diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_ai_script_commands.c | 14 | ||||
| -rw-r--r-- | src/battle_ai_switch_items.c | 2 | ||||
| -rw-r--r-- | src/battle_controller_player.c | 22 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index ce1b081e7..b7cf113d4 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -344,12 +344,12 @@ void BattleAI_SetupAIData(void) } else if (!(gBattleTypeFlags & (0x80900)) && (gTrainerBattleOpponent_A != 0x400)) // _080C6ECC { - if(gBattleTypeFlags & (0x80 << 10)) + if (gBattleTypeFlags & (0x80 << 10)) { AI_THINKING_STRUCT->aiFlags = 1; return; } - else if(gBattleTypeFlags & (0x80 << 11)) + else if (gBattleTypeFlags & (0x80 << 11)) { AI_THINKING_STRUCT->aiFlags = 7; return; @@ -1704,22 +1704,22 @@ static void BattleAICmd_frlg_safari(void) { u8 var; - if(gBattleStruct->safariGoNearCounter) + if (gBattleStruct->safariGoNearCounter) { var = gBattleStruct->safariEscapeFactor * 2; - if(var > 20) + if (var > 20) var = 20; } - else if(gBattleStruct->safariPkblThrowCounter != 0) // _080C91DC + else if (gBattleStruct->safariPkblThrowCounter != 0) // _080C91DC { var = gBattleStruct->safariEscapeFactor / 4; - if(var == 0) + if (var == 0) var = 1; } else var = gBattleStruct->safariEscapeFactor; var *= 5; - if((u8)(Random() % 100) < var) + if ((u8)(Random() % 100) < var) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 6f059e9a5..22def6ff6 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -38,7 +38,7 @@ static bool8 ShouldSwitchIfWonderGuard(void) s32 i, j; u16 move; - if(gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) return FALSE; if (gBattleMons[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)].ability == ABILITY_WONDER_GUARD) { diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index efa2b0d95..cdf72e4e1 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1198,7 +1198,7 @@ static void sub_80303A8(u8 taskId) s16 *data = gTasks[taskId].data; u8 battlerId = tExpTask_battler; u16 v5 = sub_80768B0(battlerId); - u32 v6 = ((v5 ^ BIT_SIDE)) != B_SIDE_PLAYER; + bool32 v6 = ((v5 ^ BIT_SIDE)) != B_SIDE_PLAYER; struct Sprite *sprite = &gSprites[gBattlerSpriteIds[battlerId]]; switch (data[15]) @@ -1226,7 +1226,7 @@ static void sub_80303A8(u8 taskId) case 1: { u32 battlerIdAlt = battlerId; - u32 v6Alt = v6; + bool32 v6Alt = v6; sub_8072E48(battlerIdAlt, v6Alt); } @@ -1407,7 +1407,7 @@ static void MoveSelectionDisplayPpNumber(void) if (gBattleBufferA[gActiveBattler][2] == TRUE) // check if we didn't want to display pp number return; SetPpNumbersPaletteInMoveSelection(); - moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]); + moveInfo = (struct ChooseMoveStruct *)(&gBattleBufferA[gActiveBattler][4]); txtPtr = ConvertIntToDecimalStringN(gDisplayedStringBattle, moveInfo->currentPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2); *txtPtr = CHAR_SLASH; ConvertIntToDecimalStringN(++txtPtr, moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2); @@ -2919,20 +2919,20 @@ static void sub_8033AC8(void) } switch (moveTarget) { - case 0: - case 1: - case 2: - case 4: + case MOVE_TARGET_SELECTED: + case MOVE_TARGET_DEPENDS: + case MOVE_TARGET_USER_OR_SELECTED: + case MOVE_TARGET_RANDOM: bitMask = 0xF0000; startY = 0; break; - case 8: - case 64: + case MOVE_TARGET_BOTH: + case MOVE_TARGET_OPPONENTS_FIELD: bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)] | gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16; startY = 8; break; - case 16: + case MOVE_TARGET_USER: switch (move) { case MOVE_HAZE: @@ -2963,7 +2963,7 @@ static void sub_8033AC8(void) } startY = 8; break; - case 32: + case MOVE_TARGET_FOES_AND_ALLY: bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)] | gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] | gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16; |