diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/core.asm | 2 | ||||
| -rwxr-xr-x | engine/evos_moves.asm | 3 | ||||
| -rwxr-xr-x | engine/give_pokemon.asm | 2 | ||||
| -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 | 2 | ||||
| -rwxr-xr-x | engine/palettes.asm | 7 | ||||
| -rwxr-xr-x | engine/predefs.asm | 1 | ||||
| -rwxr-xr-x | engine/trade2.asm | 2 |
10 files changed, 0 insertions, 63 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d1fd27f1..30d6ee2f 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6336,8 +6336,6 @@ LoadEnemyMonData: 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 f50f8081..6fa34585 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -157,8 +157,6 @@ Evolution_PartyMonLoop: ; loop over party mons push af ld a, [wd0b5] ld [wd11e], a - predef IndexToPokedex - ld a, [wd11e] dec a ld hl, BaseStats ld bc, MonBaseStatsEnd - MonBaseStats @@ -213,7 +211,6 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [wIsInBattle] 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 49596782..007e75d2 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -55,8 +55,6 @@ SetPokedexOwnedFlag: 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 f8873a6e..4806b7dd 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -518,7 +518,6 @@ ItemUseBall: call PrintText ; Add the caught Pokémon to the Pokédex. - predef IndexToPokedex ld a,[wd11e] dec a ld c,a 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 diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index 864ac136..5f270b00 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -398,8 +398,6 @@ WriteMonPartySpriteOAM: GetPartyMonSpriteID: 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 4f535413..1dcfd28f 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -275,13 +275,6 @@ DeterminePaletteID: ld a, [hl] DeterminePaletteIDOutOfBattle: 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 7b0be1e9..fccb6661 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -110,7 +110,6 @@ PredefPointers:: 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 062d5285..4cdba12d 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -4,7 +4,6 @@ Trade_PrintPlayerMonInfoText: 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: call PlaceString ld a,[wTradedEnemyMonSpecies] ld [wd11e],a - predef IndexToPokedex coord hl, 9, 10 ld de,wd11e lb bc, LEADING_ZEROES | 1, 3 |