mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-11-11 07:44:47 +13:00
16e3c69ee8
This update does a good few things. Giovanni now uses his unused encounter theme in all pre-fights, which is followed by the regular evil trainer theme when you're about to fight him. This feels very correct. His team has also been minorly altered. I backported LGPE's pre-fight monologue for Giovanni in Rocket Hideout B4F. Adapted for RB's story, of course, no Cubones here. The original text is very awkward and abrupt, and it also makes the encounter theme feel much more effective in delivery. I think a lot of people can appreciate this. I also backported Jessie and James for Rocket Hideout B4F while I was at it. I had to change their event script quite a bit for it to fit, and their walking seems...awkward. Regardless, it's functional. The rest will be done with time. To make future dev door testing easier, I'm keeping all warps I've previously used in comments.
135 lines
8.3 KiB
NASM
135 lines
8.3 KiB
NASM
; gyms except giovanni begin here
|
|
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, 22, OMANYTE, 22, KABUTO, 23, DECILLA, 25, ONIX, 0 ; 2
|
|
db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3
|
|
db $FF, 39, GOLEM, 38, OMANYTE, 38, KABUTO, 39, NIDOREIGN, 41, GYAOON, 0 ; 4
|
|
db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, NIDOREIGN, 43, GYAOON, 0 ; 5
|
|
db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, NIDOREIGN, 47, GYAOON, 0 ; 6
|
|
db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, NIDOREIGN, 48, KLEAVOR, 50, GYAOON, 0 ; 7 (unused)
|
|
db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, ARCANINE_H, 67, KLEAVOR, 70, GYAOON, 0 ; 8 (postgame)
|
|
|
|
MistyData:
|
|
db $FF, 10, STARYU, 11, GYOPIN, 13, WEIRDUCK, 0 ; 0 badges
|
|
db $FF, 19, HORSEA, 18, GOLDEEN, 19, WEIRDUCK, 21, STARMIE, 0 ; 1
|
|
db $FF, 22, HORSEA, 22, CHEEP, 22, GOLDEEN, 23, WEIRDUCK, 25, STARMIE, 0 ; 2
|
|
db $FF, 29, HORSEA, 28, JABETTA, 28, GOLDEEN, 29, WEIRDUCK, 31, STARMIE, 0 ; 3
|
|
db $FF, 39, SEADRA, 38, JABETTA, 38, SEAKING, 39, GOLDUCK, 41, 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, VAPOREON, 67, TAUROS_PA, 66, TOTARTLE, 67, GOLDUCK, 70, GYARADOS, 0 ; 8 (postgame)
|
|
|
|
LtSurgeData:
|
|
db $FF, 10, VOLTORB, 11, PIKACHU, 13, MAGNETITE, 0 ; 0 badges
|
|
db $FF, 19, VOLTORB, 18, PIKACHU, 19, MAGNETITE, 21, ELECTABUZZ, 0 ; 1
|
|
db $FF, 22, VOLTORB, 22, GAOTORA, 22, MAGNETITE, 23, ELECTABUZZ, 25, GOROCHU, 0 ; 2
|
|
db $FF, 28, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, GOROCHU, 0 ; 3
|
|
db $FF, 39, ELECTRODE, 38, GOROTORA, 38, MAGNETON, 39, ELECTABUZZ, 41, 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
|
|
db $FF, 47, ELECTRODE, 46, GOROTORA, 46, MAGNEZONE, 48, ELECTIVIRE, 48, JOLTEON, 50, GOROCHU, 0 ; 7 (unused)
|
|
db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, JOLTEON, 66, GOLEM_A, 67, GOROCHU, 70, ZAPDOS, 0 ; 8 (postgame)
|
|
|
|
ErikaData:
|
|
db $FF, 10, BELLSPROUT, 11, MONJA, 13, GLOOM, 0 ; 0 badges
|
|
db $FF, 19, BELLSPROUT, 18, TOEDSCOOL, 19, TANGELA, 21, GLOOM, 0 ; 1
|
|
db $FF, 22, BELLSPROUT, 22, PARASECT, 22, TOEDSCOOL, 23, TANGELA, 25, GLOOM, 0 ; 2
|
|
db $FF, 28, WEEPINBELL, 28, PARASECT, 28, TOEDSCOOL, 29, TANGELA, 31, BELLOSSOM, 0 ; 3
|
|
db $FF, 38, VICTREEBEL, 38, PARASECT, 39, TOEDSCRUEL, 39, BELLOSSOM, 41, TANGROWTH, 0 ; 4
|
|
db $FF, 40, VICTREEBEL, 40, PARASECT, 41, TOEDSCRUEL, 41, BELLOSSOM, 43, TANGROWTH, 0 ; 5
|
|
db $FF, 44, VICTREEBEL, 44, PARASECT, 45, TOEDSCRUEL, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6
|
|
db $FF, 46, VICTREEBEL, 46, PARASECT, 47, TOEDSCRUEL, 48, BELLOSSOM, 48, EXEGGUTOR, 50, TANGROWTH, 0 ; 7 (unused)
|
|
db $FF, 66, TOEDSCRUEL, 67, BELLOSSOM, 67, ELECTRODE_H, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0 ; 8 (postgame)
|
|
|
|
KogaData:
|
|
db $FF, 10, VENONAT, 11, KOFFING, 13, NIDORINO, 0 ; 0 badges
|
|
db $FF, 19, VENONAT, 18, GRIMER, 19, KOFFING, 21, NIDORINO, 0 ; 1
|
|
db $FF, 22, GOLBAT, 22, NIDORINO, 22, GRIMER, 23, KOFFING, 25, VENOMOTH, 0 ; 2
|
|
db $FF, 28, GOLBAT, 28, NIDORINO, 28, GRIMER, 29, KOFFING, 31, VENOMOTH, 0 ; 3
|
|
db $FF, 38, TENTACRUEL, 39, VENOMOTH, 38, MUK, 39, WEEZING, 41, CROBAT, 0 ; 4
|
|
db $FF, 40, TENTACRUEL, 41, VENOMOTH, 40, MUK, 41, WEEZING, 43, CROBAT, 0 ; 5
|
|
db $FF, 44, TENTACRUEL, 45, VENOMOTH, 44, MUK, 45, WEEZING, 47, CROBAT, 0 ; 6
|
|
db $FF, 46, TENTACRUEL, 46, NIDOKING, 47, VENOMOTH, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7
|
|
db $FF, 66, TSUBOMITTO, 67, NIDOKING, 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?)
|
|
db $FF, 19, PONYTA, 18, VULPIX, 19, GROWLITHE, 21, MAGMAR, 0 ; 1
|
|
db $FF, 22, PONYTA, 22, VULPIX, 22, GROWLITHE, 23, CHARMELEON, 25, MAGMAR, 0 ; 2
|
|
db $FF, 28, PONYTA, 28, VULPIX, 28, GROWLITHE, 29, FLAREON, 31, MAGMAR, 0 ; 3
|
|
db $FF, 38, PONYTA, 39, NINETALES, 38, FLAREON, 39, ARCANINE, 41, MAGMORTAR, 0 ; 4
|
|
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, NINETALES, 67, TAUROS_PB, 67, ARCANINE, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0 ; 8 (postgame)
|
|
|
|
SabrinaData:
|
|
db $FF, 10, DROWZEE, 11, SLOWPOKE, 13, KADABRA, 0 ; 0 badges
|
|
db $FF, 19, DROWZEE, 18, SLOWPOKE, 19, KADABRA, 21, MR_MIME, 0 ; 1
|
|
db $FF, 22, DROWZEE, 22, SLOWPOKE, 22, EXEGGCUTE, 23, KADABRA, 25, MR_MIME, 0 ; 2
|
|
db $FF, 28, MR_MIME, 28, SLOWPOKE, 28, EXEGGCUTE, 29, HYPNO, 31, ALAKAZAM, 0 ; 3
|
|
db $FF, 38, ESPEON, 39, MR_MIME, 38, SLOWKING, 39, HYPNO, 41, ALAKAZAM, 0 ; 4
|
|
db $FF, 40, ESPEON, 41, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0 ; 5
|
|
db $FF, 44, ESPEON, 45, MR_RIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6
|
|
db $FF, 46, ESPEON, 47, 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)
|
|
|
|
GiovanniData: ; is not scaled as he is always fought last
|
|
; Rocket Hideout B4F
|
|
db $FF, 29, BEEDRILL, 32, RHYHORN, 31, KANGASKHAN, 37, PERSIAN, 0
|
|
; Silph Co. 11F
|
|
db $FF, 37, KANGASKHAN, 36, NIDOKING, 37, NIDOQUEEN, 40, PERSIAN, 42, RHYDON, 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, BUU, 56, LAPRAS, 0
|
|
; post-game rematch team (currently unused)
|
|
db $FF, 74, DEWGONG, 73, CLOYSTER, 74, NINETALES_A, 75, GLACEON, 75, LAPRAS, 76, ARTICUNO, 0
|
|
|
|
BrunoData:
|
|
db $FF, 54, HITMONTOP, 55, STEELIX, 55, POLIWRATH, 56, SIRFETCHD, 56, PURAKKUSU, 58, MACHAMP, 0
|
|
; post-game rematch team (currently unused)
|
|
db $FF, 74, POLIWRATH, 75, STEELIX, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, ZAPDOS_G, 0
|
|
|
|
AgathaData:
|
|
db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, ANNIHILAPE, 58, MAROWAK_A, 58, UMBREON, 60, GENGAR, 0
|
|
; post-game rematch team (currently unused)
|
|
db $FF, 77, ANNIHILAPE, 76, UMBREON, 76, MAROWAK_A, 78, CROBAT, 78, GENGAR, 80, MOLTRES_G, 0
|
|
|
|
LanceData:
|
|
db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, EXEGGUTOR_A, 59, CRYITHAN, 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
|
|
|
|
YujirouData: ; was unused juggler
|
|
db $FF, 7, KONYA, 7, RATTATA, 10, LICKITUNG, 0
|
|
; post-game rematch team (currently unused)
|
|
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
|
|
; Fighting Dojo Trainers
|
|
db 31, CHEEP, CHEEP, JABETTA, 0
|
|
db 32, MACHOKE, MACHAMP, 0
|
|
db 36, SIRFETCHD, 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, CACTUS, DUGTRIO, STEELIX, 0
|
|
; Victory Road 2F
|
|
db 43, MACHOKE, MACHOP, MACHOKE, 0
|