ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

More missing constant usage

Browse Source
This commit is contained in:
GriffinR 2022-11-09 15:53:47 -05:00
parent 431a7ef8dd
commit e434b0047f
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/berry_blender.c
View File

@ -2676,7 +2676,7 @@ static void CB2_EndBlenderGame(void)
switch (Menu_ProcessInputNoWrapClearOnChoose()) switch (Menu_ProcessInputNoWrapClearOnChoose())
{ {
case 1: case 1:
case -1: case MENU_B_PRESSED:
sBerryBlender->yesNoAnswer = 1; sBerryBlender->yesNoAnswer = 1;
sBerryBlender->gameEndState++; sBerryBlender->gameEndState++;
for (i = 0; i < BLENDER_MAX_PLAYERS; i++) for (i = 0; i < BLENDER_MAX_PLAYERS; i++)

2
src/clear_save_data_screen.c
View File

@ -95,7 +95,7 @@ static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId)
gTasks[taskId].func = Task_ClearSaveData; gTasks[taskId].func = Task_ClearSaveData;
break; break;
case 1: case 1:
case -1: case MENU_B_PRESSED:
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
DestroyTask(taskId); DestroyTask(taskId);
SetMainCallback2(CB2_FadeAndDoReset); SetMainCallback2(CB2_FadeAndDoReset);

2
src/data/union_room.h
View File

@ -930,7 +930,7 @@ static const struct WindowTemplate sWindowTemplate_TradingBoardMain = {
}; };
static const struct ListMenuItem sTradeBoardListMenuItems[] = { static const struct ListMenuItem sTradeBoardListMenuItems[] = {
{ sText_EmptyString, -3 }, { sText_EmptyString, LIST_HEADER },
{ sText_EmptyString, 0 }, { sText_EmptyString, 0 },
{ sText_EmptyString, 1 }, { sText_EmptyString, 1 },
{ sText_EmptyString, 2 }, { sText_EmptyString, 2 },

2
src/main_menu.c
View File

@ -1631,7 +1631,7 @@ static void Task_NewGameBirchSpeech_ProcessNameYesNoMenu(u8 taskId)
NewGameBirchSpeech_StartFadePlatformIn(taskId, 1); NewGameBirchSpeech_StartFadePlatformIn(taskId, 1);
gTasks[taskId].func = Task_NewGameBirchSpeech_SlidePlatformAway2; gTasks[taskId].func = Task_NewGameBirchSpeech_SlidePlatformAway2;
break; break;
case -1: case MENU_B_PRESSED:
case 1: case 1:
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
gTasks[taskId].func = Task_NewGameBirchSpeech_BoyOrGirl; gTasks[taskId].func = Task_NewGameBirchSpeech_BoyOrGirl;

10
src/menu_specialized.c
View File

@ -1538,7 +1538,7 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bg
0, 0,
15 * i, 15 * i,
color, color,
-1, TEXT_SKIP_DRAW,
sLvlUpStatStrings[i]); sLvlUpStatStrings[i]);
StringCopy(text, (statsDiff[i] >= 0) ? gText_Plus : gText_Dash); StringCopy(text, (statsDiff[i] >= 0) ? gText_Plus : gText_Dash);
@ -1547,7 +1547,7 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bg
56, 56,
15 * i, 15 * i,
color, color,
-1, TEXT_SKIP_DRAW,
text); text);
if (abs(statsDiff[i]) <= 9) if (abs(statsDiff[i]) <= 9)
x = 18; x = 18;
@ -1560,7 +1560,7 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bg
56 + x, 56 + x,
15 * i, 15 * i,
color, color,
-1, TEXT_SKIP_DRAW,
text); text);
} }
} }
@ -1602,7 +1602,7 @@ void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 s
0, 0,
15 * i, 15 * i,
color, color,
-1, TEXT_SKIP_DRAW,
sLvlUpStatStrings[i]); sLvlUpStatStrings[i]);
AddTextPrinterParameterized3(windowId, AddTextPrinterParameterized3(windowId,
@ -1610,7 +1610,7 @@ void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 s
56 + x, 56 + x,
15 * i, 15 * i,
color, color,
-1, TEXT_SKIP_DRAW,
text); text);
} }
} }

14
src/move_relearner.c
View File

