From 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 4 Nov 2020 00:06:44 -0600
Subject: Sync with pokered

---
 scripts/Route15Gate2F.asm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'scripts/Route15Gate2F.asm')

diff --git a/scripts/Route15Gate2F.asm b/scripts/Route15Gate2F.asm
index 83763762..1b85e34e 100755
--- a/scripts/Route15Gate2F.asm
+++ b/scripts/Route15Gate2F.asm
@@ -6,13 +6,13 @@ Route15Gate2F_TextPointers:
 	dw Route15GateUpstairsText2
 
 Route15GateUpstairsText1:
-	TX_ASM
+	text_asm
 	CheckEvent EVENT_GOT_EXP_ALL
-	jr nz, .asm_49683
-	ld a, 50 ; pokemon needed
-	ld [hOaksAideRequirement], a
-	ld a, EXP_ALL ; oak's aide reward
-	ld [hOaksAideRewardItem], a
+	jr nz, .got_item
+	ld a, 50
+	ldh [hOaksAideRequirement], a
+	ld a, EXP_ALL
+	ldh [hOaksAideRewardItem], a
 	ld [wd11e], a
 	call GetItemName
 	ld hl, wcd6d
@@ -20,25 +20,25 @@ Route15GateUpstairsText1:
 	ld bc, ITEM_NAME_LENGTH
 	call CopyData
 	predef OaksAideScript
-	ld a, [hOaksAideResult]
-	cp $1
-	jr nz, .asm_49689
+	ldh a, [hOaksAideResult]
+	cp OAKS_AIDE_GOT_ITEM
+	jr nz, .no_item
 	SetEvent EVENT_GOT_EXP_ALL
-.asm_49683
+.got_item
 	ld hl, Route15GateUpstairsText_4968c
 	call PrintText
-.asm_49689
+.no_item
 	jp TextScriptEnd
 
 Route15GateUpstairsText_4968c:
-	TX_FAR _Route15GateUpstairsText_4968c
-	db "@"
+	text_far _Route15GateUpstairsText_4968c
+	text_end
 
 Route15GateUpstairsText2:
-	TX_ASM
+	text_asm
 	ld hl, Route15GateUpstairsText_49698
 	jp GateUpstairsScript_PrintIfFacingUp
 
 Route15GateUpstairsText_49698:
-	TX_FAR _Route15GateUpstairsText_49698
-	db "@"
+	text_far _Route15GateUpstairsText_49698
+	text_end
-- 
cgit v1.3.1-sl0p