atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #537 from DizzyEggg/bttle

Browse source 
Name battle's action 11
This commit is contained in:
Diegoisawesome 2019-02-02 11:11:55 -06:00 committed by GitHub
commit f7cb3719e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/battle.h
View file

@ -28,10 +28,11 @@
#define B_ACTION_SAFARI_GO_NEAR 7 #define B_ACTION_SAFARI_GO_NEAR 7
#define B_ACTION_SAFARI_RUN 8 #define B_ACTION_SAFARI_RUN 8
#define B_ACTION_WALLY_THROW 9 #define B_ACTION_WALLY_THROW 9
// The exact purposes of these are unclear #define B_ACTION_EXEC_SCRIPT 10
#define B_ACTION_EXEC_SCRIPT 10 // when executing an action #define B_ACTION_TRY_FINISH 11
#define B_ACTION_FINISHED 12
#define B_ACTION_CANCEL_PARTNER 12 // when choosing an action #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_NOTHING_FAINTED 13 // when choosing an action
#define B_ACTION_NONE 0xFF #define B_ACTION_NONE 0xFF

6
src/battle_main.c
View file

@ -139,7 +139,7 @@ static void HandleAction_ThrowPokeblock(void);
static void HandleAction_GoNear(void); static void HandleAction_GoNear(void);
static void HandleAction_SafariZoneRun(void); static void HandleAction_SafariZoneRun(void);
static void HandleAction_WallyBallThrow(void); static void HandleAction_WallyBallThrow(void);
static void HandleAction_Action11(void); static void HandleAction_TryFinish(void);
static void HandleAction_NothingIsFainted(void); static void HandleAction_NothingIsFainted(void);
static void HandleAction_ActionFinished(void); static void HandleAction_ActionFinished(void);
@ -553,7 +553,7 @@ static void (* const sTurnActionsFuncsTable[])(void) =
[B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun, [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun,
[B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow, [B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow,
[B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript, [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_FINISHED] = HandleAction_ActionFinished,
[B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted, [B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted,
}; };
@ -5845,7 +5845,7 @@ static void HandleAction_WallyBallThrow(void)
gActionsByTurnOrder[1] = B_ACTION_FINISHED; gActionsByTurnOrder[1] = B_ACTION_FINISHED;
} }
static void HandleAction_Action11(void) static void HandleAction_TryFinish(void)
{ {
if (!HandleFaintedMonActions()) if (!HandleFaintedMonActions())
{ {

4
src/battle_script_commands.c
View file

@ -4233,13 +4233,13 @@ static void atk3D_end(void)
gMoveResultFlags = 0; gMoveResultFlags = 0;
gActiveBattler = 0; gActiveBattler = 0;
gCurrentActionFuncId = 0xB; gCurrentActionFuncId = B_ACTION_TRY_FINISH;
} }
static void atk3E_end2(void) static void atk3E_end2(void)
{ {
gActiveBattler = 0; gActiveBattler = 0;
gCurrentActionFuncId = 0xB; gCurrentActionFuncId = B_ACTION_TRY_FINISH;
} }
static void atk3F_end3(void) // pops the main function stack static void atk3F_end3(void) // pops the main function stack