From f23b59d7b75ac20ac1fa13d2de6595a5c76e9da5 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sun, 24 Sep 2023 22:58:46 +0100 Subject: [PATCH] A few small changes Just some very minor things I'm pushing while I work on the stubborn Silph Gauntlet Guard. - Fixed the misshapen Poke Ball and Pikachu sprites on the 3DS Border, and gave Shocks the updated grey palette. - Moved a trainer in Rock Tunnel that was accidentally made optional. - Fixed some wording in Gavillain's dex entry - Made wild encounters in Rock Tunnel have more consistent levels. --- 3DS Border/KEPBorder.png | Bin 11860 -> 9770 bytes data/maps/objects/RockTunnel1F.asm | 2 +- data/pokemon/new_dex_text.asm | 2 +- data/wild/maps/RockTunnel1F.asm | 2 +- data/wild/maps/RockTunnelB1F.asm | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3DS Border/KEPBorder.png b/3DS Border/KEPBorder.png index 890885b0b46956cb505d0e5c54aea83b70c7983a..3f7643b2b8b6f8486d26357efda8f6a764b43108 100644 GIT binary patch literal 9770 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 U-{5h>(bX+&jqBHq)$ literal 11860 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 diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index 8a9252bc..0d64c2f6 100644 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm @@ -18,7 +18,7 @@ RockTunnel1F_Object: object_event 7, 5, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 12 object_event 5, 10, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13 object_event 17, 15, SPRITE_HIKER, STAY, LEFT, 3, OPP_HIKER, 14 - object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7 + object_event 27, 8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7 object_event 37, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 object_event 22, 24, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 object_event 32, 26, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 7f0646c0..8ecc09f6 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -314,7 +314,7 @@ _GavillainDexEntry:: next "its surroundings." page "Those who gaze at" - next "it for too long" + next "them for too long" next "become immobile" dex diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm index b166cfa7..af70b318 100644 --- a/data/wild/maps/RockTunnel1F.asm +++ b/data/wild/maps/RockTunnel1F.asm @@ -8,7 +8,7 @@ RockTunnel1FWildMons: db 18, SLOWPOKE db 17, SLOWPOKE db 17, MACHOP - db 13, ONIX + db 15, ONIX db 15, GAVILLAIN end_grass_wildmons diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm index c0505597..abaa2839 100644 --- a/data/wild/maps/RockTunnelB1F.asm +++ b/data/wild/maps/RockTunnelB1F.asm @@ -8,8 +8,8 @@ RockTunnelB1FWildMons: db 18, ZUBAT db 17, MACHOP db 17, ONIX - db 13, GAVILLAIN - db 18, GAVILLAIN + db 16, GAVILLAIN + db 17, GAVILLAIN end_grass_wildmons def_water_wildmons 0 ; encounter rate