thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-11 15:54:49 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fighting Dojo fix

Browse source 
Admittedly very very comical.

Moves the normal processing checks down to where the normal processing actually happens.
This commit is contained in:
Llinos Evans 2023-12-24 18:21:21 +00:00
parent 6678af8722
commit 39b1340dda
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/FightingDojo.asm
View file

@ -109,14 +109,7 @@ FightingDojoText1: ; gym scaling can be removed to make space
text_asm text_asm
CheckEvent EVENT_POST_GAME_ATTAINED ; No need to view previous stuff, technically you can skip Bide this way but I think that's hilarious CheckEvent EVENT_POST_GAME_ATTAINED ; No need to view previous stuff, technically you can skip Bide this way but I think that's hilarious
jp z, .normalProcessing jp z, .normalProcessing
CheckEvent EVENT_GOT_HITMON ; failsafe ld hl, KoichiRematchPreBattleText ; Rematch functionality. Just loads pre-battle text and his trainer.
jp nz, .continue2
CheckEvent EVENT_DEFEATED_FIGHTING_DOJO
jp nz, .continue1
CheckEventReuseA EVENT_BEAT_KARATE_MASTER
jp nz, .continue2
.rematchMode ; Rematch functionality. Just loads pre-battle text and his trainer.
ld hl, KoichiRematchPreBattleText
call PrintText call PrintText
ld c, BANK(Music_MeetMaleTrainer) ld c, BANK(Music_MeetMaleTrainer)
ld a, MUSIC_MEET_MALE_TRAINER ld a, MUSIC_MEET_MALE_TRAINER
@ -139,6 +132,12 @@ FightingDojoText1: ; gym scaling can be removed to make space
ld [wGymLeaderNo], a ld [wGymLeaderNo], a
jr .asm_9dba4 jr .asm_9dba4
.normalProcessing .normalProcessing
CheckEvent EVENT_DEFEATED_FIGHTING_DOJO
jp nz, .continue1
CheckEventReuseA EVENT_BEAT_KARATE_MASTER
jp nz, .continue2
CheckEvent EVENT_GOT_HITMON ; failsafe
jp nz, .continue2
ld hl, FightingDojoText_5ce8e ld hl, FightingDojoText_5ce8e
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d