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_controller_player.c
+10 -10
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);
} }
@@ -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;