Merge pull request #1317 from opakedragon/master

Fix Spelling of BagMenu_RemoveBagItemMessageindow
This commit is contained in:
GriffinR 2021-02-07 13:43:05 -05:00 committed by GitHub
commit 6899acfb6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -86,7 +86,7 @@ u16 BagGetQuantityByPocketPosition(u8, u16);
void BagDestroyPocketSwitchArrowPair(void); void BagDestroyPocketSwitchArrowPair(void);
void TaskCloseBagMenu_2(u8); void TaskCloseBagMenu_2(u8);
u8 AddItemMessageWindow(u8); u8 AddItemMessageWindow(u8);
void BagMenu_RemoveBagItemMessageindow(u8); void BagMenu_RemoveBagItemMessageWindow(u8);
void set_callback3_to_bag(u8); void set_callback3_to_bag(u8);
void PrintItemDepositAmount(u8, s16); void PrintItemDepositAmount(u8, s16);
static u8 BagMenu_AddWindow(u8); static u8 BagMenu_AddWindow(u8);
@ -1115,7 +1115,7 @@ void BagMenu_InitListsMenu(u8 taskId)
s16* data = gTasks[taskId].data; s16* data = gTasks[taskId].data;
u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]; u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket];
u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]; u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
BagMenu_RemoveBagItemMessageindow(4); BagMenu_RemoveBagItemMessageWindow(4);
DestroyListMenuTask(data[0], scrollPos, cursorPos); DestroyListMenuTask(data[0], scrollPos, cursorPos);
UpdatePocketItemList(gBagPositionStruct.pocket); UpdatePocketItemList(gBagPositionStruct.pocket);
SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket); SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket);
@ -2035,7 +2035,7 @@ void BagMenu_CancelSell(u8 taskId)
s16* data = gTasks[taskId].data; s16* data = gTasks[taskId].data;
RemoveMoneyWindow(); RemoveMoneyWindow();
BagMenu_RemoveBagItemMessageindow(4); BagMenu_RemoveBagItemMessageWindow(4);
BagMenu_PrintCursor_(data[0], 0); BagMenu_PrintCursor_(data[0], 0);
set_callback3_to_bag(taskId); set_callback3_to_bag(taskId);
} }
@ -2070,7 +2070,7 @@ static void Task_SellHowManyDialogueHandleInput(u8 taskId)
BagMenu_PrintCursor_(data[0], 0); BagMenu_PrintCursor_(data[0], 0);
RemoveMoneyWindow(); RemoveMoneyWindow();
BagMenu_RemoveWindow(8); BagMenu_RemoveWindow(8);
BagMenu_RemoveBagItemMessageindow(4); BagMenu_RemoveBagItemMessageWindow(4);
set_callback3_to_bag(taskId); set_callback3_to_bag(taskId);
} }
} }
@ -2420,7 +2420,7 @@ u8 AddItemMessageWindow(u8 which)
return *ptr; return *ptr;
} }
void BagMenu_RemoveBagItemMessageindow(u8 which) void BagMenu_RemoveBagItemMessageWindow(u8 which)
{ {
u8 *ptr = &gBagMenu->windowPointers[which]; u8 *ptr = &gBagMenu->windowPointers[which];
if (*ptr != 0xFF) if (*ptr != 0xFF)