diff --git a/.github/calcrom/calcrom.pl b/.github/calcrom/calcrom.pl
index 9fbd95994..cb8c5723e 100755
--- a/.github/calcrom/calcrom.pl
+++ b/.github/calcrom/calcrom.pl
@@ -1,5 +1,11 @@
 #!/usr/bin/perl
 
+# Usage:
+#   calcrom.pl <mapfile> [--data]
+#
+#   mapfile: path to .map file output by LD
+#   data: set to output % breakdown of data
+
 use IPC::Cmd qw[ run ];
 use Getopt::Long;
 
@@ -65,12 +71,13 @@ my $base_cmd = "nm $elffname | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
 
 # This looks for Unknown_, Unknown_, or sub_, followed by an address. Note that
 # it matches even if stuff precedes the unknown, like sUnknown/gUnknown.
-my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]\\{5,7\\}\\|sub_[0-9a-fA-F]\\{5,7\\}'";
+my $undoc_regex = "'[Uu]nknown_[0-9a-fA-F]\\{5,7\\}\\|sub_[0-9a-fA-F]\\{5,7\\}'";
 
 # This looks for every symbol with an address at the end of it. Some things are
 # given a name based on their type / location, but still have an unknown purpose.
 # For example, FooMap_EventScript_FFFFFFF.
-my $partial_doc_cmd = "grep '_[0-28][0-9a-fA-F]\\{5,7\\}'";
+# The above may be double counted here, and will need to be filtered out.
+my $partial_doc_regex = "'_[0-28][0-9a-fA-F]\\{5,7\\}'";
 
 my $count_cmd = "wc -l";
 
@@ -87,7 +94,7 @@ my $total_syms_as_string;
 
 my $undocumented_as_string;
 (run (
-    command => "$base_cmd | $undoc_cmd | $count_cmd",
+    command => "$base_cmd | grep $undoc_regex | $count_cmd",
     buffer => \$undocumented_as_string,
     timeout => 60
 ))
@@ -95,7 +102,7 @@ my $undocumented_as_string;
 
 my $partial_documented_as_string;
 (run (
-    command => "$base_cmd | $partial_doc_cmd | $count_cmd",
+    command => "$base_cmd | grep $partial_doc_regex | grep -v $undoc_regex | $count_cmd",
     buffer => \$partial_documented_as_string,
     timeout => 60
 ))
@@ -112,7 +119,7 @@ my $undocumented = $undocumented_as_string + 0;
 $partial_documented_as_string =~ s/^\s+|\s+$//g;
 my $partial_documented = $partial_documented_as_string + 0;
 (($partial_documented != 0) or (($partial_documented == 0) and ($partial_documented_as_string eq "0")))
-	or die "ERROR: Cannot convert string to num: '$partial_documented_as_string'";
+    or die "ERROR: Cannot convert string to num: '$partial_documented_as_string'";
 
 $total_syms_as_string =~ s/^\s+|\s+$//g;
 my $total_syms = $total_syms_as_string + 0;
@@ -126,9 +133,6 @@ my $total = $src + $asm;
 my $srcPct = sprintf("%.4f", 100 * $src / $total);
 my $asmPct = sprintf("%.4f", 100 * $asm / $total);
 
-# partial_documented is double-counting the unknown_* and sub_* symbols.
-$partial_documented = $partial_documented - $undocumented;
-
 my $documented = $total_syms - ($undocumented + $partial_documented);
 my $docPct = sprintf("%.4f", 100 * $documented / $total_syms);
 my $partialPct = sprintf("%.4f", 100 * $partial_documented / $total_syms);
diff --git a/charmap.txt b/charmap.txt
index 260607678..725f5d1b9 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -416,13 +416,13 @@ SHADOW = FC 03 @ same as fc 01
 COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes
 PALETTE = FC 05 @ used in credits
 FONT = FC 06 @ Given a font id, or use font constants below instead
-RESET_SIZE = FC 07
+RESET_FONT = FC 07
 PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them
 PAUSE_UNTIL_PRESS = FC 09
 WAIT_SE = FC 0A
 PLAY_BGM = FC 0B
 ESCAPE = FC 0C
-SHIFT_TEXT = FC 0D
+SHIFT_RIGHT = FC 0D
 SHIFT_DOWN = FC 0E
 FILL_WINDOW = FC 0F
 PLAY_SE = FC 10
diff --git a/gflib/bg.c b/gflib/bg.c
index 4b0379de0..89f503824 100644
--- a/gflib/bg.c
+++ b/gflib/bg.c
@@ -1053,7 +1053,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
                 for (x16 = x; x16 < (x + width); x16++)
                 {
                     CopyTileMapEntry(&firstTileNum, &((u16 *)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0);
-                    firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK);
+                    firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF);
                 }
             }
             break;
@@ -1064,7 +1064,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
                 for (x16 = x; x16 < (x + width); x16++)
                 {
                     ((u8 *)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum;
-                    firstTileNum = (firstTileNum & (MAPGRID_COLLISION_MASK | MAPGRID_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & MAPGRID_METATILE_ID_MASK);
+                    firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF);
                 }
             }
             break;
diff --git a/gflib/characters.h b/gflib/characters.h
index 714904aa4..8ed440e63 100644
--- a/gflib/characters.h
+++ b/gflib/characters.h
@@ -212,13 +212,13 @@
 #define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x04
 #define EXT_CTRL_CODE_PALETTE                0x05
 #define EXT_CTRL_CODE_FONT                   0x06
-#define EXT_CTRL_CODE_RESET_SIZE             0x07
+#define EXT_CTRL_CODE_RESET_FONT             0x07
 #define EXT_CTRL_CODE_PAUSE                  0x08
 #define EXT_CTRL_CODE_PAUSE_UNTIL_PRESS      0x09
 #define EXT_CTRL_CODE_WAIT_SE                0x0A
 #define EXT_CTRL_CODE_PLAY_BGM               0x0B
 #define EXT_CTRL_CODE_ESCAPE                 0x0C
-#define EXT_CTRL_CODE_SHIFT_TEXT             0x0D
+#define EXT_CTRL_CODE_SHIFT_RIGHT            0x0D
 #define EXT_CTRL_CODE_SHIFT_DOWN             0x0E
 #define EXT_CTRL_CODE_FILL_WINDOW            0x0F
 #define EXT_CTRL_CODE_PLAY_SE                0x10
diff --git a/gflib/string_util.c b/gflib/string_util.c
index 4bf8d946d..8d969d1bf 100644
--- a/gflib/string_util.c
+++ b/gflib/string_util.c
@@ -354,7 +354,7 @@ u8 *StringExpandPlaceholders(u8 *dest, const u8 *src)
 
             switch (c)
             {
-            case EXT_CTRL_CODE_RESET_SIZE:
+            case EXT_CTRL_CODE_RESET_FONT:
             case EXT_CTRL_CODE_PAUSE_UNTIL_PRESS:
             case EXT_CTRL_CODE_FILL_WINDOW:
             case EXT_CTRL_CODE_JPN:
@@ -665,13 +665,13 @@ u8 GetExtCtrlCodeLength(u8 code)
         [EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW] = 4,
         [EXT_CTRL_CODE_PALETTE]                = 2,
         [EXT_CTRL_CODE_FONT]                   = 2,
-        [EXT_CTRL_CODE_RESET_SIZE]             = 1,
+        [EXT_CTRL_CODE_RESET_FONT]             = 1,
         [EXT_CTRL_CODE_PAUSE]                  = 2,
         [EXT_CTRL_CODE_PAUSE_UNTIL_PRESS]      = 1,
         [EXT_CTRL_CODE_WAIT_SE]                = 1,
         [EXT_CTRL_CODE_PLAY_BGM]               = 3,
         [EXT_CTRL_CODE_ESCAPE]                 = 2,
-        [EXT_CTRL_CODE_SHIFT_TEXT]             = 2,
+        [EXT_CTRL_CODE_SHIFT_RIGHT]            = 2,
         [EXT_CTRL_CODE_SHIFT_DOWN]             = 2,
         [EXT_CTRL_CODE_FILL_WINDOW]            = 1,
         [EXT_CTRL_CODE_PLAY_SE]                = 3,
diff --git a/gflib/text.c b/gflib/text.c
index e7a7d5957..86dca3829 100644
--- a/gflib/text.c
+++ b/gflib/text.c
@@ -1009,7 +1009,7 @@ static u16 RenderText(struct TextPrinter *textPrinter)
                 subStruct->fontId = *textPrinter->printerTemplate.currentChar;
                 textPrinter->printerTemplate.currentChar++;
                 return RENDER_REPEAT;
-            case EXT_CTRL_CODE_RESET_SIZE:
+            case EXT_CTRL_CODE_RESET_FONT:
                 return RENDER_REPEAT;
             case EXT_CTRL_CODE_PAUSE:
                 textPrinter->delayCounter = *textPrinter->printerTemplate.currentChar;
@@ -1042,7 +1042,7 @@ static u16 RenderText(struct TextPrinter *textPrinter)
                 textPrinter->printerTemplate.currentChar++;
                 PlaySE(currChar);
                 return RENDER_REPEAT;
-            case EXT_CTRL_CODE_SHIFT_TEXT:
+            case EXT_CTRL_CODE_SHIFT_RIGHT:
                 textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x + *textPrinter->printerTemplate.currentChar;
                 textPrinter->printerTemplate.currentChar++;
                 return RENDER_REPEAT;
@@ -1271,7 +1271,7 @@ static u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpaci
             case EXT_CTRL_CODE_FONT:
             case EXT_CTRL_CODE_PAUSE:
             case EXT_CTRL_CODE_ESCAPE:
-            case EXT_CTRL_CODE_SHIFT_TEXT:
+            case EXT_CTRL_CODE_SHIFT_RIGHT:
             case EXT_CTRL_CODE_SHIFT_DOWN:
             case EXT_CTRL_CODE_CLEAR:
             case EXT_CTRL_CODE_SKIP:
@@ -1279,7 +1279,7 @@ static u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpaci
             case EXT_CTRL_CODE_MIN_LETTER_SPACING:
                 ++strPos;
                 break;
-            case EXT_CTRL_CODE_RESET_SIZE:
+            case EXT_CTRL_CODE_RESET_FONT:
             case EXT_CTRL_CODE_PAUSE_UNTIL_PRESS:
             case EXT_CTRL_CODE_WAIT_SE:
             case EXT_CTRL_CODE_FILL_WINDOW:
@@ -1413,7 +1413,7 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
             case EXT_CTRL_CODE_PALETTE:
             case EXT_CTRL_CODE_PAUSE:
             case EXT_CTRL_CODE_ESCAPE:
-            case EXT_CTRL_CODE_SHIFT_TEXT:
+            case EXT_CTRL_CODE_SHIFT_RIGHT:
             case EXT_CTRL_CODE_SHIFT_DOWN:
                 ++str;
                 break;
@@ -1444,7 +1444,7 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
             case EXT_CTRL_CODE_ENG:
                 isJapanese = 0;
                 break;
-            case EXT_CTRL_CODE_RESET_SIZE:
+            case EXT_CTRL_CODE_RESET_FONT:
             case EXT_CTRL_CODE_PAUSE_UNTIL_PRESS:
             case EXT_CTRL_CODE_WAIT_SE:
             case EXT_CTRL_CODE_FILL_WINDOW:
@@ -1556,7 +1556,7 @@ u8 RenderTextHandleBold(u8 *pixels, u8 fontId, u8 *str)
             case EXT_CTRL_CODE_PALETTE:
             case EXT_CTRL_CODE_PAUSE:
             case EXT_CTRL_CODE_ESCAPE:
-            case EXT_CTRL_CODE_SHIFT_TEXT:
+            case EXT_CTRL_CODE_SHIFT_RIGHT:
             case EXT_CTRL_CODE_SHIFT_DOWN:
             case EXT_CTRL_CODE_CLEAR:
             case EXT_CTRL_CODE_SKIP:
@@ -1564,7 +1564,7 @@ u8 RenderTextHandleBold(u8 *pixels, u8 fontId, u8 *str)
             case EXT_CTRL_CODE_MIN_LETTER_SPACING:
                 ++strPos;
                 break;
-            case EXT_CTRL_CODE_RESET_SIZE:
+            case EXT_CTRL_CODE_RESET_FONT:
             case EXT_CTRL_CODE_PAUSE_UNTIL_PRESS:
             case EXT_CTRL_CODE_WAIT_SE:
             case EXT_CTRL_CODE_FILL_WINDOW:
diff --git a/graphics/battle_interface/ball_display_unused_extra.png b/graphics/battle_interface/ball_caught_indicator.png
similarity index 100%
rename from graphics/battle_interface/ball_display_unused_extra.png
rename to graphics/battle_interface/ball_caught_indicator.png
diff --git a/graphics/interface/red_arrow.png b/graphics/interface/arrow_cursor.png
similarity index 100%
rename from graphics/interface/red_arrow.png
rename to graphics/interface/arrow_cursor.png
diff --git a/graphics/interface/selector_outline.png b/graphics/interface/outline_cursor.png
similarity index 100%
rename from graphics/interface/selector_outline.png
rename to graphics/interface/outline_cursor.png
diff --git a/graphics/interface/red.pal b/graphics/interface/red.pal
new file mode 100644
index 000000000..f820b52bb
--- /dev/null
+++ b/graphics/interface/red.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 164 197
+255 82 0
+131 32 0
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
diff --git a/graphics/interface/red_arrow_other.png b/graphics/interface/scroll_indicator.png
similarity index 100%
rename from graphics/interface/red_arrow_other.png
rename to graphics/interface/scroll_indicator.png
diff --git a/graphics/link/wireless_info_screen.pal b/graphics/link/wireless_info_screen.pal
deleted file mode 100644
index 8e0bc0581..000000000
--- a/graphics/link/wireless_info_screen.pal
+++ /dev/null
@@ -1,259 +0,0 @@
-JASC-PAL
-0100
-256
-0 0 0
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-57 57 57
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-74 246 255
-57 57 57
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-74 246 255
-57 213 230
-57 57 57
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-74 246 255
-57 213 230
-49 180 205
-0 32 98
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-90 90 90
-90 90 90
-90 90 90
-74 246 255
-57 213 230
-49 180 205
-41 148 180
-0 32 98
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-90 90 90
-90 90 90
-74 246 255
-57 213 230
-49 180 205
-41 148 180
-24 123 164
-0 32 98
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-90 90 90
-74 246 255
-57 213 230
-49 180 205
-41 148 180
-24 123 164
-16 90 139
-0 32 98
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-74 246 255
-57 213 230
-49 180 205
-41 148 180
-24 123 164
-16 90 139
-8 57 115
-0 32 98
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-57 213 230
-49 180 205
-41 148 180
-24 123 164
-16 90 139
-8 57 115
-8 57 115
-57 57 57
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-49 180 205
-41 148 180
-24 123 164
-16 90 139
-8 57 115
-8 57 115
-90 90 90
-57 57 57
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-41 148 180
-24 123 164
-16 90 139
-8 57 115
-8 57 115
-90 90 90
-90 90 90
-57 57 57
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-24 123 164
-16 90 139
-8 57 115
-8 57 115
-90 90 90
-90 90 90
-90 90 90
-57 57 57
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-16 90 139
-8 57 115
-8 57 115
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-57 57 57
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-8 57 115
-8 57 115
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-57 57 57
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
-0 0 0
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-90 90 90
-57 57 57
-172 123 0
-90 90 90
-57 57 57
-164 164 164
-255 180 0
-106 106 106
-74 74 74
diff --git a/graphics/link/wireless_info_screen.png b/graphics/link/wireless_info_screen.png
deleted file mode 100644
index 796b2771a..000000000
Binary files a/graphics/link/wireless_info_screen.png and /dev/null differ
diff --git a/graphics/wireless_status_screen/anim_00.pal b/graphics/wireless_status_screen/anim_00.pal
new file mode 100644
index 000000000..7779155a6
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_00.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+74 246 255
+57 57 57
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_01.pal b/graphics/wireless_status_screen/anim_01.pal
new file mode 100644
index 000000000..30040b471
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_01.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+74 246 255
+57 213 230
+57 57 57
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_02.pal b/graphics/wireless_status_screen/anim_02.pal
new file mode 100644
index 000000000..3b40e7681
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_02.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+74 246 255
+57 213 230
+49 180 205
+0 32 98
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_03.pal b/graphics/wireless_status_screen/anim_03.pal
new file mode 100644
index 000000000..b0756a995
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_03.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+90 90 90
+90 90 90
+90 90 90
+74 246 255
+57 213 230
+49 180 205
+41 148 180
+0 32 98
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_04.pal b/graphics/wireless_status_screen/anim_04.pal
new file mode 100644
index 000000000..60916f08c
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_04.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+90 90 90
+90 90 90
+74 246 255
+57 213 230
+49 180 205
+41 148 180
+24 123 164
+0 32 98
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_05.pal b/graphics/wireless_status_screen/anim_05.pal
new file mode 100644
index 000000000..b59dc5901
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_05.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+90 90 90
+74 246 255
+57 213 230
+49 180 205
+41 148 180
+24 123 164
+16 90 139
+0 32 98
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_06.pal b/graphics/wireless_status_screen/anim_06.pal
new file mode 100644
index 000000000..3f14d81e7
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_06.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 246 255
+57 213 230
+49 180 205
+41 148 180
+24 123 164
+16 90 139
+8 57 115
+0 32 98
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_07.pal b/graphics/wireless_status_screen/anim_07.pal
new file mode 100644
index 000000000..e3da8baa6
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_07.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+57 213 230
+49 180 205
+41 148 180
+24 123 164
+16 90 139
+8 57 115
+8 57 115
+57 57 57
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_08.pal b/graphics/wireless_status_screen/anim_08.pal
new file mode 100644
index 000000000..1544a2303
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_08.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+49 180 205
+41 148 180
+24 123 164
+16 90 139
+8 57 115
+8 57 115
+90 90 90
+57 57 57
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_09.pal b/graphics/wireless_status_screen/anim_09.pal
new file mode 100644
index 000000000..8d3b1d4bc
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_09.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+41 148 180
+24 123 164
+16 90 139
+8 57 115
+8 57 115
+90 90 90
+90 90 90
+57 57 57
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_10.pal b/graphics/wireless_status_screen/anim_10.pal
new file mode 100644
index 000000000..5ab981ba3
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+24 123 164
+16 90 139
+8 57 115
+8 57 115
+90 90 90
+90 90 90
+90 90 90
+57 57 57
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_11.pal b/graphics/wireless_status_screen/anim_11.pal
new file mode 100644
index 000000000..46ad15269
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+16 90 139
+8 57 115
+8 57 115
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+57 57 57
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_12.pal b/graphics/wireless_status_screen/anim_12.pal
new file mode 100644
index 000000000..d1e4bdd02
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+8 57 115
+8 57 115
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+57 57 57
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/wireless_status_screen/anim_13.pal b/graphics/wireless_status_screen/anim_13.pal
new file mode 100644
index 000000000..dd11346b7
--- /dev/null
+++ b/graphics/wireless_status_screen/anim_13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+57 57 57
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics/link/wireless_info_screen.bin b/graphics/wireless_status_screen/bg.bin
similarity index 100%
rename from graphics/link/wireless_info_screen.bin
rename to graphics/wireless_status_screen/bg.bin
diff --git a/graphics/wireless_status_screen/bg.png b/graphics/wireless_status_screen/bg.png
new file mode 100644
index 000000000..4c453cf1a
Binary files /dev/null and b/graphics/wireless_status_screen/bg.png differ
diff --git a/graphics/wireless_status_screen/default.pal b/graphics/wireless_status_screen/default.pal
new file mode 100644
index 000000000..dd11346b7
--- /dev/null
+++ b/graphics/wireless_status_screen/default.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+90 90 90
+57 57 57
+172 123 0
+90 90 90
+57 57 57
+164 164 164
+255 180 0
+106 106 106
+74 74 74
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 56acaf659..8f74216a7 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -90,40 +90,6 @@ $(TILESETGFXDIR)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png
 $(TILESETGFXDIR)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 328 -Wnum_tiles
 
-SOOTOPOLISANIMDIR := $(TILESETGFXDIR)/secondary/sootopolis/anim
-
-$(SOOTOPOLISANIMDIR)/stormy_water/0.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/0_kyogre.4bpp \
-                                          $(SOOTOPOLISANIMDIR)/stormy_water/0_groudon.4bpp
-	@cat $^ >$@
-
-$(SOOTOPOLISANIMDIR)/stormy_water/1.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/1_kyogre.4bpp \
-                                          $(SOOTOPOLISANIMDIR)/stormy_water/1_groudon.4bpp
-	@cat $^ >$@
-
-$(SOOTOPOLISANIMDIR)/stormy_water/2.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/2_kyogre.4bpp \
-                                          $(SOOTOPOLISANIMDIR)/stormy_water/2_groudon.4bpp
-	@cat $^ >$@
-
-$(SOOTOPOLISANIMDIR)/stormy_water/3.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/3_kyogre.4bpp \
-                                          $(SOOTOPOLISANIMDIR)/stormy_water/3_groudon.4bpp
-	@cat $^ >$@
-
-$(SOOTOPOLISANIMDIR)/stormy_water/4.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/4_kyogre.4bpp \
-                                          $(SOOTOPOLISANIMDIR)/stormy_water/4_groudon.4bpp
-	@cat $^ >$@
-
-$(SOOTOPOLISANIMDIR)/stormy_water/5.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/5_kyogre.4bpp \
-                                          $(SOOTOPOLISANIMDIR)/stormy_water/5_groudon.4bpp
-	@cat $^ >$@
-
-$(SOOTOPOLISANIMDIR)/stormy_water/6.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/6_kyogre.4bpp \
-                                          $(SOOTOPOLISANIMDIR)/stormy_water/6_groudon.4bpp
-	@cat $^ >$@
-
-$(SOOTOPOLISANIMDIR)/stormy_water/7.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/7_kyogre.4bpp \
-                                          $(SOOTOPOLISANIMDIR)/stormy_water/7_groudon.4bpp
-	@cat $^ >$@
-
 $(TILESETGFXDIR)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 508 -Wnum_tiles
 
@@ -669,7 +635,7 @@ $(WALLPAPERGFXDIR)/whiscash/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $
 $(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 11 -Wnum_tiles
 
-$(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
+$(INTERFACEGFXDIR)/outline_cursor.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 8 -Wnum_tiles
 
 $(BATTRANSGFXDIR)/frontier_logo_center.4bpp: %.4bpp: %.png
diff --git a/include/battle.h b/include/battle.h
index e779dee3d..c1c713691 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -164,7 +164,7 @@ struct WishFutureKnock
     u8 wishCounter[MAX_BATTLERS_COUNT];
     u8 wishMonId[MAX_BATTLERS_COUNT];
     u8 weatherDuration;
-    u8 knockedOffMons[2]; // Each battler is represented by a bit. The array entry is dependent on the battler's side.
+    u8 knockedOffMons[NUM_BATTLE_SIDES]; // Each battler is represented by a bit.
 };
 
 struct AI_ThinkingStruct
@@ -326,9 +326,9 @@ struct BattleTv_Mon
 
 struct BattleTv
 {
-    struct BattleTv_Mon mon[2][PARTY_SIZE]; // [side][partyId]
-    struct BattleTv_Position pos[2][2]; // [side][flank]
-    struct BattleTv_Side side[2]; // [side]
+    struct BattleTv_Mon mon[NUM_BATTLE_SIDES][PARTY_SIZE];
+    struct BattleTv_Position pos[NUM_BATTLE_SIDES][2]; // [side][flank]
+    struct BattleTv_Side side[NUM_BATTLE_SIDES];
 };
 
 struct BattleTvMovePoints
@@ -399,7 +399,7 @@ struct BattleStruct
     u8 wallyWaitFrames;
     u8 wallyMoveFrames;
     u8 lastTakenMove[MAX_BATTLERS_COUNT * 2 * 2]; // Last move that a battler was hit with. This field seems to erroneously take 16 bytes instead of 8.
-    u16 hpOnSwitchout[2];
+    u16 hpOnSwitchout[NUM_BATTLE_SIDES];
     u32 savedBattleTypeFlags;
     u8 abilityPreventingSwitchout;
     u8 hpScale;
@@ -670,8 +670,8 @@ extern u8 gMoveResultFlags;
 extern u32 gHitMarker;
 extern u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT];
 extern u8 gUnusedFirstBattleVar2;
-extern u16 gSideStatuses[2];
-extern struct SideTimer gSideTimers[2];
+extern u16 gSideStatuses[NUM_BATTLE_SIDES];
+extern struct SideTimer gSideTimers[NUM_BATTLE_SIDES];
 extern u32 gStatuses3[MAX_BATTLERS_COUNT];
 extern struct DisableStruct gDisableStructs[MAX_BATTLERS_COUNT];
 extern u16 gPauseCounterBattle;
diff --git a/include/constants/battle.h b/include/constants/battle.h
index b4f3a4d9b..ac83feb3a 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -36,6 +36,7 @@
 
 #define B_SIDE_PLAYER     0
 #define B_SIDE_OPPONENT   1
+#define NUM_BATTLE_SIDES  2
 
 #define B_FLANK_LEFT  0
 #define B_FLANK_RIGHT 1
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index ff10f52ee..71aac2308 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -684,8 +684,6 @@
 #define METATILE_SecretBase_BigPlant_TopRight           0x2E6
 #define METATILE_SecretBase_BigPlant_BaseLeft1          0x2EC
 #define METATILE_SecretBase_BigPlant_BaseRight1         0x2ED
-#define METATILE_SecretBase_BigPlant_TopLeftWall        0x2E5
-#define METATILE_SecretBase_BigPlant_TopRightWall       0x2E6
 #define METATILE_SecretBase_BigPlant_BaseLeft2          0x2EE
 #define METATILE_SecretBase_BigPlant_BaseRight2         0x2EF
 #define METATILE_SecretBase_GorgeousPlant_TopLeft       0x2F0
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 2f7eaba66..f2dbefae8 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -9,6 +9,8 @@
 #define NUM_PALS_TOTAL 13
 #define MAX_MAP_DATA_SIZE 10240
 
+#define NUM_TILES_PER_METATILE 8
+
 // Map coordinates are offset by 7 when using the map
 // buffer because it needs to load sufficient border
 // metatiles to fill the player's view (the player has
diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h
index 91aa9f214..d362b5cb3 100644
--- a/include/gba/isagbprint.h
+++ b/include/gba/isagbprint.h
@@ -11,6 +11,7 @@
 
 #ifdef NDEBUG
 #define DebugPrintf(pBuf, ...)
+#define DebugPrintfLevel(level, pBuf, ...)
 #define MgbaOpen()
 #define MgbaClose()
 #define AGBPrintInit()
@@ -29,18 +30,21 @@ void AGBPrintInit(void);
 
 #if (LOG_HANDLER == LOG_HANDLER_MGBA_PRINT)
 
-#define DebugPrintf(pBuf, ...) MgbaPrintf(MGBA_LOG_INFO, pBuf, __VA_ARGS__)
+#define DebugPrintf(pBuf, ...) MgbaPrintf(MGBA_LOG_INFO, pBuf, ## __VA_ARGS__)
 #define DebugAssert(pFile, nLine, pExpression, nStopProgram) MgbaAssert(pFile, nLine, pExpression, nStopProgram)
+#define DebugPrintfLevel(level, pBuf, ...) MgbaPrintf(level, pBuf, ## __VA_ARGS__)
 
 #elif (LOG_HANDLER == LOG_HANDLER_NOCASH_PRINT)
 
-#define DebugPrintf(pBuf, ...) NoCashGBAPrintf(pBuf, __VA_ARGS__)
+#define DebugPrintf(pBuf, ...) NoCashGBAPrintf(pBuf, ## __VA_ARGS__)
 #define DebugAssert(pFile, nLine, pExpression, nStopProgram) NoCashGBAAssert(pFile, nLine, pExpression, nStopProgram)
+#define DebugPrintfLevel(level, pBuf, ...) NoCashGBAPrintf(pBuf, ## __VA_ARGS__)
 
 #else // Default to AGBPrint
 
-#define DebugPrintf(pBuf, ...) AGBPrintf(const char *pBuf, ...)
+#define DebugPrintf(pBuf, ...) AGBPrintf(pBuf, ## __VA_ARGS__)
 #define DebugAssert(pFile, nLine, pExpression, nStopProgram) AGBAssert(pFile, nLine, pExpression, nStopProgram)
+#define DebugPrintfLevel(level, pBuf, ...) AGBPrintf(pBuf, ## __VA_ARGS__)
 
 #endif
 #endif
diff --git a/include/gba/multiboot.h b/include/gba/multiboot.h
index 14b6594b2..64a860284 100644
--- a/include/gba/multiboot.h
+++ b/include/gba/multiboot.h
@@ -10,7 +10,7 @@ struct MultiBootParam
 {
     u32 system_work[5]; // 00
     u8 handshake_data;  // 14
-    u8 padding;         // 15
+    //u8 padding;         // 15
     u16 handshake_timeout; // 16
     u8 probe_count; // 18
     u8 client_data[MULTIBOOT_NCHILD]; // 19
diff --git a/include/global.berry.h b/include/global.berry.h
index 8d1aa369d..29f1cfe14 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -40,6 +40,7 @@ struct Berry2
     u8 bitter;
     u8 sour;
     u8 smoothness;
+    //u8 padding;
 };
 
 struct EnigmaBerry
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 4da3154e2..26e5c44bf 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -41,7 +41,7 @@ struct Tileset
     /*0x01*/ bool8 isSecondary;
     /*0x04*/ const u32 *tiles;
     /*0x08*/ const u16 (*palettes)[16];
-    /*0x0c*/ const u16 *metatiles;
+    /*0x0C*/ const u16 *metatiles;
     /*0x10*/ const u16 *metatileAttributes;
     /*0x14*/ TilesetCB callback;
 };
@@ -51,7 +51,7 @@ struct MapLayout
     /*0x00*/ s32 width;
     /*0x04*/ s32 height;
     /*0x08*/ u16 *border;
-    /*0x0c*/ u16 *map;
+    /*0x0C*/ u16 *map;
     /*0x10*/ struct Tileset *primaryTileset;
     /*0x14*/ struct Tileset *secondaryTileset;
 };
@@ -68,16 +68,19 @@ struct ObjectEventTemplate
     /*0x00*/ u8 localId;
     /*0x01*/ u8 graphicsId;
     /*0x02*/ u8 inConnection; // Leftover from FRLG
+    /*0x03*/ //u8 padding1;
     /*0x04*/ s16 x;
     /*0x06*/ s16 y;
     /*0x08*/ u8 elevation;
     /*0x09*/ u8 movementType;
     /*0x0A*/ u16 movementRangeX:4;
              u16 movementRangeY:4;
+             //u16 padding2:8;
     /*0x0C*/ u16 trainerType;
     /*0x0E*/ u16 trainerRange_berryTreeId;
     /*0x10*/ const u8 *script;
     /*0x14*/ u16 flagId;
+    /*0x16*/ //u8 padding3[2];
 };
 
 struct WarpEvent
@@ -192,6 +195,7 @@ struct ObjectEvent
              u32 disableJumpLandingGroundEffect:1;
              u32 fixedPriority:1;
              u32 hideReflection:1;
+             //u32 padding:4;
     /*0x04*/ u8 spriteId;
     /*0x05*/ u8 graphicsId;
     /*0x06*/ u8 movementType;
@@ -217,6 +221,7 @@ struct ObjectEvent
     /*0x20*/ u8 previousMovementDirection;
     /*0x21*/ u8 directionSequenceIndex;
     /*0x22*/ u8 playerCopyableMovement; // COPY_MOVE_*
+    /*0x23*/ //u8 padding2;
     /*size = 0x24*/
 };
 
diff --git a/include/global.h b/include/global.h
index 58922a39b..e0ff9f0c2 100644
--- a/include/global.h
+++ b/include/global.h
@@ -246,9 +246,11 @@ struct ApprenticeMon
 struct Apprentice
 {
     u8 id:5;
-    u8 lvlMode:2; // + 1
+    u8 lvlMode:2;
+    //u8 padding1:1;
     u8 numQuestions;
     u8 number;
+    //u8 padding2;
     struct ApprenticeMon party[MULTI_PARTY_SIZE];
     u16 speechWon[EASY_CHAT_BATTLE_WORDS_COUNT];
     u8 playerId[TRAINER_ID_LENGTH];
@@ -296,6 +298,7 @@ struct EmeraldBattleTowerRecord
     /*0x28*/ u16 speechLost[EASY_CHAT_BATTLE_WORDS_COUNT];
     /*0x34*/ struct BattleTowerPokemon party[MAX_FRONTIER_PARTY_SIZE];
     /*0xE4*/ u8 language;
+    /*0xE7*/ //u8 padding[3];
     /*0xE8*/ u32 checksum;
 };
 
@@ -328,14 +331,17 @@ struct DomeMonData
     u16 moves[MAX_MON_MOVES];
     u8 evs[NUM_STATS];
     u8 nature;
+    //u8 padding;
 };
 
 struct RentalMon
 {
     u16 monId;
+    //u8 padding1[2];
     u32 personality;
     u8 ivs;
     u8 abilityNum;
+    //u8 padding2[2];
 };
 
 struct BattleDomeTrainer
@@ -357,8 +363,9 @@ struct BattleFrontier
     /*0xBEC*/ struct BattleTowerEReaderTrainer ereaderTrainer;
     /*0xCA8*/ u8 challengeStatus;
     /*0xCA9*/ u8 lvlMode:2;
-    /*0xCA9*/ u8 challengePaused:1;
-    /*0xCA9*/ u8 disableRecordBattle:1;
+              u8 challengePaused:1;
+              u8 disableRecordBattle:1;
+              //u8 padding1:4;
     /*0xCAA*/ u16 selectedPartyMons[MAX_FRONTIER_PARTY_SIZE];
     /*0xCB2*/ u16 curChallengeBattleNum; // Battle number / room number (Pike) / floor number (Pyramid)
     /*0xCB4*/ u16 trainerIds[20];
@@ -402,16 +409,19 @@ struct BattleFrontier
     /*0xE08*/ u16 pikeRecordStreaks[FRONTIER_LVL_MODE_COUNT];
     /*0xE0C*/ u16 pikeTotalStreaks[FRONTIER_LVL_MODE_COUNT];
     /*0xE10*/ u8 pikeHintedRoomIndex:3;
-    /*0xE10*/ u8 pikeHintedRoomType:4;
-    /*0xE10*/ u8 pikeHealingRoomsDisabled:1;
+              u8 pikeHintedRoomType:4;
+              u8 pikeHealingRoomsDisabled:1;
+    /*0xE11*/ //u8 padding2;
     /*0xE12*/ u16 pikeHeldItemsBackup[FRONTIER_PARTY_SIZE];
     /*0xE18*/ u16 pyramidPrize;
     /*0xE1A*/ u16 pyramidWinStreaks[FRONTIER_LVL_MODE_COUNT];
     /*0xE1E*/ u16 pyramidRecordStreaks[FRONTIER_LVL_MODE_COUNT];
     /*0xE22*/ u16 pyramidRandoms[4];
     /*0xE2A*/ u8 pyramidTrainerFlags; // 1 bit for each trainer (MAX_PYRAMID_TRAINERS)
+    /*0xE2B*/ //u8 padding3;
     /*0xE2C*/ struct PyramidBag pyramidBag;
     /*0xE68*/ u8 pyramidLightRadius;
+    /*0xE69*/ //u8 padding4;
     /*0xE6A*/ u16 verdanturfTentPrize;
     /*0xE6C*/ u16 fallarborTentPrize;
     /*0xE6E*/ u16 slateportTentPrize;
@@ -436,6 +446,7 @@ struct ApprenticeQuestion
     u8 monId:2;
     u8 moveSlot:2;
     u8 suggestedChange:2; // TRUE if told to use held item or second move, FALSE if told to use no item or first move
+    //u8 padding;
     u16 data; // used both as an itemId and a moveId
 };
 
@@ -446,9 +457,11 @@ struct PlayersApprentice
     /*0xB1*/ u8 questionsAnswered:4;
     /*0xB1*/ u8 leadMonId:2;
     /*0xB2*/ u8 party:3;
-    /*0xB2*/ u8 saveId:2;
+             u8 saveId:2;
+             //u8 padding1:3;
     /*0xB3*/ u8 unused;
     /*0xB4*/ u8 speciesIds[MULTI_PARTY_SIZE];
+    /*0xB7*/ //u8 padding2;
     /*0xB8*/ struct ApprenticeQuestion questions[APPRENTICE_MAX_QUESTIONS];
 };
 
@@ -458,6 +471,7 @@ struct RankingHall1P
     u16 winStreak;
     u8 name[PLAYER_NAME_LENGTH + 1];
     u8 language;
+    //u8 padding;
 };
 
 struct RankingHall2P
@@ -468,6 +482,7 @@ struct RankingHall2P
     u8 name1[PLAYER_NAME_LENGTH + 1];
     u8 name2[PLAYER_NAME_LENGTH + 1];
     u8 language;
+    //u8 padding;
 };
 
 struct SaveBlock2
@@ -487,6 +502,8 @@ struct SaveBlock2
              u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET]
              u16 optionsBattleSceneOff:1; // whether battle animations are disabled
              u16 regionMapZoom:1; // whether the map is zoomed in
+             //u16 padding1:4;
+             //u16 padding2;
     /*0x18*/ struct Pokedex pokedex;
     /*0x90*/ u8 filler_90[0x8];
     /*0x98*/ struct Time localTimeOffset;
@@ -531,6 +548,7 @@ struct SecretBase
     /*0x1AAD*/ u8 unused;
     /*0x1AAE*/ u8 decorations[DECOR_MAX_SECRET_BASE];
     /*0x1ABE*/ u8 decorationPositions[DECOR_MAX_SECRET_BASE];
+    /*0x1ACE*/ //u8 padding[2];
     /*0x1AD0*/ struct SecretBaseParty party;
 };
 
@@ -545,6 +563,7 @@ struct WarpData
     s8 mapGroup;
     s8 mapNum;
     s8 warpId;
+    //u8 padding;
     s16 x, y;
 };
 
@@ -589,6 +608,7 @@ struct RamScriptData
     u8 mapNum;
     u8 objectId;
     u8 script[995];
+    //u8 padding;
 };
 
 struct RamScript
@@ -603,6 +623,7 @@ struct DewfordTrend
     u16 trendiness:7;
     u16 maxTrendiness:7;
     u16 gainingTrendiness:1;
+    //u16 padding:1;
     u16 rand;
     u16 words[2];
 }; /*size = 0x8*/
@@ -615,6 +636,7 @@ struct MauvilleManCommon
 struct MauvilleManBard
 {
     /*0x00*/ u8 id;
+    /*0x01*/ //u8 padding1;
     /*0x02*/ u16 songLyrics[BARD_SONG_LENGTH];
     /*0x0E*/ u16 temporaryLyrics[BARD_SONG_LENGTH];
     /*0x1A*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
@@ -622,6 +644,7 @@ struct MauvilleManBard
     /*0x25*/ u8 playerTrainerId[TRAINER_ID_LENGTH];
     /*0x29*/ bool8 hasChangedSong;
     /*0x2A*/ u8 language;
+    /*0x2B*/ //u8 padding2;
 }; /*size = 0x2C*/
 
 struct MauvilleManStoryteller
@@ -640,9 +663,11 @@ struct MauvilleManGiddy
     /*0x00*/ u8 id;
     /*0x01*/ u8 taleCounter;
     /*0x02*/ u8 questionNum;
+    /*0x03*/ //u8 padding1;
     /*0x04*/ u16 randomWords[GIDDY_MAX_TALES];
     /*0x18*/ u8 questionList[GIDDY_MAX_QUESTIONS];
     /*0x20*/ u8 language;
+    /*0x21*/ //u8 padding2;
 }; /*size = 0x2C*/
 
 struct MauvilleManHipster
@@ -687,6 +712,7 @@ struct LinkBattleRecords
 {
     struct LinkBattleRecord entries[LINK_B_RECORDS_COUNT];
     u8 languages[LINK_B_RECORDS_COUNT];
+    //u8 padding;
 };
 
 struct RecordMixingGiftData
@@ -712,6 +738,7 @@ struct ContestWinner
     u8 monName[POKEMON_NAME_LENGTH + 1];
     u8 trainerName[PLAYER_NAME_LENGTH + 1];
     u8 contestRank;
+    //u8 padding;
 };
 
 struct Mail
@@ -744,6 +771,7 @@ struct DayCare
     struct DaycareMon mons[DAYCARE_MON_COUNT];
     u32 offspringPersonality;
     u8 stepCounter;
+    //u8 padding[3];
 };
 
 struct LilycoveLadyQuiz
@@ -756,10 +784,10 @@ struct LilycoveLadyQuiz
     /*0x018*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
     /*0x020*/ u16 playerTrainerId[TRAINER_ID_LENGTH];
     /*0x028*/ u16 prize;
-    /*0x02a*/ bool8 waitingForChallenger;
-    /*0x02b*/ u8 questionId;
-    /*0x02c*/ u8 prevQuestionId;
-    /*0x02d*/ u8 language;
+    /*0x02A*/ bool8 waitingForChallenger;
+    /*0x02B*/ u8 questionId;
+    /*0x02C*/ u8 prevQuestionId;
+    /*0x02D*/ u8 language;
 };
 
 struct LilycoveLadyFavor
@@ -769,10 +797,12 @@ struct LilycoveLadyFavor
     /*0x002*/ bool8 likedItem;
     /*0x003*/ u8 numItemsGiven;
     /*0x004*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
-    /*0x00c*/ u8 favorId;
-    /*0x00e*/ u16 itemId;
+    /*0x00C*/ u8 favorId;
+    /*0x00D*/ //u8 padding1;
+    /*0x00E*/ u16 itemId;
     /*0x010*/ u16 bestItem;
     /*0x012*/ u8 language;
+    /*0x013*/ //u8 padding2;
 };
 
 struct LilycoveLadyContest
@@ -782,9 +812,9 @@ struct LilycoveLadyContest
     /*0x002*/ u8 numGoodPokeblocksGiven;
     /*0x003*/ u8 numOtherPokeblocksGiven;
     /*0x004*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
-    /*0x00c*/ u8 maxSheen;
-    /*0x00d*/ u8 category;
-    /*0x00e*/ u8 language;
+    /*0x00C*/ u8 maxSheen;
+    /*0x00D*/ u8 category;
+    /*0x00E*/ u8 language;
 };
 
 typedef union // 3b58
@@ -793,7 +823,7 @@ typedef union // 3b58
     struct LilycoveLadyFavor favor;
     struct LilycoveLadyContest contest;
     u8 id;
-    u8 pad[0x40];
+    u8 filler[0x40];
 } LilycoveLady;
 
 struct WaldaPhrase
@@ -803,6 +833,7 @@ struct WaldaPhrase
     u8 iconId;
     u8 patternId;
     bool8 patternUnlocked;
+    //u8 padding;
 };
 
 struct TrainerNameRecord
@@ -818,12 +849,13 @@ struct TrainerHillSave
     /*0x3D6C*/ u8 unk_3D6C;
     /*0x3D6D*/ u8 unused;
     /*0x3D6E*/ u16 receivedPrize:1;
-    /*0x3D6E*/ u16 checkedFinalTime:1;
-    /*0x3D6E*/ u16 spokeToOwner:1;
-    /*0x3D6E*/ u16 hasLost:1;
-    /*0x3D6E*/ u16 maybeECardScanDuringChallenge:1;
-    /*0x3D6E*/ u16 field_3D6E_0f:1;
-    /*0x3D6E*/ u16 mode:2; // HILL_MODE_*
+               u16 checkedFinalTime:1;
+               u16 spokeToOwner:1;
+               u16 hasLost:1;
+               u16 maybeECardScanDuringChallenge:1;
+               u16 field_3D6E_0f:1;
+               u16 mode:2; // HILL_MODE_*
+               //u16 padding:8;
 };
 
 struct WonderNewsMetadata
@@ -832,6 +864,7 @@ struct WonderNewsMetadata
     u8 sentRewardCounter:3;
     u8 rewardCounter:3;
     u8 berry;
+    //u8 padding[2];
 };
 
 struct WonderNews
@@ -857,6 +890,7 @@ struct WonderCard
     u8 bodyText[WONDER_CARD_BODY_TEXT_LINES][WONDER_CARD_TEXT_LENGTH];
     u8 footerLine1Text[WONDER_CARD_TEXT_LENGTH];
     u8 footerLine2Text[WONDER_CARD_TEXT_LENGTH];
+    //u8 padding[2];
 };
 
 struct WonderCardMetadata
@@ -903,7 +937,7 @@ struct ExternalEventFlags
 {
     u8 usedBoxRS:1; // Set by Pokémon Box: Ruby & Sapphire; denotes whether this save has connected to it and triggered the free False Swipe Swablu Egg giveaway.
     u8 boxRSEggsUnlocked:2; // Set by Pokémon Box: Ruby & Sapphire; denotes the number of Eggs unlocked from deposits; 1 for ExtremeSpeed Zigzagoon (at 100 deposited), 2 for Pay Day Skitty (at 500 deposited), 3 for Surf Pichu (at 1499 deposited)
-    u8 padding:5;
+    //u8 padding:5;
     u8 unknownFlag1;
     u8 receivedGCNJirachi; // Both the US Colosseum Bonus Disc and PAL/AUS Pokémon Channel use this field. One cannot receive a WISHMKR Jirachi and CHANNEL Jirachi with the same savefile.
     u8 unknownFlag3;
@@ -939,9 +973,11 @@ struct SaveBlock1
     /*0x2E*/ u8 weather;
     /*0x2F*/ u8 weatherCycleStage;
     /*0x30*/ u8 flashLevel;
+    /*0x31*/ //u8 padding1;
     /*0x32*/ u16 mapLayoutId;
     /*0x34*/ u16 mapView[0x100];
     /*0x234*/ u8 playerPartyCount;
+    /*0x235*/ //u8 padding2[3];
     /*0x238*/ struct Pokemon playerParty[PARTY_SIZE];
     /*0x490*/ u32 money;
     /*0x494*/ u16 coins;
@@ -958,6 +994,7 @@ struct SaveBlock1
     /*0x9C2*/ u8 unused_9C2[6];
     /*0x9C8*/ u16 trainerRematchStepCounter;
     /*0x9CA*/ u8 trainerRematches[MAX_REMATCH_ENTRIES];
+    /*0xA2E*/ //u8 padding3[2];
     /*0xA30*/ struct ObjectEvent objectEvents[OBJECT_EVENTS_COUNT];
     /*0xC70*/ struct ObjectEventTemplate objectEventTemplates[OBJECT_EVENT_TEMPLATES_COUNT];
     /*0x1270*/ u8 flags[NUM_FLAG_BYTES];
@@ -975,6 +1012,7 @@ struct SaveBlock1
     /*0x278E*/ u8 decorationPosters[10];
     /*0x2798*/ u8 decorationDolls[40];
     /*0x27C0*/ u8 decorationCushions[10];
+    /*0x27CA*/ //u8 padding4[2];
     /*0x27CC*/ TVShow tvShows[TV_SHOWS_COUNT];
     /*0x2B50*/ PokeNews pokeNews[POKE_NEWS_COUNT];
     /*0x2B90*/ u16 outbreakPokemonSpecies;
@@ -994,6 +1032,7 @@ struct SaveBlock1
     /*0x2BD4*/ u16 easyChatBattleLost[EASY_CHAT_BATTLE_WORDS_COUNT];
     /*0x2BE0*/ struct Mail mail[MAIL_COUNT];
     /*0x2E20*/ u8 additionalPhrases[NUM_ADDITIONAL_PHRASE_BYTES]; // bitfield for 33 additional phrases in easy chat system
+    /*0x2E25*/ //u8 padding5[3];
     /*0x2E28*/ OldMan oldMan;
     /*0x2e64*/ struct DewfordTrend dewfordTrends[SAVED_TRENDS_COUNT];
     /*0x2e90*/ struct ContestWinner contestWinners[NUM_CONTEST_WINNERS]; // see CONTEST_WINNER_*
diff --git a/include/global.tv.h b/include/global.tv.h
index 1fb1b8a33..3729562cd 100644
--- a/include/global.tv.h
+++ b/include/global.tv.h
@@ -36,6 +36,7 @@ typedef union // size = 0x24
         /*0x04*/ u16 words[6];
         /*0x10*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
         /*0x18*/ u8 language;
+        /*0x19*/ //u8 padding;
     } fanclubLetter;
 
     // TVSHOW_RECENT_HAPPENINGS
@@ -46,6 +47,7 @@ typedef union // size = 0x24
         /*0x04*/ u16 words[6];
         /*0x10*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
         /*0x18*/ u8 language;
+        /*0x19*/ //u8 padding;
     } recentHappenings;
 
     // TVSHOW_PKMN_FAN_CLUB_OPINIONS
@@ -54,7 +56,7 @@ typedef union // size = 0x24
         /*0x01*/ bool8 active;
         /*0x02*/ u16 species;
         /*0x04*/ u8 friendshipHighNybble:4;
-        /*0x04*/ u8 questionAsked:4;
+                 u8 questionAsked:4;
         /*0x05*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
         /*0x0D*/ u8 language;
         /*0x0E*/ u8 pokemonNameLanguage;
@@ -70,8 +72,8 @@ typedef union // size = 0x24
         /*0x01*/ bool8 active;
         /*0x02*/ u16 words[2];
         /*0x06*/ u16 species;
-        /*0x08*/ u8 pad_08[3];
-        /*0x0b*/ u8 name[12];
+        /*0x08*/ u8 filler_08[3];
+        /*0x0B*/ u8 name[12];
         /*0x17*/ u8 language;
     } dummy;
 
@@ -98,8 +100,9 @@ typedef union // size = 0x24
         /*0x04*/ u16 words[2];
         /*0x08*/ u8 pokemonNickname[POKEMON_NAME_LENGTH + 1];
         /*0x13*/ u8 contestCategory:3;
-        /*0x13*/ u8 contestRank:2;
-        /*0x13*/ u8 contestResult:2;
+                 u8 contestRank:2;
+                 u8 contestResult:2;
+                 //u8 padding:1;
         /*0x14*/ u16 move;
         /*0x16*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
         /*0x1E*/ u8 language;
@@ -121,6 +124,7 @@ typedef union // size = 0x24
         /*0x1C*/ bool8 wonTheChallenge;
         /*0x1D*/ u8 language;
         /*0x1E*/ u8 pokemonNameLanguage;
+        /*0x1F*/ //u8 padding;
     } bravoTrainerTower;
 
     // TVSHOW_CONTEST_LIVE_UPDATES
@@ -131,14 +135,15 @@ typedef union // size = 0x24
         /*0x04*/ u8 losingTrainerName[PLAYER_NAME_LENGTH + 1];
         /*0x0C*/ u8 loserAppealFlag;
         /*0x0D*/ u8 round1Placing;
-        /*0x0e*/ u8 round2Placing;
-        /*0x0f*/ u8 winnerAppealFlag;
+        /*0x0E*/ u8 round2Placing;
+        /*0x0F*/ u8 winnerAppealFlag;
         /*0x10*/ u16 move;
         /*0x12*/ u16 winningSpecies;
         /*0x14*/ u8 winningTrainerName[PLAYER_NAME_LENGTH + 1];
         /*0x1C*/ u8 category;
         /*0x1D*/ u8 winningTrainerLanguage;
         /*0x1E*/ u8 losingTrainerLanguage;
+        /*0x1F*/ //u8 padding;
     } contestLiveUpdates;
 
     // TVSHOW_3_CHEERS_FOR_POKEBLOCKS
@@ -147,7 +152,8 @@ typedef union // size = 0x24
         /*0x01*/ bool8 active;
         /*0x02*/ u8 sheen;
         /*0x03*/ u8 flavor:3;
-        /*0x03*/ u8 color:2;
+                 u8 color:2;
+                 //u8 padding:3;
         /*0x04*/ u8 worstBlenderName[PLAYER_NAME_LENGTH + 1];
         /*0x0C*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
         /*0x14*/ u8 language;
@@ -166,6 +172,7 @@ typedef union // size = 0x24
         /*0x18*/ u8 battleType;
         /*0x19*/ u8 language;
         /*0x1A*/ u8 linkOpponentLanguage;
+        /*0x1B*/ //u8 padding;
     } battleUpdate;
 
     // TVSHOW_FAN_CLUB_SPECIAL
@@ -173,13 +180,14 @@ typedef union // size = 0x24
         /*0x00*/ u8 kind;
         /*0x01*/ bool8 active;
         /*0x02*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
-        /*0x0a*/ u8 idLo;
-        /*0x0b*/ u8 idHi;
-        /*0x0c*/ u8 idolName[PLAYER_NAME_LENGTH + 1];
+        /*0x0A*/ u8 idLo;
+        /*0x0B*/ u8 idHi;
+        /*0x0C*/ u8 idolName[PLAYER_NAME_LENGTH + 1];
         /*0x14*/ u16 words[1];
         /*0x16*/ u8 score;
         /*0x17*/ u8 language;
         /*0x18*/ u8 idolNameLanguage;
+        /*0x19*/ //u8 padding;
     } fanClubSpecial;
 
     // TVSHOW_LILYCOVE_CONTEST_LADY
@@ -187,8 +195,8 @@ typedef union // size = 0x24
         /*0x00*/ u8 kind;
         /*0x01*/ bool8 active;
         /*0x02*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
-        /*0x0a*/ u8 contestCategory;
-        /*0x0b*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
+        /*0x0A*/ u8 contestCategory;
+        /*0x0B*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
         /*0x16*/ u8 pokeblockState;
         /*0x17*/ u8 language;
         /*0x18*/ u8 pokemonNameLanguage;
@@ -206,6 +214,7 @@ typedef union // size = 0x24
         /*0x10*/ u16 species;
         /*0x12*/ u8 nBallsUsed;
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } pokemonToday;
 
     // TVSHOW_SMART_SHOPPER
@@ -214,11 +223,12 @@ typedef union // size = 0x24
         /*0x01*/ bool8 active;
         /*0x02*/ u8 priceReduced;
         /*0x03*/ u8 language;
-        /*0x04*/ u8 pad04[2];
+        /*0x04*/ u8 filler_04[2];
         /*0x06*/ u16 itemIds[SMARTSHOPPER_NUM_ITEMS];
         /*0x0C*/ u16 itemAmounts[SMARTSHOPPER_NUM_ITEMS];
         /*0x12*/ u8 shopLocation;
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } smartshopperShow;
 
     // TVSHOW_POKEMON_TODAY_FAILED
@@ -226,13 +236,14 @@ typedef union // size = 0x24
         /*0x00*/ u8 kind;
         /*0x01*/ bool8 active;
         /*0x02*/ u8 language;
-        /*0x03*/ u8 pad03[9];
-        /*0x0c*/ u16 species;
-        /*0x0e*/ u16 species2;
+        /*0x03*/ u8 filler_03[9];
+        /*0x0C*/ u16 species;
+        /*0x0E*/ u16 species2;
         /*0x10*/ u8 nBallsUsed;
         /*0x11*/ u8 outcome;
         /*0x12*/ u8 location;
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } pokemonTodayFailed;
 
     // TVSHOW_FISHING_ADVICE
@@ -243,8 +254,9 @@ typedef union // size = 0x24
         /*0x03*/ u8 nFails;
         /*0x04*/ u16 species;
         /*0x06*/ u8 language;
-        /*0x07*/ u8 pad07[12];
+        /*0x07*/ u8 filler_07[12];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } pokemonAngler;
 
     // TVSHOW_WORLD_OF_MASTERS
@@ -255,10 +267,11 @@ typedef union // size = 0x24
         /*0x04*/ u16 caughtPoke;
         /*0x06*/ u16 steps;
         /*0x08*/ u16 species;
-        /*0x0a*/ u8 location;
-        /*0x0b*/ u8 language;
-        /*0x0c*/ u8 pad0c[7];
+        /*0x0A*/ u8 location;
+        /*0x0B*/ u8 language;
+        /*0x0C*/ u8 filler_0C[7];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding2;
     } worldOfMasters;
 
     // TVSHOW_TODAYS_RIVAL_TRAINER
@@ -271,10 +284,11 @@ typedef union // size = 0x24
         /*0x06*/ u8 nGoldSymbols;
         /*0x07*/ u8 location;
         /*0x08*/ u16 battlePoints;
-        /*0x0a*/ u16 mapLayoutId;
-        /*0x0c*/ u8 language;
-        /*0x0d*/ u8 filler_0d[6];
+        /*0x0A*/ u16 mapLayoutId;
+        /*0x0C*/ u8 language;
+        /*0x0D*/ u8 filler_0D[6];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding2;
     } rivalTrainer;
 
     // TVSHOW_TREND_WATCHER
@@ -285,8 +299,9 @@ typedef union // size = 0x24
         /*0x04*/ u16 words[2];
         /*0x08*/ u8 gender;
         /*0x09*/ u8 language;
-        /*0x0a*/ u8 filler_0a[9];
+        /*0x0A*/ u8 filler_0a[9];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } trendWatcher;
 
     // TVSHOW_TREASURE_INVESTIGATORS
@@ -299,6 +314,7 @@ typedef union // size = 0x24
         /*0x06*/ u16 mapLayoutId;
         /*0x08*/ u8 filler_08[11];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } treasureInvestigators;
 
     // TVSHOW_FIND_THAT_GAMER
@@ -312,6 +328,7 @@ typedef union // size = 0x24
         /*0x08*/ u8 language;
         /*0x09*/ u8 filler_09[10];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } findThatGamer;
 
     // TVSHOW_BREAKING_NEWS
@@ -323,11 +340,12 @@ typedef union // size = 0x24
         /*0x05*/ u8 outcome;
         /*0x06*/ u16 caughtMonBall;
         /*0x08*/ u16 balls;
-        /*0x0a*/ u16 poke1Species;
-        /*0x0c*/ u16 lastUsedMove;
-        /*0x0e*/ u8 language;
-        /*0x0f*/ u8 filler_0f[4];
+        /*0x0A*/ u16 poke1Species;
+        /*0x0C*/ u16 lastUsedMove;
+        /*0x0E*/ u8 language;
+        /*0x0F*/ u8 filler_0f[4];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } breakingNews;
 
     // TVSHOW_SECRET_BASE_VISIT
@@ -338,10 +356,11 @@ typedef union // size = 0x24
         /*0x03*/ u8 numDecorations;
         /*0x04*/ u8 decorations[4];
         /*0x08*/ u16 species;
-        /*0x0a*/ u16 move;
-        /*0x0c*/ u8 language;
-        /*0x0d*/ u8 filler_0d[6];
+        /*0x0A*/ u16 move;
+        /*0x0C*/ u8 language;
+        /*0x0D*/ u8 filler_0d[6];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } secretBaseVisit;
 
     // TVSHOW_LOTTO_WINNER
@@ -353,6 +372,7 @@ typedef union // size = 0x24
         /*0x05*/ u8 language;
         /*0x06*/ u8 filler_06[13];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } lottoWinner;
 
     // TVSHOW_BATTLE_SEMINAR
@@ -363,11 +383,12 @@ typedef union // size = 0x24
         /*0x04*/ u16 foeSpecies;
         /*0x06*/ u16 species;
         /*0x08*/ u16 otherMoves[3];
-        /*0x0e*/ u16 betterMove;
+        /*0x0E*/ u16 betterMove;
         /*0x10*/ u8 nOtherMoves;
         /*0x11*/ u8 language;
         /*0x12*/ u8 filler_12[1];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } battleSeminar;
 
     // TVSHOW_TRAINER_FAN_CLUB
@@ -379,6 +400,7 @@ typedef union // size = 0x24
         /*0x08*/ u8 language;
         /*0x09*/ u8 filler_09[10];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } trainerFanClub;
 
     // TVSHOW_CUTIES
@@ -388,7 +410,7 @@ typedef union // size = 0x24
         /*0x02*/ u8 nRibbons;
         /*0x03*/ u8 selectedRibbon;
         /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
-        /*0x0f*/ u8 language;
+        /*0x0F*/ u8 language;
         /*0x10*/ u8 pokemonNameLanguage;
         /*0x11*/ u8 filler_12[2];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
@@ -402,11 +424,12 @@ typedef union // size = 0x24
         /*0x04*/ u16 species1;
         /*0x06*/ u16 species2;
         /*0x08*/ u16 species3;
-        /*0x0a*/ u16 species4;
-        /*0x0c*/ u8 language;
-        /*0x0d*/ u8 facilityAndMode;
-        /*0x0e*/ u8 filler_0e[5];
+        /*0x0A*/ u16 species4;
+        /*0x0C*/ u8 language;
+        /*0x0D*/ u8 facilityAndMode;
+        /*0x0E*/ u8 filler_0e[5];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } frontier;
 
     // TVSHOW_NUMBER_ONE
@@ -418,6 +441,7 @@ typedef union // size = 0x24
         /*0x05*/ u8 language;
         /*0x06*/ u8 filler_06[13];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
+        /*0x1B*/ //u8 padding;
     } numberOne;
 
     // TVSHOW_SECRET_BASE_SECRETS
@@ -426,12 +450,13 @@ typedef union // size = 0x24
         /*0x01*/ bool8 active;
         /*0x02*/ u16 stepsInBase;
         /*0x04*/ u8 baseOwnersName[PLAYER_NAME_LENGTH + 1];
-        /*0x0c*/ u32 flags;
+        /*0x0C*/ u32 flags;
         /*0x10*/ u16 item;
         /*0x12*/ u8 savedState;
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
-        /*0x1b*/ u8 language;
-        /*0x1c*/ u8 baseOwnersNameLanguage;
+        /*0x1B*/ u8 language;
+        /*0x1C*/ u8 baseOwnersNameLanguage;
+        /*0x1D*/ //u8 padding[3];
     } secretBaseSecrets;
 
     // TVSHOW_SAFARI_FAN_CLUB
@@ -463,6 +488,7 @@ typedef union // size = 0x24
         /*0x15*/ u8 unused5;
         /*0x16*/ u16 daysLeft;
         /*0x18*/ u8 language;
+        /*0x19*/ //u8 padding;
     } massOutbreak;
 } TVShow;
 
@@ -475,23 +501,23 @@ typedef struct
 
 struct GabbyAndTyData
 {
-    /*2ba4*/ u16 mon1;
-    /*2ba6*/ u16 mon2;
-    /*2ba8*/ u16 lastMove;
-    /*2baa*/ u16 quote[1];
-    /*2bac*/ u8 mapnum;
-    /*2bad*/ u8 battleNum;
-    /*2bae*/ u8 battleTookMoreThanOneTurn:1;
-    /*2bae*/ u8 playerLostAMon:1;
-    /*2bae*/ u8 playerUsedHealingItem:1;
-    /*2bae*/ u8 playerThrewABall:1;
-    /*2bae*/ u8 onAir:1;
-    /*2bae*/ u8 valA_5:3;
-    /*2baf*/ u8 battleTookMoreThanOneTurn2:1;
-    /*2baf*/ u8 playerLostAMon2:1;
-    /*2baf*/ u8 playerUsedHealingItem2:1;
-    /*2baf*/ u8 playerThrewABall2:1;
-    /*2baf*/ u8 valB_4:4;
+    /*2BA4*/ u16 mon1;
+    /*2BA6*/ u16 mon2;
+    /*2BA8*/ u16 lastMove;
+    /*2BAA*/ u16 quote[1];
+    /*2BAC*/ u8 mapnum;
+    /*2BAD*/ u8 battleNum;
+    /*2BAE*/ u8 battleTookMoreThanOneTurn:1;
+             u8 playerLostAMon:1;
+             u8 playerUsedHealingItem:1;
+             u8 playerThrewABall:1;
+             u8 onAir:1;
+             u8 valA_5:3;
+    /*2BAF*/ u8 battleTookMoreThanOneTurn2:1;
+             u8 playerLostAMon2:1;
+             u8 playerUsedHealingItem2:1;
+             u8 playerThrewABall2:1;
+             u8 valB_4:4;
 };
 
 #endif //GUARD_GLOBAL_TV_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 1e434e830..88f95b170 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -109,7 +109,7 @@ struct __attribute__((packed, aligned(2))) RfuGameData
     u8 startedActivity:1;
     u8 playerGender:1;
     u8 tradeLevel:7;
-    u8 padding;
+    u8 filler;
 };
 
 // Constants for getting/setting information in 'partnerInfo' of RfuGameData.
diff --git a/include/list_menu.h b/include/list_menu.h
index e70a92bab..9299ede6c 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -7,12 +7,20 @@
 #define LIST_CANCEL -2
 #define LIST_HEADER -3
 
-#define LIST_NO_MULTIPLE_SCROLL     0
-#define LIST_MULTIPLE_SCROLL_DPAD   1
-#define LIST_MULTIPLE_SCROLL_L_R    2
+enum {
+    LIST_NO_MULTIPLE_SCROLL,
+    LIST_MULTIPLE_SCROLL_DPAD,
+    LIST_MULTIPLE_SCROLL_L_R,
+};
 
-enum
-{
+enum {
+    CURSOR_BLACK_ARROW,
+    CURSOR_INVISIBLE,
+    CURSOR_RED_OUTLINE,
+    CURSOR_RED_ARROW,
+};
+
+enum {
     SCROLL_ARROW_LEFT,
     SCROLL_ARROW_RIGHT,
     SCROLL_ARROW_UP,
diff --git a/include/pokemon.h b/include/pokemon.h
index e48618328..1b6151669 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -287,7 +287,7 @@ struct BattlePokemon
     /*0x54*/ u32 otId;
 };
 
-struct BaseStats
+struct SpeciesInfo
 {
  /* 0x00 */ u8 baseHP;
  /* 0x01 */ u8 baseAttack;
@@ -374,7 +374,7 @@ extern struct SpriteTemplate gMultiuseSpriteTemplate;
 extern const struct BattleMove gBattleMoves[];
 extern const u8 gFacilityClassToPicIndex[];
 extern const u8 gFacilityClassToTrainerClass[];
-extern const struct BaseStats gBaseStats[];
+extern const struct SpeciesInfo gSpeciesInfo[];
 extern const u8 *const gItemEffectTable[];
 extern const u32 gExperienceTables[][MAX_LEVEL + 1];
 extern const u16 *const gLevelUpLearnsets[];
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 1ddcc9805..aacbe20ac 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -1379,24 +1379,24 @@ static void Cmd_get_ability(void)
             return;
         }
 
-        if (gBaseStats[gBattleMons[battlerId].species].abilities[0] != ABILITY_NONE)
+        if (gSpeciesInfo[gBattleMons[battlerId].species].abilities[0] != ABILITY_NONE)
         {
-            if (gBaseStats[gBattleMons[battlerId].species].abilities[1] != ABILITY_NONE)
+            if (gSpeciesInfo[gBattleMons[battlerId].species].abilities[1] != ABILITY_NONE)
             {
                 // AI has no knowledge of opponent, so it guesses which ability.
                 if (Random() & 1)
-                    AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[0];
+                    AI_THINKING_STRUCT->funcResult = gSpeciesInfo[gBattleMons[battlerId].species].abilities[0];
                 else
-                    AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[1];
+                    AI_THINKING_STRUCT->funcResult = gSpeciesInfo[gBattleMons[battlerId].species].abilities[1];
             }
             else
             {
-                AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[0]; // It's definitely ability 1.
+                AI_THINKING_STRUCT->funcResult = gSpeciesInfo[gBattleMons[battlerId].species].abilities[0]; // It's definitely ability 1.
             }
         }
         else
         {
-            AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1.
+            AI_THINKING_STRUCT->funcResult = gSpeciesInfo[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1.
         }
     }
     else
@@ -1427,15 +1427,15 @@ static void Cmd_check_ability(void)
         {
             ability = gBattleMons[battlerId].ability;
         }
-        else if (gBaseStats[gBattleMons[battlerId].species].abilities[0] != ABILITY_NONE)
+        else if (gSpeciesInfo[gBattleMons[battlerId].species].abilities[0] != ABILITY_NONE)
         {
-            if (gBaseStats[gBattleMons[battlerId].species].abilities[1] != ABILITY_NONE)
+            if (gSpeciesInfo[gBattleMons[battlerId].species].abilities[1] != ABILITY_NONE)
             {
                 u8 abilityDummyVariable = ability; // Needed to match.
-                if (gBaseStats[gBattleMons[battlerId].species].abilities[0] != abilityDummyVariable
-                && gBaseStats[gBattleMons[battlerId].species].abilities[1] != abilityDummyVariable)
+                if (gSpeciesInfo[gBattleMons[battlerId].species].abilities[0] != abilityDummyVariable
+                && gSpeciesInfo[gBattleMons[battlerId].species].abilities[1] != abilityDummyVariable)
                 {
-                    ability = gBaseStats[gBattleMons[battlerId].species].abilities[0];
+                    ability = gSpeciesInfo[gBattleMons[battlerId].species].abilities[0];
                 }
                 else
                 {
@@ -1444,12 +1444,12 @@ static void Cmd_check_ability(void)
             }
             else
             {
-                ability = gBaseStats[gBattleMons[battlerId].species].abilities[0];
+                ability = gSpeciesInfo[gBattleMons[battlerId].species].abilities[0];
             }
         }
         else
         {
-            ability = gBaseStats[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1.
+            ability = gSpeciesInfo[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1.
         }
     }
     else
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 261349dce..0aec2316e 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -199,9 +199,9 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
 
         species = GetMonData(&party[i], MON_DATA_SPECIES);
         if (GetMonData(&party[i], MON_DATA_ABILITY_NUM) != 0)
-            monAbility = gBaseStats[species].abilities[1];
+            monAbility = gSpeciesInfo[species].abilities[1];
         else
-            monAbility = gBaseStats[species].abilities[0];
+            monAbility = gSpeciesInfo[species].abilities[0];
 
         if (absorbingTypeAbility == monAbility && Random() & 1)
         {
@@ -397,9 +397,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
 
         species = GetMonData(&party[i], MON_DATA_SPECIES);
         if (GetMonData(&party[i], MON_DATA_ABILITY_NUM) != 0)
-            monAbility = gBaseStats[species].abilities[1];
+            monAbility = gSpeciesInfo[species].abilities[1];
         else
-            monAbility = gBaseStats[species].abilities[0];
+            monAbility = gSpeciesInfo[species].abilities[0];
 
         moveFlags = AI_TypeCalc(gLastLandedMoves[gActiveBattler], species, monAbility);
         if (moveFlags & flags)
@@ -703,8 +703,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
                 && i != *(gBattleStruct->monToSwitchIntoId + battlerIn1)
                 && i != *(gBattleStruct->monToSwitchIntoId + battlerIn2))
             {
-                u8 type1 = gBaseStats[species].type1;
-                u8 type2 = gBaseStats[species].type2;
+                u8 type1 = gSpeciesInfo[species].type1;
+                u8 type2 = gSpeciesInfo[species].type2;
                 u8 typeDmg = TYPE_MUL_NORMAL;
                 ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type1, type1, type2, &typeDmg);
                 ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type2, type1, type2, &typeDmg);
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 757576efa..f6d50b147 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -4561,11 +4561,11 @@ static void AnimTipMon_Step(struct Sprite *sprite)
 
 void AnimTask_SkullBashPosition(u8 taskId)
 {
-    u8 a;
+    u8 side;
 
     gTasks[taskId].data[0] = gBattlerSpriteIds[gBattleAnimAttacker];
-    a = GetBattlerSide(gBattleAnimAttacker);
-    gTasks[taskId].data[1] = a;
+    side = GetBattlerSide(gBattleAnimAttacker);
+    gTasks[taskId].data[1] = side;
     gTasks[taskId].data[2] = 0;
     switch (gBattleAnimArgs[0])
     {
@@ -4577,7 +4577,7 @@ void AnimTask_SkullBashPosition(u8 taskId)
         gTasks[taskId].data[3] = 8;
         gTasks[taskId].data[4] = 0;
         gTasks[taskId].data[5] = 3;
-        if (a == 0)
+        if (side == B_SIDE_PLAYER)
             gTasks[taskId].data[5] *= -1;
 
         gTasks[taskId].func = AnimTask_SkullBashPositionSet;
@@ -4586,7 +4586,7 @@ void AnimTask_SkullBashPosition(u8 taskId)
         gTasks[taskId].data[3] = 8;
         gTasks[taskId].data[4] = 0x600;
         gTasks[taskId].data[5] = 0xC0;
-        if (a == 0)
+        if (side == B_SIDE_PLAYER)
         {
             gTasks[taskId].data[4] = -gTasks[taskId].data[4];
             gTasks[taskId].data[5] = -gTasks[taskId].data[5];
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 265bb7f65..42f2725b4 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -1163,7 +1163,7 @@ static void Task_GiveExpToMon(u8 taskId)
         u16 species = GetMonData(mon, MON_DATA_SPECIES);
         u8 level = GetMonData(mon, MON_DATA_LEVEL);
         u32 currExp = GetMonData(mon, MON_DATA_EXP);
-        u32 nextLvlExp = gExperienceTables[gBaseStats[species].growthRate][level + 1];
+        u32 nextLvlExp = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1];
 
         if (currExp + gainedExp >= nextLvlExp)
         {
@@ -1206,11 +1206,11 @@ static void Task_PrepareToGiveExpWithExpBar(u8 taskId)
     u8 level = GetMonData(mon, MON_DATA_LEVEL);
     u16 species = GetMonData(mon, MON_DATA_SPECIES);
     u32 exp = GetMonData(mon, MON_DATA_EXP);
-    u32 currLvlExp = gExperienceTables[gBaseStats[species].growthRate][level];
+    u32 currLvlExp = gExperienceTables[gSpeciesInfo[species].growthRate][level];
     u32 expToNextLvl;
 
     exp -= currLvlExp;
-    expToNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLvlExp;
+    expToNextLvl = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1] - currLvlExp;
     SetBattleBarStruct(battlerId, gHealthboxSpriteIds[battlerId], expToNextLvl, exp, -gainedExp);
     PlaySE(SE_EXP);
     gTasks[taskId].func = Task_GiveExpWithExpBar;
@@ -1242,7 +1242,7 @@ static void Task_GiveExpWithExpBar(u8 taskId)
             level = GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL);
             currExp = GetMonData(&gPlayerParty[monId], MON_DATA_EXP);
             species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);
-            expOnNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1];
+            expOnNextLvl = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1];
 
             if (currExp + gainedExp >= expOnNextLvl)
             {
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index a77144e29..cc134b92e 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -321,7 +321,7 @@ static void Task_GiveExpToMon(u8 taskId)
         u16 species = GetMonData(mon, MON_DATA_SPECIES);
         u8 level = GetMonData(mon, MON_DATA_LEVEL);
         u32 currExp = GetMonData(mon, MON_DATA_EXP);
-        u32 nextLvlExp = gExperienceTables[gBaseStats[species].growthRate][level + 1];
+        u32 nextLvlExp = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1];
 
         if (currExp + gainedExp >= nextLvlExp)
         {
@@ -364,11 +364,11 @@ static void Task_PrepareToGiveExpWithExpBar(u8 taskId)
     u8 level = GetMonData(mon, MON_DATA_LEVEL);
     u16 species = GetMonData(mon, MON_DATA_SPECIES);
     u32 exp = GetMonData(mon, MON_DATA_EXP);
-    u32 currLvlExp = gExperienceTables[gBaseStats[species].growthRate][level];
+    u32 currLvlExp = gExperienceTables[gSpeciesInfo[species].growthRate][level];
     u32 expToNextLvl;
 
     exp -= currLvlExp;
-    expToNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLvlExp;
+    expToNextLvl = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1] - currLvlExp;
     SetBattleBarStruct(battlerId, gHealthboxSpriteIds[battlerId], expToNextLvl, exp, -gainedExp);
     PlaySE(SE_EXP);
     gTasks[taskId].func = Task_GiveExpWithExpBar;
@@ -400,7 +400,7 @@ static void Task_GiveExpWithExpBar(u8 taskId)
             level = GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL);
             currExp = GetMonData(&gPlayerParty[monId], MON_DATA_EXP);
             species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);
-            expOnNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1];
+            expOnNextLvl = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1];
 
             if (currExp + gainedExp >= expOnNextLvl)
             {
diff --git a/src/battle_dome.c b/src/battle_dome.c
index d30739ca5..e0911d485 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -2348,8 +2348,8 @@ static void InitDomeTrainers(void)
         rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_SPDEF, NULL);
         rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_SPEED, NULL);
         rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_MAX_HP, NULL);
-        monTypesBits |= gBitTable[gBaseStats[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type1];
-        monTypesBits |= gBitTable[gBaseStats[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type2];
+        monTypesBits |= gBitTable[gSpeciesInfo[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type1];
+        monTypesBits |= gBitTable[gSpeciesInfo[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type2];
     }
 
     // Count the number of types in the players party, to factor into the ranking
@@ -2383,8 +2383,8 @@ static void InitDomeTrainers(void)
             rankingScores[i] += statValues[STAT_SPDEF];
             rankingScores[i] += statValues[STAT_SPEED];
             rankingScores[i] += statValues[STAT_HP];
-            monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
-            monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
+            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
+            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
         }
 
         for (monTypesCount = 0, j = 0; j < 32; j++)
@@ -2448,7 +2448,7 @@ static void InitDomeTrainers(void)
 
 #define CALC_STAT(base, statIndex)                                                          \
 {                                                                                           \
-    u8 baseStat = gBaseStats[species].base;                                                 \
+    u8 baseStat = gSpeciesInfo[species].base;                                                 \
     stats[statIndex] = (((2 * baseStat + ivs + evs[statIndex] / 4) * level) / 100) + 5;     \
     stats[statIndex] = (u8) ModifyStatByNature(nature, stats[statIndex], statIndex);        \
 }
@@ -2481,7 +2481,7 @@ static void CalcDomeMonStats(u16 species, int level, int ivs, u8 evBits, u8 natu
     }
     else
     {
-        int n = 2 * gBaseStats[species].baseHP;
+        int n = 2 * gSpeciesInfo[species].baseHP;
         stats[STAT_HP] = (((n + ivs + evs[STAT_HP] / 4) * level) / 100) + level + 10;
     }
 
@@ -2750,9 +2750,9 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int mode)
     if (move == MOVE_NONE || move == MOVE_UNAVAILABLE || gBattleMoves[move].power == 0)
         return 0;
 
-    defType1 = gBaseStats[targetSpecies].type1;
-    defType2 = gBaseStats[targetSpecies].type2;
-    defAbility = gBaseStats[targetSpecies].abilities[0];
+    defType1 = gSpeciesInfo[targetSpecies].type1;
+    defType2 = gSpeciesInfo[targetSpecies].type2;
+    defAbility = gSpeciesInfo[targetSpecies].abilities[0];
     moveType = gBattleMoves[move].type;
 
     if (defAbility == ABILITY_LEVITATE && moveType == TYPE_GROUND)
@@ -5204,9 +5204,9 @@ static u16 GetWinningMove(int winnerTournamentId, int loserTournamentId, u8 roun
 
                 targetSpecies = gFacilityTrainerMons[DOME_MONS[loserTournamentId][k]].species;
                 if (var & 1)
-                    targetAbility = gBaseStats[targetSpecies].abilities[1];
+                    targetAbility = gSpeciesInfo[targetSpecies].abilities[1];
                 else
-                    targetAbility = gBaseStats[targetSpecies].abilities[0];
+                    targetAbility = gSpeciesInfo[targetSpecies].abilities[0];
 
                 var = AI_TypeCalc(moveIds[i * MAX_MON_MOVES + j], targetSpecies, targetAbility);
                 if (var & MOVE_RESULT_NOT_VERY_EFFECTIVE && var & MOVE_RESULT_SUPER_EFFECTIVE)
@@ -5883,8 +5883,8 @@ static void InitRandomTourneyTreeResults(void)
             statSums[i] += statValues[STAT_SPDEF];
             statSums[i] += statValues[STAT_SPEED];
             statSums[i] += statValues[STAT_HP];
-            monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
-            monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
+            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
+            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
         }
 
         // Because GF hates temporary vars, trainerId acts like monTypesCount here.
@@ -6010,12 +6010,12 @@ static void DecideRoundWinners(u8 roundId)
                     }
                 }
                 species = gFacilityTrainerMons[DOME_MONS[tournamentId1][monId1]].species;
-                points1 += ( gBaseStats[species].baseHP
-                           + gBaseStats[species].baseAttack
-                           + gBaseStats[species].baseDefense
-                           + gBaseStats[species].baseSpeed
-                           + gBaseStats[species].baseSpAttack
-                           + gBaseStats[species].baseSpDefense) / 10;
+                points1 += ( gSpeciesInfo[species].baseHP
+                           + gSpeciesInfo[species].baseAttack
+                           + gSpeciesInfo[species].baseDefense
+                           + gSpeciesInfo[species].baseSpeed
+                           + gSpeciesInfo[species].baseSpAttack
+                           + gSpeciesInfo[species].baseSpDefense) / 10;
             }
             // Random part of the formula.
             points1 += (Random() & 0x1F);
@@ -6033,12 +6033,12 @@ static void DecideRoundWinners(u8 roundId)
                     }
                 }
                 species = gFacilityTrainerMons[DOME_MONS[tournamentId2][monId1]].species;
-                points2 += ( gBaseStats[species].baseHP
-                           + gBaseStats[species].baseAttack
-                           + gBaseStats[species].baseDefense
-                           + gBaseStats[species].baseSpeed
-                           + gBaseStats[species].baseSpAttack
-                           + gBaseStats[species].baseSpDefense) / 10;
+                points2 += ( gSpeciesInfo[species].baseHP
+                           + gSpeciesInfo[species].baseAttack
+                           + gSpeciesInfo[species].baseDefense
+                           + gSpeciesInfo[species].baseSpeed
+                           + gSpeciesInfo[species].baseSpAttack
+                           + gSpeciesInfo[species].baseSpDefense) / 10;
             }
             // Random part of the formula.
             points2 += (Random() & 0x1F);
diff --git a/src/battle_factory.c b/src/battle_factory.c
index a68ef8180..5aeef2e29 100644
--- a/src/battle_factory.c
+++ b/src/battle_factory.c
@@ -618,9 +618,9 @@ static void GetOpponentMostCommonMonType(void)
     for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
     {
         u32 species = gFacilityTrainerMons[gFrontierTempParty[i]].species;
-        typeCounts[gBaseStats[species].type1]++;
-        if (gBaseStats[species].type1 != gBaseStats[species].type2)
-            typeCounts[gBaseStats[species].type2]++;
+        typeCounts[gSpeciesInfo[species].type1]++;
+        if (gSpeciesInfo[species].type1 != gSpeciesInfo[species].type2)
+            typeCounts[gSpeciesInfo[species].type2]++;
     }
 
     // Determine which are the two most-common types.
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 355397a1e..469646436 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -2199,9 +2199,9 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem
             species = GetMonData(mon, MON_DATA_SPECIES);
             level = GetMonData(mon, MON_DATA_LEVEL);
             exp = GetMonData(mon, MON_DATA_EXP);
-            currLevelExp = gExperienceTables[gBaseStats[species].growthRate][level];
+            currLevelExp = gExperienceTables[gSpeciesInfo[species].growthRate][level];
             currExpBarValue = exp - currLevelExp;
-            maxExpBarValue = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLevelExp;
+            maxExpBarValue = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1] - currLevelExp;
             SetBattleBarStruct(battlerId, healthboxSpriteId, maxExpBarValue, currExpBarValue, isDoubles);
             MoveBattleBar(battlerId, healthboxSpriteId, EXP_BAR, 0);
         }
diff --git a/src/battle_main.c b/src/battle_main.c
index 903588fe7..fa85608d4 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -199,8 +199,8 @@ EWRAM_DATA u32 gHitMarker = 0;
 EWRAM_DATA static u8 sUnusedBattlersArray[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gUnusedFirstBattleVar2 = 0; // Never read
-EWRAM_DATA u16 gSideStatuses[2] = {0};
-EWRAM_DATA struct SideTimer gSideTimers[2] = {0};
+EWRAM_DATA u16 gSideStatuses[NUM_BATTLE_SIDES] = {0};
+EWRAM_DATA struct SideTimer gSideTimers[NUM_BATTLE_SIDES] = {0};
 EWRAM_DATA u32 gStatuses3[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA struct DisableStruct gDisableStructs[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u16 gPauseCounterBattle = 0;
@@ -3097,7 +3097,7 @@ static void BattleStartClearSetData(void)
     gBattleStruct->runTries = 0;
     gBattleStruct->safariGoNearCounter = 0;
     gBattleStruct->safariPkblThrowCounter = 0;
-    *(&gBattleStruct->safariCatchFactor) = gBaseStats[GetMonData(&gEnemyParty[0], MON_DATA_SPECIES)].catchRate * 100 / 1275;
+    *(&gBattleStruct->safariCatchFactor) = gSpeciesInfo[GetMonData(&gEnemyParty[0], MON_DATA_SPECIES)].catchRate * 100 / 1275;
     gBattleStruct->safariEscapeFactor = 3;
     gBattleStruct->wildVictorySong = 0;
     gBattleStruct->moneyMultiplier = 1;
@@ -3332,8 +3332,8 @@ void FaintClearSetData(void)
 
     gBattleResources->flags->flags[gActiveBattler] = 0;
 
-    gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
-    gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
+    gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type1;
+    gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type2;
 
     ClearBattlerMoveHistory(gActiveBattler);
     ClearBattlerAbilityHistory(gActiveBattler);
@@ -3400,8 +3400,8 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
             for (i = 0; i < sizeof(struct BattlePokemon); i++)
                 ptr[i] = gBattleBufferB[gActiveBattler][4 + i];
 
-            gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
-            gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
+            gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type1;
+            gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type2;
             gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].abilityNum);
             hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(gActiveBattler)];
             *hpOnSwitchout = gBattleMons[gActiveBattler].hp;
diff --git a/src/battle_pike.c b/src/battle_pike.c
index 4f9af98ea..174006161 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -845,21 +845,21 @@ static bool8 DoesTypePreventStatus(u16 species, u32 status)
     switch (status)
     {
     case STATUS1_TOXIC_POISON:
-        if (gBaseStats[species].type1 == TYPE_STEEL || gBaseStats[species].type1 == TYPE_POISON
-            || gBaseStats[species].type2 == TYPE_STEEL || gBaseStats[species].type2 == TYPE_POISON)
+        if (gSpeciesInfo[species].type1 == TYPE_STEEL || gSpeciesInfo[species].type1 == TYPE_POISON
+            || gSpeciesInfo[species].type2 == TYPE_STEEL || gSpeciesInfo[species].type2 == TYPE_POISON)
             ret = TRUE;
         break;
     case STATUS1_FREEZE:
-        if (gBaseStats[species].type1 == TYPE_ICE || gBaseStats[species].type2 == TYPE_ICE)
+        if (gSpeciesInfo[species].type1 == TYPE_ICE || gSpeciesInfo[species].type2 == TYPE_ICE)
             ret = TRUE;
         break;
     case STATUS1_PARALYSIS:
-        if (gBaseStats[species].type1 == TYPE_GROUND || gBaseStats[species].type1 == TYPE_ELECTRIC
-            || gBaseStats[species].type2 == TYPE_GROUND || gBaseStats[species].type2 == TYPE_ELECTRIC)
+        if (gSpeciesInfo[species].type1 == TYPE_GROUND || gSpeciesInfo[species].type1 == TYPE_ELECTRIC
+            || gSpeciesInfo[species].type2 == TYPE_GROUND || gSpeciesInfo[species].type2 == TYPE_ELECTRIC)
             ret = TRUE;
         break;
     case STATUS1_BURN:
-        if (gBaseStats[species].type1 == TYPE_FIRE || gBaseStats[species].type2 == TYPE_FIRE)
+        if (gSpeciesInfo[species].type1 == TYPE_FIRE || gSpeciesInfo[species].type2 == TYPE_FIRE)
             ret = TRUE;
         break;
     case STATUS1_SLEEP:
@@ -1138,9 +1138,9 @@ bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate)
 
     SetMonData(&gEnemyParty[0],
                MON_DATA_EXP,
-               &gExperienceTables[gBaseStats[wildMons[headerId][pikeMonId].species].growthRate][monLevel]);
+               &gExperienceTables[gSpeciesInfo[wildMons[headerId][pikeMonId].species].growthRate][monLevel]);
 
-    if (gBaseStats[wildMons[headerId][pikeMonId].species].abilities[1])
+    if (gSpeciesInfo[wildMons[headerId][pikeMonId].species].abilities[1])
         abilityNum = Random() % 2;
     else
         abilityNum = 0;
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index cbc1589bd..32fab3402 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -1371,7 +1371,7 @@ void GenerateBattlePyramidWildMon(void)
     }
     SetMonData(&gEnemyParty[0],
                MON_DATA_EXP,
-               &gExperienceTables[gBaseStats[wildMons[id].species].growthRate][lvl]);
+               &gExperienceTables[gSpeciesInfo[wildMons[id].species].growthRate][lvl]);
 
     switch (wildMons[id].abilityNum)
     {
@@ -1381,7 +1381,7 @@ void GenerateBattlePyramidWildMon(void)
         break;
     case ABILITY_RANDOM:
     default:
-        if (gBaseStats[wildMons[id].species].abilities[1])
+        if (gSpeciesInfo[wildMons[id].species].abilities[1])
         {
             i = GetMonData(&gEnemyParty[0], MON_DATA_PERSONALITY, NULL) % 2;
             SetMonData(&gEnemyParty[0], MON_DATA_ABILITY_NUM, &i);
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index 67afaefe1..4f72a7463 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -160,7 +160,7 @@ static const struct ListMenuTemplate sListMenuTemplate =
     .itemVerticalPadding = 0,
     .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
     .fontId = FONT_NARROW,
-    .cursorKind = 0
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 enum {
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index fb5a7649a..111713b1f 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -1595,7 +1595,7 @@ u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility)
 {
     s32 i = 0;
     u8 flags = 0;
-    u8 type1 = gBaseStats[targetSpecies].type1, type2 = gBaseStats[targetSpecies].type2;
+    u8 type1 = gSpeciesInfo[targetSpecies].type1, type2 = gSpeciesInfo[targetSpecies].type2;
     u8 moveType;
 
     if (move == MOVE_STRUGGLE)
@@ -3274,7 +3274,7 @@ static void Cmd_getexp(void)
                     viaExpShare++;
             }
 
-            calculatedExp = gBaseStats[gBattleMons[gBattlerFainted].species].expYield * gBattleMons[gBattlerFainted].level / 7;
+            calculatedExp = gSpeciesInfo[gBattleMons[gBattlerFainted].species].expYield * gBattleMons[gBattlerFainted].level / 7;
 
             if (viaExpShare) // at least one mon is getting exp via exp share
             {
@@ -4604,8 +4604,8 @@ static void Cmd_switchindataupdate(void)
     for (i = 0; i < sizeof(struct BattlePokemon); i++)
         monData[i] = gBattleBufferB[gActiveBattler][4 + i];
 
-    gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
-    gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
+    gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type1;
+    gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type2;
     gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].abilityNum);
 
     // check knocked off item
@@ -8888,10 +8888,10 @@ static void Cmd_trydobeatup(void)
 
             gBattlescriptCurrInstr += 9;
 
-            gBattleMoveDamage = gBaseStats[GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES)].baseAttack;
+            gBattleMoveDamage = gSpeciesInfo[GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES)].baseAttack;
             gBattleMoveDamage *= gBattleMoves[gCurrentMove].power;
             gBattleMoveDamage *= (GetMonData(&party[gBattleCommunication[0]], MON_DATA_LEVEL) * 2 / 5 + 2);
-            gBattleMoveDamage /= gBaseStats[gBattleMons[gBattlerTarget].species].baseDefense;
+            gBattleMoveDamage /= gSpeciesInfo[gBattleMons[gBattlerTarget].species].baseDefense;
             gBattleMoveDamage = (gBattleMoveDamage / 50) + 2;
             if (gProtectStructs[gBattlerAttacker].helpingHand)
                 gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
@@ -9568,9 +9568,9 @@ static void Cmd_pickup(void)
             heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
 
             if (GetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM))
-                ability = gBaseStats[species].abilities[1];
+                ability = gSpeciesInfo[species].abilities[1];
             else
-                ability = gBaseStats[species].abilities[0];
+                ability = gSpeciesInfo[species].abilities[0];
 
             if (ability == ABILITY_PICKUP
                 && species != SPECIES_NONE
@@ -9591,9 +9591,9 @@ static void Cmd_pickup(void)
             heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
 
             if (GetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM))
-                ability = gBaseStats[species].abilities[1];
+                ability = gSpeciesInfo[species].abilities[1];
             else
-                ability = gBaseStats[species].abilities[0];
+                ability = gSpeciesInfo[species].abilities[0];
 
             if (ability == ABILITY_PICKUP
                 && species != SPECIES_NONE
@@ -9831,7 +9831,7 @@ static void Cmd_handleballthrow(void)
         if (gLastUsedItem == ITEM_SAFARI_BALL)
             catchRate = gBattleStruct->safariCatchFactor * 1275 / 100;
         else
-            catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate;
+            catchRate = gSpeciesInfo[gBattleMons[gBattlerTarget].species].catchRate;
 
         if (gLastUsedItem > ITEM_SAFARI_BALL)
         {
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 7eed612ff..1e134b8fa 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -3539,7 +3539,7 @@ void TrySetLinkBattleTowerEnemyPartyLevel(void)
             u32 species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES, NULL);
             if (species)
             {
-                SetMonData(&gEnemyParty[i], MON_DATA_EXP, &gExperienceTables[gBaseStats[species].growthRate][enemyLevel]);
+                SetMonData(&gEnemyParty[i], MON_DATA_EXP, &gExperienceTables[gSpeciesInfo[species].growthRate][enemyLevel]);
                 CalculateMonStats(&gEnemyParty[i]);
             }
         }
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 140d1042e..c05f4c761 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -2676,7 +2676,7 @@ static void CB2_EndBlenderGame(void)
         switch (Menu_ProcessInputNoWrapClearOnChoose())
         {
         case 1:
-        case -1:
+        case MENU_B_PRESSED:
             sBerryBlender->yesNoAnswer = 1;
             sBerryBlender->gameEndState++;
             for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
diff --git a/src/braille.c b/src/braille.c
index 704f50760..91872b88a 100644
--- a/src/braille.c
+++ b/src/braille.c
@@ -88,7 +88,7 @@ u16 FontFunc_Braille(struct TextPrinter *textPrinter)
                 subStruct->fontId = *textPrinter->printerTemplate.currentChar;
                 textPrinter->printerTemplate.currentChar++;
                 return RENDER_REPEAT;
-            case EXT_CTRL_CODE_RESET_SIZE:
+            case EXT_CTRL_CODE_RESET_FONT:
                 return RENDER_REPEAT;
             case EXT_CTRL_CODE_PAUSE:
                 textPrinter->delayCounter = *textPrinter->printerTemplate.currentChar++;
@@ -109,7 +109,7 @@ u16 FontFunc_Braille(struct TextPrinter *textPrinter)
             case EXT_CTRL_CODE_ESCAPE:
                 char_ = *++textPrinter->printerTemplate.currentChar;
                 break;
-            case EXT_CTRL_CODE_SHIFT_TEXT:
+            case EXT_CTRL_CODE_SHIFT_RIGHT:
                 textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x + *textPrinter->printerTemplate.currentChar++;
                 return RENDER_REPEAT;
             case EXT_CTRL_CODE_SHIFT_DOWN:
diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c
index 9b79b48f1..ed5461d91 100644
--- a/src/clear_save_data_screen.c
+++ b/src/clear_save_data_screen.c
@@ -95,7 +95,7 @@ static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId)
         gTasks[taskId].func = Task_ClearSaveData;
         break;
     case 1:
-    case -1:
+    case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
         DestroyTask(taskId);
         SetMainCallback2(CB2_FadeAndDoReset);
diff --git a/src/contest.c b/src/contest.c
index 0f77df814..e5cda17ae 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -5320,7 +5320,7 @@ static void SetMoveSpecificAnimData(u8 contestant)
     switch (move)
     {
     case MOVE_CURSE:
-        if (gBaseStats[species].type1 == TYPE_GHOST || gBaseStats[species].type2 == TYPE_GHOST)
+        if (gSpeciesInfo[species].type1 == TYPE_GHOST || gSpeciesInfo[species].type2 == TYPE_GHOST)
             gAnimMoveTurn = 0;
         else
             gAnimMoveTurn = 1;
diff --git a/src/data.c b/src/data.c
index 5856d17b8..cd3340d67 100644
--- a/src/data.c
+++ b/src/data.c
@@ -302,7 +302,7 @@ const union AnimCmd *const gAnims_MonPic[] =
 #define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species}
 #define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG}
 
-#include "data/pokemon_graphics/unknown_anims.h"
+#include "data/pokemon_graphics/unused_anims.h"
 #include "data/pokemon_graphics/front_pic_coordinates.h"
 #include "data/pokemon_graphics/still_front_pic_table.h"
 #include "data/pokemon_graphics/back_pic_coordinates.h"
diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/species_info.h
similarity index 99%
rename from src/data/pokemon/base_stats.h
rename to src/data/pokemon/species_info.h
index 6b6ab12aa..5af84df1f 100644
--- a/src/data/pokemon/base_stats.h
+++ b/src/data/pokemon/species_info.h
@@ -2,7 +2,7 @@
 // 255 (MON_GENDERLESS) is reserved for genderless Pokémon.
 #define PERCENT_FEMALE(percent) min(254, ((percent * 255) / 100))
 
-#define OLD_UNOWN_BASE_STATS                        \
+#define OLD_UNOWN_SPECIES_INFO                      \
     {                                               \
         .baseHP = 50,                               \
         .baseAttack = 150,                          \
@@ -34,7 +34,7 @@
         .noFlip = FALSE,                            \
     }
 
-const struct BaseStats gBaseStats[] =
+const struct SpeciesInfo gSpeciesInfo[] =
 {
     [SPECIES_NONE] = {0},
 
@@ -8070,55 +8070,55 @@ const struct BaseStats gBaseStats[] =
         .noFlip = FALSE,
     },
 
-    [SPECIES_OLD_UNOWN_B] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_B] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_C] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_C] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_D] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_D] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_E] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_E] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_F] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_F] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_G] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_G] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_H] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_H] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_I] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_I] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_J] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_J] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_K] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_K] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_L] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_L] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_M] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_M] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_N] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_N] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_O] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_O] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_P] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_P] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_Q] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_Q] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_R] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_R] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_S] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_S] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_T] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_T] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_U] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_U] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_V] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_V] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_W] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_W] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_X] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_X] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_Y] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_Y] = OLD_UNOWN_SPECIES_INFO,
 
-    [SPECIES_OLD_UNOWN_Z] = OLD_UNOWN_BASE_STATS,
+    [SPECIES_OLD_UNOWN_Z] = OLD_UNOWN_SPECIES_INFO,
 
     [SPECIES_TREECKO] =
     {
diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index 671fc5fad..68ceddafa 100644
--- a/src/data/pokemon_graphics/front_pic_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -1,4 +1,4 @@
-static const union AnimCmd sAnim_NONE_1[] =
+static const union AnimCmd sAnim_None_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -6,7 +6,7 @@
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BULBASAUR_1[] =
+static const union AnimCmd sAnim_Bulbasaur_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -14,7 +14,7 @@ static const union AnimCmd sAnim_BULBASAUR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_IVYSAUR_1[] =
+static const union AnimCmd sAnim_Ivysaur_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 36),
@@ -22,7 +22,7 @@ static const union AnimCmd sAnim_IVYSAUR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VENUSAUR_1[] =
+static const union AnimCmd sAnim_Venusaur_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 25),
@@ -30,7 +30,7 @@ static const union AnimCmd sAnim_VENUSAUR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CHARMANDER_1[] =
+static const union AnimCmd sAnim_Charmander_1[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(1, 46),
@@ -38,7 +38,7 @@ static const union AnimCmd sAnim_CHARMANDER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CHARMELEON_1[] =
+static const union AnimCmd sAnim_Charmeleon_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 25),
@@ -46,14 +46,14 @@ static const union AnimCmd sAnim_CHARMELEON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CHARIZARD_1[] =
+static const union AnimCmd sAnim_Charizard_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SQUIRTLE_1[] =
+static const union AnimCmd sAnim_Squirtle_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 50),
@@ -61,7 +61,7 @@ static const union AnimCmd sAnim_SQUIRTLE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WARTORTLE_1[] =
+static const union AnimCmd sAnim_Wartortle_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 20),
@@ -69,7 +69,7 @@ static const union AnimCmd sAnim_WARTORTLE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BLASTOISE_1[] =
+static const union AnimCmd sAnim_Blastoise_1[] =
 {
     ANIMCMD_FRAME(0, 50),
     ANIMCMD_FRAME(1, 25),
@@ -79,7 +79,7 @@ static const union AnimCmd sAnim_BLASTOISE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CATERPIE_1[] =
+static const union AnimCmd sAnim_Caterpie_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -92,14 +92,14 @@ static const union AnimCmd sAnim_CATERPIE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_METAPOD_1[] =
+static const union AnimCmd sAnim_Metapod_1[] =
 {
     ANIMCMD_FRAME(1, 45),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BUTTERFREE_1[] =
+static const union AnimCmd sAnim_Butterfree_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -117,7 +117,7 @@ static const union AnimCmd sAnim_BUTTERFREE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WEEDLE_1[] =
+static const union AnimCmd sAnim_Weedle_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 15),
@@ -129,7 +129,7 @@ static const union AnimCmd sAnim_WEEDLE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KAKUNA_1[] =
+static const union AnimCmd sAnim_Kakuna_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -145,7 +145,7 @@ static const union AnimCmd sAnim_KAKUNA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BEEDRILL_1[] =
+static const union AnimCmd sAnim_Beedrill_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 35),
@@ -155,7 +155,7 @@ static const union AnimCmd sAnim_BEEDRILL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PIDGEY_1[] =
+static const union AnimCmd sAnim_Pidgey_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -172,7 +172,7 @@ static const union AnimCmd sAnim_PIDGEY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PIDGEOTTO_1[] =
+static const union AnimCmd sAnim_Pidgeotto_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 10),
@@ -182,7 +182,7 @@ static const union AnimCmd sAnim_PIDGEOTTO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PIDGEOT_1[] =
+static const union AnimCmd sAnim_Pidgeot_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 10),
@@ -191,8 +191,7 @@ static const union AnimCmd sAnim_PIDGEOT_1[] =
     ANIMCMD_END,
 };
 
-
-static const union AnimCmd sAnim_RATTATA_1[] =
+static const union AnimCmd sAnim_Rattata_1[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(1, 50),
@@ -201,7 +200,7 @@ static const union AnimCmd sAnim_RATTATA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RATICATE_1[] =
+static const union AnimCmd sAnim_Raticate_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -218,7 +217,7 @@ static const union AnimCmd sAnim_RATICATE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SPEAROW_1[] =
+static const union AnimCmd sAnim_Spearow_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -239,7 +238,7 @@ static const union AnimCmd sAnim_SPEAROW_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_FEAROW_1[] =
+static const union AnimCmd sAnim_Fearow_1[] =
 {
     ANIMCMD_FRAME(1, 7),
     ANIMCMD_FRAME(0, 7),
@@ -252,7 +251,7 @@ static const union AnimCmd sAnim_FEAROW_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_EKANS_1[] =
+static const union AnimCmd sAnim_Ekans_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -263,7 +262,7 @@ static const union AnimCmd sAnim_EKANS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ARBOK_1[] =
+static const union AnimCmd sAnim_Arbok_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 35),
@@ -271,7 +270,7 @@ static const union AnimCmd sAnim_ARBOK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PIKACHU_1[] =
+static const union AnimCmd sAnim_Pikachu_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -281,7 +280,7 @@ static const union AnimCmd sAnim_PIKACHU_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PIKACHU_2[] =
+static const union AnimCmd sAnim_Pikachu_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -290,7 +289,7 @@ static const union AnimCmd sAnim_PIKACHU_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RAICHU_1[] =
+static const union AnimCmd sAnim_Raichu_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -300,7 +299,7 @@ static const union AnimCmd sAnim_RAICHU_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RAICHU_2[] =
+static const union AnimCmd sAnim_Raichu_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -309,7 +308,7 @@ static const union AnimCmd sAnim_RAICHU_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SANDSHREW_1[] =
+static const union AnimCmd sAnim_Sandshrew_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -319,7 +318,7 @@ static const union AnimCmd sAnim_SANDSHREW_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SANDSHREW_2[] =
+static const union AnimCmd sAnim_Sandshrew_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -328,7 +327,7 @@ static const union AnimCmd sAnim_SANDSHREW_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SANDSLASH_1[] =
+static const union AnimCmd sAnim_Sandslash_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -338,7 +337,7 @@ static const union AnimCmd sAnim_SANDSLASH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SANDSLASH_2[] =
+static const union AnimCmd sAnim_Sandslash_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -347,7 +346,7 @@ static const union AnimCmd sAnim_SANDSLASH_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NIDORAN_F_1[] =
+static const union AnimCmd sAnim_NidoranF_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -361,21 +360,21 @@ static const union AnimCmd sAnim_NIDORAN_F_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NIDORINA_1[] =
+static const union AnimCmd sAnim_Nidorina_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NIDOQUEEN_1[] =
+static const union AnimCmd sAnim_Nidoqueen_1[] =
 {
     ANIMCMD_FRAME(1, 45),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NIDORAN_M_1[] =
+static const union AnimCmd sAnim_NidoranM_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -383,7 +382,7 @@ static const union AnimCmd sAnim_NIDORAN_M_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NIDORINO_1[] =
+static const union AnimCmd sAnim_Nidorino_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -391,7 +390,7 @@ static const union AnimCmd sAnim_NIDORINO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NIDOKING_1[] =
+static const union AnimCmd sAnim_Nidoking_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 15),
@@ -400,7 +399,7 @@ static const union AnimCmd sAnim_NIDOKING_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CLEFAIRY_1[] =
+static const union AnimCmd sAnim_Clefairy_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -408,7 +407,7 @@ static const union AnimCmd sAnim_CLEFAIRY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CLEFABLE_1[] =
+static const union AnimCmd sAnim_Clefable_1[] =
 {
     ANIMCMD_FRAME(1, 27),
     ANIMCMD_FRAME(0, 27),
@@ -419,7 +418,7 @@ static const union AnimCmd sAnim_CLEFABLE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VULPIX_1[] =
+static const union AnimCmd sAnim_Vulpix_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -429,7 +428,7 @@ static const union AnimCmd sAnim_VULPIX_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VULPIX_2[] =
+static const union AnimCmd sAnim_Vulpix_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -438,7 +437,7 @@ static const union AnimCmd sAnim_VULPIX_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NINETALES_1[] =
+static const union AnimCmd sAnim_Ninetales_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -448,7 +447,7 @@ static const union AnimCmd sAnim_NINETALES_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NINETALES_2[] =
+static const union AnimCmd sAnim_Ninetales_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -457,7 +456,7 @@ static const union AnimCmd sAnim_NINETALES_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_JIGGLYPUFF_1[] =
+static const union AnimCmd sAnim_Jigglypuff_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -467,7 +466,7 @@ static const union AnimCmd sAnim_JIGGLYPUFF_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_JIGGLYPUFF_2[] =
+static const union AnimCmd sAnim_Jigglypuff_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -476,7 +475,7 @@ static const union AnimCmd sAnim_JIGGLYPUFF_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WIGGLYTUFF_1[] =
+static const union AnimCmd sAnim_Wigglytuff_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -486,7 +485,7 @@ static const union AnimCmd sAnim_WIGGLYTUFF_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WIGGLYTUFF_2[] =
+static const union AnimCmd sAnim_Wigglytuff_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -495,7 +494,7 @@ static const union AnimCmd sAnim_WIGGLYTUFF_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ZUBAT_1[] =
+static const union AnimCmd sAnim_Zubat_1[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(1, 3),
@@ -513,7 +512,7 @@ static const union AnimCmd sAnim_ZUBAT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GOLBAT_1[] =
+static const union AnimCmd sAnim_Golbat_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -537,7 +536,7 @@ static const union AnimCmd sAnim_GOLBAT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ODDISH_1[] =
+static const union AnimCmd sAnim_Oddish_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 11),
@@ -549,7 +548,7 @@ static const union AnimCmd sAnim_ODDISH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GLOOM_1[] =
+static const union AnimCmd sAnim_Gloom_1[] =
 {
     ANIMCMD_FRAME(0, 21),
     ANIMCMD_FRAME(1, 45),
@@ -558,7 +557,7 @@ static const union AnimCmd sAnim_GLOOM_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VILEPLUME_1[] =
+static const union AnimCmd sAnim_Vileplume_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 21),
@@ -568,7 +567,7 @@ static const union AnimCmd sAnim_VILEPLUME_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PARAS_1[] =
+static const union AnimCmd sAnim_Paras_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -589,7 +588,7 @@ static const union AnimCmd sAnim_PARAS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PARASECT_1[] =
+static const union AnimCmd sAnim_Parasect_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -600,7 +599,7 @@ static const union AnimCmd sAnim_PARASECT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VENONAT_1[] =
+static const union AnimCmd sAnim_Venonat_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -611,7 +610,7 @@ static const union AnimCmd sAnim_VENONAT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VENOMOTH_1[] =
+static const union AnimCmd sAnim_Venomoth_1[] =
 {
     ANIMCMD_FRAME(1, 4),
     ANIMCMD_FRAME(0, 4),
@@ -638,7 +637,7 @@ static const union AnimCmd sAnim_VENOMOTH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DIGLETT_1[] =
+static const union AnimCmd sAnim_Diglett_1[] =
 {
     ANIMCMD_FRAME(0, 25),
     ANIMCMD_FRAME(1, 35),
@@ -646,7 +645,7 @@ static const union AnimCmd sAnim_DIGLETT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DUGTRIO_1[] =
+static const union AnimCmd sAnim_Dugtrio_1[] =
 {
     ANIMCMD_FRAME(1, 35),
     ANIMCMD_FRAME(0, 10),
@@ -661,7 +660,7 @@ static const union AnimCmd sAnim_DUGTRIO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MEOWTH_1[] =
+static const union AnimCmd sAnim_Meowth_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -672,14 +671,14 @@ static const union AnimCmd sAnim_MEOWTH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PERSIAN_1[] =
+static const union AnimCmd sAnim_Persian_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PSYDUCK_1[] =
+static const union AnimCmd sAnim_Psyduck_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -689,7 +688,7 @@ static const union AnimCmd sAnim_PSYDUCK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PSYDUCK_2[] =
+static const union AnimCmd sAnim_Psyduck_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -698,7 +697,7 @@ static const union AnimCmd sAnim_PSYDUCK_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GOLDUCK_1[] =
+static const union AnimCmd sAnim_Golduck_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -708,7 +707,7 @@ static const union AnimCmd sAnim_GOLDUCK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GOLDUCK_2[] =
+static const union AnimCmd sAnim_Golduck_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -717,7 +716,7 @@ static const union AnimCmd sAnim_GOLDUCK_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MANKEY_1[] =
+static const union AnimCmd sAnim_Mankey_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -728,7 +727,7 @@ static const union AnimCmd sAnim_MANKEY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PRIMEAPE_1[] =
+static const union AnimCmd sAnim_Primeape_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -739,7 +738,7 @@ static const union AnimCmd sAnim_PRIMEAPE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GROWLITHE_1[] =
+static const union AnimCmd sAnim_Growlithe_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -750,7 +749,7 @@ static const union AnimCmd sAnim_GROWLITHE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ARCANINE_1[] =
+static const union AnimCmd sAnim_Arcanine_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -758,9 +757,10 @@ static const union AnimCmd sAnim_ARCANINE_1[] =
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
-    ANIMCMD_END,};
+    ANIMCMD_END,
+};
 
-static const union AnimCmd sAnim_POLIWAG_1[] =
+static const union AnimCmd sAnim_Poliwag_1[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 10),
@@ -768,7 +768,7 @@ static const union AnimCmd sAnim_POLIWAG_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_POLIWHIRL_1[] =
+static const union AnimCmd sAnim_Poliwhirl_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 25),
@@ -778,14 +778,14 @@ static const union AnimCmd sAnim_POLIWHIRL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_POLIWRATH_1[] =
+static const union AnimCmd sAnim_Poliwrath_1[] =
 {
     ANIMCMD_FRAME(1, 45),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ABRA_1[] =
+static const union AnimCmd sAnim_Abra_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 21),
@@ -795,7 +795,7 @@ static const union AnimCmd sAnim_ABRA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KADABRA_1[] =
+static const union AnimCmd sAnim_Kadabra_1[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(1, 45),
@@ -803,7 +803,7 @@ static const union AnimCmd sAnim_KADABRA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ALAKAZAM_1[] =
+static const union AnimCmd sAnim_Alakazam_1[] =
 {
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(1, 54),
@@ -811,7 +811,7 @@ static const union AnimCmd sAnim_ALAKAZAM_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MACHOP_1[] =
+static const union AnimCmd sAnim_Machop_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -823,7 +823,7 @@ static const union AnimCmd sAnim_MACHOP_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MACHOKE_1[] =
+static const union AnimCmd sAnim_Machoke_1[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 44),
@@ -831,7 +831,7 @@ static const union AnimCmd sAnim_MACHOKE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MACHAMP_1[] =
+static const union AnimCmd sAnim_Machamp_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 11),
@@ -843,7 +843,7 @@ static const union AnimCmd sAnim_MACHAMP_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BELLSPROUT_1[] =
+static const union AnimCmd sAnim_Bellsprout_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 25),
@@ -851,7 +851,7 @@ static const union AnimCmd sAnim_BELLSPROUT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WEEPINBELL_1[] =
+static const union AnimCmd sAnim_Weepinbell_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 25),
@@ -863,7 +863,7 @@ static const union AnimCmd sAnim_WEEPINBELL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VICTREEBEL_1[] =
+static const union AnimCmd sAnim_Victreebel_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -875,7 +875,7 @@ static const union AnimCmd sAnim_VICTREEBEL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TENTACOOL_1[] =
+static const union AnimCmd sAnim_Tentacool_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 15),
@@ -885,7 +885,7 @@ static const union AnimCmd sAnim_TENTACOOL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TENTACRUEL_1[] =
+static const union AnimCmd sAnim_Tentacruel_1[] =
 {
     ANIMCMD_FRAME(0, 19),
     ANIMCMD_FRAME(1, 35),
@@ -895,7 +895,7 @@ static const union AnimCmd sAnim_TENTACRUEL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GEODUDE_1[] =
+static const union AnimCmd sAnim_Geodude_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 36),
@@ -903,7 +903,7 @@ static const union AnimCmd sAnim_GEODUDE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GRAVELER_1[] =
+static const union AnimCmd sAnim_Graveler_1[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
@@ -913,7 +913,7 @@ static const union AnimCmd sAnim_GRAVELER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GOLEM_1[] =
+static const union AnimCmd sAnim_Golem_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 31),
@@ -923,14 +923,14 @@ static const union AnimCmd sAnim_GOLEM_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PONYTA_1[] =
+static const union AnimCmd sAnim_Ponyta_1[] =
 {
     ANIMCMD_FRAME(1, 45),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RAPIDASH_1[] =
+static const union AnimCmd sAnim_Rapidash_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 40),
@@ -938,7 +938,7 @@ static const union AnimCmd sAnim_RAPIDASH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SLOWPOKE_1[] =
+static const union AnimCmd sAnim_Slowpoke_1[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 50),
@@ -946,7 +946,7 @@ static const union AnimCmd sAnim_SLOWPOKE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SLOWBRO_1[] =
+static const union AnimCmd sAnim_Slowbro_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 45),
@@ -954,7 +954,7 @@ static const union AnimCmd sAnim_SLOWBRO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MAGNEMITE_1[] =
+static const union AnimCmd sAnim_Magnemite_1[] =
 {
     ANIMCMD_FRAME(0, 28),
     ANIMCMD_FRAME(1, 28),
@@ -964,7 +964,7 @@ static const union AnimCmd sAnim_MAGNEMITE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MAGNETON_1[] =
+static const union AnimCmd sAnim_Magneton_1[] =
 {
     ANIMCMD_FRAME(0, 14),
     ANIMCMD_FRAME(1, 14),
@@ -976,7 +976,7 @@ static const union AnimCmd sAnim_MAGNETON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_FARFETCHD_1[] =
+static const union AnimCmd sAnim_Farfetchd_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -993,7 +993,7 @@ static const union AnimCmd sAnim_FARFETCHD_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DODUO_1[] =
+static const union AnimCmd sAnim_Doduo_1[] =
 {
     ANIMCMD_FRAME(0, 18),
     ANIMCMD_FRAME(1, 18),
@@ -1003,7 +1003,7 @@ static const union AnimCmd sAnim_DODUO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DODRIO_1[] =
+static const union AnimCmd sAnim_Dodrio_1[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(1, 12),
@@ -1017,7 +1017,7 @@ static const union AnimCmd sAnim_DODRIO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SEEL_1[] =
+static const union AnimCmd sAnim_Seel_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -1030,7 +1030,7 @@ static const union AnimCmd sAnim_SEEL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DEWGONG_1[] =
+static const union AnimCmd sAnim_Dewgong_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -1038,7 +1038,7 @@ static const union AnimCmd sAnim_DEWGONG_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GRIMER_1[] =
+static const union AnimCmd sAnim_Grimer_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -1048,7 +1048,7 @@ static const union AnimCmd sAnim_GRIMER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GRIMER_2[] =
+static const union AnimCmd sAnim_Grimer_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1057,7 +1057,7 @@ static const union AnimCmd sAnim_GRIMER_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MUK_1[] =
+static const union AnimCmd sAnim_Muk_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -1067,7 +1067,7 @@ static const union AnimCmd sAnim_MUK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MUK_2[] =
+static const union AnimCmd sAnim_Muk_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1076,7 +1076,7 @@ static const union AnimCmd sAnim_MUK_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SHELLDER_1[] =
+static const union AnimCmd sAnim_Shellder_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -1085,7 +1085,7 @@ static const union AnimCmd sAnim_SHELLDER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CLOYSTER_1[] =
+static const union AnimCmd sAnim_Cloyster_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -1106,7 +1106,7 @@ static const union AnimCmd sAnim_CLOYSTER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GASTLY_1[] =
+static const union AnimCmd sAnim_Gastly_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 30),
@@ -1114,7 +1114,7 @@ static const union AnimCmd sAnim_GASTLY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HAUNTER_1[] =
+static const union AnimCmd sAnim_Haunter_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 15),
@@ -1124,7 +1124,7 @@ static const union AnimCmd sAnim_HAUNTER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GENGAR_1[] =
+static const union AnimCmd sAnim_Gengar_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 40),
@@ -1132,7 +1132,7 @@ static const union AnimCmd sAnim_GENGAR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ONIX_1[] =
+static const union AnimCmd sAnim_Onix_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 30),
@@ -1140,7 +1140,7 @@ static const union AnimCmd sAnim_ONIX_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DROWZEE_1[] =
+static const union AnimCmd sAnim_Drowzee_1[] =
 {
     ANIMCMD_FRAME(1, 12),
     ANIMCMD_FRAME(0, 12),
@@ -1151,7 +1151,7 @@ static const union AnimCmd sAnim_DROWZEE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HYPNO_1[] =
+static const union AnimCmd sAnim_Hypno_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -1163,7 +1163,7 @@ static const union AnimCmd sAnim_HYPNO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KRABBY_1[] =
+static const union AnimCmd sAnim_Krabby_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -1174,7 +1174,7 @@ static const union AnimCmd sAnim_KRABBY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KINGLER_1[] =
+static const union AnimCmd sAnim_Kingler_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 15),
@@ -1188,7 +1188,7 @@ static const union AnimCmd sAnim_KINGLER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VOLTORB_1[] =
+static const union AnimCmd sAnim_Voltorb_1[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 25),
@@ -1198,7 +1198,7 @@ static const union AnimCmd sAnim_VOLTORB_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ELECTRODE_1[] =
+static const union AnimCmd sAnim_Electrode_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 30),
@@ -1208,7 +1208,7 @@ static const union AnimCmd sAnim_ELECTRODE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_EXEGGCUTE_1[] =
+static const union AnimCmd sAnim_Exeggcute_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -1222,14 +1222,14 @@ static const union AnimCmd sAnim_EXEGGCUTE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_EXEGGUTOR_1[] =
+static const union AnimCmd sAnim_Exeggutor_1[] =
 {
     ANIMCMD_FRAME(1, 35),
     ANIMCMD_FRAME(0, 10),
-    ANIMCMD_END,};
+    ANIMCMD_END,
+};
 
-
-static const union AnimCmd sAnim_CUBONE_1[] =
+static const union AnimCmd sAnim_Cubone_1[] =
 {
     ANIMCMD_FRAME(1, 14),
     ANIMCMD_FRAME(0, 14),
@@ -1240,7 +1240,7 @@ static const union AnimCmd sAnim_CUBONE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MAROWAK_1[] =
+static const union AnimCmd sAnim_Marowak_1[] =
 {
     ANIMCMD_FRAME(1, 14),
     ANIMCMD_FRAME(0, 14),
@@ -1251,14 +1251,14 @@ static const union AnimCmd sAnim_MAROWAK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HITMONLEE_1[] =
+static const union AnimCmd sAnim_Hitmonlee_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HITMONCHAN_1[] =
+static const union AnimCmd sAnim_Hitmonchan_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -1271,7 +1271,7 @@ static const union AnimCmd sAnim_HITMONCHAN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LICKITUNG_1[] =
+static const union AnimCmd sAnim_Lickitung_1[] =
 {
     ANIMCMD_FRAME(0, 28),
     ANIMCMD_FRAME(1, 32),
@@ -1279,7 +1279,7 @@ static const union AnimCmd sAnim_LICKITUNG_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KOFFING_1[] =
+static const union AnimCmd sAnim_Koffing_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -1289,7 +1289,7 @@ static const union AnimCmd sAnim_KOFFING_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KOFFING_2[] =
+static const union AnimCmd sAnim_Koffing_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1298,7 +1298,7 @@ static const union AnimCmd sAnim_KOFFING_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WEEZING_1[] =
+static const union AnimCmd sAnim_Weezing_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -1308,7 +1308,7 @@ static const union AnimCmd sAnim_WEEZING_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WEEZING_2[] =
+static const union AnimCmd sAnim_Weezing_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1317,7 +1317,7 @@ static const union AnimCmd sAnim_WEEZING_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RHYHORN_1[] =
+static const union AnimCmd sAnim_Rhyhorn_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1327,7 +1327,7 @@ static const union AnimCmd sAnim_RHYHORN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RHYHORN_2[] =
+static const union AnimCmd sAnim_Rhyhorn_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1336,7 +1336,7 @@ static const union AnimCmd sAnim_RHYHORN_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RHYDON_1[] =
+static const union AnimCmd sAnim_Rhydon_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1346,7 +1346,7 @@ static const union AnimCmd sAnim_RHYDON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RHYDON_2[] =
+static const union AnimCmd sAnim_Rhydon_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1355,7 +1355,7 @@ static const union AnimCmd sAnim_RHYDON_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CHANSEY_1[] =
+static const union AnimCmd sAnim_Chansey_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -1363,7 +1363,7 @@ static const union AnimCmd sAnim_CHANSEY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TANGELA_1[] =
+static const union AnimCmd sAnim_Tangela_1[] =
 {
     ANIMCMD_FRAME(1, 9),
     ANIMCMD_FRAME(0, 9),
@@ -1378,7 +1378,7 @@ static const union AnimCmd sAnim_TANGELA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KANGASKHAN_1[] =
+static const union AnimCmd sAnim_Kangaskhan_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1387,7 +1387,7 @@ static const union AnimCmd sAnim_KANGASKHAN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HORSEA_1[] =
+static const union AnimCmd sAnim_Horsea_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1397,7 +1397,7 @@ static const union AnimCmd sAnim_HORSEA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HORSEA_2[] =
+static const union AnimCmd sAnim_Horsea_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1406,7 +1406,7 @@ static const union AnimCmd sAnim_HORSEA_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SEADRA_1[] =
+static const union AnimCmd sAnim_Seadra_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1416,7 +1416,7 @@ static const union AnimCmd sAnim_SEADRA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SEADRA_2[] =
+static const union AnimCmd sAnim_Seadra_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1425,7 +1425,7 @@ static const union AnimCmd sAnim_SEADRA_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GOLDEEN_1[] =
+static const union AnimCmd sAnim_Goldeen_1[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
@@ -1439,7 +1439,7 @@ static const union AnimCmd sAnim_GOLDEEN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SEAKING_1[] =
+static const union AnimCmd sAnim_Seaking_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 20),
@@ -1449,7 +1449,7 @@ static const union AnimCmd sAnim_SEAKING_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_STARYU_1[] =
+static const union AnimCmd sAnim_Staryu_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1459,7 +1459,7 @@ static const union AnimCmd sAnim_STARYU_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_STARYU_2[] =
+static const union AnimCmd sAnim_Staryu_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1468,7 +1468,7 @@ static const union AnimCmd sAnim_STARYU_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_STARMIE_1[] =
+static const union AnimCmd sAnim_Starmie_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1478,7 +1478,7 @@ static const union AnimCmd sAnim_STARMIE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_STARMIE_2[] =
+static const union AnimCmd sAnim_Starmie_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1487,7 +1487,7 @@ static const union AnimCmd sAnim_STARMIE_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MR_MIME_1[] =
+static const union AnimCmd sAnim_MrMime_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -1498,7 +1498,7 @@ static const union AnimCmd sAnim_MR_MIME_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SCYTHER_1[] =
+static const union AnimCmd sAnim_Scyther_1[] =
 {
     ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
@@ -1511,7 +1511,7 @@ static const union AnimCmd sAnim_SCYTHER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_JYNX_1[] =
+static const union AnimCmd sAnim_Jynx_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
@@ -1521,7 +1521,7 @@ static const union AnimCmd sAnim_JYNX_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ELECTABUZZ_1[] =
+static const union AnimCmd sAnim_Electabuzz_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1530,14 +1530,14 @@ static const union AnimCmd sAnim_ELECTABUZZ_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MAGMAR_1[] =
+static const union AnimCmd sAnim_Magmar_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PINSIR_1[] =
+static const union AnimCmd sAnim_Pinsir_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -1547,7 +1547,7 @@ static const union AnimCmd sAnim_PINSIR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PINSIR_2[] =
+static const union AnimCmd sAnim_Pinsir_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -1556,7 +1556,7 @@ static const union AnimCmd sAnim_PINSIR_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TAUROS_1[] =
+static const union AnimCmd sAnim_Tauros_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 20),
@@ -1565,7 +1565,7 @@ static const union AnimCmd sAnim_TAUROS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MAGIKARP_1[] =
+static const union AnimCmd sAnim_Magikarp_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -1579,7 +1579,7 @@ static const union AnimCmd sAnim_MAGIKARP_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GYARADOS_1[] =
+static const union AnimCmd sAnim_Gyarados_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 32),
@@ -1587,14 +1587,14 @@ static const union AnimCmd sAnim_GYARADOS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LAPRAS_1[] =
+static const union AnimCmd sAnim_Lapras_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DITTO_1[] =
+static const union AnimCmd sAnim_Ditto_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1603,35 +1603,35 @@ static const union AnimCmd sAnim_DITTO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_EEVEE_1[] =
+static const union AnimCmd sAnim_Eevee_1[] =
 {
     ANIMCMD_FRAME(1, 33),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VAPOREON_1[] =
+static const union AnimCmd sAnim_Vaporeon_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_JOLTEON_1[] =
+static const union AnimCmd sAnim_Jolteon_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_FLAREON_1[] =
+static const union AnimCmd sAnim_Flareon_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PORYGON_1[] =
+static const union AnimCmd sAnim_Porygon_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1640,7 +1640,7 @@ static const union AnimCmd sAnim_PORYGON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_OMANYTE_1[] =
+static const union AnimCmd sAnim_Omanyte_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1653,7 +1653,7 @@ static const union AnimCmd sAnim_OMANYTE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_OMASTAR_1[] =
+static const union AnimCmd sAnim_Omastar_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1662,7 +1662,7 @@ static const union AnimCmd sAnim_OMASTAR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KABUTO_1[] =
+static const union AnimCmd sAnim_Kabuto_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -1675,7 +1675,7 @@ static const union AnimCmd sAnim_KABUTO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KABUTOPS_1[] =
+static const union AnimCmd sAnim_Kabutops_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1684,7 +1684,7 @@ static const union AnimCmd sAnim_KABUTOPS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_AERODACTYL_1[] =
+static const union AnimCmd sAnim_Aerodactyl_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 25),
@@ -1693,7 +1693,7 @@ static const union AnimCmd sAnim_AERODACTYL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SNORLAX_1[] =
+static const union AnimCmd sAnim_Snorlax_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 50),
@@ -1701,7 +1701,7 @@ static const union AnimCmd sAnim_SNORLAX_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ARTICUNO_1[] =
+static const union AnimCmd sAnim_Articuno_1[] =
 {
     ANIMCMD_FRAME(1, 25),
     ANIMCMD_FRAME(0, 15),
@@ -1710,7 +1710,7 @@ static const union AnimCmd sAnim_ARTICUNO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ZAPDOS_1[] =
+static const union AnimCmd sAnim_Zapdos_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1719,7 +1719,7 @@ static const union AnimCmd sAnim_ZAPDOS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MOLTRES_1[] =
+static const union AnimCmd sAnim_Moltres_1[] =
 {
     ANIMCMD_FRAME(1, 3),
     ANIMCMD_FRAME(0, 3),
@@ -1756,7 +1756,7 @@ static const union AnimCmd sAnim_MOLTRES_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DRATINI_1[] =
+static const union AnimCmd sAnim_Dratini_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -1764,7 +1764,7 @@ static const union AnimCmd sAnim_DRATINI_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DRAGONAIR_1[] =
+static const union AnimCmd sAnim_Dragonair_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1773,7 +1773,7 @@ static const union AnimCmd sAnim_DRAGONAIR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DRAGONITE_1[] =
+static const union AnimCmd sAnim_Dragonite_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 30),
@@ -1781,14 +1781,14 @@ static const union AnimCmd sAnim_DRAGONITE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MEWTWO_1[] =
+static const union AnimCmd sAnim_Mewtwo_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MEW_1[] =
+static const union AnimCmd sAnim_Mew_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 40),
@@ -1796,29 +1796,29 @@ static const union AnimCmd sAnim_MEW_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CHIKORITA_1[] =
+static const union AnimCmd sAnim_Chikorita_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
-    ANIMCMD_END,};
+    ANIMCMD_END,
+};
 
-
-static const union AnimCmd sAnim_BAYLEEF_1[] =
+static const union AnimCmd sAnim_Bayleef_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MEGANIUM_1[] =
+static const union AnimCmd sAnim_Meganium_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CYNDAQUIL_1[] =
+static const union AnimCmd sAnim_Cyndaquil_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1827,21 +1827,21 @@ static const union AnimCmd sAnim_CYNDAQUIL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_QUILAVA_1[] =
+static const union AnimCmd sAnim_Quilava_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TYPHLOSION_1[] =
+static const union AnimCmd sAnim_Typhlosion_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TOTODILE_1[] =
+static const union AnimCmd sAnim_Totodile_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -1852,14 +1852,14 @@ static const union AnimCmd sAnim_TOTODILE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CROCONAW_1[] =
+static const union AnimCmd sAnim_Croconaw_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_FERALIGATR_1[] =
+static const union AnimCmd sAnim_Feraligatr_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1868,7 +1868,7 @@ static const union AnimCmd sAnim_FERALIGATR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SENTRET_1[] =
+static const union AnimCmd sAnim_Sentret_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -1877,14 +1877,14 @@ static const union AnimCmd sAnim_SENTRET_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_FURRET_1[] =
+static const union AnimCmd sAnim_Furret_1[] =
 {
     ANIMCMD_FRAME(1, 35),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HOOTHOOT_1[] =
+static const union AnimCmd sAnim_Hoothoot_1[] =
 {
     ANIMCMD_FRAME(1, 7),
     ANIMCMD_FRAME(0, 7),
@@ -1901,14 +1901,14 @@ static const union AnimCmd sAnim_HOOTHOOT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NOCTOWL_1[] =
+static const union AnimCmd sAnim_Noctowl_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LEDYBA_1[] =
+static const union AnimCmd sAnim_Ledyba_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1917,7 +1917,7 @@ static const union AnimCmd sAnim_LEDYBA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LEDIAN_1[] =
+static const union AnimCmd sAnim_Ledian_1[] =
 {
     ANIMCMD_FRAME(1, 3),
     ANIMCMD_FRAME(0, 3),
@@ -1948,7 +1948,7 @@ static const union AnimCmd sAnim_LEDIAN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SPINARAK_1[] =
+static const union AnimCmd sAnim_Spinarak_1[] =
 {
     ANIMCMD_FRAME(1, 6),
     ANIMCMD_FRAME(0, 6),
@@ -1961,7 +1961,7 @@ static const union AnimCmd sAnim_SPINARAK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ARIADOS_1[] =
+static const union AnimCmd sAnim_Ariados_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -1970,7 +1970,7 @@ static const union AnimCmd sAnim_ARIADOS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CROBAT_1[] =
+static const union AnimCmd sAnim_Crobat_1[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(1, 2),
@@ -1992,7 +1992,7 @@ static const union AnimCmd sAnim_CROBAT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CHINCHOU_1[] =
+static const union AnimCmd sAnim_Chinchou_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -2002,7 +2002,7 @@ static const union AnimCmd sAnim_CHINCHOU_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CHINCHOU_2[] =
+static const union AnimCmd sAnim_Chinchou_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2011,7 +2011,7 @@ static const union AnimCmd sAnim_CHINCHOU_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LANTURN_1[] =
+static const union AnimCmd sAnim_Lanturn_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -2021,7 +2021,7 @@ static const union AnimCmd sAnim_LANTURN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LANTURN_2[] =
+static const union AnimCmd sAnim_Lanturn_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2030,7 +2030,7 @@ static const union AnimCmd sAnim_LANTURN_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PICHU_1[] =
+static const union AnimCmd sAnim_Pichu_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2040,7 +2040,7 @@ static const union AnimCmd sAnim_PICHU_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PICHU_2[] =
+static const union AnimCmd sAnim_Pichu_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2049,7 +2049,7 @@ static const union AnimCmd sAnim_PICHU_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CLEFFA_1[] =
+static const union AnimCmd sAnim_Cleffa_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2058,7 +2058,7 @@ static const union AnimCmd sAnim_CLEFFA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_IGGLYBUFF_1[] =
+static const union AnimCmd sAnim_Igglybuff_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2068,7 +2068,7 @@ static const union AnimCmd sAnim_IGGLYBUFF_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_IGGLYBUFF_2[] =
+static const union AnimCmd sAnim_Igglybuff_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2077,7 +2077,7 @@ static const union AnimCmd sAnim_IGGLYBUFF_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TOGEPI_1[] =
+static const union AnimCmd sAnim_Togepi_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 50),
@@ -2085,7 +2085,7 @@ static const union AnimCmd sAnim_TOGEPI_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TOGETIC_1[] =
+static const union AnimCmd sAnim_Togetic_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -2093,7 +2093,7 @@ static const union AnimCmd sAnim_TOGETIC_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NATU_1[] =
+static const union AnimCmd sAnim_Natu_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2103,7 +2103,7 @@ static const union AnimCmd sAnim_NATU_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NATU_2[] =
+static const union AnimCmd sAnim_Natu_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2112,7 +2112,7 @@ static const union AnimCmd sAnim_NATU_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_XATU_1[] =
+static const union AnimCmd sAnim_Xatu_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 45),
@@ -2124,7 +2124,7 @@ static const union AnimCmd sAnim_XATU_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_XATU_2[] =
+static const union AnimCmd sAnim_Xatu_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2133,7 +2133,7 @@ static const union AnimCmd sAnim_XATU_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MAREEP_1[] =
+static const union AnimCmd sAnim_Mareep_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2144,7 +2144,7 @@ static const union AnimCmd sAnim_MAREEP_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_FLAAFFY_1[] =
+static const union AnimCmd sAnim_Flaaffy_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2153,7 +2153,7 @@ static const union AnimCmd sAnim_FLAAFFY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_AMPHAROS_1[] =
+static const union AnimCmd sAnim_Ampharos_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 15),
@@ -2161,7 +2161,7 @@ static const union AnimCmd sAnim_AMPHAROS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BELLOSSOM_1[] =
+static const union AnimCmd sAnim_Bellossom_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -2173,7 +2173,7 @@ static const union AnimCmd sAnim_BELLOSSOM_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MARILL_1[] =
+static const union AnimCmd sAnim_Marill_1[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 44),
@@ -2183,7 +2183,7 @@ static const union AnimCmd sAnim_MARILL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_AZUMARILL_1[] =
+static const union AnimCmd sAnim_Azumarill_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -2193,7 +2193,7 @@ static const union AnimCmd sAnim_AZUMARILL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SUDOWOODO_1[] =
+static const union AnimCmd sAnim_Sudowoodo_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
@@ -2204,7 +2204,7 @@ static const union AnimCmd sAnim_SUDOWOODO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_POLITOED_1[] =
+static const union AnimCmd sAnim_Politoed_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2215,7 +2215,7 @@ static const union AnimCmd sAnim_POLITOED_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HOPPIP_1[] =
+static const union AnimCmd sAnim_Hoppip_1[] =
 {
     ANIMCMD_FRAME(1, 25),
     ANIMCMD_FRAME(0, 25),
@@ -2224,7 +2224,7 @@ static const union AnimCmd sAnim_HOPPIP_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SKIPLOOM_1[] =
+static const union AnimCmd sAnim_Skiploom_1[] =
 {
     ANIMCMD_FRAME(1, 12),
     ANIMCMD_FRAME(0, 12),
@@ -2237,7 +2237,7 @@ static const union AnimCmd sAnim_SKIPLOOM_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_JUMPLUFF_1[] =
+static const union AnimCmd sAnim_Jumpluff_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 25),
@@ -2248,14 +2248,14 @@ static const union AnimCmd sAnim_JUMPLUFF_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_AIPOM_1[] =
+static const union AnimCmd sAnim_Aipom_1[] =
 {
     ANIMCMD_FRAME(1, 35),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SUNKERN_1[] =
+static const union AnimCmd sAnim_Sunkern_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2264,7 +2264,7 @@ static const union AnimCmd sAnim_SUNKERN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SUNFLORA_1[] =
+static const union AnimCmd sAnim_Sunflora_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -2272,7 +2272,7 @@ static const union AnimCmd sAnim_SUNFLORA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_YANMA_1[] =
+static const union AnimCmd sAnim_Yanma_1[] =
 {
     ANIMCMD_FRAME(1, 2),
     ANIMCMD_FRAME(0, 2),
@@ -2299,7 +2299,7 @@ static const union AnimCmd sAnim_YANMA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WOOPER_1[] =
+static const union AnimCmd sAnim_Wooper_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -2307,14 +2307,14 @@ static const union AnimCmd sAnim_WOOPER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_QUAGSIRE_1[] =
+static const union AnimCmd sAnim_Quagsire_1[] =
 {
     ANIMCMD_FRAME(1, 32),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ESPEON_1[] =
+static const union AnimCmd sAnim_Espeon_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 25),
@@ -2322,21 +2322,21 @@ static const union AnimCmd sAnim_ESPEON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UMBREON_1[] =
+static const union AnimCmd sAnim_Umbreon_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MURKROW_1[] =
+static const union AnimCmd sAnim_Murkrow_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SLOWKING_1[] =
+static const union AnimCmd sAnim_Slowking_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2344,7 +2344,7 @@ static const union AnimCmd sAnim_SLOWKING_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MISDREAVUS_1[] =
+static const union AnimCmd sAnim_Misdreavus_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2359,7 +2359,7 @@ static const union AnimCmd sAnim_MISDREAVUS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_1[] =
+static const union AnimCmd sAnim_Unown_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -2367,7 +2367,7 @@ static const union AnimCmd sAnim_UNOWN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WOBBUFFET_1[] =
+static const union AnimCmd sAnim_Wobbuffet_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2377,7 +2377,7 @@ static const union AnimCmd sAnim_WOBBUFFET_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WOBBUFFET_2[] =
+static const union AnimCmd sAnim_Wobbuffet_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2386,7 +2386,7 @@ static const union AnimCmd sAnim_WOBBUFFET_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GIRAFARIG_1[] =
+static const union AnimCmd sAnim_Girafarig_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2398,7 +2398,7 @@ static const union AnimCmd sAnim_GIRAFARIG_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GIRAFARIG_2[] =
+static const union AnimCmd sAnim_Girafarig_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2407,7 +2407,7 @@ static const union AnimCmd sAnim_GIRAFARIG_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PINECO_1[] =
+static const union AnimCmd sAnim_Pineco_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2420,7 +2420,7 @@ static const union AnimCmd sAnim_PINECO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_FORRETRESS_1[] =
+static const union AnimCmd sAnim_Forretress_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2429,7 +2429,7 @@ static const union AnimCmd sAnim_FORRETRESS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DUNSPARCE_1[] =
+static const union AnimCmd sAnim_Dunsparce_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 15),
@@ -2438,14 +2438,14 @@ static const union AnimCmd sAnim_DUNSPARCE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GLIGAR_1[] =
+static const union AnimCmd sAnim_Gligar_1[] =
 {
     ANIMCMD_FRAME(1, 17),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_STEELIX_1[] =
+static const union AnimCmd sAnim_Steelix_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 8),
@@ -2456,21 +2456,21 @@ static const union AnimCmd sAnim_STEELIX_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SNUBBULL_1[] =
+static const union AnimCmd sAnim_Snubbull_1[] =
 {
     ANIMCMD_FRAME(1, 32),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GRANBULL_1[] =
+static const union AnimCmd sAnim_Granbull_1[] =
 {
     ANIMCMD_FRAME(1, 35),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_QWILFISH_1[] =
+static const union AnimCmd sAnim_Qwilfish_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -2482,14 +2482,14 @@ static const union AnimCmd sAnim_QWILFISH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SCIZOR_1[] =
+static const union AnimCmd sAnim_Scizor_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SHUCKLE_1[] =
+static const union AnimCmd sAnim_Shuckle_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 50),
@@ -2497,7 +2497,7 @@ static const union AnimCmd sAnim_SHUCKLE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HERACROSS_1[] =
+static const union AnimCmd sAnim_Heracross_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -2507,7 +2507,7 @@ static const union AnimCmd sAnim_HERACROSS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HERACROSS_2[] =
+static const union AnimCmd sAnim_Heracross_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2516,28 +2516,28 @@ static const union AnimCmd sAnim_HERACROSS_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SNEASEL_1[] =
+static const union AnimCmd sAnim_Sneasel_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TEDDIURSA_1[] =
+static const union AnimCmd sAnim_Teddiursa_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_URSARING_1[] =
+static const union AnimCmd sAnim_Ursaring_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SLUGMA_1[] =
+static const union AnimCmd sAnim_Slugma_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -2547,7 +2547,7 @@ static const union AnimCmd sAnim_SLUGMA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SLUGMA_2[] =
+static const union AnimCmd sAnim_Slugma_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2556,7 +2556,7 @@ static const union AnimCmd sAnim_SLUGMA_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MAGCARGO_1[] =
+static const union AnimCmd sAnim_Magcargo_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -2566,7 +2566,7 @@ static const union AnimCmd sAnim_MAGCARGO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MAGCARGO_2[] =
+static const union AnimCmd sAnim_Magcargo_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2575,7 +2575,7 @@ static const union AnimCmd sAnim_MAGCARGO_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SWINUB_1[] =
+static const union AnimCmd sAnim_Swinub_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2584,7 +2584,7 @@ static const union AnimCmd sAnim_SWINUB_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PILOSWINE_1[] =
+static const union AnimCmd sAnim_Piloswine_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2593,7 +2593,7 @@ static const union AnimCmd sAnim_PILOSWINE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CORSOLA_1[] =
+static const union AnimCmd sAnim_Corsola_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -2603,7 +2603,7 @@ static const union AnimCmd sAnim_CORSOLA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CORSOLA_2[] =
+static const union AnimCmd sAnim_Corsola_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2612,7 +2612,7 @@ static const union AnimCmd sAnim_CORSOLA_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_REMORAID_1[] =
+static const union AnimCmd sAnim_Remoraid_1[] =
 {
     ANIMCMD_FRAME(1, 8),
     ANIMCMD_FRAME(0, 8),
@@ -2621,7 +2621,7 @@ static const union AnimCmd sAnim_REMORAID_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_OCTILLERY_1[] =
+static const union AnimCmd sAnim_Octillery_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2630,7 +2630,7 @@ static const union AnimCmd sAnim_OCTILLERY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DELIBIRD_1[] =
+static const union AnimCmd sAnim_Delibird_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2639,7 +2639,7 @@ static const union AnimCmd sAnim_DELIBIRD_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MANTINE_1[] =
+static const union AnimCmd sAnim_Mantine_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 30),
@@ -2648,7 +2648,7 @@ static const union AnimCmd sAnim_MANTINE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SKARMORY_1[] =
+static const union AnimCmd sAnim_Skarmory_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2658,7 +2658,7 @@ static const union AnimCmd sAnim_SKARMORY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SKARMORY_2[] =
+static const union AnimCmd sAnim_Skarmory_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2667,7 +2667,7 @@ static const union AnimCmd sAnim_SKARMORY_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HOUNDOUR_1[] =
+static const union AnimCmd sAnim_Houndour_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2676,14 +2676,14 @@ static const union AnimCmd sAnim_HOUNDOUR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HOUNDOOM_1[] =
+static const union AnimCmd sAnim_Houndoom_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KINGDRA_1[] =
+static const union AnimCmd sAnim_Kingdra_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -2693,7 +2693,7 @@ static const union AnimCmd sAnim_KINGDRA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KINGDRA_2[] =
+static const union AnimCmd sAnim_Kingdra_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2702,7 +2702,7 @@ static const union AnimCmd sAnim_KINGDRA_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PHANPY_1[] =
+static const union AnimCmd sAnim_Phanpy_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2714,7 +2714,7 @@ static const union AnimCmd sAnim_PHANPY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PHANPY_2[] =
+static const union AnimCmd sAnim_Phanpy_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2723,7 +2723,7 @@ static const union AnimCmd sAnim_PHANPY_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DONPHAN_1[] =
+static const union AnimCmd sAnim_Donphan_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -2735,7 +2735,7 @@ static const union AnimCmd sAnim_DONPHAN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DONPHAN_2[] =
+static const union AnimCmd sAnim_Donphan_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -2744,7 +2744,7 @@ static const union AnimCmd sAnim_DONPHAN_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PORYGON2_1[] =
+static const union AnimCmd sAnim_Porygon2_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -2754,14 +2754,14 @@ static const union AnimCmd sAnim_PORYGON2_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_STANTLER_1[] =
+static const union AnimCmd sAnim_Stantler_1[] =
 {
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SMEARGLE_1[] =
+static const union AnimCmd sAnim_Smeargle_1[] =
 {
     ANIMCMD_FRAME(1, 12),
     ANIMCMD_FRAME(0, 12),
@@ -2770,14 +2770,14 @@ static const union AnimCmd sAnim_SMEARGLE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TYROGUE_1[] =
+static const union AnimCmd sAnim_Tyrogue_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HITMONTOP_1[] =
+static const union AnimCmd sAnim_Hitmontop_1[] =
 {
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(1, 4),
@@ -2793,7 +2793,7 @@ static const union AnimCmd sAnim_HITMONTOP_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SMOOCHUM_1[] =
+static const union AnimCmd sAnim_Smoochum_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2804,7 +2804,7 @@ static const union AnimCmd sAnim_SMOOCHUM_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ELEKID_1[] =
+static const union AnimCmd sAnim_Elekid_1[] =
 {
     ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 5),
@@ -2812,7 +2812,7 @@ static const union AnimCmd sAnim_ELEKID_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MAGBY_1[] =
+static const union AnimCmd sAnim_Magby_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -2824,21 +2824,21 @@ static const union AnimCmd sAnim_MAGBY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MILTANK_1[] =
+static const union AnimCmd sAnim_Miltank_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BLISSEY_1[] =
+static const union AnimCmd sAnim_Blissey_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RAIKOU_1[] =
+static const union AnimCmd sAnim_Raikou_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2847,21 +2847,21 @@ static const union AnimCmd sAnim_RAIKOU_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ENTEI_1[] =
+static const union AnimCmd sAnim_Entei_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SUICUNE_1[] =
+static const union AnimCmd sAnim_Suicune_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LARVITAR_1[] =
+static const union AnimCmd sAnim_Larvitar_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
@@ -2870,14 +2870,14 @@ static const union AnimCmd sAnim_LARVITAR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PUPITAR_1[] =
+static const union AnimCmd sAnim_Pupitar_1[] =
 {
     ANIMCMD_FRAME(1, 40),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TYRANITAR_1[] =
+static const union AnimCmd sAnim_Tyranitar_1[] =
 {
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 20),
@@ -2886,21 +2886,21 @@ static const union AnimCmd sAnim_TYRANITAR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LUGIA_1[] =
+static const union AnimCmd sAnim_Lugia_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HO_OH_1[] =
+static const union AnimCmd sAnim_HoOh_1[] =
 {
     ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CELEBI_1[] =
+static const union AnimCmd sAnim_Celebi_1[] =
 {
     ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 30),
@@ -2909,7 +2909,7 @@ static const union AnimCmd sAnim_CELEBI_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_OLD_UNOWN_B_1[] =
+static const union AnimCmd sAnim_OldUnownB_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -2917,16 +2917,17 @@ static const union AnimCmd sAnim_OLD_UNOWN_B_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TREECKO_1[] =
+static const union AnimCmd sAnim_Treecko_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 3),
-    ANIMCMD_END,};
+    ANIMCMD_END,
+};
 
-static const union AnimCmd sAnim_GROVYLE_1[] =
+static const union AnimCmd sAnim_Grovyle_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 18),
@@ -2936,7 +2937,7 @@ static const union AnimCmd sAnim_GROVYLE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SCEPTILE_1[] =
+static const union AnimCmd sAnim_Sceptile_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 26),
@@ -2944,7 +2945,7 @@ static const union AnimCmd sAnim_SCEPTILE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TORCHIC_1[] =
+static const union AnimCmd sAnim_Torchic_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 4),
@@ -2956,14 +2957,15 @@ static const union AnimCmd sAnim_TORCHIC_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_COMBUSKEN_1[] =
+static const union AnimCmd sAnim_Combusken_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 25),
     ANIMCMD_FRAME(0, 12),
-    ANIMCMD_END,};
+    ANIMCMD_END,
+};
 
-static const union AnimCmd sAnim_BLAZIKEN_1[] =
+static const union AnimCmd sAnim_Blaziken_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 25),
@@ -2973,7 +2975,7 @@ static const union AnimCmd sAnim_BLAZIKEN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BLAZIKEN_2[] =
+static const union AnimCmd sAnim_Blaziken_2[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(2, 8),
@@ -2981,20 +2983,20 @@ static const union AnimCmd sAnim_BLAZIKEN_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BLAZIKEN_3[] =
+static const union AnimCmd sAnim_Blaziken_3[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(2, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BLAZIKEN_4[] =
+static const union AnimCmd sAnim_Blaziken_4[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MUDKIP_1[] =
+static const union AnimCmd sAnim_Mudkip_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 8),
@@ -3004,7 +3006,7 @@ static const union AnimCmd sAnim_MUDKIP_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MARSHTOMP_1[] =
+static const union AnimCmd sAnim_Marshtomp_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -3018,7 +3020,7 @@ static const union AnimCmd sAnim_MARSHTOMP_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SWAMPERT_1[] =
+static const union AnimCmd sAnim_Swampert_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 44),
@@ -3028,7 +3030,7 @@ static const union AnimCmd sAnim_SWAMPERT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_POOCHYENA_1[] =
+static const union AnimCmd sAnim_Poochyena_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 44),
@@ -3036,7 +3038,7 @@ static const union AnimCmd sAnim_POOCHYENA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MIGHTYENA_1[] =
+static const union AnimCmd sAnim_Mightyena_1[] =
 {
     ANIMCMD_FRAME(0, 27),
     ANIMCMD_FRAME(1, 6),
@@ -3046,7 +3048,7 @@ static const union AnimCmd sAnim_MIGHTYENA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ZIGZAGOON_1[] =
+static const union AnimCmd sAnim_Zigzagoon_1[] =
 {
     ANIMCMD_FRAME(0, 27),
     ANIMCMD_FRAME(1, 6),
@@ -3056,7 +3058,7 @@ static const union AnimCmd sAnim_ZIGZAGOON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LINOONE_1[] =
+static const union AnimCmd sAnim_Linoone_1[] =
 {
     ANIMCMD_FRAME(0, 14),
     ANIMCMD_FRAME(1, 14),
@@ -3066,7 +3068,7 @@ static const union AnimCmd sAnim_LINOONE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WURMPLE_1[] =
+static const union AnimCmd sAnim_Wurmple_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 35),
@@ -3074,7 +3076,7 @@ static const union AnimCmd sAnim_WURMPLE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SILCOON_1[] =
+static const union AnimCmd sAnim_Silcoon_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 25),
@@ -3082,13 +3084,13 @@ static const union AnimCmd sAnim_SILCOON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SILCOON_2[] =
+static const union AnimCmd sAnim_Silcoon_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BEAUTIFLY_1[] =
+static const union AnimCmd sAnim_Beautifly_1[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(1, 2),
@@ -3102,13 +3104,13 @@ static const union AnimCmd sAnim_BEAUTIFLY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BEAUTIFLY_2[] =
+static const union AnimCmd sAnim_Beautifly_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CASCOON_1[] =
+static const union AnimCmd sAnim_Cascoon_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3118,13 +3120,13 @@ static const union AnimCmd sAnim_CASCOON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CASCOON_2[] =
+static const union AnimCmd sAnim_Cascoon_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DUSTOX_1[] =
+static const union AnimCmd sAnim_Dustox_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 1),
@@ -3144,13 +3146,13 @@ static const union AnimCmd sAnim_DUSTOX_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DUSTOX_2[] =
+static const union AnimCmd sAnim_Dustox_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LOTAD_1[] =
+static const union AnimCmd sAnim_Lotad_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 55),
@@ -3158,7 +3160,7 @@ static const union AnimCmd sAnim_LOTAD_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LOMBRE_1[] =
+static const union AnimCmd sAnim_Lombre_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 30),
@@ -3168,7 +3170,7 @@ static const union AnimCmd sAnim_LOMBRE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LUDICOLO_1[] =
+static const union AnimCmd sAnim_Ludicolo_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -3180,7 +3182,7 @@ static const union AnimCmd sAnim_LUDICOLO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SEEDOT_1[] =
+static const union AnimCmd sAnim_Seedot_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3194,7 +3196,7 @@ static const union AnimCmd sAnim_SEEDOT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NUZLEAF_1[] =
+static const union AnimCmd sAnim_Nuzleaf_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 15),
@@ -3208,7 +3210,7 @@ static const union AnimCmd sAnim_NUZLEAF_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SHIFTRY_1[] =
+static const union AnimCmd sAnim_Shiftry_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 35),
@@ -3216,7 +3218,7 @@ static const union AnimCmd sAnim_SHIFTRY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NINCADA_1[] =
+static const union AnimCmd sAnim_Nincada_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 22),
@@ -3226,7 +3228,7 @@ static const union AnimCmd sAnim_NINCADA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NINJASK_1[] =
+static const union AnimCmd sAnim_Ninjask_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 1),
@@ -3249,7 +3251,7 @@ static const union AnimCmd sAnim_NINJASK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SHEDINJA_1[] =
+static const union AnimCmd sAnim_Shedinja_1[] =
 {
     ANIMCMD_FRAME(0, 33),
     ANIMCMD_FRAME(1, 33),
@@ -3259,7 +3261,7 @@ static const union AnimCmd sAnim_SHEDINJA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TAILLOW_1[] =
+static const union AnimCmd sAnim_Taillow_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 15),
@@ -3273,7 +3275,7 @@ static const union AnimCmd sAnim_TAILLOW_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SWELLOW_1[] =
+static const union AnimCmd sAnim_Swellow_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 18),
@@ -3281,7 +3283,7 @@ static const union AnimCmd sAnim_SWELLOW_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SHROOMISH_1[] =
+static const union AnimCmd sAnim_Shroomish_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -3297,7 +3299,7 @@ static const union AnimCmd sAnim_SHROOMISH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BRELOOM_1[] =
+static const union AnimCmd sAnim_Breloom_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 30),
@@ -3307,7 +3309,7 @@ static const union AnimCmd sAnim_BRELOOM_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WINGULL_1[] =
+static const union AnimCmd sAnim_Wingull_1[] =
 {
     ANIMCMD_FRAME(0, 17),
     ANIMCMD_FRAME(1, 23),
@@ -3315,7 +3317,7 @@ static const union AnimCmd sAnim_WINGULL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PELIPPER_1[] =
+static const union AnimCmd sAnim_Pelipper_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 5),
@@ -3329,7 +3331,7 @@ static const union AnimCmd sAnim_PELIPPER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SURSKIT_1[] =
+static const union AnimCmd sAnim_Surskit_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 18),
@@ -3339,13 +3341,13 @@ static const union AnimCmd sAnim_SURSKIT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SURSKIT_2[] =
+static const union AnimCmd sAnim_Surskit_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MASQUERAIN_1[] =
+static const union AnimCmd sAnim_Masquerain_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -3359,13 +3361,13 @@ static const union AnimCmd sAnim_MASQUERAIN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MASQUERAIN_2[] =
+static const union AnimCmd sAnim_Masquerain_2[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WAILMER_1[] =
+static const union AnimCmd sAnim_Wailmer_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -3377,7 +3379,7 @@ static const union AnimCmd sAnim_WAILMER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WAILORD_1[] =
+static const union AnimCmd sAnim_Wailord_1[] =
 {
     ANIMCMD_FRAME(0, 26),
     ANIMCMD_FRAME(1, 48),
@@ -3385,7 +3387,7 @@ static const union AnimCmd sAnim_WAILORD_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SKITTY_1[] =
+static const union AnimCmd sAnim_Skitty_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 35),
@@ -3393,7 +3395,7 @@ static const union AnimCmd sAnim_SKITTY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DELCATTY_1[] =
+static const union AnimCmd sAnim_Delcatty_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 46),
@@ -3401,7 +3403,7 @@ static const union AnimCmd sAnim_DELCATTY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KECLEON_1[] =
+static const union AnimCmd sAnim_Kecleon_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 18),
@@ -3411,7 +3413,7 @@ static const union AnimCmd sAnim_KECLEON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BALTOY_1[] =
+static const union AnimCmd sAnim_Baltoy_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3423,7 +3425,7 @@ static const union AnimCmd sAnim_BALTOY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CLAYDOL_1[] =
+static const union AnimCmd sAnim_Claydol_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3435,7 +3437,7 @@ static const union AnimCmd sAnim_CLAYDOL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NOSEPASS_1[] =
+static const union AnimCmd sAnim_Nosepass_1[] =
 {
     ANIMCMD_FRAME(0, 27),
     ANIMCMD_FRAME(1, 27),
@@ -3447,7 +3449,7 @@ static const union AnimCmd sAnim_NOSEPASS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TORKOAL_1[] =
+static const union AnimCmd sAnim_Torkoal_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3457,7 +3459,7 @@ static const union AnimCmd sAnim_TORKOAL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SABLEYE_1[] =
+static const union AnimCmd sAnim_Sableye_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3467,7 +3469,7 @@ static const union AnimCmd sAnim_SABLEYE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BARBOACH_1[] =
+static const union AnimCmd sAnim_Barboach_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3485,7 +3487,7 @@ static const union AnimCmd sAnim_BARBOACH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WHISCASH_1[] =
+static const union AnimCmd sAnim_Whiscash_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3503,7 +3505,7 @@ static const union AnimCmd sAnim_WHISCASH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LUVDISC_1[] =
+static const union AnimCmd sAnim_Luvdisc_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3513,7 +3515,7 @@ static const union AnimCmd sAnim_LUVDISC_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CORPHISH_1[] =
+static const union AnimCmd sAnim_Corphish_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3525,7 +3527,7 @@ static const union AnimCmd sAnim_CORPHISH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CRAWDAUNT_1[] =
+static const union AnimCmd sAnim_Crawdaunt_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3535,7 +3537,7 @@ static const union AnimCmd sAnim_CRAWDAUNT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_FEEBAS_1[] =
+static const union AnimCmd sAnim_Feebas_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3547,7 +3549,7 @@ static const union AnimCmd sAnim_FEEBAS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MILOTIC_1[] =
+static const union AnimCmd sAnim_Milotic_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3559,7 +3561,7 @@ static const union AnimCmd sAnim_MILOTIC_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CARVANHA_1[] =
+static const union AnimCmd sAnim_Carvanha_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -3573,7 +3575,7 @@ static const union AnimCmd sAnim_CARVANHA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SHARPEDO_1[] =
+static const union AnimCmd sAnim_Sharpedo_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -3587,7 +3589,7 @@ static const union AnimCmd sAnim_SHARPEDO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TRAPINCH_1[] =
+static const union AnimCmd sAnim_Trapinch_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3597,7 +3599,7 @@ static const union AnimCmd sAnim_TRAPINCH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VIBRAVA_1[] =
+static const union AnimCmd sAnim_Vibrava_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3609,7 +3611,7 @@ static const union AnimCmd sAnim_VIBRAVA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_FLYGON_1[] =
+static const union AnimCmd sAnim_Flygon_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3621,7 +3623,7 @@ static const union AnimCmd sAnim_FLYGON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MAKUHITA_1[] =
+static const union AnimCmd sAnim_Makuhita_1[] =
 {
     ANIMCMD_FRAME(0, 7),
     ANIMCMD_FRAME(1, 10),
@@ -3635,7 +3637,7 @@ static const union AnimCmd sAnim_MAKUHITA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HARIYAMA_1[] =
+static const union AnimCmd sAnim_Hariyama_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -3644,7 +3646,7 @@ static const union AnimCmd sAnim_HARIYAMA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ELECTRIKE_1[] =
+static const union AnimCmd sAnim_Electrike_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 25),
@@ -3654,7 +3656,7 @@ static const union AnimCmd sAnim_ELECTRIKE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MANECTRIC_1[] =
+static const union AnimCmd sAnim_Manectric_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 33),
@@ -3664,7 +3666,7 @@ static const union AnimCmd sAnim_MANECTRIC_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_NUMEL_1[] =
+static const union AnimCmd sAnim_Numel_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3674,7 +3676,7 @@ static const union AnimCmd sAnim_NUMEL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CAMERUPT_1[] =
+static const union AnimCmd sAnim_Camerupt_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3686,7 +3688,7 @@ static const union AnimCmd sAnim_CAMERUPT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SPHEAL_1[] =
+static const union AnimCmd sAnim_Spheal_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 43),
@@ -3699,7 +3701,7 @@ static const union AnimCmd sAnim_SPHEAL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SEALEO_1[] =
+static const union AnimCmd sAnim_Sealeo_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3709,7 +3711,7 @@ static const union AnimCmd sAnim_SEALEO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WALREIN_1[] =
+static const union AnimCmd sAnim_Walrein_1[] =
 {
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(1, 10),
@@ -3719,7 +3721,7 @@ static const union AnimCmd sAnim_WALREIN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CACNEA_1[] =
+static const union AnimCmd sAnim_Cacnea_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3735,7 +3737,7 @@ static const union AnimCmd sAnim_CACNEA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CACTURNE_1[] =
+static const union AnimCmd sAnim_Cacturne_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3745,7 +3747,7 @@ static const union AnimCmd sAnim_CACTURNE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SNORUNT_1[] =
+static const union AnimCmd sAnim_Snorunt_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3755,7 +3757,7 @@ static const union AnimCmd sAnim_SNORUNT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GLALIE_1[] =
+static const union AnimCmd sAnim_Glalie_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3765,7 +3767,7 @@ static const union AnimCmd sAnim_GLALIE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LUNATONE_1[] =
+static const union AnimCmd sAnim_Lunatone_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -3775,7 +3777,7 @@ static const union AnimCmd sAnim_LUNATONE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LUNATONE_2[] =
+static const union AnimCmd sAnim_Lunatone_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -3784,7 +3786,7 @@ static const union AnimCmd sAnim_LUNATONE_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SOLROCK_1[] =
+static const union AnimCmd sAnim_Solrock_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -3794,7 +3796,7 @@ static const union AnimCmd sAnim_SOLROCK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SOLROCK_2[] =
+static const union AnimCmd sAnim_Solrock_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -3803,7 +3805,7 @@ static const union AnimCmd sAnim_SOLROCK_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_AZURILL_1[] =
+static const union AnimCmd sAnim_Azurill_1[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(1, 12),
@@ -3815,7 +3817,7 @@ static const union AnimCmd sAnim_AZURILL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SPOINK_1[] =
+static const union AnimCmd sAnim_Spoink_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 10),
@@ -3831,7 +3833,7 @@ static const union AnimCmd sAnim_SPOINK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GRUMPIG_1[] =
+static const union AnimCmd sAnim_Grumpig_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3841,7 +3843,7 @@ static const union AnimCmd sAnim_GRUMPIG_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_PLUSLE_1[] =
+static const union AnimCmd sAnim_Plusle_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3851,7 +3853,7 @@ static const union AnimCmd sAnim_PLUSLE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MINUN_1[] =
+static const union AnimCmd sAnim_Minun_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3861,7 +3863,7 @@ static const union AnimCmd sAnim_MINUN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MAWILE_1[] =
+static const union AnimCmd sAnim_Mawile_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -3873,7 +3875,7 @@ static const union AnimCmd sAnim_MAWILE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MEDITITE_1[] =
+static const union AnimCmd sAnim_Meditite_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 2),
@@ -3881,7 +3883,7 @@ static const union AnimCmd sAnim_MEDITITE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_MEDICHAM_1[] =
+static const union AnimCmd sAnim_Medicham_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 11),
@@ -3893,7 +3895,7 @@ static const union AnimCmd sAnim_MEDICHAM_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SWABLU_1[] =
+static const union AnimCmd sAnim_Swablu_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 10),
@@ -3905,7 +3907,7 @@ static const union AnimCmd sAnim_SWABLU_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SWABLU_2[] =
+static const union AnimCmd sAnim_Swablu_2[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(2, 8),
@@ -3916,7 +3918,7 @@ static const union AnimCmd sAnim_SWABLU_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ALTARIA_1[] =
+static const union AnimCmd sAnim_Altaria_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 20),
@@ -3926,7 +3928,7 @@ static const union AnimCmd sAnim_ALTARIA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ALTARIA_2[] =
+static const union AnimCmd sAnim_Altaria_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -3935,7 +3937,7 @@ static const union AnimCmd sAnim_ALTARIA_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WYNAUT_1[] =
+static const union AnimCmd sAnim_Wynaut_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3945,7 +3947,7 @@ static const union AnimCmd sAnim_WYNAUT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DUSKULL_1[] =
+static const union AnimCmd sAnim_Duskull_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3955,7 +3957,7 @@ static const union AnimCmd sAnim_DUSKULL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DUSCLOPS_1[] =
+static const union AnimCmd sAnim_Dusclops_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -3965,7 +3967,7 @@ static const union AnimCmd sAnim_DUSCLOPS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ROSELIA_1[] =
+static const union AnimCmd sAnim_Roselia_1[] =
 {
     ANIMCMD_FRAME(0, 18),
     ANIMCMD_FRAME(1, 44),
@@ -3973,7 +3975,7 @@ static const union AnimCmd sAnim_ROSELIA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SLAKOTH_1[] =
+static const union AnimCmd sAnim_Slakoth_1[] =
 {
     ANIMCMD_FRAME(0, 13),
     ANIMCMD_FRAME(1, 22),
@@ -3984,7 +3986,7 @@ static const union AnimCmd sAnim_SLAKOTH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VIGOROTH_1[] =
+static const union AnimCmd sAnim_Vigoroth_1[] =
 {
     ANIMCMD_FRAME(0, 13),
     ANIMCMD_FRAME(1, 7),
@@ -3996,7 +3998,7 @@ static const union AnimCmd sAnim_VIGOROTH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SLAKING_1[] =
+static const union AnimCmd sAnim_Slaking_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -4008,7 +4010,7 @@ static const union AnimCmd sAnim_SLAKING_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GULPIN_1[] =
+static const union AnimCmd sAnim_Gulpin_1[] =
 {
     ANIMCMD_FRAME(0, 14),
     ANIMCMD_FRAME(1, 14),
@@ -4018,7 +4020,7 @@ static const union AnimCmd sAnim_GULPIN_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SWALOT_1[] =
+static const union AnimCmd sAnim_Swalot_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 30),
@@ -4027,7 +4029,7 @@ static const union AnimCmd sAnim_SWALOT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_TROPIUS_1[] =
+static const union AnimCmd sAnim_Tropius_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4037,7 +4039,7 @@ static const union AnimCmd sAnim_TROPIUS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_WHISMUR_1[] =
+static const union AnimCmd sAnim_Whismur_1[] =
 {
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(1, 9),
@@ -4052,7 +4054,7 @@ static const union AnimCmd sAnim_WHISMUR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LOUDRED_1[] =
+static const union AnimCmd sAnim_Loudred_1[] =
 {
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(1, 9),
@@ -4062,7 +4064,7 @@ static const union AnimCmd sAnim_LOUDRED_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_EXPLOUD_1[] =
+static const union AnimCmd sAnim_Exploud_1[] =
 {
     ANIMCMD_FRAME(0, 9),
     ANIMCMD_FRAME(1, 44),
@@ -4070,7 +4072,7 @@ static const union AnimCmd sAnim_EXPLOUD_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CLAMPERL_1[] =
+static const union AnimCmd sAnim_Clamperl_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4080,7 +4082,7 @@ static const union AnimCmd sAnim_CLAMPERL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_HUNTAIL_1[] =
+static const union AnimCmd sAnim_Huntail_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4090,7 +4092,7 @@ static const union AnimCmd sAnim_HUNTAIL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GOREBYSS_1[] =
+static const union AnimCmd sAnim_Gorebyss_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4100,7 +4102,7 @@ static const union AnimCmd sAnim_GOREBYSS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ABSOL_1[] =
+static const union AnimCmd sAnim_Absol_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4110,7 +4112,7 @@ static const union AnimCmd sAnim_ABSOL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SHUPPET_1[] =
+static const union AnimCmd sAnim_Shuppet_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4122,7 +4124,7 @@ static const union AnimCmd sAnim_SHUPPET_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BANETTE_1[] =
+static const union AnimCmd sAnim_Banette_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4134,7 +4136,7 @@ static const union AnimCmd sAnim_BANETTE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SEVIPER_1[] =
+static const union AnimCmd sAnim_Seviper_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4146,7 +4148,7 @@ static const union AnimCmd sAnim_SEVIPER_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ZANGOOSE_1[] =
+static const union AnimCmd sAnim_Zangoose_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4158,7 +4160,7 @@ static const union AnimCmd sAnim_ZANGOOSE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RELICANTH_1[] =
+static const union AnimCmd sAnim_Relicanth_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4168,7 +4170,7 @@ static const union AnimCmd sAnim_RELICANTH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ARON_1[] =
+static const union AnimCmd sAnim_Aron_1[] =
 {
     ANIMCMD_FRAME(0, 33),
     ANIMCMD_FRAME(1, 44),
@@ -4178,7 +4180,7 @@ static const union AnimCmd sAnim_ARON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LAIRON_1[] =
+static const union AnimCmd sAnim_Lairon_1[] =
 {
     ANIMCMD_FRAME(0, 12),
     ANIMCMD_FRAME(1, 29),
@@ -4188,7 +4190,7 @@ static const union AnimCmd sAnim_LAIRON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_AGGRON_1[] =
+static const union AnimCmd sAnim_Aggron_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 44),
@@ -4196,31 +4198,31 @@ static const union AnimCmd sAnim_AGGRON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CASTFORM_0[] =
+static const union AnimCmd sAnim_Castform_0[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CASTFORM_1[] =
+static const union AnimCmd sAnim_Castform_1[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CASTFORM_2[] =
+static const union AnimCmd sAnim_Castform_2[] =
 {
     ANIMCMD_FRAME(2, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CASTFORM_3[] =
+static const union AnimCmd sAnim_Castform_3[] =
 {
     ANIMCMD_FRAME(3, 1),
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_VOLBEAT_1[] =
+static const union AnimCmd sAnim_Volbeat_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 11),
@@ -4232,7 +4234,7 @@ static const union AnimCmd sAnim_VOLBEAT_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ILLUMISE_1[] =
+static const union AnimCmd sAnim_Illumise_1[] =
 {
     ANIMCMD_FRAME(0, 22),
     ANIMCMD_FRAME(1, 22),
@@ -4242,7 +4244,7 @@ static const union AnimCmd sAnim_ILLUMISE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LILEEP_1[] =
+static const union AnimCmd sAnim_Lileep_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4252,7 +4254,7 @@ static const union AnimCmd sAnim_LILEEP_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CRADILY_1[] =
+static const union AnimCmd sAnim_Cradily_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4264,7 +4266,7 @@ static const union AnimCmd sAnim_CRADILY_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ANORITH_1[] =
+static const union AnimCmd sAnim_Anorith_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4276,7 +4278,7 @@ static const union AnimCmd sAnim_ANORITH_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_ARMALDO_1[] =
+static const union AnimCmd sAnim_Armaldo_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4286,7 +4288,7 @@ static const union AnimCmd sAnim_ARMALDO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RALTS_1[] =
+static const union AnimCmd sAnim_Ralts_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 25),
@@ -4294,7 +4296,7 @@ static const union AnimCmd sAnim_RALTS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KIRLIA_1[] =
+static const union AnimCmd sAnim_Kirlia_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 39),
@@ -4302,7 +4304,7 @@ static const union AnimCmd sAnim_KIRLIA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GARDEVOIR_1[] =
+static const union AnimCmd sAnim_Gardevoir_1[] =
 {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_FRAME(1, 3),
@@ -4320,7 +4322,7 @@ static const union AnimCmd sAnim_GARDEVOIR_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BAGON_1[] =
+static const union AnimCmd sAnim_Bagon_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4330,7 +4332,7 @@ static const union AnimCmd sAnim_BAGON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SHELGON_1[] =
+static const union AnimCmd sAnim_Shelgon_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4340,7 +4342,7 @@ static const union AnimCmd sAnim_SHELGON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_SALAMENCE_1[] =
+static const union AnimCmd sAnim_Salamence_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4350,7 +4352,7 @@ static const union AnimCmd sAnim_SALAMENCE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_BELDUM_1[] =
+static const union AnimCmd sAnim_Beldum_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4360,7 +4362,7 @@ static const union AnimCmd sAnim_BELDUM_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_METANG_1[] =
+static const union AnimCmd sAnim_Metang_1[] =
 {
     ANIMCMD_FRAME(0, 8),
     ANIMCMD_FRAME(1, 8),
@@ -4370,7 +4372,7 @@ static const union AnimCmd sAnim_METANG_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_METAGROSS_1[] =
+static const union AnimCmd sAnim_Metagross_1[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
@@ -4380,7 +4382,7 @@ static const union AnimCmd sAnim_METAGROSS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_REGIROCK_1[] =
+static const union AnimCmd sAnim_Regirock_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4390,7 +4392,7 @@ static const union AnimCmd sAnim_REGIROCK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_REGIROCK_2[] =
+static const union AnimCmd sAnim_Regirock_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4399,7 +4401,7 @@ static const union AnimCmd sAnim_REGIROCK_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_REGICE_1[] =
+static const union AnimCmd sAnim_Regice_1[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 15),
@@ -4409,7 +4411,7 @@ static const union AnimCmd sAnim_REGICE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_REGISTEEL_1[] =
+static const union AnimCmd sAnim_Registeel_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4419,7 +4421,7 @@ static const union AnimCmd sAnim_REGISTEEL_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_REGISTEEL_2[] =
+static const union AnimCmd sAnim_Registeel_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4428,7 +4430,7 @@ static const union AnimCmd sAnim_REGISTEEL_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KYOGRE_1[] =
+static const union AnimCmd sAnim_Kyogre_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4438,7 +4440,7 @@ static const union AnimCmd sAnim_KYOGRE_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_KYOGRE_2[] =
+static const union AnimCmd sAnim_Kyogre_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4447,7 +4449,7 @@ static const union AnimCmd sAnim_KYOGRE_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GROUDON_1[] =
+static const union AnimCmd sAnim_Groudon_1[] =
 {
     ANIMCMD_FRAME(0, 11),
     ANIMCMD_FRAME(1, 10),
@@ -4457,7 +4459,7 @@ static const union AnimCmd sAnim_GROUDON_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_GROUDON_2[] =
+static const union AnimCmd sAnim_Groudon_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4466,7 +4468,7 @@ static const union AnimCmd sAnim_GROUDON_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RAYQUAZA_1[] =
+static const union AnimCmd sAnim_Rayquaza_1[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_FRAME(1, 8),
@@ -4476,7 +4478,7 @@ static const union AnimCmd sAnim_RAYQUAZA_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_RAYQUAZA_2[] =
+static const union AnimCmd sAnim_Rayquaza_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4485,7 +4487,7 @@ static const union AnimCmd sAnim_RAYQUAZA_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LATIAS_1[] =
+static const union AnimCmd sAnim_Latias_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4495,7 +4497,7 @@ static const union AnimCmd sAnim_LATIAS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LATIAS_2[] =
+static const union AnimCmd sAnim_Latias_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4504,7 +4506,7 @@ static const union AnimCmd sAnim_LATIAS_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LATIOS_1[] =
+static const union AnimCmd sAnim_Latios_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4514,7 +4516,7 @@ static const union AnimCmd sAnim_LATIOS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_LATIOS_2[] =
+static const union AnimCmd sAnim_Latios_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4523,7 +4525,7 @@ static const union AnimCmd sAnim_LATIOS_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_JIRACHI_1[] =
+static const union AnimCmd sAnim_Jirachi_1[] =
 {
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(1, 10),
@@ -4538,7 +4540,7 @@ static const union AnimCmd sAnim_JIRACHI_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_JIRACHI_2[] =
+static const union AnimCmd sAnim_Jirachi_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4547,7 +4549,7 @@ static const union AnimCmd sAnim_JIRACHI_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DEOXYS_1[] =
+static const union AnimCmd sAnim_Deoxys_1[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
@@ -4557,7 +4559,7 @@ static const union AnimCmd sAnim_DEOXYS_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_DEOXYS_2[] =
+static const union AnimCmd sAnim_Deoxys_2[] =
 {
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(2, 20),
@@ -4566,7 +4568,7 @@ static const union AnimCmd sAnim_DEOXYS_2[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_CHIMECHO_1[] =
+static const union AnimCmd sAnim_Chimecho_1[] =
 {
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -4580,7 +4582,7 @@ static const union AnimCmd sAnim_CHIMECHO_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_EGG_1[] =
+static const union AnimCmd sAnim_Egg_1[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -4589,7 +4591,7 @@ static const union AnimCmd sAnim_EGG_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_B_1[] =
+static const union AnimCmd sAnim_UnownB_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4597,7 +4599,7 @@ static const union AnimCmd sAnim_UNOWN_B_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_C_1[] =
+static const union AnimCmd sAnim_UnownC_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4605,7 +4607,7 @@ static const union AnimCmd sAnim_UNOWN_C_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_D_1[] =
+static const union AnimCmd sAnim_UnownD_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4613,7 +4615,7 @@ static const union AnimCmd sAnim_UNOWN_D_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_E_1[] =
+static const union AnimCmd sAnim_UnownE_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4621,7 +4623,7 @@ static const union AnimCmd sAnim_UNOWN_E_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_F_1[] =
+static const union AnimCmd sAnim_UnownF_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4629,7 +4631,7 @@ static const union AnimCmd sAnim_UNOWN_F_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_G_1[] =
+static const union AnimCmd sAnim_UnownG_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4637,7 +4639,7 @@ static const union AnimCmd sAnim_UNOWN_G_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_H_1[] =
+static const union AnimCmd sAnim_UnownH_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4645,7 +4647,7 @@ static const union AnimCmd sAnim_UNOWN_H_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_I_1[] =
+static const union AnimCmd sAnim_UnownI_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4653,7 +4655,7 @@ static const union AnimCmd sAnim_UNOWN_I_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_J_1[] =
+static const union AnimCmd sAnim_UnownJ_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4661,7 +4663,7 @@ static const union AnimCmd sAnim_UNOWN_J_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_K_1[] =
+static const union AnimCmd sAnim_UnownK_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4669,7 +4671,7 @@ static const union AnimCmd sAnim_UNOWN_K_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_L_1[] =
+static const union AnimCmd sAnim_UnownL_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4677,7 +4679,7 @@ static const union AnimCmd sAnim_UNOWN_L_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_M_1[] =
+static const union AnimCmd sAnim_UnownM_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4685,7 +4687,7 @@ static const union AnimCmd sAnim_UNOWN_M_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_N_1[] =
+static const union AnimCmd sAnim_UnownN_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4693,7 +4695,7 @@ static const union AnimCmd sAnim_UNOWN_N_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_O_1[] =
+static const union AnimCmd sAnim_UnownO_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4701,7 +4703,7 @@ static const union AnimCmd sAnim_UNOWN_O_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_P_1[] =
+static const union AnimCmd sAnim_UnownP_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4709,7 +4711,7 @@ static const union AnimCmd sAnim_UNOWN_P_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_Q_1[] =
+static const union AnimCmd sAnim_UnownQ_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4717,7 +4719,7 @@ static const union AnimCmd sAnim_UNOWN_Q_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_R_1[] =
+static const union AnimCmd sAnim_UnownR_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4725,7 +4727,7 @@ static const union AnimCmd sAnim_UNOWN_R_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_S_1[] =
+static const union AnimCmd sAnim_UnownS_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4733,7 +4735,7 @@ static const union AnimCmd sAnim_UNOWN_S_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_T_1[] =
+static const union AnimCmd sAnim_UnownT_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4741,7 +4743,7 @@ static const union AnimCmd sAnim_UNOWN_T_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_U_1[] =
+static const union AnimCmd sAnim_UnownU_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4749,7 +4751,7 @@ static const union AnimCmd sAnim_UNOWN_U_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_V_1[] =
+static const union AnimCmd sAnim_UnownV_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4757,7 +4759,7 @@ static const union AnimCmd sAnim_UNOWN_V_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_W_1[] =
+static const union AnimCmd sAnim_UnownW_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4765,7 +4767,7 @@ static const union AnimCmd sAnim_UNOWN_W_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_X_1[] =
+static const union AnimCmd sAnim_UnownX_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4773,7 +4775,7 @@ static const union AnimCmd sAnim_UNOWN_X_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_Y_1[] =
+static const union AnimCmd sAnim_UnownY_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4781,7 +4783,7 @@ static const union AnimCmd sAnim_UNOWN_Y_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_Z_1[] =
+static const union AnimCmd sAnim_UnownZ_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4789,7 +4791,7 @@ static const union AnimCmd sAnim_UNOWN_Z_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_EMARK_1[] =
+static const union AnimCmd sAnim_UnownEMark_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4797,7 +4799,7 @@ static const union AnimCmd sAnim_UNOWN_EMARK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd sAnim_UNOWN_QMARK_1[] =
+static const union AnimCmd sAnim_UnownQMark_1[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_FRAME(1, 30),
@@ -4805,2592 +4807,892 @@ static const union AnimCmd sAnim_UNOWN_QMARK_1[] =
     ANIMCMD_END,
 };
 
-static const union AnimCmd *const sAnims_NONE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NONE_1,
-};
-
-static const union AnimCmd *const sAnims_BULBASAUR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BULBASAUR_1,
-};
-
-static const union AnimCmd *const sAnims_IVYSAUR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_IVYSAUR_1,
-};
-
-static const union AnimCmd *const sAnims_VENUSAUR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_VENUSAUR_1,
-};
-
-static const union AnimCmd *const sAnims_CHARMANDER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CHARMANDER_1,
-};
-
-static const union AnimCmd *const sAnims_CHARMELEON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CHARMELEON_1,
-};
-
-static const union AnimCmd *const sAnims_CHARIZARD[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CHARIZARD_1,
-};
-
-static const union AnimCmd *const sAnims_SQUIRTLE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SQUIRTLE_1,
-};
-
-static const union AnimCmd *const sAnims_WARTORTLE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WARTORTLE_1,
-};
-
-static const union AnimCmd *const sAnims_BLASTOISE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BLASTOISE_1,
-};
-
-static const union AnimCmd *const sAnims_CATERPIE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CATERPIE_1,
-};
-
-static const union AnimCmd *const sAnims_METAPOD[] ={
-    sAnim_GeneralFrame0,
-    sAnim_METAPOD_1,
-};
-
-static const union AnimCmd *const sAnims_BUTTERFREE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BUTTERFREE_1,
-};
-
-static const union AnimCmd *const sAnims_WEEDLE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WEEDLE_1,
-};
-
-static const union AnimCmd *const sAnims_KAKUNA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KAKUNA_1,
-};
-
-static const union AnimCmd *const sAnims_BEEDRILL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BEEDRILL_1,
-};
-
-static const union AnimCmd *const sAnims_PIDGEY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PIDGEY_1,
-};
-
-static const union AnimCmd *const sAnims_PIDGEOTTO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PIDGEOTTO_1,
-};
-
-static const union AnimCmd *const sAnims_PIDGEOT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PIDGEOT_1,
-};
-
-static const union AnimCmd *const sAnims_RATTATA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_RATTATA_1,
-};
-
-static const union AnimCmd *const sAnims_RATICATE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_RATICATE_1,
-};
-
-static const union AnimCmd *const sAnims_SPEAROW[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SPEAROW_1,
-};
-
-static const union AnimCmd *const sAnims_FEAROW[] ={
-    sAnim_GeneralFrame0,
-    sAnim_FEAROW_1,
-};
-
-static const union AnimCmd *const sAnims_EKANS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_EKANS_1,
-};
-
-static const union AnimCmd *const sAnims_ARBOK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ARBOK_1,
-};
-
-static const union AnimCmd *const sAnims_PIKACHU[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PIKACHU_1,
-    sAnim_PIKACHU_2,
-};
-
-static const union AnimCmd *const sAnims_RAICHU[] ={
-    sAnim_GeneralFrame0,
-    sAnim_RAICHU_1,
-    sAnim_RAICHU_2,
-};
-
-static const union AnimCmd *const sAnims_SANDSHREW[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SANDSHREW_1,
-    sAnim_SANDSHREW_2,
-};
-
-static const union AnimCmd *const sAnims_SANDSLASH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SANDSLASH_1,
-    sAnim_SANDSLASH_2,
-};
-
-static const union AnimCmd *const sAnims_NIDORAN_F[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NIDORAN_F_1,
-};
-
-static const union AnimCmd *const sAnims_NIDORINA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NIDORINA_1,
-};
-
-static const union AnimCmd *const sAnims_NIDOQUEEN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NIDOQUEEN_1,
-};
-
-static const union AnimCmd *const sAnims_NIDORAN_M[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NIDORAN_M_1,
-};
-
-static const union AnimCmd *const sAnims_NIDORINO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NIDORINO_1,
-};
-
-static const union AnimCmd *const sAnims_NIDOKING[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NIDOKING_1,
-};
-
-static const union AnimCmd *const sAnims_CLEFAIRY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CLEFAIRY_1,
-};
-
-static const union AnimCmd *const sAnims_CLEFABLE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CLEFABLE_1,
-};
-
-static const union AnimCmd *const sAnims_VULPIX[] ={
-    sAnim_GeneralFrame0,
-    sAnim_VULPIX_1,
-    sAnim_VULPIX_2,
-};
-
-static const union AnimCmd *const sAnims_NINETALES[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NINETALES_1,
-    sAnim_NINETALES_2,
-};
-
-static const union AnimCmd *const sAnims_JIGGLYPUFF[] ={
-    sAnim_GeneralFrame0,
-    sAnim_JIGGLYPUFF_1,
-    sAnim_JIGGLYPUFF_2,
-};
-
-static const union AnimCmd *const sAnims_WIGGLYTUFF[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WIGGLYTUFF_1,
-    sAnim_WIGGLYTUFF_2,
-};
-
-static const union AnimCmd *const sAnims_ZUBAT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ZUBAT_1,
-};
-
-static const union AnimCmd *const sAnims_GOLBAT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GOLBAT_1,
-};
-
-static const union AnimCmd *const sAnims_ODDISH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ODDISH_1,
-};
-
-static const union AnimCmd *const sAnims_GLOOM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GLOOM_1,
-};
-
-static const union AnimCmd *const sAnims_VILEPLUME[] ={
-    sAnim_GeneralFrame0,
-    sAnim_VILEPLUME_1,
-};
-
-static const union AnimCmd *const sAnims_PARAS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PARAS_1,
-};
-
-static const union AnimCmd *const sAnims_PARASECT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PARASECT_1,
-};
-
-static const union AnimCmd *const sAnims_VENONAT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_VENONAT_1,
-};
-
-static const union AnimCmd *const sAnims_VENOMOTH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_VENOMOTH_1,
-};
-
-static const union AnimCmd *const sAnims_DIGLETT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DIGLETT_1,
-};
-
-static const union AnimCmd *const sAnims_DUGTRIO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DUGTRIO_1,
-};
-
-static const union AnimCmd *const sAnims_MEOWTH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MEOWTH_1,
-};
-
-static const union AnimCmd *const sAnims_PERSIAN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PERSIAN_1,
-};
-
-static const union AnimCmd *const sAnims_PSYDUCK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PSYDUCK_1,
-    sAnim_PSYDUCK_2,
-};
-
-static const union AnimCmd *const sAnims_GOLDUCK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GOLDUCK_1,
-    sAnim_GOLDUCK_2,
-};
-
-static const union AnimCmd *const sAnims_MANKEY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MANKEY_1,
-};
-
-static const union AnimCmd *const sAnims_PRIMEAPE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PRIMEAPE_1,
-};
-
-static const union AnimCmd *const sAnims_GROWLITHE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GROWLITHE_1,
-};
-
-static const union AnimCmd *const sAnims_ARCANINE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ARCANINE_1,
-};
-
-static const union AnimCmd *const sAnims_POLIWAG[] ={
-    sAnim_GeneralFrame0,
-    sAnim_POLIWAG_1,
-};
-
-static const union AnimCmd *const sAnims_POLIWHIRL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_POLIWHIRL_1,
-};
-
-static const union AnimCmd *const sAnims_POLIWRATH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_POLIWRATH_1,
-};
-
-static const union AnimCmd *const sAnims_ABRA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ABRA_1,
-};
-
-static const union AnimCmd *const sAnims_KADABRA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KADABRA_1,
-};
-
-static const union AnimCmd *const sAnims_ALAKAZAM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ALAKAZAM_1,
-};
-
-static const union AnimCmd *const sAnims_MACHOP[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MACHOP_1,
-};
-
-static const union AnimCmd *const sAnims_MACHOKE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MACHOKE_1,
-};
-
-static const union AnimCmd *const sAnims_MACHAMP[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MACHAMP_1,
-};
-
-static const union AnimCmd *const sAnims_BELLSPROUT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BELLSPROUT_1,
-};
-
-static const union AnimCmd *const sAnims_WEEPINBELL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WEEPINBELL_1,
-};
-
-static const union AnimCmd *const sAnims_VICTREEBEL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_VICTREEBEL_1,
-};
-
-static const union AnimCmd *const sAnims_TENTACOOL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TENTACOOL_1,
-};
-
-static const union AnimCmd *const sAnims_TENTACRUEL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TENTACRUEL_1,
-};
-
-static const union AnimCmd *const sAnims_GEODUDE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GEODUDE_1,
-};
-
-static const union AnimCmd *const sAnims_GRAVELER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GRAVELER_1,
-};
-
-static const union AnimCmd *const sAnims_GOLEM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GOLEM_1,
-};
-
-static const union AnimCmd *const sAnims_PONYTA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PONYTA_1,
-};
-
-static const union AnimCmd *const sAnims_RAPIDASH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_RAPIDASH_1,
-};
-
-static const union AnimCmd *const sAnims_SLOWPOKE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SLOWPOKE_1,
-};
-
-static const union AnimCmd *const sAnims_SLOWBRO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SLOWBRO_1,
-};
-
-static const union AnimCmd *const sAnims_MAGNEMITE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MAGNEMITE_1,
-};
-
-static const union AnimCmd *const sAnims_MAGNETON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MAGNETON_1,
-};
-
-static const union AnimCmd *const sAnims_FARFETCHD[] ={
-    sAnim_GeneralFrame0,
-    sAnim_FARFETCHD_1,
-};
-
-static const union AnimCmd *const sAnims_DODUO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DODUO_1,
-};
-
-static const union AnimCmd *const sAnims_DODRIO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DODRIO_1,
-};
-
-static const union AnimCmd *const sAnims_SEEL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SEEL_1,
-};
-
-static const union AnimCmd *const sAnims_DEWGONG[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DEWGONG_1,
-};
-
-static const union AnimCmd *const sAnims_GRIMER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GRIMER_1,
-    sAnim_GRIMER_2,
-};
-
-static const union AnimCmd *const sAnims_MUK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MUK_1,
-    sAnim_MUK_2,
-};
-
-static const union AnimCmd *const sAnims_SHELLDER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SHELLDER_1,
-};
-
-static const union AnimCmd *const sAnims_CLOYSTER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CLOYSTER_1,
-};
-
-static const union AnimCmd *const sAnims_GASTLY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GASTLY_1,
-};
-
-static const union AnimCmd *const sAnims_HAUNTER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HAUNTER_1,
-};
-
-static const union AnimCmd *const sAnims_GENGAR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GENGAR_1,
-};
-
-static const union AnimCmd *const sAnims_ONIX[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ONIX_1,
-};
-
-static const union AnimCmd *const sAnims_DROWZEE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DROWZEE_1,
-};
-
-static const union AnimCmd *const sAnims_HYPNO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HYPNO_1,
-};
-
-static const union AnimCmd *const sAnims_KRABBY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KRABBY_1,
-};
-
-static const union AnimCmd *const sAnims_KINGLER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KINGLER_1,
-};
-
-static const union AnimCmd *const sAnims_VOLTORB[] ={
-    sAnim_GeneralFrame0,
-    sAnim_VOLTORB_1,
-};
-
-static const union AnimCmd *const sAnims_ELECTRODE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ELECTRODE_1,
-};
-
-static const union AnimCmd *const sAnims_EXEGGCUTE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_EXEGGCUTE_1,
-};
-
-static const union AnimCmd *const sAnims_EXEGGUTOR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_EXEGGUTOR_1,
-};
-
-static const union AnimCmd *const sAnims_CUBONE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CUBONE_1,
-};
-
-static const union AnimCmd *const sAnims_MAROWAK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MAROWAK_1,
-};
-
-static const union AnimCmd *const sAnims_HITMONLEE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HITMONLEE_1,
-};
-
-static const union AnimCmd *const sAnims_HITMONCHAN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HITMONCHAN_1,
-};
-
-static const union AnimCmd *const sAnims_LICKITUNG[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LICKITUNG_1,
-};
-
-static const union AnimCmd *const sAnims_KOFFING[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KOFFING_1,
-    sAnim_KOFFING_2,
-};
-
-static const union AnimCmd *const sAnims_WEEZING[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WEEZING_1,
-    sAnim_WEEZING_2,
-};
-
-static const union AnimCmd *const sAnims_RHYHORN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_RHYHORN_1,
-    sAnim_RHYHORN_2,
-};
-
-static const union AnimCmd *const sAnims_RHYDON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_RHYDON_1,
-    sAnim_RHYDON_2,
-};
-
-static const union AnimCmd *const sAnims_CHANSEY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CHANSEY_1,
-};
-
-static const union AnimCmd *const sAnims_TANGELA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TANGELA_1,
-};
-
-static const union AnimCmd *const sAnims_KANGASKHAN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KANGASKHAN_1,
-};
-
-static const union AnimCmd *const sAnims_HORSEA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HORSEA_1,
-    sAnim_HORSEA_2,
-};
-
-static const union AnimCmd *const sAnims_SEADRA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SEADRA_1,
-    sAnim_SEADRA_2,
-};
-
-static const union AnimCmd *const sAnims_GOLDEEN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GOLDEEN_1,
-};
-
-static const union AnimCmd *const sAnims_SEAKING[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SEAKING_1,
-};
-
-static const union AnimCmd *const sAnims_STARYU[] ={
-    sAnim_GeneralFrame0,
-    sAnim_STARYU_1,
-    sAnim_STARYU_2,
-};
-
-static const union AnimCmd *const sAnims_STARMIE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_STARMIE_1,
-    sAnim_STARMIE_2,
-};
-
-static const union AnimCmd *const sAnims_MR_MIME[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MR_MIME_1,
-};
-
-static const union AnimCmd *const sAnims_SCYTHER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SCYTHER_1,
-};
-
-static const union AnimCmd *const sAnims_JYNX[] ={
-    sAnim_GeneralFrame0,
-    sAnim_JYNX_1,
-};
-
-static const union AnimCmd *const sAnims_ELECTABUZZ[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ELECTABUZZ_1,
-};
-
-static const union AnimCmd *const sAnims_MAGMAR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MAGMAR_1,
-};
-
-static const union AnimCmd *const sAnims_PINSIR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PINSIR_1,
-    sAnim_PINSIR_2,
-};
-
-static const union AnimCmd *const sAnims_TAUROS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TAUROS_1,
-};
-
-static const union AnimCmd *const sAnims_MAGIKARP[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MAGIKARP_1,
-};
-
-static const union AnimCmd *const sAnims_GYARADOS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GYARADOS_1,
-};
-
-static const union AnimCmd *const sAnims_LAPRAS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LAPRAS_1,
-};
-
-static const union AnimCmd *const sAnims_DITTO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DITTO_1,
-};
-
-static const union AnimCmd *const sAnims_EEVEE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_EEVEE_1,
-};
-
-static const union AnimCmd *const sAnims_VAPOREON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_VAPOREON_1,
-};
-
-static const union AnimCmd *const sAnims_JOLTEON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_JOLTEON_1,
-};
-
-static const union AnimCmd *const sAnims_FLAREON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_FLAREON_1,
-};
-
-static const union AnimCmd *const sAnims_PORYGON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PORYGON_1,
-};
-
-static const union AnimCmd *const sAnims_OMANYTE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_OMANYTE_1,
-};
-
-static const union AnimCmd *const sAnims_OMASTAR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_OMASTAR_1,
-};
-
-static const union AnimCmd *const sAnims_KABUTO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KABUTO_1,
-};
-
-static const union AnimCmd *const sAnims_KABUTOPS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KABUTOPS_1,
-};
-
-static const union AnimCmd *const sAnims_AERODACTYL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_AERODACTYL_1,
-};
-
-static const union AnimCmd *const sAnims_SNORLAX[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SNORLAX_1,
-};
-
-static const union AnimCmd *const sAnims_ARTICUNO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ARTICUNO_1,
-};
-
-static const union AnimCmd *const sAnims_ZAPDOS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ZAPDOS_1,
-};
-
-static const union AnimCmd *const sAnims_MOLTRES[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MOLTRES_1,
-};
-
-static const union AnimCmd *const sAnims_DRATINI[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DRATINI_1,
-};
-
-static const union AnimCmd *const sAnims_DRAGONAIR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DRAGONAIR_1,
-};
-
-static const union AnimCmd *const sAnims_DRAGONITE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DRAGONITE_1,
-};
-
-static const union AnimCmd *const sAnims_MEWTWO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MEWTWO_1,
-};
-
-static const union AnimCmd *const sAnims_MEW[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MEW_1,
-};
-
-static const union AnimCmd *const sAnims_CHIKORITA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CHIKORITA_1,
-};
-
-static const union AnimCmd *const sAnims_BAYLEEF[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BAYLEEF_1,
-};
-
-static const union AnimCmd *const sAnims_MEGANIUM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MEGANIUM_1,
-};
-
-static const union AnimCmd *const sAnims_CYNDAQUIL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CYNDAQUIL_1,
-};
-
-static const union AnimCmd *const sAnims_QUILAVA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_QUILAVA_1,
-};
-
-static const union AnimCmd *const sAnims_TYPHLOSION[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TYPHLOSION_1,
-};
-
-static const union AnimCmd *const sAnims_TOTODILE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TOTODILE_1,
-};
-
-static const union AnimCmd *const sAnims_CROCONAW[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CROCONAW_1,
-};
-
-static const union AnimCmd *const sAnims_FERALIGATR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_FERALIGATR_1,
-};
-
-static const union AnimCmd *const sAnims_SENTRET[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SENTRET_1,
-};
-
-static const union AnimCmd *const sAnims_FURRET[] ={
-    sAnim_GeneralFrame0,
-    sAnim_FURRET_1,
-};
-
-static const union AnimCmd *const sAnims_HOOTHOOT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HOOTHOOT_1,
-};
-
-static const union AnimCmd *const sAnims_NOCTOWL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NOCTOWL_1,
-};
-
-static const union AnimCmd *const sAnims_LEDYBA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LEDYBA_1,
-};
-
-static const union AnimCmd *const sAnims_LEDIAN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LEDIAN_1,
-};
-
-static const union AnimCmd *const sAnims_SPINARAK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SPINARAK_1,
-};
-
-static const union AnimCmd *const sAnims_ARIADOS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ARIADOS_1,
-};
-
-static const union AnimCmd *const sAnims_CROBAT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CROBAT_1,
-};
-
-static const union AnimCmd *const sAnims_CHINCHOU[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CHINCHOU_1,
-    sAnim_CHINCHOU_2,
-};
-
-static const union AnimCmd *const sAnims_LANTURN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LANTURN_1,
-    sAnim_LANTURN_2,
-};
-
-static const union AnimCmd *const sAnims_PICHU[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PICHU_1,
-    sAnim_PICHU_2,
-};
-
-static const union AnimCmd *const sAnims_CLEFFA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CLEFFA_1,
-};
-
-static const union AnimCmd *const sAnims_IGGLYBUFF[] ={
-    sAnim_GeneralFrame0,
-    sAnim_IGGLYBUFF_1,
-    sAnim_IGGLYBUFF_2,
-};
-
-static const union AnimCmd *const sAnims_TOGEPI[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TOGEPI_1,
-};
-
-static const union AnimCmd *const sAnims_TOGETIC[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TOGETIC_1,
-};
-
-static const union AnimCmd *const sAnims_NATU[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NATU_1,
-    sAnim_NATU_2,
-};
-
-static const union AnimCmd *const sAnims_XATU[] ={
-    sAnim_GeneralFrame0,
-    sAnim_XATU_1,
-    sAnim_XATU_2,
-};
-
-static const union AnimCmd *const sAnims_MAREEP[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MAREEP_1,
-};
-
-static const union AnimCmd *const sAnims_FLAAFFY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_FLAAFFY_1,
-};
-
-static const union AnimCmd *const sAnims_AMPHAROS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_AMPHAROS_1,
-};
-
-static const union AnimCmd *const sAnims_BELLOSSOM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BELLOSSOM_1,
-};
-
-static const union AnimCmd *const sAnims_MARILL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MARILL_1,
-};
-
-static const union AnimCmd *const sAnims_AZUMARILL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_AZUMARILL_1,
-};
-
-static const union AnimCmd *const sAnims_SUDOWOODO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SUDOWOODO_1,
-};
-
-static const union AnimCmd *const sAnims_POLITOED[] ={
-    sAnim_GeneralFrame0,
-    sAnim_POLITOED_1,
-};
-
-static const union AnimCmd *const sAnims_HOPPIP[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HOPPIP_1,
-};
-
-static const union AnimCmd *const sAnims_SKIPLOOM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SKIPLOOM_1,
-};
-
-static const union AnimCmd *const sAnims_JUMPLUFF[] ={
-    sAnim_GeneralFrame0,
-    sAnim_JUMPLUFF_1,
-};
-
-static const union AnimCmd *const sAnims_AIPOM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_AIPOM_1,
-};
-
-static const union AnimCmd *const sAnims_SUNKERN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SUNKERN_1,
-};
-
-static const union AnimCmd *const sAnims_SUNFLORA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SUNFLORA_1,
-};
-
-static const union AnimCmd *const sAnims_YANMA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_YANMA_1,
-};
-
-static const union AnimCmd *const sAnims_WOOPER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WOOPER_1,
-};
-
-static const union AnimCmd *const sAnims_QUAGSIRE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_QUAGSIRE_1,
-};
-
-static const union AnimCmd *const sAnims_ESPEON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ESPEON_1,
-};
-
-static const union AnimCmd *const sAnims_UMBREON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UMBREON_1,
-};
-
-static const union AnimCmd *const sAnims_MURKROW[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MURKROW_1,
-};
-
-static const union AnimCmd *const sAnims_SLOWKING[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SLOWKING_1,
-};
-
-static const union AnimCmd *const sAnims_MISDREAVUS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MISDREAVUS_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_1,
-};
-
-static const union AnimCmd *const sAnims_WOBBUFFET[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WOBBUFFET_1,
-    sAnim_WOBBUFFET_2,
-};
-
-static const union AnimCmd *const sAnims_GIRAFARIG[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GIRAFARIG_1,
-    sAnim_GIRAFARIG_2,
-};
-
-static const union AnimCmd *const sAnims_PINECO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PINECO_1,
-};
-
-static const union AnimCmd *const sAnims_FORRETRESS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_FORRETRESS_1,
-};
-
-static const union AnimCmd *const sAnims_DUNSPARCE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DUNSPARCE_1,
-};
-
-static const union AnimCmd *const sAnims_GLIGAR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GLIGAR_1,
-};
-
-static const union AnimCmd *const sAnims_STEELIX[] ={
-    sAnim_GeneralFrame0,
-    sAnim_STEELIX_1,
-};
-
-static const union AnimCmd *const sAnims_SNUBBULL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SNUBBULL_1,
-};
-
-static const union AnimCmd *const sAnims_GRANBULL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GRANBULL_1,
-};
-
-static const union AnimCmd *const sAnims_QWILFISH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_QWILFISH_1,
-};
-
-static const union AnimCmd *const sAnims_SCIZOR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SCIZOR_1,
-};
-
-static const union AnimCmd *const sAnims_SHUCKLE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SHUCKLE_1,
-};
-
-static const union AnimCmd *const sAnims_HERACROSS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HERACROSS_1,
-    sAnim_HERACROSS_2,
-};
-
-static const union AnimCmd *const sAnims_SNEASEL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SNEASEL_1,
-};
-
-static const union AnimCmd *const sAnims_TEDDIURSA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TEDDIURSA_1,
-};
-
-static const union AnimCmd *const sAnims_URSARING[] ={
-    sAnim_GeneralFrame0,
-    sAnim_URSARING_1,
-};
-
-static const union AnimCmd *const sAnims_SLUGMA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SLUGMA_1,
-    sAnim_SLUGMA_2,
-};
-
-static const union AnimCmd *const sAnims_MAGCARGO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MAGCARGO_1,
-    sAnim_MAGCARGO_2,
-};
-
-static const union AnimCmd *const sAnims_SWINUB[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SWINUB_1,
-};
-
-static const union AnimCmd *const sAnims_PILOSWINE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PILOSWINE_1,
-};
-
-static const union AnimCmd *const sAnims_CORSOLA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CORSOLA_1,
-    sAnim_CORSOLA_2,
-};
-
-static const union AnimCmd *const sAnims_REMORAID[] ={
-    sAnim_GeneralFrame0,
-    sAnim_REMORAID_1,
-};
-
-static const union AnimCmd *const sAnims_OCTILLERY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_OCTILLERY_1,
-};
-
-static const union AnimCmd *const sAnims_DELIBIRD[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DELIBIRD_1,
-};
-
-static const union AnimCmd *const sAnims_MANTINE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MANTINE_1,
-};
-
-static const union AnimCmd *const sAnims_SKARMORY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SKARMORY_1,
-    sAnim_SKARMORY_2,
-};
-
-static const union AnimCmd *const sAnims_HOUNDOUR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HOUNDOUR_1,
-};
-
-static const union AnimCmd *const sAnims_HOUNDOOM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HOUNDOOM_1,
-};
-
-static const union AnimCmd *const sAnims_KINGDRA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KINGDRA_1,
-    sAnim_KINGDRA_2,
-};
-
-static const union AnimCmd *const sAnims_PHANPY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PHANPY_1,
-    sAnim_PHANPY_2,
-};
-
-static const union AnimCmd *const sAnims_DONPHAN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DONPHAN_1,
-    sAnim_DONPHAN_2,
-};
-
-static const union AnimCmd *const sAnims_PORYGON2[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PORYGON2_1,
-};
-
-static const union AnimCmd *const sAnims_STANTLER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_STANTLER_1,
-};
-
-static const union AnimCmd *const sAnims_SMEARGLE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SMEARGLE_1,
-};
-
-static const union AnimCmd *const sAnims_TYROGUE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TYROGUE_1,
-};
-
-static const union AnimCmd *const sAnims_HITMONTOP[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HITMONTOP_1,
-};
-
-static const union AnimCmd *const sAnims_SMOOCHUM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SMOOCHUM_1,
-};
-
-static const union AnimCmd *const sAnims_ELEKID[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ELEKID_1,
-};
-
-static const union AnimCmd *const sAnims_MAGBY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MAGBY_1,
-};
-
-static const union AnimCmd *const sAnims_MILTANK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MILTANK_1,
-};
-
-static const union AnimCmd *const sAnims_BLISSEY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BLISSEY_1,
-};
-
-static const union AnimCmd *const sAnims_RAIKOU[] ={
-    sAnim_GeneralFrame0,
-    sAnim_RAIKOU_1,
-};
-
-static const union AnimCmd *const sAnims_ENTEI[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ENTEI_1,
-};
-
-static const union AnimCmd *const sAnims_SUICUNE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SUICUNE_1,
-};
-
-static const union AnimCmd *const sAnims_LARVITAR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LARVITAR_1,
-};
-
-static const union AnimCmd *const sAnims_PUPITAR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PUPITAR_1,
-};
-
-static const union AnimCmd *const sAnims_TYRANITAR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TYRANITAR_1,
-};
-
-static const union AnimCmd *const sAnims_LUGIA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LUGIA_1,
-};
-
-static const union AnimCmd *const sAnims_HO_OH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HO_OH_1,
-};
-
-static const union AnimCmd *const sAnims_CELEBI[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CELEBI_1,
-};
-
-static const union AnimCmd *const sAnims_OLD_UNOWN_B[] ={
-    sAnim_GeneralFrame0,
-    sAnim_OLD_UNOWN_B_1,
-};
-
-static const union AnimCmd *const sAnims_TREECKO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TREECKO_1,
-};
-
-static const union AnimCmd *const sAnims_GROVYLE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GROVYLE_1,
-};
-
-static const union AnimCmd *const sAnims_SCEPTILE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SCEPTILE_1,
-};
-
-static const union AnimCmd *const sAnims_TORCHIC[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TORCHIC_1,
-};
-
-static const union AnimCmd *const sAnims_COMBUSKEN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_COMBUSKEN_1,
-};
-
-static const union AnimCmd *const sAnims_BLAZIKEN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BLAZIKEN_1,
-    sAnim_BLAZIKEN_2,
-    sAnim_BLAZIKEN_3,
-    sAnim_BLAZIKEN_4,
-};
-
-static const union AnimCmd *const sAnims_MUDKIP[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MUDKIP_1,
-};
-
-static const union AnimCmd *const sAnims_MARSHTOMP[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MARSHTOMP_1,
-};
-
-static const union AnimCmd *const sAnims_SWAMPERT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SWAMPERT_1,
-};
-
-static const union AnimCmd *const sAnims_POOCHYENA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_POOCHYENA_1,
-};
-
-static const union AnimCmd *const sAnims_MIGHTYENA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MIGHTYENA_1,
-};
-
-static const union AnimCmd *const sAnims_ZIGZAGOON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ZIGZAGOON_1,
-};
-
-static const union AnimCmd *const sAnims_LINOONE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LINOONE_1,
-};
-
-static const union AnimCmd *const sAnims_WURMPLE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WURMPLE_1,
-};
-
-static const union AnimCmd *const sAnims_SILCOON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SILCOON_1,
-    sAnim_SILCOON_2,
-};
-
-static const union AnimCmd *const sAnims_BEAUTIFLY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BEAUTIFLY_1,
-    sAnim_BEAUTIFLY_2,
-};
-
-static const union AnimCmd *const sAnims_CASCOON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CASCOON_1,
-    sAnim_CASCOON_2,
-};
-
-static const union AnimCmd *const sAnims_DUSTOX[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DUSTOX_1,
-    sAnim_DUSTOX_2,
-};
-
-static const union AnimCmd *const sAnims_LOTAD[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LOTAD_1,
-};
-
-static const union AnimCmd *const sAnims_LOMBRE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LOMBRE_1,
-};
-
-static const union AnimCmd *const sAnims_LUDICOLO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LUDICOLO_1,
-};
-
-static const union AnimCmd *const sAnims_SEEDOT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SEEDOT_1,
-};
-
-static const union AnimCmd *const sAnims_NUZLEAF[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NUZLEAF_1,
-};
-
-static const union AnimCmd *const sAnims_SHIFTRY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SHIFTRY_1,
-};
-
-static const union AnimCmd *const sAnims_NINCADA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NINCADA_1,
-};
-
-static const union AnimCmd *const sAnims_NINJASK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NINJASK_1,
-};
-
-static const union AnimCmd *const sAnims_SHEDINJA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SHEDINJA_1,
-};
-
-static const union AnimCmd *const sAnims_TAILLOW[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TAILLOW_1,
-};
-
-static const union AnimCmd *const sAnims_SWELLOW[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SWELLOW_1,
-};
-
-static const union AnimCmd *const sAnims_SHROOMISH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SHROOMISH_1,
-};
-
-static const union AnimCmd *const sAnims_BRELOOM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BRELOOM_1,
-};
-
-static const union AnimCmd *const sAnims_SPINDA[] ={
-    sAnim_GeneralFrame0,
-};
-
-static const union AnimCmd *const sAnims_WINGULL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WINGULL_1,
-};
-
-static const union AnimCmd *const sAnims_PELIPPER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PELIPPER_1,
-};
-
-static const union AnimCmd *const sAnims_SURSKIT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SURSKIT_1,
-    sAnim_SURSKIT_2,
-};
-
-static const union AnimCmd *const sAnims_MASQUERAIN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MASQUERAIN_1,
-    sAnim_MASQUERAIN_2,
-};
-
-static const union AnimCmd *const sAnims_WAILMER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WAILMER_1,
-};
-
-static const union AnimCmd *const sAnims_WAILORD[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WAILORD_1,
-};
-
-static const union AnimCmd *const sAnims_SKITTY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SKITTY_1,
-};
-
-static const union AnimCmd *const sAnims_DELCATTY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DELCATTY_1,
-};
-
-static const union AnimCmd *const sAnims_KECLEON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KECLEON_1,
-};
-
-static const union AnimCmd *const sAnims_BALTOY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BALTOY_1,
-};
-
-static const union AnimCmd *const sAnims_CLAYDOL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CLAYDOL_1,
-};
-
-static const union AnimCmd *const sAnims_NOSEPASS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NOSEPASS_1,
-};
-
-static const union AnimCmd *const sAnims_TORKOAL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TORKOAL_1,
-};
-
-static const union AnimCmd *const sAnims_SABLEYE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SABLEYE_1,
-};
-
-static const union AnimCmd *const sAnims_BARBOACH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BARBOACH_1,
-};
-
-static const union AnimCmd *const sAnims_WHISCASH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WHISCASH_1,
-};
-
-static const union AnimCmd *const sAnims_LUVDISC[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LUVDISC_1,
-};
-
-static const union AnimCmd *const sAnims_CORPHISH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CORPHISH_1,
-};
-
-static const union AnimCmd *const sAnims_CRAWDAUNT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CRAWDAUNT_1,
-};
-
-static const union AnimCmd *const sAnims_FEEBAS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_FEEBAS_1,
-};
-
-static const union AnimCmd *const sAnims_MILOTIC[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MILOTIC_1,
-};
-
-static const union AnimCmd *const sAnims_CARVANHA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CARVANHA_1,
-};
-
-static const union AnimCmd *const sAnims_SHARPEDO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SHARPEDO_1,
-};
-
-static const union AnimCmd *const sAnims_TRAPINCH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TRAPINCH_1,
-};
-
-static const union AnimCmd *const sAnims_VIBRAVA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_VIBRAVA_1,
-};
-
-static const union AnimCmd *const sAnims_FLYGON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_FLYGON_1,
-};
-
-static const union AnimCmd *const sAnims_MAKUHITA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MAKUHITA_1,
-};
-
-static const union AnimCmd *const sAnims_HARIYAMA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HARIYAMA_1,
-};
-
-static const union AnimCmd *const sAnims_ELECTRIKE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ELECTRIKE_1,
-};
-
-static const union AnimCmd *const sAnims_MANECTRIC[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MANECTRIC_1,
-};
-
-static const union AnimCmd *const sAnims_NUMEL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_NUMEL_1,
-};
-
-static const union AnimCmd *const sAnims_CAMERUPT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CAMERUPT_1,
-};
-
-static const union AnimCmd *const sAnims_SPHEAL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SPHEAL_1,
-};
-
-static const union AnimCmd *const sAnims_SEALEO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SEALEO_1,
-};
-
-static const union AnimCmd *const sAnims_WALREIN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WALREIN_1,
-};
-
-static const union AnimCmd *const sAnims_CACNEA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CACNEA_1,
-};
-
-static const union AnimCmd *const sAnims_CACTURNE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CACTURNE_1,
-};
-
-static const union AnimCmd *const sAnims_SNORUNT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SNORUNT_1,
-};
-
-static const union AnimCmd *const sAnims_GLALIE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GLALIE_1,
-};
-
-static const union AnimCmd *const sAnims_LUNATONE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LUNATONE_1,
-    sAnim_LUNATONE_2,
-};
-
-static const union AnimCmd *const sAnims_SOLROCK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SOLROCK_1,
-    sAnim_SOLROCK_2,
-};
-
-static const union AnimCmd *const sAnims_AZURILL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_AZURILL_1,
-};
-
-static const union AnimCmd *const sAnims_SPOINK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SPOINK_1,
-};
-
-static const union AnimCmd *const sAnims_GRUMPIG[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GRUMPIG_1,
-};
-
-static const union AnimCmd *const sAnims_PLUSLE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_PLUSLE_1,
-};
-
-static const union AnimCmd *const sAnims_MINUN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MINUN_1,
-};
-
-static const union AnimCmd *const sAnims_MAWILE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MAWILE_1,
-};
-
-static const union AnimCmd *const sAnims_MEDITITE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MEDITITE_1,
-};
-
-static const union AnimCmd *const sAnims_MEDICHAM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_MEDICHAM_1,
-};
-
-static const union AnimCmd *const sAnims_SWABLU[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SWABLU_1,
-    sAnim_SWABLU_2,
-};
-
-static const union AnimCmd *const sAnims_ALTARIA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ALTARIA_1,
-    sAnim_ALTARIA_2,
-};
-
-static const union AnimCmd *const sAnims_WYNAUT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WYNAUT_1,
-};
-
-static const union AnimCmd *const sAnims_DUSKULL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DUSKULL_1,
-};
-
-static const union AnimCmd *const sAnims_DUSCLOPS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DUSCLOPS_1,
-};
-
-static const union AnimCmd *const sAnims_ROSELIA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ROSELIA_1,
-};
-
-static const union AnimCmd *const sAnims_SLAKOTH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SLAKOTH_1,
-};
-
-static const union AnimCmd *const sAnims_VIGOROTH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_VIGOROTH_1,
-};
-
-static const union AnimCmd *const sAnims_SLAKING[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SLAKING_1,
-};
-
-static const union AnimCmd *const sAnims_GULPIN[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GULPIN_1,
-};
-
-static const union AnimCmd *const sAnims_SWALOT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SWALOT_1,
-};
-
-static const union AnimCmd *const sAnims_TROPIUS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_TROPIUS_1,
-};
-
-static const union AnimCmd *const sAnims_WHISMUR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_WHISMUR_1,
-};
-
-static const union AnimCmd *const sAnims_LOUDRED[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LOUDRED_1,
-};
-
-static const union AnimCmd *const sAnims_EXPLOUD[] ={
-    sAnim_GeneralFrame0,
-    sAnim_EXPLOUD_1,
-};
-
-static const union AnimCmd *const sAnims_CLAMPERL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CLAMPERL_1,
-};
-
-static const union AnimCmd *const sAnims_HUNTAIL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_HUNTAIL_1,
-};
-
-static const union AnimCmd *const sAnims_GOREBYSS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GOREBYSS_1,
-};
-
-static const union AnimCmd *const sAnims_ABSOL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ABSOL_1,
-};
-
-static const union AnimCmd *const sAnims_SHUPPET[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SHUPPET_1,
-};
-
-static const union AnimCmd *const sAnims_BANETTE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BANETTE_1,
-};
-
-static const union AnimCmd *const sAnims_SEVIPER[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SEVIPER_1,
-};
-
-static const union AnimCmd *const sAnims_ZANGOOSE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ZANGOOSE_1,
-};
-
-static const union AnimCmd *const sAnims_RELICANTH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_RELICANTH_1,
-};
-
-static const union AnimCmd *const sAnims_ARON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ARON_1,
-};
-
-static const union AnimCmd *const sAnims_LAIRON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LAIRON_1,
-};
-
-static const union AnimCmd *const sAnims_AGGRON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_AGGRON_1,
-};
-
-static const union AnimCmd *const sAnims_CASTFORM[] ={
-    sAnim_CASTFORM_0,
-    sAnim_CASTFORM_1,
-    sAnim_CASTFORM_2,
-    sAnim_CASTFORM_3,
-};
-
-static const union AnimCmd *const sAnims_VOLBEAT[] ={
-    sAnim_GeneralFrame0,
-    sAnim_VOLBEAT_1,
-};
-
-static const union AnimCmd *const sAnims_ILLUMISE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ILLUMISE_1,
-};
-
-static const union AnimCmd *const sAnims_LILEEP[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LILEEP_1,
-};
-
-static const union AnimCmd *const sAnims_CRADILY[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CRADILY_1,
-};
-
-static const union AnimCmd *const sAnims_ANORITH[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ANORITH_1,
-};
-
-static const union AnimCmd *const sAnims_ARMALDO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_ARMALDO_1,
-};
-
-static const union AnimCmd *const sAnims_RALTS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_RALTS_1,
-};
-
-static const union AnimCmd *const sAnims_KIRLIA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KIRLIA_1,
-};
-
-static const union AnimCmd *const sAnims_GARDEVOIR[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GARDEVOIR_1,
-};
-
-static const union AnimCmd *const sAnims_BAGON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BAGON_1,
-};
-
-static const union AnimCmd *const sAnims_SHELGON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SHELGON_1,
-};
-
-static const union AnimCmd *const sAnims_SALAMENCE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_SALAMENCE_1,
-};
-
-static const union AnimCmd *const sAnims_BELDUM[] ={
-    sAnim_GeneralFrame0,
-    sAnim_BELDUM_1,
-};
-
-static const union AnimCmd *const sAnims_METANG[] ={
-    sAnim_GeneralFrame0,
-    sAnim_METANG_1,
-};
-
-static const union AnimCmd *const sAnims_METAGROSS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_METAGROSS_1,
-};
-
-static const union AnimCmd *const sAnims_REGIROCK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_REGIROCK_1,
-    sAnim_REGIROCK_2,
-};
-
-static const union AnimCmd *const sAnims_REGICE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_REGICE_1,
-};
-
-static const union AnimCmd *const sAnims_REGISTEEL[] ={
-    sAnim_GeneralFrame0,
-    sAnim_REGISTEEL_1,
-    sAnim_REGISTEEL_2,
-};
-
-static const union AnimCmd *const sAnims_KYOGRE[] ={
-    sAnim_GeneralFrame0,
-    sAnim_KYOGRE_1,
-    sAnim_KYOGRE_2,
-};
-
-static const union AnimCmd *const sAnims_GROUDON[] ={
-    sAnim_GeneralFrame0,
-    sAnim_GROUDON_1,
-    sAnim_GROUDON_2,
-};
-
-static const union AnimCmd *const sAnims_RAYQUAZA[] ={
-    sAnim_GeneralFrame0,
-    sAnim_RAYQUAZA_1,
-    sAnim_RAYQUAZA_2,
-};
-
-static const union AnimCmd *const sAnims_LATIAS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LATIAS_1,
-    sAnim_LATIAS_2,
-};
-
-static const union AnimCmd *const sAnims_LATIOS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_LATIOS_1,
-    sAnim_LATIOS_2,
-};
-
-static const union AnimCmd *const sAnims_JIRACHI[] ={
-    sAnim_GeneralFrame0,
-    sAnim_JIRACHI_1,
-    sAnim_JIRACHI_2,
-};
-
-static const union AnimCmd *const sAnims_DEOXYS[] ={
-    sAnim_GeneralFrame0,
-    sAnim_DEOXYS_1,
-    sAnim_DEOXYS_2,
-};
-
-static const union AnimCmd *const sAnims_CHIMECHO[] ={
-    sAnim_GeneralFrame0,
-    sAnim_CHIMECHO_1,
-};
-
-static const union AnimCmd *const sAnims_EGG[] ={
-    sAnim_GeneralFrame0,
-    sAnim_EGG_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_B[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_B_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_C[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_C_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_D[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_D_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_E[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_E_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_F[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_F_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_G[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_G_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_H[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_H_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_I[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_I_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_J[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_J_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_K[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_K_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_L[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_L_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_M[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_M_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_N[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_N_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_O[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_O_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_P[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_P_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_Q[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_Q_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_R[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_R_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_S[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_S_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_T[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_T_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_U[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_U_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_V[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_V_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_W[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_W_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_X[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_X_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_Y[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_Y_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_Z[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_Z_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_EMARK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_EMARK_1,
-};
-
-static const union AnimCmd *const sAnims_UNOWN_QMARK[] ={
-    sAnim_GeneralFrame0,
-    sAnim_UNOWN_QMARK_1,
-};
-
-#define ANIM_CMD(name)             [SPECIES_##name] = sAnims_##name
-#define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims
+#define SINGLE_ANIMATION(name)                      \
+static const union AnimCmd *const sAnims_##name[] = \
+{                                                   \
+    sAnim_GeneralFrame0,                            \
+    sAnim_##name##_1,                               \
+}
+
+#define DOUBLE_ANIMATION(name)                      \
+static const union AnimCmd *const sAnims_##name[] = \
+{                                                   \
+    sAnim_GeneralFrame0,                            \
+    sAnim_##name##_1,                               \
+    sAnim_##name##_2,                               \
+}
+
+SINGLE_ANIMATION(None);
+SINGLE_ANIMATION(Bulbasaur);
+SINGLE_ANIMATION(Ivysaur);
+SINGLE_ANIMATION(Venusaur);
+SINGLE_ANIMATION(Charmander);
+SINGLE_ANIMATION(Charmeleon);
+SINGLE_ANIMATION(Charizard);
+SINGLE_ANIMATION(Squirtle);
+SINGLE_ANIMATION(Wartortle);
+SINGLE_ANIMATION(Blastoise);
+SINGLE_ANIMATION(Caterpie);
+SINGLE_ANIMATION(Metapod);
+SINGLE_ANIMATION(Butterfree);
+SINGLE_ANIMATION(Weedle);
+SINGLE_ANIMATION(Kakuna);
+SINGLE_ANIMATION(Beedrill);
+SINGLE_ANIMATION(Pidgey);
+SINGLE_ANIMATION(Pidgeotto);
+SINGLE_ANIMATION(Pidgeot);
+SINGLE_ANIMATION(Rattata);
+SINGLE_ANIMATION(Raticate);
+SINGLE_ANIMATION(Spearow);
+SINGLE_ANIMATION(Fearow);
+SINGLE_ANIMATION(Ekans);
+SINGLE_ANIMATION(Arbok);
+DOUBLE_ANIMATION(Pikachu);
+DOUBLE_ANIMATION(Raichu);
+DOUBLE_ANIMATION(Sandshrew);
+DOUBLE_ANIMATION(Sandslash);
+SINGLE_ANIMATION(NidoranF);
+SINGLE_ANIMATION(Nidorina);
+SINGLE_ANIMATION(Nidoqueen);
+SINGLE_ANIMATION(NidoranM);
+SINGLE_ANIMATION(Nidorino);
+SINGLE_ANIMATION(Nidoking);
+SINGLE_ANIMATION(Clefairy);
+SINGLE_ANIMATION(Clefable);
+DOUBLE_ANIMATION(Vulpix);
+DOUBLE_ANIMATION(Ninetales);
+DOUBLE_ANIMATION(Jigglypuff);
+DOUBLE_ANIMATION(Wigglytuff);
+SINGLE_ANIMATION(Zubat);
+SINGLE_ANIMATION(Golbat);
+SINGLE_ANIMATION(Oddish);
+SINGLE_ANIMATION(Gloom);
+SINGLE_ANIMATION(Vileplume);
+SINGLE_ANIMATION(Paras);
+SINGLE_ANIMATION(Parasect);
+SINGLE_ANIMATION(Venonat);
+SINGLE_ANIMATION(Venomoth);
+SINGLE_ANIMATION(Diglett);
+SINGLE_ANIMATION(Dugtrio);
+SINGLE_ANIMATION(Meowth);
+SINGLE_ANIMATION(Persian);
+DOUBLE_ANIMATION(Psyduck);
+DOUBLE_ANIMATION(Golduck);
+SINGLE_ANIMATION(Mankey);
+SINGLE_ANIMATION(Primeape);
+SINGLE_ANIMATION(Growlithe);
+SINGLE_ANIMATION(Arcanine);
+SINGLE_ANIMATION(Poliwag);
+SINGLE_ANIMATION(Poliwhirl);
+SINGLE_ANIMATION(Poliwrath);
+SINGLE_ANIMATION(Abra);
+SINGLE_ANIMATION(Kadabra);
+SINGLE_ANIMATION(Alakazam);
+SINGLE_ANIMATION(Machop);
+SINGLE_ANIMATION(Machoke);
+SINGLE_ANIMATION(Machamp);
+SINGLE_ANIMATION(Bellsprout);
+SINGLE_ANIMATION(Weepinbell);
+SINGLE_ANIMATION(Victreebel);
+SINGLE_ANIMATION(Tentacool);
+SINGLE_ANIMATION(Tentacruel);
+SINGLE_ANIMATION(Geodude);
+SINGLE_ANIMATION(Graveler);
+SINGLE_ANIMATION(Golem);
+SINGLE_ANIMATION(Ponyta);
+SINGLE_ANIMATION(Rapidash);
+SINGLE_ANIMATION(Slowpoke);
+SINGLE_ANIMATION(Slowbro);
+SINGLE_ANIMATION(Magnemite);
+SINGLE_ANIMATION(Magneton);
+SINGLE_ANIMATION(Farfetchd);
+SINGLE_ANIMATION(Doduo);
+SINGLE_ANIMATION(Dodrio);
+SINGLE_ANIMATION(Seel);
+SINGLE_ANIMATION(Dewgong);
+DOUBLE_ANIMATION(Grimer);
+DOUBLE_ANIMATION(Muk);
+SINGLE_ANIMATION(Shellder);
+SINGLE_ANIMATION(Cloyster);
+SINGLE_ANIMATION(Gastly);
+SINGLE_ANIMATION(Haunter);
+SINGLE_ANIMATION(Gengar);
+SINGLE_ANIMATION(Onix);
+SINGLE_ANIMATION(Drowzee);
+SINGLE_ANIMATION(Hypno);
+SINGLE_ANIMATION(Krabby);
+SINGLE_ANIMATION(Kingler);
+SINGLE_ANIMATION(Voltorb);
+SINGLE_ANIMATION(Electrode);
+SINGLE_ANIMATION(Exeggcute);
+SINGLE_ANIMATION(Exeggutor);
+SINGLE_ANIMATION(Cubone);
+SINGLE_ANIMATION(Marowak);
+SINGLE_ANIMATION(Hitmonlee);
+SINGLE_ANIMATION(Hitmonchan);
+SINGLE_ANIMATION(Lickitung);
+DOUBLE_ANIMATION(Koffing);
+DOUBLE_ANIMATION(Weezing);
+DOUBLE_ANIMATION(Rhyhorn);
+DOUBLE_ANIMATION(Rhydon);
+SINGLE_ANIMATION(Chansey);
+SINGLE_ANIMATION(Tangela);
+SINGLE_ANIMATION(Kangaskhan);
+DOUBLE_ANIMATION(Horsea);
+DOUBLE_ANIMATION(Seadra);
+SINGLE_ANIMATION(Goldeen);
+SINGLE_ANIMATION(Seaking);
+DOUBLE_ANIMATION(Staryu);
+DOUBLE_ANIMATION(Starmie);
+SINGLE_ANIMATION(MrMime);
+SINGLE_ANIMATION(Scyther);
+SINGLE_ANIMATION(Jynx);
+SINGLE_ANIMATION(Electabuzz);
+SINGLE_ANIMATION(Magmar);
+DOUBLE_ANIMATION(Pinsir);
+SINGLE_ANIMATION(Tauros);
+SINGLE_ANIMATION(Magikarp);
+SINGLE_ANIMATION(Gyarados);
+SINGLE_ANIMATION(Lapras);
+SINGLE_ANIMATION(Ditto);
+SINGLE_ANIMATION(Eevee);
+SINGLE_ANIMATION(Vaporeon);
+SINGLE_ANIMATION(Jolteon);
+SINGLE_ANIMATION(Flareon);
+SINGLE_ANIMATION(Porygon);
+SINGLE_ANIMATION(Omanyte);
+SINGLE_ANIMATION(Omastar);
+SINGLE_ANIMATION(Kabuto);
+SINGLE_ANIMATION(Kabutops);
+SINGLE_ANIMATION(Aerodactyl);
+SINGLE_ANIMATION(Snorlax);
+SINGLE_ANIMATION(Articuno);
+SINGLE_ANIMATION(Zapdos);
+SINGLE_ANIMATION(Moltres);
+SINGLE_ANIMATION(Dratini);
+SINGLE_ANIMATION(Dragonair);
+SINGLE_ANIMATION(Dragonite);
+SINGLE_ANIMATION(Mewtwo);
+SINGLE_ANIMATION(Mew);
+SINGLE_ANIMATION(Chikorita);
+SINGLE_ANIMATION(Bayleef);
+SINGLE_ANIMATION(Meganium);
+SINGLE_ANIMATION(Cyndaquil);
+SINGLE_ANIMATION(Quilava);
+SINGLE_ANIMATION(Typhlosion);
+SINGLE_ANIMATION(Totodile);
+SINGLE_ANIMATION(Croconaw);
+SINGLE_ANIMATION(Feraligatr);
+SINGLE_ANIMATION(Sentret);
+SINGLE_ANIMATION(Furret);
+SINGLE_ANIMATION(Hoothoot);
+SINGLE_ANIMATION(Noctowl);
+SINGLE_ANIMATION(Ledyba);
+SINGLE_ANIMATION(Ledian);
+SINGLE_ANIMATION(Spinarak);
+SINGLE_ANIMATION(Ariados);
+SINGLE_ANIMATION(Crobat);
+DOUBLE_ANIMATION(Chinchou);
+DOUBLE_ANIMATION(Lanturn);
+DOUBLE_ANIMATION(Pichu);
+SINGLE_ANIMATION(Cleffa);
+DOUBLE_ANIMATION(Igglybuff);
+SINGLE_ANIMATION(Togepi);
+SINGLE_ANIMATION(Togetic);
+DOUBLE_ANIMATION(Natu);
+DOUBLE_ANIMATION(Xatu);
+SINGLE_ANIMATION(Mareep);
+SINGLE_ANIMATION(Flaaffy);
+SINGLE_ANIMATION(Ampharos);
+SINGLE_ANIMATION(Bellossom);
+SINGLE_ANIMATION(Marill);
+SINGLE_ANIMATION(Azumarill);
+SINGLE_ANIMATION(Sudowoodo);
+SINGLE_ANIMATION(Politoed);
+SINGLE_ANIMATION(Hoppip);
+SINGLE_ANIMATION(Skiploom);
+SINGLE_ANIMATION(Jumpluff);
+SINGLE_ANIMATION(Aipom);
+SINGLE_ANIMATION(Sunkern);
+SINGLE_ANIMATION(Sunflora);
+SINGLE_ANIMATION(Yanma);
+SINGLE_ANIMATION(Wooper);
+SINGLE_ANIMATION(Quagsire);
+SINGLE_ANIMATION(Espeon);
+SINGLE_ANIMATION(Umbreon);
+SINGLE_ANIMATION(Murkrow);
+SINGLE_ANIMATION(Slowking);
+SINGLE_ANIMATION(Misdreavus);
+SINGLE_ANIMATION(Unown);
+DOUBLE_ANIMATION(Wobbuffet);
+DOUBLE_ANIMATION(Girafarig);
+SINGLE_ANIMATION(Pineco);
+SINGLE_ANIMATION(Forretress);
+SINGLE_ANIMATION(Dunsparce);
+SINGLE_ANIMATION(Gligar);
+SINGLE_ANIMATION(Steelix);
+SINGLE_ANIMATION(Snubbull);
+SINGLE_ANIMATION(Granbull);
+SINGLE_ANIMATION(Qwilfish);
+SINGLE_ANIMATION(Scizor);
+SINGLE_ANIMATION(Shuckle);
+DOUBLE_ANIMATION(Heracross);
+SINGLE_ANIMATION(Sneasel);
+SINGLE_ANIMATION(Teddiursa);
+SINGLE_ANIMATION(Ursaring);
+DOUBLE_ANIMATION(Slugma);
+DOUBLE_ANIMATION(Magcargo);
+SINGLE_ANIMATION(Swinub);
+SINGLE_ANIMATION(Piloswine);
+DOUBLE_ANIMATION(Corsola);
+SINGLE_ANIMATION(Remoraid);
+SINGLE_ANIMATION(Octillery);
+SINGLE_ANIMATION(Delibird);
+SINGLE_ANIMATION(Mantine);
+DOUBLE_ANIMATION(Skarmory);
+SINGLE_ANIMATION(Houndour);
+SINGLE_ANIMATION(Houndoom);
+DOUBLE_ANIMATION(Kingdra);
+DOUBLE_ANIMATION(Phanpy);
+DOUBLE_ANIMATION(Donphan);
+SINGLE_ANIMATION(Porygon2);
+SINGLE_ANIMATION(Stantler);
+SINGLE_ANIMATION(Smeargle);
+SINGLE_ANIMATION(Tyrogue);
+SINGLE_ANIMATION(Hitmontop);
+SINGLE_ANIMATION(Smoochum);
+SINGLE_ANIMATION(Elekid);
+SINGLE_ANIMATION(Magby);
+SINGLE_ANIMATION(Miltank);
+SINGLE_ANIMATION(Blissey);
+SINGLE_ANIMATION(Raikou);
+SINGLE_ANIMATION(Entei);
+SINGLE_ANIMATION(Suicune);
+SINGLE_ANIMATION(Larvitar);
+SINGLE_ANIMATION(Pupitar);
+SINGLE_ANIMATION(Tyranitar);
+SINGLE_ANIMATION(Lugia);
+SINGLE_ANIMATION(HoOh);
+SINGLE_ANIMATION(Celebi);
+SINGLE_ANIMATION(OldUnownB);
+SINGLE_ANIMATION(Treecko);
+SINGLE_ANIMATION(Grovyle);
+SINGLE_ANIMATION(Sceptile);
+SINGLE_ANIMATION(Torchic);
+SINGLE_ANIMATION(Combusken);
+static const union AnimCmd *const sAnims_Blaziken[] ={
+    sAnim_GeneralFrame0,
+    sAnim_Blaziken_1,
+    sAnim_Blaziken_2,
+    sAnim_Blaziken_3,
+    sAnim_Blaziken_4,
+};
+SINGLE_ANIMATION(Mudkip);
+SINGLE_ANIMATION(Marshtomp);
+SINGLE_ANIMATION(Swampert);
+SINGLE_ANIMATION(Poochyena);
+SINGLE_ANIMATION(Mightyena);
+SINGLE_ANIMATION(Zigzagoon);
+SINGLE_ANIMATION(Linoone);
+SINGLE_ANIMATION(Wurmple);
+DOUBLE_ANIMATION(Silcoon);
+DOUBLE_ANIMATION(Beautifly);
+DOUBLE_ANIMATION(Cascoon);
+DOUBLE_ANIMATION(Dustox);
+SINGLE_ANIMATION(Lotad);
+SINGLE_ANIMATION(Lombre);
+SINGLE_ANIMATION(Ludicolo);
+SINGLE_ANIMATION(Seedot);
+SINGLE_ANIMATION(Nuzleaf);
+SINGLE_ANIMATION(Shiftry);
+SINGLE_ANIMATION(Nincada);
+SINGLE_ANIMATION(Ninjask);
+SINGLE_ANIMATION(Shedinja);
+SINGLE_ANIMATION(Taillow);
+SINGLE_ANIMATION(Swellow);
+SINGLE_ANIMATION(Shroomish);
+SINGLE_ANIMATION(Breloom);
+static const union AnimCmd *const sAnims_Spinda[] ={
+    sAnim_GeneralFrame0,
+};
+SINGLE_ANIMATION(Wingull);
+SINGLE_ANIMATION(Pelipper);
+DOUBLE_ANIMATION(Surskit);
+DOUBLE_ANIMATION(Masquerain);
+SINGLE_ANIMATION(Wailmer);
+SINGLE_ANIMATION(Wailord);
+SINGLE_ANIMATION(Skitty);
+SINGLE_ANIMATION(Delcatty);
+SINGLE_ANIMATION(Kecleon);
+SINGLE_ANIMATION(Baltoy);
+SINGLE_ANIMATION(Claydol);
+SINGLE_ANIMATION(Nosepass);
+SINGLE_ANIMATION(Torkoal);
+SINGLE_ANIMATION(Sableye);
+SINGLE_ANIMATION(Barboach);
+SINGLE_ANIMATION(Whiscash);
+SINGLE_ANIMATION(Luvdisc);
+SINGLE_ANIMATION(Corphish);
+SINGLE_ANIMATION(Crawdaunt);
+SINGLE_ANIMATION(Feebas);
+SINGLE_ANIMATION(Milotic);
+SINGLE_ANIMATION(Carvanha);
+SINGLE_ANIMATION(Sharpedo);
+SINGLE_ANIMATION(Trapinch);
+SINGLE_ANIMATION(Vibrava);
+SINGLE_ANIMATION(Flygon);
+SINGLE_ANIMATION(Makuhita);
+SINGLE_ANIMATION(Hariyama);
+SINGLE_ANIMATION(Electrike);
+SINGLE_ANIMATION(Manectric);
+SINGLE_ANIMATION(Numel);
+SINGLE_ANIMATION(Camerupt);
+SINGLE_ANIMATION(Spheal);
+SINGLE_ANIMATION(Sealeo);
+SINGLE_ANIMATION(Walrein);
+SINGLE_ANIMATION(Cacnea);
+SINGLE_ANIMATION(Cacturne);
+SINGLE_ANIMATION(Snorunt);
+SINGLE_ANIMATION(Glalie);
+DOUBLE_ANIMATION(Lunatone);
+DOUBLE_ANIMATION(Solrock);
+SINGLE_ANIMATION(Azurill);
+SINGLE_ANIMATION(Spoink);
+SINGLE_ANIMATION(Grumpig);
+SINGLE_ANIMATION(Plusle);
+SINGLE_ANIMATION(Minun);
+SINGLE_ANIMATION(Mawile);
+SINGLE_ANIMATION(Meditite);
+SINGLE_ANIMATION(Medicham);
+DOUBLE_ANIMATION(Swablu);
+DOUBLE_ANIMATION(Altaria);
+SINGLE_ANIMATION(Wynaut);
+SINGLE_ANIMATION(Duskull);
+SINGLE_ANIMATION(Dusclops);
+SINGLE_ANIMATION(Roselia);
+SINGLE_ANIMATION(Slakoth);
+SINGLE_ANIMATION(Vigoroth);
+SINGLE_ANIMATION(Slaking);
+SINGLE_ANIMATION(Gulpin);
+SINGLE_ANIMATION(Swalot);
+SINGLE_ANIMATION(Tropius);
+SINGLE_ANIMATION(Whismur);
+SINGLE_ANIMATION(Loudred);
+SINGLE_ANIMATION(Exploud);
+SINGLE_ANIMATION(Clamperl);
+SINGLE_ANIMATION(Huntail);
+SINGLE_ANIMATION(Gorebyss);
+SINGLE_ANIMATION(Absol);
+SINGLE_ANIMATION(Shuppet);
+SINGLE_ANIMATION(Banette);
+SINGLE_ANIMATION(Seviper);
+SINGLE_ANIMATION(Zangoose);
+SINGLE_ANIMATION(Relicanth);
+SINGLE_ANIMATION(Aron);
+SINGLE_ANIMATION(Lairon);
+SINGLE_ANIMATION(Aggron);
+static const union AnimCmd *const sAnims_Castform[] ={
+    sAnim_Castform_0,
+    sAnim_Castform_1,
+    sAnim_Castform_2,
+    sAnim_Castform_3,
+};
+SINGLE_ANIMATION(Volbeat);
+SINGLE_ANIMATION(Illumise);
+SINGLE_ANIMATION(Lileep);
+SINGLE_ANIMATION(Cradily);
+SINGLE_ANIMATION(Anorith);
+SINGLE_ANIMATION(Armaldo);
+SINGLE_ANIMATION(Ralts);
+SINGLE_ANIMATION(Kirlia);
+SINGLE_ANIMATION(Gardevoir);
+SINGLE_ANIMATION(Bagon);
+SINGLE_ANIMATION(Shelgon);
+SINGLE_ANIMATION(Salamence);
+SINGLE_ANIMATION(Beldum);
+SINGLE_ANIMATION(Metang);
+SINGLE_ANIMATION(Metagross);
+DOUBLE_ANIMATION(Regirock);
+SINGLE_ANIMATION(Regice);
+DOUBLE_ANIMATION(Registeel);
+DOUBLE_ANIMATION(Kyogre);
+DOUBLE_ANIMATION(Groudon);
+DOUBLE_ANIMATION(Rayquaza);
+DOUBLE_ANIMATION(Latias);
+DOUBLE_ANIMATION(Latios);
+DOUBLE_ANIMATION(Jirachi);
+DOUBLE_ANIMATION(Deoxys);
+SINGLE_ANIMATION(Chimecho);
+SINGLE_ANIMATION(Egg);
+SINGLE_ANIMATION(UnownB);
+SINGLE_ANIMATION(UnownC);
+SINGLE_ANIMATION(UnownD);
+SINGLE_ANIMATION(UnownE);
+SINGLE_ANIMATION(UnownF);
+SINGLE_ANIMATION(UnownG);
+SINGLE_ANIMATION(UnownH);
+SINGLE_ANIMATION(UnownI);
+SINGLE_ANIMATION(UnownJ);
+SINGLE_ANIMATION(UnownK);
+SINGLE_ANIMATION(UnownL);
+SINGLE_ANIMATION(UnownM);
+SINGLE_ANIMATION(UnownN);
+SINGLE_ANIMATION(UnownO);
+SINGLE_ANIMATION(UnownP);
+SINGLE_ANIMATION(UnownQ);
+SINGLE_ANIMATION(UnownR);
+SINGLE_ANIMATION(UnownS);
+SINGLE_ANIMATION(UnownT);
+SINGLE_ANIMATION(UnownU);
+SINGLE_ANIMATION(UnownV);
+SINGLE_ANIMATION(UnownW);
+SINGLE_ANIMATION(UnownX);
+SINGLE_ANIMATION(UnownY);
+SINGLE_ANIMATION(UnownZ);
+SINGLE_ANIMATION(UnownEMark);
+SINGLE_ANIMATION(UnownQMark);
 
 const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
 {
-    ANIM_CMD(NONE),
-    ANIM_CMD(BULBASAUR),
-    ANIM_CMD(IVYSAUR),
-    ANIM_CMD(VENUSAUR),
-    ANIM_CMD(CHARMANDER),
-    ANIM_CMD(CHARMELEON),
-    ANIM_CMD(CHARIZARD),
-    ANIM_CMD(SQUIRTLE),
-    ANIM_CMD(WARTORTLE),
-    ANIM_CMD(BLASTOISE),
-    ANIM_CMD(CATERPIE),
-    ANIM_CMD(METAPOD),
-    ANIM_CMD(BUTTERFREE),
-    ANIM_CMD(WEEDLE),
-    ANIM_CMD(KAKUNA),
-    ANIM_CMD(BEEDRILL),
-    ANIM_CMD(PIDGEY),
-    ANIM_CMD(PIDGEOTTO),
-    ANIM_CMD(PIDGEOT),
-    ANIM_CMD(RATTATA),
-    ANIM_CMD(RATICATE),
-    ANIM_CMD(SPEAROW),
-    ANIM_CMD(FEAROW),
-    ANIM_CMD(EKANS),
-    ANIM_CMD(ARBOK),
-    ANIM_CMD(PIKACHU),
-    ANIM_CMD(RAICHU),
-    ANIM_CMD(SANDSHREW),
-    ANIM_CMD(SANDSLASH),
-    ANIM_CMD(NIDORAN_F),
-    ANIM_CMD(NIDORINA),
-    ANIM_CMD(NIDOQUEEN),
-    ANIM_CMD(NIDORAN_M),
-    ANIM_CMD(NIDORINO),
-    ANIM_CMD(NIDOKING),
-    ANIM_CMD(CLEFAIRY),
-    ANIM_CMD(CLEFABLE),
-    ANIM_CMD(VULPIX),
-    ANIM_CMD(NINETALES),
-    ANIM_CMD(JIGGLYPUFF),
-    ANIM_CMD(WIGGLYTUFF),
-    ANIM_CMD(ZUBAT),
-    ANIM_CMD(GOLBAT),
-    ANIM_CMD(ODDISH),
-    ANIM_CMD(GLOOM),
-    ANIM_CMD(VILEPLUME),
-    ANIM_CMD(PARAS),
-    ANIM_CMD(PARASECT),
-    ANIM_CMD(VENONAT),
-    ANIM_CMD(VENOMOTH),
-    ANIM_CMD(DIGLETT),
-    ANIM_CMD(DUGTRIO),
-    ANIM_CMD(MEOWTH),
-    ANIM_CMD(PERSIAN),
-    ANIM_CMD(PSYDUCK),
-    ANIM_CMD(GOLDUCK),
-    ANIM_CMD(MANKEY),
-    ANIM_CMD(PRIMEAPE),
-    ANIM_CMD(GROWLITHE),
-    ANIM_CMD(ARCANINE),
-    ANIM_CMD(POLIWAG),
-    ANIM_CMD(POLIWHIRL),
-    ANIM_CMD(POLIWRATH),
-    ANIM_CMD(ABRA),
-    ANIM_CMD(KADABRA),
-    ANIM_CMD(ALAKAZAM),
-    ANIM_CMD(MACHOP),
-    ANIM_CMD(MACHOKE),
-    ANIM_CMD(MACHAMP),
-    ANIM_CMD(BELLSPROUT),
-    ANIM_CMD(WEEPINBELL),
-    ANIM_CMD(VICTREEBEL),
-    ANIM_CMD(TENTACOOL),
-    ANIM_CMD(TENTACRUEL),
-    ANIM_CMD(GEODUDE),
-    ANIM_CMD(GRAVELER),
-    ANIM_CMD(GOLEM),
-    ANIM_CMD(PONYTA),
-    ANIM_CMD(RAPIDASH),
-    ANIM_CMD(SLOWPOKE),
-    ANIM_CMD(SLOWBRO),
-    ANIM_CMD(MAGNEMITE),
-    ANIM_CMD(MAGNETON),
-    ANIM_CMD(FARFETCHD),
-    ANIM_CMD(DODUO),
-    ANIM_CMD(DODRIO),
-    ANIM_CMD(SEEL),
-    ANIM_CMD(DEWGONG),
-    ANIM_CMD(GRIMER),
-    ANIM_CMD(MUK),
-    ANIM_CMD(SHELLDER),
-    ANIM_CMD(CLOYSTER),
-    ANIM_CMD(GASTLY),
-    ANIM_CMD(HAUNTER),
-    ANIM_CMD(GENGAR),
-    ANIM_CMD(ONIX),
-    ANIM_CMD(DROWZEE),
-    ANIM_CMD(HYPNO),
-    ANIM_CMD(KRABBY),
-    ANIM_CMD(KINGLER),
-    ANIM_CMD(VOLTORB),
-    ANIM_CMD(ELECTRODE),
-    ANIM_CMD(EXEGGCUTE),
-    ANIM_CMD(EXEGGUTOR),
-    ANIM_CMD(CUBONE),
-    ANIM_CMD(MAROWAK),
-    ANIM_CMD(HITMONLEE),
-    ANIM_CMD(HITMONCHAN),
-    ANIM_CMD(LICKITUNG),
-    ANIM_CMD(KOFFING),
-    ANIM_CMD(WEEZING),
-    ANIM_CMD(RHYHORN),
-    ANIM_CMD(RHYDON),
-    ANIM_CMD(CHANSEY),
-    ANIM_CMD(TANGELA),
-    ANIM_CMD(KANGASKHAN),
-    ANIM_CMD(HORSEA),
-    ANIM_CMD(SEADRA),
-    ANIM_CMD(GOLDEEN),
-    ANIM_CMD(SEAKING),
-    ANIM_CMD(STARYU),
-    ANIM_CMD(STARMIE),
-    ANIM_CMD(MR_MIME),
-    ANIM_CMD(SCYTHER),
-    ANIM_CMD(JYNX),
-    ANIM_CMD(ELECTABUZZ),
-    ANIM_CMD(MAGMAR),
-    ANIM_CMD(PINSIR),
-    ANIM_CMD(TAUROS),
-    ANIM_CMD(MAGIKARP),
-    ANIM_CMD(GYARADOS),
-    ANIM_CMD(LAPRAS),
-    ANIM_CMD(DITTO),
-    ANIM_CMD(EEVEE),
-    ANIM_CMD(VAPOREON),
-    ANIM_CMD(JOLTEON),
-    ANIM_CMD(FLAREON),
-    ANIM_CMD(PORYGON),
-    ANIM_CMD(OMANYTE),
-    ANIM_CMD(OMASTAR),
-    ANIM_CMD(KABUTO),
-    ANIM_CMD(KABUTOPS),
-    ANIM_CMD(AERODACTYL),
-    ANIM_CMD(SNORLAX),
-    ANIM_CMD(ARTICUNO),
-    ANIM_CMD(ZAPDOS),
-    ANIM_CMD(MOLTRES),
-    ANIM_CMD(DRATINI),
-    ANIM_CMD(DRAGONAIR),
-    ANIM_CMD(DRAGONITE),
-    ANIM_CMD(MEWTWO),
-    ANIM_CMD(MEW),
-    ANIM_CMD(CHIKORITA),
-    ANIM_CMD(BAYLEEF),
-    ANIM_CMD(MEGANIUM),
-    ANIM_CMD(CYNDAQUIL),
-    ANIM_CMD(QUILAVA),
-    ANIM_CMD(TYPHLOSION),
-    ANIM_CMD(TOTODILE),
-    ANIM_CMD(CROCONAW),
-    ANIM_CMD(FERALIGATR),
-    ANIM_CMD(SENTRET),
-    ANIM_CMD(FURRET),
-    ANIM_CMD(HOOTHOOT),
-    ANIM_CMD(NOCTOWL),
-    ANIM_CMD(LEDYBA),
-    ANIM_CMD(LEDIAN),
-    ANIM_CMD(SPINARAK),
-    ANIM_CMD(ARIADOS),
-    ANIM_CMD(CROBAT),
-    ANIM_CMD(CHINCHOU),
-    ANIM_CMD(LANTURN),
-    ANIM_CMD(PICHU),
-    ANIM_CMD(CLEFFA),
-    ANIM_CMD(IGGLYBUFF),
-    ANIM_CMD(TOGEPI),
-    ANIM_CMD(TOGETIC),
-    ANIM_CMD(NATU),
-    ANIM_CMD(XATU),
-    ANIM_CMD(MAREEP),
-    ANIM_CMD(FLAAFFY),
-    ANIM_CMD(AMPHAROS),
-    ANIM_CMD(BELLOSSOM),
-    ANIM_CMD(MARILL),
-    ANIM_CMD(AZUMARILL),
-    ANIM_CMD(SUDOWOODO),
-    ANIM_CMD(POLITOED),
-    ANIM_CMD(HOPPIP),
-    ANIM_CMD(SKIPLOOM),
-    ANIM_CMD(JUMPLUFF),
-    ANIM_CMD(AIPOM),
-    ANIM_CMD(SUNKERN),
-    ANIM_CMD(SUNFLORA),
-    ANIM_CMD(YANMA),
-    ANIM_CMD(WOOPER),
-    ANIM_CMD(QUAGSIRE),
-    ANIM_CMD(ESPEON),
-    ANIM_CMD(UMBREON),
-    ANIM_CMD(MURKROW),
-    ANIM_CMD(SLOWKING),
-    ANIM_CMD(MISDREAVUS),
-    ANIM_CMD(UNOWN),
-    ANIM_CMD(WOBBUFFET),
-    ANIM_CMD(GIRAFARIG),
-    ANIM_CMD(PINECO),
-    ANIM_CMD(FORRETRESS),
-    ANIM_CMD(DUNSPARCE),
-    ANIM_CMD(GLIGAR),
-    ANIM_CMD(STEELIX),
-    ANIM_CMD(SNUBBULL),
-    ANIM_CMD(GRANBULL),
-    ANIM_CMD(QWILFISH),
-    ANIM_CMD(SCIZOR),
-    ANIM_CMD(SHUCKLE),
-    ANIM_CMD(HERACROSS),
-    ANIM_CMD(SNEASEL),
-    ANIM_CMD(TEDDIURSA),
-    ANIM_CMD(URSARING),
-    ANIM_CMD(SLUGMA),
-    ANIM_CMD(MAGCARGO),
-    ANIM_CMD(SWINUB),
-    ANIM_CMD(PILOSWINE),
-    ANIM_CMD(CORSOLA),
-    ANIM_CMD(REMORAID),
-    ANIM_CMD(OCTILLERY),
-    ANIM_CMD(DELIBIRD),
-    ANIM_CMD(MANTINE),
-    ANIM_CMD(SKARMORY),
-    ANIM_CMD(HOUNDOUR),
-    ANIM_CMD(HOUNDOOM),
-    ANIM_CMD(KINGDRA),
-    ANIM_CMD(PHANPY),
-    ANIM_CMD(DONPHAN),
-    ANIM_CMD(PORYGON2),
-    ANIM_CMD(STANTLER),
-    ANIM_CMD(SMEARGLE),
-    ANIM_CMD(TYROGUE),
-    ANIM_CMD(HITMONTOP),
-    ANIM_CMD(SMOOCHUM),
-    ANIM_CMD(ELEKID),
-    ANIM_CMD(MAGBY),
-    ANIM_CMD(MILTANK),
-    ANIM_CMD(BLISSEY),
-    ANIM_CMD(RAIKOU),
-    ANIM_CMD(ENTEI),
-    ANIM_CMD(SUICUNE),
-    ANIM_CMD(LARVITAR),
-    ANIM_CMD(PUPITAR),
-    ANIM_CMD(TYRANITAR),
-    ANIM_CMD(LUGIA),
-    ANIM_CMD(HO_OH),
-    ANIM_CMD(CELEBI),
-    ANIM_CMD(OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_C, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_D, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_E, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_F, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_G, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_H, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_I, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_J, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_K, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_L, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_M, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_N, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_O, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_P, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_Q, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_R, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_S, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_T, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_U, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_V, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_W, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_X, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_Y, sAnims_OLD_UNOWN_B),
-    ANIM_CMD_FULL(OLD_UNOWN_Z, sAnims_OLD_UNOWN_B),
-    ANIM_CMD(TREECKO),
-    ANIM_CMD(GROVYLE),
-    ANIM_CMD(SCEPTILE),
-    ANIM_CMD(TORCHIC),
-    ANIM_CMD(COMBUSKEN),
-    ANIM_CMD(BLAZIKEN),
-    ANIM_CMD(MUDKIP),
-    ANIM_CMD(MARSHTOMP),
-    ANIM_CMD(SWAMPERT),
-    ANIM_CMD(POOCHYENA),
-    ANIM_CMD(MIGHTYENA),
-    ANIM_CMD(ZIGZAGOON),
-    ANIM_CMD(LINOONE),
-    ANIM_CMD(WURMPLE),
-    ANIM_CMD(SILCOON),
-    ANIM_CMD(BEAUTIFLY),
-    ANIM_CMD(CASCOON),
-    ANIM_CMD(DUSTOX),
-    ANIM_CMD(LOTAD),
-    ANIM_CMD(LOMBRE),
-    ANIM_CMD(LUDICOLO),
-    ANIM_CMD(SEEDOT),
-    ANIM_CMD(NUZLEAF),
-    ANIM_CMD(SHIFTRY),
-    ANIM_CMD(NINCADA),
-    ANIM_CMD(NINJASK),
-    ANIM_CMD(SHEDINJA),
-    ANIM_CMD(TAILLOW),
-    ANIM_CMD(SWELLOW),
-    ANIM_CMD(SHROOMISH),
-    ANIM_CMD(BRELOOM),
-    ANIM_CMD(SPINDA),
-    ANIM_CMD(WINGULL),
-    ANIM_CMD(PELIPPER),
-    ANIM_CMD(SURSKIT),
-    ANIM_CMD(MASQUERAIN),
-    ANIM_CMD(WAILMER),
-    ANIM_CMD(WAILORD),
-    ANIM_CMD(SKITTY),
-    ANIM_CMD(DELCATTY),
-    ANIM_CMD(KECLEON),
-    ANIM_CMD(BALTOY),
-    ANIM_CMD(CLAYDOL),
-    ANIM_CMD(NOSEPASS),
-    ANIM_CMD(TORKOAL),
-    ANIM_CMD(SABLEYE),
-    ANIM_CMD(BARBOACH),
-    ANIM_CMD(WHISCASH),
-    ANIM_CMD(LUVDISC),
-    ANIM_CMD(CORPHISH),
-    ANIM_CMD(CRAWDAUNT),
-    ANIM_CMD(FEEBAS),
-    ANIM_CMD(MILOTIC),
-    ANIM_CMD(CARVANHA),
-    ANIM_CMD(SHARPEDO),
-    ANIM_CMD(TRAPINCH),
-    ANIM_CMD(VIBRAVA),
-    ANIM_CMD(FLYGON),
-    ANIM_CMD(MAKUHITA),
-    ANIM_CMD(HARIYAMA),
-    ANIM_CMD(ELECTRIKE),
-    ANIM_CMD(MANECTRIC),
-    ANIM_CMD(NUMEL),
-    ANIM_CMD(CAMERUPT),
-    ANIM_CMD(SPHEAL),
-    ANIM_CMD(SEALEO),
-    ANIM_CMD(WALREIN),
-    ANIM_CMD(CACNEA),
-    ANIM_CMD(CACTURNE),
-    ANIM_CMD(SNORUNT),
-    ANIM_CMD(GLALIE),
-    ANIM_CMD(LUNATONE),
-    ANIM_CMD(SOLROCK),
-    ANIM_CMD(AZURILL),
-    ANIM_CMD(SPOINK),
-    ANIM_CMD(GRUMPIG),
-    ANIM_CMD(PLUSLE),
-    ANIM_CMD(MINUN),
-    ANIM_CMD(MAWILE),
-    ANIM_CMD(MEDITITE),
-    ANIM_CMD(MEDICHAM),
-    ANIM_CMD(SWABLU),
-    ANIM_CMD(ALTARIA),
-    ANIM_CMD(WYNAUT),
-    ANIM_CMD(DUSKULL),
-    ANIM_CMD(DUSCLOPS),
-    ANIM_CMD(ROSELIA),
-    ANIM_CMD(SLAKOTH),
-    ANIM_CMD(VIGOROTH),
-    ANIM_CMD(SLAKING),
-    ANIM_CMD(GULPIN),
-    ANIM_CMD(SWALOT),
-    ANIM_CMD(TROPIUS),
-    ANIM_CMD(WHISMUR),
-    ANIM_CMD(LOUDRED),
-    ANIM_CMD(EXPLOUD),
-    ANIM_CMD(CLAMPERL),
-    ANIM_CMD(HUNTAIL),
-    ANIM_CMD(GOREBYSS),
-    ANIM_CMD(ABSOL),
-    ANIM_CMD(SHUPPET),
-    ANIM_CMD(BANETTE),
-    ANIM_CMD(SEVIPER),
-    ANIM_CMD(ZANGOOSE),
-    ANIM_CMD(RELICANTH),
-    ANIM_CMD(ARON),
-    ANIM_CMD(LAIRON),
-    ANIM_CMD(AGGRON),
-    ANIM_CMD(CASTFORM),
-    ANIM_CMD(VOLBEAT),
-    ANIM_CMD(ILLUMISE),
-    ANIM_CMD(LILEEP),
-    ANIM_CMD(CRADILY),
-    ANIM_CMD(ANORITH),
-    ANIM_CMD(ARMALDO),
-    ANIM_CMD(RALTS),
-    ANIM_CMD(KIRLIA),
-    ANIM_CMD(GARDEVOIR),
-    ANIM_CMD(BAGON),
-    ANIM_CMD(SHELGON),
-    ANIM_CMD(SALAMENCE),
-    ANIM_CMD(BELDUM),
-    ANIM_CMD(METANG),
-    ANIM_CMD(METAGROSS),
-    ANIM_CMD(REGIROCK),
-    ANIM_CMD(REGICE),
-    ANIM_CMD(REGISTEEL),
-    ANIM_CMD(KYOGRE),
-    ANIM_CMD(GROUDON),
-    ANIM_CMD(RAYQUAZA),
-    ANIM_CMD(LATIAS),
-    ANIM_CMD(LATIOS),
-    ANIM_CMD(JIRACHI),
-    ANIM_CMD(DEOXYS),
-    ANIM_CMD(CHIMECHO),
-    ANIM_CMD(EGG),
-    ANIM_CMD(UNOWN_B),
-    ANIM_CMD(UNOWN_C),
-    ANIM_CMD(UNOWN_D),
-    ANIM_CMD(UNOWN_E),
-    ANIM_CMD(UNOWN_F),
-    ANIM_CMD(UNOWN_G),
-    ANIM_CMD(UNOWN_H),
-    ANIM_CMD(UNOWN_I),
-    ANIM_CMD(UNOWN_J),
-    ANIM_CMD(UNOWN_K),
-    ANIM_CMD(UNOWN_L),
-    ANIM_CMD(UNOWN_M),
-    ANIM_CMD(UNOWN_N),
-    ANIM_CMD(UNOWN_O),
-    ANIM_CMD(UNOWN_P),
-    ANIM_CMD(UNOWN_Q),
-    ANIM_CMD(UNOWN_R),
-    ANIM_CMD(UNOWN_S),
-    ANIM_CMD(UNOWN_T),
-    ANIM_CMD(UNOWN_U),
-    ANIM_CMD(UNOWN_V),
-    ANIM_CMD(UNOWN_W),
-    ANIM_CMD(UNOWN_X),
-    ANIM_CMD(UNOWN_Y),
-    ANIM_CMD(UNOWN_Z),
-    ANIM_CMD(UNOWN_EMARK),
-    ANIM_CMD(UNOWN_QMARK),
-};
+    [SPECIES_NONE]        = sAnims_None,
+    [SPECIES_BULBASAUR]   = sAnims_Bulbasaur,
+    [SPECIES_IVYSAUR]     = sAnims_Ivysaur,
+    [SPECIES_VENUSAUR]    = sAnims_Venusaur,
+    [SPECIES_CHARMANDER]  = sAnims_Charmander,
+    [SPECIES_CHARMELEON]  = sAnims_Charmeleon,
+    [SPECIES_CHARIZARD]   = sAnims_Charizard,
+    [SPECIES_SQUIRTLE]    = sAnims_Squirtle,
+    [SPECIES_WARTORTLE]   = sAnims_Wartortle,
+    [SPECIES_BLASTOISE]   = sAnims_Blastoise,
+    [SPECIES_CATERPIE]    = sAnims_Caterpie,
+    [SPECIES_METAPOD]     = sAnims_Metapod,
+    [SPECIES_BUTTERFREE]  = sAnims_Butterfree,
+    [SPECIES_WEEDLE]      = sAnims_Weedle,
+    [SPECIES_KAKUNA]      = sAnims_Kakuna,
+    [SPECIES_BEEDRILL]    = sAnims_Beedrill,
+    [SPECIES_PIDGEY]      = sAnims_Pidgey,
+    [SPECIES_PIDGEOTTO]   = sAnims_Pidgeotto,
+    [SPECIES_PIDGEOT]     = sAnims_Pidgeot,
+    [SPECIES_RATTATA]     = sAnims_Rattata,
+    [SPECIES_RATICATE]    = sAnims_Raticate,
+    [SPECIES_SPEAROW]     = sAnims_Spearow,
+    [SPECIES_FEAROW]      = sAnims_Fearow,
+    [SPECIES_EKANS]       = sAnims_Ekans,
+    [SPECIES_ARBOK]       = sAnims_Arbok,
+    [SPECIES_PIKACHU]     = sAnims_Pikachu,
+    [SPECIES_RAICHU]      = sAnims_Raichu,
+    [SPECIES_SANDSHREW]   = sAnims_Sandshrew,
+    [SPECIES_SANDSLASH]   = sAnims_Sandslash,
+    [SPECIES_NIDORAN_F]   = sAnims_NidoranF,
+    [SPECIES_NIDORINA]    = sAnims_Nidorina,
+    [SPECIES_NIDOQUEEN]   = sAnims_Nidoqueen,
+    [SPECIES_NIDORAN_M]   = sAnims_NidoranM,
+    [SPECIES_NIDORINO]    = sAnims_Nidorino,
+    [SPECIES_NIDOKING]    = sAnims_Nidoking,
+    [SPECIES_CLEFAIRY]    = sAnims_Clefairy,
+    [SPECIES_CLEFABLE]    = sAnims_Clefable,
+    [SPECIES_VULPIX]      = sAnims_Vulpix,
+    [SPECIES_NINETALES]   = sAnims_Ninetales,
+    [SPECIES_JIGGLYPUFF]  = sAnims_Jigglypuff,
+    [SPECIES_WIGGLYTUFF]  = sAnims_Wigglytuff,
+    [SPECIES_ZUBAT]       = sAnims_Zubat,
+    [SPECIES_GOLBAT]      = sAnims_Golbat,
+    [SPECIES_ODDISH]      = sAnims_Oddish,
+    [SPECIES_GLOOM]       = sAnims_Gloom,
+    [SPECIES_VILEPLUME]   = sAnims_Vileplume,
+    [SPECIES_PARAS]       = sAnims_Paras,
+    [SPECIES_PARASECT]    = sAnims_Parasect,
+    [SPECIES_VENONAT]     = sAnims_Venonat,
+    [SPECIES_VENOMOTH]    = sAnims_Venomoth,
+    [SPECIES_DIGLETT]     = sAnims_Diglett,
+    [SPECIES_DUGTRIO]     = sAnims_Dugtrio,
+    [SPECIES_MEOWTH]      = sAnims_Meowth,
+    [SPECIES_PERSIAN]     = sAnims_Persian,
+    [SPECIES_PSYDUCK]     = sAnims_Psyduck,
+    [SPECIES_GOLDUCK]     = sAnims_Golduck,
+    [SPECIES_MANKEY]      = sAnims_Mankey,
+    [SPECIES_PRIMEAPE]    = sAnims_Primeape,
+    [SPECIES_GROWLITHE]   = sAnims_Growlithe,
+    [SPECIES_ARCANINE]    = sAnims_Arcanine,
+    [SPECIES_POLIWAG]     = sAnims_Poliwag,
+    [SPECIES_POLIWHIRL]   = sAnims_Poliwhirl,
+    [SPECIES_POLIWRATH]   = sAnims_Poliwrath,
+    [SPECIES_ABRA]        = sAnims_Abra,
+    [SPECIES_KADABRA]     = sAnims_Kadabra,
+    [SPECIES_ALAKAZAM]    = sAnims_Alakazam,
+    [SPECIES_MACHOP]      = sAnims_Machop,
+    [SPECIES_MACHOKE]     = sAnims_Machoke,
+    [SPECIES_MACHAMP]     = sAnims_Machamp,
+    [SPECIES_BELLSPROUT]  = sAnims_Bellsprout,
+    [SPECIES_WEEPINBELL]  = sAnims_Weepinbell,
+    [SPECIES_VICTREEBEL]  = sAnims_Victreebel,
+    [SPECIES_TENTACOOL]   = sAnims_Tentacool,
+    [SPECIES_TENTACRUEL]  = sAnims_Tentacruel,
+    [SPECIES_GEODUDE]     = sAnims_Geodude,
+    [SPECIES_GRAVELER]    = sAnims_Graveler,
+    [SPECIES_GOLEM]       = sAnims_Golem,
+    [SPECIES_PONYTA]      = sAnims_Ponyta,
+    [SPECIES_RAPIDASH]    = sAnims_Rapidash,
+    [SPECIES_SLOWPOKE]    = sAnims_Slowpoke,
+    [SPECIES_SLOWBRO]     = sAnims_Slowbro,
+    [SPECIES_MAGNEMITE]   = sAnims_Magnemite,
+    [SPECIES_MAGNETON]    = sAnims_Magneton,
+    [SPECIES_FARFETCHD]   = sAnims_Farfetchd,
+    [SPECIES_DODUO]       = sAnims_Doduo,
+    [SPECIES_DODRIO]      = sAnims_Dodrio,
+    [SPECIES_SEEL]        = sAnims_Seel,
+    [SPECIES_DEWGONG]     = sAnims_Dewgong,
+    [SPECIES_GRIMER]      = sAnims_Grimer,
+    [SPECIES_MUK]         = sAnims_Muk,
+    [SPECIES_SHELLDER]    = sAnims_Shellder,
+    [SPECIES_CLOYSTER]    = sAnims_Cloyster,
+    [SPECIES_GASTLY]      = sAnims_Gastly,
+    [SPECIES_HAUNTER]     = sAnims_Haunter,
+    [SPECIES_GENGAR]      = sAnims_Gengar,
+    [SPECIES_ONIX]        = sAnims_Onix,
+    [SPECIES_DROWZEE]     = sAnims_Drowzee,
+    [SPECIES_HYPNO]       = sAnims_Hypno,
+    [SPECIES_KRABBY]      = sAnims_Krabby,
+    [SPECIES_KINGLER]     = sAnims_Kingler,
+    [SPECIES_VOLTORB]     = sAnims_Voltorb,
+    [SPECIES_ELECTRODE]   = sAnims_Electrode,
+    [SPECIES_EXEGGCUTE]   = sAnims_Exeggcute,
+    [SPECIES_EXEGGUTOR]   = sAnims_Exeggutor,
+    [SPECIES_CUBONE]      = sAnims_Cubone,
+    [SPECIES_MAROWAK]     = sAnims_Marowak,
+    [SPECIES_HITMONLEE]   = sAnims_Hitmonlee,
+    [SPECIES_HITMONCHAN]  = sAnims_Hitmonchan,
+    [SPECIES_LICKITUNG]   = sAnims_Lickitung,
+    [SPECIES_KOFFING]     = sAnims_Koffing,
+    [SPECIES_WEEZING]     = sAnims_Weezing,
+    [SPECIES_RHYHORN]     = sAnims_Rhyhorn,
+    [SPECIES_RHYDON]      = sAnims_Rhydon,
+    [SPECIES_CHANSEY]     = sAnims_Chansey,
+    [SPECIES_TANGELA]     = sAnims_Tangela,
+    [SPECIES_KANGASKHAN]  = sAnims_Kangaskhan,
+    [SPECIES_HORSEA]      = sAnims_Horsea,
+    [SPECIES_SEADRA]      = sAnims_Seadra,
+    [SPECIES_GOLDEEN]     = sAnims_Goldeen,
+    [SPECIES_SEAKING]     = sAnims_Seaking,
+    [SPECIES_STARYU]      = sAnims_Staryu,
+    [SPECIES_STARMIE]     = sAnims_Starmie,
+    [SPECIES_MR_MIME]     = sAnims_MrMime,
+    [SPECIES_SCYTHER]     = sAnims_Scyther,
+    [SPECIES_JYNX]        = sAnims_Jynx,
+    [SPECIES_ELECTABUZZ]  = sAnims_Electabuzz,
+    [SPECIES_MAGMAR]      = sAnims_Magmar,
+    [SPECIES_PINSIR]      = sAnims_Pinsir,
+    [SPECIES_TAUROS]      = sAnims_Tauros,
+    [SPECIES_MAGIKARP]    = sAnims_Magikarp,
+    [SPECIES_GYARADOS]    = sAnims_Gyarados,
+    [SPECIES_LAPRAS]      = sAnims_Lapras,
+    [SPECIES_DITTO]       = sAnims_Ditto,
+    [SPECIES_EEVEE]       = sAnims_Eevee,
+    [SPECIES_VAPOREON]    = sAnims_Vaporeon,
+    [SPECIES_JOLTEON]     = sAnims_Jolteon,
+    [SPECIES_FLAREON]     = sAnims_Flareon,
+    [SPECIES_PORYGON]     = sAnims_Porygon,
+    [SPECIES_OMANYTE]     = sAnims_Omanyte,
+    [SPECIES_OMASTAR]     = sAnims_Omastar,
+    [SPECIES_KABUTO]      = sAnims_Kabuto,
+    [SPECIES_KABUTOPS]    = sAnims_Kabutops,
+    [SPECIES_AERODACTYL]  = sAnims_Aerodactyl,
+    [SPECIES_SNORLAX]     = sAnims_Snorlax,
+    [SPECIES_ARTICUNO]    = sAnims_Articuno,
+    [SPECIES_ZAPDOS]      = sAnims_Zapdos,
+    [SPECIES_MOLTRES]     = sAnims_Moltres,
+    [SPECIES_DRATINI]     = sAnims_Dratini,
+    [SPECIES_DRAGONAIR]   = sAnims_Dragonair,
+    [SPECIES_DRAGONITE]   = sAnims_Dragonite,
+    [SPECIES_MEWTWO]      = sAnims_Mewtwo,
+    [SPECIES_MEW]         = sAnims_Mew,
+    [SPECIES_CHIKORITA]   = sAnims_Chikorita,
+    [SPECIES_BAYLEEF]     = sAnims_Bayleef,
+    [SPECIES_MEGANIUM]    = sAnims_Meganium,
+    [SPECIES_CYNDAQUIL]   = sAnims_Cyndaquil,
+    [SPECIES_QUILAVA]     = sAnims_Quilava,
+    [SPECIES_TYPHLOSION]  = sAnims_Typhlosion,
+    [SPECIES_TOTODILE]    = sAnims_Totodile,
+    [SPECIES_CROCONAW]    = sAnims_Croconaw,
+    [SPECIES_FERALIGATR]  = sAnims_Feraligatr,
+    [SPECIES_SENTRET]     = sAnims_Sentret,
+    [SPECIES_FURRET]      = sAnims_Furret,
+    [SPECIES_HOOTHOOT]    = sAnims_Hoothoot,
+    [SPECIES_NOCTOWL]     = sAnims_Noctowl,
+    [SPECIES_LEDYBA]      = sAnims_Ledyba,
+    [SPECIES_LEDIAN]      = sAnims_Ledian,
+    [SPECIES_SPINARAK]    = sAnims_Spinarak,
+    [SPECIES_ARIADOS]     = sAnims_Ariados,
+    [SPECIES_CROBAT]      = sAnims_Crobat,
+    [SPECIES_CHINCHOU]    = sAnims_Chinchou,
+    [SPECIES_LANTURN]     = sAnims_Lanturn,
+    [SPECIES_PICHU]       = sAnims_Pichu,
+    [SPECIES_CLEFFA]      = sAnims_Cleffa,
+    [SPECIES_IGGLYBUFF]   = sAnims_Igglybuff,
+    [SPECIES_TOGEPI]      = sAnims_Togepi,
+    [SPECIES_TOGETIC]     = sAnims_Togetic,
+    [SPECIES_NATU]        = sAnims_Natu,
+    [SPECIES_XATU]        = sAnims_Xatu,
+    [SPECIES_MAREEP]      = sAnims_Mareep,
+    [SPECIES_FLAAFFY]     = sAnims_Flaaffy,
+    [SPECIES_AMPHAROS]    = sAnims_Ampharos,
+    [SPECIES_BELLOSSOM]   = sAnims_Bellossom,
+    [SPECIES_MARILL]      = sAnims_Marill,
+    [SPECIES_AZUMARILL]   = sAnims_Azumarill,
+    [SPECIES_SUDOWOODO]   = sAnims_Sudowoodo,
+    [SPECIES_POLITOED]    = sAnims_Politoed,
+    [SPECIES_HOPPIP]      = sAnims_Hoppip,
+    [SPECIES_SKIPLOOM]    = sAnims_Skiploom,
+    [SPECIES_JUMPLUFF]    = sAnims_Jumpluff,
+    [SPECIES_AIPOM]       = sAnims_Aipom,
+    [SPECIES_SUNKERN]     = sAnims_Sunkern,
+    [SPECIES_SUNFLORA]    = sAnims_Sunflora,
+    [SPECIES_YANMA]       = sAnims_Yanma,
+    [SPECIES_WOOPER]      = sAnims_Wooper,
+    [SPECIES_QUAGSIRE]    = sAnims_Quagsire,
+    [SPECIES_ESPEON]      = sAnims_Espeon,
+    [SPECIES_UMBREON]     = sAnims_Umbreon,
+    [SPECIES_MURKROW]     = sAnims_Murkrow,
+    [SPECIES_SLOWKING]    = sAnims_Slowking,
+    [SPECIES_MISDREAVUS]  = sAnims_Misdreavus,
+    [SPECIES_UNOWN]       = sAnims_Unown,
+    [SPECIES_WOBBUFFET]   = sAnims_Wobbuffet,
+    [SPECIES_GIRAFARIG]   = sAnims_Girafarig,
+    [SPECIES_PINECO]      = sAnims_Pineco,
+    [SPECIES_FORRETRESS]  = sAnims_Forretress,
+    [SPECIES_DUNSPARCE]   = sAnims_Dunsparce,
+    [SPECIES_GLIGAR]      = sAnims_Gligar,
+    [SPECIES_STEELIX]     = sAnims_Steelix,
+    [SPECIES_SNUBBULL]    = sAnims_Snubbull,
+    [SPECIES_GRANBULL]    = sAnims_Granbull,
+    [SPECIES_QWILFISH]    = sAnims_Qwilfish,
+    [SPECIES_SCIZOR]      = sAnims_Scizor,
+    [SPECIES_SHUCKLE]     = sAnims_Shuckle,
+    [SPECIES_HERACROSS]   = sAnims_Heracross,
+    [SPECIES_SNEASEL]     = sAnims_Sneasel,
+    [SPECIES_TEDDIURSA]   = sAnims_Teddiursa,
+    [SPECIES_URSARING]    = sAnims_Ursaring,
+    [SPECIES_SLUGMA]      = sAnims_Slugma,
+    [SPECIES_MAGCARGO]    = sAnims_Magcargo,
+    [SPECIES_SWINUB]      = sAnims_Swinub,
+    [SPECIES_PILOSWINE]   = sAnims_Piloswine,
+    [SPECIES_CORSOLA]     = sAnims_Corsola,
+    [SPECIES_REMORAID]    = sAnims_Remoraid,
+    [SPECIES_OCTILLERY]   = sAnims_Octillery,
+    [SPECIES_DELIBIRD]    = sAnims_Delibird,
+    [SPECIES_MANTINE]     = sAnims_Mantine,
+    [SPECIES_SKARMORY]    = sAnims_Skarmory,
+    [SPECIES_HOUNDOUR]    = sAnims_Houndour,
+    [SPECIES_HOUNDOOM]    = sAnims_Houndoom,
+    [SPECIES_KINGDRA]     = sAnims_Kingdra,
+    [SPECIES_PHANPY]      = sAnims_Phanpy,
+    [SPECIES_DONPHAN]     = sAnims_Donphan,
+    [SPECIES_PORYGON2]    = sAnims_Porygon2,
+    [SPECIES_STANTLER]    = sAnims_Stantler,
+    [SPECIES_SMEARGLE]    = sAnims_Smeargle,
+    [SPECIES_TYROGUE]     = sAnims_Tyrogue,
+    [SPECIES_HITMONTOP]   = sAnims_Hitmontop,
+    [SPECIES_SMOOCHUM]    = sAnims_Smoochum,
+    [SPECIES_ELEKID]      = sAnims_Elekid,
+    [SPECIES_MAGBY]       = sAnims_Magby,
+    [SPECIES_MILTANK]     = sAnims_Miltank,
+    [SPECIES_BLISSEY]     = sAnims_Blissey,
+    [SPECIES_RAIKOU]      = sAnims_Raikou,
+    [SPECIES_ENTEI]       = sAnims_Entei,
+    [SPECIES_SUICUNE]     = sAnims_Suicune,
+    [SPECIES_LARVITAR]    = sAnims_Larvitar,
+    [SPECIES_PUPITAR]     = sAnims_Pupitar,
+    [SPECIES_TYRANITAR]   = sAnims_Tyranitar,
+    [SPECIES_LUGIA]       = sAnims_Lugia,
+    [SPECIES_HO_OH]       = sAnims_HoOh,
+    [SPECIES_CELEBI]      = sAnims_Celebi,
+    [SPECIES_OLD_UNOWN_B] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_C] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_D] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_E] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_F] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_G] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_H] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_I] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_J] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_K] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_L] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_M] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_N] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_O] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_P] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_Q] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_R] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_S] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_T] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_U] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_V] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_W] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_X] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_Y] = sAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_Z] = sAnims_OldUnownB,
+    [SPECIES_TREECKO]     = sAnims_Treecko,
+    [SPECIES_GROVYLE]     = sAnims_Grovyle,
+    [SPECIES_SCEPTILE]    = sAnims_Sceptile,
+    [SPECIES_TORCHIC]     = sAnims_Torchic,
+    [SPECIES_COMBUSKEN]   = sAnims_Combusken,
+    [SPECIES_BLAZIKEN]    = sAnims_Blaziken,
+    [SPECIES_MUDKIP]      = sAnims_Mudkip,
+    [SPECIES_MARSHTOMP]   = sAnims_Marshtomp,
+    [SPECIES_SWAMPERT]    = sAnims_Swampert,
+    [SPECIES_POOCHYENA]   = sAnims_Poochyena,
+    [SPECIES_MIGHTYENA]   = sAnims_Mightyena,
+    [SPECIES_ZIGZAGOON]   = sAnims_Zigzagoon,
+    [SPECIES_LINOONE]     = sAnims_Linoone,
+    [SPECIES_WURMPLE]     = sAnims_Wurmple,
+    [SPECIES_SILCOON]     = sAnims_Silcoon,
+    [SPECIES_BEAUTIFLY]   = sAnims_Beautifly,
+    [SPECIES_CASCOON]     = sAnims_Cascoon,
+    [SPECIES_DUSTOX]      = sAnims_Dustox,
+    [SPECIES_LOTAD]       = sAnims_Lotad,
+    [SPECIES_LOMBRE]      = sAnims_Lombre,
+    [SPECIES_LUDICOLO]    = sAnims_Ludicolo,
+    [SPECIES_SEEDOT]      = sAnims_Seedot,
+    [SPECIES_NUZLEAF]     = sAnims_Nuzleaf,
+    [SPECIES_SHIFTRY]     = sAnims_Shiftry,
+    [SPECIES_NINCADA]     = sAnims_Nincada,
+    [SPECIES_NINJASK]     = sAnims_Ninjask,
+    [SPECIES_SHEDINJA]    = sAnims_Shedinja,
+    [SPECIES_TAILLOW]     = sAnims_Taillow,
+    [SPECIES_SWELLOW]     = sAnims_Swellow,
+    [SPECIES_SHROOMISH]   = sAnims_Shroomish,
+    [SPECIES_BRELOOM]     = sAnims_Breloom,
+    [SPECIES_SPINDA]      = sAnims_Spinda,
+    [SPECIES_WINGULL]     = sAnims_Wingull,
+    [SPECIES_PELIPPER]    = sAnims_Pelipper,
+    [SPECIES_SURSKIT]     = sAnims_Surskit,
+    [SPECIES_MASQUERAIN]  = sAnims_Masquerain,
+    [SPECIES_WAILMER]     = sAnims_Wailmer,
+    [SPECIES_WAILORD]     = sAnims_Wailord,
+    [SPECIES_SKITTY]      = sAnims_Skitty,
+    [SPECIES_DELCATTY]    = sAnims_Delcatty,
+    [SPECIES_KECLEON]     = sAnims_Kecleon,
+    [SPECIES_BALTOY]      = sAnims_Baltoy,
+    [SPECIES_CLAYDOL]     = sAnims_Claydol,
+    [SPECIES_NOSEPASS]    = sAnims_Nosepass,
+    [SPECIES_TORKOAL]     = sAnims_Torkoal,
+    [SPECIES_SABLEYE]     = sAnims_Sableye,
+    [SPECIES_BARBOACH]    = sAnims_Barboach,
+    [SPECIES_WHISCASH]    = sAnims_Whiscash,
+    [SPECIES_LUVDISC]     = sAnims_Luvdisc,
+    [SPECIES_CORPHISH]    = sAnims_Corphish,
+    [SPECIES_CRAWDAUNT]   = sAnims_Crawdaunt,
+    [SPECIES_FEEBAS]      = sAnims_Feebas,
+    [SPECIES_MILOTIC]     = sAnims_Milotic,
+    [SPECIES_CARVANHA]    = sAnims_Carvanha,
+    [SPECIES_SHARPEDO]    = sAnims_Sharpedo,
+    [SPECIES_TRAPINCH]    = sAnims_Trapinch,
+    [SPECIES_VIBRAVA]     = sAnims_Vibrava,
+    [SPECIES_FLYGON]      = sAnims_Flygon,
+    [SPECIES_MAKUHITA]    = sAnims_Makuhita,
+    [SPECIES_HARIYAMA]    = sAnims_Hariyama,
+    [SPECIES_ELECTRIKE]   = sAnims_Electrike,
+    [SPECIES_MANECTRIC]   = sAnims_Manectric,
+    [SPECIES_NUMEL]       = sAnims_Numel,
+    [SPECIES_CAMERUPT]    = sAnims_Camerupt,
+    [SPECIES_SPHEAL]      = sAnims_Spheal,
+    [SPECIES_SEALEO]      = sAnims_Sealeo,
+    [SPECIES_WALREIN]     = sAnims_Walrein,
+    [SPECIES_CACNEA]      = sAnims_Cacnea,
+    [SPECIES_CACTURNE]    = sAnims_Cacturne,
+    [SPECIES_SNORUNT]     = sAnims_Snorunt,
+    [SPECIES_GLALIE]      = sAnims_Glalie,
+    [SPECIES_LUNATONE]    = sAnims_Lunatone,
+    [SPECIES_SOLROCK]     = sAnims_Solrock,
+    [SPECIES_AZURILL]     = sAnims_Azurill,
+    [SPECIES_SPOINK]      = sAnims_Spoink,
+    [SPECIES_GRUMPIG]     = sAnims_Grumpig,
+    [SPECIES_PLUSLE]      = sAnims_Plusle,
+    [SPECIES_MINUN]       = sAnims_Minun,
+    [SPECIES_MAWILE]      = sAnims_Mawile,
+    [SPECIES_MEDITITE]    = sAnims_Meditite,
+    [SPECIES_MEDICHAM]    = sAnims_Medicham,
+    [SPECIES_SWABLU]      = sAnims_Swablu,
+    [SPECIES_ALTARIA]     = sAnims_Altaria,
+    [SPECIES_WYNAUT]      = sAnims_Wynaut,
+    [SPECIES_DUSKULL]     = sAnims_Duskull,
+    [SPECIES_DUSCLOPS]    = sAnims_Dusclops,
+    [SPECIES_ROSELIA]     = sAnims_Roselia,
+    [SPECIES_SLAKOTH]     = sAnims_Slakoth,
+    [SPECIES_VIGOROTH]    = sAnims_Vigoroth,
+    [SPECIES_SLAKING]     = sAnims_Slaking,
+    [SPECIES_GULPIN]      = sAnims_Gulpin,
+    [SPECIES_SWALOT]      = sAnims_Swalot,
+    [SPECIES_TROPIUS]     = sAnims_Tropius,
+    [SPECIES_WHISMUR]     = sAnims_Whismur,
+    [SPECIES_LOUDRED]     = sAnims_Loudred,
+    [SPECIES_EXPLOUD]     = sAnims_Exploud,
+    [SPECIES_CLAMPERL]    = sAnims_Clamperl,
+    [SPECIES_HUNTAIL]     = sAnims_Huntail,
+    [SPECIES_GOREBYSS]    = sAnims_Gorebyss,
+    [SPECIES_ABSOL]       = sAnims_Absol,
+    [SPECIES_SHUPPET]     = sAnims_Shuppet,
+    [SPECIES_BANETTE]     = sAnims_Banette,
+    [SPECIES_SEVIPER]     = sAnims_Seviper,
+    [SPECIES_ZANGOOSE]    = sAnims_Zangoose,
+    [SPECIES_RELICANTH]   = sAnims_Relicanth,
+    [SPECIES_ARON]        = sAnims_Aron,
+    [SPECIES_LAIRON]      = sAnims_Lairon,
+    [SPECIES_AGGRON]      = sAnims_Aggron,
+    [SPECIES_CASTFORM]    = sAnims_Castform,
+    [SPECIES_VOLBEAT]     = sAnims_Volbeat,
+    [SPECIES_ILLUMISE]    = sAnims_Illumise,
+    [SPECIES_LILEEP]      = sAnims_Lileep,
+    [SPECIES_CRADILY]     = sAnims_Cradily,
+    [SPECIES_ANORITH]     = sAnims_Anorith,
+    [SPECIES_ARMALDO]     = sAnims_Armaldo,
+    [SPECIES_RALTS]       = sAnims_Ralts,
+    [SPECIES_KIRLIA]      = sAnims_Kirlia,
+    [SPECIES_GARDEVOIR]   = sAnims_Gardevoir,
+    [SPECIES_BAGON]       = sAnims_Bagon,
+    [SPECIES_SHELGON]     = sAnims_Shelgon,
+    [SPECIES_SALAMENCE]   = sAnims_Salamence,
+    [SPECIES_BELDUM]      = sAnims_Beldum,
+    [SPECIES_METANG]      = sAnims_Metang,
+    [SPECIES_METAGROSS]   = sAnims_Metagross,
+    [SPECIES_REGIROCK]    = sAnims_Regirock,
+    [SPECIES_REGICE]      = sAnims_Regice,
+    [SPECIES_REGISTEEL]   = sAnims_Registeel,
+    [SPECIES_KYOGRE]      = sAnims_Kyogre,
+    [SPECIES_GROUDON]     = sAnims_Groudon,
+    [SPECIES_RAYQUAZA]    = sAnims_Rayquaza,
+    [SPECIES_LATIAS]      = sAnims_Latias,
+    [SPECIES_LATIOS]      = sAnims_Latios,
+    [SPECIES_JIRACHI]     = sAnims_Jirachi,
+    [SPECIES_DEOXYS]      = sAnims_Deoxys,
+    [SPECIES_CHIMECHO]    = sAnims_Chimecho,
+    [SPECIES_EGG]         = sAnims_Egg,
+    [SPECIES_UNOWN_B]     = sAnims_UnownB,
+    [SPECIES_UNOWN_C]     = sAnims_UnownC,
+    [SPECIES_UNOWN_D]     = sAnims_UnownD,
+    [SPECIES_UNOWN_E]     = sAnims_UnownE,
+    [SPECIES_UNOWN_F]     = sAnims_UnownF,
+    [SPECIES_UNOWN_G]     = sAnims_UnownG,
+    [SPECIES_UNOWN_H]     = sAnims_UnownH,
+    [SPECIES_UNOWN_I]     = sAnims_UnownI,
+    [SPECIES_UNOWN_J]     = sAnims_UnownJ,
+    [SPECIES_UNOWN_K]     = sAnims_UnownK,
+    [SPECIES_UNOWN_L]     = sAnims_UnownL,
+    [SPECIES_UNOWN_M]     = sAnims_UnownM,
+    [SPECIES_UNOWN_N]     = sAnims_UnownN,
+    [SPECIES_UNOWN_O]     = sAnims_UnownO,
+    [SPECIES_UNOWN_P]     = sAnims_UnownP,
+    [SPECIES_UNOWN_Q]     = sAnims_UnownQ,
+    [SPECIES_UNOWN_R]     = sAnims_UnownR,
+    [SPECIES_UNOWN_S]     = sAnims_UnownS,
+    [SPECIES_UNOWN_T]     = sAnims_UnownT,
+    [SPECIES_UNOWN_U]     = sAnims_UnownU,
+    [SPECIES_UNOWN_V]     = sAnims_UnownV,
+    [SPECIES_UNOWN_W]     = sAnims_UnownW,
+    [SPECIES_UNOWN_X]     = sAnims_UnownX,
+    [SPECIES_UNOWN_Y]     = sAnims_UnownY,
+    [SPECIES_UNOWN_Z]     = sAnims_UnownZ,
+    [SPECIES_UNOWN_EMARK] = sAnims_UnownEMark,
+    [SPECIES_UNOWN_QMARK] = sAnims_UnownQMark,
 
-#undef ANIM_CMD
-#undef ANIM_CMD_FULL
+};
diff --git a/src/data/pokemon_graphics/unknown_anims.h b/src/data/pokemon_graphics/unknown_anims.h
deleted file mode 100644
index ea7ab34a2..000000000
--- a/src/data/pokemon_graphics/unknown_anims.h
+++ /dev/null
@@ -1,2322 +0,0 @@
-// unused and unkown
-static const union AnimCmd sUnknownAnim_BLAZIKEN_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_FRAME(1, 25),
-    ANIMCMD_FRAME(0, 7),
-    ANIMCMD_FRAME(1, 7),
-    ANIMCMD_FRAME(0, 7),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_BLAZIKEN_2[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_FRAME(2, 8),
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_BLAZIKEN_3[] =
-{
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(2, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_BLAZIKEN_4[] =
-{
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MARSHTOMP_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MARSHTOMP_2[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_FRAME(2, 12),
-    ANIMCMD_FRAME(0, 14),
-    ANIMCMD_FRAME(2, 12),
-    ANIMCMD_FRAME(0, 14),
-    ANIMCMD_FRAME(2, 12),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MARSHTOMP_3[] =
-{
-    ANIMCMD_FRAME(0, 14),
-    ANIMCMD_FRAME(2, 12),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_POOCHYENA_1[] =
-{
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(1, 10),
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(1, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_POOCHYENA_2[] =
-{
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(2, 10),
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(2, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MIGHTYENA_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_ZIGZAGOON_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_LINOONE_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_WURMPLE_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_WURMPLE_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SILCOON_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SILCOON_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_BEAUTIFLY_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_BEAUTIFLY_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_CASCOON_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_CASCOON_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_DUSTOX_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_DUSTOX_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_LOMBRE_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_LUDICOLO_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_LUDICOLO_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SEEDOT_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_NUZLEAF_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SHIFTRY_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SHIFTRY_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_TAILLOW_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SWELLOW_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SHROOMISH_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_BRELOOM_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_WINGULL_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_PELIPPER_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_PELIPPER_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SURSKIT_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SURSKIT_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MASQUERAIN_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MASQUERAIN_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_WAILMER_1[] =
-{
-    ANIMCMD_FRAME(0, 15),
-    ANIMCMD_FRAME(8, 15),
-    ANIMCMD_FRAME(2, 22),
-    ANIMCMD_FRAME(8, 5),
-    ANIMCMD_FRAME(3, 8),
-    ANIMCMD_FRAME(4, 5),
-    ANIMCMD_FRAME(6, 5),
-    ANIMCMD_FRAME(4, 5),
-    ANIMCMD_FRAME(6, 5),
-    ANIMCMD_FRAME(4, 5),
-    ANIMCMD_FRAME(6, 5),
-    ANIMCMD_FRAME(4, 5),
-    ANIMCMD_FRAME(6, 5),
-    ANIMCMD_FRAME(5, 5),
-    ANIMCMD_FRAME(7, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_WAILMER_2[] =
-{
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(8, 15),
-    ANIMCMD_FRAME(2, 15),
-    ANIMCMD_FRAME(8, 15),
-    ANIMCMD_FRAME(9, 15),
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(9, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_WAILMER_3[] =
-{
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(9, 10),
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(10, 20),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_WAILMER_4[] =
-{
-    ANIMCMD_FRAME(0, 15),
-    ANIMCMD_FRAME(11, 15),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SKITTY_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_DELCATTY_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_KECLEON_1[] =
-{
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(1, 7),
-    ANIMCMD_FRAME(2, 7),
-    ANIMCMD_FRAME(3, 4),
-    ANIMCMD_FRAME(4, 4),
-    ANIMCMD_FRAME(3, 4),
-    ANIMCMD_FRAME(4, 4),
-    ANIMCMD_FRAME(3, 4),
-    ANIMCMD_FRAME(4, 4),
-    ANIMCMD_FRAME(3, 4),
-    ANIMCMD_FRAME(1, 6),
-    ANIMCMD_FRAME(5, 2),
-    ANIMCMD_FRAME(0, 2),
-    ANIMCMD_FRAME(5, 2),
-    ANIMCMD_FRAME(0, 2),
-    ANIMCMD_FRAME(5, 2),
-    ANIMCMD_FRAME(6, 2),
-    ANIMCMD_FRAME(5, 2),
-    ANIMCMD_FRAME(6, 2),
-    ANIMCMD_FRAME(6, 10),
-    ANIMCMD_FRAME(5, 4),
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_KECLEON_2[] =
-{
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_FRAME(9, 3),
-    ANIMCMD_FRAME(0, 3),
-    ANIMCMD_FRAME(9, 3),
-    ANIMCMD_FRAME(0, 3),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_KECLEON_3[] =
-{
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_FRAME(9, 3),
-    ANIMCMD_FRAME(0, 3),
-    ANIMCMD_FRAME(9, 3),
-    ANIMCMD_FRAME(0, 3),
-    ANIMCMD_FRAME(7, 12),
-    ANIMCMD_FRAME(8, 12),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_KECLEON_4[] =
-{
-    ANIMCMD_FRAME(0,18),
-    ANIMCMD_FRAME(10, 18),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_BALTOY_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_CLAYDOL_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_NOSEPASS_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SABLEYE_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SABLEYE_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_LUVDISC_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_LUVDISC_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_FEEBAS_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_FEEBAS_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MILOTIC_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MILOTIC_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_CARVANHA_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_CARVANHA_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SHARPEDO_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SHARPEDO_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_TRAPINCH_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_VIBRAVA_1[] =
-{
-    ANIMCMD_FRAME(0, 63),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_FLYGON_1[] =
-{
-    ANIMCMD_FRAME(0, 63),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MAKUHITA_1[] =
-{
-    ANIMCMD_FRAME(0, 63),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_HARIYAMA_1[] =
-{
-    ANIMCMD_FRAME(0, 63),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_ELECTRIKE_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_ELECTRIKE_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MANECTRIC_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_NUMEL_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_NUMEL_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_CAMERUPT_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SPHEAL_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SEALEO_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_WALREIN_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_FRAME(1, 18),
-    ANIMCMD_FRAME(0, 18),
-    ANIMCMD_FRAME(1, 18),
-    ANIMCMD_FRAME(0, 18),
-    ANIMCMD_FRAME(1, 18),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_WALREIN_2[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_FRAME(2, 18),
-    ANIMCMD_FRAME(0, 18),
-    ANIMCMD_FRAME(2, 18),
-    ANIMCMD_FRAME(0, 18),
-    ANIMCMD_FRAME(2, 18),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_AZURILL_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(2, 5),
-    ANIMCMD_FRAME(3, 6),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(2, 5),
-    ANIMCMD_FRAME(3, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 7),
-    ANIMCMD_FRAME(0, 4),
-    ANIMCMD_FRAME(4, 4),
-    ANIMCMD_FRAME(0, 4),
-    ANIMCMD_FRAME(4, 4),
-    ANIMCMD_FRAME(0, 20),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_AZURILL_2[] =
-{
-    ANIMCMD_FRAME(0, 6),
-    ANIMCMD_FRAME(1, 6),
-    ANIMCMD_FRAME(2, 6),
-    ANIMCMD_FRAME(3, 6),
-    ANIMCMD_FRAME(1, 6),
-    ANIMCMD_FRAME(0, 6),
-    ANIMCMD_FRAME(1, 6),
-    ANIMCMD_FRAME(0, 30),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_AZURILL_3[] =
-{
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(5, 12),
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(6, 12),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_AZURILL_4[] =
-{
-    ANIMCMD_FRAME(7, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SPOINK_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SPOINK_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_GRUMPIG_1[] =
-{
-    ANIMCMD_FRAME(0, 63),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_PLUSLE_1[] =
-{
-    ANIMCMD_FRAME(0, 63),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MINUN_1[] =
-{
-    ANIMCMD_FRAME(0, 63),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MAWILE_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MEDITITE_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_MEDICHAM_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SWABLU_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_FRAME(1, 10),
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(1, 10),
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(1, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SWABLU_2[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_FRAME(2, 8),
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(2, 8),
-    ANIMCMD_FRAME(0, 12),
-    ANIMCMD_FRAME(2, 8),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_ALTARIA_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_WYNAUT_1[] =
-{
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_WYNAUT_2[] =
-{
-    ANIMCMD_FRAME(1, 9),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_DUSKULL_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_DUSKULL_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_DUSCLOPS_1[] =
-{
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_DUSCLOPS_2[] =
-{
-    ANIMCMD_FRAME(1, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SLAKOTH_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_VIGOROTH_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SLAKING_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_GULPIN_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SWALOT_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_TROPIUS_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_CLAMPERL_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_ABSOL_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SHUPPET_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SHUPPET_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_BANETTE_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_ARON_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_LAIRON_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_AGGRON_1[] =
-{
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_CASTFORM_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_CASTFORM_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_CASTFORM_3[] =
-{
-    ANIMCMD_FRAME(2, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_CASTFORM_4[] =
-{
-    ANIMCMD_FRAME(3, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_VOLBEAT_1[] =
-{
-    ANIMCMD_FRAME(0, 63),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_ILLUMISE_1[] =
-{
-    ANIMCMD_FRAME(0, 63),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_BAGON_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_BAGON_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SALAMENCE_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_SALAMENCE_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_REGIROCK_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_REGICE_1[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_REGISTEEL_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_REGISTEEL_2[] =
-{
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_RAYQUAZA_1[] =
-{
-    ANIMCMD_FRAME(0, 20),
-    ANIMCMD_FRAME(1, 30),
-    ANIMCMD_FRAME(0, 20),
-    ANIMCMD_FRAME(1, 30),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_RAYQUAZA_2[] =
-{
-    ANIMCMD_FRAME(0, 20),
-    ANIMCMD_FRAME(2, 20),
-    ANIMCMD_FRAME(0, 20),
-    ANIMCMD_FRAME(2, 20),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_Unused1[] =
-{
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_Unused2[] =
-{
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd sUnknownAnim_JIRACHI_1[] =
-{
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_END,
-};
-
-static const union AnimCmd *const sUnknownAnims_NONE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_BULBASAUR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_IVYSAUR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_VENUSAUR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CHARMANDER[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CHARMELEON[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CHARIZARD[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SQUIRTLE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_WARTORTLE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_BLASTOISE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CATERPIE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_METAPOD[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_BUTTERFREE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_WEEDLE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_KAKUNA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_BEEDRILL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PIDGEY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PIDGEOTTO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PIDGEOT[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_RATTATA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_RATICATE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SPEAROW[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_FEAROW[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_EKANS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ARBOK[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PIKACHU[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_RAICHU[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SANDSHREW[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SANDSLASH[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_NIDORAN_F[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_NIDORINA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_NIDOQUEEN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_NIDORAN_M[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_NIDORINO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_NIDOKING[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CLEFAIRY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CLEFABLE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_VULPIX[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_NINETALES[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_JIGGLYPUFF[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_WIGGLYTUFF[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ZUBAT[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GOLBAT[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ODDISH[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GLOOM[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_VILEPLUME[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PARAS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PARASECT[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_VENONAT[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_VENOMOTH[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DIGLETT[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DUGTRIO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MEOWTH[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PERSIAN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PSYDUCK[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GOLDUCK[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MANKEY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PRIMEAPE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GROWLITHE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ARCANINE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_POLIWAG[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_POLIWHIRL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_POLIWRATH[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ABRA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_KADABRA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ALAKAZAM[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MACHOP[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MACHOKE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MACHAMP[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_BELLSPROUT[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_WEEPINBELL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_VICTREEBEL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TENTACOOL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TENTACRUEL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GEODUDE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GRAVELER[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GOLEM[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PONYTA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_RAPIDASH[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SLOWPOKE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SLOWBRO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MAGNEMITE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MAGNETON[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_FARFETCHD[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DODUO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DODRIO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SEEL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DEWGONG[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GRIMER[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MUK[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SHELLDER[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CLOYSTER[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GASTLY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HAUNTER[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GENGAR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ONIX[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DROWZEE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HYPNO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_KRABBY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_KINGLER[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_VOLTORB[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ELECTRODE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_EXEGGCUTE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_EXEGGUTOR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CUBONE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MAROWAK[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HITMONLEE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HITMONCHAN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_LICKITUNG[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_KOFFING[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_WEEZING[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_RHYHORN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_RHYDON[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CHANSEY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TANGELA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_KANGASKHAN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HORSEA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SEADRA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GOLDEEN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SEAKING[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_STARYU[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_STARMIE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MR_MIME[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SCYTHER[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_JYNX[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ELECTABUZZ[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MAGMAR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PINSIR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TAUROS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MAGIKARP[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GYARADOS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_LAPRAS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DITTO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_EEVEE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_VAPOREON[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_JOLTEON[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_FLAREON[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PORYGON[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_OMANYTE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_OMASTAR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_KABUTO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_KABUTOPS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_AERODACTYL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SNORLAX[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ARTICUNO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ZAPDOS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MOLTRES[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DRATINI[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DRAGONAIR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DRAGONITE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MEWTWO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MEW[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CHIKORITA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_BAYLEEF[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MEGANIUM[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CYNDAQUIL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_QUILAVA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TYPHLOSION[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TOTODILE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CROCONAW[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_FERALIGATR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SENTRET[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_FURRET[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HOOTHOOT[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_NOCTOWL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_LEDYBA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_LEDIAN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SPINARAK[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ARIADOS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CROBAT[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CHINCHOU[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_LANTURN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PICHU[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CLEFFA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_IGGLYBUFF[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TOGEPI[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TOGETIC[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_NATU[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_XATU[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MAREEP[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_FLAAFFY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_AMPHAROS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_BELLOSSOM[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MARILL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_AZUMARILL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SUDOWOODO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_POLITOED[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HOPPIP[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SKIPLOOM[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_JUMPLUFF[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_AIPOM[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SUNKERN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SUNFLORA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_YANMA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_WOOPER[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_QUAGSIRE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ESPEON[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UMBREON[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MURKROW[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SLOWKING[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MISDREAVUS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_WOBBUFFET[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GIRAFARIG[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PINECO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_FORRETRESS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DUNSPARCE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GLIGAR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_STEELIX[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SNUBBULL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GRANBULL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_QWILFISH[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SCIZOR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SHUCKLE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HERACROSS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SNEASEL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TEDDIURSA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_URSARING[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SLUGMA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MAGCARGO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SWINUB[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PILOSWINE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CORSOLA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_REMORAID[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_OCTILLERY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DELIBIRD[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MANTINE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SKARMORY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HOUNDOUR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HOUNDOOM[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_KINGDRA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PHANPY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_DONPHAN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PORYGON2[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_STANTLER[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SMEARGLE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TYROGUE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HITMONTOP[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SMOOCHUM[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ELEKID[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MAGBY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_MILTANK[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_BLISSEY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_RAIKOU[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ENTEI[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SUICUNE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_LARVITAR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_PUPITAR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TYRANITAR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_LUGIA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_HO_OH[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CELEBI[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_OLD_UNOWN[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TREECKO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GROVYLE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SCEPTILE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_TORCHIC[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_COMBUSKEN[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_BLAZIKEN[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_BLAZIKEN_1,
-    sUnknownAnim_BLAZIKEN_2,
-    sUnknownAnim_BLAZIKEN_3,
-    sUnknownAnim_BLAZIKEN_4,
-};
-
-static const union AnimCmd *const sUnknownAnims_MUDKIP[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_MARSHTOMP[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_MARSHTOMP_1,
-    sUnknownAnim_MARSHTOMP_2,
-    sUnknownAnim_MARSHTOMP_3,
-};
-
-static const union AnimCmd *const sUnknownAnims_SWAMPERT[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_POOCHYENA[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_POOCHYENA_1,
-    sUnknownAnim_POOCHYENA_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_MIGHTYENA[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_MIGHTYENA_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_ZIGZAGOON[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_ZIGZAGOON_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_LINOONE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_LINOONE_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_WURMPLE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_WURMPLE_1,
-    sUnknownAnim_WURMPLE_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_SILCOON[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SILCOON_1,
-    sUnknownAnim_SILCOON_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_BEAUTIFLY[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_BEAUTIFLY_1,
-    sUnknownAnim_BEAUTIFLY_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_CASCOON[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_CASCOON_1,
-    sUnknownAnim_CASCOON_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_DUSTOX[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_DUSTOX_1,
-    sUnknownAnim_DUSTOX_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_LOTAD[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_LOMBRE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_LOMBRE_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_LUDICOLO[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_LUDICOLO_1,
-    sUnknownAnim_LUDICOLO_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_SEEDOT[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SEEDOT_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_NUZLEAF[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_NUZLEAF_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_SHIFTRY[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SHIFTRY_1,
-    sUnknownAnim_SHIFTRY_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_NINCADA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_NINJASK[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SHEDINJA[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_TAILLOW[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_TAILLOW_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_SWELLOW[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SWELLOW_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_SHROOMISH[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SHROOMISH_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_BRELOOM[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_BRELOOM_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_SPINDA[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_WINGULL[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_WINGULL_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_PELIPPER[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_PELIPPER_1,
-    sUnknownAnim_PELIPPER_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_SURSKIT[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SURSKIT_1,
-    sUnknownAnim_SURSKIT_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_MASQUERAIN[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_MASQUERAIN_1,
-    sUnknownAnim_MASQUERAIN_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_WAILMER[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_WAILMER_1,
-    sUnknownAnim_WAILMER_2,
-    sUnknownAnim_WAILMER_3,
-    sUnknownAnim_WAILMER_4,
-};
-
-static const union AnimCmd *const sUnknownAnims_WAILORD[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_SKITTY[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SKITTY_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_DELCATTY[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_DELCATTY_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_KECLEON[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_KECLEON_1,
-    sUnknownAnim_KECLEON_2,
-    sUnknownAnim_KECLEON_3,
-    sUnknownAnim_KECLEON_4,
-};
-
-static const union AnimCmd *const sUnknownAnims_BALTOY[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_BALTOY_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_CLAYDOL[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_CLAYDOL_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_NOSEPASS[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_NOSEPASS_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_TORKOAL[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_SABLEYE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SABLEYE_1,
-    sUnknownAnim_SABLEYE_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_BARBOACH[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_WHISCASH[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_LUVDISC[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_LUVDISC_1,
-    sUnknownAnim_LUVDISC_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_CORPHISH[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CRAWDAUNT[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_FEEBAS[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_FEEBAS_1,
-    sUnknownAnim_FEEBAS_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_MILOTIC[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_MILOTIC_1,
-    sUnknownAnim_MILOTIC_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_CARVANHA[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_CARVANHA_1,
-    sUnknownAnim_CARVANHA_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_SHARPEDO[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SHARPEDO_1,
-    sUnknownAnim_SHARPEDO_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_TRAPINCH[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_TRAPINCH_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_VIBRAVA[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_VIBRAVA_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_FLYGON[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_FLYGON_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_MAKUHITA[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_MAKUHITA_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_HARIYAMA[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_HARIYAMA_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_ELECTRIKE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_ELECTRIKE_1,
-    sUnknownAnim_ELECTRIKE_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_MANECTRIC[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_MANECTRIC_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_NUMEL[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_NUMEL_1,
-    sUnknownAnim_NUMEL_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_CAMERUPT[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_CAMERUPT_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_SPHEAL[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SPHEAL_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_SEALEO[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SEALEO_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_WALREIN[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_WALREIN_1,
-    sUnknownAnim_WALREIN_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_CACNEA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CACTURNE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SNORUNT[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GLALIE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_LUNATONE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_SOLROCK[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_AZURILL[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_AZURILL_1,
-    sUnknownAnim_AZURILL_2,
-    sUnknownAnim_AZURILL_3,
-    sUnknownAnim_AZURILL_4,
-};
-
-static const union AnimCmd *const sUnknownAnims_SPOINK[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SPOINK_1,
-    sUnknownAnim_SPOINK_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_GRUMPIG[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_GRUMPIG_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_PLUSLE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_PLUSLE_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_MINUN[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_MINUN_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_MAWILE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_MAWILE_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_MEDITITE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_MEDITITE_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_MEDICHAM[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_MEDICHAM_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_SWABLU[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SWABLU_1,
-    sUnknownAnim_SWABLU_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_ALTARIA[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_ALTARIA_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_WYNAUT[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_WYNAUT_1,
-    sUnknownAnim_WYNAUT_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_DUSKULL[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_DUSKULL_1,
-    sUnknownAnim_DUSKULL_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_DUSCLOPS[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_DUSCLOPS_1,
-    sUnknownAnim_DUSCLOPS_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_ROSELIA[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_SLAKOTH[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SLAKOTH_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_VIGOROTH[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_VIGOROTH_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_SLAKING[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SLAKING_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_GULPIN[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_GULPIN_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_SWALOT[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SWALOT_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_TROPIUS[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_TROPIUS_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_WHISMUR[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_LOUDRED[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_EXPLOUD[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_CLAMPERL[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_CLAMPERL_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_HUNTAIL[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GOREBYSS[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_ABSOL[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_ABSOL_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_SHUPPET[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SHUPPET_1,
-    sUnknownAnim_SHUPPET_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_BANETTE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_BANETTE_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_SEVIPER[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ZANGOOSE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_RELICANTH[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_ARON[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_ARON_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_LAIRON[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_LAIRON_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_AGGRON[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_AGGRON_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_CASTFORM[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_CASTFORM_1,
-    sUnknownAnim_CASTFORM_2,
-    sUnknownAnim_CASTFORM_3,
-    sUnknownAnim_CASTFORM_4,
-};
-
-static const union AnimCmd *const sUnknownAnims_VOLBEAT[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_VOLBEAT_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_ILLUMISE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_ILLUMISE_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_LILEEP[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CRADILY[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ANORITH[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_ARMALDO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_RALTS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_KIRLIA[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GARDEVOIR[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_BAGON[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_BAGON_1,
-    sUnknownAnim_BAGON_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_SHELGON[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_SALAMENCE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_SALAMENCE_1,
-    sUnknownAnim_SALAMENCE_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_BELDUM[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_METANG[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_METAGROSS[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_REGIROCK[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_REGIROCK_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_REGICE[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_REGICE_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_REGISTEEL[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_REGISTEEL_1,
-    sUnknownAnim_REGISTEEL_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_KYOGRE[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_GROUDON[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_RAYQUAZA[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_RAYQUAZA_1,
-    sUnknownAnim_RAYQUAZA_2,
-};
-
-static const union AnimCmd *const sUnknownAnims_LATIAS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_LATIOS[] = {sAnim_GeneralFrame0};
-
-static const union AnimCmd *const sUnknownAnims_JIRACHI[] =
-{
-    sAnim_GeneralFrame0,
-    sUnknownAnim_JIRACHI_1,
-};
-
-static const union AnimCmd *const sUnknownAnims_DEOXYS[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_CHIMECHO[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_EGG[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_C[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_D[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_E[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_F[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_G[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_H[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_I[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_J[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_K[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_L[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_M[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_N[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_O[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_P[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_Q[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_R[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_S[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_T[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_U[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_V[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_W[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_X[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_Y[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_Z[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_EMARK[] = {sAnim_GeneralFrame0};
-static const union AnimCmd *const sUnknownAnims_UNOWN_QMARK[] = {sAnim_GeneralFrame0};
-
-#define ANIM_CMD(name)             [SPECIES_##name] = sUnknownAnims_##name
-#define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims
-
-static const union AnimCmd *const *const sUnknownAnimsTable[] =
-{
-    ANIM_CMD(NONE),
-    ANIM_CMD(BULBASAUR),
-    ANIM_CMD(IVYSAUR),
-    ANIM_CMD(VENUSAUR),
-    ANIM_CMD(CHARMANDER),
-    ANIM_CMD(CHARMELEON),
-    ANIM_CMD(CHARIZARD),
-    ANIM_CMD(SQUIRTLE),
-    ANIM_CMD(WARTORTLE),
-    ANIM_CMD(BLASTOISE),
-    ANIM_CMD(CATERPIE),
-    ANIM_CMD(METAPOD),
-    ANIM_CMD(BUTTERFREE),
-    ANIM_CMD(WEEDLE),
-    ANIM_CMD(KAKUNA),
-    ANIM_CMD(BEEDRILL),
-    ANIM_CMD(PIDGEY),
-    ANIM_CMD(PIDGEOTTO),
-    ANIM_CMD(PIDGEOT),
-    ANIM_CMD(RATTATA),
-    ANIM_CMD(RATICATE),
-    ANIM_CMD(SPEAROW),
-    ANIM_CMD(FEAROW),
-    ANIM_CMD(EKANS),
-    ANIM_CMD(ARBOK),
-    ANIM_CMD(PIKACHU),
-    ANIM_CMD(RAICHU),
-    ANIM_CMD(SANDSHREW),
-    ANIM_CMD(SANDSLASH),
-    ANIM_CMD(NIDORAN_F),
-    ANIM_CMD(NIDORINA),
-    ANIM_CMD(NIDOQUEEN),
-    ANIM_CMD(NIDORAN_M),
-    ANIM_CMD(NIDORINO),
-    ANIM_CMD(NIDOKING),
-    ANIM_CMD(CLEFAIRY),
-    ANIM_CMD(CLEFABLE),
-    ANIM_CMD(VULPIX),
-    ANIM_CMD(NINETALES),
-    ANIM_CMD(JIGGLYPUFF),
-    ANIM_CMD(WIGGLYTUFF),
-    ANIM_CMD(ZUBAT),
-    ANIM_CMD(GOLBAT),
-    ANIM_CMD(ODDISH),
-    ANIM_CMD(GLOOM),
-    ANIM_CMD(VILEPLUME),
-    ANIM_CMD(PARAS),
-    ANIM_CMD(PARASECT),
-    ANIM_CMD(VENONAT),
-    ANIM_CMD(VENOMOTH),
-    ANIM_CMD(DIGLETT),
-    ANIM_CMD(DUGTRIO),
-    ANIM_CMD(MEOWTH),
-    ANIM_CMD(PERSIAN),
-    ANIM_CMD(PSYDUCK),
-    ANIM_CMD(GOLDUCK),
-    ANIM_CMD(MANKEY),
-    ANIM_CMD(PRIMEAPE),
-    ANIM_CMD(GROWLITHE),
-    ANIM_CMD(ARCANINE),
-    ANIM_CMD(POLIWAG),
-    ANIM_CMD(POLIWHIRL),
-    ANIM_CMD(POLIWRATH),
-    ANIM_CMD(ABRA),
-    ANIM_CMD(KADABRA),
-    ANIM_CMD(ALAKAZAM),
-    ANIM_CMD(MACHOP),
-    ANIM_CMD(MACHOKE),
-    ANIM_CMD(MACHAMP),
-    ANIM_CMD(BELLSPROUT),
-    ANIM_CMD(WEEPINBELL),
-    ANIM_CMD(VICTREEBEL),
-    ANIM_CMD(TENTACOOL),
-    ANIM_CMD(TENTACRUEL),
-    ANIM_CMD(GEODUDE),
-    ANIM_CMD(GRAVELER),
-    ANIM_CMD(GOLEM),
-    ANIM_CMD(PONYTA),
-    ANIM_CMD(RAPIDASH),
-    ANIM_CMD(SLOWPOKE),
-    ANIM_CMD(SLOWBRO),
-    ANIM_CMD(MAGNEMITE),
-    ANIM_CMD(MAGNETON),
-    ANIM_CMD(FARFETCHD),
-    ANIM_CMD(DODUO),
-    ANIM_CMD(DODRIO),
-    ANIM_CMD(SEEL),
-    ANIM_CMD(DEWGONG),
-    ANIM_CMD(GRIMER),
-    ANIM_CMD(MUK),
-    ANIM_CMD(SHELLDER),
-    ANIM_CMD(CLOYSTER),
-    ANIM_CMD(GASTLY),
-    ANIM_CMD(HAUNTER),
-    ANIM_CMD(GENGAR),
-    ANIM_CMD(ONIX),
-    ANIM_CMD(DROWZEE),
-    ANIM_CMD(HYPNO),
-    ANIM_CMD(KRABBY),
-    ANIM_CMD(KINGLER),
-    ANIM_CMD(VOLTORB),
-    ANIM_CMD(ELECTRODE),
-    ANIM_CMD(EXEGGCUTE),
-    ANIM_CMD(EXEGGUTOR),
-    ANIM_CMD(CUBONE),
-    ANIM_CMD(MAROWAK),
-    ANIM_CMD(HITMONLEE),
-    ANIM_CMD(HITMONCHAN),
-    ANIM_CMD(LICKITUNG),
-    ANIM_CMD(KOFFING),
-    ANIM_CMD(WEEZING),
-    ANIM_CMD(RHYHORN),
-    ANIM_CMD(RHYDON),
-    ANIM_CMD(CHANSEY),
-    ANIM_CMD(TANGELA),
-    ANIM_CMD(KANGASKHAN),
-    ANIM_CMD(HORSEA),
-    ANIM_CMD(SEADRA),
-    ANIM_CMD(GOLDEEN),
-    ANIM_CMD(SEAKING),
-    ANIM_CMD(STARYU),
-    ANIM_CMD(STARMIE),
-    ANIM_CMD(MR_MIME),
-    ANIM_CMD(SCYTHER),
-    ANIM_CMD(JYNX),
-    ANIM_CMD(ELECTABUZZ),
-    ANIM_CMD(MAGMAR),
-    ANIM_CMD(PINSIR),
-    ANIM_CMD(TAUROS),
-    ANIM_CMD(MAGIKARP),
-    ANIM_CMD(GYARADOS),
-    ANIM_CMD(LAPRAS),
-    ANIM_CMD(DITTO),
-    ANIM_CMD(EEVEE),
-    ANIM_CMD(VAPOREON),
-    ANIM_CMD(JOLTEON),
-    ANIM_CMD(FLAREON),
-    ANIM_CMD(PORYGON),
-    ANIM_CMD(OMANYTE),
-    ANIM_CMD(OMASTAR),
-    ANIM_CMD(KABUTO),
-    ANIM_CMD(KABUTOPS),
-    ANIM_CMD(AERODACTYL),
-    ANIM_CMD(SNORLAX),
-    ANIM_CMD(ARTICUNO),
-    ANIM_CMD(ZAPDOS),
-    ANIM_CMD(MOLTRES),
-    ANIM_CMD(DRATINI),
-    ANIM_CMD(DRAGONAIR),
-    ANIM_CMD(DRAGONITE),
-    ANIM_CMD(MEWTWO),
-    ANIM_CMD(MEW),
-    ANIM_CMD(CHIKORITA),
-    ANIM_CMD(BAYLEEF),
-    ANIM_CMD(MEGANIUM),
-    ANIM_CMD(CYNDAQUIL),
-    ANIM_CMD(QUILAVA),
-    ANIM_CMD(TYPHLOSION),
-    ANIM_CMD(TOTODILE),
-    ANIM_CMD(CROCONAW),
-    ANIM_CMD(FERALIGATR),
-    ANIM_CMD(SENTRET),
-    ANIM_CMD(FURRET),
-    ANIM_CMD(HOOTHOOT),
-    ANIM_CMD(NOCTOWL),
-    ANIM_CMD(LEDYBA),
-    ANIM_CMD(LEDIAN),
-    ANIM_CMD(SPINARAK),
-    ANIM_CMD(ARIADOS),
-    ANIM_CMD(CROBAT),
-    ANIM_CMD(CHINCHOU),
-    ANIM_CMD(LANTURN),
-    ANIM_CMD(PICHU),
-    ANIM_CMD(CLEFFA),
-    ANIM_CMD(IGGLYBUFF),
-    ANIM_CMD(TOGEPI),
-    ANIM_CMD(TOGETIC),
-    ANIM_CMD(NATU),
-    ANIM_CMD(XATU),
-    ANIM_CMD(MAREEP),
-    ANIM_CMD(FLAAFFY),
-    ANIM_CMD(AMPHAROS),
-    ANIM_CMD(BELLOSSOM),
-    ANIM_CMD(MARILL),
-    ANIM_CMD(AZUMARILL),
-    ANIM_CMD(SUDOWOODO),
-    ANIM_CMD(POLITOED),
-    ANIM_CMD(HOPPIP),
-    ANIM_CMD(SKIPLOOM),
-    ANIM_CMD(JUMPLUFF),
-    ANIM_CMD(AIPOM),
-    ANIM_CMD(SUNKERN),
-    ANIM_CMD(SUNFLORA),
-    ANIM_CMD(YANMA),
-    ANIM_CMD(WOOPER),
-    ANIM_CMD(QUAGSIRE),
-    ANIM_CMD(ESPEON),
-    ANIM_CMD(UMBREON),
-    ANIM_CMD(MURKROW),
-    ANIM_CMD(SLOWKING),
-    ANIM_CMD(MISDREAVUS),
-    ANIM_CMD(UNOWN),
-    ANIM_CMD(WOBBUFFET),
-    ANIM_CMD(GIRAFARIG),
-    ANIM_CMD(PINECO),
-    ANIM_CMD(FORRETRESS),
-    ANIM_CMD(DUNSPARCE),
-    ANIM_CMD(GLIGAR),
-    ANIM_CMD(STEELIX),
-    ANIM_CMD(SNUBBULL),
-    ANIM_CMD(GRANBULL),
-    ANIM_CMD(QWILFISH),
-    ANIM_CMD(SCIZOR),
-    ANIM_CMD(SHUCKLE),
-    ANIM_CMD(HERACROSS),
-    ANIM_CMD(SNEASEL),
-    ANIM_CMD(TEDDIURSA),
-    ANIM_CMD(URSARING),
-    ANIM_CMD(SLUGMA),
-    ANIM_CMD(MAGCARGO),
-    ANIM_CMD(SWINUB),
-    ANIM_CMD(PILOSWINE),
-    ANIM_CMD(CORSOLA),
-    ANIM_CMD(REMORAID),
-    ANIM_CMD(OCTILLERY),
-    ANIM_CMD(DELIBIRD),
-    ANIM_CMD(MANTINE),
-    ANIM_CMD(SKARMORY),
-    ANIM_CMD(HOUNDOUR),
-    ANIM_CMD(HOUNDOOM),
-    ANIM_CMD(KINGDRA),
-    ANIM_CMD(PHANPY),
-    ANIM_CMD(DONPHAN),
-    ANIM_CMD(PORYGON2),
-    ANIM_CMD(STANTLER),
-    ANIM_CMD(SMEARGLE),
-    ANIM_CMD(TYROGUE),
-    ANIM_CMD(HITMONTOP),
-    ANIM_CMD(SMOOCHUM),
-    ANIM_CMD(ELEKID),
-    ANIM_CMD(MAGBY),
-    ANIM_CMD(MILTANK),
-    ANIM_CMD(BLISSEY),
-    ANIM_CMD(RAIKOU),
-    ANIM_CMD(ENTEI),
-    ANIM_CMD(SUICUNE),
-    ANIM_CMD(LARVITAR),
-    ANIM_CMD(PUPITAR),
-    ANIM_CMD(TYRANITAR),
-    ANIM_CMD(LUGIA),
-    ANIM_CMD(HO_OH),
-    ANIM_CMD(CELEBI),
-    ANIM_CMD_FULL(OLD_UNOWN_B, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_C, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_D, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_E, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_F, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_G, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_H, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_I, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_J, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_K, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_L, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_M, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_N, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_O, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_P, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_Q, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_R, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_S, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_T, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_U, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_V, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_W, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_X, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_Y, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD_FULL(OLD_UNOWN_Z, sUnknownAnims_OLD_UNOWN),
-    ANIM_CMD(TREECKO),
-    ANIM_CMD(GROVYLE),
-    ANIM_CMD(SCEPTILE),
-    ANIM_CMD(TORCHIC),
-    ANIM_CMD(COMBUSKEN),
-    ANIM_CMD(BLAZIKEN),
-    ANIM_CMD(MUDKIP),
-    ANIM_CMD(MARSHTOMP),
-    ANIM_CMD(SWAMPERT),
-    ANIM_CMD(POOCHYENA),
-    ANIM_CMD(MIGHTYENA),
-    ANIM_CMD(ZIGZAGOON),
-    ANIM_CMD(LINOONE),
-    ANIM_CMD(WURMPLE),
-    ANIM_CMD(SILCOON),
-    ANIM_CMD(BEAUTIFLY),
-    ANIM_CMD(CASCOON),
-    ANIM_CMD(DUSTOX),
-    ANIM_CMD(LOTAD),
-    ANIM_CMD(LOMBRE),
-    ANIM_CMD(LUDICOLO),
-    ANIM_CMD(SEEDOT),
-    ANIM_CMD(NUZLEAF),
-    ANIM_CMD(SHIFTRY),
-    ANIM_CMD(NINCADA),
-    ANIM_CMD(NINJASK),
-    ANIM_CMD(SHEDINJA),
-    ANIM_CMD(TAILLOW),
-    ANIM_CMD(SWELLOW),
-    ANIM_CMD(SHROOMISH),
-    ANIM_CMD(BRELOOM),
-    ANIM_CMD(SPINDA),
-    ANIM_CMD(WINGULL),
-    ANIM_CMD(PELIPPER),
-    ANIM_CMD(SURSKIT),
-    ANIM_CMD(MASQUERAIN),
-    ANIM_CMD(WAILMER),
-    ANIM_CMD(WAILORD),
-    ANIM_CMD(SKITTY),
-    ANIM_CMD(DELCATTY),
-    ANIM_CMD(KECLEON),
-    ANIM_CMD(BALTOY),
-    ANIM_CMD(CLAYDOL),
-    ANIM_CMD(NOSEPASS),
-    ANIM_CMD(TORKOAL),
-    ANIM_CMD(SABLEYE),
-    ANIM_CMD(BARBOACH),
-    ANIM_CMD(WHISCASH),
-    ANIM_CMD(LUVDISC),
-    ANIM_CMD(CORPHISH),
-    ANIM_CMD(CRAWDAUNT),
-    ANIM_CMD(FEEBAS),
-    ANIM_CMD(MILOTIC),
-    ANIM_CMD(CARVANHA),
-    ANIM_CMD(SHARPEDO),
-    ANIM_CMD(TRAPINCH),
-    ANIM_CMD(VIBRAVA),
-    ANIM_CMD(FLYGON),
-    ANIM_CMD(MAKUHITA),
-    ANIM_CMD(HARIYAMA),
-    ANIM_CMD(ELECTRIKE),
-    ANIM_CMD(MANECTRIC),
-    ANIM_CMD(NUMEL),
-    ANIM_CMD(CAMERUPT),
-    ANIM_CMD(SPHEAL),
-    ANIM_CMD(SEALEO),
-    ANIM_CMD(WALREIN),
-    ANIM_CMD(CACNEA),
-    ANIM_CMD(CACTURNE),
-    ANIM_CMD(SNORUNT),
-    ANIM_CMD(GLALIE),
-    ANIM_CMD(LUNATONE),
-    ANIM_CMD(SOLROCK),
-    ANIM_CMD(AZURILL),
-    ANIM_CMD(SPOINK),
-    ANIM_CMD(GRUMPIG),
-    ANIM_CMD(PLUSLE),
-    ANIM_CMD(MINUN),
-    ANIM_CMD(MAWILE),
-    ANIM_CMD(MEDITITE),
-    ANIM_CMD(MEDICHAM),
-    ANIM_CMD(SWABLU),
-    ANIM_CMD(ALTARIA),
-    ANIM_CMD(WYNAUT),
-    ANIM_CMD(DUSKULL),
-    ANIM_CMD(DUSCLOPS),
-    ANIM_CMD(ROSELIA),
-    ANIM_CMD(SLAKOTH),
-    ANIM_CMD(VIGOROTH),
-    ANIM_CMD(SLAKING),
-    ANIM_CMD(GULPIN),
-    ANIM_CMD(SWALOT),
-    ANIM_CMD(TROPIUS),
-    ANIM_CMD(WHISMUR),
-    ANIM_CMD(LOUDRED),
-    ANIM_CMD(EXPLOUD),
-    ANIM_CMD(CLAMPERL),
-    ANIM_CMD(HUNTAIL),
-    ANIM_CMD(GOREBYSS),
-    ANIM_CMD(ABSOL),
-    ANIM_CMD(SHUPPET),
-    ANIM_CMD(BANETTE),
-    ANIM_CMD(SEVIPER),
-    ANIM_CMD(ZANGOOSE),
-    ANIM_CMD(RELICANTH),
-    ANIM_CMD(ARON),
-    ANIM_CMD(LAIRON),
-    ANIM_CMD(AGGRON),
-    ANIM_CMD(CASTFORM),
-    ANIM_CMD(VOLBEAT),
-    ANIM_CMD(ILLUMISE),
-    ANIM_CMD(LILEEP),
-    ANIM_CMD(CRADILY),
-    ANIM_CMD(ANORITH),
-    ANIM_CMD(ARMALDO),
-    ANIM_CMD(RALTS),
-    ANIM_CMD(KIRLIA),
-    ANIM_CMD(GARDEVOIR),
-    ANIM_CMD(BAGON),
-    ANIM_CMD(SHELGON),
-    ANIM_CMD(SALAMENCE),
-    ANIM_CMD(BELDUM),
-    ANIM_CMD(METANG),
-    ANIM_CMD(METAGROSS),
-    ANIM_CMD(REGIROCK),
-    ANIM_CMD(REGICE),
-    ANIM_CMD(REGISTEEL),
-    ANIM_CMD(KYOGRE),
-    ANIM_CMD(GROUDON),
-    ANIM_CMD(RAYQUAZA),
-    ANIM_CMD(LATIAS),
-    ANIM_CMD(LATIOS),
-    ANIM_CMD(JIRACHI),
-    ANIM_CMD(DEOXYS),
-    ANIM_CMD(CHIMECHO),
-    ANIM_CMD(EGG),
-    ANIM_CMD_FULL(UNOWN_B, sUnknownAnims_EGG),
-    ANIM_CMD(UNOWN_C),
-    ANIM_CMD(UNOWN_D),
-    ANIM_CMD(UNOWN_E),
-    ANIM_CMD(UNOWN_F),
-    ANIM_CMD(UNOWN_G),
-    ANIM_CMD(UNOWN_H),
-    ANIM_CMD(UNOWN_I),
-    ANIM_CMD(UNOWN_J),
-    ANIM_CMD(UNOWN_K),
-    ANIM_CMD(UNOWN_L),
-    ANIM_CMD(UNOWN_M),
-    ANIM_CMD(UNOWN_N),
-    ANIM_CMD(UNOWN_O),
-    ANIM_CMD(UNOWN_P),
-    ANIM_CMD(UNOWN_Q),
-    ANIM_CMD(UNOWN_R),
-    ANIM_CMD(UNOWN_S),
-    ANIM_CMD(UNOWN_T),
-    ANIM_CMD(UNOWN_U),
-    ANIM_CMD(UNOWN_V),
-    ANIM_CMD(UNOWN_W),
-    ANIM_CMD(UNOWN_X),
-    ANIM_CMD(UNOWN_Y),
-    ANIM_CMD(UNOWN_Z),
-    ANIM_CMD(UNOWN_EMARK),
-    ANIM_CMD(UNOWN_QMARK),
-};
-
-#undef ANIM_CMD
-#undef ANIM_CMD_FULL
diff --git a/src/data/pokemon_graphics/unused_anims.h b/src/data/pokemon_graphics/unused_anims.h
new file mode 100644
index 000000000..3d0c283dc
--- /dev/null
+++ b/src/data/pokemon_graphics/unused_anims.h
@@ -0,0 +1,1827 @@
+// unused and unkown
+static const union AnimCmd sUnusedAnim_Blaziken_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(1, 25),
+    ANIMCMD_FRAME(0, 7),
+    ANIMCMD_FRAME(1, 7),
+    ANIMCMD_FRAME(0, 7),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Blaziken_2[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Blaziken_3[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(2, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Blaziken_4[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Marshtomp_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(1, 5),
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_FRAME(1, 5),
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_FRAME(1, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Marshtomp_2[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(2, 12),
+    ANIMCMD_FRAME(0, 14),
+    ANIMCMD_FRAME(2, 12),
+    ANIMCMD_FRAME(0, 14),
+    ANIMCMD_FRAME(2, 12),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Marshtomp_3[] =
+{
+    ANIMCMD_FRAME(0, 14),
+    ANIMCMD_FRAME(2, 12),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Poochyena_1[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(1, 10),
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(1, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Poochyena_2[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(2, 10),
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(2, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Mightyena_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Zigzagoon_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Linoone_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Wurmple_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Wurmple_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Silcoon_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Silcoon_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Beautifly_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Beautifly_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Cascoon_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Cascoon_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Dustox_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Dustox_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Lombre_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Ludicolo_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Ludicolo_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Seedot_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Nuzleaf_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Shiftry_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Shiftry_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Taillow_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Swellow_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Shroomish_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Breloom_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Wingull_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Pelipper_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Pelipper_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Surskit_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Surskit_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Masquerain_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Masquerain_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Wailmer_1[] =
+{
+    ANIMCMD_FRAME(0, 15),
+    ANIMCMD_FRAME(8, 15),
+    ANIMCMD_FRAME(2, 22),
+    ANIMCMD_FRAME(8, 5),
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_FRAME(4, 5),
+    ANIMCMD_FRAME(6, 5),
+    ANIMCMD_FRAME(4, 5),
+    ANIMCMD_FRAME(6, 5),
+    ANIMCMD_FRAME(4, 5),
+    ANIMCMD_FRAME(6, 5),
+    ANIMCMD_FRAME(4, 5),
+    ANIMCMD_FRAME(6, 5),
+    ANIMCMD_FRAME(5, 5),
+    ANIMCMD_FRAME(7, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Wailmer_2[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(8, 15),
+    ANIMCMD_FRAME(2, 15),
+    ANIMCMD_FRAME(8, 15),
+    ANIMCMD_FRAME(9, 15),
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(9, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Wailmer_3[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(9, 10),
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(10, 20),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Wailmer_4[] =
+{
+    ANIMCMD_FRAME(0, 15),
+    ANIMCMD_FRAME(11, 15),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Skitty_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Delcatty_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Kecleon_1[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(1, 7),
+    ANIMCMD_FRAME(2, 7),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_FRAME(5, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(5, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(5, 2),
+    ANIMCMD_FRAME(6, 2),
+    ANIMCMD_FRAME(5, 2),
+    ANIMCMD_FRAME(6, 2),
+    ANIMCMD_FRAME(6, 10),
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Kecleon_2[] =
+{
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(9, 3),
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_FRAME(9, 3),
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Kecleon_3[] =
+{
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_FRAME(9, 3),
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_FRAME(9, 3),
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_FRAME(7, 12),
+    ANIMCMD_FRAME(8, 12),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Kecleon_4[] =
+{
+    ANIMCMD_FRAME(0,18),
+    ANIMCMD_FRAME(10, 18),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Baltoy_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Claydol_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Nosepass_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Sableye_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Sableye_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Luvdisc_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Luvdisc_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Feebas_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Feebas_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Milotic_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Milotic_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Carvanha_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Carvanha_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Sharpedo_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Sharpedo_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Trapinch_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Vibrava_1[] =
+{
+    ANIMCMD_FRAME(0, 63),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Flygon_1[] =
+{
+    ANIMCMD_FRAME(0, 63),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Makuhita_1[] =
+{
+    ANIMCMD_FRAME(0, 63),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Hariyama_1[] =
+{
+    ANIMCMD_FRAME(0, 63),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Electrike_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Electrike_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Manectric_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Numel_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Numel_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Camerupt_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Spheal_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Sealeo_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Walrein_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(1, 18),
+    ANIMCMD_FRAME(0, 18),
+    ANIMCMD_FRAME(1, 18),
+    ANIMCMD_FRAME(0, 18),
+    ANIMCMD_FRAME(1, 18),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Walrein_2[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(2, 18),
+    ANIMCMD_FRAME(0, 18),
+    ANIMCMD_FRAME(2, 18),
+    ANIMCMD_FRAME(0, 18),
+    ANIMCMD_FRAME(2, 18),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Azurill_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_FRAME(2, 5),
+    ANIMCMD_FRAME(3, 6),
+    ANIMCMD_FRAME(1, 5),
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_FRAME(2, 5),
+    ANIMCMD_FRAME(3, 5),
+    ANIMCMD_FRAME(1, 5),
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_FRAME(1, 7),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Azurill_2[] =
+{
+    ANIMCMD_FRAME(0, 6),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_FRAME(2, 6),
+    ANIMCMD_FRAME(3, 6),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_FRAME(0, 6),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Azurill_3[] =
+{
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(5, 12),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(6, 12),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Azurill_4[] =
+{
+    ANIMCMD_FRAME(7, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Spoink_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Spoink_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Grumpig_1[] =
+{
+    ANIMCMD_FRAME(0, 63),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Plusle_1[] =
+{
+    ANIMCMD_FRAME(0, 63),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Minun_1[] =
+{
+    ANIMCMD_FRAME(0, 63),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Mawile_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Meditite_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Medicham_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Swablu_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(1, 10),
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(1, 10),
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(1, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Swablu_2[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(0, 12),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Altaria_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Wynaut_1[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Wynaut_2[] =
+{
+    ANIMCMD_FRAME(1, 9),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Duskull_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Duskull_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Dusclops_1[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Dusclops_2[] =
+{
+    ANIMCMD_FRAME(1, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Slakoth_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Vigoroth_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Slaking_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Gulpin_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Swalot_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Tropius_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Clamperl_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Absol_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Shuppet_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Shuppet_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Banette_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Aron_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Lairon_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Aggron_1[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Castform_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Castform_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Castform_3[] =
+{
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Castform_4[] =
+{
+    ANIMCMD_FRAME(3, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Volbeat_1[] =
+{
+    ANIMCMD_FRAME(0, 63),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Illumise_1[] =
+{
+    ANIMCMD_FRAME(0, 63),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Bagon_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Bagon_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Salamence_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Salamence_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Regirock_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Regice_1[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Registeel_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Registeel_2[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Rayquaza_1[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(1, 30),
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(1, 30),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Rayquaza_2[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(2, 20),
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(2, 20),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Unused1[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Unused2[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sUnusedAnim_Jirachi_1[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd *const sUnusedAnims_None[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Bulbasaur[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ivysaur[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Venusaur[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Charmander[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Charmeleon[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Charizard[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Squirtle[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Wartortle[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Blastoise[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Caterpie[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Metapod[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Butterfree[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Weedle[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Kakuna[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Beedrill[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Pidgey[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Pidgeotto[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Pidgeot[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Rattata[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Raticate[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Spearow[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Fearow[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ekans[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Arbok[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Pikachu[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Raichu[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Sandshrew[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Sandslash[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_NidoranF[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Nidorina[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Nidoqueen[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_NidoranM[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Nidorino[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Nidoking[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Clefairy[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Clefable[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Vulpix[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ninetales[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Jigglypuff[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Wigglytuff[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Zubat[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Golbat[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Oddish[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Gloom[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Vileplume[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Paras[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Parasect[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Venonat[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Venomoth[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Diglett[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Dugtrio[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Meowth[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Persian[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Psyduck[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Golduck[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Mankey[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Primeape[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Growlithe[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Arcanine[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Poliwag[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Poliwhirl[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Poliwrath[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Abra[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Kadabra[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Alakazam[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Machop[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Machoke[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Machamp[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Bellsprout[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Weepinbell[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Victreebel[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Tentacool[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Tentacruel[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Geodude[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Graveler[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Golem[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ponyta[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Rapidash[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Slowpoke[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Slowbro[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Magnemite[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Magneton[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Farfetchd[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Doduo[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Dodrio[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Seel[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Dewgong[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Grimer[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Muk[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Shellder[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Cloyster[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Gastly[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Haunter[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Gengar[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Onix[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Drowzee[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Hypno[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Krabby[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Kingler[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Voltorb[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Electrode[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Exeggcute[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Exeggutor[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Cubone[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Marowak[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Hitmonlee[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Hitmonchan[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Lickitung[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Koffing[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Weezing[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Rhyhorn[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Rhydon[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Chansey[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Tangela[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Kangaskhan[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Horsea[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Seadra[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Goldeen[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Seaking[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Staryu[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Starmie[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_MrMime[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Scyther[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Jynx[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Electabuzz[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Magmar[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Pinsir[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Tauros[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Magikarp[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Gyarados[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Lapras[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ditto[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Eevee[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Vaporeon[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Jolteon[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Flareon[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Porygon[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Omanyte[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Omastar[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Kabuto[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Kabutops[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Aerodactyl[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Snorlax[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Articuno[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Zapdos[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Moltres[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Dratini[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Dragonair[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Dragonite[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Mewtwo[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Mew[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Chikorita[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Bayleef[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Meganium[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Cyndaquil[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Quilava[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Typhlosion[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Totodile[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Croconaw[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Feraligatr[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Sentret[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Furret[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Hoothoot[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Noctowl[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ledyba[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ledian[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Spinarak[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ariados[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Crobat[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Chinchou[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Lanturn[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Pichu[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Cleffa[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Igglybuff[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Togepi[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Togetic[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Natu[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Xatu[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Mareep[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Flaaffy[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ampharos[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Bellossom[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Marill[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Azumarill[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Sudowoodo[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Politoed[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Hoppip[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Skiploom[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Jumpluff[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Aipom[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Sunkern[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Sunflora[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Yanma[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Wooper[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Quagsire[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Espeon[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Umbreon[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Murkrow[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Slowking[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Misdreavus[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Unown[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Wobbuffet[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Girafarig[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Pineco[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Forretress[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Dunsparce[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Gligar[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Steelix[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Snubbull[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Granbull[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Qwilfish[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Scizor[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Shuckle[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Heracross[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Sneasel[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Teddiursa[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ursaring[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Slugma[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Magcargo[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Swinub[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Piloswine[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Corsola[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Remoraid[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Octillery[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Delibird[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Mantine[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Skarmory[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Houndour[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Houndoom[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Kingdra[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Phanpy[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Donphan[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Porygon2[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Stantler[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Smeargle[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Tyrogue[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Hitmontop[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Smoochum[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Elekid[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Magby[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Miltank[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Blissey[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Raikou[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Entei[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Suicune[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Larvitar[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Pupitar[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Tyranitar[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Lugia[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_HoOh[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Celebi[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_OldUnownB[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Treecko[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Grovyle[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Sceptile[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Torchic[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Combusken[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Blaziken[] = {sAnim_GeneralFrame0, sUnusedAnim_Blaziken_1, sUnusedAnim_Blaziken_2, sUnusedAnim_Blaziken_3, sUnusedAnim_Blaziken_4};
+static const union AnimCmd *const sUnusedAnims_Mudkip[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Marshtomp[] = {sAnim_GeneralFrame0, sUnusedAnim_Marshtomp_1, sUnusedAnim_Marshtomp_2, sUnusedAnim_Marshtomp_3};
+static const union AnimCmd *const sUnusedAnims_Swampert[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Poochyena[] = {sAnim_GeneralFrame0, sUnusedAnim_Poochyena_1, sUnusedAnim_Poochyena_2};
+static const union AnimCmd *const sUnusedAnims_Mightyena[] = {sAnim_GeneralFrame0, sUnusedAnim_Mightyena_1};
+static const union AnimCmd *const sUnusedAnims_Zigzagoon[] = {sAnim_GeneralFrame0, sUnusedAnim_Zigzagoon_1};
+static const union AnimCmd *const sUnusedAnims_Linoone[] = {sAnim_GeneralFrame0, sUnusedAnim_Linoone_1};
+static const union AnimCmd *const sUnusedAnims_Wurmple[] = {sAnim_GeneralFrame0, sUnusedAnim_Wurmple_1, sUnusedAnim_Wurmple_2};
+static const union AnimCmd *const sUnusedAnims_Silcoon[] = {sAnim_GeneralFrame0, sUnusedAnim_Silcoon_1, sUnusedAnim_Silcoon_2};
+static const union AnimCmd *const sUnusedAnims_Beautifly[] = {sAnim_GeneralFrame0, sUnusedAnim_Beautifly_1, sUnusedAnim_Beautifly_2};
+static const union AnimCmd *const sUnusedAnims_Cascoon[] = {sAnim_GeneralFrame0, sUnusedAnim_Cascoon_1, sUnusedAnim_Cascoon_2};
+static const union AnimCmd *const sUnusedAnims_Dustox[] = {sAnim_GeneralFrame0, sUnusedAnim_Dustox_1, sUnusedAnim_Dustox_2};
+static const union AnimCmd *const sUnusedAnims_Lotad[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Lombre[] = {sAnim_GeneralFrame0, sUnusedAnim_Lombre_1};
+static const union AnimCmd *const sUnusedAnims_Ludicolo[] = {sAnim_GeneralFrame0, sUnusedAnim_Ludicolo_1, sUnusedAnim_Ludicolo_2};
+static const union AnimCmd *const sUnusedAnims_Seedot[] = {sAnim_GeneralFrame0, sUnusedAnim_Seedot_1};
+static const union AnimCmd *const sUnusedAnims_Nuzleaf[] = {sAnim_GeneralFrame0, sUnusedAnim_Nuzleaf_1};
+static const union AnimCmd *const sUnusedAnims_Shiftry[] = {sAnim_GeneralFrame0, sUnusedAnim_Shiftry_1, sUnusedAnim_Shiftry_2};
+static const union AnimCmd *const sUnusedAnims_Nincada[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ninjask[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Shedinja[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Taillow[] = {sAnim_GeneralFrame0, sUnusedAnim_Taillow_1};
+static const union AnimCmd *const sUnusedAnims_Swellow[] = {sAnim_GeneralFrame0, sUnusedAnim_Swellow_1};
+static const union AnimCmd *const sUnusedAnims_Shroomish[] = {sAnim_GeneralFrame0, sUnusedAnim_Shroomish_1};
+static const union AnimCmd *const sUnusedAnims_Breloom[] = {sAnim_GeneralFrame0, sUnusedAnim_Breloom_1};
+static const union AnimCmd *const sUnusedAnims_Spinda[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Wingull[] = {sAnim_GeneralFrame0, sUnusedAnim_Wingull_1};
+static const union AnimCmd *const sUnusedAnims_Pelipper[] = {sAnim_GeneralFrame0, sUnusedAnim_Pelipper_1, sUnusedAnim_Pelipper_2};
+static const union AnimCmd *const sUnusedAnims_Surskit[] = {sAnim_GeneralFrame0, sUnusedAnim_Surskit_1, sUnusedAnim_Surskit_2};
+static const union AnimCmd *const sUnusedAnims_Masquerain[] = {sAnim_GeneralFrame0, sUnusedAnim_Masquerain_1, sUnusedAnim_Masquerain_2};
+static const union AnimCmd *const sUnusedAnims_Wailmer[] = {sAnim_GeneralFrame0, sUnusedAnim_Wailmer_1, sUnusedAnim_Wailmer_2, sUnusedAnim_Wailmer_3, sUnusedAnim_Wailmer_4};
+static const union AnimCmd *const sUnusedAnims_Wailord[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Skitty[] = {sAnim_GeneralFrame0, sUnusedAnim_Skitty_1};
+static const union AnimCmd *const sUnusedAnims_Delcatty[] = {sAnim_GeneralFrame0, sUnusedAnim_Delcatty_1};
+static const union AnimCmd *const sUnusedAnims_Kecleon[] = {sAnim_GeneralFrame0, sUnusedAnim_Kecleon_1, sUnusedAnim_Kecleon_2, sUnusedAnim_Kecleon_3, sUnusedAnim_Kecleon_4};
+static const union AnimCmd *const sUnusedAnims_Baltoy[] = {sAnim_GeneralFrame0, sUnusedAnim_Baltoy_1};
+static const union AnimCmd *const sUnusedAnims_Claydol[] = {sAnim_GeneralFrame0, sUnusedAnim_Claydol_1};
+static const union AnimCmd *const sUnusedAnims_Nosepass[] = {sAnim_GeneralFrame0, sUnusedAnim_Nosepass_1};
+static const union AnimCmd *const sUnusedAnims_Torkoal[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Sableye[] = {sAnim_GeneralFrame0, sUnusedAnim_Sableye_1, sUnusedAnim_Sableye_2};
+static const union AnimCmd *const sUnusedAnims_Barboach[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Whiscash[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Luvdisc[] = {sAnim_GeneralFrame0, sUnusedAnim_Luvdisc_1, sUnusedAnim_Luvdisc_2};
+static const union AnimCmd *const sUnusedAnims_Corphish[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Crawdaunt[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Feebas[] = {sAnim_GeneralFrame0, sUnusedAnim_Feebas_1, sUnusedAnim_Feebas_2};
+static const union AnimCmd *const sUnusedAnims_Milotic[] = {sAnim_GeneralFrame0, sUnusedAnim_Milotic_1, sUnusedAnim_Milotic_2};
+static const union AnimCmd *const sUnusedAnims_Carvanha[] = {sAnim_GeneralFrame0, sUnusedAnim_Carvanha_1, sUnusedAnim_Carvanha_2};
+static const union AnimCmd *const sUnusedAnims_Sharpedo[] = {sAnim_GeneralFrame0, sUnusedAnim_Sharpedo_1, sUnusedAnim_Sharpedo_2};
+static const union AnimCmd *const sUnusedAnims_Trapinch[] = {sAnim_GeneralFrame0, sUnusedAnim_Trapinch_1};
+static const union AnimCmd *const sUnusedAnims_Vibrava[] = {sAnim_GeneralFrame0, sUnusedAnim_Vibrava_1};
+static const union AnimCmd *const sUnusedAnims_Flygon[] = {sAnim_GeneralFrame0, sUnusedAnim_Flygon_1};
+static const union AnimCmd *const sUnusedAnims_Makuhita[] = {sAnim_GeneralFrame0, sUnusedAnim_Makuhita_1};
+static const union AnimCmd *const sUnusedAnims_Hariyama[] = {sAnim_GeneralFrame0, sUnusedAnim_Hariyama_1};
+static const union AnimCmd *const sUnusedAnims_Electrike[] = {sAnim_GeneralFrame0, sUnusedAnim_Electrike_1, sUnusedAnim_Electrike_2};
+static const union AnimCmd *const sUnusedAnims_Manectric[] = {sAnim_GeneralFrame0, sUnusedAnim_Manectric_1};
+static const union AnimCmd *const sUnusedAnims_Numel[] = {sAnim_GeneralFrame0, sUnusedAnim_Numel_1, sUnusedAnim_Numel_2};
+static const union AnimCmd *const sUnusedAnims_Camerupt[] = {sAnim_GeneralFrame0, sUnusedAnim_Camerupt_1};
+static const union AnimCmd *const sUnusedAnims_Spheal[] = {sAnim_GeneralFrame0, sUnusedAnim_Spheal_1};
+static const union AnimCmd *const sUnusedAnims_Sealeo[] = {sAnim_GeneralFrame0, sUnusedAnim_Sealeo_1};
+static const union AnimCmd *const sUnusedAnims_Walrein[] = {sAnim_GeneralFrame0, sUnusedAnim_Walrein_1, sUnusedAnim_Walrein_2};
+static const union AnimCmd *const sUnusedAnims_Cacnea[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Cacturne[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Snorunt[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Glalie[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Lunatone[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Solrock[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Azurill[] = {sAnim_GeneralFrame0, sUnusedAnim_Azurill_1, sUnusedAnim_Azurill_2, sUnusedAnim_Azurill_3, sUnusedAnim_Azurill_4};
+static const union AnimCmd *const sUnusedAnims_Spoink[] = {sAnim_GeneralFrame0, sUnusedAnim_Spoink_1, sUnusedAnim_Spoink_2};
+static const union AnimCmd *const sUnusedAnims_Grumpig[] = {sAnim_GeneralFrame0, sUnusedAnim_Grumpig_1};
+static const union AnimCmd *const sUnusedAnims_Plusle[] = {sAnim_GeneralFrame0, sUnusedAnim_Plusle_1};
+static const union AnimCmd *const sUnusedAnims_Minun[] = {sAnim_GeneralFrame0, sUnusedAnim_Minun_1};
+static const union AnimCmd *const sUnusedAnims_Mawile[] = {sAnim_GeneralFrame0, sUnusedAnim_Mawile_1};
+static const union AnimCmd *const sUnusedAnims_Meditite[] = {sAnim_GeneralFrame0, sUnusedAnim_Meditite_1};
+static const union AnimCmd *const sUnusedAnims_Medicham[] = {sAnim_GeneralFrame0, sUnusedAnim_Medicham_1};
+static const union AnimCmd *const sUnusedAnims_Swablu[] = {sAnim_GeneralFrame0, sUnusedAnim_Swablu_1, sUnusedAnim_Swablu_2};
+static const union AnimCmd *const sUnusedAnims_Altaria[] = {sAnim_GeneralFrame0, sUnusedAnim_Altaria_1};
+static const union AnimCmd *const sUnusedAnims_Wynaut[] = {sAnim_GeneralFrame0, sUnusedAnim_Wynaut_1, sUnusedAnim_Wynaut_2};
+static const union AnimCmd *const sUnusedAnims_Duskull[] = {sAnim_GeneralFrame0, sUnusedAnim_Duskull_1, sUnusedAnim_Duskull_2};
+static const union AnimCmd *const sUnusedAnims_Dusclops[] = {sAnim_GeneralFrame0, sUnusedAnim_Dusclops_1, sUnusedAnim_Dusclops_2};
+static const union AnimCmd *const sUnusedAnims_Roselia[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Slakoth[] = {sAnim_GeneralFrame0, sUnusedAnim_Slakoth_1};
+static const union AnimCmd *const sUnusedAnims_Vigoroth[] = {sAnim_GeneralFrame0, sUnusedAnim_Vigoroth_1};
+static const union AnimCmd *const sUnusedAnims_Slaking[] = {sAnim_GeneralFrame0, sUnusedAnim_Slaking_1};
+static const union AnimCmd *const sUnusedAnims_Gulpin[] = {sAnim_GeneralFrame0, sUnusedAnim_Gulpin_1};
+static const union AnimCmd *const sUnusedAnims_Swalot[] = {sAnim_GeneralFrame0, sUnusedAnim_Swalot_1};
+static const union AnimCmd *const sUnusedAnims_Tropius[] = {sAnim_GeneralFrame0, sUnusedAnim_Tropius_1};
+static const union AnimCmd *const sUnusedAnims_Whismur[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Loudred[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Exploud[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Clamperl[] = {sAnim_GeneralFrame0, sUnusedAnim_Clamperl_1};
+static const union AnimCmd *const sUnusedAnims_Huntail[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Gorebyss[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Absol[] = {sAnim_GeneralFrame0, sUnusedAnim_Absol_1};
+static const union AnimCmd *const sUnusedAnims_Shuppet[] = {sAnim_GeneralFrame0, sUnusedAnim_Shuppet_1, sUnusedAnim_Shuppet_2};
+static const union AnimCmd *const sUnusedAnims_Banette[] = {sAnim_GeneralFrame0, sUnusedAnim_Banette_1};
+static const union AnimCmd *const sUnusedAnims_Seviper[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Zangoose[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Relicanth[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Aron[] = {sAnim_GeneralFrame0, sUnusedAnim_Aron_1};
+static const union AnimCmd *const sUnusedAnims_Lairon[] = {sAnim_GeneralFrame0, sUnusedAnim_Lairon_1};
+static const union AnimCmd *const sUnusedAnims_Aggron[] = {sAnim_GeneralFrame0, sUnusedAnim_Aggron_1};
+static const union AnimCmd *const sUnusedAnims_Castform[] = {sAnim_GeneralFrame0, sUnusedAnim_Castform_1, sUnusedAnim_Castform_2, sUnusedAnim_Castform_3, sUnusedAnim_Castform_4};
+static const union AnimCmd *const sUnusedAnims_Volbeat[] = {sAnim_GeneralFrame0, sUnusedAnim_Volbeat_1};
+static const union AnimCmd *const sUnusedAnims_Illumise[] = {sAnim_GeneralFrame0, sUnusedAnim_Illumise_1};
+static const union AnimCmd *const sUnusedAnims_Lileep[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Cradily[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Anorith[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Armaldo[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Ralts[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Kirlia[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Gardevoir[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Bagon[] = {sAnim_GeneralFrame0, sUnusedAnim_Bagon_1, sUnusedAnim_Bagon_2};
+static const union AnimCmd *const sUnusedAnims_Shelgon[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Salamence[] = {sAnim_GeneralFrame0, sUnusedAnim_Salamence_1, sUnusedAnim_Salamence_2};
+static const union AnimCmd *const sUnusedAnims_Beldum[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Metang[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Metagross[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Regirock[] = {sAnim_GeneralFrame0, sUnusedAnim_Regirock_1};
+static const union AnimCmd *const sUnusedAnims_Regice[] = {sAnim_GeneralFrame0, sUnusedAnim_Regice_1};
+static const union AnimCmd *const sUnusedAnims_Registeel[] = {sAnim_GeneralFrame0, sUnusedAnim_Registeel_1, sUnusedAnim_Registeel_2};
+static const union AnimCmd *const sUnusedAnims_Kyogre[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Groudon[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Rayquaza[] = {sAnim_GeneralFrame0, sUnusedAnim_Rayquaza_1, sUnusedAnim_Rayquaza_2};
+static const union AnimCmd *const sUnusedAnims_Latias[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Latios[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Jirachi[] = {sAnim_GeneralFrame0, sUnusedAnim_Jirachi_1};
+static const union AnimCmd *const sUnusedAnims_Deoxys[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Chimecho[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_Egg[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownC[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownD[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownE[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownF[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownG[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownH[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownI[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownJ[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownK[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownL[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownM[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownN[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownO[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownP[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownQ[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownR[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownS[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownT[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownU[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownV[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownW[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownX[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownY[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownZ[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownEMark[] = {sAnim_GeneralFrame0};
+static const union AnimCmd *const sUnusedAnims_UnownQMark[] = {sAnim_GeneralFrame0};
+
+static const union AnimCmd *const *const sUnusedAnimsTable[] =
+{
+    [SPECIES_NONE] = sUnusedAnims_None,
+    [SPECIES_BULBASAUR] = sUnusedAnims_Bulbasaur,
+    [SPECIES_IVYSAUR] = sUnusedAnims_Ivysaur,
+    [SPECIES_VENUSAUR] = sUnusedAnims_Venusaur,
+    [SPECIES_CHARMANDER] = sUnusedAnims_Charmander,
+    [SPECIES_CHARMELEON] = sUnusedAnims_Charmeleon,
+    [SPECIES_CHARIZARD] = sUnusedAnims_Charizard,
+    [SPECIES_SQUIRTLE] = sUnusedAnims_Squirtle,
+    [SPECIES_WARTORTLE] = sUnusedAnims_Wartortle,
+    [SPECIES_BLASTOISE] = sUnusedAnims_Blastoise,
+    [SPECIES_CATERPIE] = sUnusedAnims_Caterpie,
+    [SPECIES_METAPOD] = sUnusedAnims_Metapod,
+    [SPECIES_BUTTERFREE] = sUnusedAnims_Butterfree,
+    [SPECIES_WEEDLE] = sUnusedAnims_Weedle,
+    [SPECIES_KAKUNA] = sUnusedAnims_Kakuna,
+    [SPECIES_BEEDRILL] = sUnusedAnims_Beedrill,
+    [SPECIES_PIDGEY] = sUnusedAnims_Pidgey,
+    [SPECIES_PIDGEOTTO] = sUnusedAnims_Pidgeotto,
+    [SPECIES_PIDGEOT] = sUnusedAnims_Pidgeot,
+    [SPECIES_RATTATA] = sUnusedAnims_Rattata,
+    [SPECIES_RATICATE] = sUnusedAnims_Raticate,
+    [SPECIES_SPEAROW] = sUnusedAnims_Spearow,
+    [SPECIES_FEAROW] = sUnusedAnims_Fearow,
+    [SPECIES_EKANS] = sUnusedAnims_Ekans,
+    [SPECIES_ARBOK] = sUnusedAnims_Arbok,
+    [SPECIES_PIKACHU] = sUnusedAnims_Pikachu,
+    [SPECIES_RAICHU] = sUnusedAnims_Raichu,
+    [SPECIES_SANDSHREW] = sUnusedAnims_Sandshrew,
+    [SPECIES_SANDSLASH] = sUnusedAnims_Sandslash,
+    [SPECIES_NIDORAN_F] = sUnusedAnims_NidoranF,
+    [SPECIES_NIDORINA] = sUnusedAnims_Nidorina,
+    [SPECIES_NIDOQUEEN] = sUnusedAnims_Nidoqueen,
+    [SPECIES_NIDORAN_M] = sUnusedAnims_NidoranM,
+    [SPECIES_NIDORINO] = sUnusedAnims_Nidorino,
+    [SPECIES_NIDOKING] = sUnusedAnims_Nidoking,
+    [SPECIES_CLEFAIRY] = sUnusedAnims_Clefairy,
+    [SPECIES_CLEFABLE] = sUnusedAnims_Clefable,
+    [SPECIES_VULPIX] = sUnusedAnims_Vulpix,
+    [SPECIES_NINETALES] = sUnusedAnims_Ninetales,
+    [SPECIES_JIGGLYPUFF] = sUnusedAnims_Jigglypuff,
+    [SPECIES_WIGGLYTUFF] = sUnusedAnims_Wigglytuff,
+    [SPECIES_ZUBAT] = sUnusedAnims_Zubat,
+    [SPECIES_GOLBAT] = sUnusedAnims_Golbat,
+    [SPECIES_ODDISH] = sUnusedAnims_Oddish,
+    [SPECIES_GLOOM] = sUnusedAnims_Gloom,
+    [SPECIES_VILEPLUME] = sUnusedAnims_Vileplume,
+    [SPECIES_PARAS] = sUnusedAnims_Paras,
+    [SPECIES_PARASECT] = sUnusedAnims_Parasect,
+    [SPECIES_VENONAT] = sUnusedAnims_Venonat,
+    [SPECIES_VENOMOTH] = sUnusedAnims_Venomoth,
+    [SPECIES_DIGLETT] = sUnusedAnims_Diglett,
+    [SPECIES_DUGTRIO] = sUnusedAnims_Dugtrio,
+    [SPECIES_MEOWTH] = sUnusedAnims_Meowth,
+    [SPECIES_PERSIAN] = sUnusedAnims_Persian,
+    [SPECIES_PSYDUCK] = sUnusedAnims_Psyduck,
+    [SPECIES_GOLDUCK] = sUnusedAnims_Golduck,
+    [SPECIES_MANKEY] = sUnusedAnims_Mankey,
+    [SPECIES_PRIMEAPE] = sUnusedAnims_Primeape,
+    [SPECIES_GROWLITHE] = sUnusedAnims_Growlithe,
+    [SPECIES_ARCANINE] = sUnusedAnims_Arcanine,
+    [SPECIES_POLIWAG] = sUnusedAnims_Poliwag,
+    [SPECIES_POLIWHIRL] = sUnusedAnims_Poliwhirl,
+    [SPECIES_POLIWRATH] = sUnusedAnims_Poliwrath,
+    [SPECIES_ABRA] = sUnusedAnims_Abra,
+    [SPECIES_KADABRA] = sUnusedAnims_Kadabra,
+    [SPECIES_ALAKAZAM] = sUnusedAnims_Alakazam,
+    [SPECIES_MACHOP] = sUnusedAnims_Machop,
+    [SPECIES_MACHOKE] = sUnusedAnims_Machoke,
+    [SPECIES_MACHAMP] = sUnusedAnims_Machamp,
+    [SPECIES_BELLSPROUT] = sUnusedAnims_Bellsprout,
+    [SPECIES_WEEPINBELL] = sUnusedAnims_Weepinbell,
+    [SPECIES_VICTREEBEL] = sUnusedAnims_Victreebel,
+    [SPECIES_TENTACOOL] = sUnusedAnims_Tentacool,
+    [SPECIES_TENTACRUEL] = sUnusedAnims_Tentacruel,
+    [SPECIES_GEODUDE] = sUnusedAnims_Geodude,
+    [SPECIES_GRAVELER] = sUnusedAnims_Graveler,
+    [SPECIES_GOLEM] = sUnusedAnims_Golem,
+    [SPECIES_PONYTA] = sUnusedAnims_Ponyta,
+    [SPECIES_RAPIDASH] = sUnusedAnims_Rapidash,
+    [SPECIES_SLOWPOKE] = sUnusedAnims_Slowpoke,
+    [SPECIES_SLOWBRO] = sUnusedAnims_Slowbro,
+    [SPECIES_MAGNEMITE] = sUnusedAnims_Magnemite,
+    [SPECIES_MAGNETON] = sUnusedAnims_Magneton,
+    [SPECIES_FARFETCHD] = sUnusedAnims_Farfetchd,
+    [SPECIES_DODUO] = sUnusedAnims_Doduo,
+    [SPECIES_DODRIO] = sUnusedAnims_Dodrio,
+    [SPECIES_SEEL] = sUnusedAnims_Seel,
+    [SPECIES_DEWGONG] = sUnusedAnims_Dewgong,
+    [SPECIES_GRIMER] = sUnusedAnims_Grimer,
+    [SPECIES_MUK] = sUnusedAnims_Muk,
+    [SPECIES_SHELLDER] = sUnusedAnims_Shellder,
+    [SPECIES_CLOYSTER] = sUnusedAnims_Cloyster,
+    [SPECIES_GASTLY] = sUnusedAnims_Gastly,
+    [SPECIES_HAUNTER] = sUnusedAnims_Haunter,
+    [SPECIES_GENGAR] = sUnusedAnims_Gengar,
+    [SPECIES_ONIX] = sUnusedAnims_Onix,
+    [SPECIES_DROWZEE] = sUnusedAnims_Drowzee,
+    [SPECIES_HYPNO] = sUnusedAnims_Hypno,
+    [SPECIES_KRABBY] = sUnusedAnims_Krabby,
+    [SPECIES_KINGLER] = sUnusedAnims_Kingler,
+    [SPECIES_VOLTORB] = sUnusedAnims_Voltorb,
+    [SPECIES_ELECTRODE] = sUnusedAnims_Electrode,
+    [SPECIES_EXEGGCUTE] = sUnusedAnims_Exeggcute,
+    [SPECIES_EXEGGUTOR] = sUnusedAnims_Exeggutor,
+    [SPECIES_CUBONE] = sUnusedAnims_Cubone,
+    [SPECIES_MAROWAK] = sUnusedAnims_Marowak,
+    [SPECIES_HITMONLEE] = sUnusedAnims_Hitmonlee,
+    [SPECIES_HITMONCHAN] = sUnusedAnims_Hitmonchan,
+    [SPECIES_LICKITUNG] = sUnusedAnims_Lickitung,
+    [SPECIES_KOFFING] = sUnusedAnims_Koffing,
+    [SPECIES_WEEZING] = sUnusedAnims_Weezing,
+    [SPECIES_RHYHORN] = sUnusedAnims_Rhyhorn,
+    [SPECIES_RHYDON] = sUnusedAnims_Rhydon,
+    [SPECIES_CHANSEY] = sUnusedAnims_Chansey,
+    [SPECIES_TANGELA] = sUnusedAnims_Tangela,
+    [SPECIES_KANGASKHAN] = sUnusedAnims_Kangaskhan,
+    [SPECIES_HORSEA] = sUnusedAnims_Horsea,
+    [SPECIES_SEADRA] = sUnusedAnims_Seadra,
+    [SPECIES_GOLDEEN] = sUnusedAnims_Goldeen,
+    [SPECIES_SEAKING] = sUnusedAnims_Seaking,
+    [SPECIES_STARYU] = sUnusedAnims_Staryu,
+    [SPECIES_STARMIE] = sUnusedAnims_Starmie,
+    [SPECIES_MR_MIME] = sUnusedAnims_MrMime,
+    [SPECIES_SCYTHER] = sUnusedAnims_Scyther,
+    [SPECIES_JYNX] = sUnusedAnims_Jynx,
+    [SPECIES_ELECTABUZZ] = sUnusedAnims_Electabuzz,
+    [SPECIES_MAGMAR] = sUnusedAnims_Magmar,
+    [SPECIES_PINSIR] = sUnusedAnims_Pinsir,
+    [SPECIES_TAUROS] = sUnusedAnims_Tauros,
+    [SPECIES_MAGIKARP] = sUnusedAnims_Magikarp,
+    [SPECIES_GYARADOS] = sUnusedAnims_Gyarados,
+    [SPECIES_LAPRAS] = sUnusedAnims_Lapras,
+    [SPECIES_DITTO] = sUnusedAnims_Ditto,
+    [SPECIES_EEVEE] = sUnusedAnims_Eevee,
+    [SPECIES_VAPOREON] = sUnusedAnims_Vaporeon,
+    [SPECIES_JOLTEON] = sUnusedAnims_Jolteon,
+    [SPECIES_FLAREON] = sUnusedAnims_Flareon,
+    [SPECIES_PORYGON] = sUnusedAnims_Porygon,
+    [SPECIES_OMANYTE] = sUnusedAnims_Omanyte,
+    [SPECIES_OMASTAR] = sUnusedAnims_Omastar,
+    [SPECIES_KABUTO] = sUnusedAnims_Kabuto,
+    [SPECIES_KABUTOPS] = sUnusedAnims_Kabutops,
+    [SPECIES_AERODACTYL] = sUnusedAnims_Aerodactyl,
+    [SPECIES_SNORLAX] = sUnusedAnims_Snorlax,
+    [SPECIES_ARTICUNO] = sUnusedAnims_Articuno,
+    [SPECIES_ZAPDOS] = sUnusedAnims_Zapdos,
+    [SPECIES_MOLTRES] = sUnusedAnims_Moltres,
+    [SPECIES_DRATINI] = sUnusedAnims_Dratini,
+    [SPECIES_DRAGONAIR] = sUnusedAnims_Dragonair,
+    [SPECIES_DRAGONITE] = sUnusedAnims_Dragonite,
+    [SPECIES_MEWTWO] = sUnusedAnims_Mewtwo,
+    [SPECIES_MEW] = sUnusedAnims_Mew,
+    [SPECIES_CHIKORITA] = sUnusedAnims_Chikorita,
+    [SPECIES_BAYLEEF] = sUnusedAnims_Bayleef,
+    [SPECIES_MEGANIUM] = sUnusedAnims_Meganium,
+    [SPECIES_CYNDAQUIL] = sUnusedAnims_Cyndaquil,
+    [SPECIES_QUILAVA] = sUnusedAnims_Quilava,
+    [SPECIES_TYPHLOSION] = sUnusedAnims_Typhlosion,
+    [SPECIES_TOTODILE] = sUnusedAnims_Totodile,
+    [SPECIES_CROCONAW] = sUnusedAnims_Croconaw,
+    [SPECIES_FERALIGATR] = sUnusedAnims_Feraligatr,
+    [SPECIES_SENTRET] = sUnusedAnims_Sentret,
+    [SPECIES_FURRET] = sUnusedAnims_Furret,
+    [SPECIES_HOOTHOOT] = sUnusedAnims_Hoothoot,
+    [SPECIES_NOCTOWL] = sUnusedAnims_Noctowl,
+    [SPECIES_LEDYBA] = sUnusedAnims_Ledyba,
+    [SPECIES_LEDIAN] = sUnusedAnims_Ledian,
+    [SPECIES_SPINARAK] = sUnusedAnims_Spinarak,
+    [SPECIES_ARIADOS] = sUnusedAnims_Ariados,
+    [SPECIES_CROBAT] = sUnusedAnims_Crobat,
+    [SPECIES_CHINCHOU] = sUnusedAnims_Chinchou,
+    [SPECIES_LANTURN] = sUnusedAnims_Lanturn,
+    [SPECIES_PICHU] = sUnusedAnims_Pichu,
+    [SPECIES_CLEFFA] = sUnusedAnims_Cleffa,
+    [SPECIES_IGGLYBUFF] = sUnusedAnims_Igglybuff,
+    [SPECIES_TOGEPI] = sUnusedAnims_Togepi,
+    [SPECIES_TOGETIC] = sUnusedAnims_Togetic,
+    [SPECIES_NATU] = sUnusedAnims_Natu,
+    [SPECIES_XATU] = sUnusedAnims_Xatu,
+    [SPECIES_MAREEP] = sUnusedAnims_Mareep,
+    [SPECIES_FLAAFFY] = sUnusedAnims_Flaaffy,
+    [SPECIES_AMPHAROS] = sUnusedAnims_Ampharos,
+    [SPECIES_BELLOSSOM] = sUnusedAnims_Bellossom,
+    [SPECIES_MARILL] = sUnusedAnims_Marill,
+    [SPECIES_AZUMARILL] = sUnusedAnims_Azumarill,
+    [SPECIES_SUDOWOODO] = sUnusedAnims_Sudowoodo,
+    [SPECIES_POLITOED] = sUnusedAnims_Politoed,
+    [SPECIES_HOPPIP] = sUnusedAnims_Hoppip,
+    [SPECIES_SKIPLOOM] = sUnusedAnims_Skiploom,
+    [SPECIES_JUMPLUFF] = sUnusedAnims_Jumpluff,
+    [SPECIES_AIPOM] = sUnusedAnims_Aipom,
+    [SPECIES_SUNKERN] = sUnusedAnims_Sunkern,
+    [SPECIES_SUNFLORA] = sUnusedAnims_Sunflora,
+    [SPECIES_YANMA] = sUnusedAnims_Yanma,
+    [SPECIES_WOOPER] = sUnusedAnims_Wooper,
+    [SPECIES_QUAGSIRE] = sUnusedAnims_Quagsire,
+    [SPECIES_ESPEON] = sUnusedAnims_Espeon,
+    [SPECIES_UMBREON] = sUnusedAnims_Umbreon,
+    [SPECIES_MURKROW] = sUnusedAnims_Murkrow,
+    [SPECIES_SLOWKING] = sUnusedAnims_Slowking,
+    [SPECIES_MISDREAVUS] = sUnusedAnims_Misdreavus,
+    [SPECIES_UNOWN] = sUnusedAnims_Unown,
+    [SPECIES_WOBBUFFET] = sUnusedAnims_Wobbuffet,
+    [SPECIES_GIRAFARIG] = sUnusedAnims_Girafarig,
+    [SPECIES_PINECO] = sUnusedAnims_Pineco,
+    [SPECIES_FORRETRESS] = sUnusedAnims_Forretress,
+    [SPECIES_DUNSPARCE] = sUnusedAnims_Dunsparce,
+    [SPECIES_GLIGAR] = sUnusedAnims_Gligar,
+    [SPECIES_STEELIX] = sUnusedAnims_Steelix,
+    [SPECIES_SNUBBULL] = sUnusedAnims_Snubbull,
+    [SPECIES_GRANBULL] = sUnusedAnims_Granbull,
+    [SPECIES_QWILFISH] = sUnusedAnims_Qwilfish,
+    [SPECIES_SCIZOR] = sUnusedAnims_Scizor,
+    [SPECIES_SHUCKLE] = sUnusedAnims_Shuckle,
+    [SPECIES_HERACROSS] = sUnusedAnims_Heracross,
+    [SPECIES_SNEASEL] = sUnusedAnims_Sneasel,
+    [SPECIES_TEDDIURSA] = sUnusedAnims_Teddiursa,
+    [SPECIES_URSARING] = sUnusedAnims_Ursaring,
+    [SPECIES_SLUGMA] = sUnusedAnims_Slugma,
+    [SPECIES_MAGCARGO] = sUnusedAnims_Magcargo,
+    [SPECIES_SWINUB] = sUnusedAnims_Swinub,
+    [SPECIES_PILOSWINE] = sUnusedAnims_Piloswine,
+    [SPECIES_CORSOLA] = sUnusedAnims_Corsola,
+    [SPECIES_REMORAID] = sUnusedAnims_Remoraid,
+    [SPECIES_OCTILLERY] = sUnusedAnims_Octillery,
+    [SPECIES_DELIBIRD] = sUnusedAnims_Delibird,
+    [SPECIES_MANTINE] = sUnusedAnims_Mantine,
+    [SPECIES_SKARMORY] = sUnusedAnims_Skarmory,
+    [SPECIES_HOUNDOUR] = sUnusedAnims_Houndour,
+    [SPECIES_HOUNDOOM] = sUnusedAnims_Houndoom,
+    [SPECIES_KINGDRA] = sUnusedAnims_Kingdra,
+    [SPECIES_PHANPY] = sUnusedAnims_Phanpy,
+    [SPECIES_DONPHAN] = sUnusedAnims_Donphan,
+    [SPECIES_PORYGON2] = sUnusedAnims_Porygon2,
+    [SPECIES_STANTLER] = sUnusedAnims_Stantler,
+    [SPECIES_SMEARGLE] = sUnusedAnims_Smeargle,
+    [SPECIES_TYROGUE] = sUnusedAnims_Tyrogue,
+    [SPECIES_HITMONTOP] = sUnusedAnims_Hitmontop,
+    [SPECIES_SMOOCHUM] = sUnusedAnims_Smoochum,
+    [SPECIES_ELEKID] = sUnusedAnims_Elekid,
+    [SPECIES_MAGBY] = sUnusedAnims_Magby,
+    [SPECIES_MILTANK] = sUnusedAnims_Miltank,
+    [SPECIES_BLISSEY] = sUnusedAnims_Blissey,
+    [SPECIES_RAIKOU] = sUnusedAnims_Raikou,
+    [SPECIES_ENTEI] = sUnusedAnims_Entei,
+    [SPECIES_SUICUNE] = sUnusedAnims_Suicune,
+    [SPECIES_LARVITAR] = sUnusedAnims_Larvitar,
+    [SPECIES_PUPITAR] = sUnusedAnims_Pupitar,
+    [SPECIES_TYRANITAR] = sUnusedAnims_Tyranitar,
+    [SPECIES_LUGIA] = sUnusedAnims_Lugia,
+    [SPECIES_HO_OH] = sUnusedAnims_HoOh,
+    [SPECIES_CELEBI] = sUnusedAnims_Celebi,
+    [SPECIES_OLD_UNOWN_B] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_C] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_D] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_E] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_F] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_G] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_H] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_I] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_J] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_K] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_L] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_M] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_N] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_O] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_P] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_Q] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_R] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_S] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_T] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_U] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_V] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_W] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_X] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_Y] = sUnusedAnims_OldUnownB,
+    [SPECIES_OLD_UNOWN_Z] = sUnusedAnims_OldUnownB,
+    [SPECIES_TREECKO] = sUnusedAnims_Treecko,
+    [SPECIES_GROVYLE] = sUnusedAnims_Grovyle,
+    [SPECIES_SCEPTILE] = sUnusedAnims_Sceptile,
+    [SPECIES_TORCHIC] = sUnusedAnims_Torchic,
+    [SPECIES_COMBUSKEN] = sUnusedAnims_Combusken,
+    [SPECIES_BLAZIKEN] = sUnusedAnims_Blaziken,
+    [SPECIES_MUDKIP] = sUnusedAnims_Mudkip,
+    [SPECIES_MARSHTOMP] = sUnusedAnims_Marshtomp,
+    [SPECIES_SWAMPERT] = sUnusedAnims_Swampert,
+    [SPECIES_POOCHYENA] = sUnusedAnims_Poochyena,
+    [SPECIES_MIGHTYENA] = sUnusedAnims_Mightyena,
+    [SPECIES_ZIGZAGOON] = sUnusedAnims_Zigzagoon,
+    [SPECIES_LINOONE] = sUnusedAnims_Linoone,
+    [SPECIES_WURMPLE] = sUnusedAnims_Wurmple,
+    [SPECIES_SILCOON] = sUnusedAnims_Silcoon,
+    [SPECIES_BEAUTIFLY] = sUnusedAnims_Beautifly,
+    [SPECIES_CASCOON] = sUnusedAnims_Cascoon,
+    [SPECIES_DUSTOX] = sUnusedAnims_Dustox,
+    [SPECIES_LOTAD] = sUnusedAnims_Lotad,
+    [SPECIES_LOMBRE] = sUnusedAnims_Lombre,
+    [SPECIES_LUDICOLO] = sUnusedAnims_Ludicolo,
+    [SPECIES_SEEDOT] = sUnusedAnims_Seedot,
+    [SPECIES_NUZLEAF] = sUnusedAnims_Nuzleaf,
+    [SPECIES_SHIFTRY] = sUnusedAnims_Shiftry,
+    [SPECIES_NINCADA] = sUnusedAnims_Nincada,
+    [SPECIES_NINJASK] = sUnusedAnims_Ninjask,
+    [SPECIES_SHEDINJA] = sUnusedAnims_Shedinja,
+    [SPECIES_TAILLOW] = sUnusedAnims_Taillow,
+    [SPECIES_SWELLOW] = sUnusedAnims_Swellow,
+    [SPECIES_SHROOMISH] = sUnusedAnims_Shroomish,
+    [SPECIES_BRELOOM] = sUnusedAnims_Breloom,
+    [SPECIES_SPINDA] = sUnusedAnims_Spinda,
+    [SPECIES_WINGULL] = sUnusedAnims_Wingull,
+    [SPECIES_PELIPPER] = sUnusedAnims_Pelipper,
+    [SPECIES_SURSKIT] = sUnusedAnims_Surskit,
+    [SPECIES_MASQUERAIN] = sUnusedAnims_Masquerain,
+    [SPECIES_WAILMER] = sUnusedAnims_Wailmer,
+    [SPECIES_WAILORD] = sUnusedAnims_Wailord,
+    [SPECIES_SKITTY] = sUnusedAnims_Skitty,
+    [SPECIES_DELCATTY] = sUnusedAnims_Delcatty,
+    [SPECIES_KECLEON] = sUnusedAnims_Kecleon,
+    [SPECIES_BALTOY] = sUnusedAnims_Baltoy,
+    [SPECIES_CLAYDOL] = sUnusedAnims_Claydol,
+    [SPECIES_NOSEPASS] = sUnusedAnims_Nosepass,
+    [SPECIES_TORKOAL] = sUnusedAnims_Torkoal,
+    [SPECIES_SABLEYE] = sUnusedAnims_Sableye,
+    [SPECIES_BARBOACH] = sUnusedAnims_Barboach,
+    [SPECIES_WHISCASH] = sUnusedAnims_Whiscash,
+    [SPECIES_LUVDISC] = sUnusedAnims_Luvdisc,
+    [SPECIES_CORPHISH] = sUnusedAnims_Corphish,
+    [SPECIES_CRAWDAUNT] = sUnusedAnims_Crawdaunt,
+    [SPECIES_FEEBAS] = sUnusedAnims_Feebas,
+    [SPECIES_MILOTIC] = sUnusedAnims_Milotic,
+    [SPECIES_CARVANHA] = sUnusedAnims_Carvanha,
+    [SPECIES_SHARPEDO] = sUnusedAnims_Sharpedo,
+    [SPECIES_TRAPINCH] = sUnusedAnims_Trapinch,
+    [SPECIES_VIBRAVA] = sUnusedAnims_Vibrava,
+    [SPECIES_FLYGON] = sUnusedAnims_Flygon,
+    [SPECIES_MAKUHITA] = sUnusedAnims_Makuhita,
+    [SPECIES_HARIYAMA] = sUnusedAnims_Hariyama,
+    [SPECIES_ELECTRIKE] = sUnusedAnims_Electrike,
+    [SPECIES_MANECTRIC] = sUnusedAnims_Manectric,
+    [SPECIES_NUMEL] = sUnusedAnims_Numel,
+    [SPECIES_CAMERUPT] = sUnusedAnims_Camerupt,
+    [SPECIES_SPHEAL] = sUnusedAnims_Spheal,
+    [SPECIES_SEALEO] = sUnusedAnims_Sealeo,
+    [SPECIES_WALREIN] = sUnusedAnims_Walrein,
+    [SPECIES_CACNEA] = sUnusedAnims_Cacnea,
+    [SPECIES_CACTURNE] = sUnusedAnims_Cacturne,
+    [SPECIES_SNORUNT] = sUnusedAnims_Snorunt,
+    [SPECIES_GLALIE] = sUnusedAnims_Glalie,
+    [SPECIES_LUNATONE] = sUnusedAnims_Lunatone,
+    [SPECIES_SOLROCK] = sUnusedAnims_Solrock,
+    [SPECIES_AZURILL] = sUnusedAnims_Azurill,
+    [SPECIES_SPOINK] = sUnusedAnims_Spoink,
+    [SPECIES_GRUMPIG] = sUnusedAnims_Grumpig,
+    [SPECIES_PLUSLE] = sUnusedAnims_Plusle,
+    [SPECIES_MINUN] = sUnusedAnims_Minun,
+    [SPECIES_MAWILE] = sUnusedAnims_Mawile,
+    [SPECIES_MEDITITE] = sUnusedAnims_Meditite,
+    [SPECIES_MEDICHAM] = sUnusedAnims_Medicham,
+    [SPECIES_SWABLU] = sUnusedAnims_Swablu,
+    [SPECIES_ALTARIA] = sUnusedAnims_Altaria,
+    [SPECIES_WYNAUT] = sUnusedAnims_Wynaut,
+    [SPECIES_DUSKULL] = sUnusedAnims_Duskull,
+    [SPECIES_DUSCLOPS] = sUnusedAnims_Dusclops,
+    [SPECIES_ROSELIA] = sUnusedAnims_Roselia,
+    [SPECIES_SLAKOTH] = sUnusedAnims_Slakoth,
+    [SPECIES_VIGOROTH] = sUnusedAnims_Vigoroth,
+    [SPECIES_SLAKING] = sUnusedAnims_Slaking,
+    [SPECIES_GULPIN] = sUnusedAnims_Gulpin,
+    [SPECIES_SWALOT] = sUnusedAnims_Swalot,
+    [SPECIES_TROPIUS] = sUnusedAnims_Tropius,
+    [SPECIES_WHISMUR] = sUnusedAnims_Whismur,
+    [SPECIES_LOUDRED] = sUnusedAnims_Loudred,
+    [SPECIES_EXPLOUD] = sUnusedAnims_Exploud,
+    [SPECIES_CLAMPERL] = sUnusedAnims_Clamperl,
+    [SPECIES_HUNTAIL] = sUnusedAnims_Huntail,
+    [SPECIES_GOREBYSS] = sUnusedAnims_Gorebyss,
+    [SPECIES_ABSOL] = sUnusedAnims_Absol,
+    [SPECIES_SHUPPET] = sUnusedAnims_Shuppet,
+    [SPECIES_BANETTE] = sUnusedAnims_Banette,
+    [SPECIES_SEVIPER] = sUnusedAnims_Seviper,
+    [SPECIES_ZANGOOSE] = sUnusedAnims_Zangoose,
+    [SPECIES_RELICANTH] = sUnusedAnims_Relicanth,
+    [SPECIES_ARON] = sUnusedAnims_Aron,
+    [SPECIES_LAIRON] = sUnusedAnims_Lairon,
+    [SPECIES_AGGRON] = sUnusedAnims_Aggron,
+    [SPECIES_CASTFORM] = sUnusedAnims_Castform,
+    [SPECIES_VOLBEAT] = sUnusedAnims_Volbeat,
+    [SPECIES_ILLUMISE] = sUnusedAnims_Illumise,
+    [SPECIES_LILEEP] = sUnusedAnims_Lileep,
+    [SPECIES_CRADILY] = sUnusedAnims_Cradily,
+    [SPECIES_ANORITH] = sUnusedAnims_Anorith,
+    [SPECIES_ARMALDO] = sUnusedAnims_Armaldo,
+    [SPECIES_RALTS] = sUnusedAnims_Ralts,
+    [SPECIES_KIRLIA] = sUnusedAnims_Kirlia,
+    [SPECIES_GARDEVOIR] = sUnusedAnims_Gardevoir,
+    [SPECIES_BAGON] = sUnusedAnims_Bagon,
+    [SPECIES_SHELGON] = sUnusedAnims_Shelgon,
+    [SPECIES_SALAMENCE] = sUnusedAnims_Salamence,
+    [SPECIES_BELDUM] = sUnusedAnims_Beldum,
+    [SPECIES_METANG] = sUnusedAnims_Metang,
+    [SPECIES_METAGROSS] = sUnusedAnims_Metagross,
+    [SPECIES_REGIROCK] = sUnusedAnims_Regirock,
+    [SPECIES_REGICE] = sUnusedAnims_Regice,
+    [SPECIES_REGISTEEL] = sUnusedAnims_Registeel,
+    [SPECIES_KYOGRE] = sUnusedAnims_Kyogre,
+    [SPECIES_GROUDON] = sUnusedAnims_Groudon,
+    [SPECIES_RAYQUAZA] = sUnusedAnims_Rayquaza,
+    [SPECIES_LATIAS] = sUnusedAnims_Latias,
+    [SPECIES_LATIOS] = sUnusedAnims_Latios,
+    [SPECIES_JIRACHI] = sUnusedAnims_Jirachi,
+    [SPECIES_DEOXYS] = sUnusedAnims_Deoxys,
+    [SPECIES_CHIMECHO] = sUnusedAnims_Chimecho,
+    [SPECIES_EGG] = sUnusedAnims_Egg,
+    [SPECIES_UNOWN_B] = sUnusedAnims_Egg,
+    [SPECIES_UNOWN_C] = sUnusedAnims_UnownC,
+    [SPECIES_UNOWN_D] = sUnusedAnims_UnownD,
+    [SPECIES_UNOWN_E] = sUnusedAnims_UnownE,
+    [SPECIES_UNOWN_F] = sUnusedAnims_UnownF,
+    [SPECIES_UNOWN_G] = sUnusedAnims_UnownG,
+    [SPECIES_UNOWN_H] = sUnusedAnims_UnownH,
+    [SPECIES_UNOWN_I] = sUnusedAnims_UnownI,
+    [SPECIES_UNOWN_J] = sUnusedAnims_UnownJ,
+    [SPECIES_UNOWN_K] = sUnusedAnims_UnownK,
+    [SPECIES_UNOWN_L] = sUnusedAnims_UnownL,
+    [SPECIES_UNOWN_M] = sUnusedAnims_UnownM,
+    [SPECIES_UNOWN_N] = sUnusedAnims_UnownN,
+    [SPECIES_UNOWN_O] = sUnusedAnims_UnownO,
+    [SPECIES_UNOWN_P] = sUnusedAnims_UnownP,
+    [SPECIES_UNOWN_Q] = sUnusedAnims_UnownQ,
+    [SPECIES_UNOWN_R] = sUnusedAnims_UnownR,
+    [SPECIES_UNOWN_S] = sUnusedAnims_UnownS,
+    [SPECIES_UNOWN_T] = sUnusedAnims_UnownT,
+    [SPECIES_UNOWN_U] = sUnusedAnims_UnownU,
+    [SPECIES_UNOWN_V] = sUnusedAnims_UnownV,
+    [SPECIES_UNOWN_W] = sUnusedAnims_UnownW,
+    [SPECIES_UNOWN_X] = sUnusedAnims_UnownX,
+    [SPECIES_UNOWN_Y] = sUnusedAnims_UnownY,
+    [SPECIES_UNOWN_Z] = sUnusedAnims_UnownZ,
+    [SPECIES_UNOWN_EMARK] = sUnusedAnims_UnownEMark,
+    [SPECIES_UNOWN_QMARK] = sUnusedAnims_UnownQMark,
+};
+
+#undef ANIM_CMD
+#undef ANIM_CMD_FULL
diff --git a/src/data/union_room.h b/src/data/union_room.h
index cf4b12b5d..129c62994 100644
--- a/src/data/union_room.h
+++ b/src/data/union_room.h
@@ -717,9 +717,9 @@ static const struct ListMenuTemplate sListMenuTemplate_PossibleGroupMembers = {
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 0,
-    .fontId = 1,
-    .cursorKind = 1
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
+    .fontId = FONT_NORMAL,
+    .cursorKind = CURSOR_INVISIBLE
 };
 
 static const struct WindowTemplate sWindowTemplate_GroupList = {
@@ -777,9 +777,9 @@ static const struct ListMenuTemplate sListMenuTemplate_UnionRoomGroups = {
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 1,
-    .fontId = 1,
-    .cursorKind = 0
+    .scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
+    .fontId = FONT_NORMAL,
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const struct WindowTemplate sWindowTemplate_InviteToActivity = {
@@ -815,9 +815,9 @@ static const struct ListMenuTemplate sListMenuTemplate_InviteToActivity = {
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 0,
-    .fontId = 1,
-    .cursorKind = 0
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
+    .fontId = FONT_NORMAL,
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const struct WindowTemplate sWindowTemplate_RegisterForTrade = {
@@ -852,9 +852,9 @@ static const struct ListMenuTemplate sListMenuTemplate_RegisterForTrade = {
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 0,
-    .fontId = 1,
-    .cursorKind = 0
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
+    .fontId = FONT_NORMAL,
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const struct WindowTemplate sWindowTemplate_TradingBoardRequestType = {
@@ -904,9 +904,9 @@ static const struct ListMenuTemplate sMenuTemplate_TradingBoardRequestType = {
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 0,
-    .fontId = 1,
-    .cursorKind = 0
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
+    .fontId = FONT_NORMAL,
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const struct WindowTemplate sWindowTemplate_TradingBoardHeader = {
@@ -930,7 +930,7 @@ static const struct WindowTemplate sWindowTemplate_TradingBoardMain = {
 };
 
 static const struct ListMenuItem sTradeBoardListMenuItems[] = {
-    { sText_EmptyString, -3 },
+    { sText_EmptyString, LIST_HEADER },
     { sText_EmptyString,  0 },
     { sText_EmptyString,  1 },
     { sText_EmptyString,  2 },
@@ -958,9 +958,9 @@ static const struct ListMenuTemplate sTradeBoardListMenuTemplate = {
     .cursorShadowPal = 13,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 0,
-    .fontId = 1,
-    .cursorKind = 0
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
+    .fontId = FONT_NORMAL,
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 // Unused
@@ -1010,9 +1010,9 @@ static const struct ListMenuTemplate sEmptyListMenuTemplate = {
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 1,
-    .fontId = 1,
-    .cursorKind = 0
+    .scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
+    .fontId = FONT_NORMAL,
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const struct RfuPlayerData sUnionRoomPlayer_DummyRfu = {0};
diff --git a/src/daycare.c b/src/daycare.c
index 19d5edbb2..c0b692aa4 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -78,7 +78,7 @@ static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
     .itemVerticalPadding = 0,
     .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
     .fontId = FONT_NORMAL,
-    .cursorKind = 0
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const u8 *const sCompatibilityMessages[] =
@@ -842,7 +842,7 @@ void CreateEgg(struct Pokemon *mon, u16 species, bool8 setHotSpringsLocation)
     language = LANGUAGE_JAPANESE;
     SetMonData(mon, MON_DATA_POKEBALL, &ball);
     SetMonData(mon, MON_DATA_NICKNAME, sJapaneseEggNickname);
-    SetMonData(mon, MON_DATA_FRIENDSHIP, &gBaseStats[species].eggCycles);
+    SetMonData(mon, MON_DATA_FRIENDSHIP, &gSpeciesInfo[species].eggCycles);
     SetMonData(mon, MON_DATA_MET_LEVEL, &metLevel);
     SetMonData(mon, MON_DATA_LANGUAGE, &language);
     if (setHotSpringsLocation)
@@ -869,7 +869,7 @@ static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *
     language = LANGUAGE_JAPANESE;
     SetMonData(mon, MON_DATA_POKEBALL, &ball);
     SetMonData(mon, MON_DATA_NICKNAME, sJapaneseEggNickname);
-    SetMonData(mon, MON_DATA_FRIENDSHIP, &gBaseStats[species].eggCycles);
+    SetMonData(mon, MON_DATA_FRIENDSHIP, &gSpeciesInfo[species].eggCycles);
     SetMonData(mon, MON_DATA_MET_LEVEL, &metLevel);
     SetMonData(mon, MON_DATA_LANGUAGE, &language);
 }
@@ -1031,8 +1031,8 @@ static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
         trainerIds[i] = GetBoxMonData(&daycare->mons[i].mon, MON_DATA_OT_ID);
         personality = GetBoxMonData(&daycare->mons[i].mon, MON_DATA_PERSONALITY);
         genders[i] = GetGenderFromSpeciesAndPersonality(species[i], personality);
-        eggGroups[i][0] = gBaseStats[species[i]].eggGroup1;
-        eggGroups[i][1] = gBaseStats[species[i]].eggGroup2;
+        eggGroups[i][0] = gSpeciesInfo[species[i]].eggGroup1;
+        eggGroups[i][1] = gSpeciesInfo[species[i]].eggGroup2;
     }
 
     // check unbreedable egg group
diff --git a/src/decoration.c b/src/decoration.c
index cd3e185da..8ec80415b 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -314,8 +314,9 @@ static const struct ListMenuTemplate sDecorationItemsListMenuTemplate =
     .cursorShadowPal = 3,
     .lettersSpacing = FALSE,
     .itemVerticalPadding = 0,
-    .scrollMultiple = FALSE,
-    .fontId = FONT_NARROW
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
+    .fontId = FONT_NARROW,
+    .cursorKind = CURSOR_BLACK_ARROW,
 };
 
 #include "data/decoration/icon.h"
@@ -890,7 +891,7 @@ static void PrintDecorationItemMenuItems(u8 taskId)
 
     StringCopy(sDecorationItemsMenu->names[i], gText_Cancel);
     sDecorationItemsMenu->items[i].name = sDecorationItemsMenu->names[i];
-    sDecorationItemsMenu->items[i].id = -2;
+    sDecorationItemsMenu->items[i].id = LIST_CANCEL;
     gMultiuseListMenuTemplate = sDecorationItemsListMenuTemplate;
     gMultiuseListMenuTemplate.windowId = sDecorMenuWindowIds[WINDOW_DECORATION_CATEGORIES];
     gMultiuseListMenuTemplate.totalItems = sDecorationItemsMenu->numMenuItems;
@@ -1976,7 +1977,7 @@ static void SetDecorSelectionMetatiles(struct PlaceDecorationGraphicsDataBuffer
     shape = data->decoration->shape;
     for (i = 0; i < sDecorTilemaps[shape].size; i++)
     {
-        data->tiles[sDecorTilemaps[shape].tiles[i]] = GetMetatile(data->decoration->tiles[sDecorTilemaps[shape].y[i]] * 8 + sDecorTilemaps[shape].x[i]);
+        data->tiles[sDecorTilemaps[shape].tiles[i]] = GetMetatile(data->decoration->tiles[sDecorTilemaps[shape].y[i]] * NUM_TILES_PER_METATILE + sDecorTilemaps[shape].x[i]);
     }
 }
 
@@ -2036,7 +2037,7 @@ static u8 gpu_pal_decompress_alloc_tag_and_upload(struct PlaceDecorationGraphics
     SetDecorSelectionMetatiles(data);
     SetDecorSelectionBoxOamAttributes(data->decoration->shape);
     SetDecorSelectionBoxTiles(data);
-    CopyPalette(data->palette, ((u16 *)gTilesetPointer_SecretBaseRedCave->metatiles)[(data->decoration->tiles[0] * 8) + 7] >> 12);
+    CopyPalette(data->palette, ((u16 *)gTilesetPointer_SecretBaseRedCave->metatiles)[(data->decoration->tiles[0] * NUM_TILES_PER_METATILE) + 7] >> 12);
     LoadSpritePalette(&sSpritePal_PlaceDecoration);
     return CreateSprite(&sDecorationSelectorSpriteTemplate, 0, 0, 0);
 }
@@ -2092,7 +2093,7 @@ static u8 AddDecorationIconObjectFromObjectEvent(u16 tilesTag, u16 paletteTag, u
         SetDecorSelectionMetatiles(&sPlaceDecorationGraphicsDataBuffer);
         SetDecorSelectionBoxOamAttributes(sPlaceDecorationGraphicsDataBuffer.decoration->shape);
         SetDecorSelectionBoxTiles(&sPlaceDecorationGraphicsDataBuffer);
-        CopyPalette(sPlaceDecorationGraphicsDataBuffer.palette, ((u16 *)gTilesetPointer_SecretBaseRedCave->metatiles)[(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0] * 8) + 7] >> 12);
+        CopyPalette(sPlaceDecorationGraphicsDataBuffer.palette, ((u16 *)gTilesetPointer_SecretBaseRedCave->metatiles)[(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0] * NUM_TILES_PER_METATILE) + 7] >> 12);
         sheet.data = sPlaceDecorationGraphicsDataBuffer.image;
         sheet.size = sDecorShapeSizes[sPlaceDecorationGraphicsDataBuffer.decoration->shape] * TILE_SIZE_4BPP;
         sheet.tag = tilesTag;
diff --git a/src/field_camera.c b/src/field_camera.c
index 8b53451c0..3f7e29208 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -237,7 +237,7 @@ static void DrawMetatileAt(const struct MapLayout *mapLayout, u16 offset, int x,
         metatiles = mapLayout->secondaryTileset->metatiles;
         metatileId -= NUM_METATILES_IN_PRIMARY;
     }
-    DrawMetatile(MapGridGetMetatileLayerTypeAt(x, y), metatiles + metatileId * 8, offset);
+    DrawMetatile(MapGridGetMetatileLayerTypeAt(x, y), metatiles + metatileId * NUM_TILES_PER_METATILE, offset);
 }
 
 static void DrawMetatile(s32 metatileLayerType, const u16 *tiles, u16 offset)
diff --git a/src/field_specials.c b/src/field_specials.c
index 11ae04f55..03aebb0ce 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1196,7 +1196,7 @@ void IsGrassTypeInParty(void)
         if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && !GetMonData(pokemon, MON_DATA_IS_EGG))
         {
             species = GetMonData(pokemon, MON_DATA_SPECIES);
-            if (gBaseStats[species].type1 == TYPE_GRASS || gBaseStats[species].type2 == TYPE_GRASS)
+            if (gSpeciesInfo[species].type1 == TYPE_GRASS || gSpeciesInfo[species].type2 == TYPE_GRASS)
             {
                 gSpecialVar_Result = TRUE;
                 return;
@@ -2536,9 +2536,9 @@ static void InitScrollableMultichoice(void)
     gScrollableMultichoice_ListMenuTemplate.cursorShadowPal = 3;
     gScrollableMultichoice_ListMenuTemplate.lettersSpacing = 0;
     gScrollableMultichoice_ListMenuTemplate.itemVerticalPadding = 0;
-    gScrollableMultichoice_ListMenuTemplate.scrollMultiple = 0;
+    gScrollableMultichoice_ListMenuTemplate.scrollMultiple = LIST_NO_MULTIPLE_SCROLL;
     gScrollableMultichoice_ListMenuTemplate.fontId = FONT_NORMAL;
-    gScrollableMultichoice_ListMenuTemplate.cursorKind = 0;
+    gScrollableMultichoice_ListMenuTemplate.cursorKind = CURSOR_BLACK_ARROW;
 }
 
 static void ScrollableMultichoice_MoveCursor(s32 itemIndex, bool8 onInit, struct ListMenu *list)
diff --git a/src/graphics.c b/src/graphics.c
index 8a6bbc88a..bb4d779ad 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -365,7 +365,7 @@ const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpb
                                                   "graphics/battle_interface/hpbar_anim.4bpp",
                                                   "graphics/battle_interface/misc_frameend.4bpp",
                                                   "graphics/battle_interface/ball_display.4bpp",
-                                                  "graphics/battle_interface/ball_display_unused_extra.4bpp",
+                                                  "graphics/battle_interface/ball_caught_indicator.4bpp",
                                                   "graphics/battle_interface/status2.4bpp",  // these three duplicate sets of graphics are for the opponent pokemon
                                                   "graphics/battle_interface/status3.4bpp",  // and are also for use in double battles. they use dynamic palettes so
                                                   "graphics/battle_interface/status4.4bpp",  // coloring them is an extreme headache and wont be done for now
diff --git a/src/international_string_util.c b/src/international_string_util.c
index f71734fa7..457e3260b 100644
--- a/src/international_string_util.c
+++ b/src/international_string_util.c
@@ -133,7 +133,7 @@ void PadNameString(u8 *dest, u8 padChar)
         while (length < PLAYER_NAME_LENGTH - 1)
         {
             dest[length] = EXT_CTRL_CODE_BEGIN;
-            dest[length + 1] = EXT_CTRL_CODE_RESET_SIZE;
+            dest[length + 1] = EXT_CTRL_CODE_RESET_FONT;
             length += 2;
         }
     }
diff --git a/src/item_menu.c b/src/item_menu.c
index 9e7966528..d19baa4ff 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -259,9 +259,9 @@ static const struct ListMenuTemplate sItemListMenu =
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 0,
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
     .fontId = FONT_NARROW,
-    .cursorKind = 0
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const struct MenuAction sItemMenuActions[] = {
@@ -987,7 +987,7 @@ static void BagMenu_ItemPrintCallback(u8 windowId, u32 itemIndex, u8 y)
         else
         {
             // Print registered icon
-            if (gSaveBlock1Ptr->registeredItem && gSaveBlock1Ptr->registeredItem == itemId)
+            if (gSaveBlock1Ptr->registeredItem != ITEM_NONE && gSaveBlock1Ptr->registeredItem == itemId)
                 BlitBitmapToWindow(windowId, sRegisteredSelect_Gfx, 96, y - 1, 24, 16);
         }
     }
@@ -1909,7 +1909,7 @@ static void ItemMenu_Register(u8 taskId)
     u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
 
     if (gSaveBlock1Ptr->registeredItem == gSpecialVar_ItemId)
-        gSaveBlock1Ptr->registeredItem = 0;
+        gSaveBlock1Ptr->registeredItem = ITEM_NONE;
     else
         gSaveBlock1Ptr->registeredItem = gSpecialVar_ItemId;
     DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);
diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c
index 4730c74fd..9d66a1837 100644
--- a/src/link_rfu_2.c
+++ b/src/link_rfu_2.c
@@ -2525,9 +2525,8 @@ u8 RfuGetStatus(void)
 
 bool32 RfuHasErrored(void)
 {
-    // RFU_STATUS_OK will underflow here intentionally
-    u32 var = RfuGetStatus() - 1;
-    if (var < RFU_STATUS_CONNECTION_ERROR)
+    u32 status = RfuGetStatus();
+    if (status == RFU_STATUS_FATAL_ERROR || status == RFU_STATUS_CONNECTION_ERROR)
         return TRUE;
     else
         return FALSE;
@@ -2656,7 +2655,7 @@ static u8 GetPartnerIndexByNameAndTrainerID(const u8 *name, u16 id)
 
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        u16 trainerId = ReadU16(gRfuLinkStatus->partner[i].gname + 2);
+        u16 trainerId = ReadU16(((struct RfuGameData *)gRfuLinkStatus->partner[i].gname)->compatibility.playerTrainerId);
         if (IsRfuSerialNumberValid(gRfuLinkStatus->partner[i].serialNo)
             && !StringCompare(name, gRfuLinkStatus->partner[i].uname)
             && id == trainerId)
@@ -2682,9 +2681,9 @@ static void RfuReqDisconnectSlot(u32 slot)
 
 void RequestDisconnectSlotByTrainerNameAndId(const u8 *name, u16 id)
 {
-    u8 var = GetPartnerIndexByNameAndTrainerID(name, id);
-    if (var != 0xFF)
-        RfuReqDisconnectSlot(1 << var);
+    u8 index = GetPartnerIndexByNameAndTrainerID(name, id);
+    if (index != 0xFF)
+        RfuReqDisconnectSlot(1 << index);
 }
 
 void Rfu_DisconnectPlayerById(u32 playerIdx)
diff --git a/src/list_menu.c b/src/list_menu.c
index 112fca753..c240564c6 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -13,6 +13,10 @@
 #include "sound.h"
 #include "constants/songs.h"
 
+// Cursors after this point are created using a sprite with their own task.
+// This allows them to have idle animations. Cursors prior to this are simply printed text.
+#define CURSOR_OBJECT_START CURSOR_RED_OUTLINE
+
 struct UnkIndicatorsStruct
 {
     u8 field_0;
@@ -70,7 +74,7 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn
 static void ListMenuPrintEntries(struct ListMenu *list, u16 startIndex, u16 yOffset, u16 count);
 static void ListMenuDrawCursor(struct ListMenu *list);
 static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 onInit);
-static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind);
+static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorObjId);
 static void Task_ScrollIndicatorArrowPair(u8 taskId);
 static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor);
 static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor);
@@ -78,9 +82,9 @@ static void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y);
 static void ListMenuUpdateRedArrowCursorObject(u8 taskId, u16 x, u16 y);
 static void ListMenuRemoveRedOutlineCursorObject(u8 taskId);
 static void ListMenuRemoveRedArrowCursorObject(u8 taskId);
-static u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind);
-static void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorKind);
-static void ListMenuRemoveCursorObject(u8 taskId, u32 cursorKind);
+static u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorObjId);
+static void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorObjId);
+static void ListMenuRemoveCursorObject(u8 taskId, u32 cursorObjId);
 static void SpriteCallback_ScrollIndicatorArrow(struct Sprite *sprite);
 static void SpriteCallback_RedArrowCursor(struct Sprite *sprite);
 
@@ -301,10 +305,10 @@ static const struct SpriteTemplate sSpriteTemplate_RedArrowCursor =
     .callback = SpriteCallback_RedArrowCursor,
 };
 
-static const u16 sRedArrowPal[] = INCBIN_U16("graphics/interface/red_arrow.gbapal");
-static const u32 sRedArrowOtherGfx[] = INCBIN_U32("graphics/interface/red_arrow_other.4bpp.lz");
-static const u32 sSelectorOutlineGfx[] = INCBIN_U32("graphics/interface/selector_outline.4bpp.lz");
-static const u32 sRedArrowGfx[] = INCBIN_U32("graphics/interface/red_arrow.4bpp.lz");
+static const u16 sRedInterface_Pal[]    = INCBIN_U16("graphics/interface/red.gbapal"); // Shared by all of the below gfx
+static const u32 sScrollIndicator_Gfx[] = INCBIN_U32("graphics/interface/scroll_indicator.4bpp.lz");
+static const u32 sOutlineCursor_Gfx[]   = INCBIN_U32("graphics/interface/outline_cursor.4bpp.lz");
+static const u32 sArrowCursor_Gfx[]     = INCBIN_U32("graphics/interface/arrow_cursor.4bpp.lz");
 
 // code
 static void ListMenuDummyTask(u8 taskId)
@@ -477,7 +481,7 @@ void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
         *selectedRow = list->selectedRow;
 
     if (list->taskId != TASK_NONE)
-        ListMenuRemoveCursorObject(list->taskId, list->template.cursorKind - 2);
+        ListMenuRemoveCursorObject(list->taskId, list->template.cursorKind - CURSOR_OBJECT_START);
 
     DestroyTask(listTaskId);
 }
@@ -650,31 +654,33 @@ static void ListMenuDrawCursor(struct ListMenu *list)
     u8 y = list->selectedRow * yMultiplier + list->template.upText_Y;
     switch (list->template.cursorKind)
     {
-    case 0:
+    case CURSOR_BLACK_ARROW:
         ListMenuPrint(list, gText_SelectorArrow2, x, y);
         break;
-    case 1:
+    case CURSOR_INVISIBLE:
         break;
-    case 2:
+    case CURSOR_RED_OUTLINE:
         if (list->taskId == TASK_NONE)
-            list->taskId = ListMenuAddCursorObject(list, 0);
+            list->taskId = ListMenuAddCursorObject(list, CURSOR_RED_OUTLINE - CURSOR_OBJECT_START);
         ListMenuUpdateCursorObject(list->taskId,
                                    GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 - 1,
-                                   GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y - 1, 0);
+                                   GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y - 1,
+                                   CURSOR_RED_OUTLINE - CURSOR_OBJECT_START);
         break;
-    case 3:
+    case CURSOR_RED_ARROW:
         if (list->taskId == TASK_NONE)
-            list->taskId = ListMenuAddCursorObject(list, 1);
+            list->taskId = ListMenuAddCursorObject(list, CURSOR_RED_ARROW - CURSOR_OBJECT_START);
         ListMenuUpdateCursorObject(list->taskId,
                                    GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 + x,
-                                   GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y, 1);
+                                   GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y,
+                                   CURSOR_RED_ARROW - CURSOR_OBJECT_START);
         break;
     }
 }
 
 #undef TASK_NONE
 
-static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind)
+static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorObjId)
 {
     struct CursorStruct cursor;
 
@@ -686,13 +692,13 @@ static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind)
     cursor.palTag = TAG_NONE;
     cursor.palNum = 15;
 
-    return ListMenuAddCursorObjectInternal(&cursor, cursorKind);
+    return ListMenuAddCursorObjectInternal(&cursor, cursorObjId);
 }
 
 static void ListMenuErasePrintedCursor(struct ListMenu *list, u16 selectedRow)
 {
     u8 cursorKind = list->template.cursorKind;
-    if (cursorKind == 0)
+    if (cursorKind == CURSOR_BLACK_ARROW)
     {
         u8 yMultiplier = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + list->template.itemVerticalPadding;
         u8 width  = GetMenuCursorDimensionByFont(list->template.fontId, 0);
@@ -1071,18 +1077,18 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
     struct ScrollIndicatorPair *data;
     u8 taskId;
 
-    spriteSheet.data = sRedArrowOtherGfx;
+    spriteSheet.data = sScrollIndicator_Gfx;
     spriteSheet.size = 0x100;
     spriteSheet.tag = arrowInfo->tileTag;
     LoadCompressedSpriteSheet(&spriteSheet);
 
     if (arrowInfo->palTag == TAG_NONE)
     {
-        LoadPalette(sRedArrowPal, (16 * arrowInfo->palNum) + 0x100, 0x20);
+        LoadPalette(sRedInterface_Pal, (16 * arrowInfo->palNum) + 0x100, 0x20);
     }
     else
     {
-        spritePal.data = sRedArrowPal;
+        spritePal.data = sRedInterface_Pal;
         spritePal.tag = arrowInfo->palTag;
         LoadSpritePalette(&spritePal);
     }
@@ -1190,39 +1196,39 @@ void RemoveScrollIndicatorArrowPair(u8 taskId)
     DestroyTask(taskId);
 }
 
-static u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind)
+static u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorObjId)
 {
-    switch (cursorKind)
+    switch (cursorObjId)
     {
-    case 0:
+    case CURSOR_RED_OUTLINE - CURSOR_OBJECT_START:
     default:
         return ListMenuAddRedOutlineCursorObject(cursor);
-    case 1:
+    case CURSOR_RED_ARROW - CURSOR_OBJECT_START:
         return ListMenuAddRedArrowCursorObject(cursor);
     }
 }
 
-static void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorKind)
+static void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorObjId)
 {
-    switch (cursorKind)
+    switch (cursorObjId)
     {
-    case 0:
+    case CURSOR_RED_OUTLINE - CURSOR_OBJECT_START:
         ListMenuUpdateRedOutlineCursorObject(taskId, x, y);
         break;
-    case 1:
+    case CURSOR_RED_ARROW - CURSOR_OBJECT_START:
         ListMenuUpdateRedArrowCursorObject(taskId, x, y);
         break;
     }
 }
 
-static void ListMenuRemoveCursorObject(u8 taskId, u32 cursorKind)
+static void ListMenuRemoveCursorObject(u8 taskId, u32 cursorObjId)
 {
-    switch (cursorKind)
+    switch (cursorObjId)
     {
-    case 0:
+    case CURSOR_RED_OUTLINE - CURSOR_OBJECT_START:
         ListMenuRemoveRedOutlineCursorObject(taskId);
         break;
-    case 1:
+    case CURSOR_RED_ARROW - CURSOR_OBJECT_START:
         ListMenuRemoveRedArrowCursorObject(taskId);
         break;
     }
@@ -1317,18 +1323,18 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor)
     struct SpriteTemplate spriteTemplate;
     u8 taskId;
 
-    spriteSheet.data = sSelectorOutlineGfx;
+    spriteSheet.data = sOutlineCursor_Gfx;
     spriteSheet.size = 0x100;
     spriteSheet.tag = cursor->tileTag;
     LoadCompressedSpriteSheet(&spriteSheet);
 
     if (cursor->palTag == TAG_NONE)
     {
-        LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20);
+        LoadPalette(sRedInterface_Pal, (16 * cursor->palNum) + 0x100, 0x20);
     }
     else
     {
-        spritePal.data = sRedArrowPal;
+        spritePal.data = sRedInterface_Pal;
         spritePal.tag = cursor->palTag;
         LoadSpritePalette(&spritePal);
     }
@@ -1402,18 +1408,18 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor)
     struct SpriteTemplate spriteTemplate;
     u8 taskId;
 
-    spriteSheet.data = sRedArrowGfx;
+    spriteSheet.data = sArrowCursor_Gfx;
     spriteSheet.size = 0x80;
     spriteSheet.tag = cursor->tileTag;
     LoadCompressedSpriteSheet(&spriteSheet);
 
     if (cursor->palTag == TAG_NONE)
     {
-        LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20);
+        LoadPalette(sRedInterface_Pal, (16 * cursor->palNum) + 0x100, 0x20);
     }
     else
     {
-        spritePal.data = sRedArrowPal;
+        spritePal.data = sRedInterface_Pal;
         spritePal.tag = cursor->palTag;
         LoadSpritePalette(&spritePal);
     }
diff --git a/src/main_menu.c b/src/main_menu.c
index 5b18e440a..7d9bb9a6c 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -1631,7 +1631,7 @@ static void Task_NewGameBirchSpeech_ProcessNameYesNoMenu(u8 taskId)
             NewGameBirchSpeech_StartFadePlatformIn(taskId, 1);
             gTasks[taskId].func = Task_NewGameBirchSpeech_SlidePlatformAway2;
             break;
-        case -1:
+        case MENU_B_PRESSED:
         case 1:
             PlaySE(SE_SELECT);
             gTasks[taskId].func = Task_NewGameBirchSpeech_BoyOrGirl;
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index 42c80b5ee..92644810d 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -187,7 +187,7 @@ static const struct ListMenuTemplate sMoveRelearnerMovesListTemplate =
     .itemVerticalPadding = 0,
     .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
     .fontId = FONT_NORMAL,
-    .cursorKind = 0
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 //--------------
@@ -284,7 +284,7 @@ u8 MailboxMenu_CreateList(struct PlayerPCItemPageStruct *page)
     gMultiuseListMenuTemplate.moveCursorFunc = MailboxMenu_MoveCursorFunc;
     gMultiuseListMenuTemplate.itemPrintFunc = MailboxMenu_ItemPrintFunc;
     gMultiuseListMenuTemplate.fontId = FONT_NORMAL;
-    gMultiuseListMenuTemplate.cursorKind = 0;
+    gMultiuseListMenuTemplate.cursorKind = CURSOR_BLACK_ARROW;
     gMultiuseListMenuTemplate.lettersSpacing = 0;
     gMultiuseListMenuTemplate.itemVerticalPadding = 0;
     gMultiuseListMenuTemplate.scrollMultiple = LIST_NO_MULTIPLE_SCROLL;
@@ -1538,7 +1538,7 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bg
                                      0,
                                      15 * i,
                                      color,
-                                     -1,
+                                     TEXT_SKIP_DRAW,
                                      sLvlUpStatStrings[i]);
 
         StringCopy(text, (statsDiff[i] >= 0) ? gText_Plus : gText_Dash);
@@ -1547,7 +1547,7 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bg
                                      56,
                                      15 * i,
                                      color,
-                                     -1,
+                                     TEXT_SKIP_DRAW,
                                      text);
         if (abs(statsDiff[i]) <= 9)
             x = 18;
@@ -1560,7 +1560,7 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bg
                                      56 + x,
                                      15 * i,
                                      color,
-                                     -1,
+                                     TEXT_SKIP_DRAW,
                                      text);
     }
 }
@@ -1602,7 +1602,7 @@ void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 s
                                      0,
                                      15 * i,
                                      color,
-                                     -1,
+                                     TEXT_SKIP_DRAW,
                                      sLvlUpStatStrings[i]);
 
         AddTextPrinterParameterized3(windowId,
@@ -1610,7 +1610,7 @@ void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 s
                                      56 + x,
                                      15 * i,
                                      color,
-                                     -1,
+                                     TEXT_SKIP_DRAW,
                                      text);
     }
 }
diff --git a/src/move_relearner.c b/src/move_relearner.c
index d9c943b57..3c8b06a78 100644
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -553,7 +553,7 @@ static void DoMoveRelearnerMain(void)
                 gSpecialVar_0x8004 = FALSE;
                 sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN;
             }
-            else if (selection == -1 || selection == 1)
+            else if (selection == MENU_B_PRESSED || selection == 1)
             {
                 if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
                 {
@@ -579,14 +579,14 @@ static void DoMoveRelearnerMain(void)
         break;
     case MENU_STATE_CONFIRM_DELETE_OLD_MOVE:
         {
-            s8 var = Menu_ProcessInputNoWrapClearOnChoose();
+            s8 selection = Menu_ProcessInputNoWrapClearOnChoose();
 
-            if (var == 0)
+            if (selection == 0)
             {
                 FormatAndPrintText(gText_MoveRelearnerWhichMoveToForget);
                 sMoveRelearnerStruct->state = MENU_STATE_PRINT_WHICH_MOVE_PROMPT;
             }
-            else if (var == -1 || var == 1)
+            else if (selection == MENU_B_PRESSED || selection == 1)
             {
                 sMoveRelearnerStruct->state = MENU_STATE_PRINT_STOP_TEACHING;
             }
@@ -606,13 +606,13 @@ static void DoMoveRelearnerMain(void)
         break;
     case MENU_STATE_CONFIRM_STOP_TEACHING:
         {
-            s8 var = Menu_ProcessInputNoWrapClearOnChoose();
+            s8 selection = Menu_ProcessInputNoWrapClearOnChoose();
 
-            if (var == 0)
+            if (selection == 0)
             {
                 sMoveRelearnerStruct->state = MENU_STATE_CHOOSE_SETUP_STATE;
             }
-            else if (var == MENU_B_PRESSED || var == 1)
+            else if (selection == MENU_B_PRESSED || selection == 1)
             {
                 // What's the point? It gets set to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT, anyway.
                 if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c
index 6a09ca206..248193f7b 100644
--- a/src/mystery_gift_menu.c
+++ b/src/mystery_gift_menu.c
@@ -234,9 +234,9 @@ static const struct ListMenuTemplate sListMenuTemplate_ThreeOptions = {
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 0,
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
     .fontId = FONT_NORMAL,
-    .cursorKind = 0
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const struct ListMenuItem sListMenuItems_ReceiveSendToss[] = {
@@ -279,9 +279,9 @@ static const struct ListMenuTemplate sListMenu_ReceiveSendToss = {
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 0,
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
     .fontId = FONT_NORMAL,
-    .cursorKind = 0
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const struct ListMenuTemplate sListMenu_ReceiveToss = {
@@ -300,9 +300,9 @@ static const struct ListMenuTemplate sListMenu_ReceiveToss = {
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 0,
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
     .fontId = FONT_NORMAL,
-    .cursorKind = 0
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const struct ListMenuTemplate sListMenu_ReceiveSend = {
@@ -321,9 +321,9 @@ static const struct ListMenuTemplate sListMenu_ReceiveSend = {
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 0,
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
     .fontId = FONT_NORMAL,
-    .cursorKind = 0
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const struct ListMenuTemplate sListMenu_Receive = {
@@ -342,9 +342,9 @@ static const struct ListMenuTemplate sListMenu_Receive = {
     .cursorShadowPal = 3,
     .lettersSpacing = 0,
     .itemVerticalPadding = 0,
-    .scrollMultiple = 0,
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
     .fontId = FONT_NORMAL,
-    .cursorKind = 0
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const u8 *const sUnusedMenuTexts[] = {
diff --git a/src/new_game.c b/src/new_game.c
index 4ecb670c0..ac3842e0a 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -44,6 +44,7 @@
 #include "berry_powder.h"
 #include "mystery_gift.h"
 #include "union_room_chat.h"
+#include "constants/items.h"
 
 extern const u8 EventScript_ResetAllMapFlags[];
 
@@ -181,7 +182,7 @@ void NewGameInitData(void)
     ResetPokemonStorageSystem();
     ClearRoamerData();
     ClearRoamerLocationData();
-    gSaveBlock1Ptr->registeredItem = 0;
+    gSaveBlock1Ptr->registeredItem = ITEM_NONE;
     ClearBag();
     NewGameInitPCItems();
     ClearPokeblocks();
diff --git a/src/player_pc.c b/src/player_pc.c
index b1a323a32..f53e08f53 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -290,8 +290,9 @@ static const struct ListMenuTemplate sListMenuTemplate_ItemStorage =
     .cursorShadowPal = 3,
     .lettersSpacing = FALSE,
     .itemVerticalPadding = 0,
-    .scrollMultiple = FALSE,
-    .fontId = FONT_NARROW
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
+    .fontId = FONT_NARROW,
+    .cursorKind = CURSOR_BLACK_ARROW,
 };
 
 static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT] =
diff --git a/src/pokeblock.c b/src/pokeblock.c
index cf0513f80..481f84c4a 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -440,7 +440,7 @@ static const struct ListMenuTemplate sPokeblockListMenuTemplate =
     .itemVerticalPadding = 0,
     .scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
     .fontId = FONT_NORMAL,
-    .cursorKind = 1
+    .cursorKind = CURSOR_INVISIBLE
 };
 
 void OpenPokeblockCase(u8 caseId, void (*callback)(void))
diff --git a/src/pokedex.c b/src/pokedex.c
index 8abf97248..33355d197 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -4701,7 +4701,7 @@ static int DoPokedexSearch(u8 dexMode, u8 order, u8 abcGroup, u8 bodyColor, u8 t
         {
             species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum);
 
-            if (bodyColor == gBaseStats[species].bodyColor)
+            if (bodyColor == gSpeciesInfo[species].bodyColor)
             {
                 sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i];
                 resultsCount++;
@@ -4727,8 +4727,8 @@ static int DoPokedexSearch(u8 dexMode, u8 order, u8 abcGroup, u8 bodyColor, u8 t
                 {
                     species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum);
 
-                    types[0] = gBaseStats[species].type1;
-                    types[1] = gBaseStats[species].type2;
+                    types[0] = gSpeciesInfo[species].type1;
+                    types[1] = gSpeciesInfo[species].type2;
                     if (types[0] == type1 || types[1] == type1)
                     {
                         sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i];
@@ -4745,8 +4745,8 @@ static int DoPokedexSearch(u8 dexMode, u8 order, u8 abcGroup, u8 bodyColor, u8 t
                 {
                     species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum);
 
-                    types[0] = gBaseStats[species].type1;
-                    types[1] = gBaseStats[species].type2;
+                    types[0] = gSpeciesInfo[species].type1;
+                    types[1] = gSpeciesInfo[species].type2;
                     if ((types[0] == type1 && types[1] == type2) || (types[0] == type2 && types[1] == type1))
                     {
                         sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i];
diff --git a/src/pokemon.c b/src/pokemon.c
index b65f97bd8..1e40220e2 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1388,7 +1388,7 @@ const s8 gNatureStatTable[NUM_NATURES][NUM_NATURE_STATS] =
 #include "data/pokemon/trainer_class_lookups.h"
 #include "data/pokemon/cry_ids.h"
 #include "data/pokemon/experience_tables.h"
-#include "data/pokemon/base_stats.h"
+#include "data/pokemon/species_info.h"
 #include "data/pokemon/level_up_learnsets.h"
 #include "data/pokemon/evolution.h"
 #include "data/pokemon/level_up_learnset_pointers.h"
@@ -2245,8 +2245,8 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
     SetBoxMonData(boxMon, MON_DATA_LANGUAGE, &gGameLanguage);
     SetBoxMonData(boxMon, MON_DATA_OT_NAME, gSaveBlock2Ptr->playerName);
     SetBoxMonData(boxMon, MON_DATA_SPECIES, &species);
-    SetBoxMonData(boxMon, MON_DATA_EXP, &gExperienceTables[gBaseStats[species].growthRate][level]);
-    SetBoxMonData(boxMon, MON_DATA_FRIENDSHIP, &gBaseStats[species].friendship);
+    SetBoxMonData(boxMon, MON_DATA_EXP, &gExperienceTables[gSpeciesInfo[species].growthRate][level]);
+    SetBoxMonData(boxMon, MON_DATA_FRIENDSHIP, &gSpeciesInfo[species].friendship);
     value = GetCurrentRegionMapSectionId();
     SetBoxMonData(boxMon, MON_DATA_MET_LOCATION, &value);
     SetBoxMonData(boxMon, MON_DATA_MET_LEVEL, &level);
@@ -2286,7 +2286,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
         SetBoxMonData(boxMon, MON_DATA_SPDEF_IV, &iv);
     }
 
-    if (gBaseStats[species].abilities[1])
+    if (gSpeciesInfo[species].abilities[1])
     {
         value = personality & 1;
         SetBoxMonData(boxMon, MON_DATA_ABILITY_NUM, &value);
@@ -2806,7 +2806,7 @@ static u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon)
 
 #define CALC_STAT(base, iv, ev, statIndex, field)               \
 {                                                               \
-    u8 baseStat = gBaseStats[species].base;                     \
+    u8 baseStat = gSpeciesInfo[species].base;                   \
     s32 n = (((2 * baseStat + iv + ev / 4) * level) / 100) + 5; \
     u8 nature = GetNature(mon);                                 \
     n = ModifyStatByNature(nature, n, statIndex);               \
@@ -2841,7 +2841,7 @@ void CalculateMonStats(struct Pokemon *mon)
     }
     else
     {
-        s32 n = 2 * gBaseStats[species].baseHP + hpIV;
+        s32 n = 2 * gSpeciesInfo[species].baseHP + hpIV;
         newMaxHP = (((n + hpEV / 4) * level) / 100) + level + 10;
     }
 
@@ -2901,7 +2901,7 @@ u8 GetLevelFromMonExp(struct Pokemon *mon)
     u32 exp = GetMonData(mon, MON_DATA_EXP, NULL);
     s32 level = 1;
 
-    while (level <= MAX_LEVEL && gExperienceTables[gBaseStats[species].growthRate][level] <= exp)
+    while (level <= MAX_LEVEL && gExperienceTables[gSpeciesInfo[species].growthRate][level] <= exp)
         level++;
 
     return level - 1;
@@ -2913,7 +2913,7 @@ u8 GetLevelFromBoxMonExp(struct BoxPokemon *boxMon)
     u32 exp = GetBoxMonData(boxMon, MON_DATA_EXP, NULL);
     s32 level = 1;
 
-    while (level <= MAX_LEVEL && gExperienceTables[gBaseStats[species].growthRate][level] <= exp)
+    while (level <= MAX_LEVEL && gExperienceTables[gSpeciesInfo[species].growthRate][level] <= exp)
         level++;
 
     return level - 1;
@@ -3442,15 +3442,15 @@ u8 GetBoxMonGender(struct BoxPokemon *boxMon)
     u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL);
     u32 personality = GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL);
 
-    switch (gBaseStats[species].genderRatio)
+    switch (gSpeciesInfo[species].genderRatio)
     {
     case MON_MALE:
     case MON_FEMALE:
     case MON_GENDERLESS:
-        return gBaseStats[species].genderRatio;
+        return gSpeciesInfo[species].genderRatio;
     }
 
-    if (gBaseStats[species].genderRatio > (personality & 0xFF))
+    if (gSpeciesInfo[species].genderRatio > (personality & 0xFF))
         return MON_FEMALE;
     else
         return MON_MALE;
@@ -3458,15 +3458,15 @@ u8 GetBoxMonGender(struct BoxPokemon *boxMon)
 
 u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality)
 {
-    switch (gBaseStats[species].genderRatio)
+    switch (gSpeciesInfo[species].genderRatio)
     {
     case MON_MALE:
     case MON_FEMALE:
     case MON_GENDERLESS:
-        return gBaseStats[species].genderRatio;
+        return gSpeciesInfo[species].genderRatio;
     }
 
-    if (gBaseStats[species].genderRatio > (personality & 0xFF))
+    if (gSpeciesInfo[species].genderRatio > (personality & 0xFF))
         return MON_FEMALE;
     else
         return MON_MALE;
@@ -4495,9 +4495,9 @@ u8 GetMonsStateToDoubles_2(void)
 u8 GetAbilityBySpecies(u16 species, u8 abilityNum)
 {
     if (abilityNum)
-        gLastUsedAbility = gBaseStats[species].abilities[1];
+        gLastUsedAbility = gSpeciesInfo[species].abilities[1];
     else
-        gLastUsedAbility = gBaseStats[species].abilities[0];
+        gLastUsedAbility = gSpeciesInfo[species].abilities[0];
 
     return gLastUsedAbility;
 }
@@ -4651,8 +4651,8 @@ void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex)
     gBattleMons[battlerId].isEgg = GetMonData(&gPlayerParty[partyIndex], MON_DATA_IS_EGG, NULL);
     gBattleMons[battlerId].abilityNum = GetMonData(&gPlayerParty[partyIndex], MON_DATA_ABILITY_NUM, NULL);
     gBattleMons[battlerId].otId = GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_ID, NULL);
-    gBattleMons[battlerId].type1 = gBaseStats[gBattleMons[battlerId].species].type1;
-    gBattleMons[battlerId].type2 = gBaseStats[gBattleMons[battlerId].species].type2;
+    gBattleMons[battlerId].type1 = gSpeciesInfo[gBattleMons[battlerId].species].type1;
+    gBattleMons[battlerId].type2 = gSpeciesInfo[gBattleMons[battlerId].species].type2;
     gBattleMons[battlerId].ability = GetAbilityBySpecies(gBattleMons[battlerId].species, gBattleMons[battlerId].abilityNum);
     GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, nickname);
     StringCopy_Nickname(gBattleMons[battlerId].nickname, nickname);
@@ -4869,7 +4869,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
             if ((itemEffect[i] & ITEM3_LEVEL_UP)
              && GetMonData(mon, MON_DATA_LEVEL, NULL) != MAX_LEVEL)
             {
-                dataUnsigned = gExperienceTables[gBaseStats[GetMonData(mon, MON_DATA_SPECIES, NULL)].growthRate][GetMonData(mon, MON_DATA_LEVEL, NULL) + 1];
+                dataUnsigned = gExperienceTables[gSpeciesInfo[GetMonData(mon, MON_DATA_SPECIES, NULL)].growthRate][GetMonData(mon, MON_DATA_LEVEL, NULL) + 1];
                 SetMonData(mon, MON_DATA_EXP, &dataUnsigned);
                 CalculateMonStats(mon);
                 retVal = FALSE;
@@ -5948,22 +5948,22 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies)
         switch (i)
         {
         case STAT_HP:
-            evIncrease = gBaseStats[defeatedSpecies].evYield_HP * multiplier;
+            evIncrease = gSpeciesInfo[defeatedSpecies].evYield_HP * multiplier;
             break;
         case STAT_ATK:
-            evIncrease = gBaseStats[defeatedSpecies].evYield_Attack * multiplier;
+            evIncrease = gSpeciesInfo[defeatedSpecies].evYield_Attack * multiplier;
             break;
         case STAT_DEF:
-            evIncrease = gBaseStats[defeatedSpecies].evYield_Defense * multiplier;
+            evIncrease = gSpeciesInfo[defeatedSpecies].evYield_Defense * multiplier;
             break;
         case STAT_SPEED:
-            evIncrease = gBaseStats[defeatedSpecies].evYield_Speed * multiplier;
+            evIncrease = gSpeciesInfo[defeatedSpecies].evYield_Speed * multiplier;
             break;
         case STAT_SPATK:
-            evIncrease = gBaseStats[defeatedSpecies].evYield_SpAttack * multiplier;
+            evIncrease = gSpeciesInfo[defeatedSpecies].evYield_SpAttack * multiplier;
             break;
         case STAT_SPDEF:
-            evIncrease = gBaseStats[defeatedSpecies].evYield_SpDefense * multiplier;
+            evIncrease = gSpeciesInfo[defeatedSpecies].evYield_SpDefense * multiplier;
             break;
         }
 
@@ -6165,12 +6165,12 @@ bool8 TryIncrementMonLevel(struct Pokemon *mon)
     u16 species = GetMonData(mon, MON_DATA_SPECIES, 0);
     u8 nextLevel = GetMonData(mon, MON_DATA_LEVEL, 0) + 1;
     u32 expPoints = GetMonData(mon, MON_DATA_EXP, 0);
-    if (expPoints > gExperienceTables[gBaseStats[species].growthRate][MAX_LEVEL])
+    if (expPoints > gExperienceTables[gSpeciesInfo[species].growthRate][MAX_LEVEL])
     {
-        expPoints = gExperienceTables[gBaseStats[species].growthRate][MAX_LEVEL];
+        expPoints = gExperienceTables[gSpeciesInfo[species].growthRate][MAX_LEVEL];
         SetMonData(mon, MON_DATA_EXP, &expPoints);
     }
-    if (nextLevel > MAX_LEVEL || expPoints < gExperienceTables[gBaseStats[species].growthRate][nextLevel])
+    if (nextLevel > MAX_LEVEL || expPoints < gExperienceTables[gSpeciesInfo[species].growthRate][nextLevel])
     {
         return FALSE;
     }
@@ -6494,7 +6494,7 @@ bool32 IsHMMove2(u16 move)
 
 bool8 IsMonSpriteNotFlipped(u16 species)
 {
-    return gBaseStats[species].noFlip;
+    return gSpeciesInfo[species].noFlip;
 }
 
 s8 GetMonFlavorRelation(struct Pokemon *mon, u8 flavor)
@@ -6615,26 +6615,26 @@ void SetWildMonHeldItem(void)
                 if (rnd < chanceNoItem)
                     return;
                 if (rnd < chanceNotRare)
-                    SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &gBaseStats[species].itemCommon);
+                    SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &gSpeciesInfo[species].itemCommon);
                 else
-                    SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &gBaseStats[species].itemRare);
+                    SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &gSpeciesInfo[species].itemRare);
             }
         }
         else
         {
-            if (gBaseStats[species].itemCommon == gBaseStats[species].itemRare && gBaseStats[species].itemCommon != ITEM_NONE)
+            if (gSpeciesInfo[species].itemCommon == gSpeciesInfo[species].itemRare && gSpeciesInfo[species].itemCommon != ITEM_NONE)
             {
                 // Both held items are the same, 100% chance to hold item
-                SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &gBaseStats[species].itemCommon);
+                SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &gSpeciesInfo[species].itemCommon);
             }
             else
             {
                 if (rnd < chanceNoItem)
                     return;
                 if (rnd < chanceNotRare)
-                    SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &gBaseStats[species].itemCommon);
+                    SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &gSpeciesInfo[species].itemCommon);
                 else
-                    SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &gBaseStats[species].itemRare);
+                    SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &gSpeciesInfo[species].itemRare);
             }
         }
     }
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 9a95edf4b..baeb70578 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -901,11 +901,11 @@ u8 GetSpeciesBackAnimSet(u16 species)
 // as 0xFFFFXXXX instead of the desired 0x02YYXXXX.
 // By dumb luck, this is not an issue in vanilla. However,
 // changing the link order revealed this bug.
-#if MODERN
+#if MODERN || defined(BUGFIX)
 #define ANIM_SPRITE(taskId)   ((struct Sprite *)((gTasks[taskId].tPtrHi << 16) | ((u16)gTasks[taskId].tPtrLo)))
 #else
 #define ANIM_SPRITE(taskId)   ((struct Sprite *)((gTasks[taskId].tPtrHi << 16) | (gTasks[taskId].tPtrLo)))
-#endif //MODERN
+#endif //MODERN || BUGFIX
 
 static void Task_HandleMonAnimation(u8 taskId)
 {
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 9806a75dc..49d338707 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -107,6 +107,7 @@ enum {
 #define PSS_DATA_WINDOW_MOVE_DESCRIPTION 2
 
 #define MOVE_SELECTOR_SPRITES_COUNT 10
+#define TYPE_ICON_SPRITE_COUNT (MAX_MON_MOVES + 1)
 // for the spriteIds field in PokemonSummaryScreenData
 enum
 {
@@ -114,7 +115,7 @@ enum
     SPRITE_ARR_ID_BALL,
     SPRITE_ARR_ID_STATUS,
     SPRITE_ARR_ID_TYPE, // 2 for mon types, 5 for move types(4 moves and 1 to learn), used interchangeably, because mon types and move types aren't shown on the same screen
-    SPRITE_ARR_ID_MOVE_SELECTOR1 = SPRITE_ARR_ID_TYPE + 5, // 10 sprites that make up the selector
+    SPRITE_ARR_ID_MOVE_SELECTOR1 = SPRITE_ARR_ID_TYPE + TYPE_ICON_SPRITE_COUNT, // 10 sprites that make up the selector
     SPRITE_ARR_ID_MOVE_SELECTOR2 = SPRITE_ARR_ID_MOVE_SELECTOR1 + MOVE_SELECTOR_SPRITES_COUNT,
     SPRITE_ARR_ID_COUNT = SPRITE_ARR_ID_MOVE_SELECTOR2 + MOVE_SELECTOR_SPRITES_COUNT
 };
@@ -2611,8 +2612,8 @@ static void DrawExperienceProgressBar(struct Pokemon *unused)
 
     if (summary->level < MAX_LEVEL)
     {
-        u32 expBetweenLevels = gExperienceTables[gBaseStats[summary->species].growthRate][summary->level + 1] - gExperienceTables[gBaseStats[summary->species].growthRate][summary->level];
-        u32 expSinceLastLevel = summary->exp - gExperienceTables[gBaseStats[summary->species].growthRate][summary->level];
+        u32 expBetweenLevels = gExperienceTables[gSpeciesInfo[summary->species].growthRate][summary->level + 1] - gExperienceTables[gSpeciesInfo[summary->species].growthRate][summary->level];
+        u32 expSinceLastLevel = summary->exp - gExperienceTables[gSpeciesInfo[summary->species].growthRate][summary->level];
 
         // Calculate the number of 1-pixel "ticks" to illuminate in the experience progress bar.
         // There are 8 tiles that make up the bar, and each tile has 8 "ticks". Hence, the numerator
@@ -3412,7 +3413,7 @@ static void PrintExpPointsNextLevel(void)
     PrintTextOnWindow(windowId, gStringVar1, x, 1, 0, 0);
 
     if (sum->level < MAX_LEVEL)
-        expToNextLevel = gExperienceTables[gBaseStats[sum->species].growthRate][sum->level + 1] - sum->exp;
+        expToNextLevel = gExperienceTables[gSpeciesInfo[sum->species].growthRate][sum->level + 1] - sum->exp;
     else
         expToNextLevel = 0;
 
@@ -3759,7 +3760,7 @@ static void CreateMoveTypeIcons(void)
 {
     u8 i;
 
-    for (i = SPRITE_ARR_ID_TYPE; i < SPRITE_ARR_ID_TYPE + 5; i++)
+    for (i = SPRITE_ARR_ID_TYPE; i < SPRITE_ARR_ID_TYPE + TYPE_ICON_SPRITE_COUNT; i++)
     {
         if (sMonSummaryScreen->spriteIds[i] == SPRITE_NONE)
             sMonSummaryScreen->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2);
@@ -3788,10 +3789,10 @@ static void SetMonTypeIcons(void)
     }
     else
     {
-        SetTypeSpritePosAndPal(gBaseStats[summary->species].type1, 120, 48, SPRITE_ARR_ID_TYPE);
-        if (gBaseStats[summary->species].type1 != gBaseStats[summary->species].type2)
+        SetTypeSpritePosAndPal(gSpeciesInfo[summary->species].type1, 120, 48, SPRITE_ARR_ID_TYPE);
+        if (gSpeciesInfo[summary->species].type1 != gSpeciesInfo[summary->species].type2)
         {
-            SetTypeSpritePosAndPal(gBaseStats[summary->species].type2, 160, 48, SPRITE_ARR_ID_TYPE + 1);
+            SetTypeSpritePosAndPal(gSpeciesInfo[summary->species].type2, 160, 48, SPRITE_ARR_ID_TYPE + 1);
             SetSpriteInvisibility(SPRITE_ARR_ID_TYPE + 1, FALSE);
         }
         else
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 5d75f3fc8..d6edd078b 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -59,23 +59,23 @@ struct PlayerRecordRS
     struct RecordMixingDaycareMail daycareMail;
     struct RSBattleTowerRecord battleTowerRecord;
     u16 giftItem;
-    u16 padding[50];
+    u16 filler[50];
 };
 
 struct PlayerRecordEmerald
 {
     /* 0x0000 */ struct SecretBase secretBases[SECRET_BASES_COUNT];
-    /* 0x0c80 */ TVShow tvShows[TV_SHOWS_COUNT];
+    /* 0x0C80 */ TVShow tvShows[TV_SHOWS_COUNT];
     /* 0x1004 */ PokeNews pokeNews[POKE_NEWS_COUNT];
     /* 0x1044 */ OldMan oldMan;
     /* 0x1084 */ struct DewfordTrend dewfordTrends[SAVED_TRENDS_COUNT];
-    /* 0x10ac */ struct RecordMixingDaycareMail daycareMail;
+    /* 0x10AC */ struct RecordMixingDaycareMail daycareMail;
     /* 0x1124 */ struct EmeraldBattleTowerRecord battleTowerRecord;
     /* 0x1210 */ u16 giftItem;
     /* 0x1214 */ LilycoveLady lilycoveLady;
     /* 0x1254 */ struct Apprentice apprentices[2];
-    /* 0x12dc */ struct PlayerHallRecords hallRecords;
-    /* 0x1434 */ u8 padding[16];
+    /* 0x12DC */ struct PlayerHallRecords hallRecords;
+    /* 0x1434 */ u8 filler_1434[16];
 }; // 0x1444
 
 union PlayerRecord
diff --git a/src/rom_header_gf.c b/src/rom_header_gf.c
index 472efe994..465c0cf41 100644
--- a/src/rom_header_gf.c
+++ b/src/rom_header_gf.c
@@ -69,7 +69,7 @@ struct GFRomHeader
     u32 externalEventFlagsOffset;
     u32 externalEventDataOffset;
     u32 unk18;
-    const struct BaseStats * baseStats;
+    const struct SpeciesInfo * speciesInfo;
     const u8 (* abilityNames)[];
     const u8 * const * abilityDescriptions;
     const struct Item * items;
@@ -150,7 +150,7 @@ static const struct GFRomHeader sGFRomHeader = {
     .externalEventFlagsOffset = offsetof(struct SaveBlock1, externalEventFlags),
     .externalEventDataOffset = offsetof(struct SaveBlock1, externalEventData),
     .unk18 = 0x00000000,
-    .baseStats = gBaseStats,
+    .speciesInfo = gSpeciesInfo,
     .abilityNames = gAbilityNames,
     .abilityDescriptions = gAbilityDescriptionPointers,
     .items = gItems,
diff --git a/src/secret_base.c b/src/secret_base.c
index ea1999343..1a4a0ac9c 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -214,7 +214,7 @@ static const struct ListMenuTemplate sRegistryListMenuTemplate =
     .itemVerticalPadding = 0,
     .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
     .fontId = FONT_NORMAL,
-    .cursorKind = 0,
+    .cursorKind = CURSOR_BLACK_ARROW,
 };
 
 static void ClearSecretBase(struct SecretBase *secretBase)
@@ -953,7 +953,7 @@ static void BuildRegistryMenuItems(u8 taskId)
     }
 
     sRegistryMenu->items[count].name = gText_Cancel;
-    sRegistryMenu->items[count].id = -2;
+    sRegistryMenu->items[count].id = LIST_CANCEL;
     tNumBases = count + 1;
     if (tNumBases < 8)
         tMaxShownItems = tNumBases;
diff --git a/src/shop.c b/src/shop.c
index b34bded84..ef0f07b38 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -216,7 +216,7 @@ static const struct ListMenuTemplate sShopBuyMenuListTemplate =
     .itemVerticalPadding = 0,
     .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
     .fontId = FONT_NARROW,
-    .cursorKind = 0
+    .cursorKind = CURSOR_BLACK_ARROW
 };
 
 static const struct BgTemplate sShopBuyMenuBgTemplates[] =
@@ -808,9 +808,9 @@ static void BuyMenuDrawMapBg(void)
                 metatileLayerType = METATILE_LAYER_TYPE_COVERED;
 
             if (metatile < NUM_METATILES_IN_PRIMARY)
-                BuyMenuDrawMapMetatile(i, j, mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType);
+                BuyMenuDrawMapMetatile(i, j, mapLayout->primaryTileset->metatiles + metatile * NUM_TILES_PER_METATILE, metatileLayerType);
             else
-                BuyMenuDrawMapMetatile(i, j, mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
+                BuyMenuDrawMapMetatile(i, j, mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * NUM_TILES_PER_METATILE), metatileLayerType);
         }
     }
 }
diff --git a/src/start_menu.c b/src/start_menu.c
index 7489f09d6..2590ee828 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -996,7 +996,7 @@ static u8 SaveConfirmInputCallback(void)
             sSaveDialogCallback = SaveFileExistsCallback;
             return SAVE_IN_PROGRESS;
         }
-    case -1: // B Button
+    case MENU_B_PRESSED:
     case 1: // No
         HideSaveInfoWindow();
         HideSaveMessageWindow();
@@ -1042,7 +1042,7 @@ static u8 SaveOverwriteInputCallback(void)
     case 0: // Yes
         sSaveDialogCallback = SaveSavingMessageCallback;
         return SAVE_IN_PROGRESS;
-    case -1: // B Button
+    case MENU_B_PRESSED:
     case 1: // No
         HideSaveInfoWindow();
         HideSaveMessageWindow();
@@ -1161,7 +1161,7 @@ static u8 BattlePyramidRetireInputCallback(void)
     {
     case 0: // Yes
         return SAVE_CANCELED;
-    case -1: // B Button
+    case MENU_B_PRESSED:
     case 1: // No
         HideSaveMessageWindow();
         return SAVE_SUCCESS;
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index 6a7589e36..fd3982ea1 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -484,14 +484,14 @@ const u16 *const gTilesetAnims_BikeShop_BlinkingLights[] = {
     gTilesetAnims_BikeShop_BlinkingLights_Frame1
 };
 
-const u16 gTilesetAnims_Sootopolis_StormyWater_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/0.4bpp");
-const u16 gTilesetAnims_Sootopolis_StormyWater_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/1.4bpp");
-const u16 gTilesetAnims_Sootopolis_StormyWater_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/2.4bpp");
-const u16 gTilesetAnims_Sootopolis_StormyWater_Frame3[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/3.4bpp");
-const u16 gTilesetAnims_Sootopolis_StormyWater_Frame4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/4.4bpp");
-const u16 gTilesetAnims_Sootopolis_StormyWater_Frame5[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/5.4bpp");
-const u16 gTilesetAnims_Sootopolis_StormyWater_Frame6[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/6.4bpp");
-const u16 gTilesetAnims_Sootopolis_StormyWater_Frame7[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/7.4bpp");
+const u16 gTilesetAnims_Sootopolis_StormyWater_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/0_kyogre.4bpp", "data/tilesets/secondary/sootopolis/anim/stormy_water/0_groudon.4bpp");
+const u16 gTilesetAnims_Sootopolis_StormyWater_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/1_kyogre.4bpp", "data/tilesets/secondary/sootopolis/anim/stormy_water/1_groudon.4bpp");
+const u16 gTilesetAnims_Sootopolis_StormyWater_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/2_kyogre.4bpp", "data/tilesets/secondary/sootopolis/anim/stormy_water/2_groudon.4bpp");
+const u16 gTilesetAnims_Sootopolis_StormyWater_Frame3[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/3_kyogre.4bpp", "data/tilesets/secondary/sootopolis/anim/stormy_water/3_groudon.4bpp");
+const u16 gTilesetAnims_Sootopolis_StormyWater_Frame4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/4_kyogre.4bpp", "data/tilesets/secondary/sootopolis/anim/stormy_water/4_groudon.4bpp");
+const u16 gTilesetAnims_Sootopolis_StormyWater_Frame5[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/5_kyogre.4bpp", "data/tilesets/secondary/sootopolis/anim/stormy_water/5_groudon.4bpp");
+const u16 gTilesetAnims_Sootopolis_StormyWater_Frame6[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/6_kyogre.4bpp", "data/tilesets/secondary/sootopolis/anim/stormy_water/6_groudon.4bpp");
+const u16 gTilesetAnims_Sootopolis_StormyWater_Frame7[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/7_kyogre.4bpp", "data/tilesets/secondary/sootopolis/anim/stormy_water/7_groudon.4bpp");
 const u16 tileset_anims_space_8[16] = {};
 
 const u16 gTilesetAnims_Unused1_Frame0[] = INCBIN_U16("data/tilesets/secondary/unused_1/0.4bpp");
diff --git a/src/trade.c b/src/trade.c
index 9c8fb2e8e..61ebaf4cc 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -2465,8 +2465,8 @@ int GetUnionRoomTradeMessageId(struct RfuGameCompatibilityData player, struct Rf
     else
     {
         // Player's Pokémon must be of the type the partner requested
-        if (gBaseStats[playerSpecies2].type1 != requestedType
-         && gBaseStats[playerSpecies2].type2 != requestedType)
+        if (gSpeciesInfo[playerSpecies2].type1 != requestedType
+         && gSpeciesInfo[playerSpecies2].type2 != requestedType)
             return UR_TRADE_MSG_NOT_MON_PARTNER_WANTS;
     }
 
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index ad4a84947..0e989a259 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -924,7 +924,7 @@ u8 GetTrainerEncounterMusicIdInTrainerHill(u16 trainerId)
 static void SetTrainerHillMonLevel(struct Pokemon *mon, u8 level)
 {
     u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
-    u32 exp = gExperienceTables[gBaseStats[species].growthRate][level];
+    u32 exp = gExperienceTables[gSpeciesInfo[species].growthRate][level];
 
     SetMonData(mon, MON_DATA_EXP, &exp);
     SetMonData(mon, MON_DATA_LEVEL, &level);
diff --git a/src/union_room.c b/src/union_room.c
index 229ea3164..aad8dbaa9 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -271,7 +271,7 @@ static void GetURoomActivityRejectMsg(u8 *, s32, u32);
 static u32 ConvPartnerUnameAndGetWhetherMetAlready(struct RfuPlayer *);
 static void GetURoomActivityStartMsg(u8 *, u8);
 static void UR_ClearBg0(void);
-static s32 IsRequestedTypeOrEggInPlayerParty(u32, u32);
+static s32 IsRequestedTradeInPlayerParty(u32, u32);
 static bool32 UR_PrintFieldMessage(const u8 *);
 static s32 GetChatLeaderActionRequestMessage(u8 *, u32, u16 *, struct WirelessLink_URoom *);
 static void Task_InitUnionRoom(u8 taskId);
@@ -319,9 +319,9 @@ static void PrintPlayerNameAndIdOnWindow(u8 windowId)
     PrintUnionRoomText(windowId, FONT_NORMAL, text, 0, 17, UR_COLOR_DEFAULT);
 }
 
-static void GetAwaitingCommunicationText(u8 *dst, u8 caseId)
+static void GetAwaitingCommunicationText(u8 *dst, u8 activity)
 {
-    switch (caseId)
+    switch (activity)
     {
     case ACTIVITY_BATTLE_SINGLE:
     case ACTIVITY_BATTLE_DOUBLE:
@@ -343,18 +343,18 @@ static void GetAwaitingCommunicationText(u8 *dst, u8 caseId)
     case ACTIVITY_CONTEST_TOUGH:
         // BUG: argument *dst isn't used, instead it always prints to gStringVar4
         // not an issue in practice since Gamefreak never used any other arguments here besides gStringVar4
-        #ifndef BUGFIX
+    #ifndef BUGFIX
         StringExpandPlaceholders(gStringVar4, sText_AwaitingCommunication);
-        #else
+    #else
         StringExpandPlaceholders(dst, sText_AwaitingCommunication);
-        #endif
+    #endif
         break;
     }
 }
 
-static bool32 IsActivityWithVariableGroupSize(u32 caseId)
+static bool32 IsActivityWithVariableGroupSize(u32 activity)
 {
-    switch (caseId)
+    switch (activity)
     {
     case ACTIVITY_POKEMON_JUMP:
     case ACTIVITY_BERRY_CRUSH:
@@ -507,11 +507,11 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
         // BUG: sPlayerActivityGroupSize was meant below, not gPlayerCurrActivity
         //      This will be false for all but ACTIVITY_BATTLE_DOUBLE and ACTIVITY_DECLINE
         //      All this changes is which of two texts gets printed
-        #ifdef BUGFIX
+    #ifdef BUGFIX
         id = (GROUP_MAX(sPlayerActivityGroupSize) == 2) ? 0 : 1;
-        #else
+    #else
         id = (GROUP_MAX(gPlayerCurrActivity) == 2) ? 1 : 0;
-        #endif
+    #endif
         if (PrintOnTextbox(&data->textState, sPlayerUnavailableTexts[id]))
         {
             data->playerCount = LeaderPrunePlayerList(data->playerList);
@@ -559,6 +559,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
         {
             if (data->joinRequestAnswer == RFU_STATUS_JOIN_GROUP_OK)
             {
+                // Sent "OK"
                 data->playerList->players[data->playerCount].newPlayerCountdown = 0;
                 RedrawListMenu(data->listTaskId);
                 data->playerCount++;
@@ -596,6 +597,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
         }
         else if (val == 2)
         {
+            // Disconnect
             RfuSetStatus(RFU_STATUS_OK, 0);
             data->state = LL_STATE_GET_AWAITING_PLAYERS_TEXT;
         }
@@ -734,9 +736,9 @@ static void Leader_DestroyResources(struct WirelessLink_Leader *data)
     Free(data->incomingPlayerList);
 }
 
-static void Leader_GetAcceptNewMemberPrompt(u8 *dst, u8 caseId)
+static void Leader_GetAcceptNewMemberPrompt(u8 *dst, u8 activity)
 {
-    switch (caseId)
+    switch (activity)
     {
     case ACTIVITY_BATTLE_SINGLE:
     case ACTIVITY_BATTLE_DOUBLE:
@@ -765,9 +767,9 @@ static void Leader_GetAcceptNewMemberPrompt(u8 *dst, u8 caseId)
     }
 }
 
-static void GetYouDeclinedTheOfferMessage(u8 *dst, u8 caseId)
+static void GetYouDeclinedTheOfferMessage(u8 *dst, u8 activity)
 {
-    switch (caseId)
+    switch (activity)
     {
     case ACTIVITY_BATTLE_SINGLE | IN_UNION_ROOM:
     case ACTIVITY_TRADE | IN_UNION_ROOM:
@@ -780,9 +782,9 @@ static void GetYouDeclinedTheOfferMessage(u8 *dst, u8 caseId)
     }
 }
 
-static void GetYouAskedToJoinGroupPleaseWaitMessage(u8 *dst, u8 caseId)
+static void GetYouAskedToJoinGroupPleaseWaitMessage(u8 *dst, u8 activity)
 {
-    switch (caseId)
+    switch (activity)
     {
     case ACTIVITY_BATTLE_SINGLE:
     case ACTIVITY_BATTLE_DOUBLE:
@@ -809,9 +811,9 @@ static void GetYouAskedToJoinGroupPleaseWaitMessage(u8 *dst, u8 caseId)
     }
 }
 
-static void GetGroupLeaderSentAnOKMessage(u8 *dst, u8 caseId)
+static void GetGroupLeaderSentAnOKMessage(u8 *dst, u8 activity)
 {
-    switch (caseId)
+    switch (activity)
     {
     case ACTIVITY_BATTLE_SINGLE:
     case ACTIVITY_BATTLE_DOUBLE:
@@ -1039,7 +1041,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
             break;
         case 0:
             id = ListMenu_ProcessInput(data->listTaskId);
-            if (JOY_NEW(A_BUTTON) && id != MENU_B_PRESSED)
+            if (JOY_NEW(A_BUTTON) && id != LIST_NOTHING_CHOSEN)
             {
                 // this unused variable along with the assignment is needed to match
                 u32 activity = data->playerList->players[id].rfu.data.activity;
@@ -1469,9 +1471,7 @@ static void Task_CreateTradeMenu(u8 taskId)
 
 u8 CreateTask_CreateTradeMenu(void)
 {
-    u8 taskId = CreateTask(Task_CreateTradeMenu, 0);
-
-    return taskId;
+    return CreateTask(Task_CreateTradeMenu, 0);
 }
 
 static void Task_StartUnionRoomTrade(u8 taskId)
@@ -2147,11 +2147,10 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
             break;
         case 0:
             id = ListMenu_ProcessInput(data->listTaskId);
-            if (JOY_NEW(A_BUTTON) && id != -1)
+            if (JOY_NEW(A_BUTTON) && id != LIST_NOTHING_CHOSEN)
             {
                 // this unused variable along with the assignment is needed to match
-                u32 unusedVar;
-                unusedVar  = data->playerList->players[id].rfu.data.activity;
+                u32 activity = data->playerList->players[id].rfu.data.activity;
 
                 if (data->playerList->players[id].groupScheduledAnim == UNION_ROOM_SPAWN_IN && !data->playerList->players[id].rfu.data.startedActivity)
                 {
@@ -2504,7 +2503,7 @@ static void Task_RunUnionRoom(u8 taskId)
         break;
     case UR_STATE_INIT_OBJECTS:
         CreateUnionRoomPlayerSprites(uroom->spriteIds, taskData[0]);
-        if (++taskData[0] == 8)
+        if (++taskData[0] == MAX_UNION_ROOM_LEADERS)
             uroom->state = UR_STATE_INIT_LINK;
         break;
     case UR_STATE_INIT_LINK:
@@ -2711,7 +2710,7 @@ static void Task_RunUnionRoom(u8 taskId)
                                                   &uroom->topListMenuId,
                                                   &sWindowTemplate_InviteToActivity,
                                                   &sListMenuTemplate_InviteToActivity);
-        if (input != -1)
+        if (input != LIST_NOTHING_CHOSEN)
         {
             if (!gReceivedRemoteLinkPlayers)
             {
@@ -2721,7 +2720,7 @@ static void Task_RunUnionRoom(u8 taskId)
             {
                 uroom->partnerYesNoResponse = 0;
                 playerGender = GetUnionRoomPlayerGender(taskData[1], uroom->playerList);
-                if (input == -2 || input == IN_UNION_ROOM)
+                if (input == LIST_CANCEL || input == IN_UNION_ROOM)
                 {
                     uroom->playerSendBuffer[0] = IN_UNION_ROOM;
                     Rfu_SendPacket(uroom->playerSendBuffer);
@@ -3068,9 +3067,9 @@ static void Task_RunUnionRoom(u8 taskId)
                                                   &uroom->tradeBoardHeaderWindowId,
                                                   &sWindowTemplate_RegisterForTrade,
                                                   &sListMenuTemplate_RegisterForTrade);
-        if (input != -1)
+        if (input != LIST_NOTHING_CHOSEN)
         {
-            if (input == -2 || input == 3)
+            if (input == LIST_CANCEL || input == 3) // Exit
             {
                 uroom->state = UR_STATE_MAIN;
                 HandleCancelActivity(TRUE);
@@ -3090,7 +3089,7 @@ static void Task_RunUnionRoom(u8 taskId)
         }
         break;
     case UR_STATE_REGISTER_SELECT_MON_FADE:
-        BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
+        BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
         uroom->state = UR_STATE_REGISTER_SELECT_MON;
         break;
     case UR_STATE_REGISTER_SELECT_MON:
@@ -3107,11 +3106,11 @@ static void Task_RunUnionRoom(u8 taskId)
                                                   &uroom->tradeBoardHeaderWindowId,
                                                   &sWindowTemplate_TradingBoardRequestType,
                                                   &sMenuTemplate_TradingBoardRequestType);
-        if (input != -1)
+        if (input != LIST_NOTHING_CHOSEN)
         {
             switch (input)
             {
-            case -2:
+            case LIST_CANCEL:
             case NUMBER_OF_MON_TYPES: // Exit
                 ResetUnionRoomTrade(&sUnionRoomTrade);
                 SetTradeBoardRegisteredMonInfo(TYPE_NORMAL, SPECIES_NONE, 0);
@@ -3166,18 +3165,18 @@ static void Task_RunUnionRoom(u8 taskId)
                                       &sWindowTemplate_TradingBoardMain,
                                       &sTradeBoardListMenuTemplate,
                                       uroom->playerList);
-        if (input != -1)
+        if (input != LIST_NOTHING_CHOSEN)
         {
             switch (input)
             {
-            case -2:
+            case LIST_CANCEL:
             case 8: // EXIT
                 HandleCancelActivity(TRUE);
                 uroom->state = UR_STATE_MAIN;
                 break;
             default:
                 UR_ClearBg0();
-                switch (IsRequestedTypeOrEggInPlayerParty(uroom->playerList->players[input].rfu.data.tradeType, uroom->playerList->players[input].rfu.data.tradeSpecies))
+                switch (IsRequestedTradeInPlayerParty(uroom->playerList->players[input].rfu.data.tradeType, uroom->playerList->players[input].rfu.data.tradeSpecies))
                 {
                 case UR_TRADE_MATCH:
                     CopyAndTranslatePlayerName(gStringVar1, &uroom->playerList->players[input]);
@@ -3707,12 +3706,12 @@ static s32 ListMenuHandler_AllItemsAvailable(u8 *state, u8 *windowId, u8 *listMe
             ClearStdWindowAndFrame(*windowId, TRUE);
             RemoveWindow(*windowId);
             *state = 0;
-            return -2;
+            return LIST_CANCEL;
         }
         break;
     }
 
-    return -1;
+    return LIST_NOTHING_CHOSEN;
 }
 
 static s32 TradeBoardMenuHandler(u8 *state, u8 *mainWindowId, u8 *listMenuId, u8 *headerWindowId,
@@ -3742,13 +3741,14 @@ static s32 TradeBoardMenuHandler(u8 *state, u8 *mainWindowId, u8 *listMenuId, u8
         input = ListMenu_ProcessInput(*listMenuId);
         if (JOY_NEW(A_BUTTON | B_BUTTON))
         {
+            // Exit or B button
             if (input == 8 || JOY_NEW(B_BUTTON))
             {
                 DestroyListMenuTask(*listMenuId, NULL, NULL);
                 RemoveWindow(*mainWindowId);
                 DeleteTradeBoardWindow(*headerWindowId);
                 *state = 0;
-                return -2;
+                return LIST_CANCEL;
             }
             else
             {
@@ -3770,7 +3770,7 @@ static s32 TradeBoardMenuHandler(u8 *state, u8 *mainWindowId, u8 *listMenuId, u8
         break;
     }
 
-    return -1;
+    return LIST_NOTHING_CHOSEN;
 }
 
 static void UR_ClearBg0(void)
@@ -4090,7 +4090,7 @@ static s32 UnionRoomGetPlayerInteractionResponse(struct RfuPlayerList *list, boo
     }
 }
 
-void ItemPrintFunc_EmptyList(u8 windowId, u32 itemId, u8 y)
+static void ItemPrintFunc_EmptyList(u8 windowId, u32 itemId, u8 y)
 {
 }
 
@@ -4120,7 +4120,7 @@ static void TradeBoardListMenuItemPrintFunc(u8 windowId, u32 itemId, u8 y)
     struct WirelessLink_Leader *leader = sWirelessLinkMain.leader;
     struct RfuGameData *gameData;
     s32 i, j;
-    u8 playerName[11];
+    u8 playerName[RFU_USER_NAME_LENGTH + 1];
 
     if (itemId == LIST_HEADER && y == sTradeBoardListMenuTemplate.upText_Y)
     {
@@ -4168,7 +4168,7 @@ static s32 GetUnionRoomPlayerGender(s32 playerIdx, struct RfuPlayerList *list)
     return list->players[playerIdx].rfu.data.playerGender;
 }
 
-static s32 IsRequestedTypeOrEggInPlayerParty(u32 type, u32 species)
+static s32 IsRequestedTradeInPlayerParty(u32 type, u32 species)
 {
     s32 i;
 
@@ -4187,7 +4187,7 @@ static s32 IsRequestedTypeOrEggInPlayerParty(u32 type, u32 species)
         for (i = 0; i < gPlayerPartyCount; i++)
         {
             species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
-            if (gBaseStats[species].type1 == type || gBaseStats[species].type2 == type)
+            if (gSpeciesInfo[species].type1 == type || gSpeciesInfo[species].type2 == type)
                 return UR_TRADE_MATCH;
         }
         return UR_TRADE_NOTYPE;
diff --git a/src/union_room_chat.c b/src/union_room_chat.c
index e1ca7c0b0..eb902fbe6 100755
--- a/src/union_room_chat.c
+++ b/src/union_room_chat.c
@@ -1171,7 +1171,7 @@ static void Chat_AskQuitChatting(void)
         input = ProcessMenuInput();
         switch (input)
         {
-        case -1:
+        case MENU_B_PRESSED:
         case 1:
             StartDisplaySubtask(CHATDISPLAY_FUNC_DESTROY_YESNO, 0);
             sChat->funcState = 3;
@@ -1210,7 +1210,7 @@ static void Chat_AskQuitChatting(void)
         input = ProcessMenuInput();
         switch (input)
         {
-        case -1:
+        case MENU_B_PRESSED:
         case 1:
             StartDisplaySubtask(CHATDISPLAY_FUNC_DESTROY_YESNO, 0);
             sChat->funcState = 3;
@@ -1512,7 +1512,7 @@ static void Chat_SaveAndExit(void)
         input = ProcessMenuInput();
         switch (input)
         {
-        case -1:
+        case MENU_B_PRESSED:
         case 1:
             sChat->funcState = 12;
             break;
@@ -1537,7 +1537,7 @@ static void Chat_SaveAndExit(void)
         input = ProcessMenuInput();
         switch (input)
         {
-        case -1:
+        case MENU_B_PRESSED:
         case 1:
             sChat->funcState = 12;
             break;
diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c
index 86a0f1a44..a7d5045b3 100644
--- a/src/union_room_player_avatar.c
+++ b/src/union_room_player_avatar.c
@@ -340,15 +340,10 @@ static void AnimateUnionRoomPlayer(u32 leaderId, struct UnionRoomObject * object
         }
         break;
     case 1:
-        if (object->schedAnim == UNION_ROOM_SPAWN_OUT)
-        {
-            object->state = 3;
-            object->animState = 0;
-        }
-        else
-        {
+        if (object->schedAnim != UNION_ROOM_SPAWN_OUT)
             break;
-        }
+        object->state = 3;
+        object->animState = 0;
         // fallthrough
     case 3:
         if (AnimateUnionRoomPlayerDespawn(&object->animState, leaderId, object) == 1)
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index eb42cd7bd..6ba13a007 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -379,7 +379,7 @@ static void CreateWildMon(u16 species, u8 level)
     ZeroEnemyPartyMons();
     checkCuteCharm = TRUE;
 
-    switch (gBaseStats[species].genderRatio)
+    switch (gSpeciesInfo[species].genderRatio)
     {
     case MON_MALE:
     case MON_FEMALE:
@@ -913,7 +913,7 @@ static bool8 TryGetRandomWildMonIndexByType(const struct WildPokemon *wildMon, u
 
     for (validMonCount = 0, i = 0; i < numMon; i++)
     {
-        if (gBaseStats[wildMon[i].species].type1 == type || gBaseStats[wildMon[i].species].type2 == type)
+        if (gSpeciesInfo[wildMon[i].species].type1 == type || gSpeciesInfo[wildMon[i].species].type2 == type)
             validIndexes[validMonCount++] = i;
     }
 
diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c
index 1fbd83fcd..fad41db7d 100644
--- a/src/wireless_communication_status_screen.c
+++ b/src/wireless_communication_status_screen.c
@@ -18,6 +18,7 @@
 #include "union_room.h"
 #include "constants/songs.h"
 #include "constants/union_room.h"
+#include "constants/rgb.h"
 
 enum {
     COLORMODE_NORMAL,
@@ -51,9 +52,26 @@ static void Task_WirelessCommunicationScreen(u8);
 static void WCSS_AddTextPrinterParameterized(u8, u8, const u8 *, u8, u8, u8);
 static bool32 UpdateCommunicationCounts(u32 *, u32 *, u32 *, u8);
 
-static const u16 sBgTiles_Pal[] = INCBIN_U16("graphics/link/wireless_info_screen.gbapal");
-static const u32 sBgTiles_Gfx[] = INCBIN_U32("graphics/link/wireless_info_screen.4bpp.lz");
-static const u32 sBgTiles_Tilemap[] = INCBIN_U32("graphics/link/wireless_info_screen.bin.lz");
+static const u16 sPalettes[][16] = {
+    INCBIN_U16("graphics/wireless_status_screen/default.gbapal"),
+    {}, // All black. Never read
+    INCBIN_U16("graphics/wireless_status_screen/anim_00.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_01.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_02.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_03.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_04.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_05.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_06.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_07.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_08.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_09.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_10.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_11.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_12.gbapal"),
+    INCBIN_U16("graphics/wireless_status_screen/anim_13.gbapal")
+};
+static const u32 sBgTiles_Gfx[] = INCBIN_U32("graphics/wireless_status_screen/bg.4bpp.lz");
+static const u32 sBgTiles_Tilemap[] = INCBIN_U32("graphics/wireless_status_screen/bg.bin.lz");
 
 static const struct BgTemplate sBgTemplates[] = {
     {
@@ -193,7 +211,7 @@ static void CB2_InitWirelessCommunicationScreen(void)
     ChangeBgY(0, 0, BG_COORD_SET);
     ChangeBgX(1, 0, BG_COORD_SET);
     ChangeBgY(1, 0, BG_COORD_SET);
-    LoadPalette(sBgTiles_Pal, 0x00, 0x20);
+    LoadPalette(sPalettes, 0x00, 0x20);
     Menu_LoadStdPalAt(0xF0);
     DynamicPlaceholderTextUtil_Reset();
     FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0x0F);
@@ -218,16 +236,19 @@ static void CB2_ExitWirelessCommunicationStatusScreen(void)
     SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
 }
 
-static void WCSS_CyclePalette(s16 * counter, s16 * palIdx)
+// Cycle through palettes that relocate various shades of blue to create the wave effect at the bottom of the screen.
+static void CyclePalette(s16 * counter, s16 * palIdx)
 {
+    s32 idx;
     if (++(*counter) > 5)
     {
-        if (++(*palIdx) == 14)
+        if (++(*palIdx) == (int)ARRAY_COUNT(sPalettes) - 2)
             *palIdx = 0;
 
         *counter = 0;
     }
-    LoadPalette(sBgTiles_Pal + 16 * (*palIdx + 2), 0, 0x10);
+    idx = *palIdx + 2; // +2 skips over default.pal and the empty black palette after it
+    LoadPalette(sPalettes[idx], 0, 16);
 }
 
 static void PrintHeaderTexts(void)
@@ -236,12 +257,17 @@ static void PrintHeaderTexts(void)
     FillWindowPixelBuffer(0, PIXEL_FILL(0));
     FillWindowPixelBuffer(1, PIXEL_FILL(0));
     FillWindowPixelBuffer(2, PIXEL_FILL(0));
+
+    // Print title
     WCSS_AddTextPrinterParameterized(0, FONT_NORMAL, sHeaderTexts[0], GetStringCenterAlignXOffset(FONT_NORMAL, sHeaderTexts[0], 0xC0), 6, COLORMODE_GREEN);
-    for (i = 0; i < (int)ARRAY_COUNT(*sHeaderTexts) - 1; i++)
-    {
+
+    // Print label for each group (excluding total)
+    for (i = 0; i < NUM_GROUPTYPES - 1; i++)
         WCSS_AddTextPrinterParameterized(1, FONT_NORMAL, sHeaderTexts[i + 1], 0, 30 * i + 8, COLORMODE_WHITE_LGRAY);
-    }
+
+    // Print label for total
     WCSS_AddTextPrinterParameterized(1, FONT_NORMAL, sHeaderTexts[i + 1], 0, 30 * i + 8, COLORMODE_RED);
+
     PutWindowTilemap(0);
     CopyWindowToVram(0, COPYWIN_GFX);
     PutWindowTilemap(1);
@@ -260,7 +286,7 @@ static void Task_WirelessCommunicationScreen(u8 taskId)
         gTasks[taskId].tState++;
         break;
     case 1:
-        BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0);
+        BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
         ShowBg(1);
         CopyBgTilemapBufferToVram(0);
         ShowBg(0);
@@ -268,9 +294,7 @@ static void Task_WirelessCommunicationScreen(u8 taskId)
         break;
     case 2:
         if (!gPaletteFade.active)
-        {
             gTasks[taskId].tState++;
-        }
         break;
     case 3:
         if (UpdateCommunicationCounts(sStatusScreen->groupCounts, sStatusScreen->prevGroupCounts, sStatusScreen->activities, sStatusScreen->rfuTaskId))
@@ -293,10 +317,10 @@ static void Task_WirelessCommunicationScreen(u8 taskId)
             gTasks[sStatusScreen->rfuTaskId].data[15] = 0xFF;
             gTasks[taskId].tState++;
         }
-        WCSS_CyclePalette(&gTasks[taskId].data[7], &gTasks[taskId].data[8]);
+        CyclePalette(&gTasks[taskId].data[7], &gTasks[taskId].data[8]);
         break;
     case 4:
-        BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0);
+        BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
         gTasks[taskId].tState++;
         break;
     case 5: