mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 18:30:50 +12:00
749abc67b7
This commit adds a large fundamental change to KEP, that being Gym Rematches. This is achieved alongside a rework to the script that makes those post-game-gating NPCs shift around. If you add a new one, just add its constant to the lists you'll see in the Hall of Fame script. It also fixes a few bugs: - Fixed a bug where Cinnabar Gym loaded a fleet of Blaines. This occurred due to the way he is coded at base, and a misunderstanding I had when implementing his scaling. This is now fixed by standardising his gym script instead, while letting the gym trainers still use the old one. - Fixed a bug where the Up-Grade NPC would not appear after beating Silph Co. 11F. However, Giovanni currently seems to have trouble with his text. This floor needs some re-coding anyway, given we need to add Jessie and James to it. And some misc. changes: - Changed the first Moon Stone in Mt. Moon to a Poison Stone for the Nidoking speedrunners - Debug Mode now has a line of code to set up the post-game easily - Changed Surge's initial battle text to Yellow's - Added Sabrina's more accurate LGPE initial battle text, referring to the spoon she bent by accident
57 lines
2.1 KiB
NASM
57 lines
2.1 KiB
NASM
SaffronGym_Object:
|
|
db $2e ; border block
|
|
|
|
; I tried to add a way to instantly get to the start.
|
|
; But...it breaks the *entire* puzzle for some reason.
|
|
; Yes, I tried changing the one in Sabrina's room. No, it didn't accomplish anything.
|
|
|
|
def_warp_events
|
|
warp_event 8, 17, LAST_MAP, 3
|
|
warp_event 9, 17, LAST_MAP, 3
|
|
warp_event 1, 3, SAFFRON_GYM, 23
|
|
warp_event 5, 3, SAFFRON_GYM, 16
|
|
warp_event 1, 5, SAFFRON_GYM, 19
|
|
warp_event 5, 5, SAFFRON_GYM, 9
|
|
warp_event 1, 9, SAFFRON_GYM, 28
|
|
warp_event 5, 9, SAFFRON_GYM, 17
|
|
warp_event 1, 11, SAFFRON_GYM, 6
|
|
warp_event 5, 11, SAFFRON_GYM, 14
|
|
warp_event 1, 15, SAFFRON_GYM, 24
|
|
warp_event 5, 15, SAFFRON_GYM, 31
|
|
warp_event 1, 17, SAFFRON_GYM, 18
|
|
warp_event 5, 17, SAFFRON_GYM, 10
|
|
warp_event 9, 3, SAFFRON_GYM, 27
|
|
warp_event 11, 3, SAFFRON_GYM, 4
|
|
warp_event 9, 5, SAFFRON_GYM, 8
|
|
warp_event 11, 5, SAFFRON_GYM, 13
|
|
warp_event 11, 11, SAFFRON_GYM, 5
|
|
warp_event 11, 15, SAFFRON_GYM, 32
|
|
warp_event 15, 3, SAFFRON_GYM, 25
|
|
warp_event 19, 3, SAFFRON_GYM, 29
|
|
warp_event 15, 5, SAFFRON_GYM, 3
|
|
warp_event 19, 5, SAFFRON_GYM, 11
|
|
warp_event 15, 9, SAFFRON_GYM, 21
|
|
warp_event 19, 9, SAFFRON_GYM, 30
|
|
warp_event 15, 11, SAFFRON_GYM, 15
|
|
warp_event 19, 11, SAFFRON_GYM, 7
|
|
warp_event 15, 15, SAFFRON_GYM, 22
|
|
warp_event 19, 15, SAFFRON_GYM, 26
|
|
warp_event 15, 17, SAFFRON_GYM, 12
|
|
warp_event 19, 17, SAFFRON_GYM, 20
|
|
;warp_event 10, 8, SAFFRON_GYM, 20 ; New warp directly to the start of the gym, like later games.
|
|
|
|
def_bg_events
|
|
|
|
def_object_events
|
|
object_event 9, 8, SPRITE_GIRL, STAY, DOWN, 1, OPP_SABRINA, 1
|
|
object_event 10, 1, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 22
|
|
object_event 17, 1, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1
|
|
object_event 3, 7, SPRITE_CHANNELER, STAY, DOWN, 4, OPP_CHANNELER, 23
|
|
object_event 17, 7, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2
|
|
object_event 3, 13, SPRITE_CHANNELER, STAY, DOWN, 6, OPP_CHANNELER, 24
|
|
object_event 17, 13, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3
|
|
object_event 3, 1, SPRITE_YOUNGSTER, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4
|
|
object_event 10, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person
|
|
|
|
def_warps_to SAFFRON_GYM
|