diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/core.asm | 3 | ||||
| -rwxr-xr-x | engine/evos_moves.asm | 4 | ||||
| -rwxr-xr-x | engine/give_pokemon.asm | 3 | ||||
| -rwxr-xr-x | engine/items/items.asm | 1 | ||||
| -rwxr-xr-x | engine/menu/pokedex.asm | 42 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 1 | ||||
| -rwxr-xr-x | engine/mon_party_sprites.asm | 3 | ||||
| -rwxr-xr-x | engine/palettes.asm | 8 | ||||
| -rwxr-xr-x | engine/predefs.asm | 1 | ||||
| -rwxr-xr-x | engine/trade2.asm | 2 |
10 files changed, 0 insertions, 68 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 0b534dda..16e256ec 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6337,9 +6337,6 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) ld bc, NAME_LENGTH call CopyData ld a, [wEnemyMonSpecies2] - ld [wd11e], a - predef IndexToPokedex - ld a, [wd11e] dec a ld c, a ld b, FLAG_SET diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 056c125e..0e169b58 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -156,9 +156,6 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [wd11e] push af ld a, [wd0b5] - ld [wd11e], a - predef IndexToPokedex - ld a, [wd11e] dec a ld hl, BaseStats ld bc, MonBaseStatsEnd - MonBaseStats @@ -213,7 +210,6 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [W_ISINBATTLE] and a call z, Evolution_ReloadTilesetTilePatterns - predef IndexToPokedex ld a, [wd11e] dec a ld c, a diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 02e2b743..70579881 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -54,9 +54,6 @@ _GivePokemon: ; 4fda5 (13:7da5) SetPokedexOwnedFlag: ; 4fe11 (13:7e11) ld a, [wcf91] push af - ld [wd11e], a - predef IndexToPokedex - ld a, [wd11e] dec a ld c, a ld hl, wPokedexOwned diff --git a/engine/items/items.asm b/engine/items/items.asm index f0666587..8df2edd1 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -396,7 +396,6 @@ ItemUseBall: ; d687 (3:5687) jr z,.printText1 ld hl,ItemUseBallText05 call PrintText - predef IndexToPokedex ld a,[wd11e] dec a ld c,a diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index a58523e8..1215bbe4 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -77,7 +77,6 @@ HandlePokedexSideMenu: ; 4006d (10:406d) call IsPokemonBitSet ld b,2 jr z,.exitSideMenu - call PokedexToIndex ld hl,wTopMenuItemY ld a,10 ld [hli],a ; top menu item Y @@ -260,7 +259,6 @@ HandlePokedexListMenu: ; 40111 (10:4111) .dashedLine ; for unseen pokemon in the list db "----------@" .getPokemonName - call PokedexToIndex call GetMonName .skipGettingName pop hl @@ -460,7 +458,6 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) push de ld a,[wd11e] push af - call IndexToPokedex coord hl, 2, 8 ld a, "№" ld [hli],a @@ -604,42 +601,3 @@ DrawTileLine: ; 40474 (10:4474) ret INCLUDE "data/pokedex_entries.asm" - -PokedexToIndex: ; 40ff9 (10:4ff9) - ; 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: ; 41010 (10:5010) - ; 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 c91d5eda..e22ccfb3 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -141,7 +141,6 @@ StatusScreen: ; 12953 (4:6953) ld a, [W_MONHINDEX] ld [wd11e], a ld [wd0b5], a - predef IndexToPokedex coord hl, 3, 7 ld de, wd11e lb bc, LEADING_ZEROES | 1, 3 diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index 185151cb..42e73e37 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -397,9 +397,6 @@ WriteMonPartySpriteOAM: ; 718c3 (1c:58c3) jp CopyData GetPartyMonSpriteID: ; 718e9 (1c:58e9) - ld [wd11e], a - predef IndexToPokedex - ld a, [wd11e] ld c, a dec a srl a diff --git a/engine/palettes.asm b/engine/palettes.asm index 55d488aa..bfeee54e 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -274,14 +274,6 @@ DeterminePaletteID: ; 71f97 (1c:5f97) ret nz ld a, [hl] DeterminePaletteIDOutOfBattle: ; 71f9d (1c:5f9d) - ld [wd11e], a - and a ; is the mon index 0? - jr z, .skipDexNumConversion - push bc - predef IndexToPokedex - pop bc - ld a, [wd11e] -.skipDexNumConversion ld e, a ld d, 0 ld hl, MonsterPalettes ; not just for Pokemon, Trainers use it too diff --git a/engine/predefs.asm b/engine/predefs.asm index 16533751..ae9a9c1d 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -110,7 +110,6 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef StatusScreen2 add_predef InternalClockTradeAnim add_predef TrainerEngage - add_predef IndexToPokedex add_predef DisplayPicCenteredOrUpperRight add_predef UsedCut add_predef ShowPokedexData diff --git a/engine/trade2.asm b/engine/trade2.asm index 10bef792..3da9fe2f 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -4,7 +4,6 @@ Trade_PrintPlayerMonInfoText: ; 42769 (10:6769) call PlaceString ld a,[wTradedPlayerMonSpecies] ld [wd11e],a - predef IndexToPokedex coord hl, 9, 0 ld de,wd11e lb bc, LEADING_ZEROES | 1, 3 @@ -26,7 +25,6 @@ Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7) call PlaceString ld a,[wTradedEnemyMonSpecies] ld [wd11e],a - predef IndexToPokedex coord hl, 9, 10 ld de,wd11e lb bc, LEADING_ZEROES | 1, 3 |