ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-09 14:53:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1669 from Bl4ckSh4rk/boolean

Browse Source 
Use more TRUE & FALSE constants
This commit is contained in:
GriffinR 2022-05-26 21:19:47 -04:00 committed by GitHub
commit a7b6dfee3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_anim_ghost.c
View File

@ -653,9 +653,9 @@ static void AnimTask_SpiteTargetShadow_Step1(u8 taskId)
startLine = 0; startLine = 0;
if (position == 1) if (position == 1)
task->data[10] = ScanlineEffect_InitWave(startLine, startLine + 64, 2, 6, 0, SCANLINE_EFFECT_REG_BG1HOFS, 1); task->data[10] = ScanlineEffect_InitWave(startLine, startLine + 64, 2, 6, 0, SCANLINE_EFFECT_REG_BG1HOFS, TRUE);
else else
task->data[10] = ScanlineEffect_InitWave(startLine, startLine + 64, 2, 6, 0, SCANLINE_EFFECT_REG_BG2HOFS, 1); task->data[10] = ScanlineEffect_InitWave(startLine, startLine + 64, 2, 6, 0, SCANLINE_EFFECT_REG_BG2HOFS, TRUE);
task->data[15]++; task->data[15]++;
break; break;

2
src/battle_anim_status_effects.c
View File

@ -549,7 +549,7 @@ void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId)
gBattleAnimAttacker = battlerId; gBattleAnimAttacker = battlerId;
gBattleAnimTarget = battlerId; gBattleAnimTarget = battlerId;
LaunchBattleAnimation(gBattleAnims_StatusConditions, statusAnimId, 0); LaunchBattleAnimation(gBattleAnims_StatusConditions, statusAnimId, FALSE);
taskId = CreateTask(Task_DoStatusAnimation, 10); taskId = CreateTask(Task_DoStatusAnimation, 10);
gTasks[taskId].data[0] = battlerId; gTasks[taskId].data[0] = battlerId;
} }

4
src/battle_interface.c
View File

@ -817,8 +817,8 @@ static void Debug_DrawNumber(s16 number, u16 *dest, bool8 unk)
static void Debug_DrawNumberPair(s16 number1, s16 number2, u16 *arg2) static void Debug_DrawNumberPair(s16 number1, s16 number2, u16 *arg2)
{ {
arg2[4] = 0x1E; arg2[4] = 0x1E;
Debug_DrawNumber(number2, arg2, 0); Debug_DrawNumber(number2, arg2, FALSE);
Debug_DrawNumber(number1, arg2 + 5, 1); Debug_DrawNumber(number1, arg2 + 5, TRUE);
} }
// Because the healthbox is too large to fit into one sprite, it is divided into two sprites. // Because the healthbox is too large to fit into one sprite, it is divided into two sprites.

2
src/battle_util.c
View File

@ -1190,7 +1190,7 @@ u8 DoFieldEndTurnEffects(void)
s32 j; s32 j;
for (j = i + 1; j < gBattlersCount; j++) for (j = i + 1; j < gBattlersCount; j++)
{ {
if (GetWhoStrikesFirst(gBattlerByTurnOrder[i], gBattlerByTurnOrder[j], 0)) if (GetWhoStrikesFirst(gBattlerByTurnOrder[i], gBattlerByTurnOrder[j], FALSE))
SwapTurnOrder(i, j); SwapTurnOrder(i, j);
} }
} }

6
src/berry_crush.c
View File

