summaryrefslogtreecommitdiff
path: root/scripts/route16house.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/route16house.asm')
-rwxr-xr-xscripts/route16house.asm18
1 files changed, 8 insertions, 10 deletions
diff --git a/scripts/route16house.asm b/scripts/route16house.asm
index 9a189757..ee23fd89 100755
--- a/scripts/route16house.asm
+++ b/scripts/route16house.asm
@@ -6,23 +6,21 @@ Route16HouseTextPointers: ; 1e5fb (7:65fb)
dw Route16HouseText2
Route16HouseText1: ; 1e5ff (7:65ff)
- db $08 ; asm
- ld a, [wd7e0]
- bit 6, a
+ TX_ASM
+ CheckEvent EVENT_GOT_HM02
ld hl, HM02ExplanationText
- jr nz, .asm_13616 ; 0x1e608
+ jr nz, .asm_13616
ld hl, Route16HouseText3
call PrintText
- ld bc, (HM_02 << 8) | 1
+ lb bc, HM_02, 1
call GiveItem
jr nc, .BagFull
- ld hl, wd7e0
- set 6, [hl]
+ SetEvent EVENT_GOT_HM02
ld hl, ReceivedHM02Text
- jr .asm_13616 ; 0x1e620
+ jr .asm_13616
.BagFull
ld hl, HM02NoRoomText
-.asm_13616 ; 0x1e625
+.asm_13616
call PrintText
jp TextScriptEnd
@@ -43,7 +41,7 @@ HM02NoRoomText: ; 1e63b (7:663b)
db "@"
Route16HouseText2: ; 1e640 (7:6640)
- db $08 ; asm
+ TX_ASM
ld hl, Route16HouseText_1e652
call PrintText
ld a, FEAROW