Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-19 11:36:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed dex_mode macro, merged dex_category and dex_order indices

Browse Source
This commit is contained in:
cawtds 2024-05-21 18:30:44 +02:00
parent f6403670f4
commit f5568b0aae
2 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/pokedex_screen.h
View File

@ -1,30 +1,26 @@
#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_COUNT 9
#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_ORDER_NUMERICAL_KANTO 9
#define DEX_ORDER_ATOZ 10
#define DEX_ORDER_TYPE 11
#define DEX_ORDER_LIGHTEST 12
#define DEX_ORDER_SMALLEST 13
#define DEX_ORDER_NUMERICAL_NATIONAL 14
#define DEX_ORDER_NUMERICAL_KANTO 1
#define DEX_ORDER_ATOZ 2
#define DEX_ORDER_TYPE 3
#define DEX_ORDER_LIGHTEST 4
#define DEX_ORDER_SMALLEST 5
#define DEX_ORDER_NUMERICAL_NATIONAL 6
#define DEX_MODE(name) (DEX_CATEGORY_COUNT + DEX_ORDER_##name - 1)
#define DEX_ORDER_START DEX_ORDER_NUMERICAL_KANTO
#include "pokedex.h"
// extern const struct PokedexEntry gPokedexEntries[];
void CB2_OpenPokedexFromStartMenu(void);
s8 DexScreen_GetSetPokedexFlag(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies);

52
src/pokedex_screen.c
View File

