From 2e45c2946a3cf7ba18de6b9d6fc4549165666864 Mon Sep 17 00:00:00 2001
From: deak311andris <deak311andris@gmail.com>
Date: Mon, 7 Oct 2019 07:23:57 +0200
Subject: Deobfuscate gyms consistently

---
 scripts/ViridianGym.asm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'scripts/ViridianGym.asm')

diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm
index 44966fef..b0f94b9d 100755
--- a/scripts/ViridianGym.asm
+++ b/scripts/ViridianGym.asm
@@ -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:
-- 
cgit v1.2.3