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

Synced src/pokeball.c

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-29 21:39:25 -04:00
parent c40791fd4e
commit dcb9d9de1e
32 changed files with 575 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_controller_player.c
+8 -8
View File
@@ -931,7 +931,7 @@ static void Intro_TryShinyAnimShowHealthbox(void)
HEALTHBOX_ALL);
StartHealthboxSlideIn(gActiveBattler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 0;
gBattleSpritesDataPtr->animationData->introAnimActive = FALSE;
gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox;
}
}
@@ -2719,7 +2719,7 @@ static void PlayerHandleIntroTrainerBallThrow(void)
gTasks[taskId].data[0] = gActiveBattler;
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown)
gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary;
gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 1;
gBattleSpritesDataPtr->animationData->introAnimActive = TRUE;
gBattlerControllerFuncs[gActiveBattler] = PlayerDummy;
}
@@ -2912,8 +2912,8 @@ static void PreviewDeterminativeMoveTargets(void)
break;
case MOVE_TARGET_BOTH:
case MOVE_TARGET_OPPONENTS_FIELD:
bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)]
| gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16;
bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)]
| gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16;
startY = 8;
break;
case MOVE_TARGET_USER:
@@ -2935,8 +2935,8 @@ static void PreviewDeterminativeMoveTargets(void)
case MOVE_MIST:
case MOVE_HEAL_BELL:
case MOVE_AROMATHERAPY:
bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]
| gBitTable[GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)]) << 16;
bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]
| gBitTable[GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)]) << 16;
break;
case MOVE_HELPING_HAND:
bitMask = (gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)]) << 16;
@@ -2948,8 +2948,8 @@ static void PreviewDeterminativeMoveTargets(void)
startY = 8;
break;
case MOVE_TARGET_FOES_AND_ALLY:
bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)]
| gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)]
bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)]
| gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)]
| gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16;
startY = 8;
break;