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

Merge branch 'mistress' into renewables

Browse source
This commit is contained in:
Thorn Avery 2024-01-15 06:44:40 +11:00
commit b9b0ea0301
8 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scripts/CinnabarVolcanoFloors.asm
View file

@ -25,6 +25,7 @@ CinnabarVolcanoFloors_TextPointers:
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
CinnabarVolcanoFloorsTrainerHeaders:
def_trainers

3
scripts/FightingDojo.asm
View file

@ -68,7 +68,7 @@ FightingDojoScript3:
.asm_5cde4
ld a, $f0
ld [wJoyIgnore], a
SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
SetEventRange EVENT_DEFEATED_FIGHTING_DOJO, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
ld a, $9
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -175,7 +175,6 @@ FightingDojoText1: ; gym scaling can be removed to make space
.continue2
ld hl, FightingDojoText8
call PrintText
SetEvent EVENT_DEFEATED_FIGHTING_DOJO
.asm_9dba4
jp TextScriptEnd