@ -2254,7 +2254,7 @@ static u32 Cmd_PrintMessage(struct BerryCrushGame *game, u8 *args)
switch (game->cmdState) switch (game->cmdState)
{ {
case 0: case 0:
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
if (args[1] & F_MSG_EXPAND) if (args[1] & F_MSG_EXPAND)
{ {
StringExpandPlaceholders(gStringVar4, sMessages[args[0]]); StringExpandPlaceholders(gStringVar4, sMessages[args[0]]);
@ -3241,7 +3241,7 @@ static u32 Cmd_SaveGame(struct BerryCrushGame *game, u8 *args)
case 2: case 2:
if (!IsLinkTaskFinished()) if (!IsLinkTaskFinished())
return 0; return 0;
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, 0, 2, 1, 3);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
CreateTask(Task_LinkFullSave, 0); CreateTask(Task_LinkFullSave, 0);
@ -3389,7 +3389,7 @@ static u32 Cmd_StopGame(struct BerryCrushGame *game, u8 *args)
switch (game->cmdState) switch (game->cmdState)
{ {
case 0: case 0:
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
if (game->playAgainState == PLAY_AGAIN_NO_BERRIES) if (game->playAgainState == PLAY_AGAIN_NO_BERRIES)
AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_NO_BERRIES], game->textSpeed, 0, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_NO_BERRIES], game->textSpeed, 0, 2, 1, 3);
else else

4
src/decoration.c
View File

@ -826,7 +826,7 @@ static void ReturnToActionsMenuFromCategories(u8 taskId)
{ {
RemoveDecorationWindow(WINDOW_DECORATION_CATEGORIES); RemoveDecorationWindow(WINDOW_DECORATION_CATEGORIES);
AddDecorationActionsWindow(); AddDecorationActionsWindow();
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
PrintCurMainMenuDescription(); PrintCurMainMenuDescription();
gTasks[taskId].func = HandleDecorationActionsMenuInput; gTasks[taskId].func = HandleDecorationActionsMenuInput;
} }
@ -2664,7 +2664,7 @@ static void FieldCB_StopPuttingAwayDecorations(void)
u8 taskId; u8 taskId;
FadeInFromBlack(); FadeInFromBlack();
DrawDialogueFrame(0, 1); DrawDialogueFrame(0, TRUE);
InitDecorationActionsWindow(); InitDecorationActionsWindow();
taskId = CreateTask(Task_ReinitializeDecorationMenuHandler, 8); taskId = CreateTask(Task_ReinitializeDecorationMenuHandler, 8);
gTasks[taskId].tState = 0; gTasks[taskId].tState = 0;

2
src/field_message_box.c
View File

@ -33,7 +33,7 @@ static void Task_DrawFieldMessage(u8 taskId)
task->tState++; task->tState++;
break; break;
case 1: case 1:
DrawDialogueFrame(0, 1); DrawDialogueFrame(0, TRUE);
task->tState++; task->tState++;
break; break;
case 2: case 2:

6
src/hall_of_fame.c
View File

@ -514,7 +514,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
} }
*lastSavedTeam = *sHofMonPtr; *lastSavedTeam = *sHofMonPtr;
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_Hof_TrySaveData; gTasks[taskId].func = Task_Hof_TrySaveData;
@ -724,7 +724,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
{ {
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
HallOfFame_PrintPlayerInfo(1, 2); HallOfFame_PrintPlayerInfo(1, 2);
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_LeagueChamp, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_LeagueChamp, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_Hof_ExitOnKeyPressed; gTasks[taskId].func = Task_Hof_ExitOnKeyPressed;
@ -1093,7 +1093,7 @@ static void Task_HofPC_HandleExit(u8 taskId)
static void Task_HofPC_PrintDataIsCorrupted(u8 taskId) static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
{ {
HofPCTopBar_Print(gText_AButtonExit, 8, TRUE); HofPCTopBar_Print(gText_AButtonExit, 8, TRUE);
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, FONT_NORMAL, gText_HOFCorrupted, 0, NULL, 2, 1, 3); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_HofPC_ExitOnButtonPress; gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;

4
src/intro.c
View File

@ -1848,7 +1848,7 @@ static void Task_Scene3_StartGroudon(u8 taskId)
{ {
gTasks[taskId].tState = 0; gTasks[taskId].tState = 0;
gTasks[taskId].func = Task_Scene3_Groudon; gTasks[taskId].func = Task_Scene3_Groudon;
ScanlineEffect_InitWave(0, 160, 4, 4, 1, SCANLINE_EFFECT_REG_BG1HOFS, 0); ScanlineEffect_InitWave(0, 160, 4, 4, 1, SCANLINE_EFFECT_REG_BG1HOFS, FALSE);
} }
#define tScreenX data[1] #define tScreenX data[1]
@ -2058,7 +2058,7 @@ static void Task_Scene3_LoadKyogre(u8 taskId)
gTasks[taskId].tDelay = 16; gTasks[taskId].tDelay = 16;
gTasks[taskId].tZoom = 256; gTasks[taskId].tZoom = 256;
PanFadeAndZoomScreen(gTasks[taskId].tScreenX, gTasks[taskId].tScreenY, gTasks[taskId].tZoom, 0); PanFadeAndZoomScreen(gTasks[taskId].tScreenX, gTasks[taskId].tScreenY, gTasks[taskId].tZoom, 0);
ScanlineEffect_InitWave(0, 0xA0, 4, 4, 1, SCANLINE_EFFECT_REG_BG1VOFS, 0); ScanlineEffect_InitWave(0, 0xA0, 4, 4, 1, SCANLINE_EFFECT_REG_BG1VOFS, FALSE);
} }
static void Task_Scene3_Kyogre(u8 taskId) static void Task_Scene3_Kyogre(u8 taskId)

2
src/item_menu.c
View File

@ -1344,7 +1344,7 @@ static void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, bool16 skipEraseLis
DrawPocketIndicatorSquare(newPocket, TRUE); DrawPocketIndicatorSquare(newPocket, TRUE);
FillBgTilemapBufferRect_Palette0(2, 11, 14, 2, 15, 16); FillBgTilemapBufferRect_Palette0(2, 11, 14, 2, 15, 16);
ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(2);
SetBagVisualPocketId(newPocket, 1); SetBagVisualPocketId(newPocket, TRUE);
RemoveBagSprite(ITEMMENUSPRITE_BALL); RemoveBagSprite(ITEMMENUSPRITE_BALL);
AddSwitchPocketRotatingBallSprite(deltaBagPocketId); AddSwitchPocketRotatingBallSprite(deltaBagPocketId);
SetTaskFuncWithFollowupFunc(taskId, Task_SwitchBagPocket, gTasks[taskId].func); SetTaskFuncWithFollowupFunc(taskId, Task_SwitchBagPocket, gTasks[taskId].func);

2
src/mauville_old_man.c
View File

@ -445,7 +445,7 @@ static void DisableTextPrinters(struct TextPrinterTemplate * printer, u16 a1)
static void DrawSongTextWindow(const u8 * str) static void DrawSongTextWindow(const u8 * str)
{ {
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized(0, FONT_NORMAL, str, 0, 1, 1, DisableTextPrinters); AddTextPrinterParameterized(0, FONT_NORMAL, str, 0, 1, 1, DisableTextPrinters);
gDisableTextPrinters = TRUE; gDisableTextPrinters = TRUE;
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);

2
src/party_menu.c
View File

@ -4969,7 +4969,7 @@ static void Task_TryLearnNewMoves(u8 taskId)
{ {
u16 learnMove; u16 learnMove;
if (WaitFanfare(0) && ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON)))) if (WaitFanfare(FALSE) && ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON))))
{ {
RemoveLevelUpStatsWindow(); RemoveLevelUpStatsWindow();
learnMove = MonTryLearningNewMove(&gPlayerParty[gPartyMenu.slotId], TRUE); learnMove = MonTryLearningNewMove(&gPlayerParty[gPartyMenu.slotId], TRUE);

6
src/player_pc.c
View File

@ -518,7 +518,7 @@ static void InitItemStorageMenu(u8 taskId, u8 var)
static void ItemStorageMenuPrint(const u8 *textPtr) static void ItemStorageMenuPrint(const u8 *textPtr)
{ {
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized(0, FONT_NORMAL, textPtr, 0, 1, 0, 0); AddTextPrinterParameterized(0, FONT_NORMAL, textPtr, 0, 1, 0, 0);
} }
@ -572,7 +572,7 @@ void CB2_PlayerPCExitBagMenu(void)
static void ItemStorage_ReshowAfterBagMenu(void) static void ItemStorage_ReshowAfterBagMenu(void)
{ {
LoadMessageBoxAndBorderGfx(); LoadMessageBoxAndBorderGfx();
DrawDialogueFrame(0, 1); DrawDialogueFrame(0, TRUE);
InitItemStorageMenu(CreateTask(ItemStorage_HandleReturnToProcessInput, 0), 1); InitItemStorageMenu(CreateTask(ItemStorage_HandleReturnToProcessInput, 0), 1);
FadeInFromBlack(); FadeInFromBlack();
} }
@ -1241,7 +1241,7 @@ static void ItemStorage_ReturnToMenuSelect(u8 taskId)
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
if (!IsDma3ManagerBusyWithBgCopy()) if (!IsDma3ManagerBusyWithBgCopy())
{ {
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
// Select Withdraw/Toss by default depending on which was just exited // Select Withdraw/Toss by default depending on which was just exited
if (!tInTossMenu) if (!tInTossMenu)

2
src/record_mixing.c
View File

@ -285,7 +285,7 @@ static void ReceiveExchangePacket(u32 multiplayerId)
static void PrintTextOnRecordMixing(const u8 *src) static void PrintTextOnRecordMixing(const u8 *src)
{ {
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized(0, FONT_NORMAL, src, 0, 1, 0, NULL); AddTextPrinterParameterized(0, FONT_NORMAL, src, 0, 1, 0, NULL);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
} }

8
src/slot_machine.c
View File

@ -1390,7 +1390,7 @@ static bool8 SlotTask_HandleBetInput(struct Task *task)
// SLOTTASK_MSG_NEED_3_COINS // SLOTTASK_MSG_NEED_3_COINS
static bool8 SlotTask_PrintMsg_Need3Coins(struct Task *task) static bool8 SlotTask_PrintMsg_Need3Coins(struct Task *task)
{ {
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized(0, FONT_NORMAL, gText_YouDontHaveThreeCoins, 0, 1, 0, 0); AddTextPrinterParameterized(0, FONT_NORMAL, gText_YouDontHaveThreeCoins, 0, 1, 0, 0);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
sSlotMachine->state = SLOTTASK_WAIT_MSG_NEED_3_COINS; sSlotMachine->state = SLOTTASK_WAIT_MSG_NEED_3_COINS;
@ -1655,7 +1655,7 @@ static bool8 SlotTask_NoMatches(struct Task *task)
// SLOTTASK_ASK_QUIT // SLOTTASK_ASK_QUIT
static bool8 SlotTask_AskQuit(struct Task *task) static bool8 SlotTask_AskQuit(struct Task *task)
{ {
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized(0, FONT_NORMAL, gText_QuitTheGame, 0, 1, 0, 0); AddTextPrinterParameterized(0, FONT_NORMAL, gText_QuitTheGame, 0, 1, 0, 0);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
CreateYesNoMenuParameterized(0x15, 7, 0x214, 0x180, 0xE, 0xF); CreateYesNoMenuParameterized(0x15, 7, 0x214, 0x180, 0xE, 0xF);
@ -1687,7 +1687,7 @@ static bool8 SlotTask_HandleQuitInput(struct Task *task)
// SLOTTASK_MSG_MAX_COINS // SLOTTASK_MSG_MAX_COINS
static bool8 SlotTask_PrintMsg_MaxCoins(struct Task *task) static bool8 SlotTask_PrintMsg_MaxCoins(struct Task *task)
{ {
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized(0, FONT_NORMAL, gText_YouveGot9999Coins, 0, 1, 0, 0); AddTextPrinterParameterized(0, FONT_NORMAL, gText_YouveGot9999Coins, 0, 1, 0, 0);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
sSlotMachine->state = SLOTTASK_WAIT_MSG_MAX_COINS; sSlotMachine->state = SLOTTASK_WAIT_MSG_MAX_COINS;
@ -1708,7 +1708,7 @@ static bool8 SlotTask_WaitMsg_MaxCoins(struct Task *task)
// SLOTTASK_MSG_NO_MORE_COINS // SLOTTASK_MSG_NO_MORE_COINS
static bool8 SlotTask_PrintMsg_NoMoreCoins(struct Task *task) static bool8 SlotTask_PrintMsg_NoMoreCoins(struct Task *task)
{ {
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized(0, FONT_NORMAL, gText_YouveRunOutOfCoins, 0, 1, 0, 0); AddTextPrinterParameterized(0, FONT_NORMAL, gText_YouveRunOutOfCoins, 0, 1, 0, 0);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
sSlotMachine->state = SLOTTASK_WAIT_MSG_NO_MORE_COINS; sSlotMachine->state = SLOTTASK_WAIT_MSG_NO_MORE_COINS;