From 311c1b9cba09507ce7d4d99cd58735c8d0363164 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 6 Apr 2019 14:34:13 +0200 Subject: [PATCH] Change anim tag names --- include/constants/battle_anim.h | 240 ++++++++++----------- src/battle_anim.c | 372 ++++++++++++++++---------------- 2 files changed, 306 insertions(+), 306 deletions(-) diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 34a45395c..f66013389 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -11,137 +11,137 @@ #define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1) #define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2) #define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3) -#define ANIM_TAG_UNUSED_ORB (ANIM_SPRITES_START + 4) +#define ANIM_TAG_ORB (ANIM_SPRITES_START + 4) // unused #define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5) #define ANIM_TAG_SEED (ANIM_SPRITES_START + 6) -#define ANIM_TAG_UNUSED_EXPLOSION (ANIM_SPRITES_START + 7) -#define ANIM_TAG_UNUSED_PINK_ORB (ANIM_SPRITES_START + 8) +#define ANIM_TAG_EXPLOSION_6 (ANIM_SPRITES_START + 7) // unused +#define ANIM_TAG_PINK_ORB (ANIM_SPRITES_START + 8) // unused #define ANIM_TAG_GUST (ANIM_SPRITES_START + 9) #define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10) #define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11) -#define ANIM_TAG_UNUSED_ORANGE (ANIM_SPRITES_START + 12) +#define ANIM_TAG_ORANGE (ANIM_SPRITES_START + 12) // unused #define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13) #define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14) #define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15) #define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16) #define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17) #define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18) -#define ANIM_TAG_UNUSED_GLASS (ANIM_SPRITES_START + 19) +#define ANIM_TAG_GLASS (ANIM_SPRITES_START + 19) // unused #define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20) -#define ANIM_TAG_UNUSED_HIT (ANIM_SPRITES_START + 21) -#define ANIM_TAG_UNUSED_HIT_2 (ANIM_SPRITES_START + 22) -#define ANIM_TAG_UNUSED_BLUE_SHARDS (ANIM_SPRITES_START + 23) -#define ANIM_TAG_UNUSED_CLOSING_EYE (ANIM_SPRITES_START + 24) -#define ANIM_TAG_UNUSED_WAVING_HAND (ANIM_SPRITES_START + 25) -#define ANIM_TAG_UNUSED_HIT_DUPLICATE (ANIM_SPRITES_START + 26) +#define ANIM_TAG_HIT (ANIM_SPRITES_START + 21) // unused +#define ANIM_TAG_HIT_2 (ANIM_SPRITES_START + 22) // unused +#define ANIM_TAG_BLUE_SHARDS (ANIM_SPRITES_START + 23) // unused +#define ANIM_TAG_CLOSING_EYE (ANIM_SPRITES_START + 24) // unused +#define ANIM_TAG_WAVING_HAND (ANIM_SPRITES_START + 25) // unused +#define ANIM_TAG_HIT_DUPLICATE (ANIM_SPRITES_START + 26) // unused #define ANIM_TAG_LEER (ANIM_SPRITES_START + 27) -#define ANIM_TAG_UNUSED_BLUE_BURST (ANIM_SPRITES_START + 28) +#define ANIM_TAG_BLUE_BURST (ANIM_SPRITES_START + 28) // unused #define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29) #define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30) #define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31) -#define ANIM_TAG_UNUSED_BUBBLE_BURST (ANIM_SPRITES_START + 32) +#define ANIM_TAG_BUBBLE_BURST (ANIM_SPRITES_START + 32) // unused #define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33) -#define ANIM_TAG_UNUSED_SPINNING_FIRE (ANIM_SPRITES_START + 34) +#define ANIM_TAG_SPINNING_FIRE (ANIM_SPRITES_START + 34) // unused #define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35) -#define ANIM_TAG_UNUSED_LIGHTNING (ANIM_SPRITES_START + 36) +#define ANIM_TAG_LIGHTNING_2 (ANIM_SPRITES_START + 36) // unused #define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37) -#define ANIM_TAG_UNUSED_CLAW_SLASH (ANIM_SPRITES_START + 38) +#define ANIM_TAG_CLAW_SLASH_2 (ANIM_SPRITES_START + 38) // unused #define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39) -#define ANIM_TAG_UNUSED_SCRATCH (ANIM_SPRITES_START + 40) -#define ANIM_TAG_UNUSED_SCRATCH_2 (ANIM_SPRITES_START + 41) -#define ANIM_TAG_UNUSED_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) +#define ANIM_TAG_SCRATCH_3 (ANIM_SPRITES_START + 40) // unused +#define ANIM_TAG_SCRATCH_2 (ANIM_SPRITES_START + 41) // unused +#define ANIM_TAG_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) // unused #define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43) -#define ANIM_TAG_UNUSED_GLASS_2 (ANIM_SPRITES_START + 44) -#define ANIM_TAG_UNUSED_PINK_HEART (ANIM_SPRITES_START + 45) -#define ANIM_TAG_UNUSED_SAP_DRIP (ANIM_SPRITES_START + 46) -#define ANIM_TAG_UNUSED_SAP_DRIP_2 (ANIM_SPRITES_START + 47) +#define ANIM_TAG_GLASS_2 (ANIM_SPRITES_START + 44) // unused +#define ANIM_TAG_PINK_HEART_2 (ANIM_SPRITES_START + 45) // unused +#define ANIM_TAG_SAP_DRIP (ANIM_SPRITES_START + 46) // unused +#define ANIM_TAG_SAP_DRIP_2 (ANIM_SPRITES_START + 47) // unused #define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48) #define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) #define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) -#define ANIM_TAG_UNUSED_MONSTER_FOOT (ANIM_SPRITES_START + 51) -#define ANIM_TAG_UNUSED_HUMANOID_HAND (ANIM_SPRITES_START + 52) +#define ANIM_TAG_MONSTER_FOOT (ANIM_SPRITES_START + 51) // unused +#define ANIM_TAG_HUMANOID_HAND (ANIM_SPRITES_START + 52) // unused #define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53) -#define ANIM_TAG_UNUSED_YELLOW_UNK (ANIM_SPRITES_START + 54) -#define ANIM_TAG_UNUSED_RED_FIST (ANIM_SPRITES_START + 55) +#define ANIM_TAG_YELLOW_UNK (ANIM_SPRITES_START + 54) // unused +#define ANIM_TAG_RED_FIST (ANIM_SPRITES_START + 55) // unused #define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56) -#define ANIM_TAG_UNUSED_RING (ANIM_SPRITES_START + 57) +#define ANIM_TAG_RING (ANIM_SPRITES_START + 57) // unused #define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58) -#define ANIM_TAG_UNUSED_Z (ANIM_SPRITES_START + 59) -#define ANIM_TAG_UNUSED_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) -#define ANIM_TAG_UNUSED_AIR_SLASH (ANIM_SPRITES_START + 61) -#define ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) +#define ANIM_TAG_Z (ANIM_SPRITES_START + 59) // unused +#define ANIM_TAG_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) // unused +#define ANIM_TAG_AIR_SLASH (ANIM_SPRITES_START + 61) // unused +#define ANIM_TAG_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) // unused #define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63) #define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64) #define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65) -#define ANIM_TAG_UNUSED_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) +#define ANIM_TAG_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) // unused #define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67) #define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68) -#define ANIM_TAG_UNUSED_POWDER (ANIM_SPRITES_START + 69) +#define ANIM_TAG_POWDER (ANIM_SPRITES_START + 69) // unused #define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70) #define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71) #define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72) #define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73) #define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74) #define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75) -#define ANIM_TAG_UNUSED_BLUE_FLAMES (ANIM_SPRITES_START + 76) -#define ANIM_TAG_UNUSED_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) -#define ANIM_TAG_UNUSED_SHOCK (ANIM_SPRITES_START + 78) +#define ANIM_TAG_BLUE_FLAMES (ANIM_SPRITES_START + 76) // unused +#define ANIM_TAG_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) // unused +#define ANIM_TAG_SHOCK_4 (ANIM_SPRITES_START + 78) // unused #define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79) -#define ANIM_TAG_UNUSED_BELL (ANIM_SPRITES_START + 80) -#define ANIM_TAG_UNUSED_PINK_GLOVE (ANIM_SPRITES_START + 81) -#define ANIM_TAG_UNUSED_BLUE_LINES (ANIM_SPRITES_START + 82) -#define ANIM_TAG_UNUSED_IMPACT (ANIM_SPRITES_START + 83) -#define ANIM_TAG_UNUSED_IMPACT_2 (ANIM_SPRITES_START + 84) -#define ANIM_TAG_UNUSED_RETICLE (ANIM_SPRITES_START + 85) +#define ANIM_TAG_BELL_2 (ANIM_SPRITES_START + 80) // unused +#define ANIM_TAG_PINK_GLOVE (ANIM_SPRITES_START + 81) // unused +#define ANIM_TAG_BLUE_LINES (ANIM_SPRITES_START + 82) // unused +#define ANIM_TAG_IMPACT_3 (ANIM_SPRITES_START + 83) // unused +#define ANIM_TAG_IMPACT_2 (ANIM_SPRITES_START + 84) // unused +#define ANIM_TAG_RETICLE (ANIM_SPRITES_START + 85) // unused #define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86) #define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87) -#define ANIM_TAG_UNUSED_SNOWBALL (ANIM_SPRITES_START + 88) -#define ANIM_TAG_UNUSED_VINE (ANIM_SPRITES_START + 89) -#define ANIM_TAG_UNUSED_SWORD (ANIM_SPRITES_START + 90) -#define ANIM_TAG_UNUSED_CLAPPING (ANIM_SPRITES_START + 91) -#define ANIM_TAG_UNUSED_RED_TUBE (ANIM_SPRITES_START + 92) +#define ANIM_TAG_SNOWBALL (ANIM_SPRITES_START + 88) // unused +#define ANIM_TAG_VINE (ANIM_SPRITES_START + 89) // unused +#define ANIM_TAG_SWORD_2 (ANIM_SPRITES_START + 90) // unused +#define ANIM_TAG_CLAPPING (ANIM_SPRITES_START + 91) // unused +#define ANIM_TAG_RED_TUBE (ANIM_SPRITES_START + 92) // unused #define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93) -#define ANIM_TAG_UNUSED_STRING (ANIM_SPRITES_START + 94) -#define ANIM_TAG_UNUSED_PENCIL (ANIM_SPRITES_START + 95) -#define ANIM_TAG_UNUSED_PETAL (ANIM_SPRITES_START + 96) +#define ANIM_TAG_STRING_2 (ANIM_SPRITES_START + 94) // unused +#define ANIM_TAG_PENCIL_2 (ANIM_SPRITES_START + 95) // unused +#define ANIM_TAG_PETAL (ANIM_SPRITES_START + 96) // unused #define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97) -#define ANIM_TAG_UNUSED_WEB (ANIM_SPRITES_START + 98) +#define ANIM_TAG_WEB (ANIM_SPRITES_START + 98) // unused #define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) #define ANIM_TAG_COIN (ANIM_SPRITES_START + 100) -#define ANIM_TAG_UNUSED_CRACKED_EGG (ANIM_SPRITES_START + 101) -#define ANIM_TAG_UNUSED_HATCHED_EGG (ANIM_SPRITES_START + 102) -#define ANIM_TAG_UNUSED_FRESH_EGG (ANIM_SPRITES_START + 103) -#define ANIM_TAG_UNUSED_FANGS (ANIM_SPRITES_START + 104) -#define ANIM_TAG_UNUSED_EXPLOSION_2 (ANIM_SPRITES_START + 105) -#define ANIM_TAG_UNUSED_EXPLOSION_3 (ANIM_SPRITES_START + 106) -#define ANIM_TAG_UNUSED_WATER_DROPLET (ANIM_SPRITES_START + 107) -#define ANIM_TAG_UNUSED_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) -#define ANIM_TAG_UNUSED_SEED (ANIM_SPRITES_START + 109) -#define ANIM_TAG_UNUSED_SPROUT (ANIM_SPRITES_START + 110) -#define ANIM_TAG_UNUSED_RED_WAND (ANIM_SPRITES_START + 111) -#define ANIM_TAG_UNUSED_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) -#define ANIM_TAG_UNUSED_WATER_COLUMN (ANIM_SPRITES_START + 113) -#define ANIM_TAG_UNUSED_MUD_UNK (ANIM_SPRITES_START + 114) +#define ANIM_TAG_CRACKED_EGG (ANIM_SPRITES_START + 101) // unused +#define ANIM_TAG_HATCHED_EGG (ANIM_SPRITES_START + 102) // unused +#define ANIM_TAG_FRESH_EGG (ANIM_SPRITES_START + 103) // unused +#define ANIM_TAG_FANGS (ANIM_SPRITES_START + 104) // unused +#define ANIM_TAG_EXPLOSION_2 (ANIM_SPRITES_START + 105) // unused +#define ANIM_TAG_EXPLOSION_3 (ANIM_SPRITES_START + 106) // unused +#define ANIM_TAG_WATER_DROPLET (ANIM_SPRITES_START + 107) // unused +#define ANIM_TAG_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) // unused +#define ANIM_TAG_SEED_2 (ANIM_SPRITES_START + 109) // unused +#define ANIM_TAG_SPROUT (ANIM_SPRITES_START + 110) // unused +#define ANIM_TAG_RED_WAND (ANIM_SPRITES_START + 111) // unused +#define ANIM_TAG_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) // unused +#define ANIM_TAG_WATER_COLUMN (ANIM_SPRITES_START + 113) // unused +#define ANIM_TAG_MUD_UNK (ANIM_SPRITES_START + 114) // unused #define ANIM_TAG_RAIN_DROPS (ANIM_SPRITES_START + 115) -#define ANIM_TAG_UNUSED_FURY_SWIPES (ANIM_SPRITES_START + 116) -#define ANIM_TAG_UNUSED_VINE_2 (ANIM_SPRITES_START + 117) -#define ANIM_TAG_UNUSED_TEETH (ANIM_SPRITES_START + 118) -#define ANIM_TAG_UNUSED_BONE (ANIM_SPRITES_START + 119) -#define ANIM_TAG_UNUSED_WHITE_BAG (ANIM_SPRITES_START + 120) -#define ANIM_TAG_UNUSED_UNKNOWN (ANIM_SPRITES_START + 121) -#define ANIM_TAG_UNUSED_PURPLE_CORAL (ANIM_SPRITES_START + 122) -#define ANIM_TAG_UNUSED_PURPLE_DROPLET (ANIM_SPRITES_START + 123) -#define ANIM_TAG_UNUSED_SHOCK_2 (ANIM_SPRITES_START + 124) -#define ANIM_TAG_UNUSED_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) -#define ANIM_TAG_UNUSED_METAL_BALL (ANIM_SPRITES_START + 126) -#define ANIM_TAG_UNUSED_MONSTER_DOLL (ANIM_SPRITES_START + 127) -#define ANIM_TAG_UNUSED_WHIRLWIND (ANIM_SPRITES_START + 128) -#define ANIM_TAG_UNUSED_WHIRLWIND_2 (ANIM_SPRITES_START + 129) -#define ANIM_TAG_UNUSED_EXPLOSION_4 (ANIM_SPRITES_START + 130) -#define ANIM_TAG_UNUSED_EXPLOSION_5 (ANIM_SPRITES_START + 131) -#define ANIM_TAG_UNUSED_TONGUE (ANIM_SPRITES_START + 132) -#define ANIM_TAG_UNUSED_SMOKE (ANIM_SPRITES_START + 133) -#define ANIM_TAG_UNUSED_SMOKE_2 (ANIM_SPRITES_START + 134) +#define ANIM_TAG_FURY_SWIPES (ANIM_SPRITES_START + 116) // unused +#define ANIM_TAG_VINE_2 (ANIM_SPRITES_START + 117) // unused +#define ANIM_TAG_TEETH (ANIM_SPRITES_START + 118) // unused +#define ANIM_TAG_BONE_2 (ANIM_SPRITES_START + 119) // unused +#define ANIM_TAG_WHITE_BAG (ANIM_SPRITES_START + 120) // unused +#define ANIM_TAG_UNKNOWN (ANIM_SPRITES_START + 121) // unused +#define ANIM_TAG_PURPLE_CORAL (ANIM_SPRITES_START + 122) // unused +#define ANIM_TAG_PURPLE_DROPLET (ANIM_SPRITES_START + 123) // unused +#define ANIM_TAG_SHOCK_2 (ANIM_SPRITES_START + 124) // unused +#define ANIM_TAG_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) // unused +#define ANIM_TAG_METAL_BALL (ANIM_SPRITES_START + 126) // unused +#define ANIM_TAG_MONSTER_DOLL (ANIM_SPRITES_START + 127) // unused +#define ANIM_TAG_WHIRLWIND (ANIM_SPRITES_START + 128) // unused +#define ANIM_TAG_WHIRLWIND_2 (ANIM_SPRITES_START + 129) // unused +#define ANIM_TAG_EXPLOSION_4 (ANIM_SPRITES_START + 130) // unused +#define ANIM_TAG_EXPLOSION_5 (ANIM_SPRITES_START + 131) // unused +#define ANIM_TAG_TONGUE (ANIM_SPRITES_START + 132) // unused +#define ANIM_TAG_SMOKE (ANIM_SPRITES_START + 133) // unused +#define ANIM_TAG_SMOKE_2 (ANIM_SPRITES_START + 134) // unused #define ANIM_TAG_IMPACT (ANIM_SPRITES_START + 135) #define ANIM_TAG_CIRCLE_IMPACT (ANIM_SPRITES_START + 136) #define ANIM_TAG_SCRATCH (ANIM_SPRITES_START + 137) @@ -185,11 +185,11 @@ #define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175) #define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176) #define ANIM_TAG_LICK (ANIM_SPRITES_START + 177) -#define ANIM_TAG_UNUSED_VOID_LINES (ANIM_SPRITES_START + 178) +#define ANIM_TAG_VOID_LINES (ANIM_SPRITES_START + 178) // unused #define ANIM_TAG_STRING (ANIM_SPRITES_START + 179) #define ANIM_TAG_WEB_THREAD (ANIM_SPRITES_START + 180) #define ANIM_TAG_SPIDER_WEB (ANIM_SPRITES_START + 181) -#define ANIM_TAG_UNUSED_LIGHTBULB (ANIM_SPRITES_START + 182) +#define ANIM_TAG_LIGHTBULB (ANIM_SPRITES_START + 182) // unused #define ANIM_TAG_SLASH (ANIM_SPRITES_START + 183) #define ANIM_TAG_FOCUS_ENERGY (ANIM_SPRITES_START + 184) #define ANIM_TAG_SPHERE_TO_CUBE (ANIM_SPRITES_START + 185) @@ -211,7 +211,7 @@ #define ANIM_TAG_WARM_ROCK (ANIM_SPRITES_START + 201) #define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) #define ANIM_TAG_THIN_RING (ANIM_SPRITES_START + 203) -#define ANIM_TAG_UNUSED_PUNCH_IMPACT (ANIM_SPRITES_START + 204) +#define ANIM_TAG_PUNCH_IMPACT (ANIM_SPRITES_START + 204) // unused #define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) #define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206) #define ANIM_TAG_SPEED_DUST (ANIM_SPRITES_START + 207) @@ -276,17 +276,17 @@ #define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266) #define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267) #define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268) -#define ANIM_TAG_UNUSED_RED_BRICK (ANIM_SPRITES_START + 269) +#define ANIM_TAG_RED_BRICK (ANIM_SPRITES_START + 269) // unused #define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270) #define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271) #define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272) #define ANIM_TAG_SWEAT_BEAD (ANIM_SPRITES_START + 273) -#define ANIM_TAG_UNUSED_GEM_1 (ANIM_SPRITES_START + 274) -#define ANIM_TAG_UNUSED_GEM_2 (ANIM_SPRITES_START + 275) -#define ANIM_TAG_UNUSED_GEM_3 (ANIM_SPRITES_START + 276) +#define ANIM_TAG_GEM_1 (ANIM_SPRITES_START + 274) // unused +#define ANIM_TAG_GEM_2 (ANIM_SPRITES_START + 275) // unused +#define ANIM_TAG_GEM_3 (ANIM_SPRITES_START + 276) // unused #define ANIM_TAG_SLAM_HIT_2 (ANIM_SPRITES_START + 277) #define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278) -#define ANIM_TAG_UNUSED_RED_PARTICLES (ANIM_SPRITES_START + 279) +#define ANIM_TAG_RED_PARTICLES (ANIM_SPRITES_START + 279) // unused #define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280) #define ANIM_TAG_DIRT_MOUND (ANIM_SPRITES_START + 281) #define ANIM_TAG_SHOCK_3 (ANIM_SPRITES_START + 282) @@ -313,7 +313,7 @@ // . . // . . // 127 -// +// #define SOUND_PAN_ATTACKER -64 #define SOUND_PAN_TARGET 63 @@ -411,32 +411,32 @@ #define ANIM_WEATHER_HAIL 4 // Battle mon back animations. -#define BACK_ANIM_NONE 0x00 -#define BACK_ANIM_H_SLIDE_QUICK 0x01 -#define BACK_ANIM_H_SLIDE 0x02 -#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_1 0x03 -#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_2 0x04 -#define BACK_ANIM_SHRINK_GROW_1 0x05 -#define BACK_ANIM_GROW_1 0x06 -#define BACK_ANIM_CIRCLE_MOVE_COUNTERCLOCKWISE 0x07 -#define BACK_ANIM_HORIZONTAL_SHAKE 0x08 -#define BACK_ANIM_VERTICAL_SHAKE 0x09 -#define BACK_ANIM_V_SHAKE_WITH_H_SLIDE 0x0a -#define BACK_ANIM_VERTICAL_STRETCH 0x0b -#define BACK_ANIM_HORIZONTAL_STRETCH 0x0c -#define BACK_ANIM_GROW_2 0x0d -#define BACK_ANIM_V_SHAKE_WITH_PAUSE 0x0e -#define BACK_ANIM_CIRCLE_MOVE_CLOCKWISE 0x0f -#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_SMALL 0x10 -#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_LARGE 0x11 -#define BACK_ANIM_CONCAVE_UP_ARC_SWAY_LARGE 0x12 -#define BACK_ANIM_DIP_RIGHT_SIDE 0x13 -#define BACK_ANIM_SHRINK_GROW_2 0x14 -#define BACK_ANIM_JOLT_RIGHT 0x15 -#define BACK_ANIM_FLASH_YELLOW_WITH_SHAKE 0x16 -#define BACK_ANIM_FADE_RED_WITH_SHAKE 0x17 -#define BACK_ANIM_FADE_GREEN_WITH_SHAKE 0x18 -#define BACK_ANIM_FADE_BLUE_WITH_SHAKE 0x19 +#define BACK_ANIM_NONE 0x00 +#define BACK_ANIM_H_SLIDE_QUICK 0x01 +#define BACK_ANIM_H_SLIDE 0x02 +#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_1 0x03 +#define BACK_ANIM_H_SLIDE_WITH_V_COMPRESS_2 0x04 +#define BACK_ANIM_SHRINK_GROW_1 0x05 +#define BACK_ANIM_GROW_1 0x06 +#define BACK_ANIM_CIRCLE_MOVE_COUNTERCLOCKWISE 0x07 +#define BACK_ANIM_HORIZONTAL_SHAKE 0x08 +#define BACK_ANIM_VERTICAL_SHAKE 0x09 +#define BACK_ANIM_V_SHAKE_WITH_H_SLIDE 0x0a +#define BACK_ANIM_VERTICAL_STRETCH 0x0b +#define BACK_ANIM_HORIZONTAL_STRETCH 0x0c +#define BACK_ANIM_GROW_2 0x0d +#define BACK_ANIM_V_SHAKE_WITH_PAUSE 0x0e +#define BACK_ANIM_CIRCLE_MOVE_CLOCKWISE 0x0f +#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_SMALL 0x10 +#define BACK_ANIM_CONCAVE_DOWN_ARC_SWAY_LARGE 0x11 +#define BACK_ANIM_CONCAVE_UP_ARC_SWAY_LARGE 0x12 +#define BACK_ANIM_DIP_RIGHT_SIDE 0x13 +#define BACK_ANIM_SHRINK_GROW_2 0x14 +#define BACK_ANIM_JOLT_RIGHT 0x15 +#define BACK_ANIM_FLASH_YELLOW_WITH_SHAKE 0x16 +#define BACK_ANIM_FADE_RED_WITH_SHAKE 0x17 +#define BACK_ANIM_FADE_GREEN_WITH_SHAKE 0x18 +#define BACK_ANIM_FADE_BLUE_WITH_SHAKE 0x19 #endif // GUARD_CONSTANTS_BATTLE_ANIM_H diff --git a/src/battle_anim.c b/src/battle_anim.c index 88de3ee88..b7fee6f2d 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1130,137 +1130,137 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] = {gBattleAnimSpriteSheet_001, 0x0300, ANIM_TAG_SPARK}, {gBattleAnimSpriteSheet_002, 0x0200, ANIM_TAG_PENCIL}, {gBattleAnimSpriteSheet_003, 0x0100, ANIM_TAG_AIR_WAVE}, - {gBattleAnimSpriteSheet_004, 0x0200, ANIM_TAG_UNUSED_ORB}, + {gBattleAnimSpriteSheet_004, 0x0200, ANIM_TAG_ORB}, {gBattleAnimSpriteSheet_005, 0x0400, ANIM_TAG_SWORD}, {gBattleAnimSpriteSheet_006, 0x0180, ANIM_TAG_SEED}, - {gBattleAnimSpriteSheet_007, 0x0800, ANIM_TAG_UNUSED_EXPLOSION}, - {gBattleAnimSpriteSheet_008, 0x0020, ANIM_TAG_UNUSED_PINK_ORB}, + {gBattleAnimSpriteSheet_007, 0x0800, ANIM_TAG_EXPLOSION_6}, + {gBattleAnimSpriteSheet_008, 0x0020, ANIM_TAG_PINK_ORB}, {gBattleAnimSpriteSheet_009, 0x0400, ANIM_TAG_GUST}, {gBattleAnimSpriteSheet_010, 0x1200, ANIM_TAG_ICE_CUBE}, {gBattleAnimSpriteSheet_011, 0x0180, ANIM_TAG_SPARK_2}, - {gBattleAnimSpriteSheet_012, 0x0080, ANIM_TAG_UNUSED_ORANGE}, + {gBattleAnimSpriteSheet_012, 0x0080, ANIM_TAG_ORANGE}, {gBattleAnimSpriteSheet_013, 0x0080, ANIM_TAG_YELLOW_BALL}, {gBattleAnimSpriteSheet_014, 0x0280, ANIM_TAG_LOCK_ON}, {gBattleAnimSpriteSheet_015, 0x0080, ANIM_TAG_TIED_BAG}, {gBattleAnimSpriteSheet_016, 0x0100, ANIM_TAG_BLACK_SMOKE}, {gBattleAnimSpriteSheet_017, 0x0020, ANIM_TAG_BLACK_BALL}, {gBattleAnimSpriteSheet_018, 0x0080, ANIM_TAG_CONVERSION}, - {gBattleAnimSpriteSheet_019, 0x0400, ANIM_TAG_UNUSED_GLASS}, + {gBattleAnimSpriteSheet_019, 0x0400, ANIM_TAG_GLASS}, {gBattleAnimSpriteSheet_020, 0x0200, ANIM_TAG_HORN_HIT}, - {gBattleAnimSpriteSheet_021, 0x0A00, ANIM_TAG_UNUSED_HIT}, - {gBattleAnimSpriteSheet_021, 0x0A00, ANIM_TAG_UNUSED_HIT_2}, - {gBattleAnimSpriteSheet_023, 0x0380, ANIM_TAG_UNUSED_BLUE_SHARDS}, - {gBattleAnimSpriteSheet_024, 0x0300, ANIM_TAG_UNUSED_CLOSING_EYE}, - {gBattleAnimSpriteSheet_025, 0x0A00, ANIM_TAG_UNUSED_WAVING_HAND}, - {gBattleAnimSpriteSheet_026, 0x0A00, ANIM_TAG_UNUSED_HIT_DUPLICATE}, + {gBattleAnimSpriteSheet_021, 0x0A00, ANIM_TAG_HIT}, + {gBattleAnimSpriteSheet_021, 0x0A00, ANIM_TAG_HIT_2}, + {gBattleAnimSpriteSheet_023, 0x0380, ANIM_TAG_BLUE_SHARDS}, + {gBattleAnimSpriteSheet_024, 0x0300, ANIM_TAG_CLOSING_EYE}, + {gBattleAnimSpriteSheet_025, 0x0A00, ANIM_TAG_WAVING_HAND}, + {gBattleAnimSpriteSheet_026, 0x0A00, ANIM_TAG_HIT_DUPLICATE}, {gBattleAnimSpriteSheet_027, 0x0A00, ANIM_TAG_LEER}, - {gBattleAnimSpriteSheet_028, 0x0A00, ANIM_TAG_UNUSED_BLUE_BURST}, + {gBattleAnimSpriteSheet_028, 0x0A00, ANIM_TAG_BLUE_BURST}, {gBattleAnimSpriteSheet_029, 0x0A00, ANIM_TAG_SMALL_EMBER}, {gBattleAnimSpriteSheet_030, 0x0A00, ANIM_TAG_GRAY_SMOKE}, {gBattleAnimSpriteSheet_031, 0x0E00, ANIM_TAG_BLUE_STAR}, - {gBattleAnimSpriteSheet_032, 0x0380, ANIM_TAG_UNUSED_BUBBLE_BURST}, + {gBattleAnimSpriteSheet_032, 0x0380, ANIM_TAG_BUBBLE_BURST}, {gBattleAnimSpriteSheet_033, 0x1000, ANIM_TAG_FIRE}, - {gBattleAnimSpriteSheet_034, 0x0800, ANIM_TAG_UNUSED_SPINNING_FIRE}, + {gBattleAnimSpriteSheet_034, 0x0800, ANIM_TAG_SPINNING_FIRE}, {gBattleAnimSpriteSheet_035, 0x0A00, ANIM_TAG_FIRE_PLUME}, - {gBattleAnimSpriteSheet_036, 0x0800, ANIM_TAG_UNUSED_LIGHTNING}, + {gBattleAnimSpriteSheet_036, 0x0800, ANIM_TAG_LIGHTNING_2}, {gBattleAnimSpriteSheet_037, 0x0A00, ANIM_TAG_LIGHTNING}, - {gBattleAnimSpriteSheet_038, 0x0A00, ANIM_TAG_UNUSED_CLAW_SLASH}, + {gBattleAnimSpriteSheet_038, 0x0A00, ANIM_TAG_CLAW_SLASH_2}, {gBattleAnimSpriteSheet_039, 0x0A00, ANIM_TAG_CLAW_SLASH}, - {gBattleAnimSpriteSheet_040, 0x0A00, ANIM_TAG_UNUSED_SCRATCH}, - {gBattleAnimSpriteSheet_041, 0x0A00, ANIM_TAG_UNUSED_SCRATCH_2}, - {gBattleAnimSpriteSheet_042, 0x0A00, ANIM_TAG_UNUSED_BUBBLE_BURST_2}, + {gBattleAnimSpriteSheet_040, 0x0A00, ANIM_TAG_SCRATCH_3}, + {gBattleAnimSpriteSheet_041, 0x0A00, ANIM_TAG_SCRATCH_2}, + {gBattleAnimSpriteSheet_042, 0x0A00, ANIM_TAG_BUBBLE_BURST_2}, {gBattleAnimSpriteSheet_043, 0x0A00, ANIM_TAG_ICE_CHUNK}, - {gBattleAnimSpriteSheet_044, 0x0A00, ANIM_TAG_UNUSED_GLASS_2}, - {gBattleAnimSpriteSheet_045, 0x0A00, ANIM_TAG_UNUSED_PINK_HEART}, - {gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_UNUSED_SAP_DRIP}, - {gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_UNUSED_SAP_DRIP_2}, + {gBattleAnimSpriteSheet_044, 0x0A00, ANIM_TAG_GLASS_2}, + {gBattleAnimSpriteSheet_045, 0x0A00, ANIM_TAG_PINK_HEART_2}, + {gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_SAP_DRIP}, + {gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_SAP_DRIP_2}, {gBattleAnimSpriteSheet_048, 0x1000, ANIM_TAG_SPARKLE_1}, {gBattleAnimSpriteSheet_048, 0x1000, ANIM_TAG_SPARKLE_2}, {gBattleAnimSpriteSheet_050, 0x0200, ANIM_TAG_HUMANOID_FOOT}, - {gBattleAnimSpriteSheet_051, 0x0200, ANIM_TAG_UNUSED_MONSTER_FOOT}, - {gBattleAnimSpriteSheet_052, 0x0200, ANIM_TAG_UNUSED_HUMANOID_HAND}, + {gBattleAnimSpriteSheet_051, 0x0200, ANIM_TAG_MONSTER_FOOT}, + {gBattleAnimSpriteSheet_052, 0x0200, ANIM_TAG_HUMANOID_HAND}, {gBattleAnimSpriteSheet_053, 0x0800, ANIM_TAG_NOISE_LINE}, - {gBattleAnimSpriteSheet_054, 0x0080, ANIM_TAG_UNUSED_YELLOW_UNK}, - {gBattleAnimSpriteSheet_055, 0x0200, ANIM_TAG_UNUSED_RED_FIST}, + {gBattleAnimSpriteSheet_054, 0x0080, ANIM_TAG_YELLOW_UNK}, + {gBattleAnimSpriteSheet_055, 0x0200, ANIM_TAG_RED_FIST}, {gBattleAnimSpriteSheet_056, 0x1000, ANIM_TAG_SLAM_HIT}, - {gBattleAnimSpriteSheet_057, 0x0180, ANIM_TAG_UNUSED_RING}, + {gBattleAnimSpriteSheet_057, 0x0180, ANIM_TAG_RING}, {gBattleAnimSpriteSheet_058, 0x0C00, ANIM_TAG_ROCKS}, - {gBattleAnimSpriteSheet_059, 0x0100, ANIM_TAG_UNUSED_Z}, - {gBattleAnimSpriteSheet_060, 0x0040, ANIM_TAG_UNUSED_YELLOW_UNK_2}, - {gBattleAnimSpriteSheet_061, 0x0180, ANIM_TAG_UNUSED_AIR_SLASH}, - {gBattleAnimSpriteSheet_062, 0x0800, ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS}, + {gBattleAnimSpriteSheet_059, 0x0100, ANIM_TAG_Z}, + {gBattleAnimSpriteSheet_060, 0x0040, ANIM_TAG_YELLOW_UNK_2}, + {gBattleAnimSpriteSheet_061, 0x0180, ANIM_TAG_AIR_SLASH}, + {gBattleAnimSpriteSheet_062, 0x0800, ANIM_TAG_SPINNING_GREEN_ORBS}, {gBattleAnimSpriteSheet_063, 0x0480, ANIM_TAG_LEAF}, {gBattleAnimSpriteSheet_064, 0x0200, ANIM_TAG_FINGER}, {gBattleAnimSpriteSheet_065, 0x0200, ANIM_TAG_POISON_POWDER}, - {gBattleAnimSpriteSheet_066, 0x0100, ANIM_TAG_UNUSED_BROWN_TRIANGLE}, + {gBattleAnimSpriteSheet_066, 0x0100, ANIM_TAG_BROWN_TRIANGLE}, {gBattleAnimSpriteSheet_065, 0x0200, ANIM_TAG_SLEEP_POWDER}, {gBattleAnimSpriteSheet_065, 0x0200, ANIM_TAG_STUN_SPORE}, - {gBattleAnimSpriteSheet_065, 0x0200, ANIM_TAG_UNUSED_POWDER}, + {gBattleAnimSpriteSheet_065, 0x0200, ANIM_TAG_POWDER}, {gBattleAnimSpriteSheet_070, 0x0200, ANIM_TAG_SPARKLE_3}, {gBattleAnimSpriteSheet_071, 0x0A00, ANIM_TAG_SPARKLE_4}, {gBattleAnimSpriteSheet_072, 0x0300, ANIM_TAG_MUSIC_NOTES}, {gBattleAnimSpriteSheet_073, 0x0180, ANIM_TAG_DUCK}, {gBattleAnimSpriteSheet_074, 0x00A0, ANIM_TAG_MUD_SAND}, {gBattleAnimSpriteSheet_075, 0x0700, ANIM_TAG_ALERT}, - {gBattleAnimSpriteSheet_076, 0x0400, ANIM_TAG_UNUSED_BLUE_FLAMES}, - {gBattleAnimSpriteSheet_077, 0x0200, ANIM_TAG_UNUSED_BLUE_FLAMES_2}, - {gBattleAnimSpriteSheet_078, 0x0300, ANIM_TAG_UNUSED_SHOCK}, + {gBattleAnimSpriteSheet_076, 0x0400, ANIM_TAG_BLUE_FLAMES}, + {gBattleAnimSpriteSheet_077, 0x0200, ANIM_TAG_BLUE_FLAMES_2}, + {gBattleAnimSpriteSheet_078, 0x0300, ANIM_TAG_SHOCK_4}, {gBattleAnimSpriteSheet_079, 0x0C00, ANIM_TAG_SHOCK}, - {gBattleAnimSpriteSheet_080, 0x0A00, ANIM_TAG_UNUSED_BELL}, - {gBattleAnimSpriteSheet_081, 0x0080, ANIM_TAG_UNUSED_PINK_GLOVE}, - {gBattleAnimSpriteSheet_082, 0x0040, ANIM_TAG_UNUSED_BLUE_LINES}, - {gBattleAnimSpriteSheet_083, 0x0E00, ANIM_TAG_UNUSED_IMPACT}, - {gBattleAnimSpriteSheet_084, 0x0E00, ANIM_TAG_UNUSED_IMPACT_2}, - {gBattleAnimSpriteSheet_085, 0x0280, ANIM_TAG_UNUSED_RETICLE}, + {gBattleAnimSpriteSheet_080, 0x0A00, ANIM_TAG_BELL_2}, + {gBattleAnimSpriteSheet_081, 0x0080, ANIM_TAG_PINK_GLOVE}, + {gBattleAnimSpriteSheet_082, 0x0040, ANIM_TAG_BLUE_LINES}, + {gBattleAnimSpriteSheet_083, 0x0E00, ANIM_TAG_IMPACT_3}, + {gBattleAnimSpriteSheet_084, 0x0E00, ANIM_TAG_IMPACT_2}, + {gBattleAnimSpriteSheet_085, 0x0280, ANIM_TAG_RETICLE}, {gBattleAnimSpriteSheet_086, 0x0200, ANIM_TAG_BREATH}, {gBattleAnimSpriteSheet_087, 0x0080, ANIM_TAG_ANGER}, - {gBattleAnimSpriteSheet_088, 0x00C0, ANIM_TAG_UNUSED_SNOWBALL}, - {gBattleAnimSpriteSheet_089, 0x0A00, ANIM_TAG_UNUSED_VINE}, - {gBattleAnimSpriteSheet_090, 0x0200, ANIM_TAG_UNUSED_SWORD}, - {gBattleAnimSpriteSheet_091, 0x0180, ANIM_TAG_UNUSED_CLAPPING}, - {gBattleAnimSpriteSheet_092, 0x0080, ANIM_TAG_UNUSED_RED_TUBE}, + {gBattleAnimSpriteSheet_088, 0x00C0, ANIM_TAG_SNOWBALL}, + {gBattleAnimSpriteSheet_089, 0x0A00, ANIM_TAG_VINE}, + {gBattleAnimSpriteSheet_090, 0x0200, ANIM_TAG_SWORD_2}, + {gBattleAnimSpriteSheet_091, 0x0180, ANIM_TAG_CLAPPING}, + {gBattleAnimSpriteSheet_092, 0x0080, ANIM_TAG_RED_TUBE}, {gBattleAnimSpriteSheet_093, 0x1000, ANIM_TAG_AMNESIA}, - {gBattleAnimSpriteSheet_094, 0x0A00, ANIM_TAG_UNUSED_STRING}, - {gBattleAnimSpriteSheet_095, 0x0180, ANIM_TAG_UNUSED_PENCIL}, - {gBattleAnimSpriteSheet_096, 0x0380, ANIM_TAG_UNUSED_PETAL}, + {gBattleAnimSpriteSheet_094, 0x0A00, ANIM_TAG_STRING_2}, + {gBattleAnimSpriteSheet_095, 0x0180, ANIM_TAG_PENCIL_2}, + {gBattleAnimSpriteSheet_096, 0x0380, ANIM_TAG_PETAL}, {gBattleAnimSpriteSheet_097, 0x0C00, ANIM_TAG_BENT_SPOON}, - {gBattleAnimSpriteSheet_098, 0x0200, ANIM_TAG_UNUSED_WEB}, + {gBattleAnimSpriteSheet_098, 0x0200, ANIM_TAG_WEB}, {gBattleAnimSpriteSheet_099, 0x0200, ANIM_TAG_MILK_BOTTLE}, {gBattleAnimSpriteSheet_100, 0x0200, ANIM_TAG_COIN}, - {gBattleAnimSpriteSheet_101, 0x0200, ANIM_TAG_UNUSED_CRACKED_EGG}, - {gBattleAnimSpriteSheet_102, 0x0400, ANIM_TAG_UNUSED_HATCHED_EGG}, - {gBattleAnimSpriteSheet_103, 0x0080, ANIM_TAG_UNUSED_FRESH_EGG}, - {gBattleAnimSpriteSheet_104, 0x0400, ANIM_TAG_UNUSED_FANGS}, - {gBattleAnimSpriteSheet_105, 0x0c00, ANIM_TAG_UNUSED_EXPLOSION_2}, - {gBattleAnimSpriteSheet_106, 0x0200, ANIM_TAG_UNUSED_EXPLOSION_3}, - {gBattleAnimSpriteSheet_107, 0x1000, ANIM_TAG_UNUSED_WATER_DROPLET}, - {gBattleAnimSpriteSheet_108, 0x0a00, ANIM_TAG_UNUSED_WATER_DROPLET_2}, - {gBattleAnimSpriteSheet_109, 0x0020, ANIM_TAG_UNUSED_SEED}, - {gBattleAnimSpriteSheet_110, 0x0e00, ANIM_TAG_UNUSED_SPROUT}, - {gBattleAnimSpriteSheet_111, 0x0080, ANIM_TAG_UNUSED_RED_WAND}, - {gBattleAnimSpriteSheet_112, 0x0a00, ANIM_TAG_UNUSED_PURPLE_GREEN_UNK}, - {gBattleAnimSpriteSheet_113, 0x0400, ANIM_TAG_UNUSED_WATER_COLUMN}, - {gBattleAnimSpriteSheet_114, 0x0200, ANIM_TAG_UNUSED_MUD_UNK}, + {gBattleAnimSpriteSheet_101, 0x0200, ANIM_TAG_CRACKED_EGG}, + {gBattleAnimSpriteSheet_102, 0x0400, ANIM_TAG_HATCHED_EGG}, + {gBattleAnimSpriteSheet_103, 0x0080, ANIM_TAG_FRESH_EGG}, + {gBattleAnimSpriteSheet_104, 0x0400, ANIM_TAG_FANGS}, + {gBattleAnimSpriteSheet_105, 0x0c00, ANIM_TAG_EXPLOSION_2}, + {gBattleAnimSpriteSheet_106, 0x0200, ANIM_TAG_EXPLOSION_3}, + {gBattleAnimSpriteSheet_107, 0x1000, ANIM_TAG_WATER_DROPLET}, + {gBattleAnimSpriteSheet_108, 0x0a00, ANIM_TAG_WATER_DROPLET_2}, + {gBattleAnimSpriteSheet_109, 0x0020, ANIM_TAG_SEED_2}, + {gBattleAnimSpriteSheet_110, 0x0e00, ANIM_TAG_SPROUT}, + {gBattleAnimSpriteSheet_111, 0x0080, ANIM_TAG_RED_WAND}, + {gBattleAnimSpriteSheet_112, 0x0a00, ANIM_TAG_PURPLE_GREEN_UNK}, + {gBattleAnimSpriteSheet_113, 0x0400, ANIM_TAG_WATER_COLUMN}, + {gBattleAnimSpriteSheet_114, 0x0200, ANIM_TAG_MUD_UNK}, {gBattleAnimSpriteSheet_115, 0x0700, ANIM_TAG_RAIN_DROPS}, - {gBattleAnimSpriteSheet_116, 0x0800, ANIM_TAG_UNUSED_FURY_SWIPES}, - {gBattleAnimSpriteSheet_117, 0x0a00, ANIM_TAG_UNUSED_VINE_2}, - {gBattleAnimSpriteSheet_118, 0x0600, ANIM_TAG_UNUSED_TEETH}, - {gBattleAnimSpriteSheet_119, 0x0800, ANIM_TAG_UNUSED_BONE}, - {gBattleAnimSpriteSheet_120, 0x0200, ANIM_TAG_UNUSED_WHITE_BAG}, - {gBattleAnimSpriteSheet_121, 0x0040, ANIM_TAG_UNUSED_UNKNOWN}, - {gBattleAnimSpriteSheet_122, 0x0180, ANIM_TAG_UNUSED_PURPLE_CORAL}, - {gBattleAnimSpriteSheet_123, 0x0600, ANIM_TAG_UNUSED_PURPLE_DROPLET}, - {gBattleAnimSpriteSheet_124, 0x0600, ANIM_TAG_UNUSED_SHOCK_2}, - {gBattleAnimSpriteSheet_125, 0x0200, ANIM_TAG_UNUSED_CLOSING_EYE_2}, - {gBattleAnimSpriteSheet_126, 0x0080, ANIM_TAG_UNUSED_METAL_BALL}, - {gBattleAnimSpriteSheet_127, 0x0200, ANIM_TAG_UNUSED_MONSTER_DOLL}, - {gBattleAnimSpriteSheet_128, 0x0800, ANIM_TAG_UNUSED_WHIRLWIND}, - {gBattleAnimSpriteSheet_129, 0x0080, ANIM_TAG_UNUSED_WHIRLWIND_2}, - {gBattleAnimSpriteSheet_130, 0x0a00, ANIM_TAG_UNUSED_EXPLOSION_4}, - {gBattleAnimSpriteSheet_131, 0x0280, ANIM_TAG_UNUSED_EXPLOSION_5}, - {gBattleAnimSpriteSheet_132, 0x0280, ANIM_TAG_UNUSED_TONGUE}, - {gBattleAnimSpriteSheet_133, 0x0100, ANIM_TAG_UNUSED_SMOKE}, - {gBattleAnimSpriteSheet_134, 0x0200, ANIM_TAG_UNUSED_SMOKE_2}, + {gBattleAnimSpriteSheet_116, 0x0800, ANIM_TAG_FURY_SWIPES}, + {gBattleAnimSpriteSheet_117, 0x0a00, ANIM_TAG_VINE_2}, + {gBattleAnimSpriteSheet_118, 0x0600, ANIM_TAG_TEETH}, + {gBattleAnimSpriteSheet_119, 0x0800, ANIM_TAG_BONE_2}, + {gBattleAnimSpriteSheet_120, 0x0200, ANIM_TAG_WHITE_BAG}, + {gBattleAnimSpriteSheet_121, 0x0040, ANIM_TAG_UNKNOWN}, + {gBattleAnimSpriteSheet_122, 0x0180, ANIM_TAG_PURPLE_CORAL}, + {gBattleAnimSpriteSheet_123, 0x0600, ANIM_TAG_PURPLE_DROPLET}, + {gBattleAnimSpriteSheet_124, 0x0600, ANIM_TAG_SHOCK_2}, + {gBattleAnimSpriteSheet_125, 0x0200, ANIM_TAG_CLOSING_EYE_2}, + {gBattleAnimSpriteSheet_126, 0x0080, ANIM_TAG_METAL_BALL}, + {gBattleAnimSpriteSheet_127, 0x0200, ANIM_TAG_MONSTER_DOLL}, + {gBattleAnimSpriteSheet_128, 0x0800, ANIM_TAG_WHIRLWIND}, + {gBattleAnimSpriteSheet_129, 0x0080, ANIM_TAG_WHIRLWIND_2}, + {gBattleAnimSpriteSheet_130, 0x0a00, ANIM_TAG_EXPLOSION_4}, + {gBattleAnimSpriteSheet_131, 0x0280, ANIM_TAG_EXPLOSION_5}, + {gBattleAnimSpriteSheet_132, 0x0280, ANIM_TAG_TONGUE}, + {gBattleAnimSpriteSheet_133, 0x0100, ANIM_TAG_SMOKE}, + {gBattleAnimSpriteSheet_134, 0x0200, ANIM_TAG_SMOKE_2}, {gBattleAnimSpriteSheet_135, 0x0200, ANIM_TAG_IMPACT}, {gBattleAnimSpriteSheet_136, 0x0020, ANIM_TAG_CIRCLE_IMPACT}, {gBattleAnimSpriteSheet_137, 0x0a00, ANIM_TAG_SCRATCH}, @@ -1304,11 +1304,11 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] = {gBattleAnimSpriteSheet_175, 0x0080, ANIM_TAG_LARGE_FRESH_EGG}, {gBattleAnimSpriteSheet_176, 0x0200, ANIM_TAG_SHADOW_BALL}, {gBattleAnimSpriteSheet_177, 0x0500, ANIM_TAG_LICK}, - {gBattleAnimSpriteSheet_178, 0x0800, ANIM_TAG_UNUSED_VOID_LINES}, + {gBattleAnimSpriteSheet_178, 0x0800, ANIM_TAG_VOID_LINES}, {gBattleAnimSpriteSheet_179, 0x0400, ANIM_TAG_STRING}, {gBattleAnimSpriteSheet_180, 0x0020, ANIM_TAG_WEB_THREAD}, {gBattleAnimSpriteSheet_181, 0x0800, ANIM_TAG_SPIDER_WEB}, - {gBattleAnimSpriteSheet_182, 0x0100, ANIM_TAG_UNUSED_LIGHTBULB}, + {gBattleAnimSpriteSheet_182, 0x0100, ANIM_TAG_LIGHTBULB}, {gBattleAnimSpriteSheet_183, 0x0800, ANIM_TAG_SLASH}, {gBattleAnimSpriteSheet_184, 0x0400, ANIM_TAG_FOCUS_ENERGY}, {gBattleAnimSpriteSheet_185, 0x0a00, ANIM_TAG_SPHERE_TO_CUBE}, @@ -1330,7 +1330,7 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] = {gBattleAnimSpriteSheet_201, 0x0a80, ANIM_TAG_WARM_ROCK}, {gBattleAnimSpriteSheet_202, 0x0600, ANIM_TAG_BREAKING_EGG}, {gBattleAnimSpriteSheet_203, 0x0800, ANIM_TAG_THIN_RING}, - {gBattleAnimSpriteSheet_204, 0x0200, ANIM_TAG_UNUSED_PUNCH_IMPACT}, + {gBattleAnimSpriteSheet_204, 0x0200, ANIM_TAG_PUNCH_IMPACT}, {gBattleAnimSpriteSheet_205, 0x0600, ANIM_TAG_BELL}, {gBattleAnimSpriteSheet_206, 0x0800, ANIM_TAG_MUSIC_NOTES_2}, {gBattleAnimSpriteSheet_207, 0x0180, ANIM_TAG_SPEED_DUST}, @@ -1395,17 +1395,17 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] = {gBattleAnimSpriteSheet_266, 0x0080, ANIM_TAG_GREEN_SPIKE}, {gBattleAnimSpriteSheet_212, 0x0800, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT}, {gBattleAnimSpriteSheet_264, 0x0020, ANIM_TAG_GLOWY_BLUE_ORB}, - {gBattleAnimSpriteSheet_269, 0x0080, ANIM_TAG_UNUSED_RED_BRICK}, + {gBattleAnimSpriteSheet_269, 0x0080, ANIM_TAG_RED_BRICK}, {gBattleAnimSpriteSheet_270, 0x0400, ANIM_TAG_WHITE_FEATHER}, {gBattleAnimSpriteSheet_271, 0x0080, ANIM_TAG_SPARKLE_6}, {gBattleAnimSpriteSheet_272, 0x0800, ANIM_TAG_SPLASH}, {gBattleAnimSpriteSheet_273, 0x0020, ANIM_TAG_SWEAT_BEAD}, - {gBattleAnimSpriteSheet_274, 0x0800, ANIM_TAG_UNUSED_GEM_1}, - {gBattleAnimSpriteSheet_275, 0x0800, ANIM_TAG_UNUSED_GEM_2}, - {gBattleAnimSpriteSheet_276, 0x0800, ANIM_TAG_UNUSED_GEM_3}, + {gBattleAnimSpriteSheet_274, 0x0800, ANIM_TAG_GEM_1}, + {gBattleAnimSpriteSheet_275, 0x0800, ANIM_TAG_GEM_2}, + {gBattleAnimSpriteSheet_276, 0x0800, ANIM_TAG_GEM_3}, {gBattleAnimSpriteSheet_277, 0x1000, ANIM_TAG_SLAM_HIT_2}, {gBattleAnimSpriteSheet_278, 0x0800, ANIM_TAG_RECYCLE}, - {gBattleAnimSpriteSheet_279, 0x00a0, ANIM_TAG_UNUSED_RED_PARTICLES}, + {gBattleAnimSpriteSheet_279, 0x00a0, ANIM_TAG_RED_PARTICLES}, {gBattleAnimSpriteSheet_280, 0x0800, ANIM_TAG_PROTECT}, {gBattleAnimSpriteSheet_281, 0x0200, ANIM_TAG_DIRT_MOUND}, {gBattleAnimSpriteSheet_282, 0x0600, ANIM_TAG_SHOCK_3}, @@ -1424,137 +1424,137 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = {gBattleAnimSpritePalette_001, ANIM_TAG_SPARK}, {gBattleAnimSpritePalette_002, ANIM_TAG_PENCIL}, {gBattleAnimSpritePalette_003, ANIM_TAG_AIR_WAVE}, - {gBattleAnimSpritePalette_004, ANIM_TAG_UNUSED_ORB}, + {gBattleAnimSpritePalette_004, ANIM_TAG_ORB}, {gBattleAnimSpritePalette_005, ANIM_TAG_SWORD}, {gBattleAnimSpritePalette_006, ANIM_TAG_SEED}, - {gBattleAnimSpritePalette_007, ANIM_TAG_UNUSED_EXPLOSION}, - {gBattleAnimSpritePalette_008, ANIM_TAG_UNUSED_PINK_ORB}, + {gBattleAnimSpritePalette_007, ANIM_TAG_EXPLOSION_6}, + {gBattleAnimSpritePalette_008, ANIM_TAG_PINK_ORB}, {gBattleAnimSpritePalette_009, ANIM_TAG_GUST}, {gBattleAnimSpritePalette_010, ANIM_TAG_ICE_CUBE}, {gBattleAnimSpritePalette_011, ANIM_TAG_SPARK_2}, - {gBattleAnimSpritePalette_012, ANIM_TAG_UNUSED_ORANGE}, + {gBattleAnimSpritePalette_012, ANIM_TAG_ORANGE}, {gBattleAnimSpritePalette_013, ANIM_TAG_YELLOW_BALL}, {gBattleAnimSpritePalette_014, ANIM_TAG_LOCK_ON}, {gBattleAnimSpritePalette_015, ANIM_TAG_TIED_BAG}, {gBattleAnimSpritePalette_016, ANIM_TAG_BLACK_SMOKE}, {gBattleAnimSpritePalette_016, ANIM_TAG_BLACK_BALL}, {gBattleAnimSpritePalette_018, ANIM_TAG_CONVERSION}, - {gBattleAnimSpritePalette_019, ANIM_TAG_UNUSED_GLASS}, + {gBattleAnimSpritePalette_019, ANIM_TAG_GLASS}, {gBattleAnimSpritePalette_020, ANIM_TAG_HORN_HIT}, - {gBattleAnimSpritePalette_021, ANIM_TAG_UNUSED_HIT}, - {gBattleAnimSpritePalette_022, ANIM_TAG_UNUSED_HIT_2}, - {gBattleAnimSpritePalette_023, ANIM_TAG_UNUSED_BLUE_SHARDS}, - {gBattleAnimSpritePalette_024, ANIM_TAG_UNUSED_CLOSING_EYE}, - {gBattleAnimSpritePalette_025, ANIM_TAG_UNUSED_WAVING_HAND}, - {gBattleAnimSpritePalette_026, ANIM_TAG_UNUSED_HIT_DUPLICATE}, + {gBattleAnimSpritePalette_021, ANIM_TAG_HIT}, + {gBattleAnimSpritePalette_022, ANIM_TAG_HIT_2}, + {gBattleAnimSpritePalette_023, ANIM_TAG_BLUE_SHARDS}, + {gBattleAnimSpritePalette_024, ANIM_TAG_CLOSING_EYE}, + {gBattleAnimSpritePalette_025, ANIM_TAG_WAVING_HAND}, + {gBattleAnimSpritePalette_026, ANIM_TAG_HIT_DUPLICATE}, {gBattleAnimSpritePalette_027, ANIM_TAG_LEER}, - {gBattleAnimSpritePalette_028, ANIM_TAG_UNUSED_BLUE_BURST}, + {gBattleAnimSpritePalette_028, ANIM_TAG_BLUE_BURST}, {gBattleAnimSpritePalette_029, ANIM_TAG_SMALL_EMBER}, {gBattleAnimSpritePalette_030, ANIM_TAG_GRAY_SMOKE}, {gBattleAnimSpritePalette_031, ANIM_TAG_BLUE_STAR}, - {gBattleAnimSpritePalette_032, ANIM_TAG_UNUSED_BUBBLE_BURST}, + {gBattleAnimSpritePalette_032, ANIM_TAG_BUBBLE_BURST}, {gBattleAnimSpritePalette_033, ANIM_TAG_FIRE}, - {gBattleAnimSpritePalette_033, ANIM_TAG_UNUSED_SPINNING_FIRE}, + {gBattleAnimSpritePalette_033, ANIM_TAG_SPINNING_FIRE}, {gBattleAnimSpritePalette_033, ANIM_TAG_FIRE_PLUME}, - {gBattleAnimSpritePalette_036, ANIM_TAG_UNUSED_LIGHTNING}, + {gBattleAnimSpritePalette_036, ANIM_TAG_LIGHTNING_2}, {gBattleAnimSpritePalette_036, ANIM_TAG_LIGHTNING}, - {gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_CLAW_SLASH}, + {gBattleAnimSpritePalette_038, ANIM_TAG_CLAW_SLASH_2}, {gBattleAnimSpritePalette_039, ANIM_TAG_CLAW_SLASH}, - {gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_SCRATCH}, - {gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_SCRATCH_2}, - {gBattleAnimSpritePalette_042, ANIM_TAG_UNUSED_BUBBLE_BURST_2}, + {gBattleAnimSpritePalette_038, ANIM_TAG_SCRATCH_3}, + {gBattleAnimSpritePalette_038, ANIM_TAG_SCRATCH_2}, + {gBattleAnimSpritePalette_042, ANIM_TAG_BUBBLE_BURST_2}, {gBattleAnimSpritePalette_043, ANIM_TAG_ICE_CHUNK}, - {gBattleAnimSpritePalette_044, ANIM_TAG_UNUSED_GLASS_2}, - {gBattleAnimSpritePalette_045, ANIM_TAG_UNUSED_PINK_HEART}, - {gBattleAnimSpritePalette_046, ANIM_TAG_UNUSED_SAP_DRIP}, - {gBattleAnimSpritePalette_047, ANIM_TAG_UNUSED_SAP_DRIP}, + {gBattleAnimSpritePalette_044, ANIM_TAG_GLASS_2}, + {gBattleAnimSpritePalette_045, ANIM_TAG_PINK_HEART_2}, + {gBattleAnimSpritePalette_046, ANIM_TAG_SAP_DRIP}, + {gBattleAnimSpritePalette_047, ANIM_TAG_SAP_DRIP}, {gBattleAnimSpritePalette_048, ANIM_TAG_SPARKLE_1}, {gBattleAnimSpritePalette_049, ANIM_TAG_SPARKLE_2}, {gBattleAnimSpritePalette_050, ANIM_TAG_HUMANOID_FOOT}, - {gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_MONSTER_FOOT}, - {gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_HUMANOID_HAND}, + {gBattleAnimSpritePalette_050, ANIM_TAG_MONSTER_FOOT}, + {gBattleAnimSpritePalette_050, ANIM_TAG_HUMANOID_HAND}, {gBattleAnimSpritePalette_026, ANIM_TAG_NOISE_LINE}, - {gBattleAnimSpritePalette_054, ANIM_TAG_UNUSED_YELLOW_UNK}, - {gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_RED_FIST}, + {gBattleAnimSpritePalette_054, ANIM_TAG_YELLOW_UNK}, + {gBattleAnimSpritePalette_050, ANIM_TAG_RED_FIST}, {gBattleAnimSpritePalette_056, ANIM_TAG_SLAM_HIT}, - {gBattleAnimSpritePalette_057, ANIM_TAG_UNUSED_RING}, + {gBattleAnimSpritePalette_057, ANIM_TAG_RING}, {gBattleAnimSpritePalette_058, ANIM_TAG_ROCKS}, - {gBattleAnimSpritePalette_059, ANIM_TAG_UNUSED_Z}, - {gBattleAnimSpritePalette_060, ANIM_TAG_UNUSED_YELLOW_UNK_2}, - {gBattleAnimSpritePalette_061, ANIM_TAG_UNUSED_AIR_SLASH}, - {gBattleAnimSpritePalette_062, ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS}, + {gBattleAnimSpritePalette_059, ANIM_TAG_Z}, + {gBattleAnimSpritePalette_060, ANIM_TAG_YELLOW_UNK_2}, + {gBattleAnimSpritePalette_061, ANIM_TAG_AIR_SLASH}, + {gBattleAnimSpritePalette_062, ANIM_TAG_SPINNING_GREEN_ORBS}, {gBattleAnimSpritePalette_063, ANIM_TAG_LEAF}, {gBattleAnimSpritePalette_064, ANIM_TAG_FINGER}, {gBattleAnimSpritePalette_065, ANIM_TAG_POISON_POWDER}, - {gBattleAnimSpritePalette_066, ANIM_TAG_UNUSED_BROWN_TRIANGLE}, + {gBattleAnimSpritePalette_066, ANIM_TAG_BROWN_TRIANGLE}, {gBattleAnimSpritePalette_067, ANIM_TAG_SLEEP_POWDER}, {gBattleAnimSpritePalette_068, ANIM_TAG_STUN_SPORE}, - {gBattleAnimSpritePalette_065, ANIM_TAG_UNUSED_POWDER}, + {gBattleAnimSpritePalette_065, ANIM_TAG_POWDER}, {gBattleAnimSpritePalette_070, ANIM_TAG_SPARKLE_3}, {gBattleAnimSpritePalette_070, ANIM_TAG_SPARKLE_4}, {gBattleAnimSpritePalette_072, ANIM_TAG_MUSIC_NOTES}, {gBattleAnimSpritePalette_073, ANIM_TAG_DUCK}, {gBattleAnimSpritePalette_074, ANIM_TAG_MUD_SAND}, {gBattleAnimSpritePalette_075, ANIM_TAG_ALERT}, - {gBattleAnimSpritePalette_076, ANIM_TAG_UNUSED_BLUE_FLAMES}, - {gBattleAnimSpritePalette_076, ANIM_TAG_UNUSED_BLUE_FLAMES_2}, - {gBattleAnimSpritePalette_078, ANIM_TAG_UNUSED_SHOCK}, + {gBattleAnimSpritePalette_076, ANIM_TAG_BLUE_FLAMES}, + {gBattleAnimSpritePalette_076, ANIM_TAG_BLUE_FLAMES_2}, + {gBattleAnimSpritePalette_078, ANIM_TAG_SHOCK_4}, {gBattleAnimSpritePalette_078, ANIM_TAG_SHOCK}, - {gBattleAnimSpritePalette_080, ANIM_TAG_UNUSED_BELL}, - {gBattleAnimSpritePalette_081, ANIM_TAG_UNUSED_PINK_GLOVE}, - {gBattleAnimSpritePalette_082, ANIM_TAG_UNUSED_BLUE_LINES}, - {gBattleAnimSpritePalette_083, ANIM_TAG_UNUSED_IMPACT}, - {gBattleAnimSpritePalette_084, ANIM_TAG_UNUSED_IMPACT_2}, - {gBattleAnimSpritePalette_085, ANIM_TAG_UNUSED_RETICLE}, + {gBattleAnimSpritePalette_080, ANIM_TAG_BELL_2}, + {gBattleAnimSpritePalette_081, ANIM_TAG_PINK_GLOVE}, + {gBattleAnimSpritePalette_082, ANIM_TAG_BLUE_LINES}, + {gBattleAnimSpritePalette_083, ANIM_TAG_IMPACT_3}, + {gBattleAnimSpritePalette_084, ANIM_TAG_IMPACT_2}, + {gBattleAnimSpritePalette_085, ANIM_TAG_RETICLE}, {gBattleAnimSpritePalette_086, ANIM_TAG_BREATH}, {gBattleAnimSpritePalette_087, ANIM_TAG_ANGER}, - {gBattleAnimSpritePalette_088, ANIM_TAG_UNUSED_SNOWBALL}, - {gBattleAnimSpritePalette_089, ANIM_TAG_UNUSED_VINE}, - {gBattleAnimSpritePalette_090, ANIM_TAG_UNUSED_SWORD}, - {gBattleAnimSpritePalette_091, ANIM_TAG_UNUSED_CLAPPING}, - {gBattleAnimSpritePalette_092, ANIM_TAG_UNUSED_RED_TUBE}, + {gBattleAnimSpritePalette_088, ANIM_TAG_SNOWBALL}, + {gBattleAnimSpritePalette_089, ANIM_TAG_VINE}, + {gBattleAnimSpritePalette_090, ANIM_TAG_SWORD_2}, + {gBattleAnimSpritePalette_091, ANIM_TAG_CLAPPING}, + {gBattleAnimSpritePalette_092, ANIM_TAG_RED_TUBE}, {gBattleAnimSpritePalette_093, ANIM_TAG_AMNESIA}, - {gBattleAnimSpritePalette_094, ANIM_TAG_UNUSED_STRING}, - {gBattleAnimSpritePalette_095, ANIM_TAG_UNUSED_PENCIL}, - {gBattleAnimSpritePalette_096, ANIM_TAG_UNUSED_PETAL}, + {gBattleAnimSpritePalette_094, ANIM_TAG_STRING_2}, + {gBattleAnimSpritePalette_095, ANIM_TAG_PENCIL_2}, + {gBattleAnimSpritePalette_096, ANIM_TAG_PETAL}, {gBattleAnimSpritePalette_097, ANIM_TAG_BENT_SPOON}, - {gBattleAnimSpritePalette_094, ANIM_TAG_UNUSED_WEB}, + {gBattleAnimSpritePalette_094, ANIM_TAG_WEB}, {gBattleAnimSpritePalette_099, ANIM_TAG_MILK_BOTTLE}, {gBattleAnimSpritePalette_100, ANIM_TAG_COIN}, - {gBattleAnimSpritePalette_101, ANIM_TAG_UNUSED_CRACKED_EGG}, - {gBattleAnimSpritePalette_101, ANIM_TAG_UNUSED_HATCHED_EGG}, - {gBattleAnimSpritePalette_103, ANIM_TAG_UNUSED_FRESH_EGG}, - {gBattleAnimSpritePalette_104, ANIM_TAG_UNUSED_FANGS}, - {gBattleAnimSpritePalette_105, ANIM_TAG_UNUSED_EXPLOSION_2}, - {gBattleAnimSpritePalette_105, ANIM_TAG_UNUSED_EXPLOSION_3}, - {gBattleAnimSpritePalette_107, ANIM_TAG_UNUSED_WATER_DROPLET}, - {gBattleAnimSpritePalette_107, ANIM_TAG_UNUSED_WATER_DROPLET_2}, - {gBattleAnimSpritePalette_109, ANIM_TAG_UNUSED_SEED}, - {gBattleAnimSpritePalette_109, ANIM_TAG_UNUSED_SPROUT}, - {gBattleAnimSpritePalette_111, ANIM_TAG_UNUSED_RED_WAND}, - {gBattleAnimSpritePalette_112, ANIM_TAG_UNUSED_PURPLE_GREEN_UNK}, - {gBattleAnimSpritePalette_113, ANIM_TAG_UNUSED_WATER_COLUMN}, - {gBattleAnimSpritePalette_114, ANIM_TAG_UNUSED_MUD_UNK}, + {gBattleAnimSpritePalette_101, ANIM_TAG_CRACKED_EGG}, + {gBattleAnimSpritePalette_101, ANIM_TAG_HATCHED_EGG}, + {gBattleAnimSpritePalette_103, ANIM_TAG_FRESH_EGG}, + {gBattleAnimSpritePalette_104, ANIM_TAG_FANGS}, + {gBattleAnimSpritePalette_105, ANIM_TAG_EXPLOSION_2}, + {gBattleAnimSpritePalette_105, ANIM_TAG_EXPLOSION_3}, + {gBattleAnimSpritePalette_107, ANIM_TAG_WATER_DROPLET}, + {gBattleAnimSpritePalette_107, ANIM_TAG_WATER_DROPLET_2}, + {gBattleAnimSpritePalette_109, ANIM_TAG_SEED_2}, + {gBattleAnimSpritePalette_109, ANIM_TAG_SPROUT}, + {gBattleAnimSpritePalette_111, ANIM_TAG_RED_WAND}, + {gBattleAnimSpritePalette_112, ANIM_TAG_PURPLE_GREEN_UNK}, + {gBattleAnimSpritePalette_113, ANIM_TAG_WATER_COLUMN}, + {gBattleAnimSpritePalette_114, ANIM_TAG_MUD_UNK}, {gBattleAnimSpritePalette_115, ANIM_TAG_RAIN_DROPS}, - {gBattleAnimSpritePalette_116, ANIM_TAG_UNUSED_FURY_SWIPES}, - {gBattleAnimSpritePalette_117, ANIM_TAG_UNUSED_VINE_2}, - {gBattleAnimSpritePalette_118, ANIM_TAG_UNUSED_TEETH}, - {gBattleAnimSpritePalette_119, ANIM_TAG_UNUSED_BONE}, - {gBattleAnimSpritePalette_120, ANIM_TAG_UNUSED_WHITE_BAG}, - {gBattleAnimSpritePalette_121, ANIM_TAG_UNUSED_UNKNOWN}, - {gBattleAnimSpritePalette_122, ANIM_TAG_UNUSED_PURPLE_CORAL}, - {gBattleAnimSpritePalette_122, ANIM_TAG_UNUSED_PURPLE_DROPLET}, - {gBattleAnimSpritePalette_124, ANIM_TAG_UNUSED_SHOCK_2}, - {gBattleAnimSpritePalette_125, ANIM_TAG_UNUSED_CLOSING_EYE_2}, - {gBattleAnimSpritePalette_126, ANIM_TAG_UNUSED_METAL_BALL}, - {gBattleAnimSpritePalette_127, ANIM_TAG_UNUSED_MONSTER_DOLL}, - {gBattleAnimSpritePalette_128, ANIM_TAG_UNUSED_WHIRLWIND}, - {gBattleAnimSpritePalette_128, ANIM_TAG_UNUSED_WHIRLWIND_2}, - {gBattleAnimSpritePalette_130, ANIM_TAG_UNUSED_EXPLOSION_4}, - {gBattleAnimSpritePalette_130, ANIM_TAG_UNUSED_EXPLOSION_5}, - {gBattleAnimSpritePalette_132, ANIM_TAG_UNUSED_TONGUE}, - {gBattleAnimSpritePalette_133, ANIM_TAG_UNUSED_SMOKE}, - {gBattleAnimSpritePalette_133, ANIM_TAG_UNUSED_SMOKE_2}, + {gBattleAnimSpritePalette_116, ANIM_TAG_FURY_SWIPES}, + {gBattleAnimSpritePalette_117, ANIM_TAG_VINE_2}, + {gBattleAnimSpritePalette_118, ANIM_TAG_TEETH}, + {gBattleAnimSpritePalette_119, ANIM_TAG_BONE_2}, + {gBattleAnimSpritePalette_120, ANIM_TAG_WHITE_BAG}, + {gBattleAnimSpritePalette_121, ANIM_TAG_UNKNOWN}, + {gBattleAnimSpritePalette_122, ANIM_TAG_PURPLE_CORAL}, + {gBattleAnimSpritePalette_122, ANIM_TAG_PURPLE_DROPLET}, + {gBattleAnimSpritePalette_124, ANIM_TAG_SHOCK_2}, + {gBattleAnimSpritePalette_125, ANIM_TAG_CLOSING_EYE_2}, + {gBattleAnimSpritePalette_126, ANIM_TAG_METAL_BALL}, + {gBattleAnimSpritePalette_127, ANIM_TAG_MONSTER_DOLL}, + {gBattleAnimSpritePalette_128, ANIM_TAG_WHIRLWIND}, + {gBattleAnimSpritePalette_128, ANIM_TAG_WHIRLWIND_2}, + {gBattleAnimSpritePalette_130, ANIM_TAG_EXPLOSION_4}, + {gBattleAnimSpritePalette_130, ANIM_TAG_EXPLOSION_5}, + {gBattleAnimSpritePalette_132, ANIM_TAG_TONGUE}, + {gBattleAnimSpritePalette_133, ANIM_TAG_SMOKE}, + {gBattleAnimSpritePalette_133, ANIM_TAG_SMOKE_2}, {gBattleAnimSpritePalette_135, ANIM_TAG_IMPACT}, {gBattleAnimSpritePalette_136, ANIM_TAG_CIRCLE_IMPACT}, {gBattleAnimSpritePalette_135, ANIM_TAG_SCRATCH}, @@ -1598,11 +1598,11 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = {gBattleAnimSpritePalette_175, ANIM_TAG_LARGE_FRESH_EGG}, {gBattleAnimSpritePalette_176, ANIM_TAG_SHADOW_BALL}, {gBattleAnimSpritePalette_177, ANIM_TAG_LICK}, - {gBattleAnimSpritePalette_178, ANIM_TAG_UNUSED_VOID_LINES}, + {gBattleAnimSpritePalette_178, ANIM_TAG_VOID_LINES}, {gBattleAnimSpritePalette_179, ANIM_TAG_STRING}, {gBattleAnimSpritePalette_179, ANIM_TAG_WEB_THREAD}, {gBattleAnimSpritePalette_179, ANIM_TAG_SPIDER_WEB}, - {gBattleAnimSpritePalette_182, ANIM_TAG_UNUSED_LIGHTBULB}, + {gBattleAnimSpritePalette_182, ANIM_TAG_LIGHTBULB}, {gBattleAnimSpritePalette_183, ANIM_TAG_SLASH}, {gBattleAnimSpritePalette_184, ANIM_TAG_FOCUS_ENERGY}, {gBattleAnimSpritePalette_185, ANIM_TAG_SPHERE_TO_CUBE}, @@ -1624,7 +1624,7 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = {gBattleAnimSpritePalette_201, ANIM_TAG_WARM_ROCK}, {gBattleAnimSpritePalette_202, ANIM_TAG_BREAKING_EGG}, {gBattleAnimSpritePalette_203, ANIM_TAG_THIN_RING}, - {gBattleAnimSpritePalette_204, ANIM_TAG_UNUSED_PUNCH_IMPACT}, + {gBattleAnimSpritePalette_204, ANIM_TAG_PUNCH_IMPACT}, {gBattleAnimSpritePalette_205, ANIM_TAG_BELL}, {gBattleAnimSpritePalette_206, ANIM_TAG_MUSIC_NOTES_2}, {gBattleAnimSpritePalette_207, ANIM_TAG_SPEED_DUST}, @@ -1689,17 +1689,17 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = {gBattleAnimSpritePalette_266, ANIM_TAG_GREEN_SPIKE}, {gBattleAnimSpritePalette_267, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT}, {gBattleAnimSpritePalette_268, ANIM_TAG_GLOWY_BLUE_ORB}, - {gBattleAnimSpritePalette_269, ANIM_TAG_UNUSED_RED_BRICK}, + {gBattleAnimSpritePalette_269, ANIM_TAG_RED_BRICK}, {gBattleAnimSpritePalette_270, ANIM_TAG_WHITE_FEATHER}, {gBattleAnimSpritePalette_271, ANIM_TAG_SPARKLE_6}, {gBattleAnimSpritePalette_272, ANIM_TAG_SPLASH}, {gBattleAnimSpritePalette_272, ANIM_TAG_SWEAT_BEAD}, - {gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_1}, - {gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_2}, - {gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_3}, + {gBattleAnimSpritePalette_274, ANIM_TAG_GEM_1}, + {gBattleAnimSpritePalette_274, ANIM_TAG_GEM_2}, + {gBattleAnimSpritePalette_274, ANIM_TAG_GEM_3}, {gBattleAnimSpritePalette_277, ANIM_TAG_SLAM_HIT_2}, {gBattleAnimSpritePalette_278, ANIM_TAG_RECYCLE}, - {gBattleAnimSpritePalette_279, ANIM_TAG_UNUSED_RED_PARTICLES}, + {gBattleAnimSpritePalette_279, ANIM_TAG_RED_PARTICLES}, {gBattleAnimSpritePalette_280, ANIM_TAG_PROTECT}, {gBattleAnimSpritePalette_281, ANIM_TAG_DIRT_MOUND}, {gBattleAnimSpritePalette_282, ANIM_TAG_SHOCK_3},