From c5eff723b15b5f1e654d3f511a9302056860a02d Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 21 Jul 2023 19:35:23 +0100 Subject: [PATCH] A couple of bug fixes More still need to be done but I'm separating the commits so I don't get overwhelmed lol - Fixes a bug with the Up-Grade NPC in Saffron. He now properly shows up only after defeating Giovanni. - Fixes a bug where Silph could be entered before receiving the Poke Flute. - Silph Gauntlet 5F has a complete remodel, more closely matching the original map found in the leaks. - One of the Fuchsia Gym Trainers no longer uses a repeat Arbok. - Wiglett and Wugtrio could learn Rock Slide via TM, which has now been fixed. - Jacky uses a Porygon in place of Machop, as it ties into his polygonal, Virtua Fighter-inspired sprite. - Chief uses a Gengar instead of Porygon2 to represent the Silph Scope. - Omega's and Giovanni 2's levels have been toned down slightly. - Lance now uses Crocky over Aerodactyl. - Yujirou's non-initial teams have had their levels reduced to be the same level as the previously-fought Gym Leader, rather than the upcoming one. - Updated README with additional credits. --- README.md | 4 +++ constants/hide_show_constants.asm | 3 +- data/maps/hide_show_data.asm | 5 ++-- data/maps/objects/SaffronCity.asm | 9 +++--- data/maps/objects/SilphCo11F.asm | 4 +-- data/maps/objects/SilphGauntlet5F.asm | 18 ++++++------ data/maps/objects/ViridianPreGym.asm | 2 +- data/pokemon/base_stats/wiglett.asm | 6 ++-- data/pokemon/base_stats/wugtrio.asm | 2 +- data/trainers/parties.asm | 17 ++++++----- data/trainers/scaled_parties.asm | 42 +++++++++++++-------------- maps/SilphGauntlet5F.blk | 3 +- scripts/SaffronCity.asm | 8 +---- scripts/SilphCo11F.asm | 5 +--- scripts/SilphGauntlet5F.asm | 12 ++++---- text/SaffronCity.asm | 4 --- 16 files changed, 67 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index ed382a85..3d2734ad 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,8 @@ New Areas New Music ==== - Mewtwo has its own theme song, being a demake of the iconic Stadium battle theme. Composed by LuciShrimp. +- Several pieces of unused music, including Digda01, Victory4, Field6, Kincho01, and Giovanni's theme have been implemented. + - A remix of the unused Koukan (trading) music is also used as a town theme. Composed by BGVC. Improved Areas ==== @@ -361,6 +363,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * erosunica - Assistance with developing Celadon University & Citrine City, plus sources for various subjects. * Chatot4444 - Assisting with gym scaling code. * Enigami - Reworking the Battle Tent's RestoreTeam code to make it work properly. +* Ness the Unexplained - Helped with writing NPC dialogue and Pokédex entries for new Pokémon such as Gyopin. * ZumiIsawhat? - Restorations of beta OST. * FrenchOrange - Reconstructions of various overworld beta sprites. * Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype Pokémon sprites @@ -368,6 +371,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red, which we used as reference points for the Girl sprites and the Battle Tent. * jojobear13 & Mateo - HP/StatExp display, move deleter, & move relearner functionality from Shin Pokered, followed [this guide](https://github.com/jojobear13/shinpokered/blob/master/how%20to%20guides/how%20to%20add%20the%20move%20relearner%26deleter.txt). Tweaks were made to make it compatible with the pokered version we worked off of. * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld! +* BGVC - Composed the original 4-channel version of the unused trading music. * wrulfy - Technical advice * suloku - Technical advice regarding setting where you spawn after beating the Elite Four. * 大吟醸 (Daiginjo) - Assistance in translating the Tamamushi University Student Book, allowing for an accurate adaptation of the location. diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 38e75020..e754791a 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -37,8 +37,7 @@ DEF SHOW EQU $15 const HS_SAFFRON_CITY_D ; 16 const HS_SAFFRON_CITY_E ; 17 const HS_SAFFRON_CITY_F ; 18 - const HS_SAFFRON_CITY_UP_GRADE ; 19 - const HS_ROUTE_1_OAK ; F0 + const HS_ROUTE_1_OAK ; 19 const HS_ROUTE_2_ITEM_1 ; 1A X const HS_ROUTE_2_ITEM_2 ; 1B X const HS_ROUTE_4_ITEM ; 1C X diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 6b97d93c..16dc4382 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -300,10 +300,9 @@ SaffronCityHS: db SAFFRON_CITY, $0A, HIDE ; HS_SAFFRON_CITY_A db SAFFRON_CITY, $0B, HIDE ; HS_SAFFRON_CITY_B db SAFFRON_CITY, $0C, HIDE ; HS_SAFFRON_CITY_C - db SAFFRON_CITY, $0D, HIDE ; HS_SAFFRON_CITY_D - db SAFFRON_CITY, $0E, SHOW ; HS_SAFFRON_CITY_E + db SAFFRON_CITY, $0D, SHOW ; HS_SAFFRON_CITY_D + db SAFFRON_CITY, $0E, HIDE ; HS_SAFFRON_CITY_E db SAFFRON_CITY, $0F, HIDE ; HS_SAFFRON_CITY_F - db SAFFRON_CITY, $1A, HIDE ; HS_SAFFRON_CITY_UP_GRADE Route1HS: db ROUTE_1, $03, HIDE ; HS_ROUTE_1_OAK Route2HS: diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index b4747273..d1f52675 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -35,10 +35,9 @@ SaffronCity_Object: object_event 23, 23, SPRITE_SILPH_WORKER, STAY, NONE, 9 ; person object_event 17, 30, SPRITE_ERIKA, WALK, LEFT_RIGHT, 10 ; person object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, 11 ; person - ;object_event 31, 12, SPRITE_BIRD, STAY, DOWN, 12 ; person - removed due to sprite limit - object_event 18, 8, SPRITE_ROCKER, STAY, UP, 13 ; person - object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person - object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, 15 ; person - object_event 5, 30, SPRITE_SILPH_WORKER, STAY, DOWN, 26 ; Up-Grade NPC, hidden until Giovanni is beaten + object_event 18, 8, SPRITE_ROCKER, STAY, UP, 12 ; person + object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, 13 ; person + object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person + object_event 5, 30, SPRITE_SILPH_WORKER, STAY, DOWN, 15 ; Up-Grade NPC def_warps_to SAFFRON_CITY diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 1ca5525f..e01e64e6 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -16,7 +16,7 @@ SilphCo11F_Object: object_event 2, 8, SPRITE_JAMES, STAY, UP, 4 object_event 3, 16, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 41 object_event 3, 8, SPRITE_JESSIE, STAY, UP, 6 - object_event 6, 11, SPRITE_MONSTER, STAY, UP, 11, OMEGA, 45 | OW_POKEMON - object_event 15, 15, SPRITE_MONSTER, STAY, UP, 12, OMEGA, 75 | OW_POKEMON + object_event 6, 11, SPRITE_MONSTER, STAY, UP, 11, OMEGA, 40 | OW_POKEMON + object_event 15, 15, SPRITE_MONSTER, STAY, UP, 12, OMEGA, 65 | OW_POKEMON def_warps_to SILPH_CO_11F diff --git a/data/maps/objects/SilphGauntlet5F.asm b/data/maps/objects/SilphGauntlet5F.asm index 5b3c0e0f..86695c51 100644 --- a/data/maps/objects/SilphGauntlet5F.asm +++ b/data/maps/objects/SilphGauntlet5F.asm @@ -2,18 +2,18 @@ SilphGauntlet5F_Object: db $0 ; border block def_warp_events - warp_event 2, 15, SILPH_GAUNTLET_4F, 2 - warp_event 2, 3, SILPH_GAUNTLET_6F, 1 + warp_event 8, 9, SILPH_GAUNTLET_4F, 2 + warp_event 8, 3, SILPH_GAUNTLET_6F, 1 def_bg_events def_object_events - object_event 1, 10, SPRITE_ROCKER, STAY, RIGHT, 1, OPP_JUGGLER, 6 - object_event 6, 6, SPRITE_BIKER, STAY, DOWN, 2, OPP_BIKER, 16 - object_event 6, 15, SPRITE_GAMBLER, STAY, RIGHT, 3, OPP_CUE_BALL, 10 - object_event 14, 10, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_SWIMMER, 16 - object_event 14, 2, SPRITE_ROCKER, STAY, DOWN, 5, OPP_TAMER, 6 - object_event 4, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, 6, OPP_COOLTRAINER_M, 4 - object_event 9, 5, SPRITE_COOLTRAINER_F, STAY, UP, 7, OPP_COOLTRAINER_F, 4 + object_event 11, 6, SPRITE_ROCKER, STAY, LEFT, 1, OPP_JUGGLER, 6 + object_event 4, 12, SPRITE_BIKER, STAY, LEFT, 2, OPP_BIKER, 16 + object_event 16, 14, SPRITE_GAMBLER, STAY, RIGHT, 3, OPP_CUE_BALL, 10 + object_event 9, 14, SPRITE_SWIMMER, STAY, DOWN, 4, OPP_SWIMMER, 16 + object_event 3, 14, SPRITE_ROCKER, STAY, DOWN, 5, OPP_TAMER, 6 + object_event 3, 5, SPRITE_COOLTRAINER_M, STAY, LEFT, 6, OPP_COOLTRAINER_M, 4 + object_event 1, 9, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_COOLTRAINER_F, 4 def_warps_to SILPH_GAUNTLET_5F diff --git a/data/maps/objects/ViridianPreGym.asm b/data/maps/objects/ViridianPreGym.asm index d74c483f..89f158ac 100644 --- a/data/maps/objects/ViridianPreGym.asm +++ b/data/maps/objects/ViridianPreGym.asm @@ -2,8 +2,8 @@ ViridianPreGym_Object: db $0 ; border block def_warp_events - warp_event 5, 13, LAST_MAP, 7 warp_event 4, 13, LAST_MAP, 7 + warp_event 5, 13, LAST_MAP, 7 def_bg_events bg_event 2, 7, 5 ; League poster diff --git a/data/pokemon/base_stats/wiglett.asm b/data/pokemon/base_stats/wiglett.asm index be2a061e..996824d5 100644 --- a/data/pokemon/base_stats/wiglett.asm +++ b/data/pokemon/base_stats/wiglett.asm @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, RAGE, EARTHQUAKE, FISSURE, DIG, \ - MIMIC, DOUBLE_TEAM, BIDE, REST, ROCK_SLIDE, \ - SUBSTITUTE, CUT, SURF + WATER_GUN, RAGE, EARTHQUAKE, FISSURE, DIG, \ + MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, \ + CUT, SURF ; end db BANK(WiglettPicFront) diff --git a/data/pokemon/base_stats/wugtrio.asm b/data/pokemon/base_stats/wugtrio.asm index f5b01c74..1b935f81 100644 --- a/data/pokemon/base_stats/wugtrio.asm +++ b/data/pokemon/base_stats/wugtrio.asm @@ -17,7 +17,7 @@ tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ WATER_GUN, HYPER_BEAM, RAGE, EARTHQUAKE, FISSURE, \ DIG, MIMIC, DOUBLE_TEAM, BIDE, REST, \ - ROCK_SLIDE, SUBSTITUTE, CUT, SURF + SUBSTITUTE, CUT, SURF ; end db BANK(WugtrioPicFront) diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index f74d1b88..125bd256 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -499,7 +499,7 @@ JugglerData: TamerData: ; Fuchsia Gym db 34, NIDOQUEEN, ARBOK, 0 - db 33, ARBOK, NIDOKING, ARBOK, 0 + db 33, ARBOK, NIDOKING, TSUBOMITTO, 0 ; Viridian Gym db 43, RHYDON, 0 db 39, SANDSLASH, TRAMPEL, 0 @@ -541,7 +541,8 @@ BirdKeeperData: ; Uses Silph products and Steel-types ChiefData: ; Silph Gauntlet 7F - db $FF, 73, PORYGON2, 72, LAPRAS, 73, SCIZOR, 73, MAGNEZONE, 75, PORYGONZ, 77, OMEGA, 0 + db $FF, 71, MAGNEZONE, 70, LAPRAS, 71, PURAKKUSU, 71, GENGAR, 73, PORYGONZ, 75, OMEGA, 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 ScientistData: @@ -743,17 +744,17 @@ JuniorData: db 63, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0 ; no idea what to do with this guy's team, so I'll redo this later JackData: -; Celadon University Roof House - db 23, MANKEY, MACHOP, SCYTHER, HITMONCHAN, 0 ; Scyther is Kage-Maru. +; Celadon Mansion Roof House + db 23, MANKEY, PORYGON, HITMONCHAN, SCYTHER, 0 ; Scyther is Kage-Maru. ; Silph Gauntlet 7F (Chief's Office) ; db 70, ANIMON, ANNIHILAPE, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0 ; not 100% sure what to do with this guy... JessieJamesData: - db 14, MEOWTH, EKANS, KOFFING, 0 ; Mt. Moon + db 15, MEOWTH, EKANS, KOFFING, 0 ; Mt. Moon db 25, MEOWTH, EKANS, LICKITUNG, KOFFING, 0 ; Rocket Hideout - db 27, MEOWTH, LICKITUNG, ARBOK, VICTREEBEL, WEEZING, 0 ; Pokemon Tower - db 37, MEOWTH, LICKITUNG, ARBOK, VICTREEBEL, WEEZING, GYARADOS, 0 ; Silph Co. - db $FF, 80, MEOWTH, 72, LICKILICKY, 72, ARBOK, 71, VICTREEBEL, 74, WEEZING, 76, GYARADOS, 0 ; Citrine Rocket House + db 28, MEOWTH, LICKITUNG, ARBOK, VICTREEBEL, WEEZING, 0 ; Pokemon Tower + db 37, MEOWTH, LICKILICKY, ARBOK, VICTREEBEL, WEEZING, GYARADOS, 0 ; Silph Co. + db $FF, 80, MEOWTH, 73, LICKILICKY, 75, ARBOK, 73, VICTREEBEL, 75, WEEZING, 71, GYARADOS, 0 ; Citrine Rocket House INCLUDE "data/trainers/scaled_parties.asm" INCLUDE "data/trainers/rival_parties.asm" diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index a3306c21..e7f9f88f 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -82,9 +82,9 @@ GiovanniData: ; is not scaled as he is always fought last ; Rocket Hideout B4F db $FF, 30, BEEDRILL, 32, RHYHORN, 32, KANGASKHAN, 34, PERSIAN, 0 ; Silph Co. 11F - did you know this team was weaker than the rival in vanilla level-wise? - db $FF, 40, BEEDRILL, 42, RHYDON, 42, KANGASKHAN, 43, NIDOKING, 43, NIDOQUEEN, 45, PERSIAN, 0 + db $FF, 40, BEEDRILL, 40, RHYDON, 40, KANGASKHAN, 41, NIDOKING, 41, NIDOQUEEN, 43, PERSIAN, 0 ; Viridian Gym - db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, GUARDIA, 48, NIDOKING, 50, RHYPERIOR, 0 + db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, GUARDIA, 48, NIDOQUEEN, 48, NIDOKING, 50, RHYPERIOR, 0 LoreleiData: db $FF, 53, DEWGONG, 52, CLOYSTER, 52, NINETALES_A, 54, JYNX, 54, GLACEON, 56, LAPRAS, 0 @@ -102,35 +102,35 @@ AgathaData: db $FF, 72, ANNIHILAPE, 71, CROBAT, 71, MAROWAK_A, 73, ARBOK, 73, UMBREON, 75, GENGAR, 0 LanceData: - db $FF, 59, CRYITHAN, 58, GYARADOS, 58, EXEGGUTOR_A, 60, KINGDRA, 60, AERODACTYL, 62, DRAGONITE, 0 + db $FF, 59, CROCKY, 58, GYARADOS, 58, EXEGGUTOR_A, 60, CRYITHAN, 60, KINGDRA, 62, DRAGONITE, 0 ; post-game rematch team (currently unused) - db $FF, 74, CRYITHAN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, KINGDRA, 75, AERODACTYL, 77, DRAGONITE, 0 + db $FF, 74, CROCKY, 73, GYARADOS, 73, EXEGGUTOR_A, 75, CRYITHAN, 75, KINGDRA, 77, DRAGONITE, 0 YujirouData: ; was unused juggler - db $FF, 4, KONYA, 5, RATTATA, 8, LICKITUNG, 0 ; 0 - db $FF, 19, MEOWTH, 18, RATICATE, 19, FARFETCHD, 21, LICKITUNG, 0 ; 1 - db $FF, 22, MEOWTH, 21, RATICATE, 21, FARFETCHD, 23, JIGGLYPUFF, 24, LICKITUNG, 0 ; 2 - db $FF, 29, PERSIAN, 28, RATICATE, 28, FARFETCHD, 29, JIGGLYPUFF, 31, LICKITUNG, 0 ; 3 - db $FF, 38, PERSIAN, 37, RATICATE, 37, MADAAMU, 38, CHANSEY, 40, LICKITUNG, 0, ; 4 - db $FF, 41, PERSIAN, 40, TAUROS, 40, MADAAMU, 41, CHANSEY, 43, LICKITUNG, 0 ; 5 - db $FF, 45, PERSIAN, 44, TAUROS, 44, MADAAMU, 45, BLISSEY, 47, LICKILICKY, 0 ; 6 - db $FF, 47, PERSIAN, 46, TAUROS, 46, MADAAMU, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0 ; 7 - db $FF, 47, PERSIAN, 46, TAUROS, 46, MADAAMU, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0 ; 8 (clone for scaling reasons) + db $FF, 4, KONYA, 5, RATTATA, 8, LICKITUNG, 0 ; 0 + db $FF, 10, KONYA, 11, RATTATA, 13, LICKITUNG, 0 ; 1 + db $FF, 19, MEOWTH, 18, RATICATE, 19, FARFETCHD, 21, LICKITUNG, 0 ; 2 + db $FF, 22, MEOWTH, 21, RATICATE, 21, FARFETCHD, 23, JIGGLYPUFF, 25, LICKITUNG, 0 ; 3 + db $FF, 29, PERSIAN, 28, RATICATE, 28, MADAAMU, 29, JIGGLYPUFF, 31, LICKITUNG, 0 ; 4 + db $FF, 38, PERSIAN, 37, RATICATE, 37, MADAAMU, 38, CHANSEY, 40, LICKITUNG, 0, ; 5 + db $FF, 41, PERSIAN, 40, TAUROS, 40, MADAAMU, 41, CHANSEY, 43, LICKILICKY, 0 ; 6 + db $FF, 45, PERSIAN, 44, TAUROS, 44, MADAAMU, 45, CHANSEY, 47, LICKILICKY, 0 ; 7 + db $FF, 47, PERSIAN, 46, TAUROS, 46, MADAAMU, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0 ; 8 ; post-game rematch team db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0 BlackbeltData: ; Koichi parties - db 12, 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 - 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 12, 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 + 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, 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, 67, MACHAMP, 67, TAUROS_P, 67, ANNIHILAPE, 70, HITMONLEE, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame + db $FF, 67, MACHAMP, 67, TAUROS_P, 67, ANNIHILAPE, 70, HITMONLEE, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame ; Fighting Dojo Trainers db 31, CHEEP, CHEEP, JABETTA, 0 db 32, MACHOKE, MACHAMP, 0 diff --git a/maps/SilphGauntlet5F.blk b/maps/SilphGauntlet5F.blk index 33bae9ff..1643d814 100644 --- a/maps/SilphGauntlet5F.blk +++ b/maps/SilphGauntlet5F.blk @@ -1 +1,2 @@ -'''&&&'&*g),,.7*,.~7<=====>\R7@AC?AABZ[7@ABDGEFZ[7DGFZ[7e~027'''''&&&&& \ No newline at end of file +'''''&&&&&*)g.<==>*''&&DEEF*,75)5*77e;+*)7'&)+.+\QR99.+ + \ No newline at end of file diff --git a/scripts/SaffronCity.asm b/scripts/SaffronCity.asm index 93d46e7c..92eeff5d 100644 --- a/scripts/SaffronCity.asm +++ b/scripts/SaffronCity.asm @@ -13,12 +13,11 @@ SaffronCity_TextPointers: dw SaffronCityText9 dw SaffronCityText10 dw SaffronCityText11 - dw SaffronCityText12 dw SaffronCityText13 dw SaffronCityText14 dw SaffronCityText15 - dw SaffronCityText16 dw SaffronCityUpGrade + dw SaffronCityText16 dw SaffronCityText17 dw SaffronCityText18 dw MartSignText @@ -73,11 +72,6 @@ SaffronCityText11: text_far _SaffronCityText11 text_end -SaffronCityText12: - text_far _SaffronCityText12 - sound_cry_pidgeot - text_end - SaffronCityText13: text_far _SaffronCityText13 text_end diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index cac6e2e1..2e27ea63 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -95,7 +95,7 @@ SilphCo11ScriptOmegaBattle: call DisplayTextID ld a, OMEGA ld [wCurOpponent], a - ld a, 45 + ld a, 40 ld [wCurEnemyLVL], a ld a, 0 ld [wIsTrainerBattle], a @@ -180,9 +180,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_8F_1 - ;db HS_SILPH_CO_8F_2 - ;db HS_SILPH_CO_8F_3 db HS_SILPH_CO_10F_1 db HS_SILPH_CO_10F_2 db HS_SILPH_CO_11F_1 diff --git a/scripts/SilphGauntlet5F.asm b/scripts/SilphGauntlet5F.asm index d3816751..a0102ac6 100644 --- a/scripts/SilphGauntlet5F.asm +++ b/scripts/SilphGauntlet5F.asm @@ -26,17 +26,17 @@ SilphGauntlet5FTrainerHeaders: SilphGauntlet5FTrainerHeader0: trainer EVENT_BEAT_GAUNTLET_JUGGLER, 3, SilphGauntlet5FBattleText1, SilphGauntlet5FEndBattleText1, SilphGauntlet5FAfterBattleText1 SilphGauntlet5FTrainerHeader1: - trainer EVENT_BEAT_GAUNTLET_BIKER, 2, SilphGauntlet5FBattleText2, SilphGauntlet5FEndBattleText2, SilphGauntlet5FAfterBattleText2 + trainer EVENT_BEAT_GAUNTLET_BIKER, 1, SilphGauntlet5FBattleText2, SilphGauntlet5FEndBattleText2, SilphGauntlet5FAfterBattleText2 SilphGauntlet5FTrainerHeader2: - trainer EVENT_BEAT_GAUNTLET_CUE_BALL, 1, SilphGauntlet5FBattleText3, SilphGauntlet5FEndBattleText3, SilphGauntlet5FAfterBattleText3 + trainer EVENT_BEAT_GAUNTLET_CUE_BALL, 2, SilphGauntlet5FBattleText3, SilphGauntlet5FEndBattleText3, SilphGauntlet5FAfterBattleText3 SilphGauntlet5FTrainerHeader3: - trainer EVENT_BEAT_GAUNTLET_SWIMMER, 3, SilphGauntlet5FBattleText4, SilphGauntlet5FEndBattleText4, SilphGauntlet5FAfterBattleText4 + trainer EVENT_BEAT_GAUNTLET_SWIMMER, 2, SilphGauntlet5FBattleText4, SilphGauntlet5FEndBattleText4, SilphGauntlet5FAfterBattleText4 SilphGauntlet5FTrainerHeader4: - trainer EVENT_BEAT_GAUNTLET_TAMER, 3, SilphGauntlet5FBattleText5, SilphGauntlet5FEndBattleText5, SilphGauntlet5FAfterBattleText5 + trainer EVENT_BEAT_GAUNTLET_TAMER, 2, SilphGauntlet5FBattleText5, SilphGauntlet5FEndBattleText5, SilphGauntlet5FAfterBattleText5 SilphGauntlet5FTrainerHeader5: - trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_F, 3, SilphGauntlet5FBattleText6, SilphGauntlet5FEndBattleText6, SilphGauntlet5FAfterBattleText6 + trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_F, 2, SilphGauntlet5FBattleText6, SilphGauntlet5FEndBattleText6, SilphGauntlet5FAfterBattleText6 SilphGauntlet5FTrainerHeader6: - trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_M, 3, SilphGauntlet5FBattleText7, SilphGauntlet5FEndBattleText7, SilphGauntlet5FAfterBattleText7 + trainer EVENT_BEAT_GAUNTLET_COOLTRAINER_M, 2, SilphGauntlet5FBattleText7, SilphGauntlet5FEndBattleText7, SilphGauntlet5FAfterBattleText7 db -1 ; end SilphGauntlet5FText1: diff --git a/text/SaffronCity.asm b/text/SaffronCity.asm index 8cfe0cd2..518e4959 100644 --- a/text/SaffronCity.asm +++ b/text/SaffronCity.asm @@ -64,10 +64,6 @@ _SaffronCityText11:: cont "media action." done -_SaffronCityText12:: - text "PIDGEOT: Bi bibii!@" - text_end - _SaffronCityText13:: text "I saw ROCKET" line "BOSS escaping"