diff options
Diffstat (limited to 'engine/pokedex')
| -rw-r--r-- | engine/pokedex/pokedex.asm | 2 | ||||
| -rw-r--r-- | engine/pokedex/pokedex_2.asm | 2 | ||||
| -rw-r--r-- | engine/pokedex/pokedex_3.asm | 2 | ||||
| -rwxr-xr-x | engine/pokedex/unown_dex.asm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 04b4a6472..2e36175ab 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -108,7 +108,7 @@ InitPokedex: ; 40063 Pokedex_CheckUnlockedUnownMode: ; 400a2 ld a, [wStatusFlags] - bit 1, a + bit STATUSFLAGS_UNOWN_DEX_F, a jr nz, .unlocked xor a diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm index a467fe02c..f8f5a34c5 100644 --- a/engine/pokedex/pokedex_2.asm +++ b/engine/pokedex/pokedex_2.asm @@ -240,7 +240,7 @@ GetDexEntryPointer: ; 44333 pop hl ret -.PokedexEntryBanks: ; 44351 +.PokedexEntryBanks: db BANK(PokedexEntries1) db BANK(PokedexEntries2) db BANK(PokedexEntries3) diff --git a/engine/pokedex/pokedex_3.asm b/engine/pokedex/pokedex_3.asm index f5247f2da..51399f434 100644 --- a/engine/pokedex/pokedex_3.asm +++ b/engine/pokedex/pokedex_3.asm @@ -21,7 +21,7 @@ LoadQuestionMarkPic: ; 1de0d7 ret .QuestionMarkLZ: ; 1de0e1 -INCBIN "gfx/pokemon/questionmark/front.2bpp.lz" +INCBIN "gfx/pokedex/question_mark.2bpp.lz" DrawPokedexListWindow: ; 1de171 (77:6171) ld a, $32 diff --git a/engine/pokedex/unown_dex.asm b/engine/pokedex/unown_dex.asm index cc3d4a273..a35a266b7 100755 --- a/engine/pokedex/unown_dex.asm +++ b/engine/pokedex/unown_dex.asm @@ -49,4 +49,4 @@ PrintUnownWord: ; fba2e (3e:7a2e) ; fba5a (3e:7a5a) -INCLUDE "data/unown_words.asm" +INCLUDE "data/pokemon/unown_words.asm" |