summaryrefslogtreecommitdiff
path: root/scripts/Route11Gate2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Route11Gate2F.asm')
-rwxr-xr-xscripts/Route11Gate2F.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm
index c140937d..1fefc824 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,12 +42,12 @@ Route11GateUpstairsText2:
jr Route11GateUpstairsScriptEnd
Route11GateUpstairsText_494a3:
- TX_FAR _Route11GateUpstairsText_494a3
- db "@"
+ text_far _Route11GateUpstairsText_494a3
+ text_end
Route11GateUpstairsText3:
- TX_ASM
- ld a, [wSpriteStateData1 + 9]
+ text_asm
+ ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
jp nz, GateUpstairsScript_PrintIfFacingUp
CheckEvent EVENT_BEAT_ROUTE12_SNORLAX
@@ -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