sum_blue_bureau01 OK (#216)

* initial commit

* imported data

* matching

* renamed functions

* extracted assets

* review

12 files changed, 210 insertions, 74 deletions

diff --git a/include/segment_symbols.h b/include/segment_symbols.h
index adebc4b..6ba7b5a 100644
--- a/include/segment_symbols.h
+++ b/include/segment_symbols.h
@@ -133,6 +133,8 @@ DECLARE_SEGMENT(segment_01409000);
 DECLARE_SEGMENT(segment_0140A000);
 DECLARE_SEGMENT(segment_0140B000);
 
+DECLARE_SEGMENT(int_sum_blue_bureau01);
+
 DECLARE_SEGMENT(int_sum_hal_chest02);
 
 DECLARE_SEGMENT(int_sum_clchest03);
diff --git a/include/tables/dmatables/dmadata_table_jp.h b/include/tables/dmatables/dmadata_table_jp.h
index b05808b..31b8917 100644
--- a/include/tables/dmatables/dmadata_table_jp.h
+++ b/include/tables/dmatables/dmadata_table_jp.h
@@ -978,8 +978,8 @@ DEFINE_DMA_ENTRY(ovl__009135C0, "ovl__009135C0")
 DEFINE_DMA_ENTRY(ovl__009135C0_reloc, "ovl__009135C0_reloc")
 DEFINE_DMA_ENTRY(ovl__00913630, "ovl__00913630")
 DEFINE_DMA_ENTRY(ovl__00913630_reloc, "ovl__00913630_reloc")
-DEFINE_DMA_ENTRY(ovl__009136A0, "ovl__009136A0")
-DEFINE_DMA_ENTRY(ovl__009136A0_reloc, "ovl__009136A0_reloc")
+DEFINE_DMA_ENTRY(ovl_sum_blue_bureau01, "ovl_sum_blue_bureau01")
+DEFINE_DMA_ENTRY(ovl_sum_blue_bureau01_reloc, "ovl_sum_blue_bureau01_reloc")
 DEFINE_DMA_ENTRY(ovl__00913A30, "ovl__00913A30")
 DEFINE_DMA_ENTRY(ovl__00913A30_reloc, "ovl__00913A30_reloc")
 DEFINE_DMA_ENTRY(ovl__00913AA0, "ovl__00913AA0")
@@ -2774,7 +2774,7 @@ DEFINE_DMA_ENTRY(segment_01517000, "segment_01517000")
 DEFINE_DMA_ENTRY(segment_01518000, "segment_01518000")
 DEFINE_DMA_ENTRY(segment_01519000, "segment_01519000")
 DEFINE_DMA_ENTRY(segment_0151A000, "segment_0151A000")
-DEFINE_DMA_ENTRY(segment_0151B000, "segment_0151B000")
+DEFINE_DMA_ENTRY(int_sum_blue_bureau01, "int_sum_blue_bureau01")
 DEFINE_DMA_ENTRY(segment_0151C000, "segment_0151C000")
 DEFINE_DMA_ENTRY(segment_0151D000, "segment_0151D000")
 DEFINE_DMA_ENTRY(segment_0151E000, "segment_0151E000")
diff --git a/linker_scripts/jp/symbol_addrs_assets.txt b/linker_scripts/jp/symbol_addrs_assets.txt
index e38e156..4ad3bd9 100644
--- a/linker_scripts/jp/symbol_addrs_assets.txt
+++ b/linker_scripts/jp/symbol_addrs_assets.txt
@@ -1290,6 +1290,23 @@ cKF_ba_r_act_balloon = 0x6000F44; // segment:act_balloon rom:0x11F5F44
 cKF_je_r_act_balloon_tbl = 0x6000F58; // segment:act_balloon rom:0x11F5F58
 cKF_bs_r_act_balloon = 0x6000F88; // segment:act_balloon rom:0x11F5F88
 
+int_sum_blue_bureau01_pal = 0x6000008; // segment:int_sum_blue_bureau01 rom:0x151B008
+int_sum_blue_bureau01_hiki_tex_txt = 0x6000028; // segment:int_sum_blue_bureau01 rom:0x151B028
+int_sum_blue_bureau01_top_tex_txt = 0x6000328; // segment:int_sum_blue_bureau01 rom:0x151B328
+int_sum_blue_bureau01_topin_tex_txt = 0x60003A8; // segment:int_sum_blue_bureau01 rom:0x151B3A8
+int_sum_blue_bureau01_side_tex_txt = 0x6000428; // segment:int_sum_blue_bureau01 rom:0x151B428
+int_sum_blue_bureau01_front_tex_txt = 0x6000628; // segment:int_sum_blue_bureau01 rom:0x151B628
+int_sum_blue_bureau01_v = 0x6000828; // segment:int_sum_blue_bureau01 rom:0x151B828 size:0x330
+sum_blue_bureau01_base_model = 0x6000B58; // segment:int_sum_blue_bureau01 rom:0x151BB58
+sum_blue_bureau01_door_model = 0x6000C60; // segment:int_sum_blue_bureau01 rom:0x151BC60
+cKF_ckcb_r_int_sum_blue_bureau01_tbl = 0x6000CF8; // segment:int_sum_blue_bureau01 rom:0x151BCF8
+cKF_kn_int_sum_blue_bureau01_tbl = 0x6000CFC; // segment:int_sum_blue_bureau01 rom:0x151BCFC
+cKF_c_int_sum_blue_bureau01_tbl = 0x6000D08; // segment:int_sum_blue_bureau01 rom:0x151BD08
+cKF_ds_int_sum_blue_bureau01_tbl = 0x6000D14; // segment:int_sum_blue_bureau01 rom:0x151BD14
+cKF_ba_r_int_sum_blue_bureau01 = 0x6000D70; // segment:int_sum_blue_bureau01 rom:0x151BD70
+cKF_je_r_int_sum_blue_bureau01_tbl = 0x6000D84; // segment:int_sum_blue_bureau01 rom:0x151BD84
+cKF_bs_r_int_sum_blue_bureau01 = 0x6000DA8; // segment:int_sum_blue_bureau01 rom:0x151BDA8
+
 int_sum_hal_chest02_pal = 0x6000000; // segment:int_sum_hal_chest02 rom:0x15C8000
 int_sum_hal_chest02_hiki_tex_txt = 0x6000020; // segment:int_sum_hal_chest02 rom:0x15C8020
 int_sum_hal_chest02_hiite_tex_txt = 0x6000220; // segment:int_sum_hal_chest02 rom:0x15C8220
diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt
index 78443e4..680b69f 100644
--- a/linker_scripts/jp/symbol_addrs_overlays.txt
+++ b/linker_scripts/jp/symbol_addrs_overlays.txt
@@ -17034,18 +17034,15 @@ D_80A4BB90_jp = 0x80A4BB90; //
 
 // .text
 
-func_80A4BC00_jp = 0x80A4BC00; // type:func
-func_80A4BC94_jp = 0x80A4BC94; // type:func
-func_80A4BCDC_jp = 0x80A4BCDC; // type:func
-func_80A4BEF0_jp = 0x80A4BEF0; // type:func
+aSumBlueBureau01_ct = 0x80A4BC00; // type:func
+aSumBlueBureau01_mv = 0x80A4BC94; // type:func
+aSumBlueBureau01_dw = 0x80A4BCDC; // type:func
+aSumBlueBureau01_dt = 0x80A4BEF0; // type:func
 
 // .data
 
-D_80A4BF00_jp = 0x80A4BF00; //
-D_80A4BF14_jp = 0x80A4BF14; //
-D_80A4BF90_jp = 0x80A4BF90; //
-D_80A4C000_jp = 0x80A4C000; //
-D_80A4C070_jp = 0x80A4C070; //
+aSumBlueBureau01_func = 0x80A4BF00; //
+iam_sum_blue_bureau01 = 0x80A4BF14; //
 
 // .text
 
diff --git a/linker_scripts/jp/undefined_syms.ld b/linker_scripts/jp/undefined_syms.ld
index e733637..6ae2875 100644
--- a/linker_scripts/jp/undefined_syms.ld
+++ b/linker_scripts/jp/undefined_syms.ld
@@ -3055,15 +3055,6 @@ D_6000000 = 0x06000000;
 D_6000008 = 0x06000008;
 D_6000028 = 0x06000028;
 
-// ovl__009136A0
-
-D_6000000 = 0x06000000;
-D_6000008 = 0x06000008;
-D_6000028 = 0x06000028;
-D_6000D70 = 0x06000D70;
-D_6000DA8 = 0x06000DA8;
-D_6000DC0 = 0x06000DC0;
-
 // ovl__00913A30
 
 D_6000000 = 0x06000000;
diff --git a/src/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01.c b/src/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01.c
new file mode 100644
index 0000000..3bbd336
--- /dev/null
+++ b/src/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01.c
@@ -0,0 +1,30 @@
+#include "int_sum_blue_bureau01.h"
+
+s32 pad151B000[] = { 0x00000000, 0x00000000 };
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01_pal.palette.inc.c"
+u8 int_sum_blue_bureau01_hiki_tex_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01_hiki_tex_txt.ci4swap.inc.c"
+};
+u8 int_sum_blue_bureau01_top_tex_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01_top_tex_txt.ci4swap.inc.c"
+};
+u8 int_sum_blue_bureau01_topin_tex_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01_topin_tex_txt.ci4swap.inc.c"
+};
+u8 int_sum_blue_bureau01_side_tex_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01_side_tex_txt.ci4swap.inc.c"
+};
+u8 int_sum_blue_bureau01_front_tex_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01_front_tex_txt.ci4swap.inc.c"
+};
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01_v.vtx.inc.c"
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/sum_blue_bureau01_base_model.gfx.inc.c"
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/sum_blue_bureau01_door_model.gfx.inc.c"
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/cKF_ckcb_r_int_sum_blue_bureau01_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/cKF_kn_int_sum_blue_bureau01_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/cKF_c_int_sum_blue_bureau01_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/cKF_ds_int_sum_blue_bureau01_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/cKF_ba_r_int_sum_blue_bureau01.inc.c"
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/cKF_je_r_int_sum_blue_bureau01_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_blue_bureau01/cKF_bs_r_int_sum_blue_bureau01.inc.c"
+s32 pad151BDB0[] = { 0x00000000, 0x00000000 };
diff --git a/src/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01.h b/src/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01.h
new file mode 100644
index 0000000..7ce4e97
--- /dev/null
+++ b/src/objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01.h
@@ -0,0 +1,24 @@
+#ifndef OBJECT_INT_SUM_BLUE_BUREAU01_H
+#define OBJECT_INT_SUM_BLUE_BUREAU01_H
+
+#include "gbi.h"
+#include "c_keyframe.h"
+
+extern u16 int_sum_blue_bureau01_pal[];
+extern u8 int_sum_blue_bureau01_hiki_tex_txt[];
+extern u8 int_sum_blue_bureau01_top_tex_txt[];
+extern u8 int_sum_blue_bureau01_topin_tex_txt[];
+extern u8 int_sum_blue_bureau01_side_tex_txt[];
+extern u8 int_sum_blue_bureau01_front_tex_txt[];
+extern Vtx int_sum_blue_bureau01_v[];
+extern Gfx sum_blue_bureau01_base_model[];
+extern Gfx sum_blue_bureau01_door_model[];
+extern u8 cKF_ckcb_r_int_sum_blue_bureau01_tbl[];
+extern s16 cKF_kn_int_sum_blue_bureau01_tbl[];
+extern s16 cKF_c_int_sum_blue_bureau01_tbl[];
+extern Keyframe cKF_ds_int_sum_blue_bureau01_tbl[];
+extern BaseAnimationR cKF_ba_r_int_sum_blue_bureau01;
+extern JointElemR cKF_je_r_int_sum_blue_bureau01_tbl[];
+extern BaseSkeletonR cKF_bs_r_int_sum_blue_bureau01;
+
+#endif
diff --git a/src/overlays/furniture/ovl_sum_blue_bureau01/ac_sum_blue_bureau01.c b/src/overlays/furniture/ovl_sum_blue_bureau01/ac_sum_blue_bureau01.c
new file mode 100644
index 0000000..e87a39d
--- /dev/null
+++ b/src/overlays/furniture/ovl_sum_blue_bureau01/ac_sum_blue_bureau01.c
@@ -0,0 +1,77 @@
+#include "m_lib.h"
+#include "src/overlays/actors/ovl_My_Room/ac_my_room.h"
+#include "segment_symbols.h"
+#include "objects/furniture/int_sum_blue_bureau01/int_sum_blue_bureau01.h"
+
+void aSumBlueBureau01_ct(FurnitureActor* this, u8* data UNUSED);
+void aSumBlueBureau01_mv(FurnitureActor* this, Actor* myRoomActor, Game_Play* game_play, u8* data UNUSED);
+void aSumBlueBureau01_dw(FurnitureActor* this, Actor* myRoomActor UNUSED, Game_Play* game_play, u8* data UNUSED);
+void aSumBlueBureau01_dt(FurnitureActor* this UNUSED, u8* data UNUSED);
+
+FurnitureActorFunctions aSumBlueBureau01_func = {
+    /* */ aSumBlueBureau01_ct,
+    /* */ aSumBlueBureau01_mv,
+    /* */ aSumBlueBureau01_dw,
+    /* */ aSumBlueBureau01_dt,
+    /* */ NULL,
+};
+
+FurnitureActorProfile iam_sum_blue_bureau01 = {
+    /* */ SEGMENT_ROM_START(int_sum_blue_bureau01),
+    /* */ SEGMENT_ROM_END(int_sum_blue_bureau01),
+    /* */ SEGMENT_VRAM_START(int_sum_blue_bureau01),
+    /* */ SEGMENT_VRAM_END(int_sum_blue_bureau01),
+    /* */ NULL,
+    /* */ NULL,
+    /* */ NULL,
+    /* */ NULL,
+    /* */ NULL,
+    /* */ NULL,
+    /* */ NULL,
+    /* */ NULL,
+    /* */ 40.0f,
+    /* */ 0.01f,
+    /* */ 4,
+    /* */ 0,
+    /* */ 0,
+    /* */ 0,
+    /* */ 0,
+    /* */ 4,
+    /* */ &aSumBlueBureau01_func,
+};
+
+void aSumBlueBureau01_ct(FurnitureActor* this, u8* data UNUSED) {
+    UNUSED s32 pad[2];
+    SkeletonInfoR* skeletonInfo = &this->skeletonInfo;
+
+    cKF_SkeletonInfo_R_ct(skeletonInfo, Lib_SegmentedToVirtual(&cKF_bs_r_int_sum_blue_bureau01),
+                          Lib_SegmentedToVirtual(&cKF_ba_r_int_sum_blue_bureau01), this->jointTable, this->morphTable);
+    cKF_SkeletonInfo_R_init_standard_stop(skeletonInfo, Lib_SegmentedToVirtual(&cKF_ba_r_int_sum_blue_bureau01), NULL);
+    skeletonInfo->frameControl.speed = 0.0f;
+    cKF_SkeletonInfo_R_play(skeletonInfo);
+}
+
+void aSumBlueBureau01_mv(FurnitureActor* this, Actor* myRoomActor, Game_Play* game_play, u8* data UNUSED) {
+    if (common_data.clip.myRoomClip != NULL) {
+        common_data.clip.myRoomClip->unk_34(this, myRoomActor, game_play, 1.0f, 16.0f);
+    }
+}
+
+void aSumBlueBureau01_dw(FurnitureActor* this, Actor* myRoomActor UNUSED, Game_Play* game_play, u8* data UNUSED) {
+    UNUSED s32 pad;
+    s32 mtxIdx = game_play->state.frameCounter & 1;
+    Mtx* mtx = &this->matrix[mtxIdx][0];
+
+    OPEN_DISPS(game_play->state.gfxCtx);
+    if (1) {}
+    gSPMatrix(POLY_OPA_DISP++, _Matrix_to_Mtx_new(game_play->state.gfxCtx),
+              G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gDPLoadTextureBlockS(POLY_OPA_DISP++, int_sum_blue_bureau01_hiki_tex_txt, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0,
+                         G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 7, 7, G_TX_NOLOD, G_TX_NOLOD);
+    gDPLoadTLUT_pal16(POLY_OPA_DISP++, 15, int_sum_blue_bureau01_pal);
+    CLOSE_DISPS(game_play->state.gfxCtx);
+    cKF_Si3_draw_R_SV(game_play, &this->skeletonInfo, mtx, NULL, NULL, NULL);
+}
+
+void aSumBlueBureau01_dt(FurnitureActor* this UNUSED, u8* data UNUSED) {
+}
diff --git a/src/overlays/furniture/ovl_sum_clchest03/ac_sum_clchest03.c b/src/overlays/furniture/ovl_sum_clchest03/ac_sum_clchest03.c
index 92b7ee2..3c9344d 100644
--- a/src/overlays/furniture/ovl_sum_clchest03/ac_sum_clchest03.c
+++ b/src/overlays/furniture/ovl_sum_clchest03/ac_sum_clchest03.c
@@ -5,7 +5,7 @@
 #include "objects/furniture/int_sum_clchest03/int_sum_clchest03.h"
 
 void aSumClChest03_ct(FurnitureActor* this, u8* data UNUSED);
-void aSumClChest03_mv(FurnitureActor* this, Actor* myroomactor, Game_Play* game_play, u8* data UNUSED);
+void aSumClChest03_mv(FurnitureActor* this, Actor* myRoomActor, Game_Play* game_play, u8* data UNUSED);
 void aSumClChest03_dw(FurnitureActor* this, Actor* myRoomActor UNUSED, Game_Play* game_play, u8* data UNUSED);
 void aSumClChest03_dt(FurnitureActor* this UNUSED, u8* data UNUSED);
 
@@ -52,40 +52,25 @@ void aSumClChest03_ct(FurnitureActor* this, u8* data UNUSED) {
     cKF_SkeletonInfo_R_play(skeletonInfo);
 }
 
-void aSumClChest03_mv(FurnitureActor* this, Actor* myroomactor, Game_Play* game_play, u8* data UNUSED) {
+void aSumClChest03_mv(FurnitureActor* this, Actor* myRoomActor, Game_Play* game_play, u8* data UNUSED) {
     if (common_data.clip.myRoomClip != NULL) {
-        common_data.clip.myRoomClip->unk_34(this, myroomactor, game_play, 1.0f, 16.0f);
+        common_data.clip.myRoomClip->unk_34(this, myRoomActor, game_play, 1.0f, 16.0f);
     }
 }
 
 void aSumClChest03_dw(FurnitureActor* this, Actor* myRoomActor UNUSED, Game_Play* game_play, u8* data UNUSED) {
     UNUSED s32 pad;
-    s32 temp = game_play->state.frameCounter & 1;
-    Mtx* mtx = &this->matrix[temp][0];
+    s32 mtxIdx = game_play->state.frameCounter & 1;
+    Mtx* mtx = &this->matrix[mtxIdx][0];
 
     OPEN_DISPS(game_play->state.gfxCtx);
     if (1) {}
-    if (1) {}
     gSPMatrix(POLY_OPA_DISP++, _Matrix_to_Mtx_new(game_play->state.gfxCtx),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gDPSetTextureImage(POLY_OPA_DISP++, G_IM_FMT_I, G_IM_SIZ_16b, 1, &int_sum_clchest03_hiki_txt);
-    gDPSetTile(POLY_OPA_DISP++, G_IM_FMT_I, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_MIRROR | G_TX_WRAP, 7,
-               G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 7, G_TX_NOLOD);
-    gDPLoadSync(POLY_OPA_DISP++);
-    gDPLoadBlock(POLY_OPA_DISP++, G_TX_LOADTILE, 0, 0, 0x7FF, 0);
-    gDPPipeSync(POLY_OPA_DISP++);
-    gDPSetTile(POLY_OPA_DISP++, G_IM_FMT_I, G_IM_SIZ_8b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_MIRROR | G_TX_WRAP, 7,
-               G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 7, G_TX_NOLOD);
-    gDPSetTileSize(POLY_OPA_DISP++, G_TX_RENDERTILE, 0, 0, 0x00FC, 0x00FC);
-    gDPSetTextureImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, &int_sum_clchest03_pal01_pal);
-    gDPTileSync(POLY_OPA_DISP++);
-    gDPSetTile(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 0x01F0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
-               G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-    gDPLoadSync(POLY_OPA_DISP++);
-    gDPLoadTLUTCmd(POLY_OPA_DISP++, G_TX_LOADTILE, 15);
-    gDPPipeSync(POLY_OPA_DISP++);
+    gDPLoadTextureBlockS(POLY_OPA_DISP++, int_sum_clchest03_hiki_txt, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0,
+                         G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 7, 7, G_TX_NOLOD, G_TX_NOLOD);
+    gDPLoadTLUT_pal16(POLY_OPA_DISP++, 15, int_sum_clchest03_pal01_pal);
     CLOSE_DISPS(game_play->state.gfxCtx);
-
     cKF_Si3_draw_R_SV(game_play, &this->skeletonInfo, mtx, NULL, NULL, NULL);
 }
 
diff --git a/src/overlays/furniture/ovl_sum_hal_chest02/ac_sum_hal_chest02.c b/src/overlays/furniture/ovl_sum_hal_chest02/ac_sum_hal_chest02.c
index f1c2210..6cd8ebf 100644
--- a/src/overlays/furniture/ovl_sum_hal_chest02/ac_sum_hal_chest02.c
+++ b/src/overlays/furniture/ovl_sum_hal_chest02/ac_sum_hal_chest02.c
@@ -60,32 +60,17 @@ void aSumHalChest02_mv(FurnitureActor* this, Actor* myRoomActor, Game_Play* game
 
 void aSumHalChest02_dw(FurnitureActor* this, Actor* myRoomActor UNUSED, Game_Play* game_play, u8* data UNUSED) {
     UNUSED s32 pad;
-    s32 temp = game_play->state.frameCounter & 1;
-    Mtx* mtx = &this->matrix[temp][0];
+    s32 mtxIdx = game_play->state.frameCounter & 1;
+    Mtx* mtx = &this->matrix[mtxIdx][0];
 
     OPEN_DISPS(game_play->state.gfxCtx);
     if (1) {}
-    if (1) {}
     gSPMatrix(POLY_OPA_DISP++, _Matrix_to_Mtx_new(game_play->state.gfxCtx),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gDPSetTextureImage(POLY_OPA_DISP++, G_IM_FMT_I, G_IM_SIZ_16b, 1, &int_sum_hal_chest02_hiki_tex_txt);
-    gDPSetTile(POLY_OPA_DISP++, G_IM_FMT_I, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_MIRROR | G_TX_WRAP, 7,
-               G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 7, G_TX_NOLOD);
-    gDPLoadSync(POLY_OPA_DISP++);
-    gDPLoadBlock(POLY_OPA_DISP++, G_TX_LOADTILE, 0, 0, 0x7FF, 0);
-    gDPPipeSync(POLY_OPA_DISP++);
-    gDPSetTile(POLY_OPA_DISP++, G_IM_FMT_I, G_IM_SIZ_8b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_MIRROR | G_TX_WRAP, 7,
-               G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 7, G_TX_NOLOD);
-    gDPSetTileSize(POLY_OPA_DISP++, G_TX_RENDERTILE, 0, 0, 0x00FC, 0x00FC);
-    gDPSetTextureImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, &int_sum_hal_chest02_pal);
-    gDPTileSync(POLY_OPA_DISP++);
-    gDPSetTile(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 0x01F0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
-               G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-    gDPLoadSync(POLY_OPA_DISP++);
-    gDPLoadTLUTCmd(POLY_OPA_DISP++, G_TX_LOADTILE, 15);
-    gDPPipeSync(POLY_OPA_DISP++);
+    gDPLoadTextureBlockS(POLY_OPA_DISP++, int_sum_hal_chest02_hiki_tex_txt, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0,
+                         G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 7, 7, G_TX_NOLOD, G_TX_NOLOD);
+    gDPLoadTLUT_pal16(POLY_OPA_DISP++, 15, int_sum_hal_chest02_pal);
     CLOSE_DISPS(game_play->state.gfxCtx);
-
     cKF_Si3_draw_R_SV(game_play, &this->skeletonInfo, mtx, NULL, NULL, NULL);
 }
 
diff --git a/yamls/jp/assets.yaml b/yamls/jp/assets.yaml
index 9543da6..856f76c 100644
--- a/yamls/jp/assets.yaml
+++ b/yamls/jp/assets.yaml
@@ -10986,12 +10986,40 @@
     align: 0x1000
   - [0x151AC10]
 
-  - name: segment_0151B000
-    type: bin
+  - name: int_sum_blue_bureau01
+    dir: objects/furniture/int_sum_blue_bureau01
+    type: code
     start: 0x151B000
-    # vram:
+    vram: 0x06000000
+    exclusive_ram_id: segment_06
     compress: True
     align: 0x1000
+    symbol_name_format: $VRAM_$ROM
+    subsegments:
+      - [auto, c, int_sum_blue_bureau01]
+      - start: 0x151B000
+        type: .data
+        name: int_sum_blue_bureau01
+        subsegments:
+          - [0x151B000, pad]
+          - [0x151B008, af_palette, int_sum_blue_bureau01_pal]
+          - [0x151B028, ci4swap, int_sum_blue_bureau01_hiki_tex_txt, 32, 48, int_sum_blue_bureau01_pal]
+          - [0x151B328, ci4swap, int_sum_blue_bureau01_top_tex_txt, 16, 16, int_sum_blue_bureau01_pal]
+          - [0x151B3A8, ci4swap, int_sum_blue_bureau01_topin_tex_txt, 16, 16, int_sum_blue_bureau01_pal]
+          - [0x151B428, ci4swap, int_sum_blue_bureau01_side_tex_txt, 16, 64, int_sum_blue_bureau01_pal]
+          - [0x151B628, ci4swap, int_sum_blue_bureau01_front_tex_txt, 16, 64, int_sum_blue_bureau01_pal]
+          - [0x151B828, vtx, int_sum_blue_bureau01_v]
+          - [0x151BB58, af_gfx, sum_blue_bureau01_base_model]
+          - [0x151BC60, af_gfx, sum_blue_bureau01_door_model]
+          - [0x151BCF8, ckf_ckcb, cKF_ckcb_r_int_sum_blue_bureau01_tbl]
+          - [0x151BCFC, ckf_kn, cKF_kn_int_sum_blue_bureau01_tbl]
+          - [0x151BD08, ckf_c, cKF_c_int_sum_blue_bureau01_tbl]
+          - [0x151BD14, ckf_ds, cKF_ds_int_sum_blue_bureau01_tbl]
+          - [0x151BD6E, pad]
+          - [0x151BD70, ckf_ba, cKF_ba_r_int_sum_blue_bureau01]
+          - [0x151BD84, ckf_je, cKF_je_r_int_sum_blue_bureau01_tbl]
+          - [0x151BDA8, ckf_bs, cKF_bs_r_int_sum_blue_bureau01]
+          - [0x151BDB0]
   - [0x151BDC0]
 
   - name: segment_0151C000
diff --git a/yamls/jp/overlays.yaml b/yamls/jp/overlays.yaml
index 9df0856..800f2cb 100644
--- a/yamls/jp/overlays.yaml
+++ b/yamls/jp/overlays.yaml
@@ -9265,7 +9265,7 @@
     subsegments:
       - [0x913680, data, overlays/other_ovl/ovl__00913630/ovl__00913630_reloc]
 
-  - name: ovl__009136A0
+  - name: ovl_sum_blue_bureau01
     type: code
     start: 0x9136A0
     vram: 0x80A4BC00
@@ -9273,22 +9273,22 @@
     compress: True
     bss_size: 0x0
     subsegments:
-      - [0x9136A0, asm, overlays/other_ovl/ovl__009136A0/ovl__009136A0]
-      - [0x9139A0, data, overlays/other_ovl/ovl__009136A0/ovl__009136A0]
-  - name: ovl__009136A0_reloc
+      - [0x9136A0, c, overlays/furniture/ovl_sum_blue_bureau01/ac_sum_blue_bureau01]
+      - [0x9139A0, .data, overlays/furniture/ovl_sum_blue_bureau01/ac_sum_blue_bureau01]
+  - name: ovl_sum_blue_bureau01_reloc
     type: code
     start: 0x913A00
     vram: 0x80A4BF60
-    follows_vram: ovl__009136A0
+    follows_vram: ovl_sum_blue_bureau01
     compress: True
     subsegments:
-      - [0x913A00, data, overlays/other_ovl/ovl__009136A0/ovl__009136A0_reloc]
+      - [0x913A00, data, overlays/furniture/ovl_sum_blue_bureau01/ac_sum_blue_bureau01_reloc]
 
   - name: ovl__00913A30
     type: code
     start: 0x913A30
     vram: 0x80A4BF90
-    follows_vram: ovl__009136A0_reloc
+    follows_vram: ovl_sum_blue_bureau01_reloc
     compress: True
     bss_size: 0x0
     subsegments: