diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/battle_anim.h | 98 |
1 files changed, 51 insertions, 47 deletions
diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 760822225..1ad375a8f 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -59,56 +59,57 @@ #define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) // ANIM_TAG_SPARKLE_2 #define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) // ANIM_TAG_HUMANOID_FOOT -#define ANIM_TAG_051 (ANIM_SPRITES_START + 51) // ANIM_TAG_UNUSED_MONSTER_FOOT -#define ANIM_TAG_052 (ANIM_SPRITES_START + 52) // ANIM_TAG_UNUSED_HUMANOID_HAND -#define ANIM_TAG_053 (ANIM_SPRITES_START + 53) // ANIM_TAG_NOISE_LINE -#define ANIM_TAG_054 (ANIM_SPRITES_START + 54) // ANIM_TAG_UNUSED_YELLOW_UNK -#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55) // ANIM_TAG_UNUSED_RED_FIST -#define ANIM_TAG_056 (ANIM_SPRITES_START + 56) // ANIM_TAG_SLAM_HIT -#define ANIM_TAG_057 (ANIM_SPRITES_START + 57) // ANIM_TAG_UNUSED_RING -#define ANIM_TAG_058 (ANIM_SPRITES_START + 58) // ANIM_TAG_ROCKS -#define ANIM_TAG_059 (ANIM_SPRITES_START + 59) // ANIM_TAG_UNUSED_Z -#define ANIM_TAG_060 (ANIM_SPRITES_START + 60) // ANIM_TAG_UNUSED_YELLOW_UNK_2 -#define ANIM_TAG_061 (ANIM_SPRITES_START + 61) // ANIM_TAG_UNUSED_AIR_SLASH -#define ANIM_TAG_062 (ANIM_SPRITES_START + 62) // ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS -#define ANIM_TAG_063 (ANIM_SPRITES_START + 63) // ANIM_TAG_LEAF -#define ANIM_TAG_064 (ANIM_SPRITES_START + 64) // ANIM_TAG_FINGER -#define ANIM_TAG_065 (ANIM_SPRITES_START + 65) // ANIM_TAG_POISON_POWDER -#define ANIM_TAG_066 (ANIM_SPRITES_START + 66) // ANIM_TAG_UNUSED_BROWN_TRIANGLE -#define ANIM_TAG_067 (ANIM_SPRITES_START + 67) // ANIM_TAG_SLEEP_POWDER -#define ANIM_TAG_068 (ANIM_SPRITES_START + 68) // ANIM_TAG_STUN_SPORE -#define ANIM_TAG_069 (ANIM_SPRITES_START + 69) // ANIM_TAG_UNUSED_POWDER -#define ANIM_TAG_070 (ANIM_SPRITES_START + 70) // ANIM_TAG_SPARKLE_3 -#define ANIM_TAG_071 (ANIM_SPRITES_START + 71) // ANIM_TAG_SPARKLE_4 -#define ANIM_TAG_MUSIC_NOTES2 (ANIM_SPRITES_START + 72) // ANIM_TAG_MUSIC_NOTES +#define ANIM_TAG_UNUSED_MONSTER_FOOT (ANIM_SPRITES_START + 51) // ANIM_TAG_UNUSED_MONSTER_FOOT +#define ANIM_TAG_UNUSED_HUMANOID_HAND (ANIM_SPRITES_START + 52) // ANIM_TAG_UNUSED_HUMANOID_HAND +#define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53) // ANIM_TAG_NOISE_LINE +#define ANIM_TAG_UNUSED_YELLOW_UNK (ANIM_SPRITES_START + 54) // ANIM_TAG_UNUSED_YELLOW_UNK +#define ANIM_TAG_UNUSED_RED_FIST (ANIM_SPRITES_START + 55) // ANIM_TAG_UNUSED_RED_FIST +#define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56) // ANIM_TAG_SLAM_HIT +#define ANIM_TAG_UNUSED_RING (ANIM_SPRITES_START + 57) // ANIM_TAG_UNUSED_RING +#define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58) // ANIM_TAG_ROCKS +#define ANIM_TAG_UNUSED_Z (ANIM_SPRITES_START + 59) // ANIM_TAG_UNUSED_Z +#define ANIM_TAG_UNUSED_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) // ANIM_TAG_UNUSED_YELLOW_UNK_2 +#define ANIM_TAG_UNUSED_AIR_SLASH (ANIM_SPRITES_START + 61) // ANIM_TAG_UNUSED_AIR_SLASH +#define ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) // ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS +#define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63) // ANIM_TAG_LEAF +#define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64) // ANIM_TAG_FINGER +#define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65) // ANIM_TAG_POISON_POWDER +#define ANIM_TAG_UNUSED_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) // ANIM_TAG_UNUSED_BROWN_TRIANGLE +#define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67) // ANIM_TAG_SLEEP_POWDER +#define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68) // ANIM_TAG_STUN_SPORE +#define ANIM_TAG_UNUSED_POWDER (ANIM_SPRITES_START + 69) // ANIM_TAG_UNUSED_POWDER +#define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70) // ANIM_TAG_SPARKLE_3 +#define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71) // ANIM_TAG_SPARKLE_4 +#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72) // ANIM_TAG_MUSIC_NOTES #define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73) -#define ANIM_TAG_074 (ANIM_SPRITES_START + 74) // ANIM_TAG_MUD_SAND -#define ANIM_TAG_075 (ANIM_SPRITES_START + 75) // ANIM_TAG_ALERT -#define ANIM_TAG_076 (ANIM_SPRITES_START + 76) // ANIM_TAG_UNUSED_BLUE_FLAMES -#define ANIM_TAG_077 (ANIM_SPRITES_START + 77) // ANIM_TAG_UNUSED_BLUE_FLAMES_2 -#define ANIM_TAG_078 (ANIM_SPRITES_START + 78) // ANIM_TAG_UNUSED_SHOCK -#define ANIM_TAG_079 (ANIM_SPRITES_START + 79) // ANIM_TAG_SHOCK -#define ANIM_TAG_080 (ANIM_SPRITES_START + 80) // ANIM_TAG_UNUSED_BELL -#define ANIM_TAG_081 (ANIM_SPRITES_START + 81) // ANIM_TAG_UNUSED_PINK_GLOVE -#define ANIM_TAG_082 (ANIM_SPRITES_START + 82) // ANIM_TAG_UNUSED_BLUE_LINES -#define ANIM_TAG_083 (ANIM_SPRITES_START + 83) // ANIM_TAG_UNUSED_IMPACT -#define ANIM_TAG_084 (ANIM_SPRITES_START + 84) // ANIM_TAG_UNUSED_IMPACT_2 -#define ANIM_TAG_085 (ANIM_SPRITES_START + 85) // ANIM_TAG_UNUSED_RETICLE -#define ANIM_TAG_086 (ANIM_SPRITES_START + 86) // ANIM_TAG_BREATH +#define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74) // ANIM_TAG_MUD_SAND +#define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75) // ANIM_TAG_ALERT +#define ANIM_TAG_UNUSED_BLUE_FLAMES (ANIM_SPRITES_START + 76) // ANIM_TAG_UNUSED_BLUE_FLAMES +#define ANIM_TAG_UNUSED_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) // ANIM_TAG_UNUSED_BLUE_FLAMES_2 +#define ANIM_TAG_UNUSED_SHOCK (ANIM_SPRITES_START + 78) // ANIM_TAG_UNUSED_SHOCK +#define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79) // ANIM_TAG_SHOCK +#define ANIM_TAG_UNUSED_BELL (ANIM_SPRITES_START + 80) // ANIM_TAG_UNUSED_BELL +#define ANIM_TAG_UNUSED_PINK_GLOVE (ANIM_SPRITES_START + 81) // ANIM_TAG_UNUSED_PINK_GLOVE +#define ANIM_TAG_UNUSED_BLUE_LINES (ANIM_SPRITES_START + 82) // ANIM_TAG_UNUSED_BLUE_LINES +#define ANIM_TAG_UNUSED_IMPACT (ANIM_SPRITES_START + 83) // ANIM_TAG_UNUSED_IMPACT +#define ANIM_TAG_UNUSED_IMPACT_2 (ANIM_SPRITES_START + 84) // ANIM_TAG_UNUSED_IMPACT_2 +#define ANIM_TAG_UNUSED_RETICLE (ANIM_SPRITES_START + 85) // ANIM_TAG_UNUSED_RETICLE +#define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86) // ANIM_TAG_BREATH #define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87) -#define ANIM_TAG_088 (ANIM_SPRITES_START + 88) // ANIM_TAG_UNUSED_SNOWBALL -#define ANIM_TAG_089 (ANIM_SPRITES_START + 89) // ANIM_TAG_UNUSED_VINE -#define ANIM_TAG_090 (ANIM_SPRITES_START + 90) // ANIM_TAG_UNUSED_SWORD -#define ANIM_TAG_091 (ANIM_SPRITES_START + 91) // ANIM_TAG_UNUSED_CLAPPING -#define ANIM_TAG_092 (ANIM_SPRITES_START + 92) // ANIM_TAG_UNUSED_RED_TUBE -#define ANIM_TAG_093 (ANIM_SPRITES_START + 93) // ANIM_TAG_AMNESIA -#define ANIM_TAG_094 (ANIM_SPRITES_START + 94) // ANIM_TAG_UNUSED_STRING -#define ANIM_TAG_095 (ANIM_SPRITES_START + 95) // ANIM_TAG_UNUSED_PENCIL -#define ANIM_TAG_096 (ANIM_SPRITES_START + 96) // ANIM_TAG_UNUSED_PETAL +#define ANIM_TAG_UNUSED_SNOWBALL (ANIM_SPRITES_START + 88) // ANIM_TAG_UNUSED_SNOWBALL +#define ANIM_TAG_UNUSED_VINE (ANIM_SPRITES_START + 89) // ANIM_TAG_UNUSED_VINE +#define ANIM_TAG_UNUSED_SWORD (ANIM_SPRITES_START + 90) // ANIM_TAG_UNUSED_SWORD +#define ANIM_TAG_UNUSED_CLAPPING (ANIM_SPRITES_START + 91) // ANIM_TAG_UNUSED_CLAPPING +#define ANIM_TAG_UNUSED_RED_TUBE (ANIM_SPRITES_START + 92) // ANIM_TAG_UNUSED_RED_TUBE +#define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93) // ANIM_TAG_AMNESIA +#define ANIM_TAG_UNUSED_STRING (ANIM_SPRITES_START + 94) // ANIM_TAG_UNUSED_STRING +#define ANIM_TAG_UNUSED_PENCIL (ANIM_SPRITES_START + 95) // ANIM_TAG_UNUSED_PENCIL +#define ANIM_TAG_UNUSED_PETAL (ANIM_SPRITES_START + 96) // ANIM_TAG_UNUSED_PETAL #define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97) -#define ANIM_TAG_098 (ANIM_SPRITES_START + 98) // ANIM_TAG_UNUSED_WEB +#define ANIM_TAG_UNUSED_WEB (ANIM_SPRITES_START + 98) // ANIM_TAG_UNUSED_WEB #define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) -#define ANIM_TAG_100 (ANIM_SPRITES_START + 100) // ANIM_TAG_COIN +#define ANIM_TAG_COIN (ANIM_SPRITES_START + 100) // ANIM_TAG_COIN + #define ANIM_TAG_101 (ANIM_SPRITES_START + 101) // ANIM_TAG_UNUSED_CRACKED_EGG #define ANIM_TAG_102 (ANIM_SPRITES_START + 102) // ANIM_TAG_UNUSED_HATCHED_EGG #define ANIM_TAG_103 (ANIM_SPRITES_START + 103) // ANIM_TAG_UNUSED_FRESH_EGG @@ -159,6 +160,7 @@ #define ANIM_TAG_148 (ANIM_SPRITES_START + 148) // ANIM_TAG_WATER_IMPACT #define ANIM_TAG_149 (ANIM_SPRITES_START + 149) // ANIM_TAG_WATER_ORB #define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150) + #define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151) #define ANIM_TAG_152 (ANIM_SPRITES_START + 152) // ANIM_TAG_SPIKES #define ANIM_TAG_153 (ANIM_SPRITES_START + 153) // ANIM_TAG_HORN_HIT_2 @@ -209,12 +211,13 @@ #define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198) #define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199) #define ANIM_TAG_200 (ANIM_SPRITES_START + 200) // ANIM_TAG_GHOSTLY_SPIRIT + #define ANIM_TAG_201 (ANIM_SPRITES_START + 201) // ANIM_TAG_WARM_ROCK #define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) #define ANIM_TAG_203 (ANIM_SPRITES_START + 203) // ANIM_TAG_THIN_RING #define ANIM_TAG_204 (ANIM_SPRITES_START + 204) // ANIM_TAG_UNUSED_PUNCH_IMPACT #define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) -#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 206) // ANIM_TAG_MUSIC_NOTES_2 +#define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206) // ANIM_TAG_MUSIC_NOTES_2 #define ANIM_TAG_207 (ANIM_SPRITES_START + 207) // ANIM_TAG_SPEED_DUST #define ANIM_TAG_208 (ANIM_SPRITES_START + 208) // ANIM_TAG_TORN_METAL #define ANIM_TAG_209 (ANIM_SPRITES_START + 209) // ANIM_TAG_THOUGHT_BUBBLE @@ -259,6 +262,7 @@ #define ANIM_TAG_248 (ANIM_SPRITES_START + 248) // ANIM_TAG_SMALL_RED_EYE #define ANIM_TAG_249 (ANIM_SPRITES_START + 249) // ANIM_TAG_HOLLOW_ORB #define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250) + #define ANIM_TAG_251 (ANIM_SPRITES_START + 251) // ANIM_TAG_BLUEGREEN_ORB #define ANIM_TAG_252 (ANIM_SPRITES_START + 252) // ANIM_TAG_PAW_PRINT #define ANIM_TAG_253 (ANIM_SPRITES_START + 253) // ANIM_TAG_PURPLE_FLAME |