Clean up data2b.c

1 files changed, 32 insertions, 32 deletions

diff --git a/src/data/trainer_graphics/back_pic_anims.h b/src/data/trainer_graphics/back_pic_anims.h
index 0cc4bb203..821039cb3 100644
--- a/src/data/trainer_graphics/back_pic_anims.h
+++ b/src/data/trainer_graphics/back_pic_anims.h
@@ -1,4 +1,4 @@
-const union AnimCmd gAnimCmd_Brendan_1[] =
+static const union AnimCmd gAnimCmd_Brendan_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -8,7 +8,7 @@ const union AnimCmd gAnimCmd_Brendan_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_May_Steven_1[] =
+static const union AnimCmd gAnimCmd_May_Steven_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -18,7 +18,7 @@ const union AnimCmd gAnimCmd_May_Steven_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_Wally_1[] =
+static const union AnimCmd gAnimCmd_Wally_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -28,7 +28,7 @@ const union AnimCmd gAnimCmd_Wally_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_Red_1[] =
+static const union AnimCmd gAnimCmd_Red_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(2, 6),
@@ -38,7 +38,7 @@ const union AnimCmd gAnimCmd_Red_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_Leaf_1[] =
+static const union AnimCmd gAnimCmd_Leaf_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(2, 6),
@@ -48,7 +48,7 @@ const union AnimCmd gAnimCmd_Leaf_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
+static const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
@@ -58,72 +58,72 @@ const union AnimCmd gAnimCmd_RubySapphireBrendan_1[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd gAnimCmd_RubySapphireMay_1[] =
+static const union AnimCmd gAnimCmd_RubySapphireMay_1[] =
 {
     ANIMCMD_FRAME(0, 24),
     ANIMCMD_FRAME(1, 9),
-    ANIMCMD_FRAME(2, 24), 
+    ANIMCMD_FRAME(2, 24),
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(3, 50),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Brendan[] =
+static const union AnimCmd *const sBackAnims_Brendan[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_Brendan_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_May[] =
+static const union AnimCmd *const sBackAnims_May[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_May_Steven_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Red[] =
+static const union AnimCmd *const sBackAnims_Red[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gAnimCmd_Red_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Leaf[] =
+static const union AnimCmd *const sBackAnims_Leaf[] =
 {
-    gAnimCmd_General_Frame0,
+    sAnim_GeneralFrame0,
     gAnimCmd_Leaf_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_RubySapphireBrendan[] =
+static const union AnimCmd *const sBackAnims_RubySapphireBrendan[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_RubySapphireBrendan_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_RubySapphireMay[] =
+static const union AnimCmd *const sBackAnims_RubySapphireMay[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_RubySapphireMay_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Wally[] =
+static const union AnimCmd *const sBackAnims_Wally[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_Wally_1,
 };
 
-const union AnimCmd *const gTrainerBackAnims_Steven[] =
+static const union AnimCmd *const sBackAnims_Steven[] =
 {
-    gAnimCmd_General_Frame3,
+    sAnim_GeneralFrame3,
     gAnimCmd_May_Steven_1,
 };
 
 const union AnimCmd *const *const gTrainerBackAnimsPtrTable[] =
 {
-    gTrainerBackAnims_Brendan,
-    gTrainerBackAnims_May,
-    gTrainerBackAnims_Red,
-    gTrainerBackAnims_Leaf,
-    gTrainerBackAnims_RubySapphireBrendan,
-    gTrainerBackAnims_RubySapphireMay,
-    gTrainerBackAnims_Wally,
-    gTrainerBackAnims_Steven,
+    [TRAINER_BACK_PIC_BRENDAN] = sBackAnims_Brendan,
+    [TRAINER_BACK_PIC_MAY] = sBackAnims_May,
+    [TRAINER_BACK_PIC_RED] = sBackAnims_Red,
+    [TRAINER_BACK_PIC_LEAF] = sBackAnims_Leaf,
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = sBackAnims_RubySapphireBrendan,
+    [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = sBackAnims_RubySapphireMay,
+    [TRAINER_BACK_PIC_WALLY] = sBackAnims_Wally,
+    [TRAINER_BACK_PIC_STEVEN] = sBackAnims_Steven,
 };