Skip to content

o_container_wood: match init and dest, disp at 99.78% #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thescorcher wants to merge 2 commits into
base: main
Choose a base branch
from
+421 −39
Open

o_container_wood: match init and dest, disp at 99.78% #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db0a526
o_container_wood: match init and dest, disp at 99.78%
thescorcher Oct 11, 2026
c636227
o_container_wood: define data in file, apply review feedback
thescorcher Oct 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions config/GSNE8P/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,81 @@ modules:
header: assets/o_cont_chao_cnk_mdl_2_vtx.inc
header_type: none
custom_type: s32
- symbol: o_cont_wood_cnk_mdl_0_tex!.data:0x2156a0
binary: assets/o_cont_wood_cnk_mdl_0_tex.bin
header: assets/o_cont_wood_cnk_mdl_0_tex.inc
header_type: none
custom_type: s16
- symbol: o_cont_wood_cnk_mdl_0_vtx!.data:0x21574c
binary: assets/o_cont_wood_cnk_mdl_0_vtx.bin
header: assets/o_cont_wood_cnk_mdl_0_vtx.inc
header_type: none
custom_type: s32
- symbol: o_cont_wood_vec_0!.data:0x215830
binary: assets/o_cont_wood_vec_0.bin
header: assets/o_cont_wood_vec_0.inc
header_type: none
custom_type: vtx
- symbol: o_cont_wood_vec_1!.data:0x215890
binary: assets/o_cont_wood_vec_1.bin
header: assets/o_cont_wood_vec_1.inc
header_type: none
custom_type: vtx
- symbol: o_cont_wood_uv_0!.data:0x2158f0
binary: assets/o_cont_wood_uv_0.bin
header: assets/o_cont_wood_uv_0.inc
header_type: none
custom_type: s16
- symbol: o_cont_wood_material_0!.data:0x215980
binary: assets/o_cont_wood_material_0.bin
header: assets/o_cont_wood_material_0.inc
header_type: none
custom_type: gjmaterial
- symbol: o_cont_wood_material_1!.data:0x2159d0
binary: assets/o_cont_wood_material_1.bin
header: assets/o_cont_wood_material_1.inc
header_type: none
custom_type: gjmaterial
- symbol: o_cont_wood_dl_0!.data:0x2159e0
binary: assets/o_cont_wood_dl_0.bin
header: assets/o_cont_wood_dl_0.inc
header_type: none
custom_type: displaylist
- symbol: o_cont_wood_dl_1!.data:0x215a00
binary: assets/o_cont_wood_dl_1.bin
header: assets/o_cont_wood_dl_1.inc
header_type: none
custom_type: displaylist
- symbol: o_cont_wood_cnk_mdl_1_tex!.data:0x215ab8
binary: assets/o_cont_wood_cnk_mdl_1_tex.bin
header: assets/o_cont_wood_cnk_mdl_1_tex.inc
header_type: none
custom_type: s16
- symbol: o_cont_wood_cnk_mdl_1_vtx!.data:0x215c68
binary: assets/o_cont_wood_cnk_mdl_1_vtx.bin
header: assets/o_cont_wood_cnk_mdl_1_vtx.inc
header_type: none
custom_type: s32
- symbol: o_cont_wood_cnk_mdl_2_tex!.data:0x215f10
binary: assets/o_cont_wood_cnk_mdl_2_tex.bin
header: assets/o_cont_wood_cnk_mdl_2_tex.inc
header_type: none
custom_type: s16
- symbol: o_cont_wood_cnk_mdl_2_vtx!.data:0x216018
binary: assets/o_cont_wood_cnk_mdl_2_vtx.bin
header: assets/o_cont_wood_cnk_mdl_2_vtx.inc
header_type: none
custom_type: s32
- symbol: o_cont_wood_cnk_mdl_3_tex!.data:0x2161d0
binary: assets/o_cont_wood_cnk_mdl_3_tex.bin
header: assets/o_cont_wood_cnk_mdl_3_tex.inc
header_type: none
custom_type: s16
- symbol: o_cont_wood_cnk_mdl_3_vtx!.data:0x21635c
binary: assets/o_cont_wood_cnk_mdl_3_vtx.bin
header: assets/o_cont_wood_cnk_mdl_3_vtx.inc
header_type: none
custom_type: s32

- object: orig/GSNE8P/files/stg14D.rel
hash: 68b094fa0f3e58adb7276d34d4b9881ac1c64fae
Expand Down
78 changes: 39 additions & 39 deletions config/GSNE8P/stg13D/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,10 @@ ContainerIron_1 = .text:0x0002636C; // type:function size:0x9D8
ContainerIron_2 = .text:0x00026D44; // type:function size:0xAC
ContainerIron_3 = .text:0x00026DF0; // type:function size:0x74
ContainerWood = .text:0x00026E64; // type:function size:0xE8
ContainerWood_0 = .text:0x00026F4C; // type:function size:0x38
ContainerWood_1 = .text:0x00026F84; // type:function size:0x968
ContainerWood_2 = .text:0x000278EC; // type:function size:0x10C
ContainerWood_3 = .text:0x000279F8; // type:function size:0x2B0
ContainerWood_dest = .text:0x00026F4C; // type:function size:0x38 scope:local
ContainerWood_exec = .text:0x00026F84; // type:function size:0x968 scope:local
ContainerWood_disp = .text:0x000278EC; // type:function size:0x10C scope:local
ContainerWood_dispSort = .text:0x000279F8; // type:function size:0x2B0 scope:local
fn_13_27CA8 = .text:0x00027CA8; // type:function size:0x34
fn_13_27CDC = .text:0x00027CDC; // type:function size:0x11C
fn_13_27DF8 = .text:0x00027DF8; // type:function size:0x110
Expand Down Expand Up @@ -16102,40 +16102,40 @@ lbl_13_data_2155D8 = .data:0x002155D8; // type:object size:0x40 data:4byte
lbl_13_data_215618 = .data:0x00215618; // type:object size:0x48
lbl_13_data_215660 = .data:0x00215660; // type:object size:0xE align:32 data:string
lbl_13_data_215670 = .data:0x00215670; // type:object size:0xE data:string
lbl_13_data_215680 = .data:0x00215680; // type:object size:0x18
lbl_13_data_215698 = .data:0x00215698; // type:object size:0x8
lbl_13_data_2156A0 = .data:0x002156A0; // type:object size:0xAC
lbl_13_data_21574C = .data:0x0021574C; // type:object size:0xCC
lbl_13_data_215818 = .data:0x00215818; // type:object size:0x18
lbl_13_data_215830 = .data:0x00215830; // type:object size:0x60
lbl_13_data_215890 = .data:0x00215890; // type:object size:0x60
lbl_13_data_2158F0 = .data:0x002158F0; // type:object size:0x50
lbl_13_data_215940 = .data:0x00215940; // type:object size:0x40
lbl_13_data_215980 = .data:0x00215980; // type:object size:0x50
lbl_13_data_2159D0 = .data:0x002159D0; // type:object size:0x10
lbl_13_data_2159E0 = .data:0x002159E0; // type:object size:0x20
lbl_13_data_215A00 = .data:0x00215A00; // type:object size:0x60
lbl_13_data_215A60 = .data:0x00215A60; // type:object size:0x20
lbl_13_data_215A80 = .data:0x00215A80; // type:object size:0x24 align:4 data:float
lbl_13_data_215AA4 = .data:0x00215AA4; // type:object size:0xC
lbl_13_data_215AB0 = .data:0x00215AB0; // type:object size:0x8
lbl_13_data_215AB8 = .data:0x00215AB8; // type:object size:0x1B0
lbl_13_data_215C68 = .data:0x00215C68; // type:object size:0x27C
lbl_13_data_215EE4 = .data:0x00215EE4; // type:object size:0x18
lbl_13_data_215EFC = .data:0x00215EFC; // type:object size:0xC
lbl_13_data_215F08 = .data:0x00215F08; // type:object size:0x8
lbl_13_data_215F10 = .data:0x00215F10; // type:object size:0x108
lbl_13_data_216018 = .data:0x00216018; // type:object size:0x18C
lbl_13_data_2161A4 = .data:0x002161A4; // type:object size:0x18
lbl_13_data_2161BC = .data:0x002161BC; // type:object size:0xC
lbl_13_data_2161C8 = .data:0x002161C8; // type:object size:0x8
lbl_13_data_2161D0 = .data:0x002161D0; // type:object size:0x18C
lbl_13_data_21635C = .data:0x0021635C; // type:object size:0x21C
lbl_13_data_216578 = .data:0x00216578; // type:object size:0x18
lbl_13_data_216590 = .data:0x00216590; // type:object size:0x14
lbl_13_data_2165A4 = .data:0x002165A4; // type:object size:0x24
lbl_13_data_2165C8 = .data:0x002165C8; // type:object size:0x40 data:4byte
lbl_13_data_216608 = .data:0x00216608; // type:object size:0x30
o_cont_wood_texname_0 = .data:0x00215680; // type:object size:0x18 scope:local
o_cont_wood_texlist_0 = .data:0x00215698; // type:object size:0x8 scope:local
o_cont_wood_cnk_mdl_0_tex = .data:0x002156A0; // type:object size:0xAC scope:local
o_cont_wood_cnk_mdl_0_vtx = .data:0x0021574C; // type:object size:0xCC scope:local
o_cont_wood_cnk_mdl_0 = .data:0x00215818; // type:object size:0x18 scope:local
o_cont_wood_vec_0 = .data:0x00215830; // type:object size:0x60 scope:local
o_cont_wood_vec_1 = .data:0x00215890; // type:object size:0x60 scope:local
o_cont_wood_uv_0 = .data:0x002158F0; // type:object size:0x50 scope:local
o_cont_wood_arr_0 = .data:0x00215940; // type:object size:0x40 scope:local
o_cont_wood_material_0 = .data:0x00215980; // type:object size:0x50 scope:local
o_cont_wood_material_1 = .data:0x002159D0; // type:object size:0x8 scope:local
o_cont_wood_dl_0 = .data:0x002159E0; // type:object size:0x20 scope:local align:32
o_cont_wood_dl_1 = .data:0x00215A00; // type:object size:0x60 scope:local align:32
o_cont_wood_meshset_0 = .data:0x00215A60; // type:object size:0x20 scope:local
o_cont_wood_mdl_0 = .data:0x00215A80; // type:object size:0x24 scope:local align:4 data:float
o_cont_wood_texname_1 = .data:0x00215AA4; // type:object size:0xC scope:local
o_cont_wood_texlist_1 = .data:0x00215AB0; // type:object size:0x8 scope:local
o_cont_wood_cnk_mdl_1_tex = .data:0x00215AB8; // type:object size:0x1B0 scope:local
o_cont_wood_cnk_mdl_1_vtx = .data:0x00215C68; // type:object size:0x27C scope:local
o_cont_wood_cnk_mdl_1 = .data:0x00215EE4; // type:object size:0x18 scope:local
o_cont_wood_texname_2 = .data:0x00215EFC; // type:object size:0xC scope:local
o_cont_wood_texlist_2 = .data:0x00215F08; // type:object size:0x8 scope:local
o_cont_wood_cnk_mdl_2_tex = .data:0x00215F10; // type:object size:0x108 scope:local
o_cont_wood_cnk_mdl_2_vtx = .data:0x00216018; // type:object size:0x18C scope:local
o_cont_wood_cnk_mdl_2 = .data:0x002161A4; // type:object size:0x18 scope:local
o_cont_wood_texname_3 = .data:0x002161BC; // type:object size:0xC scope:local
o_cont_wood_texlist_3 = .data:0x002161C8; // type:object size:0x8 scope:local
o_cont_wood_cnk_mdl_3_tex = .data:0x002161D0; // type:object size:0x18C scope:local
o_cont_wood_cnk_mdl_3_vtx = .data:0x0021635C; // type:object size:0x21C scope:local
o_cont_wood_cnk_mdl_3 = .data:0x00216578; // type:object size:0x18 scope:local
g_ContWoodTexList = .data:0x00216590; // type:object size:0x14
o_cont_wood_break_pieces = .data:0x002165A4; // type:object size:0x24 scope:local
o_cont_wood_dc_draw = .data:0x002165C8; // type:object size:0x40 scope:local data:4byte
o_cont_wood_collision = .data:0x00216608; // type:object size:0x30 scope:local
lbl_13_data_216638 = .data:0x00216638; // type:object size:0x5 data:string
lbl_13_data_216640 = .data:0x00216640; // type:object size:0xE data:string
lbl_13_data_216650 = .data:0x00216650; // type:object size:0xD data:string
Expand Down Expand Up @@ -18388,7 +18388,7 @@ lbl_13_bss_700 = .bss:0x00000700; // type:object size:0x8 data:4byte
lbl_13_bss_708 = .bss:0x00000708; // type:object size:0x8 data:4byte
o_cont_chao_cnkdraw = .bss:0x00000710; // type:object size:0x8 scope:local data:4byte
lbl_13_bss_718 = .bss:0x00000718; // type:object size:0x8 data:4byte
lbl_13_bss_720 = .bss:0x00000720; // type:object size:0x8 data:4byte
o_cont_wood_cnkdraw = .bss:0x00000720; // type:object size:0x8 scope:local data:4byte
lbl_13_bss_728 = .bss:0x00000728; // type:object size:0x8 data:4byte
lbl_13_bss_730 = .bss:0x00000730; // type:object size:0x4 data:4byte
lbl_13_bss_734 = .bss:0x00000734; // type:object size:0x4 data:4byte
Expand Down
6 changes: 6 additions & 0 deletions include/OBJECT/o_container_wood.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#ifndef _O_CONTAINER_WOOD_H_
#define _O_CONTAINER_WOOD_H_

#include "sa2b_types.h"
#include "samt/sonic/task.h"

void ContainerWood(task *tp);
extern NJS_TEXLIST *g_ContWoodTexList[];

#endif // !_O_CONTAINER_WOOD_H_
Loading