Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps

1 files changed, 43 insertions, 72 deletions

diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h
index ebc422b18..4622876cc 100644
--- a/include/constants/battle_anim.h
+++ b/include/constants/battle_anim.h
@@ -346,51 +346,51 @@
 #define BG_SOLARBEAM_PLAYER 25
 #define BG_SOLARBEAM_CONTESTS 26
 
-// table ids for general animations
-#define B_ANIM_CASTFORM_CHANGE          0x0
-#define B_ANIM_STATS_CHANGE             0x1
-#define B_ANIM_SUBSTITUTE_FADE          0x2
-#define B_ANIM_SUBSTITUTE_APPEAR        0x3
-#define B_ANIM_POKEBLOCK_THROW          0x4
-#define B_ANIM_ITEM_KNOCKOFF            0x5
-#define B_ANIM_TURN_TRAP                0x6
-#define B_ANIM_HELD_ITEM_EFFECT         0x7
-#define B_ANIM_SMOKEBALL_ESCAPE         0x8
-#define B_ANIM_FOCUS_BAND               0x9
-#define B_ANIM_RAIN_CONTINUES           0xA
-#define B_ANIM_SUN_CONTINUES            0xB
-#define B_ANIM_SANDSTORM_CONTINUES      0xC
-#define B_ANIM_HAIL_CONTINUES           0xD
-#define B_ANIM_LEECH_SEED_DRAIN         0xE
-#define B_ANIM_MON_HIT                  0xF
-#define B_ANIM_ITEM_STEAL               0x10
-#define B_ANIM_SNATCH_MOVE              0x11
-#define B_ANIM_FUTURE_SIGHT_HIT         0x12
-#define B_ANIM_DOOM_DESIRE_HIT          0x13
-#define B_ANIM_FOCUS_PUNCH_SETUP        0x14
-#define B_ANIM_INGRAIN_HEAL             0x15
-#define B_ANIM_WISH_HEAL                0x16
+// table ids for general animations (gBattleAnims_General)
+#define B_ANIM_CASTFORM_CHANGE          0
+#define B_ANIM_STATS_CHANGE             1
+#define B_ANIM_SUBSTITUTE_FADE          2
+#define B_ANIM_SUBSTITUTE_APPEAR        3
+#define B_ANIM_POKEBLOCK_THROW          4
+#define B_ANIM_ITEM_KNOCKOFF            5
+#define B_ANIM_TURN_TRAP                6
+#define B_ANIM_HELD_ITEM_EFFECT         7
+#define B_ANIM_SMOKEBALL_ESCAPE         8
+#define B_ANIM_FOCUS_BAND               9
+#define B_ANIM_RAIN_CONTINUES           10
+#define B_ANIM_SUN_CONTINUES            11
+#define B_ANIM_SANDSTORM_CONTINUES      12
+#define B_ANIM_HAIL_CONTINUES           13
+#define B_ANIM_LEECH_SEED_DRAIN         14
+#define B_ANIM_MON_HIT                  15
+#define B_ANIM_ITEM_STEAL               16
+#define B_ANIM_SNATCH_MOVE              17
+#define B_ANIM_FUTURE_SIGHT_HIT         18
+#define B_ANIM_DOOM_DESIRE_HIT          19
+#define B_ANIM_FOCUS_PUNCH_SETUP        20
+#define B_ANIM_INGRAIN_HEAL             21
+#define B_ANIM_WISH_HEAL                22
 
-// special animations table
-#define B_ANIM_LVL_UP                   0x0
-#define B_ANIM_SWITCH_OUT_PLAYER_MON    0x1
-#define B_ANIM_SWITCH_OUT_OPPONENT_MON  0x2
-#define B_ANIM_BALL_THROW               0x3
-#define B_ANIM_BALL_THROW_WITH_TRAINER  0x4
-#define B_ANIM_SUBSTITUTE_TO_MON        0x5
-#define B_ANIM_MON_TO_SUBSTITUTE        0x6
+// special animations table (gBattleAnims_Special)
+#define B_ANIM_LVL_UP                   0
+#define B_ANIM_SWITCH_OUT_PLAYER_MON    1
+#define B_ANIM_SWITCH_OUT_OPPONENT_MON  2
+#define B_ANIM_BALL_THROW               3
+#define B_ANIM_BALL_THROW_WITH_TRAINER  4
+#define B_ANIM_SUBSTITUTE_TO_MON        5
+#define B_ANIM_MON_TO_SUBSTITUTE        6
 
-// status animation table
-#define B_ANIM_STATUS_PSN               0x0
-#define B_ANIM_STATUS_CONFUSION         0x1
-#define B_ANIM_STATUS_BRN               0x2
-#define B_ANIM_STATUS_INFATUATION       0x3
-#define B_ANIM_STATUS_SLP               0x4
-#define B_ANIM_STATUS_PRZ               0x5
-#define B_ANIM_STATUS_FRZ               0x6
-#define B_ANIM_STATUS_CURSED            0x7
-#define B_ANIM_STATUS_NIGHTMARE         0x8
-#define B_ANIM_STATUS_WRAPPED           0x9 // does not actually exist
+// status animation table (gBattleAnims_StatusConditions)
+#define B_ANIM_STATUS_PSN               0
+#define B_ANIM_STATUS_CONFUSION         1
+#define B_ANIM_STATUS_BRN               2
+#define B_ANIM_STATUS_INFATUATION       3
+#define B_ANIM_STATUS_SLP               4
+#define B_ANIM_STATUS_PRZ               5
+#define B_ANIM_STATUS_FRZ               6
+#define B_ANIM_STATUS_CURSED            7
+#define B_ANIM_STATUS_NIGHTMARE         8
+#define B_ANIM_STATUS_WRAPPED           9 // does not actually exist
 
 // Tasks with return values often assign them to gBattleAnimArgs[7].
 #define ARG_RET_ID 7
@@ -410,33 +410,4 @@
 #define ANIM_WEATHER_SANDSTORM 3
 #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
-
-
 #endif // GUARD_CONSTANTS_BATTLE_ANIM_H