Skip to content

Fix .tilemap file extension, fix some typos #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rangi42 merged 1 commit into from
Sep 6, 2025
Merged

Fix .tilemap file extension, fix some typos #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion constants/credits_constants.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
const CRED_YOSHIKAWA ; 2d
const CRED_OOTA23 ; 2e
const CRED_YOSHIDA ; 2f
const CRED_MATSUMITA ; 30
const CRED_MATSUMIYA ; 30
const CRED_SEYA ; 31
const CRED_SEKINE ; 32
const CRED_SHIMAMURA ; 33
Expand Down
2 changes: 1 addition & 1 deletion data/credits/credits_order.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CreditsOrder:
db CRED_GAME_DESIGN, CRED_TAJIRI, CRED_NISHINO, CRED_TEXT_FADE_MON
db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_YOSHIDA, CRED_TEXT_FADE_MON
db CRED_GAME_SCENARIO, CRED_TAJIRI, CRED_TEXT_FADE
db CRED_GAME_SCENARIO, CRED_MATSUMITA, CRED_TEXT_MON
db CRED_GAME_SCENARIO, CRED_MATSUMIYA, CRED_TEXT_MON
db CRED_PARAMETRIC_DESIGN, CRED_NISHINO, CRED_TEXT_FADE_MON
db CRED_MAP_DESIGN, CRED_TAJIRI, CRED_NISHINO, CRED_SEYA, CRED_TEXT_FADE_MON
db CRED_TESTING, CRED_SEKINE, CRED_SEYA, CRED_TEXT_FADE
Expand Down
4 changes: 2 additions & 2 deletions data/credits/credits_text.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ CreditsTextPointers:
dw CreditsText_Yoshikawa
dw CreditsText_Oota23
dw CreditsText_Yoshida
dw CreditsText_Matsumita
dw CreditsText_Matsumiya
dw CreditsText_Seya
dw CreditsText_Sekine
dw CreditsText_Shimamura
Expand Down Expand Up @@ -186,7 +186,7 @@ CreditsText_Yoshikawa:
db -6, "RENA YOSHIKAWA@"
CreditsText_Oota23:
db -6, "TOMOMICHI OOTA@"
CreditsText_Matsumita:
CreditsText_Matsumiya:
db -8, "TOSHINOBU MATSUMIYA@"
CreditsText_Seya:
db -5, "NOBUHIRO SEYA@"
Expand Down
1 change: 1 addition & 0 deletions data/maps/objects/CeladonPokecenter.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
const_export CELADONPOKECENTER_GENTLEMAN
const_export CELADONPOKECENTER_BEAUTY
const_export CELADONPOKECENTER_LINK_RECEPTIONIST
const_export CELADONPOKECENTER_CHANSEY

CeladonPokecenter_Object:
db $0 ; border block
Expand Down
2 changes: 1 addition & 1 deletion data/maps/objects/ViridianPokecenter.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const_export VIRIDIANPOKECENTER_GENTLEMAN
const_export VIRIDIANPOKECENTER_COOLTRAINER_M
const_export VIRIDIANPOKECENTER_LINK_RECEPTIONIST
const_export VIRIDIANPOKECENTER_TEXT_VIRIDIANPOKECENTER_NURSE
const_export VIRIDIANPOKECENTER_CHANSEY
Copy link
Copy Markdown
Member

@dannye dannye Sep 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow lol


ViridianPokecenter_Object:
db $0 ; border block
Expand Down
10 changes: 5 additions & 5 deletions engine/minigame/surfing_pikachu.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,7 +1470,7 @@ SurfingMinigame_DrawResultsScreen:
ret

.BeachTilemap:
INCBIN "gfx/surfing_pikachu/unknown_f8946.map"
INCBIN "gfx/surfing_pikachu/unknown_f8946.tilemap"
.BeachTilemapEnd:

.PlaceTextbox:
Expand Down Expand Up @@ -2455,10 +2455,10 @@ DrawSurfingPikachuMinigameIntroBackground:
jr nz, .fill_row
ret

