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
include/list_menu.h
+1 -1
View File
@@ -54,7 +54,7 @@ struct ListMenuTemplate
{ {
/*0x00*/ const struct ListMenuItem *items; /*0x00*/ const struct ListMenuItem *items;
/*0x04*/ void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list); /*0x04*/ void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list);
/*0x08*/ void (* itemPrintFunc)(u8 windowId, s32 itemId, u8 y); /*0x08*/ void (* itemPrintFunc)(u8 windowId, u32 itemId, u8 y);
/*0x0C*/ u16 totalItems; /*0x0C*/ u16 totalItems;
/*0x0E*/ u16 maxShowed; /*0x0E*/ u16 maxShowed;
/*0x10*/ u8 windowId; /*0x10*/ u8 windowId;
src/berry_pouch.c
+2 -2
View File
@@ -80,7 +80,7 @@ static bool8 AllocateListMenuBuffers(void);
static void SetUpListMenuTemplate(void); static void SetUpListMenuTemplate(void);
static void GetBerryNameAndIndexForMenu(u8 * dest, u16 itemId); static void GetBerryNameAndIndexForMenu(u8 * dest, u16 itemId);
static void BerryPouchMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list); static void BerryPouchMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list);
static void BerryPouchItemPrintFunc(u8 windowId, s32 itemId, u8 y); static void BerryPouchItemPrintFunc(u8 windowId, u32 itemId, u8 y);
static void BerryPouchSetArrowCursorAt(u8 y, u8 colorIdx); static void BerryPouchSetArrowCursorAt(u8 y, u8 colorIdx);
static void PrintSelectedBerryDescription(s32 itemIndex); static void PrintSelectedBerryDescription(s32 itemIndex);
static void CreateScrollIndicatorArrows_BerryPouchList(void); static void CreateScrollIndicatorArrows_BerryPouchList(void);
@@ -716,7 +716,7 @@ static void BerryPouchMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen
PrintSelectedBerryDescription(itemIndex); PrintSelectedBerryDescription(itemIndex);
} }
static void BerryPouchItemPrintFunc(u8 windowId, s32 itemId, u8 y) static void BerryPouchItemPrintFunc(u8 windowId, u32 itemId, u8 y)
{ {
u16 unused; u16 unused;
u16 itemQuantity; u16 itemQuantity;
src/daycare.c
+2 -2
View File
@@ -55,7 +55,7 @@ struct EggHatchData
static void ClearDaycareMonMail(struct DayCareMail *mail); static void ClearDaycareMonMail(struct DayCareMail *mail);
static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare); static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare);
static u8 GetDaycareCompatibilityScore(struct DayCare *daycare); static u8 GetDaycareCompatibilityScore(struct DayCare *daycare);
static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y); static void DaycarePrintMonInfo(u8 windowId, u32 daycareSlotId, u8 y);
static void Task_EggHatch(u8 taskID); static void Task_EggHatch(u8 taskID);
static void CB2_EggHatch_0(void); static void CB2_EggHatch_0(void);
@@ -1483,7 +1483,7 @@ static void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycare
DaycareAddTextPrinter(windowId, lvlText, x, y); DaycareAddTextPrinter(windowId, lvlText, x, y);
} }
static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y) static void DaycarePrintMonInfo(u8 windowId, u32 daycareSlotId, u8 y)
{ {
if (daycareSlotId < (unsigned) DAYCARE_MON_COUNT) if (daycareSlotId < (unsigned) DAYCARE_MON_COUNT)
{ {
src/item_menu.c
+2 -2
View File
@@ -85,7 +85,7 @@ static bool8 TryAllocListMenuBuffers(void);
static void Bag_BuildListMenuTemplate(u8 pocket); static void Bag_BuildListMenuTemplate(u8 pocket);
static void BagListMenuGetItemNameColored(u8 *dest, u16 itemId); static void BagListMenuGetItemNameColored(u8 *dest, u16 itemId);
static void BagListMenuMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list); static void BagListMenuMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list);
static void BagListMenuItemPrintFunc(u8 windowId, s32 itemId, u8 y); static void BagListMenuItemPrintFunc(u8 windowId, u32 itemId, u8 y);
static void bag_menu_print_cursor(u8 y, u8 colorIdx); static void bag_menu_print_cursor(u8 y, u8 colorIdx);
static void PrintBagPocketName(void); static void PrintBagPocketName(void);
static void PrintItemDescriptionOnMessageWindow(s32 itemIndex); static void PrintItemDescriptionOnMessageWindow(s32 itemIndex);
@@ -699,7 +699,7 @@ static void BagListMenuMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMe
} }
} }
static void BagListMenuItemPrintFunc(u8 windowId, s32 itemId, u8 y) static void BagListMenuItemPrintFunc(u8 windowId, u32 itemId, u8 y)
{ {
u16 bagItemId; u16 bagItemId;
u16 bagItemQuantity; u16 bagItemQuantity;
src/item_pc.c
+2 -2
View File
@@ -63,7 +63,7 @@ static bool8 ItemPc_LoadGraphics(void);
static bool8 ItemPc_AllocateResourcesForListMenu(void); static bool8 ItemPc_AllocateResourcesForListMenu(void);
static void ItemPc_BuildListMenuTemplate(void); static void ItemPc_BuildListMenuTemplate(void);
static void ItemPc_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu * list); static void ItemPc_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu * list);
static void ItemPc_ItemPrintFunc(u8 windowId, s32 itemId, u8 y); static void ItemPc_ItemPrintFunc(u8 windowId, u32 itemId, u8 y);
static void ItemPc_PrintOrRemoveCursorAt(u8 y, u8 state); static void ItemPc_PrintOrRemoveCursorAt(u8 y, u8 state);
static void ItemPc_PrintWithdrawItem(void); static void ItemPc_PrintWithdrawItem(void);
static void ItemPc_PlaceTopMenuScrollIndicatorArrows(void); static void ItemPc_PlaceTopMenuScrollIndicatorArrows(void);
@@ -538,7 +538,7 @@ static void ItemPc_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *
} }
} }
static void ItemPc_ItemPrintFunc(u8 windowId, s32 itemId, u8 y) static void ItemPc_ItemPrintFunc(u8 windowId, u32 itemId, u8 y)
{ {
if (sStateDataPtr->moveModeOrigPos != 0xFF) if (sStateDataPtr->moveModeOrigPos != 0xFF)
{ {
src/mailbox_pc.c
+1 -1
View File
@@ -79,7 +79,7 @@ u8 MailboxPC_GetWindowId(u8 winIdx)
return sWindowIds[winIdx]; return sWindowIds[winIdx];
} }
static void ItemPrintFunc(u8 windowId, s32 itemId, u8 y) static void ItemPrintFunc(u8 windowId, u32 itemId, u8 y)
{ {
u8 strbuf[30]; u8 strbuf[30];
if (itemId != -2) if (itemId != -2)
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_InputHandler_StartToCry(void);
void DexScreen_PrintStringWithAlignment(const u8 *str, s32 mode); void DexScreen_PrintStringWithAlignment(const u8 *str, s32 mode);
static void MoveCursorFunc_DexModeSelect(s32 itemIndex, bool8 onInit, struct ListMenu *list); static void MoveCursorFunc_DexModeSelect(s32 itemIndex, bool8 onInit, struct ListMenu *list);
static void ItemPrintFunc_DexModeSelect(u8 windowId, s32 itemId, u8 y); static void ItemPrintFunc_DexModeSelect(u8 windowId, u32 itemId, u8 y);
static void ItemPrintFunc_OrderedListMenu(u8 windowId, s32 itemId, u8 y); static void ItemPrintFunc_OrderedListMenu(u8 windowId, u32 itemId, u8 y);
static void Task_DexScreen_RegisterNonKantoMonBeforeNationalDex(u8 taskId); static void Task_DexScreen_RegisterNonKantoMonBeforeNationalDex(u8 taskId);
static void Task_DexScreen_RegisterMonToPokedex(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); 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; u32 itemId_ = itemId;
if (itemId_ >= DEX_CATEGORY_COUNT || sPokedexScreenData->unlockedCategories & (1 << itemId_)) if (itemId_ >= DEX_CATEGORY_COUNT || sPokedexScreenData->unlockedCategories & (1 << itemId_))
@@ -1542,11 +1542,11 @@ struct PokedexListItem
bool8 caught:1; 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; u16 species = itemId;
bool8 seen = ((u32)itemId >> 16) & 1; // not used but required to match bool8 seen = (itemId >> 16) & 1; // not used but required to match
bool8 caught = ((u32)itemId >> 17) & 1; bool8 caught = (itemId >> 17) & 1;
u8 type1; u8 type1;
DexScreen_PrintMonDexNo(sPokedexScreenData->numericalOrderWindowId, 0, species, 12, y); DexScreen_PrintMonDexNo(sPokedexScreenData->numericalOrderWindowId, 0, species, 12, y);
if (caught) if (caught)
src/shop.c
+2 -2
View File
@@ -117,7 +117,7 @@ static void BuyMenuDrawGraphics(void);
static bool8 BuyMenuBuildListMenuTemplate(void); static bool8 BuyMenuBuildListMenuTemplate(void);
static void PokeMartWriteNameAndIdAt(struct ListMenuItem *list, u16 index, u8* dst); static void PokeMartWriteNameAndIdAt(struct ListMenuItem *list, u16 index, u8* dst);
static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, struct ListMenu *list); static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, struct ListMenu *list);
static void BuyMenuPrintPriceInList(u8 windowId, s32 itemId, u8 y); static void BuyMenuPrintPriceInList(u8 windowId, u32 itemId, u8 y);
static void LoadTmHmNameInMart(s32 item); static void LoadTmHmNameInMart(s32 item);
static void BuyMenuPrintCursor(u8 listTaskId, u8 a1); static void BuyMenuPrintCursor(u8 listTaskId, u8 a1);
static void BuyMenuPrintCursorAtYPosition(u8 y, u8 a1); static void BuyMenuPrintCursorAtYPosition(u8 y, u8 a1);
@@ -607,7 +607,7 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, s
} }
} }
static void BuyMenuPrintPriceInList(u8 windowId, s32 item, u8 y) static void BuyMenuPrintPriceInList(u8 windowId, u32 item, u8 y)
{ {
s32 x; s32 x;
u8 *loc; u8 *loc;
src/tm_case.c
+2 -2
View File
@@ -75,7 +75,7 @@ static void CreateTMCaseListMenuBuffers(void);
static void InitTMCaseListMenuItems(void); static void InitTMCaseListMenuItems(void);
static void GetTMNumberAndMoveString(u8 * dest, u16 itemId); static void GetTMNumberAndMoveString(u8 * dest, u16 itemId);
static void TMCase_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list); static void TMCase_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list);
static void TMCase_ItemPrintFunc(u8 windowId, s32 itemId, u8 y); static void TMCase_ItemPrintFunc(u8 windowId, u32 itemId, u8 y);
static void TMCase_MoveCursor_UpdatePrintedDescription(s32 itemIndex); static void TMCase_MoveCursor_UpdatePrintedDescription(s32 itemIndex);
static void PrintListMenuCursorAt_WithColorIdx(u8 a0, u8 a1); static void PrintListMenuCursorAt_WithColorIdx(u8 a0, u8 a1);
static void CreateTMCaseScrollIndicatorArrowPair_Main(void); static void CreateTMCaseScrollIndicatorArrowPair_Main(void);
@@ -554,7 +554,7 @@ static void TMCase_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *
TMCase_MoveCursor_UpdatePrintedTMInfo(itemId); TMCase_MoveCursor_UpdatePrintedTMInfo(itemId);
} }
static void TMCase_ItemPrintFunc(u8 windowId, s32 itemId, u8 y) static void TMCase_ItemPrintFunc(u8 windowId, u32 itemId, u8 y)
{ {
if (itemId != -2) if (itemId != -2)
{ {
src/union_room.c
+8 -9
View File
@@ -65,14 +65,14 @@ static struct UnkStruct_URoom * sURoom;
static void Task_TryBecomeLinkLeader(u8 taskId); static void Task_TryBecomeLinkLeader(u8 taskId);
static void Leader_DestroyResources(struct UnkStruct_Leader * leader); static void Leader_DestroyResources(struct UnkStruct_Leader * leader);
static bool8 Leader_SetStateIfMemberListChanged(struct UnkStruct_Leader * leader, u32 state1, u32 state2); static bool8 Leader_SetStateIfMemberListChanged(struct UnkStruct_Leader * leader, u32 state1, u32 state2);
static void ItemPrintFunc_PossibleGroupMembers(u8 windowId, s32 itemId, u8 y); static void ItemPrintFunc_PossibleGroupMembers(u8 windowId, u32 itemId, u8 y);
static u8 LeaderUpdateGroupMembership(struct UnkStruct_Main0 * main0); static u8 LeaderUpdateGroupMembership(struct UnkStruct_Main0 * main0);
static u8 UnionRoomLeaderField0CompactionAndCount(struct UnkStruct_Main0 * main0); static u8 UnionRoomLeaderField0CompactionAndCount(struct UnkStruct_Main0 * main0);
static void Task_TryJoinLinkGroup(u8 taskId); static void Task_TryJoinLinkGroup(u8 taskId);
static u32 IsTryingToTradeWithHoennTooSoon(struct UnkStruct_Group * group, s32 id); static u32 IsTryingToTradeWithHoennTooSoon(struct UnkStruct_Group * group, s32 id);
static void AskToJoinRfuGroup(struct UnkStruct_Group * group, s32 id); static void AskToJoinRfuGroup(struct UnkStruct_Group * group, s32 id);
static void Task_ListenToWireless(u8 taskId); static void Task_ListenToWireless(u8 taskId);
static void ListMenuItemPrintFunc_UnionRoomGroups(u8 windowId, s32 itemId, u8 y); static void ListMenuItemPrintFunc_UnionRoomGroups(u8 windowId, u32 itemId, u8 y);
static u8 GetNewLeaderCandidate(void); static u8 GetNewLeaderCandidate(void);
static void CreateTask_RunScriptAndFadeToActivity(void); static void CreateTask_RunScriptAndFadeToActivity(void);
static void CreateTask_StartActivity(void); static void CreateTask_StartActivity(void);
@@ -110,8 +110,8 @@ static bool32 PlayerIsTalkingToUnionRoomAide(void);
static u32 GetResponseIdx_InviteToURoomActivity(s32 activity); static u32 GetResponseIdx_InviteToURoomActivity(s32 activity);
static u32 ConvPartnerUnameAndGetWhetherMetAlready(struct UnkStruct_x20 * unkX20); static u32 ConvPartnerUnameAndGetWhetherMetAlready(struct UnkStruct_x20 * unkX20);
static s32 UnionRoomGetPlayerInteractionResponse(struct UnkStruct_Main0 * main0, u8 overrideGender, u8 playerIdx, u32 playerGender); static s32 UnionRoomGetPlayerInteractionResponse(struct UnkStruct_Main0 * main0, u8 overrideGender, u8 playerIdx, u32 playerGender);
static void nullsub_92(u8 windowId, s32 itemId, u8 y); static void nullsub_92(u8 windowId, u32 itemId, u8 y);
static void TradeBoardListMenuItemPrintFunc(u8 windowId, s32 itemId, u8 y); static void TradeBoardListMenuItemPrintFunc(u8 windowId, u32 itemId, u8 y);
static s32 GetIndexOfNthTradeBoardOffer(struct UnkStruct_x20 * x20, s32 n); static s32 GetIndexOfNthTradeBoardOffer(struct UnkStruct_x20 * x20, s32 n);
static s32 GetUnionRoomPlayerGender(s32 playerIdx, struct UnkStruct_Main0 * main0); static s32 GetUnionRoomPlayerGender(s32 playerIdx, struct UnkStruct_Main0 * main0);
static s32 IsRequestedTypeAndSpeciesInPlayerParty(u32 type, u32 species); static s32 IsRequestedTypeAndSpeciesInPlayerParty(u32 type, u32 species);
@@ -1163,7 +1163,7 @@ static bool8 Leader_SetStateIfMemberListChanged(struct UnkStruct_Leader * data,
return FALSE; return FALSE;
} }
static void ItemPrintFunc_PossibleGroupMembers(u8 windowId, s32 itemId, u8 y) static void ItemPrintFunc_PossibleGroupMembers(u8 windowId, u32 itemId, u8 y)
{ {
struct UnkStruct_Leader * data = sUnionRoomMain.leader; struct UnkStruct_Leader * data = sUnionRoomMain.leader;
u8 var = 0; u8 var = 0;
@@ -1658,7 +1658,7 @@ static u8 URoomGroupListGetTextColor(struct UnkStruct_Group * data, u32 id)
return UR_COLOR_DKE_WHT_LTE; return UR_COLOR_DKE_WHT_LTE;
} }
static void ListMenuItemPrintFunc_UnionRoomGroups(u8 windowId, s32 itemId, u8 y) static void ListMenuItemPrintFunc_UnionRoomGroups(u8 windowId, u32 itemId, u8 y)
{ {
struct UnkStruct_Group * data = sUnionRoomMain.group; struct UnkStruct_Group * data = sUnionRoomMain.group;
u8 color_idx = URoomGroupListGetTextColor(data, itemId); u8 color_idx = URoomGroupListGetTextColor(data, itemId);
@@ -4307,9 +4307,8 @@ static s32 UnionRoomGetPlayerInteractionResponse(struct UnkStruct_Main0 * main0,
} }
} }
static void nullsub_92(u8 windowId, s32 itemId, u8 y) static void nullsub_92(u8 windowId, u32 itemId, u8 y)
{ {
} }
static void TradeBoardPrintItemInfo(u8 windowId, u8 y, struct GFtgtGname * gname, const u8 * uname, u8 colorIdx) static void TradeBoardPrintItemInfo(u8 windowId, u8 y, struct GFtgtGname * gname, const u8 * uname, u8 colorIdx)
@@ -4333,7 +4332,7 @@ static void TradeBoardPrintItemInfo(u8 windowId, u8 y, struct GFtgtGname * gname
} }
} }
static void TradeBoardListMenuItemPrintFunc(u8 windowId, s32 itemId, u8 y) static void TradeBoardListMenuItemPrintFunc(u8 windowId, u32 itemId, u8 y)
{ {
struct UnkStruct_Leader * leader = sUnionRoomMain.leader; struct UnkStruct_Leader * leader = sUnionRoomMain.leader;
struct GFtgtGname * rfu; struct GFtgtGname * rfu;