summaryrefslogtreecommitdiff
path: root/scripts/billshouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/billshouse.asm')
-rwxr-xr-xscripts/billshouse.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm
index 5d6d668f..8c800748 100755
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -1,7 +1,7 @@
BillsHouseScript: ; 1e76a (7:676a)
call BillsHouseScript_1e09e
call EnableAutoTextBoxDrawing
- ld a, [W_BILLSHOUSECURSCRIPT]
+ ld a, [wBillsHouseCurScript]
ld hl, BillsHouseScriptPointers
call JumpTable
ret
@@ -35,7 +35,7 @@ BillsHouseScript_1e09e:
.asm_1e0b3
ld a, $9
.asm_1e0b5
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
BillsHouseScript0: ; 1e782 (7:6782)
@@ -49,7 +49,7 @@ BillsHouseScript0: ; 1e782 (7:6782)
xor a
ld [wJoyIgnore], a
ld a, $1
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
BillsHouseScript1: ; 1e783 (7:6783)
@@ -72,7 +72,7 @@ BillsHouseScript2:
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $3
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
MovementData_1e79c: ; 1e79c (7:679c)
@@ -112,7 +112,7 @@ BillsHouseScript3: ; 1e7a6 (7:67a6)
ld [wJoyIgnore], a
SetEvent EVENT_BILL_SAID_USE_CELL_SEPARATOR
ld a, $4
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
PikachuMovementData_1e14d:
@@ -138,7 +138,7 @@ BillsHouseScript4: ; 1e7c5 (7:67c5)
ld a, $fc
ld [wJoyIgnore], a
ld a, $5
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
BillsHouseScript5:
@@ -182,7 +182,7 @@ BillsHouseScript5:
ld de, MovementData_1e807
call MoveSprite
ld a, $6
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
MovementData_1e807: ; 1e807 (7:6807)
@@ -205,7 +205,7 @@ BillsHouseScript6: ; 1e80d (7:680d)
SetEvent EVENT_MET_BILL_2 ; this event seems redundant
SetEvent EVENT_MET_BILL
ld a, $7
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
BillsHouseScript7:
@@ -222,7 +222,7 @@ BillsHouseScript7:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $8
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
RLE_1e219:
@@ -248,7 +248,7 @@ BillsHouseScript8:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $9
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
BillsHouseScript9: ; 1e827 (7:6827)