From d18d7089c795751da0b6ee3d0c016576c332fe68 Mon Sep 17 00:00:00 2001 From: Narishma-gb <194818981+Narishma-gb@users.noreply.github.com> Date: Sat, 6 Sep 2025 22:50:51 +0200 Subject: Fix .tilemap file extension, fix some typos (#138) --- constants/credits_constants.asm | 2 +- data/credits/credits_order.asm | 2 +- data/credits/credits_text.asm | 4 ++-- data/maps/objects/CeladonPokecenter.asm | 1 + data/maps/objects/ViridianPokecenter.asm | 2 +- engine/minigame/surfing_pikachu.asm | 10 +++++----- engine/movie/intro_yellow.asm | 6 +++--- gfx/intro/unknown_f9b6e.map | Bin 120 -> 0 bytes gfx/intro/unknown_f9b6e.tilemap | Bin 0 -> 120 bytes gfx/intro/unknown_f9be6.map | 1 - gfx/intro/unknown_f9be6.tilemap | 1 + gfx/intro/unknown_f9bf2.map | 1 - gfx/intro/unknown_f9bf2.tilemap | 1 + gfx/surfing_pikachu/unknown_f8946.map | 1 - gfx/surfing_pikachu/unknown_f8946.tilemap | 1 + gfx/surfing_pikachu/unknown_f90bc.map | Bin 240 -> 0 bytes gfx/surfing_pikachu/unknown_f90bc.tilemap | Bin 0 -> 240 bytes gfx/surfing_pikachu/unknown_f91ac.map | 1 - gfx/surfing_pikachu/unknown_f91ac.tilemap | 1 + gfx/surfing_pikachu/unknown_f91bb.map | 2 -- gfx/surfing_pikachu/unknown_f91bb.tilemap | 2 ++ gfx/surfing_pikachu/unknown_f91c8.map | 1 - gfx/surfing_pikachu/unknown_f91c8.tilemap | 1 + home/copy2.asm | 2 +- home/pics.asm | 1 - 25 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 gfx/intro/unknown_f9b6e.map create mode 100644 gfx/intro/unknown_f9b6e.tilemap delete mode 100644 gfx/intro/unknown_f9be6.map create mode 100644 gfx/intro/unknown_f9be6.tilemap delete mode 100644 gfx/intro/unknown_f9bf2.map create mode 100644 gfx/intro/unknown_f9bf2.tilemap delete mode 100644 gfx/surfing_pikachu/unknown_f8946.map create mode 100644 gfx/surfing_pikachu/unknown_f8946.tilemap delete mode 100644 gfx/surfing_pikachu/unknown_f90bc.map create mode 100644 gfx/surfing_pikachu/unknown_f90bc.tilemap delete mode 100644 gfx/surfing_pikachu/unknown_f91ac.map create mode 100644 gfx/surfing_pikachu/unknown_f91ac.tilemap delete mode 100644 gfx/surfing_pikachu/unknown_f91bb.map create mode 100644 gfx/surfing_pikachu/unknown_f91bb.tilemap delete mode 100644 gfx/surfing_pikachu/unknown_f91c8.map create mode 100644 gfx/surfing_pikachu/unknown_f91c8.tilemap 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.map deleted file mode 100644 index 3ce924dc..00000000 Binary files a/gfx/intro/unknown_f9b6e.map and /dev/null differ diff --git a/gfx/intro/unknown_f9b6e.tilemap b/gfx/intro/unknown_f9b6e.tilemap new file mode 100644 index 00000000..3ce924dc Binary files /dev/null and b/gfx/intro/unknown_f9b6e.tilemap differ diff --git a/gfx/intro/unknown_f9be6.map b/gfx/intro/unknown_f9be6.map deleted file mode 100644 index 18560135..00000000 --- a/gfx/intro/unknown_f9be6.map +++ /dev/null @@ -1 +0,0 @@ -0123@ABCPQRS \ No newline at end of file diff --git a/gfx/intro/unknown_f9be6.tilemap b/gfx/intro/unknown_f9be6.tilemap new file mode 100644 index 00000000..18560135 --- /dev/null +++ b/gfx/intro/unknown_f9be6.tilemap @@ -0,0 +1 @@ +0123@ABCPQRS \ No newline at end of file diff --git a/gfx/intro/unknown_f9bf2.map b/gfx/intro/unknown_f9bf2.map deleted file mode 100644 index e587b7ce..00000000 --- a/gfx/intro/unknown_f9bf2.map +++ /dev/null @@ -1 +0,0 @@ -"# \ No newline at end of file diff --git a/gfx/intro/unknown_f9bf2.tilemap b/gfx/intro/unknown_f9bf2.tilemap new file mode 100644 index 00000000..e587b7ce --- /dev/null +++ b/gfx/intro/unknown_f9bf2.tilemap @@ -0,0 +1 @@ +"# \ No newline at end of file diff --git a/gfx/surfing_pikachu/unknown_f8946.map b/gfx/surfing_pikachu/unknown_f8946.map deleted file mode 100644 index a89a52b8..00000000 --- a/gfx/surfing_pikachu/unknown_f8946.map +++ /dev/null @@ -1 +0,0 @@ -           \ No newline at end of file diff --git a/gfx/surfing_pikachu/unknown_f8946.tilemap b/gfx/surfing_pikachu/unknown_f8946.tilemap new file mode 100644 index 00000000..a89a52b8 --- /dev/null +++ b/gfx/surfing_pikachu/unknown_f8946.tilemap @@ -0,0 +1 @@ +           \ No newline at end of file diff --git a/gfx/surfing_pikachu/unknown_f90bc.map b/gfx/surfing_pikachu/unknown_f90bc.map deleted file mode 100644 index 98b8ba51..00000000 Binary files a/gfx/surfing_pikachu/unknown_f90bc.map and /dev/null differ diff --git a/gfx/surfing_pikachu/unknown_f90bc.tilemap b/gfx/surfing_pikachu/unknown_f90bc.tilemap new file mode 100644 index 00000000..98b8ba51 Binary files /dev/null and b/gfx/surfing_pikachu/unknown_f90bc.tilemap differ diff --git a/gfx/surfing_pikachu/unknown_f91ac.map b/gfx/surfing_pikachu/unknown_f91ac.map deleted file mode 100644 index 8a1f06b7..00000000 --- a/gfx/surfing_pikachu/unknown_f91ac.map +++ /dev/null @@ -1 +0,0 @@ -íîïÿðñòóôõöÿ÷øù \ No newline at end of file diff --git a/gfx/surfing_pikachu/unknown_f91ac.tilemap b/gfx/surfing_pikachu/unknown_f91ac.tilemap new file mode 100644 index 00000000..8a1f06b7 --- /dev/null +++ b/gfx/surfing_pikachu/unknown_f91ac.tilemap @@ -0,0 +1 @@ +íîïÿðñòóôõöÿ÷øù \ No newline at end of file diff --git a/gfx/surfing_pikachu/unknown_f91bb.map b/gfx/surfing_pikachu/unknown_f91bb.map deleted file mode 100644 index 6d8ebb43..00000000 --- a/gfx/surfing_pikachu/unknown_f91bb.map +++ /dev/null @@ -1,2 +0,0 @@ -úûÿüýþÿ -ÿ \ No newline at end of file diff --git a/gfx/surfing_pikachu/unknown_f91bb.tilemap b/gfx/surfing_pikachu/unknown_f91bb.tilemap new file mode 100644 index 00000000..6d8ebb43 --- /dev/null +++ b/gfx/surfing_pikachu/unknown_f91bb.tilemap @@ -0,0 +1,2 @@ +úûÿüýþÿ +ÿ \ No newline at end of file diff --git a/gfx/surfing_pikachu/unknown_f91c8.map b/gfx/surfing_pikachu/unknown_f91c8.map deleted file mode 100644 index 20d18de5..00000000 --- a/gfx/surfing_pikachu/unknown_f91c8.map +++ /dev/null @@ -1 +0,0 @@ -¶·¸¹ÿÿÿºÿÿÿÿ»¼½¾¿ÀÁÂÃÄÅÿÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖרÙÚÛÜÿÿÿÝÞßàáâãäÿÿÿÿåæçèéêëìÿÿ \ No newline at end of file diff --git a/gfx/surfing_pikachu/unknown_f91c8.tilemap b/gfx/surfing_pikachu/unknown_f91c8.tilemap new file mode 100644 index 00000000..20d18de5 --- /dev/null +++ b/gfx/surfing_pikachu/unknown_f91c8.tilemap @@ -0,0 +1 @@ +¶·¸¹ÿÿÿºÿÿÿÿ»¼½¾¿ÀÁÂÃÄÅÿÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖרÙÚÛÜÿÿÿÝÞßàáâãäÿÿÿÿåæçèéêëìÿÿ \ No newline at end of file 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") -- cgit v1.3.1-sl0p