dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change itemPrintFunc to use u32 instead of s32

Browse Source
This commit is contained in:
Kurausukun
2021-06-17 23:26:02 -04:00
parent b15cc8eead
commit 72fc4b6f84
10 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokedex_screen.c
+7 -7
View File
@@ -129,8 +129,8 @@ static u8 DexScreen_PageNumberToRenderablePages(u16 page);
void DexScreen_InputHandler_StartToCry(void);
void DexScreen_PrintStringWithAlignment(const u8 *str, s32 mode);
static void MoveCursorFunc_DexModeSelect(s32 itemIndex, bool8 onInit, struct ListMenu *list);
static void ItemPrintFunc_DexModeSelect(u8 windowId, s32 itemId, u8 y);
static void ItemPrintFunc_OrderedListMenu(u8 windowId, s32 itemId, u8 y);
static void ItemPrintFunc_DexModeSelect(u8 windowId, u32 itemId, u8 y);
static void ItemPrintFunc_OrderedListMenu(u8 windowId, u32 itemId, u8 y);
static void Task_DexScreen_RegisterNonKantoMonBeforeNationalDex(u8 taskId);
static void Task_DexScreen_RegisterMonToPokedex(u8 taskId);
@@ -1184,7 +1184,7 @@ static void MoveCursorFunc_DexModeSelect(s32 itemIndex, bool8 onInit, struct Lis
CopyWindowToVram(sPokedexScreenData->selectionIconWindowId, COPYWIN_GFX);
}
static void ItemPrintFunc_DexModeSelect(u8 windowId, s32 itemId, u8 y)
static void ItemPrintFunc_DexModeSelect(u8 windowId, u32 itemId, u8 y)
{
u32 itemId_ = itemId;
if (itemId_ >= DEX_CATEGORY_COUNT || sPokedexScreenData->unlockedCategories & (1 << itemId_))
@@ -1542,11 +1542,11 @@ struct PokedexListItem
bool8 caught:1;
};
static void ItemPrintFunc_OrderedListMenu(u8 windowId, s32 itemId, u8 y)
static void ItemPrintFunc_OrderedListMenu(u8 windowId, u32 itemId, u8 y)
{
u16 species = (u32)itemId;
bool8 seen = ((u32)itemId >> 16) & 1; // not used but required to match
bool8 caught = ((u32)itemId >> 17) & 1;
u16 species = itemId;
bool8 seen = (itemId >> 16) & 1; // not used but required to match
bool8 caught = (itemId >> 17) & 1;
u8 type1;
DexScreen_PrintMonDexNo(sPokedexScreenData->numericalOrderWindowId, 0, species, 12, y);
if (caught)