thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 22:52:15 +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