Updated splat, implemented new palette system (#146)

* image_type_in_extension

* new palette extension

* global_id not found

* updated splat

* disaster

* changed wording

* fixed fall texture names

* delete bin_to_inc_c script

* forgot to rename

127 files changed, 1049 insertions, 633 deletions

diff --git a/Makefile b/Makefile
index 442c85d..8d8fa94 100644
--- a/Makefile
+++ b/Makefile
@@ -338,14 +338,10 @@ ifneq ($(PERMUTER), 1)
 endif
 
 # Build C files from assets
-$(BUILD_DIR)/%.bin: %.png
-# file names are formatted as <file name>.<image format>.png
+$(BUILD_DIR)/%.inc.c: %.png
+# File names are formatted as <file name>.<image format>.png
 # The <image format> part is passed into pigment's format argument
-	$(PIGMENT) to-bin -f $(subst .,,$(suffix $*)) -o $@ $<
-
-%.inc.c: %.bin
-# The C name argument uses just the <file name> part, with .<image format>.bin removed
-	python3 tools/bin_inc_c.py $< $@ $(basename $(basename $(notdir $<)))
+	$(PIGMENT) to-bin -f $(subst .,,$(suffix $*)) --c-array -o $@ $<
 
 # Add these as a dependency for .o files
 asset_files: $(ASSET_INC_C)
diff --git a/docs/asset_extraction.md b/docs/asset_extraction.md
index 4724d90..7c8a520 100644
--- a/docs/asset_extraction.md
+++ b/docs/asset_extraction.md
@@ -115,7 +115,7 @@ For the other textures, we need to identify what type they are. Because of how t
 

 ![](images/asset_extraction/z64utils_texture_view.png)

 

-For this object, all the textures are CI4. These use the `af_ci4` type. For I4 or I8 textures there are `af_i4` and `af_i8` types.

+For this object, all the textures are CI4. These use the `ci4` type. Other types include `i4`, `i8`, `ia4`, `ia8`, `ia16`, `ci8`, `rgba16`, or `rgba32`.

 

 At the bottom is one last unknown section. This is the model's skeleton. It's composed of a JointElemR and BaseSkeletonR. You can find the addresses for these by starting at the bottom until you find a segment address, which is a pointer to  `cKF_je_r_tol_keitai_1_tbl`. BaseSkeletonR is 8 bytes long, so count 8 bytes from the end of that address to get 0x06000A2C, which is the start of `cKF_bs_r_tol_keitai_1`. These use custom splat extensions `ckf_je` and `ckf_bs` respectively.

 

@@ -139,10 +139,10 @@ That's all the data in this object! input.csv should look like this:
 0x06000320, main1_keitai1_model, af_gfx

 0x06000480, main2_keitai1_model, af_gfx

 0x060005E8, tol_keitai_1_pal, af_palette

-0x06000608, tol_keitai_1_ueura1_tex_txt, af_ci4

-0x06000708, tol_keitai_1_ueomote1_tex_txt, af_ci4

-0x06000808, tol_keitai_1_shitaura1_tex_txt, af_ci4

-0x06000908, tol_keitai_1_shitaomote1_tex_txt, af_ci4

+0x06000608, tol_keitai_1_ueura1_tex_txt, ci4

+0x06000708, tol_keitai_1_ueomote1_tex_txt, ci4

+0x06000808, tol_keitai_1_shitaura1_tex_txt, ci4

+0x06000908, tol_keitai_1_shitaomote1_tex_txt, ci4

 0x06000A08, cKF_je_r_tol_keitai_1_tbl, ckf_je

 0x06000A2C, cKF_bs_r_tol_keitai_1, ckf_bs

 ```

@@ -169,15 +169,51 @@ One important thing to point out is `tol_keitai_1_v`. It has an extra option for
 

 `output.txt` also contains the splat segment definitions. This should be pasted into `assets.yaml`, replacing the old auto generated one.

 

-There's a few changes we need to make though. The definitions for the textures need additional arguments for splat to extract them: width, height, palette rom address, and palette size. The width and height can be found in Z64Utils, in the text above the texture preview, similar to how we found the texture's format. The palette is `tol_keitai_1_pal`, which is rom address 0x11275E8. And this palette ends at 0x1127608, which makes the size 0x20 bytes.

+### Textures

+

+Textures require a width and height argument in order to extract them. This can be found in Z64Utils in the text above the texture preview, similar to how we found the texture's format.

+

+An example from a separate object file:

+```yaml

+- [0xD66A58, i4, obj_e_count01/obj_e_count01_spot_tex_sgi_i4, 16, 16]

+```

+

+### Palette Textures

+

+Palette textures require the palette name as a third argument. In this case, we know the palette is `tol_keitai_1_pal`.

 

 ```yaml

-- [0x1127608, af_ci4, tol_keitai_1_ueura1_tex_txt, 16, 32, 0x11275E8, 0x20]

-- [0x1127708, af_ci4, tol_keitai_1_ueomote1_tex_txt, 16, 32, 0x11275E8, 0x20]

-- [0x1127808, af_ci4, tol_keitai_1_shitaura1_tex_txt, 16, 32, 0x11275E8, 0x20]

-- [0x1127908, af_ci4, tol_keitai_1_shitaomote1_tex_txt, 16, 32, 0x11275E8, 0x20]

+- [0x1127608, ci4, tol_keitai_1_ueura1_tex_txt, 16, 32, tol_keitai_1_pal]

+- [0x1127708, ci4, tol_keitai_1_ueomote1_tex_txt, 16, 32, tol_keitai_1_pal]

+- [0x1127808, ci4, tol_keitai_1_shitaura1_tex_txt, 16, 32, tol_keitai_1_pal]

+- [0x1127908, ci4, tol_keitai_1_shitaomote1_tex_txt, 16, 32, tol_keitai_1_pal]

 ```

 

+This object only has one palette and it's included in the object. However some objects use external palettes. In order to use a palette from a different object, it needs to define a `global_id`. This can only be set when the segment is in dictionary format.

+

+Here's `obj_s_house1` as an example:

+```yaml

+- { start: 0xD5B008, type: af_palette, name: obj_s_house1_a_pal, global_id: obj_s_house1_a_pal }

+- { start: 0xD5B028, type: af_palette, name: obj_s_house1_b_pal, global_id: obj_s_house1_b_pal }

+- { start: 0xD5B048, type: af_palette, name: obj_s_house1_c_pal, global_id: obj_s_house1_c_pal }

+- { start: 0xD5B068, type: af_palette, name: obj_s_house1_d_pal, global_id: obj_s_house1_d_pal }

+- { start: 0xD5B088, type: af_palette, name: obj_s_house1_e_pal, global_id: obj_s_house1_e_pal }

+```

+

+`obj_s_house1` has 5 palettes, so for the palette argument you would put a list of each of them, like this:

+```yaml

+- start: 0xD83058

+  type: ci4

+  name: obj_house/obj_s_house1_t3_tex_txt

+  width: 128

+  height: 32

+  palettes: [obj_s_house1_a_pal, obj_s_house1_b_pal, obj_s_house1_c_pal, obj_s_house1_d_pal, obj_s_house1_e_pal]   

+```

+

+Finally, these textures will be extracted as `<filename>_<palette_name>.ci4.png`. Our script generated an include statement for `<filename>.ci4.png`, so you need to update this to `obj_s_house1_t3_tex_txt_obj_s_house1_a_pal.ci4.inc.c`

+

+### Adjusting code

+

 Because we renamed the segment, we also need to adjust the DMA table and the object table, which specify where files are in the ROM.

 

 In `dmadata_table_jp.h`, rename object_01127A40 to tol_keitai_1:

@@ -237,10 +273,10 @@ To replicate this, we're going to make seperate .c files for this object. First
     - [0x1127320, af_gfx, main1_keitai1_model]

     - [0x1127480, af_gfx, main2_keitai1_model]

     - [0x11275E8, af_palette, tol_keitai_1_pal]

-    - [0x1127608, af_ci4, tol_keitai_1_ueura1_tex_txt, 16, 32, 0x11275E8, 0x20]

-    - [0x1127708, af_ci4, tol_keitai_1_ueomote1_tex_txt, 16, 32, 0x11275E8, 0x20]

-    - [0x1127808, af_ci4, tol_keitai_1_shitaura1_tex_txt, 16, 32, 0x11275E8, 0x20]

-    - [0x1127908, af_ci4, tol_keitai_1_shitaomote1_tex_txt, 16, 32, 0x11275E8, 0x20]

+    - [0x1127608, ci4, tol_keitai_1_ueura1_tex_txt, 16, 32, tol_keitai_1_pal]

+    - [0x1127708, ci4, tol_keitai_1_ueomote1_tex_txt, 16, 32, tol_keitai_1_pal]

+    - [0x1127808, ci4, tol_keitai_1_shitaura1_tex_txt, 16, 32, tol_keitai_1_pal]

+    - [0x1127908, ci4, tol_keitai_1_shitaomote1_tex_txt, 16, 32, tol_keitai_1_pal]

     - [0x1127A08, ckf_je, cKF_je_r_tol_keitai_1_tbl]

     - [0x1127A2C, ckf_bs, cKF_bs_r_tol_keitai_1]

     - [0x1127A34]

diff --git a/linker_scripts/jp/symbol_addrs_assets.txt b/linker_scripts/jp/symbol_addrs_assets.txt
index c6f8bb7..c19791c 100644
--- a/linker_scripts/jp/symbol_addrs_assets.txt
+++ b/linker_scripts/jp/symbol_addrs_assets.txt
@@ -237,11 +237,11 @@ obj_fallSE_grpBT_model = 0x6013DC0; // segment:object_00D5E000 rom:0xD71DC0
 obj_fallSE_grpDT_model = 0x6013EC0; // segment:object_00D5E000 rom:0xD71EC0
 obj_fallSE_grpCT_model = 0x6013F98; // segment:object_00D5E000 rom:0xD71F98
 obj_fallSESW_model = 0x6014080; // segment:object_00D5E000 rom:0xD72080
-obj_fallCA1_tex_rgb_ia8_2 = 0x60140A8; // segment:object_00D5E000 rom:0xD720A8 allow_duplicated:true
-obj_fallA2_tex_rgb_i4_2 = 0x60144A8; // segment:object_00D5E000 rom:0xD724A8 allow_duplicated:true
-obj_fallA3_tex_rgb_i4_2 = 0x60146A8; // segment:object_00D5E000 rom:0xD726A8 allow_duplicated:true
-obj_fallC2_tex_rgb_i4_2 = 0x6014728; // segment:object_00D5E000 rom:0xD72728 allow_duplicated:true
-obj_fallC3_tex_rgb_i4_2 = 0x6014928; // segment:object_00D5E000 rom:0xD72928 allow_duplicated:true
+obj_fallCA1_tex_rgb_ia8 = 0x60140A8; // segment:object_00D5E000 rom:0xD720A8 allow_duplicated:true
+obj_fallA2_tex_rgb_i4 = 0x60144A8; // segment:object_00D5E000 rom:0xD724A8 allow_duplicated:true
+obj_fallA3_tex_rgb_i4 = 0x60146A8; // segment:object_00D5E000 rom:0xD726A8 allow_duplicated:true
+obj_fallC2_tex_rgb_i4 = 0x6014728; // segment:object_00D5E000 rom:0xD72728 allow_duplicated:true
+obj_fallC3_tex_rgb_i4 = 0x6014928; // segment:object_00D5E000 rom:0xD72928 allow_duplicated:true
 obj_fallSE_evw_anime_1 = 0x60149A8; // segment:object_00D5E000 rom:0xD729A8
 obj_fallSE_evw_anime_2 = 0x60149B0; // segment:object_00D5E000 rom:0xD729B0
 obj_fallSE_evw_anime_3 = 0x60149B8; // segment:object_00D5E000 rom:0xD729B8
diff --git a/requirements.txt b/requirements.txt
index 34bd7cd..a0e0d80 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-splat64[mips]==0.21.9
+splat64[mips]==0.22.1
 mapfile-parser>=1.2.1,<2.0.0
 colorama
 libyaz0
diff --git a/src/objects/object_00D5E000/obj_douzou/obj_douzou.c b/src/objects/object_00D5E000/obj_douzou/obj_douzou.c
index 81d7d18..41d0b73 100644
--- a/src/objects/object_00D5E000/obj_douzou/obj_douzou.c
+++ b/src/objects/object_00D5E000/obj_douzou/obj_douzou.c
@@ -10,28 +10,72 @@ s32 padD68420[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_boy_mouth_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_boy_face_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_boy_model.gfx.inc.c"
+u8 obj_s_douzou_dai_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_dai_tex_txt.ci4.inc.c"
+};
+u8 obj_s_douzou_name_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_name_tex_txt.i4.inc.c"
+};
+u8 obj_s_douzou_b1_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_b1_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_b2_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_b2_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_b3_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_b3_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_b4_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_b4_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_b5_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_b5_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_b6_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_b6_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_b7_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_b7_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_b8_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_b8_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_bm1_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_bm1_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_bm2_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_bm2_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_g1_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_g1_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_g2_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_g2_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_g3_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_g3_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_g4_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_g4_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_g5_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_g5_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_g6_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_g6_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_g8_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_g8_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_gm1_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_gm1_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_gm2_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_gm2_tex_pic_i4.i4.inc.c"
+};
+u8 obj_s_douzou_metal_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_s_douzou_metal_tex_pic_i4.i4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_douzou/cKF_ckcb_r_obj_s_douzou_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_douzou/cKF_c_obj_s_douzou_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_douzou/cKF_ba_r_obj_s_douzou.inc.c"
@@ -47,28 +91,72 @@ s32 padD6B178[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_boy_mouth_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_boy_face_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_boy_model.gfx.inc.c"
+u8 obj_w_douzou_dai_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_dai_tex_txt.ci4.inc.c"
+};
+u8 obj_w_douzou_name_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_name_tex_txt.i4.inc.c"
+};
+u8 obj_w_douzou_b1_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_b1_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_b2_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_b2_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_b3_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_b3_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_b4_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_b4_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_b5_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_b5_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_b6_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_b6_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_b7_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_b7_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_b8_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_b8_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_bm1_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_bm1_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_bm2_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_bm2_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_g1_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_g1_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_g2_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_g2_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_g3_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_g3_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_g4_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_g4_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_g5_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_g5_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_g6_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_g6_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_g8_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_g8_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_gm1_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_gm1_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_gm2_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_gm2_tex_pic_i4.i4.inc.c"
+};
+u8 obj_w_douzou_metal_tex_pic_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_douzou/obj_w_douzou_metal_tex_pic_i4.i4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_douzou/cKF_ckcb_r_obj_w_douzou_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_douzou/cKF_c_obj_w_douzou_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_douzou/cKF_ba_r_obj_w_douzou.inc.c"
diff --git a/src/objects/object_00D5E000/obj_douzou/obj_douzou.h b/src/objects/object_00D5E000/obj_douzou/obj_douzou.h
index fc7dbb8..22bb809 100644
--- a/src/objects/object_00D5E000/obj_douzou/obj_douzou.h
+++ b/src/objects/object_00D5E000/obj_douzou/obj_douzou.h
@@ -19,28 +19,28 @@ extern Gfx obj_s_douzou_girl_model[];
 extern Gfx obj_s_douzou_boy_mouth_model[];
 extern Gfx obj_s_douzou_boy_face_model[];
 extern Gfx obj_s_douzou_boy_model[];
-extern unsigned char obj_s_douzou_dai_tex_txt[];
-extern unsigned char obj_s_douzou_name_tex_txt[];
-extern unsigned char obj_s_douzou_b1_tex_pic_i4[];
-extern unsigned char obj_s_douzou_b2_tex_pic_i4[];
-extern unsigned char obj_s_douzou_b3_tex_pic_i4[];
-extern unsigned char obj_s_douzou_b4_tex_pic_i4[];
-extern unsigned char obj_s_douzou_b5_tex_pic_i4[];
-extern unsigned char obj_s_douzou_b6_tex_pic_i4[];
-extern unsigned char obj_s_douzou_b7_tex_pic_i4[];
-extern unsigned char obj_s_douzou_b8_tex_pic_i4[];
-extern unsigned char obj_s_douzou_bm1_tex_pic_i4[];
-extern unsigned char obj_s_douzou_bm2_tex_pic_i4[];
-extern unsigned char obj_s_douzou_g1_tex_pic_i4[];
-extern unsigned char obj_s_douzou_g2_tex_pic_i4[];
-extern unsigned char obj_s_douzou_g3_tex_pic_i4[];
-extern unsigned char obj_s_douzou_g4_tex_pic_i4[];
-extern unsigned char obj_s_douzou_g5_tex_pic_i4[];
-extern unsigned char obj_s_douzou_g6_tex_pic_i4[];
-extern unsigned char obj_s_douzou_g8_tex_pic_i4[];
-extern unsigned char obj_s_douzou_gm1_tex_pic_i4[];
-extern unsigned char obj_s_douzou_gm2_tex_pic_i4[];
-extern unsigned char obj_s_douzou_metal_tex_pic_i4[];
+extern u8 obj_s_douzou_dai_tex_txt[];
+extern u8 obj_s_douzou_name_tex_txt[];
+extern u8 obj_s_douzou_b1_tex_pic_i4[];
+extern u8 obj_s_douzou_b2_tex_pic_i4[];
+extern u8 obj_s_douzou_b3_tex_pic_i4[];
+extern u8 obj_s_douzou_b4_tex_pic_i4[];
+extern u8 obj_s_douzou_b5_tex_pic_i4[];
+extern u8 obj_s_douzou_b6_tex_pic_i4[];
+extern u8 obj_s_douzou_b7_tex_pic_i4[];
+extern u8 obj_s_douzou_b8_tex_pic_i4[];
+extern u8 obj_s_douzou_bm1_tex_pic_i4[];
+extern u8 obj_s_douzou_bm2_tex_pic_i4[];
+extern u8 obj_s_douzou_g1_tex_pic_i4[];
+extern u8 obj_s_douzou_g2_tex_pic_i4[];
+extern u8 obj_s_douzou_g3_tex_pic_i4[];
+extern u8 obj_s_douzou_g4_tex_pic_i4[];
+extern u8 obj_s_douzou_g5_tex_pic_i4[];
+extern u8 obj_s_douzou_g6_tex_pic_i4[];
+extern u8 obj_s_douzou_g8_tex_pic_i4[];
+extern u8 obj_s_douzou_gm1_tex_pic_i4[];
+extern u8 obj_s_douzou_gm2_tex_pic_i4[];
+extern u8 obj_s_douzou_metal_tex_pic_i4[];
 extern u8 cKF_ckcb_r_obj_s_douzou_tbl[];
 extern s16 cKF_c_obj_s_douzou_tbl[];
 extern BaseAnimationR cKF_ba_r_obj_s_douzou;
@@ -55,28 +55,28 @@ extern Gfx obj_w_douzou_girl_model[];
 extern Gfx obj_w_douzou_boy_mouth_model[];
 extern Gfx obj_w_douzou_boy_face_model[];
 extern Gfx obj_w_douzou_boy_model[];
-extern unsigned char obj_w_douzou_dai_tex_txt[];
-extern unsigned char obj_w_douzou_name_tex_txt[];
-extern unsigned char obj_w_douzou_b1_tex_pic_i4[];
-extern unsigned char obj_w_douzou_b2_tex_pic_i4[];
-extern unsigned char obj_w_douzou_b3_tex_pic_i4[];
-extern unsigned char obj_w_douzou_b4_tex_pic_i4[];
-extern unsigned char obj_w_douzou_b5_tex_pic_i4[];
-extern unsigned char obj_w_douzou_b6_tex_pic_i4[];
-extern unsigned char obj_w_douzou_b7_tex_pic_i4[];
-extern unsigned char obj_w_douzou_b8_tex_pic_i4[];
-extern unsigned char obj_w_douzou_bm1_tex_pic_i4[];
-extern unsigned char obj_w_douzou_bm2_tex_pic_i4[];
-extern unsigned char obj_w_douzou_g1_tex_pic_i4[];
-extern unsigned char obj_w_douzou_g2_tex_pic_i4[];
-extern unsigned char obj_w_douzou_g3_tex_pic_i4[];
-extern unsigned char obj_w_douzou_g4_tex_pic_i4[];
-extern unsigned char obj_w_douzou_g5_tex_pic_i4[];
-extern unsigned char obj_w_douzou_g6_tex_pic_i4[];
-extern unsigned char obj_w_douzou_g8_tex_pic_i4[];
-extern unsigned char obj_w_douzou_gm1_tex_pic_i4[];
-extern unsigned char obj_w_douzou_gm2_tex_pic_i4[];
-extern unsigned char obj_w_douzou_metal_tex_pic_i4[];
+extern u8 obj_w_douzou_dai_tex_txt[];
+extern u8 obj_w_douzou_name_tex_txt[];
+extern u8 obj_w_douzou_b1_tex_pic_i4[];
+extern u8 obj_w_douzou_b2_tex_pic_i4[];
+extern u8 obj_w_douzou_b3_tex_pic_i4[];
+extern u8 obj_w_douzou_b4_tex_pic_i4[];
+extern u8 obj_w_douzou_b5_tex_pic_i4[];
+extern u8 obj_w_douzou_b6_tex_pic_i4[];
+extern u8 obj_w_douzou_b7_tex_pic_i4[];
+extern u8 obj_w_douzou_b8_tex_pic_i4[];
+extern u8 obj_w_douzou_bm1_tex_pic_i4[];
+extern u8 obj_w_douzou_bm2_tex_pic_i4[];
+extern u8 obj_w_douzou_g1_tex_pic_i4[];
+extern u8 obj_w_douzou_g2_tex_pic_i4[];
+extern u8 obj_w_douzou_g3_tex_pic_i4[];
+extern u8 obj_w_douzou_g4_tex_pic_i4[];
+extern u8 obj_w_douzou_g5_tex_pic_i4[];
+extern u8 obj_w_douzou_g6_tex_pic_i4[];
+extern u8 obj_w_douzou_g8_tex_pic_i4[];
+extern u8 obj_w_douzou_gm1_tex_pic_i4[];
+extern u8 obj_w_douzou_gm2_tex_pic_i4[];
+extern u8 obj_w_douzou_metal_tex_pic_i4[];
 extern u8 cKF_ckcb_r_obj_w_douzou_tbl[];
 extern s16 cKF_c_obj_w_douzou_tbl[];
 extern BaseAnimationR cKF_ba_r_obj_w_douzou;
diff --git a/src/objects/object_00D5E000/obj_dump/obj_dump.c b/src/objects/object_00D5E000/obj_dump/obj_dump.c
index 53a1da8..d085e6b 100644
--- a/src/objects/object_00D5E000/obj_dump/obj_dump.c
+++ b/src/objects/object_00D5E000/obj_dump/obj_dump.c
@@ -5,12 +5,20 @@ s32 padD6DEE0[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_dump/obj_s_dump_t1T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_dump/obj_s_dump_t2T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_dump/dump_s_DL_model.gfx.inc.c"
+u8 obj_s_dump_t1_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_dump/obj_s_dump_t1_tex.ci4.inc.c"
+};
+u8 obj_s_dump_t2_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_dump/obj_s_dump_t2_tex.ci4.inc.c"
+};
 s32 padD6F4D0[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_dump/obj_w_dump_v.vtx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_dump/obj_w_dump_t1T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_dump/obj_w_dump_t2T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_dump/dump_w_DL_model.gfx.inc.c"
+u8 obj_w_dump_t1_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_dump/obj_w_dump_t1_tex.ci4.inc.c"
+};
+u8 obj_w_dump_t2_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_dump/obj_w_dump_t2_tex.ci4.inc.c"
+};
diff --git a/src/objects/object_00D5E000/obj_dump/obj_dump.h b/src/objects/object_00D5E000/obj_dump/obj_dump.h
index 214c252..a91ea62 100644
--- a/src/objects/object_00D5E000/obj_dump/obj_dump.h
+++ b/src/objects/object_00D5E000/obj_dump/obj_dump.h
@@ -12,13 +12,13 @@ extern Vtx obj_s_dump_v[];
 extern Gfx obj_s_dump_t1T_model[];
 extern Gfx obj_s_dump_t2T_model[];
 extern Gfx dump_s_DL_model[];
-extern unsigned char obj_s_dump_t1_tex[];
-extern unsigned char obj_s_dump_t2_tex[];
+extern u8 obj_s_dump_t1_tex[];
+extern u8 obj_s_dump_t2_tex[];
 extern Vtx obj_w_dump_v[];
 extern Gfx obj_w_dump_t1T_model[];
 extern Gfx obj_w_dump_t2T_model[];
 extern Gfx dump_w_DL_model[];
-extern unsigned char obj_w_dump_t1_tex[];
-extern unsigned char obj_w_dump_t2_tex[];
+extern u8 obj_w_dump_t1_tex[];
+extern u8 obj_w_dump_t2_tex[];
 
 #endif
diff --git a/src/objects/object_00D5E000/obj_e_count01/obj_e_count01.c b/src/objects/object_00D5E000/obj_e_count01/obj_e_count01.c
index 89d43f9..ebdaee6 100644
--- a/src/objects/object_00D5E000/obj_e_count01/obj_e_count01.c
+++ b/src/objects/object_00D5E000/obj_e_count01/obj_e_count01.c
@@ -9,10 +9,18 @@ s32 padD64830[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_e_count01/obj_e_count_back_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_count01/obj_e_count_new_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_count01/obj_e_count_down_model.gfx.inc.c"
+u8 obj_e_count_t1_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count01/obj_e_count_t1_tex_txt.ci4.inc.c"
+};
+u8 obj_e_count_t2_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count01/obj_e_count_t2_tex_txt.ci4.inc.c"
+};
+u8 obj_e_count_t3_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count01/obj_e_count_t3_tex_txt.ci4.inc.c"
+};
+u8 obj_e_count01_spot_tex_sgi_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count01/obj_e_count01_spot_tex_sgi_i4.i4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_e_count01/cKF_je_r_obj_e_count01_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_count01/cKF_bs_r_obj_e_count01.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_count01/cKF_ckcb_r_obj_e_count01_tbl.inc.c"
diff --git a/src/objects/object_00D5E000/obj_e_count01/obj_e_count01.h b/src/objects/object_00D5E000/obj_e_count01/obj_e_count01.h
index 7a98029..f510465 100644
--- a/src/objects/object_00D5E000/obj_e_count01/obj_e_count01.h
+++ b/src/objects/object_00D5E000/obj_e_count01/obj_e_count01.h
@@ -7,7 +7,7 @@
 
 /**
  * @file obj_e_count01
- * New years day countdown clock
+ * New years countdown clock
  */
 
 extern Vtx obj_e_count01_v[];
@@ -18,10 +18,10 @@ extern Gfx obj_e_count_baloon_model[];
 extern Gfx obj_e_count_back_model[];
 extern Gfx obj_e_count_new_model[];
 extern Gfx obj_e_count_down_model[];
-extern unsigned char obj_e_count_t1_tex_txt[];
-extern unsigned char obj_e_count_t2_tex_txt[];
-extern unsigned char obj_e_count_t3_tex_txt[];
-extern unsigned char obj_e_count01_spot_tex_sgi_i4[];
+extern u8 obj_e_count_t1_tex_txt[];
+extern u8 obj_e_count_t2_tex_txt[];
+extern u8 obj_e_count_t3_tex_txt[];
+extern u8 obj_e_count01_spot_tex_sgi_i4[];
 extern JointElemR cKF_je_r_obj_e_count01_tbl[];
 extern BaseSkeletonR cKF_bs_r_obj_e_count01;
 extern u8 cKF_ckcb_r_obj_e_count01_tbl[];
diff --git a/src/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_cl.c b/src/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_cl.c
index 9d36a18..c9b23ed 100644
--- a/src/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_cl.c
+++ b/src/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_cl.c
@@ -4,16 +4,36 @@ s32 padD66C90[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_cl_v.vtx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_c2_ani_cl01_sita_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_c2_ani_ci01_mae_model.gfx.inc.c"
+u8 obj_e_count02_1_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_1_tex.ci4.inc.c"
+};
+u8 obj_e_count02_0_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_0_tex.ci4.inc.c"
+};
+u8 obj_e_count02_2_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_2_tex.ci4.inc.c"
+};
+u8 obj_e_count02_3_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_3_tex.ci4.inc.c"
+};
+u8 obj_e_count02_4_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_4_tex.ci4.inc.c"
+};
+u8 obj_e_count02_5_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_5_tex.ci4.inc.c"
+};
+u8 obj_e_count02_6_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_6_tex.ci4.inc.c"
+};
+u8 obj_e_count02_7_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_7_tex.ci4.inc.c"
+};
+u8 obj_e_count02_8_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_8_tex.ci4.inc.c"
+};
+u8 obj_e_count02_9_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_9_tex.ci4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/cKF_je_r_obj_e_count02_cl_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/cKF_bs_r_obj_e_count02_cl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_count02_cl/cKF_ckcb_r_obj_e_count02_cl_tbl.inc.c"
diff --git a/src/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_cl.h b/src/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_cl.h
index 819503c..fa88e41 100644
--- a/src/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_cl.h
+++ b/src/objects/object_00D5E000/obj_e_count02_cl/obj_e_count02_cl.h
@@ -6,22 +6,22 @@
 
 /**
  * @file obj_e_count02_cl
- * New years day countdown clock numbers
+ * New years countdown clock numbers
  */
 
 extern Vtx obj_e_count02_cl_v[];
 extern Gfx obj_e_c2_ani_cl01_sita_model[];
 extern Gfx obj_e_c2_ani_ci01_mae_model[];
-extern unsigned char obj_e_count02_1_tex[];
-extern unsigned char obj_e_count02_0_tex[];
-extern unsigned char obj_e_count02_2_tex[];
-extern unsigned char obj_e_count02_3_tex[];
-extern unsigned char obj_e_count02_4_tex[];
-extern unsigned char obj_e_count02_5_tex[];
-extern unsigned char obj_e_count02_6_tex[];
-extern unsigned char obj_e_count02_7_tex[];
-extern unsigned char obj_e_count02_8_tex[];
-extern unsigned char obj_e_count02_9_tex[];
+extern u8 obj_e_count02_1_tex[];
+extern u8 obj_e_count02_0_tex[];
+extern u8 obj_e_count02_2_tex[];
+extern u8 obj_e_count02_3_tex[];
+extern u8 obj_e_count02_4_tex[];
+extern u8 obj_e_count02_5_tex[];
+extern u8 obj_e_count02_6_tex[];
+extern u8 obj_e_count02_7_tex[];
+extern u8 obj_e_count02_8_tex[];
+extern u8 obj_e_count02_9_tex[];
 extern JointElemR cKF_je_r_obj_e_count02_cl_tbl[];
 extern BaseSkeletonR cKF_bs_r_obj_e_count02_cl;
 extern u8 cKF_ckcb_r_obj_e_count02_cl_tbl[];
diff --git a/src/objects/object_00D5E000/obj_e_goza/obj_e_goza.c b/src/objects/object_00D5E000/obj_e_goza/obj_e_goza.c
index f1a0a81..895ecef 100644
--- a/src/objects/object_00D5E000/obj_e_goza/obj_e_goza.c
+++ b/src/objects/object_00D5E000/obj_e_goza/obj_e_goza.c
@@ -6,6 +6,12 @@ s32 padD729F0[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_e_goza/obj_e_goza_t1T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_goza/obj_e_goza_t3T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_goza/goza_DL_model.gfx.inc.c"
+u8 obj_e_goza_t1_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_goza/obj_e_goza_t1_tex.ci4.inc.c"
+};
+u8 obj_e_goza_t2_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_goza/obj_e_goza_t2_tex.ci4.inc.c"
+};
+u8 obj_e_goza_t3_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_goza/obj_e_goza_t3_tex.ci4.inc.c"
+};
diff --git a/src/objects/object_00D5E000/obj_e_goza/obj_e_goza.h b/src/objects/object_00D5E000/obj_e_goza/obj_e_goza.h
index 0a796a6..6ce1bdd 100644
--- a/src/objects/object_00D5E000/obj_e_goza/obj_e_goza.h
+++ b/src/objects/object_00D5E000/obj_e_goza/obj_e_goza.h
@@ -13,8 +13,8 @@ extern Gfx obj_e_goza_t2T_model[];
 extern Gfx obj_e_goza_t1T_model[];
 extern Gfx obj_e_goza_t3T_model[];
 extern Gfx goza_DL_model[];
-extern unsigned char obj_e_goza_t1_tex[];
-extern unsigned char obj_e_goza_t2_tex[];
-extern unsigned char obj_e_goza_t3_tex[];
+extern u8 obj_e_goza_t1_tex[];
+extern u8 obj_e_goza_t2_tex[];
+extern u8 obj_e_goza_t3_tex[];
 
 #endif
diff --git a/src/objects/object_00D5E000/obj_e_kago/obj_e_kago.c b/src/objects/object_00D5E000/obj_e_kago/obj_e_kago.c
index 0b04c4c..2a07e4a 100644
--- a/src/objects/object_00D5E000/obj_e_kago/obj_e_kago.c
+++ b/src/objects/object_00D5E000/obj_e_kago/obj_e_kago.c
@@ -5,21 +5,33 @@ s32 padD74A40[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_r_t1T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_r_t2T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/kago_r_DL_model.gfx.inc.c"
+u8 obj_e_kago_r_t1_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_r_t1_tex.ci4.inc.c"
+};
+u8 obj_e_kago_r_t2_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_r_t2_tex.ci4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_r_ball_v.vtx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_r_ball_t1T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/kago_r_ball_DL_model.gfx.inc.c"
+u8 obj_e_kago_r_ball_t1_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_r_ball_t1_tex.ci4.inc.c"
+};
 s32 padD76A30[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_w_v.vtx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_w_t1T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_w_t2T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/kago_w_DL_model.gfx.inc.c"
+u8 obj_e_kago_w_t1_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_w_t1_tex.ci4.inc.c"
+};
+u8 obj_e_kago_w_t2_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_w_t2_tex.ci4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_w_ball_v.vtx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_w_ball_t1T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/kago_w_ball_DL_model.gfx.inc.c"
+u8 obj_e_kago_w_ball_t1_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_kago/obj_e_kago_w_ball_t1_tex.ci4.inc.c"
+};
 s32 padD789F0[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
diff --git a/src/objects/object_00D5E000/obj_e_kago/obj_e_kago.h b/src/objects/object_00D5E000/obj_e_kago/obj_e_kago.h
index 970bfe1..e01a4eb 100644
--- a/src/objects/object_00D5E000/obj_e_kago/obj_e_kago.h
+++ b/src/objects/object_00D5E000/obj_e_kago/obj_e_kago.h
@@ -12,21 +12,21 @@ extern Vtx obj_e_kago_r_v[];
 extern Gfx obj_e_kago_r_t1T_model[];
 extern Gfx obj_e_kago_r_t2T_model[];
 extern Gfx kago_r_DL_model[];
-extern unsigned char obj_e_kago_r_t1_tex[];
-extern unsigned char obj_e_kago_r_t2_tex[];
+extern u8 obj_e_kago_r_t1_tex[];
+extern u8 obj_e_kago_r_t2_tex[];
 extern Vtx obj_e_kago_r_ball_v[];
 extern Gfx obj_e_kago_r_ball_t1T_model[];
 extern Gfx kago_r_ball_DL_model[];
-extern unsigned char obj_e_kago_r_ball_t1_tex[];
+extern u8 obj_e_kago_r_ball_t1_tex[];
 extern Vtx obj_e_kago_w_v[];
 extern Gfx obj_e_kago_w_t1T_model[];
 extern Gfx obj_e_kago_w_t2T_model[];
 extern Gfx kago_w_DL_model[];
-extern unsigned char obj_e_kago_w_t1_tex[];
-extern unsigned char obj_e_kago_w_t2_tex[];
+extern u8 obj_e_kago_w_t1_tex[];
+extern u8 obj_e_kago_w_t2_tex[];
 extern Vtx obj_e_kago_w_ball_v[];
 extern Gfx obj_e_kago_w_ball_t1T_model[];
 extern Gfx kago_w_ball_DL_model[];
-extern unsigned char obj_e_kago_w_ball_t1_tex[];
+extern u8 obj_e_kago_w_ball_t1_tex[];
 
 #endif
diff --git a/src/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori.c b/src/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori.c
index 12dc47a..2a6a4ec 100644
--- a/src/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori.c
+++ b/src/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori.c
@@ -14,8 +14,12 @@ s32 padD7AAE0[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori_fukiB_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori_fukiC_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori_yaguruma_model.gfx.inc.c"
+u8 obj_e_koinobori_t1_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori_t1_tex_txt.ci4.inc.c"
+};
+u8 obj_e_koinobori_t3_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori_t3_tex_txt.ci4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_e_koinobori/cKF_je_r_obj_e_koinobori_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_koinobori/cKF_bs_r_obj_e_koinobori.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_koinobori/cKF_ckcb_r_obj_e_koinobori_tbl.inc.c"
diff --git a/src/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori.h b/src/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori.h
index 9903c6f..a27c5d2 100644
--- a/src/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori.h
+++ b/src/objects/object_00D5E000/obj_e_koinobori/obj_e_koinobori.h
@@ -26,8 +26,8 @@ extern Gfx obj_e_koinobori_fukiB_model[];
 extern Gfx obj_e_koinobori_fukiC_model[];
 // 矢車 Spinning wheel at the top of the pole
 extern Gfx obj_e_koinobori_yaguruma_model[];
-extern unsigned char obj_e_koinobori_t1_tex_txt[];
-extern unsigned char obj_e_koinobori_t3_tex_txt[];
+extern u8 obj_e_koinobori_t1_tex_txt[];
+extern u8 obj_e_koinobori_t3_tex_txt[];
 extern JointElemR cKF_je_r_obj_e_koinobori_tbl[];
 extern BaseSkeletonR cKF_bs_r_obj_e_koinobori;
 extern u8 cKF_ckcb_r_obj_e_koinobori_tbl[];
diff --git a/src/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox.c b/src/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox.c
index ead45b7..c01763d 100644
--- a/src/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox.c
+++ b/src/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox.c
@@ -3,7 +3,11 @@
 s32 padD7EFE0[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox_v.vtx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox_model.gfx.inc.c"
+u8 obj_e_mikanbox_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox_tex.ci4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox_copyrightT_model.gfx.inc.c"
+u8 copyright_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_mikanbox/copyright_tex.i4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox_copyrightT_model2.gfx.inc.c"
diff --git a/src/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox.h b/src/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox.h
index 58e81ef..a95eb82 100644
--- a/src/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox.h
+++ b/src/objects/object_00D5E000/obj_e_mikanbox/obj_e_mikanbox.h
@@ -12,9 +12,9 @@
 
 extern Vtx obj_e_mikanbox_v[];
 extern Gfx obj_e_mikanbox_model[];
-extern unsigned char obj_e_mikanbox_tex[];
+extern u8 obj_e_mikanbox_tex[];
 extern Gfx obj_e_mikanbox_copyrightT_model[];
-extern unsigned char copyright_tex[];
+extern u8 copyright_tex[];
 extern Gfx obj_e_mikanbox_copyrightT_model2[];
 
 #endif
diff --git a/src/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji.c b/src/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji.c
index d1cd2ea..3188d2d 100644
--- a/src/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji.c
+++ b/src/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji.c
@@ -6,6 +6,12 @@ s32 padD7FEE0[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji_t1T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji_t2T_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_e_mikuji/mikuji_DL_model.gfx.inc.c"
+u8 obj_e_mikuji_t1_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji_t1_tex.ci4.inc.c"
+};
+u8 obj_e_mikuji_t2_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji_t2_tex.ci4.inc.c"
+};
+u8 obj_e_mikuji_t3_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji_t3_tex.ci4.inc.c"
+};
diff --git a/src/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji.h b/src/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji.h
index 5fd0316..b102c2e 100644
--- a/src/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji.h
+++ b/src/objects/object_00D5E000/obj_e_mikuji/obj_e_mikuji.h
@@ -5,7 +5,7 @@
 
 /**
  * @file obj_e_mikuji
- * おみくじ　The desk that Katrina sets up on New Years Day to give out fortune slips
+ * おみくじ The desk that Katrina sets up on New Years Day to give out fortune slips
  */
 
 extern Vtx obj_e_mikuji_v[];
@@ -13,8 +13,8 @@ extern Gfx obj_e_mikuji_t3_model[];
 extern Gfx obj_e_mikuji_t1T_model[];
 extern Gfx obj_e_mikuji_t2T_model[];
 extern Gfx mikuji_DL_model[];
-extern unsigned char obj_e_mikuji_t1_tex[];
-extern unsigned char obj_e_mikuji_t2_tex[];
-extern unsigned char obj_e_mikuji_t3_tex[];
+extern u8 obj_e_mikuji_t1_tex[];
+extern u8 obj_e_mikuji_t2_tex[];
+extern u8 obj_e_mikuji_t3_tex[];
 
 #endif
diff --git a/src/objects/object_00D5E000/obj_fallS/obj_fallS.c b/src/objects/object_00D5E000/obj_fallS/obj_fallS.c
index d0a773c..6f9ef73 100644
--- a/src/objects/object_00D5E000/obj_fallS/obj_fallS.c
+++ b/src/objects/object_00D5E000/obj_fallS/obj_fallS.c
@@ -7,11 +7,21 @@ s32 padD70AD0[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_fallS/obj_fallS_grpDT_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_fallS/obj_fallS_grpCT_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_fallS/obj_fallS_model.gfx.inc.c"
+u8 obj_fallCA1_tex_rgb_ia8[] = {
 #include "assets/jp/objects/object_00D5E000/obj_fallS/obj_fallCA1_tex_rgb_ia8.ia8.inc.c"
+};
+u8 obj_fallA2_tex_rgb_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_fallS/obj_fallA2_tex_rgb_i4.i4.inc.c"
+};
+u8 obj_fallA3_tex_rgb_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_fallS/obj_fallA3_tex_rgb_i4.i4.inc.c"
+};
+u8 obj_fallC2_tex_rgb_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_fallS/obj_fallC2_tex_rgb_i4.i4.inc.c"
+};
+u8 obj_fallC3_tex_rgb_i4[] = {
 #include "assets/jp/objects/object_00D5E000/obj_fallS/obj_fallC3_tex_rgb_i4.i4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_fallS/obj_fallS_evw_anime_1.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_fallS/obj_fallS_evw_anime_2.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_fallS/obj_fallS_evw_anime_3.inc.c"
diff --git a/src/objects/object_00D5E000/obj_fallS/obj_fallS.h b/src/objects/object_00D5E000/obj_fallS/obj_fallS.h
index 0d89fdf..3259fdb 100644
--- a/src/objects/object_00D5E000/obj_fallS/obj_fallS.h
+++ b/src/objects/object_00D5E000/obj_fallS/obj_fallS.h
@@ -15,11 +15,11 @@ extern Gfx obj_fallS_grpBT_model[];
 extern Gfx obj_fallS_grpDT_model[];
 extern Gfx obj_fallS_grpCT_model[];
 extern Gfx obj_fallS_model[];
-extern unsigned char obj_fallCA1_tex_rgb_ia8[];
-extern unsigned char obj_fallA2_tex_rgb_i4[];
-extern unsigned char obj_fallA3_tex_rgb_i4[];
-extern unsigned char obj_fallC2_tex_rgb_i4[];
-extern unsigned char obj_fallC3_tex_rgb_i4[];
+extern u8 obj_fallCA1_tex_rgb_ia8[];
+extern u8 obj_fallA2_tex_rgb_i4[];
+extern u8 obj_fallA3_tex_rgb_i4[];
+extern u8 obj_fallC2_tex_rgb_i4[];
+extern u8 obj_fallC3_tex_rgb_i4[];
 extern EvwAnimeScroll obj_fallS_evw_anime_1[];
 extern EvwAnimeScroll obj_fallS_evw_anime_2[];
 extern EvwAnimeScroll obj_fallS_evw_anime_3[];
diff --git a/src/objects/object_00D5E000/obj_fallSE/obj_fallSE.c b/src/objects/object_00D5E000/obj_fallSE/obj_fallSE.c
index db64f7e..5422b46 100644
--- a/src/objects/object_00D5E000/obj_fallSE/obj_fallSE.c
+++ b/src/objects/object_00D5E000/obj_fallSE/obj_fallSE.c
@@ -7,11 +7,21 @@ s32 padD71A60[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallSE_grpDT_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallSE_grpCT_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallSESW_model.gfx.inc.c"
-#include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallCA1_tex_rgb_ia8_2.ia8.inc.c"
-#include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallA2_tex_rgb_i4_2.i4.inc.c"
-#include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallA3_tex_rgb_i4_2.i4.inc.c"
-#include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallC2_tex_rgb_i4_2.i4.inc.c"
-#include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallC3_tex_rgb_i4_2.i4.inc.c"
+static u8 obj_fallCA1_tex_rgb_ia8[] = {
+#include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallCA1_tex_rgb_ia8.ia8.inc.c"
+};
+static u8 obj_fallA2_tex_rgb_i4[] = {
+#include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallA2_tex_rgb_i4.i4.inc.c"
+};
+static u8 obj_fallA3_tex_rgb_i4[] = {
+#include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallA3_tex_rgb_i4.i4.inc.c"
+};
+static u8 obj_fallC2_tex_rgb_i4[] = {
+#include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallC2_tex_rgb_i4.i4.inc.c"
+};
+static u8 obj_fallC3_tex_rgb_i4[] = {
+#include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallC3_tex_rgb_i4.i4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallSE_evw_anime_1.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallSE_evw_anime_2.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_fallSE/obj_fallSE_evw_anime_3.inc.c"
diff --git a/src/objects/object_00D5E000/obj_fallSE/obj_fallSE.h b/src/objects/object_00D5E000/obj_fallSE/obj_fallSE.h
index 922325d..59301f0 100644
--- a/src/objects/object_00D5E000/obj_fallSE/obj_fallSE.h
+++ b/src/objects/object_00D5E000/obj_fallSE/obj_fallSE.h
@@ -15,11 +15,11 @@ extern Gfx obj_fallSE_grpBT_model[];
 extern Gfx obj_fallSE_grpDT_model[];
 extern Gfx obj_fallSE_grpCT_model[];
 extern Gfx obj_fallSESW_model[];
-extern unsigned char obj_fallCA1_tex_rgb_ia8_2[];
-extern unsigned char obj_fallA2_tex_rgb_i4_2[];
-extern unsigned char obj_fallA3_tex_rgb_i4_2[];
-extern unsigned char obj_fallC2_tex_rgb_i4_2[];
-extern unsigned char obj_fallC3_tex_rgb_i4_2[];
+static u8 obj_fallCA1_tex_rgb_ia8[1024];
+static u8 obj_fallA2_tex_rgb_i4[512];
+static u8 obj_fallA3_tex_rgb_i4[128];
+static u8 obj_fallC2_tex_rgb_i4[512];
+static u8 obj_fallC3_tex_rgb_i4[128];
 extern EvwAnimeScroll obj_fallSE_evw_anime_1[];
 extern EvwAnimeScroll obj_fallSE_evw_anime_2[];
 extern EvwAnimeScroll obj_fallSE_evw_anime_3[];
diff --git a/src/objects/object_00D5E000/obj_house/obj_house.c b/src/objects/object_00D5E000/obj_house/obj_house.c
index 64798a6..877f16c 100644
--- a/src/objects/object_00D5E000/obj_house/obj_house.c
+++ b/src/objects/object_00D5E000/obj_house/obj_house.c
@@ -9,11 +9,21 @@ s32 padD81BB0[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_house/obj_s_house1_t2_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_house/obj_s_house1_t1_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_house/obj_s_house1_door_model.gfx.inc.c"
+u8 obj_s_house1_t1_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_house/obj_s_house1_t1_tex_txt.ci4.inc.c"
+};
+u8 obj_s_house1_window_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_house/obj_s_house1_window_txt.i4.inc.c"
-#include "assets/jp/objects/object_00D5E000/obj_house/obj_s_house1_t3_tex_txt.ci4.inc.c"
-#include "assets/jp/objects/object_00D5E000/obj_house/obj_s_house1_t2_tex_txt.ci4.inc.c"
+};
+u8 obj_s_house1_t3_tex_txt[] = {
+#include "assets/jp/objects/object_00D5E000/obj_house/obj_s_house1_t3_tex_txt_obj_s_house1_a_pal.ci4.inc.c"
+};
+u8 obj_s_house1_t2_tex_txt[] = {
+#include "assets/jp/objects/object_00D5E000/obj_house/obj_s_house1_t2_tex_txt_obj_s_house1_a_pal.ci4.inc.c"
+};
+u8 obj_s_house1_t4_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_house/obj_s_house1_t4_tex_txt.ci4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_house/cKF_je_r_obj_s_house1_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_house/cKF_bs_r_obj_s_house1.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_house/cKF_ckcb_r_obj_s_house1_tbl.inc.c"
diff --git a/src/objects/object_00D5E000/obj_house/obj_house.h b/src/objects/object_00D5E000/obj_house/obj_house.h
index 8d969f6..8b45bf9 100644
--- a/src/objects/object_00D5E000/obj_house/obj_house.h
+++ b/src/objects/object_00D5E000/obj_house/obj_house.h
@@ -17,11 +17,11 @@ extern Gfx obj_s_house1_t3_model[];
 extern Gfx obj_s_house1_t2_model[];
 extern Gfx obj_s_house1_t1_model[];
 extern Gfx obj_s_house1_door_model[];
-extern unsigned char obj_s_house1_t1_tex_txt[];
-extern unsigned char obj_s_house1_window_txt[];
-extern unsigned char obj_s_house1_t3_tex_txt[];
-extern unsigned char obj_s_house1_t2_tex_txt[];
-extern unsigned char obj_s_house1_t4_tex_txt[];
+extern u8 obj_s_house1_t1_tex_txt[];
+extern u8 obj_s_house1_window_txt[];
+extern u8 obj_s_house1_t3_tex_txt[];
+extern u8 obj_s_house1_t2_tex_txt[];
+extern u8 obj_s_house1_t4_tex_txt[];
 extern JointElemR cKF_je_r_obj_s_house1_tbl[];
 extern BaseSkeletonR cKF_bs_r_obj_s_house1;
 extern u8 cKF_ckcb_r_obj_s_house1_tbl[];
diff --git a/src/objects/object_00D5E000/obj_lotus/obj_lotus.c b/src/objects/object_00D5E000/obj_lotus/obj_lotus.c
index b154ee7..33b091e 100644
--- a/src/objects/object_00D5E000/obj_lotus/obj_lotus.c
+++ b/src/objects/object_00D5E000/obj_lotus/obj_lotus.c
@@ -11,8 +11,12 @@ s32 padD7D6F0[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_lotus/obj_s_lotus_leafC_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_lotus/obj_s_lotus_leafB_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_lotus/obj_s_lotus_leafA_model.gfx.inc.c"
+u8 obj_lotus_flower_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_lotus/obj_lotus_flower_tex_txt.ci4.inc.c"
+};
+u8 obj_lotus_leaf_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_lotus/obj_lotus_leaf_tex_txt.ci4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_lotus/cKF_je_r_obj_s_lotus_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_lotus/cKF_bs_r_obj_s_lotus.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_lotus/cKF_ckcb_r_obj_s_lotus_tbl.inc.c"
diff --git a/src/objects/object_00D5E000/obj_lotus/obj_lotus.h b/src/objects/object_00D5E000/obj_lotus/obj_lotus.h
index ec211c4..40b493b 100644
--- a/src/objects/object_00D5E000/obj_lotus/obj_lotus.h
+++ b/src/objects/object_00D5E000/obj_lotus/obj_lotus.h
@@ -19,8 +19,8 @@ extern Gfx obj_s_lotus_leafD_model[];
 extern Gfx obj_s_lotus_leafC_model[];
 extern Gfx obj_s_lotus_leafB_model[];
 extern Gfx obj_s_lotus_leafA_model[];
-extern unsigned char obj_lotus_flower_tex_txt[];
-extern unsigned char obj_lotus_leaf_tex_txt[];
+extern u8 obj_lotus_flower_tex_txt[];
+extern u8 obj_lotus_leaf_tex_txt[];
 extern JointElemR cKF_je_r_obj_s_lotus_tbl[];
 extern BaseSkeletonR cKF_bs_r_obj_s_lotus;
 extern u8 cKF_ckcb_r_obj_s_lotus_tbl[];
diff --git a/src/objects/object_00D5E000/obj_uranai/obj_uranai.c b/src/objects/object_00D5E000/obj_uranai/obj_uranai.c
index a441385..fad5d30 100644
--- a/src/objects/object_00D5E000/obj_uranai/obj_uranai.c
+++ b/src/objects/object_00D5E000/obj_uranai/obj_uranai.c
@@ -8,9 +8,15 @@ s32 padD61440[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_s_uranai_light_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_s_uranai_doorA_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_s_uranai_doorB_model.gfx.inc.c"
+u8 obj_s_uranai_t2_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_s_uranai_t2_tex_txt.ci4.inc.c"
+};
+u8 obj_s_uranai_window_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_s_uranai_window_tex_txt.i4.inc.c"
+};
+u8 obj_s_uranai_t1_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_s_uranai_t1_tex_txt.ci4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_uranai/cKF_je_r_obj_s_uranai_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_uranai/cKF_bs_r_obj_s_uranai.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_uranai/cKF_ckcb_r_obj_s_uranai_tbl.inc.c"
@@ -26,9 +32,15 @@ s32 padD62E2C[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_w_uranai_light_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_w_uranai_doorA_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_w_uranai_doorB_model.gfx.inc.c"
+u8 obj_w_uranai_t2_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_w_uranai_t2_tex_txt.ci4.inc.c"
+};
+u8 obj_w_uranai_window_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_w_uranai_window_tex_txt.i4.inc.c"
+};
+u8 obj_w_uranai_t1_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_uranai/obj_w_uranai_t1_tex_txt.ci4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_uranai/cKF_je_r_obj_w_uranai_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_uranai/cKF_bs_r_obj_w_uranai.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_uranai/cKF_ckcb_r_obj_w_uranai_tbl.inc.c"
diff --git a/src/objects/object_00D5E000/obj_uranai/obj_uranai.h b/src/objects/object_00D5E000/obj_uranai/obj_uranai.h
index e130697..7576afe 100644
--- a/src/objects/object_00D5E000/obj_uranai/obj_uranai.h
+++ b/src/objects/object_00D5E000/obj_uranai/obj_uranai.h
@@ -16,9 +16,9 @@ extern Gfx obj_s_uranai_t1_model[];
 extern Gfx obj_s_uranai_light_model[];
 extern Gfx obj_s_uranai_doorA_model[];
 extern Gfx obj_s_uranai_doorB_model[];
-extern unsigned char obj_s_uranai_t2_tex_txt[];
-extern unsigned char obj_s_uranai_window_tex_txt[];
-extern unsigned char obj_s_uranai_t1_tex_txt[];
+extern u8 obj_s_uranai_t2_tex_txt[];
+extern u8 obj_s_uranai_window_tex_txt[];
+extern u8 obj_s_uranai_t1_tex_txt[];
 extern JointElemR cKF_je_r_obj_s_uranai_tbl[];
 extern BaseSkeletonR cKF_bs_r_obj_s_uranai;
 extern u8 cKF_ckcb_r_obj_s_uranai_tbl[];
@@ -33,9 +33,9 @@ extern Gfx obj_w_uranai_t1_model[];
 extern Gfx obj_w_uranai_light_model[];
 extern Gfx obj_w_uranai_doorA_model[];
 extern Gfx obj_w_uranai_doorB_model[];
-extern unsigned char obj_w_uranai_t2_tex_txt[];
-extern unsigned char obj_w_uranai_window_tex_txt[];
-extern unsigned char obj_w_uranai_t1_tex_txt[];
+extern u8 obj_w_uranai_t2_tex_txt[];
+extern u8 obj_w_uranai_window_tex_txt[];
+extern u8 obj_w_uranai_t1_tex_txt[];
 extern JointElemR cKF_je_r_obj_w_uranai_tbl[];
 extern BaseSkeletonR cKF_bs_r_obj_w_uranai;
 extern u8 cKF_ckcb_r_obj_w_uranai_tbl[];
diff --git a/src/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura.c b/src/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura.c
index ea7fc1b..80e152a 100644
--- a/src/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura.c
+++ b/src/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura.c
@@ -8,7 +8,15 @@ s32 padD78A00[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura_t1_onT_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura_t3_onT_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_w_kamakura/kamakura_DL_model.gfx.inc.c"
+u8 obj_w_kamakura_t1_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura_t1_tex.ci4.inc.c"
+};
+u8 obj_w_kamakura_t2_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura_t2_tex.ci4.inc.c"
+};
+u8 obj_w_kamakura_t3_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura_t3_tex.ci4.inc.c"
+};
+u8 obj_w_kamakura_light02_tex[] = {
 #include "assets/jp/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura_light02_tex.i4.inc.c"
+};
diff --git a/src/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura.h b/src/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura.h
index b9fae4c..97793ba 100644
--- a/src/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura.h
+++ b/src/objects/object_00D5E000/obj_w_kamakura/obj_w_kamakura.h
@@ -15,9 +15,9 @@ extern Gfx obj_w_kamakura_window_model[];
 extern Gfx obj_w_kamakura_t1_onT_model[];
 extern Gfx obj_w_kamakura_t3_onT_model[];
 extern Gfx kamakura_DL_model[];
-extern unsigned char obj_w_kamakura_t1_tex[];
-extern unsigned char obj_w_kamakura_t2_tex[];
-extern unsigned char obj_w_kamakura_t3_tex[];
-extern unsigned char obj_w_kamakura_light02_tex[];
+extern u8 obj_w_kamakura_t1_tex[];
+extern u8 obj_w_kamakura_t2_tex[];
+extern u8 obj_w_kamakura_t3_tex[];
+extern u8 obj_w_kamakura_light02_tex[];
 
 #endif
diff --git a/src/objects/object_00D5E000/obj_yamishop/obj_yamishop.c b/src/objects/object_00D5E000/obj_yamishop/obj_yamishop.c
index 74fb707..9b6db2b 100644
--- a/src/objects/object_00D5E000/obj_yamishop/obj_yamishop.c
+++ b/src/objects/object_00D5E000/obj_yamishop/obj_yamishop.c
@@ -7,9 +7,15 @@ s32 padD5E000[] = { 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_s_yamishop_light_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_s_yamishop_door1_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_s_yamishop_door2_model.gfx.inc.c"
+u8 obj_s_yamishop_t2_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_s_yamishop_t2_tex_txt.ci4.inc.c"
+};
+u8 obj_s_yamishop_t1_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_s_yamishop_t1_tex_txt.ci4.inc.c"
+};
+u8 obj_s_yamishop_window_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_s_yamishop_window_tex_txt.i4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/cKF_je_r_obj_s_yamishop_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/cKF_bs_r_obj_s_yamishop.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/cKF_ckcb_r_obj_s_yamishop_tbl.inc.c"
@@ -24,9 +30,15 @@ s32 padD5FA18[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 };
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_w_yamishop_light_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_w_yamishop_door1_model.gfx.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_w_yamishop_door2_model.gfx.inc.c"
+u8 obj_w_yamishop_t2_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_w_yamishop_t2_tex_txt.ci4.inc.c"
+};
+u8 obj_w_yamishop_t1_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_w_yamishop_t1_tex_txt.ci4.inc.c"
+};
+u8 obj_w_yamishop_window_tex_txt[] = {
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/obj_w_yamishop_window_tex_txt.i4.inc.c"
+};
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/cKF_je_r_obj_w_yamishop_tbl.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/cKF_bs_r_obj_w_yamishop.inc.c"
 #include "assets/jp/objects/object_00D5E000/obj_yamishop/cKF_ckcb_r_obj_w_yamishop_tbl.inc.c"
diff --git a/src/objects/object_00D5E000/obj_yamishop/obj_yamishop.h b/src/objects/object_00D5E000/obj_yamishop/obj_yamishop.h
index 955fc65..3d3dee2 100644
--- a/src/objects/object_00D5E000/obj_yamishop/obj_yamishop.h
+++ b/src/objects/object_00D5E000/obj_yamishop/obj_yamishop.h
@@ -4,20 +4,15 @@
 #include "gbi.h"
 #include "c_keyframe.h"
 
-/**
- * @file obj_yamishop
- * 闇ショップ Crazy Redd's tent
- */
-
 extern Vtx obj_s_yamishop_v[];
 extern Gfx obj_s_yamishop_window_model[];
 extern Gfx obj_s_yamishop_t1_model[];
 extern Gfx obj_s_yamishop_light_model[];
 extern Gfx obj_s_yamishop_door1_model[];
 extern Gfx obj_s_yamishop_door2_model[];
-extern unsigned char obj_s_yamishop_t2_tex_txt[];
-extern unsigned char obj_s_yamishop_t1_tex_txt[];
-extern unsigned char obj_s_yamishop_window_tex_txt[];
+extern u8 obj_s_yamishop_t2_tex_txt[];
+extern u8 obj_s_yamishop_t1_tex_txt[];
+extern u8 obj_s_yamishop_window_tex_txt[];
 extern JointElemR cKF_je_r_obj_s_yamishop_tbl[];
 extern BaseSkeletonR cKF_bs_r_obj_s_yamishop;
 extern u8 cKF_ckcb_r_obj_s_yamishop_tbl[];
@@ -31,9 +26,9 @@ extern Gfx obj_w_yamishop_t1_model[];
 extern Gfx obj_w_yamishop_light_model[];
 extern Gfx obj_w_yamishop_door1_model[];
 extern Gfx obj_w_yamishop_door2_model[];
-extern unsigned char obj_w_yamishop_t2_tex_txt[];
-extern unsigned char obj_w_yamishop_t1_tex_txt[];
-extern unsigned char obj_w_yamishop_window_tex_txt[];
+extern u8 obj_w_yamishop_t2_tex_txt[];
+extern u8 obj_w_yamishop_t1_tex_txt[];
+extern u8 obj_w_yamishop_window_tex_txt[];
 extern JointElemR cKF_je_r_obj_w_yamishop_tbl[];
 extern BaseSkeletonR cKF_bs_r_obj_w_yamishop;
 extern u8 cKF_ckcb_r_obj_w_yamishop_tbl[];
diff --git a/src/objects/tol_cracker_1/tol_cracker_1.c b/src/objects/tol_cracker_1/tol_cracker_1.c
index d37af15..5e6979c 100644
--- a/src/objects/tol_cracker_1/tol_cracker_1.c
+++ b/src/objects/tol_cracker_1/tol_cracker_1.c
@@ -3,4 +3,6 @@
 #include "assets/jp/objects/tol_cracker_1/tol_cracker_1_v.vtx.inc.c"
 #include "assets/jp/objects/tol_cracker_1/tol_cracker_1T_model.gfx.inc.c"
 #include "assets/jp/objects/tol_cracker_1/tol_cracker_1_pal.palette.inc.c"
+u8 tol_cracker_1_tex[] = {
 #include "assets/jp/objects/tol_cracker_1/tol_cracker_1_tex.ci4.inc.c"
+};
diff --git a/src/objects/tol_cracker_1/tol_cracker_1.h b/src/objects/tol_cracker_1/tol_cracker_1.h
index 50c1c26..e0b257f 100644
--- a/src/objects/tol_cracker_1/tol_cracker_1.h
+++ b/src/objects/tol_cracker_1/tol_cracker_1.h
@@ -10,7 +10,7 @@
 
 extern Vtx tol_cracker_1_v[];
 extern Gfx tol_cracker_1T_model[];
-extern unsigned short tol_cracker_1_pal[];
-extern unsigned char tol_cracker_1_tex[];
+extern u16 tol_cracker_1_pal[];
+extern u8 tol_cracker_1_tex[];
 
 #endif
diff --git a/src/objects/tol_hata_01/tol_hata_01.c b/src/objects/tol_hata_01/tol_hata_01.c
index bb07458..45134c0 100644
--- a/src/objects/tol_hata_01/tol_hata_01.c
+++ b/src/objects/tol_hata_01/tol_hata_01.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_hata_01/tol_hata_e_model.gfx.inc.c"
 #include "assets/jp/objects/tol_hata_01/tol_hata_hataT_model.gfx.inc.c"
 #include "assets/jp/objects/tol_hata_01/tol_hata_e_pal.palette.inc.c"
+u8 tol_hata_e_tex[] = {
 #include "assets/jp/objects/tol_hata_01/tol_hata_e_tex.ci4.inc.c"
+};
+u8 tol_hata_hata_tex_inta_ia8[] = {
 #include "assets/jp/objects/tol_hata_01/tol_hata_hata_tex_inta_ia8.ia8.inc.c"
+};
diff --git a/src/objects/tol_hata_01/tol_hata_01.h b/src/objects/tol_hata_01/tol_hata_01.h
index c17ca49..1ad4554 100644
--- a/src/objects/tol_hata_01/tol_hata_01.h
+++ b/src/objects/tol_hata_01/tol_hata_01.h
@@ -12,9 +12,9 @@
 extern Vtx tol_hata_01_v[];
 extern Gfx tol_hata_e_model[];
 extern Gfx tol_hata_hataT_model[];
-extern unsigned short tol_hata_e_pal[];
-extern unsigned char tol_hata_e_tex[];
-extern unsigned char tol_hata_hata_tex_inta_ia8[];
+extern u16 tol_hata_e_pal[];
+extern u8 tol_hata_e_tex[];
+extern u8 tol_hata_hata_tex_inta_ia8[];
 extern void* tol_hata_01_evw_anime_1_tex_table;
 extern u8 tol_hata_01_evw_anime_1_anime_ptn[];
 extern EvwAnimeTexAnime tol_hata_01_evw_anime_1;
diff --git a/src/objects/tol_kamicup/tol_kamicup.c b/src/objects/tol_kamicup/tol_kamicup.c
index dc239cf..8d2b0df 100644
--- a/src/objects/tol_kamicup/tol_kamicup.c
+++ b/src/objects/tol_kamicup/tol_kamicup.c
@@ -3,4 +3,6 @@
 #include "assets/jp/objects/tol_kamicup/tol_kamicup_1_v.vtx.inc.c"
 #include "assets/jp/objects/tol_kamicup/tol_kamicup_1T_model.gfx.inc.c"
 #include "assets/jp/objects/tol_kamicup/tol_kamicup_pal.palette.inc.c"
+u8 tol_kamicup_tex[] = {
 #include "assets/jp/objects/tol_kamicup/tol_kamicup_tex.ci4.inc.c"
+};
diff --git a/src/objects/tol_kamicup/tol_kamicup.h b/src/objects/tol_kamicup/tol_kamicup.h
index 752b763..e6ebfb6 100644
--- a/src/objects/tol_kamicup/tol_kamicup.h
+++ b/src/objects/tol_kamicup/tol_kamicup.h
@@ -10,7 +10,7 @@
 
 extern Vtx tol_kamicup_1_v[];
 extern Gfx tol_kamicup_1T_model[];
-extern unsigned short tol_kamicup_pal[];
-extern unsigned char tol_kamicup_tex[];
+extern u16 tol_kamicup_pal[];
+extern u8 tol_kamicup_tex[];
 
 #endif
diff --git a/src/objects/tol_keitai_1/tol_keitai_1.c b/src/objects/tol_keitai_1/tol_keitai_1.c
index e5e6637..641b81e 100644
--- a/src/objects/tol_keitai_1/tol_keitai_1.c
+++ b/src/objects/tol_keitai_1/tol_keitai_1.c
@@ -4,9 +4,17 @@
 #include "assets/jp/objects/tol_keitai_1/main1_keitai1_model.gfx.inc.c"
 #include "assets/jp/objects/tol_keitai_1/main2_keitai1_model.gfx.inc.c"
 #include "assets/jp/objects/tol_keitai_1/tol_keitai_1_pal.palette.inc.c"
+u8 tol_keitai_1_ueura1_tex_txt[] = {
 #include "assets/jp/objects/tol_keitai_1/tol_keitai_1_ueura1_tex_txt.ci4.inc.c"
+};
+u8 tol_keitai_1_ueomote1_tex_txt[] = {
 #include "assets/jp/objects/tol_keitai_1/tol_keitai_1_ueomote1_tex_txt.ci4.inc.c"
+};
+u8 tol_keitai_1_shitaura1_tex_txt[] = {
 #include "assets/jp/objects/tol_keitai_1/tol_keitai_1_shitaura1_tex_txt.ci4.inc.c"
+};
+u8 tol_keitai_1_shitaomote1_tex_txt[] = {
 #include "assets/jp/objects/tol_keitai_1/tol_keitai_1_shitaomote1_tex_txt.ci4.inc.c"
+};
 #include "assets/jp/objects/tol_keitai_1/cKF_je_r_tol_keitai_1_tbl.inc.c"
 #include "assets/jp/objects/tol_keitai_1/cKF_bs_r_tol_keitai_1.inc.c"
diff --git a/src/objects/tol_keitai_1/tol_keitai_1.h b/src/objects/tol_keitai_1/tol_keitai_1.h
index 00aa025..782aa28 100644
--- a/src/objects/tol_keitai_1/tol_keitai_1.h
+++ b/src/objects/tol_keitai_1/tol_keitai_1.h
@@ -22,15 +22,15 @@ extern BaseAnimationR cKF_ba_r_tol_keitai_1_keitai_on1;
 extern Vtx tol_keitai_1_v[];
 extern Gfx main1_keitai1_model[];
 extern Gfx main2_keitai1_model[];
-extern unsigned short tol_keitai_1_pal[];
+extern u16 tol_keitai_1_pal[];
 // 上裏 Top half back side
-extern unsigned char tol_keitai_1_ueura1_tex_txt[];
+extern u8 tol_keitai_1_ueura1_tex_txt[];
 // 上面 Top half front side
-extern unsigned char tol_keitai_1_ueomote1_tex_txt[];
+extern u8 tol_keitai_1_ueomote1_tex_txt[];
 // 下裏 Bottom half back side
-extern unsigned char tol_keitai_1_shitaura1_tex_txt[];
+extern u8 tol_keitai_1_shitaura1_tex_txt[];
 // 下面 Bottom half front side
-extern unsigned char tol_keitai_1_shitaomote1_tex_txt[];
+extern u8 tol_keitai_1_shitaomote1_tex_txt[];
 extern JointElemR cKF_je_r_tol_keitai_1_tbl[];
 extern BaseSkeletonR cKF_bs_r_tol_keitai_1;
 
diff --git a/src/objects/tol_kenjyu_1/tol_kenjyu_1.c b/src/objects/tol_kenjyu_1/tol_kenjyu_1.c
index a4f6a17..7436e6e 100644
--- a/src/objects/tol_kenjyu_1/tol_kenjyu_1.c
+++ b/src/objects/tol_kenjyu_1/tol_kenjyu_1.c
@@ -3,4 +3,6 @@
 #include "assets/jp/objects/tol_kenjyu_1/tol_kenjyu_1_v.vtx.inc.c"
 #include "assets/jp/objects/tol_kenjyu_1/tol_kenjyu_1T_model.gfx.inc.c"
 #include "assets/jp/objects/tol_kenjyu_1/tol_kenjyu_1_pal.palette.inc.c"
+u8 tol_kenjyu_1_tex[] = {
 #include "assets/jp/objects/tol_kenjyu_1/tol_kenjyu_1_tex.ci4.inc.c"
+};
diff --git a/src/objects/tol_kenjyu_1/tol_kenjyu_1.h b/src/objects/tol_kenjyu_1/tol_kenjyu_1.h
index da805f3..6ff6af8 100644
--- a/src/objects/tol_kenjyu_1/tol_kenjyu_1.h
+++ b/src/objects/tol_kenjyu_1/tol_kenjyu_1.h
@@ -10,7 +10,7 @@
 
 extern Vtx tol_kenjyu_1_v[];
 extern Gfx tol_kenjyu_1T_model[];
-extern unsigned short tol_kenjyu_1_pal[];
-extern unsigned char tol_kenjyu_1_tex[];
+extern u16 tol_kenjyu_1_pal[];
+extern u8 tol_kenjyu_1_tex[];
 
 #endif
diff --git a/src/objects/tol_npcsao_1/tol_npcsao_1.c b/src/objects/tol_npcsao_1/tol_npcsao_1.c
index b340f14..8da6487 100644
--- a/src/objects/tol_npcsao_1/tol_npcsao_1.c
+++ b/src/objects/tol_npcsao_1/tol_npcsao_1.c
@@ -4,4 +4,6 @@
 #include "assets/jp/objects/tol_npcsao_1/tol_npcsao_1_sao_model.gfx.inc.c"
 #include "assets/jp/objects/tol_npcsao_1/tol_npcsao_1_uki_model.gfx.inc.c"
 #include "assets/jp/objects/tol_npcsao_1/tol_npcsao_1_pal.palette.inc.c"
+u8 tol_npcsao_1_tex[] = {
 #include "assets/jp/objects/tol_npcsao_1/tol_npcsao_1_tex.ci4.inc.c"
+};
diff --git a/src/objects/tol_npcsao_1/tol_npcsao_1.h b/src/objects/tol_npcsao_1/tol_npcsao_1.h
index deb8b10..ac7e0bc 100644
--- a/src/objects/tol_npcsao_1/tol_npcsao_1.h
+++ b/src/objects/tol_npcsao_1/tol_npcsao_1.h
@@ -12,7 +12,7 @@ extern Vtx tol_npcsao_1_v[];
 extern Gfx tol_npcsao_1_sao_model[];
 // 浮き Fishing Bobber
 extern Gfx tol_npcsao_1_uki_model[];
-extern unsigned short tol_npcsao_1_pal[];
-extern unsigned char tol_npcsao_1_tex[];
+extern u16 tol_npcsao_1_pal[];
+extern u8 tol_npcsao_1_tex[];
 
 #endif
diff --git a/src/objects/tol_tamaire/ef_tamaire01.c b/src/objects/tol_tamaire/ef_tamaire01.c
index 6843a6c..f0e97a4 100644
--- a/src/objects/tol_tamaire/ef_tamaire01.c
+++ b/src/objects/tol_tamaire/ef_tamaire01.c
@@ -3,5 +3,9 @@
 #include "assets/jp/objects/tol_tamaire/ef_tamaire01_r_v.vtx.inc.c"
 #include "assets/jp/objects/tol_tamaire/tama01_model.gfx.inc.c"
 #include "assets/jp/objects/tol_tamaire/ef_tamaire01_r_pal.palette.inc.c"
+u8 tama01_r_tex[] = {
 #include "assets/jp/objects/tol_tamaire/tama01_r_tex.ci4.inc.c"
+};
+u8 tama01_w_tex[] = {
 #include "assets/jp/objects/tol_tamaire/tama01_w_tex.ci4.inc.c"
+};
diff --git a/src/objects/tol_tamaire/tol_tamaire.c b/src/objects/tol_tamaire/tol_tamaire.c
index 713e17c..2104d69 100644
--- a/src/objects/tol_tamaire/tol_tamaire.c
+++ b/src/objects/tol_tamaire/tol_tamaire.c
@@ -3,9 +3,21 @@
 #include "assets/jp/objects/tol_tamaire/tol_tamaire_v.vtx.inc.c"
 #include "assets/jp/objects/tol_tamaire/tol_tamaire_model.gfx.inc.c"
 #include "assets/jp/objects/tol_tamaire/tol_tamaire_pal.palette.inc.c"
+u8 tol_tamaire_r1_tex[] = {
 #include "assets/jp/objects/tol_tamaire/tol_tamaire_r1_tex.ci4.inc.c"
+};
+u8 tol_tamaire_r2_tex[] = {
 #include "assets/jp/objects/tol_tamaire/tol_tamaire_r2_tex.ci4.inc.c"
+};
+u8 tol_tamaire_r3_tex[] = {
 #include "assets/jp/objects/tol_tamaire/tol_tamaire_r3_tex.ci4.inc.c"
+};
+u8 tol_tamaire_w1_tex[] = {
 #include "assets/jp/objects/tol_tamaire/tol_tamaire_w1_tex.ci4.inc.c"
+};
+u8 tol_tamaire_w2_tex[] = {
 #include "assets/jp/objects/tol_tamaire/tol_tamaire_w2_tex.ci4.inc.c"
+};
+u8 tol_tamaire_w3_tex[] = {
 #include "assets/jp/objects/tol_tamaire/tol_tamaire_w3_tex.ci4.inc.c"
+};
diff --git a/src/objects/tol_tamaire/tol_tamaire.h b/src/objects/tol_tamaire/tol_tamaire.h
index f617e84..bdcde8e 100644
--- a/src/objects/tol_tamaire/tol_tamaire.h
+++ b/src/objects/tol_tamaire/tol_tamaire.h
@@ -10,17 +10,17 @@
 
 extern Vtx ef_tamaire01_r_v[];
 extern Gfx tama01_model[];
-extern unsigned short ef_tamaire01_r_pal[];
-extern unsigned char tama01_r_tex[];
-extern unsigned char tama01_w_tex[];
+extern u16 ef_tamaire01_r_pal[];
+extern u8 tama01_r_tex[];
+extern u8 tama01_w_tex[];
 extern Vtx tol_tamaire_v[];
 extern Gfx tol_tamaire_model[];
-extern unsigned short tol_tamaire_pal[];
-extern unsigned char tol_tamaire_r1_tex[];
-extern unsigned char tol_tamaire_r2_tex[];
-extern unsigned char tol_tamaire_r3_tex[];
-extern unsigned char tol_tamaire_w1_tex[];
-extern unsigned char tol_tamaire_w2_tex[];
-extern unsigned char tol_tamaire_w3_tex[];
+extern u16 tol_tamaire_pal[];
+extern u8 tol_tamaire_r1_tex[];
+extern u8 tol_tamaire_r2_tex[];
+extern u8 tol_tamaire_r3_tex[];
+extern u8 tol_tamaire_w1_tex[];
+extern u8 tol_tamaire_w2_tex[];
+extern u8 tol_tamaire_w3_tex[];
 
 #endif
diff --git a/src/objects/tol_umb_01/tol_umb_01.c b/src/objects/tol_umb_01/tol_umb_01.c
index d27edb1..1186daf 100644
--- a/src/objects/tol_umb_01/tol_umb_01.c
+++ b/src/objects/tol_umb_01/tol_umb_01.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_01/kasa_umb01_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_01/e_umb01_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_01/tol_umb_01_pal.palette.inc.c"
+u8 tol_umb_01_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_01/tol_umb_01_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_01_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_01/tol_umb_01_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_01/tol_umb_01.h b/src/objects/tol_umb_01/tol_umb_01.h
index 398358a..9179336 100644
--- a/src/objects/tol_umb_01/tol_umb_01.h
+++ b/src/objects/tol_umb_01/tol_umb_01.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_01_v[];
 extern Gfx kasa_umb01_model[];
 extern Gfx e_umb01_model[];
-extern unsigned short tol_umb_01_pal[];
-extern unsigned char tol_umb_01_kasa_tex_txt[];
-extern unsigned char tol_umb_01_tuka_tex_txt[];
+extern u16 tol_umb_01_pal[];
+extern u8 tol_umb_01_kasa_tex_txt[];
+extern u8 tol_umb_01_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_02/tol_umb_02.c b/src/objects/tol_umb_02/tol_umb_02.c
index 129e65e..8803e18 100644
--- a/src/objects/tol_umb_02/tol_umb_02.c
+++ b/src/objects/tol_umb_02/tol_umb_02.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_02/kasa_umb02_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_02/e_umb02_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_02/tol_umb02_pal.palette.inc.c"
+u8 tol_umb02_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_02/tol_umb02_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb02_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_02/tol_umb02_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb02_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_02/tol_umb02_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_02/tol_umb_02.h b/src/objects/tol_umb_02/tol_umb_02.h
index 385b37a..530c023 100644
--- a/src/objects/tol_umb_02/tol_umb_02.h
+++ b/src/objects/tol_umb_02/tol_umb_02.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_02_v[];
 extern Gfx kasa_umb02_model[];
 extern Gfx e_umb02_model[];
-extern unsigned short tol_umb02_pal[];
-extern unsigned char tol_umb02_kasa2_tex_txt[];
-extern unsigned char tol_umb02_kasa1_tex_txt[];
-extern unsigned char tol_umb02_tuka_tex_txt[];
+extern u16 tol_umb02_pal[];
+extern u8 tol_umb02_kasa2_tex_txt[];
+extern u8 tol_umb02_kasa1_tex_txt[];
+extern u8 tol_umb02_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_03/tol_umb_03.c b/src/objects/tol_umb_03/tol_umb_03.c
index 669391d..ac1eaa5 100644
--- a/src/objects/tol_umb_03/tol_umb_03.c
+++ b/src/objects/tol_umb_03/tol_umb_03.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_03/kasa_umb03_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_03/e_umb03_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_03/tol_umb_03_pal.palette.inc.c"
+u8 tol_umb_03_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_03/tol_umb_03_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_03_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_03/tol_umb_03_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_03/tol_umb_03.h b/src/objects/tol_umb_03/tol_umb_03.h
index 37d625d..407ad3d 100644
--- a/src/objects/tol_umb_03/tol_umb_03.h
+++ b/src/objects/tol_umb_03/tol_umb_03.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_03_v[];
 extern Gfx kasa_umb03_model[];
 extern Gfx e_umb03_model[];
-extern unsigned short tol_umb_03_pal[];
-extern unsigned char tol_umb_03_kasa1_tex_txt[];
-extern unsigned char tol_umb_03_tuka_tex_txt[];
+extern u16 tol_umb_03_pal[];
+extern u8 tol_umb_03_kasa1_tex_txt[];
+extern u8 tol_umb_03_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_04/tol_umb_04.c b/src/objects/tol_umb_04/tol_umb_04.c
index bab0c42..e0a878b 100644
--- a/src/objects/tol_umb_04/tol_umb_04.c
+++ b/src/objects/tol_umb_04/tol_umb_04.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_04/kasa_umb04_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_04/e_umb04_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_04/tol_umb_04_pal.palette.inc.c"
+u8 tol_umb_04_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_04/tol_umb_04_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_04_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_04/tol_umb_04_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_04_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_04/tol_umb_04_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_04/tol_umb_04.h b/src/objects/tol_umb_04/tol_umb_04.h
index e1e4638..906786f 100644
--- a/src/objects/tol_umb_04/tol_umb_04.h
+++ b/src/objects/tol_umb_04/tol_umb_04.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_04_v[];
 extern Gfx kasa_umb04_model[];
 extern Gfx e_umb04_model[];
-extern unsigned short tol_umb_04_pal[];
-extern unsigned char tol_umb_04_kasa1_tex_txt[];
-extern unsigned char tol_umb_04_kasa2_tex_txt[];
-extern unsigned char tol_umb_04_tuka_tex_txt[];
+extern u16 tol_umb_04_pal[];
+extern u8 tol_umb_04_kasa1_tex_txt[];
+extern u8 tol_umb_04_kasa2_tex_txt[];
+extern u8 tol_umb_04_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_05/tol_umb_05.c b/src/objects/tol_umb_05/tol_umb_05.c
index 17eb5fc..7a7080f 100644
--- a/src/objects/tol_umb_05/tol_umb_05.c
+++ b/src/objects/tol_umb_05/tol_umb_05.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_05/kasa_umb05_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_05/e_umb05_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_05/tol_umb_05_pal.palette.inc.c"
+u8 tol_umb_05_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_05/tol_umb_05_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_05_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_05/tol_umb_05_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_05/tol_umb_05.h b/src/objects/tol_umb_05/tol_umb_05.h
index 003b725..3b79ff4 100644
--- a/src/objects/tol_umb_05/tol_umb_05.h
+++ b/src/objects/tol_umb_05/tol_umb_05.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_05_v[];
 extern Gfx kasa_umb05_model[];
 extern Gfx e_umb05_model[];
-extern unsigned short tol_umb_05_pal[];
-extern unsigned char tol_umb_05_kasa_tex_txt[];
-extern unsigned char tol_umb_05_tuka_tex_txt[];
+extern u16 tol_umb_05_pal[];
+extern u8 tol_umb_05_kasa_tex_txt[];
+extern u8 tol_umb_05_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_06/tol_umb_06.c b/src/objects/tol_umb_06/tol_umb_06.c
index 990f169..6398b87 100644
--- a/src/objects/tol_umb_06/tol_umb_06.c
+++ b/src/objects/tol_umb_06/tol_umb_06.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_06/kasa_umb06_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_06/e_umb06_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_06/tol_umb_06_pal.palette.inc.c"
+u8 tol_umb_06_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_06/tol_umb_06_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_06_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_06/tol_umb_06_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_06/tol_umb_06.h b/src/objects/tol_umb_06/tol_umb_06.h
index 485ab45..f6cdb5f 100644
--- a/src/objects/tol_umb_06/tol_umb_06.h
+++ b/src/objects/tol_umb_06/tol_umb_06.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_06_v[];
 extern Gfx kasa_umb06_model[];
 extern Gfx e_umb06_model[];
-extern unsigned short tol_umb_06_pal[];
-extern unsigned char tol_umb_06_kasa1_tex_txt[];
-extern unsigned char tol_umb_06_tuka_tex_txt[];
+extern u16 tol_umb_06_pal[];
+extern u8 tol_umb_06_kasa1_tex_txt[];
+extern u8 tol_umb_06_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_07/tol_umb_07.c b/src/objects/tol_umb_07/tol_umb_07.c
index b2ed9cf..5945cab 100644
--- a/src/objects/tol_umb_07/tol_umb_07.c
+++ b/src/objects/tol_umb_07/tol_umb_07.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_07/kasa_umb07_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_07/e_umb07_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_07/tol_umb07_pal.palette.inc.c"
+u8 tol_umb07_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_07/tol_umb07_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb07_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_07/tol_umb07_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb07_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_07/tol_umb07_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_07/tol_umb_07.h b/src/objects/tol_umb_07/tol_umb_07.h
index 6d62f58..53b5030 100644
--- a/src/objects/tol_umb_07/tol_umb_07.h
+++ b/src/objects/tol_umb_07/tol_umb_07.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_07_v[];
 extern Gfx kasa_umb07_model[];
 extern Gfx e_umb07_model[];
-extern unsigned short tol_umb07_pal[];
-extern unsigned char tol_umb07_kasa2_tex_txt[];
-extern unsigned char tol_umb07_kasa1_tex_txt[];
-extern unsigned char tol_umb07_tuka_tex_txt[];
+extern u16 tol_umb07_pal[];
+extern u8 tol_umb07_kasa2_tex_txt[];
+extern u8 tol_umb07_kasa1_tex_txt[];
+extern u8 tol_umb07_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_08/tol_umb_08.c b/src/objects/tol_umb_08/tol_umb_08.c
index 4dcd752..d2059b8 100644
--- a/src/objects/tol_umb_08/tol_umb_08.c
+++ b/src/objects/tol_umb_08/tol_umb_08.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_08/kasa_umb08_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_08/e_umb08_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_08/tol_umb08_pal.palette.inc.c"
+u8 tol_umb08_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_08/tol_umb08_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb08_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_08/tol_umb08_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb08_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_08/tol_umb08_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_08/tol_umb_08.h b/src/objects/tol_umb_08/tol_umb_08.h
index 074e70b..bd0d581 100644
--- a/src/objects/tol_umb_08/tol_umb_08.h
+++ b/src/objects/tol_umb_08/tol_umb_08.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_08_v[];
 extern Gfx kasa_umb08_model[];
 extern Gfx e_umb08_model[];
-extern unsigned short tol_umb08_pal[];
-extern unsigned char tol_umb08_kasa1_tex_txt[];
-extern unsigned char tol_umb08_kasa2_tex_txt[];
-extern unsigned char tol_umb08_tuka_tex_txt[];
+extern u16 tol_umb08_pal[];
+extern u8 tol_umb08_kasa1_tex_txt[];
+extern u8 tol_umb08_kasa2_tex_txt[];
+extern u8 tol_umb08_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_09/tol_umb_09.c b/src/objects/tol_umb_09/tol_umb_09.c
index fdcf362..5512eb8 100644
--- a/src/objects/tol_umb_09/tol_umb_09.c
+++ b/src/objects/tol_umb_09/tol_umb_09.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_09/kasa_umb09_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_09/e_umb09_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_09/tol_umb09_pal.palette.inc.c"
+u8 tol_umb09_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_09/tol_umb09_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb09_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_09/tol_umb09_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb09_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_09/tol_umb09_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_09/tol_umb_09.h b/src/objects/tol_umb_09/tol_umb_09.h
index 63e24b2..177af7b 100644
--- a/src/objects/tol_umb_09/tol_umb_09.h
+++ b/src/objects/tol_umb_09/tol_umb_09.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_09_v[];
 extern Gfx kasa_umb09_model[];
 extern Gfx e_umb09_model[];
-extern unsigned short tol_umb09_pal[];
-extern unsigned char tol_umb09_kasa1_tex_txt[];
-extern unsigned char tol_umb09_kasa2_tex_txt[];
-extern unsigned char tol_umb09_tuka_tex_txt[];
+extern u16 tol_umb09_pal[];
+extern u8 tol_umb09_kasa1_tex_txt[];
+extern u8 tol_umb09_kasa2_tex_txt[];
+extern u8 tol_umb09_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_10/tol_umb_10.c b/src/objects/tol_umb_10/tol_umb_10.c
index 95d15d0..d3ceaf7 100644
--- a/src/objects/tol_umb_10/tol_umb_10.c
+++ b/src/objects/tol_umb_10/tol_umb_10.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_10/kasa_umb10_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_10/e_umb10_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_10/tol_umb10_pal.palette.inc.c"
+u8 tol_umb10_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_10/tol_umb10_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb10_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_10/tol_umb10_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb10_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_10/tol_umb10_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_10/tol_umb_10.h b/src/objects/tol_umb_10/tol_umb_10.h
index 8ae12b2..ab7866c 100644
--- a/src/objects/tol_umb_10/tol_umb_10.h
+++ b/src/objects/tol_umb_10/tol_umb_10.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_10_v[];
 extern Gfx kasa_umb10_model[];
 extern Gfx e_umb10_model[];
-extern unsigned short tol_umb10_pal[];
-extern unsigned char tol_umb10_kasa1_tex_txt[];
-extern unsigned char tol_umb10_kasa2_tex_txt[];
-extern unsigned char tol_umb10_tuka_tex_txt[];
+extern u16 tol_umb10_pal[];
+extern u8 tol_umb10_kasa1_tex_txt[];
+extern u8 tol_umb10_kasa2_tex_txt[];
+extern u8 tol_umb10_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_11/tol_umb_11.c b/src/objects/tol_umb_11/tol_umb_11.c
index faa4ec2..3f3b506 100644
--- a/src/objects/tol_umb_11/tol_umb_11.c
+++ b/src/objects/tol_umb_11/tol_umb_11.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_11/kasa_umb11_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_11/e_umb11_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_11/tol_umb11_pal.palette.inc.c"
+u8 tol_umb11_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_11/tol_umb11_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb11_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_11/tol_umb11_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb11_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_11/tol_umb11_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_11/tol_umb_11.h b/src/objects/tol_umb_11/tol_umb_11.h
index e2e8ac7..1d5ff79 100644
--- a/src/objects/tol_umb_11/tol_umb_11.h
+++ b/src/objects/tol_umb_11/tol_umb_11.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_11_v[];
 extern Gfx kasa_umb11_model[];
 extern Gfx e_umb11_model[];
-extern unsigned short tol_umb11_pal[];
-extern unsigned char tol_umb11_kasa1_tex_txt[];
-extern unsigned char tol_umb11_kasa2_tex_txt[];
-extern unsigned char tol_umb11_tuka_tex_txt[];
+extern u16 tol_umb11_pal[];
+extern u8 tol_umb11_kasa1_tex_txt[];
+extern u8 tol_umb11_kasa2_tex_txt[];
+extern u8 tol_umb11_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_12/tol_umb_12.c b/src/objects/tol_umb_12/tol_umb_12.c
index cb22a3e..d96266b 100644
--- a/src/objects/tol_umb_12/tol_umb_12.c
+++ b/src/objects/tol_umb_12/tol_umb_12.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_12/kasa_umb12_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_12/e_umb12_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_12/tol_umb12_pal.palette.inc.c"
+u8 tol_umb12_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_12/tol_umb12_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb12_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_12/tol_umb12_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb12_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_12/tol_umb12_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_12/tol_umb_12.h b/src/objects/tol_umb_12/tol_umb_12.h
index dc9c14e..a97c264 100644
--- a/src/objects/tol_umb_12/tol_umb_12.h
+++ b/src/objects/tol_umb_12/tol_umb_12.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_12_v[];
 extern Gfx kasa_umb12_model[];
 extern Gfx e_umb12_model[];
-extern unsigned short tol_umb12_pal[];
-extern unsigned char tol_umb12_kasa1_tex_txt[];
-extern unsigned char tol_umb12_kasa2_tex_txt[];
-extern unsigned char tol_umb12_tuka_tex_txt[];
+extern u16 tol_umb12_pal[];
+extern u8 tol_umb12_kasa1_tex_txt[];
+extern u8 tol_umb12_kasa2_tex_txt[];
+extern u8 tol_umb12_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_13/tol_umb_13.c b/src/objects/tol_umb_13/tol_umb_13.c
index 8c3ee14..24839c7 100644
--- a/src/objects/tol_umb_13/tol_umb_13.c
+++ b/src/objects/tol_umb_13/tol_umb_13.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_13/kasa_umb13_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_13/e_umb13_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_13/tol_umb13_pal.palette.inc.c"
+u8 tol_umb13_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_13/tol_umb13_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb13_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_13/tol_umb13_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb13_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_13/tol_umb13_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_13/tol_umb_13.h b/src/objects/tol_umb_13/tol_umb_13.h
index 94144ca..7e6785f 100644
--- a/src/objects/tol_umb_13/tol_umb_13.h
+++ b/src/objects/tol_umb_13/tol_umb_13.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_13_v[];
 extern Gfx kasa_umb13_model[];
 extern Gfx e_umb13_model[];
-extern unsigned short tol_umb13_pal[];
-extern unsigned char tol_umb13_kasa1_tex_txt[];
-extern unsigned char tol_umb13_kasa2_tex_txt[];
-extern unsigned char tol_umb13_tuka_tex_txt[];
+extern u16 tol_umb13_pal[];
+extern u8 tol_umb13_kasa1_tex_txt[];
+extern u8 tol_umb13_kasa2_tex_txt[];
+extern u8 tol_umb13_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_14/tol_umb_14.c b/src/objects/tol_umb_14/tol_umb_14.c
index eb4c174..ed557c3 100644
--- a/src/objects/tol_umb_14/tol_umb_14.c
+++ b/src/objects/tol_umb_14/tol_umb_14.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_14/kasa_umb14_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_14/e_umb14_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_14/tol_umb_14_pal.palette.inc.c"
+u8 tol_umb_14_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_14/tol_umb_14_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_14_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_14/tol_umb_14_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_14/tol_umb_14.h b/src/objects/tol_umb_14/tol_umb_14.h
index 642a417..591047b 100644
--- a/src/objects/tol_umb_14/tol_umb_14.h
+++ b/src/objects/tol_umb_14/tol_umb_14.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_14_v[];
 extern Gfx kasa_umb14_model[];
 extern Gfx e_umb14_model[];
-extern unsigned short tol_umb_14_pal[];
-extern unsigned char tol_umb_14_kasa_tex_txt[];
-extern unsigned char tol_umb_14_tuka_tex_txt[];
+extern u16 tol_umb_14_pal[];
+extern u8 tol_umb_14_kasa_tex_txt[];
+extern u8 tol_umb_14_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_15/tol_umb_15.c b/src/objects/tol_umb_15/tol_umb_15.c
index 14e59ea..071e257 100644
--- a/src/objects/tol_umb_15/tol_umb_15.c
+++ b/src/objects/tol_umb_15/tol_umb_15.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_15/kasa_umb15_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_15/e_umb15_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_15/tol_umb_15_pal.palette.inc.c"
+u8 tol_umb_15_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_15/tol_umb_15_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_15_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_15/tol_umb_15_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_15_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_15/tol_umb_15_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_15/tol_umb_15.h b/src/objects/tol_umb_15/tol_umb_15.h
index b464089..140dfd7 100644
--- a/src/objects/tol_umb_15/tol_umb_15.h
+++ b/src/objects/tol_umb_15/tol_umb_15.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_15_v[];
 extern Gfx kasa_umb15_model[];
 extern Gfx e_umb15_model[];
-extern unsigned short tol_umb_15_pal[];
-extern unsigned char tol_umb_15_kasa1_tex_txt[];
-extern unsigned char tol_umb_15_kasa2_tex_txt[];
-extern unsigned char tol_umb_15_tuka_tex_txt[];
+extern u16 tol_umb_15_pal[];
+extern u8 tol_umb_15_kasa1_tex_txt[];
+extern u8 tol_umb_15_kasa2_tex_txt[];
+extern u8 tol_umb_15_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_16/tol_umb_16.c b/src/objects/tol_umb_16/tol_umb_16.c
index bc7973b..f255ecb 100644
--- a/src/objects/tol_umb_16/tol_umb_16.c
+++ b/src/objects/tol_umb_16/tol_umb_16.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_16/kasa_umb16_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_16/e_umb16_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_16/tol_umb_16_pal.palette.inc.c"
+u8 tol_umb_16_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_16/tol_umb_16_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_16_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_16/tol_umb_16_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_16/tol_umb_16.h b/src/objects/tol_umb_16/tol_umb_16.h
index 37beb91..57d6c07 100644
--- a/src/objects/tol_umb_16/tol_umb_16.h
+++ b/src/objects/tol_umb_16/tol_umb_16.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_16_v[];
 extern Gfx kasa_umb16_model[];
 extern Gfx e_umb16_model[];
-extern unsigned short tol_umb_16_pal[];
-extern unsigned char tol_umb_16_kasa1_tex_txt[];
-extern unsigned char tol_umb_16_tuka_tex_txt[];
+extern u16 tol_umb_16_pal[];
+extern u8 tol_umb_16_kasa1_tex_txt[];
+extern u8 tol_umb_16_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_17/tol_umb_17.c b/src/objects/tol_umb_17/tol_umb_17.c
index 9442217..1619e76 100644
--- a/src/objects/tol_umb_17/tol_umb_17.c
+++ b/src/objects/tol_umb_17/tol_umb_17.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_17/kasa_umb17_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_17/e_umb17_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_17/tol_umb_17_pal.palette.inc.c"
+u8 tol_umb_17_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_17/tol_umb_17_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_17_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_17/tol_umb_17_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_17/tol_umb_17.h b/src/objects/tol_umb_17/tol_umb_17.h
index 6709d0f..b70eff4 100644
--- a/src/objects/tol_umb_17/tol_umb_17.h
+++ b/src/objects/tol_umb_17/tol_umb_17.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_17_v[];
 extern Gfx kasa_umb17_model[];
 extern Gfx e_umb17_model[];
-extern unsigned short tol_umb_17_pal[];
-extern unsigned char tol_umb_17_kasa_tex_txt[];
-extern unsigned char tol_umb_17_tuka_tex_txt[];
+extern u16 tol_umb_17_pal[];
+extern u8 tol_umb_17_kasa_tex_txt[];
+extern u8 tol_umb_17_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_18/tol_umb_18.c b/src/objects/tol_umb_18/tol_umb_18.c
index b31c26e..6c1680f 100644
--- a/src/objects/tol_umb_18/tol_umb_18.c
+++ b/src/objects/tol_umb_18/tol_umb_18.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_18/kasa_umb18_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_18/e_umb18_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_18/tol_umb18_pal.palette.inc.c"
+u8 tol_umb18_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_18/tol_umb18_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb18_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_18/tol_umb18_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb18_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_18/tol_umb18_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_18/tol_umb_18.h b/src/objects/tol_umb_18/tol_umb_18.h
index 8cefffa..1e6cc6b 100644
--- a/src/objects/tol_umb_18/tol_umb_18.h
+++ b/src/objects/tol_umb_18/tol_umb_18.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_18_v[];
 extern Gfx kasa_umb18_model[];
 extern Gfx e_umb18_model[];
-extern unsigned short tol_umb18_pal[];
-extern unsigned char tol_umb18_kasa1_tex_txt[];
-extern unsigned char tol_umb18_kasa2_tex_txt[];
-extern unsigned char tol_umb18_tuka_tex_txt[];
+extern u16 tol_umb18_pal[];
+extern u8 tol_umb18_kasa1_tex_txt[];
+extern u8 tol_umb18_kasa2_tex_txt[];
+extern u8 tol_umb18_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_19/tol_umb_19.c b/src/objects/tol_umb_19/tol_umb_19.c
index 606fd3a..b2b12f0 100644
--- a/src/objects/tol_umb_19/tol_umb_19.c
+++ b/src/objects/tol_umb_19/tol_umb_19.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_19/kasa_umb19_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_19/e_umb19_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_19/tol_umb_19_pal.palette.inc.c"
+u8 tol_umb_19_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_19/tol_umb_19_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_19_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_19/tol_umb_19_tuka_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_19_e_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_19/tol_umb_19_e_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_19/tol_umb_19.h b/src/objects/tol_umb_19/tol_umb_19.h
index 449ce76..ffb9f3f 100644
--- a/src/objects/tol_umb_19/tol_umb_19.h
+++ b/src/objects/tol_umb_19/tol_umb_19.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_19_v[];
 extern Gfx kasa_umb19_model[];
 extern Gfx e_umb19_model[];
-extern unsigned short tol_umb_19_pal[];
-extern unsigned char tol_umb_19_kasa_tex_txt[];
-extern unsigned char tol_umb_19_tuka_tex_txt[];
-extern unsigned char tol_umb_19_e_tex_txt[];
+extern u16 tol_umb_19_pal[];
+extern u8 tol_umb_19_kasa_tex_txt[];
+extern u8 tol_umb_19_tuka_tex_txt[];
+extern u8 tol_umb_19_e_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_20/tol_umb_20.c b/src/objects/tol_umb_20/tol_umb_20.c
index 7df8324..0c120d2 100644
--- a/src/objects/tol_umb_20/tol_umb_20.c
+++ b/src/objects/tol_umb_20/tol_umb_20.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_20/kasa_umb20_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_20/e_umb20_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_20/tol_umb_20_pal.palette.inc.c"
+u8 tol_umb_20_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_20/tol_umb_20_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_20_e_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_20/tol_umb_20_e_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_20/tol_umb_20.h b/src/objects/tol_umb_20/tol_umb_20.h
index 8feb611..febbd4e 100644
--- a/src/objects/tol_umb_20/tol_umb_20.h
+++ b/src/objects/tol_umb_20/tol_umb_20.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_20_v[];
 extern Gfx kasa_umb20_model[];
 extern Gfx e_umb20_model[];
-extern unsigned short tol_umb_20_pal[];
-extern unsigned char tol_umb_20_kasa_tex_txt[];
-extern unsigned char tol_umb_20_e_tex_txt[];
+extern u16 tol_umb_20_pal[];
+extern u8 tol_umb_20_kasa_tex_txt[];
+extern u8 tol_umb_20_e_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_21/tol_umb_21.c b/src/objects/tol_umb_21/tol_umb_21.c
index 950e088..62a9d66 100644
--- a/src/objects/tol_umb_21/tol_umb_21.c
+++ b/src/objects/tol_umb_21/tol_umb_21.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_21/kasa_umb21_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_21/e_umb21_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_21/tol_umb_21_pal.palette.inc.c"
+u8 tol_umb_21_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_21/tol_umb_21_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_21_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_21/tol_umb_21_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_21/tol_umb_21.h b/src/objects/tol_umb_21/tol_umb_21.h
index f6f169e..2df88e1 100644
--- a/src/objects/tol_umb_21/tol_umb_21.h
+++ b/src/objects/tol_umb_21/tol_umb_21.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_21_v[];
 extern Gfx kasa_umb21_model[];
 extern Gfx e_umb21_model[];
-extern unsigned short tol_umb_21_pal[];
-extern unsigned char tol_umb_21_kasa_tex_txt[];
-extern unsigned char tol_umb_21_tuka_tex_txt[];
+extern u16 tol_umb_21_pal[];
+extern u8 tol_umb_21_kasa_tex_txt[];
+extern u8 tol_umb_21_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_22/tol_umb_22.c b/src/objects/tol_umb_22/tol_umb_22.c
index 5f96f59..39a42a9 100644
--- a/src/objects/tol_umb_22/tol_umb_22.c
+++ b/src/objects/tol_umb_22/tol_umb_22.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_22/kasa_umb22_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_22/e_umb22_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_22/tol_umb_22_pal.palette.inc.c"
+u8 tol_umb_22_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_22/tol_umb_22_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_22_e_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_22/tol_umb_22_e_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_22/tol_umb_22.h b/src/objects/tol_umb_22/tol_umb_22.h
index 9aa5655..c32a952 100644
--- a/src/objects/tol_umb_22/tol_umb_22.h
+++ b/src/objects/tol_umb_22/tol_umb_22.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_22_v[];
 extern Gfx kasa_umb22_model[];
 extern Gfx e_umb22_model[];
-extern unsigned short tol_umb_22_pal[];
-extern unsigned char tol_umb_22_kasa_tex_txt[];
-extern unsigned char tol_umb_22_e_tex_txt[];
+extern u16 tol_umb_22_pal[];
+extern u8 tol_umb_22_kasa_tex_txt[];
+extern u8 tol_umb_22_e_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_23/tol_umb_23.c b/src/objects/tol_umb_23/tol_umb_23.c
index db62c18..8a96616 100644
--- a/src/objects/tol_umb_23/tol_umb_23.c
+++ b/src/objects/tol_umb_23/tol_umb_23.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_23/kasa_umb23_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_23/e_umb23_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_23/tol_umb_23_pal.palette.inc.c"
+u8 tol_umb_23_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_23/tol_umb_23_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_23_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_23/tol_umb_23_tuka_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_23_e_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_23/tol_umb_23_e_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_23/tol_umb_23.h b/src/objects/tol_umb_23/tol_umb_23.h
index b47e1f1..def1091 100644
--- a/src/objects/tol_umb_23/tol_umb_23.h
+++ b/src/objects/tol_umb_23/tol_umb_23.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_23_v[];
 extern Gfx kasa_umb23_model[];
 extern Gfx e_umb23_model[];
-extern unsigned short tol_umb_23_pal[];
-extern unsigned char tol_umb_23_kasa_tex_txt[];
-extern unsigned char tol_umb_23_tuka_tex_txt[];
-extern unsigned char tol_umb_23_e_tex_txt[];
+extern u16 tol_umb_23_pal[];
+extern u8 tol_umb_23_kasa_tex_txt[];
+extern u8 tol_umb_23_tuka_tex_txt[];
+extern u8 tol_umb_23_e_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_24/tol_umb_24.c b/src/objects/tol_umb_24/tol_umb_24.c
index 2a4b396..a9d93b2 100644
--- a/src/objects/tol_umb_24/tol_umb_24.c
+++ b/src/objects/tol_umb_24/tol_umb_24.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_24/kasa_umb24_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_24/e_umb24_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_24/tol_umb_24_pal.palette.inc.c"
+u8 tol_umb_24_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_24/tol_umb_24_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_24_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_24/tol_umb_24_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_24_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_24/tol_umb_24_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_24/tol_umb_24.h b/src/objects/tol_umb_24/tol_umb_24.h
index cd0fba0..7d34317 100644
--- a/src/objects/tol_umb_24/tol_umb_24.h
+++ b/src/objects/tol_umb_24/tol_umb_24.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_24_v[];
 extern Gfx kasa_umb24_model[];
 extern Gfx e_umb24_model[];
-extern unsigned short tol_umb_24_pal[];
-extern unsigned char tol_umb_24_kasa1_tex_txt[];
-extern unsigned char tol_umb_24_kasa2_tex_txt[];
-extern unsigned char tol_umb_24_tuka_tex_txt[];
+extern u16 tol_umb_24_pal[];
+extern u8 tol_umb_24_kasa1_tex_txt[];
+extern u8 tol_umb_24_kasa2_tex_txt[];
+extern u8 tol_umb_24_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_25/tol_umb_25.c b/src/objects/tol_umb_25/tol_umb_25.c
index 0a1e58b..9896943 100644
--- a/src/objects/tol_umb_25/tol_umb_25.c
+++ b/src/objects/tol_umb_25/tol_umb_25.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_25/kasa_umb25_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_25/e_umb25_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_25/tol_umb_25_pal.palette.inc.c"
+u8 tol_umb_25_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_25/tol_umb_25_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_25_ya_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_25/tol_umb_25_ya_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_25/tol_umb_25.h b/src/objects/tol_umb_25/tol_umb_25.h
index efb34b7..dcece96 100644
--- a/src/objects/tol_umb_25/tol_umb_25.h
+++ b/src/objects/tol_umb_25/tol_umb_25.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_25_v[];
 extern Gfx kasa_umb25_model[];
 extern Gfx e_umb25_model[];
-extern unsigned short tol_umb_25_pal[];
-extern unsigned char tol_umb_25_kasa_tex_txt[];
-extern unsigned char tol_umb_25_ya_tex_txt[];
+extern u16 tol_umb_25_pal[];
+extern u8 tol_umb_25_kasa_tex_txt[];
+extern u8 tol_umb_25_ya_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_26/tol_umb_26.c b/src/objects/tol_umb_26/tol_umb_26.c
index deb4c4f..e537d10 100644
--- a/src/objects/tol_umb_26/tol_umb_26.c
+++ b/src/objects/tol_umb_26/tol_umb_26.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_26/kasa_umb26_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_26/e_umb26_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_26/tol_umb_26_pal.palette.inc.c"
+u8 tol_umb_26_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_26/tol_umb_26_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_26_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_26/tol_umb_26_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_26_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_26/tol_umb_26_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_26/tol_umb_26.h b/src/objects/tol_umb_26/tol_umb_26.h
index b21a04a..f84086c 100644
--- a/src/objects/tol_umb_26/tol_umb_26.h
+++ b/src/objects/tol_umb_26/tol_umb_26.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_26_v[];
 extern Gfx kasa_umb26_model[];
 extern Gfx e_umb26_model[];
-extern unsigned short tol_umb_26_pal[];
-extern unsigned char tol_umb_26_kasa1_tex_txt[];
-extern unsigned char tol_umb_26_kasa2_tex_txt[];
-extern unsigned char tol_umb_26_tuka_tex_txt[];
+extern u16 tol_umb_26_pal[];
+extern u8 tol_umb_26_kasa1_tex_txt[];
+extern u8 tol_umb_26_kasa2_tex_txt[];
+extern u8 tol_umb_26_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_27/tol_umb_27.c b/src/objects/tol_umb_27/tol_umb_27.c
index f8f5ff2..4623cab 100644
--- a/src/objects/tol_umb_27/tol_umb_27.c
+++ b/src/objects/tol_umb_27/tol_umb_27.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_27/kasa_umb27_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_27/e_umb27_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_27/tol_umb_27_pal.palette.inc.c"
+u8 tol_umb_27_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_27/tol_umb_27_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_27_kasa2_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_27/tol_umb_27_kasa2_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_27_e_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_27/tol_umb_27_e_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_27/tol_umb_27.h b/src/objects/tol_umb_27/tol_umb_27.h
index f450738..9d0dfa0 100644
--- a/src/objects/tol_umb_27/tol_umb_27.h
+++ b/src/objects/tol_umb_27/tol_umb_27.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_27_v[];
 extern Gfx kasa_umb27_model[];
 extern Gfx e_umb27_model[];
-extern unsigned short tol_umb_27_pal[];
-extern unsigned char tol_umb_27_kasa1_tex_txt[];
-extern unsigned char tol_umb_27_kasa2_tex_txt[];
-extern unsigned char tol_umb_27_e_tex_txt[];
+extern u16 tol_umb_27_pal[];
+extern u8 tol_umb_27_kasa1_tex_txt[];
+extern u8 tol_umb_27_kasa2_tex_txt[];
+extern u8 tol_umb_27_e_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_28/tol_umb_28.c b/src/objects/tol_umb_28/tol_umb_28.c
index 86f1ce0..aae2a0d 100644
--- a/src/objects/tol_umb_28/tol_umb_28.c
+++ b/src/objects/tol_umb_28/tol_umb_28.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_28/kasa_umb28_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_28/e_umb28_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_28/tol_umb_28_pal.palette.inc.c"
+u8 tol_umb_28_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_28/tol_umb_28_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_28_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_28/tol_umb_28_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_28/tol_umb_28.h b/src/objects/tol_umb_28/tol_umb_28.h
index 1c5a9ca..9731139 100644
--- a/src/objects/tol_umb_28/tol_umb_28.h
+++ b/src/objects/tol_umb_28/tol_umb_28.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_28_v[];
 extern Gfx kasa_umb28_model[];
 extern Gfx e_umb28_model[];
-extern unsigned short tol_umb_28_pal[];
-extern unsigned char tol_umb_28_kasa_tex_txt[];
-extern unsigned char tol_umb_28_tuka_tex_txt[];
+extern u16 tol_umb_28_pal[];
+extern u8 tol_umb_28_kasa_tex_txt[];
+extern u8 tol_umb_28_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_29/tol_umb_29.c b/src/objects/tol_umb_29/tol_umb_29.c
index 8159829..579ad7c 100644
--- a/src/objects/tol_umb_29/tol_umb_29.c
+++ b/src/objects/tol_umb_29/tol_umb_29.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_29/kasa_umb29_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_29/e_umb29_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_29/tol_umb_29_pal.palette.inc.c"
+u8 tol_umb_29_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_29/tol_umb_29_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_29_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_29/tol_umb_29_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_29/tol_umb_29.h b/src/objects/tol_umb_29/tol_umb_29.h
index 580d710..3fce1f2 100644
--- a/src/objects/tol_umb_29/tol_umb_29.h
+++ b/src/objects/tol_umb_29/tol_umb_29.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_29_v[];
 extern Gfx kasa_umb29_model[];
 extern Gfx e_umb29_model[];
-extern unsigned short tol_umb_29_pal[];
-extern unsigned char tol_umb_29_kasa1_tex_txt[];
-extern unsigned char tol_umb_29_tuka_tex_txt[];
+extern u16 tol_umb_29_pal[];
+extern u8 tol_umb_29_kasa1_tex_txt[];
+extern u8 tol_umb_29_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_30/tol_umb_30.c b/src/objects/tol_umb_30/tol_umb_30.c
index 9aa7f95..de0a71a 100644
--- a/src/objects/tol_umb_30/tol_umb_30.c
+++ b/src/objects/tol_umb_30/tol_umb_30.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_30/kasa_umb30_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_30/e_umb30_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_30/obj_shop_umb_30_pal.palette.inc.c"
+u8 tol_umb_30_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_30/tol_umb_30_kasa1_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_30_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_30/tol_umb_30_tuka_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_30/tol_umb_30.h b/src/objects/tol_umb_30/tol_umb_30.h
index ee0d0f6..d4673e6 100644
--- a/src/objects/tol_umb_30/tol_umb_30.h
+++ b/src/objects/tol_umb_30/tol_umb_30.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_30_v[];
 extern Gfx kasa_umb30_model[];
 extern Gfx e_umb30_model[];
-extern unsigned short obj_shop_umb_30_pal[];
-extern unsigned char tol_umb_30_kasa1_tex_txt[];
-extern unsigned char tol_umb_30_tuka_tex_txt[];
+extern u16 obj_shop_umb_30_pal[];
+extern u8 tol_umb_30_kasa1_tex_txt[];
+extern u8 tol_umb_30_tuka_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_31/tol_umb_31.c b/src/objects/tol_umb_31/tol_umb_31.c
index 4ae586b..2686479 100644
--- a/src/objects/tol_umb_31/tol_umb_31.c
+++ b/src/objects/tol_umb_31/tol_umb_31.c
@@ -4,6 +4,12 @@
 #include "assets/jp/objects/tol_umb_31/kasa_umb31_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_31/e_umb31_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_31/tol_umb_31_pal.palette.inc.c"
+u8 tol_umb_31_kasa_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_31/tol_umb_31_kasa_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_31_tuka_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_31/tol_umb_31_tuka_tex_txt.ci4.inc.c"
+};
+u8 tol_umb_31_e_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_31/tol_umb_31_e_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_31/tol_umb_31.h b/src/objects/tol_umb_31/tol_umb_31.h
index d802c85..82b3146 100644
--- a/src/objects/tol_umb_31/tol_umb_31.h
+++ b/src/objects/tol_umb_31/tol_umb_31.h
@@ -6,9 +6,9 @@
 extern Vtx tol_umb_31_v[];
 extern Gfx kasa_umb31_model[];
 extern Gfx e_umb31_model[];
-extern unsigned short tol_umb_31_pal[];
-extern unsigned char tol_umb_31_kasa_tex_txt[];
-extern unsigned char tol_umb_31_tuka_tex_txt[];
-extern unsigned char tol_umb_31_e_tex_txt[];
+extern u16 tol_umb_31_pal[];
+extern u8 tol_umb_31_kasa_tex_txt[];
+extern u8 tol_umb_31_tuka_tex_txt[];
+extern u8 tol_umb_31_e_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_umb_32/tol_umb_32.c b/src/objects/tol_umb_32/tol_umb_32.c
index dda8876..cfc8f22 100644
--- a/src/objects/tol_umb_32/tol_umb_32.c
+++ b/src/objects/tol_umb_32/tol_umb_32.c
@@ -4,5 +4,9 @@
 #include "assets/jp/objects/tol_umb_32/kasa_umb32_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_32/e_umb32_model.gfx.inc.c"
 #include "assets/jp/objects/tol_umb_32/obj_shop_umb_32_pal.palette.inc.c"
+u8 obj_shop_umb_32_kasa1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_32/obj_shop_umb_32_kasa1_tex_txt.ci4.inc.c"
+};
+u8 obj_shop_umb_32_tuka1_tex_txt[] = {
 #include "assets/jp/objects/tol_umb_32/obj_shop_umb_32_tuka1_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_umb_32/tol_umb_32.h b/src/objects/tol_umb_32/tol_umb_32.h
index ba50525..ea9957d 100644
--- a/src/objects/tol_umb_32/tol_umb_32.h
+++ b/src/objects/tol_umb_32/tol_umb_32.h
@@ -6,8 +6,8 @@
 extern Vtx tol_umb_32_v[];
 extern Gfx kasa_umb32_model[];
 extern Gfx e_umb32_model[];
-extern unsigned short obj_shop_umb_32_pal[];
-extern unsigned char obj_shop_umb_32_kasa1_tex_txt[];
-extern unsigned char obj_shop_umb_32_tuka1_tex_txt[];
+extern u16 obj_shop_umb_32_pal[];
+extern u8 obj_shop_umb_32_kasa1_tex_txt[];
+extern u8 obj_shop_umb_32_tuka1_tex_txt[];
 
 #endif
diff --git a/src/objects/tol_utiwa_1/tol_utiwa_1.c b/src/objects/tol_utiwa_1/tol_utiwa_1.c
index 04c44ff..4f11361 100644
--- a/src/objects/tol_utiwa_1/tol_utiwa_1.c
+++ b/src/objects/tol_utiwa_1/tol_utiwa_1.c
@@ -3,5 +3,9 @@
 #include "assets/jp/objects/tol_utiwa_1/tol_utiwa_1_v.vtx.inc.c"
 #include "assets/jp/objects/tol_utiwa_1/main_utiwa1_model.gfx.inc.c"
 #include "assets/jp/objects/tol_utiwa_1/tol_utiwa1_pal.palette.inc.c"
+u8 tol_utiwa_1_main1_tex_txt[] = {
 #include "assets/jp/objects/tol_utiwa_1/tol_utiwa_1_main1_tex_txt.ci4.inc.c"
+};
+u8 tol_utiwa_1_main2_tex_txt[] = {
 #include "assets/jp/objects/tol_utiwa_1/tol_utiwa_1_main2_tex_txt.ci4.inc.c"
+};
diff --git a/src/objects/tol_utiwa_1/tol_utiwa_1.h b/src/objects/tol_utiwa_1/tol_utiwa_1.h
index 15e8df5..800cbf3 100644
--- a/src/objects/tol_utiwa_1/tol_utiwa_1.h
+++ b/src/objects/tol_utiwa_1/tol_utiwa_1.h
@@ -10,8 +10,8 @@
 
 extern Vtx tol_utiwa_1_v[];
 extern Gfx main_utiwa1_model[];
-extern unsigned short tol_utiwa1_pal[];
-extern unsigned char tol_utiwa_1_main1_tex_txt[];
-extern unsigned char tol_utiwa_1_main2_tex_txt[];
+extern u16 tol_utiwa1_pal[];
+extern u8 tol_utiwa_1_main1_tex_txt[];
+extern u8 tol_utiwa_1_main2_tex_txt[];
 
 #endif
diff --git a/src/overlays/actors/ovl_Koinobori/ac_koinobori.c b/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
index be8ba2b..e6605ed 100644
--- a/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
+++ b/src/overlays/actors/ovl_Koinobori/ac_koinobori.c
@@ -120,8 +120,8 @@ void aKOI_actor_init(Actor* thisx, Game_Play* game_play) {
     }                                \
     while (0)
 
-extern unsigned short aKOI_obj_e_koinobori_a_pal[];
-extern unsigned short obj_e_koinobori_b_pal[];
+extern u16 aKOI_obj_e_koinobori_a_pal[];
+extern u16 obj_e_koinobori_b_pal[];
 #include "assets/jp/overlays/actors/ovl_Koinobori/aKOI_obj_e_koinobori_a_pal.palette.inc.c"
 #include "assets/jp/overlays/actors/ovl_Koinobori/obj_e_koinobori_b_pal.palette.inc.c"
 
diff --git a/tools/bin_inc_c.py b/tools/bin_inc_c.py
deleted file mode 100644
index 9a78c30..0000000
--- a/tools/bin_inc_c.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python3
-
-from pathlib import Path
-from sys import argv
-import re
-
-if __name__ == "__main__":
-    infile, outfile, cname = argv[1:]
-
-    with open(outfile, "w") as f:
-        f.write(f"unsigned char {cname}[] = {{ ")
-
-        with open(infile, "rb") as i:
-            for char in i.read():
-                f.write(f"0x{char:02X}, ")
-
-        f.write(f"}};\n")
diff --git a/tools/splat_ext/af_i4.py b/tools/splat_ext/af_i4.py
deleted file mode 100644
index 54bd7b1..0000000
--- a/tools/splat_ext/af_i4.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from n64img.image import Image, I4
-from splat.util import log, options
-from splat.segtypes.n64.segment import N64Segment
-
-class N64SegAf_i4(N64Segment):
-    def __init__(self, rom_start, rom_end, type, name, vram_start, args, yaml):
-        super().__init__(rom_start, rom_end, type, name, vram_start, args=args, yaml=yaml),
-
-        self.width = args[0]
-        self.height = args[1]
-
-    def scan(self, rom_bytes: bytes):
-        self.n64img: Image = I4(b"", 0, 0)
-        self.n64img.width = self.width
-        self.n64img.height = self.height
-        self.n64img.data = rom_bytes[self.rom_start : self.rom_end]
-
-    def split(self, rom_bytes: bytes):
-        path = options.opts.asset_path / self.dir / f"{self.name}.i4.png"
-        path.parent.mkdir(parents=True, exist_ok=True)
-
-        self.n64img.write(path)
diff --git a/tools/splat_ext/af_i8.py b/tools/splat_ext/af_i8.py
deleted file mode 100644
index 9b167f7..0000000
--- a/tools/splat_ext/af_i8.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from n64img.image import Image, I8
-from splat.util import log, options
-from splat.segtypes.n64.segment import N64Segment
-
-class N64SegAf_i8(N64Segment):
-    def __init__(self, rom_start, rom_end, type, name, vram_start, args, yaml):
-        super().__init__(rom_start, rom_end, type, name, vram_start, args=args, yaml=yaml),
-
-        self.width = args[0]
-        self.height = args[1]
-
-    def scan(self, rom_bytes: bytes):
-        self.n64img: Image = I8(b"", 0, 0)
-        self.n64img.width = self.width
-        self.n64img.height = self.height
-        self.n64img.data = rom_bytes[self.rom_start : self.rom_end]
-
-    def split(self, rom_bytes: bytes):
-        path = options.opts.asset_path / self.dir / f"{self.name}.i8.png"
-        path.parent.mkdir(parents=True, exist_ok=True)
-
-        self.n64img.write(path)
diff --git a/tools/splat_ext/af_ia8.py b/tools/splat_ext/af_ia8.py
deleted file mode 100644
index ce5ffe5..0000000
--- a/tools/splat_ext/af_ia8.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from n64img.image import Image, IA8
-from splat.util import log, options
-from splat.segtypes.n64.segment import N64Segment
-
-class N64SegAf_ia8(N64Segment):
-    def __init__(self, rom_start, rom_end, type, name, vram_start, args, yaml):
-        super().__init__(rom_start, rom_end, type, name, vram_start, args=args, yaml=yaml),
-
-        self.width = args[0]
-        self.height = args[1]
-
-    def scan(self, rom_bytes: bytes):
-        self.n64img: Image = IA8(b"", 0, 0)
-        self.n64img.width = self.width
-        self.n64img.height = self.height
-        self.n64img.data = rom_bytes[self.rom_start : self.rom_end]
-
-    def split(self, rom_bytes: bytes):
-        path = options.opts.asset_path / self.dir / f"{self.name}.ia8.png"
-        path.parent.mkdir(parents=True, exist_ok=True)
-
-        self.n64img.write(path)
diff --git a/tools/splat_ext/af_palette.py b/tools/splat_ext/af_palette.py
index 8a36c09..974ebc4 100644
--- a/tools/splat_ext/af_palette.py
+++ b/tools/splat_ext/af_palette.py
@@ -1,11 +1,11 @@
 import struct
 from splat.util import options, log
-from splat.segtypes.common.codesubsegment import CommonSegCodeSubsegment
+from splat.segtypes.n64.palette import N64SegPalette
 
-class N64SegAf_palette(CommonSegCodeSubsegment):
+class N64SegAf_palette(N64SegPalette):
     def __init__(self, rom_start, rom_end, type, name, vram_start, args, yaml):
         super().__init__(rom_start, rom_end, type, name, vram_start, args=args, yaml=yaml),
-
+        
         self.data_only = isinstance(yaml, dict) and yaml.get("data_only", False)
 
     def scan(self, rom_bytes: bytes):
@@ -15,7 +15,7 @@ class N64SegAf_palette(CommonSegCodeSubsegment):
         if not self.data_only:
             lines.append(options.opts.generated_c_preamble)
             lines.append("")
-            lines.append(f"unsigned short {self.name}[] = {{")
+            lines.append(f"u16 {self.name}[] = {{")
 
         for short in struct.iter_unpack(">H", data):
             lines.append(f"    0x{short[0]:04X},")
diff --git a/tools/splat_ext/af_palette2.py b/tools/splat_ext/af_palette2.py
new file mode 100644
index 0000000..b029949
--- /dev/null
+++ b/tools/splat_ext/af_palette2.py
@@ -0,0 +1,35 @@
+import struct
+from splat.util import options, log
+from splat.segtypes.common.codesubsegment import CommonSegCodeSubsegment
+
+class N64SegAf_palette2(CommonSegCodeSubsegment):
+    def __init__(self, rom_start, rom_end, type, name, vram_start, args, yaml):
+        super().__init__(rom_start, rom_end, type, name, vram_start, args=args, yaml=yaml),
+
+        self.data_only = isinstance(yaml, dict) and yaml.get("data_only", False)
+
+    def scan(self, rom_bytes: bytes):
+        data = rom_bytes[self.rom_start : self.rom_end]
+        lines = []
+
+        if not self.data_only:
+            lines.append(options.opts.generated_c_preamble)
+            lines.append("")
+            lines.append(f"u16 {self.name}[] = {{")
+
+        for short in struct.iter_unpack(">H", data):
+            lines.append(f"    0x{short[0]:04X},")
+
+        if not self.data_only:
+            lines.append("};")
+
+        lines.append("")
+        self.file_text = "\n".join(lines)
+
+    def split(self, rom_bytes: bytes):
+        path = options.opts.asset_path / self.dir / f"{self.name}.palette.inc.c"
+
+        if self.file_text and path:
+            path.parent.mkdir(parents=True, exist_ok=True)
+            with open(path, "w", newline="\n") as f:
+                f.write(self.file_text)
diff --git a/yamls/jp/assets.yaml b/yamls/jp/assets.yaml
index 5a350bd..7e2dc70 100644
--- a/yamls/jp/assets.yaml
+++ b/yamls/jp/assets.yaml
@@ -562,46 +562,48 @@
         name: object_00D5B000
         subsegments:
           - [0xD5B000]
-          - [0xD5B008, af_palette, obj_s_house1_a_pal]
-          - [0xD5B028, af_palette, obj_s_house1_b_pal]
-          - [0xD5B048, af_palette, obj_s_house1_c_pal]
-          - [0xD5B068, af_palette, obj_s_house1_d_pal]
-          - [0xD5B088, af_palette, obj_s_house1_e_pal]
+          - { start: 0xD5B008, type: af_palette, name: obj_s_house1_a_pal, global_id: obj_s_house1_a_pal }
+          - { start: 0xD5B028, type: af_palette, name: obj_s_house1_b_pal, global_id: obj_s_house1_b_pal }
+          - { start: 0xD5B048, type: af_palette, name: obj_s_house1_c_pal, global_id: obj_s_house1_c_pal }
+          - { start: 0xD5B068, type: af_palette, name: obj_s_house1_d_pal, global_id: obj_s_house1_d_pal }
+          - { start: 0xD5B088, type: af_palette, name: obj_s_house1_e_pal, global_id: obj_s_house1_e_pal }
           - [0xD5B0A8]
-          - [0xD5BA48, af_palette, obj_s_yamishop_pal]
-          - [0xD5BA68, af_palette, obj_w_yamishop_pal]
+          - { start: 0xD5BA48, type: af_palette, name: obj_s_yamishop_pal, global_id: obj_s_yamishop_pal }
+          - { start: 0xD5BA68, type: af_palette, name: obj_w_yamishop_pal, global_id: obj_w_yamishop_pal }
           - [0xD5BA88]
-          - [0xD5BF88, af_palette, obj_buggy_pal]
-          - [0xD5BFA8, af_palette, obj_buggy_winter_pal]
+          - { start: 0xD5BF88, type: af_palette, name: obj_buggy_pal, global_id: obj_buggy_pal }
+          - { start: 0xD5BFA8, type: af_palette, name: obj_buggy_winter_pal, global_id: obj_buggy_winter_pal }
           - [0xD5BFC8]
-          - [0xD5BFE8, af_palette, obj_w_kamakura_pal]
+          - { start: 0xD5BFE8, type: af_palette, name: obj_w_kamakura_pal, global_id: obj_w_kamakura_pal }
           - [0xD5C008]
-          - [0xD5C048, af_palette, obj_e_goza_pal]
+          - { start: 0xD5C048, type: af_palette, name: obj_e_goza_pal, global_id: obj_e_goza_pal }
           - [0xD5C068]
-          - [0xD5C0C8, af_palette, obj_e_mikuji_pal]
-          - [0xD5C0E8, af_palette, obj_e_count_pal]
-          - [0xD5C108, af_palette, obj_e_count02_pal]
-          - [0xD5C128, af_palette, obj_e_kago_r_pal]
-          - [0xD5C148, af_palette, obj_e_kago_w_pal]
+          - { start: 0xD5C0C8, type: af_palette, name: obj_e_mikuji_pal, global_id: obj_e_mikuji_pal }
+          - { start: 0xD5C0E8, type: af_palette, name: obj_e_count_pal, global_id: obj_e_count_pal }
+          - { start: 0xD5C108, type: af_palette, name: obj_e_count02_pal, global_id: obj_e_count02_pal }
+          - { start: 0xD5C128, type: af_palette, name: obj_e_kago_r_pal, global_id: obj_e_kago_r_pal }
+          - { start: 0xD5C148, type: af_palette, name: obj_e_kago_w_pal, global_id: obj_e_kago_w_pal }
           - [0xD5C168]
-          - [0xD5C1A8, af_palette, obj_e_koinobori_a_pal]
-          - [0xD5C1C8, af_palette, obj_dump_pal]
-          - [0xD5C1E8, af_palette, obj_s_windmill_a_pal]
-          - [0xD5C208, af_palette, obj_s_windmill_b_pal]
-          - [0xD5C228, af_palette, obj_s_windmill_c_pal]
-          - [0xD5C248, af_palette, obj_s_windmill_d_pal]
-          - [0xD5C268, af_palette, obj_s_windmill_e_pal]
-          - [0xD5C288, af_palette, obj_w_windmill_a_pal]
-          - [0xD5C2A8, af_palette, obj_w_windmill_b_pal]
-          - [0xD5C2C8, af_palette, obj_w_windmill_c_pal]
-          - [0xD5C2E8, af_palette, obj_w_windmill_d_pal]
-          - [0xD5C308, af_palette, obj_w_windmill_e_pal]
-          - [0xD5C328, af_palette, obj_01_lotus_pal]
-          - [0xD5C348, af_palette, obj_e_mikanbox_pal]
-          - [0xD5C368, af_palette, obj_s_douzou_dai_pal]
-          - [0xD5C388, af_palette, obj_w_douzou_pal]
-          - [0xD5C3A8, af_palette, obj_s_toudai_pal]
-          - [0xD5C3C8, af_palette, obj_w_toudai_pal]
+          - { start: 0xD5C1A8, type: af_palette, name: obj_e_koinobori_a_pal, global_id: obj_e_koinobori_a_pal }
+          - { start: 0xD5C1C8, type: af_palette, name: obj_dump_pal, global_id: obj_dump_pal }
+          - [0xD5C1E8]
+          # - { start: 0xD5C1E8, type: af_palette, name: obj_s_windmill_a_pal, global_id: obj_s_windmill_a_pal }
+          # - { start: 0xD5C208, type: af_palette, name: obj_s_windmill_b_pal, global_id: obj_s_windmill_b_pal }
+          # - { start: 0xD5C228, type: af_palette, name: obj_s_windmill_c_pal, global_id: obj_s_windmill_c_pal }
+          # - { start: 0xD5C248, type: af_palette, name: obj_s_windmill_d_pal, global_id: obj_s_windmill_d_pal }
+          # - { start: 0xD5C268, type: af_palette, name: obj_s_windmill_e_pal, global_id: obj_s_windmill_e_pal }
+          # - { start: 0xD5C288, type: af_palette, name: obj_w_windmill_a_pal, global_id: obj_w_windmill_a_pal }
+          # - { start: 0xD5C2A8, type: af_palette, name: obj_w_windmill_b_pal, global_id: obj_w_windmill_b_pal }
+          # - { start: 0xD5C2C8, type: af_palette, name: obj_w_windmill_c_pal, global_id: obj_w_windmill_c_pal }
+          # - { start: 0xD5C2E8, type: af_palette, name: obj_w_windmill_d_pal, global_id: obj_w_windmill_d_pal }
+          # - { start: 0xD5C308, type: af_palette, name: obj_w_windmill_e_pal, global_id: obj_w_windmill_e_pal }
+          - { start: 0xD5C328, type: af_palette, name: obj_01_lotus_pal, global_id: obj_01_lotus_pal }
+          - { start: 0xD5C348, type: af_palette, name: obj_e_mikanbox_pal, global_id: obj_e_mikanbox_pal }
+          - { start: 0xD5C368, type: af_palette, name: obj_s_douzou_dai_pal, global_id: obj_s_douzou_dai_pal }
+          - { start: 0xD5C388, type: af_palette, name: obj_w_douzou_pal, global_id: obj_w_douzou_pal }
+          - [0xD5C3A8]
+          # - { start: 0xD5C3A8, type: af_palette, name: obj_s_toudai_pal, global_id: obj_w_toudai_pal }
+          # - { start: 0xD5C3C8, type: af_palette, name: obj_w_toudai_pal, global_id: obj_s_toudai_pal }
           - [0xD5C3E8] 
   - [0xD5C3F0]
 
@@ -641,9 +643,9 @@
           - [0xD5E5D0, af_gfx, obj_yamishop/obj_s_yamishop_light_model]
           - [0xD5E690, af_gfx, obj_yamishop/obj_s_yamishop_door1_model]
           - [0xD5E7D8, af_gfx, obj_yamishop/obj_s_yamishop_door2_model]
-          - [0xD5E8C8, af_ci4, obj_yamishop/obj_s_yamishop_t2_tex_txt, 128, 32, 0xD5BA48, 0x20]
-          - [0xD5F0C8, af_ci4, obj_yamishop/obj_s_yamishop_t1_tex_txt, 128, 32, 0xD5BA48, 0x20]
-          - [0xD5F8C8, af_i4, obj_yamishop/obj_s_yamishop_window_tex_txt, 16, 16]
+          - [0xD5E8C8, ci4, obj_yamishop/obj_s_yamishop_t2_tex_txt, 128, 32, obj_s_yamishop_pal]
+          - [0xD5F0C8, ci4, obj_yamishop/obj_s_yamishop_t1_tex_txt, 128, 32, obj_s_yamishop_pal]
+          - [0xD5F8C8, i4, obj_yamishop/obj_s_yamishop_window_tex_txt, 16, 16]
           - [0xD5F948, ckf_je, obj_yamishop/cKF_je_r_obj_s_yamishop_tbl]
           - [0xD5F990, ckf_bs, obj_yamishop/cKF_bs_r_obj_s_yamishop]
           - [0xD5F998, ckf_ckcb, obj_yamishop/cKF_ckcb_r_obj_s_yamishop_tbl]
@@ -659,9 +661,9 @@
           - [0xD5FFF0, af_gfx, obj_yamishop/obj_w_yamishop_light_model]
           - [0xD600B0, af_gfx, obj_yamishop/obj_w_yamishop_door1_model]
           - [0xD601F8, af_gfx, obj_yamishop/obj_w_yamishop_door2_model]
-          - [0xD602E8, af_ci4, obj_yamishop/obj_w_yamishop_t2_tex_txt, 128, 32, 0xD5BA68, 0x20]
-          - [0xD60AE8, af_ci4, obj_yamishop/obj_w_yamishop_t1_tex_txt, 128, 32, 0xD5BA68, 0x20]
-          - [0xD612E8, af_i4, obj_yamishop/obj_w_yamishop_window_tex_txt, 16, 16]
+          - [0xD602E8, ci4, obj_yamishop/obj_w_yamishop_t2_tex_txt, 128, 32, obj_w_yamishop_pal]
+          - [0xD60AE8, ci4, obj_yamishop/obj_w_yamishop_t1_tex_txt, 128, 32, obj_w_yamishop_pal]
+          - [0xD612E8, i4, obj_yamishop/obj_w_yamishop_window_tex_txt, 16, 16]
           - [0xD61368, ckf_je, obj_yamishop/cKF_je_r_obj_w_yamishop_tbl]
           - [0xD613B0, ckf_bs, obj_yamishop/cKF_bs_r_obj_w_yamishop]
           - [0xD613B8, ckf_ckcb, obj_yamishop/cKF_ckcb_r_obj_w_yamishop_tbl]
@@ -684,9 +686,9 @@
           - [0xD61A18, af_gfx, obj_uranai/obj_s_uranai_light_model]
           - [0xD61AD0, af_gfx, obj_uranai/obj_s_uranai_doorA_model]
           - [0xD61B98, af_gfx, obj_uranai/obj_s_uranai_doorB_model]
-          - [0xD61C60, af_ci4, obj_uranai/obj_s_uranai_t2_tex_txt, 128, 32, 0xD5BF88, 0x20]
-          - [0xD62460, af_i4, obj_uranai/obj_s_uranai_window_tex_txt, 16, 16]
-          - [0xD624E0, af_ci4, obj_uranai/obj_s_uranai_t1_tex_txt, 128, 32, 0xD5BF88, 0x20]
+          - [0xD61C60, ci4, obj_uranai/obj_s_uranai_t2_tex_txt, 128, 32, obj_buggy_pal]
+          - [0xD62460, i4, obj_uranai/obj_s_uranai_window_tex_txt, 16, 16]
+          - [0xD624E0, ci4, obj_uranai/obj_s_uranai_t1_tex_txt, 128, 32, obj_buggy_pal]
           - [0xD62CE0, ckf_je, obj_uranai/cKF_je_r_obj_s_uranai_tbl]
           - [0xD62D40, ckf_bs, obj_uranai/cKF_bs_r_obj_s_uranai]
           - [0xD62D48, ckf_ckcb, obj_uranai/cKF_ckcb_r_obj_s_uranai_tbl]
@@ -702,9 +704,9 @@
           - [0xD63410, af_gfx, obj_uranai/obj_w_uranai_light_model]
           - [0xD634C8, af_gfx, obj_uranai/obj_w_uranai_doorA_model]
           - [0xD63590, af_gfx, obj_uranai/obj_w_uranai_doorB_model]
-          - [0xD63658, af_ci4, obj_uranai/obj_w_uranai_t2_tex_txt, 128, 32, 0xD5BFA8, 0x20]
-          - [0xD63E58, af_i4, obj_uranai/obj_w_uranai_window_tex_txt, 16, 16]
-          - [0xD63ED8, af_ci4, obj_uranai/obj_w_uranai_t1_tex_txt, 128, 32, 0xD5BFA8, 0x20]
+          - [0xD63658, ci4, obj_uranai/obj_w_uranai_t2_tex_txt, 128, 32, obj_buggy_winter_pal]
+          - [0xD63E58, i4, obj_uranai/obj_w_uranai_window_tex_txt, 16, 16]
+          - [0xD63ED8, ci4, obj_uranai/obj_w_uranai_t1_tex_txt, 128, 32, obj_buggy_winter_pal]
           - [0xD646D8, ckf_je, obj_uranai/cKF_je_r_obj_w_uranai_tbl]
           - [0xD64738, ckf_bs, obj_uranai/cKF_bs_r_obj_w_uranai]
           - [0xD64740, ckf_ckcb, obj_uranai/cKF_ckcb_r_obj_w_uranai_tbl]
@@ -727,10 +729,10 @@
           - [0xD65018, af_gfx, obj_e_count01/obj_e_count_back_model]
           - [0xD650D8, af_gfx, obj_e_count01/obj_e_count_new_model]
           - [0xD65190, af_gfx, obj_e_count01/obj_e_count_down_model]
-          - [0xD65258, af_ci4, obj_e_count01/obj_e_count_t1_tex_txt, 128, 32, 0xD5C0E8, 0x20]
-          - [0xD65A58, af_ci4, obj_e_count01/obj_e_count_t2_tex_txt, 128, 32, 0xD5C0E8, 0x20]
-          - [0xD66258, af_ci4, obj_e_count01/obj_e_count_t3_tex_txt, 128, 32, 0xD5C0E8, 0x20]
-          - [0xD66A58, af_i4, obj_e_count01/obj_e_count01_spot_tex_sgi_i4, 16, 16]
+          - [0xD65258, ci4, obj_e_count01/obj_e_count_t1_tex_txt, 128, 32, obj_e_count_pal]
+          - [0xD65A58, ci4, obj_e_count01/obj_e_count_t2_tex_txt, 128, 32, obj_e_count_pal]
+          - [0xD66258, ci4, obj_e_count01/obj_e_count_t3_tex_txt, 128, 32, obj_e_count_pal]
+          - [0xD66A58, i4, obj_e_count01/obj_e_count01_spot_tex_sgi_i4, 16, 16]
           - [0xD66AD8, ckf_je, obj_e_count01/cKF_je_r_obj_e_count01_tbl]
           - [0xD66B44, ckf_bs, obj_e_count01/cKF_bs_r_obj_e_count01]
           - [0xD66B4C, ckf_ckcb, obj_e_count01/cKF_ckcb_r_obj_e_count01_tbl]
@@ -754,16 +756,16 @@
           - [0xD66C98, vtx, obj_e_count02_cl/obj_e_count02_cl_v]
           - [0xD66D98, af_gfx, obj_e_count02_cl/obj_e_c2_ani_cl01_sita_model]
           - [0xD66E98, af_gfx, obj_e_count02_cl/obj_e_c2_ani_ci01_mae_model]
-          - [0xD66F98, af_ci4, obj_e_count02_cl/obj_e_count02_1_tex, 32, 32, 0xD5C108, 0x20]
-          - [0xD67198, af_ci4, obj_e_count02_cl/obj_e_count02_0_tex, 32, 32, 0xD5C108, 0x20]
-          - [0xD67398, af_ci4, obj_e_count02_cl/obj_e_count02_2_tex, 32, 32, 0xD5C108, 0x20]
-          - [0xD67598, af_ci4, obj_e_count02_cl/obj_e_count02_3_tex, 32, 32, 0xD5C108, 0x20]
-          - [0xD67798, af_ci4, obj_e_count02_cl/obj_e_count02_4_tex, 32, 32, 0xD5C108, 0x20]
-          - [0xD67998, af_ci4, obj_e_count02_cl/obj_e_count02_5_tex, 32, 32, 0xD5C108, 0x20]
-          - [0xD67B98, af_ci4, obj_e_count02_cl/obj_e_count02_6_tex, 32, 32, 0xD5C108, 0x20]
-          - [0xD67D98, af_ci4, obj_e_count02_cl/obj_e_count02_7_tex, 32, 32, 0xD5C108, 0x20]
-          - [0xD67F98, af_ci4, obj_e_count02_cl/obj_e_count02_8_tex, 32, 32, 0xD5C108, 0x20]
-          - [0xD68198, af_ci4, obj_e_count02_cl/obj_e_count02_9_tex, 32, 32, 0xD5C108, 0x20]
+          - [0xD66F98, ci4, obj_e_count02_cl/obj_e_count02_1_tex, 32, 32, obj_e_count02_pal]
+          - [0xD67198, ci4, obj_e_count02_cl/obj_e_count02_0_tex, 32, 32, obj_e_count02_pal]
+          - [0xD67398, ci4, obj_e_count02_cl/obj_e_count02_2_tex, 32, 32, obj_e_count02_pal]
+          - [0xD67598, ci4, obj_e_count02_cl/obj_e_count02_3_tex, 32, 32, obj_e_count02_pal]
+          - [0xD67798, ci4, obj_e_count02_cl/obj_e_count02_4_tex, 32, 32, obj_e_count02_pal]
+          - [0xD67998, ci4, obj_e_count02_cl/obj_e_count02_5_tex, 32, 32, obj_e_count02_pal]
+          - [0xD67B98, ci4, obj_e_count02_cl/obj_e_count02_6_tex, 32, 32, obj_e_count02_pal]
+          - [0xD67D98, ci4, obj_e_count02_cl/obj_e_count02_7_tex, 32, 32, obj_e_count02_pal]
+          - [0xD67F98, ci4, obj_e_count02_cl/obj_e_count02_8_tex, 32, 32, obj_e_count02_pal]
+          - [0xD68198, ci4, obj_e_count02_cl/obj_e_count02_9_tex, 32, 32, obj_e_count02_pal]
           - [0xD68398, ckf_je, obj_e_count02_cl/cKF_je_r_obj_e_count02_cl_tbl]
           - [0xD683BC, ckf_bs, obj_e_count02_cl/cKF_bs_r_obj_e_count02_cl]
           - [0xD683C4, ckf_ckcb, obj_e_count02_cl/cKF_ckcb_r_obj_e_count02_cl_tbl]
@@ -788,28 +790,28 @@
           - [0xD69A70, af_gfx, obj_douzou/obj_s_douzou_boy_mouth_model]
           - [0xD69AF8, af_gfx, obj_douzou/obj_s_douzou_boy_face_model]
           - [0xD69B88, af_gfx, obj_douzou/obj_s_douzou_boy_model]
-          - [0xD69DE8, af_ci4, obj_douzou/obj_s_douzou_dai_tex_txt, 16, 32, 0xD5C368, 0x20]
-          - [0xD69EE8, af_i4, obj_douzou/obj_s_douzou_name_tex_txt, 16, 16]
-          - [0xD69F68, af_i4, obj_douzou/obj_s_douzou_b1_tex_pic_i4, 32, 16]
-          - [0xD6A068, af_i4, obj_douzou/obj_s_douzou_b2_tex_pic_i4, 32, 16]
-          - [0xD6A168, af_i4, obj_douzou/obj_s_douzou_b3_tex_pic_i4, 32, 16]
-          - [0xD6A268, af_i4, obj_douzou/obj_s_douzou_b4_tex_pic_i4, 32, 16]
-          - [0xD6A368, af_i4, obj_douzou/obj_s_douzou_b5_tex_pic_i4, 32, 16]
-          - [0xD6A468, af_i4, obj_douzou/obj_s_douzou_b6_tex_pic_i4, 32, 16]
-          - [0xD6A568, af_i4, obj_douzou/obj_s_douzou_b7_tex_pic_i4, 32, 16]
-          - [0xD6A668, af_i4, obj_douzou/obj_s_douzou_b8_tex_pic_i4, 32, 16]
-          - [0xD6A768, af_i4, obj_douzou/obj_s_douzou_bm1_tex_pic_i4, 16, 16]
-          - [0xD6A7E8, af_i4, obj_douzou/obj_s_douzou_bm2_tex_pic_i4, 16, 16]
-          - [0xD6A868, af_i4, obj_douzou/obj_s_douzou_g1_tex_pic_i4, 32, 16]
-          - [0xD6A968, af_i4, obj_douzou/obj_s_douzou_g2_tex_pic_i4, 32, 16]
-          - [0xD6AA68, af_i4, obj_douzou/obj_s_douzou_g3_tex_pic_i4, 32, 16]
-          - [0xD6AB68, af_i4, obj_douzou/obj_s_douzou_g4_tex_pic_i4, 32, 16]
-          - [0xD6AC68, af_i4, obj_douzou/obj_s_douzou_g5_tex_pic_i4, 32, 16]
-          - [0xD6AD68, af_i4, obj_douzou/obj_s_douzou_g6_tex_pic_i4, 32, 16]
-          - [0xD6AE68, af_i4, obj_douzou/obj_s_douzou_g8_tex_pic_i4, 32, 16]
-          - [0xD6AF68, af_i4, obj_douzou/obj_s_douzou_gm1_tex_pic_i4, 16, 16]
-          - [0xD6AFE8, af_i4, obj_douzou/obj_s_douzou_gm2_tex_pic_i4, 16, 16]
-          - [0xD6B068, af_i4, obj_douzou/obj_s_douzou_metal_tex_pic_i4, 16, 8]
+          - [0xD69DE8, ci4, obj_douzou/obj_s_douzou_dai_tex_txt, 16, 32, obj_s_douzou_dai_pal]
+          - [0xD69EE8, i4, obj_douzou/obj_s_douzou_name_tex_txt, 16, 16]
+          - [0xD69F68, i4, obj_douzou/obj_s_douzou_b1_tex_pic_i4, 32, 16]
+          - [0xD6A068, i4, obj_douzou/obj_s_douzou_b2_tex_pic_i4, 32, 16]
+          - [0xD6A168, i4, obj_douzou/obj_s_douzou_b3_tex_pic_i4, 32, 16]
+          - [0xD6A268, i4, obj_douzou/obj_s_douzou_b4_tex_pic_i4, 32, 16]
+          - [0xD6A368, i4, obj_douzou/obj_s_douzou_b5_tex_pic_i4, 32, 16]
+          - [0xD6A468, i4, obj_douzou/obj_s_douzou_b6_tex_pic_i4, 32, 16]
+          - [0xD6A568, i4, obj_douzou/obj_s_douzou_b7_tex_pic_i4, 32, 16]
+          - [0xD6A668, i4, obj_douzou/obj_s_douzou_b8_tex_pic_i4, 32, 16]
+          - [0xD6A768, i4, obj_douzou/obj_s_douzou_bm1_tex_pic_i4, 16, 16]
+          - [0xD6A7E8, i4, obj_douzou/obj_s_douzou_bm2_tex_pic_i4, 16, 16]
+          - [0xD6A868, i4, obj_douzou/obj_s_douzou_g1_tex_pic_i4, 32, 16]
+          - [0xD6A968, i4, obj_douzou/obj_s_douzou_g2_tex_pic_i4, 32, 16]
+          - [0xD6AA68, i4, obj_douzou/obj_s_douzou_g3_tex_pic_i4, 32, 16]
+          - [0xD6AB68, i4, obj_douzou/obj_s_douzou_g4_tex_pic_i4, 32, 16]
+          - [0xD6AC68, i4, obj_douzou/obj_s_douzou_g5_tex_pic_i4, 32, 16]
+          - [0xD6AD68, i4, obj_douzou/obj_s_douzou_g6_tex_pic_i4, 32, 16]
+          - [0xD6AE68, i4, obj_douzou/obj_s_douzou_g8_tex_pic_i4, 32, 16]
+          - [0xD6AF68, i4, obj_douzou/obj_s_douzou_gm1_tex_pic_i4, 16, 16]
+          - [0xD6AFE8, i4, obj_douzou/obj_s_douzou_gm2_tex_pic_i4, 16, 16]
+          - [0xD6B068, i4, obj_douzou/obj_s_douzou_metal_tex_pic_i4, 16, 8]
           - [0xD6B0A8, ckf_ckcb, obj_douzou/cKF_ckcb_r_obj_s_douzou_tbl]
           - [0xD6B0B4, ckf_c, obj_douzou/cKF_c_obj_s_douzou_tbl]
           - [0xD6B0F0, ckf_ba, obj_douzou/cKF_ba_r_obj_s_douzou]
@@ -825,28 +827,28 @@
           - [0xD6C7D0, af_gfx, obj_douzou/obj_w_douzou_boy_mouth_model]
           - [0xD6C858, af_gfx, obj_douzou/obj_w_douzou_boy_face_model]
           - [0xD6C8E8, af_gfx, obj_douzou/obj_w_douzou_boy_model]
-          - [0xD6CB48, af_ci4, obj_douzou/obj_w_douzou_dai_tex_txt, 16, 32, 0xD5C388, 0x20]
-          - [0xD6CC48, af_i4, obj_douzou/obj_w_douzou_name_tex_txt, 16, 16]
-          - [0xD6CCC8, af_i4, obj_douzou/obj_w_douzou_b1_tex_pic_i4, 32, 16]
-          - [0xD6CDC8, af_i4, obj_douzou/obj_w_douzou_b2_tex_pic_i4, 32, 16]
-          - [0xD6CEC8, af_i4, obj_douzou/obj_w_douzou_b3_tex_pic_i4, 32, 16]
-          - [0xD6CFC8, af_i4, obj_douzou/obj_w_douzou_b4_tex_pic_i4, 32, 16]
-          - [0xD6D0C8, af_i4, obj_douzou/obj_w_douzou_b5_tex_pic_i4, 32, 16]
-          - [0xD6D1C8, af_i4, obj_douzou/obj_w_douzou_b6_tex_pic_i4, 32, 16]
-          - [0xD6D2C8, af_i4, obj_douzou/obj_w_douzou_b7_tex_pic_i4, 32, 16]
-          - [0xD6D3C8, af_i4, obj_douzou/obj_w_douzou_b8_tex_pic_i4, 32, 16]
-          - [0xD6D4C8, af_i4, obj_douzou/obj_w_douzou_bm1_tex_pic_i4, 16, 16]
-          - [0xD6D548, af_i4, obj_douzou/obj_w_douzou_bm2_tex_pic_i4, 16, 16]
-          - [0xD6D5C8, af_i4, obj_douzou/obj_w_douzou_g1_tex_pic_i4, 32, 16]
-          - [0xD6D6C8, af_i4, obj_douzou/obj_w_douzou_g2_tex_pic_i4, 32, 16]
-          - [0xD6D7C8, af_i4, obj_douzou/obj_w_douzou_g3_tex_pic_i4, 32, 16]
-          - [0xD6D8C8, af_i4, obj_douzou/obj_w_douzou_g4_tex_pic_i4, 32, 16]
-          - [0xD6D9C8, af_i4, obj_douzou/obj_w_douzou_g5_tex_pic_i4, 32, 16]
-          - [0xD6DAC8, af_i4, obj_douzou/obj_w_douzou_g6_tex_pic_i4, 32, 16]
-          - [0xD6DBC8, af_i4, obj_douzou/obj_w_douzou_g8_tex_pic_i4, 32, 16]
-          - [0xD6DCC8, af_i4, obj_douzou/obj_w_douzou_gm1_tex_pic_i4, 16, 16]
-          - [0xD6DD48, af_i4, obj_douzou/obj_w_douzou_gm2_tex_pic_i4, 16, 16]
-          - [0xD6DDC8, af_i4, obj_douzou/obj_w_douzou_metal_tex_pic_i4, 16, 8]
+          - [0xD6CB48, ci4, obj_douzou/obj_w_douzou_dai_tex_txt, 16, 32, obj_w_douzou_pal]
+          - [0xD6CC48, i4, obj_douzou/obj_w_douzou_name_tex_txt, 16, 16]
+          - [0xD6CCC8, i4, obj_douzou/obj_w_douzou_b1_tex_pic_i4, 32, 16]
+          - [0xD6CDC8, i4, obj_douzou/obj_w_douzou_b2_tex_pic_i4, 32, 16]
+          - [0xD6CEC8, i4, obj_douzou/obj_w_douzou_b3_tex_pic_i4, 32, 16]
+          - [0xD6CFC8, i4, obj_douzou/obj_w_douzou_b4_tex_pic_i4, 32, 16]
+          - [0xD6D0C8, i4, obj_douzou/obj_w_douzou_b5_tex_pic_i4, 32, 16]
+          - [0xD6D1C8, i4, obj_douzou/obj_w_douzou_b6_tex_pic_i4, 32, 16]
+          - [0xD6D2C8, i4, obj_douzou/obj_w_douzou_b7_tex_pic_i4, 32, 16]
+          - [0xD6D3C8, i4, obj_douzou/obj_w_douzou_b8_tex_pic_i4, 32, 16]
+          - [0xD6D4C8, i4, obj_douzou/obj_w_douzou_bm1_tex_pic_i4, 16, 16]
+          - [0xD6D548, i4, obj_douzou/obj_w_douzou_bm2_tex_pic_i4, 16, 16]
+          - [0xD6D5C8, i4, obj_douzou/obj_w_douzou_g1_tex_pic_i4, 32, 16]
+          - [0xD6D6C8, i4, obj_douzou/obj_w_douzou_g2_tex_pic_i4, 32, 16]
+          - [0xD6D7C8, i4, obj_douzou/obj_w_douzou_g3_tex_pic_i4, 32, 16]
+          - [0xD6D8C8, i4, obj_douzou/obj_w_douzou_g4_tex_pic_i4, 32, 16]
+          - [0xD6D9C8, i4, obj_douzou/obj_w_douzou_g5_tex_pic_i4, 32, 16]
+          - [0xD6DAC8, i4, obj_douzou/obj_w_douzou_g6_tex_pic_i4, 32, 16]
+          - [0xD6DBC8, i4, obj_douzou/obj_w_douzou_g8_tex_pic_i4, 32, 16]
+          - [0xD6DCC8, i4, obj_douzou/obj_w_douzou_gm1_tex_pic_i4, 16, 16]
+          - [0xD6DD48, i4, obj_douzou/obj_w_douzou_gm2_tex_pic_i4, 16, 16]
+          - [0xD6DDC8, i4, obj_douzou/obj_w_douzou_metal_tex_pic_i4, 16, 8]
           - [0xD6DE08, ckf_ckcb, obj_douzou/cKF_ckcb_r_obj_w_douzou_tbl]
           - [0xD6DE14, ckf_c, obj_douzou/cKF_c_obj_w_douzou_tbl]
           - [0xD6DE50, ckf_ba, obj_douzou/cKF_ba_r_obj_w_douzou]
@@ -863,15 +865,15 @@
           - [0xD6E328, af_gfx, obj_dump/obj_s_dump_t1T_model]
           - [0xD6E408, af_gfx, obj_dump/obj_s_dump_t2T_model]
           - [0xD6E4B8, af_gfx, obj_dump/dump_s_DL_model]
-          - [0xD6E4D0, af_ci4, obj_dump/obj_s_dump_t1_tex, 128, 32, 0xD5C1C8, 0x20]
-          - [0xD6ECD0, af_ci4, obj_dump/obj_s_dump_t2_tex, 128, 32, 0xD5C1C8, 0x20]
+          - [0xD6E4D0, ci4, obj_dump/obj_s_dump_t1_tex, 128, 32, obj_dump_pal]
+          - [0xD6ECD0, ci4, obj_dump/obj_s_dump_t2_tex, 128, 32, obj_dump_pal]
           - [0xD6F4D0, pad]
           - [0xD6F4E0, vtx, obj_dump/obj_w_dump_v]
           - [0xD6F920, af_gfx, obj_dump/obj_w_dump_t1T_model]
           - [0xD6FA00, af_gfx, obj_dump/obj_w_dump_t2T_model]
           - [0xD6FAB0, af_gfx, obj_dump/dump_w_DL_model]
-          - [0xD6FAC8, af_ci4, obj_dump/obj_w_dump_t1_tex, 128, 32, 0xD5C1C8, 0x20]
-          - [0xD702C8, af_ci4, obj_dump/obj_w_dump_t2_tex, 128, 32, 0xD5C1C8, 0x20]
+          - [0xD6FAC8, ci4, obj_dump/obj_w_dump_t1_tex, 128, 32, obj_dump_pal]
+          - [0xD702C8, ci4, obj_dump/obj_w_dump_t2_tex, 128, 32, obj_dump_pal]
           - [0xD70AC8]
       - [auto, c, obj_fallS/obj_fallS]
       - start: 0xD70AD0
@@ -885,11 +887,11 @@
           - [0xD70F30, af_gfx, obj_fallS/obj_fallS_grpDT_model]
           - [0xD71008, af_gfx, obj_fallS/obj_fallS_grpCT_model]
           - [0xD710F0, af_gfx, obj_fallS/obj_fallS_model]
-          - [0xD71118, af_ia8, obj_fallS/obj_fallCA1_tex_rgb_ia8, 32, 32]
-          - [0xD71518, af_i4, obj_fallS/obj_fallA2_tex_rgb_i4, 32, 32]
-          - [0xD71718, af_i4, obj_fallS/obj_fallA3_tex_rgb_i4, 16, 16]
-          - [0xD71798, af_i4, obj_fallS/obj_fallC2_tex_rgb_i4, 32, 32]
-          - [0xD71998, af_i4, obj_fallS/obj_fallC3_tex_rgb_i4, 16, 16]
+          - [0xD71118, ia8, obj_fallS/obj_fallCA1_tex_rgb_ia8, 32, 32]
+          - [0xD71518, i4, obj_fallS/obj_fallA2_tex_rgb_i4, 32, 32]
+          - [0xD71718, i4, obj_fallS/obj_fallA3_tex_rgb_i4, 16, 16]
+          - [0xD71798, i4, obj_fallS/obj_fallC2_tex_rgb_i4, 32, 32]
+          - [0xD71998, i4, obj_fallS/obj_fallC3_tex_rgb_i4, 16, 16]
           - [0xD71A18, evw_scroll, obj_fallS/obj_fallS_evw_anime_1]
           - [0xD71A20, evw_scroll, obj_fallS/obj_fallS_evw_anime_2]
           - [0xD71A28, evw_scroll, obj_fallS/obj_fallS_evw_anime_3]
@@ -908,11 +910,11 @@
           - [0xD71EC0, af_gfx, obj_fallSE/obj_fallSE_grpDT_model]
           - [0xD71F98, af_gfx, obj_fallSE/obj_fallSE_grpCT_model]
           - [0xD72080, af_gfx, obj_fallSE/obj_fallSESW_model]
-          - [0xD720A8, af_ia8, obj_fallSE/obj_fallCA1_tex_rgb_ia8_2, 32, 32]
-          - [0xD724A8, af_i4, obj_fallSE/obj_fallA2_tex_rgb_i4_2, 32, 32]
-          - [0xD726A8, af_i4, obj_fallSE/obj_fallA3_tex_rgb_i4_2, 16, 16]
-          - [0xD72728, af_i4, obj_fallSE/obj_fallC2_tex_rgb_i4_2, 32, 32]
-          - [0xD72928, af_i4, obj_fallSE/obj_fallC3_tex_rgb_i4_2, 16, 16]
+          - [0xD720A8, ia8, obj_fallSE/obj_fallCA1_tex_rgb_ia8, 32, 32]
+          - [0xD724A8, i4, obj_fallSE/obj_fallA2_tex_rgb_i4, 32, 32]
+          - [0xD726A8, i4, obj_fallSE/obj_fallA3_tex_rgb_i4, 16, 16]
+          - [0xD72728, i4, obj_fallSE/obj_fallC2_tex_rgb_i4, 32, 32]
+          - [0xD72928, i4, obj_fallSE/obj_fallC3_tex_rgb_i4, 16, 16]
           - [0xD729A8, evw_scroll, obj_fallSE/obj_fallSE_evw_anime_1]
           - [0xD729B0, evw_scroll, obj_fallSE/obj_fallSE_evw_anime_2]
           - [0xD729B8, evw_scroll, obj_fallSE/obj_fallSE_evw_anime_3]
@@ -930,9 +932,9 @@
           - [0xD73028, af_gfx, obj_e_goza/obj_e_goza_t1T_model]
           - [0xD73138, af_gfx, obj_e_goza/obj_e_goza_t3T_model]
           - [0xD73218, af_gfx, obj_e_goza/goza_DL_model]
-          - [0xD73238, af_ci4, obj_e_goza/obj_e_goza_t1_tex, 128, 32, 0xD5C048, 0x20]
-          - [0xD73A38, af_ci4, obj_e_goza/obj_e_goza_t2_tex, 128, 32, 0xD5C048, 0x20]
-          - [0xD74238, af_ci4, obj_e_goza/obj_e_goza_t3_tex, 128, 32, 0xD5C048, 0x20]
+          - [0xD73238, ci4, obj_e_goza/obj_e_goza_t1_tex, 128, 32, obj_e_goza_pal]
+          - [0xD73A38, ci4, obj_e_goza/obj_e_goza_t2_tex, 128, 32, obj_e_goza_pal]
+          - [0xD74238, ci4, obj_e_goza/obj_e_goza_t3_tex, 128, 32, obj_e_goza_pal]
           - [0xD74A38]
       - [auto, c, obj_e_kago/obj_e_kago]
       - start: 0xD74A40
@@ -944,23 +946,23 @@
           - [0xD74CD8, af_gfx, obj_e_kago/obj_e_kago_r_t1T_model]
           - [0xD74DA8, af_gfx, obj_e_kago/obj_e_kago_r_t2T_model]
           - [0xD74EA8, af_gfx, obj_e_kago/kago_r_DL_model]
-          - [0xD74EC0, af_ci4, obj_e_kago/obj_e_kago_r_t1_tex, 128, 32, 0xD5C128, 0x20]
-          - [0xD756C0, af_ci4, obj_e_kago/obj_e_kago_r_t2_tex, 128, 32, 0xD5C128, 0x20]
+          - [0xD74EC0, ci4, obj_e_kago/obj_e_kago_r_t1_tex, 128, 32, obj_e_kago_r_pal]
+          - [0xD756C0, ci4, obj_e_kago/obj_e_kago_r_t2_tex, 128, 32, obj_e_kago_r_pal]
           - [0xD75EC0, vtx, obj_e_kago/obj_e_kago_r_ball_v]
           - [0xD76130, af_gfx, obj_e_kago/obj_e_kago_r_ball_t1T_model]
           - [0xD76220, af_gfx, obj_e_kago/kago_r_ball_DL_model]
-          - [0xD76230, af_ci4, obj_e_kago/obj_e_kago_r_ball_t1_tex, 128, 32, 0xD5C128, 0x20]
+          - [0xD76230, ci4, obj_e_kago/obj_e_kago_r_ball_t1_tex, 128, 32, obj_e_kago_r_pal]
           - [0xD76A30, pad]
           - [0xD76A40, vtx, obj_e_kago/obj_e_kago_w_v]
           - [0xD76CD0, af_gfx, obj_e_kago/obj_e_kago_w_t1T_model]
           - [0xD76DA0, af_gfx, obj_e_kago/obj_e_kago_w_t2T_model]
           - [0xD76EA0, af_gfx, obj_e_kago/kago_w_DL_model]
-          - [0xD76EB8, af_ci4, obj_e_kago/obj_e_kago_w_t1_tex, 128, 32, 0xD5C148, 0x20]
-          - [0xD776B8, af_ci4, obj_e_kago/obj_e_kago_w_t2_tex, 128, 32, 0xD5C148, 0x20]
+          - [0xD76EB8, ci4, obj_e_kago/obj_e_kago_w_t1_tex, 128, 32, obj_e_kago_w_pal]
+          - [0xD776B8, ci4, obj_e_kago/obj_e_kago_w_t2_tex, 128, 32, obj_e_kago_w_pal]
           - [0xD77EB8, vtx, obj_e_kago/obj_e_kago_w_ball_v]
           - [0xD780F8, af_gfx, obj_e_kago/obj_e_kago_w_ball_t1T_model]
           - [0xD781E0, af_gfx, obj_e_kago/kago_w_ball_DL_model]
-          - [0xD781F0, af_ci4, obj_e_kago/obj_e_kago_w_ball_t1_tex, 128, 32, 0xD5C148, 0x20]
+          - [0xD781F0, ci4, obj_e_kago/obj_e_kago_w_ball_t1_tex, 128, 32, obj_e_kago_w_pal]
           - [0xD789F0]
       - [auto, c, obj_w_kamakura/obj_w_kamakura]
       - start: 0xD78A00
@@ -975,10 +977,10 @@
           - [0xD79108, af_gfx, obj_w_kamakura/obj_w_kamakura_t1_onT_model]
           - [0xD791A8, af_gfx, obj_w_kamakura/obj_w_kamakura_t3_onT_model]
           - [0xD79230, af_gfx, obj_w_kamakura/kamakura_DL_model]
-          - [0xD79258, af_ci4, obj_w_kamakura/obj_w_kamakura_t1_tex, 128, 32, 0xD5BFE8, 0x20]
-          - [0xD79A58, af_ci4, obj_w_kamakura/obj_w_kamakura_t2_tex, 128, 32, 0xD5BFE8, 0x20]
-          - [0xD7A258, af_ci4, obj_w_kamakura/obj_w_kamakura_t3_tex, 128, 32, 0xD5BFE8, 0x20]
-          - [0xD7AA58, af_i4, obj_w_kamakura/obj_w_kamakura_light02_tex, 16, 16]
+          - [0xD79258, ci4, obj_w_kamakura/obj_w_kamakura_t1_tex, 128, 32, obj_w_kamakura_pal]
+          - [0xD79A58, ci4, obj_w_kamakura/obj_w_kamakura_t2_tex, 128, 32, obj_w_kamakura_pal]
+          - [0xD7A258, ci4, obj_w_kamakura/obj_w_kamakura_t3_tex, 128, 32, obj_w_kamakura_pal]
+          - [0xD7AA58, i4, obj_w_kamakura/obj_w_kamakura_light02_tex, 16, 16]
           - [0xD7AAD8]
       - [auto, c, obj_e_koinobori/obj_e_koinobori]
       - start: 0xD7AAE0
@@ -999,8 +1001,8 @@
           - [0xD7BF00, af_gfx, obj_e_koinobori/obj_e_koinobori_fukiB_model]
           - [0xD7BFD0, af_gfx, obj_e_koinobori/obj_e_koinobori_fukiC_model]
           - [0xD7C0D0, af_gfx, obj_e_koinobori/obj_e_koinobori_yaguruma_model]
-          - [0xD7C160, af_ci4, obj_e_koinobori/obj_e_koinobori_t1_tex_txt, 128, 32, 0xD5C1A8, 0x20]
-          - [0xD7C960, af_ci4, obj_e_koinobori/obj_e_koinobori_t3_tex_txt, 128, 32, 0xD5C1A8, 0x20]
+          - [0xD7C160, ci4, obj_e_koinobori/obj_e_koinobori_t1_tex_txt, 128, 32, obj_e_koinobori_a_pal]
+          - [0xD7C960, ci4, obj_e_koinobori/obj_e_koinobori_t3_tex_txt, 128, 32, obj_e_koinobori_a_pal]
           - [0xD7D160, ckf_je, obj_e_koinobori/cKF_je_r_obj_e_koinobori_tbl]
           - [0xD7D22C, ckf_bs, obj_e_koinobori/cKF_bs_r_obj_e_koinobori]
           - [0xD7D234, ckf_ckcb, obj_e_koinobori/cKF_ckcb_r_obj_e_koinobori_tbl]
@@ -1026,8 +1028,8 @@
           - [0xD7E4F8, af_gfx, obj_lotus/obj_s_lotus_leafC_model]
           - [0xD7E598, af_gfx, obj_lotus/obj_s_lotus_leafB_model]
           - [0xD7E638, af_gfx, obj_lotus/obj_s_lotus_leafA_model]
-          - [0xD7E6D8, af_ci4, obj_lotus/obj_lotus_flower_tex_txt, 32, 32, 0xD5C328, 0x20]
-          - [0xD7E8D8, af_ci4, obj_lotus/obj_lotus_leaf_tex_txt, 64, 32, 0xD5C328, 0x20]
+          - [0xD7E6D8, ci4, obj_lotus/obj_lotus_flower_tex_txt, 32, 32, obj_01_lotus_pal]
+          - [0xD7E8D8, ci4, obj_lotus/obj_lotus_leaf_tex_txt, 64, 32, obj_01_lotus_pal]
           - [0xD7ECD8, ckf_je, obj_lotus/cKF_je_r_obj_s_lotus_tbl]
           - [0xD7EDBC, ckf_bs, obj_lotus/cKF_bs_r_obj_s_lotus]
           - [0xD7EDC4, ckf_ckcb, obj_lotus/cKF_ckcb_r_obj_s_lotus_tbl]
@@ -1045,9 +1047,9 @@
           - [0xD7EFE0, pad]
           - [0xD7EFE8, vtx, obj_e_mikanbox/obj_e_mikanbox_v]
           - [0xD7F1A8, af_gfx, obj_e_mikanbox/obj_e_mikanbox_model]
-          - [0xD7F258, af_ci4, obj_e_mikanbox/obj_e_mikanbox_tex, 64, 32, 0xD5C348, 0x20]
+          - [0xD7F258, ci4, obj_e_mikanbox/obj_e_mikanbox_tex, 64, 32, obj_e_mikanbox_pal]
           - [0xD7F658, af_gfx, obj_e_mikanbox/obj_e_mikanbox_copyrightT_model]
-          - [0xD7F660, af_i4, obj_e_mikanbox/copyright_tex, 256, 16]
+          - [0xD7F660, i4, obj_e_mikanbox/copyright_tex, 256, 16]
           - [0xD7FE60, af_gfx, obj_e_mikanbox/obj_e_mikanbox_copyrightT_model2]
           - [0xD7FED8]
       - [auto, c, obj_e_mikuji/obj_e_mikuji]
@@ -1061,9 +1063,9 @@
           - [0xD80248, af_gfx, obj_e_mikuji/obj_e_mikuji_t1T_model]
           - [0xD802E0, af_gfx, obj_e_mikuji/obj_e_mikuji_t2T_model]
           - [0xD80388, af_gfx, obj_e_mikuji/mikuji_DL_model]
-          - [0xD803A8, af_ci4, obj_e_mikuji/obj_e_mikuji_t1_tex, 128, 32, 0xD5C0C8, 0x20]
-          - [0xD80BA8, af_ci4, obj_e_mikuji/obj_e_mikuji_t2_tex, 128, 32, 0xD5C0C8, 0x20]
-          - [0xD813A8, af_ci4, obj_e_mikuji/obj_e_mikuji_t3_tex, 128, 32, 0xD5C0C8, 0x20]
+          - [0xD803A8, ci4, obj_e_mikuji/obj_e_mikuji_t1_tex, 128, 32, obj_e_mikuji_pal]
+          - [0xD80BA8, ci4, obj_e_mikuji/obj_e_mikuji_t2_tex, 128, 32, obj_e_mikuji_pal]
+          - [0xD813A8, ci4, obj_e_mikuji/obj_e_mikuji_t3_tex, 128, 32, obj_e_mikuji_pal]
           - [0xD81BA8]
       - [auto, c, obj_house/obj_house]
       - start: 0xD81BB0
@@ -1079,11 +1081,21 @@
           - [0xD82570, af_gfx, obj_house/obj_s_house1_t2_model]
           - [0xD82648, af_gfx, obj_house/obj_s_house1_t1_model]
           - [0xD82718, af_gfx, obj_house/obj_s_house1_door_model]
-          - [0xD827D8, af_ci4, obj_house/obj_s_house1_t1_tex_txt, 128, 32, 0xD5B008, 0x20]
-          - [0xD82FD8, af_i4, obj_house/obj_s_house1_window_txt, 16, 16]
-          - [0xD83058, af_ci4, obj_house/obj_s_house1_t3_tex_txt, 128, 32, 0xD5B008, 0x20]
-          - [0xD83858, af_ci4, obj_house/obj_s_house1_t2_tex_txt, 128, 32, 0xD5B008, 0x20]
-          - [0xD84058, af_ci4, obj_house/obj_s_house1_t4_tex_txt, 32, 24, 0xD5B008, 0x20]
+          - [0xD827D8, ci4, obj_house/obj_s_house1_t1_tex_txt, 128, 32, obj_s_house1_a_pal]
+          - [0xD82FD8, i4, obj_house/obj_s_house1_window_txt, 16, 16]
+          - start: 0xD83058
+            type: ci4
+            name: obj_house/obj_s_house1_t3_tex_txt
+            width: 128
+            height: 32
+            palettes: [obj_s_house1_a_pal, obj_s_house1_b_pal, obj_s_house1_c_pal, obj_s_house1_d_pal, obj_s_house1_e_pal]
+          - start: 0xD83858
+            type: ci4
+            name: obj_house/obj_s_house1_t2_tex_txt
+            width: 128
+            height: 32
+            palettes: [obj_s_house1_a_pal, obj_s_house1_b_pal, obj_s_house1_c_pal, obj_s_house1_d_pal, obj_s_house1_e_pal]
+          - [0xD84058, ci4, obj_house/obj_s_house1_t4_tex_txt, 32, 24, obj_s_house1_a_pal]
           - [0xD841D8, ckf_je, obj_house/cKF_je_r_obj_s_house1_tbl]
           - [0xD84238, ckf_bs, obj_house/cKF_bs_r_obj_s_house1]
           - [0xD84240, ckf_ckcb, obj_house/cKF_ckcb_r_obj_s_house1_tbl]
@@ -4650,8 +4662,8 @@
           - [0x1107380, af_gfx, kasa_umb01_model]
           - [0x1107448, af_gfx, e_umb01_model]
           - [0x1107508, af_palette, tol_umb_01_pal]
-          - [0x1107528, af_ci4, tol_umb_01_kasa_tex_txt, 32, 32, 0x1107508, 0x20]
-          - [0x1107728, af_ci4, tol_umb_01_tuka_tex_txt, 32, 32, 0x1107508, 0x20]
+          - [0x1107528, ci4, tol_umb_01_kasa_tex_txt, 32, 32, tol_umb_01_pal]
+          - [0x1107728, ci4, tol_umb_01_tuka_tex_txt, 32, 32, tol_umb_01_pal]
   - [0x1107930]
 
   - name: tol_umb_02
@@ -4673,9 +4685,9 @@
           - [0x11083E0, af_gfx, kasa_umb02_model]
           - [0x1108508, af_gfx, e_umb02_model]
           - [0x11085C8, af_palette, tol_umb02_pal]
-          - [0x11085E8, af_ci4, tol_umb02_kasa2_tex_txt, 16, 64, 0x11085C8, 0x20]
-          - [0x11087E8, af_ci4, tol_umb02_kasa1_tex_txt, 16, 64, 0x11085C8, 0x20]
-          - [0x11089E8, af_ci4, tol_umb02_tuka_tex_txt, 32, 32, 0x11085C8, 0x20]
+          - [0x11085E8, ci4, tol_umb02_kasa2_tex_txt, 16, 64, tol_umb02_pal]
+          - [0x11087E8, ci4, tol_umb02_kasa1_tex_txt, 16, 64, tol_umb02_pal]
+          - [0x11089E8, ci4, tol_umb02_tuka_tex_txt, 32, 32, tol_umb02_pal]
   - [0x1108BF0]
 
   - name: tol_umb_03
@@ -4697,8 +4709,8 @@
           - [0x1109380, af_gfx, kasa_umb03_model]
           - [0x1109450, af_gfx, e_umb03_model]
           - [0x1109510, af_palette, tol_umb_03_pal]
-          - [0x1109530, af_ci4, tol_umb_03_kasa1_tex_txt, 32, 64, 0x1109510, 0x20]
-          - [0x1109930, af_ci4, tol_umb_03_tuka_tex_txt, 32, 32, 0x1109510, 0x20]
+          - [0x1109530, ci4, tol_umb_03_kasa1_tex_txt, 32, 64, tol_umb_03_pal]
+          - [0x1109930, ci4, tol_umb_03_tuka_tex_txt, 32, 32, tol_umb_03_pal]
   - [0x1109B30]
 
   - name: tol_umb_04
@@ -4720,9 +4732,9 @@
           - [0x110A380, af_gfx, kasa_umb04_model]
           - [0x110A4C0, af_gfx, e_umb04_model]
           - [0x110A580, af_palette, tol_umb_04_pal]
-          - [0x110A5A0, af_ci4, tol_umb_04_kasa1_tex_txt, 16, 32, 0x110A580, 0x20]
-          - [0x110A6A0, af_ci4, tol_umb_04_kasa2_tex_txt, 16, 32, 0x110A580, 0x20]
-          - [0x110A7A0, af_ci4, tol_umb_04_tuka_tex_txt, 32, 32, 0x110A580, 0x20]
+          - [0x110A5A0, ci4, tol_umb_04_kasa1_tex_txt, 16, 32, tol_umb_04_pal]
+          - [0x110A6A0, ci4, tol_umb_04_kasa2_tex_txt, 16, 32, tol_umb_04_pal]
+          - [0x110A7A0, ci4, tol_umb_04_tuka_tex_txt, 32, 32, tol_umb_04_pal]
   - [0x110A9A0]
 
   - name: tol_umb_05
@@ -4744,8 +4756,8 @@
           - [0x110B380, af_gfx, kasa_umb05_model]
           - [0x110B448, af_gfx, e_umb05_model]
           - [0x110B508, af_palette, tol_umb_05_pal]
-          - [0x110B528, af_ci4, tol_umb_05_kasa_tex_txt, 32, 32, 0x110B508, 0x20]
-          - [0x110B728, af_ci4, tol_umb_05_tuka_tex_txt, 32, 32, 0x110B508, 0x20]
+          - [0x110B528, ci4, tol_umb_05_kasa_tex_txt, 32, 32, tol_umb_05_pal]
+          - [0x110B728, ci4, tol_umb_05_tuka_tex_txt, 32, 32, tol_umb_05_pal]
   - [0x110B930]
 
   - name: tol_umb_06
@@ -4767,8 +4779,8 @@
           - [0x110C5E0, af_gfx, kasa_umb06_model]
           - [0x110C6D0, af_gfx, e_umb06_model]
           - [0x110C790, af_palette, tol_umb_06_pal]
-          - [0x110C7B0, af_ci4, tol_umb_06_kasa1_tex_txt, 32, 32, 0x110C790, 0x20]
-          - [0x110C9B0, af_ci4, tol_umb_06_tuka_tex_txt, 32, 32, 0x110C790, 0x20]
+          - [0x110C7B0, ci4, tol_umb_06_kasa1_tex_txt, 32, 32, tol_umb_06_pal]
+          - [0x110C9B0, ci4, tol_umb_06_tuka_tex_txt, 32, 32, tol_umb_06_pal]
   - [0x110CBB0]
 
   - name: tol_umb_07
@@ -4790,9 +4802,9 @@
           - [0x110D260, af_gfx, kasa_umb07_model]
           - [0x110D380, af_gfx, e_umb07_model]
           - [0x110D440, af_palette, tol_umb07_pal]
-          - [0x110D460, af_ci4, tol_umb07_kasa2_tex_txt, 16, 32, 0x110D440, 0x20]
-          - [0x110D560, af_ci4, tol_umb07_kasa1_tex_txt, 32, 64, 0x110D440, 0x20]
-          - [0x110D960, af_ci4, tol_umb07_tuka_tex_txt, 32, 32, 0x110D440, 0x20]
+          - [0x110D460, ci4, tol_umb07_kasa2_tex_txt, 16, 32, tol_umb07_pal]
+          - [0x110D560, ci4, tol_umb07_kasa1_tex_txt, 32, 64, tol_umb07_pal]
+          - [0x110D960, ci4, tol_umb07_tuka_tex_txt, 32, 32, tol_umb07_pal]
   - [0x110DB60]
 
   - name: tol_umb_08
@@ -4814,9 +4826,9 @@
           - [0x110E390, af_gfx, kasa_umb08_model]
           - [0x110E458, af_gfx, e_umb08_model]
           - [0x110E570, af_palette, tol_umb08_pal]
-          - [0x110E590, af_ci4, tol_umb08_kasa1_tex_txt, 32, 32, 0x110E570, 0x20]
-          - [0x110E790, af_ci4, tol_umb08_kasa2_tex_txt, 8, 16, 0x110E570, 0x20]
-          - [0x110E7D0, af_ci4, tol_umb08_tuka_tex_txt, 32, 32, 0x110E570, 0x20]
+          - [0x110E590, ci4, tol_umb08_kasa1_tex_txt, 32, 32, tol_umb08_pal]
+          - [0x110E790, ci4, tol_umb08_kasa2_tex_txt, 8, 16, tol_umb08_pal]
+          - [0x110E7D0, ci4, tol_umb08_tuka_tex_txt, 32, 32, tol_umb08_pal]
   - [0x110E9D0]
 
 
@@ -4839,9 +4851,9 @@
           - [0x110F390, af_gfx, kasa_umb09_model]
           - [0x110F458, af_gfx, e_umb09_model]
           - [0x110F570, af_palette, tol_umb09_pal]
-          - [0x110F590, af_ci4, tol_umb09_kasa1_tex_txt, 32, 32, 0x110F570, 0x20]
-          - [0x110F790, af_ci4, tol_umb09_kasa2_tex_txt, 8, 16, 0x110F570, 0x20]
-          - [0x110F7D0, af_ci4, tol_umb09_tuka_tex_txt, 32, 32, 0x110F570, 0x20]
+          - [0x110F590, ci4, tol_umb09_kasa1_tex_txt, 32, 32, tol_umb09_pal]
+          - [0x110F790, ci4, tol_umb09_kasa2_tex_txt, 8, 16, tol_umb09_pal]
+          - [0x110F7D0, ci4, tol_umb09_tuka_tex_txt, 32, 32, tol_umb09_pal]
   - [0x110F9D0]
 
   - name: tol_umb_10
@@ -4863,9 +4875,9 @@
           - [0x1110390, af_gfx, kasa_umb10_model]
           - [0x1110458, af_gfx, e_umb10_model]
           - [0x1110570, af_palette, tol_umb10_pal]
-          - [0x1110590, af_ci4, tol_umb10_kasa1_tex_txt, 16, 64, 0x1110570, 0x20]
-          - [0x1110790, af_ci4, tol_umb10_kasa2_tex_txt, 8, 16, 0x1110570, 0x20]
-          - [0x11107D0, af_ci4, tol_umb10_tuka_tex_txt, 32, 32, 0x1110570, 0x20]
+          - [0x1110590, ci4, tol_umb10_kasa1_tex_txt, 16, 64, tol_umb10_pal]
+          - [0x1110790, ci4, tol_umb10_kasa2_tex_txt, 8, 16, tol_umb10_pal]
+          - [0x11107D0, ci4, tol_umb10_tuka_tex_txt, 32, 32, tol_umb10_pal]
   - [0x11109D0]
 
   - name: tol_umb_11
@@ -4887,9 +4899,9 @@
           - [0x1111390, af_gfx, kasa_umb11_model]
           - [0x1111458, af_gfx, e_umb11_model]
           - [0x1111570, af_palette, tol_umb11_pal]
-          - [0x1111590, af_ci4, tol_umb11_kasa1_tex_txt, 16, 64, 0x1111570, 0x20]
-          - [0x1111790, af_ci4, tol_umb11_kasa2_tex_txt, 8, 16, 0x1111570, 0x20]
-          - [0x11117D0, af_ci4, tol_umb11_tuka_tex_txt, 32, 32, 0x1111570, 0x20]
+          - [0x1111590, ci4, tol_umb11_kasa1_tex_txt, 16, 64, tol_umb11_pal]
+          - [0x1111790, ci4, tol_umb11_kasa2_tex_txt, 8, 16, tol_umb11_pal]
+          - [0x11117D0, ci4, tol_umb11_tuka_tex_txt, 32, 32, tol_umb11_pal]
   - [0x11119D0]
 
   - name: tol_umb_12
@@ -4911,9 +4923,9 @@
           - [0x1112390, af_gfx, kasa_umb12_model]
           - [0x1112458, af_gfx, e_umb12_model]
           - [0x1112570, af_palette, tol_umb12_pal]
-          - [0x1112590, af_ci4, tol_umb12_kasa1_tex_txt, 32, 64, 0x1112570, 0x20]
-          - [0x1112990, af_ci4, tol_umb12_kasa2_tex_txt, 8, 16, 0x1112570, 0x20]
-          - [0x11129D0, af_ci4, tol_umb12_tuka_tex_txt, 32, 32, 0x1112570, 0x20]
+          - [0x1112590, ci4, tol_umb12_kasa1_tex_txt, 32, 64, tol_umb12_pal]
+          - [0x1112990, ci4, tol_umb12_kasa2_tex_txt, 8, 16, tol_umb12_pal]
+          - [0x11129D0, ci4, tol_umb12_tuka_tex_txt, 32, 32, tol_umb12_pal]
   - [0x1112BD0]
 
   - name: tol_umb_13
@@ -4935,9 +4947,9 @@
           - [0x1113390, af_gfx, kasa_umb13_model]
           - [0x1113458, af_gfx, e_umb13_model]
           - [0x1113570, af_palette, tol_umb13_pal]
-          - [0x1113590, af_ci4, tol_umb13_kasa1_tex_txt, 32, 32, 0x1113570, 0x20]
-          - [0x1113790, af_ci4, tol_umb13_kasa2_tex_txt, 8, 16, 0x1113570, 0x20]
-          - [0x11137D0, af_ci4, tol_umb13_tuka_tex_txt, 32, 32, 0x1113570, 0x20]
+          - [0x1113590, ci4, tol_umb13_kasa1_tex_txt, 32, 32, tol_umb13_pal]
+          - [0x1113790, ci4, tol_umb13_kasa2_tex_txt, 8, 16, tol_umb13_pal]
+          - [0x11137D0, ci4, tol_umb13_tuka_tex_txt, 32, 32, tol_umb13_pal]
   - [0x11139D0]
 
   - name: tol_umb_14
@@ -4959,8 +4971,8 @@
           - [0x1114380, af_gfx, kasa_umb14_model]
           - [0x1114448, af_gfx, e_umb14_model]
           - [0x1114508, af_palette, tol_umb_14_pal]
-          - [0x1114528, af_ci4, tol_umb_14_kasa_tex_txt, 32, 32, 0x1114508, 0x20]
-          - [0x1114728, af_ci4, tol_umb_14_tuka_tex_txt, 32, 32, 0x1114508, 0x20]
+          - [0x1114528, ci4, tol_umb_14_kasa_tex_txt, 32, 32, tol_umb_14_pal]
+          - [0x1114728, ci4, tol_umb_14_tuka_tex_txt, 32, 32, tol_umb_14_pal]
   - [0x1114930]
 
   - name: tol_umb_15
@@ -4982,9 +4994,9 @@
           - [0x11153C0, af_gfx, kasa_umb15_model]
           - [0x11154D8, af_gfx, e_umb15_model]
           - [0x1115598, af_palette, tol_umb_15_pal]
-          - [0x11155B8, af_ci4, tol_umb_15_kasa1_tex_txt, 16, 32, 0x1115598, 0x20]
-          - [0x11156B8, af_ci4, tol_umb_15_kasa2_tex_txt, 32, 32, 0x1115598, 0x20]
-          - [0x11158B8, af_ci4, tol_umb_15_tuka_tex_txt, 32, 32, 0x1115598, 0x20]
+          - [0x11155B8, ci4, tol_umb_15_kasa1_tex_txt, 16, 32, tol_umb_15_pal]
+          - [0x11156B8, ci4, tol_umb_15_kasa2_tex_txt, 32, 32, tol_umb_15_pal]
+          - [0x11158B8, ci4, tol_umb_15_tuka_tex_txt, 32, 32, tol_umb_15_pal]
   - [0x1115AC0]
 
   - name: tol_umb_16
@@ -5006,8 +5018,8 @@
           - [0x1116380, af_gfx, kasa_umb16_model]
           - [0x1116448, af_gfx, e_umb16_model]
           - [0x1116508, af_palette, tol_umb_16_pal]
-          - [0x1116528, af_ci4, tol_umb_16_kasa1_tex_txt, 32, 32, 0x1116508, 0x20]
-          - [0x1116728, af_ci4, tol_umb_16_tuka_tex_txt, 32, 32, 0x1116508, 0x20]
+          - [0x1116528, ci4, tol_umb_16_kasa1_tex_txt, 32, 32, tol_umb_16_pal]
+          - [0x1116728, ci4, tol_umb_16_tuka_tex_txt, 32, 32, tol_umb_16_pal]
   - [0x1116930]
 
   - name: tol_umb_17
@@ -5029,8 +5041,8 @@
           - [0x11174D0, af_gfx, kasa_umb17_model]
           - [0x11175D8, af_gfx, e_umb17_model]
           - [0x1117680, af_palette, tol_umb_17_pal]
-          - [0x11176A0, af_ci4, tol_umb_17_kasa_tex_txt, 32, 32, 0x1117680, 0x20]
-          - [0x11178A0, af_ci4, tol_umb_17_tuka_tex_txt, 32, 32, 0x1117680, 0x20]
+          - [0x11176A0, ci4, tol_umb_17_kasa_tex_txt, 32, 32, tol_umb_17_pal]
+          - [0x11178A0, ci4, tol_umb_17_tuka_tex_txt, 32, 32, tol_umb_17_pal]
   - [0x1117AA0]
 
   - name: tol_umb_18
@@ -5052,9 +5064,9 @@
           - [0x1118280, af_gfx, kasa_umb18_model]
           - [0x1118348, af_gfx, e_umb18_model]
           - [0x1118460, af_palette, tol_umb18_pal]
-          - [0x1118480, af_ci4, tol_umb18_kasa1_tex_txt, 16, 32, 0x1118460, 0x20]
-          - [0x1118580, af_ci4, tol_umb18_kasa2_tex_txt, 16, 16, 0x1118460, 0x20]
-          - [0x1118600, af_ci4, tol_umb18_tuka_tex_txt, 32, 32, 0x1118460, 0x20]
+          - [0x1118480, ci4, tol_umb18_kasa1_tex_txt, 16, 32, tol_umb18_pal]
+          - [0x1118580, ci4, tol_umb18_kasa2_tex_txt, 16, 16, tol_umb18_pal]
+          - [0x1118600, ci4, tol_umb18_tuka_tex_txt, 32, 32, tol_umb18_pal]
   - [0x1118800]
 
   - name: tol_umb_19
@@ -5076,9 +5088,9 @@
           - [0x1119400, af_gfx, kasa_umb19_model]
           - [0x11194E0, af_gfx, e_umb19_model]
           - [0x1119610, af_palette, tol_umb_19_pal]
-          - [0x1119630, af_ci4, tol_umb_19_kasa_tex_txt, 32, 32, 0x1119610, 0x20]
-          - [0x1119830, af_ci4, tol_umb_19_tuka_tex_txt, 32, 32, 0x1119610, 0x20]
-          - [0x1119A30, af_ci4, tol_umb_19_e_tex_txt, 16, 16, 0x1119610, 0x20]
+          - [0x1119630, ci4, tol_umb_19_kasa_tex_txt, 32, 32, tol_umb_19_pal]
+          - [0x1119830, ci4, tol_umb_19_tuka_tex_txt, 32, 32, tol_umb_19_pal]
+          - [0x1119A30, ci4, tol_umb_19_e_tex_txt, 16, 16, tol_umb_19_pal]
   - [0x1119AB0]
 
   - name: tol_umb_20
@@ -5100,8 +5112,8 @@
           - [0x111A280, af_gfx, kasa_umb20_model]
           - [0x111A338, af_gfx, e_umb20_model]
           - [0x111A408, af_palette, tol_umb_20_pal]
-          - [0x111A428, af_ci4, tol_umb_20_kasa_tex_txt, 32, 64, 0x111A408, 0x20]
-          - [0x111A828, af_ci4, tol_umb_20_e_tex_txt, 16, 16, 0x111A408, 0x20]
+          - [0x111A428, ci4, tol_umb_20_kasa_tex_txt, 32, 64, tol_umb_20_pal]
+          - [0x111A828, ci4, tol_umb_20_e_tex_txt, 16, 16, tol_umb_20_pal]
   - [0x111A8B0]
 
   - name: tol_umb_21
@@ -5123,8 +5135,8 @@
           - [0x111B380, af_gfx, kasa_umb21_model]
           - [0x111B468, af_gfx, e_umb21_model]
           - [0x111B520, af_palette, tol_umb_21_pal]
-          - [0x111B540, af_ci4, tol_umb_21_kasa_tex_txt, 64, 32, 0x111B520, 0x20]
-          - [0x111B940, af_ci4, tol_umb_21_tuka_tex_txt, 32, 32, 0x111B520, 0x20]
+          - [0x111B540, ci4, tol_umb_21_kasa_tex_txt, 64, 32, tol_umb_21_pal]
+          - [0x111B940, ci4, tol_umb_21_tuka_tex_txt, 32, 32, tol_umb_21_pal]
   - [0x111BB40]
 
   - name: tol_umb_22
@@ -5146,8 +5158,8 @@
           - [0x111C480, af_gfx, kasa_umb22_model]
           - [0x111C580, af_gfx, e_umb22_model]
           - [0x111C620, af_palette, tol_umb_22_pal]
-          - [0x111C640, af_ci4, tol_umb_22_kasa_tex_txt, 32, 32, 0x111C620, 0x20]
-          - [0x111C840, af_ci4, tol_umb_22_e_tex_txt, 16, 32, 0x111C620, 0x20]
+          - [0x111C640, ci4, tol_umb_22_kasa_tex_txt, 32, 32, tol_umb_22_pal]
+          - [0x111C840, ci4, tol_umb_22_e_tex_txt, 16, 32, tol_umb_22_pal]
   - [0x111C940]
 
   - name: tol_umb_23
@@ -5169,9 +5181,9 @@
           - [0x111D360, af_gfx, kasa_umb23_model]
           - [0x111D428, af_gfx, e_umb23_model]
           - [0x111D528, af_palette, tol_umb_23_pal]
-          - [0x111D548, af_ci4, tol_umb_23_kasa_tex_txt, 32, 64, 0x111D528, 0x20]
-          - [0x111D948, af_ci4, tol_umb_23_tuka_tex_txt, 32, 32, 0x111D528, 0x20]
-          - [0x111DB48, af_ci4, tol_umb_23_e_tex_txt, 16, 16, 0x111D528, 0x20]
+          - [0x111D548, ci4, tol_umb_23_kasa_tex_txt, 32, 64, tol_umb_23_pal]
+          - [0x111D948, ci4, tol_umb_23_tuka_tex_txt, 32, 32, tol_umb_23_pal]
+          - [0x111DB48, ci4, tol_umb_23_e_tex_txt, 16, 16, tol_umb_23_pal]
   - [0x111DBD0]
 
   - name: tol_umb_24
@@ -5193,9 +5205,9 @@
           - [0x111E3C0, af_gfx, kasa_umb24_model]
           - [0x111E4D8, af_gfx, e_umb24_model]
           - [0x111E598, af_palette, tol_umb_24_pal]
-          - [0x111E5B8, af_ci4, tol_umb_24_kasa1_tex_txt, 16, 32, 0x111E598, 0x20]
-          - [0x111E6B8, af_ci4, tol_umb_24_kasa2_tex_txt, 16, 32, 0x111E598, 0x20]
-          - [0x111E7B8, af_ci4, tol_umb_24_tuka_tex_txt, 32, 32, 0x111E598, 0x20]
+          - [0x111E5B8, ci4, tol_umb_24_kasa1_tex_txt, 16, 32, tol_umb_24_pal]
+          - [0x111E6B8, ci4, tol_umb_24_kasa2_tex_txt, 16, 32, tol_umb_24_pal]
+          - [0x111E7B8, ci4, tol_umb_24_tuka_tex_txt, 32, 32, tol_umb_24_pal]
   - [0x111E9C0]
 
   - name: tol_umb_25
@@ -5217,8 +5229,8 @@
           - [0x111F350, af_gfx, kasa_umb25_model]
           - [0x111F470, af_gfx, e_umb25_model]
           - [0x111F510, af_palette, tol_umb_25_pal]
-          - [0x111F530, af_ci4, tol_umb_25_kasa_tex_txt, 32, 32, 0x111F510, 0x20]
-          - [0x111F730, af_ci4, tol_umb_25_ya_tex_txt, 16, 64, 0x111F510, 0x20]
+          - [0x111F530, ci4, tol_umb_25_kasa_tex_txt, 32, 32, tol_umb_25_pal]
+          - [0x111F730, ci4, tol_umb_25_ya_tex_txt, 16, 64, tol_umb_25_pal]
   - [0x111F930]
 
   - name: tol_umb_26
@@ -5240,9 +5252,9 @@
           - [0x11203C0, af_gfx, kasa_umb26_model]
           - [0x11204D0, af_gfx, e_umb26_model]
           - [0x1120590, af_palette, tol_umb_26_pal]
-          - [0x11205B0, af_ci4, tol_umb_26_kasa1_tex_txt, 16, 32, 0x1120590, 0x20]
-          - [0x11206B0, af_ci4, tol_umb_26_kasa2_tex_txt, 16, 32, 0x1120590, 0x20]
-          - [0x11207B0, af_ci4, tol_umb_26_tuka_tex_txt, 32, 32, 0x1120590, 0x20]
+          - [0x11205B0, ci4, tol_umb_26_kasa1_tex_txt, 16, 32, tol_umb_26_pal]
+          - [0x11206B0, ci4, tol_umb_26_kasa2_tex_txt, 16, 32, tol_umb_26_pal]
+          - [0x11207B0, ci4, tol_umb_26_tuka_tex_txt, 32, 32, tol_umb_26_pal]
   - [0x11209B0]
 
   - name: tol_umb_27
@@ -5264,9 +5276,9 @@
           - [0x11214B0, af_gfx, kasa_umb27_model]
           - [0x11215F8, af_gfx, e_umb27_model]
           - [0x1121698, af_palette, tol_umb_27_pal]
-          - [0x11216B8, af_ci4, tol_umb_27_kasa1_tex_txt, 32, 32, 0x1121698, 0x20]
-          - [0x11218B8, af_ci4, tol_umb_27_kasa2_tex_txt, 32, 32, 0x1121698, 0x20]
-          - [0x1121AB8, af_ci4, tol_umb_27_e_tex_txt, 16, 16, 0x1121698, 0x20]
+          - [0x11216B8, ci4, tol_umb_27_kasa1_tex_txt, 32, 32, tol_umb_27_pal]
+          - [0x11218B8, ci4, tol_umb_27_kasa2_tex_txt, 32, 32, tol_umb_27_pal]
+          - [0x1121AB8, ci4, tol_umb_27_e_tex_txt, 16, 16, tol_umb_27_pal]
   - [0x1121B40]
 
   - name: tol_umb_28
@@ -5288,8 +5300,8 @@
           - [0x1122360, af_gfx, kasa_umb28_model]
           - [0x1122428, af_gfx, e_umb28_model]
           - [0x11224E0, af_palette, tol_umb_28_pal]
-          - [0x1122500, af_ci4, tol_umb_28_kasa_tex_txt, 32, 32, 0x11224E0, 0x20]
-          - [0x1122700, af_ci4, tol_umb_28_tuka_tex_txt, 32, 32, 0x11224E0, 0x20]
+          - [0x1122500, ci4, tol_umb_28_kasa_tex_txt, 32, 32, tol_umb_28_pal]
+          - [0x1122700, ci4, tol_umb_28_tuka_tex_txt, 32, 32, tol_umb_28_pal]
   - [0x1122900]
 
   - name: tol_umb_29
@@ -5311,8 +5323,8 @@
           - [0x1123380, af_gfx, kasa_umb29_model]
           - [0x1123448, af_gfx, e_umb29_model]
           - [0x1123508, af_palette, tol_umb_29_pal]
-          - [0x1123528, af_ci4, tol_umb_29_kasa1_tex_txt, 32, 32, 0x1123508, 0x20]
-          - [0x1123728, af_ci4, tol_umb_29_tuka_tex_txt, 32, 32, 0x1123508, 0x20]
+          - [0x1123528, ci4, tol_umb_29_kasa1_tex_txt, 32, 32, tol_umb_29_pal]
+          - [0x1123728, ci4, tol_umb_29_tuka_tex_txt, 32, 32, tol_umb_29_pal]
   - [0x1123930]
 
   - name: tol_umb_30
@@ -5334,8 +5346,8 @@
           - [0x1124380, af_gfx, kasa_umb30_model]
           - [0x1124450, af_gfx, e_umb30_model]
           - [0x1124510, af_palette, obj_shop_umb_30_pal]
-          - [0x1124530, af_ci4, tol_umb_30_kasa1_tex_txt, 32, 32, 0x1124510, 0x20]
-          - [0x1124730, af_ci4, tol_umb_30_tuka_tex_txt, 32, 32, 0x1124510, 0x20]
+          - [0x1124530, ci4, tol_umb_30_kasa1_tex_txt, 32, 32, obj_shop_umb_30_pal]
+          - [0x1124730, ci4, tol_umb_30_tuka_tex_txt, 32, 32, obj_shop_umb_30_pal]
   - [0x1124930]
 
   - name: tol_umb_31
@@ -5357,9 +5369,9 @@
           - [0x1125360, af_gfx, kasa_umb31_model]
           - [0x1125428, af_gfx, e_umb31_model]
           - [0x1125528, af_palette, tol_umb_31_pal]
-          - [0x1125548, af_ci4, tol_umb_31_kasa_tex_txt, 32, 32, 0x1125528, 0x20]
-          - [0x1125748, af_ci4, tol_umb_31_tuka_tex_txt, 32, 32, 0x1125528, 0x20]
-          - [0x1125948, af_ci4, tol_umb_31_e_tex_txt, 16, 16, 0x1125528, 0x20]
+          - [0x1125548, ci4, tol_umb_31_kasa_tex_txt, 32, 32, tol_umb_31_pal]
+          - [0x1125748, ci4, tol_umb_31_tuka_tex_txt, 32, 32, tol_umb_31_pal]
+          - [0x1125948, ci4, tol_umb_31_e_tex_txt, 16, 16, tol_umb_31_pal]
   - [0x11259D0]
 
   - name: tol_umb_32
@@ -5381,8 +5393,8 @@
           - [0x1126380, af_gfx, kasa_umb32_model]
           - [0x1126448, af_gfx, e_umb32_model]
           - [0x1126508, af_palette, obj_shop_umb_32_pal]
-          - [0x1126528, af_ci4, obj_shop_umb_32_kasa1_tex_txt, 32, 32, 0x1126508, 0x20]
-          - [0x1126728, af_ci4, obj_shop_umb_32_tuka1_tex_txt, 32, 32, 0x1126508, 0x20]
+          - [0x1126528, ci4, obj_shop_umb_32_kasa1_tex_txt, 32, 32, obj_shop_umb_32_pal]
+          - [0x1126728, ci4, obj_shop_umb_32_tuka1_tex_txt, 32, 32, obj_shop_umb_32_pal]
   - [0x1126930]
 
   - name: tol_keitai_1
@@ -5426,10 +5438,10 @@
           - [0x1127320, af_gfx, main1_keitai1_model]
           - [0x1127480, af_gfx, main2_keitai1_model]
           - [0x11275E8, af_palette, tol_keitai_1_pal]
-          - [0x1127608, af_ci4, tol_keitai_1_ueura1_tex_txt, 16, 32, 0x11275E8, 0x20]
-          - [0x1127708, af_ci4, tol_keitai_1_ueomote1_tex_txt, 16, 32, 0x11275E8, 0x20]
-          - [0x1127808, af_ci4, tol_keitai_1_shitaura1_tex_txt, 16, 32, 0x11275E8, 0x20]
-          - [0x1127908, af_ci4, tol_keitai_1_shitaomote1_tex_txt, 16, 32, 0x11275E8, 0x20]
+          - [0x1127608, ci4, tol_keitai_1_ueura1_tex_txt, 16, 32, tol_keitai_1_pal]
+          - [0x1127708, ci4, tol_keitai_1_ueomote1_tex_txt, 16, 32, tol_keitai_1_pal]
+          - [0x1127808, ci4, tol_keitai_1_shitaura1_tex_txt, 16, 32, tol_keitai_1_pal]
+          - [0x1127908, ci4, tol_keitai_1_shitaomote1_tex_txt, 16, 32, tol_keitai_1_pal]
           - [0x1127A08, ckf_je, cKF_je_r_tol_keitai_1_tbl]
           - [0x1127A2C, ckf_bs, cKF_bs_r_tol_keitai_1]
           - [0x1127A34]
@@ -5453,8 +5465,8 @@
           - [0x1128000, vtx, tol_utiwa_1_v]
           - [0x1128080, af_gfx, main_utiwa1_model]
           - [0x1128188, af_palette, tol_utiwa1_pal]
-          - [0x11281A8, af_ci4, tol_utiwa_1_main1_tex_txt, 32, 32, 0x1128188, 0x20]
-          - [0x11283A8, af_ci4, tol_utiwa_1_main2_tex_txt, 32, 32, 0x1128188, 0x20]
+          - [0x11281A8, ci4, tol_utiwa_1_main1_tex_txt, 32, 32, tol_utiwa1_pal]
+          - [0x11283A8, ci4, tol_utiwa_1_main2_tex_txt, 32, 32, tol_utiwa1_pal]
   - [0x11285B0]
 
   - name: object_01129000
@@ -5487,7 +5499,7 @@
           - [0x112A470, af_gfx, tol_npcsao_1_sao_model]
           - [0x112A548, af_gfx, tol_npcsao_1_uki_model]
           - [0x112A5D8, af_palette, tol_npcsao_1_pal]
-          - [0x112A5F8, af_ci4, tol_npcsao_1_tex, 64, 16, 0x112A5D8, 0x20]
+          - [0x112A5F8, ci4, tol_npcsao_1_tex, 64, 16, tol_npcsao_1_pal]
   - [0x112A800]
 
   - name: tol_kamicup
@@ -5508,7 +5520,7 @@
           - [0x112B000, vtx, tol_kamicup_1_v]
           - [0x112B330, af_gfx, tol_kamicup_1T_model]
           - [0x112B450, af_palette, tol_kamicup_pal]
-          - [0x112B470, af_ci4, tol_kamicup_tex, 32, 32, 0x112B450, 0x20]
+          - [0x112B470, ci4, tol_kamicup_tex, 32, 32, tol_kamicup_pal]
   - [0x112B670]
 
   - name: tol_kenjyu_1
@@ -5529,7 +5541,7 @@
           - [0x112C000, vtx, tol_kenjyu_1_v]
           - [0x112C410, af_gfx, tol_kenjyu_1T_model]
           - [0x112C528, af_palette, tol_kenjyu_1_pal]
-          - [0x112C548, af_ci4, tol_kenjyu_1_tex, 32, 32, 0x112C528, 0x20]
+          - [0x112C548, ci4, tol_kenjyu_1_tex, 32, 32, tol_kenjyu_1_pal]
   - [0x112C750]
 
   - name: tol_tamaire
@@ -5550,8 +5562,8 @@
           - [0x112D000, vtx, ef_tamaire01_r_v]
           - [0x112D040, af_gfx, tama01_model]
           - [0x112D0C8, af_palette, ef_tamaire01_r_pal]
-          - [0x112D0E8, af_ci4, tama01_r_tex, 32, 32, 0x112D0C8, 0x20]
-          - [0x112D2E8, af_ci4, tama01_w_tex, 32, 32, 0x112D0C8, 0x20]
+          - [0x112D0E8, ci4, tama01_r_tex, 32, 32, ef_tamaire01_r_pal]
+          - [0x112D2E8, ci4, tama01_w_tex, 32, 32, ef_tamaire01_r_pal]
       - [auto, c, tol_tamaire]
       - start: 0x112D4F0
         type: .data
@@ -5560,12 +5572,12 @@
           - [0x112D4F0, vtx, tol_tamaire_v]
           - [0x112D530, af_gfx, tol_tamaire_model]
           - [0x112D5B8, af_palette, tol_tamaire_pal]
-          - [0x112D5D8, af_ci4, tol_tamaire_r1_tex, 32, 32, 0x112D5B8, 0x20]
-          - [0x112D7D8, af_ci4, tol_tamaire_r2_tex, 32, 32, 0x112D5B8, 0x20]
-          - [0x112D9D8, af_ci4, tol_tamaire_r3_tex, 32, 32, 0x112D5B8, 0x20]
-          - [0x112DBD8, af_ci4, tol_tamaire_w1_tex, 32, 32, 0x112D5B8, 0x20]
-          - [0x112DDD8, af_ci4, tol_tamaire_w2_tex, 32, 32, 0x112D5B8, 0x20]
-          - [0x112DFD8, af_ci4, tol_tamaire_w3_tex, 32, 32, 0x112D5B8, 0x20]
+          - [0x112D5D8, ci4, tol_tamaire_r1_tex, 32, 32, tol_tamaire_pal]
+          - [0x112D7D8, ci4, tol_tamaire_r2_tex, 32, 32, tol_tamaire_pal]
+          - [0x112D9D8, ci4, tol_tamaire_r3_tex, 32, 32, tol_tamaire_pal]
+          - [0x112DBD8, ci4, tol_tamaire_w1_tex, 32, 32, tol_tamaire_pal]
+          - [0x112DDD8, ci4, tol_tamaire_w2_tex, 32, 32, tol_tamaire_pal]
+          - [0x112DFD8, ci4, tol_tamaire_w3_tex, 32, 32, tol_tamaire_pal]
   - [0x112E1E0]
 
   - name: tol_cracker_1
@@ -5586,7 +5598,7 @@
           - [0x112F000, vtx, tol_cracker_1_v]
           - [0x112F1C0, af_gfx, tol_cracker_1T_model]
           - [0x112F280, af_palette, tol_cracker_1_pal]
-          - [0x112F2A0, af_ci4, tol_cracker_1_tex, 64, 16, 0x112F280, 0x20]
+          - [0x112F2A0, ci4, tol_cracker_1_tex, 64, 16, tol_cracker_1_pal]
   - [0x112F4A0]
 
   - name: tol_hata_01
@@ -5608,8 +5620,8 @@
           - [0x11300F0, af_gfx, tol_hata_e_model]
           - [0x11301A0, af_gfx, tol_hata_hataT_model]
           - [0x1130228, af_palette, tol_hata_e_pal]
-          - [0x1130248, af_ci4, tol_hata_e_tex, 16, 16, 0x1130228, 0x20]
-          - [0x11302C8, af_ia8, tol_hata_hata_tex_inta_ia8, 16, 16]
+          - [0x1130248, ci4, tol_hata_e_tex, 16, 16, tol_hata_e_pal]
+          - [0x11302C8, ia8, tol_hata_hata_tex_inta_ia8, 16, 16]
           - [0x11303C8]
       - [auto, c, tol_hata_01_evw_anime]
       - start: 0x11303C8
diff --git a/yamls/jp/header.yaml b/yamls/jp/header.yaml
index b78766d..6a9795f 100644
--- a/yamls/jp/header.yaml
+++ b/yamls/jp/header.yaml
@@ -53,5 +53,6 @@ options:
   asm_emit_size_directive: False
   segment_end_before_align: True
   ld_align_section_vram_end: False
+  image_type_in_extension: true
 
 segments:
diff --git a/yamls/jp/overlays.yaml b/yamls/jp/overlays.yaml
index 1f22fda..e4a0fb6 100644
--- a/yamls/jp/overlays.yaml
+++ b/yamls/jp/overlays.yaml
@@ -11289,7 +11289,7 @@
         name: ac_train_window
         subsegments:
           - [0x922020, pad]
-          - { start: 0x922028, type: af_palette, name: aTrainWindow_tree_pal_table, data_only: true }
+          - { start: 0x922028, type: af_palette2, name: aTrainWindow_tree_pal_table, data_only: true }
           - [0x922208, evw_scroll, aTrainWindow_out_cloud]
           - [0x92220C, evw_data, aTrainWindow_evw_anime_data]
           - [0x922214, .data, ac_train_window]
@@ -15137,8 +15137,8 @@
         name: ac_koinobori
         subsegments:
           - [0x953CE0, .data, ac_koinobori]
-          - [0x953D24, af_palette, aKOI_obj_e_koinobori_a_pal]
-          - [0x953D44, af_palette, obj_e_koinobori_b_pal]
+          - [0x953D24, af_palette2, aKOI_obj_e_koinobori_a_pal]
+          - [0x953D44, af_palette2, obj_e_koinobori_b_pal]
           - [0x953D64]
   - name: ovl_Koinobori_reloc
     type: code