diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/gba/defines.h | 5 | ||||
| -rw-r--r-- | include/graphics.h | 4 | ||||
| -rw-r--r-- | include/menu.h | 4 | ||||
| -rw-r--r-- | include/pokedex.h | 2 | ||||
| -rw-r--r-- | include/pokedex_area_markers.h | 6 | ||||
| -rw-r--r-- | include/pokedex_screen.h | 30 |
6 files changed, 31 insertions, 20 deletions
diff --git a/include/gba/defines.h b/include/gba/defines.h index 02d687ade..f0fce824e 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -51,8 +51,9 @@ #define BG_SCREEN_ADDR(n) (void *)(BG_VRAM + (BG_SCREEN_SIZE * (n))) #define BG_TILE_ADDR(n) (void *)(BG_VRAM + (0x80 * (n))) -#define BG_TILE_H_FLIP(n) (0x400 + (n)) -#define BG_TILE_V_FLIP(n) (0x800 + (n)) +#define BG_TILE_H_FLIP(n) (0x400 + (n)) +#define BG_TILE_V_FLIP(n) (0x800 + (n)) +#define BG_TILE_H_V_FLIP(n) (0xC00 + (n)) // text-mode BG #define OBJ_VRAM0 (void *)(VRAM + 0x10000) diff --git a/include/graphics.h b/include/graphics.h index 81b6b4ddf..533b88b4b 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4931,7 +4931,7 @@ extern const u16 gUnknown_8E9C3F8[]; extern const u16 gUnknown_8E9C418[]; // pokedex_screen -extern const u16 gUnknown_8E9C14C[]; -extern const u16 gUnknown_8E9C16C[]; +extern const u16 gDexScreen_TopMenuIconPals_AtoZ[]; +extern const u32 gDexScreen_TopMenuIconTiles_AtoZ[]; #endif //GUARD_GRAPHICS_H diff --git a/include/menu.h b/include/menu.h index 83bdcb4f6..5b12047ee 100644 --- a/include/menu.h +++ b/include/menu.h @@ -28,8 +28,8 @@ u8 Menu2_GetMonSpriteAnchorCoord(u16 species, u32 personality, u8 a2); s8 Menu2_GetMonSpriteAnchorCoordMinusx20(u16 species, u32 personality, u8 a2); // list_menu -void sub_8107CD8(u8 palOffset, u16 speciesId); -void sub_8107CF8(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y); +void ListMenu_LoadMonIconPalette(u8 palOffset, u16 speciesId); +void ListMenu_DrawMonIconGraphics(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y); void ListMenuLoadStdPalAt(u8 palOffset, u8 palId); void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y); diff --git a/include/pokedex.h b/include/pokedex.h index aad4849de..12f03e87d 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -48,6 +48,6 @@ bool16 HasAllHoennMons(void); bool16 HasAllKantoMons(void); bool16 HasAllMons(void); -u8 sub_8106B60(u16 species); +u8 DexScreen_RegisterMonToPokedex(u16 species); #endif // GUARD_POKEDEX_H diff --git a/include/pokedex_area_markers.h b/include/pokedex_area_markers.h index 47bbdf486..a9669a80a 100644 --- a/include/pokedex_area_markers.h +++ b/include/pokedex_area_markers.h @@ -12,8 +12,8 @@ struct PAM_TaskData }; void SetAreaSubsprite(s32 i, s32 whichArea, struct Subsprite * subsprites); -void sub_81343F4(u8 taskId); -u8 sub_8134230(u16 species, u16 tilesTag, u8 palIdx, u8 y); -u8 sub_81344E0(u8 taskId); +void Dtor_PokedexAreaMarkers(u8 taskId); +u8 Ctor_PokedexAreaMarkers(u16 species, u16 tilesTag, u8 palIdx, u8 y); +u8 PokedexAreaMarkers_Any(u8 taskId); #endif //GUARD_POKEDEX_AREA_MARKERS_H diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h index 128fc1ad3..a93e0ffcd 100644 --- a/include/pokedex_screen.h +++ b/include/pokedex_screen.h @@ -1,21 +1,31 @@ #ifndef GUARD_POKEDEX_SCREEN_H #define GUARD_POKEDEX_SCREEN_H -#define DEX_CATEGORY_GRASSLAND 0 -#define DEX_CATEGORY_FOREST 1 -#define DEX_CATEGORY_WATERS_EDGE 2 -#define DEX_CATEGORY_SEA 3 -#define DEX_CATEGORY_CAVE 4 -#define DEX_CATEGORY_MOUNTAIN 5 -#define DEX_CATEGORY_ROUGH_TERRAIN 6 -#define DEX_CATEGORY_URBAN 7 -#define DEX_CATEGORY_RARE 8 +#define DEX_CATEGORY_GRASSLAND 0 +#define DEX_CATEGORY_FOREST 1 +#define DEX_CATEGORY_WATERS_EDGE 2 +#define DEX_CATEGORY_SEA 3 +#define DEX_CATEGORY_CAVE 4 +#define DEX_CATEGORY_MOUNTAIN 5 +#define DEX_CATEGORY_ROUGH_TERRAIN 6 +#define DEX_CATEGORY_URBAN 7 +#define DEX_CATEGORY_RARE 8 +#define DEX_CATEGORY_COUNT 9 + +#define DEX_ORDER_NUMERICAL_KANTO 0 +#define DEX_ORDER_ATOZ 1 +#define DEX_ORDER_TYPE 2 +#define DEX_ORDER_LIGHTEST 3 +#define DEX_ORDER_SMALLEST 4 +#define DEX_ORDER_NUMERICAL_NATIONAL 5 + +#define DEX_MODE(name) (DEX_CATEGORY_COUNT + DEX_ORDER_##name) #include "pokedex.h" extern const struct PokedexEntry gPokedexEntries[]; void CB2_OpenPokedexFromStartMenu(void); -s8 sub_8104AB0(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies); +s8 DexScreen_GetSetPokedexFlag(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies); #endif //GUARD_POKEDEX_SCREEN_H |