thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 10:23:34 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -263,7 +263,7 @@ Comprehensive list can be found on Discord.
- Occasionally, menu text sets itself to scroll.
- The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1.
- Fake Tears and Nasty Plot don't quite look right when done from the opponent's side.
- After reloading the game after beating the Elite Four, Pallet Town's correct palette isn't loaded in until after leaving the house.
- Yujirou seems to crash the game after battling him sometimes.
- The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle
Evolution Methods for new Pokemon

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:

14
scripts/BrunswickGlade.asm
View file

@ -13,6 +13,10 @@ BrunswickGlade_ScriptPointers:
dw EndTrainerBattle
BrunswickGlade_TextPointers:
dw BrunswickGladeTrainer1
dw BrunswickGladeTrainer2
dw BrunswickGladeTrainer3
dw BrunswickGladeTrainer4
dw GZapRun1
dw GZapRun2
dw GZapRun3
@ -20,20 +24,16 @@ BrunswickGlade_TextPointers:
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw BrunswickGladeTrainer1
dw BrunswickGladeTrainer2
dw BrunswickGladeTrainer3
dw BrunswickGladeTrainer4
dw BrunswickGladeSign1
BrunswickGladeTrainerHeaders:
def_trainers
BrunswickGladeTrainerHeader0:
trainer EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_F, 1, BrunswickGladeBattleText1, BrunswickGladeEndBattleText1, BrunswickGladeAfterBattleText1
BrunswickGladeTrainerHeader2: ; don't ask
trainer EVENT_BEAT_BRUNSWICK_GLADE_GENTLEMAN, 4, BrunswickGladeBattleText3, BrunswickGladeEndBattleText3, BrunswickGladeAfterBattleText3
BrunswickGladeTrainerHeader1:
trainer EVENT_BEAT_BRUNSWICK_GLADE_BEAUTY, 4, BrunswickGladeBattleText2, BrunswickGladeEndBattleText2, BrunswickGladeAfterBattleText2
trainer EVENT_BEAT_BRUNSWICK_GLADE_GENTLEMAN, 4, BrunswickGladeBattleText2, BrunswickGladeEndBattleText2, BrunswickGladeAfterBattleText2
BrunswickGladeTrainerHeader2:
trainer EVENT_BEAT_BRUNSWICK_GLADE_BEAUTY, 4, BrunswickGladeBattleText3, BrunswickGladeEndBattleText3, BrunswickGladeAfterBattleText3
BrunswickGladeTrainerHeader3:
trainer EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_M, 3, BrunswickGladeBattleText4, BrunswickGladeEndBattleText4, BrunswickGladeAfterBattleText4
db -1 ; end

57
text/BrunswickGlade.asm
View file

@ -20,7 +20,8 @@ _BrunswickGladeBattleText1:: ; Leaf
done
_BrunswickGladeEndBattleText1::
text "Dang it!" ; Taken from Smash Ultimate when a Pokemon faints. Cryptid moment.
text "Dang"
line "it!" ; Taken from Smash Ultimate when a Pokemon faints. Cryptid moment.
prompt
_BrunswickGladeAfterBattleText1::
@ -34,30 +35,7 @@ _BrunswickGladeAfterBattleText1::
cont "everywhere!"
done
_BrunswickGladeBattleText2:: ; Ariana - uses stad2 quotes
text "That sharp gaze..."
para "You seem rather"
line "competent."
done
_BrunswickGladeEndBattleText2::
text "I can't"
line "look them in"
cont "the face after"
cont "this!"
prompt
_BrunswickGladeAfterBattleText2::
text "Have you thought"
line "about working"
cont "for TEAM ROCKET?"
para "No? Forget I"
line "said anything."
done
_BrunswickGladeBattleText3:: ; Fuji
_BrunswickGladeBattleText2:: ; Fuji
text "You seem to have"
line "raised your #-"
cont "MON with love"
@ -67,11 +45,11 @@ _BrunswickGladeBattleText3:: ; Fuji
line "they battle!"
done
_BrunswickGladeEndBattleText3::
_BrunswickGladeEndBattleText2::
text "Hm..."
prompt
_BrunswickGladeAfterBattleText3::
_BrunswickGladeAfterBattleText2::
text "I've made many"
line "mistakes in my"
cont "life."
@ -83,6 +61,29 @@ _BrunswickGladeAfterBattleText3::
cont "matters."
done
_BrunswickGladeBattleText3:: ; Ariana - uses stad2 quotes
text "That sharp gaze..."
para "You seem rather"
line "competent."
done
_BrunswickGladeEndBattleText3::
text "I can't"
line "look them in"
cont "the face after"
cont "this!"
prompt
_BrunswickGladeAfterBattleText3::
text "Have you thought"
line "about working"
cont "for TEAM ROCKET?"
para "No? Forget I"
line "said anything."
done
_BrunswickGladeBattleText4:: ; Trace
text "Whoa!"
@ -92,7 +93,7 @@ _BrunswickGladeBattleText4:: ; Trace
done
_BrunswickGladeEndBattleText4::
text "Whoa!"
text "Wow!"
line "Seriously?"
prompt