diff options
Diffstat (limited to 'engine/menu')
| -rwxr-xr-x | engine/menu/pokedex.asm | 42 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 1 |
2 files changed, 0 insertions, 43 deletions
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 2da3a0f6..4c5479a5 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -77,7 +77,6 @@ HandlePokedexSideMenu: call IsPokemonBitSet ld b,2 jr z,.exitSideMenu - call PokedexToIndex ld hl,wTopMenuItemY ld a,10 ld [hli],a ; top menu item Y @@ -265,7 +264,6 @@ HandlePokedexListMenu: .dashedLine ; for unseen pokemon in the list db "----------@" .getPokemonName - call PokedexToIndex call GetMonName .skipGettingName pop hl @@ -473,7 +471,6 @@ ShowPokedexDataInternal: push de ld a,[wd11e] push af - call IndexToPokedex coord hl, 2, 8 ld a, "№" @@ -624,42 +621,3 @@ DrawTileLine: ret INCLUDE "data/pokedex_entries.asm" - -PokedexToIndex: - ; converts the Pokédex number at wd11e to an index - push bc - push hl - ld a,[wd11e] - ld b,a - ld c,0 - ld hl,PokedexOrder - -.loop ; go through the list until we find an entry with a matching dex number - inc c - ld a,[hli] - cp b - jr nz,.loop - - ld a,c - ld [wd11e],a - pop hl - pop bc - ret - -IndexToPokedex: - ; converts the indexédex number at wd11e to a Pokédex number - push bc - push hl - ld a,[wd11e] - dec a - ld hl,PokedexOrder - ld b,0 - ld c,a - add hl,bc - ld a,[hl] - ld [wd11e],a - pop hl - pop bc - ret - -INCLUDE "data/pokedex_order.asm" diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index ef94f13c..dc40d615 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -141,7 +141,6 @@ StatusScreen: ld a, [wMonHIndex] ld [wd11e], a ld [wd0b5], a - predef IndexToPokedex coord hl, 3, 7 ld de, wd11e lb bc, LEADING_ZEROES | 1, 3 |