diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-09 15:28:03 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-09 15:28:03 -0500 |
| commit | 880fb511e19eb6aa413af1519731074c7ec8d852 (patch) | |
| tree | 5ec42b7bfbdb8996e90bdb7bc62356cd7638272e /engine/pokedex.asm | |
| parent | e3c686f6df866d1b393d9cc9e61a750a454b5270 (diff) | |
More WRAM organization
Diffstat (limited to 'engine/pokedex.asm')
| -rw-r--r-- | engine/pokedex.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 531684640..282b9ca91 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -117,7 +117,7 @@ Pokedex_CheckUnlockedUnownMode: ; 400a2 ret Pokedex_InitCursorPosition: ; 400b4 - ld hl, wPokedexDataStart + ld hl, wPokedexOrder ld a, [wLastDexEntry] and a jr z, .done @@ -1479,11 +1479,11 @@ Pokedex_PrintListing: ; 40b0f (10:4b0f) ld a, " " call Pokedex_FillBox -; Load de with wPokedexDataStart + [wDexListingScrollOffset] +; Load de with wPokedexOrder + [wDexListingScrollOffset] ld a, [wDexListingScrollOffset] ld e, a ld d, $0 - ld hl, wPokedexDataStart + ld hl, wPokedexOrder add hl, de ld e, l ld d, h @@ -1583,7 +1583,7 @@ Pokedex_GetSelectedMon: ; 40bb1 add [hl] ld e, a ld d, $0 - ld hl, wPokedexDataStart + ld hl, wPokedexOrder add hl, de ld a, [hl] ld [wd265], a @@ -1614,8 +1614,8 @@ Pokedex_CheckSeen: ; 40bd0 Pokedex_OrderMonsByMode: ; 40bdc - ld hl, wPokedexDataStart - ld bc, wPokedexMetadata - wPokedexDataStart + ld hl, wPokedexOrder + ld bc, wPokedexOrderEnd - wPokedexOrder xor a call ByteFill ld a, [wCurrentDexMode] @@ -1632,7 +1632,7 @@ Pokedex_OrderMonsByMode: ; 40bdc .NewMode: ; 40bf6 (10:4bf6) ld de, NewPokedexOrder - ld hl, wPokedexDataStart + ld hl, wPokedexOrder ld c, NUM_POKEMON .loopnew ld a, [de] @@ -1644,7 +1644,7 @@ Pokedex_OrderMonsByMode: ; 40bdc ret .OldMode: ; 40c08 (10:4c08) - ld hl, wPokedexDataStart + ld hl, wPokedexOrder ld a, $1 ld c, NUM_POKEMON .loopold @@ -1656,7 +1656,7 @@ Pokedex_OrderMonsByMode: ; 40bdc ret .FindLastSeen: ; 40c18 (10:4c18) - ld hl, wPokedexDataStart + NUM_POKEMON - 1 + ld hl, wPokedexOrder + NUM_POKEMON - 1 ld d, NUM_POKEMON ld e, d .loopfindend @@ -1675,7 +1675,7 @@ Pokedex_OrderMonsByMode: ; 40bdc Pokedex_ABCMode: ; 40c30 xor a ld [wDexListingEnd], a - ld hl, wPokedexDataStart + ld hl, wPokedexOrder ld de, AlphabeticalPokedexOrder ld c, NUM_POKEMON .loop1abc @@ -1915,8 +1915,8 @@ Pokedex_SearchForMons: ; 41086 add hl, de ld a, [hl] ld [wDexConvertedMonType], a - ld hl, wPokedexDataStart - ld de, wPokedexDataStart + ld hl, wPokedexOrder + ld de, wPokedexOrder ld c, NUM_POKEMON xor a ld [wDexSearchResultCount], a |