diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /engine/mart.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'engine/mart.asm')
| -rwxr-xr-x | engine/mart.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/mart.asm b/engine/mart.asm index 55c184737..4a8d9e17b 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -58,7 +58,7 @@ BargainShop: ; 15a84 ld a, [hli] or [hl] jr z, .skip_set - ld hl, DailyFlags + ld hl, wDailyFlags set 6, [hl] .skip_set @@ -81,7 +81,7 @@ Pharmacist: ; 15aae RooftopSale: ; 15ac4 ld b, BANK(RooftopSaleData1) ld de, RooftopSaleData1 - ld hl, StatusFlags + ld hl, wStatusFlags bit 6, [hl] ; hall of fame jr z, .ok ld b, BANK(RooftopSaleData2) |