From 5eb44b1794b7111a78bbb8c21b4fda16dac98553 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 11 Dec 2023 13:16:38 +0000 Subject: [PATCH 1/4] brunswick items In the glade and trail could possibly move some to the grotto itself; I wasn't sure what to put there I realised that I don't have polishedmap on this laptop so you'll want to move the items elsewhere --- constants/hide_show_constants.asm | 5 +++++ data/events/hidden_item_coords.asm | 1 + data/events/hidden_objects.asm | 6 ++++++ data/maps/hide_show_data.asm | 5 +++++ data/maps/objects/BrunswickGlade.asm | 6 +++++- data/maps/objects/BrunswickTrail.asm | 2 ++ scripts/BrunswickGlade.asm | 4 ++++ scripts/BrunswickTrail.asm | 1 + tools/consts.py | 0 tools/free_space.awk | 0 tools/palfix.py | 0 tools/pic.py | 0 tools/rgb555.py | 0 tools/sym_comments.py | 0 tools/toc.py | 0 tools/unique.py | 0 16 files changed, 29 insertions(+), 1 deletion(-) mode change 100755 => 100644 tools/consts.py mode change 100755 => 100644 tools/free_space.awk mode change 100755 => 100644 tools/palfix.py mode change 100755 => 100644 tools/pic.py mode change 100755 => 100644 tools/rgb555.py mode change 100755 => 100644 tools/sym_comments.py mode change 100755 => 100644 tools/toc.py mode change 100755 => 100644 tools/unique.py diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 54467918..8fd7f807 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -55,6 +55,7 @@ DEF SHOW EQU $15 const HS_ROUTE_25_ITEM ; 29 X const HS_CACTUS ; 2A const HS_BRUNSWICK_ZAPDOS_G_1 ; 2B + const HS_BRUNSWICK_TRAIL_ITEM1 const HS_DAISY_SITTING ; 2C const HS_DAISY_WALKING ; 2D const HS_TOWN_MAP ; 2E @@ -251,5 +252,9 @@ DEF SHOW EQU $15 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 DEF NUM_HS_OBJECTS EQU const_value ; F2 - FE all go unused. diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm index d9bc77ea..1c3c8853 100644 --- a/data/events/hidden_item_coords.asm +++ b/data/events/hidden_item_coords.asm @@ -64,4 +64,5 @@ HiddenItemCoords: hidden_item MT_MOON_CRATER, 32, 45 ; Old Amber hidden_item DAYCARE, 4, 1 ; Daycare PC hidden_item MT_MOON_SQUARE, 5, 5 ; Moon Stone + hidden_item BRUNSWICK_TRAIL, 23, 11 ; Solar Beam TM below Cactus db -1 ; end diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index bc6fdb26..264188f9 100644 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm @@ -90,6 +90,7 @@ HiddenObjectMaps: db MT_MOON_CRATER db DAYCARE db MT_MOON_SQUARE + db BRUNSWICK_TRAIL db -1 ; end HiddenObjectPointers: @@ -185,6 +186,7 @@ HiddenObjectPointers: dw MtMoonCraterHiddenObjects dw DaycareHiddenItems dw MtMoonSquareHiddenItems + dw BrunswickTrailHiddenItems MACRO hidden_object db \2 ; y coord @@ -667,3 +669,7 @@ DaycareHiddenItems: MtMoonSquareHiddenItems: hidden_object 5, 5, MOON_STONE, HiddenItems db -1 + +BrunswickTrailHiddenItems: + hidden_object 23, 11, TM_SOLARBEAM, HiddenItems + db -1 diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 42140dbe..704d898e 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -330,6 +330,7 @@ Route25HS: BrunswickTrailHS: db BRUNSWICK_TRAIL, $01, SHOW ; HS_CACTUS db BRUNSWICK_TRAIL, $06, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1 + db BRUNSWICK_TRAIL, $09, SHOW ; HS_BRUNSWICK_TRAIL_ITEM1 BluesHouseHS: db BLUES_HOUSE, $01, SHOW ; HS_DAISY_SITTING db BLUES_HOUSE, $02, HIDE ; HS_DAISY_WALKING @@ -591,6 +592,10 @@ 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 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 9889a35c..ad43777d 100644 --- a/data/maps/objects/BrunswickGlade.asm +++ b/data/maps/objects/BrunswickGlade.asm @@ -8,11 +8,15 @@ BrunswickGlade_Object: warp_event 9, 0, BRUNSWICK_GROTTO, 2 def_bg_events - bg_event 14, 24, 4 + bg_event 14, 24, 8 ; 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 6, 15, SPRITE_POKE_BALL, STAY, NONE, 4, TM_THUNDER ; itemball1 + object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 5, LEAF_STONE ; itemball2 + object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 6, REVIVE ; itemball3 + object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION ; itemball4 def_warps_to BRUNSWICK_GLADE \ No newline at end of file diff --git a/data/maps/objects/BrunswickTrail.asm b/data/maps/objects/BrunswickTrail.asm index 9e0fe377..9191f525 100644 --- a/data/maps/objects/BrunswickTrail.asm +++ b/data/maps/objects/BrunswickTrail.asm @@ -16,5 +16,7 @@ BrunswickTrail_Object: object_event 54, 9, SPRITE_BIRD, STAY, UP, 6 ; person, GZap object_event 6, 16, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person, Lover1 object_event 6, 15, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 8 ; person, Lover2 + object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 9, ULTRA_BALL ; itemball1 + def_warps_to BRUNSWICK_TRAIL diff --git a/scripts/BrunswickGlade.asm b/scripts/BrunswickGlade.asm index 9900defc..aa64323c 100644 --- a/scripts/BrunswickGlade.asm +++ b/scripts/BrunswickGlade.asm @@ -6,6 +6,10 @@ BrunswickGlade_TextPointers: dw GZapRun2 dw GZapRun3 dw BrunswickGladeSign1 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText GZapRun1: text_far _BirdBattleText diff --git a/scripts/BrunswickTrail.asm b/scripts/BrunswickTrail.asm index 8b182408..34b4c6e4 100644 --- a/scripts/BrunswickTrail.asm +++ b/scripts/BrunswickTrail.asm @@ -21,6 +21,7 @@ BrunswickTrail_TextPointers: dw GZapFound dw Lover1 dw Lover2 + dw PickUpItemText BrunswickTrailTrainerHeaders: def_trainers diff --git a/tools/consts.py b/tools/consts.py old mode 100755 new mode 100644 diff --git a/tools/free_space.awk b/tools/free_space.awk old mode 100755 new mode 100644 diff --git a/tools/palfix.py b/tools/palfix.py old mode 100755 new mode 100644 diff --git a/tools/pic.py b/tools/pic.py old mode 100755 new mode 100644 diff --git a/tools/rgb555.py b/tools/rgb555.py old mode 100755 new mode 100644 diff --git a/tools/sym_comments.py b/tools/sym_comments.py old mode 100755 new mode 100644 diff --git a/tools/toc.py b/tools/toc.py old mode 100755 new mode 100644 diff --git a/tools/unique.py b/tools/unique.py old mode 100755 new mode 100644 From c3d92fb62f14ff18b18070fcc7c5730db6b7e577 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 11 Dec 2023 13:32:05 +0000 Subject: [PATCH 2/4] celeste/brunswick trainer groundwork dist sucks but the parties are there found unused trainers we could also dot around --- data/trainers/parties.asm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 09ec3394..5b85faa6 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -455,6 +455,10 @@ BeautyData: db 30, KINGDRA, 0 ; Close to the Trader ; Brunswick Trail db 66, PERSIAN, VENUSAUR, KINGDRA, SYLVEON, CLOYSTER, 0 +; Celeste Hill? + db 66, MR_MIME, WIGGLYTUFF, NINETALES_A, PENDRAKEN, 0 ; Mina + db 65, PERSIAN, PERSIAN_A, PERRSERKER, 0 ; Selphy + db 67, MUK, ARBOK, VILEPLUME, 0 ; Ariana ; yep psychic yep psychic yep psychic PsychicData: @@ -655,6 +659,12 @@ CooltrainerMData: ; Viridian Gym db 39, SANDSLASH, DUGTRIO, 0 db 43, NIDOKING, 0 +; Celadon Condominiums Moriomoto? + db 75, KANGASKHAN, FLAREON, VAPOREON, JOLTEON, MACHAMP, DRAGONITE, 0 +; Brunswick Trail / Glade + db 68, RATICATE, POLIWRATH, BUTTERFREE, WIGGLYTUFF, MACHAMP, RHYPERIOR, 0 ; Primo + db 67, PIDGEOT, VILEPLUME, GUARDIA, RAPIDASH, SLOWBRO, JOLTEON, 0 ; Trace + db 70, EXEGGUTOR, SLOWBRO, JYNX, 0 ; Will ; Equally varied, nothing to say CooltrainerFData: @@ -667,10 +677,12 @@ CooltrainerFData: db 66, CLEFABLE, GENGAR, VICTREEBEL, NINETALES, KANGASKHAN, BLASTOISE, 0 ; Victory Road 1F db 44, PERSIAN, NINETALES, BELLOSSOM, 0 -; Unused +; Unused - reuse somewhere? celeste, etc? ; db 45, IVYSAUR, VENUSAUR, 0 ; db 45, NIDORINA, NIDOQUEEN, 0 ; db 43, PERSIAN, NINETALES, RAICHU, 0 +; Brunswick Glade/grotto etc, whatever desired + db 68, PIDGEOT, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf ; "Dignified" Pokemon associated with the privileged class. GentlemanData: @@ -683,6 +695,9 @@ GentlemanData: db 64, ARCANINE, NIDOQUEEN, MR_RIME, FEAROW, CARAPTHOR, RAPIDASH, 0 ; SS Anne 2F Rooms db 17, KOLTA, GROWLITHE, 0 +; Celeste Hill? + db 69, NIDOKING, GOLDUCK, GUARDIA, PIDGEOT, DODRIO, BEEDRILL, 0 ; Fuji + db 67, FEAROW, RAPIDASH, GOROCHU, ALAKAZAM, SYLVEON, 0 ; Fan Club chairman ChannelerData: ; Unused From 62fb13c3b39bd99e98c8a2cd14008fa8ea4696e3 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Mon, 11 Dec 2023 14:14:49 +0000 Subject: [PATCH 3/4] why do the goldeen and psyduck lines not learn water gun by level up what is wrong with the learnsets in this game Also relocated the aforementioned items and made Celeste Hill look a bit nicer. --- constants/map_constants.asm | 4 ++-- data/maps/objects/BrunswickGlade.asm | 8 ++++---- data/maps/objects/BrunswickTrail.asm | 2 +- data/maps/objects/CelesteHillOutside.asm | 18 +++++++++--------- data/moves/names.asm | 2 +- data/pokemon/base_stats/goldeen.asm | 2 +- data/pokemon/base_stats/golduck.asm | 2 +- data/pokemon/base_stats/orfry.asm | 2 +- data/pokemon/base_stats/psyduck.asm | 2 +- data/pokemon/base_stats/seaking.asm | 2 +- data/pokemon/base_stats/weirduck.asm | 2 +- data/trainers/rival_parties.asm | 12 ++++++------ data/trainers/scaled_parties.asm | 2 +- maps/CelesteHillOutside.blk | 2 +- text/BrunswickTrail.asm | 2 +- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/constants/map_constants.asm b/constants/map_constants.asm index c94c40e0..0a99337e 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -272,8 +272,8 @@ DEF FIRST_INDOOR_MAP EQU const_value 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, 18 ; $FD - map_const BRUNSWICK_GLADE, 19, 20 ; $FE + map_const CELESTE_HILL_OUTSIDE, 20, 20 ; $FD + map_const BRUNSWICK_GLADE, 19, 20 ; $FE 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/maps/objects/BrunswickGlade.asm b/data/maps/objects/BrunswickGlade.asm index ad43777d..0b5f7342 100644 --- a/data/maps/objects/BrunswickGlade.asm +++ b/data/maps/objects/BrunswickGlade.asm @@ -14,9 +14,9 @@ BrunswickGlade_Object: 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 6, 15, SPRITE_POKE_BALL, STAY, NONE, 4, TM_THUNDER ; itemball1 - object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 5, LEAF_STONE ; itemball2 - object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 6, REVIVE ; itemball3 - object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION ; itemball4 + 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 def_warps_to BRUNSWICK_GLADE \ No newline at end of file diff --git a/data/maps/objects/BrunswickTrail.asm b/data/maps/objects/BrunswickTrail.asm index 9191f525..e05370d3 100644 --- a/data/maps/objects/BrunswickTrail.asm +++ b/data/maps/objects/BrunswickTrail.asm @@ -16,7 +16,7 @@ BrunswickTrail_Object: object_event 54, 9, SPRITE_BIRD, STAY, UP, 6 ; person, GZap object_event 6, 16, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person, Lover1 object_event 6, 15, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 8 ; person, Lover2 - object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 9, ULTRA_BALL ; itemball1 + object_event 20, 21, SPRITE_POKE_BALL, STAY, NONE, 9, ULTRA_BALL ; itemball1 def_warps_to BRUNSWICK_TRAIL diff --git a/data/maps/objects/CelesteHillOutside.asm b/data/maps/objects/CelesteHillOutside.asm index 47e2ddae..6416966a 100644 --- a/data/maps/objects/CelesteHillOutside.asm +++ b/data/maps/objects/CelesteHillOutside.asm @@ -1,15 +1,15 @@ CelesteHillOutside_Object: - db $2 ; border block + db $3 ; border block def_warp_events - warp_event 18, 35, CELESTE_HILL_GATE, 1 - warp_event 19, 35, CELESTE_HILL_GATE, 2 - warp_event 16, 23, CELESTE_HILL_CAVE, 1 - warp_event 36, 11, CELESTE_HILL_CAVE, 5 - warp_event 2, 9, CELESTE_HILL_CAVE, 6 - warp_event 22, 3, CELESTE_HILL_CAVE, 7 - warp_event 18, 0, CELESTE_HILL, 1 - warp_event 19, 0, CELESTE_HILL, 2 + warp_event 20, 39, CELESTE_HILL_GATE, 1 + warp_event 21, 39, CELESTE_HILL_GATE, 2 + warp_event 16, 27, CELESTE_HILL_CAVE, 1 + warp_event 36, 15, CELESTE_HILL_CAVE, 5 + warp_event 2, 13, CELESTE_HILL_CAVE, 6 + warp_event 22, 7, CELESTE_HILL_CAVE, 7 + warp_event 18, 4, CELESTE_HILL, 1 + warp_event 19, 4, CELESTE_HILL, 2 def_bg_events diff --git a/data/moves/names.asm b/data/moves/names.asm index e683e14e..a16812c7 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -180,7 +180,7 @@ MoveNames:: ; 12chr limit li "MIRROR SHOT" li "SMART STRIKE" li "FAKE TEARS" - li "FALSURRENDER" ; maybe we leave this out. maybe. + li "FAKESURRENDR" li "KOWTOWCLEAVE" li "DISARMVOICE" li "NASTY PLOT" diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index 024512c6..f0abcd91 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/goldeen.pic", 0, 1 ; sprite dimensions dw GoldeenPicFront, GoldeenPicBack - db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db PECK, TAIL_WHIP, WATER_GUN, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index 48e167ec..90f4eda7 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions dw GolduckPicFront, GolduckPicBack - db SCRATCH, TAIL_WHIP, AMNESIA, DISABLE ; level 1 learnset + db SCRATCH, WATER_GUN, TAIL_WHIP, AMNESIA ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/orfry.asm b/data/pokemon/base_stats/orfry.asm index 6df14b06..9e6ef704 100644 --- a/data/pokemon/base_stats/orfry.asm +++ b/data/pokemon/base_stats/orfry.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/orfry.pic", 0, 1 ; sprite dimensions dw OrfryPicFront, OrfryPicBack - db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db PECK, TAIL_WHIP, WATER_GUN, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index 51bd916b..99d8c2dd 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/psyduck.pic", 0, 1 ; sprite dimensions dw PsyduckPicFront, PsyduckPicBack - db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db SCRATCH, WATER_GUN, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index 61a75f79..8a4c0af7 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/seaking.pic", 0, 1 ; sprite dimensions dw SeakingPicFront, SeakingPicBack - db PECK, TAIL_WHIP, SUPERSONIC, NO_MOVE ; level 1 learnset + db PECK, TAIL_WHIP, WATER_GUN, SUPERSONIC ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/weirduck.asm b/data/pokemon/base_stats/weirduck.asm index d24e0534..7fb33e8c 100644 --- a/data/pokemon/base_stats/weirduck.asm +++ b/data/pokemon/base_stats/weirduck.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/weirduck.pic", 0, 1 ; sprite dimensions dw WeirduckPicFront, WeirduckPicBack - db SCRATCH, TAIL_WHIP, AMNESIA, NO_MOVE ; level 1 learnset + db SCRATCH, WATER_GUN, TAIL_WHIP, AMNESIA ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/trainers/rival_parties.asm b/data/trainers/rival_parties.asm index 8d922270..314ae0a3 100644 --- a/data/trainers/rival_parties.asm +++ b/data/trainers/rival_parties.asm @@ -28,8 +28,8 @@ Green2Data: db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 23, EXEGGCUTE, 22, KADABRA, 25, WARTORTLE, 0 db $FF, 25, PIDGEOTTO, 23, GYARADOS, 23, GROWLITHE, 22, KADABRA, 25, IVYSAUR, 0 db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 23, GYARADOS, 22, KADABRA, 25, CHARMELEON, 0 - db $FF, 25, FEAROW, 23, VULPIX, 23, MAGNEMITE, 22, SANDSHREW, 25, UMBREON, 0 - db $FF, 25, FEAROW, 23, SHELLDER, 23, VULPIX, 22, SANDSHREW, 25, RAICHU, 0 + db $FF, 25, FEAROW, 23, MAGNETITE, 23, VULPIX, 22, SANDSHREW, 25, EEVEE, 0 + db $FF, 25, FEAROW, 23, VULPIX, 23, SHELLDER, 22, SANDSHREW, 25, RAICHU, 0 ; Silph Co. 7F db $FF, 37, PIDGEOT, 35, RHYHORN, 36, GROWLITHE, 36, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0 db $FF, 37, PIDGEOT, 35, RHYHORN, 36, GYARADOS, 36, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0 @@ -47,14 +47,14 @@ Green3Data: db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0 db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0 db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0 - db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, MAGNEZONE, 65, UMBREON, 0 - db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, CLOYSTER, 63, NINETALES, 65, GOROCHU, 0 + db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, MAGNEZONE, 63, NINETALES, 65, UMBREON, 0 + db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, CLOYSTER, 65, GOROCHU, 0 ; post-game rematch teams, based on FRLG team db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, ARCANINE, 78, EXEGGUTOR, 80, TOTARTLE, 0 db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, GYARADOS, 78, ARCANINE, 80, VENUSAUR, 0 db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, EXEGGUTOR, 78, GYARADOS, 80, CHARIZARD, 0 - db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, NINETALES, 78, MAGNEZONE, 80, UMBREON, 0 - db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, CLOYSTER, 78, NINETALES, 80, GOROCHU, 0 + db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, MAGNEZONE, 78, NINETALES, 80, UMBREON, 0 + db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, NINETALES, 78, CLOYSTER, 80, GOROCHU, 0 ProfOakData: db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 70, NIDOKING, 70, TOTARTLE, 0 diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index fb72c7c5..035c618a 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -127,7 +127,7 @@ BlackbeltData: db $FF, 27, MACHOKE, 27, MANKEY, 30, HITMONLEE, 30, HITMONCHAN, 30, HITMONTOP, 0 ; 3 db $FF, 36, MACHOKE, 36, PRIMEAPE, 39, HITMONLEE, 39, HITMONCHAN, 39, HITMONTOP, 0 ; 4 db $FF, 39, MACHOKE, 39, PRIMEAPE, 42, HITMONLEE, 42, HITMONCHAN, 42, HITMONTOP, 0 ; 5 - db $FF, 43, MACHAMP, 43, ANNIHILAPE, 46, HITMONLEE, 46, HITMONCHAN, 46, HITMONTOP, 0 ; 6 + db $FF, 43, MACHAMP, 43, PRIMEAPE, 46, HITMONLEE, 46, HITMONCHAN, 46, HITMONTOP, 0 ; 6 db $FF, 46, MACHAMP, 46, CARAPTHOR, 46, ANNIHILAPE, 49, HITMONLEE, 49, HITMONCHAN, 49, HITMONTOP, 0 ; 7 db $FF, 52, MACHAMP, 52, CARAPTHOR, 52, ANNIHILAPE, 55, HITMONLEE, 55, HITMONCHAN, 55, HITMONTOP, 0 ; 8 db $FF, 66, MACHAMP, 66, ANNIHILAPE, 66, TAUROS_P, 70, HITMONLEE, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame diff --git a/maps/CelesteHillOutside.blk b/maps/CelesteHillOutside.blk index 90b92bba..ea268357 100644 --- a/maps/CelesteHillOutside.blk +++ b/maps/CelesteHillOutside.blk @@ -1 +1 @@ -ƒ2X0…†s,a`geaW/‡ƒg…2sˆVVVVVj/ag…†‡2WV‚gg)aWj‡‹c‹s/<>†€jV€/@ABƒg…DFg<>_DdF†€‡g„‚DFg%0ƒgg…AAA†‚g„/sV,„‡AAABsV/‹‹‹‹‹‹sV‡@AAABAAAAB@CD?ACFEEE?B@BDdFggg@B@Bggggggg@B@Bggg@BD?>gg<=CFD?>g†€jV€/@ABƒg…DFg<>_DdF†€‡g„‚DF%0ƒgg…AAA†‚g„/sV,„‡AAABsV/‹‹‹‹‹‹sV‡@AAABAAAAB@CD?ACFEEE?B@BDdFggg@B@Bgggggg@B@Bggg@BD?>ggg Date: Mon, 11 Dec 2023 23:21:54 +0000 Subject: [PATCH 4/4] Add Morimoto Boss Fight from LGPE Uses the team from the LGPE boss fight; quotes are from a mix of games across the series; appears after the game is beaten. --- README.md | 1 + constants/hide_show_constants.asm | 1 + data/maps/hide_show_data.asm | 6 ++- data/maps/objects/CeladonMansion3F.asm | 9 ++-- data/trainers/parties.asm | 4 +- scripts/CeladonMansion3F.asm | 58 ++++++++++++++++++++++++++ scripts/HallOfFame.asm | 1 + text/CeladonMansion3F.asm | 45 ++++++++++++++++++++ 8 files changed, 117 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 01604e04..0831d261 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,7 @@ Improved Areas - Vermilion City now features Officer Jenny with the Squirtle. She only appears if Pikachu or Eevee are chosen. - Rock Tunnel has a more workable map, now being easier to go through and having new areas to explore. Includes a way to get renewable fossils, items, and other interesting bits and pieces. Overall, it makes Flash much more rewarding to bring, showing you where the items and content are instead of being an inconvenience. - Celadon Mansion's Roof House now features Shinjuku Jacky, a cut representation of a famous Virtua Fighter player. The house has also been redesigned, derived from the unused "Grandpa's House", featuring Nintendo 64s. + - If you go to the Developer Room after beating the game, Morimoto's boss fight from LGPE will be available! - Pokemon Tower was shortened, being less intensive and adding room for more maps. - Fuchsia City has been made to resemble the more walkable LGPE version, removing the Cut trees among other things. - The Fighting Dojo has been revamped, featuring a design reminiscent of the prototype versions; rough floors, the elder in the back, and more. Additionally, you can now get a Hitmontop as a third option. The Karate Master is also now treated somewhat more like a Gym Leader, having Gym Scaling and a Rematch system. diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 8fd7f807..c45418cd 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -83,6 +83,7 @@ DEF SHOW EQU $15 const HS_POKEMON_TOWER_7F_JAMES ; 44 const HS_POKEMON_TOWER_7F_MR_FUJI ; 45 const HS_MR_FUJIS_HOUSE_MR_FUJI ; 46 + const HS_MORIMOTO const HS_CELADON_MANSION_EEVEE_GIFT ; 47 const HS_GAME_CORNER_ROCKET ; 48 const HS_WARDENS_HOUSE_ITEM ; 49 X diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 704d898e..1d649ce4 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -136,7 +136,7 @@ MapHSPointers: dw NoHS dw NoHS dw NoHS - dw NoHS + dw CeladonMansion3FHS dw NoHS dw CeladonMansionRoofHouseHS dw NoHS @@ -369,7 +369,9 @@ PokemonTower7FHS: db POKEMON_TOWER_7F, $02, HIDE ; HS_POKEMON_TOWER_7F_JAMES db POKEMON_TOWER_7F, $03, SHOW ; HS_POKEMON_TOWER_7F_MR_FUJI MrFujisHouseHS: - db MR_FUJIS_HOUSE, $05, HIDE ; HS_MR_FUJIS_HOUSE_MR_FUJI + db MR_FUJIS_HOUSE, $05, HIDE ; HS_MR_FUJIS_HOUSE_MR_FUJI# +CeladonMansion3FHS: + db CELADON_MANSION_3F, $05, HIDE ; HS_MORIMOTO CeladonMansionRoofHouseHS: db CELADON_MANSION_ROOF_HOUSE, $02, SHOW ; HS_CELADON_MANSION_EEVEE_GIFT GameCornerHS: diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm index b4f9c37b..614e34f1 100644 --- a/data/maps/objects/CeladonMansion3F.asm +++ b/data/maps/objects/CeladonMansion3F.asm @@ -8,15 +8,16 @@ CeladonMansion3F_Object: warp_event 4, 1, CELADON_MANSION_2F, 4 def_bg_events - bg_event 1, 3, 5 ; CeladonMansion3Text5 - bg_event 4, 3, 6 ; CeladonMansion3Text6 - bg_event 1, 6, 7 ; CeladonMansion3Text7 - bg_event 4, 9, 8 ; CeladonMansion3Text8 + bg_event 1, 3, 6 ; CeladonMansion3Text5 + bg_event 4, 3, 7 ; CeladonMansion3Text6 + bg_event 1, 6, 8 ; CeladonMansion3Text7 + bg_event 4, 9, 9 ; CeladonMansion3Text8 def_object_events object_event 0, 4, SPRITE_BIKE_SHOP_CLERK, STAY, UP, 1 ; person object_event 3, 4, SPRITE_CLERK, STAY, UP, 2 ; person object_event 0, 7, SPRITE_SUPER_NERD, STAY, UP, 3 ; person object_event 2, 3, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person + object_event 4, 6, SPRITE_COOLTRAINER_M, STAY, DOWN, 5 ; person def_warps_to CELADON_MANSION_3F diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 5b85faa6..046dd306 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -659,8 +659,8 @@ CooltrainerMData: ; Viridian Gym db 39, SANDSLASH, DUGTRIO, 0 db 43, NIDOKING, 0 -; Celadon Condominiums Moriomoto? - db 75, KANGASKHAN, FLAREON, VAPOREON, JOLTEON, MACHAMP, DRAGONITE, 0 +; Celadon Condominiums Morimoto - Team is LGPE's with +10 Levels each. + db 64, KANGASKHAN, FLAREON, VAPOREON, JOLTEON, MACHAMP, DRAGONITE, 0 ; Brunswick Trail / Glade db 68, RATICATE, POLIWRATH, BUTTERFREE, WIGGLYTUFF, MACHAMP, RHYPERIOR, 0 ; Primo db 67, PIDGEOT, VILEPLUME, GUARDIA, RAPIDASH, SLOWBRO, JOLTEON, 0 ; Trace diff --git a/scripts/CeladonMansion3F.asm b/scripts/CeladonMansion3F.asm index 566d7cf5..8619e9ce 100644 --- a/scripts/CeladonMansion3F.asm +++ b/scripts/CeladonMansion3F.asm @@ -6,6 +6,7 @@ CeladonMansion3F_TextPointers: dw GraphicArtistText dw WriterText dw DirectorText + dw MorimotoFight dw GameFreakPCText1 dw GameFreakPCText2 dw GameFreakPCText3 @@ -67,3 +68,60 @@ GameFreakPCText3: GameFreakSignText: text_far _CeladonMansion3Text8 text_end + +MorimotoFight: + text_asm + ld hl, CeladonMansionMorimotoGreeting + call PrintText + + call YesNoChoice ; Do they want in? + ld a, [wCurrentMenuItem] + and a + jr nz, .refused + + ld hl, CeladonMansionMorimotoFight + call PrintText + ld c, BANK(Music_MeetMaleTrainer) + ld a, MUSIC_MEET_MALE_TRAINER + call PlayMusic + ld hl, wd72d + set 6, [hl] + set 7, [hl] + + call Delay3 + ld a, OPP_COOLTRAINER_M + ld [wCurOpponent], a + ld a, 11 + ld [wTrainerNo], a + ld a, 1 + ld [wIsTrainerBattle], a + ld hl, CeladonMansionMorimotoDefeated + ld de, CeladonMansionMorimotoWin + call SaveEndBattleTextPointers + jr .done +.refused + ld hl, CeladonMansionMorimotoNo + call PrintText + ; fallthrough +.done + jp TextScriptEnd + +CeladonMansionMorimotoGreeting: + text_far _CeladonMansionMorimotoGreeting + text_end + +CeladonMansionMorimotoFight: + text_far _CeladonMansionMorimotoFight + text_end + +CeladonMansionMorimotoNo: + text_far _CeladonMansionMorimotoNo + text_end + +CeladonMansionMorimotoDefeated: + text_far _CeladonMansionMorimotoDefeated + text_end + +CeladonMansionMorimotoWin: + text_far _CeladonMansionMorimotoWin + text_end diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 308ccb40..1b7aee1d 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -251,6 +251,7 @@ ShowThis: ObjectsToShow: db HS_ROUTE_1_OAK ; Oak post-game fight + db HS_MORIMOTO ; LGPE Morimoto Boss Fight db -1 ; end ObjectsToHide: diff --git a/text/CeladonMansion3F.asm b/text/CeladonMansion3F.asm index 714ecf19..42d5703c 100644 --- a/text/CeladonMansion3F.asm +++ b/text/CeladonMansion3F.asm @@ -65,3 +65,48 @@ _CeladonMansion3Text8:: text "GAME FREAK" line "Development Room" done + +; Morimoto Boss Fight from LGPE. +; We use a mix of quotes from across the series, and adapt it to RBY jargon. +; Eg. Cooltrainer > Coach Trainer. + +_CeladonMansionMorimotoGreeting:: ; LGPE + text "I'm MORIMOTO." + + para "I help out all" + line "the COOLTRAINERs." +; cont "I have my reasons." this is insanely cringe it's off by ONE CHARACTER + + para "Do you really want" + line "to battle me, the" + cont "strongest COOL-" + cont "TRAINER?" + prompt + +_CeladonMansionMorimotoFight:: ; LGPE + text "Here I go!" + prompt + +_CeladonMansionMorimotoNo:: ; USUM + text "Oh yeah?" + + para "Well, that's a" + line "real shame. I'm" + cont "really good," + cont "after all." + done + +_CeladonMansionMorimotoDefeated:: ; LGPE, compressed + text "When" + line "it comes down" + line "to it, you are" + cont "still the best!" + prompt + +_CeladonMansionMorimotoWin:: ; BW/BW2, compressed & repositioned + text "I am" + line "the best, after" + cont "all!" + + para "Just kidding!" + prompt