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/Route11Gate2F.asm | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'scripts/Route11Gate2F.asm')

diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm
index fde7fdd6..65352cd9 100755
--- a/scripts/Route11Gate2F.asm
+++ b/scripts/Route11Gate2F.asm
@@ -8,21 +8,21 @@ Route11Gate2F_TextPointers:
 	dw Route11GateUpstairsText4
 
 Route11GateUpstairsText1:
-	TX_ASM
-	ld a, $0
+	text_asm
+	ld a, TRADE_FOR_TERRY
 	ld [wWhichTrade], a
 	predef DoInGameTradeDialogue
 Route11GateUpstairsScriptEnd:
 	jp TextScriptEnd
 
 Route11GateUpstairsText2:
-	TX_ASM
+	text_asm
 	CheckEvent EVENT_GOT_ITEMFINDER, 1
-	jr c, .asm_4949b
-	ld a, 30 ; pokemon needed
-	ld [hOaksAideRequirement], a
-	ld a, ITEMFINDER ; oak's aide reward
-	ld [hOaksAideRewardItem], a
+	jr c, .got_item
+	ld a, 30
+	ldh [hOaksAideRequirement], a
+	ld a, ITEMFINDER
+	ldh [hOaksAideRewardItem], a
 	ld [wd11e], a
 	call GetItemName
 	ld h, d
@@ -31,22 +31,22 @@ Route11GateUpstairsText2:
 	ld bc, ITEM_NAME_LENGTH
 	call CopyData
 	predef OaksAideScript
-	ld a, [hOaksAideResult]
-	dec a
-	jr nz, .asm_494a1
+	ldh a, [hOaksAideResult]
+	dec a ; OAKS_AIDE_GOT_ITEM?
+	jr nz, .no_item
 	SetEvent EVENT_GOT_ITEMFINDER
-.asm_4949b
+.got_item
 	ld hl, Route11GateUpstairsText_494a3
 	call PrintText
-.asm_494a1
+.no_item
 	jr Route11GateUpstairsScriptEnd
 
 Route11GateUpstairsText_494a3:
-	TX_FAR _Route11GateUpstairsText_494a3
-	db "@"
+	text_far _Route11GateUpstairsText_494a3
+	text_end
 
 Route11GateUpstairsText3:
-	TX_ASM
+	text_asm
 	ld a, [wSpritePlayerStateData1FacingDirection]
 	cp SPRITE_FACING_UP
 	jp nz, GateUpstairsScript_PrintIfFacingUp
@@ -59,18 +59,18 @@ Route11GateUpstairsText3:
 	jp TextScriptEnd
 
 BinocularsSnorlaxText:
-	TX_FAR _BinocularsSnorlaxText
-	db "@"
+	text_far _BinocularsSnorlaxText
+	text_end
 
 BinocularsNoSnorlaxText:
-	TX_FAR _BinocularsNoSnorlaxText
-	db "@"
+	text_far _BinocularsNoSnorlaxText
+	text_end
 
 Route11GateUpstairsText4:
-	TX_ASM
+	text_asm
 	ld hl, Route11GateUpstairsText_494d5
 	jp GateUpstairsScript_PrintIfFacingUp
 
 Route11GateUpstairsText_494d5:
-	TX_FAR _Route11GateUpstairsText_494d5
-	db "@"
+	text_far _Route11GateUpstairsText_494d5
+	text_end
-- 
cgit v1.3.1-sl0p