dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor issue

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-08-05 09:25:46 +08:00
parent b9d547a02f
commit 08e8856f10
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_ai_script_commands.c
+7 -7
View File
@@ -344,12 +344,12 @@ void BattleAI_SetupAIData(void)
} }
else if (!(gBattleTypeFlags & (0x80900)) && (gTrainerBattleOpponent_A != 0x400)) // _080C6ECC else if (!(gBattleTypeFlags & (0x80900)) && (gTrainerBattleOpponent_A != 0x400)) // _080C6ECC
{ {
if(gBattleTypeFlags & (0x80 << 10)) if (gBattleTypeFlags & (0x80 << 10))
{ {
AI_THINKING_STRUCT->aiFlags = 1; AI_THINKING_STRUCT->aiFlags = 1;
return; return;
} }
else if(gBattleTypeFlags & (0x80 << 11)) else if (gBattleTypeFlags & (0x80 << 11))
{ {
AI_THINKING_STRUCT->aiFlags = 7; AI_THINKING_STRUCT->aiFlags = 7;
return; return;
@@ -1704,22 +1704,22 @@ static void BattleAICmd_frlg_safari(void)
{ {
u8 var; u8 var;
if(gBattleStruct->safariGoNearCounter) if (gBattleStruct->safariGoNearCounter)
{ {
var = gBattleStruct->safariEscapeFactor * 2; var = gBattleStruct->safariEscapeFactor * 2;
if(var > 20) if (var > 20)
var = 20; var = 20;
} }
else if(gBattleStruct->safariPkblThrowCounter != 0) // _080C91DC else if (gBattleStruct->safariPkblThrowCounter != 0) // _080C91DC
{ {
var = gBattleStruct->safariEscapeFactor / 4; var = gBattleStruct->safariEscapeFactor / 4;
if(var == 0) if (var == 0)
var = 1; var = 1;
} }
else else
var = gBattleStruct->safariEscapeFactor; var = gBattleStruct->safariEscapeFactor;
var *= 5; var *= 5;
if((u8)(Random() % 100) < var) if ((u8)(Random() % 100) < var)
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
else else
gAIScriptPtr += 5; gAIScriptPtr += 5;
src/battle_ai_switch_items.c
+1 -1
View File
@@ -38,7 +38,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
s32 i, j; s32 i, j;
u16 move; u16 move;
if(gBattleTypeFlags & BATTLE_TYPE_DOUBLE) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
return FALSE; return FALSE;
if (gBattleMons[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)].ability == ABILITY_WONDER_GUARD) if (gBattleMons[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)].ability == ABILITY_WONDER_GUARD)
{ {
src/battle_controller_player.c
+11 -11
View File
@@ -1198,7 +1198,7 @@ static void sub_80303A8(u8 taskId)
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
u8 battlerId = tExpTask_battler; u8 battlerId = tExpTask_battler;
u16 v5 = sub_80768B0(battlerId); 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]]; struct Sprite *sprite = &gSprites[gBattlerSpriteIds[battlerId]];
switch (data[15]) switch (data[15])
@@ -1226,7 +1226,7 @@ static void sub_80303A8(u8 taskId)
case 1: case 1:
{ {
u32 battlerIdAlt = battlerId; u32 battlerIdAlt = battlerId;
u32 v6Alt = v6; bool32 v6Alt = v6;
sub_8072E48(battlerIdAlt, v6Alt); 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 if (gBattleBufferA[gActiveBattler][2] == TRUE) // check if we didn't want to display pp number
return; return;
SetPpNumbersPaletteInMoveSelection(); 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 = ConvertIntToDecimalStringN(gDisplayedStringBattle, moveInfo->currentPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2);
*txtPtr = CHAR_SLASH; *txtPtr = CHAR_SLASH;
ConvertIntToDecimalStringN(++txtPtr, moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2); ConvertIntToDecimalStringN(++txtPtr, moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2);
@@ -2919,20 +2919,20 @@ static void sub_8033AC8(void)
} }
switch (moveTarget) switch (moveTarget)
{ {
case 0: case MOVE_TARGET_SELECTED:
case 1: case MOVE_TARGET_DEPENDS:
case 2: case MOVE_TARGET_USER_OR_SELECTED:
case 4: case MOVE_TARGET_RANDOM:
bitMask = 0xF0000; bitMask = 0xF0000;
startY = 0; startY = 0;
break; break;
case 8: case MOVE_TARGET_BOTH:
case 64: case MOVE_TARGET_OPPONENTS_FIELD:
bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)] bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)]
| gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16; | gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16;
startY = 8; startY = 8;
break; break;
case 16: case MOVE_TARGET_USER:
switch (move) switch (move)
{ {
case MOVE_HAZE: case MOVE_HAZE:
@@ -2963,7 +2963,7 @@ static void sub_8033AC8(void)
} }
startY = 8; startY = 8;
break; break;
case 32: case MOVE_TARGET_FOES_AND_ALLY:
bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)] bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)]
| gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] | gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)]
| gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16; | gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16;