diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /scripts/billshouse.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/billshouse.asm')
| -rwxr-xr-x | scripts/billshouse.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index 08ac98d6..04d3ee60 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -1,6 +1,6 @@ BillsHouseScript: ; 1e76a (7:676a) call EnableAutoTextBoxDrawing - ld a, [W_BILLSHOUSECURSCRIPT] + ld a, [wBillsHouseCurScript] ld hl, BillsHouseScriptPointers jp CallFunctionInTable @@ -26,7 +26,7 @@ BillsHouseScript1: ; 1e783 (7:6783) ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret MovementData_1e79c: ; 1e79c (7:679c) @@ -55,7 +55,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6) xor a ld [wJoyIgnore], a ld a, $3 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseScript3: ; 1e7c5 (7:67c5) @@ -84,7 +84,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5) ld de, MovementData_1e807 call MoveSprite ld a, $4 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret MovementData_1e807: ; 1e807 (7:6807) @@ -104,7 +104,7 @@ BillsHouseScript4: ; 1e80d (7:680d) SetEvent EVENT_MET_BILL_2 ; this event seems redundant SetEvent EVENT_MET_BILL ld a, $0 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseScript5: ; 1e827 (7:6827) @@ -112,7 +112,7 @@ BillsHouseScript5: ; 1e827 (7:6827) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $0 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseTextPointers: ; 1e834 (7:6834) @@ -136,7 +136,7 @@ BillsHouseText1: ; 1e83d (7:683d) ld hl, BillsHouseText_1e86a call PrintText ld a, $1 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a jr .asm_1e862 .asm_1e85a ld hl, BillsHouseText_1e86f @@ -163,7 +163,7 @@ BillsHouseText2: ; 1e874 (7:6874) jr nz, .asm_1e8a9 ld hl, BillThankYouText call PrintText - lb bc, S_S__TICKET, 1 + lb bc, S_S_TICKET, 1 call GiveItem jr nc, .BagFull ld hl, SSTicketReceivedText |