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

113 files changed, 687 insertions, 268 deletions

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