thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-20 22:28:41 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding data for Silph Gauntlet Trainers (2, 3, 5F)

Browse source 
Adds the trainers themselves, dialogue still needs to be written but PvK can help with that

Currently they either don't see you or challenge you multiple times...probably issues with where the event constants are located, will sort out once I figure out the problem
This commit is contained in:
Martha Schilling 2023-07-15 22:07:51 +01:00
parent ffd03c1b06
commit 91e06763dd
19 changed files with 936 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/objects/Route12.asm
View file

@ -15,7 +15,7 @@ Route12_Object:
object_event 14, 31, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 3
object_event 5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4
object_event 11, 92, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9
object_event 14, 76, SPRITE_SUPER_NERD, STAY, UP, 5, OPP_ROCKER, 2
object_event 14, 76, SPRITE_ROCKER, STAY, UP, 5, OPP_ROCKER, 2
object_event 12, 40, SPRITE_FISHER, STAY, LEFT, 6, OPP_FISHER, 5
object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, 7, OPP_FISHER, 6
object_event 6, 87, SPRITE_FISHER, STAY, DOWN, 8, OPP_FISHER, 11

8
data/maps/objects/SilphGauntlet2F.asm
View file

@ -3,10 +3,16 @@ SilphGauntlet2F_Object:
def_warp_events
warp_event 7, 5, SILPH_GAUNTLET_1F, 2
warp_event 3, 13, SILPH_GAUNTLET_3F, 1
warp_event 3, 13, SILPH_GAUNTLET_3F, 1
def_bg_events
def_object_events
object_event 13, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_LASS, 19
object_event 21, 9, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_JUNIOR, 1
object_event 24, 13, SPRITE_HIKER, STAY, RIGHT, 3, OPP_HIKER, 15
object_event 23, 19, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_SUPER_NERD, 8
object_event 11, 16, SPRITE_SUPER_NERD, STAY, DOWN, 5, OPP_POKEMANIAC, 8
object_event 2, 16, SPRITE_HIKER, STAY, RIGHT, 6, OPP_BLACKBELT, 19
def_warps_to SILPH_GAUNTLET_2F

7
data/maps/objects/SilphGauntlet3F.asm
View file

@ -22,5 +22,12 @@ SilphGauntlet3F_Object:
def_bg_events
def_object_events
object_event 13, 13, SPRITE_SAILOR, STAY, UP, 1, OPP_SAILOR, 9
object_event 12, 23, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_FIREFIGHTER, 2
object_event 2, 23, SPRITE_GENTLEMAN, STAY, DOWN, 3, OPP_GENTLEMAN, 4
object_event 21, 12, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_ENGINEER, 4
object_event 6, 7, SPRITE_ROCKER, STAY, RIGHT, 5, OPP_ROCKER, 3
object_event 22, 23, SPRITE_FISHER, STAY, DOWN, 6, OPP_FISHER, 12
object_event 30, 23, SPRITE_BEAUTY, STAY, RIGHT, 7, OPP_BEAUTY, 11
def_warps_to SILPH_GAUNTLET_3F

7
data/maps/objects/SilphGauntlet5F.asm
View file

@ -8,5 +8,12 @@ SilphGauntlet5F_Object:
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
def_warps_to SILPH_GAUNTLET_5F

2
data/maps/objects/VermilionGym.asm
View file

@ -10,7 +10,7 @@ VermilionGym_Object:
def_object_events
object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, 1, OPP_LT_SURGE, 1
object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, 2, OPP_GENTLEMAN, 3
object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_ROCKER, 1
object_event 3, 8, SPRITE_ROCKER, STAY, LEFT, 3, OPP_ROCKER, 1
object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, 4, OPP_SAILOR, 8
object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person

47
data/trainers/parties.asm
View file

