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

Fixing the Brunswick Glade NPC bugs

Browse source 
Almost there...
This commit is contained in:
Martha Schilling 2023-12-28 21:40:05 +00:00
parent 7b2a5e5d7f
commit 5760e27617
8 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

14
data/maps/hide_show_data.asm
View file

@ -591,13 +591,13 @@ MtMoonSquareHS:
DaycareHS:
db DAYCARE, $03, SHOW ; HS_DAYCARE_BULBASAUR
BrunswickGladeHS:
db BRUNSWICK_GLADE, $01, HIDE ; HS_GLADE_GZAP_1
db BRUNSWICK_GLADE, $02, HIDE ; HS_GLADE_GZAP_2
db BRUNSWICK_GLADE, $03, HIDE ; HS_GLADE_GZAP_3
db BRUNSWICK_GLADE, $04, HIDE ; HS_GLADE_ITEM1
db BRUNSWICK_GLADE, $05, HIDE ; HS_GLADE_ITEM2
db BRUNSWICK_GLADE, $06, HIDE ; HS_GLADE_ITEM3
db BRUNSWICK_GLADE, $07, HIDE ; HS_GLADE_ITEM4
db BRUNSWICK_GLADE, $05, HIDE ; HS_GLADE_GZAP_1
db BRUNSWICK_GLADE, $06, HIDE ; HS_GLADE_GZAP_2
db BRUNSWICK_GLADE, $07, HIDE ; HS_GLADE_GZAP_3
db BRUNSWICK_GLADE, $08, SHOW ; HS_GLADE_ITEM1
db BRUNSWICK_GLADE, $09, SHOW ; HS_GLADE_ITEM2
db BRUNSWICK_GLADE, $0A, SHOW ; HS_GLADE_ITEM3
db BRUNSWICK_GLADE, $0B, SHOW ; HS_GLADE_ITEM4
CinnabarVolcanoFloorsHS:
db CINNABAR_VOLCANO_FLOORS, $05, SHOW
assert_table_length NUM_HS_OBJECTS

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

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

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

@ -13,7 +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
object_event 22, 15, SPRITE_BEAUTY, STAY, DOWN, 1, OPP_BEAUTY, 17 ; Mina reference Trainer
object_event 23, 4, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_COOLTRAINER_M, 12 ; Primo reference Trainer
def_warps_to CELESTE_HILL_CAVE

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

@ -15,7 +15,7 @@ CelesteHillOutside_Object:
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 1, 16, 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

4
data/trainers/parties.asm
View file

@ -699,7 +699,7 @@ CooltrainerFData:
; db 45, NIDORINA, NIDOQUEEN, 0
; db 43, PERSIAN, NINETALES, RAICHU, 0
; Brunswick Glade/grotto etc, whatever desired
db 60, PIDGEOT, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf
db 60, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf
; "Dignified" Pokemon associated with the privileged class.
GentlemanData:
@ -713,7 +713,7 @@ GentlemanData:
; SS Anne 2F Rooms
db 17, KOLTA, GROWLITHE, 0
; Celeste Hill?
db 56, NIDOKING, GOLDUCK, GUARDIA, PIDGEOT, DODRIO, BEEDRILL, 0 ; Fuji
db 56, NIDOKING, GOLDUCK, GUARDIA, DODRIO, BEEDRILL, 0 ; Fuji
db 57, FEAROW, RAPIDASH, GOROCHU, ALAKAZAM, SYLVEON, 0 ; Fan Club chairman
ChannelerData: