Fix .tilemap file extension, fix some typos (#138)

17 files changed, 15 insertions, 15 deletions

diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm
index 251d05ad..eeadd014 100644
--- a/constants/credits_constants.asm
+++ b/constants/credits_constants.asm
@@ -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
diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm
index c2b5e523..ddf51d52 100644
--- a/data/credits/credits_order.asm
+++ b/data/credits/credits_order.asm
@@ -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
diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm
index 459f8c61..a3ddaeb4 100644
--- a/data/credits/credits_text.asm
+++ b/data/credits/credits_text.asm
@@ -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
@@ -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@"
diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm
index 64de9b95..21bb906f 100644
--- a/data/maps/objects/CeladonPokecenter.asm
+++ b/data/maps/objects/CeladonPokecenter.asm
@@ -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
diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm
index 7aaaddb6..d3921b75 100644
--- a/data/maps/objects/ViridianPokecenter.asm
+++ b/data/maps/objects/ViridianPokecenter.asm
@@ -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
 
 ViridianPokecenter_Object:
 	db $0 ; border block
diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm
index 65e4f5e5..5d43cba6 100644
--- a/engine/minigame/surfing_pikachu.asm
+++ b/engine/minigame/surfing_pikachu.asm
@@ -1470,7 +1470,7 @@ SurfingMinigame_DrawResultsScreen:
 	ret
 
 .BeachTilemap:
-INCBIN "gfx/surfing_pikachu/unknown_f8946.map"
+INCBIN "gfx/surfing_pikachu/unknown_f8946.tilemap"
 .BeachTilemapEnd:
 
 .PlaceTextbox:
@@ -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
diff --git a/engine/movie/intro_yellow.asm b/engine/movie/intro_yellow.asm
index 37eee6f8..8b8866e5 100644
--- a/engine/movie/intro_yellow.asm
+++ b/engine/movie/intro_yellow.asm
@@ -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
diff --git a/gfx/intro/unknown_f9b6e.map b/gfx/intro/unknown_f9b6e.tilemap
index 3ce924dc..3ce924dc 100644
--- a/gfx/intro/unknown_f9b6e.map
+++ b/gfx/intro/unknown_f9b6e.tilemap
diff --git a/gfx/intro/unknown_f9be6.map b/gfx/intro/unknown_f9be6.tilemap
index 18560135..18560135 100644
--- a/gfx/intro/unknown_f9be6.map
+++ b/gfx/intro/unknown_f9be6.tilemap
diff --git a/gfx/intro/unknown_f9bf2.map b/gfx/intro/unknown_f9bf2.tilemap
index e587b7ce..e587b7ce 100644
--- a/gfx/intro/unknown_f9bf2.map
+++ b/gfx/intro/unknown_f9bf2.tilemap
diff --git a/gfx/surfing_pikachu/unknown_f8946.map b/gfx/surfing_pikachu/unknown_f8946.tilemap
index a89a52b8..a89a52b8 100644
--- a/gfx/surfing_pikachu/unknown_f8946.map
+++ b/gfx/surfing_pikachu/unknown_f8946.tilemap
diff --git a/gfx/surfing_pikachu/unknown_f90bc.map b/gfx/surfing_pikachu/unknown_f90bc.tilemap
index 98b8ba51..98b8ba51 100644
--- a/gfx/surfing_pikachu/unknown_f90bc.map
+++ b/gfx/surfing_pikachu/unknown_f90bc.tilemap
diff --git a/gfx/surfing_pikachu/unknown_f91ac.map b/gfx/surfing_pikachu/unknown_f91ac.tilemap
index 8a1f06b7..8a1f06b7 100644
--- a/gfx/surfing_pikachu/unknown_f91ac.map
+++ b/gfx/surfing_pikachu/unknown_f91ac.tilemap
diff --git a/gfx/surfing_pikachu/unknown_f91bb.map b/gfx/surfing_pikachu/unknown_f91bb.tilemap
index 6d8ebb43..6d8ebb43 100644
--- a/gfx/surfing_pikachu/unknown_f91bb.map
+++ b/gfx/surfing_pikachu/unknown_f91bb.tilemap
diff --git a/gfx/surfing_pikachu/unknown_f91c8.map b/gfx/surfing_pikachu/unknown_f91c8.tilemap
index 20d18de5..20d18de5 100644
--- a/gfx/surfing_pikachu/unknown_f91c8.map
+++ b/gfx/surfing_pikachu/unknown_f91c8.tilemap
diff --git a/home/copy2.asm b/home/copy2.asm
index 6245ad5d..4acedf82 100644
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -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
diff --git a/home/pics.asm b/home/pics.asm
index b87d987d..7a58a05e 100644
--- a/home/pics.asm
+++ b/home/pics.asm
@@ -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")