mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-21 22:52:15 +13:00
A few bug fixes
- Fixed a bug where attempting to Fly on Celeste Hill caused a huge memory corruption effect. Oops. - Fixed text issues on Route 1 and Museum 2F - Tidied up trainer parties a little more
This commit is contained in:
Martha Schilling
parent
85e1701879
commit
0852d5f725
15 changed files with 106 additions and 86 deletions
|
|
@ -1,14 +1,16 @@
|
|||
; gyms except giovanni begin here
|
||||
; Following a philosophy here, where every gym leader should keep their most iconic Pokemon somewhere on their team:
|
||||
; This goes for Brock's Steelix, Misty's Starmie, Surge's Gorochu, Erika's Bellossom, Koga's Crobat, Sabrina's Alakazam, Blaine's Arcanine, and Giovanni's Rhyperior.
|
||||
; In addition, for the rematches, all the leaders should have a regional variant (see the LGPE E4 rematches), plus a starter where applicable.
|
||||
BrockData:
|
||||
db $FF, 10, GEODUDE, 11, DECILLA, 13, 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, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3
|
||||
db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, ONIX, 40, GYAOON, 0, ; 4
|
||||
db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, STEELIX, 43, GYAOON, 0 ; 5
|
||||
db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, STEELIX, 47, GYAOON, 0 ; 6
|
||||
db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, KLEAVOR, 48, STEELIX, 50, GYAOON, 0 ; 7 (unused)
|
||||
db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, ARCANINE_H, 67, STEELIX, 70, GYAOON, 0 ; 8 (postgame)
|
||||
db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, DECILLA, 40, STEELIX, 0, ; 4
|
||||
db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, GYAOON, 43, STEELIX, 0 ; 5
|
||||
db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, GYAOON, 47, STEELIX, 0 ; 6
|
||||
db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, GYAOON, 48, KLEAVOR, 50, STEELIX, 0 ; 7 (unused)
|
||||
db $FF, 67, GOLEM, 66, GYAOON, 66, ARCANINE_H, 67, OMASTAR, 67, KABUTOPS, 70, STEELIX, 0 ; 8 (postgame)
|
||||
|
||||
MistyData:
|
||||
db $FF, 10, STARYU, 11, GYOPIN, 13, WEIRDUCK, 0 ; 0 badges
|
||||
|
|
@ -18,8 +20,8 @@ MistyData:
|
|||
db $FF, 38, SEADRA, 37, JABETTA, 37, SEAKING, 38, GOLDUCK, 40, STARMIE, 0 ; 4
|
||||
db $FF, 41, SEADRA, 40, JABETTA, 40, SEAKING, 41, GOLDUCK, 43, STARMIE, 0 ; 5
|
||||
db $FF, 45, KINGDRA, 44, JABETTA, 44, SEAKING, 45, GOLDUCK, 47, STARMIE, 0 ; 6
|
||||
db $FF, 47, KINGDRA, 46, JABETTA, 46, SEAKING, 48, GOLDUCK, 48, JAGG, 50, STARMIE, 0 ; 7 (unused)
|
||||
db $FF, 66, STARMIE, 67, GOLDUCK, 67, TAUROS_PA, 66, TOTARTLE, 67, VAPOREON, 70, GYARADOS, 0 ; 8 (postgame)
|
||||
db $FF, 47, KINGDRA, 46, JABETTA, 46, SEAKING, 48, GOLDUCK, 48, VAPOREON, 50, STARMIE, 0 ; 7 (unused)
|
||||
db $FF, 67, KINGDRA, 67, GOLDUCK, 66, TAUROS_PA, 66, VAPOREON, 67, TOTARTLE, 70, STARMIE, 0 ; 8 (postgame)
|
||||
|
||||
LtSurgeData:
|
||||
db $FF, 10, VOLTORB, 11, PIKACHU, 13, GAOTORA, 0 ; 0 badges
|
||||
|
|
@ -30,29 +32,29 @@ LtSurgeData:
|
|||
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
|
||||
db $FF, 47, ELECTRODE, 46, GOROTORA, 46, MAGNEZONE, 48, ELECTIVIRE, 48, JOLTEON, 50, GOROCHU, 0 ; 7 (unused)
|
||||
db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, GOLEM_A, 66, JOLTEON, 67, GOROCHU, 70, ZAPDOS, 0 ; 8 (postgame)
|
||||
db $FF, 67, GOROTORA, 67, MAGNEZONE, 66, GOLEM_A, 67, ELECTIVIRE, 66, JOLTEON, 70, GOROCHU, 0 ; 8 (postgame)
|
||||
|
||||
ErikaData:
|
||||
db $FF, 10, BELLSPROUT, 11, MONJA, 13, GLOOM, 0 ; 0 badges (unused)
|
||||
db $FF, 19, BELLSPROUT, 18, TOEDSCOOL, 19, MONJA, 21, GLOOM, 0 ; 1
|
||||
db $FF, 10, BELLSPROUT, 11, ODDISH, 13, TANGELA, 0 ; 0 badges (unused)
|
||||
db $FF, 19, BELLSPROUT, 18, TOEDSCOOL, 19, ODDISH, 21, TANGELA, 0 ; 1
|
||||
db $FF, 22, BELLSPROUT, 21, PARAS, 21, TOEDSCOOL, 23, TANGELA, 25, GLOOM, 0 ; 2
|
||||
db $FF, 29, WEEPINBELL, 28, PARASECT, 28, TOEDSCOOL, 29, TANGELA, 31, BELLOSSOM, 0 ; 3
|
||||
db $FF, 38, VICTREEBEL, 37, PARASECT, 37, CACTUS, 38, BELLOSSOM, 40, TANGROWTH, 0 ; 4
|
||||
db $FF, 38, VICTREEBEL, 37, PARASECT, 37, CACTUS, 38, TANGELA, 40, BELLOSSOM, 0 ; 4
|
||||
db $FF, 41, VICTREEBEL, 40, PARASECT, 40, CACTUS, 41, BELLOSSOM, 43, TANGROWTH, 0 ; 5
|
||||
db $FF, 45, VICTREEBEL, 44, PARASECT, 45, CACTUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6
|
||||
db $FF, 47, VICTREEBEL, 46, PARASECT, 46, CACTUS, 48, BELLOSSOM, 48, LEAFEON, 50, TANGROWTH, 0 ; 7 (unused)
|
||||
db $FF, 66, TOEDSCRUEL, 67, BELLOSSOM, 67, ELECTRODE_H, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0 ; 8 (postgame)
|
||||
db $FF, 67, BELLOSSOM, 67, TOEDSCRUEL, 66, ELECTRODE_H, 66, LEAFEON, 67, VENUSAUR, 70, TANGROWTH, 0 ; 8 (postgame)
|
||||
|
||||
KogaData:
|
||||
db $FF, 10, VENONAT, 11, KOFFING, 13, NIDORINO, 0 ; 0 badges (unused)
|
||||
db $FF, 19, VENONAT, 18, GRIMER, 19, KOFFING, 21, NIDORINO, 0 ; 1
|
||||
db $FF, 22, VENONAT, 21, NIDORINO, 21, GRIMER, 23, KOFFING, 25, GOLBAT, 0 ; 2
|
||||
db $FF, 29, VENOMOTH, 28, NIDORINO, 28, GRIMER, 29, KOFFING, 31, GOLBAT, 0 ; 3
|
||||
db $FF, 38, TENTACRUEL, 37, VENOMOTH, 37, MUK, 38, WEEZING, 40, CROBAT, 0 ; 4
|
||||
db $FF, 41, TENTACRUEL, 40, VENOMOTH, 40, MUK, 41, WEEZING, 43, CROBAT, 0 ; 5
|
||||
db $FF, 45, TENTACRUEL, 44, VENOMOTH, 44, MUK, 45, WEEZING, 47, CROBAT, 0 ; 6
|
||||
db $FF, 47, TENTACRUEL, 46, NIDOKING, 46, VENOMOTH, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 (unused)
|
||||
db $FF, 66, TSUBOMITTO, 67, NIDOKING, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
|
||||
db $FF, 10, VENONAT, 11, ZUBAT, 13, KOFFING, 0 ; 0 badges (unused)
|
||||
db $FF, 19, VENONAT, 18, GRIMER, 19, KOFFING, 21, GOLBAT, 0 ; 1
|
||||
db $FF, 22, VENONAT, 21, TENTACOOL, 21, GRIMER, 23, KOFFING, 25, GOLBAT, 0 ; 2
|
||||
db $FF, 29, VENOMOTH, 28, TENTACOOL, 28, GRIMER, 29, KOFFING, 31, GOLBAT, 0 ; 3
|
||||
db $FF, 38, VENOMOTH, 37, TENTACRUEL, 37, MUK, 38, WEEZING, 40, CROBAT, 0 ; 4
|
||||
db $FF, 41, VENOMOTH, 40, TENTACRUEL, 40, MUK, 41, WEEZING, 43, CROBAT, 0 ; 5
|
||||
db $FF, 45, VENOMOTH, 44, TENTACRUEL, 44, MUK, 45, WEEZING, 47, CROBAT, 0 ; 6
|
||||
db $FF, 47, VENOMOTH, 46, NIDOKING, 46, TENTACRUEL, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 (unused)
|
||||
db $FF, 67, VENOMOTH, 66, TSUBOMITTO, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
|
||||
|
||||
BlaineData:
|
||||
db $FF, 10, VULPIX, 11, GROWLITHE, 13, PONYTA, 0 ; 0 badges (unused)
|
||||
|
|
@ -63,64 +65,64 @@ BlaineData:
|
|||
db $FF, 41, RAPIDASH, 40, NINETALES, 40, FLAREON, 41, ARCANINE, 43, MAGMORTAR, 0 ; 5
|
||||
db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0 ; 6
|
||||
db $FF, 47, RAPIDASH, 46, NINETALES, 46, FLAREON, 48, CHARIZARD, 48, ARCANINE, 50, MAGMORTAR, 0 ; 7 (unused)
|
||||
db $FF, 66, ARCANINE, 67, TAUROS_PB, 67, FLAREON, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0 ; 8 (postgame)
|
||||
db $FF, 67, RAPIDASH, 67, ARCANINE, 66, TAUROS_PB, 66, FLAREON, 67, CHARIZARD, 70, MAGMORTAR, 0 ; 8 (postgame)
|
||||
|
||||
SabrinaData:
|
||||
db $FF, 10, DROWZEE, 11, SLOWPOKE, 13, KADABRA, 0 ; 0 badges (unused)
|
||||
db $FF, 19, DROWZEE, 18, SLOWPOKE, 19, KADABRA, 21, MR_MIME, 0 ; 1
|
||||
db $FF, 22, DROWZEE, 21, SLOWPOKE, 21, EXEGGCUTE, 23, KADABRA, 25, MR_MIME, 0 ; 2
|
||||
db $FF, 29, MR_MIME, 28, SLOWPOKE, 28, EXEGGCUTE, 29, HYPNO, 31, ALAKAZAM, 0 ; 3
|
||||
db $FF, 10, SLOWPOKE, 11, DROWZEE, 13, KADABRA, 0 ; 0 badges (unused)
|
||||
db $FF, 19, SLOWPOKE, 18, DROWZEE, 19, KADABRA, 21, MR_MIME, 0 ; 1
|
||||
db $FF, 22, SLOWPOKE, 21, DROWZEE, 21, EXEGGCUTE, 23, KADABRA, 25, MR_MIME, 0 ; 2
|
||||
db $FF, 29, SLOWPOKE, 28, MR_MIME, 28, EXEGGCUTE, 29, HYPNO, 31, ALAKAZAM, 0 ; 3
|
||||
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_RIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6
|
||||
db $FF, 47, ESPEON, 46, MR_RIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused)
|
||||
db $FF, 66, ESPEON, 67, SLOWKING, 67, HYPNO, 66, RAPIDASH_G, 67, ALAKAZAM, 70, ARTICUNO_G, 0 ; 8 (postgame)
|
||||
db $FF, 67, EXEGGUTOR, 67, SLOWKING, 66, RAPIDASH_G, 67, HYPNO, 66, ESPEON, 70, ALAKAZAM, 0 ; 8 (postgame)
|
||||
|
||||
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 ; if persian slash is desirable, make it L47.
|
||||
db $FF, 40, BEEDRILL, 42, RHYDON, 42, KANGASKHAN, 43, NIDOKING, 43, NIDOQUEEN, 45, PERSIAN, 0
|
||||
; Viridian Gym
|
||||
db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, GUARDIA, 48, NIDOKING, 50, RHYPERIOR, 0
|
||||
|
||||
LoreleiData:
|
||||
db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, NINETALES_A, 55, JYNX, 56, LAPRAS, 0
|
||||
db $FF, 53, DEWGONG, 52, CLOYSTER, 52, NINETALES_A, 54, JYNX, 54, GLACEON, 56, LAPRAS, 0
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 74, JYNX, 73, DEWGONG, 73, CLOYSTER, 74, NINETALES_A, 75, GLACEON, 75, LAPRAS, 0
|
||||
db $FF, 68, JYNX, 67, CLOYSTER, 67, NINETALES_A, 69, MR_RIME, 69, GLACEON, 71, LAPRAS, 0
|
||||
|
||||
BrunoData:
|
||||
db $FF, 54, HITMONTOP, 55, STEELIX, 55, POLIWRATH, 56, SIRFETCHD, 56, PURAKKUSU, 58, MACHAMP, 0
|
||||
db $FF, 55, HITMONCHAN, 54, STEELIX, 54, SIRFETCHD, 56, HITMONLEE, 56, PURAKKUSU, 58, MACHAMP, 0
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 74, POLIWRATH, 74, HITMONTOP, 75, STEELIX, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, 0
|
||||
db $FF, 70, HITMONTOP, 69, STEELIX, 69, SIRFETCHD, 71, POLIWRATH, 71, PURAKKUSU, 73, MACHAMP, 0
|
||||
|
||||
AgathaData:
|
||||
db $FF, 57, ARBOK, 56, ANNIHILAPE, 56, CROBAT, 58, MAROWAK_A, 58, UMBREON, 60, GENGAR, 0
|
||||
db $FF, 57, ANNIHILAPE, 56, CROBAT, 56, MAROWAK_A, 58, ARBOK, 58, UMBREON, 60, GENGAR, 0
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 77, ARBOK, 77, ANNIHILAPE, 76, CROBAT, 76, MAROWAK_A, 78, UMBREON, 78, GENGAR, 80, 0
|
||||
db $FF, 72, ANNIHILAPE, 71, CROBAT, 71, MAROWAK_A, 73, ARBOK, 73, UMBREON, 75, GENGAR, 0
|
||||
|
||||
LanceData:
|
||||
db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, EXEGGUTOR_A, 59, CRYITHAN, 62, DRAGONITE, 0
|
||||
db $FF, 59, CRYITHAN, 58, GYARADOS, 58, EXEGGUTOR_A, 60, KINGDRA, 60, AERODACTYL, 62, DRAGONITE, 0
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 78, CROCKY, 77, KINGDRA, 77, EXEGGUTOR_A, 79, AERODACTYL, 79, CRYITHAN, 82, DRAGONITE, 0
|
||||
db $FF, 74, CRYITHAN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, KINGDRA, 75, AERODACTYL, 77, DRAGONITE, 0
|
||||
|
||||
YujirouData: ; was unused juggler
|
||||
db $FF, 4, KONYA, 5, RATTATA, 9, LICKITUNG, 0
|
||||
; post-game rematch team (currently unused)
|
||||
; post-game rematch team
|
||||
db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
|
||||
|
||||
BlackbeltData:
|
||||
; Koichi parties - unused to make space for rival teams
|
||||
db 12, MACHOP, HITMONLEE, HITMONCHAN, 0 ; 0 badges
|
||||
db 20, MACHOP, MANKEY, HITMONLEE, HITMONCHAN, 0 ; 1
|
||||
db 24, MACHOKE, MANKEY, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 2
|
||||
db 30, MACHOKE, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 3
|
||||
db 40, MACHOKE, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 4
|
||||
db 42, MACHAMP, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 5
|
||||
db 46, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 6
|
||||
db 49, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 7
|
||||
db 53, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 8
|
||||
db 67, MACHAMP, ANNIHILAPE, TAUROS_P, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; Silph Gauntlet
|
||||
; Koichi parties
|
||||
db 12, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 0 badges (unused)
|
||||
db $FF, 17, MACHOP, 20, HITMONCHAN, 20, HITMONCHAN, 20, HITMONTOP, 0 ; 1
|
||||
db $FF, 20, MACHOP, 20, MANKEY, 24, HITMONCHAN, 24, HITMONCHAN, 24, HITMONTOP, 0 ; 2
|
||||
db $FF, 27, MACHOKE, 27, MANKEY, 30, HITMONCHAN, 30, HITMONCHAN, 30, HITMONTOP, 0 ; 3
|
||||
db $FF, 36, MACHOKE, 36, PRIMEAPE, 39, HITMONCHAN, 39, HITMONCHAN, 39, HITMONTOP, 0 ; 4
|
||||
db $FF, 39, MACHOKE, 39, PRIMEAPE, 42, HITMONCHAN, 42, HITMONCHAN, 42, HITMONTOP, 0 ; 5
|
||||
db $FF, 43, MACHAMP, 43, ANNIHILAPE, 46, HITMONCHAN, 46, HITMONCHAN, 46, HITMONTOP, 0 ; 6
|
||||
db $FF, 46, MACHAMP, 46, CARAPTHOR, 46, ANNIHILAPE, 49, HITMONCHAN, 49, HITMONCHAN, 49, HITMONTOP, 0 ; 7
|
||||
db $FF, 52, MACHAMP, 52, CARAPTHOR, 52, ANNIHILAPE, 55, HITMONCHAN, 55, HITMONCHAN, 55, HITMONTOP, 0 ; 8
|
||||
db $FF, 67, MACHAMP, 67, TAUROS_P, 67, ANNIHILAPE, 70, HITMONCHAN, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame
|
||||
; Fighting Dojo Trainers
|
||||
db 31, CHEEP, CHEEP, JABETTA, 0
|
||||
db 32, MACHOKE, MACHAMP, 0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue