Some constant use in WallyHandleActions

This commit is contained in:
GriffinR 2021-04-03 16:37:00 -04:00
parent b6711441f5
commit fe1b757af5

View file

@ -190,7 +190,7 @@ static void WallyHandleActions(void)
switch (gBattleStruct->wallyBattleState) switch (gBattleStruct->wallyBattleState)
{ {
case 0: case 0:
gBattleStruct->wallyWaitFrames = 64; gBattleStruct->wallyWaitFrames = B_WAIT_TIME_LONG;
gBattleStruct->wallyBattleState++; gBattleStruct->wallyBattleState++;
case 1: case 1:
if (--gBattleStruct->wallyWaitFrames == 0) if (--gBattleStruct->wallyWaitFrames == 0)
@ -200,7 +200,7 @@ static void WallyHandleActions(void)
WallyBufferExecCompleted(); WallyBufferExecCompleted();
gBattleStruct->wallyBattleState++; gBattleStruct->wallyBattleState++;
gBattleStruct->wallyMovesState = 0; gBattleStruct->wallyMovesState = 0;
gBattleStruct->wallyWaitFrames = 64; gBattleStruct->wallyWaitFrames = B_WAIT_TIME_LONG;
} }
break; break;
case 2: case 2:
@ -211,17 +211,17 @@ static void WallyHandleActions(void)
WallyBufferExecCompleted(); WallyBufferExecCompleted();
gBattleStruct->wallyBattleState++; gBattleStruct->wallyBattleState++;
gBattleStruct->wallyMovesState = 0; gBattleStruct->wallyMovesState = 0;
gBattleStruct->wallyWaitFrames = 64; gBattleStruct->wallyWaitFrames = B_WAIT_TIME_LONG;
} }
break; break;
case 3: case 3:
if (--gBattleStruct->wallyWaitFrames == 0) if (--gBattleStruct->wallyWaitFrames == 0)
{ {
BtlController_EmitTwoReturnValues(1, 9, 0); BtlController_EmitTwoReturnValues(1, B_ACTION_WALLY_THROW, 0);
WallyBufferExecCompleted(); WallyBufferExecCompleted();
gBattleStruct->wallyBattleState++; gBattleStruct->wallyBattleState++;
gBattleStruct->wallyMovesState = 0; gBattleStruct->wallyMovesState = 0;
gBattleStruct->wallyWaitFrames = 64; gBattleStruct->wallyWaitFrames = B_WAIT_TIME_LONG;
} }
break; break;
case 4: case 4:
@ -230,7 +230,7 @@ static void WallyHandleActions(void)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
ActionSelectionDestroyCursorAt(0); ActionSelectionDestroyCursorAt(0);
ActionSelectionCreateCursorAt(1, 0); ActionSelectionCreateCursorAt(1, 0);
gBattleStruct->wallyWaitFrames = 64; gBattleStruct->wallyWaitFrames = B_WAIT_TIME_LONG;
gBattleStruct->wallyBattleState++; gBattleStruct->wallyBattleState++;
} }
break; break;