@ -225,33 +225,33 @@ JrTrainerFData:
PokemaniacData:
; Route 10
db 30, RHYHORN, LICKITUNG, 0
db 20, CUBONE, SLOWPOKE, 0
db 21, CHARMELEON, CUBONE, 0
; Rock Tunnel B1F
db 20, SLOWPOKE, LICKITUNG, RHYHORN, 0
db 22, CHARMANDER, CUBONE, 0
db 25, SKIMPER, 0
; Victory Road 2F
db 40, CHARMELEON, LAPRAS, LICKILICKY, RHYDON, 0
db 40, BAWLIGUA, LAPRAS, LICKILICKY, RHYDON, 0
; Rock Tunnel 1F
db 23, CUBONE, SLOWPOKE, 0
; Silph Gauntlet (currently 2F but may move up to 5F)
; Silph Gauntlet 2F (Mt. Moon)
db 63, GUARDIA, SLOWKING, CHARIZARD, STEELIX, LICKILICKY, RHYPERIOR, 0
; Feels almost aimless...
; The Super Nerd has some weird choices, but I think they're mostly inorganic Pokemon, except for Fire-types that the Cinnabar Gym Trainers use.
SuperNerdData:
; Mt. Moon 1F
db 11, MAGNEMITE, VOLTORB, 0
; Mt. Moon B2F - the fossil guy fight
db 12, GRIMER, VOLTORB, KOFFING, 0
; Route 8
db 20, VOLTORB, KOFFING, VOLTORB, MAGNEMITE, 0
db 22, GRIMER, MUK, GRIMER, 0
db 26, KOFFING, 0
db 20, GRIMER, KOFFING, KOFFING, MAGNEMITE, 0
db 22, VOLTORB, KOFFING, MAGNETITE, 0
db 26, ELECTRODE, 0
; Unused
db 30, PORYGON, 0 ; - used in celadon university
db 25, MAGNETITE, ELECTRODE, KABUTO, OMANYTE, 0 ; - used in celadon university
; Silph Gauntlet 2F (Mt. Moon)
db 63, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, MAGMORTAR, 0
db 63, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, PORYGONZ, 0
; Cinnabar Gym
db 36, VULPIX, NINETALES, CHARIZARD, 0
db 34, PONYTA, CHARMANDER, RAPIDASH, ARCANINE, 0
@ -261,30 +261,31 @@ SuperNerdData:
; Expanding the Hiker's cast is hard, as Rock-types are actually quite limited.
; Machop is more of an exception and not the rule, it's just "strong".
; So, I have added a few Ground-types that you could reasonably expect to see in each area.
; The Zubat line should also be there given how prevalent they tend to be inside caves...
HikerData:
; Mt. Moon 1F
db 10, GEODUDE, GEODUDE, ONIX, 0
; Route 25
db 15, MACHOP, GEODUDE, 0
db 13, GEODUDE, GEODUDE, MACHOP, GEODUDE, 0
db 13, GEODUDE, ZUBAT, MACHOP, ZUBAT, 0
db 17, ONIX, 0
; Route 9
db 21, GEODUDE, ONIX, 0
db 20, GEODUDE, MACHOP, DIGLETT, 0
; Route 10
db 21, CUBONE, ONIX, 0
db 19, SANDSHREW, GRAVELER, 0
db 19, ZUBAT, GRAVELER, 0
; Rock Tunnel B1F
db 21, GEODUDE, GEODUDE, GRAVELER, 0 ; The "Self-Destructing Hiker", fairly notorious and good to keep
db 23, NIDOKING, 0 ; could be a little strong, but I'll give it a go
db 24, GOLBAT, 0
; Route 9/Rock Tunnel B1F
db 20, MACHOP, RHYHORN, 0
; Rock Tunnel 1F
db 19, GEODUDE, MACHOP, RHYHORN, 0
db 20, MACHOP, DIGLETT, ONIX, 0
db 20, ZUBAT, DIGLETT, ONIX, 0
db 21, GEODUDE, GRAVELER, 0
; Silph Gauntlet 2F (Mt. Moon)
db 63, STEELIX, GOLEM, MACHAMP, CROBAT, CROAKOZUNA, GUARDIA, 0
db 63, STEELIX, GOLEM, MACHAMP, CROBAT, DUGTRIO, GUARDIA, 0
; Poison Pokemon. Poison Pokemon everywhere.
; Much of this seems to represent the pollution caused by petrol gas.
@ -317,7 +318,7 @@ BikerData:
db 28, GRIMER, GRIMER, SEADRA, 0
db 29, MAGMAR, 0
; Silph Gauntlet 5F (Safari Zone)
db 66, GENGAR, MUK_A, WEEZING, FLAREON, KINGDRA, CHARIZARD, 0
db 66, GOROTORA, MUK_A, WEEZING, FLAREON, KINGDRA, CHARIZARD, 0
; Fire specialist
BurglarData:
@ -486,7 +487,7 @@ JugglerData:
; Victory Road 2F
db 48, ELECTRODE, HYPNO, MR_MIME, 0 ; buffed roster
; Silph Gauntlet 5F (Safari Zone)
db 66, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, GENGAR, SLOWKING, 0
db 66, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, VICTREEBEL, SLOWKING_G, 0
; Fuchsia Gym
db 38, UMBREON, 0
; Fuchsia Gym
@ -505,7 +506,7 @@ TamerData:
; Victory Road 2F
db 44, KANGASKHAN, TAUROS, GOLDUCK, PRIMEAPE, 0
; Silph Gauntlet 5F (Safari Zone)
db 66, RHYPERIOR, GOLDUCK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0
db 66, RHYPERIOR, ARBOK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0
; yep bird yep bird yep bird yep bird
; If nothing else, just make them less agonising to fight.
@ -720,25 +721,27 @@ ChannelerData:
db 38, ESPEON, 0
db 33, JYNX, EXEGGCUTE, KADABRA, 0
; Normal specialists
; Mostly Normal specialists
StudentData:
; Viridian Pre-Gym
db 4, PIDGEY, RATTATA, 0
db 6, CLEFAIRY, 0
; Silph Gauntlet 1F (Viridian Forest)
db 62, CLEFABLE, PENDRAKEN, WIGGLYTUFF, BARUNDA, BELLOSSOM, NINETALES_A, 0 ; may revise
db 62, WIGGLYTUFF, PIDGEOT, TRAMPEL, CLEFABLE, KANGASKHAN, DEER, 0 ; all Normal types that Yujirou doesn't use
; Celadon University
db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
; Water specialists
; Mainly Water specialists, but can also use anything else that hits Fire super-effectively
FirefighterData:
; For Cerulean Gym
; Cerulean Gym
db 15, POLIWAG, CHEEP, SQUIRTLE, 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
db 64, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0
JuniorData:
; Silph Gauntlet 2F (Mt. Moon)
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:
; Silph Gauntlet 7F (Chief's Office)
db 70, ANIMON, PURAKKUSU, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0 ; not 100% sure what to do with this guy...

2
data/trainers/scaled_parties.asm
View file

@ -142,3 +142,5 @@ BlackbeltData:
db 38, CACTUS, DUGTRIO, STEELIX, 0
; Victory Road 2F
db 43, MACHOKE, MACHOP, MACHOKE, 0
; Silph Gauntlet 2F (Mt. Moon)
db 63, HITMONLEE, JABETTA, HITMONCHAN, POLIWRATH, CARAPTHOR, MACHAMP, 0