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 3abbeb7a..c7fd74f9 100755
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -1,7 +1,7 @@
BillsHouseScript:
call BillsHouseScript_1e09e
call EnableAutoTextBoxDrawing
- ld a, [W_BILLSHOUSECURSCRIPT]
+ ld a, [wBillsHouseCurScript]
ld hl, BillsHouseScriptPointers
call JumpTable
ret
@@ -34,7 +34,7 @@ BillsHouseScript_1e09e:
.asm_1e0b3
ld a, $9
.asm_1e0b5
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
BillsHouseScript0:
@@ -48,7 +48,7 @@ BillsHouseScript0:
xor a
ld [wJoyIgnore], a
ld a, $1
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
BillsHouseScript1:
@@ -71,7 +71,7 @@ BillsHouseScript2:
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, $3
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
MovementData_1e79c:
@@ -111,7 +111,7 @@ BillsHouseScript3:
ld [wJoyIgnore], a
SetEvent EVENT_BILL_SAID_USE_CELL_SEPARATOR
ld a, $4
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
PikachuMovementData_1e14d:
@@ -137,7 +137,7 @@ BillsHouseScript4:
ld a, $fc
ld [wJoyIgnore], a
ld a, $5
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
BillsHouseScript5:
@@ -181,7 +181,7 @@ BillsHouseScript5:
ld de, MovementData_1e807
call MoveSprite
ld a, $6
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
MovementData_1e807:
@@ -204,7 +204,7 @@ BillsHouseScript6:
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:
@@ -221,7 +221,7 @@ BillsHouseScript7:
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $8
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
RLE_1e219:
@@ -247,7 +247,7 @@ BillsHouseScript8:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $9
- ld [W_BILLSHOUSECURSCRIPT], a
+ ld [wBillsHouseCurScript], a
ret
BillsHouseScript9: