From 594c58a289cbad3954899d76ed000f483389472f Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Thu, 16 Jul 2020 11:19:05 -0400
Subject: Revise some map scripts, mostly for getting items

---
 scripts/Route2Gate.asm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'scripts/Route2Gate.asm')

diff --git a/scripts/Route2Gate.asm b/scripts/Route2Gate.asm
index d9d30218..60f6ffe1 100755
--- a/scripts/Route2Gate.asm
+++ b/scripts/Route2Gate.asm
@@ -8,10 +8,10 @@ Route2Gate_TextPointers:
 Route2GateText1:
 	text_asm
 	CheckEvent EVENT_GOT_HM05
-	jr nz, .asm_5d60d
-	ld a, 10 ; pokemon needed
+	jr nz, .got_item
+	ld a, 10
 	ldh [hOaksAideRequirement], a
-	ld a, HM_FLASH ; oak's aide reward
+	ld a, HM_FLASH
 	ldh [hOaksAideRewardItem], a
 	ld [wd11e], a
 	call GetItemName
@@ -21,13 +21,13 @@ Route2GateText1:
 	call CopyData
 	predef OaksAideScript
 	ldh a, [hOaksAideResult]
-	cp $1
-	jr nz, .asm_5d613
+	cp OAKS_AIDE_GOT_ITEM
+	jr nz, .no_item
 	SetEvent EVENT_GOT_HM05
-.asm_5d60d
+.got_item
 	ld hl, Route2GateText_5d616
 	call PrintText
-.asm_5d613
+.no_item
 	jp TextScriptEnd
 
 Route2GateText_5d616:
-- 
cgit v1.2.3