diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-08-22 15:33:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 15:33:38 -0500 |
| commit | 46ca339a3a8d44ae199228e2e4198daa9d337efb (patch) | |
| tree | 152f0292a9f382f9f2ac545e605e2eecc95ae1f6 /include/battle.h | |
| parent | 3e7bdf4f5fd54676c6f965325ec5b67d3d8b3eef (diff) | |
| parent | 20594938e275bd3d6ec6f38b42400eaac79fa86e (diff) | |
Merge branch 'master' into decompile_battle_5
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 4b2542017..9d8092197 100644 --- a/include/battle.h +++ b/include/battle.h @@ -19,6 +19,15 @@ #define BATTLE_TYPE_LEGENDARY 0x2000 #define BATTLE_TYPE_REGI 0x4000 +#define BATTLE_WON 0x1 +#define BATTLE_LOST 0x2 +#define BATTLE_DREW 0x3 +#define BATTLE_RAN 0x4 +#define BATTLE_PLAYER_TELEPORTED 0x5 +#define BATTLE_POKE_FLED 0x6 +#define BATTLE_CAUGHT 0x7 +#define BATTLE_OPPONENT_TELEPORTED 0xA + #define AI_ACTION_DONE 0x0001 #define AI_ACTION_FLEE 0x0002 #define AI_ACTION_WATCH 0x0004 @@ -327,7 +336,7 @@ struct BattleStruct /* 0x2000000 */ /*0x1609D*/ u8 unk1609D; /*0x1609E*/ u8 unk1609E; /*0x1609F*/ u8 unk1609F; - /*0x160A0*/ u8 unk160a0; + /*0x160A0*/ u8 stringMoveType; /*0x160A1*/ u8 animTargetsHit; /*0x160A2*/ u8 expGetterBank; /*0x160A3*/ u8 unk160A3; |