From 200dc696aa3b83d55084ef30bde23c405c51f189 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 24 Dec 2023 15:37:48 -0500 Subject: [PATCH 01/30] Geodude Line update + Nidoreign Tweak Integrated the new Geodude line movesets, as well as added Spike Cannon to Nidoreign's level-up moveset. (Might've been accidentally removed, as it was on the spreadsheet but not in the code.) --- data/pokemon/evos_moves.asm | 48 ++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 871b8d12..647091af 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -672,6 +672,7 @@ NidoreignEvosMoves: ; Evolutions db 0 ; Learnset + db 23, SPIKE_CANNON db 36, ROCK_SLIDE db 43, BODY_SLAM db 50, THRASH @@ -768,10 +769,14 @@ GravelerEvosMoves: db 11, DEFENSE_CURL db 16, ROCK_THROW db 21, SELFDESTRUCT - db 29, HARDEN - db 36, EARTHQUAKE - db 43, EXPLOSION - db 50, ROCK_SLIDE + db 25, MEGA_PUNCH + db 30, HARDEN + db 35, EARTHQUAKE + db 40, BODY_SLAM + db 45, ROCK_SLIDE + db 50, EXPLOSION + db 55, DOUBLE_EDGE + db 60, FISSURE db 0 ChanseyEvosMoves: @@ -894,10 +899,14 @@ GolemEvosMoves: db 11, DEFENSE_CURL db 16, ROCK_THROW db 21, SELFDESTRUCT - db 29, HARDEN - db 36, EARTHQUAKE - db 43, EXPLOSION - db 50, ROCK_SLIDE + db 25, MEGA_PUNCH + db 30, HARDEN + db 35, EARTHQUAKE + db 40, BODY_SLAM + db 45, ROCK_SLIDE + db 50, EXPLOSION + db 55, DOUBLE_EDGE + db 60, FISSURE db 0 BalumbaEvosMoves: @@ -2390,7 +2399,6 @@ NidorinaEvosMoves: db 55, TAKE_DOWN ; Prototype db 0 -; Needs Body Slam, Mega Punch, Double-Edge, and Fissure distributed GeodudeEvosMoves: ; Evolutions db EV_LEVEL, 25, GRAVELER @@ -2399,10 +2407,14 @@ GeodudeEvosMoves: db 11, DEFENSE_CURL db 16, ROCK_THROW db 21, SELFDESTRUCT - db 26, HARDEN - db 31, EARTHQUAKE - db 36, EXPLOSION + db 25, MEGA_PUNCH + db 29, HARDEN + db 33, EARTHQUAKE + db 37, BODY_SLAM db 41, ROCK_SLIDE + db 45, EXPLOSION + db 49, DOUBLE_EDGE + db 53, FISSURE db 0 PorygonEvosMoves: @@ -3320,10 +3332,14 @@ GolemAEvosMoves: db 11, DEFENSE_CURL db 16, ROCK_THROW db 21, SELFDESTRUCT - db 29, THUNDERPUNCH - db 36, DOUBLE_EDGE - db 43, EXPLOSION - db 50, ROCK_SLIDE + db 25, MEGA_PUNCH + db 30, THUNDERPUNCH + db 35, THUNDER_WAVE + db 40, BODY_SLAM + db 45, ROCK_SLIDE + db 50, EXPLOSION + db 55, DOUBLE_EDGE + db 60, THUNDER db 0 RapidashGEvosMoves: From 543ea46d8e815beccd32f675009858f02d372662 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sun, 24 Dec 2023 22:18:00 +0000 Subject: [PATCH 02/30] Koichi unique trainer class! Well, 'unique' is VERY loose here. He looks and behaves identically to a Black Belt still, just with a proper name and a higher payout. He replaces the unused Junior class. In addition, I've brought back the text on the scrolls on the back wall in the Fighting Dojo that were accidentally inaccessible for a while. --- audio/play_battle_music.asm | 2 ++ constants/trainer_constants.asm | 2 +- data/events/hidden_objects.asm | 4 ++-- data/maps/objects/FightingDojo.asm | 10 +++++----- data/maps/objects/SilphGauntlet2F.asm | 2 +- data/maps/objects/VictoryRoad2F.asm | 2 +- data/maps/objects/ViridianGym.asm | 6 +++--- data/trainers/ai_pointers.asm | 2 +- data/trainers/encounter_types.asm | 6 ++++++ data/trainers/move_choices.asm | 2 +- data/trainers/names.asm | 2 +- data/trainers/parties.asm | 19 ++++++++++++++++++- data/trainers/pic_pointers_money.asm | 8 ++++---- data/trainers/scaled_parties.asm | 16 +--------------- engine/battletentdata.asm | 2 +- gfx/blocksets/pregym.bst | Bin 864 -> 896 bytes gfx/pics.asm | 2 +- gfx/trainers/junior.png | Bin 645 -> 0 bytes gfx/trainers/koichi.png | Bin 0 -> 594 bytes maps/FightingDojo.blk | 2 +- scripts/FightingDojo.asm | 4 ++-- 21 files changed, 52 insertions(+), 41 deletions(-) delete mode 100644 gfx/trainers/junior.png create mode 100644 gfx/trainers/koichi.png diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index 84fdb35a..d0500f6f 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -44,6 +44,8 @@ PlayBattleMusic:: jr c, .wildBattle cp OPP_YUJIROU jr z, .Elite4Battle + cp OPP_KOICHI + jr z, .Elite4Battle cp OPP_LORELEI ; elite four now play the gym leader battle theme jr z, .Elite4Battle cp OPP_BRUNO diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index f747bfc2..6287488b 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -64,7 +64,7 @@ ENDM trainer_const YUJIROU ; $0D, was unused juggler, also not 0D but I can't be bothered to change everything trainer_const STUDENT trainer_const FIREFIGHTER - trainer_const JUNIOR + trainer_const KOICHI trainer_const JACK trainer_const JESSIE_JAMES DEF NUM_TRAINERS EQU const_value - 1 diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index 6cc05fe6..c94a1df5 100644 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm @@ -575,8 +575,8 @@ CeladonMansion5HiddenObjects: FightingDojoHiddenObjects: hidden_object 3, 9, SPRITE_FACING_UP, PrintFightingDojoText hidden_object 6, 9, SPRITE_FACING_UP, PrintFightingDojoText - hidden_object 4, 0, SPRITE_FACING_UP, PrintFightingDojoText2 - hidden_object 5, 0, SPRITE_FACING_UP, PrintFightingDojoText3 + hidden_object 1, 0, SPRITE_FACING_UP, PrintFightingDojoText2 + hidden_object 2, 0, SPRITE_FACING_UP, PrintFightingDojoText3 db -1 ; end IndigoPlateauLobbyHiddenObjects: diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 7d9bba96..e45499dd 100644 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -8,11 +8,11 @@ FightingDojo_Object: def_bg_events def_object_events - object_event 4, 1, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1 ; koichi - object_event 3, 3, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 11 - object_event 3, 5, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 12 - object_event 6, 4, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 13 - object_event 6, 6, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 14 + object_event 4, 1, SPRITE_HIKER, STAY, DOWN, 1, OPP_KOICHI, 1 + object_event 3, 3, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 3 + object_event 3, 5, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 4 + object_event 6, 4, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 2 + object_event 6, 6, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 1 object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, 6 ; Hitmonlee object_event 7, 1, SPRITE_POKE_BALL, STAY, NONE, 7 ; Hitmonchan object_event 6, 1, SPRITE_POKE_BALL, STAY, NONE, 8 ; Hitmontop diff --git a/data/maps/objects/SilphGauntlet2F.asm b/data/maps/objects/SilphGauntlet2F.asm index d4ec14e2..6dbf2c51 100644 --- a/data/maps/objects/SilphGauntlet2F.asm +++ b/data/maps/objects/SilphGauntlet2F.asm @@ -13,6 +13,6 @@ SilphGauntlet2F_Object: object_event 24, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 3, OPP_SUPER_NERD, 8 object_event 23, 19, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_POKEMANIAC, 8 object_event 11, 16, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 11 - object_event 2, 16, SPRITE_HIKER, STAY, RIGHT, 6, OPP_BLACKBELT, 19 + object_event 2, 16, SPRITE_HIKER, STAY, RIGHT, 6, OPP_BLACKBELT, 9 def_warps_to SILPH_GAUNTLET_2F diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index 5f1cdbaf..f0761fdd 100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -13,7 +13,7 @@ VictoryRoad2F_Object: def_bg_events def_object_events - object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 16 + object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 8 object_event 21, 13, SPRITE_SUPER_NERD, STAY, LEFT, 2, OPP_JUGGLER, 2 object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5 object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6 diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index 983a5c1d..d5c36e19 100644 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm @@ -13,11 +13,11 @@ ViridianGym_Object: def_object_events object_event 2, 2, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3 object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 - object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 13 + object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 5 object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3 - object_event 7, 10, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 14 + object_event 7, 10, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 6 object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 - object_event 9, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 15 + object_event 9, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 7 object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, 8, OPP_TAMER, 4 object_event 4, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 object_event 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 10 ; person diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm index 1ec9ce0c..e783308c 100644 --- a/data/trainers/ai_pointers.asm +++ b/data/trainers/ai_pointers.asm @@ -53,7 +53,7 @@ TrainerAIPointers: dbw 3, GenericAI ; Yujirou dbw 3, GenericAI ; Student dbw 3, GenericAI ; Firefighter - dbw 3, GenericAI ; Junior + dbw 2, BlackbeltAI ; Koichi dbw 2, BlackbeltAI ; Jack dbw 2, GenericAI ; Jessie & James assert_table_length NUM_TRAINERS diff --git a/data/trainers/encounter_types.asm b/data/trainers/encounter_types.asm index 6ab860bf..ca08d434 100644 --- a/data/trainers/encounter_types.asm +++ b/data/trainers/encounter_types.asm @@ -3,6 +3,8 @@ FemaleTrainerList:: db OPP_JR_TRAINER_F db OPP_BEAUTY db OPP_COOLTRAINER_F + db OPP_MISTY + db OPP_ERIKA db OPP_STUDENT db -1 ; end @@ -14,5 +16,9 @@ EvilTrainerList:: db OPP_SCIENTIST db OPP_GIOVANNI db OPP_ROCKET + db OPP_KOGA + db OPP_SABRINA + db OPP_CHANNELER + db OPP_AGATHA db OPP_JESSIE_JAMES db -1 ; end diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm index 59965c97..306c7c7c 100644 --- a/data/trainers/move_choices.asm +++ b/data/trainers/move_choices.asm @@ -58,7 +58,7 @@ TrainerClassMoveChoiceModifications: move_choices 1, 3, ; YUJIROU, was UNUSED_JUGGLER move_choices 1, 3, ; STUDENT move_choices 1, 3, ; FIREFIGHTER - move_choices 1, 3, ; JUNIOR + move_choices 1, 3, ; KOICHI move_choices 1, 3, ; JACK move_choices 1, 3, ; JESSIE_JAMES assert_list_length NUM_TRAINERS diff --git a/data/trainers/names.asm b/data/trainers/names.asm index bc0309e7..c9dae124 100644 --- a/data/trainers/names.asm +++ b/data/trainers/names.asm @@ -49,7 +49,7 @@ TrainerNames:: li "YUJIROU" li "STUDENT" li "FIREFIGHTER" - li "JUNIOR" + li "KOICHI" li "JACKY" ; Often called Jack, but the only source for that is the file names themselves, which are oft shortened or literal japanese translations; all other context is "Shinjuku Jacky". li "JESSIE&JAMES" assert_list_length NUM_TRAINERS diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 7e549c81..e6cd8de6 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -49,7 +49,7 @@ TrainerDataPointers: dw YujirouData ; was unused juggler dw StudentData dw FirefighterData - dw JuniorData + dw KoichiData dw JackData dw JessieJamesData assert_table_length NUM_TRAINERS @@ -542,6 +542,23 @@ BirdKeeperData: db 29, PIDGEOTTO, FEAROW, 0 db 28, SPEAROW, DODUO, FEAROW, 0 +; Fighting specialist, even the ones in Giovanni's gym! +; These have been changed to bulky, 'intimidating' Ground types to fit the theme +BlackbeltData: +; Fighting Dojo Trainers + db 31, MANKEY, MACHOKE, JABETTA, 0 + db 32, PRIMEAPE, CARAPTHOR, 0 + db 35, GORILLAIMO, 0 + db 33, MACHOP, POLIWRATH, 0 +; Viridian Gym - changed to fit the Ground-type gym theme + db 40, MAROWAK, GOLEM, 0 + db 43, GUARDIA, 0 + db 38, CACTORMUS, DUGTRIO, STEELIX, 0 +; Victory Road 2F + db 43, MACHOKE, MACHOP, MACHOKE, 0 +; Silph Gauntlet 2F (Mt. Moon) + db 63, HITMONTOP, JABETTA, GORILLAIMO, POLIWRATH, CARAPTHOR, MACHAMP, 0 + ; Uses Silph products and Steel-types ChiefData: ; Silph Gauntlet 7F diff --git a/data/trainers/pic_pointers_money.asm b/data/trainers/pic_pointers_money.asm index 9b8b207c..af202ba2 100644 --- a/data/trainers/pic_pointers_money.asm +++ b/data/trainers/pic_pointers_money.asm @@ -53,10 +53,10 @@ TrainerPicAndMoneyPointers:: pic_money ChannelerPic, 3000 pic_money AgathaPic, 9900 pic_money LancePic, 9900 - pic_money YujirouPic, 9900 ; was unused juggler + pic_money YujirouPic, 3500 ; was unused juggler pic_money StudentPic, 1000 - pic_money FirefighterPic, 1500 - pic_money JuniorPic, 1000 + pic_money FirefighterPic, 2500 + pic_money KoichiPic, 9900 pic_money JackPic, 5000 - pic_money JessieJamesPic, 9900 + pic_money JessieJamesPic, 5000 assert_table_length NUM_TRAINERS diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index 30a86936..f32e42ee 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -119,8 +119,7 @@ YujirouData: ; was unused juggler ; post-game rematch team db $FF, 61, PERSIAN, 60, TAUROS, 60, BLISSEY, 61, LUXWAN, 61, SNORLAX, 64, LICKILICKY, 0 -BlackbeltData: -; Koichi parties +KoichiData: db 13, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 0 badges (unused) db $FF, 17, MACHOP, 20, HITMONLEE, 20, HITMONCHAN, 20, HITMONTOP, 0 ; 1 db $FF, 20, MACHOP, 20, MANKEY, 24, HITMONLEE, 24, HITMONCHAN, 24, HITMONTOP, 0 ; 2 @@ -131,16 +130,3 @@ BlackbeltData: db $FF, 46, MACHAMP, 46, CARAPTHOR, 46, ANNIHILAPE, 49, HITMONLEE, 49, HITMONCHAN, 49, HITMONTOP, 0 ; 7 db $FF, 50, MACHAMP, 50, CARAPTHOR, 50, ANNIHILAPE, 53, HITMONLEE, 53, HITMONCHAN, 53, HITMONTOP, 0 ; 8 db $FF, 60, MACHAMP, 60, ANNIHILAPE, 60, TAUROS_P, 65, HITMONLEE, 65, HITMONCHAN, 65, HITMONTOP, 0 ; Postgame -; Fighting Dojo Trainers - db 31, CHEEP, CHEEP, JABETTA, 0 - db 32, MACHOKE, MACHAMP, 0 - db 35, GORILLAIMO, 0 - db 31, MACHOP, MANKEY, PRIMEAPE, 0 -; Viridian Gym - changed to fit the Ground-type gym theme - db 40, SANDSLASH, GOLEM, 0 - db 43, GUARDIA, 0 - db 38, CACTORMUS, DUGTRIO, STEELIX, 0 -; Victory Road 2F - db 43, MACHOKE, MACHOP, MACHOKE, 0 -; Silph Gauntlet 2F (Mt. Moon) - db 63, HITMONLEE, JABETTA, HITMONCHAN, POLIWRATH, CARAPTHOR, MACHAMP, 0 diff --git a/engine/battletentdata.asm b/engine/battletentdata.asm index 2d787330..41b785f7 100644 --- a/engine/battletentdata.asm +++ b/engine/battletentdata.asm @@ -217,7 +217,7 @@ BTTrainerClassList:: db BLACKBELT, SPRITE_HIKER, 2 db SCIENTIST, SPRITE_SCIENTIST, 8 db FIREFIGHTER, SPRITE_FISHER, 0 - db JUNIOR, SPRITE_YOUNGSTER, 8 + db STUDENT, SPRITE_GIRL, 8 db CHANNELER, SPRITE_CHANNELER, 8 BTMonList:: diff --git a/gfx/blocksets/pregym.bst b/gfx/blocksets/pregym.bst index bcbb36ea377247f9c19383dfe805ef28b1da009e..c40d725e96816099d7f7a6843f775cfc919ca077 100644 GIT binary patch delta 79 zcmaFB*1*2u5R(i81EY+904pmio2aO$7!NNKGY_wjFb^*`HxKXRdrT3GGLy}jH5ItQ TfSrq*TU?5pTb3WhMdkqjzE}wV delta 46 ycmZo*f55ik5R(iOGoy@|IV&qGo2aO$7y}bCgMgX23^y1|zQ+{7C@|TaSrY)k5(lXO diff --git a/gfx/pics.asm b/gfx/pics.asm index 2b05b246..e19cb907 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -591,6 +591,6 @@ LancePic:: INCBIN "gfx/trainers/lance.pic" YujirouPic:: INCBIN "gfx/trainers/yujirou.pic" StudentPic:: INCBIN "gfx/trainers/student.pic" FirefighterPic:: INCBIN "gfx/trainers/firefighter.pic" -JuniorPic:: INCBIN "gfx/trainers/junior.pic" +KoichiPic:: INCBIN "gfx/trainers/koichi.pic" JackPic:: INCBIN "gfx/trainers/jack.pic" JessieJamesPic:: INCBIN "gfx/trainers/jessiejames.pic" diff --git a/gfx/trainers/junior.png b/gfx/trainers/junior.png deleted file mode 100644 index 8f42567cf80dfbe6dd6a7c51db14f370df5c55b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 645 zcmV;00($+4P)t-G&u9_vKmt=@a@9V-(m{>(BmJqj2IbMQL|m2R-tkdZ*GlT?Z#~TW>p?PI zeay^%iiAoj2>r57Jso=I0TESIWP;a_I}%TVE<8;ofDw@3!q(dSNzxqK=HbgUrYW#V zQ+sjMN87P4*`zPhakEGn;~^rgwHSS{PucutB5k8zpuBQfnpr|qGU}zTTV99H7L&7y zO78Xa@MHS~$cV^s7m{V-X6RCu{uod6!sD{#j^9X+P7u|KG{kx|*=JK+7<&FdcLydM z59>WzA#G8bd`2dHe^URi3caeH_xC9<;W(l=ZcZ99zA2fw;2+7;=t9{GdP;YaFm^o3 zMRfk;ao%yEj;bo!sFWTmlW3gm0g1JrNp$3ts8DQFJfFc2kL=(Jf;AGJ00000NkvXXu0mjfIAJ&E diff --git a/gfx/trainers/koichi.png b/gfx/trainers/koichi.png new file mode 100644 index 0000000000000000000000000000000000000000..8ba5480fec44d71782e9085852d15552dc07dd09 GIT binary patch literal 594 zcmV-Y0fKV6Ew#Qfv#p84Iy%Q^eoKK$Mr-uFGge;)idRno9h zVGlS9>&}>k>h>wP>M^MV0D8JRgx2e@pR!XNpkz(XQQA!ADeWc?D4izjU<2qg33u&* zdychzMQZb#EbHbD1G-V zw~ODZ-eze{y3Fa6m7VES(|waMipvdVVfDtNC!GGPIu4Wjw<5b$c8+VYx|xz{pJz() z%1W}u{GDmOUR?Caua+DL6&OfQsxr_08r%R5%7&mEtO!gb$&Kl8BeW*>WwO zc@I5j3ZHt(?79$nusD7aMx(t~(xIoD8Rkpm#SonMIxh<`nw&KDYyqT*)Su1Jm@kz3 z%8+-t-Z9OzfQsPvJ3t)`V*=lFk(?I3&H)Ci_!Gr-!H3D9J`pyUv$xY6O8S7i*nA$a zohP`ja}Tu*7NZ1JomJG<5DNq=I**CQw-VdJW1W-Or2FvUZ=EAY<8)hlDAI5g_vsp? zNC;1V)wn`AAjCYB{;W#3y1dj)dzI+c1iie6V?QXX!fWGNuhsR~!C^4B!&uMzaf-Ln g`!Z?eM>m6i012f Date: Sun, 24 Dec 2023 22:48:31 +0000 Subject: [PATCH 03/30] whoa! new vire backsprite! (whoa!) --- gfx/pokemon/back/electivireb.png | Bin 576 -> 628 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/pokemon/back/electivireb.png b/gfx/pokemon/back/electivireb.png index a4addeac048ff6ee5fb37ecdcba9f1d6ba346da8..9d6f45c3d10b9ce1be54ac7ea04a9cd1cbeaeb82 100644 GIT binary patch delta 386 zcmX@W@`YuB%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6gNzrY*#^%7J6zWECl6T|*;X zBa;v#BP$bQD?@W_0|P4qgYU1`8cnE!I%_H}ZehRNIb^x&POP{#7`pF7a4x zHS_HhfyYeD%*@6eg$mhMSqz-BuC5AgRA{@lDpcE%?H?p7)!>+S1zE zm~_8Jb1gaCz@t6EA>?;`oABy}p3v_9#x-nREvaAsr|-D_N??|$=MQ`5Ru1OX;oK7r zN+_I?*kJI){&3*&3k?Bo3eHnPRa`_eOqf^Q-)O|Jyl?##vnjKRfkDFH>FVdQ&MBb@ E05?38SO5S3 delta 332 zcmeyua)4!m3NK5#qpu?a!^VE@KZ&dp6&pI&Qh@pvjk+y+>m4QL}c7^2=4~nD98bV~%nVQ-rt1)KQ zAMkW>43W58dft}nPyi3Z1Cc)mJ=6UazOw0s?r}Ic-O>FhpPbVkM^?c%YF8HaE?_Sx ze)EVo=8lZam5oxu+3uU4C@U&5K2y(T_ Date: Mon, 25 Dec 2023 13:16:44 +0000 Subject: [PATCH 04/30] Celeste Hill and Brunswick wild encounter glitch fixed The fix really was that easy, huh. --- engine/battle/wild_encounters.asm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 28a85aee..f05b0543 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -57,6 +57,8 @@ TryDoWildEncounter: ld a, [wCurMapTileset] cp FOREST ; Viridian Forest/Safari Zone jp z, .CantEncounter2 + cp CELESTE + jp z, .CantEncounter2 ld a, [wGrassRate] .CanEncounter ; compare encounter chance with a random number to determine if there will be an encounter From 5ea0fc5de911a5fc40dcd8b4566cf35ea610c77b Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 25 Dec 2023 22:15:27 +0000 Subject: [PATCH 05/30] New starter pathing, beautify Oak's Lab Please stop asking me about the sprite limit i beg u Ok so this commit does the following; - Oak's Lab now uses the Fossil Lab tileset, featuring lots of new contraptions etc to make up for the old removed aides. - Places the Pikachu and Eevee starters in a new place, which results in a slightly blocky mess, but does the job. - Fossil Lab tileset graphic has many new things. Lots of bad tiles in the blockset in case we want to use this more. - Changes the rival's pathing so he, y'know, works on the new map... - Re-adds the Oak email thing, but I had to do like 4 stupid workarounds because it was broken for unknown reasons. Just made it a generic bg event with no issues. - Removed the old oak email event; no visible difference. --- data/maps/headers/OaksLab.asm | 2 +- data/maps/objects/OaksLab.asm | 8 ++- data/text_predef_pointers.asm | 2 +- data/tilesets/collision_tile_ids.asm | 4 +- .../events/hidden_objects/oaks_lab_email.asm | 16 ++--- gfx/blocksets/fossillab.bst | Bin 928 -> 928 bytes gfx/tilesets/fossillab.png | Bin 2234 -> 2280 bytes maps/OaksLab.blk | 3 +- scripts/OaksLab.asm | 62 ++++++++++++++---- 9 files changed, 69 insertions(+), 28 deletions(-) diff --git a/data/maps/headers/OaksLab.asm b/data/maps/headers/OaksLab.asm index a31d9d37..0cc37744 100644 --- a/data/maps/headers/OaksLab.asm +++ b/data/maps/headers/OaksLab.asm @@ -1,2 +1,2 @@ - map_header OaksLab, OAKS_LAB, GYM, 0 + map_header OaksLab, OAKS_LAB, FOSSILLAB, 0 end_map_header diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index f25c51b2..a6657727 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -1,11 +1,13 @@ OaksLab_Object: - db $3 ; border block + db $17 ; border block def_warp_events warp_event 6, 11, LAST_MAP, 3 warp_event 7, 11, LAST_MAP, 3 def_bg_events + bg_event 10, 6, 30 ; PC because it keeps breaking + bg_event 11, 6, 30 ; PC because it keeps breaking def_object_events object_event 6, 4, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1 @@ -19,7 +21,7 @@ OaksLab_Object: ;object_event 2, 11, SPRITE_GIRL, WALK, UP_DOWN, 9 ; person ;object_event 4, 11, SPRITE_SCIENTIST, STAY, NONE, 10 ; person ;object_event 11, 11, SPRITE_SCIENTIST, STAY, NONE, 11 ; person - object_event 4, 3, SPRITE_POKE_BALL, STAY, NONE, 28 ; person, Pikachu - object_event 5, 3, SPRITE_POKE_BALL, STAY, NONE, 29 ; person, Eevee + object_event 8, 6, SPRITE_POKE_BALL, STAY, NONE, 28 ; person, Pikachu + object_event 9, 6, SPRITE_POKE_BALL, STAY, NONE, 29 ; person, Eevee def_warps_to OAKS_LAB diff --git a/data/text_predef_pointers.asm b/data/text_predef_pointers.asm index ca6e0362..5f9aff3d 100644 --- a/data/text_predef_pointers.asm +++ b/data/text_predef_pointers.asm @@ -11,7 +11,7 @@ TextPredefs:: add_tx_pre PushStartText ; 05 add_tx_pre SaveOptionText ; 06 add_tx_pre StrengthsAndWeaknessesText ; 07 - add_tx_pre OakLabEmailText ; 08 +; add_tx_pre OakLabEmailText ; 08 add_tx_pre AerodactylFossilText ; 09 add_tx_pre Route15UpstairsBinocularsText ; 0A add_tx_pre KabutopsFossilText ; 0B diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index ba42e2dd..2c2c0669 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -55,10 +55,12 @@ Lobby_Coll:: Mansion_Coll:: coll_tiles $01, $05, $11, $12, $14, $1a, $1c, $2c, $53 -FossilLab_Coll:: ; It has the same tileset except the trees are the fossil machine, so... Lab_Coll:: coll_tiles $0c, $26, $16, $1e, $34, $37 +FossilLab_Coll:: ; Originally just the Lab collision, but now that Oak uses it, it's using separate collision. Added plenty just to be sure. + coll_tiles $0c, $26, $16, $1e, $34, $37, $17, $4C, $47, $58, $57, $59, $27, $4D + Club_Coll:: coll_tiles $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41 diff --git a/engine/events/hidden_objects/oaks_lab_email.asm b/engine/events/hidden_objects/oaks_lab_email.asm index b66babe0..0a244a35 100644 --- a/engine/events/hidden_objects/oaks_lab_email.asm +++ b/engine/events/hidden_objects/oaks_lab_email.asm @@ -1,10 +1,6 @@ -DisplayOakLabEmailText: - ld a, [wSpritePlayerStateData1FacingDirection] - cp SPRITE_FACING_UP - ret nz - call EnableAutoTextBoxDrawing - tx_pre_jump OakLabEmailText - -OakLabEmailText:: - text_far _OakLabEmailText - text_end +;DisplayOakLabEmailText: +; ld a, [wSpritePlayerStateData1FacingDirection] +; cp SPRITE_FACING_UP +; ret nz +; call EnableAutoTextBoxDrawing +; tx_pre_jump OakLabEmailText diff --git a/gfx/blocksets/fossillab.bst b/gfx/blocksets/fossillab.bst index 91f667919f1ff0d80d916c4e4c36a588b30a62ef..ba89bc108453d94300edde9140526cf2595530d1 100644 GIT binary patch delta 267 zcmZ3$zJPs#fq;ahgrte7iK#mjOmqlPfU#k;f}(|ifS{!z8@sx%kGQ-0#0?4x4vvma z0fB)*;Smv$Aa#yFejtz^0p(Bp@W243-_gn4Jut}K9ikE@>h2EI8-d`tyH8>=fa?L8 z?+7$MkWr0M4Tu;S)f^nv7`2qZ_Ih{*!Q3)Afk}%E;;hLNm^K)oyGscQ`1l#s5xpp0^rqOuJ0K!~3nY9B12}>sI10!Dj=)Hc;0QLFzy8vuY2Rzp zhyAd-&=GM~BJLgpHPBZV*FTD6xkzvVi;@uePQc(q6lFiU>H)KyFdoo95?TK9yq+N# z#YEGZ8pToEwEsRyz%(UHy<4H~eE%>r(}Pt_c#Lbk37*M+_F zGycbqA6Ij`q#r(i{#^DQ;o*-gsT`A(V|(ZdM~ScW)Q=x;&3{%O6f?!~t!N9tlbuO8 zqY@nw?z=t~LVS+??1AyZ@3$f!qK&Hk$XtFTvXyDx$<;JUIS zyAgDK&K20vI)6IdTd|ryi_wH?Et$R3PJk8Yd0{AlnM1UrPa&wko5%ZO5v^b+s0bj+ z6`2lgna@=_tm5e7ZpFJlvP4c)a)Kvcc;GWg4i{*iOrJh%A)`O&XP2Y#6wRJ1lFb2K zJAOpz>(Pc$pH8`>v;`n1Dmfu@RtxIzLdd{|2kxz4{(mi(@Oy{$z3cIL{K_D*Plf#Z z`8ez<%XM_mc%0R>1vw|1+`A3;jdm?W`f(SctG3D)*^ut4z*Za?EAT~Y+k#@oSWt{6 zC}(i>4S-<)uhD>^S%-I~i5`3dT$dmwAuw`dgF56SBBG7r-K1v|pJ56Ss}`1*0=KO+qZ8Q`St79iv$vy6+tA^$?S=DBy*bhTT&&tl2g!)`qR+QKY zN}%gc5+Bi=S3d*0qtJK2BoXK^rV6x>t*M;i<2tt3eQUNRyyB_=fIukGUJ#QY?!}Wk zl@p{7QAYeDSUTS3_YS(1P1yQ<;Y?44y`%*I6Q@^;-U_x>$&PXg`cREge`HJ2uz$V9 zCt%)c?hJj%P02p^GRgvoA3Iqj0p-pSBC<9ld z0a=?T26#n+CwFz?#XcV&ZHue_9ZZFLaD3qrEg~jdDA7!wRX6?9Kvs08Mp)hz*?6rR z-+adlkI5=NP{mPgvK!;$G2`B2Ox$A3W1C_RS^QNHFTMeAC>FqkJ%0rtRCLRci%ib)VwuOWX0=#?Uvs(&Cdx&=NO6X44%zyXU?=z~oB|F-mfk(-b z4_Wf{oe)onYJnhGvD)3xjfZF>7QxED4%rYIr-F?A;I^x|U9M>VbLg2UvHr)F6ZR}@ zD{2gHO6eG{;lY=JQ`8R&Ja3Ps6gPV{2( zd9KE<`h;R6d>&-%kKl{^%VfvR3n1=vv84c30q)qEfD8pP3u;#Y9dT?N)A^qzJ<1iY zasnLXNPxQl9Djv19`TRZi(CD9OytF!PuI;0U~dvMeih(uhfI=i6xQcEPI6iRO1w@) zPtch#kLCd8x%tmPP$F-^Tb=@5;4%5$SM?)fQlR?jd?w7v+^>ED(6-vqQ5Vp!g7-Io zFPVSS(?+%pD60-1dq}k9N21eo3A| z_kk>?dXZNtfTLu=MV`SKiIR;dq4TqwKl}L%G2u!yJ9`T^F8~7INA)To^!c&LGXc_= zD53jc()bu?w=p4(uU=!3F2P&y*8?c&w5eUk{FIx219S=Mpm-`9t3Gk|x+2|szAH5R si|^$unIl=dP6z&R&6aWh&GmTq4}a9cu()wvdjJ3c07*qoM6N<$f?d5(sQ>@~ delta 2171 zcmV->2!!|O5xNnOR)0@PL_t(|Ue%ggQXDxDMZv)eao8VbeehudZ_&f);WF3hOes~5 zhB*;(R+XewzND^hbNl<1n*q@jlwK1?CICUPU%U9o6$aYei-oN_cE{p8$euzjvbZy3gQ5@ng~P#E*2y zw$T_T+C7^$^3#2sU4z!*nfhD`V&WeIanr?3Gs4FnasoKfFpLH_y877QxjVre@UhY( zy%EOxnj_F7KYwOp&tkNG7NZW8FPXl>PJj`N^TJR9GlO`}cnU%Nvvs^b7SRZHf{Fm5 z9FdLTS!Q$f97b{Ud1rC>36SB*7o#EoeV(ZhST9?Xd-Y2Szjj=Q>x_DQT!l^>QLQ<8 z9@mug^%X1iai7I?m8+ZpnX#kfJ1T_A*)8@saegK{bbrT1v`%DoeP?CP^ml+6dZEBr zwG}Xyrky0m1-kvHmU9{(&6hn;*&-bpt0G%v&s>2m@@)mhOdCTn>cBk32L|Gx=&KS1u7A%RV?A0-1~xHnW{1WwpE;F;*_e_2 zBe0*j*rND#VIKA?CbG2)w!`HeAd)%MbrOSC+DxyHUB%~mt58r}X3sK|z)>PQW40n& zyG^7gfRdtMReh^fcLweZY}pB0{n#^C5Km&cS`^Il6JRT80mPsRoQ(yb`wH~U98^EL zx_=Tn0gzu6(kGo=m`4NIwL*8!{r&w#{`&Rn{aWx0vgbZ;#9uFg7)D|#0(Y>J>^&$T zE3(6^K(vErg%XMDXX{93)`t%jkB^TR`S9>?kw8MTB8X&TGJT?a2f%o5-GFapmh33I zU^{av>5wQT%Vl)8qI? zP@g}mHVR{-E@yNC&gh;DTS zJw3f$^&!}^fJb7oqZFR(PT~c6MonuVz3G{wSgB=rq9awG>x?gzmu~?WS`m$;2q=y? zkHpJpu6?JoXslS+QUt5W&XEKay{@}-Pc5zE$c7BxI9&V2;yxx)c%RSLb${gY5-8)i zmP2lsUwiU1rz)sUiXs-r3T{Ui*;z?vi~bo}Bd!JUSxk~P4GC22M2unV6fl8bmn$nWYI+fbkdkB{V_JaDMm<_ zbPGL`{um#R8P^_T;ud2bpDFf`#a{(+`Ll30#vPp{U*oqFfRG_8FJ3U(2@ZCSz{gPm z=sshn8@hIW6qf=x%ScZuFMM95UL1RvB|-hw4z7~xcwxl#&|4KRaeuA)1oJyKWMGS$ zY>RTnUB}3+MBOAm9#t?pL7;L3CuhN9E)?r+x>j*|RWXLXTiAj%g z#QXmRF!)GZU-oq`+x<#-RS+372djkf%=;8j;R(SPFP5k?23!(mr>pCUHdI90vbEiY z5vTtYTz%Kil21|4RDTFUjzkGKI%*md$(~ij-O0Vr_kg?H0&_<#!n15`$r+~?fTQDo z^lMf|+hM40me(aG{Z!5^2D6c`acGrfh6aWd2$&cR(=;KtN#gBl>LG_WaN(vJ0 zErPz-L_C_~M*wJilxKq-tX0Vwr~f^G5)Z!fNpySnPB7l+J1wbrW|c__)VD|2Ud`V>pUG)_iTJ7r@peX#Oa`Ri79oXfLdfe*E(t zC)q6kC0-wio`0YtVIBY2Wu2@1O`sBa2D2cm_*5*J+=3TXmVEilb=8lINr7wpH#uvv z_Eic1M+J^oJCbC?u_6oJ3P&bC676!Srg539h`)zyrFyxBs}umi?mF#>)z~VyE1Z>l zIKsY)DtWOuy5k~ODS*9X!9}icR`Nl~juK{e`q+&44RlH$6*1vTG)Mair~eQ{0QjsS z=(JHl=+ihKTS?$WX4C}w&Pe_Y5|n>k`E-Eovs4sk88X*)IaCu<{wKhN~UeK?_K}^002ovPDHLkV1oX&9+3b5 diff --git a/maps/OaksLab.blk b/maps/OaksLab.blk index 0e87062e..91d6bb9a 100644 --- a/maps/OaksLab.blk +++ b/maps/OaksLab.blk @@ -1 +1,2 @@ -hhhghhhijijmnmnhhhhhh \ No newline at end of file +  # (   + 6 \ No newline at end of file diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 052f2225..e820cc45 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -285,25 +285,31 @@ OaksLabScript8: ld de, .PikachuMovement1 jr z, .moveBlue .PikachuMovement1 - db NPC_MOVEMENT_LEFT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_DOWN db -1 ; end .Eevee ld de, .EeveeMovement1 - ld a, [wYCoord] - cp 4 ; is the player standing below the table? - jr z, .moveBlue - ld de, .EeveeMovement2 +; ld a, [wYCoord] +; cp 4 ; is the player standing below the table? +; jr z, .moveBlue +; ld de, .EeveeMovement2 jp .moveBlue .EeveeMovement1 +; db NPC_MOVEMENT_DOWN +; db NPC_MOVEMENT_LEFT +; db NPC_MOVEMENT_LEFT +; db NPC_MOVEMENT_UP + db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_LEFT - db NPC_MOVEMENT_LEFT - db NPC_MOVEMENT_UP db -1 ; end -.EeveeMovement2 - db NPC_MOVEMENT_LEFT - db NPC_MOVEMENT_LEFT +;.EeveeMovement2 +; db NPC_MOVEMENT_LEFT +; db NPC_MOVEMENT_LEFT db -1 ; end .moveBlue @@ -323,9 +329,20 @@ OaksLabScript9: ; This is where Blue picks up the ball and removes the sprite. ld [wJoyIgnore], a ld a, $1 ldh [hSpriteIndex], a + + ; So when using this new table system, we actually need to add cases for when you have the new starters... + + ld a, [wPlayerStarter] + cp STARTER4 + jr z, .skip + cp STARTER5 + jr z, .skip + ; Since he's just moved down, we just need to skip this process. It's actually harder for him to pick up the regular starters! ld a, SPRITE_FACING_UP ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay +.skip + ld a, $d ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -361,11 +378,21 @@ OaksLabScript9: ; This is where Blue picks up the ball and removes the sprite. ld [wcf91], a ld [wd11e], a call GetMonName + + ; why does he do this twice why does he do this twice why does he do this twice + ld a, [wPlayerStarter] + cp STARTER4 + jr z, .skip2 + cp STARTER5 + jr z, .skip2 + ld a, $1 ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay + +.skip2 ld a, $e ldh [hSpriteIndexOrTextID], a call DisplayTextID @@ -803,6 +830,7 @@ OaksLab_TextPointers: dw OaksLabText27 dw OaksLabTextPikachu dw OaksLabTextEevee + dw OakLabEmailText OaksLab_TextPointers2: dw OaksLabText1 @@ -1368,3 +1396,15 @@ PikachuEeveeShows: db HS_DAMIEN ; Charmander guy db HS_VERMILION_JENNY ; Squirtle db -1 ; end + +; Moved here to turn into a new bg event +OakLabEmailText: + text_asm + call EnableAutoTextBoxDrawing + ld hl, OakLabEmailTextGet + call PrintText + jp TextScriptEnd + +OakLabEmailTextGet: + text_far _OakLabEmailText + text_end From 84cf9e9bff3769531fb974a4e5ce91fc82e64743 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 26 Dec 2023 12:26:16 +0000 Subject: [PATCH 06/30] Oak's Lab improvements - Fixed some collision on the back wall - Made the exit tiles more obvious --- data/tilesets/collision_tile_ids.asm | 2 +- gfx/blocksets/fossillab.bst | Bin 928 -> 944 bytes gfx/tilesets/fossillab.png | Bin 2280 -> 1734 bytes maps/OaksLab.blk | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index 2c2c0669..c0433d36 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -59,7 +59,7 @@ Lab_Coll:: coll_tiles $0c, $26, $16, $1e, $34, $37 FossilLab_Coll:: ; Originally just the Lab collision, but now that Oak uses it, it's using separate collision. Added plenty just to be sure. - coll_tiles $0c, $26, $16, $1e, $34, $37, $17, $4C, $47, $58, $57, $59, $27, $4D + coll_tiles $0c, $26, $16, $1e, $34, $37, $17, $4C, $47, $58, $57, $59, $27, $4D, $4F Club_Coll:: coll_tiles $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41 diff --git a/gfx/blocksets/fossillab.bst b/gfx/blocksets/fossillab.bst index ba89bc108453d94300edde9140526cf2595530d1..6b5d55b39b21f9ebf97f899a6004f1da839bada0 100644 GIT binary patch delta 36 dcmZ3$zJYy$0f!P4Y_!N=7I23Ge;_ai0sy6h2OV1ZP1_K>z@;j|==^1poj5 z24YJ`L;(K){{a7>y{D4^00tpRL_t(|oZXviZrm^og!haAa(~49$t7DjDBH%Y?6b1qJ`Dhs0(3HYcu+~785rHbjRdtDz)THPebr{C z0?a7y76pj&%zwGpJ-i=(D+{OK5~C)noQeHc&q3R<1XNIDb;$ZuRSU1fy%X zTMkB+0QB811=tF}4h6^xL!j1S90%4%M{*|5IAXS_F@KLhGZTE}>!S)#IUpXoQvsY@ zBLM7_M*%Qn@%${fIMxvWI%9_Of3H)W^^={?0L)|pXEZB-1HetL3&5=Oue8Pay0N-B zAOzu~j#&WQ?l}t=QGg793HpW`e+7L;UOjIK?Xg$R?d-t^#1hG5}P6ycVBQ zfNbsxmS+NB#J&N5S>YVO1IHkYPGHqK01Re=oPR5xI|bmQ3pgKl05Dr_qvSlBDF7xj zA$3xv04w%z0A`$r^*b_$%AzbBFmmiVAj`haKBS{S*zaiIJN4e)-o6aa@mhAB>!gN( zZ&L&HcL6X1K?eZk^h}m#1DF96_bY(dK0ZFajDxHG?$p8lgpIuho&w;W3Xla;?GgA| zoPVDHKn2WYeRl2u5UTL~OJK(kfYHoR&X00J0npi%0^s~&Zc+GrCjgka6#$vEyLt)$ z=wt1-fLBle&e{wB4)!wx(6uQ5(6K6*Cjgj%U{nE|3OUfbZD!2@u*0SRaKS_;yn+H$ z<2$tp?7l^G0ElZ{TLwTmQYpYHo%c|HYJWeo62KK7MB5Ai4BQL=>e>$gN)HMUI_;6g#mKQMrVl`1wh&5Gu+&~9`SpSp)@IHY7#63V~ zzmQ$a0O0e^ocW&Xs|`SB7ux|KQ-SKuqx(iOs{q-?P;C@B^E<&0rQ(81SmzUN9HWg| zZt)(sSD%Z&=22yM7l3LB;PolacYo}nR}>)Y6Mdn87=2^tDgb9R2bF!Cz4mc?wsa4` z&gpD$I-5ZLLKXK%9GPXSv#PjF9^PkFK|reDD?i3Hl_W~GJ3D;k`^^7;=fiU4vLmw@ z0J3k|yREaFsH_ZlRslObzhyf)NG#d9bUMJD3>^i8703m@Dz3k5d@=9q$bb6`x9>>C zxcq4zFJKz{|miUK$QD&>0_1;C)HH-Ksha0*aOunT~?hsvOWj{#G* zLjfv#dIeB{uYUbfdw^L5=$kGvL|(w*s70 z0UY1#CKZEHEs3k9o^^Kxr~;ZfIL3&_dr9U=1#kfD8sEbK!2T-$REDeIcO9(28d;vQ zdf2y9fK>ph4KfGW{Yv<<0IVoL1;9v_X8<^OI)FII9W45^^Owr*2X zl`I=)*Lwu31Hh^RWG}%~AI_>a4*_7c>;T}TjVi~i0;uazM%&@>H^PL~2^_tu!~g&Q M07*qoM6N<$f;M6Rz5oCK delta 2268 zcmV<22qX8#4d@Y&B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ie z000ie0hKEb8vpdQ%( zRn?_#Tb5->cK6|O|NDu%1wViOy!-U&Qz_y8{{AAj(oFqqcYmdaj{G=6wyp}-g}w7L z{>P6WS980hA3lHnT=pH|;g2k-9Fvq|d*}*BiLdn3j~{Q%Rv#2I#qq6Z3&4||NjRet z9TM)lJ{CfJj{fX{@xt%7A|IlSs{P1Zk#0i?kL}?TKydHRPF%d6GdNNFSadw`D;x4{ zrQ<}uyK$>^`hOa`d(d38sn4Y#CjJ_Tn=Wpe6|Q^A3E)J>a2nj{>a{_;FM=`Py0Rm? z5p;dd71+@_I^A2bnm>!tgla9Bz0*#B73g_kD1n(nw4+ZUsK1-X`(qKUU?->uAj%b) z4sDswRXeQW=;Ln1yFao-PE>M&CtrBrGe`~>Xr4@;K7VW>qd(|pm!t6%&7Lcg%>i9I zenjc((S}i?+H3bkBI4)wKmVC!5^64fl<9Ekycp7ow}S$`{#??yA6692qO{MQhuFV#Zidj3y{& zaPKz86rfU9+6NVgj!za(MHJdWEq3&pS^7Rhq~ zum}xaIYyrrTaEBUUGd@-&;@M@36d?{ zM_Hi&`*`7nHCd#Obyj0#U-JJ*<$D(Qt8V~L0QZ^fa2*9Z$`1Df7^k)=)43eY=W7;Q z=YMVFyT?Bg`z{5bM&F$t0GCb{;Io5t#9lQvt|OAIRnL`8VnO^QGbTEF+51Z3#rOBV z%zp;Ng>U^p(|E>JLDU8iu6y)@kV3$AwwYEiF8Z~H7ylk$x)@)4SII1_TcG-VcXSda z0npCP#)F={Z35%CKz6q<9rNMChl_lCe0;tav_aPH<5pZ=0ZM$e10t@k03SsG*&-*P zJ7McO;`~`5%4XKL^6T5TZx{LX>(`3}5`UT%K_t`3?1^_IbDH>DQYE>PQ_zk2*wE#W zC?(5fc7F@HWr*eYy9UmL}gmheYI_FlD*a=FY z>rWCN(VSO51G}TpcfceO=rE=Vw2-Z-oZ{m;w%C1ZwkEvdssMmMDA8UJlOXQJlYcvv z6QmDOM*JgKI^O2@4!V_1*!q3pOizZrqy+#Ir&o*K3bt0sj&ch6P>oT4WJ}Vpy~QVB z-fHd)eaKD8KKL@q0*D_wSwL9yBv30I1rDj?PUVD74_mPHO1J`n%&00YRxZy`H`>*%@FG;3x3Bzh-1khf#)!v6dP4VZ zXN8ZQQtkL(zkdC>ySw}N@#CMnf64kLC&xn;06`$s-z^k0p(nZeiSqsX_kX)DU%p%g zSV{KX!E*sy*#_}(oe$Mq?uUr6%02)|bWFae`c^jYp8}g!0FGsjgB+Lh zB%I`HA|_Fr&~rQi-oJnUoY++{I!X%qs}l?;9IYdh^hdDi?fA!BDo*-W<0G2SQ5!ai zn-b$O^n0;dbL?B$(wyZ-pnr&t?}h5DiU1Uh2?{<}hXTEl6XcsD<0i>x4wp`BQ<8*s zGl|MJl#^{XA1{=6@sI@|bGE}BjLvCcUIeuHaWzfER+QvQ#(9-gwJR2qK;I@Hb>hW7A0KUttN$HLg?n&(;Snt&CR`}dOrBLY{nJ2JbbqHtSl$)cc&!`X ze8&rq$tpfj#Zhgt8{^|K@H{8bPyz5#G37Qlo(1t8?et>_X2(os^B z^ws-TbOqLpe`_u$z^$D0;PBP&RqDlYgf78d|D?!cfjAUPRRqMfE08$9+oLb@Pktad zrF5Ukj?13|bWZLi+J7eb@u-5;2?EtZSR~hqNf1`AA%6wvl`ye+21?`#>8#|6=U)Nc zL|but?EXl$`<3vjATqiIPS>SG3oi<6=s7C_1v*OTPS?zT_u20=s<|aQ+Mj_($&wFQ z^7Wk%Pl;-QAX%~6-O!DPXd@QE%D)cT5E`d~jQ!xYtGQjSXn+56=$R<7{>PRR_AG2G zB-O7i+{(X+jcV?x53f=HBs?ZR{wko4Q-LeK0;&b7kAzin3ije9;_D&40zmpv9zlM@ zOMQSJ+*h)L7u3^t+P{D4b0*l6&1~0`XnhC7gbRHWu$XLtF)VkCSXWPj|B;EVjrWXH`5AntUrr2tj|?%0}u3vztHr`3y1PN;Err3pXzS0^mpWDj@XvvB@(5(wHcr z`(V=e7*%MuF(HnxUSp9i!CUax11RaVsa?nXl$(D8bP4L9cq$vKK5_QCBHeqwD>VFz q@8v9+S-VaL{&CHgasSQrc=r!~)WWd1ab9}>0000 Date: Tue, 26 Dec 2023 14:59:02 +0000 Subject: [PATCH 07/30] Changing a default player name for Green I know that some people are gonna ask if 'Seren' is a misspelling of 'Serena', so I'm changing it so we won't get questions like that. It's now Elaine, which is the name of the LGPE protag so...kinda works Also changed an inconsistency in Erika's 6 badges party where her Cactormus was a higher level than it should've been --- data/player_names.asm | 2 +- data/player_names_list.asm | 2 +- data/trainers/scaled_parties.asm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/player_names.asm b/data/player_names.asm index 3c65c57b..6aec50fb 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -9,7 +9,7 @@ DefaultNamesGirl: db "NEW NAME" next "GREEN" next "LEAF" - next "SEREN" + next "ELAINE" db "@" DefaultNamesRival: diff --git a/data/player_names_list.asm b/data/player_names_list.asm index a0ac7579..f5c06f6a 100644 --- a/data/player_names_list.asm +++ b/data/player_names_list.asm @@ -8,7 +8,7 @@ DefaultNamesGirlList: db "NEW NAME@" db "GREEN@" db "LEAF@" - db "SEREN@" + db "ELAINE@" DefaultNamesRivalList: db "NEW NAME@" diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index f32e42ee..11a527db 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -41,7 +41,7 @@ ErikaData: db $FF, 29, WEEPINBELL, 28, PARASECT, 28, CACTORMUS, 29, TANGELA, 31, BELLOSSOM, 0 ; 3 db $FF, 38, VICTREEBEL, 37, PARASECT, 37, CACTORMUS, 38, TANGELA, 40, BELLOSSOM, 0 ; 4 db $FF, 41, VICTREEBEL, 40, PARASECT, 40, CACTORMUS, 41, BELLOSSOM, 43, TANGROWTH, 0 ; 5 - db $FF, 45, VICTREEBEL, 44, PARASECT, 45, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6 + db $FF, 45, VICTREEBEL, 44, PARASECT, 44, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6 db $FF, 47, VICTREEBEL, 46, PARASECT, 46, CACTORMUS, 48, BELLOSSOM, 48, LEAFEON, 50, TANGROWTH, 0 ; 7 (unused) db $FF, 62, BELLOSSOM, 62, TOEDSCRUEL, 61, ELECTRODE_H, 61, LEAFEON, 62, VENUSAUR, 65, TANGROWTH, 0 ; 8 (postgame) From 602013ca5193c9ff5d6d879e8119e3dbc86cb536 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 26 Dec 2023 17:14:39 +0000 Subject: [PATCH 08/30] Pre-Champion Boss trainer movesets! (finally! again!) Now. Please. I beg of you. Do not change any more level up movesets unless necessary. I will not be going back to check these again. Doing this is pain. --- data/trainers/scaled_parties.asm | 4 +- data/trainers/special_moves.asm | 118 +++++++++++++++++-------------- 2 files changed, 68 insertions(+), 54 deletions(-) diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index 11a527db..38237f16 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -4,7 +4,7 @@ BrockData: db $FF, 11, GEODUDE, 12, DECILLA, 14, ONIX, 0 ; 0 badges db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1 - db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0 ; 2 + db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 25, ONIX, 0 ; 2 db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3 db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, DECILLA, 40, STEELIX, 0, ; 4 db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, GAWARHED, 43, STEELIX, 0 ; 5 @@ -27,7 +27,7 @@ LtSurgeData: db $FF, 11, VOLTORB, 12, PIKACHU, 14, GAOTORA, 0 ; 0 badges db $FF, 19, VOLTORB, 18, PIKACHU, 19, GAOTORA, 21, ELECTABUZZ, 0 ; 1 db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNETITE, 23, ELECTABUZZ, 25, RAICHU, 0 ; 2 - db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, RAICHU, 0 ; 3 + db $FF, 29, VOLTORB, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, RAICHU, 0 ; 3 db $FF, 38, ELECTRODE, 37, GOROTORA, 37, MAGNETON, 38, ELECTABUZZ, 40, GOROCHU, 0 ; 4 db $FF, 41, ELECTRODE, 40, GOROTORA, 40, MAGNETON, 41, ELECTABUZZ, 43, GOROCHU, 0 ; 5 db $FF, 45, ELECTRODE, 44, GOROTORA, 44, MAGNEZONE, 45, ELECTIVIRE, 47, GOROCHU, 0 ; 6 diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index 1d3aa0f8..e163785e 100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -21,7 +21,7 @@ SpecialTrainerMoves: db YUJIROU, 4 ; Yujirou 3 badges db 2, 1, DIG - db 3, 4, THUNDER_WAVE + db 3, 4, SING db 4, 2, PECK db 4, 3, CUT db 5, 3, WRAP @@ -33,8 +33,7 @@ SpecialTrainerMoves: db 1, 3, SCREECH db 1, 4, BODY_SLAM db 2, 4, DIG - db 3, 1, SING - db 3, 3, THUNDER_WAVE + db 3, 3, SING db 4, 2, PECK db 4, 3, CUT db 5, 2, SWORDS_DANCE @@ -136,7 +135,7 @@ SpecialTrainerMoves: db 0 db BROCK, 5 ; Brock 4 badges - db 1, 3, MEGA_PUNCH + db 1, 3, ROCK_SLIDE db 2, 1, SURF db 2, 4, HORN_ATTACK db 3, 2, BUBBLEBEAM @@ -148,11 +147,12 @@ SpecialTrainerMoves: db 0 db BROCK, 6 ; Brock 5 badges - db 1, 1, MEGA_PUNCH - db 1, 3, ROCK_SLIDE + db 1, 1, SELFDESTRUCT + db 1, 2, ROCK_SLIDE db 2, 3, SURF db 2, 4, ICE_BEAM db 3, 1, SURF + db 3, 2, ROCK_THROW db 3, 3, SWORDS_DANCE db 4, 1, SUBSTITUTE db 4, 4, DOUBLE_EDGE @@ -162,11 +162,11 @@ SpecialTrainerMoves: db 0 db BROCK, 7 ; Brock 6 badges - db 1, 1, MEGA_PUNCH - db 1, 2, ROCK_SLIDE + db 1, 1, SELFDESTRUCT db 2, 2, SURF db 2, 3, ICE_BEAM db 3, 1, SURF + db 3, 2, ROCK_THROW db 3, 3, SWORDS_DANCE db 4, 1, ROCK_SLIDE db 4, 3, DOUBLE_EDGE @@ -192,7 +192,12 @@ SpecialTrainerMoves: db 2, 2, THUNDER_WAVE db 0 + db RIVAL1, 14 ; Cerulean City Rival w/Eevee + db 1, 1, PECK + db 0 + db RIVAL1, 15 ; Cerulean City Rival w/Pikachu + db 1, 1, PECK db 4, 1, THUNDERSHOCK db 0 @@ -227,13 +232,19 @@ SpecialTrainerMoves: db RIVAL2, 2 ; SS Anne Rival w/Ivysaur db 3, 1, THUNDER_WAVE + db 4, 1, TACKLE db 0 db RIVAL2, 3 ; SS Anne Rival w/Charmeleon db 3, 1, THUNDER_WAVE db 0 + + db RIVAL2, 4 ; SS Anne Rival w/Eevee + db 1, 1, PECK + db 0 db RIVAL2, 5 ; SS Anne Rival w/Pikachu + db 1, 1, PECK db 4, 2, THUNDERSHOCK db 0 @@ -248,7 +259,7 @@ SpecialTrainerMoves: db 2, 1, THUNDERSHOCK db 3, 4, THUNDER_WAVE db 4, 3, THUNDERBOLT - db 5, 4, THUNDER_WAVE + db 4, 4, THUNDER_WAVE db 0 db LT_SURGE, 3 ; Surge 2 badges @@ -316,6 +327,7 @@ SpecialTrainerMoves: db RIVAL2, 6 ; Pokemon Tower Rival w/Wartortle db 1, 4, MIMIC + db 2, 1, BITE db 3, 3, LEECH_SEED db 3, 4, CONFUSION db 4, 1, THUNDER_WAVE @@ -325,8 +337,9 @@ SpecialTrainerMoves: db 1, 4, MIMIC db 2, 3, BUBBLEBEAM db 2, 4, BIDE + db 3, 1, BITE db 4, 1, THUNDER_WAVE - db 5, 1, CUT + db 5, 3, CUT db 0 db RIVAL2, 8 ; Pokemon Tower Rival w/Charmeleon @@ -336,7 +349,7 @@ SpecialTrainerMoves: db 3, 3, BUBBLEBEAM db 3, 4, BIDE db 4, 1, THUNDER_WAVE - db 5, 4, CUT + db 5, 3, CUT db 0 db RIVAL2, 9 ; Pokemon Tower Rival w/Eevee @@ -386,7 +399,7 @@ SpecialTrainerMoves: db ERIKA, 3 ; Erika 2 badges db 1, 2, GROWTH db 1, 4, VINE_WHIP - db 1, 1, CUT + db 2, 1, CUT db 4, 2, CUT db 5, 3, MEGA_DRAIN db 0 @@ -430,8 +443,8 @@ SpecialTrainerMoves: db ERIKA, 7 ; Erika 6 badges db 1, 3, ACID db 2, 2, MEGA_DRAIN - db 3, 1, EARTHQUAKE - db 3, 3, VINE_WHIP + db 3, 2, EARTHQUAKE + db 3, 4, VINE_WHIP db 4, 2, MEGA_DRAIN db 4, 4, ACID db 5, 1, BIND @@ -455,7 +468,7 @@ SpecialTrainerMoves: db KOGA, 3 ; Koga 2 badges db 2, 4, WATER_GUN db 3, 2, POUND - db 4, 1, TOXIC + db 4, 2, TOXIC db 5, 2, TOXIC db 5, 3, SCREECH db 0 @@ -467,7 +480,7 @@ SpecialTrainerMoves: db 2, 4, ACID db 3, 1, BODY_SLAM db 3, 2, DISABLE - db 4, 4, TOXIC + db 4, 1, TOXIC db 5, 1, WING_ATTACK db 5, 2, TOXIC db 5, 4, SCREECH @@ -492,27 +505,27 @@ SpecialTrainerMoves: db 1, 3, MEGA_DRAIN db 2, 1, TOXIC db 2, 2, SURF - db 2, 4, WRAP + db 2, 3, WRAP db 3, 3, BODY_SLAM db 3, 4, TOXIC - db 4, 1, TOXIC + db 4, 4, TOXIC db 5, 1, TOXIC db 5, 2, FLY db 0 - db BLACKBELT, 2 ; Koichi 1 badge + db KOICHI, 2 ; Koichi 1 badge db 2, 3, TACKLE db 3, 4, TACKLE db 4, 3, TACKLE db 0 - db BLACKBELT, 3 ; Koichi 2 badges + db KOICHI, 3 ; Koichi 2 badges db 3, 3, TACKLE db 4, 4, TACKLE db 5, 3, TACKLE db 0 - db BLACKBELT, 4 ; Koichi 3 badges + db KOICHI, 4 ; Koichi 3 badges db 2, 3, LEER db 2, 4, UPPERCUT db 3, 3, MEGA_KICK @@ -522,7 +535,7 @@ SpecialTrainerMoves: db 5, 4, DIG db 0 - db BLACKBELT, 5 ; Koichi 4 badges + db KOICHI, 5 ; Koichi 4 badges db 1, 4, ROCK_SLIDE db 2, 2, LEER db 2, 3, DIG @@ -532,7 +545,7 @@ SpecialTrainerMoves: db 5, 2, DIG db 0 - db BLACKBELT, 6 ; Koichi 5 badges + db KOICHI, 6 ; Koichi 5 badges db 1, 4, ROCK_SLIDE db 2, 1, LOW_KICK db 2, 2, LEER @@ -542,7 +555,7 @@ SpecialTrainerMoves: db 5, 2, DIG db 0 - db BLACKBELT, 7 ; Koichi 6 badges + db KOICHI, 7 ; Koichi 6 badges db 1, 3, ROCK_SLIDE db 1, 4, EARTHQUAKE db 2, 1, LOW_KICK @@ -554,15 +567,15 @@ SpecialTrainerMoves: db 5, 2, DIG db 0 - db BLACKBELT, 8 ; Koichi 7 badges + db KOICHI, 8 ; Koichi 7 badges db 1, 1, ROCK_SLIDE db 1, 2, LOW_KICK db 1, 3, EARTHQUAKE - db 2, 1, PIN_MISSILE - db 2, 2, UPPERCUT + db 2, 3, PIN_MISSILE + db 2, 4, UPPERCUT db 3, 1, LOW_KICK db 3, 2, ROCK_SLIDE - db 3, 3, DIG + db 3, 4, DIG db 4, 1, MIMIC db 4, 2, MEGA_KICK db 4, 3, MEDITATE @@ -571,12 +584,12 @@ SpecialTrainerMoves: db 6, 1, DIG db 0 - db BLACKBELT, 9 ; Koichi 8 badges + db KOICHI, 9 ; Koichi 8 badges db 1, 1, ROCK_SLIDE db 1, 2, EARTHQUAKE db 1, 3, SUBMISSION - db 2, 1, PIN_MISSILE - db 2, 2, UPPERCUT + db 2, 2, PIN_MISSILE + db 2, 3, MEGA_PUNCH db 3, 1, LOW_KICK db 3, 3, ROCK_SLIDE db 3, 4, DIG @@ -593,7 +606,6 @@ SpecialTrainerMoves: db 4, 2, BARRAGE db 4, 4, CONFUSION db 5, 2, THUNDER_WAVE - db 6, 1, BODY_SLAM db 6, 2, MEGA_DRAIN db 6, 3, SURF db 0 @@ -604,8 +616,7 @@ SpecialTrainerMoves: db 3, 1, SURF db 4, 1, DIG db 5, 2, THUNDER_WAVE - db 6, 2, BODY_SLAM - db 6, 3, GROWTH + db 6, 3, LEECH_SEED db 0 db RIVAL2, 13 ; Silph Co. Rival w/Charizard @@ -615,9 +626,8 @@ SpecialTrainerMoves: db 3, 4, CONFUSION db 4, 1, SURF db 5, 2, THUNDER_WAVE - db 6, 1, FLY - db 6, 2, BODY_SLAM - db 6, 3, FLAMETHROWER + db 6, 3, SEISMIC_TOSS + db 6, 4, FLY db 0 db RIVAL2, 14 ; Silph Co. Rival w/Umbreon @@ -635,7 +645,7 @@ SpecialTrainerMoves: db RIVAL2, 15 ; Silph Co. Rival w/Raichu db 1, 3, DIG db 1, 4, SWORDS_DANCE - db 2, 1, BARRAGE + db 2, 2, BARRAGE db 2, 4, CONFUSION db 3, 1, CONFUSE_RAY db 3, 4, FLAMETHROWER @@ -666,14 +676,14 @@ SpecialTrainerMoves: db 0 db SABRINA, 2 ; Sabrina 1 badge - db 1, 3, WATER_GUN + db 1, 4, WATER_GUN db 3, 1, PSYWAVE db 4, 3, PSYWAVE db 4, 4, REFLECT db 0 db SABRINA, 3 ; Sabrina 2 badges - db 1, 4, WATER_GUN + db 1, 2, WATER_GUN db 3, 3, LEECH_SEED db 3, 4, CONFUSION db 4, 1, PSYWAVE @@ -682,6 +692,7 @@ SpecialTrainerMoves: db 0 db SABRINA, 4 ; Sabrina 3 badges + db 1, 1, CONFUSION db 1, 4, WATER_GUN db 2, 3, PSYWAVE db 2, 4, REFLECT @@ -725,7 +736,7 @@ SpecialTrainerMoves: db BLAINE, 3 ; Blaine 2 badges db 2, 3, EMBER - db 3, 4, DIG + db 3, 2, DIG db 4, 1, CUT db 5, 2, LEER db 5, 3, SMOG @@ -735,9 +746,9 @@ SpecialTrainerMoves: db BLAINE, 4 ; Blaine 3 badges db 1, 1, EMBER db 2, 2, EMBER + db 3, 1, BITE db 3, 2, DIG - db 4, 1, CUT - db 4, 4, GROWL + db 4, 2, EMBER db 5, 2, LEER db 5, 3, SMOG db 5, 4, FIRE_PUNCH @@ -794,8 +805,10 @@ SpecialTrainerMoves: db 3, 3, SKULL_BASH db 3, 4, BONEMERANG db 4, 1, ROCK_SLIDE + db 4, 2, BODY_SLAM db 4, 3, DOUBLE_KICK db 5, 1, THUNDERBOLT + db 5, 2, THRASH db 5, 3, DOUBLE_KICK db 6, 1, FISSURE db 6, 3, STOMP @@ -828,9 +841,9 @@ SpecialTrainerMoves: db 4, 1, FIRE_BLAST db 4, 2, DIG db 4, 3, AGILITY + db 4, 4, DOUBLE_EDGE db 5, 1, THUNDER_WAVE - db 6, 1, BODY_SLAM - db 6, 2, LEECH_SEED + db 6, 3, LEECH_SEED db 0 db RIVAL2, 18 ; Route 22 Rival w/Charizard @@ -844,7 +857,7 @@ SpecialTrainerMoves: db 4, 3, SURF db 5, 1, THUNDER_WAVE db 6, 1, FLY - db 6, 2, BODY_SLAM + db 6, 3, FIRE_SPIN db 0 db RIVAL2, 19 ; Route 22 Rival w/Umbreon @@ -854,7 +867,7 @@ SpecialTrainerMoves: db 2, 2, HYPNOSIS db 2, 3, PSYCHIC_M db 3, 1, THUNDERBOLT - db 3, 2, DOUBLE_TEAM + db 3, 4, DOUBLE_TEAM db 4, 1, CONFUSE_RAY db 4, 2, REFLECT db 4, 4, FIRE_BLAST @@ -902,7 +915,7 @@ SpecialTrainerMoves: db BRUNO, 1 db 1, 3, MEDITATE db 2, 1, EARTHQUAKE - db 2, 2, ROCK_SLIDE + db 2, 3, ROCK_SLIDE db 2, 4, EXPLOSION db 3, 1, THUNDERBOLT db 4, 1, SUBMISSION @@ -914,15 +927,14 @@ SpecialTrainerMoves: db 0 db AGATHA, 1 - db 1, 1, LOW_KICK + db 1, 1, MEGA_PUNCH db 1, 2, ROCK_SLIDE - db 1, 3, MEGA_PUNCH db 2, 1, MEGA_DRAIN db 2, 3, CONFUSE_RAY db 2, 4, FLY db 3, 1, THUNDERBOLT db 3, 2, EXPLOSION - db 4, 1, WRAP + db 4, 3, WRAP db 4, 4, EARTHQUAKE db 5, 1, REST db 5, 3, TOXIC @@ -962,8 +974,9 @@ SpecialTrainerMoves: db 5, 1, PSYCHIC_M db 5, 2, SLEEP_POWDER db 5, 4, SOLARBEAM - db 6, 2, BLIZZARD + db 6, 1, BLIZZARD db 6, 3, BODY_SLAM + db 6, 4, PETAL_DANCE db 0 db RIVAL3, 2 ; Champion Rival w/Venusaur @@ -980,6 +993,7 @@ SpecialTrainerMoves: db 5, 4, DOUBLE_EDGE db 6, 1, SOLARBEAM db 6, 3, BODY_SLAM + db 6, 4, SLEEP_POWDER db 0 db RIVAL3, 3 ; Champion Rival w/Charizard From bdf89fd6d237a4f2473a27d1cccd1fbc2dcfbacf Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Wed, 27 Dec 2023 11:20:39 +0000 Subject: [PATCH 09/30] Safari Zone tweaks Added some Cubones since it's featured in the Safari Zone in Yellow and Pokemon Origins. Changed the second Chansey's level to 7 for consistency. Also fixed an error on the Safari Zone Area 1 sign that said Centre Area, which was fixed in FRLG. Thanks to Lyra made a website for pointing this out! --- data/wild/maps/SafariZoneNorth.asm | 2 +- data/wild/maps/SafariZoneWest.asm | 4 ++-- text/SafariZoneEast.asm | 2 +- text/SafariZoneNorth.asm | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm index 740442dc..9543a202 100644 --- a/data/wild/maps/SafariZoneNorth.asm +++ b/data/wild/maps/SafariZoneNorth.asm @@ -5,7 +5,7 @@ SafariZoneNorthWildMons: db 23, EXEGGCUTE db 25, TANGELA db 30, VENOMOTH - db 27, EXEGGCUTE + db 27, CUBONE db 28, DODRIO db 27, TAUROS db 26, TRAMPEL diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm index dbd65d3f..eb62a6e0 100644 --- a/data/wild/maps/SafariZoneWest.asm +++ b/data/wild/maps/SafariZoneWest.asm @@ -5,11 +5,11 @@ SafariZoneWestWildMons: db 23, EXEGGCUTE db 24, EXEGGCUTE db 33, VENOMOTH - db 26, EXEGGCUTE + db 26, CUBONE db 25, MAROWAK db 25, SCYTHER db 26, TAUROS - db 25, CHANSEY + db 7, CHANSEY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/text/SafariZoneEast.asm b/text/SafariZoneEast.asm index eebe5de7..a0f081fb 100644 --- a/text/SafariZoneEast.asm +++ b/text/SafariZoneEast.asm @@ -11,6 +11,6 @@ _SafariZoneEastText6:: done _SafariZoneEastText7:: - text "CENTER AREA" + text "AREA 1" line "NORTH: AREA 2" done diff --git a/text/SafariZoneNorth.asm b/text/SafariZoneNorth.asm index 1e148f0b..2f05334e 100644 --- a/text/SafariZoneNorth.asm +++ b/text/SafariZoneNorth.asm @@ -11,6 +11,7 @@ _SafariZoneNorthText4:: _SafariZoneNorthText5:: text "AREA 2" + line "SOUTH: AREA 3" done _SafariZoneNorthText6:: From 5859ea25ead756d62aed18a6196983995e7aa449 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Wed, 27 Dec 2023 22:18:23 +0000 Subject: [PATCH 10/30] Giovanni's Room theme okay look I did this months ago and now I'm finally pushing it This gives Giovanni's Room its own theme, which is a slower-tempo version of the Rocket HQ theme that's missing channel 1. --- audio.asm | 1 + constants/music_constants.asm | 1 + crysaudio/music/RBY/giovannisroom.asm | 368 ++++++++++++++++++++++++++ crysaudio/music_pointers_red.asm | 1 + data/maps/songs.asm | 2 +- 5 files changed, 372 insertions(+), 1 deletion(-) create mode 100644 crysaudio/music/RBY/giovannisroom.asm diff --git a/audio.asm b/audio.asm index f7ef5677..b1defe61 100644 --- a/audio.asm +++ b/audio.asm @@ -380,6 +380,7 @@ INCLUDE "crysaudio/music/RBY/victory4.asm" INCLUDE "crysaudio/music/RBY/kinchou01.asm" INCLUDE "crysaudio/music/RBY/mewtwo01.asm" INCLUDE "crysaudio/music/RBY/legendarybattle.asm" +INCLUDE "crysaudio/music/RBY/giovannisroom.asm" SECTION "TCG Songs 1", ROMX diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 2356a040..cf463bad 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -64,6 +64,7 @@ const MUSIC_KINCHOU01 const MUSIC_MEWTWO01 const MUSIC_LEGENDARYBATTLE + const MUSIC_GIOVANNIS_ROOM const NUM_SONGS diff --git a/crysaudio/music/RBY/giovannisroom.asm b/crysaudio/music/RBY/giovannisroom.asm new file mode 100644 index 00000000..ef88d392 --- /dev/null +++ b/crysaudio/music/RBY/giovannisroom.asm @@ -0,0 +1,368 @@ +Music_GiovannisRoom: + channel_count 2 + channel 2, Music_GiovannisRoom_Ch2 + channel 3, Music_GiovannisRoom_Ch3 + +Music_GiovannisRoom_Ch2: + vibrato 11, 1, 5 + duty_cycle 3 + note_type 12, 0, -7 + stereo_panning TRUE, FALSE + note_type 12, 4, -5 + octave 5 + rest 4 + stereo_panning TRUE, TRUE +Music_GiovannisRoom_branch_7dfeb: + note_type 12, 12, 2 +Music_GiovannisRoom_branch_7dfed: + sound_call Music_GiovannisRoom_branch_7e097 + sound_loop 3, Music_GiovannisRoom_branch_7dfed + octave 2 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + note E_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note D#, 1 +Music_GiovannisRoom_branch_7e006: + sound_call Music_GiovannisRoom_branch_7e097 + sound_loop 4, Music_GiovannisRoom_branch_7e006 + rest 2 + sound_call Music_GiovannisRoom_branch_7e0ab + octave 3 + note C_, 4 + sound_call Music_GiovannisRoom_branch_7e0ab + octave 3 + note C#, 4 + sound_call Music_GiovannisRoom_branch_7e0ab + octave 3 + note D#, 4 + note_type 12, 13, 3 + octave 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 3 + note B_, 4 + note_type 12, 13, 2 + sound_call Music_GiovannisRoom_branch_7e0b5 + octave 3 + note F#, 4 + sound_call Music_GiovannisRoom_branch_7e0b5 + octave 3 + note G_, 4 + sound_call Music_GiovannisRoom_branch_7e0b5 + octave 3 + note A#, 4 + note_type 12, 13, 3 + octave 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note G_, 4 + note F#, 2 + note_type 12, 13, 6 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + note_type 12, 13, 2 + sound_call Music_GiovannisRoom_branch_7e0ba + rest 10 + note E_, 1 + rest 1 + sound_call Music_GiovannisRoom_branch_7e0ba + rest 12 + sound_call Music_GiovannisRoom_branch_7e0ba + rest 12 + sound_call Music_GiovannisRoom_branch_7e0ba + rest 14 + note_type 12, 13, 3 + sound_call Music_GiovannisRoom_branch_7e0cd + note D#, 4 + sound_call Music_GiovannisRoom_branch_7e0cd + note D#, 2 + rest 2 + note_type 12, 13, 2 + sound_call Music_GiovannisRoom_branch_7e0c0 + rest 2 + octave 3 + note F#, 4 + octave 2 + note E_, 1 + note E_, 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + note C#, 1 + rest 1 + note D_, 1 + note C#, 1 + rest 2 + octave 3 + note G_, 4 + sound_call Music_GiovannisRoom_branch_7e0c0 + octave 3 + note A#, 4 + note_type 12, 13, 6 + note B_, 8 + octave 4 + note D#, 8 + note_type 12, 13, 2 + sound_call Music_GiovannisRoom_branch_7e097 + sound_call Music_GiovannisRoom_branch_7e097 + sound_loop 0, Music_GiovannisRoom_branch_7dfeb + +Music_GiovannisRoom_branch_7e097: + octave 2 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + sound_ret + +Music_GiovannisRoom_branch_7e0ab: + octave 2 + note E_, 1 + note E_, 1 + rest 2 + octave 1 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + sound_ret + +Music_GiovannisRoom_branch_7e0b5: + octave 2 + note E_, 1 + note E_, 1 + rest 10 + sound_ret + +Music_GiovannisRoom_branch_7e0ba: + octave 1 + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret + +Music_GiovannisRoom_branch_7e0c0: + octave 2 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + rest 1 + note D#, 1 + rest 1 + note D_, 1 + rest 1 + note C#, 1 + note C_, 1 + sound_ret + +Music_GiovannisRoom_branch_7e0cd: + octave 3 + note E_, 6 + note G_, 6 + note E_, 4 + note A_, 6 + octave 4 + note C_, 6 + octave 3 + note B_, 4 + note G_, 6 + note A#, 6 + note F#, 4 + note E_, 6 + note F#, 6 + sound_ret + +Music_GiovannisRoom_Ch3: + note_type 12, 1, 1 + vibrato 8, 2, 6 + rest 2 + octave 4 + note D_, 1 + note D#, 1 +Music_GiovannisRoom_branch_7e0e5: + sound_call Music_GiovannisRoom_branch_7e140 + sound_call Music_GiovannisRoom_branch_7e140 + octave 5 + note E_, 2 + rest 4 + octave 3 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + octave 4 + note F#, 4 + sound_call Music_GiovannisRoom_branch_7e154 + octave 4 + note G_, 4 + sound_call Music_GiovannisRoom_branch_7e154 + octave 4 + note A_, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 + rest 6 + sound_call Music_GiovannisRoom_branch_7e177 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + sound_call Music_GiovannisRoom_branch_7e15e + rest 12 + sound_call Music_GiovannisRoom_branch_7e15e + rest 12 + sound_call Music_GiovannisRoom_branch_7e15e + rest 10 + note E_, 1 + rest 1 + sound_call Music_GiovannisRoom_branch_7e15e + rest 12 + sound_call Music_GiovannisRoom_branch_7e15e + rest 12 + sound_call Music_GiovannisRoom_branch_7e15e + rest 10 + note D_, 1 + note D#, 1 + sound_call Music_GiovannisRoom_branch_7e164 + sound_call Music_GiovannisRoom_branch_7e164 + note E_, 2 + rest 4 + sound_call Music_GiovannisRoom_branch_7e177 + note B_, 8 + note F#, 6 + note D_, 1 + note D#, 1 + rest 16 + rest 16 + sound_loop 0, Music_GiovannisRoom_branch_7e0e5 + +Music_GiovannisRoom_branch_7e140: + octave 5 + note E_, 4 + note B_, 4 + note A#, 4 + octave 6 + note D_, 4 + note C#, 4 + octave 5 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + sound_ret + +Music_GiovannisRoom_branch_7e154: + octave 6 + note E_, 1 + note E_, 1 + rest 4 + octave 3 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + sound_ret + +Music_GiovannisRoom_branch_7e15e: + octave 3 + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret + +Music_GiovannisRoom_branch_7e164: + note E_, 4 + note B_, 4 + note A#, 4 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + sound_ret + +Music_GiovannisRoom_branch_7e177: + octave 4 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note F#, 4 + rest 6 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note G_, 4 + rest 6 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note A#, 4 + sound_ret diff --git a/crysaudio/music_pointers_red.asm b/crysaudio/music_pointers_red.asm index e5bf36e1..e48fa6b7 100644 --- a/crysaudio/music_pointers_red.asm +++ b/crysaudio/music_pointers_red.asm @@ -58,3 +58,4 @@ Music: dba Music_Kinchou01 dba Music_Mewtwo01 dba Music_LegendaryBattle + dba Music_GiovannisRoom diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 47fec6da..f510fc8b 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -248,7 +248,7 @@ MapSongBanks:: db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F - db MUSIC_DUNGEON1, 0 ; GIOVANNIS_ROOM + db MUSIC_GIOVANNIS_ROOM, 0 ; GIOVANNIS_ROOM db MUSIC_GYM, 0 ; BATTLE_TENT db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE_HOUSE From e401f05495c12159371c4826344bb22aa3bba12b Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Wed, 27 Dec 2023 23:00:09 +0000 Subject: [PATCH 11/30] Update evos_moves.asm how long has Vap's moveset been broken holy shit --- data/pokemon/evos_moves.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 647091af..0ee3d981 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -1614,6 +1614,7 @@ VaporeonEvosMoves: db 44, MIST db 47, ACID_ARMOR db 52, HYDRO_PUMP + db 0 MachopEvosMoves: ; Evolutions From dbc9fe29293ab73ef12517878be34b093639e6b1 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Wed, 27 Dec 2023 23:31:30 +0000 Subject: [PATCH 12/30] Postgame boss movesets: Batch 1 Includes Professor Oak's 5 teams, Chief's team, as well as the postgame teams for Yujirou, Koichi, Brock, Misty, Lt. Surge, Erika, Koga, Sabrina and Blaine. --- data/trainers/rival_parties.asm | 4 +- data/trainers/scaled_parties.asm | 4 +- data/trainers/special_moves.asm | 314 +++++++++++++++++++++++++++++++ 3 files changed, 318 insertions(+), 4 deletions(-) diff --git a/data/trainers/rival_parties.asm b/data/trainers/rival_parties.asm index 60de4e4a..67521f0f 100644 --- a/data/trainers/rival_parties.asm +++ b/data/trainers/rival_parties.asm @@ -60,8 +60,8 @@ ProfOakData: db $FF, 61, TAUROS, 62, GYARADOS, 63, ARCANINE, 63, EXEGGUTOR, 64, NIDOKING, 65, TOTARTLE, 0 db $FF, 61, TAUROS, 62, EXEGGUTOR, 63, GYARADOS, 63, ARCANINE, 64, NIDOKING, 65, VENUSAUR, 0 db $FF, 61, TAUROS, 62, ARCANINE, 63, EXEGGUTOR, 63, GYARADOS, 64, NIDOKING, 65, CHARIZARD, 0 - db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, TOTARTLE, 65, CHARIZARD, 65, VENUSAUR, 0 - db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, CHARIZARD, 65, VENUSAUR, 65, TOTARTLE, 0 + db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, VENUSAUR, 65, CHARIZARD, 65, TOTARTLE, 0 + db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, VENUSAUR, 65, CHARIZARD, 65, TOTARTLE, 0 ; with Oak's teams, he uses his original unused team with Nidoking added on. ; his teams weren't changed in Yellow, so what I've decided to do is give him all 3 starters that weren't chosen. ; he should also use a Magnezone here, since his other team mirrors Blue's in many ways, and Magnezone avoids type overlap. diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index 38237f16..0d91512c 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -64,8 +64,8 @@ SabrinaData: db $FF, 38, ESPEON, 37, MR_MIME, 37, SLOWKING, 38, HYPNO, 40, ALAKAZAM, 0 ; 4 db $FF, 41, ESPEON, 40, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0 ; 5 db $FF, 45, ESPEON, 44, MR_MIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6 - db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused) - db $FF, 62, EXEGGUTOR, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0 ; 8 (postgame) + db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, JYNX, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused) + db $FF, 62, JYNX, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0 ; 8 (postgame) BlaineData: db $FF, 11, VULPIX, 12, GROWLITHE, 14, PONYTA, 0 ; 0 badges (unused) diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index e163785e..68bebd9f 100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -1048,5 +1048,319 @@ SpecialTrainerMoves: db 6, 3, THUNDER_WAVE db 6, 4, SURF db 0 + + db PROF_OAK, 1 ; Totartle Team + db 1, 1, HYPER_BEAM + db 1, 3, EARTHQUAKE + db 1, 4, BLIZZARD + db 2, 1, BLIZZARD + db 2, 2, THUNDERBOLT + db 3, 1, FIRE_BLAST + db 3, 2, DIG + db 3, 3, AGILITY + db 3, 4, BODY_SLAM + db 4, 1, PSYCHIC_M + db 4, 2, SLEEP_POWDER + db 4, 3, EXPLOSION + db 4, 4, MEGA_DRAIN + db 5, 1, BLIZZARD + db 5, 3, THUNDERBOLT + db 5, 4, THRASH + db 6, 1, BLIZZARD + db 6, 3, BODY_SLAM + db 6, 4, SOLARBEAM + db 0 + + db PROF_OAK, 2 ; Venusaur Team + db 1, 1, HYPER_BEAM + db 1, 3, EARTHQUAKE + db 1, 4, BLIZZARD + db 2, 1, PSYCHIC_M + db 2, 2, SLEEP_POWDER + db 2, 3, EXPLOSION + db 2, 4, MEGA_DRAIN + db 3, 1, BLIZZARD + db 3, 2, THUNDERBOLT + db 4, 1, FIRE_BLAST + db 4, 2, DIG + db 4, 3, AGILITY + db 4, 4, BODY_SLAM + db 5, 1, BLIZZARD + db 5, 3, THUNDERBOLT + db 5, 4, THRASH + db 6, 1, SWORDS_DANCE + db 6, 2, RAZOR_LEAF + db 6, 3, HYPER_BEAM + db 6, 4, SLEEP_POWDER + db 0 + + db PROF_OAK, 3 ; Charizard Team + db 1, 1, HYPER_BEAM + db 1, 3, EARTHQUAKE + db 1, 4, BLIZZARD + db 2, 1, FIRE_BLAST + db 2, 2, DIG + db 2, 3, AGILITY + db 2, 4, BODY_SLAM + db 3, 1, PSYCHIC_M + db 3, 2, SLEEP_POWDER + db 3, 3, EXPLOSION + db 3, 4, MEGA_DRAIN + db 4, 1, BLIZZARD + db 4, 2, THUNDERBOLT + db 5, 1, BLIZZARD + db 5, 3, THUNDERBOLT + db 5, 4, THRASH + db 6, 1, SWORDS_DANCE + db 6, 3, FIRE_BLAST + db 6, 4, EARTHQUAKE + db 0 + + db PROF_OAK, 4 ; Pika/Vee Team 1 + db 1, 1, HYPER_BEAM + db 1, 3, EARTHQUAKE + db 1, 4, BLIZZARD + db 2, 1, THUNDER_WAVE + db 2, 3, THUNDERBOLT + db 3, 1, BLIZZARD + db 3, 3, THUNDERBOLT + db 3, 4, THRASH + db 4, 1, SWORDS_DANCE + db 4, 2, RAZOR_LEAF + db 4, 3, HYPER_BEAM + db 4, 4, SLEEP_POWDER + db 5, 1, SWORDS_DANCE + db 5, 3, FIRE_BLAST + db 5, 4, EARTHQUAKE + db 6, 1, BLIZZARD + db 6, 3, BODY_SLAM + db 6, 4, SOLARBEAM + db 0 + + db PROF_OAK, 5 ; Pika/Vee Team 2 + db 1, 1, HYPER_BEAM + db 1, 3, EARTHQUAKE + db 1, 4, BLIZZARD + db 2, 1, THUNDER_WAVE + db 2, 3, THUNDERBOLT + db 3, 1, BLIZZARD + db 3, 3, THUNDERBOLT + db 3, 4, THRASH + db 4, 1, SWORDS_DANCE + db 4, 2, RAZOR_LEAF + db 4, 3, HYPER_BEAM + db 4, 4, SLEEP_POWDER + db 5, 1, SWORDS_DANCE + db 5, 3, FIRE_BLAST + db 5, 4, EARTHQUAKE + db 6, 1, BLIZZARD + db 6, 3, BODY_SLAM + db 6, 4, SOLARBEAM + db 0 + + db YUJIROU, 10 ; Yujirou postgame + db 1, 1, BUBBLEBEAM + db 1, 2, THUNDERBOLT + db 1, 4, HYPNOSIS + db 2, 1, FIRE_BLAST + db 2, 3, HYPER_BEAM + db 2, 4, FISSURE + db 3, 1, REFLECT + db 3, 2, ICE_BEAM + db 3, 3, PSYCHIC_M + db 3, 4, SOFTBOILED + db 5, 2, LOVELY_KISS + db 5, 3, BLIZZARD + db 5, 4, AMNESIA + db 6, 1, WRAP + db 6, 2, SWORDS_DANCE + db 6, 3, HYPER_BEAM + db 6, 4, EARTHQUAKE + db 0 + + db KOICHI, 10 ; Koichi postgame + db 1, 1, ROCK_SLIDE + db 1, 2, EARTHQUAKE + db 1, 4, BODY_SLAM + db 2, 2, ROCK_SLIDE + db 2, 3, SEISMIC_TOSS + db 3, 1, EARTHQUAKE + db 3, 2, HYPER_BEAM + db 3, 3, BODY_SLAM + db 4, 1, COUNTER + db 4, 2, SEISMIC_TOSS + db 4, 4, BODY_SLAM + db 5, 2, AGILITY + db 5, 3, HI_JUMP_KICK + db 6, 3, HI_JUMP_KICK + db 6, 4, DIG + db 0 + + db BROCK, 9 ; Brock postgame + db 1, 3, EARTHQUAKE + db 1, 4, BODY_SLAM + db 2, 1, SURF + db 2, 2, SUBSTITUTE + db 2, 3, FIRE_BLAST + db 3, 3, FIRE_BLAST + db 3, 4, FIRE_SPIN + db 4, 1, BODY_SLAM + db 4, 2, REST + db 4, 3, SURF + db 4, 4, ICE_BEAM + db 5, 1, SURF + db 5, 2, SWORDS_DANCE + db 5, 3, HYPER_BEAM + db 5, 4, DIG + db 6, 1, ROCK_SLIDE + db 6, 3, BIND + db 6, 4, EARTHQUAKE + db 0 + db MISTY, 9 ; Misty postgame + db 1, 1, REST + db 1, 2, ICE_BEAM + db 2, 1, AMNESIA + db 2, 2, GLARE + db 2, 3, PSYCHIC_M + db 2, 4, SURF + db 3, 1, BODY_SLAM + db 3, 2, EARTHQUAKE + db 3, 3, SUBMISSION + db 4, 1, SURF + db 4, 2, GROWTH + db 4, 4, BLIZZARD + db 5, 1, COUNTER + db 5, 2, BLIZZARD + db 5, 3, MEGA_DRAIN + db 5, 4, SURF + db 6, 1, RECOVER + db 6, 2, SURF + db 6, 3, PSYCHIC_M + db 6, 4, THUNDERBOLT + db 0 + + db LT_SURGE, 9 ; Surge postgame + db 1, 1, THUNDER_WAVE + db 1, 2, EARTHQUAKE + db 1, 4, HYPER_BEAM + db 2, 1, THUNDER_WAVE + db 2, 3, THUNDERBOLT + db 3, 3, EARTHQUAKE + db 3, 4, THUNDER_WAVE + db 4, 1, THUNDERBOLT + db 4, 2, ROLLING_KICK + db 4, 3, ICE_PUNCH + db 4, 4, PSYCHIC_M + db 5, 3, THUNDERBOLT + db 5, 4, GROWTH + db 6, 1, THUNDERBOLT + db 6, 2, BODY_SLAM + db 6, 3, FLY + db 6, 4, SURF + db 0 + + db ERIKA, 9 ; Erika postgame + db 1, 1, REST + db 1, 2, RAZOR_LEAF + db 1, 3, ACID + db 2, 1, SWORDS_DANCE + db 2, 2, EARTHQUAKE + db 2, 3, WRAP + db 3, 1, MEGA_DRAIN + db 3, 2, THUNDERBOLT + db 3, 3, THUNDER_WAVE + db 4, 1, HYPER_BEAM + db 4, 3, BODY_SLAM + db 4, 4, SWORDS_DANCE + db 5, 1, SOLARBEAM + db 5, 3, BODY_SLAM + db 5, 4, SLEEP_POWDER + db 6, 2, MEGA_DRAIN + db 6, 3, ROCK_SLIDE + db 6, 4, AMNESIA + db 0 + + db KOGA, 9 ; Koga postgame + db 1, 2, MEGA_DRAIN + db 2, 1, RAZOR_LEAF + db 2, 2, ACID + db 2, 4, WRAP + db 3, 1, SURF + db 4, 1, THUNDERBOLT + db 4, 2, ICE_PUNCH + db 4, 3, SLUDGE + db 4, 4, EXPLOSION + db 5, 1, THUNDERBOLT + db 5, 2, FIRE_BLAST + db 5, 3, SLUDGE + db 6, 1, MEGA_DRAIN + db 6, 3, CONFUSE_RAY + db 6, 4, FLY + db 0 + + db SABRINA, 9 ; Sabrina postgame + db 1, 1, LOVELY_KISS + db 1, 2, BODY_SLAM + db 1, 3, PSYCHIC_M + db 2, 1, EARTHQUAKE + db 2, 2, SURF + db 3, 1, HYPNOSIS + db 3, 3, DOUBLE_KICK + db 4, 1, THUNDERPUNCH + db 4, 2, ICE_PUNCH + db 4, 4, AMNESIA + db 5, 1, HYPER_BEAM + db 5, 2, REFLECT + db 5, 3, GROWTH + db 6, 1, FIRE_PUNCH + db 6, 4, THUNDERPUNCH + db 0 + + db BLAINE, 9 ; Blaine postgame + db 1, 1, HYPNOSIS + db 1, 2, FIRE_SPIN + db 1, 3, DOUBLE_KICK + db 1, 4, FIRE_BLAST + db 2, 1, FIRE_BLAST + db 2, 2, DIG + db 2, 3, AGILITY + db 2, 4, BODY_SLAM + db 3, 1, BODY_SLAM + db 3, 2, EARTHQUAKE + db 3, 3, SUBMISSION + db 3, 4, FIRE_BLAST + db 4, 1, GROWTH + db 4, 2, HYPER_BEAM + db 4, 3, FIRE_BLAST + db 5, 1, FLY + db 5, 3, FIRE_BLAST + db 5, 4, EARTHQUAKE + db 6, 1, FIRE_BLAST + db 6, 2, THUNDERBOLT + db 6, 3, EARTHQUAKE + db 6, 4, CONFUSE_RAY + db 0 + + db CHIEF, 1 + db 1, 1, THUNDERBOLT + db 1, 2, THUNDER_WAVE + db 1, 3, HEADBUTT + db 2, 1, BLIZZARD + db 2, 2, THUNDERBOLT + db 2, 3, SING + db 2, 4, HYPER_BEAM + db 3, 1, IRON_HEAD + db 3, 3, HYPER_BEAM + db 4, 1, EXPLOSION + db 4, 2, THUNDERBOLT + db 4, 4, ICE_PUNCH + db 5, 1, THUNDERBOLT + db 5, 2, ICE_BEAM + db 5, 3, RECOVER + db 6, 1, THUNDERBOLT + db 6, 2, THUNDER_WAVE + db 6, 4, ICE_BEAM + db 0 + db -1 ; end From 7b2a5e5d7f8d4af375656ba9471f444c4bb60369 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 28 Dec 2023 13:12:39 +0000 Subject: [PATCH 13/30] Postgame boss movesets: Batch 2 Includes the final Jessie and James fight, and the Elite 4 and Champion rematches. I'm finally done with these movesets and it's never been better. --- data/trainers/special_moves.asm | 191 +++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 2 deletions(-) diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index 68bebd9f..fc70fdf0 100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -876,7 +876,7 @@ SpecialTrainerMoves: db 6, 3, QUICK_ATTACK db 0 - db RIVAL2, 20 ; Route 22 Rival w/Raichu + db RIVAL2, 20 ; Route 22 Rival w/Gorochu db 1, 1, SAND_ATTACK db 1, 2, SLASH db 1, 4, SWORDS_DANCE @@ -1029,7 +1029,7 @@ SpecialTrainerMoves: db 6, 3, QUICK_ATTACK db 0 - db RIVAL3, 5 ; Champion Rival w/Raichu + db RIVAL3, 5 ; Champion Rival w/Gorochu db 1, 1, SAND_ATTACK db 1, 2, SLASH db 1, 4, SWORDS_DANCE @@ -1363,4 +1363,191 @@ SpecialTrainerMoves: db 6, 4, ICE_BEAM db 0 + db JESSIE_JAMES, 5 ; J&J postgame + db 1, 1, BUBBLEBEAM + db 1, 2, THUNDERBOLT + db 1, 4, HYPNOSIS + db 2, 3, WRAP + db 2, 4, EARTHQUAKE + db 3, 1, WRAP + db 3, 2, BODY_SLAM + db 3, 3, EXPLOSION + db 3, 4, EARTHQUAKE + db 4, 1, SLUDGE + db 4, 2, THUNDERBOLT + db 4, 3, FIRE_BLAST + db 5, 3, BODY_SLAM + db 6, 1, FIRE_BLAST + db 6, 2, THUNDERBOLT + db 0 + + db LORELEI, 2 ; Lorelei rematch + db 1, 1, SURF + db 1, 3, BODY_SLAM + db 1, 4, BLIZZARD + db 2, 1, EXPLOSION + db 2, 3, ICE_BEAM + db 3, 1, HYPNOSIS + db 3, 4, SUBSTITUTE + db 4, 1, LOVELY_KISS + db 4, 2, COUNTER + db 4, 3, PSYCHIC_M + db 5, 1, BODY_SLAM + db 5, 2, REST + db 5, 4, GROWTH + db 6, 1, HYPER_BEAM + db 6, 2, THUNDERBOLT + db 6, 3, BLIZZARD + db 0 + + db BRUNO, 2 ; Bruno rematch + db 1, 3, MEDITATE + db 2, 1, EARTHQUAKE + db 2, 3, ROCK_SLIDE + db 2, 4, EXPLOSION + db 3, 1, BODY_SLAM + db 3, 2, BRUTAL_SWING + db 3, 3, SWORDS_DANCE + db 4, 1, THUNDERBOLT + db 5, 2, BODY_SLAM + db 5, 3, HI_JUMP_KICK + db 5, 4, DIG + db 6, 1, BODY_SLAM + db 6, 3, EARTHQUAKE + db 6, 4, ROCK_SLIDE + db 0 + + db AGATHA, 2 ; Agatha rematch + db 1, 1, MEGA_PUNCH + db 1, 4, ROCK_SLIDE + db 2, 1, MEGA_DRAIN + db 2, 3, CONFUSE_RAY + db 2, 4, FLY + db 3, 1, SWORDS_DANCE + db 3, 2, FIRE_BLAST + db 3, 3, EARTHQUAKE + db 3, 4, BLIZZARD + db 4, 3, WRAP + db 4, 4, EARTHQUAKE + db 5, 1, GROWTH + db 5, 3, TOXIC + db 6, 1, THUNDERBOLT + db 6, 2, ICE_PUNCH + db 6, 4, PSYCHIC_M + db 0 + + db LANCE, 2 ; Lance rematch + db 1, 1, SWORDS_DANCE + db 1, 2, THUNDERBOLT + db 1, 4, EARTHQUAKE + db 2, 1, BLIZZARD + db 2, 2, THUNDERBOLT + db 3, 1, PSYCHIC_M + db 3, 2, EARTHQUAKE + db 3, 3, EXPLOSION + db 4, 1, REST + db 4, 2, ICE_BEAM + db 5, 1, SURF + db 5, 3, THUNDERBOLT + db 6, 1, BLIZZARD + db 6, 2, FIRE_BLAST + db 6, 4, AGILITY + db 0 + + db RIVAL3, 6 ; Champion Rival rematch w/Totartle + db 1, 1, SMART_STRIKE + db 1, 2, EARTHQUAKE + db 2, 1, THUNDERPUNCH + db 2, 4, ICE_PUNCH + db 3, 1, SURF + db 3, 3, THUNDERBOLT + db 4, 1, FIRE_BLAST + db 4, 2, DIG + db 4, 3, AGILITY + db 4, 4, BODY_SLAM + db 5, 1, PSYCHIC_M + db 5, 2, SLEEP_POWDER + db 5, 4, SOLARBEAM + db 6, 1, BODY_SLAM + db 6, 2, HYDRO_PUMP + db 0 + + db RIVAL3, 7 ; Champion Rival rematch w/Venusaur + db 1, 1, SMART_STRIKE + db 1, 2, EARTHQUAKE + db 2, 1, FIRE_PUNCH + db 2, 4, THUNDERPUNCH + db 3, 1, SURF + db 3, 3, THUNDERBOLT + db 4, 1, BLIZZARD + db 4, 2, THUNDERBOLT + db 5, 1, FIRE_BLAST + db 5, 2, DIG + db 5, 3, AGILITY + db 5, 4, BODY_SLAM + db 6, 2, RAZOR_LEAF + db 6, 3, BODY_SLAM + db 6, 4, SLEEP_POWDER + db 0 + + db RIVAL3, 8 ; Champion Rival rematch w/Charizard + db 1, 1, SMART_STRIKE + db 1, 2, EARTHQUAKE + db 2, 1, ICE_PUNCH + db 2, 4, FIRE_PUNCH + db 3, 1, SURF + db 3, 3, THUNDERBOLT + db 4, 1, PSYCHIC_M + db 4, 2, SLEEP_POWDER + db 4, 4, SOLARBEAM + db 5, 1, BLIZZARD + db 5, 2, THUNDERBOLT + db 6, 1, FLY + db 6, 2, SLASH + db 6, 4, EARTHQUAKE + db 0 + + db RIVAL3, 9 ; Champion Rival rematch w/Umbreon + db 1, 1, BODY_SLAM + db 1, 2, EARTHQUAKE + db 1, 3, BLIZZARD + db 1, 4, FIRE_BLAST + db 2, 1, FIRE_PUNCH + db 2, 4, ICE_PUNCH + db 3, 2, SOLARBEAM + db 3, 3, MEGA_DRAIN + db 3, 4, AMNESIA + db 4, 1, THUNDER_WAVE + db 4, 3, THUNDERBOLT + db 5, 1, HYPNOSIS + db 5, 2, REFLECT + db 5, 3, BODY_SLAM + db 5, 4, FIRE_BLAST + db 6, 1, BODY_SLAM + db 6, 3, GROWTH + db 0 + + db RIVAL3, 10 ; Champion Rival rematch w/Gorochu + db 1, 1, BODY_SLAM + db 1, 2, EARTHQUAKE + db 1, 3, BLIZZARD + db 1, 4, FIRE_BLAST + db 2, 1, ICE_PUNCH + db 2, 4, THUNDERPUNCH + db 3, 2, SOLARBEAM + db 3, 3, MEGA_DRAIN + db 3, 4, AMNESIA + db 4, 1, HYPNOSIS + db 4, 2, REFLECT + db 4, 3, BODY_SLAM + db 4, 4, FIRE_BLAST + db 5, 1, EXPLOSION + db 5, 3, SURF + db 5, 4, BLIZZARD + db 6, 1, THUNDERBOLT + db 6, 2, BODY_SLAM + db 6, 3, THUNDER_WAVE + db 6, 4, SURF + db 0 + db -1 ; end From 5760e27617670cb6b085f626b4ebfeba9ebfc6f7 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 28 Dec 2023 21:40:05 +0000 Subject: [PATCH 14/30] Fixing the Brunswick Glade NPC bugs Almost there... --- README.md | 2 +- data/maps/hide_show_data.asm | 14 +++--- data/maps/objects/BrunswickGlade.asm | 22 ++++----- data/maps/objects/CelesteHillCave.asm | 4 +- data/maps/objects/CelesteHillOutside.asm | 2 +- data/trainers/parties.asm | 4 +- scripts/BrunswickGlade.asm | 14 +++--- text/BrunswickGlade.asm | 57 ++++++++++++------------ 8 files changed, 60 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 5e971cae..0c73c4cd 100644 --- a/README.md +++ b/README.md @@ -263,7 +263,7 @@ Comprehensive list can be found on Discord. - Occasionally, menu text sets itself to scroll. - The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1. - Fake Tears and Nasty Plot don't quite look right when done from the opponent's side. -- After reloading the game after beating the Elite Four, Pallet Town's correct palette isn't loaded in until after leaving the house. +- Yujirou seems to crash the game after battling him sometimes. - The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle Evolution Methods for new Pokemon diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 1d649ce4..10eacdee 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -591,13 +591,13 @@ MtMoonSquareHS: DaycareHS: db DAYCARE, $03, SHOW ; HS_DAYCARE_BULBASAUR BrunswickGladeHS: - db BRUNSWICK_GLADE, $01, HIDE ; HS_GLADE_GZAP_1 - db BRUNSWICK_GLADE, $02, HIDE ; HS_GLADE_GZAP_2 - db BRUNSWICK_GLADE, $03, HIDE ; HS_GLADE_GZAP_3 - db BRUNSWICK_GLADE, $04, HIDE ; HS_GLADE_ITEM1 - db BRUNSWICK_GLADE, $05, HIDE ; HS_GLADE_ITEM2 - db BRUNSWICK_GLADE, $06, HIDE ; HS_GLADE_ITEM3 - db BRUNSWICK_GLADE, $07, HIDE ; HS_GLADE_ITEM4 + db BRUNSWICK_GLADE, $05, HIDE ; HS_GLADE_GZAP_1 + db BRUNSWICK_GLADE, $06, HIDE ; HS_GLADE_GZAP_2 + db BRUNSWICK_GLADE, $07, HIDE ; HS_GLADE_GZAP_3 + db BRUNSWICK_GLADE, $08, SHOW ; HS_GLADE_ITEM1 + db BRUNSWICK_GLADE, $09, SHOW ; HS_GLADE_ITEM2 + db BRUNSWICK_GLADE, $0A, SHOW ; HS_GLADE_ITEM3 + db BRUNSWICK_GLADE, $0B, SHOW ; HS_GLADE_ITEM4 CinnabarVolcanoFloorsHS: db CINNABAR_VOLCANO_FLOORS, $05, SHOW assert_table_length NUM_HS_OBJECTS diff --git a/data/maps/objects/BrunswickGlade.asm b/data/maps/objects/BrunswickGlade.asm index c593e222..b1efe04a 100644 --- a/data/maps/objects/BrunswickGlade.asm +++ b/data/maps/objects/BrunswickGlade.asm @@ -11,16 +11,16 @@ BrunswickGlade_Object: bg_event 14, 24, 12 ; Sign def_object_events - object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1 - object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2 - object_event 9, 3, SPRITE_BIRD, STAY, UP, 3 - object_event 33, 11, SPRITE_POKE_BALL, STAY, NONE, 4, TM_THUNDER ; itemball1 - object_event 5, 21, SPRITE_POKE_BALL, STAY, NONE, 5, LEAF_STONE ; itemball2 - object_event 22, 15, SPRITE_POKE_BALL, STAY, NONE, 6, REVIVE ; itemball3 - object_event 9, 33, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION ; itemball4 - object_event 16, 8, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 6 ; Leaf reference Trainer - object_event 7, 28, SPRITE_GENTLEMAN, STAY, UP, 9, OPP_GENTLEMAN, 6 ; Fuji reference Trainer - object_event 15, 30, SPRITE_BEAUTY, STAY, RIGHT, 10, OPP_BEAUTY, 19 ; Ariana reference Trainer - object_event 31, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 11, OPP_COOLTRAINER_M, 13 ; Trace reference Trainer + object_event 16, 8, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_COOLTRAINER_F, 6 ; Leaf reference Trainer + object_event 7, 28, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 6 ; Fuji reference Trainer + object_event 15, 30, SPRITE_BEAUTY, STAY, RIGHT, 3, OPP_BEAUTY, 19 ; Ariana reference Trainer + object_event 31, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 4, OPP_COOLTRAINER_M, 13 ; Trace reference Trainer + object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 5 + object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 6 + object_event 9, 3, SPRITE_BIRD, STAY, UP, 7 + object_event 33, 11, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER ; itemball1 + object_event 5, 21, SPRITE_POKE_BALL, STAY, NONE, 9, LEAF_STONE ; itemball2 + object_event 22, 15, SPRITE_POKE_BALL, STAY, NONE, 10, REVIVE ; itemball3 + object_event 9, 33, SPRITE_POKE_BALL, STAY, NONE, 11, HYPER_POTION ; itemball4 def_warps_to BRUNSWICK_GLADE \ No newline at end of file diff --git a/data/maps/objects/CelesteHillCave.asm b/data/maps/objects/CelesteHillCave.asm index a457622d..14272091 100644 --- a/data/maps/objects/CelesteHillCave.asm +++ b/data/maps/objects/CelesteHillCave.asm @@ -13,7 +13,7 @@ CelesteHillCave_Object: def_bg_events def_object_events - object_event 22, 14, SPRITE_BEAUTY, STAY, DOWN, 1, OPP_BEAUTY, 17 ; Mina reference Trainer - object_event 21, 5, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_COOLTRAINER_M, 12 ; Primo reference Trainer + object_event 22, 15, SPRITE_BEAUTY, STAY, DOWN, 1, OPP_BEAUTY, 17 ; Mina reference Trainer + object_event 23, 4, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_COOLTRAINER_M, 12 ; Primo reference Trainer def_warps_to CELESTE_HILL_CAVE diff --git a/data/maps/objects/CelesteHillOutside.asm b/data/maps/objects/CelesteHillOutside.asm index 40601ba4..1a939a40 100644 --- a/data/maps/objects/CelesteHillOutside.asm +++ b/data/maps/objects/CelesteHillOutside.asm @@ -15,7 +15,7 @@ CelesteHillOutside_Object: def_object_events object_event 30, 16, SPRITE_BEAUTY, STAY, LEFT, 1, OPP_BEAUTY, 18 ; Selphy reference Trainer - object_event 19, 31, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_COOLTRAINER_M, 14 ; Will reference Trainer + object_event 1, 16, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_COOLTRAINER_M, 14 ; Will reference Trainer object_event 11, 16, SPRITE_GENTLEMAN, STAY, DOWN, 3, OPP_GENTLEMAN, 7; Fan Club Chairman reference Trainer diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index e6cd8de6..9d4be3fc 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -699,7 +699,7 @@ CooltrainerFData: ; db 45, NIDORINA, NIDOQUEEN, 0 ; db 43, PERSIAN, NINETALES, RAICHU, 0 ; Brunswick Glade/grotto etc, whatever desired - db 60, PIDGEOT, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf + db 60, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf ; "Dignified" Pokemon associated with the privileged class. GentlemanData: @@ -713,7 +713,7 @@ GentlemanData: ; SS Anne 2F Rooms db 17, KOLTA, GROWLITHE, 0 ; Celeste Hill? - db 56, NIDOKING, GOLDUCK, GUARDIA, PIDGEOT, DODRIO, BEEDRILL, 0 ; Fuji + db 56, NIDOKING, GOLDUCK, GUARDIA, DODRIO, BEEDRILL, 0 ; Fuji db 57, FEAROW, RAPIDASH, GOROCHU, ALAKAZAM, SYLVEON, 0 ; Fan Club chairman ChannelerData: diff --git a/scripts/BrunswickGlade.asm b/scripts/BrunswickGlade.asm index 7047f003..6e88d902 100644 --- a/scripts/BrunswickGlade.asm +++ b/scripts/BrunswickGlade.asm @@ -13,6 +13,10 @@ BrunswickGlade_ScriptPointers: dw EndTrainerBattle BrunswickGlade_TextPointers: + dw BrunswickGladeTrainer1 + dw BrunswickGladeTrainer2 + dw BrunswickGladeTrainer3 + dw BrunswickGladeTrainer4 dw GZapRun1 dw GZapRun2 dw GZapRun3 @@ -20,20 +24,16 @@ BrunswickGlade_TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText - dw BrunswickGladeTrainer1 - dw BrunswickGladeTrainer2 - dw BrunswickGladeTrainer3 - dw BrunswickGladeTrainer4 dw BrunswickGladeSign1 BrunswickGladeTrainerHeaders: def_trainers BrunswickGladeTrainerHeader0: trainer EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_F, 1, BrunswickGladeBattleText1, BrunswickGladeEndBattleText1, BrunswickGladeAfterBattleText1 -BrunswickGladeTrainerHeader2: ; don't ask - trainer EVENT_BEAT_BRUNSWICK_GLADE_GENTLEMAN, 4, BrunswickGladeBattleText3, BrunswickGladeEndBattleText3, BrunswickGladeAfterBattleText3 BrunswickGladeTrainerHeader1: - trainer EVENT_BEAT_BRUNSWICK_GLADE_BEAUTY, 4, BrunswickGladeBattleText2, BrunswickGladeEndBattleText2, BrunswickGladeAfterBattleText2 + trainer EVENT_BEAT_BRUNSWICK_GLADE_GENTLEMAN, 4, BrunswickGladeBattleText2, BrunswickGladeEndBattleText2, BrunswickGladeAfterBattleText2 +BrunswickGladeTrainerHeader2: + trainer EVENT_BEAT_BRUNSWICK_GLADE_BEAUTY, 4, BrunswickGladeBattleText3, BrunswickGladeEndBattleText3, BrunswickGladeAfterBattleText3 BrunswickGladeTrainerHeader3: trainer EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_M, 3, BrunswickGladeBattleText4, BrunswickGladeEndBattleText4, BrunswickGladeAfterBattleText4 db -1 ; end diff --git a/text/BrunswickGlade.asm b/text/BrunswickGlade.asm index 949f60ec..df816307 100644 --- a/text/BrunswickGlade.asm +++ b/text/BrunswickGlade.asm @@ -20,7 +20,8 @@ _BrunswickGladeBattleText1:: ; Leaf done _BrunswickGladeEndBattleText1:: - text "Dang it!" ; Taken from Smash Ultimate when a Pokemon faints. Cryptid moment. + text "Dang" + line "it!" ; Taken from Smash Ultimate when a Pokemon faints. Cryptid moment. prompt _BrunswickGladeAfterBattleText1:: @@ -34,30 +35,7 @@ _BrunswickGladeAfterBattleText1:: cont "everywhere!" done -_BrunswickGladeBattleText2:: ; Ariana - uses stad2 quotes - text "That sharp gaze..." - - para "You seem rather" - line "competent." - done - -_BrunswickGladeEndBattleText2:: - text "I can't" - line "look them in" - cont "the face after" - cont "this!" - prompt - -_BrunswickGladeAfterBattleText2:: - text "Have you thought" - line "about working" - cont "for TEAM ROCKET?" - - para "No? Forget I" - line "said anything." - done - -_BrunswickGladeBattleText3:: ; Fuji +_BrunswickGladeBattleText2:: ; Fuji text "You seem to have" line "raised your #-" cont "MON with love" @@ -67,11 +45,11 @@ _BrunswickGladeBattleText3:: ; Fuji line "they battle!" done -_BrunswickGladeEndBattleText3:: +_BrunswickGladeEndBattleText2:: text "Hm..." prompt -_BrunswickGladeAfterBattleText3:: +_BrunswickGladeAfterBattleText2:: text "I've made many" line "mistakes in my" cont "life." @@ -83,6 +61,29 @@ _BrunswickGladeAfterBattleText3:: cont "matters." done +_BrunswickGladeBattleText3:: ; Ariana - uses stad2 quotes + text "That sharp gaze..." + + para "You seem rather" + line "competent." + done + +_BrunswickGladeEndBattleText3:: + text "I can't" + line "look them in" + cont "the face after" + cont "this!" + prompt + +_BrunswickGladeAfterBattleText3:: + text "Have you thought" + line "about working" + cont "for TEAM ROCKET?" + + para "No? Forget I" + line "said anything." + done + _BrunswickGladeBattleText4:: ; Trace text "Whoa!" @@ -92,7 +93,7 @@ _BrunswickGladeBattleText4:: ; Trace done _BrunswickGladeEndBattleText4:: - text "Whoa!" + text "Wow!" line "Seriously?" prompt From 222b71f437019118835b00320998e9b571bcc9eb Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 28 Dec 2023 22:42:09 +0000 Subject: [PATCH 15/30] Cries! We're finally done with cries! --- crysaudio/cry_headers.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm index ab5ad0b3..7fccf934 100644 --- a/crysaudio/cry_headers.asm +++ b/crysaudio/cry_headers.asm @@ -26,7 +26,7 @@ PokemonCries:: mon_cry CRY_VENONAT, -233, 240 ; UMBREON mon_cry CRY_CHIKORITA, -1, 512 ; LEAFEON mon_cry CRY_AMPHAROS, 63, 592 ; GLACEON - mon_cry CRY_NIDORAN_M, 0, 0 ; SYLVEON (incomplete) + mon_cry CRY_NIDOQUEEN, 253, 367 ; SYLVEON mon_cry CRY_RATTATA, 0, 256 ; RATTATA mon_cry CRY_RATTATA, 32, 383 ; RATICATE mon_cry CRY_RATTATA, 32, 383 ; RATICATE_A @@ -45,7 +45,7 @@ PokemonCries:: mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL mon_cry CRY_MUK, 163, 187 ; GENTLARVA - mon_cry CRY_KRABBY, 144, 151 ; PUPAL (needs revising) + mon_cry CRY_KRABBY, 144, 151 ; PUPAL mon_cry CRY_KRABBY, 245, 288 ; CARAPTHOR mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA mon_cry CRY_KANGASKHAN, 45, 129 ; GAOTORA @@ -113,7 +113,7 @@ PokemonCries:: mon_cry CRY_RATTATA, 255, 192 ; CHEEP mon_cry CRY_RATTATA, 50, 383 ; JABETTA mon_cry CRY_SEEL, 0, 256 ; LICKITUNG - mon_cry CRY_TYPHLOSION, 576, 234 ; LICKILICKY (sounds really similar to electivire, consider revising) + mon_cry CRY_SEEL, 169, 639 ; LICKILICKY mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE_H @@ -129,8 +129,8 @@ PokemonCries:: mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO_A - mon_cry CRY_NIDORAN_M, 0, 0 ; WIGLETT (incomplete) - mon_cry CRY_NIDORAN_M, 0, 0 ; WUGTRIO (incomplete) + mon_cry CRY_PSYDUCK, 640, 480 ; WIGLETT + mon_cry CRY_DIGLETT, 36, 480 ; WUGTRIO mon_cry CRY_EKANS, 255, 320 ; ONIX mon_cry CRY_TYPHLOSION, 239, 247 ; STEELIX mon_cry CRY_VOLTORB, 237, 256 ; VOLTORB From 2a714f3dffb70526bf651b8aff86e6a459c8d6c5 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 28 Dec 2023 23:14:31 +0000 Subject: [PATCH 16/30] Dog and Monkey No pheasant? damn :( (updated shading and general improvements for Harcanine and Annihilape) --- gfx/pokemon/front/annihilape.png | Bin 908 -> 1036 bytes gfx/pokemon/front/arcanineh.png | Bin 943 -> 999 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/pokemon/front/annihilape.png b/gfx/pokemon/front/annihilape.png index d7844ef3710dfb2f7b5cd92571671474aa86d9a9..9580b862b00bcd8a6ef690d9fa89433e53cb84c3 100644 GIT binary patch delta 884 zcmeBS@8OtG<<27`&ShpY%_oY1fq^l<$S;KP{G#$%K#ppOYeY#(Vo9o1a#1RfVlXl= zGS)RT(lxROF*3F?G_W!?);2J(GB8NDnst4$G_#}xHc7E`rR>Q*%rf;Tk|q$HEmv)= zfL2ANMtG+A`Z8z%*&Gb4j6w{|AlCpP1EUlJE11o|;Ke8nX9qEAK-DlYFfa)t)C1Lm zfCmr*bwg*uJpR6 z?s>LBFx31{_uI#3pFJ&GB4OC`{oJ*uPB_c_oxf0f-{;lwQZ~~izT7g`Qdn>5`sML5 zZx;WF$!CLO0v8uQx?2=xCtbDLiYq#;PVxck3bu=nW-~-;sCFBs$cBD52%XNVC9KlQ zl7C>bqd#-Oq>H`>Rz_Cej7jMVyu7vkw)D^CoV)k(&zv&%%{T4Hvq-^Ye{`vYh_d~ju%Q9wK+c#bhxmzNkdrs`E<+;wrzsed@O(VFj z-aBUVe#Vt|+ipegsx1#byX;@@uhwYs{lU!l!mZjqtU1QnaCG|3DT+5g7CA~TFtRmq z<5{&v*>dUi%SYy3^$ zzLvJtVb1o}vv%jd-Bou>SbjUoFXPuwR!_#{mkB32*uJ<;{IOtxdo8i(`n!dDqKlvxOZ+7(R3!WiU z&tH1vY+eT6%(un&a*o=*&3|^b+Bm;VGD+;eJ&$X}2Q7=j7m4*t1eNwja(LpH{9F>f%Tj4dmWZ%O;brREDKHN{tIXb=Mw^c+?eme&fB!_r=_X?Th_iwoE;zdwj}nncb5sX5QAVUmdc? z+RAo&(ZfgX@qydUScIO8{b#(gX|pQhuBo#RuFeYMU%a&Pwnnv_;f8(eN41)-FO0gq zvZ9(zw%mKIuATM%g;ke-d6{!;SKD`y@lNTjwt}%h;uWV7<`8=&j%i-^D|^U}80F3B4e-aI}QS-dz- zAxtOn%{BY*w^zt%5omvbt7oAZE zUaITklbv+xkjmXdS&n@v9}4XLskN%<%wBvx=~Q&WoBREr#ie#CBnr7nzhz)xP%Uwd zC`m~ynK+wI!oXD5&?v;v)XKon%GgZXz`)ADp!4eDRTB?NMqrcs(IG7cG(rPvM5*rdX1nOb%boFyt=akR{0En4Yp#T5? diff --git a/gfx/pokemon/front/arcanineh.png b/gfx/pokemon/front/arcanineh.png index 868ccdd1d154c7245a7e513487fe53b550dd9b6d..2c954c718fdf39836b01e1ead456ced8a0c404e5 100644 GIT binary patch delta 756 zcmZ3_{+xY+%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6gN#&ShpY%_nN&WHkvxBV8kl z5F=wNLjx;Q6Kw+nD+7Z?bC*O;yeR2|B4-Sd6H8ah1{$SN;u=wsl30>zRg#&TT3nKt zTfkssU}UU|q6cbT%T-&e$xMuy_0FCyjv*T7Lnk|CUvZFVyMHrfS83!67IXIQOIo&9 zY$N|WsF`pFam`IluhPqKtp3O^Qug(kW6uS-J(_Ed&b5Ci7d2s?i_O>YlEd4Uw|tzv zg=4P6r1WRi_xBjrH10NjkZ)bSf#=%+_>}$BaN#49__7W4dl!ENjKkYPP*6heR#3>_F$fJGv z^=j1}#heB+r>I?%Tsx0(b&OiL9P^H(5`V6V^=G!ct6qI{xs)ac@A5BC%NSCUJXWwS z406ztUHD03Wy`!`;pTl0Grm7qndv_1^6c4FY{8MM9L`NQEj!d9a`1oX%c)beKKU)0 zcUb6@PRssRhDUTBv-o5!I`A;WM!{K9I{x(s_Y%&~B_~(C{J^x{^G2p-oH(~(Tyx6W z_p99Ayj|;DpLlT6w64SJlVqiO4K3GLY$;x|abH$XfT$qg2^^`ECBOl09KbJI+07navmTUAJq(wxxW%)9l)s zm(9#^^HtGwOXXbrFT`6;Fz&Wv>gTfQhBE^{9!)984NW;-l4LJi_qD9+_^(~nJ=_1q j?{EoHT5;eN-+y-L*LJ7xoUjlCCPW5LS3j3^P6-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vpn zcS|rtCa26@y7V&?Y_fH#q0Z3F0TXO}3J(dCObK+#r|=zZCk6F=?NG?Uo$jaij~+b| z!lMWLIeLV?`3RR=53t4fOUDn`Vay=P4W@)XN3<#S_H-WECIHGPCuejueJyaJxZTK&m{8EwUnxo z8*KGTWKgRD5wF{Ce*(E2R-FwR17tc>1?R$Rnv^`9X_i4R;>@-g2$$~hjd*j z{zth5ng|{4Bss$9^A;^gp-r^P6Z#X{4%lE^$^**N-Oqwr@8NchW_P|#>J)O!sVYsT zFC*3@ Date: Fri, 29 Dec 2023 20:16:26 +1100 Subject: [PATCH 17/30] fixed battle tent rewards --- scripts/BattleTent.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/BattleTent.asm b/scripts/BattleTent.asm index a67bdca5..42f60344 100644 --- a/scripts/BattleTent.asm +++ b/scripts/BattleTent.asm @@ -615,6 +615,7 @@ BattleTentGuy_After: call PrintText ld a, [wBTRewards] ld b, RARE_CANDY + ld c, a call GiveItem jr nc, .bag_full ; could use money instead here ld hl, ReceivedRewardText @@ -626,6 +627,7 @@ BattleTentGuy_After: ld [wBTRewards], a ;ld b, POWER_FEED ld b, BOTTLE_CAP + ld c, a call GiveItem jr nc, .bag_full ld hl, ReceivedRewardText @@ -889,7 +891,7 @@ BattleTentGuy2_Heal: done ReceivedRewardPreamble: - text "Take these" + text "Take these," line "on the house!" prompt text_end From 9b4a9d5839c57a32d9511ad416775e86d5c7ab8e Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 29 Dec 2023 19:11:11 +0000 Subject: [PATCH 18/30] Yujirou is now marginally less of a twat He now gives you a Bottle Cap when you win, but still crashes the game when you lose for some reason... --- constants/event_constants.asm | 3 +- scripts/FightingDojo.asm | 4 -- scripts/ViridianPreGym.asm | 128 +++++++++++++++++++++------------- text/FightingDojo.asm | 9 ++- text/ViridianPreGym.asm | 50 ++++++++++--- 5 files changed, 127 insertions(+), 67 deletions(-) diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 7232ace7..a04bf97b 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -36,8 +36,9 @@ const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0 const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1 const EVENT_GOT_TM42 + const EVENT_GOT_YUJIROU_BOTTLE_CAP const EVENT_BEAT_YUJIROU - const_skip 11 + const_skip 10 const EVENT_OAK_GOT_PARCEL const EVENT_GOT_OAKS_PARCEL const_skip 22 diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index ec36670f..3836ff63 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -128,8 +128,6 @@ FightingDojoText1: ; gym scaling can be removed to make space ld [wTrainerNo], a ld a, 1 ld [wIsTrainerBattle], a - ld a, $1 - ld [wGymLeaderNo], a jr .asm_9dba4 .normalProcessing CheckEvent EVENT_DEFEATED_FIGHTING_DOJO @@ -164,8 +162,6 @@ FightingDojoText1: ; gym scaling can be removed to make space ld [wTrainerNo], a ld a, 1 ld [wIsTrainerBattle], a - ld a, $1 - ld [wGymLeaderNo], a ; play gym music ;ends here diff --git a/scripts/ViridianPreGym.asm b/scripts/ViridianPreGym.asm index c2a98a7a..659f8235 100644 --- a/scripts/ViridianPreGym.asm +++ b/scripts/ViridianPreGym.asm @@ -26,12 +26,24 @@ ViridianGymYujirouPostBattle: jp z, ViridianGymResetScripts ld a, $f0 ld [wJoyIgnore], a -; SetEvents EVENT_BEAT_YUJIROU, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1 ; Needs to be set here for the correct text to pop up. -; ld a, $3 -; ld [hSpriteIndex], a -; call DisplayTextID -; xor a -; ld [wViridianPreGymCurScript], a +ViridianPreGymScriptReceiveBottleCap: + ld a, $b + ldh [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_BEAT_YUJIROU + lb bc, BOTTLE_CAP, 1 + call GiveItem + jr nc, .BagFull + ld a, $c + ldh [hSpriteIndexOrTextID], a + call DisplayTextID + SetEvent EVENT_GOT_YUJIROU_BOTTLE_CAP + jp ViridianPreGymResetScripts +.BagFull + ld a, $d + ldh [hSpriteIndexOrTextID], a + call DisplayTextID + jp ViridianPreGymResetScripts ViridianPreGym_TextPointers: dw ViridianPreGymText1 @@ -44,6 +56,9 @@ ViridianPreGym_TextPointers: dw ViridianPreGymSign4 dw ViridianPreGymStatue1 dw ViridianPreGymStatue2 + dw BeforeReceivedBottleCapText + dw ReceivedBottleCapText + dw BottleCapNoRoomText ViridianPreGymTrainerHeaders: def_trainers @@ -58,41 +73,12 @@ YujirouText: CheckEvent EVENT_POST_GAME_ATTAINED ; No need to view previous stuff jr nz, .rematchMode CheckEvent EVENT_BEAT_YUJIROU - jp nz, .YujirouBeaten - ld hl, YujirouIntro - call PrintText - - ld c, BANK(Music_MeetMaleTrainer) - ld a, MUSIC_MEET_MALE_TRAINER - call PlayMusic - - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, YujirouLoseText - ld de, YujirouWinText - call SaveEndBattleTextPointers - ldh a, [hSpriteIndex] - ld [wSpriteIndex], a - call EngageMapTrainer - - ; gym scaling spaghetti code begins here - remove initial parameters as we're making our own - ld a, OPP_YUJIROU - ld [wCurOpponent], a - - ld hl, wObtainedBadges ; Picking the team based on badge count. Need +1 so it loads the right team: remember, you're fighting for the badge! Thanks to Chatot4444 for the help. - ld b, 1 - call CountSetBits - ld a, [wNumSetBits] - inc a - ld [wTrainerNo], a - - ld a, 1 - ld [wIsTrainerBattle], a - ld a, $3 - ld [wViridianPreGymCurScript], a - ld [wCurMapScript], a - jr .done + jp z, .yujirouNotBeaten + CheckEventReuseA EVENT_GOT_YUJIROU_BOTTLE_CAP + jr nz, .yujirouBeaten + call z, PewterGymScriptReceiveTM34 + call DisableWaitingAfterTextDisplay + jp .done ; needed due to the rematch script length. .rematchMode ; Rematch functionality. Just loads pre-battle text and his trainer. ld hl, YujirouIntro2 call PrintText @@ -105,7 +91,7 @@ YujirouText: ldh a, [hSpriteIndex] ld [wSpriteIndex], a ld hl, YujirouLoseText2 - ld de, YujirouWinText + ld de, YujirouLoseText2 call SaveEndBattleTextPointers call EngageMapTrainer ld a, OPP_YUJIROU @@ -114,12 +100,46 @@ YujirouText: ld [wTrainerNo], a ld a, 1 ld [wIsTrainerBattle], a - ld a, $1 - ld [wGymLeaderNo], a jr .done -.YujirouBeaten +.yujirouBeaten ld hl, YujirouAfterBattleText call PrintText + jr .done +.yujirouNotBeaten + ld hl, YujirouIntro + call PrintText + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, YujirouLoseText + ld de, YujirouLoseText + call SaveEndBattleTextPointers + ldh a, [hSpriteIndex] + ld [wSpriteIndex], a + call EngageMapTrainer + + + ; gym scaling spaghetti code begins here - remove initial parameters as we're making our own + ld a, OPP_YUJIROU + ld [wCurOpponent], a + + ld hl, wObtainedBadges ; Picking the team based on badge count. Need +1 so it loads the right team: remember, you're fighting for the badge! Thanks to Chatot4444 for the help. + ld b, 1 + call CountSetBits + ld a, [wNumSetBits] + inc a + + ld [wTrainerNo], a + ld a, 1 + ld [wIsTrainerBattle], a + + ;ends here + + xor a + ldh [hJoyHeld], a + ld a, $3 + ld [wViridianPreGymCurScript], a + ld [wCurMapScript], a .done jp TextScriptEnd @@ -131,14 +151,24 @@ YujirouLoseText:: text_far _YujirouLoseText text_end -YujirouWinText:: - text_far _YujirouWinText - text_end - YujirouAfterBattleText:: text_far _YujirouAfterBattleText text_end +BeforeReceivedBottleCapText: + text_far _BeforeReceivedBottleCapText + text_end + +ReceivedBottleCapText: + text_far _ReceivedBottleCapText + sound_get_item_1 + text_far _BottleCapExplanationText + text_end + +BottleCapNoRoomText: + text_far _BottleCapNoRoomText + text_end + YujirouIntro2:: text_far _YujirouIntro2 text_end diff --git a/text/FightingDojo.asm b/text/FightingDojo.asm index dfe84354..7d7ba24a 100644 --- a/text/FightingDojo.asm +++ b/text/FightingDojo.asm @@ -35,10 +35,9 @@ _FightingDojoText_5ce98:: done _FightingDojoText_5ce9d:: - text "Ho!" - - para "Stay and train at" - line "Karate with us!" + text "Hyah!" + line "Stay and train at" + cont "karate with us!" done _FightingDojoBattleText1:: @@ -139,7 +138,7 @@ _OiMateText:: done _KoichiRematchPreBattleText:: - text "Ho, !" + text "!" para "Did you return" line "to spar with us" diff --git a/text/ViridianPreGym.asm b/text/ViridianPreGym.asm index af3a7504..ddd9fa6c 100644 --- a/text/ViridianPreGym.asm +++ b/text/ViridianPreGym.asm @@ -17,12 +17,19 @@ _YujirouLoseText:: line "I lost?!" prompt -_YujirouWinText:: - text "Ha!" - line "Small fry!" - prompt - _YujirouAfterBattleText:: + text "I won't give up!" + line "I'll train with" + cont "my #MON until" + cont "we're the best" + cont "there is!" + + para "One day, we will" + line "beat you!" + + done + +_BeforeReceivedBottleCapText:: text "I lost..." para "..." @@ -35,7 +42,34 @@ _YujirouAfterBattleText:: para "One day, we will" line "beat you!" - + + para "Oh yeah! You can" + line "have this for" + cont "winning!" + done + +_ReceivedBottleCapText:: + text " received" + line "BOTTLE CAP!@" + text_end + +_BottleCapExplanationText:: + text_start + + para "I know it's not" + line "a real BADGE..." + cont "but look at how" + cont "shiny it is!" + + para "Maybe it'll come" + line "in handy some" + cont "other time." + done + +_BottleCapNoRoomText:: + text "Wait, you've got" + line "way too many" + cont "items already!" done _YujirouIntro2:: @@ -95,8 +129,8 @@ _ViridianPreGymBattleText2:: done _ViridianPreGymEndBattleText2:: - text "CLEFAIRY!" - line "No!" + text "No!" + line "CLEFAIRY!" prompt _ViridianPreGymAfterBattleText2:: From da4082bca3798e36f86b627b08d754f505c33069 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 29 Dec 2023 20:34:45 +0000 Subject: [PATCH 19/30] Update ViridianPreGym.asm This makes it so you don't miss the Bottle Cap gift that Yujirou gives you, even if you beat the Elite 4 before him. There's a similar issue with the Fighting Dojo where the same thing happens but I'm less sure on how to fix that one... --- scripts/ViridianPreGym.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ViridianPreGym.asm b/scripts/ViridianPreGym.asm index 659f8235..054039a5 100644 --- a/scripts/ViridianPreGym.asm +++ b/scripts/ViridianPreGym.asm @@ -70,10 +70,10 @@ ViridianPreGymTrainerHeader1: YujirouText: text_asm - CheckEvent EVENT_POST_GAME_ATTAINED ; No need to view previous stuff - jr nz, .rematchMode CheckEvent EVENT_BEAT_YUJIROU jp z, .yujirouNotBeaten + CheckEvent EVENT_POST_GAME_ATTAINED ; No need to view previous stuff + jr nz, .rematchMode CheckEventReuseA EVENT_GOT_YUJIROU_BOTTLE_CAP jr nz, .yujirouBeaten call z, PewterGymScriptReceiveTM34 From 9060580fdafbccdf9c4e7c1a383fb9f4f0ce46e1 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 29 Dec 2023 20:49:43 +0000 Subject: [PATCH 20/30] Mainly updating the remaining bugs list on the README just in case --- README.md | 10 ++++++---- text/CeladonMansion3F.asm | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0c73c4cd..c03c196c 100644 --- a/README.md +++ b/README.md @@ -259,12 +259,14 @@ and more! Known Bugs ==== -Comprehensive list can be found on Discord. -- Occasionally, menu text sets itself to scroll. +- Losing to Yujirou's initial team crashes the game. +- The Fighing Dojo Karate Master doesn't allow you to rematch him after losing to him, but still lets you pick a Hitmon. If you defeat the Elite Four before him, the Hitmon gift is instead permanently locked off. +- Occasionally, menu text sets itself to scroll. (hasn't happened for a while, either uncommon or fixed) - The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1. - Fake Tears and Nasty Plot don't quite look right when done from the opponent's side. -- Yujirou seems to crash the game after battling him sometimes. -- The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle +- The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle. +- Silph Co. Worker doesn't give Lapras as a gift on occasion (this happened like one time, more testing needed) +- The final battle against Blue uses the wrong team when Eevee is chosen. Evolution Methods for new Pokemon ==== diff --git a/text/CeladonMansion3F.asm b/text/CeladonMansion3F.asm index 42d5703c..4fd67e83 100644 --- a/text/CeladonMansion3F.asm +++ b/text/CeladonMansion3F.asm @@ -99,7 +99,7 @@ _CeladonMansionMorimotoNo:: ; USUM _CeladonMansionMorimotoDefeated:: ; LGPE, compressed text "When" line "it comes down" - line "to it, you are" + cont "to it, you are" cont "still the best!" prompt From 51185204d0c126c236ddda602111a78f030efdb0 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 29 Dec 2023 22:37:14 +0000 Subject: [PATCH 21/30] One more bug down! --- README.md | 2 +- scripts/FightingDojo.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c03c196c..47381e15 100644 --- a/README.md +++ b/README.md @@ -260,7 +260,7 @@ and more! Known Bugs ==== - Losing to Yujirou's initial team crashes the game. -- The Fighing Dojo Karate Master doesn't allow you to rematch him after losing to him, but still lets you pick a Hitmon. If you defeat the Elite Four before him, the Hitmon gift is instead permanently locked off. +- If you defeat the Elite Four before the Fighing Dojo Karate Master, the Hitmon gift is permanently locked off. - Occasionally, menu text sets itself to scroll. (hasn't happened for a while, either uncommon or fixed) - The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1. - Fake Tears and Nasty Plot don't quite look right when done from the opponent's side. diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index 3836ff63..44cf5aef 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -168,7 +168,6 @@ FightingDojoText1: ; gym scaling can be removed to make space ld a, $3 ld [wFightingDojoCurScript], a ld [wCurMapScript], a - SetEvent EVENT_DEFEATED_FIGHTING_DOJO jr .asm_9dba4 .continue1 ld hl, FightingDojoText_5ce9d @@ -177,6 +176,7 @@ FightingDojoText1: ; gym scaling can be removed to make space .continue2 ld hl, FightingDojoText8 call PrintText + SetEvent EVENT_DEFEATED_FIGHTING_DOJO .asm_9dba4 jp TextScriptEnd From 8893f847a0d83fc3c535838530916e3b909178f6 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 29 Dec 2023 23:21:42 +0000 Subject: [PATCH 22/30] HAHAHA FUCK YOU YUJIROU WE WIN PRAISE BE TO RAINBOW METAL PIGEON, OH MY GOD --- README.md | 1 - scripts/ViridianPreGym.asm | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 47381e15..a4ed6170 100644 --- a/README.md +++ b/README.md @@ -259,7 +259,6 @@ and more! Known Bugs ==== -- Losing to Yujirou's initial team crashes the game. - If you defeat the Elite Four before the Fighing Dojo Karate Master, the Hitmon gift is permanently locked off. - Occasionally, menu text sets itself to scroll. (hasn't happened for a while, either uncommon or fixed) - The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1. diff --git a/scripts/ViridianPreGym.asm b/scripts/ViridianPreGym.asm index 054039a5..106c52e9 100644 --- a/scripts/ViridianPreGym.asm +++ b/scripts/ViridianPreGym.asm @@ -23,7 +23,7 @@ ViridianPreGym_ScriptPointers: ViridianGymYujirouPostBattle: ld a, [wIsInBattle] cp $ff - jp z, ViridianGymResetScripts + jp z, ViridianPreGymResetScripts ld a, $f0 ld [wJoyIgnore], a ViridianPreGymScriptReceiveBottleCap: @@ -76,7 +76,7 @@ YujirouText: jr nz, .rematchMode CheckEventReuseA EVENT_GOT_YUJIROU_BOTTLE_CAP jr nz, .yujirouBeaten - call z, PewterGymScriptReceiveTM34 + call z, ViridianPreGymScriptReceiveBottleCap call DisableWaitingAfterTextDisplay jp .done ; needed due to the rematch script length. .rematchMode ; Rematch functionality. Just loads pre-battle text and his trainer. From 72b5bd7b0e7b3f2302be6724ea6edfeb13971948 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sat, 30 Dec 2023 15:39:34 +0000 Subject: [PATCH 23/30] Fixing some text inconsistencies --- data/text/item_descriptions.asm | 2 +- text/BrunswickTrail.asm | 4 ++-- text/CeladonCity.asm | 6 +++-- text/CeladonGym.asm | 21 ++++++++--------- text/CeruleanGym.asm | 12 +++++----- text/CinnabarGym.asm | 40 +++++++++++++++++++-------------- text/CitrineCity.asm | 2 +- text/CitrineTradebackHouse.asm | 2 +- text/FightingDojo.asm | 3 ++- text/FuchsiaGym_2.asm | 2 +- text/GameCorner.asm | 5 +++-- text/LoreleisRoom.asm | 2 +- text/OaksLab.asm | 12 +++++----- text/PewterCity.asm | 2 +- text/PewterGym.asm | 2 +- text/PokemonMansionB2F.asm | 2 +- text/RockTunnelB1F.asm | 2 +- text/Route1.asm | 2 +- text/Route9.asm | 6 ++--- text/SaffronCity.asm | 2 +- text/SaffronGym.asm | 11 ++++----- text/VermilionGym_2.asm | 13 ++++++----- text/ViridianGym.asm | 10 +++------ 23 files changed, 88 insertions(+), 77 deletions(-) diff --git a/data/text/item_descriptions.asm b/data/text/item_descriptions.asm index 1c7744a0..96404035 100644 --- a/data/text/item_descriptions.asm +++ b/data/text/item_descriptions.asm @@ -524,7 +524,7 @@ _TM26Description:: prompt _TM27Description:: - text "A ground-type," + text "A GROUND-type," next "one-hit KO attack." prompt diff --git a/text/BrunswickTrail.asm b/text/BrunswickTrail.asm index f59e7135..40c97b8f 100644 --- a/text/BrunswickTrail.asm +++ b/text/BrunswickTrail.asm @@ -41,7 +41,7 @@ _Lover2:: _BrunswickBattleText1:: text "I'm searching" - line "for rare BIRD" + line "for rare bird" cont "#MON!" done @@ -69,7 +69,7 @@ _BrunswickEndBattleText2:: prompt _BrunswickAfterBattleText2:: - text "I saw a BIRD" + text "I saw a bird" line "#MON with huge" cont "legs sprint past" cont "me!" diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm index a0e4826e..6d05a2b0 100644 --- a/text/CeladonCity.asm +++ b/text/CeladonCity.asm @@ -67,7 +67,8 @@ _CeladonCityText6:: para "It evolved from" line "POLIWHIRL when I" - cont "used WATER STONE!" + cont "gave it a WATER" + cont "STONE!" done _CeladonCityText7:: @@ -138,7 +139,8 @@ _CeladonCityText16:: line "protects #MON" cont "against SPECIAL" cont "attacks such as" - cont "fire and water!" + cont "FIRE- and WATER-" + cont "type techniques!" para "It even improves" line "their own!" diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm index 80bfd30a..fea9feee 100644 --- a/text/CeladonGym.asm +++ b/text/CeladonGym.asm @@ -14,7 +14,7 @@ _ErikaPreBattleText:: para "I teach the art of" line "flower arranging." cont "My #MON are of" - cont "the grass-type." + cont "the GRASS-type." para "Oh, I'm sorry, I" line "had no idea that" @@ -110,13 +110,14 @@ _CeladonGymEndBattleText3:: prompt _CeladonGymAfterBattleText3:: - text "Grass-type #MON" + text "GRASS-type #MON" line "are tough against" - cont "the water-type!" + cont "the WATER-type!" para "They also have an" - line "edge on rock and" - cont "ground #MON!" + line "advantage against" + cont "ROCK- and GROUND-" + cont "type #MON!" done _CeladonGymBattleText4:: @@ -137,8 +138,8 @@ _CeladonGymAfterBattleText4:: done _CeladonGymBattleText5:: - text "Look at my grass" - line "#MON!" + text "Look at my GRASS-" + line "type #MON!" para "They're so easy" line "to raise!" @@ -149,7 +150,7 @@ _CeladonGymEndBattleText5:: prompt _CeladonGymAfterBattleText5:: - text "We only use grass-" + text "We only use GRASS-" line "type #MON at" cont "our GYM!" @@ -160,8 +161,8 @@ _CeladonGymAfterBattleText5:: _CeladonGymBattleText6:: text "Don't bring any" - line "bugs or fire" - cont "#MON in here!" + line "BUG- or FIRE-" + cont "type #MON!" done _CeladonGymEndBattleText6:: diff --git a/text/CeruleanGym.asm b/text/CeruleanGym.asm index d8643b6c..f71453b1 100644 --- a/text/CeruleanGym.asm +++ b/text/CeruleanGym.asm @@ -13,7 +13,7 @@ _MistyPreBattleText:: para "My policy is an" line "all-out offensive" - cont "with water-type" + cont "with WATER-type" cont "#MON!" done @@ -111,8 +111,8 @@ _CeruleanGymEndBattleText3:: _CeruleanGymAfterBattleText3:: text "Why is a FIRE-" line "FIGHTER in a" - cont "GYM for water" - cont "#MON?" + cont "GYM for WATER-" + cont "type #MON?" para "Haha! You have to" ; Actually happens in real life! line "check for short" @@ -121,13 +121,13 @@ _CeruleanGymAfterBattleText3:: _CeruleanGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "Here's my advice!" para "The LEADER, MISTY," line "is a pro who uses" - cont "water #MON!" + cont "WATER-types!" para "You can drain all" line "their water with" @@ -141,7 +141,7 @@ _CeruleanGymGuidePostBattleText:: text "You beat MISTY!" line "What'd I tell ya?" - para "You and me kid," + para "You and me, kid," line "we make a pretty" cont "darn good team!" done diff --git a/text/CinnabarGym.asm b/text/CinnabarGym.asm index 7328f9e5..703a5a19 100644 --- a/text/CinnabarGym.asm +++ b/text/CinnabarGym.asm @@ -23,11 +23,11 @@ _ReceivedVolcanoBadgeText:: _BlainePostBattleAdviceText:: text "FIRE BLAST is the" - line "ultimate fire" + line "ultimate fiery" cont "technique!" para "Don't waste it on" - line "water #MON!" + line "WATER-types!" done _BlaineVolcanoBadgeInfoText:: @@ -55,7 +55,7 @@ _TM38ExplanationText:: para "TM38 contains" line "FIRE BLAST!" - para "Teach it to fire-" + para "Teach it to FIRE-" line "type #MON!" para "CHARMELEON or" @@ -124,7 +124,7 @@ _CinnabarGymAfterBattleText3:: _CinnabarGymBattleText4:: text "I just like using" - line "fire #MON!" + line "the FIRE-type!" done _CinnabarGymEndBattleText4:: @@ -133,9 +133,9 @@ _CinnabarGymEndBattleText4:: prompt _CinnabarGymAfterBattleText4:: - text "I wish there was" - line "a thief #MON!" - cont "I'd use that!" + text "I wonder...does a" + line "FIRE-type thief" + cont "#MON exist?" done _CinnabarGymBattleText5:: @@ -170,9 +170,9 @@ _CinnabarGymEndBattleText6:: prompt _CinnabarGymAfterBattleText6:: - text "Us fire #MON" - line "fans like PONYTA" - cont "and NINETALES!" + text "Us FIRE-type fans" + line "like PONYTA and" + cont "NINETALES a lot!" done _CinnabarGymBattleText7:: @@ -186,21 +186,27 @@ _CinnabarGymEndBattleText7:: prompt _CinnabarGymAfterBattleText7:: - text "Water beats fire!" - line "But, fire melts" - cont "ice #MON!" + text "Water beats fire," + line "but fire easily" + cont "melts ice!" + + para "WATER- and ICE-" + line "type #MON like" + cont "DEWGONG can be" + cont "tricky..." done _CinnabarGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "The hot-headed" - line "BLAINE is a fire" - cont "#MON pro!" + line "BLAINE is a FIRE-" + cont "type #MON pro!" para "Douse his spirits" - line "with water!" + line "with WATER-type" + cont "techniques!" para "You better take" line "some BURN HEALs!" diff --git a/text/CitrineCity.asm b/text/CitrineCity.asm index 10525626..fc9d55f4 100644 --- a/text/CitrineCity.asm +++ b/text/CitrineCity.asm @@ -75,7 +75,7 @@ _CitrineCityText3:: done _CitrineCityText4:: - text "Some BIRD #MON" + text "Some bird #MON" line "roost on the" cont "hill north of" cont "here every year." diff --git a/text/CitrineTradebackHouse.asm b/text/CitrineTradebackHouse.asm index 5efef4ea..fc1604f8 100644 --- a/text/CitrineTradebackHouse.asm +++ b/text/CitrineTradebackHouse.asm @@ -10,6 +10,6 @@ _CitrineTradebackHouseGuy:: _CitrineTradebackHouseBooklet:: text "It's a book showing" - line "two strange BIRD" + line "two strange bird" cont "#MON." done diff --git a/text/FightingDojo.asm b/text/FightingDojo.asm index 7d7ba24a..d9c56be9 100644 --- a/text/FightingDojo.asm +++ b/text/FightingDojo.asm @@ -28,7 +28,8 @@ _FightingDojoText_5ce98:: para "In return, I will" line "give you a prized" - cont "fighting #MON!" + cont "FIGHTING-type" + cont "#MON!" para "Choose whichever" line "one you like!" diff --git a/text/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm index c256e019..4f76173c 100644 --- a/text/FuchsiaGym_2.asm +++ b/text/FuchsiaGym_2.asm @@ -172,7 +172,7 @@ _FuchsiaGymAfterBattleText6:: _FuchsiaGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "FUCHSIA GYM is" line "riddled with" diff --git a/text/GameCorner.asm b/text/GameCorner.asm index 1868daf8..a237090c 100644 --- a/text/GameCorner.asm +++ b/text/GameCorner.asm @@ -88,11 +88,12 @@ _CeladonGameCornerText_48dca:: para "You have better" line "things to do," - cont "champ in making!" + cont "champ in the" + cont "making!" para "CELADON GYM's" line "LEADER is ERIKA!" - cont "She uses grass-" + cont "She uses GRASS-" cont "type #MON!" para "She might appear" diff --git a/text/LoreleisRoom.asm b/text/LoreleisRoom.asm index 868cb7f3..b9bb8a17 100644 --- a/text/LoreleisRoom.asm +++ b/text/LoreleisRoom.asm @@ -60,7 +60,7 @@ _LoreleiRematchAfterBattleText:: text "I may have lost" line "to you, but I'll" cont "never give up on" - cont "ice #MON!" + cont "icy #MON!" para "You should aim to" line "win using #MON" diff --git a/text/OaksLab.asm b/text/OaksLab.asm index f384f56c..c40f65c2 100644 --- a/text/OaksLab.asm +++ b/text/OaksLab.asm @@ -27,32 +27,32 @@ _OaksLabText39:: _OaksLabCharmanderText:: text "So! You want the" - line "fire #MON," + line "FIRE #MON," cont "CHARMANDER?" done _OaksLabSquirtleText:: text "So! You want the" - line "water #MON," + line "WATER #MON," cont "SQUIRTLE?" done _OaksLabBulbasaurText:: text "So! You want the" - line "plant #MON," + line "GRASS #MON," cont "BULBASAUR?" done _OaksLabPikachuText:: text "So! You want the" - line "electric #MON," + line "mouse #MON," cont "PIKACHU?" done _OaksLabEeveeText:: text "So! You want the" - line "normal #MON," - cont "EEVEE?" + line "evolution #-" + cont "MON, EEVEE?" done _OaksLabMonEnergeticText:: diff --git a/text/PewterCity.asm b/text/PewterCity.asm index 14240c9e..3e579462 100644 --- a/text/PewterCity.asm +++ b/text/PewterCity.asm @@ -1,6 +1,6 @@ _PewterCityText1:: text "It's rumored that" - line "CLEFAIRYs came" + line "CLEFAIRY came" cont "from the moon!" para "They appeared " diff --git a/text/PewterGym.asm b/text/PewterGym.asm index 8110b116..47293b6a 100644 --- a/text/PewterGym.asm +++ b/text/PewterGym.asm @@ -9,7 +9,7 @@ _BrockPreBattleText:: para "That's why my" line "#MON are all" - cont "the rock-type!" + cont "the ROCK-type!" para "Do you still want" line "to challenge me?" diff --git a/text/PokemonMansionB2F.asm b/text/PokemonMansionB2F.asm index 01974718..9242d0f9 100644 --- a/text/PokemonMansionB2F.asm +++ b/text/PokemonMansionB2F.asm @@ -6,7 +6,7 @@ _B2FBook1:: para "We are getting" line "high energy" cont "readings from" - cont "MEWTWO's PSYCHIC" + cont "MEWTWO's psychic" cont "power!" para "But..." diff --git a/text/RockTunnelB1F.asm b/text/RockTunnelB1F.asm index 1a565eb3..bbfd98b6 100644 --- a/text/RockTunnelB1F.asm +++ b/text/RockTunnelB1F.asm @@ -77,7 +77,7 @@ _RockTunnel2EndBattleText6:: _RockTunnel2AfterBattleText6:: text "In mountains," line "you'll often find" - cont "rock-type #MON." + cont "ROCK-type #MON." done _RockTunnel2BattleText7:: diff --git a/text/Route1.asm b/text/Route1.asm index da7ba7c2..85b6a7a2 100644 --- a/text/Route1.asm +++ b/text/Route1.asm @@ -146,7 +146,7 @@ _OakCitrineExplain:: cont "go to become far" cont "stronger." - para "Some strange BIRD" + para "Some strange bird" line "#MON are said" cont "to roost there," cont "but they are so" diff --git a/text/Route9.asm b/text/Route9.asm index 9975000d..cbdc42e5 100644 --- a/text/Route9.asm +++ b/text/Route9.asm @@ -135,8 +135,8 @@ _Route9AfterBattleText8:: done _Route9BattleText9:: - text "Go, my super bug" - line "#MON!" + text "Go, my super BUG-" + line "type #MON!" done _Route9EndBattleText9:: @@ -146,7 +146,7 @@ _Route9EndBattleText9:: _Route9AfterBattleText9:: text "If you don't like" - line "bug #MON, you" + line "bugs, you really" cont "bug me!" done diff --git a/text/SaffronCity.asm b/text/SaffronCity.asm index 3b8cc3e0..0fc7ee73 100644 --- a/text/SaffronCity.asm +++ b/text/SaffronCity.asm @@ -102,7 +102,7 @@ _SaffronCityText18:: cont "LEADER: SABRINA" para "The Master of" - line "Psychic #MON!" + line "PSI #MON!" done _SaffronCityText20:: diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm index 8a39e02f..517ec61e 100644 --- a/text/SaffronGym.asm +++ b/text/SaffronGym.asm @@ -72,15 +72,15 @@ _TM46NoRoomText:: _SaffronGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "SABRINA's #MON" line "use psychic power" cont "instead of force!" - para "Fighting #MON" + para "FIGHTING-types" line "are weak against" - cont "psychic #MON!" + cont "psychic power!" para "They get creamed" line "before they can" @@ -129,8 +129,9 @@ _SaffronGymEndBattleText2:: prompt _SaffronGymAfterBattleText2:: - text "Psychic #MON" - line "fear only bugs!" ; changed to the Yellow version because this guy LIES in RGB + text "PSYCHIC-types are" + line "afraid of DARK-" + cont "and BUG-types!" done _SaffronGymBattleText3:: diff --git a/text/VermilionGym_2.asm b/text/VermilionGym_2.asm index be6198df..5f7a113e 100644 --- a/text/VermilionGym_2.asm +++ b/text/VermilionGym_2.asm @@ -6,7 +6,7 @@ _LTSurgePostBattleAdviceText:: line "sure powerful!" para "But, it's useless" - line "against ground-" + line "against GROUND-" cont "type #MON!" done @@ -37,7 +37,9 @@ _TM24ExplanationText:: line "THUNDERBOLT!" para "Teach it to an" - line "electric #MON!" + line "ELECTRIC-type," + cont "like PIKACHU or" + cont "GAOTORA!" done _TM24NoRoomText:: @@ -119,7 +121,7 @@ _VermilionGymAfterBattleText3:: _VermilionGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "LT.SURGE has a" line "nickname. People" @@ -128,9 +130,10 @@ _VermilionGymGuidePreBattleText:: cont "American!" para "He's an expert on" - line "electric #MON!" + line "ELECTRIC-type" + cont "#MON!" - para "Birds and water" + para "Birds and aquatic" line "#MON are at" cont "risk! Beware of" cont "paralysis too!" diff --git a/text/ViridianGym.asm b/text/ViridianGym.asm index 5544e433..d02a6f9f 100644 --- a/text/ViridianGym.asm +++ b/text/ViridianGym.asm @@ -143,7 +143,7 @@ _ViridianGymEndBattleText4:: _ViridianGymAfterBattleText4:: text "If my #MON" line "were as good at" - cont "Karate as I..." + cont "karate as I..." done _ViridianGymBattleText5:: @@ -214,11 +214,7 @@ _ViridianGymAfterBattleText8:: _ViridianGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" - - para "Even I don't know" - line "VIRIDIAN LEADER's" - cont "identity!" + line "the making!" para "This will be the" line "toughest of all" @@ -226,7 +222,7 @@ _ViridianGymGuidePreBattleText:: para "I heard that the" line "trainers here" - cont "like ground-type" + cont "like GROUND-type" cont "#MON!" done From 980664075b2018eb2eb215bca093a541d03c908d Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sat, 30 Dec 2023 16:29:55 +0000 Subject: [PATCH 24/30] Yay! Fixed a glitch again! --- README.md | 1 - scripts/ChampionsRoom.asm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index a4ed6170..6f8073e9 100644 --- a/README.md +++ b/README.md @@ -265,7 +265,6 @@ Known Bugs - Fake Tears and Nasty Plot don't quite look right when done from the opponent's side. - The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle. - Silph Co. Worker doesn't give Lapras as a gift on occasion (this happened like one time, more testing needed) -- The final battle against Blue uses the wrong team when Eevee is chosen. Evolution Methods for new Pokemon ==== diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index 3cedbbb0..cef930e4 100644 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -80,8 +80,8 @@ GaryScript2: jr .saveTrainerId .Charmander cp STARTER1 ; changes start here - ld a, $3 jr nz, .Pikachu + ld a, $3 jr .saveTrainerId .Pikachu ; cp STARTER4 From dacb23f87bca3edcdc2d7a584521b1a702afa9fe Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sat, 30 Dec 2023 17:26:51 +0000 Subject: [PATCH 25/30] Update RockTunnelB1F.asm lol we accidentally made Kleavor postgame-only, fixing that now --- data/maps/objects/RockTunnelB1F.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index 73a136ed..092abc8e 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -19,9 +19,9 @@ RockTunnelB1F_Object: object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11 object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5 object_event 22, 5, SPRITE_YOUNGSTER, STAY, DOWN, 9 - object_event 7, 23, SPRITE_FOSSIL, STAY, NONE, 10, HELIX_FOSSIL - object_event 6, 23, SPRITE_FOSSIL, STAY, NONE, 11, DOME_FOSSIL - object_event 8, 24, SPRITE_OLD_AMBER, STAY, NONE, 12, OLD_AMBER - object_event 5, 24, SPRITE_FOSSIL, STAY, NONE, 13, WING_FOSSIL + object_event 7, 25, SPRITE_FOSSIL, STAY, NONE, 10, HELIX_FOSSIL + object_event 6, 25, SPRITE_FOSSIL, STAY, NONE, 11, DOME_FOSSIL + object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, 12, BLK_AUGURITE + object_event 5, 23, SPRITE_FOSSIL, STAY, NONE, 13, WING_FOSSIL def_warps_to ROCK_TUNNEL_B1F From d20207f012c14fda2208638a10ab75b57b6d317b Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sat, 30 Dec 2023 20:10:11 +0000 Subject: [PATCH 26/30] Salesman 'Obtained item!' text Yeah for some reason the salesman didn't actually tell you that you got the item. Meanie. --- scripts/CinnabarPokecenter.asm | 36 +++++++++++++++++++++++----------- scripts/FuchsiaCity.asm | 23 +++++++++++++++++----- text/CinnabarPokecenter.asm | 11 +++++++++-- text/FuchsiaCity.asm | 6 ++++++ 4 files changed, 58 insertions(+), 18 deletions(-) diff --git a/scripts/CinnabarPokecenter.asm b/scripts/CinnabarPokecenter.asm index eddf5d55..f79cbd6a 100644 --- a/scripts/CinnabarPokecenter.asm +++ b/scripts/CinnabarPokecenter.asm @@ -40,7 +40,7 @@ PoryZSalesmanText: jp nz, .choseNo ldh [hMoney], a ldh [hMoney + 2], a - ld a, $21 + ld a, $30 ldh [hMoney + 1], a call HasEnoughMoney jr nc, .enoughMoney @@ -49,11 +49,13 @@ PoryZSalesmanText: .enoughMoney lb bc, DUBIOUS_DISC, 1 call GiveItem - jr nc, .done + jr nc, .BagFull + ld hl, ReceivedDubiousDiscText + call PrintText xor a ld [wPriceTemp], a ld [wPriceTemp + 2], a - ld a, $21 + ld a, $30 ld [wPriceTemp + 1], a ld hl, wPriceTemp + 2 ld de, wPlayerMoney + 2 @@ -65,10 +67,17 @@ PoryZSalesmanText: SetEvent EVENT_BOUGHT_DUBIOUS_DISC jr .done .choseNo - ld hl, .RefuseText - jr .printText + ld hl, RefuseText2 + call PrintText + jr .done .alreadyBoughtPoryZ ld hl, .Text2 + call PrintText + jr .done +.BagFull + ld hl, PoryZBagFull + call PrintText + jr .done .printText call PrintText .done @@ -77,17 +86,22 @@ PoryZSalesmanText: .Text1 text_far _PoryZSalesmanText1 text_end - -.RefuseText - text_far _PoryZSalesmanNoText + +.Text2 + text_far _PoryZSalesmanText2 text_end - + .NoMoneyText text_far _PoryZSalesmanNoMoneyText text_end -.Text2 - text_far _PoryZSalesmanText2 +RefuseText2: + text_far _PoryZSalesmanNoText + text_end + +ReceivedDubiousDiscText: + text_far _ReceivedDubiousDiscText + sound_get_item_1 text_end PoryZBagFull: diff --git a/scripts/FuchsiaCity.asm b/scripts/FuchsiaCity.asm index 65d84811..bcf37a7d 100644 --- a/scripts/FuchsiaCity.asm +++ b/scripts/FuchsiaCity.asm @@ -190,7 +190,9 @@ SafariBallSalesman: .enoughMoney lb bc, SAFARI_BALL, 3 call GiveItem - jr nc, .done + jr nc, .BagFull + ld hl, ReceivedSafariBallsText + call PrintText xor a ld [wPriceTemp], a ld [wPriceTemp + 2], a @@ -205,7 +207,13 @@ SafariBallSalesman: call DisplayTextBoxID jr .done .choseNo - ld hl, .RefuseText + ld hl, RefuseText + call PrintText + jr .done +.BagFull + ld hl, SafariBallBagFull + call PrintText + jr .done .printText call PrintText .done @@ -214,13 +222,18 @@ SafariBallSalesman: .Text1 text_far _SafariBallSalesmanText1 text_end + +.NoMoneyText + text_far _SafariBallSalesmanNoMoneyText + text_end -.RefuseText +RefuseText: text_far _SafariBallSalesmanNoText text_end -.NoMoneyText - text_far _SafariBallSalesmanNoMoneyText +ReceivedSafariBallsText: + text_far _ReceivedSafariBallsText + sound_get_item_1 text_end SafariBallBagFull: diff --git a/text/CinnabarPokecenter.asm b/text/CinnabarPokecenter.asm index f56bfcb7..d8f99c91 100644 --- a/text/CinnabarPokecenter.asm +++ b/text/CinnabarPokecenter.asm @@ -33,7 +33,7 @@ _PoryZSalesmanText1:: para "Tell you what." line "You can get a" - cont "copy for ¥2100." + cont "copy for ¥3000." cont "What do you say?" done @@ -44,6 +44,11 @@ _PoryZSalesmanNoText:: cont "chance!" done +_ReceivedDubiousDiscText:: + text " received" + line "DUBIOUS DISC!@" + text_end + _PoryZSalesmanNoMoneyText:: text "You'll need more" line "money than that!" @@ -59,4 +64,6 @@ _PoryZBagFull:: text "Hey, your bag's" line "full! Can't sell" cont "you anything like" - cont "that!" \ No newline at end of file + cont "that!" + done + \ No newline at end of file diff --git a/text/FuchsiaCity.asm b/text/FuchsiaCity.asm index 7d04a0db..498d0277 100644 --- a/text/FuchsiaCity.asm +++ b/text/FuchsiaCity.asm @@ -145,6 +145,11 @@ _SafariBallSalesmanNoText:: cont "me?" done +_ReceivedSafariBallsText:: + text " received" + line "3 SAFARI BALLS!@" + text_end + _SafariBallSalesmanNoMoneyText:: text "Not enough money?" line "Sorry, kid! Paint" @@ -160,6 +165,7 @@ _SafariBallBagFull:: line "give you these" cont "when your bag's" cont "that full!" + done _ReceivedTM50Text:: text " received" From 4c0dfdfeddb8fb8b1e64149e3f6ff07531430607 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sat, 30 Dec 2023 22:39:09 +0000 Subject: [PATCH 27/30] Improvements to Chief! - Now has a rematch team, just with boosted levels - Has unique dialogue if you never picked up the Master Ball before fighting him, including after winning - Has new dialogue on subsequent matches We're nearly done. --- constants/event_constants.asm | 1 + data/trainers/parties.asm | 1 + data/trainers/special_moves.asm | 21 ++++++ layout.link | 2 +- scripts/HallOfFame.asm | 3 +- scripts/SilphGauntlet7F.asm | 72 ++++++++++++++++++- text/SilphCo11F.asm | 2 +- text/SilphGauntlet7F.asm | 122 +++++++++++++++++++++++++++++--- 8 files changed, 208 insertions(+), 16 deletions(-) diff --git a/constants/event_constants.asm b/constants/event_constants.asm index a04bf97b..52ef9732 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -819,6 +819,7 @@ DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1 const_skip 4 const EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH const EVENT_BEAT_CHIEF ; moved out of the below union to prevent bugs + const EVENT_MEWTWO_UNLOCKED ; Silph Gauntlet events const_next $930 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 9d4be3fc..0ff0e33b 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -563,6 +563,7 @@ BlackbeltData: ChiefData: ; Silph Gauntlet 7F db $FF, 66, ELECTRODE, 65, LAPRAS, 66, SCIZOR, 65, GENGAR, 68, PORYGONZ, 70, OMEGADGE, 0 + db $FF, 73, ELECTRODE, 72, LAPRAS, 73, SCIZOR, 72, GENGAR, 75, PORYGONZ, 78, OMEGADGE, 0 ; Lapras and Gengar are used here since Lapras is given by a Silph worker, and Gengar represents the Silph Scope. ; Poison- and Electric-type Pokemon diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index fc70fdf0..76c500b2 100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -1362,6 +1362,27 @@ SpecialTrainerMoves: db 6, 2, THUNDER_WAVE db 6, 4, ICE_BEAM db 0 + + db CHIEF, 2 + db 1, 1, THUNDERBOLT + db 1, 2, THUNDER_WAVE + db 1, 3, HEADBUTT + db 2, 1, BLIZZARD + db 2, 2, THUNDERBOLT + db 2, 3, SING + db 2, 4, HYPER_BEAM + db 3, 1, IRON_HEAD + db 3, 3, HYPER_BEAM + db 4, 1, EXPLOSION + db 4, 2, THUNDERBOLT + db 4, 4, ICE_PUNCH + db 5, 1, THUNDERBOLT + db 5, 2, ICE_BEAM + db 5, 3, RECOVER + db 6, 1, THUNDERBOLT + db 6, 2, THUNDER_WAVE + db 6, 4, ICE_BEAM + db 0 db JESSIE_JAMES, 5 ; J&J postgame db 1, 1, BUBBLEBEAM diff --git a/layout.link b/layout.link index 70f04037..184bf5d5 100644 --- a/layout.link +++ b/layout.link @@ -141,7 +141,6 @@ ROMX $1D "Itemfinder 1" "Maps 20" "Maps 21" - "Itemfinder 2" ROMX $1E "bank1E" ROMX $1F @@ -151,6 +150,7 @@ ROMX $1F "Sound Effects 3" ; "Audio Engine 3" ; "Music 3" + "Itemfinder 2" ROMX $20 "Text 1" ROMX $21 diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 6fd57c39..12da23c1 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -180,7 +180,7 @@ ResetLegendaryPokemon: call ShowThis .skipMew CheckEvent EVENT_POST_GAME_ATTAINED - jp z, .skipGalarianBirdsAndMewtwo ; If you haven't cleared the game yet, you've not met the Galarian Birds. So we may as well skip processing all this. + jp z, .skipGalarianBirdsAndMewtwo ld a, DEX_ARTICUNO_G call HoFIsPokemonBitSet jr nz, .skipArticunoG @@ -257,7 +257,6 @@ ObjectsToHide: db HS_BILLS_NIDORINO ; Bill's Garden access db HS_MANSION_GUARD ; Pokemon Mansion basement access db HS_MT_MOON_CRATER_GUARD ; Mt. Moon Crater access - db HS_CERULEAN_CAVE_GUY ; Cerulean Cave access db -1 ; end ; Farcalling this caused weird issues so I'm just using a clone diff --git a/scripts/SilphGauntlet7F.asm b/scripts/SilphGauntlet7F.asm index e3e6f860..f7215813 100644 --- a/scripts/SilphGauntlet7F.asm +++ b/scripts/SilphGauntlet7F.asm @@ -95,6 +95,7 @@ ChiefScript4: ld a, HS_CERULEAN_CAVE_GUY ld [wMissableObjectIndex], a predef HideObject + SetEvent EVENT_MEWTWO_UNLOCKED ResetEventRange SILPH_GAUNTLET_EVENTS_START, SILPH_GAUNTLET_EVENTS_END, 1 ld a, $0 @@ -117,8 +118,10 @@ SilphGauntlet7F_TextPointers: ChiefText1: text_asm + CheckEvent EVENT_MEWTWO_UNLOCKED + jr nz, .chiefSecondFight CheckEvent EVENT_BEAT_CHIEF ; Check if Chief was beaten - jr nz, .chiefBeaten ; If Chief has been beaten, skip the trainer loading + jr nz, .chiefBeaten1 ; If Chief has been beaten, skip the trainer loading ; standard processing ld hl, ChiefMonologue call PrintText @@ -127,6 +130,9 @@ ChiefText1: call z, WaitForTextScrollButtonPress ; and here. call EnableAutoTextBoxDrawing ; and here. + CheckEvent EVENT_GOT_MASTER_BALL ; Check if Master Ball was collected. + ld hl, ChiefMonologueMasterBallNotCollected ; If no, load this text... + jr z, .masterBallSkip ; ...then skip. CheckEvent EVENT_USED_MASTER_BALL ; Check if the Master Ball has been used. ld hl, ChiefMonologueMasterBallNotUsed ; Load not used by default. jr z, .masterBallSkip ; In which case, we can skip. @@ -153,12 +159,48 @@ ChiefText1: ld de, ChiefVictoryText call SaveEndBattleTextPointers jr .done -.chiefBeaten - ld hl, ChiefAfterBattleText +.chiefBeaten1 + CheckEvent EVENT_GOT_MASTER_BALL ; Check if Master Ball was collected. + ld hl, ChiefAltAfterBattleText ; If no, load this text... + jr z, .noMBallskip ; ...then skip. + ld hl, ChiefAfterBattleText ; otherwise, load this. +.noMBallskip call PrintText ; fallthrough .done jp TextScriptEnd +.chiefSecondFight + CheckEvent EVENT_BEAT_CHIEF ; Check if Chief was beaten + jr nz, .chiefBeaten2 ; If Chief has been beaten, skip the trainer loading + ld hl, ChiefMonologueRematch + call PrintText + ld a, [wSimulatedJoypadStatesEnd] ; ensuring that the text doesn't autoskip. + and a ; yep, here too. + call z, WaitForTextScrollButtonPress ; and here. + call EnableAutoTextBoxDrawing ; and here. + ld c, BANK(Music_MeetEvilTrainer) + ld a, MUSIC_MEET_EVIL_TRAINER + call PlayMusic + + call Delay3 + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld a, OPP_CHIEF + ld [wCurOpponent], a + ld a, 2 + ld [wTrainerNo], a + ld [wIsTrainerBattle], a + ld a, $1 + ld [wSilphGauntlet7FCurScript], a + ld hl, ChiefDefeatedText2 + ld de, ChiefVictoryText2 + call SaveEndBattleTextPointers + jr .done +.chiefBeaten2 + ld hl, ChiefAfterBattleText2 + call PrintText + jr .done ChiefMonologue: text_far _ChiefMonologue @@ -171,6 +213,10 @@ ChiefMonologueMasterBallUsed: ChiefMonologueMasterBallNotUsed: text_far _ChiefMonologueMasterBallNotUsed text_end + +ChiefMonologueMasterBallNotCollected: + text_far _ChiefMonologueMasterBallNotCollected + text_end ChiefDefeatedText: text_far _ChiefDefeatedText @@ -183,6 +229,26 @@ ChiefVictoryText: ChiefAfterBattleText: text_far _ChiefAfterBattleText text_end + +ChiefAltAfterBattleText: + text_far _ChiefAltAfterBattleText + text_end + +ChiefMonologueRematch: + text_far _ChiefMonologueRematch + text_end + +ChiefDefeatedText2: + text_far _ChiefDefeatedText2 + text_end + +ChiefVictoryText2: + text_far _ChiefVictoryText2 + text_end + +ChiefAfterBattleText2: + text_far _ChiefAfterBattleText2 + text_end ChiefPC: text_far _ChiefPCText diff --git a/text/SilphCo11F.asm b/text/SilphCo11F.asm index 1a55b07d..5b94eeb9 100644 --- a/text/SilphCo11F.asm +++ b/text/SilphCo11F.asm @@ -148,7 +148,7 @@ _SilphCo10Text_6237b:: _OmegaBattleText:: text "Bzzt! Clank!" - text_end + done ; Fun fact: For some reason, this text is stored in 10F. Seems to be a beta element - they ARE encountered in 11F. _SilphCoJessieJamesText1:: diff --git a/text/SilphGauntlet7F.asm b/text/SilphGauntlet7F.asm index ca64953a..5967a8e2 100644 --- a/text/SilphGauntlet7F.asm +++ b/text/SilphGauntlet7F.asm @@ -8,9 +8,13 @@ _ChiefMonologue:: para "However, I can't" line "let you leave" - cont "this place. You" - cont "are still looking" - cont "for the ultimate" + cont "this place quite" + cont "yet..." + prompt + +_ChiefMonologueMasterBallNotUsed:: + text "You're looking for" + line "for the ultimate" cont "#MON, aren't" cont "you?" @@ -22,10 +26,8 @@ _ChiefMonologue:: cont "GIOVANNI gone," cont "our company is" cont "going under!" - prompt -_ChiefMonologueMasterBallNotUsed:: - text "Now there's only" + para "Now there's only" line "one way to catch" cont "MEWTWO, and it's" cont "in your hands!" @@ -33,10 +35,24 @@ _ChiefMonologueMasterBallNotUsed:: para "!" para "Give me that BALL!" - prompt + done _ChiefMonologueMasterBallUsed:: - text "...what? You used" + text "You're looking for" + line "for the ultimate" + cont "#MON, aren't" + cont "you?" + + para "That MASTER" + line "BALL... I should" + cont "never have given" + cont "it to you! With" + cont "MEWTWO loose and" + cont "GIOVANNI gone," + cont "our company is" + cont "going under!" + + para "...what? You used" line "the MASTER BALL?!" para "You stupid child!" @@ -50,7 +66,31 @@ _ChiefMonologueMasterBallUsed:: para "You are in for" line "a world of hurt!" ; Like Giovanni, but with a slightly more pompous tone in using "hurt". - prompt + done + +_ChiefMonologueMasterBallNotCollected:: + text "As I watched you" + line "battle GIOVANNI," + cont "I know how you" + cont "and your #MON" + cont "fight." + + para "I must say, your" + line "strength seems..." + cont "promising. That's" + cont "why I invited you" + cont "here, after all." + + para "Before my next big" + line "plan, I must see" + cont "how well I stand" + cont "against the new" + cont "champion!" + + para "!" + + para "Give it your all!" + done _ChiefDefeatedText:: text "No! I..." @@ -92,6 +132,27 @@ _ChiefAfterBattleText:: cont "world." done + +_ChiefAltAfterBattleText:: + text "CHIEF: Just as" + line "I thought..." + cont "No product I" + cont "have is capable" + cont "of trouncing you." + + para "Money means I can" + line "be as powerful as" + cont "I want, but what" + cont "I do with that" + cont "power...is very" + cont "important." + + para "I still have much" + line "yet to learn..." + + para "Go." + + done _ChiefPCText:: text "It's a PC with" @@ -119,3 +180,46 @@ _ChiefPainting2:: line "of GAWARHED, an" cont "extinct #MON!" done + +_ChiefMonologueRematch:: + text "CHIEF: What?" + line "you're back?" + + para "Hmm...you're" + line "looking for a" + cont "rematch, is that" + cont "it?" + + para "Alright, if you" + line "insist. OMEGADGE" + cont "could always use" + cont "some more battle" + cont "data..." + + para "So, no holding" + line "back!" + done + +_ChiefDefeatedText2:: + text "Impressive" + line "work..." + prompt + +_ChiefVictoryText2:: + text "CHIEF: I" + line "expected better." + prompt + +_ChiefAfterBattleText2:: + text "CHIEF: It really" + line "is no wonder" + cont "how you've been" + cont "capable of" + cont "accomplishing so" + cont "much..." + + para "You truly trust" + line "and care for" + cont "your #MON." + + done From caa8076bcd79ad0c8832852efbb2dc8b830b238b Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sun, 31 Dec 2023 12:22:36 +0000 Subject: [PATCH 28/30] A few things - Added a gate between the two halves of Route 10 on the right side of Rock Tunnel that contains the Graveler trade NPC. - Improved Faraway's encounter table. - Made the music go silent before battling both of the postgame bosses for suspense reasons. It also sounds cool. - Minor text fixes --- constants/hide_show_constants.asm | 151 ++++++++++----------- constants/map_constants.asm | 41 +++--- data/events/card_key_coords.asm | 6 - data/events/card_key_maps.asm | 2 - data/events/hidden_item_coords.asm | 5 +- data/events/hidden_objects.asm | 10 +- data/maps/dungeon_maps.asm | 3 +- data/maps/headers/Route10Gate.asm | 2 + data/maps/hide_show_data.asm | 7 - data/maps/map_header_banks.asm | 3 +- data/maps/map_header_pointers.asm | 3 +- data/maps/objects/CinnabarLabTradeRoom.asm | 4 +- data/maps/objects/Route10.asm | 5 +- data/maps/objects/Route10Gate.asm | 14 ++ data/maps/songs.asm | 3 +- data/maps/town_map_entries.asm | 1 + data/text/text_7.asm | 3 +- data/wild/grass_water.asm | 1 - data/wild/maps/FarawayIslandInside.asm | 22 +-- maps.asm | 13 +- maps/Route10.blk | 3 +- maps/Route10Gate.blk | Bin 0 -> 20 bytes scripts/CeruleanCaveB1F.asm | 13 ++ scripts/CinnabarLabTradeRoom.asm | 16 --- scripts/Route10Gate.asm | 15 ++ scripts/SilphCo11F.asm | 6 - scripts/SilphGauntlet7F.asm | 11 ++ text/CelesteHillCave.asm | 2 +- text/CeruleanCaveB1F.asm | 6 +- 29 files changed, 185 insertions(+), 186 deletions(-) create mode 100644 data/maps/headers/Route10Gate.asm create mode 100644 data/maps/objects/Route10Gate.asm create mode 100644 maps/Route10Gate.blk create mode 100644 scripts/Route10Gate.asm diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index c45418cd..7eca96d1 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -180,82 +180,77 @@ DEF SHOW EQU $15 const HS_SILPH_CO_7F_RIVAL ; A5 const HS_SILPH_CO_7F_ITEM_1 ; A6 X const HS_SILPH_CO_7F_ITEM_2 ; A7 X - const HS_SILPH_CO_10F_1 ; A8 - const HS_SILPH_CO_10F_2 ; A9 - const HS_SILPH_CO_10F_ITEM_1 ; AA X - const HS_SILPH_CO_10F_ITEM_2 ; AB X - const HS_SILPH_CO_10F_ITEM_3 ; AC X - const HS_SILPH_CO_11F_1 ; AD - const HS_SILPH_CO_11F_JAMES ; AE - const HS_SILPH_CO_11F_3 ; AF - const HS_SILPH_CO_11F_JESSIE ; B0 - const HS_OMEGA ; B1 - const HS_OMEGA_2 ; B2 - const HS_DRAGONITE ; B3 - const HS_MOLTRES ; B4 - const HS_POKEMON_MANSION_2F_ITEM ; B5 X - const HS_POKEMON_MANSION_3F_ITEM_1 ; B6 X - const HS_POKEMON_MANSION_3F_ITEM_2 ; B7 X - const HS_POKEMON_MANSION_B1F_ITEM_1 ; B8 X - const HS_POKEMON_MANSION_B1F_ITEM_2 ; B9 X - const HS_POKEMON_MANSION_B1F_ITEM_3 ; BA X - const HS_POKEMON_MANSION_B1F_ITEM_4 ; BB X - const HS_POKEMON_MANSION_B1F_ITEM_5 ; BC X - const HS_MANSION_GUARD ; BD - const HS_SAFARI_ZONE_EAST_ITEM_1 ; BE X - const HS_SAFARI_ZONE_EAST_ITEM_2 ; BF X - const HS_SAFARI_ZONE_EAST_ITEM_3 ; C0 X - const HS_SAFARI_ZONE_EAST_ITEM_4 ; C1 X - const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C2 X - const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C3 X - const HS_SAFARI_ZONE_WEST_ITEM_1 ; C4 X - const HS_SAFARI_ZONE_WEST_ITEM_2 ; C5 X - const HS_SAFARI_ZONE_WEST_ITEM_3 ; C6 X - const HS_SAFARI_ZONE_WEST_ITEM_4 ; C7 X - const HS_SAFARI_ZONE_CENTER_ITEM ; C8 X - const HS_CERULEAN_CAVE_2F_ITEM_1 ; C9 X - const HS_CERULEAN_CAVE_2F_ITEM_2 ; CA X - const HS_CERULEAN_CAVE_2F_ITEM_3 ; CB X - const HS_MEWTWO ; CC X - const HS_CERULEAN_CAVE_B1F_ITEM_1 ; CD X - const HS_CERULEAN_CAVE_B1F_ITEM_2 ; CE X - const HS_VICTORY_ROAD_1F_ITEM_1 ; CF X - const HS_VICTORY_ROAD_1F_ITEM_2 ; D0 X - const HS_CHAMPIONS_ROOM_OAK ; D1 - const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; D2 - const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; D3 - const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; D4 - const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; D5 - const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; D6 - const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; D7 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; D8 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; D9 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; DA - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; DB - const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; DC - const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; DD - const HS_ARTICUNO ; DE - const HS_MEW ; DF - const HS_POKEMON_MANSION_B2F_ITEM_1 ; E0 - const HS_POKEMON_MANSION_B2F_ITEM_2 ; E1 - const HS_MT_MOON_CRATER_ITEM_1 ; E2 - const HS_MT_MOON_CRATER_ITEM_2 ; E3 - const HS_MT_MOON_CRATER_ITEM_3 ; E4 - const HS_MT_MOON_CRATER_ITEM_4 ; E5 - const HS_GIOVANNIS_ROOM_ITEM_1 ; E6 - const HS_GIOVANNIS_ROOM_ITEM_2 ; E7 - const HS_ROCK_TUNNEL_B1F_DOME ; E8 - const HS_ROCK_TUNNEL_B1F_HELIX ; E9 - const HS_ROCK_TUNNEL_B1F_AMBER ; EA sports. to the game. - const HS_ROCK_TUNNEL_B1F_WING ; EB - const HS_MT_MOON_CRATER_GUARD ; EC - const HS_DAYCARE_BULBASAUR ; ED - const HS_GLADE_GZAP_1 ; EE - const HS_GLADE_GZAP_2 ; EF - const HS_GLADE_GZAP_3 ; F0 - const HS_GLADE_ITEM1 - const HS_GLADE_ITEM2 - const HS_GLADE_ITEM3 - const HS_GLADE_ITEM4 - const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F1 + const HS_SILPH_CO_11F_1 ; A8 + const HS_SILPH_CO_11F_JAMES ; A9 + const HS_SILPH_CO_11F_3 ; AA + const HS_SILPH_CO_11F_JESSIE ; AB + const HS_OMEGA ; AC + const HS_OMEGA_2 ; AD + const HS_DRAGONITE ; AE + const HS_MOLTRES ; AF + const HS_POKEMON_MANSION_2F_ITEM ; B0 X + const HS_POKEMON_MANSION_3F_ITEM_1 ; B1 X + const HS_POKEMON_MANSION_3F_ITEM_2 ; B2 X + const HS_POKEMON_MANSION_B1F_ITEM_1 ; B3 X + const HS_POKEMON_MANSION_B1F_ITEM_2 ; B4 X + const HS_POKEMON_MANSION_B1F_ITEM_3 ; B5 X + const HS_POKEMON_MANSION_B1F_ITEM_4 ; B6 X + const HS_POKEMON_MANSION_B1F_ITEM_5 ; B7 X + const HS_MANSION_GUARD ; B8 + const HS_SAFARI_ZONE_EAST_ITEM_1 ; B9 X + const HS_SAFARI_ZONE_EAST_ITEM_2 ; BA X + const HS_SAFARI_ZONE_EAST_ITEM_3 ; BB X + const HS_SAFARI_ZONE_EAST_ITEM_4 ; BC X + const HS_SAFARI_ZONE_NORTH_ITEM_1 ; BD X + const HS_SAFARI_ZONE_NORTH_ITEM_2 ; BE X + const HS_SAFARI_ZONE_WEST_ITEM_1 ; BF X + const HS_SAFARI_ZONE_WEST_ITEM_2 ; C0 X + const HS_SAFARI_ZONE_WEST_ITEM_3 ; C1 X + const HS_SAFARI_ZONE_WEST_ITEM_4 ; C2 X + const HS_SAFARI_ZONE_CENTER_ITEM ; C3 X + const HS_CERULEAN_CAVE_2F_ITEM_1 ; C4 X + const HS_CERULEAN_CAVE_2F_ITEM_2 ; C5 X + const HS_CERULEAN_CAVE_2F_ITEM_3 ; C6 X + const HS_MEWTWO ; C7 X + const HS_CERULEAN_CAVE_B1F_ITEM_1 ; C8 X + const HS_CERULEAN_CAVE_B1F_ITEM_2 ; C9 X + const HS_VICTORY_ROAD_1F_ITEM_1 ; CA X + const HS_VICTORY_ROAD_1F_ITEM_2 ; CB X + const HS_CHAMPIONS_ROOM_OAK ; CC + const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; CD + const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; CE + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; CF + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; D0 + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; D1 + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; D2 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; D3 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; D4 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; D5 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; D6 + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; D7 + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; D8 + const HS_ARTICUNO ; D9 + const HS_MEW ; DA + const HS_POKEMON_MANSION_B2F_ITEM_1 ; DB + const HS_POKEMON_MANSION_B2F_ITEM_2 ; DC + const HS_MT_MOON_CRATER_ITEM_1 ; DD + const HS_MT_MOON_CRATER_ITEM_2 ; DE + const HS_MT_MOON_CRATER_ITEM_3 ; DF + const HS_MT_MOON_CRATER_ITEM_4 ; E0 + const HS_GIOVANNIS_ROOM_ITEM_1 ; E1 + const HS_GIOVANNIS_ROOM_ITEM_2 ; E2 + const HS_ROCK_TUNNEL_B1F_DOME ; E3 + const HS_ROCK_TUNNEL_B1F_HELIX ; E4 + const HS_ROCK_TUNNEL_B1F_AMBER ; E5 + const HS_ROCK_TUNNEL_B1F_WING ; E6 + const HS_MT_MOON_CRATER_GUARD ; E7 + const HS_DAYCARE_BULBASAUR ; E8 + const HS_GLADE_GZAP_1 ; E9 + const HS_GLADE_GZAP_2 ; EA sports. to the game. + const HS_GLADE_GZAP_3 ; EB + const HS_GLADE_ITEM1 ; EC + const HS_GLADE_ITEM2 ; ED + const HS_GLADE_ITEM3 ; EE + const HS_GLADE_ITEM4 ; EF + const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F0 DEF NUM_HS_OBJECTS EQU const_value ; F2 - FE all go unused. diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0a99337e..e4a607bc 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -253,27 +253,26 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const CERULEAN_BADGE_HOUSE, 4, 4 ; $E7 map_const CINNABAR_VOLCANO, 14, 12 ; $E8 - Was UNUSED_MAP_E7 map_const CINNABAR_VOLCANO_FLOORS, 20, 20 ; $E9 - Switched with ROCK_TUNNEL_B1F - map_const SILPH_CO_9F, 13, 9 ; $EA (now goes unused) - map_const SILPH_CO_10F, 8, 9 ; $EB (now goes unused) - map_const SILPH_CO_11F, 9, 9 ; $EC - map_const FARAWAY_FERRY_DOCK, 14, 6 ; $ED - was SILPH_CO_ELEVATOR - map_const GARNET_CAVERN_2F, 15, 9 ; $EE - was UNUSED_MAP_ED - map_const UNDERWATER_TUNNEL, 15, 9 ; $EF - Was UNUSED_MAP_EE - map_const TRADE_CENTER, 5, 4 ; $F0 - map_const COLOSSEUM, 5, 4 ; $F1 - map_const CELADON_UNIVERSITY_INSIDE, 11, 10 ; $F2 - Was UNUSED_MAP_F1 - map_const CELADON_UNIVERSITY_POKECENTER, 7, 4 ; $F3 - Was UNUSED_MAP_F2 - map_const LORELEIS_ROOM, 5, 6 ; $F4 - map_const BRUNOS_ROOM, 5, 6 ; $F5 - map_const AGATHAS_ROOM, 5, 6 ; $F6 - map_const ROCK_TUNNEL_B1F, 20, 18 ; $F7 - Switched with CINNABAR_VOLCANO_FLOORS - map_const GIOVANNIS_ROOM, 11, 14 ; $F8 - map_const BATTLE_TENT, 5, 10 ; $F9 - map_const MT_MOON_SQUARE, 13, 7 ; $FA - map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FB - map_const CELESTE_HILL_CAVE, 20, 18 ; $FC - map_const CELESTE_HILL_OUTSIDE, 20, 20 ; $FD - map_const BRUNSWICK_GLADE, 19, 20 ; $FE + map_const ROUTE_10_GATE, 5, 4 ; $EA + map_const SILPH_CO_11F, 9, 9 ; $EB + map_const FARAWAY_FERRY_DOCK, 14, 6 ; $EC - was SILPH_CO_ELEVATOR + map_const GARNET_CAVERN_2F, 15, 9 ; $ED - was UNUSED_MAP_ED + map_const UNDERWATER_TUNNEL, 15, 9 ; $EE - Was UNUSED_MAP_EE + map_const TRADE_CENTER, 5, 4 ; $EF + map_const COLOSSEUM, 5, 4 ; $F0 + map_const CELADON_UNIVERSITY_INSIDE, 11, 10 ; $F1 - Was UNUSED_MAP_F1 + map_const CELADON_UNIVERSITY_POKECENTER, 7, 4 ; $F2 - Was UNUSED_MAP_F2 + map_const LORELEIS_ROOM, 5, 6 ; $F3 + map_const BRUNOS_ROOM, 5, 6 ; $F4 + map_const AGATHAS_ROOM, 5, 6 ; $F5 + map_const ROCK_TUNNEL_B1F, 20, 18 ; $F6 - Switched with CINNABAR_VOLCANO_FLOORS + map_const GIOVANNIS_ROOM, 11, 14 ; $F7 + map_const BATTLE_TENT, 5, 10 ; $F8 + map_const MT_MOON_SQUARE, 13, 7 ; $F9 + map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FA + map_const CELESTE_HILL_CAVE, 20, 18 ; $FB + map_const CELESTE_HILL_OUTSIDE, 20, 20 ; $FC + map_const BRUNSWICK_GLADE, 19, 20 ; $FD DEF NUM_MAPS EQU const_value ; Indoor maps, such as houses, use this as the Map ID in their exit warps diff --git a/data/events/card_key_coords.asm b/data/events/card_key_coords.asm index 95569169..79cc80eb 100644 --- a/data/events/card_key_coords.asm +++ b/data/events/card_key_coords.asm @@ -7,10 +7,6 @@ CardKeyTable1: db SILPH_CO_7F, $06, $0A, 4 db SILPH_CO_7F, $06, $0B, 5 - db SILPH_CO_9F, $04, $12, 6 - db SILPH_CO_9F, $04, $13, 7 - db SILPH_CO_10F, $08, $0A, 8 - db SILPH_CO_10F, $08, $0B, 9 db -1 ; end CardKeyTable2: @@ -18,8 +14,6 @@ CardKeyTable2: db SILPH_CO_3F, $09, $09, 11 db SILPH_CO_5F, $04, $07, 12 db SILPH_CO_5F, $05, $07, 13 - db SILPH_CO_9F, $08, $03, 18 - db SILPH_CO_9F, $09, $03, 19 db -1 ; end CardKeyTable3: diff --git a/data/events/card_key_maps.asm b/data/events/card_key_maps.asm index dd601c12..4c326b69 100644 --- a/data/events/card_key_maps.asm +++ b/data/events/card_key_maps.asm @@ -2,7 +2,5 @@ SilphCoMapList: db SILPH_CO_3F db SILPH_CO_5F db SILPH_CO_7F - db SILPH_CO_9F - db SILPH_CO_10F db SILPH_CO_11F db -1 ; end diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm index 85358a8c..c2e3531d 100644 --- a/data/events/hidden_item_coords.asm +++ b/data/events/hidden_item_coords.asm @@ -11,8 +11,8 @@ HiddenItemCoords: hidden_item ROUTE_9, 14, 7 hidden_item SS_ANNE_KITCHEN, 13, 9 hidden_item SS_ANNE_B1F_ROOMS, 3, 1 - hidden_item ROUTE_10, 9, 17 - hidden_item ROUTE_10, 16, 53 + hidden_item ROUTE_10, 9, 25 + hidden_item ROUTE_10, 12, 71 hidden_item ROCKET_HIDEOUT_B1F, 21, 15 hidden_item ROCKET_HIDEOUT_B3F, 27, 17 hidden_item ROCKET_HIDEOUT_B4F, 25, 1 @@ -23,7 +23,6 @@ HiddenItemCoords: hidden_item SAFARI_ZONE_GATE, 10, 1 ; inaccessible hidden_item SAFARI_ZONE_WEST, 6, 5 hidden_item SILPH_CO_5F, 12, 3 - hidden_item SILPH_CO_9F, 2, 15 hidden_item COPYCATS_HOUSE_2F, 1, 1 hidden_item CERULEAN_CAVE_1F, 14, 11 hidden_item CERULEAN_CAVE_B1F, 27, 3 diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index c94a1df5..865d85dc 100644 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm @@ -46,7 +46,6 @@ HiddenObjectMaps: db SAFARI_ZONE_GATE db SAFARI_ZONE_WEST db SILPH_CO_5F - db SILPH_CO_9F db COPYCATS_HOUSE_2F db CERULEAN_CAVE_1F db CERULEAN_CAVE_B1F @@ -142,7 +141,6 @@ HiddenObjectPointers: dw SafariZoneEntranceHiddenObjects dw SafariZoneWestHiddenObjects dw SilphCo5FHiddenObjects - dw SilphCo9FHiddenObjects dw CopycatsHouse2FHiddenObjects dw CeruleanCave1HiddenObjects dw CeruleanCave3HiddenObjects @@ -431,8 +429,8 @@ SSAnne10HiddenObjects: db -1 ; end Route10HiddenObjects: - hidden_object 9, 17, SUPER_POTION, HiddenItems - hidden_object 16, 53, MAX_ETHER, HiddenItems + hidden_object 9, 25, SUPER_POTION, HiddenItems + hidden_object 12, 71, MAX_ETHER, HiddenItems db -1 ; end RocketHideout1HiddenObjects: @@ -473,10 +471,6 @@ SilphCo5FHiddenObjects: hidden_object 12, 3, ELIXER, HiddenItems db -1 ; end -SilphCo9FHiddenObjects: - hidden_object 2, 15, MAX_POTION, HiddenItems - db -1 ; end - CopycatsHouse2FHiddenObjects: hidden_object 1, 1, NUGGET, HiddenItems db -1 ; end diff --git a/data/maps/dungeon_maps.asm b/data/maps/dungeon_maps.asm index aba0ac00..b4825117 100644 --- a/data/maps/dungeon_maps.asm +++ b/data/maps/dungeon_maps.asm @@ -13,6 +13,7 @@ DungeonMaps1: db DIGLETTS_CAVE db UNDERWATER_TUNNEL db CINNABAR_VOLCANO_FLOORS + db SILPH_CO_11F db CELESTE_HILL db CELESTE_HILL_OUTSIDE db CELESTE_HILL_CAVE @@ -34,8 +35,6 @@ DungeonMaps2: ; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and ; CERULEAN_CAVE maps, except for SILPH_CO_1F db SILPH_CO_3F, CERULEAN_CAVE_1F - ; SILPH_CO_[9-11]F - db SILPH_CO_9F, SILPH_CO_11F ; SEAFOAM_ISLANDS_[B1F-B4F] db SEAFOAM_ISLANDS_B1F, SEAFOAM_ISLANDS_B4F ; all ROCKET_HIDEOUT maps diff --git a/data/maps/headers/Route10Gate.asm b/data/maps/headers/Route10Gate.asm new file mode 100644 index 00000000..af5406e7 --- /dev/null +++ b/data/maps/headers/Route10Gate.asm @@ -0,0 +1,2 @@ + map_header Route10Gate, ROUTE_10_GATE, FOREST_GATE, 0 + end_map_header diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 10eacdee..a298fca2 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -238,7 +238,6 @@ MapHSPointers: dw CinnabarVolcanoHS dw CinnabarVolcanoFloorsHS dw NoHS - dw SilphCo10FHS dw SilphCo11FHS dw NoHS dw NoHS @@ -493,12 +492,6 @@ SilphCo7FHS: db SILPH_CO_7F, $09, SHOW ; HS_SILPH_CO_7F_RIVAL db SILPH_CO_7F, $0A, SHOW ; HS_SILPH_CO_7F_ITEM_1 db SILPH_CO_7F, $0B, SHOW ; HS_SILPH_CO_7F_ITEM_2 -SilphCo10FHS: - db SILPH_CO_10F, $01, SHOW ; HS_SILPH_CO_10F_1 - db SILPH_CO_10F, $02, SHOW ; HS_SILPH_CO_10F_2 - db SILPH_CO_10F, $03, SHOW ; HS_SILPH_CO_10F_ITEM_1 - db SILPH_CO_10F, $04, SHOW ; HS_SILPH_CO_10F_ITEM_2 - db SILPH_CO_10F, $05, SHOW ; HS_SILPH_CO_10F_ITEM_3 SilphCo11FHS: db SILPH_CO_11F, $03, SHOW ; Giovanni db SILPH_CO_11F, $04, SHOW ; James diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index 8c06fc59..99c25975 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -235,8 +235,7 @@ MapHeaderBanks:: db BANK(CeruleanBadgeHouse_h) db BANK(CinnabarVolcano_h) ; $01 UNUSED_MAP_E7 db BANK(CinnabarVolcanoFloors_h) - db BANK(SilphCo9F_h) - db BANK(SilphCo10F_h) + db BANK(Route10Gate_h) db BANK(SilphCo11F_h) db BANK(FarawayFerryDock_h) db BANK(GarnetCavern2F_h) ; was UNUSED_MAP_ED diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 4f89390d..41dd1682 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -235,8 +235,7 @@ MapHeaderPointers:: dw CeruleanBadgeHouse_h dw CinnabarVolcano_h ; UNUSED_MAP_E7 dw CinnabarVolcanoFloors_h - dw SilphCo9F_h - dw SilphCo10F_h + dw Route10Gate_h dw SilphCo11F_h dw FarawayFerryDock_h dw GarnetCavern2F_h ; UNUSED_MAP_ED, used silph 2f diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index 048f34c4..7db91102 100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -9,8 +9,6 @@ CinnabarLabTradeRoom_Object: def_object_events object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person - object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person -; object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person - object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; Trader + object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; Trader def_warps_to CINNABAR_LAB_TRADE_ROOM diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index 724e0494..65c22ac0 100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -7,6 +7,9 @@ Route10_Object: warp_event 8, 61, ROCK_TUNNEL_1F, 3 warp_event 6, 47, POWER_PLANT, 1 warp_event 6, 3, UNDERWATER_TUNNEL, 2 + warp_event 14, 61, ROUTE_10_GATE, 2 + warp_event 14, 57, ROUTE_10_GATE, 1 + warp_event 15, 57, ROUTE_10_GATE, 1 def_bg_events bg_event 7, 27, 7 ; Route10Text7 @@ -15,7 +18,7 @@ Route10_Object: bg_event 5, 49, 10 ; Route10Text10 def_object_events - object_event 10, 52, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1 + object_event 10, 50, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1 object_event 3, 65, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7 object_event 14, 72, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2 object_event 7, 33, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 diff --git a/data/maps/objects/Route10Gate.asm b/data/maps/objects/Route10Gate.asm new file mode 100644 index 00000000..d1ebe555 --- /dev/null +++ b/data/maps/objects/Route10Gate.asm @@ -0,0 +1,14 @@ +Route10Gate_Object: + db $a ; border block + + def_warp_events + warp_event 5, 0, ROUTE_10, 7 + warp_event 4, 7, ROUTE_10, 6 + warp_event 5, 7, ROUTE_10, 6 + + def_bg_events + + def_object_events + object_event 3, 4, SPRITE_GRAMPS, STAY, LEFT, 1 ; person + + def_warps_to ROUTE_10_GATE diff --git a/data/maps/songs.asm b/data/maps/songs.asm index f510fc8b..1e2df766 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -234,8 +234,7 @@ MapSongBanks:: db MUSIC_CITIES2, 0 ; CERULEAN_BADGE_HOUSE db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS - db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F + db MUSIC_CITIES1, 0 ; ROUTE_10_GATE db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F db MUSIC_DUNGEON2, 0 ; FARAWAY_FERRY_DOCK db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index d6170694..a87065b5 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -135,6 +135,7 @@ InternalMapEntries: internal_map NAME_RATERS_HOUSE, 14, 5, LavenderTownName internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName internal_map CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName + internal_map ROUTE_10_GATE, 14, 4, Route10Name internal_map SILPH_CO_11F, 10, 5, SilphCoName internal_map FARAWAY_FERRY_DOCK, 15, 15, FarawayIslandName internal_map GARNET_CAVERN_2F, 6, 10, GarnetCavernName diff --git a/data/text/text_7.asm b/data/text/text_7.asm index e6f9487a..9398c1ce 100644 --- a/data/text/text_7.asm +++ b/data/text/text_7.asm @@ -142,8 +142,7 @@ _AfterTrade2Text:: text_ram wInGameTradeGiveMonName text " you" line "traded to me" - - para "went and evolved!" + cont "went and evolved!" done _WannaTrade3Text:: diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 46405b89..207bbfb9 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -237,7 +237,6 @@ WildDataPointers: dw NothingWildMons dw NothingWildMons dw NothingWildMons - dw NothingWildMons dw GarnetCavern2FWildMons dw UnderwaterTunnelWildMons dw NothingWildMons diff --git a/data/wild/maps/FarawayIslandInside.asm b/data/wild/maps/FarawayIslandInside.asm index a0b692b8..97b71bf6 100644 --- a/data/wild/maps/FarawayIslandInside.asm +++ b/data/wild/maps/FarawayIslandInside.asm @@ -1,15 +1,15 @@ -FarawayIslandInsideMons: ; DEFINITELY needs reworking +FarawayIslandInsideMons: def_grass_wildmons 10 ; encounter rate - db 30, EEVEE - db 30, MANKEY - db 30, MANKEY - db 30, PRIMEAPE - db 30, BUTTERFREE - db 30, EEVEE - db 30, EEVEE - db 30, EEVEE - db 30, EEVEE - db 30, EEVEE + db 25, MANKEY + db 28, GLOOM + db 26, BUTTERFREE + db 29, PRIMEAPE + db 24, MANKEY + db 30, DECILLA + db 26, MANKEY + db 30, GORILLAIMO + db 27, BUTTERFREE + db 30, AERODACTYL end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/maps.asm b/maps.asm index 23c2bfc1..0f2940b7 100644 --- a/maps.asm +++ b/maps.asm @@ -789,10 +789,10 @@ INCLUDE "scripts/SilphCo3F.asm" INCLUDE "data/maps/objects/SilphCo3F.asm" SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk" -INCLUDE "data/maps/headers/SilphCo10F.asm" -INCLUDE "scripts/SilphCo10F.asm" -INCLUDE "data/maps/objects/SilphCo10F.asm" -SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk" +INCLUDE "data/maps/headers/Route10Gate.asm" +INCLUDE "scripts/Route10Gate.asm" +INCLUDE "data/maps/objects/Route10Gate.asm" +Route10Gate_Blocks: INCBIN "maps/Route10Gate.blk" INCLUDE "data/maps/headers/LancesRoom.asm" INCLUDE "scripts/LancesRoom.asm" @@ -947,11 +947,6 @@ INCLUDE "data/maps/objects/UndergroundPathRoute7.asm" ;INCLUDE "scripts/UndergroundPathRoute7Copy.asm" ;INCLUDE "data/maps/objects/UndergroundPathRoute7Copy.asm" -INCLUDE "data/maps/headers/SilphCo9F.asm" -INCLUDE "scripts/SilphCo9F.asm" -INCLUDE "data/maps/objects/SilphCo9F.asm" -SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk" - INCLUDE "data/maps/headers/VictoryRoad1F.asm" INCLUDE "scripts/VictoryRoad1F.asm" INCLUDE "data/maps/objects/VictoryRoad1F.asm" diff --git a/maps/Route10.blk b/maps/Route10.blk index 0c3df17f..071a9d15 100644 --- a/maps/Route10.blk +++ b/maps/Route10.blk @@ -24,8 +24,7 @@ Me() -Oe(,?????;{e(+WWWW*){e() !(){e()hi(){e()7}:~(){e(){y{{(){e(){{{{$%{e(){{{{{{{e().(,?????;CC(,,,,,,)CC(+WWWW% -L()11111 +Oe(,?????;{e(+WWWW*){e() !(){e()hi(){e()7}:~(){e(){y{{$%{e(){{{{{{{e().()CCCCCCCC(,????;CTC(,,,,,) !(+WWW%7:~()11111 ()1111>;/()>??,) diff --git a/maps/Route10Gate.blk b/maps/Route10Gate.blk new file mode 100644 index 0000000000000000000000000000000000000000..19af95408a67a09392becf0bffbb98a67146f44c GIT binary patch literal 20 Zcma!xDUOM^Vqi#01`-J=Rt(&UsQ@@f1n~d> literal 0 HcmV?d00001 diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm index 0c0ce766..fc774ebe 100644 --- a/scripts/CeruleanCaveB1F.asm +++ b/scripts/CeruleanCaveB1F.asm @@ -25,8 +25,21 @@ MewtwoTrainerHeader: MewtwoText: text_asm + ld a, 5 + ld [wMusicFade], a + xor a + ld [wMusicFadeID], a +.waitloop + ld a, [wMusicFade] + and a + jr nz, .waitloop + + ld a, SFX_STOP_ALL_MUSIC + call PlaySound ld hl, MewtwoTrainerHeader call TalkToTrainer + ld a, SFX_STOP_ALL_MUSIC + call PlaySound jp TextScriptEnd MewtwoBattleText: diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm index f6d83695..9de5f4bd 100644 --- a/scripts/CinnabarLabTradeRoom.asm +++ b/scripts/CinnabarLabTradeRoom.asm @@ -3,28 +3,12 @@ CinnabarLabTradeRoom_Script: CinnabarLabTradeRoom_TextPointers: dw Lab2Text1 - dw Lab2Text2 -; dw Lab2Text3 dw CinnabarLabTrader Lab2Text1: text_far _Lab2Text1 text_end -Lab2Text2: - text_asm - ld a, TRADE_FOR_JENNY - ld [wWhichTrade], a - jr Lab2DoTrade - -;Lab2Text3: -; text_asm -; ld a, TRADE_FOR_CRINKLES -; ld [wWhichTrade], a -Lab2DoTrade: - predef DoInGameTradeDialogue - jp TextScriptEnd - CinnabarLabTrader: text_asm ld a, TRADE_WITH_SELF diff --git a/scripts/Route10Gate.asm b/scripts/Route10Gate.asm new file mode 100644 index 00000000..8380639b --- /dev/null +++ b/scripts/Route10Gate.asm @@ -0,0 +1,15 @@ +Route10Gate_Script: + jp EnableAutoTextBoxDrawing + +Route10Gate_TextPointers: + dw Route10GateText1 + +Route10GateText1: + text_asm + ld a, TRADE_FOR_JENNY + ld [wWhichTrade], a + jr Route10GateDoTrade + +Route10GateDoTrade: + predef DoInGameTradeDialogue + jp TextScriptEnd diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 3a3de2a5..1ea03279 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -173,10 +173,6 @@ MissableObjectIDs_6219b: db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_3 db HS_SILPH_CO_7F_4 - db HS_SILPH_CO_10F_1 - db HS_SILPH_CO_10F_2 - db HS_SILPH_CO_11F_1 - db HS_SILPH_CO_11F_3 db -1 ; end SilphCo11Script_62185: @@ -633,8 +629,6 @@ SaffronCityRockets: db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_3 db HS_SILPH_CO_7F_4 - db HS_SILPH_CO_10F_1 - db HS_SILPH_CO_10F_2 db HS_SILPH_CO_11F_1 db HS_SILPH_CO_11F_3 db -1 ; end diff --git a/scripts/SilphGauntlet7F.asm b/scripts/SilphGauntlet7F.asm index f7215813..3610c1e4 100644 --- a/scripts/SilphGauntlet7F.asm +++ b/scripts/SilphGauntlet7F.asm @@ -21,6 +21,17 @@ SilphGauntlet7F_ScriptPointers: ChiefScript1: CheckEvent EVENT_BEAT_CHIEF jr nz, .skip + ld a, 5 + ld [wMusicFade], a + xor a + ld [wMusicFadeID], a +.waitloop + ld a, [wMusicFade] + and a + jr nz, .waitloop + + ld a, SFX_STOP_ALL_MUSIC + call PlaySound ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a call UpdateSprites diff --git a/text/CelesteHillCave.asm b/text/CelesteHillCave.asm index fb58d735..cb3073ac 100644 --- a/text/CelesteHillCave.asm +++ b/text/CelesteHillCave.asm @@ -26,7 +26,7 @@ _CelesteHillCaveBattleText2:: _CelesteHillCaveEndBattleText2:: text "...!" line "You are not an" - cont "ordinary TRAINER!" + cont "ordinary trainer!" prompt _CelesteHillCaveAfterBattleText2:: ; Allusion to the lack of a Teachy TV diff --git a/text/CeruleanCaveB1F.asm b/text/CeruleanCaveB1F.asm index cb407c60..9d048c26 100644 --- a/text/CeruleanCaveB1F.asm +++ b/text/CeruleanCaveB1F.asm @@ -1,3 +1,7 @@ _MewtwoBattleText:: - text "Mew!@" + text "MEWTWO: ..." + + para "..." + + para "...Mew!!!@" text_end From 09f2c83e72a031649faae67d727443c7230675f6 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sun, 31 Dec 2023 16:59:29 +0000 Subject: [PATCH 29/30] Mewtwo sprite improvement! --- data/maps/objects/RedsHouse2F.asm | 5 +++-- data/trainers/parties.asm | 2 +- gfx/pokemon/front/mewtwo.png | Bin 614 -> 991 bytes text/CeladonMansionRoofHouse.asm | 23 ++++++----------------- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index 2bc15fdb..e891303c 100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm @@ -4,7 +4,7 @@ RedsHouse2F_Object: def_warp_events warp_event 7, 1, REDS_HOUSE_1F, 3 ;warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief - warp_event 5, 1, SILPH_CO_1F, 1 ; - Go through Gauntlet + ;warp_event 5, 1, SILPH_CO_1F, 1 ; - Go through Gauntlet ;warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1. ;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1 ;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater @@ -14,7 +14,8 @@ RedsHouse2F_Object: ;warp_event 5, 1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew ;warp_event 5, 1, GIOVANNIS_ROOM, 1 ; Test spinner tiles ;warp_event 5, 1, CINNABAR_LAB_FOSSIL_ROOM, 1 ; Test new tileset and fossils - + warp_event 5, 1, CERULEAN_CAVE_B1F, 1 ; Test Mewtwo theme + def_bg_events def_object_events diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 0ff0e33b..92b995b6 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -75,7 +75,7 @@ YoungsterData: db 14, RATTATA, EKANS, ZUBAT, 0 ; Route 25 db 15, RATTATA, SPEAROW, 0 - db 17, SLOWPOKE, 0 ; The famous "Slowpoke Kid" who was used for the Mew glitch. Our changes make em not work anymore, but keep em for the iconography. + db 15, SHELLDER, SLOWPOKE, 0 ; The famous "Slowpoke Kid" who was used for the Mew glitch. db 14, EKANS, SANDSHREW, 0 ; SS Anne 1F Rooms db 21, NIDORINO, 0 diff --git a/gfx/pokemon/front/mewtwo.png b/gfx/pokemon/front/mewtwo.png index 40c6f21776dd6594bebd7bc3973efeff7108d873..aaccc9e4c6aec45030205c252706f3720d70fd20 100644 GIT binary patch literal 991 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7Tdg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&U^Z?k>HzXM3p^r=85sBugD~Uq{1quc zLG}_)Usv|$Jn{l29E(qUehw63%rEi_VLZR6d=`+STH+c}l9E`GYL#4+3Zxi}42+C* z4UKe-4MPmgtW1rp3@o$_46FPnu;_tW(xSEU08md+?Wf`Adpw`#G5iT;D0=Afz&U}5(MD-w(7gJV^uHzQH{aYU zSv#|UooUZBgVS}%M-HSpZ}Q67V19k_*^Y0oo=v=wu<@VT!}AY5rLZ1k?BZW^-J6?B zCS2)W^A`J5fxQCDnO?-0#K!*izpk`w@oSBg#T)0Qha^`$u~G8cIO8-JHz zMb5eBYrdD6K53C*W03wDD{9T^m(Os;NjyYAdEZv+<@a`53YeZdc=~KP_p-@-o?e@; zpE`A<;!J*koN?#0&Pw)g{vq2#IAzWyaDKbM9C%dlH(SKdlkP@r(~G?|)`pbp%zXOf z`9Fc>@mKximqkqDd2IRj+NA$alI?1C?JEhtzG=&(*quh_BL07NylxOOnroIh6=d$yPHEJ$PLFeEom;EHX!>iN(8ly#d(1id zqK`I7ddzCfdEk)MKWoAnMTsEgB>CsNxL7X59XS@Bv7O;n2VF73t3gWy5D^x{?1I+&nf zrcLPI&|bUB1ks^gt#jaEgC)ARf56kq4!umV^X=j#>NdOev@WsjN|LX?C+U&~ z@{kX|=RIEr`KZ8-kRMDoo&hLUMAu}~{!&ct&kW+u9bl!8h<{Chw_+;v?ndc;yg5Mv1GmVa;EsCL{WegyoAxiiM?BMx1ae29Ivx}H*ymh{eJ&wX@pN+4YzI^!^R z79ZaQ(s|+*E6=l8b7IJ!=O*8*EuWkn@``?Mc5r!= zs3DIHO41TsF^r0dn=s<2tO<`FM5%L23jK*nNJr$_Dm=ay()xmfmduA5kjAtqfj#Ob zNx9yo>PL}~foHOLL7B3fy+MU|3}1$%*E+erLhROq{JBPZ(IC3(PlF9ju0NMmWP|;{ cV-Gm~1GU^&bqn~RQvd(}07*qoM6N<$f(Doh($ diff --git a/text/CeladonMansionRoofHouse.asm b/text/CeladonMansionRoofHouse.asm index 99ec671b..31d4a561 100644 --- a/text/CeladonMansionRoofHouse.asm +++ b/text/CeladonMansionRoofHouse.asm @@ -51,31 +51,20 @@ _JackyAfterBattle:: cont "slow motion..." para "Ok! I will give" - line "you a #MON" - cont "to help you on" - cont "your quest!" + line "you a gift to" + cont "help you on your" + cont "quest!" para "Over there is a" - line "@" - text_ram wcd6d - text "!" + line "rare #MON!" para "Go, go, take it!" -; para "I look forward" -; line "to our next bout!" done _JackyGift:: - text_ram wcd6d - text " has" - line "incredibly good" - cont "evolutionary" - cont "potential!" - - para "It will help" - line "you greatly in" - cont "your next bout!" + line "I look forward to" + line "our next bout!" done _JackyN64:: From d05d2655cebf4b364bedc6fee362dbb7ded600bd Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sun, 31 Dec 2023 17:09:13 +0000 Subject: [PATCH 30/30] Mewtwo sprite improvement! Again! --- gfx/pokemon/front/mewtwo.png | Bin 991 -> 989 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/pokemon/front/mewtwo.png b/gfx/pokemon/front/mewtwo.png index aaccc9e4c6aec45030205c252706f3720d70fd20..57617fe7e10db645bac258a763513cbe43ffe650 100644 GIT binary patch delta 676 zcmV;V0$csx2i*sddq7+K~yNuP14V6(_k0} z@N`vn5vsCY6qc)=iXwQ@x3#*;E-5y_KS8^T7f&+!UMxk2rqhA9)tcbCBJAqPD45GO zj6d)o9;$SsKTf8ptqX77XHSyaERdIcc;EMVAM$<$@E-{v6MP8%;Ay~sPRaC`;~wEz zH{OdD+Xk<-eN&)mPYPM4NPg`f2smLK)t?eu_pCkbtcAl_yGG~UoIa8G!Cn?%e z&?H|@d~G#cNe* zZg#@2P@U13oS5(q?4M}Zc`>B70(<1a@jQj^K8Gsk+4be~N5Cx6mx~ zDF{Soe|Z_8D>rYu_+z&pdFeR-_heD_IV_fhV@M$;7m=-MDUIYYB7VfZpVX&S!2q5m z>Tj$(SbyFSDDcXXgm)@`p_-mI#cw8gfW8eF;2qFJ$WrbUOeRmjdFRQV!;GjLUqI7PN8p4~5Uzvp+l$@!qVl zt0D)${e+D>2Uj^@*@#8IyEvnFgPnPFgh?Wges}PlO_Rae>+J;K~yNuP14P4)Ibyf z@N8G?*B-7Z3}o(u(Z zX^ZQ}Nj$8wE&Fk5HtVhplX=c0annGC`7!g}4D+4<{8IpO;Y8p=U;+U=BC%4Qe}rfK zbSK&D+H|d%e{cr^yp}M_eq+SIW<#<{Y_K=ilg)_s>gJKyV6pxt;m_dmWCg(iiVvdK zOA87dS0dhnv_EAKy%47Y=v*{iUHebhBBrD3C}g9too7^IdgMGJP4T9vguF3URyIS7^5Y>Qo8IRAO4JKZk4^Cu%^GtsY?b!tTt6=Mt-1 zedrsEJ)npexpjDTopE5d!;Uw*t0p6