Name action 11
This commit is contained in:
parent
9d8a43a1fb
commit
a740bc7190
3 changed files with 9 additions and 8 deletions
|
@ -28,10 +28,11 @@
|
|||
#define B_ACTION_SAFARI_GO_NEAR 7
|
||||
#define B_ACTION_SAFARI_RUN 8
|
||||
#define B_ACTION_WALLY_THROW 9
|
||||
// The exact purposes of these are unclear
|
||||
#define B_ACTION_EXEC_SCRIPT 10 // when executing an action
|
||||
#define B_ACTION_EXEC_SCRIPT 10
|
||||
#define B_ACTION_TRY_FINISH 11
|
||||
#define B_ACTION_FINISHED 12
|
||||
|
||||
#define B_ACTION_CANCEL_PARTNER 12 // when choosing an action
|
||||
#define B_ACTION_FINISHED 12 // when executing an action
|
||||
#define B_ACTION_NOTHING_FAINTED 13 // when choosing an action
|
||||
#define B_ACTION_NONE 0xFF
|
||||
|
||||
|
|
|
@ -139,7 +139,7 @@ static void HandleAction_ThrowPokeblock(void);
|
|||
static void HandleAction_GoNear(void);
|
||||
static void HandleAction_SafariZoneRun(void);
|
||||
static void HandleAction_WallyBallThrow(void);
|
||||
static void HandleAction_Action11(void);
|
||||
static void HandleAction_TryFinish(void);
|
||||
static void HandleAction_NothingIsFainted(void);
|
||||
static void HandleAction_ActionFinished(void);
|
||||
|
||||
|
@ -553,7 +553,7 @@ static void (* const sTurnActionsFuncsTable[])(void) =
|
|||
[B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun,
|
||||
[B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow,
|
||||
[B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript,
|
||||
[11] = HandleAction_Action11, // not sure about this one
|
||||
[B_ACTION_TRY_FINISH] = HandleAction_TryFinish,
|
||||
[B_ACTION_FINISHED] = HandleAction_ActionFinished,
|
||||
[B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted,
|
||||
};
|
||||
|
@ -5845,7 +5845,7 @@ static void HandleAction_WallyBallThrow(void)
|
|||
gActionsByTurnOrder[1] = B_ACTION_FINISHED;
|
||||
}
|
||||
|
||||
static void HandleAction_Action11(void)
|
||||
static void HandleAction_TryFinish(void)
|
||||
{
|
||||
if (!HandleFaintedMonActions())
|
||||
{
|
||||
|
|
|
@ -4233,13 +4233,13 @@ static void atk3D_end(void)
|
|||
|
||||
gMoveResultFlags = 0;
|
||||
gActiveBattler = 0;
|
||||
gCurrentActionFuncId = 0xB;
|
||||
gCurrentActionFuncId = B_ACTION_TRY_FINISH;
|
||||
}
|
||||
|
||||
static void atk3E_end2(void)
|
||||
{
|
||||
gActiveBattler = 0;
|
||||
gCurrentActionFuncId = 0xB;
|
||||
gCurrentActionFuncId = B_ACTION_TRY_FINISH;
|
||||
}
|
||||
|
||||
static void atk3F_end3(void) // pops the main function stack
|
||||
|
|
Loading…
Reference in a new issue