summaryrefslogtreecommitdiff
path: root/engine/predefs7.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-02-13 14:50:56 -0800
committeryenatch <yenatch@gmail.com>2015-02-13 14:50:56 -0800
commitb65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch)
tree151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/predefs7.asm
parentb35294752c55b5df88ccfc785279c36f30a43fd6 (diff)
parent7b7c563c93155e121e05149779cfb78b0bf9d259 (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/predefs7.asm')
-rwxr-xr-xengine/predefs7.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/predefs7.asm b/engine/predefs7.asm
index b6c3bbbc..9786c097 100755
--- a/engine/predefs7.asm
+++ b/engine/predefs7.asm
@@ -3,26 +3,26 @@ Func_1c9c6: ; 1c9c6 (7:49c6)
call PrintText
ld hl, wStringBuffer2 + 11
ld a, l
- ld [wcf8b], a
+ ld [wList], a
ld a, h
- ld [wcf8c], a
- ld a, [wListScrollOffset] ; wcc36
+ ld [wList + 1], a
+ ld a, [wListScrollOffset]
push af
xor a
- ld [wCurrentMenuItem], a ; wCurrentMenuItem
- ld [wListScrollOffset], a ; wcc36
+ ld [wCurrentMenuItem], a
+ ld [wListScrollOffset], a
ld [wcf93], a
ld a, $4
- ld [wListMenuID], a ; wListMenuID
+ ld [wListMenuID], a
call DisplayListMenuID
pop bc
ld a, b
- ld [wListScrollOffset], a ; wcc36
+ ld [wListScrollOffset], a
ret c
ld hl, wd126
set 7, [hl]
ld hl, wcc5b
- ld a, [wWhichPokemon] ; wWhichPokemon
+ ld a, [wWhichPokemon]
add a
ld d, $0
ld e, a