Import w_037 data and normalize weapon palette (#1777)

This PR also allows to being able to import the BSS section by tweaking the linker script
Xeeynamo · Oct 11, 2024 · f015a76 · f015a76
1 parent 67a6f1c
commit f015a76
Show file tree

Hide file tree

Showing 15 changed files with 506 additions and 434 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -336,6 +336,7 @@ set(SOURCE_FILES_WEAPON
  src/weapon/w_007.c
  src/weapon/w_012.c
  src/weapon/w_034.c
+ src/weapon/w_037.c
  src/weapon/w_041.c
  src/weapon/w_045.c
  src/weapon/w_046.c
@@ -349,6 +350,7 @@ set_source_files_properties(src/weapon/w_002.c PROPERTIES COMPILE_DEFINITIONS WE
 set_source_files_properties(src/weapon/w_007.c PROPERTIES COMPILE_DEFINITIONS WEAPON_ID=w_007)
 set_source_files_properties(src/weapon/w_012.c PROPERTIES COMPILE_DEFINITIONS WEAPON_ID=w_012)
 set_source_files_properties(src/weapon/w_034.c PROPERTIES COMPILE_DEFINITIONS WEAPON_ID=w_034)
+set_source_files_properties(src/weapon/w_037.c PROPERTIES COMPILE_DEFINITIONS WEAPON_ID=w_037)
 set_source_files_properties(src/weapon/w_041.c PROPERTIES COMPILE_DEFINITIONS WEAPON_ID=w_041)
 set_source_files_properties(src/weapon/w_045.c PROPERTIES COMPILE_DEFINITIONS WEAPON_ID=w_045)
 set_source_files_properties(src/weapon/w_046.c PROPERTIES COMPILE_DEFINITIONS WEAPON_ID=w_046)

diff --git a/config/splat.us.weapon.yaml b/config/splat.us.weapon.yaml
@@ -266,7 +266,7 @@ segments:
  - [0x582B0, animset, w_012_2]
  - [0x582B0, .data, w_012]
  - [0x58ACC, c, w_012]
- - [0x59B28, sbss, w_012]
+ - [0x59B28, .bss, w_012]
  - name: f_013
  type: grey4
  start: 0x5B000
@@ -726,9 +726,9 @@ segments:
  subsegments:
  - [0x107040, animset, w_037_1]
  - [0x107504, animset, w_037_2]
- - [0x107504, data, w_037]
+ - [0x107504, .data, w_037]
  - [0x1077C4, c, w_037]
- - [0x108BE4, sbss, w_037]
+ - [0x108BE4, .bss, w_037]
  - name: f_038
  type: grey4
  start: 0x10A000
@@ -801,7 +801,7 @@ segments:
  - [0x123284, .data, w_041]
  - [0x123560, .rodata, w_041]
  - [0x123574, c, w_041]
- - [0x124200, sbss, w_041]
+ - [0x124200, .bss, w_041]
  - name: f_042
  type: grey4
  start: 0x126000
@@ -1002,7 +1002,7 @@ segments:
  - [0x170808, .data, w_052]
  - [0x170C24, .rodata, w_052]
  - [0x170CB0, c, w_052]
- - [0x172B84, sbss, w_052]
+ - [0x172B84, .bss, w_052]
  - name: f_053
  type: grey4
  start: 0x173000

diff --git a/include/weapon.h b/include/weapon.h
@@ -27,3 +27,13 @@ typedef struct {
 #define N_WEAPON_PAL 12
 extern u16 D_8006EDCC[2][N_WEAPON_PAL * PALETTE_LEN];
 #endif
+
+#ifdef VERSION_PC
+// LoadWeaponPalette reads a predetermined amount of bytes from the weapon
+// palette, often going out of the array boundaries. This is not a problem on
+// PSX, but on any other platform we need to force each weapon palette to be
+// `N_ARRAY_PAL` long to account for the extra data read.
+#define N_ARRAY_PAL LEN(*D_8006EDCC)
+#else
+#define N_ARRAY_PAL
+#endif
diff --git a/src/pc/weapon_pc.c b/src/pc/weapon_pc.c
@@ -63,19 +63,26 @@ static Weapon dummy_header = {
 
 extern Weapon w_000_header;
 extern Weapon w_002_header;
+extern Weapon w_007_header;
+extern Weapon w_012_header;
+extern Weapon w_034_header;
+extern Weapon w_037_header;
+extern Weapon w_041_header;
 extern Weapon w_046_header;
+extern Weapon w_051_header;
+extern Weapon w_052_header;
 Weapon* g_Weapons[] = {
  &w_000_header, &dummy_header, &w_002_header, &dummy_header, &dummy_header,
+ &dummy_header, &dummy_header, &w_007_header, &dummy_header, &dummy_header,
+ &dummy_header, &dummy_header, &w_012_header, &dummy_header, &dummy_header,
  &dummy_header, &dummy_header, &dummy_header, &dummy_header, &dummy_header,
  &dummy_header, &dummy_header, &dummy_header, &dummy_header, &dummy_header,
  &dummy_header, &dummy_header, &dummy_header, &dummy_header, &dummy_header,
- &dummy_header, &dummy_header, &dummy_header, &dummy_header, &dummy_header,
- &dummy_header, &dummy_header, &dummy_header, &dummy_header, &dummy_header,
- &dummy_header, &dummy_header, &dummy_header, &dummy_header, &dummy_header,
- &dummy_header, &dummy_header, &dummy_header, &dummy_header, &dummy_header,
- &dummy_header, &dummy_header, &dummy_header, &dummy_header, &dummy_header,
+ &dummy_header, &dummy_header, &dummy_header, &dummy_header, &w_034_header,
+ &dummy_header, &dummy_header, &w_037_header, &dummy_header, &dummy_header,
+ &dummy_header, &w_041_header, &dummy_header, &dummy_header, &dummy_header,
  &dummy_header, &w_046_header, &dummy_header, &dummy_header, &dummy_header,
- &dummy_header, &dummy_header, &dummy_header, &dummy_header, &dummy_header,
+ &dummy_header, &w_051_header, &w_052_header, &dummy_header, &dummy_header,
  &dummy_header, &dummy_header, &dummy_header, &dummy_header,
 };
 
@@ -115,7 +122,6 @@ int readSubsetToBuf(char* filename, char* dest, size_t start, size_t size) {
 
 void HandleWeapon0Prg(int fileId) {
  memcpy(&D_8017A000, g_Weapons[fileId], sizeof(Weapon));
- // todo animsets
 }
 
 void HandleWeapon0Chr(int fileId) {

diff --git a/src/weapon/shared.h b/src/weapon/shared.h
@@ -20,12 +20,7 @@ static void LoadWeaponPalette(s32 clutIndex) {
  return;
  }
 
- // I think dst is longer than src so this reads out of bounds
-#ifndef VERSION_PC
  for (i = 0; i < LEN(*D_8006EDCC); i++) {
-#else
- for (i = 0; i < 112; i++) {
-#endif
  *dst++ = *src++;
  }
 

diff --git a/src/weapon/w_000.c b/src/weapon/w_000.c
@@ -12,90 +12,81 @@
 #define g_Animset2 w_000_2
 #include "sfx.h"
 
-static u16 g_Clut0[] = {
- 0x0000, 0x8000, 0xA821, 0x9DC0, 0xA821, 0xA821, 0xA821, 0xA821, // 0
- 0x843F, 0xB0E4, 0x9CA4, 0x0000, 0x0000, 0x0000, 0xD294, 0xF2F3,
- 0x0000, 0x8000, 0x0000, 0x0000, 0x0000, 0xED8C, 0xED8C, 0xED8C, // 1
- 0x843F, 0xBC00, 0xBC00, 0xED8C, 0xED8C, 0xED8C, 0xD294, 0xFFFF,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xE021, 0xE021, // 2
- 0x801F, 0x9C00, 0xB800, 0xE021, 0x0000, 0x0000, 0xD294, 0xEAD3,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xA0C0, 0x0000, // 3
- 0x843F, 0x0000, 0xA800, 0x0000, 0xF608, 0x0000, 0xD294, 0xE24C,
- 0x0000, 0x8000, 0x9C00, 0x9DC0, 0x9C00, 0x9C00, 0x9C00, 0x9C00, // 4
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF2D1,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0xD400, 0xD400, 0xD400, 0xD400, // 5
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xCCA0, 0x0000, // 6
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xEA90,
-};
-
-static u16 g_Clut1[] = {
- 0x0000, 0x8007, 0xAD6B, 0xAD6B, 0xAD6B, 0xAD6B, 0xAD6B, 0xAD6B, // 0
- 0x843F, 0xB148, 0xA928, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C,
- 0x0000, 0x8007, 0x0000, 0x0000, 0x0000, 0xE717, 0xE717, 0xE717, // 1
- 0x843F, 0xA0E6, 0xA0E6, 0xE717, 0xE717, 0xE717, 0xD294, 0xF39C,
- 0x0000, 0x8007, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xB56A, 0xA927, // 2
- 0x801F, 0x9062, 0x98C6, 0xB148, 0x0000, 0x0000, 0xD294, 0xF39C,
- 0x0000, 0x8007, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xA4E6, 0x0000, // 3
- 0x843F, 0x0000, 0x9483, 0x0000, 0xA0C4, 0x0000, 0xD294, 0xF39C,
- 0x0000, 0x8007, 0x98C6, 0x9DC0, 0x98C6, 0x98C6, 0x98C6, 0x98C6, // 4
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C,
- 0x0000, 0x8007, 0x0000, 0x9DC0, 0xA94A, 0xA94A, 0xA94A, 0xA94A, // 5
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C,
- 0x0000, 0x8007, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x94A5, 0x0000, // 6
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xEB5A,
-};
-
-static u16 g_Clut2[] = {
- 0x0000, 0x8000, 0x800F, 0x800F, 0x800F, 0x800F, 0x800F, 0x800F, // 0
- 0x83E0, 0x800F, 0x8CB4, 0x0000, 0x0000, 0x0000, 0xD294, 0xCF1C,
- 0x0000, 0x8000, 0x0000, 0x0000, 0x0000, 0xA818, 0xB0B8, 0xAC38, // 1
- 0x83E0, 0x800E, 0x8450, 0x9418, 0x9418, 0x9818, 0xD294, 0xFFFF,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x8014, 0x940C, // 2
- 0x83E0, 0x8005, 0x844E, 0x807D, 0x0000, 0x0000, 0xD294, 0xE35C,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xA008, 0x0000, // 3
- 0x83E0, 0x0000, 0x8008, 0x0000, 0x806C, 0x0000, 0xD294, 0xBEBC,
- 0x0000, 0x8000, 0x800B, 0x9DC0, 0x800B, 0x800B, 0x800B, 0x800B, // 4
- 0x83E0, 0xB9C0, 0x800B, 0x0000, 0x0000, 0x0000, 0xD294, 0xAABC,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0x8011, 0x8011, 0x8011, 0x8011, // 5
- 0x83E0, 0xB9C0, 0x8011, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x8008, 0x0000, // 6
- 0x83E0, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0x9E1C,
-};
-
-static u16 g_Clut3[] = {
- 0x0000, 0x8000, 0x8900, 0x8900, 0x8900, 0x8900, 0x8902, 0x8904, // 0
- 0x843F, 0x9541, 0x95E1, 0x0000, 0x0000, 0x0000, 0xD294, 0xF2D1,
- 0x0000, 0x8000, 0x0000, 0x0000, 0x0000, 0xA208, 0xA208, 0xA208, // 1
- 0x843F, 0x9541, 0x9541, 0xA208, 0xA208, 0xA208, 0xD294, 0xF39C,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x8160, 0x8920, // 2
- 0x801F, 0x8080, 0x88E1, 0x8160, 0x0000, 0x0000, 0xD294, 0xE796,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x94A0, 0x0000, // 3
- 0x843F, 0x0000, 0x8080, 0x0000, 0xA264, 0x0000, 0xD294, 0xAB8D,
- 0x0000, 0x8000, 0x80E0, 0x80E0, 0x80E0, 0x80E0, 0x80E0, 0x80E0, // 4
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF2B2,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0x8200, 0x8200, 0x8200, 0x8200, // 5
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C,
- 0x0000, 0x8000, 0x0000, 0xA686, 0x0000, 0x0000, 0xA520, 0x0000, // 6
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xB792,
-};
-
-static u16 g_Clut4[] = {
- 0x0000, 0x8000, 0x817F, 0x81B6, 0x81DF, 0x827F, 0xA2FE, 0xD77F, // 0
- 0x843F, 0x819E, 0x9A1F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C,
- 0x0000, 0x8000, 0x0000, 0x0000, 0x0000, 0xB77D, 0xB77D, 0xB77D, // 1
- 0x843F, 0x811E, 0x811E, 0xB77D, 0xB77D, 0xB77D, 0xD294, 0xFFFF,
- 0x0000, 0x8000, 0x0000, 0x9A1F, 0x0000, 0x0000, 0x8E3F, 0x99DF, // 2
- 0x801F, 0x80B0, 0x811A, 0x9ADF, 0x0000, 0x0000, 0xD294, 0xE35C,
- 0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x80FE, 0x0000, // 3
- 0x843F, 0x0000, 0x80B1, 0x0000, 0x8157, 0x0000, 0xD294, 0xD31C,
- 0x0000, 0x8000, 0x8158, 0x81B6, 0x819B, 0x823D, 0xA2FF, 0xD31F, // 4
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C,
- 0x0000, 0x8000, 0x0000, 0xB77D, 0xB77D, 0xB77D, 0xB77D, 0xB77D, // 5
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C,
- 0x0000, 0x8000, 0x0000, 0x819E, 0x0000, 0x0000, 0x811E, 0x0000, // 6
- 0x843F, 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C,
-};
+static u16 g_Clut0[N_ARRAY_PAL][COLORS_PER_PAL] = {
+ {0x0000, 0x8000, 0xA821, 0x9DC0, 0xA821, 0xA821, 0xA821, 0xA821, 0x843F,
+ 0xB0E4, 0x9CA4, 0x0000, 0x0000, 0x0000, 0xD294, 0xF2F3},
+ {0x0000, 0x8000, 0x0000, 0x0000, 0x0000, 0xED8C, 0xED8C, 0xED8C, 0x843F,
+ 0xBC00, 0xBC00, 0xED8C, 0xED8C, 0xED8C, 0xD294, 0xFFFF},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xE021, 0xE021, 0x801F,
+ 0x9C00, 0xB800, 0xE021, 0x0000, 0x0000, 0xD294, 0xEAD3},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xA0C0, 0x0000, 0x843F,
+ 0x0000, 0xA800, 0x0000, 0xF608, 0x0000, 0xD294, 0xE24C},
+ {0x0000, 0x8000, 0x9C00, 0x9DC0, 0x9C00, 0x9C00, 0x9C00, 0x9C00, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF2D1},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0xD400, 0xD400, 0xD400, 0xD400, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xCCA0, 0x0000, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xEA90}};
+static u16 g_Clut1[N_ARRAY_PAL][COLORS_PER_PAL] = {
+ {0x0000, 0x8007, 0xAD6B, 0xAD6B, 0xAD6B, 0xAD6B, 0xAD6B, 0xAD6B, 0x843F,
+ 0xB148, 0xA928, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C},
+ {0x0000, 0x8007, 0x0000, 0x0000, 0x0000, 0xE717, 0xE717, 0xE717, 0x843F,
+ 0xA0E6, 0xA0E6, 0xE717, 0xE717, 0xE717, 0xD294, 0xF39C},
+ {0x0000, 0x8007, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xB56A, 0xA927, 0x801F,
+ 0x9062, 0x98C6, 0xB148, 0x0000, 0x0000, 0xD294, 0xF39C},
+ {0x0000, 0x8007, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xA4E6, 0x0000, 0x843F,
+ 0x0000, 0x9483, 0x0000, 0xA0C4, 0x0000, 0xD294, 0xF39C},
+ {0x0000, 0x8007, 0x98C6, 0x9DC0, 0x98C6, 0x98C6, 0x98C6, 0x98C6, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C},
+ {0x0000, 0x8007, 0x0000, 0x9DC0, 0xA94A, 0xA94A, 0xA94A, 0xA94A, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C},
+ {0x0000, 0x8007, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x94A5, 0x0000, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xEB5A}};
+static u16 g_Clut2[N_ARRAY_PAL][COLORS_PER_PAL] = {
+ {0x0000, 0x8000, 0x800F, 0x800F, 0x800F, 0x800F, 0x800F, 0x800F, 0x83E0,
+ 0x800F, 0x8CB4, 0x0000, 0x0000, 0x0000, 0xD294, 0xCF1C},
+ {0x0000, 0x8000, 0x0000, 0x0000, 0x0000, 0xA818, 0xB0B8, 0xAC38, 0x83E0,
+ 0x800E, 0x8450, 0x9418, 0x9418, 0x9818, 0xD294, 0xFFFF},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x8014, 0x940C, 0x83E0,
+ 0x8005, 0x844E, 0x807D, 0x0000, 0x0000, 0xD294, 0xE35C},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0xA008, 0x0000, 0x83E0,
+ 0x0000, 0x8008, 0x0000, 0x806C, 0x0000, 0xD294, 0xBEBC},
+ {0x0000, 0x8000, 0x800B, 0x9DC0, 0x800B, 0x800B, 0x800B, 0x800B, 0x83E0,
+ 0xB9C0, 0x800B, 0x0000, 0x0000, 0x0000, 0xD294, 0xAABC},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0x8011, 0x8011, 0x8011, 0x8011, 0x83E0,
+ 0xB9C0, 0x8011, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x8008, 0x0000, 0x83E0,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0x9E1C}};
+static u16 g_Clut3[N_ARRAY_PAL][COLORS_PER_PAL] = {
+ {0x0000, 0x8000, 0x8900, 0x8900, 0x8900, 0x8900, 0x8902, 0x8904, 0x843F,
+ 0x9541, 0x95E1, 0x0000, 0x0000, 0x0000, 0xD294, 0xF2D1},
+ {0x0000, 0x8000, 0x0000, 0x0000, 0x0000, 0xA208, 0xA208, 0xA208, 0x843F,
+ 0x9541, 0x9541, 0xA208, 0xA208, 0xA208, 0xD294, 0xF39C},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x8160, 0x8920, 0x801F,
+ 0x8080, 0x88E1, 0x8160, 0x0000, 0x0000, 0xD294, 0xE796},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x94A0, 0x0000, 0x843F,
+ 0x0000, 0x8080, 0x0000, 0xA264, 0x0000, 0xD294, 0xAB8D},
+ {0x0000, 0x8000, 0x80E0, 0x80E0, 0x80E0, 0x80E0, 0x80E0, 0x80E0, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF2B2},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0x8200, 0x8200, 0x8200, 0x8200, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C},
+ {0x0000, 0x8000, 0x0000, 0xA686, 0x0000, 0x0000, 0xA520, 0x0000, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xB792}};
+static u16 g_Clut4[N_ARRAY_PAL][COLORS_PER_PAL] = {
+ {0x0000, 0x8000, 0x817F, 0x81B6, 0x81DF, 0x827F, 0xA2FE, 0xD77F, 0x843F,
+ 0x819E, 0x9A1F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C},
+ {0x0000, 0x8000, 0x0000, 0x0000, 0x0000, 0xB77D, 0xB77D, 0xB77D, 0x843F,
+ 0x811E, 0x811E, 0xB77D, 0xB77D, 0xB77D, 0xD294, 0xFFFF},
+ {0x0000, 0x8000, 0x0000, 0x9A1F, 0x0000, 0x0000, 0x8E3F, 0x99DF, 0x801F,
+ 0x80B0, 0x811A, 0x9ADF, 0x0000, 0x0000, 0xD294, 0xE35C},
+ {0x0000, 0x8000, 0x0000, 0x9DC0, 0x0000, 0x0000, 0x80FE, 0x0000, 0x843F,
+ 0x0000, 0x80B1, 0x0000, 0x8157, 0x0000, 0xD294, 0xD31C},
+ {0x0000, 0x8000, 0x8158, 0x81B6, 0x819B, 0x823D, 0xA2FF, 0xD31F, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C},
+ {0x0000, 0x8000, 0x0000, 0xB77D, 0xB77D, 0xB77D, 0xB77D, 0xB77D, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C},
+ {0x0000, 0x8000, 0x0000, 0x819E, 0x0000, 0x0000, 0x811E, 0x0000, 0x843F,
+ 0xB9C0, 0x801F, 0x0000, 0x0000, 0x0000, 0xD294, 0xF39C}};
 
 static u8 g_Anim0Frame0[] = {
  0x01, 0x02, 0x02, 0x04, 0x03, 0x04, 0x04, 0x04, 0x05, 0x04,