summaryrefslogtreecommitdiff
path: root/src/battle_controller_wally.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_controller_wally.c')
-rw-r--r--src/battle_controller_wally.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 8b490a5bf..0d1515213 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -190,7 +190,7 @@ static void WallyHandleActions(void)
switch (gBattleStruct->wallyBattleState)
{
case 0:
- gBattleStruct->wallyWaitFrames = 64;
+ gBattleStruct->wallyWaitFrames = B_WAIT_TIME_LONG;
gBattleStruct->wallyBattleState++;
case 1:
if (--gBattleStruct->wallyWaitFrames == 0)
@@ -200,7 +200,7 @@ static void WallyHandleActions(void)
WallyBufferExecCompleted();
gBattleStruct->wallyBattleState++;
gBattleStruct->wallyMovesState = 0;
- gBattleStruct->wallyWaitFrames = 64;
+ gBattleStruct->wallyWaitFrames = B_WAIT_TIME_LONG;
}
break;
case 2:
@@ -211,17 +211,17 @@ static void WallyHandleActions(void)
WallyBufferExecCompleted();
gBattleStruct->wallyBattleState++;
gBattleStruct->wallyMovesState = 0;
- gBattleStruct->wallyWaitFrames = 64;
+ gBattleStruct->wallyWaitFrames = B_WAIT_TIME_LONG;
}
break;
case 3:
if (--gBattleStruct->wallyWaitFrames == 0)
{
- BtlController_EmitTwoReturnValues(1, 9, 0);
+ BtlController_EmitTwoReturnValues(1, B_ACTION_WALLY_THROW, 0);
WallyBufferExecCompleted();
gBattleStruct->wallyBattleState++;
gBattleStruct->wallyMovesState = 0;
- gBattleStruct->wallyWaitFrames = 64;
+ gBattleStruct->wallyWaitFrames = B_WAIT_TIME_LONG;
}
break;
case 4:
@@ -230,7 +230,7 @@ static void WallyHandleActions(void)
PlaySE(SE_SELECT);
ActionSelectionDestroyCursorAt(0);
ActionSelectionCreateCursorAt(1, 0);
- gBattleStruct->wallyWaitFrames = 64;
+ gBattleStruct->wallyWaitFrames = B_WAIT_TIME_LONG;
gBattleStruct->wallyBattleState++;
}
break;