@ -323,7 +323,7 @@ static const struct WindowTemplate sWindowTemplate_DexCounts = {
static const struct ListMenuItem sListMenuItems_KantoDexModeSelect[] = {
{gText_PokemonList, LIST_HEADER},
{gText_NumericalMode, DEX_MODE(NUMERICAL_KANTO)},
{gText_NumericalMode, DEX_ORDER_NUMERICAL_KANTO},
{gText_PokemonHabitats, LIST_HEADER},
{gText_DexCategory_GrasslandPkmn, DEX_CATEGORY_GRASSLAND},
{gText_DexCategory_ForestPkmn, DEX_CATEGORY_FOREST},
@ -335,10 +335,10 @@ static const struct ListMenuItem sListMenuItems_KantoDexModeSelect[] = {
{gText_DexCategory_UrbanPkmn, DEX_CATEGORY_URBAN},
{gText_DexCategory_RarePkmn, DEX_CATEGORY_RARE},
{gText_Search, LIST_HEADER},
{gText_AToZMode, DEX_MODE(ATOZ)},
{gText_TypeMode, DEX_MODE(TYPE)},
{gText_LightestMode, DEX_MODE(LIGHTEST)},
{gText_SmallestMode, DEX_MODE(SMALLEST)},
{gText_AToZMode, DEX_ORDER_ATOZ},
{gText_TypeMode, DEX_ORDER_TYPE},
{gText_LightestMode, DEX_ORDER_LIGHTEST},
{gText_SmallestMode, DEX_ORDER_SMALLEST},
{gText_PokedexOther, LIST_HEADER},
{gText_ClosePokedex, LIST_CANCEL},
};
@ -366,8 +366,8 @@ static const struct ListMenuTemplate sListMenuTemplate_KantoDexModeSelect = {
static const struct ListMenuItem sListMenuItems_NatDexModeSelect[] = {
{gText_PokemonList, LIST_HEADER},
{gText_NumericalModeKanto, DEX_MODE(NUMERICAL_KANTO)},
{gText_NumericalModeNational, DEX_MODE(NUMERICAL_NATIONAL)},
{gText_NumericalModeKanto, DEX_ORDER_NUMERICAL_KANTO},
{gText_NumericalModeNational, DEX_ORDER_NUMERICAL_NATIONAL},
{gText_PokemonHabitats, LIST_HEADER},
{gText_DexCategory_GrasslandPkmn, DEX_CATEGORY_GRASSLAND},
{gText_DexCategory_ForestPkmn, DEX_CATEGORY_FOREST},
@ -379,10 +379,10 @@ static const struct ListMenuItem sListMenuItems_NatDexModeSelect[] = {
{gText_DexCategory_UrbanPkmn, DEX_CATEGORY_URBAN},
{gText_DexCategory_RarePkmn, DEX_CATEGORY_RARE},
{gText_Search, LIST_HEADER},
{gText_AToZMode, DEX_MODE(ATOZ)},
{gText_TypeMode, DEX_MODE(TYPE)},
{gText_LightestMode, DEX_MODE(LIGHTEST)},
{gText_SmallestMode, DEX_MODE(SMALLEST)},
{gText_AToZMode, DEX_ORDER_ATOZ},
{gText_TypeMode, DEX_ORDER_TYPE},
{gText_LightestMode, DEX_ORDER_LIGHTEST},
{gText_SmallestMode, DEX_ORDER_SMALLEST},
{gText_PokedexOther, LIST_HEADER},
{gText_ClosePokedex, LIST_CANCEL},
};
@ -474,27 +474,27 @@ static const struct PokedexScreenWindowGfx sTopMenuSelectionIconGfxPtrs[] = {
.tiles = sTopMenuIconTiles_Rare,
.pal = sTopMenuIconPals_Rare
},
[DEX_MODE(NUMERICAL_KANTO)] = {
[DEX_ORDER_NUMERICAL_KANTO] = {
.tiles = sTopMenuIconTiles_Numerical,
.pal = sTopMenuIconPals_Numerical
},
[DEX_MODE(ATOZ)] = {
[DEX_ORDER_ATOZ] = {
.tiles = gDexScreen_TopMenuIconTiles_AtoZ,
.pal = gDexScreen_TopMenuIconPals_AtoZ
},
[DEX_MODE(TYPE)] = {
[DEX_ORDER_TYPE] = {
.tiles = sTopMenuIconTiles_Type,
.pal = sTopMenuIconPals_Type
},
[DEX_MODE(LIGHTEST)] = {
[DEX_ORDER_LIGHTEST] = {
.tiles = sTopMenuIconTiles_Lightest,
.pal = sTopMenuIconPals_Lightest
},
[DEX_MODE(SMALLEST)] = {
[DEX_ORDER_SMALLEST] = {
.tiles = sTopMenuIconTiles_Smallest,
.pal = sTopMenuIconPals_Smallest
},
[DEX_MODE(NUMERICAL_NATIONAL)] = {
[DEX_ORDER_NUMERICAL_NATIONAL] = {
.tiles = sTopMenuIconTiles_Numerical,
.pal = sTopMenuIconPals_Numerical
},
@ -1070,19 +1070,19 @@ static void Task_PokedexScreen(u8 taskId)
sPokedexScreenData->state = 7;
}
break;
case DEX_MODE(NUMERICAL_KANTO):
case DEX_MODE(NUMERICAL_NATIONAL):
case DEX_ORDER_NUMERICAL_KANTO:
case DEX_ORDER_NUMERICAL_NATIONAL:
RemoveScrollIndicatorArrowPair(sPokedexScreenData->scrollArrowsTaskId);
sPokedexScreenData->dexOrderId = sPokedexScreenData->modeSelectInput - DEX_CATEGORY_COUNT + 1;
sPokedexScreenData->dexOrderId = sPokedexScreenData->modeSelectInput;
BeginNormalPaletteFade(~0x8000, 0, 0, 16, RGB_WHITEALPHA);
sPokedexScreenData->state = 9;
break;
case DEX_MODE(ATOZ):
case DEX_MODE(TYPE):
case DEX_MODE(LIGHTEST):
case DEX_MODE(SMALLEST):
case DEX_ORDER_ATOZ:
case DEX_ORDER_TYPE:
case DEX_ORDER_LIGHTEST:
case DEX_ORDER_SMALLEST:
RemoveScrollIndicatorArrowPair(sPokedexScreenData->scrollArrowsTaskId);
sPokedexScreenData->dexOrderId = sPokedexScreenData->modeSelectInput - DEX_CATEGORY_COUNT + 1;
sPokedexScreenData->dexOrderId = sPokedexScreenData->modeSelectInput;
sPokedexScreenData->characteristicOrderMenuItemsAbove = sPokedexScreenData->characteristicOrderMenuCursorPos = 0;
BeginNormalPaletteFade(~0x8000, 0, 0, 16, RGB_WHITEALPHA);
sPokedexScreenData->state = 8;
@ -1198,7 +1198,7 @@ static void MoveCursorFunc_DexModeSelect(s32 itemIndex, bool8 onInit, struct Lis
static void ItemPrintFunc_DexModeSelect(u8 windowId, u32 itemId, u8 y)
{
if (itemId >= DEX_CATEGORY_COUNT || sPokedexScreenData->unlockedCategories & (1 << itemId))
if (itemId >= DEX_ORDER_START || sPokedexScreenData->unlockedCategories & (1 << itemId))
ListMenuOverrideSetColors(TEXT_COLOR_WHITE, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GRAY);
else
ListMenuOverrideSetColors(TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_2);