summaryrefslogtreecommitdiff
path: root/scripts/LavenderCuboneHouse.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
committerdannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
commit5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch)
treedde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /scripts/LavenderCuboneHouse.asm
parent53fcd05aa24693093d8af1dc8ec4fedd3957decc (diff)
Sync with pokered
Diffstat (limited to 'scripts/LavenderCuboneHouse.asm')
-rwxr-xr-xscripts/LavenderCuboneHouse.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/LavenderCuboneHouse.asm b/scripts/LavenderCuboneHouse.asm
index ff5aa732..69d74ede 100755
--- a/scripts/LavenderCuboneHouse.asm
+++ b/scripts/LavenderCuboneHouse.asm
@@ -7,29 +7,29 @@ LavenderCuboneHouse_TextPointers:
dw LavenderHouse2Text2
LavenderHouse2Text1:
- TX_FAR _LavenderHouse2Text1
- TX_ASM
+ text_far _LavenderHouse2Text1
+ text_asm
ld a, CUBONE
call PlayCry
jp TextScriptEnd
LavenderHouse2Text2:
- TX_ASM
+ text_asm
CheckEvent EVENT_RESCUED_MR_FUJI
- jr nz, .asm_65711
+ jr nz, .rescued_mr_fuji
ld hl, LavenderHouse2Text_1d9dc
call PrintText
- jr .asm_64be1
-.asm_65711
+ jr .done
+.rescued_mr_fuji
ld hl, LavenderHouse2Text_1d9e1
call PrintText
-.asm_64be1
+.done
jp TextScriptEnd
LavenderHouse2Text_1d9dc:
- TX_FAR _LavenderHouse2Text_1d9dc
- db "@"
+ text_far _LavenderHouse2Text_1d9dc
+ text_end
LavenderHouse2Text_1d9e1:
- TX_FAR _LavenderHouse2Text_1d9e1
- db "@"
+ text_far _LavenderHouse2Text_1d9e1
+ text_end