@ -553,7 +553,7 @@ static void DoMoveRelearnerMain(void)
gSpecialVar_0x8004 = FALSE; gSpecialVar_0x8004 = FALSE;
sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN; sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN;
} }
else if (selection == -1 || selection == 1) else if (selection == MENU_B_PRESSED || selection == 1)
{ {
if (sMoveRelearnerMenuSate.showContestInfo == FALSE) if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
{ {
@ -579,14 +579,14 @@ static void DoMoveRelearnerMain(void)
break; break;
case MENU_STATE_CONFIRM_DELETE_OLD_MOVE: case MENU_STATE_CONFIRM_DELETE_OLD_MOVE:
{ {
s8 var = Menu_ProcessInputNoWrapClearOnChoose(); s8 selection = Menu_ProcessInputNoWrapClearOnChoose();
if (var == 0) if (selection == 0)
{ {
FormatAndPrintText(gText_MoveRelearnerWhichMoveToForget); FormatAndPrintText(gText_MoveRelearnerWhichMoveToForget);
sMoveRelearnerStruct->state = MENU_STATE_PRINT_WHICH_MOVE_PROMPT; sMoveRelearnerStruct->state = MENU_STATE_PRINT_WHICH_MOVE_PROMPT;
} }
else if (var == -1 || var == 1) else if (selection == MENU_B_PRESSED || selection == 1)
{ {
sMoveRelearnerStruct->state = MENU_STATE_PRINT_STOP_TEACHING; sMoveRelearnerStruct->state = MENU_STATE_PRINT_STOP_TEACHING;
} }
@ -606,13 +606,13 @@ static void DoMoveRelearnerMain(void)
break; break;
case MENU_STATE_CONFIRM_STOP_TEACHING: case MENU_STATE_CONFIRM_STOP_TEACHING:
{ {
s8 var = Menu_ProcessInputNoWrapClearOnChoose(); s8 selection = Menu_ProcessInputNoWrapClearOnChoose();
if (var == 0) if (selection == 0)
{ {
sMoveRelearnerStruct->state = MENU_STATE_CHOOSE_SETUP_STATE; sMoveRelearnerStruct->state = MENU_STATE_CHOOSE_SETUP_STATE;
} }
else if (var == MENU_B_PRESSED || var == 1) else if (selection == MENU_B_PRESSED || selection == 1)
{ {
// What's the point? It gets set to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT, anyway. // What's the point? It gets set to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT, anyway.
if (sMoveRelearnerMenuSate.showContestInfo == FALSE) if (sMoveRelearnerMenuSate.showContestInfo == FALSE)

2
src/secret_base.c
View File

@ -953,7 +953,7 @@ static void BuildRegistryMenuItems(u8 taskId)
} }
sRegistryMenu->items[count].name = gText_Cancel; sRegistryMenu->items[count].name = gText_Cancel;
sRegistryMenu->items[count].id = -2; sRegistryMenu->items[count].id = LIST_CANCEL;
tNumBases = count + 1; tNumBases = count + 1;
if (tNumBases < 8) if (tNumBases < 8)
tMaxShownItems = tNumBases; tMaxShownItems = tNumBases;

6
src/start_menu.c
View File

@ -996,7 +996,7 @@ static u8 SaveConfirmInputCallback(void)
sSaveDialogCallback = SaveFileExistsCallback; sSaveDialogCallback = SaveFileExistsCallback;
return SAVE_IN_PROGRESS; return SAVE_IN_PROGRESS;
} }
case -1: // B Button case MENU_B_PRESSED:
case 1: // No case 1: // No
HideSaveInfoWindow(); HideSaveInfoWindow();
HideSaveMessageWindow(); HideSaveMessageWindow();
@ -1042,7 +1042,7 @@ static u8 SaveOverwriteInputCallback(void)
case 0: // Yes case 0: // Yes
sSaveDialogCallback = SaveSavingMessageCallback; sSaveDialogCallback = SaveSavingMessageCallback;
return SAVE_IN_PROGRESS; return SAVE_IN_PROGRESS;
case -1: // B Button case MENU_B_PRESSED:
case 1: // No case 1: // No
HideSaveInfoWindow(); HideSaveInfoWindow();
HideSaveMessageWindow(); HideSaveMessageWindow();
@ -1161,7 +1161,7 @@ static u8 BattlePyramidRetireInputCallback(void)
{ {
case 0: // Yes case 0: // Yes
return SAVE_CANCELED; return SAVE_CANCELED;
case -1: // B Button case MENU_B_PRESSED:
case 1: // No case 1: // No
HideSaveMessageWindow(); HideSaveMessageWindow();
return SAVE_SUCCESS; return SAVE_SUCCESS;

8
src/union_room_chat.c
View File

@ -1171,7 +1171,7 @@ static void Chat_AskQuitChatting(void)
input = ProcessMenuInput(); input = ProcessMenuInput();
switch (input) switch (input)
{ {
case -1: case MENU_B_PRESSED:
case 1: case 1:
StartDisplaySubtask(CHATDISPLAY_FUNC_DESTROY_YESNO, 0); StartDisplaySubtask(CHATDISPLAY_FUNC_DESTROY_YESNO, 0);
sChat->funcState = 3; sChat->funcState = 3;
@ -1210,7 +1210,7 @@ static void Chat_AskQuitChatting(void)
input = ProcessMenuInput(); input = ProcessMenuInput();
switch (input) switch (input)
{ {
case -1: case MENU_B_PRESSED:
case 1: case 1:
StartDisplaySubtask(CHATDISPLAY_FUNC_DESTROY_YESNO, 0); StartDisplaySubtask(CHATDISPLAY_FUNC_DESTROY_YESNO, 0);
sChat->funcState = 3; sChat->funcState = 3;
@ -1512,7 +1512,7 @@ static void Chat_SaveAndExit(void)
input = ProcessMenuInput(); input = ProcessMenuInput();
switch (input) switch (input)
{ {
case -1: case MENU_B_PRESSED:
case 1: case 1:
sChat->funcState = 12; sChat->funcState = 12;
break; break;
@ -1537,7 +1537,7 @@ static void Chat_SaveAndExit(void)
input = ProcessMenuInput(); input = ProcessMenuInput();
switch (input) switch (input)
{ {
case -1: case MENU_B_PRESSED:
case 1: case 1:
sChat->funcState = 12; sChat->funcState = 12;
break; break;