thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Silph Gauntlet 4F trainers!

Browse source 
Includes the same healing pad that was in Lavender Tower, as a reward for getting halfway! Trainers can't currently see you, which I'll fix once I've added the trainers on 2F and 3F.
This commit is contained in:
MementoMartha 2023-04-27 19:55:35 +01:00
parent 0b9bf6d8db
commit ba78014ec6
8 changed files with 343 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/maps/objects/SilphGauntlet4F.asm
View file

@ -8,5 +8,11 @@ SilphGauntlet4F_Object:
def_bg_events
def_object_events
object_event 4, 3, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 1
object_event 14, 2, SPRITE_GAMBLER, STAY, RIGHT, 2, OPP_GAMBLER, 6
object_event 18, 11, SPRITE_ROCKET, STAY, LEFT, 3, OPP_ROCKET, 22
object_event 12, 10, SPRITE_YOUNGSTER, STAY, RIGHT, 4, OPP_PSYCHIC_TR, 5
object_event 7, 5, SPRITE_SUPER_NERD, STAY, UP, 5, OPP_BURGLAR, 1
object_event 4, 14, SPRITE_CHANNELER, STAY, DOWN, 6, OPP_CHANNELER, 7
def_warps_to SILPH_GAUNTLET_4F

14
data/trainers/parties.asm
View file

@ -306,7 +306,7 @@ BikerData:
BurglarData:
; Unused
db 66, NINETALES, RAPIDASH, ARCANINE, WEEZING, MAGMORTAR, MUK, 0 ; - used in Silph Gauntlet
db 65, RAPIDASH, CROAKOZUNA, ARCANINE, WEEZING, MAGMORTAR, MUK, 0 ; - used in Silph Gauntlet
db 33, GROWLITHE, 0
db 28, VULPIX, CHARMANDER, PONYTA, 0
; Cinnabar Gym
@ -390,8 +390,8 @@ GamblerData:
db 18, GROWLITHE, VULPIX, 0
; Route 8
db 22, POLIWAG, POLIWAG, POLIWHIRL, 0
; Unused
; db 22, ONIX, GEODUDE, GRAVELER, 0
; Unused - used in Silph Gauntlet
db 65, SEAKING, RHYPERIOR, ELECTRODE, ARCANINE, GOLEM, POLITOED, 0
; Route 8
db 24, GROWLITHE, VULPIX, 0
@ -425,6 +425,8 @@ PsychicData:
db 34, MR_MIME, KADABRA, 0
db 33, SLOWPOKE, SLOWPOKE, SLOWBRO, 0
db 38, SLOWBRO, 0
; Silph Gauntlet
db 65, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0
RockerData:
; Vermilion Gym
@ -494,7 +496,7 @@ ChiefData:
ScientistData:
; Unused - this will be used in the Silph Gauntlet
db 64, MAGNEZONE, ELECTRODE, PORYGONZ, MUK, WEEZING, ALAKAZAM, 0
db 65, MAGNEZONE, ELECTRODE, PORYGONZ, ANIMON, WEEZING, ALAKAZAM, 0
; Silph Co. 2F
db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
db 28, MAGNEMITE, VOLTORB, MAGNETON, 0
@ -552,7 +554,7 @@ RocketData: ; restoring these so undefined stuff isn't pulled RIGHT NOW
db 26, KOFFING, DROWZEE, 0
db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0
; Unused - this will be used in the Silph Gauntlet
db 65, PERSIAN, ARBOK, WEEZING, CROBAT, HYPNO, GUARDIA, 0
db 65, PERSIAN, ARBOK, RATICATE, CROBAT, HYPNO, GUARDIA, 0
; Silph Co. 2F - cut
db 29, CUBONE, ZUBAT, 0
db 25, GOLBAT, ZUBAT, ZUBAT, RATICATE, ZUBAT, 0
@ -637,7 +639,7 @@ ChannelerData:
db 23, MIKON, GASTLY, 0
db 24, VULPIX, 0
; Unused - this will be used in the Silph Gauntlet
db 65, GUARDIA, NINETALES, ANNIHILAPE, HYPNO, MUK, GENGAR, 0
db 65, MUK, GUARDIA, ANNIHILAPE, HYPNO, NINETALES, GENGAR, 0
; Pokémon Tower 3F
db 25, GASTLY, HAUNTER, 0
; Pokémon Tower 4F, now unused