From 139a28ff9906d728a6820fe678a2a616eb309421 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 4 Jul 2020 17:09:35 -0400
Subject: Port pokecrystal's formatting of text commands and special characters

---
 scripts/Route11Gate2F.asm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'scripts/Route11Gate2F.asm')

diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm
index c140937d..f888d72f 100755
--- a/scripts/Route11Gate2F.asm
+++ b/scripts/Route11Gate2F.asm
@@ -8,7 +8,7 @@ Route11Gate2F_TextPointers:
 	dw Route11GateUpstairsText4
 
 Route11GateUpstairsText1:
-	TX_ASM
+	text_asm
 	xor a
 	ld [wWhichTrade], a
 	predef DoInGameTradeDialogue
@@ -16,7 +16,7 @@ Route11GateUpstairsScriptEnd:
 	jp TextScriptEnd
 
 Route11GateUpstairsText2:
-	TX_ASM
+	text_asm
 	CheckEvent EVENT_GOT_ITEMFINDER, 1
 	jr c, .asm_4949b
 	ld a, 30 ; pokemon needed
@@ -42,11 +42,11 @@ Route11GateUpstairsText2:
 	jr Route11GateUpstairsScriptEnd
 
 Route11GateUpstairsText_494a3:
-	TX_FAR _Route11GateUpstairsText_494a3
-	db "@"
+	text_far _Route11GateUpstairsText_494a3
+	text_end
 
 Route11GateUpstairsText3:
-	TX_ASM
+	text_asm
 	ld a, [wSpriteStateData1 + 9]
 	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.2.3


From 2b2ed54bbf017943ba2343cd6c1dbe88b8f34a4e Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 5 Jul 2020 17:29:11 -0400
Subject: Identify wSpriteStateData1 and wSpriteStateData2 offsets, like
 pokeyellow

---
 scripts/Route11Gate2F.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/Route11Gate2F.asm')

diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm
index f888d72f..1fefc824 100755
--- a/scripts/Route11Gate2F.asm
+++ b/scripts/Route11Gate2F.asm
@@ -47,7 +47,7 @@ Route11GateUpstairsText_494a3:
 
 Route11GateUpstairsText3:
 	text_asm
-	ld a, [wSpriteStateData1 + 9]
+	ld a, [wSpritePlayerStateData1FacingDirection]
 	cp SPRITE_FACING_UP
 	jp nz, GateUpstairsScript_PrintIfFacingUp
 	CheckEvent EVENT_BEAT_ROUTE12_SNORLAX
-- 
cgit v1.2.3