thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-05 11:04:30 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update parties.asm

Browse source 
Adding a couple more Gauntlet parties, will properly refine soon
This commit is contained in:
Martha Schilling 2023-05-23 12:08:06 +01:00 committed by GitHub
parent 0c6903588f
commit 939800e5ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
data/trainers/parties.asm
View file

@ -410,8 +410,8 @@ BeautyData:
; Route 15 ; Route 15
db 29, PIDGEOTTO, WIGGLYTUFF, 0 db 29, PIDGEOTTO, WIGGLYTUFF, 0
db 29, BULBASAUR, IVYSAUR, 0 db 29, BULBASAUR, IVYSAUR, 0
; Unused ; Silph Gauntlet 3F (S.S Anne)
; db 33, WEEPINBELL, BELLSPROUT, WEEPINBELL, 0 ; db 64, STARMIE, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0
; Route 19 ; Route 19
db 27, POLIWAG, GOLDEEN, SEAKING, GOLDEEN, POLIWAG, 0 db 27, POLIWAG, GOLDEEN, SEAKING, GOLDEEN, POLIWAG, 0
db 30, GOLDEEN, SEAKING, 0 db 30, GOLDEEN, SEAKING, 0
@ -425,7 +425,7 @@ PsychicData:
db 34, MR_MIME, KADABRA, 0 db 34, MR_MIME, KADABRA, 0
db 33, SLOWPOKE, SLOWPOKE, SLOWBRO, 0 db 33, SLOWPOKE, SLOWPOKE, SLOWBRO, 0
db 38, SLOWBRO, 0 db 38, SLOWBRO, 0
; Silph Gauntlet ; Silph Gauntlet 4F (Lavender Tower)
db 65, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0 db 65, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0
RockerData: RockerData:
@ -444,8 +444,8 @@ JugglerData:
db 34, TENTACOOL, TENTACRUEL, 0 db 34, TENTACOOL, TENTACRUEL, 0
; Victory Road 2F ; Victory Road 2F
db 48, MR_MIME, 0 db 48, MR_MIME, 0
; Unused - this will be used in the Silph Gauntlet ; Silph Gauntlet 5F (Safari Zone)
db 65, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, GENGAR, SLOWKING, 0 db 66, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, GENGAR, SLOWKING, 0
; Fuchsia Gym ; Fuchsia Gym
db 38, UMBREON, 0 db 38, UMBREON, 0
; Fuchsia Gym ; Fuchsia Gym
@ -460,8 +460,8 @@ TamerData:
db 39, SANDSLASH, TRAMPEL, 0 db 39, SANDSLASH, TRAMPEL, 0
; Victory Road 2F ; Victory Road 2F
db 44, TAUROS, GOLDUCK, 0 db 44, TAUROS, GOLDUCK, 0
; Unused - this will be used in the Silph Gauntlet ; Silph Gauntlet 5F (Safari Zone)
db 66, RHYPERIOR, ARBOK, SANDSLASH, PRIMEAPE, TRAMPEL, TAUROS, 0 db 66, RHYPERIOR, ARBOK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0
BirdKeeperData: BirdKeeperData:
; Route 13 ; Route 13
@ -482,8 +482,8 @@ BirdKeeperData:
db 30, FEAROW, FEAROW, PIDGEOTTO, 0 db 30, FEAROW, FEAROW, PIDGEOTTO, 0
; Unused ; Unused
db 39, PIDGEOTTO, PIDGEOTTO, PIDGEY, PIDGEOTTO, 0 db 39, PIDGEOTTO, PIDGEOTTO, PIDGEY, PIDGEOTTO, 0
; Unused - this will be used in the Silph Gauntlet ; Silph Gauntlet 1F (Viridian Forest)
db 62, FEAROW, GOLDUCK, DODRIO, PORYGON2, MADAAMU, AERODACTYL, 0 db 62, FEAROW, GOLDUCK, DODRIO, SIRFETCHD, MADAAMU, AERODACTYL, 0
; Route 14 ; Route 14
db 28, PIDGEY, DODUO, PIDGEOTTO, 0 db 28, PIDGEY, DODUO, PIDGEOTTO, 0
db 26, PIDGEY, SPEAROW, PIDGEY, FEAROW, 0 db 26, PIDGEY, SPEAROW, PIDGEY, FEAROW, 0
@ -491,11 +491,11 @@ BirdKeeperData:
db 28, SPEAROW, DODUO, FEAROW, 0 db 28, SPEAROW, DODUO, FEAROW, 0
ChiefData: ChiefData:
; New - this will be used in the Silph Gauntlet ; Silph Gauntlet 7F
db $FF, 73, PORYGON2, 72, LAPRAS, 73, SCIZOR, 73, MAGNEZONE, 75, PORYGONZ, 77, OMEGA, 0 db $FF, 73, PORYGON2, 72, LAPRAS, 73, SCIZOR, 73, MAGNEZONE, 75, PORYGONZ, 77, OMEGA, 0
ScientistData: ScientistData:
; Unused - this will be used in the Silph Gauntlet ; Silph Gauntlet 4F (Lavender Tower)
db 65, MAGNEZONE, ELECTRODE, PORYGONZ, ANIMON, WEEZING, ALAKAZAM, 0 db 65, MAGNEZONE, ELECTRODE, PORYGONZ, ANIMON, WEEZING, ALAKAZAM, 0
; Silph Co. 2F ; Silph Co. 2F
db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0 db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
@ -553,7 +553,7 @@ RocketData: ; restoring these so undefined stuff isn't pulled RIGHT NOW
db 25, ZUBAT, ZUBAT, GOLBAT, 0 db 25, ZUBAT, ZUBAT, GOLBAT, 0
db 26, KOFFING, DROWZEE, 0 db 26, KOFFING, DROWZEE, 0
db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0 db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0
; Unused - this will be used in the Silph Gauntlet ; Silph Gauntlet 4F (Lavender Tower)
db 65, PERSIAN, ARBOK, RATICATE, CROBAT, HYPNO, GUARDIA, 0 db 65, PERSIAN, ARBOK, RATICATE, CROBAT, HYPNO, GUARDIA, 0
; Silph Co. 2F - cut ; Silph Co. 2F - cut
db 29, CUBONE, ZUBAT, 0 db 29, CUBONE, ZUBAT, 0
@ -591,7 +591,7 @@ CooltrainerMData:
; Victory Road 3F ; Victory Road 3F
db 43, EXEGGUTOR, CLOYSTER, ARCANINE, 0 db 43, EXEGGUTOR, CLOYSTER, ARCANINE, 0
db 43, KINGLER, TENTACRUEL, BLASTOISE, 0 db 43, KINGLER, TENTACRUEL, BLASTOISE, 0
; Unused - this will be used in the Silph Gauntlet ; Silph Gauntlet 5F (Safari Zone)
db 66, GOROCHU, VENUSAUR, ESPEON, CHARIZARD, SNORLAX, TOTARTLE, 0 db 66, GOROCHU, VENUSAUR, ESPEON, CHARIZARD, SNORLAX, TOTARTLE, 0
; Victory Road 1F ; Victory Road 1F
db 42, IVYSAUR, WARTORTLE, CHARMELEON, CHARIZARD, 0 db 42, IVYSAUR, WARTORTLE, CHARMELEON, CHARIZARD, 0
@ -609,7 +609,7 @@ CooltrainerFData:
; Victory Road 3F ; Victory Road 3F
db 43, BELLSPROUT, WEEPINBELL, VICTREEBEL, 0 db 43, BELLSPROUT, WEEPINBELL, VICTREEBEL, 0
db 43, PARASECT, DEWGONG, CHANSEY, 0 db 43, PARASECT, DEWGONG, CHANSEY, 0
; Unused - this will be used in the Silph Gauntlet ; Silph Gauntlet 5F (Safari Zone)
db 66, CLEFABLE, GENGAR, VICTREEBEL, NINETALES, KANGASKHAN, BLASTOISE, 0 db 66, CLEFABLE, GENGAR, VICTREEBEL, NINETALES, KANGASKHAN, BLASTOISE, 0
; Victory Road 1F ; Victory Road 1F
db 44, PERSIAN, NINETALES, 0 db 44, PERSIAN, NINETALES, 0
@ -624,7 +624,7 @@ GentlemanData:
db 19, NIDORAN_M, NIDORAN_F, 0 db 19, NIDORAN_M, NIDORAN_F, 0
; SS Anne 2F Rooms/Vermilion Gym ; SS Anne 2F Rooms/Vermilion Gym
db 23, PIKACHU, 0 db 23, PIKACHU, 0
; Unused - this will be used in the Silph Gauntlet ; Silph Gauntlet 3F (S.S Anne)
db 64, ARCANINE, NIDOQUEEN, MR_RIME, FEAROW, CARAPTHOR, RAPIDASH, 0 db 64, ARCANINE, NIDOQUEEN, MR_RIME, FEAROW, CARAPTHOR, RAPIDASH, 0
; SS Anne 2F Rooms ; SS Anne 2F Rooms
db 17, GROWLITHE, PONYTA, 0 db 17, GROWLITHE, PONYTA, 0
@ -638,7 +638,7 @@ ChannelerData:
; Pokémon Tower 3F ; Pokémon Tower 3F
db 23, MIKON, GASTLY, 0 db 23, MIKON, GASTLY, 0
db 24, VULPIX, 0 db 24, VULPIX, 0
; Unused - this will be used in the Silph Gauntlet ; Silph Gauntlet 4F (Lavender Tower)
db 65, MUK, GUARDIA, ANNIHILAPE, HYPNO, NINETALES, GENGAR, 0 db 65, MUK, GUARDIA, ANNIHILAPE, HYPNO, NINETALES, GENGAR, 0
; Pokémon Tower 3F ; Pokémon Tower 3F
db 25, GASTLY, HAUNTER, 0 db 25, GASTLY, HAUNTER, 0
@ -672,7 +672,7 @@ StudentData:
; Viridian Pre-Gym ; Viridian Pre-Gym
db 6, PIDGEY, RATTATA, 0 db 6, PIDGEY, RATTATA, 0
db 6, CLEFAIRY, 0 db 6, CLEFAIRY, 0
; Silph Gauntlet ; Silph Gauntlet 1F (Viridian Forest)
db 62, CLEFABLE, PENDRAKEN, WIGGLYTUFF, BARUNDA, BELLOSSOM, SLOWKING, 0 ; may revise db 62, CLEFABLE, PENDRAKEN, WIGGLYTUFF, BARUNDA, BELLOSSOM, SLOWKING, 0 ; may revise
; Celadon University ; Celadon University
db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0 db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
@ -680,10 +680,14 @@ StudentData:
FirefighterData: FirefighterData:
; For Cerulean Gym ; For Cerulean Gym
db 15, POLIWAG, SQUIRTLE, CHEEP, 0 db 15, POLIWAG, SQUIRTLE, CHEEP, 0
; Silph Gauntlet 3F (S.S Anne)
db 64, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0 ; mostly water-types, but adding other types that hit Fire super-effectively
JuniorData: JuniorData:
JackData: JackData:
; Silph Gauntlet 7F (Chief's Office)
db 70, ANIMON, PURAKKUSU, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0 ; not 100% sure what to do with this guy...
JessieJamesData: JessieJamesData:
db 14, EKANS, MEOWTH, KOFFING, 0 ; Mt. Moon db 14, EKANS, MEOWTH, KOFFING, 0 ; Mt. Moon
@ -693,4 +697,4 @@ JessieJamesData:
db $FF, 80, MEOWTH, 72, ARBOK, 71, WEEZING, 74, LICKILICKY, 74, VICTREEBEL, 74, GYARADOS, 0 ; Citrine Rocket House db $FF, 80, MEOWTH, 72, ARBOK, 71, WEEZING, 74, LICKILICKY, 74, VICTREEBEL, 74, GYARADOS, 0 ; Citrine Rocket House
INCLUDE "data/trainers/scaled_parties.asm" INCLUDE "data/trainers/scaled_parties.asm"
INCLUDE "data/trainers/rival_parties.asm" INCLUDE "data/trainers/rival_parties.asm"