Tilemap_f90bc: INCBIN "gfx/surfing_pikachu/unknown_f90bc.map"
Tilemap_f91ac: INCBIN "gfx/surfing_pikachu/unknown_f91ac.map"
Tilemap_f91bb: INCBIN "gfx/surfing_pikachu/unknown_f91bb.map"
Tilemap_f91c8: INCBIN "gfx/surfing_pikachu/unknown_f91c8.map"
Tilemap_f90bc: INCBIN "gfx/surfing_pikachu/unknown_f90bc.tilemap"
Tilemap_f91ac: INCBIN "gfx/surfing_pikachu/unknown_f91ac.tilemap"
Tilemap_f91bb: INCBIN "gfx/surfing_pikachu/unknown_f91bb.tilemap"
Tilemap_f91c8: INCBIN "gfx/surfing_pikachu/unknown_f91c8.tilemap"

SurfingMinigame_UpdateLYOverrides:
ld hl, wLYOverrides + $10
Expand Down
6 changes: 3 additions & 3 deletions engine/movie/intro_yellow.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,9 @@ YellowIntroScene10:
jr nz, .fill_row
ret

Unkn_f9b6e: INCBIN "gfx/intro/unknown_f9b6e.map"
Unkn_f9be6: INCBIN "gfx/intro/unknown_f9be6.map"
Unkn_f9bf2: INCBIN "gfx/intro/unknown_f9bf2.map"
Unkn_f9b6e: INCBIN "gfx/intro/unknown_f9b6e.tilemap"
Unkn_f9be6: INCBIN "gfx/intro/unknown_f9be6.tilemap"
Unkn_f9bf2: INCBIN "gfx/intro/unknown_f9bf2.tilemap"

YellowIntroScene11:
call YellowIntro_CheckFrameTimerDecrement
Expand Down
0 gfx/intro/unknown_f9b6e.map → gfx/intro/unknown_f9b6e.tilemap
View file
Open in desktop
File renamed without changes.
0 gfx/intro/unknown_f9be6.map → gfx/intro/unknown_f9be6.tilemap
View file
Open in desktop
File renamed without changes.
0 gfx/intro/unknown_f9bf2.map → gfx/intro/unknown_f9bf2.tilemap
View file
Open in desktop
File renamed without changes.
0 gfx/surfing_pikachu/unknown_f8946.map → gfx/surfing_pikachu/unknown_f8946.tilemap
View file
Open in desktop
File renamed without changes.
0 gfx/surfing_pikachu/unknown_f90bc.map → gfx/surfing_pikachu/unknown_f90bc.tilemap
View file
Open in desktop
File renamed without changes.
0 gfx/surfing_pikachu/unknown_f91ac.map → gfx/surfing_pikachu/unknown_f91ac.tilemap
View file
Open in desktop
File renamed without changes.
0 gfx/surfing_pikachu/unknown_f91bb.map → gfx/surfing_pikachu/unknown_f91bb.tilemap
View file
Open in desktop
File renamed without changes.
0 gfx/surfing_pikachu/unknown_f91c8.map → gfx/surfing_pikachu/unknown_f91c8.tilemap
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion home/copy2.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ IsTilePassable::

FarCopyDataDouble::
; Expand bc bytes of 1bpp image data
; from a:de to 2bpp data at hl.
; from a:hl to 2bpp data at de.
ld [wFarCopyDataSavedROMBank], a
ldh a, [hLoadedROMBank]
push af
Expand Down
1 change: 0 additions & 1 deletion home/pics.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ UncompressMonSprite::
ld a, [hl]
ld [wSpriteInputPtr+1], a
; define (by index number) the bank that a pokemon's image is in
; index = MEW: bank $1
; index = FOSSIL_KABUTOPS: bank $B
; index < $1F: bank $9 ("Pics 1")
; $1F ≤ index < $4A: bank $A ("Pics 2")
Expand Down