3041 files changed, 6910 insertions, 6412 deletions

diff --git a/.travis/calcrom/calcrom.pl b/.travis/calcrom/calcrom.pl
index 9eff1c064..9c4867929 100755
--- a/.travis/calcrom/calcrom.pl
+++ b/.travis/calcrom/calcrom.pl
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+use IPC::Cmd qw[ run ];
+
 (@ARGV == 1)
     or die "ERROR: no map file specified.\n";
 open(my $file, $ARGV[0])
@@ -7,7 +9,6 @@ open(my $file, $ARGV[0])
 
 my $src = 0;
 my $asm = 0;
-my $undocumented = 0;
 while (my $line = <$file>)
 {
     if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/)
@@ -28,19 +29,92 @@ while (my $line = <$file>)
             }
         }
     }
-    if($line =~ /^\s+0x([0-9A-f]+)\s+[A-z_]+([0-9A-f]+)/) {
-        my $thing1 = sprintf("%08X", hex($1));
-        my $thing2 = sprintf("%08X", hex($2));
-        if($thing1 eq $thing2) {
-            $undocumented += 1;
-        }
-    }
 }
 
+# Note that the grep filters out all branch labels. It also requires a minimum
+# line length of 5, to filter out a ton of generated symbols (like AcCn). No
+# settings to nm seem to remove these symbols. Finally, nm prints out a separate
+# entry for whenever a name appears in a file, not just where it's defined. uniq
+# removes all the duplicate entries.
+#
+#
+# You'd expect this to take a while, because of uniq. It runs in under a second,
+# though. Uniq is pretty fast!
+my $base_cmd = "nm pokeemerald.elf | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
+
+# This looks for Unknown_, Unknown_, or sub_, followed by just numbers. Note that
+# it matches even if stuff precedes the unknown, like sUnknown/gUnknown.
+my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]*\\|sub_[0-9a-fA-F]*'";
+
+# 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-9a-fA-F]\\{6,7\\}'";
+
+my $count_cmd = "wc -l";
+
+# It sucks that we have to run this three times, but I can't figure out how to get
+# stdin working for subcommands in perl while still having a timeout. It's decently
+# fast anyway.
+my $total_syms_as_string;
+(run (
+    command => "$base_cmd | $count_cmd",
+    buffer => \$total_syms_as_string,
+    timeout => 60
+))
+    or die "ERROR: Error while getting all symbols: $?";
+
+my $undocumented_as_string;
+(run (
+    command => "$base_cmd | $undoc_cmd | $count_cmd",
+    buffer => \$undocumented_as_string,
+    timeout => 60
+))
+    or die "ERROR: Error while filtering for undocumented symbols: $?";
+
+my $partial_documented_as_string;
+(run (
+    command => "$base_cmd | $partial_doc_cmd | $count_cmd",
+    buffer => \$partial_documented_as_string,
+    timeout => 60
+))
+    or die "ERROR: Error while filtering for partial symbols: $?";
+
+# Performing addition on a string converts it to a number. Any string that fails
+# to convert to a number becomes 0. So if our converted number is 0, but our string
+# is nonzero, then the conversion was an error.
+my $undocumented = $undocumented_as_string + 0;
+(($undocumented != 0) and ($undocumented_as_string ne "0"))
+    or die "ERROR: Cannot convert string to num: '$undocumented_as_string'";
+
+my $partial_documented = $partial_documented_as_string + 0;
+(($partial_documented != 0) and ($partial_documented_as_string ne "0"))
+	or die "ERROR: Cannot convert string to num: '$partial_documented_as_string'";
+
+my $total_syms = $total_syms_as_string + 0;
+(($total_syms != 0) and ($total_syms_as_string ne "0"))
+    or die "ERROR: Cannot convert string to num: '$total_syms_as_string'";
+
+($total_syms != 0)
+    or die "ERROR: No symbols found.";
+
 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);
+my $undocPct = sprintf("%.4f", 100 * $undocumented / $total_syms);
+
 print "$total total bytes of code\n";
 print "$src bytes of code in src ($srcPct%)\n";
 print "$asm bytes of code in asm ($asmPct%)\n";
-print "$undocumented global symbols undocumented\n";
+print "\n";
+print "$total_syms total symbols\n";
+print "$documented symbols documented ($docPct%)\n";
+print "$partial_documented symbols partially documented ($partialPct%)\n";
+print "$undocumented symbols undocumented ($undocPct%)\n";
diff --git a/INSTALL.md b/INSTALL.md
index 041f6b8e9..fcdd8b655 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -66,6 +66,14 @@ cd ../pokeemerald
 
 And build the ROM with `make`.
 
+If the step `./build.sh` in the above list of commands fails with the error `Makefile:1: /opt/devkitpro/devkitARM/base_tools: No such file or directory`, then try installing the pacman package `devkitarm-rules` by executing the command
+
+```
+sudo dkp-pacman -S devkitarm-rules
+```
+
+Executing `./build.sh` again should now succeed.
+
 # Faster builds
 
 After the first build, subsequent builds are faster. You can further speed up the build:
diff --git a/asm/contest_painting_effects.s b/asm/contest_painting_effects.s
deleted file mode 100644
index 801e840b9..000000000
--- a/asm/contest_painting_effects.s
+++ /dev/null
@@ -1,1152 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-
-
-
-	thumb_func_start sub_8126058
-sub_8126058: @ 8126058
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	ldrb r1, [r0, 0x1D]
-	lsrs r5, r1, 3
-	ldrb r1, [r0, 0x1E]
-	lsrs r1, 3
-	str r1, [sp, 0x8]
-	ldr r1, [r0, 0x4]
-	str r1, [sp]
-	ldr r2, [r0, 0x10]
-	str r2, [sp, 0x4]
-	ldrh r0, [r0, 0x16]
-	cmp r0, 0x2
-	bne _08126108
-	movs r1, 0
-	ldr r0, [sp, 0x8]
-	cmp r1, r0
-	bcc _08126086
-	b _08126194
-_08126086:
-	movs r0, 0
-	adds r2, r1, 0x1
-	mov r10, r2
-	cmp r0, r5
-	bcs _081260FA
-	adds r2, r1, 0
-	muls r2, r5
-	mov r9, r2
-	lsls r1, 3
-	mov r8, r1
-_0812609A:
-	movs r4, 0
-	lsls r6, r0, 4
-	adds r7, r0, 0x1
-	add r0, r9
-	lsls r0, 6
-	ldr r1, [sp, 0x4]
-	adds r1, r0
-	mov r12, r1
-_081260AA:
-	lsls r0, r4, 3
-	mov r2, r12
-	adds r3, r2, r0
-	mov r1, r8
-	adds r0, r1, r4
-	lsls r0, 3
-	muls r0, r5
-	lsls r0, 1
-	ldr r2, [sp]
-	adds r0, r2, r0
-	adds r2, r0, r6
-	ldrh r0, [r2, 0x2]
-	lsls r0, 8
-	ldrh r1, [r2]
-	orrs r0, r1
-	strh r0, [r3]
-	ldrh r0, [r2, 0x6]
-	lsls r0, 8
-	ldrh r1, [r2, 0x4]
-	orrs r0, r1
-	strh r0, [r3, 0x2]
-	ldrh r0, [r2, 0xA]
-	lsls r0, 8
-	ldrh r1, [r2, 0x8]
-	orrs r0, r1
-	strh r0, [r3, 0x4]
-	ldrh r0, [r2, 0xE]
-	lsls r0, 8
-	ldrh r1, [r2, 0xC]
-	orrs r0, r1
-	strh r0, [r3, 0x6]
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x7
-	bls _081260AA
-	lsls r0, r7, 16
-	lsrs r0, 16
-	cmp r0, r5
-	bcc _0812609A
-_081260FA:
-	mov r1, r10
-	lsls r0, r1, 16
-	lsrs r1, r0, 16
-	ldr r2, [sp, 0x8]
-	cmp r1, r2
-	bcc _08126086
-	b _08126194
-_08126108:
-	movs r1, 0
-	ldr r0, [sp, 0x8]
-	cmp r1, r0
-	bcs _08126194
-_08126110:
-	movs r0, 0
-	adds r2, r1, 0x1
-	mov r10, r2
-	cmp r0, r5
-	bcs _08126188
-	adds r2, r1, 0
-	muls r2, r5
-	mov r9, r2
-	lsls r1, 3
-	mov r8, r1
-_08126124:
-	movs r4, 0
-	lsls r6, r0, 4
-	adds r7, r0, 0x1
-	add r0, r9
-	lsls r0, 5
-	ldr r1, [sp, 0x4]
-	adds r1, r0
-	mov r12, r1
-_08126134:
-	lsls r0, r4, 2
-	mov r2, r12
-	adds r3, r2, r0
-	mov r1, r8
-	adds r0, r1, r4
-	lsls r0, 3
-	muls r0, r5
-	lsls r0, 1
-	ldr r2, [sp]
-	adds r0, r2, r0
-	adds r2, r0, r6
-	ldrh r1, [r2, 0x2]
-	lsls r1, 4
-	ldrh r0, [r2]
-	orrs r1, r0
-	ldrh r0, [r2, 0x4]
-	lsls r0, 8
-	orrs r1, r0
-	ldrh r0, [r2, 0x6]
-	lsls r0, 12
-	orrs r1, r0
-	strh r1, [r3]
-	ldrh r1, [r2, 0xA]
-	lsls r1, 4
-	ldrh r0, [r2, 0x8]
-	orrs r1, r0
-	ldrh r0, [r2, 0xC]
-	lsls r0, 8
-	orrs r1, r0
-	ldrh r0, [r2, 0xE]
-	lsls r0, 12
-	orrs r1, r0
-	strh r1, [r3, 0x2]
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x7
-	bls _08126134
-	lsls r0, r7, 16
-	lsrs r0, 16
-	cmp r0, r5
-	bcc _08126124
-_08126188:
-	mov r1, r10
-	lsls r0, r1, 16
-	lsrs r1, r0, 16
-	ldr r2, [sp, 0x8]
-	cmp r1, r2
-	bcc _08126110
-_08126194:
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8126058
-
-	thumb_func_start sub_81261A4
-sub_81261A4: @ 81261A4
-	push {lr}
-	ldr r2, =gUnknown_03006188
-	ldrb r1, [r0, 0x18]
-	lsls r1, 4
-	strh r1, [r2]
-	ldr r3, =gUnknown_03006184
-	ldrh r2, [r2]
-	lsls r2, 1
-	ldr r1, [r0, 0x8]
-	adds r1, r2
-	str r1, [r3]
-	ldr r2, =gUnknown_03006168
-	ldr r1, [r0, 0x4]
-	str r1, [r2]
-	ldr r2, =gUnknown_03006164
-	ldrb r1, [r0, 0x19]
-	strb r1, [r2]
-	ldr r2, =gUnknown_03006178
-	ldrb r1, [r0, 0x1A]
-	strb r1, [r2]
-	ldr r2, =gUnknown_03006174
-	ldrb r1, [r0, 0x1B]
-	strb r1, [r2]
-	ldr r2, =gUnknown_0300616C
-	ldrb r1, [r0, 0x1C]
-	strb r1, [r2]
-	ldr r2, =gUnknown_03006180
-	ldrb r1, [r0, 0x1D]
-	strb r1, [r2]
-	ldr r2, =gUnknown_03006170
-	ldrb r1, [r0, 0x1E]
-	strb r1, [r2]
-	ldrh r0, [r0, 0x14]
-	cmp r0, 0x5
-	bhi _0812626A
-	lsls r0, 2
-	ldr r1, =_0812621C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_0812621C:
-	.4byte _08126234
-	.4byte _0812623C
-	.4byte _08126244
-	.4byte _0812624E
-	.4byte _08126258
-	.4byte _08126262
-_08126234:
-	movs r0, 0
-	bl sub_81263A4
-	b _0812626A
-_0812623C:
-	movs r0, 0x1
-	bl sub_81263A4
-	b _0812626A
-_08126244:
-	bl sub_8126270
-	bl sub_8126714
-	b _0812626A
-_0812624E:
-	bl sub_8126370
-	bl sub_8126664
-	b _0812626A
-_08126258:
-	bl sub_8126334
-	bl sub_81265B4
-	b _0812626A
-_08126262:
-	bl sub_8126318
-	bl sub_81264FC
-_0812626A:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81261A4
-
-	thumb_func_start sub_8126270
-sub_8126270: @ 8126270
-	ldr r2, =gUnknown_03006184
-	ldr r1, [r2]
-	movs r0, 0
-	strh r0, [r1]
-	ldr r0, [r2]
-	ldr r2, =0x000018c6
-	adds r1, r2, 0
-	strh r1, [r0, 0x2]
-	ldr r2, =0x000077bd
-	adds r1, r2, 0
-	strh r1, [r0, 0x4]
-	ldr r2, =0x00002d6b
-	adds r1, r2, 0
-	strh r1, [r0, 0x6]
-	ldr r2, =0x000018dd
-	adds r1, r2, 0
-	strh r1, [r0, 0x8]
-	ldr r2, =0x00001ba6
-	adds r1, r2, 0
-	strh r1, [r0, 0xA]
-	ldr r2, =0x000074c6
-	adds r1, r2, 0
-	strh r1, [r0, 0xC]
-	ldr r2, =0x00001bbd
-	adds r1, r2, 0
-	strh r1, [r0, 0xE]
-	ldr r2, =0x000074dd
-	adds r1, r2, 0
-	strh r1, [r0, 0x10]
-	ldr r2, =0x000077a6
-	adds r1, r2, 0
-	strh r1, [r0, 0x12]
-	ldr r2, =0x0000197d
-	adds r1, r2, 0
-	strh r1, [r0, 0x14]
-	ldr r2, =0x00001bab
-	adds r1, r2, 0
-	strh r1, [r0, 0x16]
-	ldr r2, =0x00007566
-	adds r1, r2, 0
-	strh r1, [r0, 0x18]
-	ldr r2, =0x00002cdd
-	adds r1, r2, 0
-	strh r1, [r0, 0x1A]
-	ldr r2, =0x00002fa6
-	adds r1, r2, 0
-	strh r1, [r0, 0x1C]
-	ldr r2, =0x000074cb
-	adds r1, r2, 0
-	strh r1, [r0, 0x1E]
-	bx lr
-	.pool
-	thumb_func_end sub_8126270
-
-	thumb_func_start sub_8126318
-sub_8126318: @ 8126318
-	ldr r2, =gUnknown_03006184
-	ldr r0, [r2]
-	movs r1, 0
-	strh r1, [r0]
-	ldr r2, [r2]
-	strh r1, [r2, 0x2]
-	ldr r1, =0x00007fff
-	adds r0, r1, 0
-	strh r0, [r2, 0x4]
-	bx lr
-	.pool
-	thumb_func_end sub_8126318
-
-	thumb_func_start sub_8126334
-sub_8126334: @ 8126334
-	push {r4,r5,lr}
-	ldr r1, =gUnknown_03006184
-	ldr r0, [r1]
-	movs r2, 0
-	strh r2, [r0]
-	ldr r0, [r1]
-	strh r2, [r0, 0x2]
-	movs r4, 0
-	adds r5, r1, 0
-_08126346:
-	ldr r0, [r5]
-	lsls r2, r4, 1
-	adds r2, r0
-	adds r0, r4, 0x2
-	lsls r3, r0, 1
-	lsls r1, r0, 11
-	lsls r0, 6
-	orrs r1, r0
-	orrs r1, r3
-	strh r1, [r2, 0x4]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xD
-	bls _08126346
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8126334
-
-	thumb_func_start sub_8126370
-sub_8126370: @ 8126370
-	push {r4,lr}
-	ldr r2, =gUnknown_03006184
-	ldr r1, [r2]
-	movs r0, 0
-	strh r0, [r1]
-	movs r3, 0
-	adds r4, r2, 0
-_0812637E:
-	ldr r0, [r4]
-	lsls r2, r3, 1
-	adds r2, r0
-	lsls r0, r3, 10
-	lsls r1, r3, 5
-	orrs r0, r1
-	orrs r0, r3
-	strh r0, [r2, 0x2]
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x1F
-	bls _0812637E
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8126370
-
-	thumb_func_start sub_81263A4
-sub_81263A4: @ 81263A4
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	movs r1, 0xDF
-	mov r9, r1
-	cmp r0, 0
-	bne _081263BC
-	movs r2, 0xFF
-	mov r9, r2
-_081263BC:
-	movs r6, 0
-	ldr r3, =gUnknown_03006184
-	mov r12, r3
-	mov r0, r9
-	lsls r4, r0, 1
-	ldr r5, =gUnknown_0300616C
-	cmp r6, r9
-	bcs _081263E0
-	movs r2, 0
-_081263CE:
-	ldr r0, [r3]
-	lsls r1, r6, 1
-	adds r1, r0
-	strh r2, [r1]
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, r9
-	bcc _081263CE
-_081263E0:
-	mov r1, r12
-	ldr r0, [r1]
-	adds r0, r4, r0
-	ldr r2, =0x00003def
-	adds r1, r2, 0
-	strh r1, [r0]
-	movs r3, 0
-	ldrb r5, [r5]
-	cmp r3, r5
-	bcs _081264E4
-_081263F4:
-	ldr r2, =gUnknown_03006168
-	ldr r0, =gUnknown_03006178
-	ldrb r1, [r0]
-	adds r1, r3
-	ldr r0, =gUnknown_03006180
-	ldrb r0, [r0]
-	muls r0, r1
-	lsls r0, 1
-	ldr r1, [r2]
-	adds r1, r0
-	ldr r0, =gUnknown_03006164
-	ldrb r0, [r0]
-	lsls r0, 1
-	adds r4, r1, r0
-	movs r6, 0
-	ldr r0, =gUnknown_03006174
-	adds r2, r0, 0
-	adds r3, 0x1
-	mov r10, r3
-	ldrb r3, [r2]
-	cmp r6, r3
-	bcs _081264D6
-	ldr r0, =gUnknown_03006188
-	mov r8, r0
-_08126424:
-	ldrh r0, [r4]
-	movs r3, 0x80
-	lsls r3, 8
-	adds r1, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08126464
-	mov r1, r8
-	ldrh r0, [r1]
-	strh r0, [r4]
-	adds r6, 0x1
-	adds r7, r4, 0x2
-	b _081264CA
-	.pool
-_08126464:
-	adds r0, r4, 0
-	bl sub_81267C4
-	lsls r0, 16
-	lsrs r5, r0, 16
-	movs r3, 0x1
-	adds r6, 0x1
-	adds r7, r4, 0x2
-	cmp r3, r9
-	bcs _081264C0
-	ldr r0, =gUnknown_03006184
-	ldr r2, [r0]
-	ldrh r1, [r2, 0x2]
-	mov r12, r0
-	cmp r1, 0
-	bne _08126494
-	strh r5, [r2, 0x2]
-	mov r2, r8
-	ldrh r0, [r2]
-	adds r0, 0x1
-	b _081264BE
-	.pool
-_08126494:
-	mov r2, r12
-	ldr r1, [r2]
-	lsls r0, r3, 1
-	adds r0, r1
-	ldrh r0, [r0]
-	cmp r0, r5
-	beq _081264B8
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r9
-	bcs _081264C0
-	lsls r0, r3, 1
-	adds r1, r0, r1
-	ldrh r0, [r1]
-	cmp r0, 0
-	bne _08126494
-	strh r5, [r1]
-_081264B8:
-	mov r1, r8
-	ldrh r0, [r1]
-	adds r0, r3
-_081264BE:
-	strh r0, [r4]
-_081264C0:
-	ldr r2, =gUnknown_03006174
-	cmp r3, r9
-	bne _081264CA
-	mov r3, r9
-	strh r3, [r4]
-_081264CA:
-	lsls r0, r6, 24
-	lsrs r6, r0, 24
-	adds r4, r7, 0
-	ldrb r0, [r2]
-	cmp r6, r0
-	bcc _08126424
-_081264D6:
-	mov r1, r10
-	lsls r0, r1, 24
-	lsrs r3, r0, 24
-	ldr r0, =gUnknown_0300616C
-	ldrb r0, [r0]
-	cmp r3, r0
-	bcc _081263F4
-_081264E4:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81263A4
-
-	thumb_func_start sub_81264FC
-sub_81264FC: @ 81264FC
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	movs r2, 0
-	ldr r0, =gUnknown_0300616C
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcs _081265A0
-	ldr r0, =gUnknown_03006168
-	mov r8, r0
-_08126510:
-	ldr r0, =gUnknown_03006178
-	ldrb r1, [r0]
-	adds r1, r2
-	ldr r0, =gUnknown_03006180
-	ldrb r0, [r0]
-	muls r0, r1
-	lsls r0, 1
-	mov r3, r8
-	ldr r1, [r3]
-	adds r1, r0
-	ldr r0, =gUnknown_03006164
-	ldrb r0, [r0]
-	lsls r0, 1
-	adds r4, r1, r0
-	movs r6, 0
-	ldr r0, =gUnknown_03006174
-	adds r3, r0, 0
-	adds r7, r2, 0x1
-	ldrb r0, [r3]
-	cmp r6, r0
-	bcs _08126594
-	ldr r5, =gUnknown_03006188
-_0812653C:
-	ldrh r0, [r4]
-	movs r2, 0x80
-	lsls r2, 8
-	adds r1, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0812656C
-	ldrh r0, [r5]
-	strh r0, [r4]
-	b _08126586
-	.pool
-_0812656C:
-	adds r0, r4, 0
-	bl ConvertToBlackOrWhite
-	lsls r0, 16
-	cmp r0, 0
-	bne _0812657E
-	ldrh r0, [r5]
-	adds r0, 0x1
-	b _08126582
-_0812657E:
-	ldrh r0, [r5]
-	adds r0, 0x2
-_08126582:
-	strh r0, [r4]
-	ldr r3, =gUnknown_03006174
-_08126586:
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-	adds r4, 0x2
-	ldrb r0, [r3]
-	cmp r6, r0
-	bcc _0812653C
-_08126594:
-	lsls r0, r7, 24
-	lsrs r2, r0, 24
-	ldr r0, =gUnknown_0300616C
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcc _08126510
-_081265A0:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81264FC
-
-	thumb_func_start sub_81265B4
-sub_81265B4: @ 81265B4
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	movs r2, 0
-	ldr r0, =gUnknown_0300616C
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcs _08126650
-	ldr r0, =gUnknown_03006168
-	mov r8, r0
-_081265CA:
-	ldr r0, =gUnknown_03006178
-	ldrb r1, [r0]
-	adds r1, r2
-	ldr r0, =gUnknown_03006180
-	ldrb r0, [r0]
-	muls r0, r1
-	lsls r0, 1
-	mov r3, r8
-	ldr r1, [r3]
-	adds r1, r0
-	ldr r0, =gUnknown_03006164
-	ldrb r0, [r0]
-	lsls r0, 1
-	adds r4, r1, r0
-	movs r5, 0
-	ldr r0, =gUnknown_03006174
-	adds r7, r2, 0x1
-	ldrb r0, [r0]
-	cmp r5, r0
-	bcs _08126644
-	ldr r6, =gUnknown_03006188
-	movs r0, 0x80
-	lsls r0, 8
-	adds r2, r0, 0
-_081265FA:
-	ldrh r0, [r4]
-	ands r0, r2
-	cmp r0, 0
-	beq _08126624
-	ldrh r0, [r6]
-	strh r0, [r4]
-	b _08126634
-	.pool
-_08126624:
-	adds r0, r4, 0
-	str r2, [sp]
-	bl sub_8126908
-	ldrh r1, [r6]
-	adds r0, r1
-	strh r0, [r4]
-	ldr r2, [sp]
-_08126634:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r4, 0x2
-	ldr r0, =gUnknown_03006174
-	ldrb r0, [r0]
-	cmp r5, r0
-	bcc _081265FA
-_08126644:
-	lsls r0, r7, 24
-	lsrs r2, r0, 24
-	ldr r0, =gUnknown_0300616C
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcc _081265CA
-_08126650:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81265B4
-
-	thumb_func_start sub_8126664
-sub_8126664: @ 8126664
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	movs r2, 0
-	ldr r0, =gUnknown_0300616C
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcs _08126700
-	ldr r0, =gUnknown_03006168
-	mov r8, r0
-_0812667A:
-	ldr r0, =gUnknown_03006178
-	ldrb r1, [r0]
-	adds r1, r2
-	ldr r0, =gUnknown_03006180
-	ldrb r0, [r0]
-	muls r0, r1
-	lsls r0, 1
-	mov r3, r8
-	ldr r1, [r3]
-	adds r1, r0
-	ldr r0, =gUnknown_03006164
-	ldrb r0, [r0]
-	lsls r0, 1
-	adds r4, r1, r0
-	movs r5, 0
-	ldr r0, =gUnknown_03006174
-	adds r7, r2, 0x1
-	ldrb r0, [r0]
-	cmp r5, r0
-	bcs _081266F4
-	ldr r6, =gUnknown_03006188
-	movs r0, 0x80
-	lsls r0, 8
-	adds r2, r0, 0
-_081266AA:
-	ldrh r0, [r4]
-	ands r0, r2
-	cmp r0, 0
-	beq _081266D4
-	ldrh r0, [r6]
-	strh r0, [r4]
-	b _081266E4
-	.pool
-_081266D4:
-	adds r0, r4, 0
-	str r2, [sp]
-	bl sub_812693C
-	ldrh r1, [r6]
-	adds r0, r1
-	strh r0, [r4]
-	ldr r2, [sp]
-_081266E4:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r4, 0x2
-	ldr r0, =gUnknown_03006174
-	ldrb r0, [r0]
-	cmp r5, r0
-	bcc _081266AA
-_081266F4:
-	lsls r0, r7, 24
-	lsrs r2, r0, 24
-	ldr r0, =gUnknown_0300616C
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcc _0812667A
-_08126700:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8126664
-
-	thumb_func_start sub_8126714
-sub_8126714: @ 8126714
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	movs r2, 0
-	ldr r0, =gUnknown_0300616C
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcs _081267B0
-	ldr r0, =gUnknown_03006168
-	mov r8, r0
-_0812672A:
-	ldr r0, =gUnknown_03006178
-	ldrb r1, [r0]
-	adds r1, r2
-	ldr r0, =gUnknown_03006180
-	ldrb r0, [r0]
-	muls r0, r1
-	lsls r0, 1
-	mov r3, r8
-	ldr r1, [r3]
-	adds r1, r0
-	ldr r0, =gUnknown_03006164
-	ldrb r0, [r0]
-	lsls r0, 1
-	adds r4, r1, r0
-	movs r5, 0
-	ldr r0, =gUnknown_03006174
-	adds r7, r2, 0x1
-	ldrb r0, [r0]
-	cmp r5, r0
-	bcs _081267A4
-	ldr r6, =gUnknown_03006188
-	movs r0, 0x80
-	lsls r0, 8
-	adds r2, r0, 0
-_0812675A:
-	ldrh r0, [r4]
-	ands r0, r2
-	cmp r0, 0
-	beq _08126784
-	ldrh r0, [r6]
-	strh r0, [r4]
-	b _08126794
-	.pool
-_08126784:
-	adds r0, r4, 0
-	str r2, [sp]
-	bl sub_8126838
-	ldrh r1, [r6]
-	adds r0, r1
-	strh r0, [r4]
-	ldr r2, [sp]
-_08126794:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r4, 0x2
-	ldr r0, =gUnknown_03006174
-	ldrb r0, [r0]
-	cmp r5, r0
-	bcc _0812675A
-_081267A4:
-	lsls r0, r7, 24
-	lsrs r2, r0, 24
-	ldr r0, =gUnknown_0300616C
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcc _0812672A
-_081267B0:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8126714
-
-	thumb_func_start sub_81267C4
-sub_81267C4: @ 81267C4
-	push {r4,lr}
-	ldrh r0, [r0]
-	movs r1, 0x1F
-	movs r4, 0x1F
-	ands r4, r0
-	lsls r0, 16
-	lsrs r3, r0, 21
-	ands r3, r1
-	lsrs r2, r0, 26
-	ands r2, r1
-	movs r1, 0x3
-	adds r0, r4, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _081267E8
-	movs r0, 0x1C
-	ands r0, r4
-	adds r4, r0, 0x4
-_081267E8:
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _081267F6
-	movs r0, 0x1C
-	ands r0, r3
-	adds r3, r0, 0x4
-_081267F6:
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08126804
-	movs r0, 0x1C
-	ands r0, r2
-	adds r2, r0, 0x4
-_08126804:
-	cmp r4, 0x5
-	bhi _0812680A
-	movs r4, 0x6
-_0812680A:
-	cmp r4, 0x1E
-	bls _08126810
-	movs r4, 0x1E
-_08126810:
-	cmp r3, 0x5
-	bhi _08126816
-	movs r3, 0x6
-_08126816:
-	cmp r3, 0x1E
-	bls _0812681C
-	movs r3, 0x1E
-_0812681C:
-	cmp r2, 0x5
-	bhi _08126822
-	movs r2, 0x6
-_08126822:
-	cmp r2, 0x1E
-	bls _08126828
-	movs r2, 0x1E
-_08126828:
-	lsls r0, r2, 10
-	lsls r1, r3, 5
-	orrs r0, r1
-	orrs r4, r0
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81267C4
-
-	thumb_func_start sub_8126838
-sub_8126838: @ 8126838
-	push {lr}
-	ldrh r0, [r0]
-	movs r1, 0x1F
-	movs r3, 0x1F
-	ands r3, r0
-	lsls r0, 16
-	lsrs r2, r0, 21
-	ands r2, r1
-	lsrs r0, 26
-	ands r0, r1
-	cmp r3, 0xB
-	bhi _0812685C
-	cmp r2, 0xA
-	bhi _0812685C
-	cmp r0, 0xA
-	bhi _0812685C
-	movs r0, 0x1
-	b _08126902
-_0812685C:
-	cmp r3, 0x13
-	bls _08126880
-	cmp r2, 0x13
-	bls _08126868
-	cmp r0, 0x13
-	bhi _0812688C
-_08126868:
-	cmp r3, 0x13
-	bls _08126880
-	cmp r2, 0x13
-	bls _08126876
-	cmp r0, 0xE
-	bhi _0812688C
-	b _081268C4
-_08126876:
-	cmp r0, 0x13
-	bls _08126880
-	cmp r2, 0xE
-	bhi _0812688C
-	b _081268A0
-_08126880:
-	cmp r2, 0x13
-	bls _08126890
-	cmp r0, 0x13
-	bls _08126890
-	cmp r3, 0xE
-	bls _081268E8
-_0812688C:
-	movs r0, 0x2
-	b _08126902
-_08126890:
-	cmp r3, 0x13
-	bls _081268B4
-	cmp r2, 0xB
-	bls _081268A8
-	cmp r0, 0xB
-	bls _081268A4
-	cmp r2, r0
-	bcs _081268C4
-_081268A0:
-	movs r0, 0x8
-	b _08126902
-_081268A4:
-	movs r0, 0xA
-	b _08126902
-_081268A8:
-	cmp r0, 0xB
-	bls _081268B0
-	movs r0, 0xD
-	b _08126902
-_081268B0:
-	movs r0, 0x4
-	b _08126902
-_081268B4:
-	cmp r2, 0x13
-	bls _081268D8
-	cmp r3, 0xB
-	bls _081268CC
-	cmp r0, 0xB
-	bls _081268C8
-	cmp r3, r0
-	bcc _081268E8
-_081268C4:
-	movs r0, 0x7
-	b _08126902
-_081268C8:
-	movs r0, 0xB
-	b _08126902
-_081268CC:
-	cmp r0, 0xB
-	bls _081268D4
-	movs r0, 0xE
-	b _08126902
-_081268D4:
-	movs r0, 0x5
-	b _08126902
-_081268D8:
-	cmp r0, 0x13
-	bls _08126900
-	cmp r3, 0xB
-	bls _081268EC
-	cmp r2, 0xB
-	bls _081268F4
-	cmp r3, r2
-	bcs _081268A0
-_081268E8:
-	movs r0, 0x9
-	b _08126902
-_081268EC:
-	cmp r2, 0xB
-	bls _081268F4
-	movs r0, 0xC
-	b _08126902
-_081268F4:
-	cmp r0, 0xB
-	bls _081268FC
-	movs r0, 0xF
-	b _08126902
-_081268FC:
-	movs r0, 0x6
-	b _08126902
-_08126900:
-	movs r0, 0x3
-_08126902:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8126838
-
-	thumb_func_start sub_8126908
-sub_8126908: @ 8126908
-	push {lr}
-	ldrh r1, [r0]
-	movs r3, 0x1F
-	movs r0, 0x1F
-	ands r0, r1
-	lsls r1, 16
-	lsrs r2, r1, 21
-	ands r2, r3
-	lsrs r1, 26
-	ands r1, r3
-	adds r0, r2
-	adds r0, r1
-	movs r1, 0x3
-	bl __divsi3
-	movs r1, 0x1E
-	ands r0, r1
-	lsls r0, 16
-	cmp r0, 0
-	beq _08126934
-	lsrs r0, 17
-	b _08126936
-_08126934:
-	movs r0, 0x1
-_08126936:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8126908
-
-	thumb_func_start sub_812693C
-sub_812693C: @ 812693C
-	push {lr}
-	ldrh r1, [r0]
-	movs r3, 0x1F
-	movs r0, 0x1F
-	ands r0, r1
-	lsls r1, 16
-	lsrs r2, r1, 21
-	ands r2, r3
-	lsrs r1, 26
-	ands r1, r3
-	adds r0, r2
-	adds r0, r1
-	movs r1, 0x3
-	bl __divsi3
-	lsls r0, 16
-	movs r1, 0x80
-	lsls r1, 9
-	adds r0, r1
-	lsrs r0, 16
-	pop {r1}
-	bx r1
-	thumb_func_end sub_812693C
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asmdiff.ps1 b/asmdiff.ps1
new file mode 100644
index 000000000..169f14776
--- /dev/null
+++ b/asmdiff.ps1
@@ -0,0 +1,114 @@
+Param
+(
+    [Parameter(Position = 0)]
+    [string]$Start,
+
+    [Parameter(Position = 1)]
+    [string]$Offset,
+
+    [Parameter()]
+    [string[]]$DiffTool
+)
+
+$ErrorActionPreference = "Stop"
+
+$offset_default_value = "0x100"
+$diff_tool_default_value = "diff"
+
+$help = "
+$($args[0]) [OPTIONS] Start [Offset]
+
+Performs a diff on the assembly of a function in a rom. 'Start' is the start
+location of the function, and 'Offset' is the number of bytes to disassemble.
+The assembly is saved to *.dump files.
+
+'Offset' is optional, and defaults to $offset_default_value. If this value is
+very large (0x10000+), objdump may hang / freeze.
+
+Requirements:
+    - A clean copy of the rom named 'baserom.gba'.
+    - $$ENV:DEVKITARM to point to the installation of devkitpro. By default, it is
+      installed to 'C:\devkitpro\devkitARM'.
+
+Options:
+    -DiffTool <tool>   The tool to use for diffing. Defaults to '$diff_tool_default_value'. For VSCode,
+                       you can use -DiffTool 'code --diff'. (Quotes are necessary around 'code --diff')
+"
+
+if ((-not (Test-Path variable:Start)) -or [string]::IsNullOrWhiteSpace($Start))
+{
+    Write-Host $help
+    exit
+}
+
+if (-not (Test-Path variable:DiffTool) -or [string]::IsNullOrWhiteSpace($DiffTool))
+{
+    $DiffTool = $diff_tool_default_value
+}
+
+if (-not (Test-Path variable:Offset) -or [string]::IsNullOrWhiteSpace($Offset))
+{
+    $Offset = $offset_default_value
+}
+
+if (-Not (Test-Path env:DEVKITARM))
+{
+    Write-Host "ENV:DEVKITARM variable not set."
+    Write-Host $help
+    exit
+}
+
+if (-Not (Test-Path $env:DEVKITARM))
+{
+    Write-Host "DEVKITARM path '$env:DEVKITARM' does not exist."
+    Write-Host $help
+    exit
+}
+
+if (-Not (Test-Path ".\pokeemerald.gba"))
+{
+    Write-Host "File 'pokeemerald.gba' not found."
+    Write-Host $help
+    exit
+}
+
+if (-Not (Test-Path ".\baserom.gba"))
+{
+    Write-Host "File 'baserom.gba' not found."
+}
+
+try
+{
+    $start_num = [System.Convert]::ToUInt64($Start, 16)
+}
+catch
+{
+    Write-Host "Error parsing '$start_num' as a hex number."
+    Write-Host $help
+    exit
+}
+
+try
+{
+    $offset_num = [System.Convert]::ToUInt64($Offset, 16)
+}
+catch
+{
+    Write-Host "Error parsing '$offset_num' as a hex number."
+    Write-Host $help
+    exit
+}
+
+if ($start_num -gt 0x1000000)
+{
+    Write-Host "Warning: Start address is larger than the ROM file. Hint: ignore the leading number in the address."
+}
+
+$end_str = [System.Convert]::ToString($start_num + $offset_num, 16)
+$end_str = "0x$end_str"
+
+Write-Host "$Start - $end_str"
+$objdump = Join-Path -Path $env:DEVKITARM -ChildPath "arm-none-eabi\bin\objdump.exe"
+&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\baserom.gba > .\baserom.dump
+&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\pokeemerald.gba > .\pokeemerald.dump
+Invoke-Expression "$DiffTool .\baserom.dump .\pokeemerald.dump"
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 1175c8d00..67351d184 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -3161,7 +3161,7 @@ Route118_EventScript_273D13:: @ 8273D13
 Route125_EventScript_273D13:: @ 8273D13
 Route127_EventScript_273D13:: @ 8273D13
 Route129_EventScript_273D13:: @ 8273D13
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 UnusualWeather_StartKyogreWeather:: @ 8273D17
@@ -3188,7 +3188,7 @@ UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
 	special DrawWholeMapView
 	setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE
 	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	fadescreenswapbuffers 0
 	releaseall
 	end
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json
index 14a2e7d23..3f4739b26 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
   "name": "BattleFrontier_BattlePyramidEmptySquare",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json
index fcb459426..d73dc1692 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/map.json
+++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
   "name": "BattleFrontier_BattlePyramidTop",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json
index 2b0d26de0..d4cbfd71d 100644
--- a/data/maps/BattlePyramidSquare01/map.json
+++ b/data/maps/BattlePyramidSquare01/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE01",
   "name": "BattlePyramidSquare01",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json
index 32b0ad7ec..e68b71284 100644
--- a/data/maps/BattlePyramidSquare02/map.json
+++ b/data/maps/BattlePyramidSquare02/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE02",
   "name": "BattlePyramidSquare02",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json
index bbec7daa4..8a495158e 100644
--- a/data/maps/BattlePyramidSquare03/map.json
+++ b/data/maps/BattlePyramidSquare03/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE03",
   "name": "BattlePyramidSquare03",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json
index 8f63efd06..e413a7e5f 100644
--- a/data/maps/BattlePyramidSquare04/map.json
+++ b/data/maps/BattlePyramidSquare04/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE04",
   "name": "BattlePyramidSquare04",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json
index 7e26a9ee3..d16a87646 100644
--- a/data/maps/BattlePyramidSquare05/map.json
+++ b/data/maps/BattlePyramidSquare05/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE05",
   "name": "BattlePyramidSquare05",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json
index 289a1e5c2..ddf011814 100644
--- a/data/maps/BattlePyramidSquare06/map.json
+++ b/data/maps/BattlePyramidSquare06/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE06",
   "name": "BattlePyramidSquare06",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json
index 745234547..8719c6d25 100644
--- a/data/maps/BattlePyramidSquare07/map.json
+++ b/data/maps/BattlePyramidSquare07/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE07",
   "name": "BattlePyramidSquare07",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json
index cac7ed96e..54cfa4fe8 100644
--- a/data/maps/BattlePyramidSquare08/map.json
+++ b/data/maps/BattlePyramidSquare08/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE08",
   "name": "BattlePyramidSquare08",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json
index b5a111334..67b9ceb1f 100644
--- a/data/maps/BattlePyramidSquare09/map.json
+++ b/data/maps/BattlePyramidSquare09/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE09",
   "name": "BattlePyramidSquare09",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json
index 5171d112e..0a5e88bf7 100644
--- a/data/maps/BattlePyramidSquare10/map.json
+++ b/data/maps/BattlePyramidSquare10/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE10",
   "name": "BattlePyramidSquare10",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json
index 58ac0476f..5dc7736a3 100644
--- a/data/maps/BattlePyramidSquare11/map.json
+++ b/data/maps/BattlePyramidSquare11/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE11",
   "name": "BattlePyramidSquare11",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json
index 648c3e3a6..dcb57812d 100644
--- a/data/maps/BattlePyramidSquare12/map.json
+++ b/data/maps/BattlePyramidSquare12/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE12",
   "name": "BattlePyramidSquare12",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json
index c9342b3b9..d277c5b1b 100644
--- a/data/maps/BattlePyramidSquare13/map.json
+++ b/data/maps/BattlePyramidSquare13/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE13",
   "name": "BattlePyramidSquare13",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json
index 6f9461967..5727356ed 100644
--- a/data/maps/BattlePyramidSquare14/map.json
+++ b/data/maps/BattlePyramidSquare14/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE14",
   "name": "BattlePyramidSquare14",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json
index 3aa2571f6..62c7e34f3 100644
--- a/data/maps/BattlePyramidSquare15/map.json
+++ b/data/maps/BattlePyramidSquare15/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE15",
   "name": "BattlePyramidSquare15",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json
index 70b677c34..a69a0ed5a 100644
--- a/data/maps/BattlePyramidSquare16/map.json
+++ b/data/maps/BattlePyramidSquare16/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE16",
   "name": "BattlePyramidSquare16",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json
index c87f39fb8..c3e5ddddf 100644
--- a/data/maps/BirthIsland_Exterior/map.json
+++ b/data/maps/BirthIsland_Exterior/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BIRTH_ISLAND_EXTERIOR",
   "name": "BirthIsland_Exterior",
   "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_BIRTH_ISLAND_2",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json
index b212247bb..48937d482 100644
--- a/data/maps/BirthIsland_Harbor/map.json
+++ b/data/maps/BirthIsland_Harbor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BIRTH_ISLAND_HARBOR",
   "name": "BirthIsland_Harbor",
   "layout": "LAYOUT_ISLAND_HARBOR",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_BIRTH_ISLAND_2",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json
index 2a764c677..ac3baeaf8 100644
--- a/data/maps/CaveOfOrigin_B1F/map.json
+++ b/data/maps/CaveOfOrigin_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CAVE_OF_ORIGIN_B1F",
   "name": "CaveOfOrigin_B1F",
   "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
   "requires_flash": false,
   "weather": "WEATHER_FOG_1",
diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json
index eefeed365..ff76eb774 100644
--- a/data/maps/InsideOfTruck/map.json
+++ b/data/maps/InsideOfTruck/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_INSIDE_OF_TRUCK",
   "name": "InsideOfTruck",
   "layout": "LAYOUT_INSIDE_OF_TRUCK",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_INSIDE_OF_TRUCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
index 672b2003b..0f7f5447d 100644
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -15,7 +15,7 @@ InsideOfTruck_MapScript1_23BF01: @ 823BF01
 
 InsideOfTruck_EventScript_23BF04:: @ 823BF04
 	lockall
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq InsideOfTruck_EventScript_23BF20
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
index 5c1612199..acbb3fcd2 100644
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -37,7 +37,7 @@ LavaridgeTown_EventScript_1EA53F:: @ 81EA53F
 	return
 
 LavaridgeTown_EventScript_1EA543:: @ 81EA543
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 LavaridgeTown_MapScript2_1EA547: @ 81EA547
@@ -95,7 +95,7 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
 	call_if_ne LavaridgeTown_EventScript_1EA6C9
 	removeobject 7
 	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	releaseall
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
index e133169ba..f347811f8 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -31,7 +31,7 @@ LittlerootTown_EventScript_1E7E45:: @ 81E7E45
 	return
 
 LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
@@ -141,7 +141,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
 	closedoor VAR_0x8004, VAR_0x8005
 	waitdooranim
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 LittlerootTown_Movement_1E7F98: @ 81E7F98
@@ -194,7 +194,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
 	delay 20
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
 	waitstate
 	releaseall
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index 5a652ab15..c8b723383 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -20,7 +20,7 @@ PetalburgCity_EventScript_1DC307:: @ 81DC307
 	return
 
 PetalburgCity_EventScript_1DC30F:: @ 81DC30F
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	savebgm MUS_TSURETEK
 	return
 
@@ -48,7 +48,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
 	waitmovement 2, MAP_PETALBURG_CITY
 	msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT
 	closemessage
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_PETALBURG_STATE, 3
 	fadedefaultbgm
 	clearflag FLAG_SPECIAL_FLAG_0x4001
@@ -61,7 +61,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
 
 PetalburgCity_EventScript_1DC390:: @ 81DC390
 	lockall
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	applymovement 5, PetalburgCity_Movement_1DC41B
 	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406
 	waitmovement 0
@@ -76,7 +76,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
 	closedoor VAR_0x8004, VAR_0x8005
 	waitdooranim
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	fadedefaultbgm
 	clearflag FLAG_SPECIAL_FLAG_0x4001
 	warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index aa20ba2da..47663e1dd 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -12,7 +12,7 @@ Route101_MapScript2_1EBCCB: @ 81EBCCB
 	.2byte 0
 
 Route101_EventScript_1EBCD5:: @ 81EBCD5
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_ROUTE101_STATE, 1
 	end
 
@@ -236,7 +236,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
 	setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
 	setvar VAR_BIRCH_LAB_STATE, 2
 	setvar VAR_ROUTE101_STATE, 3
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	checkplayergender
 	compare VAR_RESULT, MALE
 	call_if_eq Route101_EventScript_1EBE85
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
index 647d62b6a..84091ac3a 100644
--- a/data/maps/Route128/scripts.inc
+++ b/data/maps/Route128/scripts.inc
@@ -73,7 +73,7 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	delay 15
 	removeobject 3
 	waitfieldeffect 30
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_ROUTE128_STATE, 2
 	releaseall
 	end
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index f93711344..1ba63c959 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -24,7 +24,7 @@ RustboroCity_EventScript_1E06FF:: @ 81E06FF
 	end
 
 RustboroCity_EventScript_1E0707:: @ 81E0707
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 RustboroCity_MapScript2_1E070B: @ 81E070B
@@ -100,7 +100,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
 	removeobject 15
 	setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
 	setvar VAR_RUSTBORO_STATE, 7
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	releaseall
 	end
 
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 38a10a004..4c630a1d4 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -140,7 +140,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	warp MAP_ROUTE128, 255, 38, 22
 	waitstate
 	releaseall
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc
index 93d4e42c3..c4769c990 100644
--- a/data/maps/SkyPillar_Outside/scripts.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
@@ -12,7 +12,7 @@ SkyPillar_Outside_MapScript1_2392B8: @ 82392B8
 	end
 
 SkyPillar_Outside_EventScript_2392CF:: @ 82392CF
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 SkyPillar_Outside_EventScript_2392D3:: @ 82392D3
@@ -81,7 +81,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	closemessage
 	playse SE_KAIDAN
 	fadescreenswapbuffers 1
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_RAYQUAZA_STATE, 4
 	removeobject 1
 	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index acf66d2bd..1830c3f00 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -36,7 +36,7 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99
 	return
 
 SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 30
 	goto_if_eq SlateportCity_EventScript_1DCD06
@@ -83,7 +83,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
 	removeobject 35
 	setobjectxyperm 35, 10, 12
 	setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2
 	addvar VAR_SCOTT_STATE, 1
 	releaseall
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index dbfe923f0..ad72120f9 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -62,7 +62,7 @@ SootopolisCity_MapScript1_1E56EF: @ 81E56EF
 	end
 
 SootopolisCity_EventScript_1E5781:: @ 81E5781
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 SootopolisCity_EventScript_1E5785:: @ 81E5785
@@ -272,7 +272,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	waitmovement 0
 	special RemoveCameraObject
 	setvar VAR_RAYQUAZA_STATE, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	releaseall
 	end
 
@@ -372,7 +372,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	waitmovement 0
 	special RemoveCameraObject
 	setvar VAR_RAYQUAZA_STATE, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	releaseall
 	end
 
@@ -544,7 +544,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
 	fadenewbgm MUS_RUNECITY
 	delay 120
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32
 	waitstate
 	end
@@ -597,7 +597,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
 	fadenewbgm MUS_NAMINORI
 	delay 120
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53
 	waitstate
 	end
diff --git a/graphics/pokemon/anim_front_pics/abra_front_pic.png b/graphics/pokemon/abra/anim_front.png
index ee466f539..ee466f539 100644
--- a/graphics/pokemon/anim_front_pics/abra_front_pic.png
+++ b/graphics/pokemon/abra/anim_front.png
diff --git a/graphics/pokemon/back_pics/abra_back_pic.png b/graphics/pokemon/abra/back.png
index 5035bde91..5035bde91 100644
--- a/graphics/pokemon/back_pics/abra_back_pic.png
+++ b/graphics/pokemon/abra/back.png
diff --git a/graphics/pokemon/footprints/abra_footprint.png b/graphics/pokemon/abra/footprint.png
index 42b5e416f..42b5e416f 100644
--- a/graphics/pokemon/footprints/abra_footprint.png
+++ b/graphics/pokemon/abra/footprint.png
diff --git a/graphics/pokemon/front_pics/abra_still_front_pic.png b/graphics/pokemon/abra/front.png
index 5e7ff8066..5e7ff8066 100644
--- a/graphics/pokemon/front_pics/abra_still_front_pic.png
+++ b/graphics/pokemon/abra/front.png
diff --git a/graphics/pokemon/icons/abra_icon.png b/graphics/pokemon/abra/icon.png
index cf7d3d2f7..cf7d3d2f7 100644
--- a/graphics/pokemon/icons/abra_icon.png
+++ b/graphics/pokemon/abra/icon.png
diff --git a/graphics/pokemon/palettes/abra_palette.pal b/graphics/pokemon/abra/normal.pal
index b688ea0bc..b688ea0bc 100644
--- a/graphics/pokemon/palettes/abra_palette.pal
+++ b/graphics/pokemon/abra/normal.pal
diff --git a/graphics/pokemon/palettes/abra_shiny_palette.pal b/graphics/pokemon/abra/shiny.pal
index 4122603ff..4122603ff 100644
--- a/graphics/pokemon/palettes/abra_shiny_palette.pal
+++ b/graphics/pokemon/abra/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/absol_front_pic.png b/graphics/pokemon/absol/anim_front.png
index 5b459aef0..5b459aef0 100644
--- a/graphics/pokemon/anim_front_pics/absol_front_pic.png
+++ b/graphics/pokemon/absol/anim_front.png
diff --git a/graphics/pokemon/back_pics/absol_back_pic.png b/graphics/pokemon/absol/back.png
index 876ba48aa..876ba48aa 100644
--- a/graphics/pokemon/back_pics/absol_back_pic.png
+++ b/graphics/pokemon/absol/back.png
diff --git a/graphics/pokemon/footprints/absol_footprint.png b/graphics/pokemon/absol/footprint.png
index da4076f78..da4076f78 100644
--- a/graphics/pokemon/footprints/absol_footprint.png
+++ b/graphics/pokemon/absol/footprint.png
diff --git a/graphics/pokemon/front_pics/absol_still_front_pic.png b/graphics/pokemon/absol/front.png
index 17759b2e7..17759b2e7 100644
--- a/graphics/pokemon/front_pics/absol_still_front_pic.png
+++ b/graphics/pokemon/absol/front.png
diff --git a/graphics/pokemon/icons/absol_icon.png b/graphics/pokemon/absol/icon.png
index 3cc5e01b5..3cc5e01b5 100644
--- a/graphics/pokemon/icons/absol_icon.png
+++ b/graphics/pokemon/absol/icon.png
diff --git a/graphics/pokemon/palettes/absol_palette.pal b/graphics/pokemon/absol/normal.pal
index 990038917..990038917 100644
--- a/graphics/pokemon/palettes/absol_palette.pal
+++ b/graphics/pokemon/absol/normal.pal
diff --git a/graphics/pokemon/palettes/absol_shiny_palette.pal b/graphics/pokemon/absol/shiny.pal
index 4b86195a7..4b86195a7 100644
--- a/graphics/pokemon/palettes/absol_shiny_palette.pal
+++ b/graphics/pokemon/absol/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/aerodactyl_front_pic.png b/graphics/pokemon/aerodactyl/anim_front.png
index 4b5ea3378..4b5ea3378 100644
--- a/graphics/pokemon/anim_front_pics/aerodactyl_front_pic.png
+++ b/graphics/pokemon/aerodactyl/anim_front.png
diff --git a/graphics/pokemon/back_pics/aerodactyl_back_pic.png b/graphics/pokemon/aerodactyl/back.png
index 8dfa76f57..8dfa76f57 100644
--- a/graphics/pokemon/back_pics/aerodactyl_back_pic.png
+++ b/graphics/pokemon/aerodactyl/back.png
diff --git a/graphics/pokemon/footprints/aerodactyl_footprint.png b/graphics/pokemon/aerodactyl/footprint.png
index 7c5d3e6c1..7c5d3e6c1 100644
--- a/graphics/pokemon/footprints/aerodactyl_footprint.png
+++ b/graphics/pokemon/aerodactyl/footprint.png
diff --git a/graphics/pokemon/front_pics/aerodactyl_still_front_pic.png b/graphics/pokemon/aerodactyl/front.png
index 5f7e41552..5f7e41552 100644
--- a/graphics/pokemon/front_pics/aerodactyl_still_front_pic.png
+++ b/graphics/pokemon/aerodactyl/front.png
diff --git a/graphics/pokemon/icons/aerodactyl_icon.png b/graphics/pokemon/aerodactyl/icon.png
index f90e269b0..f90e269b0 100644
--- a/graphics/pokemon/icons/aerodactyl_icon.png
+++ b/graphics/pokemon/aerodactyl/icon.png
diff --git a/graphics/pokemon/palettes/aerodactyl_palette.pal b/graphics/pokemon/aerodactyl/normal.pal
index 45116129c..45116129c 100644
--- a/graphics/pokemon/palettes/aerodactyl_palette.pal
+++ b/graphics/pokemon/aerodactyl/normal.pal
diff --git a/graphics/pokemon/palettes/aerodactyl_shiny_palette.pal b/graphics/pokemon/aerodactyl/shiny.pal
index 1e2e3f8d7..1e2e3f8d7 100644
--- a/graphics/pokemon/palettes/aerodactyl_shiny_palette.pal
+++ b/graphics/pokemon/aerodactyl/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/aggron_front_pic.png b/graphics/pokemon/aggron/anim_front.png
index 43adabd58..43adabd58 100644
--- a/graphics/pokemon/anim_front_pics/aggron_front_pic.png
+++ b/graphics/pokemon/aggron/anim_front.png
diff --git a/graphics/pokemon/back_pics/aggron_back_pic.png b/graphics/pokemon/aggron/back.png
index 24ade1ff4..24ade1ff4 100644
--- a/graphics/pokemon/back_pics/aggron_back_pic.png
+++ b/graphics/pokemon/aggron/back.png
diff --git a/graphics/pokemon/footprints/aggron_footprint.png b/graphics/pokemon/aggron/footprint.png
index 3ba6d480b..3ba6d480b 100644
--- a/graphics/pokemon/footprints/aggron_footprint.png
+++ b/graphics/pokemon/aggron/footprint.png
diff --git a/graphics/pokemon/front_pics/aggron_still_front_pic.png b/graphics/pokemon/aggron/front.png
index 0c357efe4..0c357efe4 100644
--- a/graphics/pokemon/front_pics/aggron_still_front_pic.png
+++ b/graphics/pokemon/aggron/front.png
diff --git a/graphics/pokemon/icons/aggron_icon.png b/graphics/pokemon/aggron/icon.png
index ed7ae52e4..ed7ae52e4 100644
--- a/graphics/pokemon/icons/aggron_icon.png
+++ b/graphics/pokemon/aggron/icon.png
diff --git a/graphics/pokemon/palettes/aggron_palette.pal b/graphics/pokemon/aggron/normal.pal
index b5711fdad..b5711fdad 100644
--- a/graphics/pokemon/palettes/aggron_palette.pal
+++ b/graphics/pokemon/aggron/normal.pal
diff --git a/graphics/pokemon/palettes/aggron_shiny_palette.pal b/graphics/pokemon/aggron/shiny.pal
index eadb9aa81..eadb9aa81 100644
--- a/graphics/pokemon/palettes/aggron_shiny_palette.pal
+++ b/graphics/pokemon/aggron/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/aipom_front_pic.png b/graphics/pokemon/aipom/anim_front.png
index 1643e37cf..1643e37cf 100644
--- a/graphics/pokemon/anim_front_pics/aipom_front_pic.png
+++ b/graphics/pokemon/aipom/anim_front.png
diff --git a/graphics/pokemon/back_pics/aipom_back_pic.png b/graphics/pokemon/aipom/back.png
index 7e9594b6f..7e9594b6f 100644
--- a/graphics/pokemon/back_pics/aipom_back_pic.png
+++ b/graphics/pokemon/aipom/back.png
diff --git a/graphics/pokemon/footprints/aipom_footprint.png b/graphics/pokemon/aipom/footprint.png
index 67f7f1188..67f7f1188 100644
--- a/graphics/pokemon/footprints/aipom_footprint.png
+++ b/graphics/pokemon/aipom/footprint.png
diff --git a/graphics/pokemon/front_pics/aipom_still_front_pic.png b/graphics/pokemon/aipom/front.png
index 25b20c739..25b20c739 100644
--- a/graphics/pokemon/front_pics/aipom_still_front_pic.png
+++ b/graphics/pokemon/aipom/front.png
diff --git a/graphics/pokemon/icons/aipom_icon.png b/graphics/pokemon/aipom/icon.png
index d5138f203..d5138f203 100644
--- a/graphics/pokemon/icons/aipom_icon.png
+++ b/graphics/pokemon/aipom/icon.png
diff --git a/graphics/pokemon/palettes/aipom_palette.pal b/graphics/pokemon/aipom/normal.pal
index bc79b2a2a..bc79b2a2a 100644
--- a/graphics/pokemon/palettes/aipom_palette.pal
+++ b/graphics/pokemon/aipom/normal.pal
diff --git a/graphics/pokemon/palettes/aipom_shiny_palette.pal b/graphics/pokemon/aipom/shiny.pal
index 785e324ab..785e324ab 100644
--- a/graphics/pokemon/palettes/aipom_shiny_palette.pal
+++ b/graphics/pokemon/aipom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/alakazam_front_pic.png b/graphics/pokemon/alakazam/anim_front.png
index 3891f3242..3891f3242 100644
--- a/graphics/pokemon/anim_front_pics/alakazam_front_pic.png
+++ b/graphics/pokemon/alakazam/anim_front.png
diff --git a/graphics/pokemon/back_pics/alakazam_back_pic.png b/graphics/pokemon/alakazam/back.png
index aad3363af..aad3363af 100644
--- a/graphics/pokemon/back_pics/alakazam_back_pic.png
+++ b/graphics/pokemon/alakazam/back.png
diff --git a/graphics/pokemon/footprints/alakazam_footprint.png b/graphics/pokemon/alakazam/footprint.png
index e3c3795cf..e3c3795cf 100644
--- a/graphics/pokemon/footprints/alakazam_footprint.png
+++ b/graphics/pokemon/alakazam/footprint.png
diff --git a/graphics/pokemon/front_pics/alakazam_still_front_pic.png b/graphics/pokemon/alakazam/front.png
index d0c45a230..d0c45a230 100644
--- a/graphics/pokemon/front_pics/alakazam_still_front_pic.png
+++ b/graphics/pokemon/alakazam/front.png
diff --git a/graphics/pokemon/icons/alakazam_icon.png b/graphics/pokemon/alakazam/icon.png
index f15231469..f15231469 100644
--- a/graphics/pokemon/icons/alakazam_icon.png
+++ b/graphics/pokemon/alakazam/icon.png
diff --git a/graphics/pokemon/palettes/alakazam_palette.pal b/graphics/pokemon/alakazam/normal.pal
index 0617af6a5..0617af6a5 100644
--- a/graphics/pokemon/palettes/alakazam_palette.pal
+++ b/graphics/pokemon/alakazam/normal.pal
diff --git a/graphics/pokemon/palettes/alakazam_shiny_palette.pal b/graphics/pokemon/alakazam/shiny.pal
index 083ce6897..083ce6897 100644
--- a/graphics/pokemon/palettes/alakazam_shiny_palette.pal
+++ b/graphics/pokemon/alakazam/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/altaria_front_pic.png b/graphics/pokemon/altaria/anim_front.png
index ff00eaa72..ff00eaa72 100644
--- a/graphics/pokemon/anim_front_pics/altaria_front_pic.png
+++ b/graphics/pokemon/altaria/anim_front.png
diff --git a/graphics/pokemon/back_pics/altaria_back_pic.png b/graphics/pokemon/altaria/back.png
index b224676be..b224676be 100644
--- a/graphics/pokemon/back_pics/altaria_back_pic.png
+++ b/graphics/pokemon/altaria/back.png
diff --git a/graphics/pokemon/footprints/altaria_footprint.png b/graphics/pokemon/altaria/footprint.png
index 6c65deae5..6c65deae5 100644
--- a/graphics/pokemon/footprints/altaria_footprint.png
+++ b/graphics/pokemon/altaria/footprint.png
diff --git a/graphics/pokemon/front_pics/altaria_still_front_pic.png b/graphics/pokemon/altaria/front.png
index 8b45828a2..8b45828a2 100644
--- a/graphics/pokemon/front_pics/altaria_still_front_pic.png
+++ b/graphics/pokemon/altaria/front.png
diff --git a/graphics/pokemon/icons/altaria_icon.png b/graphics/pokemon/altaria/icon.png
index 300dfec82..300dfec82 100644
--- a/graphics/pokemon/icons/altaria_icon.png
+++ b/graphics/pokemon/altaria/icon.png
diff --git a/graphics/pokemon/palettes/altaria_palette.pal b/graphics/pokemon/altaria/normal.pal
index d7af0b531..d7af0b531 100644
--- a/graphics/pokemon/palettes/altaria_palette.pal
+++ b/graphics/pokemon/altaria/normal.pal
diff --git a/graphics/pokemon/palettes/altaria_shiny_palette.pal b/graphics/pokemon/altaria/shiny.pal
index 0ebea146a..0ebea146a 100644
--- a/graphics/pokemon/palettes/altaria_shiny_palette.pal
+++ b/graphics/pokemon/altaria/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ampharos_front_pic.png b/graphics/pokemon/ampharos/anim_front.png
index cf0558411..cf0558411 100644
--- a/graphics/pokemon/anim_front_pics/ampharos_front_pic.png
+++ b/graphics/pokemon/ampharos/anim_front.png
diff --git a/graphics/pokemon/back_pics/ampharos_back_pic.png b/graphics/pokemon/ampharos/back.png
index 2e7c2399e..2e7c2399e 100644
--- a/graphics/pokemon/back_pics/ampharos_back_pic.png
+++ b/graphics/pokemon/ampharos/back.png
diff --git a/graphics/pokemon/footprints/ampharos_footprint.png b/graphics/pokemon/ampharos/footprint.png
index bfc2f8034..bfc2f8034 100644
--- a/graphics/pokemon/footprints/ampharos_footprint.png
+++ b/graphics/pokemon/ampharos/footprint.png
diff --git a/graphics/pokemon/front_pics/ampharos_still_front_pic.png b/graphics/pokemon/ampharos/front.png
index cc4956afb..cc4956afb 100644
--- a/graphics/pokemon/front_pics/ampharos_still_front_pic.png
+++ b/graphics/pokemon/ampharos/front.png
diff --git a/graphics/pokemon/icons/ampharos_icon.png b/graphics/pokemon/ampharos/icon.png
index d7a3f9e70..d7a3f9e70 100644
--- a/graphics/pokemon/icons/ampharos_icon.png
+++ b/graphics/pokemon/ampharos/icon.png
diff --git a/graphics/pokemon/palettes/ampharos_palette.pal b/graphics/pokemon/ampharos/normal.pal
index f7fdd3683..f7fdd3683 100644
--- a/graphics/pokemon/palettes/ampharos_palette.pal
+++ b/graphics/pokemon/ampharos/normal.pal
diff --git a/graphics/pokemon/palettes/ampharos_shiny_palette.pal b/graphics/pokemon/ampharos/shiny.pal
index f29dc710f..f29dc710f 100644
--- a/graphics/pokemon/palettes/ampharos_shiny_palette.pal
+++ b/graphics/pokemon/ampharos/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/anorith_front_pic.png b/graphics/pokemon/anorith/anim_front.png
index 17d439d83..17d439d83 100644
--- a/graphics/pokemon/anim_front_pics/anorith_front_pic.png
+++ b/graphics/pokemon/anorith/anim_front.png
diff --git a/graphics/pokemon/back_pics/anorith_back_pic.png b/graphics/pokemon/anorith/back.png
index 0f9c0efc0..0f9c0efc0 100644
--- a/graphics/pokemon/back_pics/anorith_back_pic.png
+++ b/graphics/pokemon/anorith/back.png
diff --git a/graphics/pokemon/footprints/anorith_footprint.png b/graphics/pokemon/anorith/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/anorith_footprint.png
+++ b/graphics/pokemon/anorith/footprint.png
diff --git a/graphics/pokemon/front_pics/anorith_still_front_pic.png b/graphics/pokemon/anorith/front.png
index 425ff4c0d..425ff4c0d 100644
--- a/graphics/pokemon/front_pics/anorith_still_front_pic.png
+++ b/graphics/pokemon/anorith/front.png
diff --git a/graphics/pokemon/icons/anorith_icon.png b/graphics/pokemon/anorith/icon.png
index 936355d61..936355d61 100644
--- a/graphics/pokemon/icons/anorith_icon.png
+++ b/graphics/pokemon/anorith/icon.png
diff --git a/graphics/pokemon/palettes/anorith_palette.pal b/graphics/pokemon/anorith/normal.pal
index 01bb5c13f..01bb5c13f 100644
--- a/graphics/pokemon/palettes/anorith_palette.pal
+++ b/graphics/pokemon/anorith/normal.pal
diff --git a/graphics/pokemon/palettes/anorith_shiny_palette.pal b/graphics/pokemon/anorith/shiny.pal
index dc1fe0374..dc1fe0374 100644
--- a/graphics/pokemon/palettes/anorith_shiny_palette.pal
+++ b/graphics/pokemon/anorith/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/arbok_front_pic.png b/graphics/pokemon/arbok/anim_front.png
index 98ca8aab2..98ca8aab2 100644
--- a/graphics/pokemon/anim_front_pics/arbok_front_pic.png
+++ b/graphics/pokemon/arbok/anim_front.png
diff --git a/graphics/pokemon/back_pics/arbok_back_pic.png b/graphics/pokemon/arbok/back.png
index 7984d422e..7984d422e 100644
--- a/graphics/pokemon/back_pics/arbok_back_pic.png
+++ b/graphics/pokemon/arbok/back.png
diff --git a/graphics/pokemon/footprints/arbok_footprint.png b/graphics/pokemon/arbok/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/arbok_footprint.png
+++ b/graphics/pokemon/arbok/footprint.png
diff --git a/graphics/pokemon/front_pics/arbok_still_front_pic.png b/graphics/pokemon/arbok/front.png
index 89c8d548b..89c8d548b 100644
--- a/graphics/pokemon/front_pics/arbok_still_front_pic.png
+++ b/graphics/pokemon/arbok/front.png
diff --git a/graphics/pokemon/icons/arbok_icon.png b/graphics/pokemon/arbok/icon.png
index 8967d44a6..8967d44a6 100644
--- a/graphics/pokemon/icons/arbok_icon.png
+++ b/graphics/pokemon/arbok/icon.png
diff --git a/graphics/pokemon/palettes/arbok_palette.pal b/graphics/pokemon/arbok/normal.pal
index afd5a0a16..afd5a0a16 100644
--- a/graphics/pokemon/palettes/arbok_palette.pal
+++ b/graphics/pokemon/arbok/normal.pal
diff --git a/graphics/pokemon/palettes/arbok_shiny_palette.pal b/graphics/pokemon/arbok/shiny.pal
index 6c88ffb42..6c88ffb42 100644
--- a/graphics/pokemon/palettes/arbok_shiny_palette.pal
+++ b/graphics/pokemon/arbok/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/arcanine_front_pic.png b/graphics/pokemon/arcanine/anim_front.png
index d955b812f..d955b812f 100644
--- a/graphics/pokemon/anim_front_pics/arcanine_front_pic.png
+++ b/graphics/pokemon/arcanine/anim_front.png
diff --git a/graphics/pokemon/back_pics/arcanine_back_pic.png b/graphics/pokemon/arcanine/back.png
index 1b0840c8a..1b0840c8a 100644
--- a/graphics/pokemon/back_pics/arcanine_back_pic.png
+++ b/graphics/pokemon/arcanine/back.png
diff --git a/graphics/pokemon/footprints/arcanine_footprint.png b/graphics/pokemon/arcanine/footprint.png
index 96b7f93ae..96b7f93ae 100644
--- a/graphics/pokemon/footprints/arcanine_footprint.png
+++ b/graphics/pokemon/arcanine/footprint.png
diff --git a/graphics/pokemon/front_pics/arcanine_still_front_pic.png b/graphics/pokemon/arcanine/front.png
index fb943a5d3..fb943a5d3 100644
--- a/graphics/pokemon/front_pics/arcanine_still_front_pic.png
+++ b/graphics/pokemon/arcanine/front.png
diff --git a/graphics/pokemon/icons/arcanine_icon.png b/graphics/pokemon/arcanine/icon.png
index 3fed9199a..3fed9199a 100644
--- a/graphics/pokemon/icons/arcanine_icon.png
+++ b/graphics/pokemon/arcanine/icon.png
diff --git a/graphics/pokemon/palettes/arcanine_palette.pal b/graphics/pokemon/arcanine/normal.pal
index 46135bf32..46135bf32 100644
--- a/graphics/pokemon/palettes/arcanine_palette.pal
+++ b/graphics/pokemon/arcanine/normal.pal
diff --git a/graphics/pokemon/palettes/arcanine_shiny_palette.pal b/graphics/pokemon/arcanine/shiny.pal
index 99edcb435..99edcb435 100644
--- a/graphics/pokemon/palettes/arcanine_shiny_palette.pal
+++ b/graphics/pokemon/arcanine/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ariados_front_pic.png b/graphics/pokemon/ariados/anim_front.png
index 9fdd51362..9fdd51362 100644
--- a/graphics/pokemon/anim_front_pics/ariados_front_pic.png
+++ b/graphics/pokemon/ariados/anim_front.png
diff --git a/graphics/pokemon/back_pics/ariados_back_pic.png b/graphics/pokemon/ariados/back.png
index b677b7222..b677b7222 100644
--- a/graphics/pokemon/back_pics/ariados_back_pic.png
+++ b/graphics/pokemon/ariados/back.png
diff --git a/graphics/pokemon/footprints/ariados_footprint.png b/graphics/pokemon/ariados/footprint.png
index cee3b1ba5..cee3b1ba5 100644
--- a/graphics/pokemon/footprints/ariados_footprint.png
+++ b/graphics/pokemon/ariados/footprint.png
diff --git a/graphics/pokemon/front_pics/ariados_still_front_pic.png b/graphics/pokemon/ariados/front.png
index 07bc4a4db..07bc4a4db 100644
--- a/graphics/pokemon/front_pics/ariados_still_front_pic.png
+++ b/graphics/pokemon/ariados/front.png
diff --git a/graphics/pokemon/icons/ariados_icon.png b/graphics/pokemon/ariados/icon.png
index 4284968f2..4284968f2 100644
--- a/graphics/pokemon/icons/ariados_icon.png
+++ b/graphics/pokemon/ariados/icon.png
diff --git a/graphics/pokemon/palettes/ariados_palette.pal b/graphics/pokemon/ariados/normal.pal
index ccf5f7fe7..ccf5f7fe7 100644
--- a/graphics/pokemon/palettes/ariados_palette.pal
+++ b/graphics/pokemon/ariados/normal.pal
diff --git a/graphics/pokemon/palettes/ariados_shiny_palette.pal b/graphics/pokemon/ariados/shiny.pal
index c2557b589..c2557b589 100644
--- a/graphics/pokemon/palettes/ariados_shiny_palette.pal
+++ b/graphics/pokemon/ariados/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/armaldo_front_pic.png b/graphics/pokemon/armaldo/anim_front.png
index 8f07191fb..8f07191fb 100644
--- a/graphics/pokemon/anim_front_pics/armaldo_front_pic.png
+++ b/graphics/pokemon/armaldo/anim_front.png
diff --git a/graphics/pokemon/back_pics/armaldo_back_pic.png b/graphics/pokemon/armaldo/back.png
index 23c8c7113..23c8c7113 100644
--- a/graphics/pokemon/back_pics/armaldo_back_pic.png
+++ b/graphics/pokemon/armaldo/back.png
diff --git a/graphics/pokemon/footprints/armaldo_footprint.png b/graphics/pokemon/armaldo/footprint.png
index d12d2e42c..d12d2e42c 100644
--- a/graphics/pokemon/footprints/armaldo_footprint.png
+++ b/graphics/pokemon/armaldo/footprint.png
diff --git a/graphics/pokemon/front_pics/armaldo_still_front_pic.png b/graphics/pokemon/armaldo/front.png
index 01b7ee08b..01b7ee08b 100644
--- a/graphics/pokemon/front_pics/armaldo_still_front_pic.png
+++ b/graphics/pokemon/armaldo/front.png
diff --git a/graphics/pokemon/icons/armaldo_icon.png b/graphics/pokemon/armaldo/icon.png
index ed3bb65f2..ed3bb65f2 100644
--- a/graphics/pokemon/icons/armaldo_icon.png
+++ b/graphics/pokemon/armaldo/icon.png
diff --git a/graphics/pokemon/palettes/armaldo_palette.pal b/graphics/pokemon/armaldo/normal.pal
index a6fc406b3..a6fc406b3 100644
--- a/graphics/pokemon/palettes/armaldo_palette.pal
+++ b/graphics/pokemon/armaldo/normal.pal
diff --git a/graphics/pokemon/palettes/armaldo_shiny_palette.pal b/graphics/pokemon/armaldo/shiny.pal
index e6d09d611..e6d09d611 100644
--- a/graphics/pokemon/palettes/armaldo_shiny_palette.pal
+++ b/graphics/pokemon/armaldo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/aron_front_pic.png b/graphics/pokemon/aron/anim_front.png
index 928d118f0..928d118f0 100644
--- a/graphics/pokemon/anim_front_pics/aron_front_pic.png
+++ b/graphics/pokemon/aron/anim_front.png
diff --git a/graphics/pokemon/back_pics/aron_back_pic.png b/graphics/pokemon/aron/back.png
index 330d46c42..330d46c42 100644
--- a/graphics/pokemon/back_pics/aron_back_pic.png
+++ b/graphics/pokemon/aron/back.png
diff --git a/graphics/pokemon/footprints/aron_footprint.png b/graphics/pokemon/aron/footprint.png
index fe53cb5eb..fe53cb5eb 100644
--- a/graphics/pokemon/footprints/aron_footprint.png
+++ b/graphics/pokemon/aron/footprint.png
diff --git a/graphics/pokemon/front_pics/aron_still_front_pic.png b/graphics/pokemon/aron/front.png
index f3764ec2b..f3764ec2b 100644
--- a/graphics/pokemon/front_pics/aron_still_front_pic.png
+++ b/graphics/pokemon/aron/front.png
diff --git a/graphics/pokemon/icons/aron_icon.png b/graphics/pokemon/aron/icon.png
index 547846374..547846374 100644
--- a/graphics/pokemon/icons/aron_icon.png
+++ b/graphics/pokemon/aron/icon.png
diff --git a/graphics/pokemon/palettes/aron_palette.pal b/graphics/pokemon/aron/normal.pal
index b5711fdad..b5711fdad 100644
--- a/graphics/pokemon/palettes/aron_palette.pal
+++ b/graphics/pokemon/aron/normal.pal
diff --git a/graphics/pokemon/palettes/aron_shiny_palette.pal b/graphics/pokemon/aron/shiny.pal
index eadb9aa81..eadb9aa81 100644
--- a/graphics/pokemon/palettes/aron_shiny_palette.pal
+++ b/graphics/pokemon/aron/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/articuno_front_pic.png b/graphics/pokemon/articuno/anim_front.png
index 3e92cc8b3..3e92cc8b3 100644
--- a/graphics/pokemon/anim_front_pics/articuno_front_pic.png
+++ b/graphics/pokemon/articuno/anim_front.png
diff --git a/graphics/pokemon/back_pics/articuno_back_pic.png b/graphics/pokemon/articuno/back.png
index 7e06ba84e..7e06ba84e 100644
--- a/graphics/pokemon/back_pics/articuno_back_pic.png
+++ b/graphics/pokemon/articuno/back.png
diff --git a/graphics/pokemon/footprints/articuno_footprint.png b/graphics/pokemon/articuno/footprint.png
index e6e4fa9ef..e6e4fa9ef 100644
--- a/graphics/pokemon/footprints/articuno_footprint.png
+++ b/graphics/pokemon/articuno/footprint.png
diff --git a/graphics/pokemon/front_pics/articuno_still_front_pic.png b/graphics/pokemon/articuno/front.png
index e3c87eb9a..e3c87eb9a 100644
--- a/graphics/pokemon/front_pics/articuno_still_front_pic.png
+++ b/graphics/pokemon/articuno/front.png
diff --git a/graphics/pokemon/icons/articuno_icon.png b/graphics/pokemon/articuno/icon.png
index e2f19f133..e2f19f133 100644
--- a/graphics/pokemon/icons/articuno_icon.png
+++ b/graphics/pokemon/articuno/icon.png
diff --git a/graphics/pokemon/palettes/articuno_palette.pal b/graphics/pokemon/articuno/normal.pal
index 4dafc1203..4dafc1203 100644
--- a/graphics/pokemon/palettes/articuno_palette.pal
+++ b/graphics/pokemon/articuno/normal.pal
diff --git a/graphics/pokemon/palettes/articuno_shiny_palette.pal b/graphics/pokemon/articuno/shiny.pal
index bb1ccfa81..bb1ccfa81 100644
--- a/graphics/pokemon/palettes/articuno_shiny_palette.pal
+++ b/graphics/pokemon/articuno/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/azumarill_front_pic.png b/graphics/pokemon/azumarill/anim_front.png
index 9097edc43..9097edc43 100644
--- a/graphics/pokemon/anim_front_pics/azumarill_front_pic.png
+++ b/graphics/pokemon/azumarill/anim_front.png
diff --git a/graphics/pokemon/back_pics/azumarill_back_pic.png b/graphics/pokemon/azumarill/back.png
index ca59011c6..ca59011c6 100644
--- a/graphics/pokemon/back_pics/azumarill_back_pic.png
+++ b/graphics/pokemon/azumarill/back.png
diff --git a/graphics/pokemon/footprints/azumarill_footprint.png b/graphics/pokemon/azumarill/footprint.png
index 904bf941c..904bf941c 100644
--- a/graphics/pokemon/footprints/azumarill_footprint.png
+++ b/graphics/pokemon/azumarill/footprint.png
diff --git a/graphics/pokemon/front_pics/azumarill_still_front_pic.png b/graphics/pokemon/azumarill/front.png
index feb172d52..feb172d52 100644
--- a/graphics/pokemon/front_pics/azumarill_still_front_pic.png
+++ b/graphics/pokemon/azumarill/front.png
diff --git a/graphics/pokemon/icons/azumarill_icon.png b/graphics/pokemon/azumarill/icon.png
index f41d53d2c..f41d53d2c 100644
--- a/graphics/pokemon/icons/azumarill_icon.png
+++ b/graphics/pokemon/azumarill/icon.png
diff --git a/graphics/pokemon/palettes/azumarill_palette.pal b/graphics/pokemon/azumarill/normal.pal
index 429d3fecc..429d3fecc 100644
--- a/graphics/pokemon/palettes/azumarill_palette.pal
+++ b/graphics/pokemon/azumarill/normal.pal
diff --git a/graphics/pokemon/palettes/azumarill_shiny_palette.pal b/graphics/pokemon/azumarill/shiny.pal
index 5f185cecb..5f185cecb 100644
--- a/graphics/pokemon/palettes/azumarill_shiny_palette.pal
+++ b/graphics/pokemon/azumarill/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/azurill_front_pic.png b/graphics/pokemon/azurill/anim_front.png
index 212454b4e..212454b4e 100644
--- a/graphics/pokemon/anim_front_pics/azurill_front_pic.png
+++ b/graphics/pokemon/azurill/anim_front.png
diff --git a/graphics/pokemon/back_pics/azurill_back_pic.png b/graphics/pokemon/azurill/back.png
index cf10bded4..cf10bded4 100644
--- a/graphics/pokemon/back_pics/azurill_back_pic.png
+++ b/graphics/pokemon/azurill/back.png
diff --git a/graphics/pokemon/footprints/azurill_footprint.png b/graphics/pokemon/azurill/footprint.png
index 60db8e03b..60db8e03b 100644
--- a/graphics/pokemon/footprints/azurill_footprint.png
+++ b/graphics/pokemon/azurill/footprint.png
diff --git a/graphics/pokemon/front_pics/azurill_still_front_pic.png b/graphics/pokemon/azurill/front.png
index 02cc79a6c..02cc79a6c 100644
--- a/graphics/pokemon/front_pics/azurill_still_front_pic.png
+++ b/graphics/pokemon/azurill/front.png
diff --git a/graphics/pokemon/icons/azurill_icon.png b/graphics/pokemon/azurill/icon.png
index b69acc7fd..b69acc7fd 100644
--- a/graphics/pokemon/icons/azurill_icon.png
+++ b/graphics/pokemon/azurill/icon.png
diff --git a/graphics/pokemon/palettes/azurill_palette.pal b/graphics/pokemon/azurill/normal.pal
index 44214498f..44214498f 100644
--- a/graphics/pokemon/palettes/azurill_palette.pal
+++ b/graphics/pokemon/azurill/normal.pal
diff --git a/graphics/pokemon/palettes/azurill_shiny_palette.pal b/graphics/pokemon/azurill/shiny.pal
index bbc8d2f29..bbc8d2f29 100644
--- a/graphics/pokemon/palettes/azurill_shiny_palette.pal
+++ b/graphics/pokemon/azurill/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/bagon_front_pic.png b/graphics/pokemon/bagon/anim_front.png
index dfcae12bb..dfcae12bb 100644
--- a/graphics/pokemon/anim_front_pics/bagon_front_pic.png
+++ b/graphics/pokemon/bagon/anim_front.png
diff --git a/graphics/pokemon/back_pics/bagon_back_pic.png b/graphics/pokemon/bagon/back.png
index 0a058d768..0a058d768 100644
--- a/graphics/pokemon/back_pics/bagon_back_pic.png
+++ b/graphics/pokemon/bagon/back.png
diff --git a/graphics/pokemon/footprints/bagon_footprint.png b/graphics/pokemon/bagon/footprint.png
index 9a93a7564..9a93a7564 100644
--- a/graphics/pokemon/footprints/bagon_footprint.png
+++ b/graphics/pokemon/bagon/footprint.png
diff --git a/graphics/pokemon/front_pics/bagon_still_front_pic.png b/graphics/pokemon/bagon/front.png
index 259872b72..259872b72 100644
--- a/graphics/pokemon/front_pics/bagon_still_front_pic.png
+++ b/graphics/pokemon/bagon/front.png
diff --git a/graphics/pokemon/icons/bagon_icon.png b/graphics/pokemon/bagon/icon.png
index cc3af423f..cc3af423f 100644
--- a/graphics/pokemon/icons/bagon_icon.png
+++ b/graphics/pokemon/bagon/icon.png
diff --git a/graphics/pokemon/palettes/bagon_palette.pal b/graphics/pokemon/bagon/normal.pal
index c71cdb94b..c71cdb94b 100644
--- a/graphics/pokemon/palettes/bagon_palette.pal
+++ b/graphics/pokemon/bagon/normal.pal
diff --git a/graphics/pokemon/palettes/bagon_shiny_palette.pal b/graphics/pokemon/bagon/shiny.pal
index 6cd8ce5ea..6cd8ce5ea 100644
--- a/graphics/pokemon/palettes/bagon_shiny_palette.pal
+++ b/graphics/pokemon/bagon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/baltoy_front_pic.png b/graphics/pokemon/baltoy/anim_front.png
index 94e7fc2c7..94e7fc2c7 100644
--- a/graphics/pokemon/anim_front_pics/baltoy_front_pic.png
+++ b/graphics/pokemon/baltoy/anim_front.png
diff --git a/graphics/pokemon/back_pics/baltoy_back_pic.png b/graphics/pokemon/baltoy/back.png
index a8d124481..a8d124481 100644
--- a/graphics/pokemon/back_pics/baltoy_back_pic.png
+++ b/graphics/pokemon/baltoy/back.png
diff --git a/graphics/pokemon/footprints/baltoy_footprint.png b/graphics/pokemon/baltoy/footprint.png
index 6965dbe60..6965dbe60 100644
--- a/graphics/pokemon/footprints/baltoy_footprint.png
+++ b/graphics/pokemon/baltoy/footprint.png
diff --git a/graphics/pokemon/front_pics/baltoy_still_front_pic.png b/graphics/pokemon/baltoy/front.png
index d161de265..d161de265 100644
--- a/graphics/pokemon/front_pics/baltoy_still_front_pic.png
+++ b/graphics/pokemon/baltoy/front.png
diff --git a/graphics/pokemon/icons/baltoy_icon.png b/graphics/pokemon/baltoy/icon.png
index 4ec3f35e9..4ec3f35e9 100644
--- a/graphics/pokemon/icons/baltoy_icon.png
+++ b/graphics/pokemon/baltoy/icon.png
diff --git a/graphics/pokemon/palettes/baltoy_palette.pal b/graphics/pokemon/baltoy/normal.pal
index 335657267..335657267 100644
--- a/graphics/pokemon/palettes/baltoy_palette.pal
+++ b/graphics/pokemon/baltoy/normal.pal
diff --git a/graphics/pokemon/palettes/baltoy_shiny_palette.pal b/graphics/pokemon/baltoy/shiny.pal
index 39cfa55ad..39cfa55ad 100644
--- a/graphics/pokemon/palettes/baltoy_shiny_palette.pal
+++ b/graphics/pokemon/baltoy/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/banette_front_pic.png b/graphics/pokemon/banette/anim_front.png
index 7d10d2c50..7d10d2c50 100644
--- a/graphics/pokemon/anim_front_pics/banette_front_pic.png
+++ b/graphics/pokemon/banette/anim_front.png
diff --git a/graphics/pokemon/back_pics/banette_back_pic.png b/graphics/pokemon/banette/back.png
index 3ea5f30af..3ea5f30af 100644
--- a/graphics/pokemon/back_pics/banette_back_pic.png
+++ b/graphics/pokemon/banette/back.png
diff --git a/graphics/pokemon/footprints/banette_footprint.png b/graphics/pokemon/banette/footprint.png
index a15814f2f..a15814f2f 100644
--- a/graphics/pokemon/footprints/banette_footprint.png
+++ b/graphics/pokemon/banette/footprint.png
diff --git a/graphics/pokemon/front_pics/banette_still_front_pic.png b/graphics/pokemon/banette/front.png
index be02be897..be02be897 100644
--- a/graphics/pokemon/front_pics/banette_still_front_pic.png
+++ b/graphics/pokemon/banette/front.png
diff --git a/graphics/pokemon/icons/banette_icon.png b/graphics/pokemon/banette/icon.png
index 3b5cbaed1..3b5cbaed1 100644
--- a/graphics/pokemon/icons/banette_icon.png
+++ b/graphics/pokemon/banette/icon.png
diff --git a/graphics/pokemon/palettes/banette_palette.pal b/graphics/pokemon/banette/normal.pal
index cebcb7757..cebcb7757 100644
--- a/graphics/pokemon/palettes/banette_palette.pal
+++ b/graphics/pokemon/banette/normal.pal
diff --git a/graphics/pokemon/palettes/banette_shiny_palette.pal b/graphics/pokemon/banette/shiny.pal
index b6df68803..b6df68803 100644
--- a/graphics/pokemon/palettes/banette_shiny_palette.pal
+++ b/graphics/pokemon/banette/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/barboach_front_pic.png b/graphics/pokemon/barboach/anim_front.png
index c8dfda78e..c8dfda78e 100644
--- a/graphics/pokemon/anim_front_pics/barboach_front_pic.png
+++ b/graphics/pokemon/barboach/anim_front.png
diff --git a/graphics/pokemon/back_pics/barboach_back_pic.png b/graphics/pokemon/barboach/back.png
index 4fa892c53..4fa892c53 100644
--- a/graphics/pokemon/back_pics/barboach_back_pic.png
+++ b/graphics/pokemon/barboach/back.png
diff --git a/graphics/pokemon/footprints/barboach_footprint.png b/graphics/pokemon/barboach/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/barboach_footprint.png
+++ b/graphics/pokemon/barboach/footprint.png
diff --git a/graphics/pokemon/front_pics/barboach_still_front_pic.png b/graphics/pokemon/barboach/front.png
index 150e6c086..150e6c086 100644
--- a/graphics/pokemon/front_pics/barboach_still_front_pic.png
+++ b/graphics/pokemon/barboach/front.png
diff --git a/graphics/pokemon/icons/barboach_icon.png b/graphics/pokemon/barboach/icon.png
index ad874daac..ad874daac 100644
--- a/graphics/pokemon/icons/barboach_icon.png
+++ b/graphics/pokemon/barboach/icon.png
diff --git a/graphics/pokemon/palettes/barboach_palette.pal b/graphics/pokemon/barboach/normal.pal
index 20167a557..20167a557 100644
--- a/graphics/pokemon/palettes/barboach_palette.pal
+++ b/graphics/pokemon/barboach/normal.pal
diff --git a/graphics/pokemon/palettes/barboach_shiny_palette.pal b/graphics/pokemon/barboach/shiny.pal
index e29a02099..e29a02099 100644
--- a/graphics/pokemon/palettes/barboach_shiny_palette.pal
+++ b/graphics/pokemon/barboach/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/bayleef_front_pic.png b/graphics/pokemon/bayleef/anim_front.png
index aa3606d43..aa3606d43 100644
--- a/graphics/pokemon/anim_front_pics/bayleef_front_pic.png
+++ b/graphics/pokemon/bayleef/anim_front.png
diff --git a/graphics/pokemon/back_pics/bayleef_back_pic.png b/graphics/pokemon/bayleef/back.png
index 63ba17c5e..63ba17c5e 100644
--- a/graphics/pokemon/back_pics/bayleef_back_pic.png
+++ b/graphics/pokemon/bayleef/back.png
diff --git a/graphics/pokemon/footprints/bayleef_footprint.png b/graphics/pokemon/bayleef/footprint.png
index 04b375a7a..04b375a7a 100644
--- a/graphics/pokemon/footprints/bayleef_footprint.png
+++ b/graphics/pokemon/bayleef/footprint.png
diff --git a/graphics/pokemon/front_pics/bayleef_still_front_pic.png b/graphics/pokemon/bayleef/front.png
index ad6713c61..ad6713c61 100644
--- a/graphics/pokemon/front_pics/bayleef_still_front_pic.png
+++ b/graphics/pokemon/bayleef/front.png
diff --git a/graphics/pokemon/icons/bayleef_icon.png b/graphics/pokemon/bayleef/icon.png
index 47d2774d6..47d2774d6 100644
--- a/graphics/pokemon/icons/bayleef_icon.png
+++ b/graphics/pokemon/bayleef/icon.png
diff --git a/graphics/pokemon/palettes/bayleef_palette.pal b/graphics/pokemon/bayleef/normal.pal
index 9fce32009..9fce32009 100644
--- a/graphics/pokemon/palettes/bayleef_palette.pal
+++ b/graphics/pokemon/bayleef/normal.pal
diff --git a/graphics/pokemon/palettes/bayleef_shiny_palette.pal b/graphics/pokemon/bayleef/shiny.pal
index 573c02e75..573c02e75 100644
--- a/graphics/pokemon/palettes/bayleef_shiny_palette.pal
+++ b/graphics/pokemon/bayleef/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/beautifly_front_pic.png b/graphics/pokemon/beautifly/anim_front.png
index 7c1cffea8..7c1cffea8 100644
--- a/graphics/pokemon/anim_front_pics/beautifly_front_pic.png
+++ b/graphics/pokemon/beautifly/anim_front.png
diff --git a/graphics/pokemon/back_pics/beautifly_back_pic.png b/graphics/pokemon/beautifly/back.png
index 1eca6edc9..1eca6edc9 100644
--- a/graphics/pokemon/back_pics/beautifly_back_pic.png
+++ b/graphics/pokemon/beautifly/back.png
diff --git a/graphics/pokemon/footprints/beautifly_footprint.png b/graphics/pokemon/beautifly/footprint.png
index 49175cb02..49175cb02 100644
--- a/graphics/pokemon/footprints/beautifly_footprint.png
+++ b/graphics/pokemon/beautifly/footprint.png
diff --git a/graphics/pokemon/front_pics/beautifly_still_front_pic.png b/graphics/pokemon/beautifly/front.png
index 89020c63a..89020c63a 100644
--- a/graphics/pokemon/front_pics/beautifly_still_front_pic.png
+++ b/graphics/pokemon/beautifly/front.png
diff --git a/graphics/pokemon/icons/beautifly_icon.png b/graphics/pokemon/beautifly/icon.png
index 346c5c906..346c5c906 100644
--- a/graphics/pokemon/icons/beautifly_icon.png
+++ b/graphics/pokemon/beautifly/icon.png
diff --git a/graphics/pokemon/palettes/beautifly_palette.pal b/graphics/pokemon/beautifly/normal.pal
index 65a02145f..65a02145f 100644
--- a/graphics/pokemon/palettes/beautifly_palette.pal
+++ b/graphics/pokemon/beautifly/normal.pal
diff --git a/graphics/pokemon/palettes/beautifly_shiny_palette.pal b/graphics/pokemon/beautifly/shiny.pal
index 9f0418187..9f0418187 100644
--- a/graphics/pokemon/palettes/beautifly_shiny_palette.pal
+++ b/graphics/pokemon/beautifly/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/beedrill_front_pic.png b/graphics/pokemon/beedrill/anim_front.png
index 169d14812..169d14812 100644
--- a/graphics/pokemon/anim_front_pics/beedrill_front_pic.png
+++ b/graphics/pokemon/beedrill/anim_front.png
diff --git a/graphics/pokemon/back_pics/beedrill_back_pic.png b/graphics/pokemon/beedrill/back.png
index 166c399e5..166c399e5 100644
--- a/graphics/pokemon/back_pics/beedrill_back_pic.png
+++ b/graphics/pokemon/beedrill/back.png
diff --git a/graphics/pokemon/footprints/beedrill_footprint.png b/graphics/pokemon/beedrill/footprint.png
index 5c3f21090..5c3f21090 100644
--- a/graphics/pokemon/footprints/beedrill_footprint.png
+++ b/graphics/pokemon/beedrill/footprint.png
diff --git a/graphics/pokemon/front_pics/beedrill_still_front_pic.png b/graphics/pokemon/beedrill/front.png
index 477b20b2e..477b20b2e 100644
--- a/graphics/pokemon/front_pics/beedrill_still_front_pic.png
+++ b/graphics/pokemon/beedrill/front.png
diff --git a/graphics/pokemon/icons/beedrill_icon.png b/graphics/pokemon/beedrill/icon.png
index d5e6471ab..d5e6471ab 100644
--- a/graphics/pokemon/icons/beedrill_icon.png
+++ b/graphics/pokemon/beedrill/icon.png
diff --git a/graphics/pokemon/palettes/beedrill_palette.pal b/graphics/pokemon/beedrill/normal.pal
index 24c875141..24c875141 100644
--- a/graphics/pokemon/palettes/beedrill_palette.pal
+++ b/graphics/pokemon/beedrill/normal.pal
diff --git a/graphics/pokemon/palettes/beedrill_shiny_palette.pal b/graphics/pokemon/beedrill/shiny.pal
index f35f264de..f35f264de 100644
--- a/graphics/pokemon/palettes/beedrill_shiny_palette.pal
+++ b/graphics/pokemon/beedrill/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/beldum_front_pic.png b/graphics/pokemon/beldum/anim_front.png
index 85d936d3e..85d936d3e 100644
--- a/graphics/pokemon/anim_front_pics/beldum_front_pic.png
+++ b/graphics/pokemon/beldum/anim_front.png
diff --git a/graphics/pokemon/back_pics/beldum_back_pic.png b/graphics/pokemon/beldum/back.png
index 7a2cab465..7a2cab465 100644
--- a/graphics/pokemon/back_pics/beldum_back_pic.png
+++ b/graphics/pokemon/beldum/back.png
diff --git a/graphics/pokemon/footprints/beldum_footprint.png b/graphics/pokemon/beldum/footprint.png
index 0554eedfe..0554eedfe 100644
--- a/graphics/pokemon/footprints/beldum_footprint.png
+++ b/graphics/pokemon/beldum/footprint.png
diff --git a/graphics/pokemon/front_pics/beldum_still_front_pic.png b/graphics/pokemon/beldum/front.png
index 1c2a04e68..1c2a04e68 100644
--- a/graphics/pokemon/front_pics/beldum_still_front_pic.png
+++ b/graphics/pokemon/beldum/front.png
diff --git a/graphics/pokemon/icons/beldum_icon.png b/graphics/pokemon/beldum/icon.png
index 346a0469d..346a0469d 100644
--- a/graphics/pokemon/icons/beldum_icon.png
+++ b/graphics/pokemon/beldum/icon.png
diff --git a/graphics/pokemon/palettes/beldum_palette.pal b/graphics/pokemon/beldum/normal.pal
index 41b48bc08..41b48bc08 100644
--- a/graphics/pokemon/palettes/beldum_palette.pal
+++ b/graphics/pokemon/beldum/normal.pal
diff --git a/graphics/pokemon/palettes/beldum_shiny_palette.pal b/graphics/pokemon/beldum/shiny.pal
index 8fc3bc4be..8fc3bc4be 100644
--- a/graphics/pokemon/palettes/beldum_shiny_palette.pal
+++ b/graphics/pokemon/beldum/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/bellossom_front_pic.png b/graphics/pokemon/bellossom/anim_front.png
index 1549e692b..1549e692b 100644
--- a/graphics/pokemon/anim_front_pics/bellossom_front_pic.png
+++ b/graphics/pokemon/bellossom/anim_front.png
diff --git a/graphics/pokemon/back_pics/bellossom_back_pic.png b/graphics/pokemon/bellossom/back.png
index 2bd8b176e..2bd8b176e 100644
--- a/graphics/pokemon/back_pics/bellossom_back_pic.png
+++ b/graphics/pokemon/bellossom/back.png
diff --git a/graphics/pokemon/footprints/bellossom_footprint.png b/graphics/pokemon/bellossom/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/bellossom_footprint.png
+++ b/graphics/pokemon/bellossom/footprint.png
diff --git a/graphics/pokemon/front_pics/bellossom_still_front_pic.png b/graphics/pokemon/bellossom/front.png
index 11ec4a08c..11ec4a08c 100644
--- a/graphics/pokemon/front_pics/bellossom_still_front_pic.png
+++ b/graphics/pokemon/bellossom/front.png
diff --git a/graphics/pokemon/icons/bellossom_icon.png b/graphics/pokemon/bellossom/icon.png
index 443d7a98c..443d7a98c 100644
--- a/graphics/pokemon/icons/bellossom_icon.png
+++ b/graphics/pokemon/bellossom/icon.png
diff --git a/graphics/pokemon/palettes/bellossom_palette.pal b/graphics/pokemon/bellossom/normal.pal
index 7b0591a62..7b0591a62 100644
--- a/graphics/pokemon/palettes/bellossom_palette.pal
+++ b/graphics/pokemon/bellossom/normal.pal
diff --git a/graphics/pokemon/palettes/bellossom_shiny_palette.pal b/graphics/pokemon/bellossom/shiny.pal
index 1f10af6fb..1f10af6fb 100644
--- a/graphics/pokemon/palettes/bellossom_shiny_palette.pal
+++ b/graphics/pokemon/bellossom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/bellsprout_front_pic.png b/graphics/pokemon/bellsprout/anim_front.png
index 3fb2689a2..3fb2689a2 100644
--- a/graphics/pokemon/anim_front_pics/bellsprout_front_pic.png
+++ b/graphics/pokemon/bellsprout/anim_front.png
diff --git a/graphics/pokemon/back_pics/bellsprout_back_pic.png b/graphics/pokemon/bellsprout/back.png
index e2a336696..e2a336696 100644
--- a/graphics/pokemon/back_pics/bellsprout_back_pic.png
+++ b/graphics/pokemon/bellsprout/back.png
diff --git a/graphics/pokemon/footprints/bellsprout_footprint.png b/graphics/pokemon/bellsprout/footprint.png
index 8fcf4f4f4..8fcf4f4f4 100644
--- a/graphics/pokemon/footprints/bellsprout_footprint.png
+++ b/graphics/pokemon/bellsprout/footprint.png
diff --git a/graphics/pokemon/front_pics/bellsprout_still_front_pic.png b/graphics/pokemon/bellsprout/front.png
index b3a494b03..b3a494b03 100644
--- a/graphics/pokemon/front_pics/bellsprout_still_front_pic.png
+++ b/graphics/pokemon/bellsprout/front.png
diff --git a/graphics/pokemon/icons/bellsprout_icon.png b/graphics/pokemon/bellsprout/icon.png
index f67c94eec..f67c94eec 100644
--- a/graphics/pokemon/icons/bellsprout_icon.png
+++ b/graphics/pokemon/bellsprout/icon.png
diff --git a/graphics/pokemon/palettes/bellsprout_palette.pal b/graphics/pokemon/bellsprout/normal.pal
index 88ab00230..88ab00230 100644
--- a/graphics/pokemon/palettes/bellsprout_palette.pal
+++ b/graphics/pokemon/bellsprout/normal.pal
diff --git a/graphics/pokemon/palettes/bellsprout_shiny_palette.pal b/graphics/pokemon/bellsprout/shiny.pal
index 6a813078f..6a813078f 100644
--- a/graphics/pokemon/palettes/bellsprout_shiny_palette.pal
+++ b/graphics/pokemon/bellsprout/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/blastoise_front_pic.png b/graphics/pokemon/blastoise/anim_front.png
index 68b8bd7dd..68b8bd7dd 100644
--- a/graphics/pokemon/anim_front_pics/blastoise_front_pic.png
+++ b/graphics/pokemon/blastoise/anim_front.png
diff --git a/graphics/pokemon/back_pics/blastoise_back_pic.png b/graphics/pokemon/blastoise/back.png
index abb14e565..abb14e565 100644
--- a/graphics/pokemon/back_pics/blastoise_back_pic.png
+++ b/graphics/pokemon/blastoise/back.png
diff --git a/graphics/pokemon/footprints/blastoise_footprint.png b/graphics/pokemon/blastoise/footprint.png
index b881f9270..b881f9270 100644
--- a/graphics/pokemon/footprints/blastoise_footprint.png
+++ b/graphics/pokemon/blastoise/footprint.png
diff --git a/graphics/pokemon/front_pics/blastoise_still_front_pic.png b/graphics/pokemon/blastoise/front.png
index 060cec2f9..060cec2f9 100644
--- a/graphics/pokemon/front_pics/blastoise_still_front_pic.png
+++ b/graphics/pokemon/blastoise/front.png
diff --git a/graphics/pokemon/icons/blastoise_icon.png b/graphics/pokemon/blastoise/icon.png
index 253d4f8da..253d4f8da 100644
--- a/graphics/pokemon/icons/blastoise_icon.png
+++ b/graphics/pokemon/blastoise/icon.png
diff --git a/graphics/pokemon/palettes/blastoise_palette.pal b/graphics/pokemon/blastoise/normal.pal
index 632bbc021..632bbc021 100644
--- a/graphics/pokemon/palettes/blastoise_palette.pal
+++ b/graphics/pokemon/blastoise/normal.pal
diff --git a/graphics/pokemon/palettes/blastoise_shiny_palette.pal b/graphics/pokemon/blastoise/shiny.pal
index d0547a706..d0547a706 100644
--- a/graphics/pokemon/palettes/blastoise_shiny_palette.pal
+++ b/graphics/pokemon/blastoise/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/blaziken_front_pic.png b/graphics/pokemon/blaziken/anim_front.png
index 8639d034c..8639d034c 100644
--- a/graphics/pokemon/anim_front_pics/blaziken_front_pic.png
+++ b/graphics/pokemon/blaziken/anim_front.png
diff --git a/graphics/pokemon/back_pics/blaziken_back_pic.png b/graphics/pokemon/blaziken/back.png
index cf89544c1..cf89544c1 100644
--- a/graphics/pokemon/back_pics/blaziken_back_pic.png
+++ b/graphics/pokemon/blaziken/back.png
diff --git a/graphics/pokemon/footprints/blaziken_footprint.png b/graphics/pokemon/blaziken/footprint.png
index cf18a353a..cf18a353a 100644
--- a/graphics/pokemon/footprints/blaziken_footprint.png
+++ b/graphics/pokemon/blaziken/footprint.png
diff --git a/graphics/pokemon/front_pics/blaziken_still_front_pic.png b/graphics/pokemon/blaziken/front.png
index 7c8721171..7c8721171 100644
--- a/graphics/pokemon/front_pics/blaziken_still_front_pic.png
+++ b/graphics/pokemon/blaziken/front.png
diff --git a/graphics/pokemon/icons/blaziken_icon.png b/graphics/pokemon/blaziken/icon.png
index 6197cce23..6197cce23 100644
--- a/graphics/pokemon/icons/blaziken_icon.png
+++ b/graphics/pokemon/blaziken/icon.png
diff --git a/graphics/pokemon/palettes/blaziken_palette.pal b/graphics/pokemon/blaziken/normal.pal
index 64aaed794..64aaed794 100644
--- a/graphics/pokemon/palettes/blaziken_palette.pal
+++ b/graphics/pokemon/blaziken/normal.pal
diff --git a/graphics/pokemon/palettes/blaziken_shiny_palette.pal b/graphics/pokemon/blaziken/shiny.pal
index fea29cce8..fea29cce8 100644
--- a/graphics/pokemon/palettes/blaziken_shiny_palette.pal
+++ b/graphics/pokemon/blaziken/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/blissey_front_pic.png b/graphics/pokemon/blissey/anim_front.png
index 5692e36b2..5692e36b2 100644
--- a/graphics/pokemon/anim_front_pics/blissey_front_pic.png
+++ b/graphics/pokemon/blissey/anim_front.png
diff --git a/graphics/pokemon/back_pics/blissey_back_pic.png b/graphics/pokemon/blissey/back.png
index 9823bd994..9823bd994 100644
--- a/graphics/pokemon/back_pics/blissey_back_pic.png
+++ b/graphics/pokemon/blissey/back.png
diff --git a/graphics/pokemon/footprints/blissey_footprint.png b/graphics/pokemon/blissey/footprint.png
index 3da3dbf93..3da3dbf93 100644
--- a/graphics/pokemon/footprints/blissey_footprint.png
+++ b/graphics/pokemon/blissey/footprint.png
diff --git a/graphics/pokemon/front_pics/blissey_still_front_pic.png b/graphics/pokemon/blissey/front.png
index 3173f820c..3173f820c 100644
--- a/graphics/pokemon/front_pics/blissey_still_front_pic.png
+++ b/graphics/pokemon/blissey/front.png
diff --git a/graphics/pokemon/icons/blissey_icon.png b/graphics/pokemon/blissey/icon.png
index 44af9704c..44af9704c 100644
--- a/graphics/pokemon/icons/blissey_icon.png
+++ b/graphics/pokemon/blissey/icon.png
diff --git a/graphics/pokemon/palettes/blissey_palette.pal b/graphics/pokemon/blissey/normal.pal
index edeacbdaa..edeacbdaa 100644
--- a/graphics/pokemon/palettes/blissey_palette.pal
+++ b/graphics/pokemon/blissey/normal.pal
diff --git a/graphics/pokemon/palettes/blissey_shiny_palette.pal b/graphics/pokemon/blissey/shiny.pal
index d6d75db9e..d6d75db9e 100644
--- a/graphics/pokemon/palettes/blissey_shiny_palette.pal
+++ b/graphics/pokemon/blissey/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/breloom_front_pic.png b/graphics/pokemon/breloom/anim_front.png
index e4d7aab2f..e4d7aab2f 100644
--- a/graphics/pokemon/anim_front_pics/breloom_front_pic.png
+++ b/graphics/pokemon/breloom/anim_front.png
diff --git a/graphics/pokemon/back_pics/breloom_back_pic.png b/graphics/pokemon/breloom/back.png
index 85df08040..85df08040 100644
--- a/graphics/pokemon/back_pics/breloom_back_pic.png
+++ b/graphics/pokemon/breloom/back.png
diff --git a/graphics/pokemon/footprints/breloom_footprint.png b/graphics/pokemon/breloom/footprint.png
index 98d920669..98d920669 100644
--- a/graphics/pokemon/footprints/breloom_footprint.png
+++ b/graphics/pokemon/breloom/footprint.png
diff --git a/graphics/pokemon/front_pics/breloom_still_front_pic.png b/graphics/pokemon/breloom/front.png
index 932fdbad8..932fdbad8 100644
--- a/graphics/pokemon/front_pics/breloom_still_front_pic.png
+++ b/graphics/pokemon/breloom/front.png
diff --git a/graphics/pokemon/icons/breloom_icon.png b/graphics/pokemon/breloom/icon.png
index 314873a27..314873a27 100644
--- a/graphics/pokemon/icons/breloom_icon.png
+++ b/graphics/pokemon/breloom/icon.png
diff --git a/graphics/pokemon/palettes/breloom_palette.pal b/graphics/pokemon/breloom/normal.pal
index f01f5d947..f01f5d947 100644
--- a/graphics/pokemon/palettes/breloom_palette.pal
+++ b/graphics/pokemon/breloom/normal.pal
diff --git a/graphics/pokemon/palettes/breloom_shiny_palette.pal b/graphics/pokemon/breloom/shiny.pal
index ad89e65f2..ad89e65f2 100644
--- a/graphics/pokemon/palettes/breloom_shiny_palette.pal
+++ b/graphics/pokemon/breloom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/bulbasaur_front_pic.png b/graphics/pokemon/bulbasaur/anim_front.png
index bb5fb3d23..bb5fb3d23 100644
--- a/graphics/pokemon/anim_front_pics/bulbasaur_front_pic.png
+++ b/graphics/pokemon/bulbasaur/anim_front.png
diff --git a/graphics/pokemon/back_pics/bulbasaur_back_pic.png b/graphics/pokemon/bulbasaur/back.png
index f97806b58..f97806b58 100644
--- a/graphics/pokemon/back_pics/bulbasaur_back_pic.png
+++ b/graphics/pokemon/bulbasaur/back.png
diff --git a/graphics/pokemon/footprints/bulbasaur_footprint.png b/graphics/pokemon/bulbasaur/footprint.png
index 8e9ab9c6b..8e9ab9c6b 100644
--- a/graphics/pokemon/footprints/bulbasaur_footprint.png
+++ b/graphics/pokemon/bulbasaur/footprint.png
diff --git a/graphics/pokemon/front_pics/bulbasaur_still_front_pic.png b/graphics/pokemon/bulbasaur/front.png
index 846545a26..846545a26 100644
--- a/graphics/pokemon/front_pics/bulbasaur_still_front_pic.png
+++ b/graphics/pokemon/bulbasaur/front.png
diff --git a/graphics/pokemon/icons/bulbasaur_icon.png b/graphics/pokemon/bulbasaur/icon.png
index 8d6fe1725..8d6fe1725 100644
--- a/graphics/pokemon/icons/bulbasaur_icon.png
+++ b/graphics/pokemon/bulbasaur/icon.png
diff --git a/graphics/pokemon/palettes/bulbasaur_palette.pal b/graphics/pokemon/bulbasaur/normal.pal
index 5147bd974..5147bd974 100644
--- a/graphics/pokemon/palettes/bulbasaur_palette.pal
+++ b/graphics/pokemon/bulbasaur/normal.pal
diff --git a/graphics/pokemon/palettes/bulbasaur_shiny_palette.pal b/graphics/pokemon/bulbasaur/shiny.pal
index 86a535831..86a535831 100644
--- a/graphics/pokemon/palettes/bulbasaur_shiny_palette.pal
+++ b/graphics/pokemon/bulbasaur/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/butterfree_front_pic.png b/graphics/pokemon/butterfree/anim_front.png
index 1626e11c0..1626e11c0 100644
--- a/graphics/pokemon/anim_front_pics/butterfree_front_pic.png
+++ b/graphics/pokemon/butterfree/anim_front.png
diff --git a/graphics/pokemon/back_pics/butterfree_back_pic.png b/graphics/pokemon/butterfree/back.png
index 6887ed815..6887ed815 100644
--- a/graphics/pokemon/back_pics/butterfree_back_pic.png
+++ b/graphics/pokemon/butterfree/back.png
diff --git a/graphics/pokemon/footprints/butterfree_footprint.png b/graphics/pokemon/butterfree/footprint.png
index b2740e9cc..b2740e9cc 100644
--- a/graphics/pokemon/footprints/butterfree_footprint.png
+++ b/graphics/pokemon/butterfree/footprint.png
diff --git a/graphics/pokemon/front_pics/butterfree_still_front_pic.png b/graphics/pokemon/butterfree/front.png
index 1a3d3d6ae..1a3d3d6ae 100644
--- a/graphics/pokemon/front_pics/butterfree_still_front_pic.png
+++ b/graphics/pokemon/butterfree/front.png
diff --git a/graphics/pokemon/icons/butterfree_icon.png b/graphics/pokemon/butterfree/icon.png
index 11c4a379f..11c4a379f 100644
--- a/graphics/pokemon/icons/butterfree_icon.png
+++ b/graphics/pokemon/butterfree/icon.png
diff --git a/graphics/pokemon/palettes/butterfree_palette.pal b/graphics/pokemon/butterfree/normal.pal
index a59d4a5d5..a59d4a5d5 100644
--- a/graphics/pokemon/palettes/butterfree_palette.pal
+++ b/graphics/pokemon/butterfree/normal.pal
diff --git a/graphics/pokemon/palettes/butterfree_shiny_palette.pal b/graphics/pokemon/butterfree/shiny.pal
index da1e68990..da1e68990 100644
--- a/graphics/pokemon/palettes/butterfree_shiny_palette.pal
+++ b/graphics/pokemon/butterfree/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cacnea_front_pic.png b/graphics/pokemon/cacnea/anim_front.png
index ac3158742..ac3158742 100644
--- a/graphics/pokemon/anim_front_pics/cacnea_front_pic.png
+++ b/graphics/pokemon/cacnea/anim_front.png
diff --git a/graphics/pokemon/back_pics/cacnea_back_pic.png b/graphics/pokemon/cacnea/back.png
index dbc804775..dbc804775 100644
--- a/graphics/pokemon/back_pics/cacnea_back_pic.png
+++ b/graphics/pokemon/cacnea/back.png
diff --git a/graphics/pokemon/footprints/cacnea_footprint.png b/graphics/pokemon/cacnea/footprint.png
index 00b6a8a7e..00b6a8a7e 100644
--- a/graphics/pokemon/footprints/cacnea_footprint.png
+++ b/graphics/pokemon/cacnea/footprint.png
diff --git a/graphics/pokemon/front_pics/cacnea_still_front_pic.png b/graphics/pokemon/cacnea/front.png
index c57dce95f..c57dce95f 100644
--- a/graphics/pokemon/front_pics/cacnea_still_front_pic.png
+++ b/graphics/pokemon/cacnea/front.png
diff --git a/graphics/pokemon/icons/cacnea_icon.png b/graphics/pokemon/cacnea/icon.png
index 367f07668..367f07668 100644
--- a/graphics/pokemon/icons/cacnea_icon.png
+++ b/graphics/pokemon/cacnea/icon.png
diff --git a/graphics/pokemon/palettes/cacnea_palette.pal b/graphics/pokemon/cacnea/normal.pal
index 2bfc05a1e..2bfc05a1e 100644
--- a/graphics/pokemon/palettes/cacnea_palette.pal
+++ b/graphics/pokemon/cacnea/normal.pal
diff --git a/graphics/pokemon/palettes/cacnea_shiny_palette.pal b/graphics/pokemon/cacnea/shiny.pal
index 67e730f61..67e730f61 100644
--- a/graphics/pokemon/palettes/cacnea_shiny_palette.pal
+++ b/graphics/pokemon/cacnea/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cacturne_front_pic.png b/graphics/pokemon/cacturne/anim_front.png
index 2ee1646e8..2ee1646e8 100644
--- a/graphics/pokemon/anim_front_pics/cacturne_front_pic.png
+++ b/graphics/pokemon/cacturne/anim_front.png
diff --git a/graphics/pokemon/back_pics/cacturne_back_pic.png b/graphics/pokemon/cacturne/back.png
index 9a67227d0..9a67227d0 100644
--- a/graphics/pokemon/back_pics/cacturne_back_pic.png
+++ b/graphics/pokemon/cacturne/back.png
diff --git a/graphics/pokemon/footprints/cacturne_footprint.png b/graphics/pokemon/cacturne/footprint.png
index 5441f92d6..5441f92d6 100644
--- a/graphics/pokemon/footprints/cacturne_footprint.png
+++ b/graphics/pokemon/cacturne/footprint.png
diff --git a/graphics/pokemon/front_pics/cacturne_still_front_pic.png b/graphics/pokemon/cacturne/front.png
index 80434c3c8..80434c3c8 100644
--- a/graphics/pokemon/front_pics/cacturne_still_front_pic.png
+++ b/graphics/pokemon/cacturne/front.png
diff --git a/graphics/pokemon/icons/cacturne_icon.png b/graphics/pokemon/cacturne/icon.png
index 948bea2d8..948bea2d8 100644
--- a/graphics/pokemon/icons/cacturne_icon.png
+++ b/graphics/pokemon/cacturne/icon.png
diff --git a/graphics/pokemon/palettes/cacturne_palette.pal b/graphics/pokemon/cacturne/normal.pal
index cd8281641..cd8281641 100644
--- a/graphics/pokemon/palettes/cacturne_palette.pal
+++ b/graphics/pokemon/cacturne/normal.pal
diff --git a/graphics/pokemon/palettes/cacturne_shiny_palette.pal b/graphics/pokemon/cacturne/shiny.pal
index 11914015b..11914015b 100644
--- a/graphics/pokemon/palettes/cacturne_shiny_palette.pal
+++ b/graphics/pokemon/cacturne/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/camerupt_front_pic.png b/graphics/pokemon/camerupt/anim_front.png
index b63d901ba..b63d901ba 100644
--- a/graphics/pokemon/anim_front_pics/camerupt_front_pic.png
+++ b/graphics/pokemon/camerupt/anim_front.png
diff --git a/graphics/pokemon/back_pics/camerupt_back_pic.png b/graphics/pokemon/camerupt/back.png
index 3b1744755..3b1744755 100644
--- a/graphics/pokemon/back_pics/camerupt_back_pic.png
+++ b/graphics/pokemon/camerupt/back.png
diff --git a/graphics/pokemon/footprints/camerupt_footprint.png b/graphics/pokemon/camerupt/footprint.png
index 40708b8a1..40708b8a1 100644
--- a/graphics/pokemon/footprints/camerupt_footprint.png
+++ b/graphics/pokemon/camerupt/footprint.png
diff --git a/graphics/pokemon/front_pics/camerupt_still_front_pic.png b/graphics/pokemon/camerupt/front.png
index ffd9ed0f2..ffd9ed0f2 100644
--- a/graphics/pokemon/front_pics/camerupt_still_front_pic.png
+++ b/graphics/pokemon/camerupt/front.png
diff --git a/graphics/pokemon/icons/camerupt_icon.png b/graphics/pokemon/camerupt/icon.png
index 372fc7ce0..372fc7ce0 100644
--- a/graphics/pokemon/icons/camerupt_icon.png
+++ b/graphics/pokemon/camerupt/icon.png
diff --git a/graphics/pokemon/palettes/camerupt_palette.pal b/graphics/pokemon/camerupt/normal.pal
index bd1096ff6..bd1096ff6 100644
--- a/graphics/pokemon/palettes/camerupt_palette.pal
+++ b/graphics/pokemon/camerupt/normal.pal
diff --git a/graphics/pokemon/palettes/camerupt_shiny_palette.pal b/graphics/pokemon/camerupt/shiny.pal
index c402d68dd..c402d68dd 100644
--- a/graphics/pokemon/palettes/camerupt_shiny_palette.pal
+++ b/graphics/pokemon/camerupt/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/carvanha_front_pic.png b/graphics/pokemon/carvanha/anim_front.png
index ec2df0cf9..ec2df0cf9 100644
--- a/graphics/pokemon/anim_front_pics/carvanha_front_pic.png
+++ b/graphics/pokemon/carvanha/anim_front.png
diff --git a/graphics/pokemon/back_pics/carvanha_back_pic.png b/graphics/pokemon/carvanha/back.png
index cef8c25dd..cef8c25dd 100644
--- a/graphics/pokemon/back_pics/carvanha_back_pic.png
+++ b/graphics/pokemon/carvanha/back.png
diff --git a/graphics/pokemon/footprints/carvanha_footprint.png b/graphics/pokemon/carvanha/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/carvanha_footprint.png
+++ b/graphics/pokemon/carvanha/footprint.png
diff --git a/graphics/pokemon/front_pics/carvanha_still_front_pic.png b/graphics/pokemon/carvanha/front.png
index f67f56cc7..f67f56cc7 100644
--- a/graphics/pokemon/front_pics/carvanha_still_front_pic.png
+++ b/graphics/pokemon/carvanha/front.png
diff --git a/graphics/pokemon/icons/carvanha_icon.png b/graphics/pokemon/carvanha/icon.png
index 6b0d48a8a..6b0d48a8a 100644
--- a/graphics/pokemon/icons/carvanha_icon.png
+++ b/graphics/pokemon/carvanha/icon.png
diff --git a/graphics/pokemon/palettes/carvanha_palette.pal b/graphics/pokemon/carvanha/normal.pal
index fbe24d28b..fbe24d28b 100644
--- a/graphics/pokemon/palettes/carvanha_palette.pal
+++ b/graphics/pokemon/carvanha/normal.pal
diff --git a/graphics/pokemon/palettes/carvanha_shiny_palette.pal b/graphics/pokemon/carvanha/shiny.pal
index 0e0cb9268..0e0cb9268 100644
--- a/graphics/pokemon/palettes/carvanha_shiny_palette.pal
+++ b/graphics/pokemon/carvanha/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cascoon_front_pic.png b/graphics/pokemon/cascoon/anim_front.png
index 19080ba2c..19080ba2c 100644
--- a/graphics/pokemon/anim_front_pics/cascoon_front_pic.png
+++ b/graphics/pokemon/cascoon/anim_front.png
diff --git a/graphics/pokemon/back_pics/cascoon_back_pic.png b/graphics/pokemon/cascoon/back.png
index fb6bc2955..fb6bc2955 100644
--- a/graphics/pokemon/back_pics/cascoon_back_pic.png
+++ b/graphics/pokemon/cascoon/back.png
diff --git a/graphics/pokemon/footprints/cascoon_footprint.png b/graphics/pokemon/cascoon/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/cascoon_footprint.png
+++ b/graphics/pokemon/cascoon/footprint.png
diff --git a/graphics/pokemon/front_pics/cascoon_still_front_pic.png b/graphics/pokemon/cascoon/front.png
index 474610aac..474610aac 100644
--- a/graphics/pokemon/front_pics/cascoon_still_front_pic.png
+++ b/graphics/pokemon/cascoon/front.png
diff --git a/graphics/pokemon/icons/cascoon_icon.png b/graphics/pokemon/cascoon/icon.png
index 4d49506c0..4d49506c0 100644
--- a/graphics/pokemon/icons/cascoon_icon.png
+++ b/graphics/pokemon/cascoon/icon.png
diff --git a/graphics/pokemon/palettes/cascoon_palette.pal b/graphics/pokemon/cascoon/normal.pal
index 05dceb931..05dceb931 100644
--- a/graphics/pokemon/palettes/cascoon_palette.pal
+++ b/graphics/pokemon/cascoon/normal.pal
diff --git a/graphics/pokemon/palettes/cascoon_shiny_palette.pal b/graphics/pokemon/cascoon/shiny.pal
index e8b230ed1..e8b230ed1 100644
--- a/graphics/pokemon/palettes/cascoon_shiny_palette.pal
+++ b/graphics/pokemon/cascoon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/castform_normal_form_front_pic.png b/graphics/pokemon/castform/anim_front_normal_form.png
index 39bfaf426..39bfaf426 100644
--- a/graphics/pokemon/anim_front_pics/castform_normal_form_front_pic.png
+++ b/graphics/pokemon/castform/anim_front_normal_form.png
diff --git a/graphics/pokemon/anim_front_pics/castform_rainy_form_front_pic.png b/graphics/pokemon/castform/anim_front_rainy_form.png
index 155374035..155374035 100644
--- a/graphics/pokemon/anim_front_pics/castform_rainy_form_front_pic.png
+++ b/graphics/pokemon/castform/anim_front_rainy_form.png
diff --git a/graphics/pokemon/anim_front_pics/castform_snowy_form_front_pic.png b/graphics/pokemon/castform/anim_front_snowy_form.png
index a75bf647e..a75bf647e 100644
--- a/graphics/pokemon/anim_front_pics/castform_snowy_form_front_pic.png
+++ b/graphics/pokemon/castform/anim_front_snowy_form.png
diff --git a/graphics/pokemon/anim_front_pics/castform_sunny_form_front_pic.png b/graphics/pokemon/castform/anim_front_sunny_form.png
index 7e14f9892..7e14f9892 100644
--- a/graphics/pokemon/anim_front_pics/castform_sunny_form_front_pic.png
+++ b/graphics/pokemon/castform/anim_front_sunny_form.png
diff --git a/graphics/pokemon/back_pics/castform_normal_form_back_pic.png b/graphics/pokemon/castform/back_normal_form.png
index 6348a35e8..6348a35e8 100644
--- a/graphics/pokemon/back_pics/castform_normal_form_back_pic.png
+++ b/graphics/pokemon/castform/back_normal_form.png
diff --git a/graphics/pokemon/back_pics/castform_rainy_form_back_pic.png b/graphics/pokemon/castform/back_rainy_form.png
index 70bad9130..70bad9130 100644
--- a/graphics/pokemon/back_pics/castform_rainy_form_back_pic.png
+++ b/graphics/pokemon/castform/back_rainy_form.png
diff --git a/graphics/pokemon/back_pics/castform_snowy_form_back_pic.png b/graphics/pokemon/castform/back_snowy_form.png
index b4f27cbe6..b4f27cbe6 100644
--- a/graphics/pokemon/back_pics/castform_snowy_form_back_pic.png
+++ b/graphics/pokemon/castform/back_snowy_form.png
diff --git a/graphics/pokemon/back_pics/castform_sunny_form_back_pic.png b/graphics/pokemon/castform/back_sunny_form.png
index 83b27298a..83b27298a 100644
--- a/graphics/pokemon/back_pics/castform_sunny_form_back_pic.png
+++ b/graphics/pokemon/castform/back_sunny_form.png
diff --git a/graphics/pokemon/footprints/castform_footprint.png b/graphics/pokemon/castform/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/castform_footprint.png
+++ b/graphics/pokemon/castform/footprint.png
diff --git a/graphics/pokemon/front_pics/castform_normal_form_still_front_pic.png b/graphics/pokemon/castform/front_normal_form.png
index 39bfaf426..39bfaf426 100644
--- a/graphics/pokemon/front_pics/castform_normal_form_still_front_pic.png
+++ b/graphics/pokemon/castform/front_normal_form.png
diff --git a/graphics/pokemon/front_pics/castform_rainy_form_still_front_pic.png b/graphics/pokemon/castform/front_rainy_form.png
index 155374035..155374035 100644
--- a/graphics/pokemon/front_pics/castform_rainy_form_still_front_pic.png
+++ b/graphics/pokemon/castform/front_rainy_form.png
diff --git a/graphics/pokemon/front_pics/castform_snowy_form_still_front_pic.png b/graphics/pokemon/castform/front_snowy_form.png
index a75bf647e..a75bf647e 100644
--- a/graphics/pokemon/front_pics/castform_snowy_form_still_front_pic.png
+++ b/graphics/pokemon/castform/front_snowy_form.png
diff --git a/graphics/pokemon/front_pics/castform_sunny_form_still_front_pic.png b/graphics/pokemon/castform/front_sunny_form.png
index 7e14f9892..7e14f9892 100644
--- a/graphics/pokemon/front_pics/castform_sunny_form_still_front_pic.png
+++ b/graphics/pokemon/castform/front_sunny_form.png
diff --git a/graphics/pokemon/icons/castform_icon.png b/graphics/pokemon/castform/icon.png
index 56c62ad07..56c62ad07 100644
--- a/graphics/pokemon/icons/castform_icon.png
+++ b/graphics/pokemon/castform/icon.png
diff --git a/graphics/pokemon/palettes/castform_normal_form_palette.pal b/graphics/pokemon/castform/normal_normal_form.pal
index 3fe2b7692..3fe2b7692 100644
--- a/graphics/pokemon/palettes/castform_normal_form_palette.pal
+++ b/graphics/pokemon/castform/normal_normal_form.pal
diff --git a/graphics/pokemon/palettes/castform_rainy_form_palette.pal b/graphics/pokemon/castform/normal_rainy_form.pal
index 914cdac62..914cdac62 100644
--- a/graphics/pokemon/palettes/castform_rainy_form_palette.pal
+++ b/graphics/pokemon/castform/normal_rainy_form.pal
diff --git a/graphics/pokemon/palettes/castform_snowy_form_palette.pal b/graphics/pokemon/castform/normal_snowy_form.pal
index d1c64ac75..d1c64ac75 100644
--- a/graphics/pokemon/palettes/castform_snowy_form_palette.pal
+++ b/graphics/pokemon/castform/normal_snowy_form.pal
diff --git a/graphics/pokemon/palettes/castform_sunny_form_palette.pal b/graphics/pokemon/castform/normal_sunny_form.pal
index af0cfbb93..af0cfbb93 100644
--- a/graphics/pokemon/palettes/castform_sunny_form_palette.pal
+++ b/graphics/pokemon/castform/normal_sunny_form.pal
diff --git a/graphics/pokemon/palettes/castform_normal_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_normal_form.pal
index 2fa401dd6..2fa401dd6 100644
--- a/graphics/pokemon/palettes/castform_normal_form_shiny_palette.pal
+++ b/graphics/pokemon/castform/shiny_normal_form.pal
diff --git a/graphics/pokemon/palettes/castform_rainy_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_rainy_form.pal
index 914cdac62..914cdac62 100644
--- a/graphics/pokemon/palettes/castform_rainy_form_shiny_palette.pal
+++ b/graphics/pokemon/castform/shiny_rainy_form.pal
diff --git a/graphics/pokemon/palettes/castform_snowy_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_snowy_form.pal
index d1c64ac75..d1c64ac75 100644
--- a/graphics/pokemon/palettes/castform_snowy_form_shiny_palette.pal
+++ b/graphics/pokemon/castform/shiny_snowy_form.pal
diff --git a/graphics/pokemon/palettes/castform_sunny_form_shiny_palette.pal b/graphics/pokemon/castform/shiny_sunny_form.pal
index af0cfbb93..af0cfbb93 100644
--- a/graphics/pokemon/palettes/castform_sunny_form_shiny_palette.pal
+++ b/graphics/pokemon/castform/shiny_sunny_form.pal
diff --git a/graphics/pokemon/anim_front_pics/caterpie_front_pic.png b/graphics/pokemon/caterpie/anim_front.png
index 602b7e30f..602b7e30f 100644
--- a/graphics/pokemon/anim_front_pics/caterpie_front_pic.png
+++ b/graphics/pokemon/caterpie/anim_front.png
diff --git a/graphics/pokemon/back_pics/caterpie_back_pic.png b/graphics/pokemon/caterpie/back.png
index 801748d1c..801748d1c 100644
--- a/graphics/pokemon/back_pics/caterpie_back_pic.png
+++ b/graphics/pokemon/caterpie/back.png
diff --git a/graphics/pokemon/footprints/caterpie_footprint.png b/graphics/pokemon/caterpie/footprint.png
index c1c0058e7..c1c0058e7 100644
--- a/graphics/pokemon/footprints/caterpie_footprint.png
+++ b/graphics/pokemon/caterpie/footprint.png
diff --git a/graphics/pokemon/front_pics/caterpie_still_front_pic.png b/graphics/pokemon/caterpie/front.png
index b8b3ce00d..b8b3ce00d 100644
--- a/graphics/pokemon/front_pics/caterpie_still_front_pic.png
+++ b/graphics/pokemon/caterpie/front.png
diff --git a/graphics/pokemon/icons/caterpie_icon.png b/graphics/pokemon/caterpie/icon.png
index be20669c3..be20669c3 100644
--- a/graphics/pokemon/icons/caterpie_icon.png
+++ b/graphics/pokemon/caterpie/icon.png
diff --git a/graphics/pokemon/palettes/caterpie_palette.pal b/graphics/pokemon/caterpie/normal.pal
index c672687ac..c672687ac 100644
--- a/graphics/pokemon/palettes/caterpie_palette.pal
+++ b/graphics/pokemon/caterpie/normal.pal
diff --git a/graphics/pokemon/palettes/caterpie_shiny_palette.pal b/graphics/pokemon/caterpie/shiny.pal
index 4b797001e..4b797001e 100644
--- a/graphics/pokemon/palettes/caterpie_shiny_palette.pal
+++ b/graphics/pokemon/caterpie/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/celebi_front_pic.png b/graphics/pokemon/celebi/anim_front.png
index e4b6a9d61..e4b6a9d61 100644
--- a/graphics/pokemon/anim_front_pics/celebi_front_pic.png
+++ b/graphics/pokemon/celebi/anim_front.png
diff --git a/graphics/pokemon/back_pics/celebi_back_pic.png b/graphics/pokemon/celebi/back.png
index c43e455dc..c43e455dc 100644
--- a/graphics/pokemon/back_pics/celebi_back_pic.png
+++ b/graphics/pokemon/celebi/back.png
diff --git a/graphics/pokemon/footprints/celebi_footprint.png b/graphics/pokemon/celebi/footprint.png
index 11aa4301c..11aa4301c 100644
--- a/graphics/pokemon/footprints/celebi_footprint.png
+++ b/graphics/pokemon/celebi/footprint.png
diff --git a/graphics/pokemon/front_pics/celebi_still_front_pic.png b/graphics/pokemon/celebi/front.png
index 1717f2561..1717f2561 100644
--- a/graphics/pokemon/front_pics/celebi_still_front_pic.png
+++ b/graphics/pokemon/celebi/front.png
diff --git a/graphics/pokemon/icons/celebi_icon.png b/graphics/pokemon/celebi/icon.png
index 245d580f7..245d580f7 100644
--- a/graphics/pokemon/icons/celebi_icon.png
+++ b/graphics/pokemon/celebi/icon.png
diff --git a/graphics/pokemon/palettes/celebi_palette.pal b/graphics/pokemon/celebi/normal.pal
index aed1b3ec2..aed1b3ec2 100644
--- a/graphics/pokemon/palettes/celebi_palette.pal
+++ b/graphics/pokemon/celebi/normal.pal
diff --git a/graphics/pokemon/palettes/celebi_shiny_palette.pal b/graphics/pokemon/celebi/shiny.pal
index b90d6ed43..b90d6ed43 100644
--- a/graphics/pokemon/palettes/celebi_shiny_palette.pal
+++ b/graphics/pokemon/celebi/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/chansey_front_pic.png b/graphics/pokemon/chansey/anim_front.png
index 1fa9b268d..1fa9b268d 100644
--- a/graphics/pokemon/anim_front_pics/chansey_front_pic.png
+++ b/graphics/pokemon/chansey/anim_front.png
diff --git a/graphics/pokemon/back_pics/chansey_back_pic.png b/graphics/pokemon/chansey/back.png
index db61e1c11..db61e1c11 100644
--- a/graphics/pokemon/back_pics/chansey_back_pic.png
+++ b/graphics/pokemon/chansey/back.png
diff --git a/graphics/pokemon/footprints/chansey_footprint.png b/graphics/pokemon/chansey/footprint.png
index 17893b9fb..17893b9fb 100644
--- a/graphics/pokemon/footprints/chansey_footprint.png
+++ b/graphics/pokemon/chansey/footprint.png
diff --git a/graphics/pokemon/front_pics/chansey_still_front_pic.png b/graphics/pokemon/chansey/front.png
index a8e26bc01..a8e26bc01 100644
--- a/graphics/pokemon/front_pics/chansey_still_front_pic.png
+++ b/graphics/pokemon/chansey/front.png
diff --git a/graphics/pokemon/icons/chansey_icon.png b/graphics/pokemon/chansey/icon.png
index 4083185b0..4083185b0 100644
--- a/graphics/pokemon/icons/chansey_icon.png
+++ b/graphics/pokemon/chansey/icon.png
diff --git a/graphics/pokemon/palettes/chansey_palette.pal b/graphics/pokemon/chansey/normal.pal
index 556aaa5e1..556aaa5e1 100644
--- a/graphics/pokemon/palettes/chansey_palette.pal
+++ b/graphics/pokemon/chansey/normal.pal
diff --git a/graphics/pokemon/palettes/chansey_shiny_palette.pal b/graphics/pokemon/chansey/shiny.pal
index e8107f8d5..e8107f8d5 100644
--- a/graphics/pokemon/palettes/chansey_shiny_palette.pal
+++ b/graphics/pokemon/chansey/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/charizard_front_pic.png b/graphics/pokemon/charizard/anim_front.png
index b3ed32338..b3ed32338 100644
--- a/graphics/pokemon/anim_front_pics/charizard_front_pic.png
+++ b/graphics/pokemon/charizard/anim_front.png
diff --git a/graphics/pokemon/back_pics/charizard_back_pic.png b/graphics/pokemon/charizard/back.png
index 22cf6b043..22cf6b043 100644
--- a/graphics/pokemon/back_pics/charizard_back_pic.png
+++ b/graphics/pokemon/charizard/back.png
diff --git a/graphics/pokemon/footprints/charizard_footprint.png b/graphics/pokemon/charizard/footprint.png
index e69f38392..e69f38392 100644
--- a/graphics/pokemon/footprints/charizard_footprint.png
+++ b/graphics/pokemon/charizard/footprint.png
diff --git a/graphics/pokemon/front_pics/charizard_still_front_pic.png b/graphics/pokemon/charizard/front.png
index 892c26c5d..892c26c5d 100644
--- a/graphics/pokemon/front_pics/charizard_still_front_pic.png
+++ b/graphics/pokemon/charizard/front.png
diff --git a/graphics/pokemon/icons/charizard_icon.png b/graphics/pokemon/charizard/icon.png
index 9c8140887..9c8140887 100644
--- a/graphics/pokemon/icons/charizard_icon.png
+++ b/graphics/pokemon/charizard/icon.png
diff --git a/graphics/pokemon/palettes/charizard_palette.pal b/graphics/pokemon/charizard/normal.pal
index 154a0f0c5..154a0f0c5 100644
--- a/graphics/pokemon/palettes/charizard_palette.pal
+++ b/graphics/pokemon/charizard/normal.pal
diff --git a/graphics/pokemon/palettes/charizard_shiny_palette.pal b/graphics/pokemon/charizard/shiny.pal
index 0704ae619..0704ae619 100644
--- a/graphics/pokemon/palettes/charizard_shiny_palette.pal
+++ b/graphics/pokemon/charizard/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/charmander_front_pic.png b/graphics/pokemon/charmander/anim_front.png
index b4f1a3c73..b4f1a3c73 100644
--- a/graphics/pokemon/anim_front_pics/charmander_front_pic.png
+++ b/graphics/pokemon/charmander/anim_front.png
diff --git a/graphics/pokemon/back_pics/charmander_back_pic.png b/graphics/pokemon/charmander/back.png
index 9e3eb944e..9e3eb944e 100644
--- a/graphics/pokemon/back_pics/charmander_back_pic.png
+++ b/graphics/pokemon/charmander/back.png
diff --git a/graphics/pokemon/footprints/charmander_footprint.png b/graphics/pokemon/charmander/footprint.png
index 2f7723621..2f7723621 100644
--- a/graphics/pokemon/footprints/charmander_footprint.png
+++ b/graphics/pokemon/charmander/footprint.png
diff --git a/graphics/pokemon/front_pics/charmander_still_front_pic.png b/graphics/pokemon/charmander/front.png
index b697f7ec2..b697f7ec2 100644
--- a/graphics/pokemon/front_pics/charmander_still_front_pic.png
+++ b/graphics/pokemon/charmander/front.png
diff --git a/graphics/pokemon/icons/charmander_icon.png b/graphics/pokemon/charmander/icon.png
index c3fa4fde4..c3fa4fde4 100644
--- a/graphics/pokemon/icons/charmander_icon.png
+++ b/graphics/pokemon/charmander/icon.png
diff --git a/graphics/pokemon/palettes/charmander_palette.pal b/graphics/pokemon/charmander/normal.pal
index 1e542aa48..1e542aa48 100644
--- a/graphics/pokemon/palettes/charmander_palette.pal
+++ b/graphics/pokemon/charmander/normal.pal
diff --git a/graphics/pokemon/palettes/charmander_shiny_palette.pal b/graphics/pokemon/charmander/shiny.pal
index 3b5bff449..3b5bff449 100644
--- a/graphics/pokemon/palettes/charmander_shiny_palette.pal
+++ b/graphics/pokemon/charmander/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/charmeleon_front_pic.png b/graphics/pokemon/charmeleon/anim_front.png
index 909f4f394..909f4f394 100644
--- a/graphics/pokemon/anim_front_pics/charmeleon_front_pic.png
+++ b/graphics/pokemon/charmeleon/anim_front.png
diff --git a/graphics/pokemon/back_pics/charmeleon_back_pic.png b/graphics/pokemon/charmeleon/back.png
index d2fb0c776..d2fb0c776 100644
--- a/graphics/pokemon/back_pics/charmeleon_back_pic.png
+++ b/graphics/pokemon/charmeleon/back.png
diff --git a/graphics/pokemon/footprints/charmeleon_footprint.png b/graphics/pokemon/charmeleon/footprint.png
index 6ec15ee20..6ec15ee20 100644
--- a/graphics/pokemon/footprints/charmeleon_footprint.png
+++ b/graphics/pokemon/charmeleon/footprint.png
diff --git a/graphics/pokemon/front_pics/charmeleon_still_front_pic.png b/graphics/pokemon/charmeleon/front.png
index f2eb19033..f2eb19033 100644
--- a/graphics/pokemon/front_pics/charmeleon_still_front_pic.png
+++ b/graphics/pokemon/charmeleon/front.png
diff --git a/graphics/pokemon/icons/charmeleon_icon.png b/graphics/pokemon/charmeleon/icon.png
index 0f1550d0c..0f1550d0c 100644
--- a/graphics/pokemon/icons/charmeleon_icon.png
+++ b/graphics/pokemon/charmeleon/icon.png
diff --git a/graphics/pokemon/palettes/charmeleon_palette.pal b/graphics/pokemon/charmeleon/normal.pal
index 400b49d5c..400b49d5c 100644
--- a/graphics/pokemon/palettes/charmeleon_palette.pal
+++ b/graphics/pokemon/charmeleon/normal.pal
diff --git a/graphics/pokemon/palettes/charmeleon_shiny_palette.pal b/graphics/pokemon/charmeleon/shiny.pal
index 7b7b96e79..7b7b96e79 100644
--- a/graphics/pokemon/palettes/charmeleon_shiny_palette.pal
+++ b/graphics/pokemon/charmeleon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/chikorita_front_pic.png b/graphics/pokemon/chikorita/anim_front.png
index fcc5174d2..fcc5174d2 100644
--- a/graphics/pokemon/anim_front_pics/chikorita_front_pic.png
+++ b/graphics/pokemon/chikorita/anim_front.png
diff --git a/graphics/pokemon/back_pics/chikorita_back_pic.png b/graphics/pokemon/chikorita/back.png
index 18c3569bf..18c3569bf 100644
--- a/graphics/pokemon/back_pics/chikorita_back_pic.png
+++ b/graphics/pokemon/chikorita/back.png
diff --git a/graphics/pokemon/footprints/chikorita_footprint.png b/graphics/pokemon/chikorita/footprint.png
index 3ac4abd9f..3ac4abd9f 100644
--- a/graphics/pokemon/footprints/chikorita_footprint.png
+++ b/graphics/pokemon/chikorita/footprint.png
diff --git a/graphics/pokemon/front_pics/chikorita_still_front_pic.png b/graphics/pokemon/chikorita/front.png
index 80f5dc9ab..80f5dc9ab 100644
--- a/graphics/pokemon/front_pics/chikorita_still_front_pic.png
+++ b/graphics/pokemon/chikorita/front.png
diff --git a/graphics/pokemon/icons/chikorita_icon.png b/graphics/pokemon/chikorita/icon.png
index f9bc40d0e..f9bc40d0e 100644
--- a/graphics/pokemon/icons/chikorita_icon.png
+++ b/graphics/pokemon/chikorita/icon.png
diff --git a/graphics/pokemon/palettes/chikorita_palette.pal b/graphics/pokemon/chikorita/normal.pal
index 9bca4c3eb..9bca4c3eb 100644
--- a/graphics/pokemon/palettes/chikorita_palette.pal
+++ b/graphics/pokemon/chikorita/normal.pal
diff --git a/graphics/pokemon/palettes/chikorita_shiny_palette.pal b/graphics/pokemon/chikorita/shiny.pal
index d7ecae6fb..d7ecae6fb 100644
--- a/graphics/pokemon/palettes/chikorita_shiny_palette.pal
+++ b/graphics/pokemon/chikorita/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/chimecho_front_pic.png b/graphics/pokemon/chimecho/anim_front.png
index 26acbd0a0..26acbd0a0 100644
--- a/graphics/pokemon/anim_front_pics/chimecho_front_pic.png
+++ b/graphics/pokemon/chimecho/anim_front.png
diff --git a/graphics/pokemon/back_pics/chimecho_back_pic.png b/graphics/pokemon/chimecho/back.png
index 7a3fedacb..7a3fedacb 100644
--- a/graphics/pokemon/back_pics/chimecho_back_pic.png
+++ b/graphics/pokemon/chimecho/back.png
diff --git a/graphics/pokemon/footprints/chimecho_footprint.png b/graphics/pokemon/chimecho/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/chimecho_footprint.png
+++ b/graphics/pokemon/chimecho/footprint.png
diff --git a/graphics/pokemon/front_pics/chimecho_still_front_pic.png b/graphics/pokemon/chimecho/front.png
index 534bec4d7..534bec4d7 100644
--- a/graphics/pokemon/front_pics/chimecho_still_front_pic.png
+++ b/graphics/pokemon/chimecho/front.png
diff --git a/graphics/pokemon/icons/chimecho_icon.png b/graphics/pokemon/chimecho/icon.png
index 11b2d93b2..11b2d93b2 100644
--- a/graphics/pokemon/icons/chimecho_icon.png
+++ b/graphics/pokemon/chimecho/icon.png
diff --git a/graphics/pokemon/palettes/chimecho_palette.pal b/graphics/pokemon/chimecho/normal.pal
index 9dd34b7c4..9dd34b7c4 100644
--- a/graphics/pokemon/palettes/chimecho_palette.pal
+++ b/graphics/pokemon/chimecho/normal.pal
diff --git a/graphics/pokemon/palettes/chimecho_shiny_palette.pal b/graphics/pokemon/chimecho/shiny.pal
index 44983802b..44983802b 100644
--- a/graphics/pokemon/palettes/chimecho_shiny_palette.pal
+++ b/graphics/pokemon/chimecho/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/chinchou_front_pic.png b/graphics/pokemon/chinchou/anim_front.png
index a573e6985..a573e6985 100644
--- a/graphics/pokemon/anim_front_pics/chinchou_front_pic.png
+++ b/graphics/pokemon/chinchou/anim_front.png
diff --git a/graphics/pokemon/back_pics/chinchou_back_pic.png b/graphics/pokemon/chinchou/back.png
index a3b11b2dc..a3b11b2dc 100644
--- a/graphics/pokemon/back_pics/chinchou_back_pic.png
+++ b/graphics/pokemon/chinchou/back.png
diff --git a/graphics/pokemon/footprints/chinchou_footprint.png b/graphics/pokemon/chinchou/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/chinchou_footprint.png
+++ b/graphics/pokemon/chinchou/footprint.png
diff --git a/graphics/pokemon/front_pics/chinchou_still_front_pic.png b/graphics/pokemon/chinchou/front.png
index 7bb954382..7bb954382 100644
--- a/graphics/pokemon/front_pics/chinchou_still_front_pic.png
+++ b/graphics/pokemon/chinchou/front.png
diff --git a/graphics/pokemon/icons/chinchou_icon.png b/graphics/pokemon/chinchou/icon.png
index 1b585204b..1b585204b 100644
--- a/graphics/pokemon/icons/chinchou_icon.png
+++ b/graphics/pokemon/chinchou/icon.png
diff --git a/graphics/pokemon/palettes/chinchou_palette.pal b/graphics/pokemon/chinchou/normal.pal
index fc382ddbb..fc382ddbb 100644
--- a/graphics/pokemon/palettes/chinchou_palette.pal
+++ b/graphics/pokemon/chinchou/normal.pal
diff --git a/graphics/pokemon/palettes/chinchou_shiny_palette.pal b/graphics/pokemon/chinchou/shiny.pal
index babb78178..babb78178 100644
--- a/graphics/pokemon/palettes/chinchou_shiny_palette.pal
+++ b/graphics/pokemon/chinchou/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/circled_question_mark_front_pic.png b/graphics/pokemon/circled_question_mark/anim_front.png
index 9eb27931e..9eb27931e 100644
--- a/graphics/pokemon/anim_front_pics/circled_question_mark_front_pic.png
+++ b/graphics/pokemon/circled_question_mark/anim_front.png
diff --git a/graphics/pokemon/back_pics/circled_question_mark_back_pic.png b/graphics/pokemon/circled_question_mark/back.png
index 3056402db..3056402db 100644
--- a/graphics/pokemon/back_pics/circled_question_mark_back_pic.png
+++ b/graphics/pokemon/circled_question_mark/back.png
diff --git a/graphics/pokemon/front_pics/circled_question_mark_still_front_pic.png b/graphics/pokemon/circled_question_mark/front.png
index 3056402db..3056402db 100644
--- a/graphics/pokemon/front_pics/circled_question_mark_still_front_pic.png
+++ b/graphics/pokemon/circled_question_mark/front.png
diff --git a/graphics/pokemon/palettes/circled_question_mark_palette.pal b/graphics/pokemon/circled_question_mark/normal.pal
index 681f1cefe..681f1cefe 100644
--- a/graphics/pokemon/palettes/circled_question_mark_palette.pal
+++ b/graphics/pokemon/circled_question_mark/normal.pal
diff --git a/graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal b/graphics/pokemon/circled_question_mark/shiny.pal
index aa8d08dc3..aa8d08dc3 100644
--- a/graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal
+++ b/graphics/pokemon/circled_question_mark/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/clamperl_front_pic.png b/graphics/pokemon/clamperl/anim_front.png
index 21e547219..21e547219 100644
--- a/graphics/pokemon/anim_front_pics/clamperl_front_pic.png
+++ b/graphics/pokemon/clamperl/anim_front.png
diff --git a/graphics/pokemon/back_pics/clamperl_back_pic.png b/graphics/pokemon/clamperl/back.png
index 5b1324473..5b1324473 100644
--- a/graphics/pokemon/back_pics/clamperl_back_pic.png
+++ b/graphics/pokemon/clamperl/back.png
diff --git a/graphics/pokemon/footprints/clamperl_footprint.png b/graphics/pokemon/clamperl/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/clamperl_footprint.png
+++ b/graphics/pokemon/clamperl/footprint.png
diff --git a/graphics/pokemon/front_pics/clamperl_still_front_pic.png b/graphics/pokemon/clamperl/front.png
index 1cfe4d4f8..1cfe4d4f8 100644
--- a/graphics/pokemon/front_pics/clamperl_still_front_pic.png
+++ b/graphics/pokemon/clamperl/front.png
diff --git a/graphics/pokemon/icons/clamperl_icon.png b/graphics/pokemon/clamperl/icon.png
index fabcd9641..fabcd9641 100644
--- a/graphics/pokemon/icons/clamperl_icon.png
+++ b/graphics/pokemon/clamperl/icon.png
diff --git a/graphics/pokemon/palettes/clamperl_palette.pal b/graphics/pokemon/clamperl/normal.pal
index 84d730399..84d730399 100644
--- a/graphics/pokemon/palettes/clamperl_palette.pal
+++ b/graphics/pokemon/clamperl/normal.pal
diff --git a/graphics/pokemon/palettes/clamperl_shiny_palette.pal b/graphics/pokemon/clamperl/shiny.pal
index d479da971..d479da971 100644
--- a/graphics/pokemon/palettes/clamperl_shiny_palette.pal
+++ b/graphics/pokemon/clamperl/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/claydol_front_pic.png b/graphics/pokemon/claydol/anim_front.png
index 034ff3262..034ff3262 100644
--- a/graphics/pokemon/anim_front_pics/claydol_front_pic.png
+++ b/graphics/pokemon/claydol/anim_front.png
diff --git a/graphics/pokemon/back_pics/claydol_back_pic.png b/graphics/pokemon/claydol/back.png
index 9fdd6e0c2..9fdd6e0c2 100644
--- a/graphics/pokemon/back_pics/claydol_back_pic.png
+++ b/graphics/pokemon/claydol/back.png
diff --git a/graphics/pokemon/footprints/claydol_footprint.png b/graphics/pokemon/claydol/footprint.png
index 2f0bca1ac..2f0bca1ac 100644
--- a/graphics/pokemon/footprints/claydol_footprint.png
+++ b/graphics/pokemon/claydol/footprint.png
diff --git a/graphics/pokemon/front_pics/claydol_still_front_pic.png b/graphics/pokemon/claydol/front.png
index ea8e2cf74..ea8e2cf74 100644
--- a/graphics/pokemon/front_pics/claydol_still_front_pic.png
+++ b/graphics/pokemon/claydol/front.png
diff --git a/graphics/pokemon/icons/claydol_icon.png b/graphics/pokemon/claydol/icon.png
index 3f3f04ead..3f3f04ead 100644
--- a/graphics/pokemon/icons/claydol_icon.png
+++ b/graphics/pokemon/claydol/icon.png
diff --git a/graphics/pokemon/palettes/claydol_palette.pal b/graphics/pokemon/claydol/normal.pal
index cd7f876c5..cd7f876c5 100644
--- a/graphics/pokemon/palettes/claydol_palette.pal
+++ b/graphics/pokemon/claydol/normal.pal
diff --git a/graphics/pokemon/palettes/claydol_shiny_palette.pal b/graphics/pokemon/claydol/shiny.pal
index e4203b19b..e4203b19b 100644
--- a/graphics/pokemon/palettes/claydol_shiny_palette.pal
+++ b/graphics/pokemon/claydol/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/clefable_front_pic.png b/graphics/pokemon/clefable/anim_front.png
index ee7af0d1b..ee7af0d1b 100644
--- a/graphics/pokemon/anim_front_pics/clefable_front_pic.png
+++ b/graphics/pokemon/clefable/anim_front.png
diff --git a/graphics/pokemon/back_pics/clefable_back_pic.png b/graphics/pokemon/clefable/back.png
index 42592b8d7..42592b8d7 100644
--- a/graphics/pokemon/back_pics/clefable_back_pic.png
+++ b/graphics/pokemon/clefable/back.png
diff --git a/graphics/pokemon/footprints/clefable_footprint.png b/graphics/pokemon/clefable/footprint.png
index 5ff3e19a1..5ff3e19a1 100644
--- a/graphics/pokemon/footprints/clefable_footprint.png
+++ b/graphics/pokemon/clefable/footprint.png
diff --git a/graphics/pokemon/front_pics/clefable_still_front_pic.png b/graphics/pokemon/clefable/front.png
index e1894fdfa..e1894fdfa 100644
--- a/graphics/pokemon/front_pics/clefable_still_front_pic.png
+++ b/graphics/pokemon/clefable/front.png
diff --git a/graphics/pokemon/icons/clefable_icon.png b/graphics/pokemon/clefable/icon.png
index 4078e2854..4078e2854 100644
--- a/graphics/pokemon/icons/clefable_icon.png
+++ b/graphics/pokemon/clefable/icon.png
diff --git a/graphics/pokemon/palettes/clefable_palette.pal b/graphics/pokemon/clefable/normal.pal
index 0befc3d13..0befc3d13 100644
--- a/graphics/pokemon/palettes/clefable_palette.pal
+++ b/graphics/pokemon/clefable/normal.pal
diff --git a/graphics/pokemon/palettes/clefable_shiny_palette.pal b/graphics/pokemon/clefable/shiny.pal
index d89afdc81..d89afdc81 100644
--- a/graphics/pokemon/palettes/clefable_shiny_palette.pal
+++ b/graphics/pokemon/clefable/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/clefairy_front_pic.png b/graphics/pokemon/clefairy/anim_front.png
index 633414022..633414022 100644
--- a/graphics/pokemon/anim_front_pics/clefairy_front_pic.png
+++ b/graphics/pokemon/clefairy/anim_front.png
diff --git a/graphics/pokemon/back_pics/clefairy_back_pic.png b/graphics/pokemon/clefairy/back.png
index 6720a7865..6720a7865 100644
--- a/graphics/pokemon/back_pics/clefairy_back_pic.png
+++ b/graphics/pokemon/clefairy/back.png
diff --git a/graphics/pokemon/footprints/clefairy_footprint.png b/graphics/pokemon/clefairy/footprint.png
index 85c25a5dc..85c25a5dc 100644
--- a/graphics/pokemon/footprints/clefairy_footprint.png
+++ b/graphics/pokemon/clefairy/footprint.png
diff --git a/graphics/pokemon/front_pics/clefairy_still_front_pic.png b/graphics/pokemon/clefairy/front.png
index faa5af32d..faa5af32d 100644
--- a/graphics/pokemon/front_pics/clefairy_still_front_pic.png
+++ b/graphics/pokemon/clefairy/front.png
diff --git a/graphics/pokemon/icons/clefairy_icon.png b/graphics/pokemon/clefairy/icon.png
index 7895bb93c..7895bb93c 100644
--- a/graphics/pokemon/icons/clefairy_icon.png
+++ b/graphics/pokemon/clefairy/icon.png
diff --git a/graphics/pokemon/palettes/clefairy_palette.pal b/graphics/pokemon/clefairy/normal.pal
index 7a7bcf171..7a7bcf171 100644
--- a/graphics/pokemon/palettes/clefairy_palette.pal
+++ b/graphics/pokemon/clefairy/normal.pal
diff --git a/graphics/pokemon/palettes/clefairy_shiny_palette.pal b/graphics/pokemon/clefairy/shiny.pal
index 7cb5d7bfc..7cb5d7bfc 100644
--- a/graphics/pokemon/palettes/clefairy_shiny_palette.pal
+++ b/graphics/pokemon/clefairy/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cleffa_front_pic.png b/graphics/pokemon/cleffa/anim_front.png
index 19256d078..19256d078 100644
--- a/graphics/pokemon/anim_front_pics/cleffa_front_pic.png
+++ b/graphics/pokemon/cleffa/anim_front.png
diff --git a/graphics/pokemon/back_pics/cleffa_back_pic.png b/graphics/pokemon/cleffa/back.png
index b110614e1..b110614e1 100644
--- a/graphics/pokemon/back_pics/cleffa_back_pic.png
+++ b/graphics/pokemon/cleffa/back.png
diff --git a/graphics/pokemon/footprints/cleffa_footprint.png b/graphics/pokemon/cleffa/footprint.png
index 4bf9339ae..4bf9339ae 100644
--- a/graphics/pokemon/footprints/cleffa_footprint.png
+++ b/graphics/pokemon/cleffa/footprint.png
diff --git a/graphics/pokemon/front_pics/cleffa_still_front_pic.png b/graphics/pokemon/cleffa/front.png
index 82b6c103b..82b6c103b 100644
--- a/graphics/pokemon/front_pics/cleffa_still_front_pic.png
+++ b/graphics/pokemon/cleffa/front.png
diff --git a/graphics/pokemon/icons/cleffa_icon.png b/graphics/pokemon/cleffa/icon.png
index e866394f0..e866394f0 100644
--- a/graphics/pokemon/icons/cleffa_icon.png
+++ b/graphics/pokemon/cleffa/icon.png
diff --git a/graphics/pokemon/palettes/cleffa_palette.pal b/graphics/pokemon/cleffa/normal.pal
index 757446357..757446357 100644
--- a/graphics/pokemon/palettes/cleffa_palette.pal
+++ b/graphics/pokemon/cleffa/normal.pal
diff --git a/graphics/pokemon/palettes/cleffa_shiny_palette.pal b/graphics/pokemon/cleffa/shiny.pal
index 1af070d66..1af070d66 100644
--- a/graphics/pokemon/palettes/cleffa_shiny_palette.pal
+++ b/graphics/pokemon/cleffa/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cloyster_front_pic.png b/graphics/pokemon/cloyster/anim_front.png
index e6331a126..e6331a126 100644
--- a/graphics/pokemon/anim_front_pics/cloyster_front_pic.png
+++ b/graphics/pokemon/cloyster/anim_front.png
diff --git a/graphics/pokemon/back_pics/cloyster_back_pic.png b/graphics/pokemon/cloyster/back.png
index fa69b7b59..fa69b7b59 100644
--- a/graphics/pokemon/back_pics/cloyster_back_pic.png
+++ b/graphics/pokemon/cloyster/back.png
diff --git a/graphics/pokemon/footprints/cloyster_footprint.png b/graphics/pokemon/cloyster/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/cloyster_footprint.png
+++ b/graphics/pokemon/cloyster/footprint.png
diff --git a/graphics/pokemon/front_pics/cloyster_still_front_pic.png b/graphics/pokemon/cloyster/front.png
index 7390f523d..7390f523d 100644
--- a/graphics/pokemon/front_pics/cloyster_still_front_pic.png
+++ b/graphics/pokemon/cloyster/front.png
diff --git a/graphics/pokemon/icons/cloyster_icon.png b/graphics/pokemon/cloyster/icon.png
index 71ca401c4..71ca401c4 100644
--- a/graphics/pokemon/icons/cloyster_icon.png
+++ b/graphics/pokemon/cloyster/icon.png
diff --git a/graphics/pokemon/palettes/cloyster_palette.pal b/graphics/pokemon/cloyster/normal.pal
index a53db8d44..a53db8d44 100644
--- a/graphics/pokemon/palettes/cloyster_palette.pal
+++ b/graphics/pokemon/cloyster/normal.pal
diff --git a/graphics/pokemon/palettes/cloyster_shiny_palette.pal b/graphics/pokemon/cloyster/shiny.pal
index 8a0d5bd4b..8a0d5bd4b 100644
--- a/graphics/pokemon/palettes/cloyster_shiny_palette.pal
+++ b/graphics/pokemon/cloyster/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/combusken_front_pic.png b/graphics/pokemon/combusken/anim_front.png
index ffa1748b3..ffa1748b3 100644
--- a/graphics/pokemon/anim_front_pics/combusken_front_pic.png
+++ b/graphics/pokemon/combusken/anim_front.png
diff --git a/graphics/pokemon/back_pics/combusken_back_pic.png b/graphics/pokemon/combusken/back.png
index 6c6d094dd..6c6d094dd 100644
--- a/graphics/pokemon/back_pics/combusken_back_pic.png
+++ b/graphics/pokemon/combusken/back.png
diff --git a/graphics/pokemon/footprints/combusken_footprint.png b/graphics/pokemon/combusken/footprint.png
index 6b66429d8..6b66429d8 100644
--- a/graphics/pokemon/footprints/combusken_footprint.png
+++ b/graphics/pokemon/combusken/footprint.png
diff --git a/graphics/pokemon/front_pics/combusken_still_front_pic.png b/graphics/pokemon/combusken/front.png
index 5852709f3..5852709f3 100644
--- a/graphics/pokemon/front_pics/combusken_still_front_pic.png
+++ b/graphics/pokemon/combusken/front.png
diff --git a/graphics/pokemon/icons/combusken_icon.png b/graphics/pokemon/combusken/icon.png
index 3cdd0f5c1..3cdd0f5c1 100644
--- a/graphics/pokemon/icons/combusken_icon.png
+++ b/graphics/pokemon/combusken/icon.png
diff --git a/graphics/pokemon/palettes/combusken_palette.pal b/graphics/pokemon/combusken/normal.pal
index 7327dbece..7327dbece 100644
--- a/graphics/pokemon/palettes/combusken_palette.pal
+++ b/graphics/pokemon/combusken/normal.pal
diff --git a/graphics/pokemon/palettes/combusken_shiny_palette.pal b/graphics/pokemon/combusken/shiny.pal
index 6fbb74b08..6fbb74b08 100644
--- a/graphics/pokemon/palettes/combusken_shiny_palette.pal
+++ b/graphics/pokemon/combusken/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/corphish_front_pic.png b/graphics/pokemon/corphish/anim_front.png
index 8e8ac3d23..8e8ac3d23 100644
--- a/graphics/pokemon/anim_front_pics/corphish_front_pic.png
+++ b/graphics/pokemon/corphish/anim_front.png
diff --git a/graphics/pokemon/back_pics/corphish_back_pic.png b/graphics/pokemon/corphish/back.png
index 01d603778..01d603778 100644
--- a/graphics/pokemon/back_pics/corphish_back_pic.png
+++ b/graphics/pokemon/corphish/back.png
diff --git a/graphics/pokemon/footprints/corphish_footprint.png b/graphics/pokemon/corphish/footprint.png
index f624724c7..f624724c7 100644
--- a/graphics/pokemon/footprints/corphish_footprint.png
+++ b/graphics/pokemon/corphish/footprint.png
diff --git a/graphics/pokemon/front_pics/corphish_still_front_pic.png b/graphics/pokemon/corphish/front.png
index f8a06a67c..f8a06a67c 100644
--- a/graphics/pokemon/front_pics/corphish_still_front_pic.png
+++ b/graphics/pokemon/corphish/front.png
diff --git a/graphics/pokemon/icons/corphish_icon.png b/graphics/pokemon/corphish/icon.png
index f14b262d2..f14b262d2 100644
--- a/graphics/pokemon/icons/corphish_icon.png
+++ b/graphics/pokemon/corphish/icon.png
diff --git a/graphics/pokemon/palettes/corphish_palette.pal b/graphics/pokemon/corphish/normal.pal
index 0fd4ea330..0fd4ea330 100644
--- a/graphics/pokemon/palettes/corphish_palette.pal
+++ b/graphics/pokemon/corphish/normal.pal
diff --git a/graphics/pokemon/palettes/corphish_shiny_palette.pal b/graphics/pokemon/corphish/shiny.pal
index a3eb45805..a3eb45805 100644
--- a/graphics/pokemon/palettes/corphish_shiny_palette.pal
+++ b/graphics/pokemon/corphish/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/corsola_front_pic.png b/graphics/pokemon/corsola/anim_front.png
index c37d0e054..c37d0e054 100644
--- a/graphics/pokemon/anim_front_pics/corsola_front_pic.png
+++ b/graphics/pokemon/corsola/anim_front.png
diff --git a/graphics/pokemon/back_pics/corsola_back_pic.png b/graphics/pokemon/corsola/back.png
index d15f330fc..d15f330fc 100644
--- a/graphics/pokemon/back_pics/corsola_back_pic.png
+++ b/graphics/pokemon/corsola/back.png
diff --git a/graphics/pokemon/footprints/corsola_footprint.png b/graphics/pokemon/corsola/footprint.png
index bae0aaf92..bae0aaf92 100644
--- a/graphics/pokemon/footprints/corsola_footprint.png
+++ b/graphics/pokemon/corsola/footprint.png
diff --git a/graphics/pokemon/front_pics/corsola_still_front_pic.png b/graphics/pokemon/corsola/front.png
index 550ddbbe3..550ddbbe3 100644
--- a/graphics/pokemon/front_pics/corsola_still_front_pic.png
+++ b/graphics/pokemon/corsola/front.png
diff --git a/graphics/pokemon/icons/corsola_icon.png b/graphics/pokemon/corsola/icon.png
index dd2d2e82e..dd2d2e82e 100644
--- a/graphics/pokemon/icons/corsola_icon.png
+++ b/graphics/pokemon/corsola/icon.png
diff --git a/graphics/pokemon/palettes/corsola_palette.pal b/graphics/pokemon/corsola/normal.pal
index 95c7616fe..95c7616fe 100644
--- a/graphics/pokemon/palettes/corsola_palette.pal
+++ b/graphics/pokemon/corsola/normal.pal
diff --git a/graphics/pokemon/palettes/corsola_shiny_palette.pal b/graphics/pokemon/corsola/shiny.pal
index 13daa4e26..13daa4e26 100644
--- a/graphics/pokemon/palettes/corsola_shiny_palette.pal
+++ b/graphics/pokemon/corsola/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cradily_front_pic.png b/graphics/pokemon/cradily/anim_front.png
index b38c51c8e..b38c51c8e 100644
--- a/graphics/pokemon/anim_front_pics/cradily_front_pic.png
+++ b/graphics/pokemon/cradily/anim_front.png
diff --git a/graphics/pokemon/back_pics/cradily_back_pic.png b/graphics/pokemon/cradily/back.png
index 338c7f0ba..338c7f0ba 100644
--- a/graphics/pokemon/back_pics/cradily_back_pic.png
+++ b/graphics/pokemon/cradily/back.png
diff --git a/graphics/pokemon/footprints/cradily_footprint.png b/graphics/pokemon/cradily/footprint.png
index 998229dc7..998229dc7 100644
--- a/graphics/pokemon/footprints/cradily_footprint.png
+++ b/graphics/pokemon/cradily/footprint.png
diff --git a/graphics/pokemon/front_pics/cradily_still_front_pic.png b/graphics/pokemon/cradily/front.png
index 0bc94d6a3..0bc94d6a3 100644
--- a/graphics/pokemon/front_pics/cradily_still_front_pic.png
+++ b/graphics/pokemon/cradily/front.png
diff --git a/graphics/pokemon/icons/cradily_icon.png b/graphics/pokemon/cradily/icon.png
index ea57b45f1..ea57b45f1 100644
--- a/graphics/pokemon/icons/cradily_icon.png
+++ b/graphics/pokemon/cradily/icon.png
diff --git a/graphics/pokemon/palettes/cradily_palette.pal b/graphics/pokemon/cradily/normal.pal
index 9167eb879..9167eb879 100644
--- a/graphics/pokemon/palettes/cradily_palette.pal
+++ b/graphics/pokemon/cradily/normal.pal
diff --git a/graphics/pokemon/palettes/cradily_shiny_palette.pal b/graphics/pokemon/cradily/shiny.pal
index 32a3b9e8f..32a3b9e8f 100644
--- a/graphics/pokemon/palettes/cradily_shiny_palette.pal
+++ b/graphics/pokemon/cradily/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/crawdaunt_front_pic.png b/graphics/pokemon/crawdaunt/anim_front.png
index f150b6d15..f150b6d15 100644
--- a/graphics/pokemon/anim_front_pics/crawdaunt_front_pic.png
+++ b/graphics/pokemon/crawdaunt/anim_front.png
diff --git a/graphics/pokemon/back_pics/crawdaunt_back_pic.png b/graphics/pokemon/crawdaunt/back.png
index f96f2c488..f96f2c488 100644
--- a/graphics/pokemon/back_pics/crawdaunt_back_pic.png
+++ b/graphics/pokemon/crawdaunt/back.png
diff --git a/graphics/pokemon/footprints/crawdaunt_footprint.png b/graphics/pokemon/crawdaunt/footprint.png
index 9169e2807..9169e2807 100644
--- a/graphics/pokemon/footprints/crawdaunt_footprint.png
+++ b/graphics/pokemon/crawdaunt/footprint.png
diff --git a/graphics/pokemon/front_pics/crawdaunt_still_front_pic.png b/graphics/pokemon/crawdaunt/front.png
index 88ee71100..88ee71100 100644
--- a/graphics/pokemon/front_pics/crawdaunt_still_front_pic.png
+++ b/graphics/pokemon/crawdaunt/front.png
diff --git a/graphics/pokemon/icons/crawdaunt_icon.png b/graphics/pokemon/crawdaunt/icon.png
index 605482d25..605482d25 100644
--- a/graphics/pokemon/icons/crawdaunt_icon.png
+++ b/graphics/pokemon/crawdaunt/icon.png
diff --git a/graphics/pokemon/palettes/crawdaunt_palette.pal b/graphics/pokemon/crawdaunt/normal.pal
index 7fe04e329..7fe04e329 100644
--- a/graphics/pokemon/palettes/crawdaunt_palette.pal
+++ b/graphics/pokemon/crawdaunt/normal.pal
diff --git a/graphics/pokemon/palettes/crawdaunt_shiny_palette.pal b/graphics/pokemon/crawdaunt/shiny.pal
index 21b58b2a0..21b58b2a0 100644
--- a/graphics/pokemon/palettes/crawdaunt_shiny_palette.pal
+++ b/graphics/pokemon/crawdaunt/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/crobat_front_pic.png b/graphics/pokemon/crobat/anim_front.png
index 1843423b7..1843423b7 100644
--- a/graphics/pokemon/anim_front_pics/crobat_front_pic.png
+++ b/graphics/pokemon/crobat/anim_front.png
diff --git a/graphics/pokemon/back_pics/crobat_back_pic.png b/graphics/pokemon/crobat/back.png
index d14ecec7b..d14ecec7b 100644
--- a/graphics/pokemon/back_pics/crobat_back_pic.png
+++ b/graphics/pokemon/crobat/back.png
diff --git a/graphics/pokemon/footprints/crobat_footprint.png b/graphics/pokemon/crobat/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/crobat_footprint.png
+++ b/graphics/pokemon/crobat/footprint.png
diff --git a/graphics/pokemon/front_pics/crobat_still_front_pic.png b/graphics/pokemon/crobat/front.png
index b61cdebe7..b61cdebe7 100644
--- a/graphics/pokemon/front_pics/crobat_still_front_pic.png
+++ b/graphics/pokemon/crobat/front.png
diff --git a/graphics/pokemon/icons/crobat_icon.png b/graphics/pokemon/crobat/icon.png
index 817951dd0..817951dd0 100644
--- a/graphics/pokemon/icons/crobat_icon.png
+++ b/graphics/pokemon/crobat/icon.png
diff --git a/graphics/pokemon/palettes/crobat_palette.pal b/graphics/pokemon/crobat/normal.pal
index 9c466e9e8..9c466e9e8 100644
--- a/graphics/pokemon/palettes/crobat_palette.pal
+++ b/graphics/pokemon/crobat/normal.pal
diff --git a/graphics/pokemon/palettes/crobat_shiny_palette.pal b/graphics/pokemon/crobat/shiny.pal
index 8f22fd4b0..8f22fd4b0 100644
--- a/graphics/pokemon/palettes/crobat_shiny_palette.pal
+++ b/graphics/pokemon/crobat/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/croconaw_front_pic.png b/graphics/pokemon/croconaw/anim_front.png
index e7d23841b..e7d23841b 100644
--- a/graphics/pokemon/anim_front_pics/croconaw_front_pic.png
+++ b/graphics/pokemon/croconaw/anim_front.png
diff --git a/graphics/pokemon/back_pics/croconaw_back_pic.png b/graphics/pokemon/croconaw/back.png
index 991be60bc..991be60bc 100644
--- a/graphics/pokemon/back_pics/croconaw_back_pic.png
+++ b/graphics/pokemon/croconaw/back.png
diff --git a/graphics/pokemon/footprints/croconaw_footprint.png b/graphics/pokemon/croconaw/footprint.png
index 43da8e68e..43da8e68e 100644
--- a/graphics/pokemon/footprints/croconaw_footprint.png
+++ b/graphics/pokemon/croconaw/footprint.png
diff --git a/graphics/pokemon/front_pics/croconaw_still_front_pic.png b/graphics/pokemon/croconaw/front.png
index 585be79f4..585be79f4 100644
--- a/graphics/pokemon/front_pics/croconaw_still_front_pic.png
+++ b/graphics/pokemon/croconaw/front.png
diff --git a/graphics/pokemon/icons/croconaw_icon.png b/graphics/pokemon/croconaw/icon.png
index 6f57e5656..6f57e5656 100644
--- a/graphics/pokemon/icons/croconaw_icon.png
+++ b/graphics/pokemon/croconaw/icon.png
diff --git a/graphics/pokemon/palettes/croconaw_palette.pal b/graphics/pokemon/croconaw/normal.pal
index 2e64441a4..2e64441a4 100644
--- a/graphics/pokemon/palettes/croconaw_palette.pal
+++ b/graphics/pokemon/croconaw/normal.pal
diff --git a/graphics/pokemon/palettes/croconaw_shiny_palette.pal b/graphics/pokemon/croconaw/shiny.pal
index 847f2ed29..847f2ed29 100644
--- a/graphics/pokemon/palettes/croconaw_shiny_palette.pal
+++ b/graphics/pokemon/croconaw/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cubone_front_pic.png b/graphics/pokemon/cubone/anim_front.png
index 42fd8be2c..42fd8be2c 100644
--- a/graphics/pokemon/anim_front_pics/cubone_front_pic.png
+++ b/graphics/pokemon/cubone/anim_front.png
diff --git a/graphics/pokemon/back_pics/cubone_back_pic.png b/graphics/pokemon/cubone/back.png
index a7b879b40..a7b879b40 100644
--- a/graphics/pokemon/back_pics/cubone_back_pic.png
+++ b/graphics/pokemon/cubone/back.png
diff --git a/graphics/pokemon/footprints/cubone_footprint.png b/graphics/pokemon/cubone/footprint.png
index 21deee1a6..21deee1a6 100644
--- a/graphics/pokemon/footprints/cubone_footprint.png
+++ b/graphics/pokemon/cubone/footprint.png
diff --git a/graphics/pokemon/front_pics/cubone_still_front_pic.png b/graphics/pokemon/cubone/front.png
index 3ce31c79c..3ce31c79c 100644
--- a/graphics/pokemon/front_pics/cubone_still_front_pic.png
+++ b/graphics/pokemon/cubone/front.png
diff --git a/graphics/pokemon/icons/cubone_icon.png b/graphics/pokemon/cubone/icon.png
index 679d8e7e5..679d8e7e5 100644
--- a/graphics/pokemon/icons/cubone_icon.png
+++ b/graphics/pokemon/cubone/icon.png
diff --git a/graphics/pokemon/palettes/cubone_palette.pal b/graphics/pokemon/cubone/normal.pal
index faaeef75c..faaeef75c 100644
--- a/graphics/pokemon/palettes/cubone_palette.pal
+++ b/graphics/pokemon/cubone/normal.pal
diff --git a/graphics/pokemon/palettes/cubone_shiny_palette.pal b/graphics/pokemon/cubone/shiny.pal
index 51b6bc8ba..51b6bc8ba 100644
--- a/graphics/pokemon/palettes/cubone_shiny_palette.pal
+++ b/graphics/pokemon/cubone/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/cyndaquil_front_pic.png b/graphics/pokemon/cyndaquil/anim_front.png
index 3974d5b40..3974d5b40 100644
--- a/graphics/pokemon/anim_front_pics/cyndaquil_front_pic.png
+++ b/graphics/pokemon/cyndaquil/anim_front.png
diff --git a/graphics/pokemon/back_pics/cyndaquil_back_pic.png b/graphics/pokemon/cyndaquil/back.png
index cfc64164e..cfc64164e 100644
--- a/graphics/pokemon/back_pics/cyndaquil_back_pic.png
+++ b/graphics/pokemon/cyndaquil/back.png
diff --git a/graphics/pokemon/footprints/cyndaquil_footprint.png b/graphics/pokemon/cyndaquil/footprint.png
index 6413cbaae..6413cbaae 100644
--- a/graphics/pokemon/footprints/cyndaquil_footprint.png
+++ b/graphics/pokemon/cyndaquil/footprint.png
diff --git a/graphics/pokemon/front_pics/cyndaquil_still_front_pic.png b/graphics/pokemon/cyndaquil/front.png
index 1a31da433..1a31da433 100644
--- a/graphics/pokemon/front_pics/cyndaquil_still_front_pic.png
+++ b/graphics/pokemon/cyndaquil/front.png
diff --git a/graphics/pokemon/icons/cyndaquil_icon.png b/graphics/pokemon/cyndaquil/icon.png
index 5f174dcf1..5f174dcf1 100644
--- a/graphics/pokemon/icons/cyndaquil_icon.png
+++ b/graphics/pokemon/cyndaquil/icon.png
diff --git a/graphics/pokemon/palettes/cyndaquil_palette.pal b/graphics/pokemon/cyndaquil/normal.pal
index 46fb06347..46fb06347 100644
--- a/graphics/pokemon/palettes/cyndaquil_palette.pal
+++ b/graphics/pokemon/cyndaquil/normal.pal
diff --git a/graphics/pokemon/palettes/cyndaquil_shiny_palette.pal b/graphics/pokemon/cyndaquil/shiny.pal
index 14e35dbc5..14e35dbc5 100644
--- a/graphics/pokemon/palettes/cyndaquil_shiny_palette.pal
+++ b/graphics/pokemon/cyndaquil/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/delcatty_front_pic.png b/graphics/pokemon/delcatty/anim_front.png
index ca4bad007..ca4bad007 100644
--- a/graphics/pokemon/anim_front_pics/delcatty_front_pic.png
+++ b/graphics/pokemon/delcatty/anim_front.png
diff --git a/graphics/pokemon/back_pics/delcatty_back_pic.png b/graphics/pokemon/delcatty/back.png
index 38bcfd5a7..38bcfd5a7 100644
--- a/graphics/pokemon/back_pics/delcatty_back_pic.png
+++ b/graphics/pokemon/delcatty/back.png
diff --git a/graphics/pokemon/footprints/delcatty_footprint.png b/graphics/pokemon/delcatty/footprint.png
index 5ff40e5a0..5ff40e5a0 100644
--- a/graphics/pokemon/footprints/delcatty_footprint.png
+++ b/graphics/pokemon/delcatty/footprint.png
diff --git a/graphics/pokemon/front_pics/delcatty_still_front_pic.png b/graphics/pokemon/delcatty/front.png
index bfb7f3894..bfb7f3894 100644
--- a/graphics/pokemon/front_pics/delcatty_still_front_pic.png
+++ b/graphics/pokemon/delcatty/front.png
diff --git a/graphics/pokemon/icons/delcatty_icon.png b/graphics/pokemon/delcatty/icon.png
index b5d874a88..b5d874a88 100644
--- a/graphics/pokemon/icons/delcatty_icon.png
+++ b/graphics/pokemon/delcatty/icon.png
diff --git a/graphics/pokemon/palettes/delcatty_palette.pal b/graphics/pokemon/delcatty/normal.pal
index 7d7d44e12..7d7d44e12 100644
--- a/graphics/pokemon/palettes/delcatty_palette.pal
+++ b/graphics/pokemon/delcatty/normal.pal
diff --git a/graphics/pokemon/palettes/delcatty_shiny_palette.pal b/graphics/pokemon/delcatty/shiny.pal
index caf7d7be8..caf7d7be8 100644
--- a/graphics/pokemon/palettes/delcatty_shiny_palette.pal
+++ b/graphics/pokemon/delcatty/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/delibird_front_pic.png b/graphics/pokemon/delibird/anim_front.png
index 43ba20e19..43ba20e19 100644
--- a/graphics/pokemon/anim_front_pics/delibird_front_pic.png
+++ b/graphics/pokemon/delibird/anim_front.png
diff --git a/graphics/pokemon/back_pics/delibird_back_pic.png b/graphics/pokemon/delibird/back.png
index b4dccb119..b4dccb119 100644
--- a/graphics/pokemon/back_pics/delibird_back_pic.png
+++ b/graphics/pokemon/delibird/back.png
diff --git a/graphics/pokemon/footprints/delibird_footprint.png b/graphics/pokemon/delibird/footprint.png
index e7348586e..e7348586e 100644
--- a/graphics/pokemon/footprints/delibird_footprint.png
+++ b/graphics/pokemon/delibird/footprint.png
diff --git a/graphics/pokemon/front_pics/delibird_still_front_pic.png b/graphics/pokemon/delibird/front.png
index b31baa203..b31baa203 100644
--- a/graphics/pokemon/front_pics/delibird_still_front_pic.png
+++ b/graphics/pokemon/delibird/front.png
diff --git a/graphics/pokemon/icons/delibird_icon.png b/graphics/pokemon/delibird/icon.png
index 438f80863..438f80863 100644
--- a/graphics/pokemon/icons/delibird_icon.png
+++ b/graphics/pokemon/delibird/icon.png
diff --git a/graphics/pokemon/palettes/delibird_palette.pal b/graphics/pokemon/delibird/normal.pal
index a975e93d3..a975e93d3 100644
--- a/graphics/pokemon/palettes/delibird_palette.pal
+++ b/graphics/pokemon/delibird/normal.pal
diff --git a/graphics/pokemon/palettes/delibird_shiny_palette.pal b/graphics/pokemon/delibird/shiny.pal
index f94267729..f94267729 100644
--- a/graphics/pokemon/palettes/delibird_shiny_palette.pal
+++ b/graphics/pokemon/delibird/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/deoxys_front_pic.png b/graphics/pokemon/deoxys/anim_front.png
index dc7faf915..dc7faf915 100644
--- a/graphics/pokemon/anim_front_pics/deoxys_front_pic.png
+++ b/graphics/pokemon/deoxys/anim_front.png
diff --git a/graphics/pokemon/back_pics/deoxys_back_pic.png b/graphics/pokemon/deoxys/back.png
index d8ba065fd..d8ba065fd 100644
--- a/graphics/pokemon/back_pics/deoxys_back_pic.png
+++ b/graphics/pokemon/deoxys/back.png
diff --git a/graphics/pokemon/footprints/deoxys_footprint.png b/graphics/pokemon/deoxys/footprint.png
index ea97e4014..ea97e4014 100644
--- a/graphics/pokemon/footprints/deoxys_footprint.png
+++ b/graphics/pokemon/deoxys/footprint.png
diff --git a/graphics/pokemon/front_pics/deoxys_still_front_pic.png b/graphics/pokemon/deoxys/front.png
index 4b3b5fa6b..4b3b5fa6b 100644
--- a/graphics/pokemon/front_pics/deoxys_still_front_pic.png
+++ b/graphics/pokemon/deoxys/front.png
diff --git a/graphics/pokemon/icons/deoxys_icon.png b/graphics/pokemon/deoxys/icon.png
index 18735fc72..18735fc72 100644
--- a/graphics/pokemon/icons/deoxys_icon.png
+++ b/graphics/pokemon/deoxys/icon.png
diff --git a/graphics/pokemon/icons/deoxys_speed_icon.png b/graphics/pokemon/deoxys/icon_speed.png
index 674b93a9c..674b93a9c 100644
--- a/graphics/pokemon/icons/deoxys_speed_icon.png
+++ b/graphics/pokemon/deoxys/icon_speed.png
diff --git a/graphics/pokemon/palettes/deoxys_palette.pal b/graphics/pokemon/deoxys/normal.pal
index 90fcff114..90fcff114 100644
--- a/graphics/pokemon/palettes/deoxys_palette.pal
+++ b/graphics/pokemon/deoxys/normal.pal
diff --git a/graphics/pokemon/palettes/deoxys_shiny_palette.pal b/graphics/pokemon/deoxys/shiny.pal
index 74b8fc777..74b8fc777 100644
--- a/graphics/pokemon/palettes/deoxys_shiny_palette.pal
+++ b/graphics/pokemon/deoxys/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dewgong_front_pic.png b/graphics/pokemon/dewgong/anim_front.png
index 035275cc0..035275cc0 100644
--- a/graphics/pokemon/anim_front_pics/dewgong_front_pic.png
+++ b/graphics/pokemon/dewgong/anim_front.png
diff --git a/graphics/pokemon/back_pics/dewgong_back_pic.png b/graphics/pokemon/dewgong/back.png
index ba6c297ea..ba6c297ea 100644
--- a/graphics/pokemon/back_pics/dewgong_back_pic.png
+++ b/graphics/pokemon/dewgong/back.png
diff --git a/graphics/pokemon/footprints/dewgong_footprint.png b/graphics/pokemon/dewgong/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/dewgong_footprint.png
+++ b/graphics/pokemon/dewgong/footprint.png
diff --git a/graphics/pokemon/front_pics/dewgong_still_front_pic.png b/graphics/pokemon/dewgong/front.png
index 315df9d0f..315df9d0f 100644
--- a/graphics/pokemon/front_pics/dewgong_still_front_pic.png
+++ b/graphics/pokemon/dewgong/front.png
diff --git a/graphics/pokemon/icons/dewgong_icon.png b/graphics/pokemon/dewgong/icon.png
index ea227df7c..ea227df7c 100644
--- a/graphics/pokemon/icons/dewgong_icon.png
+++ b/graphics/pokemon/dewgong/icon.png
diff --git a/graphics/pokemon/palettes/dewgong_palette.pal b/graphics/pokemon/dewgong/normal.pal
index d3440f5a3..d3440f5a3 100644
--- a/graphics/pokemon/palettes/dewgong_palette.pal
+++ b/graphics/pokemon/dewgong/normal.pal
diff --git a/graphics/pokemon/palettes/dewgong_shiny_palette.pal b/graphics/pokemon/dewgong/shiny.pal
index 02a02aa66..02a02aa66 100644
--- a/graphics/pokemon/palettes/dewgong_shiny_palette.pal
+++ b/graphics/pokemon/dewgong/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/diglett_front_pic.png b/graphics/pokemon/diglett/anim_front.png
index f06decaa8..f06decaa8 100644
--- a/graphics/pokemon/anim_front_pics/diglett_front_pic.png
+++ b/graphics/pokemon/diglett/anim_front.png
diff --git a/graphics/pokemon/back_pics/diglett_back_pic.png b/graphics/pokemon/diglett/back.png
index 7f0b0863b..7f0b0863b 100644
--- a/graphics/pokemon/back_pics/diglett_back_pic.png
+++ b/graphics/pokemon/diglett/back.png
diff --git a/graphics/pokemon/footprints/diglett_footprint.png b/graphics/pokemon/diglett/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/diglett_footprint.png
+++ b/graphics/pokemon/diglett/footprint.png
diff --git a/graphics/pokemon/front_pics/diglett_still_front_pic.png b/graphics/pokemon/diglett/front.png
index 20579c491..20579c491 100644
--- a/graphics/pokemon/front_pics/diglett_still_front_pic.png
+++ b/graphics/pokemon/diglett/front.png
diff --git a/graphics/pokemon/icons/diglett_icon.png b/graphics/pokemon/diglett/icon.png
index 43db9f62d..43db9f62d 100644
--- a/graphics/pokemon/icons/diglett_icon.png
+++ b/graphics/pokemon/diglett/icon.png
diff --git a/graphics/pokemon/palettes/diglett_palette.pal b/graphics/pokemon/diglett/normal.pal
index 431b7e0f0..431b7e0f0 100644
--- a/graphics/pokemon/palettes/diglett_palette.pal
+++ b/graphics/pokemon/diglett/normal.pal
diff --git a/graphics/pokemon/palettes/diglett_shiny_palette.pal b/graphics/pokemon/diglett/shiny.pal
index c7c26b7e5..c7c26b7e5 100644
--- a/graphics/pokemon/palettes/diglett_shiny_palette.pal
+++ b/graphics/pokemon/diglett/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ditto_front_pic.png b/graphics/pokemon/ditto/anim_front.png
index 4a8120ace..4a8120ace 100644
--- a/graphics/pokemon/anim_front_pics/ditto_front_pic.png
+++ b/graphics/pokemon/ditto/anim_front.png
diff --git a/graphics/pokemon/back_pics/ditto_back_pic.png b/graphics/pokemon/ditto/back.png
index 002635423..002635423 100644
--- a/graphics/pokemon/back_pics/ditto_back_pic.png
+++ b/graphics/pokemon/ditto/back.png
diff --git a/graphics/pokemon/footprints/ditto_footprint.png b/graphics/pokemon/ditto/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/ditto_footprint.png
+++ b/graphics/pokemon/ditto/footprint.png
diff --git a/graphics/pokemon/front_pics/ditto_still_front_pic.png b/graphics/pokemon/ditto/front.png
index 52eef0e60..52eef0e60 100644
--- a/graphics/pokemon/front_pics/ditto_still_front_pic.png
+++ b/graphics/pokemon/ditto/front.png
diff --git a/graphics/pokemon/icons/ditto_icon.png b/graphics/pokemon/ditto/icon.png
index e6328feb5..e6328feb5 100644
--- a/graphics/pokemon/icons/ditto_icon.png
+++ b/graphics/pokemon/ditto/icon.png
diff --git a/graphics/pokemon/palettes/ditto_palette.pal b/graphics/pokemon/ditto/normal.pal
index 262742c15..262742c15 100644
--- a/graphics/pokemon/palettes/ditto_palette.pal
+++ b/graphics/pokemon/ditto/normal.pal
diff --git a/graphics/pokemon/palettes/ditto_shiny_palette.pal b/graphics/pokemon/ditto/shiny.pal
index 987958312..987958312 100644
--- a/graphics/pokemon/palettes/ditto_shiny_palette.pal
+++ b/graphics/pokemon/ditto/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dodrio_front_pic.png b/graphics/pokemon/dodrio/anim_front.png
index 96cead2d1..96cead2d1 100644
--- a/graphics/pokemon/anim_front_pics/dodrio_front_pic.png
+++ b/graphics/pokemon/dodrio/anim_front.png
diff --git a/graphics/pokemon/back_pics/dodrio_back_pic.png b/graphics/pokemon/dodrio/back.png
index 090c189e4..090c189e4 100644
--- a/graphics/pokemon/back_pics/dodrio_back_pic.png
+++ b/graphics/pokemon/dodrio/back.png
diff --git a/graphics/pokemon/footprints/dodrio_footprint.png b/graphics/pokemon/dodrio/footprint.png
index 34f85bfb3..34f85bfb3 100644
--- a/graphics/pokemon/footprints/dodrio_footprint.png
+++ b/graphics/pokemon/dodrio/footprint.png
diff --git a/graphics/pokemon/front_pics/dodrio_still_front_pic.png b/graphics/pokemon/dodrio/front.png
index 13ce71f56..13ce71f56 100644
--- a/graphics/pokemon/front_pics/dodrio_still_front_pic.png
+++ b/graphics/pokemon/dodrio/front.png
diff --git a/graphics/pokemon/icons/dodrio_icon.png b/graphics/pokemon/dodrio/icon.png
index 3d462999e..3d462999e 100644
--- a/graphics/pokemon/icons/dodrio_icon.png
+++ b/graphics/pokemon/dodrio/icon.png
diff --git a/graphics/pokemon/palettes/dodrio_palette.pal b/graphics/pokemon/dodrio/normal.pal
index 445bd3377..445bd3377 100644
--- a/graphics/pokemon/palettes/dodrio_palette.pal
+++ b/graphics/pokemon/dodrio/normal.pal
diff --git a/graphics/pokemon/palettes/dodrio_shiny_palette.pal b/graphics/pokemon/dodrio/shiny.pal
index e7c27940f..e7c27940f 100644
--- a/graphics/pokemon/palettes/dodrio_shiny_palette.pal
+++ b/graphics/pokemon/dodrio/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/doduo_front_pic.png b/graphics/pokemon/doduo/anim_front.png
index 7c0576996..7c0576996 100644
--- a/graphics/pokemon/anim_front_pics/doduo_front_pic.png
+++ b/graphics/pokemon/doduo/anim_front.png
diff --git a/graphics/pokemon/back_pics/doduo_back_pic.png b/graphics/pokemon/doduo/back.png
index 4589eff60..4589eff60 100644
--- a/graphics/pokemon/back_pics/doduo_back_pic.png
+++ b/graphics/pokemon/doduo/back.png
diff --git a/graphics/pokemon/footprints/doduo_footprint.png b/graphics/pokemon/doduo/footprint.png
index 0710eca52..0710eca52 100644
--- a/graphics/pokemon/footprints/doduo_footprint.png
+++ b/graphics/pokemon/doduo/footprint.png
diff --git a/graphics/pokemon/front_pics/doduo_still_front_pic.png b/graphics/pokemon/doduo/front.png
index 6773f0a6f..6773f0a6f 100644
--- a/graphics/pokemon/front_pics/doduo_still_front_pic.png
+++ b/graphics/pokemon/doduo/front.png
diff --git a/graphics/pokemon/icons/doduo_icon.png b/graphics/pokemon/doduo/icon.png
index 540834591..540834591 100644
--- a/graphics/pokemon/icons/doduo_icon.png
+++ b/graphics/pokemon/doduo/icon.png
diff --git a/graphics/pokemon/palettes/doduo_palette.pal b/graphics/pokemon/doduo/normal.pal
index d3213543a..d3213543a 100644
--- a/graphics/pokemon/palettes/doduo_palette.pal
+++ b/graphics/pokemon/doduo/normal.pal
diff --git a/graphics/pokemon/palettes/doduo_shiny_palette.pal b/graphics/pokemon/doduo/shiny.pal
index fa2c1c8fb..fa2c1c8fb 100644
--- a/graphics/pokemon/palettes/doduo_shiny_palette.pal
+++ b/graphics/pokemon/doduo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/donphan_front_pic.png b/graphics/pokemon/donphan/anim_front.png
index 23181fc63..23181fc63 100644
--- a/graphics/pokemon/anim_front_pics/donphan_front_pic.png
+++ b/graphics/pokemon/donphan/anim_front.png
diff --git a/graphics/pokemon/back_pics/donphan_back_pic.png b/graphics/pokemon/donphan/back.png
index d50d467ee..d50d467ee 100644
--- a/graphics/pokemon/back_pics/donphan_back_pic.png
+++ b/graphics/pokemon/donphan/back.png
diff --git a/graphics/pokemon/footprints/donphan_footprint.png b/graphics/pokemon/donphan/footprint.png
index 394cf6457..394cf6457 100644
--- a/graphics/pokemon/footprints/donphan_footprint.png
+++ b/graphics/pokemon/donphan/footprint.png
diff --git a/graphics/pokemon/front_pics/donphan_still_front_pic.png b/graphics/pokemon/donphan/front.png
index c971f446a..c971f446a 100644
--- a/graphics/pokemon/front_pics/donphan_still_front_pic.png
+++ b/graphics/pokemon/donphan/front.png
diff --git a/graphics/pokemon/icons/donphan_icon.png b/graphics/pokemon/donphan/icon.png
index 09000b166..09000b166 100644
--- a/graphics/pokemon/icons/donphan_icon.png
+++ b/graphics/pokemon/donphan/icon.png
diff --git a/graphics/pokemon/palettes/donphan_palette.pal b/graphics/pokemon/donphan/normal.pal
index 4e0393757..4e0393757 100644
--- a/graphics/pokemon/palettes/donphan_palette.pal
+++ b/graphics/pokemon/donphan/normal.pal
diff --git a/graphics/pokemon/palettes/donphan_shiny_palette.pal b/graphics/pokemon/donphan/shiny.pal
index 55a6da008..55a6da008 100644
--- a/graphics/pokemon/palettes/donphan_shiny_palette.pal
+++ b/graphics/pokemon/donphan/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/double_question_mark_front_pic.png b/graphics/pokemon/double_question_mark/anim_front.png
index 6afe02dee..6afe02dee 100644
--- a/graphics/pokemon/anim_front_pics/double_question_mark_front_pic.png
+++ b/graphics/pokemon/double_question_mark/anim_front.png
diff --git a/graphics/pokemon/back_pics/double_question_mark_back_pic.png b/graphics/pokemon/double_question_mark/back.png
index 14eb6e139..14eb6e139 100644
--- a/graphics/pokemon/back_pics/double_question_mark_back_pic.png
+++ b/graphics/pokemon/double_question_mark/back.png
diff --git a/graphics/pokemon/front_pics/double_question_mark_still_front_pic.png b/graphics/pokemon/double_question_mark/front.png
index f23b08476..f23b08476 100644
--- a/graphics/pokemon/front_pics/double_question_mark_still_front_pic.png
+++ b/graphics/pokemon/double_question_mark/front.png
diff --git a/graphics/pokemon/palettes/double_question_mark_palette.pal b/graphics/pokemon/double_question_mark/normal.pal
index 67be6bbf4..67be6bbf4 100644
--- a/graphics/pokemon/palettes/double_question_mark_palette.pal
+++ b/graphics/pokemon/double_question_mark/normal.pal
diff --git a/graphics/pokemon/palettes/double_question_mark_shiny_palette.pal b/graphics/pokemon/double_question_mark/shiny.pal
index 67be6bbf4..67be6bbf4 100644
--- a/graphics/pokemon/palettes/double_question_mark_shiny_palette.pal
+++ b/graphics/pokemon/double_question_mark/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dragonair_front_pic.png b/graphics/pokemon/dragonair/anim_front.png
index 3a41bef76..3a41bef76 100644
--- a/graphics/pokemon/anim_front_pics/dragonair_front_pic.png
+++ b/graphics/pokemon/dragonair/anim_front.png
diff --git a/graphics/pokemon/back_pics/dragonair_back_pic.png b/graphics/pokemon/dragonair/back.png
index ee3cf04d1..ee3cf04d1 100644
--- a/graphics/pokemon/back_pics/dragonair_back_pic.png
+++ b/graphics/pokemon/dragonair/back.png
diff --git a/graphics/pokemon/footprints/dragonair_footprint.png b/graphics/pokemon/dragonair/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/dragonair_footprint.png
+++ b/graphics/pokemon/dragonair/footprint.png
diff --git a/graphics/pokemon/front_pics/dragonair_still_front_pic.png b/graphics/pokemon/dragonair/front.png
index e824a6a87..e824a6a87 100644
--- a/graphics/pokemon/front_pics/dragonair_still_front_pic.png
+++ b/graphics/pokemon/dragonair/front.png
diff --git a/graphics/pokemon/icons/dragonair_icon.png b/graphics/pokemon/dragonair/icon.png
index f4b870a2a..f4b870a2a 100644
--- a/graphics/pokemon/icons/dragonair_icon.png
+++ b/graphics/pokemon/dragonair/icon.png
diff --git a/graphics/pokemon/palettes/dragonair_palette.pal b/graphics/pokemon/dragonair/normal.pal
index 4297fb8e9..4297fb8e9 100644
--- a/graphics/pokemon/palettes/dragonair_palette.pal
+++ b/graphics/pokemon/dragonair/normal.pal
diff --git a/graphics/pokemon/palettes/dragonair_shiny_palette.pal b/graphics/pokemon/dragonair/shiny.pal
index da7b6d02e..da7b6d02e 100644
--- a/graphics/pokemon/palettes/dragonair_shiny_palette.pal
+++ b/graphics/pokemon/dragonair/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dragonite_front_pic.png b/graphics/pokemon/dragonite/anim_front.png
index 188c9ee59..188c9ee59 100644
--- a/graphics/pokemon/anim_front_pics/dragonite_front_pic.png
+++ b/graphics/pokemon/dragonite/anim_front.png
diff --git a/graphics/pokemon/back_pics/dragonite_back_pic.png b/graphics/pokemon/dragonite/back.png
index 7107f90cf..7107f90cf 100644
--- a/graphics/pokemon/back_pics/dragonite_back_pic.png
+++ b/graphics/pokemon/dragonite/back.png
diff --git a/graphics/pokemon/footprints/dragonite_footprint.png b/graphics/pokemon/dragonite/footprint.png
index 1f41296b0..1f41296b0 100644
--- a/graphics/pokemon/footprints/dragonite_footprint.png
+++ b/graphics/pokemon/dragonite/footprint.png
diff --git a/graphics/pokemon/front_pics/dragonite_still_front_pic.png b/graphics/pokemon/dragonite/front.png
index 85d652bc1..85d652bc1 100644
--- a/graphics/pokemon/front_pics/dragonite_still_front_pic.png
+++ b/graphics/pokemon/dragonite/front.png
diff --git a/graphics/pokemon/icons/dragonite_icon.png b/graphics/pokemon/dragonite/icon.png
index efcbd8f11..efcbd8f11 100644
--- a/graphics/pokemon/icons/dragonite_icon.png
+++ b/graphics/pokemon/dragonite/icon.png
diff --git a/graphics/pokemon/palettes/dragonite_palette.pal b/graphics/pokemon/dragonite/normal.pal
index 80f21c5c0..80f21c5c0 100644
--- a/graphics/pokemon/palettes/dragonite_palette.pal
+++ b/graphics/pokemon/dragonite/normal.pal
diff --git a/graphics/pokemon/palettes/dragonite_shiny_palette.pal b/graphics/pokemon/dragonite/shiny.pal
index 4e04571b1..4e04571b1 100644
--- a/graphics/pokemon/palettes/dragonite_shiny_palette.pal
+++ b/graphics/pokemon/dragonite/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dratini_front_pic.png b/graphics/pokemon/dratini/anim_front.png
index b80476eee..b80476eee 100644
--- a/graphics/pokemon/anim_front_pics/dratini_front_pic.png
+++ b/graphics/pokemon/dratini/anim_front.png
diff --git a/graphics/pokemon/back_pics/dratini_back_pic.png b/graphics/pokemon/dratini/back.png
index f87eb13cb..f87eb13cb 100644
--- a/graphics/pokemon/back_pics/dratini_back_pic.png
+++ b/graphics/pokemon/dratini/back.png
diff --git a/graphics/pokemon/footprints/dratini_footprint.png b/graphics/pokemon/dratini/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/dratini_footprint.png
+++ b/graphics/pokemon/dratini/footprint.png
diff --git a/graphics/pokemon/front_pics/dratini_still_front_pic.png b/graphics/pokemon/dratini/front.png
index 7d86aa2d5..7d86aa2d5 100644
--- a/graphics/pokemon/front_pics/dratini_still_front_pic.png
+++ b/graphics/pokemon/dratini/front.png
diff --git a/graphics/pokemon/icons/dratini_icon.png b/graphics/pokemon/dratini/icon.png
index c26efee60..c26efee60 100644
--- a/graphics/pokemon/icons/dratini_icon.png
+++ b/graphics/pokemon/dratini/icon.png
diff --git a/graphics/pokemon/palettes/dratini_palette.pal b/graphics/pokemon/dratini/normal.pal
index 97c442e6d..97c442e6d 100644
--- a/graphics/pokemon/palettes/dratini_palette.pal
+++ b/graphics/pokemon/dratini/normal.pal
diff --git a/graphics/pokemon/palettes/dratini_shiny_palette.pal b/graphics/pokemon/dratini/shiny.pal
index b2e5cc781..b2e5cc781 100644
--- a/graphics/pokemon/palettes/dratini_shiny_palette.pal
+++ b/graphics/pokemon/dratini/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/drowzee_front_pic.png b/graphics/pokemon/drowzee/anim_front.png
index 2e74d279c..2e74d279c 100644
--- a/graphics/pokemon/anim_front_pics/drowzee_front_pic.png
+++ b/graphics/pokemon/drowzee/anim_front.png
diff --git a/graphics/pokemon/back_pics/drowzee_back_pic.png b/graphics/pokemon/drowzee/back.png
index b63105878..b63105878 100644
--- a/graphics/pokemon/back_pics/drowzee_back_pic.png
+++ b/graphics/pokemon/drowzee/back.png
diff --git a/graphics/pokemon/footprints/drowzee_footprint.png b/graphics/pokemon/drowzee/footprint.png
index 23293423e..23293423e 100644
--- a/graphics/pokemon/footprints/drowzee_footprint.png
+++ b/graphics/pokemon/drowzee/footprint.png
diff --git a/graphics/pokemon/front_pics/drowzee_still_front_pic.png b/graphics/pokemon/drowzee/front.png
index 684438509..684438509 100644
--- a/graphics/pokemon/front_pics/drowzee_still_front_pic.png
+++ b/graphics/pokemon/drowzee/front.png
diff --git a/graphics/pokemon/icons/drowzee_icon.png b/graphics/pokemon/drowzee/icon.png
index 39b84c871..39b84c871 100644
--- a/graphics/pokemon/icons/drowzee_icon.png
+++ b/graphics/pokemon/drowzee/icon.png
diff --git a/graphics/pokemon/palettes/drowzee_palette.pal b/graphics/pokemon/drowzee/normal.pal
index 2fc73cae9..2fc73cae9 100644
--- a/graphics/pokemon/palettes/drowzee_palette.pal
+++ b/graphics/pokemon/drowzee/normal.pal
diff --git a/graphics/pokemon/palettes/drowzee_shiny_palette.pal b/graphics/pokemon/drowzee/shiny.pal
index f192e20d0..f192e20d0 100644
--- a/graphics/pokemon/palettes/drowzee_shiny_palette.pal
+++ b/graphics/pokemon/drowzee/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dugtrio_front_pic.png b/graphics/pokemon/dugtrio/anim_front.png
index 81f462cc6..81f462cc6 100644
--- a/graphics/pokemon/anim_front_pics/dugtrio_front_pic.png
+++ b/graphics/pokemon/dugtrio/anim_front.png
diff --git a/graphics/pokemon/back_pics/dugtrio_back_pic.png b/graphics/pokemon/dugtrio/back.png
index 84fd0b630..84fd0b630 100644
--- a/graphics/pokemon/back_pics/dugtrio_back_pic.png
+++ b/graphics/pokemon/dugtrio/back.png
diff --git a/graphics/pokemon/footprints/dugtrio_footprint.png b/graphics/pokemon/dugtrio/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/dugtrio_footprint.png
+++ b/graphics/pokemon/dugtrio/footprint.png
diff --git a/graphics/pokemon/front_pics/dugtrio_still_front_pic.png b/graphics/pokemon/dugtrio/front.png
index 6122554de..6122554de 100644
--- a/graphics/pokemon/front_pics/dugtrio_still_front_pic.png
+++ b/graphics/pokemon/dugtrio/front.png
diff --git a/graphics/pokemon/icons/dugtrio_icon.png b/graphics/pokemon/dugtrio/icon.png
index a837c7f6f..a837c7f6f 100644
--- a/graphics/pokemon/icons/dugtrio_icon.png
+++ b/graphics/pokemon/dugtrio/icon.png
diff --git a/graphics/pokemon/palettes/dugtrio_palette.pal b/graphics/pokemon/dugtrio/normal.pal
index 78691ac04..78691ac04 100644
--- a/graphics/pokemon/palettes/dugtrio_palette.pal
+++ b/graphics/pokemon/dugtrio/normal.pal
diff --git a/graphics/pokemon/palettes/dugtrio_shiny_palette.pal b/graphics/pokemon/dugtrio/shiny.pal
index 77345a714..77345a714 100644
--- a/graphics/pokemon/palettes/dugtrio_shiny_palette.pal
+++ b/graphics/pokemon/dugtrio/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dunsparce_front_pic.png b/graphics/pokemon/dunsparce/anim_front.png
index 527b51c93..527b51c93 100644
--- a/graphics/pokemon/anim_front_pics/dunsparce_front_pic.png
+++ b/graphics/pokemon/dunsparce/anim_front.png
diff --git a/graphics/pokemon/back_pics/dunsparce_back_pic.png b/graphics/pokemon/dunsparce/back.png
index 05f700ea7..05f700ea7 100644
--- a/graphics/pokemon/back_pics/dunsparce_back_pic.png
+++ b/graphics/pokemon/dunsparce/back.png
diff --git a/graphics/pokemon/footprints/dunsparce_footprint.png b/graphics/pokemon/dunsparce/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/dunsparce_footprint.png
+++ b/graphics/pokemon/dunsparce/footprint.png
diff --git a/graphics/pokemon/front_pics/dunsparce_still_front_pic.png b/graphics/pokemon/dunsparce/front.png
index cf3c421af..cf3c421af 100644
--- a/graphics/pokemon/front_pics/dunsparce_still_front_pic.png
+++ b/graphics/pokemon/dunsparce/front.png
diff --git a/graphics/pokemon/icons/dunsparce_icon.png b/graphics/pokemon/dunsparce/icon.png
index d2896e72b..d2896e72b 100644
--- a/graphics/pokemon/icons/dunsparce_icon.png
+++ b/graphics/pokemon/dunsparce/icon.png
diff --git a/graphics/pokemon/palettes/dunsparce_palette.pal b/graphics/pokemon/dunsparce/normal.pal
index e0440cdc1..e0440cdc1 100644
--- a/graphics/pokemon/palettes/dunsparce_palette.pal
+++ b/graphics/pokemon/dunsparce/normal.pal
diff --git a/graphics/pokemon/palettes/dunsparce_shiny_palette.pal b/graphics/pokemon/dunsparce/shiny.pal
index 425dc8b36..425dc8b36 100644
--- a/graphics/pokemon/palettes/dunsparce_shiny_palette.pal
+++ b/graphics/pokemon/dunsparce/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dusclops_front_pic.png b/graphics/pokemon/dusclops/anim_front.png
index c567f1703..c567f1703 100644
--- a/graphics/pokemon/anim_front_pics/dusclops_front_pic.png
+++ b/graphics/pokemon/dusclops/anim_front.png
diff --git a/graphics/pokemon/back_pics/dusclops_back_pic.png b/graphics/pokemon/dusclops/back.png
index 9362e8421..9362e8421 100644
--- a/graphics/pokemon/back_pics/dusclops_back_pic.png
+++ b/graphics/pokemon/dusclops/back.png
diff --git a/graphics/pokemon/footprints/dusclops_footprint.png b/graphics/pokemon/dusclops/footprint.png
index 752ffa353..752ffa353 100644
--- a/graphics/pokemon/footprints/dusclops_footprint.png
+++ b/graphics/pokemon/dusclops/footprint.png
diff --git a/graphics/pokemon/front_pics/dusclops_still_front_pic.png b/graphics/pokemon/dusclops/front.png
index 477423e62..477423e62 100644
--- a/graphics/pokemon/front_pics/dusclops_still_front_pic.png
+++ b/graphics/pokemon/dusclops/front.png
diff --git a/graphics/pokemon/icons/dusclops_icon.png b/graphics/pokemon/dusclops/icon.png
index 6ebc957da..6ebc957da 100644
--- a/graphics/pokemon/icons/dusclops_icon.png
+++ b/graphics/pokemon/dusclops/icon.png
diff --git a/graphics/pokemon/palettes/dusclops_palette.pal b/graphics/pokemon/dusclops/normal.pal
index f82d7f82e..f82d7f82e 100644
--- a/graphics/pokemon/palettes/dusclops_palette.pal
+++ b/graphics/pokemon/dusclops/normal.pal
diff --git a/graphics/pokemon/palettes/dusclops_shiny_palette.pal b/graphics/pokemon/dusclops/shiny.pal
index f07d7112f..f07d7112f 100644
--- a/graphics/pokemon/palettes/dusclops_shiny_palette.pal
+++ b/graphics/pokemon/dusclops/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/duskull_front_pic.png b/graphics/pokemon/duskull/anim_front.png
index 46c83d72f..46c83d72f 100644
--- a/graphics/pokemon/anim_front_pics/duskull_front_pic.png
+++ b/graphics/pokemon/duskull/anim_front.png
diff --git a/graphics/pokemon/back_pics/duskull_back_pic.png b/graphics/pokemon/duskull/back.png
index 52a5c867d..52a5c867d 100644
--- a/graphics/pokemon/back_pics/duskull_back_pic.png
+++ b/graphics/pokemon/duskull/back.png
diff --git a/graphics/pokemon/footprints/duskull_footprint.png b/graphics/pokemon/duskull/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/duskull_footprint.png
+++ b/graphics/pokemon/duskull/footprint.png
diff --git a/graphics/pokemon/front_pics/duskull_still_front_pic.png b/graphics/pokemon/duskull/front.png
index bf379af6d..bf379af6d 100644
--- a/graphics/pokemon/front_pics/duskull_still_front_pic.png
+++ b/graphics/pokemon/duskull/front.png
diff --git a/graphics/pokemon/icons/duskull_icon.png b/graphics/pokemon/duskull/icon.png
index 22710a79f..22710a79f 100644
--- a/graphics/pokemon/icons/duskull_icon.png
+++ b/graphics/pokemon/duskull/icon.png
diff --git a/graphics/pokemon/palettes/duskull_palette.pal b/graphics/pokemon/duskull/normal.pal
index aa1fb6ba4..aa1fb6ba4 100644
--- a/graphics/pokemon/palettes/duskull_palette.pal
+++ b/graphics/pokemon/duskull/normal.pal
diff --git a/graphics/pokemon/palettes/duskull_shiny_palette.pal b/graphics/pokemon/duskull/shiny.pal
index 2ec13fb1d..2ec13fb1d 100644
--- a/graphics/pokemon/palettes/duskull_shiny_palette.pal
+++ b/graphics/pokemon/duskull/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/dustox_front_pic.png b/graphics/pokemon/dustox/anim_front.png
index b2b1924a9..b2b1924a9 100644
--- a/graphics/pokemon/anim_front_pics/dustox_front_pic.png
+++ b/graphics/pokemon/dustox/anim_front.png
diff --git a/graphics/pokemon/back_pics/dustox_back_pic.png b/graphics/pokemon/dustox/back.png
index 759b98ea2..759b98ea2 100644
--- a/graphics/pokemon/back_pics/dustox_back_pic.png
+++ b/graphics/pokemon/dustox/back.png
diff --git a/graphics/pokemon/footprints/dustox_footprint.png b/graphics/pokemon/dustox/footprint.png
index f7cc85bf9..f7cc85bf9 100644
--- a/graphics/pokemon/footprints/dustox_footprint.png
+++ b/graphics/pokemon/dustox/footprint.png
diff --git a/graphics/pokemon/front_pics/dustox_still_front_pic.png b/graphics/pokemon/dustox/front.png
index 8866606d8..8866606d8 100644
--- a/graphics/pokemon/front_pics/dustox_still_front_pic.png
+++ b/graphics/pokemon/dustox/front.png
diff --git a/graphics/pokemon/icons/dustox_icon.png b/graphics/pokemon/dustox/icon.png
index 2f0d14001..2f0d14001 100644
--- a/graphics/pokemon/icons/dustox_icon.png
+++ b/graphics/pokemon/dustox/icon.png
diff --git a/graphics/pokemon/palettes/dustox_palette.pal b/graphics/pokemon/dustox/normal.pal
index 262b7d1ba..262b7d1ba 100644
--- a/graphics/pokemon/palettes/dustox_palette.pal
+++ b/graphics/pokemon/dustox/normal.pal
diff --git a/graphics/pokemon/palettes/dustox_shiny_palette.pal b/graphics/pokemon/dustox/shiny.pal
index c1c43725b..c1c43725b 100644
--- a/graphics/pokemon/palettes/dustox_shiny_palette.pal
+++ b/graphics/pokemon/dustox/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/eevee_front_pic.png b/graphics/pokemon/eevee/anim_front.png
index 04fd9b506..04fd9b506 100644
--- a/graphics/pokemon/anim_front_pics/eevee_front_pic.png
+++ b/graphics/pokemon/eevee/anim_front.png
diff --git a/graphics/pokemon/back_pics/eevee_back_pic.png b/graphics/pokemon/eevee/back.png
index 79bd1129c..79bd1129c 100644
--- a/graphics/pokemon/back_pics/eevee_back_pic.png
+++ b/graphics/pokemon/eevee/back.png
diff --git a/graphics/pokemon/footprints/eevee_footprint.png b/graphics/pokemon/eevee/footprint.png
index 4e4c01c9f..4e4c01c9f 100644
--- a/graphics/pokemon/footprints/eevee_footprint.png
+++ b/graphics/pokemon/eevee/footprint.png
diff --git a/graphics/pokemon/front_pics/eevee_still_front_pic.png b/graphics/pokemon/eevee/front.png
index 6ef22ee6b..6ef22ee6b 100644
--- a/graphics/pokemon/front_pics/eevee_still_front_pic.png
+++ b/graphics/pokemon/eevee/front.png
diff --git a/graphics/pokemon/icons/eevee_icon.png b/graphics/pokemon/eevee/icon.png
index 13b90c2e2..13b90c2e2 100644
--- a/graphics/pokemon/icons/eevee_icon.png
+++ b/graphics/pokemon/eevee/icon.png
diff --git a/graphics/pokemon/palettes/eevee_palette.pal b/graphics/pokemon/eevee/normal.pal
index 266f9f174..266f9f174 100644
--- a/graphics/pokemon/palettes/eevee_palette.pal
+++ b/graphics/pokemon/eevee/normal.pal
diff --git a/graphics/pokemon/palettes/eevee_shiny_palette.pal b/graphics/pokemon/eevee/shiny.pal
index 7f9f3c7b8..7f9f3c7b8 100644
--- a/graphics/pokemon/palettes/eevee_shiny_palette.pal
+++ b/graphics/pokemon/eevee/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/egg_front_pic.png b/graphics/pokemon/egg/anim_front.png
index 5451b34a2..5451b34a2 100644
--- a/graphics/pokemon/anim_front_pics/egg_front_pic.png
+++ b/graphics/pokemon/egg/anim_front.png
diff --git a/graphics/pokemon/front_pics/egg_still_front_pic.png b/graphics/pokemon/egg/front.png
index d9680a899..d9680a899 100644
--- a/graphics/pokemon/front_pics/egg_still_front_pic.png
+++ b/graphics/pokemon/egg/front.png
diff --git a/graphics/pokemon/icons/egg_icon.png b/graphics/pokemon/egg/icon.png
index 8f6ca5dde..8f6ca5dde 100644
--- a/graphics/pokemon/icons/egg_icon.png
+++ b/graphics/pokemon/egg/icon.png
diff --git a/graphics/pokemon/palettes/egg_palette.pal b/graphics/pokemon/egg/normal.pal
index cadeacee0..cadeacee0 100644
--- a/graphics/pokemon/palettes/egg_palette.pal
+++ b/graphics/pokemon/egg/normal.pal
diff --git a/graphics/pokemon/anim_front_pics/ekans_front_pic.png b/graphics/pokemon/ekans/anim_front.png
index 22d3fe19c..22d3fe19c 100644
--- a/graphics/pokemon/anim_front_pics/ekans_front_pic.png
+++ b/graphics/pokemon/ekans/anim_front.png
diff --git a/graphics/pokemon/back_pics/ekans_back_pic.png b/graphics/pokemon/ekans/back.png
index e72a7a9ed..e72a7a9ed 100644
--- a/graphics/pokemon/back_pics/ekans_back_pic.png
+++ b/graphics/pokemon/ekans/back.png
diff --git a/graphics/pokemon/footprints/ekans_footprint.png b/graphics/pokemon/ekans/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/ekans_footprint.png
+++ b/graphics/pokemon/ekans/footprint.png
diff --git a/graphics/pokemon/front_pics/ekans_still_front_pic.png b/graphics/pokemon/ekans/front.png
index 7bd27381c..7bd27381c 100644
--- a/graphics/pokemon/front_pics/ekans_still_front_pic.png
+++ b/graphics/pokemon/ekans/front.png
diff --git a/graphics/pokemon/icons/ekans_icon.png b/graphics/pokemon/ekans/icon.png
index 3c81efd69..3c81efd69 100644
--- a/graphics/pokemon/icons/ekans_icon.png
+++ b/graphics/pokemon/ekans/icon.png
diff --git a/graphics/pokemon/palettes/ekans_palette.pal b/graphics/pokemon/ekans/normal.pal
index 55289888c..55289888c 100644
--- a/graphics/pokemon/palettes/ekans_palette.pal
+++ b/graphics/pokemon/ekans/normal.pal
diff --git a/graphics/pokemon/palettes/ekans_shiny_palette.pal b/graphics/pokemon/ekans/shiny.pal
index 529864430..529864430 100644
--- a/graphics/pokemon/palettes/ekans_shiny_palette.pal
+++ b/graphics/pokemon/ekans/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/electabuzz_front_pic.png b/graphics/pokemon/electabuzz/anim_front.png
index 7edefd605..7edefd605 100644
--- a/graphics/pokemon/anim_front_pics/electabuzz_front_pic.png
+++ b/graphics/pokemon/electabuzz/anim_front.png
diff --git a/graphics/pokemon/back_pics/electabuzz_back_pic.png b/graphics/pokemon/electabuzz/back.png
index 8d84c2cb6..8d84c2cb6 100644
--- a/graphics/pokemon/back_pics/electabuzz_back_pic.png
+++ b/graphics/pokemon/electabuzz/back.png
diff --git a/graphics/pokemon/footprints/electabuzz_footprint.png b/graphics/pokemon/electabuzz/footprint.png
index b2b4de625..b2b4de625 100644
--- a/graphics/pokemon/footprints/electabuzz_footprint.png
+++ b/graphics/pokemon/electabuzz/footprint.png
diff --git a/graphics/pokemon/front_pics/electabuzz_still_front_pic.png b/graphics/pokemon/electabuzz/front.png
index 783cd49c8..783cd49c8 100644
--- a/graphics/pokemon/front_pics/electabuzz_still_front_pic.png
+++ b/graphics/pokemon/electabuzz/front.png
diff --git a/graphics/pokemon/icons/electabuzz_icon.png b/graphics/pokemon/electabuzz/icon.png
index 4c9babe2a..4c9babe2a 100644
--- a/graphics/pokemon/icons/electabuzz_icon.png
+++ b/graphics/pokemon/electabuzz/icon.png
diff --git a/graphics/pokemon/palettes/electabuzz_palette.pal b/graphics/pokemon/electabuzz/normal.pal
index 1a18eb70d..1a18eb70d 100644
--- a/graphics/pokemon/palettes/electabuzz_palette.pal
+++ b/graphics/pokemon/electabuzz/normal.pal
diff --git a/graphics/pokemon/palettes/electabuzz_shiny_palette.pal b/graphics/pokemon/electabuzz/shiny.pal
index df9fa23e8..df9fa23e8 100644
--- a/graphics/pokemon/palettes/electabuzz_shiny_palette.pal
+++ b/graphics/pokemon/electabuzz/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/electrike_front_pic.png b/graphics/pokemon/electrike/anim_front.png
index 396dd670b..396dd670b 100644
--- a/graphics/pokemon/anim_front_pics/electrike_front_pic.png
+++ b/graphics/pokemon/electrike/anim_front.png
diff --git a/graphics/pokemon/back_pics/electrike_back_pic.png b/graphics/pokemon/electrike/back.png
index c6e9e83e5..c6e9e83e5 100644
--- a/graphics/pokemon/back_pics/electrike_back_pic.png
+++ b/graphics/pokemon/electrike/back.png
diff --git a/graphics/pokemon/footprints/electrike_footprint.png b/graphics/pokemon/electrike/footprint.png
index 8dd914b35..8dd914b35 100644
--- a/graphics/pokemon/footprints/electrike_footprint.png
+++ b/graphics/pokemon/electrike/footprint.png
diff --git a/graphics/pokemon/front_pics/electrike_still_front_pic.png b/graphics/pokemon/electrike/front.png
index 0a86b13af..0a86b13af 100644
--- a/graphics/pokemon/front_pics/electrike_still_front_pic.png
+++ b/graphics/pokemon/electrike/front.png
diff --git a/graphics/pokemon/icons/electrike_icon.png b/graphics/pokemon/electrike/icon.png
index ebef61c49..ebef61c49 100644
--- a/graphics/pokemon/icons/electrike_icon.png
+++ b/graphics/pokemon/electrike/icon.png
diff --git a/graphics/pokemon/palettes/electrike_palette.pal b/graphics/pokemon/electrike/normal.pal
index 5ee96cb84..5ee96cb84 100644
--- a/graphics/pokemon/palettes/electrike_palette.pal
+++ b/graphics/pokemon/electrike/normal.pal
diff --git a/graphics/pokemon/palettes/electrike_shiny_palette.pal b/graphics/pokemon/electrike/shiny.pal
index c7f51a2b1..c7f51a2b1 100644
--- a/graphics/pokemon/palettes/electrike_shiny_palette.pal
+++ b/graphics/pokemon/electrike/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/electrode_front_pic.png b/graphics/pokemon/electrode/anim_front.png
index 57c95efa1..57c95efa1 100644
--- a/graphics/pokemon/anim_front_pics/electrode_front_pic.png
+++ b/graphics/pokemon/electrode/anim_front.png
diff --git a/graphics/pokemon/back_pics/electrode_back_pic.png b/graphics/pokemon/electrode/back.png
index 74ca458d3..74ca458d3 100644
--- a/graphics/pokemon/back_pics/electrode_back_pic.png
+++ b/graphics/pokemon/electrode/back.png
diff --git a/graphics/pokemon/footprints/electrode_footprint.png b/graphics/pokemon/electrode/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/electrode_footprint.png
+++ b/graphics/pokemon/electrode/footprint.png
diff --git a/graphics/pokemon/front_pics/electrode_still_front_pic.png b/graphics/pokemon/electrode/front.png
index 801c2cdb2..801c2cdb2 100644
--- a/graphics/pokemon/front_pics/electrode_still_front_pic.png
+++ b/graphics/pokemon/electrode/front.png
diff --git a/graphics/pokemon/icons/electrode_icon.png b/graphics/pokemon/electrode/icon.png
index e46c57974..e46c57974 100644
--- a/graphics/pokemon/icons/electrode_icon.png
+++ b/graphics/pokemon/electrode/icon.png
diff --git a/graphics/pokemon/palettes/electrode_palette.pal b/graphics/pokemon/electrode/normal.pal
index 1848bf716..1848bf716 100644
--- a/graphics/pokemon/palettes/electrode_palette.pal
+++ b/graphics/pokemon/electrode/normal.pal
diff --git a/graphics/pokemon/palettes/electrode_shiny_palette.pal b/graphics/pokemon/electrode/shiny.pal
index d651b064f..d651b064f 100644
--- a/graphics/pokemon/palettes/electrode_shiny_palette.pal
+++ b/graphics/pokemon/electrode/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/elekid_front_pic.png b/graphics/pokemon/elekid/anim_front.png
index 7f3091f52..7f3091f52 100644
--- a/graphics/pokemon/anim_front_pics/elekid_front_pic.png
+++ b/graphics/pokemon/elekid/anim_front.png
diff --git a/graphics/pokemon/back_pics/elekid_back_pic.png b/graphics/pokemon/elekid/back.png
index 0d8d9428a..0d8d9428a 100644
--- a/graphics/pokemon/back_pics/elekid_back_pic.png
+++ b/graphics/pokemon/elekid/back.png
diff --git a/graphics/pokemon/footprints/elekid_footprint.png b/graphics/pokemon/elekid/footprint.png
index 15547931c..15547931c 100644
--- a/graphics/pokemon/footprints/elekid_footprint.png
+++ b/graphics/pokemon/elekid/footprint.png
diff --git a/graphics/pokemon/front_pics/elekid_still_front_pic.png b/graphics/pokemon/elekid/front.png
index 0c3d5325e..0c3d5325e 100644
--- a/graphics/pokemon/front_pics/elekid_still_front_pic.png
+++ b/graphics/pokemon/elekid/front.png
diff --git a/graphics/pokemon/icons/elekid_icon.png b/graphics/pokemon/elekid/icon.png
index d80ce6f0d..d80ce6f0d 100644
--- a/graphics/pokemon/icons/elekid_icon.png
+++ b/graphics/pokemon/elekid/icon.png
diff --git a/graphics/pokemon/palettes/elekid_palette.pal b/graphics/pokemon/elekid/normal.pal
index 522f7de84..522f7de84 100644
--- a/graphics/pokemon/palettes/elekid_palette.pal
+++ b/graphics/pokemon/elekid/normal.pal
diff --git a/graphics/pokemon/palettes/elekid_shiny_palette.pal b/graphics/pokemon/elekid/shiny.pal
index 59ff6b2cf..59ff6b2cf 100644
--- a/graphics/pokemon/palettes/elekid_shiny_palette.pal
+++ b/graphics/pokemon/elekid/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/entei_front_pic.png b/graphics/pokemon/entei/anim_front.png
index 297d253b1..297d253b1 100644
--- a/graphics/pokemon/anim_front_pics/entei_front_pic.png
+++ b/graphics/pokemon/entei/anim_front.png
diff --git a/graphics/pokemon/back_pics/entei_back_pic.png b/graphics/pokemon/entei/back.png
index 902b4461a..902b4461a 100644
--- a/graphics/pokemon/back_pics/entei_back_pic.png
+++ b/graphics/pokemon/entei/back.png
diff --git a/graphics/pokemon/footprints/entei_footprint.png b/graphics/pokemon/entei/footprint.png
index 7336df599..7336df599 100644
--- a/graphics/pokemon/footprints/entei_footprint.png
+++ b/graphics/pokemon/entei/footprint.png
diff --git a/graphics/pokemon/front_pics/entei_still_front_pic.png b/graphics/pokemon/entei/front.png
index 1aa34cf4d..1aa34cf4d 100644
--- a/graphics/pokemon/front_pics/entei_still_front_pic.png
+++ b/graphics/pokemon/entei/front.png
diff --git a/graphics/pokemon/icons/entei_icon.png b/graphics/pokemon/entei/icon.png
index 4d2353a20..4d2353a20 100644
--- a/graphics/pokemon/icons/entei_icon.png
+++ b/graphics/pokemon/entei/icon.png
diff --git a/graphics/pokemon/palettes/entei_palette.pal b/graphics/pokemon/entei/normal.pal
index 27cad95ea..27cad95ea 100644
--- a/graphics/pokemon/palettes/entei_palette.pal
+++ b/graphics/pokemon/entei/normal.pal
diff --git a/graphics/pokemon/palettes/entei_shiny_palette.pal b/graphics/pokemon/entei/shiny.pal
index e3f22acdd..e3f22acdd 100644
--- a/graphics/pokemon/palettes/entei_shiny_palette.pal
+++ b/graphics/pokemon/entei/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/espeon_front_pic.png b/graphics/pokemon/espeon/anim_front.png
index 95ff75a0c..95ff75a0c 100644
--- a/graphics/pokemon/anim_front_pics/espeon_front_pic.png
+++ b/graphics/pokemon/espeon/anim_front.png
diff --git a/graphics/pokemon/back_pics/espeon_back_pic.png b/graphics/pokemon/espeon/back.png
index c3e5d96de..c3e5d96de 100644
--- a/graphics/pokemon/back_pics/espeon_back_pic.png
+++ b/graphics/pokemon/espeon/back.png
diff --git a/graphics/pokemon/footprints/espeon_footprint.png b/graphics/pokemon/espeon/footprint.png
index c7b17a4ad..c7b17a4ad 100644
--- a/graphics/pokemon/footprints/espeon_footprint.png
+++ b/graphics/pokemon/espeon/footprint.png
diff --git a/graphics/pokemon/front_pics/espeon_still_front_pic.png b/graphics/pokemon/espeon/front.png
index 9e66b1626..9e66b1626 100644
--- a/graphics/pokemon/front_pics/espeon_still_front_pic.png
+++ b/graphics/pokemon/espeon/front.png
diff --git a/graphics/pokemon/icons/espeon_icon.png b/graphics/pokemon/espeon/icon.png
index bc63aa3f2..bc63aa3f2 100644
--- a/graphics/pokemon/icons/espeon_icon.png
+++ b/graphics/pokemon/espeon/icon.png
diff --git a/graphics/pokemon/palettes/espeon_palette.pal b/graphics/pokemon/espeon/normal.pal
index b001102c1..b001102c1 100644
--- a/graphics/pokemon/palettes/espeon_palette.pal
+++ b/graphics/pokemon/espeon/normal.pal
diff --git a/graphics/pokemon/palettes/espeon_shiny_palette.pal b/graphics/pokemon/espeon/shiny.pal
index 22222e2c7..22222e2c7 100644
--- a/graphics/pokemon/palettes/espeon_shiny_palette.pal
+++ b/graphics/pokemon/espeon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/exeggcute_front_pic.png b/graphics/pokemon/exeggcute/anim_front.png
index ca0b6df22..ca0b6df22 100644
--- a/graphics/pokemon/anim_front_pics/exeggcute_front_pic.png
+++ b/graphics/pokemon/exeggcute/anim_front.png
diff --git a/graphics/pokemon/back_pics/exeggcute_back_pic.png b/graphics/pokemon/exeggcute/back.png
index e340cd036..e340cd036 100644
--- a/graphics/pokemon/back_pics/exeggcute_back_pic.png
+++ b/graphics/pokemon/exeggcute/back.png
diff --git a/graphics/pokemon/footprints/exeggcute_footprint.png b/graphics/pokemon/exeggcute/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/exeggcute_footprint.png
+++ b/graphics/pokemon/exeggcute/footprint.png
diff --git a/graphics/pokemon/front_pics/exeggcute_still_front_pic.png b/graphics/pokemon/exeggcute/front.png
index 6868d6e05..6868d6e05 100644
--- a/graphics/pokemon/front_pics/exeggcute_still_front_pic.png
+++ b/graphics/pokemon/exeggcute/front.png
diff --git a/graphics/pokemon/icons/exeggcute_icon.png b/graphics/pokemon/exeggcute/icon.png
index 5d0306610..5d0306610 100644
--- a/graphics/pokemon/icons/exeggcute_icon.png
+++ b/graphics/pokemon/exeggcute/icon.png
diff --git a/graphics/pokemon/palettes/exeggcute_palette.pal b/graphics/pokemon/exeggcute/normal.pal
index 04f5ede31..04f5ede31 100644
--- a/graphics/pokemon/palettes/exeggcute_palette.pal
+++ b/graphics/pokemon/exeggcute/normal.pal
diff --git a/graphics/pokemon/palettes/exeggcute_shiny_palette.pal b/graphics/pokemon/exeggcute/shiny.pal
index 4b18e5857..4b18e5857 100644
--- a/graphics/pokemon/palettes/exeggcute_shiny_palette.pal
+++ b/graphics/pokemon/exeggcute/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/exeggutor_front_pic.png b/graphics/pokemon/exeggutor/anim_front.png
index f4100b755..f4100b755 100644
--- a/graphics/pokemon/anim_front_pics/exeggutor_front_pic.png
+++ b/graphics/pokemon/exeggutor/anim_front.png
diff --git a/graphics/pokemon/back_pics/exeggutor_back_pic.png b/graphics/pokemon/exeggutor/back.png
index ff28c8555..ff28c8555 100644
--- a/graphics/pokemon/back_pics/exeggutor_back_pic.png
+++ b/graphics/pokemon/exeggutor/back.png
diff --git a/graphics/pokemon/footprints/exeggutor_footprint.png b/graphics/pokemon/exeggutor/footprint.png
index 6df7122f8..6df7122f8 100644
--- a/graphics/pokemon/footprints/exeggutor_footprint.png
+++ b/graphics/pokemon/exeggutor/footprint.png
diff --git a/graphics/pokemon/front_pics/exeggutor_still_front_pic.png b/graphics/pokemon/exeggutor/front.png
index 67c59d0bb..67c59d0bb 100644
--- a/graphics/pokemon/front_pics/exeggutor_still_front_pic.png
+++ b/graphics/pokemon/exeggutor/front.png
diff --git a/graphics/pokemon/icons/exeggutor_icon.png b/graphics/pokemon/exeggutor/icon.png
index 610c65a3d..610c65a3d 100644
--- a/graphics/pokemon/icons/exeggutor_icon.png
+++ b/graphics/pokemon/exeggutor/icon.png
diff --git a/graphics/pokemon/palettes/exeggutor_palette.pal b/graphics/pokemon/exeggutor/normal.pal
index 6c375af6d..6c375af6d 100644
--- a/graphics/pokemon/palettes/exeggutor_palette.pal
+++ b/graphics/pokemon/exeggutor/normal.pal
diff --git a/graphics/pokemon/palettes/exeggutor_shiny_palette.pal b/graphics/pokemon/exeggutor/shiny.pal
index c06646a6c..c06646a6c 100644
--- a/graphics/pokemon/palettes/exeggutor_shiny_palette.pal
+++ b/graphics/pokemon/exeggutor/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/exploud_front_pic.png b/graphics/pokemon/exploud/anim_front.png
index 8cf38b83e..8cf38b83e 100644
--- a/graphics/pokemon/anim_front_pics/exploud_front_pic.png
+++ b/graphics/pokemon/exploud/anim_front.png
diff --git a/graphics/pokemon/back_pics/exploud_back_pic.png b/graphics/pokemon/exploud/back.png
index 37132bf48..37132bf48 100644
--- a/graphics/pokemon/back_pics/exploud_back_pic.png
+++ b/graphics/pokemon/exploud/back.png
diff --git a/graphics/pokemon/footprints/exploud_footprint.png b/graphics/pokemon/exploud/footprint.png
index b27283a14..b27283a14 100644
--- a/graphics/pokemon/footprints/exploud_footprint.png
+++ b/graphics/pokemon/exploud/footprint.png
diff --git a/graphics/pokemon/front_pics/exploud_still_front_pic.png b/graphics/pokemon/exploud/front.png
index 48e86c610..48e86c610 100644
--- a/graphics/pokemon/front_pics/exploud_still_front_pic.png
+++ b/graphics/pokemon/exploud/front.png
diff --git a/graphics/pokemon/icons/exploud_icon.png b/graphics/pokemon/exploud/icon.png
index 04ed7f13d..04ed7f13d 100644
--- a/graphics/pokemon/icons/exploud_icon.png
+++ b/graphics/pokemon/exploud/icon.png
diff --git a/graphics/pokemon/palettes/exploud_palette.pal b/graphics/pokemon/exploud/normal.pal
index 074305af3..074305af3 100644
--- a/graphics/pokemon/palettes/exploud_palette.pal
+++ b/graphics/pokemon/exploud/normal.pal
diff --git a/graphics/pokemon/palettes/exploud_shiny_palette.pal b/graphics/pokemon/exploud/shiny.pal
index cfde98dc2..cfde98dc2 100644
--- a/graphics/pokemon/palettes/exploud_shiny_palette.pal
+++ b/graphics/pokemon/exploud/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/farfetch_d_front_pic.png b/graphics/pokemon/farfetch_d/anim_front.png
index 23176939b..23176939b 100644
--- a/graphics/pokemon/anim_front_pics/farfetch_d_front_pic.png
+++ b/graphics/pokemon/farfetch_d/anim_front.png
diff --git a/graphics/pokemon/back_pics/farfetch_d_back_pic.png b/graphics/pokemon/farfetch_d/back.png
index 7f981b389..7f981b389 100644
--- a/graphics/pokemon/back_pics/farfetch_d_back_pic.png
+++ b/graphics/pokemon/farfetch_d/back.png
diff --git a/graphics/pokemon/footprints/farfetch_d_footprint.png b/graphics/pokemon/farfetch_d/footprint.png
index 2f08f732d..2f08f732d 100644
--- a/graphics/pokemon/footprints/farfetch_d_footprint.png
+++ b/graphics/pokemon/farfetch_d/footprint.png
diff --git a/graphics/pokemon/front_pics/farfetch_d_still_front_pic.png b/graphics/pokemon/farfetch_d/front.png
index d938c1b50..d938c1b50 100644
--- a/graphics/pokemon/front_pics/farfetch_d_still_front_pic.png
+++ b/graphics/pokemon/farfetch_d/front.png
diff --git a/graphics/pokemon/icons/farfetch_d_icon.png b/graphics/pokemon/farfetch_d/icon.png
index cb3cd931b..cb3cd931b 100644
--- a/graphics/pokemon/icons/farfetch_d_icon.png
+++ b/graphics/pokemon/farfetch_d/icon.png
diff --git a/graphics/pokemon/palettes/farfetch_d_palette.pal b/graphics/pokemon/farfetch_d/normal.pal
index 397d1195c..397d1195c 100644
--- a/graphics/pokemon/palettes/farfetch_d_palette.pal
+++ b/graphics/pokemon/farfetch_d/normal.pal
diff --git a/graphics/pokemon/palettes/farfetch_d_shiny_palette.pal b/graphics/pokemon/farfetch_d/shiny.pal
index 5537612ce..5537612ce 100644
--- a/graphics/pokemon/palettes/farfetch_d_shiny_palette.pal
+++ b/graphics/pokemon/farfetch_d/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/fearow_front_pic.png b/graphics/pokemon/fearow/anim_front.png
index 42bc44fd3..42bc44fd3 100644
--- a/graphics/pokemon/anim_front_pics/fearow_front_pic.png
+++ b/graphics/pokemon/fearow/anim_front.png
diff --git a/graphics/pokemon/back_pics/fearow_back_pic.png b/graphics/pokemon/fearow/back.png
index ae54db9a7..ae54db9a7 100644
--- a/graphics/pokemon/back_pics/fearow_back_pic.png
+++ b/graphics/pokemon/fearow/back.png
diff --git a/graphics/pokemon/footprints/fearow_footprint.png b/graphics/pokemon/fearow/footprint.png
index 04ea7924d..04ea7924d 100644
--- a/graphics/pokemon/footprints/fearow_footprint.png
+++ b/graphics/pokemon/fearow/footprint.png
diff --git a/graphics/pokemon/front_pics/fearow_still_front_pic.png b/graphics/pokemon/fearow/front.png
index cfea711a3..cfea711a3 100644
--- a/graphics/pokemon/front_pics/fearow_still_front_pic.png
+++ b/graphics/pokemon/fearow/front.png
diff --git a/graphics/pokemon/icons/fearow_icon.png b/graphics/pokemon/fearow/icon.png
index 9a3be9393..9a3be9393 100644
--- a/graphics/pokemon/icons/fearow_icon.png
+++ b/graphics/pokemon/fearow/icon.png
diff --git a/graphics/pokemon/palettes/fearow_palette.pal b/graphics/pokemon/fearow/normal.pal
index 6b73e3639..6b73e3639 100644
--- a/graphics/pokemon/palettes/fearow_palette.pal
+++ b/graphics/pokemon/fearow/normal.pal
diff --git a/graphics/pokemon/palettes/fearow_shiny_palette.pal b/graphics/pokemon/fearow/shiny.pal
index 686e65a9c..686e65a9c 100644
--- a/graphics/pokemon/palettes/fearow_shiny_palette.pal
+++ b/graphics/pokemon/fearow/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/feebas_front_pic.png b/graphics/pokemon/feebas/anim_front.png
index 9afa332dc..9afa332dc 100644
--- a/graphics/pokemon/anim_front_pics/feebas_front_pic.png
+++ b/graphics/pokemon/feebas/anim_front.png
diff --git a/graphics/pokemon/back_pics/feebas_back_pic.png b/graphics/pokemon/feebas/back.png
index 3eabd6021..3eabd6021 100644
--- a/graphics/pokemon/back_pics/feebas_back_pic.png
+++ b/graphics/pokemon/feebas/back.png
diff --git a/graphics/pokemon/footprints/feebas_footprint.png b/graphics/pokemon/feebas/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/feebas_footprint.png
+++ b/graphics/pokemon/feebas/footprint.png
diff --git a/graphics/pokemon/front_pics/feebas_still_front_pic.png b/graphics/pokemon/feebas/front.png
index 036e151e8..036e151e8 100644
--- a/graphics/pokemon/front_pics/feebas_still_front_pic.png
+++ b/graphics/pokemon/feebas/front.png
diff --git a/graphics/pokemon/icons/feebas_icon.png b/graphics/pokemon/feebas/icon.png
index 19e08797a..19e08797a 100644
--- a/graphics/pokemon/icons/feebas_icon.png
+++ b/graphics/pokemon/feebas/icon.png
diff --git a/graphics/pokemon/palettes/feebas_palette.pal b/graphics/pokemon/feebas/normal.pal
index c66deb1e0..c66deb1e0 100644
--- a/graphics/pokemon/palettes/feebas_palette.pal
+++ b/graphics/pokemon/feebas/normal.pal
diff --git a/graphics/pokemon/palettes/feebas_shiny_palette.pal b/graphics/pokemon/feebas/shiny.pal
index 6d85b2866..6d85b2866 100644
--- a/graphics/pokemon/palettes/feebas_shiny_palette.pal
+++ b/graphics/pokemon/feebas/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/feraligatr_front_pic.png b/graphics/pokemon/feraligatr/anim_front.png
index 17228a853..17228a853 100644
--- a/graphics/pokemon/anim_front_pics/feraligatr_front_pic.png
+++ b/graphics/pokemon/feraligatr/anim_front.png
diff --git a/graphics/pokemon/back_pics/feraligatr_back_pic.png b/graphics/pokemon/feraligatr/back.png
index d996dd8ce..d996dd8ce 100644
--- a/graphics/pokemon/back_pics/feraligatr_back_pic.png
+++ b/graphics/pokemon/feraligatr/back.png
diff --git a/graphics/pokemon/footprints/feraligatr_footprint.png b/graphics/pokemon/feraligatr/footprint.png
index efe894289..efe894289 100644
--- a/graphics/pokemon/footprints/feraligatr_footprint.png
+++ b/graphics/pokemon/feraligatr/footprint.png
diff --git a/graphics/pokemon/front_pics/feraligatr_still_front_pic.png b/graphics/pokemon/feraligatr/front.png
index c44e7afc2..c44e7afc2 100644
--- a/graphics/pokemon/front_pics/feraligatr_still_front_pic.png
+++ b/graphics/pokemon/feraligatr/front.png
diff --git a/graphics/pokemon/icons/feraligatr_icon.png b/graphics/pokemon/feraligatr/icon.png
index fe3f4fca6..fe3f4fca6 100644
--- a/graphics/pokemon/icons/feraligatr_icon.png
+++ b/graphics/pokemon/feraligatr/icon.png
diff --git a/graphics/pokemon/palettes/feraligatr_palette.pal b/graphics/pokemon/feraligatr/normal.pal
index 7fc0a9eb8..7fc0a9eb8 100644
--- a/graphics/pokemon/palettes/feraligatr_palette.pal
+++ b/graphics/pokemon/feraligatr/normal.pal
diff --git a/graphics/pokemon/palettes/feraligatr_shiny_palette.pal b/graphics/pokemon/feraligatr/shiny.pal
index 81c5ebc2a..81c5ebc2a 100644
--- a/graphics/pokemon/palettes/feraligatr_shiny_palette.pal
+++ b/graphics/pokemon/feraligatr/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/flaaffy_front_pic.png b/graphics/pokemon/flaaffy/anim_front.png
index 11d7dd68b..11d7dd68b 100644
--- a/graphics/pokemon/anim_front_pics/flaaffy_front_pic.png
+++ b/graphics/pokemon/flaaffy/anim_front.png
diff --git a/graphics/pokemon/back_pics/flaaffy_back_pic.png b/graphics/pokemon/flaaffy/back.png
index e0ac771bf..e0ac771bf 100644
--- a/graphics/pokemon/back_pics/flaaffy_back_pic.png
+++ b/graphics/pokemon/flaaffy/back.png
diff --git a/graphics/pokemon/footprints/flaaffy_footprint.png b/graphics/pokemon/flaaffy/footprint.png
index d1695ec80..d1695ec80 100644
--- a/graphics/pokemon/footprints/flaaffy_footprint.png
+++ b/graphics/pokemon/flaaffy/footprint.png
diff --git a/graphics/pokemon/front_pics/flaaffy_still_front_pic.png b/graphics/pokemon/flaaffy/front.png
index 49f794128..49f794128 100644
--- a/graphics/pokemon/front_pics/flaaffy_still_front_pic.png
+++ b/graphics/pokemon/flaaffy/front.png
diff --git a/graphics/pokemon/icons/flaaffy_icon.png b/graphics/pokemon/flaaffy/icon.png
index 719ed69a3..719ed69a3 100644
--- a/graphics/pokemon/icons/flaaffy_icon.png
+++ b/graphics/pokemon/flaaffy/icon.png
diff --git a/graphics/pokemon/palettes/flaaffy_palette.pal b/graphics/pokemon/flaaffy/normal.pal
index 4efbb5bda..4efbb5bda 100644
--- a/graphics/pokemon/palettes/flaaffy_palette.pal
+++ b/graphics/pokemon/flaaffy/normal.pal
diff --git a/graphics/pokemon/palettes/flaaffy_shiny_palette.pal b/graphics/pokemon/flaaffy/shiny.pal
index b99745d84..b99745d84 100644
--- a/graphics/pokemon/palettes/flaaffy_shiny_palette.pal
+++ b/graphics/pokemon/flaaffy/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/flareon_front_pic.png b/graphics/pokemon/flareon/anim_front.png
index 5d8850930..5d8850930 100644
--- a/graphics/pokemon/anim_front_pics/flareon_front_pic.png
+++ b/graphics/pokemon/flareon/anim_front.png
diff --git a/graphics/pokemon/back_pics/flareon_back_pic.png b/graphics/pokemon/flareon/back.png
index c1efa1306..c1efa1306 100644
--- a/graphics/pokemon/back_pics/flareon_back_pic.png
+++ b/graphics/pokemon/flareon/back.png
diff --git a/graphics/pokemon/footprints/flareon_footprint.png b/graphics/pokemon/flareon/footprint.png
index db5d37ed4..db5d37ed4 100644
--- a/graphics/pokemon/footprints/flareon_footprint.png
+++ b/graphics/pokemon/flareon/footprint.png
diff --git a/graphics/pokemon/front_pics/flareon_still_front_pic.png b/graphics/pokemon/flareon/front.png
index 006aa5047..006aa5047 100644
--- a/graphics/pokemon/front_pics/flareon_still_front_pic.png
+++ b/graphics/pokemon/flareon/front.png
diff --git a/graphics/pokemon/icons/flareon_icon.png b/graphics/pokemon/flareon/icon.png
index 317aa61d0..317aa61d0 100644
--- a/graphics/pokemon/icons/flareon_icon.png
+++ b/graphics/pokemon/flareon/icon.png
diff --git a/graphics/pokemon/palettes/flareon_palette.pal b/graphics/pokemon/flareon/normal.pal
index b617df86b..b617df86b 100644
--- a/graphics/pokemon/palettes/flareon_palette.pal
+++ b/graphics/pokemon/flareon/normal.pal
diff --git a/graphics/pokemon/palettes/flareon_shiny_palette.pal b/graphics/pokemon/flareon/shiny.pal
index 60c1b337c..60c1b337c 100644
--- a/graphics/pokemon/palettes/flareon_shiny_palette.pal
+++ b/graphics/pokemon/flareon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/flygon_front_pic.png b/graphics/pokemon/flygon/anim_front.png
index d7b750f75..d7b750f75 100644
--- a/graphics/pokemon/anim_front_pics/flygon_front_pic.png
+++ b/graphics/pokemon/flygon/anim_front.png
diff --git a/graphics/pokemon/back_pics/flygon_back_pic.png b/graphics/pokemon/flygon/back.png
index 576cff1c5..576cff1c5 100644
--- a/graphics/pokemon/back_pics/flygon_back_pic.png
+++ b/graphics/pokemon/flygon/back.png
diff --git a/graphics/pokemon/footprints/flygon_footprint.png b/graphics/pokemon/flygon/footprint.png
index 5af877878..5af877878 100644
--- a/graphics/pokemon/footprints/flygon_footprint.png
+++ b/graphics/pokemon/flygon/footprint.png
diff --git a/graphics/pokemon/front_pics/flygon_still_front_pic.png b/graphics/pokemon/flygon/front.png
index 310966c6e..310966c6e 100644
--- a/graphics/pokemon/front_pics/flygon_still_front_pic.png
+++ b/graphics/pokemon/flygon/front.png
diff --git a/graphics/pokemon/icons/flygon_icon.png b/graphics/pokemon/flygon/icon.png
index f033c9a88..f033c9a88 100644
--- a/graphics/pokemon/icons/flygon_icon.png
+++ b/graphics/pokemon/flygon/icon.png
diff --git a/graphics/pokemon/palettes/flygon_palette.pal b/graphics/pokemon/flygon/normal.pal
index 33888cd1a..33888cd1a 100644
--- a/graphics/pokemon/palettes/flygon_palette.pal
+++ b/graphics/pokemon/flygon/normal.pal
diff --git a/graphics/pokemon/palettes/flygon_shiny_palette.pal b/graphics/pokemon/flygon/shiny.pal
index 772834b38..772834b38 100644
--- a/graphics/pokemon/palettes/flygon_shiny_palette.pal
+++ b/graphics/pokemon/flygon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/forretress_front_pic.png b/graphics/pokemon/forretress/anim_front.png
index 59cca7fb4..59cca7fb4 100644
--- a/graphics/pokemon/anim_front_pics/forretress_front_pic.png
+++ b/graphics/pokemon/forretress/anim_front.png
diff --git a/graphics/pokemon/back_pics/forretress_back_pic.png b/graphics/pokemon/forretress/back.png
index 5761be137..5761be137 100644
--- a/graphics/pokemon/back_pics/forretress_back_pic.png
+++ b/graphics/pokemon/forretress/back.png
diff --git a/graphics/pokemon/footprints/forretress_footprint.png b/graphics/pokemon/forretress/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/forretress_footprint.png
+++ b/graphics/pokemon/forretress/footprint.png
diff --git a/graphics/pokemon/front_pics/forretress_still_front_pic.png b/graphics/pokemon/forretress/front.png
index 511ee5720..511ee5720 100644
--- a/graphics/pokemon/front_pics/forretress_still_front_pic.png
+++ b/graphics/pokemon/forretress/front.png
diff --git a/graphics/pokemon/icons/forretress_icon.png b/graphics/pokemon/forretress/icon.png
index 056683bec..056683bec 100644
--- a/graphics/pokemon/icons/forretress_icon.png
+++ b/graphics/pokemon/forretress/icon.png
diff --git a/graphics/pokemon/palettes/forretress_palette.pal b/graphics/pokemon/forretress/normal.pal
index 285c56291..285c56291 100644
--- a/graphics/pokemon/palettes/forretress_palette.pal
+++ b/graphics/pokemon/forretress/normal.pal
diff --git a/graphics/pokemon/palettes/forretress_shiny_palette.pal b/graphics/pokemon/forretress/shiny.pal
index 7b894a11a..7b894a11a 100644
--- a/graphics/pokemon/palettes/forretress_shiny_palette.pal
+++ b/graphics/pokemon/forretress/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/furret_front_pic.png b/graphics/pokemon/furret/anim_front.png
index 2a0e35ee1..2a0e35ee1 100644
--- a/graphics/pokemon/anim_front_pics/furret_front_pic.png
+++ b/graphics/pokemon/furret/anim_front.png
diff --git a/graphics/pokemon/back_pics/furret_back_pic.png b/graphics/pokemon/furret/back.png
index 0dd2873af..0dd2873af 100644
--- a/graphics/pokemon/back_pics/furret_back_pic.png
+++ b/graphics/pokemon/furret/back.png
diff --git a/graphics/pokemon/footprints/furret_footprint.png b/graphics/pokemon/furret/footprint.png
index 225445fb3..225445fb3 100644
--- a/graphics/pokemon/footprints/furret_footprint.png
+++ b/graphics/pokemon/furret/footprint.png
diff --git a/graphics/pokemon/front_pics/furret_still_front_pic.png b/graphics/pokemon/furret/front.png
index 4f7ca56e1..4f7ca56e1 100644
--- a/graphics/pokemon/front_pics/furret_still_front_pic.png
+++ b/graphics/pokemon/furret/front.png
diff --git a/graphics/pokemon/icons/furret_icon.png b/graphics/pokemon/furret/icon.png
index 6974ee9f3..6974ee9f3 100644
--- a/graphics/pokemon/icons/furret_icon.png
+++ b/graphics/pokemon/furret/icon.png
diff --git a/graphics/pokemon/palettes/furret_palette.pal b/graphics/pokemon/furret/normal.pal
index 5996436be..5996436be 100644
--- a/graphics/pokemon/palettes/furret_palette.pal
+++ b/graphics/pokemon/furret/normal.pal
diff --git a/graphics/pokemon/palettes/furret_shiny_palette.pal b/graphics/pokemon/furret/shiny.pal
index 24ebc5bd6..24ebc5bd6 100644
--- a/graphics/pokemon/palettes/furret_shiny_palette.pal
+++ b/graphics/pokemon/furret/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gardevoir_front_pic.png b/graphics/pokemon/gardevoir/anim_front.png
index 88067c8c0..88067c8c0 100644
--- a/graphics/pokemon/anim_front_pics/gardevoir_front_pic.png
+++ b/graphics/pokemon/gardevoir/anim_front.png
diff --git a/graphics/pokemon/back_pics/gardevoir_back_pic.png b/graphics/pokemon/gardevoir/back.png
index 9f975a82c..9f975a82c 100644
--- a/graphics/pokemon/back_pics/gardevoir_back_pic.png
+++ b/graphics/pokemon/gardevoir/back.png
diff --git a/graphics/pokemon/footprints/gardevoir_footprint.png b/graphics/pokemon/gardevoir/footprint.png
index fd9f4755b..fd9f4755b 100644
--- a/graphics/pokemon/footprints/gardevoir_footprint.png
+++ b/graphics/pokemon/gardevoir/footprint.png
diff --git a/graphics/pokemon/front_pics/gardevoir_still_front_pic.png b/graphics/pokemon/gardevoir/front.png
index 27de874ac..27de874ac 100644
--- a/graphics/pokemon/front_pics/gardevoir_still_front_pic.png
+++ b/graphics/pokemon/gardevoir/front.png
diff --git a/graphics/pokemon/icons/gardevoir_icon.png b/graphics/pokemon/gardevoir/icon.png
index 958ea7f62..958ea7f62 100644
--- a/graphics/pokemon/icons/gardevoir_icon.png
+++ b/graphics/pokemon/gardevoir/icon.png
diff --git a/graphics/pokemon/palettes/gardevoir_palette.pal b/graphics/pokemon/gardevoir/normal.pal
index 1e513ae87..1e513ae87 100644
--- a/graphics/pokemon/palettes/gardevoir_palette.pal
+++ b/graphics/pokemon/gardevoir/normal.pal
diff --git a/graphics/pokemon/palettes/gardevoir_shiny_palette.pal b/graphics/pokemon/gardevoir/shiny.pal
index b588f6eea..b588f6eea 100644
--- a/graphics/pokemon/palettes/gardevoir_shiny_palette.pal
+++ b/graphics/pokemon/gardevoir/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gastly_front_pic.png b/graphics/pokemon/gastly/anim_front.png
index 935ff437d..935ff437d 100644
--- a/graphics/pokemon/anim_front_pics/gastly_front_pic.png
+++ b/graphics/pokemon/gastly/anim_front.png
diff --git a/graphics/pokemon/back_pics/gastly_back_pic.png b/graphics/pokemon/gastly/back.png
index 3ff1badde..3ff1badde 100644
--- a/graphics/pokemon/back_pics/gastly_back_pic.png
+++ b/graphics/pokemon/gastly/back.png
diff --git a/graphics/pokemon/footprints/gastly_footprint.png b/graphics/pokemon/gastly/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/gastly_footprint.png
+++ b/graphics/pokemon/gastly/footprint.png
diff --git a/graphics/pokemon/front_pics/gastly_still_front_pic.png b/graphics/pokemon/gastly/front.png
index 444ac485a..444ac485a 100644
--- a/graphics/pokemon/front_pics/gastly_still_front_pic.png
+++ b/graphics/pokemon/gastly/front.png
diff --git a/graphics/pokemon/icons/gastly_icon.png b/graphics/pokemon/gastly/icon.png
index 6a33a8ab5..6a33a8ab5 100644
--- a/graphics/pokemon/icons/gastly_icon.png
+++ b/graphics/pokemon/gastly/icon.png
diff --git a/graphics/pokemon/palettes/gastly_palette.pal b/graphics/pokemon/gastly/normal.pal
index 6098ec195..6098ec195 100644
--- a/graphics/pokemon/palettes/gastly_palette.pal
+++ b/graphics/pokemon/gastly/normal.pal
diff --git a/graphics/pokemon/palettes/gastly_shiny_palette.pal b/graphics/pokemon/gastly/shiny.pal
index 350cb8abf..350cb8abf 100644
--- a/graphics/pokemon/palettes/gastly_shiny_palette.pal
+++ b/graphics/pokemon/gastly/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gengar_front_pic.png b/graphics/pokemon/gengar/anim_front.png
index 8f0cb8913..8f0cb8913 100644
--- a/graphics/pokemon/anim_front_pics/gengar_front_pic.png
+++ b/graphics/pokemon/gengar/anim_front.png
diff --git a/graphics/pokemon/back_pics/gengar_back_pic.png b/graphics/pokemon/gengar/back.png
index 1132f4523..1132f4523 100644
--- a/graphics/pokemon/back_pics/gengar_back_pic.png
+++ b/graphics/pokemon/gengar/back.png
diff --git a/graphics/pokemon/footprints/gengar_footprint.png b/graphics/pokemon/gengar/footprint.png
index 0eb8fcebf..0eb8fcebf 100644
--- a/graphics/pokemon/footprints/gengar_footprint.png
+++ b/graphics/pokemon/gengar/footprint.png
diff --git a/graphics/pokemon/front_pics/gengar_still_front_pic.png b/graphics/pokemon/gengar/front.png
index f1537c6a4..f1537c6a4 100644
--- a/graphics/pokemon/front_pics/gengar_still_front_pic.png
+++ b/graphics/pokemon/gengar/front.png
diff --git a/graphics/pokemon/icons/gengar_icon.png b/graphics/pokemon/gengar/icon.png
index bbc3d758d..bbc3d758d 100644
--- a/graphics/pokemon/icons/gengar_icon.png
+++ b/graphics/pokemon/gengar/icon.png
diff --git a/graphics/pokemon/palettes/gengar_palette.pal b/graphics/pokemon/gengar/normal.pal
index 595c47909..595c47909 100644
--- a/graphics/pokemon/palettes/gengar_palette.pal
+++ b/graphics/pokemon/gengar/normal.pal
diff --git a/graphics/pokemon/palettes/gengar_shiny_palette.pal b/graphics/pokemon/gengar/shiny.pal
index d3f61f7d5..d3f61f7d5 100644
--- a/graphics/pokemon/palettes/gengar_shiny_palette.pal
+++ b/graphics/pokemon/gengar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/geodude_front_pic.png b/graphics/pokemon/geodude/anim_front.png
index 941f279f3..941f279f3 100644
--- a/graphics/pokemon/anim_front_pics/geodude_front_pic.png
+++ b/graphics/pokemon/geodude/anim_front.png
diff --git a/graphics/pokemon/back_pics/geodude_back_pic.png b/graphics/pokemon/geodude/back.png
index 29a4e3f3d..29a4e3f3d 100644
--- a/graphics/pokemon/back_pics/geodude_back_pic.png
+++ b/graphics/pokemon/geodude/back.png
diff --git a/graphics/pokemon/footprints/geodude_footprint.png b/graphics/pokemon/geodude/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/geodude_footprint.png
+++ b/graphics/pokemon/geodude/footprint.png
diff --git a/graphics/pokemon/front_pics/geodude_still_front_pic.png b/graphics/pokemon/geodude/front.png
index 99d5a1afe..99d5a1afe 100644
--- a/graphics/pokemon/front_pics/geodude_still_front_pic.png
+++ b/graphics/pokemon/geodude/front.png
diff --git a/graphics/pokemon/icons/geodude_icon.png b/graphics/pokemon/geodude/icon.png
index da39c60f0..da39c60f0 100644
--- a/graphics/pokemon/icons/geodude_icon.png
+++ b/graphics/pokemon/geodude/icon.png
diff --git a/graphics/pokemon/palettes/geodude_palette.pal b/graphics/pokemon/geodude/normal.pal
index 0bb2d6afd..0bb2d6afd 100644
--- a/graphics/pokemon/palettes/geodude_palette.pal
+++ b/graphics/pokemon/geodude/normal.pal
diff --git a/graphics/pokemon/palettes/geodude_shiny_palette.pal b/graphics/pokemon/geodude/shiny.pal
index d98062067..d98062067 100644
--- a/graphics/pokemon/palettes/geodude_shiny_palette.pal
+++ b/graphics/pokemon/geodude/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/girafarig_front_pic.png b/graphics/pokemon/girafarig/anim_front.png
index fded8246b..fded8246b 100644
--- a/graphics/pokemon/anim_front_pics/girafarig_front_pic.png
+++ b/graphics/pokemon/girafarig/anim_front.png
diff --git a/graphics/pokemon/back_pics/girafarig_back_pic.png b/graphics/pokemon/girafarig/back.png
index 8d86e1f79..8d86e1f79 100644
--- a/graphics/pokemon/back_pics/girafarig_back_pic.png
+++ b/graphics/pokemon/girafarig/back.png
diff --git a/graphics/pokemon/footprints/girafarig_footprint.png b/graphics/pokemon/girafarig/footprint.png
index f7af3f622..f7af3f622 100644
--- a/graphics/pokemon/footprints/girafarig_footprint.png
+++ b/graphics/pokemon/girafarig/footprint.png
diff --git a/graphics/pokemon/front_pics/girafarig_still_front_pic.png b/graphics/pokemon/girafarig/front.png
index bcada08dd..bcada08dd 100644
--- a/graphics/pokemon/front_pics/girafarig_still_front_pic.png
+++ b/graphics/pokemon/girafarig/front.png
diff --git a/graphics/pokemon/icons/girafarig_icon.png b/graphics/pokemon/girafarig/icon.png
index c8b79b132..c8b79b132 100644
--- a/graphics/pokemon/icons/girafarig_icon.png
+++ b/graphics/pokemon/girafarig/icon.png
diff --git a/graphics/pokemon/palettes/girafarig_palette.pal b/graphics/pokemon/girafarig/normal.pal
index 03e09de81..03e09de81 100644
--- a/graphics/pokemon/palettes/girafarig_palette.pal
+++ b/graphics/pokemon/girafarig/normal.pal
diff --git a/graphics/pokemon/palettes/girafarig_shiny_palette.pal b/graphics/pokemon/girafarig/shiny.pal
index d720557a7..d720557a7 100644
--- a/graphics/pokemon/palettes/girafarig_shiny_palette.pal
+++ b/graphics/pokemon/girafarig/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/glalie_front_pic.png b/graphics/pokemon/glalie/anim_front.png
index 3363961d7..3363961d7 100644
--- a/graphics/pokemon/anim_front_pics/glalie_front_pic.png
+++ b/graphics/pokemon/glalie/anim_front.png
diff --git a/graphics/pokemon/back_pics/glalie_back_pic.png b/graphics/pokemon/glalie/back.png
index 9c73ee9b2..9c73ee9b2 100644
--- a/graphics/pokemon/back_pics/glalie_back_pic.png
+++ b/graphics/pokemon/glalie/back.png
diff --git a/graphics/pokemon/footprints/glalie_footprint.png b/graphics/pokemon/glalie/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/glalie_footprint.png
+++ b/graphics/pokemon/glalie/footprint.png
diff --git a/graphics/pokemon/front_pics/glalie_still_front_pic.png b/graphics/pokemon/glalie/front.png
index c49ea517c..c49ea517c 100644
--- a/graphics/pokemon/front_pics/glalie_still_front_pic.png
+++ b/graphics/pokemon/glalie/front.png
diff --git a/graphics/pokemon/icons/glalie_icon.png b/graphics/pokemon/glalie/icon.png
index 0fc66c900..0fc66c900 100644
--- a/graphics/pokemon/icons/glalie_icon.png
+++ b/graphics/pokemon/glalie/icon.png
diff --git a/graphics/pokemon/palettes/glalie_palette.pal b/graphics/pokemon/glalie/normal.pal
index aeadcf782..aeadcf782 100644
--- a/graphics/pokemon/palettes/glalie_palette.pal
+++ b/graphics/pokemon/glalie/normal.pal
diff --git a/graphics/pokemon/palettes/glalie_shiny_palette.pal b/graphics/pokemon/glalie/shiny.pal
index c45ff937f..c45ff937f 100644
--- a/graphics/pokemon/palettes/glalie_shiny_palette.pal
+++ b/graphics/pokemon/glalie/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gligar_front_pic.png b/graphics/pokemon/gligar/anim_front.png
index c5ce592eb..c5ce592eb 100644
--- a/graphics/pokemon/anim_front_pics/gligar_front_pic.png
+++ b/graphics/pokemon/gligar/anim_front.png
diff --git a/graphics/pokemon/back_pics/gligar_back_pic.png b/graphics/pokemon/gligar/back.png
index 8179867e9..8179867e9 100644
--- a/graphics/pokemon/back_pics/gligar_back_pic.png
+++ b/graphics/pokemon/gligar/back.png
diff --git a/graphics/pokemon/footprints/gligar_footprint.png b/graphics/pokemon/gligar/footprint.png
index 3ca9864f0..3ca9864f0 100644
--- a/graphics/pokemon/footprints/gligar_footprint.png
+++ b/graphics/pokemon/gligar/footprint.png
diff --git a/graphics/pokemon/front_pics/gligar_still_front_pic.png b/graphics/pokemon/gligar/front.png
index b6bb68483..b6bb68483 100644
--- a/graphics/pokemon/front_pics/gligar_still_front_pic.png
+++ b/graphics/pokemon/gligar/front.png
diff --git a/graphics/pokemon/icons/gligar_icon.png b/graphics/pokemon/gligar/icon.png
index baa8414a7..baa8414a7 100644
--- a/graphics/pokemon/icons/gligar_icon.png
+++ b/graphics/pokemon/gligar/icon.png
diff --git a/graphics/pokemon/palettes/gligar_palette.pal b/graphics/pokemon/gligar/normal.pal
index 2f5ba7645..2f5ba7645 100644
--- a/graphics/pokemon/palettes/gligar_palette.pal
+++ b/graphics/pokemon/gligar/normal.pal
diff --git a/graphics/pokemon/palettes/gligar_shiny_palette.pal b/graphics/pokemon/gligar/shiny.pal
index 9b1d7d308..9b1d7d308 100644
--- a/graphics/pokemon/palettes/gligar_shiny_palette.pal
+++ b/graphics/pokemon/gligar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gloom_front_pic.png b/graphics/pokemon/gloom/anim_front.png
index 07f85cfb8..07f85cfb8 100644
--- a/graphics/pokemon/anim_front_pics/gloom_front_pic.png
+++ b/graphics/pokemon/gloom/anim_front.png
diff --git a/graphics/pokemon/back_pics/gloom_back_pic.png b/graphics/pokemon/gloom/back.png
index ec65e869e..ec65e869e 100644
--- a/graphics/pokemon/back_pics/gloom_back_pic.png
+++ b/graphics/pokemon/gloom/back.png
diff --git a/graphics/pokemon/footprints/gloom_footprint.png b/graphics/pokemon/gloom/footprint.png
index 7e9c265e8..7e9c265e8 100644
--- a/graphics/pokemon/footprints/gloom_footprint.png
+++ b/graphics/pokemon/gloom/footprint.png
diff --git a/graphics/pokemon/front_pics/gloom_still_front_pic.png b/graphics/pokemon/gloom/front.png
index 2a2658c5a..2a2658c5a 100644
--- a/graphics/pokemon/front_pics/gloom_still_front_pic.png
+++ b/graphics/pokemon/gloom/front.png
diff --git a/graphics/pokemon/icons/gloom_icon.png b/graphics/pokemon/gloom/icon.png
index 99c487dd2..99c487dd2 100644
--- a/graphics/pokemon/icons/gloom_icon.png
+++ b/graphics/pokemon/gloom/icon.png
diff --git a/graphics/pokemon/palettes/gloom_palette.pal b/graphics/pokemon/gloom/normal.pal
index 7b0861249..7b0861249 100644
--- a/graphics/pokemon/palettes/gloom_palette.pal
+++ b/graphics/pokemon/gloom/normal.pal
diff --git a/graphics/pokemon/palettes/gloom_shiny_palette.pal b/graphics/pokemon/gloom/shiny.pal
index c5e913980..c5e913980 100644
--- a/graphics/pokemon/palettes/gloom_shiny_palette.pal
+++ b/graphics/pokemon/gloom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/golbat_front_pic.png b/graphics/pokemon/golbat/anim_front.png
index c7ba99936..c7ba99936 100644
--- a/graphics/pokemon/anim_front_pics/golbat_front_pic.png
+++ b/graphics/pokemon/golbat/anim_front.png
diff --git a/graphics/pokemon/back_pics/golbat_back_pic.png b/graphics/pokemon/golbat/back.png
index caa196036..caa196036 100644
--- a/graphics/pokemon/back_pics/golbat_back_pic.png
+++ b/graphics/pokemon/golbat/back.png
diff --git a/graphics/pokemon/footprints/golbat_footprint.png b/graphics/pokemon/golbat/footprint.png
index 65c126fb3..65c126fb3 100644
--- a/graphics/pokemon/footprints/golbat_footprint.png
+++ b/graphics/pokemon/golbat/footprint.png
diff --git a/graphics/pokemon/front_pics/golbat_still_front_pic.png b/graphics/pokemon/golbat/front.png
index 84a7de3ba..84a7de3ba 100644
--- a/graphics/pokemon/front_pics/golbat_still_front_pic.png
+++ b/graphics/pokemon/golbat/front.png
diff --git a/graphics/pokemon/icons/golbat_icon.png b/graphics/pokemon/golbat/icon.png
index 25b3f6821..25b3f6821 100644
--- a/graphics/pokemon/icons/golbat_icon.png
+++ b/graphics/pokemon/golbat/icon.png
diff --git a/graphics/pokemon/palettes/golbat_palette.pal b/graphics/pokemon/golbat/normal.pal
index 424bccef8..424bccef8 100644
--- a/graphics/pokemon/palettes/golbat_palette.pal
+++ b/graphics/pokemon/golbat/normal.pal
diff --git a/graphics/pokemon/palettes/golbat_shiny_palette.pal b/graphics/pokemon/golbat/shiny.pal
index 7255f93b7..7255f93b7 100644
--- a/graphics/pokemon/palettes/golbat_shiny_palette.pal
+++ b/graphics/pokemon/golbat/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/goldeen_front_pic.png b/graphics/pokemon/goldeen/anim_front.png
index 375571730..375571730 100644
--- a/graphics/pokemon/anim_front_pics/goldeen_front_pic.png
+++ b/graphics/pokemon/goldeen/anim_front.png
diff --git a/graphics/pokemon/back_pics/goldeen_back_pic.png b/graphics/pokemon/goldeen/back.png
index 8ac7cb7bc..8ac7cb7bc 100644
--- a/graphics/pokemon/back_pics/goldeen_back_pic.png
+++ b/graphics/pokemon/goldeen/back.png
diff --git a/graphics/pokemon/footprints/goldeen_footprint.png b/graphics/pokemon/goldeen/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/goldeen_footprint.png
+++ b/graphics/pokemon/goldeen/footprint.png
diff --git a/graphics/pokemon/front_pics/goldeen_still_front_pic.png b/graphics/pokemon/goldeen/front.png
index 8014f649d..8014f649d 100644
--- a/graphics/pokemon/front_pics/goldeen_still_front_pic.png
+++ b/graphics/pokemon/goldeen/front.png
diff --git a/graphics/pokemon/icons/goldeen_icon.png b/graphics/pokemon/goldeen/icon.png
index 9dc3bff80..9dc3bff80 100644
--- a/graphics/pokemon/icons/goldeen_icon.png
+++ b/graphics/pokemon/goldeen/icon.png
diff --git a/graphics/pokemon/palettes/goldeen_palette.pal b/graphics/pokemon/goldeen/normal.pal
index d88f14932..d88f14932 100644
--- a/graphics/pokemon/palettes/goldeen_palette.pal
+++ b/graphics/pokemon/goldeen/normal.pal
diff --git a/graphics/pokemon/palettes/goldeen_shiny_palette.pal b/graphics/pokemon/goldeen/shiny.pal
index d2a881523..d2a881523 100644
--- a/graphics/pokemon/palettes/goldeen_shiny_palette.pal
+++ b/graphics/pokemon/goldeen/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/golduck_front_pic.png b/graphics/pokemon/golduck/anim_front.png
index 87b2327ce..87b2327ce 100644
--- a/graphics/pokemon/anim_front_pics/golduck_front_pic.png
+++ b/graphics/pokemon/golduck/anim_front.png
diff --git a/graphics/pokemon/back_pics/golduck_back_pic.png b/graphics/pokemon/golduck/back.png
index 1422a73ae..1422a73ae 100644
--- a/graphics/pokemon/back_pics/golduck_back_pic.png
+++ b/graphics/pokemon/golduck/back.png
diff --git a/graphics/pokemon/footprints/golduck_footprint.png b/graphics/pokemon/golduck/footprint.png
index 63ba752e4..63ba752e4 100644
--- a/graphics/pokemon/footprints/golduck_footprint.png
+++ b/graphics/pokemon/golduck/footprint.png
diff --git a/graphics/pokemon/front_pics/golduck_still_front_pic.png b/graphics/pokemon/golduck/front.png
index c0da452fe..c0da452fe 100644
--- a/graphics/pokemon/front_pics/golduck_still_front_pic.png
+++ b/graphics/pokemon/golduck/front.png
diff --git a/graphics/pokemon/icons/golduck_icon.png b/graphics/pokemon/golduck/icon.png
index c0c922834..c0c922834 100644
--- a/graphics/pokemon/icons/golduck_icon.png
+++ b/graphics/pokemon/golduck/icon.png
diff --git a/graphics/pokemon/palettes/golduck_palette.pal b/graphics/pokemon/golduck/normal.pal
index f6dc8cce1..f6dc8cce1 100644
--- a/graphics/pokemon/palettes/golduck_palette.pal
+++ b/graphics/pokemon/golduck/normal.pal
diff --git a/graphics/pokemon/palettes/golduck_shiny_palette.pal b/graphics/pokemon/golduck/shiny.pal
index 2d563d702..2d563d702 100644
--- a/graphics/pokemon/palettes/golduck_shiny_palette.pal
+++ b/graphics/pokemon/golduck/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/golem_front_pic.png b/graphics/pokemon/golem/anim_front.png
index 48e7128d6..48e7128d6 100644
--- a/graphics/pokemon/anim_front_pics/golem_front_pic.png
+++ b/graphics/pokemon/golem/anim_front.png
diff --git a/graphics/pokemon/back_pics/golem_back_pic.png b/graphics/pokemon/golem/back.png
index fb27ae43f..fb27ae43f 100644
--- a/graphics/pokemon/back_pics/golem_back_pic.png
+++ b/graphics/pokemon/golem/back.png
diff --git a/graphics/pokemon/footprints/golem_footprint.png b/graphics/pokemon/golem/footprint.png
index 8ddc6345c..8ddc6345c 100644
--- a/graphics/pokemon/footprints/golem_footprint.png
+++ b/graphics/pokemon/golem/footprint.png
diff --git a/graphics/pokemon/front_pics/golem_still_front_pic.png b/graphics/pokemon/golem/front.png
index 02c98b38f..02c98b38f 100644
--- a/graphics/pokemon/front_pics/golem_still_front_pic.png
+++ b/graphics/pokemon/golem/front.png
diff --git a/graphics/pokemon/icons/golem_icon.png b/graphics/pokemon/golem/icon.png
index 480f8c0bb..480f8c0bb 100644
--- a/graphics/pokemon/icons/golem_icon.png
+++ b/graphics/pokemon/golem/icon.png
diff --git a/graphics/pokemon/palettes/golem_palette.pal b/graphics/pokemon/golem/normal.pal
index bb55b42d9..bb55b42d9 100644
--- a/graphics/pokemon/palettes/golem_palette.pal
+++ b/graphics/pokemon/golem/normal.pal
diff --git a/graphics/pokemon/palettes/golem_shiny_palette.pal b/graphics/pokemon/golem/shiny.pal
index 41b80863c..41b80863c 100644
--- a/graphics/pokemon/palettes/golem_shiny_palette.pal
+++ b/graphics/pokemon/golem/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gorebyss_front_pic.png b/graphics/pokemon/gorebyss/anim_front.png
index d3dd2fd48..d3dd2fd48 100644
--- a/graphics/pokemon/anim_front_pics/gorebyss_front_pic.png
+++ b/graphics/pokemon/gorebyss/anim_front.png
diff --git a/graphics/pokemon/back_pics/gorebyss_back_pic.png b/graphics/pokemon/gorebyss/back.png
index aaf24366b..aaf24366b 100644
--- a/graphics/pokemon/back_pics/gorebyss_back_pic.png
+++ b/graphics/pokemon/gorebyss/back.png
diff --git a/graphics/pokemon/footprints/gorebyss_footprint.png b/graphics/pokemon/gorebyss/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/gorebyss_footprint.png
+++ b/graphics/pokemon/gorebyss/footprint.png
diff --git a/graphics/pokemon/front_pics/gorebyss_still_front_pic.png b/graphics/pokemon/gorebyss/front.png
index ba017418c..ba017418c 100644
--- a/graphics/pokemon/front_pics/gorebyss_still_front_pic.png
+++ b/graphics/pokemon/gorebyss/front.png
diff --git a/graphics/pokemon/icons/gorebyss_icon.png b/graphics/pokemon/gorebyss/icon.png
index 7dc8bc476..7dc8bc476 100644
--- a/graphics/pokemon/icons/gorebyss_icon.png
+++ b/graphics/pokemon/gorebyss/icon.png
diff --git a/graphics/pokemon/palettes/gorebyss_palette.pal b/graphics/pokemon/gorebyss/normal.pal
index 432c0eccc..432c0eccc 100644
--- a/graphics/pokemon/palettes/gorebyss_palette.pal
+++ b/graphics/pokemon/gorebyss/normal.pal
diff --git a/graphics/pokemon/palettes/gorebyss_shiny_palette.pal b/graphics/pokemon/gorebyss/shiny.pal
index 693375005..693375005 100644
--- a/graphics/pokemon/palettes/gorebyss_shiny_palette.pal
+++ b/graphics/pokemon/gorebyss/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/granbull_front_pic.png b/graphics/pokemon/granbull/anim_front.png
index e077f8b07..e077f8b07 100644
--- a/graphics/pokemon/anim_front_pics/granbull_front_pic.png
+++ b/graphics/pokemon/granbull/anim_front.png
diff --git a/graphics/pokemon/back_pics/granbull_back_pic.png b/graphics/pokemon/granbull/back.png
index 2ac044da6..2ac044da6 100644
--- a/graphics/pokemon/back_pics/granbull_back_pic.png
+++ b/graphics/pokemon/granbull/back.png
diff --git a/graphics/pokemon/footprints/granbull_footprint.png b/graphics/pokemon/granbull/footprint.png
index 010b5fb67..010b5fb67 100644
--- a/graphics/pokemon/footprints/granbull_footprint.png
+++ b/graphics/pokemon/granbull/footprint.png
diff --git a/graphics/pokemon/front_pics/granbull_still_front_pic.png b/graphics/pokemon/granbull/front.png
index ee4c40b25..ee4c40b25 100644
--- a/graphics/pokemon/front_pics/granbull_still_front_pic.png
+++ b/graphics/pokemon/granbull/front.png
diff --git a/graphics/pokemon/icons/granbull_icon.png b/graphics/pokemon/granbull/icon.png
index 89beb7a8c..89beb7a8c 100644
--- a/graphics/pokemon/icons/granbull_icon.png
+++ b/graphics/pokemon/granbull/icon.png
diff --git a/graphics/pokemon/palettes/granbull_palette.pal b/graphics/pokemon/granbull/normal.pal
index b83b14d16..b83b14d16 100644
--- a/graphics/pokemon/palettes/granbull_palette.pal
+++ b/graphics/pokemon/granbull/normal.pal
diff --git a/graphics/pokemon/palettes/granbull_shiny_palette.pal b/graphics/pokemon/granbull/shiny.pal
index a8dfec728..a8dfec728 100644
--- a/graphics/pokemon/palettes/granbull_shiny_palette.pal
+++ b/graphics/pokemon/granbull/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/graveler_front_pic.png b/graphics/pokemon/graveler/anim_front.png
index 09b913061..09b913061 100644
--- a/graphics/pokemon/anim_front_pics/graveler_front_pic.png
+++ b/graphics/pokemon/graveler/anim_front.png
diff --git a/graphics/pokemon/back_pics/graveler_back_pic.png b/graphics/pokemon/graveler/back.png
index 79e87cee9..79e87cee9 100644
--- a/graphics/pokemon/back_pics/graveler_back_pic.png
+++ b/graphics/pokemon/graveler/back.png
diff --git a/graphics/pokemon/footprints/graveler_footprint.png b/graphics/pokemon/graveler/footprint.png
index c836ad3f4..c836ad3f4 100644
--- a/graphics/pokemon/footprints/graveler_footprint.png
+++ b/graphics/pokemon/graveler/footprint.png
diff --git a/graphics/pokemon/front_pics/graveler_still_front_pic.png b/graphics/pokemon/graveler/front.png
index 25c7066a4..25c7066a4 100644
--- a/graphics/pokemon/front_pics/graveler_still_front_pic.png
+++ b/graphics/pokemon/graveler/front.png
diff --git a/graphics/pokemon/icons/graveler_icon.png b/graphics/pokemon/graveler/icon.png
index 84e81dc10..84e81dc10 100644
--- a/graphics/pokemon/icons/graveler_icon.png
+++ b/graphics/pokemon/graveler/icon.png
diff --git a/graphics/pokemon/palettes/graveler_palette.pal b/graphics/pokemon/graveler/normal.pal
index b176f1268..b176f1268 100644
--- a/graphics/pokemon/palettes/graveler_palette.pal
+++ b/graphics/pokemon/graveler/normal.pal
diff --git a/graphics/pokemon/palettes/graveler_shiny_palette.pal b/graphics/pokemon/graveler/shiny.pal
index 3b61619d9..3b61619d9 100644
--- a/graphics/pokemon/palettes/graveler_shiny_palette.pal
+++ b/graphics/pokemon/graveler/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/grimer_front_pic.png b/graphics/pokemon/grimer/anim_front.png
index 9305e2d97..9305e2d97 100644
--- a/graphics/pokemon/anim_front_pics/grimer_front_pic.png
+++ b/graphics/pokemon/grimer/anim_front.png
diff --git a/graphics/pokemon/back_pics/grimer_back_pic.png b/graphics/pokemon/grimer/back.png
index 593a1ab54..593a1ab54 100644
--- a/graphics/pokemon/back_pics/grimer_back_pic.png
+++ b/graphics/pokemon/grimer/back.png
diff --git a/graphics/pokemon/footprints/grimer_footprint.png b/graphics/pokemon/grimer/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/grimer_footprint.png
+++ b/graphics/pokemon/grimer/footprint.png
diff --git a/graphics/pokemon/front_pics/grimer_still_front_pic.png b/graphics/pokemon/grimer/front.png
index 040fbd192..040fbd192 100644
--- a/graphics/pokemon/front_pics/grimer_still_front_pic.png
+++ b/graphics/pokemon/grimer/front.png
diff --git a/graphics/pokemon/icons/grimer_icon.png b/graphics/pokemon/grimer/icon.png
index c814df542..c814df542 100644
--- a/graphics/pokemon/icons/grimer_icon.png
+++ b/graphics/pokemon/grimer/icon.png
diff --git a/graphics/pokemon/palettes/grimer_palette.pal b/graphics/pokemon/grimer/normal.pal
index 6a1087bcf..6a1087bcf 100644
--- a/graphics/pokemon/palettes/grimer_palette.pal
+++ b/graphics/pokemon/grimer/normal.pal
diff --git a/graphics/pokemon/palettes/grimer_shiny_palette.pal b/graphics/pokemon/grimer/shiny.pal
index 6c9a6b415..6c9a6b415 100644
--- a/graphics/pokemon/palettes/grimer_shiny_palette.pal
+++ b/graphics/pokemon/grimer/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/groudon_front_pic.png b/graphics/pokemon/groudon/anim_front.png
index 815808a92..815808a92 100644
--- a/graphics/pokemon/anim_front_pics/groudon_front_pic.png
+++ b/graphics/pokemon/groudon/anim_front.png
diff --git a/graphics/pokemon/back_pics/groudon_back_pic.png b/graphics/pokemon/groudon/back.png
index e2b711932..e2b711932 100644
--- a/graphics/pokemon/back_pics/groudon_back_pic.png
+++ b/graphics/pokemon/groudon/back.png
diff --git a/graphics/pokemon/footprints/groudon_footprint.png b/graphics/pokemon/groudon/footprint.png
index cb80ba48d..cb80ba48d 100644
--- a/graphics/pokemon/footprints/groudon_footprint.png
+++ b/graphics/pokemon/groudon/footprint.png
diff --git a/graphics/pokemon/front_pics/groudon_still_front_pic.png b/graphics/pokemon/groudon/front.png
index 2e768694f..2e768694f 100644
--- a/graphics/pokemon/front_pics/groudon_still_front_pic.png
+++ b/graphics/pokemon/groudon/front.png
diff --git a/graphics/pokemon/icons/groudon_icon.png b/graphics/pokemon/groudon/icon.png
index 2b8707bb8..2b8707bb8 100644
--- a/graphics/pokemon/icons/groudon_icon.png
+++ b/graphics/pokemon/groudon/icon.png
diff --git a/graphics/pokemon/palettes/groudon_palette.pal b/graphics/pokemon/groudon/normal.pal
index 24c99e510..24c99e510 100644
--- a/graphics/pokemon/palettes/groudon_palette.pal
+++ b/graphics/pokemon/groudon/normal.pal
diff --git a/graphics/pokemon/palettes/groudon_shiny_palette.pal b/graphics/pokemon/groudon/shiny.pal
index 6c0a16585..6c0a16585 100644
--- a/graphics/pokemon/palettes/groudon_shiny_palette.pal
+++ b/graphics/pokemon/groudon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/grovyle_front_pic.png b/graphics/pokemon/grovyle/anim_front.png
index daee3d1be..daee3d1be 100644
--- a/graphics/pokemon/anim_front_pics/grovyle_front_pic.png
+++ b/graphics/pokemon/grovyle/anim_front.png
diff --git a/graphics/pokemon/back_pics/grovyle_back_pic.png b/graphics/pokemon/grovyle/back.png
index 1ffed7b90..1ffed7b90 100644
--- a/graphics/pokemon/back_pics/grovyle_back_pic.png
+++ b/graphics/pokemon/grovyle/back.png
diff --git a/graphics/pokemon/footprints/grovyle_footprint.png b/graphics/pokemon/grovyle/footprint.png
index c78ea507c..c78ea507c 100644
--- a/graphics/pokemon/footprints/grovyle_footprint.png
+++ b/graphics/pokemon/grovyle/footprint.png
diff --git a/graphics/pokemon/front_pics/grovyle_still_front_pic.png b/graphics/pokemon/grovyle/front.png
index 95a19a7ca..95a19a7ca 100644
--- a/graphics/pokemon/front_pics/grovyle_still_front_pic.png
+++ b/graphics/pokemon/grovyle/front.png
diff --git a/graphics/pokemon/icons/grovyle_icon.png b/graphics/pokemon/grovyle/icon.png
index bed04dc98..bed04dc98 100644
--- a/graphics/pokemon/icons/grovyle_icon.png
+++ b/graphics/pokemon/grovyle/icon.png
diff --git a/graphics/pokemon/palettes/grovyle_palette.pal b/graphics/pokemon/grovyle/normal.pal
index a1e6181fc..a1e6181fc 100644
--- a/graphics/pokemon/palettes/grovyle_palette.pal
+++ b/graphics/pokemon/grovyle/normal.pal
diff --git a/graphics/pokemon/palettes/grovyle_shiny_palette.pal b/graphics/pokemon/grovyle/shiny.pal
index c61afa4a3..c61afa4a3 100644
--- a/graphics/pokemon/palettes/grovyle_shiny_palette.pal
+++ b/graphics/pokemon/grovyle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/growlithe_front_pic.png b/graphics/pokemon/growlithe/anim_front.png
index ee7564cb9..ee7564cb9 100644
--- a/graphics/pokemon/anim_front_pics/growlithe_front_pic.png
+++ b/graphics/pokemon/growlithe/anim_front.png
diff --git a/graphics/pokemon/back_pics/growlithe_back_pic.png b/graphics/pokemon/growlithe/back.png
index 2b89351a3..2b89351a3 100644
--- a/graphics/pokemon/back_pics/growlithe_back_pic.png
+++ b/graphics/pokemon/growlithe/back.png
diff --git a/graphics/pokemon/footprints/growlithe_footprint.png b/graphics/pokemon/growlithe/footprint.png
index 2517cdcba..2517cdcba 100644
--- a/graphics/pokemon/footprints/growlithe_footprint.png
+++ b/graphics/pokemon/growlithe/footprint.png
diff --git a/graphics/pokemon/front_pics/growlithe_still_front_pic.png b/graphics/pokemon/growlithe/front.png
index 12ae57290..12ae57290 100644
--- a/graphics/pokemon/front_pics/growlithe_still_front_pic.png
+++ b/graphics/pokemon/growlithe/front.png
diff --git a/graphics/pokemon/icons/growlithe_icon.png b/graphics/pokemon/growlithe/icon.png
index 8870c8b4f..8870c8b4f 100644
--- a/graphics/pokemon/icons/growlithe_icon.png
+++ b/graphics/pokemon/growlithe/icon.png
diff --git a/graphics/pokemon/palettes/growlithe_palette.pal b/graphics/pokemon/growlithe/normal.pal
index 0c7054eae..0c7054eae 100644
--- a/graphics/pokemon/palettes/growlithe_palette.pal
+++ b/graphics/pokemon/growlithe/normal.pal
diff --git a/graphics/pokemon/palettes/growlithe_shiny_palette.pal b/graphics/pokemon/growlithe/shiny.pal
index 0604c9c25..0604c9c25 100644
--- a/graphics/pokemon/palettes/growlithe_shiny_palette.pal
+++ b/graphics/pokemon/growlithe/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/grumpig_front_pic.png b/graphics/pokemon/grumpig/anim_front.png
index 1d128a652..1d128a652 100644
--- a/graphics/pokemon/anim_front_pics/grumpig_front_pic.png
+++ b/graphics/pokemon/grumpig/anim_front.png
diff --git a/graphics/pokemon/back_pics/grumpig_back_pic.png b/graphics/pokemon/grumpig/back.png
index 08d476c29..08d476c29 100644
--- a/graphics/pokemon/back_pics/grumpig_back_pic.png
+++ b/graphics/pokemon/grumpig/back.png
diff --git a/graphics/pokemon/footprints/grumpig_footprint.png b/graphics/pokemon/grumpig/footprint.png
index ddff0e500..ddff0e500 100644
--- a/graphics/pokemon/footprints/grumpig_footprint.png
+++ b/graphics/pokemon/grumpig/footprint.png
diff --git a/graphics/pokemon/front_pics/grumpig_still_front_pic.png b/graphics/pokemon/grumpig/front.png
index 42604aed2..42604aed2 100644
--- a/graphics/pokemon/front_pics/grumpig_still_front_pic.png
+++ b/graphics/pokemon/grumpig/front.png
diff --git a/graphics/pokemon/icons/grumpig_icon.png b/graphics/pokemon/grumpig/icon.png
index fb3cac59d..fb3cac59d 100644
--- a/graphics/pokemon/icons/grumpig_icon.png
+++ b/graphics/pokemon/grumpig/icon.png
diff --git a/graphics/pokemon/palettes/grumpig_palette.pal b/graphics/pokemon/grumpig/normal.pal
index c49601f91..c49601f91 100644
--- a/graphics/pokemon/palettes/grumpig_palette.pal
+++ b/graphics/pokemon/grumpig/normal.pal
diff --git a/graphics/pokemon/palettes/grumpig_shiny_palette.pal b/graphics/pokemon/grumpig/shiny.pal
index b9c88ae3d..b9c88ae3d 100644
--- a/graphics/pokemon/palettes/grumpig_shiny_palette.pal
+++ b/graphics/pokemon/grumpig/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gulpin_front_pic.png b/graphics/pokemon/gulpin/anim_front.png
index 8381bfdc7..8381bfdc7 100644
--- a/graphics/pokemon/anim_front_pics/gulpin_front_pic.png
+++ b/graphics/pokemon/gulpin/anim_front.png
diff --git a/graphics/pokemon/back_pics/gulpin_back_pic.png b/graphics/pokemon/gulpin/back.png
index 928f291d1..928f291d1 100644
--- a/graphics/pokemon/back_pics/gulpin_back_pic.png
+++ b/graphics/pokemon/gulpin/back.png
diff --git a/graphics/pokemon/footprints/gulpin_footprint.png b/graphics/pokemon/gulpin/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/gulpin_footprint.png
+++ b/graphics/pokemon/gulpin/footprint.png
diff --git a/graphics/pokemon/front_pics/gulpin_still_front_pic.png b/graphics/pokemon/gulpin/front.png
index 14809cf73..14809cf73 100644
--- a/graphics/pokemon/front_pics/gulpin_still_front_pic.png
+++ b/graphics/pokemon/gulpin/front.png
diff --git a/graphics/pokemon/icons/gulpin_icon.png b/graphics/pokemon/gulpin/icon.png
index 53eed645f..53eed645f 100644
--- a/graphics/pokemon/icons/gulpin_icon.png
+++ b/graphics/pokemon/gulpin/icon.png
diff --git a/graphics/pokemon/palettes/gulpin_palette.pal b/graphics/pokemon/gulpin/normal.pal
index 588be1e4a..588be1e4a 100644
--- a/graphics/pokemon/palettes/gulpin_palette.pal
+++ b/graphics/pokemon/gulpin/normal.pal
diff --git a/graphics/pokemon/palettes/gulpin_shiny_palette.pal b/graphics/pokemon/gulpin/shiny.pal
index 83373f072..83373f072 100644
--- a/graphics/pokemon/palettes/gulpin_shiny_palette.pal
+++ b/graphics/pokemon/gulpin/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/gyarados_front_pic.png b/graphics/pokemon/gyarados/anim_front.png
index 7b1864f1b..7b1864f1b 100644
--- a/graphics/pokemon/anim_front_pics/gyarados_front_pic.png
+++ b/graphics/pokemon/gyarados/anim_front.png
diff --git a/graphics/pokemon/back_pics/gyarados_back_pic.png b/graphics/pokemon/gyarados/back.png
index 8240fa3cc..8240fa3cc 100644
--- a/graphics/pokemon/back_pics/gyarados_back_pic.png
+++ b/graphics/pokemon/gyarados/back.png
diff --git a/graphics/pokemon/footprints/gyarados_footprint.png b/graphics/pokemon/gyarados/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/gyarados_footprint.png
+++ b/graphics/pokemon/gyarados/footprint.png
diff --git a/graphics/pokemon/front_pics/gyarados_still_front_pic.png b/graphics/pokemon/gyarados/front.png
index 3a2d4f3e7..3a2d4f3e7 100644
--- a/graphics/pokemon/front_pics/gyarados_still_front_pic.png
+++ b/graphics/pokemon/gyarados/front.png
diff --git a/graphics/pokemon/icons/gyarados_icon.png b/graphics/pokemon/gyarados/icon.png
index 13e611d09..13e611d09 100644
--- a/graphics/pokemon/icons/gyarados_icon.png
+++ b/graphics/pokemon/gyarados/icon.png
diff --git a/graphics/pokemon/palettes/gyarados_palette.pal b/graphics/pokemon/gyarados/normal.pal
index 63b325d5b..63b325d5b 100644
--- a/graphics/pokemon/palettes/gyarados_palette.pal
+++ b/graphics/pokemon/gyarados/normal.pal
diff --git a/graphics/pokemon/palettes/gyarados_shiny_palette.pal b/graphics/pokemon/gyarados/shiny.pal
index a8afe9dcd..a8afe9dcd 100644
--- a/graphics/pokemon/palettes/gyarados_shiny_palette.pal
+++ b/graphics/pokemon/gyarados/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hariyama_front_pic.png b/graphics/pokemon/hariyama/anim_front.png
index d71ec4704..d71ec4704 100644
--- a/graphics/pokemon/anim_front_pics/hariyama_front_pic.png
+++ b/graphics/pokemon/hariyama/anim_front.png
diff --git a/graphics/pokemon/back_pics/hariyama_back_pic.png b/graphics/pokemon/hariyama/back.png
index 09eba4b52..09eba4b52 100644
--- a/graphics/pokemon/back_pics/hariyama_back_pic.png
+++ b/graphics/pokemon/hariyama/back.png
diff --git a/graphics/pokemon/footprints/hariyama_footprint.png b/graphics/pokemon/hariyama/footprint.png
index ab5d9f369..ab5d9f369 100644
--- a/graphics/pokemon/footprints/hariyama_footprint.png
+++ b/graphics/pokemon/hariyama/footprint.png
diff --git a/graphics/pokemon/front_pics/hariyama_still_front_pic.png b/graphics/pokemon/hariyama/front.png
index abefe0de2..abefe0de2 100644
--- a/graphics/pokemon/front_pics/hariyama_still_front_pic.png
+++ b/graphics/pokemon/hariyama/front.png
diff --git a/graphics/pokemon/icons/hariyama_icon.png b/graphics/pokemon/hariyama/icon.png
index b16b04907..b16b04907 100644
--- a/graphics/pokemon/icons/hariyama_icon.png
+++ b/graphics/pokemon/hariyama/icon.png
diff --git a/graphics/pokemon/palettes/hariyama_palette.pal b/graphics/pokemon/hariyama/normal.pal
index 99b5902d9..99b5902d9 100644
--- a/graphics/pokemon/palettes/hariyama_palette.pal
+++ b/graphics/pokemon/hariyama/normal.pal
diff --git a/graphics/pokemon/palettes/hariyama_shiny_palette.pal b/graphics/pokemon/hariyama/shiny.pal
index 14281f812..14281f812 100644
--- a/graphics/pokemon/palettes/hariyama_shiny_palette.pal
+++ b/graphics/pokemon/hariyama/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/haunter_front_pic.png b/graphics/pokemon/haunter/anim_front.png
index a41b867fd..a41b867fd 100644
--- a/graphics/pokemon/anim_front_pics/haunter_front_pic.png
+++ b/graphics/pokemon/haunter/anim_front.png
diff --git a/graphics/pokemon/back_pics/haunter_back_pic.png b/graphics/pokemon/haunter/back.png
index 4b4585904..4b4585904 100644
--- a/graphics/pokemon/back_pics/haunter_back_pic.png
+++ b/graphics/pokemon/haunter/back.png
diff --git a/graphics/pokemon/footprints/haunter_footprint.png b/graphics/pokemon/haunter/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/haunter_footprint.png
+++ b/graphics/pokemon/haunter/footprint.png
diff --git a/graphics/pokemon/front_pics/haunter_still_front_pic.png b/graphics/pokemon/haunter/front.png
index e773c0863..e773c0863 100644
--- a/graphics/pokemon/front_pics/haunter_still_front_pic.png
+++ b/graphics/pokemon/haunter/front.png
diff --git a/graphics/pokemon/icons/haunter_icon.png b/graphics/pokemon/haunter/icon.png
index aac3e15f8..aac3e15f8 100644
--- a/graphics/pokemon/icons/haunter_icon.png
+++ b/graphics/pokemon/haunter/icon.png
diff --git a/graphics/pokemon/palettes/haunter_palette.pal b/graphics/pokemon/haunter/normal.pal
index 1f3ceb070..1f3ceb070 100644
--- a/graphics/pokemon/palettes/haunter_palette.pal
+++ b/graphics/pokemon/haunter/normal.pal
diff --git a/graphics/pokemon/palettes/haunter_shiny_palette.pal b/graphics/pokemon/haunter/shiny.pal
index d6cab2588..d6cab2588 100644
--- a/graphics/pokemon/palettes/haunter_shiny_palette.pal
+++ b/graphics/pokemon/haunter/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/heracross_front_pic.png b/graphics/pokemon/heracross/anim_front.png
index 96af2d24f..96af2d24f 100644
--- a/graphics/pokemon/anim_front_pics/heracross_front_pic.png
+++ b/graphics/pokemon/heracross/anim_front.png
diff --git a/graphics/pokemon/back_pics/heracross_back_pic.png b/graphics/pokemon/heracross/back.png
index df8202179..df8202179 100644
--- a/graphics/pokemon/back_pics/heracross_back_pic.png
+++ b/graphics/pokemon/heracross/back.png
diff --git a/graphics/pokemon/footprints/heracross_footprint.png b/graphics/pokemon/heracross/footprint.png
index a740a17c9..a740a17c9 100644
--- a/graphics/pokemon/footprints/heracross_footprint.png
+++ b/graphics/pokemon/heracross/footprint.png
diff --git a/graphics/pokemon/front_pics/heracross_still_front_pic.png b/graphics/pokemon/heracross/front.png
index f693a4c46..f693a4c46 100644
--- a/graphics/pokemon/front_pics/heracross_still_front_pic.png
+++ b/graphics/pokemon/heracross/front.png
diff --git a/graphics/pokemon/icons/heracross_icon.png b/graphics/pokemon/heracross/icon.png
index 994fbe33f..994fbe33f 100644
--- a/graphics/pokemon/icons/heracross_icon.png
+++ b/graphics/pokemon/heracross/icon.png
diff --git a/graphics/pokemon/palettes/heracross_palette.pal b/graphics/pokemon/heracross/normal.pal
index 06fe289a5..06fe289a5 100644
--- a/graphics/pokemon/palettes/heracross_palette.pal
+++ b/graphics/pokemon/heracross/normal.pal
diff --git a/graphics/pokemon/palettes/heracross_shiny_palette.pal b/graphics/pokemon/heracross/shiny.pal
index c85ace38b..c85ace38b 100644
--- a/graphics/pokemon/palettes/heracross_shiny_palette.pal
+++ b/graphics/pokemon/heracross/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hitmonchan_front_pic.png b/graphics/pokemon/hitmonchan/anim_front.png
index a08e0a0da..a08e0a0da 100644
--- a/graphics/pokemon/anim_front_pics/hitmonchan_front_pic.png
+++ b/graphics/pokemon/hitmonchan/anim_front.png
diff --git a/graphics/pokemon/back_pics/hitmonchan_back_pic.png b/graphics/pokemon/hitmonchan/back.png
index 8d9423071..8d9423071 100644
--- a/graphics/pokemon/back_pics/hitmonchan_back_pic.png
+++ b/graphics/pokemon/hitmonchan/back.png
diff --git a/graphics/pokemon/footprints/hitmonchan_footprint.png b/graphics/pokemon/hitmonchan/footprint.png
index cfd1efd54..cfd1efd54 100644
--- a/graphics/pokemon/footprints/hitmonchan_footprint.png
+++ b/graphics/pokemon/hitmonchan/footprint.png
diff --git a/graphics/pokemon/front_pics/hitmonchan_still_front_pic.png b/graphics/pokemon/hitmonchan/front.png
index 5a16c4070..5a16c4070 100644
--- a/graphics/pokemon/front_pics/hitmonchan_still_front_pic.png
+++ b/graphics/pokemon/hitmonchan/front.png
diff --git a/graphics/pokemon/icons/hitmonchan_icon.png b/graphics/pokemon/hitmonchan/icon.png
index a657a6d74..a657a6d74 100644
--- a/graphics/pokemon/icons/hitmonchan_icon.png
+++ b/graphics/pokemon/hitmonchan/icon.png
diff --git a/graphics/pokemon/palettes/hitmonchan_palette.pal b/graphics/pokemon/hitmonchan/normal.pal
index 77c20d85a..77c20d85a 100644
--- a/graphics/pokemon/palettes/hitmonchan_palette.pal
+++ b/graphics/pokemon/hitmonchan/normal.pal
diff --git a/graphics/pokemon/palettes/hitmonchan_shiny_palette.pal b/graphics/pokemon/hitmonchan/shiny.pal
index 2e4a28f0c..2e4a28f0c 100644
--- a/graphics/pokemon/palettes/hitmonchan_shiny_palette.pal
+++ b/graphics/pokemon/hitmonchan/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hitmonlee_front_pic.png b/graphics/pokemon/hitmonlee/anim_front.png
index 46d29bd4a..46d29bd4a 100644
--- a/graphics/pokemon/anim_front_pics/hitmonlee_front_pic.png
+++ b/graphics/pokemon/hitmonlee/anim_front.png
diff --git a/graphics/pokemon/back_pics/hitmonlee_back_pic.png b/graphics/pokemon/hitmonlee/back.png
index 9aa095a6a..9aa095a6a 100644
--- a/graphics/pokemon/back_pics/hitmonlee_back_pic.png
+++ b/graphics/pokemon/hitmonlee/back.png
diff --git a/graphics/pokemon/footprints/hitmonlee_footprint.png b/graphics/pokemon/hitmonlee/footprint.png
index 505120110..505120110 100644
--- a/graphics/pokemon/footprints/hitmonlee_footprint.png
+++ b/graphics/pokemon/hitmonlee/footprint.png
diff --git a/graphics/pokemon/front_pics/hitmonlee_still_front_pic.png b/graphics/pokemon/hitmonlee/front.png
index 543c4e58c..543c4e58c 100644
--- a/graphics/pokemon/front_pics/hitmonlee_still_front_pic.png
+++ b/graphics/pokemon/hitmonlee/front.png
diff --git a/graphics/pokemon/icons/hitmonlee_icon.png b/graphics/pokemon/hitmonlee/icon.png
index b45c93686..b45c93686 100644
--- a/graphics/pokemon/icons/hitmonlee_icon.png
+++ b/graphics/pokemon/hitmonlee/icon.png
diff --git a/graphics/pokemon/palettes/hitmonlee_palette.pal b/graphics/pokemon/hitmonlee/normal.pal
index e70409a90..e70409a90 100644
--- a/graphics/pokemon/palettes/hitmonlee_palette.pal
+++ b/graphics/pokemon/hitmonlee/normal.pal
diff --git a/graphics/pokemon/palettes/hitmonlee_shiny_palette.pal b/graphics/pokemon/hitmonlee/shiny.pal
index 74e6c6452..74e6c6452 100644
--- a/graphics/pokemon/palettes/hitmonlee_shiny_palette.pal
+++ b/graphics/pokemon/hitmonlee/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hitmontop_front_pic.png b/graphics/pokemon/hitmontop/anim_front.png
index 69365ac62..69365ac62 100644
--- a/graphics/pokemon/anim_front_pics/hitmontop_front_pic.png
+++ b/graphics/pokemon/hitmontop/anim_front.png
diff --git a/graphics/pokemon/back_pics/hitmontop_back_pic.png b/graphics/pokemon/hitmontop/back.png
index 09d16414c..09d16414c 100644
--- a/graphics/pokemon/back_pics/hitmontop_back_pic.png
+++ b/graphics/pokemon/hitmontop/back.png
diff --git a/graphics/pokemon/footprints/hitmontop_footprint.png b/graphics/pokemon/hitmontop/footprint.png
index ba8c1cca2..ba8c1cca2 100644
--- a/graphics/pokemon/footprints/hitmontop_footprint.png
+++ b/graphics/pokemon/hitmontop/footprint.png
diff --git a/graphics/pokemon/front_pics/hitmontop_still_front_pic.png b/graphics/pokemon/hitmontop/front.png
index d2d7b5093..d2d7b5093 100644
--- a/graphics/pokemon/front_pics/hitmontop_still_front_pic.png
+++ b/graphics/pokemon/hitmontop/front.png
diff --git a/graphics/pokemon/icons/hitmontop_icon.png b/graphics/pokemon/hitmontop/icon.png
index c5b8ee564..c5b8ee564 100644
--- a/graphics/pokemon/icons/hitmontop_icon.png
+++ b/graphics/pokemon/hitmontop/icon.png
diff --git a/graphics/pokemon/palettes/hitmontop_palette.pal b/graphics/pokemon/hitmontop/normal.pal
index b49c96760..b49c96760 100644
--- a/graphics/pokemon/palettes/hitmontop_palette.pal
+++ b/graphics/pokemon/hitmontop/normal.pal
diff --git a/graphics/pokemon/palettes/hitmontop_shiny_palette.pal b/graphics/pokemon/hitmontop/shiny.pal
index 8c6bbd31f..8c6bbd31f 100644
--- a/graphics/pokemon/palettes/hitmontop_shiny_palette.pal
+++ b/graphics/pokemon/hitmontop/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ho_oh_front_pic.png b/graphics/pokemon/ho_oh/anim_front.png
index 5b60f009a..5b60f009a 100644
--- a/graphics/pokemon/anim_front_pics/ho_oh_front_pic.png
+++ b/graphics/pokemon/ho_oh/anim_front.png
diff --git a/graphics/pokemon/back_pics/ho_oh_back_pic.png b/graphics/pokemon/ho_oh/back.png
index 9acbdf0cc..9acbdf0cc 100644
--- a/graphics/pokemon/back_pics/ho_oh_back_pic.png
+++ b/graphics/pokemon/ho_oh/back.png
diff --git a/graphics/pokemon/footprints/ho_oh_footprint.png b/graphics/pokemon/ho_oh/footprint.png
index adceb3878..adceb3878 100644
--- a/graphics/pokemon/footprints/ho_oh_footprint.png
+++ b/graphics/pokemon/ho_oh/footprint.png
diff --git a/graphics/pokemon/front_pics/ho_oh_still_front_pic.png b/graphics/pokemon/ho_oh/front.png
index 97a7c3e25..97a7c3e25 100644
--- a/graphics/pokemon/front_pics/ho_oh_still_front_pic.png
+++ b/graphics/pokemon/ho_oh/front.png
diff --git a/graphics/pokemon/icons/ho_oh_icon.png b/graphics/pokemon/ho_oh/icon.png
index 4cd5ed871..4cd5ed871 100644
--- a/graphics/pokemon/icons/ho_oh_icon.png
+++ b/graphics/pokemon/ho_oh/icon.png
diff --git a/graphics/pokemon/palettes/ho_oh_palette.pal b/graphics/pokemon/ho_oh/normal.pal
index f4b583541..f4b583541 100644
--- a/graphics/pokemon/palettes/ho_oh_palette.pal
+++ b/graphics/pokemon/ho_oh/normal.pal
diff --git a/graphics/pokemon/palettes/ho_oh_shiny_palette.pal b/graphics/pokemon/ho_oh/shiny.pal
index 2c14ff9e4..2c14ff9e4 100644
--- a/graphics/pokemon/palettes/ho_oh_shiny_palette.pal
+++ b/graphics/pokemon/ho_oh/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hoothoot_front_pic.png b/graphics/pokemon/hoothoot/anim_front.png
index c2abe1464..c2abe1464 100644
--- a/graphics/pokemon/anim_front_pics/hoothoot_front_pic.png
+++ b/graphics/pokemon/hoothoot/anim_front.png
diff --git a/graphics/pokemon/back_pics/hoothoot_back_pic.png b/graphics/pokemon/hoothoot/back.png
index 2ab2253bd..2ab2253bd 100644
--- a/graphics/pokemon/back_pics/hoothoot_back_pic.png
+++ b/graphics/pokemon/hoothoot/back.png
diff --git a/graphics/pokemon/footprints/hoothoot_footprint.png b/graphics/pokemon/hoothoot/footprint.png
index 1eacf9116..1eacf9116 100644
--- a/graphics/pokemon/footprints/hoothoot_footprint.png
+++ b/graphics/pokemon/hoothoot/footprint.png
diff --git a/graphics/pokemon/front_pics/hoothoot_still_front_pic.png b/graphics/pokemon/hoothoot/front.png
index 12e160d81..12e160d81 100644
--- a/graphics/pokemon/front_pics/hoothoot_still_front_pic.png
+++ b/graphics/pokemon/hoothoot/front.png
diff --git a/graphics/pokemon/icons/hoothoot_icon.png b/graphics/pokemon/hoothoot/icon.png
index c25065113..c25065113 100644
--- a/graphics/pokemon/icons/hoothoot_icon.png
+++ b/graphics/pokemon/hoothoot/icon.png
diff --git a/graphics/pokemon/palettes/hoothoot_palette.pal b/graphics/pokemon/hoothoot/normal.pal
index f1a3ee54e..f1a3ee54e 100644
--- a/graphics/pokemon/palettes/hoothoot_palette.pal
+++ b/graphics/pokemon/hoothoot/normal.pal
diff --git a/graphics/pokemon/palettes/hoothoot_shiny_palette.pal b/graphics/pokemon/hoothoot/shiny.pal
index 3b951e004..3b951e004 100644
--- a/graphics/pokemon/palettes/hoothoot_shiny_palette.pal
+++ b/graphics/pokemon/hoothoot/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hoppip_front_pic.png b/graphics/pokemon/hoppip/anim_front.png
index 1295bbc84..1295bbc84 100644
--- a/graphics/pokemon/anim_front_pics/hoppip_front_pic.png
+++ b/graphics/pokemon/hoppip/anim_front.png
diff --git a/graphics/pokemon/back_pics/hoppip_back_pic.png b/graphics/pokemon/hoppip/back.png
index a5d042909..a5d042909 100644
--- a/graphics/pokemon/back_pics/hoppip_back_pic.png
+++ b/graphics/pokemon/hoppip/back.png
diff --git a/graphics/pokemon/footprints/hoppip_footprint.png b/graphics/pokemon/hoppip/footprint.png
index 0be22ed86..0be22ed86 100644
--- a/graphics/pokemon/footprints/hoppip_footprint.png
+++ b/graphics/pokemon/hoppip/footprint.png
diff --git a/graphics/pokemon/front_pics/hoppip_still_front_pic.png b/graphics/pokemon/hoppip/front.png
index 87110d09c..87110d09c 100644
--- a/graphics/pokemon/front_pics/hoppip_still_front_pic.png
+++ b/graphics/pokemon/hoppip/front.png
diff --git a/graphics/pokemon/icons/hoppip_icon.png b/graphics/pokemon/hoppip/icon.png
index 0692f69d7..0692f69d7 100644
--- a/graphics/pokemon/icons/hoppip_icon.png
+++ b/graphics/pokemon/hoppip/icon.png
diff --git a/graphics/pokemon/palettes/hoppip_palette.pal b/graphics/pokemon/hoppip/normal.pal
index 578494117..578494117 100644
--- a/graphics/pokemon/palettes/hoppip_palette.pal
+++ b/graphics/pokemon/hoppip/normal.pal
diff --git a/graphics/pokemon/palettes/hoppip_shiny_palette.pal b/graphics/pokemon/hoppip/shiny.pal
index c70c55c99..c70c55c99 100644
--- a/graphics/pokemon/palettes/hoppip_shiny_palette.pal
+++ b/graphics/pokemon/hoppip/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/horsea_front_pic.png b/graphics/pokemon/horsea/anim_front.png
index 24f4d0116..24f4d0116 100644
--- a/graphics/pokemon/anim_front_pics/horsea_front_pic.png
+++ b/graphics/pokemon/horsea/anim_front.png
diff --git a/graphics/pokemon/back_pics/horsea_back_pic.png b/graphics/pokemon/horsea/back.png
index bd6cb3d2b..bd6cb3d2b 100644
--- a/graphics/pokemon/back_pics/horsea_back_pic.png
+++ b/graphics/pokemon/horsea/back.png
diff --git a/graphics/pokemon/footprints/horsea_footprint.png b/graphics/pokemon/horsea/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/horsea_footprint.png
+++ b/graphics/pokemon/horsea/footprint.png
diff --git a/graphics/pokemon/front_pics/horsea_still_front_pic.png b/graphics/pokemon/horsea/front.png
index 572beb851..572beb851 100644
--- a/graphics/pokemon/front_pics/horsea_still_front_pic.png
+++ b/graphics/pokemon/horsea/front.png
diff --git a/graphics/pokemon/icons/horsea_icon.png b/graphics/pokemon/horsea/icon.png
index d57901f51..d57901f51 100644
--- a/graphics/pokemon/icons/horsea_icon.png
+++ b/graphics/pokemon/horsea/icon.png
diff --git a/graphics/pokemon/palettes/horsea_palette.pal b/graphics/pokemon/horsea/normal.pal
index a14e2b4c5..a14e2b4c5 100644
--- a/graphics/pokemon/palettes/horsea_palette.pal
+++ b/graphics/pokemon/horsea/normal.pal
diff --git a/graphics/pokemon/palettes/horsea_shiny_palette.pal b/graphics/pokemon/horsea/shiny.pal
index f163c929a..f163c929a 100644
--- a/graphics/pokemon/palettes/horsea_shiny_palette.pal
+++ b/graphics/pokemon/horsea/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/houndoom_front_pic.png b/graphics/pokemon/houndoom/anim_front.png
index adebd878b..adebd878b 100644
--- a/graphics/pokemon/anim_front_pics/houndoom_front_pic.png
+++ b/graphics/pokemon/houndoom/anim_front.png
diff --git a/graphics/pokemon/back_pics/houndoom_back_pic.png b/graphics/pokemon/houndoom/back.png
index 6aae855c6..6aae855c6 100644
--- a/graphics/pokemon/back_pics/houndoom_back_pic.png
+++ b/graphics/pokemon/houndoom/back.png
diff --git a/graphics/pokemon/footprints/houndoom_footprint.png b/graphics/pokemon/houndoom/footprint.png
index b1f2c80f4..b1f2c80f4 100644
--- a/graphics/pokemon/footprints/houndoom_footprint.png
+++ b/graphics/pokemon/houndoom/footprint.png
diff --git a/graphics/pokemon/front_pics/houndoom_still_front_pic.png b/graphics/pokemon/houndoom/front.png
index d5ab79d18..d5ab79d18 100644
--- a/graphics/pokemon/front_pics/houndoom_still_front_pic.png
+++ b/graphics/pokemon/houndoom/front.png
diff --git a/graphics/pokemon/icons/houndoom_icon.png b/graphics/pokemon/houndoom/icon.png
index 8ca4aec3c..8ca4aec3c 100644
--- a/graphics/pokemon/icons/houndoom_icon.png
+++ b/graphics/pokemon/houndoom/icon.png
diff --git a/graphics/pokemon/palettes/houndoom_palette.pal b/graphics/pokemon/houndoom/normal.pal
index 676369d07..676369d07 100644
--- a/graphics/pokemon/palettes/houndoom_palette.pal
+++ b/graphics/pokemon/houndoom/normal.pal
diff --git a/graphics/pokemon/palettes/houndoom_shiny_palette.pal b/graphics/pokemon/houndoom/shiny.pal
index 7e7aa56bf..7e7aa56bf 100644
--- a/graphics/pokemon/palettes/houndoom_shiny_palette.pal
+++ b/graphics/pokemon/houndoom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/houndour_front_pic.png b/graphics/pokemon/houndour/anim_front.png
index 057479784..057479784 100644
--- a/graphics/pokemon/anim_front_pics/houndour_front_pic.png
+++ b/graphics/pokemon/houndour/anim_front.png
diff --git a/graphics/pokemon/back_pics/houndour_back_pic.png b/graphics/pokemon/houndour/back.png
index 64e104954..64e104954 100644
--- a/graphics/pokemon/back_pics/houndour_back_pic.png
+++ b/graphics/pokemon/houndour/back.png
diff --git a/graphics/pokemon/footprints/houndour_footprint.png b/graphics/pokemon/houndour/footprint.png
index 3f8161431..3f8161431 100644
--- a/graphics/pokemon/footprints/houndour_footprint.png
+++ b/graphics/pokemon/houndour/footprint.png
diff --git a/graphics/pokemon/front_pics/houndour_still_front_pic.png b/graphics/pokemon/houndour/front.png
index 87bbce73e..87bbce73e 100644
--- a/graphics/pokemon/front_pics/houndour_still_front_pic.png
+++ b/graphics/pokemon/houndour/front.png
diff --git a/graphics/pokemon/icons/houndour_icon.png b/graphics/pokemon/houndour/icon.png
index 1d397d9bf..1d397d9bf 100644
--- a/graphics/pokemon/icons/houndour_icon.png
+++ b/graphics/pokemon/houndour/icon.png
diff --git a/graphics/pokemon/palettes/houndour_palette.pal b/graphics/pokemon/houndour/normal.pal
index 676369d07..676369d07 100644
--- a/graphics/pokemon/palettes/houndour_palette.pal
+++ b/graphics/pokemon/houndour/normal.pal
diff --git a/graphics/pokemon/palettes/houndour_shiny_palette.pal b/graphics/pokemon/houndour/shiny.pal
index 4197f8de7..4197f8de7 100644
--- a/graphics/pokemon/palettes/houndour_shiny_palette.pal
+++ b/graphics/pokemon/houndour/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/huntail_front_pic.png b/graphics/pokemon/huntail/anim_front.png
index 6963d99c8..6963d99c8 100644
--- a/graphics/pokemon/anim_front_pics/huntail_front_pic.png
+++ b/graphics/pokemon/huntail/anim_front.png
diff --git a/graphics/pokemon/back_pics/huntail_back_pic.png b/graphics/pokemon/huntail/back.png
index 23ccaac12..23ccaac12 100644
--- a/graphics/pokemon/back_pics/huntail_back_pic.png
+++ b/graphics/pokemon/huntail/back.png
diff --git a/graphics/pokemon/footprints/huntail_footprint.png b/graphics/pokemon/huntail/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/huntail_footprint.png
+++ b/graphics/pokemon/huntail/footprint.png
diff --git a/graphics/pokemon/front_pics/huntail_still_front_pic.png b/graphics/pokemon/huntail/front.png
index 647cdb8ca..647cdb8ca 100644
--- a/graphics/pokemon/front_pics/huntail_still_front_pic.png
+++ b/graphics/pokemon/huntail/front.png
diff --git a/graphics/pokemon/icons/huntail_icon.png b/graphics/pokemon/huntail/icon.png
index b70fca87e..b70fca87e 100644
--- a/graphics/pokemon/icons/huntail_icon.png
+++ b/graphics/pokemon/huntail/icon.png
diff --git a/graphics/pokemon/palettes/huntail_palette.pal b/graphics/pokemon/huntail/normal.pal
index 192061e01..192061e01 100644
--- a/graphics/pokemon/palettes/huntail_palette.pal
+++ b/graphics/pokemon/huntail/normal.pal
diff --git a/graphics/pokemon/palettes/huntail_shiny_palette.pal b/graphics/pokemon/huntail/shiny.pal
index 713c54adf..713c54adf 100644
--- a/graphics/pokemon/palettes/huntail_shiny_palette.pal
+++ b/graphics/pokemon/huntail/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/hypno_front_pic.png b/graphics/pokemon/hypno/anim_front.png
index e3cd338ed..e3cd338ed 100644
--- a/graphics/pokemon/anim_front_pics/hypno_front_pic.png
+++ b/graphics/pokemon/hypno/anim_front.png
diff --git a/graphics/pokemon/back_pics/hypno_back_pic.png b/graphics/pokemon/hypno/back.png
index 12aec4f4d..12aec4f4d 100644
--- a/graphics/pokemon/back_pics/hypno_back_pic.png
+++ b/graphics/pokemon/hypno/back.png
diff --git a/graphics/pokemon/footprints/hypno_footprint.png b/graphics/pokemon/hypno/footprint.png
index 51f734973..51f734973 100644
--- a/graphics/pokemon/footprints/hypno_footprint.png
+++ b/graphics/pokemon/hypno/footprint.png
diff --git a/graphics/pokemon/front_pics/hypno_still_front_pic.png b/graphics/pokemon/hypno/front.png
index 5dce9a50e..5dce9a50e 100644
--- a/graphics/pokemon/front_pics/hypno_still_front_pic.png
+++ b/graphics/pokemon/hypno/front.png
diff --git a/graphics/pokemon/icons/hypno_icon.png b/graphics/pokemon/hypno/icon.png
index 4015f2386..4015f2386 100644
--- a/graphics/pokemon/icons/hypno_icon.png
+++ b/graphics/pokemon/hypno/icon.png
diff --git a/graphics/pokemon/palettes/hypno_palette.pal b/graphics/pokemon/hypno/normal.pal
index 96218054e..96218054e 100644
--- a/graphics/pokemon/palettes/hypno_palette.pal
+++ b/graphics/pokemon/hypno/normal.pal
diff --git a/graphics/pokemon/palettes/hypno_shiny_palette.pal b/graphics/pokemon/hypno/shiny.pal
index af2643bd9..af2643bd9 100644
--- a/graphics/pokemon/palettes/hypno_shiny_palette.pal
+++ b/graphics/pokemon/hypno/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/igglybuff_front_pic.png b/graphics/pokemon/igglybuff/anim_front.png
index 0947bca66..0947bca66 100644
--- a/graphics/pokemon/anim_front_pics/igglybuff_front_pic.png
+++ b/graphics/pokemon/igglybuff/anim_front.png
diff --git a/graphics/pokemon/back_pics/igglybuff_back_pic.png b/graphics/pokemon/igglybuff/back.png
index efc417ab5..efc417ab5 100644
--- a/graphics/pokemon/back_pics/igglybuff_back_pic.png
+++ b/graphics/pokemon/igglybuff/back.png
diff --git a/graphics/pokemon/footprints/igglybuff_footprint.png b/graphics/pokemon/igglybuff/footprint.png
index bbb7352a6..bbb7352a6 100644
--- a/graphics/pokemon/footprints/igglybuff_footprint.png
+++ b/graphics/pokemon/igglybuff/footprint.png
diff --git a/graphics/pokemon/front_pics/igglybuff_still_front_pic.png b/graphics/pokemon/igglybuff/front.png
index b232daaac..b232daaac 100644
--- a/graphics/pokemon/front_pics/igglybuff_still_front_pic.png
+++ b/graphics/pokemon/igglybuff/front.png
diff --git a/graphics/pokemon/icons/igglybuff_icon.png b/graphics/pokemon/igglybuff/icon.png
index 55d1a9eb1..55d1a9eb1 100644
--- a/graphics/pokemon/icons/igglybuff_icon.png
+++ b/graphics/pokemon/igglybuff/icon.png
diff --git a/graphics/pokemon/palettes/igglybuff_palette.pal b/graphics/pokemon/igglybuff/normal.pal
index 9b5beb079..9b5beb079 100644
--- a/graphics/pokemon/palettes/igglybuff_palette.pal
+++ b/graphics/pokemon/igglybuff/normal.pal
diff --git a/graphics/pokemon/palettes/igglybuff_shiny_palette.pal b/graphics/pokemon/igglybuff/shiny.pal
index fd1f6fbf8..fd1f6fbf8 100644
--- a/graphics/pokemon/palettes/igglybuff_shiny_palette.pal
+++ b/graphics/pokemon/igglybuff/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/illumise_front_pic.png b/graphics/pokemon/illumise/anim_front.png
index 0d20f3357..0d20f3357 100644
--- a/graphics/pokemon/anim_front_pics/illumise_front_pic.png
+++ b/graphics/pokemon/illumise/anim_front.png
diff --git a/graphics/pokemon/back_pics/illumise_back_pic.png b/graphics/pokemon/illumise/back.png
index a06de56a1..a06de56a1 100644
--- a/graphics/pokemon/back_pics/illumise_back_pic.png
+++ b/graphics/pokemon/illumise/back.png
diff --git a/graphics/pokemon/footprints/illumise_footprint.png b/graphics/pokemon/illumise/footprint.png
index 451d532b2..451d532b2 100644
--- a/graphics/pokemon/footprints/illumise_footprint.png
+++ b/graphics/pokemon/illumise/footprint.png
diff --git a/graphics/pokemon/front_pics/illumise_still_front_pic.png b/graphics/pokemon/illumise/front.png
index 14513aee6..14513aee6 100644
--- a/graphics/pokemon/front_pics/illumise_still_front_pic.png
+++ b/graphics/pokemon/illumise/front.png
diff --git a/graphics/pokemon/icons/illumise_icon.png b/graphics/pokemon/illumise/icon.png
index ac812de37..ac812de37 100644
--- a/graphics/pokemon/icons/illumise_icon.png
+++ b/graphics/pokemon/illumise/icon.png
diff --git a/graphics/pokemon/palettes/illumise_palette.pal b/graphics/pokemon/illumise/normal.pal
index 63c55bbc0..63c55bbc0 100644
--- a/graphics/pokemon/palettes/illumise_palette.pal
+++ b/graphics/pokemon/illumise/normal.pal
diff --git a/graphics/pokemon/palettes/illumise_shiny_palette.pal b/graphics/pokemon/illumise/shiny.pal
index 78bdbdc22..78bdbdc22 100644
--- a/graphics/pokemon/palettes/illumise_shiny_palette.pal
+++ b/graphics/pokemon/illumise/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ivysaur_front_pic.png b/graphics/pokemon/ivysaur/anim_front.png
index 1e8d0f04e..1e8d0f04e 100644
--- a/graphics/pokemon/anim_front_pics/ivysaur_front_pic.png
+++ b/graphics/pokemon/ivysaur/anim_front.png
diff --git a/graphics/pokemon/back_pics/ivysaur_back_pic.png b/graphics/pokemon/ivysaur/back.png
index d977bc314..d977bc314 100644
--- a/graphics/pokemon/back_pics/ivysaur_back_pic.png
+++ b/graphics/pokemon/ivysaur/back.png
diff --git a/graphics/pokemon/footprints/ivysaur_footprint.png b/graphics/pokemon/ivysaur/footprint.png
index 29206b935..29206b935 100644
--- a/graphics/pokemon/footprints/ivysaur_footprint.png
+++ b/graphics/pokemon/ivysaur/footprint.png
diff --git a/graphics/pokemon/front_pics/ivysaur_still_front_pic.png b/graphics/pokemon/ivysaur/front.png
index 86c27474b..86c27474b 100644
--- a/graphics/pokemon/front_pics/ivysaur_still_front_pic.png
+++ b/graphics/pokemon/ivysaur/front.png
diff --git a/graphics/pokemon/icons/ivysaur_icon.png b/graphics/pokemon/ivysaur/icon.png
index 2f1627506..2f1627506 100644
--- a/graphics/pokemon/icons/ivysaur_icon.png
+++ b/graphics/pokemon/ivysaur/icon.png
diff --git a/graphics/pokemon/palettes/ivysaur_palette.pal b/graphics/pokemon/ivysaur/normal.pal
index 5d4c59bbd..5d4c59bbd 100644
--- a/graphics/pokemon/palettes/ivysaur_palette.pal
+++ b/graphics/pokemon/ivysaur/normal.pal
diff --git a/graphics/pokemon/palettes/ivysaur_shiny_palette.pal b/graphics/pokemon/ivysaur/shiny.pal
index 964be9785..964be9785 100644
--- a/graphics/pokemon/palettes/ivysaur_shiny_palette.pal
+++ b/graphics/pokemon/ivysaur/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/jigglypuff_front_pic.png b/graphics/pokemon/jigglypuff/anim_front.png
index 98981352b..98981352b 100644
--- a/graphics/pokemon/anim_front_pics/jigglypuff_front_pic.png
+++ b/graphics/pokemon/jigglypuff/anim_front.png
diff --git a/graphics/pokemon/back_pics/jigglypuff_back_pic.png b/graphics/pokemon/jigglypuff/back.png
index 8055a79b0..8055a79b0 100644
--- a/graphics/pokemon/back_pics/jigglypuff_back_pic.png
+++ b/graphics/pokemon/jigglypuff/back.png
diff --git a/graphics/pokemon/footprints/jigglypuff_footprint.png b/graphics/pokemon/jigglypuff/footprint.png
index 59b5f1171..59b5f1171 100644
--- a/graphics/pokemon/footprints/jigglypuff_footprint.png
+++ b/graphics/pokemon/jigglypuff/footprint.png
diff --git a/graphics/pokemon/front_pics/jigglypuff_still_front_pic.png b/graphics/pokemon/jigglypuff/front.png
index 41c8f2e8f..41c8f2e8f 100644
--- a/graphics/pokemon/front_pics/jigglypuff_still_front_pic.png
+++ b/graphics/pokemon/jigglypuff/front.png
diff --git a/graphics/pokemon/icons/jigglypuff_icon.png b/graphics/pokemon/jigglypuff/icon.png
index 4c5a33cb8..4c5a33cb8 100644
--- a/graphics/pokemon/icons/jigglypuff_icon.png
+++ b/graphics/pokemon/jigglypuff/icon.png
diff --git a/graphics/pokemon/palettes/jigglypuff_palette.pal b/graphics/pokemon/jigglypuff/normal.pal
index f7f6154c1..f7f6154c1 100644
--- a/graphics/pokemon/palettes/jigglypuff_palette.pal
+++ b/graphics/pokemon/jigglypuff/normal.pal
diff --git a/graphics/pokemon/palettes/jigglypuff_shiny_palette.pal b/graphics/pokemon/jigglypuff/shiny.pal
index bea601916..bea601916 100644
--- a/graphics/pokemon/palettes/jigglypuff_shiny_palette.pal
+++ b/graphics/pokemon/jigglypuff/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/jirachi_front_pic.png b/graphics/pokemon/jirachi/anim_front.png
index b414a28cb..b414a28cb 100644
--- a/graphics/pokemon/anim_front_pics/jirachi_front_pic.png
+++ b/graphics/pokemon/jirachi/anim_front.png
diff --git a/graphics/pokemon/back_pics/jirachi_back_pic.png b/graphics/pokemon/jirachi/back.png
index 4fa283e0d..4fa283e0d 100644
--- a/graphics/pokemon/back_pics/jirachi_back_pic.png
+++ b/graphics/pokemon/jirachi/back.png
diff --git a/graphics/pokemon/footprints/jirachi_footprint.png b/graphics/pokemon/jirachi/footprint.png
index 856bb5faa..856bb5faa 100644
--- a/graphics/pokemon/footprints/jirachi_footprint.png
+++ b/graphics/pokemon/jirachi/footprint.png
diff --git a/graphics/pokemon/front_pics/jirachi_still_front_pic.png b/graphics/pokemon/jirachi/front.png
index 91f5e3fad..91f5e3fad 100644
--- a/graphics/pokemon/front_pics/jirachi_still_front_pic.png
+++ b/graphics/pokemon/jirachi/front.png
diff --git a/graphics/pokemon/icons/jirachi_icon.png b/graphics/pokemon/jirachi/icon.png
index 15df4559b..15df4559b 100644
--- a/graphics/pokemon/icons/jirachi_icon.png
+++ b/graphics/pokemon/jirachi/icon.png
diff --git a/graphics/pokemon/palettes/jirachi_palette.pal b/graphics/pokemon/jirachi/normal.pal
index ba0b7a6b1..ba0b7a6b1 100644
--- a/graphics/pokemon/palettes/jirachi_palette.pal
+++ b/graphics/pokemon/jirachi/normal.pal
diff --git a/graphics/pokemon/palettes/jirachi_shiny_palette.pal b/graphics/pokemon/jirachi/shiny.pal
index 219b9ac57..219b9ac57 100644
--- a/graphics/pokemon/palettes/jirachi_shiny_palette.pal
+++ b/graphics/pokemon/jirachi/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/jolteon_front_pic.png b/graphics/pokemon/jolteon/anim_front.png
index ff0edda9f..ff0edda9f 100644
--- a/graphics/pokemon/anim_front_pics/jolteon_front_pic.png
+++ b/graphics/pokemon/jolteon/anim_front.png
diff --git a/graphics/pokemon/back_pics/jolteon_back_pic.png b/graphics/pokemon/jolteon/back.png
index 19dc00a7c..19dc00a7c 100644
--- a/graphics/pokemon/back_pics/jolteon_back_pic.png
+++ b/graphics/pokemon/jolteon/back.png
diff --git a/graphics/pokemon/footprints/jolteon_footprint.png b/graphics/pokemon/jolteon/footprint.png
index d1e9477b3..d1e9477b3 100644
--- a/graphics/pokemon/footprints/jolteon_footprint.png
+++ b/graphics/pokemon/jolteon/footprint.png
diff --git a/graphics/pokemon/front_pics/jolteon_still_front_pic.png b/graphics/pokemon/jolteon/front.png
index b33177bb6..b33177bb6 100644
--- a/graphics/pokemon/front_pics/jolteon_still_front_pic.png
+++ b/graphics/pokemon/jolteon/front.png
diff --git a/graphics/pokemon/icons/jolteon_icon.png b/graphics/pokemon/jolteon/icon.png
index b98fd78b2..b98fd78b2 100644
--- a/graphics/pokemon/icons/jolteon_icon.png
+++ b/graphics/pokemon/jolteon/icon.png
diff --git a/graphics/pokemon/palettes/jolteon_palette.pal b/graphics/pokemon/jolteon/normal.pal
index 87daf4781..87daf4781 100644
--- a/graphics/pokemon/palettes/jolteon_palette.pal
+++ b/graphics/pokemon/jolteon/normal.pal
diff --git a/graphics/pokemon/palettes/jolteon_shiny_palette.pal b/graphics/pokemon/jolteon/shiny.pal
index ece1425c3..ece1425c3 100644
--- a/graphics/pokemon/palettes/jolteon_shiny_palette.pal
+++ b/graphics/pokemon/jolteon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/jumpluff_front_pic.png b/graphics/pokemon/jumpluff/anim_front.png
index dd79c45e3..dd79c45e3 100644
--- a/graphics/pokemon/anim_front_pics/jumpluff_front_pic.png
+++ b/graphics/pokemon/jumpluff/anim_front.png
diff --git a/graphics/pokemon/back_pics/jumpluff_back_pic.png b/graphics/pokemon/jumpluff/back.png
index 1f822f850..1f822f850 100644
--- a/graphics/pokemon/back_pics/jumpluff_back_pic.png
+++ b/graphics/pokemon/jumpluff/back.png
diff --git a/graphics/pokemon/footprints/jumpluff_footprint.png b/graphics/pokemon/jumpluff/footprint.png
index 9cd0f5938..9cd0f5938 100644
--- a/graphics/pokemon/footprints/jumpluff_footprint.png
+++ b/graphics/pokemon/jumpluff/footprint.png
diff --git a/graphics/pokemon/front_pics/jumpluff_still_front_pic.png b/graphics/pokemon/jumpluff/front.png
index 6b7cbaf61..6b7cbaf61 100644
--- a/graphics/pokemon/front_pics/jumpluff_still_front_pic.png
+++ b/graphics/pokemon/jumpluff/front.png
diff --git a/graphics/pokemon/icons/jumpluff_icon.png b/graphics/pokemon/jumpluff/icon.png
index bf0cb64de..bf0cb64de 100644
--- a/graphics/pokemon/icons/jumpluff_icon.png
+++ b/graphics/pokemon/jumpluff/icon.png
diff --git a/graphics/pokemon/palettes/jumpluff_palette.pal b/graphics/pokemon/jumpluff/normal.pal
index 422184976..422184976 100644
--- a/graphics/pokemon/palettes/jumpluff_palette.pal
+++ b/graphics/pokemon/jumpluff/normal.pal
diff --git a/graphics/pokemon/palettes/jumpluff_shiny_palette.pal b/graphics/pokemon/jumpluff/shiny.pal
index 4885690b6..4885690b6 100644
--- a/graphics/pokemon/palettes/jumpluff_shiny_palette.pal
+++ b/graphics/pokemon/jumpluff/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/jynx_front_pic.png b/graphics/pokemon/jynx/anim_front.png
index db5d0d4c7..db5d0d4c7 100644
--- a/graphics/pokemon/anim_front_pics/jynx_front_pic.png
+++ b/graphics/pokemon/jynx/anim_front.png
diff --git a/graphics/pokemon/back_pics/jynx_back_pic.png b/graphics/pokemon/jynx/back.png
index 5bb72fb10..5bb72fb10 100644
--- a/graphics/pokemon/back_pics/jynx_back_pic.png
+++ b/graphics/pokemon/jynx/back.png
diff --git a/graphics/pokemon/footprints/jynx_footprint.png b/graphics/pokemon/jynx/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/jynx_footprint.png
+++ b/graphics/pokemon/jynx/footprint.png
diff --git a/graphics/pokemon/front_pics/jynx_still_front_pic.png b/graphics/pokemon/jynx/front.png
index 470a4e8cd..470a4e8cd 100644
--- a/graphics/pokemon/front_pics/jynx_still_front_pic.png
+++ b/graphics/pokemon/jynx/front.png
diff --git a/graphics/pokemon/icons/jynx_icon.png b/graphics/pokemon/jynx/icon.png
index 431b6bf19..431b6bf19 100644
--- a/graphics/pokemon/icons/jynx_icon.png
+++ b/graphics/pokemon/jynx/icon.png
diff --git a/graphics/pokemon/palettes/jynx_palette.pal b/graphics/pokemon/jynx/normal.pal
index ac1da7597..ac1da7597 100644
--- a/graphics/pokemon/palettes/jynx_palette.pal
+++ b/graphics/pokemon/jynx/normal.pal
diff --git a/graphics/pokemon/palettes/jynx_shiny_palette.pal b/graphics/pokemon/jynx/shiny.pal
index b6838c13d..b6838c13d 100644
--- a/graphics/pokemon/palettes/jynx_shiny_palette.pal
+++ b/graphics/pokemon/jynx/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kabuto_front_pic.png b/graphics/pokemon/kabuto/anim_front.png
index 101560ce6..101560ce6 100644
--- a/graphics/pokemon/anim_front_pics/kabuto_front_pic.png
+++ b/graphics/pokemon/kabuto/anim_front.png
diff --git a/graphics/pokemon/back_pics/kabuto_back_pic.png b/graphics/pokemon/kabuto/back.png
index 9664ead41..9664ead41 100644
--- a/graphics/pokemon/back_pics/kabuto_back_pic.png
+++ b/graphics/pokemon/kabuto/back.png
diff --git a/graphics/pokemon/footprints/kabuto_footprint.png b/graphics/pokemon/kabuto/footprint.png
index 6965dbe60..6965dbe60 100644
--- a/graphics/pokemon/footprints/kabuto_footprint.png
+++ b/graphics/pokemon/kabuto/footprint.png
diff --git a/graphics/pokemon/front_pics/kabuto_still_front_pic.png b/graphics/pokemon/kabuto/front.png
index ccac7d4aa..ccac7d4aa 100644
--- a/graphics/pokemon/front_pics/kabuto_still_front_pic.png
+++ b/graphics/pokemon/kabuto/front.png
diff --git a/graphics/pokemon/icons/kabuto_icon.png b/graphics/pokemon/kabuto/icon.png
index c0a140722..c0a140722 100644
--- a/graphics/pokemon/icons/kabuto_icon.png
+++ b/graphics/pokemon/kabuto/icon.png
diff --git a/graphics/pokemon/palettes/kabuto_palette.pal b/graphics/pokemon/kabuto/normal.pal
index 285bae040..285bae040 100644
--- a/graphics/pokemon/palettes/kabuto_palette.pal
+++ b/graphics/pokemon/kabuto/normal.pal
diff --git a/graphics/pokemon/palettes/kabuto_shiny_palette.pal b/graphics/pokemon/kabuto/shiny.pal
index 8e3eaad12..8e3eaad12 100644
--- a/graphics/pokemon/palettes/kabuto_shiny_palette.pal
+++ b/graphics/pokemon/kabuto/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kabutops_front_pic.png b/graphics/pokemon/kabutops/anim_front.png
index b1e26e884..b1e26e884 100644
--- a/graphics/pokemon/anim_front_pics/kabutops_front_pic.png
+++ b/graphics/pokemon/kabutops/anim_front.png
diff --git a/graphics/pokemon/back_pics/kabutops_back_pic.png b/graphics/pokemon/kabutops/back.png
index e1aab4de2..e1aab4de2 100644
--- a/graphics/pokemon/back_pics/kabutops_back_pic.png
+++ b/graphics/pokemon/kabutops/back.png
diff --git a/graphics/pokemon/footprints/kabutops_footprint.png b/graphics/pokemon/kabutops/footprint.png
index 127b741d8..127b741d8 100644
--- a/graphics/pokemon/footprints/kabutops_footprint.png
+++ b/graphics/pokemon/kabutops/footprint.png
diff --git a/graphics/pokemon/front_pics/kabutops_still_front_pic.png b/graphics/pokemon/kabutops/front.png
index d6263253a..d6263253a 100644
--- a/graphics/pokemon/front_pics/kabutops_still_front_pic.png
+++ b/graphics/pokemon/kabutops/front.png
diff --git a/graphics/pokemon/icons/kabutops_icon.png b/graphics/pokemon/kabutops/icon.png
index 1c23836e5..1c23836e5 100644
--- a/graphics/pokemon/icons/kabutops_icon.png
+++ b/graphics/pokemon/kabutops/icon.png
diff --git a/graphics/pokemon/palettes/kabutops_palette.pal b/graphics/pokemon/kabutops/normal.pal
index 09a61f8e6..09a61f8e6 100644
--- a/graphics/pokemon/palettes/kabutops_palette.pal
+++ b/graphics/pokemon/kabutops/normal.pal
diff --git a/graphics/pokemon/palettes/kabutops_shiny_palette.pal b/graphics/pokemon/kabutops/shiny.pal
index 9217ab55d..9217ab55d 100644
--- a/graphics/pokemon/palettes/kabutops_shiny_palette.pal
+++ b/graphics/pokemon/kabutops/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kadabra_front_pic.png b/graphics/pokemon/kadabra/anim_front.png
index cabd2589f..cabd2589f 100644
--- a/graphics/pokemon/anim_front_pics/kadabra_front_pic.png
+++ b/graphics/pokemon/kadabra/anim_front.png
diff --git a/graphics/pokemon/back_pics/kadabra_back_pic.png b/graphics/pokemon/kadabra/back.png
index 703f4afcc..703f4afcc 100644
--- a/graphics/pokemon/back_pics/kadabra_back_pic.png
+++ b/graphics/pokemon/kadabra/back.png
diff --git a/graphics/pokemon/footprints/kadabra_footprint.png b/graphics/pokemon/kadabra/footprint.png
index a699f2987..a699f2987 100644
--- a/graphics/pokemon/footprints/kadabra_footprint.png
+++ b/graphics/pokemon/kadabra/footprint.png
diff --git a/graphics/pokemon/front_pics/kadabra_still_front_pic.png b/graphics/pokemon/kadabra/front.png
index d9f21082b..d9f21082b 100644
--- a/graphics/pokemon/front_pics/kadabra_still_front_pic.png
+++ b/graphics/pokemon/kadabra/front.png
diff --git a/graphics/pokemon/icons/kadabra_icon.png b/graphics/pokemon/kadabra/icon.png
index 8653f7524..8653f7524 100644
--- a/graphics/pokemon/icons/kadabra_icon.png
+++ b/graphics/pokemon/kadabra/icon.png
diff --git a/graphics/pokemon/palettes/kadabra_palette.pal b/graphics/pokemon/kadabra/normal.pal
index 0e561d4e6..0e561d4e6 100644
--- a/graphics/pokemon/palettes/kadabra_palette.pal
+++ b/graphics/pokemon/kadabra/normal.pal
diff --git a/graphics/pokemon/palettes/kadabra_shiny_palette.pal b/graphics/pokemon/kadabra/shiny.pal
index e722cc8fa..e722cc8fa 100644
--- a/graphics/pokemon/palettes/kadabra_shiny_palette.pal
+++ b/graphics/pokemon/kadabra/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kakuna_front_pic.png b/graphics/pokemon/kakuna/anim_front.png
index 5b7914f46..5b7914f46 100644
--- a/graphics/pokemon/anim_front_pics/kakuna_front_pic.png
+++ b/graphics/pokemon/kakuna/anim_front.png
diff --git a/graphics/pokemon/back_pics/kakuna_back_pic.png b/graphics/pokemon/kakuna/back.png
index 2f5455238..2f5455238 100644
--- a/graphics/pokemon/back_pics/kakuna_back_pic.png
+++ b/graphics/pokemon/kakuna/back.png
diff --git a/graphics/pokemon/footprints/kakuna_footprint.png b/graphics/pokemon/kakuna/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/kakuna_footprint.png
+++ b/graphics/pokemon/kakuna/footprint.png
diff --git a/graphics/pokemon/front_pics/kakuna_still_front_pic.png b/graphics/pokemon/kakuna/front.png
index 38e6265bc..38e6265bc 100644
--- a/graphics/pokemon/front_pics/kakuna_still_front_pic.png
+++ b/graphics/pokemon/kakuna/front.png
diff --git a/graphics/pokemon/icons/kakuna_icon.png b/graphics/pokemon/kakuna/icon.png
index 1c857d442..1c857d442 100644
--- a/graphics/pokemon/icons/kakuna_icon.png
+++ b/graphics/pokemon/kakuna/icon.png
diff --git a/graphics/pokemon/palettes/kakuna_palette.pal b/graphics/pokemon/kakuna/normal.pal
index b14a68968..b14a68968 100644
--- a/graphics/pokemon/palettes/kakuna_palette.pal
+++ b/graphics/pokemon/kakuna/normal.pal
diff --git a/graphics/pokemon/palettes/kakuna_shiny_palette.pal b/graphics/pokemon/kakuna/shiny.pal
index 0a45b029a..0a45b029a 100644
--- a/graphics/pokemon/palettes/kakuna_shiny_palette.pal
+++ b/graphics/pokemon/kakuna/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kangaskhan_front_pic.png b/graphics/pokemon/kangaskhan/anim_front.png
index ec534bcb6..ec534bcb6 100644
--- a/graphics/pokemon/anim_front_pics/kangaskhan_front_pic.png
+++ b/graphics/pokemon/kangaskhan/anim_front.png
diff --git a/graphics/pokemon/back_pics/kangaskhan_back_pic.png b/graphics/pokemon/kangaskhan/back.png
index babb41fce..babb41fce 100644
--- a/graphics/pokemon/back_pics/kangaskhan_back_pic.png
+++ b/graphics/pokemon/kangaskhan/back.png
diff --git a/graphics/pokemon/footprints/kangaskhan_footprint.png b/graphics/pokemon/kangaskhan/footprint.png
index 7753a4a71..7753a4a71 100644
--- a/graphics/pokemon/footprints/kangaskhan_footprint.png
+++ b/graphics/pokemon/kangaskhan/footprint.png
diff --git a/graphics/pokemon/front_pics/kangaskhan_still_front_pic.png b/graphics/pokemon/kangaskhan/front.png
index 9cc2c312f..9cc2c312f 100644
--- a/graphics/pokemon/front_pics/kangaskhan_still_front_pic.png
+++ b/graphics/pokemon/kangaskhan/front.png
diff --git a/graphics/pokemon/icons/kangaskhan_icon.png b/graphics/pokemon/kangaskhan/icon.png
index 177a688cd..177a688cd 100644
--- a/graphics/pokemon/icons/kangaskhan_icon.png
+++ b/graphics/pokemon/kangaskhan/icon.png
diff --git a/graphics/pokemon/palettes/kangaskhan_palette.pal b/graphics/pokemon/kangaskhan/normal.pal
index 2dca5ca1a..2dca5ca1a 100644
--- a/graphics/pokemon/palettes/kangaskhan_palette.pal
+++ b/graphics/pokemon/kangaskhan/normal.pal
diff --git a/graphics/pokemon/palettes/kangaskhan_shiny_palette.pal b/graphics/pokemon/kangaskhan/shiny.pal
index 3580f7e9d..3580f7e9d 100644
--- a/graphics/pokemon/palettes/kangaskhan_shiny_palette.pal
+++ b/graphics/pokemon/kangaskhan/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kecleon_front_pic.png b/graphics/pokemon/kecleon/anim_front.png
index 33d577e3e..33d577e3e 100644
--- a/graphics/pokemon/anim_front_pics/kecleon_front_pic.png
+++ b/graphics/pokemon/kecleon/anim_front.png
diff --git a/graphics/pokemon/back_pics/kecleon_back_pic.png b/graphics/pokemon/kecleon/back.png
index 1baeeb58a..1baeeb58a 100644
--- a/graphics/pokemon/back_pics/kecleon_back_pic.png
+++ b/graphics/pokemon/kecleon/back.png
diff --git a/graphics/pokemon/footprints/kecleon_footprint.png b/graphics/pokemon/kecleon/footprint.png
index 3c6968437..3c6968437 100644
--- a/graphics/pokemon/footprints/kecleon_footprint.png
+++ b/graphics/pokemon/kecleon/footprint.png
diff --git a/graphics/pokemon/front_pics/kecleon_still_front_pic.png b/graphics/pokemon/kecleon/front.png
index e57431a06..e57431a06 100644
--- a/graphics/pokemon/front_pics/kecleon_still_front_pic.png
+++ b/graphics/pokemon/kecleon/front.png
diff --git a/graphics/pokemon/icons/kecleon_icon.png b/graphics/pokemon/kecleon/icon.png
index 98b108fd9..98b108fd9 100644
--- a/graphics/pokemon/icons/kecleon_icon.png
+++ b/graphics/pokemon/kecleon/icon.png
diff --git a/graphics/pokemon/palettes/kecleon_palette.pal b/graphics/pokemon/kecleon/normal.pal
index 36d6be7d7..36d6be7d7 100644
--- a/graphics/pokemon/palettes/kecleon_palette.pal
+++ b/graphics/pokemon/kecleon/normal.pal
diff --git a/graphics/pokemon/palettes/kecleon_shiny_palette.pal b/graphics/pokemon/kecleon/shiny.pal
index e056b670f..e056b670f 100644
--- a/graphics/pokemon/palettes/kecleon_shiny_palette.pal
+++ b/graphics/pokemon/kecleon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kingdra_front_pic.png b/graphics/pokemon/kingdra/anim_front.png
index b51448e0a..b51448e0a 100644
--- a/graphics/pokemon/anim_front_pics/kingdra_front_pic.png
+++ b/graphics/pokemon/kingdra/anim_front.png
diff --git a/graphics/pokemon/back_pics/kingdra_back_pic.png b/graphics/pokemon/kingdra/back.png
index 3e6ec7789..3e6ec7789 100644
--- a/graphics/pokemon/back_pics/kingdra_back_pic.png
+++ b/graphics/pokemon/kingdra/back.png
diff --git a/graphics/pokemon/footprints/kingdra_footprint.png b/graphics/pokemon/kingdra/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/kingdra_footprint.png
+++ b/graphics/pokemon/kingdra/footprint.png
diff --git a/graphics/pokemon/front_pics/kingdra_still_front_pic.png b/graphics/pokemon/kingdra/front.png
index 86fecb914..86fecb914 100644
--- a/graphics/pokemon/front_pics/kingdra_still_front_pic.png
+++ b/graphics/pokemon/kingdra/front.png
diff --git a/graphics/pokemon/icons/kingdra_icon.png b/graphics/pokemon/kingdra/icon.png
index c0fb5484a..c0fb5484a 100644
--- a/graphics/pokemon/icons/kingdra_icon.png
+++ b/graphics/pokemon/kingdra/icon.png
diff --git a/graphics/pokemon/palettes/kingdra_palette.pal b/graphics/pokemon/kingdra/normal.pal
index 9dcb7ab85..9dcb7ab85 100644
--- a/graphics/pokemon/palettes/kingdra_palette.pal
+++ b/graphics/pokemon/kingdra/normal.pal
diff --git a/graphics/pokemon/palettes/kingdra_shiny_palette.pal b/graphics/pokemon/kingdra/shiny.pal
index c45869283..c45869283 100644
--- a/graphics/pokemon/palettes/kingdra_shiny_palette.pal
+++ b/graphics/pokemon/kingdra/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kingler_front_pic.png b/graphics/pokemon/kingler/anim_front.png
index fbcafec03..fbcafec03 100644
--- a/graphics/pokemon/anim_front_pics/kingler_front_pic.png
+++ b/graphics/pokemon/kingler/anim_front.png
diff --git a/graphics/pokemon/back_pics/kingler_back_pic.png b/graphics/pokemon/kingler/back.png
index 11338630f..11338630f 100644
--- a/graphics/pokemon/back_pics/kingler_back_pic.png
+++ b/graphics/pokemon/kingler/back.png
diff --git a/graphics/pokemon/footprints/kingler_footprint.png b/graphics/pokemon/kingler/footprint.png
index b75db30dc..b75db30dc 100644
--- a/graphics/pokemon/footprints/kingler_footprint.png
+++ b/graphics/pokemon/kingler/footprint.png
diff --git a/graphics/pokemon/front_pics/kingler_still_front_pic.png b/graphics/pokemon/kingler/front.png
index d59b31f12..d59b31f12 100644
--- a/graphics/pokemon/front_pics/kingler_still_front_pic.png
+++ b/graphics/pokemon/kingler/front.png
diff --git a/graphics/pokemon/icons/kingler_icon.png b/graphics/pokemon/kingler/icon.png
index dbf1af284..dbf1af284 100644
--- a/graphics/pokemon/icons/kingler_icon.png
+++ b/graphics/pokemon/kingler/icon.png
diff --git a/graphics/pokemon/palettes/kingler_palette.pal b/graphics/pokemon/kingler/normal.pal
index 15450f55c..15450f55c 100644
--- a/graphics/pokemon/palettes/kingler_palette.pal
+++ b/graphics/pokemon/kingler/normal.pal
diff --git a/graphics/pokemon/palettes/kingler_shiny_palette.pal b/graphics/pokemon/kingler/shiny.pal
index a472da125..a472da125 100644
--- a/graphics/pokemon/palettes/kingler_shiny_palette.pal
+++ b/graphics/pokemon/kingler/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kirlia_front_pic.png b/graphics/pokemon/kirlia/anim_front.png
index eb8560d98..eb8560d98 100644
--- a/graphics/pokemon/anim_front_pics/kirlia_front_pic.png
+++ b/graphics/pokemon/kirlia/anim_front.png
diff --git a/graphics/pokemon/back_pics/kirlia_back_pic.png b/graphics/pokemon/kirlia/back.png
index 5820cd068..5820cd068 100644
--- a/graphics/pokemon/back_pics/kirlia_back_pic.png
+++ b/graphics/pokemon/kirlia/back.png
diff --git a/graphics/pokemon/footprints/kirlia_footprint.png b/graphics/pokemon/kirlia/footprint.png
index c1c0058e7..c1c0058e7 100644
--- a/graphics/pokemon/footprints/kirlia_footprint.png
+++ b/graphics/pokemon/kirlia/footprint.png
diff --git a/graphics/pokemon/front_pics/kirlia_still_front_pic.png b/graphics/pokemon/kirlia/front.png
index 84acc1494..84acc1494 100644
--- a/graphics/pokemon/front_pics/kirlia_still_front_pic.png
+++ b/graphics/pokemon/kirlia/front.png
diff --git a/graphics/pokemon/icons/kirlia_icon.png b/graphics/pokemon/kirlia/icon.png
index b99dfee25..b99dfee25 100644
--- a/graphics/pokemon/icons/kirlia_icon.png
+++ b/graphics/pokemon/kirlia/icon.png
diff --git a/graphics/pokemon/palettes/kirlia_palette.pal b/graphics/pokemon/kirlia/normal.pal
index 91b428af2..91b428af2 100644
--- a/graphics/pokemon/palettes/kirlia_palette.pal
+++ b/graphics/pokemon/kirlia/normal.pal
diff --git a/graphics/pokemon/palettes/kirlia_shiny_palette.pal b/graphics/pokemon/kirlia/shiny.pal
index ff944e551..ff944e551 100644
--- a/graphics/pokemon/palettes/kirlia_shiny_palette.pal
+++ b/graphics/pokemon/kirlia/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/koffing_front_pic.png b/graphics/pokemon/koffing/anim_front.png
index 430dcfdfb..430dcfdfb 100644
--- a/graphics/pokemon/anim_front_pics/koffing_front_pic.png
+++ b/graphics/pokemon/koffing/anim_front.png
diff --git a/graphics/pokemon/back_pics/koffing_back_pic.png b/graphics/pokemon/koffing/back.png
index a76b27fae..a76b27fae 100644
--- a/graphics/pokemon/back_pics/koffing_back_pic.png
+++ b/graphics/pokemon/koffing/back.png
diff --git a/graphics/pokemon/footprints/koffing_footprint.png b/graphics/pokemon/koffing/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/koffing_footprint.png
+++ b/graphics/pokemon/koffing/footprint.png
diff --git a/graphics/pokemon/front_pics/koffing_still_front_pic.png b/graphics/pokemon/koffing/front.png
index 4b92c57b6..4b92c57b6 100644
--- a/graphics/pokemon/front_pics/koffing_still_front_pic.png
+++ b/graphics/pokemon/koffing/front.png
diff --git a/graphics/pokemon/icons/koffing_icon.png b/graphics/pokemon/koffing/icon.png
index 683df2b85..683df2b85 100644
--- a/graphics/pokemon/icons/koffing_icon.png
+++ b/graphics/pokemon/koffing/icon.png
diff --git a/graphics/pokemon/palettes/koffing_palette.pal b/graphics/pokemon/koffing/normal.pal
index 7b248a340..7b248a340 100644
--- a/graphics/pokemon/palettes/koffing_palette.pal
+++ b/graphics/pokemon/koffing/normal.pal
diff --git a/graphics/pokemon/palettes/koffing_shiny_palette.pal b/graphics/pokemon/koffing/shiny.pal
index bcea2e929..bcea2e929 100644
--- a/graphics/pokemon/palettes/koffing_shiny_palette.pal
+++ b/graphics/pokemon/koffing/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/krabby_front_pic.png b/graphics/pokemon/krabby/anim_front.png
index b7f5b3b77..b7f5b3b77 100644
--- a/graphics/pokemon/anim_front_pics/krabby_front_pic.png
+++ b/graphics/pokemon/krabby/anim_front.png
diff --git a/graphics/pokemon/back_pics/krabby_back_pic.png b/graphics/pokemon/krabby/back.png
index d0501e77a..d0501e77a 100644
--- a/graphics/pokemon/back_pics/krabby_back_pic.png
+++ b/graphics/pokemon/krabby/back.png
diff --git a/graphics/pokemon/footprints/krabby_footprint.png b/graphics/pokemon/krabby/footprint.png
index eae28fe5e..eae28fe5e 100644
--- a/graphics/pokemon/footprints/krabby_footprint.png
+++ b/graphics/pokemon/krabby/footprint.png
diff --git a/graphics/pokemon/front_pics/krabby_still_front_pic.png b/graphics/pokemon/krabby/front.png
index 2a47d68d5..2a47d68d5 100644
--- a/graphics/pokemon/front_pics/krabby_still_front_pic.png
+++ b/graphics/pokemon/krabby/front.png
diff --git a/graphics/pokemon/icons/krabby_icon.png b/graphics/pokemon/krabby/icon.png
index f9fdaa6d5..f9fdaa6d5 100644
--- a/graphics/pokemon/icons/krabby_icon.png
+++ b/graphics/pokemon/krabby/icon.png
diff --git a/graphics/pokemon/palettes/krabby_palette.pal b/graphics/pokemon/krabby/normal.pal
index 2255b2970..2255b2970 100644
--- a/graphics/pokemon/palettes/krabby_palette.pal
+++ b/graphics/pokemon/krabby/normal.pal
diff --git a/graphics/pokemon/palettes/krabby_shiny_palette.pal b/graphics/pokemon/krabby/shiny.pal
index d1318f36c..d1318f36c 100644
--- a/graphics/pokemon/palettes/krabby_shiny_palette.pal
+++ b/graphics/pokemon/krabby/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/kyogre_front_pic.png b/graphics/pokemon/kyogre/anim_front.png
index 780f87052..780f87052 100644
--- a/graphics/pokemon/anim_front_pics/kyogre_front_pic.png
+++ b/graphics/pokemon/kyogre/anim_front.png
diff --git a/graphics/pokemon/back_pics/kyogre_back_pic.png b/graphics/pokemon/kyogre/back.png
index d0c4f55c1..d0c4f55c1 100644
--- a/graphics/pokemon/back_pics/kyogre_back_pic.png
+++ b/graphics/pokemon/kyogre/back.png
diff --git a/graphics/pokemon/footprints/kyogre_footprint.png b/graphics/pokemon/kyogre/footprint.png
index 8d58ee462..8d58ee462 100644
--- a/graphics/pokemon/footprints/kyogre_footprint.png
+++ b/graphics/pokemon/kyogre/footprint.png
diff --git a/graphics/pokemon/front_pics/kyogre_still_front_pic.png b/graphics/pokemon/kyogre/front.png
index 3b4b8e093..3b4b8e093 100644
--- a/graphics/pokemon/front_pics/kyogre_still_front_pic.png
+++ b/graphics/pokemon/kyogre/front.png
diff --git a/graphics/pokemon/icons/kyogre_icon.png b/graphics/pokemon/kyogre/icon.png
index 544ed9daf..544ed9daf 100644
--- a/graphics/pokemon/icons/kyogre_icon.png
+++ b/graphics/pokemon/kyogre/icon.png
diff --git a/graphics/pokemon/palettes/kyogre_palette.pal b/graphics/pokemon/kyogre/normal.pal
index d598595cb..d598595cb 100644
--- a/graphics/pokemon/palettes/kyogre_palette.pal
+++ b/graphics/pokemon/kyogre/normal.pal
diff --git a/graphics/pokemon/palettes/kyogre_shiny_palette.pal b/graphics/pokemon/kyogre/shiny.pal
index 392162401..392162401 100644
--- a/graphics/pokemon/palettes/kyogre_shiny_palette.pal
+++ b/graphics/pokemon/kyogre/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lairon_front_pic.png b/graphics/pokemon/lairon/anim_front.png
index 744680a2b..744680a2b 100644
--- a/graphics/pokemon/anim_front_pics/lairon_front_pic.png
+++ b/graphics/pokemon/lairon/anim_front.png
diff --git a/graphics/pokemon/back_pics/lairon_back_pic.png b/graphics/pokemon/lairon/back.png
index 552c01356..552c01356 100644
--- a/graphics/pokemon/back_pics/lairon_back_pic.png
+++ b/graphics/pokemon/lairon/back.png
diff --git a/graphics/pokemon/footprints/lairon_footprint.png b/graphics/pokemon/lairon/footprint.png
index 9a6527c1c..9a6527c1c 100644
--- a/graphics/pokemon/footprints/lairon_footprint.png
+++ b/graphics/pokemon/lairon/footprint.png
diff --git a/graphics/pokemon/front_pics/lairon_still_front_pic.png b/graphics/pokemon/lairon/front.png
index 50470dead..50470dead 100644
--- a/graphics/pokemon/front_pics/lairon_still_front_pic.png
+++ b/graphics/pokemon/lairon/front.png
diff --git a/graphics/pokemon/icons/lairon_icon.png b/graphics/pokemon/lairon/icon.png
index 6d450b08d..6d450b08d 100644
--- a/graphics/pokemon/icons/lairon_icon.png
+++ b/graphics/pokemon/lairon/icon.png
diff --git a/graphics/pokemon/palettes/lairon_palette.pal b/graphics/pokemon/lairon/normal.pal
index b5711fdad..b5711fdad 100644
--- a/graphics/pokemon/palettes/lairon_palette.pal
+++ b/graphics/pokemon/lairon/normal.pal
diff --git a/graphics/pokemon/palettes/lairon_shiny_palette.pal b/graphics/pokemon/lairon/shiny.pal
index eadb9aa81..eadb9aa81 100644
--- a/graphics/pokemon/palettes/lairon_shiny_palette.pal
+++ b/graphics/pokemon/lairon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lanturn_front_pic.png b/graphics/pokemon/lanturn/anim_front.png
index 8d74b75fc..8d74b75fc 100644
--- a/graphics/pokemon/anim_front_pics/lanturn_front_pic.png
+++ b/graphics/pokemon/lanturn/anim_front.png
diff --git a/graphics/pokemon/back_pics/lanturn_back_pic.png b/graphics/pokemon/lanturn/back.png
index 1b9543d63..1b9543d63 100644
--- a/graphics/pokemon/back_pics/lanturn_back_pic.png
+++ b/graphics/pokemon/lanturn/back.png
diff --git a/graphics/pokemon/footprints/lanturn_footprint.png b/graphics/pokemon/lanturn/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/lanturn_footprint.png
+++ b/graphics/pokemon/lanturn/footprint.png
diff --git a/graphics/pokemon/front_pics/lanturn_still_front_pic.png b/graphics/pokemon/lanturn/front.png
index a94ab7470..a94ab7470 100644
--- a/graphics/pokemon/front_pics/lanturn_still_front_pic.png
+++ b/graphics/pokemon/lanturn/front.png
diff --git a/graphics/pokemon/icons/lanturn_icon.png b/graphics/pokemon/lanturn/icon.png
index d2b3d4348..d2b3d4348 100644
--- a/graphics/pokemon/icons/lanturn_icon.png
+++ b/graphics/pokemon/lanturn/icon.png
diff --git a/graphics/pokemon/palettes/lanturn_palette.pal b/graphics/pokemon/lanturn/normal.pal
index 7baa22c6e..7baa22c6e 100644
--- a/graphics/pokemon/palettes/lanturn_palette.pal
+++ b/graphics/pokemon/lanturn/normal.pal
diff --git a/graphics/pokemon/palettes/lanturn_shiny_palette.pal b/graphics/pokemon/lanturn/shiny.pal
index 70360c029..70360c029 100644
--- a/graphics/pokemon/palettes/lanturn_shiny_palette.pal
+++ b/graphics/pokemon/lanturn/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lapras_front_pic.png b/graphics/pokemon/lapras/anim_front.png
index 1124f14aa..1124f14aa 100644
--- a/graphics/pokemon/anim_front_pics/lapras_front_pic.png
+++ b/graphics/pokemon/lapras/anim_front.png
diff --git a/graphics/pokemon/back_pics/lapras_back_pic.png b/graphics/pokemon/lapras/back.png
index 3b5a18f17..3b5a18f17 100644
--- a/graphics/pokemon/back_pics/lapras_back_pic.png
+++ b/graphics/pokemon/lapras/back.png
diff --git a/graphics/pokemon/footprints/lapras_footprint.png b/graphics/pokemon/lapras/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/lapras_footprint.png
+++ b/graphics/pokemon/lapras/footprint.png
diff --git a/graphics/pokemon/front_pics/lapras_still_front_pic.png b/graphics/pokemon/lapras/front.png
index fc65670b2..fc65670b2 100644
--- a/graphics/pokemon/front_pics/lapras_still_front_pic.png
+++ b/graphics/pokemon/lapras/front.png
diff --git a/graphics/pokemon/icons/lapras_icon.png b/graphics/pokemon/lapras/icon.png
index fa8035ada..fa8035ada 100644
--- a/graphics/pokemon/icons/lapras_icon.png
+++ b/graphics/pokemon/lapras/icon.png
diff --git a/graphics/pokemon/palettes/lapras_palette.pal b/graphics/pokemon/lapras/normal.pal
index 0426c24de..0426c24de 100644
--- a/graphics/pokemon/palettes/lapras_palette.pal
+++ b/graphics/pokemon/lapras/normal.pal
diff --git a/graphics/pokemon/palettes/lapras_shiny_palette.pal b/graphics/pokemon/lapras/shiny.pal
index 5090527aa..5090527aa 100644
--- a/graphics/pokemon/palettes/lapras_shiny_palette.pal
+++ b/graphics/pokemon/lapras/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/larvitar_front_pic.png b/graphics/pokemon/larvitar/anim_front.png
index 4aa28027b..4aa28027b 100644
--- a/graphics/pokemon/anim_front_pics/larvitar_front_pic.png
+++ b/graphics/pokemon/larvitar/anim_front.png
diff --git a/graphics/pokemon/back_pics/larvitar_back_pic.png b/graphics/pokemon/larvitar/back.png
index 1c28da425..1c28da425 100644
--- a/graphics/pokemon/back_pics/larvitar_back_pic.png
+++ b/graphics/pokemon/larvitar/back.png
diff --git a/graphics/pokemon/footprints/larvitar_footprint.png b/graphics/pokemon/larvitar/footprint.png
index a31e8d7f3..a31e8d7f3 100644
--- a/graphics/pokemon/footprints/larvitar_footprint.png
+++ b/graphics/pokemon/larvitar/footprint.png
diff --git a/graphics/pokemon/front_pics/larvitar_still_front_pic.png b/graphics/pokemon/larvitar/front.png
index 4183e29e1..4183e29e1 100644
--- a/graphics/pokemon/front_pics/larvitar_still_front_pic.png
+++ b/graphics/pokemon/larvitar/front.png
diff --git a/graphics/pokemon/icons/larvitar_icon.png b/graphics/pokemon/larvitar/icon.png
index 85a5504c3..85a5504c3 100644
--- a/graphics/pokemon/icons/larvitar_icon.png
+++ b/graphics/pokemon/larvitar/icon.png
diff --git a/graphics/pokemon/palettes/larvitar_palette.pal b/graphics/pokemon/larvitar/normal.pal
index 3bcc1f133..3bcc1f133 100644
--- a/graphics/pokemon/palettes/larvitar_palette.pal
+++ b/graphics/pokemon/larvitar/normal.pal
diff --git a/graphics/pokemon/palettes/larvitar_shiny_palette.pal b/graphics/pokemon/larvitar/shiny.pal
index aa6a59c36..aa6a59c36 100644
--- a/graphics/pokemon/palettes/larvitar_shiny_palette.pal
+++ b/graphics/pokemon/larvitar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/latias_front_pic.png b/graphics/pokemon/latias/anim_front.png
index 63f4a1d1f..63f4a1d1f 100644
--- a/graphics/pokemon/anim_front_pics/latias_front_pic.png
+++ b/graphics/pokemon/latias/anim_front.png
diff --git a/graphics/pokemon/back_pics/latias_back_pic.png b/graphics/pokemon/latias/back.png
index a4286579b..a4286579b 100644
--- a/graphics/pokemon/back_pics/latias_back_pic.png
+++ b/graphics/pokemon/latias/back.png
diff --git a/graphics/pokemon/footprints/latias_footprint.png b/graphics/pokemon/latias/footprint.png
index 0419630c1..0419630c1 100644
--- a/graphics/pokemon/footprints/latias_footprint.png
+++ b/graphics/pokemon/latias/footprint.png
diff --git a/graphics/pokemon/front_pics/latias_still_front_pic.png b/graphics/pokemon/latias/front.png
index 55e7e36b1..55e7e36b1 100644
--- a/graphics/pokemon/front_pics/latias_still_front_pic.png
+++ b/graphics/pokemon/latias/front.png
diff --git a/graphics/pokemon/icons/latias_icon.png b/graphics/pokemon/latias/icon.png
index 1727c0af6..1727c0af6 100644
--- a/graphics/pokemon/icons/latias_icon.png
+++ b/graphics/pokemon/latias/icon.png
diff --git a/graphics/pokemon/palettes/latias_palette.pal b/graphics/pokemon/latias/normal.pal
index 6f831271f..6f831271f 100644
--- a/graphics/pokemon/palettes/latias_palette.pal
+++ b/graphics/pokemon/latias/normal.pal
diff --git a/graphics/pokemon/palettes/latias_shiny_palette.pal b/graphics/pokemon/latias/shiny.pal
index a701dc933..a701dc933 100644
--- a/graphics/pokemon/palettes/latias_shiny_palette.pal
+++ b/graphics/pokemon/latias/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/latios_front_pic.png b/graphics/pokemon/latios/anim_front.png
index 330bf8e4c..330bf8e4c 100644
--- a/graphics/pokemon/anim_front_pics/latios_front_pic.png
+++ b/graphics/pokemon/latios/anim_front.png
diff --git a/graphics/pokemon/back_pics/latios_back_pic.png b/graphics/pokemon/latios/back.png
index 0f2b7f5d6..0f2b7f5d6 100644
--- a/graphics/pokemon/back_pics/latios_back_pic.png
+++ b/graphics/pokemon/latios/back.png
diff --git a/graphics/pokemon/footprints/latios_footprint.png b/graphics/pokemon/latios/footprint.png
index f77d0fa86..f77d0fa86 100644
--- a/graphics/pokemon/footprints/latios_footprint.png
+++ b/graphics/pokemon/latios/footprint.png
diff --git a/graphics/pokemon/front_pics/latios_still_front_pic.png b/graphics/pokemon/latios/front.png
index a9c41e250..a9c41e250 100644
--- a/graphics/pokemon/front_pics/latios_still_front_pic.png
+++ b/graphics/pokemon/latios/front.png
diff --git a/graphics/pokemon/icons/latios_icon.png b/graphics/pokemon/latios/icon.png
index 10a23ad47..10a23ad47 100644
--- a/graphics/pokemon/icons/latios_icon.png
+++ b/graphics/pokemon/latios/icon.png
diff --git a/graphics/pokemon/palettes/latios_palette.pal b/graphics/pokemon/latios/normal.pal
index 6a3d8bead..6a3d8bead 100644
--- a/graphics/pokemon/palettes/latios_palette.pal
+++ b/graphics/pokemon/latios/normal.pal
diff --git a/graphics/pokemon/palettes/latios_shiny_palette.pal b/graphics/pokemon/latios/shiny.pal
index 2b539fd9c..2b539fd9c 100644
--- a/graphics/pokemon/palettes/latios_shiny_palette.pal
+++ b/graphics/pokemon/latios/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ledian_front_pic.png b/graphics/pokemon/ledian/anim_front.png
index 91ac5a9f5..91ac5a9f5 100644
--- a/graphics/pokemon/anim_front_pics/ledian_front_pic.png
+++ b/graphics/pokemon/ledian/anim_front.png
diff --git a/graphics/pokemon/back_pics/ledian_back_pic.png b/graphics/pokemon/ledian/back.png
index 577fd2d71..577fd2d71 100644
--- a/graphics/pokemon/back_pics/ledian_back_pic.png
+++ b/graphics/pokemon/ledian/back.png
diff --git a/graphics/pokemon/footprints/ledian_footprint.png b/graphics/pokemon/ledian/footprint.png
index 5c2d6221f..5c2d6221f 100644
--- a/graphics/pokemon/footprints/ledian_footprint.png
+++ b/graphics/pokemon/ledian/footprint.png
diff --git a/graphics/pokemon/front_pics/ledian_still_front_pic.png b/graphics/pokemon/ledian/front.png
index ea58651cb..ea58651cb 100644
--- a/graphics/pokemon/front_pics/ledian_still_front_pic.png
+++ b/graphics/pokemon/ledian/front.png
diff --git a/graphics/pokemon/icons/ledian_icon.png b/graphics/pokemon/ledian/icon.png
index b82ef1306..b82ef1306 100644
--- a/graphics/pokemon/icons/ledian_icon.png
+++ b/graphics/pokemon/ledian/icon.png
diff --git a/graphics/pokemon/palettes/ledian_palette.pal b/graphics/pokemon/ledian/normal.pal
index dc9acc426..dc9acc426 100644
--- a/graphics/pokemon/palettes/ledian_palette.pal
+++ b/graphics/pokemon/ledian/normal.pal
diff --git a/graphics/pokemon/palettes/ledian_shiny_palette.pal b/graphics/pokemon/ledian/shiny.pal
index 472f0974d..472f0974d 100644
--- a/graphics/pokemon/palettes/ledian_shiny_palette.pal
+++ b/graphics/pokemon/ledian/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ledyba_front_pic.png b/graphics/pokemon/ledyba/anim_front.png
index e58a15d75..e58a15d75 100644
--- a/graphics/pokemon/anim_front_pics/ledyba_front_pic.png
+++ b/graphics/pokemon/ledyba/anim_front.png
diff --git a/graphics/pokemon/back_pics/ledyba_back_pic.png b/graphics/pokemon/ledyba/back.png
index 6a84f405d..6a84f405d 100644
--- a/graphics/pokemon/back_pics/ledyba_back_pic.png
+++ b/graphics/pokemon/ledyba/back.png
diff --git a/graphics/pokemon/footprints/ledyba_footprint.png b/graphics/pokemon/ledyba/footprint.png
index a52ed2560..a52ed2560 100644
--- a/graphics/pokemon/footprints/ledyba_footprint.png
+++ b/graphics/pokemon/ledyba/footprint.png
diff --git a/graphics/pokemon/front_pics/ledyba_still_front_pic.png b/graphics/pokemon/ledyba/front.png
index 210a16176..210a16176 100644
--- a/graphics/pokemon/front_pics/ledyba_still_front_pic.png
+++ b/graphics/pokemon/ledyba/front.png
diff --git a/graphics/pokemon/icons/ledyba_icon.png b/graphics/pokemon/ledyba/icon.png
index f417e2d74..f417e2d74 100644
--- a/graphics/pokemon/icons/ledyba_icon.png
+++ b/graphics/pokemon/ledyba/icon.png
diff --git a/graphics/pokemon/palettes/ledyba_palette.pal b/graphics/pokemon/ledyba/normal.pal
index 2cc003adf..2cc003adf 100644
--- a/graphics/pokemon/palettes/ledyba_palette.pal
+++ b/graphics/pokemon/ledyba/normal.pal
diff --git a/graphics/pokemon/palettes/ledyba_shiny_palette.pal b/graphics/pokemon/ledyba/shiny.pal
index 472f0974d..472f0974d 100644
--- a/graphics/pokemon/palettes/ledyba_shiny_palette.pal
+++ b/graphics/pokemon/ledyba/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lickitung_front_pic.png b/graphics/pokemon/lickitung/anim_front.png
index c3dcbfd1a..c3dcbfd1a 100644
--- a/graphics/pokemon/anim_front_pics/lickitung_front_pic.png
+++ b/graphics/pokemon/lickitung/anim_front.png
diff --git a/graphics/pokemon/back_pics/lickitung_back_pic.png b/graphics/pokemon/lickitung/back.png
index adf354eb3..adf354eb3 100644
--- a/graphics/pokemon/back_pics/lickitung_back_pic.png
+++ b/graphics/pokemon/lickitung/back.png
diff --git a/graphics/pokemon/footprints/lickitung_footprint.png b/graphics/pokemon/lickitung/footprint.png
index 1f88f23fc..1f88f23fc 100644
--- a/graphics/pokemon/footprints/lickitung_footprint.png
+++ b/graphics/pokemon/lickitung/footprint.png
diff --git a/graphics/pokemon/front_pics/lickitung_still_front_pic.png b/graphics/pokemon/lickitung/front.png
index d6ebe65d5..d6ebe65d5 100644
--- a/graphics/pokemon/front_pics/lickitung_still_front_pic.png
+++ b/graphics/pokemon/lickitung/front.png
diff --git a/graphics/pokemon/icons/lickitung_icon.png b/graphics/pokemon/lickitung/icon.png
index 5b7804afa..5b7804afa 100644
--- a/graphics/pokemon/icons/lickitung_icon.png
+++ b/graphics/pokemon/lickitung/icon.png
diff --git a/graphics/pokemon/palettes/lickitung_palette.pal b/graphics/pokemon/lickitung/normal.pal
index 602ac2724..602ac2724 100644
--- a/graphics/pokemon/palettes/lickitung_palette.pal
+++ b/graphics/pokemon/lickitung/normal.pal
diff --git a/graphics/pokemon/palettes/lickitung_shiny_palette.pal b/graphics/pokemon/lickitung/shiny.pal
index d739ad9c1..d739ad9c1 100644
--- a/graphics/pokemon/palettes/lickitung_shiny_palette.pal
+++ b/graphics/pokemon/lickitung/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lileep_front_pic.png b/graphics/pokemon/lileep/anim_front.png
index a656d6fa6..a656d6fa6 100644
--- a/graphics/pokemon/anim_front_pics/lileep_front_pic.png
+++ b/graphics/pokemon/lileep/anim_front.png
diff --git a/graphics/pokemon/back_pics/lileep_back_pic.png b/graphics/pokemon/lileep/back.png
index 753602091..753602091 100644
--- a/graphics/pokemon/back_pics/lileep_back_pic.png
+++ b/graphics/pokemon/lileep/back.png
diff --git a/graphics/pokemon/footprints/lileep_footprint.png b/graphics/pokemon/lileep/footprint.png
index ce6b2790e..ce6b2790e 100644
--- a/graphics/pokemon/footprints/lileep_footprint.png
+++ b/graphics/pokemon/lileep/footprint.png
diff --git a/graphics/pokemon/front_pics/lileep_still_front_pic.png b/graphics/pokemon/lileep/front.png
index 5f85c25aa..5f85c25aa 100644
--- a/graphics/pokemon/front_pics/lileep_still_front_pic.png
+++ b/graphics/pokemon/lileep/front.png
diff --git a/graphics/pokemon/icons/lileep_icon.png b/graphics/pokemon/lileep/icon.png
index b875a53a7..b875a53a7 100644
--- a/graphics/pokemon/icons/lileep_icon.png
+++ b/graphics/pokemon/lileep/icon.png
diff --git a/graphics/pokemon/palettes/lileep_palette.pal b/graphics/pokemon/lileep/normal.pal
index a739bf847..a739bf847 100644
--- a/graphics/pokemon/palettes/lileep_palette.pal
+++ b/graphics/pokemon/lileep/normal.pal
diff --git a/graphics/pokemon/palettes/lileep_shiny_palette.pal b/graphics/pokemon/lileep/shiny.pal
index 6402a8688..6402a8688 100644
--- a/graphics/pokemon/palettes/lileep_shiny_palette.pal
+++ b/graphics/pokemon/lileep/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/linoone_front_pic.png b/graphics/pokemon/linoone/anim_front.png
index e95180de0..e95180de0 100644
--- a/graphics/pokemon/anim_front_pics/linoone_front_pic.png
+++ b/graphics/pokemon/linoone/anim_front.png
diff --git a/graphics/pokemon/back_pics/linoone_back_pic.png b/graphics/pokemon/linoone/back.png
index 9fc8fad38..9fc8fad38 100644
--- a/graphics/pokemon/back_pics/linoone_back_pic.png
+++ b/graphics/pokemon/linoone/back.png
diff --git a/graphics/pokemon/footprints/linoone_footprint.png b/graphics/pokemon/linoone/footprint.png
index 8d83166d3..8d83166d3 100644
--- a/graphics/pokemon/footprints/linoone_footprint.png
+++ b/graphics/pokemon/linoone/footprint.png
diff --git a/graphics/pokemon/front_pics/linoone_still_front_pic.png b/graphics/pokemon/linoone/front.png
index 8b5baa699..8b5baa699 100644
--- a/graphics/pokemon/front_pics/linoone_still_front_pic.png
+++ b/graphics/pokemon/linoone/front.png
diff --git a/graphics/pokemon/icons/linoone_icon.png b/graphics/pokemon/linoone/icon.png
index bf0ea0cac..bf0ea0cac 100644
--- a/graphics/pokemon/icons/linoone_icon.png
+++ b/graphics/pokemon/linoone/icon.png
diff --git a/graphics/pokemon/palettes/linoone_palette.pal b/graphics/pokemon/linoone/normal.pal
index 368b6ac6f..368b6ac6f 100644
--- a/graphics/pokemon/palettes/linoone_palette.pal
+++ b/graphics/pokemon/linoone/normal.pal
diff --git a/graphics/pokemon/palettes/linoone_shiny_palette.pal b/graphics/pokemon/linoone/shiny.pal
index 7988bb21c..7988bb21c 100644
--- a/graphics/pokemon/palettes/linoone_shiny_palette.pal
+++ b/graphics/pokemon/linoone/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lombre_front_pic.png b/graphics/pokemon/lombre/anim_front.png
index d1aa1e351..d1aa1e351 100644
--- a/graphics/pokemon/anim_front_pics/lombre_front_pic.png
+++ b/graphics/pokemon/lombre/anim_front.png
diff --git a/graphics/pokemon/back_pics/lombre_back_pic.png b/graphics/pokemon/lombre/back.png
index c87b4bcf3..c87b4bcf3 100644
--- a/graphics/pokemon/back_pics/lombre_back_pic.png
+++ b/graphics/pokemon/lombre/back.png
diff --git a/graphics/pokemon/footprints/lombre_footprint.png b/graphics/pokemon/lombre/footprint.png
index 051e5ab55..051e5ab55 100644
--- a/graphics/pokemon/footprints/lombre_footprint.png
+++ b/graphics/pokemon/lombre/footprint.png
diff --git a/graphics/pokemon/front_pics/lombre_still_front_pic.png b/graphics/pokemon/lombre/front.png
index 3719098a9..3719098a9 100644
--- a/graphics/pokemon/front_pics/lombre_still_front_pic.png
+++ b/graphics/pokemon/lombre/front.png
diff --git a/graphics/pokemon/icons/lombre_icon.png b/graphics/pokemon/lombre/icon.png
index b3e661cca..b3e661cca 100644
--- a/graphics/pokemon/icons/lombre_icon.png
+++ b/graphics/pokemon/lombre/icon.png
diff --git a/graphics/pokemon/palettes/lombre_palette.pal b/graphics/pokemon/lombre/normal.pal
index 69f944a22..69f944a22 100644
--- a/graphics/pokemon/palettes/lombre_palette.pal
+++ b/graphics/pokemon/lombre/normal.pal
diff --git a/graphics/pokemon/palettes/lombre_shiny_palette.pal b/graphics/pokemon/lombre/shiny.pal
index d4458373a..d4458373a 100644
--- a/graphics/pokemon/palettes/lombre_shiny_palette.pal
+++ b/graphics/pokemon/lombre/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lotad_front_pic.png b/graphics/pokemon/lotad/anim_front.png
index b2eabc212..b2eabc212 100644
--- a/graphics/pokemon/anim_front_pics/lotad_front_pic.png
+++ b/graphics/pokemon/lotad/anim_front.png
diff --git a/graphics/pokemon/back_pics/lotad_back_pic.png b/graphics/pokemon/lotad/back.png
index d8ca7648d..d8ca7648d 100644
--- a/graphics/pokemon/back_pics/lotad_back_pic.png
+++ b/graphics/pokemon/lotad/back.png
diff --git a/graphics/pokemon/footprints/lotad_footprint.png b/graphics/pokemon/lotad/footprint.png
index caac6945f..caac6945f 100644
--- a/graphics/pokemon/footprints/lotad_footprint.png
+++ b/graphics/pokemon/lotad/footprint.png
diff --git a/graphics/pokemon/front_pics/lotad_still_front_pic.png b/graphics/pokemon/lotad/front.png
index 0b7e0a0a6..0b7e0a0a6 100644
--- a/graphics/pokemon/front_pics/lotad_still_front_pic.png
+++ b/graphics/pokemon/lotad/front.png
diff --git a/graphics/pokemon/icons/lotad_icon.png b/graphics/pokemon/lotad/icon.png
index 74e37ceed..74e37ceed 100644
--- a/graphics/pokemon/icons/lotad_icon.png
+++ b/graphics/pokemon/lotad/icon.png
diff --git a/graphics/pokemon/palettes/lotad_palette.pal b/graphics/pokemon/lotad/normal.pal
index efb988ea0..efb988ea0 100644
--- a/graphics/pokemon/palettes/lotad_palette.pal
+++ b/graphics/pokemon/lotad/normal.pal
diff --git a/graphics/pokemon/palettes/lotad_shiny_palette.pal b/graphics/pokemon/lotad/shiny.pal
index 36f271590..36f271590 100644
--- a/graphics/pokemon/palettes/lotad_shiny_palette.pal
+++ b/graphics/pokemon/lotad/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/loudred_front_pic.png b/graphics/pokemon/loudred/anim_front.png
index 13fe39e53..13fe39e53 100644
--- a/graphics/pokemon/anim_front_pics/loudred_front_pic.png
+++ b/graphics/pokemon/loudred/anim_front.png
diff --git a/graphics/pokemon/back_pics/loudred_back_pic.png b/graphics/pokemon/loudred/back.png
index cb3d5d816..cb3d5d816 100644
--- a/graphics/pokemon/back_pics/loudred_back_pic.png
+++ b/graphics/pokemon/loudred/back.png
diff --git a/graphics/pokemon/footprints/loudred_footprint.png b/graphics/pokemon/loudred/footprint.png
index 604af9000..604af9000 100644
--- a/graphics/pokemon/footprints/loudred_footprint.png
+++ b/graphics/pokemon/loudred/footprint.png
diff --git a/graphics/pokemon/front_pics/loudred_still_front_pic.png b/graphics/pokemon/loudred/front.png
index 2b87c0b29..2b87c0b29 100644
--- a/graphics/pokemon/front_pics/loudred_still_front_pic.png
+++ b/graphics/pokemon/loudred/front.png
diff --git a/graphics/pokemon/icons/loudred_icon.png b/graphics/pokemon/loudred/icon.png
index cbb1859f8..cbb1859f8 100644
--- a/graphics/pokemon/icons/loudred_icon.png
+++ b/graphics/pokemon/loudred/icon.png
diff --git a/graphics/pokemon/palettes/loudred_palette.pal b/graphics/pokemon/loudred/normal.pal
index 27c8ed1e7..27c8ed1e7 100644
--- a/graphics/pokemon/palettes/loudred_palette.pal
+++ b/graphics/pokemon/loudred/normal.pal
diff --git a/graphics/pokemon/palettes/loudred_shiny_palette.pal b/graphics/pokemon/loudred/shiny.pal
index b905b269c..b905b269c 100644
--- a/graphics/pokemon/palettes/loudred_shiny_palette.pal
+++ b/graphics/pokemon/loudred/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ludicolo_front_pic.png b/graphics/pokemon/ludicolo/anim_front.png
index f649bebcb..f649bebcb 100644
--- a/graphics/pokemon/anim_front_pics/ludicolo_front_pic.png
+++ b/graphics/pokemon/ludicolo/anim_front.png
diff --git a/graphics/pokemon/back_pics/ludicolo_back_pic.png b/graphics/pokemon/ludicolo/back.png
index 2bdc96c39..2bdc96c39 100644
--- a/graphics/pokemon/back_pics/ludicolo_back_pic.png
+++ b/graphics/pokemon/ludicolo/back.png
diff --git a/graphics/pokemon/footprints/ludicolo_footprint.png b/graphics/pokemon/ludicolo/footprint.png
index 23163f358..23163f358 100644
--- a/graphics/pokemon/footprints/ludicolo_footprint.png
+++ b/graphics/pokemon/ludicolo/footprint.png
diff --git a/graphics/pokemon/front_pics/ludicolo_still_front_pic.png b/graphics/pokemon/ludicolo/front.png
index df8e0091b..df8e0091b 100644
--- a/graphics/pokemon/front_pics/ludicolo_still_front_pic.png
+++ b/graphics/pokemon/ludicolo/front.png
diff --git a/graphics/pokemon/icons/ludicolo_icon.png b/graphics/pokemon/ludicolo/icon.png
index 47490411b..47490411b 100644
--- a/graphics/pokemon/icons/ludicolo_icon.png
+++ b/graphics/pokemon/ludicolo/icon.png
diff --git a/graphics/pokemon/palettes/ludicolo_palette.pal b/graphics/pokemon/ludicolo/normal.pal
index 618414394..618414394 100644
--- a/graphics/pokemon/palettes/ludicolo_palette.pal
+++ b/graphics/pokemon/ludicolo/normal.pal
diff --git a/graphics/pokemon/palettes/ludicolo_shiny_palette.pal b/graphics/pokemon/ludicolo/shiny.pal
index 442eda95e..442eda95e 100644
--- a/graphics/pokemon/palettes/ludicolo_shiny_palette.pal
+++ b/graphics/pokemon/ludicolo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lugia_front_pic.png b/graphics/pokemon/lugia/anim_front.png
index 930d81732..930d81732 100644
--- a/graphics/pokemon/anim_front_pics/lugia_front_pic.png
+++ b/graphics/pokemon/lugia/anim_front.png
diff --git a/graphics/pokemon/back_pics/lugia_back_pic.png b/graphics/pokemon/lugia/back.png
index ece7def85..ece7def85 100644
--- a/graphics/pokemon/back_pics/lugia_back_pic.png
+++ b/graphics/pokemon/lugia/back.png
diff --git a/graphics/pokemon/footprints/lugia_footprint.png b/graphics/pokemon/lugia/footprint.png
index e6642ed07..e6642ed07 100644
--- a/graphics/pokemon/footprints/lugia_footprint.png
+++ b/graphics/pokemon/lugia/footprint.png
diff --git a/graphics/pokemon/front_pics/lugia_still_front_pic.png b/graphics/pokemon/lugia/front.png
index 44f6ce278..44f6ce278 100644
--- a/graphics/pokemon/front_pics/lugia_still_front_pic.png
+++ b/graphics/pokemon/lugia/front.png
diff --git a/graphics/pokemon/icons/lugia_icon.png b/graphics/pokemon/lugia/icon.png
index 5e581ee19..5e581ee19 100644
--- a/graphics/pokemon/icons/lugia_icon.png
+++ b/graphics/pokemon/lugia/icon.png
diff --git a/graphics/pokemon/palettes/lugia_palette.pal b/graphics/pokemon/lugia/normal.pal
index 483157770..483157770 100644
--- a/graphics/pokemon/palettes/lugia_palette.pal
+++ b/graphics/pokemon/lugia/normal.pal
diff --git a/graphics/pokemon/palettes/lugia_shiny_palette.pal b/graphics/pokemon/lugia/shiny.pal
index 42db26696..42db26696 100644
--- a/graphics/pokemon/palettes/lugia_shiny_palette.pal
+++ b/graphics/pokemon/lugia/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/lunatone_front_pic.png b/graphics/pokemon/lunatone/anim_front.png
index 75b483b42..75b483b42 100644
--- a/graphics/pokemon/anim_front_pics/lunatone_front_pic.png
+++ b/graphics/pokemon/lunatone/anim_front.png
diff --git a/graphics/pokemon/back_pics/lunatone_back_pic.png b/graphics/pokemon/lunatone/back.png
index 3f2247f8e..3f2247f8e 100644
--- a/graphics/pokemon/back_pics/lunatone_back_pic.png
+++ b/graphics/pokemon/lunatone/back.png
diff --git a/graphics/pokemon/footprints/lunatone_footprint.png b/graphics/pokemon/lunatone/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/lunatone_footprint.png
+++ b/graphics/pokemon/lunatone/footprint.png
diff --git a/graphics/pokemon/front_pics/lunatone_still_front_pic.png b/graphics/pokemon/lunatone/front.png
index 3458d32d5..3458d32d5 100644
--- a/graphics/pokemon/front_pics/lunatone_still_front_pic.png
+++ b/graphics/pokemon/lunatone/front.png
diff --git a/graphics/pokemon/icons/lunatone_icon.png b/graphics/pokemon/lunatone/icon.png
index 27a42ae41..27a42ae41 100644
--- a/graphics/pokemon/icons/lunatone_icon.png
+++ b/graphics/pokemon/lunatone/icon.png
diff --git a/graphics/pokemon/palettes/lunatone_palette.pal b/graphics/pokemon/lunatone/normal.pal
index 9a0a5885f..9a0a5885f 100644
--- a/graphics/pokemon/palettes/lunatone_palette.pal
+++ b/graphics/pokemon/lunatone/normal.pal
diff --git a/graphics/pokemon/palettes/lunatone_shiny_palette.pal b/graphics/pokemon/lunatone/shiny.pal
index e0f5eb308..e0f5eb308 100644
--- a/graphics/pokemon/palettes/lunatone_shiny_palette.pal
+++ b/graphics/pokemon/lunatone/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/luvdisc_front_pic.png b/graphics/pokemon/luvdisc/anim_front.png
index bdd3e2f44..bdd3e2f44 100644
--- a/graphics/pokemon/anim_front_pics/luvdisc_front_pic.png
+++ b/graphics/pokemon/luvdisc/anim_front.png
diff --git a/graphics/pokemon/back_pics/luvdisc_back_pic.png b/graphics/pokemon/luvdisc/back.png
index 04895aa25..04895aa25 100644
--- a/graphics/pokemon/back_pics/luvdisc_back_pic.png
+++ b/graphics/pokemon/luvdisc/back.png
diff --git a/graphics/pokemon/footprints/luvdisc_footprint.png b/graphics/pokemon/luvdisc/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/luvdisc_footprint.png
+++ b/graphics/pokemon/luvdisc/footprint.png
diff --git a/graphics/pokemon/front_pics/luvdisc_still_front_pic.png b/graphics/pokemon/luvdisc/front.png
index e85283e10..e85283e10 100644
--- a/graphics/pokemon/front_pics/luvdisc_still_front_pic.png
+++ b/graphics/pokemon/luvdisc/front.png
diff --git a/graphics/pokemon/icons/luvdisc_icon.png b/graphics/pokemon/luvdisc/icon.png
index 980b73492..980b73492 100644
--- a/graphics/pokemon/icons/luvdisc_icon.png
+++ b/graphics/pokemon/luvdisc/icon.png
diff --git a/graphics/pokemon/palettes/luvdisc_palette.pal b/graphics/pokemon/luvdisc/normal.pal
index c443e0633..c443e0633 100644
--- a/graphics/pokemon/palettes/luvdisc_palette.pal
+++ b/graphics/pokemon/luvdisc/normal.pal
diff --git a/graphics/pokemon/palettes/luvdisc_shiny_palette.pal b/graphics/pokemon/luvdisc/shiny.pal
index b1df53235..b1df53235 100644
--- a/graphics/pokemon/palettes/luvdisc_shiny_palette.pal
+++ b/graphics/pokemon/luvdisc/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/machamp_front_pic.png b/graphics/pokemon/machamp/anim_front.png
index bf4b640c8..bf4b640c8 100644
--- a/graphics/pokemon/anim_front_pics/machamp_front_pic.png
+++ b/graphics/pokemon/machamp/anim_front.png
diff --git a/graphics/pokemon/back_pics/machamp_back_pic.png b/graphics/pokemon/machamp/back.png
index 98f6f961b..98f6f961b 100644
--- a/graphics/pokemon/back_pics/machamp_back_pic.png
+++ b/graphics/pokemon/machamp/back.png
diff --git a/graphics/pokemon/footprints/machamp_footprint.png b/graphics/pokemon/machamp/footprint.png
index e562fd08c..e562fd08c 100644
--- a/graphics/pokemon/footprints/machamp_footprint.png
+++ b/graphics/pokemon/machamp/footprint.png
diff --git a/graphics/pokemon/front_pics/machamp_still_front_pic.png b/graphics/pokemon/machamp/front.png
index ee4d80748..ee4d80748 100644
--- a/graphics/pokemon/front_pics/machamp_still_front_pic.png
+++ b/graphics/pokemon/machamp/front.png
diff --git a/graphics/pokemon/icons/machamp_icon.png b/graphics/pokemon/machamp/icon.png
index f803845ab..f803845ab 100644
--- a/graphics/pokemon/icons/machamp_icon.png
+++ b/graphics/pokemon/machamp/icon.png
diff --git a/graphics/pokemon/palettes/machamp_palette.pal b/graphics/pokemon/machamp/normal.pal
index b3c4a313b..b3c4a313b 100644
--- a/graphics/pokemon/palettes/machamp_palette.pal
+++ b/graphics/pokemon/machamp/normal.pal
diff --git a/graphics/pokemon/palettes/machamp_shiny_palette.pal b/graphics/pokemon/machamp/shiny.pal
index 6e7cc549c..6e7cc549c 100644
--- a/graphics/pokemon/palettes/machamp_shiny_palette.pal
+++ b/graphics/pokemon/machamp/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/machoke_front_pic.png b/graphics/pokemon/machoke/anim_front.png
index 45744a871..45744a871 100644
--- a/graphics/pokemon/anim_front_pics/machoke_front_pic.png
+++ b/graphics/pokemon/machoke/anim_front.png
diff --git a/graphics/pokemon/back_pics/machoke_back_pic.png b/graphics/pokemon/machoke/back.png
index b3c84c77c..b3c84c77c 100644
--- a/graphics/pokemon/back_pics/machoke_back_pic.png
+++ b/graphics/pokemon/machoke/back.png
diff --git a/graphics/pokemon/footprints/machoke_footprint.png b/graphics/pokemon/machoke/footprint.png
index d9009d3e1..d9009d3e1 100644
--- a/graphics/pokemon/footprints/machoke_footprint.png
+++ b/graphics/pokemon/machoke/footprint.png
diff --git a/graphics/pokemon/front_pics/machoke_still_front_pic.png b/graphics/pokemon/machoke/front.png
index 17a4bcc85..17a4bcc85 100644
--- a/graphics/pokemon/front_pics/machoke_still_front_pic.png
+++ b/graphics/pokemon/machoke/front.png
diff --git a/graphics/pokemon/icons/machoke_icon.png b/graphics/pokemon/machoke/icon.png
index 97d3a6bf0..97d3a6bf0 100644
--- a/graphics/pokemon/icons/machoke_icon.png
+++ b/graphics/pokemon/machoke/icon.png
diff --git a/graphics/pokemon/palettes/machoke_palette.pal b/graphics/pokemon/machoke/normal.pal
index f07156ff0..f07156ff0 100644
--- a/graphics/pokemon/palettes/machoke_palette.pal
+++ b/graphics/pokemon/machoke/normal.pal
diff --git a/graphics/pokemon/palettes/machoke_shiny_palette.pal b/graphics/pokemon/machoke/shiny.pal
index 5d5cb321b..5d5cb321b 100644
--- a/graphics/pokemon/palettes/machoke_shiny_palette.pal
+++ b/graphics/pokemon/machoke/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/machop_front_pic.png b/graphics/pokemon/machop/anim_front.png
index 91e430114..91e430114 100644
--- a/graphics/pokemon/anim_front_pics/machop_front_pic.png
+++ b/graphics/pokemon/machop/anim_front.png
diff --git a/graphics/pokemon/back_pics/machop_back_pic.png b/graphics/pokemon/machop/back.png
index 6b0dda04c..6b0dda04c 100644
--- a/graphics/pokemon/back_pics/machop_back_pic.png
+++ b/graphics/pokemon/machop/back.png
diff --git a/graphics/pokemon/footprints/machop_footprint.png b/graphics/pokemon/machop/footprint.png
index 8b2808553..8b2808553 100644
--- a/graphics/pokemon/footprints/machop_footprint.png
+++ b/graphics/pokemon/machop/footprint.png
diff --git a/graphics/pokemon/front_pics/machop_still_front_pic.png b/graphics/pokemon/machop/front.png
index 456267d19..456267d19 100644
--- a/graphics/pokemon/front_pics/machop_still_front_pic.png
+++ b/graphics/pokemon/machop/front.png
diff --git a/graphics/pokemon/icons/machop_icon.png b/graphics/pokemon/machop/icon.png
index 53773ea8c..53773ea8c 100644
--- a/graphics/pokemon/icons/machop_icon.png
+++ b/graphics/pokemon/machop/icon.png
diff --git a/graphics/pokemon/palettes/machop_palette.pal b/graphics/pokemon/machop/normal.pal
index 0232ea1d0..0232ea1d0 100644
--- a/graphics/pokemon/palettes/machop_palette.pal
+++ b/graphics/pokemon/machop/normal.pal
diff --git a/graphics/pokemon/palettes/machop_shiny_palette.pal b/graphics/pokemon/machop/shiny.pal
index 2ceeb3c56..2ceeb3c56 100644
--- a/graphics/pokemon/palettes/machop_shiny_palette.pal
+++ b/graphics/pokemon/machop/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magby_front_pic.png b/graphics/pokemon/magby/anim_front.png
index fa7c91f0b..fa7c91f0b 100644
--- a/graphics/pokemon/anim_front_pics/magby_front_pic.png
+++ b/graphics/pokemon/magby/anim_front.png
diff --git a/graphics/pokemon/back_pics/magby_back_pic.png b/graphics/pokemon/magby/back.png
index f05f62283..f05f62283 100644
--- a/graphics/pokemon/back_pics/magby_back_pic.png
+++ b/graphics/pokemon/magby/back.png
diff --git a/graphics/pokemon/footprints/magby_footprint.png b/graphics/pokemon/magby/footprint.png
index 655d0ca2b..655d0ca2b 100644
--- a/graphics/pokemon/footprints/magby_footprint.png
+++ b/graphics/pokemon/magby/footprint.png
diff --git a/graphics/pokemon/front_pics/magby_still_front_pic.png b/graphics/pokemon/magby/front.png
index 6994953b2..6994953b2 100644
--- a/graphics/pokemon/front_pics/magby_still_front_pic.png
+++ b/graphics/pokemon/magby/front.png
diff --git a/graphics/pokemon/icons/magby_icon.png b/graphics/pokemon/magby/icon.png
index 574274003..574274003 100644
--- a/graphics/pokemon/icons/magby_icon.png
+++ b/graphics/pokemon/magby/icon.png
diff --git a/graphics/pokemon/palettes/magby_palette.pal b/graphics/pokemon/magby/normal.pal
index 42daceeb8..42daceeb8 100644
--- a/graphics/pokemon/palettes/magby_palette.pal
+++ b/graphics/pokemon/magby/normal.pal
diff --git a/graphics/pokemon/palettes/magby_shiny_palette.pal b/graphics/pokemon/magby/shiny.pal
index 97a19115c..97a19115c 100644
--- a/graphics/pokemon/palettes/magby_shiny_palette.pal
+++ b/graphics/pokemon/magby/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magcargo_front_pic.png b/graphics/pokemon/magcargo/anim_front.png
index 5c2ddcddd..5c2ddcddd 100644
--- a/graphics/pokemon/anim_front_pics/magcargo_front_pic.png
+++ b/graphics/pokemon/magcargo/anim_front.png
diff --git a/graphics/pokemon/back_pics/magcargo_back_pic.png b/graphics/pokemon/magcargo/back.png
index 8d2221f0d..8d2221f0d 100644
--- a/graphics/pokemon/back_pics/magcargo_back_pic.png
+++ b/graphics/pokemon/magcargo/back.png
diff --git a/graphics/pokemon/footprints/magcargo_footprint.png b/graphics/pokemon/magcargo/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/magcargo_footprint.png
+++ b/graphics/pokemon/magcargo/footprint.png
diff --git a/graphics/pokemon/front_pics/magcargo_still_front_pic.png b/graphics/pokemon/magcargo/front.png
index b2e3679cd..b2e3679cd 100644
--- a/graphics/pokemon/front_pics/magcargo_still_front_pic.png
+++ b/graphics/pokemon/magcargo/front.png
diff --git a/graphics/pokemon/icons/magcargo_icon.png b/graphics/pokemon/magcargo/icon.png
index 46cbb8cb5..46cbb8cb5 100644
--- a/graphics/pokemon/icons/magcargo_icon.png
+++ b/graphics/pokemon/magcargo/icon.png
diff --git a/graphics/pokemon/palettes/magcargo_palette.pal b/graphics/pokemon/magcargo/normal.pal
index 71f6dce5b..71f6dce5b 100644
--- a/graphics/pokemon/palettes/magcargo_palette.pal
+++ b/graphics/pokemon/magcargo/normal.pal
diff --git a/graphics/pokemon/palettes/magcargo_shiny_palette.pal b/graphics/pokemon/magcargo/shiny.pal
index ff0c9dd40..ff0c9dd40 100644
--- a/graphics/pokemon/palettes/magcargo_shiny_palette.pal
+++ b/graphics/pokemon/magcargo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magikarp_front_pic.png b/graphics/pokemon/magikarp/anim_front.png
index 4b4f31f72..4b4f31f72 100644
--- a/graphics/pokemon/anim_front_pics/magikarp_front_pic.png
+++ b/graphics/pokemon/magikarp/anim_front.png
diff --git a/graphics/pokemon/back_pics/magikarp_back_pic.png b/graphics/pokemon/magikarp/back.png
index 66e874bb9..66e874bb9 100644
--- a/graphics/pokemon/back_pics/magikarp_back_pic.png
+++ b/graphics/pokemon/magikarp/back.png
diff --git a/graphics/pokemon/footprints/magikarp_footprint.png b/graphics/pokemon/magikarp/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/magikarp_footprint.png
+++ b/graphics/pokemon/magikarp/footprint.png
diff --git a/graphics/pokemon/front_pics/magikarp_still_front_pic.png b/graphics/pokemon/magikarp/front.png
index 030c0a188..030c0a188 100644
--- a/graphics/pokemon/front_pics/magikarp_still_front_pic.png
+++ b/graphics/pokemon/magikarp/front.png
diff --git a/graphics/pokemon/icons/magikarp_icon.png b/graphics/pokemon/magikarp/icon.png
index 004884582..004884582 100644
--- a/graphics/pokemon/icons/magikarp_icon.png
+++ b/graphics/pokemon/magikarp/icon.png
diff --git a/graphics/pokemon/palettes/magikarp_palette.pal b/graphics/pokemon/magikarp/normal.pal
index 14b625cb9..14b625cb9 100644
--- a/graphics/pokemon/palettes/magikarp_palette.pal
+++ b/graphics/pokemon/magikarp/normal.pal
diff --git a/graphics/pokemon/palettes/magikarp_shiny_palette.pal b/graphics/pokemon/magikarp/shiny.pal
index d6eec780a..d6eec780a 100644
--- a/graphics/pokemon/palettes/magikarp_shiny_palette.pal
+++ b/graphics/pokemon/magikarp/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magmar_front_pic.png b/graphics/pokemon/magmar/anim_front.png
index 3562bda29..3562bda29 100644
--- a/graphics/pokemon/anim_front_pics/magmar_front_pic.png
+++ b/graphics/pokemon/magmar/anim_front.png
diff --git a/graphics/pokemon/back_pics/magmar_back_pic.png b/graphics/pokemon/magmar/back.png
index 6aba73438..6aba73438 100644
--- a/graphics/pokemon/back_pics/magmar_back_pic.png
+++ b/graphics/pokemon/magmar/back.png
diff --git a/graphics/pokemon/footprints/magmar_footprint.png b/graphics/pokemon/magmar/footprint.png
index 17de53a46..17de53a46 100644
--- a/graphics/pokemon/footprints/magmar_footprint.png
+++ b/graphics/pokemon/magmar/footprint.png
diff --git a/graphics/pokemon/front_pics/magmar_still_front_pic.png b/graphics/pokemon/magmar/front.png
index 01fa79228..01fa79228 100644
--- a/graphics/pokemon/front_pics/magmar_still_front_pic.png
+++ b/graphics/pokemon/magmar/front.png
diff --git a/graphics/pokemon/icons/magmar_icon.png b/graphics/pokemon/magmar/icon.png
index af5ece4f7..af5ece4f7 100644
--- a/graphics/pokemon/icons/magmar_icon.png
+++ b/graphics/pokemon/magmar/icon.png
diff --git a/graphics/pokemon/palettes/magmar_palette.pal b/graphics/pokemon/magmar/normal.pal
index d94c6d760..d94c6d760 100644
--- a/graphics/pokemon/palettes/magmar_palette.pal
+++ b/graphics/pokemon/magmar/normal.pal
diff --git a/graphics/pokemon/palettes/magmar_shiny_palette.pal b/graphics/pokemon/magmar/shiny.pal
index f4da957cb..f4da957cb 100644
--- a/graphics/pokemon/palettes/magmar_shiny_palette.pal
+++ b/graphics/pokemon/magmar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magnemite_front_pic.png b/graphics/pokemon/magnemite/anim_front.png
index 60081cacb..60081cacb 100644
--- a/graphics/pokemon/anim_front_pics/magnemite_front_pic.png
+++ b/graphics/pokemon/magnemite/anim_front.png
diff --git a/graphics/pokemon/back_pics/magnemite_back_pic.png b/graphics/pokemon/magnemite/back.png
index c1769ec51..c1769ec51 100644
--- a/graphics/pokemon/back_pics/magnemite_back_pic.png
+++ b/graphics/pokemon/magnemite/back.png
diff --git a/graphics/pokemon/footprints/magnemite_footprint.png b/graphics/pokemon/magnemite/footprint.png
index f710e5028..f710e5028 100644
--- a/graphics/pokemon/footprints/magnemite_footprint.png
+++ b/graphics/pokemon/magnemite/footprint.png
diff --git a/graphics/pokemon/front_pics/magnemite_still_front_pic.png b/graphics/pokemon/magnemite/front.png
index 7de985dbd..7de985dbd 100644
--- a/graphics/pokemon/front_pics/magnemite_still_front_pic.png
+++ b/graphics/pokemon/magnemite/front.png
diff --git a/graphics/pokemon/icons/magnemite_icon.png b/graphics/pokemon/magnemite/icon.png
index ba9561d21..ba9561d21 100644
--- a/graphics/pokemon/icons/magnemite_icon.png
+++ b/graphics/pokemon/magnemite/icon.png
diff --git a/graphics/pokemon/palettes/magnemite_palette.pal b/graphics/pokemon/magnemite/normal.pal
index 4ece43e6e..4ece43e6e 100644
--- a/graphics/pokemon/palettes/magnemite_palette.pal
+++ b/graphics/pokemon/magnemite/normal.pal
diff --git a/graphics/pokemon/palettes/magnemite_shiny_palette.pal b/graphics/pokemon/magnemite/shiny.pal
index 50bb00b88..50bb00b88 100644
--- a/graphics/pokemon/palettes/magnemite_shiny_palette.pal
+++ b/graphics/pokemon/magnemite/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/magneton_front_pic.png b/graphics/pokemon/magneton/anim_front.png
index 40e95aaf4..40e95aaf4 100644
--- a/graphics/pokemon/anim_front_pics/magneton_front_pic.png
+++ b/graphics/pokemon/magneton/anim_front.png
diff --git a/graphics/pokemon/back_pics/magneton_back_pic.png b/graphics/pokemon/magneton/back.png
index 5fc357dfc..5fc357dfc 100644
--- a/graphics/pokemon/back_pics/magneton_back_pic.png
+++ b/graphics/pokemon/magneton/back.png
diff --git a/graphics/pokemon/footprints/magneton_footprint.png b/graphics/pokemon/magneton/footprint.png
index 00b8b0ebf..00b8b0ebf 100644
--- a/graphics/pokemon/footprints/magneton_footprint.png
+++ b/graphics/pokemon/magneton/footprint.png
diff --git a/graphics/pokemon/front_pics/magneton_still_front_pic.png b/graphics/pokemon/magneton/front.png
index 3587c2d45..3587c2d45 100644
--- a/graphics/pokemon/front_pics/magneton_still_front_pic.png
+++ b/graphics/pokemon/magneton/front.png
diff --git a/graphics/pokemon/icons/magneton_icon.png b/graphics/pokemon/magneton/icon.png
index 91a25f3ce..91a25f3ce 100644
--- a/graphics/pokemon/icons/magneton_icon.png
+++ b/graphics/pokemon/magneton/icon.png
diff --git a/graphics/pokemon/palettes/magneton_palette.pal b/graphics/pokemon/magneton/normal.pal
index 4ece43e6e..4ece43e6e 100644
--- a/graphics/pokemon/palettes/magneton_palette.pal
+++ b/graphics/pokemon/magneton/normal.pal
diff --git a/graphics/pokemon/palettes/magneton_shiny_palette.pal b/graphics/pokemon/magneton/shiny.pal
index 1777fbd2a..1777fbd2a 100644
--- a/graphics/pokemon/palettes/magneton_shiny_palette.pal
+++ b/graphics/pokemon/magneton/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/makuhita_front_pic.png b/graphics/pokemon/makuhita/anim_front.png
index fae14eb6a..fae14eb6a 100644
--- a/graphics/pokemon/anim_front_pics/makuhita_front_pic.png
+++ b/graphics/pokemon/makuhita/anim_front.png
diff --git a/graphics/pokemon/back_pics/makuhita_back_pic.png b/graphics/pokemon/makuhita/back.png
index 45423f822..45423f822 100644
--- a/graphics/pokemon/back_pics/makuhita_back_pic.png
+++ b/graphics/pokemon/makuhita/back.png
diff --git a/graphics/pokemon/footprints/makuhita_footprint.png b/graphics/pokemon/makuhita/footprint.png
index 3da20ccb3..3da20ccb3 100644
--- a/graphics/pokemon/footprints/makuhita_footprint.png
+++ b/graphics/pokemon/makuhita/footprint.png
diff --git a/graphics/pokemon/front_pics/makuhita_still_front_pic.png b/graphics/pokemon/makuhita/front.png
index 76a11c069..76a11c069 100644
--- a/graphics/pokemon/front_pics/makuhita_still_front_pic.png
+++ b/graphics/pokemon/makuhita/front.png
diff --git a/graphics/pokemon/icons/makuhita_icon.png b/graphics/pokemon/makuhita/icon.png
index d64f2c418..d64f2c418 100644
--- a/graphics/pokemon/icons/makuhita_icon.png
+++ b/graphics/pokemon/makuhita/icon.png
diff --git a/graphics/pokemon/palettes/makuhita_palette.pal b/graphics/pokemon/makuhita/normal.pal
index 7fc578bb1..7fc578bb1 100644
--- a/graphics/pokemon/palettes/makuhita_palette.pal
+++ b/graphics/pokemon/makuhita/normal.pal
diff --git a/graphics/pokemon/palettes/makuhita_shiny_palette.pal b/graphics/pokemon/makuhita/shiny.pal
index 2f3aa75fc..2f3aa75fc 100644
--- a/graphics/pokemon/palettes/makuhita_shiny_palette.pal
+++ b/graphics/pokemon/makuhita/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/manectric_front_pic.png b/graphics/pokemon/manectric/anim_front.png
index e91cf8850..e91cf8850 100644
--- a/graphics/pokemon/anim_front_pics/manectric_front_pic.png
+++ b/graphics/pokemon/manectric/anim_front.png
diff --git a/graphics/pokemon/back_pics/manectric_back_pic.png b/graphics/pokemon/manectric/back.png
index 9373757a0..9373757a0 100644
--- a/graphics/pokemon/back_pics/manectric_back_pic.png
+++ b/graphics/pokemon/manectric/back.png
diff --git a/graphics/pokemon/footprints/manectric_footprint.png b/graphics/pokemon/manectric/footprint.png
index 4f4903bf9..4f4903bf9 100644
--- a/graphics/pokemon/footprints/manectric_footprint.png
+++ b/graphics/pokemon/manectric/footprint.png
diff --git a/graphics/pokemon/front_pics/manectric_still_front_pic.png b/graphics/pokemon/manectric/front.png
index d4142301c..d4142301c 100644
--- a/graphics/pokemon/front_pics/manectric_still_front_pic.png
+++ b/graphics/pokemon/manectric/front.png
diff --git a/graphics/pokemon/icons/manectric_icon.png b/graphics/pokemon/manectric/icon.png
index 0b8fe933d..0b8fe933d 100644
--- a/graphics/pokemon/icons/manectric_icon.png
+++ b/graphics/pokemon/manectric/icon.png
diff --git a/graphics/pokemon/palettes/manectric_palette.pal b/graphics/pokemon/manectric/normal.pal
index 0067c876b..0067c876b 100644
--- a/graphics/pokemon/palettes/manectric_palette.pal
+++ b/graphics/pokemon/manectric/normal.pal
diff --git a/graphics/pokemon/palettes/manectric_shiny_palette.pal b/graphics/pokemon/manectric/shiny.pal
index db1f6ea18..db1f6ea18 100644
--- a/graphics/pokemon/palettes/manectric_shiny_palette.pal
+++ b/graphics/pokemon/manectric/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mankey_front_pic.png b/graphics/pokemon/mankey/anim_front.png
index b630920f6..b630920f6 100644
--- a/graphics/pokemon/anim_front_pics/mankey_front_pic.png
+++ b/graphics/pokemon/mankey/anim_front.png
diff --git a/graphics/pokemon/back_pics/mankey_back_pic.png b/graphics/pokemon/mankey/back.png
index 8b0751a9e..8b0751a9e 100644
--- a/graphics/pokemon/back_pics/mankey_back_pic.png
+++ b/graphics/pokemon/mankey/back.png
diff --git a/graphics/pokemon/footprints/mankey_footprint.png b/graphics/pokemon/mankey/footprint.png
index f02036af5..f02036af5 100644
--- a/graphics/pokemon/footprints/mankey_footprint.png
+++ b/graphics/pokemon/mankey/footprint.png
diff --git a/graphics/pokemon/front_pics/mankey_still_front_pic.png b/graphics/pokemon/mankey/front.png
index 10abe4def..10abe4def 100644
--- a/graphics/pokemon/front_pics/mankey_still_front_pic.png
+++ b/graphics/pokemon/mankey/front.png
diff --git a/graphics/pokemon/icons/mankey_icon.png b/graphics/pokemon/mankey/icon.png
index 369221126..369221126 100644
--- a/graphics/pokemon/icons/mankey_icon.png
+++ b/graphics/pokemon/mankey/icon.png
diff --git a/graphics/pokemon/palettes/mankey_palette.pal b/graphics/pokemon/mankey/normal.pal
index bc405617a..bc405617a 100644
--- a/graphics/pokemon/palettes/mankey_palette.pal
+++ b/graphics/pokemon/mankey/normal.pal
diff --git a/graphics/pokemon/palettes/mankey_shiny_palette.pal b/graphics/pokemon/mankey/shiny.pal
index 55703c37b..55703c37b 100644
--- a/graphics/pokemon/palettes/mankey_shiny_palette.pal
+++ b/graphics/pokemon/mankey/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mantine_front_pic.png b/graphics/pokemon/mantine/anim_front.png
index d310da6e5..d310da6e5 100644
--- a/graphics/pokemon/anim_front_pics/mantine_front_pic.png
+++ b/graphics/pokemon/mantine/anim_front.png
diff --git a/graphics/pokemon/back_pics/mantine_back_pic.png b/graphics/pokemon/mantine/back.png
index 186e90e1e..186e90e1e 100644
--- a/graphics/pokemon/back_pics/mantine_back_pic.png
+++ b/graphics/pokemon/mantine/back.png
diff --git a/graphics/pokemon/footprints/mantine_footprint.png b/graphics/pokemon/mantine/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/mantine_footprint.png
+++ b/graphics/pokemon/mantine/footprint.png
diff --git a/graphics/pokemon/front_pics/mantine_still_front_pic.png b/graphics/pokemon/mantine/front.png
index b8a292d83..b8a292d83 100644
--- a/graphics/pokemon/front_pics/mantine_still_front_pic.png
+++ b/graphics/pokemon/mantine/front.png
diff --git a/graphics/pokemon/icons/mantine_icon.png b/graphics/pokemon/mantine/icon.png
index cf0bb2223..cf0bb2223 100644
--- a/graphics/pokemon/icons/mantine_icon.png
+++ b/graphics/pokemon/mantine/icon.png
diff --git a/graphics/pokemon/palettes/mantine_palette.pal b/graphics/pokemon/mantine/normal.pal
index 36e0777c4..36e0777c4 100644
--- a/graphics/pokemon/palettes/mantine_palette.pal
+++ b/graphics/pokemon/mantine/normal.pal
diff --git a/graphics/pokemon/palettes/mantine_shiny_palette.pal b/graphics/pokemon/mantine/shiny.pal
index 5427dc275..5427dc275 100644
--- a/graphics/pokemon/palettes/mantine_shiny_palette.pal
+++ b/graphics/pokemon/mantine/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mareep_front_pic.png b/graphics/pokemon/mareep/anim_front.png
index 9435ca829..9435ca829 100644
--- a/graphics/pokemon/anim_front_pics/mareep_front_pic.png
+++ b/graphics/pokemon/mareep/anim_front.png
diff --git a/graphics/pokemon/back_pics/mareep_back_pic.png b/graphics/pokemon/mareep/back.png
index 601d13c8d..601d13c8d 100644
--- a/graphics/pokemon/back_pics/mareep_back_pic.png
+++ b/graphics/pokemon/mareep/back.png
diff --git a/graphics/pokemon/footprints/mareep_footprint.png b/graphics/pokemon/mareep/footprint.png
index 2913a4c48..2913a4c48 100644
--- a/graphics/pokemon/footprints/mareep_footprint.png
+++ b/graphics/pokemon/mareep/footprint.png
diff --git a/graphics/pokemon/front_pics/mareep_still_front_pic.png b/graphics/pokemon/mareep/front.png
index 7f052faea..7f052faea 100644
--- a/graphics/pokemon/front_pics/mareep_still_front_pic.png
+++ b/graphics/pokemon/mareep/front.png
diff --git a/graphics/pokemon/icons/mareep_icon.png b/graphics/pokemon/mareep/icon.png
index 2bd5335b6..2bd5335b6 100644
--- a/graphics/pokemon/icons/mareep_icon.png
+++ b/graphics/pokemon/mareep/icon.png
diff --git a/graphics/pokemon/palettes/mareep_palette.pal b/graphics/pokemon/mareep/normal.pal
index bd24bfe72..bd24bfe72 100644
--- a/graphics/pokemon/palettes/mareep_palette.pal
+++ b/graphics/pokemon/mareep/normal.pal
diff --git a/graphics/pokemon/palettes/mareep_shiny_palette.pal b/graphics/pokemon/mareep/shiny.pal
index 587f7493f..587f7493f 100644
--- a/graphics/pokemon/palettes/mareep_shiny_palette.pal
+++ b/graphics/pokemon/mareep/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/marill_front_pic.png b/graphics/pokemon/marill/anim_front.png
index 51e0a1444..51e0a1444 100644
--- a/graphics/pokemon/anim_front_pics/marill_front_pic.png
+++ b/graphics/pokemon/marill/anim_front.png
diff --git a/graphics/pokemon/back_pics/marill_back_pic.png b/graphics/pokemon/marill/back.png
index 49bc29d97..49bc29d97 100644
--- a/graphics/pokemon/back_pics/marill_back_pic.png
+++ b/graphics/pokemon/marill/back.png
diff --git a/graphics/pokemon/footprints/marill_footprint.png b/graphics/pokemon/marill/footprint.png
index a09d8f2c0..a09d8f2c0 100644
--- a/graphics/pokemon/footprints/marill_footprint.png
+++ b/graphics/pokemon/marill/footprint.png
diff --git a/graphics/pokemon/front_pics/marill_still_front_pic.png b/graphics/pokemon/marill/front.png
index 91cdf233f..91cdf233f 100644
--- a/graphics/pokemon/front_pics/marill_still_front_pic.png
+++ b/graphics/pokemon/marill/front.png
diff --git a/graphics/pokemon/icons/marill_icon.png b/graphics/pokemon/marill/icon.png
index d91f9da86..d91f9da86 100644
--- a/graphics/pokemon/icons/marill_icon.png
+++ b/graphics/pokemon/marill/icon.png
diff --git a/graphics/pokemon/palettes/marill_palette.pal b/graphics/pokemon/marill/normal.pal
index 77ed6b4b6..77ed6b4b6 100644
--- a/graphics/pokemon/palettes/marill_palette.pal
+++ b/graphics/pokemon/marill/normal.pal
diff --git a/graphics/pokemon/palettes/marill_shiny_palette.pal b/graphics/pokemon/marill/shiny.pal
index 7bd492c65..7bd492c65 100644
--- a/graphics/pokemon/palettes/marill_shiny_palette.pal
+++ b/graphics/pokemon/marill/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/marowak_front_pic.png b/graphics/pokemon/marowak/anim_front.png
index 8d15403c8..8d15403c8 100644
--- a/graphics/pokemon/anim_front_pics/marowak_front_pic.png
+++ b/graphics/pokemon/marowak/anim_front.png
diff --git a/graphics/pokemon/back_pics/marowak_back_pic.png b/graphics/pokemon/marowak/back.png
index 8510885d5..8510885d5 100644
--- a/graphics/pokemon/back_pics/marowak_back_pic.png
+++ b/graphics/pokemon/marowak/back.png
diff --git a/graphics/pokemon/footprints/marowak_footprint.png b/graphics/pokemon/marowak/footprint.png
index fbde41d04..fbde41d04 100644
--- a/graphics/pokemon/footprints/marowak_footprint.png
+++ b/graphics/pokemon/marowak/footprint.png
diff --git a/graphics/pokemon/front_pics/marowak_still_front_pic.png b/graphics/pokemon/marowak/front.png
index f86aafe76..f86aafe76 100644
--- a/graphics/pokemon/front_pics/marowak_still_front_pic.png
+++ b/graphics/pokemon/marowak/front.png
diff --git a/graphics/pokemon/icons/marowak_icon.png b/graphics/pokemon/marowak/icon.png
index 7efbb1779..7efbb1779 100644
--- a/graphics/pokemon/icons/marowak_icon.png
+++ b/graphics/pokemon/marowak/icon.png
diff --git a/graphics/pokemon/palettes/marowak_palette.pal b/graphics/pokemon/marowak/normal.pal
index 7a70bffe3..7a70bffe3 100644
--- a/graphics/pokemon/palettes/marowak_palette.pal
+++ b/graphics/pokemon/marowak/normal.pal
diff --git a/graphics/pokemon/palettes/marowak_shiny_palette.pal b/graphics/pokemon/marowak/shiny.pal
index 569ccc082..569ccc082 100644
--- a/graphics/pokemon/palettes/marowak_shiny_palette.pal
+++ b/graphics/pokemon/marowak/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/marshtomp_front_pic.png b/graphics/pokemon/marshtomp/anim_front.png
index d06bc373e..d06bc373e 100644
--- a/graphics/pokemon/anim_front_pics/marshtomp_front_pic.png
+++ b/graphics/pokemon/marshtomp/anim_front.png
diff --git a/graphics/pokemon/back_pics/marshtomp_back_pic.png b/graphics/pokemon/marshtomp/back.png
index 6c530aaee..6c530aaee 100644
--- a/graphics/pokemon/back_pics/marshtomp_back_pic.png
+++ b/graphics/pokemon/marshtomp/back.png
diff --git a/graphics/pokemon/footprints/marshtomp_footprint.png b/graphics/pokemon/marshtomp/footprint.png
index 3c232ccad..3c232ccad 100644
--- a/graphics/pokemon/footprints/marshtomp_footprint.png
+++ b/graphics/pokemon/marshtomp/footprint.png
diff --git a/graphics/pokemon/front_pics/marshtomp_still_front_pic.png b/graphics/pokemon/marshtomp/front.png
index f94cf911d..f94cf911d 100644
--- a/graphics/pokemon/front_pics/marshtomp_still_front_pic.png
+++ b/graphics/pokemon/marshtomp/front.png
diff --git a/graphics/pokemon/icons/marshtomp_icon.png b/graphics/pokemon/marshtomp/icon.png
index 170e82851..170e82851 100644
--- a/graphics/pokemon/icons/marshtomp_icon.png
+++ b/graphics/pokemon/marshtomp/icon.png
diff --git a/graphics/pokemon/palettes/marshtomp_palette.pal b/graphics/pokemon/marshtomp/normal.pal
index b21cb52db..b21cb52db 100644
--- a/graphics/pokemon/palettes/marshtomp_palette.pal
+++ b/graphics/pokemon/marshtomp/normal.pal
diff --git a/graphics/pokemon/palettes/marshtomp_shiny_palette.pal b/graphics/pokemon/marshtomp/shiny.pal
index f47e2751d..f47e2751d 100644
--- a/graphics/pokemon/palettes/marshtomp_shiny_palette.pal
+++ b/graphics/pokemon/marshtomp/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/masquerain_front_pic.png b/graphics/pokemon/masquerain/anim_front.png
index 7853b70e8..7853b70e8 100644
--- a/graphics/pokemon/anim_front_pics/masquerain_front_pic.png
+++ b/graphics/pokemon/masquerain/anim_front.png
diff --git a/graphics/pokemon/back_pics/masquerain_back_pic.png b/graphics/pokemon/masquerain/back.png
index 0092c2ca6..0092c2ca6 100644
--- a/graphics/pokemon/back_pics/masquerain_back_pic.png
+++ b/graphics/pokemon/masquerain/back.png
diff --git a/graphics/pokemon/footprints/masquerain_footprint.png b/graphics/pokemon/masquerain/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/masquerain_footprint.png
+++ b/graphics/pokemon/masquerain/footprint.png
diff --git a/graphics/pokemon/front_pics/masquerain_still_front_pic.png b/graphics/pokemon/masquerain/front.png
index b4c33dccc..b4c33dccc 100644
--- a/graphics/pokemon/front_pics/masquerain_still_front_pic.png
+++ b/graphics/pokemon/masquerain/front.png
diff --git a/graphics/pokemon/icons/masquerain_icon.png b/graphics/pokemon/masquerain/icon.png
index 5487241e2..5487241e2 100644
--- a/graphics/pokemon/icons/masquerain_icon.png
+++ b/graphics/pokemon/masquerain/icon.png
diff --git a/graphics/pokemon/palettes/masquerain_palette.pal b/graphics/pokemon/masquerain/normal.pal
index 54690d35b..54690d35b 100644
--- a/graphics/pokemon/palettes/masquerain_palette.pal
+++ b/graphics/pokemon/masquerain/normal.pal
diff --git a/graphics/pokemon/palettes/masquerain_shiny_palette.pal b/graphics/pokemon/masquerain/shiny.pal
index 09ed3ccf5..09ed3ccf5 100644
--- a/graphics/pokemon/palettes/masquerain_shiny_palette.pal
+++ b/graphics/pokemon/masquerain/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mawile_front_pic.png b/graphics/pokemon/mawile/anim_front.png
index 562612086..562612086 100644
--- a/graphics/pokemon/anim_front_pics/mawile_front_pic.png
+++ b/graphics/pokemon/mawile/anim_front.png
diff --git a/graphics/pokemon/back_pics/mawile_back_pic.png b/graphics/pokemon/mawile/back.png
index 5bbf44ca9..5bbf44ca9 100644
--- a/graphics/pokemon/back_pics/mawile_back_pic.png
+++ b/graphics/pokemon/mawile/back.png
diff --git a/graphics/pokemon/footprints/mawile_footprint.png b/graphics/pokemon/mawile/footprint.png
index 5195fd4df..5195fd4df 100644
--- a/graphics/pokemon/footprints/mawile_footprint.png
+++ b/graphics/pokemon/mawile/footprint.png
diff --git a/graphics/pokemon/front_pics/mawile_still_front_pic.png b/graphics/pokemon/mawile/front.png
index 49f38de14..49f38de14 100644
--- a/graphics/pokemon/front_pics/mawile_still_front_pic.png
+++ b/graphics/pokemon/mawile/front.png
diff --git a/graphics/pokemon/icons/mawile_icon.png b/graphics/pokemon/mawile/icon.png
index cf7363277..cf7363277 100644
--- a/graphics/pokemon/icons/mawile_icon.png
+++ b/graphics/pokemon/mawile/icon.png
diff --git a/graphics/pokemon/palettes/mawile_palette.pal b/graphics/pokemon/mawile/normal.pal
index ebb40809c..ebb40809c 100644
--- a/graphics/pokemon/palettes/mawile_palette.pal
+++ b/graphics/pokemon/mawile/normal.pal
diff --git a/graphics/pokemon/palettes/mawile_shiny_palette.pal b/graphics/pokemon/mawile/shiny.pal
index ceadfc93e..ceadfc93e 100644
--- a/graphics/pokemon/palettes/mawile_shiny_palette.pal
+++ b/graphics/pokemon/mawile/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/medicham_front_pic.png b/graphics/pokemon/medicham/anim_front.png
index 7dc0762c4..7dc0762c4 100644
--- a/graphics/pokemon/anim_front_pics/medicham_front_pic.png
+++ b/graphics/pokemon/medicham/anim_front.png
diff --git a/graphics/pokemon/back_pics/medicham_back_pic.png b/graphics/pokemon/medicham/back.png
index f4f58839b..f4f58839b 100644
--- a/graphics/pokemon/back_pics/medicham_back_pic.png
+++ b/graphics/pokemon/medicham/back.png
diff --git a/graphics/pokemon/footprints/medicham_footprint.png b/graphics/pokemon/medicham/footprint.png
index 804e8c1d8..804e8c1d8 100644
--- a/graphics/pokemon/footprints/medicham_footprint.png
+++ b/graphics/pokemon/medicham/footprint.png
diff --git a/graphics/pokemon/front_pics/medicham_still_front_pic.png b/graphics/pokemon/medicham/front.png
index 1da67a1f2..1da67a1f2 100644
--- a/graphics/pokemon/front_pics/medicham_still_front_pic.png
+++ b/graphics/pokemon/medicham/front.png
diff --git a/graphics/pokemon/icons/medicham_icon.png b/graphics/pokemon/medicham/icon.png
index ed287fb28..ed287fb28 100644
--- a/graphics/pokemon/icons/medicham_icon.png
+++ b/graphics/pokemon/medicham/icon.png
diff --git a/graphics/pokemon/palettes/medicham_palette.pal b/graphics/pokemon/medicham/normal.pal
index ffc38ab86..ffc38ab86 100644
--- a/graphics/pokemon/palettes/medicham_palette.pal
+++ b/graphics/pokemon/medicham/normal.pal
diff --git a/graphics/pokemon/palettes/medicham_shiny_palette.pal b/graphics/pokemon/medicham/shiny.pal
index 9a1d82aa7..9a1d82aa7 100644
--- a/graphics/pokemon/palettes/medicham_shiny_palette.pal
+++ b/graphics/pokemon/medicham/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/meditite_front_pic.png b/graphics/pokemon/meditite/anim_front.png
index cd9516ad2..cd9516ad2 100644
--- a/graphics/pokemon/anim_front_pics/meditite_front_pic.png
+++ b/graphics/pokemon/meditite/anim_front.png
diff --git a/graphics/pokemon/back_pics/meditite_back_pic.png b/graphics/pokemon/meditite/back.png
index 8c00d8f6d..8c00d8f6d 100644
--- a/graphics/pokemon/back_pics/meditite_back_pic.png
+++ b/graphics/pokemon/meditite/back.png
diff --git a/graphics/pokemon/footprints/meditite_footprint.png b/graphics/pokemon/meditite/footprint.png
index 034cb0df8..034cb0df8 100644
--- a/graphics/pokemon/footprints/meditite_footprint.png
+++ b/graphics/pokemon/meditite/footprint.png
diff --git a/graphics/pokemon/front_pics/meditite_still_front_pic.png b/graphics/pokemon/meditite/front.png
index e8717b13d..e8717b13d 100644
--- a/graphics/pokemon/front_pics/meditite_still_front_pic.png
+++ b/graphics/pokemon/meditite/front.png
diff --git a/graphics/pokemon/icons/meditite_icon.png b/graphics/pokemon/meditite/icon.png
index 05a02f077..05a02f077 100644
--- a/graphics/pokemon/icons/meditite_icon.png
+++ b/graphics/pokemon/meditite/icon.png
diff --git a/graphics/pokemon/palettes/meditite_palette.pal b/graphics/pokemon/meditite/normal.pal
index a60729a6a..a60729a6a 100644
--- a/graphics/pokemon/palettes/meditite_palette.pal
+++ b/graphics/pokemon/meditite/normal.pal
diff --git a/graphics/pokemon/palettes/meditite_shiny_palette.pal b/graphics/pokemon/meditite/shiny.pal
index de7c38f5a..de7c38f5a 100644
--- a/graphics/pokemon/palettes/meditite_shiny_palette.pal
+++ b/graphics/pokemon/meditite/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/meganium_front_pic.png b/graphics/pokemon/meganium/anim_front.png
index 9317b389a..9317b389a 100644
--- a/graphics/pokemon/anim_front_pics/meganium_front_pic.png
+++ b/graphics/pokemon/meganium/anim_front.png
diff --git a/graphics/pokemon/back_pics/meganium_back_pic.png b/graphics/pokemon/meganium/back.png
index be01710af..be01710af 100644
--- a/graphics/pokemon/back_pics/meganium_back_pic.png
+++ b/graphics/pokemon/meganium/back.png
diff --git a/graphics/pokemon/footprints/meganium_footprint.png b/graphics/pokemon/meganium/footprint.png
index 39303ac4f..39303ac4f 100644
--- a/graphics/pokemon/footprints/meganium_footprint.png
+++ b/graphics/pokemon/meganium/footprint.png
diff --git a/graphics/pokemon/front_pics/meganium_still_front_pic.png b/graphics/pokemon/meganium/front.png
index 5ecee5287..5ecee5287 100644
--- a/graphics/pokemon/front_pics/meganium_still_front_pic.png
+++ b/graphics/pokemon/meganium/front.png
diff --git a/graphics/pokemon/icons/meganium_icon.png b/graphics/pokemon/meganium/icon.png
index ce4592272..ce4592272 100644
--- a/graphics/pokemon/icons/meganium_icon.png
+++ b/graphics/pokemon/meganium/icon.png
diff --git a/graphics/pokemon/palettes/meganium_palette.pal b/graphics/pokemon/meganium/normal.pal
index 6a4bca91c..6a4bca91c 100644
--- a/graphics/pokemon/palettes/meganium_palette.pal
+++ b/graphics/pokemon/meganium/normal.pal
diff --git a/graphics/pokemon/palettes/meganium_shiny_palette.pal b/graphics/pokemon/meganium/shiny.pal
index 0b03b419d..0b03b419d 100644
--- a/graphics/pokemon/palettes/meganium_shiny_palette.pal
+++ b/graphics/pokemon/meganium/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/meowth_front_pic.png b/graphics/pokemon/meowth/anim_front.png
index ab750326a..ab750326a 100644
--- a/graphics/pokemon/anim_front_pics/meowth_front_pic.png
+++ b/graphics/pokemon/meowth/anim_front.png
diff --git a/graphics/pokemon/back_pics/meowth_back_pic.png b/graphics/pokemon/meowth/back.png
index d87e7aa14..d87e7aa14 100644
--- a/graphics/pokemon/back_pics/meowth_back_pic.png
+++ b/graphics/pokemon/meowth/back.png
diff --git a/graphics/pokemon/footprints/meowth_footprint.png b/graphics/pokemon/meowth/footprint.png
index 7dc20ada7..7dc20ada7 100644
--- a/graphics/pokemon/footprints/meowth_footprint.png
+++ b/graphics/pokemon/meowth/footprint.png
diff --git a/graphics/pokemon/front_pics/meowth_still_front_pic.png b/graphics/pokemon/meowth/front.png
index 76299ea59..76299ea59 100644
--- a/graphics/pokemon/front_pics/meowth_still_front_pic.png
+++ b/graphics/pokemon/meowth/front.png
diff --git a/graphics/pokemon/icons/meowth_icon.png b/graphics/pokemon/meowth/icon.png
index 146c69093..146c69093 100644
--- a/graphics/pokemon/icons/meowth_icon.png
+++ b/graphics/pokemon/meowth/icon.png
diff --git a/graphics/pokemon/palettes/meowth_palette.pal b/graphics/pokemon/meowth/normal.pal
index 034249ad5..034249ad5 100644
--- a/graphics/pokemon/palettes/meowth_palette.pal
+++ b/graphics/pokemon/meowth/normal.pal
diff --git a/graphics/pokemon/palettes/meowth_shiny_palette.pal b/graphics/pokemon/meowth/shiny.pal
index 68f386ca6..68f386ca6 100644
--- a/graphics/pokemon/palettes/meowth_shiny_palette.pal
+++ b/graphics/pokemon/meowth/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/metagross_front_pic.png b/graphics/pokemon/metagross/anim_front.png
index def46cfa3..def46cfa3 100644
--- a/graphics/pokemon/anim_front_pics/metagross_front_pic.png
+++ b/graphics/pokemon/metagross/anim_front.png
diff --git a/graphics/pokemon/back_pics/metagross_back_pic.png b/graphics/pokemon/metagross/back.png
index 2097f945d..2097f945d 100644
--- a/graphics/pokemon/back_pics/metagross_back_pic.png
+++ b/graphics/pokemon/metagross/back.png
diff --git a/graphics/pokemon/footprints/metagross_footprint.png b/graphics/pokemon/metagross/footprint.png
index 07f91d604..07f91d604 100644
--- a/graphics/pokemon/footprints/metagross_footprint.png
+++ b/graphics/pokemon/metagross/footprint.png
diff --git a/graphics/pokemon/front_pics/metagross_still_front_pic.png b/graphics/pokemon/metagross/front.png
index 6349fe912..6349fe912 100644
--- a/graphics/pokemon/front_pics/metagross_still_front_pic.png
+++ b/graphics/pokemon/metagross/front.png
diff --git a/graphics/pokemon/icons/metagross_icon.png b/graphics/pokemon/metagross/icon.png
index e9cf14ab1..e9cf14ab1 100644
--- a/graphics/pokemon/icons/metagross_icon.png
+++ b/graphics/pokemon/metagross/icon.png
diff --git a/graphics/pokemon/palettes/metagross_palette.pal b/graphics/pokemon/metagross/normal.pal
index 265dadb67..265dadb67 100644
--- a/graphics/pokemon/palettes/metagross_palette.pal
+++ b/graphics/pokemon/metagross/normal.pal
diff --git a/graphics/pokemon/palettes/metagross_shiny_palette.pal b/graphics/pokemon/metagross/shiny.pal
index 4ff89d816..4ff89d816 100644
--- a/graphics/pokemon/palettes/metagross_shiny_palette.pal
+++ b/graphics/pokemon/metagross/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/metang_front_pic.png b/graphics/pokemon/metang/anim_front.png
index c1d71aa9b..c1d71aa9b 100644
--- a/graphics/pokemon/anim_front_pics/metang_front_pic.png
+++ b/graphics/pokemon/metang/anim_front.png
diff --git a/graphics/pokemon/back_pics/metang_back_pic.png b/graphics/pokemon/metang/back.png
index 2ba18eb3d..2ba18eb3d 100644
--- a/graphics/pokemon/back_pics/metang_back_pic.png
+++ b/graphics/pokemon/metang/back.png
diff --git a/graphics/pokemon/footprints/metang_footprint.png b/graphics/pokemon/metang/footprint.png
index 5b0f8f5b0..5b0f8f5b0 100644
--- a/graphics/pokemon/footprints/metang_footprint.png
+++ b/graphics/pokemon/metang/footprint.png
diff --git a/graphics/pokemon/front_pics/metang_still_front_pic.png b/graphics/pokemon/metang/front.png
index 397bef3bf..397bef3bf 100644
--- a/graphics/pokemon/front_pics/metang_still_front_pic.png
+++ b/graphics/pokemon/metang/front.png
diff --git a/graphics/pokemon/icons/metang_icon.png b/graphics/pokemon/metang/icon.png
index cc095e935..cc095e935 100644
--- a/graphics/pokemon/icons/metang_icon.png
+++ b/graphics/pokemon/metang/icon.png
diff --git a/graphics/pokemon/palettes/metang_palette.pal b/graphics/pokemon/metang/normal.pal
index 41b48bc08..41b48bc08 100644
--- a/graphics/pokemon/palettes/metang_palette.pal
+++ b/graphics/pokemon/metang/normal.pal
diff --git a/graphics/pokemon/palettes/metang_shiny_palette.pal b/graphics/pokemon/metang/shiny.pal
index 56c14cd75..56c14cd75 100644
--- a/graphics/pokemon/palettes/metang_shiny_palette.pal
+++ b/graphics/pokemon/metang/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/metapod_front_pic.png b/graphics/pokemon/metapod/anim_front.png
index 89843520d..89843520d 100644
--- a/graphics/pokemon/anim_front_pics/metapod_front_pic.png
+++ b/graphics/pokemon/metapod/anim_front.png
diff --git a/graphics/pokemon/back_pics/metapod_back_pic.png b/graphics/pokemon/metapod/back.png
index 42b80d17c..42b80d17c 100644
--- a/graphics/pokemon/back_pics/metapod_back_pic.png
+++ b/graphics/pokemon/metapod/back.png
diff --git a/graphics/pokemon/footprints/metapod_footprint.png b/graphics/pokemon/metapod/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/metapod_footprint.png
+++ b/graphics/pokemon/metapod/footprint.png
diff --git a/graphics/pokemon/front_pics/metapod_still_front_pic.png b/graphics/pokemon/metapod/front.png
index 3ae019264..3ae019264 100644
--- a/graphics/pokemon/front_pics/metapod_still_front_pic.png
+++ b/graphics/pokemon/metapod/front.png
diff --git a/graphics/pokemon/icons/metapod_icon.png b/graphics/pokemon/metapod/icon.png
index 2316b2408..2316b2408 100644
--- a/graphics/pokemon/icons/metapod_icon.png
+++ b/graphics/pokemon/metapod/icon.png
diff --git a/graphics/pokemon/palettes/metapod_palette.pal b/graphics/pokemon/metapod/normal.pal
index 747522889..747522889 100644
--- a/graphics/pokemon/palettes/metapod_palette.pal
+++ b/graphics/pokemon/metapod/normal.pal
diff --git a/graphics/pokemon/palettes/metapod_shiny_palette.pal b/graphics/pokemon/metapod/shiny.pal
index 149d03c64..149d03c64 100644
--- a/graphics/pokemon/palettes/metapod_shiny_palette.pal
+++ b/graphics/pokemon/metapod/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mew_front_pic.png b/graphics/pokemon/mew/anim_front.png
index fc6dacbfd..fc6dacbfd 100644
--- a/graphics/pokemon/anim_front_pics/mew_front_pic.png
+++ b/graphics/pokemon/mew/anim_front.png
diff --git a/graphics/pokemon/back_pics/mew_back_pic.png b/graphics/pokemon/mew/back.png
index d73526245..d73526245 100644
--- a/graphics/pokemon/back_pics/mew_back_pic.png
+++ b/graphics/pokemon/mew/back.png
diff --git a/graphics/pokemon/footprints/mew_footprint.png b/graphics/pokemon/mew/footprint.png
index afbba43ac..afbba43ac 100644
--- a/graphics/pokemon/footprints/mew_footprint.png
+++ b/graphics/pokemon/mew/footprint.png
diff --git a/graphics/pokemon/front_pics/mew_still_front_pic.png b/graphics/pokemon/mew/front.png
index b72376196..b72376196 100644
--- a/graphics/pokemon/front_pics/mew_still_front_pic.png
+++ b/graphics/pokemon/mew/front.png
diff --git a/graphics/pokemon/icons/mew_icon.png b/graphics/pokemon/mew/icon.png
index cffd1dacc..cffd1dacc 100644
--- a/graphics/pokemon/icons/mew_icon.png
+++ b/graphics/pokemon/mew/icon.png
diff --git a/graphics/pokemon/palettes/mew_palette.pal b/graphics/pokemon/mew/normal.pal
index d9a50cdec..d9a50cdec 100644
--- a/graphics/pokemon/palettes/mew_palette.pal
+++ b/graphics/pokemon/mew/normal.pal
diff --git a/graphics/pokemon/palettes/mew_shiny_palette.pal b/graphics/pokemon/mew/shiny.pal
index 0bf72b2d8..0bf72b2d8 100644
--- a/graphics/pokemon/palettes/mew_shiny_palette.pal
+++ b/graphics/pokemon/mew/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mewtwo_front_pic.png b/graphics/pokemon/mewtwo/anim_front.png
index e3ef74e03..e3ef74e03 100644
--- a/graphics/pokemon/anim_front_pics/mewtwo_front_pic.png
+++ b/graphics/pokemon/mewtwo/anim_front.png
diff --git a/graphics/pokemon/back_pics/mewtwo_back_pic.png b/graphics/pokemon/mewtwo/back.png
index e466856e5..e466856e5 100644
--- a/graphics/pokemon/back_pics/mewtwo_back_pic.png
+++ b/graphics/pokemon/mewtwo/back.png
diff --git a/graphics/pokemon/footprints/mewtwo_footprint.png b/graphics/pokemon/mewtwo/footprint.png
index 0f7573dd3..0f7573dd3 100644
--- a/graphics/pokemon/footprints/mewtwo_footprint.png
+++ b/graphics/pokemon/mewtwo/footprint.png
diff --git a/graphics/pokemon/front_pics/mewtwo_still_front_pic.png b/graphics/pokemon/mewtwo/front.png
index 58aafc2d4..58aafc2d4 100644
--- a/graphics/pokemon/front_pics/mewtwo_still_front_pic.png
+++ b/graphics/pokemon/mewtwo/front.png
diff --git a/graphics/pokemon/icons/mewtwo_icon.png b/graphics/pokemon/mewtwo/icon.png
index 65f2aeec2..65f2aeec2 100644
--- a/graphics/pokemon/icons/mewtwo_icon.png
+++ b/graphics/pokemon/mewtwo/icon.png
diff --git a/graphics/pokemon/palettes/mewtwo_palette.pal b/graphics/pokemon/mewtwo/normal.pal
index 4afd3567e..4afd3567e 100644
--- a/graphics/pokemon/palettes/mewtwo_palette.pal
+++ b/graphics/pokemon/mewtwo/normal.pal
diff --git a/graphics/pokemon/palettes/mewtwo_shiny_palette.pal b/graphics/pokemon/mewtwo/shiny.pal
index c65c6c83e..c65c6c83e 100644
--- a/graphics/pokemon/palettes/mewtwo_shiny_palette.pal
+++ b/graphics/pokemon/mewtwo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mightyena_front_pic.png b/graphics/pokemon/mightyena/anim_front.png
index 494b7b23a..494b7b23a 100644
--- a/graphics/pokemon/anim_front_pics/mightyena_front_pic.png
+++ b/graphics/pokemon/mightyena/anim_front.png
diff --git a/graphics/pokemon/back_pics/mightyena_back_pic.png b/graphics/pokemon/mightyena/back.png
index 188562590..188562590 100644
--- a/graphics/pokemon/back_pics/mightyena_back_pic.png
+++ b/graphics/pokemon/mightyena/back.png
diff --git a/graphics/pokemon/footprints/mightyena_footprint.png b/graphics/pokemon/mightyena/footprint.png
index b39af65bc..b39af65bc 100644
--- a/graphics/pokemon/footprints/mightyena_footprint.png
+++ b/graphics/pokemon/mightyena/footprint.png
diff --git a/graphics/pokemon/front_pics/mightyena_still_front_pic.png b/graphics/pokemon/mightyena/front.png
index 16af4c021..16af4c021 100644
--- a/graphics/pokemon/front_pics/mightyena_still_front_pic.png
+++ b/graphics/pokemon/mightyena/front.png
diff --git a/graphics/pokemon/icons/mightyena_icon.png b/graphics/pokemon/mightyena/icon.png
index 3f9e61763..3f9e61763 100644
--- a/graphics/pokemon/icons/mightyena_icon.png
+++ b/graphics/pokemon/mightyena/icon.png
diff --git a/graphics/pokemon/palettes/mightyena_palette.pal b/graphics/pokemon/mightyena/normal.pal
index 42cdc8fc1..42cdc8fc1 100644
--- a/graphics/pokemon/palettes/mightyena_palette.pal
+++ b/graphics/pokemon/mightyena/normal.pal
diff --git a/graphics/pokemon/palettes/mightyena_shiny_palette.pal b/graphics/pokemon/mightyena/shiny.pal
index 7881952af..7881952af 100644
--- a/graphics/pokemon/palettes/mightyena_shiny_palette.pal
+++ b/graphics/pokemon/mightyena/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/milotic_front_pic.png b/graphics/pokemon/milotic/anim_front.png
index a80ed6f94..a80ed6f94 100644
--- a/graphics/pokemon/anim_front_pics/milotic_front_pic.png
+++ b/graphics/pokemon/milotic/anim_front.png
diff --git a/graphics/pokemon/back_pics/milotic_back_pic.png b/graphics/pokemon/milotic/back.png
index 5d91dfb63..5d91dfb63 100644
--- a/graphics/pokemon/back_pics/milotic_back_pic.png
+++ b/graphics/pokemon/milotic/back.png
diff --git a/graphics/pokemon/footprints/milotic_footprint.png b/graphics/pokemon/milotic/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/milotic_footprint.png
+++ b/graphics/pokemon/milotic/footprint.png
diff --git a/graphics/pokemon/front_pics/milotic_still_front_pic.png b/graphics/pokemon/milotic/front.png
index 82d683449..82d683449 100644
--- a/graphics/pokemon/front_pics/milotic_still_front_pic.png
+++ b/graphics/pokemon/milotic/front.png
diff --git a/graphics/pokemon/icons/milotic_icon.png b/graphics/pokemon/milotic/icon.png
index c1aa2ec8a..c1aa2ec8a 100644
--- a/graphics/pokemon/icons/milotic_icon.png
+++ b/graphics/pokemon/milotic/icon.png
diff --git a/graphics/pokemon/palettes/milotic_palette.pal b/graphics/pokemon/milotic/normal.pal
index df5cab01a..df5cab01a 100644
--- a/graphics/pokemon/palettes/milotic_palette.pal
+++ b/graphics/pokemon/milotic/normal.pal
diff --git a/graphics/pokemon/palettes/milotic_shiny_palette.pal b/graphics/pokemon/milotic/shiny.pal
index 8a57b80b2..8a57b80b2 100644
--- a/graphics/pokemon/palettes/milotic_shiny_palette.pal
+++ b/graphics/pokemon/milotic/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/miltank_front_pic.png b/graphics/pokemon/miltank/anim_front.png
index f702f1143..f702f1143 100644
--- a/graphics/pokemon/anim_front_pics/miltank_front_pic.png
+++ b/graphics/pokemon/miltank/anim_front.png
diff --git a/graphics/pokemon/back_pics/miltank_back_pic.png b/graphics/pokemon/miltank/back.png
index 0cf5b21e6..0cf5b21e6 100644
--- a/graphics/pokemon/back_pics/miltank_back_pic.png
+++ b/graphics/pokemon/miltank/back.png
diff --git a/graphics/pokemon/footprints/miltank_footprint.png b/graphics/pokemon/miltank/footprint.png
index a7162cd21..a7162cd21 100644
--- a/graphics/pokemon/footprints/miltank_footprint.png
+++ b/graphics/pokemon/miltank/footprint.png
diff --git a/graphics/pokemon/front_pics/miltank_still_front_pic.png b/graphics/pokemon/miltank/front.png
index 394b56fab..394b56fab 100644
--- a/graphics/pokemon/front_pics/miltank_still_front_pic.png
+++ b/graphics/pokemon/miltank/front.png
diff --git a/graphics/pokemon/icons/miltank_icon.png b/graphics/pokemon/miltank/icon.png
index ade9cad90..ade9cad90 100644
--- a/graphics/pokemon/icons/miltank_icon.png
+++ b/graphics/pokemon/miltank/icon.png
diff --git a/graphics/pokemon/palettes/miltank_palette.pal b/graphics/pokemon/miltank/normal.pal
index 105c67283..105c67283 100644
--- a/graphics/pokemon/palettes/miltank_palette.pal
+++ b/graphics/pokemon/miltank/normal.pal
diff --git a/graphics/pokemon/palettes/miltank_shiny_palette.pal b/graphics/pokemon/miltank/shiny.pal
index 7dcb6f2ee..7dcb6f2ee 100644
--- a/graphics/pokemon/palettes/miltank_shiny_palette.pal
+++ b/graphics/pokemon/miltank/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/minun_front_pic.png b/graphics/pokemon/minun/anim_front.png
index 3cd9688ba..3cd9688ba 100644
--- a/graphics/pokemon/anim_front_pics/minun_front_pic.png
+++ b/graphics/pokemon/minun/anim_front.png
diff --git a/graphics/pokemon/back_pics/minun_back_pic.png b/graphics/pokemon/minun/back.png
index 7c1377d59..7c1377d59 100644
--- a/graphics/pokemon/back_pics/minun_back_pic.png
+++ b/graphics/pokemon/minun/back.png
diff --git a/graphics/pokemon/footprints/minun_footprint.png b/graphics/pokemon/minun/footprint.png
index 1071b8069..1071b8069 100644
--- a/graphics/pokemon/footprints/minun_footprint.png
+++ b/graphics/pokemon/minun/footprint.png
diff --git a/graphics/pokemon/front_pics/minun_still_front_pic.png b/graphics/pokemon/minun/front.png
index 9b373c0a2..9b373c0a2 100644
--- a/graphics/pokemon/front_pics/minun_still_front_pic.png
+++ b/graphics/pokemon/minun/front.png
diff --git a/graphics/pokemon/icons/minun_icon.png b/graphics/pokemon/minun/icon.png
index 1aacd776a..1aacd776a 100644
--- a/graphics/pokemon/icons/minun_icon.png
+++ b/graphics/pokemon/minun/icon.png
diff --git a/graphics/pokemon/palettes/minun_palette.pal b/graphics/pokemon/minun/normal.pal
index 3ed8a19ee..3ed8a19ee 100644
--- a/graphics/pokemon/palettes/minun_palette.pal
+++ b/graphics/pokemon/minun/normal.pal
diff --git a/graphics/pokemon/palettes/minun_shiny_palette.pal b/graphics/pokemon/minun/shiny.pal
index db9c93534..db9c93534 100644
--- a/graphics/pokemon/palettes/minun_shiny_palette.pal
+++ b/graphics/pokemon/minun/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/misdreavus_front_pic.png b/graphics/pokemon/misdreavus/anim_front.png
index bd669637b..bd669637b 100644
--- a/graphics/pokemon/anim_front_pics/misdreavus_front_pic.png
+++ b/graphics/pokemon/misdreavus/anim_front.png
diff --git a/graphics/pokemon/back_pics/misdreavus_back_pic.png b/graphics/pokemon/misdreavus/back.png
index 44b44a3ff..44b44a3ff 100644
--- a/graphics/pokemon/back_pics/misdreavus_back_pic.png
+++ b/graphics/pokemon/misdreavus/back.png
diff --git a/graphics/pokemon/footprints/misdreavus_footprint.png b/graphics/pokemon/misdreavus/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/misdreavus_footprint.png
+++ b/graphics/pokemon/misdreavus/footprint.png
diff --git a/graphics/pokemon/front_pics/misdreavus_still_front_pic.png b/graphics/pokemon/misdreavus/front.png
index 135f6969b..135f6969b 100644
--- a/graphics/pokemon/front_pics/misdreavus_still_front_pic.png
+++ b/graphics/pokemon/misdreavus/front.png
diff --git a/graphics/pokemon/icons/misdreavus_icon.png b/graphics/pokemon/misdreavus/icon.png
index bbe121b91..bbe121b91 100644
--- a/graphics/pokemon/icons/misdreavus_icon.png
+++ b/graphics/pokemon/misdreavus/icon.png
diff --git a/graphics/pokemon/palettes/misdreavus_palette.pal b/graphics/pokemon/misdreavus/normal.pal
index c57ab5ea7..c57ab5ea7 100644
--- a/graphics/pokemon/palettes/misdreavus_palette.pal
+++ b/graphics/pokemon/misdreavus/normal.pal
diff --git a/graphics/pokemon/palettes/misdreavus_shiny_palette.pal b/graphics/pokemon/misdreavus/shiny.pal
index 8814515be..8814515be 100644
--- a/graphics/pokemon/palettes/misdreavus_shiny_palette.pal
+++ b/graphics/pokemon/misdreavus/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/moltres_front_pic.png b/graphics/pokemon/moltres/anim_front.png
index 2f49fe6a7..2f49fe6a7 100644
--- a/graphics/pokemon/anim_front_pics/moltres_front_pic.png
+++ b/graphics/pokemon/moltres/anim_front.png
diff --git a/graphics/pokemon/back_pics/moltres_back_pic.png b/graphics/pokemon/moltres/back.png
index 11ed8ced8..11ed8ced8 100644
--- a/graphics/pokemon/back_pics/moltres_back_pic.png
+++ b/graphics/pokemon/moltres/back.png
diff --git a/graphics/pokemon/footprints/moltres_footprint.png b/graphics/pokemon/moltres/footprint.png
index 3900403bd..3900403bd 100644
--- a/graphics/pokemon/footprints/moltres_footprint.png
+++ b/graphics/pokemon/moltres/footprint.png
diff --git a/graphics/pokemon/front_pics/moltres_still_front_pic.png b/graphics/pokemon/moltres/front.png
index d07fc056f..d07fc056f 100644
--- a/graphics/pokemon/front_pics/moltres_still_front_pic.png
+++ b/graphics/pokemon/moltres/front.png
diff --git a/graphics/pokemon/icons/moltres_icon.png b/graphics/pokemon/moltres/icon.png
index e15d2164a..e15d2164a 100644
--- a/graphics/pokemon/icons/moltres_icon.png
+++ b/graphics/pokemon/moltres/icon.png
diff --git a/graphics/pokemon/palettes/moltres_palette.pal b/graphics/pokemon/moltres/normal.pal
index b27f7cdac..b27f7cdac 100644
--- a/graphics/pokemon/palettes/moltres_palette.pal
+++ b/graphics/pokemon/moltres/normal.pal
diff --git a/graphics/pokemon/palettes/moltres_shiny_palette.pal b/graphics/pokemon/moltres/shiny.pal
index b289551aa..b289551aa 100644
--- a/graphics/pokemon/palettes/moltres_shiny_palette.pal
+++ b/graphics/pokemon/moltres/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mr_mime_front_pic.png b/graphics/pokemon/mr_mime/anim_front.png
index 710145fef..710145fef 100644
--- a/graphics/pokemon/anim_front_pics/mr_mime_front_pic.png
+++ b/graphics/pokemon/mr_mime/anim_front.png
diff --git a/graphics/pokemon/back_pics/mr_mime_back_pic.png b/graphics/pokemon/mr_mime/back.png
index 129fbb4e2..129fbb4e2 100644
--- a/graphics/pokemon/back_pics/mr_mime_back_pic.png
+++ b/graphics/pokemon/mr_mime/back.png
diff --git a/graphics/pokemon/footprints/mr_mime_footprint.png b/graphics/pokemon/mr_mime/footprint.png
index cb0aff1a3..cb0aff1a3 100644
--- a/graphics/pokemon/footprints/mr_mime_footprint.png
+++ b/graphics/pokemon/mr_mime/footprint.png
diff --git a/graphics/pokemon/front_pics/mr_mime_still_front_pic.png b/graphics/pokemon/mr_mime/front.png
index c8f107911..c8f107911 100644
--- a/graphics/pokemon/front_pics/mr_mime_still_front_pic.png
+++ b/graphics/pokemon/mr_mime/front.png
diff --git a/graphics/pokemon/icons/mr_mime_icon.png b/graphics/pokemon/mr_mime/icon.png
index b1e3b2bfb..b1e3b2bfb 100644
--- a/graphics/pokemon/icons/mr_mime_icon.png
+++ b/graphics/pokemon/mr_mime/icon.png
diff --git a/graphics/pokemon/palettes/mr_mime_palette.pal b/graphics/pokemon/mr_mime/normal.pal
index 269bf45ed..269bf45ed 100644
--- a/graphics/pokemon/palettes/mr_mime_palette.pal
+++ b/graphics/pokemon/mr_mime/normal.pal
diff --git a/graphics/pokemon/palettes/mr_mime_shiny_palette.pal b/graphics/pokemon/mr_mime/shiny.pal
index c20f8dbf4..c20f8dbf4 100644
--- a/graphics/pokemon/palettes/mr_mime_shiny_palette.pal
+++ b/graphics/pokemon/mr_mime/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/mudkip_front_pic.png b/graphics/pokemon/mudkip/anim_front.png
index 712f3ce5a..712f3ce5a 100644
--- a/graphics/pokemon/anim_front_pics/mudkip_front_pic.png
+++ b/graphics/pokemon/mudkip/anim_front.png
diff --git a/graphics/pokemon/back_pics/mudkip_back_pic.png b/graphics/pokemon/mudkip/back.png
index 1b1282d42..1b1282d42 100644
--- a/graphics/pokemon/back_pics/mudkip_back_pic.png
+++ b/graphics/pokemon/mudkip/back.png
diff --git a/graphics/pokemon/footprints/mudkip_footprint.png b/graphics/pokemon/mudkip/footprint.png
index 490db6e25..490db6e25 100644
--- a/graphics/pokemon/footprints/mudkip_footprint.png
+++ b/graphics/pokemon/mudkip/footprint.png
diff --git a/graphics/pokemon/front_pics/mudkip_still_front_pic.png b/graphics/pokemon/mudkip/front.png
index 15405baf9..15405baf9 100644
--- a/graphics/pokemon/front_pics/mudkip_still_front_pic.png
+++ b/graphics/pokemon/mudkip/front.png
diff --git a/graphics/pokemon/icons/mudkip_icon.png b/graphics/pokemon/mudkip/icon.png
index 5a657aa91..5a657aa91 100644
--- a/graphics/pokemon/icons/mudkip_icon.png
+++ b/graphics/pokemon/mudkip/icon.png
diff --git a/graphics/pokemon/palettes/mudkip_palette.pal b/graphics/pokemon/mudkip/normal.pal
index bc3cc1b65..bc3cc1b65 100644
--- a/graphics/pokemon/palettes/mudkip_palette.pal
+++ b/graphics/pokemon/mudkip/normal.pal
diff --git a/graphics/pokemon/palettes/mudkip_shiny_palette.pal b/graphics/pokemon/mudkip/shiny.pal
index ef5447b60..ef5447b60 100644
--- a/graphics/pokemon/palettes/mudkip_shiny_palette.pal
+++ b/graphics/pokemon/mudkip/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/muk_front_pic.png b/graphics/pokemon/muk/anim_front.png
index 3ac15d0d0..3ac15d0d0 100644
--- a/graphics/pokemon/anim_front_pics/muk_front_pic.png
+++ b/graphics/pokemon/muk/anim_front.png
diff --git a/graphics/pokemon/back_pics/muk_back_pic.png b/graphics/pokemon/muk/back.png
index f91c8ca5e..f91c8ca5e 100644
--- a/graphics/pokemon/back_pics/muk_back_pic.png
+++ b/graphics/pokemon/muk/back.png
diff --git a/graphics/pokemon/footprints/muk_footprint.png b/graphics/pokemon/muk/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/muk_footprint.png
+++ b/graphics/pokemon/muk/footprint.png
diff --git a/graphics/pokemon/front_pics/muk_still_front_pic.png b/graphics/pokemon/muk/front.png
index d176c85ab..d176c85ab 100644
--- a/graphics/pokemon/front_pics/muk_still_front_pic.png
+++ b/graphics/pokemon/muk/front.png
diff --git a/graphics/pokemon/icons/muk_icon.png b/graphics/pokemon/muk/icon.png
index 6d8d09350..6d8d09350 100644
--- a/graphics/pokemon/icons/muk_icon.png
+++ b/graphics/pokemon/muk/icon.png
diff --git a/graphics/pokemon/palettes/muk_palette.pal b/graphics/pokemon/muk/normal.pal
index 3a7db5d6c..3a7db5d6c 100644
--- a/graphics/pokemon/palettes/muk_palette.pal
+++ b/graphics/pokemon/muk/normal.pal
diff --git a/graphics/pokemon/palettes/muk_shiny_palette.pal b/graphics/pokemon/muk/shiny.pal
index 98e322878..98e322878 100644
--- a/graphics/pokemon/palettes/muk_shiny_palette.pal
+++ b/graphics/pokemon/muk/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/murkrow_front_pic.png b/graphics/pokemon/murkrow/anim_front.png
index 85282ee7e..85282ee7e 100644
--- a/graphics/pokemon/anim_front_pics/murkrow_front_pic.png
+++ b/graphics/pokemon/murkrow/anim_front.png
diff --git a/graphics/pokemon/back_pics/murkrow_back_pic.png b/graphics/pokemon/murkrow/back.png
index 3007b7643..3007b7643 100644
--- a/graphics/pokemon/back_pics/murkrow_back_pic.png
+++ b/graphics/pokemon/murkrow/back.png
diff --git a/graphics/pokemon/footprints/murkrow_footprint.png b/graphics/pokemon/murkrow/footprint.png
index 0f0566834..0f0566834 100644
--- a/graphics/pokemon/footprints/murkrow_footprint.png
+++ b/graphics/pokemon/murkrow/footprint.png
diff --git a/graphics/pokemon/front_pics/murkrow_still_front_pic.png b/graphics/pokemon/murkrow/front.png
index 77c11fef2..77c11fef2 100644
--- a/graphics/pokemon/front_pics/murkrow_still_front_pic.png
+++ b/graphics/pokemon/murkrow/front.png
diff --git a/graphics/pokemon/icons/murkrow_icon.png b/graphics/pokemon/murkrow/icon.png
index eac91aa18..eac91aa18 100644
--- a/graphics/pokemon/icons/murkrow_icon.png
+++ b/graphics/pokemon/murkrow/icon.png
diff --git a/graphics/pokemon/palettes/murkrow_palette.pal b/graphics/pokemon/murkrow/normal.pal
index 1d8b5f991..1d8b5f991 100644
--- a/graphics/pokemon/palettes/murkrow_palette.pal
+++ b/graphics/pokemon/murkrow/normal.pal
diff --git a/graphics/pokemon/palettes/murkrow_shiny_palette.pal b/graphics/pokemon/murkrow/shiny.pal
index 4524256e4..4524256e4 100644
--- a/graphics/pokemon/palettes/murkrow_shiny_palette.pal
+++ b/graphics/pokemon/murkrow/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/natu_front_pic.png b/graphics/pokemon/natu/anim_front.png
index 02e1e7894..02e1e7894 100644
--- a/graphics/pokemon/anim_front_pics/natu_front_pic.png
+++ b/graphics/pokemon/natu/anim_front.png
diff --git a/graphics/pokemon/back_pics/natu_back_pic.png b/graphics/pokemon/natu/back.png
index 0349877d5..0349877d5 100644
--- a/graphics/pokemon/back_pics/natu_back_pic.png
+++ b/graphics/pokemon/natu/back.png
diff --git a/graphics/pokemon/footprints/natu_footprint.png b/graphics/pokemon/natu/footprint.png
index f17821fc0..f17821fc0 100644
--- a/graphics/pokemon/footprints/natu_footprint.png
+++ b/graphics/pokemon/natu/footprint.png
diff --git a/graphics/pokemon/front_pics/natu_still_front_pic.png b/graphics/pokemon/natu/front.png
index b25742d8e..b25742d8e 100644
--- a/graphics/pokemon/front_pics/natu_still_front_pic.png
+++ b/graphics/pokemon/natu/front.png
diff --git a/graphics/pokemon/icons/natu_icon.png b/graphics/pokemon/natu/icon.png
index 7188fb7f3..7188fb7f3 100644
--- a/graphics/pokemon/icons/natu_icon.png
+++ b/graphics/pokemon/natu/icon.png
diff --git a/graphics/pokemon/palettes/natu_palette.pal b/graphics/pokemon/natu/normal.pal
index c1712ee1e..c1712ee1e 100644
--- a/graphics/pokemon/palettes/natu_palette.pal
+++ b/graphics/pokemon/natu/normal.pal
diff --git a/graphics/pokemon/palettes/natu_shiny_palette.pal b/graphics/pokemon/natu/shiny.pal
index 2dcf957e9..2dcf957e9 100644
--- a/graphics/pokemon/palettes/natu_shiny_palette.pal
+++ b/graphics/pokemon/natu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidoking_front_pic.png b/graphics/pokemon/nidoking/anim_front.png
index be45df265..be45df265 100644
--- a/graphics/pokemon/anim_front_pics/nidoking_front_pic.png
+++ b/graphics/pokemon/nidoking/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidoking_back_pic.png b/graphics/pokemon/nidoking/back.png
index 65a253b45..65a253b45 100644
--- a/graphics/pokemon/back_pics/nidoking_back_pic.png
+++ b/graphics/pokemon/nidoking/back.png
diff --git a/graphics/pokemon/footprints/nidoking_footprint.png b/graphics/pokemon/nidoking/footprint.png
index 577e14f30..577e14f30 100644
--- a/graphics/pokemon/footprints/nidoking_footprint.png
+++ b/graphics/pokemon/nidoking/footprint.png
diff --git a/graphics/pokemon/front_pics/nidoking_still_front_pic.png b/graphics/pokemon/nidoking/front.png
index 76e60c3dc..76e60c3dc 100644
--- a/graphics/pokemon/front_pics/nidoking_still_front_pic.png
+++ b/graphics/pokemon/nidoking/front.png
diff --git a/graphics/pokemon/icons/nidoking_icon.png b/graphics/pokemon/nidoking/icon.png
index baa05c6a0..baa05c6a0 100644
--- a/graphics/pokemon/icons/nidoking_icon.png
+++ b/graphics/pokemon/nidoking/icon.png
diff --git a/graphics/pokemon/palettes/nidoking_palette.pal b/graphics/pokemon/nidoking/normal.pal
index ccde781ae..ccde781ae 100644
--- a/graphics/pokemon/palettes/nidoking_palette.pal
+++ b/graphics/pokemon/nidoking/normal.pal
diff --git a/graphics/pokemon/palettes/nidoking_shiny_palette.pal b/graphics/pokemon/nidoking/shiny.pal
index 021b228e9..021b228e9 100644
--- a/graphics/pokemon/palettes/nidoking_shiny_palette.pal
+++ b/graphics/pokemon/nidoking/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidoqueen_front_pic.png b/graphics/pokemon/nidoqueen/anim_front.png
index db2af8d12..db2af8d12 100644
--- a/graphics/pokemon/anim_front_pics/nidoqueen_front_pic.png
+++ b/graphics/pokemon/nidoqueen/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidoqueen_back_pic.png b/graphics/pokemon/nidoqueen/back.png
index 339582c54..339582c54 100644
--- a/graphics/pokemon/back_pics/nidoqueen_back_pic.png
+++ b/graphics/pokemon/nidoqueen/back.png
diff --git a/graphics/pokemon/footprints/nidoqueen_footprint.png b/graphics/pokemon/nidoqueen/footprint.png
index c3156e621..c3156e621 100644
--- a/graphics/pokemon/footprints/nidoqueen_footprint.png
+++ b/graphics/pokemon/nidoqueen/footprint.png
diff --git a/graphics/pokemon/front_pics/nidoqueen_still_front_pic.png b/graphics/pokemon/nidoqueen/front.png
index 0eded68d9..0eded68d9 100644
--- a/graphics/pokemon/front_pics/nidoqueen_still_front_pic.png
+++ b/graphics/pokemon/nidoqueen/front.png
diff --git a/graphics/pokemon/icons/nidoqueen_icon.png b/graphics/pokemon/nidoqueen/icon.png
index 2d3cdc477..2d3cdc477 100644
--- a/graphics/pokemon/icons/nidoqueen_icon.png
+++ b/graphics/pokemon/nidoqueen/icon.png
diff --git a/graphics/pokemon/palettes/nidoqueen_palette.pal b/graphics/pokemon/nidoqueen/normal.pal
index ac8d604c0..ac8d604c0 100644
--- a/graphics/pokemon/palettes/nidoqueen_palette.pal
+++ b/graphics/pokemon/nidoqueen/normal.pal
diff --git a/graphics/pokemon/palettes/nidoqueen_shiny_palette.pal b/graphics/pokemon/nidoqueen/shiny.pal
index 1795131dc..1795131dc 100644
--- a/graphics/pokemon/palettes/nidoqueen_shiny_palette.pal
+++ b/graphics/pokemon/nidoqueen/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidoran_f_front_pic.png b/graphics/pokemon/nidoran_f/anim_front.png
index 57c6b0056..57c6b0056 100644
--- a/graphics/pokemon/anim_front_pics/nidoran_f_front_pic.png
+++ b/graphics/pokemon/nidoran_f/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidoran_f_back_pic.png b/graphics/pokemon/nidoran_f/back.png
index 5173e952e..5173e952e 100644
--- a/graphics/pokemon/back_pics/nidoran_f_back_pic.png
+++ b/graphics/pokemon/nidoran_f/back.png
diff --git a/graphics/pokemon/footprints/nidoran_f_footprint.png b/graphics/pokemon/nidoran_f/footprint.png
index f673df112..f673df112 100644
--- a/graphics/pokemon/footprints/nidoran_f_footprint.png
+++ b/graphics/pokemon/nidoran_f/footprint.png
diff --git a/graphics/pokemon/front_pics/nidoran_f_still_front_pic.png b/graphics/pokemon/nidoran_f/front.png
index ca1d7b1da..ca1d7b1da 100644
--- a/graphics/pokemon/front_pics/nidoran_f_still_front_pic.png
+++ b/graphics/pokemon/nidoran_f/front.png
diff --git a/graphics/pokemon/icons/nidoran_f_icon.png b/graphics/pokemon/nidoran_f/icon.png
index a2483ae63..a2483ae63 100644
--- a/graphics/pokemon/icons/nidoran_f_icon.png
+++ b/graphics/pokemon/nidoran_f/icon.png
diff --git a/graphics/pokemon/palettes/nidoran_f_palette.pal b/graphics/pokemon/nidoran_f/normal.pal
index daed29569..daed29569 100644
--- a/graphics/pokemon/palettes/nidoran_f_palette.pal
+++ b/graphics/pokemon/nidoran_f/normal.pal
diff --git a/graphics/pokemon/palettes/nidoran_f_shiny_palette.pal b/graphics/pokemon/nidoran_f/shiny.pal
index 5b6e230fe..5b6e230fe 100644
--- a/graphics/pokemon/palettes/nidoran_f_shiny_palette.pal
+++ b/graphics/pokemon/nidoran_f/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidoran_m_front_pic.png b/graphics/pokemon/nidoran_m/anim_front.png
index 84e9aa98e..84e9aa98e 100644
--- a/graphics/pokemon/anim_front_pics/nidoran_m_front_pic.png
+++ b/graphics/pokemon/nidoran_m/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidoran_m_back_pic.png b/graphics/pokemon/nidoran_m/back.png
index 76c47d33e..76c47d33e 100644
--- a/graphics/pokemon/back_pics/nidoran_m_back_pic.png
+++ b/graphics/pokemon/nidoran_m/back.png
diff --git a/graphics/pokemon/footprints/nidoran_m_footprint.png b/graphics/pokemon/nidoran_m/footprint.png
index 874c60781..874c60781 100644
--- a/graphics/pokemon/footprints/nidoran_m_footprint.png
+++ b/graphics/pokemon/nidoran_m/footprint.png
diff --git a/graphics/pokemon/front_pics/nidoran_m_still_front_pic.png b/graphics/pokemon/nidoran_m/front.png
index 893c9c3d2..893c9c3d2 100644
--- a/graphics/pokemon/front_pics/nidoran_m_still_front_pic.png
+++ b/graphics/pokemon/nidoran_m/front.png
diff --git a/graphics/pokemon/icons/nidoran_m_icon.png b/graphics/pokemon/nidoran_m/icon.png
index 4467c5192..4467c5192 100644
--- a/graphics/pokemon/icons/nidoran_m_icon.png
+++ b/graphics/pokemon/nidoran_m/icon.png
diff --git a/graphics/pokemon/palettes/nidoran_m_palette.pal b/graphics/pokemon/nidoran_m/normal.pal
index 7dd064edb..7dd064edb 100644
--- a/graphics/pokemon/palettes/nidoran_m_palette.pal
+++ b/graphics/pokemon/nidoran_m/normal.pal
diff --git a/graphics/pokemon/palettes/nidoran_m_shiny_palette.pal b/graphics/pokemon/nidoran_m/shiny.pal
index 41901c9ff..41901c9ff 100644
--- a/graphics/pokemon/palettes/nidoran_m_shiny_palette.pal
+++ b/graphics/pokemon/nidoran_m/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidorina_front_pic.png b/graphics/pokemon/nidorina/anim_front.png
index 8b33e786b..8b33e786b 100644
--- a/graphics/pokemon/anim_front_pics/nidorina_front_pic.png
+++ b/graphics/pokemon/nidorina/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidorina_back_pic.png b/graphics/pokemon/nidorina/back.png
index 14940d21f..14940d21f 100644
--- a/graphics/pokemon/back_pics/nidorina_back_pic.png
+++ b/graphics/pokemon/nidorina/back.png
diff --git a/graphics/pokemon/footprints/nidorina_footprint.png b/graphics/pokemon/nidorina/footprint.png
index 94553054a..94553054a 100644
--- a/graphics/pokemon/footprints/nidorina_footprint.png
+++ b/graphics/pokemon/nidorina/footprint.png
diff --git a/graphics/pokemon/front_pics/nidorina_still_front_pic.png b/graphics/pokemon/nidorina/front.png
index 85cbed8b4..85cbed8b4 100644
--- a/graphics/pokemon/front_pics/nidorina_still_front_pic.png
+++ b/graphics/pokemon/nidorina/front.png
diff --git a/graphics/pokemon/icons/nidorina_icon.png b/graphics/pokemon/nidorina/icon.png
index ad90d02ba..ad90d02ba 100644
--- a/graphics/pokemon/icons/nidorina_icon.png
+++ b/graphics/pokemon/nidorina/icon.png
diff --git a/graphics/pokemon/palettes/nidorina_palette.pal b/graphics/pokemon/nidorina/normal.pal
index 9f4acf8be..9f4acf8be 100644
--- a/graphics/pokemon/palettes/nidorina_palette.pal
+++ b/graphics/pokemon/nidorina/normal.pal
diff --git a/graphics/pokemon/palettes/nidorina_shiny_palette.pal b/graphics/pokemon/nidorina/shiny.pal
index 634e882d9..634e882d9 100644
--- a/graphics/pokemon/palettes/nidorina_shiny_palette.pal
+++ b/graphics/pokemon/nidorina/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nidorino_front_pic.png b/graphics/pokemon/nidorino/anim_front.png
index a048b8b06..a048b8b06 100644
--- a/graphics/pokemon/anim_front_pics/nidorino_front_pic.png
+++ b/graphics/pokemon/nidorino/anim_front.png
diff --git a/graphics/pokemon/back_pics/nidorino_back_pic.png b/graphics/pokemon/nidorino/back.png
index 01b866e00..01b866e00 100644
--- a/graphics/pokemon/back_pics/nidorino_back_pic.png
+++ b/graphics/pokemon/nidorino/back.png
diff --git a/graphics/pokemon/footprints/nidorino_footprint.png b/graphics/pokemon/nidorino/footprint.png
index eaa67b379..eaa67b379 100644
--- a/graphics/pokemon/footprints/nidorino_footprint.png
+++ b/graphics/pokemon/nidorino/footprint.png
diff --git a/graphics/pokemon/front_pics/nidorino_still_front_pic.png b/graphics/pokemon/nidorino/front.png
index 81045ffca..81045ffca 100644
--- a/graphics/pokemon/front_pics/nidorino_still_front_pic.png
+++ b/graphics/pokemon/nidorino/front.png
diff --git a/graphics/pokemon/icons/nidorino_icon.png b/graphics/pokemon/nidorino/icon.png
index 5edc103c1..5edc103c1 100644
--- a/graphics/pokemon/icons/nidorino_icon.png
+++ b/graphics/pokemon/nidorino/icon.png
diff --git a/graphics/pokemon/palettes/nidorino_palette.pal b/graphics/pokemon/nidorino/normal.pal
index b0b728608..b0b728608 100644
--- a/graphics/pokemon/palettes/nidorino_palette.pal
+++ b/graphics/pokemon/nidorino/normal.pal
diff --git a/graphics/pokemon/palettes/nidorino_shiny_palette.pal b/graphics/pokemon/nidorino/shiny.pal
index 97b3c368f..97b3c368f 100644
--- a/graphics/pokemon/palettes/nidorino_shiny_palette.pal
+++ b/graphics/pokemon/nidorino/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nincada_front_pic.png b/graphics/pokemon/nincada/anim_front.png
index 35ba5c5b4..35ba5c5b4 100644
--- a/graphics/pokemon/anim_front_pics/nincada_front_pic.png
+++ b/graphics/pokemon/nincada/anim_front.png
diff --git a/graphics/pokemon/back_pics/nincada_back_pic.png b/graphics/pokemon/nincada/back.png
index e35b19cc7..e35b19cc7 100644
--- a/graphics/pokemon/back_pics/nincada_back_pic.png
+++ b/graphics/pokemon/nincada/back.png
diff --git a/graphics/pokemon/footprints/nincada_footprint.png b/graphics/pokemon/nincada/footprint.png
index deea05721..deea05721 100644
--- a/graphics/pokemon/footprints/nincada_footprint.png
+++ b/graphics/pokemon/nincada/footprint.png
diff --git a/graphics/pokemon/front_pics/nincada_still_front_pic.png b/graphics/pokemon/nincada/front.png
index 576144c48..576144c48 100644
--- a/graphics/pokemon/front_pics/nincada_still_front_pic.png
+++ b/graphics/pokemon/nincada/front.png
diff --git a/graphics/pokemon/icons/nincada_icon.png b/graphics/pokemon/nincada/icon.png
index 003ddb992..003ddb992 100644
--- a/graphics/pokemon/icons/nincada_icon.png
+++ b/graphics/pokemon/nincada/icon.png
diff --git a/graphics/pokemon/palettes/nincada_palette.pal b/graphics/pokemon/nincada/normal.pal
index 22184bbbd..22184bbbd 100644
--- a/graphics/pokemon/palettes/nincada_palette.pal
+++ b/graphics/pokemon/nincada/normal.pal
diff --git a/graphics/pokemon/palettes/nincada_shiny_palette.pal b/graphics/pokemon/nincada/shiny.pal
index 08e4c9575..08e4c9575 100644
--- a/graphics/pokemon/palettes/nincada_shiny_palette.pal
+++ b/graphics/pokemon/nincada/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ninetales_front_pic.png b/graphics/pokemon/ninetales/anim_front.png
index afd4cc40d..afd4cc40d 100644
--- a/graphics/pokemon/anim_front_pics/ninetales_front_pic.png
+++ b/graphics/pokemon/ninetales/anim_front.png
diff --git a/graphics/pokemon/back_pics/ninetales_back_pic.png b/graphics/pokemon/ninetales/back.png
index 03d8a214f..03d8a214f 100644
--- a/graphics/pokemon/back_pics/ninetales_back_pic.png
+++ b/graphics/pokemon/ninetales/back.png
diff --git a/graphics/pokemon/footprints/ninetales_footprint.png b/graphics/pokemon/ninetales/footprint.png
index 3f1f0247e..3f1f0247e 100644
--- a/graphics/pokemon/footprints/ninetales_footprint.png
+++ b/graphics/pokemon/ninetales/footprint.png
diff --git a/graphics/pokemon/front_pics/ninetales_still_front_pic.png b/graphics/pokemon/ninetales/front.png
index d8c2a6746..d8c2a6746 100644
--- a/graphics/pokemon/front_pics/ninetales_still_front_pic.png
+++ b/graphics/pokemon/ninetales/front.png
diff --git a/graphics/pokemon/icons/ninetales_icon.png b/graphics/pokemon/ninetales/icon.png
index 1a74d34eb..1a74d34eb 100644
--- a/graphics/pokemon/icons/ninetales_icon.png
+++ b/graphics/pokemon/ninetales/icon.png
diff --git a/graphics/pokemon/palettes/ninetales_palette.pal b/graphics/pokemon/ninetales/normal.pal
index d6d95a7d3..d6d95a7d3 100644
--- a/graphics/pokemon/palettes/ninetales_palette.pal
+++ b/graphics/pokemon/ninetales/normal.pal
diff --git a/graphics/pokemon/palettes/ninetales_shiny_palette.pal b/graphics/pokemon/ninetales/shiny.pal
index 736e5d374..736e5d374 100644
--- a/graphics/pokemon/palettes/ninetales_shiny_palette.pal
+++ b/graphics/pokemon/ninetales/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ninjask_front_pic.png b/graphics/pokemon/ninjask/anim_front.png
index fda03f09c..fda03f09c 100644
--- a/graphics/pokemon/anim_front_pics/ninjask_front_pic.png
+++ b/graphics/pokemon/ninjask/anim_front.png
diff --git a/graphics/pokemon/back_pics/ninjask_back_pic.png b/graphics/pokemon/ninjask/back.png
index fd2daf29a..fd2daf29a 100644
--- a/graphics/pokemon/back_pics/ninjask_back_pic.png
+++ b/graphics/pokemon/ninjask/back.png
diff --git a/graphics/pokemon/footprints/ninjask_footprint.png b/graphics/pokemon/ninjask/footprint.png
index eacba16dc..eacba16dc 100644
--- a/graphics/pokemon/footprints/ninjask_footprint.png
+++ b/graphics/pokemon/ninjask/footprint.png
diff --git a/graphics/pokemon/front_pics/ninjask_still_front_pic.png b/graphics/pokemon/ninjask/front.png
index c642dbad5..c642dbad5 100644
--- a/graphics/pokemon/front_pics/ninjask_still_front_pic.png
+++ b/graphics/pokemon/ninjask/front.png
diff --git a/graphics/pokemon/icons/ninjask_icon.png b/graphics/pokemon/ninjask/icon.png
index c51533c67..c51533c67 100644
--- a/graphics/pokemon/icons/ninjask_icon.png
+++ b/graphics/pokemon/ninjask/icon.png
diff --git a/graphics/pokemon/palettes/ninjask_palette.pal b/graphics/pokemon/ninjask/normal.pal
index ec7c1daa7..ec7c1daa7 100644
--- a/graphics/pokemon/palettes/ninjask_palette.pal
+++ b/graphics/pokemon/ninjask/normal.pal
diff --git a/graphics/pokemon/palettes/ninjask_shiny_palette.pal b/graphics/pokemon/ninjask/shiny.pal
index bd2fbbda9..bd2fbbda9 100644
--- a/graphics/pokemon/palettes/ninjask_shiny_palette.pal
+++ b/graphics/pokemon/ninjask/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/noctowl_front_pic.png b/graphics/pokemon/noctowl/anim_front.png
index 7053bd201..7053bd201 100644
--- a/graphics/pokemon/anim_front_pics/noctowl_front_pic.png
+++ b/graphics/pokemon/noctowl/anim_front.png
diff --git a/graphics/pokemon/back_pics/noctowl_back_pic.png b/graphics/pokemon/noctowl/back.png
index e9984ea5e..e9984ea5e 100644
--- a/graphics/pokemon/back_pics/noctowl_back_pic.png
+++ b/graphics/pokemon/noctowl/back.png
diff --git a/graphics/pokemon/footprints/noctowl_footprint.png b/graphics/pokemon/noctowl/footprint.png
index 89ed409e9..89ed409e9 100644
--- a/graphics/pokemon/footprints/noctowl_footprint.png
+++ b/graphics/pokemon/noctowl/footprint.png
diff --git a/graphics/pokemon/front_pics/noctowl_still_front_pic.png b/graphics/pokemon/noctowl/front.png
index 56e148d94..56e148d94 100644
--- a/graphics/pokemon/front_pics/noctowl_still_front_pic.png
+++ b/graphics/pokemon/noctowl/front.png
diff --git a/graphics/pokemon/icons/noctowl_icon.png b/graphics/pokemon/noctowl/icon.png
index eafbea37e..eafbea37e 100644
--- a/graphics/pokemon/icons/noctowl_icon.png
+++ b/graphics/pokemon/noctowl/icon.png
diff --git a/graphics/pokemon/palettes/noctowl_palette.pal b/graphics/pokemon/noctowl/normal.pal
index 710759236..710759236 100644
--- a/graphics/pokemon/palettes/noctowl_palette.pal
+++ b/graphics/pokemon/noctowl/normal.pal
diff --git a/graphics/pokemon/palettes/noctowl_shiny_palette.pal b/graphics/pokemon/noctowl/shiny.pal
index 859222f59..859222f59 100644
--- a/graphics/pokemon/palettes/noctowl_shiny_palette.pal
+++ b/graphics/pokemon/noctowl/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nosepass_front_pic.png b/graphics/pokemon/nosepass/anim_front.png
index 4b7f7b362..4b7f7b362 100644
--- a/graphics/pokemon/anim_front_pics/nosepass_front_pic.png
+++ b/graphics/pokemon/nosepass/anim_front.png
diff --git a/graphics/pokemon/back_pics/nosepass_back_pic.png b/graphics/pokemon/nosepass/back.png
index 21b41a3cd..21b41a3cd 100644
--- a/graphics/pokemon/back_pics/nosepass_back_pic.png
+++ b/graphics/pokemon/nosepass/back.png
diff --git a/graphics/pokemon/footprints/nosepass_footprint.png b/graphics/pokemon/nosepass/footprint.png
index 9b9ad2708..9b9ad2708 100644
--- a/graphics/pokemon/footprints/nosepass_footprint.png
+++ b/graphics/pokemon/nosepass/footprint.png
diff --git a/graphics/pokemon/front_pics/nosepass_still_front_pic.png b/graphics/pokemon/nosepass/front.png
index 5ed3a851f..5ed3a851f 100644
--- a/graphics/pokemon/front_pics/nosepass_still_front_pic.png
+++ b/graphics/pokemon/nosepass/front.png
diff --git a/graphics/pokemon/icons/nosepass_icon.png b/graphics/pokemon/nosepass/icon.png
index 718fed8fa..718fed8fa 100644
--- a/graphics/pokemon/icons/nosepass_icon.png
+++ b/graphics/pokemon/nosepass/icon.png
diff --git a/graphics/pokemon/palettes/nosepass_palette.pal b/graphics/pokemon/nosepass/normal.pal
index ec3681288..ec3681288 100644
--- a/graphics/pokemon/palettes/nosepass_palette.pal
+++ b/graphics/pokemon/nosepass/normal.pal
diff --git a/graphics/pokemon/palettes/nosepass_shiny_palette.pal b/graphics/pokemon/nosepass/shiny.pal
index b17260e5a..b17260e5a 100644
--- a/graphics/pokemon/palettes/nosepass_shiny_palette.pal
+++ b/graphics/pokemon/nosepass/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/numel_front_pic.png b/graphics/pokemon/numel/anim_front.png
index 0d3ccc839..0d3ccc839 100644
--- a/graphics/pokemon/anim_front_pics/numel_front_pic.png
+++ b/graphics/pokemon/numel/anim_front.png
diff --git a/graphics/pokemon/back_pics/numel_back_pic.png b/graphics/pokemon/numel/back.png
index 9722ff438..9722ff438 100644
--- a/graphics/pokemon/back_pics/numel_back_pic.png
+++ b/graphics/pokemon/numel/back.png
diff --git a/graphics/pokemon/footprints/numel_footprint.png b/graphics/pokemon/numel/footprint.png
index 6238f9400..6238f9400 100644
--- a/graphics/pokemon/footprints/numel_footprint.png
+++ b/graphics/pokemon/numel/footprint.png
diff --git a/graphics/pokemon/front_pics/numel_still_front_pic.png b/graphics/pokemon/numel/front.png
index 1aca480f7..1aca480f7 100644
--- a/graphics/pokemon/front_pics/numel_still_front_pic.png
+++ b/graphics/pokemon/numel/front.png
diff --git a/graphics/pokemon/icons/numel_icon.png b/graphics/pokemon/numel/icon.png
index 62281e8bf..62281e8bf 100644
--- a/graphics/pokemon/icons/numel_icon.png
+++ b/graphics/pokemon/numel/icon.png
diff --git a/graphics/pokemon/palettes/numel_palette.pal b/graphics/pokemon/numel/normal.pal
index 74388d36b..74388d36b 100644
--- a/graphics/pokemon/palettes/numel_palette.pal
+++ b/graphics/pokemon/numel/normal.pal
diff --git a/graphics/pokemon/palettes/numel_shiny_palette.pal b/graphics/pokemon/numel/shiny.pal
index 2162c155c..2162c155c 100644
--- a/graphics/pokemon/palettes/numel_shiny_palette.pal
+++ b/graphics/pokemon/numel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/nuzleaf_front_pic.png b/graphics/pokemon/nuzleaf/anim_front.png
index 02aa6b1d4..02aa6b1d4 100644
--- a/graphics/pokemon/anim_front_pics/nuzleaf_front_pic.png
+++ b/graphics/pokemon/nuzleaf/anim_front.png
diff --git a/graphics/pokemon/back_pics/nuzleaf_back_pic.png b/graphics/pokemon/nuzleaf/back.png
index 858377c11..858377c11 100644
--- a/graphics/pokemon/back_pics/nuzleaf_back_pic.png
+++ b/graphics/pokemon/nuzleaf/back.png
diff --git a/graphics/pokemon/footprints/nuzleaf_footprint.png b/graphics/pokemon/nuzleaf/footprint.png
index b35288e05..b35288e05 100644
--- a/graphics/pokemon/footprints/nuzleaf_footprint.png
+++ b/graphics/pokemon/nuzleaf/footprint.png
diff --git a/graphics/pokemon/front_pics/nuzleaf_still_front_pic.png b/graphics/pokemon/nuzleaf/front.png
index ecaf00f85..ecaf00f85 100644
--- a/graphics/pokemon/front_pics/nuzleaf_still_front_pic.png
+++ b/graphics/pokemon/nuzleaf/front.png
diff --git a/graphics/pokemon/icons/nuzleaf_icon.png b/graphics/pokemon/nuzleaf/icon.png
index 8c9f4038f..8c9f4038f 100644
--- a/graphics/pokemon/icons/nuzleaf_icon.png
+++ b/graphics/pokemon/nuzleaf/icon.png
diff --git a/graphics/pokemon/palettes/nuzleaf_palette.pal b/graphics/pokemon/nuzleaf/normal.pal
index fd8ec8bff..fd8ec8bff 100644
--- a/graphics/pokemon/palettes/nuzleaf_palette.pal
+++ b/graphics/pokemon/nuzleaf/normal.pal
diff --git a/graphics/pokemon/palettes/nuzleaf_shiny_palette.pal b/graphics/pokemon/nuzleaf/shiny.pal
index 1706d316b..1706d316b 100644
--- a/graphics/pokemon/palettes/nuzleaf_shiny_palette.pal
+++ b/graphics/pokemon/nuzleaf/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/octillery_front_pic.png b/graphics/pokemon/octillery/anim_front.png
index 82d366484..82d366484 100644
--- a/graphics/pokemon/anim_front_pics/octillery_front_pic.png
+++ b/graphics/pokemon/octillery/anim_front.png
diff --git a/graphics/pokemon/back_pics/octillery_back_pic.png b/graphics/pokemon/octillery/back.png
index 09a867881..09a867881 100644
--- a/graphics/pokemon/back_pics/octillery_back_pic.png
+++ b/graphics/pokemon/octillery/back.png
diff --git a/graphics/pokemon/footprints/octillery_footprint.png b/graphics/pokemon/octillery/footprint.png
index afa1f5433..afa1f5433 100644
--- a/graphics/pokemon/footprints/octillery_footprint.png
+++ b/graphics/pokemon/octillery/footprint.png
diff --git a/graphics/pokemon/front_pics/octillery_still_front_pic.png b/graphics/pokemon/octillery/front.png
index 99d3a166e..99d3a166e 100644
--- a/graphics/pokemon/front_pics/octillery_still_front_pic.png
+++ b/graphics/pokemon/octillery/front.png
diff --git a/graphics/pokemon/icons/octillery_icon.png b/graphics/pokemon/octillery/icon.png
index a21e60327..a21e60327 100644
--- a/graphics/pokemon/icons/octillery_icon.png
+++ b/graphics/pokemon/octillery/icon.png
diff --git a/graphics/pokemon/palettes/octillery_palette.pal b/graphics/pokemon/octillery/normal.pal
index 2a32e5f6d..2a32e5f6d 100644
--- a/graphics/pokemon/palettes/octillery_palette.pal
+++ b/graphics/pokemon/octillery/normal.pal
diff --git a/graphics/pokemon/palettes/octillery_shiny_palette.pal b/graphics/pokemon/octillery/shiny.pal
index fcbdd5cda..fcbdd5cda 100644
--- a/graphics/pokemon/palettes/octillery_shiny_palette.pal
+++ b/graphics/pokemon/octillery/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/oddish_front_pic.png b/graphics/pokemon/oddish/anim_front.png
index 9a75f16cb..9a75f16cb 100644
--- a/graphics/pokemon/anim_front_pics/oddish_front_pic.png
+++ b/graphics/pokemon/oddish/anim_front.png
diff --git a/graphics/pokemon/back_pics/oddish_back_pic.png b/graphics/pokemon/oddish/back.png
index bafd8bbff..bafd8bbff 100644
--- a/graphics/pokemon/back_pics/oddish_back_pic.png
+++ b/graphics/pokemon/oddish/back.png
diff --git a/graphics/pokemon/footprints/oddish_footprint.png b/graphics/pokemon/oddish/footprint.png
index d38175273..d38175273 100644
--- a/graphics/pokemon/footprints/oddish_footprint.png
+++ b/graphics/pokemon/oddish/footprint.png
diff --git a/graphics/pokemon/front_pics/oddish_still_front_pic.png b/graphics/pokemon/oddish/front.png
index 02da03b26..02da03b26 100644
--- a/graphics/pokemon/front_pics/oddish_still_front_pic.png
+++ b/graphics/pokemon/oddish/front.png
diff --git a/graphics/pokemon/icons/oddish_icon.png b/graphics/pokemon/oddish/icon.png
index 7c46ae7e7..7c46ae7e7 100644
--- a/graphics/pokemon/icons/oddish_icon.png
+++ b/graphics/pokemon/oddish/icon.png
diff --git a/graphics/pokemon/palettes/oddish_palette.pal b/graphics/pokemon/oddish/normal.pal
index 11db38a91..11db38a91 100644
--- a/graphics/pokemon/palettes/oddish_palette.pal
+++ b/graphics/pokemon/oddish/normal.pal
diff --git a/graphics/pokemon/palettes/oddish_shiny_palette.pal b/graphics/pokemon/oddish/shiny.pal
index a3b719830..a3b719830 100644
--- a/graphics/pokemon/palettes/oddish_shiny_palette.pal
+++ b/graphics/pokemon/oddish/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/omanyte_front_pic.png b/graphics/pokemon/omanyte/anim_front.png
index a76eabe2c..a76eabe2c 100644
--- a/graphics/pokemon/anim_front_pics/omanyte_front_pic.png
+++ b/graphics/pokemon/omanyte/anim_front.png
diff --git a/graphics/pokemon/back_pics/omanyte_back_pic.png b/graphics/pokemon/omanyte/back.png
index 6cd77bffc..6cd77bffc 100644
--- a/graphics/pokemon/back_pics/omanyte_back_pic.png
+++ b/graphics/pokemon/omanyte/back.png
diff --git a/graphics/pokemon/footprints/omanyte_footprint.png b/graphics/pokemon/omanyte/footprint.png
index f5eb9fdba..f5eb9fdba 100644
--- a/graphics/pokemon/footprints/omanyte_footprint.png
+++ b/graphics/pokemon/omanyte/footprint.png
diff --git a/graphics/pokemon/front_pics/omanyte_still_front_pic.png b/graphics/pokemon/omanyte/front.png
index f110ecd80..f110ecd80 100644
--- a/graphics/pokemon/front_pics/omanyte_still_front_pic.png
+++ b/graphics/pokemon/omanyte/front.png
diff --git a/graphics/pokemon/icons/omanyte_icon.png b/graphics/pokemon/omanyte/icon.png
index 94684f5c3..94684f5c3 100644
--- a/graphics/pokemon/icons/omanyte_icon.png
+++ b/graphics/pokemon/omanyte/icon.png
diff --git a/graphics/pokemon/palettes/omanyte_palette.pal b/graphics/pokemon/omanyte/normal.pal
index 09d257a66..09d257a66 100644
--- a/graphics/pokemon/palettes/omanyte_palette.pal
+++ b/graphics/pokemon/omanyte/normal.pal
diff --git a/graphics/pokemon/palettes/omanyte_shiny_palette.pal b/graphics/pokemon/omanyte/shiny.pal
index af72dc30d..af72dc30d 100644
--- a/graphics/pokemon/palettes/omanyte_shiny_palette.pal
+++ b/graphics/pokemon/omanyte/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/omastar_front_pic.png b/graphics/pokemon/omastar/anim_front.png
index 677f46749..677f46749 100644
--- a/graphics/pokemon/anim_front_pics/omastar_front_pic.png
+++ b/graphics/pokemon/omastar/anim_front.png
diff --git a/graphics/pokemon/back_pics/omastar_back_pic.png b/graphics/pokemon/omastar/back.png
index 3f7467950..3f7467950 100644
--- a/graphics/pokemon/back_pics/omastar_back_pic.png
+++ b/graphics/pokemon/omastar/back.png
diff --git a/graphics/pokemon/footprints/omastar_footprint.png b/graphics/pokemon/omastar/footprint.png
index fdd911ecf..fdd911ecf 100644
--- a/graphics/pokemon/footprints/omastar_footprint.png
+++ b/graphics/pokemon/omastar/footprint.png
diff --git a/graphics/pokemon/front_pics/omastar_still_front_pic.png b/graphics/pokemon/omastar/front.png
index 2a1c58e38..2a1c58e38 100644
--- a/graphics/pokemon/front_pics/omastar_still_front_pic.png
+++ b/graphics/pokemon/omastar/front.png
diff --git a/graphics/pokemon/icons/omastar_icon.png b/graphics/pokemon/omastar/icon.png
index b72bd6aec..b72bd6aec 100644
--- a/graphics/pokemon/icons/omastar_icon.png
+++ b/graphics/pokemon/omastar/icon.png
diff --git a/graphics/pokemon/palettes/omastar_palette.pal b/graphics/pokemon/omastar/normal.pal
index f63530b4e..f63530b4e 100644
--- a/graphics/pokemon/palettes/omastar_palette.pal
+++ b/graphics/pokemon/omastar/normal.pal
diff --git a/graphics/pokemon/palettes/omastar_shiny_palette.pal b/graphics/pokemon/omastar/shiny.pal
index b17facc09..b17facc09 100644
--- a/graphics/pokemon/palettes/omastar_shiny_palette.pal
+++ b/graphics/pokemon/omastar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/onix_front_pic.png b/graphics/pokemon/onix/anim_front.png
index fbe64c2ec..fbe64c2ec 100644
--- a/graphics/pokemon/anim_front_pics/onix_front_pic.png
+++ b/graphics/pokemon/onix/anim_front.png
diff --git a/graphics/pokemon/back_pics/onix_back_pic.png b/graphics/pokemon/onix/back.png
index 233e66d91..233e66d91 100644
--- a/graphics/pokemon/back_pics/onix_back_pic.png
+++ b/graphics/pokemon/onix/back.png
diff --git a/graphics/pokemon/footprints/onix_footprint.png b/graphics/pokemon/onix/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/onix_footprint.png
+++ b/graphics/pokemon/onix/footprint.png
diff --git a/graphics/pokemon/front_pics/onix_still_front_pic.png b/graphics/pokemon/onix/front.png
index 0fd31f6b1..0fd31f6b1 100644
--- a/graphics/pokemon/front_pics/onix_still_front_pic.png
+++ b/graphics/pokemon/onix/front.png
diff --git a/graphics/pokemon/icons/onix_icon.png b/graphics/pokemon/onix/icon.png
index ddd7ee4f9..ddd7ee4f9 100644
--- a/graphics/pokemon/icons/onix_icon.png
+++ b/graphics/pokemon/onix/icon.png
diff --git a/graphics/pokemon/palettes/onix_palette.pal b/graphics/pokemon/onix/normal.pal
index e513a11e3..e513a11e3 100644
--- a/graphics/pokemon/palettes/onix_palette.pal
+++ b/graphics/pokemon/onix/normal.pal
diff --git a/graphics/pokemon/palettes/onix_shiny_palette.pal b/graphics/pokemon/onix/shiny.pal
index e3584ed0c..e3584ed0c 100644
--- a/graphics/pokemon/palettes/onix_shiny_palette.pal
+++ b/graphics/pokemon/onix/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/paras_front_pic.png b/graphics/pokemon/paras/anim_front.png
index 5a027dc07..5a027dc07 100644
--- a/graphics/pokemon/anim_front_pics/paras_front_pic.png
+++ b/graphics/pokemon/paras/anim_front.png
diff --git a/graphics/pokemon/back_pics/paras_back_pic.png b/graphics/pokemon/paras/back.png
index cb77d2d77..cb77d2d77 100644
--- a/graphics/pokemon/back_pics/paras_back_pic.png
+++ b/graphics/pokemon/paras/back.png
diff --git a/graphics/pokemon/footprints/paras_footprint.png b/graphics/pokemon/paras/footprint.png
index f8d7574d2..f8d7574d2 100644
--- a/graphics/pokemon/footprints/paras_footprint.png
+++ b/graphics/pokemon/paras/footprint.png
diff --git a/graphics/pokemon/front_pics/paras_still_front_pic.png b/graphics/pokemon/paras/front.png
index 28b75cb26..28b75cb26 100644
--- a/graphics/pokemon/front_pics/paras_still_front_pic.png
+++ b/graphics/pokemon/paras/front.png
diff --git a/graphics/pokemon/icons/paras_icon.png b/graphics/pokemon/paras/icon.png
index 6b828b058..6b828b058 100644
--- a/graphics/pokemon/icons/paras_icon.png
+++ b/graphics/pokemon/paras/icon.png
diff --git a/graphics/pokemon/palettes/paras_palette.pal b/graphics/pokemon/paras/normal.pal
index 46c089f35..46c089f35 100644
--- a/graphics/pokemon/palettes/paras_palette.pal
+++ b/graphics/pokemon/paras/normal.pal
diff --git a/graphics/pokemon/palettes/paras_shiny_palette.pal b/graphics/pokemon/paras/shiny.pal
index 77d322075..77d322075 100644
--- a/graphics/pokemon/palettes/paras_shiny_palette.pal
+++ b/graphics/pokemon/paras/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/parasect_front_pic.png b/graphics/pokemon/parasect/anim_front.png
index b22a7ff89..b22a7ff89 100644
--- a/graphics/pokemon/anim_front_pics/parasect_front_pic.png
+++ b/graphics/pokemon/parasect/anim_front.png
diff --git a/graphics/pokemon/back_pics/parasect_back_pic.png b/graphics/pokemon/parasect/back.png
index f313d5a91..f313d5a91 100644
--- a/graphics/pokemon/back_pics/parasect_back_pic.png
+++ b/graphics/pokemon/parasect/back.png
diff --git a/graphics/pokemon/footprints/parasect_footprint.png b/graphics/pokemon/parasect/footprint.png
index e0f1715f2..e0f1715f2 100644
--- a/graphics/pokemon/footprints/parasect_footprint.png
+++ b/graphics/pokemon/parasect/footprint.png
diff --git a/graphics/pokemon/front_pics/parasect_still_front_pic.png b/graphics/pokemon/parasect/front.png
index 8462e24bb..8462e24bb 100644
--- a/graphics/pokemon/front_pics/parasect_still_front_pic.png
+++ b/graphics/pokemon/parasect/front.png
diff --git a/graphics/pokemon/icons/parasect_icon.png b/graphics/pokemon/parasect/icon.png
index 907cbf5ca..907cbf5ca 100644
--- a/graphics/pokemon/icons/parasect_icon.png
+++ b/graphics/pokemon/parasect/icon.png
diff --git a/graphics/pokemon/palettes/parasect_palette.pal b/graphics/pokemon/parasect/normal.pal
index 158331c68..158331c68 100644
--- a/graphics/pokemon/palettes/parasect_palette.pal
+++ b/graphics/pokemon/parasect/normal.pal
diff --git a/graphics/pokemon/palettes/parasect_shiny_palette.pal b/graphics/pokemon/parasect/shiny.pal
index 3574c408f..3574c408f 100644
--- a/graphics/pokemon/palettes/parasect_shiny_palette.pal
+++ b/graphics/pokemon/parasect/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pelipper_front_pic.png b/graphics/pokemon/pelipper/anim_front.png
index 1bf8530ae..1bf8530ae 100644
--- a/graphics/pokemon/anim_front_pics/pelipper_front_pic.png
+++ b/graphics/pokemon/pelipper/anim_front.png
diff --git a/graphics/pokemon/back_pics/pelipper_back_pic.png b/graphics/pokemon/pelipper/back.png
index 4b155c28d..4b155c28d 100644
--- a/graphics/pokemon/back_pics/pelipper_back_pic.png
+++ b/graphics/pokemon/pelipper/back.png
diff --git a/graphics/pokemon/footprints/pelipper_footprint.png b/graphics/pokemon/pelipper/footprint.png
index 54718d259..54718d259 100644
--- a/graphics/pokemon/footprints/pelipper_footprint.png
+++ b/graphics/pokemon/pelipper/footprint.png
diff --git a/graphics/pokemon/front_pics/pelipper_still_front_pic.png b/graphics/pokemon/pelipper/front.png
index 1bf3669ae..1bf3669ae 100644
--- a/graphics/pokemon/front_pics/pelipper_still_front_pic.png
+++ b/graphics/pokemon/pelipper/front.png
diff --git a/graphics/pokemon/icons/pelipper_icon.png b/graphics/pokemon/pelipper/icon.png
index 55a16bc5f..55a16bc5f 100644
--- a/graphics/pokemon/icons/pelipper_icon.png
+++ b/graphics/pokemon/pelipper/icon.png
diff --git a/graphics/pokemon/palettes/pelipper_palette.pal b/graphics/pokemon/pelipper/normal.pal
index c78d73c37..c78d73c37 100644
--- a/graphics/pokemon/palettes/pelipper_palette.pal
+++ b/graphics/pokemon/pelipper/normal.pal
diff --git a/graphics/pokemon/palettes/pelipper_shiny_palette.pal b/graphics/pokemon/pelipper/shiny.pal
index 41686ffed..41686ffed 100644
--- a/graphics/pokemon/palettes/pelipper_shiny_palette.pal
+++ b/graphics/pokemon/pelipper/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/persian_front_pic.png b/graphics/pokemon/persian/anim_front.png
index 2eda6b1ce..2eda6b1ce 100644
--- a/graphics/pokemon/anim_front_pics/persian_front_pic.png
+++ b/graphics/pokemon/persian/anim_front.png
diff --git a/graphics/pokemon/back_pics/persian_back_pic.png b/graphics/pokemon/persian/back.png
index 10b7acf65..10b7acf65 100644
--- a/graphics/pokemon/back_pics/persian_back_pic.png
+++ b/graphics/pokemon/persian/back.png
diff --git a/graphics/pokemon/footprints/persian_footprint.png b/graphics/pokemon/persian/footprint.png
index 33f25f0aa..33f25f0aa 100644
--- a/graphics/pokemon/footprints/persian_footprint.png
+++ b/graphics/pokemon/persian/footprint.png
diff --git a/graphics/pokemon/front_pics/persian_still_front_pic.png b/graphics/pokemon/persian/front.png
index 489c7ae6e..489c7ae6e 100644
--- a/graphics/pokemon/front_pics/persian_still_front_pic.png
+++ b/graphics/pokemon/persian/front.png
diff --git a/graphics/pokemon/icons/persian_icon.png b/graphics/pokemon/persian/icon.png
index 3d6f72fee..3d6f72fee 100644
--- a/graphics/pokemon/icons/persian_icon.png
+++ b/graphics/pokemon/persian/icon.png
diff --git a/graphics/pokemon/palettes/persian_palette.pal b/graphics/pokemon/persian/normal.pal
index 7f533e870..7f533e870 100644
--- a/graphics/pokemon/palettes/persian_palette.pal
+++ b/graphics/pokemon/persian/normal.pal
diff --git a/graphics/pokemon/palettes/persian_shiny_palette.pal b/graphics/pokemon/persian/shiny.pal
index 7c72dc0b9..7c72dc0b9 100644
--- a/graphics/pokemon/palettes/persian_shiny_palette.pal
+++ b/graphics/pokemon/persian/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/phanpy_front_pic.png b/graphics/pokemon/phanpy/anim_front.png
index e90f240ce..e90f240ce 100644
--- a/graphics/pokemon/anim_front_pics/phanpy_front_pic.png
+++ b/graphics/pokemon/phanpy/anim_front.png
diff --git a/graphics/pokemon/back_pics/phanpy_back_pic.png b/graphics/pokemon/phanpy/back.png
index b40fb8ddf..b40fb8ddf 100644
--- a/graphics/pokemon/back_pics/phanpy_back_pic.png
+++ b/graphics/pokemon/phanpy/back.png
diff --git a/graphics/pokemon/footprints/phanpy_footprint.png b/graphics/pokemon/phanpy/footprint.png
index 70498b18f..70498b18f 100644
--- a/graphics/pokemon/footprints/phanpy_footprint.png
+++ b/graphics/pokemon/phanpy/footprint.png
diff --git a/graphics/pokemon/front_pics/phanpy_still_front_pic.png b/graphics/pokemon/phanpy/front.png
index f9dc5fce6..f9dc5fce6 100644
--- a/graphics/pokemon/front_pics/phanpy_still_front_pic.png
+++ b/graphics/pokemon/phanpy/front.png
diff --git a/graphics/pokemon/icons/phanpy_icon.png b/graphics/pokemon/phanpy/icon.png
index 341724973..341724973 100644
--- a/graphics/pokemon/icons/phanpy_icon.png
+++ b/graphics/pokemon/phanpy/icon.png
diff --git a/graphics/pokemon/palettes/phanpy_palette.pal b/graphics/pokemon/phanpy/normal.pal
index 57ca810fa..57ca810fa 100644
--- a/graphics/pokemon/palettes/phanpy_palette.pal
+++ b/graphics/pokemon/phanpy/normal.pal
diff --git a/graphics/pokemon/palettes/phanpy_shiny_palette.pal b/graphics/pokemon/phanpy/shiny.pal
index a09fc1dcc..a09fc1dcc 100644
--- a/graphics/pokemon/palettes/phanpy_shiny_palette.pal
+++ b/graphics/pokemon/phanpy/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pichu_front_pic.png b/graphics/pokemon/pichu/anim_front.png
index 0ea36a2c9..0ea36a2c9 100644
--- a/graphics/pokemon/anim_front_pics/pichu_front_pic.png
+++ b/graphics/pokemon/pichu/anim_front.png
diff --git a/graphics/pokemon/back_pics/pichu_back_pic.png b/graphics/pokemon/pichu/back.png
index 94d593632..94d593632 100644
--- a/graphics/pokemon/back_pics/pichu_back_pic.png
+++ b/graphics/pokemon/pichu/back.png
diff --git a/graphics/pokemon/footprints/pichu_footprint.png b/graphics/pokemon/pichu/footprint.png
index 823c7e32d..823c7e32d 100644
--- a/graphics/pokemon/footprints/pichu_footprint.png
+++ b/graphics/pokemon/pichu/footprint.png
diff --git a/graphics/pokemon/front_pics/pichu_still_front_pic.png b/graphics/pokemon/pichu/front.png
index f061d578b..f061d578b 100644
--- a/graphics/pokemon/front_pics/pichu_still_front_pic.png
+++ b/graphics/pokemon/pichu/front.png
diff --git a/graphics/pokemon/icons/pichu_icon.png b/graphics/pokemon/pichu/icon.png
index dd696ac10..dd696ac10 100644
--- a/graphics/pokemon/icons/pichu_icon.png
+++ b/graphics/pokemon/pichu/icon.png
diff --git a/graphics/pokemon/palettes/pichu_palette.pal b/graphics/pokemon/pichu/normal.pal
index 50d614dae..50d614dae 100644
--- a/graphics/pokemon/palettes/pichu_palette.pal
+++ b/graphics/pokemon/pichu/normal.pal
diff --git a/graphics/pokemon/palettes/pichu_shiny_palette.pal b/graphics/pokemon/pichu/shiny.pal
index dd17d7fe0..dd17d7fe0 100644
--- a/graphics/pokemon/palettes/pichu_shiny_palette.pal
+++ b/graphics/pokemon/pichu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pidgeot_front_pic.png b/graphics/pokemon/pidgeot/anim_front.png
index 1c202dab0..1c202dab0 100644
--- a/graphics/pokemon/anim_front_pics/pidgeot_front_pic.png
+++ b/graphics/pokemon/pidgeot/anim_front.png
diff --git a/graphics/pokemon/back_pics/pidgeot_back_pic.png b/graphics/pokemon/pidgeot/back.png
index 22d7d2702..22d7d2702 100644
--- a/graphics/pokemon/back_pics/pidgeot_back_pic.png
+++ b/graphics/pokemon/pidgeot/back.png
diff --git a/graphics/pokemon/footprints/pidgeot_footprint.png b/graphics/pokemon/pidgeot/footprint.png
index 025341554..025341554 100644
--- a/graphics/pokemon/footprints/pidgeot_footprint.png
+++ b/graphics/pokemon/pidgeot/footprint.png
diff --git a/graphics/pokemon/front_pics/pidgeot_still_front_pic.png b/graphics/pokemon/pidgeot/front.png
index 1e55140e9..1e55140e9 100644
--- a/graphics/pokemon/front_pics/pidgeot_still_front_pic.png
+++ b/graphics/pokemon/pidgeot/front.png
diff --git a/graphics/pokemon/icons/pidgeot_icon.png b/graphics/pokemon/pidgeot/icon.png
index 472c0640c..472c0640c 100644
--- a/graphics/pokemon/icons/pidgeot_icon.png
+++ b/graphics/pokemon/pidgeot/icon.png
diff --git a/graphics/pokemon/palettes/pidgeot_palette.pal b/graphics/pokemon/pidgeot/normal.pal
index a9fff6c19..a9fff6c19 100644
--- a/graphics/pokemon/palettes/pidgeot_palette.pal
+++ b/graphics/pokemon/pidgeot/normal.pal
diff --git a/graphics/pokemon/palettes/pidgeot_shiny_palette.pal b/graphics/pokemon/pidgeot/shiny.pal
index 17eaa40f2..17eaa40f2 100644
--- a/graphics/pokemon/palettes/pidgeot_shiny_palette.pal
+++ b/graphics/pokemon/pidgeot/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pidgeotto_front_pic.png b/graphics/pokemon/pidgeotto/anim_front.png
index 65ef21ec5..65ef21ec5 100644
--- a/graphics/pokemon/anim_front_pics/pidgeotto_front_pic.png
+++ b/graphics/pokemon/pidgeotto/anim_front.png
diff --git a/graphics/pokemon/back_pics/pidgeotto_back_pic.png b/graphics/pokemon/pidgeotto/back.png
index 4aeab2844..4aeab2844 100644
--- a/graphics/pokemon/back_pics/pidgeotto_back_pic.png
+++ b/graphics/pokemon/pidgeotto/back.png
diff --git a/graphics/pokemon/footprints/pidgeotto_footprint.png b/graphics/pokemon/pidgeotto/footprint.png
index c507f72b8..c507f72b8 100644
--- a/graphics/pokemon/footprints/pidgeotto_footprint.png
+++ b/graphics/pokemon/pidgeotto/footprint.png
diff --git a/graphics/pokemon/front_pics/pidgeotto_still_front_pic.png b/graphics/pokemon/pidgeotto/front.png
index 1a8e4656b..1a8e4656b 100644
--- a/graphics/pokemon/front_pics/pidgeotto_still_front_pic.png
+++ b/graphics/pokemon/pidgeotto/front.png
diff --git a/graphics/pokemon/icons/pidgeotto_icon.png b/graphics/pokemon/pidgeotto/icon.png
index bb134533e..bb134533e 100644
--- a/graphics/pokemon/icons/pidgeotto_icon.png
+++ b/graphics/pokemon/pidgeotto/icon.png
diff --git a/graphics/pokemon/palettes/pidgeotto_palette.pal b/graphics/pokemon/pidgeotto/normal.pal
index bf2ec6af1..bf2ec6af1 100644
--- a/graphics/pokemon/palettes/pidgeotto_palette.pal
+++ b/graphics/pokemon/pidgeotto/normal.pal
diff --git a/graphics/pokemon/palettes/pidgeotto_shiny_palette.pal b/graphics/pokemon/pidgeotto/shiny.pal
index 09a5b5cd3..09a5b5cd3 100644
--- a/graphics/pokemon/palettes/pidgeotto_shiny_palette.pal
+++ b/graphics/pokemon/pidgeotto/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pidgey_front_pic.png b/graphics/pokemon/pidgey/anim_front.png
index 8136556d5..8136556d5 100644
--- a/graphics/pokemon/anim_front_pics/pidgey_front_pic.png
+++ b/graphics/pokemon/pidgey/anim_front.png
diff --git a/graphics/pokemon/back_pics/pidgey_back_pic.png b/graphics/pokemon/pidgey/back.png
index ecb42e8f1..ecb42e8f1 100644
--- a/graphics/pokemon/back_pics/pidgey_back_pic.png
+++ b/graphics/pokemon/pidgey/back.png
diff --git a/graphics/pokemon/footprints/pidgey_footprint.png b/graphics/pokemon/pidgey/footprint.png
index 6fe6e4282..6fe6e4282 100644
--- a/graphics/pokemon/footprints/pidgey_footprint.png
+++ b/graphics/pokemon/pidgey/footprint.png
diff --git a/graphics/pokemon/front_pics/pidgey_still_front_pic.png b/graphics/pokemon/pidgey/front.png
index 2dae9b8d9..2dae9b8d9 100644
--- a/graphics/pokemon/front_pics/pidgey_still_front_pic.png
+++ b/graphics/pokemon/pidgey/front.png
diff --git a/graphics/pokemon/icons/pidgey_icon.png b/graphics/pokemon/pidgey/icon.png
index 44ff94311..44ff94311 100644
--- a/graphics/pokemon/icons/pidgey_icon.png
+++ b/graphics/pokemon/pidgey/icon.png
diff --git a/graphics/pokemon/palettes/pidgey_palette.pal b/graphics/pokemon/pidgey/normal.pal
index 94db7288c..94db7288c 100644
--- a/graphics/pokemon/palettes/pidgey_palette.pal
+++ b/graphics/pokemon/pidgey/normal.pal
diff --git a/graphics/pokemon/palettes/pidgey_shiny_palette.pal b/graphics/pokemon/pidgey/shiny.pal
index 5723ea075..5723ea075 100644
--- a/graphics/pokemon/palettes/pidgey_shiny_palette.pal
+++ b/graphics/pokemon/pidgey/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pikachu_front_pic.png b/graphics/pokemon/pikachu/anim_front.png
index f9be05401..f9be05401 100644
--- a/graphics/pokemon/anim_front_pics/pikachu_front_pic.png
+++ b/graphics/pokemon/pikachu/anim_front.png
diff --git a/graphics/pokemon/back_pics/pikachu_back_pic.png b/graphics/pokemon/pikachu/back.png
index 0ea5ff592..0ea5ff592 100644
--- a/graphics/pokemon/back_pics/pikachu_back_pic.png
+++ b/graphics/pokemon/pikachu/back.png
diff --git a/graphics/pokemon/footprints/pikachu_footprint.png b/graphics/pokemon/pikachu/footprint.png
index a8ee2e4ac..a8ee2e4ac 100644
--- a/graphics/pokemon/footprints/pikachu_footprint.png
+++ b/graphics/pokemon/pikachu/footprint.png
diff --git a/graphics/pokemon/front_pics/pikachu_still_front_pic.png b/graphics/pokemon/pikachu/front.png
index 18f83cf02..18f83cf02 100644
--- a/graphics/pokemon/front_pics/pikachu_still_front_pic.png
+++ b/graphics/pokemon/pikachu/front.png
diff --git a/graphics/pokemon/icons/pikachu_icon.png b/graphics/pokemon/pikachu/icon.png
index feb77f7db..feb77f7db 100644
--- a/graphics/pokemon/icons/pikachu_icon.png
+++ b/graphics/pokemon/pikachu/icon.png
diff --git a/graphics/pokemon/palettes/pikachu_palette.pal b/graphics/pokemon/pikachu/normal.pal
index bb60c24a9..bb60c24a9 100644
--- a/graphics/pokemon/palettes/pikachu_palette.pal
+++ b/graphics/pokemon/pikachu/normal.pal
diff --git a/graphics/pokemon/palettes/pikachu_shiny_palette.pal b/graphics/pokemon/pikachu/shiny.pal
index d4b783b0e..d4b783b0e 100644
--- a/graphics/pokemon/palettes/pikachu_shiny_palette.pal
+++ b/graphics/pokemon/pikachu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/piloswine_front_pic.png b/graphics/pokemon/piloswine/anim_front.png
index ed0870abc..ed0870abc 100644
--- a/graphics/pokemon/anim_front_pics/piloswine_front_pic.png
+++ b/graphics/pokemon/piloswine/anim_front.png
diff --git a/graphics/pokemon/back_pics/piloswine_back_pic.png b/graphics/pokemon/piloswine/back.png
index a9a3bfed8..a9a3bfed8 100644
--- a/graphics/pokemon/back_pics/piloswine_back_pic.png
+++ b/graphics/pokemon/piloswine/back.png
diff --git a/graphics/pokemon/footprints/piloswine_footprint.png b/graphics/pokemon/piloswine/footprint.png
index 0b7405ece..0b7405ece 100644
--- a/graphics/pokemon/footprints/piloswine_footprint.png
+++ b/graphics/pokemon/piloswine/footprint.png
diff --git a/graphics/pokemon/front_pics/piloswine_still_front_pic.png b/graphics/pokemon/piloswine/front.png
index 939fb3908..939fb3908 100644
--- a/graphics/pokemon/front_pics/piloswine_still_front_pic.png
+++ b/graphics/pokemon/piloswine/front.png
diff --git a/graphics/pokemon/icons/piloswine_icon.png b/graphics/pokemon/piloswine/icon.png
index 974e9ea6a..974e9ea6a 100644
--- a/graphics/pokemon/icons/piloswine_icon.png
+++ b/graphics/pokemon/piloswine/icon.png
diff --git a/graphics/pokemon/palettes/piloswine_palette.pal b/graphics/pokemon/piloswine/normal.pal
index 287cfcd0d..287cfcd0d 100644
--- a/graphics/pokemon/palettes/piloswine_palette.pal
+++ b/graphics/pokemon/piloswine/normal.pal
diff --git a/graphics/pokemon/palettes/piloswine_shiny_palette.pal b/graphics/pokemon/piloswine/shiny.pal
index ff56a634a..ff56a634a 100644
--- a/graphics/pokemon/palettes/piloswine_shiny_palette.pal
+++ b/graphics/pokemon/piloswine/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pineco_front_pic.png b/graphics/pokemon/pineco/anim_front.png
index 6b554b984..6b554b984 100644
--- a/graphics/pokemon/anim_front_pics/pineco_front_pic.png
+++ b/graphics/pokemon/pineco/anim_front.png
diff --git a/graphics/pokemon/back_pics/pineco_back_pic.png b/graphics/pokemon/pineco/back.png
index a92454bb3..a92454bb3 100644
--- a/graphics/pokemon/back_pics/pineco_back_pic.png
+++ b/graphics/pokemon/pineco/back.png
diff --git a/graphics/pokemon/footprints/pineco_footprint.png b/graphics/pokemon/pineco/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/pineco_footprint.png
+++ b/graphics/pokemon/pineco/footprint.png
diff --git a/graphics/pokemon/front_pics/pineco_still_front_pic.png b/graphics/pokemon/pineco/front.png
index eee32963a..eee32963a 100644
--- a/graphics/pokemon/front_pics/pineco_still_front_pic.png
+++ b/graphics/pokemon/pineco/front.png
diff --git a/graphics/pokemon/icons/pineco_icon.png b/graphics/pokemon/pineco/icon.png
index 3c12df5a2..3c12df5a2 100644
--- a/graphics/pokemon/icons/pineco_icon.png
+++ b/graphics/pokemon/pineco/icon.png
diff --git a/graphics/pokemon/palettes/pineco_palette.pal b/graphics/pokemon/pineco/normal.pal
index 91acee124..91acee124 100644
--- a/graphics/pokemon/palettes/pineco_palette.pal
+++ b/graphics/pokemon/pineco/normal.pal
diff --git a/graphics/pokemon/palettes/pineco_shiny_palette.pal b/graphics/pokemon/pineco/shiny.pal
index a474cc3e8..a474cc3e8 100644
--- a/graphics/pokemon/palettes/pineco_shiny_palette.pal
+++ b/graphics/pokemon/pineco/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pinsir_front_pic.png b/graphics/pokemon/pinsir/anim_front.png
index 576e56b7d..576e56b7d 100644
--- a/graphics/pokemon/anim_front_pics/pinsir_front_pic.png
+++ b/graphics/pokemon/pinsir/anim_front.png
diff --git a/graphics/pokemon/back_pics/pinsir_back_pic.png b/graphics/pokemon/pinsir/back.png
index 95ee9784c..95ee9784c 100644
--- a/graphics/pokemon/back_pics/pinsir_back_pic.png
+++ b/graphics/pokemon/pinsir/back.png
diff --git a/graphics/pokemon/footprints/pinsir_footprint.png b/graphics/pokemon/pinsir/footprint.png
index ebd22101e..ebd22101e 100644
--- a/graphics/pokemon/footprints/pinsir_footprint.png
+++ b/graphics/pokemon/pinsir/footprint.png
diff --git a/graphics/pokemon/front_pics/pinsir_still_front_pic.png b/graphics/pokemon/pinsir/front.png
index 1c4f1eaf0..1c4f1eaf0 100644
--- a/graphics/pokemon/front_pics/pinsir_still_front_pic.png
+++ b/graphics/pokemon/pinsir/front.png
diff --git a/graphics/pokemon/icons/pinsir_icon.png b/graphics/pokemon/pinsir/icon.png
index b05b075b9..b05b075b9 100644
--- a/graphics/pokemon/icons/pinsir_icon.png
+++ b/graphics/pokemon/pinsir/icon.png
diff --git a/graphics/pokemon/palettes/pinsir_palette.pal b/graphics/pokemon/pinsir/normal.pal
index 9ef4b91f2..9ef4b91f2 100644
--- a/graphics/pokemon/palettes/pinsir_palette.pal
+++ b/graphics/pokemon/pinsir/normal.pal
diff --git a/graphics/pokemon/palettes/pinsir_shiny_palette.pal b/graphics/pokemon/pinsir/shiny.pal
index cd06d2111..cd06d2111 100644
--- a/graphics/pokemon/palettes/pinsir_shiny_palette.pal
+++ b/graphics/pokemon/pinsir/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/plusle_front_pic.png b/graphics/pokemon/plusle/anim_front.png
index 123efe4ef..123efe4ef 100644
--- a/graphics/pokemon/anim_front_pics/plusle_front_pic.png
+++ b/graphics/pokemon/plusle/anim_front.png
diff --git a/graphics/pokemon/back_pics/plusle_back_pic.png b/graphics/pokemon/plusle/back.png
index 7365f9921..7365f9921 100644
--- a/graphics/pokemon/back_pics/plusle_back_pic.png
+++ b/graphics/pokemon/plusle/back.png
diff --git a/graphics/pokemon/footprints/plusle_footprint.png b/graphics/pokemon/plusle/footprint.png
index 1071b8069..1071b8069 100644
--- a/graphics/pokemon/footprints/plusle_footprint.png
+++ b/graphics/pokemon/plusle/footprint.png
diff --git a/graphics/pokemon/front_pics/plusle_still_front_pic.png b/graphics/pokemon/plusle/front.png
index dc38ca3d1..dc38ca3d1 100644
--- a/graphics/pokemon/front_pics/plusle_still_front_pic.png
+++ b/graphics/pokemon/plusle/front.png
diff --git a/graphics/pokemon/icons/plusle_icon.png b/graphics/pokemon/plusle/icon.png
index 97f10d56f..97f10d56f 100644
--- a/graphics/pokemon/icons/plusle_icon.png
+++ b/graphics/pokemon/plusle/icon.png
diff --git a/graphics/pokemon/palettes/plusle_palette.pal b/graphics/pokemon/plusle/normal.pal
index e225ab56a..e225ab56a 100644
--- a/graphics/pokemon/palettes/plusle_palette.pal
+++ b/graphics/pokemon/plusle/normal.pal
diff --git a/graphics/pokemon/palettes/plusle_shiny_palette.pal b/graphics/pokemon/plusle/shiny.pal
index f1305ea50..f1305ea50 100644
--- a/graphics/pokemon/palettes/plusle_shiny_palette.pal
+++ b/graphics/pokemon/plusle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/politoed_front_pic.png b/graphics/pokemon/politoed/anim_front.png
index d2b8b43aa..d2b8b43aa 100644
--- a/graphics/pokemon/anim_front_pics/politoed_front_pic.png
+++ b/graphics/pokemon/politoed/anim_front.png
diff --git a/graphics/pokemon/back_pics/politoed_back_pic.png b/graphics/pokemon/politoed/back.png
index 5337b6f27..5337b6f27 100644
--- a/graphics/pokemon/back_pics/politoed_back_pic.png
+++ b/graphics/pokemon/politoed/back.png
diff --git a/graphics/pokemon/footprints/politoed_footprint.png b/graphics/pokemon/politoed/footprint.png
index f97b78994..f97b78994 100644
--- a/graphics/pokemon/footprints/politoed_footprint.png
+++ b/graphics/pokemon/politoed/footprint.png
diff --git a/graphics/pokemon/front_pics/politoed_still_front_pic.png b/graphics/pokemon/politoed/front.png
index d07bf4013..d07bf4013 100644
--- a/graphics/pokemon/front_pics/politoed_still_front_pic.png
+++ b/graphics/pokemon/politoed/front.png
diff --git a/graphics/pokemon/icons/politoed_icon.png b/graphics/pokemon/politoed/icon.png
index a5e5d699b..a5e5d699b 100644
--- a/graphics/pokemon/icons/politoed_icon.png
+++ b/graphics/pokemon/politoed/icon.png
diff --git a/graphics/pokemon/palettes/politoed_palette.pal b/graphics/pokemon/politoed/normal.pal
index 31177861d..31177861d 100644
--- a/graphics/pokemon/palettes/politoed_palette.pal
+++ b/graphics/pokemon/politoed/normal.pal
diff --git a/graphics/pokemon/palettes/politoed_shiny_palette.pal b/graphics/pokemon/politoed/shiny.pal
index 1d25291bf..1d25291bf 100644
--- a/graphics/pokemon/palettes/politoed_shiny_palette.pal
+++ b/graphics/pokemon/politoed/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/poliwag_front_pic.png b/graphics/pokemon/poliwag/anim_front.png
index 32c339383..32c339383 100644
--- a/graphics/pokemon/anim_front_pics/poliwag_front_pic.png
+++ b/graphics/pokemon/poliwag/anim_front.png
diff --git a/graphics/pokemon/back_pics/poliwag_back_pic.png b/graphics/pokemon/poliwag/back.png
index a6e5d23fa..a6e5d23fa 100644
--- a/graphics/pokemon/back_pics/poliwag_back_pic.png
+++ b/graphics/pokemon/poliwag/back.png
diff --git a/graphics/pokemon/footprints/poliwag_footprint.png b/graphics/pokemon/poliwag/footprint.png
index 04e411726..04e411726 100644
--- a/graphics/pokemon/footprints/poliwag_footprint.png
+++ b/graphics/pokemon/poliwag/footprint.png
diff --git a/graphics/pokemon/front_pics/poliwag_still_front_pic.png b/graphics/pokemon/poliwag/front.png
index 72e454c95..72e454c95 100644
--- a/graphics/pokemon/front_pics/poliwag_still_front_pic.png
+++ b/graphics/pokemon/poliwag/front.png
diff --git a/graphics/pokemon/icons/poliwag_icon.png b/graphics/pokemon/poliwag/icon.png
index d4cd95f1c..d4cd95f1c 100644
--- a/graphics/pokemon/icons/poliwag_icon.png
+++ b/graphics/pokemon/poliwag/icon.png
diff --git a/graphics/pokemon/palettes/poliwag_palette.pal b/graphics/pokemon/poliwag/normal.pal
index 14f781ec9..14f781ec9 100644
--- a/graphics/pokemon/palettes/poliwag_palette.pal
+++ b/graphics/pokemon/poliwag/normal.pal
diff --git a/graphics/pokemon/palettes/poliwag_shiny_palette.pal b/graphics/pokemon/poliwag/shiny.pal
index 1789edc4a..1789edc4a 100644
--- a/graphics/pokemon/palettes/poliwag_shiny_palette.pal
+++ b/graphics/pokemon/poliwag/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/poliwhirl_front_pic.png b/graphics/pokemon/poliwhirl/anim_front.png
index df878ca7b..df878ca7b 100644
--- a/graphics/pokemon/anim_front_pics/poliwhirl_front_pic.png
+++ b/graphics/pokemon/poliwhirl/anim_front.png
diff --git a/graphics/pokemon/back_pics/poliwhirl_back_pic.png b/graphics/pokemon/poliwhirl/back.png
index 16531886a..16531886a 100644
--- a/graphics/pokemon/back_pics/poliwhirl_back_pic.png
+++ b/graphics/pokemon/poliwhirl/back.png
diff --git a/graphics/pokemon/footprints/poliwhirl_footprint.png b/graphics/pokemon/poliwhirl/footprint.png
index 14f6c2ea9..14f6c2ea9 100644
--- a/graphics/pokemon/footprints/poliwhirl_footprint.png
+++ b/graphics/pokemon/poliwhirl/footprint.png
diff --git a/graphics/pokemon/front_pics/poliwhirl_still_front_pic.png b/graphics/pokemon/poliwhirl/front.png
index fac7d0575..fac7d0575 100644
--- a/graphics/pokemon/front_pics/poliwhirl_still_front_pic.png
+++ b/graphics/pokemon/poliwhirl/front.png
diff --git a/graphics/pokemon/icons/poliwhirl_icon.png b/graphics/pokemon/poliwhirl/icon.png
index c25dabbfe..c25dabbfe 100644
--- a/graphics/pokemon/icons/poliwhirl_icon.png
+++ b/graphics/pokemon/poliwhirl/icon.png
diff --git a/graphics/pokemon/palettes/poliwhirl_palette.pal b/graphics/pokemon/poliwhirl/normal.pal
index 50de4d631..50de4d631 100644
--- a/graphics/pokemon/palettes/poliwhirl_palette.pal
+++ b/graphics/pokemon/poliwhirl/normal.pal
diff --git a/graphics/pokemon/palettes/poliwhirl_shiny_palette.pal b/graphics/pokemon/poliwhirl/shiny.pal
index b6aa45616..b6aa45616 100644
--- a/graphics/pokemon/palettes/poliwhirl_shiny_palette.pal
+++ b/graphics/pokemon/poliwhirl/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/poliwrath_front_pic.png b/graphics/pokemon/poliwrath/anim_front.png
index ec68c4aa5..ec68c4aa5 100644
--- a/graphics/pokemon/anim_front_pics/poliwrath_front_pic.png
+++ b/graphics/pokemon/poliwrath/anim_front.png
diff --git a/graphics/pokemon/back_pics/poliwrath_back_pic.png b/graphics/pokemon/poliwrath/back.png
index e5bee3663..e5bee3663 100644
--- a/graphics/pokemon/back_pics/poliwrath_back_pic.png
+++ b/graphics/pokemon/poliwrath/back.png
diff --git a/graphics/pokemon/footprints/poliwrath_footprint.png b/graphics/pokemon/poliwrath/footprint.png
index 8f562fcef..8f562fcef 100644
--- a/graphics/pokemon/footprints/poliwrath_footprint.png
+++ b/graphics/pokemon/poliwrath/footprint.png
diff --git a/graphics/pokemon/front_pics/poliwrath_still_front_pic.png b/graphics/pokemon/poliwrath/front.png
index 2d82581d8..2d82581d8 100644
--- a/graphics/pokemon/front_pics/poliwrath_still_front_pic.png
+++ b/graphics/pokemon/poliwrath/front.png
diff --git a/graphics/pokemon/icons/poliwrath_icon.png b/graphics/pokemon/poliwrath/icon.png
index d1afb4511..d1afb4511 100644
--- a/graphics/pokemon/icons/poliwrath_icon.png
+++ b/graphics/pokemon/poliwrath/icon.png
diff --git a/graphics/pokemon/palettes/poliwrath_palette.pal b/graphics/pokemon/poliwrath/normal.pal
index 14f4493d4..14f4493d4 100644
--- a/graphics/pokemon/palettes/poliwrath_palette.pal
+++ b/graphics/pokemon/poliwrath/normal.pal
diff --git a/graphics/pokemon/palettes/poliwrath_shiny_palette.pal b/graphics/pokemon/poliwrath/shiny.pal
index 64aab4039..64aab4039 100644
--- a/graphics/pokemon/palettes/poliwrath_shiny_palette.pal
+++ b/graphics/pokemon/poliwrath/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ponyta_front_pic.png b/graphics/pokemon/ponyta/anim_front.png
index abee4ad85..abee4ad85 100644
--- a/graphics/pokemon/anim_front_pics/ponyta_front_pic.png
+++ b/graphics/pokemon/ponyta/anim_front.png
diff --git a/graphics/pokemon/back_pics/ponyta_back_pic.png b/graphics/pokemon/ponyta/back.png
index cc4bf1189..cc4bf1189 100644
--- a/graphics/pokemon/back_pics/ponyta_back_pic.png
+++ b/graphics/pokemon/ponyta/back.png
diff --git a/graphics/pokemon/footprints/ponyta_footprint.png b/graphics/pokemon/ponyta/footprint.png
index 906ee7a5b..906ee7a5b 100644
--- a/graphics/pokemon/footprints/ponyta_footprint.png
+++ b/graphics/pokemon/ponyta/footprint.png
diff --git a/graphics/pokemon/front_pics/ponyta_still_front_pic.png b/graphics/pokemon/ponyta/front.png
index 4833f1658..4833f1658 100644
--- a/graphics/pokemon/front_pics/ponyta_still_front_pic.png
+++ b/graphics/pokemon/ponyta/front.png
diff --git a/graphics/pokemon/icons/ponyta_icon.png b/graphics/pokemon/ponyta/icon.png
index 05ac87a44..05ac87a44 100644
--- a/graphics/pokemon/icons/ponyta_icon.png
+++ b/graphics/pokemon/ponyta/icon.png
diff --git a/graphics/pokemon/palettes/ponyta_palette.pal b/graphics/pokemon/ponyta/normal.pal
index 68dcf8d3b..68dcf8d3b 100644
--- a/graphics/pokemon/palettes/ponyta_palette.pal
+++ b/graphics/pokemon/ponyta/normal.pal
diff --git a/graphics/pokemon/palettes/ponyta_shiny_palette.pal b/graphics/pokemon/ponyta/shiny.pal
index 1210e5228..1210e5228 100644
--- a/graphics/pokemon/palettes/ponyta_shiny_palette.pal
+++ b/graphics/pokemon/ponyta/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/poochyena_front_pic.png b/graphics/pokemon/poochyena/anim_front.png
index 0579a1fa9..0579a1fa9 100644
--- a/graphics/pokemon/anim_front_pics/poochyena_front_pic.png
+++ b/graphics/pokemon/poochyena/anim_front.png
diff --git a/graphics/pokemon/back_pics/poochyena_back_pic.png b/graphics/pokemon/poochyena/back.png
index 6d13ed43a..6d13ed43a 100644
--- a/graphics/pokemon/back_pics/poochyena_back_pic.png
+++ b/graphics/pokemon/poochyena/back.png
diff --git a/graphics/pokemon/footprints/poochyena_footprint.png b/graphics/pokemon/poochyena/footprint.png
index c4afe995f..c4afe995f 100644
--- a/graphics/pokemon/footprints/poochyena_footprint.png
+++ b/graphics/pokemon/poochyena/footprint.png
diff --git a/graphics/pokemon/front_pics/poochyena_still_front_pic.png b/graphics/pokemon/poochyena/front.png
index 0eee404a7..0eee404a7 100644
--- a/graphics/pokemon/front_pics/poochyena_still_front_pic.png
+++ b/graphics/pokemon/poochyena/front.png
diff --git a/graphics/pokemon/icons/poochyena_icon.png b/graphics/pokemon/poochyena/icon.png
index 7e6be6a17..7e6be6a17 100644
--- a/graphics/pokemon/icons/poochyena_icon.png
+++ b/graphics/pokemon/poochyena/icon.png
diff --git a/graphics/pokemon/palettes/poochyena_palette.pal b/graphics/pokemon/poochyena/normal.pal
index 4c386e261..4c386e261 100644
--- a/graphics/pokemon/palettes/poochyena_palette.pal
+++ b/graphics/pokemon/poochyena/normal.pal
diff --git a/graphics/pokemon/palettes/poochyena_shiny_palette.pal b/graphics/pokemon/poochyena/shiny.pal
index c30dcec93..c30dcec93 100644
--- a/graphics/pokemon/palettes/poochyena_shiny_palette.pal
+++ b/graphics/pokemon/poochyena/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/porygon_front_pic.png b/graphics/pokemon/porygon/anim_front.png
index 7654821da..7654821da 100644
--- a/graphics/pokemon/anim_front_pics/porygon_front_pic.png
+++ b/graphics/pokemon/porygon/anim_front.png
diff --git a/graphics/pokemon/back_pics/porygon_back_pic.png b/graphics/pokemon/porygon/back.png
index f102465a8..f102465a8 100644
--- a/graphics/pokemon/back_pics/porygon_back_pic.png
+++ b/graphics/pokemon/porygon/back.png
diff --git a/graphics/pokemon/footprints/porygon_footprint.png b/graphics/pokemon/porygon/footprint.png
index 02243e3bc..02243e3bc 100644
--- a/graphics/pokemon/footprints/porygon_footprint.png
+++ b/graphics/pokemon/porygon/footprint.png
diff --git a/graphics/pokemon/front_pics/porygon_still_front_pic.png b/graphics/pokemon/porygon/front.png
index b053083ce..b053083ce 100644
--- a/graphics/pokemon/front_pics/porygon_still_front_pic.png
+++ b/graphics/pokemon/porygon/front.png
diff --git a/graphics/pokemon/icons/porygon_icon.png b/graphics/pokemon/porygon/icon.png
index 306ea8d31..306ea8d31 100644
--- a/graphics/pokemon/icons/porygon_icon.png
+++ b/graphics/pokemon/porygon/icon.png
diff --git a/graphics/pokemon/palettes/porygon_palette.pal b/graphics/pokemon/porygon/normal.pal
index 68ca2bef2..68ca2bef2 100644
--- a/graphics/pokemon/palettes/porygon_palette.pal
+++ b/graphics/pokemon/porygon/normal.pal
diff --git a/graphics/pokemon/palettes/porygon_shiny_palette.pal b/graphics/pokemon/porygon/shiny.pal
index 19178b1b8..19178b1b8 100644
--- a/graphics/pokemon/palettes/porygon_shiny_palette.pal
+++ b/graphics/pokemon/porygon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/porygon2_front_pic.png b/graphics/pokemon/porygon2/anim_front.png
index f324d55ad..f324d55ad 100644
--- a/graphics/pokemon/anim_front_pics/porygon2_front_pic.png
+++ b/graphics/pokemon/porygon2/anim_front.png
diff --git a/graphics/pokemon/back_pics/porygon2_back_pic.png b/graphics/pokemon/porygon2/back.png
index aad400b56..aad400b56 100644
--- a/graphics/pokemon/back_pics/porygon2_back_pic.png
+++ b/graphics/pokemon/porygon2/back.png
diff --git a/graphics/pokemon/footprints/porygon2_footprint.png b/graphics/pokemon/porygon2/footprint.png
index f92224af3..f92224af3 100644
--- a/graphics/pokemon/footprints/porygon2_footprint.png
+++ b/graphics/pokemon/porygon2/footprint.png
diff --git a/graphics/pokemon/front_pics/porygon2_still_front_pic.png b/graphics/pokemon/porygon2/front.png
index ef08816d7..ef08816d7 100644
--- a/graphics/pokemon/front_pics/porygon2_still_front_pic.png
+++ b/graphics/pokemon/porygon2/front.png
diff --git a/graphics/pokemon/icons/porygon2_icon.png b/graphics/pokemon/porygon2/icon.png
index 312640b40..312640b40 100644
--- a/graphics/pokemon/icons/porygon2_icon.png
+++ b/graphics/pokemon/porygon2/icon.png
diff --git a/graphics/pokemon/palettes/porygon2_palette.pal b/graphics/pokemon/porygon2/normal.pal
index a9de00549..a9de00549 100644
--- a/graphics/pokemon/palettes/porygon2_palette.pal
+++ b/graphics/pokemon/porygon2/normal.pal
diff --git a/graphics/pokemon/palettes/porygon2_shiny_palette.pal b/graphics/pokemon/porygon2/shiny.pal
index 4c0d2054c..4c0d2054c 100644
--- a/graphics/pokemon/palettes/porygon2_shiny_palette.pal
+++ b/graphics/pokemon/porygon2/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/primeape_front_pic.png b/graphics/pokemon/primeape/anim_front.png
index babecf370..babecf370 100644
--- a/graphics/pokemon/anim_front_pics/primeape_front_pic.png
+++ b/graphics/pokemon/primeape/anim_front.png
diff --git a/graphics/pokemon/back_pics/primeape_back_pic.png b/graphics/pokemon/primeape/back.png
index 02b326cd4..02b326cd4 100644
--- a/graphics/pokemon/back_pics/primeape_back_pic.png
+++ b/graphics/pokemon/primeape/back.png
diff --git a/graphics/pokemon/footprints/primeape_footprint.png b/graphics/pokemon/primeape/footprint.png
index f4c90ee17..f4c90ee17 100644
--- a/graphics/pokemon/footprints/primeape_footprint.png
+++ b/graphics/pokemon/primeape/footprint.png
diff --git a/graphics/pokemon/front_pics/primeape_still_front_pic.png b/graphics/pokemon/primeape/front.png
index 4f87b1876..4f87b1876 100644
--- a/graphics/pokemon/front_pics/primeape_still_front_pic.png
+++ b/graphics/pokemon/primeape/front.png
diff --git a/graphics/pokemon/icons/primeape_icon.png b/graphics/pokemon/primeape/icon.png
index d2d42f7dc..d2d42f7dc 100644
--- a/graphics/pokemon/icons/primeape_icon.png
+++ b/graphics/pokemon/primeape/icon.png
diff --git a/graphics/pokemon/palettes/primeape_palette.pal b/graphics/pokemon/primeape/normal.pal
index bebbba406..bebbba406 100644
--- a/graphics/pokemon/palettes/primeape_palette.pal
+++ b/graphics/pokemon/primeape/normal.pal
diff --git a/graphics/pokemon/palettes/primeape_shiny_palette.pal b/graphics/pokemon/primeape/shiny.pal
index 02b4f4e16..02b4f4e16 100644
--- a/graphics/pokemon/palettes/primeape_shiny_palette.pal
+++ b/graphics/pokemon/primeape/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/psyduck_front_pic.png b/graphics/pokemon/psyduck/anim_front.png
index 51d323716..51d323716 100644
--- a/graphics/pokemon/anim_front_pics/psyduck_front_pic.png
+++ b/graphics/pokemon/psyduck/anim_front.png
diff --git a/graphics/pokemon/back_pics/psyduck_back_pic.png b/graphics/pokemon/psyduck/back.png
index 65f8032a7..65f8032a7 100644
--- a/graphics/pokemon/back_pics/psyduck_back_pic.png
+++ b/graphics/pokemon/psyduck/back.png
diff --git a/graphics/pokemon/footprints/psyduck_footprint.png b/graphics/pokemon/psyduck/footprint.png
index 4dff44800..4dff44800 100644
--- a/graphics/pokemon/footprints/psyduck_footprint.png
+++ b/graphics/pokemon/psyduck/footprint.png
diff --git a/graphics/pokemon/front_pics/psyduck_still_front_pic.png b/graphics/pokemon/psyduck/front.png
index 765e9f61b..765e9f61b 100644
--- a/graphics/pokemon/front_pics/psyduck_still_front_pic.png
+++ b/graphics/pokemon/psyduck/front.png
diff --git a/graphics/pokemon/icons/psyduck_icon.png b/graphics/pokemon/psyduck/icon.png
index f3ebc9f96..f3ebc9f96 100644
--- a/graphics/pokemon/icons/psyduck_icon.png
+++ b/graphics/pokemon/psyduck/icon.png
diff --git a/graphics/pokemon/palettes/psyduck_palette.pal b/graphics/pokemon/psyduck/normal.pal
index c69e486a9..c69e486a9 100644
--- a/graphics/pokemon/palettes/psyduck_palette.pal
+++ b/graphics/pokemon/psyduck/normal.pal
diff --git a/graphics/pokemon/palettes/psyduck_shiny_palette.pal b/graphics/pokemon/psyduck/shiny.pal
index 889cfaedc..889cfaedc 100644
--- a/graphics/pokemon/palettes/psyduck_shiny_palette.pal
+++ b/graphics/pokemon/psyduck/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/pupitar_front_pic.png b/graphics/pokemon/pupitar/anim_front.png
index 910afd614..910afd614 100644
--- a/graphics/pokemon/anim_front_pics/pupitar_front_pic.png
+++ b/graphics/pokemon/pupitar/anim_front.png
diff --git a/graphics/pokemon/back_pics/pupitar_back_pic.png b/graphics/pokemon/pupitar/back.png
index 1f49a87f9..1f49a87f9 100644
--- a/graphics/pokemon/back_pics/pupitar_back_pic.png
+++ b/graphics/pokemon/pupitar/back.png
diff --git a/graphics/pokemon/footprints/pupitar_footprint.png b/graphics/pokemon/pupitar/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/pupitar_footprint.png
+++ b/graphics/pokemon/pupitar/footprint.png
diff --git a/graphics/pokemon/front_pics/pupitar_still_front_pic.png b/graphics/pokemon/pupitar/front.png
index 9e48ec20a..9e48ec20a 100644
--- a/graphics/pokemon/front_pics/pupitar_still_front_pic.png
+++ b/graphics/pokemon/pupitar/front.png
diff --git a/graphics/pokemon/icons/pupitar_icon.png b/graphics/pokemon/pupitar/icon.png
index 3491849d1..3491849d1 100644
--- a/graphics/pokemon/icons/pupitar_icon.png
+++ b/graphics/pokemon/pupitar/icon.png
diff --git a/graphics/pokemon/palettes/pupitar_palette.pal b/graphics/pokemon/pupitar/normal.pal
index bd8385e29..bd8385e29 100644
--- a/graphics/pokemon/palettes/pupitar_palette.pal
+++ b/graphics/pokemon/pupitar/normal.pal
diff --git a/graphics/pokemon/palettes/pupitar_shiny_palette.pal b/graphics/pokemon/pupitar/shiny.pal
index 58371ba01..58371ba01 100644
--- a/graphics/pokemon/palettes/pupitar_shiny_palette.pal
+++ b/graphics/pokemon/pupitar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/quagsire_front_pic.png b/graphics/pokemon/quagsire/anim_front.png
index 0834e1da6..0834e1da6 100644
--- a/graphics/pokemon/anim_front_pics/quagsire_front_pic.png
+++ b/graphics/pokemon/quagsire/anim_front.png
diff --git a/graphics/pokemon/back_pics/quagsire_back_pic.png b/graphics/pokemon/quagsire/back.png
index 9233569b8..9233569b8 100644
--- a/graphics/pokemon/back_pics/quagsire_back_pic.png
+++ b/graphics/pokemon/quagsire/back.png
diff --git a/graphics/pokemon/footprints/quagsire_footprint.png b/graphics/pokemon/quagsire/footprint.png
index d04039763..d04039763 100644
--- a/graphics/pokemon/footprints/quagsire_footprint.png
+++ b/graphics/pokemon/quagsire/footprint.png
diff --git a/graphics/pokemon/front_pics/quagsire_still_front_pic.png b/graphics/pokemon/quagsire/front.png
index d065f9fa1..d065f9fa1 100644
--- a/graphics/pokemon/front_pics/quagsire_still_front_pic.png
+++ b/graphics/pokemon/quagsire/front.png
diff --git a/graphics/pokemon/icons/quagsire_icon.png b/graphics/pokemon/quagsire/icon.png
index 62c7f2e46..62c7f2e46 100644
--- a/graphics/pokemon/icons/quagsire_icon.png
+++ b/graphics/pokemon/quagsire/icon.png
diff --git a/graphics/pokemon/palettes/quagsire_palette.pal b/graphics/pokemon/quagsire/normal.pal
index 5a74c8c08..5a74c8c08 100644
--- a/graphics/pokemon/palettes/quagsire_palette.pal
+++ b/graphics/pokemon/quagsire/normal.pal
diff --git a/graphics/pokemon/palettes/quagsire_shiny_palette.pal b/graphics/pokemon/quagsire/shiny.pal
index cb5bd7922..cb5bd7922 100644
--- a/graphics/pokemon/palettes/quagsire_shiny_palette.pal
+++ b/graphics/pokemon/quagsire/shiny.pal
diff --git a/graphics/pokemon/footprints/question_mark_footprint.png b/graphics/pokemon/question_mark/footprint.png
index 7c4f45eaa..7c4f45eaa 100644
--- a/graphics/pokemon/footprints/question_mark_footprint.png
+++ b/graphics/pokemon/question_mark/footprint.png
diff --git a/graphics/pokemon/icons/question_mark_icon.png b/graphics/pokemon/question_mark/icon.png
index b31ebacf7..b31ebacf7 100644
--- a/graphics/pokemon/icons/question_mark_icon.png
+++ b/graphics/pokemon/question_mark/icon.png
diff --git a/graphics/pokemon/anim_front_pics/quilava_front_pic.png b/graphics/pokemon/quilava/anim_front.png
index b5ec66bba..b5ec66bba 100644
--- a/graphics/pokemon/anim_front_pics/quilava_front_pic.png
+++ b/graphics/pokemon/quilava/anim_front.png
diff --git a/graphics/pokemon/back_pics/quilava_back_pic.png b/graphics/pokemon/quilava/back.png
index 5a97c1b11..5a97c1b11 100644
--- a/graphics/pokemon/back_pics/quilava_back_pic.png
+++ b/graphics/pokemon/quilava/back.png
diff --git a/graphics/pokemon/footprints/quilava_footprint.png b/graphics/pokemon/quilava/footprint.png
index 28324dd7c..28324dd7c 100644
--- a/graphics/pokemon/footprints/quilava_footprint.png
+++ b/graphics/pokemon/quilava/footprint.png
diff --git a/graphics/pokemon/front_pics/quilava_still_front_pic.png b/graphics/pokemon/quilava/front.png
index a5a0d34f6..a5a0d34f6 100644
--- a/graphics/pokemon/front_pics/quilava_still_front_pic.png
+++ b/graphics/pokemon/quilava/front.png
diff --git a/graphics/pokemon/icons/quilava_icon.png b/graphics/pokemon/quilava/icon.png
index 62d0608dd..62d0608dd 100644
--- a/graphics/pokemon/icons/quilava_icon.png
+++ b/graphics/pokemon/quilava/icon.png
diff --git a/graphics/pokemon/palettes/quilava_palette.pal b/graphics/pokemon/quilava/normal.pal
index 0b37faf22..0b37faf22 100644
--- a/graphics/pokemon/palettes/quilava_palette.pal
+++ b/graphics/pokemon/quilava/normal.pal
diff --git a/graphics/pokemon/palettes/quilava_shiny_palette.pal b/graphics/pokemon/quilava/shiny.pal
index e1baba127..e1baba127 100644
--- a/graphics/pokemon/palettes/quilava_shiny_palette.pal
+++ b/graphics/pokemon/quilava/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/qwilfish_front_pic.png b/graphics/pokemon/qwilfish/anim_front.png
index 4cfbe002e..4cfbe002e 100644
--- a/graphics/pokemon/anim_front_pics/qwilfish_front_pic.png
+++ b/graphics/pokemon/qwilfish/anim_front.png
diff --git a/graphics/pokemon/back_pics/qwilfish_back_pic.png b/graphics/pokemon/qwilfish/back.png
index 34fb6e12e..34fb6e12e 100644
--- a/graphics/pokemon/back_pics/qwilfish_back_pic.png
+++ b/graphics/pokemon/qwilfish/back.png
diff --git a/graphics/pokemon/footprints/qwilfish_footprint.png b/graphics/pokemon/qwilfish/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/qwilfish_footprint.png
+++ b/graphics/pokemon/qwilfish/footprint.png
diff --git a/graphics/pokemon/front_pics/qwilfish_still_front_pic.png b/graphics/pokemon/qwilfish/front.png
index 67266d4af..67266d4af 100644
--- a/graphics/pokemon/front_pics/qwilfish_still_front_pic.png
+++ b/graphics/pokemon/qwilfish/front.png
diff --git a/graphics/pokemon/icons/qwilfish_icon.png b/graphics/pokemon/qwilfish/icon.png
index b0fc12302..b0fc12302 100644
--- a/graphics/pokemon/icons/qwilfish_icon.png
+++ b/graphics/pokemon/qwilfish/icon.png
diff --git a/graphics/pokemon/palettes/qwilfish_palette.pal b/graphics/pokemon/qwilfish/normal.pal
index 1956e57c4..1956e57c4 100644
--- a/graphics/pokemon/palettes/qwilfish_palette.pal
+++ b/graphics/pokemon/qwilfish/normal.pal
diff --git a/graphics/pokemon/palettes/qwilfish_shiny_palette.pal b/graphics/pokemon/qwilfish/shiny.pal
index d548d12e9..d548d12e9 100644
--- a/graphics/pokemon/palettes/qwilfish_shiny_palette.pal
+++ b/graphics/pokemon/qwilfish/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/raichu_front_pic.png b/graphics/pokemon/raichu/anim_front.png
index 722c0ff59..722c0ff59 100644
--- a/graphics/pokemon/anim_front_pics/raichu_front_pic.png
+++ b/graphics/pokemon/raichu/anim_front.png
diff --git a/graphics/pokemon/back_pics/raichu_back_pic.png b/graphics/pokemon/raichu/back.png
index 6f8a0afcd..6f8a0afcd 100644
--- a/graphics/pokemon/back_pics/raichu_back_pic.png
+++ b/graphics/pokemon/raichu/back.png
diff --git a/graphics/pokemon/footprints/raichu_footprint.png b/graphics/pokemon/raichu/footprint.png
index 9f2ac3993..9f2ac3993 100644
--- a/graphics/pokemon/footprints/raichu_footprint.png
+++ b/graphics/pokemon/raichu/footprint.png
diff --git a/graphics/pokemon/front_pics/raichu_still_front_pic.png b/graphics/pokemon/raichu/front.png
index d1357f521..d1357f521 100644
--- a/graphics/pokemon/front_pics/raichu_still_front_pic.png
+++ b/graphics/pokemon/raichu/front.png
diff --git a/graphics/pokemon/icons/raichu_icon.png b/graphics/pokemon/raichu/icon.png
index a34997b47..a34997b47 100644
--- a/graphics/pokemon/icons/raichu_icon.png
+++ b/graphics/pokemon/raichu/icon.png
diff --git a/graphics/pokemon/palettes/raichu_palette.pal b/graphics/pokemon/raichu/normal.pal
index c04e9d81c..c04e9d81c 100644
--- a/graphics/pokemon/palettes/raichu_palette.pal
+++ b/graphics/pokemon/raichu/normal.pal
diff --git a/graphics/pokemon/palettes/raichu_shiny_palette.pal b/graphics/pokemon/raichu/shiny.pal
index 40e16fa6c..40e16fa6c 100644
--- a/graphics/pokemon/palettes/raichu_shiny_palette.pal
+++ b/graphics/pokemon/raichu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/raikou_front_pic.png b/graphics/pokemon/raikou/anim_front.png
index a0149846d..a0149846d 100644
--- a/graphics/pokemon/anim_front_pics/raikou_front_pic.png
+++ b/graphics/pokemon/raikou/anim_front.png
diff --git a/graphics/pokemon/back_pics/raikou_back_pic.png b/graphics/pokemon/raikou/back.png
index e187eda52..e187eda52 100644
--- a/graphics/pokemon/back_pics/raikou_back_pic.png
+++ b/graphics/pokemon/raikou/back.png
diff --git a/graphics/pokemon/footprints/raikou_footprint.png b/graphics/pokemon/raikou/footprint.png
index b7081dcd3..b7081dcd3 100644
--- a/graphics/pokemon/footprints/raikou_footprint.png
+++ b/graphics/pokemon/raikou/footprint.png
diff --git a/graphics/pokemon/front_pics/raikou_still_front_pic.png b/graphics/pokemon/raikou/front.png
index f9ee02ea9..f9ee02ea9 100644
--- a/graphics/pokemon/front_pics/raikou_still_front_pic.png
+++ b/graphics/pokemon/raikou/front.png
diff --git a/graphics/pokemon/icons/raikou_icon.png b/graphics/pokemon/raikou/icon.png
index 7847a6f16..7847a6f16 100644
--- a/graphics/pokemon/icons/raikou_icon.png
+++ b/graphics/pokemon/raikou/icon.png
diff --git a/graphics/pokemon/palettes/raikou_palette.pal b/graphics/pokemon/raikou/normal.pal
index 975f92b23..975f92b23 100644
--- a/graphics/pokemon/palettes/raikou_palette.pal
+++ b/graphics/pokemon/raikou/normal.pal
diff --git a/graphics/pokemon/palettes/raikou_shiny_palette.pal b/graphics/pokemon/raikou/shiny.pal
index 73bbcb405..73bbcb405 100644
--- a/graphics/pokemon/palettes/raikou_shiny_palette.pal
+++ b/graphics/pokemon/raikou/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ralts_front_pic.png b/graphics/pokemon/ralts/anim_front.png
index cb19276d8..cb19276d8 100644
--- a/graphics/pokemon/anim_front_pics/ralts_front_pic.png
+++ b/graphics/pokemon/ralts/anim_front.png
diff --git a/graphics/pokemon/back_pics/ralts_back_pic.png b/graphics/pokemon/ralts/back.png
index 926bdc0ab..926bdc0ab 100644
--- a/graphics/pokemon/back_pics/ralts_back_pic.png
+++ b/graphics/pokemon/ralts/back.png
diff --git a/graphics/pokemon/footprints/ralts_footprint.png b/graphics/pokemon/ralts/footprint.png
index 6965dbe60..6965dbe60 100644
--- a/graphics/pokemon/footprints/ralts_footprint.png
+++ b/graphics/pokemon/ralts/footprint.png
diff --git a/graphics/pokemon/front_pics/ralts_still_front_pic.png b/graphics/pokemon/ralts/front.png
index dc4551880..dc4551880 100644
--- a/graphics/pokemon/front_pics/ralts_still_front_pic.png
+++ b/graphics/pokemon/ralts/front.png
diff --git a/graphics/pokemon/icons/ralts_icon.png b/graphics/pokemon/ralts/icon.png
index ed99d3427..ed99d3427 100644
--- a/graphics/pokemon/icons/ralts_icon.png
+++ b/graphics/pokemon/ralts/icon.png
diff --git a/graphics/pokemon/palettes/ralts_palette.pal b/graphics/pokemon/ralts/normal.pal
index 1e513ae87..1e513ae87 100644
--- a/graphics/pokemon/palettes/ralts_palette.pal
+++ b/graphics/pokemon/ralts/normal.pal
diff --git a/graphics/pokemon/palettes/ralts_shiny_palette.pal b/graphics/pokemon/ralts/shiny.pal
index b588f6eea..b588f6eea 100644
--- a/graphics/pokemon/palettes/ralts_shiny_palette.pal
+++ b/graphics/pokemon/ralts/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/rapidash_front_pic.png b/graphics/pokemon/rapidash/anim_front.png
index 69ba93ebe..69ba93ebe 100644
--- a/graphics/pokemon/anim_front_pics/rapidash_front_pic.png
+++ b/graphics/pokemon/rapidash/anim_front.png
diff --git a/graphics/pokemon/back_pics/rapidash_back_pic.png b/graphics/pokemon/rapidash/back.png
index 7d4b9667e..7d4b9667e 100644
--- a/graphics/pokemon/back_pics/rapidash_back_pic.png
+++ b/graphics/pokemon/rapidash/back.png
diff --git a/graphics/pokemon/footprints/rapidash_footprint.png b/graphics/pokemon/rapidash/footprint.png
index 3361489fd..3361489fd 100644
--- a/graphics/pokemon/footprints/rapidash_footprint.png
+++ b/graphics/pokemon/rapidash/footprint.png
diff --git a/graphics/pokemon/front_pics/rapidash_still_front_pic.png b/graphics/pokemon/rapidash/front.png
index ead8745a6..ead8745a6 100644
--- a/graphics/pokemon/front_pics/rapidash_still_front_pic.png
+++ b/graphics/pokemon/rapidash/front.png
diff --git a/graphics/pokemon/icons/rapidash_icon.png b/graphics/pokemon/rapidash/icon.png
index c0af0dd08..c0af0dd08 100644
--- a/graphics/pokemon/icons/rapidash_icon.png
+++ b/graphics/pokemon/rapidash/icon.png
diff --git a/graphics/pokemon/palettes/rapidash_palette.pal b/graphics/pokemon/rapidash/normal.pal
index dea936aba..dea936aba 100644
--- a/graphics/pokemon/palettes/rapidash_palette.pal
+++ b/graphics/pokemon/rapidash/normal.pal
diff --git a/graphics/pokemon/palettes/rapidash_shiny_palette.pal b/graphics/pokemon/rapidash/shiny.pal
index c65fda218..c65fda218 100644
--- a/graphics/pokemon/palettes/rapidash_shiny_palette.pal
+++ b/graphics/pokemon/rapidash/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/raticate_front_pic.png b/graphics/pokemon/raticate/anim_front.png
index 589201cc9..589201cc9 100644
--- a/graphics/pokemon/anim_front_pics/raticate_front_pic.png
+++ b/graphics/pokemon/raticate/anim_front.png
diff --git a/graphics/pokemon/back_pics/raticate_back_pic.png b/graphics/pokemon/raticate/back.png
index d6c0d8ae2..d6c0d8ae2 100644
--- a/graphics/pokemon/back_pics/raticate_back_pic.png
+++ b/graphics/pokemon/raticate/back.png
diff --git a/graphics/pokemon/footprints/raticate_footprint.png b/graphics/pokemon/raticate/footprint.png
index 6628cfdd7..6628cfdd7 100644
--- a/graphics/pokemon/footprints/raticate_footprint.png
+++ b/graphics/pokemon/raticate/footprint.png
diff --git a/graphics/pokemon/front_pics/raticate_still_front_pic.png b/graphics/pokemon/raticate/front.png
index 7c6f4cdd5..7c6f4cdd5 100644
--- a/graphics/pokemon/front_pics/raticate_still_front_pic.png
+++ b/graphics/pokemon/raticate/front.png
diff --git a/graphics/pokemon/icons/raticate_icon.png b/graphics/pokemon/raticate/icon.png
index 40fbd79c5..40fbd79c5 100644
--- a/graphics/pokemon/icons/raticate_icon.png
+++ b/graphics/pokemon/raticate/icon.png
diff --git a/graphics/pokemon/palettes/raticate_palette.pal b/graphics/pokemon/raticate/normal.pal
index 72981c0d7..72981c0d7 100644
--- a/graphics/pokemon/palettes/raticate_palette.pal
+++ b/graphics/pokemon/raticate/normal.pal
diff --git a/graphics/pokemon/palettes/raticate_shiny_palette.pal b/graphics/pokemon/raticate/shiny.pal
index 15e73219a..15e73219a 100644
--- a/graphics/pokemon/palettes/raticate_shiny_palette.pal
+++ b/graphics/pokemon/raticate/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/rattata_front_pic.png b/graphics/pokemon/rattata/anim_front.png
index 0380429f5..0380429f5 100644
--- a/graphics/pokemon/anim_front_pics/rattata_front_pic.png
+++ b/graphics/pokemon/rattata/anim_front.png
diff --git a/graphics/pokemon/back_pics/rattata_back_pic.png b/graphics/pokemon/rattata/back.png
index 72bb56766..72bb56766 100644
--- a/graphics/pokemon/back_pics/rattata_back_pic.png
+++ b/graphics/pokemon/rattata/back.png
diff --git a/graphics/pokemon/footprints/rattata_footprint.png b/graphics/pokemon/rattata/footprint.png
index 008b1ddc0..008b1ddc0 100644
--- a/graphics/pokemon/footprints/rattata_footprint.png
+++ b/graphics/pokemon/rattata/footprint.png
diff --git a/graphics/pokemon/front_pics/rattata_still_front_pic.png b/graphics/pokemon/rattata/front.png
index 22b945aa9..22b945aa9 100644
--- a/graphics/pokemon/front_pics/rattata_still_front_pic.png
+++ b/graphics/pokemon/rattata/front.png
diff --git a/graphics/pokemon/icons/rattata_icon.png b/graphics/pokemon/rattata/icon.png
index ae7b22258..ae7b22258 100644
--- a/graphics/pokemon/icons/rattata_icon.png
+++ b/graphics/pokemon/rattata/icon.png
diff --git a/graphics/pokemon/palettes/rattata_palette.pal b/graphics/pokemon/rattata/normal.pal
index 971ffed37..971ffed37 100644
--- a/graphics/pokemon/palettes/rattata_palette.pal
+++ b/graphics/pokemon/rattata/normal.pal
diff --git a/graphics/pokemon/palettes/rattata_shiny_palette.pal b/graphics/pokemon/rattata/shiny.pal
index 41a644c54..41a644c54 100644
--- a/graphics/pokemon/palettes/rattata_shiny_palette.pal
+++ b/graphics/pokemon/rattata/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/rayquaza_front_pic.png b/graphics/pokemon/rayquaza/anim_front.png
index 25103d2d4..25103d2d4 100644
--- a/graphics/pokemon/anim_front_pics/rayquaza_front_pic.png
+++ b/graphics/pokemon/rayquaza/anim_front.png
diff --git a/graphics/pokemon/back_pics/rayquaza_back_pic.png b/graphics/pokemon/rayquaza/back.png
index e8b8704a8..e8b8704a8 100644
--- a/graphics/pokemon/back_pics/rayquaza_back_pic.png
+++ b/graphics/pokemon/rayquaza/back.png
diff --git a/graphics/pokemon/footprints/rayquaza_footprint.png b/graphics/pokemon/rayquaza/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/rayquaza_footprint.png
+++ b/graphics/pokemon/rayquaza/footprint.png
diff --git a/graphics/pokemon/front_pics/rayquaza_still_front_pic.png b/graphics/pokemon/rayquaza/front.png
index 29c11180f..29c11180f 100644
--- a/graphics/pokemon/front_pics/rayquaza_still_front_pic.png
+++ b/graphics/pokemon/rayquaza/front.png
diff --git a/graphics/pokemon/icons/rayquaza_icon.png b/graphics/pokemon/rayquaza/icon.png
index 65844ebf7..65844ebf7 100644
--- a/graphics/pokemon/icons/rayquaza_icon.png
+++ b/graphics/pokemon/rayquaza/icon.png
diff --git a/graphics/pokemon/palettes/rayquaza_palette.pal b/graphics/pokemon/rayquaza/normal.pal
index 651b1b9b1..651b1b9b1 100644
--- a/graphics/pokemon/palettes/rayquaza_palette.pal
+++ b/graphics/pokemon/rayquaza/normal.pal
diff --git a/graphics/pokemon/palettes/rayquaza_shiny_palette.pal b/graphics/pokemon/rayquaza/shiny.pal
index c294fa7ca..c294fa7ca 100644
--- a/graphics/pokemon/palettes/rayquaza_shiny_palette.pal
+++ b/graphics/pokemon/rayquaza/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/regice_front_pic.png b/graphics/pokemon/regice/anim_front.png
index e8a38b575..e8a38b575 100644
--- a/graphics/pokemon/anim_front_pics/regice_front_pic.png
+++ b/graphics/pokemon/regice/anim_front.png
diff --git a/graphics/pokemon/back_pics/regice_back_pic.png b/graphics/pokemon/regice/back.png
index 69b091437..69b091437 100644
--- a/graphics/pokemon/back_pics/regice_back_pic.png
+++ b/graphics/pokemon/regice/back.png
diff --git a/graphics/pokemon/footprints/regice_footprint.png b/graphics/pokemon/regice/footprint.png
index 6965dbe60..6965dbe60 100644
--- a/graphics/pokemon/footprints/regice_footprint.png
+++ b/graphics/pokemon/regice/footprint.png
diff --git a/graphics/pokemon/front_pics/regice_still_front_pic.png b/graphics/pokemon/regice/front.png
index 022a3a855..022a3a855 100644
--- a/graphics/pokemon/front_pics/regice_still_front_pic.png
+++ b/graphics/pokemon/regice/front.png
diff --git a/graphics/pokemon/icons/regice_icon.png b/graphics/pokemon/regice/icon.png
index 46b07b3aa..46b07b3aa 100644
--- a/graphics/pokemon/icons/regice_icon.png
+++ b/graphics/pokemon/regice/icon.png
diff --git a/graphics/pokemon/palettes/regice_palette.pal b/graphics/pokemon/regice/normal.pal
index 2d599438d..2d599438d 100644
--- a/graphics/pokemon/palettes/regice_palette.pal
+++ b/graphics/pokemon/regice/normal.pal
diff --git a/graphics/pokemon/palettes/regice_shiny_palette.pal b/graphics/pokemon/regice/shiny.pal
index 0c3dc8a37..0c3dc8a37 100644
--- a/graphics/pokemon/palettes/regice_shiny_palette.pal
+++ b/graphics/pokemon/regice/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/regirock_front_pic.png b/graphics/pokemon/regirock/anim_front.png
index e278efd82..e278efd82 100644
--- a/graphics/pokemon/anim_front_pics/regirock_front_pic.png
+++ b/graphics/pokemon/regirock/anim_front.png
diff --git a/graphics/pokemon/back_pics/regirock_back_pic.png b/graphics/pokemon/regirock/back.png
index 7175fc90a..7175fc90a 100644
--- a/graphics/pokemon/back_pics/regirock_back_pic.png
+++ b/graphics/pokemon/regirock/back.png
diff --git a/graphics/pokemon/footprints/regirock_footprint.png b/graphics/pokemon/regirock/footprint.png
index 44da2a57f..44da2a57f 100644
--- a/graphics/pokemon/footprints/regirock_footprint.png
+++ b/graphics/pokemon/regirock/footprint.png
diff --git a/graphics/pokemon/front_pics/regirock_still_front_pic.png b/graphics/pokemon/regirock/front.png
index 9e179079a..9e179079a 100644
--- a/graphics/pokemon/front_pics/regirock_still_front_pic.png
+++ b/graphics/pokemon/regirock/front.png
diff --git a/graphics/pokemon/icons/regirock_icon.png b/graphics/pokemon/regirock/icon.png
index e69836744..e69836744 100644
--- a/graphics/pokemon/icons/regirock_icon.png
+++ b/graphics/pokemon/regirock/icon.png
diff --git a/graphics/pokemon/palettes/regirock_palette.pal b/graphics/pokemon/regirock/normal.pal
index f577420cb..f577420cb 100644
--- a/graphics/pokemon/palettes/regirock_palette.pal
+++ b/graphics/pokemon/regirock/normal.pal
diff --git a/graphics/pokemon/palettes/regirock_shiny_palette.pal b/graphics/pokemon/regirock/shiny.pal
index b997589cc..b997589cc 100644
--- a/graphics/pokemon/palettes/regirock_shiny_palette.pal
+++ b/graphics/pokemon/regirock/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/registeel_front_pic.png b/graphics/pokemon/registeel/anim_front.png
index 17ddf8ff1..17ddf8ff1 100644
--- a/graphics/pokemon/anim_front_pics/registeel_front_pic.png
+++ b/graphics/pokemon/registeel/anim_front.png
diff --git a/graphics/pokemon/back_pics/registeel_back_pic.png b/graphics/pokemon/registeel/back.png
index 233240d45..233240d45 100644
--- a/graphics/pokemon/back_pics/registeel_back_pic.png
+++ b/graphics/pokemon/registeel/back.png
diff --git a/graphics/pokemon/footprints/registeel_footprint.png b/graphics/pokemon/registeel/footprint.png
index e191faabc..e191faabc 100644
--- a/graphics/pokemon/footprints/registeel_footprint.png
+++ b/graphics/pokemon/registeel/footprint.png
diff --git a/graphics/pokemon/front_pics/registeel_still_front_pic.png b/graphics/pokemon/registeel/front.png
index d7fe7e101..d7fe7e101 100644
--- a/graphics/pokemon/front_pics/registeel_still_front_pic.png
+++ b/graphics/pokemon/registeel/front.png
diff --git a/graphics/pokemon/icons/registeel_icon.png b/graphics/pokemon/registeel/icon.png
index 5a8cd3d19..5a8cd3d19 100644
--- a/graphics/pokemon/icons/registeel_icon.png
+++ b/graphics/pokemon/registeel/icon.png
diff --git a/graphics/pokemon/palettes/registeel_palette.pal b/graphics/pokemon/registeel/normal.pal
index 9d7d328f4..9d7d328f4 100644
--- a/graphics/pokemon/palettes/registeel_palette.pal
+++ b/graphics/pokemon/registeel/normal.pal
diff --git a/graphics/pokemon/palettes/registeel_shiny_palette.pal b/graphics/pokemon/registeel/shiny.pal
index e0489363a..e0489363a 100644
--- a/graphics/pokemon/palettes/registeel_shiny_palette.pal
+++ b/graphics/pokemon/registeel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/relicanth_front_pic.png b/graphics/pokemon/relicanth/anim_front.png
index 3a6216ed7..3a6216ed7 100644
--- a/graphics/pokemon/anim_front_pics/relicanth_front_pic.png
+++ b/graphics/pokemon/relicanth/anim_front.png
diff --git a/graphics/pokemon/back_pics/relicanth_back_pic.png b/graphics/pokemon/relicanth/back.png
index c9ae2e572..c9ae2e572 100644
--- a/graphics/pokemon/back_pics/relicanth_back_pic.png
+++ b/graphics/pokemon/relicanth/back.png
diff --git a/graphics/pokemon/footprints/relicanth_footprint.png b/graphics/pokemon/relicanth/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/relicanth_footprint.png
+++ b/graphics/pokemon/relicanth/footprint.png
diff --git a/graphics/pokemon/front_pics/relicanth_still_front_pic.png b/graphics/pokemon/relicanth/front.png
index 41886e9e2..41886e9e2 100644
--- a/graphics/pokemon/front_pics/relicanth_still_front_pic.png
+++ b/graphics/pokemon/relicanth/front.png
diff --git a/graphics/pokemon/icons/relicanth_icon.png b/graphics/pokemon/relicanth/icon.png
index da17eec33..da17eec33 100644
--- a/graphics/pokemon/icons/relicanth_icon.png
+++ b/graphics/pokemon/relicanth/icon.png
diff --git a/graphics/pokemon/palettes/relicanth_palette.pal b/graphics/pokemon/relicanth/normal.pal
index 2a95fb3cb..2a95fb3cb 100644
--- a/graphics/pokemon/palettes/relicanth_palette.pal
+++ b/graphics/pokemon/relicanth/normal.pal
diff --git a/graphics/pokemon/palettes/relicanth_shiny_palette.pal b/graphics/pokemon/relicanth/shiny.pal
index 3c3780470..3c3780470 100644
--- a/graphics/pokemon/palettes/relicanth_shiny_palette.pal
+++ b/graphics/pokemon/relicanth/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/remoraid_front_pic.png b/graphics/pokemon/remoraid/anim_front.png
index 73b643b99..73b643b99 100644
--- a/graphics/pokemon/anim_front_pics/remoraid_front_pic.png
+++ b/graphics/pokemon/remoraid/anim_front.png
diff --git a/graphics/pokemon/back_pics/remoraid_back_pic.png b/graphics/pokemon/remoraid/back.png
index 22e48fa6d..22e48fa6d 100644
--- a/graphics/pokemon/back_pics/remoraid_back_pic.png
+++ b/graphics/pokemon/remoraid/back.png
diff --git a/graphics/pokemon/footprints/remoraid_footprint.png b/graphics/pokemon/remoraid/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/remoraid_footprint.png
+++ b/graphics/pokemon/remoraid/footprint.png
diff --git a/graphics/pokemon/front_pics/remoraid_still_front_pic.png b/graphics/pokemon/remoraid/front.png
index b80e2af89..b80e2af89 100644
--- a/graphics/pokemon/front_pics/remoraid_still_front_pic.png
+++ b/graphics/pokemon/remoraid/front.png
diff --git a/graphics/pokemon/icons/remoraid_icon.png b/graphics/pokemon/remoraid/icon.png
index efbe4ace3..efbe4ace3 100644
--- a/graphics/pokemon/icons/remoraid_icon.png
+++ b/graphics/pokemon/remoraid/icon.png
diff --git a/graphics/pokemon/palettes/remoraid_palette.pal b/graphics/pokemon/remoraid/normal.pal
index 4d8f3326c..4d8f3326c 100644
--- a/graphics/pokemon/palettes/remoraid_palette.pal
+++ b/graphics/pokemon/remoraid/normal.pal
diff --git a/graphics/pokemon/palettes/remoraid_shiny_palette.pal b/graphics/pokemon/remoraid/shiny.pal
index b9fd05014..b9fd05014 100644
--- a/graphics/pokemon/palettes/remoraid_shiny_palette.pal
+++ b/graphics/pokemon/remoraid/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/rhydon_front_pic.png b/graphics/pokemon/rhydon/anim_front.png
index 6f1f5fda9..6f1f5fda9 100644
--- a/graphics/pokemon/anim_front_pics/rhydon_front_pic.png
+++ b/graphics/pokemon/rhydon/anim_front.png
diff --git a/graphics/pokemon/back_pics/rhydon_back_pic.png b/graphics/pokemon/rhydon/back.png
index 4acc986ba..4acc986ba 100644
--- a/graphics/pokemon/back_pics/rhydon_back_pic.png
+++ b/graphics/pokemon/rhydon/back.png
diff --git a/graphics/pokemon/footprints/rhydon_footprint.png b/graphics/pokemon/rhydon/footprint.png
index df6d8fced..df6d8fced 100644
--- a/graphics/pokemon/footprints/rhydon_footprint.png
+++ b/graphics/pokemon/rhydon/footprint.png
diff --git a/graphics/pokemon/front_pics/rhydon_still_front_pic.png b/graphics/pokemon/rhydon/front.png
index cd57b4728..cd57b4728 100644
--- a/graphics/pokemon/front_pics/rhydon_still_front_pic.png
+++ b/graphics/pokemon/rhydon/front.png
diff --git a/graphics/pokemon/icons/rhydon_icon.png b/graphics/pokemon/rhydon/icon.png
index 3bf633680..3bf633680 100644
--- a/graphics/pokemon/icons/rhydon_icon.png
+++ b/graphics/pokemon/rhydon/icon.png
diff --git a/graphics/pokemon/palettes/rhydon_palette.pal b/graphics/pokemon/rhydon/normal.pal
index 1874d9eb7..1874d9eb7 100644
--- a/graphics/pokemon/palettes/rhydon_palette.pal
+++ b/graphics/pokemon/rhydon/normal.pal
diff --git a/graphics/pokemon/palettes/rhydon_shiny_palette.pal b/graphics/pokemon/rhydon/shiny.pal
index 1e71e3ac5..1e71e3ac5 100644
--- a/graphics/pokemon/palettes/rhydon_shiny_palette.pal
+++ b/graphics/pokemon/rhydon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/rhyhorn_front_pic.png b/graphics/pokemon/rhyhorn/anim_front.png
index eb62ec8a0..eb62ec8a0 100644
--- a/graphics/pokemon/anim_front_pics/rhyhorn_front_pic.png
+++ b/graphics/pokemon/rhyhorn/anim_front.png
diff --git a/graphics/pokemon/back_pics/rhyhorn_back_pic.png b/graphics/pokemon/rhyhorn/back.png
index 67d006205..67d006205 100644
--- a/graphics/pokemon/back_pics/rhyhorn_back_pic.png
+++ b/graphics/pokemon/rhyhorn/back.png
diff --git a/graphics/pokemon/footprints/rhyhorn_footprint.png b/graphics/pokemon/rhyhorn/footprint.png
index 632b753c2..632b753c2 100644
--- a/graphics/pokemon/footprints/rhyhorn_footprint.png
+++ b/graphics/pokemon/rhyhorn/footprint.png
diff --git a/graphics/pokemon/front_pics/rhyhorn_still_front_pic.png b/graphics/pokemon/rhyhorn/front.png
index a1140944d..a1140944d 100644
--- a/graphics/pokemon/front_pics/rhyhorn_still_front_pic.png
+++ b/graphics/pokemon/rhyhorn/front.png
diff --git a/graphics/pokemon/icons/rhyhorn_icon.png b/graphics/pokemon/rhyhorn/icon.png
index 03bb348e7..03bb348e7 100644
--- a/graphics/pokemon/icons/rhyhorn_icon.png
+++ b/graphics/pokemon/rhyhorn/icon.png
diff --git a/graphics/pokemon/palettes/rhyhorn_palette.pal b/graphics/pokemon/rhyhorn/normal.pal
index bf720235e..bf720235e 100644
--- a/graphics/pokemon/palettes/rhyhorn_palette.pal
+++ b/graphics/pokemon/rhyhorn/normal.pal
diff --git a/graphics/pokemon/palettes/rhyhorn_shiny_palette.pal b/graphics/pokemon/rhyhorn/shiny.pal
index 64280c939..64280c939 100644
--- a/graphics/pokemon/palettes/rhyhorn_shiny_palette.pal
+++ b/graphics/pokemon/rhyhorn/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/roselia_front_pic.png b/graphics/pokemon/roselia/anim_front.png
index 0b9cfdf0b..0b9cfdf0b 100644
--- a/graphics/pokemon/anim_front_pics/roselia_front_pic.png
+++ b/graphics/pokemon/roselia/anim_front.png
diff --git a/graphics/pokemon/back_pics/roselia_back_pic.png b/graphics/pokemon/roselia/back.png
index 5275c801d..5275c801d 100644
--- a/graphics/pokemon/back_pics/roselia_back_pic.png
+++ b/graphics/pokemon/roselia/back.png
diff --git a/graphics/pokemon/footprints/roselia_footprint.png b/graphics/pokemon/roselia/footprint.png
index bedf2ab69..bedf2ab69 100644
--- a/graphics/pokemon/footprints/roselia_footprint.png
+++ b/graphics/pokemon/roselia/footprint.png
diff --git a/graphics/pokemon/front_pics/roselia_still_front_pic.png b/graphics/pokemon/roselia/front.png
index d018ba658..d018ba658 100644
--- a/graphics/pokemon/front_pics/roselia_still_front_pic.png
+++ b/graphics/pokemon/roselia/front.png
diff --git a/graphics/pokemon/icons/roselia_icon.png b/graphics/pokemon/roselia/icon.png
index fc63c9644..fc63c9644 100644
--- a/graphics/pokemon/icons/roselia_icon.png
+++ b/graphics/pokemon/roselia/icon.png
diff --git a/graphics/pokemon/palettes/roselia_palette.pal b/graphics/pokemon/roselia/normal.pal
index a96e5081c..a96e5081c 100644
--- a/graphics/pokemon/palettes/roselia_palette.pal
+++ b/graphics/pokemon/roselia/normal.pal
diff --git a/graphics/pokemon/palettes/roselia_shiny_palette.pal b/graphics/pokemon/roselia/shiny.pal
index eebb104af..eebb104af 100644
--- a/graphics/pokemon/palettes/roselia_shiny_palette.pal
+++ b/graphics/pokemon/roselia/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sableye_front_pic.png b/graphics/pokemon/sableye/anim_front.png
index 3b70ec40f..3b70ec40f 100644
--- a/graphics/pokemon/anim_front_pics/sableye_front_pic.png
+++ b/graphics/pokemon/sableye/anim_front.png
diff --git a/graphics/pokemon/back_pics/sableye_back_pic.png b/graphics/pokemon/sableye/back.png
index 75c12743c..75c12743c 100644
--- a/graphics/pokemon/back_pics/sableye_back_pic.png
+++ b/graphics/pokemon/sableye/back.png
diff --git a/graphics/pokemon/footprints/sableye_footprint.png b/graphics/pokemon/sableye/footprint.png
index 204d8da54..204d8da54 100644
--- a/graphics/pokemon/footprints/sableye_footprint.png
+++ b/graphics/pokemon/sableye/footprint.png
diff --git a/graphics/pokemon/front_pics/sableye_still_front_pic.png b/graphics/pokemon/sableye/front.png
index 5004a61ec..5004a61ec 100644
--- a/graphics/pokemon/front_pics/sableye_still_front_pic.png
+++ b/graphics/pokemon/sableye/front.png
diff --git a/graphics/pokemon/icons/sableye_icon.png b/graphics/pokemon/sableye/icon.png
index e8ac1307e..e8ac1307e 100644
--- a/graphics/pokemon/icons/sableye_icon.png
+++ b/graphics/pokemon/sableye/icon.png
diff --git a/graphics/pokemon/palettes/sableye_palette.pal b/graphics/pokemon/sableye/normal.pal
index 89a2bed0a..89a2bed0a 100644
--- a/graphics/pokemon/palettes/sableye_palette.pal
+++ b/graphics/pokemon/sableye/normal.pal
diff --git a/graphics/pokemon/palettes/sableye_shiny_palette.pal b/graphics/pokemon/sableye/shiny.pal
index 8b03a2efe..8b03a2efe 100644
--- a/graphics/pokemon/palettes/sableye_shiny_palette.pal
+++ b/graphics/pokemon/sableye/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/salamence_front_pic.png b/graphics/pokemon/salamence/anim_front.png
index 7d1af0efb..7d1af0efb 100644
--- a/graphics/pokemon/anim_front_pics/salamence_front_pic.png
+++ b/graphics/pokemon/salamence/anim_front.png
diff --git a/graphics/pokemon/back_pics/salamence_back_pic.png b/graphics/pokemon/salamence/back.png
index 748147e77..748147e77 100644
--- a/graphics/pokemon/back_pics/salamence_back_pic.png
+++ b/graphics/pokemon/salamence/back.png
diff --git a/graphics/pokemon/footprints/salamence_footprint.png b/graphics/pokemon/salamence/footprint.png
index 2440a370f..2440a370f 100644
--- a/graphics/pokemon/footprints/salamence_footprint.png
+++ b/graphics/pokemon/salamence/footprint.png
diff --git a/graphics/pokemon/front_pics/salamence_still_front_pic.png b/graphics/pokemon/salamence/front.png
index 97db0937c..97db0937c 100644
--- a/graphics/pokemon/front_pics/salamence_still_front_pic.png
+++ b/graphics/pokemon/salamence/front.png
diff --git a/graphics/pokemon/icons/salamence_icon.png b/graphics/pokemon/salamence/icon.png
index b4c925502..b4c925502 100644
--- a/graphics/pokemon/icons/salamence_icon.png
+++ b/graphics/pokemon/salamence/icon.png
diff --git a/graphics/pokemon/palettes/salamence_palette.pal b/graphics/pokemon/salamence/normal.pal
index 8ee78691f..8ee78691f 100644
--- a/graphics/pokemon/palettes/salamence_palette.pal
+++ b/graphics/pokemon/salamence/normal.pal
diff --git a/graphics/pokemon/palettes/salamence_shiny_palette.pal b/graphics/pokemon/salamence/shiny.pal
index bf2da08f2..bf2da08f2 100644
--- a/graphics/pokemon/palettes/salamence_shiny_palette.pal
+++ b/graphics/pokemon/salamence/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sandshrew_front_pic.png b/graphics/pokemon/sandshrew/anim_front.png
index 8382009fd..8382009fd 100644
--- a/graphics/pokemon/anim_front_pics/sandshrew_front_pic.png
+++ b/graphics/pokemon/sandshrew/anim_front.png
diff --git a/graphics/pokemon/back_pics/sandshrew_back_pic.png b/graphics/pokemon/sandshrew/back.png
index 86fa10ec8..86fa10ec8 100644
--- a/graphics/pokemon/back_pics/sandshrew_back_pic.png
+++ b/graphics/pokemon/sandshrew/back.png
diff --git a/graphics/pokemon/footprints/sandshrew_footprint.png b/graphics/pokemon/sandshrew/footprint.png
index 481de0993..481de0993 100644
--- a/graphics/pokemon/footprints/sandshrew_footprint.png
+++ b/graphics/pokemon/sandshrew/footprint.png
diff --git a/graphics/pokemon/front_pics/sandshrew_still_front_pic.png b/graphics/pokemon/sandshrew/front.png
index e63f71814..e63f71814 100644
--- a/graphics/pokemon/front_pics/sandshrew_still_front_pic.png
+++ b/graphics/pokemon/sandshrew/front.png
diff --git a/graphics/pokemon/icons/sandshrew_icon.png b/graphics/pokemon/sandshrew/icon.png
index 5919f1095..5919f1095 100644
--- a/graphics/pokemon/icons/sandshrew_icon.png
+++ b/graphics/pokemon/sandshrew/icon.png
diff --git a/graphics/pokemon/palettes/sandshrew_palette.pal b/graphics/pokemon/sandshrew/normal.pal
index 5f537b591..5f537b591 100644
--- a/graphics/pokemon/palettes/sandshrew_palette.pal
+++ b/graphics/pokemon/sandshrew/normal.pal
diff --git a/graphics/pokemon/palettes/sandshrew_shiny_palette.pal b/graphics/pokemon/sandshrew/shiny.pal
index ce7877a66..ce7877a66 100644
--- a/graphics/pokemon/palettes/sandshrew_shiny_palette.pal
+++ b/graphics/pokemon/sandshrew/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sandslash_front_pic.png b/graphics/pokemon/sandslash/anim_front.png
index b71e3bc7d..b71e3bc7d 100644
--- a/graphics/pokemon/anim_front_pics/sandslash_front_pic.png
+++ b/graphics/pokemon/sandslash/anim_front.png
diff --git a/graphics/pokemon/back_pics/sandslash_back_pic.png b/graphics/pokemon/sandslash/back.png
index 64c305047..64c305047 100644
--- a/graphics/pokemon/back_pics/sandslash_back_pic.png
+++ b/graphics/pokemon/sandslash/back.png
diff --git a/graphics/pokemon/footprints/sandslash_footprint.png b/graphics/pokemon/sandslash/footprint.png
index 431ca99be..431ca99be 100644
--- a/graphics/pokemon/footprints/sandslash_footprint.png
+++ b/graphics/pokemon/sandslash/footprint.png
diff --git a/graphics/pokemon/front_pics/sandslash_still_front_pic.png b/graphics/pokemon/sandslash/front.png
index f8090078a..f8090078a 100644
--- a/graphics/pokemon/front_pics/sandslash_still_front_pic.png
+++ b/graphics/pokemon/sandslash/front.png
diff --git a/graphics/pokemon/icons/sandslash_icon.png b/graphics/pokemon/sandslash/icon.png
index 08198e6b2..08198e6b2 100644
--- a/graphics/pokemon/icons/sandslash_icon.png
+++ b/graphics/pokemon/sandslash/icon.png
diff --git a/graphics/pokemon/palettes/sandslash_palette.pal b/graphics/pokemon/sandslash/normal.pal
index a9122fbf6..a9122fbf6 100644
--- a/graphics/pokemon/palettes/sandslash_palette.pal
+++ b/graphics/pokemon/sandslash/normal.pal
diff --git a/graphics/pokemon/palettes/sandslash_shiny_palette.pal b/graphics/pokemon/sandslash/shiny.pal
index 8d1cca9b2..8d1cca9b2 100644
--- a/graphics/pokemon/palettes/sandslash_shiny_palette.pal
+++ b/graphics/pokemon/sandslash/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sceptile_front_pic.png b/graphics/pokemon/sceptile/anim_front.png
index 74473e2e5..74473e2e5 100644
--- a/graphics/pokemon/anim_front_pics/sceptile_front_pic.png
+++ b/graphics/pokemon/sceptile/anim_front.png
diff --git a/graphics/pokemon/back_pics/sceptile_back_pic.png b/graphics/pokemon/sceptile/back.png
index 5b7e8696e..5b7e8696e 100644
--- a/graphics/pokemon/back_pics/sceptile_back_pic.png
+++ b/graphics/pokemon/sceptile/back.png
diff --git a/graphics/pokemon/footprints/sceptile_footprint.png b/graphics/pokemon/sceptile/footprint.png
index 1958a4778..1958a4778 100644
--- a/graphics/pokemon/footprints/sceptile_footprint.png
+++ b/graphics/pokemon/sceptile/footprint.png
diff --git a/graphics/pokemon/front_pics/sceptile_still_front_pic.png b/graphics/pokemon/sceptile/front.png
index f6ce3a054..f6ce3a054 100644
--- a/graphics/pokemon/front_pics/sceptile_still_front_pic.png
+++ b/graphics/pokemon/sceptile/front.png
diff --git a/graphics/pokemon/icons/sceptile_icon.png b/graphics/pokemon/sceptile/icon.png
index d144941e0..d144941e0 100644
--- a/graphics/pokemon/icons/sceptile_icon.png
+++ b/graphics/pokemon/sceptile/icon.png
diff --git a/graphics/pokemon/palettes/sceptile_palette.pal b/graphics/pokemon/sceptile/normal.pal
index 31f822b0c..31f822b0c 100644
--- a/graphics/pokemon/palettes/sceptile_palette.pal
+++ b/graphics/pokemon/sceptile/normal.pal
diff --git a/graphics/pokemon/palettes/sceptile_shiny_palette.pal b/graphics/pokemon/sceptile/shiny.pal
index 9a6882bf4..9a6882bf4 100644
--- a/graphics/pokemon/palettes/sceptile_shiny_palette.pal
+++ b/graphics/pokemon/sceptile/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/scizor_front_pic.png b/graphics/pokemon/scizor/anim_front.png
index 9005f3438..9005f3438 100644
--- a/graphics/pokemon/anim_front_pics/scizor_front_pic.png
+++ b/graphics/pokemon/scizor/anim_front.png
diff --git a/graphics/pokemon/back_pics/scizor_back_pic.png b/graphics/pokemon/scizor/back.png
index b31f50da1..b31f50da1 100644
--- a/graphics/pokemon/back_pics/scizor_back_pic.png
+++ b/graphics/pokemon/scizor/back.png
diff --git a/graphics/pokemon/footprints/scizor_footprint.png b/graphics/pokemon/scizor/footprint.png
index 00824374a..00824374a 100644
--- a/graphics/pokemon/footprints/scizor_footprint.png
+++ b/graphics/pokemon/scizor/footprint.png
diff --git a/graphics/pokemon/front_pics/scizor_still_front_pic.png b/graphics/pokemon/scizor/front.png
index 33bdef332..33bdef332 100644
--- a/graphics/pokemon/front_pics/scizor_still_front_pic.png
+++ b/graphics/pokemon/scizor/front.png
diff --git a/graphics/pokemon/icons/scizor_icon.png b/graphics/pokemon/scizor/icon.png
index 0a8667832..0a8667832 100644
--- a/graphics/pokemon/icons/scizor_icon.png
+++ b/graphics/pokemon/scizor/icon.png
diff --git a/graphics/pokemon/palettes/scizor_palette.pal b/graphics/pokemon/scizor/normal.pal
index a9310feae..a9310feae 100644
--- a/graphics/pokemon/palettes/scizor_palette.pal
+++ b/graphics/pokemon/scizor/normal.pal
diff --git a/graphics/pokemon/palettes/scizor_shiny_palette.pal b/graphics/pokemon/scizor/shiny.pal
index 93e8e479b..93e8e479b 100644
--- a/graphics/pokemon/palettes/scizor_shiny_palette.pal
+++ b/graphics/pokemon/scizor/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/scyther_front_pic.png b/graphics/pokemon/scyther/anim_front.png
index 90b7ad4a8..90b7ad4a8 100644
--- a/graphics/pokemon/anim_front_pics/scyther_front_pic.png
+++ b/graphics/pokemon/scyther/anim_front.png
diff --git a/graphics/pokemon/back_pics/scyther_back_pic.png b/graphics/pokemon/scyther/back.png
index a1b9d1591..a1b9d1591 100644
--- a/graphics/pokemon/back_pics/scyther_back_pic.png
+++ b/graphics/pokemon/scyther/back.png
diff --git a/graphics/pokemon/footprints/scyther_footprint.png b/graphics/pokemon/scyther/footprint.png
index c6b773028..c6b773028 100644
--- a/graphics/pokemon/footprints/scyther_footprint.png
+++ b/graphics/pokemon/scyther/footprint.png
diff --git a/graphics/pokemon/front_pics/scyther_still_front_pic.png b/graphics/pokemon/scyther/front.png
index c8420f5a9..c8420f5a9 100644
--- a/graphics/pokemon/front_pics/scyther_still_front_pic.png
+++ b/graphics/pokemon/scyther/front.png
diff --git a/graphics/pokemon/icons/scyther_icon.png b/graphics/pokemon/scyther/icon.png
index 62f94bba6..62f94bba6 100644
--- a/graphics/pokemon/icons/scyther_icon.png
+++ b/graphics/pokemon/scyther/icon.png
diff --git a/graphics/pokemon/palettes/scyther_palette.pal b/graphics/pokemon/scyther/normal.pal
index 8678b0bc3..8678b0bc3 100644
--- a/graphics/pokemon/palettes/scyther_palette.pal
+++ b/graphics/pokemon/scyther/normal.pal
diff --git a/graphics/pokemon/palettes/scyther_shiny_palette.pal b/graphics/pokemon/scyther/shiny.pal
index 131fff636..131fff636 100644
--- a/graphics/pokemon/palettes/scyther_shiny_palette.pal
+++ b/graphics/pokemon/scyther/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/seadra_front_pic.png b/graphics/pokemon/seadra/anim_front.png
index c9fc064a4..c9fc064a4 100644
--- a/graphics/pokemon/anim_front_pics/seadra_front_pic.png
+++ b/graphics/pokemon/seadra/anim_front.png
diff --git a/graphics/pokemon/back_pics/seadra_back_pic.png b/graphics/pokemon/seadra/back.png
index 526d7495c..526d7495c 100644
--- a/graphics/pokemon/back_pics/seadra_back_pic.png
+++ b/graphics/pokemon/seadra/back.png
diff --git a/graphics/pokemon/footprints/seadra_footprint.png b/graphics/pokemon/seadra/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/seadra_footprint.png
+++ b/graphics/pokemon/seadra/footprint.png
diff --git a/graphics/pokemon/front_pics/seadra_still_front_pic.png b/graphics/pokemon/seadra/front.png
index 4fbd64d88..4fbd64d88 100644
--- a/graphics/pokemon/front_pics/seadra_still_front_pic.png
+++ b/graphics/pokemon/seadra/front.png
diff --git a/graphics/pokemon/icons/seadra_icon.png b/graphics/pokemon/seadra/icon.png
index f85ea2f32..f85ea2f32 100644
--- a/graphics/pokemon/icons/seadra_icon.png
+++ b/graphics/pokemon/seadra/icon.png
diff --git a/graphics/pokemon/palettes/seadra_palette.pal b/graphics/pokemon/seadra/normal.pal
index e29e999bf..e29e999bf 100644
--- a/graphics/pokemon/palettes/seadra_palette.pal
+++ b/graphics/pokemon/seadra/normal.pal
diff --git a/graphics/pokemon/palettes/seadra_shiny_palette.pal b/graphics/pokemon/seadra/shiny.pal
index 7cb7cbb5f..7cb7cbb5f 100644
--- a/graphics/pokemon/palettes/seadra_shiny_palette.pal
+++ b/graphics/pokemon/seadra/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/seaking_front_pic.png b/graphics/pokemon/seaking/anim_front.png
index 242f2b65f..242f2b65f 100644
--- a/graphics/pokemon/anim_front_pics/seaking_front_pic.png
+++ b/graphics/pokemon/seaking/anim_front.png
diff --git a/graphics/pokemon/back_pics/seaking_back_pic.png b/graphics/pokemon/seaking/back.png
index eb3fbd661..eb3fbd661 100644
--- a/graphics/pokemon/back_pics/seaking_back_pic.png
+++ b/graphics/pokemon/seaking/back.png
diff --git a/graphics/pokemon/footprints/seaking_footprint.png b/graphics/pokemon/seaking/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/seaking_footprint.png
+++ b/graphics/pokemon/seaking/footprint.png
diff --git a/graphics/pokemon/front_pics/seaking_still_front_pic.png b/graphics/pokemon/seaking/front.png
index b5cb55a8e..b5cb55a8e 100644
--- a/graphics/pokemon/front_pics/seaking_still_front_pic.png
+++ b/graphics/pokemon/seaking/front.png
diff --git a/graphics/pokemon/icons/seaking_icon.png b/graphics/pokemon/seaking/icon.png
index 7c3bcaec1..7c3bcaec1 100644
--- a/graphics/pokemon/icons/seaking_icon.png
+++ b/graphics/pokemon/seaking/icon.png
diff --git a/graphics/pokemon/palettes/seaking_palette.pal b/graphics/pokemon/seaking/normal.pal
index 1ffe314f4..1ffe314f4 100644
--- a/graphics/pokemon/palettes/seaking_palette.pal
+++ b/graphics/pokemon/seaking/normal.pal
diff --git a/graphics/pokemon/palettes/seaking_shiny_palette.pal b/graphics/pokemon/seaking/shiny.pal
index 2a4acb23d..2a4acb23d 100644
--- a/graphics/pokemon/palettes/seaking_shiny_palette.pal
+++ b/graphics/pokemon/seaking/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sealeo_front_pic.png b/graphics/pokemon/sealeo/anim_front.png
index 01d8371a6..01d8371a6 100644
--- a/graphics/pokemon/anim_front_pics/sealeo_front_pic.png
+++ b/graphics/pokemon/sealeo/anim_front.png
diff --git a/graphics/pokemon/back_pics/sealeo_back_pic.png b/graphics/pokemon/sealeo/back.png
index 302ffb7f2..302ffb7f2 100644
--- a/graphics/pokemon/back_pics/sealeo_back_pic.png
+++ b/graphics/pokemon/sealeo/back.png
diff --git a/graphics/pokemon/footprints/sealeo_footprint.png b/graphics/pokemon/sealeo/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/sealeo_footprint.png
+++ b/graphics/pokemon/sealeo/footprint.png
diff --git a/graphics/pokemon/front_pics/sealeo_still_front_pic.png b/graphics/pokemon/sealeo/front.png
index 920a190d0..920a190d0 100644
--- a/graphics/pokemon/front_pics/sealeo_still_front_pic.png
+++ b/graphics/pokemon/sealeo/front.png
diff --git a/graphics/pokemon/icons/sealeo_icon.png b/graphics/pokemon/sealeo/icon.png
index 2d21e8837..2d21e8837 100644
--- a/graphics/pokemon/icons/sealeo_icon.png
+++ b/graphics/pokemon/sealeo/icon.png
diff --git a/graphics/pokemon/palettes/sealeo_palette.pal b/graphics/pokemon/sealeo/normal.pal
index 6644440c0..6644440c0 100644
--- a/graphics/pokemon/palettes/sealeo_palette.pal
+++ b/graphics/pokemon/sealeo/normal.pal
diff --git a/graphics/pokemon/palettes/sealeo_shiny_palette.pal b/graphics/pokemon/sealeo/shiny.pal
index df4474877..df4474877 100644
--- a/graphics/pokemon/palettes/sealeo_shiny_palette.pal
+++ b/graphics/pokemon/sealeo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/seedot_front_pic.png b/graphics/pokemon/seedot/anim_front.png
index 95007fb3f..95007fb3f 100644
--- a/graphics/pokemon/anim_front_pics/seedot_front_pic.png
+++ b/graphics/pokemon/seedot/anim_front.png
diff --git a/graphics/pokemon/back_pics/seedot_back_pic.png b/graphics/pokemon/seedot/back.png
index ee4017cf5..ee4017cf5 100644
--- a/graphics/pokemon/back_pics/seedot_back_pic.png
+++ b/graphics/pokemon/seedot/back.png
diff --git a/graphics/pokemon/footprints/seedot_footprint.png b/graphics/pokemon/seedot/footprint.png
index 9b41f13ed..9b41f13ed 100644
--- a/graphics/pokemon/footprints/seedot_footprint.png
+++ b/graphics/pokemon/seedot/footprint.png
diff --git a/graphics/pokemon/front_pics/seedot_still_front_pic.png b/graphics/pokemon/seedot/front.png
index 6be5868e6..6be5868e6 100644
--- a/graphics/pokemon/front_pics/seedot_still_front_pic.png
+++ b/graphics/pokemon/seedot/front.png
diff --git a/graphics/pokemon/icons/seedot_icon.png b/graphics/pokemon/seedot/icon.png
index 500a49d47..500a49d47 100644
--- a/graphics/pokemon/icons/seedot_icon.png
+++ b/graphics/pokemon/seedot/icon.png
diff --git a/graphics/pokemon/palettes/seedot_palette.pal b/graphics/pokemon/seedot/normal.pal
index 0fc33bf9b..0fc33bf9b 100644
--- a/graphics/pokemon/palettes/seedot_palette.pal
+++ b/graphics/pokemon/seedot/normal.pal
diff --git a/graphics/pokemon/palettes/seedot_shiny_palette.pal b/graphics/pokemon/seedot/shiny.pal
index 0cd33d0c1..0cd33d0c1 100644
--- a/graphics/pokemon/palettes/seedot_shiny_palette.pal
+++ b/graphics/pokemon/seedot/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/seel_front_pic.png b/graphics/pokemon/seel/anim_front.png
index 37495db71..37495db71 100644
--- a/graphics/pokemon/anim_front_pics/seel_front_pic.png
+++ b/graphics/pokemon/seel/anim_front.png
diff --git a/graphics/pokemon/back_pics/seel_back_pic.png b/graphics/pokemon/seel/back.png
index 5268657f5..5268657f5 100644
--- a/graphics/pokemon/back_pics/seel_back_pic.png
+++ b/graphics/pokemon/seel/back.png
diff --git a/graphics/pokemon/footprints/seel_footprint.png b/graphics/pokemon/seel/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/seel_footprint.png
+++ b/graphics/pokemon/seel/footprint.png
diff --git a/graphics/pokemon/front_pics/seel_still_front_pic.png b/graphics/pokemon/seel/front.png
index b06cb7dd7..b06cb7dd7 100644
--- a/graphics/pokemon/front_pics/seel_still_front_pic.png
+++ b/graphics/pokemon/seel/front.png
diff --git a/graphics/pokemon/icons/seel_icon.png b/graphics/pokemon/seel/icon.png
index 9000021e9..9000021e9 100644
--- a/graphics/pokemon/icons/seel_icon.png
+++ b/graphics/pokemon/seel/icon.png
diff --git a/graphics/pokemon/palettes/seel_palette.pal b/graphics/pokemon/seel/normal.pal
index bc38b44e5..bc38b44e5 100644
--- a/graphics/pokemon/palettes/seel_palette.pal
+++ b/graphics/pokemon/seel/normal.pal
diff --git a/graphics/pokemon/palettes/seel_shiny_palette.pal b/graphics/pokemon/seel/shiny.pal
index 952eec318..952eec318 100644
--- a/graphics/pokemon/palettes/seel_shiny_palette.pal
+++ b/graphics/pokemon/seel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sentret_front_pic.png b/graphics/pokemon/sentret/anim_front.png
index b1c9ec22c..b1c9ec22c 100644
--- a/graphics/pokemon/anim_front_pics/sentret_front_pic.png
+++ b/graphics/pokemon/sentret/anim_front.png
diff --git a/graphics/pokemon/back_pics/sentret_back_pic.png b/graphics/pokemon/sentret/back.png
index 97ef90a8d..97ef90a8d 100644
--- a/graphics/pokemon/back_pics/sentret_back_pic.png
+++ b/graphics/pokemon/sentret/back.png
diff --git a/graphics/pokemon/footprints/sentret_footprint.png b/graphics/pokemon/sentret/footprint.png
index 49ab94c0b..49ab94c0b 100644
--- a/graphics/pokemon/footprints/sentret_footprint.png
+++ b/graphics/pokemon/sentret/footprint.png
diff --git a/graphics/pokemon/front_pics/sentret_still_front_pic.png b/graphics/pokemon/sentret/front.png
index eb3032ade..eb3032ade 100644
--- a/graphics/pokemon/front_pics/sentret_still_front_pic.png
+++ b/graphics/pokemon/sentret/front.png
diff --git a/graphics/pokemon/icons/sentret_icon.png b/graphics/pokemon/sentret/icon.png
index 560b38d44..560b38d44 100644
--- a/graphics/pokemon/icons/sentret_icon.png
+++ b/graphics/pokemon/sentret/icon.png
diff --git a/graphics/pokemon/palettes/sentret_palette.pal b/graphics/pokemon/sentret/normal.pal
index 5591d8f1b..5591d8f1b 100644
--- a/graphics/pokemon/palettes/sentret_palette.pal
+++ b/graphics/pokemon/sentret/normal.pal
diff --git a/graphics/pokemon/palettes/sentret_shiny_palette.pal b/graphics/pokemon/sentret/shiny.pal
index 05c9da6f7..05c9da6f7 100644
--- a/graphics/pokemon/palettes/sentret_shiny_palette.pal
+++ b/graphics/pokemon/sentret/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/seviper_front_pic.png b/graphics/pokemon/seviper/anim_front.png
index 5aafb8002..5aafb8002 100644
--- a/graphics/pokemon/anim_front_pics/seviper_front_pic.png
+++ b/graphics/pokemon/seviper/anim_front.png
diff --git a/graphics/pokemon/back_pics/seviper_back_pic.png b/graphics/pokemon/seviper/back.png
index b9849a6fa..b9849a6fa 100644
--- a/graphics/pokemon/back_pics/seviper_back_pic.png
+++ b/graphics/pokemon/seviper/back.png
diff --git a/graphics/pokemon/footprints/seviper_footprint.png b/graphics/pokemon/seviper/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/seviper_footprint.png
+++ b/graphics/pokemon/seviper/footprint.png
diff --git a/graphics/pokemon/front_pics/seviper_still_front_pic.png b/graphics/pokemon/seviper/front.png
index 41635e5fb..41635e5fb 100644
--- a/graphics/pokemon/front_pics/seviper_still_front_pic.png
+++ b/graphics/pokemon/seviper/front.png
diff --git a/graphics/pokemon/icons/seviper_icon.png b/graphics/pokemon/seviper/icon.png
index ce751ce33..ce751ce33 100644
--- a/graphics/pokemon/icons/seviper_icon.png
+++ b/graphics/pokemon/seviper/icon.png
diff --git a/graphics/pokemon/palettes/seviper_palette.pal b/graphics/pokemon/seviper/normal.pal
index bdcc5e761..bdcc5e761 100644
--- a/graphics/pokemon/palettes/seviper_palette.pal
+++ b/graphics/pokemon/seviper/normal.pal
diff --git a/graphics/pokemon/palettes/seviper_shiny_palette.pal b/graphics/pokemon/seviper/shiny.pal
index 7296a030a..7296a030a 100644
--- a/graphics/pokemon/palettes/seviper_shiny_palette.pal
+++ b/graphics/pokemon/seviper/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sharpedo_front_pic.png b/graphics/pokemon/sharpedo/anim_front.png
index 644b5331b..644b5331b 100644
--- a/graphics/pokemon/anim_front_pics/sharpedo_front_pic.png
+++ b/graphics/pokemon/sharpedo/anim_front.png
diff --git a/graphics/pokemon/back_pics/sharpedo_back_pic.png b/graphics/pokemon/sharpedo/back.png
index 4e011968b..4e011968b 100644
--- a/graphics/pokemon/back_pics/sharpedo_back_pic.png
+++ b/graphics/pokemon/sharpedo/back.png
diff --git a/graphics/pokemon/footprints/sharpedo_footprint.png b/graphics/pokemon/sharpedo/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/sharpedo_footprint.png
+++ b/graphics/pokemon/sharpedo/footprint.png
diff --git a/graphics/pokemon/front_pics/sharpedo_still_front_pic.png b/graphics/pokemon/sharpedo/front.png
index 65d1182c0..65d1182c0 100644
--- a/graphics/pokemon/front_pics/sharpedo_still_front_pic.png
+++ b/graphics/pokemon/sharpedo/front.png
diff --git a/graphics/pokemon/icons/sharpedo_icon.png b/graphics/pokemon/sharpedo/icon.png
index d8dbc26b2..d8dbc26b2 100644
--- a/graphics/pokemon/icons/sharpedo_icon.png
+++ b/graphics/pokemon/sharpedo/icon.png
diff --git a/graphics/pokemon/palettes/sharpedo_palette.pal b/graphics/pokemon/sharpedo/normal.pal
index 3db40a601..3db40a601 100644
--- a/graphics/pokemon/palettes/sharpedo_palette.pal
+++ b/graphics/pokemon/sharpedo/normal.pal
diff --git a/graphics/pokemon/palettes/sharpedo_shiny_palette.pal b/graphics/pokemon/sharpedo/shiny.pal
index 11b98e3bd..11b98e3bd 100644
--- a/graphics/pokemon/palettes/sharpedo_shiny_palette.pal
+++ b/graphics/pokemon/sharpedo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shedinja_front_pic.png b/graphics/pokemon/shedinja/anim_front.png
index e21ca56ce..e21ca56ce 100644
--- a/graphics/pokemon/anim_front_pics/shedinja_front_pic.png
+++ b/graphics/pokemon/shedinja/anim_front.png
diff --git a/graphics/pokemon/back_pics/shedinja_back_pic.png b/graphics/pokemon/shedinja/back.png
index bb3a5be7d..bb3a5be7d 100644
--- a/graphics/pokemon/back_pics/shedinja_back_pic.png
+++ b/graphics/pokemon/shedinja/back.png
diff --git a/graphics/pokemon/footprints/shedinja_footprint.png b/graphics/pokemon/shedinja/footprint.png
index d4118d5e6..d4118d5e6 100644
--- a/graphics/pokemon/footprints/shedinja_footprint.png
+++ b/graphics/pokemon/shedinja/footprint.png
diff --git a/graphics/pokemon/front_pics/shedinja_still_front_pic.png b/graphics/pokemon/shedinja/front.png
index 06c47ea9c..06c47ea9c 100644
--- a/graphics/pokemon/front_pics/shedinja_still_front_pic.png
+++ b/graphics/pokemon/shedinja/front.png
diff --git a/graphics/pokemon/icons/shedinja_icon.png b/graphics/pokemon/shedinja/icon.png
index 9f400e338..9f400e338 100644
--- a/graphics/pokemon/icons/shedinja_icon.png
+++ b/graphics/pokemon/shedinja/icon.png
diff --git a/graphics/pokemon/palettes/shedinja_palette.pal b/graphics/pokemon/shedinja/normal.pal
index 1e1eefe6b..1e1eefe6b 100644
--- a/graphics/pokemon/palettes/shedinja_palette.pal
+++ b/graphics/pokemon/shedinja/normal.pal
diff --git a/graphics/pokemon/palettes/shedinja_shiny_palette.pal b/graphics/pokemon/shedinja/shiny.pal
index 7e7ae66bd..7e7ae66bd 100644
--- a/graphics/pokemon/palettes/shedinja_shiny_palette.pal
+++ b/graphics/pokemon/shedinja/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shelgon_front_pic.png b/graphics/pokemon/shelgon/anim_front.png
index 062ccf3a1..062ccf3a1 100644
--- a/graphics/pokemon/anim_front_pics/shelgon_front_pic.png
+++ b/graphics/pokemon/shelgon/anim_front.png
diff --git a/graphics/pokemon/back_pics/shelgon_back_pic.png b/graphics/pokemon/shelgon/back.png
index 9c87ad57c..9c87ad57c 100644
--- a/graphics/pokemon/back_pics/shelgon_back_pic.png
+++ b/graphics/pokemon/shelgon/back.png
diff --git a/graphics/pokemon/footprints/shelgon_footprint.png b/graphics/pokemon/shelgon/footprint.png
index e2d61b9bc..e2d61b9bc 100644
--- a/graphics/pokemon/footprints/shelgon_footprint.png
+++ b/graphics/pokemon/shelgon/footprint.png
diff --git a/graphics/pokemon/front_pics/shelgon_still_front_pic.png b/graphics/pokemon/shelgon/front.png
index c9474977e..c9474977e 100644
--- a/graphics/pokemon/front_pics/shelgon_still_front_pic.png
+++ b/graphics/pokemon/shelgon/front.png
diff --git a/graphics/pokemon/icons/shelgon_icon.png b/graphics/pokemon/shelgon/icon.png
index 76e0c6a1f..76e0c6a1f 100644
--- a/graphics/pokemon/icons/shelgon_icon.png
+++ b/graphics/pokemon/shelgon/icon.png
diff --git a/graphics/pokemon/palettes/shelgon_palette.pal b/graphics/pokemon/shelgon/normal.pal
index a5abe063e..a5abe063e 100644
--- a/graphics/pokemon/palettes/shelgon_palette.pal
+++ b/graphics/pokemon/shelgon/normal.pal
diff --git a/graphics/pokemon/palettes/shelgon_shiny_palette.pal b/graphics/pokemon/shelgon/shiny.pal
index 3d1e1a361..3d1e1a361 100644
--- a/graphics/pokemon/palettes/shelgon_shiny_palette.pal
+++ b/graphics/pokemon/shelgon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shellder_front_pic.png b/graphics/pokemon/shellder/anim_front.png
index 99cbf9875..99cbf9875 100644
--- a/graphics/pokemon/anim_front_pics/shellder_front_pic.png
+++ b/graphics/pokemon/shellder/anim_front.png
diff --git a/graphics/pokemon/back_pics/shellder_back_pic.png b/graphics/pokemon/shellder/back.png
index ee5374333..ee5374333 100644
--- a/graphics/pokemon/back_pics/shellder_back_pic.png
+++ b/graphics/pokemon/shellder/back.png
diff --git a/graphics/pokemon/footprints/shellder_footprint.png b/graphics/pokemon/shellder/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/shellder_footprint.png
+++ b/graphics/pokemon/shellder/footprint.png
diff --git a/graphics/pokemon/front_pics/shellder_still_front_pic.png b/graphics/pokemon/shellder/front.png
index 7b4a6ccc6..7b4a6ccc6 100644
--- a/graphics/pokemon/front_pics/shellder_still_front_pic.png
+++ b/graphics/pokemon/shellder/front.png
diff --git a/graphics/pokemon/icons/shellder_icon.png b/graphics/pokemon/shellder/icon.png
index 36ad59dfa..36ad59dfa 100644
--- a/graphics/pokemon/icons/shellder_icon.png
+++ b/graphics/pokemon/shellder/icon.png
diff --git a/graphics/pokemon/palettes/shellder_palette.pal b/graphics/pokemon/shellder/normal.pal
index a7c916549..a7c916549 100644
--- a/graphics/pokemon/palettes/shellder_palette.pal
+++ b/graphics/pokemon/shellder/normal.pal
diff --git a/graphics/pokemon/palettes/shellder_shiny_palette.pal b/graphics/pokemon/shellder/shiny.pal
index 20f597524..20f597524 100644
--- a/graphics/pokemon/palettes/shellder_shiny_palette.pal
+++ b/graphics/pokemon/shellder/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shiftry_front_pic.png b/graphics/pokemon/shiftry/anim_front.png
index 70eb97348..70eb97348 100644
--- a/graphics/pokemon/anim_front_pics/shiftry_front_pic.png
+++ b/graphics/pokemon/shiftry/anim_front.png
diff --git a/graphics/pokemon/back_pics/shiftry_back_pic.png b/graphics/pokemon/shiftry/back.png
index 17ddb24ca..17ddb24ca 100644
--- a/graphics/pokemon/back_pics/shiftry_back_pic.png
+++ b/graphics/pokemon/shiftry/back.png
diff --git a/graphics/pokemon/footprints/shiftry_footprint.png b/graphics/pokemon/shiftry/footprint.png
index 3ea82a3da..3ea82a3da 100644
--- a/graphics/pokemon/footprints/shiftry_footprint.png
+++ b/graphics/pokemon/shiftry/footprint.png
diff --git a/graphics/pokemon/front_pics/shiftry_still_front_pic.png b/graphics/pokemon/shiftry/front.png
index 580c248b7..580c248b7 100644
--- a/graphics/pokemon/front_pics/shiftry_still_front_pic.png
+++ b/graphics/pokemon/shiftry/front.png
diff --git a/graphics/pokemon/icons/shiftry_icon.png b/graphics/pokemon/shiftry/icon.png
index c10fa772d..c10fa772d 100644
--- a/graphics/pokemon/icons/shiftry_icon.png
+++ b/graphics/pokemon/shiftry/icon.png
diff --git a/graphics/pokemon/palettes/shiftry_palette.pal b/graphics/pokemon/shiftry/normal.pal
index 3a91e677c..3a91e677c 100644
--- a/graphics/pokemon/palettes/shiftry_palette.pal
+++ b/graphics/pokemon/shiftry/normal.pal
diff --git a/graphics/pokemon/palettes/shiftry_shiny_palette.pal b/graphics/pokemon/shiftry/shiny.pal
index 35aca99d4..35aca99d4 100644
--- a/graphics/pokemon/palettes/shiftry_shiny_palette.pal
+++ b/graphics/pokemon/shiftry/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shroomish_front_pic.png b/graphics/pokemon/shroomish/anim_front.png
index df403cca3..df403cca3 100644
--- a/graphics/pokemon/anim_front_pics/shroomish_front_pic.png
+++ b/graphics/pokemon/shroomish/anim_front.png
diff --git a/graphics/pokemon/back_pics/shroomish_back_pic.png b/graphics/pokemon/shroomish/back.png
index 4812bcbcd..4812bcbcd 100644
--- a/graphics/pokemon/back_pics/shroomish_back_pic.png
+++ b/graphics/pokemon/shroomish/back.png
diff --git a/graphics/pokemon/footprints/shroomish_footprint.png b/graphics/pokemon/shroomish/footprint.png
index d3a5986ce..d3a5986ce 100644
--- a/graphics/pokemon/footprints/shroomish_footprint.png
+++ b/graphics/pokemon/shroomish/footprint.png
diff --git a/graphics/pokemon/front_pics/shroomish_still_front_pic.png b/graphics/pokemon/shroomish/front.png
index 0ebe8ca06..0ebe8ca06 100644
--- a/graphics/pokemon/front_pics/shroomish_still_front_pic.png
+++ b/graphics/pokemon/shroomish/front.png
diff --git a/graphics/pokemon/icons/shroomish_icon.png b/graphics/pokemon/shroomish/icon.png
index 87dd12060..87dd12060 100644
--- a/graphics/pokemon/icons/shroomish_icon.png
+++ b/graphics/pokemon/shroomish/icon.png
diff --git a/graphics/pokemon/palettes/shroomish_palette.pal b/graphics/pokemon/shroomish/normal.pal
index 97f25bdf6..97f25bdf6 100644
--- a/graphics/pokemon/palettes/shroomish_palette.pal
+++ b/graphics/pokemon/shroomish/normal.pal
diff --git a/graphics/pokemon/palettes/shroomish_shiny_palette.pal b/graphics/pokemon/shroomish/shiny.pal
index a0bd12821..a0bd12821 100644
--- a/graphics/pokemon/palettes/shroomish_shiny_palette.pal
+++ b/graphics/pokemon/shroomish/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shuckle_front_pic.png b/graphics/pokemon/shuckle/anim_front.png
index 74251deb0..74251deb0 100644
--- a/graphics/pokemon/anim_front_pics/shuckle_front_pic.png
+++ b/graphics/pokemon/shuckle/anim_front.png
diff --git a/graphics/pokemon/back_pics/shuckle_back_pic.png b/graphics/pokemon/shuckle/back.png
index 1b19db0e5..1b19db0e5 100644
--- a/graphics/pokemon/back_pics/shuckle_back_pic.png
+++ b/graphics/pokemon/shuckle/back.png
diff --git a/graphics/pokemon/footprints/shuckle_footprint.png b/graphics/pokemon/shuckle/footprint.png
index e26b60bcd..e26b60bcd 100644
--- a/graphics/pokemon/footprints/shuckle_footprint.png
+++ b/graphics/pokemon/shuckle/footprint.png
diff --git a/graphics/pokemon/front_pics/shuckle_still_front_pic.png b/graphics/pokemon/shuckle/front.png
index 1747fe5e7..1747fe5e7 100644
--- a/graphics/pokemon/front_pics/shuckle_still_front_pic.png
+++ b/graphics/pokemon/shuckle/front.png
diff --git a/graphics/pokemon/icons/shuckle_icon.png b/graphics/pokemon/shuckle/icon.png
index aaf49345a..aaf49345a 100644
--- a/graphics/pokemon/icons/shuckle_icon.png
+++ b/graphics/pokemon/shuckle/icon.png
diff --git a/graphics/pokemon/palettes/shuckle_palette.pal b/graphics/pokemon/shuckle/normal.pal
index ea40c0be4..ea40c0be4 100644
--- a/graphics/pokemon/palettes/shuckle_palette.pal
+++ b/graphics/pokemon/shuckle/normal.pal
diff --git a/graphics/pokemon/palettes/shuckle_shiny_palette.pal b/graphics/pokemon/shuckle/shiny.pal
index 30126f57c..30126f57c 100644
--- a/graphics/pokemon/palettes/shuckle_shiny_palette.pal
+++ b/graphics/pokemon/shuckle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/shuppet_front_pic.png b/graphics/pokemon/shuppet/anim_front.png
index 00629578f..00629578f 100644
--- a/graphics/pokemon/anim_front_pics/shuppet_front_pic.png
+++ b/graphics/pokemon/shuppet/anim_front.png
diff --git a/graphics/pokemon/back_pics/shuppet_back_pic.png b/graphics/pokemon/shuppet/back.png
index 2c6dbdb18..2c6dbdb18 100644
--- a/graphics/pokemon/back_pics/shuppet_back_pic.png
+++ b/graphics/pokemon/shuppet/back.png
diff --git a/graphics/pokemon/footprints/shuppet_footprint.png b/graphics/pokemon/shuppet/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/shuppet_footprint.png
+++ b/graphics/pokemon/shuppet/footprint.png
diff --git a/graphics/pokemon/front_pics/shuppet_still_front_pic.png b/graphics/pokemon/shuppet/front.png
index 9b63e2640..9b63e2640 100644
--- a/graphics/pokemon/front_pics/shuppet_still_front_pic.png
+++ b/graphics/pokemon/shuppet/front.png
diff --git a/graphics/pokemon/icons/shuppet_icon.png b/graphics/pokemon/shuppet/icon.png
index 6e7087efd..6e7087efd 100644
--- a/graphics/pokemon/icons/shuppet_icon.png
+++ b/graphics/pokemon/shuppet/icon.png
diff --git a/graphics/pokemon/palettes/shuppet_palette.pal b/graphics/pokemon/shuppet/normal.pal
index 7dafb6a01..7dafb6a01 100644
--- a/graphics/pokemon/palettes/shuppet_palette.pal
+++ b/graphics/pokemon/shuppet/normal.pal
diff --git a/graphics/pokemon/palettes/shuppet_shiny_palette.pal b/graphics/pokemon/shuppet/shiny.pal
index 9d5557a71..9d5557a71 100644
--- a/graphics/pokemon/palettes/shuppet_shiny_palette.pal
+++ b/graphics/pokemon/shuppet/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/silcoon_front_pic.png b/graphics/pokemon/silcoon/anim_front.png
index a6cc252dc..a6cc252dc 100644
--- a/graphics/pokemon/anim_front_pics/silcoon_front_pic.png
+++ b/graphics/pokemon/silcoon/anim_front.png
diff --git a/graphics/pokemon/back_pics/silcoon_back_pic.png b/graphics/pokemon/silcoon/back.png
index 26c8cfdaf..26c8cfdaf 100644
--- a/graphics/pokemon/back_pics/silcoon_back_pic.png
+++ b/graphics/pokemon/silcoon/back.png
diff --git a/graphics/pokemon/footprints/silcoon_footprint.png b/graphics/pokemon/silcoon/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/silcoon_footprint.png
+++ b/graphics/pokemon/silcoon/footprint.png
diff --git a/graphics/pokemon/front_pics/silcoon_still_front_pic.png b/graphics/pokemon/silcoon/front.png
index f416f074d..f416f074d 100644
--- a/graphics/pokemon/front_pics/silcoon_still_front_pic.png
+++ b/graphics/pokemon/silcoon/front.png
diff --git a/graphics/pokemon/icons/silcoon_icon.png b/graphics/pokemon/silcoon/icon.png
index 0b572a20c..0b572a20c 100644
--- a/graphics/pokemon/icons/silcoon_icon.png
+++ b/graphics/pokemon/silcoon/icon.png
diff --git a/graphics/pokemon/palettes/silcoon_palette.pal b/graphics/pokemon/silcoon/normal.pal
index 2a48849f8..2a48849f8 100644
--- a/graphics/pokemon/palettes/silcoon_palette.pal
+++ b/graphics/pokemon/silcoon/normal.pal
diff --git a/graphics/pokemon/palettes/silcoon_shiny_palette.pal b/graphics/pokemon/silcoon/shiny.pal
index db9e98b7a..db9e98b7a 100644
--- a/graphics/pokemon/palettes/silcoon_shiny_palette.pal
+++ b/graphics/pokemon/silcoon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/skarmory_front_pic.png b/graphics/pokemon/skarmory/anim_front.png
index b0883329c..b0883329c 100644
--- a/graphics/pokemon/anim_front_pics/skarmory_front_pic.png
+++ b/graphics/pokemon/skarmory/anim_front.png
diff --git a/graphics/pokemon/back_pics/skarmory_back_pic.png b/graphics/pokemon/skarmory/back.png
index f3c8d95cc..f3c8d95cc 100644
--- a/graphics/pokemon/back_pics/skarmory_back_pic.png
+++ b/graphics/pokemon/skarmory/back.png
diff --git a/graphics/pokemon/footprints/skarmory_footprint.png b/graphics/pokemon/skarmory/footprint.png
index 1134fec29..1134fec29 100644
--- a/graphics/pokemon/footprints/skarmory_footprint.png
+++ b/graphics/pokemon/skarmory/footprint.png
diff --git a/graphics/pokemon/front_pics/skarmory_still_front_pic.png b/graphics/pokemon/skarmory/front.png
index 06ce4420f..06ce4420f 100644
--- a/graphics/pokemon/front_pics/skarmory_still_front_pic.png
+++ b/graphics/pokemon/skarmory/front.png
diff --git a/graphics/pokemon/icons/skarmory_icon.png b/graphics/pokemon/skarmory/icon.png
index 1eb310654..1eb310654 100644
--- a/graphics/pokemon/icons/skarmory_icon.png
+++ b/graphics/pokemon/skarmory/icon.png
diff --git a/graphics/pokemon/palettes/skarmory_palette.pal b/graphics/pokemon/skarmory/normal.pal
index d4662ab92..d4662ab92 100644
--- a/graphics/pokemon/palettes/skarmory_palette.pal
+++ b/graphics/pokemon/skarmory/normal.pal
diff --git a/graphics/pokemon/palettes/skarmory_shiny_palette.pal b/graphics/pokemon/skarmory/shiny.pal
index 561324c82..561324c82 100644
--- a/graphics/pokemon/palettes/skarmory_shiny_palette.pal
+++ b/graphics/pokemon/skarmory/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/skiploom_front_pic.png b/graphics/pokemon/skiploom/anim_front.png
index a2955bdd6..a2955bdd6 100644
--- a/graphics/pokemon/anim_front_pics/skiploom_front_pic.png
+++ b/graphics/pokemon/skiploom/anim_front.png
diff --git a/graphics/pokemon/back_pics/skiploom_back_pic.png b/graphics/pokemon/skiploom/back.png
index 8f010fb4f..8f010fb4f 100644
--- a/graphics/pokemon/back_pics/skiploom_back_pic.png
+++ b/graphics/pokemon/skiploom/back.png
diff --git a/graphics/pokemon/footprints/skiploom_footprint.png b/graphics/pokemon/skiploom/footprint.png
index efa7f5034..efa7f5034 100644
--- a/graphics/pokemon/footprints/skiploom_footprint.png
+++ b/graphics/pokemon/skiploom/footprint.png
diff --git a/graphics/pokemon/front_pics/skiploom_still_front_pic.png b/graphics/pokemon/skiploom/front.png
index 0efc78f1d..0efc78f1d 100644
--- a/graphics/pokemon/front_pics/skiploom_still_front_pic.png
+++ b/graphics/pokemon/skiploom/front.png
diff --git a/graphics/pokemon/icons/skiploom_icon.png b/graphics/pokemon/skiploom/icon.png
index 90c0c8e7c..90c0c8e7c 100644
--- a/graphics/pokemon/icons/skiploom_icon.png
+++ b/graphics/pokemon/skiploom/icon.png
diff --git a/graphics/pokemon/palettes/skiploom_palette.pal b/graphics/pokemon/skiploom/normal.pal
index 15fcce8e5..15fcce8e5 100644
--- a/graphics/pokemon/palettes/skiploom_palette.pal
+++ b/graphics/pokemon/skiploom/normal.pal
diff --git a/graphics/pokemon/palettes/skiploom_shiny_palette.pal b/graphics/pokemon/skiploom/shiny.pal
index 2dedaa30e..2dedaa30e 100644
--- a/graphics/pokemon/palettes/skiploom_shiny_palette.pal
+++ b/graphics/pokemon/skiploom/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/skitty_front_pic.png b/graphics/pokemon/skitty/anim_front.png
index 6bd564a90..6bd564a90 100644
--- a/graphics/pokemon/anim_front_pics/skitty_front_pic.png
+++ b/graphics/pokemon/skitty/anim_front.png
diff --git a/graphics/pokemon/back_pics/skitty_back_pic.png b/graphics/pokemon/skitty/back.png
index e7f5ebb67..e7f5ebb67 100644
--- a/graphics/pokemon/back_pics/skitty_back_pic.png
+++ b/graphics/pokemon/skitty/back.png
diff --git a/graphics/pokemon/footprints/skitty_footprint.png b/graphics/pokemon/skitty/footprint.png
index 355153dcb..355153dcb 100644
--- a/graphics/pokemon/footprints/skitty_footprint.png
+++ b/graphics/pokemon/skitty/footprint.png
diff --git a/graphics/pokemon/front_pics/skitty_still_front_pic.png b/graphics/pokemon/skitty/front.png
index b0b85cc95..b0b85cc95 100644
--- a/graphics/pokemon/front_pics/skitty_still_front_pic.png
+++ b/graphics/pokemon/skitty/front.png
diff --git a/graphics/pokemon/icons/skitty_icon.png b/graphics/pokemon/skitty/icon.png
index fb41f1c07..fb41f1c07 100644
--- a/graphics/pokemon/icons/skitty_icon.png
+++ b/graphics/pokemon/skitty/icon.png
diff --git a/graphics/pokemon/palettes/skitty_palette.pal b/graphics/pokemon/skitty/normal.pal
index 0a1228191..0a1228191 100644
--- a/graphics/pokemon/palettes/skitty_palette.pal
+++ b/graphics/pokemon/skitty/normal.pal
diff --git a/graphics/pokemon/palettes/skitty_shiny_palette.pal b/graphics/pokemon/skitty/shiny.pal
index d3e9130f3..d3e9130f3 100644
--- a/graphics/pokemon/palettes/skitty_shiny_palette.pal
+++ b/graphics/pokemon/skitty/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slaking_front_pic.png b/graphics/pokemon/slaking/anim_front.png
index a57d3c092..a57d3c092 100644
--- a/graphics/pokemon/anim_front_pics/slaking_front_pic.png
+++ b/graphics/pokemon/slaking/anim_front.png
diff --git a/graphics/pokemon/back_pics/slaking_back_pic.png b/graphics/pokemon/slaking/back.png
index 50d55a957..50d55a957 100644
--- a/graphics/pokemon/back_pics/slaking_back_pic.png
+++ b/graphics/pokemon/slaking/back.png
diff --git a/graphics/pokemon/footprints/slaking_footprint.png b/graphics/pokemon/slaking/footprint.png
index c2c20413b..c2c20413b 100644
--- a/graphics/pokemon/footprints/slaking_footprint.png
+++ b/graphics/pokemon/slaking/footprint.png
diff --git a/graphics/pokemon/front_pics/slaking_still_front_pic.png b/graphics/pokemon/slaking/front.png
index 3ff648701..3ff648701 100644
--- a/graphics/pokemon/front_pics/slaking_still_front_pic.png
+++ b/graphics/pokemon/slaking/front.png
diff --git a/graphics/pokemon/icons/slaking_icon.png b/graphics/pokemon/slaking/icon.png
index 71b6c7537..71b6c7537 100644
--- a/graphics/pokemon/icons/slaking_icon.png
+++ b/graphics/pokemon/slaking/icon.png
diff --git a/graphics/pokemon/palettes/slaking_palette.pal b/graphics/pokemon/slaking/normal.pal
index 84cf081cf..84cf081cf 100644
--- a/graphics/pokemon/palettes/slaking_palette.pal
+++ b/graphics/pokemon/slaking/normal.pal
diff --git a/graphics/pokemon/palettes/slaking_shiny_palette.pal b/graphics/pokemon/slaking/shiny.pal
index 1ec404cf6..1ec404cf6 100644
--- a/graphics/pokemon/palettes/slaking_shiny_palette.pal
+++ b/graphics/pokemon/slaking/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slakoth_front_pic.png b/graphics/pokemon/slakoth/anim_front.png
index fbbef311a..fbbef311a 100644
--- a/graphics/pokemon/anim_front_pics/slakoth_front_pic.png
+++ b/graphics/pokemon/slakoth/anim_front.png
diff --git a/graphics/pokemon/back_pics/slakoth_back_pic.png b/graphics/pokemon/slakoth/back.png
index 9f82930b0..9f82930b0 100644
--- a/graphics/pokemon/back_pics/slakoth_back_pic.png
+++ b/graphics/pokemon/slakoth/back.png
diff --git a/graphics/pokemon/footprints/slakoth_footprint.png b/graphics/pokemon/slakoth/footprint.png
index ec258f41b..ec258f41b 100644
--- a/graphics/pokemon/footprints/slakoth_footprint.png
+++ b/graphics/pokemon/slakoth/footprint.png
diff --git a/graphics/pokemon/front_pics/slakoth_still_front_pic.png b/graphics/pokemon/slakoth/front.png
index 5440669ae..5440669ae 100644
--- a/graphics/pokemon/front_pics/slakoth_still_front_pic.png
+++ b/graphics/pokemon/slakoth/front.png
diff --git a/graphics/pokemon/icons/slakoth_icon.png b/graphics/pokemon/slakoth/icon.png
index c04ff08a0..c04ff08a0 100644
--- a/graphics/pokemon/icons/slakoth_icon.png
+++ b/graphics/pokemon/slakoth/icon.png
diff --git a/graphics/pokemon/palettes/slakoth_palette.pal b/graphics/pokemon/slakoth/normal.pal
index 934fc9ae9..934fc9ae9 100644
--- a/graphics/pokemon/palettes/slakoth_palette.pal
+++ b/graphics/pokemon/slakoth/normal.pal
diff --git a/graphics/pokemon/palettes/slakoth_shiny_palette.pal b/graphics/pokemon/slakoth/shiny.pal
index 4f65ae8e4..4f65ae8e4 100644
--- a/graphics/pokemon/palettes/slakoth_shiny_palette.pal
+++ b/graphics/pokemon/slakoth/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slowbro_front_pic.png b/graphics/pokemon/slowbro/anim_front.png
index 9bd16e4dc..9bd16e4dc 100644
--- a/graphics/pokemon/anim_front_pics/slowbro_front_pic.png
+++ b/graphics/pokemon/slowbro/anim_front.png
diff --git a/graphics/pokemon/back_pics/slowbro_back_pic.png b/graphics/pokemon/slowbro/back.png
index b62c5fcf4..b62c5fcf4 100644
--- a/graphics/pokemon/back_pics/slowbro_back_pic.png
+++ b/graphics/pokemon/slowbro/back.png
diff --git a/graphics/pokemon/footprints/slowbro_footprint.png b/graphics/pokemon/slowbro/footprint.png
index c4f82e405..c4f82e405 100644
--- a/graphics/pokemon/footprints/slowbro_footprint.png
+++ b/graphics/pokemon/slowbro/footprint.png
diff --git a/graphics/pokemon/front_pics/slowbro_still_front_pic.png b/graphics/pokemon/slowbro/front.png
index 020f4d4dc..020f4d4dc 100644
--- a/graphics/pokemon/front_pics/slowbro_still_front_pic.png
+++ b/graphics/pokemon/slowbro/front.png
diff --git a/graphics/pokemon/icons/slowbro_icon.png b/graphics/pokemon/slowbro/icon.png
index bf7ee6a32..bf7ee6a32 100644
--- a/graphics/pokemon/icons/slowbro_icon.png
+++ b/graphics/pokemon/slowbro/icon.png
diff --git a/graphics/pokemon/palettes/slowbro_palette.pal b/graphics/pokemon/slowbro/normal.pal
index 6ae68b376..6ae68b376 100644
--- a/graphics/pokemon/palettes/slowbro_palette.pal
+++ b/graphics/pokemon/slowbro/normal.pal
diff --git a/graphics/pokemon/palettes/slowbro_shiny_palette.pal b/graphics/pokemon/slowbro/shiny.pal
index ad1c1246d..ad1c1246d 100644
--- a/graphics/pokemon/palettes/slowbro_shiny_palette.pal
+++ b/graphics/pokemon/slowbro/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slowking_front_pic.png b/graphics/pokemon/slowking/anim_front.png
index 378d14e91..378d14e91 100644
--- a/graphics/pokemon/anim_front_pics/slowking_front_pic.png
+++ b/graphics/pokemon/slowking/anim_front.png
diff --git a/graphics/pokemon/back_pics/slowking_back_pic.png b/graphics/pokemon/slowking/back.png
index 16a779506..16a779506 100644
--- a/graphics/pokemon/back_pics/slowking_back_pic.png
+++ b/graphics/pokemon/slowking/back.png
diff --git a/graphics/pokemon/footprints/slowking_footprint.png b/graphics/pokemon/slowking/footprint.png
index 52593624a..52593624a 100644
--- a/graphics/pokemon/footprints/slowking_footprint.png
+++ b/graphics/pokemon/slowking/footprint.png
diff --git a/graphics/pokemon/front_pics/slowking_still_front_pic.png b/graphics/pokemon/slowking/front.png
index 11b16a952..11b16a952 100644
--- a/graphics/pokemon/front_pics/slowking_still_front_pic.png
+++ b/graphics/pokemon/slowking/front.png
diff --git a/graphics/pokemon/icons/slowking_icon.png b/graphics/pokemon/slowking/icon.png
index 04bd1a155..04bd1a155 100644
--- a/graphics/pokemon/icons/slowking_icon.png
+++ b/graphics/pokemon/slowking/icon.png
diff --git a/graphics/pokemon/palettes/slowking_palette.pal b/graphics/pokemon/slowking/normal.pal
index c3e452f0d..c3e452f0d 100644
--- a/graphics/pokemon/palettes/slowking_palette.pal
+++ b/graphics/pokemon/slowking/normal.pal
diff --git a/graphics/pokemon/palettes/slowking_shiny_palette.pal b/graphics/pokemon/slowking/shiny.pal
index 55ae2a1ee..55ae2a1ee 100644
--- a/graphics/pokemon/palettes/slowking_shiny_palette.pal
+++ b/graphics/pokemon/slowking/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slowpoke_front_pic.png b/graphics/pokemon/slowpoke/anim_front.png
index 5eae03871..5eae03871 100644
--- a/graphics/pokemon/anim_front_pics/slowpoke_front_pic.png
+++ b/graphics/pokemon/slowpoke/anim_front.png
diff --git a/graphics/pokemon/back_pics/slowpoke_back_pic.png b/graphics/pokemon/slowpoke/back.png
index 62bf72f0e..62bf72f0e 100644
--- a/graphics/pokemon/back_pics/slowpoke_back_pic.png
+++ b/graphics/pokemon/slowpoke/back.png
diff --git a/graphics/pokemon/footprints/slowpoke_footprint.png b/graphics/pokemon/slowpoke/footprint.png
index a66ebbc32..a66ebbc32 100644
--- a/graphics/pokemon/footprints/slowpoke_footprint.png
+++ b/graphics/pokemon/slowpoke/footprint.png
diff --git a/graphics/pokemon/front_pics/slowpoke_still_front_pic.png b/graphics/pokemon/slowpoke/front.png
index f526344d2..f526344d2 100644
--- a/graphics/pokemon/front_pics/slowpoke_still_front_pic.png
+++ b/graphics/pokemon/slowpoke/front.png
diff --git a/graphics/pokemon/icons/slowpoke_icon.png b/graphics/pokemon/slowpoke/icon.png
index cc3123e14..cc3123e14 100644
--- a/graphics/pokemon/icons/slowpoke_icon.png
+++ b/graphics/pokemon/slowpoke/icon.png
diff --git a/graphics/pokemon/palettes/slowpoke_palette.pal b/graphics/pokemon/slowpoke/normal.pal
index 4b3e369dd..4b3e369dd 100644
--- a/graphics/pokemon/palettes/slowpoke_palette.pal
+++ b/graphics/pokemon/slowpoke/normal.pal
diff --git a/graphics/pokemon/palettes/slowpoke_shiny_palette.pal b/graphics/pokemon/slowpoke/shiny.pal
index 628e4153a..628e4153a 100644
--- a/graphics/pokemon/palettes/slowpoke_shiny_palette.pal
+++ b/graphics/pokemon/slowpoke/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/slugma_front_pic.png b/graphics/pokemon/slugma/anim_front.png
index dd2747f5b..dd2747f5b 100644
--- a/graphics/pokemon/anim_front_pics/slugma_front_pic.png
+++ b/graphics/pokemon/slugma/anim_front.png
diff --git a/graphics/pokemon/back_pics/slugma_back_pic.png b/graphics/pokemon/slugma/back.png
index 347d27ed1..347d27ed1 100644
--- a/graphics/pokemon/back_pics/slugma_back_pic.png
+++ b/graphics/pokemon/slugma/back.png
diff --git a/graphics/pokemon/footprints/slugma_footprint.png b/graphics/pokemon/slugma/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/slugma_footprint.png
+++ b/graphics/pokemon/slugma/footprint.png
diff --git a/graphics/pokemon/front_pics/slugma_still_front_pic.png b/graphics/pokemon/slugma/front.png
index 4b27af3fc..4b27af3fc 100644
--- a/graphics/pokemon/front_pics/slugma_still_front_pic.png
+++ b/graphics/pokemon/slugma/front.png
diff --git a/graphics/pokemon/icons/slugma_icon.png b/graphics/pokemon/slugma/icon.png
index d954c6f68..d954c6f68 100644
--- a/graphics/pokemon/icons/slugma_icon.png
+++ b/graphics/pokemon/slugma/icon.png
diff --git a/graphics/pokemon/palettes/slugma_palette.pal b/graphics/pokemon/slugma/normal.pal
index 081ae47dc..081ae47dc 100644
--- a/graphics/pokemon/palettes/slugma_palette.pal
+++ b/graphics/pokemon/slugma/normal.pal
diff --git a/graphics/pokemon/palettes/slugma_shiny_palette.pal b/graphics/pokemon/slugma/shiny.pal
index 85babdbe1..85babdbe1 100644
--- a/graphics/pokemon/palettes/slugma_shiny_palette.pal
+++ b/graphics/pokemon/slugma/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/smeargle_front_pic.png b/graphics/pokemon/smeargle/anim_front.png
index 20db180b8..20db180b8 100644
--- a/graphics/pokemon/anim_front_pics/smeargle_front_pic.png
+++ b/graphics/pokemon/smeargle/anim_front.png
diff --git a/graphics/pokemon/back_pics/smeargle_back_pic.png b/graphics/pokemon/smeargle/back.png
index fefbed16f..fefbed16f 100644
--- a/graphics/pokemon/back_pics/smeargle_back_pic.png
+++ b/graphics/pokemon/smeargle/back.png
diff --git a/graphics/pokemon/footprints/smeargle_footprint.png b/graphics/pokemon/smeargle/footprint.png
index b946130cd..b946130cd 100644
--- a/graphics/pokemon/footprints/smeargle_footprint.png
+++ b/graphics/pokemon/smeargle/footprint.png
diff --git a/graphics/pokemon/front_pics/smeargle_still_front_pic.png b/graphics/pokemon/smeargle/front.png
index 91c400395..91c400395 100644
--- a/graphics/pokemon/front_pics/smeargle_still_front_pic.png
+++ b/graphics/pokemon/smeargle/front.png
diff --git a/graphics/pokemon/icons/smeargle_icon.png b/graphics/pokemon/smeargle/icon.png
index 54b387b05..54b387b05 100644
--- a/graphics/pokemon/icons/smeargle_icon.png
+++ b/graphics/pokemon/smeargle/icon.png
diff --git a/graphics/pokemon/palettes/smeargle_palette.pal b/graphics/pokemon/smeargle/normal.pal
index 068322e3e..068322e3e 100644
--- a/graphics/pokemon/palettes/smeargle_palette.pal
+++ b/graphics/pokemon/smeargle/normal.pal
diff --git a/graphics/pokemon/palettes/smeargle_shiny_palette.pal b/graphics/pokemon/smeargle/shiny.pal
index f5f50de2d..f5f50de2d 100644
--- a/graphics/pokemon/palettes/smeargle_shiny_palette.pal
+++ b/graphics/pokemon/smeargle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/smoochum_front_pic.png b/graphics/pokemon/smoochum/anim_front.png
index 9f2fcea05..9f2fcea05 100644
--- a/graphics/pokemon/anim_front_pics/smoochum_front_pic.png
+++ b/graphics/pokemon/smoochum/anim_front.png
diff --git a/graphics/pokemon/back_pics/smoochum_back_pic.png b/graphics/pokemon/smoochum/back.png
index bad0422e5..bad0422e5 100644
--- a/graphics/pokemon/back_pics/smoochum_back_pic.png
+++ b/graphics/pokemon/smoochum/back.png
diff --git a/graphics/pokemon/footprints/smoochum_footprint.png b/graphics/pokemon/smoochum/footprint.png
index e901d9334..e901d9334 100644
--- a/graphics/pokemon/footprints/smoochum_footprint.png
+++ b/graphics/pokemon/smoochum/footprint.png
diff --git a/graphics/pokemon/front_pics/smoochum_still_front_pic.png b/graphics/pokemon/smoochum/front.png
index 608841600..608841600 100644
--- a/graphics/pokemon/front_pics/smoochum_still_front_pic.png
+++ b/graphics/pokemon/smoochum/front.png
diff --git a/graphics/pokemon/icons/smoochum_icon.png b/graphics/pokemon/smoochum/icon.png
index 11f1e6fe7..11f1e6fe7 100644
--- a/graphics/pokemon/icons/smoochum_icon.png
+++ b/graphics/pokemon/smoochum/icon.png
diff --git a/graphics/pokemon/palettes/smoochum_palette.pal b/graphics/pokemon/smoochum/normal.pal
index 722cd4206..722cd4206 100644
--- a/graphics/pokemon/palettes/smoochum_palette.pal
+++ b/graphics/pokemon/smoochum/normal.pal
diff --git a/graphics/pokemon/palettes/smoochum_shiny_palette.pal b/graphics/pokemon/smoochum/shiny.pal
index 00a439312..00a439312 100644
--- a/graphics/pokemon/palettes/smoochum_shiny_palette.pal
+++ b/graphics/pokemon/smoochum/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sneasel_front_pic.png b/graphics/pokemon/sneasel/anim_front.png
index 38d982338..38d982338 100644
--- a/graphics/pokemon/anim_front_pics/sneasel_front_pic.png
+++ b/graphics/pokemon/sneasel/anim_front.png
diff --git a/graphics/pokemon/back_pics/sneasel_back_pic.png b/graphics/pokemon/sneasel/back.png
index 5a0765cb2..5a0765cb2 100644
--- a/graphics/pokemon/back_pics/sneasel_back_pic.png
+++ b/graphics/pokemon/sneasel/back.png
diff --git a/graphics/pokemon/footprints/sneasel_footprint.png b/graphics/pokemon/sneasel/footprint.png
index 2159ef3dc..2159ef3dc 100644
--- a/graphics/pokemon/footprints/sneasel_footprint.png
+++ b/graphics/pokemon/sneasel/footprint.png
diff --git a/graphics/pokemon/front_pics/sneasel_still_front_pic.png b/graphics/pokemon/sneasel/front.png
index 704489419..704489419 100644
--- a/graphics/pokemon/front_pics/sneasel_still_front_pic.png
+++ b/graphics/pokemon/sneasel/front.png
diff --git a/graphics/pokemon/icons/sneasel_icon.png b/graphics/pokemon/sneasel/icon.png
index 95eb3e66d..95eb3e66d 100644
--- a/graphics/pokemon/icons/sneasel_icon.png
+++ b/graphics/pokemon/sneasel/icon.png
diff --git a/graphics/pokemon/palettes/sneasel_palette.pal b/graphics/pokemon/sneasel/normal.pal
index 076fa7300..076fa7300 100644
--- a/graphics/pokemon/palettes/sneasel_palette.pal
+++ b/graphics/pokemon/sneasel/normal.pal
diff --git a/graphics/pokemon/palettes/sneasel_shiny_palette.pal b/graphics/pokemon/sneasel/shiny.pal
index 64a502ce6..64a502ce6 100644
--- a/graphics/pokemon/palettes/sneasel_shiny_palette.pal
+++ b/graphics/pokemon/sneasel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/snorlax_front_pic.png b/graphics/pokemon/snorlax/anim_front.png
index e23e6b52d..e23e6b52d 100644
--- a/graphics/pokemon/anim_front_pics/snorlax_front_pic.png
+++ b/graphics/pokemon/snorlax/anim_front.png
diff --git a/graphics/pokemon/back_pics/snorlax_back_pic.png b/graphics/pokemon/snorlax/back.png
index da44b95aa..da44b95aa 100644
--- a/graphics/pokemon/back_pics/snorlax_back_pic.png
+++ b/graphics/pokemon/snorlax/back.png
diff --git a/graphics/pokemon/footprints/snorlax_footprint.png b/graphics/pokemon/snorlax/footprint.png
index d3d25c4bc..d3d25c4bc 100644
--- a/graphics/pokemon/footprints/snorlax_footprint.png
+++ b/graphics/pokemon/snorlax/footprint.png
diff --git a/graphics/pokemon/front_pics/snorlax_still_front_pic.png b/graphics/pokemon/snorlax/front.png
index 7e4b4f009..7e4b4f009 100644
--- a/graphics/pokemon/front_pics/snorlax_still_front_pic.png
+++ b/graphics/pokemon/snorlax/front.png
diff --git a/graphics/pokemon/icons/snorlax_icon.png b/graphics/pokemon/snorlax/icon.png
index 00a74b6ac..00a74b6ac 100644
--- a/graphics/pokemon/icons/snorlax_icon.png
+++ b/graphics/pokemon/snorlax/icon.png
diff --git a/graphics/pokemon/palettes/snorlax_palette.pal b/graphics/pokemon/snorlax/normal.pal
index aa61fc9e4..aa61fc9e4 100644
--- a/graphics/pokemon/palettes/snorlax_palette.pal
+++ b/graphics/pokemon/snorlax/normal.pal
diff --git a/graphics/pokemon/palettes/snorlax_shiny_palette.pal b/graphics/pokemon/snorlax/shiny.pal
index 8528d0924..8528d0924 100644
--- a/graphics/pokemon/palettes/snorlax_shiny_palette.pal
+++ b/graphics/pokemon/snorlax/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/snorunt_front_pic.png b/graphics/pokemon/snorunt/anim_front.png
index 6ced11d08..6ced11d08 100644
--- a/graphics/pokemon/anim_front_pics/snorunt_front_pic.png
+++ b/graphics/pokemon/snorunt/anim_front.png
diff --git a/graphics/pokemon/back_pics/snorunt_back_pic.png b/graphics/pokemon/snorunt/back.png
index 53ddf9fdc..53ddf9fdc 100644
--- a/graphics/pokemon/back_pics/snorunt_back_pic.png
+++ b/graphics/pokemon/snorunt/back.png
diff --git a/graphics/pokemon/footprints/snorunt_footprint.png b/graphics/pokemon/snorunt/footprint.png
index 14277b506..14277b506 100644
--- a/graphics/pokemon/footprints/snorunt_footprint.png
+++ b/graphics/pokemon/snorunt/footprint.png
diff --git a/graphics/pokemon/front_pics/snorunt_still_front_pic.png b/graphics/pokemon/snorunt/front.png
index bf18fb9fa..bf18fb9fa 100644
--- a/graphics/pokemon/front_pics/snorunt_still_front_pic.png
+++ b/graphics/pokemon/snorunt/front.png
diff --git a/graphics/pokemon/icons/snorunt_icon.png b/graphics/pokemon/snorunt/icon.png
index 2710b9a0a..2710b9a0a 100644
--- a/graphics/pokemon/icons/snorunt_icon.png
+++ b/graphics/pokemon/snorunt/icon.png
diff --git a/graphics/pokemon/palettes/snorunt_palette.pal b/graphics/pokemon/snorunt/normal.pal
index 25d137458..25d137458 100644
--- a/graphics/pokemon/palettes/snorunt_palette.pal
+++ b/graphics/pokemon/snorunt/normal.pal
diff --git a/graphics/pokemon/palettes/snorunt_shiny_palette.pal b/graphics/pokemon/snorunt/shiny.pal
index b483a219f..b483a219f 100644
--- a/graphics/pokemon/palettes/snorunt_shiny_palette.pal
+++ b/graphics/pokemon/snorunt/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/snubbull_front_pic.png b/graphics/pokemon/snubbull/anim_front.png
index bffc3a2ef..bffc3a2ef 100644
--- a/graphics/pokemon/anim_front_pics/snubbull_front_pic.png
+++ b/graphics/pokemon/snubbull/anim_front.png
diff --git a/graphics/pokemon/back_pics/snubbull_back_pic.png b/graphics/pokemon/snubbull/back.png
index 2b212b708..2b212b708 100644
--- a/graphics/pokemon/back_pics/snubbull_back_pic.png
+++ b/graphics/pokemon/snubbull/back.png
diff --git a/graphics/pokemon/footprints/snubbull_footprint.png b/graphics/pokemon/snubbull/footprint.png
index 443847cdd..443847cdd 100644
--- a/graphics/pokemon/footprints/snubbull_footprint.png
+++ b/graphics/pokemon/snubbull/footprint.png
diff --git a/graphics/pokemon/front_pics/snubbull_still_front_pic.png b/graphics/pokemon/snubbull/front.png
index 86c602d49..86c602d49 100644
--- a/graphics/pokemon/front_pics/snubbull_still_front_pic.png
+++ b/graphics/pokemon/snubbull/front.png
diff --git a/graphics/pokemon/icons/snubbull_icon.png b/graphics/pokemon/snubbull/icon.png
index 80f9b1288..80f9b1288 100644
--- a/graphics/pokemon/icons/snubbull_icon.png
+++ b/graphics/pokemon/snubbull/icon.png
diff --git a/graphics/pokemon/palettes/snubbull_palette.pal b/graphics/pokemon/snubbull/normal.pal
index dea1ea530..dea1ea530 100644
--- a/graphics/pokemon/palettes/snubbull_palette.pal
+++ b/graphics/pokemon/snubbull/normal.pal
diff --git a/graphics/pokemon/palettes/snubbull_shiny_palette.pal b/graphics/pokemon/snubbull/shiny.pal
index 5dcc2957d..5dcc2957d 100644
--- a/graphics/pokemon/palettes/snubbull_shiny_palette.pal
+++ b/graphics/pokemon/snubbull/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/solrock_front_pic.png b/graphics/pokemon/solrock/anim_front.png
index 84bdfae74..84bdfae74 100644
--- a/graphics/pokemon/anim_front_pics/solrock_front_pic.png
+++ b/graphics/pokemon/solrock/anim_front.png
diff --git a/graphics/pokemon/back_pics/solrock_back_pic.png b/graphics/pokemon/solrock/back.png
index 2f6e7cb99..2f6e7cb99 100644
--- a/graphics/pokemon/back_pics/solrock_back_pic.png
+++ b/graphics/pokemon/solrock/back.png
diff --git a/graphics/pokemon/footprints/solrock_footprint.png b/graphics/pokemon/solrock/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/solrock_footprint.png
+++ b/graphics/pokemon/solrock/footprint.png
diff --git a/graphics/pokemon/front_pics/solrock_still_front_pic.png b/graphics/pokemon/solrock/front.png
index d0fe58533..d0fe58533 100644
--- a/graphics/pokemon/front_pics/solrock_still_front_pic.png
+++ b/graphics/pokemon/solrock/front.png
diff --git a/graphics/pokemon/icons/solrock_icon.png b/graphics/pokemon/solrock/icon.png
index f9e689424..f9e689424 100644
--- a/graphics/pokemon/icons/solrock_icon.png
+++ b/graphics/pokemon/solrock/icon.png
diff --git a/graphics/pokemon/palettes/solrock_palette.pal b/graphics/pokemon/solrock/normal.pal
index 315f49dd3..315f49dd3 100644
--- a/graphics/pokemon/palettes/solrock_palette.pal
+++ b/graphics/pokemon/solrock/normal.pal
diff --git a/graphics/pokemon/palettes/solrock_shiny_palette.pal b/graphics/pokemon/solrock/shiny.pal
index 9de01aa0b..9de01aa0b 100644
--- a/graphics/pokemon/palettes/solrock_shiny_palette.pal
+++ b/graphics/pokemon/solrock/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/spearow_front_pic.png b/graphics/pokemon/spearow/anim_front.png
index 4283ba2d6..4283ba2d6 100644
--- a/graphics/pokemon/anim_front_pics/spearow_front_pic.png
+++ b/graphics/pokemon/spearow/anim_front.png
diff --git a/graphics/pokemon/back_pics/spearow_back_pic.png b/graphics/pokemon/spearow/back.png
index b630f24e0..b630f24e0 100644
--- a/graphics/pokemon/back_pics/spearow_back_pic.png
+++ b/graphics/pokemon/spearow/back.png
diff --git a/graphics/pokemon/footprints/spearow_footprint.png b/graphics/pokemon/spearow/footprint.png
index 6fe6e4282..6fe6e4282 100644
--- a/graphics/pokemon/footprints/spearow_footprint.png
+++ b/graphics/pokemon/spearow/footprint.png
diff --git a/graphics/pokemon/front_pics/spearow_still_front_pic.png b/graphics/pokemon/spearow/front.png
index 10d35504a..10d35504a 100644
--- a/graphics/pokemon/front_pics/spearow_still_front_pic.png
+++ b/graphics/pokemon/spearow/front.png
diff --git a/graphics/pokemon/icons/spearow_icon.png b/graphics/pokemon/spearow/icon.png
index a88db9927..a88db9927 100644
--- a/graphics/pokemon/icons/spearow_icon.png
+++ b/graphics/pokemon/spearow/icon.png
diff --git a/graphics/pokemon/palettes/spearow_palette.pal b/graphics/pokemon/spearow/normal.pal
index de6c4ce1c..de6c4ce1c 100644
--- a/graphics/pokemon/palettes/spearow_palette.pal
+++ b/graphics/pokemon/spearow/normal.pal
diff --git a/graphics/pokemon/palettes/spearow_shiny_palette.pal b/graphics/pokemon/spearow/shiny.pal
index fd2223485..fd2223485 100644
--- a/graphics/pokemon/palettes/spearow_shiny_palette.pal
+++ b/graphics/pokemon/spearow/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/spheal_front_pic.png b/graphics/pokemon/spheal/anim_front.png
index 0bedf25fd..0bedf25fd 100644
--- a/graphics/pokemon/anim_front_pics/spheal_front_pic.png
+++ b/graphics/pokemon/spheal/anim_front.png
diff --git a/graphics/pokemon/back_pics/spheal_back_pic.png b/graphics/pokemon/spheal/back.png
index 6fb9e9443..6fb9e9443 100644
--- a/graphics/pokemon/back_pics/spheal_back_pic.png
+++ b/graphics/pokemon/spheal/back.png
diff --git a/graphics/pokemon/footprints/spheal_footprint.png b/graphics/pokemon/spheal/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/spheal_footprint.png
+++ b/graphics/pokemon/spheal/footprint.png
diff --git a/graphics/pokemon/front_pics/spheal_still_front_pic.png b/graphics/pokemon/spheal/front.png
index f07cf67b5..f07cf67b5 100644
--- a/graphics/pokemon/front_pics/spheal_still_front_pic.png
+++ b/graphics/pokemon/spheal/front.png
diff --git a/graphics/pokemon/icons/spheal_icon.png b/graphics/pokemon/spheal/icon.png
index fd392e196..fd392e196 100644
--- a/graphics/pokemon/icons/spheal_icon.png
+++ b/graphics/pokemon/spheal/icon.png
diff --git a/graphics/pokemon/palettes/spheal_palette.pal b/graphics/pokemon/spheal/normal.pal
index 1fa035c32..1fa035c32 100644
--- a/graphics/pokemon/palettes/spheal_palette.pal
+++ b/graphics/pokemon/spheal/normal.pal
diff --git a/graphics/pokemon/palettes/spheal_shiny_palette.pal b/graphics/pokemon/spheal/shiny.pal
index 14f207301..14f207301 100644
--- a/graphics/pokemon/palettes/spheal_shiny_palette.pal
+++ b/graphics/pokemon/spheal/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/spinarak_front_pic.png b/graphics/pokemon/spinarak/anim_front.png
index e9f611b14..e9f611b14 100644
--- a/graphics/pokemon/anim_front_pics/spinarak_front_pic.png
+++ b/graphics/pokemon/spinarak/anim_front.png
diff --git a/graphics/pokemon/back_pics/spinarak_back_pic.png b/graphics/pokemon/spinarak/back.png
index 7c2144971..7c2144971 100644
--- a/graphics/pokemon/back_pics/spinarak_back_pic.png
+++ b/graphics/pokemon/spinarak/back.png
diff --git a/graphics/pokemon/footprints/spinarak_footprint.png b/graphics/pokemon/spinarak/footprint.png
index 6965dbe60..6965dbe60 100644
--- a/graphics/pokemon/footprints/spinarak_footprint.png
+++ b/graphics/pokemon/spinarak/footprint.png
diff --git a/graphics/pokemon/front_pics/spinarak_still_front_pic.png b/graphics/pokemon/spinarak/front.png
index cd525f1c4..cd525f1c4 100644
--- a/graphics/pokemon/front_pics/spinarak_still_front_pic.png
+++ b/graphics/pokemon/spinarak/front.png
diff --git a/graphics/pokemon/icons/spinarak_icon.png b/graphics/pokemon/spinarak/icon.png
index 54ec8e0fe..54ec8e0fe 100644
--- a/graphics/pokemon/icons/spinarak_icon.png
+++ b/graphics/pokemon/spinarak/icon.png
diff --git a/graphics/pokemon/palettes/spinarak_palette.pal b/graphics/pokemon/spinarak/normal.pal
index 0a09982d6..0a09982d6 100644
--- a/graphics/pokemon/palettes/spinarak_palette.pal
+++ b/graphics/pokemon/spinarak/normal.pal
diff --git a/graphics/pokemon/palettes/spinarak_shiny_palette.pal b/graphics/pokemon/spinarak/shiny.pal
index f2aed8e9f..f2aed8e9f 100644
--- a/graphics/pokemon/palettes/spinarak_shiny_palette.pal
+++ b/graphics/pokemon/spinarak/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/spinda_front_pic.png b/graphics/pokemon/spinda/anim_front.png
index 7ddfbef51..7ddfbef51 100644
--- a/graphics/pokemon/anim_front_pics/spinda_front_pic.png
+++ b/graphics/pokemon/spinda/anim_front.png
diff --git a/graphics/pokemon/back_pics/spinda_back_pic.png b/graphics/pokemon/spinda/back.png
index c5f699e2c..c5f699e2c 100644
--- a/graphics/pokemon/back_pics/spinda_back_pic.png
+++ b/graphics/pokemon/spinda/back.png
diff --git a/graphics/pokemon/footprints/spinda_footprint.png b/graphics/pokemon/spinda/footprint.png
index 7be943a89..7be943a89 100644
--- a/graphics/pokemon/footprints/spinda_footprint.png
+++ b/graphics/pokemon/spinda/footprint.png
diff --git a/graphics/pokemon/front_pics/spinda_still_front_pic.png b/graphics/pokemon/spinda/front.png
index 4d298366f..4d298366f 100644
--- a/graphics/pokemon/front_pics/spinda_still_front_pic.png
+++ b/graphics/pokemon/spinda/front.png
diff --git a/graphics/pokemon/icons/spinda_icon.png b/graphics/pokemon/spinda/icon.png
index 75699c7cb..75699c7cb 100644
--- a/graphics/pokemon/icons/spinda_icon.png
+++ b/graphics/pokemon/spinda/icon.png
diff --git a/graphics/pokemon/palettes/spinda_palette.pal b/graphics/pokemon/spinda/normal.pal
index 9b0ad5bfc..9b0ad5bfc 100644
--- a/graphics/pokemon/palettes/spinda_palette.pal
+++ b/graphics/pokemon/spinda/normal.pal
diff --git a/graphics/pokemon/palettes/spinda_shiny_palette.pal b/graphics/pokemon/spinda/shiny.pal
index 6aa748129..6aa748129 100644
--- a/graphics/pokemon/palettes/spinda_shiny_palette.pal
+++ b/graphics/pokemon/spinda/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/spoink_front_pic.png b/graphics/pokemon/spoink/anim_front.png
index 8bdf77cbd..8bdf77cbd 100644
--- a/graphics/pokemon/anim_front_pics/spoink_front_pic.png
+++ b/graphics/pokemon/spoink/anim_front.png
diff --git a/graphics/pokemon/back_pics/spoink_back_pic.png b/graphics/pokemon/spoink/back.png
index 7872e240c..7872e240c 100644
--- a/graphics/pokemon/back_pics/spoink_back_pic.png
+++ b/graphics/pokemon/spoink/back.png
diff --git a/graphics/pokemon/footprints/spoink_footprint.png b/graphics/pokemon/spoink/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/spoink_footprint.png
+++ b/graphics/pokemon/spoink/footprint.png
diff --git a/graphics/pokemon/front_pics/spoink_still_front_pic.png b/graphics/pokemon/spoink/front.png
index ee4afc1ed..ee4afc1ed 100644
--- a/graphics/pokemon/front_pics/spoink_still_front_pic.png
+++ b/graphics/pokemon/spoink/front.png
diff --git a/graphics/pokemon/icons/spoink_icon.png b/graphics/pokemon/spoink/icon.png
index 387d0ed00..387d0ed00 100644
--- a/graphics/pokemon/icons/spoink_icon.png
+++ b/graphics/pokemon/spoink/icon.png
diff --git a/graphics/pokemon/palettes/spoink_palette.pal b/graphics/pokemon/spoink/normal.pal
index c1891323c..c1891323c 100644
--- a/graphics/pokemon/palettes/spoink_palette.pal
+++ b/graphics/pokemon/spoink/normal.pal
diff --git a/graphics/pokemon/palettes/spoink_shiny_palette.pal b/graphics/pokemon/spoink/shiny.pal
index c8edfafd7..c8edfafd7 100644
--- a/graphics/pokemon/palettes/spoink_shiny_palette.pal
+++ b/graphics/pokemon/spoink/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/squirtle_front_pic.png b/graphics/pokemon/squirtle/anim_front.png
index 403a786ec..403a786ec 100644
--- a/graphics/pokemon/anim_front_pics/squirtle_front_pic.png
+++ b/graphics/pokemon/squirtle/anim_front.png
diff --git a/graphics/pokemon/back_pics/squirtle_back_pic.png b/graphics/pokemon/squirtle/back.png
index b2fa0f37b..b2fa0f37b 100644
--- a/graphics/pokemon/back_pics/squirtle_back_pic.png
+++ b/graphics/pokemon/squirtle/back.png
diff --git a/graphics/pokemon/footprints/squirtle_footprint.png b/graphics/pokemon/squirtle/footprint.png
index 696cd6d42..696cd6d42 100644
--- a/graphics/pokemon/footprints/squirtle_footprint.png
+++ b/graphics/pokemon/squirtle/footprint.png
diff --git a/graphics/pokemon/front_pics/squirtle_still_front_pic.png b/graphics/pokemon/squirtle/front.png
index 04d27ede5..04d27ede5 100644
--- a/graphics/pokemon/front_pics/squirtle_still_front_pic.png
+++ b/graphics/pokemon/squirtle/front.png
diff --git a/graphics/pokemon/icons/squirtle_icon.png b/graphics/pokemon/squirtle/icon.png
index 75a58770f..75a58770f 100644
--- a/graphics/pokemon/icons/squirtle_icon.png
+++ b/graphics/pokemon/squirtle/icon.png
diff --git a/graphics/pokemon/palettes/squirtle_palette.pal b/graphics/pokemon/squirtle/normal.pal
index 8429f3be2..8429f3be2 100644
--- a/graphics/pokemon/palettes/squirtle_palette.pal
+++ b/graphics/pokemon/squirtle/normal.pal
diff --git a/graphics/pokemon/palettes/squirtle_shiny_palette.pal b/graphics/pokemon/squirtle/shiny.pal
index 9a41b677c..9a41b677c 100644
--- a/graphics/pokemon/palettes/squirtle_shiny_palette.pal
+++ b/graphics/pokemon/squirtle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/stantler_front_pic.png b/graphics/pokemon/stantler/anim_front.png
index 27c482ef4..27c482ef4 100644
--- a/graphics/pokemon/anim_front_pics/stantler_front_pic.png
+++ b/graphics/pokemon/stantler/anim_front.png
diff --git a/graphics/pokemon/back_pics/stantler_back_pic.png b/graphics/pokemon/stantler/back.png
index 9ddf7a40c..9ddf7a40c 100644
--- a/graphics/pokemon/back_pics/stantler_back_pic.png
+++ b/graphics/pokemon/stantler/back.png
diff --git a/graphics/pokemon/footprints/stantler_footprint.png b/graphics/pokemon/stantler/footprint.png
index 7f2b0f532..7f2b0f532 100644
--- a/graphics/pokemon/footprints/stantler_footprint.png
+++ b/graphics/pokemon/stantler/footprint.png
diff --git a/graphics/pokemon/front_pics/stantler_still_front_pic.png b/graphics/pokemon/stantler/front.png
index aa3d80efc..aa3d80efc 100644
--- a/graphics/pokemon/front_pics/stantler_still_front_pic.png
+++ b/graphics/pokemon/stantler/front.png
diff --git a/graphics/pokemon/icons/stantler_icon.png b/graphics/pokemon/stantler/icon.png
index da9e6da99..da9e6da99 100644
--- a/graphics/pokemon/icons/stantler_icon.png
+++ b/graphics/pokemon/stantler/icon.png
diff --git a/graphics/pokemon/palettes/stantler_palette.pal b/graphics/pokemon/stantler/normal.pal
index 29eeabc43..29eeabc43 100644
--- a/graphics/pokemon/palettes/stantler_palette.pal
+++ b/graphics/pokemon/stantler/normal.pal
diff --git a/graphics/pokemon/palettes/stantler_shiny_palette.pal b/graphics/pokemon/stantler/shiny.pal
index 18b43b330..18b43b330 100644
--- a/graphics/pokemon/palettes/stantler_shiny_palette.pal
+++ b/graphics/pokemon/stantler/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/starmie_front_pic.png b/graphics/pokemon/starmie/anim_front.png
index b98d2ac32..b98d2ac32 100644
--- a/graphics/pokemon/anim_front_pics/starmie_front_pic.png
+++ b/graphics/pokemon/starmie/anim_front.png
diff --git a/graphics/pokemon/back_pics/starmie_back_pic.png b/graphics/pokemon/starmie/back.png
index 62fdf3a41..62fdf3a41 100644
--- a/graphics/pokemon/back_pics/starmie_back_pic.png
+++ b/graphics/pokemon/starmie/back.png
diff --git a/graphics/pokemon/footprints/starmie_footprint.png b/graphics/pokemon/starmie/footprint.png
index c1c0058e7..c1c0058e7 100644
--- a/graphics/pokemon/footprints/starmie_footprint.png
+++ b/graphics/pokemon/starmie/footprint.png
diff --git a/graphics/pokemon/front_pics/starmie_still_front_pic.png b/graphics/pokemon/starmie/front.png
index ef137d686..ef137d686 100644
--- a/graphics/pokemon/front_pics/starmie_still_front_pic.png
+++ b/graphics/pokemon/starmie/front.png
diff --git a/graphics/pokemon/icons/starmie_icon.png b/graphics/pokemon/starmie/icon.png
index 844cae0c7..844cae0c7 100644
--- a/graphics/pokemon/icons/starmie_icon.png
+++ b/graphics/pokemon/starmie/icon.png
diff --git a/graphics/pokemon/palettes/starmie_palette.pal b/graphics/pokemon/starmie/normal.pal
index ff0daf218..ff0daf218 100644
--- a/graphics/pokemon/palettes/starmie_palette.pal
+++ b/graphics/pokemon/starmie/normal.pal
diff --git a/graphics/pokemon/palettes/starmie_shiny_palette.pal b/graphics/pokemon/starmie/shiny.pal
index 1f68c3476..1f68c3476 100644
--- a/graphics/pokemon/palettes/starmie_shiny_palette.pal
+++ b/graphics/pokemon/starmie/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/staryu_front_pic.png b/graphics/pokemon/staryu/anim_front.png
index a36ec0807..a36ec0807 100644
--- a/graphics/pokemon/anim_front_pics/staryu_front_pic.png
+++ b/graphics/pokemon/staryu/anim_front.png
diff --git a/graphics/pokemon/back_pics/staryu_back_pic.png b/graphics/pokemon/staryu/back.png
index 73a2f6aad..73a2f6aad 100644
--- a/graphics/pokemon/back_pics/staryu_back_pic.png
+++ b/graphics/pokemon/staryu/back.png
diff --git a/graphics/pokemon/footprints/staryu_footprint.png b/graphics/pokemon/staryu/footprint.png
index c1c0058e7..c1c0058e7 100644
--- a/graphics/pokemon/footprints/staryu_footprint.png
+++ b/graphics/pokemon/staryu/footprint.png
diff --git a/graphics/pokemon/front_pics/staryu_still_front_pic.png b/graphics/pokemon/staryu/front.png
index 7ce81165e..7ce81165e 100644
--- a/graphics/pokemon/front_pics/staryu_still_front_pic.png
+++ b/graphics/pokemon/staryu/front.png
diff --git a/graphics/pokemon/icons/staryu_icon.png b/graphics/pokemon/staryu/icon.png
index b90c0b9c3..b90c0b9c3 100644
--- a/graphics/pokemon/icons/staryu_icon.png
+++ b/graphics/pokemon/staryu/icon.png
diff --git a/graphics/pokemon/palettes/staryu_palette.pal b/graphics/pokemon/staryu/normal.pal
index 005b36c32..005b36c32 100644
--- a/graphics/pokemon/palettes/staryu_palette.pal
+++ b/graphics/pokemon/staryu/normal.pal
diff --git a/graphics/pokemon/palettes/staryu_shiny_palette.pal b/graphics/pokemon/staryu/shiny.pal
index e48cd6510..e48cd6510 100644
--- a/graphics/pokemon/palettes/staryu_shiny_palette.pal
+++ b/graphics/pokemon/staryu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/steelix_front_pic.png b/graphics/pokemon/steelix/anim_front.png
index bf4c25932..bf4c25932 100644
--- a/graphics/pokemon/anim_front_pics/steelix_front_pic.png
+++ b/graphics/pokemon/steelix/anim_front.png
diff --git a/graphics/pokemon/back_pics/steelix_back_pic.png b/graphics/pokemon/steelix/back.png
index 74cb256d0..74cb256d0 100644
--- a/graphics/pokemon/back_pics/steelix_back_pic.png
+++ b/graphics/pokemon/steelix/back.png
diff --git a/graphics/pokemon/footprints/steelix_footprint.png b/graphics/pokemon/steelix/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/steelix_footprint.png
+++ b/graphics/pokemon/steelix/footprint.png
diff --git a/graphics/pokemon/front_pics/steelix_still_front_pic.png b/graphics/pokemon/steelix/front.png
index e5b3a35d6..e5b3a35d6 100644
--- a/graphics/pokemon/front_pics/steelix_still_front_pic.png
+++ b/graphics/pokemon/steelix/front.png
diff --git a/graphics/pokemon/icons/steelix_icon.png b/graphics/pokemon/steelix/icon.png
index c99e17581..c99e17581 100644
--- a/graphics/pokemon/icons/steelix_icon.png
+++ b/graphics/pokemon/steelix/icon.png
diff --git a/graphics/pokemon/palettes/steelix_palette.pal b/graphics/pokemon/steelix/normal.pal
index e18ae398c..e18ae398c 100644
--- a/graphics/pokemon/palettes/steelix_palette.pal
+++ b/graphics/pokemon/steelix/normal.pal
diff --git a/graphics/pokemon/palettes/steelix_shiny_palette.pal b/graphics/pokemon/steelix/shiny.pal
index 02b21c7ac..02b21c7ac 100644
--- a/graphics/pokemon/palettes/steelix_shiny_palette.pal
+++ b/graphics/pokemon/steelix/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sudowoodo_front_pic.png b/graphics/pokemon/sudowoodo/anim_front.png
index ed198580d..ed198580d 100644
--- a/graphics/pokemon/anim_front_pics/sudowoodo_front_pic.png
+++ b/graphics/pokemon/sudowoodo/anim_front.png
diff --git a/graphics/pokemon/back_pics/sudowoodo_back_pic.png b/graphics/pokemon/sudowoodo/back.png
index befda7efc..befda7efc 100644
--- a/graphics/pokemon/back_pics/sudowoodo_back_pic.png
+++ b/graphics/pokemon/sudowoodo/back.png
diff --git a/graphics/pokemon/footprints/sudowoodo_footprint.png b/graphics/pokemon/sudowoodo/footprint.png
index 4ed751a79..4ed751a79 100644
--- a/graphics/pokemon/footprints/sudowoodo_footprint.png
+++ b/graphics/pokemon/sudowoodo/footprint.png
diff --git a/graphics/pokemon/front_pics/sudowoodo_still_front_pic.png b/graphics/pokemon/sudowoodo/front.png
index 897516953..897516953 100644
--- a/graphics/pokemon/front_pics/sudowoodo_still_front_pic.png
+++ b/graphics/pokemon/sudowoodo/front.png
diff --git a/graphics/pokemon/icons/sudowoodo_icon.png b/graphics/pokemon/sudowoodo/icon.png
index 4cc4afadf..4cc4afadf 100644
--- a/graphics/pokemon/icons/sudowoodo_icon.png
+++ b/graphics/pokemon/sudowoodo/icon.png
diff --git a/graphics/pokemon/palettes/sudowoodo_palette.pal b/graphics/pokemon/sudowoodo/normal.pal
index 3d589fc9d..3d589fc9d 100644
--- a/graphics/pokemon/palettes/sudowoodo_palette.pal
+++ b/graphics/pokemon/sudowoodo/normal.pal
diff --git a/graphics/pokemon/palettes/sudowoodo_shiny_palette.pal b/graphics/pokemon/sudowoodo/shiny.pal
index 6344dcc53..6344dcc53 100644
--- a/graphics/pokemon/palettes/sudowoodo_shiny_palette.pal
+++ b/graphics/pokemon/sudowoodo/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/suicune_front_pic.png b/graphics/pokemon/suicune/anim_front.png
index 6eca4e01f..6eca4e01f 100644
--- a/graphics/pokemon/anim_front_pics/suicune_front_pic.png
+++ b/graphics/pokemon/suicune/anim_front.png
diff --git a/graphics/pokemon/back_pics/suicune_back_pic.png b/graphics/pokemon/suicune/back.png
index 80eef8678..80eef8678 100644
--- a/graphics/pokemon/back_pics/suicune_back_pic.png
+++ b/graphics/pokemon/suicune/back.png
diff --git a/graphics/pokemon/footprints/suicune_footprint.png b/graphics/pokemon/suicune/footprint.png
index 946c35dd0..946c35dd0 100644
--- a/graphics/pokemon/footprints/suicune_footprint.png
+++ b/graphics/pokemon/suicune/footprint.png
diff --git a/graphics/pokemon/front_pics/suicune_still_front_pic.png b/graphics/pokemon/suicune/front.png
index 3529d8fe1..3529d8fe1 100644
--- a/graphics/pokemon/front_pics/suicune_still_front_pic.png
+++ b/graphics/pokemon/suicune/front.png
diff --git a/graphics/pokemon/icons/suicune_icon.png b/graphics/pokemon/suicune/icon.png
index 3e4b3c695..3e4b3c695 100644
--- a/graphics/pokemon/icons/suicune_icon.png
+++ b/graphics/pokemon/suicune/icon.png
diff --git a/graphics/pokemon/palettes/suicune_palette.pal b/graphics/pokemon/suicune/normal.pal
index 3a21dbd4d..3a21dbd4d 100644
--- a/graphics/pokemon/palettes/suicune_palette.pal
+++ b/graphics/pokemon/suicune/normal.pal
diff --git a/graphics/pokemon/palettes/suicune_shiny_palette.pal b/graphics/pokemon/suicune/shiny.pal
index 2ee8b7a0f..2ee8b7a0f 100644
--- a/graphics/pokemon/palettes/suicune_shiny_palette.pal
+++ b/graphics/pokemon/suicune/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sunflora_front_pic.png b/graphics/pokemon/sunflora/anim_front.png
index 219c076ef..219c076ef 100644
--- a/graphics/pokemon/anim_front_pics/sunflora_front_pic.png
+++ b/graphics/pokemon/sunflora/anim_front.png
diff --git a/graphics/pokemon/back_pics/sunflora_back_pic.png b/graphics/pokemon/sunflora/back.png
index c048bebc2..c048bebc2 100644
--- a/graphics/pokemon/back_pics/sunflora_back_pic.png
+++ b/graphics/pokemon/sunflora/back.png
diff --git a/graphics/pokemon/footprints/sunflora_footprint.png b/graphics/pokemon/sunflora/footprint.png
index f6de3ca9f..f6de3ca9f 100644
--- a/graphics/pokemon/footprints/sunflora_footprint.png
+++ b/graphics/pokemon/sunflora/footprint.png
diff --git a/graphics/pokemon/front_pics/sunflora_still_front_pic.png b/graphics/pokemon/sunflora/front.png
index 9752bb9d4..9752bb9d4 100644
--- a/graphics/pokemon/front_pics/sunflora_still_front_pic.png
+++ b/graphics/pokemon/sunflora/front.png
diff --git a/graphics/pokemon/icons/sunflora_icon.png b/graphics/pokemon/sunflora/icon.png
index 6493eb510..6493eb510 100644
--- a/graphics/pokemon/icons/sunflora_icon.png
+++ b/graphics/pokemon/sunflora/icon.png
diff --git a/graphics/pokemon/palettes/sunflora_palette.pal b/graphics/pokemon/sunflora/normal.pal
index a22ed3fe7..a22ed3fe7 100644
--- a/graphics/pokemon/palettes/sunflora_palette.pal
+++ b/graphics/pokemon/sunflora/normal.pal
diff --git a/graphics/pokemon/palettes/sunflora_shiny_palette.pal b/graphics/pokemon/sunflora/shiny.pal
index ea8de6e05..ea8de6e05 100644
--- a/graphics/pokemon/palettes/sunflora_shiny_palette.pal
+++ b/graphics/pokemon/sunflora/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/sunkern_front_pic.png b/graphics/pokemon/sunkern/anim_front.png
index 167f1f37e..167f1f37e 100644
--- a/graphics/pokemon/anim_front_pics/sunkern_front_pic.png
+++ b/graphics/pokemon/sunkern/anim_front.png
diff --git a/graphics/pokemon/back_pics/sunkern_back_pic.png b/graphics/pokemon/sunkern/back.png
index e6adde775..e6adde775 100644
--- a/graphics/pokemon/back_pics/sunkern_back_pic.png
+++ b/graphics/pokemon/sunkern/back.png
diff --git a/graphics/pokemon/footprints/sunkern_footprint.png b/graphics/pokemon/sunkern/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/sunkern_footprint.png
+++ b/graphics/pokemon/sunkern/footprint.png
diff --git a/graphics/pokemon/front_pics/sunkern_still_front_pic.png b/graphics/pokemon/sunkern/front.png
index 15a743cc3..15a743cc3 100644
--- a/graphics/pokemon/front_pics/sunkern_still_front_pic.png
+++ b/graphics/pokemon/sunkern/front.png
diff --git a/graphics/pokemon/icons/sunkern_icon.png b/graphics/pokemon/sunkern/icon.png
index 60d7ea91b..60d7ea91b 100644
--- a/graphics/pokemon/icons/sunkern_icon.png
+++ b/graphics/pokemon/sunkern/icon.png
diff --git a/graphics/pokemon/palettes/sunkern_palette.pal b/graphics/pokemon/sunkern/normal.pal
index 7dab1246d..7dab1246d 100644
--- a/graphics/pokemon/palettes/sunkern_palette.pal
+++ b/graphics/pokemon/sunkern/normal.pal
diff --git a/graphics/pokemon/palettes/sunkern_shiny_palette.pal b/graphics/pokemon/sunkern/shiny.pal
index 84a106f65..84a106f65 100644
--- a/graphics/pokemon/palettes/sunkern_shiny_palette.pal
+++ b/graphics/pokemon/sunkern/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/surskit_front_pic.png b/graphics/pokemon/surskit/anim_front.png
index 187952826..187952826 100644
--- a/graphics/pokemon/anim_front_pics/surskit_front_pic.png
+++ b/graphics/pokemon/surskit/anim_front.png
diff --git a/graphics/pokemon/back_pics/surskit_back_pic.png b/graphics/pokemon/surskit/back.png
index 85b8a8a4f..85b8a8a4f 100644
--- a/graphics/pokemon/back_pics/surskit_back_pic.png
+++ b/graphics/pokemon/surskit/back.png
diff --git a/graphics/pokemon/footprints/surskit_footprint.png b/graphics/pokemon/surskit/footprint.png
index e4945976f..e4945976f 100644
--- a/graphics/pokemon/footprints/surskit_footprint.png
+++ b/graphics/pokemon/surskit/footprint.png
diff --git a/graphics/pokemon/front_pics/surskit_still_front_pic.png b/graphics/pokemon/surskit/front.png
index 559e8e786..559e8e786 100644
--- a/graphics/pokemon/front_pics/surskit_still_front_pic.png
+++ b/graphics/pokemon/surskit/front.png
diff --git a/graphics/pokemon/icons/surskit_icon.png b/graphics/pokemon/surskit/icon.png
index a7267c21a..a7267c21a 100644
--- a/graphics/pokemon/icons/surskit_icon.png
+++ b/graphics/pokemon/surskit/icon.png
diff --git a/graphics/pokemon/palettes/surskit_palette.pal b/graphics/pokemon/surskit/normal.pal
index 7aa7f389d..7aa7f389d 100644
--- a/graphics/pokemon/palettes/surskit_palette.pal
+++ b/graphics/pokemon/surskit/normal.pal
diff --git a/graphics/pokemon/palettes/surskit_shiny_palette.pal b/graphics/pokemon/surskit/shiny.pal
index 71624ff69..71624ff69 100644
--- a/graphics/pokemon/palettes/surskit_shiny_palette.pal
+++ b/graphics/pokemon/surskit/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/swablu_front_pic.png b/graphics/pokemon/swablu/anim_front.png
index bbe775905..bbe775905 100644
--- a/graphics/pokemon/anim_front_pics/swablu_front_pic.png
+++ b/graphics/pokemon/swablu/anim_front.png
diff --git a/graphics/pokemon/back_pics/swablu_back_pic.png b/graphics/pokemon/swablu/back.png
index 802a9e37c..802a9e37c 100644
--- a/graphics/pokemon/back_pics/swablu_back_pic.png
+++ b/graphics/pokemon/swablu/back.png
diff --git a/graphics/pokemon/footprints/swablu_footprint.png b/graphics/pokemon/swablu/footprint.png
index 7e71113c3..7e71113c3 100644
--- a/graphics/pokemon/footprints/swablu_footprint.png
+++ b/graphics/pokemon/swablu/footprint.png
diff --git a/graphics/pokemon/front_pics/swablu_still_front_pic.png b/graphics/pokemon/swablu/front.png
index 3439086e9..3439086e9 100644
--- a/graphics/pokemon/front_pics/swablu_still_front_pic.png
+++ b/graphics/pokemon/swablu/front.png
diff --git a/graphics/pokemon/icons/swablu_icon.png b/graphics/pokemon/swablu/icon.png
index fa269d741..fa269d741 100644
--- a/graphics/pokemon/icons/swablu_icon.png
+++ b/graphics/pokemon/swablu/icon.png
diff --git a/graphics/pokemon/palettes/swablu_palette.pal b/graphics/pokemon/swablu/normal.pal
index 180dac0df..180dac0df 100644
--- a/graphics/pokemon/palettes/swablu_palette.pal
+++ b/graphics/pokemon/swablu/normal.pal
diff --git a/graphics/pokemon/palettes/swablu_shiny_palette.pal b/graphics/pokemon/swablu/shiny.pal
index 392d5a8bb..392d5a8bb 100644
--- a/graphics/pokemon/palettes/swablu_shiny_palette.pal
+++ b/graphics/pokemon/swablu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/swalot_front_pic.png b/graphics/pokemon/swalot/anim_front.png
index 11ca0f353..11ca0f353 100644
--- a/graphics/pokemon/anim_front_pics/swalot_front_pic.png
+++ b/graphics/pokemon/swalot/anim_front.png
diff --git a/graphics/pokemon/back_pics/swalot_back_pic.png b/graphics/pokemon/swalot/back.png
index acd59b1b9..acd59b1b9 100644
--- a/graphics/pokemon/back_pics/swalot_back_pic.png
+++ b/graphics/pokemon/swalot/back.png
diff --git a/graphics/pokemon/footprints/swalot_footprint.png b/graphics/pokemon/swalot/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/swalot_footprint.png
+++ b/graphics/pokemon/swalot/footprint.png
diff --git a/graphics/pokemon/front_pics/swalot_still_front_pic.png b/graphics/pokemon/swalot/front.png
index 7607b8c2e..7607b8c2e 100644
--- a/graphics/pokemon/front_pics/swalot_still_front_pic.png
+++ b/graphics/pokemon/swalot/front.png
diff --git a/graphics/pokemon/icons/swalot_icon.png b/graphics/pokemon/swalot/icon.png
index 9868d73d3..9868d73d3 100644
--- a/graphics/pokemon/icons/swalot_icon.png
+++ b/graphics/pokemon/swalot/icon.png
diff --git a/graphics/pokemon/palettes/swalot_palette.pal b/graphics/pokemon/swalot/normal.pal
index fcd80af0b..fcd80af0b 100644
--- a/graphics/pokemon/palettes/swalot_palette.pal
+++ b/graphics/pokemon/swalot/normal.pal
diff --git a/graphics/pokemon/palettes/swalot_shiny_palette.pal b/graphics/pokemon/swalot/shiny.pal
index 109d19022..109d19022 100644
--- a/graphics/pokemon/palettes/swalot_shiny_palette.pal
+++ b/graphics/pokemon/swalot/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/swampert_front_pic.png b/graphics/pokemon/swampert/anim_front.png
index 62c207a26..62c207a26 100644
--- a/graphics/pokemon/anim_front_pics/swampert_front_pic.png
+++ b/graphics/pokemon/swampert/anim_front.png
diff --git a/graphics/pokemon/back_pics/swampert_back_pic.png b/graphics/pokemon/swampert/back.png
index bb795c65f..bb795c65f 100644
--- a/graphics/pokemon/back_pics/swampert_back_pic.png
+++ b/graphics/pokemon/swampert/back.png
diff --git a/graphics/pokemon/footprints/swampert_footprint.png b/graphics/pokemon/swampert/footprint.png
index ed223e641..ed223e641 100644
--- a/graphics/pokemon/footprints/swampert_footprint.png
+++ b/graphics/pokemon/swampert/footprint.png
diff --git a/graphics/pokemon/front_pics/swampert_still_front_pic.png b/graphics/pokemon/swampert/front.png
index eea565e43..eea565e43 100644
--- a/graphics/pokemon/front_pics/swampert_still_front_pic.png
+++ b/graphics/pokemon/swampert/front.png
diff --git a/graphics/pokemon/icons/swampert_icon.png b/graphics/pokemon/swampert/icon.png
index 5b2f04ca9..5b2f04ca9 100644
--- a/graphics/pokemon/icons/swampert_icon.png
+++ b/graphics/pokemon/swampert/icon.png
diff --git a/graphics/pokemon/palettes/swampert_palette.pal b/graphics/pokemon/swampert/normal.pal
index 149557aa4..149557aa4 100644
--- a/graphics/pokemon/palettes/swampert_palette.pal
+++ b/graphics/pokemon/swampert/normal.pal
diff --git a/graphics/pokemon/palettes/swampert_shiny_palette.pal b/graphics/pokemon/swampert/shiny.pal
index 284a31508..284a31508 100644
--- a/graphics/pokemon/palettes/swampert_shiny_palette.pal
+++ b/graphics/pokemon/swampert/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/swellow_front_pic.png b/graphics/pokemon/swellow/anim_front.png
index de8016b51..de8016b51 100644
--- a/graphics/pokemon/anim_front_pics/swellow_front_pic.png
+++ b/graphics/pokemon/swellow/anim_front.png
diff --git a/graphics/pokemon/back_pics/swellow_back_pic.png b/graphics/pokemon/swellow/back.png
index c2c1c3ed3..c2c1c3ed3 100644
--- a/graphics/pokemon/back_pics/swellow_back_pic.png
+++ b/graphics/pokemon/swellow/back.png
diff --git a/graphics/pokemon/footprints/swellow_footprint.png b/graphics/pokemon/swellow/footprint.png
index f44a71c29..f44a71c29 100644
--- a/graphics/pokemon/footprints/swellow_footprint.png
+++ b/graphics/pokemon/swellow/footprint.png
diff --git a/graphics/pokemon/front_pics/swellow_still_front_pic.png b/graphics/pokemon/swellow/front.png
index 6a5dcb239..6a5dcb239 100644
--- a/graphics/pokemon/front_pics/swellow_still_front_pic.png
+++ b/graphics/pokemon/swellow/front.png
diff --git a/graphics/pokemon/icons/swellow_icon.png b/graphics/pokemon/swellow/icon.png
index 47a2ea74d..47a2ea74d 100644
--- a/graphics/pokemon/icons/swellow_icon.png
+++ b/graphics/pokemon/swellow/icon.png
diff --git a/graphics/pokemon/palettes/swellow_palette.pal b/graphics/pokemon/swellow/normal.pal
index cf8e9f794..cf8e9f794 100644
--- a/graphics/pokemon/palettes/swellow_palette.pal
+++ b/graphics/pokemon/swellow/normal.pal
diff --git a/graphics/pokemon/palettes/swellow_shiny_palette.pal b/graphics/pokemon/swellow/shiny.pal
index 388f2b220..388f2b220 100644
--- a/graphics/pokemon/palettes/swellow_shiny_palette.pal
+++ b/graphics/pokemon/swellow/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/swinub_front_pic.png b/graphics/pokemon/swinub/anim_front.png
index 80675bd9b..80675bd9b 100644
--- a/graphics/pokemon/anim_front_pics/swinub_front_pic.png
+++ b/graphics/pokemon/swinub/anim_front.png
diff --git a/graphics/pokemon/back_pics/swinub_back_pic.png b/graphics/pokemon/swinub/back.png
index 66998faad..66998faad 100644
--- a/graphics/pokemon/back_pics/swinub_back_pic.png
+++ b/graphics/pokemon/swinub/back.png
diff --git a/graphics/pokemon/footprints/swinub_footprint.png b/graphics/pokemon/swinub/footprint.png
index fb56709ec..fb56709ec 100644
--- a/graphics/pokemon/footprints/swinub_footprint.png
+++ b/graphics/pokemon/swinub/footprint.png
diff --git a/graphics/pokemon/front_pics/swinub_still_front_pic.png b/graphics/pokemon/swinub/front.png
index c92de5b5a..c92de5b5a 100644
--- a/graphics/pokemon/front_pics/swinub_still_front_pic.png
+++ b/graphics/pokemon/swinub/front.png
diff --git a/graphics/pokemon/icons/swinub_icon.png b/graphics/pokemon/swinub/icon.png
index f33656a0c..f33656a0c 100644
--- a/graphics/pokemon/icons/swinub_icon.png
+++ b/graphics/pokemon/swinub/icon.png
diff --git a/graphics/pokemon/palettes/swinub_palette.pal b/graphics/pokemon/swinub/normal.pal
index b014d69d6..b014d69d6 100644
--- a/graphics/pokemon/palettes/swinub_palette.pal
+++ b/graphics/pokemon/swinub/normal.pal
diff --git a/graphics/pokemon/palettes/swinub_shiny_palette.pal b/graphics/pokemon/swinub/shiny.pal
index 9482e2d46..9482e2d46 100644
--- a/graphics/pokemon/palettes/swinub_shiny_palette.pal
+++ b/graphics/pokemon/swinub/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/taillow_front_pic.png b/graphics/pokemon/taillow/anim_front.png
index d27e9f768..d27e9f768 100644
--- a/graphics/pokemon/anim_front_pics/taillow_front_pic.png
+++ b/graphics/pokemon/taillow/anim_front.png
diff --git a/graphics/pokemon/back_pics/taillow_back_pic.png b/graphics/pokemon/taillow/back.png
index 997d6db45..997d6db45 100644
--- a/graphics/pokemon/back_pics/taillow_back_pic.png
+++ b/graphics/pokemon/taillow/back.png
diff --git a/graphics/pokemon/footprints/taillow_footprint.png b/graphics/pokemon/taillow/footprint.png
index dbf5c5c6b..dbf5c5c6b 100644
--- a/graphics/pokemon/footprints/taillow_footprint.png
+++ b/graphics/pokemon/taillow/footprint.png
diff --git a/graphics/pokemon/front_pics/taillow_still_front_pic.png b/graphics/pokemon/taillow/front.png
index 6ff802ac6..6ff802ac6 100644
--- a/graphics/pokemon/front_pics/taillow_still_front_pic.png
+++ b/graphics/pokemon/taillow/front.png
diff --git a/graphics/pokemon/icons/taillow_icon.png b/graphics/pokemon/taillow/icon.png
index a0668865b..a0668865b 100644
--- a/graphics/pokemon/icons/taillow_icon.png
+++ b/graphics/pokemon/taillow/icon.png
diff --git a/graphics/pokemon/palettes/taillow_palette.pal b/graphics/pokemon/taillow/normal.pal
index b1777b5be..b1777b5be 100644
--- a/graphics/pokemon/palettes/taillow_palette.pal
+++ b/graphics/pokemon/taillow/normal.pal
diff --git a/graphics/pokemon/palettes/taillow_shiny_palette.pal b/graphics/pokemon/taillow/shiny.pal
index 388f2b220..388f2b220 100644
--- a/graphics/pokemon/palettes/taillow_shiny_palette.pal
+++ b/graphics/pokemon/taillow/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tangela_front_pic.png b/graphics/pokemon/tangela/anim_front.png
index 161c7d576..161c7d576 100644
--- a/graphics/pokemon/anim_front_pics/tangela_front_pic.png
+++ b/graphics/pokemon/tangela/anim_front.png
diff --git a/graphics/pokemon/back_pics/tangela_back_pic.png b/graphics/pokemon/tangela/back.png
index 5a15f1b91..5a15f1b91 100644
--- a/graphics/pokemon/back_pics/tangela_back_pic.png
+++ b/graphics/pokemon/tangela/back.png
diff --git a/graphics/pokemon/footprints/tangela_footprint.png b/graphics/pokemon/tangela/footprint.png
index c05d3b437..c05d3b437 100644
--- a/graphics/pokemon/footprints/tangela_footprint.png
+++ b/graphics/pokemon/tangela/footprint.png
diff --git a/graphics/pokemon/front_pics/tangela_still_front_pic.png b/graphics/pokemon/tangela/front.png
index 8826b1cd7..8826b1cd7 100644
--- a/graphics/pokemon/front_pics/tangela_still_front_pic.png
+++ b/graphics/pokemon/tangela/front.png
diff --git a/graphics/pokemon/icons/tangela_icon.png b/graphics/pokemon/tangela/icon.png
index c2a8ee33f..c2a8ee33f 100644
--- a/graphics/pokemon/icons/tangela_icon.png
+++ b/graphics/pokemon/tangela/icon.png
diff --git a/graphics/pokemon/palettes/tangela_palette.pal b/graphics/pokemon/tangela/normal.pal
index 91dc27d45..91dc27d45 100644
--- a/graphics/pokemon/palettes/tangela_palette.pal
+++ b/graphics/pokemon/tangela/normal.pal
diff --git a/graphics/pokemon/palettes/tangela_shiny_palette.pal b/graphics/pokemon/tangela/shiny.pal
index 6c8c7fad5..6c8c7fad5 100644
--- a/graphics/pokemon/palettes/tangela_shiny_palette.pal
+++ b/graphics/pokemon/tangela/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tauros_front_pic.png b/graphics/pokemon/tauros/anim_front.png
index 6853a31b1..6853a31b1 100644
--- a/graphics/pokemon/anim_front_pics/tauros_front_pic.png
+++ b/graphics/pokemon/tauros/anim_front.png
diff --git a/graphics/pokemon/back_pics/tauros_back_pic.png b/graphics/pokemon/tauros/back.png
index 2fac61283..2fac61283 100644
--- a/graphics/pokemon/back_pics/tauros_back_pic.png
+++ b/graphics/pokemon/tauros/back.png
diff --git a/graphics/pokemon/footprints/tauros_footprint.png b/graphics/pokemon/tauros/footprint.png
index 602011c6d..602011c6d 100644
--- a/graphics/pokemon/footprints/tauros_footprint.png
+++ b/graphics/pokemon/tauros/footprint.png
diff --git a/graphics/pokemon/front_pics/tauros_still_front_pic.png b/graphics/pokemon/tauros/front.png
index c13d25022..c13d25022 100644
--- a/graphics/pokemon/front_pics/tauros_still_front_pic.png
+++ b/graphics/pokemon/tauros/front.png
diff --git a/graphics/pokemon/icons/tauros_icon.png b/graphics/pokemon/tauros/icon.png
index fc432dab9..fc432dab9 100644
--- a/graphics/pokemon/icons/tauros_icon.png
+++ b/graphics/pokemon/tauros/icon.png
diff --git a/graphics/pokemon/palettes/tauros_palette.pal b/graphics/pokemon/tauros/normal.pal
index 537af1b4a..537af1b4a 100644
--- a/graphics/pokemon/palettes/tauros_palette.pal
+++ b/graphics/pokemon/tauros/normal.pal
diff --git a/graphics/pokemon/palettes/tauros_shiny_palette.pal b/graphics/pokemon/tauros/shiny.pal
index 68da59668..68da59668 100644
--- a/graphics/pokemon/palettes/tauros_shiny_palette.pal
+++ b/graphics/pokemon/tauros/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/teddiursa_front_pic.png b/graphics/pokemon/teddiursa/anim_front.png
index ba5f60158..ba5f60158 100644
--- a/graphics/pokemon/anim_front_pics/teddiursa_front_pic.png
+++ b/graphics/pokemon/teddiursa/anim_front.png
diff --git a/graphics/pokemon/back_pics/teddiursa_back_pic.png b/graphics/pokemon/teddiursa/back.png
index d79f39a5b..d79f39a5b 100644
--- a/graphics/pokemon/back_pics/teddiursa_back_pic.png
+++ b/graphics/pokemon/teddiursa/back.png
diff --git a/graphics/pokemon/footprints/teddiursa_footprint.png b/graphics/pokemon/teddiursa/footprint.png
index def88c323..def88c323 100644
--- a/graphics/pokemon/footprints/teddiursa_footprint.png
+++ b/graphics/pokemon/teddiursa/footprint.png
diff --git a/graphics/pokemon/front_pics/teddiursa_still_front_pic.png b/graphics/pokemon/teddiursa/front.png
index 75f513043..75f513043 100644
--- a/graphics/pokemon/front_pics/teddiursa_still_front_pic.png
+++ b/graphics/pokemon/teddiursa/front.png
diff --git a/graphics/pokemon/icons/teddiursa_icon.png b/graphics/pokemon/teddiursa/icon.png
index 94994c86d..94994c86d 100644
--- a/graphics/pokemon/icons/teddiursa_icon.png
+++ b/graphics/pokemon/teddiursa/icon.png
diff --git a/graphics/pokemon/palettes/teddiursa_palette.pal b/graphics/pokemon/teddiursa/normal.pal
index 11192e2c0..11192e2c0 100644
--- a/graphics/pokemon/palettes/teddiursa_palette.pal
+++ b/graphics/pokemon/teddiursa/normal.pal
diff --git a/graphics/pokemon/palettes/teddiursa_shiny_palette.pal b/graphics/pokemon/teddiursa/shiny.pal
index 0be332569..0be332569 100644
--- a/graphics/pokemon/palettes/teddiursa_shiny_palette.pal
+++ b/graphics/pokemon/teddiursa/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tentacool_front_pic.png b/graphics/pokemon/tentacool/anim_front.png
index 6cbb2a47f..6cbb2a47f 100644
--- a/graphics/pokemon/anim_front_pics/tentacool_front_pic.png
+++ b/graphics/pokemon/tentacool/anim_front.png
diff --git a/graphics/pokemon/back_pics/tentacool_back_pic.png b/graphics/pokemon/tentacool/back.png
index d603ca052..d603ca052 100644
--- a/graphics/pokemon/back_pics/tentacool_back_pic.png
+++ b/graphics/pokemon/tentacool/back.png
diff --git a/graphics/pokemon/footprints/tentacool_footprint.png b/graphics/pokemon/tentacool/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/tentacool_footprint.png
+++ b/graphics/pokemon/tentacool/footprint.png
diff --git a/graphics/pokemon/front_pics/tentacool_still_front_pic.png b/graphics/pokemon/tentacool/front.png
index ccd68bf78..ccd68bf78 100644
--- a/graphics/pokemon/front_pics/tentacool_still_front_pic.png
+++ b/graphics/pokemon/tentacool/front.png
diff --git a/graphics/pokemon/icons/tentacool_icon.png b/graphics/pokemon/tentacool/icon.png
index d29ca1938..d29ca1938 100644
--- a/graphics/pokemon/icons/tentacool_icon.png
+++ b/graphics/pokemon/tentacool/icon.png
diff --git a/graphics/pokemon/palettes/tentacool_palette.pal b/graphics/pokemon/tentacool/normal.pal
index 686fea273..686fea273 100644
--- a/graphics/pokemon/palettes/tentacool_palette.pal
+++ b/graphics/pokemon/tentacool/normal.pal
diff --git a/graphics/pokemon/palettes/tentacool_shiny_palette.pal b/graphics/pokemon/tentacool/shiny.pal
index d90b7d4a0..d90b7d4a0 100644
--- a/graphics/pokemon/palettes/tentacool_shiny_palette.pal
+++ b/graphics/pokemon/tentacool/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tentacruel_front_pic.png b/graphics/pokemon/tentacruel/anim_front.png
index 999e8f7b4..999e8f7b4 100644
--- a/graphics/pokemon/anim_front_pics/tentacruel_front_pic.png
+++ b/graphics/pokemon/tentacruel/anim_front.png
diff --git a/graphics/pokemon/back_pics/tentacruel_back_pic.png b/graphics/pokemon/tentacruel/back.png
index 232bc9259..232bc9259 100644
--- a/graphics/pokemon/back_pics/tentacruel_back_pic.png
+++ b/graphics/pokemon/tentacruel/back.png
diff --git a/graphics/pokemon/footprints/tentacruel_footprint.png b/graphics/pokemon/tentacruel/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/tentacruel_footprint.png
+++ b/graphics/pokemon/tentacruel/footprint.png
diff --git a/graphics/pokemon/front_pics/tentacruel_still_front_pic.png b/graphics/pokemon/tentacruel/front.png
index a9e4691d8..a9e4691d8 100644
--- a/graphics/pokemon/front_pics/tentacruel_still_front_pic.png
+++ b/graphics/pokemon/tentacruel/front.png
diff --git a/graphics/pokemon/icons/tentacruel_icon.png b/graphics/pokemon/tentacruel/icon.png
index 72b6da9b9..72b6da9b9 100644
--- a/graphics/pokemon/icons/tentacruel_icon.png
+++ b/graphics/pokemon/tentacruel/icon.png
diff --git a/graphics/pokemon/palettes/tentacruel_palette.pal b/graphics/pokemon/tentacruel/normal.pal
index 8e397af8f..8e397af8f 100644
--- a/graphics/pokemon/palettes/tentacruel_palette.pal
+++ b/graphics/pokemon/tentacruel/normal.pal
diff --git a/graphics/pokemon/palettes/tentacruel_shiny_palette.pal b/graphics/pokemon/tentacruel/shiny.pal
index b53f96599..b53f96599 100644
--- a/graphics/pokemon/palettes/tentacruel_shiny_palette.pal
+++ b/graphics/pokemon/tentacruel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/togepi_front_pic.png b/graphics/pokemon/togepi/anim_front.png
index e0d71a63a..e0d71a63a 100644
--- a/graphics/pokemon/anim_front_pics/togepi_front_pic.png
+++ b/graphics/pokemon/togepi/anim_front.png
diff --git a/graphics/pokemon/back_pics/togepi_back_pic.png b/graphics/pokemon/togepi/back.png
index 24858fc22..24858fc22 100644
--- a/graphics/pokemon/back_pics/togepi_back_pic.png
+++ b/graphics/pokemon/togepi/back.png
diff --git a/graphics/pokemon/footprints/togepi_footprint.png b/graphics/pokemon/togepi/footprint.png
index 84e75101b..84e75101b 100644
--- a/graphics/pokemon/footprints/togepi_footprint.png
+++ b/graphics/pokemon/togepi/footprint.png
diff --git a/graphics/pokemon/front_pics/togepi_still_front_pic.png b/graphics/pokemon/togepi/front.png
index 2fd04df59..2fd04df59 100644
--- a/graphics/pokemon/front_pics/togepi_still_front_pic.png
+++ b/graphics/pokemon/togepi/front.png
diff --git a/graphics/pokemon/icons/togepi_icon.png b/graphics/pokemon/togepi/icon.png
index ded646fa1..ded646fa1 100644
--- a/graphics/pokemon/icons/togepi_icon.png
+++ b/graphics/pokemon/togepi/icon.png
diff --git a/graphics/pokemon/palettes/togepi_palette.pal b/graphics/pokemon/togepi/normal.pal
index 6e9355508..6e9355508 100644
--- a/graphics/pokemon/palettes/togepi_palette.pal
+++ b/graphics/pokemon/togepi/normal.pal
diff --git a/graphics/pokemon/palettes/togepi_shiny_palette.pal b/graphics/pokemon/togepi/shiny.pal
index 6ce2e1be7..6ce2e1be7 100644
--- a/graphics/pokemon/palettes/togepi_shiny_palette.pal
+++ b/graphics/pokemon/togepi/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/togetic_front_pic.png b/graphics/pokemon/togetic/anim_front.png
index e233ea940..e233ea940 100644
--- a/graphics/pokemon/anim_front_pics/togetic_front_pic.png
+++ b/graphics/pokemon/togetic/anim_front.png
diff --git a/graphics/pokemon/back_pics/togetic_back_pic.png b/graphics/pokemon/togetic/back.png
index f5125735a..f5125735a 100644
--- a/graphics/pokemon/back_pics/togetic_back_pic.png
+++ b/graphics/pokemon/togetic/back.png
diff --git a/graphics/pokemon/footprints/togetic_footprint.png b/graphics/pokemon/togetic/footprint.png
index b15913fa8..b15913fa8 100644
--- a/graphics/pokemon/footprints/togetic_footprint.png
+++ b/graphics/pokemon/togetic/footprint.png
diff --git a/graphics/pokemon/front_pics/togetic_still_front_pic.png b/graphics/pokemon/togetic/front.png
index 4f6fe9339..4f6fe9339 100644
--- a/graphics/pokemon/front_pics/togetic_still_front_pic.png
+++ b/graphics/pokemon/togetic/front.png
diff --git a/graphics/pokemon/icons/togetic_icon.png b/graphics/pokemon/togetic/icon.png
index 61e73ab3e..61e73ab3e 100644
--- a/graphics/pokemon/icons/togetic_icon.png
+++ b/graphics/pokemon/togetic/icon.png
diff --git a/graphics/pokemon/palettes/togetic_palette.pal b/graphics/pokemon/togetic/normal.pal
index c07ecff88..c07ecff88 100644
--- a/graphics/pokemon/palettes/togetic_palette.pal
+++ b/graphics/pokemon/togetic/normal.pal
diff --git a/graphics/pokemon/palettes/togetic_shiny_palette.pal b/graphics/pokemon/togetic/shiny.pal
index 6d37ce70d..6d37ce70d 100644
--- a/graphics/pokemon/palettes/togetic_shiny_palette.pal
+++ b/graphics/pokemon/togetic/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/torchic_front_pic.png b/graphics/pokemon/torchic/anim_front.png
index c1aa67fd1..c1aa67fd1 100644
--- a/graphics/pokemon/anim_front_pics/torchic_front_pic.png
+++ b/graphics/pokemon/torchic/anim_front.png
diff --git a/graphics/pokemon/back_pics/torchic_back_pic.png b/graphics/pokemon/torchic/back.png
index ed2c53879..ed2c53879 100644
--- a/graphics/pokemon/back_pics/torchic_back_pic.png
+++ b/graphics/pokemon/torchic/back.png
diff --git a/graphics/pokemon/footprints/torchic_footprint.png b/graphics/pokemon/torchic/footprint.png
index 955afa82a..955afa82a 100644
--- a/graphics/pokemon/footprints/torchic_footprint.png
+++ b/graphics/pokemon/torchic/footprint.png
diff --git a/graphics/pokemon/front_pics/torchic_still_front_pic.png b/graphics/pokemon/torchic/front.png
index a8eeb2699..a8eeb2699 100644
--- a/graphics/pokemon/front_pics/torchic_still_front_pic.png
+++ b/graphics/pokemon/torchic/front.png
diff --git a/graphics/pokemon/icons/torchic_icon.png b/graphics/pokemon/torchic/icon.png
index 6346e2272..6346e2272 100644
--- a/graphics/pokemon/icons/torchic_icon.png
+++ b/graphics/pokemon/torchic/icon.png
diff --git a/graphics/pokemon/palettes/torchic_palette.pal b/graphics/pokemon/torchic/normal.pal
index 373cb59b7..373cb59b7 100644
--- a/graphics/pokemon/palettes/torchic_palette.pal
+++ b/graphics/pokemon/torchic/normal.pal
diff --git a/graphics/pokemon/palettes/torchic_shiny_palette.pal b/graphics/pokemon/torchic/shiny.pal
index 368d18494..368d18494 100644
--- a/graphics/pokemon/palettes/torchic_shiny_palette.pal
+++ b/graphics/pokemon/torchic/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/torkoal_front_pic.png b/graphics/pokemon/torkoal/anim_front.png
index 17ce45d87..17ce45d87 100644
--- a/graphics/pokemon/anim_front_pics/torkoal_front_pic.png
+++ b/graphics/pokemon/torkoal/anim_front.png
diff --git a/graphics/pokemon/back_pics/torkoal_back_pic.png b/graphics/pokemon/torkoal/back.png
index 4eb5c4f0e..4eb5c4f0e 100644
--- a/graphics/pokemon/back_pics/torkoal_back_pic.png
+++ b/graphics/pokemon/torkoal/back.png
diff --git a/graphics/pokemon/footprints/torkoal_footprint.png b/graphics/pokemon/torkoal/footprint.png
index 208f3bb77..208f3bb77 100644
--- a/graphics/pokemon/footprints/torkoal_footprint.png
+++ b/graphics/pokemon/torkoal/footprint.png
diff --git a/graphics/pokemon/front_pics/torkoal_still_front_pic.png b/graphics/pokemon/torkoal/front.png
index b19eea08b..b19eea08b 100644
--- a/graphics/pokemon/front_pics/torkoal_still_front_pic.png
+++ b/graphics/pokemon/torkoal/front.png
diff --git a/graphics/pokemon/icons/torkoal_icon.png b/graphics/pokemon/torkoal/icon.png
index 077ce4026..077ce4026 100644
--- a/graphics/pokemon/icons/torkoal_icon.png
+++ b/graphics/pokemon/torkoal/icon.png
diff --git a/graphics/pokemon/palettes/torkoal_palette.pal b/graphics/pokemon/torkoal/normal.pal
index 85caef491..85caef491 100644
--- a/graphics/pokemon/palettes/torkoal_palette.pal
+++ b/graphics/pokemon/torkoal/normal.pal
diff --git a/graphics/pokemon/palettes/torkoal_shiny_palette.pal b/graphics/pokemon/torkoal/shiny.pal
index 70194b9f1..70194b9f1 100644
--- a/graphics/pokemon/palettes/torkoal_shiny_palette.pal
+++ b/graphics/pokemon/torkoal/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/totodile_front_pic.png b/graphics/pokemon/totodile/anim_front.png
index 387b24e47..387b24e47 100644
--- a/graphics/pokemon/anim_front_pics/totodile_front_pic.png
+++ b/graphics/pokemon/totodile/anim_front.png
diff --git a/graphics/pokemon/back_pics/totodile_back_pic.png b/graphics/pokemon/totodile/back.png
index 1ac54c7bd..1ac54c7bd 100644
--- a/graphics/pokemon/back_pics/totodile_back_pic.png
+++ b/graphics/pokemon/totodile/back.png
diff --git a/graphics/pokemon/footprints/totodile_footprint.png b/graphics/pokemon/totodile/footprint.png
index 210260273..210260273 100644
--- a/graphics/pokemon/footprints/totodile_footprint.png
+++ b/graphics/pokemon/totodile/footprint.png
diff --git a/graphics/pokemon/front_pics/totodile_still_front_pic.png b/graphics/pokemon/totodile/front.png
index d65863e81..d65863e81 100644
--- a/graphics/pokemon/front_pics/totodile_still_front_pic.png
+++ b/graphics/pokemon/totodile/front.png
diff --git a/graphics/pokemon/icons/totodile_icon.png b/graphics/pokemon/totodile/icon.png
index c2bc68521..c2bc68521 100644
--- a/graphics/pokemon/icons/totodile_icon.png
+++ b/graphics/pokemon/totodile/icon.png
diff --git a/graphics/pokemon/palettes/totodile_palette.pal b/graphics/pokemon/totodile/normal.pal
index 8a68271f6..8a68271f6 100644
--- a/graphics/pokemon/palettes/totodile_palette.pal
+++ b/graphics/pokemon/totodile/normal.pal
diff --git a/graphics/pokemon/palettes/totodile_shiny_palette.pal b/graphics/pokemon/totodile/shiny.pal
index 609f22253..609f22253 100644
--- a/graphics/pokemon/palettes/totodile_shiny_palette.pal
+++ b/graphics/pokemon/totodile/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/trapinch_front_pic.png b/graphics/pokemon/trapinch/anim_front.png
index 2ee209fdf..2ee209fdf 100644
--- a/graphics/pokemon/anim_front_pics/trapinch_front_pic.png
+++ b/graphics/pokemon/trapinch/anim_front.png
diff --git a/graphics/pokemon/back_pics/trapinch_back_pic.png b/graphics/pokemon/trapinch/back.png
index 61eec3c92..61eec3c92 100644
--- a/graphics/pokemon/back_pics/trapinch_back_pic.png
+++ b/graphics/pokemon/trapinch/back.png
diff --git a/graphics/pokemon/footprints/trapinch_footprint.png b/graphics/pokemon/trapinch/footprint.png
index c3e6e785b..c3e6e785b 100644
--- a/graphics/pokemon/footprints/trapinch_footprint.png
+++ b/graphics/pokemon/trapinch/footprint.png
diff --git a/graphics/pokemon/front_pics/trapinch_still_front_pic.png b/graphics/pokemon/trapinch/front.png
index 48dd7951a..48dd7951a 100644
--- a/graphics/pokemon/front_pics/trapinch_still_front_pic.png
+++ b/graphics/pokemon/trapinch/front.png
diff --git a/graphics/pokemon/icons/trapinch_icon.png b/graphics/pokemon/trapinch/icon.png
index 731dbf569..731dbf569 100644
--- a/graphics/pokemon/icons/trapinch_icon.png
+++ b/graphics/pokemon/trapinch/icon.png
diff --git a/graphics/pokemon/palettes/trapinch_palette.pal b/graphics/pokemon/trapinch/normal.pal
index 2344a7eca..2344a7eca 100644
--- a/graphics/pokemon/palettes/trapinch_palette.pal
+++ b/graphics/pokemon/trapinch/normal.pal
diff --git a/graphics/pokemon/palettes/trapinch_shiny_palette.pal b/graphics/pokemon/trapinch/shiny.pal
index 87ce33ef0..87ce33ef0 100644
--- a/graphics/pokemon/palettes/trapinch_shiny_palette.pal
+++ b/graphics/pokemon/trapinch/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/treecko_front_pic.png b/graphics/pokemon/treecko/anim_front.png
index ce98864ea..ce98864ea 100644
--- a/graphics/pokemon/anim_front_pics/treecko_front_pic.png
+++ b/graphics/pokemon/treecko/anim_front.png
diff --git a/graphics/pokemon/back_pics/treecko_back_pic.png b/graphics/pokemon/treecko/back.png
index 89e53390d..89e53390d 100644
--- a/graphics/pokemon/back_pics/treecko_back_pic.png
+++ b/graphics/pokemon/treecko/back.png
diff --git a/graphics/pokemon/footprints/treecko_footprint.png b/graphics/pokemon/treecko/footprint.png
index ed3854702..ed3854702 100644
--- a/graphics/pokemon/footprints/treecko_footprint.png
+++ b/graphics/pokemon/treecko/footprint.png
diff --git a/graphics/pokemon/front_pics/treecko_still_front_pic.png b/graphics/pokemon/treecko/front.png
index 7cacddaae..7cacddaae 100644
--- a/graphics/pokemon/front_pics/treecko_still_front_pic.png
+++ b/graphics/pokemon/treecko/front.png
diff --git a/graphics/pokemon/icons/treecko_icon.png b/graphics/pokemon/treecko/icon.png
index f51358adf..f51358adf 100644
--- a/graphics/pokemon/icons/treecko_icon.png
+++ b/graphics/pokemon/treecko/icon.png
diff --git a/graphics/pokemon/palettes/treecko_palette.pal b/graphics/pokemon/treecko/normal.pal
index 987a3a5b9..987a3a5b9 100644
--- a/graphics/pokemon/palettes/treecko_palette.pal
+++ b/graphics/pokemon/treecko/normal.pal
diff --git a/graphics/pokemon/palettes/treecko_shiny_palette.pal b/graphics/pokemon/treecko/shiny.pal
index da5dda0e4..da5dda0e4 100644
--- a/graphics/pokemon/palettes/treecko_shiny_palette.pal
+++ b/graphics/pokemon/treecko/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tropius_front_pic.png b/graphics/pokemon/tropius/anim_front.png
index 62df662a2..62df662a2 100644
--- a/graphics/pokemon/anim_front_pics/tropius_front_pic.png
+++ b/graphics/pokemon/tropius/anim_front.png
diff --git a/graphics/pokemon/back_pics/tropius_back_pic.png b/graphics/pokemon/tropius/back.png
index d948c3dc0..d948c3dc0 100644
--- a/graphics/pokemon/back_pics/tropius_back_pic.png
+++ b/graphics/pokemon/tropius/back.png
diff --git a/graphics/pokemon/footprints/tropius_footprint.png b/graphics/pokemon/tropius/footprint.png
index e6e7e8795..e6e7e8795 100644
--- a/graphics/pokemon/footprints/tropius_footprint.png
+++ b/graphics/pokemon/tropius/footprint.png
diff --git a/graphics/pokemon/front_pics/tropius_still_front_pic.png b/graphics/pokemon/tropius/front.png
index e2ae021cb..e2ae021cb 100644
--- a/graphics/pokemon/front_pics/tropius_still_front_pic.png
+++ b/graphics/pokemon/tropius/front.png
diff --git a/graphics/pokemon/icons/tropius_icon.png b/graphics/pokemon/tropius/icon.png
index dabfcd295..dabfcd295 100644
--- a/graphics/pokemon/icons/tropius_icon.png
+++ b/graphics/pokemon/tropius/icon.png
diff --git a/graphics/pokemon/palettes/tropius_palette.pal b/graphics/pokemon/tropius/normal.pal
index efe3d75ab..efe3d75ab 100644
--- a/graphics/pokemon/palettes/tropius_palette.pal
+++ b/graphics/pokemon/tropius/normal.pal
diff --git a/graphics/pokemon/palettes/tropius_shiny_palette.pal b/graphics/pokemon/tropius/shiny.pal
index cb02cf449..cb02cf449 100644
--- a/graphics/pokemon/palettes/tropius_shiny_palette.pal
+++ b/graphics/pokemon/tropius/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/typhlosion_front_pic.png b/graphics/pokemon/typhlosion/anim_front.png
index e56996868..e56996868 100644
--- a/graphics/pokemon/anim_front_pics/typhlosion_front_pic.png
+++ b/graphics/pokemon/typhlosion/anim_front.png
diff --git a/graphics/pokemon/back_pics/typhlosion_back_pic.png b/graphics/pokemon/typhlosion/back.png
index deb3ffb0d..deb3ffb0d 100644
--- a/graphics/pokemon/back_pics/typhlosion_back_pic.png
+++ b/graphics/pokemon/typhlosion/back.png
diff --git a/graphics/pokemon/footprints/typhlosion_footprint.png b/graphics/pokemon/typhlosion/footprint.png
index 1d4492cf1..1d4492cf1 100644
--- a/graphics/pokemon/footprints/typhlosion_footprint.png
+++ b/graphics/pokemon/typhlosion/footprint.png
diff --git a/graphics/pokemon/front_pics/typhlosion_still_front_pic.png b/graphics/pokemon/typhlosion/front.png
index 22ab5cd90..22ab5cd90 100644
--- a/graphics/pokemon/front_pics/typhlosion_still_front_pic.png
+++ b/graphics/pokemon/typhlosion/front.png
diff --git a/graphics/pokemon/icons/typhlosion_icon.png b/graphics/pokemon/typhlosion/icon.png
index e15d7b683..e15d7b683 100644
--- a/graphics/pokemon/icons/typhlosion_icon.png
+++ b/graphics/pokemon/typhlosion/icon.png
diff --git a/graphics/pokemon/palettes/typhlosion_palette.pal b/graphics/pokemon/typhlosion/normal.pal
index 72f0c9c8c..72f0c9c8c 100644
--- a/graphics/pokemon/palettes/typhlosion_palette.pal
+++ b/graphics/pokemon/typhlosion/normal.pal
diff --git a/graphics/pokemon/palettes/typhlosion_shiny_palette.pal b/graphics/pokemon/typhlosion/shiny.pal
index 42fb4ee9c..42fb4ee9c 100644
--- a/graphics/pokemon/palettes/typhlosion_shiny_palette.pal
+++ b/graphics/pokemon/typhlosion/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tyranitar_front_pic.png b/graphics/pokemon/tyranitar/anim_front.png
index 33cf099b8..33cf099b8 100644
--- a/graphics/pokemon/anim_front_pics/tyranitar_front_pic.png
+++ b/graphics/pokemon/tyranitar/anim_front.png
diff --git a/graphics/pokemon/back_pics/tyranitar_back_pic.png b/graphics/pokemon/tyranitar/back.png
index 273318be0..273318be0 100644
--- a/graphics/pokemon/back_pics/tyranitar_back_pic.png
+++ b/graphics/pokemon/tyranitar/back.png
diff --git a/graphics/pokemon/footprints/tyranitar_footprint.png b/graphics/pokemon/tyranitar/footprint.png
index ea12c75b0..ea12c75b0 100644
--- a/graphics/pokemon/footprints/tyranitar_footprint.png
+++ b/graphics/pokemon/tyranitar/footprint.png
diff --git a/graphics/pokemon/front_pics/tyranitar_still_front_pic.png b/graphics/pokemon/tyranitar/front.png
index a1035064b..a1035064b 100644
--- a/graphics/pokemon/front_pics/tyranitar_still_front_pic.png
+++ b/graphics/pokemon/tyranitar/front.png
diff --git a/graphics/pokemon/icons/tyranitar_icon.png b/graphics/pokemon/tyranitar/icon.png
index 76113bc68..76113bc68 100644
--- a/graphics/pokemon/icons/tyranitar_icon.png
+++ b/graphics/pokemon/tyranitar/icon.png
diff --git a/graphics/pokemon/palettes/tyranitar_palette.pal b/graphics/pokemon/tyranitar/normal.pal
index 6c5e2941c..6c5e2941c 100644
--- a/graphics/pokemon/palettes/tyranitar_palette.pal
+++ b/graphics/pokemon/tyranitar/normal.pal
diff --git a/graphics/pokemon/palettes/tyranitar_shiny_palette.pal b/graphics/pokemon/tyranitar/shiny.pal
index 3090536a9..3090536a9 100644
--- a/graphics/pokemon/palettes/tyranitar_shiny_palette.pal
+++ b/graphics/pokemon/tyranitar/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/tyrogue_front_pic.png b/graphics/pokemon/tyrogue/anim_front.png
index 038a2795c..038a2795c 100644
--- a/graphics/pokemon/anim_front_pics/tyrogue_front_pic.png
+++ b/graphics/pokemon/tyrogue/anim_front.png
diff --git a/graphics/pokemon/back_pics/tyrogue_back_pic.png b/graphics/pokemon/tyrogue/back.png
index 1d6b2e198..1d6b2e198 100644
--- a/graphics/pokemon/back_pics/tyrogue_back_pic.png
+++ b/graphics/pokemon/tyrogue/back.png
diff --git a/graphics/pokemon/footprints/tyrogue_footprint.png b/graphics/pokemon/tyrogue/footprint.png
index 0ef849eb8..0ef849eb8 100644
--- a/graphics/pokemon/footprints/tyrogue_footprint.png
+++ b/graphics/pokemon/tyrogue/footprint.png
diff --git a/graphics/pokemon/front_pics/tyrogue_still_front_pic.png b/graphics/pokemon/tyrogue/front.png
index cd12978ae..cd12978ae 100644
--- a/graphics/pokemon/front_pics/tyrogue_still_front_pic.png
+++ b/graphics/pokemon/tyrogue/front.png
diff --git a/graphics/pokemon/icons/tyrogue_icon.png b/graphics/pokemon/tyrogue/icon.png
index 10099d5cf..10099d5cf 100644
--- a/graphics/pokemon/icons/tyrogue_icon.png
+++ b/graphics/pokemon/tyrogue/icon.png
diff --git a/graphics/pokemon/palettes/tyrogue_palette.pal b/graphics/pokemon/tyrogue/normal.pal
index 97bff0783..97bff0783 100644
--- a/graphics/pokemon/palettes/tyrogue_palette.pal
+++ b/graphics/pokemon/tyrogue/normal.pal
diff --git a/graphics/pokemon/palettes/tyrogue_shiny_palette.pal b/graphics/pokemon/tyrogue/shiny.pal
index e8fef8a16..e8fef8a16 100644
--- a/graphics/pokemon/palettes/tyrogue_shiny_palette.pal
+++ b/graphics/pokemon/tyrogue/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/umbreon_front_pic.png b/graphics/pokemon/umbreon/anim_front.png
index dc7372850..dc7372850 100644
--- a/graphics/pokemon/anim_front_pics/umbreon_front_pic.png
+++ b/graphics/pokemon/umbreon/anim_front.png
diff --git a/graphics/pokemon/back_pics/umbreon_back_pic.png b/graphics/pokemon/umbreon/back.png
index d73508aed..d73508aed 100644
--- a/graphics/pokemon/back_pics/umbreon_back_pic.png
+++ b/graphics/pokemon/umbreon/back.png
diff --git a/graphics/pokemon/footprints/umbreon_footprint.png b/graphics/pokemon/umbreon/footprint.png
index a1d897dc3..a1d897dc3 100644
--- a/graphics/pokemon/footprints/umbreon_footprint.png
+++ b/graphics/pokemon/umbreon/footprint.png
diff --git a/graphics/pokemon/front_pics/umbreon_still_front_pic.png b/graphics/pokemon/umbreon/front.png
index 8fbc3b0f2..8fbc3b0f2 100644
--- a/graphics/pokemon/front_pics/umbreon_still_front_pic.png
+++ b/graphics/pokemon/umbreon/front.png
diff --git a/graphics/pokemon/icons/umbreon_icon.png b/graphics/pokemon/umbreon/icon.png
index 8d8d867c2..8d8d867c2 100644
--- a/graphics/pokemon/icons/umbreon_icon.png
+++ b/graphics/pokemon/umbreon/icon.png
diff --git a/graphics/pokemon/palettes/umbreon_palette.pal b/graphics/pokemon/umbreon/normal.pal
index dc6ec68e6..dc6ec68e6 100644
--- a/graphics/pokemon/palettes/umbreon_palette.pal
+++ b/graphics/pokemon/umbreon/normal.pal
diff --git a/graphics/pokemon/palettes/umbreon_shiny_palette.pal b/graphics/pokemon/umbreon/shiny.pal
index 82c71e1ae..82c71e1ae 100644
--- a/graphics/pokemon/palettes/umbreon_shiny_palette.pal
+++ b/graphics/pokemon/umbreon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/unown_a_front_pic.png b/graphics/pokemon/unown/anim_front_a.png
index 065d82a47..065d82a47 100644
--- a/graphics/pokemon/anim_front_pics/unown_a_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_a.png
diff --git a/graphics/pokemon/anim_front_pics/unown_b_front_pic.png b/graphics/pokemon/unown/anim_front_b.png
index bedc98634..bedc98634 100644
--- a/graphics/pokemon/anim_front_pics/unown_b_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_b.png
diff --git a/graphics/pokemon/anim_front_pics/unown_c_front_pic.png b/graphics/pokemon/unown/anim_front_c.png
index 6699bbbb5..6699bbbb5 100644
--- a/graphics/pokemon/anim_front_pics/unown_c_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_c.png
diff --git a/graphics/pokemon/anim_front_pics/unown_d_front_pic.png b/graphics/pokemon/unown/anim_front_d.png
index 7491a13fb..7491a13fb 100644
--- a/graphics/pokemon/anim_front_pics/unown_d_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_d.png
diff --git a/graphics/pokemon/anim_front_pics/unown_e_front_pic.png b/graphics/pokemon/unown/anim_front_e.png
index a761cdd95..a761cdd95 100644
--- a/graphics/pokemon/anim_front_pics/unown_e_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_e.png
diff --git a/graphics/pokemon/anim_front_pics/unown_exclamation_mark_front_pic.png b/graphics/pokemon/unown/anim_front_exclamation_mark.png
index 96c436e8c..96c436e8c 100644
--- a/graphics/pokemon/anim_front_pics/unown_exclamation_mark_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_exclamation_mark.png
diff --git a/graphics/pokemon/anim_front_pics/unown_f_front_pic.png b/graphics/pokemon/unown/anim_front_f.png
index 1c9685659..1c9685659 100644
--- a/graphics/pokemon/anim_front_pics/unown_f_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_f.png
diff --git a/graphics/pokemon/anim_front_pics/unown_g_front_pic.png b/graphics/pokemon/unown/anim_front_g.png
index 028bd4cad..028bd4cad 100644
--- a/graphics/pokemon/anim_front_pics/unown_g_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_g.png
diff --git a/graphics/pokemon/anim_front_pics/unown_h_front_pic.png b/graphics/pokemon/unown/anim_front_h.png
index 686e70d4b..686e70d4b 100644
--- a/graphics/pokemon/anim_front_pics/unown_h_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_h.png
diff --git a/graphics/pokemon/anim_front_pics/unown_i_front_pic.png b/graphics/pokemon/unown/anim_front_i.png
index 04a748fa0..04a748fa0 100644
--- a/graphics/pokemon/anim_front_pics/unown_i_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_i.png
diff --git a/graphics/pokemon/anim_front_pics/unown_j_front_pic.png b/graphics/pokemon/unown/anim_front_j.png
index e2906d253..e2906d253 100644
--- a/graphics/pokemon/anim_front_pics/unown_j_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_j.png
diff --git a/graphics/pokemon/anim_front_pics/unown_k_front_pic.png b/graphics/pokemon/unown/anim_front_k.png
index b83ef195f..b83ef195f 100644
--- a/graphics/pokemon/anim_front_pics/unown_k_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_k.png
diff --git a/graphics/pokemon/anim_front_pics/unown_l_front_pic.png b/graphics/pokemon/unown/anim_front_l.png
index 9d8b23af4..9d8b23af4 100644
--- a/graphics/pokemon/anim_front_pics/unown_l_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_l.png
diff --git a/graphics/pokemon/anim_front_pics/unown_m_front_pic.png b/graphics/pokemon/unown/anim_front_m.png
index ee9c7c7a8..ee9c7c7a8 100644
--- a/graphics/pokemon/anim_front_pics/unown_m_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_m.png
diff --git a/graphics/pokemon/anim_front_pics/unown_n_front_pic.png b/graphics/pokemon/unown/anim_front_n.png
index 47cac4516..47cac4516 100644
--- a/graphics/pokemon/anim_front_pics/unown_n_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_n.png
diff --git a/graphics/pokemon/anim_front_pics/unown_o_front_pic.png b/graphics/pokemon/unown/anim_front_o.png
index b32cdb325..b32cdb325 100644
--- a/graphics/pokemon/anim_front_pics/unown_o_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_o.png
diff --git a/graphics/pokemon/anim_front_pics/unown_p_front_pic.png b/graphics/pokemon/unown/anim_front_p.png
index 01aa0329c..01aa0329c 100644
--- a/graphics/pokemon/anim_front_pics/unown_p_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_p.png
diff --git a/graphics/pokemon/anim_front_pics/unown_q_front_pic.png b/graphics/pokemon/unown/anim_front_q.png
index 18c930e69..18c930e69 100644
--- a/graphics/pokemon/anim_front_pics/unown_q_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_q.png
diff --git a/graphics/pokemon/anim_front_pics/unown_question_mark_front_pic.png b/graphics/pokemon/unown/anim_front_question_mark.png
index 8a2f8bb6c..8a2f8bb6c 100644
--- a/graphics/pokemon/anim_front_pics/unown_question_mark_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_question_mark.png
diff --git a/graphics/pokemon/anim_front_pics/unown_r_front_pic.png b/graphics/pokemon/unown/anim_front_r.png
index 0b861d277..0b861d277 100644
--- a/graphics/pokemon/anim_front_pics/unown_r_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_r.png
diff --git a/graphics/pokemon/anim_front_pics/unown_s_front_pic.png b/graphics/pokemon/unown/anim_front_s.png
index 17016ac1c..17016ac1c 100644
--- a/graphics/pokemon/anim_front_pics/unown_s_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_s.png
diff --git a/graphics/pokemon/anim_front_pics/unown_t_front_pic.png b/graphics/pokemon/unown/anim_front_t.png
index 556ab78ce..556ab78ce 100644
--- a/graphics/pokemon/anim_front_pics/unown_t_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_t.png
diff --git a/graphics/pokemon/anim_front_pics/unown_u_front_pic.png b/graphics/pokemon/unown/anim_front_u.png
index cea47fd5b..cea47fd5b 100644
--- a/graphics/pokemon/anim_front_pics/unown_u_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_u.png
diff --git a/graphics/pokemon/anim_front_pics/unown_v_front_pic.png b/graphics/pokemon/unown/anim_front_v.png
index d073949e5..d073949e5 100644
--- a/graphics/pokemon/anim_front_pics/unown_v_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_v.png
diff --git a/graphics/pokemon/anim_front_pics/unown_w_front_pic.png b/graphics/pokemon/unown/anim_front_w.png
index d34a16f05..d34a16f05 100644
--- a/graphics/pokemon/anim_front_pics/unown_w_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_w.png
diff --git a/graphics/pokemon/anim_front_pics/unown_x_front_pic.png b/graphics/pokemon/unown/anim_front_x.png
index a75ab916c..a75ab916c 100644
--- a/graphics/pokemon/anim_front_pics/unown_x_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_x.png
diff --git a/graphics/pokemon/anim_front_pics/unown_y_front_pic.png b/graphics/pokemon/unown/anim_front_y.png
index 8b5221943..8b5221943 100644
--- a/graphics/pokemon/anim_front_pics/unown_y_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_y.png
diff --git a/graphics/pokemon/anim_front_pics/unown_z_front_pic.png b/graphics/pokemon/unown/anim_front_z.png
index 3080f7347..3080f7347 100644
--- a/graphics/pokemon/anim_front_pics/unown_z_front_pic.png
+++ b/graphics/pokemon/unown/anim_front_z.png
diff --git a/graphics/pokemon/back_pics/unown_a_back_pic.png b/graphics/pokemon/unown/back_a.png
index b90973023..b90973023 100644
--- a/graphics/pokemon/back_pics/unown_a_back_pic.png
+++ b/graphics/pokemon/unown/back_a.png
diff --git a/graphics/pokemon/back_pics/unown_b_back_pic.png b/graphics/pokemon/unown/back_b.png
index b398754ca..b398754ca 100644
--- a/graphics/pokemon/back_pics/unown_b_back_pic.png
+++ b/graphics/pokemon/unown/back_b.png
diff --git a/graphics/pokemon/back_pics/unown_c_back_pic.png b/graphics/pokemon/unown/back_c.png
index b9bccf4c5..b9bccf4c5 100644
--- a/graphics/pokemon/back_pics/unown_c_back_pic.png
+++ b/graphics/pokemon/unown/back_c.png
diff --git a/graphics/pokemon/back_pics/unown_d_back_pic.png b/graphics/pokemon/unown/back_d.png
index 1b3f19b09..1b3f19b09 100644
--- a/graphics/pokemon/back_pics/unown_d_back_pic.png
+++ b/graphics/pokemon/unown/back_d.png
diff --git a/graphics/pokemon/back_pics/unown_e_back_pic.png b/graphics/pokemon/unown/back_e.png
index 1baaf759f..1baaf759f 100644
--- a/graphics/pokemon/back_pics/unown_e_back_pic.png
+++ b/graphics/pokemon/unown/back_e.png
diff --git a/graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.png b/graphics/pokemon/unown/back_exclamation_mark.png
index cb05b906d..cb05b906d 100644
--- a/graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.png
+++ b/graphics/pokemon/unown/back_exclamation_mark.png
diff --git a/graphics/pokemon/back_pics/unown_f_back_pic.png b/graphics/pokemon/unown/back_f.png
index 30be252f9..30be252f9 100644
--- a/graphics/pokemon/back_pics/unown_f_back_pic.png
+++ b/graphics/pokemon/unown/back_f.png
diff --git a/graphics/pokemon/back_pics/unown_g_back_pic.png b/graphics/pokemon/unown/back_g.png
index ec5e708bf..ec5e708bf 100644
--- a/graphics/pokemon/back_pics/unown_g_back_pic.png
+++ b/graphics/pokemon/unown/back_g.png
diff --git a/graphics/pokemon/back_pics/unown_h_back_pic.png b/graphics/pokemon/unown/back_h.png
index 992e34e21..992e34e21 100644
--- a/graphics/pokemon/back_pics/unown_h_back_pic.png
+++ b/graphics/pokemon/unown/back_h.png
diff --git a/graphics/pokemon/back_pics/unown_i_back_pic.png b/graphics/pokemon/unown/back_i.png
index 5640fd5e0..5640fd5e0 100644
--- a/graphics/pokemon/back_pics/unown_i_back_pic.png
+++ b/graphics/pokemon/unown/back_i.png
diff --git a/graphics/pokemon/back_pics/unown_j_back_pic.png b/graphics/pokemon/unown/back_j.png
index 619ebb75b..619ebb75b 100644
--- a/graphics/pokemon/back_pics/unown_j_back_pic.png
+++ b/graphics/pokemon/unown/back_j.png
diff --git a/graphics/pokemon/back_pics/unown_k_back_pic.png b/graphics/pokemon/unown/back_k.png
index 46ac175bc..46ac175bc 100644
--- a/graphics/pokemon/back_pics/unown_k_back_pic.png
+++ b/graphics/pokemon/unown/back_k.png
diff --git a/graphics/pokemon/back_pics/unown_l_back_pic.png b/graphics/pokemon/unown/back_l.png
index da0c6c5f5..da0c6c5f5 100644
--- a/graphics/pokemon/back_pics/unown_l_back_pic.png
+++ b/graphics/pokemon/unown/back_l.png
diff --git a/graphics/pokemon/back_pics/unown_m_back_pic.png b/graphics/pokemon/unown/back_m.png
index 37dd0a97f..37dd0a97f 100644
--- a/graphics/pokemon/back_pics/unown_m_back_pic.png
+++ b/graphics/pokemon/unown/back_m.png
diff --git a/graphics/pokemon/back_pics/unown_n_back_pic.png b/graphics/pokemon/unown/back_n.png
index 17163be73..17163be73 100644
--- a/graphics/pokemon/back_pics/unown_n_back_pic.png
+++ b/graphics/pokemon/unown/back_n.png
diff --git a/graphics/pokemon/back_pics/unown_o_back_pic.png b/graphics/pokemon/unown/back_o.png
index 7260da757..7260da757 100644
--- a/graphics/pokemon/back_pics/unown_o_back_pic.png
+++ b/graphics/pokemon/unown/back_o.png
diff --git a/graphics/pokemon/back_pics/unown_p_back_pic.png b/graphics/pokemon/unown/back_p.png
index e275a3a96..e275a3a96 100644
--- a/graphics/pokemon/back_pics/unown_p_back_pic.png
+++ b/graphics/pokemon/unown/back_p.png
diff --git a/graphics/pokemon/back_pics/unown_q_back_pic.png b/graphics/pokemon/unown/back_q.png
index 08d5a0d0a..08d5a0d0a 100644
--- a/graphics/pokemon/back_pics/unown_q_back_pic.png
+++ b/graphics/pokemon/unown/back_q.png
diff --git a/graphics/pokemon/back_pics/unown_question_mark_back_pic.png b/graphics/pokemon/unown/back_question_mark.png
index 3d9ae3ee3..3d9ae3ee3 100644
--- a/graphics/pokemon/back_pics/unown_question_mark_back_pic.png
+++ b/graphics/pokemon/unown/back_question_mark.png
diff --git a/graphics/pokemon/back_pics/unown_r_back_pic.png b/graphics/pokemon/unown/back_r.png
index 9ea2bd6f7..9ea2bd6f7 100644
--- a/graphics/pokemon/back_pics/unown_r_back_pic.png
+++ b/graphics/pokemon/unown/back_r.png
diff --git a/graphics/pokemon/back_pics/unown_s_back_pic.png b/graphics/pokemon/unown/back_s.png
index c85571503..c85571503 100644
--- a/graphics/pokemon/back_pics/unown_s_back_pic.png
+++ b/graphics/pokemon/unown/back_s.png
diff --git a/graphics/pokemon/back_pics/unown_t_back_pic.png b/graphics/pokemon/unown/back_t.png
index f840953b8..f840953b8 100644
--- a/graphics/pokemon/back_pics/unown_t_back_pic.png
+++ b/graphics/pokemon/unown/back_t.png
diff --git a/graphics/pokemon/back_pics/unown_u_back_pic.png b/graphics/pokemon/unown/back_u.png
index 8d99bd088..8d99bd088 100644
--- a/graphics/pokemon/back_pics/unown_u_back_pic.png
+++ b/graphics/pokemon/unown/back_u.png
diff --git a/graphics/pokemon/back_pics/unown_v_back_pic.png b/graphics/pokemon/unown/back_v.png
index 41e215720..41e215720 100644
--- a/graphics/pokemon/back_pics/unown_v_back_pic.png
+++ b/graphics/pokemon/unown/back_v.png
diff --git a/graphics/pokemon/back_pics/unown_w_back_pic.png b/graphics/pokemon/unown/back_w.png
index 3d42e4eb2..3d42e4eb2 100644
--- a/graphics/pokemon/back_pics/unown_w_back_pic.png
+++ b/graphics/pokemon/unown/back_w.png
diff --git a/graphics/pokemon/back_pics/unown_x_back_pic.png b/graphics/pokemon/unown/back_x.png
index a21d5a9c3..a21d5a9c3 100644
--- a/graphics/pokemon/back_pics/unown_x_back_pic.png
+++ b/graphics/pokemon/unown/back_x.png
diff --git a/graphics/pokemon/back_pics/unown_y_back_pic.png b/graphics/pokemon/unown/back_y.png
index 3ccca08e8..3ccca08e8 100644
--- a/graphics/pokemon/back_pics/unown_y_back_pic.png
+++ b/graphics/pokemon/unown/back_y.png
diff --git a/graphics/pokemon/back_pics/unown_z_back_pic.png b/graphics/pokemon/unown/back_z.png
index e1f528a2b..e1f528a2b 100644
--- a/graphics/pokemon/back_pics/unown_z_back_pic.png
+++ b/graphics/pokemon/unown/back_z.png
diff --git a/graphics/pokemon/footprints/unown_footprint.png b/graphics/pokemon/unown/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/unown_footprint.png
+++ b/graphics/pokemon/unown/footprint.png
diff --git a/graphics/pokemon/front_pics/unown_a_still_front_pic.png b/graphics/pokemon/unown/front_a.png
index 697de36dc..697de36dc 100644
--- a/graphics/pokemon/front_pics/unown_a_still_front_pic.png
+++ b/graphics/pokemon/unown/front_a.png
diff --git a/graphics/pokemon/front_pics/unown_b_still_front_pic.png b/graphics/pokemon/unown/front_b.png
index fbe2e4623..fbe2e4623 100644
--- a/graphics/pokemon/front_pics/unown_b_still_front_pic.png
+++ b/graphics/pokemon/unown/front_b.png
diff --git a/graphics/pokemon/front_pics/unown_c_still_front_pic.png b/graphics/pokemon/unown/front_c.png
index c5ef1c457..c5ef1c457 100644
--- a/graphics/pokemon/front_pics/unown_c_still_front_pic.png
+++ b/graphics/pokemon/unown/front_c.png
diff --git a/graphics/pokemon/front_pics/unown_d_still_front_pic.png b/graphics/pokemon/unown/front_d.png
index c39b26120..c39b26120 100644
--- a/graphics/pokemon/front_pics/unown_d_still_front_pic.png
+++ b/graphics/pokemon/unown/front_d.png
diff --git a/graphics/pokemon/front_pics/unown_e_still_front_pic.png b/graphics/pokemon/unown/front_e.png
index 81e3f9c93..81e3f9c93 100644
--- a/graphics/pokemon/front_pics/unown_e_still_front_pic.png
+++ b/graphics/pokemon/unown/front_e.png
diff --git a/graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.png b/graphics/pokemon/unown/front_exclamation_mark.png
index 86f329f92..86f329f92 100644
--- a/graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.png
+++ b/graphics/pokemon/unown/front_exclamation_mark.png
diff --git a/graphics/pokemon/front_pics/unown_f_still_front_pic.png b/graphics/pokemon/unown/front_f.png
index 8e61eb768..8e61eb768 100644
--- a/graphics/pokemon/front_pics/unown_f_still_front_pic.png
+++ b/graphics/pokemon/unown/front_f.png
diff --git a/graphics/pokemon/front_pics/unown_g_still_front_pic.png b/graphics/pokemon/unown/front_g.png
index 4f665124a..4f665124a 100644
--- a/graphics/pokemon/front_pics/unown_g_still_front_pic.png
+++ b/graphics/pokemon/unown/front_g.png
diff --git a/graphics/pokemon/front_pics/unown_h_still_front_pic.png b/graphics/pokemon/unown/front_h.png
index f8ab66963..f8ab66963 100644
--- a/graphics/pokemon/front_pics/unown_h_still_front_pic.png
+++ b/graphics/pokemon/unown/front_h.png
diff --git a/graphics/pokemon/front_pics/unown_i_still_front_pic.png b/graphics/pokemon/unown/front_i.png
index ebc8a51a9..ebc8a51a9 100644
--- a/graphics/pokemon/front_pics/unown_i_still_front_pic.png
+++ b/graphics/pokemon/unown/front_i.png
diff --git a/graphics/pokemon/front_pics/unown_j_still_front_pic.png b/graphics/pokemon/unown/front_j.png
index 4c1f4ed2e..4c1f4ed2e 100644
--- a/graphics/pokemon/front_pics/unown_j_still_front_pic.png
+++ b/graphics/pokemon/unown/front_j.png
diff --git a/graphics/pokemon/front_pics/unown_k_still_front_pic.png b/graphics/pokemon/unown/front_k.png
index 8ccce125e..8ccce125e 100644
--- a/graphics/pokemon/front_pics/unown_k_still_front_pic.png
+++ b/graphics/pokemon/unown/front_k.png
diff --git a/graphics/pokemon/front_pics/unown_l_still_front_pic.png b/graphics/pokemon/unown/front_l.png
index 6bb837167..6bb837167 100644
--- a/graphics/pokemon/front_pics/unown_l_still_front_pic.png
+++ b/graphics/pokemon/unown/front_l.png
diff --git a/graphics/pokemon/front_pics/unown_m_still_front_pic.png b/graphics/pokemon/unown/front_m.png
index 981c7f801..981c7f801 100644
--- a/graphics/pokemon/front_pics/unown_m_still_front_pic.png
+++ b/graphics/pokemon/unown/front_m.png
diff --git a/graphics/pokemon/front_pics/unown_n_still_front_pic.png b/graphics/pokemon/unown/front_n.png
index cff797db4..cff797db4 100644
--- a/graphics/pokemon/front_pics/unown_n_still_front_pic.png
+++ b/graphics/pokemon/unown/front_n.png
diff --git a/graphics/pokemon/front_pics/unown_o_still_front_pic.png b/graphics/pokemon/unown/front_o.png
index 8b8e81295..8b8e81295 100644
--- a/graphics/pokemon/front_pics/unown_o_still_front_pic.png
+++ b/graphics/pokemon/unown/front_o.png
diff --git a/graphics/pokemon/front_pics/unown_p_still_front_pic.png b/graphics/pokemon/unown/front_p.png
index 99a7c98e2..99a7c98e2 100644
--- a/graphics/pokemon/front_pics/unown_p_still_front_pic.png
+++ b/graphics/pokemon/unown/front_p.png
diff --git a/graphics/pokemon/front_pics/unown_q_still_front_pic.png b/graphics/pokemon/unown/front_q.png
index fe94c27fa..fe94c27fa 100644
--- a/graphics/pokemon/front_pics/unown_q_still_front_pic.png
+++ b/graphics/pokemon/unown/front_q.png
diff --git a/graphics/pokemon/front_pics/unown_question_mark_still_front_pic.png b/graphics/pokemon/unown/front_question_mark.png
index ee0ad284c..ee0ad284c 100644
--- a/graphics/pokemon/front_pics/unown_question_mark_still_front_pic.png
+++ b/graphics/pokemon/unown/front_question_mark.png
diff --git a/graphics/pokemon/front_pics/unown_r_still_front_pic.png b/graphics/pokemon/unown/front_r.png
index 4e2a40007..4e2a40007 100644
--- a/graphics/pokemon/front_pics/unown_r_still_front_pic.png
+++ b/graphics/pokemon/unown/front_r.png
diff --git a/graphics/pokemon/front_pics/unown_s_still_front_pic.png b/graphics/pokemon/unown/front_s.png
index a144e27f5..a144e27f5 100644
--- a/graphics/pokemon/front_pics/unown_s_still_front_pic.png
+++ b/graphics/pokemon/unown/front_s.png
diff --git a/graphics/pokemon/front_pics/unown_t_still_front_pic.png b/graphics/pokemon/unown/front_t.png
index 4d5fa8b98..4d5fa8b98 100644
--- a/graphics/pokemon/front_pics/unown_t_still_front_pic.png
+++ b/graphics/pokemon/unown/front_t.png
diff --git a/graphics/pokemon/front_pics/unown_u_still_front_pic.png b/graphics/pokemon/unown/front_u.png
index 39503f01c..39503f01c 100644
--- a/graphics/pokemon/front_pics/unown_u_still_front_pic.png
+++ b/graphics/pokemon/unown/front_u.png
diff --git a/graphics/pokemon/front_pics/unown_v_still_front_pic.png b/graphics/pokemon/unown/front_v.png
index f014289bd..f014289bd 100644
--- a/graphics/pokemon/front_pics/unown_v_still_front_pic.png
+++ b/graphics/pokemon/unown/front_v.png
diff --git a/graphics/pokemon/front_pics/unown_w_still_front_pic.png b/graphics/pokemon/unown/front_w.png
index 829804ebf..829804ebf 100644
--- a/graphics/pokemon/front_pics/unown_w_still_front_pic.png
+++ b/graphics/pokemon/unown/front_w.png
diff --git a/graphics/pokemon/front_pics/unown_x_still_front_pic.png b/graphics/pokemon/unown/front_x.png
index 053e2ee08..053e2ee08 100644
--- a/graphics/pokemon/front_pics/unown_x_still_front_pic.png
+++ b/graphics/pokemon/unown/front_x.png
diff --git a/graphics/pokemon/front_pics/unown_y_still_front_pic.png b/graphics/pokemon/unown/front_y.png
index d8f40e27e..d8f40e27e 100644
--- a/graphics/pokemon/front_pics/unown_y_still_front_pic.png
+++ b/graphics/pokemon/unown/front_y.png
diff --git a/graphics/pokemon/front_pics/unown_z_still_front_pic.png b/graphics/pokemon/unown/front_z.png
index 054eacb6d..054eacb6d 100644
--- a/graphics/pokemon/front_pics/unown_z_still_front_pic.png
+++ b/graphics/pokemon/unown/front_z.png
diff --git a/graphics/pokemon/icons/unown_a_icon.png b/graphics/pokemon/unown/icon_a.png
index cd9056ab2..cd9056ab2 100644
--- a/graphics/pokemon/icons/unown_a_icon.png
+++ b/graphics/pokemon/unown/icon_a.png
diff --git a/graphics/pokemon/icons/unown_B_icon.png b/graphics/pokemon/unown/icon_b.png
index 47654aba5..47654aba5 100644
--- a/graphics/pokemon/icons/unown_B_icon.png
+++ b/graphics/pokemon/unown/icon_b.png
diff --git a/graphics/pokemon/icons/unown_C_icon.png b/graphics/pokemon/unown/icon_c.png
index 7b8721a7d..7b8721a7d 100644
--- a/graphics/pokemon/icons/unown_C_icon.png
+++ b/graphics/pokemon/unown/icon_c.png
diff --git a/graphics/pokemon/icons/unown_D_icon.png b/graphics/pokemon/unown/icon_d.png
index db6b0cf8a..db6b0cf8a 100644
--- a/graphics/pokemon/icons/unown_D_icon.png
+++ b/graphics/pokemon/unown/icon_d.png
diff --git a/graphics/pokemon/icons/unown_E_icon.png b/graphics/pokemon/unown/icon_e.png
index 6addb828e..6addb828e 100644
--- a/graphics/pokemon/icons/unown_E_icon.png
+++ b/graphics/pokemon/unown/icon_e.png
diff --git a/graphics/pokemon/icons/unown_exclamation_mark_icon.png b/graphics/pokemon/unown/icon_exclamation_mark.png
index beeea4ae1..beeea4ae1 100644
--- a/graphics/pokemon/icons/unown_exclamation_mark_icon.png
+++ b/graphics/pokemon/unown/icon_exclamation_mark.png
diff --git a/graphics/pokemon/icons/unown_F_icon.png b/graphics/pokemon/unown/icon_f.png
index 3c45017b1..3c45017b1 100644
--- a/graphics/pokemon/icons/unown_F_icon.png
+++ b/graphics/pokemon/unown/icon_f.png
diff --git a/graphics/pokemon/icons/unown_G_icon.png b/graphics/pokemon/unown/icon_g.png
index ab00f8ad2..ab00f8ad2 100644
--- a/graphics/pokemon/icons/unown_G_icon.png
+++ b/graphics/pokemon/unown/icon_g.png
diff --git a/graphics/pokemon/icons/unown_H_icon.png b/graphics/pokemon/unown/icon_h.png
index bd4fd96bf..bd4fd96bf 100644
--- a/graphics/pokemon/icons/unown_H_icon.png
+++ b/graphics/pokemon/unown/icon_h.png
diff --git a/graphics/pokemon/icons/unown_I_icon.png b/graphics/pokemon/unown/icon_i.png
index 6973196bb..6973196bb 100644
--- a/graphics/pokemon/icons/unown_I_icon.png
+++ b/graphics/pokemon/unown/icon_i.png
diff --git a/graphics/pokemon/icons/unown_J_icon.png b/graphics/pokemon/unown/icon_j.png
index b85a45a71..b85a45a71 100644
--- a/graphics/pokemon/icons/unown_J_icon.png
+++ b/graphics/pokemon/unown/icon_j.png
diff --git a/graphics/pokemon/icons/unown_K_icon.png b/graphics/pokemon/unown/icon_k.png
index 81bcb385e..81bcb385e 100644
--- a/graphics/pokemon/icons/unown_K_icon.png
+++ b/graphics/pokemon/unown/icon_k.png
diff --git a/graphics/pokemon/icons/unown_L_icon.png b/graphics/pokemon/unown/icon_l.png
index 5f6fb9db8..5f6fb9db8 100644
--- a/graphics/pokemon/icons/unown_L_icon.png
+++ b/graphics/pokemon/unown/icon_l.png
diff --git a/graphics/pokemon/icons/unown_M_icon.png b/graphics/pokemon/unown/icon_m.png
index c9b8d0fb4..c9b8d0fb4 100644
--- a/graphics/pokemon/icons/unown_M_icon.png
+++ b/graphics/pokemon/unown/icon_m.png
diff --git a/graphics/pokemon/icons/unown_N_icon.png b/graphics/pokemon/unown/icon_n.png
index b1e5c5abb..b1e5c5abb 100644
--- a/graphics/pokemon/icons/unown_N_icon.png
+++ b/graphics/pokemon/unown/icon_n.png
diff --git a/graphics/pokemon/icons/unown_O_icon.png b/graphics/pokemon/unown/icon_o.png
index 14a88d062..14a88d062 100644
--- a/graphics/pokemon/icons/unown_O_icon.png
+++ b/graphics/pokemon/unown/icon_o.png
diff --git a/graphics/pokemon/icons/unown_P_icon.png b/graphics/pokemon/unown/icon_p.png
index 7a7afb8de..7a7afb8de 100644
--- a/graphics/pokemon/icons/unown_P_icon.png
+++ b/graphics/pokemon/unown/icon_p.png
diff --git a/graphics/pokemon/icons/unown_Q_icon.png b/graphics/pokemon/unown/icon_q.png
index 2270f8373..2270f8373 100644
--- a/graphics/pokemon/icons/unown_Q_icon.png
+++ b/graphics/pokemon/unown/icon_q.png
diff --git a/graphics/pokemon/icons/unown_question_mark_icon.png b/graphics/pokemon/unown/icon_question_mark.png
index a9bb50930..a9bb50930 100644
--- a/graphics/pokemon/icons/unown_question_mark_icon.png
+++ b/graphics/pokemon/unown/icon_question_mark.png
diff --git a/graphics/pokemon/icons/unown_R_icon.png b/graphics/pokemon/unown/icon_r.png
index 6ba4d5764..6ba4d5764 100644
--- a/graphics/pokemon/icons/unown_R_icon.png
+++ b/graphics/pokemon/unown/icon_r.png
diff --git a/graphics/pokemon/icons/unown_S_icon.png b/graphics/pokemon/unown/icon_s.png
index 44f17718b..44f17718b 100644
--- a/graphics/pokemon/icons/unown_S_icon.png
+++ b/graphics/pokemon/unown/icon_s.png
diff --git a/graphics/pokemon/icons/unown_T_icon.png b/graphics/pokemon/unown/icon_t.png
index 9023b7366..9023b7366 100644
--- a/graphics/pokemon/icons/unown_T_icon.png
+++ b/graphics/pokemon/unown/icon_t.png
diff --git a/graphics/pokemon/icons/unown_U_icon.png b/graphics/pokemon/unown/icon_u.png
index 3d315ebf2..3d315ebf2 100644
--- a/graphics/pokemon/icons/unown_U_icon.png
+++ b/graphics/pokemon/unown/icon_u.png
diff --git a/graphics/pokemon/icons/unown_V_icon.png b/graphics/pokemon/unown/icon_v.png
index f973a3d85..f973a3d85 100644
--- a/graphics/pokemon/icons/unown_V_icon.png
+++ b/graphics/pokemon/unown/icon_v.png
diff --git a/graphics/pokemon/icons/unown_W_icon.png b/graphics/pokemon/unown/icon_w.png
index aabb0663e..aabb0663e 100644
--- a/graphics/pokemon/icons/unown_W_icon.png
+++ b/graphics/pokemon/unown/icon_w.png
diff --git a/graphics/pokemon/icons/unown_X_icon.png b/graphics/pokemon/unown/icon_x.png
index b5be9e10b..b5be9e10b 100644
--- a/graphics/pokemon/icons/unown_X_icon.png
+++ b/graphics/pokemon/unown/icon_x.png
diff --git a/graphics/pokemon/icons/unown_Y_icon.png b/graphics/pokemon/unown/icon_y.png
index 8923810aa..8923810aa 100644
--- a/graphics/pokemon/icons/unown_Y_icon.png
+++ b/graphics/pokemon/unown/icon_y.png
diff --git a/graphics/pokemon/icons/unown_Z_icon.png b/graphics/pokemon/unown/icon_z.png
index a14f73696..a14f73696 100644
--- a/graphics/pokemon/icons/unown_Z_icon.png
+++ b/graphics/pokemon/unown/icon_z.png
diff --git a/graphics/pokemon/palettes/unown_palette.pal b/graphics/pokemon/unown/normal.pal
index 6babb2d90..6babb2d90 100644
--- a/graphics/pokemon/palettes/unown_palette.pal
+++ b/graphics/pokemon/unown/normal.pal
diff --git a/graphics/pokemon/palettes/unown_shiny_palette.pal b/graphics/pokemon/unown/shiny.pal
index 016a93548..016a93548 100644
--- a/graphics/pokemon/palettes/unown_shiny_palette.pal
+++ b/graphics/pokemon/unown/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/ursaring_front_pic.png b/graphics/pokemon/ursaring/anim_front.png
index eb9e307ce..eb9e307ce 100644
--- a/graphics/pokemon/anim_front_pics/ursaring_front_pic.png
+++ b/graphics/pokemon/ursaring/anim_front.png
diff --git a/graphics/pokemon/back_pics/ursaring_back_pic.png b/graphics/pokemon/ursaring/back.png
index 4a546c055..4a546c055 100644
--- a/graphics/pokemon/back_pics/ursaring_back_pic.png
+++ b/graphics/pokemon/ursaring/back.png
diff --git a/graphics/pokemon/footprints/ursaring_footprint.png b/graphics/pokemon/ursaring/footprint.png
index b1023bd3b..b1023bd3b 100644
--- a/graphics/pokemon/footprints/ursaring_footprint.png
+++ b/graphics/pokemon/ursaring/footprint.png
diff --git a/graphics/pokemon/front_pics/ursaring_still_front_pic.png b/graphics/pokemon/ursaring/front.png
index 8699738b5..8699738b5 100644
--- a/graphics/pokemon/front_pics/ursaring_still_front_pic.png
+++ b/graphics/pokemon/ursaring/front.png
diff --git a/graphics/pokemon/icons/ursaring_icon.png b/graphics/pokemon/ursaring/icon.png
index 143353f31..143353f31 100644
--- a/graphics/pokemon/icons/ursaring_icon.png
+++ b/graphics/pokemon/ursaring/icon.png
diff --git a/graphics/pokemon/palettes/ursaring_palette.pal b/graphics/pokemon/ursaring/normal.pal
index 6af3469eb..6af3469eb 100644
--- a/graphics/pokemon/palettes/ursaring_palette.pal
+++ b/graphics/pokemon/ursaring/normal.pal
diff --git a/graphics/pokemon/palettes/ursaring_shiny_palette.pal b/graphics/pokemon/ursaring/shiny.pal
index 607975efa..607975efa 100644
--- a/graphics/pokemon/palettes/ursaring_shiny_palette.pal
+++ b/graphics/pokemon/ursaring/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/vaporeon_front_pic.png b/graphics/pokemon/vaporeon/anim_front.png
index f3eb2d626..f3eb2d626 100644
--- a/graphics/pokemon/anim_front_pics/vaporeon_front_pic.png
+++ b/graphics/pokemon/vaporeon/anim_front.png
diff --git a/graphics/pokemon/back_pics/vaporeon_back_pic.png b/graphics/pokemon/vaporeon/back.png
index 5ac5b94fb..5ac5b94fb 100644
--- a/graphics/pokemon/back_pics/vaporeon_back_pic.png
+++ b/graphics/pokemon/vaporeon/back.png
diff --git a/graphics/pokemon/footprints/vaporeon_footprint.png b/graphics/pokemon/vaporeon/footprint.png
index 2b44d4b24..2b44d4b24 100644
--- a/graphics/pokemon/footprints/vaporeon_footprint.png
+++ b/graphics/pokemon/vaporeon/footprint.png
diff --git a/graphics/pokemon/front_pics/vaporeon_still_front_pic.png b/graphics/pokemon/vaporeon/front.png
index af9a0f999..af9a0f999 100644
--- a/graphics/pokemon/front_pics/vaporeon_still_front_pic.png
+++ b/graphics/pokemon/vaporeon/front.png
diff --git a/graphics/pokemon/icons/vaporeon_icon.png b/graphics/pokemon/vaporeon/icon.png
index d4003c2a8..d4003c2a8 100644
--- a/graphics/pokemon/icons/vaporeon_icon.png
+++ b/graphics/pokemon/vaporeon/icon.png
diff --git a/graphics/pokemon/palettes/vaporeon_palette.pal b/graphics/pokemon/vaporeon/normal.pal
index e6a4024f1..e6a4024f1 100644
--- a/graphics/pokemon/palettes/vaporeon_palette.pal
+++ b/graphics/pokemon/vaporeon/normal.pal
diff --git a/graphics/pokemon/palettes/vaporeon_shiny_palette.pal b/graphics/pokemon/vaporeon/shiny.pal
index 1cfaae92b..1cfaae92b 100644
--- a/graphics/pokemon/palettes/vaporeon_shiny_palette.pal
+++ b/graphics/pokemon/vaporeon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/venomoth_front_pic.png b/graphics/pokemon/venomoth/anim_front.png
index 55704df34..55704df34 100644
--- a/graphics/pokemon/anim_front_pics/venomoth_front_pic.png
+++ b/graphics/pokemon/venomoth/anim_front.png
diff --git a/graphics/pokemon/back_pics/venomoth_back_pic.png b/graphics/pokemon/venomoth/back.png
index 56b1b5b7a..56b1b5b7a 100644
--- a/graphics/pokemon/back_pics/venomoth_back_pic.png
+++ b/graphics/pokemon/venomoth/back.png
diff --git a/graphics/pokemon/footprints/venomoth_footprint.png b/graphics/pokemon/venomoth/footprint.png
index 6965dbe60..6965dbe60 100644
--- a/graphics/pokemon/footprints/venomoth_footprint.png
+++ b/graphics/pokemon/venomoth/footprint.png
diff --git a/graphics/pokemon/front_pics/venomoth_still_front_pic.png b/graphics/pokemon/venomoth/front.png
index 6a13cd6f1..6a13cd6f1 100644
--- a/graphics/pokemon/front_pics/venomoth_still_front_pic.png
+++ b/graphics/pokemon/venomoth/front.png
diff --git a/graphics/pokemon/icons/venomoth_icon.png b/graphics/pokemon/venomoth/icon.png
index d77b6dce8..d77b6dce8 100644
--- a/graphics/pokemon/icons/venomoth_icon.png
+++ b/graphics/pokemon/venomoth/icon.png
diff --git a/graphics/pokemon/palettes/venomoth_palette.pal b/graphics/pokemon/venomoth/normal.pal
index c9b3d325d..c9b3d325d 100644
--- a/graphics/pokemon/palettes/venomoth_palette.pal
+++ b/graphics/pokemon/venomoth/normal.pal
diff --git a/graphics/pokemon/palettes/venomoth_shiny_palette.pal b/graphics/pokemon/venomoth/shiny.pal
index a490c4985..a490c4985 100644
--- a/graphics/pokemon/palettes/venomoth_shiny_palette.pal
+++ b/graphics/pokemon/venomoth/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/venonat_front_pic.png b/graphics/pokemon/venonat/anim_front.png
index a8c726b2c..a8c726b2c 100644
--- a/graphics/pokemon/anim_front_pics/venonat_front_pic.png
+++ b/graphics/pokemon/venonat/anim_front.png
diff --git a/graphics/pokemon/back_pics/venonat_back_pic.png b/graphics/pokemon/venonat/back.png
index 44f7f45c5..44f7f45c5 100644
--- a/graphics/pokemon/back_pics/venonat_back_pic.png
+++ b/graphics/pokemon/venonat/back.png
diff --git a/graphics/pokemon/footprints/venonat_footprint.png b/graphics/pokemon/venonat/footprint.png
index 3675945c9..3675945c9 100644
--- a/graphics/pokemon/footprints/venonat_footprint.png
+++ b/graphics/pokemon/venonat/footprint.png
diff --git a/graphics/pokemon/front_pics/venonat_still_front_pic.png b/graphics/pokemon/venonat/front.png
index 8d27f698b..8d27f698b 100644
--- a/graphics/pokemon/front_pics/venonat_still_front_pic.png
+++ b/graphics/pokemon/venonat/front.png
diff --git a/graphics/pokemon/icons/venonat_icon.png b/graphics/pokemon/venonat/icon.png
index a2ed54b71..a2ed54b71 100644
--- a/graphics/pokemon/icons/venonat_icon.png
+++ b/graphics/pokemon/venonat/icon.png
diff --git a/graphics/pokemon/palettes/venonat_palette.pal b/graphics/pokemon/venonat/normal.pal
index ae6698416..ae6698416 100644
--- a/graphics/pokemon/palettes/venonat_palette.pal
+++ b/graphics/pokemon/venonat/normal.pal
diff --git a/graphics/pokemon/palettes/venonat_shiny_palette.pal b/graphics/pokemon/venonat/shiny.pal
index 88c346a27..88c346a27 100644
--- a/graphics/pokemon/palettes/venonat_shiny_palette.pal
+++ b/graphics/pokemon/venonat/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/venusaur_front_pic.png b/graphics/pokemon/venusaur/anim_front.png
index 7a1157fe3..7a1157fe3 100644
--- a/graphics/pokemon/anim_front_pics/venusaur_front_pic.png
+++ b/graphics/pokemon/venusaur/anim_front.png
diff --git a/graphics/pokemon/back_pics/venusaur_back_pic.png b/graphics/pokemon/venusaur/back.png
index 78649eeee..78649eeee 100644
--- a/graphics/pokemon/back_pics/venusaur_back_pic.png
+++ b/graphics/pokemon/venusaur/back.png
diff --git a/graphics/pokemon/footprints/venusaur_footprint.png b/graphics/pokemon/venusaur/footprint.png
index bdef2c818..bdef2c818 100644
--- a/graphics/pokemon/footprints/venusaur_footprint.png
+++ b/graphics/pokemon/venusaur/footprint.png
diff --git a/graphics/pokemon/front_pics/venusaur_still_front_pic.png b/graphics/pokemon/venusaur/front.png
index 479be8737..479be8737 100644
--- a/graphics/pokemon/front_pics/venusaur_still_front_pic.png
+++ b/graphics/pokemon/venusaur/front.png
diff --git a/graphics/pokemon/icons/venusaur_icon.png b/graphics/pokemon/venusaur/icon.png
index fbd5380f5..fbd5380f5 100644
--- a/graphics/pokemon/icons/venusaur_icon.png
+++ b/graphics/pokemon/venusaur/icon.png
diff --git a/graphics/pokemon/palettes/venusaur_palette.pal b/graphics/pokemon/venusaur/normal.pal
index 362bb6d92..362bb6d92 100644
--- a/graphics/pokemon/palettes/venusaur_palette.pal
+++ b/graphics/pokemon/venusaur/normal.pal
diff --git a/graphics/pokemon/palettes/venusaur_shiny_palette.pal b/graphics/pokemon/venusaur/shiny.pal
index 566246394..566246394 100644
--- a/graphics/pokemon/palettes/venusaur_shiny_palette.pal
+++ b/graphics/pokemon/venusaur/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/vibrava_front_pic.png b/graphics/pokemon/vibrava/anim_front.png
index 6f58b89bb..6f58b89bb 100644
--- a/graphics/pokemon/anim_front_pics/vibrava_front_pic.png
+++ b/graphics/pokemon/vibrava/anim_front.png
diff --git a/graphics/pokemon/back_pics/vibrava_back_pic.png b/graphics/pokemon/vibrava/back.png
index c5a0eb60b..c5a0eb60b 100644
--- a/graphics/pokemon/back_pics/vibrava_back_pic.png
+++ b/graphics/pokemon/vibrava/back.png
diff --git a/graphics/pokemon/footprints/vibrava_footprint.png b/graphics/pokemon/vibrava/footprint.png
index fdf76f9f2..fdf76f9f2 100644
--- a/graphics/pokemon/footprints/vibrava_footprint.png
+++ b/graphics/pokemon/vibrava/footprint.png
diff --git a/graphics/pokemon/front_pics/vibrava_still_front_pic.png b/graphics/pokemon/vibrava/front.png
index 487ce4746..487ce4746 100644
--- a/graphics/pokemon/front_pics/vibrava_still_front_pic.png
+++ b/graphics/pokemon/vibrava/front.png
diff --git a/graphics/pokemon/icons/vibrava_icon.png b/graphics/pokemon/vibrava/icon.png
index 422ea2359..422ea2359 100644
--- a/graphics/pokemon/icons/vibrava_icon.png
+++ b/graphics/pokemon/vibrava/icon.png
diff --git a/graphics/pokemon/palettes/vibrava_palette.pal b/graphics/pokemon/vibrava/normal.pal
index 7f40d2316..7f40d2316 100644
--- a/graphics/pokemon/palettes/vibrava_palette.pal
+++ b/graphics/pokemon/vibrava/normal.pal
diff --git a/graphics/pokemon/palettes/vibrava_shiny_palette.pal b/graphics/pokemon/vibrava/shiny.pal
index 8da128d69..8da128d69 100644
--- a/graphics/pokemon/palettes/vibrava_shiny_palette.pal
+++ b/graphics/pokemon/vibrava/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/victreebel_front_pic.png b/graphics/pokemon/victreebel/anim_front.png
index 3615e31a1..3615e31a1 100644
--- a/graphics/pokemon/anim_front_pics/victreebel_front_pic.png
+++ b/graphics/pokemon/victreebel/anim_front.png
diff --git a/graphics/pokemon/back_pics/victreebel_back_pic.png b/graphics/pokemon/victreebel/back.png
index a92b61f7a..a92b61f7a 100644
--- a/graphics/pokemon/back_pics/victreebel_back_pic.png
+++ b/graphics/pokemon/victreebel/back.png
diff --git a/graphics/pokemon/footprints/victreebel_footprint.png b/graphics/pokemon/victreebel/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/victreebel_footprint.png
+++ b/graphics/pokemon/victreebel/footprint.png
diff --git a/graphics/pokemon/front_pics/victreebel_still_front_pic.png b/graphics/pokemon/victreebel/front.png
index 4f2d7b8f4..4f2d7b8f4 100644
--- a/graphics/pokemon/front_pics/victreebel_still_front_pic.png
+++ b/graphics/pokemon/victreebel/front.png
diff --git a/graphics/pokemon/icons/victreebel_icon.png b/graphics/pokemon/victreebel/icon.png
index 49298177e..49298177e 100644
--- a/graphics/pokemon/icons/victreebel_icon.png
+++ b/graphics/pokemon/victreebel/icon.png
diff --git a/graphics/pokemon/palettes/victreebel_palette.pal b/graphics/pokemon/victreebel/normal.pal
index 635eae0ab..635eae0ab 100644
--- a/graphics/pokemon/palettes/victreebel_palette.pal
+++ b/graphics/pokemon/victreebel/normal.pal
diff --git a/graphics/pokemon/palettes/victreebel_shiny_palette.pal b/graphics/pokemon/victreebel/shiny.pal
index 2542072f3..2542072f3 100644
--- a/graphics/pokemon/palettes/victreebel_shiny_palette.pal
+++ b/graphics/pokemon/victreebel/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/vigoroth_front_pic.png b/graphics/pokemon/vigoroth/anim_front.png
index cbf7519a0..cbf7519a0 100644
--- a/graphics/pokemon/anim_front_pics/vigoroth_front_pic.png
+++ b/graphics/pokemon/vigoroth/anim_front.png
diff --git a/graphics/pokemon/back_pics/vigoroth_back_pic.png b/graphics/pokemon/vigoroth/back.png
index 7d806e703..7d806e703 100644
--- a/graphics/pokemon/back_pics/vigoroth_back_pic.png
+++ b/graphics/pokemon/vigoroth/back.png
diff --git a/graphics/pokemon/footprints/vigoroth_footprint.png b/graphics/pokemon/vigoroth/footprint.png
index bc10a7230..bc10a7230 100644
--- a/graphics/pokemon/footprints/vigoroth_footprint.png
+++ b/graphics/pokemon/vigoroth/footprint.png
diff --git a/graphics/pokemon/front_pics/vigoroth_still_front_pic.png b/graphics/pokemon/vigoroth/front.png
index fe87041ee..fe87041ee 100644
--- a/graphics/pokemon/front_pics/vigoroth_still_front_pic.png
+++ b/graphics/pokemon/vigoroth/front.png
diff --git a/graphics/pokemon/icons/vigoroth_icon.png b/graphics/pokemon/vigoroth/icon.png
index f8808cde3..f8808cde3 100644
--- a/graphics/pokemon/icons/vigoroth_icon.png
+++ b/graphics/pokemon/vigoroth/icon.png
diff --git a/graphics/pokemon/palettes/vigoroth_palette.pal b/graphics/pokemon/vigoroth/normal.pal
index 824efe711..824efe711 100644
--- a/graphics/pokemon/palettes/vigoroth_palette.pal
+++ b/graphics/pokemon/vigoroth/normal.pal
diff --git a/graphics/pokemon/palettes/vigoroth_shiny_palette.pal b/graphics/pokemon/vigoroth/shiny.pal
index adc647979..adc647979 100644
--- a/graphics/pokemon/palettes/vigoroth_shiny_palette.pal
+++ b/graphics/pokemon/vigoroth/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/vileplume_front_pic.png b/graphics/pokemon/vileplume/anim_front.png
index e4fffcf76..e4fffcf76 100644
--- a/graphics/pokemon/anim_front_pics/vileplume_front_pic.png
+++ b/graphics/pokemon/vileplume/anim_front.png
diff --git a/graphics/pokemon/back_pics/vileplume_back_pic.png b/graphics/pokemon/vileplume/back.png
index 6c441efb3..6c441efb3 100644
--- a/graphics/pokemon/back_pics/vileplume_back_pic.png
+++ b/graphics/pokemon/vileplume/back.png
diff --git a/graphics/pokemon/footprints/vileplume_footprint.png b/graphics/pokemon/vileplume/footprint.png
index 8fd5bdf83..8fd5bdf83 100644
--- a/graphics/pokemon/footprints/vileplume_footprint.png
+++ b/graphics/pokemon/vileplume/footprint.png
diff --git a/graphics/pokemon/front_pics/vileplume_still_front_pic.png b/graphics/pokemon/vileplume/front.png
index 0d6962d32..0d6962d32 100644
--- a/graphics/pokemon/front_pics/vileplume_still_front_pic.png
+++ b/graphics/pokemon/vileplume/front.png
diff --git a/graphics/pokemon/icons/vileplume_icon.png b/graphics/pokemon/vileplume/icon.png
index 7009048c5..7009048c5 100644
--- a/graphics/pokemon/icons/vileplume_icon.png
+++ b/graphics/pokemon/vileplume/icon.png
diff --git a/graphics/pokemon/palettes/vileplume_palette.pal b/graphics/pokemon/vileplume/normal.pal
index 96d98b0d9..96d98b0d9 100644
--- a/graphics/pokemon/palettes/vileplume_palette.pal
+++ b/graphics/pokemon/vileplume/normal.pal
diff --git a/graphics/pokemon/palettes/vileplume_shiny_palette.pal b/graphics/pokemon/vileplume/shiny.pal
index b0bd4468f..b0bd4468f 100644
--- a/graphics/pokemon/palettes/vileplume_shiny_palette.pal
+++ b/graphics/pokemon/vileplume/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/volbeat_front_pic.png b/graphics/pokemon/volbeat/anim_front.png
index 945ed1400..945ed1400 100644
--- a/graphics/pokemon/anim_front_pics/volbeat_front_pic.png
+++ b/graphics/pokemon/volbeat/anim_front.png
diff --git a/graphics/pokemon/back_pics/volbeat_back_pic.png b/graphics/pokemon/volbeat/back.png
index 217b966ed..217b966ed 100644
--- a/graphics/pokemon/back_pics/volbeat_back_pic.png
+++ b/graphics/pokemon/volbeat/back.png
diff --git a/graphics/pokemon/footprints/volbeat_footprint.png b/graphics/pokemon/volbeat/footprint.png
index 916c59f60..916c59f60 100644
--- a/graphics/pokemon/footprints/volbeat_footprint.png
+++ b/graphics/pokemon/volbeat/footprint.png
diff --git a/graphics/pokemon/front_pics/volbeat_still_front_pic.png b/graphics/pokemon/volbeat/front.png
index 9daf199a3..9daf199a3 100644
--- a/graphics/pokemon/front_pics/volbeat_still_front_pic.png
+++ b/graphics/pokemon/volbeat/front.png
diff --git a/graphics/pokemon/icons/volbeat_icon.png b/graphics/pokemon/volbeat/icon.png
index 849715d33..849715d33 100644
--- a/graphics/pokemon/icons/volbeat_icon.png
+++ b/graphics/pokemon/volbeat/icon.png
diff --git a/graphics/pokemon/palettes/volbeat_palette.pal b/graphics/pokemon/volbeat/normal.pal
index 8d2cedfa8..8d2cedfa8 100644
--- a/graphics/pokemon/palettes/volbeat_palette.pal
+++ b/graphics/pokemon/volbeat/normal.pal
diff --git a/graphics/pokemon/palettes/volbeat_shiny_palette.pal b/graphics/pokemon/volbeat/shiny.pal
index 106d373cf..106d373cf 100644
--- a/graphics/pokemon/palettes/volbeat_shiny_palette.pal
+++ b/graphics/pokemon/volbeat/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/voltorb_front_pic.png b/graphics/pokemon/voltorb/anim_front.png
index ef550558b..ef550558b 100644
--- a/graphics/pokemon/anim_front_pics/voltorb_front_pic.png
+++ b/graphics/pokemon/voltorb/anim_front.png
diff --git a/graphics/pokemon/back_pics/voltorb_back_pic.png b/graphics/pokemon/voltorb/back.png
index c379b4a8b..c379b4a8b 100644
--- a/graphics/pokemon/back_pics/voltorb_back_pic.png
+++ b/graphics/pokemon/voltorb/back.png
diff --git a/graphics/pokemon/footprints/voltorb_footprint.png b/graphics/pokemon/voltorb/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/voltorb_footprint.png
+++ b/graphics/pokemon/voltorb/footprint.png
diff --git a/graphics/pokemon/front_pics/voltorb_still_front_pic.png b/graphics/pokemon/voltorb/front.png
index da18b70b6..da18b70b6 100644
--- a/graphics/pokemon/front_pics/voltorb_still_front_pic.png
+++ b/graphics/pokemon/voltorb/front.png
diff --git a/graphics/pokemon/icons/voltorb_icon.png b/graphics/pokemon/voltorb/icon.png
index 53d318fdb..53d318fdb 100644
--- a/graphics/pokemon/icons/voltorb_icon.png
+++ b/graphics/pokemon/voltorb/icon.png
diff --git a/graphics/pokemon/palettes/voltorb_palette.pal b/graphics/pokemon/voltorb/normal.pal
index 64007ece6..64007ece6 100644
--- a/graphics/pokemon/palettes/voltorb_palette.pal
+++ b/graphics/pokemon/voltorb/normal.pal
diff --git a/graphics/pokemon/palettes/voltorb_shiny_palette.pal b/graphics/pokemon/voltorb/shiny.pal
index 1ceb68b1b..1ceb68b1b 100644
--- a/graphics/pokemon/palettes/voltorb_shiny_palette.pal
+++ b/graphics/pokemon/voltorb/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/vulpix_front_pic.png b/graphics/pokemon/vulpix/anim_front.png
index f48618e69..f48618e69 100644
--- a/graphics/pokemon/anim_front_pics/vulpix_front_pic.png
+++ b/graphics/pokemon/vulpix/anim_front.png
diff --git a/graphics/pokemon/back_pics/vulpix_back_pic.png b/graphics/pokemon/vulpix/back.png
index 49bad4ed6..49bad4ed6 100644
--- a/graphics/pokemon/back_pics/vulpix_back_pic.png
+++ b/graphics/pokemon/vulpix/back.png
diff --git a/graphics/pokemon/footprints/vulpix_footprint.png b/graphics/pokemon/vulpix/footprint.png
index a0a655ca6..a0a655ca6 100644
--- a/graphics/pokemon/footprints/vulpix_footprint.png
+++ b/graphics/pokemon/vulpix/footprint.png
diff --git a/graphics/pokemon/front_pics/vulpix_still_front_pic.png b/graphics/pokemon/vulpix/front.png
index 53f866b2c..53f866b2c 100644
--- a/graphics/pokemon/front_pics/vulpix_still_front_pic.png
+++ b/graphics/pokemon/vulpix/front.png
diff --git a/graphics/pokemon/icons/vulpix_icon.png b/graphics/pokemon/vulpix/icon.png
index d998362d1..d998362d1 100644
--- a/graphics/pokemon/icons/vulpix_icon.png
+++ b/graphics/pokemon/vulpix/icon.png
diff --git a/graphics/pokemon/palettes/vulpix_palette.pal b/graphics/pokemon/vulpix/normal.pal
index 3fb9878d3..3fb9878d3 100644
--- a/graphics/pokemon/palettes/vulpix_palette.pal
+++ b/graphics/pokemon/vulpix/normal.pal
diff --git a/graphics/pokemon/palettes/vulpix_shiny_palette.pal b/graphics/pokemon/vulpix/shiny.pal
index 7c52191ab..7c52191ab 100644
--- a/graphics/pokemon/palettes/vulpix_shiny_palette.pal
+++ b/graphics/pokemon/vulpix/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wailmer_front_pic.png b/graphics/pokemon/wailmer/anim_front.png
index f1032d0d1..f1032d0d1 100644
--- a/graphics/pokemon/anim_front_pics/wailmer_front_pic.png
+++ b/graphics/pokemon/wailmer/anim_front.png
diff --git a/graphics/pokemon/back_pics/wailmer_back_pic.png b/graphics/pokemon/wailmer/back.png
index 9ad9f21ea..9ad9f21ea 100644
--- a/graphics/pokemon/back_pics/wailmer_back_pic.png
+++ b/graphics/pokemon/wailmer/back.png
diff --git a/graphics/pokemon/footprints/wailmer_footprint.png b/graphics/pokemon/wailmer/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/wailmer_footprint.png
+++ b/graphics/pokemon/wailmer/footprint.png
diff --git a/graphics/pokemon/front_pics/wailmer_still_front_pic.png b/graphics/pokemon/wailmer/front.png
index a17d48cdf..a17d48cdf 100644
--- a/graphics/pokemon/front_pics/wailmer_still_front_pic.png
+++ b/graphics/pokemon/wailmer/front.png
diff --git a/graphics/pokemon/icons/wailmer_icon.png b/graphics/pokemon/wailmer/icon.png
index 16ba6d4b9..16ba6d4b9 100644
--- a/graphics/pokemon/icons/wailmer_icon.png
+++ b/graphics/pokemon/wailmer/icon.png
diff --git a/graphics/pokemon/palettes/wailmer_palette.pal b/graphics/pokemon/wailmer/normal.pal
index 4e56fb42a..4e56fb42a 100644
--- a/graphics/pokemon/palettes/wailmer_palette.pal
+++ b/graphics/pokemon/wailmer/normal.pal
diff --git a/graphics/pokemon/palettes/wailmer_shiny_palette.pal b/graphics/pokemon/wailmer/shiny.pal
index 296519dbd..296519dbd 100644
--- a/graphics/pokemon/palettes/wailmer_shiny_palette.pal
+++ b/graphics/pokemon/wailmer/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wailord_front_pic.png b/graphics/pokemon/wailord/anim_front.png
index 3a9ae255c..3a9ae255c 100644
--- a/graphics/pokemon/anim_front_pics/wailord_front_pic.png
+++ b/graphics/pokemon/wailord/anim_front.png
diff --git a/graphics/pokemon/back_pics/wailord_back_pic.png b/graphics/pokemon/wailord/back.png
index 7698ba500..7698ba500 100644
--- a/graphics/pokemon/back_pics/wailord_back_pic.png
+++ b/graphics/pokemon/wailord/back.png
diff --git a/graphics/pokemon/footprints/wailord_footprint.png b/graphics/pokemon/wailord/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/wailord_footprint.png
+++ b/graphics/pokemon/wailord/footprint.png
diff --git a/graphics/pokemon/front_pics/wailord_still_front_pic.png b/graphics/pokemon/wailord/front.png
index e542cbc64..e542cbc64 100644
--- a/graphics/pokemon/front_pics/wailord_still_front_pic.png
+++ b/graphics/pokemon/wailord/front.png
diff --git a/graphics/pokemon/icons/wailord_icon.png b/graphics/pokemon/wailord/icon.png
index f84a7ea70..f84a7ea70 100644
--- a/graphics/pokemon/icons/wailord_icon.png
+++ b/graphics/pokemon/wailord/icon.png
diff --git a/graphics/pokemon/palettes/wailord_palette.pal b/graphics/pokemon/wailord/normal.pal
index 55fdf02f6..55fdf02f6 100644
--- a/graphics/pokemon/palettes/wailord_palette.pal
+++ b/graphics/pokemon/wailord/normal.pal
diff --git a/graphics/pokemon/palettes/wailord_shiny_palette.pal b/graphics/pokemon/wailord/shiny.pal
index 31a687fb9..31a687fb9 100644
--- a/graphics/pokemon/palettes/wailord_shiny_palette.pal
+++ b/graphics/pokemon/wailord/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/walrein_front_pic.png b/graphics/pokemon/walrein/anim_front.png
index b809a6806..b809a6806 100644
--- a/graphics/pokemon/anim_front_pics/walrein_front_pic.png
+++ b/graphics/pokemon/walrein/anim_front.png
diff --git a/graphics/pokemon/back_pics/walrein_back_pic.png b/graphics/pokemon/walrein/back.png
index c58df92b0..c58df92b0 100644
--- a/graphics/pokemon/back_pics/walrein_back_pic.png
+++ b/graphics/pokemon/walrein/back.png
diff --git a/graphics/pokemon/footprints/walrein_footprint.png b/graphics/pokemon/walrein/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/walrein_footprint.png
+++ b/graphics/pokemon/walrein/footprint.png
diff --git a/graphics/pokemon/front_pics/walrein_still_front_pic.png b/graphics/pokemon/walrein/front.png
index b19ad4564..b19ad4564 100644
--- a/graphics/pokemon/front_pics/walrein_still_front_pic.png
+++ b/graphics/pokemon/walrein/front.png
diff --git a/graphics/pokemon/icons/walrein_icon.png b/graphics/pokemon/walrein/icon.png
index f98348a54..f98348a54 100644
--- a/graphics/pokemon/icons/walrein_icon.png
+++ b/graphics/pokemon/walrein/icon.png
diff --git a/graphics/pokemon/palettes/walrein_palette.pal b/graphics/pokemon/walrein/normal.pal
index 2b4fb8ad4..2b4fb8ad4 100644
--- a/graphics/pokemon/palettes/walrein_palette.pal
+++ b/graphics/pokemon/walrein/normal.pal
diff --git a/graphics/pokemon/palettes/walrein_shiny_palette.pal b/graphics/pokemon/walrein/shiny.pal
index 0d93d3e7d..0d93d3e7d 100644
--- a/graphics/pokemon/palettes/walrein_shiny_palette.pal
+++ b/graphics/pokemon/walrein/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wartortle_front_pic.png b/graphics/pokemon/wartortle/anim_front.png
index 8c484dade..8c484dade 100644
--- a/graphics/pokemon/anim_front_pics/wartortle_front_pic.png
+++ b/graphics/pokemon/wartortle/anim_front.png
diff --git a/graphics/pokemon/back_pics/wartortle_back_pic.png b/graphics/pokemon/wartortle/back.png
index b7ccefbb5..b7ccefbb5 100644
--- a/graphics/pokemon/back_pics/wartortle_back_pic.png
+++ b/graphics/pokemon/wartortle/back.png
diff --git a/graphics/pokemon/footprints/wartortle_footprint.png b/graphics/pokemon/wartortle/footprint.png
index 4dd126496..4dd126496 100644
--- a/graphics/pokemon/footprints/wartortle_footprint.png
+++ b/graphics/pokemon/wartortle/footprint.png
diff --git a/graphics/pokemon/front_pics/wartortle_still_front_pic.png b/graphics/pokemon/wartortle/front.png
index 1a71e8410..1a71e8410 100644
--- a/graphics/pokemon/front_pics/wartortle_still_front_pic.png
+++ b/graphics/pokemon/wartortle/front.png
diff --git a/graphics/pokemon/icons/wartortle_icon.png b/graphics/pokemon/wartortle/icon.png
index 2cdfca2d9..2cdfca2d9 100644
--- a/graphics/pokemon/icons/wartortle_icon.png
+++ b/graphics/pokemon/wartortle/icon.png
diff --git a/graphics/pokemon/palettes/wartortle_palette.pal b/graphics/pokemon/wartortle/normal.pal
index b497d87b3..b497d87b3 100644
--- a/graphics/pokemon/palettes/wartortle_palette.pal
+++ b/graphics/pokemon/wartortle/normal.pal
diff --git a/graphics/pokemon/palettes/wartortle_shiny_palette.pal b/graphics/pokemon/wartortle/shiny.pal
index 9694dfc73..9694dfc73 100644
--- a/graphics/pokemon/palettes/wartortle_shiny_palette.pal
+++ b/graphics/pokemon/wartortle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/weedle_front_pic.png b/graphics/pokemon/weedle/anim_front.png
index 2334ea600..2334ea600 100644
--- a/graphics/pokemon/anim_front_pics/weedle_front_pic.png
+++ b/graphics/pokemon/weedle/anim_front.png
diff --git a/graphics/pokemon/back_pics/weedle_back_pic.png b/graphics/pokemon/weedle/back.png
index 3180bf513..3180bf513 100644
--- a/graphics/pokemon/back_pics/weedle_back_pic.png
+++ b/graphics/pokemon/weedle/back.png
diff --git a/graphics/pokemon/footprints/weedle_footprint.png b/graphics/pokemon/weedle/footprint.png
index c1c0058e7..c1c0058e7 100644
--- a/graphics/pokemon/footprints/weedle_footprint.png
+++ b/graphics/pokemon/weedle/footprint.png
diff --git a/graphics/pokemon/front_pics/weedle_still_front_pic.png b/graphics/pokemon/weedle/front.png
index 036cf109c..036cf109c 100644
--- a/graphics/pokemon/front_pics/weedle_still_front_pic.png
+++ b/graphics/pokemon/weedle/front.png
diff --git a/graphics/pokemon/icons/weedle_icon.png b/graphics/pokemon/weedle/icon.png
index 3a36001c6..3a36001c6 100644
--- a/graphics/pokemon/icons/weedle_icon.png
+++ b/graphics/pokemon/weedle/icon.png
diff --git a/graphics/pokemon/palettes/weedle_palette.pal b/graphics/pokemon/weedle/normal.pal
index da76f3794..da76f3794 100644
--- a/graphics/pokemon/palettes/weedle_palette.pal
+++ b/graphics/pokemon/weedle/normal.pal
diff --git a/graphics/pokemon/palettes/weedle_shiny_palette.pal b/graphics/pokemon/weedle/shiny.pal
index ea331921e..ea331921e 100644
--- a/graphics/pokemon/palettes/weedle_shiny_palette.pal
+++ b/graphics/pokemon/weedle/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/weepinbell_front_pic.png b/graphics/pokemon/weepinbell/anim_front.png
index 4574d1c5d..4574d1c5d 100644
--- a/graphics/pokemon/anim_front_pics/weepinbell_front_pic.png
+++ b/graphics/pokemon/weepinbell/anim_front.png
diff --git a/graphics/pokemon/back_pics/weepinbell_back_pic.png b/graphics/pokemon/weepinbell/back.png
index aad38d1df..aad38d1df 100644
--- a/graphics/pokemon/back_pics/weepinbell_back_pic.png
+++ b/graphics/pokemon/weepinbell/back.png
diff --git a/graphics/pokemon/footprints/weepinbell_footprint.png b/graphics/pokemon/weepinbell/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/weepinbell_footprint.png
+++ b/graphics/pokemon/weepinbell/footprint.png
diff --git a/graphics/pokemon/front_pics/weepinbell_still_front_pic.png b/graphics/pokemon/weepinbell/front.png
index 19b821711..19b821711 100644
--- a/graphics/pokemon/front_pics/weepinbell_still_front_pic.png
+++ b/graphics/pokemon/weepinbell/front.png
diff --git a/graphics/pokemon/icons/weepinbell_icon.png b/graphics/pokemon/weepinbell/icon.png
index eda2fd29a..eda2fd29a 100644
--- a/graphics/pokemon/icons/weepinbell_icon.png
+++ b/graphics/pokemon/weepinbell/icon.png
diff --git a/graphics/pokemon/palettes/weepinbell_palette.pal b/graphics/pokemon/weepinbell/normal.pal
index 162f84084..162f84084 100644
--- a/graphics/pokemon/palettes/weepinbell_palette.pal
+++ b/graphics/pokemon/weepinbell/normal.pal
diff --git a/graphics/pokemon/palettes/weepinbell_shiny_palette.pal b/graphics/pokemon/weepinbell/shiny.pal
index 2c7c777e6..2c7c777e6 100644
--- a/graphics/pokemon/palettes/weepinbell_shiny_palette.pal
+++ b/graphics/pokemon/weepinbell/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/weezing_front_pic.png b/graphics/pokemon/weezing/anim_front.png
index c4d684163..c4d684163 100644
--- a/graphics/pokemon/anim_front_pics/weezing_front_pic.png
+++ b/graphics/pokemon/weezing/anim_front.png
diff --git a/graphics/pokemon/back_pics/weezing_back_pic.png b/graphics/pokemon/weezing/back.png
index 3d3883211..3d3883211 100644
--- a/graphics/pokemon/back_pics/weezing_back_pic.png
+++ b/graphics/pokemon/weezing/back.png
diff --git a/graphics/pokemon/footprints/weezing_footprint.png b/graphics/pokemon/weezing/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/weezing_footprint.png
+++ b/graphics/pokemon/weezing/footprint.png
diff --git a/graphics/pokemon/front_pics/weezing_still_front_pic.png b/graphics/pokemon/weezing/front.png
index 7c2914724..7c2914724 100644
--- a/graphics/pokemon/front_pics/weezing_still_front_pic.png
+++ b/graphics/pokemon/weezing/front.png
diff --git a/graphics/pokemon/icons/weezing_icon.png b/graphics/pokemon/weezing/icon.png
index 4ef2404a9..4ef2404a9 100644
--- a/graphics/pokemon/icons/weezing_icon.png
+++ b/graphics/pokemon/weezing/icon.png
diff --git a/graphics/pokemon/palettes/weezing_palette.pal b/graphics/pokemon/weezing/normal.pal
index 2d8469910..2d8469910 100644
--- a/graphics/pokemon/palettes/weezing_palette.pal
+++ b/graphics/pokemon/weezing/normal.pal
diff --git a/graphics/pokemon/palettes/weezing_shiny_palette.pal b/graphics/pokemon/weezing/shiny.pal
index 1f0b9347c..1f0b9347c 100644
--- a/graphics/pokemon/palettes/weezing_shiny_palette.pal
+++ b/graphics/pokemon/weezing/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/whiscash_front_pic.png b/graphics/pokemon/whiscash/anim_front.png
index c6f1b3bcf..c6f1b3bcf 100644
--- a/graphics/pokemon/anim_front_pics/whiscash_front_pic.png
+++ b/graphics/pokemon/whiscash/anim_front.png
diff --git a/graphics/pokemon/back_pics/whiscash_back_pic.png b/graphics/pokemon/whiscash/back.png
index 6aad1817d..6aad1817d 100644
--- a/graphics/pokemon/back_pics/whiscash_back_pic.png
+++ b/graphics/pokemon/whiscash/back.png
diff --git a/graphics/pokemon/footprints/whiscash_footprint.png b/graphics/pokemon/whiscash/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/whiscash_footprint.png
+++ b/graphics/pokemon/whiscash/footprint.png
diff --git a/graphics/pokemon/front_pics/whiscash_still_front_pic.png b/graphics/pokemon/whiscash/front.png
index 1262d3af8..1262d3af8 100644
--- a/graphics/pokemon/front_pics/whiscash_still_front_pic.png
+++ b/graphics/pokemon/whiscash/front.png
diff --git a/graphics/pokemon/icons/whiscash_icon.png b/graphics/pokemon/whiscash/icon.png
index dcd79a540..dcd79a540 100644
--- a/graphics/pokemon/icons/whiscash_icon.png
+++ b/graphics/pokemon/whiscash/icon.png
diff --git a/graphics/pokemon/palettes/whiscash_palette.pal b/graphics/pokemon/whiscash/normal.pal
index c6b70659b..c6b70659b 100644
--- a/graphics/pokemon/palettes/whiscash_palette.pal
+++ b/graphics/pokemon/whiscash/normal.pal
diff --git a/graphics/pokemon/palettes/whiscash_shiny_palette.pal b/graphics/pokemon/whiscash/shiny.pal
index 12554c568..12554c568 100644
--- a/graphics/pokemon/palettes/whiscash_shiny_palette.pal
+++ b/graphics/pokemon/whiscash/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/whismur_front_pic.png b/graphics/pokemon/whismur/anim_front.png
index 0770894e4..0770894e4 100644
--- a/graphics/pokemon/anim_front_pics/whismur_front_pic.png
+++ b/graphics/pokemon/whismur/anim_front.png
diff --git a/graphics/pokemon/back_pics/whismur_back_pic.png b/graphics/pokemon/whismur/back.png
index f13819f15..f13819f15 100644
--- a/graphics/pokemon/back_pics/whismur_back_pic.png
+++ b/graphics/pokemon/whismur/back.png
diff --git a/graphics/pokemon/footprints/whismur_footprint.png b/graphics/pokemon/whismur/footprint.png
index a2ad42b4c..a2ad42b4c 100644
--- a/graphics/pokemon/footprints/whismur_footprint.png
+++ b/graphics/pokemon/whismur/footprint.png
diff --git a/graphics/pokemon/front_pics/whismur_still_front_pic.png b/graphics/pokemon/whismur/front.png
index d12369e26..d12369e26 100644
--- a/graphics/pokemon/front_pics/whismur_still_front_pic.png
+++ b/graphics/pokemon/whismur/front.png
diff --git a/graphics/pokemon/icons/whismur_icon.png b/graphics/pokemon/whismur/icon.png
index 573dfa531..573dfa531 100644
--- a/graphics/pokemon/icons/whismur_icon.png
+++ b/graphics/pokemon/whismur/icon.png
diff --git a/graphics/pokemon/palettes/whismur_palette.pal b/graphics/pokemon/whismur/normal.pal
index e57bb7b39..e57bb7b39 100644
--- a/graphics/pokemon/palettes/whismur_palette.pal
+++ b/graphics/pokemon/whismur/normal.pal
diff --git a/graphics/pokemon/palettes/whismur_shiny_palette.pal b/graphics/pokemon/whismur/shiny.pal
index 395867cad..395867cad 100644
--- a/graphics/pokemon/palettes/whismur_shiny_palette.pal
+++ b/graphics/pokemon/whismur/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wigglytuff_front_pic.png b/graphics/pokemon/wigglytuff/anim_front.png
index 66af6ce77..66af6ce77 100644
--- a/graphics/pokemon/anim_front_pics/wigglytuff_front_pic.png
+++ b/graphics/pokemon/wigglytuff/anim_front.png
diff --git a/graphics/pokemon/back_pics/wigglytuff_back_pic.png b/graphics/pokemon/wigglytuff/back.png
index c57f8681f..c57f8681f 100644
--- a/graphics/pokemon/back_pics/wigglytuff_back_pic.png
+++ b/graphics/pokemon/wigglytuff/back.png
diff --git a/graphics/pokemon/footprints/wigglytuff_footprint.png b/graphics/pokemon/wigglytuff/footprint.png
index 68ce8eda3..68ce8eda3 100644
--- a/graphics/pokemon/footprints/wigglytuff_footprint.png
+++ b/graphics/pokemon/wigglytuff/footprint.png
diff --git a/graphics/pokemon/front_pics/wigglytuff_still_front_pic.png b/graphics/pokemon/wigglytuff/front.png
index 8bf2ed2f5..8bf2ed2f5 100644
--- a/graphics/pokemon/front_pics/wigglytuff_still_front_pic.png
+++ b/graphics/pokemon/wigglytuff/front.png
diff --git a/graphics/pokemon/icons/wigglytuff_icon.png b/graphics/pokemon/wigglytuff/icon.png
index adb921150..adb921150 100644
--- a/graphics/pokemon/icons/wigglytuff_icon.png
+++ b/graphics/pokemon/wigglytuff/icon.png
diff --git a/graphics/pokemon/palettes/wigglytuff_palette.pal b/graphics/pokemon/wigglytuff/normal.pal
index b0b85cc79..b0b85cc79 100644
--- a/graphics/pokemon/palettes/wigglytuff_palette.pal
+++ b/graphics/pokemon/wigglytuff/normal.pal
diff --git a/graphics/pokemon/palettes/wigglytuff_shiny_palette.pal b/graphics/pokemon/wigglytuff/shiny.pal
index f3d0192a2..f3d0192a2 100644
--- a/graphics/pokemon/palettes/wigglytuff_shiny_palette.pal
+++ b/graphics/pokemon/wigglytuff/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wingull_front_pic.png b/graphics/pokemon/wingull/anim_front.png
index 69ef9d7d0..69ef9d7d0 100644
--- a/graphics/pokemon/anim_front_pics/wingull_front_pic.png
+++ b/graphics/pokemon/wingull/anim_front.png
diff --git a/graphics/pokemon/back_pics/wingull_back_pic.png b/graphics/pokemon/wingull/back.png
index 3ea8c6474..3ea8c6474 100644
--- a/graphics/pokemon/back_pics/wingull_back_pic.png
+++ b/graphics/pokemon/wingull/back.png
diff --git a/graphics/pokemon/footprints/wingull_footprint.png b/graphics/pokemon/wingull/footprint.png
index 057b2cefa..057b2cefa 100644
--- a/graphics/pokemon/footprints/wingull_footprint.png
+++ b/graphics/pokemon/wingull/footprint.png
diff --git a/graphics/pokemon/front_pics/wingull_still_front_pic.png b/graphics/pokemon/wingull/front.png
index 4d1b16ece..4d1b16ece 100644
--- a/graphics/pokemon/front_pics/wingull_still_front_pic.png
+++ b/graphics/pokemon/wingull/front.png
diff --git a/graphics/pokemon/icons/wingull_icon.png b/graphics/pokemon/wingull/icon.png
index 524ecda23..524ecda23 100644
--- a/graphics/pokemon/icons/wingull_icon.png
+++ b/graphics/pokemon/wingull/icon.png
diff --git a/graphics/pokemon/palettes/wingull_palette.pal b/graphics/pokemon/wingull/normal.pal
index ce5820061..ce5820061 100644
--- a/graphics/pokemon/palettes/wingull_palette.pal
+++ b/graphics/pokemon/wingull/normal.pal
diff --git a/graphics/pokemon/palettes/wingull_shiny_palette.pal b/graphics/pokemon/wingull/shiny.pal
index 59785b7cb..59785b7cb 100644
--- a/graphics/pokemon/palettes/wingull_shiny_palette.pal
+++ b/graphics/pokemon/wingull/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wobbuffet_front_pic.png b/graphics/pokemon/wobbuffet/anim_front.png
index f26a0406d..f26a0406d 100644
--- a/graphics/pokemon/anim_front_pics/wobbuffet_front_pic.png
+++ b/graphics/pokemon/wobbuffet/anim_front.png
diff --git a/graphics/pokemon/back_pics/wobbuffet_back_pic.png b/graphics/pokemon/wobbuffet/back.png
index 3f22dd4a1..3f22dd4a1 100644
--- a/graphics/pokemon/back_pics/wobbuffet_back_pic.png
+++ b/graphics/pokemon/wobbuffet/back.png
diff --git a/graphics/pokemon/footprints/wobbuffet_footprint.png b/graphics/pokemon/wobbuffet/footprint.png
index 49fa6818d..49fa6818d 100644
--- a/graphics/pokemon/footprints/wobbuffet_footprint.png
+++ b/graphics/pokemon/wobbuffet/footprint.png
diff --git a/graphics/pokemon/front_pics/wobbuffet_still_front_pic.png b/graphics/pokemon/wobbuffet/front.png
index 0e3f39ae1..0e3f39ae1 100644
--- a/graphics/pokemon/front_pics/wobbuffet_still_front_pic.png
+++ b/graphics/pokemon/wobbuffet/front.png
diff --git a/graphics/pokemon/icons/wobbuffet_icon.png b/graphics/pokemon/wobbuffet/icon.png
index 14cddd184..14cddd184 100644
--- a/graphics/pokemon/icons/wobbuffet_icon.png
+++ b/graphics/pokemon/wobbuffet/icon.png
diff --git a/graphics/pokemon/palettes/wobbuffet_palette.pal b/graphics/pokemon/wobbuffet/normal.pal
index e83cdc8c2..e83cdc8c2 100644
--- a/graphics/pokemon/palettes/wobbuffet_palette.pal
+++ b/graphics/pokemon/wobbuffet/normal.pal
diff --git a/graphics/pokemon/palettes/wobbuffet_shiny_palette.pal b/graphics/pokemon/wobbuffet/shiny.pal
index 0fa077555..0fa077555 100644
--- a/graphics/pokemon/palettes/wobbuffet_shiny_palette.pal
+++ b/graphics/pokemon/wobbuffet/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wooper_front_pic.png b/graphics/pokemon/wooper/anim_front.png
index 8d6255f80..8d6255f80 100644
--- a/graphics/pokemon/anim_front_pics/wooper_front_pic.png
+++ b/graphics/pokemon/wooper/anim_front.png
diff --git a/graphics/pokemon/back_pics/wooper_back_pic.png b/graphics/pokemon/wooper/back.png
index 13cb768c1..13cb768c1 100644
--- a/graphics/pokemon/back_pics/wooper_back_pic.png
+++ b/graphics/pokemon/wooper/back.png
diff --git a/graphics/pokemon/footprints/wooper_footprint.png b/graphics/pokemon/wooper/footprint.png
index 5e1ba56e6..5e1ba56e6 100644
--- a/graphics/pokemon/footprints/wooper_footprint.png
+++ b/graphics/pokemon/wooper/footprint.png
diff --git a/graphics/pokemon/front_pics/wooper_still_front_pic.png b/graphics/pokemon/wooper/front.png
index 4562b0baa..4562b0baa 100644
--- a/graphics/pokemon/front_pics/wooper_still_front_pic.png
+++ b/graphics/pokemon/wooper/front.png
diff --git a/graphics/pokemon/icons/wooper_icon.png b/graphics/pokemon/wooper/icon.png
index 26e617d33..26e617d33 100644
--- a/graphics/pokemon/icons/wooper_icon.png
+++ b/graphics/pokemon/wooper/icon.png
diff --git a/graphics/pokemon/palettes/wooper_palette.pal b/graphics/pokemon/wooper/normal.pal
index f364d6c71..f364d6c71 100644
--- a/graphics/pokemon/palettes/wooper_palette.pal
+++ b/graphics/pokemon/wooper/normal.pal
diff --git a/graphics/pokemon/palettes/wooper_shiny_palette.pal b/graphics/pokemon/wooper/shiny.pal
index cf0a3ce59..cf0a3ce59 100644
--- a/graphics/pokemon/palettes/wooper_shiny_palette.pal
+++ b/graphics/pokemon/wooper/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wurmple_front_pic.png b/graphics/pokemon/wurmple/anim_front.png
index c79458bff..c79458bff 100644
--- a/graphics/pokemon/anim_front_pics/wurmple_front_pic.png
+++ b/graphics/pokemon/wurmple/anim_front.png
diff --git a/graphics/pokemon/back_pics/wurmple_back_pic.png b/graphics/pokemon/wurmple/back.png
index d6ef56dcd..d6ef56dcd 100644
--- a/graphics/pokemon/back_pics/wurmple_back_pic.png
+++ b/graphics/pokemon/wurmple/back.png
diff --git a/graphics/pokemon/footprints/wurmple_footprint.png b/graphics/pokemon/wurmple/footprint.png
index 3ac4abd9f..3ac4abd9f 100644
--- a/graphics/pokemon/footprints/wurmple_footprint.png
+++ b/graphics/pokemon/wurmple/footprint.png
diff --git a/graphics/pokemon/front_pics/wurmple_still_front_pic.png b/graphics/pokemon/wurmple/front.png
index 86d8bc06a..86d8bc06a 100644
--- a/graphics/pokemon/front_pics/wurmple_still_front_pic.png
+++ b/graphics/pokemon/wurmple/front.png
diff --git a/graphics/pokemon/icons/wurmple_icon.png b/graphics/pokemon/wurmple/icon.png
index 52b46b490..52b46b490 100644
--- a/graphics/pokemon/icons/wurmple_icon.png
+++ b/graphics/pokemon/wurmple/icon.png
diff --git a/graphics/pokemon/palettes/wurmple_palette.pal b/graphics/pokemon/wurmple/normal.pal
index 2fe1fd189..2fe1fd189 100644
--- a/graphics/pokemon/palettes/wurmple_palette.pal
+++ b/graphics/pokemon/wurmple/normal.pal
diff --git a/graphics/pokemon/palettes/wurmple_shiny_palette.pal b/graphics/pokemon/wurmple/shiny.pal
index 3217ddc57..3217ddc57 100644
--- a/graphics/pokemon/palettes/wurmple_shiny_palette.pal
+++ b/graphics/pokemon/wurmple/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/wynaut_front_pic.png b/graphics/pokemon/wynaut/anim_front.png
index 0fe27ffed..0fe27ffed 100644
--- a/graphics/pokemon/anim_front_pics/wynaut_front_pic.png
+++ b/graphics/pokemon/wynaut/anim_front.png
diff --git a/graphics/pokemon/back_pics/wynaut_back_pic.png b/graphics/pokemon/wynaut/back.png
index 388b1582b..388b1582b 100644
--- a/graphics/pokemon/back_pics/wynaut_back_pic.png
+++ b/graphics/pokemon/wynaut/back.png
diff --git a/graphics/pokemon/footprints/wynaut_footprint.png b/graphics/pokemon/wynaut/footprint.png
index 4fe4832c0..4fe4832c0 100644
--- a/graphics/pokemon/footprints/wynaut_footprint.png
+++ b/graphics/pokemon/wynaut/footprint.png
diff --git a/graphics/pokemon/front_pics/wynaut_still_front_pic.png b/graphics/pokemon/wynaut/front.png
index 7b1be29f0..7b1be29f0 100644
--- a/graphics/pokemon/front_pics/wynaut_still_front_pic.png
+++ b/graphics/pokemon/wynaut/front.png
diff --git a/graphics/pokemon/icons/wynaut_icon.png b/graphics/pokemon/wynaut/icon.png
index cca26e1bb..cca26e1bb 100644
--- a/graphics/pokemon/icons/wynaut_icon.png
+++ b/graphics/pokemon/wynaut/icon.png
diff --git a/graphics/pokemon/palettes/wynaut_palette.pal b/graphics/pokemon/wynaut/normal.pal
index c37046634..c37046634 100644
--- a/graphics/pokemon/palettes/wynaut_palette.pal
+++ b/graphics/pokemon/wynaut/normal.pal
diff --git a/graphics/pokemon/palettes/wynaut_shiny_palette.pal b/graphics/pokemon/wynaut/shiny.pal
index 7a5032aa6..7a5032aa6 100644
--- a/graphics/pokemon/palettes/wynaut_shiny_palette.pal
+++ b/graphics/pokemon/wynaut/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/xatu_front_pic.png b/graphics/pokemon/xatu/anim_front.png
index d4c3c1970..d4c3c1970 100644
--- a/graphics/pokemon/anim_front_pics/xatu_front_pic.png
+++ b/graphics/pokemon/xatu/anim_front.png
diff --git a/graphics/pokemon/back_pics/xatu_back_pic.png b/graphics/pokemon/xatu/back.png
index b66774b13..b66774b13 100644
--- a/graphics/pokemon/back_pics/xatu_back_pic.png
+++ b/graphics/pokemon/xatu/back.png
diff --git a/graphics/pokemon/footprints/xatu_footprint.png b/graphics/pokemon/xatu/footprint.png
index 44fcad1e3..44fcad1e3 100644
--- a/graphics/pokemon/footprints/xatu_footprint.png
+++ b/graphics/pokemon/xatu/footprint.png
diff --git a/graphics/pokemon/front_pics/xatu_still_front_pic.png b/graphics/pokemon/xatu/front.png
index 138550b54..138550b54 100644
--- a/graphics/pokemon/front_pics/xatu_still_front_pic.png
+++ b/graphics/pokemon/xatu/front.png
diff --git a/graphics/pokemon/icons/xatu_icon.png b/graphics/pokemon/xatu/icon.png
index a0e6d6fc9..a0e6d6fc9 100644
--- a/graphics/pokemon/icons/xatu_icon.png
+++ b/graphics/pokemon/xatu/icon.png
diff --git a/graphics/pokemon/palettes/xatu_palette.pal b/graphics/pokemon/xatu/normal.pal
index b6ab27604..b6ab27604 100644
--- a/graphics/pokemon/palettes/xatu_palette.pal
+++ b/graphics/pokemon/xatu/normal.pal
diff --git a/graphics/pokemon/palettes/xatu_shiny_palette.pal b/graphics/pokemon/xatu/shiny.pal
index 2dcf957e9..2dcf957e9 100644
--- a/graphics/pokemon/palettes/xatu_shiny_palette.pal
+++ b/graphics/pokemon/xatu/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/yanma_front_pic.png b/graphics/pokemon/yanma/anim_front.png
index 24721e872..24721e872 100644
--- a/graphics/pokemon/anim_front_pics/yanma_front_pic.png
+++ b/graphics/pokemon/yanma/anim_front.png
diff --git a/graphics/pokemon/back_pics/yanma_back_pic.png b/graphics/pokemon/yanma/back.png
index 980bc86f2..980bc86f2 100644
--- a/graphics/pokemon/back_pics/yanma_back_pic.png
+++ b/graphics/pokemon/yanma/back.png
diff --git a/graphics/pokemon/footprints/yanma_footprint.png b/graphics/pokemon/yanma/footprint.png
index 20b4a00b0..20b4a00b0 100644
--- a/graphics/pokemon/footprints/yanma_footprint.png
+++ b/graphics/pokemon/yanma/footprint.png
diff --git a/graphics/pokemon/front_pics/yanma_still_front_pic.png b/graphics/pokemon/yanma/front.png
index 534e873a1..534e873a1 100644
--- a/graphics/pokemon/front_pics/yanma_still_front_pic.png
+++ b/graphics/pokemon/yanma/front.png
diff --git a/graphics/pokemon/icons/yanma_icon.png b/graphics/pokemon/yanma/icon.png
index 336841a00..336841a00 100644
--- a/graphics/pokemon/icons/yanma_icon.png
+++ b/graphics/pokemon/yanma/icon.png
diff --git a/graphics/pokemon/palettes/yanma_palette.pal b/graphics/pokemon/yanma/normal.pal
index a53cd19e3..a53cd19e3 100644
--- a/graphics/pokemon/palettes/yanma_palette.pal
+++ b/graphics/pokemon/yanma/normal.pal
diff --git a/graphics/pokemon/palettes/yanma_shiny_palette.pal b/graphics/pokemon/yanma/shiny.pal
index 08b7c0cce..08b7c0cce 100644
--- a/graphics/pokemon/palettes/yanma_shiny_palette.pal
+++ b/graphics/pokemon/yanma/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/zangoose_front_pic.png b/graphics/pokemon/zangoose/anim_front.png
index 24bb548dd..24bb548dd 100644
--- a/graphics/pokemon/anim_front_pics/zangoose_front_pic.png
+++ b/graphics/pokemon/zangoose/anim_front.png
diff --git a/graphics/pokemon/back_pics/zangoose_back_pic.png b/graphics/pokemon/zangoose/back.png
index 88357e182..88357e182 100644
--- a/graphics/pokemon/back_pics/zangoose_back_pic.png
+++ b/graphics/pokemon/zangoose/back.png
diff --git a/graphics/pokemon/footprints/zangoose_footprint.png b/graphics/pokemon/zangoose/footprint.png
index e07e58cee..e07e58cee 100644
--- a/graphics/pokemon/footprints/zangoose_footprint.png
+++ b/graphics/pokemon/zangoose/footprint.png
diff --git a/graphics/pokemon/front_pics/zangoose_still_front_pic.png b/graphics/pokemon/zangoose/front.png
index b95a412bf..b95a412bf 100644
--- a/graphics/pokemon/front_pics/zangoose_still_front_pic.png
+++ b/graphics/pokemon/zangoose/front.png
diff --git a/graphics/pokemon/icons/zangoose_icon.png b/graphics/pokemon/zangoose/icon.png
index e0485b0b0..e0485b0b0 100644
--- a/graphics/pokemon/icons/zangoose_icon.png
+++ b/graphics/pokemon/zangoose/icon.png
diff --git a/graphics/pokemon/palettes/zangoose_palette.pal b/graphics/pokemon/zangoose/normal.pal
index eb0ef7068..eb0ef7068 100644
--- a/graphics/pokemon/palettes/zangoose_palette.pal
+++ b/graphics/pokemon/zangoose/normal.pal
diff --git a/graphics/pokemon/palettes/zangoose_shiny_palette.pal b/graphics/pokemon/zangoose/shiny.pal
index 82487aa4f..82487aa4f 100644
--- a/graphics/pokemon/palettes/zangoose_shiny_palette.pal
+++ b/graphics/pokemon/zangoose/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/zapdos_front_pic.png b/graphics/pokemon/zapdos/anim_front.png
index a27b64e00..a27b64e00 100644
--- a/graphics/pokemon/anim_front_pics/zapdos_front_pic.png
+++ b/graphics/pokemon/zapdos/anim_front.png
diff --git a/graphics/pokemon/back_pics/zapdos_back_pic.png b/graphics/pokemon/zapdos/back.png
index 248366dc5..248366dc5 100644
--- a/graphics/pokemon/back_pics/zapdos_back_pic.png
+++ b/graphics/pokemon/zapdos/back.png
diff --git a/graphics/pokemon/footprints/zapdos_footprint.png b/graphics/pokemon/zapdos/footprint.png
index 480063a88..480063a88 100644
--- a/graphics/pokemon/footprints/zapdos_footprint.png
+++ b/graphics/pokemon/zapdos/footprint.png
diff --git a/graphics/pokemon/front_pics/zapdos_still_front_pic.png b/graphics/pokemon/zapdos/front.png
index e8b8b929d..e8b8b929d 100644
--- a/graphics/pokemon/front_pics/zapdos_still_front_pic.png
+++ b/graphics/pokemon/zapdos/front.png
diff --git a/graphics/pokemon/icons/zapdos_icon.png b/graphics/pokemon/zapdos/icon.png
index 26fc73427..26fc73427 100644
--- a/graphics/pokemon/icons/zapdos_icon.png
+++ b/graphics/pokemon/zapdos/icon.png
diff --git a/graphics/pokemon/palettes/zapdos_palette.pal b/graphics/pokemon/zapdos/normal.pal
index 5980cfed4..5980cfed4 100644
--- a/graphics/pokemon/palettes/zapdos_palette.pal
+++ b/graphics/pokemon/zapdos/normal.pal
diff --git a/graphics/pokemon/palettes/zapdos_shiny_palette.pal b/graphics/pokemon/zapdos/shiny.pal
index fb7840ebc..fb7840ebc 100644
--- a/graphics/pokemon/palettes/zapdos_shiny_palette.pal
+++ b/graphics/pokemon/zapdos/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/zigzagoon_front_pic.png b/graphics/pokemon/zigzagoon/anim_front.png
index ba726a266..ba726a266 100644
--- a/graphics/pokemon/anim_front_pics/zigzagoon_front_pic.png
+++ b/graphics/pokemon/zigzagoon/anim_front.png
diff --git a/graphics/pokemon/back_pics/zigzagoon_back_pic.png b/graphics/pokemon/zigzagoon/back.png
index cc56c5d67..cc56c5d67 100644
--- a/graphics/pokemon/back_pics/zigzagoon_back_pic.png
+++ b/graphics/pokemon/zigzagoon/back.png
diff --git a/graphics/pokemon/footprints/zigzagoon_footprint.png b/graphics/pokemon/zigzagoon/footprint.png
index d7373e064..d7373e064 100644
--- a/graphics/pokemon/footprints/zigzagoon_footprint.png
+++ b/graphics/pokemon/zigzagoon/footprint.png
diff --git a/graphics/pokemon/front_pics/zigzagoon_still_front_pic.png b/graphics/pokemon/zigzagoon/front.png
index 442a5c5aa..442a5c5aa 100644
--- a/graphics/pokemon/front_pics/zigzagoon_still_front_pic.png
+++ b/graphics/pokemon/zigzagoon/front.png
diff --git a/graphics/pokemon/icons/zigzagoon_icon.png b/graphics/pokemon/zigzagoon/icon.png
index acd0ecc8c..acd0ecc8c 100644
--- a/graphics/pokemon/icons/zigzagoon_icon.png
+++ b/graphics/pokemon/zigzagoon/icon.png
diff --git a/graphics/pokemon/palettes/zigzagoon_palette.pal b/graphics/pokemon/zigzagoon/normal.pal
index 55f6178cb..55f6178cb 100644
--- a/graphics/pokemon/palettes/zigzagoon_palette.pal
+++ b/graphics/pokemon/zigzagoon/normal.pal
diff --git a/graphics/pokemon/palettes/zigzagoon_shiny_palette.pal b/graphics/pokemon/zigzagoon/shiny.pal
index fe2d3cbc9..fe2d3cbc9 100644
--- a/graphics/pokemon/palettes/zigzagoon_shiny_palette.pal
+++ b/graphics/pokemon/zigzagoon/shiny.pal
diff --git a/graphics/pokemon/anim_front_pics/zubat_front_pic.png b/graphics/pokemon/zubat/anim_front.png
index 5f98e0c13..5f98e0c13 100644
--- a/graphics/pokemon/anim_front_pics/zubat_front_pic.png
+++ b/graphics/pokemon/zubat/anim_front.png
diff --git a/graphics/pokemon/back_pics/zubat_back_pic.png b/graphics/pokemon/zubat/back.png
index 5589e5767..5589e5767 100644
--- a/graphics/pokemon/back_pics/zubat_back_pic.png
+++ b/graphics/pokemon/zubat/back.png
diff --git a/graphics/pokemon/footprints/zubat_footprint.png b/graphics/pokemon/zubat/footprint.png
index c7ccf57f3..c7ccf57f3 100644
--- a/graphics/pokemon/footprints/zubat_footprint.png
+++ b/graphics/pokemon/zubat/footprint.png
diff --git a/graphics/pokemon/front_pics/zubat_still_front_pic.png b/graphics/pokemon/zubat/front.png
index b19d3681c..b19d3681c 100644
--- a/graphics/pokemon/front_pics/zubat_still_front_pic.png
+++ b/graphics/pokemon/zubat/front.png
diff --git a/graphics/pokemon/icons/zubat_icon.png b/graphics/pokemon/zubat/icon.png
index 696c097e1..696c097e1 100644
--- a/graphics/pokemon/icons/zubat_icon.png
+++ b/graphics/pokemon/zubat/icon.png
diff --git a/graphics/pokemon/palettes/zubat_palette.pal b/graphics/pokemon/zubat/normal.pal
index 080a3fd93..080a3fd93 100644
--- a/graphics/pokemon/palettes/zubat_palette.pal
+++ b/graphics/pokemon/zubat/normal.pal
diff --git a/graphics/pokemon/palettes/zubat_shiny_palette.pal b/graphics/pokemon/zubat/shiny.pal
index ab2540e88..ab2540e88 100644
--- a/graphics/pokemon/palettes/zubat_shiny_palette.pal
+++ b/graphics/pokemon/zubat/shiny.pal
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 0a22a711c..0516a8a4d 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -1,7 +1,4 @@
-MONSTILLFRONTGFXDIR := graphics/pokemon/front_pics
-MONBACKGFXDIR := graphics/pokemon/back_pics
-MONFRONTGFXDIR := graphics/pokemon/anim_front_pics
-MONPALDIR := graphics/pokemon/palettes
+CASTFORMGFXDIR := graphics/pokemon/castform
 TILESETGFXDIR := data/tilesets
 FONTGFXDIR := data/graphics/fonts
 INTERFACEGFXDIR := graphics/interface
@@ -24,36 +21,44 @@ MISCGFXDIR := graphics/misc
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
 contest_types := cool beauty cute smart tough
 
-$(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \
-												   $(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \
-												   $(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \
-												   $(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp
+
+
+### Castform ###
+
+$(CASTFORMGFXDIR)/front.4bpp: $(CASTFORMGFXDIR)/front_normal_form.4bpp \
+							  $(CASTFORMGFXDIR)/front_sunny_form.4bpp \
+							  $(CASTFORMGFXDIR)/front_rainy_form.4bpp \
+							  $(CASTFORMGFXDIR)/front_snowy_form.4bpp
 	@cat $^ >$@
 
-$(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \
-									  $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \
-									  $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \
-									  $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp
+$(CASTFORMGFXDIR)/back.4bpp: $(CASTFORMGFXDIR)/back_normal_form.4bpp \
+							 $(CASTFORMGFXDIR)/back_sunny_form.4bpp \
+							 $(CASTFORMGFXDIR)/back_rainy_form.4bpp \
+							 $(CASTFORMGFXDIR)/back_snowy_form.4bpp
 	@cat $^ >$@
 
-$(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \
-										$(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \
-										$(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \
-										$(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp
+$(CASTFORMGFXDIR)/anim_front.4bpp: $(CASTFORMGFXDIR)/anim_front_normal_form.4bpp \
+								   $(CASTFORMGFXDIR)/anim_front_sunny_form.4bpp \
+								   $(CASTFORMGFXDIR)/anim_front_rainy_form.4bpp \
+								   $(CASTFORMGFXDIR)/anim_front_snowy_form.4bpp
 	@cat $^ >$@
 
-$(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \
-									  $(MONPALDIR)/castform_sunny_form_palette.gbapal \
-									  $(MONPALDIR)/castform_rainy_form_palette.gbapal \
-									  $(MONPALDIR)/castform_snowy_form_palette.gbapal
+$(CASTFORMGFXDIR)/normal.gbapal: $(CASTFORMGFXDIR)/normal_normal_form.gbapal \
+								 $(CASTFORMGFXDIR)/normal_sunny_form.gbapal \
+								 $(CASTFORMGFXDIR)/normal_rainy_form.gbapal \
+								 $(CASTFORMGFXDIR)/normal_snowy_form.gbapal
 	@cat $^ >$@
 
-$(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \
-											$(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \
-											$(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \
-											$(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal
+$(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/shiny_normal_form.gbapal \
+								$(CASTFORMGFXDIR)/shiny_sunny_form.gbapal \
+								$(CASTFORMGFXDIR)/shiny_rainy_form.gbapal \
+								$(CASTFORMGFXDIR)/shiny_snowy_form.gbapal
 	@cat $^ >$@
 
+
+
+### Tilesets ###
+
 $(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 159
 
@@ -246,6 +251,10 @@ $(TILESETGFXDIR)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.pn
 $(TILESETGFXDIR)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 509
 
+
+
+### Fonts ###
+
 $(FONTGFXDIR)/font0.latfont: $(FONTGFXDIR)/font0_latin.png
 	$(GFX) $< $@
 
@@ -297,6 +306,9 @@ $(FONTGFXDIR)/unused_frlg_down_arrow.4bpp: %.4bpp: %.png
 $(FONTGFXDIR)/keypad_icons.4bpp: %.4bpp: %.png
 	$(GFX) $< $@
 
+
+
+### Miscellaneous ###
 graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
 	$(GFX) $< $@ -num_colors 224
 
@@ -310,13 +322,13 @@ $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 29
 
 $(BATINTGFXDIR)/textbox.gbapal: $(BATINTGFXDIR)/textbox_0.gbapal \
-						$(BATINTGFXDIR)/textbox_1.gbapal
+								$(BATINTGFXDIR)/textbox_1.gbapal
 	@cat $^ >$@
 
 $(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \
-						  $(BTLANMSPRGFXDIR)/010_1.4bpp \
-						  $(BTLANMSPRGFXDIR)/010_2.4bpp \
-						  $(BTLANMSPRGFXDIR)/010_3.4bpp
+						 	 $(BTLANMSPRGFXDIR)/010_1.4bpp \
+						 	 $(BTLANMSPRGFXDIR)/010_2.4bpp \
+						 	 $(BTLANMSPRGFXDIR)/010_3.4bpp
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \
@@ -340,8 +352,8 @@ $(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \
 	@cat $^ >$@
 
 $(INTERFACEGFXDIR)/hp_numbers.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \
-							$(INTERFACEGFXDIR)/numbers1.4bpp \
-							$(INTERFACEGFXDIR)/numbers2.4bpp
+									$(INTERFACEGFXDIR)/numbers1.4bpp \
+									$(INTERFACEGFXDIR)/numbers2.4bpp
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
@@ -472,6 +484,10 @@ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.
 $(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 822
 
+
+
+### PSS ###
+
 $(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 55
 
@@ -636,7 +652,11 @@ $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
 	
 $(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 43
-	
+
+
+
+### Pokenav ###
+
 $(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
 								$(PKNAVOPTIONSGFXDIR)/condition.4bpp \
 								$(PKNAVOPTIONSGFXDIR)/match_call.4bpp \
diff --git a/include/agb_flash.h b/include/agb_flash.h
index 27e45e8fa..ba5820f01 100644
--- a/include/agb_flash.h
+++ b/include/agb_flash.h
@@ -8,5 +8,7 @@
 // Exported ROM declarations
 
 u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void));
+u16 IdentifyFlash(void);
+u32 ProgramFlashSectorAndVerify(u16 sectorNum, u8 *src);
 
 #endif //GUARD_AGB_FLASH_H
diff --git a/include/battle_anim.h b/include/battle_anim.h
index d0d323216..b3350f893 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -204,6 +204,9 @@ void sub_80A718C(struct Sprite *sprite);
 #define STAT_ANIM_MULTIPLE_MINUS2 58
 void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId);
 
+// battle_anim_8170478.c
+void sub_8172EF0(u8 battler, struct Pokemon *mon);
+
 // ground.c
 void sub_81152DC(u8 taskId);
 
@@ -216,6 +219,19 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes,
 void sub_8116EB4(u8);
 void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette);
 
+// battle_anim_effects_1.c
+void sub_810310C(u8 battler, struct Sprite* sprite);
+void AnimMoveTwisterParticle(struct Sprite* sprite);
+
+// water.c
+void sub_8108C94(struct Sprite *sprite);
+
+// flying.c
+void sub_810E2C8(struct Sprite *sprite);
+
+// smokescreen.c
+u8 sub_807521C(s16 x, s16 y, u8 a3);
+
 u32 UnpackSelectedBattleAnimPalettes(s16);
 
 u8 GetBattlerSpriteFinal_Y(u8, u16, u8);
diff --git a/include/battle_tent.h b/include/battle_tent.h
index a894d4cfb..ca3faa4a6 100644
--- a/include/battle_tent.h
+++ b/include/battle_tent.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_BATTLE_TENT_H
 #define GUARD_BATTLE_TENT_H
 
-bool8 sub_81B9E94(void);
+bool8 InSlateportBattleTent(void);
 
 #endif //GUARD_BATTLE_TENT_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index f0759389f..230fbabaf 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1548,7 +1548,7 @@
 
 // Special Flags (Unknown)
 #define SPECIAL_FLAGS_START                                        0x4000
-#define FLAG_SPECIAL_FLAG_0x4000                                   0x4000
+#define FLAG_HIDE_MAP_NAME_POPUP                                   0x4000
 #define FLAG_SPECIAL_FLAG_0x4001                                   0x4001
 #define FLAG_SPECIAL_FLAG_0x4002                                   0x4002
 #define FLAG_SPECIAL_FLAG_0x4003                                   0x4003
diff --git a/include/constants/songs.h b/include/constants/songs.h
index a459edd24..14b766965 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -538,4 +538,6 @@
 
 #define MUS_ROUTE_118 0x7FFF  // map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic().
 
+#define MUS_NONE 0xFFFF
+
 #endif  // GUARD_CONSTANTS_SONGS_H
diff --git a/include/contest.h b/include/contest.h
index e4391a327..8146486cb 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -478,5 +478,6 @@ bool32 sub_80FC4F4(void *, u16);
 bool8 sub_80FC55C(void);
 bool8 sub_80FC530(u8);
 u8 sub_80F86E0(u8 *);
+void sub_80FC9F8(u8 taskId);
 
 #endif //GUARD_CONTEST_H
diff --git a/include/dewford_trend.h b/include/dewford_trend.h
index 608a925f5..bdb0fc95c 100644
--- a/include/dewford_trend.h
+++ b/include/dewford_trend.h
@@ -5,5 +5,7 @@ void InitDewfordTrend(void);
 void UpdateDewfordTrendPerDay(u16);
 void UpdateDewfordTrendPerDay(u16 days);
 bool8 sub_81226D8(u16 *a);
+void ReceiveEasyChatPairsData(struct EasyChatPair *a, size_t b, u8 unused);
+
 
 #endif // GUARD_DEWFORDTREND_H
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 2efdc4e5d..84ac15422 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -134,5 +134,6 @@ u16 EasyChat_GetNumWordsInGroup(u8);
 u16 sub_811EE90(u16);
 void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType);
 void sub_811F8BC(void);
+void sub_811EFC0(u8 additionalPhraseId);
 
 #endif // GUARD_EASYCHAT_H
diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h
index 59532fdcb..2f09ad36a 100644
--- a/include/event_obj_lock.h
+++ b/include/event_obj_lock.h
@@ -7,5 +7,6 @@ bool8 sub_809847C(void);
 void LockSelectedEventObject(void);
 void sub_8098630(void);
 bool8 sub_8098734(void);
+void ScriptUnfreezeEventObjects(void);
 
 #endif // GUARD_EVENT_OBJ_LOCK_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 284bbe8db..63ac09f2d 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -193,6 +193,9 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible);
 s16 sub_809773C(s16 a1);
 s16 sub_8097728(s16 a1);
 void CameraObjectReset2(void);
+u8 EventObjectGetBerryTreeId(u8 eventObjectId);
+void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
+bool8 IsBerryTreeSparkling(u8, u8, u8);
 
 void MovementType_None(struct Sprite *);
 void MovementType_LookAround(struct Sprite *);
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 738cceb3e..feb20cef6 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -39,5 +39,6 @@ int SetCableClubWarp(void);
 u8 TrySetDiveWarp(void);
 const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction);
 u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position);
+void ClearPoisonStepCounter(void);
 
 #endif // GUARD_FIELDCONTROLAVATAR_H
diff --git a/include/field_effect.h b/include/field_effect.h
index 205dbb68a..1f5f4ee29 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -36,6 +36,10 @@ bool8 FieldEffectCmd_end(u8 **script, u32 *val);
 bool8 FieldEffectCmd_loadgfx_callnative(u8 **script, u32 *val);
 bool8 FieldEffectCmd_loadtiles_callnative(u8 **script, u32 *val);
 bool8 FieldEffectCmd_loadfadedpal_callnative(u8 **script, u32 *val);
+void sub_80B6B68(void);
+void sub_80B6E4C(u8 a0, u8 priority);
+void sub_80B75D8(u8 priority);
+void sub_80B7A74(u8 priority);
 
 void sub_80B9C28(s16*, u8);
 void sub_80B9C54(s16*, u8);
@@ -47,5 +51,6 @@ void sub_80B7A58(struct Sprite*);
 void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
 void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);
 u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority);
+void StartEscapeRopeFieldEffect(void);
 
 #endif //GUARD_FIELD_EFFECTS_H
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 6022467e4..6ea9771e6 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -34,5 +34,6 @@ void UpdateSparkleFieldEffect(struct Sprite*);
 void SetSpriteInvisible(u8 spriteId);
 void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
 void sub_8155604(u8 spriteId, u8 value, s16 data1);
+void sub_81555D8(u8 spriteId, u8 value);
 
 #endif //GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 45cd0dbd9..ca3d41546 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -63,5 +63,15 @@ u8 sub_808BCD0(void);
 void sub_808B578(void);
 u8 GetFRLGAvatarGraphicsIdByGender(u8);
 u8 GetRSAvatarGraphicsIdByGender(u8);
+void sub_808B980(u8 direction);
+void sub_808B9BC(u8 direction);
+void sub_808B9A4(u8 direction);
+void sub_808C1B4(u8 direction);
+void sub_808B9D4(u8 direction);
+void sub_808D194(void);
+void sub_808D1C8(void);
+bool32 sub_808D1B4(void);
+bool32 sub_808D1E8(void);
+void sub_808C0A8(u8 a);
 
 #endif // GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index a1cf580cd..a62a76b2a 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -41,5 +41,6 @@ void sub_80B0534(void);
 void sub_80B058C(void);
 void sub_80B05B4(void);
 void WriteFlashScanlineEffectBuffer(u8 flashLevel);
+bool8 walkrun_is_standing_still(void);
 
 #endif // GUARD_FIELD_SCREEN_EFFECT_H
diff --git a/include/field_special_scene.h b/include/field_special_scene.h
index 240e9ecb6..2219c9433 100644
--- a/include/field_special_scene.h
+++ b/include/field_special_scene.h
@@ -10,5 +10,6 @@ void Task_HandleTruckSequence(u8 taskId);
 void ExecuteTruckSequence(void);
 void EndTruckSequence(u8);
 void sub_80C791C(void);
+void sub_80FB768(void);
 
 #endif // GUARD_FIELD_SPECIAL_SCENE_H
diff --git a/include/field_specials.h b/include/field_specials.h
index 28e47fead..68b233074 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -26,6 +26,7 @@ void UpdateFrontierGambler(u16 a0);
 void ResetCyclingRoadChallengeData(void);
 bool8 warp0_in_pokecenter(void);
 void ResetFanClub(void);
-
+bool8 sub_813B21C(void);
+void set_unknown_box_id(u8 id);
 
 #endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 24bc4989a..bb5b0e290 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -9,6 +9,8 @@
 #define NUM_PALS_TOTAL 13
 #define MAX_MAP_DATA_SIZE 0x2800
 
+#include "main.h"
+
 extern struct BackupMapLayout gBackupMapLayout;
 
 u32 MapGridGetMetatileIdAt(int, int);
@@ -37,11 +39,16 @@ void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout);
 void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout);
 void apply_map_tileset2_palette(struct MapLayout const *mapLayout);
 void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout);
-extern void copy_map_tileset1_to_vram(const struct MapLayout *);
-extern void copy_map_tileset2_to_vram(const struct MapLayout *);
+void copy_map_tileset1_to_vram(const struct MapLayout *);
+void copy_map_tileset2_to_vram(const struct MapLayout *);
+struct MapHeader const *const mapconnection_get_mapheader(struct MapConnection *connection);
+struct MapConnection *sub_8088A8C(s16 x, s16 y);
 
 void SpriteCB_PokeballGlow(struct Sprite *);
 void SpriteCB_PokecenterMonitor(struct Sprite *);
 void SpriteCB_HallOfFameMonitor(struct Sprite *);
 
+// field_region_map.c
+void FieldInitRegionMap(MainCallback callback);
+
 #endif //GUARD_FIELDMAP_H
diff --git a/include/gba/types.h b/include/gba/types.h
index 3d78b5b5e..cb370c785 100644
--- a/include/gba/types.h
+++ b/include/gba/types.h
@@ -87,6 +87,29 @@ struct OamData
 #define ST_OAM_H_RECTANGLE 1
 #define ST_OAM_V_RECTANGLE 2
 
+#define ST_OAM_SIZE_0   0
+#define ST_OAM_SIZE_1   1
+#define ST_OAM_SIZE_2   2
+#define ST_OAM_SIZE_3   3
+
+#define SPRITE_SIZE_8x8     ((ST_OAM_SIZE_0 << 2) | (ST_OAM_SQUARE))
+#define SPRITE_SIZE_16x16   ((ST_OAM_SIZE_1 << 2) | (ST_OAM_SQUARE))
+#define SPRITE_SIZE_32x32   ((ST_OAM_SIZE_2 << 2) | (ST_OAM_SQUARE))
+#define SPRITE_SIZE_64x64   ((ST_OAM_SIZE_3 << 2) | (ST_OAM_SQUARE))
+
+#define SPRITE_SIZE_16x8    ((ST_OAM_SIZE_0 << 2) | (ST_OAM_H_RECTANGLE))
+#define SPRITE_SIZE_32x8    ((ST_OAM_SIZE_1 << 2) | (ST_OAM_H_RECTANGLE))
+#define SPRITE_SIZE_32x16   ((ST_OAM_SIZE_2 << 2) | (ST_OAM_H_RECTANGLE))
+#define SPRITE_SIZE_64x32   ((ST_OAM_SIZE_3 << 2) | (ST_OAM_H_RECTANGLE))
+
+#define SPRITE_SIZE_8x16    ((ST_OAM_SIZE_0 << 2) | (ST_OAM_V_RECTANGLE))
+#define SPRITE_SIZE_8x32    ((ST_OAM_SIZE_1 << 2) | (ST_OAM_V_RECTANGLE))
+#define SPRITE_SIZE_16x32   ((ST_OAM_SIZE_2 << 2) | (ST_OAM_V_RECTANGLE))
+#define SPRITE_SIZE_32x64   ((ST_OAM_SIZE_3 << 2) | (ST_OAM_V_RECTANGLE))
+
+#define SPRITE_SIZE(dim) (SPRITE_SIZE_##dim >> 2)
+#define SPRITE_SHAPE(dim) (SPRITE_SIZE_##dim & 0xFF)
+
 struct BgAffineSrcData
 {
     s32 texX;
diff --git a/include/hall_of_fame.h b/include/hall_of_fame.h
index d35ecf268..5c8a01bcb 100644
--- a/include/hall_of_fame.h
+++ b/include/hall_of_fame.h
@@ -6,4 +6,7 @@ void CB2_DoHallOfFameScreenDontSaveData(void);
 void CB2_DoHallOfFamePC(void);
 void sub_8175280(void);
 
+// hof_pc.c
+void ReturnFromHallOfFamePC(void);
+
 #endif // GUARD_HALL_OF_FAME_H
diff --git a/include/item_menu.h b/include/item_menu.h
index 2ca1af200..70d6b5a94 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -2,6 +2,7 @@
 #define GUARD_item_menu_H
 
 #include "item.h"
+#include "menu_helpers.h"
 
 #define RETURN_LOCATION_FIELD 0
 #define RETURN_LOCATION_BATTLE 1
@@ -71,6 +72,7 @@ void sub_81AAC14(void);
 void sub_81AAC50(void);
 void sub_81AAC70(void);
 void sub_81AAC28(void);
+void sub_81AABB0(void);
 void SetInitialScrollAndCursorPositions(u8 pocketId);
 void bag_menu_mail_related(void);
 void CB2_BagMenuFromStartMenu(void);
@@ -80,6 +82,11 @@ void CB2_GoToSellMenu(void);
 void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
 void DoWallyTutorialBagMenu(void);
 void ResetBagScrollPositions(void);
+void sub_81AABF0(void (*callback)(void));
+void CB2_ChooseBerry(void);
+void unknown_ItemMenu_Confirm(u8 taskId);
+void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*);
+void sub_81AB9A8(u8 pocketId);
 
 
 #endif //GUARD_item_menu_H
diff --git a/include/link.h b/include/link.h
index 83deab88f..24a834c68 100644
--- a/include/link.h
+++ b/include/link.h
@@ -261,6 +261,8 @@ void sub_800B3A4(u32 who);
 bool32 sub_800A07C(void);
 void sub_800AB98(void);
 void sub_800AA04(u8 a0);
+void sub_800B4C0(void);
+bool32 sub_800B504(void);
 
 extern u16 gLinkPartnersHeldKeys[6];
 extern u32 gLinkDebugSeed;
diff --git a/include/main.h b/include/main.h
index 2c241bf97..4f9a9e61a 100644
--- a/include/main.h
+++ b/include/main.h
@@ -68,7 +68,7 @@ void ClearPokemonCrySongs(void);
 void RestoreSerialTimer3IntrHandlers(void);
 void StartTimer1(void);
 void SeedRngAndSetTrainerId(void);
-extern u16 GetGeneratedTrainerIdLower(void);
+u16 GetGeneratedTrainerIdLower(void);
 
 
 #endif // GUARD_MAIN_H
diff --git a/include/match_call.h b/include/match_call.h
index 17d40d41c..6803d2f26 100644
--- a/include/match_call.h
+++ b/include/match_call.h
@@ -12,5 +12,9 @@ enum {
 
 s32 GetRematchIdxByTrainerIdx(s32 trainerIdx);
 void InitMatchCallCounters(void);
+bool32 TryStartMatchCall(void);
+bool32 IsMatchCallTaskActive(void);
+void StartMatchCallFromScript(u8* script);
+void sub_8197080(u8 *destStr);
 
 #endif //GUARD_MATCH_CALL_H
diff --git a/include/menu_specialized.h b/include/menu_specialized.h
index 3012ac90a..e43ea024c 100644
--- a/include/menu_specialized.h
+++ b/include/menu_specialized.h
@@ -3,6 +3,7 @@
 
 #include "player_pc.h"
 #include "list_menu.h"
+#include "pokemon.h"
 
 struct UnknownSubStruct_81D1ED4
 {
@@ -47,5 +48,6 @@ bool16 MoveRelearnerRunTextPrinters(void);
 void MoveRelearnerCreateYesNoMenu(void);
 u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices);
 void InitMoveRelearnerWindows(bool8 useContextWindow);
+void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation);
 
 #endif // GUARD_MENU_SPECIALIZED_H
\ No newline at end of file
diff --git a/include/party_menu.h b/include/party_menu.h
index e67dd56f2..413a89689 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -62,7 +62,7 @@ u8 sub_81B1B5C(const u8* str, u8 b);
 bool8 sub_81B1BD4(void);
 void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func);
 u8 pokemon_ailments_get_primary(u32 status);
-u8 sub_81B205C(struct Pokemon *mon);
+u8 GetMonAilment(struct Pokemon *mon);
 void display_pokemon_menu_message(u32 stringID);
 void sub_81B47E0(u8 taskId);
 bool8 FieldCallback_PrepareFadeInFromMenu(void);
diff --git a/include/pokedex.h b/include/pokedex.h
index 6136f7786..a1b7378bf 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -43,5 +43,7 @@ s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
 u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16);
 bool16 HasAllHoennMons(void);
 void ResetPokedexScrollPositions(void);
+u16 sub_80C0944(void);
+void CB2_Pokedex(void);
 
 #endif // GUARD_POKEDEX_H
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index 4f27ef281..c7b895028 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -23,5 +23,6 @@ void LoadMonIconPalette(u16 species);
 void sub_80D328C(struct Sprite *sprite);
 void sub_80D3014(struct Sprite *sprite);
 void sub_80D32C8(struct Sprite *sprite, u8 animNum);
+u8 sub_80D30A0(u16 species);
 
 #endif // GUARD_POKEMON_ICON_H
diff --git a/include/pokenav.h b/include/pokenav.h
index a562b0c7b..55bfb366c 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -7,5 +7,6 @@ bool8 sub_81D4A58(struct EventObject*);
 bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
 u32 sub_81D427C(void);
 void sub_81D4998(void);
+void CB2_InitPokeNav(void);
 
 #endif //GUARD_POKENAV_H
diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h
index faffd3375..ac9bbb5c3 100644
--- a/include/rom_8011DC0.h
+++ b/include/rom_8011DC0.h
@@ -17,5 +17,7 @@ u16 mevent_081445C0(u8);
 void sub_801B990(u32, u32);
 u8 sub_8013F78(void);
 bool32 sub_802C908(u16);
+void nullsub_89(u8 taskId);
+void var_800D_set_xB(void);
 
 #endif //GUARD_rom_8011DC0_H
diff --git a/include/save.h b/include/save.h
index 7ce86de70..88e5f2280 100644
--- a/include/save.h
+++ b/include/save.h
@@ -92,4 +92,7 @@ u32 TryCopySpecialSaveSection(u8 sector, u8* dst);
 u32 sub_8153634(u8 sector, u8* src);
 void sub_8153688(u8 taskId);
 
+// save_failed_screen.c
+void DoSaveFailedScreen(u8 saveType);
+
 #endif // GUARD_SAVE_H
diff --git a/include/script.h b/include/script.h
index 386b388d0..34f4635bb 100644
--- a/include/script.h
+++ b/include/script.h
@@ -61,4 +61,7 @@ bool32 sub_80991F8(void);
 u8 *sub_8099244(void);
 void sub_80992A0(u8 *script, u16 scriptSize);
 
+// srccmd.h
+void sub_809BE48(u16 npcId);
+
 #endif // GUARD_SCRIPT_H
diff --git a/include/script_menu.h b/include/script_menu.h
index a6d52c31e..1f4e549fe 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -14,5 +14,7 @@ u8 CreateWindowFromRect(u8, u8, u8, u8);
 void sub_80E2A78(u8);
 int display_text_and_get_width(const u8*, int);
 int sub_80E2D5C(int arg0, int tileWidth);
+bool16 ScrSpecial_CreatePCMenu(void);
+void ScriptMenu_DisplayPCStartupPrompt(void);
 
 #endif //GUARD_SCRIPT_MENU_H
diff --git a/include/secret_base.h b/include/secret_base.h
index 699158d0e..17efc314d 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -33,6 +33,8 @@ void sub_80E8B6C(void);
 void sub_80E8BC8(void);
 void sub_80E8D4C(void);
 void EnableBothScriptContexts(void);
+void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx);
+
 
 
 #endif //GUARD_SECRET_BASE_H
diff --git a/include/text.h b/include/text.h
index 96c5a4507..d8f2fd8a3 100644
--- a/include/text.h
+++ b/include/text.h
@@ -284,4 +284,8 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese);
 u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese);
 void DecompressGlyphFont9(u16 glyphId);
 
+// unk_text_util_2.c
+u16 Font6Func(struct TextPrinter *textPrinter);
+u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
+
 #endif // GUARD_TEXT_H
diff --git a/include/title_screen.h b/include/title_screen.h
index ad0809ed2..b7100f124 100644
--- a/include/title_screen.h
+++ b/include/title_screen.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_TITLE_SCREEN_H
 #define GUARD_TITLE_SCREEN_H
 
-extern const u16 gIntroWaterDropData[];
+extern const u16 gIntroWaterDropAlphaBlend[];
 
 void CB2_InitTitleScreen(void);
 
diff --git a/ld_script.txt b/ld_script.txt
index fa8146782..bd0bb7661 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -185,7 +185,6 @@ SECTIONS {
         src/heal_location.o(.text);
         src/region_map.o(.text);
         src/contest_painting_effects.o(.text);
-        asm/contest_painting_effects.o(.text);
         src/decoration.o(.text);
         src/slot_machine.o(.text);
         src/contest_painting.o(.text);
diff --git a/src/anim_mon_front_pics.c b/src/anim_mon_front_pics.c
index ba53ba193..b566b7760 100644
--- a/src/anim_mon_front_pics.c
+++ b/src/anim_mon_front_pics.c
@@ -1,424 +1,424 @@
 #include "global.h"
 
-const u32 gMonFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/circled_question_mark_front_pic.4bpp.lz");
+const u32 gMonFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/anim_front.4bpp.lz");
 
-const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bulbasaur_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ivysaur_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/venusaur_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/anim_front_pics/charmander_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/charmeleon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/anim_front_pics/charizard_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/squirtle_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wartortle_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/anim_front_pics/blastoise_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/anim_front_pics/caterpie_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/anim_front_pics/metapod_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/anim_front_pics/butterfree_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/weedle_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kakuna_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/beedrill_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pidgey_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pidgeotto_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pidgeot_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rattata_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/anim_front_pics/raticate_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spearow_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/fearow_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ekans_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/anim_front_pics/arbok_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pikachu_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/raichu_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sandshrew_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sandslash_front_pic.4bpp.lz");
-const u32 gMonFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoran_f_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidorina_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoqueen_front_pic.4bpp.lz");
-const u32 gMonFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoran_m_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidorino_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoking_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/clefairy_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/anim_front_pics/clefable_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vulpix_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ninetales_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jigglypuff_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wigglytuff_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zubat_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/golbat_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/oddish_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gloom_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vileplume_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/anim_front_pics/paras_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/anim_front_pics/parasect_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/venonat_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/venomoth_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/anim_front_pics/diglett_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dugtrio_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/meowth_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/anim_front_pics/persian_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/anim_front_pics/psyduck_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/anim_front_pics/golduck_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mankey_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/anim_front_pics/primeape_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/anim_front_pics/growlithe_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/anim_front_pics/arcanine_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poliwag_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poliwhirl_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poliwrath_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/abra_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kadabra_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/anim_front_pics/alakazam_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/anim_front_pics/machop_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/anim_front_pics/machoke_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/anim_front_pics/machamp_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bellsprout_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/anim_front_pics/weepinbell_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/victreebel_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tentacool_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tentacruel_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/anim_front_pics/geodude_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/anim_front_pics/graveler_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/anim_front_pics/golem_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ponyta_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rapidash_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slowpoke_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slowbro_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magnemite_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magneton_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/anim_front_pics/farfetch_d_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/doduo_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dodrio_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seel_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dewgong_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/anim_front_pics/grimer_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/anim_front_pics/muk_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shellder_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cloyster_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gastly_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/anim_front_pics/haunter_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gengar_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/anim_front_pics/onix_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/anim_front_pics/drowzee_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hypno_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/anim_front_pics/krabby_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kingler_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/anim_front_pics/voltorb_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/anim_front_pics/electrode_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/anim_front_pics/exeggcute_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/anim_front_pics/exeggutor_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cubone_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/anim_front_pics/marowak_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hitmonlee_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hitmonchan_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lickitung_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/anim_front_pics/koffing_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/anim_front_pics/weezing_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rhyhorn_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rhydon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chansey_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tangela_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kangaskhan_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/anim_front_pics/horsea_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seadra_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/anim_front_pics/goldeen_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seaking_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/staryu_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/anim_front_pics/starmie_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mr_mime_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/anim_front_pics/scyther_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jynx_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/anim_front_pics/electabuzz_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magmar_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pinsir_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tauros_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magikarp_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gyarados_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lapras_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ditto_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/anim_front_pics/eevee_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vaporeon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jolteon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/flareon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/porygon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/anim_front_pics/omanyte_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/omastar_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kabuto_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kabutops_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aerodactyl_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/anim_front_pics/snorlax_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/anim_front_pics/articuno_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zapdos_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/anim_front_pics/moltres_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dratini_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dragonair_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dragonite_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mewtwo_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mew_front_pic.4bpp.lz");
+const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/anim_front.4bpp.lz");
+const u32 gMonFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/anim_front.4bpp.lz");
+const u32 gMonFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/anim_front.4bpp.lz");
 
-const u32 gMonFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chikorita_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bayleef_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/anim_front_pics/meganium_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cyndaquil_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/anim_front_pics/quilava_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/anim_front_pics/typhlosion_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/anim_front_pics/totodile_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/anim_front_pics/croconaw_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/anim_front_pics/feraligatr_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sentret_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/anim_front_pics/furret_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hoothoot_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/noctowl_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ledyba_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ledian_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spinarak_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ariados_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/crobat_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chinchou_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lanturn_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pichu_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cleffa_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/igglybuff_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/anim_front_pics/togepi_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/anim_front_pics/togetic_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/natu_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/xatu_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mareep_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/flaaffy_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ampharos_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bellossom_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/marill_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/azumarill_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sudowoodo_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/anim_front_pics/politoed_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hoppip_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/skiploom_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jumpluff_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aipom_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sunkern_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sunflora_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/anim_front_pics/yanma_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wooper_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/anim_front_pics/quagsire_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/espeon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/umbreon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/murkrow_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slowking_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/anim_front_pics/misdreavus_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_a_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wobbuffet_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/anim_front_pics/girafarig_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pineco_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/anim_front_pics/forretress_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dunsparce_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gligar_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/anim_front_pics/steelix_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/snubbull_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/granbull_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/qwilfish_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/anim_front_pics/scizor_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shuckle_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/anim_front_pics/heracross_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sneasel_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/anim_front_pics/teddiursa_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ursaring_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slugma_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magcargo_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swinub_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/anim_front_pics/piloswine_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/anim_front_pics/corsola_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/anim_front_pics/remoraid_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/anim_front_pics/octillery_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/anim_front_pics/delibird_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mantine_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/anim_front_pics/skarmory_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/anim_front_pics/houndour_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/houndoom_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kingdra_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/phanpy_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/anim_front_pics/donphan_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/anim_front_pics/porygon2_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/anim_front_pics/stantler_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/smeargle_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tyrogue_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hitmontop_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/anim_front_pics/smoochum_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/anim_front_pics/elekid_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magby_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/anim_front_pics/miltank_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/blissey_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/anim_front_pics/raikou_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/anim_front_pics/entei_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/anim_front_pics/suicune_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/larvitar_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pupitar_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tyranitar_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lugia_front_pic.4bpp.lz");
-const u32 gMonFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ho_oh_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/anim_front_pics/celebi_front_pic.4bpp.lz");
+const u32 gMonFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/anim_front.4bpp.lz");
+const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/anim_front_a.4bpp.lz");
+const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/anim_front.4bpp.lz");
+const u32 gMonFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/anim_front.4bpp.lz");
 
-const u32 gMonFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/double_question_mark_front_pic.4bpp.lz");
+const u32 gMonFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/anim_front.4bpp.lz");
 
-const u32 gMonFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/anim_front_pics/treecko_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/grovyle_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sceptile_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/anim_front_pics/torchic_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/anim_front_pics/combusken_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/anim_front_pics/blaziken_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mudkip_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/anim_front_pics/marshtomp_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swampert_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poochyena_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mightyena_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zigzagoon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/anim_front_pics/linoone_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wurmple_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/silcoon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/anim_front_pics/beautifly_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cascoon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dustox_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lotad_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lombre_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ludicolo_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seedot_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nuzleaf_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shiftry_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nincada_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ninjask_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shedinja_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/taillow_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swellow_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shroomish_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/breloom_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spinda_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wingull_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pelipper_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/anim_front_pics/surskit_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/anim_front_pics/masquerain_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wailmer_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wailord_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/anim_front_pics/skitty_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/anim_front_pics/delcatty_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kecleon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/baltoy_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/anim_front_pics/claydol_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nosepass_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/anim_front_pics/torkoal_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sableye_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/anim_front_pics/barboach_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/anim_front_pics/whiscash_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/anim_front_pics/luvdisc_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/corphish_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/anim_front_pics/crawdaunt_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/anim_front_pics/feebas_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/anim_front_pics/milotic_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/anim_front_pics/carvanha_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sharpedo_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/anim_front_pics/trapinch_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vibrava_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/flygon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/anim_front_pics/makuhita_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hariyama_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/anim_front_pics/electrike_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/anim_front_pics/manectric_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/numel_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/anim_front_pics/camerupt_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spheal_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sealeo_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/anim_front_pics/walrein_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cacnea_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cacturne_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/anim_front_pics/snorunt_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/anim_front_pics/glalie_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lunatone_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/anim_front_pics/solrock_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/azurill_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spoink_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/anim_front_pics/grumpig_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/plusle_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/anim_front_pics/minun_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mawile_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/anim_front_pics/meditite_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/anim_front_pics/medicham_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swablu_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/anim_front_pics/altaria_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wynaut_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/duskull_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dusclops_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/anim_front_pics/roselia_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slakoth_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vigoroth_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slaking_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gulpin_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swalot_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tropius_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/whismur_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/anim_front_pics/loudred_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/anim_front_pics/exploud_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/clamperl_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/anim_front_pics/huntail_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gorebyss_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/anim_front_pics/absol_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shuppet_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/anim_front_pics/banette_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seviper_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zangoose_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/relicanth_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aron_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lairon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aggron_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/anim_front_pics/castform_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/volbeat_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/anim_front_pics/illumise_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lileep_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cradily_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anim_front_pics/anorith_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/armaldo_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ralts_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kirlia_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gardevoir_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bagon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shelgon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/anim_front_pics/salamence_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/anim_front_pics/beldum_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/anim_front_pics/metang_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/anim_front_pics/metagross_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/anim_front_pics/regirock_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/anim_front_pics/regice_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/registeel_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kyogre_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/groudon_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rayquaza_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/anim_front_pics/latias_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/anim_front_pics/latios_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jirachi_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/anim_front_pics/deoxys_front_pic.4bpp.lz");
-const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chimecho_front_pic.4bpp.lz");
+const u32 gMonFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front.4bpp.lz");
+const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/anim_front.4bpp.lz");
 
-const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/anim_front_pics/egg_front_pic.4bpp.lz");
+const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz");
 
-const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_b_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_c_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_d_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_e_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_f_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_g_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_h_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_i_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_j_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_k_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_l_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_m_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_n_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_o_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_p_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_q_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_r_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_s_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_t_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_u_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_v_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_w_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_x_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_y_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_z_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_exclamation_mark_front_pic.4bpp.lz");
-const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_question_mark_front_pic.4bpp.lz");
+const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/anim_front_b.4bpp.lz");
+const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/anim_front_c.4bpp.lz");
+const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/anim_front_d.4bpp.lz");
+const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/anim_front_e.4bpp.lz");
+const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/anim_front_f.4bpp.lz");
+const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/anim_front_g.4bpp.lz");
+const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/anim_front_h.4bpp.lz");
+const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/anim_front_i.4bpp.lz");
+const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_j.4bpp.lz");
+const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/anim_front_k.4bpp.lz");
+const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/anim_front_l.4bpp.lz");
+const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/anim_front_m.4bpp.lz");
+const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/anim_front_n.4bpp.lz");
+const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/anim_front_o.4bpp.lz");
+const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/anim_front_p.4bpp.lz");
+const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_q.4bpp.lz");
+const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/anim_front_r.4bpp.lz");
+const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/anim_front_s.4bpp.lz");
+const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/anim_front_t.4bpp.lz");
+const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/anim_front_u.4bpp.lz");
+const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/anim_front_v.4bpp.lz");
+const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/anim_front_w.4bpp.lz");
+const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/anim_front_x.4bpp.lz");
+const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/anim_front_y.4bpp.lz");
+const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_z.4bpp.lz");
+const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/anim_front_exclamation_mark.4bpp.lz");
+const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/anim_front_question_mark.4bpp.lz");
diff --git a/src/battle_anim.c b/src/battle_anim.c
index f1cff1de2..31ff11ee8 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -119,8 +119,8 @@ const struct OamData gUnknown_08524904 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .priority = 2,
 };
 
@@ -129,8 +129,8 @@ const struct OamData gUnknown_0852490C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2,
 };
 
@@ -138,8 +138,8 @@ const struct OamData gUnknown_08524914 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 2,
 };
 
@@ -147,8 +147,8 @@ const struct OamData gUnknown_0852491C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 2,
 };
 
@@ -156,8 +156,8 @@ const struct OamData gUnknown_08524924 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(16x8),
+    .size = SPRITE_SIZE(16x8),
     .priority = 2,
 };
 
@@ -165,8 +165,8 @@ const struct OamData gUnknown_0852492C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(32x8),
+    .size = SPRITE_SIZE(32x8),
     .priority = 2,
 };
 
@@ -174,8 +174,8 @@ const struct OamData gUnknown_08524934 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 2,
 };
 
@@ -183,8 +183,8 @@ const struct OamData gUnknown_0852493C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 2,
 };
 
@@ -192,8 +192,8 @@ const struct OamData gUnknown_08524944 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x16),
+    .size = SPRITE_SIZE(8x16),
     .priority = 2,
 };
 
@@ -201,8 +201,8 @@ const struct OamData gUnknown_0852494C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(8x32),
+    .size = SPRITE_SIZE(8x32),
     .priority = 2,
 };
 
@@ -210,8 +210,8 @@ const struct OamData gUnknown_08524954 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 2,
 };
 
@@ -219,8 +219,8 @@ const struct OamData gUnknown_0852495C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(32x64),
+    .size = SPRITE_SIZE(32x64),
     .priority = 2,
 };
 
@@ -228,8 +228,8 @@ const struct OamData gUnknown_08524964 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .priority = 2,
 };
 
@@ -237,8 +237,8 @@ const struct OamData gUnknown_0852496C =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2,
 };
 
@@ -246,8 +246,8 @@ const struct OamData gUnknown_08524974 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 2,
 };
 
@@ -255,8 +255,8 @@ const struct OamData gUnknown_0852497C =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 2,
 };
 
@@ -264,8 +264,8 @@ const struct OamData gUnknown_08524984 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(16x8),
+    .size = SPRITE_SIZE(16x8),
     .priority = 2,
 };
 
@@ -273,8 +273,8 @@ const struct OamData gUnknown_0852498C =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(32x8),
+    .size = SPRITE_SIZE(32x8),
     .priority = 2,
 };
 
@@ -282,8 +282,8 @@ const struct OamData gUnknown_08524994 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 2,
 };
 
@@ -291,8 +291,8 @@ const struct OamData gUnknown_0852499C =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 2,
 };
 
@@ -300,8 +300,8 @@ const struct OamData gUnknown_085249A4 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x16),
+    .size = SPRITE_SIZE(8x16),
     .priority = 2,
 };
 
@@ -309,8 +309,8 @@ const struct OamData gUnknown_085249AC =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(8x32),
+    .size = SPRITE_SIZE(8x32),
     .priority = 2,
 };
 
@@ -318,8 +318,8 @@ const struct OamData gUnknown_085249B4 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 2,
 };
 
@@ -327,8 +327,8 @@ const struct OamData gUnknown_085249BC =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(32x64),
+    .size = SPRITE_SIZE(32x64),
     .priority = 2,
 };
 
@@ -336,8 +336,8 @@ const struct OamData gUnknown_085249C4 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .priority = 2,
 };
 
@@ -345,8 +345,8 @@ const struct OamData gUnknown_085249CC =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2,
 };
 
@@ -354,8 +354,8 @@ const struct OamData gUnknown_085249D4 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 2,
 };
 
@@ -363,8 +363,8 @@ const struct OamData gUnknown_085249DC =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 2,
 };
 
@@ -372,8 +372,8 @@ const struct OamData gUnknown_085249E4 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(16x8),
+    .size = SPRITE_SIZE(16x8),
     .priority = 2,
 };
 
@@ -381,8 +381,8 @@ const struct OamData gUnknown_085249EC =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(32x8),
+    .size = SPRITE_SIZE(32x8),
     .priority = 2,
 };
 
@@ -390,8 +390,8 @@ const struct OamData gUnknown_085249F4 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 2,
 };
 
@@ -399,8 +399,8 @@ const struct OamData gUnknown_085249FC =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 2,
 };
 
@@ -408,8 +408,8 @@ const struct OamData gUnknown_08524A04 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x16),
+    .size = SPRITE_SIZE(8x16),
     .priority = 2,
 };
 
@@ -417,8 +417,8 @@ const struct OamData gUnknown_08524A0C =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(8x32),
+    .size = SPRITE_SIZE(8x32),
     .priority = 2,
 };
 
@@ -426,8 +426,8 @@ const struct OamData gUnknown_08524A14 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 2,
 };
 
@@ -435,8 +435,8 @@ const struct OamData gUnknown_08524A1C =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(32x64),
+    .size = SPRITE_SIZE(32x64),
     .priority = 2,
 };
 
@@ -444,8 +444,8 @@ const struct OamData gUnknown_08524A24 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .priority = 2,
 };
 
@@ -453,8 +453,8 @@ const struct OamData gUnknown_08524A2C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2,
 };
 
@@ -462,8 +462,8 @@ const struct OamData gUnknown_08524A34 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 2,
 };
 
@@ -471,8 +471,8 @@ const struct OamData gUnknown_08524A3C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 2,
 };
 
@@ -480,8 +480,8 @@ const struct OamData gUnknown_08524A44 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(16x8),
+    .size = SPRITE_SIZE(16x8),
     .priority = 2,
 };
 
@@ -489,8 +489,8 @@ const struct OamData gUnknown_08524A4C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(32x8),
+    .size = SPRITE_SIZE(32x8),
     .priority = 2,
 };
 
@@ -498,8 +498,8 @@ const struct OamData gUnknown_08524A54 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 2,
 };
 
@@ -507,8 +507,8 @@ const struct OamData gUnknown_08524A5C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 2,
 };
 
@@ -516,8 +516,8 @@ const struct OamData gUnknown_08524A64 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x16),
+    .size = SPRITE_SIZE(8x16),
     .priority = 2,
 };
 
@@ -525,8 +525,8 @@ const struct OamData gUnknown_08524A6C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(8x32),
+    .size = SPRITE_SIZE(8x32),
     .priority = 2,
 };
 
@@ -534,8 +534,8 @@ const struct OamData gUnknown_08524A74 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 2,
 };
 
@@ -543,8 +543,8 @@ const struct OamData gUnknown_08524A7C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(32x64),
+    .size = SPRITE_SIZE(32x64),
     .priority = 2,
 };
 
@@ -552,8 +552,8 @@ const struct OamData gUnknown_08524A84 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .priority = 2,
 };
 
@@ -561,8 +561,8 @@ const struct OamData gUnknown_08524A8C =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2,
 };
 
@@ -570,8 +570,8 @@ const struct OamData gUnknown_08524A94 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 2,
 };
 
@@ -579,8 +579,8 @@ const struct OamData gUnknown_08524A9C =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 2,
 };
 
@@ -588,8 +588,8 @@ const struct OamData gUnknown_08524AA4 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(16x8),
+    .size = SPRITE_SIZE(16x8),
     .priority = 2,
 };
 
@@ -597,8 +597,8 @@ const struct OamData gUnknown_08524AAC =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(32x8),
+    .size = SPRITE_SIZE(32x8),
     .priority = 2,
 };
 
@@ -606,8 +606,8 @@ const struct OamData gUnknown_08524AB4 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 2,
 };
 
@@ -615,8 +615,8 @@ const struct OamData gUnknown_08524ABC =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 2,
 };
 
@@ -624,8 +624,8 @@ const struct OamData gUnknown_08524AC4 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x16),
+    .size = SPRITE_SIZE(8x16),
     .priority = 2,
 };
 
@@ -633,8 +633,8 @@ const struct OamData gUnknown_08524ACC =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(8x32),
+    .size = SPRITE_SIZE(8x32),
     .priority = 2,
 };
 
@@ -642,8 +642,8 @@ const struct OamData gUnknown_08524AD4 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 2,
 };
 
@@ -651,8 +651,8 @@ const struct OamData gUnknown_08524ADC =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(32x64),
+    .size = SPRITE_SIZE(32x64),
     .priority = 2,
 };
 
@@ -660,8 +660,8 @@ const struct OamData gUnknown_08524AE4 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .priority = 2,
 };
 
@@ -669,8 +669,8 @@ const struct OamData gUnknown_08524AEC =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2,
 };
 
@@ -678,8 +678,8 @@ const struct OamData gUnknown_08524AF4 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 2,
 };
 
@@ -687,8 +687,8 @@ const struct OamData gUnknown_08524AFC =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_SQUARE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 2,
 };
 
@@ -696,8 +696,8 @@ const struct OamData gUnknown_08524B04 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(16x8),
+    .size = SPRITE_SIZE(16x8),
     .priority = 2,
 };
 
@@ -705,8 +705,8 @@ const struct OamData gUnknown_08524B0C =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(32x8),
+    .size = SPRITE_SIZE(32x8),
     .priority = 2,
 };
 
@@ -714,8 +714,8 @@ const struct OamData gUnknown_08524B14 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 2,
 };
 
@@ -723,8 +723,8 @@ const struct OamData gUnknown_08524B1C =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 2,
 };
 
@@ -732,8 +732,8 @@ const struct OamData gUnknown_08524B24 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x16),
+    .size = SPRITE_SIZE(8x16),
     .priority = 2,
 };
 
@@ -741,8 +741,8 @@ const struct OamData gUnknown_08524B2C =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(8x32),
+    .size = SPRITE_SIZE(8x32),
     .priority = 2,
 };
 
@@ -750,8 +750,8 @@ const struct OamData gUnknown_08524B34 =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 2,
 };
 
@@ -759,8 +759,8 @@ const struct OamData gUnknown_08524B3C =
 {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_BLEND,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(32x64),
+    .size = SPRITE_SIZE(32x64),
     .priority = 2,
 };
 
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index ee6676e64..80b3258b4 100755
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -16,9 +16,6 @@
 #include "constants/rgb.h"
 #include "constants/songs.h"
 
-extern void sub_8108C94(struct Sprite *);
-extern void sub_810310C(u8, struct Sprite *);
-
 void sub_8103448(struct Sprite *);
 void sub_8103498(struct Sprite *);
 void sub_810358C(struct Sprite *);
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index 49fb69342..efa2620fd 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -24,9 +24,6 @@
 #include "constants/species.h"
 #include "constants/weather.h"
 
-extern u8 sub_807521C(s16 x, s16 y, u8 a3);
-extern void sub_810E2C8(struct Sprite *);
-
 extern const struct SpriteTemplate gUnknown_08593114;
 extern const union AffineAnimCmd *const gUnknown_082FF6C0[];
 extern const union AffineAnimCmd *const gUnknown_082FF694[];
diff --git a/src/battle_arena.c b/src/battle_arena.c
index 8146f5b38..f785fa7c3 100644
--- a/src/battle_arena.c
+++ b/src/battle_arena.c
@@ -406,10 +406,10 @@ static const struct OamData sJudgementIconOamData =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 15,
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 9ca0f8b84..524f73abf 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -42,10 +42,10 @@ static const struct OamData gUnknown_0831A988 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -59,10 +59,10 @@ static const struct OamData gUnknown_0831A990 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 64,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 28ab4c279..23d469c27 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -27,13 +27,12 @@
 #include "constants/battle_anim.h"
 #include "constants/songs.h"
 #include "constants/trainers.h"
+#include "recorded_battle.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 
-extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-
 // this file's functions
 static void LinkOpponentHandleGetMonData(void);
 static void LinkOpponentHandleGetRawMonData(void);
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 06a8d4a6a..22633c5bc 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -27,12 +27,11 @@
 #include "constants/battle_anim.h"
 #include "constants/songs.h"
 #include "constants/trainers.h"
+#include "recorded_battle.h"
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 
-extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-
 // this file's functions
 static void LinkPartnerHandleGetMonData(void);
 static void LinkPartnerHandleGetRawMonData(void);
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index cdb886e5d..7d940cb89 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -32,14 +32,12 @@
 #include "constants/moves.h"
 #include "constants/songs.h"
 #include "constants/trainers.h"
+#include "trainer_hill.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 
-extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-extern u8 GetTrainerHillTrainerFrontSpriteId(u16 trainerId);
-
 // this file's functions
 static void OpponentHandleGetMonData(void);
 static void OpponentHandleGetRawMonData(void);
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index a0d92f23a..b377ecf64 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -39,10 +39,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 
-extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-extern void sub_81AABB0(void);
-extern void sub_81851A8(u8 *);
-
 // this file's functions
 static void PlayerHandleGetMonData(void);
 static void PlayerHandleSetMonData(void);
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 787a4f77c..2c53938c1 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -30,9 +30,6 @@
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 
-extern void sub_81358F4(void);
-extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-
 // this file's functions
 static void PlayerPartnerHandleGetMonData(void);
 static void PlayerPartnerHandleGetRawMonData(void);
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 79065c2e2..e43c5f8ae 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -33,8 +33,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 
-extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-
 // this file's functions
 static void RecordedOpponentHandleGetMonData(void);
 static void RecordedOpponentHandleGetRawMonData(void);
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index e5e934761..412c49f17 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -30,8 +30,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 
-extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-
 // this file's functions
 static void RecordedPlayerHandleGetMonData(void);
 static void RecordedPlayerHandleGetRawMonData(void);
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 247f00627..e9da16252 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -25,8 +25,6 @@
 
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 
-extern void sub_81358F4(void);
-
 // this file's functions
 static void SafariHandleGetMonData(void);
 static void SafariHandleGetRawMonData(void);
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 7f4fe4761..f1b783b21 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -33,8 +33,6 @@
 
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 
-extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
-
 // this file's functions
 static void WallyHandleGetMonData(void);
 static void WallyHandleGetRawMonData(void);
diff --git a/src/battle_dome.c b/src/battle_dome.c
index f86faeffb..1b7953180 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -872,10 +872,10 @@ static const struct OamData gUnknown_0860CF70 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -889,10 +889,10 @@ static const struct OamData gUnknown_0860CF78 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 1,
@@ -906,10 +906,10 @@ static const struct OamData gUnknown_0860CF80 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(16x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(16x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 2,
@@ -923,10 +923,10 @@ static const struct OamData gUnknown_0860CF88 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 2,
+    .shape = SPRITE_SHAPE(8x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 2,
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c
index 85c0b2808..367c1401f 100644
--- a/src/battle_factory_screen.c
+++ b/src/battle_factory_screen.c
@@ -385,10 +385,10 @@ static const struct OamData gUnknown_0861047C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 3,
     .paletteNum = 0,
@@ -402,10 +402,10 @@ static const struct OamData gUnknown_08610484 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 3,
     .paletteNum = 0,
@@ -419,10 +419,10 @@ static const struct OamData gUnknown_0861048C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x16),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -436,10 +436,10 @@ static const struct OamData gUnknown_08610494 =
     .objMode = 1,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/battle_interface.c b/src/battle_interface.c
index f2916012e..a8651f6cf 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -207,10 +207,10 @@ static const struct OamData sUnknown_0832C138 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -279,10 +279,10 @@ static const struct OamData sOamData_Healthbar =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(32x8),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -446,10 +446,10 @@ static const struct OamData sUnknown_0832C354 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -463,10 +463,10 @@ static const struct OamData sOamData_StatusSummaryBalls =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
diff --git a/src/battle_main.c b/src/battle_main.c
index 853dafe01..0f593fef6 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -57,6 +57,7 @@
 #include "constants/songs.h"
 #include "constants/species.h"
 #include "constants/trainers.h"
+#include "cable_club.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
@@ -69,9 +70,6 @@ extern const u8 *const gBattlescriptsForRunningByItem[];
 extern const u8 *const gBattlescriptsForUsingItem[];
 extern const u8 *const gBattlescriptsForSafariActions[];
 
-// functions
-extern void sub_80B3AF8(u8 taskId); // cable club
-
 // this file's functions
 static void CB2_InitBattleInternal(void);
 static void CB2_PreInitMultiBattle(void);
@@ -298,10 +296,10 @@ const struct OamData gOamData_831ACA8 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -315,10 +313,10 @@ const struct OamData gOamData_831ACB0 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 2,
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index 329cb5926..ee35ed45b 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -282,10 +282,10 @@ static const struct OamData gOamData_861F378 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
diff --git a/src/battle_records.c b/src/battle_records.c
index 6997e40dd..fdd915d07 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -21,8 +21,7 @@
 #include "alloc.h"
 #include "gpu_regs.h"
 #include "constants/game_stat.h"
-
-extern void PrintOnTrainerHillRecordsWindow(void); // pokenav.s
+#include "trainer_hill.h"
 
 // this file's functions
 static void Task_CloseTrainerHillRecordsOnButton(u8 taskId);
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 327ff76da..0eb6dfec0 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -48,17 +48,13 @@
 #include "battle_pyramid.h"
 #include "field_specials.h"
 #include "pokemon_summary_screen.h"
+#include "pokenav.h"
+#include "menu_specialized.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 extern const u8* const gBattleScriptsForMoveEffects[];
 
-// functions
-extern void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation); // pokenav.s
-extern void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s
-extern void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s
-extern u8 sub_813B21C(void);
-
 #define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
 
 // this file's functions
@@ -735,10 +731,10 @@ static const struct OamData sOamData_MonIconOnLvlUpBox =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 40423697e..347486a0b 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -44,6 +44,7 @@
 #include "mirage_tower.h"
 #include "constants/map_types.h"
 #include "constants/battle_frontier.h"
+#include "field_screen_effect.h"
 
 enum
 {
@@ -62,10 +63,6 @@ struct TrainerBattleParameter
     u8 ptrType;
 };
 
-extern void ClearPoisonStepCounter(void);
-extern void sub_808BCF4(void);
-extern void sub_80AF6F0(void);
-
 // this file's functions
 static void DoBattlePikeWildBattle(void);
 static void DoSafariBattle(void);
diff --git a/src/battle_tent.c b/src/battle_tent.c
index b07020822..85194417f 100644
--- a/src/battle_tent.c
+++ b/src/battle_tent.c
@@ -269,7 +269,7 @@ static void sub_81B9E88(void)
     DoBattleFactorySwapScreen();
 }
 
-bool8 sub_81B9E94(void)
+bool8 InSlateportBattleTent(void)
 {
     return gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY
            && (gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_CORRIDOR || gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_BATTLE_ROOM);
diff --git a/src/battle_transition.c b/src/battle_transition.c
index 786d5e869..df6180d19 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -763,10 +763,10 @@ static const struct OamData gOamData_85C8E80 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/berry.c b/src/berry.c
index bd596db7f..cbac06a3d 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -11,11 +11,9 @@
 #include "text.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/items.h"
+#include "event_object_movement.h"
+
 
-extern u8 EventObjectGetBerryTreeId(u8 eventObjectId);
-extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
-extern void CB2_ChooseBerry(void);
-extern bool8 IsBerryTreeSparkling(u8, u8, u8);
 
 extern const u8 BerryTreeScript[];
 
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 8d852819b..c792b9b40 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -142,9 +142,6 @@ extern const u8 gText_Space[];
 extern const u8 gText_BlenderMaxSpeedRecord[];
 extern const u8 gText_234Players[];
 
-extern void sub_81AABF0(void (*callback)(void));
-extern void sub_800B4C0(void);
-
 // this file's functions
 static void BerryBlender_SetBackgroundsPos(void);
 static void sub_8080EA4(u8 taskId);
@@ -407,10 +404,10 @@ static const struct OamData sOamData_8216314 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -550,10 +547,10 @@ static const struct OamData sOamData_821640C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -619,10 +616,10 @@ static const struct OamData sOamData_8216474 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -706,10 +703,10 @@ static const struct OamData sOamData_8216514 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -764,10 +761,10 @@ static const struct OamData sOamData_8216560 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
diff --git a/src/bike.c b/src/bike.c
index 1e91baab0..530742bdf 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -14,12 +14,6 @@
 extern bool8 gBikeCyclingChallenge;
 extern u8 gBikeCollisions;
 
-extern u8 sub_808B980(u8 direction);
-extern u8 sub_808B9BC(u8 direction);
-extern u8 sub_808B9A4(u8 direction);
-extern u8 sub_808C1B4(u8 direction);
-extern u8 sub_808B9D4(u8 direction);
-
 // this file's functions
 static void MovePlayerOnMachBike(u8, u16, u16);
 static u8 GetMachBikeTransition(u8 *);
diff --git a/src/cable_car.c b/src/cable_car.c
index 420bdd30f..ab7b5726a 100755
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -153,19 +153,22 @@ const struct SpritePalette gUnknown_085CDB74[] = {
 
 const struct OamData gOamData_85CDB84 = {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 2
 };
 
 const struct OamData gOamData_85CDB8C = {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
-    .shape = ST_OAM_H_RECTANGLE,
+    .shape = SPRITE_SHAPE(16x8),
+    .size = SPRITE_SIZE(16x8),
     .priority = 2
 };
 
 const struct OamData gOamData_85CDB94 = {
     .affineMode = ST_OAM_AFFINE_DOUBLE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2
 };
 
diff --git a/src/contest.c b/src/contest.c
index e9353596b..114a1fb69 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -45,8 +45,6 @@
 #include "constants/rgb.h"
 #include "contest_ai.h"
 
-extern void sub_80FC9F8(u8); // contest_link_80FC4F4.c
-
 // This file's functions.
 static void sub_80D782C(void);
 static void sub_80D7C7C(u8 taskId);
diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c
index b2ce52757..a4b88c074 100644
--- a/src/contest_link_80F57C4.c
+++ b/src/contest_link_80F57C4.c
@@ -39,6 +39,7 @@
 #include "constants/rgb.h"
 #include "constants/songs.h"
 #include "constants/vars.h"
+#include "contest.h"
 
 struct ContestLinkUnk0
 {
@@ -99,8 +100,6 @@ extern const struct SpriteSheet gUnknown_0858D810[];
 extern const struct SpritePalette gUnknown_0858D850;
 extern const struct SpriteTemplate gSpriteTemplate_858D860;
 
-extern void sub_81D9DE4(u8);
-
 static void sub_80F6A9C(void);
 static void sub_80F71C8(void);
 u8 sub_80F7310(u8, u8);
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 931deb01b..29f3c871d 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -154,10 +154,10 @@ const struct OamData gUnknown_085B0830 =
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 1,
     .bpp = ST_OAM_8BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/contest_painting_effects.c b/src/contest_painting_effects.c
index 142ad7bc9..a791df65c 100644
--- a/src/contest_painting_effects.c
+++ b/src/contest_painting_effects.c
@@ -3,6 +3,13 @@
 #include "contest_painting.h"
 #include "constants/rgb.h"
 
+struct Unk8125954
+{
+    u8 unk0;
+    u8 unk1;
+    u16 unk2;
+};
+
 // IWRAM common
 u8 gUnknown_03006164;
 u16 (*gUnknown_03006168)[][32];
@@ -12,32 +19,46 @@ u8 gUnknown_03006174;
 u8 gUnknown_03006178;
 u8 gUnknown_0300617C;
 u8 gUnknown_03006180;
-u16 gUnknown_03006184;
+u16 *gUnknown_03006184;
 u16 gUnknown_03006188;
 
-// this file's functions
-void sub_8125230(void);
-void sub_81252E8(void);
-void sub_81254E0(void);
-void sub_8125630(void);
-void sub_8125448(void);
-void sub_81257F8(void);
-void sub_81258A0(void);
-void sub_81256C8(void);
-void sub_8125250(void);
-void sub_81253A4(u8);
-void sub_81250B8(u8);
-void sub_8125170(u8);
-void sub_8125954(u16);
-u16 ConvertColorToGrayscale(u16*);
-u16 sub_8125E18(u16*, u16*, u16*);
-u16 ConvertCoolColor(u16*, u8);
-u16 ConvertToBlackOrWhite(u16*);
-u16 sub_8125C98(u16*, u16*);
-u16 InvertColor(u16*);
-u16 sub_8125F38(u16*, u16*, u16*);
-u16 sub_8125CF4(u16*, u16*);
-u16 GetCoolColorFromPersonality(u8);
+static void sub_8125230(void);
+static void sub_81252E8(void);
+static void sub_81254E0(void);
+static void sub_8125630(void);
+static void sub_8125448(void);
+static void sub_81257F8(void);
+static void sub_81258A0(void);
+static void sub_81256C8(void);
+static void sub_8125250(void);
+static void sub_81253A4(u8);
+static void sub_81250B8(u8);
+static void sub_8125170(u8);
+static void sub_8125954(u16);
+static u16 ConvertColorToGrayscale(u16*);
+static u16 sub_8125E18(u16*, u16*, u16*);
+static u16 ConvertCoolColor(u16*, u8);
+static u16 ConvertToBlackOrWhite(u16*);
+static u16 sub_8125C98(u16*, u16*);
+static u16 InvertColor(u16*);
+static u16 sub_8125F38(u16*, u16*, u16*);
+static u16 sub_8125CF4(u16*, u16*);
+static u16 GetCoolColorFromPersonality(u8);
+static void sub_81263A4(bool8);
+static void sub_8126270(void);
+static void sub_8126714(void);
+static void sub_8126370(void);
+static void sub_8126664(void);
+static void sub_8126334(void);
+static void sub_81265B4(void);
+static void sub_8126318(void);
+static void sub_81264FC(void);
+static u16 sub_81267C4(u16*);
+static u16 sub_8126908(u16*);
+static u16 sub_812693C(u16*);
+static u16 sub_8126838(u16*);
+
+extern const u8 gUnknown_085A1F94[][3];
 
 void sub_8124F2C(struct Unk030061A0 *info)
 {
@@ -104,7 +125,7 @@ void sub_8124F2C(struct Unk030061A0 *info)
     }
 }
 
-void sub_81250B8(u8 a0) // it changes palette someway somehow... .__.
+static void sub_81250B8(u8 a0) // it changes palette someway somehow... .__.
 {
     u8 i, j;
 
@@ -127,7 +148,7 @@ void sub_81250B8(u8 a0) // it changes palette someway somehow... .__.
     }
 }
 
-void sub_8125170(u8 a0)
+static void sub_8125170(u8 a0)
 {
     u8 i, j;
 
@@ -149,14 +170,14 @@ void sub_8125170(u8 a0)
     }
 }
 
-void sub_8125230(void)
+static void sub_8125230(void)
 {
     u32 i;
     for (i = 0; i < 3200; i++)
         sub_8125954(i);
 }
 
-void sub_8125250(void)
+static void sub_8125250(void)
 {
     u8 i, j;
 
@@ -174,7 +195,7 @@ void sub_8125250(void)
     }
 }
 
-void sub_81252E8(void)
+static void sub_81252E8(void)
 {
     u8 i, j;
 
@@ -200,7 +221,7 @@ void sub_81252E8(void)
     }
 }
 
-void sub_81253A4(u8 arg0)
+static void sub_81253A4(u8 arg0)
 {
     u8 i, j;
 
@@ -218,7 +239,7 @@ void sub_81253A4(u8 arg0)
     }
 }
 
-void sub_8125448(void)
+static void sub_8125448(void)
 {
     u8 i, j;
 
@@ -236,7 +257,7 @@ void sub_8125448(void)
     }
 }
 
-void sub_81254E0(void)
+static void sub_81254E0(void)
 {
     u8 i, j;
     u16 *palette;
@@ -270,7 +291,7 @@ void sub_81254E0(void)
     }
 }
 
-void sub_8125630(void)
+static void sub_8125630(void)
 {
     u8 i, j;
 
@@ -288,7 +309,7 @@ void sub_8125630(void)
     }
 }
 
-void sub_81256C8(void)
+static void sub_81256C8(void)
 {
     u8 i, j;
     u16 *palette;
@@ -349,7 +370,7 @@ void sub_81256C8(void)
     }
 }
 
-void sub_81257F8(void)
+static void sub_81257F8(void)
 {
     u8 i, j;
 
@@ -369,7 +390,7 @@ void sub_81257F8(void)
     }
 }
 
-void sub_81258A0(void)
+static void sub_81258A0(void)
 {
     u8 i, j;
 
@@ -389,16 +410,7 @@ void sub_81258A0(void)
     }
 }
 
-struct Unk8125954
-{
-    u8 unk0;
-    u8 unk1;
-    u16 unk2;
-};
-
-extern const u8 gUnknown_085A1F94[][3];
-
-void sub_8125954(u16 arg0)
+static void sub_8125954(u16 arg0)
 {
     u8 i;
     u8 r5, r9;
@@ -487,7 +499,7 @@ void sub_8125954(u16 arg0)
     }
 }
 
-u16 ConvertColorToGrayscale(u16 *color)
+static u16 ConvertColorToGrayscale(u16 *color)
 {
     s32 clr = *color;
     s32 r = clr & 0x1F;
@@ -499,7 +511,7 @@ u16 ConvertColorToGrayscale(u16 *color)
 
 // The dark colors are the colored edges of the Cool painting effect.
 // Everything else is white.
-u16 ConvertCoolColor(u16 *color, u8 personality)
+static u16 ConvertCoolColor(u16 *color, u8 personality)
 {
     u16 red = *color & 0x1F;
     u16 green = (*color >> 5) & 0x1F;
@@ -513,7 +525,7 @@ u16 ConvertCoolColor(u16 *color, u8 personality)
 
 // Based on the given value, which comes from the first 8 bits of
 // the mon's personality value, return a color.
-u16 GetCoolColorFromPersonality(u8 personality)
+static u16 GetCoolColorFromPersonality(u8 personality)
 {
     u16 red = 0;
     u16 green = 0;
@@ -564,7 +576,7 @@ u16 GetCoolColorFromPersonality(u8 personality)
     return RGB2(red, green, blue);
 }
 
-u16 ConvertToBlackOrWhite(u16 *color)
+static u16 ConvertToBlackOrWhite(u16 *color)
 {
     u16 red = *color & 0x1F;
     u16 green = (*color >> 5) & 0x1F;
@@ -576,7 +588,7 @@ u16 ConvertToBlackOrWhite(u16 *color)
         return RGB_WHITE;
 }
 
-u16 sub_8125C98(u16 *colorA, u16 *colorB)
+static u16 sub_8125C98(u16 *colorA, u16 *colorB)
 {
     if (*colorA)
     {
@@ -591,7 +603,7 @@ u16 sub_8125C98(u16 *colorA, u16 *colorB)
     return RGB_BLACK;
 }
 
-u16 InvertColor(u16 *color)
+static u16 InvertColor(u16 *color)
 {
     u16 red = *color & 0x1F;
     u16 green = (*color >> 5) & 0x1F;
@@ -604,7 +616,7 @@ u16 InvertColor(u16 *color)
     return RGB2(red, green, blue);
 }
 
-u16 sub_8125CF4(u16 *a0, u16 *a1)
+static u16 sub_8125CF4(u16 *a0, u16 *a1)
 {
     u16 sp0[2][3];
     u16 spC[3];
@@ -660,7 +672,7 @@ u16 sub_8125CF4(u16 *a0, u16 *a1)
     return RGB2(r, g, b);
 }
 
-u16 sub_8125E18(u16 * a0, u16 * a1, u16 * a2)
+static u16 sub_8125E18(u16 * a0, u16 * a1, u16 * a2)
 {
     u16 red, green, blue;
     u16 avg0, avg1, avg2;
@@ -704,7 +716,7 @@ u16 sub_8125E18(u16 * a0, u16 * a1, u16 * a2)
     return RGB2(red, green, blue);
 }
 
-u16 sub_8125F38(u16 *a0, u16 *a1, u16 *a2)
+static u16 sub_8125F38(u16 *a0, u16 *a1, u16 *a2)
 {
     u16 red, green, blue;
     u16 avg0, avg1, avg2;
@@ -772,3 +784,582 @@ void sub_8126058(struct Unk030061A0 *arg0)
     }
 }
 */
+
+NAKED
+void sub_8126058(struct Unk030061A0 *arg0)
+{
+    asm_unified("\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0xC\n\
+    ldrb r1, [r0, 0x1D]\n\
+    lsrs r5, r1, 3\n\
+    ldrb r1, [r0, 0x1E]\n\
+    lsrs r1, 3\n\
+    str r1, [sp, 0x8]\n\
+    ldr r1, [r0, 0x4]\n\
+    str r1, [sp]\n\
+    ldr r2, [r0, 0x10]\n\
+    str r2, [sp, 0x4]\n\
+    ldrh r0, [r0, 0x16]\n\
+    cmp r0, 0x2\n\
+    bne _08126108\n\
+    movs r1, 0\n\
+    ldr r0, [sp, 0x8]\n\
+    cmp r1, r0\n\
+    bcc _08126086\n\
+    b _08126194\n\
+_08126086:\n\
+    movs r0, 0\n\
+    adds r2, r1, 0x1\n\
+    mov r10, r2\n\
+    cmp r0, r5\n\
+    bcs _081260FA\n\
+    adds r2, r1, 0\n\
+    muls r2, r5\n\
+    mov r9, r2\n\
+    lsls r1, 3\n\
+    mov r8, r1\n\
+_0812609A:\n\
+    movs r4, 0\n\
+    lsls r6, r0, 4\n\
+    adds r7, r0, 0x1\n\
+    add r0, r9\n\
+    lsls r0, 6\n\
+    ldr r1, [sp, 0x4]\n\
+    adds r1, r0\n\
+    mov r12, r1\n\
+_081260AA:\n\
+    lsls r0, r4, 3\n\
+    mov r2, r12\n\
+    adds r3, r2, r0\n\
+    mov r1, r8\n\
+    adds r0, r1, r4\n\
+    lsls r0, 3\n\
+    muls r0, r5\n\
+    lsls r0, 1\n\
+    ldr r2, [sp]\n\
+    adds r0, r2, r0\n\
+    adds r2, r0, r6\n\
+    ldrh r0, [r2, 0x2]\n\
+    lsls r0, 8\n\
+    ldrh r1, [r2]\n\
+    orrs r0, r1\n\
+    strh r0, [r3]\n\
+    ldrh r0, [r2, 0x6]\n\
+    lsls r0, 8\n\
+    ldrh r1, [r2, 0x4]\n\
+    orrs r0, r1\n\
+    strh r0, [r3, 0x2]\n\
+    ldrh r0, [r2, 0xA]\n\
+    lsls r0, 8\n\
+    ldrh r1, [r2, 0x8]\n\
+    orrs r0, r1\n\
+    strh r0, [r3, 0x4]\n\
+    ldrh r0, [r2, 0xE]\n\
+    lsls r0, 8\n\
+    ldrh r1, [r2, 0xC]\n\
+    orrs r0, r1\n\
+    strh r0, [r3, 0x6]\n\
+    adds r0, r4, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    cmp r4, 0x7\n\
+    bls _081260AA\n\
+    lsls r0, r7, 16\n\
+    lsrs r0, 16\n\
+    cmp r0, r5\n\
+    bcc _0812609A\n\
+_081260FA:\n\
+    mov r1, r10\n\
+    lsls r0, r1, 16\n\
+    lsrs r1, r0, 16\n\
+    ldr r2, [sp, 0x8]\n\
+    cmp r1, r2\n\
+    bcc _08126086\n\
+    b _08126194\n\
+_08126108:\n\
+    movs r1, 0\n\
+    ldr r0, [sp, 0x8]\n\
+    cmp r1, r0\n\
+    bcs _08126194\n\
+_08126110:\n\
+    movs r0, 0\n\
+    adds r2, r1, 0x1\n\
+    mov r10, r2\n\
+    cmp r0, r5\n\
+    bcs _08126188\n\
+    adds r2, r1, 0\n\
+    muls r2, r5\n\
+    mov r9, r2\n\
+    lsls r1, 3\n\
+    mov r8, r1\n\
+_08126124:\n\
+    movs r4, 0\n\
+    lsls r6, r0, 4\n\
+    adds r7, r0, 0x1\n\
+    add r0, r9\n\
+    lsls r0, 5\n\
+    ldr r1, [sp, 0x4]\n\
+    adds r1, r0\n\
+    mov r12, r1\n\
+_08126134:\n\
+    lsls r0, r4, 2\n\
+    mov r2, r12\n\
+    adds r3, r2, r0\n\
+    mov r1, r8\n\
+    adds r0, r1, r4\n\
+    lsls r0, 3\n\
+    muls r0, r5\n\
+    lsls r0, 1\n\
+    ldr r2, [sp]\n\
+    adds r0, r2, r0\n\
+    adds r2, r0, r6\n\
+    ldrh r1, [r2, 0x2]\n\
+    lsls r1, 4\n\
+    ldrh r0, [r2]\n\
+    orrs r1, r0\n\
+    ldrh r0, [r2, 0x4]\n\
+    lsls r0, 8\n\
+    orrs r1, r0\n\
+    ldrh r0, [r2, 0x6]\n\
+    lsls r0, 12\n\
+    orrs r1, r0\n\
+    strh r1, [r3]\n\
+    ldrh r1, [r2, 0xA]\n\
+    lsls r1, 4\n\
+    ldrh r0, [r2, 0x8]\n\
+    orrs r1, r0\n\
+    ldrh r0, [r2, 0xC]\n\
+    lsls r0, 8\n\
+    orrs r1, r0\n\
+    ldrh r0, [r2, 0xE]\n\
+    lsls r0, 12\n\
+    orrs r1, r0\n\
+    strh r1, [r3, 0x2]\n\
+    adds r0, r4, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    cmp r4, 0x7\n\
+    bls _08126134\n\
+    lsls r0, r7, 16\n\
+    lsrs r0, 16\n\
+    cmp r0, r5\n\
+    bcc _08126124\n\
+_08126188:\n\
+    mov r1, r10\n\
+    lsls r0, r1, 16\n\
+    lsrs r1, r0, 16\n\
+    ldr r2, [sp, 0x8]\n\
+    cmp r1, r2\n\
+    bcc _08126110\n\
+_08126194:\n\
+    add sp, 0xC\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0");
+}
+
+void sub_81261A4(struct Unk030061A0 *arg0)
+{
+    gUnknown_03006188 = arg0->var_18 * 16;
+    gUnknown_03006184 = &arg0->var_8[gUnknown_03006188];
+    gUnknown_03006168 = arg0->var_4;
+    gUnknown_03006164 = arg0->var_19;
+    gUnknown_03006178 = arg0->var_1A;
+    gUnknown_03006174 = arg0->var_1B;
+    gUnknown_0300616C = arg0->var_1C;
+    gUnknown_03006180 = arg0->var_1D;
+    gUnknown_03006170 = arg0->var_1E;
+
+    switch (arg0->var_14)
+    {
+    case 0:
+        sub_81263A4(FALSE);
+        break;
+    case 1:
+        sub_81263A4(TRUE);
+        break;
+    case 2:
+        sub_8126270();
+        sub_8126714();
+        break;
+    case 3:
+        sub_8126370();
+        sub_8126664();
+        break;
+    case 4:
+        sub_8126334();
+        sub_81265B4();
+        break;
+    case 5:
+        sub_8126318();
+        sub_81264FC();
+        break;
+    }
+}
+
+static void sub_8126270(void)
+{
+    gUnknown_03006184[0] = RGB2(0, 0, 0);
+    gUnknown_03006184[1] = RGB2(6, 6, 6);
+    gUnknown_03006184[2] = RGB2(29, 29, 29);
+    gUnknown_03006184[3] = RGB2(11, 11, 11);
+    gUnknown_03006184[4] = RGB2(29, 6, 6);
+    gUnknown_03006184[5] = RGB2(6, 29, 6);
+    gUnknown_03006184[6] = RGB2(6, 6, 29);
+    gUnknown_03006184[7] = RGB2(29, 29, 6);
+    gUnknown_03006184[8] = RGB2(29, 6, 29);
+    gUnknown_03006184[9] = RGB2(6, 29, 29);
+    gUnknown_03006184[10] = RGB2(29, 11, 6);
+    gUnknown_03006184[11] = RGB2(11, 29, 6);
+    gUnknown_03006184[12] = RGB2(6, 11, 29);
+    gUnknown_03006184[13] = RGB2(29, 6, 11);
+    gUnknown_03006184[14] = RGB2(6, 29, 11);
+    gUnknown_03006184[15] = RGB2(11, 6, 29);
+}
+
+static void sub_8126318(void)
+{
+    gUnknown_03006184[0] = RGB2(0, 0, 0);
+    gUnknown_03006184[1] = RGB2(0, 0, 0);
+    gUnknown_03006184[2] = RGB2(31, 31, 31);
+}
+
+static void sub_8126334(void)
+{
+    u8 i;
+
+    gUnknown_03006184[0] = RGB2(0, 0, 0);
+    gUnknown_03006184[1] = RGB2(0, 0, 0);
+    for (i = 0; i < 14; i++)
+        gUnknown_03006184[i + 2] = RGB2(2 * (i + 2), 2 * (i + 2), 2 * (i + 2));
+}
+
+static void sub_8126370(void)
+{
+    u8 i;
+
+    gUnknown_03006184[0] = RGB2(0, 0, 0);
+    for (i = 0; i < 32; i++)
+        gUnknown_03006184[i + 1] = RGB2(i, i, i);
+}
+
+static void sub_81263A4(bool8 arg0)
+{
+    u8 i, j;
+    u16 maxIndex;
+
+    maxIndex = 0xDF;
+    if (!arg0)
+        maxIndex = 0xFF;
+
+    for (j = 0; j < maxIndex; j++)
+        gUnknown_03006184[j] = 0;
+
+    gUnknown_03006184[maxIndex] = RGB2(15, 15, 15);
+    for (i = 0; i < gUnknown_0300616C; i++)
+    {
+        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
+        u16* pal = &var2[gUnknown_03006164];
+        for (j = 0; j < gUnknown_03006174; j++, pal++)
+        {
+            if (*pal & 0x8000)
+            {
+                *pal = gUnknown_03006188;
+            }
+            else
+            {
+                u16 color = sub_81267C4(pal);
+                u8 curIndex = 1;
+                if (curIndex < maxIndex)
+                {
+                    if (gUnknown_03006184[curIndex] == RGB_BLACK)
+                    {
+                        gUnknown_03006184[curIndex] = color;
+                        *pal = gUnknown_03006188 + curIndex;
+                    }
+                    else
+                    {
+                        while (curIndex < maxIndex)
+                        {
+                            if (gUnknown_03006184[curIndex] == RGB_BLACK)
+                            {
+                                gUnknown_03006184[curIndex] = color;
+                                *pal = gUnknown_03006188 + curIndex;
+                                break;
+                            }
+
+                            if (gUnknown_03006184[curIndex] == color)
+                            {
+                                *pal = gUnknown_03006188 + curIndex;
+                                break;
+                            }
+
+                            curIndex++;
+                        }
+                    }
+                }
+
+                if (curIndex == maxIndex)
+                {
+                    curIndex = maxIndex;
+                    *pal = curIndex;
+                }
+            }
+        }
+    }
+}
+
+static void sub_81264FC(void)
+{
+    u8 i, j;
+
+    for (i = 0; i < gUnknown_0300616C; i++)
+    {
+        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
+        u16* pal = &var2[gUnknown_03006164];
+        for (j = 0; j < gUnknown_03006174; j++, pal++)
+        {
+            if (*pal & 0x8000)
+            {
+                *pal = gUnknown_03006188;
+            }
+            else
+            {
+                if (ConvertToBlackOrWhite(pal) == RGB_BLACK)
+                    *pal = gUnknown_03006188 + 1;
+                else
+                    *pal = gUnknown_03006188 + 2;
+            }
+        }
+    }
+}
+
+static void sub_81265B4(void)
+{
+    u8 i, j;
+
+    for (i = 0; i < gUnknown_0300616C; i++)
+    {
+        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
+        u16* pal = &var2[gUnknown_03006164];
+        for (j = 0; j < gUnknown_03006174; j++, pal++)
+        {
+            if (*pal & 0x8000)
+                *pal = gUnknown_03006188;
+            else
+                *pal = sub_8126908(pal) + gUnknown_03006188;
+        }
+    }
+}
+
+static void sub_8126664(void)
+{
+    u8 i, j;
+
+    for (i = 0; i < gUnknown_0300616C; i++)
+    {
+        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
+        u16* pal = &var2[gUnknown_03006164];
+        for (j = 0; j < gUnknown_03006174; j++, pal++)
+        {
+            if (*pal & 0x8000)
+                *pal = gUnknown_03006188;
+            else
+                *pal = sub_812693C(pal) + gUnknown_03006188;
+        }
+    }
+}
+
+static void sub_8126714(void)
+{
+    u8 i, j;
+
+    for (i = 0; i < gUnknown_0300616C; i++)
+    {
+        u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
+        u16* pal = &var2[gUnknown_03006164];
+        for (j = 0; j < gUnknown_03006174; j++, pal++)
+        {
+            if (*pal & 0x8000)
+                *pal = gUnknown_03006188;
+            else
+                *pal = sub_8126838(pal) + gUnknown_03006188;
+        }
+    }
+}
+
+static u16 sub_81267C4(u16 *color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+
+    if (red & 3)
+        red = (red & 0x1C) + 4;
+    if (green & 3)
+        green = (green & 0x1C) + 4;
+    if (blue & 3)
+        blue = (blue & 0x1C) + 4;
+
+    if (red < 6)
+        red = 6;
+    if (red > 30)
+        red = 30;
+
+    if (green < 6)
+        green = 6;
+    if (green > 30)
+        green = 30;
+
+    if (blue < 6)
+        blue = 6;
+    if (blue > 30)
+        blue = 30;
+
+    return RGB2(red, green, blue);
+}
+
+static u16 sub_8126838(u16* color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+
+    if (red < 12 && green < 11 && blue < 11)
+        return 1;
+
+    if (red > 19 && green > 19 && blue > 19)
+        return 2;
+
+    if (red > 19)
+    {
+        if (green > 19)
+        {
+            if (blue > 14)
+                return 2;
+            else
+                return 7;
+        }
+        else if (blue > 19)
+        {
+            if (green > 14)
+                return 2;
+            else
+                return 8;
+        }
+    }
+
+    if (green > 19 && blue > 19)
+    {
+        if (red > 14)
+            return 2;
+        else
+            return 9;
+    }
+
+    if (red > 19)
+    {
+        if (green > 11)
+        {
+            if (blue > 11)
+            {
+                if (green < blue)
+                    return 8;
+                else
+                    return 7;
+            }
+            else
+            {
+                return 10;
+            }
+        }
+        else if (blue > 11)
+        {
+            return 13;
+        }
+        else
+        {
+            return 4;
+        }
+    }
+
+    if (green > 19)
+    {
+        if (red > 11)
+        {
+            if (blue > 11)
+            {
+                if (red < blue)
+                    return 9;
+                else
+                    return 7;
+            }
+            else
+            {
+                return 11;
+            }
+        }
+        else
+        {
+            if (blue > 11)
+                return 14;
+            else
+                return 5;
+        }
+    }
+
+    if (blue > 19)
+    {
+        if (red > 11)
+        {
+            if (green > 11)
+            {
+                if (red < green)
+                    return 9;
+                else
+                    return 8;
+            }
+        }
+        else if (green > 11)
+        {
+            return 12;
+        }
+
+        if (blue > 11)
+            return 15;
+        else
+            return 6;
+    }
+
+    return 3;
+}
+
+static u16 sub_8126908(u16 *color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+    u16 average = ((red + green + blue) / 3) & 0x1E;
+    if (average == 0)
+        return 1;
+    else
+        return average / 2;
+}
+
+static u16 sub_812693C(u16 *color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+    u16 average = (red + green + blue) / 3;
+    return average + 1;
+}
diff --git a/src/credits.c b/src/credits.c
index 4483e3160..1e96514b1 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -1056,10 +1056,10 @@ static const struct OamData gUnknown_085E703C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
diff --git a/src/data/field_event_obj/base_oam.h b/src/data/field_event_obj/base_oam.h
index 543382d43..af961f492 100755
--- a/src/data/field_event_obj/base_oam.h
+++ b/src/data/field_event_obj/base_oam.h
@@ -1,47 +1,47 @@
 const struct OamData gEventObjectBaseOam_8x8 = {
-    .shape = 0,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_16x8 = {
-    .shape = 1,
-    .size = 0,
+    .shape = SPRITE_SHAPE(16x8),
+    .size = SPRITE_SIZE(16x8),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_16x16 = {
-    .shape = 0,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_32x8 = {
-    .shape = 1,
-    .size = 1,
+    .shape = SPRITE_SHAPE(32x8),
+    .size = SPRITE_SIZE(32x8),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_64x32 = {
-    .shape = 1,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_16x32 = {
-    .shape = 2,
-    .size = 2,
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_32x32 = {
-    .shape = 0,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_64x64 = {
-    .shape = 0,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 2
 };
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 40ebdf9e4..07415949d 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -1,2823 +1,2823 @@
-const u32 gMonStillFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/front_pics/bulbasaur_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/palettes/bulbasaur_palette.gbapal.lz");
-const u32 gMonBackPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/back_pics/bulbasaur_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/palettes/bulbasaur_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/icons/bulbasaur_icon.4bpp");
-const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/footprints/bulbasaur_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/front_pics/ivysaur_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/palettes/ivysaur_palette.gbapal.lz");
-const u32 gMonBackPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/back_pics/ivysaur_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/palettes/ivysaur_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ivysaur[] = INCBIN_U8("graphics/pokemon/icons/ivysaur_icon.4bpp");
-const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/footprints/ivysaur_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/front_pics/venusaur_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/palettes/venusaur_palette.gbapal.lz");
-const u32 gMonBackPic_Venusaur[] = INCBIN_U32("graphics/pokemon/back_pics/venusaur_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/palettes/venusaur_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Venusaur[] = INCBIN_U8("graphics/pokemon/icons/venusaur_icon.4bpp");
-const u8 gMonFootprint_Venusaur[] = INCBIN_U8("graphics/pokemon/footprints/venusaur_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/front_pics/charmander_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Charmander[] = INCBIN_U32("graphics/pokemon/palettes/charmander_palette.gbapal.lz");
-const u32 gMonBackPic_Charmander[] = INCBIN_U32("graphics/pokemon/back_pics/charmander_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Charmander[] = INCBIN_U32("graphics/pokemon/palettes/charmander_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Charmander[] = INCBIN_U8("graphics/pokemon/icons/charmander_icon.4bpp");
-const u8 gMonFootprint_Charmander[] = INCBIN_U8("graphics/pokemon/footprints/charmander_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/front_pics/charmeleon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/palettes/charmeleon_palette.gbapal.lz");
-const u32 gMonBackPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/back_pics/charmeleon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/palettes/charmeleon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Charmeleon[] = INCBIN_U8("graphics/pokemon/icons/charmeleon_icon.4bpp");
-const u8 gMonFootprint_Charmeleon[] = INCBIN_U8("graphics/pokemon/footprints/charmeleon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/front_pics/charizard_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Charizard[] = INCBIN_U32("graphics/pokemon/palettes/charizard_palette.gbapal.lz");
-const u32 gMonBackPic_Charizard[] = INCBIN_U32("graphics/pokemon/back_pics/charizard_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Charizard[] = INCBIN_U32("graphics/pokemon/palettes/charizard_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Charizard[] = INCBIN_U8("graphics/pokemon/icons/charizard_icon.4bpp");
-const u8 gMonFootprint_Charizard[] = INCBIN_U8("graphics/pokemon/footprints/charizard_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/front_pics/squirtle_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/palettes/squirtle_palette.gbapal.lz");
-const u32 gMonBackPic_Squirtle[] = INCBIN_U32("graphics/pokemon/back_pics/squirtle_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/palettes/squirtle_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Squirtle[] = INCBIN_U8("graphics/pokemon/icons/squirtle_icon.4bpp");
-const u8 gMonFootprint_Squirtle[] = INCBIN_U8("graphics/pokemon/footprints/squirtle_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/front_pics/wartortle_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/palettes/wartortle_palette.gbapal.lz");
-const u32 gMonBackPic_Wartortle[] = INCBIN_U32("graphics/pokemon/back_pics/wartortle_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/palettes/wartortle_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Wartortle[] = INCBIN_U8("graphics/pokemon/icons/wartortle_icon.4bpp");
-const u8 gMonFootprint_Wartortle[] = INCBIN_U8("graphics/pokemon/footprints/wartortle_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/front_pics/blastoise_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/palettes/blastoise_palette.gbapal.lz");
-const u32 gMonBackPic_Blastoise[] = INCBIN_U32("graphics/pokemon/back_pics/blastoise_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/palettes/blastoise_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Blastoise[] = INCBIN_U8("graphics/pokemon/icons/blastoise_icon.4bpp");
-const u8 gMonFootprint_Blastoise[] = INCBIN_U8("graphics/pokemon/footprints/blastoise_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/front_pics/caterpie_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/palettes/caterpie_palette.gbapal.lz");
-const u32 gMonBackPic_Caterpie[] = INCBIN_U32("graphics/pokemon/back_pics/caterpie_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/palettes/caterpie_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Caterpie[] = INCBIN_U8("graphics/pokemon/icons/caterpie_icon.4bpp");
-const u8 gMonFootprint_Caterpie[] = INCBIN_U8("graphics/pokemon/footprints/caterpie_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/front_pics/metapod_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Metapod[] = INCBIN_U32("graphics/pokemon/palettes/metapod_palette.gbapal.lz");
-const u32 gMonBackPic_Metapod[] = INCBIN_U32("graphics/pokemon/back_pics/metapod_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Metapod[] = INCBIN_U32("graphics/pokemon/palettes/metapod_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Metapod[] = INCBIN_U8( "graphics/pokemon/icons/metapod_icon.4bpp");
-const u8 gMonFootprint_Metapod[] = INCBIN_U8("graphics/pokemon/footprints/metapod_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/front_pics/butterfree_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/palettes/butterfree_palette.gbapal.lz");
-const u32 gMonBackPic_Butterfree[] = INCBIN_U32("graphics/pokemon/back_pics/butterfree_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/palettes/butterfree_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Butterfree[] = INCBIN_U8("graphics/pokemon/icons/butterfree_icon.4bpp");
-const u8 gMonFootprint_Butterfree[] = INCBIN_U8("graphics/pokemon/footprints/butterfree_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/front_pics/weedle_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Weedle[] = INCBIN_U32("graphics/pokemon/palettes/weedle_palette.gbapal.lz");
-const u32 gMonBackPic_Weedle[] = INCBIN_U32("graphics/pokemon/back_pics/weedle_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Weedle[] = INCBIN_U32("graphics/pokemon/palettes/weedle_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Weedle[] = INCBIN_U8("graphics/pokemon/icons/weedle_icon.4bpp");
-const u8 gMonFootprint_Weedle[] = INCBIN_U8("graphics/pokemon/footprints/weedle_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/front_pics/kakuna_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/palettes/kakuna_palette.gbapal.lz");
-const u32 gMonBackPic_Kakuna[] = INCBIN_U32("graphics/pokemon/back_pics/kakuna_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/palettes/kakuna_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Kakuna[] = INCBIN_U8("graphics/pokemon/icons/kakuna_icon.4bpp");
-const u8 gMonFootprint_Kakuna[] = INCBIN_U8("graphics/pokemon/footprints/kakuna_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/front_pics/beedrill_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/palettes/beedrill_palette.gbapal.lz");
-const u32 gMonBackPic_Beedrill[] = INCBIN_U32("graphics/pokemon/back_pics/beedrill_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/palettes/beedrill_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Beedrill[] = INCBIN_U8("graphics/pokemon/icons/beedrill_icon.4bpp");
-const u8 gMonFootprint_Beedrill[] = INCBIN_U8("graphics/pokemon/footprints/beedrill_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/front_pics/pidgey_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/palettes/pidgey_palette.gbapal.lz");
-const u32 gMonBackPic_Pidgey[] = INCBIN_U32("graphics/pokemon/back_pics/pidgey_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/palettes/pidgey_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Pidgey[] = INCBIN_U8("graphics/pokemon/icons/pidgey_icon.4bpp");
-const u8 gMonFootprint_Pidgey[] = INCBIN_U8("graphics/pokemon/footprints/pidgey_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/front_pics/pidgeotto_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/palettes/pidgeotto_palette.gbapal.lz");
-const u32 gMonBackPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/back_pics/pidgeotto_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/palettes/pidgeotto_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Pidgeotto[] = INCBIN_U8("graphics/pokemon/icons/pidgeotto_icon.4bpp");
-const u8 gMonFootprint_Pidgeotto[] = INCBIN_U8("graphics/pokemon/footprints/pidgeotto_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/front_pics/pidgeot_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/palettes/pidgeot_palette.gbapal.lz");
-const u32 gMonBackPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/back_pics/pidgeot_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/palettes/pidgeot_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Pidgeot[] = INCBIN_U8("graphics/pokemon/icons/pidgeot_icon.4bpp");
-const u8 gMonFootprint_Pidgeot[] = INCBIN_U8("graphics/pokemon/footprints/pidgeot_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/front_pics/rattata_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Rattata[] = INCBIN_U32("graphics/pokemon/palettes/rattata_palette.gbapal.lz");
-const u32 gMonBackPic_Rattata[] = INCBIN_U32("graphics/pokemon/back_pics/rattata_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Rattata[] = INCBIN_U32("graphics/pokemon/palettes/rattata_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Rattata[] = INCBIN_U8("graphics/pokemon/icons/rattata_icon.4bpp");
-const u8 gMonFootprint_Rattata[] = INCBIN_U8("graphics/pokemon/footprints/rattata_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/front_pics/raticate_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Raticate[] = INCBIN_U32("graphics/pokemon/palettes/raticate_palette.gbapal.lz");
-const u32 gMonBackPic_Raticate[] = INCBIN_U32("graphics/pokemon/back_pics/raticate_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Raticate[] = INCBIN_U32("graphics/pokemon/palettes/raticate_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Raticate[] = INCBIN_U8("graphics/pokemon/icons/raticate_icon.4bpp");
-const u8 gMonFootprint_Raticate[] = INCBIN_U8("graphics/pokemon/footprints/raticate_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/front_pics/spearow_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Spearow[] = INCBIN_U32("graphics/pokemon/palettes/spearow_palette.gbapal.lz");
-const u32 gMonBackPic_Spearow[] = INCBIN_U32("graphics/pokemon/back_pics/spearow_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Spearow[] = INCBIN_U32("graphics/pokemon/palettes/spearow_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Spearow[] = INCBIN_U8("graphics/pokemon/icons/spearow_icon.4bpp");
-const u8 gMonFootprint_Spearow[] = INCBIN_U8("graphics/pokemon/footprints/spearow_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/front_pics/fearow_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Fearow[] = INCBIN_U32("graphics/pokemon/palettes/fearow_palette.gbapal.lz");
-const u32 gMonBackPic_Fearow[] = INCBIN_U32("graphics/pokemon/back_pics/fearow_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Fearow[] = INCBIN_U32("graphics/pokemon/palettes/fearow_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Fearow[] = INCBIN_U8("graphics/pokemon/icons/fearow_icon.4bpp");
-const u8 gMonFootprint_Fearow[] = INCBIN_U8("graphics/pokemon/footprints/fearow_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/front_pics/ekans_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ekans[] = INCBIN_U32("graphics/pokemon/palettes/ekans_palette.gbapal.lz");
-const u32 gMonBackPic_Ekans[] = INCBIN_U32("graphics/pokemon/back_pics/ekans_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ekans[] = INCBIN_U32("graphics/pokemon/palettes/ekans_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ekans[] = INCBIN_U8("graphics/pokemon/icons/ekans_icon.4bpp");
-const u8 gMonFootprint_Ekans[] = INCBIN_U8("graphics/pokemon/footprints/ekans_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/front_pics/arbok_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Arbok[] = INCBIN_U32("graphics/pokemon/palettes/arbok_palette.gbapal.lz");
-const u32 gMonBackPic_Arbok[] = INCBIN_U32("graphics/pokemon/back_pics/arbok_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Arbok[] = INCBIN_U32("graphics/pokemon/palettes/arbok_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Arbok[] = INCBIN_U8("graphics/pokemon/icons/arbok_icon.4bpp");
-const u8 gMonFootprint_Arbok[] = INCBIN_U8("graphics/pokemon/footprints/arbok_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/front_pics/pikachu_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/palettes/pikachu_palette.gbapal.lz");
-const u32 gMonBackPic_Pikachu[] = INCBIN_U32("graphics/pokemon/back_pics/pikachu_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/palettes/pikachu_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Pikachu[] = INCBIN_U8("graphics/pokemon/icons/pikachu_icon.4bpp");
-const u8 gMonFootprint_Pikachu[] = INCBIN_U8("graphics/pokemon/footprints/pikachu_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/front_pics/raichu_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Raichu[] = INCBIN_U32("graphics/pokemon/palettes/raichu_palette.gbapal.lz");
-const u32 gMonBackPic_Raichu[] = INCBIN_U32("graphics/pokemon/back_pics/raichu_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Raichu[] = INCBIN_U32("graphics/pokemon/palettes/raichu_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Raichu[] = INCBIN_U8("graphics/pokemon/icons/raichu_icon.4bpp");
-const u8 gMonFootprint_Raichu[] = INCBIN_U8("graphics/pokemon/footprints/raichu_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/front_pics/sandshrew_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/palettes/sandshrew_palette.gbapal.lz");
-const u32 gMonBackPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/back_pics/sandshrew_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/palettes/sandshrew_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Sandshrew[] = INCBIN_U8("graphics/pokemon/icons/sandshrew_icon.4bpp");
-const u8 gMonFootprint_Sandshrew[] = INCBIN_U8("graphics/pokemon/footprints/sandshrew_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/front_pics/sandslash_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/palettes/sandslash_palette.gbapal.lz");
-const u32 gMonBackPic_Sandslash[] = INCBIN_U32("graphics/pokemon/back_pics/sandslash_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/palettes/sandslash_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Sandslash[] = INCBIN_U8("graphics/pokemon/icons/sandslash_icon.4bpp");
-const u8 gMonFootprint_Sandslash[] = INCBIN_U8("graphics/pokemon/footprints/sandslash_footprint.1bpp");
-
-const u32 gMonStillFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/front_pics/nidoran_f_still_front_pic.4bpp.lz");
-const u32 gMonPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/palettes/nidoran_f_palette.gbapal.lz");
-const u32 gMonBackPic_NidoranF[] = INCBIN_U32("graphics/pokemon/back_pics/nidoran_f_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/palettes/nidoran_f_shiny_palette.gbapal.lz");
-const u8 gMonIcon_NidoranF[] = INCBIN_U8("graphics/pokemon/icons/nidoran_f_icon.4bpp");
-const u8 gMonFootprint_NidoranF[] = INCBIN_U8("graphics/pokemon/footprints/nidoran_f_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/front_pics/nidorina_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/palettes/nidorina_palette.gbapal.lz");
-const u32 gMonBackPic_Nidorina[] = INCBIN_U32("graphics/pokemon/back_pics/nidorina_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/palettes/nidorina_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Nidorina[] = INCBIN_U8("graphics/pokemon/icons/nidorina_icon.4bpp");
-const u8 gMonFootprint_Nidorina[] = INCBIN_U8("graphics/pokemon/footprints/nidorina_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/front_pics/nidoqueen_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/palettes/nidoqueen_palette.gbapal.lz");
-const u32 gMonBackPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/back_pics/nidoqueen_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/palettes/nidoqueen_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Nidoqueen[] = INCBIN_U8("graphics/pokemon/icons/nidoqueen_icon.4bpp");
-const u8 gMonFootprint_Nidoqueen[] = INCBIN_U8("graphics/pokemon/footprints/nidoqueen_footprint.1bpp");
-
-const u32 gMonStillFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/front_pics/nidoran_m_still_front_pic.4bpp.lz");
-const u32 gMonPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/palettes/nidoran_m_palette.gbapal.lz");
-const u32 gMonBackPic_NidoranM[] = INCBIN_U32("graphics/pokemon/back_pics/nidoran_m_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/palettes/nidoran_m_shiny_palette.gbapal.lz");
-const u8 gMonIcon_NidoranM[] = INCBIN_U8("graphics/pokemon/icons/nidoran_m_icon.4bpp");
-const u8 gMonFootprint_NidoranM[] = INCBIN_U8("graphics/pokemon/footprints/nidoran_m_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/front_pics/nidorino_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/palettes/nidorino_palette.gbapal.lz");
-const u32 gMonBackPic_Nidorino[] = INCBIN_U32("graphics/pokemon/back_pics/nidorino_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/palettes/nidorino_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Nidorino[] = INCBIN_U8("graphics/pokemon/icons/nidorino_icon.4bpp");
-const u8 gMonFootprint_Nidorino[] = INCBIN_U8("graphics/pokemon/footprints/nidorino_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/front_pics/nidoking_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/palettes/nidoking_palette.gbapal.lz");
-const u32 gMonBackPic_Nidoking[] = INCBIN_U32("graphics/pokemon/back_pics/nidoking_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/palettes/nidoking_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Nidoking[] = INCBIN_U8("graphics/pokemon/icons/nidoking_icon.4bpp");
-const u8 gMonFootprint_Nidoking[] = INCBIN_U8("graphics/pokemon/footprints/nidoking_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/front_pics/clefairy_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/palettes/clefairy_palette.gbapal.lz");
-const u32 gMonBackPic_Clefairy[] = INCBIN_U32("graphics/pokemon/back_pics/clefairy_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/palettes/clefairy_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Clefairy[] = INCBIN_U8("graphics/pokemon/icons/clefairy_icon.4bpp");
-const u8 gMonFootprint_Clefairy[] = INCBIN_U8("graphics/pokemon/footprints/clefairy_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/front_pics/clefable_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Clefable[] = INCBIN_U32("graphics/pokemon/palettes/clefable_palette.gbapal.lz");
-const u32 gMonBackPic_Clefable[] = INCBIN_U32("graphics/pokemon/back_pics/clefable_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Clefable[] = INCBIN_U32("graphics/pokemon/palettes/clefable_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Clefable[] = INCBIN_U8("graphics/pokemon/icons/clefable_icon.4bpp");
-const u8 gMonFootprint_Clefable[] = INCBIN_U8("graphics/pokemon/footprints/clefable_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/front_pics/vulpix_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/palettes/vulpix_palette.gbapal.lz");
-const u32 gMonBackPic_Vulpix[] = INCBIN_U32("graphics/pokemon/back_pics/vulpix_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/palettes/vulpix_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Vulpix[] = INCBIN_U8("graphics/pokemon/icons/vulpix_icon.4bpp");
-const u8 gMonFootprint_Vulpix[] = INCBIN_U8("graphics/pokemon/footprints/vulpix_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/front_pics/ninetales_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/palettes/ninetales_palette.gbapal.lz");
-const u32 gMonBackPic_Ninetales[] = INCBIN_U32("graphics/pokemon/back_pics/ninetales_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/palettes/ninetales_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ninetales[] = INCBIN_U8("graphics/pokemon/icons/ninetales_icon.4bpp");
-const u8 gMonFootprint_Ninetales[] = INCBIN_U8("graphics/pokemon/footprints/ninetales_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/front_pics/jigglypuff_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/palettes/jigglypuff_palette.gbapal.lz");
-const u32 gMonBackPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/back_pics/jigglypuff_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/palettes/jigglypuff_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Jigglypuff[] = INCBIN_U8("graphics/pokemon/icons/jigglypuff_icon.4bpp");
-const u8 gMonFootprint_Jigglypuff[] = INCBIN_U8("graphics/pokemon/footprints/jigglypuff_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/front_pics/wigglytuff_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/palettes/wigglytuff_palette.gbapal.lz");
-const u32 gMonBackPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/back_pics/wigglytuff_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/palettes/wigglytuff_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Wigglytuff[] = INCBIN_U8("graphics/pokemon/icons/wigglytuff_icon.4bpp");
-const u8 gMonFootprint_Wigglytuff[] = INCBIN_U8("graphics/pokemon/footprints/wigglytuff_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/front_pics/zubat_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Zubat[] = INCBIN_U32("graphics/pokemon/palettes/zubat_palette.gbapal.lz");
-const u32 gMonBackPic_Zubat[] = INCBIN_U32("graphics/pokemon/back_pics/zubat_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Zubat[] = INCBIN_U32("graphics/pokemon/palettes/zubat_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Zubat[] = INCBIN_U8("graphics/pokemon/icons/zubat_icon.4bpp");
-const u8 gMonFootprint_Zubat[] = INCBIN_U8("graphics/pokemon/footprints/zubat_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/front_pics/golbat_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Golbat[] = INCBIN_U32("graphics/pokemon/palettes/golbat_palette.gbapal.lz");
-const u32 gMonBackPic_Golbat[] = INCBIN_U32("graphics/pokemon/back_pics/golbat_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Golbat[] = INCBIN_U32("graphics/pokemon/palettes/golbat_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Golbat[] = INCBIN_U8("graphics/pokemon/icons/golbat_icon.4bpp");
-const u8 gMonFootprint_Golbat[] = INCBIN_U8("graphics/pokemon/footprints/golbat_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/front_pics/oddish_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Oddish[] = INCBIN_U32("graphics/pokemon/palettes/oddish_palette.gbapal.lz");
-const u32 gMonBackPic_Oddish[] = INCBIN_U32("graphics/pokemon/back_pics/oddish_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Oddish[] = INCBIN_U32("graphics/pokemon/palettes/oddish_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Oddish[] = INCBIN_U8("graphics/pokemon/icons/oddish_icon.4bpp");
-const u8 gMonFootprint_Oddish[] = INCBIN_U8("graphics/pokemon/footprints/oddish_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/front_pics/gloom_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Gloom[] = INCBIN_U32("graphics/pokemon/palettes/gloom_palette.gbapal.lz");
-const u32 gMonBackPic_Gloom[] = INCBIN_U32("graphics/pokemon/back_pics/gloom_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Gloom[] = INCBIN_U32("graphics/pokemon/palettes/gloom_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Gloom[] = INCBIN_U8("graphics/pokemon/icons/gloom_icon.4bpp");
-const u8 gMonFootprint_Gloom[] = INCBIN_U8("graphics/pokemon/footprints/gloom_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/front_pics/vileplume_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/palettes/vileplume_palette.gbapal.lz");
-const u32 gMonBackPic_Vileplume[] = INCBIN_U32("graphics/pokemon/back_pics/vileplume_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/palettes/vileplume_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Vileplume[] = INCBIN_U8("graphics/pokemon/icons/vileplume_icon.4bpp");
-const u8 gMonFootprint_Vileplume[] = INCBIN_U8("graphics/pokemon/footprints/vileplume_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/front_pics/paras_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Paras[] = INCBIN_U32("graphics/pokemon/palettes/paras_palette.gbapal.lz");
-const u32 gMonBackPic_Paras[] = INCBIN_U32("graphics/pokemon/back_pics/paras_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Paras[] = INCBIN_U32("graphics/pokemon/palettes/paras_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Paras[] = INCBIN_U8("graphics/pokemon/icons/paras_icon.4bpp");
-const u8 gMonFootprint_Paras[] = INCBIN_U8("graphics/pokemon/footprints/paras_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/front_pics/parasect_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Parasect[] = INCBIN_U32("graphics/pokemon/palettes/parasect_palette.gbapal.lz");
-const u32 gMonBackPic_Parasect[] = INCBIN_U32("graphics/pokemon/back_pics/parasect_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Parasect[] = INCBIN_U32("graphics/pokemon/palettes/parasect_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Parasect[] = INCBIN_U8("graphics/pokemon/icons/parasect_icon.4bpp");
-const u8 gMonFootprint_Parasect[] = INCBIN_U8("graphics/pokemon/footprints/parasect_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/front_pics/venonat_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Venonat[] = INCBIN_U32("graphics/pokemon/palettes/venonat_palette.gbapal.lz");
-const u32 gMonBackPic_Venonat[] = INCBIN_U32("graphics/pokemon/back_pics/venonat_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Venonat[] = INCBIN_U32("graphics/pokemon/palettes/venonat_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Venonat[] = INCBIN_U8("graphics/pokemon/icons/venonat_icon.4bpp");
-const u8 gMonFootprint_Venonat[] = INCBIN_U8("graphics/pokemon/footprints/venonat_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/front_pics/venomoth_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/palettes/venomoth_palette.gbapal.lz");
-const u32 gMonBackPic_Venomoth[] = INCBIN_U32("graphics/pokemon/back_pics/venomoth_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/palettes/venomoth_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Venomoth[] = INCBIN_U8("graphics/pokemon/icons/venomoth_icon.4bpp");
-const u8 gMonFootprint_Venomoth[] = INCBIN_U8("graphics/pokemon/footprints/venomoth_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/front_pics/diglett_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Diglett[] = INCBIN_U32("graphics/pokemon/palettes/diglett_palette.gbapal.lz");
-const u32 gMonBackPic_Diglett[] = INCBIN_U32("graphics/pokemon/back_pics/diglett_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Diglett[] = INCBIN_U32("graphics/pokemon/palettes/diglett_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Diglett[] = INCBIN_U8("graphics/pokemon/icons/diglett_icon.4bpp");
-const u8 gMonFootprint_Diglett[] = INCBIN_U8("graphics/pokemon/footprints/diglett_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/front_pics/dugtrio_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/palettes/dugtrio_palette.gbapal.lz");
-const u32 gMonBackPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/back_pics/dugtrio_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/palettes/dugtrio_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Dugtrio[] = INCBIN_U8("graphics/pokemon/icons/dugtrio_icon.4bpp");
-const u8 gMonFootprint_Dugtrio[] = INCBIN_U8("graphics/pokemon/footprints/dugtrio_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/front_pics/meowth_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Meowth[] = INCBIN_U32("graphics/pokemon/palettes/meowth_palette.gbapal.lz");
-const u32 gMonBackPic_Meowth[] = INCBIN_U32("graphics/pokemon/back_pics/meowth_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Meowth[] = INCBIN_U32("graphics/pokemon/palettes/meowth_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Meowth[] = INCBIN_U8("graphics/pokemon/icons/meowth_icon.4bpp");
-const u8 gMonFootprint_Meowth[] = INCBIN_U8("graphics/pokemon/footprints/meowth_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/front_pics/persian_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Persian[] = INCBIN_U32("graphics/pokemon/palettes/persian_palette.gbapal.lz");
-const u32 gMonBackPic_Persian[] = INCBIN_U32("graphics/pokemon/back_pics/persian_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Persian[] = INCBIN_U32("graphics/pokemon/palettes/persian_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Persian[] = INCBIN_U8("graphics/pokemon/icons/persian_icon.4bpp");
-const u8 gMonFootprint_Persian[] = INCBIN_U8("graphics/pokemon/footprints/persian_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/front_pics/psyduck_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/palettes/psyduck_palette.gbapal.lz");
-const u32 gMonBackPic_Psyduck[] = INCBIN_U32("graphics/pokemon/back_pics/psyduck_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/palettes/psyduck_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Psyduck[] = INCBIN_U8("graphics/pokemon/icons/psyduck_icon.4bpp");
-const u8 gMonFootprint_Psyduck[] = INCBIN_U8("graphics/pokemon/footprints/psyduck_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/front_pics/golduck_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Golduck[] = INCBIN_U32("graphics/pokemon/palettes/golduck_palette.gbapal.lz");
-const u32 gMonBackPic_Golduck[] = INCBIN_U32("graphics/pokemon/back_pics/golduck_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Golduck[] = INCBIN_U32("graphics/pokemon/palettes/golduck_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Golduck[] = INCBIN_U8("graphics/pokemon/icons/golduck_icon.4bpp");
-const u8 gMonFootprint_Golduck[] = INCBIN_U8("graphics/pokemon/footprints/golduck_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/front_pics/mankey_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Mankey[] = INCBIN_U32("graphics/pokemon/palettes/mankey_palette.gbapal.lz");
-const u32 gMonBackPic_Mankey[] = INCBIN_U32("graphics/pokemon/back_pics/mankey_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Mankey[] = INCBIN_U32("graphics/pokemon/palettes/mankey_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Mankey[] = INCBIN_U8("graphics/pokemon/icons/mankey_icon.4bpp");
-const u8 gMonFootprint_Mankey[] = INCBIN_U8("graphics/pokemon/footprints/mankey_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/front_pics/primeape_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Primeape[] = INCBIN_U32("graphics/pokemon/palettes/primeape_palette.gbapal.lz");
-const u32 gMonBackPic_Primeape[] = INCBIN_U32("graphics/pokemon/back_pics/primeape_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Primeape[] = INCBIN_U32("graphics/pokemon/palettes/primeape_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Primeape[] = INCBIN_U8("graphics/pokemon/icons/primeape_icon.4bpp");
-const u8 gMonFootprint_Primeape[] = INCBIN_U8("graphics/pokemon/footprints/primeape_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/front_pics/growlithe_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/palettes/growlithe_palette.gbapal.lz");
-const u32 gMonBackPic_Growlithe[] = INCBIN_U32("graphics/pokemon/back_pics/growlithe_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/palettes/growlithe_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Growlithe[] = INCBIN_U8("graphics/pokemon/icons/growlithe_icon.4bpp");
-const u8 gMonFootprint_Growlithe[] = INCBIN_U8("graphics/pokemon/footprints/growlithe_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/front_pics/arcanine_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/palettes/arcanine_palette.gbapal.lz");
-const u32 gMonBackPic_Arcanine[] = INCBIN_U32("graphics/pokemon/back_pics/arcanine_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/palettes/arcanine_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Arcanine[] = INCBIN_U8("graphics/pokemon/icons/arcanine_icon.4bpp");
-const u8 gMonFootprint_Arcanine[] = INCBIN_U8("graphics/pokemon/footprints/arcanine_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/front_pics/poliwag_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/palettes/poliwag_palette.gbapal.lz");
-const u32 gMonBackPic_Poliwag[] = INCBIN_U32("graphics/pokemon/back_pics/poliwag_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/palettes/poliwag_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Poliwag[] = INCBIN_U8("graphics/pokemon/icons/poliwag_icon.4bpp");
-const u8 gMonFootprint_Poliwag[] = INCBIN_U8("graphics/pokemon/footprints/poliwag_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/front_pics/poliwhirl_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/palettes/poliwhirl_palette.gbapal.lz");
-const u32 gMonBackPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/back_pics/poliwhirl_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/palettes/poliwhirl_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Poliwhirl[] = INCBIN_U8("graphics/pokemon/icons/poliwhirl_icon.4bpp");
-const u8 gMonFootprint_Poliwhirl[] = INCBIN_U8("graphics/pokemon/footprints/poliwhirl_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/front_pics/poliwrath_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/palettes/poliwrath_palette.gbapal.lz");
-const u32 gMonBackPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/back_pics/poliwrath_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/palettes/poliwrath_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Poliwrath[] = INCBIN_U8("graphics/pokemon/icons/poliwrath_icon.4bpp");
-const u8 gMonFootprint_Poliwrath[] = INCBIN_U8("graphics/pokemon/footprints/poliwrath_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/front_pics/abra_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Abra[] = INCBIN_U32("graphics/pokemon/palettes/abra_palette.gbapal.lz");
-const u32 gMonBackPic_Abra[] = INCBIN_U32("graphics/pokemon/back_pics/abra_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Abra[] = INCBIN_U32("graphics/pokemon/palettes/abra_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Abra[] = INCBIN_U8("graphics/pokemon/icons/abra_icon.4bpp");
-const u8 gMonFootprint_Abra[] = INCBIN_U8("graphics/pokemon/footprints/abra_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/front_pics/kadabra_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/palettes/kadabra_palette.gbapal.lz");
-const u32 gMonBackPic_Kadabra[] = INCBIN_U32("graphics/pokemon/back_pics/kadabra_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/palettes/kadabra_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Kadabra[] = INCBIN_U8("graphics/pokemon/icons/kadabra_icon.4bpp");
-const u8 gMonFootprint_Kadabra[] = INCBIN_U8("graphics/pokemon/footprints/kadabra_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/front_pics/alakazam_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/palettes/alakazam_palette.gbapal.lz");
-const u32 gMonBackPic_Alakazam[] = INCBIN_U32("graphics/pokemon/back_pics/alakazam_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/palettes/alakazam_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Alakazam[] = INCBIN_U8("graphics/pokemon/icons/alakazam_icon.4bpp");
-const u8 gMonFootprint_Alakazam[] = INCBIN_U8("graphics/pokemon/footprints/alakazam_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/front_pics/machop_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Machop[] = INCBIN_U32("graphics/pokemon/palettes/machop_palette.gbapal.lz");
-const u32 gMonBackPic_Machop[] = INCBIN_U32("graphics/pokemon/back_pics/machop_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Machop[] = INCBIN_U32("graphics/pokemon/palettes/machop_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Machop[] = INCBIN_U8("graphics/pokemon/icons/machop_icon.4bpp");
-const u8 gMonFootprint_Machop[] = INCBIN_U8("graphics/pokemon/footprints/machop_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/front_pics/machoke_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Machoke[] = INCBIN_U32("graphics/pokemon/palettes/machoke_palette.gbapal.lz");
-const u32 gMonBackPic_Machoke[] = INCBIN_U32("graphics/pokemon/back_pics/machoke_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Machoke[] = INCBIN_U32("graphics/pokemon/palettes/machoke_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Machoke[] = INCBIN_U8("graphics/pokemon/icons/machoke_icon.4bpp");
-const u8 gMonFootprint_Machoke[] = INCBIN_U8("graphics/pokemon/footprints/machoke_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/front_pics/machamp_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Machamp[] = INCBIN_U32("graphics/pokemon/palettes/machamp_palette.gbapal.lz");
-const u32 gMonBackPic_Machamp[] = INCBIN_U32("graphics/pokemon/back_pics/machamp_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Machamp[] = INCBIN_U32("graphics/pokemon/palettes/machamp_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Machamp[] = INCBIN_U8("graphics/pokemon/icons/machamp_icon.4bpp");
-const u8 gMonFootprint_Machamp[] = INCBIN_U8("graphics/pokemon/footprints/machamp_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/front_pics/bellsprout_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/palettes/bellsprout_palette.gbapal.lz");
-const u32 gMonBackPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/back_pics/bellsprout_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/palettes/bellsprout_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Bellsprout[] = INCBIN_U8("graphics/pokemon/icons/bellsprout_icon.4bpp");
-const u8 gMonFootprint_Bellsprout[] = INCBIN_U8("graphics/pokemon/footprints/bellsprout_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/front_pics/weepinbell_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/palettes/weepinbell_palette.gbapal.lz");
-const u32 gMonBackPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/back_pics/weepinbell_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/palettes/weepinbell_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Weepinbell[] = INCBIN_U8("graphics/pokemon/icons/weepinbell_icon.4bpp");
-const u8 gMonFootprint_Weepinbell[] = INCBIN_U8("graphics/pokemon/footprints/weepinbell_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/front_pics/victreebel_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/palettes/victreebel_palette.gbapal.lz");
-const u32 gMonBackPic_Victreebel[] = INCBIN_U32("graphics/pokemon/back_pics/victreebel_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/palettes/victreebel_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Victreebel[] = INCBIN_U8("graphics/pokemon/icons/victreebel_icon.4bpp");
-const u8 gMonFootprint_Victreebel[] = INCBIN_U8("graphics/pokemon/footprints/victreebel_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/front_pics/tentacool_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/palettes/tentacool_palette.gbapal.lz");
-const u32 gMonBackPic_Tentacool[] = INCBIN_U32("graphics/pokemon/back_pics/tentacool_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/palettes/tentacool_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Tentacool[] = INCBIN_U8("graphics/pokemon/icons/tentacool_icon.4bpp");
-const u8 gMonFootprint_Tentacool[] = INCBIN_U8("graphics/pokemon/footprints/tentacool_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/front_pics/tentacruel_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/palettes/tentacruel_palette.gbapal.lz");
-const u32 gMonBackPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/back_pics/tentacruel_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/palettes/tentacruel_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Tentacruel[] = INCBIN_U8("graphics/pokemon/icons/tentacruel_icon.4bpp");
-const u8 gMonFootprint_Tentacruel[] = INCBIN_U8("graphics/pokemon/footprints/tentacruel_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/front_pics/geodude_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Geodude[] = INCBIN_U32("graphics/pokemon/palettes/geodude_palette.gbapal.lz");
-const u32 gMonBackPic_Geodude[] = INCBIN_U32("graphics/pokemon/back_pics/geodude_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Geodude[] = INCBIN_U32("graphics/pokemon/palettes/geodude_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Geodude[] = INCBIN_U8("graphics/pokemon/icons/geodude_icon.4bpp");
-const u8 gMonFootprint_Geodude[] = INCBIN_U8("graphics/pokemon/footprints/geodude_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/front_pics/graveler_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Graveler[] = INCBIN_U32("graphics/pokemon/palettes/graveler_palette.gbapal.lz");
-const u32 gMonBackPic_Graveler[] = INCBIN_U32("graphics/pokemon/back_pics/graveler_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Graveler[] = INCBIN_U32("graphics/pokemon/palettes/graveler_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Graveler[] = INCBIN_U8("graphics/pokemon/icons/graveler_icon.4bpp");
-const u8 gMonFootprint_Graveler[] = INCBIN_U8("graphics/pokemon/footprints/graveler_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/front_pics/golem_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Golem[] = INCBIN_U32("graphics/pokemon/palettes/golem_palette.gbapal.lz");
-const u32 gMonBackPic_Golem[] = INCBIN_U32("graphics/pokemon/back_pics/golem_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Golem[] = INCBIN_U32("graphics/pokemon/palettes/golem_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Golem[] = INCBIN_U8("graphics/pokemon/icons/golem_icon.4bpp");
-const u8 gMonFootprint_Golem[] = INCBIN_U8("graphics/pokemon/footprints/golem_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/front_pics/ponyta_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/palettes/ponyta_palette.gbapal.lz");
-const u32 gMonBackPic_Ponyta[] = INCBIN_U32("graphics/pokemon/back_pics/ponyta_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/palettes/ponyta_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ponyta[] = INCBIN_U8("graphics/pokemon/icons/ponyta_icon.4bpp");
-const u8 gMonFootprint_Ponyta[] = INCBIN_U8("graphics/pokemon/footprints/ponyta_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/front_pics/rapidash_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/palettes/rapidash_palette.gbapal.lz");
-const u32 gMonBackPic_Rapidash[] = INCBIN_U32("graphics/pokemon/back_pics/rapidash_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/palettes/rapidash_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Rapidash[] = INCBIN_U8("graphics/pokemon/icons/rapidash_icon.4bpp");
-const u8 gMonFootprint_Rapidash[] = INCBIN_U8("graphics/pokemon/footprints/rapidash_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/front_pics/slowpoke_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/palettes/slowpoke_palette.gbapal.lz");
-const u32 gMonBackPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/back_pics/slowpoke_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/palettes/slowpoke_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Slowpoke[] = INCBIN_U8("graphics/pokemon/icons/slowpoke_icon.4bpp");
-const u8 gMonFootprint_Slowpoke[] = INCBIN_U8("graphics/pokemon/footprints/slowpoke_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/front_pics/slowbro_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/palettes/slowbro_palette.gbapal.lz");
-const u32 gMonBackPic_Slowbro[] = INCBIN_U32("graphics/pokemon/back_pics/slowbro_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/palettes/slowbro_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Slowbro[] = INCBIN_U8("graphics/pokemon/icons/slowbro_icon.4bpp");
-const u8 gMonFootprint_Slowbro[] = INCBIN_U8("graphics/pokemon/footprints/slowbro_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/front_pics/magnemite_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/palettes/magnemite_palette.gbapal.lz");
-const u32 gMonBackPic_Magnemite[] = INCBIN_U32("graphics/pokemon/back_pics/magnemite_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/palettes/magnemite_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Magnemite[] = INCBIN_U8("graphics/pokemon/icons/magnemite_icon.4bpp");
-const u8 gMonFootprint_Magnemite[] = INCBIN_U8("graphics/pokemon/footprints/magnemite_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/front_pics/magneton_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Magneton[] = INCBIN_U32("graphics/pokemon/palettes/magneton_palette.gbapal.lz");
-const u32 gMonBackPic_Magneton[] = INCBIN_U32("graphics/pokemon/back_pics/magneton_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Magneton[] = INCBIN_U32("graphics/pokemon/palettes/magneton_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Magneton[] = INCBIN_U8("graphics/pokemon/icons/magneton_icon.4bpp");
-const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/footprints/magneton_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/front_pics/farfetch_d_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/palettes/farfetch_d_palette.gbapal.lz");
-const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/back_pics/farfetch_d_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/palettes/farfetch_d_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/icons/farfetch_d_icon.4bpp");
-const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/footprints/farfetch_d_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/front_pics/doduo_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Doduo[] = INCBIN_U32("graphics/pokemon/palettes/doduo_palette.gbapal.lz");
-const u32 gMonBackPic_Doduo[] = INCBIN_U32("graphics/pokemon/back_pics/doduo_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Doduo[] = INCBIN_U32("graphics/pokemon/palettes/doduo_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Doduo[] = INCBIN_U8("graphics/pokemon/icons/doduo_icon.4bpp");
-const u8 gMonFootprint_Doduo[] = INCBIN_U8("graphics/pokemon/footprints/doduo_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/front_pics/dodrio_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/palettes/dodrio_palette.gbapal.lz");
-const u32 gMonBackPic_Dodrio[] = INCBIN_U32("graphics/pokemon/back_pics/dodrio_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/palettes/dodrio_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Dodrio[] = INCBIN_U8("graphics/pokemon/icons/dodrio_icon.4bpp");
-const u8 gMonFootprint_Dodrio[] = INCBIN_U8("graphics/pokemon/footprints/dodrio_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/front_pics/seel_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Seel[] = INCBIN_U32("graphics/pokemon/palettes/seel_palette.gbapal.lz");
-const u32 gMonBackPic_Seel[] = INCBIN_U32("graphics/pokemon/back_pics/seel_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Seel[] = INCBIN_U32("graphics/pokemon/palettes/seel_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Seel[] = INCBIN_U8("graphics/pokemon/icons/seel_icon.4bpp");
-const u8 gMonFootprint_Seel[] = INCBIN_U8("graphics/pokemon/footprints/seel_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/front_pics/dewgong_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/palettes/dewgong_palette.gbapal.lz");
-const u32 gMonBackPic_Dewgong[] = INCBIN_U32("graphics/pokemon/back_pics/dewgong_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/palettes/dewgong_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Dewgong[] = INCBIN_U8("graphics/pokemon/icons/dewgong_icon.4bpp");
-const u8 gMonFootprint_Dewgong[] = INCBIN_U8("graphics/pokemon/footprints/dewgong_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/front_pics/grimer_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Grimer[] = INCBIN_U32("graphics/pokemon/palettes/grimer_palette.gbapal.lz");
-const u32 gMonBackPic_Grimer[] = INCBIN_U32("graphics/pokemon/back_pics/grimer_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Grimer[] = INCBIN_U32("graphics/pokemon/palettes/grimer_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Grimer[] = INCBIN_U8("graphics/pokemon/icons/grimer_icon.4bpp");
-const u8 gMonFootprint_Grimer[] = INCBIN_U8("graphics/pokemon/footprints/grimer_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/front_pics/muk_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Muk[] = INCBIN_U32("graphics/pokemon/palettes/muk_palette.gbapal.lz");
-const u32 gMonBackPic_Muk[] = INCBIN_U32("graphics/pokemon/back_pics/muk_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Muk[] = INCBIN_U32("graphics/pokemon/palettes/muk_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Muk[] = INCBIN_U8("graphics/pokemon/icons/muk_icon.4bpp");
-const u8 gMonFootprint_Muk[] = INCBIN_U8("graphics/pokemon/footprints/muk_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/front_pics/shellder_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Shellder[] = INCBIN_U32("graphics/pokemon/palettes/shellder_palette.gbapal.lz");
-const u32 gMonBackPic_Shellder[] = INCBIN_U32("graphics/pokemon/back_pics/shellder_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Shellder[] = INCBIN_U32("graphics/pokemon/palettes/shellder_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Shellder[] = INCBIN_U8("graphics/pokemon/icons/shellder_icon.4bpp");
-const u8 gMonFootprint_Shellder[] = INCBIN_U8("graphics/pokemon/footprints/shellder_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/front_pics/cloyster_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/palettes/cloyster_palette.gbapal.lz");
-const u32 gMonBackPic_Cloyster[] = INCBIN_U32("graphics/pokemon/back_pics/cloyster_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/palettes/cloyster_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Cloyster[] = INCBIN_U8("graphics/pokemon/icons/cloyster_icon.4bpp");
-const u8 gMonFootprint_Cloyster[] = INCBIN_U8("graphics/pokemon/footprints/cloyster_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/front_pics/gastly_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Gastly[] = INCBIN_U32("graphics/pokemon/palettes/gastly_palette.gbapal.lz");
-const u32 gMonBackPic_Gastly[] = INCBIN_U32("graphics/pokemon/back_pics/gastly_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Gastly[] = INCBIN_U32("graphics/pokemon/palettes/gastly_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Gastly[] = INCBIN_U8("graphics/pokemon/icons/gastly_icon.4bpp");
-const u8 gMonFootprint_Gastly[] = INCBIN_U8("graphics/pokemon/footprints/gastly_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/front_pics/haunter_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Haunter[] = INCBIN_U32("graphics/pokemon/palettes/haunter_palette.gbapal.lz");
-const u32 gMonBackPic_Haunter[] = INCBIN_U32("graphics/pokemon/back_pics/haunter_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Haunter[] = INCBIN_U32("graphics/pokemon/palettes/haunter_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Haunter[] = INCBIN_U8("graphics/pokemon/icons/haunter_icon.4bpp");
-const u8 gMonFootprint_Haunter[] = INCBIN_U8("graphics/pokemon/footprints/haunter_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/front_pics/gengar_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Gengar[] = INCBIN_U32("graphics/pokemon/palettes/gengar_palette.gbapal.lz");
-const u32 gMonBackPic_Gengar[] = INCBIN_U32("graphics/pokemon/back_pics/gengar_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Gengar[] = INCBIN_U32("graphics/pokemon/palettes/gengar_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Gengar[] = INCBIN_U8("graphics/pokemon/icons/gengar_icon.4bpp");
-const u8 gMonFootprint_Gengar[] = INCBIN_U8("graphics/pokemon/footprints/gengar_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/front_pics/onix_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Onix[] = INCBIN_U32("graphics/pokemon/palettes/onix_palette.gbapal.lz");
-const u32 gMonBackPic_Onix[] = INCBIN_U32("graphics/pokemon/back_pics/onix_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Onix[] = INCBIN_U32("graphics/pokemon/palettes/onix_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Onix[] = INCBIN_U8("graphics/pokemon/icons/onix_icon.4bpp");
-const u8 gMonFootprint_Onix[] = INCBIN_U8("graphics/pokemon/footprints/onix_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/front_pics/drowzee_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/palettes/drowzee_palette.gbapal.lz");
-const u32 gMonBackPic_Drowzee[] = INCBIN_U32("graphics/pokemon/back_pics/drowzee_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/palettes/drowzee_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Drowzee[] = INCBIN_U8("graphics/pokemon/icons/drowzee_icon.4bpp");
-const u8 gMonFootprint_Drowzee[] = INCBIN_U8("graphics/pokemon/footprints/drowzee_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/front_pics/hypno_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Hypno[] = INCBIN_U32("graphics/pokemon/palettes/hypno_palette.gbapal.lz");
-const u32 gMonBackPic_Hypno[] = INCBIN_U32("graphics/pokemon/back_pics/hypno_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Hypno[] = INCBIN_U32("graphics/pokemon/palettes/hypno_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Hypno[] = INCBIN_U8("graphics/pokemon/icons/hypno_icon.4bpp");
-const u8 gMonFootprint_Hypno[] = INCBIN_U8("graphics/pokemon/footprints/hypno_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/front_pics/krabby_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Krabby[] = INCBIN_U32("graphics/pokemon/palettes/krabby_palette.gbapal.lz");
-const u32 gMonBackPic_Krabby[] = INCBIN_U32("graphics/pokemon/back_pics/krabby_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Krabby[] = INCBIN_U32("graphics/pokemon/palettes/krabby_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Krabby[] = INCBIN_U8("graphics/pokemon/icons/krabby_icon.4bpp");
-const u8 gMonFootprint_Krabby[] = INCBIN_U8("graphics/pokemon/footprints/krabby_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/front_pics/kingler_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Kingler[] = INCBIN_U32("graphics/pokemon/palettes/kingler_palette.gbapal.lz");
-const u32 gMonBackPic_Kingler[] = INCBIN_U32("graphics/pokemon/back_pics/kingler_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Kingler[] = INCBIN_U32("graphics/pokemon/palettes/kingler_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Kingler[] = INCBIN_U8("graphics/pokemon/icons/kingler_icon.4bpp");
-const u8 gMonFootprint_Kingler[] = INCBIN_U8("graphics/pokemon/footprints/kingler_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/front_pics/voltorb_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/palettes/voltorb_palette.gbapal.lz");
-const u32 gMonBackPic_Voltorb[] = INCBIN_U32("graphics/pokemon/back_pics/voltorb_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/palettes/voltorb_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Voltorb[] = INCBIN_U8("graphics/pokemon/icons/voltorb_icon.4bpp");
-const u8 gMonFootprint_Voltorb[] = INCBIN_U8("graphics/pokemon/footprints/voltorb_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/front_pics/electrode_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Electrode[] = INCBIN_U32("graphics/pokemon/palettes/electrode_palette.gbapal.lz");
-const u32 gMonBackPic_Electrode[] = INCBIN_U32("graphics/pokemon/back_pics/electrode_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Electrode[] = INCBIN_U32("graphics/pokemon/palettes/electrode_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Electrode[] = INCBIN_U8("graphics/pokemon/icons/electrode_icon.4bpp");
-const u8 gMonFootprint_Electrode[] = INCBIN_U8("graphics/pokemon/footprints/electrode_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/front_pics/exeggcute_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/palettes/exeggcute_palette.gbapal.lz");
-const u32 gMonBackPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/back_pics/exeggcute_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/palettes/exeggcute_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Exeggcute[] = INCBIN_U8("graphics/pokemon/icons/exeggcute_icon.4bpp");
-const u8 gMonFootprint_Exeggcute[] = INCBIN_U8("graphics/pokemon/footprints/exeggcute_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/front_pics/exeggutor_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/palettes/exeggutor_palette.gbapal.lz");
-const u32 gMonBackPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/back_pics/exeggutor_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/palettes/exeggutor_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Exeggutor[] = INCBIN_U8("graphics/pokemon/icons/exeggutor_icon.4bpp");
-const u8 gMonFootprint_Exeggutor[] = INCBIN_U8("graphics/pokemon/footprints/exeggutor_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/front_pics/cubone_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Cubone[] = INCBIN_U32("graphics/pokemon/palettes/cubone_palette.gbapal.lz");
-const u32 gMonBackPic_Cubone[] = INCBIN_U32("graphics/pokemon/back_pics/cubone_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Cubone[] = INCBIN_U32("graphics/pokemon/palettes/cubone_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Cubone[] = INCBIN_U8("graphics/pokemon/icons/cubone_icon.4bpp");
-const u8 gMonFootprint_Cubone[] = INCBIN_U8("graphics/pokemon/footprints/cubone_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/front_pics/marowak_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Marowak[] = INCBIN_U32("graphics/pokemon/palettes/marowak_palette.gbapal.lz");
-const u32 gMonBackPic_Marowak[] = INCBIN_U32("graphics/pokemon/back_pics/marowak_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Marowak[] = INCBIN_U32("graphics/pokemon/palettes/marowak_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Marowak[] = INCBIN_U8("graphics/pokemon/icons/marowak_icon.4bpp");
-const u8 gMonFootprint_Marowak[] = INCBIN_U8("graphics/pokemon/footprints/marowak_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/front_pics/hitmonlee_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/palettes/hitmonlee_palette.gbapal.lz");
-const u32 gMonBackPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/back_pics/hitmonlee_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/palettes/hitmonlee_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Hitmonlee[] = INCBIN_U8("graphics/pokemon/icons/hitmonlee_icon.4bpp");
-const u8 gMonFootprint_Hitmonlee[] = INCBIN_U8("graphics/pokemon/footprints/hitmonlee_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/front_pics/hitmonchan_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/palettes/hitmonchan_palette.gbapal.lz");
-const u32 gMonBackPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/back_pics/hitmonchan_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/palettes/hitmonchan_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Hitmonchan[] = INCBIN_U8("graphics/pokemon/icons/hitmonchan_icon.4bpp");
-const u8 gMonFootprint_Hitmonchan[] = INCBIN_U8("graphics/pokemon/footprints/hitmonchan_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/front_pics/lickitung_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/palettes/lickitung_palette.gbapal.lz");
-const u32 gMonBackPic_Lickitung[] = INCBIN_U32("graphics/pokemon/back_pics/lickitung_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/palettes/lickitung_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Lickitung[] = INCBIN_U8("graphics/pokemon/icons/lickitung_icon.4bpp");
-const u8 gMonFootprint_Lickitung[] = INCBIN_U8("graphics/pokemon/footprints/lickitung_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/front_pics/koffing_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Koffing[] = INCBIN_U32("graphics/pokemon/palettes/koffing_palette.gbapal.lz");
-const u32 gMonBackPic_Koffing[] = INCBIN_U32("graphics/pokemon/back_pics/koffing_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Koffing[] = INCBIN_U32("graphics/pokemon/palettes/koffing_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Koffing[] = INCBIN_U8("graphics/pokemon/icons/koffing_icon.4bpp");
-const u8 gMonFootprint_Koffing[] = INCBIN_U8("graphics/pokemon/footprints/koffing_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/front_pics/weezing_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Weezing[] = INCBIN_U32("graphics/pokemon/palettes/weezing_palette.gbapal.lz");
-const u32 gMonBackPic_Weezing[] = INCBIN_U32("graphics/pokemon/back_pics/weezing_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Weezing[] = INCBIN_U32("graphics/pokemon/palettes/weezing_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Weezing[] = INCBIN_U8("graphics/pokemon/icons/weezing_icon.4bpp");
-const u8 gMonFootprint_Weezing[] = INCBIN_U8("graphics/pokemon/footprints/weezing_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/front_pics/rhyhorn_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/palettes/rhyhorn_palette.gbapal.lz");
-const u32 gMonBackPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/back_pics/rhyhorn_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/palettes/rhyhorn_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Rhyhorn[] = INCBIN_U8("graphics/pokemon/icons/rhyhorn_icon.4bpp");
-const u8 gMonFootprint_Rhyhorn[] = INCBIN_U8("graphics/pokemon/footprints/rhyhorn_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/front_pics/rhydon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/palettes/rhydon_palette.gbapal.lz");
-const u32 gMonBackPic_Rhydon[] = INCBIN_U32("graphics/pokemon/back_pics/rhydon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/palettes/rhydon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Rhydon[] = INCBIN_U8("graphics/pokemon/icons/rhydon_icon.4bpp");
-const u8 gMonFootprint_Rhydon[] = INCBIN_U8("graphics/pokemon/footprints/rhydon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/front_pics/chansey_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Chansey[] = INCBIN_U32("graphics/pokemon/palettes/chansey_palette.gbapal.lz");
-const u32 gMonBackPic_Chansey[] = INCBIN_U32("graphics/pokemon/back_pics/chansey_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Chansey[] = INCBIN_U32("graphics/pokemon/palettes/chansey_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Chansey[] = INCBIN_U8("graphics/pokemon/icons/chansey_icon.4bpp");
-const u8 gMonFootprint_Chansey[] = INCBIN_U8("graphics/pokemon/footprints/chansey_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/front_pics/tangela_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Tangela[] = INCBIN_U32("graphics/pokemon/palettes/tangela_palette.gbapal.lz");
-const u32 gMonBackPic_Tangela[] = INCBIN_U32("graphics/pokemon/back_pics/tangela_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Tangela[] = INCBIN_U32("graphics/pokemon/palettes/tangela_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Tangela[] = INCBIN_U8("graphics/pokemon/icons/tangela_icon.4bpp");
-const u8 gMonFootprint_Tangela[] = INCBIN_U8("graphics/pokemon/footprints/tangela_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/front_pics/kangaskhan_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/palettes/kangaskhan_palette.gbapal.lz");
-const u32 gMonBackPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/back_pics/kangaskhan_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/palettes/kangaskhan_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Kangaskhan[] = INCBIN_U8("graphics/pokemon/icons/kangaskhan_icon.4bpp");
-const u8 gMonFootprint_Kangaskhan[] = INCBIN_U8("graphics/pokemon/footprints/kangaskhan_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/front_pics/horsea_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Horsea[] = INCBIN_U32("graphics/pokemon/palettes/horsea_palette.gbapal.lz");
-const u32 gMonBackPic_Horsea[] = INCBIN_U32("graphics/pokemon/back_pics/horsea_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Horsea[] = INCBIN_U32("graphics/pokemon/palettes/horsea_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Horsea[] = INCBIN_U8("graphics/pokemon/icons/horsea_icon.4bpp");
-const u8 gMonFootprint_Horsea[] = INCBIN_U8("graphics/pokemon/footprints/horsea_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/front_pics/seadra_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Seadra[] = INCBIN_U32("graphics/pokemon/palettes/seadra_palette.gbapal.lz");
-const u32 gMonBackPic_Seadra[] = INCBIN_U32("graphics/pokemon/back_pics/seadra_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Seadra[] = INCBIN_U32("graphics/pokemon/palettes/seadra_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Seadra[] = INCBIN_U8("graphics/pokemon/icons/seadra_icon.4bpp");
-const u8 gMonFootprint_Seadra[] = INCBIN_U8("graphics/pokemon/footprints/seadra_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/front_pics/goldeen_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/palettes/goldeen_palette.gbapal.lz");
-const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/back_pics/goldeen_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/palettes/goldeen_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/icons/goldeen_icon.4bpp");
-const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/footprints/goldeen_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/front_pics/seaking_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Seaking[] = INCBIN_U32("graphics/pokemon/palettes/seaking_palette.gbapal.lz");
-const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/back_pics/seaking_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/palettes/seaking_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/icons/seaking_icon.4bpp");
-const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/footprints/seaking_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/front_pics/staryu_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Staryu[] = INCBIN_U32("graphics/pokemon/palettes/staryu_palette.gbapal.lz");
-const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/back_pics/staryu_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/palettes/staryu_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/icons/staryu_icon.4bpp");
-const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/footprints/staryu_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/front_pics/starmie_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/palettes/starmie_palette.gbapal.lz");
-const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/back_pics/starmie_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/palettes/starmie_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/icons/starmie_icon.4bpp");
-const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/footprints/starmie_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/front_pics/mr_mime_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/palettes/mr_mime_palette.gbapal.lz");
-const u32 gMonBackPic_Mrmime[] = INCBIN_U32("graphics/pokemon/back_pics/mr_mime_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/palettes/mr_mime_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Mrmime[] = INCBIN_U8("graphics/pokemon/icons/mr_mime_icon.4bpp");
-const u8 gMonFootprint_Mrmime[] = INCBIN_U8("graphics/pokemon/footprints/mr_mime_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/front_pics/scyther_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Scyther[] = INCBIN_U32("graphics/pokemon/palettes/scyther_palette.gbapal.lz");
-const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/back_pics/scyther_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/palettes/scyther_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/icons/scyther_icon.4bpp");
-const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/footprints/scyther_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/front_pics/jynx_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Jynx[] = INCBIN_U32("graphics/pokemon/palettes/jynx_palette.gbapal.lz");
-const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/back_pics/jynx_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/palettes/jynx_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/icons/jynx_icon.4bpp");
-const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/footprints/jynx_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/front_pics/electabuzz_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/palettes/electabuzz_palette.gbapal.lz");
-const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/back_pics/electabuzz_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/palettes/electabuzz_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/icons/electabuzz_icon.4bpp");
-const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/footprints/electabuzz_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/front_pics/magmar_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Magmar[] = INCBIN_U32("graphics/pokemon/palettes/magmar_palette.gbapal.lz");
-const u32 gMonBackPic_Magmar[] = INCBIN_U32("graphics/pokemon/back_pics/magmar_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Magmar[] = INCBIN_U32("graphics/pokemon/palettes/magmar_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Magmar[] = INCBIN_U8("graphics/pokemon/icons/magmar_icon.4bpp");
-const u8 gMonFootprint_Magmar[] = INCBIN_U8("graphics/pokemon/footprints/magmar_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/front_pics/pinsir_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/palettes/pinsir_palette.gbapal.lz");
-const u32 gMonBackPic_Pinsir[] = INCBIN_U32("graphics/pokemon/back_pics/pinsir_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/palettes/pinsir_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Pinsir[] = INCBIN_U8("graphics/pokemon/icons/pinsir_icon.4bpp");
-const u8 gMonFootprint_Pinsir[] = INCBIN_U8("graphics/pokemon/footprints/pinsir_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/front_pics/tauros_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Tauros[] = INCBIN_U32("graphics/pokemon/palettes/tauros_palette.gbapal.lz");
-const u32 gMonBackPic_Tauros[] = INCBIN_U32("graphics/pokemon/back_pics/tauros_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Tauros[] = INCBIN_U32("graphics/pokemon/palettes/tauros_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Tauros[] = INCBIN_U8("graphics/pokemon/icons/tauros_icon.4bpp");
-const u8 gMonFootprint_Tauros[] = INCBIN_U8("graphics/pokemon/footprints/tauros_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/front_pics/magikarp_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/palettes/magikarp_palette.gbapal.lz");
-const u32 gMonBackPic_Magikarp[] = INCBIN_U32("graphics/pokemon/back_pics/magikarp_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/palettes/magikarp_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Magikarp[] = INCBIN_U8("graphics/pokemon/icons/magikarp_icon.4bpp");
-const u8 gMonFootprint_Magikarp[] = INCBIN_U8("graphics/pokemon/footprints/magikarp_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/front_pics/gyarados_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/palettes/gyarados_palette.gbapal.lz");
-const u32 gMonBackPic_Gyarados[] = INCBIN_U32("graphics/pokemon/back_pics/gyarados_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/palettes/gyarados_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Gyarados[] = INCBIN_U8("graphics/pokemon/icons/gyarados_icon.4bpp");
-const u8 gMonFootprint_Gyarados[] = INCBIN_U8("graphics/pokemon/footprints/gyarados_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/front_pics/lapras_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Lapras[] = INCBIN_U32("graphics/pokemon/palettes/lapras_palette.gbapal.lz");
-const u32 gMonBackPic_Lapras[] = INCBIN_U32("graphics/pokemon/back_pics/lapras_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Lapras[] = INCBIN_U32("graphics/pokemon/palettes/lapras_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Lapras[] = INCBIN_U8("graphics/pokemon/icons/lapras_icon.4bpp");
-const u8 gMonFootprint_Lapras[] = INCBIN_U8("graphics/pokemon/footprints/lapras_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/front_pics/ditto_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ditto[] = INCBIN_U32("graphics/pokemon/palettes/ditto_palette.gbapal.lz");
-const u32 gMonBackPic_Ditto[] = INCBIN_U32("graphics/pokemon/back_pics/ditto_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ditto[] = INCBIN_U32("graphics/pokemon/palettes/ditto_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ditto[] = INCBIN_U8("graphics/pokemon/icons/ditto_icon.4bpp");
-const u8 gMonFootprint_Ditto[] = INCBIN_U8("graphics/pokemon/footprints/ditto_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/front_pics/eevee_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Eevee[] = INCBIN_U32("graphics/pokemon/palettes/eevee_palette.gbapal.lz");
-const u32 gMonBackPic_Eevee[] = INCBIN_U32("graphics/pokemon/back_pics/eevee_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Eevee[] = INCBIN_U32("graphics/pokemon/palettes/eevee_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Eevee[] = INCBIN_U8("graphics/pokemon/icons/eevee_icon.4bpp");
-const u8 gMonFootprint_Eevee[] = INCBIN_U8("graphics/pokemon/footprints/eevee_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/front_pics/vaporeon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/palettes/vaporeon_palette.gbapal.lz");
-const u32 gMonBackPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/back_pics/vaporeon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/palettes/vaporeon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Vaporeon[] = INCBIN_U8("graphics/pokemon/icons/vaporeon_icon.4bpp");
-const u8 gMonFootprint_Vaporeon[] = INCBIN_U8("graphics/pokemon/footprints/vaporeon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/front_pics/jolteon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/palettes/jolteon_palette.gbapal.lz");
-const u32 gMonBackPic_Jolteon[] = INCBIN_U32("graphics/pokemon/back_pics/jolteon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/palettes/jolteon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Jolteon[] = INCBIN_U8("graphics/pokemon/icons/jolteon_icon.4bpp");
-const u8 gMonFootprint_Jolteon[] = INCBIN_U8("graphics/pokemon/footprints/jolteon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/front_pics/flareon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Flareon[] = INCBIN_U32("graphics/pokemon/palettes/flareon_palette.gbapal.lz");
-const u32 gMonBackPic_Flareon[] = INCBIN_U32("graphics/pokemon/back_pics/flareon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Flareon[] = INCBIN_U32("graphics/pokemon/palettes/flareon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Flareon[] = INCBIN_U8("graphics/pokemon/icons/flareon_icon.4bpp");
-const u8 gMonFootprint_Flareon[] = INCBIN_U8("graphics/pokemon/footprints/flareon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/front_pics/porygon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Porygon[] = INCBIN_U32("graphics/pokemon/palettes/porygon_palette.gbapal.lz");
-const u32 gMonBackPic_Porygon[] = INCBIN_U32("graphics/pokemon/back_pics/porygon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Porygon[] = INCBIN_U32("graphics/pokemon/palettes/porygon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Porygon[] = INCBIN_U8("graphics/pokemon/icons/porygon_icon.4bpp");
-const u8 gMonFootprint_Porygon[] = INCBIN_U8("graphics/pokemon/footprints/porygon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/front_pics/omanyte_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/palettes/omanyte_palette.gbapal.lz");
-const u32 gMonBackPic_Omanyte[] = INCBIN_U32("graphics/pokemon/back_pics/omanyte_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/palettes/omanyte_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Omanyte[] = INCBIN_U8("graphics/pokemon/icons/omanyte_icon.4bpp");
-const u8 gMonFootprint_Omanyte[] = INCBIN_U8("graphics/pokemon/footprints/omanyte_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/front_pics/omastar_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Omastar[] = INCBIN_U32("graphics/pokemon/palettes/omastar_palette.gbapal.lz");
-const u32 gMonBackPic_Omastar[] = INCBIN_U32("graphics/pokemon/back_pics/omastar_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Omastar[] = INCBIN_U32("graphics/pokemon/palettes/omastar_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Omastar[] = INCBIN_U8("graphics/pokemon/icons/omastar_icon.4bpp");
-const u8 gMonFootprint_Omastar[] = INCBIN_U8("graphics/pokemon/footprints/omastar_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/front_pics/kabuto_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/palettes/kabuto_palette.gbapal.lz");
-const u32 gMonBackPic_Kabuto[] = INCBIN_U32("graphics/pokemon/back_pics/kabuto_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/palettes/kabuto_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Kabuto[] = INCBIN_U8("graphics/pokemon/icons/kabuto_icon.4bpp");
-const u8 gMonFootprint_Kabuto[] = INCBIN_U8("graphics/pokemon/footprints/kabuto_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/front_pics/kabutops_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/palettes/kabutops_palette.gbapal.lz");
-const u32 gMonBackPic_Kabutops[] = INCBIN_U32("graphics/pokemon/back_pics/kabutops_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/palettes/kabutops_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Kabutops[] = INCBIN_U8("graphics/pokemon/icons/kabutops_icon.4bpp");
-const u8 gMonFootprint_Kabutops[] = INCBIN_U8("graphics/pokemon/footprints/kabutops_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/front_pics/aerodactyl_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/palettes/aerodactyl_palette.gbapal.lz");
-const u32 gMonBackPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/back_pics/aerodactyl_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/palettes/aerodactyl_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Aerodactyl[] = INCBIN_U8("graphics/pokemon/icons/aerodactyl_icon.4bpp");
-const u8 gMonFootprint_Aerodactyl[] = INCBIN_U8("graphics/pokemon/footprints/aerodactyl_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/front_pics/snorlax_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/palettes/snorlax_palette.gbapal.lz");
-const u32 gMonBackPic_Snorlax[] = INCBIN_U32("graphics/pokemon/back_pics/snorlax_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/palettes/snorlax_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Snorlax[] = INCBIN_U8("graphics/pokemon/icons/snorlax_icon.4bpp");
-const u8 gMonFootprint_Snorlax[] = INCBIN_U8("graphics/pokemon/footprints/snorlax_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/front_pics/articuno_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Articuno[] = INCBIN_U32("graphics/pokemon/palettes/articuno_palette.gbapal.lz");
-const u32 gMonBackPic_Articuno[] = INCBIN_U32("graphics/pokemon/back_pics/articuno_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Articuno[] = INCBIN_U32("graphics/pokemon/palettes/articuno_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Articuno[] = INCBIN_U8("graphics/pokemon/icons/articuno_icon.4bpp");
-const u8 gMonFootprint_Articuno[] = INCBIN_U8("graphics/pokemon/footprints/articuno_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/front_pics/zapdos_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/palettes/zapdos_palette.gbapal.lz");
-const u32 gMonBackPic_Zapdos[] = INCBIN_U32("graphics/pokemon/back_pics/zapdos_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/palettes/zapdos_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Zapdos[] = INCBIN_U8("graphics/pokemon/icons/zapdos_icon.4bpp");
-const u8 gMonFootprint_Zapdos[] = INCBIN_U8("graphics/pokemon/footprints/zapdos_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/front_pics/moltres_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Moltres[] = INCBIN_U32("graphics/pokemon/palettes/moltres_palette.gbapal.lz");
-const u32 gMonBackPic_Moltres[] = INCBIN_U32("graphics/pokemon/back_pics/moltres_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Moltres[] = INCBIN_U32("graphics/pokemon/palettes/moltres_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Moltres[] = INCBIN_U8("graphics/pokemon/icons/moltres_icon.4bpp");
-const u8 gMonFootprint_Moltres[] = INCBIN_U8("graphics/pokemon/footprints/moltres_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/front_pics/dratini_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Dratini[] = INCBIN_U32("graphics/pokemon/palettes/dratini_palette.gbapal.lz");
-const u32 gMonBackPic_Dratini[] = INCBIN_U32("graphics/pokemon/back_pics/dratini_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Dratini[] = INCBIN_U32("graphics/pokemon/palettes/dratini_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Dratini[] = INCBIN_U8("graphics/pokemon/icons/dratini_icon.4bpp");
-const u8 gMonFootprint_Dratini[] = INCBIN_U8("graphics/pokemon/footprints/dratini_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/front_pics/dragonair_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/palettes/dragonair_palette.gbapal.lz");
-const u32 gMonBackPic_Dragonair[] = INCBIN_U32("graphics/pokemon/back_pics/dragonair_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/palettes/dragonair_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Dragonair[] = INCBIN_U8("graphics/pokemon/icons/dragonair_icon.4bpp");
-const u8 gMonFootprint_Dragonair[] = INCBIN_U8("graphics/pokemon/footprints/dragonair_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/front_pics/dragonite_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/palettes/dragonite_palette.gbapal.lz");
-const u32 gMonBackPic_Dragonite[] = INCBIN_U32("graphics/pokemon/back_pics/dragonite_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/palettes/dragonite_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Dragonite[] = INCBIN_U8("graphics/pokemon/icons/dragonite_icon.4bpp");
-const u8 gMonFootprint_Dragonite[] = INCBIN_U8("graphics/pokemon/footprints/dragonite_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/front_pics/mewtwo_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/palettes/mewtwo_palette.gbapal.lz");
-const u32 gMonBackPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/back_pics/mewtwo_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/palettes/mewtwo_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Mewtwo[] = INCBIN_U8("graphics/pokemon/icons/mewtwo_icon.4bpp");
-const u8 gMonFootprint_Mewtwo[] = INCBIN_U8("graphics/pokemon/footprints/mewtwo_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/front_pics/mew_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Mew[] = INCBIN_U32("graphics/pokemon/palettes/mew_palette.gbapal.lz");
-const u32 gMonBackPic_Mew[] = INCBIN_U32("graphics/pokemon/back_pics/mew_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Mew[] = INCBIN_U32("graphics/pokemon/palettes/mew_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Mew[] = INCBIN_U8("graphics/pokemon/icons/mew_icon.4bpp");
-const u8 gMonFootprint_Mew[] = INCBIN_U8("graphics/pokemon/footprints/mew_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/front_pics/chikorita_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/palettes/chikorita_palette.gbapal.lz");
-const u32 gMonBackPic_Chikorita[] = INCBIN_U32("graphics/pokemon/back_pics/chikorita_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/palettes/chikorita_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Chikorita[] = INCBIN_U8("graphics/pokemon/icons/chikorita_icon.4bpp");
-const u8 gMonFootprint_Chikorita[] = INCBIN_U8("graphics/pokemon/footprints/chikorita_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/front_pics/bayleef_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/palettes/bayleef_palette.gbapal.lz");
-const u32 gMonBackPic_Bayleef[] = INCBIN_U32("graphics/pokemon/back_pics/bayleef_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/palettes/bayleef_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Bayleef[] = INCBIN_U8("graphics/pokemon/icons/bayleef_icon.4bpp");
-const u8 gMonFootprint_Bayleef[] = INCBIN_U8("graphics/pokemon/footprints/bayleef_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/front_pics/meganium_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Meganium[] = INCBIN_U32("graphics/pokemon/palettes/meganium_palette.gbapal.lz");
-const u32 gMonBackPic_Meganium[] = INCBIN_U32("graphics/pokemon/back_pics/meganium_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Meganium[] = INCBIN_U32("graphics/pokemon/palettes/meganium_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Meganium[] = INCBIN_U8("graphics/pokemon/icons/meganium_icon.4bpp");
-const u8 gMonFootprint_Meganium[] = INCBIN_U8("graphics/pokemon/footprints/meganium_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/front_pics/cyndaquil_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/palettes/cyndaquil_palette.gbapal.lz");
-const u32 gMonBackPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/back_pics/cyndaquil_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/palettes/cyndaquil_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Cyndaquil[] = INCBIN_U8("graphics/pokemon/icons/cyndaquil_icon.4bpp");
-const u8 gMonFootprint_Cyndaquil[] = INCBIN_U8("graphics/pokemon/footprints/cyndaquil_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/front_pics/quilava_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Quilava[] = INCBIN_U32("graphics/pokemon/palettes/quilava_palette.gbapal.lz");
-const u32 gMonBackPic_Quilava[] = INCBIN_U32("graphics/pokemon/back_pics/quilava_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Quilava[] = INCBIN_U32("graphics/pokemon/palettes/quilava_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Quilava[] = INCBIN_U8("graphics/pokemon/icons/quilava_icon.4bpp");
-const u8 gMonFootprint_Quilava[] = INCBIN_U8("graphics/pokemon/footprints/quilava_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/front_pics/typhlosion_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/palettes/typhlosion_palette.gbapal.lz");
-const u32 gMonBackPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/back_pics/typhlosion_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/palettes/typhlosion_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Typhlosion[] = INCBIN_U8("graphics/pokemon/icons/typhlosion_icon.4bpp");
-const u8 gMonFootprint_Typhlosion[] = INCBIN_U8("graphics/pokemon/footprints/typhlosion_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/front_pics/totodile_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Totodile[] = INCBIN_U32("graphics/pokemon/palettes/totodile_palette.gbapal.lz");
-const u32 gMonBackPic_Totodile[] = INCBIN_U32("graphics/pokemon/back_pics/totodile_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Totodile[] = INCBIN_U32("graphics/pokemon/palettes/totodile_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Totodile[] = INCBIN_U8("graphics/pokemon/icons/totodile_icon.4bpp");
-const u8 gMonFootprint_Totodile[] = INCBIN_U8("graphics/pokemon/footprints/totodile_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/front_pics/croconaw_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/palettes/croconaw_palette.gbapal.lz");
-const u32 gMonBackPic_Croconaw[] = INCBIN_U32("graphics/pokemon/back_pics/croconaw_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/palettes/croconaw_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Croconaw[] = INCBIN_U8("graphics/pokemon/icons/croconaw_icon.4bpp");
-const u8 gMonFootprint_Croconaw[] = INCBIN_U8("graphics/pokemon/footprints/croconaw_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/front_pics/feraligatr_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/palettes/feraligatr_palette.gbapal.lz");
-const u32 gMonBackPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/back_pics/feraligatr_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/palettes/feraligatr_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Feraligatr[] = INCBIN_U8("graphics/pokemon/icons/feraligatr_icon.4bpp");
-const u8 gMonFootprint_Feraligatr[] = INCBIN_U8("graphics/pokemon/footprints/feraligatr_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/front_pics/sentret_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Sentret[] = INCBIN_U32("graphics/pokemon/palettes/sentret_palette.gbapal.lz");
-const u32 gMonBackPic_Sentret[] = INCBIN_U32("graphics/pokemon/back_pics/sentret_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Sentret[] = INCBIN_U32("graphics/pokemon/palettes/sentret_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Sentret[] = INCBIN_U8("graphics/pokemon/icons/sentret_icon.4bpp");
-const u8 gMonFootprint_Sentret[] = INCBIN_U8("graphics/pokemon/footprints/sentret_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/front_pics/furret_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Furret[] = INCBIN_U32("graphics/pokemon/palettes/furret_palette.gbapal.lz");
-const u32 gMonBackPic_Furret[] = INCBIN_U32("graphics/pokemon/back_pics/furret_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Furret[] = INCBIN_U32("graphics/pokemon/palettes/furret_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Furret[] = INCBIN_U8("graphics/pokemon/icons/furret_icon.4bpp");
-const u8 gMonFootprint_Furret[] = INCBIN_U8("graphics/pokemon/footprints/furret_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/front_pics/hoothoot_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/palettes/hoothoot_palette.gbapal.lz");
-const u32 gMonBackPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/back_pics/hoothoot_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/palettes/hoothoot_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Hoothoot[] = INCBIN_U8("graphics/pokemon/icons/hoothoot_icon.4bpp");
-const u8 gMonFootprint_Hoothoot[] = INCBIN_U8("graphics/pokemon/footprints/hoothoot_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/front_pics/noctowl_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/palettes/noctowl_palette.gbapal.lz");
-const u32 gMonBackPic_Noctowl[] = INCBIN_U32("graphics/pokemon/back_pics/noctowl_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/palettes/noctowl_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Noctowl[] = INCBIN_U8("graphics/pokemon/icons/noctowl_icon.4bpp");
-const u8 gMonFootprint_Noctowl[] = INCBIN_U8("graphics/pokemon/footprints/noctowl_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/front_pics/ledyba_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/palettes/ledyba_palette.gbapal.lz");
-const u32 gMonBackPic_Ledyba[] = INCBIN_U32("graphics/pokemon/back_pics/ledyba_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/palettes/ledyba_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ledyba[] = INCBIN_U8("graphics/pokemon/icons/ledyba_icon.4bpp");
-const u8 gMonFootprint_Ledyba[] = INCBIN_U8("graphics/pokemon/footprints/ledyba_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/front_pics/ledian_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ledian[] = INCBIN_U32("graphics/pokemon/palettes/ledian_palette.gbapal.lz");
-const u32 gMonBackPic_Ledian[] = INCBIN_U32("graphics/pokemon/back_pics/ledian_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ledian[] = INCBIN_U32("graphics/pokemon/palettes/ledian_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ledian[] = INCBIN_U8("graphics/pokemon/icons/ledian_icon.4bpp");
-const u8 gMonFootprint_Ledian[] = INCBIN_U8("graphics/pokemon/footprints/ledian_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/front_pics/spinarak_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/palettes/spinarak_palette.gbapal.lz");
-const u32 gMonBackPic_Spinarak[] = INCBIN_U32("graphics/pokemon/back_pics/spinarak_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/palettes/spinarak_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Spinarak[] = INCBIN_U8("graphics/pokemon/icons/spinarak_icon.4bpp");
-const u8 gMonFootprint_Spinarak[] = INCBIN_U8("graphics/pokemon/footprints/spinarak_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/front_pics/ariados_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ariados[] = INCBIN_U32("graphics/pokemon/palettes/ariados_palette.gbapal.lz");
-const u32 gMonBackPic_Ariados[] = INCBIN_U32("graphics/pokemon/back_pics/ariados_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ariados[] = INCBIN_U32("graphics/pokemon/palettes/ariados_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ariados[] = INCBIN_U8("graphics/pokemon/icons/ariados_icon.4bpp");
-const u8 gMonFootprint_Ariados[] = INCBIN_U8("graphics/pokemon/footprints/ariados_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/front_pics/crobat_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Crobat[] = INCBIN_U32("graphics/pokemon/palettes/crobat_palette.gbapal.lz");
-const u32 gMonBackPic_Crobat[] = INCBIN_U32("graphics/pokemon/back_pics/crobat_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Crobat[] = INCBIN_U32("graphics/pokemon/palettes/crobat_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Crobat[] = INCBIN_U8("graphics/pokemon/icons/crobat_icon.4bpp");
-const u8 gMonFootprint_Crobat[] = INCBIN_U8("graphics/pokemon/footprints/crobat_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/front_pics/chinchou_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/palettes/chinchou_palette.gbapal.lz");
-const u32 gMonBackPic_Chinchou[] = INCBIN_U32("graphics/pokemon/back_pics/chinchou_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/palettes/chinchou_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Chinchou[] = INCBIN_U8("graphics/pokemon/icons/chinchou_icon.4bpp");
-const u8 gMonFootprint_Chinchou[] = INCBIN_U8("graphics/pokemon/footprints/chinchou_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/front_pics/lanturn_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/palettes/lanturn_palette.gbapal.lz");
-const u32 gMonBackPic_Lanturn[] = INCBIN_U32("graphics/pokemon/back_pics/lanturn_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/palettes/lanturn_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Lanturn[] = INCBIN_U8("graphics/pokemon/icons/lanturn_icon.4bpp");
-const u8 gMonFootprint_Lanturn[] = INCBIN_U8("graphics/pokemon/footprints/lanturn_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/front_pics/pichu_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Pichu[] = INCBIN_U32("graphics/pokemon/palettes/pichu_palette.gbapal.lz");
-const u32 gMonBackPic_Pichu[] = INCBIN_U32("graphics/pokemon/back_pics/pichu_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Pichu[] = INCBIN_U32("graphics/pokemon/palettes/pichu_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Pichu[] = INCBIN_U8("graphics/pokemon/icons/pichu_icon.4bpp");
-const u8 gMonFootprint_Pichu[] = INCBIN_U8("graphics/pokemon/footprints/pichu_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/front_pics/cleffa_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/palettes/cleffa_palette.gbapal.lz");
-const u32 gMonBackPic_Cleffa[] = INCBIN_U32("graphics/pokemon/back_pics/cleffa_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/palettes/cleffa_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Cleffa[] = INCBIN_U8("graphics/pokemon/icons/cleffa_icon.4bpp");
-const u8 gMonFootprint_Cleffa[] = INCBIN_U8("graphics/pokemon/footprints/cleffa_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/front_pics/igglybuff_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/palettes/igglybuff_palette.gbapal.lz");
-const u32 gMonBackPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/back_pics/igglybuff_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/palettes/igglybuff_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Igglybuff[] = INCBIN_U8("graphics/pokemon/icons/igglybuff_icon.4bpp");
-const u8 gMonFootprint_Igglybuff[] = INCBIN_U8("graphics/pokemon/footprints/igglybuff_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/front_pics/togepi_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Togepi[] = INCBIN_U32("graphics/pokemon/palettes/togepi_palette.gbapal.lz");
-const u32 gMonBackPic_Togepi[] = INCBIN_U32("graphics/pokemon/back_pics/togepi_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Togepi[] = INCBIN_U32("graphics/pokemon/palettes/togepi_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Togepi[] = INCBIN_U8("graphics/pokemon/icons/togepi_icon.4bpp");
-const u8 gMonFootprint_Togepi[] = INCBIN_U8("graphics/pokemon/footprints/togepi_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/front_pics/togetic_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Togetic[] = INCBIN_U32("graphics/pokemon/palettes/togetic_palette.gbapal.lz");
-const u32 gMonBackPic_Togetic[] = INCBIN_U32("graphics/pokemon/back_pics/togetic_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Togetic[] = INCBIN_U32("graphics/pokemon/palettes/togetic_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Togetic[] = INCBIN_U8("graphics/pokemon/icons/togetic_icon.4bpp");
-const u8 gMonFootprint_Togetic[] = INCBIN_U8("graphics/pokemon/footprints/togetic_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/front_pics/natu_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Natu[] = INCBIN_U32("graphics/pokemon/palettes/natu_palette.gbapal.lz");
-const u32 gMonBackPic_Natu[] = INCBIN_U32("graphics/pokemon/back_pics/natu_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Natu[] = INCBIN_U32("graphics/pokemon/palettes/natu_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Natu[] = INCBIN_U8("graphics/pokemon/icons/natu_icon.4bpp");
-const u8 gMonFootprint_Natu[] = INCBIN_U8("graphics/pokemon/footprints/natu_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/front_pics/xatu_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Xatu[] = INCBIN_U32("graphics/pokemon/palettes/xatu_palette.gbapal.lz");
-const u32 gMonBackPic_Xatu[] = INCBIN_U32("graphics/pokemon/back_pics/xatu_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Xatu[] = INCBIN_U32("graphics/pokemon/palettes/xatu_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Xatu[] = INCBIN_U8("graphics/pokemon/icons/xatu_icon.4bpp");
-const u8 gMonFootprint_Xatu[] = INCBIN_U8("graphics/pokemon/footprints/xatu_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/front_pics/mareep_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Mareep[] = INCBIN_U32("graphics/pokemon/palettes/mareep_palette.gbapal.lz");
-const u32 gMonBackPic_Mareep[] = INCBIN_U32("graphics/pokemon/back_pics/mareep_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Mareep[] = INCBIN_U32("graphics/pokemon/palettes/mareep_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Mareep[] = INCBIN_U8("graphics/pokemon/icons/mareep_icon.4bpp");
-const u8 gMonFootprint_Mareep[] = INCBIN_U8("graphics/pokemon/footprints/mareep_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/front_pics/flaaffy_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/palettes/flaaffy_palette.gbapal.lz");
-const u32 gMonBackPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/back_pics/flaaffy_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/palettes/flaaffy_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Flaaffy[] = INCBIN_U8("graphics/pokemon/icons/flaaffy_icon.4bpp");
-const u8 gMonFootprint_Flaaffy[] = INCBIN_U8("graphics/pokemon/footprints/flaaffy_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/front_pics/ampharos_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/palettes/ampharos_palette.gbapal.lz");
-const u32 gMonBackPic_Ampharos[] = INCBIN_U32("graphics/pokemon/back_pics/ampharos_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/palettes/ampharos_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ampharos[] = INCBIN_U8("graphics/pokemon/icons/ampharos_icon.4bpp");
-const u8 gMonFootprint_Ampharos[] = INCBIN_U8("graphics/pokemon/footprints/ampharos_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/front_pics/bellossom_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/palettes/bellossom_palette.gbapal.lz");
-const u32 gMonBackPic_Bellossom[] = INCBIN_U32("graphics/pokemon/back_pics/bellossom_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/palettes/bellossom_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Bellossom[] = INCBIN_U8("graphics/pokemon/icons/bellossom_icon.4bpp");
-const u8 gMonFootprint_Bellossom[] = INCBIN_U8("graphics/pokemon/footprints/bellossom_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/front_pics/marill_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Marill[] = INCBIN_U32("graphics/pokemon/palettes/marill_palette.gbapal.lz");
-const u32 gMonBackPic_Marill[] = INCBIN_U32("graphics/pokemon/back_pics/marill_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Marill[] = INCBIN_U32("graphics/pokemon/palettes/marill_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Marill[] = INCBIN_U8("graphics/pokemon/icons/marill_icon.4bpp");
-const u8 gMonFootprint_Marill[] = INCBIN_U8("graphics/pokemon/footprints/marill_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/front_pics/azumarill_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/palettes/azumarill_palette.gbapal.lz");
-const u32 gMonBackPic_Azumarill[] = INCBIN_U32("graphics/pokemon/back_pics/azumarill_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/palettes/azumarill_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Azumarill[] = INCBIN_U8("graphics/pokemon/icons/azumarill_icon.4bpp");
-const u8 gMonFootprint_Azumarill[] = INCBIN_U8("graphics/pokemon/footprints/azumarill_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/front_pics/sudowoodo_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/palettes/sudowoodo_palette.gbapal.lz");
-const u32 gMonBackPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/back_pics/sudowoodo_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/palettes/sudowoodo_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Sudowoodo[] = INCBIN_U8("graphics/pokemon/icons/sudowoodo_icon.4bpp");
-const u8 gMonFootprint_Sudowoodo[] = INCBIN_U8("graphics/pokemon/footprints/sudowoodo_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/front_pics/politoed_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Politoed[] = INCBIN_U32("graphics/pokemon/palettes/politoed_palette.gbapal.lz");
-const u32 gMonBackPic_Politoed[] = INCBIN_U32("graphics/pokemon/back_pics/politoed_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Politoed[] = INCBIN_U32("graphics/pokemon/palettes/politoed_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Politoed[] = INCBIN_U8("graphics/pokemon/icons/politoed_icon.4bpp");
-const u8 gMonFootprint_Politoed[] = INCBIN_U8("graphics/pokemon/footprints/politoed_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/front_pics/hoppip_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/palettes/hoppip_palette.gbapal.lz");
-const u32 gMonBackPic_Hoppip[] = INCBIN_U32("graphics/pokemon/back_pics/hoppip_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/palettes/hoppip_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Hoppip[] = INCBIN_U8("graphics/pokemon/icons/hoppip_icon.4bpp");
-const u8 gMonFootprint_Hoppip[] = INCBIN_U8("graphics/pokemon/footprints/hoppip_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/front_pics/skiploom_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/palettes/skiploom_palette.gbapal.lz");
-const u32 gMonBackPic_Skiploom[] = INCBIN_U32("graphics/pokemon/back_pics/skiploom_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/palettes/skiploom_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Skiploom[] = INCBIN_U8("graphics/pokemon/icons/skiploom_icon.4bpp");
-const u8 gMonFootprint_Skiploom[] = INCBIN_U8("graphics/pokemon/footprints/skiploom_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/front_pics/jumpluff_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/palettes/jumpluff_palette.gbapal.lz");
-const u32 gMonBackPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/back_pics/jumpluff_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/palettes/jumpluff_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Jumpluff[] = INCBIN_U8("graphics/pokemon/icons/jumpluff_icon.4bpp");
-const u8 gMonFootprint_Jumpluff[] = INCBIN_U8("graphics/pokemon/footprints/jumpluff_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/front_pics/aipom_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Aipom[] = INCBIN_U32("graphics/pokemon/palettes/aipom_palette.gbapal.lz");
-const u32 gMonBackPic_Aipom[] = INCBIN_U32("graphics/pokemon/back_pics/aipom_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Aipom[] = INCBIN_U32("graphics/pokemon/palettes/aipom_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Aipom[] = INCBIN_U8("graphics/pokemon/icons/aipom_icon.4bpp");
-const u8 gMonFootprint_Aipom[] = INCBIN_U8("graphics/pokemon/footprints/aipom_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/front_pics/sunkern_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/palettes/sunkern_palette.gbapal.lz");
-const u32 gMonBackPic_Sunkern[] = INCBIN_U32("graphics/pokemon/back_pics/sunkern_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/palettes/sunkern_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Sunkern[] = INCBIN_U8("graphics/pokemon/icons/sunkern_icon.4bpp");
-const u8 gMonFootprint_Sunkern[] = INCBIN_U8("graphics/pokemon/footprints/sunkern_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/front_pics/sunflora_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/palettes/sunflora_palette.gbapal.lz");
-const u32 gMonBackPic_Sunflora[] = INCBIN_U32("graphics/pokemon/back_pics/sunflora_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/palettes/sunflora_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Sunflora[] = INCBIN_U8("graphics/pokemon/icons/sunflora_icon.4bpp");
-const u8 gMonFootprint_Sunflora[] = INCBIN_U8("graphics/pokemon/footprints/sunflora_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/front_pics/yanma_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Yanma[] = INCBIN_U32("graphics/pokemon/palettes/yanma_palette.gbapal.lz");
-const u32 gMonBackPic_Yanma[] = INCBIN_U32("graphics/pokemon/back_pics/yanma_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Yanma[] = INCBIN_U32("graphics/pokemon/palettes/yanma_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Yanma[] = INCBIN_U8("graphics/pokemon/icons/yanma_icon.4bpp");
-const u8 gMonFootprint_Yanma[] = INCBIN_U8("graphics/pokemon/footprints/yanma_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/front_pics/wooper_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Wooper[] = INCBIN_U32("graphics/pokemon/palettes/wooper_palette.gbapal.lz");
-const u32 gMonBackPic_Wooper[] = INCBIN_U32("graphics/pokemon/back_pics/wooper_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Wooper[] = INCBIN_U32("graphics/pokemon/palettes/wooper_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Wooper[] = INCBIN_U8("graphics/pokemon/icons/wooper_icon.4bpp");
-const u8 gMonFootprint_Wooper[] = INCBIN_U8("graphics/pokemon/footprints/wooper_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/front_pics/quagsire_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/palettes/quagsire_palette.gbapal.lz");
-const u32 gMonBackPic_Quagsire[] = INCBIN_U32("graphics/pokemon/back_pics/quagsire_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/palettes/quagsire_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Quagsire[] = INCBIN_U8("graphics/pokemon/icons/quagsire_icon.4bpp");
-const u8 gMonFootprint_Quagsire[] = INCBIN_U8("graphics/pokemon/footprints/quagsire_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/front_pics/espeon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Espeon[] = INCBIN_U32("graphics/pokemon/palettes/espeon_palette.gbapal.lz");
-const u32 gMonBackPic_Espeon[] = INCBIN_U32("graphics/pokemon/back_pics/espeon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Espeon[] = INCBIN_U32("graphics/pokemon/palettes/espeon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Espeon[] = INCBIN_U8("graphics/pokemon/icons/espeon_icon.4bpp");
-const u8 gMonFootprint_Espeon[] = INCBIN_U8("graphics/pokemon/footprints/espeon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/front_pics/umbreon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/palettes/umbreon_palette.gbapal.lz");
-const u32 gMonBackPic_Umbreon[] = INCBIN_U32("graphics/pokemon/back_pics/umbreon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/palettes/umbreon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Umbreon[] = INCBIN_U8("graphics/pokemon/icons/umbreon_icon.4bpp");
-const u8 gMonFootprint_Umbreon[] = INCBIN_U8("graphics/pokemon/footprints/umbreon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/front_pics/murkrow_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/palettes/murkrow_palette.gbapal.lz");
-const u32 gMonBackPic_Murkrow[] = INCBIN_U32("graphics/pokemon/back_pics/murkrow_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/palettes/murkrow_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Murkrow[] = INCBIN_U8("graphics/pokemon/icons/murkrow_icon.4bpp");
-const u8 gMonFootprint_Murkrow[] = INCBIN_U8("graphics/pokemon/footprints/murkrow_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/front_pics/slowking_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Slowking[] = INCBIN_U32("graphics/pokemon/palettes/slowking_palette.gbapal.lz");
-const u32 gMonBackPic_Slowking[] = INCBIN_U32("graphics/pokemon/back_pics/slowking_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Slowking[] = INCBIN_U32("graphics/pokemon/palettes/slowking_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Slowking[] = INCBIN_U8("graphics/pokemon/icons/slowking_icon.4bpp");
-const u8 gMonFootprint_Slowking[] = INCBIN_U8("graphics/pokemon/footprints/slowking_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/front_pics/misdreavus_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/palettes/misdreavus_palette.gbapal.lz");
-const u32 gMonBackPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/back_pics/misdreavus_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/palettes/misdreavus_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Misdreavus[] = INCBIN_U8("graphics/pokemon/icons/misdreavus_icon.4bpp");
-const u8 gMonFootprint_Misdreavus[] = INCBIN_U8("graphics/pokemon/footprints/misdreavus_footprint.1bpp");
-
-const u32 gMonStillFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/front_pics/unown_a_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Unown[] = INCBIN_U32("graphics/pokemon/palettes/unown_palette.gbapal.lz");
-const u32 gMonBackPic_UnownA[] = INCBIN_U32("graphics/pokemon/back_pics/unown_a_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Unown[] = INCBIN_U32("graphics/pokemon/palettes/unown_shiny_palette.gbapal.lz");
-const u8 gMonIcon_UnownA[] = INCBIN_U8("graphics/pokemon/icons/unown_a_icon.4bpp");
-const u8 gMonFootprint_Unown[] = INCBIN_U8("graphics/pokemon/footprints/unown_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/front_pics/wobbuffet_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/palettes/wobbuffet_palette.gbapal.lz");
-const u32 gMonBackPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/back_pics/wobbuffet_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/palettes/wobbuffet_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Wobbuffet[] = INCBIN_U8("graphics/pokemon/icons/wobbuffet_icon.4bpp");
-const u8 gMonFootprint_Wobbuffet[] = INCBIN_U8("graphics/pokemon/footprints/wobbuffet_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/front_pics/girafarig_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/palettes/girafarig_palette.gbapal.lz");
-const u32 gMonBackPic_Girafarig[] = INCBIN_U32("graphics/pokemon/back_pics/girafarig_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/palettes/girafarig_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Girafarig[] = INCBIN_U8("graphics/pokemon/icons/girafarig_icon.4bpp");
-const u8 gMonFootprint_Girafarig[] = INCBIN_U8("graphics/pokemon/footprints/girafarig_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/front_pics/pineco_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Pineco[] = INCBIN_U32("graphics/pokemon/palettes/pineco_palette.gbapal.lz");
-const u32 gMonBackPic_Pineco[] = INCBIN_U32("graphics/pokemon/back_pics/pineco_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Pineco[] = INCBIN_U32("graphics/pokemon/palettes/pineco_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Pineco[] = INCBIN_U8("graphics/pokemon/icons/pineco_icon.4bpp");
-const u8 gMonFootprint_Pineco[] = INCBIN_U8("graphics/pokemon/footprints/pineco_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/front_pics/forretress_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Forretress[] = INCBIN_U32("graphics/pokemon/palettes/forretress_palette.gbapal.lz");
-const u32 gMonBackPic_Forretress[] = INCBIN_U32("graphics/pokemon/back_pics/forretress_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Forretress[] = INCBIN_U32("graphics/pokemon/palettes/forretress_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Forretress[] = INCBIN_U8("graphics/pokemon/icons/forretress_icon.4bpp");
-const u8 gMonFootprint_Forretress[] = INCBIN_U8("graphics/pokemon/footprints/forretress_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/front_pics/dunsparce_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/palettes/dunsparce_palette.gbapal.lz");
-const u32 gMonBackPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/back_pics/dunsparce_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/palettes/dunsparce_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Dunsparce[] = INCBIN_U8("graphics/pokemon/icons/dunsparce_icon.4bpp");
-const u8 gMonFootprint_Dunsparce[] = INCBIN_U8("graphics/pokemon/footprints/dunsparce_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/front_pics/gligar_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Gligar[] = INCBIN_U32("graphics/pokemon/palettes/gligar_palette.gbapal.lz");
-const u32 gMonBackPic_Gligar[] = INCBIN_U32("graphics/pokemon/back_pics/gligar_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Gligar[] = INCBIN_U32("graphics/pokemon/palettes/gligar_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Gligar[] = INCBIN_U8("graphics/pokemon/icons/gligar_icon.4bpp");
-const u8 gMonFootprint_Gligar[] = INCBIN_U8("graphics/pokemon/footprints/gligar_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/front_pics/steelix_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Steelix[] = INCBIN_U32("graphics/pokemon/palettes/steelix_palette.gbapal.lz");
-const u32 gMonBackPic_Steelix[] = INCBIN_U32("graphics/pokemon/back_pics/steelix_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Steelix[] = INCBIN_U32("graphics/pokemon/palettes/steelix_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Steelix[] = INCBIN_U8("graphics/pokemon/icons/steelix_icon.4bpp");
-const u8 gMonFootprint_Steelix[] = INCBIN_U8("graphics/pokemon/footprints/steelix_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/front_pics/snubbull_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/palettes/snubbull_palette.gbapal.lz");
-const u32 gMonBackPic_Snubbull[] = INCBIN_U32("graphics/pokemon/back_pics/snubbull_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/palettes/snubbull_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Snubbull[] = INCBIN_U8("graphics/pokemon/icons/snubbull_icon.4bpp");
-const u8 gMonFootprint_Snubbull[] = INCBIN_U8("graphics/pokemon/footprints/snubbull_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/front_pics/granbull_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Granbull[] = INCBIN_U32("graphics/pokemon/palettes/granbull_palette.gbapal.lz");
-const u32 gMonBackPic_Granbull[] = INCBIN_U32("graphics/pokemon/back_pics/granbull_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Granbull[] = INCBIN_U32("graphics/pokemon/palettes/granbull_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Granbull[] = INCBIN_U8("graphics/pokemon/icons/granbull_icon.4bpp");
-const u8 gMonFootprint_Granbull[] = INCBIN_U8("graphics/pokemon/footprints/granbull_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/front_pics/qwilfish_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/palettes/qwilfish_palette.gbapal.lz");
-const u32 gMonBackPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/back_pics/qwilfish_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/palettes/qwilfish_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Qwilfish[] = INCBIN_U8("graphics/pokemon/icons/qwilfish_icon.4bpp");
-const u8 gMonFootprint_Qwilfish[] = INCBIN_U8("graphics/pokemon/footprints/qwilfish_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/front_pics/scizor_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Scizor[] = INCBIN_U32("graphics/pokemon/palettes/scizor_palette.gbapal.lz");
-const u32 gMonBackPic_Scizor[] = INCBIN_U32("graphics/pokemon/back_pics/scizor_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Scizor[] = INCBIN_U32("graphics/pokemon/palettes/scizor_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Scizor[] = INCBIN_U8("graphics/pokemon/icons/scizor_icon.4bpp");
-const u8 gMonFootprint_Scizor[] = INCBIN_U8("graphics/pokemon/footprints/scizor_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/front_pics/shuckle_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/palettes/shuckle_palette.gbapal.lz");
-const u32 gMonBackPic_Shuckle[] = INCBIN_U32("graphics/pokemon/back_pics/shuckle_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/palettes/shuckle_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Shuckle[] = INCBIN_U8("graphics/pokemon/icons/shuckle_icon.4bpp");
-const u8 gMonFootprint_Shuckle[] = INCBIN_U8("graphics/pokemon/footprints/shuckle_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/front_pics/heracross_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Heracross[] = INCBIN_U32("graphics/pokemon/palettes/heracross_palette.gbapal.lz");
-const u32 gMonBackPic_Heracross[] = INCBIN_U32("graphics/pokemon/back_pics/heracross_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Heracross[] = INCBIN_U32("graphics/pokemon/palettes/heracross_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Heracross[] = INCBIN_U8("graphics/pokemon/icons/heracross_icon.4bpp");
-const u8 gMonFootprint_Heracross[] = INCBIN_U8("graphics/pokemon/footprints/heracross_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/front_pics/sneasel_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/palettes/sneasel_palette.gbapal.lz");
-const u32 gMonBackPic_Sneasel[] = INCBIN_U32("graphics/pokemon/back_pics/sneasel_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/palettes/sneasel_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Sneasel[] = INCBIN_U8("graphics/pokemon/icons/sneasel_icon.4bpp");
-const u8 gMonFootprint_Sneasel[] = INCBIN_U8("graphics/pokemon/footprints/sneasel_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/front_pics/teddiursa_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/palettes/teddiursa_palette.gbapal.lz");
-const u32 gMonBackPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/back_pics/teddiursa_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/palettes/teddiursa_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Teddiursa[] = INCBIN_U8("graphics/pokemon/icons/teddiursa_icon.4bpp");
-const u8 gMonFootprint_Teddiursa[] = INCBIN_U8("graphics/pokemon/footprints/teddiursa_footprint.1bpp");
-const u32 gMonStillFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/front_pics/ursaring_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/palettes/ursaring_palette.gbapal.lz");
-const u32 gMonBackPic_Ursaring[] = INCBIN_U32("graphics/pokemon/back_pics/ursaring_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/palettes/ursaring_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ursaring[] = INCBIN_U8("graphics/pokemon/icons/ursaring_icon.4bpp");
-const u8 gMonFootprint_Ursaring[] = INCBIN_U8("graphics/pokemon/footprints/ursaring_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/front_pics/slugma_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Slugma[] = INCBIN_U32("graphics/pokemon/palettes/slugma_palette.gbapal.lz");
-const u32 gMonBackPic_Slugma[] = INCBIN_U32("graphics/pokemon/back_pics/slugma_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Slugma[] = INCBIN_U32("graphics/pokemon/palettes/slugma_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Slugma[] = INCBIN_U8("graphics/pokemon/icons/slugma_icon.4bpp");
-const u8 gMonFootprint_Slugma[] = INCBIN_U8("graphics/pokemon/footprints/slugma_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/front_pics/magcargo_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/palettes/magcargo_palette.gbapal.lz");
-const u32 gMonBackPic_Magcargo[] = INCBIN_U32("graphics/pokemon/back_pics/magcargo_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/palettes/magcargo_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Magcargo[] = INCBIN_U8("graphics/pokemon/icons/magcargo_icon.4bpp");
-const u8 gMonFootprint_Magcargo[] = INCBIN_U8("graphics/pokemon/footprints/magcargo_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/front_pics/swinub_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Swinub[] = INCBIN_U32("graphics/pokemon/palettes/swinub_palette.gbapal.lz");
-const u32 gMonBackPic_Swinub[] = INCBIN_U32("graphics/pokemon/back_pics/swinub_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Swinub[] = INCBIN_U32("graphics/pokemon/palettes/swinub_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Swinub[] = INCBIN_U8("graphics/pokemon/icons/swinub_icon.4bpp");
-const u8 gMonFootprint_Swinub[] = INCBIN_U8("graphics/pokemon/footprints/swinub_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/front_pics/piloswine_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/palettes/piloswine_palette.gbapal.lz");
-const u32 gMonBackPic_Piloswine[] = INCBIN_U32("graphics/pokemon/back_pics/piloswine_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/palettes/piloswine_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Piloswine[] = INCBIN_U8("graphics/pokemon/icons/piloswine_icon.4bpp");
-const u8 gMonFootprint_Piloswine[] = INCBIN_U8("graphics/pokemon/footprints/piloswine_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/front_pics/corsola_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Corsola[] = INCBIN_U32("graphics/pokemon/palettes/corsola_palette.gbapal.lz");
-const u32 gMonBackPic_Corsola[] = INCBIN_U32("graphics/pokemon/back_pics/corsola_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Corsola[] = INCBIN_U32("graphics/pokemon/palettes/corsola_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Corsola[] = INCBIN_U8("graphics/pokemon/icons/corsola_icon.4bpp");
-const u8 gMonFootprint_Corsola[] = INCBIN_U8("graphics/pokemon/footprints/corsola_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/front_pics/remoraid_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/palettes/remoraid_palette.gbapal.lz");
-const u32 gMonBackPic_Remoraid[] = INCBIN_U32("graphics/pokemon/back_pics/remoraid_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/palettes/remoraid_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Remoraid[] = INCBIN_U8("graphics/pokemon/icons/remoraid_icon.4bpp");
-const u8 gMonFootprint_Remoraid[] = INCBIN_U8("graphics/pokemon/footprints/remoraid_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/front_pics/octillery_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Octillery[] = INCBIN_U32("graphics/pokemon/palettes/octillery_palette.gbapal.lz");
-const u32 gMonBackPic_Octillery[] = INCBIN_U32("graphics/pokemon/back_pics/octillery_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Octillery[] = INCBIN_U32("graphics/pokemon/palettes/octillery_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Octillery[] = INCBIN_U8("graphics/pokemon/icons/octillery_icon.4bpp");
-const u8 gMonFootprint_Octillery[] = INCBIN_U8("graphics/pokemon/footprints/octillery_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/front_pics/delibird_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Delibird[] = INCBIN_U32("graphics/pokemon/palettes/delibird_palette.gbapal.lz");
-const u32 gMonBackPic_Delibird[] = INCBIN_U32("graphics/pokemon/back_pics/delibird_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Delibird[] = INCBIN_U32("graphics/pokemon/palettes/delibird_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Delibird[] = INCBIN_U8("graphics/pokemon/icons/delibird_icon.4bpp");
-const u8 gMonFootprint_Delibird[] = INCBIN_U8("graphics/pokemon/footprints/delibird_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/front_pics/mantine_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Mantine[] = INCBIN_U32("graphics/pokemon/palettes/mantine_palette.gbapal.lz");
-const u32 gMonBackPic_Mantine[] = INCBIN_U32("graphics/pokemon/back_pics/mantine_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Mantine[] = INCBIN_U32("graphics/pokemon/palettes/mantine_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Mantine[] = INCBIN_U8("graphics/pokemon/icons/mantine_icon.4bpp");
-const u8 gMonFootprint_Mantine[] = INCBIN_U8("graphics/pokemon/footprints/mantine_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/front_pics/skarmory_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/palettes/skarmory_palette.gbapal.lz");
-const u32 gMonBackPic_Skarmory[] = INCBIN_U32("graphics/pokemon/back_pics/skarmory_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/palettes/skarmory_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Skarmory[] = INCBIN_U8("graphics/pokemon/icons/skarmory_icon.4bpp");
-const u8 gMonFootprint_Skarmory[] = INCBIN_U8("graphics/pokemon/footprints/skarmory_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/front_pics/houndour_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Houndour[] = INCBIN_U32("graphics/pokemon/palettes/houndour_palette.gbapal.lz");
-const u32 gMonBackPic_Houndour[] = INCBIN_U32("graphics/pokemon/back_pics/houndour_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Houndour[] = INCBIN_U32("graphics/pokemon/palettes/houndour_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Houndour[] = INCBIN_U8("graphics/pokemon/icons/houndour_icon.4bpp");
-const u8 gMonFootprint_Houndour[] = INCBIN_U8("graphics/pokemon/footprints/houndour_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/front_pics/houndoom_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/palettes/houndoom_palette.gbapal.lz");
-const u32 gMonBackPic_Houndoom[] = INCBIN_U32("graphics/pokemon/back_pics/houndoom_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/palettes/houndoom_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Houndoom[] = INCBIN_U8("graphics/pokemon/icons/houndoom_icon.4bpp");
-const u8 gMonFootprint_Houndoom[] = INCBIN_U8("graphics/pokemon/footprints/houndoom_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/front_pics/kingdra_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/palettes/kingdra_palette.gbapal.lz");
-const u32 gMonBackPic_Kingdra[] = INCBIN_U32("graphics/pokemon/back_pics/kingdra_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/palettes/kingdra_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Kingdra[] = INCBIN_U8("graphics/pokemon/icons/kingdra_icon.4bpp");
-const u8 gMonFootprint_Kingdra[] = INCBIN_U8("graphics/pokemon/footprints/kingdra_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/front_pics/phanpy_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/palettes/phanpy_palette.gbapal.lz");
-const u32 gMonBackPic_Phanpy[] = INCBIN_U32("graphics/pokemon/back_pics/phanpy_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/palettes/phanpy_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Phanpy[] = INCBIN_U8("graphics/pokemon/icons/phanpy_icon.4bpp");
-const u8 gMonFootprint_Phanpy[] = INCBIN_U8("graphics/pokemon/footprints/phanpy_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/front_pics/donphan_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Donphan[] = INCBIN_U32("graphics/pokemon/palettes/donphan_palette.gbapal.lz");
-const u32 gMonBackPic_Donphan[] = INCBIN_U32("graphics/pokemon/back_pics/donphan_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Donphan[] = INCBIN_U32("graphics/pokemon/palettes/donphan_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Donphan[] = INCBIN_U8("graphics/pokemon/icons/donphan_icon.4bpp");
-const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/footprints/donphan_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/front_pics/porygon2_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/palettes/porygon2_palette.gbapal.lz");
-const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/back_pics/porygon2_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/palettes/porygon2_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/icons/porygon2_icon.4bpp");
-const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/footprints/porygon2_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/front_pics/stantler_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Stantler[] = INCBIN_U32("graphics/pokemon/palettes/stantler_palette.gbapal.lz");
-const u32 gMonBackPic_Stantler[] = INCBIN_U32("graphics/pokemon/back_pics/stantler_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Stantler[] = INCBIN_U32("graphics/pokemon/palettes/stantler_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Stantler[] = INCBIN_U8("graphics/pokemon/icons/stantler_icon.4bpp");
-const u8 gMonFootprint_Stantler[] = INCBIN_U8("graphics/pokemon/footprints/stantler_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/front_pics/smeargle_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/palettes/smeargle_palette.gbapal.lz");
-const u32 gMonBackPic_Smeargle[] = INCBIN_U32("graphics/pokemon/back_pics/smeargle_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/palettes/smeargle_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Smeargle[] = INCBIN_U8("graphics/pokemon/icons/smeargle_icon.4bpp");
-const u8 gMonFootprint_Smeargle[] = INCBIN_U8("graphics/pokemon/footprints/smeargle_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/front_pics/tyrogue_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/palettes/tyrogue_palette.gbapal.lz");
-const u32 gMonBackPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/back_pics/tyrogue_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/palettes/tyrogue_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Tyrogue[] = INCBIN_U8("graphics/pokemon/icons/tyrogue_icon.4bpp");
-const u8 gMonFootprint_Tyrogue[] = INCBIN_U8("graphics/pokemon/footprints/tyrogue_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/front_pics/hitmontop_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/palettes/hitmontop_palette.gbapal.lz");
-const u32 gMonBackPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/back_pics/hitmontop_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/palettes/hitmontop_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Hitmontop[] = INCBIN_U8("graphics/pokemon/icons/hitmontop_icon.4bpp");
-const u8 gMonFootprint_Hitmontop[] = INCBIN_U8("graphics/pokemon/footprints/hitmontop_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/front_pics/smoochum_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/palettes/smoochum_palette.gbapal.lz");
-const u32 gMonBackPic_Smoochum[] = INCBIN_U32("graphics/pokemon/back_pics/smoochum_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/palettes/smoochum_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Smoochum[] = INCBIN_U8("graphics/pokemon/icons/smoochum_icon.4bpp");
-const u8 gMonFootprint_Smoochum[] = INCBIN_U8("graphics/pokemon/footprints/smoochum_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/front_pics/elekid_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Elekid[] = INCBIN_U32("graphics/pokemon/palettes/elekid_palette.gbapal.lz");
-const u32 gMonBackPic_Elekid[] = INCBIN_U32("graphics/pokemon/back_pics/elekid_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Elekid[] = INCBIN_U32("graphics/pokemon/palettes/elekid_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Elekid[] = INCBIN_U8("graphics/pokemon/icons/elekid_icon.4bpp");
-const u8 gMonFootprint_Elekid[] = INCBIN_U8("graphics/pokemon/footprints/elekid_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/front_pics/magby_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Magby[] = INCBIN_U32("graphics/pokemon/palettes/magby_palette.gbapal.lz");
-const u32 gMonBackPic_Magby[] = INCBIN_U32("graphics/pokemon/back_pics/magby_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Magby[] = INCBIN_U32("graphics/pokemon/palettes/magby_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Magby[] = INCBIN_U8("graphics/pokemon/icons/magby_icon.4bpp");
-const u8 gMonFootprint_Magby[] = INCBIN_U8("graphics/pokemon/footprints/magby_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/front_pics/miltank_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Miltank[] = INCBIN_U32("graphics/pokemon/palettes/miltank_palette.gbapal.lz");
-const u32 gMonBackPic_Miltank[] = INCBIN_U32("graphics/pokemon/back_pics/miltank_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Miltank[] = INCBIN_U32("graphics/pokemon/palettes/miltank_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Miltank[] = INCBIN_U8("graphics/pokemon/icons/miltank_icon.4bpp");
-const u8 gMonFootprint_Miltank[] = INCBIN_U8("graphics/pokemon/footprints/miltank_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/front_pics/blissey_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Blissey[] = INCBIN_U32("graphics/pokemon/palettes/blissey_palette.gbapal.lz");
-const u32 gMonBackPic_Blissey[] = INCBIN_U32("graphics/pokemon/back_pics/blissey_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Blissey[] = INCBIN_U32("graphics/pokemon/palettes/blissey_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Blissey[] = INCBIN_U8("graphics/pokemon/icons/blissey_icon.4bpp");
-const u8 gMonFootprint_Blissey[] = INCBIN_U8("graphics/pokemon/footprints/blissey_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/front_pics/raikou_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Raikou[] = INCBIN_U32("graphics/pokemon/palettes/raikou_palette.gbapal.lz");
-const u32 gMonBackPic_Raikou[] = INCBIN_U32("graphics/pokemon/back_pics/raikou_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Raikou[] = INCBIN_U32("graphics/pokemon/palettes/raikou_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Raikou[] = INCBIN_U8("graphics/pokemon/icons/raikou_icon.4bpp");
-const u8 gMonFootprint_Raikou[] = INCBIN_U8("graphics/pokemon/footprints/raikou_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/front_pics/entei_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Entei[] = INCBIN_U32("graphics/pokemon/palettes/entei_palette.gbapal.lz");
-const u32 gMonBackPic_Entei[] = INCBIN_U32("graphics/pokemon/back_pics/entei_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Entei[] = INCBIN_U32("graphics/pokemon/palettes/entei_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Entei[] = INCBIN_U8("graphics/pokemon/icons/entei_icon.4bpp");
-const u8 gMonFootprint_Entei[] = INCBIN_U8("graphics/pokemon/footprints/entei_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/front_pics/suicune_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Suicune[] = INCBIN_U32("graphics/pokemon/palettes/suicune_palette.gbapal.lz");
-const u32 gMonBackPic_Suicune[] = INCBIN_U32("graphics/pokemon/back_pics/suicune_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Suicune[] = INCBIN_U32("graphics/pokemon/palettes/suicune_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Suicune[] = INCBIN_U8("graphics/pokemon/icons/suicune_icon.4bpp");
-const u8 gMonFootprint_Suicune[] = INCBIN_U8("graphics/pokemon/footprints/suicune_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/front_pics/larvitar_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/palettes/larvitar_palette.gbapal.lz");
-const u32 gMonBackPic_Larvitar[] = INCBIN_U32("graphics/pokemon/back_pics/larvitar_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/palettes/larvitar_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Larvitar[] = INCBIN_U8("graphics/pokemon/icons/larvitar_icon.4bpp");
-const u8 gMonFootprint_Larvitar[] = INCBIN_U8("graphics/pokemon/footprints/larvitar_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/front_pics/pupitar_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/palettes/pupitar_palette.gbapal.lz");
-const u32 gMonBackPic_Pupitar[] = INCBIN_U32("graphics/pokemon/back_pics/pupitar_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/palettes/pupitar_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Pupitar[] = INCBIN_U8("graphics/pokemon/icons/pupitar_icon.4bpp");
-const u8 gMonFootprint_Pupitar[] = INCBIN_U8("graphics/pokemon/footprints/pupitar_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/front_pics/tyranitar_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/palettes/tyranitar_palette.gbapal.lz");
-const u32 gMonBackPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/back_pics/tyranitar_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/palettes/tyranitar_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Tyranitar[] = INCBIN_U8("graphics/pokemon/icons/tyranitar_icon.4bpp");
-const u8 gMonFootprint_Tyranitar[] = INCBIN_U8("graphics/pokemon/footprints/tyranitar_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/front_pics/lugia_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Lugia[] = INCBIN_U32("graphics/pokemon/palettes/lugia_palette.gbapal.lz");
-const u32 gMonBackPic_Lugia[] = INCBIN_U32("graphics/pokemon/back_pics/lugia_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Lugia[] = INCBIN_U32("graphics/pokemon/palettes/lugia_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Lugia[] = INCBIN_U8("graphics/pokemon/icons/lugia_icon.4bpp");
-const u8 gMonFootprint_Lugia[] = INCBIN_U8("graphics/pokemon/footprints/lugia_footprint.1bpp");
-
-const u32 gMonStillFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/front_pics/ho_oh_still_front_pic.4bpp.lz");
-const u32 gMonPalette_HoOh[] = INCBIN_U32("graphics/pokemon/palettes/ho_oh_palette.gbapal.lz");
-const u32 gMonBackPic_HoOh[] = INCBIN_U32("graphics/pokemon/back_pics/ho_oh_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_HoOh[] = INCBIN_U32("graphics/pokemon/palettes/ho_oh_shiny_palette.gbapal.lz");
-const u8 gMonIcon_HoOh[] = INCBIN_U8("graphics/pokemon/icons/ho_oh_icon.4bpp");
-const u8 gMonFootprint_HoOh[] = INCBIN_U8("graphics/pokemon/footprints/ho_oh_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/front_pics/celebi_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Celebi[] = INCBIN_U32("graphics/pokemon/palettes/celebi_palette.gbapal.lz");
-const u32 gMonBackPic_Celebi[] = INCBIN_U32("graphics/pokemon/back_pics/celebi_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Celebi[] = INCBIN_U32("graphics/pokemon/palettes/celebi_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Celebi[] = INCBIN_U8("graphics/pokemon/icons/celebi_icon.4bpp");
-const u8 gMonFootprint_Celebi[] = INCBIN_U8("graphics/pokemon/footprints/celebi_footprint.1bpp");
-
-const u32 gMonStillFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/front_pics/double_question_mark_still_front_pic.4bpp.lz");
-const u32 gMonPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/double_question_mark_palette.gbapal.lz");
-const u32 gMonBackPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/double_question_mark_shiny_palette.gbapal.lz");
-
-const u32 gMonStillFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/front_pics/treecko_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Treecko[] = INCBIN_U32("graphics/pokemon/palettes/treecko_palette.gbapal.lz");
-const u32 gMonBackPic_Treecko[] = INCBIN_U32("graphics/pokemon/back_pics/treecko_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Treecko[] = INCBIN_U32("graphics/pokemon/palettes/treecko_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Treecko[] = INCBIN_U8("graphics/pokemon/icons/treecko_icon.4bpp");
-const u8 gMonFootprint_Treecko[] = INCBIN_U8("graphics/pokemon/footprints/treecko_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/front_pics/grovyle_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/palettes/grovyle_palette.gbapal.lz");
-const u32 gMonBackPic_Grovyle[] = INCBIN_U32("graphics/pokemon/back_pics/grovyle_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/palettes/grovyle_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Grovyle[] = INCBIN_U8("graphics/pokemon/icons/grovyle_icon.4bpp");
-const u8 gMonFootprint_Grovyle[] = INCBIN_U8("graphics/pokemon/footprints/grovyle_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/front_pics/sceptile_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/palettes/sceptile_palette.gbapal.lz");
-const u32 gMonBackPic_Sceptile[] = INCBIN_U32("graphics/pokemon/back_pics/sceptile_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/palettes/sceptile_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Sceptile[] = INCBIN_U8("graphics/pokemon/icons/sceptile_icon.4bpp");
-const u8 gMonFootprint_Sceptile[] = INCBIN_U8("graphics/pokemon/footprints/sceptile_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/front_pics/torchic_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Torchic[] = INCBIN_U32("graphics/pokemon/palettes/torchic_palette.gbapal.lz");
-const u32 gMonBackPic_Torchic[] = INCBIN_U32("graphics/pokemon/back_pics/torchic_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Torchic[] = INCBIN_U32("graphics/pokemon/palettes/torchic_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Torchic[] = INCBIN_U8("graphics/pokemon/icons/torchic_icon.4bpp");
-const u8 gMonFootprint_Torchic[] = INCBIN_U8("graphics/pokemon/footprints/torchic_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/front_pics/combusken_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Combusken[] = INCBIN_U32("graphics/pokemon/palettes/combusken_palette.gbapal.lz");
-const u32 gMonBackPic_Combusken[] = INCBIN_U32("graphics/pokemon/back_pics/combusken_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Combusken[] = INCBIN_U32("graphics/pokemon/palettes/combusken_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Combusken[] = INCBIN_U8("graphics/pokemon/icons/combusken_icon.4bpp");
-const u8 gMonFootprint_Combusken[] = INCBIN_U8("graphics/pokemon/footprints/combusken_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/front_pics/blaziken_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/palettes/blaziken_palette.gbapal.lz");
-const u32 gMonBackPic_Blaziken[] = INCBIN_U32("graphics/pokemon/back_pics/blaziken_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/palettes/blaziken_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Blaziken[] = INCBIN_U8("graphics/pokemon/icons/blaziken_icon.4bpp");
-const u8 gMonFootprint_Blaziken[] = INCBIN_U8("graphics/pokemon/footprints/blaziken_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/front_pics/mudkip_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/palettes/mudkip_palette.gbapal.lz");
-const u32 gMonBackPic_Mudkip[] = INCBIN_U32("graphics/pokemon/back_pics/mudkip_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/palettes/mudkip_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Mudkip[] = INCBIN_U8("graphics/pokemon/icons/mudkip_icon.4bpp");
-const u8 gMonFootprint_Mudkip[] = INCBIN_U8("graphics/pokemon/footprints/mudkip_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/front_pics/marshtomp_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/palettes/marshtomp_palette.gbapal.lz");
-const u32 gMonBackPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/back_pics/marshtomp_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/palettes/marshtomp_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Marshtomp[] = INCBIN_U8("graphics/pokemon/icons/marshtomp_icon.4bpp");
-const u8 gMonFootprint_Marshtomp[] = INCBIN_U8("graphics/pokemon/footprints/marshtomp_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/front_pics/swampert_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Swampert[] = INCBIN_U32("graphics/pokemon/palettes/swampert_palette.gbapal.lz");
-const u32 gMonBackPic_Swampert[] = INCBIN_U32("graphics/pokemon/back_pics/swampert_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Swampert[] = INCBIN_U32("graphics/pokemon/palettes/swampert_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Swampert[] = INCBIN_U8("graphics/pokemon/icons/swampert_icon.4bpp");
-const u8 gMonFootprint_Swampert[] = INCBIN_U8("graphics/pokemon/footprints/swampert_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/front_pics/poochyena_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/palettes/poochyena_palette.gbapal.lz");
-const u32 gMonBackPic_Poochyena[] = INCBIN_U32("graphics/pokemon/back_pics/poochyena_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/palettes/poochyena_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Poochyena[] = INCBIN_U8("graphics/pokemon/icons/poochyena_icon.4bpp");
-const u8 gMonFootprint_Poochyena[] = INCBIN_U8("graphics/pokemon/footprints/poochyena_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/front_pics/mightyena_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/palettes/mightyena_palette.gbapal.lz");
-const u32 gMonBackPic_Mightyena[] = INCBIN_U32("graphics/pokemon/back_pics/mightyena_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/palettes/mightyena_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Mightyena[] = INCBIN_U8("graphics/pokemon/icons/mightyena_icon.4bpp");
-const u8 gMonFootprint_Mightyena[] = INCBIN_U8("graphics/pokemon/footprints/mightyena_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/front_pics/zigzagoon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/palettes/zigzagoon_palette.gbapal.lz");
-const u32 gMonBackPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/back_pics/zigzagoon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/palettes/zigzagoon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Zigzagoon[] = INCBIN_U8("graphics/pokemon/icons/zigzagoon_icon.4bpp");
-const u8 gMonFootprint_Zigzagoon[] = INCBIN_U8("graphics/pokemon/footprints/zigzagoon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/front_pics/linoone_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Linoone[] = INCBIN_U32("graphics/pokemon/palettes/linoone_palette.gbapal.lz");
-const u32 gMonBackPic_Linoone[] = INCBIN_U32("graphics/pokemon/back_pics/linoone_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Linoone[] = INCBIN_U32("graphics/pokemon/palettes/linoone_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Linoone[] = INCBIN_U8("graphics/pokemon/icons/linoone_icon.4bpp");
-const u8 gMonFootprint_Linoone[] = INCBIN_U8("graphics/pokemon/footprints/linoone_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/front_pics/wurmple_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/palettes/wurmple_palette.gbapal.lz");
-const u32 gMonBackPic_Wurmple[] = INCBIN_U32("graphics/pokemon/back_pics/wurmple_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/palettes/wurmple_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Wurmple[] = INCBIN_U8("graphics/pokemon/icons/wurmple_icon.4bpp");
-const u8 gMonFootprint_Wurmple[] = INCBIN_U8("graphics/pokemon/footprints/wurmple_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/front_pics/silcoon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/palettes/silcoon_palette.gbapal.lz");
-const u32 gMonBackPic_Silcoon[] = INCBIN_U32("graphics/pokemon/back_pics/silcoon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/palettes/silcoon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Silcoon[] = INCBIN_U8("graphics/pokemon/icons/silcoon_icon.4bpp");
-const u8 gMonFootprint_Silcoon[] = INCBIN_U8("graphics/pokemon/footprints/silcoon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/front_pics/beautifly_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/palettes/beautifly_palette.gbapal.lz");
-const u32 gMonBackPic_Beautifly[] = INCBIN_U32("graphics/pokemon/back_pics/beautifly_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/palettes/beautifly_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Beautifly[] = INCBIN_U8("graphics/pokemon/icons/beautifly_icon.4bpp");
-const u8 gMonFootprint_Beautifly[] = INCBIN_U8("graphics/pokemon/footprints/beautifly_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/front_pics/cascoon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/palettes/cascoon_palette.gbapal.lz");
-const u32 gMonBackPic_Cascoon[] = INCBIN_U32("graphics/pokemon/back_pics/cascoon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/palettes/cascoon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Cascoon[] = INCBIN_U8("graphics/pokemon/icons/cascoon_icon.4bpp");
-const u8 gMonFootprint_Cascoon[] = INCBIN_U8("graphics/pokemon/footprints/cascoon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/front_pics/dustox_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Dustox[] = INCBIN_U32("graphics/pokemon/palettes/dustox_palette.gbapal.lz");
-const u32 gMonBackPic_Dustox[] = INCBIN_U32("graphics/pokemon/back_pics/dustox_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Dustox[] = INCBIN_U32("graphics/pokemon/palettes/dustox_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Dustox[] = INCBIN_U8("graphics/pokemon/icons/dustox_icon.4bpp");
-const u8 gMonFootprint_Dustox[] = INCBIN_U8("graphics/pokemon/footprints/dustox_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/front_pics/lotad_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Lotad[] = INCBIN_U32("graphics/pokemon/palettes/lotad_palette.gbapal.lz");
-const u32 gMonBackPic_Lotad[] = INCBIN_U32("graphics/pokemon/back_pics/lotad_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Lotad[] = INCBIN_U32("graphics/pokemon/palettes/lotad_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Lotad[] = INCBIN_U8("graphics/pokemon/icons/lotad_icon.4bpp");
-const u8 gMonFootprint_Lotad[] = INCBIN_U8("graphics/pokemon/footprints/lotad_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/front_pics/lombre_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Lombre[] = INCBIN_U32("graphics/pokemon/palettes/lombre_palette.gbapal.lz");
-const u32 gMonBackPic_Lombre[] = INCBIN_U32("graphics/pokemon/back_pics/lombre_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Lombre[] = INCBIN_U32("graphics/pokemon/palettes/lombre_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Lombre[] = INCBIN_U8("graphics/pokemon/icons/lombre_icon.4bpp");
-const u8 gMonFootprint_Lombre[] = INCBIN_U8("graphics/pokemon/footprints/lombre_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/front_pics/ludicolo_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/palettes/ludicolo_palette.gbapal.lz");
-const u32 gMonBackPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/back_pics/ludicolo_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/palettes/ludicolo_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ludicolo[] = INCBIN_U8("graphics/pokemon/icons/ludicolo_icon.4bpp");
-const u8 gMonFootprint_Ludicolo[] = INCBIN_U8("graphics/pokemon/footprints/ludicolo_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/front_pics/seedot_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Seedot[] = INCBIN_U32("graphics/pokemon/palettes/seedot_palette.gbapal.lz");
-const u32 gMonBackPic_Seedot[] = INCBIN_U32("graphics/pokemon/back_pics/seedot_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Seedot[] = INCBIN_U32("graphics/pokemon/palettes/seedot_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Seedot[] = INCBIN_U8("graphics/pokemon/icons/seedot_icon.4bpp");
-const u8 gMonFootprint_Seedot[] = INCBIN_U8("graphics/pokemon/footprints/seedot_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/front_pics/nuzleaf_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/palettes/nuzleaf_palette.gbapal.lz");
-const u32 gMonBackPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/back_pics/nuzleaf_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/palettes/nuzleaf_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Nuzleaf[] = INCBIN_U8("graphics/pokemon/icons/nuzleaf_icon.4bpp");
-const u8 gMonFootprint_Nuzleaf[] = INCBIN_U8("graphics/pokemon/footprints/nuzleaf_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/front_pics/shiftry_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/palettes/shiftry_palette.gbapal.lz");
-const u32 gMonBackPic_Shiftry[] = INCBIN_U32("graphics/pokemon/back_pics/shiftry_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/palettes/shiftry_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Shiftry[] = INCBIN_U8("graphics/pokemon/icons/shiftry_icon.4bpp");
-const u8 gMonFootprint_Shiftry[] = INCBIN_U8("graphics/pokemon/footprints/shiftry_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/front_pics/nincada_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Nincada[] = INCBIN_U32("graphics/pokemon/palettes/nincada_palette.gbapal.lz");
-const u32 gMonBackPic_Nincada[] = INCBIN_U32("graphics/pokemon/back_pics/nincada_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Nincada[] = INCBIN_U32("graphics/pokemon/palettes/nincada_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Nincada[] = INCBIN_U8("graphics/pokemon/icons/nincada_icon.4bpp");
-const u8 gMonFootprint_Nincada[] = INCBIN_U8("graphics/pokemon/footprints/nincada_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/front_pics/ninjask_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/palettes/ninjask_palette.gbapal.lz");
-const u32 gMonBackPic_Ninjask[] = INCBIN_U32("graphics/pokemon/back_pics/ninjask_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/palettes/ninjask_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ninjask[] = INCBIN_U8("graphics/pokemon/icons/ninjask_icon.4bpp");
-const u8 gMonFootprint_Ninjask[] = INCBIN_U8("graphics/pokemon/footprints/ninjask_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/front_pics/shedinja_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/palettes/shedinja_palette.gbapal.lz");
-const u32 gMonBackPic_Shedinja[] = INCBIN_U32("graphics/pokemon/back_pics/shedinja_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/palettes/shedinja_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Shedinja[] = INCBIN_U8("graphics/pokemon/icons/shedinja_icon.4bpp");
-const u8 gMonFootprint_Shedinja[] = INCBIN_U8("graphics/pokemon/footprints/shedinja_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/front_pics/taillow_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Taillow[] = INCBIN_U32("graphics/pokemon/palettes/taillow_palette.gbapal.lz");
-const u32 gMonBackPic_Taillow[] = INCBIN_U32("graphics/pokemon/back_pics/taillow_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Taillow[] = INCBIN_U32("graphics/pokemon/palettes/taillow_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Taillow[] = INCBIN_U8("graphics/pokemon/icons/taillow_icon.4bpp");
-const u8 gMonFootprint_Taillow[] = INCBIN_U8("graphics/pokemon/footprints/taillow_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/front_pics/swellow_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Swellow[] = INCBIN_U32("graphics/pokemon/palettes/swellow_palette.gbapal.lz");
-const u32 gMonBackPic_Swellow[] = INCBIN_U32("graphics/pokemon/back_pics/swellow_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Swellow[] = INCBIN_U32("graphics/pokemon/palettes/swellow_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Swellow[] = INCBIN_U8("graphics/pokemon/icons/swellow_icon.4bpp");
-const u8 gMonFootprint_Swellow[] = INCBIN_U8("graphics/pokemon/footprints/swellow_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/front_pics/shroomish_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/palettes/shroomish_palette.gbapal.lz");
-const u32 gMonBackPic_Shroomish[] = INCBIN_U32("graphics/pokemon/back_pics/shroomish_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/palettes/shroomish_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Shroomish[] = INCBIN_U8("graphics/pokemon/icons/shroomish_icon.4bpp");
-const u8 gMonFootprint_Shroomish[] = INCBIN_U8("graphics/pokemon/footprints/shroomish_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/front_pics/breloom_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Breloom[] = INCBIN_U32("graphics/pokemon/palettes/breloom_palette.gbapal.lz");
-const u32 gMonBackPic_Breloom[] = INCBIN_U32("graphics/pokemon/back_pics/breloom_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Breloom[] = INCBIN_U32("graphics/pokemon/palettes/breloom_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Breloom[] = INCBIN_U8("graphics/pokemon/icons/breloom_icon.4bpp");
-const u8 gMonFootprint_Breloom[] = INCBIN_U8("graphics/pokemon/footprints/breloom_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/front_pics/spinda_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Spinda[] = INCBIN_U32("graphics/pokemon/palettes/spinda_palette.gbapal.lz");
-const u32 gMonBackPic_Spinda[] = INCBIN_U32("graphics/pokemon/back_pics/spinda_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Spinda[] = INCBIN_U32("graphics/pokemon/palettes/spinda_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Spinda[] = INCBIN_U8("graphics/pokemon/icons/spinda_icon.4bpp");
-const u8 gMonFootprint_Spinda[] = INCBIN_U8("graphics/pokemon/footprints/spinda_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/front_pics/wingull_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Wingull[] = INCBIN_U32("graphics/pokemon/palettes/wingull_palette.gbapal.lz");
-const u32 gMonBackPic_Wingull[] = INCBIN_U32("graphics/pokemon/back_pics/wingull_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Wingull[] = INCBIN_U32("graphics/pokemon/palettes/wingull_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Wingull[] = INCBIN_U8("graphics/pokemon/icons/wingull_icon.4bpp");
-const u8 gMonFootprint_Wingull[] = INCBIN_U8("graphics/pokemon/footprints/wingull_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/front_pics/pelipper_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/palettes/pelipper_palette.gbapal.lz");
-const u32 gMonBackPic_Pelipper[] = INCBIN_U32("graphics/pokemon/back_pics/pelipper_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/palettes/pelipper_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Pelipper[] = INCBIN_U8("graphics/pokemon/icons/pelipper_icon.4bpp");
-const u8 gMonFootprint_Pelipper[] = INCBIN_U8("graphics/pokemon/footprints/pelipper_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/front_pics/surskit_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Surskit[] = INCBIN_U32("graphics/pokemon/palettes/surskit_palette.gbapal.lz");
-const u32 gMonBackPic_Surskit[] = INCBIN_U32("graphics/pokemon/back_pics/surskit_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Surskit[] = INCBIN_U32("graphics/pokemon/palettes/surskit_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Surskit[] = INCBIN_U8("graphics/pokemon/icons/surskit_icon.4bpp");
-const u8 gMonFootprint_Surskit[] = INCBIN_U8("graphics/pokemon/footprints/surskit_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/front_pics/masquerain_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/palettes/masquerain_palette.gbapal.lz");
-const u32 gMonBackPic_Masquerain[] = INCBIN_U32("graphics/pokemon/back_pics/masquerain_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/palettes/masquerain_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Masquerain[] = INCBIN_U8("graphics/pokemon/icons/masquerain_icon.4bpp");
-const u8 gMonFootprint_Masquerain[] = INCBIN_U8("graphics/pokemon/footprints/masquerain_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/front_pics/wailmer_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/palettes/wailmer_palette.gbapal.lz");
-const u32 gMonBackPic_Wailmer[] = INCBIN_U32("graphics/pokemon/back_pics/wailmer_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/palettes/wailmer_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Wailmer[] = INCBIN_U8("graphics/pokemon/icons/wailmer_icon.4bpp");
-const u8 gMonFootprint_Wailmer[] = INCBIN_U8("graphics/pokemon/footprints/wailmer_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/front_pics/wailord_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Wailord[] = INCBIN_U32("graphics/pokemon/palettes/wailord_palette.gbapal.lz");
-const u32 gMonBackPic_Wailord[] = INCBIN_U32("graphics/pokemon/back_pics/wailord_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Wailord[] = INCBIN_U32("graphics/pokemon/palettes/wailord_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Wailord[] = INCBIN_U8("graphics/pokemon/icons/wailord_icon.4bpp");
-const u8 gMonFootprint_Wailord[] = INCBIN_U8("graphics/pokemon/footprints/wailord_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/front_pics/skitty_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Skitty[] = INCBIN_U32("graphics/pokemon/palettes/skitty_palette.gbapal.lz");
-const u32 gMonBackPic_Skitty[] = INCBIN_U32("graphics/pokemon/back_pics/skitty_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Skitty[] = INCBIN_U32("graphics/pokemon/palettes/skitty_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Skitty[] = INCBIN_U8("graphics/pokemon/icons/skitty_icon.4bpp");
-const u8 gMonFootprint_Skitty[] = INCBIN_U8("graphics/pokemon/footprints/skitty_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/front_pics/delcatty_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/palettes/delcatty_palette.gbapal.lz");
-const u32 gMonBackPic_Delcatty[] = INCBIN_U32("graphics/pokemon/back_pics/delcatty_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/palettes/delcatty_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Delcatty[] = INCBIN_U8("graphics/pokemon/icons/delcatty_icon.4bpp");
-const u8 gMonFootprint_Delcatty[] = INCBIN_U8("graphics/pokemon/footprints/delcatty_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/front_pics/kecleon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/palettes/kecleon_palette.gbapal.lz");
-const u32 gMonBackPic_Kecleon[] = INCBIN_U32("graphics/pokemon/back_pics/kecleon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/palettes/kecleon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Kecleon[] = INCBIN_U8("graphics/pokemon/icons/kecleon_icon.4bpp");
-const u8 gMonFootprint_Kecleon[] = INCBIN_U8("graphics/pokemon/footprints/kecleon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/front_pics/baltoy_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/palettes/baltoy_palette.gbapal.lz");
-const u32 gMonBackPic_Baltoy[] = INCBIN_U32("graphics/pokemon/back_pics/baltoy_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/palettes/baltoy_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Baltoy[] = INCBIN_U8("graphics/pokemon/icons/baltoy_icon.4bpp");
-const u8 gMonFootprint_Baltoy[] = INCBIN_U8("graphics/pokemon/footprints/baltoy_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/front_pics/claydol_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Claydol[] = INCBIN_U32("graphics/pokemon/palettes/claydol_palette.gbapal.lz");
-const u32 gMonBackPic_Claydol[] = INCBIN_U32("graphics/pokemon/back_pics/claydol_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Claydol[] = INCBIN_U32("graphics/pokemon/palettes/claydol_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Claydol[] = INCBIN_U8("graphics/pokemon/icons/claydol_icon.4bpp");
-const u8 gMonFootprint_Claydol[] = INCBIN_U8("graphics/pokemon/footprints/claydol_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/front_pics/nosepass_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/palettes/nosepass_palette.gbapal.lz");
-const u32 gMonBackPic_Nosepass[] = INCBIN_U32("graphics/pokemon/back_pics/nosepass_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/palettes/nosepass_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Nosepass[] = INCBIN_U8("graphics/pokemon/icons/nosepass_icon.4bpp");
-const u8 gMonFootprint_Nosepass[] = INCBIN_U8("graphics/pokemon/footprints/nosepass_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/front_pics/torkoal_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/palettes/torkoal_palette.gbapal.lz");
-const u32 gMonBackPic_Torkoal[] = INCBIN_U32("graphics/pokemon/back_pics/torkoal_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/palettes/torkoal_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Torkoal[] = INCBIN_U8("graphics/pokemon/icons/torkoal_icon.4bpp");
-const u8 gMonFootprint_Torkoal[] = INCBIN_U8("graphics/pokemon/footprints/torkoal_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/front_pics/sableye_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Sableye[] = INCBIN_U32("graphics/pokemon/palettes/sableye_palette.gbapal.lz");
-const u32 gMonBackPic_Sableye[] = INCBIN_U32("graphics/pokemon/back_pics/sableye_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Sableye[] = INCBIN_U32("graphics/pokemon/palettes/sableye_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Sableye[] = INCBIN_U8("graphics/pokemon/icons/sableye_icon.4bpp");
-const u8 gMonFootprint_Sableye[] = INCBIN_U8("graphics/pokemon/footprints/sableye_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/front_pics/barboach_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Barboach[] = INCBIN_U32("graphics/pokemon/palettes/barboach_palette.gbapal.lz");
-const u32 gMonBackPic_Barboach[] = INCBIN_U32("graphics/pokemon/back_pics/barboach_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Barboach[] = INCBIN_U32("graphics/pokemon/palettes/barboach_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Barboach[] = INCBIN_U8("graphics/pokemon/icons/barboach_icon.4bpp");
-const u8 gMonFootprint_Barboach[] = INCBIN_U8("graphics/pokemon/footprints/barboach_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/front_pics/whiscash_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/palettes/whiscash_palette.gbapal.lz");
-const u32 gMonBackPic_Whiscash[] = INCBIN_U32("graphics/pokemon/back_pics/whiscash_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/palettes/whiscash_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Whiscash[] = INCBIN_U8("graphics/pokemon/icons/whiscash_icon.4bpp");
-const u8 gMonFootprint_Whiscash[] = INCBIN_U8("graphics/pokemon/footprints/whiscash_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/front_pics/luvdisc_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/palettes/luvdisc_palette.gbapal.lz");
-const u32 gMonBackPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/back_pics/luvdisc_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/palettes/luvdisc_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Luvdisc[] = INCBIN_U8("graphics/pokemon/icons/luvdisc_icon.4bpp");
-const u8 gMonFootprint_Luvdisc[] = INCBIN_U8("graphics/pokemon/footprints/luvdisc_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/front_pics/corphish_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Corphish[] = INCBIN_U32("graphics/pokemon/palettes/corphish_palette.gbapal.lz");
-const u32 gMonBackPic_Corphish[] = INCBIN_U32("graphics/pokemon/back_pics/corphish_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Corphish[] = INCBIN_U32("graphics/pokemon/palettes/corphish_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Corphish[] = INCBIN_U8("graphics/pokemon/icons/corphish_icon.4bpp");
-const u8 gMonFootprint_Corphish[] = INCBIN_U8("graphics/pokemon/footprints/corphish_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/front_pics/crawdaunt_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/palettes/crawdaunt_palette.gbapal.lz");
-const u32 gMonBackPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/back_pics/crawdaunt_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/palettes/crawdaunt_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Crawdaunt[] = INCBIN_U8("graphics/pokemon/icons/crawdaunt_icon.4bpp");
-const u8 gMonFootprint_Crawdaunt[] = INCBIN_U8("graphics/pokemon/footprints/crawdaunt_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/front_pics/feebas_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Feebas[] = INCBIN_U32("graphics/pokemon/palettes/feebas_palette.gbapal.lz");
-const u32 gMonBackPic_Feebas[] = INCBIN_U32("graphics/pokemon/back_pics/feebas_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Feebas[] = INCBIN_U32("graphics/pokemon/palettes/feebas_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Feebas[] = INCBIN_U8("graphics/pokemon/icons/feebas_icon.4bpp");
-const u8 gMonFootprint_Feebas[] = INCBIN_U8("graphics/pokemon/footprints/feebas_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/front_pics/milotic_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Milotic[] = INCBIN_U32("graphics/pokemon/palettes/milotic_palette.gbapal.lz");
-const u32 gMonBackPic_Milotic[] = INCBIN_U32("graphics/pokemon/back_pics/milotic_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Milotic[] = INCBIN_U32("graphics/pokemon/palettes/milotic_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Milotic[] = INCBIN_U8("graphics/pokemon/icons/milotic_icon.4bpp");
-const u8 gMonFootprint_Milotic[] = INCBIN_U8("graphics/pokemon/footprints/milotic_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/front_pics/carvanha_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/palettes/carvanha_palette.gbapal.lz");
-const u32 gMonBackPic_Carvanha[] = INCBIN_U32("graphics/pokemon/back_pics/carvanha_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/palettes/carvanha_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Carvanha[] = INCBIN_U8("graphics/pokemon/icons/carvanha_icon.4bpp");
-const u8 gMonFootprint_Carvanha[] = INCBIN_U8("graphics/pokemon/footprints/carvanha_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/front_pics/sharpedo_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/palettes/sharpedo_palette.gbapal.lz");
-const u32 gMonBackPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/back_pics/sharpedo_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/palettes/sharpedo_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Sharpedo[] = INCBIN_U8("graphics/pokemon/icons/sharpedo_icon.4bpp");
-const u8 gMonFootprint_Sharpedo[] = INCBIN_U8("graphics/pokemon/footprints/sharpedo_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/front_pics/trapinch_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/palettes/trapinch_palette.gbapal.lz");
-const u32 gMonBackPic_Trapinch[] = INCBIN_U32("graphics/pokemon/back_pics/trapinch_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/palettes/trapinch_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Trapinch[] = INCBIN_U8("graphics/pokemon/icons/trapinch_icon.4bpp");
-const u8 gMonFootprint_Trapinch[] = INCBIN_U8("graphics/pokemon/footprints/trapinch_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/front_pics/vibrava_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/palettes/vibrava_palette.gbapal.lz");
-const u32 gMonBackPic_Vibrava[] = INCBIN_U32("graphics/pokemon/back_pics/vibrava_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/palettes/vibrava_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Vibrava[] = INCBIN_U8("graphics/pokemon/icons/vibrava_icon.4bpp");
-const u8 gMonFootprint_Vibrava[] = INCBIN_U8("graphics/pokemon/footprints/vibrava_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/front_pics/flygon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Flygon[] = INCBIN_U32("graphics/pokemon/palettes/flygon_palette.gbapal.lz");
-const u32 gMonBackPic_Flygon[] = INCBIN_U32("graphics/pokemon/back_pics/flygon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Flygon[] = INCBIN_U32("graphics/pokemon/palettes/flygon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Flygon[] = INCBIN_U8("graphics/pokemon/icons/flygon_icon.4bpp");
-const u8 gMonFootprint_Flygon[] = INCBIN_U8("graphics/pokemon/footprints/flygon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/front_pics/makuhita_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/palettes/makuhita_palette.gbapal.lz");
-const u32 gMonBackPic_Makuhita[] = INCBIN_U32("graphics/pokemon/back_pics/makuhita_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/palettes/makuhita_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Makuhita[] = INCBIN_U8("graphics/pokemon/icons/makuhita_icon.4bpp");
-const u8 gMonFootprint_Makuhita[] = INCBIN_U8("graphics/pokemon/footprints/makuhita_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/front_pics/hariyama_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/palettes/hariyama_palette.gbapal.lz");
-const u32 gMonBackPic_Hariyama[] = INCBIN_U32("graphics/pokemon/back_pics/hariyama_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/palettes/hariyama_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Hariyama[] = INCBIN_U8("graphics/pokemon/icons/hariyama_icon.4bpp");
-const u8 gMonFootprint_Hariyama[] = INCBIN_U8("graphics/pokemon/footprints/hariyama_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/front_pics/electrike_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Electrike[] = INCBIN_U32("graphics/pokemon/palettes/electrike_palette.gbapal.lz");
-const u32 gMonBackPic_Electrike[] = INCBIN_U32("graphics/pokemon/back_pics/electrike_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Electrike[] = INCBIN_U32("graphics/pokemon/palettes/electrike_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Electrike[] = INCBIN_U8("graphics/pokemon/icons/electrike_icon.4bpp");
-const u8 gMonFootprint_Electrike[] = INCBIN_U8("graphics/pokemon/footprints/electrike_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/front_pics/manectric_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Manectric[] = INCBIN_U32("graphics/pokemon/palettes/manectric_palette.gbapal.lz");
-const u32 gMonBackPic_Manectric[] = INCBIN_U32("graphics/pokemon/back_pics/manectric_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Manectric[] = INCBIN_U32("graphics/pokemon/palettes/manectric_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Manectric[] = INCBIN_U8("graphics/pokemon/icons/manectric_icon.4bpp");
-const u8 gMonFootprint_Manectric[] = INCBIN_U8("graphics/pokemon/footprints/manectric_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/front_pics/numel_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Numel[] = INCBIN_U32("graphics/pokemon/palettes/numel_palette.gbapal.lz");
-const u32 gMonBackPic_Numel[] = INCBIN_U32("graphics/pokemon/back_pics/numel_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Numel[] = INCBIN_U32("graphics/pokemon/palettes/numel_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Numel[] = INCBIN_U8("graphics/pokemon/icons/numel_icon.4bpp");
-const u8 gMonFootprint_Numel[] = INCBIN_U8("graphics/pokemon/footprints/numel_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/front_pics/camerupt_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/palettes/camerupt_palette.gbapal.lz");
-const u32 gMonBackPic_Camerupt[] = INCBIN_U32("graphics/pokemon/back_pics/camerupt_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/palettes/camerupt_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Camerupt[] = INCBIN_U8("graphics/pokemon/icons/camerupt_icon.4bpp");
-const u8 gMonFootprint_Camerupt[] = INCBIN_U8("graphics/pokemon/footprints/camerupt_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/front_pics/spheal_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Spheal[] = INCBIN_U32("graphics/pokemon/palettes/spheal_palette.gbapal.lz");
-const u32 gMonBackPic_Spheal[] = INCBIN_U32("graphics/pokemon/back_pics/spheal_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Spheal[] = INCBIN_U32("graphics/pokemon/palettes/spheal_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Spheal[] = INCBIN_U8("graphics/pokemon/icons/spheal_icon.4bpp");
-const u8 gMonFootprint_Spheal[] = INCBIN_U8("graphics/pokemon/footprints/spheal_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/front_pics/sealeo_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/palettes/sealeo_palette.gbapal.lz");
-const u32 gMonBackPic_Sealeo[] = INCBIN_U32("graphics/pokemon/back_pics/sealeo_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/palettes/sealeo_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Sealeo[] = INCBIN_U8("graphics/pokemon/icons/sealeo_icon.4bpp");
-const u8 gMonFootprint_Sealeo[] = INCBIN_U8("graphics/pokemon/footprints/sealeo_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/front_pics/walrein_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Walrein[] = INCBIN_U32("graphics/pokemon/palettes/walrein_palette.gbapal.lz");
-const u32 gMonBackPic_Walrein[] = INCBIN_U32("graphics/pokemon/back_pics/walrein_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Walrein[] = INCBIN_U32("graphics/pokemon/palettes/walrein_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Walrein[] = INCBIN_U8("graphics/pokemon/icons/walrein_icon.4bpp");
-const u8 gMonFootprint_Walrein[] = INCBIN_U8("graphics/pokemon/footprints/walrein_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/front_pics/cacnea_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/palettes/cacnea_palette.gbapal.lz");
-const u32 gMonBackPic_Cacnea[] = INCBIN_U32("graphics/pokemon/back_pics/cacnea_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/palettes/cacnea_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Cacnea[] = INCBIN_U8("graphics/pokemon/icons/cacnea_icon.4bpp");
-const u8 gMonFootprint_Cacnea[] = INCBIN_U8("graphics/pokemon/footprints/cacnea_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/front_pics/cacturne_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/palettes/cacturne_palette.gbapal.lz");
-const u32 gMonBackPic_Cacturne[] = INCBIN_U32("graphics/pokemon/back_pics/cacturne_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/palettes/cacturne_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Cacturne[] = INCBIN_U8("graphics/pokemon/icons/cacturne_icon.4bpp");
-const u8 gMonFootprint_Cacturne[] = INCBIN_U8("graphics/pokemon/footprints/cacturne_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/front_pics/snorunt_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/palettes/snorunt_palette.gbapal.lz");
-const u32 gMonBackPic_Snorunt[] = INCBIN_U32("graphics/pokemon/back_pics/snorunt_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/palettes/snorunt_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Snorunt[] = INCBIN_U8("graphics/pokemon/icons/snorunt_icon.4bpp");
-const u8 gMonFootprint_Snorunt[] = INCBIN_U8("graphics/pokemon/footprints/snorunt_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/front_pics/glalie_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Glalie[] = INCBIN_U32("graphics/pokemon/palettes/glalie_palette.gbapal.lz");
-const u32 gMonBackPic_Glalie[] = INCBIN_U32("graphics/pokemon/back_pics/glalie_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Glalie[] = INCBIN_U32("graphics/pokemon/palettes/glalie_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Glalie[] = INCBIN_U8("graphics/pokemon/icons/glalie_icon.4bpp");
-const u8 gMonFootprint_Glalie[] = INCBIN_U8("graphics/pokemon/footprints/glalie_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/front_pics/lunatone_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/palettes/lunatone_palette.gbapal.lz");
-const u32 gMonBackPic_Lunatone[] = INCBIN_U32("graphics/pokemon/back_pics/lunatone_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/palettes/lunatone_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Lunatone[] = INCBIN_U8("graphics/pokemon/icons/lunatone_icon.4bpp");
-const u8 gMonFootprint_Lunatone[] = INCBIN_U8("graphics/pokemon/footprints/lunatone_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/front_pics/solrock_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Solrock[] = INCBIN_U32("graphics/pokemon/palettes/solrock_palette.gbapal.lz");
-const u32 gMonBackPic_Solrock[] = INCBIN_U32("graphics/pokemon/back_pics/solrock_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Solrock[] = INCBIN_U32("graphics/pokemon/palettes/solrock_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Solrock[] = INCBIN_U8("graphics/pokemon/icons/solrock_icon.4bpp");
-const u8 gMonFootprint_Solrock[] = INCBIN_U8("graphics/pokemon/footprints/solrock_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/front_pics/azurill_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Azurill[] = INCBIN_U32("graphics/pokemon/palettes/azurill_palette.gbapal.lz");
-const u32 gMonBackPic_Azurill[] = INCBIN_U32("graphics/pokemon/back_pics/azurill_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Azurill[] = INCBIN_U32("graphics/pokemon/palettes/azurill_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Azurill[] = INCBIN_U8("graphics/pokemon/icons/azurill_icon.4bpp");
-const u8 gMonFootprint_Azurill[] = INCBIN_U8("graphics/pokemon/footprints/azurill_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/front_pics/spoink_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Spoink[] = INCBIN_U32("graphics/pokemon/palettes/spoink_palette.gbapal.lz");
-const u32 gMonBackPic_Spoink[] = INCBIN_U32("graphics/pokemon/back_pics/spoink_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Spoink[] = INCBIN_U32("graphics/pokemon/palettes/spoink_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Spoink[] = INCBIN_U8("graphics/pokemon/icons/spoink_icon.4bpp");
-const u8 gMonFootprint_Spoink[] = INCBIN_U8("graphics/pokemon/footprints/spoink_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/front_pics/grumpig_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/palettes/grumpig_palette.gbapal.lz");
-const u32 gMonBackPic_Grumpig[] = INCBIN_U32("graphics/pokemon/back_pics/grumpig_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/palettes/grumpig_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Grumpig[] = INCBIN_U8("graphics/pokemon/icons/grumpig_icon.4bpp");
-const u8 gMonFootprint_Grumpig[] = INCBIN_U8("graphics/pokemon/footprints/grumpig_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/front_pics/plusle_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Plusle[] = INCBIN_U32("graphics/pokemon/palettes/plusle_palette.gbapal.lz");
-const u32 gMonBackPic_Plusle[] = INCBIN_U32("graphics/pokemon/back_pics/plusle_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Plusle[] = INCBIN_U32("graphics/pokemon/palettes/plusle_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Plusle[] = INCBIN_U8("graphics/pokemon/icons/plusle_icon.4bpp");
-const u8 gMonFootprint_Plusle[] = INCBIN_U8("graphics/pokemon/footprints/plusle_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/front_pics/minun_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Minun[] = INCBIN_U32("graphics/pokemon/palettes/minun_palette.gbapal.lz");
-const u32 gMonBackPic_Minun[] = INCBIN_U32("graphics/pokemon/back_pics/minun_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Minun[] = INCBIN_U32("graphics/pokemon/palettes/minun_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Minun[] = INCBIN_U8("graphics/pokemon/icons/minun_icon.4bpp");
-const u8 gMonFootprint_Minun[] = INCBIN_U8("graphics/pokemon/footprints/minun_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/front_pics/mawile_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Mawile[] = INCBIN_U32("graphics/pokemon/palettes/mawile_palette.gbapal.lz");
-const u32 gMonBackPic_Mawile[] = INCBIN_U32("graphics/pokemon/back_pics/mawile_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Mawile[] = INCBIN_U32("graphics/pokemon/palettes/mawile_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Mawile[] = INCBIN_U8("graphics/pokemon/icons/mawile_icon.4bpp");
-const u8 gMonFootprint_Mawile[] = INCBIN_U8("graphics/pokemon/footprints/mawile_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/front_pics/meditite_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Meditite[] = INCBIN_U32("graphics/pokemon/palettes/meditite_palette.gbapal.lz");
-const u32 gMonBackPic_Meditite[] = INCBIN_U32("graphics/pokemon/back_pics/meditite_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Meditite[] = INCBIN_U32("graphics/pokemon/palettes/meditite_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Meditite[] = INCBIN_U8("graphics/pokemon/icons/meditite_icon.4bpp");
-const u8 gMonFootprint_Meditite[] = INCBIN_U8("graphics/pokemon/footprints/meditite_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/front_pics/medicham_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Medicham[] = INCBIN_U32("graphics/pokemon/palettes/medicham_palette.gbapal.lz");
-const u32 gMonBackPic_Medicham[] = INCBIN_U32("graphics/pokemon/back_pics/medicham_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Medicham[] = INCBIN_U32("graphics/pokemon/palettes/medicham_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Medicham[] = INCBIN_U8("graphics/pokemon/icons/medicham_icon.4bpp");
-const u8 gMonFootprint_Medicham[] = INCBIN_U8("graphics/pokemon/footprints/medicham_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/front_pics/swablu_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Swablu[] = INCBIN_U32("graphics/pokemon/palettes/swablu_palette.gbapal.lz");
-const u32 gMonBackPic_Swablu[] = INCBIN_U32("graphics/pokemon/back_pics/swablu_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Swablu[] = INCBIN_U32("graphics/pokemon/palettes/swablu_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Swablu[] = INCBIN_U8("graphics/pokemon/icons/swablu_icon.4bpp");
-const u8 gMonFootprint_Swablu[] = INCBIN_U8("graphics/pokemon/footprints/swablu_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/front_pics/altaria_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Altaria[] = INCBIN_U32("graphics/pokemon/palettes/altaria_palette.gbapal.lz");
-const u32 gMonBackPic_Altaria[] = INCBIN_U32("graphics/pokemon/back_pics/altaria_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Altaria[] = INCBIN_U32("graphics/pokemon/palettes/altaria_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Altaria[] = INCBIN_U8("graphics/pokemon/icons/altaria_icon.4bpp");
-const u8 gMonFootprint_Altaria[] = INCBIN_U8("graphics/pokemon/footprints/altaria_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/front_pics/wynaut_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/palettes/wynaut_palette.gbapal.lz");
-const u32 gMonBackPic_Wynaut[] = INCBIN_U32("graphics/pokemon/back_pics/wynaut_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/palettes/wynaut_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Wynaut[] = INCBIN_U8("graphics/pokemon/icons/wynaut_icon.4bpp");
-const u8 gMonFootprint_Wynaut[] = INCBIN_U8("graphics/pokemon/footprints/wynaut_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/front_pics/duskull_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Duskull[] = INCBIN_U32("graphics/pokemon/palettes/duskull_palette.gbapal.lz");
-const u32 gMonBackPic_Duskull[] = INCBIN_U32("graphics/pokemon/back_pics/duskull_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Duskull[] = INCBIN_U32("graphics/pokemon/palettes/duskull_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Duskull[] = INCBIN_U8("graphics/pokemon/icons/duskull_icon.4bpp");
-const u8 gMonFootprint_Duskull[] = INCBIN_U8("graphics/pokemon/footprints/duskull_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/front_pics/dusclops_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/palettes/dusclops_palette.gbapal.lz");
-const u32 gMonBackPic_Dusclops[] = INCBIN_U32("graphics/pokemon/back_pics/dusclops_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/palettes/dusclops_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Dusclops[] = INCBIN_U8("graphics/pokemon/icons/dusclops_icon.4bpp");
-const u8 gMonFootprint_Dusclops[] = INCBIN_U8("graphics/pokemon/footprints/dusclops_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/front_pics/roselia_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Roselia[] = INCBIN_U32("graphics/pokemon/palettes/roselia_palette.gbapal.lz");
-const u32 gMonBackPic_Roselia[] = INCBIN_U32("graphics/pokemon/back_pics/roselia_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Roselia[] = INCBIN_U32("graphics/pokemon/palettes/roselia_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Roselia[] = INCBIN_U8("graphics/pokemon/icons/roselia_icon.4bpp");
-const u8 gMonFootprint_Roselia[] = INCBIN_U8("graphics/pokemon/footprints/roselia_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/front_pics/slakoth_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/palettes/slakoth_palette.gbapal.lz");
-const u32 gMonBackPic_Slakoth[] = INCBIN_U32("graphics/pokemon/back_pics/slakoth_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/palettes/slakoth_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Slakoth[] = INCBIN_U8("graphics/pokemon/icons/slakoth_icon.4bpp");
-const u8 gMonFootprint_Slakoth[] = INCBIN_U8("graphics/pokemon/footprints/slakoth_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/front_pics/vigoroth_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/palettes/vigoroth_palette.gbapal.lz");
-const u32 gMonBackPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/back_pics/vigoroth_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/palettes/vigoroth_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Vigoroth[] = INCBIN_U8("graphics/pokemon/icons/vigoroth_icon.4bpp");
-const u8 gMonFootprint_Vigoroth[] = INCBIN_U8("graphics/pokemon/footprints/vigoroth_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/front_pics/slaking_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Slaking[] = INCBIN_U32("graphics/pokemon/palettes/slaking_palette.gbapal.lz");
-const u32 gMonBackPic_Slaking[] = INCBIN_U32("graphics/pokemon/back_pics/slaking_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Slaking[] = INCBIN_U32("graphics/pokemon/palettes/slaking_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Slaking[] = INCBIN_U8("graphics/pokemon/icons/slaking_icon.4bpp");
-const u8 gMonFootprint_Slaking[] = INCBIN_U8("graphics/pokemon/footprints/slaking_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/front_pics/gulpin_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/palettes/gulpin_palette.gbapal.lz");
-const u32 gMonBackPic_Gulpin[] = INCBIN_U32("graphics/pokemon/back_pics/gulpin_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/palettes/gulpin_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Gulpin[] = INCBIN_U8("graphics/pokemon/icons/gulpin_icon.4bpp");
-const u8 gMonFootprint_Gulpin[] = INCBIN_U8("graphics/pokemon/footprints/gulpin_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/front_pics/swalot_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Swalot[] = INCBIN_U32("graphics/pokemon/palettes/swalot_palette.gbapal.lz");
-const u32 gMonBackPic_Swalot[] = INCBIN_U32("graphics/pokemon/back_pics/swalot_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Swalot[] = INCBIN_U32("graphics/pokemon/palettes/swalot_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Swalot[] = INCBIN_U8("graphics/pokemon/icons/swalot_icon.4bpp");
-const u8 gMonFootprint_Swalot[] = INCBIN_U8("graphics/pokemon/footprints/swalot_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/front_pics/tropius_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Tropius[] = INCBIN_U32("graphics/pokemon/palettes/tropius_palette.gbapal.lz");
-const u32 gMonBackPic_Tropius[] = INCBIN_U32("graphics/pokemon/back_pics/tropius_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Tropius[] = INCBIN_U32("graphics/pokemon/palettes/tropius_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Tropius[] = INCBIN_U8("graphics/pokemon/icons/tropius_icon.4bpp");
-const u8 gMonFootprint_Tropius[] = INCBIN_U8("graphics/pokemon/footprints/tropius_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/front_pics/whismur_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Whismur[] = INCBIN_U32("graphics/pokemon/palettes/whismur_palette.gbapal.lz");
-const u32 gMonBackPic_Whismur[] = INCBIN_U32("graphics/pokemon/back_pics/whismur_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Whismur[] = INCBIN_U32("graphics/pokemon/palettes/whismur_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Whismur[] = INCBIN_U8("graphics/pokemon/icons/whismur_icon.4bpp");
-const u8 gMonFootprint_Whismur[] = INCBIN_U8("graphics/pokemon/footprints/whismur_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/front_pics/loudred_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Loudred[] = INCBIN_U32("graphics/pokemon/palettes/loudred_palette.gbapal.lz");
-const u32 gMonBackPic_Loudred[] = INCBIN_U32("graphics/pokemon/back_pics/loudred_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Loudred[] = INCBIN_U32("graphics/pokemon/palettes/loudred_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Loudred[] = INCBIN_U8("graphics/pokemon/icons/loudred_icon.4bpp");
-const u8 gMonFootprint_Loudred[] = INCBIN_U8("graphics/pokemon/footprints/loudred_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/front_pics/exploud_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Exploud[] = INCBIN_U32("graphics/pokemon/palettes/exploud_palette.gbapal.lz");
-const u32 gMonBackPic_Exploud[] = INCBIN_U32("graphics/pokemon/back_pics/exploud_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Exploud[] = INCBIN_U32("graphics/pokemon/palettes/exploud_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Exploud[] = INCBIN_U8("graphics/pokemon/icons/exploud_icon.4bpp");
-const u8 gMonFootprint_Exploud[] = INCBIN_U8("graphics/pokemon/footprints/exploud_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/front_pics/clamperl_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/palettes/clamperl_palette.gbapal.lz");
-const u32 gMonBackPic_Clamperl[] = INCBIN_U32("graphics/pokemon/back_pics/clamperl_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/palettes/clamperl_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Clamperl[] = INCBIN_U8("graphics/pokemon/icons/clamperl_icon.4bpp");
-const u8 gMonFootprint_Clamperl[] = INCBIN_U8("graphics/pokemon/footprints/clamperl_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/front_pics/huntail_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Huntail[] = INCBIN_U32("graphics/pokemon/palettes/huntail_palette.gbapal.lz");
-const u32 gMonBackPic_Huntail[] = INCBIN_U32("graphics/pokemon/back_pics/huntail_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Huntail[] = INCBIN_U32("graphics/pokemon/palettes/huntail_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Huntail[] = INCBIN_U8("graphics/pokemon/icons/huntail_icon.4bpp");
-const u8 gMonFootprint_Huntail[] = INCBIN_U8("graphics/pokemon/footprints/huntail_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/front_pics/gorebyss_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/palettes/gorebyss_palette.gbapal.lz");
-const u32 gMonBackPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/back_pics/gorebyss_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/palettes/gorebyss_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Gorebyss[] = INCBIN_U8("graphics/pokemon/icons/gorebyss_icon.4bpp");
-const u8 gMonFootprint_Gorebyss[] = INCBIN_U8("graphics/pokemon/footprints/gorebyss_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/front_pics/absol_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Absol[] = INCBIN_U32("graphics/pokemon/palettes/absol_palette.gbapal.lz");
-const u32 gMonBackPic_Absol[] = INCBIN_U32("graphics/pokemon/back_pics/absol_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Absol[] = INCBIN_U32("graphics/pokemon/palettes/absol_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Absol[] = INCBIN_U8("graphics/pokemon/icons/absol_icon.4bpp");
-const u8 gMonFootprint_Absol[] = INCBIN_U8("graphics/pokemon/footprints/absol_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/front_pics/shuppet_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/palettes/shuppet_palette.gbapal.lz");
-const u32 gMonBackPic_Shuppet[] = INCBIN_U32("graphics/pokemon/back_pics/shuppet_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/palettes/shuppet_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Shuppet[] = INCBIN_U8("graphics/pokemon/icons/shuppet_icon.4bpp");
-const u8 gMonFootprint_Shuppet[] = INCBIN_U8("graphics/pokemon/footprints/shuppet_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/front_pics/banette_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Banette[] = INCBIN_U32("graphics/pokemon/palettes/banette_palette.gbapal.lz");
-const u32 gMonBackPic_Banette[] = INCBIN_U32("graphics/pokemon/back_pics/banette_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Banette[] = INCBIN_U32("graphics/pokemon/palettes/banette_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Banette[] = INCBIN_U8("graphics/pokemon/icons/banette_icon.4bpp");
-const u8 gMonFootprint_Banette[] = INCBIN_U8("graphics/pokemon/footprints/banette_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/front_pics/seviper_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Seviper[] = INCBIN_U32("graphics/pokemon/palettes/seviper_palette.gbapal.lz");
-const u32 gMonBackPic_Seviper[] = INCBIN_U32("graphics/pokemon/back_pics/seviper_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Seviper[] = INCBIN_U32("graphics/pokemon/palettes/seviper_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Seviper[] = INCBIN_U8("graphics/pokemon/icons/seviper_icon.4bpp");
-const u8 gMonFootprint_Seviper[] = INCBIN_U8("graphics/pokemon/footprints/seviper_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/front_pics/zangoose_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/palettes/zangoose_palette.gbapal.lz");
-const u32 gMonBackPic_Zangoose[] = INCBIN_U32("graphics/pokemon/back_pics/zangoose_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/palettes/zangoose_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Zangoose[] = INCBIN_U8("graphics/pokemon/icons/zangoose_icon.4bpp");
-const u8 gMonFootprint_Zangoose[] = INCBIN_U8("graphics/pokemon/footprints/zangoose_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/front_pics/relicanth_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/palettes/relicanth_palette.gbapal.lz");
-const u32 gMonBackPic_Relicanth[] = INCBIN_U32("graphics/pokemon/back_pics/relicanth_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/palettes/relicanth_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Relicanth[] = INCBIN_U8("graphics/pokemon/icons/relicanth_icon.4bpp");
-const u8 gMonFootprint_Relicanth[] = INCBIN_U8("graphics/pokemon/footprints/relicanth_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/front_pics/aron_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Aron[] = INCBIN_U32("graphics/pokemon/palettes/aron_palette.gbapal.lz");
-const u32 gMonBackPic_Aron[] = INCBIN_U32("graphics/pokemon/back_pics/aron_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Aron[] = INCBIN_U32("graphics/pokemon/palettes/aron_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Aron[] = INCBIN_U8("graphics/pokemon/icons/aron_icon.4bpp");
-const u8 gMonFootprint_Aron[] = INCBIN_U8("graphics/pokemon/footprints/aron_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/front_pics/lairon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Lairon[] = INCBIN_U32("graphics/pokemon/palettes/lairon_palette.gbapal.lz");
-const u32 gMonBackPic_Lairon[] = INCBIN_U32("graphics/pokemon/back_pics/lairon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Lairon[] = INCBIN_U32("graphics/pokemon/palettes/lairon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Lairon[] = INCBIN_U8("graphics/pokemon/icons/lairon_icon.4bpp");
-const u8 gMonFootprint_Lairon[] = INCBIN_U8("graphics/pokemon/footprints/lairon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/front_pics/aggron_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Aggron[] = INCBIN_U32("graphics/pokemon/palettes/aggron_palette.gbapal.lz");
-const u32 gMonBackPic_Aggron[] = INCBIN_U32("graphics/pokemon/back_pics/aggron_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Aggron[] = INCBIN_U32("graphics/pokemon/palettes/aggron_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Aggron[] = INCBIN_U8("graphics/pokemon/icons/aggron_icon.4bpp");
-const u8 gMonFootprint_Aggron[] = INCBIN_U8("graphics/pokemon/footprints/aggron_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/front_pics/castform_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Castform[] = INCBIN_U32("graphics/pokemon/palettes/castform_palette.gbapal.lz");
-const u32 gMonBackPic_Castform[] = INCBIN_U32("graphics/pokemon/back_pics/castform_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Castform[] = INCBIN_U32("graphics/pokemon/palettes/castform_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Castform[] = INCBIN_U8("graphics/pokemon/icons/castform_icon.4bpp");
-const u8 gMonFootprint_Castform[] = INCBIN_U8("graphics/pokemon/footprints/castform_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/front_pics/volbeat_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/palettes/volbeat_palette.gbapal.lz");
-const u32 gMonBackPic_Volbeat[] = INCBIN_U32("graphics/pokemon/back_pics/volbeat_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/palettes/volbeat_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Volbeat[] = INCBIN_U8("graphics/pokemon/icons/volbeat_icon.4bpp");
-const u8 gMonFootprint_Volbeat[] = INCBIN_U8("graphics/pokemon/footprints/volbeat_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/front_pics/illumise_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Illumise[] = INCBIN_U32("graphics/pokemon/palettes/illumise_palette.gbapal.lz");
-const u32 gMonBackPic_Illumise[] = INCBIN_U32("graphics/pokemon/back_pics/illumise_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Illumise[] = INCBIN_U32("graphics/pokemon/palettes/illumise_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Illumise[] = INCBIN_U8("graphics/pokemon/icons/illumise_icon.4bpp");
-const u8 gMonFootprint_Illumise[] = INCBIN_U8("graphics/pokemon/footprints/illumise_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/front_pics/lileep_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Lileep[] = INCBIN_U32("graphics/pokemon/palettes/lileep_palette.gbapal.lz");
-const u32 gMonBackPic_Lileep[] = INCBIN_U32("graphics/pokemon/back_pics/lileep_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Lileep[] = INCBIN_U32("graphics/pokemon/palettes/lileep_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Lileep[] = INCBIN_U8("graphics/pokemon/icons/lileep_icon.4bpp");
-const u8 gMonFootprint_Lileep[] = INCBIN_U8("graphics/pokemon/footprints/lileep_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/front_pics/cradily_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Cradily[] = INCBIN_U32("graphics/pokemon/palettes/cradily_palette.gbapal.lz");
-const u32 gMonBackPic_Cradily[] = INCBIN_U32("graphics/pokemon/back_pics/cradily_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Cradily[] = INCBIN_U32("graphics/pokemon/palettes/cradily_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Cradily[] = INCBIN_U8("graphics/pokemon/icons/cradily_icon.4bpp");
-const u8 gMonFootprint_Cradily[] = INCBIN_U8("graphics/pokemon/footprints/cradily_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/front_pics/anorith_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Anorith[] = INCBIN_U32("graphics/pokemon/palettes/anorith_palette.gbapal.lz");
-const u32 gMonBackPic_Anorith[] = INCBIN_U32("graphics/pokemon/back_pics/anorith_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Anorith[] = INCBIN_U32("graphics/pokemon/palettes/anorith_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Anorith[] = INCBIN_U8("graphics/pokemon/icons/anorith_icon.4bpp");
-const u8 gMonFootprint_Anorith[] = INCBIN_U8("graphics/pokemon/footprints/anorith_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/front_pics/armaldo_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/palettes/armaldo_palette.gbapal.lz");
-const u32 gMonBackPic_Armaldo[] = INCBIN_U32("graphics/pokemon/back_pics/armaldo_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/palettes/armaldo_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Armaldo[] = INCBIN_U8("graphics/pokemon/icons/armaldo_icon.4bpp");
-const u8 gMonFootprint_Armaldo[] = INCBIN_U8("graphics/pokemon/footprints/armaldo_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/front_pics/ralts_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Ralts[] = INCBIN_U32("graphics/pokemon/palettes/ralts_palette.gbapal.lz");
-const u32 gMonBackPic_Ralts[] = INCBIN_U32("graphics/pokemon/back_pics/ralts_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Ralts[] = INCBIN_U32("graphics/pokemon/palettes/ralts_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Ralts[] = INCBIN_U8("graphics/pokemon/icons/ralts_icon.4bpp");
-const u8 gMonFootprint_Ralts[] = INCBIN_U8("graphics/pokemon/footprints/ralts_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/front_pics/kirlia_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/palettes/kirlia_palette.gbapal.lz");
-const u32 gMonBackPic_Kirlia[] = INCBIN_U32("graphics/pokemon/back_pics/kirlia_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/palettes/kirlia_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Kirlia[] = INCBIN_U8("graphics/pokemon/icons/kirlia_icon.4bpp");
-const u8 gMonFootprint_Kirlia[] = INCBIN_U8("graphics/pokemon/footprints/kirlia_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/front_pics/gardevoir_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/palettes/gardevoir_palette.gbapal.lz");
-const u32 gMonBackPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/back_pics/gardevoir_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/palettes/gardevoir_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Gardevoir[] = INCBIN_U8("graphics/pokemon/icons/gardevoir_icon.4bpp");
-const u8 gMonFootprint_Gardevoir[] = INCBIN_U8("graphics/pokemon/footprints/gardevoir_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/front_pics/bagon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Bagon[] = INCBIN_U32("graphics/pokemon/palettes/bagon_palette.gbapal.lz");
-const u32 gMonBackPic_Bagon[] = INCBIN_U32("graphics/pokemon/back_pics/bagon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Bagon[] = INCBIN_U32("graphics/pokemon/palettes/bagon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Bagon[] = INCBIN_U8("graphics/pokemon/icons/bagon_icon.4bpp");
-const u8 gMonFootprint_Bagon[] = INCBIN_U8("graphics/pokemon/footprints/bagon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/front_pics/shelgon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/palettes/shelgon_palette.gbapal.lz");
-const u32 gMonBackPic_Shelgon[] = INCBIN_U32("graphics/pokemon/back_pics/shelgon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/palettes/shelgon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Shelgon[] = INCBIN_U8("graphics/pokemon/icons/shelgon_icon.4bpp");
-const u8 gMonFootprint_Shelgon[] = INCBIN_U8("graphics/pokemon/footprints/shelgon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/front_pics/salamence_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Salamence[] = INCBIN_U32("graphics/pokemon/palettes/salamence_palette.gbapal.lz");
-const u32 gMonBackPic_Salamence[] = INCBIN_U32("graphics/pokemon/back_pics/salamence_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Salamence[] = INCBIN_U32("graphics/pokemon/palettes/salamence_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Salamence[] = INCBIN_U8("graphics/pokemon/icons/salamence_icon.4bpp");
-const u8 gMonFootprint_Salamence[] = INCBIN_U8("graphics/pokemon/footprints/salamence_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/front_pics/beldum_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Beldum[] = INCBIN_U32("graphics/pokemon/palettes/beldum_palette.gbapal.lz");
-const u32 gMonBackPic_Beldum[] = INCBIN_U32("graphics/pokemon/back_pics/beldum_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Beldum[] = INCBIN_U32("graphics/pokemon/palettes/beldum_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Beldum[] = INCBIN_U8("graphics/pokemon/icons/beldum_icon.4bpp");
-const u8 gMonFootprint_Beldum[] = INCBIN_U8("graphics/pokemon/footprints/beldum_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/front_pics/metang_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Metang[] = INCBIN_U32("graphics/pokemon/palettes/metang_palette.gbapal.lz");
-const u32 gMonBackPic_Metang[] = INCBIN_U32("graphics/pokemon/back_pics/metang_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Metang[] = INCBIN_U32("graphics/pokemon/palettes/metang_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Metang[] = INCBIN_U8("graphics/pokemon/icons/metang_icon.4bpp");
-const u8 gMonFootprint_Metang[] = INCBIN_U8("graphics/pokemon/footprints/metang_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/front_pics/metagross_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Metagross[] = INCBIN_U32("graphics/pokemon/palettes/metagross_palette.gbapal.lz");
-const u32 gMonBackPic_Metagross[] = INCBIN_U32("graphics/pokemon/back_pics/metagross_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Metagross[] = INCBIN_U32("graphics/pokemon/palettes/metagross_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Metagross[] = INCBIN_U8("graphics/pokemon/icons/metagross_icon.4bpp");
-const u8 gMonFootprint_Metagross[] = INCBIN_U8("graphics/pokemon/footprints/metagross_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/front_pics/regirock_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Regirock[] = INCBIN_U32("graphics/pokemon/palettes/regirock_palette.gbapal.lz");
-const u32 gMonBackPic_Regirock[] = INCBIN_U32("graphics/pokemon/back_pics/regirock_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Regirock[] = INCBIN_U32("graphics/pokemon/palettes/regirock_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Regirock[] = INCBIN_U8("graphics/pokemon/icons/regirock_icon.4bpp");
-const u8 gMonFootprint_Regirock[] = INCBIN_U8("graphics/pokemon/footprints/regirock_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/front_pics/regice_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Regice[] = INCBIN_U32("graphics/pokemon/palettes/regice_palette.gbapal.lz");
-const u32 gMonBackPic_Regice[] = INCBIN_U32("graphics/pokemon/back_pics/regice_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Regice[] = INCBIN_U32("graphics/pokemon/palettes/regice_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Regice[] = INCBIN_U8("graphics/pokemon/icons/regice_icon.4bpp");
-const u8 gMonFootprint_Regice[] = INCBIN_U8("graphics/pokemon/footprints/regice_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/front_pics/registeel_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Registeel[] = INCBIN_U32("graphics/pokemon/palettes/registeel_palette.gbapal.lz");
-const u32 gMonBackPic_Registeel[] = INCBIN_U32("graphics/pokemon/back_pics/registeel_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Registeel[] = INCBIN_U32("graphics/pokemon/palettes/registeel_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Registeel[] = INCBIN_U8("graphics/pokemon/icons/registeel_icon.4bpp");
-const u8 gMonFootprint_Registeel[] = INCBIN_U8("graphics/pokemon/footprints/registeel_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/front_pics/kyogre_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/palettes/kyogre_palette.gbapal.lz");
-const u32 gMonBackPic_Kyogre[] = INCBIN_U32("graphics/pokemon/back_pics/kyogre_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/palettes/kyogre_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Kyogre[] = INCBIN_U8("graphics/pokemon/icons/kyogre_icon.4bpp");
-const u8 gMonFootprint_Kyogre[] = INCBIN_U8("graphics/pokemon/footprints/kyogre_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/front_pics/groudon_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/palettes/groudon_palette.gbapal.lz");
-const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/back_pics/groudon_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/palettes/groudon_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/icons/groudon_icon.4bpp");
-const u8 gMonFootprint_Groudon[] = INCBIN_U8("graphics/pokemon/footprints/groudon_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/front_pics/rayquaza_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/palettes/rayquaza_palette.gbapal.lz");
-const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/back_pics/rayquaza_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/palettes/rayquaza_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/icons/rayquaza_icon.4bpp");
-const u8 gMonFootprint_Rayquaza[] = INCBIN_U8("graphics/pokemon/footprints/rayquaza_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/front_pics/latias_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Latias[] = INCBIN_U32("graphics/pokemon/palettes/latias_palette.gbapal.lz");
-const u32 gMonBackPic_Latias[] = INCBIN_U32("graphics/pokemon/back_pics/latias_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Latias[] = INCBIN_U32("graphics/pokemon/palettes/latias_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Latias[] = INCBIN_U8("graphics/pokemon/icons/latias_icon.4bpp");
-const u8 gMonFootprint_Latias[] = INCBIN_U8("graphics/pokemon/footprints/latias_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/front_pics/latios_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Latios[] = INCBIN_U32("graphics/pokemon/palettes/latios_palette.gbapal.lz");
-const u32 gMonBackPic_Latios[] = INCBIN_U32("graphics/pokemon/back_pics/latios_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Latios[] = INCBIN_U32("graphics/pokemon/palettes/latios_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Latios[] = INCBIN_U8("graphics/pokemon/icons/latios_icon.4bpp");
-const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/footprints/latios_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/front_pics/jirachi_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/palettes/jirachi_palette.gbapal.lz");
-const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/back_pics/jirachi_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/palettes/jirachi_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/icons/jirachi_icon.4bpp");
-const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/footprints/jirachi_footprint.1bpp");
-
-const u32 gMonStillFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/front_pics/deoxys_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/palettes/deoxys_palette.gbapal.lz");
-const u32 gMonBackPic_Deoxys[] = INCBIN_U32("graphics/pokemon/back_pics/deoxys_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/palettes/deoxys_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/icons/deoxys_icon.4bpp");
-const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/icons/deoxys_speed_icon.4bpp");
+const u32 gMonStillFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/front.4bpp.lz");
+const u32 gMonPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/normal.gbapal.lz");
+const u32 gMonBackPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/back.4bpp.lz");
+const u32 gMonShinyPalette_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/shiny.gbapal.lz");
+const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/icon.4bpp");
+const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/front.4bpp.lz");
+const u32 gMonPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/normal.gbapal.lz");
+const u32 gMonBackPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/back.4bpp.lz");
+const u32 gMonShinyPalette_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/shiny.gbapal.lz");
+const u8 gMonIcon_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/icon.4bpp");
+const u8 gMonFootprint_Ivysaur[] = INCBIN_U8("graphics/pokemon/ivysaur/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/front.4bpp.lz");
+const u32 gMonPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/normal.gbapal.lz");
+const u32 gMonBackPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/back.4bpp.lz");
+const u32 gMonShinyPalette_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/shiny.gbapal.lz");
+const u8 gMonIcon_Venusaur[] = INCBIN_U8("graphics/pokemon/venusaur/icon.4bpp");
+const u8 gMonFootprint_Venusaur[] = INCBIN_U8("graphics/pokemon/venusaur/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/front.4bpp.lz");
+const u32 gMonPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/normal.gbapal.lz");
+const u32 gMonBackPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/back.4bpp.lz");
+const u32 gMonShinyPalette_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/shiny.gbapal.lz");
+const u8 gMonIcon_Charmander[] = INCBIN_U8("graphics/pokemon/charmander/icon.4bpp");
+const u8 gMonFootprint_Charmander[] = INCBIN_U8("graphics/pokemon/charmander/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/front.4bpp.lz");
+const u32 gMonPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/normal.gbapal.lz");
+const u32 gMonBackPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/back.4bpp.lz");
+const u32 gMonShinyPalette_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/shiny.gbapal.lz");
+const u8 gMonIcon_Charmeleon[] = INCBIN_U8("graphics/pokemon/charmeleon/icon.4bpp");
+const u8 gMonFootprint_Charmeleon[] = INCBIN_U8("graphics/pokemon/charmeleon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/front.4bpp.lz");
+const u32 gMonPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/normal.gbapal.lz");
+const u32 gMonBackPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/back.4bpp.lz");
+const u32 gMonShinyPalette_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/shiny.gbapal.lz");
+const u8 gMonIcon_Charizard[] = INCBIN_U8("graphics/pokemon/charizard/icon.4bpp");
+const u8 gMonFootprint_Charizard[] = INCBIN_U8("graphics/pokemon/charizard/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/front.4bpp.lz");
+const u32 gMonPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/normal.gbapal.lz");
+const u32 gMonBackPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/back.4bpp.lz");
+const u32 gMonShinyPalette_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/shiny.gbapal.lz");
+const u8 gMonIcon_Squirtle[] = INCBIN_U8("graphics/pokemon/squirtle/icon.4bpp");
+const u8 gMonFootprint_Squirtle[] = INCBIN_U8("graphics/pokemon/squirtle/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/front.4bpp.lz");
+const u32 gMonPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/normal.gbapal.lz");
+const u32 gMonBackPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/back.4bpp.lz");
+const u32 gMonShinyPalette_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/shiny.gbapal.lz");
+const u8 gMonIcon_Wartortle[] = INCBIN_U8("graphics/pokemon/wartortle/icon.4bpp");
+const u8 gMonFootprint_Wartortle[] = INCBIN_U8("graphics/pokemon/wartortle/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/front.4bpp.lz");
+const u32 gMonPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/normal.gbapal.lz");
+const u32 gMonBackPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/back.4bpp.lz");
+const u32 gMonShinyPalette_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/shiny.gbapal.lz");
+const u8 gMonIcon_Blastoise[] = INCBIN_U8("graphics/pokemon/blastoise/icon.4bpp");
+const u8 gMonFootprint_Blastoise[] = INCBIN_U8("graphics/pokemon/blastoise/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/front.4bpp.lz");
+const u32 gMonPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/normal.gbapal.lz");
+const u32 gMonBackPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/back.4bpp.lz");
+const u32 gMonShinyPalette_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/shiny.gbapal.lz");
+const u8 gMonIcon_Caterpie[] = INCBIN_U8("graphics/pokemon/caterpie/icon.4bpp");
+const u8 gMonFootprint_Caterpie[] = INCBIN_U8("graphics/pokemon/caterpie/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/front.4bpp.lz");
+const u32 gMonPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/normal.gbapal.lz");
+const u32 gMonBackPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/back.4bpp.lz");
+const u32 gMonShinyPalette_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/shiny.gbapal.lz");
+const u8 gMonIcon_Metapod[] = INCBIN_U8( "graphics/pokemon/metapod/icon.4bpp");
+const u8 gMonFootprint_Metapod[] = INCBIN_U8("graphics/pokemon/metapod/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/front.4bpp.lz");
+const u32 gMonPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/normal.gbapal.lz");
+const u32 gMonBackPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/back.4bpp.lz");
+const u32 gMonShinyPalette_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/shiny.gbapal.lz");
+const u8 gMonIcon_Butterfree[] = INCBIN_U8("graphics/pokemon/butterfree/icon.4bpp");
+const u8 gMonFootprint_Butterfree[] = INCBIN_U8("graphics/pokemon/butterfree/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/front.4bpp.lz");
+const u32 gMonPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/normal.gbapal.lz");
+const u32 gMonBackPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/back.4bpp.lz");
+const u32 gMonShinyPalette_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/shiny.gbapal.lz");
+const u8 gMonIcon_Weedle[] = INCBIN_U8("graphics/pokemon/weedle/icon.4bpp");
+const u8 gMonFootprint_Weedle[] = INCBIN_U8("graphics/pokemon/weedle/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/front.4bpp.lz");
+const u32 gMonPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/normal.gbapal.lz");
+const u32 gMonBackPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/back.4bpp.lz");
+const u32 gMonShinyPalette_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/shiny.gbapal.lz");
+const u8 gMonIcon_Kakuna[] = INCBIN_U8("graphics/pokemon/kakuna/icon.4bpp");
+const u8 gMonFootprint_Kakuna[] = INCBIN_U8("graphics/pokemon/kakuna/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/front.4bpp.lz");
+const u32 gMonPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/normal.gbapal.lz");
+const u32 gMonBackPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/back.4bpp.lz");
+const u32 gMonShinyPalette_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/shiny.gbapal.lz");
+const u8 gMonIcon_Beedrill[] = INCBIN_U8("graphics/pokemon/beedrill/icon.4bpp");
+const u8 gMonFootprint_Beedrill[] = INCBIN_U8("graphics/pokemon/beedrill/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/front.4bpp.lz");
+const u32 gMonPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/normal.gbapal.lz");
+const u32 gMonBackPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/back.4bpp.lz");
+const u32 gMonShinyPalette_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/shiny.gbapal.lz");
+const u8 gMonIcon_Pidgey[] = INCBIN_U8("graphics/pokemon/pidgey/icon.4bpp");
+const u8 gMonFootprint_Pidgey[] = INCBIN_U8("graphics/pokemon/pidgey/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/front.4bpp.lz");
+const u32 gMonPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/normal.gbapal.lz");
+const u32 gMonBackPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/back.4bpp.lz");
+const u32 gMonShinyPalette_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/shiny.gbapal.lz");
+const u8 gMonIcon_Pidgeotto[] = INCBIN_U8("graphics/pokemon/pidgeotto/icon.4bpp");
+const u8 gMonFootprint_Pidgeotto[] = INCBIN_U8("graphics/pokemon/pidgeotto/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/front.4bpp.lz");
+const u32 gMonPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/normal.gbapal.lz");
+const u32 gMonBackPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/back.4bpp.lz");
+const u32 gMonShinyPalette_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/shiny.gbapal.lz");
+const u8 gMonIcon_Pidgeot[] = INCBIN_U8("graphics/pokemon/pidgeot/icon.4bpp");
+const u8 gMonFootprint_Pidgeot[] = INCBIN_U8("graphics/pokemon/pidgeot/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/front.4bpp.lz");
+const u32 gMonPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/normal.gbapal.lz");
+const u32 gMonBackPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/back.4bpp.lz");
+const u32 gMonShinyPalette_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/shiny.gbapal.lz");
+const u8 gMonIcon_Rattata[] = INCBIN_U8("graphics/pokemon/rattata/icon.4bpp");
+const u8 gMonFootprint_Rattata[] = INCBIN_U8("graphics/pokemon/rattata/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/front.4bpp.lz");
+const u32 gMonPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/normal.gbapal.lz");
+const u32 gMonBackPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/back.4bpp.lz");
+const u32 gMonShinyPalette_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/shiny.gbapal.lz");
+const u8 gMonIcon_Raticate[] = INCBIN_U8("graphics/pokemon/raticate/icon.4bpp");
+const u8 gMonFootprint_Raticate[] = INCBIN_U8("graphics/pokemon/raticate/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/front.4bpp.lz");
+const u32 gMonPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/normal.gbapal.lz");
+const u32 gMonBackPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/back.4bpp.lz");
+const u32 gMonShinyPalette_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/shiny.gbapal.lz");
+const u8 gMonIcon_Spearow[] = INCBIN_U8("graphics/pokemon/spearow/icon.4bpp");
+const u8 gMonFootprint_Spearow[] = INCBIN_U8("graphics/pokemon/spearow/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/front.4bpp.lz");
+const u32 gMonPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/normal.gbapal.lz");
+const u32 gMonBackPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/back.4bpp.lz");
+const u32 gMonShinyPalette_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/shiny.gbapal.lz");
+const u8 gMonIcon_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/icon.4bpp");
+const u8 gMonFootprint_Fearow[] = INCBIN_U8("graphics/pokemon/fearow/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/front.4bpp.lz");
+const u32 gMonPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/normal.gbapal.lz");
+const u32 gMonBackPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/back.4bpp.lz");
+const u32 gMonShinyPalette_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/shiny.gbapal.lz");
+const u8 gMonIcon_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/icon.4bpp");
+const u8 gMonFootprint_Ekans[] = INCBIN_U8("graphics/pokemon/ekans/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/front.4bpp.lz");
+const u32 gMonPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/normal.gbapal.lz");
+const u32 gMonBackPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/back.4bpp.lz");
+const u32 gMonShinyPalette_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/shiny.gbapal.lz");
+const u8 gMonIcon_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/icon.4bpp");
+const u8 gMonFootprint_Arbok[] = INCBIN_U8("graphics/pokemon/arbok/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/front.4bpp.lz");
+const u32 gMonPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/normal.gbapal.lz");
+const u32 gMonBackPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/back.4bpp.lz");
+const u32 gMonShinyPalette_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/shiny.gbapal.lz");
+const u8 gMonIcon_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/icon.4bpp");
+const u8 gMonFootprint_Pikachu[] = INCBIN_U8("graphics/pokemon/pikachu/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/front.4bpp.lz");
+const u32 gMonPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/normal.gbapal.lz");
+const u32 gMonBackPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/back.4bpp.lz");
+const u32 gMonShinyPalette_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/shiny.gbapal.lz");
+const u8 gMonIcon_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/icon.4bpp");
+const u8 gMonFootprint_Raichu[] = INCBIN_U8("graphics/pokemon/raichu/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/front.4bpp.lz");
+const u32 gMonPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/normal.gbapal.lz");
+const u32 gMonBackPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/back.4bpp.lz");
+const u32 gMonShinyPalette_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/shiny.gbapal.lz");
+const u8 gMonIcon_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/icon.4bpp");
+const u8 gMonFootprint_Sandshrew[] = INCBIN_U8("graphics/pokemon/sandshrew/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/front.4bpp.lz");
+const u32 gMonPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/normal.gbapal.lz");
+const u32 gMonBackPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/back.4bpp.lz");
+const u32 gMonShinyPalette_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/shiny.gbapal.lz");
+const u8 gMonIcon_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/icon.4bpp");
+const u8 gMonFootprint_Sandslash[] = INCBIN_U8("graphics/pokemon/sandslash/footprint.1bpp");
+
+const u32 gMonStillFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/front.4bpp.lz");
+const u32 gMonPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/normal.gbapal.lz");
+const u32 gMonBackPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/back.4bpp.lz");
+const u32 gMonShinyPalette_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/shiny.gbapal.lz");
+const u8 gMonIcon_NidoranF[] = INCBIN_U8("graphics/pokemon/nidoran_f/icon.4bpp");
+const u8 gMonFootprint_NidoranF[] = INCBIN_U8("graphics/pokemon/nidoran_f/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/front.4bpp.lz");
+const u32 gMonPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/normal.gbapal.lz");
+const u32 gMonBackPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/back.4bpp.lz");
+const u32 gMonShinyPalette_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/shiny.gbapal.lz");
+const u8 gMonIcon_Nidorina[] = INCBIN_U8("graphics/pokemon/nidorina/icon.4bpp");
+const u8 gMonFootprint_Nidorina[] = INCBIN_U8("graphics/pokemon/nidorina/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/front.4bpp.lz");
+const u32 gMonPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/normal.gbapal.lz");
+const u32 gMonBackPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/back.4bpp.lz");
+const u32 gMonShinyPalette_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/shiny.gbapal.lz");
+const u8 gMonIcon_Nidoqueen[] = INCBIN_U8("graphics/pokemon/nidoqueen/icon.4bpp");
+const u8 gMonFootprint_Nidoqueen[] = INCBIN_U8("graphics/pokemon/nidoqueen/footprint.1bpp");
+
+const u32 gMonStillFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/front.4bpp.lz");
+const u32 gMonPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/normal.gbapal.lz");
+const u32 gMonBackPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/back.4bpp.lz");
+const u32 gMonShinyPalette_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/shiny.gbapal.lz");
+const u8 gMonIcon_NidoranM[] = INCBIN_U8("graphics/pokemon/nidoran_m/icon.4bpp");
+const u8 gMonFootprint_NidoranM[] = INCBIN_U8("graphics/pokemon/nidoran_m/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/front.4bpp.lz");
+const u32 gMonPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/normal.gbapal.lz");
+const u32 gMonBackPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/back.4bpp.lz");
+const u32 gMonShinyPalette_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/shiny.gbapal.lz");
+const u8 gMonIcon_Nidorino[] = INCBIN_U8("graphics/pokemon/nidorino/icon.4bpp");
+const u8 gMonFootprint_Nidorino[] = INCBIN_U8("graphics/pokemon/nidorino/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/front.4bpp.lz");
+const u32 gMonPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/normal.gbapal.lz");
+const u32 gMonBackPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/back.4bpp.lz");
+const u32 gMonShinyPalette_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/shiny.gbapal.lz");
+const u8 gMonIcon_Nidoking[] = INCBIN_U8("graphics/pokemon/nidoking/icon.4bpp");
+const u8 gMonFootprint_Nidoking[] = INCBIN_U8("graphics/pokemon/nidoking/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/front.4bpp.lz");
+const u32 gMonPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/normal.gbapal.lz");
+const u32 gMonBackPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/back.4bpp.lz");
+const u32 gMonShinyPalette_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/shiny.gbapal.lz");
+const u8 gMonIcon_Clefairy[] = INCBIN_U8("graphics/pokemon/clefairy/icon.4bpp");
+const u8 gMonFootprint_Clefairy[] = INCBIN_U8("graphics/pokemon/clefairy/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/front.4bpp.lz");
+const u32 gMonPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/normal.gbapal.lz");
+const u32 gMonBackPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/back.4bpp.lz");
+const u32 gMonShinyPalette_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/shiny.gbapal.lz");
+const u8 gMonIcon_Clefable[] = INCBIN_U8("graphics/pokemon/clefable/icon.4bpp");
+const u8 gMonFootprint_Clefable[] = INCBIN_U8("graphics/pokemon/clefable/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/front.4bpp.lz");
+const u32 gMonPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/normal.gbapal.lz");
+const u32 gMonBackPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/back.4bpp.lz");
+const u32 gMonShinyPalette_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/shiny.gbapal.lz");
+const u8 gMonIcon_Vulpix[] = INCBIN_U8("graphics/pokemon/vulpix/icon.4bpp");
+const u8 gMonFootprint_Vulpix[] = INCBIN_U8("graphics/pokemon/vulpix/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/front.4bpp.lz");
+const u32 gMonPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/normal.gbapal.lz");
+const u32 gMonBackPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/back.4bpp.lz");
+const u32 gMonShinyPalette_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/shiny.gbapal.lz");
+const u8 gMonIcon_Ninetales[] = INCBIN_U8("graphics/pokemon/ninetales/icon.4bpp");
+const u8 gMonFootprint_Ninetales[] = INCBIN_U8("graphics/pokemon/ninetales/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/front.4bpp.lz");
+const u32 gMonPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/normal.gbapal.lz");
+const u32 gMonBackPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/back.4bpp.lz");
+const u32 gMonShinyPalette_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/shiny.gbapal.lz");
+const u8 gMonIcon_Jigglypuff[] = INCBIN_U8("graphics/pokemon/jigglypuff/icon.4bpp");
+const u8 gMonFootprint_Jigglypuff[] = INCBIN_U8("graphics/pokemon/jigglypuff/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/front.4bpp.lz");
+const u32 gMonPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/normal.gbapal.lz");
+const u32 gMonBackPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/back.4bpp.lz");
+const u32 gMonShinyPalette_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/shiny.gbapal.lz");
+const u8 gMonIcon_Wigglytuff[] = INCBIN_U8("graphics/pokemon/wigglytuff/icon.4bpp");
+const u8 gMonFootprint_Wigglytuff[] = INCBIN_U8("graphics/pokemon/wigglytuff/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/front.4bpp.lz");
+const u32 gMonPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/normal.gbapal.lz");
+const u32 gMonBackPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/back.4bpp.lz");
+const u32 gMonShinyPalette_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/shiny.gbapal.lz");
+const u8 gMonIcon_Zubat[] = INCBIN_U8("graphics/pokemon/zubat/icon.4bpp");
+const u8 gMonFootprint_Zubat[] = INCBIN_U8("graphics/pokemon/zubat/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/front.4bpp.lz");
+const u32 gMonPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/normal.gbapal.lz");
+const u32 gMonBackPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/back.4bpp.lz");
+const u32 gMonShinyPalette_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/shiny.gbapal.lz");
+const u8 gMonIcon_Golbat[] = INCBIN_U8("graphics/pokemon/golbat/icon.4bpp");
+const u8 gMonFootprint_Golbat[] = INCBIN_U8("graphics/pokemon/golbat/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/front.4bpp.lz");
+const u32 gMonPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/normal.gbapal.lz");
+const u32 gMonBackPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/back.4bpp.lz");
+const u32 gMonShinyPalette_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/shiny.gbapal.lz");
+const u8 gMonIcon_Oddish[] = INCBIN_U8("graphics/pokemon/oddish/icon.4bpp");
+const u8 gMonFootprint_Oddish[] = INCBIN_U8("graphics/pokemon/oddish/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/front.4bpp.lz");
+const u32 gMonPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/normal.gbapal.lz");
+const u32 gMonBackPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/back.4bpp.lz");
+const u32 gMonShinyPalette_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/shiny.gbapal.lz");
+const u8 gMonIcon_Gloom[] = INCBIN_U8("graphics/pokemon/gloom/icon.4bpp");
+const u8 gMonFootprint_Gloom[] = INCBIN_U8("graphics/pokemon/gloom/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/front.4bpp.lz");
+const u32 gMonPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/normal.gbapal.lz");
+const u32 gMonBackPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/back.4bpp.lz");
+const u32 gMonShinyPalette_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/shiny.gbapal.lz");
+const u8 gMonIcon_Vileplume[] = INCBIN_U8("graphics/pokemon/vileplume/icon.4bpp");
+const u8 gMonFootprint_Vileplume[] = INCBIN_U8("graphics/pokemon/vileplume/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/front.4bpp.lz");
+const u32 gMonPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/normal.gbapal.lz");
+const u32 gMonBackPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/back.4bpp.lz");
+const u32 gMonShinyPalette_Paras[] = INCBIN_U32("graphics/pokemon/paras/shiny.gbapal.lz");
+const u8 gMonIcon_Paras[] = INCBIN_U8("graphics/pokemon/paras/icon.4bpp");
+const u8 gMonFootprint_Paras[] = INCBIN_U8("graphics/pokemon/paras/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/front.4bpp.lz");
+const u32 gMonPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/normal.gbapal.lz");
+const u32 gMonBackPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/back.4bpp.lz");
+const u32 gMonShinyPalette_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/shiny.gbapal.lz");
+const u8 gMonIcon_Parasect[] = INCBIN_U8("graphics/pokemon/parasect/icon.4bpp");
+const u8 gMonFootprint_Parasect[] = INCBIN_U8("graphics/pokemon/parasect/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/front.4bpp.lz");
+const u32 gMonPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/normal.gbapal.lz");
+const u32 gMonBackPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/back.4bpp.lz");
+const u32 gMonShinyPalette_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/shiny.gbapal.lz");
+const u8 gMonIcon_Venonat[] = INCBIN_U8("graphics/pokemon/venonat/icon.4bpp");
+const u8 gMonFootprint_Venonat[] = INCBIN_U8("graphics/pokemon/venonat/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/front.4bpp.lz");
+const u32 gMonPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/normal.gbapal.lz");
+const u32 gMonBackPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/back.4bpp.lz");
+const u32 gMonShinyPalette_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/shiny.gbapal.lz");
+const u8 gMonIcon_Venomoth[] = INCBIN_U8("graphics/pokemon/venomoth/icon.4bpp");
+const u8 gMonFootprint_Venomoth[] = INCBIN_U8("graphics/pokemon/venomoth/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/front.4bpp.lz");
+const u32 gMonPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/normal.gbapal.lz");
+const u32 gMonBackPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/back.4bpp.lz");
+const u32 gMonShinyPalette_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/shiny.gbapal.lz");
+const u8 gMonIcon_Diglett[] = INCBIN_U8("graphics/pokemon/diglett/icon.4bpp");
+const u8 gMonFootprint_Diglett[] = INCBIN_U8("graphics/pokemon/diglett/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/front.4bpp.lz");
+const u32 gMonPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/normal.gbapal.lz");
+const u32 gMonBackPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/back.4bpp.lz");
+const u32 gMonShinyPalette_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/shiny.gbapal.lz");
+const u8 gMonIcon_Dugtrio[] = INCBIN_U8("graphics/pokemon/dugtrio/icon.4bpp");
+const u8 gMonFootprint_Dugtrio[] = INCBIN_U8("graphics/pokemon/dugtrio/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/front.4bpp.lz");
+const u32 gMonPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/normal.gbapal.lz");
+const u32 gMonBackPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/back.4bpp.lz");
+const u32 gMonShinyPalette_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/shiny.gbapal.lz");
+const u8 gMonIcon_Meowth[] = INCBIN_U8("graphics/pokemon/meowth/icon.4bpp");
+const u8 gMonFootprint_Meowth[] = INCBIN_U8("graphics/pokemon/meowth/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/front.4bpp.lz");
+const u32 gMonPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/normal.gbapal.lz");
+const u32 gMonBackPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/back.4bpp.lz");
+const u32 gMonShinyPalette_Persian[] = INCBIN_U32("graphics/pokemon/persian/shiny.gbapal.lz");
+const u8 gMonIcon_Persian[] = INCBIN_U8("graphics/pokemon/persian/icon.4bpp");
+const u8 gMonFootprint_Persian[] = INCBIN_U8("graphics/pokemon/persian/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/front.4bpp.lz");
+const u32 gMonPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/normal.gbapal.lz");
+const u32 gMonBackPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/back.4bpp.lz");
+const u32 gMonShinyPalette_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/shiny.gbapal.lz");
+const u8 gMonIcon_Psyduck[] = INCBIN_U8("graphics/pokemon/psyduck/icon.4bpp");
+const u8 gMonFootprint_Psyduck[] = INCBIN_U8("graphics/pokemon/psyduck/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/front.4bpp.lz");
+const u32 gMonPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/normal.gbapal.lz");
+const u32 gMonBackPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/back.4bpp.lz");
+const u32 gMonShinyPalette_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/shiny.gbapal.lz");
+const u8 gMonIcon_Golduck[] = INCBIN_U8("graphics/pokemon/golduck/icon.4bpp");
+const u8 gMonFootprint_Golduck[] = INCBIN_U8("graphics/pokemon/golduck/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/front.4bpp.lz");
+const u32 gMonPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/normal.gbapal.lz");
+const u32 gMonBackPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/back.4bpp.lz");
+const u32 gMonShinyPalette_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/shiny.gbapal.lz");
+const u8 gMonIcon_Mankey[] = INCBIN_U8("graphics/pokemon/mankey/icon.4bpp");
+const u8 gMonFootprint_Mankey[] = INCBIN_U8("graphics/pokemon/mankey/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/front.4bpp.lz");
+const u32 gMonPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/normal.gbapal.lz");
+const u32 gMonBackPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/back.4bpp.lz");
+const u32 gMonShinyPalette_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/shiny.gbapal.lz");
+const u8 gMonIcon_Primeape[] = INCBIN_U8("graphics/pokemon/primeape/icon.4bpp");
+const u8 gMonFootprint_Primeape[] = INCBIN_U8("graphics/pokemon/primeape/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/front.4bpp.lz");
+const u32 gMonPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/normal.gbapal.lz");
+const u32 gMonBackPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/back.4bpp.lz");
+const u32 gMonShinyPalette_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/shiny.gbapal.lz");
+const u8 gMonIcon_Growlithe[] = INCBIN_U8("graphics/pokemon/growlithe/icon.4bpp");
+const u8 gMonFootprint_Growlithe[] = INCBIN_U8("graphics/pokemon/growlithe/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/front.4bpp.lz");
+const u32 gMonPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/normal.gbapal.lz");
+const u32 gMonBackPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/back.4bpp.lz");
+const u32 gMonShinyPalette_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/shiny.gbapal.lz");
+const u8 gMonIcon_Arcanine[] = INCBIN_U8("graphics/pokemon/arcanine/icon.4bpp");
+const u8 gMonFootprint_Arcanine[] = INCBIN_U8("graphics/pokemon/arcanine/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/front.4bpp.lz");
+const u32 gMonPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/normal.gbapal.lz");
+const u32 gMonBackPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/back.4bpp.lz");
+const u32 gMonShinyPalette_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/shiny.gbapal.lz");
+const u8 gMonIcon_Poliwag[] = INCBIN_U8("graphics/pokemon/poliwag/icon.4bpp");
+const u8 gMonFootprint_Poliwag[] = INCBIN_U8("graphics/pokemon/poliwag/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/front.4bpp.lz");
+const u32 gMonPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/normal.gbapal.lz");
+const u32 gMonBackPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/back.4bpp.lz");
+const u32 gMonShinyPalette_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/shiny.gbapal.lz");
+const u8 gMonIcon_Poliwhirl[] = INCBIN_U8("graphics/pokemon/poliwhirl/icon.4bpp");
+const u8 gMonFootprint_Poliwhirl[] = INCBIN_U8("graphics/pokemon/poliwhirl/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/front.4bpp.lz");
+const u32 gMonPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/normal.gbapal.lz");
+const u32 gMonBackPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/back.4bpp.lz");
+const u32 gMonShinyPalette_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/shiny.gbapal.lz");
+const u8 gMonIcon_Poliwrath[] = INCBIN_U8("graphics/pokemon/poliwrath/icon.4bpp");
+const u8 gMonFootprint_Poliwrath[] = INCBIN_U8("graphics/pokemon/poliwrath/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/front.4bpp.lz");
+const u32 gMonPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/normal.gbapal.lz");
+const u32 gMonBackPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/back.4bpp.lz");
+const u32 gMonShinyPalette_Abra[] = INCBIN_U32("graphics/pokemon/abra/shiny.gbapal.lz");
+const u8 gMonIcon_Abra[] = INCBIN_U8("graphics/pokemon/abra/icon.4bpp");
+const u8 gMonFootprint_Abra[] = INCBIN_U8("graphics/pokemon/abra/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/front.4bpp.lz");
+const u32 gMonPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/normal.gbapal.lz");
+const u32 gMonBackPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/back.4bpp.lz");
+const u32 gMonShinyPalette_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/shiny.gbapal.lz");
+const u8 gMonIcon_Kadabra[] = INCBIN_U8("graphics/pokemon/kadabra/icon.4bpp");
+const u8 gMonFootprint_Kadabra[] = INCBIN_U8("graphics/pokemon/kadabra/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/front.4bpp.lz");
+const u32 gMonPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/normal.gbapal.lz");
+const u32 gMonBackPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/back.4bpp.lz");
+const u32 gMonShinyPalette_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/shiny.gbapal.lz");
+const u8 gMonIcon_Alakazam[] = INCBIN_U8("graphics/pokemon/alakazam/icon.4bpp");
+const u8 gMonFootprint_Alakazam[] = INCBIN_U8("graphics/pokemon/alakazam/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/front.4bpp.lz");
+const u32 gMonPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/normal.gbapal.lz");
+const u32 gMonBackPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/back.4bpp.lz");
+const u32 gMonShinyPalette_Machop[] = INCBIN_U32("graphics/pokemon/machop/shiny.gbapal.lz");
+const u8 gMonIcon_Machop[] = INCBIN_U8("graphics/pokemon/machop/icon.4bpp");
+const u8 gMonFootprint_Machop[] = INCBIN_U8("graphics/pokemon/machop/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/front.4bpp.lz");
+const u32 gMonPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/normal.gbapal.lz");
+const u32 gMonBackPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/back.4bpp.lz");
+const u32 gMonShinyPalette_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/shiny.gbapal.lz");
+const u8 gMonIcon_Machoke[] = INCBIN_U8("graphics/pokemon/machoke/icon.4bpp");
+const u8 gMonFootprint_Machoke[] = INCBIN_U8("graphics/pokemon/machoke/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/front.4bpp.lz");
+const u32 gMonPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/normal.gbapal.lz");
+const u32 gMonBackPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/back.4bpp.lz");
+const u32 gMonShinyPalette_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/shiny.gbapal.lz");
+const u8 gMonIcon_Machamp[] = INCBIN_U8("graphics/pokemon/machamp/icon.4bpp");
+const u8 gMonFootprint_Machamp[] = INCBIN_U8("graphics/pokemon/machamp/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/front.4bpp.lz");
+const u32 gMonPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/normal.gbapal.lz");
+const u32 gMonBackPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/back.4bpp.lz");
+const u32 gMonShinyPalette_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/shiny.gbapal.lz");
+const u8 gMonIcon_Bellsprout[] = INCBIN_U8("graphics/pokemon/bellsprout/icon.4bpp");
+const u8 gMonFootprint_Bellsprout[] = INCBIN_U8("graphics/pokemon/bellsprout/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/front.4bpp.lz");
+const u32 gMonPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/normal.gbapal.lz");
+const u32 gMonBackPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/back.4bpp.lz");
+const u32 gMonShinyPalette_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/shiny.gbapal.lz");
+const u8 gMonIcon_Weepinbell[] = INCBIN_U8("graphics/pokemon/weepinbell/icon.4bpp");
+const u8 gMonFootprint_Weepinbell[] = INCBIN_U8("graphics/pokemon/weepinbell/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/front.4bpp.lz");
+const u32 gMonPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/normal.gbapal.lz");
+const u32 gMonBackPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/back.4bpp.lz");
+const u32 gMonShinyPalette_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/shiny.gbapal.lz");
+const u8 gMonIcon_Victreebel[] = INCBIN_U8("graphics/pokemon/victreebel/icon.4bpp");
+const u8 gMonFootprint_Victreebel[] = INCBIN_U8("graphics/pokemon/victreebel/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/front.4bpp.lz");
+const u32 gMonPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/normal.gbapal.lz");
+const u32 gMonBackPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/back.4bpp.lz");
+const u32 gMonShinyPalette_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/shiny.gbapal.lz");
+const u8 gMonIcon_Tentacool[] = INCBIN_U8("graphics/pokemon/tentacool/icon.4bpp");
+const u8 gMonFootprint_Tentacool[] = INCBIN_U8("graphics/pokemon/tentacool/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/front.4bpp.lz");
+const u32 gMonPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/normal.gbapal.lz");
+const u32 gMonBackPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/back.4bpp.lz");
+const u32 gMonShinyPalette_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/shiny.gbapal.lz");
+const u8 gMonIcon_Tentacruel[] = INCBIN_U8("graphics/pokemon/tentacruel/icon.4bpp");
+const u8 gMonFootprint_Tentacruel[] = INCBIN_U8("graphics/pokemon/tentacruel/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/front.4bpp.lz");
+const u32 gMonPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/normal.gbapal.lz");
+const u32 gMonBackPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/back.4bpp.lz");
+const u32 gMonShinyPalette_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/shiny.gbapal.lz");
+const u8 gMonIcon_Geodude[] = INCBIN_U8("graphics/pokemon/geodude/icon.4bpp");
+const u8 gMonFootprint_Geodude[] = INCBIN_U8("graphics/pokemon/geodude/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/front.4bpp.lz");
+const u32 gMonPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/normal.gbapal.lz");
+const u32 gMonBackPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/back.4bpp.lz");
+const u32 gMonShinyPalette_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/shiny.gbapal.lz");
+const u8 gMonIcon_Graveler[] = INCBIN_U8("graphics/pokemon/graveler/icon.4bpp");
+const u8 gMonFootprint_Graveler[] = INCBIN_U8("graphics/pokemon/graveler/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/front.4bpp.lz");
+const u32 gMonPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/normal.gbapal.lz");
+const u32 gMonBackPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/back.4bpp.lz");
+const u32 gMonShinyPalette_Golem[] = INCBIN_U32("graphics/pokemon/golem/shiny.gbapal.lz");
+const u8 gMonIcon_Golem[] = INCBIN_U8("graphics/pokemon/golem/icon.4bpp");
+const u8 gMonFootprint_Golem[] = INCBIN_U8("graphics/pokemon/golem/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/front.4bpp.lz");
+const u32 gMonPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/normal.gbapal.lz");
+const u32 gMonBackPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/back.4bpp.lz");
+const u32 gMonShinyPalette_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/shiny.gbapal.lz");
+const u8 gMonIcon_Ponyta[] = INCBIN_U8("graphics/pokemon/ponyta/icon.4bpp");
+const u8 gMonFootprint_Ponyta[] = INCBIN_U8("graphics/pokemon/ponyta/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/front.4bpp.lz");
+const u32 gMonPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/normal.gbapal.lz");
+const u32 gMonBackPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/back.4bpp.lz");
+const u32 gMonShinyPalette_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/shiny.gbapal.lz");
+const u8 gMonIcon_Rapidash[] = INCBIN_U8("graphics/pokemon/rapidash/icon.4bpp");
+const u8 gMonFootprint_Rapidash[] = INCBIN_U8("graphics/pokemon/rapidash/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/front.4bpp.lz");
+const u32 gMonPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/normal.gbapal.lz");
+const u32 gMonBackPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/back.4bpp.lz");
+const u32 gMonShinyPalette_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/shiny.gbapal.lz");
+const u8 gMonIcon_Slowpoke[] = INCBIN_U8("graphics/pokemon/slowpoke/icon.4bpp");
+const u8 gMonFootprint_Slowpoke[] = INCBIN_U8("graphics/pokemon/slowpoke/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/front.4bpp.lz");
+const u32 gMonPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/normal.gbapal.lz");
+const u32 gMonBackPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/back.4bpp.lz");
+const u32 gMonShinyPalette_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/shiny.gbapal.lz");
+const u8 gMonIcon_Slowbro[] = INCBIN_U8("graphics/pokemon/slowbro/icon.4bpp");
+const u8 gMonFootprint_Slowbro[] = INCBIN_U8("graphics/pokemon/slowbro/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/front.4bpp.lz");
+const u32 gMonPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/normal.gbapal.lz");
+const u32 gMonBackPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/back.4bpp.lz");
+const u32 gMonShinyPalette_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/shiny.gbapal.lz");
+const u8 gMonIcon_Magnemite[] = INCBIN_U8("graphics/pokemon/magnemite/icon.4bpp");
+const u8 gMonFootprint_Magnemite[] = INCBIN_U8("graphics/pokemon/magnemite/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/front.4bpp.lz");
+const u32 gMonPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/normal.gbapal.lz");
+const u32 gMonBackPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/back.4bpp.lz");
+const u32 gMonShinyPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/shiny.gbapal.lz");
+const u8 gMonIcon_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/icon.4bpp");
+const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/front.4bpp.lz");
+const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/normal.gbapal.lz");
+const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/back.4bpp.lz");
+const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/shiny.gbapal.lz");
+const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetch_d/icon.4bpp");
+const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetch_d/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/front.4bpp.lz");
+const u32 gMonPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/normal.gbapal.lz");
+const u32 gMonBackPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/back.4bpp.lz");
+const u32 gMonShinyPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/shiny.gbapal.lz");
+const u8 gMonIcon_Doduo[] = INCBIN_U8("graphics/pokemon/doduo/icon.4bpp");
+const u8 gMonFootprint_Doduo[] = INCBIN_U8("graphics/pokemon/doduo/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/front.4bpp.lz");
+const u32 gMonPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/normal.gbapal.lz");
+const u32 gMonBackPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/back.4bpp.lz");
+const u32 gMonShinyPalette_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/shiny.gbapal.lz");
+const u8 gMonIcon_Dodrio[] = INCBIN_U8("graphics/pokemon/dodrio/icon.4bpp");
+const u8 gMonFootprint_Dodrio[] = INCBIN_U8("graphics/pokemon/dodrio/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/front.4bpp.lz");
+const u32 gMonPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/normal.gbapal.lz");
+const u32 gMonBackPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/back.4bpp.lz");
+const u32 gMonShinyPalette_Seel[] = INCBIN_U32("graphics/pokemon/seel/shiny.gbapal.lz");
+const u8 gMonIcon_Seel[] = INCBIN_U8("graphics/pokemon/seel/icon.4bpp");
+const u8 gMonFootprint_Seel[] = INCBIN_U8("graphics/pokemon/seel/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/front.4bpp.lz");
+const u32 gMonPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/normal.gbapal.lz");
+const u32 gMonBackPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/back.4bpp.lz");
+const u32 gMonShinyPalette_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/shiny.gbapal.lz");
+const u8 gMonIcon_Dewgong[] = INCBIN_U8("graphics/pokemon/dewgong/icon.4bpp");
+const u8 gMonFootprint_Dewgong[] = INCBIN_U8("graphics/pokemon/dewgong/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/front.4bpp.lz");
+const u32 gMonPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/normal.gbapal.lz");
+const u32 gMonBackPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/back.4bpp.lz");
+const u32 gMonShinyPalette_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/shiny.gbapal.lz");
+const u8 gMonIcon_Grimer[] = INCBIN_U8("graphics/pokemon/grimer/icon.4bpp");
+const u8 gMonFootprint_Grimer[] = INCBIN_U8("graphics/pokemon/grimer/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/front.4bpp.lz");
+const u32 gMonPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/normal.gbapal.lz");
+const u32 gMonBackPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/back.4bpp.lz");
+const u32 gMonShinyPalette_Muk[] = INCBIN_U32("graphics/pokemon/muk/shiny.gbapal.lz");
+const u8 gMonIcon_Muk[] = INCBIN_U8("graphics/pokemon/muk/icon.4bpp");
+const u8 gMonFootprint_Muk[] = INCBIN_U8("graphics/pokemon/muk/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/front.4bpp.lz");
+const u32 gMonPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/normal.gbapal.lz");
+const u32 gMonBackPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/back.4bpp.lz");
+const u32 gMonShinyPalette_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/shiny.gbapal.lz");
+const u8 gMonIcon_Shellder[] = INCBIN_U8("graphics/pokemon/shellder/icon.4bpp");
+const u8 gMonFootprint_Shellder[] = INCBIN_U8("graphics/pokemon/shellder/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/front.4bpp.lz");
+const u32 gMonPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/normal.gbapal.lz");
+const u32 gMonBackPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/back.4bpp.lz");
+const u32 gMonShinyPalette_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/shiny.gbapal.lz");
+const u8 gMonIcon_Cloyster[] = INCBIN_U8("graphics/pokemon/cloyster/icon.4bpp");
+const u8 gMonFootprint_Cloyster[] = INCBIN_U8("graphics/pokemon/cloyster/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/front.4bpp.lz");
+const u32 gMonPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/normal.gbapal.lz");
+const u32 gMonBackPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/back.4bpp.lz");
+const u32 gMonShinyPalette_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/shiny.gbapal.lz");
+const u8 gMonIcon_Gastly[] = INCBIN_U8("graphics/pokemon/gastly/icon.4bpp");
+const u8 gMonFootprint_Gastly[] = INCBIN_U8("graphics/pokemon/gastly/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/front.4bpp.lz");
+const u32 gMonPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/normal.gbapal.lz");
+const u32 gMonBackPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/back.4bpp.lz");
+const u32 gMonShinyPalette_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/shiny.gbapal.lz");
+const u8 gMonIcon_Haunter[] = INCBIN_U8("graphics/pokemon/haunter/icon.4bpp");
+const u8 gMonFootprint_Haunter[] = INCBIN_U8("graphics/pokemon/haunter/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/front.4bpp.lz");
+const u32 gMonPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/normal.gbapal.lz");
+const u32 gMonBackPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/back.4bpp.lz");
+const u32 gMonShinyPalette_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/shiny.gbapal.lz");
+const u8 gMonIcon_Gengar[] = INCBIN_U8("graphics/pokemon/gengar/icon.4bpp");
+const u8 gMonFootprint_Gengar[] = INCBIN_U8("graphics/pokemon/gengar/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/front.4bpp.lz");
+const u32 gMonPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/normal.gbapal.lz");
+const u32 gMonBackPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/back.4bpp.lz");
+const u32 gMonShinyPalette_Onix[] = INCBIN_U32("graphics/pokemon/onix/shiny.gbapal.lz");
+const u8 gMonIcon_Onix[] = INCBIN_U8("graphics/pokemon/onix/icon.4bpp");
+const u8 gMonFootprint_Onix[] = INCBIN_U8("graphics/pokemon/onix/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/front.4bpp.lz");
+const u32 gMonPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/normal.gbapal.lz");
+const u32 gMonBackPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/back.4bpp.lz");
+const u32 gMonShinyPalette_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/shiny.gbapal.lz");
+const u8 gMonIcon_Drowzee[] = INCBIN_U8("graphics/pokemon/drowzee/icon.4bpp");
+const u8 gMonFootprint_Drowzee[] = INCBIN_U8("graphics/pokemon/drowzee/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/front.4bpp.lz");
+const u32 gMonPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/normal.gbapal.lz");
+const u32 gMonBackPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/back.4bpp.lz");
+const u32 gMonShinyPalette_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/shiny.gbapal.lz");
+const u8 gMonIcon_Hypno[] = INCBIN_U8("graphics/pokemon/hypno/icon.4bpp");
+const u8 gMonFootprint_Hypno[] = INCBIN_U8("graphics/pokemon/hypno/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/front.4bpp.lz");
+const u32 gMonPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/normal.gbapal.lz");
+const u32 gMonBackPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/back.4bpp.lz");
+const u32 gMonShinyPalette_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/shiny.gbapal.lz");
+const u8 gMonIcon_Krabby[] = INCBIN_U8("graphics/pokemon/krabby/icon.4bpp");
+const u8 gMonFootprint_Krabby[] = INCBIN_U8("graphics/pokemon/krabby/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/front.4bpp.lz");
+const u32 gMonPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/normal.gbapal.lz");
+const u32 gMonBackPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/back.4bpp.lz");
+const u32 gMonShinyPalette_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/shiny.gbapal.lz");
+const u8 gMonIcon_Kingler[] = INCBIN_U8("graphics/pokemon/kingler/icon.4bpp");
+const u8 gMonFootprint_Kingler[] = INCBIN_U8("graphics/pokemon/kingler/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/front.4bpp.lz");
+const u32 gMonPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/normal.gbapal.lz");
+const u32 gMonBackPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/back.4bpp.lz");
+const u32 gMonShinyPalette_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/shiny.gbapal.lz");
+const u8 gMonIcon_Voltorb[] = INCBIN_U8("graphics/pokemon/voltorb/icon.4bpp");
+const u8 gMonFootprint_Voltorb[] = INCBIN_U8("graphics/pokemon/voltorb/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/front.4bpp.lz");
+const u32 gMonPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/normal.gbapal.lz");
+const u32 gMonBackPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/back.4bpp.lz");
+const u32 gMonShinyPalette_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/shiny.gbapal.lz");
+const u8 gMonIcon_Electrode[] = INCBIN_U8("graphics/pokemon/electrode/icon.4bpp");
+const u8 gMonFootprint_Electrode[] = INCBIN_U8("graphics/pokemon/electrode/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/front.4bpp.lz");
+const u32 gMonPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/normal.gbapal.lz");
+const u32 gMonBackPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/back.4bpp.lz");
+const u32 gMonShinyPalette_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/shiny.gbapal.lz");
+const u8 gMonIcon_Exeggcute[] = INCBIN_U8("graphics/pokemon/exeggcute/icon.4bpp");
+const u8 gMonFootprint_Exeggcute[] = INCBIN_U8("graphics/pokemon/exeggcute/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/front.4bpp.lz");
+const u32 gMonPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/normal.gbapal.lz");
+const u32 gMonBackPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/back.4bpp.lz");
+const u32 gMonShinyPalette_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/shiny.gbapal.lz");
+const u8 gMonIcon_Exeggutor[] = INCBIN_U8("graphics/pokemon/exeggutor/icon.4bpp");
+const u8 gMonFootprint_Exeggutor[] = INCBIN_U8("graphics/pokemon/exeggutor/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/front.4bpp.lz");
+const u32 gMonPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/normal.gbapal.lz");
+const u32 gMonBackPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/back.4bpp.lz");
+const u32 gMonShinyPalette_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/shiny.gbapal.lz");
+const u8 gMonIcon_Cubone[] = INCBIN_U8("graphics/pokemon/cubone/icon.4bpp");
+const u8 gMonFootprint_Cubone[] = INCBIN_U8("graphics/pokemon/cubone/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/front.4bpp.lz");
+const u32 gMonPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/normal.gbapal.lz");
+const u32 gMonBackPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/back.4bpp.lz");
+const u32 gMonShinyPalette_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/shiny.gbapal.lz");
+const u8 gMonIcon_Marowak[] = INCBIN_U8("graphics/pokemon/marowak/icon.4bpp");
+const u8 gMonFootprint_Marowak[] = INCBIN_U8("graphics/pokemon/marowak/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/front.4bpp.lz");
+const u32 gMonPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/normal.gbapal.lz");
+const u32 gMonBackPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/back.4bpp.lz");
+const u32 gMonShinyPalette_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/shiny.gbapal.lz");
+const u8 gMonIcon_Hitmonlee[] = INCBIN_U8("graphics/pokemon/hitmonlee/icon.4bpp");
+const u8 gMonFootprint_Hitmonlee[] = INCBIN_U8("graphics/pokemon/hitmonlee/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/front.4bpp.lz");
+const u32 gMonPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/normal.gbapal.lz");
+const u32 gMonBackPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/back.4bpp.lz");
+const u32 gMonShinyPalette_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/shiny.gbapal.lz");
+const u8 gMonIcon_Hitmonchan[] = INCBIN_U8("graphics/pokemon/hitmonchan/icon.4bpp");
+const u8 gMonFootprint_Hitmonchan[] = INCBIN_U8("graphics/pokemon/hitmonchan/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/front.4bpp.lz");
+const u32 gMonPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/normal.gbapal.lz");
+const u32 gMonBackPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/back.4bpp.lz");
+const u32 gMonShinyPalette_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/shiny.gbapal.lz");
+const u8 gMonIcon_Lickitung[] = INCBIN_U8("graphics/pokemon/lickitung/icon.4bpp");
+const u8 gMonFootprint_Lickitung[] = INCBIN_U8("graphics/pokemon/lickitung/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/front.4bpp.lz");
+const u32 gMonPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/normal.gbapal.lz");
+const u32 gMonBackPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/back.4bpp.lz");
+const u32 gMonShinyPalette_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/shiny.gbapal.lz");
+const u8 gMonIcon_Koffing[] = INCBIN_U8("graphics/pokemon/koffing/icon.4bpp");
+const u8 gMonFootprint_Koffing[] = INCBIN_U8("graphics/pokemon/koffing/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/front.4bpp.lz");
+const u32 gMonPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/normal.gbapal.lz");
+const u32 gMonBackPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/back.4bpp.lz");
+const u32 gMonShinyPalette_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/shiny.gbapal.lz");
+const u8 gMonIcon_Weezing[] = INCBIN_U8("graphics/pokemon/weezing/icon.4bpp");
+const u8 gMonFootprint_Weezing[] = INCBIN_U8("graphics/pokemon/weezing/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/front.4bpp.lz");
+const u32 gMonPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/normal.gbapal.lz");
+const u32 gMonBackPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/back.4bpp.lz");
+const u32 gMonShinyPalette_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/shiny.gbapal.lz");
+const u8 gMonIcon_Rhyhorn[] = INCBIN_U8("graphics/pokemon/rhyhorn/icon.4bpp");
+const u8 gMonFootprint_Rhyhorn[] = INCBIN_U8("graphics/pokemon/rhyhorn/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/front.4bpp.lz");
+const u32 gMonPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/normal.gbapal.lz");
+const u32 gMonBackPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/back.4bpp.lz");
+const u32 gMonShinyPalette_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/shiny.gbapal.lz");
+const u8 gMonIcon_Rhydon[] = INCBIN_U8("graphics/pokemon/rhydon/icon.4bpp");
+const u8 gMonFootprint_Rhydon[] = INCBIN_U8("graphics/pokemon/rhydon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/front.4bpp.lz");
+const u32 gMonPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/normal.gbapal.lz");
+const u32 gMonBackPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/back.4bpp.lz");
+const u32 gMonShinyPalette_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/shiny.gbapal.lz");
+const u8 gMonIcon_Chansey[] = INCBIN_U8("graphics/pokemon/chansey/icon.4bpp");
+const u8 gMonFootprint_Chansey[] = INCBIN_U8("graphics/pokemon/chansey/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/front.4bpp.lz");
+const u32 gMonPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/normal.gbapal.lz");
+const u32 gMonBackPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/back.4bpp.lz");
+const u32 gMonShinyPalette_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/shiny.gbapal.lz");
+const u8 gMonIcon_Tangela[] = INCBIN_U8("graphics/pokemon/tangela/icon.4bpp");
+const u8 gMonFootprint_Tangela[] = INCBIN_U8("graphics/pokemon/tangela/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/front.4bpp.lz");
+const u32 gMonPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/normal.gbapal.lz");
+const u32 gMonBackPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/back.4bpp.lz");
+const u32 gMonShinyPalette_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/shiny.gbapal.lz");
+const u8 gMonIcon_Kangaskhan[] = INCBIN_U8("graphics/pokemon/kangaskhan/icon.4bpp");
+const u8 gMonFootprint_Kangaskhan[] = INCBIN_U8("graphics/pokemon/kangaskhan/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/front.4bpp.lz");
+const u32 gMonPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/normal.gbapal.lz");
+const u32 gMonBackPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/back.4bpp.lz");
+const u32 gMonShinyPalette_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/shiny.gbapal.lz");
+const u8 gMonIcon_Horsea[] = INCBIN_U8("graphics/pokemon/horsea/icon.4bpp");
+const u8 gMonFootprint_Horsea[] = INCBIN_U8("graphics/pokemon/horsea/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/front.4bpp.lz");
+const u32 gMonPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/normal.gbapal.lz");
+const u32 gMonBackPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/back.4bpp.lz");
+const u32 gMonShinyPalette_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/shiny.gbapal.lz");
+const u8 gMonIcon_Seadra[] = INCBIN_U8("graphics/pokemon/seadra/icon.4bpp");
+const u8 gMonFootprint_Seadra[] = INCBIN_U8("graphics/pokemon/seadra/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/front.4bpp.lz");
+const u32 gMonPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/normal.gbapal.lz");
+const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/back.4bpp.lz");
+const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/shiny.gbapal.lz");
+const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/icon.4bpp");
+const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/front.4bpp.lz");
+const u32 gMonPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/normal.gbapal.lz");
+const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/back.4bpp.lz");
+const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/shiny.gbapal.lz");
+const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/icon.4bpp");
+const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/front.4bpp.lz");
+const u32 gMonPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/normal.gbapal.lz");
+const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/back.4bpp.lz");
+const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/shiny.gbapal.lz");
+const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/icon.4bpp");
+const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/front.4bpp.lz");
+const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/normal.gbapal.lz");
+const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/back.4bpp.lz");
+const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/shiny.gbapal.lz");
+const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/icon.4bpp");
+const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/front.4bpp.lz");
+const u32 gMonPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/normal.gbapal.lz");
+const u32 gMonBackPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz");
+const u32 gMonShinyPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/shiny.gbapal.lz");
+const u8 gMonIcon_Mrmime[] = INCBIN_U8("graphics/pokemon/mr_mime/icon.4bpp");
+const u8 gMonFootprint_Mrmime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/front.4bpp.lz");
+const u32 gMonPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/normal.gbapal.lz");
+const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/back.4bpp.lz");
+const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/shiny.gbapal.lz");
+const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/icon.4bpp");
+const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/front.4bpp.lz");
+const u32 gMonPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/normal.gbapal.lz");
+const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/back.4bpp.lz");
+const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/shiny.gbapal.lz");
+const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/icon.4bpp");
+const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/front.4bpp.lz");
+const u32 gMonPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/normal.gbapal.lz");
+const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/back.4bpp.lz");
+const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/shiny.gbapal.lz");
+const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/icon.4bpp");
+const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/front.4bpp.lz");
+const u32 gMonPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/normal.gbapal.lz");
+const u32 gMonBackPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/back.4bpp.lz");
+const u32 gMonShinyPalette_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/shiny.gbapal.lz");
+const u8 gMonIcon_Magmar[] = INCBIN_U8("graphics/pokemon/magmar/icon.4bpp");
+const u8 gMonFootprint_Magmar[] = INCBIN_U8("graphics/pokemon/magmar/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/front.4bpp.lz");
+const u32 gMonPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/normal.gbapal.lz");
+const u32 gMonBackPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/back.4bpp.lz");
+const u32 gMonShinyPalette_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/shiny.gbapal.lz");
+const u8 gMonIcon_Pinsir[] = INCBIN_U8("graphics/pokemon/pinsir/icon.4bpp");
+const u8 gMonFootprint_Pinsir[] = INCBIN_U8("graphics/pokemon/pinsir/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/front.4bpp.lz");
+const u32 gMonPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/normal.gbapal.lz");
+const u32 gMonBackPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/back.4bpp.lz");
+const u32 gMonShinyPalette_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/shiny.gbapal.lz");
+const u8 gMonIcon_Tauros[] = INCBIN_U8("graphics/pokemon/tauros/icon.4bpp");
+const u8 gMonFootprint_Tauros[] = INCBIN_U8("graphics/pokemon/tauros/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/front.4bpp.lz");
+const u32 gMonPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/normal.gbapal.lz");
+const u32 gMonBackPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/back.4bpp.lz");
+const u32 gMonShinyPalette_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/shiny.gbapal.lz");
+const u8 gMonIcon_Magikarp[] = INCBIN_U8("graphics/pokemon/magikarp/icon.4bpp");
+const u8 gMonFootprint_Magikarp[] = INCBIN_U8("graphics/pokemon/magikarp/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/front.4bpp.lz");
+const u32 gMonPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/normal.gbapal.lz");
+const u32 gMonBackPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/back.4bpp.lz");
+const u32 gMonShinyPalette_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/shiny.gbapal.lz");
+const u8 gMonIcon_Gyarados[] = INCBIN_U8("graphics/pokemon/gyarados/icon.4bpp");
+const u8 gMonFootprint_Gyarados[] = INCBIN_U8("graphics/pokemon/gyarados/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/front.4bpp.lz");
+const u32 gMonPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/normal.gbapal.lz");
+const u32 gMonBackPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/back.4bpp.lz");
+const u32 gMonShinyPalette_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/shiny.gbapal.lz");
+const u8 gMonIcon_Lapras[] = INCBIN_U8("graphics/pokemon/lapras/icon.4bpp");
+const u8 gMonFootprint_Lapras[] = INCBIN_U8("graphics/pokemon/lapras/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/front.4bpp.lz");
+const u32 gMonPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/normal.gbapal.lz");
+const u32 gMonBackPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/back.4bpp.lz");
+const u32 gMonShinyPalette_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/shiny.gbapal.lz");
+const u8 gMonIcon_Ditto[] = INCBIN_U8("graphics/pokemon/ditto/icon.4bpp");
+const u8 gMonFootprint_Ditto[] = INCBIN_U8("graphics/pokemon/ditto/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/front.4bpp.lz");
+const u32 gMonPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/normal.gbapal.lz");
+const u32 gMonBackPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/back.4bpp.lz");
+const u32 gMonShinyPalette_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/shiny.gbapal.lz");
+const u8 gMonIcon_Eevee[] = INCBIN_U8("graphics/pokemon/eevee/icon.4bpp");
+const u8 gMonFootprint_Eevee[] = INCBIN_U8("graphics/pokemon/eevee/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/front.4bpp.lz");
+const u32 gMonPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/normal.gbapal.lz");
+const u32 gMonBackPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/back.4bpp.lz");
+const u32 gMonShinyPalette_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/shiny.gbapal.lz");
+const u8 gMonIcon_Vaporeon[] = INCBIN_U8("graphics/pokemon/vaporeon/icon.4bpp");
+const u8 gMonFootprint_Vaporeon[] = INCBIN_U8("graphics/pokemon/vaporeon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/front.4bpp.lz");
+const u32 gMonPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/normal.gbapal.lz");
+const u32 gMonBackPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/back.4bpp.lz");
+const u32 gMonShinyPalette_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/shiny.gbapal.lz");
+const u8 gMonIcon_Jolteon[] = INCBIN_U8("graphics/pokemon/jolteon/icon.4bpp");
+const u8 gMonFootprint_Jolteon[] = INCBIN_U8("graphics/pokemon/jolteon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/front.4bpp.lz");
+const u32 gMonPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/normal.gbapal.lz");
+const u32 gMonBackPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/back.4bpp.lz");
+const u32 gMonShinyPalette_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/shiny.gbapal.lz");
+const u8 gMonIcon_Flareon[] = INCBIN_U8("graphics/pokemon/flareon/icon.4bpp");
+const u8 gMonFootprint_Flareon[] = INCBIN_U8("graphics/pokemon/flareon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/front.4bpp.lz");
+const u32 gMonPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/normal.gbapal.lz");
+const u32 gMonBackPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/back.4bpp.lz");
+const u32 gMonShinyPalette_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/shiny.gbapal.lz");
+const u8 gMonIcon_Porygon[] = INCBIN_U8("graphics/pokemon/porygon/icon.4bpp");
+const u8 gMonFootprint_Porygon[] = INCBIN_U8("graphics/pokemon/porygon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/front.4bpp.lz");
+const u32 gMonPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/normal.gbapal.lz");
+const u32 gMonBackPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/back.4bpp.lz");
+const u32 gMonShinyPalette_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/shiny.gbapal.lz");
+const u8 gMonIcon_Omanyte[] = INCBIN_U8("graphics/pokemon/omanyte/icon.4bpp");
+const u8 gMonFootprint_Omanyte[] = INCBIN_U8("graphics/pokemon/omanyte/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/front.4bpp.lz");
+const u32 gMonPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/normal.gbapal.lz");
+const u32 gMonBackPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/back.4bpp.lz");
+const u32 gMonShinyPalette_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/shiny.gbapal.lz");
+const u8 gMonIcon_Omastar[] = INCBIN_U8("graphics/pokemon/omastar/icon.4bpp");
+const u8 gMonFootprint_Omastar[] = INCBIN_U8("graphics/pokemon/omastar/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/front.4bpp.lz");
+const u32 gMonPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/normal.gbapal.lz");
+const u32 gMonBackPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/back.4bpp.lz");
+const u32 gMonShinyPalette_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/shiny.gbapal.lz");
+const u8 gMonIcon_Kabuto[] = INCBIN_U8("graphics/pokemon/kabuto/icon.4bpp");
+const u8 gMonFootprint_Kabuto[] = INCBIN_U8("graphics/pokemon/kabuto/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/front.4bpp.lz");
+const u32 gMonPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/normal.gbapal.lz");
+const u32 gMonBackPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/back.4bpp.lz");
+const u32 gMonShinyPalette_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/shiny.gbapal.lz");
+const u8 gMonIcon_Kabutops[] = INCBIN_U8("graphics/pokemon/kabutops/icon.4bpp");
+const u8 gMonFootprint_Kabutops[] = INCBIN_U8("graphics/pokemon/kabutops/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/front.4bpp.lz");
+const u32 gMonPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/normal.gbapal.lz");
+const u32 gMonBackPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/back.4bpp.lz");
+const u32 gMonShinyPalette_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/shiny.gbapal.lz");
+const u8 gMonIcon_Aerodactyl[] = INCBIN_U8("graphics/pokemon/aerodactyl/icon.4bpp");
+const u8 gMonFootprint_Aerodactyl[] = INCBIN_U8("graphics/pokemon/aerodactyl/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/front.4bpp.lz");
+const u32 gMonPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/normal.gbapal.lz");
+const u32 gMonBackPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/back.4bpp.lz");
+const u32 gMonShinyPalette_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/shiny.gbapal.lz");
+const u8 gMonIcon_Snorlax[] = INCBIN_U8("graphics/pokemon/snorlax/icon.4bpp");
+const u8 gMonFootprint_Snorlax[] = INCBIN_U8("graphics/pokemon/snorlax/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/front.4bpp.lz");
+const u32 gMonPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/normal.gbapal.lz");
+const u32 gMonBackPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/back.4bpp.lz");
+const u32 gMonShinyPalette_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/shiny.gbapal.lz");
+const u8 gMonIcon_Articuno[] = INCBIN_U8("graphics/pokemon/articuno/icon.4bpp");
+const u8 gMonFootprint_Articuno[] = INCBIN_U8("graphics/pokemon/articuno/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/front.4bpp.lz");
+const u32 gMonPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/normal.gbapal.lz");
+const u32 gMonBackPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/back.4bpp.lz");
+const u32 gMonShinyPalette_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/shiny.gbapal.lz");
+const u8 gMonIcon_Zapdos[] = INCBIN_U8("graphics/pokemon/zapdos/icon.4bpp");
+const u8 gMonFootprint_Zapdos[] = INCBIN_U8("graphics/pokemon/zapdos/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/front.4bpp.lz");
+const u32 gMonPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/normal.gbapal.lz");
+const u32 gMonBackPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/back.4bpp.lz");
+const u32 gMonShinyPalette_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/shiny.gbapal.lz");
+const u8 gMonIcon_Moltres[] = INCBIN_U8("graphics/pokemon/moltres/icon.4bpp");
+const u8 gMonFootprint_Moltres[] = INCBIN_U8("graphics/pokemon/moltres/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/front.4bpp.lz");
+const u32 gMonPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/normal.gbapal.lz");
+const u32 gMonBackPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/back.4bpp.lz");
+const u32 gMonShinyPalette_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/shiny.gbapal.lz");
+const u8 gMonIcon_Dratini[] = INCBIN_U8("graphics/pokemon/dratini/icon.4bpp");
+const u8 gMonFootprint_Dratini[] = INCBIN_U8("graphics/pokemon/dratini/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/front.4bpp.lz");
+const u32 gMonPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/normal.gbapal.lz");
+const u32 gMonBackPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/back.4bpp.lz");
+const u32 gMonShinyPalette_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/shiny.gbapal.lz");
+const u8 gMonIcon_Dragonair[] = INCBIN_U8("graphics/pokemon/dragonair/icon.4bpp");
+const u8 gMonFootprint_Dragonair[] = INCBIN_U8("graphics/pokemon/dragonair/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/front.4bpp.lz");
+const u32 gMonPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/normal.gbapal.lz");
+const u32 gMonBackPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/back.4bpp.lz");
+const u32 gMonShinyPalette_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/shiny.gbapal.lz");
+const u8 gMonIcon_Dragonite[] = INCBIN_U8("graphics/pokemon/dragonite/icon.4bpp");
+const u8 gMonFootprint_Dragonite[] = INCBIN_U8("graphics/pokemon/dragonite/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/front.4bpp.lz");
+const u32 gMonPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/normal.gbapal.lz");
+const u32 gMonBackPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/back.4bpp.lz");
+const u32 gMonShinyPalette_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/shiny.gbapal.lz");
+const u8 gMonIcon_Mewtwo[] = INCBIN_U8("graphics/pokemon/mewtwo/icon.4bpp");
+const u8 gMonFootprint_Mewtwo[] = INCBIN_U8("graphics/pokemon/mewtwo/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/front.4bpp.lz");
+const u32 gMonPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/normal.gbapal.lz");
+const u32 gMonBackPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/back.4bpp.lz");
+const u32 gMonShinyPalette_Mew[] = INCBIN_U32("graphics/pokemon/mew/shiny.gbapal.lz");
+const u8 gMonIcon_Mew[] = INCBIN_U8("graphics/pokemon/mew/icon.4bpp");
+const u8 gMonFootprint_Mew[] = INCBIN_U8("graphics/pokemon/mew/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/front.4bpp.lz");
+const u32 gMonPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/normal.gbapal.lz");
+const u32 gMonBackPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/back.4bpp.lz");
+const u32 gMonShinyPalette_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/shiny.gbapal.lz");
+const u8 gMonIcon_Chikorita[] = INCBIN_U8("graphics/pokemon/chikorita/icon.4bpp");
+const u8 gMonFootprint_Chikorita[] = INCBIN_U8("graphics/pokemon/chikorita/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/front.4bpp.lz");
+const u32 gMonPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/normal.gbapal.lz");
+const u32 gMonBackPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/back.4bpp.lz");
+const u32 gMonShinyPalette_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/shiny.gbapal.lz");
+const u8 gMonIcon_Bayleef[] = INCBIN_U8("graphics/pokemon/bayleef/icon.4bpp");
+const u8 gMonFootprint_Bayleef[] = INCBIN_U8("graphics/pokemon/bayleef/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/front.4bpp.lz");
+const u32 gMonPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/normal.gbapal.lz");
+const u32 gMonBackPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/back.4bpp.lz");
+const u32 gMonShinyPalette_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/shiny.gbapal.lz");
+const u8 gMonIcon_Meganium[] = INCBIN_U8("graphics/pokemon/meganium/icon.4bpp");
+const u8 gMonFootprint_Meganium[] = INCBIN_U8("graphics/pokemon/meganium/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/front.4bpp.lz");
+const u32 gMonPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/normal.gbapal.lz");
+const u32 gMonBackPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/back.4bpp.lz");
+const u32 gMonShinyPalette_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/shiny.gbapal.lz");
+const u8 gMonIcon_Cyndaquil[] = INCBIN_U8("graphics/pokemon/cyndaquil/icon.4bpp");
+const u8 gMonFootprint_Cyndaquil[] = INCBIN_U8("graphics/pokemon/cyndaquil/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/front.4bpp.lz");
+const u32 gMonPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/normal.gbapal.lz");
+const u32 gMonBackPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/back.4bpp.lz");
+const u32 gMonShinyPalette_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/shiny.gbapal.lz");
+const u8 gMonIcon_Quilava[] = INCBIN_U8("graphics/pokemon/quilava/icon.4bpp");
+const u8 gMonFootprint_Quilava[] = INCBIN_U8("graphics/pokemon/quilava/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/front.4bpp.lz");
+const u32 gMonPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/normal.gbapal.lz");
+const u32 gMonBackPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/back.4bpp.lz");
+const u32 gMonShinyPalette_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/shiny.gbapal.lz");
+const u8 gMonIcon_Typhlosion[] = INCBIN_U8("graphics/pokemon/typhlosion/icon.4bpp");
+const u8 gMonFootprint_Typhlosion[] = INCBIN_U8("graphics/pokemon/typhlosion/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/front.4bpp.lz");
+const u32 gMonPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/normal.gbapal.lz");
+const u32 gMonBackPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/back.4bpp.lz");
+const u32 gMonShinyPalette_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/shiny.gbapal.lz");
+const u8 gMonIcon_Totodile[] = INCBIN_U8("graphics/pokemon/totodile/icon.4bpp");
+const u8 gMonFootprint_Totodile[] = INCBIN_U8("graphics/pokemon/totodile/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/front.4bpp.lz");
+const u32 gMonPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/normal.gbapal.lz");
+const u32 gMonBackPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/back.4bpp.lz");
+const u32 gMonShinyPalette_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/shiny.gbapal.lz");
+const u8 gMonIcon_Croconaw[] = INCBIN_U8("graphics/pokemon/croconaw/icon.4bpp");
+const u8 gMonFootprint_Croconaw[] = INCBIN_U8("graphics/pokemon/croconaw/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/front.4bpp.lz");
+const u32 gMonPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/normal.gbapal.lz");
+const u32 gMonBackPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/back.4bpp.lz");
+const u32 gMonShinyPalette_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/shiny.gbapal.lz");
+const u8 gMonIcon_Feraligatr[] = INCBIN_U8("graphics/pokemon/feraligatr/icon.4bpp");
+const u8 gMonFootprint_Feraligatr[] = INCBIN_U8("graphics/pokemon/feraligatr/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/front.4bpp.lz");
+const u32 gMonPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/normal.gbapal.lz");
+const u32 gMonBackPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/back.4bpp.lz");
+const u32 gMonShinyPalette_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/shiny.gbapal.lz");
+const u8 gMonIcon_Sentret[] = INCBIN_U8("graphics/pokemon/sentret/icon.4bpp");
+const u8 gMonFootprint_Sentret[] = INCBIN_U8("graphics/pokemon/sentret/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/front.4bpp.lz");
+const u32 gMonPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/normal.gbapal.lz");
+const u32 gMonBackPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/back.4bpp.lz");
+const u32 gMonShinyPalette_Furret[] = INCBIN_U32("graphics/pokemon/furret/shiny.gbapal.lz");
+const u8 gMonIcon_Furret[] = INCBIN_U8("graphics/pokemon/furret/icon.4bpp");
+const u8 gMonFootprint_Furret[] = INCBIN_U8("graphics/pokemon/furret/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/front.4bpp.lz");
+const u32 gMonPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/normal.gbapal.lz");
+const u32 gMonBackPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/back.4bpp.lz");
+const u32 gMonShinyPalette_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/shiny.gbapal.lz");
+const u8 gMonIcon_Hoothoot[] = INCBIN_U8("graphics/pokemon/hoothoot/icon.4bpp");
+const u8 gMonFootprint_Hoothoot[] = INCBIN_U8("graphics/pokemon/hoothoot/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/front.4bpp.lz");
+const u32 gMonPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/normal.gbapal.lz");
+const u32 gMonBackPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/back.4bpp.lz");
+const u32 gMonShinyPalette_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/shiny.gbapal.lz");
+const u8 gMonIcon_Noctowl[] = INCBIN_U8("graphics/pokemon/noctowl/icon.4bpp");
+const u8 gMonFootprint_Noctowl[] = INCBIN_U8("graphics/pokemon/noctowl/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/front.4bpp.lz");
+const u32 gMonPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/normal.gbapal.lz");
+const u32 gMonBackPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/back.4bpp.lz");
+const u32 gMonShinyPalette_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/shiny.gbapal.lz");
+const u8 gMonIcon_Ledyba[] = INCBIN_U8("graphics/pokemon/ledyba/icon.4bpp");
+const u8 gMonFootprint_Ledyba[] = INCBIN_U8("graphics/pokemon/ledyba/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/front.4bpp.lz");
+const u32 gMonPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/normal.gbapal.lz");
+const u32 gMonBackPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/back.4bpp.lz");
+const u32 gMonShinyPalette_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/shiny.gbapal.lz");
+const u8 gMonIcon_Ledian[] = INCBIN_U8("graphics/pokemon/ledian/icon.4bpp");
+const u8 gMonFootprint_Ledian[] = INCBIN_U8("graphics/pokemon/ledian/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/front.4bpp.lz");
+const u32 gMonPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/normal.gbapal.lz");
+const u32 gMonBackPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/back.4bpp.lz");
+const u32 gMonShinyPalette_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/shiny.gbapal.lz");
+const u8 gMonIcon_Spinarak[] = INCBIN_U8("graphics/pokemon/spinarak/icon.4bpp");
+const u8 gMonFootprint_Spinarak[] = INCBIN_U8("graphics/pokemon/spinarak/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/front.4bpp.lz");
+const u32 gMonPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/normal.gbapal.lz");
+const u32 gMonBackPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/back.4bpp.lz");
+const u32 gMonShinyPalette_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/shiny.gbapal.lz");
+const u8 gMonIcon_Ariados[] = INCBIN_U8("graphics/pokemon/ariados/icon.4bpp");
+const u8 gMonFootprint_Ariados[] = INCBIN_U8("graphics/pokemon/ariados/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/front.4bpp.lz");
+const u32 gMonPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/normal.gbapal.lz");
+const u32 gMonBackPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/back.4bpp.lz");
+const u32 gMonShinyPalette_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/shiny.gbapal.lz");
+const u8 gMonIcon_Crobat[] = INCBIN_U8("graphics/pokemon/crobat/icon.4bpp");
+const u8 gMonFootprint_Crobat[] = INCBIN_U8("graphics/pokemon/crobat/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/front.4bpp.lz");
+const u32 gMonPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/normal.gbapal.lz");
+const u32 gMonBackPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/back.4bpp.lz");
+const u32 gMonShinyPalette_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/shiny.gbapal.lz");
+const u8 gMonIcon_Chinchou[] = INCBIN_U8("graphics/pokemon/chinchou/icon.4bpp");
+const u8 gMonFootprint_Chinchou[] = INCBIN_U8("graphics/pokemon/chinchou/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/front.4bpp.lz");
+const u32 gMonPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/normal.gbapal.lz");
+const u32 gMonBackPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/back.4bpp.lz");
+const u32 gMonShinyPalette_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/shiny.gbapal.lz");
+const u8 gMonIcon_Lanturn[] = INCBIN_U8("graphics/pokemon/lanturn/icon.4bpp");
+const u8 gMonFootprint_Lanturn[] = INCBIN_U8("graphics/pokemon/lanturn/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/front.4bpp.lz");
+const u32 gMonPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/normal.gbapal.lz");
+const u32 gMonBackPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/back.4bpp.lz");
+const u32 gMonShinyPalette_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/shiny.gbapal.lz");
+const u8 gMonIcon_Pichu[] = INCBIN_U8("graphics/pokemon/pichu/icon.4bpp");
+const u8 gMonFootprint_Pichu[] = INCBIN_U8("graphics/pokemon/pichu/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/front.4bpp.lz");
+const u32 gMonPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/normal.gbapal.lz");
+const u32 gMonBackPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/back.4bpp.lz");
+const u32 gMonShinyPalette_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/shiny.gbapal.lz");
+const u8 gMonIcon_Cleffa[] = INCBIN_U8("graphics/pokemon/cleffa/icon.4bpp");
+const u8 gMonFootprint_Cleffa[] = INCBIN_U8("graphics/pokemon/cleffa/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/front.4bpp.lz");
+const u32 gMonPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/normal.gbapal.lz");
+const u32 gMonBackPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/back.4bpp.lz");
+const u32 gMonShinyPalette_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/shiny.gbapal.lz");
+const u8 gMonIcon_Igglybuff[] = INCBIN_U8("graphics/pokemon/igglybuff/icon.4bpp");
+const u8 gMonFootprint_Igglybuff[] = INCBIN_U8("graphics/pokemon/igglybuff/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/front.4bpp.lz");
+const u32 gMonPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/normal.gbapal.lz");
+const u32 gMonBackPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/back.4bpp.lz");
+const u32 gMonShinyPalette_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/shiny.gbapal.lz");
+const u8 gMonIcon_Togepi[] = INCBIN_U8("graphics/pokemon/togepi/icon.4bpp");
+const u8 gMonFootprint_Togepi[] = INCBIN_U8("graphics/pokemon/togepi/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/front.4bpp.lz");
+const u32 gMonPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/normal.gbapal.lz");
+const u32 gMonBackPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/back.4bpp.lz");
+const u32 gMonShinyPalette_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/shiny.gbapal.lz");
+const u8 gMonIcon_Togetic[] = INCBIN_U8("graphics/pokemon/togetic/icon.4bpp");
+const u8 gMonFootprint_Togetic[] = INCBIN_U8("graphics/pokemon/togetic/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/front.4bpp.lz");
+const u32 gMonPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/normal.gbapal.lz");
+const u32 gMonBackPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/back.4bpp.lz");
+const u32 gMonShinyPalette_Natu[] = INCBIN_U32("graphics/pokemon/natu/shiny.gbapal.lz");
+const u8 gMonIcon_Natu[] = INCBIN_U8("graphics/pokemon/natu/icon.4bpp");
+const u8 gMonFootprint_Natu[] = INCBIN_U8("graphics/pokemon/natu/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/front.4bpp.lz");
+const u32 gMonPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/normal.gbapal.lz");
+const u32 gMonBackPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/back.4bpp.lz");
+const u32 gMonShinyPalette_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/shiny.gbapal.lz");
+const u8 gMonIcon_Xatu[] = INCBIN_U8("graphics/pokemon/xatu/icon.4bpp");
+const u8 gMonFootprint_Xatu[] = INCBIN_U8("graphics/pokemon/xatu/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/front.4bpp.lz");
+const u32 gMonPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/normal.gbapal.lz");
+const u32 gMonBackPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/back.4bpp.lz");
+const u32 gMonShinyPalette_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/shiny.gbapal.lz");
+const u8 gMonIcon_Mareep[] = INCBIN_U8("graphics/pokemon/mareep/icon.4bpp");
+const u8 gMonFootprint_Mareep[] = INCBIN_U8("graphics/pokemon/mareep/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/front.4bpp.lz");
+const u32 gMonPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/normal.gbapal.lz");
+const u32 gMonBackPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/back.4bpp.lz");
+const u32 gMonShinyPalette_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/shiny.gbapal.lz");
+const u8 gMonIcon_Flaaffy[] = INCBIN_U8("graphics/pokemon/flaaffy/icon.4bpp");
+const u8 gMonFootprint_Flaaffy[] = INCBIN_U8("graphics/pokemon/flaaffy/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/front.4bpp.lz");
+const u32 gMonPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/normal.gbapal.lz");
+const u32 gMonBackPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/back.4bpp.lz");
+const u32 gMonShinyPalette_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/shiny.gbapal.lz");
+const u8 gMonIcon_Ampharos[] = INCBIN_U8("graphics/pokemon/ampharos/icon.4bpp");
+const u8 gMonFootprint_Ampharos[] = INCBIN_U8("graphics/pokemon/ampharos/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/front.4bpp.lz");
+const u32 gMonPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/normal.gbapal.lz");
+const u32 gMonBackPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/back.4bpp.lz");
+const u32 gMonShinyPalette_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/shiny.gbapal.lz");
+const u8 gMonIcon_Bellossom[] = INCBIN_U8("graphics/pokemon/bellossom/icon.4bpp");
+const u8 gMonFootprint_Bellossom[] = INCBIN_U8("graphics/pokemon/bellossom/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/front.4bpp.lz");
+const u32 gMonPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/normal.gbapal.lz");
+const u32 gMonBackPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/back.4bpp.lz");
+const u32 gMonShinyPalette_Marill[] = INCBIN_U32("graphics/pokemon/marill/shiny.gbapal.lz");
+const u8 gMonIcon_Marill[] = INCBIN_U8("graphics/pokemon/marill/icon.4bpp");
+const u8 gMonFootprint_Marill[] = INCBIN_U8("graphics/pokemon/marill/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/front.4bpp.lz");
+const u32 gMonPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/normal.gbapal.lz");
+const u32 gMonBackPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/back.4bpp.lz");
+const u32 gMonShinyPalette_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/shiny.gbapal.lz");
+const u8 gMonIcon_Azumarill[] = INCBIN_U8("graphics/pokemon/azumarill/icon.4bpp");
+const u8 gMonFootprint_Azumarill[] = INCBIN_U8("graphics/pokemon/azumarill/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/front.4bpp.lz");
+const u32 gMonPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/normal.gbapal.lz");
+const u32 gMonBackPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/back.4bpp.lz");
+const u32 gMonShinyPalette_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/shiny.gbapal.lz");
+const u8 gMonIcon_Sudowoodo[] = INCBIN_U8("graphics/pokemon/sudowoodo/icon.4bpp");
+const u8 gMonFootprint_Sudowoodo[] = INCBIN_U8("graphics/pokemon/sudowoodo/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/front.4bpp.lz");
+const u32 gMonPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/normal.gbapal.lz");
+const u32 gMonBackPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/back.4bpp.lz");
+const u32 gMonShinyPalette_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/shiny.gbapal.lz");
+const u8 gMonIcon_Politoed[] = INCBIN_U8("graphics/pokemon/politoed/icon.4bpp");
+const u8 gMonFootprint_Politoed[] = INCBIN_U8("graphics/pokemon/politoed/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/front.4bpp.lz");
+const u32 gMonPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/normal.gbapal.lz");
+const u32 gMonBackPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/back.4bpp.lz");
+const u32 gMonShinyPalette_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/shiny.gbapal.lz");
+const u8 gMonIcon_Hoppip[] = INCBIN_U8("graphics/pokemon/hoppip/icon.4bpp");
+const u8 gMonFootprint_Hoppip[] = INCBIN_U8("graphics/pokemon/hoppip/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/front.4bpp.lz");
+const u32 gMonPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/normal.gbapal.lz");
+const u32 gMonBackPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/back.4bpp.lz");
+const u32 gMonShinyPalette_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/shiny.gbapal.lz");
+const u8 gMonIcon_Skiploom[] = INCBIN_U8("graphics/pokemon/skiploom/icon.4bpp");
+const u8 gMonFootprint_Skiploom[] = INCBIN_U8("graphics/pokemon/skiploom/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/front.4bpp.lz");
+const u32 gMonPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/normal.gbapal.lz");
+const u32 gMonBackPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/back.4bpp.lz");
+const u32 gMonShinyPalette_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/shiny.gbapal.lz");
+const u8 gMonIcon_Jumpluff[] = INCBIN_U8("graphics/pokemon/jumpluff/icon.4bpp");
+const u8 gMonFootprint_Jumpluff[] = INCBIN_U8("graphics/pokemon/jumpluff/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/front.4bpp.lz");
+const u32 gMonPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/normal.gbapal.lz");
+const u32 gMonBackPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/back.4bpp.lz");
+const u32 gMonShinyPalette_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/shiny.gbapal.lz");
+const u8 gMonIcon_Aipom[] = INCBIN_U8("graphics/pokemon/aipom/icon.4bpp");
+const u8 gMonFootprint_Aipom[] = INCBIN_U8("graphics/pokemon/aipom/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/front.4bpp.lz");
+const u32 gMonPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/normal.gbapal.lz");
+const u32 gMonBackPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/back.4bpp.lz");
+const u32 gMonShinyPalette_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/shiny.gbapal.lz");
+const u8 gMonIcon_Sunkern[] = INCBIN_U8("graphics/pokemon/sunkern/icon.4bpp");
+const u8 gMonFootprint_Sunkern[] = INCBIN_U8("graphics/pokemon/sunkern/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/front.4bpp.lz");
+const u32 gMonPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/normal.gbapal.lz");
+const u32 gMonBackPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/back.4bpp.lz");
+const u32 gMonShinyPalette_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/shiny.gbapal.lz");
+const u8 gMonIcon_Sunflora[] = INCBIN_U8("graphics/pokemon/sunflora/icon.4bpp");
+const u8 gMonFootprint_Sunflora[] = INCBIN_U8("graphics/pokemon/sunflora/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/front.4bpp.lz");
+const u32 gMonPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/normal.gbapal.lz");
+const u32 gMonBackPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/back.4bpp.lz");
+const u32 gMonShinyPalette_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/shiny.gbapal.lz");
+const u8 gMonIcon_Yanma[] = INCBIN_U8("graphics/pokemon/yanma/icon.4bpp");
+const u8 gMonFootprint_Yanma[] = INCBIN_U8("graphics/pokemon/yanma/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/front.4bpp.lz");
+const u32 gMonPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/normal.gbapal.lz");
+const u32 gMonBackPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/back.4bpp.lz");
+const u32 gMonShinyPalette_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/shiny.gbapal.lz");
+const u8 gMonIcon_Wooper[] = INCBIN_U8("graphics/pokemon/wooper/icon.4bpp");
+const u8 gMonFootprint_Wooper[] = INCBIN_U8("graphics/pokemon/wooper/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/front.4bpp.lz");
+const u32 gMonPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/normal.gbapal.lz");
+const u32 gMonBackPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/back.4bpp.lz");
+const u32 gMonShinyPalette_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/shiny.gbapal.lz");
+const u8 gMonIcon_Quagsire[] = INCBIN_U8("graphics/pokemon/quagsire/icon.4bpp");
+const u8 gMonFootprint_Quagsire[] = INCBIN_U8("graphics/pokemon/quagsire/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/front.4bpp.lz");
+const u32 gMonPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/normal.gbapal.lz");
+const u32 gMonBackPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/back.4bpp.lz");
+const u32 gMonShinyPalette_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/shiny.gbapal.lz");
+const u8 gMonIcon_Espeon[] = INCBIN_U8("graphics/pokemon/espeon/icon.4bpp");
+const u8 gMonFootprint_Espeon[] = INCBIN_U8("graphics/pokemon/espeon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/front.4bpp.lz");
+const u32 gMonPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/normal.gbapal.lz");
+const u32 gMonBackPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/back.4bpp.lz");
+const u32 gMonShinyPalette_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/shiny.gbapal.lz");
+const u8 gMonIcon_Umbreon[] = INCBIN_U8("graphics/pokemon/umbreon/icon.4bpp");
+const u8 gMonFootprint_Umbreon[] = INCBIN_U8("graphics/pokemon/umbreon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/front.4bpp.lz");
+const u32 gMonPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/normal.gbapal.lz");
+const u32 gMonBackPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/back.4bpp.lz");
+const u32 gMonShinyPalette_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/shiny.gbapal.lz");
+const u8 gMonIcon_Murkrow[] = INCBIN_U8("graphics/pokemon/murkrow/icon.4bpp");
+const u8 gMonFootprint_Murkrow[] = INCBIN_U8("graphics/pokemon/murkrow/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/front.4bpp.lz");
+const u32 gMonPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/normal.gbapal.lz");
+const u32 gMonBackPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/back.4bpp.lz");
+const u32 gMonShinyPalette_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/shiny.gbapal.lz");
+const u8 gMonIcon_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/icon.4bpp");
+const u8 gMonFootprint_Slowking[] = INCBIN_U8("graphics/pokemon/slowking/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/front.4bpp.lz");
+const u32 gMonPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/normal.gbapal.lz");
+const u32 gMonBackPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/back.4bpp.lz");
+const u32 gMonShinyPalette_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/shiny.gbapal.lz");
+const u8 gMonIcon_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/icon.4bpp");
+const u8 gMonFootprint_Misdreavus[] = INCBIN_U8("graphics/pokemon/misdreavus/footprint.1bpp");
+
+const u32 gMonStillFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/front_a.4bpp.lz");
+const u32 gMonPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/normal.gbapal.lz");
+const u32 gMonBackPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/back_a.4bpp.lz");
+const u32 gMonShinyPalette_Unown[] = INCBIN_U32("graphics/pokemon/unown/shiny.gbapal.lz");
+const u8 gMonIcon_UnownA[] = INCBIN_U8("graphics/pokemon/unown/icon_a.4bpp");
+const u8 gMonFootprint_Unown[] = INCBIN_U8("graphics/pokemon/unown/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/front.4bpp.lz");
+const u32 gMonPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/normal.gbapal.lz");
+const u32 gMonBackPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/back.4bpp.lz");
+const u32 gMonShinyPalette_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/shiny.gbapal.lz");
+const u8 gMonIcon_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/icon.4bpp");
+const u8 gMonFootprint_Wobbuffet[] = INCBIN_U8("graphics/pokemon/wobbuffet/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/front.4bpp.lz");
+const u32 gMonPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/normal.gbapal.lz");
+const u32 gMonBackPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/back.4bpp.lz");
+const u32 gMonShinyPalette_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/shiny.gbapal.lz");
+const u8 gMonIcon_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/icon.4bpp");
+const u8 gMonFootprint_Girafarig[] = INCBIN_U8("graphics/pokemon/girafarig/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/front.4bpp.lz");
+const u32 gMonPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/normal.gbapal.lz");
+const u32 gMonBackPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/back.4bpp.lz");
+const u32 gMonShinyPalette_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/shiny.gbapal.lz");
+const u8 gMonIcon_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/icon.4bpp");
+const u8 gMonFootprint_Pineco[] = INCBIN_U8("graphics/pokemon/pineco/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/front.4bpp.lz");
+const u32 gMonPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/normal.gbapal.lz");
+const u32 gMonBackPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/back.4bpp.lz");
+const u32 gMonShinyPalette_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/shiny.gbapal.lz");
+const u8 gMonIcon_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/icon.4bpp");
+const u8 gMonFootprint_Forretress[] = INCBIN_U8("graphics/pokemon/forretress/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/front.4bpp.lz");
+const u32 gMonPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/normal.gbapal.lz");
+const u32 gMonBackPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/back.4bpp.lz");
+const u32 gMonShinyPalette_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/shiny.gbapal.lz");
+const u8 gMonIcon_Dunsparce[] = INCBIN_U8("graphics/pokemon/dunsparce/icon.4bpp");
+const u8 gMonFootprint_Dunsparce[] = INCBIN_U8("graphics/pokemon/dunsparce/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/front.4bpp.lz");
+const u32 gMonPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/normal.gbapal.lz");
+const u32 gMonBackPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/back.4bpp.lz");
+const u32 gMonShinyPalette_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/shiny.gbapal.lz");
+const u8 gMonIcon_Gligar[] = INCBIN_U8("graphics/pokemon/gligar/icon.4bpp");
+const u8 gMonFootprint_Gligar[] = INCBIN_U8("graphics/pokemon/gligar/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/front.4bpp.lz");
+const u32 gMonPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/normal.gbapal.lz");
+const u32 gMonBackPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/back.4bpp.lz");
+const u32 gMonShinyPalette_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/shiny.gbapal.lz");
+const u8 gMonIcon_Steelix[] = INCBIN_U8("graphics/pokemon/steelix/icon.4bpp");
+const u8 gMonFootprint_Steelix[] = INCBIN_U8("graphics/pokemon/steelix/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/front.4bpp.lz");
+const u32 gMonPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/normal.gbapal.lz");
+const u32 gMonBackPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/back.4bpp.lz");
+const u32 gMonShinyPalette_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/shiny.gbapal.lz");
+const u8 gMonIcon_Snubbull[] = INCBIN_U8("graphics/pokemon/snubbull/icon.4bpp");
+const u8 gMonFootprint_Snubbull[] = INCBIN_U8("graphics/pokemon/snubbull/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/front.4bpp.lz");
+const u32 gMonPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/normal.gbapal.lz");
+const u32 gMonBackPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/back.4bpp.lz");
+const u32 gMonShinyPalette_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/shiny.gbapal.lz");
+const u8 gMonIcon_Granbull[] = INCBIN_U8("graphics/pokemon/granbull/icon.4bpp");
+const u8 gMonFootprint_Granbull[] = INCBIN_U8("graphics/pokemon/granbull/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/front.4bpp.lz");
+const u32 gMonPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/normal.gbapal.lz");
+const u32 gMonBackPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/back.4bpp.lz");
+const u32 gMonShinyPalette_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/shiny.gbapal.lz");
+const u8 gMonIcon_Qwilfish[] = INCBIN_U8("graphics/pokemon/qwilfish/icon.4bpp");
+const u8 gMonFootprint_Qwilfish[] = INCBIN_U8("graphics/pokemon/qwilfish/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/front.4bpp.lz");
+const u32 gMonPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/normal.gbapal.lz");
+const u32 gMonBackPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/back.4bpp.lz");
+const u32 gMonShinyPalette_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/shiny.gbapal.lz");
+const u8 gMonIcon_Scizor[] = INCBIN_U8("graphics/pokemon/scizor/icon.4bpp");
+const u8 gMonFootprint_Scizor[] = INCBIN_U8("graphics/pokemon/scizor/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/front.4bpp.lz");
+const u32 gMonPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/normal.gbapal.lz");
+const u32 gMonBackPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/back.4bpp.lz");
+const u32 gMonShinyPalette_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/shiny.gbapal.lz");
+const u8 gMonIcon_Shuckle[] = INCBIN_U8("graphics/pokemon/shuckle/icon.4bpp");
+const u8 gMonFootprint_Shuckle[] = INCBIN_U8("graphics/pokemon/shuckle/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/front.4bpp.lz");
+const u32 gMonPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/normal.gbapal.lz");
+const u32 gMonBackPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/back.4bpp.lz");
+const u32 gMonShinyPalette_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/shiny.gbapal.lz");
+const u8 gMonIcon_Heracross[] = INCBIN_U8("graphics/pokemon/heracross/icon.4bpp");
+const u8 gMonFootprint_Heracross[] = INCBIN_U8("graphics/pokemon/heracross/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/front.4bpp.lz");
+const u32 gMonPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/normal.gbapal.lz");
+const u32 gMonBackPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/back.4bpp.lz");
+const u32 gMonShinyPalette_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/shiny.gbapal.lz");
+const u8 gMonIcon_Sneasel[] = INCBIN_U8("graphics/pokemon/sneasel/icon.4bpp");
+const u8 gMonFootprint_Sneasel[] = INCBIN_U8("graphics/pokemon/sneasel/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/front.4bpp.lz");
+const u32 gMonPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/normal.gbapal.lz");
+const u32 gMonBackPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/back.4bpp.lz");
+const u32 gMonShinyPalette_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/shiny.gbapal.lz");
+const u8 gMonIcon_Teddiursa[] = INCBIN_U8("graphics/pokemon/teddiursa/icon.4bpp");
+const u8 gMonFootprint_Teddiursa[] = INCBIN_U8("graphics/pokemon/teddiursa/footprint.1bpp");
+const u32 gMonStillFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/front.4bpp.lz");
+const u32 gMonPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/normal.gbapal.lz");
+const u32 gMonBackPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/back.4bpp.lz");
+const u32 gMonShinyPalette_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/shiny.gbapal.lz");
+const u8 gMonIcon_Ursaring[] = INCBIN_U8("graphics/pokemon/ursaring/icon.4bpp");
+const u8 gMonFootprint_Ursaring[] = INCBIN_U8("graphics/pokemon/ursaring/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/front.4bpp.lz");
+const u32 gMonPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/normal.gbapal.lz");
+const u32 gMonBackPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/back.4bpp.lz");
+const u32 gMonShinyPalette_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/shiny.gbapal.lz");
+const u8 gMonIcon_Slugma[] = INCBIN_U8("graphics/pokemon/slugma/icon.4bpp");
+const u8 gMonFootprint_Slugma[] = INCBIN_U8("graphics/pokemon/slugma/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/front.4bpp.lz");
+const u32 gMonPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/normal.gbapal.lz");
+const u32 gMonBackPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/back.4bpp.lz");
+const u32 gMonShinyPalette_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/shiny.gbapal.lz");
+const u8 gMonIcon_Magcargo[] = INCBIN_U8("graphics/pokemon/magcargo/icon.4bpp");
+const u8 gMonFootprint_Magcargo[] = INCBIN_U8("graphics/pokemon/magcargo/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/front.4bpp.lz");
+const u32 gMonPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/normal.gbapal.lz");
+const u32 gMonBackPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/back.4bpp.lz");
+const u32 gMonShinyPalette_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/shiny.gbapal.lz");
+const u8 gMonIcon_Swinub[] = INCBIN_U8("graphics/pokemon/swinub/icon.4bpp");
+const u8 gMonFootprint_Swinub[] = INCBIN_U8("graphics/pokemon/swinub/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/front.4bpp.lz");
+const u32 gMonPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/normal.gbapal.lz");
+const u32 gMonBackPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/back.4bpp.lz");
+const u32 gMonShinyPalette_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/shiny.gbapal.lz");
+const u8 gMonIcon_Piloswine[] = INCBIN_U8("graphics/pokemon/piloswine/icon.4bpp");
+const u8 gMonFootprint_Piloswine[] = INCBIN_U8("graphics/pokemon/piloswine/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/front.4bpp.lz");
+const u32 gMonPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/normal.gbapal.lz");
+const u32 gMonBackPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/back.4bpp.lz");
+const u32 gMonShinyPalette_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/shiny.gbapal.lz");
+const u8 gMonIcon_Corsola[] = INCBIN_U8("graphics/pokemon/corsola/icon.4bpp");
+const u8 gMonFootprint_Corsola[] = INCBIN_U8("graphics/pokemon/corsola/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/front.4bpp.lz");
+const u32 gMonPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/normal.gbapal.lz");
+const u32 gMonBackPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/back.4bpp.lz");
+const u32 gMonShinyPalette_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/shiny.gbapal.lz");
+const u8 gMonIcon_Remoraid[] = INCBIN_U8("graphics/pokemon/remoraid/icon.4bpp");
+const u8 gMonFootprint_Remoraid[] = INCBIN_U8("graphics/pokemon/remoraid/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/front.4bpp.lz");
+const u32 gMonPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/normal.gbapal.lz");
+const u32 gMonBackPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/back.4bpp.lz");
+const u32 gMonShinyPalette_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/shiny.gbapal.lz");
+const u8 gMonIcon_Octillery[] = INCBIN_U8("graphics/pokemon/octillery/icon.4bpp");
+const u8 gMonFootprint_Octillery[] = INCBIN_U8("graphics/pokemon/octillery/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/front.4bpp.lz");
+const u32 gMonPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/normal.gbapal.lz");
+const u32 gMonBackPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/back.4bpp.lz");
+const u32 gMonShinyPalette_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/shiny.gbapal.lz");
+const u8 gMonIcon_Delibird[] = INCBIN_U8("graphics/pokemon/delibird/icon.4bpp");
+const u8 gMonFootprint_Delibird[] = INCBIN_U8("graphics/pokemon/delibird/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/front.4bpp.lz");
+const u32 gMonPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/normal.gbapal.lz");
+const u32 gMonBackPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/back.4bpp.lz");
+const u32 gMonShinyPalette_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/shiny.gbapal.lz");
+const u8 gMonIcon_Mantine[] = INCBIN_U8("graphics/pokemon/mantine/icon.4bpp");
+const u8 gMonFootprint_Mantine[] = INCBIN_U8("graphics/pokemon/mantine/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/front.4bpp.lz");
+const u32 gMonPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/normal.gbapal.lz");
+const u32 gMonBackPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/back.4bpp.lz");
+const u32 gMonShinyPalette_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/shiny.gbapal.lz");
+const u8 gMonIcon_Skarmory[] = INCBIN_U8("graphics/pokemon/skarmory/icon.4bpp");
+const u8 gMonFootprint_Skarmory[] = INCBIN_U8("graphics/pokemon/skarmory/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/front.4bpp.lz");
+const u32 gMonPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/normal.gbapal.lz");
+const u32 gMonBackPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/back.4bpp.lz");
+const u32 gMonShinyPalette_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/shiny.gbapal.lz");
+const u8 gMonIcon_Houndour[] = INCBIN_U8("graphics/pokemon/houndour/icon.4bpp");
+const u8 gMonFootprint_Houndour[] = INCBIN_U8("graphics/pokemon/houndour/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/front.4bpp.lz");
+const u32 gMonPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/normal.gbapal.lz");
+const u32 gMonBackPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/back.4bpp.lz");
+const u32 gMonShinyPalette_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/shiny.gbapal.lz");
+const u8 gMonIcon_Houndoom[] = INCBIN_U8("graphics/pokemon/houndoom/icon.4bpp");
+const u8 gMonFootprint_Houndoom[] = INCBIN_U8("graphics/pokemon/houndoom/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/front.4bpp.lz");
+const u32 gMonPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/normal.gbapal.lz");
+const u32 gMonBackPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/back.4bpp.lz");
+const u32 gMonShinyPalette_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/shiny.gbapal.lz");
+const u8 gMonIcon_Kingdra[] = INCBIN_U8("graphics/pokemon/kingdra/icon.4bpp");
+const u8 gMonFootprint_Kingdra[] = INCBIN_U8("graphics/pokemon/kingdra/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/front.4bpp.lz");
+const u32 gMonPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/normal.gbapal.lz");
+const u32 gMonBackPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/back.4bpp.lz");
+const u32 gMonShinyPalette_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/shiny.gbapal.lz");
+const u8 gMonIcon_Phanpy[] = INCBIN_U8("graphics/pokemon/phanpy/icon.4bpp");
+const u8 gMonFootprint_Phanpy[] = INCBIN_U8("graphics/pokemon/phanpy/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/front.4bpp.lz");
+const u32 gMonPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/normal.gbapal.lz");
+const u32 gMonBackPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/back.4bpp.lz");
+const u32 gMonShinyPalette_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/shiny.gbapal.lz");
+const u8 gMonIcon_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/icon.4bpp");
+const u8 gMonFootprint_Donphan[] = INCBIN_U8("graphics/pokemon/donphan/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/front.4bpp.lz");
+const u32 gMonPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/normal.gbapal.lz");
+const u32 gMonBackPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/back.4bpp.lz");
+const u32 gMonShinyPalette_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/shiny.gbapal.lz");
+const u8 gMonIcon_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/icon.4bpp");
+const u8 gMonFootprint_Porygon2[] = INCBIN_U8("graphics/pokemon/porygon2/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/front.4bpp.lz");
+const u32 gMonPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/normal.gbapal.lz");
+const u32 gMonBackPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/back.4bpp.lz");
+const u32 gMonShinyPalette_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/shiny.gbapal.lz");
+const u8 gMonIcon_Stantler[] = INCBIN_U8("graphics/pokemon/stantler/icon.4bpp");
+const u8 gMonFootprint_Stantler[] = INCBIN_U8("graphics/pokemon/stantler/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/front.4bpp.lz");
+const u32 gMonPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/normal.gbapal.lz");
+const u32 gMonBackPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/back.4bpp.lz");
+const u32 gMonShinyPalette_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/shiny.gbapal.lz");
+const u8 gMonIcon_Smeargle[] = INCBIN_U8("graphics/pokemon/smeargle/icon.4bpp");
+const u8 gMonFootprint_Smeargle[] = INCBIN_U8("graphics/pokemon/smeargle/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/front.4bpp.lz");
+const u32 gMonPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/normal.gbapal.lz");
+const u32 gMonBackPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/back.4bpp.lz");
+const u32 gMonShinyPalette_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/shiny.gbapal.lz");
+const u8 gMonIcon_Tyrogue[] = INCBIN_U8("graphics/pokemon/tyrogue/icon.4bpp");
+const u8 gMonFootprint_Tyrogue[] = INCBIN_U8("graphics/pokemon/tyrogue/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/front.4bpp.lz");
+const u32 gMonPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/normal.gbapal.lz");
+const u32 gMonBackPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/back.4bpp.lz");
+const u32 gMonShinyPalette_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/shiny.gbapal.lz");
+const u8 gMonIcon_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/icon.4bpp");
+const u8 gMonFootprint_Hitmontop[] = INCBIN_U8("graphics/pokemon/hitmontop/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/front.4bpp.lz");
+const u32 gMonPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/normal.gbapal.lz");
+const u32 gMonBackPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/back.4bpp.lz");
+const u32 gMonShinyPalette_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/shiny.gbapal.lz");
+const u8 gMonIcon_Smoochum[] = INCBIN_U8("graphics/pokemon/smoochum/icon.4bpp");
+const u8 gMonFootprint_Smoochum[] = INCBIN_U8("graphics/pokemon/smoochum/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/front.4bpp.lz");
+const u32 gMonPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/normal.gbapal.lz");
+const u32 gMonBackPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/back.4bpp.lz");
+const u32 gMonShinyPalette_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/shiny.gbapal.lz");
+const u8 gMonIcon_Elekid[] = INCBIN_U8("graphics/pokemon/elekid/icon.4bpp");
+const u8 gMonFootprint_Elekid[] = INCBIN_U8("graphics/pokemon/elekid/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/front.4bpp.lz");
+const u32 gMonPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/normal.gbapal.lz");
+const u32 gMonBackPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/back.4bpp.lz");
+const u32 gMonShinyPalette_Magby[] = INCBIN_U32("graphics/pokemon/magby/shiny.gbapal.lz");
+const u8 gMonIcon_Magby[] = INCBIN_U8("graphics/pokemon/magby/icon.4bpp");
+const u8 gMonFootprint_Magby[] = INCBIN_U8("graphics/pokemon/magby/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/front.4bpp.lz");
+const u32 gMonPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/normal.gbapal.lz");
+const u32 gMonBackPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/back.4bpp.lz");
+const u32 gMonShinyPalette_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/shiny.gbapal.lz");
+const u8 gMonIcon_Miltank[] = INCBIN_U8("graphics/pokemon/miltank/icon.4bpp");
+const u8 gMonFootprint_Miltank[] = INCBIN_U8("graphics/pokemon/miltank/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/front.4bpp.lz");
+const u32 gMonPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/normal.gbapal.lz");
+const u32 gMonBackPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/back.4bpp.lz");
+const u32 gMonShinyPalette_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/shiny.gbapal.lz");
+const u8 gMonIcon_Blissey[] = INCBIN_U8("graphics/pokemon/blissey/icon.4bpp");
+const u8 gMonFootprint_Blissey[] = INCBIN_U8("graphics/pokemon/blissey/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/front.4bpp.lz");
+const u32 gMonPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/normal.gbapal.lz");
+const u32 gMonBackPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/back.4bpp.lz");
+const u32 gMonShinyPalette_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/shiny.gbapal.lz");
+const u8 gMonIcon_Raikou[] = INCBIN_U8("graphics/pokemon/raikou/icon.4bpp");
+const u8 gMonFootprint_Raikou[] = INCBIN_U8("graphics/pokemon/raikou/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/front.4bpp.lz");
+const u32 gMonPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/normal.gbapal.lz");
+const u32 gMonBackPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/back.4bpp.lz");
+const u32 gMonShinyPalette_Entei[] = INCBIN_U32("graphics/pokemon/entei/shiny.gbapal.lz");
+const u8 gMonIcon_Entei[] = INCBIN_U8("graphics/pokemon/entei/icon.4bpp");
+const u8 gMonFootprint_Entei[] = INCBIN_U8("graphics/pokemon/entei/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/front.4bpp.lz");
+const u32 gMonPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/normal.gbapal.lz");
+const u32 gMonBackPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/back.4bpp.lz");
+const u32 gMonShinyPalette_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/shiny.gbapal.lz");
+const u8 gMonIcon_Suicune[] = INCBIN_U8("graphics/pokemon/suicune/icon.4bpp");
+const u8 gMonFootprint_Suicune[] = INCBIN_U8("graphics/pokemon/suicune/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/front.4bpp.lz");
+const u32 gMonPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/normal.gbapal.lz");
+const u32 gMonBackPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/back.4bpp.lz");
+const u32 gMonShinyPalette_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/shiny.gbapal.lz");
+const u8 gMonIcon_Larvitar[] = INCBIN_U8("graphics/pokemon/larvitar/icon.4bpp");
+const u8 gMonFootprint_Larvitar[] = INCBIN_U8("graphics/pokemon/larvitar/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/front.4bpp.lz");
+const u32 gMonPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/normal.gbapal.lz");
+const u32 gMonBackPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/back.4bpp.lz");
+const u32 gMonShinyPalette_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/shiny.gbapal.lz");
+const u8 gMonIcon_Pupitar[] = INCBIN_U8("graphics/pokemon/pupitar/icon.4bpp");
+const u8 gMonFootprint_Pupitar[] = INCBIN_U8("graphics/pokemon/pupitar/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/front.4bpp.lz");
+const u32 gMonPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/normal.gbapal.lz");
+const u32 gMonBackPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/back.4bpp.lz");
+const u32 gMonShinyPalette_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/shiny.gbapal.lz");
+const u8 gMonIcon_Tyranitar[] = INCBIN_U8("graphics/pokemon/tyranitar/icon.4bpp");
+const u8 gMonFootprint_Tyranitar[] = INCBIN_U8("graphics/pokemon/tyranitar/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/front.4bpp.lz");
+const u32 gMonPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/normal.gbapal.lz");
+const u32 gMonBackPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/back.4bpp.lz");
+const u32 gMonShinyPalette_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/shiny.gbapal.lz");
+const u8 gMonIcon_Lugia[] = INCBIN_U8("graphics/pokemon/lugia/icon.4bpp");
+const u8 gMonFootprint_Lugia[] = INCBIN_U8("graphics/pokemon/lugia/footprint.1bpp");
+
+const u32 gMonStillFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/front.4bpp.lz");
+const u32 gMonPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/normal.gbapal.lz");
+const u32 gMonBackPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/back.4bpp.lz");
+const u32 gMonShinyPalette_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/shiny.gbapal.lz");
+const u8 gMonIcon_HoOh[] = INCBIN_U8("graphics/pokemon/ho_oh/icon.4bpp");
+const u8 gMonFootprint_HoOh[] = INCBIN_U8("graphics/pokemon/ho_oh/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/front.4bpp.lz");
+const u32 gMonPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/normal.gbapal.lz");
+const u32 gMonBackPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/back.4bpp.lz");
+const u32 gMonShinyPalette_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/shiny.gbapal.lz");
+const u8 gMonIcon_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/icon.4bpp");
+const u8 gMonFootprint_Celebi[] = INCBIN_U8("graphics/pokemon/celebi/footprint.1bpp");
+
+const u32 gMonStillFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/front.4bpp.lz");
+const u32 gMonPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/normal.gbapal.lz");
+const u32 gMonBackPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/back.4bpp.lz");
+const u32 gMonShinyPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/shiny.gbapal.lz");
+
+const u32 gMonStillFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/front.4bpp.lz");
+const u32 gMonPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/normal.gbapal.lz");
+const u32 gMonBackPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/back.4bpp.lz");
+const u32 gMonShinyPalette_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/shiny.gbapal.lz");
+const u8 gMonIcon_Treecko[] = INCBIN_U8("graphics/pokemon/treecko/icon.4bpp");
+const u8 gMonFootprint_Treecko[] = INCBIN_U8("graphics/pokemon/treecko/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/front.4bpp.lz");
+const u32 gMonPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/normal.gbapal.lz");
+const u32 gMonBackPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/back.4bpp.lz");
+const u32 gMonShinyPalette_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/shiny.gbapal.lz");
+const u8 gMonIcon_Grovyle[] = INCBIN_U8("graphics/pokemon/grovyle/icon.4bpp");
+const u8 gMonFootprint_Grovyle[] = INCBIN_U8("graphics/pokemon/grovyle/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/front.4bpp.lz");
+const u32 gMonPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/normal.gbapal.lz");
+const u32 gMonBackPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/back.4bpp.lz");
+const u32 gMonShinyPalette_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/shiny.gbapal.lz");
+const u8 gMonIcon_Sceptile[] = INCBIN_U8("graphics/pokemon/sceptile/icon.4bpp");
+const u8 gMonFootprint_Sceptile[] = INCBIN_U8("graphics/pokemon/sceptile/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/front.4bpp.lz");
+const u32 gMonPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/normal.gbapal.lz");
+const u32 gMonBackPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/back.4bpp.lz");
+const u32 gMonShinyPalette_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/shiny.gbapal.lz");
+const u8 gMonIcon_Torchic[] = INCBIN_U8("graphics/pokemon/torchic/icon.4bpp");
+const u8 gMonFootprint_Torchic[] = INCBIN_U8("graphics/pokemon/torchic/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/front.4bpp.lz");
+const u32 gMonPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/normal.gbapal.lz");
+const u32 gMonBackPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/back.4bpp.lz");
+const u32 gMonShinyPalette_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/shiny.gbapal.lz");
+const u8 gMonIcon_Combusken[] = INCBIN_U8("graphics/pokemon/combusken/icon.4bpp");
+const u8 gMonFootprint_Combusken[] = INCBIN_U8("graphics/pokemon/combusken/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/front.4bpp.lz");
+const u32 gMonPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/normal.gbapal.lz");
+const u32 gMonBackPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/back.4bpp.lz");
+const u32 gMonShinyPalette_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/shiny.gbapal.lz");
+const u8 gMonIcon_Blaziken[] = INCBIN_U8("graphics/pokemon/blaziken/icon.4bpp");
+const u8 gMonFootprint_Blaziken[] = INCBIN_U8("graphics/pokemon/blaziken/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/front.4bpp.lz");
+const u32 gMonPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/normal.gbapal.lz");
+const u32 gMonBackPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/back.4bpp.lz");
+const u32 gMonShinyPalette_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/shiny.gbapal.lz");
+const u8 gMonIcon_Mudkip[] = INCBIN_U8("graphics/pokemon/mudkip/icon.4bpp");
+const u8 gMonFootprint_Mudkip[] = INCBIN_U8("graphics/pokemon/mudkip/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/front.4bpp.lz");
+const u32 gMonPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/normal.gbapal.lz");
+const u32 gMonBackPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/back.4bpp.lz");
+const u32 gMonShinyPalette_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/shiny.gbapal.lz");
+const u8 gMonIcon_Marshtomp[] = INCBIN_U8("graphics/pokemon/marshtomp/icon.4bpp");
+const u8 gMonFootprint_Marshtomp[] = INCBIN_U8("graphics/pokemon/marshtomp/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/front.4bpp.lz");
+const u32 gMonPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/normal.gbapal.lz");
+const u32 gMonBackPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/back.4bpp.lz");
+const u32 gMonShinyPalette_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/shiny.gbapal.lz");
+const u8 gMonIcon_Swampert[] = INCBIN_U8("graphics/pokemon/swampert/icon.4bpp");
+const u8 gMonFootprint_Swampert[] = INCBIN_U8("graphics/pokemon/swampert/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/front.4bpp.lz");
+const u32 gMonPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/normal.gbapal.lz");
+const u32 gMonBackPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/back.4bpp.lz");
+const u32 gMonShinyPalette_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/shiny.gbapal.lz");
+const u8 gMonIcon_Poochyena[] = INCBIN_U8("graphics/pokemon/poochyena/icon.4bpp");
+const u8 gMonFootprint_Poochyena[] = INCBIN_U8("graphics/pokemon/poochyena/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/front.4bpp.lz");
+const u32 gMonPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/normal.gbapal.lz");
+const u32 gMonBackPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/back.4bpp.lz");
+const u32 gMonShinyPalette_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/shiny.gbapal.lz");
+const u8 gMonIcon_Mightyena[] = INCBIN_U8("graphics/pokemon/mightyena/icon.4bpp");
+const u8 gMonFootprint_Mightyena[] = INCBIN_U8("graphics/pokemon/mightyena/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/front.4bpp.lz");
+const u32 gMonPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/normal.gbapal.lz");
+const u32 gMonBackPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/back.4bpp.lz");
+const u32 gMonShinyPalette_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/shiny.gbapal.lz");
+const u8 gMonIcon_Zigzagoon[] = INCBIN_U8("graphics/pokemon/zigzagoon/icon.4bpp");
+const u8 gMonFootprint_Zigzagoon[] = INCBIN_U8("graphics/pokemon/zigzagoon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/front.4bpp.lz");
+const u32 gMonPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/normal.gbapal.lz");
+const u32 gMonBackPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/back.4bpp.lz");
+const u32 gMonShinyPalette_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/shiny.gbapal.lz");
+const u8 gMonIcon_Linoone[] = INCBIN_U8("graphics/pokemon/linoone/icon.4bpp");
+const u8 gMonFootprint_Linoone[] = INCBIN_U8("graphics/pokemon/linoone/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/front.4bpp.lz");
+const u32 gMonPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/normal.gbapal.lz");
+const u32 gMonBackPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/back.4bpp.lz");
+const u32 gMonShinyPalette_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/shiny.gbapal.lz");
+const u8 gMonIcon_Wurmple[] = INCBIN_U8("graphics/pokemon/wurmple/icon.4bpp");
+const u8 gMonFootprint_Wurmple[] = INCBIN_U8("graphics/pokemon/wurmple/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/front.4bpp.lz");
+const u32 gMonPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/normal.gbapal.lz");
+const u32 gMonBackPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/back.4bpp.lz");
+const u32 gMonShinyPalette_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/shiny.gbapal.lz");
+const u8 gMonIcon_Silcoon[] = INCBIN_U8("graphics/pokemon/silcoon/icon.4bpp");
+const u8 gMonFootprint_Silcoon[] = INCBIN_U8("graphics/pokemon/silcoon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/front.4bpp.lz");
+const u32 gMonPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/normal.gbapal.lz");
+const u32 gMonBackPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/back.4bpp.lz");
+const u32 gMonShinyPalette_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/shiny.gbapal.lz");
+const u8 gMonIcon_Beautifly[] = INCBIN_U8("graphics/pokemon/beautifly/icon.4bpp");
+const u8 gMonFootprint_Beautifly[] = INCBIN_U8("graphics/pokemon/beautifly/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/front.4bpp.lz");
+const u32 gMonPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/normal.gbapal.lz");
+const u32 gMonBackPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/back.4bpp.lz");
+const u32 gMonShinyPalette_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/shiny.gbapal.lz");
+const u8 gMonIcon_Cascoon[] = INCBIN_U8("graphics/pokemon/cascoon/icon.4bpp");
+const u8 gMonFootprint_Cascoon[] = INCBIN_U8("graphics/pokemon/cascoon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/front.4bpp.lz");
+const u32 gMonPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/normal.gbapal.lz");
+const u32 gMonBackPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/back.4bpp.lz");
+const u32 gMonShinyPalette_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/shiny.gbapal.lz");
+const u8 gMonIcon_Dustox[] = INCBIN_U8("graphics/pokemon/dustox/icon.4bpp");
+const u8 gMonFootprint_Dustox[] = INCBIN_U8("graphics/pokemon/dustox/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/front.4bpp.lz");
+const u32 gMonPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/normal.gbapal.lz");
+const u32 gMonBackPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/back.4bpp.lz");
+const u32 gMonShinyPalette_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/shiny.gbapal.lz");
+const u8 gMonIcon_Lotad[] = INCBIN_U8("graphics/pokemon/lotad/icon.4bpp");
+const u8 gMonFootprint_Lotad[] = INCBIN_U8("graphics/pokemon/lotad/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/front.4bpp.lz");
+const u32 gMonPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/normal.gbapal.lz");
+const u32 gMonBackPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/back.4bpp.lz");
+const u32 gMonShinyPalette_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/shiny.gbapal.lz");
+const u8 gMonIcon_Lombre[] = INCBIN_U8("graphics/pokemon/lombre/icon.4bpp");
+const u8 gMonFootprint_Lombre[] = INCBIN_U8("graphics/pokemon/lombre/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/front.4bpp.lz");
+const u32 gMonPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/normal.gbapal.lz");
+const u32 gMonBackPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/back.4bpp.lz");
+const u32 gMonShinyPalette_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/shiny.gbapal.lz");
+const u8 gMonIcon_Ludicolo[] = INCBIN_U8("graphics/pokemon/ludicolo/icon.4bpp");
+const u8 gMonFootprint_Ludicolo[] = INCBIN_U8("graphics/pokemon/ludicolo/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/front.4bpp.lz");
+const u32 gMonPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/normal.gbapal.lz");
+const u32 gMonBackPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/back.4bpp.lz");
+const u32 gMonShinyPalette_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/shiny.gbapal.lz");
+const u8 gMonIcon_Seedot[] = INCBIN_U8("graphics/pokemon/seedot/icon.4bpp");
+const u8 gMonFootprint_Seedot[] = INCBIN_U8("graphics/pokemon/seedot/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/front.4bpp.lz");
+const u32 gMonPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/normal.gbapal.lz");
+const u32 gMonBackPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/back.4bpp.lz");
+const u32 gMonShinyPalette_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/shiny.gbapal.lz");
+const u8 gMonIcon_Nuzleaf[] = INCBIN_U8("graphics/pokemon/nuzleaf/icon.4bpp");
+const u8 gMonFootprint_Nuzleaf[] = INCBIN_U8("graphics/pokemon/nuzleaf/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/front.4bpp.lz");
+const u32 gMonPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/normal.gbapal.lz");
+const u32 gMonBackPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/back.4bpp.lz");
+const u32 gMonShinyPalette_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/shiny.gbapal.lz");
+const u8 gMonIcon_Shiftry[] = INCBIN_U8("graphics/pokemon/shiftry/icon.4bpp");
+const u8 gMonFootprint_Shiftry[] = INCBIN_U8("graphics/pokemon/shiftry/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/front.4bpp.lz");
+const u32 gMonPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/normal.gbapal.lz");
+const u32 gMonBackPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/back.4bpp.lz");
+const u32 gMonShinyPalette_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/shiny.gbapal.lz");
+const u8 gMonIcon_Nincada[] = INCBIN_U8("graphics/pokemon/nincada/icon.4bpp");
+const u8 gMonFootprint_Nincada[] = INCBIN_U8("graphics/pokemon/nincada/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/front.4bpp.lz");
+const u32 gMonPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/normal.gbapal.lz");
+const u32 gMonBackPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/back.4bpp.lz");
+const u32 gMonShinyPalette_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/shiny.gbapal.lz");
+const u8 gMonIcon_Ninjask[] = INCBIN_U8("graphics/pokemon/ninjask/icon.4bpp");
+const u8 gMonFootprint_Ninjask[] = INCBIN_U8("graphics/pokemon/ninjask/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/front.4bpp.lz");
+const u32 gMonPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/normal.gbapal.lz");
+const u32 gMonBackPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/back.4bpp.lz");
+const u32 gMonShinyPalette_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/shiny.gbapal.lz");
+const u8 gMonIcon_Shedinja[] = INCBIN_U8("graphics/pokemon/shedinja/icon.4bpp");
+const u8 gMonFootprint_Shedinja[] = INCBIN_U8("graphics/pokemon/shedinja/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/front.4bpp.lz");
+const u32 gMonPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/normal.gbapal.lz");
+const u32 gMonBackPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/back.4bpp.lz");
+const u32 gMonShinyPalette_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/shiny.gbapal.lz");
+const u8 gMonIcon_Taillow[] = INCBIN_U8("graphics/pokemon/taillow/icon.4bpp");
+const u8 gMonFootprint_Taillow[] = INCBIN_U8("graphics/pokemon/taillow/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/front.4bpp.lz");
+const u32 gMonPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/normal.gbapal.lz");
+const u32 gMonBackPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/back.4bpp.lz");
+const u32 gMonShinyPalette_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/shiny.gbapal.lz");
+const u8 gMonIcon_Swellow[] = INCBIN_U8("graphics/pokemon/swellow/icon.4bpp");
+const u8 gMonFootprint_Swellow[] = INCBIN_U8("graphics/pokemon/swellow/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/front.4bpp.lz");
+const u32 gMonPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/normal.gbapal.lz");
+const u32 gMonBackPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/back.4bpp.lz");
+const u32 gMonShinyPalette_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/shiny.gbapal.lz");
+const u8 gMonIcon_Shroomish[] = INCBIN_U8("graphics/pokemon/shroomish/icon.4bpp");
+const u8 gMonFootprint_Shroomish[] = INCBIN_U8("graphics/pokemon/shroomish/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/front.4bpp.lz");
+const u32 gMonPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/normal.gbapal.lz");
+const u32 gMonBackPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/back.4bpp.lz");
+const u32 gMonShinyPalette_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/shiny.gbapal.lz");
+const u8 gMonIcon_Breloom[] = INCBIN_U8("graphics/pokemon/breloom/icon.4bpp");
+const u8 gMonFootprint_Breloom[] = INCBIN_U8("graphics/pokemon/breloom/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/front.4bpp.lz");
+const u32 gMonPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/normal.gbapal.lz");
+const u32 gMonBackPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/back.4bpp.lz");
+const u32 gMonShinyPalette_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/shiny.gbapal.lz");
+const u8 gMonIcon_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/icon.4bpp");
+const u8 gMonFootprint_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/front.4bpp.lz");
+const u32 gMonPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/normal.gbapal.lz");
+const u32 gMonBackPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/back.4bpp.lz");
+const u32 gMonShinyPalette_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/shiny.gbapal.lz");
+const u8 gMonIcon_Wingull[] = INCBIN_U8("graphics/pokemon/wingull/icon.4bpp");
+const u8 gMonFootprint_Wingull[] = INCBIN_U8("graphics/pokemon/wingull/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/front.4bpp.lz");
+const u32 gMonPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/normal.gbapal.lz");
+const u32 gMonBackPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/back.4bpp.lz");
+const u32 gMonShinyPalette_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/shiny.gbapal.lz");
+const u8 gMonIcon_Pelipper[] = INCBIN_U8("graphics/pokemon/pelipper/icon.4bpp");
+const u8 gMonFootprint_Pelipper[] = INCBIN_U8("graphics/pokemon/pelipper/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/front.4bpp.lz");
+const u32 gMonPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/normal.gbapal.lz");
+const u32 gMonBackPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/back.4bpp.lz");
+const u32 gMonShinyPalette_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/shiny.gbapal.lz");
+const u8 gMonIcon_Surskit[] = INCBIN_U8("graphics/pokemon/surskit/icon.4bpp");
+const u8 gMonFootprint_Surskit[] = INCBIN_U8("graphics/pokemon/surskit/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/front.4bpp.lz");
+const u32 gMonPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/normal.gbapal.lz");
+const u32 gMonBackPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/back.4bpp.lz");
+const u32 gMonShinyPalette_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/shiny.gbapal.lz");
+const u8 gMonIcon_Masquerain[] = INCBIN_U8("graphics/pokemon/masquerain/icon.4bpp");
+const u8 gMonFootprint_Masquerain[] = INCBIN_U8("graphics/pokemon/masquerain/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/front.4bpp.lz");
+const u32 gMonPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/normal.gbapal.lz");
+const u32 gMonBackPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/back.4bpp.lz");
+const u32 gMonShinyPalette_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/shiny.gbapal.lz");
+const u8 gMonIcon_Wailmer[] = INCBIN_U8("graphics/pokemon/wailmer/icon.4bpp");
+const u8 gMonFootprint_Wailmer[] = INCBIN_U8("graphics/pokemon/wailmer/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/front.4bpp.lz");
+const u32 gMonPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/normal.gbapal.lz");
+const u32 gMonBackPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/back.4bpp.lz");
+const u32 gMonShinyPalette_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/shiny.gbapal.lz");
+const u8 gMonIcon_Wailord[] = INCBIN_U8("graphics/pokemon/wailord/icon.4bpp");
+const u8 gMonFootprint_Wailord[] = INCBIN_U8("graphics/pokemon/wailord/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/front.4bpp.lz");
+const u32 gMonPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/normal.gbapal.lz");
+const u32 gMonBackPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/back.4bpp.lz");
+const u32 gMonShinyPalette_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/shiny.gbapal.lz");
+const u8 gMonIcon_Skitty[] = INCBIN_U8("graphics/pokemon/skitty/icon.4bpp");
+const u8 gMonFootprint_Skitty[] = INCBIN_U8("graphics/pokemon/skitty/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/front.4bpp.lz");
+const u32 gMonPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/normal.gbapal.lz");
+const u32 gMonBackPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/back.4bpp.lz");
+const u32 gMonShinyPalette_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/shiny.gbapal.lz");
+const u8 gMonIcon_Delcatty[] = INCBIN_U8("graphics/pokemon/delcatty/icon.4bpp");
+const u8 gMonFootprint_Delcatty[] = INCBIN_U8("graphics/pokemon/delcatty/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/front.4bpp.lz");
+const u32 gMonPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/normal.gbapal.lz");
+const u32 gMonBackPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/back.4bpp.lz");
+const u32 gMonShinyPalette_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/shiny.gbapal.lz");
+const u8 gMonIcon_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/icon.4bpp");
+const u8 gMonFootprint_Kecleon[] = INCBIN_U8("graphics/pokemon/kecleon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/front.4bpp.lz");
+const u32 gMonPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/normal.gbapal.lz");
+const u32 gMonBackPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/back.4bpp.lz");
+const u32 gMonShinyPalette_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/shiny.gbapal.lz");
+const u8 gMonIcon_Baltoy[] = INCBIN_U8("graphics/pokemon/baltoy/icon.4bpp");
+const u8 gMonFootprint_Baltoy[] = INCBIN_U8("graphics/pokemon/baltoy/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/front.4bpp.lz");
+const u32 gMonPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/normal.gbapal.lz");
+const u32 gMonBackPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/back.4bpp.lz");
+const u32 gMonShinyPalette_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/shiny.gbapal.lz");
+const u8 gMonIcon_Claydol[] = INCBIN_U8("graphics/pokemon/claydol/icon.4bpp");
+const u8 gMonFootprint_Claydol[] = INCBIN_U8("graphics/pokemon/claydol/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/front.4bpp.lz");
+const u32 gMonPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/normal.gbapal.lz");
+const u32 gMonBackPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/back.4bpp.lz");
+const u32 gMonShinyPalette_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/shiny.gbapal.lz");
+const u8 gMonIcon_Nosepass[] = INCBIN_U8("graphics/pokemon/nosepass/icon.4bpp");
+const u8 gMonFootprint_Nosepass[] = INCBIN_U8("graphics/pokemon/nosepass/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/front.4bpp.lz");
+const u32 gMonPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/normal.gbapal.lz");
+const u32 gMonBackPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/back.4bpp.lz");
+const u32 gMonShinyPalette_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/shiny.gbapal.lz");
+const u8 gMonIcon_Torkoal[] = INCBIN_U8("graphics/pokemon/torkoal/icon.4bpp");
+const u8 gMonFootprint_Torkoal[] = INCBIN_U8("graphics/pokemon/torkoal/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/front.4bpp.lz");
+const u32 gMonPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/normal.gbapal.lz");
+const u32 gMonBackPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/back.4bpp.lz");
+const u32 gMonShinyPalette_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/shiny.gbapal.lz");
+const u8 gMonIcon_Sableye[] = INCBIN_U8("graphics/pokemon/sableye/icon.4bpp");
+const u8 gMonFootprint_Sableye[] = INCBIN_U8("graphics/pokemon/sableye/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/front.4bpp.lz");
+const u32 gMonPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/normal.gbapal.lz");
+const u32 gMonBackPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/back.4bpp.lz");
+const u32 gMonShinyPalette_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/shiny.gbapal.lz");
+const u8 gMonIcon_Barboach[] = INCBIN_U8("graphics/pokemon/barboach/icon.4bpp");
+const u8 gMonFootprint_Barboach[] = INCBIN_U8("graphics/pokemon/barboach/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/front.4bpp.lz");
+const u32 gMonPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/normal.gbapal.lz");
+const u32 gMonBackPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/back.4bpp.lz");
+const u32 gMonShinyPalette_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/shiny.gbapal.lz");
+const u8 gMonIcon_Whiscash[] = INCBIN_U8("graphics/pokemon/whiscash/icon.4bpp");
+const u8 gMonFootprint_Whiscash[] = INCBIN_U8("graphics/pokemon/whiscash/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/front.4bpp.lz");
+const u32 gMonPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/normal.gbapal.lz");
+const u32 gMonBackPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/back.4bpp.lz");
+const u32 gMonShinyPalette_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/shiny.gbapal.lz");
+const u8 gMonIcon_Luvdisc[] = INCBIN_U8("graphics/pokemon/luvdisc/icon.4bpp");
+const u8 gMonFootprint_Luvdisc[] = INCBIN_U8("graphics/pokemon/luvdisc/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/front.4bpp.lz");
+const u32 gMonPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/normal.gbapal.lz");
+const u32 gMonBackPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/back.4bpp.lz");
+const u32 gMonShinyPalette_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/shiny.gbapal.lz");
+const u8 gMonIcon_Corphish[] = INCBIN_U8("graphics/pokemon/corphish/icon.4bpp");
+const u8 gMonFootprint_Corphish[] = INCBIN_U8("graphics/pokemon/corphish/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/front.4bpp.lz");
+const u32 gMonPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/normal.gbapal.lz");
+const u32 gMonBackPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/back.4bpp.lz");
+const u32 gMonShinyPalette_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/shiny.gbapal.lz");
+const u8 gMonIcon_Crawdaunt[] = INCBIN_U8("graphics/pokemon/crawdaunt/icon.4bpp");
+const u8 gMonFootprint_Crawdaunt[] = INCBIN_U8("graphics/pokemon/crawdaunt/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/front.4bpp.lz");
+const u32 gMonPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/normal.gbapal.lz");
+const u32 gMonBackPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/back.4bpp.lz");
+const u32 gMonShinyPalette_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/shiny.gbapal.lz");
+const u8 gMonIcon_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/icon.4bpp");
+const u8 gMonFootprint_Feebas[] = INCBIN_U8("graphics/pokemon/feebas/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/front.4bpp.lz");
+const u32 gMonPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/normal.gbapal.lz");
+const u32 gMonBackPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/back.4bpp.lz");
+const u32 gMonShinyPalette_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/shiny.gbapal.lz");
+const u8 gMonIcon_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/icon.4bpp");
+const u8 gMonFootprint_Milotic[] = INCBIN_U8("graphics/pokemon/milotic/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/front.4bpp.lz");
+const u32 gMonPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/normal.gbapal.lz");
+const u32 gMonBackPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/back.4bpp.lz");
+const u32 gMonShinyPalette_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/shiny.gbapal.lz");
+const u8 gMonIcon_Carvanha[] = INCBIN_U8("graphics/pokemon/carvanha/icon.4bpp");
+const u8 gMonFootprint_Carvanha[] = INCBIN_U8("graphics/pokemon/carvanha/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/front.4bpp.lz");
+const u32 gMonPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/normal.gbapal.lz");
+const u32 gMonBackPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/back.4bpp.lz");
+const u32 gMonShinyPalette_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/shiny.gbapal.lz");
+const u8 gMonIcon_Sharpedo[] = INCBIN_U8("graphics/pokemon/sharpedo/icon.4bpp");
+const u8 gMonFootprint_Sharpedo[] = INCBIN_U8("graphics/pokemon/sharpedo/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/front.4bpp.lz");
+const u32 gMonPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/normal.gbapal.lz");
+const u32 gMonBackPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/back.4bpp.lz");
+const u32 gMonShinyPalette_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/shiny.gbapal.lz");
+const u8 gMonIcon_Trapinch[] = INCBIN_U8("graphics/pokemon/trapinch/icon.4bpp");
+const u8 gMonFootprint_Trapinch[] = INCBIN_U8("graphics/pokemon/trapinch/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/front.4bpp.lz");
+const u32 gMonPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/normal.gbapal.lz");
+const u32 gMonBackPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/back.4bpp.lz");
+const u32 gMonShinyPalette_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/shiny.gbapal.lz");
+const u8 gMonIcon_Vibrava[] = INCBIN_U8("graphics/pokemon/vibrava/icon.4bpp");
+const u8 gMonFootprint_Vibrava[] = INCBIN_U8("graphics/pokemon/vibrava/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/front.4bpp.lz");
+const u32 gMonPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/normal.gbapal.lz");
+const u32 gMonBackPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/back.4bpp.lz");
+const u32 gMonShinyPalette_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/shiny.gbapal.lz");
+const u8 gMonIcon_Flygon[] = INCBIN_U8("graphics/pokemon/flygon/icon.4bpp");
+const u8 gMonFootprint_Flygon[] = INCBIN_U8("graphics/pokemon/flygon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/front.4bpp.lz");
+const u32 gMonPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/normal.gbapal.lz");
+const u32 gMonBackPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/back.4bpp.lz");
+const u32 gMonShinyPalette_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/shiny.gbapal.lz");
+const u8 gMonIcon_Makuhita[] = INCBIN_U8("graphics/pokemon/makuhita/icon.4bpp");
+const u8 gMonFootprint_Makuhita[] = INCBIN_U8("graphics/pokemon/makuhita/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/front.4bpp.lz");
+const u32 gMonPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/normal.gbapal.lz");
+const u32 gMonBackPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/back.4bpp.lz");
+const u32 gMonShinyPalette_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/shiny.gbapal.lz");
+const u8 gMonIcon_Hariyama[] = INCBIN_U8("graphics/pokemon/hariyama/icon.4bpp");
+const u8 gMonFootprint_Hariyama[] = INCBIN_U8("graphics/pokemon/hariyama/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/front.4bpp.lz");
+const u32 gMonPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/normal.gbapal.lz");
+const u32 gMonBackPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/back.4bpp.lz");
+const u32 gMonShinyPalette_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/shiny.gbapal.lz");
+const u8 gMonIcon_Electrike[] = INCBIN_U8("graphics/pokemon/electrike/icon.4bpp");
+const u8 gMonFootprint_Electrike[] = INCBIN_U8("graphics/pokemon/electrike/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/front.4bpp.lz");
+const u32 gMonPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/normal.gbapal.lz");
+const u32 gMonBackPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/back.4bpp.lz");
+const u32 gMonShinyPalette_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/shiny.gbapal.lz");
+const u8 gMonIcon_Manectric[] = INCBIN_U8("graphics/pokemon/manectric/icon.4bpp");
+const u8 gMonFootprint_Manectric[] = INCBIN_U8("graphics/pokemon/manectric/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/front.4bpp.lz");
+const u32 gMonPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/normal.gbapal.lz");
+const u32 gMonBackPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/back.4bpp.lz");
+const u32 gMonShinyPalette_Numel[] = INCBIN_U32("graphics/pokemon/numel/shiny.gbapal.lz");
+const u8 gMonIcon_Numel[] = INCBIN_U8("graphics/pokemon/numel/icon.4bpp");
+const u8 gMonFootprint_Numel[] = INCBIN_U8("graphics/pokemon/numel/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/front.4bpp.lz");
+const u32 gMonPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/normal.gbapal.lz");
+const u32 gMonBackPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/back.4bpp.lz");
+const u32 gMonShinyPalette_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/shiny.gbapal.lz");
+const u8 gMonIcon_Camerupt[] = INCBIN_U8("graphics/pokemon/camerupt/icon.4bpp");
+const u8 gMonFootprint_Camerupt[] = INCBIN_U8("graphics/pokemon/camerupt/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/front.4bpp.lz");
+const u32 gMonPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/normal.gbapal.lz");
+const u32 gMonBackPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/back.4bpp.lz");
+const u32 gMonShinyPalette_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/shiny.gbapal.lz");
+const u8 gMonIcon_Spheal[] = INCBIN_U8("graphics/pokemon/spheal/icon.4bpp");
+const u8 gMonFootprint_Spheal[] = INCBIN_U8("graphics/pokemon/spheal/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/front.4bpp.lz");
+const u32 gMonPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/normal.gbapal.lz");
+const u32 gMonBackPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/back.4bpp.lz");
+const u32 gMonShinyPalette_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/shiny.gbapal.lz");
+const u8 gMonIcon_Sealeo[] = INCBIN_U8("graphics/pokemon/sealeo/icon.4bpp");
+const u8 gMonFootprint_Sealeo[] = INCBIN_U8("graphics/pokemon/sealeo/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/front.4bpp.lz");
+const u32 gMonPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/normal.gbapal.lz");
+const u32 gMonBackPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/back.4bpp.lz");
+const u32 gMonShinyPalette_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/shiny.gbapal.lz");
+const u8 gMonIcon_Walrein[] = INCBIN_U8("graphics/pokemon/walrein/icon.4bpp");
+const u8 gMonFootprint_Walrein[] = INCBIN_U8("graphics/pokemon/walrein/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/front.4bpp.lz");
+const u32 gMonPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/normal.gbapal.lz");
+const u32 gMonBackPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/back.4bpp.lz");
+const u32 gMonShinyPalette_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/shiny.gbapal.lz");
+const u8 gMonIcon_Cacnea[] = INCBIN_U8("graphics/pokemon/cacnea/icon.4bpp");
+const u8 gMonFootprint_Cacnea[] = INCBIN_U8("graphics/pokemon/cacnea/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/front.4bpp.lz");
+const u32 gMonPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/normal.gbapal.lz");
+const u32 gMonBackPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/back.4bpp.lz");
+const u32 gMonShinyPalette_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/shiny.gbapal.lz");
+const u8 gMonIcon_Cacturne[] = INCBIN_U8("graphics/pokemon/cacturne/icon.4bpp");
+const u8 gMonFootprint_Cacturne[] = INCBIN_U8("graphics/pokemon/cacturne/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/front.4bpp.lz");
+const u32 gMonPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/normal.gbapal.lz");
+const u32 gMonBackPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/back.4bpp.lz");
+const u32 gMonShinyPalette_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/shiny.gbapal.lz");
+const u8 gMonIcon_Snorunt[] = INCBIN_U8("graphics/pokemon/snorunt/icon.4bpp");
+const u8 gMonFootprint_Snorunt[] = INCBIN_U8("graphics/pokemon/snorunt/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/front.4bpp.lz");
+const u32 gMonPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/normal.gbapal.lz");
+const u32 gMonBackPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/back.4bpp.lz");
+const u32 gMonShinyPalette_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/shiny.gbapal.lz");
+const u8 gMonIcon_Glalie[] = INCBIN_U8("graphics/pokemon/glalie/icon.4bpp");
+const u8 gMonFootprint_Glalie[] = INCBIN_U8("graphics/pokemon/glalie/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/front.4bpp.lz");
+const u32 gMonPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/normal.gbapal.lz");
+const u32 gMonBackPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/back.4bpp.lz");
+const u32 gMonShinyPalette_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/shiny.gbapal.lz");
+const u8 gMonIcon_Lunatone[] = INCBIN_U8("graphics/pokemon/lunatone/icon.4bpp");
+const u8 gMonFootprint_Lunatone[] = INCBIN_U8("graphics/pokemon/lunatone/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/front.4bpp.lz");
+const u32 gMonPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/normal.gbapal.lz");
+const u32 gMonBackPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/back.4bpp.lz");
+const u32 gMonShinyPalette_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/shiny.gbapal.lz");
+const u8 gMonIcon_Solrock[] = INCBIN_U8("graphics/pokemon/solrock/icon.4bpp");
+const u8 gMonFootprint_Solrock[] = INCBIN_U8("graphics/pokemon/solrock/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/front.4bpp.lz");
+const u32 gMonPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/normal.gbapal.lz");
+const u32 gMonBackPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/back.4bpp.lz");
+const u32 gMonShinyPalette_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/shiny.gbapal.lz");
+const u8 gMonIcon_Azurill[] = INCBIN_U8("graphics/pokemon/azurill/icon.4bpp");
+const u8 gMonFootprint_Azurill[] = INCBIN_U8("graphics/pokemon/azurill/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/front.4bpp.lz");
+const u32 gMonPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/normal.gbapal.lz");
+const u32 gMonBackPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/back.4bpp.lz");
+const u32 gMonShinyPalette_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/shiny.gbapal.lz");
+const u8 gMonIcon_Spoink[] = INCBIN_U8("graphics/pokemon/spoink/icon.4bpp");
+const u8 gMonFootprint_Spoink[] = INCBIN_U8("graphics/pokemon/spoink/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/front.4bpp.lz");
+const u32 gMonPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/normal.gbapal.lz");
+const u32 gMonBackPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/back.4bpp.lz");
+const u32 gMonShinyPalette_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/shiny.gbapal.lz");
+const u8 gMonIcon_Grumpig[] = INCBIN_U8("graphics/pokemon/grumpig/icon.4bpp");
+const u8 gMonFootprint_Grumpig[] = INCBIN_U8("graphics/pokemon/grumpig/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/front.4bpp.lz");
+const u32 gMonPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/normal.gbapal.lz");
+const u32 gMonBackPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/back.4bpp.lz");
+const u32 gMonShinyPalette_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/shiny.gbapal.lz");
+const u8 gMonIcon_Plusle[] = INCBIN_U8("graphics/pokemon/plusle/icon.4bpp");
+const u8 gMonFootprint_Plusle[] = INCBIN_U8("graphics/pokemon/plusle/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/front.4bpp.lz");
+const u32 gMonPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/normal.gbapal.lz");
+const u32 gMonBackPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/back.4bpp.lz");
+const u32 gMonShinyPalette_Minun[] = INCBIN_U32("graphics/pokemon/minun/shiny.gbapal.lz");
+const u8 gMonIcon_Minun[] = INCBIN_U8("graphics/pokemon/minun/icon.4bpp");
+const u8 gMonFootprint_Minun[] = INCBIN_U8("graphics/pokemon/minun/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/front.4bpp.lz");
+const u32 gMonPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/normal.gbapal.lz");
+const u32 gMonBackPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/back.4bpp.lz");
+const u32 gMonShinyPalette_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/shiny.gbapal.lz");
+const u8 gMonIcon_Mawile[] = INCBIN_U8("graphics/pokemon/mawile/icon.4bpp");
+const u8 gMonFootprint_Mawile[] = INCBIN_U8("graphics/pokemon/mawile/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/front.4bpp.lz");
+const u32 gMonPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/normal.gbapal.lz");
+const u32 gMonBackPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/back.4bpp.lz");
+const u32 gMonShinyPalette_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/shiny.gbapal.lz");
+const u8 gMonIcon_Meditite[] = INCBIN_U8("graphics/pokemon/meditite/icon.4bpp");
+const u8 gMonFootprint_Meditite[] = INCBIN_U8("graphics/pokemon/meditite/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/front.4bpp.lz");
+const u32 gMonPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/normal.gbapal.lz");
+const u32 gMonBackPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/back.4bpp.lz");
+const u32 gMonShinyPalette_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/shiny.gbapal.lz");
+const u8 gMonIcon_Medicham[] = INCBIN_U8("graphics/pokemon/medicham/icon.4bpp");
+const u8 gMonFootprint_Medicham[] = INCBIN_U8("graphics/pokemon/medicham/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/front.4bpp.lz");
+const u32 gMonPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/normal.gbapal.lz");
+const u32 gMonBackPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/back.4bpp.lz");
+const u32 gMonShinyPalette_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/shiny.gbapal.lz");
+const u8 gMonIcon_Swablu[] = INCBIN_U8("graphics/pokemon/swablu/icon.4bpp");
+const u8 gMonFootprint_Swablu[] = INCBIN_U8("graphics/pokemon/swablu/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/front.4bpp.lz");
+const u32 gMonPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/normal.gbapal.lz");
+const u32 gMonBackPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/back.4bpp.lz");
+const u32 gMonShinyPalette_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/shiny.gbapal.lz");
+const u8 gMonIcon_Altaria[] = INCBIN_U8("graphics/pokemon/altaria/icon.4bpp");
+const u8 gMonFootprint_Altaria[] = INCBIN_U8("graphics/pokemon/altaria/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/front.4bpp.lz");
+const u32 gMonPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/normal.gbapal.lz");
+const u32 gMonBackPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/back.4bpp.lz");
+const u32 gMonShinyPalette_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/shiny.gbapal.lz");
+const u8 gMonIcon_Wynaut[] = INCBIN_U8("graphics/pokemon/wynaut/icon.4bpp");
+const u8 gMonFootprint_Wynaut[] = INCBIN_U8("graphics/pokemon/wynaut/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/front.4bpp.lz");
+const u32 gMonPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/normal.gbapal.lz");
+const u32 gMonBackPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/back.4bpp.lz");
+const u32 gMonShinyPalette_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/shiny.gbapal.lz");
+const u8 gMonIcon_Duskull[] = INCBIN_U8("graphics/pokemon/duskull/icon.4bpp");
+const u8 gMonFootprint_Duskull[] = INCBIN_U8("graphics/pokemon/duskull/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/front.4bpp.lz");
+const u32 gMonPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/normal.gbapal.lz");
+const u32 gMonBackPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/back.4bpp.lz");
+const u32 gMonShinyPalette_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/shiny.gbapal.lz");
+const u8 gMonIcon_Dusclops[] = INCBIN_U8("graphics/pokemon/dusclops/icon.4bpp");
+const u8 gMonFootprint_Dusclops[] = INCBIN_U8("graphics/pokemon/dusclops/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/front.4bpp.lz");
+const u32 gMonPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/normal.gbapal.lz");
+const u32 gMonBackPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/back.4bpp.lz");
+const u32 gMonShinyPalette_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/shiny.gbapal.lz");
+const u8 gMonIcon_Roselia[] = INCBIN_U8("graphics/pokemon/roselia/icon.4bpp");
+const u8 gMonFootprint_Roselia[] = INCBIN_U8("graphics/pokemon/roselia/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/front.4bpp.lz");
+const u32 gMonPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/normal.gbapal.lz");
+const u32 gMonBackPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/back.4bpp.lz");
+const u32 gMonShinyPalette_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/shiny.gbapal.lz");
+const u8 gMonIcon_Slakoth[] = INCBIN_U8("graphics/pokemon/slakoth/icon.4bpp");
+const u8 gMonFootprint_Slakoth[] = INCBIN_U8("graphics/pokemon/slakoth/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/front.4bpp.lz");
+const u32 gMonPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/normal.gbapal.lz");
+const u32 gMonBackPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/back.4bpp.lz");
+const u32 gMonShinyPalette_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/shiny.gbapal.lz");
+const u8 gMonIcon_Vigoroth[] = INCBIN_U8("graphics/pokemon/vigoroth/icon.4bpp");
+const u8 gMonFootprint_Vigoroth[] = INCBIN_U8("graphics/pokemon/vigoroth/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/front.4bpp.lz");
+const u32 gMonPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/normal.gbapal.lz");
+const u32 gMonBackPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/back.4bpp.lz");
+const u32 gMonShinyPalette_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/shiny.gbapal.lz");
+const u8 gMonIcon_Slaking[] = INCBIN_U8("graphics/pokemon/slaking/icon.4bpp");
+const u8 gMonFootprint_Slaking[] = INCBIN_U8("graphics/pokemon/slaking/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/front.4bpp.lz");
+const u32 gMonPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/normal.gbapal.lz");
+const u32 gMonBackPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/back.4bpp.lz");
+const u32 gMonShinyPalette_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/shiny.gbapal.lz");
+const u8 gMonIcon_Gulpin[] = INCBIN_U8("graphics/pokemon/gulpin/icon.4bpp");
+const u8 gMonFootprint_Gulpin[] = INCBIN_U8("graphics/pokemon/gulpin/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/front.4bpp.lz");
+const u32 gMonPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/normal.gbapal.lz");
+const u32 gMonBackPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/back.4bpp.lz");
+const u32 gMonShinyPalette_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/shiny.gbapal.lz");
+const u8 gMonIcon_Swalot[] = INCBIN_U8("graphics/pokemon/swalot/icon.4bpp");
+const u8 gMonFootprint_Swalot[] = INCBIN_U8("graphics/pokemon/swalot/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/front.4bpp.lz");
+const u32 gMonPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/normal.gbapal.lz");
+const u32 gMonBackPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/back.4bpp.lz");
+const u32 gMonShinyPalette_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/shiny.gbapal.lz");
+const u8 gMonIcon_Tropius[] = INCBIN_U8("graphics/pokemon/tropius/icon.4bpp");
+const u8 gMonFootprint_Tropius[] = INCBIN_U8("graphics/pokemon/tropius/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/front.4bpp.lz");
+const u32 gMonPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/normal.gbapal.lz");
+const u32 gMonBackPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/back.4bpp.lz");
+const u32 gMonShinyPalette_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/shiny.gbapal.lz");
+const u8 gMonIcon_Whismur[] = INCBIN_U8("graphics/pokemon/whismur/icon.4bpp");
+const u8 gMonFootprint_Whismur[] = INCBIN_U8("graphics/pokemon/whismur/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/front.4bpp.lz");
+const u32 gMonPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/normal.gbapal.lz");
+const u32 gMonBackPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/back.4bpp.lz");
+const u32 gMonShinyPalette_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/shiny.gbapal.lz");
+const u8 gMonIcon_Loudred[] = INCBIN_U8("graphics/pokemon/loudred/icon.4bpp");
+const u8 gMonFootprint_Loudred[] = INCBIN_U8("graphics/pokemon/loudred/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/front.4bpp.lz");
+const u32 gMonPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/normal.gbapal.lz");
+const u32 gMonBackPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/back.4bpp.lz");
+const u32 gMonShinyPalette_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/shiny.gbapal.lz");
+const u8 gMonIcon_Exploud[] = INCBIN_U8("graphics/pokemon/exploud/icon.4bpp");
+const u8 gMonFootprint_Exploud[] = INCBIN_U8("graphics/pokemon/exploud/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/front.4bpp.lz");
+const u32 gMonPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/normal.gbapal.lz");
+const u32 gMonBackPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/back.4bpp.lz");
+const u32 gMonShinyPalette_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/shiny.gbapal.lz");
+const u8 gMonIcon_Clamperl[] = INCBIN_U8("graphics/pokemon/clamperl/icon.4bpp");
+const u8 gMonFootprint_Clamperl[] = INCBIN_U8("graphics/pokemon/clamperl/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/front.4bpp.lz");
+const u32 gMonPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/normal.gbapal.lz");
+const u32 gMonBackPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/back.4bpp.lz");
+const u32 gMonShinyPalette_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/shiny.gbapal.lz");
+const u8 gMonIcon_Huntail[] = INCBIN_U8("graphics/pokemon/huntail/icon.4bpp");
+const u8 gMonFootprint_Huntail[] = INCBIN_U8("graphics/pokemon/huntail/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/front.4bpp.lz");
+const u32 gMonPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/normal.gbapal.lz");
+const u32 gMonBackPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/back.4bpp.lz");
+const u32 gMonShinyPalette_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/shiny.gbapal.lz");
+const u8 gMonIcon_Gorebyss[] = INCBIN_U8("graphics/pokemon/gorebyss/icon.4bpp");
+const u8 gMonFootprint_Gorebyss[] = INCBIN_U8("graphics/pokemon/gorebyss/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/front.4bpp.lz");
+const u32 gMonPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/normal.gbapal.lz");
+const u32 gMonBackPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/back.4bpp.lz");
+const u32 gMonShinyPalette_Absol[] = INCBIN_U32("graphics/pokemon/absol/shiny.gbapal.lz");
+const u8 gMonIcon_Absol[] = INCBIN_U8("graphics/pokemon/absol/icon.4bpp");
+const u8 gMonFootprint_Absol[] = INCBIN_U8("graphics/pokemon/absol/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/front.4bpp.lz");
+const u32 gMonPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/normal.gbapal.lz");
+const u32 gMonBackPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/back.4bpp.lz");
+const u32 gMonShinyPalette_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/shiny.gbapal.lz");
+const u8 gMonIcon_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/icon.4bpp");
+const u8 gMonFootprint_Shuppet[] = INCBIN_U8("graphics/pokemon/shuppet/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/front.4bpp.lz");
+const u32 gMonPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/normal.gbapal.lz");
+const u32 gMonBackPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/back.4bpp.lz");
+const u32 gMonShinyPalette_Banette[] = INCBIN_U32("graphics/pokemon/banette/shiny.gbapal.lz");
+const u8 gMonIcon_Banette[] = INCBIN_U8("graphics/pokemon/banette/icon.4bpp");
+const u8 gMonFootprint_Banette[] = INCBIN_U8("graphics/pokemon/banette/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/front.4bpp.lz");
+const u32 gMonPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/normal.gbapal.lz");
+const u32 gMonBackPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/back.4bpp.lz");
+const u32 gMonShinyPalette_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/shiny.gbapal.lz");
+const u8 gMonIcon_Seviper[] = INCBIN_U8("graphics/pokemon/seviper/icon.4bpp");
+const u8 gMonFootprint_Seviper[] = INCBIN_U8("graphics/pokemon/seviper/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/front.4bpp.lz");
+const u32 gMonPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/normal.gbapal.lz");
+const u32 gMonBackPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/back.4bpp.lz");
+const u32 gMonShinyPalette_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/shiny.gbapal.lz");
+const u8 gMonIcon_Zangoose[] = INCBIN_U8("graphics/pokemon/zangoose/icon.4bpp");
+const u8 gMonFootprint_Zangoose[] = INCBIN_U8("graphics/pokemon/zangoose/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/front.4bpp.lz");
+const u32 gMonPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/normal.gbapal.lz");
+const u32 gMonBackPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/back.4bpp.lz");
+const u32 gMonShinyPalette_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/shiny.gbapal.lz");
+const u8 gMonIcon_Relicanth[] = INCBIN_U8("graphics/pokemon/relicanth/icon.4bpp");
+const u8 gMonFootprint_Relicanth[] = INCBIN_U8("graphics/pokemon/relicanth/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/front.4bpp.lz");
+const u32 gMonPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/normal.gbapal.lz");
+const u32 gMonBackPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/back.4bpp.lz");
+const u32 gMonShinyPalette_Aron[] = INCBIN_U32("graphics/pokemon/aron/shiny.gbapal.lz");
+const u8 gMonIcon_Aron[] = INCBIN_U8("graphics/pokemon/aron/icon.4bpp");
+const u8 gMonFootprint_Aron[] = INCBIN_U8("graphics/pokemon/aron/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/front.4bpp.lz");
+const u32 gMonPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/normal.gbapal.lz");
+const u32 gMonBackPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/back.4bpp.lz");
+const u32 gMonShinyPalette_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/shiny.gbapal.lz");
+const u8 gMonIcon_Lairon[] = INCBIN_U8("graphics/pokemon/lairon/icon.4bpp");
+const u8 gMonFootprint_Lairon[] = INCBIN_U8("graphics/pokemon/lairon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/front.4bpp.lz");
+const u32 gMonPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/normal.gbapal.lz");
+const u32 gMonBackPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/back.4bpp.lz");
+const u32 gMonShinyPalette_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/shiny.gbapal.lz");
+const u8 gMonIcon_Aggron[] = INCBIN_U8("graphics/pokemon/aggron/icon.4bpp");
+const u8 gMonFootprint_Aggron[] = INCBIN_U8("graphics/pokemon/aggron/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/front.4bpp.lz");
+const u32 gMonPalette_Castform[] = INCBIN_U32("graphics/pokemon/castform/normal.gbapal.lz");
+const u32 gMonBackPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/back.4bpp.lz");
+const u32 gMonShinyPalette_Castform[] = INCBIN_U32("graphics/pokemon/castform/shiny.gbapal.lz");
+const u8 gMonIcon_Castform[] = INCBIN_U8("graphics/pokemon/castform/icon.4bpp");
+const u8 gMonFootprint_Castform[] = INCBIN_U8("graphics/pokemon/castform/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/front.4bpp.lz");
+const u32 gMonPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/normal.gbapal.lz");
+const u32 gMonBackPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/back.4bpp.lz");
+const u32 gMonShinyPalette_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/shiny.gbapal.lz");
+const u8 gMonIcon_Volbeat[] = INCBIN_U8("graphics/pokemon/volbeat/icon.4bpp");
+const u8 gMonFootprint_Volbeat[] = INCBIN_U8("graphics/pokemon/volbeat/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/front.4bpp.lz");
+const u32 gMonPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/normal.gbapal.lz");
+const u32 gMonBackPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/back.4bpp.lz");
+const u32 gMonShinyPalette_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/shiny.gbapal.lz");
+const u8 gMonIcon_Illumise[] = INCBIN_U8("graphics/pokemon/illumise/icon.4bpp");
+const u8 gMonFootprint_Illumise[] = INCBIN_U8("graphics/pokemon/illumise/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/front.4bpp.lz");
+const u32 gMonPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/normal.gbapal.lz");
+const u32 gMonBackPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/back.4bpp.lz");
+const u32 gMonShinyPalette_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/shiny.gbapal.lz");
+const u8 gMonIcon_Lileep[] = INCBIN_U8("graphics/pokemon/lileep/icon.4bpp");
+const u8 gMonFootprint_Lileep[] = INCBIN_U8("graphics/pokemon/lileep/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/front.4bpp.lz");
+const u32 gMonPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/normal.gbapal.lz");
+const u32 gMonBackPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/back.4bpp.lz");
+const u32 gMonShinyPalette_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/shiny.gbapal.lz");
+const u8 gMonIcon_Cradily[] = INCBIN_U8("graphics/pokemon/cradily/icon.4bpp");
+const u8 gMonFootprint_Cradily[] = INCBIN_U8("graphics/pokemon/cradily/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/front.4bpp.lz");
+const u32 gMonPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/normal.gbapal.lz");
+const u32 gMonBackPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/back.4bpp.lz");
+const u32 gMonShinyPalette_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/shiny.gbapal.lz");
+const u8 gMonIcon_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/icon.4bpp");
+const u8 gMonFootprint_Anorith[] = INCBIN_U8("graphics/pokemon/anorith/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/front.4bpp.lz");
+const u32 gMonPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/normal.gbapal.lz");
+const u32 gMonBackPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/back.4bpp.lz");
+const u32 gMonShinyPalette_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/shiny.gbapal.lz");
+const u8 gMonIcon_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/icon.4bpp");
+const u8 gMonFootprint_Armaldo[] = INCBIN_U8("graphics/pokemon/armaldo/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/front.4bpp.lz");
+const u32 gMonPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/normal.gbapal.lz");
+const u32 gMonBackPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/back.4bpp.lz");
+const u32 gMonShinyPalette_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/shiny.gbapal.lz");
+const u8 gMonIcon_Ralts[] = INCBIN_U8("graphics/pokemon/ralts/icon.4bpp");
+const u8 gMonFootprint_Ralts[] = INCBIN_U8("graphics/pokemon/ralts/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/front.4bpp.lz");
+const u32 gMonPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/normal.gbapal.lz");
+const u32 gMonBackPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/back.4bpp.lz");
+const u32 gMonShinyPalette_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/shiny.gbapal.lz");
+const u8 gMonIcon_Kirlia[] = INCBIN_U8("graphics/pokemon/kirlia/icon.4bpp");
+const u8 gMonFootprint_Kirlia[] = INCBIN_U8("graphics/pokemon/kirlia/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/front.4bpp.lz");
+const u32 gMonPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/normal.gbapal.lz");
+const u32 gMonBackPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/back.4bpp.lz");
+const u32 gMonShinyPalette_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/shiny.gbapal.lz");
+const u8 gMonIcon_Gardevoir[] = INCBIN_U8("graphics/pokemon/gardevoir/icon.4bpp");
+const u8 gMonFootprint_Gardevoir[] = INCBIN_U8("graphics/pokemon/gardevoir/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/front.4bpp.lz");
+const u32 gMonPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/normal.gbapal.lz");
+const u32 gMonBackPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/back.4bpp.lz");
+const u32 gMonShinyPalette_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/shiny.gbapal.lz");
+const u8 gMonIcon_Bagon[] = INCBIN_U8("graphics/pokemon/bagon/icon.4bpp");
+const u8 gMonFootprint_Bagon[] = INCBIN_U8("graphics/pokemon/bagon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/front.4bpp.lz");
+const u32 gMonPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/normal.gbapal.lz");
+const u32 gMonBackPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/back.4bpp.lz");
+const u32 gMonShinyPalette_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/shiny.gbapal.lz");
+const u8 gMonIcon_Shelgon[] = INCBIN_U8("graphics/pokemon/shelgon/icon.4bpp");
+const u8 gMonFootprint_Shelgon[] = INCBIN_U8("graphics/pokemon/shelgon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/front.4bpp.lz");
+const u32 gMonPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/normal.gbapal.lz");
+const u32 gMonBackPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/back.4bpp.lz");
+const u32 gMonShinyPalette_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/shiny.gbapal.lz");
+const u8 gMonIcon_Salamence[] = INCBIN_U8("graphics/pokemon/salamence/icon.4bpp");
+const u8 gMonFootprint_Salamence[] = INCBIN_U8("graphics/pokemon/salamence/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/front.4bpp.lz");
+const u32 gMonPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/normal.gbapal.lz");
+const u32 gMonBackPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/back.4bpp.lz");
+const u32 gMonShinyPalette_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/shiny.gbapal.lz");
+const u8 gMonIcon_Beldum[] = INCBIN_U8("graphics/pokemon/beldum/icon.4bpp");
+const u8 gMonFootprint_Beldum[] = INCBIN_U8("graphics/pokemon/beldum/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/front.4bpp.lz");
+const u32 gMonPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/normal.gbapal.lz");
+const u32 gMonBackPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/back.4bpp.lz");
+const u32 gMonShinyPalette_Metang[] = INCBIN_U32("graphics/pokemon/metang/shiny.gbapal.lz");
+const u8 gMonIcon_Metang[] = INCBIN_U8("graphics/pokemon/metang/icon.4bpp");
+const u8 gMonFootprint_Metang[] = INCBIN_U8("graphics/pokemon/metang/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/front.4bpp.lz");
+const u32 gMonPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/normal.gbapal.lz");
+const u32 gMonBackPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/back.4bpp.lz");
+const u32 gMonShinyPalette_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/shiny.gbapal.lz");
+const u8 gMonIcon_Metagross[] = INCBIN_U8("graphics/pokemon/metagross/icon.4bpp");
+const u8 gMonFootprint_Metagross[] = INCBIN_U8("graphics/pokemon/metagross/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/front.4bpp.lz");
+const u32 gMonPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/normal.gbapal.lz");
+const u32 gMonBackPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/back.4bpp.lz");
+const u32 gMonShinyPalette_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/shiny.gbapal.lz");
+const u8 gMonIcon_Regirock[] = INCBIN_U8("graphics/pokemon/regirock/icon.4bpp");
+const u8 gMonFootprint_Regirock[] = INCBIN_U8("graphics/pokemon/regirock/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/front.4bpp.lz");
+const u32 gMonPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/normal.gbapal.lz");
+const u32 gMonBackPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/back.4bpp.lz");
+const u32 gMonShinyPalette_Regice[] = INCBIN_U32("graphics/pokemon/regice/shiny.gbapal.lz");
+const u8 gMonIcon_Regice[] = INCBIN_U8("graphics/pokemon/regice/icon.4bpp");
+const u8 gMonFootprint_Regice[] = INCBIN_U8("graphics/pokemon/regice/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/front.4bpp.lz");
+const u32 gMonPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/normal.gbapal.lz");
+const u32 gMonBackPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/back.4bpp.lz");
+const u32 gMonShinyPalette_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/shiny.gbapal.lz");
+const u8 gMonIcon_Registeel[] = INCBIN_U8("graphics/pokemon/registeel/icon.4bpp");
+const u8 gMonFootprint_Registeel[] = INCBIN_U8("graphics/pokemon/registeel/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/front.4bpp.lz");
+const u32 gMonPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/normal.gbapal.lz");
+const u32 gMonBackPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/back.4bpp.lz");
+const u32 gMonShinyPalette_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/shiny.gbapal.lz");
+const u8 gMonIcon_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/icon.4bpp");
+const u8 gMonFootprint_Kyogre[] = INCBIN_U8("graphics/pokemon/kyogre/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/front.4bpp.lz");
+const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/normal.gbapal.lz");
+const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/back.4bpp.lz");
+const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/shiny.gbapal.lz");
+const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/icon.4bpp");
+const u8 gMonFootprint_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/front.4bpp.lz");
+const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/normal.gbapal.lz");
+const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/back.4bpp.lz");
+const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/shiny.gbapal.lz");
+const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/icon.4bpp");
+const u8 gMonFootprint_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/front.4bpp.lz");
+const u32 gMonPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/normal.gbapal.lz");
+const u32 gMonBackPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/back.4bpp.lz");
+const u32 gMonShinyPalette_Latias[] = INCBIN_U32("graphics/pokemon/latias/shiny.gbapal.lz");
+const u8 gMonIcon_Latias[] = INCBIN_U8("graphics/pokemon/latias/icon.4bpp");
+const u8 gMonFootprint_Latias[] = INCBIN_U8("graphics/pokemon/latias/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/front.4bpp.lz");
+const u32 gMonPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/normal.gbapal.lz");
+const u32 gMonBackPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/back.4bpp.lz");
+const u32 gMonShinyPalette_Latios[] = INCBIN_U32("graphics/pokemon/latios/shiny.gbapal.lz");
+const u8 gMonIcon_Latios[] = INCBIN_U8("graphics/pokemon/latios/icon.4bpp");
+const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/latios/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/front.4bpp.lz");
+const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/normal.gbapal.lz");
+const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/back.4bpp.lz");
+const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/shiny.gbapal.lz");
+const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/icon.4bpp");
+const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/footprint.1bpp");
+
+const u32 gMonStillFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/front.4bpp.lz");
+const u32 gMonPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/normal.gbapal.lz");
+const u32 gMonBackPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz");
+const u32 gMonShinyPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz");
+const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp");
+const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/icon_speed.4bpp");
 const u8 gMonIcon_DeoxysSpeedWide[] = INCBIN_U8("graphics/unused/deoxys_speed_icon_wide.4bpp");
 
 asm(".space 0x6800");
 
 const u16 gUnknown_D437F8[] = INCBIN_U16("graphics/unknown/unknown_D437F8.bin");
 
-const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/footprints/deoxys_footprint.1bpp");
+const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/footprint.1bpp");
 
-const u32 gMonStillFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/front_pics/chimecho_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/palettes/chimecho_palette.gbapal.lz");
-const u32 gMonBackPic_Chimecho[] = INCBIN_U32("graphics/pokemon/back_pics/chimecho_back_pic.4bpp.lz");
-const u32 gMonShinyPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/palettes/chimecho_shiny_palette.gbapal.lz");
-const u8 gMonIcon_Chimecho[] = INCBIN_U8("graphics/pokemon/icons/chimecho_icon.4bpp");
-const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/footprints/chimecho_footprint.1bpp");
+const u32 gMonStillFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/front.4bpp.lz");
+const u32 gMonPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/normal.gbapal.lz");
+const u32 gMonBackPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/back.4bpp.lz");
+const u32 gMonShinyPalette_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/shiny.gbapal.lz");
+const u8 gMonIcon_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/icon.4bpp");
+const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/footprint.1bpp");
 
-const u32 gMonStillFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/front_pics/egg_still_front_pic.4bpp.lz");
-const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/palettes/egg_palette.gbapal.lz");
+const u32 gMonStillFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/front.4bpp.lz");
+const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz");
 
-const u32 gMonStillFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/front_pics/unown_b_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/back_pics/unown_b_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/icons/unown_B_icon.4bpp");
+const u32 gMonStillFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/front_b.4bpp.lz");
+const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/back_b.4bpp.lz");
+const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/unown/icon_b.4bpp");
 
-const u32 gMonStillFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/front_pics/unown_c_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/back_pics/unown_c_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/icons/unown_C_icon.4bpp");
+const u32 gMonStillFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/front_c.4bpp.lz");
+const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/back_c.4bpp.lz");
+const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/unown/icon_c.4bpp");
 
-const u32 gMonStillFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/front_pics/unown_d_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/back_pics/unown_d_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/icons/unown_D_icon.4bpp");
+const u32 gMonStillFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/front_d.4bpp.lz");
+const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/back_d.4bpp.lz");
+const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/unown/icon_d.4bpp");
 
-const u32 gMonStillFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/front_pics/unown_e_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownE[] = INCBIN_U32("graphics/pokemon/back_pics/unown_e_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownE[] = INCBIN_U8("graphics/pokemon/icons/unown_E_icon.4bpp");
+const u32 gMonStillFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/front_e.4bpp.lz");
+const u32 gMonBackPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/back_e.4bpp.lz");
+const u8 gMonIcon_UnownE[] = INCBIN_U8("graphics/pokemon/unown/icon_e.4bpp");
 
-const u32 gMonStillFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/front_pics/unown_f_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownF[] = INCBIN_U32("graphics/pokemon/back_pics/unown_f_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownF[] = INCBIN_U8("graphics/pokemon/icons/unown_F_icon.4bpp");
+const u32 gMonStillFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/front_f.4bpp.lz");
+const u32 gMonBackPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/back_f.4bpp.lz");
+const u8 gMonIcon_UnownF[] = INCBIN_U8("graphics/pokemon/unown/icon_f.4bpp");
 
-const u32 gMonStillFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/front_pics/unown_g_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownG[] = INCBIN_U32("graphics/pokemon/back_pics/unown_g_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownG[] = INCBIN_U8("graphics/pokemon/icons/unown_G_icon.4bpp");
+const u32 gMonStillFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/front_g.4bpp.lz");
+const u32 gMonBackPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/back_g.4bpp.lz");
+const u8 gMonIcon_UnownG[] = INCBIN_U8("graphics/pokemon/unown/icon_g.4bpp");
 
-const u32 gMonStillFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/front_pics/unown_h_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownH[] = INCBIN_U32("graphics/pokemon/back_pics/unown_h_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownH[] = INCBIN_U8("graphics/pokemon/icons/unown_H_icon.4bpp");
+const u32 gMonStillFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/front_h.4bpp.lz");
+const u32 gMonBackPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/back_h.4bpp.lz");
+const u8 gMonIcon_UnownH[] = INCBIN_U8("graphics/pokemon/unown/icon_h.4bpp");
 
-const u32 gMonStillFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/front_pics/unown_i_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownI[] = INCBIN_U32("graphics/pokemon/back_pics/unown_i_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownI[] = INCBIN_U8("graphics/pokemon/icons/unown_I_icon.4bpp");
+const u32 gMonStillFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/front_i.4bpp.lz");
+const u32 gMonBackPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/back_i.4bpp.lz");
+const u8 gMonIcon_UnownI[] = INCBIN_U8("graphics/pokemon/unown/icon_i.4bpp");
 
-const u32 gMonStillFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/front_pics/unown_j_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownJ[] = INCBIN_U32("graphics/pokemon/back_pics/unown_j_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownJ[] = INCBIN_U8("graphics/pokemon/icons/unown_J_icon.4bpp");
+const u32 gMonStillFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/front_j.4bpp.lz");
+const u32 gMonBackPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/back_j.4bpp.lz");
+const u8 gMonIcon_UnownJ[] = INCBIN_U8("graphics/pokemon/unown/icon_j.4bpp");
 
-const u32 gMonStillFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/front_pics/unown_k_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownK[] = INCBIN_U32("graphics/pokemon/back_pics/unown_k_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownK[] = INCBIN_U8("graphics/pokemon/icons/unown_K_icon.4bpp");
+const u32 gMonStillFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/front_k.4bpp.lz");
+const u32 gMonBackPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/back_k.4bpp.lz");
+const u8 gMonIcon_UnownK[] = INCBIN_U8("graphics/pokemon/unown/icon_k.4bpp");
 
-const u32 gMonStillFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/front_pics/unown_l_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownL[] = INCBIN_U32("graphics/pokemon/back_pics/unown_l_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownL[] = INCBIN_U8("graphics/pokemon/icons/unown_L_icon.4bpp");
+const u32 gMonStillFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/front_l.4bpp.lz");
+const u32 gMonBackPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/back_l.4bpp.lz");
+const u8 gMonIcon_UnownL[] = INCBIN_U8("graphics/pokemon/unown/icon_l.4bpp");
 
-const u32 gMonStillFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/front_pics/unown_m_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownM[] = INCBIN_U32("graphics/pokemon/back_pics/unown_m_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownM[] = INCBIN_U8("graphics/pokemon/icons/unown_M_icon.4bpp");
+const u32 gMonStillFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/front_m.4bpp.lz");
+const u32 gMonBackPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/back_m.4bpp.lz");
+const u8 gMonIcon_UnownM[] = INCBIN_U8("graphics/pokemon/unown/icon_m.4bpp");
 
-const u32 gMonStillFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/front_pics/unown_n_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownN[] = INCBIN_U32("graphics/pokemon/back_pics/unown_n_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownN[] = INCBIN_U8("graphics/pokemon/icons/unown_N_icon.4bpp");
+const u32 gMonStillFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/front_n.4bpp.lz");
+const u32 gMonBackPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/back_n.4bpp.lz");
+const u8 gMonIcon_UnownN[] = INCBIN_U8("graphics/pokemon/unown/icon_n.4bpp");
 
-const u32 gMonStillFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/front_pics/unown_o_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownO[] = INCBIN_U32("graphics/pokemon/back_pics/unown_o_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownO[] = INCBIN_U8("graphics/pokemon/icons/unown_O_icon.4bpp");
+const u32 gMonStillFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/front_o.4bpp.lz");
+const u32 gMonBackPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/back_o.4bpp.lz");
+const u8 gMonIcon_UnownO[] = INCBIN_U8("graphics/pokemon/unown/icon_o.4bpp");
 
-const u32 gMonStillFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/front_pics/unown_p_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownP[] = INCBIN_U32("graphics/pokemon/back_pics/unown_p_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownP[] = INCBIN_U8("graphics/pokemon/icons/unown_P_icon.4bpp");
+const u32 gMonStillFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/front_p.4bpp.lz");
+const u32 gMonBackPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/back_p.4bpp.lz");
+const u8 gMonIcon_UnownP[] = INCBIN_U8("graphics/pokemon/unown/icon_p.4bpp");
 
-const u32 gMonStillFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/front_pics/unown_q_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownQ[] = INCBIN_U32("graphics/pokemon/back_pics/unown_q_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownQ[] = INCBIN_U8("graphics/pokemon/icons/unown_Q_icon.4bpp");
+const u32 gMonStillFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/front_q.4bpp.lz");
+const u32 gMonBackPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/back_q.4bpp.lz");
+const u8 gMonIcon_UnownQ[] = INCBIN_U8("graphics/pokemon/unown/icon_q.4bpp");
 
-const u32 gMonStillFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/front_pics/unown_r_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownR[] = INCBIN_U32("graphics/pokemon/back_pics/unown_r_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownR[] = INCBIN_U8("graphics/pokemon/icons/unown_R_icon.4bpp");
+const u32 gMonStillFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/front_r.4bpp.lz");
+const u32 gMonBackPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/back_r.4bpp.lz");
+const u8 gMonIcon_UnownR[] = INCBIN_U8("graphics/pokemon/unown/icon_r.4bpp");
 
-const u32 gMonStillFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/front_pics/unown_s_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownS[] = INCBIN_U32("graphics/pokemon/back_pics/unown_s_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownS[] = INCBIN_U8("graphics/pokemon/icons/unown_S_icon.4bpp");
+const u32 gMonStillFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/front_s.4bpp.lz");
+const u32 gMonBackPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/back_s.4bpp.lz");
+const u8 gMonIcon_UnownS[] = INCBIN_U8("graphics/pokemon/unown/icon_s.4bpp");
 
-const u32 gMonStillFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/front_pics/unown_t_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownT[] = INCBIN_U32("graphics/pokemon/back_pics/unown_t_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownT[] = INCBIN_U8("graphics/pokemon/icons/unown_T_icon.4bpp");
+const u32 gMonStillFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/front_t.4bpp.lz");
+const u32 gMonBackPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/back_t.4bpp.lz");
+const u8 gMonIcon_UnownT[] = INCBIN_U8("graphics/pokemon/unown/icon_t.4bpp");
 
-const u32 gMonStillFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/front_pics/unown_u_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownU[] = INCBIN_U32("graphics/pokemon/back_pics/unown_u_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownU[] = INCBIN_U8("graphics/pokemon/icons/unown_U_icon.4bpp");
+const u32 gMonStillFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/front_u.4bpp.lz");
+const u32 gMonBackPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/back_u.4bpp.lz");
+const u8 gMonIcon_UnownU[] = INCBIN_U8("graphics/pokemon/unown/icon_u.4bpp");
 
-const u32 gMonStillFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/front_pics/unown_v_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownV[] = INCBIN_U32("graphics/pokemon/back_pics/unown_v_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownV[] = INCBIN_U8("graphics/pokemon/icons/unown_V_icon.4bpp");
+const u32 gMonStillFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/front_v.4bpp.lz");
+const u32 gMonBackPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/back_v.4bpp.lz");
+const u8 gMonIcon_UnownV[] = INCBIN_U8("graphics/pokemon/unown/icon_v.4bpp");
 
-const u32 gMonStillFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/front_pics/unown_w_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownW[] = INCBIN_U32("graphics/pokemon/back_pics/unown_w_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownW[] = INCBIN_U8("graphics/pokemon/icons/unown_W_icon.4bpp");
+const u32 gMonStillFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/front_w.4bpp.lz");
+const u32 gMonBackPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/back_w.4bpp.lz");
+const u8 gMonIcon_UnownW[] = INCBIN_U8("graphics/pokemon/unown/icon_w.4bpp");
 
-const u32 gMonStillFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/front_pics/unown_x_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownX[] = INCBIN_U32("graphics/pokemon/back_pics/unown_x_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownX[] = INCBIN_U8("graphics/pokemon/icons/unown_X_icon.4bpp");
-
-const u32 gMonStillFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/front_pics/unown_y_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownY[] = INCBIN_U32("graphics/pokemon/back_pics/unown_y_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownY[] = INCBIN_U8("graphics/pokemon/icons/unown_Y_icon.4bpp");
+const u32 gMonStillFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/front_x.4bpp.lz");
+const u32 gMonBackPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/back_x.4bpp.lz");
+const u8 gMonIcon_UnownX[] = INCBIN_U8("graphics/pokemon/unown/icon_x.4bpp");
+
+const u32 gMonStillFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/front_y.4bpp.lz");
+const u32 gMonBackPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/back_y.4bpp.lz");
+const u8 gMonIcon_UnownY[] = INCBIN_U8("graphics/pokemon/unown/icon_y.4bpp");
 
-const u32 gMonStillFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/front_pics/unown_z_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownZ[] = INCBIN_U32("graphics/pokemon/back_pics/unown_z_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownZ[] = INCBIN_U8("graphics/pokemon/icons/unown_Z_icon.4bpp");
+const u32 gMonStillFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/front_z.4bpp.lz");
+const u32 gMonBackPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/back_z.4bpp.lz");
+const u8 gMonIcon_UnownZ[] = INCBIN_U8("graphics/pokemon/unown/icon_z.4bpp");
 
-const u32 gMonStillFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/icons/unown_exclamation_mark_icon.4bpp");
+const u32 gMonStillFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/front_exclamation_mark.4bpp.lz");
+const u32 gMonBackPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/back_exclamation_mark.4bpp.lz");
+const u8 gMonIcon_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/icon_exclamation_mark.4bpp");
 
-const u32 gMonStillFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/front_pics/unown_question_mark_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/back_pics/unown_question_mark_back_pic.4bpp.lz");
-const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/icons/unown_question_mark_icon.4bpp");
+const u32 gMonStillFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/front_question_mark.4bpp.lz");
+const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/back_question_mark.4bpp.lz");
+const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/icon_question_mark.4bpp");
diff --git a/src/decoration.c b/src/decoration.c
index b753d3233..3c8809c6a 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -392,7 +392,9 @@ const struct SpritePalette gUnknown_085A73E0 = {
 };
 
 const struct OamData Unknown_085A73E8 = {
-    .size = 1, .priority = 1
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
+    .priority = 1
 };
 
 const union AnimCmd Unknown_085A73F0[] = {
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index cad5ef9c2..ee310af04 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -159,7 +159,7 @@ static void sub_8122804(struct EasyChatPair *s, u16 b, u8 c)
     }
 }
 
-void ReceiveEasyChatPairsData(void *a, u32 b, u8 unused)
+void ReceiveEasyChatPairsData(struct EasyChatPair *a, size_t size, u8 unused)
 {
     u16 i, j, r3, players;
     struct EasyChatPair *buffer1, *buffer2, *src, *dst, *foo_of_buffer2;
@@ -176,7 +176,7 @@ void ReceiveEasyChatPairsData(void *a, u32 b, u8 unused)
         {
             players = GetLinkPlayerCount();
             for (i = 0; i < players; i++)
-                memcpy(&(buffer1[i * 5]), (u8 *)a + i * b, 40);
+                memcpy(&(buffer1[i * 5]), (u8 *)a + i * size, 40);
             src = buffer1;
             dst = buffer2;
             r3 = 0;
diff --git a/src/diploma.c b/src/diploma.c
index 716495034..2113b09ed 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -13,8 +13,7 @@
 #include "text.h"
 #include "overworld.h"
 #include "menu.h"
-
-extern bool16 sub_80C0944(void);
+#include "pokedex.h"
 
 extern const u8 gText_DexNational[];
 extern const u8 gText_DexHoenn[];
diff --git a/src/easy_chat.c b/src/easy_chat.c
index b03058eb9..4cc8b9c5b 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -772,10 +772,10 @@ static const struct OamData sOamData_8597D10 = {
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 3,
     .paletteNum = 0,
@@ -798,10 +798,10 @@ static const struct OamData sUnknown_08597D30 = {
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_H_RECTANGLE,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -851,10 +851,10 @@ static const struct OamData sUnknown_08597D80 = {
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_H_RECTANGLE,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -913,10 +913,10 @@ static const struct OamData sUnknown_08597DE8 = {
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 3,
     .paletteNum = 0,
@@ -939,10 +939,10 @@ static const struct OamData sUnknown_08597E08 = {
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_H_RECTANGLE,
+    .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(32x8),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -955,10 +955,10 @@ static const struct OamData gUnknown_08597E10 = {
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 9e44d3531..fc559e001 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -75,7 +75,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8
 static IWRAM_DATA struct EggHatchData *sEggHatchData;
 
 // rom data
-static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/palettes/egg_palette.gbapal");
+static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/egg/normal.gbapal");
 static const u8 sEggHatchTiles[] = INCBIN_U8("graphics/misc/egg_hatch.4bpp");
 static const u8 sEggShardTiles[] = INCBIN_U8("graphics/misc/egg_shard.4bpp");
 
@@ -86,10 +86,10 @@ static const struct OamData sOamData_EggHatch =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -166,10 +166,10 @@ static const struct OamData sOamData_EggShard =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
diff --git a/src/electric.c b/src/electric.c
index 142a9ca09..5e7729842 100644
--- a/src/electric.c
+++ b/src/electric.c
@@ -5,9 +5,6 @@
 #include "constants/songs.h"
 #include "sound.h"
 
-extern void sub_810E2C8(struct Sprite *);
-extern void TranslateAnimSpriteToTargetMonLocation(struct Sprite *);
-
 static void sub_810A1A8(struct Sprite *);
 static void sub_810A1F8(struct Sprite *);
 static void sub_810A214(struct Sprite *);
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index bfd46978c..e36d47c2b 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -53,10 +53,10 @@ static const struct OamData sOamData_EvoSparkle =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 8a7076591..680191bb3 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -32,8 +32,7 @@
 #include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
-
-extern bool32 TryStartMatchCall(void);
+#include "match_call.h"
 
 static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
 static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
diff --git a/src/field_effect.c b/src/field_effect.c
index 158d4dead..825efc380 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -240,12 +240,6 @@ static IWRAM_DATA u8 sActiveList[32];
 
 extern u8 *gFieldEffectScriptPointers[];
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
-extern void sub_81555D8(u8, u8);
-extern void pal_fill_for_maplights(void);
-extern void sub_80E1558(u8);
-extern void sub_80E1570(void);
-extern bool8 sub_80E1584(void);
-extern void WarpFadeScreen(void);
 
 // .rodata
 const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
@@ -276,7 +270,8 @@ const u8 gUnknown_0855C190[] = INCBIN_U8("graphics/unknown/unknown_55C190.4bpp")
 const u8 gUnknown_0855C1B0[] = INCBIN_U8("graphics/unknown/unknown_55C1B0.4bpp");
 const u8 gUnknown_0855C1D0[] = INCBIN_U8("graphics/unknown/unknown_55C1D0.4bpp");
 
-bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) = {
+bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) =
+{
     FieldEffectCmd_loadtiles,
     FieldEffectCmd_loadfadedpal,
     FieldEffectCmd_loadpal,
@@ -287,25 +282,48 @@ bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) = {
     FieldEffectCmd_loadfadedpal_callnative,
 };
 
-const struct OamData gNewGameBirchOamAttributes = {.size = 3};
-const struct OamData gOamData_855C218 = {.size = 0};
-const struct OamData gOamData_855C220 = {.size = 1};
+const struct OamData gNewGameBirchOamAttributes =
+{
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64)
+};
 
-const struct SpriteFrameImage gNewGameBirchPicTable[] = {
+const struct OamData gOamData_855C218 =
+{
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8)
+};
+
+const struct OamData gOamData_855C220 =
+{
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16)
+};
+
+const struct SpriteFrameImage gNewGameBirchPicTable[] =
+{
     obj_frame_tiles(gNewGameBirchPic)
 };
-const struct SpritePalette gNewGameBirchObjectPaletteInfo = {.data = gNewGameBirchPalette, .tag = 0x1006};
 
-const union AnimCmd gNewGameBirchImageAnim[] = {
+const struct SpritePalette gNewGameBirchObjectPaletteInfo =
+{
+    .data = gNewGameBirchPalette,
+    .tag = 0x1006
+};
+
+const union AnimCmd gNewGameBirchImageAnim[] =
+{
     ANIMCMD_FRAME(.imageValue = 0, .duration = 1),
     ANIMCMD_END
 };
 
-const union AnimCmd *const gNewGameBirchImageAnimTable[] = {
+const union AnimCmd *const gNewGameBirchImageAnimTable[] =
+{
     gNewGameBirchImageAnim
 };
 
-const struct SpriteTemplate gNewGameBirchObjectTemplate = {
+const struct SpriteTemplate gNewGameBirchObjectTemplate =
+{
     .tileTag = 0xFFFF,
     .paletteTag = 4102,
     .oam = &gNewGameBirchOamAttributes,
@@ -315,31 +333,47 @@ const struct SpriteTemplate gNewGameBirchObjectTemplate = {
     .callback = SpriteCallbackDummy
 };
 
-const struct SpritePalette gFieldEffectObjectPaletteInfo4 = {.data = gFieldEffectObjectPalette4, .tag = 0x1007};
-const struct SpritePalette gFieldEffectObjectPaletteInfo5 = {.data = gFieldEffectObjectPalette5, .tag = 0x1010};
-const struct OamData gOamData_855C26C = {
-    .shape = 1,
-    .size = 2
+const struct SpritePalette gFieldEffectObjectPaletteInfo4 =
+{
+    .data = gFieldEffectObjectPalette4,
+    .tag = 0x1007
+};
+
+const struct SpritePalette gFieldEffectObjectPaletteInfo5 =
+{
+    .data = gFieldEffectObjectPalette5,
+    .tag = 0x1010
+};
+
+const struct OamData gOamData_855C26C =
+{
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16)
 };
 
-const struct SpriteFrameImage gSpriteImageTable_855C274[] = {
+const struct SpriteFrameImage gSpriteImageTable_855C274[] =
+{
     obj_frame_tiles(gSpriteImage_855A970)
 };
 
-const struct SpriteFrameImage gSpriteImageTable_855C27C[] = {
+const struct SpriteFrameImage gSpriteImageTable_855C27C[] =
+{
     obj_frame_tiles(gSpriteImage_855A9B0),
     obj_frame_tiles(gSpriteImage_855AA70)
 };
 
-const struct SpriteFrameImage gSpriteImageTable_855C28C[] = {
+const struct SpriteFrameImage gSpriteImageTable_855C28C[] =
+{
     obj_frame_tiles(gSpriteImage_855AB30)
 };
 
-const struct SpriteFrameImage gSpriteImageTable_855C294[] = {
+const struct SpriteFrameImage gSpriteImageTable_855C294[] =
+{
     {.data = gSpriteImage_855AD30, .size = 0x200} // the macro breaks down here
 };
 
-const struct Subsprite gSubspriteTable_855C29C[] = {
+const struct Subsprite gSubspriteTable_855C29C[] =
+{
     {.x = -12, .y = -8, .priority = 2, .tileOffset = 0, .shape = 1, .size = 0},
     {.x =   4, .y = -8, .priority = 2, .tileOffset = 2, .shape = 0, .size = 0},
     {.x = -12, .y =  0, .priority = 2, .tileOffset = 3, .shape = 1, .size = 0},
@@ -348,7 +382,8 @@ const struct Subsprite gSubspriteTable_855C29C[] = {
 
 const struct SubspriteTable gUnknown_0855C2AC = subsprite_table(gSubspriteTable_855C29C);
 
-const struct Subsprite gSubspriteTable_855C2B4[] = {
+const struct Subsprite gSubspriteTable_855C2B4[] =
+{
     {.x = -32, .y = -8, .priority = 2, .tileOffset =  0, .shape = 1, .size = 1},
     {.x =   0, .y = -8, .priority = 2, .tileOffset =  4, .shape = 1, .size = 1},
     {.x = -32, .y =  0, .priority = 2, .tileOffset =  8, .shape = 1, .size = 1},
@@ -357,12 +392,14 @@ const struct Subsprite gSubspriteTable_855C2B4[] = {
 
 const struct SubspriteTable gUnknown_0855C2C4 = subsprite_table(gSubspriteTable_855C2B4);
 
-const union AnimCmd gSpriteAnim_855C2CC[] = {
+const union AnimCmd gSpriteAnim_855C2CC[] =
+{
     ANIMCMD_FRAME(.imageValue = 0, .duration = 1),
     ANIMCMD_JUMP(0)
 };
 
-const union AnimCmd gSpriteAnim_855C2D4[] = {
+const union AnimCmd gSpriteAnim_855C2D4[] =
+{
     ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
     ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
     ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
@@ -374,16 +411,19 @@ const union AnimCmd gSpriteAnim_855C2D4[] = {
     ANIMCMD_END
 };
 
-const union AnimCmd *const gSpriteAnimTable_855C2F8[] = {
+const union AnimCmd *const gSpriteAnimTable_855C2F8[] =
+{
     gSpriteAnim_855C2CC,
     gSpriteAnim_855C2D4
 };
 
-const union AnimCmd *const gSpriteAnimTable_855C300[] = {
+const union AnimCmd *const gSpriteAnimTable_855C300[] =
+{
     gSpriteAnim_855C2CC
 };
 
-const struct SpriteTemplate gSpriteTemplate_855C304 = {
+const struct SpriteTemplate gSpriteTemplate_855C304 =
+{
     .tileTag = 0xFFFF,
     .paletteTag = 4103,
     .oam = &gOamData_855C218,
@@ -393,7 +433,8 @@ const struct SpriteTemplate gSpriteTemplate_855C304 = {
     .callback = SpriteCB_PokeballGlow
 };
 
-const struct SpriteTemplate gSpriteTemplate_855C31C = {
+const struct SpriteTemplate gSpriteTemplate_855C31C =
+{
     .tileTag = 0xFFFF,
     .paletteTag = 4100,
     .oam = &gOamData_855C220,
@@ -403,7 +444,8 @@ const struct SpriteTemplate gSpriteTemplate_855C31C = {
     .callback = SpriteCB_PokecenterMonitor
 };
 
-const struct SpriteTemplate gSpriteTemplate_855C334 = {
+const struct SpriteTemplate gSpriteTemplate_855C334 =
+{
     .tileTag = 0xFFFF,
     .paletteTag = 4112,
     .oam = &gOamData_855C220,
@@ -413,7 +455,8 @@ const struct SpriteTemplate gSpriteTemplate_855C334 = {
     .callback = SpriteCB_HallOfFameMonitor
 };
 
-const struct SpriteTemplate gSpriteTemplate_855C34C = {
+const struct SpriteTemplate gSpriteTemplate_855C34C =
+{
     .tileTag = 0xFFFF,
     .paletteTag = 4112,
     .oam = &gOamData_855C26C,
@@ -423,21 +466,24 @@ const struct SpriteTemplate gSpriteTemplate_855C34C = {
     .callback = SpriteCB_HallOfFameMonitor
 };
 
-void (*const gUnknown_0855C364[])(struct Task *) = {
+void (*const gUnknown_0855C364[])(struct Task *) =
+{
     PokecenterHealEffect_0,
     PokecenterHealEffect_1,
     PokecenterHealEffect_2,
     PokecenterHealEffect_3
 };
 
-void (*const gUnknown_0855C374[])(struct Task *) = {
+void (*const gUnknown_0855C374[])(struct Task *) =
+{
     HallOfFameRecordEffect_0,
     HallOfFameRecordEffect_1,
     HallOfFameRecordEffect_2,
     HallOfFameRecordEffect_3
 };
 
-void (*const gUnknown_0855C384[])(struct Sprite *) = {
+void (*const gUnknown_0855C384[])(struct Sprite *) =
+{
     PokeballGlowEffect_0,
     PokeballGlowEffect_1,
     PokeballGlowEffect_2,
@@ -448,7 +494,8 @@ void (*const gUnknown_0855C384[])(struct Sprite *) = {
     PokeballGlowEffect_7
 };
 
-const struct Coords16 gUnknown_0855C3A4[] = {
+const struct Coords16 gUnknown_0855C3A4[] =
+{
     {.x = 0, .y = 0},
     {.x = 6, .y = 0},
     {.x = 0, .y = 4},
@@ -461,7 +508,8 @@ const u8 gUnknown_0855C3BC[] = {16, 12, 8, 0};
 const u8 gUnknown_0855C3C0[] = {16, 12, 8, 0};
 const u8 gUnknown_0855C3C4[] = { 0,  0, 0, 0};
 
-bool8 (*const gUnknown_0855C3C8[])(struct Task *) = {
+bool8 (*const gUnknown_0855C3C8[])(struct Task *) =
+{
     sub_80B6BCC,
     sub_80B6C74,
     sub_80B6C90,
@@ -471,7 +519,8 @@ bool8 (*const gUnknown_0855C3C8[])(struct Task *) = {
     sub_80B6E18,
 };
 
-bool8 (*const gUnknown_0855C3E4[])(struct Task *) = {
+bool8 (*const gUnknown_0855C3E4[])(struct Task *) =
+{
     sub_80B6EC0,
     sub_80B6EE0,
     sub_80B6F50,
@@ -480,7 +529,8 @@ bool8 (*const gUnknown_0855C3E4[])(struct Task *) = {
     sub_80B6FA8,
 };
 
-bool8 (*const gUnknown_0855C3FC[])(struct Task *) = {
+bool8 (*const gUnknown_0855C3FC[])(struct Task *) =
+{
     sub_80B7114,
     sub_80B7190,
     sub_80B71D0,
@@ -490,7 +540,8 @@ bool8 (*const gUnknown_0855C3FC[])(struct Task *) = {
     sub_80B72F4,
 };
 
-bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = {
+bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) =
+{
     sub_80B73D0,
     waterfall_1_do_anim_probably,
     waterfall_2_wait_anim_finish_probably,
@@ -498,13 +549,15 @@ bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = {
     sub_80B7478,
 };
 
-bool8 (*const gUnknown_0855C42C[])(struct Task *) = {
+bool8 (*const gUnknown_0855C42C[])(struct Task *) =
+{
     dive_1_lock,
     dive_2_unknown,
     dive_3_unknown,
 };
 
-bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) = {
+bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) =
+{
     sub_80B764C,
     sub_80B7684,
     sub_80B76B8,
@@ -513,14 +566,16 @@ bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct S
     sub_80B7814,
 };
 
-bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct Sprite *) = {
+bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct Sprite *) =
+{
     sub_80B78EC,
     sub_80B791C,
     sub_80B7968,
     sub_80B79BC,
 };
 
-bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) = {
+bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) =
+{
     sub_80B7AE8,
     sub_80B7B18,
     sub_80B7B94,
@@ -528,7 +583,8 @@ bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct S
     sub_80B7BF4,
 };
 
-void (*const gEscapeRopeFieldEffectFuncs[])(struct Task *) = {
+void (*const gEscapeRopeFieldEffectFuncs[])(struct Task *) =
+{
     EscapeRopeFieldEffect_Step0,
     EscapeRopeFieldEffect_Step1,
 };
diff --git a/src/field_message_box.c b/src/field_message_box.c
index ac5e7a4bb..1c554b6c6 100755
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -4,9 +4,7 @@
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
-
-extern bool32 IsMatchCallTaskActive(void);
-extern void StartMatchCallFromScript(u8*);
+#include "match_call.h"
 
 static EWRAM_DATA u8 sFieldMessageBoxMode = 0;
 
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 96e679dd7..a070fe0e1 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -2125,7 +2125,7 @@ void sub_808D194(void)
     sub_808D1FC(CreateTask(sub_808D1FC, 0));
 }
 
-bool8 sub_808D1B4(void)
+bool32 sub_808D1B4(void)
 {
     return FuncIsActiveTask(sub_808D1FC);
 }
@@ -2135,7 +2135,7 @@ void sub_808D1C8(void)
     sub_808D094(CreateTask(sub_808D094, 0));
 }
 
-bool8 sub_808D1E8(void)
+bool32 sub_808D1E8(void)
 {
     return FuncIsActiveTask(sub_808D094);
 }
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 4027fdffc..5769f44af 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -10,7 +10,6 @@
 #include "field_screen_effect.h"
 #include "field_special_scene.h"
 #include "field_weather.h"
-// #include "fldeff_flash.h"
 #include "gpu_regs.h"
 #include "link.h"
 #include "link_rfu.h"
@@ -31,22 +30,9 @@
 #include "constants/event_object_movement_constants.h"
 #include "constants/songs.h"
 #include "constants/rgb.h"
-
-extern bool32 sub_81D6534(void);
-extern bool8 walkrun_is_standing_still(void);
-extern void ScriptUnfreezeEventObjects(void);
-extern void sub_80FB768(void);
-extern void sub_808D194(void);
-extern void sub_808D1C8(void);
-extern bool32 sub_808D1B4(void);
-extern bool32 sub_808D1E8(void);
-extern void sub_80B6B68(void);
-extern void sub_80B6E4C(u8, u8);
-extern void sub_80B75D8(u8);
-extern void sub_80B7A74(u8);
-extern void sub_808C0A8(u8);
-extern u8 GetMapPairFadeToType(u8, u8);
-extern u8 GetMapPairFadeFromType(u8, u8);
+#include "trainer_hill.h"
+#include "event_obj_lock.h"
+#include "fldeff.h"
 
 extern const u16 gUnknown_82EC7CC[];
 
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 2b518808b..e059e6ef8 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -301,7 +301,7 @@ void Task_HandlePorthole(u8 taskId)
         break;
     case EXIT_PORTHOLE: // exit porthole.
         FlagClear(FLAG_SPECIAL_FLAG_0x4001);
-        FlagClear(FLAG_SPECIAL_FLAG_0x4000);
+        FlagClear(FLAG_HIDE_MAP_NAME_POPUP);
         SetWarpDestinationToDynamicWarp(0);
         DoDiveWarp();
         DestroyTask(taskId);
@@ -338,7 +338,7 @@ void sub_80FB7A4(void)
 {
     FlagSet(FLAG_SYS_CRUISE_MODE);
     FlagSet(FLAG_SPECIAL_FLAG_0x4001);
-    FlagSet(FLAG_SPECIAL_FLAG_0x4000);
+    FlagSet(FLAG_HIDE_MAP_NAME_POPUP);
     SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
     sub_80FB59C();
     sub_80AF8B8();
diff --git a/src/field_specials.c b/src/field_specials.c
index 910937c51..2ae494dad 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -55,6 +55,7 @@
 #include "constants/vars.h"
 #include "constants/battle_frontier.h"
 #include "constants/weather.h"
+#include "palette.h"
 
 EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE;
 EWRAM_DATA u8 gBikeCollisions = 0;
@@ -80,9 +81,6 @@ extern const u16 gEventObjectPalette17[];
 extern const u16 gEventObjectPalette33[];
 extern const u16 gEventObjectPalette34[];
 
-extern void LoadPalette(const void *src, u32 offset, u16 size); // incorrect signature, needed to match
-extern void BlendPalettes(u32, u8, u16);
-extern void FieldInitRegionMap(MainCallback callback);
 
 void UpdateMovedLilycoveFanClubMembers(void);
 void sub_813BF60(void);
@@ -591,7 +589,9 @@ void SpawnLinkPartnerEventObject(void)
 
 static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum)
 {
-    paletteNum += 6;
+    u8 adjustedPaletteNum;
+    // Note: This temp var is necessary; paletteNum += 6 doesn't match.
+    adjustedPaletteNum = paletteNum + 6;
     if (graphicsId == EVENT_OBJ_GFX_LINK_RS_BRENDAN ||
         graphicsId == EVENT_OBJ_GFX_LINK_RS_MAY ||
         graphicsId == EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL ||
@@ -602,21 +602,21 @@ static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEvent
         {
             u8 spriteId = gEventObjects[obj].spriteId;
             struct Sprite *sprite = &gSprites[spriteId];
-            sprite->oam.paletteNum = paletteNum;
+            sprite->oam.paletteNum = adjustedPaletteNum;
 
             switch (graphicsId)
             {
                 case EVENT_OBJ_GFX_LINK_RS_BRENDAN:
-                    LoadPalette(gEventObjectPalette33, 0x100 + paletteNum * 16, 0x20);
+                    LoadPalette(gEventObjectPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20);
                     break;
                 case EVENT_OBJ_GFX_LINK_RS_MAY:
-                    LoadPalette(gEventObjectPalette34, 0x100 + paletteNum * 16, 0x20);
+                    LoadPalette(gEventObjectPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20);
                     break;
                 case EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL:
-                    LoadPalette(gEventObjectPalette8, 0x100 + paletteNum * 16, 0x20);
+                    LoadPalette(gEventObjectPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20);
                     break;
                 case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL:
-                    LoadPalette(gEventObjectPalette17, 0x100 + paletteNum * 16, 0x20);
+                    LoadPalette(gEventObjectPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20);
                     break;
             }
         }
@@ -3379,7 +3379,7 @@ u16 get_unknown_box_id(void)
     return gUnknown_0203AB6F;
 }
 
-bool32 sub_813B21C(void)
+bool8 sub_813B21C(void)
 {
     if (FlagGet(FLAG_SYS_STORAGE_UNKNOWN_FLAG) == FALSE)
     {
diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c
index be8fdc6cb..6ec83f1a0 100644
--- a/src/field_weather_effect.c
+++ b/src/field_weather_effect.c
@@ -48,10 +48,10 @@ static const struct OamData gOamData_839A9DC =
     .objMode = 1,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 3,
     .paletteNum = 0,
@@ -577,10 +577,10 @@ static const struct OamData gOamData_839AA68 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 2,
+    .shape = SPRITE_SHAPE(16x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(16x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 2,
@@ -648,10 +648,10 @@ static const struct OamData gOamData_839AAD4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -704,10 +704,10 @@ static const struct OamData gOamData_839AB2C =
     .objMode = 1,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -1517,10 +1517,10 @@ const struct OamData gOamData_839ABB8 =
     .objMode = 1,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 15,
@@ -1754,10 +1754,10 @@ const struct OamData gOamData_839ABF0 =
     .objMode = 1,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -1953,10 +1953,10 @@ const struct OamData gOamData_839AC1C =
     .objMode = 1,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 348a1f46c..b1f4a6368 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -20,7 +20,6 @@
 #include "constants/field_effects.h"
 #include "constants/songs.h"
 
-extern void ScriptUnfreezeEventObjects(void);
 extern bool8 IsMewPlayingHideAndSeek(void);
 
 extern struct MapPosition gPlayerFacingPosition;
@@ -133,10 +132,10 @@ static const struct OamData sOamData_CutGrass =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 1,
     .priority = 1,
     .paletteNum = 1,
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index d4d6075f3..5d1920aac 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -93,8 +93,8 @@ static const struct OamData gOamData_858E4D8 =
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2,
 };
 
@@ -246,8 +246,8 @@ static const struct OamData gOamData_858E658 =
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 2,
 };
 
diff --git a/src/frontier_util.c b/src/frontier_util.c
index 0c68bf119..bce7b926f 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -35,8 +35,7 @@
 #include "constants/moves.h"
 #include "constants/items.h"
 #include "constants/event_objects.h"
-
-extern u8 gSelectedOrderFromParty[];
+#include "party_menu.h"
 
 struct FrontierBrainMon
 {
@@ -48,8 +47,6 @@ struct FrontierBrainMon
     u16 moves[4];
 };
 
-extern void sub_81B8558(void);
-
 // This file's functions.
 static void sub_81A17A0(void);
 static void sub_81A1830(void);
diff --git a/src/graphics.c b/src/graphics.c
index a3b9eb913..c243c64a5 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -4,10 +4,10 @@ const u32 gBattleTextboxTiles[] = INCBIN_U32("graphics/battle_interface/textbox.
 const u32 gBattleTextboxPalette[] = INCBIN_U32("graphics/battle_interface/textbox.gbapal.lz");
 const u32 gBattleTextboxTilemap[] = INCBIN_U32("graphics/battle_interface/textbox_map.bin.lz");
 
-const u32 gMonStillFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/front_pics/circled_question_mark_still_front_pic.4bpp.lz");
-const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/back_pics/circled_question_mark_back_pic.4bpp.lz");
-const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz");
-const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz");
+const u32 gMonStillFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/front.4bpp.lz");
+const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/back.4bpp.lz");
+const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/normal.gbapal.lz");
+const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/shiny.gbapal.lz");
 
 const u32 gUnusedGfx_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.4bpp.lz"); // japanese table and bunch of stuff
 const u32 gUnusedTimemap_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.bin.lz");
@@ -953,8 +953,8 @@ const u32 gUnknownPal_C2F9E0[] = INCBIN_U32("graphics/unknown/unknown_C2F9E0.gba
 #include "data/graphics/pokemon.h"
 #include "data/graphics/trainers.h"
 
-const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/icons/question_mark_icon.4bpp");
-const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/footprints/question_mark_footprint.1bpp");
+const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
+const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp");
 
 const u32 gUnknown_08D778F0[] = INCBIN_U32("graphics/battle_transitions/vs_frame.4bpp.lz");
 const u32 gUnknown_08D779D8[] = INCBIN_U32("graphics/battle_transitions/vs_frame.bin.lz");
@@ -1064,7 +1064,7 @@ const u32 gEnemyMonShadow_Gfx[] = INCBIN_U32("graphics/battle_interface/enemy_mo
 
 const u32 gBattleInterface_BallStatusBarGfx[] = INCBIN_U32("graphics/battle_interface/ball_status_bar.4bpp.lz");
 
-const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/icons/egg_icon.4bpp");
+const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp");
 
 const u32 gBattleAnimBackgroundImage_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.4bpp.lz");
 const u32 gBattleAnimBackgroundPalette_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.gbapal.lz");
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 53577e166..8eba90d96 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -66,8 +66,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 #define HALL_OF_FAME_MAX_TEAMS 50
 
-extern void ReturnFromHallOfFamePC(void);
-
 // this file's functions
 static void ClearVramOamPltt_LoadHofPal(void);
 static void sub_8174F70(void);
@@ -180,10 +178,10 @@ static const struct OamData sOamData_85E53FC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/hof_pc.c b/src/hof_pc.c
index 2cea5540a..d76f04372 100644
--- a/src/hof_pc.c
+++ b/src/hof_pc.c
@@ -7,10 +7,6 @@
 #include "script_menu.h"
 #include "task.h"
 
-extern void Overworld_PlaySpecialMapMusic(void);
-extern bool16 ScrSpecial_CreatePCMenu(void);
-extern void ScriptMenu_DisplayPCStartupPrompt(void);
-
 static void ReshowPCMenuAfterHallOfFamePC(void);
 static void Task_WaitForPaletteFade(u8);
 
diff --git a/src/ice.c b/src/ice.c
index 34ad572e8..fa1913b96 100644
--- a/src/ice.c
+++ b/src/ice.c
@@ -21,30 +21,29 @@ struct HailStruct {
 };
 
 static void sub_810B6C4(struct Sprite *);
-extern void sub_810B848(struct Sprite *);
-extern void AnimIcePunchSwirlingParticle(struct Sprite *);
-extern void AnimIceBeamParticle(struct Sprite *);
-extern void AnimIceEffectParticle(struct Sprite *);
-extern void AnimFlickerIceEffectParticle(struct Sprite *);
-extern void AnimSwirlingSnowball_Step1(struct Sprite *);
-extern void AnimSwirlingSnowball_Step2(struct Sprite *);
-extern void AnimSwirlingSnowball_Step3(struct Sprite *);
-extern void AnimSwirlingSnowball_End(struct Sprite *);
-extern void AnimMoveParticleBeyondTarget(struct Sprite *);
-extern void AnimWiggleParticleTowardsTarget(struct Sprite *);
-extern void AnimWaveFromCenterOfTarget(struct Sprite *);
-extern void InitSwirlingFogAnim(struct Sprite *);
-extern void AnimSwirlingFogAnim(struct Sprite *);
-extern void AnimThrowMistBall(struct Sprite *);
-extern void InitPoisonGasCloudAnim(struct Sprite *);
-extern void MovePoisonGasCloud(struct Sprite *);
-extern void AnimHailBegin(struct Sprite *);
-extern void AnimHailContinue(struct Sprite *);
-extern void sub_80A8EE4(struct Sprite *);
-extern void InitIceBallAnim(struct Sprite *);
-extern void AnimThrowIceBall(struct Sprite *);
-extern void InitIceBallParticle(struct Sprite *);
-extern void AnimIceBallParticle(struct Sprite *);
+void sub_810B848(struct Sprite *);
+void AnimIcePunchSwirlingParticle(struct Sprite *);
+void AnimIceBeamParticle(struct Sprite *);
+void AnimIceEffectParticle(struct Sprite *);
+void AnimFlickerIceEffectParticle(struct Sprite *);
+void AnimSwirlingSnowball_Step1(struct Sprite *);
+void AnimSwirlingSnowball_Step2(struct Sprite *);
+void AnimSwirlingSnowball_Step3(struct Sprite *);
+void AnimSwirlingSnowball_End(struct Sprite *);
+void AnimMoveParticleBeyondTarget(struct Sprite *);
+void AnimWiggleParticleTowardsTarget(struct Sprite *);
+void AnimWaveFromCenterOfTarget(struct Sprite *);
+void InitSwirlingFogAnim(struct Sprite *);
+void AnimSwirlingFogAnim(struct Sprite *);
+void AnimThrowMistBall(struct Sprite *);
+void InitPoisonGasCloudAnim(struct Sprite *);
+void MovePoisonGasCloud(struct Sprite *);
+void AnimHailBegin(struct Sprite *);
+void AnimHailContinue(struct Sprite *);
+void InitIceBallAnim(struct Sprite *);
+void AnimThrowIceBall(struct Sprite *);
+void InitIceBallParticle(struct Sprite *);
+void AnimIceBallParticle(struct Sprite *);
 void AnimTask_Haze2(u8);
 void AnimTask_OverlayFogTiles(u8);
 void AnimTask_Hail2(u8);
diff --git a/src/intro.c b/src/intro.c
index 23457f370..e97fbedb0 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -145,10 +145,10 @@ static const struct OamData gUnknown_085E4A94 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -214,10 +214,10 @@ static const struct OamData gUnknown_085E4B28 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -251,10 +251,10 @@ static const struct OamData gUnknown_085E4B58 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -307,10 +307,10 @@ static const struct OamData gUnknown_085E4BBC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -356,10 +356,10 @@ static const struct OamData gUnknown_085E4C14 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -441,10 +441,10 @@ static const struct OamData gUnknown_085E4CF0 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 2,
+    .shape = SPRITE_SHAPE(16x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(16x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -481,10 +481,10 @@ static const struct OamData gUnknown_085E4D2C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -572,10 +572,10 @@ static const struct OamData gUnknown_085E4DD4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -588,10 +588,10 @@ static const struct OamData gUnknown_085E4DDC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -604,10 +604,10 @@ static const struct OamData gUnknown_085E4DE4 =
     .objMode = 1,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 2,
+    .shape = SPRITE_SHAPE(32x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(32x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -804,10 +804,10 @@ static const struct OamData gUnknown_085E4FB0 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -857,10 +857,10 @@ static const struct OamData gUnknown_085E501C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -2427,7 +2427,7 @@ static void Task_IntroWaterDrops_1(u8 taskId)
                                    | BLDCNT_TGT2_BG3
                                    | BLDCNT_TGT2_OBJ
                                    | BLDCNT_TGT2_BD);
-        SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[31]);
+        SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[31]);
         SetGpuReg(REG_OFFSET_BLDY, 0);
         gTasks[taskId].data[1] = 0x40;
         gTasks[taskId].data[0]++;
@@ -2439,11 +2439,11 @@ static void Task_IntroWaterDrops_1(u8 taskId)
 
             gTasks[taskId].data[1]--;
             tmp = gTasks[taskId].data[1] / 2;
-            SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[tmp]);
+            SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[tmp]);
         }
         else
         {
-            SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[0]);
+            SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[0]);
             gTasks[taskId].data[1] = 0x10;
             gTasks[taskId].data[0]++;
         }
@@ -2470,7 +2470,7 @@ static void Task_IntroWaterDrops_2(u8 taskId)
                                    | BLDCNT_TGT2_BG3
                                    | BLDCNT_TGT2_OBJ
                                    | BLDCNT_TGT2_BD);
-        SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[0]);
+        SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[0]);
         SetGpuReg(REG_OFFSET_BLDY, 0);
         gTasks[taskId].data[1] = 0;
         gTasks[taskId].data[0]++;
@@ -2482,11 +2482,11 @@ static void Task_IntroWaterDrops_2(u8 taskId)
 
             gTasks[taskId].data[1]++;
             tmp = gTasks[taskId].data[1] / 2;
-            SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[tmp]);
+            SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[tmp]);
         }
         else
         {
-            SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[31]);
+            SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[31]);
             gTasks[taskId].data[1] = 0x10;
             gTasks[taskId].data[0]++;
         }
diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c
index b98708324..059c1079e 100644
--- a/src/intro_credits_graphics.c
+++ b/src/intro_credits_graphics.c
@@ -57,123 +57,380 @@ static void nullsub_65(struct Sprite *sprite);
 static void sub_817B7C4(struct Sprite *sprite);
 static void nullsub_66(struct Sprite *sprite);
 
-static const struct SpriteTemplate gUnknown_085F504C = {
-    2000, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C
+static const struct SpriteTemplate gUnknown_085F504C =
+{
+    .tileTag = 2000,
+    .paletteTag = 0xFFFF,
+    .oam = &gDummyOamData,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_817B62C
 };
 
-static const struct CompressedSpriteSheet gUnknown_085F5064[] = {
-    { gUnknown_085F16A8, 0x400, 2000 },
-    { NULL }
+static const struct CompressedSpriteSheet gUnknown_085F5064[] =
+{
+    {
+        .data = gUnknown_085F16A8,
+        .size = 0x400,
+        .tag = 2000
+    },
+    {}
 };
 
-static const union AnimCmd gUnknown_085F5074[] = {
+static const union AnimCmd gUnknown_085F5074[] =
+{
     ANIMCMD_FRAME( 0, 30),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085F507C[] = {
+static const union AnimCmd gUnknown_085F507C[] =
+{
     ANIMCMD_FRAME(16, 30),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085F5084[] = {
+static const union AnimCmd gUnknown_085F5084[] =
+{
     ANIMCMD_FRAME(20, 30),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085F508C[] = {
+static const union AnimCmd gUnknown_085F508C[] =
+{
     ANIMCMD_FRAME(22, 30),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gUnknown_085F5094[] = {
+static const union AnimCmd *const gUnknown_085F5094[] =
+{
     gUnknown_085F5074,
     gUnknown_085F507C,
     gUnknown_085F5084,
     gUnknown_085F508C
 };
 
-static const struct IntroCreditsSpriteMetadata gUnknown_085F50A4[] = {
-    {  0, ST_OAM_SQUARE,      2,   72, 32, 100, 0xc00 },
-    {  0, ST_OAM_SQUARE,      2,  158, 32, 100, 0xc00 },
-    {  1, ST_OAM_SQUARE,      1,  192, 40, 101, 0x800 },
-    {  1, ST_OAM_SQUARE,      1,   56, 40, 101, 0x800 },
-    {  2, ST_OAM_H_RECTANGLE, 0,  100, 44, 102, 0x400 },
-    {  2, ST_OAM_H_RECTANGLE, 0,  152, 44, 102, 0x400 },
-    {  3, ST_OAM_H_RECTANGLE, 0,    8, 46, 103, 0x100 },
-    {  3, ST_OAM_H_RECTANGLE, 0,   56, 46, 103, 0x100 },
-    {  3, ST_OAM_H_RECTANGLE, 0,  240, 46, 103, 0x100 },
+static const struct IntroCreditsSpriteMetadata gUnknown_085F50A4[] =
+{
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 72,
+        .y = 32,
+        .subpriority = 100,
+        .xOff = 0xc00
+    },
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 158,
+        .y = 32,
+        .subpriority = 100,
+        .xOff = 0xc00
+    },
+    {
+        .animNum = 1,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .x = 192,
+        .y = 40,
+        .subpriority = 101,
+        .xOff = 0x800
+    },
+    {
+        .animNum = 1,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .x = 56,
+        .y = 40,
+        .subpriority = 101,
+        .xOff = 0x800
+    },
+    {
+        .animNum = 2,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .x = 100,
+        .y = 44,
+        .subpriority = 102,
+        .xOff = 0x400
+    },
+    {
+        .animNum = 2,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .x = 152,
+        .y = 44,
+        .subpriority = 102,
+        .xOff = 0x400
+    },
+    {
+        .animNum = 3,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .x = 8,
+        .y = 46,
+        .subpriority = 103,
+        .xOff = 0x100
+    },
+    {
+        .animNum = 3,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .x = 56,
+        .y = 46,
+        .subpriority = 103,
+        .xOff = 0x100
+    },
+    {
+        .animNum = 3,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .x = 240,
+        .y = 46,
+        .subpriority = 103,
+        .xOff = 0x100
+    },
 };
 
-static const struct CompressedSpriteSheet gUnknown_085F50EC[] = {
-    { gIntro2TreeTiles, 0x400, 2000 },
-    { NULL }
+static const struct CompressedSpriteSheet gUnknown_085F50EC[] =
+{
+    {
+        .data = gIntro2TreeTiles,
+        .size = 0x400,
+        .tag = 2000
+    },
+    {}
 };
 
-static const union AnimCmd gUnknown_085F50FC[] = {
+static const union AnimCmd gUnknown_085F50FC[] =
+{
     ANIMCMD_FRAME( 0, 30),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085F5104[] = {
+static const union AnimCmd gUnknown_085F5104[] =
+{
     ANIMCMD_FRAME(16, 30),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085F510C[] = {
+static const union AnimCmd gUnknown_085F510C[] =
+{
     ANIMCMD_FRAME(24, 30),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gUnknown_085F5114[] = {
+static const union AnimCmd *const gUnknown_085F5114[] =
+{
     gUnknown_085F50FC,
     gUnknown_085F5104,
     gUnknown_085F510C
 };
 
-static const struct IntroCreditsSpriteMetadata gUnknown_085F5120[] = {
-    {  0, ST_OAM_SQUARE,      2,   16, 88, 100, 0x2000 },
-    {  0, ST_OAM_SQUARE,      2,   80, 88, 100, 0x2000 },
-    {  0, ST_OAM_SQUARE,      2,  144, 88, 100, 0x2000 },
-    {  0, ST_OAM_SQUARE,      2,  208, 88, 100, 0x2000 },
-    {  1, ST_OAM_V_RECTANGLE, 2,   40, 88, 101, 0x1000 },
-    {  1, ST_OAM_V_RECTANGLE, 2,  104, 88, 101, 0x1000 },
-    {  1, ST_OAM_V_RECTANGLE, 2,  168, 88, 101, 0x1000 },
-    {  1, ST_OAM_V_RECTANGLE, 2,  232, 88, 101, 0x1000 },
-    {  2, ST_OAM_V_RECTANGLE, 2,   56, 88, 102, 0x800  },
-    {  2, ST_OAM_V_RECTANGLE, 2,  120, 88, 102, 0x800  },
-    {  2, ST_OAM_V_RECTANGLE, 2,  184, 88, 102, 0x800  },
-    {  2, ST_OAM_V_RECTANGLE, 2,  248, 88, 102, 0x800  },
+static const struct IntroCreditsSpriteMetadata gUnknown_085F5120[] =
+{
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 16,
+        .y = 88,
+        .subpriority = 100,
+        .xOff = 0x2000,
+    },
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 80,
+        .y = 88,
+        .subpriority = 100,
+        .xOff = 0x2000,
+    },
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 144,
+        .y = 88,
+        .subpriority = 100,
+        .xOff = 0x2000,
+    },
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 208,
+        .y = 88,
+        .subpriority = 100,
+        .xOff = 0x2000,
+    },
+    {
+        .animNum = 1,
+        .shape = SPRITE_SHAPE(16x32),
+        .size = SPRITE_SIZE(16x32),
+        .x = 40,
+        .y = 88,
+        .subpriority = 101,
+        .xOff = 0x1000,
+    },
+    {
+        .animNum = 1,
+        .shape = SPRITE_SHAPE(16x32),
+        .size = SPRITE_SIZE(16x32),
+        .x = 104,
+        .y = 88,
+        .subpriority = 101,
+        .xOff = 0x1000,
+    },
+    {
+        .animNum = 1,
+        .shape = SPRITE_SHAPE(16x32),
+        .size = SPRITE_SIZE(16x32),
+        .x = 168,
+        .y = 88,
+        .subpriority = 101,
+        .xOff = 0x1000,
+    },
+    {
+        .animNum = 1,
+        .shape = SPRITE_SHAPE(16x32),
+        .size = SPRITE_SIZE(16x32),
+        .x = 232,
+        .y = 88,
+        .subpriority = 101,
+        .xOff = 0x1000,
+    },
+    {
+        .animNum = 2,
+        .shape = SPRITE_SHAPE(16x32),
+        .size = SPRITE_SIZE(16x32),
+        .x = 56,
+        .y = 88,
+        .subpriority = 102,
+        .xOff = 0x800,
+    },
+    {
+        .animNum = 2,
+        .shape = SPRITE_SHAPE(16x32),
+        .size = SPRITE_SIZE(16x32),
+        .x = 120,
+        .y = 88,
+        .subpriority = 102,
+        .xOff = 0x800,
+    },
+    {
+        .animNum = 2,
+        .shape = SPRITE_SHAPE(16x32),
+        .size = SPRITE_SIZE(16x32),
+        .x = 184,
+        .y = 88,
+        .subpriority = 102,
+        .xOff = 0x800,
+    },
+    {
+        .animNum = 2,
+        .shape = SPRITE_SHAPE(16x32),
+        .size = SPRITE_SIZE(16x32),
+        .x = 248,
+        .y = 88,
+        .subpriority = 102,
+        .xOff = 0x800,
+    }
 };
 
-static const struct CompressedSpriteSheet gUnknown_085F5180[] = {
-    { gIntro2NightTiles, 0x400, 2000 },
-    { NULL }
+static const struct CompressedSpriteSheet gUnknown_085F5180[] =
+{
+    {
+        .data = gIntro2NightTiles,
+        .size = 0x400,
+        .tag = 2000
+    },
+    {}
 };
 
-static const union AnimCmd gUnknown_085F5190[] = {
+static const union AnimCmd gUnknown_085F5190[] =
+{
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gUnknown_085F5198[] = {
+static const union AnimCmd *const gUnknown_085F5198[] =
+{
     gUnknown_085F5190
 };
 
-static const struct IntroCreditsSpriteMetadata gUnknown_085F519C[] = {
-    { 0, ST_OAM_SQUARE, 2,   24, 88, 100, 0x1000 },
-    { 0, ST_OAM_SQUARE, 2,   64, 88, 100, 0x1000 },
-    { 0, ST_OAM_SQUARE, 2,  104, 88, 100, 0x1000 },
-    { 0, ST_OAM_SQUARE, 2,  144, 88, 100, 0x1000 },
-    { 0, ST_OAM_SQUARE, 2,  184, 88, 100, 0x1000 },
-    { 0, ST_OAM_SQUARE, 2,  224, 88, 100, 0x1000 },
+static const struct IntroCreditsSpriteMetadata gUnknown_085F519C[] =
+{
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 24,
+        .y = 88,
+        .subpriority = 100,
+        .xOff = 0x1000,
+    },
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 64,
+        .y = 88,
+        .subpriority = 100,
+        .xOff = 0x1000,
+    },
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 104,
+        .y = 88,
+        .subpriority = 100,
+        .xOff = 0x1000,
+    },
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 144,
+        .y = 88,
+        .subpriority = 100,
+        .xOff = 0x1000,
+    },
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 184,
+        .y = 88,
+        .subpriority = 100,
+        .xOff = 0x1000,
+    },
+    {
+        .animNum = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .x = 224,
+        .y = 88,
+        .subpriority = 100,
+        .xOff = 0x1000,
+    }
 };
 
-static const struct OamData gOamData_85F51CC = {
-    .y = 160, .shape = ST_OAM_SQUARE, .size = 3, .priority = 1
+static const struct OamData gOamData_85F51CC =
+{
+    .y = 160,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
+    .priority = 1
 };
 
-static const union AnimCmd gUnknown_085F51D4[] = {
+static const union AnimCmd gUnknown_085F51D4[] =
+{
     ANIMCMD_FRAME(  0, 8),
     ANIMCMD_FRAME( 64, 8),
     ANIMCMD_FRAME(128, 8),
@@ -181,23 +438,43 @@ static const union AnimCmd gUnknown_085F51D4[] = {
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd *const gUnknown_085F51E8[] = {
+static const union AnimCmd *const gUnknown_085F51E8[] =
+{
     gUnknown_085F51D4
 };
 
-static const struct SpriteTemplate gUnknown_085F51EC = {
-    1002, 1002, &gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65
+static const struct SpriteTemplate gUnknown_085F51EC =
+{
+    .tileTag = 1002,
+    .paletteTag = 1002,
+    .oam = &gOamData_85F51CC,
+    .anims = gUnknown_085F51E8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = nullsub_65
 };
 
-static const struct SpriteTemplate gUnknown_085F5204 = {
-    1003, 1003, &gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65
+static const struct SpriteTemplate gUnknown_085F5204 =
+{
+    .tileTag = 1003,
+    .paletteTag = 1003,
+    .oam = &gOamData_85F51CC,
+    .anims = gUnknown_085F51E8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = nullsub_65
 };
 
-static const struct OamData gUnknown_085F521C = {
-    .y = 160, .shape = ST_OAM_H_RECTANGLE, .size = 3, .priority = 1
+static const struct OamData gUnknown_085F521C =
+{
+    .y = 160,
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
+    .priority = 1
 };
 
-static const union AnimCmd gUnknown_085F5224[] = {
+static const union AnimCmd gUnknown_085F5224[] =
+{
     ANIMCMD_FRAME(  0, 8),
     ANIMCMD_FRAME( 32, 8),
     ANIMCMD_FRAME( 64, 8),
@@ -205,119 +482,217 @@ static const union AnimCmd gUnknown_085F5224[] = {
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd *const gUnknown_085F5238[] = {
+static const union AnimCmd *const gUnknown_085F5238[] =
+{
     gUnknown_085F5224
 };
 
-static const struct SpriteTemplate gUnknown_085F523C = {
-    1001, 1002, &gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4
+static const struct SpriteTemplate gUnknown_085F523C =
+{
+    .tileTag = 1001,
+    .paletteTag = 1002,
+    .oam = &gUnknown_085F521C,
+    .anims = gUnknown_085F5238,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_817B7C4
 };
 
-static const struct SpriteTemplate gUnknown_085F5254 = {
-    1001, 1003, &gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4
+static const struct SpriteTemplate gUnknown_085F5254 =
+{
+    .tileTag = 1001,
+    .paletteTag = 1003,
+    .oam = &gUnknown_085F521C,
+    .anims = gUnknown_085F5238,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_817B7C4
 };
 
-static const struct OamData gUnknown_085F526C = {
-    .y = 160, .shape = ST_OAM_SQUARE, .size = 3, .priority = 1
+static const struct OamData gUnknown_085F526C =
+{
+    .y = 160,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
+    .priority = 1
 };
 
-static const union AnimCmd gUnknown_085F5274[] = {
+static const union AnimCmd gUnknown_085F5274[] =
+{
     ANIMCMD_FRAME(  0, 16),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085F527C[] = {
+static const union AnimCmd gUnknown_085F527C[] =
+{
     ANIMCMD_FRAME( 64, 16),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gUnknown_085F5284[] = {
+static const union AnimCmd *const gUnknown_085F5284[] =
+{
     gUnknown_085F5274,
     gUnknown_085F527C
 };
 
-static const struct SpriteTemplate gUnknown_085F528C = {
-    1004, 1004, &gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66
+static const struct SpriteTemplate gUnknown_085F528C =
+{
+    .tileTag = 1004,
+    .paletteTag = 1004,
+    .oam = &gUnknown_085F526C,
+    .anims = gUnknown_085F5284,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = nullsub_66
 };
 
-static const struct SpriteTemplate gUnknown_085F52A4 = {
-    1005, 1005, &gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66
+static const struct SpriteTemplate gUnknown_085F52A4 =
+{
+    .tileTag = 1005,
+    .paletteTag = 1005,
+    .oam = &gUnknown_085F526C,
+    .anims = gUnknown_085F5284,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = nullsub_66
 };
 
-const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[] = {
-    { gIntro2BrendanNoTurnGfx, 0x2000, 1002 },
-    { NULL }
+const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[] =
+{
+    {
+        .data = gIntro2BrendanNoTurnGfx,
+        .size = 0x2000,
+        .tag = 1002
+    },
+    {}
 };
 
-const struct CompressedSpriteSheet gIntro2MaySpriteSheet[] = {
-    { gIntro2MayNoTurnGfx, 0x2000, 1003 },
-    { NULL }
+const struct CompressedSpriteSheet gIntro2MaySpriteSheet[] =
+{
+    {
+        .data = gIntro2MayNoTurnGfx,
+        .size = 0x2000,
+        .tag = 1003
+    },
+    {}
 };
 
-const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[] = {
-    { gIntro2BicycleTiles, 0x1000, 1001 },
-    { NULL }
+const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[] =
+{
+    {
+        .data = gIntro2BicycleTiles,
+        .size = 0x1000,
+        .tag = 1001
+    },
+    {}
 };
 
-static const struct CompressedSpriteSheet gUnknown_085F52EC[] = {
-    { gIntro2FlygonGfx, 0x1000, 1004 },
-    { NULL }
+static const struct CompressedSpriteSheet gUnknown_085F52EC[] =
+{
+    {
+        .data = gIntro2FlygonGfx,
+        .size = 0x1000,
+        .tag = 1004
+    },
+    {}
 };
 
-const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[] = {
-    { gIntro2FlygonGfx, 0x1000, 1005 },
-    { NULL }
+const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[] =
+{
+    {
+        .data = gIntro2FlygonGfx,
+        .size = 0x1000,
+        .tag = 1005
+    },
+    {}
 };
 
-const struct SpritePalette gIntroBikeAndFlygonPalette[] = {
-    { gIntro2BrendanNoTurnPal, 1002 },
-    { gIntro2BrendanNoTurnPal, 1003 },
-    { gIntro2FlygonPal,        1004 },
-    { gIntro2FlygonPal,        1005 },
-    { NULL }
+const struct SpritePalette gIntroBikeAndFlygonPalette[] =
+{
+    { .data = gIntro2BrendanNoTurnPal, .tag = 1002 },
+    { .data = gIntro2BrendanNoTurnPal, .tag = 1003 },
+    { .data = gIntro2FlygonPal,        .tag = 1004 },
+    { .data = gIntro2FlygonPal,        .tag = 1005 },
+    {}
 };
 
-const struct CompressedSpriteSheet gUnknown_085F5334[] = {
-    { gIntro2BrendanTiles, 0x3800, 1002 },
-    { NULL }
+const struct CompressedSpriteSheet gUnknown_085F5334[] =
+{
+    {
+        .data = gIntro2BrendanTiles,
+        .size = 0x3800,
+        .tag = 1002
+    },
+    {}
 };
 
-const struct CompressedSpriteSheet gUnknown_085F5344[] = {
-    { gIntro2MayTiles, 0x3800, 1003 },
-    { NULL }
+const struct CompressedSpriteSheet gUnknown_085F5344[] =
+{
+    {
+        .data = gIntro2MayTiles,
+        .size = 0x3800,
+        .tag = 1003
+    },
+    {}
 };
 
-const struct CompressedSpriteSheet gUnknown_085F5354[] = {
-    { gIntro2BicycleTiles, 0x1000, 1001 },
-    { NULL }
+const struct CompressedSpriteSheet gUnknown_085F5354[] =
+{
+    {
+        .data = gIntro2BicycleTiles,
+        .size = 0x1000,
+        .tag = 1001
+    },
+    {}
 };
 
-static const struct CompressedSpriteSheet gUnknown_085F5364[] = {
-    { gIntro2LatiosTiles, 0x1000, 1004 },
-    { NULL }
+static const struct CompressedSpriteSheet gUnknown_085F5364[] =
+{
+    {
+        .data = gIntro2LatiosTiles,
+        .size = 0x1000,
+        .tag = 1004
+    },
+    {}
 };
 
-static const struct CompressedSpriteSheet gUnknown_085F5374[] = {
-    { gIntro2LatiasTiles, 0x1000, 1005 },
-    { NULL }
+static const struct CompressedSpriteSheet gUnknown_085F5374[] =
+{
+    {
+        .data = gIntro2LatiasTiles,
+        .size = 0x1000,
+        .tag = 1005
+    },
+    {}
 };
 
-const struct SpritePalette gUnknown_085F5384[] = {
-    { gIntro2BrendanPalette, 1002 },
-    { gIntro2MayPalette,     1003 },
-    { gIntro2LatiosPalette,  1004 },
-    { gIntro2LatiasPalette,  1005 },
-    { NULL }
+const struct SpritePalette gUnknown_085F5384[] =
+{
+    { .data = gIntro2BrendanPalette, .tag = 1002 },
+    { .data = gIntro2MayPalette,     .tag = 1003 },
+    { .data = gIntro2LatiosPalette,  .tag = 1004 },
+    { .data = gIntro2LatiasPalette,  .tag = 1005 },
+    {}
 };
 
-const struct CompressedSpriteSheet gUnknown_085F53AC[] = {
-    { gIntro2BrendanTiles, 0x2000, 1002},
-    { NULL }
+const struct CompressedSpriteSheet gUnknown_085F53AC[] =
+{
+    {
+        .data = gIntro2BrendanTiles,
+        .size = 0x2000,
+        .tag = 1002
+    },
+    {}
 };
 
-const struct CompressedSpriteSheet gUnknown_085F53BC[] = {
-    { gIntro2MayTiles, 0x2000, 1003},
-    { NULL }
+const struct CompressedSpriteSheet gUnknown_085F53BC[] =
+{
+    {
+        .data = gIntro2MayTiles,
+        .size = 0x2000,
+        .tag = 1003
+    },
+    {}
 };
 
 EWRAM_DATA u16 gUnknown_0203BD24 = 0;
diff --git a/src/item_icon.c b/src/item_icon.c
index e9379dbba..7bf1a29ca 100644
--- a/src/item_icon.c
+++ b/src/item_icon.c
@@ -20,10 +20,10 @@ static const struct OamData sOamData_ItemIcon =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 2,
diff --git a/src/item_menu.c b/src/item_menu.c
index 667b6930d..81bc120a8 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -141,7 +141,6 @@ void unknown_ItemMenu_Confirm2(u8 taskId);
 void unknown_item_menu_type(u8 taskId);
 void item_menu_type_2(u8 taskId);
 void display_sell_item_ask_str(u8 taskId);
-void unknown_ItemMenu_Confirm(u8 taskId);
 void display_deposit_item_ask_str(u8 taskId);
 void item_menu_type_b(u8 taskId);
 void BagMenuActuallyToss(u8 taskId);
@@ -476,7 +475,7 @@ void CB2_ChooseBerry(void)
     GoToBagMenu(RETURN_LOCATION_FIELD_2, BERRIES_POCKET, CB2_ReturnToFieldContinueScript);
 }
 
-void sub_81AABF0(void(*callback)(void))
+void sub_81AABF0(void (*callback)(void))
 {
     GoToBagMenu(RETURN_LOCATION_FIELD_3, BERRIES_POCKET, callback);
 }
diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c
index 669195b33..83ed3abfe 100644
--- a/src/item_menu_icons.c
+++ b/src/item_menu_icons.c
@@ -36,10 +36,10 @@ static const struct OamData sOamData_857FAA4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -146,10 +146,10 @@ static const struct OamData sOamData_857FB64 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 4,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -217,10 +217,10 @@ static const struct OamData sOamData_857FBC8 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 7,
@@ -234,10 +234,10 @@ static const struct OamData sOamData_857FBD0 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 7,
@@ -374,10 +374,10 @@ static const struct OamData sOamData_857FDFC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
diff --git a/src/item_use.c b/src/item_use.c
index 2281cc198..e646a18ee 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -8,13 +8,15 @@
 #include "coins.h"
 #include "data2.h"
 #include "event_data.h"
-#include "fieldmap.h"
 #include "event_object_movement.h"
+#include "fieldmap.h"
+#include "field_effect.h"
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
 #include "field_weather.h"
 #include "item.h"
 #include "item_menu.h"
+#include "item_use.h"
 #include "mail.h"
 #include "main.h"
 #include "menu.h"
@@ -37,31 +39,15 @@
 #include "constants/items.h"
 #include "constants/songs.h"
 #include "constants/vars.h"
+#include "event_obj_lock.h"
 
-extern void unknown_ItemMenu_Confirm(u8 taskId);
-extern void sub_81C5B14(u8 taskId);
-extern void ScriptUnfreezeEventObjects(void);
-extern void ItemUseOutOfBattle_TMHM(u8 a);
-extern void ItemUseOutOfBattle_EvolutionStone(u8 b);
-extern bool8 IsPlayerFacingSurfableFishableWater(void);
-extern bool8 sub_81221AC(void);
 extern u8 Route102_EventScript_274482[];
 extern u8 Route102_EventScript_2744C0[];
 extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[];
-extern int sub_80247BC(void);
-extern struct MapHeader* mapconnection_get_mapheader(struct MapConnection *connection);
-extern void SetUpItemUseCallback(u8 taskId);
-extern void ItemUseCB_Medicine(u8, TaskFunc);
-extern void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*);
-extern void sub_81C5924(void);
-extern void sub_81C59BC(void);
-extern void sub_81AB9A8(u8);
-extern void StartEscapeRopeFieldEffect(void);
-extern u8* sub_806CF78(u16);
-extern void sub_81B89F0(void);
-extern u8 GetItemEffectType(u16);
-extern struct MapConnection *sub_8088A8C(s16, s16);
 
+extern s32 sub_80247BC(void);
+
+void SetUpItemUseCallback(u8 taskId);
 void MapPostLoadHook_UseItem(void);
 void sub_80AF6D4(void);
 void Task_CallItemUseOnFieldCallback(u8 taskId);
@@ -404,12 +390,12 @@ bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y)
 
 bool8 sub_80FD730(struct MapConnection *connection, int x, int y)
 {
-    struct MapHeader *mapHeader;
+    
     u16 localX, localY;
     u32 localOffset;
     s32 localLength;
 
-    mapHeader = mapconnection_get_mapheader(connection);
+    struct MapHeader const *const mapHeader = mapconnection_get_mapheader(connection);
 
     switch (connection->direction)
     {
diff --git a/src/link.c b/src/link.c
index a49ffaca8..525d50d7c 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1893,7 +1893,7 @@ u32 GetLinkRecvQueueLength(void)
     return gLink.recvQueue.count;
 }
 
-bool8 sub_800B504(void)
+bool32 sub_800B504(void)
 {
     if (GetLinkRecvQueueLength() > 2)
     {
diff --git a/src/link_rfu.c b/src/link_rfu.c
index 8da6b166a..a557397f0 100644
--- a/src/link_rfu.c
+++ b/src/link_rfu.c
@@ -17,9 +17,9 @@
 #include "text.h"
 #include "constants/species.h"
 #include "save.h"
+#include "rom_8011DC0.h"
 
 extern u16 gHeldKeyCodeToSend;
-extern void nullsub_89(u8 taskId);
 
 struct UnkRfuStruct_1 gUnknown_03004140;
 struct UnkRfuStruct_2 gUnknown_03005000;
@@ -155,7 +155,8 @@ const u8 sWireless_RSEtoASCIITable[] = {
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00
 };
 const struct OamData sWirelessStatusIndicatorOamData = {
-    .size = 1
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16)
 };
 static const union AnimCmd sWirelessStatusIndicatorAnim0[] = {
     // 3 bars
diff --git a/src/list_menu.c b/src/list_menu.c
index f36144e07..57bcc5c4f 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -129,10 +129,10 @@ static const struct OamData sOamData_ScrollArrowIndicator =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -186,8 +186,8 @@ static const struct Subsprite sSubsprite_RedOutline1 =
 {
     .x = 0,
     .y = 0,
-    .shape = 0,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .tileOffset = 0,
     .priority = 0,
 };
@@ -196,8 +196,8 @@ static const struct Subsprite sSubsprite_RedOutline2 =
 {
     .x = 0,
     .y = 0,
-    .shape = 0,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .tileOffset = 1,
     .priority = 0,
 };
@@ -206,8 +206,8 @@ static const struct Subsprite sSubsprite_RedOutline3 =
 {
     .x = 0,
     .y = 0,
-    .shape = 0,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .tileOffset = 2,
     .priority = 0,
 };
@@ -216,8 +216,8 @@ static const struct Subsprite sSubsprite_RedOutline4 =
 {
     .x = 0,
     .y = 0,
-    .shape = 0,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .tileOffset = 3,
     .priority = 0,
 };
@@ -226,8 +226,8 @@ static const struct Subsprite sSubsprite_RedOutline5 =
 {
     .x = 0,
     .y = 0,
-    .shape = 0,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .tileOffset = 4,
     .priority = 0,
 };
@@ -236,8 +236,8 @@ static const struct Subsprite sSubsprite_RedOutline6 =
 {
     .x = 0,
     .y = 0,
-    .shape = 0,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .tileOffset = 5,
     .priority = 0,
 };
@@ -246,8 +246,8 @@ static const struct Subsprite sSubsprite_RedOutline7 =
 {
     .x = 0,
     .y = 0,
-    .shape = 0,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .tileOffset = 6,
     .priority = 0,
 };
@@ -256,8 +256,8 @@ static const struct Subsprite sSubsprite_RedOutline8 =
 {
     .x = 0,
     .y = 0,
-    .shape = 0,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .tileOffset = 7,
     .priority = 0,
 };
@@ -269,10 +269,10 @@ static const struct OamData sOamData_RedArrowCursor =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/load_save.c b/src/load_save.c
index 7d307ec1b..d6785254f 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -11,10 +11,10 @@
 #include "trainer_hill.h"
 #include "gba/flash_internal.h"
 #include "decoration_inventory.h"
+#include "agb_flash.h"
 
 static void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
 
-extern bool16 IdentifyFlash(void);
 extern void ApplyNewEncryptionKeyToBerryPowder(u32 key);
 
 #define SAVEBLOCK_MOVE_RANGE    128
diff --git a/src/main.c b/src/main.c
index 3049f4f90..40381bb68 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,9 +24,6 @@
 #include "main.h"
 #include "trainer_hill.h"
 
-extern void sub_800B9B8(void);
-extern u8 gUnknown_03002748;
-
 static void VBlankIntr(void);
 static void HBlankIntr(void);
 static void VCountIntr(void);
@@ -313,8 +310,6 @@ void SetSerialCallback(IntrCallback callback)
     gMain.serialCallback = callback;
 }
 
-extern void CopyBufferedValuesToGpuRegs(void);
-
 static void VBlankIntr(void)
 {
     if (gWirelessCommType != 0)
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index 8936198ae..d95b808e9 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -207,7 +207,7 @@ bool8 sub_80D47D4(void)
 
 void ShowMapNamePopup(void)
 {
-    if (FlagGet(FLAG_SPECIAL_FLAG_0x4000) != TRUE)
+    if (FlagGet(FLAG_HIDE_MAP_NAME_POPUP) != TRUE)
     {
         if (!FuncIsActiveTask(Task_MapNamePopUpWindow))
         {
diff --git a/src/match_call.c b/src/match_call.c
index cca55fcb6..641079ba9 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -111,8 +111,6 @@ static void PopulateSpeciesFromTrainerParty(int, u8 *);
 static void PopulateBattleFrontierFacilityName(int, u8 *);
 static void PopulateBattleFrontierStreak(int, u8 *);
 
-extern void sub_81973A4(void);
-
 #define TEXT_ID(topic, id) (((topic) << 8) | ((id) & 0xFF))
 
 static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
diff --git a/src/menu.c b/src/menu.c
index 8cb7ac0b2..b04572b81 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -122,20 +122,18 @@ const struct MoveMenuInfoIcon gMoveMenuInfoIcons[] =
     {  8,  8, 0xAF },       // Unused (Small dark pokeball)
 };
 
+
 // Forward declarations
-extern void sub_81973A4(void);
-extern void WindowFunc_DrawStandardFrame(u8, u8, u8, u8, u8, u8);
-extern void WindowFunc_DrawDialogueFrame(u8, u8, u8, u8, u8, u8);
-extern void WindowFunc_ClearStdWindowAndFrame(u8, u8, u8, u8, u8, u8);
-extern void WindowFunc_ClearDialogWindowAndFrame(u8, u8, u8, u8, u8, u8);
-extern void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8, u8, u8, u8, u8, u8);
-extern void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8, u8, u8, u8, u8, u8);
-extern void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8, u8, u8, u8, u8, u8);
-extern void WindowFunc_ClearStdWindowAndFrameToTransparent(u8, u8, u8, u8, u8, u8);
-extern u8 Menu_MoveCursor(s8);
-extern u8 sub_8199134(s8, s8);
-extern void sub_8198C78(void);
-extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
+void WindowFunc_DrawStandardFrame(u8, u8, u8, u8, u8, u8);
+void WindowFunc_DrawDialogueFrame(u8, u8, u8, u8, u8, u8);
+void WindowFunc_ClearStdWindowAndFrame(u8, u8, u8, u8, u8, u8);
+void WindowFunc_ClearDialogWindowAndFrame(u8, u8, u8, u8, u8, u8);
+void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8, u8, u8, u8, u8, u8);
+void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8, u8, u8, u8, u8, u8);
+void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8, u8, u8, u8, u8, u8);
+void WindowFunc_ClearStdWindowAndFrameToTransparent(u8, u8, u8, u8, u8, u8);
+void sub_8198C78(void);
+void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
 
 void InitStandardTextBoxWindows(void)
 {
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index 25058abf9..b5745d812 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -18,8 +18,6 @@
 #include "constants/items.h"
 #include "constants/maps.h"
 
-extern bool32 sub_800B504(void);
-
 // this file's functions
 static void Task_ContinueTaskAfterMessagePrints(u8 taskId);
 static void Task_CallYesOrNoCallback(u8 taskId);
@@ -39,10 +37,10 @@ static const struct OamData sOamData_859F4E8 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/mirage_tower.c b/src/mirage_tower.c
index 4f5834db1..898180df4 100644
--- a/src/mirage_tower.c
+++ b/src/mirage_tower.c
@@ -142,10 +142,10 @@ static const struct OamData gOamData_8617DF4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 3,
@@ -192,10 +192,10 @@ static const struct OamData sCeilingCrumble2OamData =
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -230,10 +230,10 @@ static const struct OamData sCeilingCrumble1OamData =
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/mon_markings.c b/src/mon_markings.c
index 48f0f5ecb..f8b128045 100644
--- a/src/mon_markings.c
+++ b/src/mon_markings.c
@@ -30,10 +30,10 @@ static const struct OamData gUnknown_0859EE7C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -47,10 +47,10 @@ static const struct OamData gUnknown_0859EE84 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -156,10 +156,10 @@ static const struct OamData gUnknown_0859EF1C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(32x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/money.c b/src/money.c
index 4ff8086ea..7b95a75ab 100644
--- a/src/money.c
+++ b/src/money.c
@@ -24,10 +24,10 @@ static const struct OamData sOamData_MoneyLabel =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c
index 4196bb34c..dba914b51 100644
--- a/src/mystery_event_script.c
+++ b/src/mystery_event_script.c
@@ -17,8 +17,6 @@
 #include "mystery_event_msg.h"
 #include "pokemon_storage_system.h"
 
-extern void sub_811EFC0(u8);
-
 extern ScrCmdFunc gMysteryEventScriptCmdTable[];
 extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[];
 
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 22bbb84d7..75b7c8566 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1910,10 +1910,10 @@ const struct OamData gOamData_858BFEC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -1927,10 +1927,10 @@ const struct OamData gOamData_858BFF4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -1944,10 +1944,10 @@ const struct OamData gOamData_858BFFC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/normal.c b/src/normal.c
index 87c8792f1..2b592e199 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -36,8 +36,6 @@ static void sub_81162F8(u8);
 static void sub_81163D0(struct Sprite *);
 static void sub_81165E4(struct Sprite *);
 
-extern void sub_810E2C8(struct Sprite *);
-
 const union AnimCmd gUnknown_0859722C[] =
 {
     ANIMCMD_FRAME(0, 8),
diff --git a/src/option_menu.c b/src/option_menu.c
index 1766f0bdb..2fc0d6f3e 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -13,8 +13,7 @@
 #include "text_window.h"
 #include "international_string_util.h"
 #include "strings.h"
-
-extern void SetPokemonCryStereo(u32 val);
+#include "gba/m4a_internal.h"
 
 // Task data
 enum
diff --git a/src/party_menu.c b/src/party_menu.c
index d97418226..7db24b6ca 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -1176,10 +1176,10 @@ static const struct OamData gOamData_83765EC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -1232,10 +1232,10 @@ static const struct OamData sOamData_8615ED8 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -1288,10 +1288,10 @@ static const struct OamData sOamData_8615F20 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -1367,10 +1367,10 @@ static const struct OamData sOamData_8615F90 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(32x8),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -2937,7 +2937,7 @@ u8 pokemon_ailments_get_primary(u32 status)
     return AILMENT_NONE;
 }
 
-u8 sub_81B205C(struct Pokemon *mon)
+u8 GetMonAilment(struct Pokemon *mon)
 {
     u8 ailment;
 
@@ -3356,7 +3356,7 @@ static void DisplayPartyPokemonLevelCheck(struct Pokemon *mon, struct Struct203C
 {
     if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
     {
-        u8 ailment = sub_81B205C(mon);
+        u8 ailment = GetMonAilment(mon);
         if (ailment == AILMENT_NONE || ailment == AILMENT_PKRS)
         {
             if (c != 0)
@@ -5185,7 +5185,7 @@ static void party_menu_link_mon_status_condition_object(u16 species, u8 status,
 
 static void party_menu_get_status_condition_and_update_object(struct Pokemon *mon, struct Struct203CEDC *ptr)
 {
-    party_menu_update_status_condition_object(sub_81B205C(mon), ptr);
+    party_menu_update_status_condition_object(GetMonAilment(mon), ptr);
 }
 
 static void party_menu_update_status_condition_object(u8 status, struct Struct203CEDC *ptr)
diff --git a/src/poison.c b/src/poison.c
index c86ec2cd8..9af981694 100644
--- a/src/poison.c
+++ b/src/poison.c
@@ -3,8 +3,6 @@
 #include "trig.h"
 #include "constants/rgb.h"
 
-extern void sub_80A77C8(struct Sprite *);
-
 void sub_810DBAC(struct Sprite *);
 void sub_810DC2C(struct Sprite *);
 void sub_810DCD0(struct Sprite *);
diff --git a/src/pokeball.c b/src/pokeball.c
index d4605ccd8..793609ec2 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -99,10 +99,10 @@ static const struct OamData sBallOamData =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 782103908..325c2d5d0 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -222,10 +222,10 @@ static const struct OamData sOamData_PokeblockCase =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index d72a9ffbe..59ba1b4dc 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -55,8 +55,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const u16 gUnknown_0860F074[];
 
-extern bool8 sub_81221EC(void);
-
 // this file's functions
 static void HandleInitBackgrounds(void);
 static void HandleInitWindows(void);
@@ -465,10 +463,10 @@ static const struct OamData sThrownPokeblockOamData =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
diff --git a/src/pokedex.c b/src/pokedex.c
index 4bf8dff6d..cceb50ba1 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -248,10 +248,10 @@ static const struct OamData sOamData_855CFE4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -265,10 +265,10 @@ static const struct OamData sOamData_855CFEC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = ST_OAM_H_RECTANGLE,
+    .shape = SPRITE_SHAPE(16x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(16x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -282,10 +282,10 @@ static const struct OamData sOamData_855CFF4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = ST_OAM_H_RECTANGLE,
+    .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -299,10 +299,10 @@ static const struct OamData sOamData_855CFFC =
     .objMode = 2,
     .mosaic = 0,
     .bpp = 0,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -316,10 +316,10 @@ static const struct OamData sOamData_855D004 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = ST_OAM_H_RECTANGLE,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -333,10 +333,10 @@ static const struct OamData sOamData_855D00C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = ST_OAM_V_RECTANGLE,
+    .shape = SPRITE_SHAPE(8x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x16),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index eeea3c210..00fe9ab82 100755
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -83,14 +83,21 @@ static const u32 sAreaGlow_Gfx[] = INCBIN_U32("graphics/pokedex/area_glow.4bpp.l
 
 static const u16 sSpeciesHiddenFromAreaScreen[] = { SPECIES_WYNAUT };
 
-static const u16 sMovingRegionMapSections[3] = { MAPSEC_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE, MAPSEC_TERRA_CAVE };
+static const u16 sMovingRegionMapSections[3] =
+{
+    MAPSEC_MARINE_CAVE,
+    MAPSEC_UNDERWATER_MARINE_CAVE,
+    MAPSEC_TERRA_CAVE
+};
 
-static const u16 sFeebasData[][3] = {
+static const u16 sFeebasData[][3] =
+{
     {SPECIES_FEEBAS, MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119)},
     {NUM_SPECIES}
 };
 
-static const u16 sLandmarkData[][2] = {
+static const u16 sLandmarkData[][2] =
+{
     {MAPSEC_SKY_PILLAR,       FLAG_LANDMARK_SKY_PILLAR},
     {MAPSEC_SEAFLOOR_CAVERN,  FLAG_LANDMARK_SEAFLOOR_CAVERN},
     {MAPSEC_ALTERING_CAVE_2,  FLAG_LANDMARK_ALTERING_CAVE},
@@ -100,7 +107,8 @@ static const u16 sLandmarkData[][2] = {
     {MAPSEC_NONE}
 };
 
-static const u8 sAreaGlowTilemapMapping[] = {
+static const u8 sAreaGlowTilemapMapping[] =
+{
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
     0x11, 0x20, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
     0x12, 0x21, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
@@ -119,7 +127,8 @@ static const u8 sAreaGlowTilemapMapping[] = {
     0x1f, 0x22, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
 };
 
-static const struct UnkStruct_1C4D70 sUnknown_085B4018 = {
+static const struct UnkStruct_1C4D70 sUnknown_085B4018 =
+{
     .bg = 3,
     .unk2 = 0,
     .unk10 = 0,
@@ -127,21 +136,26 @@ static const struct UnkStruct_1C4D70 sUnknown_085B4018 = {
 };
 
 static const u8 sAreaMarkerTiles[];
-static const struct SpriteSheet sAreaMarkerSpriteSheet = {
+static const struct SpriteSheet sAreaMarkerSpriteSheet =
+{
     sAreaMarkerTiles, 0x80, 2
 };
 
 static const u16 sAreaMarkerPalette[];
-static const struct SpritePalette sAreaMarkerSpritePalette = {
+static const struct SpritePalette sAreaMarkerSpritePalette =
+{
     sAreaMarkerPalette, 2
 };
 
-static const struct OamData sAreaMarkerOamData = {
-    .size = 1,
+static const struct OamData sAreaMarkerOamData =
+{
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 1
 };
 
-static const struct SpriteTemplate sAreaMarkerSpriteTemplate = {
+static const struct SpriteTemplate sAreaMarkerSpriteTemplate =
+{
     2,
     2,
     &sAreaMarkerOamData,
@@ -154,16 +168,20 @@ static const struct SpriteTemplate sAreaMarkerSpriteTemplate = {
 static const u16 sAreaMarkerPalette[] = INCBIN_U16("graphics/pokedex/area_marker.gbapal");
 static const u8 sAreaMarkerTiles[] = INCBIN_U8("graphics/pokedex/area_marker.4bpp");
 
-static const struct SpritePalette sAreaUnknownSpritePalette = {
+static const struct SpritePalette sAreaUnknownSpritePalette =
+{
     gPokedexAreaScreenAreaUnknown_Pal, 3
 };
 
-static const struct OamData sAreaUnknownOamData = {
-    .size = 2,
+static const struct OamData sAreaUnknownOamData =
+{
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 1
 };
 
-static const struct SpriteTemplate sAreaUnknownSpriteTemplate = {
+static const struct SpriteTemplate sAreaUnknownSpriteTemplate =
+{
     3,
     3,
     &sAreaUnknownOamData,
diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c
index c385141d5..8ca0c8d6e 100755
--- a/src/pokedex_cry_screen.c
+++ b/src/pokedex_cry_screen.c
@@ -54,7 +54,8 @@ const u16 gUnknown_085B8378[] = INCBIN_U16("graphics/pokedex/cry_meter_map.bin")
 const u16 gUnknown_085B8418[] = INCBIN_U16("graphics/pokedex/cry_meter.gbapal");
 const u8 gUnknown_085B8438[] = INCBIN_U8("graphics/pokedex/cry_meter.4bpp.lz");
 
-const u16 gUnknown_085B8770[][72] = {
+const u16 gUnknown_085B8770[][72] =
+{
     {
         0x0000, 0x0004, 0x0008, 0x000C, 0x0010, 0x0014, 0x0018, 0x001C,
         0x0400, 0x0404, 0x0408, 0x040C, 0x0410, 0x0414, 0x0418, 0x041C,
@@ -142,7 +143,8 @@ const u16 gUnknown_085B8BF0[] = INCBIN_U16("graphics/pokedex/85B8C10.gbapal");
 const u8 gUnknown_085B8C10[] = INCBIN_U8("graphics/pokedex/85B8C10.4bpp");
 
 const u8 gUnknown_085B8C30[] = {0xF0, 0x0F};
-const u8 gUnknown_085B8C32[][16] = {
+const u8 gUnknown_085B8C32[][16] =
+{
     {
         0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08,
         0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
@@ -152,23 +154,28 @@ const u8 gUnknown_085B8C32[][16] = {
     }
 };
 
-const union AnimCmd gSpriteAnim_85B8C54[] = {
+const union AnimCmd gSpriteAnim_85B8C54[] =
+{
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_END
 };
 
-const union AnimCmd *const gSpriteAnimTable_85B8C5C[] = {
+const union AnimCmd *const gSpriteAnimTable_85B8C5C[] =
+{
     gSpriteAnim_85B8C54
 };
 
-const struct OamData gOamData_85B8C60 = {
+const struct OamData gOamData_85B8C60 =
+{
     .y = 160,
     .affineMode = ST_OAM_AFFINE_NORMAL,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 1
 };
 
-const struct SpriteTemplate gUnknown_085B8C68 = {
+const struct SpriteTemplate gUnknown_085B8C68 =
+{
     0x2000,
     0x2000,
     &gOamData_85B8C60,
@@ -178,12 +185,14 @@ const struct SpriteTemplate gUnknown_085B8C68 = {
     sub_814596C
 };
 
-const struct SpriteSheet gCryMeterNeedleSpriteSheets[] = {
+const struct SpriteSheet gCryMeterNeedleSpriteSheets[] =
+{
     {CryMeterNeedleTiles, 0x800, 0x2000},
     {}
 };
 
-const struct SpritePalette gCryMeterNeedleSpritePalettes[] = {
+const struct SpritePalette gCryMeterNeedleSpritePalettes[] =
+{
     {CryMeterNeedlePalette, 0x2000},
     {}
 };
diff --git a/src/pokemon.c b/src/pokemon.c
index a35033d49..1ee9c4cff 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -10,6 +10,7 @@
 #include "battle_tower.h"
 #include "event_data.h"
 #include "evolution_scene.h"
+#include "field_specials.h"
 #include "item.h"
 #include "link.h"
 #include "main.h"
@@ -72,10 +73,6 @@ extern const struct CompressedSpritePalette gMonPaletteTable[];
 extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
 extern const u8 gTrainerClassNames[][13];
 
-extern u16 get_unknown_box_id(void);
-extern void set_unknown_box_id(u8);
-extern bool8 sub_806F104(void);
-
 // this file's functions
 static u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon);
 static union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality, u8 substructType);
@@ -2465,10 +2462,10 @@ static const struct OamData sOamData_8329F20 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index ecb8f4950..4ff182a0e 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -931,10 +931,10 @@ const struct OamData sMonIconOamData =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index b0e14d2b1..98d83d8ce 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "event_data.h"
+#include "pokedex.h"
 #include "pokemon.h"
 #include "pokemon_size_record.h"
 #include "string_util.h"
@@ -15,9 +16,6 @@ struct UnknownStruct
     u16 unk4;
 };
 
-extern u16 GetPokedexHeightWeight(u16 dexNo, bool8 height);
-extern u16 SpeciesToNationalPokedexNum(u16 species);
-
 static const struct UnknownStruct sBigMonSizeTable[] =
 {
     {  290,   1,      0 },
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index c5d40877b..30f5af14c 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -969,10 +969,10 @@ static const struct OamData sOamData_857286C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -986,10 +986,10 @@ static const struct OamData sOamData_8572874 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(16x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(16x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -1062,10 +1062,10 @@ static const struct OamData sOamData_85728EC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -1467,8 +1467,8 @@ static const struct SpriteSheet gUnknown_0857B080 = {gPCGfx_Arrow, 0x80, 6};
 
 static const struct OamData gOamData_83BB298 =
 {
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 2
 };
 
@@ -1503,7 +1503,8 @@ static const struct SpriteTemplate gSpriteTemplate_857B0A8 =
 
 static const struct OamData gOamData_83BB2D0 =
 {
-    .shape = ST_OAM_V_RECTANGLE,
+    .shape = SPRITE_SHAPE(8x16),
+    .size = SPRITE_SIZE(8x16),
     .priority = 2
 };
 
@@ -2004,7 +2005,7 @@ static void sub_80C7958(u8 curBox)
     u8 spriteId;
     struct SpriteTemplate template;
     struct OamData oamData = {};
-    oamData.size = 3;
+    oamData.size = SPRITE_SIZE(64x64);
     oamData.paletteNum = 1;
     template = (struct SpriteTemplate){
         0, 0, &oamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
@@ -2017,8 +2018,8 @@ static void sub_80C7958(u8 curBox)
     spriteId = CreateSprite(&template, 160, 96, 0);
     gUnknown_02039D04->unk_0000 = gSprites + spriteId;
 
-    oamData.shape = ST_OAM_V_RECTANGLE;
-    oamData.size = 1;
+    oamData.shape = SPRITE_SHAPE(8x32);
+    oamData.size = SPRITE_SIZE(8x32);
     template.tileTag = gUnknown_02039D04->unk_0240 + 1;
     template.anims = sSpriteAnimTable_8571710;
     for (i = 0; i < 4; i++)
@@ -8490,12 +8491,14 @@ static void sub_80CFC14(void)
 
     static const struct OamData sOamData_857BA0C =
     {
-        .size = 2,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
         .priority = 1,
     };
     static const struct OamData sOamData_857BA14 =
     {
-        .size = 1,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
         .priority = 1,
     };
 
@@ -9358,10 +9361,10 @@ static const struct OamData sOamData_857BBA4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 0133e40f1..3a5b06d45 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -47,7 +47,58 @@
 #include "constants/songs.h"
 #include "constants/species.h"
 
-static EWRAM_DATA struct PssData
+// Screen titles (upper left)
+#define PSS_LABEL_WINDOW_POKEMON_INFO_TITLE 0
+#define PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE 1
+#define PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE 2
+#define PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE 3
+
+// Button control text (upper right)
+#define PSS_LABEL_WINDOW_PROMPT_CANCEL 4
+#define PSS_LABEL_WINDOW_PROMPT_INFO 5
+#define PSS_LABEL_WINDOW_PROMPT_SWITCH 6
+#define PSS_LABEL_WINDOW_UNUSED1 7
+
+// Info screen
+#define PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL 8
+#define PSS_LABEL_WINDOW_POKEMON_INFO_TYPE 9
+
+// Skills screen
+#define PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT 10 // HP, Attack, Defense
+#define PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT 11 // Sp. Attack, Sp. Defense, Speed
+#define PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP 12 // EXP, Next Level
+#define PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS 13
+
+// Moves screen
+#define PSS_LABEL_WINDOW_MOVES_POWER_ACC 14 // Also contains the power and accuracy values
+#define PSS_LABEL_WINDOW_MOVES_APPEAL_JAM 15
+#define PSS_LABEL_WINDOW_UNUSED2 16
+
+// Above/below the pokemon's portrait (left)
+#define PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER 17
+#define PSS_LABEL_WINDOW_PORTRAIT_NICKNAME 18 // The upper name
+#define PSS_LABEL_WINDOW_PORTRAIT_SPECIES 19 // The lower name
+#define PSS_LABEL_WINDOW_END 20
+
+// Dynamic fields for the Pokemon Info page
+#define PSS_DATA_WINDOW_INFO_ORIGINAL_TRAINER 0
+#define PSS_DATA_WINDOW_INFO_ID 1
+#define PSS_DATA_WINDOW_INFO_ABILITY 2
+#define PSS_DATA_WINDOW_INFO_MEMO 3
+
+// Dynamic fields for the Pokemon Skills page
+#define PSS_DATA_WINDOW_SKILLS_HELD_ITEM 0
+#define PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT 1
+#define PSS_DATA_WINDOW_SKILLS_STATS_LEFT 2 // HP, Attack, Defense
+#define PSS_DATA_WINDOW_SKILLS_STATS_RIGHT 3 // Sp. Attack, Sp. Defense, Speed
+#define PSS_DATA_WINDOW_EXP 4 // Exp, next level
+
+// Dynamic fields for the Battle Moves and Contest Moves pages.
+#define PSS_DATA_WINDOW_MOVE_NAMES 0
+#define PSS_DATA_WINDOW_MOVE_PP 1
+#define PSS_DATA_WINDOW_MOVE_DESCRIPTION 2
+
+static EWRAM_DATA struct PokemonSummaryScreenData
 {
     /*0x00*/ union {
         struct Pokemon *mons;
@@ -63,7 +114,7 @@ static EWRAM_DATA struct PssData
         u8 isEgg; // 0x4
         u8 level; // 0x5
         u8 ribbonCount; // 0x6
-        u8 unk7; // 0x7
+        u8 ailment; // 0x7
         u8 altAbility; // 0x8
         u8 metLocation; // 0x9
         u8 metLevel; // 0xA
@@ -109,7 +160,7 @@ static EWRAM_DATA struct PssData
     bool8 unk40EF;
     s16 switchCounter; // Used for various switch statement cases that decompress/load graphics or pokemon data
     u8 unk_filler4[6];
-} *pssData = NULL;
+} *sMonSummaryScreen = NULL;
 EWRAM_DATA u8 gLastViewedMonIndex = 0;
 static EWRAM_DATA u8 sUnknown_0203CF21 = 0;
 ALIGNED(4) static EWRAM_DATA u8 sUnknownTaskId = 0;
@@ -135,7 +186,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon* a);
 static void sub_81C0348(void);
 static void CloseSummaryScreen(u8 taskId);
 static void HandleInput(u8 taskId);
-static void ChangePokemon(u8 taskId, s8 a);
+static void ChangeSummaryPokemon(u8 taskId, s8 a);
 static void sub_81C0704(u8 taskId);
 static s8 sub_81C08F8(s8 a);
 static s8 sub_81C09B4(s8 a);
@@ -309,7 +360,7 @@ static const struct UnkStruct_61CC04 sUnknown_0861CC10 =
 static const s8 gUnknown_0861CC1C[] = {0, 2, 3, 1, 4, 5};
 static const struct WindowTemplate sSummaryTemplate[] =
 {
-    {//Text for Pokemon Info
+    [PSS_LABEL_WINDOW_POKEMON_INFO_TITLE] = {
         .bg = 0,
         .tilemapLeft = 0,
         .tilemapTop = 0,
@@ -318,7 +369,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 1,
     },
-    {//Text for Pokemon Skills
+    [PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE] = {
         .bg = 0,
         .tilemapLeft = 0,
         .tilemapTop = 0,
@@ -327,7 +378,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 23,
     },
-    {//Text for Battle Moves
+    [PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE] = {
         .bg = 0,
         .tilemapLeft = 0,
         .tilemapTop = 0,
@@ -336,7 +387,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 45,
     },
-    {//Text for Contest Moves
+    [PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE] = {
         .bg = 0,
         .tilemapLeft = 0,
         .tilemapTop = 0,
@@ -345,7 +396,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 67,
     },
-    { //Text on Pokemon Info: Button prompt: Cancel
+    [PSS_LABEL_WINDOW_PROMPT_CANCEL] = {
         .bg = 0,
         .tilemapLeft = 22,
         .tilemapTop = 0,
@@ -354,7 +405,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 7,
         .baseBlock = 89,
     },
-    {//Info button found under moves
+    [PSS_LABEL_WINDOW_PROMPT_INFO] = {
         .bg = 0,
         .tilemapLeft = 22,
         .tilemapTop = 0,
@@ -363,7 +414,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 7,
         .baseBlock = 105,
     },
-    {//Switch button under moves when viewing moves
+    [PSS_LABEL_WINDOW_PROMPT_SWITCH] = {
         .bg = 0,
         .tilemapLeft = 22,
         .tilemapTop = 0,
@@ -372,7 +423,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 7,
         .baseBlock = 121,
     },
-    {//Unknown
+    [PSS_LABEL_WINDOW_UNUSED1] = {
         .bg = 0,
         .tilemapLeft = 11,
         .tilemapTop = 4,
@@ -381,7 +432,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 137,
     },
-    {//Unknown
+    [PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL] = {
         .bg = 0,
         .tilemapLeft = 11,
         .tilemapTop = 4,
@@ -390,7 +441,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 137,
     },
-    {//Type on pokemon info page
+    [PSS_LABEL_WINDOW_POKEMON_INFO_TYPE] = {
         .bg = 0,
         .tilemapLeft = 11,
         .tilemapTop = 6,
@@ -399,7 +450,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 173,
     },
-    {//HP, Attack and Defense text
+    [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT] = {
         .bg = 0,
         .tilemapLeft = 10,
         .tilemapTop = 7,
@@ -408,7 +459,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 209,
     },
-    {//Sp. atk, Sp. Def and Speed texxt
+    [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT] = {
         .bg = 0,
         .tilemapLeft = 22,
         .tilemapTop = 7,
@@ -417,7 +468,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 245,
     },
-    {//EXP and next lvl.
+    [PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP] = {
         .bg = 0,
         .tilemapLeft = 10,
         .tilemapTop = 14,
@@ -426,7 +477,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 275,
     },
-    {//Unknown
+    [PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS] = {
         .bg = 0,
         .tilemapLeft = 0,
         .tilemapTop = 18,
@@ -435,7 +486,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 319,
     },
-    {//move text: Power, Accuracy and their numeric values.
+    [PSS_LABEL_WINDOW_MOVES_POWER_ACC] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 15,
@@ -444,7 +495,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 331,
     },
-    {//contest text: appeal and jam
+    [PSS_LABEL_WINDOW_MOVES_APPEAL_JAM] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 15,
@@ -453,7 +504,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 367,
     },
-    {//Unknown
+    [PSS_LABEL_WINDOW_UNUSED2] = {
         .bg = 0,
         .tilemapLeft = 22,
         .tilemapTop = 4,
@@ -462,7 +513,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 387,
     },
-    {//No.
+    [PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 2,
@@ -471,7 +522,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 7,
         .baseBlock = 387,
     },
-    {//Upper name
+    [PSS_LABEL_WINDOW_PORTRAIT_NICKNAME] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 12,
@@ -480,7 +531,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 395,
     },
-    {//Lower name
+    [PSS_LABEL_WINDOW_PORTRAIT_SPECIES] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 14,
@@ -489,11 +540,11 @@ static const struct WindowTemplate sSummaryTemplate[] =
         .paletteNum = 6,
         .baseBlock = 413,
     },
-    DUMMY_WIN_TEMPLATE
+    [PSS_LABEL_WINDOW_END] = DUMMY_WIN_TEMPLATE
 };
 static const struct WindowTemplate sPageInfoTemplate[] =
 {
-    {//Original Trainer
+    [PSS_DATA_WINDOW_INFO_ORIGINAL_TRAINER] = {
         .bg = 0,
         .tilemapLeft = 11,
         .tilemapTop = 4,
@@ -502,7 +553,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
         .paletteNum = 6,
         .baseBlock = 449,
     },
-    {//ID numbers
+    [PSS_DATA_WINDOW_INFO_ID] = {
         .bg = 0,
         .tilemapLeft = 22,
         .tilemapTop = 4,
@@ -511,7 +562,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
         .paletteNum = 6,
         .baseBlock = 471,
     },
-    {//Ability
+    [PSS_DATA_WINDOW_INFO_ABILITY] = {
         .bg = 0,
         .tilemapLeft = 11,
         .tilemapTop = 9,
@@ -520,7 +571,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
         .paletteNum = 6,
         .baseBlock = 485,
     },
-    {//Trainer Memo
+    [PSS_DATA_WINDOW_INFO_MEMO] = {
         .bg = 0,
         .tilemapLeft = 11,
         .tilemapTop = 14,
@@ -532,7 +583,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
 };
 static const struct WindowTemplate sPageSkillsTemplate[] =
 {
-    {//Held Item string
+    [PSS_DATA_WINDOW_SKILLS_HELD_ITEM] = {
         .bg = 0,
         .tilemapLeft = 10,
         .tilemapTop = 4,
@@ -541,7 +592,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
         .paletteNum = 6,
         .baseBlock = 449,
     },
-    {//Ribbon string
+    [PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT] = {
         .bg = 0,
         .tilemapLeft = 20,
         .tilemapTop = 4,
@@ -550,7 +601,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
         .paletteNum = 6,
         .baseBlock = 469,
     },
-    {//Stat numbers left (HP, ATK & DEF)
+    [PSS_DATA_WINDOW_SKILLS_STATS_LEFT] = {
         .bg = 0,
         .tilemapLeft = 16,
         .tilemapTop = 7,
@@ -559,7 +610,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
         .paletteNum = 6,
         .baseBlock = 489,
     },
-    {//Stat numbers right (SP.ATK, SP.DEF & SPEED)
+    [PSS_DATA_WINDOW_SKILLS_STATS_RIGHT] = {
         .bg = 0,
         .tilemapLeft = 27,
         .tilemapTop = 7,
@@ -568,7 +619,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
         .paletteNum = 6,
         .baseBlock = 525,
     },
-    {//Exp numbers
+    [PSS_DATA_WINDOW_EXP] = {
         .bg = 0,
         .tilemapLeft = 24,
         .tilemapTop = 14,
@@ -580,7 +631,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
 };
 static const struct WindowTemplate sPageMovesTemplate[] = // This is used for both battle and contest moves
 {
-    {//Move names?
+    [PSS_DATA_WINDOW_MOVE_NAMES] = {
         .bg = 0,
         .tilemapLeft = 15,
         .tilemapTop = 4,
@@ -589,7 +640,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo
         .paletteNum = 6,
         .baseBlock = 449,
     },
-    {//PP Numbers
+    [PSS_DATA_WINDOW_MOVE_PP] = {
         .bg = 0,
         .tilemapLeft = 24,
         .tilemapTop = 4,
@@ -598,7 +649,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo
         .paletteNum = 8,
         .baseBlock = 539,
     },
-    {//Move description text
+    [PSS_DATA_WINDOW_MOVE_DESCRIPTION] = {
         .bg = 0,
         .tilemapLeft = 10,
         .tilemapTop = 15,
@@ -659,10 +710,10 @@ static const struct OamData sOamData_MoveTypes =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x16),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -835,10 +886,10 @@ static const struct OamData gOamData_861CFF4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -924,10 +975,10 @@ static const struct OamData sOamData_StatusCondition =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(32x8),
     .tileNum = 0,
     .priority = 3,
     .paletteNum = 0,
@@ -996,38 +1047,38 @@ static const u16 sSummaryMarkingsPalette[] = INCBIN_U16("graphics/interface/summ
 // code
 void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void))
 {
-    pssData = AllocZeroed(sizeof(*pssData));
-    pssData->mode = mode;
-    pssData->monList.mons = mons;
-    pssData->curMonIndex = monIndex;
-    pssData->maxMonIndex = maxMonIndex;
-    pssData->callback = callback;
+    sMonSummaryScreen = AllocZeroed(sizeof(*sMonSummaryScreen));
+    sMonSummaryScreen->mode = mode;
+    sMonSummaryScreen->monList.mons = mons;
+    sMonSummaryScreen->curMonIndex = monIndex;
+    sMonSummaryScreen->maxMonIndex = maxMonIndex;
+    sMonSummaryScreen->callback = callback;
 
     if (mode == PSS_MODE_BOX)
-        pssData->isBoxMon = TRUE;
+        sMonSummaryScreen->isBoxMon = TRUE;
     else
-        pssData->isBoxMon = FALSE;
+        sMonSummaryScreen->isBoxMon = FALSE;
 
     switch (mode)
     {
     case PSS_MODE_NORMAL:
     case PSS_MODE_BOX:
-        pssData->minPageIndex = 0;
-        pssData->maxPageIndex = 3;
+        sMonSummaryScreen->minPageIndex = 0;
+        sMonSummaryScreen->maxPageIndex = 3;
         break;
     case PSS_MODE_UNK1:
-        pssData->minPageIndex = 0;
-        pssData->maxPageIndex = 3;
-        pssData->unk40C8 = TRUE;
+        sMonSummaryScreen->minPageIndex = 0;
+        sMonSummaryScreen->maxPageIndex = 3;
+        sMonSummaryScreen->unk40C8 = TRUE;
         break;
     case PSS_MODE_SELECT_MOVE:
-        pssData->minPageIndex = 2;
-        pssData->maxPageIndex = 3;
-        pssData->lockMonFlag = TRUE;
+        sMonSummaryScreen->minPageIndex = 2;
+        sMonSummaryScreen->maxPageIndex = 3;
+        sMonSummaryScreen->lockMonFlag = TRUE;
         break;
     }
 
-    pssData->currPageIndex = pssData->minPageIndex;
+    sMonSummaryScreen->currPageIndex = sMonSummaryScreen->minPageIndex;
     SummaryScreen_SetUnknownTaskId(-1);
 
     if (gMonSpritesGfxPtr == 0)
@@ -1039,13 +1090,13 @@ void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex,
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void), u16 newMove)
 {
     ShowPokemonSummaryScreen(PSS_MODE_SELECT_MOVE, mons, monIndex, maxMonIndex, callback);
-    pssData->newMove = newMove;
+    sMonSummaryScreen->newMove = newMove;
 }
 
 void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void))
 {
     ShowPokemonSummaryScreen(mode, mons, monIndex, maxMonIndex, callback);
-    pssData->unk40EF = TRUE;
+    sMonSummaryScreen->unk40EF = TRUE;
 }
 
 static void SummaryScreen_MainCB2(void)
@@ -1098,7 +1149,7 @@ static bool8 SummaryScreen_LoadGraphics(void)
         break;
     case 5:
         InitBGs();
-        pssData->switchCounter = 0;
+        sMonSummaryScreen->switchCounter = 0;
         gMain.state++;
         break;
     case 6:
@@ -1114,12 +1165,12 @@ static bool8 SummaryScreen_LoadGraphics(void)
         gMain.state++;
         break;
     case 9:
-        CopyMonToSummaryStruct(&pssData->currentMon);
-        pssData->switchCounter = 0;
+        CopyMonToSummaryStruct(&sMonSummaryScreen->currentMon);
+        sMonSummaryScreen->switchCounter = 0;
         gMain.state++;
         break;
     case 10:
-        if (ExtractMonDataToSummaryStruct(&pssData->currentMon) != 0)
+        if (ExtractMonDataToSummaryStruct(&sMonSummaryScreen->currentMon) != 0)
             gMain.state++;
         break;
     case 11:
@@ -1131,7 +1182,7 @@ static bool8 SummaryScreen_LoadGraphics(void)
         gMain.state++;
         break;
     case 13:
-        PrintPageSpecificText(pssData->currPageIndex);
+        PrintPageSpecificText(sMonSummaryScreen->currPageIndex);
         gMain.state++;
         break;
     case 14:
@@ -1139,29 +1190,29 @@ static bool8 SummaryScreen_LoadGraphics(void)
         gMain.state++;
         break;
     case 15:
-        CreatePageWindowTilemaps(pssData->currPageIndex);
+        CreatePageWindowTilemaps(sMonSummaryScreen->currPageIndex);
         gMain.state++;
         break;
     case 16:
         ResetSpriteIds();
         CreateMoveTypeIcons();
-        pssData->switchCounter = 0;
+        sMonSummaryScreen->switchCounter = 0;
         gMain.state++;
         break;
     case 17:
-        pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &pssData->switchCounter);
-        if (pssData->spriteIds[0] != 0xFF)
+        sMonSummaryScreen->spriteIds[0] = CreatePokemonSprite(&sMonSummaryScreen->currentMon, &sMonSummaryScreen->switchCounter);
+        if (sMonSummaryScreen->spriteIds[0] != 0xFF)
         {
-            pssData->switchCounter = 0;
+            sMonSummaryScreen->switchCounter = 0;
             gMain.state++;
         }
         break;
     case 18:
-        CreateMonMarkingsSprite(&pssData->currentMon);
+        CreateMonMarkingsSprite(&sMonSummaryScreen->currentMon);
         gMain.state++;
         break;
     case 19:
-        CreateCaughtBallSprite(&pssData->currentMon);
+        CreateCaughtBallSprite(&sMonSummaryScreen->currentMon);
         gMain.state++;
         break;
     case 20:
@@ -1173,7 +1224,7 @@ static bool8 SummaryScreen_LoadGraphics(void)
         gMain.state++;
         break;
     case 22:
-        if (pssData->mode != PSS_MODE_SELECT_MOVE)
+        if (sMonSummaryScreen->mode != PSS_MODE_SELECT_MOVE)
             CreateTask(HandleInput, 0);
         else
             CreateTask(sub_81C171C, 0);
@@ -1200,9 +1251,9 @@ static void InitBGs(void)
 {
     ResetBgsAndClearDma3BusyFlags(0);
     InitBgsFromTemplates(0, sUnknown_0861CBB4, ARRAY_COUNT(sUnknown_0861CBB4));
-    SetBgTilemapBuffer(1, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]);
-    SetBgTilemapBuffer(2, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][0]);
-    SetBgTilemapBuffer(3, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]);
+    SetBgTilemapBuffer(1, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]);
+    SetBgTilemapBuffer(2, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_SKILLS][0]);
+    SetBgTilemapBuffer(3, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0]);
     ResetAllBgsCoordinates();
     schedule_bg_copy_tilemap_to_vram(1);
     schedule_bg_copy_tilemap_to_vram(2);
@@ -1217,64 +1268,64 @@ static void InitBGs(void)
 
 static bool8 SummaryScreen_DecompressGraphics(void)
 {
-    switch (pssData->switchCounter)
+    switch (sMonSummaryScreen->switchCounter)
     {
     case 0:
         reset_temp_tile_data_buffers();
         decompress_and_copy_tile_data_to_vram(1, &gStatusScreenBitmap, 0, 0, 0);
-        pssData->switchCounter++;
+        sMonSummaryScreen->switchCounter++;
         break;
     case 1:
         if (free_temp_tile_data_buffers_if_possible() != 1)
         {
-            LZDecompressWram(gPageInfoTilemap, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]);
-            pssData->switchCounter++;
+            LZDecompressWram(gPageInfoTilemap, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0]);
+            sMonSummaryScreen->switchCounter++;
         }
         break;
     case 2:
-        LZDecompressWram(gUnknown_08D98CC8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][1]);
-        pssData->switchCounter++;
+        LZDecompressWram(gUnknown_08D98CC8, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][1]);
+        sMonSummaryScreen->switchCounter++;
         break;
     case 3:
-        LZDecompressWram(gPageSkillsTilemap, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][1]);
-        pssData->switchCounter++;
+        LZDecompressWram(gPageSkillsTilemap, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_SKILLS][1]);
+        sMonSummaryScreen->switchCounter++;
         break;
     case 4:
-        LZDecompressWram(gPageBattleMovesTilemap, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]);
-        pssData->switchCounter++;
+        LZDecompressWram(gPageBattleMovesTilemap, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]);
+        sMonSummaryScreen->switchCounter++;
         break;
     case 5:
-        LZDecompressWram(gPageContestMovesTilemap, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]);
-        pssData->switchCounter++;
+        LZDecompressWram(gPageContestMovesTilemap, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]);
+        sMonSummaryScreen->switchCounter++;
         break;
     case 6:
         LoadCompressedPalette(gStatusScreenPalette, 0, 0x100);
         LoadPalette(&gUnknown_08D85620, 0x81, 0x1E);
-        pssData->switchCounter++;
+        sMonSummaryScreen->switchCounter++;
         break;
     case 7:
         LoadCompressedSpriteSheet(&sSpriteSheet_MoveTypes);
-        pssData->switchCounter++;
+        sMonSummaryScreen->switchCounter++;
         break;
     case 8:
         LoadCompressedSpriteSheet(&sMoveSelectorSpriteSheet);
-        pssData->switchCounter++;
+        sMonSummaryScreen->switchCounter++;
         break;
     case 9:
         LoadCompressedSpriteSheet(&sStatusIconsSpriteSheet);
-        pssData->switchCounter++;
+        sMonSummaryScreen->switchCounter++;
         break;
     case 10:
         LoadCompressedSpritePalette(&sStatusIconsSpritePalette);
-        pssData->switchCounter++;
+        sMonSummaryScreen->switchCounter++;
         break;
     case 11:
         LoadCompressedSpritePalette(&gUnknown_0861D07C);
-        pssData->switchCounter++;
+        sMonSummaryScreen->switchCounter++;
         break;
     case 12:
         LoadCompressedPalette(gMoveTypes_Pal, 0x1D0, 0x60);
-        pssData->switchCounter = 0;
+        sMonSummaryScreen->switchCounter = 0;
         return TRUE;
     }
     return FALSE;
@@ -1282,126 +1333,127 @@ static bool8 SummaryScreen_DecompressGraphics(void)
 
 static void CopyMonToSummaryStruct(struct Pokemon *mon)
 {
-    if (!pssData->isBoxMon)
+    if (!sMonSummaryScreen->isBoxMon)
     {
-        struct Pokemon *partyMon = pssData->monList.mons;
-        *mon = partyMon[pssData->curMonIndex];
+        struct Pokemon *partyMon = sMonSummaryScreen->monList.mons;
+        *mon = partyMon[sMonSummaryScreen->curMonIndex];
     }
     else
     {
-        struct BoxPokemon *boxMon = pssData->monList.boxMons;
-        BoxMonToMon(&boxMon[pssData->curMonIndex], mon);
+        struct BoxPokemon *boxMon = sMonSummaryScreen->monList.boxMons;
+        BoxMonToMon(&boxMon[sMonSummaryScreen->curMonIndex], mon);
     }
 }
 
-static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *a)
+static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *mon)
 {
     u32 i;
-    struct PokeSummary *sum = &pssData->summary;
-    switch (pssData->switchCounter)
+    struct PokeSummary *sum = &sMonSummaryScreen->summary;
+    // Spread the data extraction over multiple frames.
+    switch (sMonSummaryScreen->switchCounter)
     {
     case 0:
-        sum->species = GetMonData(a, MON_DATA_SPECIES);
-        sum->species2 = GetMonData(a, MON_DATA_SPECIES2);
-        sum->exp = GetMonData(a, MON_DATA_EXP);
-        sum->level = GetMonData(a, MON_DATA_LEVEL);
-        sum->altAbility = GetMonData(a, MON_DATA_ALT_ABILITY);
-        sum->item = GetMonData(a, MON_DATA_HELD_ITEM);
-        sum->pid = GetMonData(a, MON_DATA_PERSONALITY);
-        sum->sanity = GetMonData(a, MON_DATA_SANITY_IS_BAD_EGG);
+        sum->species = GetMonData(mon, MON_DATA_SPECIES);
+        sum->species2 = GetMonData(mon, MON_DATA_SPECIES2);
+        sum->exp = GetMonData(mon, MON_DATA_EXP);
+        sum->level = GetMonData(mon, MON_DATA_LEVEL);
+        sum->altAbility = GetMonData(mon, MON_DATA_ALT_ABILITY);
+        sum->item = GetMonData(mon, MON_DATA_HELD_ITEM);
+        sum->pid = GetMonData(mon, MON_DATA_PERSONALITY);
+        sum->sanity = GetMonData(mon, MON_DATA_SANITY_IS_BAD_EGG);
 
         if (sum->sanity)
             sum->isEgg = TRUE;
         else
-            sum->isEgg = GetMonData(a, MON_DATA_IS_EGG);
+            sum->isEgg = GetMonData(mon, MON_DATA_IS_EGG);
 
         break;
     case 1:
         for (i = 0; i < MAX_MON_MOVES; i++)
         {
-            sum->moves[i] = GetMonData(a, MON_DATA_MOVE1+i);
-            sum->pp[i] = GetMonData(a, MON_DATA_PP1+i);
+            sum->moves[i] = GetMonData(mon, MON_DATA_MOVE1+i);
+            sum->pp[i] = GetMonData(mon, MON_DATA_PP1+i);
         }
-        sum->ppBonuses = GetMonData(a, MON_DATA_PP_BONUSES);
+        sum->ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES);
         break;
     case 2:
-        if (pssData->monList.mons == gPlayerParty || pssData->mode == PSS_MODE_BOX || pssData->unk40EF == TRUE)
+        if (sMonSummaryScreen->monList.mons == gPlayerParty || sMonSummaryScreen->mode == PSS_MODE_BOX || sMonSummaryScreen->unk40EF == TRUE)
         {
-            sum->nature = GetNature(a);
-            sum->currentHP = GetMonData(a, MON_DATA_HP);
-            sum->maxHP = GetMonData(a, MON_DATA_MAX_HP);
-            sum->atk = GetMonData(a, MON_DATA_ATK);
-            sum->def = GetMonData(a, MON_DATA_DEF);
-            sum->spatk = GetMonData(a, MON_DATA_SPATK);
-            sum->spdef = GetMonData(a, MON_DATA_SPDEF);
-            sum->speed = GetMonData(a, MON_DATA_SPEED);
+            sum->nature = GetNature(mon);
+            sum->currentHP = GetMonData(mon, MON_DATA_HP);
+            sum->maxHP = GetMonData(mon, MON_DATA_MAX_HP);
+            sum->atk = GetMonData(mon, MON_DATA_ATK);
+            sum->def = GetMonData(mon, MON_DATA_DEF);
+            sum->spatk = GetMonData(mon, MON_DATA_SPATK);
+            sum->spdef = GetMonData(mon, MON_DATA_SPDEF);
+            sum->speed = GetMonData(mon, MON_DATA_SPEED);
         }
         else
         {
-            sum->nature = GetNature(a);
-            sum->currentHP = GetMonData(a, MON_DATA_HP);
-            sum->maxHP = GetMonData(a, MON_DATA_MAX_HP);
-            sum->atk = GetMonData(a, MON_DATA_ATK2);
-            sum->def = GetMonData(a, MON_DATA_DEF2);
-            sum->spatk = GetMonData(a, MON_DATA_SPATK2);
-            sum->spdef = GetMonData(a, MON_DATA_SPDEF2);
-            sum->speed = GetMonData(a, MON_DATA_SPEED2);
+            sum->nature = GetNature(mon);
+            sum->currentHP = GetMonData(mon, MON_DATA_HP);
+            sum->maxHP = GetMonData(mon, MON_DATA_MAX_HP);
+            sum->atk = GetMonData(mon, MON_DATA_ATK2);
+            sum->def = GetMonData(mon, MON_DATA_DEF2);
+            sum->spatk = GetMonData(mon, MON_DATA_SPATK2);
+            sum->spdef = GetMonData(mon, MON_DATA_SPDEF2);
+            sum->speed = GetMonData(mon, MON_DATA_SPEED2);
         }
         break;
     case 3:
-        GetMonData(a, MON_DATA_OT_NAME, sum->OTName);
-        ConvertInternationalString((u8*)&sum->OTName, GetMonData(a, MON_DATA_LANGUAGE));
-        sum->unk7 = sub_81B205C(a);
-        sum->OTGender = GetMonData(a, MON_DATA_OT_GENDER);
-        sum->OTID = GetMonData(a, MON_DATA_OT_ID);
-        sum->metLocation = GetMonData(a, MON_DATA_MET_LOCATION);
-        sum->metLevel = GetMonData(a, MON_DATA_MET_LEVEL);
-        sum->metGame = GetMonData(a, MON_DATA_MET_GAME);
-        sum->friendship = GetMonData(a, MON_DATA_FRIENDSHIP);
+        GetMonData(mon, MON_DATA_OT_NAME, sum->OTName);
+        ConvertInternationalString((u8*)&sum->OTName, GetMonData(mon, MON_DATA_LANGUAGE));
+        sum->ailment = GetMonAilment(mon);
+        sum->OTGender = GetMonData(mon, MON_DATA_OT_GENDER);
+        sum->OTID = GetMonData(mon, MON_DATA_OT_ID);
+        sum->metLocation = GetMonData(mon, MON_DATA_MET_LOCATION);
+        sum->metLevel = GetMonData(mon, MON_DATA_MET_LEVEL);
+        sum->metGame = GetMonData(mon, MON_DATA_MET_GAME);
+        sum->friendship = GetMonData(mon, MON_DATA_FRIENDSHIP);
         break;
     default:
-        sum->ribbonCount = GetMonData(a, MON_DATA_RIBBON_COUNT);
+        sum->ribbonCount = GetMonData(mon, MON_DATA_RIBBON_COUNT);
         return TRUE;
     }
-    pssData->switchCounter++;
+    sMonSummaryScreen->switchCounter++;
     return FALSE;
 }
 
 static void sub_81C0348(void)
 {
-    if (pssData->currPageIndex != PSS_PAGE_BATTLE_MOVES && pssData->currPageIndex != PSS_PAGE_CONTEST_MOVES)
+    if (sMonSummaryScreen->currPageIndex != PSS_PAGE_BATTLE_MOVES && sMonSummaryScreen->currPageIndex != PSS_PAGE_CONTEST_MOVES)
     {
         sub_81C1DA4(0, 255);
         sub_81C1EFC(0, 255, 0);
     }
     else
     {
-        DrawContestMoveHearts(pssData->summary.moves[pssData->firstMoveIndex]);
-        sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0);
-        sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0);
-        SetBgTilemapBuffer(1, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0]);
-        SetBgTilemapBuffer(2, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]);
+        DrawContestMoveHearts(sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]);
+        sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0);
+        sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0);
+        SetBgTilemapBuffer(1, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0]);
+        SetBgTilemapBuffer(2, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0]);
         ChangeBgX(2, 0x10000, 1);
-        ClearWindowTilemap(19);
-        ClearWindowTilemap(13);
+        ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
+        ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS);
     }
-    if (pssData->summary.unk7 == 0)
+    if (sMonSummaryScreen->summary.ailment == AILMENT_NONE)
     {
         sub_81C2074(0, 0xFF);
     }
     else
     {
-        if (pssData->currPageIndex != PSS_PAGE_BATTLE_MOVES && pssData->currPageIndex != PSS_PAGE_CONTEST_MOVES)
-            PutWindowTilemap(13);
+        if (sMonSummaryScreen->currPageIndex != PSS_PAGE_BATTLE_MOVES && sMonSummaryScreen->currPageIndex != PSS_PAGE_CONTEST_MOVES)
+            PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS);
     }
     LimitEggSummaryPageDisplay();
-    DrawPokerusCuredSymbol(&pssData->currentMon);
+    DrawPokerusCuredSymbol(&sMonSummaryScreen->currentMon);
 }
 
 static void sub_81C0434(void)
 {
     FreeAllWindowBuffers();
-    Free(pssData);
+    Free(sMonSummaryScreen);
 }
 
 static void BeginCloseSummaryScreen(u8 taskId)
@@ -1414,8 +1466,8 @@ static void CloseSummaryScreen(u8 taskId)
 {
     if (sub_81221EC() != TRUE && !gPaletteFade.active)
     {
-        SetMainCallback2(pssData->callback);
-        gLastViewedMonIndex = pssData->curMonIndex;
+        SetMainCallback2(sMonSummaryScreen->callback);
+        gLastViewedMonIndex = sMonSummaryScreen->curMonIndex;
         SummaryScreen_DestroyUnknownTask();
         ResetSpriteData();
         FreeAllSpritePalettes();
@@ -1434,11 +1486,11 @@ static void HandleInput(u8 taskId)
     {
         if (gMain.newKeys & DPAD_UP)
         {
-            ChangePokemon(taskId, -1);
+            ChangeSummaryPokemon(taskId, -1);
         }
         else if (gMain.newKeys & DPAD_DOWN)
         {
-            ChangePokemon(taskId, 1);
+            ChangeSummaryPokemon(taskId, 1);
         }
         else if ((gMain.newKeys & DPAD_LEFT) || GetLRKeysState() == 1)
         {
@@ -1450,9 +1502,9 @@ static void HandleInput(u8 taskId)
         }
         else if (gMain.newKeys & A_BUTTON)
         {
-            if (pssData->currPageIndex != PSS_PAGE_SKILLS)
+            if (sMonSummaryScreen->currPageIndex != PSS_PAGE_SKILLS)
             {
-                if (pssData->currPageIndex == PSS_PAGE_INFO)
+                if (sMonSummaryScreen->currPageIndex == PSS_PAGE_INFO)
                 {
                     StopPokemonAnimations();
                     PlaySE(SE_SELECT);
@@ -1474,50 +1526,52 @@ static void HandleInput(u8 taskId)
     }
 }
 
-static void ChangePokemon(u8 taskId, s8 a)
+static void ChangeSummaryPokemon(u8 taskId, s8 delta)
 {
-    s8 r4_2;
+    s8 v1;
+    s8 v2;
 
-    if (!pssData->lockMonFlag)
+    if (!sMonSummaryScreen->lockMonFlag)
     {
-        if (pssData->isBoxMon == TRUE)
+        if (sMonSummaryScreen->isBoxMon == TRUE)
         {
-            if (pssData->currPageIndex != PSS_PAGE_INFO)
+
+            if (sMonSummaryScreen->currPageIndex != PSS_PAGE_INFO)
             {
-                if (a == 1)
-                    a = 0;
+                if (delta == 1)
+                    delta = 0;
                 else
-                    a = 2;
+                    delta = 2;
             }
             else
             {
-                if (a == 1)
-                    a = 1;
+                if (delta == 1)
+                    delta = 1;
                 else
-                    a = 3;
+                    delta = 3;
             }
-            r4_2 = sub_80D214C(pssData->monList.boxMons, pssData->curMonIndex, pssData->maxMonIndex, a);
+            v1 = sub_80D214C(sMonSummaryScreen->monList.boxMons, sMonSummaryScreen->curMonIndex, sMonSummaryScreen->maxMonIndex, delta);
         }
         else if (IsMultiBattle() == TRUE)
         {
-            r4_2 = sub_81C09B4(a);
+            v1 = sub_81C09B4(delta);
         }
         else
         {
-            r4_2 = sub_81C08F8(a);
+            v1 = sub_81C08F8(delta);
         }
 
-        if (r4_2 != -1)
+        if (v1 != -1)
         {
             PlaySE(SE_SELECT);
-            if (pssData->summary.unk7 != 0)
+            if (sMonSummaryScreen->summary.ailment != AILMENT_NONE)
             {
                 SetSpriteInvisibility(2, 1);
-                ClearWindowTilemap(13);
+                ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS);
                 schedule_bg_copy_tilemap_to_vram(0);
                 sub_81C2074(0, 2);
             }
-            pssData->curMonIndex = r4_2;
+            sMonSummaryScreen->curMonIndex = v1;
             gTasks[taskId].data[0] = 0;
             gTasks[taskId].func = sub_81C0704;
         }
@@ -1535,36 +1589,36 @@ static void sub_81C0704(u8 taskId)
         break;
     case 1:
         SummaryScreen_DestroyUnknownTask();
-        DestroySpriteAndFreeResources(&gSprites[pssData->spriteIds[0]]);
+        DestroySpriteAndFreeResources(&gSprites[sMonSummaryScreen->spriteIds[0]]);
         break;
     case 2:
-        DestroySpriteAndFreeResources(&gSprites[pssData->spriteIds[1]]);
+        DestroySpriteAndFreeResources(&gSprites[sMonSummaryScreen->spriteIds[1]]);
         break;
     case 3:
-        CopyMonToSummaryStruct(&pssData->currentMon);
-        pssData->switchCounter = 0;
+        CopyMonToSummaryStruct(&sMonSummaryScreen->currentMon);
+        sMonSummaryScreen->switchCounter = 0;
         break;
     case 4:
-        if (ExtractMonDataToSummaryStruct(&pssData->currentMon) == FALSE)
+        if (ExtractMonDataToSummaryStruct(&sMonSummaryScreen->currentMon) == FALSE)
             return;
         break;
     case 5:
-        RemoveAndCreateMonMarkingsSprite(&pssData->currentMon);
+        RemoveAndCreateMonMarkingsSprite(&sMonSummaryScreen->currentMon);
         break;
     case 6:
-        CreateCaughtBallSprite(&pssData->currentMon);
+        CreateCaughtBallSprite(&sMonSummaryScreen->currentMon);
         break;
     case 7:
-        if (pssData->summary.unk7)
+        if (sMonSummaryScreen->summary.ailment != AILMENT_NONE)
             sub_81C2074(10, -2);
-        DrawPokerusCuredSymbol(&pssData->currentMon);
+        DrawPokerusCuredSymbol(&sMonSummaryScreen->currentMon);
         data[1] = 0;
         break;
     case 8:
-        pssData->spriteIds[0] = CreatePokemonSprite(&pssData->currentMon, &data[1]);
-        if (pssData->spriteIds[0] == 0xFF)
+        sMonSummaryScreen->spriteIds[0] = CreatePokemonSprite(&sMonSummaryScreen->currentMon, &data[1]);
+        if (sMonSummaryScreen->spriteIds[0] == 0xFF)
             return;
-        gSprites[pssData->spriteIds[0]].data[2] = 1;
+        gSprites[sMonSummaryScreen->spriteIds[0]].data[2] = 1;
         CheckExperienceProgressBar();
         data[1] = 0;
         break;
@@ -1575,11 +1629,11 @@ static void sub_81C0704(u8 taskId)
         sub_81C25E8();
         break;
     case 11:
-        PrintPageSpecificText(pssData->currPageIndex);
+        PrintPageSpecificText(sMonSummaryScreen->currPageIndex);
         LimitEggSummaryPageDisplay();
         break;
     case 12:
-        gSprites[pssData->spriteIds[0]].data[2] = 0;
+        gSprites[sMonSummaryScreen->spriteIds[0]].data[2] = 0;
         break;
     default:
         if (sub_81221EC() == 0 && FuncIsActiveTask(sub_81C20F0) == 0)
@@ -1594,25 +1648,25 @@ static void sub_81C0704(u8 taskId)
 
 static s8 sub_81C08F8(s8 a)
 {
-    struct Pokemon *mon = pssData->monList.mons;
+    struct Pokemon *mon = sMonSummaryScreen->monList.mons;
 
-    if (pssData->currPageIndex == PSS_PAGE_INFO)
+    if (sMonSummaryScreen->currPageIndex == PSS_PAGE_INFO)
     {
-        if (a == -1 && pssData->curMonIndex == 0)
+        if (a == -1 && sMonSummaryScreen->curMonIndex == 0)
             return -1;
-        else if (a == 1 && pssData->curMonIndex >= pssData->maxMonIndex)
+        else if (a == 1 && sMonSummaryScreen->curMonIndex >= sMonSummaryScreen->maxMonIndex)
             return -1;
         else
-            return pssData->curMonIndex + a;
+            return sMonSummaryScreen->curMonIndex + a;
     }
     else
     {
-        s8 index = pssData->curMonIndex;
+        s8 index = sMonSummaryScreen->curMonIndex;
 
         do
         {
             index += a;
-            if (index < 0 || index > pssData->maxMonIndex)
+            if (index < 0 || index > sMonSummaryScreen->maxMonIndex)
                 return -1;
         } while (GetMonData(&mon[index], MON_DATA_IS_EGG) != 0);
         return index;
@@ -1621,13 +1675,13 @@ static s8 sub_81C08F8(s8 a)
 
 static s8 sub_81C09B4(s8 a)
 {
-    struct Pokemon *mon = pssData->monList.mons;
+    struct Pokemon *mon = sMonSummaryScreen->monList.mons;
     s8 r5 = 0;
     u8 i;
 
     for (i = 0; i < 6; i++)
     {
-        if (gUnknown_0861CC1C[i] == pssData->curMonIndex)
+        if (gUnknown_0861CC1C[i] == sMonSummaryScreen->curMonIndex)
         {
             r5 = i;
             break;
@@ -1652,33 +1706,33 @@ static bool8 sub_81C0A50(struct Pokemon* mon)
 {
     if (GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NONE)
         return FALSE;
-    else if (pssData->curMonIndex != 0 || GetMonData(mon, MON_DATA_IS_EGG) == 0)
+    else if (sMonSummaryScreen->curMonIndex != 0 || GetMonData(mon, MON_DATA_IS_EGG) == 0)
         return TRUE;
     else
         return FALSE;
 }
 
-static void ChangePage(u8 taskId, s8 b)
+static void ChangePage(u8 taskId, s8 delta)
 {
-    struct PokeSummary *summary = &pssData->summary;
+    struct PokeSummary *summary = &sMonSummaryScreen->summary;
     s16 *data = gTasks[taskId].data;
 
     if (summary->isEgg)
         return;
-    else if (b == -1 && pssData->currPageIndex == pssData->minPageIndex)
+    else if (delta == -1 && sMonSummaryScreen->currPageIndex == sMonSummaryScreen->minPageIndex)
         return;
-    else if (b == 1 && pssData->currPageIndex == pssData->maxPageIndex)
+    else if (delta == 1 && sMonSummaryScreen->currPageIndex == sMonSummaryScreen->maxPageIndex)
         return;
 
     PlaySE(SE_SELECT);
-    ClearPageWindowTilemaps(pssData->currPageIndex);
-    pssData->currPageIndex += b;
+    ClearPageWindowTilemaps(sMonSummaryScreen->currPageIndex);
+    sMonSummaryScreen->currPageIndex += delta;
     data[0] = 0;
-    if (b == 1)
+    if (delta == 1)
         SetTaskFuncWithFollowupFunc(taskId, PssScrollRight, gTasks[taskId].func);
     else
         SetTaskFuncWithFollowupFunc(taskId, PssScrollLeft, gTasks[taskId].func);
-    CreateTextPrinterTask(pssData->currPageIndex);
+    CreateTextPrinterTask(sMonSummaryScreen->currPageIndex);
     HidePageSpecificSprites();
 }
 
@@ -1687,7 +1741,7 @@ static void PssScrollRight(u8 taskId) // Scroll right
     s16 *data = gTasks[taskId].data;
     if (data[0] == 0)
     {
-        if (pssData->bgDisplayOrder == 0)
+        if (sMonSummaryScreen->bgDisplayOrder == 0)
         {
             data[1] = 1;
             SetBgAttribute(1, BG_ATTR_PRIORITY, 1);
@@ -1702,7 +1756,7 @@ static void PssScrollRight(u8 taskId) // Scroll right
             schedule_bg_copy_tilemap_to_vram(2);
         }
         ChangeBgX(data[1], 0, 0);
-        SetBgTilemapBuffer(data[1], pssData->bgTilemapBuffers[pssData->currPageIndex][0]);
+        SetBgTilemapBuffer(data[1], sMonSummaryScreen->bgTilemapBuffers[sMonSummaryScreen->currPageIndex][0]);
         ShowBg(1);
         ShowBg(2);
     }
@@ -1715,11 +1769,11 @@ static void PssScrollRight(u8 taskId) // Scroll right
 static void PssScrollRightEnd(u8 taskId) // display right
 {
     s16 *data = gTasks[taskId].data;
-    pssData->bgDisplayOrder ^= 1;
+    sMonSummaryScreen->bgDisplayOrder ^= 1;
     data[1] = 0;
     data[0] = 0;
     DrawPagination();
-    CreatePageWindowTilemaps(pssData->currPageIndex);
+    CreatePageWindowTilemaps(sMonSummaryScreen->currPageIndex);
     SetTypeIcons();
     CheckExperienceProgressBar();
     SwitchTaskToFollowupFunc(taskId);
@@ -1730,7 +1784,7 @@ static void PssScrollLeft(u8 taskId) // Scroll left
     s16 *data = gTasks[taskId].data;
     if (data[0] == 0)
     {
-        if (pssData->bgDisplayOrder == 0)
+        if (sMonSummaryScreen->bgDisplayOrder == 0)
             data[1] = 2;
         else
             data[1] = 1;
@@ -1745,7 +1799,7 @@ static void PssScrollLeft(u8 taskId) // Scroll left
 static void PssScrollLeftEnd(u8 taskId) // display left
 {
     s16 *data = gTasks[taskId].data;
-    if (pssData->bgDisplayOrder == 0)
+    if (sMonSummaryScreen->bgDisplayOrder == 0)
     {
         SetBgAttribute(1, BG_ATTR_PRIORITY, 1);
         SetBgAttribute(2, BG_ATTR_PRIORITY, 2);
@@ -1757,18 +1811,18 @@ static void PssScrollLeftEnd(u8 taskId) // display left
         SetBgAttribute(1, BG_ATTR_PRIORITY, 2);
         schedule_bg_copy_tilemap_to_vram(1);
     }
-    if (pssData->currPageIndex > 1)
+    if (sMonSummaryScreen->currPageIndex > 1)
     {
-        SetBgTilemapBuffer(data[1], (u8*)pssData + ((pssData->currPageIndex << 12) + 0xFFFFF0BC));
+        SetBgTilemapBuffer(data[1], (u8*)sMonSummaryScreen + ((sMonSummaryScreen->currPageIndex << 12) + 0xFFFFF0BC));
         ChangeBgX(data[1], 0x10000, 0);
     }
     ShowBg(1);
     ShowBg(2);
-    pssData->bgDisplayOrder ^= 1;
+    sMonSummaryScreen->bgDisplayOrder ^= 1;
     data[1] = 0;
     data[0] = 0;
     DrawPagination();
-    CreatePageWindowTilemaps(pssData->currPageIndex);
+    CreatePageWindowTilemaps(sMonSummaryScreen->currPageIndex);
     SetTypeIcons();
     CheckExperienceProgressBar();
     SwitchTaskToFollowupFunc(taskId);
@@ -1776,27 +1830,27 @@ static void PssScrollLeftEnd(u8 taskId) // display left
 
 static void CheckExperienceProgressBar(void)
 {
-    if (pssData->currPageIndex == 1)
-        DrawExperienceProgressBar(&pssData->currentMon);
+    if (sMonSummaryScreen->currPageIndex == 1)
+        DrawExperienceProgressBar(&sMonSummaryScreen->currentMon);
 }
 
 static void sub_81C0E48(u8 taskId)
 {
     u16 move;
-    pssData->firstMoveIndex = 0;
-    move = pssData->summary.moves[pssData->firstMoveIndex];
-    ClearWindowTilemap(0x13);
-    if (gSprites[pssData->spriteIds[2]].invisible == 0)
-        ClearWindowTilemap(0xD);
+    sMonSummaryScreen->firstMoveIndex = 0;
+    move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex];
+    ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
+    if (gSprites[sMonSummaryScreen->spriteIds[2]].invisible == 0)
+        ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS);
     sub_81C1DA4(9, -3);
     sub_81C1EFC(9, -3, move);
-    if (!pssData->unk40C8)
+    if (!sMonSummaryScreen->unk40C8)
     {
-        ClearWindowTilemap(5);
-        PutWindowTilemap(6);
+        ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO);
+        PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_SWITCH);
     }
-    sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0);
-    sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0);
+    sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 0);
+    sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 0);
     PrintMoveDetails(move);
     PrintNewMoveDetailsOrCancelText();
     SetNewMoveTypeIcon();
@@ -1817,17 +1871,17 @@ static void HandleInput_MoveSelect(u8 taskId)
         if (gMain.newKeys & DPAD_UP)
         {
             data[0] = 4;
-            sub_81C1070(data, -1, &pssData->firstMoveIndex);
+            sub_81C1070(data, -1, &sMonSummaryScreen->firstMoveIndex);
         }
         else if (gMain.newKeys & DPAD_DOWN)
         {
             data[0] = 4;
-            sub_81C1070(data, 1, &pssData->firstMoveIndex);
+            sub_81C1070(data, 1, &sMonSummaryScreen->firstMoveIndex);
         }
         else if (gMain.newKeys & A_BUTTON)
         {
-            if (pssData->unk40C8 == TRUE
-             || (pssData->newMove == MOVE_NONE && pssData->firstMoveIndex == MAX_MON_MOVES))
+            if (sMonSummaryScreen->unk40C8 == TRUE
+             || (sMonSummaryScreen->newMove == MOVE_NONE && sMonSummaryScreen->firstMoveIndex == MAX_MON_MOVES))
             {
                 PlaySE(SE_SELECT);
                 sub_81C11F4(taskId);
@@ -1855,7 +1909,7 @@ static bool8 sub_81C1040(void)
     u8 i;
     for (i = 1; i < MAX_MON_MOVES; i++)
     {
-        if (pssData->summary.moves[i] != 0)
+        if (sMonSummaryScreen->summary.moves[i] != 0)
             return TRUE;
     }
     return FALSE;
@@ -1878,10 +1932,10 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c)
             moveIndex = a[0];
         if (moveIndex == MAX_MON_MOVES)
         {
-            move = pssData->newMove;
+            move = sMonSummaryScreen->newMove;
             break;
         }
-        move = pssData->summary.moves[moveIndex];
+        move = sMonSummaryScreen->summary.moves[moveIndex];
         if (move != 0)
             break;
     }
@@ -1889,25 +1943,25 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c)
     schedule_bg_copy_tilemap_to_vram(1);
     schedule_bg_copy_tilemap_to_vram(2);
     PrintMoveDetails(move);
-    if ((*c == 4 && pssData->newMove == MOVE_NONE) || a[1] == 1)
+    if ((*c == 4 && sMonSummaryScreen->newMove == MOVE_NONE) || a[1] == 1)
     {
-        ClearWindowTilemap(19);
-        if (!gSprites[pssData->spriteIds[2]].invisible)
-            ClearWindowTilemap(13);
+        ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
+        if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible)
+            ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS);
         schedule_bg_copy_tilemap_to_vram(0);
         sub_81C1DA4(9, -3);
         sub_81C1EFC(9, -3, move);
     }
-    if (*c != 4 && moveIndex == 4 && pssData->newMove == MOVE_NONE)
+    if (*c != 4 && moveIndex == 4 && sMonSummaryScreen->newMove == MOVE_NONE)
     {
-        ClearWindowTilemap(14);
-        ClearWindowTilemap(15);
+        ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC);
+        ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM);
         schedule_bg_copy_tilemap_to_vram(0);
         sub_81C1DA4(0, 3);
         sub_81C1EFC(0, 3, 0);
     }
     *c = moveIndex;
-    if (c == &pssData->firstMoveIndex)
+    if (c == &sMonSummaryScreen->firstMoveIndex)
         sub_81C4D18(8);
     else
         sub_81C4D18(18);
@@ -1916,16 +1970,16 @@ static void sub_81C1070(s16 *a, s8 b, u8 *c)
 static void sub_81C11F4(u8 taskId)
 {
     sub_81C4C60(8);
-    ClearWindowTilemap(6);
-    PutWindowTilemap(5);
+    ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_SWITCH);
+    PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO);
     PrintMoveDetails(0);
-    sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 1);
-    sub_81C2194(pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 1);
+    sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], 3, 1);
+    sub_81C2194(sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], 1, 1);
     sub_81C4064();
-    if (pssData->firstMoveIndex != MAX_MON_MOVES)
+    if (sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES)
     {
-        ClearWindowTilemap(14);
-        ClearWindowTilemap(15);
+        ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC);
+        ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM);
         sub_81C1DA4(0, 3);
         sub_81C1EFC(0, 3, 0);
     }
@@ -1937,7 +1991,7 @@ static void sub_81C11F4(u8 taskId)
 
 static void sub_81C129C(u8 taskId)
 {
-    pssData->secondMoveIndex = pssData->firstMoveIndex;
+    sMonSummaryScreen->secondMoveIndex = sMonSummaryScreen->firstMoveIndex;
     sub_81C4C84(1);
     sub_81C4AF8(18);
     gTasks[taskId].func = sub_81C12E4;
@@ -1952,16 +2006,16 @@ static void sub_81C12E4(u8 taskId)
         if (gMain.newKeys & DPAD_UP)
         {
             data[0] = 3;
-            sub_81C1070(&data[0], -1, &pssData->secondMoveIndex);
+            sub_81C1070(&data[0], -1, &sMonSummaryScreen->secondMoveIndex);
         }
         else if (gMain.newKeys & DPAD_DOWN)
         {
             data[0] = 3;
-            sub_81C1070(&data[0], 1, &pssData->secondMoveIndex);
+            sub_81C1070(&data[0], 1, &sMonSummaryScreen->secondMoveIndex);
         }
         else if (gMain.newKeys & A_BUTTON)
         {
-            if (pssData->firstMoveIndex == pssData->secondMoveIndex)
+            if (sMonSummaryScreen->firstMoveIndex == sMonSummaryScreen->secondMoveIndex)
             {
                 sub_81C13B0(taskId, 0);
             }
@@ -1987,23 +2041,23 @@ static void sub_81C13B0(u8 taskId, bool8 b)
 
     if (b == TRUE)
     {
-        if (!pssData->isBoxMon)
+        if (!sMonSummaryScreen->isBoxMon)
         {
-            struct Pokemon *why = pssData->monList.mons;
-            SwapMonMoves(&why[pssData->curMonIndex], pssData->firstMoveIndex, pssData->secondMoveIndex);
+            struct Pokemon *why = sMonSummaryScreen->monList.mons;
+            SwapMonMoves(&why[sMonSummaryScreen->curMonIndex], sMonSummaryScreen->firstMoveIndex, sMonSummaryScreen->secondMoveIndex);
         }
         else
         {
-            struct BoxPokemon *why = pssData->monList.boxMons;
-            SwapBoxMonMoves(&why[pssData->curMonIndex], pssData->firstMoveIndex, pssData->secondMoveIndex);
+            struct BoxPokemon *why = sMonSummaryScreen->monList.boxMons;
+            SwapBoxMonMoves(&why[sMonSummaryScreen->curMonIndex], sMonSummaryScreen->firstMoveIndex, sMonSummaryScreen->secondMoveIndex);
         }
-        CopyMonToSummaryStruct(&pssData->currentMon);
-        sub_81C40A0(pssData->firstMoveIndex, pssData->secondMoveIndex);
-        sub_81C4568(pssData->firstMoveIndex, pssData->secondMoveIndex);
-        pssData->firstMoveIndex = pssData->secondMoveIndex;
+        CopyMonToSummaryStruct(&sMonSummaryScreen->currentMon);
+        sub_81C40A0(sMonSummaryScreen->firstMoveIndex, sMonSummaryScreen->secondMoveIndex);
+        sub_81C4568(sMonSummaryScreen->firstMoveIndex, sMonSummaryScreen->secondMoveIndex);
+        sMonSummaryScreen->firstMoveIndex = sMonSummaryScreen->secondMoveIndex;
     }
 
-    move = pssData->summary.moves[pssData->firstMoveIndex];
+    move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex];
     PrintMoveDetails(move);
     DrawContestMoveHearts(move);
     schedule_bg_copy_tilemap_to_vram(1);
@@ -2013,7 +2067,7 @@ static void sub_81C13B0(u8 taskId, bool8 b)
 
 static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2)
 {
-    struct PokeSummary* summary = &pssData->summary;
+    struct PokeSummary* summary = &sMonSummaryScreen->summary;
 
     u16 move1 = summary->moves[moveIndex1];
     u16 move2 = summary->moves[moveIndex2];
@@ -2048,7 +2102,7 @@ static void SwapMonMoves(struct Pokemon *mon, u8 moveIndex1, u8 moveIndex2)
 
 static void SwapBoxMonMoves(struct BoxPokemon *mon, u8 moveIndex1, u8 moveIndex2)
 {
-    struct PokeSummary* summary = &pssData->summary;
+    struct PokeSummary* summary = &sMonSummaryScreen->summary;
 
     u16 move1 = summary->moves[moveIndex1];
     u16 move2 = summary->moves[moveIndex2];
@@ -2092,19 +2146,19 @@ static void HandleReplaceMoveInput(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
-    if (sub_81221EC() != 1)
+    if (sub_81221EC() != TRUE)
     {
-        if (gPaletteFade.active != 1)
+        if (gPaletteFade.active != TRUE)
         {
             if (gMain.newKeys & DPAD_UP)
             {
                 data[0] = 4;
-                sub_81C1070(data, -1, &pssData->firstMoveIndex);
+                sub_81C1070(data, -1, &sMonSummaryScreen->firstMoveIndex);
             }
             else if (gMain.newKeys & DPAD_DOWN)
             {
                 data[0] = 4;
-                sub_81C1070(data, 1, &pssData->firstMoveIndex);
+                sub_81C1070(data, 1, &sMonSummaryScreen->firstMoveIndex);
             }
             else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
             {
@@ -2120,7 +2174,7 @@ static void HandleReplaceMoveInput(u8 taskId)
                 {
                     StopPokemonAnimations();
                     PlaySE(SE_SELECT);
-                    sUnknown_0203CF21 = pssData->firstMoveIndex;
+                    sUnknown_0203CF21 = sMonSummaryScreen->firstMoveIndex;
                     gSpecialVar_0x8005 = sUnknown_0203CF21;
                     BeginCloseSummaryScreen(taskId);
                 }
@@ -2145,7 +2199,7 @@ static void HandleReplaceMoveInput(u8 taskId)
 
 static bool8 CanReplaceMove(void)
 {
-    if (pssData->firstMoveIndex == MAX_MON_MOVES || pssData->newMove == MOVE_NONE || IsMoveHm(pssData->summary.moves[pssData->firstMoveIndex]) != 1)
+    if (sMonSummaryScreen->firstMoveIndex == MAX_MON_MOVES || sMonSummaryScreen->newMove == MOVE_NONE || IsMoveHm(sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]) != 1)
         return TRUE;
     else
         return FALSE;
@@ -2153,8 +2207,8 @@ static bool8 CanReplaceMove(void)
 
 static void ShowHMMovesCantBeForgottenWindow(u8 taskId)
 {
-    ClearWindowTilemap(14);
-    ClearWindowTilemap(15);
+    ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC);
+    ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM);
     schedule_bg_copy_tilemap_to_vram(0);
     sub_81C1DA4(0, 3);
     sub_81C1EFC(0, 3, 0);
@@ -2173,7 +2227,7 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId)
         {
             data[1] = 1;
             data[0] = 4;
-            sub_81C1070(&data[0], -1, &pssData->firstMoveIndex);
+            sub_81C1070(&data[0], -1, &sMonSummaryScreen->firstMoveIndex);
             data[1] = 0;
             gTasks[taskId].func = HandleReplaceMoveInput;
         }
@@ -2181,18 +2235,18 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId)
         {
             data[1] = 1;
             data[0] = 4;
-            sub_81C1070(&data[0], 1, &pssData->firstMoveIndex);
+            sub_81C1070(&data[0], 1, &sMonSummaryScreen->firstMoveIndex);
             data[1] = 0;
             gTasks[taskId].func = HandleReplaceMoveInput;
         }
         else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
         {
-            if (pssData->currPageIndex != 2)
+            if (sMonSummaryScreen->currPageIndex != 2)
             {
-                ClearWindowTilemap(19);
-                if (!gSprites[pssData->spriteIds[2]].invisible)
-                    ClearWindowTilemap(13);
-                move = pssData->summary.moves[pssData->firstMoveIndex];
+                ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
+                if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible)
+                    ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS);
+                move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex];
                 gTasks[taskId].func = HandleReplaceMoveInput;
                 ChangePage(taskId, -1);
                 sub_81C1DA4(9, -2);
@@ -2201,12 +2255,12 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId)
         }
         else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2)
         {
-            if (pssData->currPageIndex != 3)
+            if (sMonSummaryScreen->currPageIndex != 3)
             {
-                ClearWindowTilemap(19);
-                if (!gSprites[pssData->spriteIds[2]].invisible)
-                    ClearWindowTilemap(13);
-                move = pssData->summary.moves[pssData->firstMoveIndex];
+                ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
+                if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible)
+                    ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS);
+                move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex];
                 gTasks[taskId].func = HandleReplaceMoveInput;
                 ChangePage(taskId, 1);
                 sub_81C1DA4(9, -2);
@@ -2215,10 +2269,10 @@ static void HandleHMMovesCantBeForgottenInput(u8 taskId)
         }
         else if (gMain.newKeys & (A_BUTTON | B_BUTTON))
         {
-            ClearWindowTilemap(19);
-            if (!gSprites[pssData->spriteIds[2]].invisible)
-                ClearWindowTilemap(13);
-            move = pssData->summary.moves[pssData->firstMoveIndex];
+            ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
+            if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible)
+                ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS);
+            move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex];
             PrintMoveDetails(move);
             schedule_bg_copy_tilemap_to_vram(0);
             sub_81C1DA4(9, -3);
@@ -2242,30 +2296,30 @@ static void DrawPagination(void) // Updates the pagination dots at the top of th
     {
         u8 j = i * 2;
 
-        if (i < pssData->minPageIndex)
+        if (i < sMonSummaryScreen->minPageIndex)
         {
             alloced[j + 0] = 0x40;
             alloced[j + 1] = 0x40;
             alloced[j + 8] = 0x50;
             alloced[j + 9] = 0x50;
         }
-        else if (i > pssData->maxPageIndex)
+        else if (i > sMonSummaryScreen->maxPageIndex)
         {
             alloced[j + 0] = 0x4A;
             alloced[j + 1] = 0x4A;
             alloced[j + 8] = 0x5A;
             alloced[j + 9] = 0x5A;
         }
-        else if (i < pssData->currPageIndex)
+        else if (i < sMonSummaryScreen->currPageIndex)
         {
             alloced[j + 0] = 0x46;
             alloced[j + 1] = 0x47;
             alloced[j + 8] = 0x56;
             alloced[j + 9] = 0x57;
         }
-        else if (i == pssData->currPageIndex)
+        else if (i == sMonSummaryScreen->currPageIndex)
         {
-            if (i != pssData->maxPageIndex)
+            if (i != sMonSummaryScreen->maxPageIndex)
             {
                 alloced[j + 0] = 0x41;
                 alloced[j + 1] = 0x42;
@@ -2280,7 +2334,7 @@ static void DrawPagination(void) // Updates the pagination dots at the top of th
                 alloced[j + 9] = 0x5C;
             }
         }
-        else if (i != pssData->maxPageIndex)
+        else if (i != sMonSummaryScreen->maxPageIndex)
         {
             alloced[j + 0] = 0x43;
             alloced[j + 1] = 0x44;
@@ -2335,7 +2389,7 @@ static void sub_81C1DA4(u16 a, s16 b)
         b = sUnknown_0861CC04.field_6;
     if (b == 0 || b == sUnknown_0861CC04.field_6)
     {
-        sub_81C1CB0(&sUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], b, 1);
+        sub_81C1CB0(&sUnknown_0861CC04, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], b, 1);
     }
     else
     {
@@ -2361,19 +2415,19 @@ static void sub_81C1E20(u8 taskId)
     {
         data[1] = sUnknown_0861CC04.field_6;
     }
-    sub_81C1CB0(&sUnknown_0861CC04, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], data[1], 1);
+    sub_81C1CB0(&sUnknown_0861CC04, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][0], data[1], 1);
     if (data[1] <= 0 || data[1] >= sUnknown_0861CC04.field_6)
     {
         if (data[0] < 0)
         {
-            if (pssData->currPageIndex == 2)
-                PutWindowTilemap(14);
+            if (sMonSummaryScreen->currPageIndex == 2)
+                PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC);
         }
         else
         {
-            if (!gSprites[pssData->spriteIds[2]].invisible)
-                PutWindowTilemap(13);
-            PutWindowTilemap(19);
+            if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible)
+                PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS);
+            PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
         }
         schedule_bg_copy_tilemap_to_vram(0);
         DestroyTask(taskId);
@@ -2387,7 +2441,7 @@ static void sub_81C1EFC(u16 a, s16 b, u16 move)
     if (b > sUnknown_0861CC10.field_6)
         b = sUnknown_0861CC10.field_6;
     if (b == 0 || b == sUnknown_0861CC10.field_6)
-        sub_81C1CB0(&sUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], b, 1);
+        sub_81C1CB0(&sUnknown_0861CC10, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], b, 1);
     else
     {
         u8 taskId = FindTaskIdByFunc(sub_81C1F80);
@@ -2411,22 +2465,22 @@ static void sub_81C1F80(u8 taskId)
     {
         data[1] = sUnknown_0861CC10.field_6;
     }
-    sub_81C1CB0(&sUnknown_0861CC10, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], data[1], 1);
+    sub_81C1CB0(&sUnknown_0861CC10, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][0], data[1], 1);
     if (data[1] <= 0 || data[1] >= sUnknown_0861CC10.field_6)
     {
         if (data[0] < 0)
         {
-            if (pssData->currPageIndex == 3 && FuncIsActiveTask(PssScrollRight) == 0)
-                PutWindowTilemap(15);
+            if (sMonSummaryScreen->currPageIndex == 3 && FuncIsActiveTask(PssScrollRight) == 0)
+                PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM);
             DrawContestMoveHearts(data[2]);
         }
         else
         {
-            if (!gSprites[pssData->spriteIds[2]].invisible)
+            if (!gSprites[sMonSummaryScreen->spriteIds[2]].invisible)
             {
-                PutWindowTilemap(13);
+                PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS);
             }
-            PutWindowTilemap(19);
+            PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
         }
         schedule_bg_copy_tilemap_to_vram(0);
         DestroyTask(taskId);
@@ -2441,8 +2495,8 @@ static void sub_81C2074(u16 a, s16 b)
         b = sUnknown_0861CBEC.field_6;
     if (b == 0 || b == sUnknown_0861CBEC.field_6)
     {
-        sub_81C1CB0(&sUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0);
-        sub_81C1CB0(&sUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0);
+        sub_81C1CB0(&sUnknown_0861CBEC, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0);
+        sub_81C1CB0(&sUnknown_0861CBF8, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0], b, 0);
     }
     else
     {
@@ -2460,15 +2514,15 @@ static void sub_81C20F0(u8 taskId)
         data[1] = 0;
     else if (data[1] > sUnknown_0861CBEC.field_6)
         data[1] = sUnknown_0861CBEC.field_6;
-    sub_81C1CB0(&sUnknown_0861CBEC, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0);
-    sub_81C1CB0(&sUnknown_0861CBF8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0);
+    sub_81C1CB0(&sUnknown_0861CBEC, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0);
+    sub_81C1CB0(&sUnknown_0861CBF8, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], 0);
     schedule_bg_copy_tilemap_to_vram(3);
     if (data[1] <= 0 || data[1] >= sUnknown_0861CBEC.field_6)
     {
         if (data[0] < 0)
         {
             CreateSetStatusSprite();
-            PutWindowTilemap(13);
+            PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS);
             schedule_bg_copy_tilemap_to_vram(0);
         }
         DestroyTask(taskId);
@@ -2507,13 +2561,13 @@ static void DrawPokerusCuredSymbol(struct Pokemon *mon) // This checks if the mo
 {
     if (!CheckPartyPokerus(mon, 0) && CheckPartyHasHadPokerus(mon, 0)) // If yes it draws the cured symbol
     {
-        pssData->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x2C;
-        pssData->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x2C;
+        sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x2C;
+        sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x2C;
     }
     else
     {
-        pssData->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x81A;
-        pssData->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x81A;
+        sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x81A;
+        sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x81A;
     }
     schedule_bg_copy_tilemap_to_vram(3);
 }
@@ -2530,7 +2584,7 @@ static void sub_81C228C(bool8 isMonShiny)
 static void DrawExperienceProgressBar(struct Pokemon *unused)
 {
     s64 numExpProgressBarTicks;
-    struct PokeSummary *summary = &pssData->summary;
+    struct PokeSummary *summary = &sMonSummaryScreen->summary;
     u16 *r9;
     u8 i;
 
@@ -2551,7 +2605,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused)
         numExpProgressBarTicks = 0;
     }
 
-    r9 = &pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][1][0x255];
+    r9 = &sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_SKILLS][1][0x255];
     for (i = 0; i < 8; i++)
     {
         if (numExpProgressBarTicks > 7)
@@ -2563,7 +2617,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused)
             numExpProgressBarTicks = 0;
     }
 
-    if (GetBgTilemapBuffer(1) == pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][0])
+    if (GetBgTilemapBuffer(1) == sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_SKILLS][0])
         schedule_bg_copy_tilemap_to_vram(1);
     else
         schedule_bg_copy_tilemap_to_vram(2);
@@ -2571,7 +2625,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused)
 
 static void DrawContestMoveHearts(u16 move)
 {
-    u16 *tilemap = pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1];
+    u16 *tilemap = sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1];
     u8 i;
     u8 effectValue;
 
@@ -2615,7 +2669,7 @@ static void DrawContestMoveHearts(u16 move)
 
 static void LimitEggSummaryPageDisplay(void) // If the pokemon is an egg, limit the number of pages displayed to 1
 {
-    if (pssData->summary.isEgg)
+    if (sMonSummaryScreen->summary.isEgg)
         ChangeBgX(3, 0x10000, 0);
     else
         ChangeBgX(3, 0, 0);
@@ -2631,9 +2685,9 @@ static void ResetWindows(void)
     {
         FillWindowPixelBuffer(i, PIXEL_FILL(0));
     }
-    for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++)
+    for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->windowIds); i++)
     {
-        pssData->windowIds[i] = 0xFF;
+        sMonSummaryScreen->windowIds[i] = 0xFF;
     }
 }
 
@@ -2644,10 +2698,10 @@ static void SummaryScreen_PrintTextOnWindow(u8 windowId, const u8 *string, u8 x,
 
 static void sub_81C25E8(void)
 {
-    FillWindowPixelBuffer(17, PIXEL_FILL(0));
-    FillWindowPixelBuffer(18, PIXEL_FILL(0));
-    FillWindowPixelBuffer(19, PIXEL_FILL(0));
-    if (!pssData->summary.isEgg)
+    FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, PIXEL_FILL(0));
+    FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, PIXEL_FILL(0));
+    FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, PIXEL_FILL(0));
+    if (!sMonSummaryScreen->summary.isEgg)
         sub_81C2628();
     else
         sub_81C2794();
@@ -2657,8 +2711,8 @@ static void sub_81C25E8(void)
 static void sub_81C2628(void)
 {
     u8 strArray[16];
-    struct Pokemon *mon = &pssData->currentMon;
-    struct PokeSummary *summary = &pssData->summary;
+    struct Pokemon *mon = &sMonSummaryScreen->currentMon;
+    struct PokeSummary *summary = &sMonSummaryScreen->summary;
     u16 dexNum = SpeciesToPokedexNum(summary->species);
     if (dexNum != 0xFFFF)
     {
@@ -2667,19 +2721,19 @@ static void sub_81C2628(void)
         StringAppend(gStringVar1, gStringVar2);
         if (!IsMonShiny(mon))
         {
-            SummaryScreen_PrintTextOnWindow(17, gStringVar1, 0, 1, 0, 1);
+            SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, gStringVar1, 0, 1, 0, 1);
             sub_81C228C(FALSE);
         }
         else
         {
-            SummaryScreen_PrintTextOnWindow(17, gStringVar1, 0, 1, 0, 7);
+            SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, gStringVar1, 0, 1, 0, 7);
             sub_81C228C(TRUE);
         }
-        PutWindowTilemap(17);
+        PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER);
     }
     else
     {
-        ClearWindowTilemap(17);
+        ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER);
         if (!IsMonShiny(mon))
             sub_81C228C(FALSE);
         else
@@ -2688,24 +2742,24 @@ static void sub_81C2628(void)
     StringCopy(gStringVar1, &gText_LevelSymbol[0]);
     ConvertIntToDecimalStringN(gStringVar2, summary->level, 0, 3);
     StringAppend(gStringVar1, gStringVar2);
-    SummaryScreen_PrintTextOnWindow(19, gStringVar1, 0x18, 17, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, gStringVar1, 0x18, 17, 0, 1);
     GetMonNickname(mon, gStringVar1);
-    SummaryScreen_PrintTextOnWindow(18, gStringVar1, 0, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, gStringVar1, 0, 1, 0, 1);
     strArray[0] = CHAR_SLASH;
     StringCopy(&strArray[1], &gSpeciesNames[summary->species2][0]);
-    SummaryScreen_PrintTextOnWindow(19, &strArray[0], 0, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, &strArray[0], 0, 1, 0, 1);
     sub_81C27DC(mon, summary->species2);
-    PutWindowTilemap(18);
-    PutWindowTilemap(19);
+    PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME);
+    PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
 }
 
 static void sub_81C2794(void)
 {
-    GetMonNickname(&pssData->currentMon, gStringVar1);
-    SummaryScreen_PrintTextOnWindow(18, gStringVar1, 0, 1, 0, 1);
-    PutWindowTilemap(18);
-    ClearWindowTilemap(17);
-    ClearWindowTilemap(19);
+    GetMonNickname(&sMonSummaryScreen->currentMon, gStringVar1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, gStringVar1, 0, 1, 0, 1);
+    PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME);
+    ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER);
+    ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
 }
 
 static void sub_81C27DC(struct Pokemon *mon, u16 species)
@@ -2716,10 +2770,10 @@ static void sub_81C27DC(struct Pokemon *mon, u16 species)
         switch (gender)
         {
             case MON_MALE:
-                SummaryScreen_PrintTextOnWindow(19, gText_MaleSymbol, 57, 17, 0, 3);
+                SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, gText_MaleSymbol, 57, 17, 0, 3);
                 break;
             case MON_FEMALE:
-                SummaryScreen_PrintTextOnWindow(19, gText_FemaleSymbol, 57, 17, 0, 4);
+                SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, gText_FemaleSymbol, 57, 17, 0, 4);
                 break;
         }
     }
@@ -2737,108 +2791,108 @@ static void PrintPageNamesAndStatsPageToWindows(void)
     int iconXPos;
     int statsXPos;
 
-    SummaryScreen_PrintTextOnWindow(0, gText_PkmnInfo, 2, 1, 0, 1);
-    SummaryScreen_PrintTextOnWindow(1, gText_PkmnSkills, 2, 1, 0, 1);
-    SummaryScreen_PrintTextOnWindow(2, gText_BattleMoves, 2, 1, 0, 1);
-    SummaryScreen_PrintTextOnWindow(3, gText_ContestMoves, 2, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_INFO_TITLE, gText_PkmnInfo, 2, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE, gText_PkmnSkills, 2, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE, gText_BattleMoves, 2, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE, gText_ContestMoves, 2, 1, 0, 1);
 
     stringXPos = GetStringRightAlignXOffset(1, gText_Cancel2, 62);
     iconXPos = stringXPos - 16;
     if (iconXPos < 0)
         iconXPos = 0;
-    PrintAOrBButtonIcon(4, FALSE, iconXPos);
-    SummaryScreen_PrintTextOnWindow(4, gText_Cancel2, stringXPos, 1, 0, 0);
+    PrintAOrBButtonIcon(PSS_LABEL_WINDOW_PROMPT_CANCEL, FALSE, iconXPos);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PROMPT_CANCEL, gText_Cancel2, stringXPos, 1, 0, 0);
 
     stringXPos = GetStringRightAlignXOffset(1, gText_Info, 0x3E);
     iconXPos = stringXPos - 16;
     if (iconXPos < 0)
         iconXPos = 0;
-    PrintAOrBButtonIcon(5, FALSE, iconXPos);
-    SummaryScreen_PrintTextOnWindow(5, gText_Info, stringXPos, 1, 0, 0);
+    PrintAOrBButtonIcon(PSS_LABEL_WINDOW_PROMPT_INFO, FALSE, iconXPos);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PROMPT_INFO, gText_Info, stringXPos, 1, 0, 0);
 
     stringXPos = GetStringRightAlignXOffset(1, gText_Switch, 0x3E);
     iconXPos = stringXPos - 16;
     if (iconXPos < 0)
         iconXPos = 0;
-    PrintAOrBButtonIcon(6, FALSE, iconXPos);
-    SummaryScreen_PrintTextOnWindow(6, gText_Switch, stringXPos, 1, 0, 0);
+    PrintAOrBButtonIcon(PSS_LABEL_WINDOW_PROMPT_SWITCH, FALSE, iconXPos);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PROMPT_SWITCH, gText_Switch, stringXPos, 1, 0, 0);
 
-    SummaryScreen_PrintTextOnWindow(8, gText_RentalPkmn, 0, 1, 0, 1);
-    SummaryScreen_PrintTextOnWindow(9, gText_TypeSlash, 0, 1, 0, 0);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL, gText_RentalPkmn, 0, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_INFO_TYPE, gText_TypeSlash, 0, 1, 0, 0);
     statsXPos = 6 + GetStringCenterAlignXOffset(1, gText_HP4, 42);
-    SummaryScreen_PrintTextOnWindow(10, gText_HP4, statsXPos, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_HP4, statsXPos, 1, 0, 1);
     statsXPos = 6 + GetStringCenterAlignXOffset(1, gText_Attack3, 42);
-    SummaryScreen_PrintTextOnWindow(10, gText_Attack3, statsXPos, 17, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_Attack3, statsXPos, 17, 0, 1);
     statsXPos = 6 + GetStringCenterAlignXOffset(1, gText_Defense3, 42);
-    SummaryScreen_PrintTextOnWindow(10, gText_Defense3, statsXPos, 33, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT, gText_Defense3, statsXPos, 33, 0, 1);
     statsXPos = 2 + GetStringCenterAlignXOffset(1, gText_SpAtk4, 36);
-    SummaryScreen_PrintTextOnWindow(11, gText_SpAtk4, statsXPos, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_SpAtk4, statsXPos, 1, 0, 1);
     statsXPos = 2 + GetStringCenterAlignXOffset(1, gText_SpDef4, 36);
-    SummaryScreen_PrintTextOnWindow(11, gText_SpDef4, statsXPos, 17, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_SpDef4, statsXPos, 17, 0, 1);
     statsXPos = 2 + GetStringCenterAlignXOffset(1, gText_Speed2, 36);
-    SummaryScreen_PrintTextOnWindow(11, gText_Speed2, statsXPos, 33, 0, 1);
-    SummaryScreen_PrintTextOnWindow(12, gText_ExpPoints, 6, 1, 0, 1);
-    SummaryScreen_PrintTextOnWindow(12, gText_NextLv, 6, 17, 0, 1);
-    SummaryScreen_PrintTextOnWindow(13, gText_Status, 2, 1, 0, 1);
-    SummaryScreen_PrintTextOnWindow(14, gText_Power, 0, 1, 0, 1);
-    SummaryScreen_PrintTextOnWindow(14, gText_Accuracy2, 0, 17, 0, 1);
-    SummaryScreen_PrintTextOnWindow(15, gText_Appeal, 0, 1, 0, 1);
-    SummaryScreen_PrintTextOnWindow(15, gText_Jam, 0, 17, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT, gText_Speed2, statsXPos, 33, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP, gText_ExpPoints, 6, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP, gText_NextLv, 6, 17, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS, gText_Status, 2, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_POWER_ACC, gText_Power, 0, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_POWER_ACC, gText_Accuracy2, 0, 17, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM, gText_Appeal, 0, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM, gText_Jam, 0, 17, 0, 1);
 }
 
 static void CreatePageWindowTilemaps(u8 page)
 {
     u8 i;
 
-    ClearWindowTilemap(0);
-    ClearWindowTilemap(1);
-    ClearWindowTilemap(2);
-    ClearWindowTilemap(3);
+    ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_TITLE);
+    ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE);
+    ClearWindowTilemap(PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE);
+    ClearWindowTilemap(PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE);
 
     switch (page)
     {
         case PSS_PAGE_INFO:
-            PutWindowTilemap(0);
-            PutWindowTilemap(4);
-            if (InBattleFactory() == TRUE || sub_81B9E94() == TRUE)
-                PutWindowTilemap(8);
-            PutWindowTilemap(9);
+            PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_TITLE);
+            PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_CANCEL);
+            if (InBattleFactory() == TRUE || InSlateportBattleTent() == TRUE)
+                PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL);
+            PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_TYPE);
             break;
         case PSS_PAGE_SKILLS:
-            PutWindowTilemap(1);
-            PutWindowTilemap(10);
-            PutWindowTilemap(11);
-            PutWindowTilemap(12);
+            PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_TITLE);
+            PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT);
+            PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT);
+            PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP);
             break;
         case PSS_PAGE_BATTLE_MOVES:
-            PutWindowTilemap(2);
-            if (pssData->mode == PSS_MODE_SELECT_MOVE)
+            PutWindowTilemap(PSS_LABEL_WINDOW_BATTLE_MOVES_TITLE);
+            if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
             {
-                if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES)
-                    PutWindowTilemap(14);
+                if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES)
+                    PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC);
             }
             else
             {
-                PutWindowTilemap(5);
+                PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO);
             }
             break;
         case PSS_PAGE_CONTEST_MOVES:
-            PutWindowTilemap(3);
-            if (pssData->mode == PSS_MODE_SELECT_MOVE)
+            PutWindowTilemap(PSS_LABEL_WINDOW_CONTEST_MOVES_TITLE);
+            if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
             {
-                if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES)
-                    PutWindowTilemap(15);
+                if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES)
+                    PutWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM);
             }
             else
             {
-                PutWindowTilemap(5);
+                PutWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO);
             }
             break;
     }
 
-    for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++)
+    for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->windowIds); i++)
     {
-        PutWindowTilemap(pssData->windowIds[i]);
+        PutWindowTilemap(sMonSummaryScreen->windowIds[i]);
     }
 
     schedule_bg_copy_tilemap_to_vram(0);
@@ -2850,41 +2904,41 @@ static void ClearPageWindowTilemaps(u8 page)
     switch (page)
     {
         case PSS_PAGE_INFO:
-            ClearWindowTilemap(4);
-            if (InBattleFactory() == TRUE || sub_81B9E94() == TRUE)
-                ClearWindowTilemap(8);
-            ClearWindowTilemap(9);
+            ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_CANCEL);
+            if (InBattleFactory() == TRUE || InSlateportBattleTent() == TRUE)
+                ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_RENTAL);
+            ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_INFO_TYPE);
             break;
         case PSS_PAGE_SKILLS:
-            ClearWindowTilemap(10);
-            ClearWindowTilemap(11);
-            ClearWindowTilemap(12);
+            ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_LEFT);
+            ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATS_RIGHT);
+            ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_EXP);
             break;
         case PSS_PAGE_BATTLE_MOVES:
-            if (pssData->mode == PSS_MODE_SELECT_MOVE)
+            if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
             {
-                if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES)
-                    ClearWindowTilemap(14);
+                if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES)
+                    ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC);
             }
             else
             {
-                ClearWindowTilemap(5);
+                ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO);
             }
             break;
         case PSS_PAGE_CONTEST_MOVES:
-            if (pssData->mode == PSS_MODE_SELECT_MOVE)
+            if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
             {
-                if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES)
-                    ClearWindowTilemap(15);
+                if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES)
+                    ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM);
             }
             else
             {
-                ClearWindowTilemap(5);
+                ClearWindowTilemap(PSS_LABEL_WINDOW_PROMPT_INFO);
             }
             break;
     }
 
-    for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++)
+    for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->windowIds); i++)
     {
         SummaryScreen_RemoveWindowByIndex(i);
     }
@@ -2894,7 +2948,7 @@ static void ClearPageWindowTilemaps(u8 page)
 
 static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 templateId)
 {
-    u8 *windowIdPtr = &(pssData->windowIds[templateId]);
+    u8 *windowIdPtr = &(sMonSummaryScreen->windowIds[templateId]);
     if (*windowIdPtr == 0xFF)
     {
         *windowIdPtr = AddWindow(&template[templateId]);
@@ -2905,7 +2959,7 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te
 
 static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex)
 {
-    u8 *windowIdPtr = &(pssData->windowIds[windowIndex]);
+    u8 *windowIdPtr = &(sMonSummaryScreen->windowIds[windowIndex]);
     if (*windowIdPtr != 0xFF)
     {
         ClearWindowTilemap(*windowIdPtr);
@@ -2917,10 +2971,10 @@ static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex)
 static void PrintPageSpecificText(u8 pageIndex)
 {
     u16 i;
-    for (i = 0; i < ARRAY_COUNT(pssData->windowIds); i++)
+    for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->windowIds); i++)
     {
-        if (pssData->windowIds[i] != 0xFF)
-            FillWindowPixelBuffer(pssData->windowIds[i], PIXEL_FILL(0));
+        if (sMonSummaryScreen->windowIds[i] != 0xFF)
+            FillWindowPixelBuffer(sMonSummaryScreen->windowIds[i], PIXEL_FILL(0));
     }
     sTextPrinterFunctions[pageIndex]();
 }
@@ -2932,7 +2986,7 @@ static void CreateTextPrinterTask(u8 pageIndex)
 
 static void PrintInfoPageText(void)
 {
-    if (pssData->summary.isEgg)
+    if (sMonSummaryScreen->summary.isEgg)
     {
         PrintEggOTName();
         PrintEggOTID();
@@ -2984,44 +3038,44 @@ static void PrintMonOTName(void)
 {
     u8 windowId;
     int x;
-    if (InBattleFactory() != TRUE && sub_81B9E94() != TRUE)
+    if (InBattleFactory() != TRUE && InSlateportBattleTent() != TRUE)
     {
-        windowId = AddWindowFromTemplateList(sPageInfoTemplate, 0);
+        windowId = AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ORIGINAL_TRAINER);
         SummaryScreen_PrintTextOnWindow(windowId, gText_OTSlash, 0, 1, 0, 1);
         x = GetStringWidth(1, gText_OTSlash, 0);
-        if (pssData->summary.OTGender == 0)
-            SummaryScreen_PrintTextOnWindow(windowId, pssData->summary.OTName, x, 1, 0, 5);
+        if (sMonSummaryScreen->summary.OTGender == 0)
+            SummaryScreen_PrintTextOnWindow(windowId, sMonSummaryScreen->summary.OTName, x, 1, 0, 5);
         else
-            SummaryScreen_PrintTextOnWindow(windowId, pssData->summary.OTName, x, 1, 0, 6);
+            SummaryScreen_PrintTextOnWindow(windowId, sMonSummaryScreen->summary.OTName, x, 1, 0, 6);
     }
 }
 
 static void PrintMonOTID(void)
 {
     int xPos;
-    if (InBattleFactory() != TRUE && sub_81B9E94() != TRUE)
+    if (InBattleFactory() != TRUE && InSlateportBattleTent() != TRUE)
     {
-        ConvertIntToDecimalStringN(StringCopy(gStringVar1, gText_UnkCtrlF907F908), (u16)pssData->summary.OTID, 2, 5);
+        ConvertIntToDecimalStringN(StringCopy(gStringVar1, gText_UnkCtrlF907F908), (u16)sMonSummaryScreen->summary.OTID, 2, 5);
         xPos = GetStringRightAlignXOffset(1, gStringVar1, 56);
-        SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 1), gStringVar1, xPos, 1, 0, 1);
+        SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ID), gStringVar1, xPos, 1, 0, 1);
     }
 }
 
 static void PrintMonAbilityName(void)
 {
-    u8 ability = GetAbilityBySpecies(pssData->summary.species, pssData->summary.altAbility);
-    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), gAbilityNames[ability], 0, 1, 0, 1);
+    u8 ability = GetAbilityBySpecies(sMonSummaryScreen->summary.species, sMonSummaryScreen->summary.altAbility);
+    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ABILITY), gAbilityNames[ability], 0, 1, 0, 1);
 }
 
 static void PrintMonAbilityDescription(void)
 {
-    u8 ability = GetAbilityBySpecies(pssData->summary.species, pssData->summary.altAbility);
-    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), gAbilityDescriptionPointers[ability], 0, 17, 0, 0);
+    u8 ability = GetAbilityBySpecies(sMonSummaryScreen->summary.species, sMonSummaryScreen->summary.altAbility);
+    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ABILITY), gAbilityDescriptionPointers[ability], 0, 17, 0, 0);
 }
 
 static void BufferMonTrainerMemo(void)
 {
-    struct PokeSummary *sum = &pssData->summary;
+    struct PokeSummary *sum = &sMonSummaryScreen->summary;
     const u8 *text;
 
     DynamicPlaceholderTextUtil_Reset();
@@ -3029,7 +3083,7 @@ static void BufferMonTrainerMemo(void)
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sMemoMiscTextColor);
     BufferNatureString();
 
-    if (InBattleFactory() == TRUE || sub_81B9E94() == TRUE || IsInGamePartnerMon() == TRUE)
+    if (InBattleFactory() == TRUE || InSlateportBattleTent() == TRUE || IsInGamePartnerMon() == TRUE)
     {
         DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_XNature);
     }
@@ -3073,19 +3127,19 @@ static void BufferMonTrainerMemo(void)
 
 static void PrintMonTrainerMemo(void)
 {
-    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 3), gStringVar4, 0, 1, 0, 0);
+    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_MEMO), gStringVar4, 0, 1, 0, 0);
 }
 
 static void BufferNatureString(void)
 {
-    struct PssData *sumStruct = pssData;
+    struct PokemonSummaryScreenData *sumStruct = sMonSummaryScreen;
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gNatureNamePointers[sumStruct->summary.nature]);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(5, gText_EmptyString5);
 }
 
 static void GetMetLevelString(u8 *output)
 {
-    u8 level = pssData->summary.metLevel;
+    u8 level = sMonSummaryScreen->summary.metLevel;
     if (level == 0)
         level = EGG_HATCH_LEVEL;
     ConvertIntToDecimalStringN(output, level, 0, 3);
@@ -3094,11 +3148,11 @@ static void GetMetLevelString(u8 *output)
 
 static bool8 DoesMonOTMatchOwner(void)
 {
-    struct PokeSummary *sum = &pssData->summary;
+    struct PokeSummary *sum = &sMonSummaryScreen->summary;
     u32 trainerId;
     u8 gender;
 
-    if (pssData->monList.mons == gEnemyParty)
+    if (sMonSummaryScreen->monList.mons == gEnemyParty)
     {
         u8 multiID = GetMultiplayerId() ^ 1;
         trainerId = (u16)gLinkPlayers[multiID].trainerId;
@@ -3120,7 +3174,7 @@ static bool8 DoesMonOTMatchOwner(void)
 
 static bool8 DidMonComeFromGBAGames(void)
 {
-    struct PokeSummary *sum = &pssData->summary;
+    struct PokeSummary *sum = &sMonSummaryScreen->summary;
     if (sum->metGame > 0 && sum->metGame <= VERSION_LEAF_GREEN)
         return TRUE;
     return FALSE;
@@ -3128,7 +3182,7 @@ static bool8 DidMonComeFromGBAGames(void)
 
 bool8 DidMonComeFromRSE(void)
 {
-    struct PokeSummary *sum = &pssData->summary;
+    struct PokeSummary *sum = &sMonSummaryScreen->summary;
     if (sum->metGame > 0 && sum->metGame <= VERSION_EMERALD)
         return TRUE;
     return FALSE;
@@ -3138,7 +3192,7 @@ static bool8 IsInGamePartnerMon(void)
 {
     if ((gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) && gMain.inBattle)
     {
-        if (pssData->curMonIndex == 1 || pssData->curMonIndex == 4 || pssData->curMonIndex == 5)
+        if (sMonSummaryScreen->curMonIndex == 1 || sMonSummaryScreen->curMonIndex == 4 || sMonSummaryScreen->curMonIndex == 5)
             return TRUE;
     }
     return FALSE;
@@ -3146,7 +3200,7 @@ static bool8 IsInGamePartnerMon(void)
 
 static void PrintEggOTName(void)
 {
-    u32 windowId = AddWindowFromTemplateList(sPageInfoTemplate, 0);
+    u32 windowId = AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ORIGINAL_TRAINER);
     u32 width = GetStringWidth(1, gText_OTSlash, 0);
     SummaryScreen_PrintTextOnWindow(windowId, gText_OTSlash, 0, 1, 0, 1);
     SummaryScreen_PrintTextOnWindow(windowId, gText_FiveMarks, width, 1, 0, 1);
@@ -3158,15 +3212,15 @@ static void PrintEggOTID(void)
     StringCopy(gStringVar1, gText_UnkCtrlF907F908);
     StringAppend(gStringVar1, gText_FiveMarks);
     x = GetStringRightAlignXOffset(1, gStringVar1, 56);
-    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 1), gStringVar1, x, 1, 0, 1);
+    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ID), gStringVar1, x, 1, 0, 1);
 }
 
 static void PrintEggState(void)
 {
     const u8 *text;
-    struct PokeSummary *sum = &pssData->summary;
+    struct PokeSummary *sum = &sMonSummaryScreen->summary;
 
-    if (pssData->summary.sanity == TRUE)
+    if (sMonSummaryScreen->summary.sanity == TRUE)
         text = gText_EggWillTakeALongTime;
     else if (sum->friendship <= 5)
         text = gText_EggAboutToHatch;
@@ -3177,15 +3231,15 @@ static void PrintEggState(void)
     else
         text = gText_EggWillTakeALongTime;
 
-    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 2), text, 0, 1, 0, 0);
+    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_ABILITY), text, 0, 1, 0, 0);
 }
 
 static void PrintEggMemo(void)
 {
     const u8 *text;
-    struct PokeSummary *sum = &pssData->summary;
+    struct PokeSummary *sum = &sMonSummaryScreen->summary;
 
-    if (pssData->summary.sanity != 1)
+    if (sMonSummaryScreen->summary.sanity != 1)
     {
         if (sum->metLocation == METLOC_FATEFUL_ENCOUNTER)
             text = gText_PeculiarEggNicePlace;
@@ -3201,7 +3255,7 @@ static void PrintEggMemo(void)
         text = gText_OddEggFoundByCouple;
     }
 
-    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, 3), text, 0, 1, 0, 0);
+    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageInfoTemplate, PSS_DATA_WINDOW_INFO_MEMO), text, 0, 1, 0, 0);
 }
 
 static void PrintSkillsPageText(void)
@@ -3254,22 +3308,22 @@ static void PrintHeldItemName(void)
     const u8 *text;
     int offset;
 
-    if (pssData->summary.item == ITEM_ENIGMA_BERRY && IsMultiBattle() == TRUE && (pssData->curMonIndex == 1 || pssData->curMonIndex == 4 || pssData->curMonIndex == 5))
+    if (sMonSummaryScreen->summary.item == ITEM_ENIGMA_BERRY && IsMultiBattle() == TRUE && (sMonSummaryScreen->curMonIndex == 1 || sMonSummaryScreen->curMonIndex == 4 || sMonSummaryScreen->curMonIndex == 5))
     {
         text = ItemId_GetName(ITEM_ENIGMA_BERRY);
     }
-    else if (pssData->summary.item == ITEM_NONE)
+    else if (sMonSummaryScreen->summary.item == ITEM_NONE)
     {
         text = gText_None;
     }
     else
     {
-        CopyItemName(pssData->summary.item, gStringVar1);
+        CopyItemName(sMonSummaryScreen->summary.item, gStringVar1);
         text = gStringVar1;
     }
 
     offset = GetStringCenterAlignXOffset(1, text, 72) + 6;
-    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 0), text, offset, 1, 0, 0);
+    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_HELD_ITEM), text, offset, 1, 0, 0);
 }
 
 static void PrintRibbonCount(void)
@@ -3277,19 +3331,19 @@ static void PrintRibbonCount(void)
     const u8 *text;
     int offset;
 
-    if (pssData->summary.ribbonCount == 0)
+    if (sMonSummaryScreen->summary.ribbonCount == 0)
     {
         text = gText_None;
     }
     else
     {
-        ConvertIntToDecimalStringN(gStringVar1, pssData->summary.ribbonCount, 1, 2);
+        ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreen->summary.ribbonCount, 1, 2);
         StringExpandPlaceholders(gStringVar4, gText_RibbonsVar1);
         text = gStringVar4;
     }
 
     offset = GetStringCenterAlignXOffset(1, text, 70) + 6;
-    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 1), text, offset, 1, 0, 0);
+    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT), text, offset, 1, 0, 0);
 }
 
 static void BufferLeftColumnStats(void)
@@ -3299,10 +3353,10 @@ static void BufferLeftColumnStats(void)
     u8 *attackString = Alloc(8);
     u8 *defenseString = Alloc(8);
 
-    ConvertIntToDecimalStringN(currentHPString, pssData->summary.currentHP, 1, 3);
-    ConvertIntToDecimalStringN(maxHPString, pssData->summary.maxHP, 1, 3);
-    ConvertIntToDecimalStringN(attackString, pssData->summary.atk, 1, 7);
-    ConvertIntToDecimalStringN(defenseString, pssData->summary.def, 1, 7);
+    ConvertIntToDecimalStringN(currentHPString, sMonSummaryScreen->summary.currentHP, 1, 3);
+    ConvertIntToDecimalStringN(maxHPString, sMonSummaryScreen->summary.maxHP, 1, 3);
+    ConvertIntToDecimalStringN(attackString, sMonSummaryScreen->summary.atk, 1, 7);
+    ConvertIntToDecimalStringN(defenseString, sMonSummaryScreen->summary.def, 1, 7);
 
     DynamicPlaceholderTextUtil_Reset();
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, currentHPString);
@@ -3319,14 +3373,14 @@ static void BufferLeftColumnStats(void)
 
 static void PrintLeftColumnStats(void)
 {
-    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 2), gStringVar4, 4, 1, 0, 0);
+    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_STATS_LEFT), gStringVar4, 4, 1, 0, 0);
 }
 
 static void BufferRightColumnStats(void)
 {
-    ConvertIntToDecimalStringN(gStringVar1, pssData->summary.spatk, 1, 3);
-    ConvertIntToDecimalStringN(gStringVar2, pssData->summary.spdef, 1, 3);
-    ConvertIntToDecimalStringN(gStringVar3, pssData->summary.speed, 1, 3);
+    ConvertIntToDecimalStringN(gStringVar1, sMonSummaryScreen->summary.spatk, 1, 3);
+    ConvertIntToDecimalStringN(gStringVar2, sMonSummaryScreen->summary.spdef, 1, 3);
+    ConvertIntToDecimalStringN(gStringVar3, sMonSummaryScreen->summary.speed, 1, 3);
 
     DynamicPlaceholderTextUtil_Reset();
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
@@ -3337,13 +3391,13 @@ static void BufferRightColumnStats(void)
 
 static void PrintRightColumnStats(void)
 {
-    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, 3), gStringVar4, 2, 1, 0, 0);
+    SummaryScreen_PrintTextOnWindow(AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_SKILLS_STATS_RIGHT), gStringVar4, 2, 1, 0, 0);
 }
 
 static void PrintExpPointsNextLevel(void)
 {
-    struct PokeSummary *sum = &pssData->summary;
-    u8 windowId = AddWindowFromTemplateList(sPageSkillsTemplate, 4);
+    struct PokeSummary *sum = &sMonSummaryScreen->summary;
+    u8 windowId = AddWindowFromTemplateList(sPageSkillsTemplate, PSS_DATA_WINDOW_EXP);
     int offset;
     u32 expToNextLevel;
 
@@ -3368,17 +3422,17 @@ static void PrintBattleMoves(void)
     PrintMoveNameAndPP(2);
     PrintMoveNameAndPP(3);
 
-    if (pssData->mode == PSS_MODE_SELECT_MOVE)
+    if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
     {
         PrintNewMoveDetailsOrCancelText();
-        if (pssData->firstMoveIndex == MAX_MON_MOVES)
+        if (sMonSummaryScreen->firstMoveIndex == MAX_MON_MOVES)
         {
-            if (pssData->newMove != MOVE_NONE)
-                PrintMoveDetails(pssData->newMove);
+            if (sMonSummaryScreen->newMove != MOVE_NONE)
+                PrintMoveDetails(sMonSummaryScreen->newMove);
         }
         else
         {
-            PrintMoveDetails(pssData->summary.moves[pssData->firstMoveIndex]);
+            PrintMoveDetails(sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]);
         }
     }
 }
@@ -3402,22 +3456,22 @@ static void Task_PrintBattleMoves(u8 taskId)
             PrintMoveNameAndPP(3);
             break;
         case 5:
-            if (pssData->mode == PSS_MODE_SELECT_MOVE)
+            if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
                 PrintNewMoveDetailsOrCancelText();
             break;
         case 6:
-            if (pssData->mode == PSS_MODE_SELECT_MOVE)
+            if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
             {
-                if (pssData->firstMoveIndex == MAX_MON_MOVES)
-                    data[1] = pssData->newMove;
+                if (sMonSummaryScreen->firstMoveIndex == MAX_MON_MOVES)
+                    data[1] = sMonSummaryScreen->newMove;
                 else
-                    data[1] = pssData->summary.moves[pssData->firstMoveIndex];
+                    data[1] = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex];
             }
             break;
         case 7:
-            if (pssData->mode == PSS_MODE_SELECT_MOVE)
+            if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
             {
-                if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES)
+                if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES)
                     PrintMoveDetails(data[1]);
             }
             break;
@@ -3434,9 +3488,9 @@ static void PrintMoveNameAndPP(u8 moveIndex)
     u32 ppState;
     const u8 *text;
     u32 offset;
-    struct PssData *summaryStruct = pssData;
-    u8 moveNameWindowId = AddWindowFromTemplateList(sPageMovesTemplate, 0);
-    u8 ppValueWindowId = AddWindowFromTemplateList(sPageMovesTemplate, 1);
+    struct PokemonSummaryScreenData *summaryStruct = sMonSummaryScreen;
+    u8 moveNameWindowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_NAMES);
+    u8 ppValueWindowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_PP);
     u16 move = summaryStruct->summary.moves[moveIndex];
 
     if (move != 0)
@@ -3469,7 +3523,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex)
     const u8 *text;
     if (moveIndex != 0)
     {
-        FillWindowPixelRect(14, PIXEL_FILL(0), 53, 0, 19, 32);
+        FillWindowPixelRect(PSS_LABEL_WINDOW_MOVES_POWER_ACC, PIXEL_FILL(0), 53, 0, 19, 32);
 
         if (gBattleMoves[moveIndex].power < 2)
         {
@@ -3481,7 +3535,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex)
             text = gStringVar1;
         }
 
-        SummaryScreen_PrintTextOnWindow(14, text, 53, 1, 0, 0);
+        SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_POWER_ACC, text, 53, 1, 0, 0);
 
         if (gBattleMoves[moveIndex].accuracy == 0)
         {
@@ -3493,7 +3547,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex)
             text = gStringVar1;
         }
 
-        SummaryScreen_PrintTextOnWindow(14, text, 53, 17, 0, 0);
+        SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_MOVES_POWER_ACC, text, 53, 17, 0, 0);
     }
 }
 
@@ -3504,10 +3558,10 @@ static void PrintContestMoves(void)
     PrintMoveNameAndPP(2);
     PrintMoveNameAndPP(3);
 
-    if (pssData->mode == PSS_MODE_SELECT_MOVE)
+    if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
     {
         PrintNewMoveDetailsOrCancelText();
-        PrintContestMoveDescription(pssData->firstMoveIndex);
+        PrintContestMoveDescription(sMonSummaryScreen->firstMoveIndex);
     }
 }
 
@@ -3531,14 +3585,14 @@ static void Task_PrintContestMoves(u8 taskId)
             PrintMoveNameAndPP(3);
             break;
         case 4:
-            if (pssData->mode == PSS_MODE_SELECT_MOVE)
+            if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
                 PrintNewMoveDetailsOrCancelText();
             break;
         case 5:
-            if (pssData->mode == PSS_MODE_SELECT_MOVE)
+            if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
             {
-                if (pssData->newMove != MOVE_NONE || pssData->firstMoveIndex != MAX_MON_MOVES)
-                    PrintContestMoveDescription(pssData->firstMoveIndex);
+                if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES)
+                    PrintContestMoveDescription(sMonSummaryScreen->firstMoveIndex);
             }
             break;
         case 6:
@@ -3553,24 +3607,24 @@ static void PrintContestMoveDescription(u8 moveSlot)
     u16 move;
 
     if (moveSlot == MAX_MON_MOVES)
-        move = pssData->newMove;
+        move = sMonSummaryScreen->newMove;
     else
-        move = pssData->summary.moves[moveSlot];
+        move = sMonSummaryScreen->summary.moves[moveSlot];
 
     if (move != MOVE_NONE)
     {
-        u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2);
+        u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_DESCRIPTION);
         SummaryScreen_PrintTextOnWindow(windowId, gContestEffectDescriptionPointers[gContestMoves[move].effect], 6, 1, 0, 0);
     }
 }
 
 static void PrintMoveDetails(u16 move)
 {
-    u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2);
+    u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_DESCRIPTION);
     FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
     if (move != MOVE_NONE)
     {
-        if (pssData->currPageIndex == 2)
+        if (sMonSummaryScreen->currPageIndex == PSS_MODE_BOX)
         {
             PrintMovePowerAndAccuracy(move);
             SummaryScreen_PrintTextOnWindow(windowId, gMoveDescriptionPointers[move - 1], 6, 1, 0, 0);
@@ -3591,18 +3645,18 @@ static void PrintMoveDetails(u16 move)
 
 static void PrintNewMoveDetailsOrCancelText(void)
 {
-    u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, 0);
-    u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, 1);
+    u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_NAMES);
+    u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_PP);
 
-    if (pssData->newMove == MOVE_NONE)
+    if (sMonSummaryScreen->newMove == MOVE_NONE)
     {
         SummaryScreen_PrintTextOnWindow(windowId1, gText_Cancel, 0, 65, 0, 1);
     }
     else
     {
-        u16 move = pssData->newMove;
+        u16 move = sMonSummaryScreen->newMove;
 
-        if (pssData->currPageIndex == 2)
+        if (sMonSummaryScreen->currPageIndex == 2)
             SummaryScreen_PrintTextOnWindow(windowId1, gMoveNames[move], 0, 65, 0, 6);
         else
             SummaryScreen_PrintTextOnWindow(windowId1, gMoveNames[move], 0, 65, 0, 5);
@@ -3618,15 +3672,15 @@ static void PrintNewMoveDetailsOrCancelText(void)
 
 static void sub_81C4064(void)
 {
-    u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 0);
+    u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_NAMES);
     FillWindowPixelRect(windowId, PIXEL_FILL(0), 0, 66, 72, 16);
     CopyWindowToVram(windowId, 2);
 }
 
 static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2)
 {
-    u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, 0);
-    u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, 1);
+    u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_NAMES);
+    u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_PP);
 
     FillWindowPixelRect(windowId1, PIXEL_FILL(0), 0, moveIndex1 * 16, 0x48, 0x10);
     FillWindowPixelRect(windowId1, PIXEL_FILL(0), 0, moveIndex2 * 16, 0x48, 0x10);
@@ -3640,7 +3694,7 @@ static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2)
 
 static void PrintHMMovesCantBeForgotten(void)
 {
-    u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 2);
+    u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, PSS_DATA_WINDOW_MOVE_DESCRIPTION);
     FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
     SummaryScreen_PrintTextOnWindow(windowId, gText_HMMovesCantBeForgotten2, 6, 1, 0, 0);
 }
@@ -3649,24 +3703,24 @@ static void ResetSpriteIds(void)
 {
     u8 i;
 
-    for (i = 0; i < ARRAY_COUNT(pssData->spriteIds); i++)
+    for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->spriteIds); i++)
     {
-        pssData->spriteIds[i] = 0xFF;
+        sMonSummaryScreen->spriteIds[i] = 0xFF;
     }
 }
 
 static void DestroySpriteInArray(u8 spriteArrayId)
 {
-    if (pssData->spriteIds[spriteArrayId] != 0xFF)
+    if (sMonSummaryScreen->spriteIds[spriteArrayId] != 0xFF)
     {
-        DestroySprite(&gSprites[pssData->spriteIds[spriteArrayId]]);
-        pssData->spriteIds[spriteArrayId] = 0xFF;
+        DestroySprite(&gSprites[sMonSummaryScreen->spriteIds[spriteArrayId]]);
+        sMonSummaryScreen->spriteIds[spriteArrayId] = 0xFF;
     }
 }
 
 static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible)
 {
-    gSprites[pssData->spriteIds[spriteArrayId]].invisible = invisible;
+    gSprites[sMonSummaryScreen->spriteIds[spriteArrayId]].invisible = invisible;
 }
 
 static void HidePageSpecificSprites(void)
@@ -3674,16 +3728,16 @@ static void HidePageSpecificSprites(void)
 // Keeps Pokémon, caught ball and status sprites visible.
     u8 i;
 
-    for (i = 3; i < ARRAY_COUNT(pssData->spriteIds); i++)
+    for (i = 3; i < ARRAY_COUNT(sMonSummaryScreen->spriteIds); i++)
     {
-        if (pssData->spriteIds[i] != 0xFF)
+        if (sMonSummaryScreen->spriteIds[i] != 0xFF)
             SetSpriteInvisibility(i, TRUE);
     }
 }
 
 static void SetTypeIcons(void)
 {
-    switch (pssData->currPageIndex)
+    switch (sMonSummaryScreen->currPageIndex)
     {
     case PSS_PAGE_INFO:
         SetMonTypeIcons();
@@ -3705,8 +3759,8 @@ static void CreateMoveTypeIcons(void)
 
     for (i = 3; i < 8; i++)
     {
-        if (pssData->spriteIds[i] == 0xFF)
-            pssData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2);
+        if (sMonSummaryScreen->spriteIds[i] == 0xFF)
+            sMonSummaryScreen->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2);
 
         SetSpriteInvisibility(i, TRUE);
     }
@@ -3714,7 +3768,7 @@ static void CreateMoveTypeIcons(void)
 
 static void SetMoveTypeSpritePosAndType(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
 {
-    struct Sprite *sprite = &gSprites[pssData->spriteIds[spriteArrayId]];
+    struct Sprite *sprite = &gSprites[sMonSummaryScreen->spriteIds[spriteArrayId]];
     StartSpriteAnim(sprite, typeId);
     sprite->oam.paletteNum = sMoveTypeToOamPaletteNum[typeId];
     sprite->pos1.x = x + 16;
@@ -3724,7 +3778,7 @@ static void SetMoveTypeSpritePosAndType(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
 
 static void SetMonTypeIcons(void)
 {
-    struct PokeSummary *summary = &pssData->summary;
+    struct PokeSummary *summary = &sMonSummaryScreen->summary;
     if (summary->isEgg)
     {
         SetMoveTypeSpritePosAndType(TYPE_MYSTERY, 120, 48, 3);
@@ -3748,7 +3802,7 @@ static void SetMonTypeIcons(void)
 static void SetMoveTypeIcons(void)
 {
     u8 i;
-    struct PokeSummary *summary = &pssData->summary;
+    struct PokeSummary *summary = &sMonSummaryScreen->summary;
     for (i = 0; i < MAX_MON_MOVES; i++)
     {
         if (summary->moves[i] != MOVE_NONE)
@@ -3761,7 +3815,7 @@ static void SetMoveTypeIcons(void)
 static void SetContestMoveTypeIcons(void)
 {
     u8 i;
-    struct PokeSummary *summary = &pssData->summary;
+    struct PokeSummary *summary = &sMonSummaryScreen->summary;
     for (i = 0; i < MAX_MON_MOVES; i++)
     {
         if (summary->moves[i] != MOVE_NONE)
@@ -3773,23 +3827,23 @@ static void SetContestMoveTypeIcons(void)
 
 static void SetNewMoveTypeIcon(void)
 {
-    if (pssData->newMove == MOVE_NONE)
+    if (sMonSummaryScreen->newMove == MOVE_NONE)
     {
         SetSpriteInvisibility(7, TRUE);
     }
     else
     {
-        if (pssData->currPageIndex == 2)
-            SetMoveTypeSpritePosAndType(gBattleMoves[pssData->newMove].type, 85, 96, 7);
+        if (sMonSummaryScreen->currPageIndex == 2)
+            SetMoveTypeSpritePosAndType(gBattleMoves[sMonSummaryScreen->newMove].type, 85, 96, 7);
         else
-            SetMoveTypeSpritePosAndType(NUMBER_OF_MON_TYPES + gContestMoves[pssData->newMove].contestCategory, 85, 96, 7);
+            SetMoveTypeSpritePosAndType(NUMBER_OF_MON_TYPES + gContestMoves[sMonSummaryScreen->newMove].contestCategory, 85, 96, 7);
     }
 }
 
 static void sub_81C4568(u8 a0, u8 a1)
 {
-    struct Sprite *sprite1 = &gSprites[pssData->spriteIds[a0 + 3]];
-    struct Sprite *sprite2 = &gSprites[pssData->spriteIds[a1 + 3]];
+    struct Sprite *sprite1 = &gSprites[sMonSummaryScreen->spriteIds[a0 + 3]];
+    struct Sprite *sprite2 = &gSprites[sMonSummaryScreen->spriteIds[a1 + 3]];
 
     u8 temp = sprite1->animNum;
     sprite1->animNum = sprite2->animNum;
@@ -3808,7 +3862,7 @@ static void sub_81C4568(u8 a0, u8 a1)
 static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1)
 {
     const struct CompressedSpritePalette *pal;
-    struct PokeSummary *summary = &pssData->summary;
+    struct PokeSummary *summary = &sMonSummaryScreen->summary;
 
     switch (*a1)
     {
@@ -3817,7 +3871,7 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1)
         case 0:
             if (gMain.inBattle)
             {
-                if (sub_80688F8(3, pssData->curMonIndex))
+                if (sub_80688F8(3, sMonSummaryScreen->curMonIndex))
                 {
                     HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[summary->species2], gMonSpritesGfxPtr->sprites[1], summary->species2, summary->pid);
                 }
@@ -3830,7 +3884,7 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1)
             {
                 if (gMonSpritesGfxPtr != NULL)
                 {
-                    if (pssData->monList.mons == gPlayerParty || pssData->mode == PSS_MODE_BOX || pssData->unk40EF == TRUE)
+                    if (sMonSummaryScreen->monList.mons == gPlayerParty || sMonSummaryScreen->mode == PSS_MODE_BOX || sMonSummaryScreen->unk40EF == TRUE)
                     {
                         HandleLoadSpecialPokePic_2(&gMonFrontPicTable[summary->species2], gMonSpritesGfxPtr->sprites[1], summary->species2, summary->pid);
                     }
@@ -3841,7 +3895,7 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1)
                 }
                 else
                 {
-                    if (pssData->monList.mons == gPlayerParty || pssData->mode == PSS_MODE_BOX || pssData->unk40EF == TRUE)
+                    if (sMonSummaryScreen->monList.mons == gPlayerParty || sMonSummaryScreen->mode == PSS_MODE_BOX || sMonSummaryScreen->unk40EF == TRUE)
                     {
                         HandleLoadSpecialPokePic_2(&gMonFrontPicTable[summary->species2], sub_806F4F8(0, 1), summary->species2, summary->pid);
                     }
@@ -3864,10 +3918,10 @@ static u8 CreatePokemonSprite(struct Pokemon *mon, s16 *a1)
 
 static void PlayMonCry(void)
 {
-    struct PokeSummary *summary = &pssData->summary;
+    struct PokeSummary *summary = &sMonSummaryScreen->summary;
     if (!summary->isEgg)
     {
-        if (ShouldPlayNormalMonCry(&pssData->currentMon) == TRUE)
+        if (ShouldPlayNormalMonCry(&sMonSummaryScreen->currentMon) == TRUE)
         {
             PlayCry3(summary->species2, 0, 0);
         }
@@ -3880,7 +3934,7 @@ static void PlayMonCry(void)
 
 static u8 sub_81C47B4(struct Pokemon *unused)
 {
-    struct PokeSummary *summary = &pssData->summary;
+    struct PokeSummary *summary = &sMonSummaryScreen->summary;
     u8 spriteId = CreateSprite(&gMultiuseSpriteTemplate, 40, 64, 5);
     struct Sprite *sprite = &gSprites[spriteId];
 
@@ -3905,7 +3959,7 @@ static u8 sub_81C47B4(struct Pokemon *unused)
 
 static void SpriteCB_Pokemon(struct Sprite *sprite)
 {
-    struct PokeSummary *summary = &pssData->summary;
+    struct PokeSummary *summary = &sMonSummaryScreen->summary;
 
     if (!gPaletteFade.active && sprite->data[2] != 1)
     {
@@ -3931,7 +3985,7 @@ void SummaryScreen_DestroyUnknownTask(void)
 
 static bool32 SummaryScreen_DoesSpriteHaveCallback(void)
 {
-    if (gSprites[pssData->spriteIds[0]].callback == SpriteCallbackDummy)
+    if (gSprites[sMonSummaryScreen->spriteIds[0]].callback == SpriteCallbackDummy)
     {
         return FALSE;
     }
@@ -3946,11 +4000,11 @@ static void StopPokemonAnimations(void)  // A subtle effect, this function stops
     u16 i;
     u16 paletteIndex;
 
-    gSprites[pssData->spriteIds[0]].animPaused = TRUE;
-    gSprites[pssData->spriteIds[0]].callback = SpriteCallbackDummy;
+    gSprites[sMonSummaryScreen->spriteIds[0]].animPaused = TRUE;
+    gSprites[sMonSummaryScreen->spriteIds[0]].callback = SpriteCallbackDummy;
     StopPokemonAnimationDelayTask();
 
-    paletteIndex = (gSprites[pssData->spriteIds[0]].oam.paletteNum * 16) | 0x100;
+    paletteIndex = (gSprites[sMonSummaryScreen->spriteIds[0]].oam.paletteNum * 16) | 0x100;
 
     for (i = 0; i < 16; i++)
     {
@@ -3962,20 +4016,20 @@ static void CreateMonMarkingsSprite(struct Pokemon *mon)
 {
     struct Sprite *sprite = sub_811FF94(30003, 30003, sSummaryMarkingsPalette);
 
-    pssData->markingsSprite = sprite;
+    sMonSummaryScreen->markingsSprite = sprite;
 
     if (sprite != NULL)
     {
         StartSpriteAnim(sprite, GetMonData(mon, MON_DATA_MARKINGS));
-        pssData->markingsSprite->pos1.x = 60;
-        pssData->markingsSprite->pos1.y = 26;
-        pssData->markingsSprite->oam.priority = 1;
+        sMonSummaryScreen->markingsSprite->pos1.x = 60;
+        sMonSummaryScreen->markingsSprite->pos1.y = 26;
+        sMonSummaryScreen->markingsSprite->oam.priority = 1;
     }
 }
 
 static void RemoveAndCreateMonMarkingsSprite(struct Pokemon *mon)
 {
-    DestroySprite(pssData->markingsSprite);
+    DestroySprite(sMonSummaryScreen->markingsSprite);
     FreeSpriteTilesByTag(30003);
     CreateMonMarkingsSprite(mon);
 }
@@ -3985,14 +4039,14 @@ static void CreateCaughtBallSprite(struct Pokemon *mon)
     u8 ball = ItemIdToBallId(GetMonData(mon, MON_DATA_POKEBALL));
 
     LoadBallGfx(ball);
-    pssData->spriteIds[1] = CreateSprite(&gBallSpriteTemplates[ball], 16, 136, 0);
-    gSprites[pssData->spriteIds[1]].callback = SpriteCallbackDummy;
-    gSprites[pssData->spriteIds[1]].oam.priority = 3;
+    sMonSummaryScreen->spriteIds[1] = CreateSprite(&gBallSpriteTemplates[ball], 16, 136, 0);
+    gSprites[sMonSummaryScreen->spriteIds[1]].callback = SpriteCallbackDummy;
+    gSprites[sMonSummaryScreen->spriteIds[1]].oam.priority = 3;
 }
 
 static void CreateSetStatusSprite(void)
 {
-    u8 *spriteId = &pssData->spriteIds[2];
+    u8 *spriteId = &sMonSummaryScreen->spriteIds[2];
     u8 anim;
 
     if (*spriteId == 0xFF)
@@ -4000,7 +4054,7 @@ static void CreateSetStatusSprite(void)
         *spriteId = CreateSprite(&sSpriteTemplate_StatusCondition, 64, 152, 0);
     }
 
-    anim = sub_81B205C(&pssData->currentMon);
+    anim = GetMonAilment(&sMonSummaryScreen->currentMon);
 
     if (anim != 0)
     {
@@ -4016,9 +4070,9 @@ static void CreateSetStatusSprite(void)
 static void sub_81C4AF8(u8 a0)
 {
     u8 i;
-    u8 *spriteIds = &pssData->spriteIds[a0];
+    u8 *spriteIds = &sMonSummaryScreen->spriteIds[a0];
 
-    if (pssData->currPageIndex > 1)
+    if (sMonSummaryScreen->currPageIndex > 1)
     {
         u8 subsprite = 0;
         if (a0 == 8)
@@ -4070,11 +4124,11 @@ static void sub_81C4BE4(struct Sprite *sprite)
 
     if (sprite->data[0] == 8)
     {
-        sprite->pos2.y = pssData->firstMoveIndex * 16;
+        sprite->pos2.y = sMonSummaryScreen->firstMoveIndex * 16;
     }
     else
     {
-        sprite->pos2.y = pssData->secondMoveIndex * 16;
+        sprite->pos2.y = sMonSummaryScreen->secondMoveIndex * 16;
     }
 }
 
@@ -4090,7 +4144,7 @@ static void sub_81C4C60(u8 a0)
 static void sub_81C4C84(u8 a0)
 {
     u8 i;
-    u8 *spriteIds = &pssData->spriteIds[8];
+    u8 *spriteIds = &sMonSummaryScreen->spriteIds[8];
     a0 *= 3;
 
     for (i = 0; i < 10; i++)
@@ -4113,7 +4167,7 @@ static void sub_81C4C84(u8 a0)
 static void sub_81C4D18(u8 firstSpriteId)
 {
     u8 i;
-    u8 *spriteIds = &pssData->spriteIds[firstSpriteId];
+    u8 *spriteIds = &sMonSummaryScreen->spriteIds[firstSpriteId];
 
     for (i = 0; i < 10; i++)
     {
diff --git a/src/pokenav.c b/src/pokenav.c
index 8eb82ffa5..42114a4b2 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -141,7 +141,7 @@ void sub_81C7710(void);
 static void InitKeys_(void);
 static void FreeVars(void);
 static void VblankCb_Pokenav(void);
-static void Cb2_Pokenav(void);
+static void CB2_Pokenav(void);
 void sub_81C7C28(void);
 void sub_81C72BC(void);
 void sub_81C7B74(void);
@@ -485,7 +485,7 @@ void sub_81C71E4(u8 taskId)
     }
 }
 
-void CB2_PokeNav(void)
+void CB2_InitPokeNav(void)
 {
     gUnknown_0203CF40 = Alloc(sizeof(*gUnknown_0203CF40));
     if (gUnknown_0203CF40 == NULL)
@@ -498,7 +498,7 @@ void CB2_PokeNav(void)
         ResetTasks();
         SetVBlankCallback(NULL);
         CreateTask(sub_81C742C, 0);
-        SetMainCallback2(Cb2_Pokenav);
+        SetMainCallback2(CB2_Pokenav);
         SetVBlankCallback(VblankCb_Pokenav);
     }
 }
@@ -529,7 +529,7 @@ void sub_81C72BC(void)
         FreeAllSpritePalettes();
         SetVBlankCallback(NULL);
         CreateTask(sub_81C742C, 0);
-        SetMainCallback2(Cb2_Pokenav);
+        SetMainCallback2(CB2_Pokenav);
         SetVBlankCallback(VblankCb_Pokenav);
     }
 }
@@ -588,7 +588,7 @@ static bool32 AnyMonHasRibbon(void)
     return FALSE;
 }
 
-static void Cb2_Pokenav(void)
+static void CB2_Pokenav(void)
 {
     RunTasks();
     AnimateSprites();
diff --git a/src/pokenav_match_call.c b/src/pokenav_match_call.c
index 53f9f0548..b775ed10e 100644
--- a/src/pokenav_match_call.c
+++ b/src/pokenav_match_call.c
@@ -1,13 +1,11 @@
-
-// Includes
 #include "global.h"
 #include "battle_setup.h"
 #include "event_data.h"
 #include "string_util.h"
 #include "battle.h"
 #include "gym_leader_rematch.h"
+#include "match_call.h"
 
-extern void sub_8197080(u8 *dest);
 extern const u8 gTrainerClassNames[][13];
 
 // Static type declarations
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 00a73a0a2..e2497a8dc 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -105,10 +105,10 @@ static const struct OamData sOamData_862A6BC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -122,10 +122,10 @@ static const struct OamData sOamData_862A6C4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -139,10 +139,10 @@ static const struct OamData sOamData_862A6CC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -156,10 +156,10 @@ static const struct OamData sOamData_862A6D4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x16),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -173,10 +173,10 @@ static const struct OamData sOamData_862A6DC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(16x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(16x8),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -190,10 +190,10 @@ static const struct OamData sOamData_862A6E4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 2,
+    .shape = SPRITE_SHAPE(16x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(16x32),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -207,10 +207,10 @@ static const struct OamData sOamData_862A6EC =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -224,10 +224,10 @@ static const struct OamData sOamData_862A6F4 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(32x8),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
diff --git a/src/record_mixing.c b/src/record_mixing.c
index ad34bc432..3a16f817e 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -34,9 +34,8 @@
 #include "daycare.h"
 #include "international_string_util.h"
 #include "constants/battle_frontier.h"
+#include "dewford_trend.h"
 
-extern void ReceiveSecretBasesData(struct SecretBaseRecord *, size_t, u8);
-extern void ReceiveEasyChatPairsData(struct EasyChatPair *, size_t, u8);
 
 // Static type declarations
 
diff --git a/src/region_map.c b/src/region_map.c
index 8dadc78a7..25b47479d 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -36,6 +36,13 @@
 
 // Static type declarations
 
+struct FlagControlledFlyDest
+{
+    const u8 *const *name;
+    u16 mapSecId;
+    u16 flag;
+};
+
 // Static RAM declarations
 
 static EWRAM_DATA struct RegionMap *gRegionMap = NULL;
@@ -106,7 +113,8 @@ static const u8 sRegionMap_MapSectionLayout[] = INCBIN_U8("graphics/pokenav/regi
 
 #include "data/region_map/region_map_entries.h"
 
-static const u16 sRegionMap_SpecialPlaceLocations[][2] = {
+static const u16 sRegionMap_SpecialPlaceLocations[][2] =
+{
     {MAPSEC_UNDERWATER_TERRA_CAVE,     MAPSEC_ROUTE_105},
     {MAPSEC_UNDERWATER_124,            MAPSEC_ROUTE_124},
     {MAPSEC_UNDERWATER_UNK1,           MAPSEC_ROUTE_129},
@@ -133,13 +141,15 @@ static const u16 sRegionMap_SpecialPlaceLocations[][2] = {
     {MAPSEC_NONE,                      MAPSEC_NONE}
 };
 
-static const u16 sRegionMap_MarineCaveMapSecIds[] = {
+static const u16 sRegionMap_MarineCaveMapSecIds[] =
+{
     MAPSEC_MARINE_CAVE,
     MAPSEC_UNDERWATER_MARINE_CAVE,
     MAPSEC_UNDERWATER_MARINE_CAVE
 };
 
-static const u16 sTerraCaveMapSectionIds[] = {
+static const u16 sTerraCaveMapSectionIds[] =
+{
     MAPSEC_ROUTE_114,
     MAPSEC_ROUTE_114,
     MAPSEC_ROUTE_115,
@@ -158,7 +168,8 @@ static const u16 sTerraCaveMapSectionIds[] = {
     MAPSEC_ROUTE_129
 };
 
-static const struct UCoords16 sTerraCaveLocationCoords[] = {
+static const struct UCoords16 sTerraCaveLocationCoords[] =
+{
     {0x00, 0x0a},
     {0x00, 0x0c},
     {0x18, 0x03},
@@ -169,21 +180,27 @@ static const struct UCoords16 sTerraCaveLocationCoords[] = {
     {0x18, 0x0a}
 };
 
-static const u8 sRegionMap_MapSecAquaHideoutOld[] = {
+static const u8 sRegionMap_MapSecAquaHideoutOld[] =
+{
     MAPSEC_AQUA_HIDEOUT_OLD
 };
 
-static const struct OamData sRegionMapCursorOam = {
-    .size = 1, .priority = 1
+static const struct OamData sRegionMapCursorOam =
+{
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
+    .priority = 1
 };
 
-static const union AnimCmd sRegionMapCursorAnim1[] = {
+static const union AnimCmd sRegionMapCursorAnim1[] =
+{
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(4, 20),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd sRegionMapCursorAnim2[] = {
+static const union AnimCmd sRegionMapCursorAnim2[] =
+{
     ANIMCMD_FRAME( 0, 10),
     ANIMCMD_FRAME(16, 10),
     ANIMCMD_FRAME(32, 10),
@@ -191,37 +208,49 @@ static const union AnimCmd sRegionMapCursorAnim2[] = {
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd *const sRegionMapCursorAnimTable[] = {
+static const union AnimCmd *const sRegionMapCursorAnimTable[] =
+{
     sRegionMapCursorAnim1,
     sRegionMapCursorAnim2
 };
 
-static const struct SpritePalette sRegionMapCursorSpritePalette = { sRegionMapCursorPal, 0 };
+static const struct SpritePalette sRegionMapCursorSpritePalette =
+{
+    .data = sRegionMapCursorPal,
+    .tag = 0
+};
 
-static const struct SpriteTemplate sRegionMapCursorSpriteTemplate = {
-    0,
-    0,
-    &sRegionMapCursorOam,
-    sRegionMapCursorAnimTable,
-    NULL,
-    gDummySpriteAffineAnimTable,
-    SpriteCallback_CursorFull
+static const struct SpriteTemplate sRegionMapCursorSpriteTemplate =
+{
+    .tileTag = 0,
+    .paletteTag = 0,
+    .oam = &sRegionMapCursorOam,
+    .anims = sRegionMapCursorAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallback_CursorFull
 };
 
-static const struct OamData sRegionMapPlayerIconOam = {
-    .size = 1, .priority = 2
+static const struct OamData sRegionMapPlayerIconOam =
+{
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
+    .priority = 2
 };
 
-static const union AnimCmd sRegionMapPlayerIconAnim1[] = {
+static const union AnimCmd sRegionMapPlayerIconAnim1[] =
+{
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const sRegionMapPlayerIconAnimTable[] = {
+static const union AnimCmd *const sRegionMapPlayerIconAnimTable[] =
+{
     sRegionMapPlayerIconAnim1
 };
 
-static const u8 sRegionMapEventSectionIds[] = {
+static const u8 sRegionMapEventSectionIds[] =
+{
     MAPSEC_BIRTH_ISLAND_2,
     MAPSEC_FARAWAY_ISLAND,
     MAPSEC_NAVEL_ROCK2
@@ -237,7 +266,8 @@ static const u16 Unknown_085A1D48[] = INCBIN_U16("graphics/pokenav/fly_target_ic
 
 static const u32 sUnknown_085A1D68[] = INCBIN_U32("graphics/pokenav/fly_target_icons.4bpp.lz");
 
-static const u8 sMapHealLocations[][3] = {
+static const u8 sMapHealLocations[][3] =
+{
     {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F},
     {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), HEAL_LOCATION_OLDALE_TOWN},
     {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), HEAL_LOCATION_DEWFORD_TOWN},
@@ -290,83 +320,150 @@ static const u8 sMapHealLocations[][3] = {
     {MAP_GROUP(ROUTE134), MAP_NUM(ROUTE134), 0}
 };
 
-static const u8 *const gUnknown_085A1ED4[] = {
+static const u8 *const gUnknown_085A1ED4[] =
+{
     gText_PokemonLeague,
     gText_PokemonCenter
 };
 
-static const struct {
-    const u8 *const *name;
-    u16 mapSecId;
-    u16 flag;
-} gUnknown_085A1EDC[] = {
-    gUnknown_085A1ED4,
-    MAPSEC_EVER_GRANDE_CITY,
-    FLAG_LANDMARK_POKEMON_LEAGUE
+static const struct FlagControlledFlyDest gUnknown_085A1EDC[] =
+{
+    {
+        .name = gUnknown_085A1ED4,
+        .mapSecId = MAPSEC_EVER_GRANDE_CITY,
+        .flag = FLAG_LANDMARK_POKEMON_LEAGUE
+    }
 };
 
-static const struct BgTemplate gUnknown_085A1EE4[] = {
-    { .bg = 0, .charBaseIndex = 0, .mapBaseIndex = 31, .screenSize = 0, .paletteMode = 0, .priority = 0 },
-    { .bg = 1, .charBaseIndex = 3, .mapBaseIndex = 30, .screenSize = 0, .paletteMode = 0, .priority = 1 },
-    { .bg = 2, .charBaseIndex = 2, .mapBaseIndex = 28, .screenSize = 2, .paletteMode = 1, .priority = 2 }
+static const struct BgTemplate gUnknown_085A1EE4[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 28,
+        .screenSize = 2,
+        .paletteMode = 1,
+        .priority = 2
+    }
 };
 
-static const struct WindowTemplate gUnknown_085A1EF0[] = {
-    { 0, 17, 17, 12,  2, 15, 0x01 },
-    { 0, 17, 15, 12,  4, 15, 0x19 },
-    { 0,  1, 18, 14,  2, 15, 0x49 },
+static const struct WindowTemplate gUnknown_085A1EF0[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 17,
+        .tilemapTop = 17,
+        .width = 12,
+        .height = 2,
+        .paletteNum = 15,
+        .baseBlock = 0x01
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 17,
+        .tilemapTop = 15,
+        .width = 12,
+        .height = 4,
+        .paletteNum = 15,
+        .baseBlock = 0x19
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 18,
+        .width = 14,
+        .height = 2,
+        .paletteNum = 15,
+        .baseBlock = 0x49
+    },
     DUMMY_WIN_TEMPLATE
 };
 
-static const struct SpritePalette gUnknown_085A1F10 = {
-    Unknown_085A1D48, 2
+static const struct SpritePalette gUnknown_085A1F10 =
+{
+    .data = Unknown_085A1D48,
+    .tag = 2
 };
 
-static const u16 sUnknown_085A1F18[][2] = {
-    {FLAG_LANDMARK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER},
-    {-1, MAPSEC_NONE}
+static const u16 sUnknown_085A1F18[][2] =
+{
+    {
+        FLAG_LANDMARK_BATTLE_FRONTIER,
+        MAPSEC_BATTLE_FRONTIER
+    },
+    {
+        -1,
+        MAPSEC_NONE
+    }
 };
 
-static const struct OamData gOamData_085A1F20 = {
+static const struct OamData gOamData_085A1F20 =
+{
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .priority = 2
 };
 
-static const union AnimCmd gUnknown_085A1F28[] = {
+static const union AnimCmd gUnknown_085A1F28[] =
+{
     ANIMCMD_FRAME( 0, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A1F30[] = {
+static const union AnimCmd gUnknown_085A1F30[] =
+{
     ANIMCMD_FRAME( 1, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A1F38[] = {
+static const union AnimCmd gUnknown_085A1F38[] =
+{
     ANIMCMD_FRAME( 3, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A1F40[] = {
+static const union AnimCmd gUnknown_085A1F40[] =
+{
     ANIMCMD_FRAME( 5, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A1F48[] = {
+static const union AnimCmd gUnknown_085A1F48[] =
+{
     ANIMCMD_FRAME( 6, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A1F50[] = {
+static const union AnimCmd gUnknown_085A1F50[] =
+{
     ANIMCMD_FRAME( 8, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_085A1F58[] = {
+static const union AnimCmd gUnknown_085A1F58[] =
+{
     ANIMCMD_FRAME(10, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gUnknown_085A1F60[] = {
+static const union AnimCmd *const gUnknown_085A1F60[] =
+{
     gUnknown_085A1F28,
     gUnknown_085A1F30,
     gUnknown_085A1F38,
@@ -376,14 +473,15 @@ static const union AnimCmd *const gUnknown_085A1F60[] = {
     gUnknown_085A1F58
 };
 
-static const struct SpriteTemplate gUnknown_085A1F7C = {
-    2,
-    2,
-    &gOamData_085A1F20,
-    gUnknown_085A1F60,
-    NULL,
-    gDummySpriteAffineAnimTable,
-    SpriteCallbackDummy
+static const struct SpriteTemplate gUnknown_085A1F7C =
+{
+    .tileTag = 2,
+    .paletteTag = 2,
+    .oam = &gOamData_085A1F20,
+    .anims = gUnknown_085A1F60,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
 };
 
 // .text
@@ -1679,7 +1777,7 @@ static void sub_8124904(void)
     if (sFlyMap->regionMap.iconDrawType > MAPSECTYPE_NONE && sFlyMap->regionMap.iconDrawType <= MAPSECTYPE_BATTLE_FRONTIER)
     {
         flag = FALSE;
-        for (i = 0; i < 1; i++)
+        for (i = 0; i < ARRAY_COUNT(gUnknown_085A1EDC); i++)
         {
             if (sFlyMap->regionMap.mapSecId == gUnknown_085A1EDC[i].mapSecId)
             {
diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
index ce9f5b98b..6ee757607 100644
--- a/src/reset_rtc_screen.c
+++ b/src/reset_rtc_screen.c
@@ -108,10 +108,10 @@ static const struct OamData sOamData_08510464 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 0926d4569..dd177f884 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -2,6 +2,7 @@
 #include "reshow_battle_screen.h"
 #include "battle.h"
 #include "palette.h"
+#include "pokemon.h"
 #include "main.h"
 #include "scanline_effect.h"
 #include "text.h"
@@ -18,8 +19,6 @@
 
 extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
 
-extern void SetMultiuseSpriteTemplateToTrainerBack(u16 backPicId, u8 battlerPosition);
-
 // this file's functions
 static void CB2_ReshowBattleScreenAfterMenu(void);
 static bool8 LoadBattlerSpriteGfx(u8 battlerId);
diff --git a/src/rock.c b/src/rock.c
index 14ffc63e0..814b1d88b 100644
--- a/src/rock.c
+++ b/src/rock.c
@@ -12,8 +12,6 @@
 extern const union AnimCmd *const gUnknown_085950E0[];
 extern const union AnimCmd *const gUnknown_085954D0[];
 
-extern void AnimMoveTwisterParticle(struct Sprite *);
-
 void sub_81109F0(struct Sprite *);
 void sub_8110AB4(struct Sprite *);
 void AnimDirtParticleAcrossScreen(struct Sprite *);
diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c
index 64850d2e3..3d9eab8d7 100644
--- a/src/rom_8011DC0.c
+++ b/src/rom_8011DC0.c
@@ -33,8 +33,7 @@
 #include "start_menu.h"
 #include "data2.h"
 #include "field_screen_effect.h"
-
-extern void HealPlayerParty(void);
+#include "script_pokemon_util_80F87D8.h"
 
 struct UnkStruct_Shared
 {
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index 3513f092e..44d291dc4 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -236,10 +236,10 @@ static const struct OamData sOamData_RotatingGateLarge =
     .objMode = 0,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 2,
@@ -253,10 +253,10 @@ static const struct OamData sOamData_RotatingGateRegular =
     .objMode = 0,
     .mosaic = 0,
     .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 2,
diff --git a/src/roulette.c b/src/roulette.c
index 533358cf5..39db5630b 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -2311,18 +2311,18 @@ static const u32 RouletteCursorTiles[] = INCBIN_U32("graphics/roulette/cursor.4b
 
 static const struct SpritePalette gUnknown_085B7384[] =
 {
-    { RouletteSpritePalette_01, 1 },
-    { RouletteSpritePalette_02, 2 },
-    { RouletteSpritePalette_03, 3 },
-    { RouletteSpritePalette_04, 4 },
-    { RouletteSpritePalette_05, 5 },
-    { RouletteSpritePalette_06, 6 },
-    { RouletteSpritePalette_07, 7 },
-    { RouletteSpritePalette_08, 8 },
-    { RouletteSpritePalette_09, 9 },
-    { RouletteSpritePalette_10, 10 },
-    { RouletteSpritePalette_11, 11 },
-    { RouletteSpritePalette_12, 12 },
+    { .data = RouletteSpritePalette_01, .tag = 1 },
+    { .data = RouletteSpritePalette_02, .tag = 2 },
+    { .data = RouletteSpritePalette_03, .tag = 3 },
+    { .data = RouletteSpritePalette_04, .tag = 4 },
+    { .data = RouletteSpritePalette_05, .tag = 5 },
+    { .data = RouletteSpritePalette_06, .tag = 6 },
+    { .data = RouletteSpritePalette_07, .tag = 7 },
+    { .data = RouletteSpritePalette_08, .tag = 8 },
+    { .data = RouletteSpritePalette_09, .tag = 9 },
+    { .data = RouletteSpritePalette_10, .tag = 10 },
+    { .data = RouletteSpritePalette_11, .tag = 11 },
+    { .data = RouletteSpritePalette_12, .tag = 12 },
     {}
 };
 
@@ -2330,8 +2330,8 @@ static const struct OamData gOamData_85B73EC =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 1,
 };
 
@@ -2339,8 +2339,8 @@ static const struct OamData gOamData_85B73F4 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 1,
 };
 
@@ -2349,35 +2349,41 @@ static const struct OamData gOamData_85B73FC =
     .y = 60,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 2,
 };
 
-static const union AnimCmd gSpriteAnim_85B7404[] = {
+static const union AnimCmd gSpriteAnim_85B7404[] =
+{
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B740C[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B740C[] =
+{
     gSpriteAnim_85B7404
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_85B7410[] = {
+static const union AffineAnimCmd gSpriteAffineAnim_85B7410[] =
+{
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7418[] = {
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7418[] =
+{
     gSpriteAffineAnim_85B7410
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B741C = {
+static const struct CompressedSpriteSheet gUnknown_085B741C =
+{
     .data = RoulettePokeIcons2Tiles,
     .size = 0xC00,
     .tag = 0
 };
 
-static const union AnimCmd gSpriteAnim_85B7420[] = {
+static const union AnimCmd gSpriteAnim_85B7420[] =
+{
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_FRAME(32, 0),
     ANIMCMD_FRAME(64, 0),
@@ -2393,67 +2399,82 @@ static const union AnimCmd gSpriteAnim_85B7420[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7458[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7458[] =
+{
     &gSpriteAnim_85B7420[0]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B745C[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B745C[] =
+{
     &gSpriteAnim_85B7420[1]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7460[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7460[] =
+{
     &gSpriteAnim_85B7420[2]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7464[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7464[] =
+{
     &gSpriteAnim_85B7420[3]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7468[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7468[] =
+{
     &gSpriteAnim_85B7420[4]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B746C[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B746C[] =
+{
     &gSpriteAnim_85B7420[5]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7470[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7470[] =
+{
     &gSpriteAnim_85B7420[6]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7474[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7474[] =
+{
     &gSpriteAnim_85B7420[7]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7478[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7478[] =
+{
     &gSpriteAnim_85B7420[8]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B747C[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B747C[] =
+{
     &gSpriteAnim_85B7420[9]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7480[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7480[] =
+{
     &gSpriteAnim_85B7420[10]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7484[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7484[] =
+{
     &gSpriteAnim_85B7420[11]
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7488 = {
+static const struct CompressedSpriteSheet gUnknown_085B7488 =
+{
     .data = gRouletteHeadersTiles,
     .size = 0x1600,
     .tag = 4
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7490 = {
+static const struct CompressedSpriteSheet gUnknown_085B7490 =
+{
     .data = RoulettePokeIconsTiles,
     .size = 0x400,
     .tag = 5
 };
 
-static const union AnimCmd gSpriteAnim_85B7498[] = {
+static const union AnimCmd gSpriteAnim_85B7498[] =
+{
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_FRAME(16, 0),
     ANIMCMD_FRAME(32, 0),
@@ -2468,7 +2489,8 @@ static const union AnimCmd gSpriteAnim_85B7498[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B74C8[] = {
+static const union AnimCmd gSpriteAnim_85B74C8[] =
+{
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_FRAME(4, 0),
     ANIMCMD_FRAME(8, 0),
@@ -2476,47 +2498,58 @@ static const union AnimCmd gSpriteAnim_85B74C8[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74DC[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B74DC[] =
+{
     &gSpriteAnim_85B7498[0]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74E0[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B74E0[] =
+{
     &gSpriteAnim_85B7498[2]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74E4[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B74E4[] =
+{
     &gSpriteAnim_85B7498[4]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74E8[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B74E8[] =
+{
     &gSpriteAnim_85B7498[6]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74EC[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B74EC[] =
+{
     &gSpriteAnim_85B7498[8]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74F0[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B74F0[] =
+{
     &gSpriteAnim_85B7498[9]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74F4[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B74F4[] =
+{
     &gSpriteAnim_85B7498[10]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74F8[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B74F8[] =
+{
     &gSpriteAnim_85B74C8[0]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B74FC[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B74FC[] =
+{
     &gSpriteAnim_85B74C8[1]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7500[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7500[] =
+{
     &gSpriteAnim_85B74C8[2]
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7504[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7504[] =
+{
     &gSpriteAnim_85B74C8[3]
 };
 
@@ -2747,8 +2780,8 @@ static const struct OamData gOamData_85B7730 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 1,
 };
 
@@ -2756,8 +2789,8 @@ static const struct OamData gOamData_85B7738 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x16),
+    .size = SPRITE_SIZE(8x16),
     .priority = 1,
 };
 
@@ -2765,8 +2798,8 @@ static const struct OamData gOamData_85B7740 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 1,
 };
 
@@ -2774,8 +2807,8 @@ static const struct OamData gOamData_85B7748 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 0,
+    .shape = SPRITE_SHAPE(16x8),
+    .size = SPRITE_SIZE(16x8),
     .priority = 1,
 };
 
@@ -2809,7 +2842,8 @@ static const struct CompressedSpriteSheet gUnknown_085B7750[] =
     {}
 };
 
-static const union AnimCmd gSpriteAnim_85B7780[] = {
+static const union AnimCmd gSpriteAnim_85B7780[] =
+{
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_FRAME(2, 0),
     ANIMCMD_FRAME(4, 0),
@@ -2824,11 +2858,13 @@ static const union AnimCmd gSpriteAnim_85B7780[] = {
     //ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B77A8[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B77A8[] =
+{
     gSpriteAnim_85B7780
 };
 
-static const union AnimCmd gSpriteAnim_85B77AC[] = {
+static const union AnimCmd gSpriteAnim_85B77AC[] =
+{
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_FRAME(8, 0),
     ANIMCMD_FRAME(16, 0),
@@ -2837,11 +2873,13 @@ static const union AnimCmd gSpriteAnim_85B77AC[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B77C4[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B77C4[] =
+{
     gSpriteAnim_85B77AC
 };
 
-static const union AnimCmd gSpriteAnim_85B77C8[] = {
+static const union AnimCmd gSpriteAnim_85B77C8[] =
+{
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_FRAME(2, 0),
     ANIMCMD_FRAME(4, 0),
@@ -2850,7 +2888,8 @@ static const union AnimCmd gSpriteAnim_85B77C8[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B77E0[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B77E0[] =
+{
     gSpriteAnim_85B77C8
 };
 
@@ -2913,8 +2952,8 @@ static const struct OamData gOamData_85B785C =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2,
 };
 
@@ -2924,7 +2963,8 @@ static const struct CompressedSpriteSheet gUnknown_085B7864 = {
     .tag = 12
 };
 
-static const union AnimCmd gSpriteAnim_85B786C[] = {
+static const union AnimCmd gSpriteAnim_85B786C[] =
+{
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(4, 5),
     ANIMCMD_FRAME(8, 5),
@@ -2932,7 +2972,8 @@ static const union AnimCmd gSpriteAnim_85B786C[] = {
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B7880[] = {
+static const union AnimCmd gSpriteAnim_85B7880[] =
+{
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_FRAME(4, 10),
     ANIMCMD_FRAME(8, 10),
@@ -2940,7 +2981,8 @@ static const union AnimCmd gSpriteAnim_85B7880[] = {
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B7894[] = {
+static const union AnimCmd gSpriteAnim_85B7894[] =
+{
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(4, 15),
     ANIMCMD_FRAME(8, 15),
@@ -2948,7 +2990,8 @@ static const union AnimCmd gSpriteAnim_85B7894[] = {
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B78A8[] = {
+static const union AnimCmd gSpriteAnim_85B78A8[] =
+{
     ANIMCMD_FRAME(4, 2),
     ANIMCMD_FRAME(8, 5),
     ANIMCMD_FRAME(4, 5),
@@ -2956,7 +2999,8 @@ static const union AnimCmd gSpriteAnim_85B78A8[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B78BC[] = {
+static const union AnimCmd gSpriteAnim_85B78BC[] =
+{
     ANIMCMD_FRAME(4, 2),
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_FRAME(4, 4),
@@ -2965,7 +3009,8 @@ static const union AnimCmd gSpriteAnim_85B78BC[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B78D4[] = {
+static const union AnimCmd gSpriteAnim_85B78D4[] =
+{
     ANIMCMD_FRAME(0, 2),
     ANIMCMD_FRAME(4, 5),
     ANIMCMD_FRAME(8, 5),
@@ -2973,12 +3018,14 @@ static const union AnimCmd gSpriteAnim_85B78D4[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B78E8[] = {
+static const union AnimCmd gSpriteAnim_85B78E8[] =
+{
     ANIMCMD_FRAME(12, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B78F0[] = {
+static const union AnimCmd gSpriteAnim_85B78F0[] =
+{
     ANIMCMD_FRAME(8, 2),
     ANIMCMD_FRAME(4, 5),
     ANIMCMD_FRAME(0, 5),
@@ -2986,7 +3033,8 @@ static const union AnimCmd gSpriteAnim_85B78F0[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7904[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7904[] =
+{
     gSpriteAnim_85B786C,
     gSpriteAnim_85B7880,
     gSpriteAnim_85B7894,
@@ -3014,12 +3062,13 @@ static const struct OamData gOamData_85B7940 =
     .y = 81,
     .affineMode = ST_OAM_AFFINE_DOUBLE,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 2,
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7948 = {
+static const struct CompressedSpriteSheet gUnknown_085B7948 =
+{
     .data = gRouletteCenter_Gfx,
     .size = 0x800,
     .tag = 6
@@ -3040,8 +3089,8 @@ static const struct OamData gOamData_85B7968 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 2,
 };
 
@@ -3049,18 +3098,20 @@ static const struct OamData gOamData_85B7970 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 2,
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7978 = {
+static const struct CompressedSpriteSheet gUnknown_085B7978 =
+{
     .data = gUnknown_085B67FC,
     .size = 0xE00,
     .tag = 13
 };
 
-static const union AnimCmd gSpriteAnim_85B7980[] = {
+static const union AnimCmd gSpriteAnim_85B7980[] =
+{
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(16, 6),
     ANIMCMD_FRAME(32, 6),
@@ -3070,45 +3121,53 @@ static const union AnimCmd gSpriteAnim_85B7980[] = {
     ANIMCMD_JUMP(2)
 };
 
-static const union AnimCmd gSpriteAnim_85B799C[] = {
+static const union AnimCmd gSpriteAnim_85B799C[] =
+{
     ANIMCMD_FRAME(80, 10),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B79A4[] = {
+static const union AnimCmd gSpriteAnim_85B79A4[] =
+{
     ANIMCMD_FRAME(80, 10, .hFlip = TRUE),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B79AC[] = {
+static const union AnimCmd gSpriteAnim_85B79AC[] =
+{
     ANIMCMD_FRAME(80, 20),
     ANIMCMD_FRAME(96, 20),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B79B8[] = {
+static const union AnimCmd gSpriteAnim_85B79B8[] =
+{
     ANIMCMD_FRAME(80, 20, .hFlip = TRUE),
     ANIMCMD_FRAME(96, 20, .hFlip = TRUE),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B79C4[] = {
+static const union AnimCmd gSpriteAnim_85B79C4[] =
+{
     ANIMCMD_FRAME(80, 10),
     ANIMCMD_FRAME(96, 10),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd gSpriteAnim_85B79D0[] = {
+static const union AnimCmd gSpriteAnim_85B79D0[] =
+{
     ANIMCMD_FRAME(80, 10, .hFlip = TRUE),
     ANIMCMD_FRAME(96, 10, .hFlip = TRUE),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B79DC[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B79DC[] =
+{
     gSpriteAnim_85B7980
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B79E0[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B79E0[] =
+{
     gSpriteAnim_85B799C,
     gSpriteAnim_85B79A4,
     gSpriteAnim_85B79AC,
@@ -3143,8 +3202,8 @@ static const struct OamData gOamData_85B7A28 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2,
 };
 
@@ -3152,8 +3211,8 @@ static const struct OamData gOamData_85B7A30 =
 {
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 2,
 };
 
@@ -3161,24 +3220,27 @@ static const struct OamData gOamData_85B7A38 =
 {
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 2,
 };
 
-static const struct CompressedSpriteSheet gUnknown_085B7A40 = {
+static const struct CompressedSpriteSheet gUnknown_085B7A40 =
+{
     .data = gUnknown_085B7290,
     .size = 0x180,
     .tag = 14
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_85B7A48[] = {
+static const union AffineAnimCmd gSpriteAffineAnim_85B7A48[] =
+{
     AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0),
     AFFINEANIMCMD_FRAME(2,    2,    0, 60),
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_85B7A60[] = {
+static const union AffineAnimCmd gSpriteAffineAnim_85B7A60[] =
+{
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_FRAME(-2,    0x0,   0, 15),
     AFFINEANIMCMD_FRAME(-1,    -2,    0, 15),
@@ -3186,38 +3248,46 @@ static const union AffineAnimCmd gSpriteAffineAnim_85B7A60[] = {
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7A88[] = {
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7A88[] =
+{
     gSpriteAffineAnim_85B7A48
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7A8C[] = {
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7A8C[] =
+{
     gSpriteAffineAnim_85B7A60
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_85B7A90[] = {
+static const union AffineAnimCmd gSpriteAffineAnim_85B7A90[] =
+{
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7AA0[] = {
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_85B7AA0[] =
+{
     gSpriteAffineAnim_85B7A90
 };
 
-static const union AnimCmd gSpriteAnim_85B7AA4[] = {
+static const union AnimCmd gSpriteAnim_85B7AA4[] =
+{
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_85B7AAC[] = {
+static const union AnimCmd gSpriteAnim_85B7AAC[] =
+{
     ANIMCMD_FRAME(4, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7AB4[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7AB4[] =
+{
     gSpriteAnim_85B7AA4
 };
 
-static const union AnimCmd *const gSpriteAnimTable_85B7AB8[] = {
+static const union AnimCmd *const gSpriteAnimTable_85B7AB8[] =
+{
     gSpriteAnim_85B7AAC
 };
 
diff --git a/src/safari_zone.c b/src/safari_zone.c
index accf94981..703c3d0cd 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -10,6 +10,7 @@
 #include "string_util.h"
 #include "tv.h"
 #include "constants/game_stat.h"
+#include "field_screen_effect.h"
 
 struct PokeblockFeeder
 {
@@ -27,8 +28,6 @@ extern const u8 EventScript_2A4B6F[];
 extern const u8 EventScript_2A4B4C[];
 extern const u8 EventScript_2A4B9B[];
 
-extern void sub_80AF6F0(void);
-
 EWRAM_DATA u8 gNumSafariBalls = 0;
 EWRAM_DATA static u16 sSafariZoneStepCounter = 0;
 EWRAM_DATA static u8 sSafariZoneCaughtMons = 0;
diff --git a/src/save.c b/src/save.c
index 4444e122c..361a88e1e 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1,5 +1,7 @@
 #include "global.h"
+#include "agb_flash.h"
 #include "gba/flash_internal.h"
+#include "fieldmap.h"
 #include "save.h"
 #include "task.h"
 #include "decompress.h"
@@ -8,6 +10,7 @@
 #include "pokemon_storage_system.h"
 #include "main.h"
 #include "trainer_hill.h"
+#include "link.h"
 #include "constants/game_stat.h"
 
 static u16 CalculateChecksum(void *data, u16 size);
@@ -70,12 +73,6 @@ const struct SaveSectionOffsets gSaveSectionOffsets[] =
     SAVEBLOCK_CHUNK(gPokemonStorage, 8),
 };
 
-extern void DoSaveFailedScreen(u8); // save_failed_screen
-extern bool32 ProgramFlashSectorAndVerify(u8 sector, u8 *data);
-extern void save_serialize_map(void);
-extern void sub_800ADF8(void);
-extern bool8 IsLinkTaskFinished(void);
-
 // iwram common
 u16 gLastWrittenSector;
 u32 gLastSaveCounter;
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 08f193890..415907585 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -47,19 +47,19 @@ EWRAM_DATA u8 gSaveFailedUnused2[4] = {0};
 
 static const struct OamData sClockOamData =
 {
-    160, // Y
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0
+    .y = 160,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(16x16),
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0
 };
 
 static const struct BgTemplate gUnknown_085EFD88[3] =
diff --git a/src/script_menu.c b/src/script_menu.c
index afb1ef312..c7523a370 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1312,7 +1312,7 @@ static void Task_HandleMultichoiceGridInput(u8 taskId)
 
 #undef tWindowId
 
-bool8 ScrSpecial_CreatePCMenu(void)
+bool16 ScrSpecial_CreatePCMenu(void)
 {
     if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
     {
diff --git a/src/secret_base.c b/src/secret_base.c
index b7d9329c3..e19aecba3 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -43,8 +43,6 @@
 #include "constants/species.h"
 #include "constants/trainers.h"
 
-extern void mapldr_default(void);
-
 // Static type declarations
 
 struct SecretBaseListMenuBuffer {
diff --git a/src/sound.c b/src/sound.c
index ebb4fad75..16f024858 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -264,7 +264,7 @@ void FadeInNewBGM(u16 songNum, u8 speed)
 {
     if (gDisableMusic)
         songNum = 0;
-    if (songNum == 0xFFFF)
+    if (songNum == MUS_NONE)
         songNum = 0;
     m4aSongNumStart(songNum);
     m4aMPlayImmInit(&gMPlayInfo_BGM);
@@ -561,7 +561,7 @@ void PlayBGM(u16 songNum)
 {
     if (gDisableMusic)
         songNum = 0;
-    if (songNum == 0xFFFF)
+    if (songNum == MUS_NONE)
         songNum = 0;
     m4aSongNumStart(songNum);
 }
diff --git a/src/sprite.c b/src/sprite.c
index 4087dd8c4..d2ea7889c 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -91,21 +91,21 @@ typedef void (*AnimFunc)(struct Sprite *);
 typedef void (*AnimCmdFunc)(struct Sprite *);
 typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *);
 
-#define DUMMY_OAM_DATA        \
-{                             \
-    160, /* Y (off-screen) */ \
-    0,                        \
-    0,                        \
-    0,                        \
-    0,                        \
-    0,                        \
-    304, /* X */              \
-    0,                        \
-    0,                        \
-    0,                        \
-    3, /* lowest priority */  \
-    0,                        \
-    0                         \
+#define DUMMY_OAM_DATA                      \
+{                                           \
+    .y = 160,                               \
+    .affineMode = 0,                        \
+    .objMode = 0,                           \
+    .mosaic = 0,                            \
+    .bpp = 0,                               \
+    .shape = SPRITE_SHAPE(8x8),             \
+    .x = 304,                               \
+    .matrixNum = 0,                         \
+    .size = SPRITE_SIZE(8x8),               \
+    .tileNum = 0,                           \
+    .priority = 3, /* lowest priority */    \
+    .paletteNum = 0,                        \
+    .affineParam = 0                        \
 }
 
 #define ANIM_END        0xFFFF
diff --git a/src/start_menu.c b/src/start_menu.c
index f56e5e861..4822c12e6 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -1,44 +1,49 @@
 #include "global.h"
-#include "start_menu.h"
-#include "menu.h"
-#include "safari_zone.h"
-#include "event_data.h"
-#include "window.h"
-#include "string_util.h"
-#include "text.h"
-#include "strings.h"
+#include "battle_pike.h"
+#include "battle_pyramid.h"
+#include "battle_pyramid_bag.h"
 #include "bg.h"
+#include "event_data.h"
+#include "event_object_movement.h"
+#include "event_obj_lock.h"
+#include "event_scripts.h"
+#include "fieldmap.h"
 #include "field_effect.h"
-#include "party_menu.h"
-#include "frontier_pass.h"
-#include "task.h"
-#include "overworld.h"
-#include "link.h"
-#include "frontier_util.h"
+#include "field_player_avatar.h"
 #include "field_specials.h"
-#include "event_object_movement.h"
-#include "script.h"
-#include "main.h"
-#include "sound.h"
-#include "pokedex.h"
 #include "field_weather.h"
-#include "palette.h"
+#include "field_screen_effect.h"
+#include "frontier_pass.h"
+#include "frontier_util.h"
+#include "gpu_regs.h"
+#include "international_string_util.h"
 #include "item_menu.h"
+#include "link.h"
+#include "load_save.h"
+#include "main.h"
+#include "menu.h"
+#include "new_game.h"
 #include "option_menu.h"
-#include "event_scripts.h"
+#include "overworld.h"
+#include "palette.h"
+#include "party_menu.h"
+#include "pokedex.h"
+#include "pokenav.h"
+#include "safari_zone.h"
 #include "save.h"
-#include "gpu_regs.h"
 #include "scanline_effect.h"
+#include "script.h"
+#include "sound.h"
+#include "start_menu.h"
+#include "strings.h"
+#include "string_util.h"
+#include "task.h"
+#include "text.h"
 #include "text_window.h"
-#include "load_save.h"
 #include "trainer_card.h"
-#include "international_string_util.h"
+#include "window.h"
 #include "constants/songs.h"
-#include "field_player_avatar.h"
-#include "battle_pyramid.h"
-#include "battle_pyramid_bag.h"
-#include "battle_pike.h"
-#include "new_game.h"
+#include "rom_8011DC0.h"
 
 // Menu actions
 enum
@@ -83,19 +88,6 @@ EWRAM_DATA static u8 sSaveDialogTimer = 0;
 EWRAM_DATA static bool8 sSavingComplete = FALSE;
 EWRAM_DATA static u8 sSaveInfoWindowId = 0;
 
-// Extern variables.
-extern u8 gLocalLinkPlayerId;
-
-// Extern functions in not decompiled files.
-extern void sub_80AF688(void);
-extern void var_800D_set_xB(void);
-extern void sub_808B864(void);
-extern void CB2_Pokedex(void);
-extern void PlayRainStoppingSoundEffect(void);
-extern void CB2_PokeNav(void);
-extern void ScriptUnfreezeEventObjects(void);
-extern void save_serialize_map(void);
-
 // Menu action callbacks
 static bool8 StartMenuPokedexCallback(void);
 static bool8 StartMenuPokemonCallback(void);
@@ -656,7 +648,7 @@ static bool8 StartMenuPokeNavCallback(void)
         PlayRainStoppingSoundEffect();
         RemoveExtraStartMenuWindows();
         CleanupOverworldWindowsAndTilemaps();
-        SetMainCallback2(CB2_PokeNav);  // Display PokeNav
+        SetMainCallback2(CB2_InitPokeNav);  // Display PokeNav
 
         return TRUE;
     }
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 4ed53539f..c3d636175 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -170,10 +170,10 @@ static const struct OamData gOamData_85B1E10 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -187,10 +187,10 @@ static const struct OamData gOamData_85B1E18 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -204,10 +204,10 @@ static const struct OamData gOamData_85B1E20 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -296,21 +296,35 @@ static const union AffineAnimCmd * const gSpriteAffineAnimTable_85B1ED4[] = {gSp
 
 static const struct CompressedSpriteSheet gUnknown_085B1ED8[] =
 {
-    gUnknown_085B18AC, 0x0800, 0x1000,
-    NULL,
+    {
+        .data = gUnknown_085B18AC,
+        .size = 0x0800,
+        .tag = 0x1000
+    },
+    {}
 };
 
 static const struct CompressedSpriteSheet gUnknown_085B1EE8[] =
 {
-    gUnknown_085B1BCC, 0x0800, 0x1001,
-    NULL,
+    {
+        .data = gUnknown_085B1BCC,
+        .size = 0x0800,
+        .tag = 0x1001
+    },
+    {}
 };
 
 static const struct SpritePalette gUnknown_085B1EF8[] =
 {
-    gBirchBallarrow_Pal, 0x1000,
-    gBirchCircle_Pal, 0x1001,
-    NULL,
+    {
+        .data = gBirchBallarrow_Pal,
+        .tag = 0x1000
+    },
+    {
+        .data = gBirchCircle_Pal,
+        .tag = 0x1001
+    },
+    {},
 };
 
 static const struct SpriteTemplate sSpriteTemplate_Hand =
diff --git a/src/text.c b/src/text.c
index 2d286992d..be4bf2697 100644
--- a/src/text.c
+++ b/src/text.c
@@ -12,10 +12,6 @@
 #include "menu.h"
 #include "dynamic_placeholder_text_util.h"
 
-extern u8 GetKeypadIconWidth(u8 keypadIconId);
-extern u16 Font6Func(struct TextPrinter *textPrinter);
-extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
-
 EWRAM_DATA struct TextPrinter gTempTextPrinter = {0};
 EWRAM_DATA struct TextPrinter gTextPrinters[NUM_TEXT_PRINTERS] = {0};
 
diff --git a/src/title_screen.c b/src/title_screen.c
index ca34f90f8..b9ef53000 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -23,9 +23,7 @@
 #include "constants/rgb.h"
 #include "constants/songs.h"
 
-#define VERSION_BANNER_SHAPE 1
 #define VERSION_BANNER_RIGHT_TILEOFFSET 64
-#define VERSION_BANNER_BYTES 0x1000
 #define VERSION_BANNER_LEFT_X 98
 #define VERSION_BANNER_RIGHT_X 162
 #define VERSION_BANNER_Y 2
@@ -64,16 +62,41 @@ static const u32 sTitleScreenRayquazaTilemap[] = INCBIN_U32("graphics/title_scre
 static const u32 sTitleScreenLogoShineGfx[] = INCBIN_U32("graphics/title_screen/logo_shine.4bpp.lz");
 static const u32 sTitleScreenCloudsGfx[] = INCBIN_U32("graphics/title_screen/clouds.4bpp.lz");
 
-const u16 gIntroWaterDropData[] =
-{
-    0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710,
-    0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10,
-    0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008,
-    0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000,
-    0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-    0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-    0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-    0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
+const u16 gIntroWaterDropAlphaBlend[] =
+{
+    BLDALPHA_BLEND(16, 0),
+    BLDALPHA_BLEND(16, 1),
+    BLDALPHA_BLEND(16, 2),
+    BLDALPHA_BLEND(16, 3),
+    BLDALPHA_BLEND(16, 4),
+    BLDALPHA_BLEND(16, 5),
+    BLDALPHA_BLEND(16, 6),
+    BLDALPHA_BLEND(16, 7),
+    BLDALPHA_BLEND(16, 8),
+    BLDALPHA_BLEND(16, 9),
+    BLDALPHA_BLEND(16, 10),
+    BLDALPHA_BLEND(16, 11),
+    BLDALPHA_BLEND(16, 12),
+    BLDALPHA_BLEND(16, 13),
+    BLDALPHA_BLEND(16, 14),
+    BLDALPHA_BLEND(16, 15),
+    BLDALPHA_BLEND(15, 16),
+    BLDALPHA_BLEND(14, 16),
+    BLDALPHA_BLEND(13, 16),
+    BLDALPHA_BLEND(12, 16),
+    BLDALPHA_BLEND(11, 16),
+    BLDALPHA_BLEND(10, 16),
+    BLDALPHA_BLEND(9, 16),
+    BLDALPHA_BLEND(8, 16),
+    BLDALPHA_BLEND(7, 16),
+    BLDALPHA_BLEND(6, 16),
+    BLDALPHA_BLEND(5, 16),
+    BLDALPHA_BLEND(4, 16),
+    BLDALPHA_BLEND(3, 16),
+    BLDALPHA_BLEND(2, 16),
+    BLDALPHA_BLEND(1, 16),
+    BLDALPHA_BLEND(0, 16),
+    [32 ... 63] = BLDALPHA_BLEND(0, 16)
 };
 
 static const struct OamData sVersionBannerLeftOamData =
@@ -83,10 +106,10 @@ static const struct OamData sVersionBannerLeftOamData =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 1,
-    .shape = VERSION_BANNER_SHAPE,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -100,10 +123,10 @@ static const struct OamData sVersionBannerRightOamData =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 1,
-    .shape = VERSION_BANNER_SHAPE,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -156,8 +179,12 @@ static const struct SpriteTemplate sVersionBannerRightSpriteTemplate =
 
 static const struct CompressedSpriteSheet sSpriteSheet_EmeraldVersion[] =
 {
-    {gTitleScreenEmeraldVersionGfx, VERSION_BANNER_BYTES, 1000},
-    {NULL},
+    {
+        .data = gTitleScreenEmeraldVersionGfx,
+        .size = 0x1000,
+        .tag = 1000
+    },
+    {},
 };
 
 static const struct OamData sOamData_CopyrightBanner =
@@ -167,10 +194,10 @@ static const struct OamData sOamData_CopyrightBanner =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(32x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -255,14 +282,21 @@ static const struct SpriteTemplate sStartCopyrightBannerSpriteTemplate =
 
 static const struct CompressedSpriteSheet sSpriteSheet_PressStart[] =
 {
-    {gTitleScreenPressStartGfx, 0x520, 1001},
-    {NULL},
+    {
+        .data = gTitleScreenPressStartGfx,
+        .size = 0x520,
+        .tag = 1001
+    },
+    {},
 };
 
 static const struct SpritePalette sSpritePalette_PressStart[] =
 {
-    {gTitleScreenPressStartPal, 1001},
-    {NULL},
+    {
+        .data = gTitleScreenPressStartPal,
+        .tag = 1001
+    },
+    {},
 };
 
 static const struct OamData sPokemonLogoShineOamData =
@@ -272,10 +306,10 @@ static const struct OamData sPokemonLogoShineOamData =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -306,8 +340,12 @@ static const struct SpriteTemplate sPokemonLogoShineSpriteTemplate =
 
 static const struct CompressedSpriteSheet sPokemonLogoShineSpriteSheet[] =
 {
-    {sTitleScreenLogoShineGfx, 0x800, 1002},
-    {NULL},
+    {
+        .data = sTitleScreenLogoShineGfx,
+        .size = 0x800,
+        .tag = 1002
+    },
+    {},
 };
 
 // code
@@ -324,7 +362,7 @@ static void SpriteCB_VersionBannerLeft(struct Sprite *sprite)
             sprite->pos1.y++;
         if (sprite->data[0] != 0)
             sprite->data[0]--;
-        SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[sprite->data[0]]);
+        SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[sprite->data[0]]);
     }
 }
 
diff --git a/src/trade.c b/src/trade.c
index 7086bac12..df8f493f1 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -256,72 +256,89 @@ static const u8 gText_YourOnlyPkmnForBattle[] = _("That's your only\nPOKéMON fo
 static const u8 gText_WaitingForYourFriend[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…");
 static const u8 gText_YourFriendWantsToTrade[] = _("Your friend wants\nto trade POKéMON.");
 
-static const struct OamData gOamData_832DC14 = {
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 2,
+static const struct OamData gOamData_832DC14 =
+{
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
     .priority = 1
 };
 
-static const struct OamData gOamData_832DC1C = {
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 3,
+static const struct OamData gOamData_832DC1C =
+{
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 1
 };
 
-static const union AnimCmd gSpriteAnim_832DC24[] = {
+static const union AnimCmd gSpriteAnim_832DC24[] =
+{
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_832DC2C[] = {
+static const union AnimCmd gSpriteAnim_832DC2C[] =
+{
     ANIMCMD_FRAME(32, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_832DC34[] = {
+static const union AnimCmd *const gSpriteAnimTable_832DC34[] =
+{
     gSpriteAnim_832DC24,
     gSpriteAnim_832DC2C
 };
 
-static const struct SpriteSheet gUnknown_0832DC3C = {
-    gUnknown_08DDC6E4, 0x800, 300
+static const struct SpriteSheet gUnknown_0832DC3C =
+{
+    .data = gUnknown_08DDC6E4,
+    .size = 0x800,
+    .tag = 300
 };
 
-static const struct SpritePalette gUnknown_0832DC44 = {
-    gUnknown_08DDB444, 2345
+static const struct SpritePalette gUnknown_0832DC44 =
+{
+    .data = gUnknown_08DDB444,
+    .tag = 2345
 };
 
-static const union AnimCmd gSpriteAnim_832DC4C[] = {
+static const union AnimCmd gSpriteAnim_832DC4C[] =
+{
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_832DC54[] = {
+static const union AnimCmd gSpriteAnim_832DC54[] =
+{
     ANIMCMD_FRAME(8, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_832DC5C[] = {
+static const union AnimCmd gSpriteAnim_832DC5C[] =
+{
     ANIMCMD_FRAME(16, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_832DC64[] = {
+static const union AnimCmd gSpriteAnim_832DC64[] =
+{
     ANIMCMD_FRAME(24, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_832DC6C[] = {
+static const union AnimCmd gSpriteAnim_832DC6C[] =
+{
     ANIMCMD_FRAME(32, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_832DC74[] = {
+static const union AnimCmd gSpriteAnim_832DC74[] =
+{
     ANIMCMD_FRAME(40, 5),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_832DC7C[] = {
+static const union AnimCmd *const gSpriteAnimTable_832DC7C[] =
+{
     gSpriteAnim_832DC4C,
     gSpriteAnim_832DC54,
     gSpriteAnim_832DC5C,
@@ -355,7 +372,8 @@ static const struct SpriteTemplate gSpriteTemplate_832DCAC =
 static const u16 TradeScreenTextPalette[] = INCBIN_U16("graphics/trade/text.gbapal");
 static const struct SpritePalette gSpritePalette_TradeScreenText =
 {
-    TradeScreenTextPalette, 4925
+    .data = TradeScreenTextPalette,
+    .tag = 4925
 };
 
 // This is used to determine the next mon to select when the D-Pad is
@@ -367,7 +385,6 @@ static const struct SpritePalette gSpritePalette_TradeScreenText =
 //  2  3  8  9
 //  4  5 10 11
 //          12
-
 static const u8 gTradeNextSelectedMonTable[][4][6] =
 {
     {
@@ -471,7 +488,8 @@ static const u8 gTradeMonSpriteCoords[][2] =
     {23, 18} // CANCEL
 };
 
-static const u8 gTradeLevelDisplayCoords[][6][2] = {
+static const u8 gTradeLevelDisplayCoords[][6][2] =
+{
     {
         // Your party
         {5, 4},
@@ -492,7 +510,8 @@ static const u8 gTradeLevelDisplayCoords[][6][2] = {
     }
 };
 
-static const u8 gTradeMonBoxCoords[][6][2] = {
+static const u8 gTradeMonBoxCoords[][6][2] =
+{
     {
         // Your party
         {1, 3},
@@ -513,7 +532,8 @@ static const u8 gTradeMonBoxCoords[][6][2] = {
     }
 };
 
-static const u8 sUnref_0832DE6E[] = {
+static const u8 sUnref_0832DE6E[] =
+{
     0x00, 0x0e,
     0x0f, 0x1d,
     0x03, 0x05,
@@ -544,7 +564,8 @@ static const u8 *const gUnknown_0832DE94[] =
     gJPText_832DB2E
 };
 
-static const struct MenuAction gUnknown_0832DEAC[] = {
+static const struct MenuAction gUnknown_0832DEAC[] =
+{
     {gText_Summary4, sub_807A000},
     {gText_Trade3, sub_807A024}
 };
@@ -817,12 +838,15 @@ static const u16 gUnknown_08337EA0[] = INCBIN_U16("graphics/trade/black.gbapal")
 static const u32 gUnknown_08337EC0[] = INCBIN_U32("graphics/trade/wireless_signal.4bpp.lz");
 static const u32 gUnknown_08338550[] = INCBIN_U32("graphics/trade/wireless_signal.bin.lz");
 
-static const struct OamData gOamData_8338C44 = {
+static const struct OamData gOamData_8338C44 =
+{
     .affineMode = 1,
-    .size = 1
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16)
 };
 
-static const union AnimCmd gSpriteAnim_8338C4C[] = {
+static const union AnimCmd gSpriteAnim_8338C4C[] =
+{
     ANIMCMD_FRAME( 0, 3),
     ANIMCMD_FRAME( 4, 3),
     ANIMCMD_FRAME( 8, 3),
@@ -840,7 +864,8 @@ static const union AnimCmd gSpriteAnim_8338C4C[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_8338C88[] = {
+static const union AnimCmd gSpriteAnim_8338C88[] =
+{
     ANIMCMD_FRAME( 0, 3),
     ANIMCMD_FRAME( 4, 3),
     ANIMCMD_FRAME( 8, 3),
@@ -858,171 +883,213 @@ static const union AnimCmd gSpriteAnim_8338C88[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_8338C88[] = {
+static const union AnimCmd *const gSpriteAnimTable_8338C88[] =
+{
     gSpriteAnim_8338C4C,
     gSpriteAnim_8338C88
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8338CCC[] = {
+static const union AffineAnimCmd gSpriteAffineAnim_8338CCC[] =
+{
     AFFINEANIMCMD_FRAME(0, 0, 0, 1),
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8338CDC[] = {
+static const union AffineAnimCmd gSpriteAffineAnim_8338CDC[] =
+{
     AFFINEANIMCMD_FRAME(-8, 0, 0, 20),
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8338CEC[] = {
+static const union AffineAnimCmd gSpriteAffineAnim_8338CEC[] =
+{
     AFFINEANIMCMD_FRAME(0x60, 0x100, 0,  0),
     AFFINEANIMCMD_FRAME(   0,     0, 0,  5),
     AFFINEANIMCMD_FRAME(   8,     0, 0, 20),
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338D0C[] = {
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338D0C[] =
+{
     gSpriteAffineAnim_8338CCC,
     gSpriteAffineAnim_8338CDC,
     gSpriteAffineAnim_8338CEC
 };
 
-static const struct SpriteSheet gUnknown_08338D18 = {
-    gTradeBallTiles, 0x600, 5557
+static const struct SpriteSheet gUnknown_08338D18 =
+{
+    .data = gTradeBallTiles,
+    .size = 0x600,
+    .tag = 5557
 };
 
-static const struct SpritePalette gUnknown_08338D20 = {
-    gTradeBallPalette, 5558
+static const struct SpritePalette gUnknown_08338D20 =
+{
+    .data = gTradeBallPalette,
+    .tag = 5558
 };
 
-static const struct SpriteTemplate gSpriteTemplate_8338D28 = {
-    5557,
-    5558,
-    &gOamData_8338C44,
-    gSpriteAnimTable_8338C88,
-    NULL,
-    gSpriteAffineAnimTable_8338D0C,
-    sub_807E55C
+static const struct SpriteTemplate gSpriteTemplate_8338D28 =
+{
+    .tileTag = 5557,
+    .paletteTag = 5558,
+    .oam = &gOamData_8338C44,
+    .anims = gSpriteAnimTable_8338C88,
+    .images = NULL,
+    .affineAnims = gSpriteAffineAnimTable_8338D0C,
+    .callback = sub_807E55C
 };
 
-static const struct OamData gOamData_8338D40 = {
+static const struct OamData gOamData_8338D40 =
+{
     .affineMode = 1,
     .objMode = 1,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 1
 };
 
-static const union AnimCmd gSpriteAnim_8338D48[] = {
+static const union AnimCmd gSpriteAnim_8338D48[] =
+{
     ANIMCMD_FRAME(0, 5, .hFlip = TRUE, .vFlip = TRUE),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_8338D50[] = {
+static const union AnimCmd *const gSpriteAnimTable_8338D50[] =
+{
     gSpriteAnim_8338D48
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8338D54[] = {
+static const union AffineAnimCmd gSpriteAffineAnim_8338D54[] =
+{
     AFFINEANIMCMD_FRAME(-10, -10, 0, 5),
     AFFINEANIMCMD_FRAME(10, 10, 0, 5),
     AFFINEANIMCMD_JUMP(0)
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338D6C[] = {
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338D6C[] =
+{
     gSpriteAffineAnim_8338D54
 };
 
-static const struct SpriteSheet gUnknown_08338D70 = {
-    gTradeGlow1Tiles, 0x200, 5550
+static const struct SpriteSheet gUnknown_08338D70 =
+{
+    .data = gTradeGlow1Tiles,
+    .size = 0x200,
+    .tag = 5550
 };
 
-static const struct SpritePalette gUnknown_08338D78 = {
-    gUnknown_08330940, 5551
+static const struct SpritePalette gUnknown_08338D78 =
+{
+    .data = gUnknown_08330940,
+    .tag = 5551
 };
 
-static const struct SpritePalette gUnknown_08338D80 = {
-    gUnknown_083308E0, 5555
+static const struct SpritePalette gUnknown_08338D80 =
+{
+    .data = gUnknown_083308E0,
+    .tag = 5555
 };
 
-static const struct SpriteTemplate gUnknown_08338D88 = {
-    5550,
-    5551,
-    &gOamData_8338D40,
-    gSpriteAnimTable_8338D50,
-    NULL,
-    gSpriteAffineAnimTable_8338D6C,
-    sub_807AA28
+static const struct SpriteTemplate gUnknown_08338D88 =
+{
+    .tileTag = 5550,
+    .paletteTag = 5551,
+    .oam = &gOamData_8338D40,
+    .anims = gSpriteAnimTable_8338D50,
+    .images = NULL,
+    .affineAnims = gSpriteAffineAnimTable_8338D6C,
+    .callback = sub_807AA28
 };
 
-static const struct OamData gOamData_8338DA0 = {
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 2,
+static const struct OamData gOamData_8338DA0 =
+{
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 1
 };
 
-static const union AnimCmd gSpriteAnim_8338DA8[] = {
+static const union AnimCmd gSpriteAnim_8338DA8[] =
+{
     ANIMCMD_FRAME(0, 5, .vFlip = TRUE, .hFlip = TRUE),
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_8338DB0[] = {
+static const union AnimCmd gSpriteAnim_8338DB0[] =
+{
     ANIMCMD_FRAME(8, 5, .vFlip = TRUE, .hFlip = TRUE),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_8338DB8[] = {
+static const union AnimCmd *const gSpriteAnimTable_8338DB8[] =
+{
     gSpriteAnim_8338DA8,
     gSpriteAnim_8338DB0
 };
 
-static const struct SpriteSheet gUnknown_08338DC0 = {
-    gTradeGlow2Tiles, 0x300, 5552
+static const struct SpriteSheet gUnknown_08338DC0 =
+{
+    .data = gTradeGlow2Tiles,
+    .size = 0x300,
+    .tag = 5552
 };
 
-static const struct SpriteTemplate gSpriteTemplate_8338DC8 = {
-    5552,
-    5551,
-    &gOamData_8338DA0,
-    gSpriteAnimTable_8338DB8,
-    NULL,
-    gDummySpriteAffineAnimTable,
-    sub_807AA7C
+static const struct SpriteTemplate gSpriteTemplate_8338DC8 =
+{
+    .tileTag = 5552,
+    .paletteTag = 5551,
+    .oam = &gOamData_8338DA0,
+    .anims = gSpriteAnimTable_8338DB8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_807AA7C
 };
 
-static const struct OamData gOamData_8338DE0 = {
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 2,
+static const struct OamData gOamData_8338DE0 =
+{
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 1
 };
 
-static const union AnimCmd gSpriteAnim_8338DE8[] = {
+static const union AnimCmd gSpriteAnim_8338DE8[] =
+{
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_8338DF0[] = {
+static const union AnimCmd *const gSpriteAnimTable_8338DF0[] =
+{
     gSpriteAnim_8338DE8
 };
 
-static const struct SpriteSheet gUnknown_08338DF4 = {
-    gTradeCableEndTiles, 0x100, 5554
+static const struct SpriteSheet gUnknown_08338DF4 =
+{
+    .data = gTradeCableEndTiles,
+    .size = 0x100,
+    .tag = 5554
 };
 
-static const struct SpriteTemplate gSpriteTemplate_8338DFC = {
-    5554,
-    5555,
-    &gOamData_8338DE0,
-    gSpriteAnimTable_8338DF0,
-    NULL,
-    gDummySpriteAffineAnimTable,
-    sub_807AABC
+static const struct SpriteTemplate gSpriteTemplate_8338DFC =
+{
+    .tileTag = 5554,
+    .paletteTag = 5555,
+    .oam = &gOamData_8338DE0,
+    .anims = gSpriteAnimTable_8338DF0,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_807AABC
 };
 
-static const struct OamData gOamData_8338E14 = {
-    .shape = ST_OAM_H_RECTANGLE,
-    .size = 3,
+static const struct OamData gOamData_8338E14 =
+{
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 1
 };
 
-static const union AnimCmd gSpriteAnim_8338E1C[] = {
+static const union AnimCmd gSpriteAnim_8338E1C[] =
+{
     ANIMCMD_FRAME( 0, 2, .vFlip = TRUE, .hFlip = TRUE),
     ANIMCMD_FRAME(32, 2, .vFlip = TRUE, .hFlip = TRUE),
     ANIMCMD_FRAME(64, 2, .vFlip = TRUE, .hFlip = TRUE),
@@ -1034,7 +1101,8 @@ static const union AnimCmd gSpriteAnim_8338E1C[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd gSpriteAnim_8338E40[] = {
+static const union AnimCmd gSpriteAnim_8338E40[] =
+{
     ANIMCMD_FRAME( 0, 2, .vFlip = TRUE, .hFlip = TRUE),
     ANIMCMD_FRAME(32, 2, .vFlip = TRUE, .hFlip = TRUE),
     ANIMCMD_FRAME(64, 2, .vFlip = TRUE, .hFlip = TRUE),
@@ -1046,50 +1114,60 @@ static const union AnimCmd gSpriteAnim_8338E40[] = {
     ANIMCMD_END
 };
 
-static const union AnimCmd *const gSpriteAnimTable_8338E64[] = {
+static const union AnimCmd *const gSpriteAnimTable_8338E64[] =
+{
     gSpriteAnim_8338E1C
 };
 
-static const union AnimCmd *const gSpriteAnimTable_8338E68[] = {
+static const union AnimCmd *const gSpriteAnimTable_8338E68[] =
+{
     gSpriteAnim_8338E40
 };
 
-static const struct SpriteSheet gUnknown_08338E6C = {
-    gTradeGBAScreenTiles, 0x1000, 5556
+static const struct SpriteSheet gUnknown_08338E6C =
+{
+    .data = gTradeGBAScreenTiles,
+    .size = 0x1000,
+    .tag = 5556
 };
 
-static const struct SpriteTemplate gSpriteTemplate_8338E74 = {
-    5556,
-    5555,
-    &gOamData_8338E14,
-    gSpriteAnimTable_8338E64,
-    NULL,
-    gDummySpriteAffineAnimTable,
-    sub_807AB04
+static const struct SpriteTemplate gSpriteTemplate_8338E74 =
+{
+    .tileTag = 5556,
+    .paletteTag = 5555,
+    .oam = &gOamData_8338E14,
+    .anims = gSpriteAnimTable_8338E64,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_807AB04
 };
 
-static const struct SpriteTemplate gSpriteTemplate_8338E8C = {
-    5556,
-    5555,
-    &gOamData_8338E14,
-    gSpriteAnimTable_8338E68,
-    NULL,
-    gDummySpriteAffineAnimTable,
-    sub_807AB04
+static const struct SpriteTemplate gSpriteTemplate_8338E8C =
+{
+    .tileTag = 5556,
+    .paletteTag = 5555,
+    .oam = &gOamData_8338E14,
+    .anims = gSpriteAnimTable_8338E68,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_807AB04
 };
 
 static const u16 gUnknown_08338EA4[] = INCBIN_U16("graphics/trade/unknown_338EA4.gbapal");
 
-static const union AffineAnimCmd gSpriteAffineAnim_8338EBC[] = {
+static const union AffineAnimCmd gSpriteAffineAnim_8338EBC[] =
+{
     AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
     AFFINEANIMCMD_JUMP(0)
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338ECC[] = {
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338ECC[] =
+{
     gSpriteAffineAnim_8338EBC
 };
 
-static const struct InGameTrade gIngameTrades[] = {
+static const struct InGameTrade gIngameTrades[] =
+{
     {
         _("DOTS"), SPECIES_SEEDOT,
         5, 4, 5, 4, 4, 4,
@@ -1131,7 +1209,8 @@ static const struct InGameTrade gIngameTrades[] = {
     }
 };
 
-static const u16 gIngameTradeMail[][10] = {
+static const u16 gIngameTradeMail[][10] =
+{
     {
         EC_WORD_BE,
         EC_WORD_NICE,
@@ -1233,7 +1312,8 @@ static const struct BgTemplate gUnknown_08339014[] =
     },
 };
 
-static const s8 gTradeBallVerticalVelocityTable[] = {
+static const s8 gTradeBallVerticalVelocityTable[] =
+{
     0,  0,  1,  0,
     1,  0,  1,  1,
     1,  1,  2,  2,
diff --git a/src/trainer_card.c b/src/trainer_card.c
index cd8b34865..01839d598 100755
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -21,6 +21,7 @@
 #include "gpu_regs.h"
 #include "international_string_util.h"
 #include "pokedex.h"
+#include "pokemon_icon.h"
 #include "graphics.h"
 #include "pokemon_icon.h"
 #include "trainer_pokemon_sprites.h"
@@ -89,9 +90,6 @@ struct TrainerCardData
     u8 language;
 };
 
-//external functions
-extern u8 sub_80D30A0(u16);
-
 // EWRAM
 EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0};
 EWRAM_DATA static struct TrainerCardData *sData = NULL;
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index d57685423..8172f09e6 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -43,13 +43,18 @@ static EWRAM_DATA struct PicData sSpritePics[PICS_COUNT] = {};
 // .rodata
 
 static const struct PicData sDummyPicData = {};
+
 static const struct OamData gUnknown_0860B064 =
 {
-    .size = 3
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64)
 };
+
 static const struct OamData gUnknown_0860B06C =
 {
-    .affineMode = 1, .size = 3
+    .affineMode = 1,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64)
 };
 
 // .text
diff --git a/src/trainer_see.c b/src/trainer_see.c
index bc5d9cbc3..9925aa6bc 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -17,8 +17,6 @@
 #include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
 
-extern void sub_809BE48(u16 npcId);
-
 // this file's functions
 static u8 CheckTrainer(u8 eventObjectId);
 static u8 GetTrainerApproachDistance(struct EventObject *trainerObj);
@@ -102,10 +100,10 @@ static const struct OamData sOamData_Icons =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -114,13 +112,22 @@ static const struct OamData sOamData_Icons =
 
 static const struct SpriteFrameImage sSpriteImageTable_ExclamationQuestionMark[] =
 {
-    {sEmotion_ExclamationMarkGfx, 0x80},
-    {sEmotion_QuestionMarkGfx, 0x80}
+    {
+        .data = sEmotion_ExclamationMarkGfx,
+        .size = 0x80
+    },
+    {
+        .data = sEmotion_QuestionMarkGfx,
+        .size = 0x80
+    }
 };
 
 static const struct SpriteFrameImage sSpriteImageTable_HeartIcon[] =
 {
-    {sEmotion_HeartGfx, 0x80}
+    {
+        .data = sEmotion_HeartGfx,
+        .size = 0x80
+    }
 };
 
 static const union AnimCmd sSpriteAnim_Icons1[] =
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c
index 03e049d72..02648bf93 100644
--- a/src/unk_text_util_2.c
+++ b/src/unk_text_util_2.c
@@ -214,7 +214,7 @@ static void DecompressGlyphFont6(u16 glyph)
     gUnknown_03002F90.unk81 = 0x10;
 }
 
-u8 GetGlyphWidthFont6(void)
+u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese)
 {
     return 0x10;
 }
diff --git a/src/unk_transition.c b/src/unk_transition.c
index d56998b5b..99479c866 100644
--- a/src/unk_transition.c
+++ b/src/unk_transition.c
@@ -40,7 +40,7 @@ static const u32 gUnknown_0862AF30[] = INCBIN_U32("graphics/battle_transitions/f
 static const u32 gUnknown_0862B0DC[] = INCBIN_U32("graphics/battle_transitions/frontier_transition_circles.4bpp.lz");
 static const u16 gUnknown_0862B53C[] = INCBIN_U16("graphics/battle_transitions/frontier_transition.gbapal");
 
-// Unused Empty data. Feel free to delete.
+// Unused Empty data.
 static const u8 sFiller[0x1C0] = {0};
 
 static const struct OamData sOamData_862B71C =
@@ -50,10 +50,10 @@ static const struct OamData sOamData_862B71C =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -62,12 +62,15 @@ static const struct OamData sOamData_862B71C =
 
 static const struct CompressedSpriteSheet sUnknown_0862B724 =
 {
-    gUnknown_0862B0DC, 0x1800, 11920
+    .data = gUnknown_0862B0DC,
+    .size = 0x1800,
+    .tag = 11920
 };
 
 static const struct SpritePalette sUnknown_0862B72C =
 {
-    gUnknown_0862B53C, 11920
+    .data = gUnknown_0862B53C,
+    .tag = 11920
 };
 
 static const union AnimCmd sSpriteAnim_862B734[] =
diff --git a/src/wallclock.c b/src/wallclock.c
index d3bbcf7a2..810abb1d1 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -93,6 +93,7 @@ static const struct WindowTemplate gUnknown_085B21DC[] =
     },
     DUMMY_WIN_TEMPLATE
 };
+
 static const struct WindowTemplate gUnknown_085B21F4 =
 {
     .bg = 0,
@@ -103,7 +104,9 @@ static const struct WindowTemplate gUnknown_085B21F4 =
     .paletteNum = 14,
     .baseBlock = 572
 };
-static const struct BgTemplate gUnknown_085B21FC[] = {
+
+static const struct BgTemplate gUnknown_085B21FC[] =
+{
     {
         .bg = 0,
         .charBaseIndex = 2,
@@ -123,34 +126,57 @@ static const struct BgTemplate gUnknown_085B21FC[] = {
         .priority = 2
     }
 };
-static const struct CompressedSpriteSheet gUnknown_085B2208 = {
+
+static const struct CompressedSpriteSheet gUnknown_085B2208 =
+{
     sUnknown_085B1F58, 0x2000, TAG_GFX_WALL_CLOCK_HAND
 };
-static const u32 filler_85B2210[2] = {};
-static const struct SpritePalette gUnknown_085B2218[] = {
-    { gWallclockMale_Pal, TAG_PAL_WALL_CLOCK_HAND },
-    { gWallclockFemale_Pal, 0x1001 },
+
+static const u8 filler_85B2210[8] = {0};
+
+static const struct SpritePalette gUnknown_085B2218[] =
+{
+    {
+        .data = gWallclockMale_Pal,
+        .tag = TAG_PAL_WALL_CLOCK_HAND
+    },
+    {
+        .data = gWallclockFemale_Pal,
+        .tag = 0x1001
+    },
     {}
 };
-static const struct OamData Unknown_085B2230 = {
+
+static const struct OamData Unknown_085B2230 =
+{
     .y = 160,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 1,
 };
-static const union AnimCmd Unknown_085B2238[] = {
+
+static const union AnimCmd Unknown_085B2238[] =
+{
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_END,
 };
-static const union AnimCmd Unknown_085B2240[] = {
+
+static const union AnimCmd Unknown_085B2240[] =
+{
     ANIMCMD_FRAME(64, 30),
     ANIMCMD_END,
 };
-static const union AnimCmd *const gUnknown_085B2248[] = {
+
+static const union AnimCmd *const gUnknown_085B2248[] =
+{
     Unknown_085B2238
 };
-static const union AnimCmd *const gUnknown_085B224C[] = {
+
+static const union AnimCmd *const gUnknown_085B224C[] =
+{
     Unknown_085B2240
 };
+
 static const struct SpriteTemplate gUnknown_085B2250 =
 {
     .tileTag = TAG_GFX_WALL_CLOCK_HAND,
@@ -161,6 +187,7 @@ static const struct SpriteTemplate gUnknown_085B2250 =
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_MinuteHand,
 };
+
 static const struct SpriteTemplate gUnknown_085B2268 =
 {
     .tileTag = TAG_GFX_WALL_CLOCK_HAND,
@@ -171,25 +198,37 @@ static const struct SpriteTemplate gUnknown_085B2268 =
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_HourHand,
 };
-static const struct OamData Unknown_085B2280 = {
+
+static const struct OamData Unknown_085B2280 =
+{
     .y = 160,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 3,
 };
-static const union AnimCmd Unknown_085B2288[] = {
+
+static const union AnimCmd Unknown_085B2288[] =
+{
     ANIMCMD_FRAME(132, 30),
     ANIMCMD_END,
 };
-static const union AnimCmd Unknown_085B2290[] = {
+
+static const union AnimCmd Unknown_085B2290[] =
+{
     ANIMCMD_FRAME(128, 30),
     ANIMCMD_END,
 };
-static const union AnimCmd *const gUnknown_085B2298[] = {
+
+static const union AnimCmd *const gUnknown_085B2298[] =
+{
     Unknown_085B2288
 };
-static const union AnimCmd *const gUnknown_085B229C[] = {
+
+static const union AnimCmd *const gUnknown_085B229C[] =
+{
     Unknown_085B2290
 };
+
 static const struct SpriteTemplate gUnknown_085B22A0 =
 {
     .tileTag = TAG_GFX_WALL_CLOCK_HAND,
@@ -200,6 +239,7 @@ static const struct SpriteTemplate gUnknown_085B22A0 =
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_AMIndicator
 };
+
 static const struct SpriteTemplate gUnknown_085B22B8 =
 {
     .tileTag = TAG_GFX_WALL_CLOCK_HAND,
@@ -210,7 +250,9 @@ static const struct SpriteTemplate gUnknown_085B22B8 =
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_PMIndicator
 };
-static const s8 sClockHandCoords[][2] = {
+
+static const s8 sClockHandCoords[][2] =
+{
     { 0x00, -0x18},
     { 0x01, -0x19},
     { 0x01, -0x19},
diff --git a/src/water.c b/src/water.c
index d13b1378e..20bf2542d 100644
--- a/src/water.c
+++ b/src/water.c
@@ -13,35 +13,33 @@
 #include "constants/battle.h"
 #include "constants/rgb.h"
 
-extern void sub_810721C(struct Sprite *);
-extern void sub_8107228(struct Sprite *);
-extern void sub_8107260(struct Sprite *);
-extern void sub_8107380(struct Sprite *);
-extern void sub_8107408(struct Sprite *);
-extern void sub_8107430(struct Sprite *);
-extern void sub_810744C(struct Sprite *);
-extern void sub_81074E4(struct Sprite *);
-extern void sub_81075EC(struct Sprite *);
-extern void sub_8107674(struct Sprite *);
-extern void sub_8107730(struct Sprite *);
-extern void sub_81077A4(struct Sprite *);
-extern void sub_81077C0(struct Sprite *);
-extern void sub_80A78AC(struct Sprite *);
-extern void sub_8107894(struct Sprite *);
-extern void sub_81078D0(struct Sprite *);
-extern void sub_810790C(struct Sprite *);
-extern void sub_8108034(struct Sprite *);
-extern void sub_8108098(struct Sprite *);
-extern void sub_810851C(struct Sprite *);
-extern void sub_81087C0(struct Sprite *);
-extern void sub_810886C(struct Sprite *);
-extern void sub_8108B2C(struct Sprite *);
-extern void sub_8108B94(struct Sprite *);
-extern void sub_8108BE0(struct Sprite *);
-extern void sub_8108C08(struct Sprite *);
-extern void sub_8108C54(struct Sprite *);
-extern void sub_8108CDC(struct Sprite *);
-extern void sub_80A8EE4(struct Sprite *);
+void sub_810721C(struct Sprite *);
+void sub_8107228(struct Sprite *);
+void sub_8107260(struct Sprite *);
+void sub_8107380(struct Sprite *);
+void sub_8107408(struct Sprite *);
+void sub_8107430(struct Sprite *);
+void sub_810744C(struct Sprite *);
+void sub_81074E4(struct Sprite *);
+void sub_81075EC(struct Sprite *);
+void sub_8107674(struct Sprite *);
+void sub_8107730(struct Sprite *);
+void sub_81077A4(struct Sprite *);
+void sub_81077C0(struct Sprite *);
+void sub_8107894(struct Sprite *);
+void sub_81078D0(struct Sprite *);
+void sub_810790C(struct Sprite *);
+void sub_8108034(struct Sprite *);
+void sub_8108098(struct Sprite *);
+void sub_810851C(struct Sprite *);
+void sub_81087C0(struct Sprite *);
+void sub_810886C(struct Sprite *);
+void sub_8108B2C(struct Sprite *);
+void sub_8108B94(struct Sprite *);
+void sub_8108BE0(struct Sprite *);
+void sub_8108C08(struct Sprite *);
+void sub_8108C54(struct Sprite *);
+void sub_8108CDC(struct Sprite *);
 void sub_810756C(u8);
 void sub_81076F4(u8);
 void sub_8107B84(u8);