mirror of
https://github.com/pret/pmd-red.git
synced 2026-03-21 17:46:39 -05:00
Remove some != false
This commit is contained in:
parent
c94d3dbf71
commit
642312baf1
|
|
@ -132,7 +132,7 @@ void sub_803C37C(DungeonLocation *location, u8 r1, u8 *itemReward)
|
|||
flag = GetScriptVarArrayValue(0, EVENT_B01P01, 1) ? TRUE : FALSE;
|
||||
if(r4 == ITEM_MIME_JR_FIG)
|
||||
if(GetScriptVarArrayValue(0, EVENT_B01P01, 0)) flag = TRUE;
|
||||
} while(flag != FALSE);
|
||||
} while(flag);
|
||||
|
||||
*itemReward = r4;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ void sub_803E178(void)
|
|||
gDungeon->unk3A12 = 28;
|
||||
}
|
||||
else {
|
||||
gDungeon->unk3A12 = (IsStairDirectionUp(gDungeon->unk644.dungeonLocation.id) != FALSE) ? 23 : 22;
|
||||
gDungeon->unk3A12 = IsStairDirectionUp(gDungeon->unk644.dungeonLocation.id) ? 23 : 22;
|
||||
}
|
||||
}
|
||||
else if (val == 1) {
|
||||
|
|
|
|||
|
|
@ -629,7 +629,7 @@ static void TryCreateModeArrows(Entity *leader)
|
|||
if (unkPtr->rotateModeDirection < NUM_DIRECTIONS) {
|
||||
s32 x, xMul, x2;
|
||||
s32 y, yMul, y2;
|
||||
s32 to = (sShowThreeArrows2 != FALSE && sShowThreeArrows1 != FALSE) ? 3 : 1;
|
||||
s32 to = (sShowThreeArrows2 && sShowThreeArrows1) ? 3 : 1;
|
||||
|
||||
xMul = sRotateArrowsInfo[direction].x * 10;
|
||||
x2 = (sArrowsFrames / 2) & 7;
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ static void PrintOnDungeonTeamMenu(struct UnkFieldTeamMenuStruct *a0, WindowTemp
|
|||
gDungeonMenu.currPage = 0;
|
||||
gDungeonMenu.pagesCount = 0;
|
||||
gDungeonMenu.unk4 = 0;
|
||||
gDungeonMenu.firstEntryY = (withHeader != FALSE) * 16;
|
||||
gDungeonMenu.firstEntryY = withHeader ? 16 : 0;
|
||||
gDungeonMenu.leftRightArrowsPos.x = 0;
|
||||
gDungeonMenu.leftRightArrowsPos.y = 0;
|
||||
gDungeonMenu.unk14.x = 0;
|
||||
|
|
|
|||
|
|
@ -339,7 +339,7 @@ void DisplayDungeonMessage_Async(struct MonDialogueSpriteInfo *monSpriteInfo, co
|
|||
monPortraitPtr = &monPortrait;
|
||||
}
|
||||
|
||||
CreateMenuDialogueBoxAndPortrait(str, 0, 0, NULL, NULL, 3, 0, monPortraitPtr, (a2 != FALSE) ? 0x701 : 0x400);
|
||||
CreateMenuDialogueBoxAndPortrait(str, 0, 0, NULL, NULL, 3, 0, monPortraitPtr, a2 ? 0x701 : 0x400);
|
||||
gDungeon->unk1BDD4.unk1C05F = 1;
|
||||
PRINT_STRING_WAIT_PRESS_ASYNC(&chosenMenuIndex);
|
||||
gDungeon->unk1BDD4.unk1C05F = 0;
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ static void CreateMessageLogArrow(bool8 upArrow, s32 y)
|
|||
SpriteSetObjMode(&sMessageLogArrowSpriteOAM, 0);
|
||||
SpriteSetMosaic(&sMessageLogArrowSpriteOAM, 0);
|
||||
SpriteSetBpp(&sMessageLogArrowSpriteOAM, 0);
|
||||
SpriteSetMatrixNum(&sMessageLogArrowSpriteOAM, (upArrow != FALSE) ? (16) : 0);
|
||||
SpriteSetMatrixNum(&sMessageLogArrowSpriteOAM, upArrow ? 16 : 0);
|
||||
SpriteSetPalNum(&sMessageLogArrowSpriteOAM, 15);
|
||||
SpriteSetY(&sMessageLogArrowSpriteOAM, (window->y * 8) + y);
|
||||
SpriteSetX(&sMessageLogArrowSpriteOAM, (window->x * 8) + 92);
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ void CreateDungeonMenuSubWindow(WindowTemplate *mainWindow, s32 subWindowX)
|
|||
s32 colorId, y;
|
||||
u8 text[20];
|
||||
|
||||
colorId = (CanSubMenuItemBeChosen(i) != FALSE) ? 7 : 2;
|
||||
colorId = CanSubMenuItemBeChosen(i) ? 7 : 2;
|
||||
sprintfStatic(text, _("{COLOR}%c%s"), colorId, GetDungeonSubMenuItemString(i));
|
||||
y = GetMenuEntryYCoord(&gDungeonMenu, i);
|
||||
PrintStringOnWindow(8, y, text, 1, 0);
|
||||
|
|
|
|||
|
|
@ -729,7 +729,7 @@ void sub_80A3BB0(GroundBg *groundBg, s32 a0_)
|
|||
mapRender[i].tilemapRenderFunc = RenderChunksToBgTilemap_2x2;
|
||||
break;
|
||||
case CHUNK_DIMENSIONS_3x3:
|
||||
mapRender[i].tilemapRenderFunc = (mapRender[i].wrapAround != FALSE) ? RenderChunksToBgTilemapWrapAround_3x3 : RenderChunksToBgTilemap_3x3;
|
||||
mapRender[i].tilemapRenderFunc = mapRender[i].wrapAround ? RenderChunksToBgTilemapWrapAround_3x3 : RenderChunksToBgTilemap_3x3;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -412,7 +412,7 @@ static void UpdateKecleonStoreDialogue(void)
|
|||
break;
|
||||
case KECLEON_STORE_BUY_ITEM_RECEIPT:
|
||||
if (CountKecleonItems() == 0) {
|
||||
if (sKecleonBrosWork1->isKecleonItemShop != FALSE)
|
||||
if (sKecleonBrosWork1->isKecleonItemShop)
|
||||
sub_801A010();
|
||||
else
|
||||
sub_801A3DC();
|
||||
|
|
@ -420,7 +420,7 @@ static void UpdateKecleonStoreDialogue(void)
|
|||
}
|
||||
else {
|
||||
if (GetNumberOfFilledInventorySlots() >= INVENTORY_SIZE) {
|
||||
if (sKecleonBrosWork1->isKecleonItemShop != FALSE)
|
||||
if (sKecleonBrosWork1->isKecleonItemShop)
|
||||
sub_801A010();
|
||||
else
|
||||
sub_801A3DC();
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ u32 sub_8019EDC(bool8 r0)
|
|||
PlayMenuSoundEffect(MENU_SFX_INFO);
|
||||
return 4;
|
||||
default:
|
||||
if (MenuCursorUpdate(&gUnknown_203B214->m.input, 1) != FALSE) {
|
||||
if (MenuCursorUpdate(&gUnknown_203B214->m.input, 1)) {
|
||||
sub_801A064();
|
||||
sub_801A0D8();
|
||||
return 1;
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ bool8 RescueScenarioConquered(s32 rescueDungeonID_)
|
|||
if (rescueDungeonID == RESCUE_DUNGEON_DUMMY)
|
||||
return FALSE;
|
||||
|
||||
return (GetScriptVarArrayValue(NULL, RESCUE_SCENARIO_CONQUEST_LIST, (u16)rescueDungeonID) != FALSE);
|
||||
return GetScriptVarArrayValue(NULL, RESCUE_SCENARIO_CONQUEST_LIST, (u16)rescueDungeonID) != FALSE;
|
||||
}
|
||||
|
||||
void SetRescueScenarioConquered(s32 rescueDungeonID_, bool32 conquered)
|
||||
|
|
|
|||
|
|
@ -1516,9 +1516,9 @@ static bool8 sub_809B648(void)
|
|||
FinishWriteSavePak();
|
||||
return 0;
|
||||
case SPECIAL_TEXT_STORAGE_WITH_DIALOG: {
|
||||
bool8 unkBool = (CheckQuest(QUEST_SQUARE_ASLEEP) != FALSE);
|
||||
u32 mode = CheckQuest(QUEST_SQUARE_ASLEEP) ? 1 : 0;
|
||||
ResetTextbox();
|
||||
if (CreateKangaskhanStorage(unkBool)) {
|
||||
if (CreateKangaskhanStorage(mode)) {
|
||||
sTextbox->unk418 = &gUnknown_81161C8;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -1529,9 +1529,9 @@ static bool8 sub_809B648(void)
|
|||
sTextbox->unk418 = &gUnknown_81161D8;
|
||||
return 1;
|
||||
case SPECIAL_TEXT_BANK: {
|
||||
bool8 unkBool = (CheckQuest(QUEST_SQUARE_ASLEEP) != FALSE);
|
||||
u32 mode = CheckQuest(QUEST_SQUARE_ASLEEP) ? 1 : 0;
|
||||
ResetTextbox();
|
||||
if (CreateFelicityBank(unkBool)) {
|
||||
if (CreateFelicityBank(mode)) {
|
||||
sTextbox->unk418 = &gUnknown_81161E8;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -1565,9 +1565,9 @@ static bool8 sub_809B648(void)
|
|||
}
|
||||
}
|
||||
case SPECIAL_TEXT_LINK_SHOP: {
|
||||
bool8 unkBool = (CheckQuest(QUEST_SQUARE_ASLEEP) != FALSE);
|
||||
u32 mode = CheckQuest(QUEST_SQUARE_ASLEEP) ? 1 : 0;
|
||||
ResetTextbox();
|
||||
if (sub_801FB50(unkBool)) {
|
||||
if (sub_801FB50(mode)) {
|
||||
sTextbox->unk418 = &gUnknown_8116208;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -1606,9 +1606,9 @@ static bool8 sub_809B648(void)
|
|||
}
|
||||
return 0;
|
||||
case SPECIAL_TEXT_FRIEND_SHOP: {
|
||||
bool8 unk = CheckQuest(QUEST_SQUARE_ASLEEP) != FALSE;
|
||||
u32 mode = CheckQuest(QUEST_SQUARE_ASLEEP) ? 1 : 0;
|
||||
ResetTextbox();
|
||||
if (CreateWigglytuffShop(unk)) {
|
||||
if (CreateWigglytuffShop(mode)) {
|
||||
sTextbox->unk418 = &gUnknown_8116218;
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user