diff options
author | Frogg <froggestspirit@gmail.com> | 2021-04-10 19:04:59 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-10 19:04:59 -0400 |
commit | ec6b1ea3735ff98a9714b219e4a999894ecc6010 (patch) | |
tree | fff7823aa15ce633de1bc4132574c1d081a84a93 /include/battle.h | |
parent | 677b4fc394516deab5b5c86c94a2a1443cb52151 (diff) | |
parent | 09a9efd5c57909c215a66b85f3255190c8882940 (diff) |
Merge pull request #2 from pret/master
update
Diffstat (limited to 'include/battle.h')
-rw-r--r-- | include/battle.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/include/battle.h b/include/battle.h index 954d33b07..14ecfbdd3 100644 --- a/include/battle.h +++ b/include/battle.h @@ -40,16 +40,17 @@ #define MAX_TRAINER_ITEMS 4 // array entries for battle communication -#define MULTIUSE_STATE 0x0 -#define CURSOR_POSITION 0x1 -#define TASK_ID 0x1 // task Id and cursor position share the same field -#define SPRITES_INIT_STATE1 0x1 // shares the Id as well -#define SPRITES_INIT_STATE2 0x2 -#define MOVE_EFFECT_BYTE 0x3 -#define ACTIONS_CONFIRMED_COUNT 0x4 -#define MULTISTRING_CHOOSER 0x5 -#define MSG_DISPLAY 0x7 -#define BATTLE_COMMUNICATION_ENTRIES_COUNT 0x8 +#define MULTIUSE_STATE 0 +#define CURSOR_POSITION 1 +#define TASK_ID 1 // task Id and cursor position share the same field +#define SPRITES_INIT_STATE1 1 // shares the Id as well +#define SPRITES_INIT_STATE2 2 +#define MOVE_EFFECT_BYTE 3 +#define ACTIONS_CONFIRMED_COUNT 4 +#define MULTISTRING_CHOOSER 5 +#define MISS_TYPE 6 +#define MSG_DISPLAY 7 +#define BATTLE_COMMUNICATION_ENTRIES_COUNT 8 #define MOVE_TARGET_SELECTED 0x0 #define MOVE_TARGET_DEPENDS 0x1 |