Deobfuscate gyms consistently

This commit is contained in:
deak311andris 2019-10-07 07:23:57 +02:00
parent 8d2afb7c13
commit 2e45c2946a
9 changed files with 77 additions and 77 deletions

View file

@ -148,12 +148,12 @@ ViridianGymScript3_74995:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_GOT_TM27
jr .asm_749be
jr .gymVictory
.BagFull
ld a, $e
ld [hSpriteIndexOrTextID], a
call DisplayTextID
.asm_749be
.gymVictory
ld hl, wObtainedBadges
set 7, [hl]
ld hl, wBeatGymFlags
@ -261,13 +261,13 @@ ViridianGymTrainerHeader7:
ViridianGymText1:
TX_ASM
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
jr z, .asm_6de66
jr z, .beginBattle
CheckEventReuseA EVENT_GOT_TM27
jr nz, .asm_9fc95
jr nz, .afterVictory
call z, ViridianGymScript3_74995
call DisableWaitingAfterTextDisplay
jr .asm_6dff7
.asm_9fc95
jr .done
.afterVictory
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, ViridianGymText_74ad9
@ -279,8 +279,8 @@ ViridianGymText1:
call UpdateSprites
call Delay3
call GBFadeInFromBlack
jr .asm_6dff7
.asm_6de66
jr .done
.beginBattle
ld hl, ViridianGymText_74ace
call PrintText
ld hl, wd72d
@ -297,7 +297,7 @@ ViridianGymText1:
ld [wGymLeaderNo], a
ld a, $3
ld [wViridianGymCurScript], a
.asm_6dff7
.done
jp TextScriptEnd
ViridianGymText_74ace: