diff options
author | dannye <corrnondacqb@yahoo.com> | 2015-07-19 03:52:20 -0500 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2015-07-19 03:52:20 -0500 |
commit | 64b4cf624fe2175e2c7539b91bc41b6dae28a00e (patch) | |
tree | 971ea955f5d40af7612f7b69029b49db98064690 /scripts/museum1f.asm | |
parent | ea9cc86949cecc3508aeac06b807372b6b0134d8 (diff) | |
parent | d0526c036210d2ee186a2a45feac91747ef6fb85 (diff) |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/evos_moves.asm
engine/overworld/healing_machine.asm
Diffstat (limited to 'scripts/museum1f.asm')
-rwxr-xr-x | scripts/museum1f.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index f41f05ff..32e489ca 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -96,11 +96,11 @@ Museum1FText1: ; 5c135 (17:4135) ld hl, wd754 set 0, [hl] xor a - ld [wMuseumPriceTemp], a - ld [wMuseumPriceTemp + 1], a + ld [wPriceTemp], a + ld [wPriceTemp + 1], a ld a, $50 - ld [wMuseumPriceTemp + 2], a - ld hl, wMuseumPriceTemp + 2 + ld [wPriceTemp + 2], a + ld hl, wPriceTemp + 2 ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef |