summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremilybrooks <emilybrooksemilybrooks@gmail.com>2024-09-21 13:03:08 -0700
committerGitHub <noreply@github.com>2024-09-21 13:03:08 -0700
commit946ee8e9c28a04c7b0a485c9b49543677112d5ec (patch)
tree7c661497815e426c6e6cb961a8add161985f4fcc
parent2c7d61be83bedf7252cb0dccc0c681bfb6bb29da (diff)
clchest03 matched and hal_chest02 cleanup (#213)
* initial commit * func_80A70C60_jp * func_80A70CF4_jp * fully matching * inported data * improved furniture actor profile struct * extracted spooky wardrobe object * extracted clchest03 object * forgot
-rw-r--r--include/m_clip.h6
-rw-r--r--include/segment_symbols.h3
-rw-r--r--include/tables/dmatables/dmadata_table_jp.h12
-rw-r--r--linker_scripts/jp/symbol_addrs_assets.txt37
-rw-r--r--linker_scripts/jp/symbol_addrs_overlays.txt16
-rw-r--r--linker_scripts/jp/undefined_syms.ld15
-rw-r--r--src/code/m_room_type.c6
-rw-r--r--src/code/m_scene.c4
-rw-r--r--src/objects/furniture/int_sum_clchest03/int_sum_clchest03.c44
-rw-r--r--src/objects/furniture/int_sum_clchest03/int_sum_clchest03.h26
-rw-r--r--src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.c31
-rw-r--r--src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.h25
-rw-r--r--src/overlays/actors/ovl_My_Room/ac_my_room.h44
-rw-r--r--src/overlays/furniture/ovl_sum_clchest03/ac_sum_clchest03.c93
-rw-r--r--src/overlays/furniture/ovl_sum_hal_chest02/ac_sum_hal_chest02.c68
-rw-r--r--yamls/jp/assets.yaml72
-rw-r--r--yamls/jp/overlays.yaml14
17 files changed, 413 insertions, 103 deletions
diff --git a/include/m_clip.h b/include/m_clip.h
index 203a7ea..e91d18f 100644
--- a/include/m_clip.h
+++ b/include/m_clip.h
@@ -115,7 +115,7 @@ typedef s32 (*Clip_unk_080_unk_28)(struct Game* game, u16 ftr, s32 res,s32 utX,
s32 squareOffs, s32 layer);
typedef UNK_RET (*Clip_unk_080_unk_34)(struct FurnitureActor* furnitureActor, struct Actor* myHouseActor, struct Game_Play* game_play, f32 arg0, f32 arg1);
-typedef struct Clip_unk_080 {
+typedef struct MyRoomClip {
/* 0x00 */ UNK_TYPE1 unk_00[0x4];
/* 0x04 */ Clip_unk_080_unk_04 unk_04;
/* 0x08 */ UNK_TYPE1 unk_08[0x1C];
@@ -123,7 +123,7 @@ typedef struct Clip_unk_080 {
/* 0x28 */ Clip_unk_080_unk_28 unk_28;
/* 0x2C */ UNK_TYPE1 unk_2C[0x8];
/* 0x34 */ Clip_unk_080_unk_34 unk_34; // open close proc
-} Clip_unk_080; // size >= 0x8
+} MyRoomClip; // size >= 0x8
typedef struct StructureClipOverlayInfo {
/* 0x00 */ s8* overlayPointer;
@@ -250,7 +250,7 @@ typedef struct Clip {
/* 0x074 */ Clip_unk_074* unk_074;
/* 0x078 */ struct WeatherClip* weatherClip;
/* 0x07C */ Clip_unk_07C* unk_07C;
- /* 0x080 */ Clip_unk_080* unk_080;
+ /* 0x080 */ MyRoomClip* myRoomClip;
/* 0x084 */ s8 unk_084[0x8];
/* 0x08C */ struct StructureClip* structureClip;
/* 0x090 */ Clip_unk_090* unk_090;
diff --git a/include/segment_symbols.h b/include/segment_symbols.h
index 7933781..adebc4b 100644
--- a/include/segment_symbols.h
+++ b/include/segment_symbols.h
@@ -133,5 +133,8 @@ DECLARE_SEGMENT(segment_01409000);
DECLARE_SEGMENT(segment_0140A000);
DECLARE_SEGMENT(segment_0140B000);
+DECLARE_SEGMENT(int_sum_hal_chest02);
+
+DECLARE_SEGMENT(int_sum_clchest03);
#endif
diff --git a/include/tables/dmatables/dmadata_table_jp.h b/include/tables/dmatables/dmadata_table_jp.h
index c61d9e1..b05808b 100644
--- a/include/tables/dmatables/dmadata_table_jp.h
+++ b/include/tables/dmatables/dmadata_table_jp.h
@@ -1362,8 +1362,8 @@ DEFINE_DMA_ENTRY(ovl__0092F760, "ovl__0092F760")
DEFINE_DMA_ENTRY(ovl__0092F760_reloc, "ovl__0092F760_reloc")
DEFINE_DMA_ENTRY(ovl__0092FAF0, "ovl__0092FAF0")
DEFINE_DMA_ENTRY(ovl__0092FAF0_reloc, "ovl__0092FAF0_reloc")
-DEFINE_DMA_ENTRY(ovl_sum_hal_chest02, "ovl__0092FE80")
-DEFINE_DMA_ENTRY(ovl_sum_hal_chest02_reloc, "ovl__0092FE80_reloc")
+DEFINE_DMA_ENTRY(ovl_sum_hal_chest02, "ovl_sum_hal_chest02")
+DEFINE_DMA_ENTRY(ovl_sum_hal_chest02_reloc, "ovl_sum_hal_chest02_reloc")
DEFINE_DMA_ENTRY(ovl__00930210, "ovl__00930210")
DEFINE_DMA_ENTRY(ovl__00930210_reloc, "ovl__00930210_reloc")
DEFINE_DMA_ENTRY(ovl__009305A0, "ovl__009305A0")
@@ -1374,8 +1374,8 @@ DEFINE_DMA_ENTRY(ovl__00930B00, "ovl__00930B00")
DEFINE_DMA_ENTRY(ovl__00930B00_reloc, "ovl__00930B00_reloc")
DEFINE_DMA_ENTRY(ovl__00930B70, "ovl__00930B70")
DEFINE_DMA_ENTRY(ovl__00930B70_reloc, "ovl__00930B70_reloc")
-DEFINE_DMA_ENTRY(ovl__00930F00, "ovl__00930F00")
-DEFINE_DMA_ENTRY(ovl__00930F00_reloc, "ovl__00930F00_reloc")
+DEFINE_DMA_ENTRY(ovl_sum_clchest03, "ovl_sum_clchest03")
+DEFINE_DMA_ENTRY(ovl_sum_clchest03_reloc, "ovl_sum_clchest03_reloc")
DEFINE_DMA_ENTRY(ovl__00931290, "ovl__00931290")
DEFINE_DMA_ENTRY(ovl__00931290_reloc, "ovl__00931290_reloc")
DEFINE_DMA_ENTRY(ovl__00931620, "ovl__00931620")
@@ -2934,13 +2934,13 @@ DEFINE_DMA_ENTRY(segment_015C3000, "segment_015C3000")
DEFINE_DMA_ENTRY(segment_015C4000, "segment_015C4000")
DEFINE_DMA_ENTRY(segment_015C5000, "segment_015C5000")
DEFINE_DMA_ENTRY(segment_015C6000, "segment_015C6000")
-DEFINE_DMA_ENTRY(segment_015C8000, "segment_015C8000")
+DEFINE_DMA_ENTRY(int_sum_hal_chest02, "int_sum_hal_chest02")
DEFINE_DMA_ENTRY(segment_015CA000, "segment_015CA000")
DEFINE_DMA_ENTRY(segment_015CB000, "segment_015CB000")
DEFINE_DMA_ENTRY(segment_015CD000, "segment_015CD000")
DEFINE_DMA_ENTRY(segment_015CE000, "segment_015CE000")
DEFINE_DMA_ENTRY(segment_015CF000, "segment_015CF000")
-DEFINE_DMA_ENTRY(segment_015D0000, "segment_015D0000")
+DEFINE_DMA_ENTRY(int_sum_clchest03, "int_sum_clchest03")
DEFINE_DMA_ENTRY(segment_015D1000, "segment_015D1000")
DEFINE_DMA_ENTRY(segment_015D2000, "segment_015D2000")
DEFINE_DMA_ENTRY(segment_015D3000, "segment_015D3000")
diff --git a/linker_scripts/jp/symbol_addrs_assets.txt b/linker_scripts/jp/symbol_addrs_assets.txt
index bc07c47..e38e156 100644
--- a/linker_scripts/jp/symbol_addrs_assets.txt
+++ b/linker_scripts/jp/symbol_addrs_assets.txt
@@ -1289,3 +1289,40 @@ cKF_ds_act_balloon_tbl = 0x6000E9C; // segment:act_balloon rom:0x11F5E9C
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_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
+int_sum_hal_chest02_top_tex_txt = 0x60002A0; // segment:int_sum_hal_chest02 rom:0x15C82A0
+int_sum_hal_chest02_front_tex_txt = 0x6000320; // segment:int_sum_hal_chest02 rom:0x15C8320
+int_sum_hal_chest02_back_tex_txt = 0x6000620; // segment:int_sum_hal_chest02 rom:0x15C8620
+int_sum_hal_chest02_kuki_tex_txt = 0x60007A0; // segment:int_sum_hal_chest02 rom:0x15C87A0
+cKF_ckcb_r_int_sum_hal_chest02_tbl = 0x6000820; // segment:int_sum_hal_chest02 rom:0x15C8820
+cKF_kn_int_sum_hal_chest02_tbl = 0x6000824; // segment:int_sum_hal_chest02 rom:0x15C8824
+cKF_c_int_sum_hal_chest02_tbl = 0x6000830; // segment:int_sum_hal_chest02 rom:0x15C8830
+cKF_ds_int_sum_hal_chest02_tbl = 0x600083C; // segment:int_sum_hal_chest02 rom:0x15C883C
+cKF_ba_r_int_sum_hal_chest02 = 0x6000898; // segment:int_sum_hal_chest02 rom:0x15C8898
+int_sum_hal_chest02_v = 0x60008B0; // segment:int_sum_hal_chest02 rom:0x15C88B0 size:0x4E0
+int_sum_hal_chest01_door_model = 0x6000D90; // segment:int_sum_hal_chest02 rom:0x15C8D90
+int_sum_hal_chest02_base_model = 0x6000E60; // segment:int_sum_hal_chest02 rom:0x15C8E60
+cKF_je_r_int_sum_hal_chest02_tbl = 0x6000FF0; // segment:int_sum_hal_chest02 rom:0x15C8FF0
+cKF_bs_r_int_sum_hal_chest02 = 0x6001014; // segment:int_sum_hal_chest02 rom:0x15C9014
+
+int_sum_clchest03_pal01_pal = 0x6000000; // segment:int_sum_clchest03 rom:0x15D0000
+int_sum_clchest03_hiki_txt = 0x6000020; // segment:int_sum_clchest03 rom:0x15D0020
+int_sum_clchest03_hikiura_txt = 0x6000120; // segment:int_sum_clchest03 rom:0x15D0120
+int_sum_clchest03_top_txt = 0x6000220; // segment:int_sum_clchest03 rom:0x15D0220
+int_sum_clchest03_stand_txt = 0x6000320; // segment:int_sum_clchest03 rom:0x15D0320
+int_sum_clchest03_front_txt = 0x60003A0; // segment:int_sum_clchest03 rom:0x15D03A0
+int_sum_clchest03_side_txt = 0x6000520; // segment:int_sum_clchest03 rom:0x15D0520
+int_sum_clchest03_hisasi_txt = 0x60006A0; // segment:int_sum_clchest03 rom:0x15D06A0
+cKF_ckcb_r_int_sum_clchest03_tbl = 0x6000820; // segment:int_sum_clchest03 rom:0x15D0820
+cKF_kn_int_sum_clchest03_tbl = 0x6000824; // segment:int_sum_clchest03 rom:0x15D0824
+cKF_c_int_sum_clchest03_tbl = 0x6000830; // segment:int_sum_clchest03 rom:0x15D0830
+cKF_ds_int_sum_clchest03_tbl = 0x600083C; // segment:int_sum_clchest03 rom:0x15D083C
+cKF_ba_r_int_sum_clchest03 = 0x6000898; // segment:int_sum_clchest03 rom:0x15D0898
+int_sum_clchest03_v = 0x60008B0; // segment:int_sum_clchest03 rom:0x15D08B0 size:0x480
+int_sum_clchest03_door_model = 0x6000D30; // segment:int_sum_clchest03 rom:0x15D0D30
+int_sum_clchest03_base_model = 0x6000DF0; // segment:int_sum_clchest03 rom:0x15D0DF0
+cKF_je_r_int_sum_clchest03_tbl = 0x6000F38; // segment:int_sum_clchest03 rom:0x15D0F38
+cKF_bs_r_int_sum_clchest03 = 0x6000F5C; // segment:int_sum_clchest03 rom:0x15D0F5C
diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt
index b918cee..310fbe2 100644
--- a/linker_scripts/jp/symbol_addrs_overlays.txt
+++ b/linker_scripts/jp/symbol_addrs_overlays.txt
@@ -18487,8 +18487,8 @@ D_80A6FB64_jp = 0x80A6FB64; //
aSumHalChest02_ct = 0x80A6FBE0; // type:func
aSumHalChest02_mv = 0x80A6FC74; // type:func
-aSumHalChest03_dw = 0x80A6FCBC; // type:func
-aSumHalChest03_dt = 0x80A6FED0; // type:func
+aSumHalChest02_dw = 0x80A6FCBC; // type:func
+aSumHalChest02_dt = 0x80A6FED0; // type:func
// .data
@@ -18535,15 +18535,15 @@ D_80A70BE4_jp = 0x80A70BE4; //
// .text
-func_80A70C60_jp = 0x80A70C60; // type:func
-func_80A70CF4_jp = 0x80A70CF4; // type:func
-func_80A70D3C_jp = 0x80A70D3C; // type:func
-func_80A70F50_jp = 0x80A70F50; // type:func
+aSumClChest03_ct = 0x80A70C60; // type:func
+aSumClChest03_mv = 0x80A70CF4; // type:func
+aSumClChest03_dw = 0x80A70D3C; // type:func
+aSumClChest03_dt = 0x80A70F50; // type:func
// .data
-D_80A70F60_jp = 0x80A70F60; //
-D_80A70F74_jp = 0x80A70F74; //
+aSumClChest03_func = 0x80A70F60; //
+iam_sum_clchest03 = 0x80A70F74; //
// .text
diff --git a/linker_scripts/jp/undefined_syms.ld b/linker_scripts/jp/undefined_syms.ld
index 99080b0..d18f37b 100644
--- a/linker_scripts/jp/undefined_syms.ld
+++ b/linker_scripts/jp/undefined_syms.ld
@@ -4216,13 +4216,6 @@ D_6000020 = 0x06000020;
D_60008E8 = 0x060008E8;
D_60011D4 = 0x060011D4;
-// ovl_sum_hal_chest02
-
-D_6000000 = 0x06000000;
-D_6000020 = 0x06000020;
-cKF_ba_r_int_sum_hal_chest02 = 0x06000898;
-cKF_bs_r_int_sum_hal_chest02 = 0x06001014;
-
// ovl__00930210
D_6000000 = 0x06000000;
@@ -4256,14 +4249,6 @@ D_6000020 = 0x06000020;
D_60008E8 = 0x060008E8;
D_6000F3C = 0x06000F3C;
-// ovl__00930F00
-
-D_6000000 = 0x06000000;
-D_6000020 = 0x06000020;
-D_6000898 = 0x06000898;
-D_6000F5C = 0x06000F5C;
-D_6000F70 = 0x06000F70;
-
// ovl__00931290
D_6000000 = 0x06000000;
diff --git a/src/code/m_room_type.c b/src/code/m_room_type.c
index a4c879c..a6e2f29 100644
--- a/src/code/m_room_type.c
+++ b/src/code/m_room_type.c
@@ -1152,14 +1152,14 @@ void mRmTp_MakeFamicom_Fdebug() {
if ((gamePT->input[1].press.button & Z_TRIG) == Z_TRIG && game != NULL) {
- if (common_data.clip.unk_080 != NULL) {
+ if (common_data.clip.myRoomClip != NULL) {
ftr = mRmTp_famicom_idx + 0x34A;
- res = common_data.clip.unk_080->unk_04(game, ftr, &utX, &utZ, &direct, &ofs, &layer);
+ res = common_data.clip.myRoomClip->unk_04(game, ftr, &utX, &utZ, &direct, &ofs, &layer);
if (res >= 0) {
- common_data.clip.unk_080->unk_28(game, ftr, res, utX, utZ, direct, ofs, layer);
+ common_data.clip.myRoomClip->unk_28(game, ftr, res, utX, utZ, direct, ofs, layer);
}
}
}
diff --git a/src/code/m_scene.c b/src/code/m_scene.c
index eb27d6e..3f67370 100644
--- a/src/code/m_scene.c
+++ b/src/code/m_scene.c
@@ -415,8 +415,8 @@ void mSc_dmacopy_all_exchange_bank(ObjectExchangeBank* exchange) {
if (common_data.clip.weatherClip != NULL) {
common_data.clip.weatherClip->changingWeather();
}
- if (common_data.clip.unk_080 != NULL) {
- common_data.clip.unk_080->unk_24();
+ if (common_data.clip.myRoomClip != NULL) {
+ common_data.clip.myRoomClip->unk_24();
}
if (common_data.clip.unk_09C != NULL) {
common_data.clip.unk_09C->unk_C();
diff --git a/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.c b/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.c
new file mode 100644
index 0000000..af0c5ce
--- /dev/null
+++ b/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.c
@@ -0,0 +1,44 @@
+#include "int_sum_clchest03.h"
+
+#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_pal01_pal.palette.inc.c"
+u8 int_sum_clchest03_hiki_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_hiki_txt.ci4.inc.c"
+};
+u8 int_sum_clchest03_hikiura_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_hikiura_txt.ci4.inc.c"
+};
+u8 int_sum_clchest03_top_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_top_txt.ci4.inc.c"
+};
+u8 int_sum_clchest03_stand_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_stand_txt.ci4.inc.c"
+};
+u8 int_sum_clchest03_front_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_front_txt.ci4.inc.c"
+};
+u8 int_sum_clchest03_side_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_side_txt.ci4.inc.c"
+};
+u8 int_sum_clchest03_hisasi_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_hisasi_txt.ci4.inc.c"
+};
+s32 pad15D0720[] = {
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+};
+#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_ckcb_r_int_sum_clchest03_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_kn_int_sum_clchest03_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_c_int_sum_clchest03_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_ds_int_sum_clchest03_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_ba_r_int_sum_clchest03.inc.c"
+#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_v.vtx.inc.c"
+#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_door_model.gfx.inc.c"
+#include "assets/jp/objects/furniture/int_sum_clchest03/int_sum_clchest03_base_model.gfx.inc.c"
+#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_je_r_int_sum_clchest03_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_clchest03/cKF_bs_r_int_sum_clchest03.inc.c"
diff --git a/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.h b/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.h
new file mode 100644
index 0000000..328a1bf
--- /dev/null
+++ b/src/objects/furniture/int_sum_clchest03/int_sum_clchest03.h
@@ -0,0 +1,26 @@
+#ifndef OBJECT_INT_SUM_CLCHEST03_H
+#define OBJECT_INT_SUM_CLCHEST03_H
+
+#include "gbi.h"
+#include "c_keyframe.h"
+
+extern u16 int_sum_clchest03_pal01_pal[];
+extern u8 int_sum_clchest03_hiki_txt[];
+extern u8 int_sum_clchest03_hikiura_txt[];
+extern u8 int_sum_clchest03_top_txt[];
+extern u8 int_sum_clchest03_stand_txt[];
+extern u8 int_sum_clchest03_front_txt[];
+extern u8 int_sum_clchest03_side_txt[];
+extern u8 int_sum_clchest03_hisasi_txt[];
+extern u8 cKF_ckcb_r_int_sum_clchest03_tbl[];
+extern s16 cKF_kn_int_sum_clchest03_tbl[];
+extern s16 cKF_c_int_sum_clchest03_tbl[];
+extern Keyframe cKF_ds_int_sum_clchest03_tbl[];
+extern BaseAnimationR cKF_ba_r_int_sum_clchest03;
+extern Vtx int_sum_clchest03_v[];
+extern Gfx int_sum_clchest03_door_model[];
+extern Gfx int_sum_clchest03_base_model[];
+extern JointElemR cKF_je_r_int_sum_clchest03_tbl[];
+extern BaseSkeletonR cKF_bs_r_int_sum_clchest03;
+
+#endif
diff --git a/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.c b/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.c
new file mode 100644
index 0000000..f8340c8
--- /dev/null
+++ b/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.c
@@ -0,0 +1,31 @@
+#include "int_sum_hal_chest02.h"
+
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_pal.palette.inc.c"
+u8 int_sum_hal_chest02_hiki_tex_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_hiki_tex_txt.ci4.inc.c"
+};
+u8 int_sum_hal_chest02_hiite_tex_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_hiite_tex_txt.ci4.inc.c"
+};
+u8 int_sum_hal_chest02_top_tex_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_top_tex_txt.ci4.inc.c"
+};
+u8 int_sum_hal_chest02_front_tex_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_front_tex_txt.ci4.inc.c"
+};
+u8 int_sum_hal_chest02_back_tex_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_back_tex_txt.ci4.inc.c"
+};
+u8 int_sum_hal_chest02_kuki_tex_txt[] = {
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_kuki_tex_txt.ci4.inc.c"
+};
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_ckcb_r_int_sum_hal_chest02_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_kn_int_sum_hal_chest02_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_c_int_sum_hal_chest02_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_ds_int_sum_hal_chest02_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_ba_r_int_sum_hal_chest02.inc.c"
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_v.vtx.inc.c"
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest01_door_model.gfx.inc.c"
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02_base_model.gfx.inc.c"
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_je_r_int_sum_hal_chest02_tbl.inc.c"
+#include "assets/jp/objects/furniture/int_sum_hal_chest02/cKF_bs_r_int_sum_hal_chest02.inc.c"
diff --git a/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.h b/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.h
new file mode 100644
index 0000000..f9b0593
--- /dev/null
+++ b/src/objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.h
@@ -0,0 +1,25 @@
+#ifndef OBJECT_INT_SUM_HAL_CHEST02_H
+#define OBJECT_INT_SUM_HAL_CHEST02_H
+
+#include "gbi.h"
+#include "c_keyframe.h"
+
+extern u16 int_sum_hal_chest02_pal[];
+extern u8 int_sum_hal_chest02_hiki_tex_txt[];
+extern u8 int_sum_hal_chest02_hiite_tex_txt[];
+extern u8 int_sum_hal_chest02_top_tex_txt[];
+extern u8 int_sum_hal_chest02_front_tex_txt[];
+extern u8 int_sum_hal_chest02_back_tex_txt[];
+extern u8 int_sum_hal_chest02_kuki_tex_txt[];
+extern u8 cKF_ckcb_r_int_sum_hal_chest02_tbl[];
+extern s16 cKF_kn_int_sum_hal_chest02_tbl[];
+extern s16 cKF_c_int_sum_hal_chest02_tbl[];
+extern Keyframe cKF_ds_int_sum_hal_chest02_tbl[];
+extern BaseAnimationR cKF_ba_r_int_sum_hal_chest02;
+extern Vtx int_sum_hal_chest02_v[];
+extern Gfx int_sum_hal_chest01_door_model[];
+extern Gfx int_sum_hal_chest02_base_model[];
+extern JointElemR cKF_je_r_int_sum_hal_chest02_tbl[];
+extern BaseSkeletonR cKF_bs_r_int_sum_hal_chest02;
+
+#endif
diff --git a/src/overlays/actors/ovl_My_Room/ac_my_room.h b/src/overlays/actors/ovl_My_Room/ac_my_room.h
index e9f0f87..0ff697b 100644
--- a/src/overlays/actors/ovl_My_Room/ac_my_room.h
+++ b/src/overlays/actors/ovl_My_Room/ac_my_room.h
@@ -5,8 +5,10 @@
#include "m_actor.h"
#include "unk.h"
#include "c_keyframe.h"
+#include "libc/stdint.h"
struct Game_Play;
+struct Game;
struct My_Room;
struct Actor;
@@ -23,7 +25,7 @@ typedef struct FurnitureActor {
/* 0x134 */ SkeletonInfoR skeletonInfo;
/* 0x1A4 */ s_xyz jointTable[9];
/* 0x1DA */ s_xyz morphTable[9];
- /* 0x210 */ Mtx matrix[2][10]; // not sure if the array dimensions are correct
+ /* 0x210 */ Mtx matrix[2][10];
} FurnitureActor; // size >= 0xA10
typedef void (*FurnitureCreate)(FurnitureActor* this, u8* data);
@@ -40,24 +42,28 @@ typedef struct FurnitureActorFunctions {
/* 0x10 */ FurnitureDma furnitureDma;
} FurnitureActorFunctions; // size = 0x14
-typedef struct FurnitureActorUnkStruct {
- /* 0x00 */ UNK_TYPE4 unk00;
- /* 0x04 */ UNK_TYPE4 unk04;
- /* 0x08 */ UNK_TYPE4 unk08;
- /* 0x0C */ UNK_TYPE4 unk0C;
- /* 0x10 */ UNK_TYPE4 unk10;
- /* 0x14 */ UNK_TYPE4 unk14;
- /* 0x18 */ UNK_TYPE4 unk18;
- /* 0x1C */ UNK_TYPE4 unk1C;
- /* 0x20 */ UNK_TYPE4 unk20;
- /* 0x24 */ UNK_TYPE4 unk24;
- /* 0x28 */ UNK_TYPE4 unk28;
- /* 0x2C */ UNK_TYPE4 unk2C;
- /* 0x30 */ UNK_TYPE4 unk30;
- /* 0x34 */ UNK_TYPE4 unk34;
- /* 0x38 */ UNK_TYPE4 unk38;
- /* 0x3C */ UNK_TYPE4 unk3C;
+typedef struct FurnitureActorProfile {
+ /* 0x00 */ uintptr_t objectRomStart;
+ /* 0x04 */ uintptr_t objectRomEnd;
+ /* 0x08 */ void* objectSegmentStart;
+ /* 0x0C */ void* objectSegmentEnd;
+ /* 0x10 */ UNK_PTR unk10; // opaque0
+ /* 0x14 */ UNK_PTR unk14; // opaque1
+ /* 0x18 */ UNK_PTR unk18; // translucent0
+ /* 0x1C */ UNK_PTR unk1C; // translucent1
+ /* 0x20 */ UNK_PTR unk20; // texture
+ /* 0x24 */ UNK_PTR unk24; // palette
+ /* 0x28 */ UNK_PTR unk28; // rig
+ /* 0x2C */ UNK_PTR unk2C; // tex_anim
+ /* 0x30 */ f32 height;
+ /* 0x34 */ f32 scale;
+ /* 0x38 */ UNK_TYPE1 unk38; // shape
+ /* 0x39 */ UNK_TYPE1 unk39; // move_bg_type
+ /* 0x3A */ UNK_TYPE1 unk3A; // check_rotation
+ /* 0x3B */ UNK_TYPE1 unk3B; // kankyo_map
+ /* 0x3C */ UNK_TYPE1 unk3C; // contact_action
+ /* 0x3E */ UNK_TYPE2 unk3E; // interaction_type
/* 0x40 */ FurnitureActorFunctions* furnitureActorFunctions;
-} FurnitureActorUnkStruct; // size = 0x44
+} FurnitureActorProfile; // size = 0x44
#endif
diff --git a/src/overlays/furniture/ovl_sum_clchest03/ac_sum_clchest03.c b/src/overlays/furniture/ovl_sum_clchest03/ac_sum_clchest03.c
new file mode 100644
index 0000000..92b7ee2
--- /dev/null
+++ b/src/overlays/furniture/ovl_sum_clchest03/ac_sum_clchest03.c
@@ -0,0 +1,93 @@
+#include "m_lib.h"
+#include "c_keyframe.h"
+#include "src/overlays/actors/ovl_My_Room/ac_my_room.h"
+#include "segment_symbols.h"
+#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_dw(FurnitureActor* this, Actor* myRoomActor UNUSED, Game_Play* game_play, u8* data UNUSED);
+void aSumClChest03_dt(FurnitureActor* this UNUSED, u8* data UNUSED);
+
+FurnitureActorFunctions aSumClChest03_func = {
+ /* */ aSumClChest03_ct,
+ /* */ aSumClChest03_mv,
+ /* */ aSumClChest03_dw,
+ /* */ aSumClChest03_dt,
+ /* */ NULL,
+};
+
+FurnitureActorProfile iam_sum_clchest03 = {
+ /* */ SEGMENT_ROM_START(int_sum_clchest03),
+ /* */ SEGMENT_ROM_END(int_sum_clchest03),
+ /* */ SEGMENT_VRAM_START(int_sum_clchest03),
+ /* */ SEGMENT_VRAM_END(int_sum_clchest03),
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ 18.0f,
+ /* */ 0.01f,
+ /* */ 4,
+ /* */ 0,
+ /* */ 0,
+ /* */ 0,
+ /* */ 0,
+ /* */ 4,
+ /* */ &aSumClChest03_func,
+};
+
+void aSumClChest03_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_clchest03),
+ Lib_SegmentedToVirtual(&cKF_ba_r_int_sum_clchest03), this->jointTable, this->morphTable);
+ cKF_SkeletonInfo_R_init_standard_stop(skeletonInfo, Lib_SegmentedToVirtual(&cKF_ba_r_int_sum_clchest03), NULL);
+ skeletonInfo->frameControl.speed = 0.0f;
+ cKF_SkeletonInfo_R_play(skeletonInfo);
+}
+
+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);
+ }
+}
+
+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];
+
+ 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++);
+ CLOSE_DISPS(game_play->state.gfxCtx);
+
+ cKF_Si3_draw_R_SV(game_play, &this->skeletonInfo, mtx, NULL, NULL, NULL);
+}
+
+void aSumClChest03_dt(FurnitureActor* this UNUSED, u8* data UNUSED) {
+}
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 3fc94f3..f1c2210 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
@@ -1,43 +1,46 @@
#include "m_lib.h"
#include "c_keyframe.h"
#include "src/overlays/actors/ovl_My_Room/ac_my_room.h"
+#include "segment_symbols.h"
+#include "objects/furniture/int_sum_hal_chest02/int_sum_hal_chest02.h"
void aSumHalChest02_ct(FurnitureActor* this, u8* data);
void aSumHalChest02_mv(FurnitureActor* this, Actor* myRoomActor, Game_Play* game_play, u8* data);
-void aSumHalChest03_dw(FurnitureActor* this, Actor* myRoomActor, Game_Play* game_play, u8* data);
-void aSumHalChest03_dt(FurnitureActor* this, u8* data);
+void aSumHalChest02_dw(FurnitureActor* this, Actor* myRoomActor, Game_Play* game_play, u8* data);
+void aSumHalChest02_dt(FurnitureActor* this, u8* data);
FurnitureActorFunctions aSumHalChest02_func = {
/* */ aSumHalChest02_ct,
/* */ aSumHalChest02_mv,
- /* */ aSumHalChest03_dw,
- /* */ aSumHalChest03_dt,
+ /* */ aSumHalChest02_dw,
+ /* */ aSumHalChest02_dt,
/* */ NULL,
};
-FurnitureActorUnkStruct iam_sum_hal_chest02 = {
- /* */ 0x015C8000,
- /* */ 0x015C9020,
- /* */ 0x06000000,
- /* */ 0x06001020,
- /* */ 0x00000000,
- /* */ 0x00000000,
- /* */ 0x00000000,
- /* */ 0x00000000,
- /* */ 0x00000000,
- /* */ 0x00000000,
- /* */ 0x00000000,
- /* */ 0x00000000,
- /* */ 0x42200000,
- /* */ 0x3C23D70A,
- /* */ 0x04000000,
- /* */ 0x00000004,
+FurnitureActorProfile iam_sum_hal_chest02 = {
+ /* */ SEGMENT_ROM_START(int_sum_hal_chest02),
+ /* */ SEGMENT_ROM_END(int_sum_hal_chest02),
+ /* */ SEGMENT_VRAM_START(int_sum_hal_chest02),
+ /* */ SEGMENT_VRAM_END(int_sum_hal_chest02),
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ NULL,
+ /* */ 40.0f,
+ /* */ 0.01f,
+ /* */ 4,
+ /* */ 0,
+ /* */ 0,
+ /* */ 0,
+ /* */ 0,
+ /* */ 4,
/* */ &aSumHalChest02_func,
};
-extern BaseSkeletonR cKF_bs_r_int_sum_hal_chest02;
-extern BaseAnimationR cKF_ba_r_int_sum_hal_chest02;
-
void aSumHalChest02_ct(FurnitureActor* this, u8* data UNUSED) {
UNUSED s32 pad[2];
SkeletonInfoR* skeletonInfo = &this->skeletonInfo;
@@ -50,15 +53,12 @@ void aSumHalChest02_ct(FurnitureActor* this, u8* data UNUSED) {
}
void aSumHalChest02_mv(FurnitureActor* this, Actor* myRoomActor, Game_Play* game_play, u8* data UNUSED) {
- if (common_data.clip.unk_080 != NULL) {
- common_data.clip.unk_080->unk_34(this, myRoomActor, game_play, 1.0f, 16.0f);
+ if (common_data.clip.myRoomClip != NULL) {
+ common_data.clip.myRoomClip->unk_34(this, myRoomActor, game_play, 1.0f, 16.0f);
}
}
-extern UNK_PTR D_6000020;
-extern UNK_PTR D_6000000;
-
-void aSumHalChest03_dw(FurnitureActor* this, Actor* myRoomActor UNUSED, Game_Play* game_play, u8* data UNUSED) {
+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];
@@ -68,16 +68,16 @@ void aSumHalChest03_dw(FurnitureActor* this, Actor* myRoomActor UNUSED, Game_Pla
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, &D_6000020);
+ 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, 2047, 0);
+ 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, &D_6000000);
+ 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);
@@ -89,5 +89,5 @@ void aSumHalChest03_dw(FurnitureActor* this, Actor* myRoomActor UNUSED, Game_Pla
cKF_Si3_draw_R_SV(game_play, &this->skeletonInfo, mtx, NULL, NULL, NULL);
}
-void aSumHalChest03_dt(FurnitureActor* this UNUSED, u8* data UNUSED) {
+void aSumHalChest02_dt(FurnitureActor* this UNUSED, u8* data UNUSED) {
}
diff --git a/yamls/jp/assets.yaml b/yamls/jp/assets.yaml
index 287fcde..b018373 100644
--- a/yamls/jp/assets.yaml
+++ b/yamls/jp/assets.yaml
@@ -12266,12 +12266,41 @@
align: 0x1000
- [0x15C71E0]
- - name: segment_015C8000
- type: bin
+ - name: int_sum_hal_chest02
+ dir: objects/furniture/int_sum_hal_chest02
+ type: code
start: 0x15C8000
- # vram:
+ vram: 0x06000000
+ exclusive_ram_id: segment_06
compress: True
align: 0x1000
+ symbol_name_format: $VRAM_$ROM
+ subsegments:
+ - [auto, c, int_sum_hal_chest02]
+ - start: 0x15C8000
+ type: .data
+ name: int_sum_hal_chest02
+ subsegments:
+ - [0x15C8000, af_palette, int_sum_hal_chest02_pal]
+ - [0x15C8020, ci4, int_sum_hal_chest02_hiki_tex_txt, 32, 32, int_sum_hal_chest02_pal]
+ - [0x15C8220, ci4, int_sum_hal_chest02_hiite_tex_txt, 16, 16, int_sum_hal_chest02_pal]
+ - [0x15C82A0, ci4, int_sum_hal_chest02_top_tex_txt, 16, 16, int_sum_hal_chest02_pal]
+ - [0x15C8320, ci4, int_sum_hal_chest02_front_tex_txt, 32, 48, int_sum_hal_chest02_pal]
+ - [0x15C8620, ci4, int_sum_hal_chest02_back_tex_txt, 16, 48, int_sum_hal_chest02_pal]
+ - [0x15C87A0, ci4, int_sum_hal_chest02_kuki_tex_txt, 16, 16, int_sum_hal_chest02_pal]
+ - [0x15C8820, ckf_ckcb, cKF_ckcb_r_int_sum_hal_chest02_tbl]
+ - [0x15C8824, ckf_kn, cKF_kn_int_sum_hal_chest02_tbl]
+ - [0x15C8830, ckf_c, cKF_c_int_sum_hal_chest02_tbl]
+ - [0x15C883C, ckf_ds, cKF_ds_int_sum_hal_chest02_tbl]
+ - [0x15C8896, pad]
+ - [0x15C8898, ckf_ba, cKF_ba_r_int_sum_hal_chest02]
+ - [0x15C88AC, pad]
+ - [0x15C88B0, vtx, int_sum_hal_chest02_v]
+ - [0x15C8D90, af_gfx, int_sum_hal_chest01_door_model]
+ - [0x15C8E60, af_gfx, int_sum_hal_chest02_base_model]
+ - [0x15C8FF0, ckf_je, cKF_je_r_int_sum_hal_chest02_tbl]
+ - [0x15C9014, ckf_bs, cKF_bs_r_int_sum_hal_chest02]
+ - [0x15C901C]
- [0x15C9020]
- name: segment_015CA000
@@ -12314,12 +12343,43 @@
align: 0x1000
- [0x15CFF50]
- - name: segment_015D0000
- type: bin
+ - name: int_sum_clchest03
+ dir: objects/furniture/int_sum_clchest03
+ type: code
start: 0x15D0000
- # vram:
+ vram: 0x06000000
+ exclusive_ram_id: segment_06
compress: True
align: 0x1000
+ symbol_name_format: $VRAM_$ROM
+ subsegments:
+ - [auto, c, int_sum_clchest03]
+ - start: 0x15D0000
+ type: .data
+ name: int_sum_clchest03
+ subsegments:
+ - [0x15D0000, af_palette, int_sum_clchest03_pal01_pal]
+ - [0x15D0020, ci4, int_sum_clchest03_hiki_txt, 16, 32, int_sum_clchest03_pal01_pal]
+ - [0x15D0120, ci4, int_sum_clchest03_hikiura_txt, 16, 32, int_sum_clchest03_pal01_pal]
+ - [0x15D0220, ci4, int_sum_clchest03_top_txt, 16, 32, int_sum_clchest03_pal01_pal]
+ - [0x15D0320, ci4, int_sum_clchest03_stand_txt, 16, 16, int_sum_clchest03_pal01_pal]
+ - [0x15D03A0, ci4, int_sum_clchest03_front_txt, 16, 48, int_sum_clchest03_pal01_pal]
+ - [0x15D0520, ci4, int_sum_clchest03_side_txt, 16, 48, int_sum_clchest03_pal01_pal]
+ - [0x15D06A0, ci4, int_sum_clchest03_hisasi_txt, 16, 16, int_sum_clchest03_pal01_pal]
+ - [0x15D0720, pad]
+ - [0x15D0820, ckf_ckcb, cKF_ckcb_r_int_sum_clchest03_tbl]
+ - [0x15D0824, ckf_kn, cKF_kn_int_sum_clchest03_tbl]
+ - [0x15D0830, ckf_c, cKF_c_int_sum_clchest03_tbl]
+ - [0x15D083C, ckf_ds, cKF_ds_int_sum_clchest03_tbl]
+ - [0x15D0896, pad]
+ - [0x15D0898, ckf_ba, cKF_ba_r_int_sum_clchest03]
+ - [0x15D08AC, pad]
+ - [0x15D08B0, vtx, int_sum_clchest03_v]
+ - [0x15D0D30, af_gfx, int_sum_clchest03_door_model]
+ - [0x15D0DF0, af_gfx, int_sum_clchest03_base_model]
+ - [0x15D0F38, ckf_je, cKF_je_r_int_sum_clchest03_tbl]
+ - [0x15D0F5C, ckf_bs, cKF_bs_r_int_sum_clchest03]
+ - [0x15D0F64]
- [0x15D0F70]
- name: segment_015D1000
diff --git a/yamls/jp/overlays.yaml b/yamls/jp/overlays.yaml
index 1df56fa..da3146a 100644
--- a/yamls/jp/overlays.yaml
+++ b/yamls/jp/overlays.yaml
@@ -12945,7 +12945,7 @@
subsegments:
- [0x930ED0, data, overlays/other_ovl/ovl__00930B70/ovl__00930B70_reloc]
- - name: ovl__00930F00
+ - name: ovl_sum_clchest03
type: code
start: 0x930F00
vram: 0x80A70C60
@@ -12953,22 +12953,22 @@
compress: True
bss_size: 0x0
subsegments:
- - [0x930F00, asm, overlays/other_ovl/ovl__00930F00/ovl__00930F00]
- - [0x931200, data, overlays/other_ovl/ovl__00930F00/ovl__00930F00]
- - name: ovl__00930F00_reloc
+ - [0x930F00, c, overlays/furniture/ovl_sum_clchest03/ac_sum_clchest03]
+ - [0x931200, .data, overlays/furniture/ovl_sum_clchest03/ac_sum_clchest03]
+ - name: ovl_sum_clchest03_reloc
type: code
start: 0x931260
vram: 0x80A70FC0
- follows_vram: ovl__00930F00
+ follows_vram: ovl_sum_clchest03
compress: True
subsegments:
- - [0x931260, data, overlays/other_ovl/ovl__00930F00/ovl__00930F00_reloc]
+ - [0x931260, data, overlays/furniture/ovl_sum_clchest03/ovl_sum_clchest03_reloc]
- name: ovl__00931290
type: code
start: 0x931290
vram: 0x80A70FF0
- follows_vram: ovl__00930F00_reloc
+ follows_vram: ovl_sum_clchest03_reloc
compress: True
bss_size: 0x0
subsegments: