diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-02-02 11:11:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-02 11:11:55 -0600 |
| commit | f7cb3719e2291acb966c542ddfac4e82733580bb (patch) | |
| tree | 291ba897a82f6aad9c7549cbb25f6940c0c6259b /include/battle.h | |
| parent | 9d8a43a1fb5d83680bd8509fa3fbc3b491b8bbf8 (diff) | |
| parent | a740bc719037612da65941482e4a0dab4837c629 (diff) | |
Merge pull request #537 from DizzyEggg/bttle
Name battle's action 11
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h index 9295a3548..94596c75e 100644 --- a/include/battle.h +++ b/include/battle.h @@ -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 |