diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /engine/predefs7.asm | |
| parent | 15427f532085846ab6b51719be687951a094cb6c (diff) | |
| parent | 9f29f21d9d43baa7124991dcf3b093fc6c615706 (diff) | |
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'engine/predefs7.asm')
| -rwxr-xr-x | engine/predefs7.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/predefs7.asm b/engine/predefs7.asm index a52a71cc..469fe0c4 100755 --- a/engine/predefs7.asm +++ b/engine/predefs7.asm @@ -1,28 +1,28 @@ Func_1c9c6: ; 1c9c6 (7:49c6) ld hl, WhichFloorText call PrintText - ld hl, $cf7b + ld hl, wStringBuffer2 + 11 ld a, l - ld [$cf8b], a + ld [wcf8b], a ld a, h - ld [$cf8c], a - ld a, [wListScrollOffset] ; $cc36 + ld [wcf8c], a + ld a, [wListScrollOffset] ; wcc36 push af xor a - ld [wCurrentMenuItem], a ; $cc26 - ld [wListScrollOffset], a ; $cc36 - ld [$cf93], a + ld [wCurrentMenuItem], a ; wCurrentMenuItem + ld [wListScrollOffset], a ; wcc36 + ld [wcf93], a ld a, $4 - ld [wListMenuID], a ; $cf94 + ld [wListMenuID], a ; wListMenuID call DisplayListMenuID pop bc ld a, b - ld [wListScrollOffset], a ; $cc36 + ld [wListScrollOffset], a ; wcc36 ret c - ld hl, $d126 + ld hl, wd126 set 7, [hl] - ld hl, $cc5b - ld a, [wWhichPokemon] ; $cf92 + ld hl, wcc5b + ld a, [wWhichPokemon] ; wWhichPokemon add a ld d, $0 ld e, a @@ -31,7 +31,7 @@ Func_1c9c6: ; 1c9c6 (7:49c6) ld b, a ld a, [hl] ld c, a - ld hl, $d3af + ld hl, wd3af call Func_1ca0d Func_1ca0d: ; 1ca0d (7:4a0d) |