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

Brunswick Glade & Celeste Hill Trainers

Browse source 
I fucked up the Brunswick Glade trainers somewhere - some text isn't sync'd and they won't come up to the player. Otherwise, it's done.
This commit is contained in:
Llinos Evans 2023-12-12 22:10:24 +00:00
parent 5ebcc9eac3
commit 4dd40a5818
15 changed files with 495 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/events/hidden_item_coords.asm
View file

@ -64,5 +64,5 @@ HiddenItemCoords:
hidden_item MT_MOON_CRATER, 32, 45 ; Old Amber
hidden_item DAYCARE, 4, 1 ; Daycare PC
hidden_item MT_MOON_SQUARE, 5, 5 ; Moon Stone
hidden_item BRUNSWICK_TRAIL, 23, 11 ; Solar Beam TM below Cactus
hidden_item BRUNSWICK_TRAIL, 24, 11 ; Solar Beam TM next to Cactus
db -1 ; end

2
data/events/hidden_objects.asm
View file

@ -671,5 +671,5 @@ MtMoonSquareHiddenItems:
db -1
BrunswickTrailHiddenItems:
hidden_object 23, 11, TM_SOLARBEAM, HiddenItems
hidden_object 24, 11, TM_SOLARBEAM, HiddenItems
db -1

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

@ -8,7 +8,7 @@ BrunswickGlade_Object:
warp_event 9, 0, BRUNSWICK_GROTTO, 2
def_bg_events
bg_event 14, 24, 8 ; Sign
bg_event 14, 24, 12 ; Sign
def_object_events
object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1
@ -18,5 +18,9 @@ BrunswickGlade_Object:
object_event 5, 21, SPRITE_POKE_BALL, STAY, NONE, 5, LEAF_STONE ; itemball2
object_event 22, 15, SPRITE_POKE_BALL, STAY, NONE, 6, REVIVE ; itemball3
object_event 9, 33, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION ; itemball4
object_event 16, 8, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 6 ; Leaf reference Trainer
object_event 7, 28, SPRITE_GENTLEMAN, STAY, UP, 9, OPP_GENTLEMAN, 6 ; Fuji reference Trainer
object_event 15, 30, SPRITE_BEAUTY, STAY, RIGHT, 10, OPP_BEAUTY, 19 ; Ariana reference Trainer
object_event 31, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 11, OPP_COOLTRAINER_M, 13 ; Trace reference Trainer
def_warps_to BRUNSWICK_GLADE

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

@ -13,5 +13,7 @@ CelesteHillCave_Object:
def_bg_events
def_object_events
object_event 22, 14, SPRITE_BEAUTY, STAY, DOWN, 1, OPP_BEAUTY, 17 ; Mina reference Trainer
object_event 21, 5, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_COOLTRAINER_M, 12 ; Primo reference Trainer
def_warps_to CELESTE_HILL_CAVE

4
data/maps/objects/CelesteHillOutside.asm
View file

@ -14,5 +14,9 @@ CelesteHillOutside_Object:
def_bg_events
def_object_events
object_event 30, 16, SPRITE_BEAUTY, STAY, LEFT, 1, OPP_BEAUTY, 18 ; Selphy reference Trainer
object_event 19, 31, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_COOLTRAINER_M, 14 ; Will reference Trainer
object_event 11, 16, SPRITE_GENTLEMAN, STAY, DOWN, 3, OPP_GENTLEMAN, 7; Fan Club Chairman reference Trainer
def_warps_to CELESTE_HILL_OUTSIDE

4
data/trainers/parties.asm
View file

@ -662,9 +662,9 @@ CooltrainerMData:
; Celadon Condominiums Morimoto - Team is LGPE's with +10 Levels each.
db 64, KANGASKHAN, FLAREON, VAPOREON, JOLTEON, MACHAMP, DRAGONITE, 0
; Brunswick Trail / Glade
db 68, RATICATE, POLIWRATH, BUTTERFREE, WIGGLYTUFF, MACHAMP, RHYPERIOR, 0 ; Primo
db 68, RATICATE, POLITOED, BUTTERFREE, WIGGLYTUFF, MACHAMP, RHYPERIOR, 0 ; Primo
db 67, PIDGEOT, VILEPLUME, GUARDIA, RAPIDASH, SLOWBRO, JOLTEON, 0 ; Trace
db 70, EXEGGUTOR, SLOWBRO, JYNX, 0 ; Will
db 63, EXEGGUTOR, SLOWBRO, JYNX, 0 ; Will
; Equally varied, nothing to say
CooltrainerFData: