diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
| commit | f5983c0f813d3d908b6016db3ed866e4ca9437dc (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /scripts/billshouse2.asm | |
| parent | 041c4f28a3c35e31329222769534942439b70f29 (diff) | |
| parent | 401d6e7f36e86aa246a2c0591195e1f0f01e879f (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/billshouse2.asm')
| -rwxr-xr-x | scripts/billshouse2.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/billshouse2.asm b/scripts/billshouse2.asm index 2ae17ae6..87016aa8 100755 --- a/scripts/billshouse2.asm +++ b/scripts/billshouse2.asm @@ -9,7 +9,7 @@ Func_f2418: ld hl, BillsHouseText_f2440 call PrintText ld a, $2 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret .asm_f2433 @@ -83,13 +83,13 @@ BillsHouseText_f24a9: TX_FAR _BillsHouseText_1e8da db "@" -Func_f24ae: ; f24ae +Func_f24ae: ld a, [wCurMap] cp BILLS_HOUSE jr nz, .asm_f24d2 call CheckPikachuFollowingPlayer jr z, .asm_f24d2 - ld a, [W_BILLSHOUSECURSCRIPT] + ld a, [wBillsHouseCurScript] cp $5 ld e, $1b ret z |