From 565734b50aa686e5bc2f1a02f8412f611eec21e5 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 17 Apr 2023 10:30:12 +0100 Subject: [PATCH] Open up Kanto, extra party tweak This moves Snorlax as Ema suggested and removes the Cut tree in front of Surge. This is to stay in-line with the current idea of an open-world Kanto. Also changes the Magmortar trainer in Cinnabar as that's Blaine's ace now. --- data/maps/objects/Route12.asm | 2 +- data/trainers/parties.asm | 2 +- maps/VermilionCity.blk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index 76e4ccb6..9b4e4814 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -11,7 +11,7 @@ Route12_Object: bg_event 11, 63, 12 ; Route12Text12 def_object_events - object_event 10, 62, SPRITE_SNORLAX, STAY, DOWN, 1 ; person + object_event 11, 62, SPRITE_SNORLAX, STAY, DOWN, 1 ; person object_event 14, 31, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 3 object_event 5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4 object_event 11, 92, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 81e8353a..2cf13de4 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -241,7 +241,7 @@ SuperNerdData: db 36, VULPIX, NINETALES, CHARIZARD, 0 db 34, PONYTA, CHARMANDER, RAPIDASH, ARCANINE, 0 db 41, FLAREON, 0 - db 37, MAGMAR, MAGMORTAR, 0 + db 37, CHARMELEON, MAGMAR, 0 HikerData: ; Mt. Moon 1F diff --git a/maps/VermilionCity.blk b/maps/VermilionCity.blk index cdba83ed..6db44247 100644 --- a/maps/VermilionCity.blk +++ b/maps/VermilionCity.blk @@ -1 +1 @@ -CCC ! ! !1 !11111111Ckk7~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1 1111 !TCdV21|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCTTTTTTTTTTTC-gCCCCTxxxTxxxxxxCCCkkkTkTkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCTCCCTCCCCCCCCCC \ No newline at end of file +CCC ! ! !1 !11111111Ckk7~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1 1111 !TCdVm1|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCTTTTTTTTTTTC-gCCCCTxxxTxxxxxxCCCkkkTkTkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCTCCCTCCCCCCCCCC \ No newline at end of file