summaryrefslogtreecommitdiff
path: root/scripts/lavenderhouse2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lavenderhouse2.asm')
-rwxr-xr-xscripts/lavenderhouse2.asm27
1 files changed, 13 insertions, 14 deletions
diff --git a/scripts/lavenderhouse2.asm b/scripts/lavenderhouse2.asm
index c2120058..b531c047 100755
--- a/scripts/lavenderhouse2.asm
+++ b/scripts/lavenderhouse2.asm
@@ -1,36 +1,35 @@
-LavenderHouse2Script: ; 1d9ae (7:59ae)
+LavenderHouse2Script:
call EnableAutoTextBoxDrawing
ret
-LavenderHouse2TextPointers: ; 1d9b2 (7:59b2)
+LavenderHouse2TextPointers:
dw LavenderHouse2Text1
dw LavenderHouse2Text2
-LavenderHouse2Text1: ; 1d9b6 (7:59b6)
+LavenderHouse2Text1:
TX_FAR _LavenderHouse2Text1
- db $8
+ TX_ASM
ld a, CUBONE
call PlayCry
jp TextScriptEnd
-LavenderHouse2Text2: ; 1d9c3 (7:59c3)
- db $08 ; asm
- ld a, [wd7e0]
- bit 7, a
- jr nz, .asm_65711 ; 0x1d9c9
+LavenderHouse2Text2:
+ TX_ASM
+ CheckEvent EVENT_RESCUED_MR_FUJI
+ jr nz, .asm_65711
ld hl, LavenderHouse2Text_1d9dc
call PrintText
- jr .asm_64be1 ; 0x1d9d1
-.asm_65711 ; 0x1d9d3
+ jr .asm_64be1
+.asm_65711
ld hl, LavenderHouse2Text_1d9e1
call PrintText
-.asm_64be1 ; 0x1d9d9
+.asm_64be1
jp TextScriptEnd
-LavenderHouse2Text_1d9dc: ; 1d9dc (7:59dc)
+LavenderHouse2Text_1d9dc:
TX_FAR _LavenderHouse2Text_1d9dc
db "@"
-LavenderHouse2Text_1d9e1: ; 1d9e1 (7:59e1)
+LavenderHouse2Text_1d9e1:
TX_FAR _LavenderHouse2Text_1d9e1
db "@"