diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 12 | ||||
| -rw-r--r-- | include/battle_script_commands.h | 8 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 4 | ||||
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/region_map.h | 1 |
5 files changed, 20 insertions, 7 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 1252886bf..133dde62f 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -5,6 +5,16 @@ #include "sprite.h" +// battle_anim_status_effects.c +#define STAT_ANIM_PLUS1 15 +#define STAT_ANIM_PLUS2 39 +#define STAT_ANIM_MINUS1 22 +#define STAT_ANIM_MINUS2 46 +#define STAT_ANIM_MULTIPLE_PLUS1 55 +#define STAT_ANIM_MULTIPLE_PLUS2 56 +#define STAT_ANIM_MULTIPLE_MINUS1 57 +#define STAT_ANIM_MULTIPLE_MINUS2 58 + #define REG_BGnCNT_BITFIELD(n) (*(vBgCnt *)REG_ADDR_BG##n##CNT) #define REG_BG0CNT_BITFIELD REG_BGnCNT_BITFIELD(0) #define REG_BG1CNT_BITFIELD REG_BGnCNT_BITFIELD(1) @@ -39,7 +49,7 @@ struct ContestMoveAnim u8 contestant; u32 personality; u32 otId; - u32 personality2; + u32 targetPersonality; }; extern void (*gAnimScriptCallback)(void); diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index 36f54c6a8..4cfa4d71b 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -16,10 +16,10 @@ #define BS_GET_ATTACKER_SIDE 8 // for atk1E_jumpifability #define BS_GET_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability -#define ATK48_STAT_NEGATIVE 0x1 -#define ATK48_STAT_BY_TWO 0x2 -#define ATK48_BIT_x4 0x4 -#define ATK48_LOWER_FAIL_CHECK 0x8 +#define STAT_CHANGE_NEGATIVE (1 << 0) +#define STAT_CHANGE_BY_TWO (1 << 1) +#define STAT_CHANGE_MULTIPLE_STATS (1 << 2) +#define STAT_CHANGE_CANT_PREVENT (1 << 3) #define ATK4F_DONT_CHECK_STATUSES 0x80 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index f5a9f4a6e..d1cec4461 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -141,6 +141,10 @@ #define NUM_STATS 6 #define UNOWN_FORM_COUNT 28 +#define MIN_STAT_STAGE 0 +#define DEFAULT_STAT_STAGE 6 +#define MAX_STAT_STAGE 12 + #define PLAYER_HAS_TWO_USABLE_MONS 0 #define PLAYER_HAS_ONE_MON 1 #define PLAYER_HAS_ONE_USABLE_MON 2 diff --git a/include/global.h b/include/global.h index 17e25f4b5..7897e20c2 100644 --- a/include/global.h +++ b/include/global.h @@ -136,7 +136,7 @@ struct UCoords16 struct SecretBaseParty { /*0x1A3C*/ u32 personality[PARTY_SIZE]; - /*0x1A54*/ u16 moves[PARTY_SIZE * 4]; + /*0x1A54*/ u16 moves[PARTY_SIZE * MAX_MON_MOVES]; /*0x1A84*/ u16 species[PARTY_SIZE]; /*0x1A90*/ u16 heldItems[PARTY_SIZE]; /*0x1A9C*/ u8 levels[PARTY_SIZE]; diff --git a/include/region_map.h b/include/region_map.h index dc3b8cee6..f42c7c493 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -60,7 +60,6 @@ struct RegionMap /*0x280*/ u8 cursorLargeImage[0x600]; }; // size: 0x880 -// Replaces field_region_map.c:UnkStruct, region_map.c:UnknownStruct3 struct RegionMapState { void (*callback)(void); |