sum_blue_bureau01 OK (#216)

* initial commit

* imported data

* matching

* renamed functions

* extracted assets

* review

5 files changed, 144 insertions, 43 deletions

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);
 }