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/FuchsiaGym.asm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'scripts/FuchsiaGym.asm')

diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm
index c856c93b..15f016af 100755
--- a/scripts/FuchsiaGym.asm
+++ b/scripts/FuchsiaGym.asm
@@ -54,12 +54,12 @@ FuchsiaGymScript3_75497:
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_GOT_TM06
-	jr .asm_754c0
+	jr .gymVictory
 .BagFull
 	ld a, $b
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
-.asm_754c0
+.gymVictory
 	ld hl, wObtainedBadges
 	set 4, [hl]
 	ld hl, wBeatGymFlags
@@ -142,17 +142,17 @@ FuchsiaGymTrainerHeader5:
 FuchsiaGymText1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_KOGA
-	jr z, .asm_181b6
+	jr z, .beginBattle
 	CheckEventReuseA EVENT_GOT_TM06
-	jr nz, .asm_adc3b
+	jr nz, .afterVictory
 	call z, FuchsiaGymScript3_75497
 	call DisableWaitingAfterTextDisplay
-	jr .asm_e84c6
-.asm_adc3b
+	jr .done
+.afterVictory
 	ld hl, KogaExplainToxicText
 	call PrintText
-	jr .asm_e84c6
-.asm_181b6
+	jr .done
+.beginBattle
 	ld hl, KogaBeforeBattleText
 	call PrintText
 	ld hl, wd72d
@@ -171,7 +171,7 @@ FuchsiaGymText1:
 	ld [hJoyHeld], a
 	ld a, $3
 	ld [wFuchsiaGymCurScript], a
-.asm_e84c6
+.done
 	jp TextScriptEnd
 
 KogaBeforeBattleText:
-- 
cgit v1.2.3