aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/pokemart.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-16 23:27:57 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-16 23:27:57 -0500
commit40ea6a5f757bbbfdb4296e5acf644f6679a03a14 (patch)
tree2f7957bfa877ce974ad185684f037ba5b6cdfccd /engine/overworld/pokemart.asm
parentSwap trade center and battle center (diff)
parentMerge pull request #101 from YamaArashi/master (diff)
downloadpokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.tar.gz
pokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.tar.xz
pokeyellow-40ea6a5f757bbbfdb4296e5acf644f6679a03a14.zip
Merge branch 'master' of https://github.com/iimarckus/pokered
Diffstat (limited to 'engine/overworld/pokemart.asm')
-rwxr-xr-xengine/overworld/pokemart.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm
index de18a1ab..2caada1d 100755
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -57,9 +57,9 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
call DisplayTextBoxID ; draw money text box
ld hl,wNumBagItems
ld a,l
- ld [wList],a
+ ld [wListPointer],a
ld a,h
- ld [wList + 1],a
+ ld [wListPointer + 1],a
xor a
ld [wPrintItemPrices],a
ld [wCurrentMenuItem],a
@@ -136,11 +136,11 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
ld a,MONEY_BOX
ld [wTextBoxID],a
call DisplayTextBoxID
- ld hl,wStringBuffer2 + 11
+ ld hl,wItemList
ld a,l
- ld [wList],a
+ ld [wListPointer],a
ld a,h
- ld [wList + 1],a
+ ld [wListPointer + 1],a
xor a
ld [wCurrentMenuItem],a
inc a