summaryrefslogtreecommitdiff
path: root/scripts/billshouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/billshouse.asm')
-rwxr-xr-xscripts/billshouse.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm
index b7e85f9a..71e61603 100755
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -51,7 +51,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6)
ld a, HS_BILL_POKEMON
ld [wcc4d], a
predef HideObject
- SetEvent EVENT_55E
+ SetEvent EVENT_BILL_SAID_USE_CELL_SEPARATOR
xor a
ld [wJoyIgnore], a
ld a, $3
@@ -59,7 +59,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6)
ret
BillsHouseScript3: ; 1e7c5 (7:67c5)
- CheckEvent EVENT_55B
+ CheckEvent EVENT_USED_CELL_SEPARATOR_ON_BILL
ret z
ld a, $f0
ld [wJoyIgnore], a
@@ -101,8 +101,8 @@ BillsHouseScript4: ; 1e80d (7:680d)
ret nz
xor a
ld [wJoyIgnore], a
- SetEvent EVENT_55D
- SetEvent EVENT_550
+ SetEvent EVENT_MET_BILL_2 ; this event seems redundant
+ SetEvent EVENT_MET_BILL
ld a, $0
ld [W_BILLSHOUSECURSCRIPT], a
ret
@@ -159,7 +159,7 @@ BillsHouseText_1e86f: ; 1e86f (7:686f)
BillsHouseText2: ; 1e874 (7:6874)
TX_ASM
- CheckEvent EVENT_55C
+ CheckEvent EVENT_GOT_SS_TICKET
jr nz, .asm_1e8a9
ld hl, BillThankYouText
call PrintText
@@ -168,7 +168,7 @@ BillsHouseText2: ; 1e874 (7:6874)
jr nc, .BagFull
ld hl, SSTicketReceivedText
call PrintText
- SetEvent EVENT_55C
+ SetEvent EVENT_GOT_SS_TICKET
ld a, HS_CERULEAN_GUARD_1
ld [wcc4d], a
predef ShowObject