diff options
| author | emilybrooks <emilybrooksemilybrooks@gmail.com> | 2024-01-14 10:09:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-14 10:09:15 -0700 |
| commit | ef3e9edf8ad84b4f6761b53a400b4f77f767a060 (patch) | |
| tree | 4c7ddb1cf65d558d670d72f594df8d823ba6577b | |
| parent | d6556e7e4d892c0eb944eabc95fe07fcde44b526 (diff) | |
Umbrella objects (#132)
* tol_umb_01
* umbrella2
* umbrella 3
* 4 and 5
* up to 8
* 9
* 16
* 17
* 22
* 22
* all extracted
* review
71 files changed, 1590 insertions, 234 deletions
diff --git a/include/tables/dmatables/dmadata_table_jp.h b/include/tables/dmatables/dmadata_table_jp.h index 9982902..c714c66 100644 --- a/include/tables/dmatables/dmadata_table_jp.h +++ b/include/tables/dmatables/dmadata_table_jp.h @@ -2236,38 +2236,38 @@ DEFINE_DMA_ENTRY(segment_01101000, "segment_01101000") DEFINE_DMA_ENTRY(segment_01102000, "segment_01102000") DEFINE_DMA_ENTRY(object_01103000, "object_01103000") DEFINE_DMA_ENTRY(object_01106000, "object_01106000") -DEFINE_DMA_ENTRY(object_01107000, "object_01107000") -DEFINE_DMA_ENTRY(object_01108000, "object_01108000") -DEFINE_DMA_ENTRY(object_01109000, "object_01109000") -DEFINE_DMA_ENTRY(object_0110A000, "object_0110A000") -DEFINE_DMA_ENTRY(object_0110B000, "object_0110B000") -DEFINE_DMA_ENTRY(object_0110C000, "object_0110C000") -DEFINE_DMA_ENTRY(object_0110D000, "object_0110D000") -DEFINE_DMA_ENTRY(object_0110E000, "object_0110E000") -DEFINE_DMA_ENTRY(object_0110F000, "object_0110F000") -DEFINE_DMA_ENTRY(object_01110000, "object_01110000") -DEFINE_DMA_ENTRY(object_01111000, "object_01111000") -DEFINE_DMA_ENTRY(object_01112000, "object_01112000") -DEFINE_DMA_ENTRY(object_01113000, "object_01113000") -DEFINE_DMA_ENTRY(object_01114000, "object_01114000") -DEFINE_DMA_ENTRY(object_01115000, "object_01115000") -DEFINE_DMA_ENTRY(object_01116000, "object_01116000") -DEFINE_DMA_ENTRY(object_01117000, "object_01117000") -DEFINE_DMA_ENTRY(object_01118000, "object_01118000") -DEFINE_DMA_ENTRY(object_01119000, "object_01119000") -DEFINE_DMA_ENTRY(object_0111A000, "object_0111A000") -DEFINE_DMA_ENTRY(object_0111B000, "object_0111B000") -DEFINE_DMA_ENTRY(object_0111C000, "object_0111C000") -DEFINE_DMA_ENTRY(object_0111D000, "object_0111D000") -DEFINE_DMA_ENTRY(object_0111E000, "object_0111E000") -DEFINE_DMA_ENTRY(object_0111F000, "object_0111F000") -DEFINE_DMA_ENTRY(object_01120000, "object_01120000") -DEFINE_DMA_ENTRY(object_01121000, "object_01121000") -DEFINE_DMA_ENTRY(object_01122000, "object_01122000") -DEFINE_DMA_ENTRY(object_01123000, "object_01123000") -DEFINE_DMA_ENTRY(object_01124000, "object_01124000") -DEFINE_DMA_ENTRY(object_01125000, "object_01125000") -DEFINE_DMA_ENTRY(object_01126000, "object_01126000") +DEFINE_DMA_ENTRY(tol_umb_01, "tol_umb_01") +DEFINE_DMA_ENTRY(tol_umb_02, "tol_umb_02") +DEFINE_DMA_ENTRY(tol_umb_03, "tol_umb_03") +DEFINE_DMA_ENTRY(tol_umb_04, "tol_umb_04") +DEFINE_DMA_ENTRY(tol_umb_05, "tol_umb_05") +DEFINE_DMA_ENTRY(tol_umb_06, "tol_umb_06") +DEFINE_DMA_ENTRY(tol_umb_07, "tol_umb_07") +DEFINE_DMA_ENTRY(tol_umb_08, "tol_umb_08") +DEFINE_DMA_ENTRY(tol_umb_09, "tol_umb_09") +DEFINE_DMA_ENTRY(tol_umb_10, "tol_umb_10") +DEFINE_DMA_ENTRY(tol_umb_11, "tol_umb_11") +DEFINE_DMA_ENTRY(tol_umb_12, "tol_umb_12") +DEFINE_DMA_ENTRY(tol_umb_13, "tol_umb_13") +DEFINE_DMA_ENTRY(tol_umb_14, "tol_umb_14") +DEFINE_DMA_ENTRY(tol_umb_15, "tol_umb_15") +DEFINE_DMA_ENTRY(tol_umb_16, "tol_umb_16") +DEFINE_DMA_ENTRY(tol_umb_17, "tol_umb_17") +DEFINE_DMA_ENTRY(tol_umb_18, "tol_umb_18") +DEFINE_DMA_ENTRY(tol_umb_19, "tol_umb_19") +DEFINE_DMA_ENTRY(tol_umb_20, "tol_umb_20") +DEFINE_DMA_ENTRY(tol_umb_21, "tol_umb_21") +DEFINE_DMA_ENTRY(tol_umb_22, "tol_umb_22") +DEFINE_DMA_ENTRY(tol_umb_23, "tol_umb_23") +DEFINE_DMA_ENTRY(tol_umb_24, "tol_umb_24") +DEFINE_DMA_ENTRY(tol_umb_25, "tol_umb_25") +DEFINE_DMA_ENTRY(tol_umb_26, "tol_umb_26") +DEFINE_DMA_ENTRY(tol_umb_27, "tol_umb_27") +DEFINE_DMA_ENTRY(tol_umb_28, "tol_umb_28") +DEFINE_DMA_ENTRY(tol_umb_29, "tol_umb_29") +DEFINE_DMA_ENTRY(tol_umb_30, "tol_umb_30") +DEFINE_DMA_ENTRY(tol_umb_31, "tol_umb_31") +DEFINE_DMA_ENTRY(tol_umb_32, "tol_umb_32") DEFINE_DMA_ENTRY(object_01127000, "object_01127000") DEFINE_DMA_ENTRY(tol_utiwa_1, "tol_utiwa_1") DEFINE_DMA_ENTRY(object_01129000, "object_01129000") diff --git a/include/tables/object_table.h b/include/tables/object_table.h index ba183da..ada136d 100644 --- a/include/tables/object_table.h +++ b/include/tables/object_table.h @@ -38,7 +38,7 @@ /* 0x019 */ DEFINE_OBJECT(object_01134000, OBJECT_25) /* 0x01A */ DEFINE_OBJECT(object_01103000, OBJECT_26) /* 0x01B */ DEFINE_OBJECT(object_00D5E000, OBJECT_27) -/* 0x01C */ DEFINE_OBJECT(object_01107000, OBJECT_28) +/* 0x01C */ DEFINE_OBJECT(tol_umb_01, OBJECT_TOL_UMB_01) /* 0x01D */ DEFINE_OBJECT(object_013EB000, OBJECT_29) /* 0x01E */ DEFINE_OBJECT(object_0140C000, OBJECT_30) /* 0x01F */ DEFINE_OBJECT(object_0113D000, OBJECT_31) @@ -65,37 +65,37 @@ /* 0x034 */ DEFINE_OBJECT(object_00B8F000, OBJECT_52) /* 0x035 */ DEFINE_OBJECT(tol_utiwa_1, OBJECT_TOL_UTIWA_1) /* 0x036 */ DEFINE_OBJECT(object_01888000, OBJECT_54) -/* 0x037 */ DEFINE_OBJECT(object_01116000, OBJECT_55) -/* 0x038 */ DEFINE_OBJECT(object_01117000, OBJECT_56) -/* 0x039 */ DEFINE_OBJECT(object_01118000, OBJECT_57) -/* 0x03A */ DEFINE_OBJECT(object_01119000, OBJECT_58) -/* 0x03B */ DEFINE_OBJECT(object_0111A000, OBJECT_59) -/* 0x03C */ DEFINE_OBJECT(object_0111B000, OBJECT_60) -/* 0x03D */ DEFINE_OBJECT(object_0111C000, OBJECT_61) -/* 0x03E */ DEFINE_OBJECT(object_0111D000, OBJECT_62) -/* 0x03F */ DEFINE_OBJECT(object_0111E000, OBJECT_63) -/* 0x040 */ DEFINE_OBJECT(object_0111F000, OBJECT_64) -/* 0x041 */ DEFINE_OBJECT(object_01120000, OBJECT_65) -/* 0x042 */ DEFINE_OBJECT(object_01121000, OBJECT_66) -/* 0x043 */ DEFINE_OBJECT(object_01122000, OBJECT_67) -/* 0x044 */ DEFINE_OBJECT(object_01123000, OBJECT_68) -/* 0x045 */ DEFINE_OBJECT(object_01124000, OBJECT_69) -/* 0x046 */ DEFINE_OBJECT(object_01125000, OBJECT_70) -/* 0x047 */ DEFINE_OBJECT(object_01126000, OBJECT_71) -/* 0x048 */ DEFINE_OBJECT(object_01109000, OBJECT_72) -/* 0x049 */ DEFINE_OBJECT(object_0110A000, OBJECT_73) -/* 0x04A */ DEFINE_OBJECT(object_0110B000, OBJECT_74) -/* 0x04B */ DEFINE_OBJECT(object_0110C000, OBJECT_75) -/* 0x04C */ DEFINE_OBJECT(object_0110D000, OBJECT_76) -/* 0x04D */ DEFINE_OBJECT(object_0110E000, OBJECT_77) -/* 0x04E */ DEFINE_OBJECT(object_0110F000, OBJECT_78) -/* 0x04F */ DEFINE_OBJECT(object_01110000, OBJECT_79) -/* 0x050 */ DEFINE_OBJECT(object_01111000, OBJECT_80) -/* 0x051 */ DEFINE_OBJECT(object_01112000, OBJECT_81) -/* 0x052 */ DEFINE_OBJECT(object_01113000, OBJECT_82) -/* 0x053 */ DEFINE_OBJECT(object_01114000, OBJECT_83) -/* 0x054 */ DEFINE_OBJECT(object_01115000, OBJECT_84) -/* 0x055 */ DEFINE_OBJECT(object_01108000, OBJECT_85) +/* 0x037 */ DEFINE_OBJECT(tol_umb_16, OBJECT_TOL_UMB_16) +/* 0x038 */ DEFINE_OBJECT(tol_umb_17, OBJECT_TOL_UMB_17) +/* 0x039 */ DEFINE_OBJECT(tol_umb_18, OBJECT_TOL_UMB_18) +/* 0x03A */ DEFINE_OBJECT(tol_umb_19, OBJECT_TOL_UMB_19) +/* 0x03B */ DEFINE_OBJECT(tol_umb_20, OBJECT_TOL_UMB_20) +/* 0x03C */ DEFINE_OBJECT(tol_umb_21, OBJECT_TOL_UMB_21) +/* 0x03D */ DEFINE_OBJECT(tol_umb_22, OBJECT_TOL_UMB_22) +/* 0x03E */ DEFINE_OBJECT(tol_umb_23, OBJECT_TOL_UMB_23) +/* 0x03F */ DEFINE_OBJECT(tol_umb_24, OBJECT_TOL_UMB_24) +/* 0x040 */ DEFINE_OBJECT(tol_umb_25, OBJECT_TOL_UMB_25) +/* 0x041 */ DEFINE_OBJECT(tol_umb_26, OBJECT_TOL_UMB_26) +/* 0x042 */ DEFINE_OBJECT(tol_umb_27, OBJECT_TOL_UMB_27) +/* 0x043 */ DEFINE_OBJECT(tol_umb_28, OBJECT_TOL_UMB_28) +/* 0x044 */ DEFINE_OBJECT(tol_umb_29, OBJECT_TOL_UMB_29) +/* 0x045 */ DEFINE_OBJECT(tol_umb_30, OBJECT_TOL_UMB_30) +/* 0x046 */ DEFINE_OBJECT(tol_umb_31, OBJECT_TOL_UMB_31) +/* 0x047 */ DEFINE_OBJECT(tol_umb_32, OBJECT_TOL_UMB_32) +/* 0x048 */ DEFINE_OBJECT(tol_umb_03, OBJECT_TOL_UMB_03) +/* 0x049 */ DEFINE_OBJECT(tol_umb_04, OBJECT_TOL_UMB_04) +/* 0x04A */ DEFINE_OBJECT(tol_umb_05, OBJECT_TOL_UMB_05) +/* 0x04B */ DEFINE_OBJECT(tol_umb_06, OBJECT_TOL_UMB_06) +/* 0x04C */ DEFINE_OBJECT(tol_umb_07, OBJECT_TOL_UMB_07) +/* 0x04D */ DEFINE_OBJECT(tol_umb_08, OBJECT_TOL_UMB_08) +/* 0x04E */ DEFINE_OBJECT(tol_umb_09, OBJECT_TOL_UMB_09) +/* 0x04F */ DEFINE_OBJECT(tol_umb_10, OBJECT_TOL_UMB_10) +/* 0x050 */ DEFINE_OBJECT(tol_umb_11, OBJECT_TOL_UMB_11) +/* 0x051 */ DEFINE_OBJECT(tol_umb_12, OBJECT_TOL_UMB_12) +/* 0x052 */ DEFINE_OBJECT(tol_umb_13, OBJECT_TOL_UMB_13) +/* 0x053 */ DEFINE_OBJECT(tol_umb_14, OBJECT_TOL_UMB_14) +/* 0x054 */ DEFINE_OBJECT(tol_umb_15, OBJECT_TOL_UMB_15) +/* 0x055 */ DEFINE_OBJECT(tol_umb_02, OBJECT_TOL_UMB_02) /* 0x056 */ DEFINE_OBJECT(object_00E61000, OBJECT_86) /* 0x057 */ DEFINE_OBJECT(object_00E64000, OBJECT_87) /* 0x058 */ DEFINE_OBJECT(object_00E66000, OBJECT_88) diff --git a/linker_scripts/jp/ignored_addresses.txt b/linker_scripts/jp/ignored_addresses.txt index dd8280f..848e5c4 100644 --- a/linker_scripts/jp/ignored_addresses.txt +++ b/linker_scripts/jp/ignored_addresses.txt @@ -36,5 +36,11 @@ __osBbIsBb = 0x80000388; // ignore:true D_6000000 = 0x06000000; // ignore:true D_6000040 = 0x06000040; // ignore:true +D_6000060 = 0x06000060; // ignore:true +D_60000C0 = 0x060000C0; // ignore:true +D_60000D0 = 0x060000D0; // ignore:true +D_6000140 = 0x06000140; // ignore:true +D_6000180 = 0x06000180; // ignore:true +D_6000220 = 0x06000220; // ignore:true D_60003E8 = 0x060003E8; // ignore:true -D_6001B68 = 0x06001B68; // ignore:true +D_6001B68 = 0x06001B68; // ignore:true
\ No newline at end of file diff --git a/linker_scripts/jp/symbol_addrs_assets.txt b/linker_scripts/jp/symbol_addrs_assets.txt index b275dce..1d74df1 100644 --- a/linker_scripts/jp/symbol_addrs_assets.txt +++ b/linker_scripts/jp/symbol_addrs_assets.txt @@ -127,6 +127,247 @@ cKF_ba_r_obj_w_windmill = 0x06092A24; // segment:object_00D5E000 rom:0xDF0A24 cKF_je_r_obj_w_windmill = 0x06092A38; // segment:object_00D5E000 rom:0xDF0A38 cKF_bs_r_obj_w_windmill = 0x06092A74; // segment:object_00D5E000 rom:0xDF0A74 +tol_umb_01_v = 0x6000000; // segment:tol_umb_01 rom:0x1107000 size:0x380 +kasa_umb01_model = 0x6000380; // segment:tol_umb_01 rom:0x1107380 +e_umb01_model = 0x6000448; // segment:tol_umb_01 rom:0x1107448 +tol_umb_01_pal = 0x6000508; // segment:tol_umb_01 rom:0x1107508 +tol_umb_01_kasa_tex_txt = 0x6000528; // segment:tol_umb_01 rom:0x1107528 +tol_umb_01_tuka_tex_txt = 0x6000728; // segment:tol_umb_01 rom:0x1107728 + +tol_umb_02_v = 0x6000000; // segment:tol_umb_02 rom:0x1108000 size:0x3E0 +kasa_umb02_model = 0x60003E0; // segment:tol_umb_02 rom:0x11083E0 +e_umb02_model = 0x6000508; // segment:tol_umb_02 rom:0x1108508 +tol_umb02_pal = 0x60005C8; // segment:tol_umb_02 rom:0x11085C8 +tol_umb02_kasa2_tex_txt = 0x60005E8; // segment:tol_umb_02 rom:0x11085E8 +tol_umb02_kasa1_tex_txt = 0x60007E8; // segment:tol_umb_02 rom:0x11087E8 +tol_umb02_tuka_tex_txt = 0x60009E8; // segment:tol_umb_02 rom:0x11089E8 + +tol_umb_03_v = 0x6000000; // segment:tol_umb_03 rom:0x1109000 size:0x380 +kasa_umb03_model = 0x6000380; // segment:tol_umb_03 rom:0x1109380 +e_umb03_model = 0x6000450; // segment:tol_umb_03 rom:0x1109450 +tol_umb_03_pal = 0x6000510; // segment:tol_umb_03 rom:0x1109510 +tol_umb_03_kasa1_tex_txt = 0x6000530; // segment:tol_umb_03 rom:0x1109530 +tol_umb_03_tuka_tex_txt = 0x6000930; // segment:tol_umb_03 rom:0x1109930 + +tol_umb_04_v = 0x6000000; // segment:tol_umb_04 rom:0x110A000 size:0x380 +kasa_umb04_model = 0x6000380; // segment:tol_umb_04 rom:0x110A380 +e_umb04_model = 0x60004C0; // segment:tol_umb_04 rom:0x110A4C0 +tol_umb_04_pal = 0x6000580; // segment:tol_umb_04 rom:0x110A580 +tol_umb_04_kasa1_tex_txt = 0x60005A0; // segment:tol_umb_04 rom:0x110A5A0 +tol_umb_04_kasa2_tex_txt = 0x60006A0; // segment:tol_umb_04 rom:0x110A6A0 +tol_umb_04_tuka_tex_txt = 0x60007A0; // segment:tol_umb_04 rom:0x110A7A0 + +tol_umb_05_v = 0x6000000; // segment:tol_umb_05 rom:0x110B000 size:0x380 +kasa_umb05_model = 0x6000380; // segment:tol_umb_05 rom:0x110B380 +e_umb05_model = 0x6000448; // segment:tol_umb_05 rom:0x110B448 +tol_umb_05_pal = 0x6000508; // segment:tol_umb_05 rom:0x110B508 +tol_umb_05_kasa_tex_txt = 0x6000528; // segment:tol_umb_05 rom:0x110B528 +tol_umb_05_tuka_tex_txt = 0x6000728; // segment:tol_umb_05 rom:0x110B728 + +tol_umb_06_v = 0x6000000; // segment:tol_umb_06 rom:0x110C000 size:0x5E0 +kasa_umb06_model = 0x60005E0; // segment:tol_umb_06 rom:0x110C5E0 +e_umb06_model = 0x60006D0; // segment:tol_umb_06 rom:0x110C6D0 +tol_umb_06_pal = 0x6000790; // segment:tol_umb_06 rom:0x110C790 +tol_umb_06_kasa1_tex_txt = 0x60007B0; // segment:tol_umb_06 rom:0x110C7B0 +tol_umb_06_tuka_tex_txt = 0x60009B0; // segment:tol_umb_06 rom:0x110C9B0 + +tol_umb_07_v = 0x6000000; // segment:tol_umb_07 rom:0x110D000 size:0x260 +kasa_umb07_model = 0x6000260; // segment:tol_umb_07 rom:0x110D260 +e_umb07_model = 0x6000380; // segment:tol_umb_07 rom:0x110D380 +tol_umb07_pal = 0x6000440; // segment:tol_umb_07 rom:0x110D440 +tol_umb07_kasa2_tex_txt = 0x6000460; // segment:tol_umb_07 rom:0x110D460 +tol_umb07_kasa1_tex_txt = 0x6000560; // segment:tol_umb_07 rom:0x110D560 +tol_umb07_tuka_tex_txt = 0x6000960; // segment:tol_umb_07 rom:0x110D960 + +tol_umb_08_v = 0x6000000; // segment:tol_umb_08 rom:0x110E000 size:0x390 +kasa_umb08_model = 0x6000390; // segment:tol_umb_08 rom:0x110E390 +e_umb08_model = 0x6000458; // segment:tol_umb_08 rom:0x110E458 +tol_umb08_pal = 0x6000570; // segment:tol_umb_08 rom:0x110E570 +tol_umb08_kasa1_tex_txt = 0x6000590; // segment:tol_umb_08 rom:0x110E590 +tol_umb08_kasa2_tex_txt = 0x6000790; // segment:tol_umb_08 rom:0x110E790 +tol_umb08_tuka_tex_txt = 0x60007D0; // segment:tol_umb_08 rom:0x110E7D0 + +tol_umb_09_v = 0x6000000; // segment:tol_umb_09 rom:0x110F000 size:0x390 +kasa_umb09_model = 0x6000390; // segment:tol_umb_09 rom:0x110F390 +e_umb09_model = 0x6000458; // segment:tol_umb_09 rom:0x110F458 +tol_umb09_pal = 0x6000570; // segment:tol_umb_09 rom:0x110F570 +tol_umb09_kasa1_tex_txt = 0x6000590; // segment:tol_umb_09 rom:0x110F590 +tol_umb09_kasa2_tex_txt = 0x6000790; // segment:tol_umb_09 rom:0x110F790 +tol_umb09_tuka_tex_txt = 0x60007D0; // segment:tol_umb_09 rom:0x110F7D0 + +tol_umb_10_v = 0x6000000; // segment:tol_umb_10 rom:0x1110000 size:0x390 +kasa_umb10_model = 0x6000390; // segment:tol_umb_10 rom:0x1110390 +e_umb10_model = 0x6000458; // segment:tol_umb_10 rom:0x1110458 +tol_umb10_pal = 0x6000570; // segment:tol_umb_10 rom:0x1110570 +tol_umb10_kasa1_tex_txt = 0x6000590; // segment:tol_umb_10 rom:0x1110590 +tol_umb10_kasa2_tex_txt = 0x6000790; // segment:tol_umb_10 rom:0x1110790 +tol_umb10_tuka_tex_txt = 0x60007D0; // segment:tol_umb_10 rom:0x11107D0 + +tol_umb_11_v = 0x6000000; // segment:tol_umb_11 rom:0x1111000 size:0x390 +kasa_umb11_model = 0x6000390; // segment:tol_umb_11 rom:0x1111390 +e_umb11_model = 0x6000458; // segment:tol_umb_11 rom:0x1111458 +tol_umb11_pal = 0x6000570; // segment:tol_umb_11 rom:0x1111570 +tol_umb11_kasa1_tex_txt = 0x6000590; // segment:tol_umb_11 rom:0x1111590 +tol_umb11_kasa2_tex_txt = 0x6000790; // segment:tol_umb_11 rom:0x1111790 +tol_umb11_tuka_tex_txt = 0x60007D0; // segment:tol_umb_11 rom:0x11117D0 + +tol_umb_12_v = 0x6000000; // segment:tol_umb_12 rom:0x1112000 size:0x390 +kasa_umb12_model = 0x6000390; // segment:tol_umb_12 rom:0x1112390 +e_umb12_model = 0x6000458; // segment:tol_umb_12 rom:0x1112458 +tol_umb12_pal = 0x6000570; // segment:tol_umb_12 rom:0x1112570 +tol_umb12_kasa1_tex_txt = 0x6000590; // segment:tol_umb_12 rom:0x1112590 +tol_umb12_kasa2_tex_txt = 0x6000990; // segment:tol_umb_12 rom:0x1112990 +tol_umb12_tuka_tex_txt = 0x60009D0; // segment:tol_umb_12 rom:0x11129D0 + +tol_umb_13_v = 0x6000000; // segment:tol_umb_13 rom:0x1113000 size:0x390 +kasa_umb13_model = 0x6000390; // segment:tol_umb_13 rom:0x1113390 +e_umb13_model = 0x6000458; // segment:tol_umb_13 rom:0x1113458 +tol_umb13_pal = 0x6000570; // segment:tol_umb_13 rom:0x1113570 +tol_umb13_kasa1_tex_txt = 0x6000590; // segment:tol_umb_13 rom:0x1113590 +tol_umb13_kasa2_tex_txt = 0x6000790; // segment:tol_umb_13 rom:0x1113790 +tol_umb13_tuka_tex_txt = 0x60007D0; // segment:tol_umb_13 rom:0x11137D0 + +tol_umb_14_v = 0x6000000; // segment:tol_umb_14 rom:0x1114000 size:0x380 +kasa_umb14_model = 0x6000380; // segment:tol_umb_14 rom:0x1114380 +e_umb14_model = 0x6000448; // segment:tol_umb_14 rom:0x1114448 +tol_umb_14_pal = 0x6000508; // segment:tol_umb_14 rom:0x1114508 +tol_umb_14_kasa_tex_txt = 0x6000528; // segment:tol_umb_14 rom:0x1114528 +tol_umb_14_tuka_tex_txt = 0x6000728; // segment:tol_umb_14 rom:0x1114728 + +tol_umb_15_v = 0x6000000; // segment:tol_umb_15 rom:0x1115000 size:0x3C0 +kasa_umb15_model = 0x60003C0; // segment:tol_umb_15 rom:0x11153C0 +e_umb15_model = 0x60004D8; // segment:tol_umb_15 rom:0x11154D8 +tol_umb_15_pal = 0x6000598; // segment:tol_umb_15 rom:0x1115598 +tol_umb_15_kasa1_tex_txt = 0x60005B8; // segment:tol_umb_15 rom:0x11155B8 +tol_umb_15_kasa2_tex_txt = 0x60006B8; // segment:tol_umb_15 rom:0x11156B8 +tol_umb_15_tuka_tex_txt = 0x60008B8; // segment:tol_umb_15 rom:0x11158B8 + +tol_umb_16_v = 0x6000000; // segment:tol_umb_16 rom:0x1116000 size:0x380 +kasa_umb16_model = 0x6000380; // segment:tol_umb_16 rom:0x1116380 +e_umb16_model = 0x6000448; // segment:tol_umb_16 rom:0x1116448 +tol_umb_16_pal = 0x6000508; // segment:tol_umb_16 rom:0x1116508 +tol_umb_16_kasa1_tex_txt = 0x6000528; // segment:tol_umb_16 rom:0x1116528 +tol_umb_16_tuka_tex_txt = 0x6000728; // segment:tol_umb_16 rom:0x1116728 + +tol_umb_17_v = 0x6000000; // segment:tol_umb_17 rom:0x1117000 size:0x4D0 +kasa_umb17_model = 0x60004D0; // segment:tol_umb_17 rom:0x11174D0 +e_umb17_model = 0x60005D8; // segment:tol_umb_17 rom:0x11175D8 +tol_umb_17_pal = 0x6000680; // segment:tol_umb_17 rom:0x1117680 +tol_umb_17_kasa_tex_txt = 0x60006A0; // segment:tol_umb_17 rom:0x11176A0 +tol_umb_17_tuka_tex_txt = 0x60008A0; // segment:tol_umb_17 rom:0x11178A0 + +tol_umb_18_v = 0x6000000; // segment:tol_umb_18 rom:0x1118000 size:0x280 +kasa_umb18_model = 0x6000280; // segment:tol_umb_18 rom:0x1118280 +e_umb18_model = 0x6000348; // segment:tol_umb_18 rom:0x1118348 +tol_umb18_pal = 0x6000460; // segment:tol_umb_18 rom:0x1118460 +tol_umb18_kasa1_tex_txt = 0x6000480; // segment:tol_umb_18 rom:0x1118480 +tol_umb18_kasa2_tex_txt = 0x6000580; // segment:tol_umb_18 rom:0x1118580 +tol_umb18_tuka_tex_txt = 0x6000600; // segment:tol_umb_18 rom:0x1118600 + +tol_umb_19_v = 0x6000000; // segment:tol_umb_19 rom:0x1119000 size:0x400 +kasa_umb19_model = 0x6000400; // segment:tol_umb_19 rom:0x1119400 +e_umb19_model = 0x60004E0; // segment:tol_umb_19 rom:0x11194E0 +tol_umb_19_pal = 0x6000610; // segment:tol_umb_19 rom:0x1119610 +tol_umb_19_kasa_tex_txt = 0x6000630; // segment:tol_umb_19 rom:0x1119630 +tol_umb_19_tuka_tex_txt = 0x6000830; // segment:tol_umb_19 rom:0x1119830 +tol_umb_19_e_tex_txt = 0x6000A30; // segment:tol_umb_19 rom:0x1119A30 + +tol_umb_20_v = 0x6000000; // segment:tol_umb_20 rom:0x111A000 size:0x280 +kasa_umb20_model = 0x6000280; // segment:tol_umb_20 rom:0x111A280 +e_umb20_model = 0x6000338; // segment:tol_umb_20 rom:0x111A338 +tol_umb_20_pal = 0x6000408; // segment:tol_umb_20 rom:0x111A408 +tol_umb_20_kasa_tex_txt = 0x6000428; // segment:tol_umb_20 rom:0x111A428 +tol_umb_20_e_tex_txt = 0x6000828; // segment:tol_umb_20 rom:0x111A828 + +tol_umb_21_v = 0x6000000; // segment:tol_umb_21 rom:0x111B000 size:0x380 +kasa_umb21_model = 0x6000380; // segment:tol_umb_21 rom:0x111B380 +e_umb21_model = 0x6000468; // segment:tol_umb_21 rom:0x111B468 +tol_umb_21_pal = 0x6000520; // segment:tol_umb_21 rom:0x111B520 +tol_umb_21_kasa_tex_txt = 0x6000540; // segment:tol_umb_21 rom:0x111B540 +tol_umb_21_tuka_tex_txt = 0x6000940; // segment:tol_umb_21 rom:0x111B940 + +tol_umb_22_v = 0x6000000; // segment:tol_umb_22 rom:0x111C000 size:0x480 +kasa_umb22_model = 0x6000480; // segment:tol_umb_22 rom:0x111C480 +e_umb22_model = 0x6000580; // segment:tol_umb_22 rom:0x111C580 +tol_umb_22_pal = 0x6000620; // segment:tol_umb_22 rom:0x111C620 +tol_umb_22_kasa_tex_txt = 0x6000640; // segment:tol_umb_22 rom:0x111C640 +tol_umb_22_e_tex_txt = 0x6000840; // segment:tol_umb_22 rom:0x111C840 + +tol_umb_23_v = 0x6000000; // segment:tol_umb_23 rom:0x111D000 size:0x360 +kasa_umb23_model = 0x6000360; // segment:tol_umb_23 rom:0x111D360 +e_umb23_model = 0x6000428; // segment:tol_umb_23 rom:0x111D428 +tol_umb_23_pal = 0x6000528; // segment:tol_umb_23 rom:0x111D528 +tol_umb_23_kasa_tex_txt = 0x6000548; // segment:tol_umb_23 rom:0x111D548 +tol_umb_23_tuka_tex_txt = 0x6000948; // segment:tol_umb_23 rom:0x111D948 +tol_umb_23_e_tex_txt = 0x6000B48; // segment:tol_umb_23 rom:0x111DB48 + +tol_umb_24_v = 0x6000000; // segment:tol_umb_24 rom:0x111E000 size:0x3C0 +kasa_umb24_model = 0x60003C0; // segment:tol_umb_24 rom:0x111E3C0 +e_umb24_model = 0x60004D8; // segment:tol_umb_24 rom:0x111E4D8 +tol_umb_24_pal = 0x6000598; // segment:tol_umb_24 rom:0x111E598 +tol_umb_24_kasa1_tex_txt = 0x60005B8; // segment:tol_umb_24 rom:0x111E5B8 +tol_umb_24_kasa2_tex_txt = 0x60006B8; // segment:tol_umb_24 rom:0x111E6B8 +tol_umb_24_tuka_tex_txt = 0x60007B8; // segment:tol_umb_24 rom:0x111E7B8 + +tol_umb_25_v = 0x6000000; // segment:tol_umb_25 rom:0x111F000 size:0x350 +kasa_umb25_model = 0x6000350; // segment:tol_umb_25 rom:0x111F350 +e_umb25_model = 0x6000470; // segment:tol_umb_25 rom:0x111F470 +tol_umb_25_pal = 0x6000510; // segment:tol_umb_25 rom:0x111F510 +tol_umb_25_kasa_tex_txt = 0x6000530; // segment:tol_umb_25 rom:0x111F530 +tol_umb_25_ya_tex_txt = 0x6000730; // segment:tol_umb_25 rom:0x111F730 + +tol_umb_26_v = 0x6000000; // segment:tol_umb_26 rom:0x1120000 size:0x3C0 +kasa_umb26_model = 0x60003C0; // segment:tol_umb_26 rom:0x11203C0 +e_umb26_model = 0x60004D0; // segment:tol_umb_26 rom:0x11204D0 +tol_umb_26_pal = 0x6000590; // segment:tol_umb_26 rom:0x1120590 +tol_umb_26_kasa1_tex_txt = 0x60005B0; // segment:tol_umb_26 rom:0x11205B0 +tol_umb_26_kasa2_tex_txt = 0x60006B0; // segment:tol_umb_26 rom:0x11206B0 +tol_umb_26_tuka_tex_txt = 0x60007B0; // segment:tol_umb_26 rom:0x11207B0 + +tol_umb_27_v = 0x6000000; // segment:tol_umb_27 rom:0x1121000 size:0x4B0 +kasa_umb27_model = 0x60004B0; // segment:tol_umb_27 rom:0x11214B0 +e_umb27_model = 0x60005F8; // segment:tol_umb_27 rom:0x11215F8 +tol_umb_27_pal = 0x6000698; // segment:tol_umb_27 rom:0x1121698 +tol_umb_27_kasa1_tex_txt = 0x60006B8; // segment:tol_umb_27 rom:0x11216B8 +tol_umb_27_kasa2_tex_txt = 0x60008B8; // segment:tol_umb_27 rom:0x11218B8 +tol_umb_27_e_tex_txt = 0x6000AB8; // segment:tol_umb_27 rom:0x1121AB8 + +tol_umb_28_v = 0x6000000; // segment:tol_umb_28 rom:0x1122000 size:0x360 +kasa_umb28_model = 0x6000360; // segment:tol_umb_28 rom:0x1122360 +e_umb28_model = 0x6000428; // segment:tol_umb_28 rom:0x1122428 +tol_umb_28_pal = 0x60004E0; // segment:tol_umb_28 rom:0x11224E0 +tol_umb_28_kasa_tex_txt = 0x6000500; // segment:tol_umb_28 rom:0x1122500 +tol_umb_28_tuka_tex_txt = 0x6000700; // segment:tol_umb_28 rom:0x1122700 + +tol_umb_29_v = 0x6000000; // segment:tol_umb_29 rom:0x1123000 size:0x380 +kasa_umb29_model = 0x6000380; // segment:tol_umb_29 rom:0x1123380 +e_umb29_model = 0x6000448; // segment:tol_umb_29 rom:0x1123448 +tol_umb_29_pal = 0x6000508; // segment:tol_umb_29 rom:0x1123508 +tol_umb_29_kasa1_tex_txt = 0x6000528; // segment:tol_umb_29 rom:0x1123528 +tol_umb_29_tuka_tex_txt = 0x6000728; // segment:tol_umb_29 rom:0x1123728 + +tol_umb_30_v = 0x6000000; // segment:tol_umb_30 rom:0x1124000 size:0x380 +kasa_umb30_model = 0x6000380; // segment:tol_umb_30 rom:0x1124380 +e_umb30_model = 0x6000450; // segment:tol_umb_30 rom:0x1124450 +obj_shop_umb_30_pal = 0x6000510; // segment:tol_umb_30 rom:0x1124510 +tol_umb_30_kasa1_tex_txt = 0x6000530; // segment:tol_umb_30 rom:0x1124530 +tol_umb_30_tuka_tex_txt = 0x6000730; // segment:tol_umb_30 rom:0x1124730 + +tol_umb_31_v = 0x6000000; // segment:tol_umb_31 rom:0x1125000 size:0x360 +kasa_umb31_model = 0x6000360; // segment:tol_umb_31 rom:0x1125360 +e_umb31_model = 0x6000428; // segment:tol_umb_31 rom:0x1125428 +tol_umb_31_pal = 0x6000528; // segment:tol_umb_31 rom:0x1125528 +tol_umb_31_kasa_tex_txt = 0x6000548; // segment:tol_umb_31 rom:0x1125548 +tol_umb_31_tuka_tex_txt = 0x6000748; // segment:tol_umb_31 rom:0x1125748 +tol_umb_31_e_tex_txt = 0x6000948; // segment:tol_umb_31 rom:0x1125948 + +tol_umb_32_v = 0x6000000; // segment:tol_umb_32 rom:0x1126000 size:0x380 +kasa_umb32_model = 0x6000380; // segment:tol_umb_32 rom:0x1126380 +e_umb32_model = 0x6000448; // segment:tol_umb_32 rom:0x1126448 +obj_shop_umb_32_pal = 0x6000508; // segment:tol_umb_32 rom:0x1126508 +obj_shop_umb_32_kasa1_tex_txt = 0x6000528; // segment:tol_umb_32 rom:0x1126528 +obj_shop_umb_32_tuka1_tex_txt = 0x6000728; // segment:tol_umb_32 rom:0x1126728 + tol_utiwa_1_v = 0x6000000; // segment:tol_utiwa_1 rom:0x1128000 size:0x80 main_utiwa1_model = 0x6000080; // segment:tol_utiwa_1 rom:0x1128080 tol_utiwa1_pal = 0x6000188; // segment:tol_utiwa_1 rom:0x1128188 diff --git a/src/objects/tol_umb_01/tol_umb_01.c b/src/objects/tol_umb_01/tol_umb_01.c new file mode 100644 index 0000000..d27edb1 --- /dev/null +++ b/src/objects/tol_umb_01/tol_umb_01.c @@ -0,0 +1,8 @@ +#include "tol_umb_01.h" + +#include "assets/jp/objects/tol_umb_01/tol_umb_01_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_01/tol_umb_01_kasa_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..398358a --- /dev/null +++ b/src/objects/tol_umb_01/tol_umb_01.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_01_H +#define OBJECT_TOL_UMB_01_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_02/tol_umb_02.c b/src/objects/tol_umb_02/tol_umb_02.c new file mode 100644 index 0000000..129e65e --- /dev/null +++ b/src/objects/tol_umb_02/tol_umb_02.c @@ -0,0 +1,9 @@ +#include "tol_umb_02.h" + +#include "assets/jp/objects/tol_umb_02/tol_umb_02_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_02/tol_umb02_kasa2_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_02/tol_umb02_kasa1_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..385b37a --- /dev/null +++ b/src/objects/tol_umb_02/tol_umb_02.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_02_H +#define OBJECT_TOL_UMB_02_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_03/tol_umb_03.c b/src/objects/tol_umb_03/tol_umb_03.c new file mode 100644 index 0000000..669391d --- /dev/null +++ b/src/objects/tol_umb_03/tol_umb_03.c @@ -0,0 +1,8 @@ +#include "tol_umb_03.h" + +#include "assets/jp/objects/tol_umb_03/tol_umb_03_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_03/tol_umb_03_kasa1_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..37d625d --- /dev/null +++ b/src/objects/tol_umb_03/tol_umb_03.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_03_H +#define OBJECT_TOL_UMB_03_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_04/tol_umb_04.c b/src/objects/tol_umb_04/tol_umb_04.c new file mode 100644 index 0000000..bab0c42 --- /dev/null +++ b/src/objects/tol_umb_04/tol_umb_04.c @@ -0,0 +1,9 @@ +#include "tol_umb_04.h" + +#include "assets/jp/objects/tol_umb_04/tol_umb_04_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_04/tol_umb_04_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_04/tol_umb_04_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..e1e4638 --- /dev/null +++ b/src/objects/tol_umb_04/tol_umb_04.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_04_H +#define OBJECT_TOL_UMB_04_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_05/tol_umb_05.c b/src/objects/tol_umb_05/tol_umb_05.c new file mode 100644 index 0000000..17eb5fc --- /dev/null +++ b/src/objects/tol_umb_05/tol_umb_05.c @@ -0,0 +1,8 @@ +#include "tol_umb_05.h" + +#include "assets/jp/objects/tol_umb_05/tol_umb_05_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_05/tol_umb_05_kasa_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..003b725 --- /dev/null +++ b/src/objects/tol_umb_05/tol_umb_05.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_05_H +#define OBJECT_TOL_UMB_05_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_06/tol_umb_06.c b/src/objects/tol_umb_06/tol_umb_06.c new file mode 100644 index 0000000..990f169 --- /dev/null +++ b/src/objects/tol_umb_06/tol_umb_06.c @@ -0,0 +1,8 @@ +#include "tol_umb_06.h" + +#include "assets/jp/objects/tol_umb_06/tol_umb_06_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_06/tol_umb_06_kasa1_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..485ab45 --- /dev/null +++ b/src/objects/tol_umb_06/tol_umb_06.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_06_H +#define OBJECT_TOL_UMB_06_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_07/tol_umb_07.c b/src/objects/tol_umb_07/tol_umb_07.c new file mode 100644 index 0000000..b2ed9cf --- /dev/null +++ b/src/objects/tol_umb_07/tol_umb_07.c @@ -0,0 +1,9 @@ +#include "tol_umb_07.h" + +#include "assets/jp/objects/tol_umb_07/tol_umb_07_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_07/tol_umb07_kasa2_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_07/tol_umb07_kasa1_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..6d62f58 --- /dev/null +++ b/src/objects/tol_umb_07/tol_umb_07.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_07_H +#define OBJECT_TOL_UMB_07_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_08/tol_umb_08.c b/src/objects/tol_umb_08/tol_umb_08.c new file mode 100644 index 0000000..4dcd752 --- /dev/null +++ b/src/objects/tol_umb_08/tol_umb_08.c @@ -0,0 +1,9 @@ +#include "tol_umb_08.h" + +#include "assets/jp/objects/tol_umb_08/tol_umb_08_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_08/tol_umb08_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_08/tol_umb08_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..074e70b --- /dev/null +++ b/src/objects/tol_umb_08/tol_umb_08.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_08_H +#define OBJECT_TOL_UMB_08_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_09/tol_umb_09.c b/src/objects/tol_umb_09/tol_umb_09.c new file mode 100644 index 0000000..fdcf362 --- /dev/null +++ b/src/objects/tol_umb_09/tol_umb_09.c @@ -0,0 +1,9 @@ +#include "tol_umb_09.h" + +#include "assets/jp/objects/tol_umb_09/tol_umb_09_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_09/tol_umb09_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_09/tol_umb09_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..63e24b2 --- /dev/null +++ b/src/objects/tol_umb_09/tol_umb_09.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_09_H +#define OBJECT_TOL_UMB_09_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_10/tol_umb_10.c b/src/objects/tol_umb_10/tol_umb_10.c new file mode 100644 index 0000000..95d15d0 --- /dev/null +++ b/src/objects/tol_umb_10/tol_umb_10.c @@ -0,0 +1,9 @@ +#include "tol_umb_10.h" + +#include "assets/jp/objects/tol_umb_10/tol_umb_10_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_10/tol_umb10_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_10/tol_umb10_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..8ae12b2 --- /dev/null +++ b/src/objects/tol_umb_10/tol_umb_10.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_10_H +#define OBJECT_TOL_UMB_10_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_11/tol_umb_11.c b/src/objects/tol_umb_11/tol_umb_11.c new file mode 100644 index 0000000..faa4ec2 --- /dev/null +++ b/src/objects/tol_umb_11/tol_umb_11.c @@ -0,0 +1,9 @@ +#include "tol_umb_11.h" + +#include "assets/jp/objects/tol_umb_11/tol_umb_11_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_11/tol_umb11_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_11/tol_umb11_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..e2e8ac7 --- /dev/null +++ b/src/objects/tol_umb_11/tol_umb_11.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_11_H +#define OBJECT_TOL_UMB_11_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_12/tol_umb_12.c b/src/objects/tol_umb_12/tol_umb_12.c new file mode 100644 index 0000000..cb22a3e --- /dev/null +++ b/src/objects/tol_umb_12/tol_umb_12.c @@ -0,0 +1,9 @@ +#include "tol_umb_12.h" + +#include "assets/jp/objects/tol_umb_12/tol_umb_12_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_12/tol_umb12_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_12/tol_umb12_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..dc9c14e --- /dev/null +++ b/src/objects/tol_umb_12/tol_umb_12.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_12_H +#define OBJECT_TOL_UMB_12_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_13/tol_umb_13.c b/src/objects/tol_umb_13/tol_umb_13.c new file mode 100644 index 0000000..8c3ee14 --- /dev/null +++ b/src/objects/tol_umb_13/tol_umb_13.c @@ -0,0 +1,9 @@ +#include "tol_umb_13.h" + +#include "assets/jp/objects/tol_umb_13/tol_umb_13_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_13/tol_umb13_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_13/tol_umb13_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..94144ca --- /dev/null +++ b/src/objects/tol_umb_13/tol_umb_13.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_13_H +#define OBJECT_TOL_UMB_13_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_14/tol_umb_14.c b/src/objects/tol_umb_14/tol_umb_14.c new file mode 100644 index 0000000..eb4c174 --- /dev/null +++ b/src/objects/tol_umb_14/tol_umb_14.c @@ -0,0 +1,8 @@ +#include "tol_umb_14.h" + +#include "assets/jp/objects/tol_umb_14/tol_umb_14_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_14/tol_umb_14_kasa_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..642a417 --- /dev/null +++ b/src/objects/tol_umb_14/tol_umb_14.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_14_H +#define OBJECT_TOL_UMB_14_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_15/tol_umb_15.c b/src/objects/tol_umb_15/tol_umb_15.c new file mode 100644 index 0000000..14e59ea --- /dev/null +++ b/src/objects/tol_umb_15/tol_umb_15.c @@ -0,0 +1,9 @@ +#include "tol_umb_15.h" + +#include "assets/jp/objects/tol_umb_15/tol_umb_15_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_15/tol_umb_15_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_15/tol_umb_15_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..b464089 --- /dev/null +++ b/src/objects/tol_umb_15/tol_umb_15.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_15_H +#define OBJECT_TOL_UMB_15_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_16/tol_umb_16.c b/src/objects/tol_umb_16/tol_umb_16.c new file mode 100644 index 0000000..bc7973b --- /dev/null +++ b/src/objects/tol_umb_16/tol_umb_16.c @@ -0,0 +1,8 @@ +#include "tol_umb_16.h" + +#include "assets/jp/objects/tol_umb_16/tol_umb_16_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_16/tol_umb_16_kasa1_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..37beb91 --- /dev/null +++ b/src/objects/tol_umb_16/tol_umb_16.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_16_H +#define OBJECT_TOL_UMB_16_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_17/tol_umb_17.c b/src/objects/tol_umb_17/tol_umb_17.c new file mode 100644 index 0000000..9442217 --- /dev/null +++ b/src/objects/tol_umb_17/tol_umb_17.c @@ -0,0 +1,8 @@ +#include "tol_umb_17.h" + +#include "assets/jp/objects/tol_umb_17/tol_umb_17_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_17/tol_umb_17_kasa_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..6709d0f --- /dev/null +++ b/src/objects/tol_umb_17/tol_umb_17.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_17_H +#define OBJECT_TOL_UMB_17_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_18/tol_umb_18.c b/src/objects/tol_umb_18/tol_umb_18.c new file mode 100644 index 0000000..b31c26e --- /dev/null +++ b/src/objects/tol_umb_18/tol_umb_18.c @@ -0,0 +1,9 @@ +#include "tol_umb_18.h" + +#include "assets/jp/objects/tol_umb_18/tol_umb_18_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_18/tol_umb18_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_18/tol_umb18_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..8cefffa --- /dev/null +++ b/src/objects/tol_umb_18/tol_umb_18.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_18_H +#define OBJECT_TOL_UMB_18_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_19/tol_umb_19.c b/src/objects/tol_umb_19/tol_umb_19.c new file mode 100644 index 0000000..606fd3a --- /dev/null +++ b/src/objects/tol_umb_19/tol_umb_19.c @@ -0,0 +1,9 @@ +#include "tol_umb_19.h" + +#include "assets/jp/objects/tol_umb_19/tol_umb_19_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_19/tol_umb_19_kasa_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_19/tol_umb_19_tuka_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..449ce76 --- /dev/null +++ b/src/objects/tol_umb_19/tol_umb_19.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_19_H +#define OBJECT_TOL_UMB_19_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_20/tol_umb_20.c b/src/objects/tol_umb_20/tol_umb_20.c new file mode 100644 index 0000000..7df8324 --- /dev/null +++ b/src/objects/tol_umb_20/tol_umb_20.c @@ -0,0 +1,8 @@ +#include "tol_umb_20.h" + +#include "assets/jp/objects/tol_umb_20/tol_umb_20_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_20/tol_umb_20_kasa_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..8feb611 --- /dev/null +++ b/src/objects/tol_umb_20/tol_umb_20.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_20_H +#define OBJECT_TOL_UMB_20_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_21/tol_umb_21.c b/src/objects/tol_umb_21/tol_umb_21.c new file mode 100644 index 0000000..950e088 --- /dev/null +++ b/src/objects/tol_umb_21/tol_umb_21.c @@ -0,0 +1,8 @@ +#include "tol_umb_21.h" + +#include "assets/jp/objects/tol_umb_21/tol_umb_21_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_21/tol_umb_21_kasa_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..f6f169e --- /dev/null +++ b/src/objects/tol_umb_21/tol_umb_21.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_21_H +#define OBJECT_TOL_UMB_21_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_22/tol_umb_22.c b/src/objects/tol_umb_22/tol_umb_22.c new file mode 100644 index 0000000..5f96f59 --- /dev/null +++ b/src/objects/tol_umb_22/tol_umb_22.c @@ -0,0 +1,8 @@ +#include "tol_umb_22.h" + +#include "assets/jp/objects/tol_umb_22/tol_umb_22_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_22/tol_umb_22_kasa_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..9aa5655 --- /dev/null +++ b/src/objects/tol_umb_22/tol_umb_22.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_22_H +#define OBJECT_TOL_UMB_22_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_23/tol_umb_23.c b/src/objects/tol_umb_23/tol_umb_23.c new file mode 100644 index 0000000..db62c18 --- /dev/null +++ b/src/objects/tol_umb_23/tol_umb_23.c @@ -0,0 +1,9 @@ +#include "tol_umb_23.h" + +#include "assets/jp/objects/tol_umb_23/tol_umb_23_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_23/tol_umb_23_kasa_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_23/tol_umb_23_tuka_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..b47e1f1 --- /dev/null +++ b/src/objects/tol_umb_23/tol_umb_23.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_23_H +#define OBJECT_TOL_UMB_23_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_24/tol_umb_24.c b/src/objects/tol_umb_24/tol_umb_24.c new file mode 100644 index 0000000..2a4b396 --- /dev/null +++ b/src/objects/tol_umb_24/tol_umb_24.c @@ -0,0 +1,9 @@ +#include "tol_umb_24.h" + +#include "assets/jp/objects/tol_umb_24/tol_umb_24_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_24/tol_umb_24_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_24/tol_umb_24_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..cd0fba0 --- /dev/null +++ b/src/objects/tol_umb_24/tol_umb_24.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_24_H +#define OBJECT_TOL_UMB_24_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_25/tol_umb_25.c b/src/objects/tol_umb_25/tol_umb_25.c new file mode 100644 index 0000000..0a1e58b --- /dev/null +++ b/src/objects/tol_umb_25/tol_umb_25.c @@ -0,0 +1,8 @@ +#include "tol_umb_25.h" + +#include "assets/jp/objects/tol_umb_25/tol_umb_25_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_25/tol_umb_25_kasa_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..efb34b7 --- /dev/null +++ b/src/objects/tol_umb_25/tol_umb_25.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_25_H +#define OBJECT_TOL_UMB_25_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_26/tol_umb_26.c b/src/objects/tol_umb_26/tol_umb_26.c new file mode 100644 index 0000000..deb4c4f --- /dev/null +++ b/src/objects/tol_umb_26/tol_umb_26.c @@ -0,0 +1,9 @@ +#include "tol_umb_26.h" + +#include "assets/jp/objects/tol_umb_26/tol_umb_26_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_26/tol_umb_26_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_26/tol_umb_26_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..b21a04a --- /dev/null +++ b/src/objects/tol_umb_26/tol_umb_26.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_26_H +#define OBJECT_TOL_UMB_26_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_27/tol_umb_27.c b/src/objects/tol_umb_27/tol_umb_27.c new file mode 100644 index 0000000..f8f5ff2 --- /dev/null +++ b/src/objects/tol_umb_27/tol_umb_27.c @@ -0,0 +1,9 @@ +#include "tol_umb_27.h" + +#include "assets/jp/objects/tol_umb_27/tol_umb_27_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_27/tol_umb_27_kasa1_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_27/tol_umb_27_kasa2_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..f450738 --- /dev/null +++ b/src/objects/tol_umb_27/tol_umb_27.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_27_H +#define OBJECT_TOL_UMB_27_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_28/tol_umb_28.c b/src/objects/tol_umb_28/tol_umb_28.c new file mode 100644 index 0000000..86f1ce0 --- /dev/null +++ b/src/objects/tol_umb_28/tol_umb_28.c @@ -0,0 +1,8 @@ +#include "tol_umb_28.h" + +#include "assets/jp/objects/tol_umb_28/tol_umb_28_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_28/tol_umb_28_kasa_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..1c5a9ca --- /dev/null +++ b/src/objects/tol_umb_28/tol_umb_28.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_28_H +#define OBJECT_TOL_UMB_28_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_29/tol_umb_29.c b/src/objects/tol_umb_29/tol_umb_29.c new file mode 100644 index 0000000..8159829 --- /dev/null +++ b/src/objects/tol_umb_29/tol_umb_29.c @@ -0,0 +1,8 @@ +#include "tol_umb_29.h" + +#include "assets/jp/objects/tol_umb_29/tol_umb_29_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_29/tol_umb_29_kasa1_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..580d710 --- /dev/null +++ b/src/objects/tol_umb_29/tol_umb_29.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_29_H +#define OBJECT_TOL_UMB_29_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_30/tol_umb_30.c b/src/objects/tol_umb_30/tol_umb_30.c new file mode 100644 index 0000000..9aa7f95 --- /dev/null +++ b/src/objects/tol_umb_30/tol_umb_30.c @@ -0,0 +1,8 @@ +#include "tol_umb_30.h" + +#include "assets/jp/objects/tol_umb_30/tol_umb_30_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_30/tol_umb_30_kasa1_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..ee0d0f6 --- /dev/null +++ b/src/objects/tol_umb_30/tol_umb_30.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_30_H +#define OBJECT_TOL_UMB_30_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_31/tol_umb_31.c b/src/objects/tol_umb_31/tol_umb_31.c new file mode 100644 index 0000000..4ae586b --- /dev/null +++ b/src/objects/tol_umb_31/tol_umb_31.c @@ -0,0 +1,9 @@ +#include "tol_umb_31.h" + +#include "assets/jp/objects/tol_umb_31/tol_umb_31_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_31/tol_umb_31_kasa_tex_txt.ci4.inc.c" +#include "assets/jp/objects/tol_umb_31/tol_umb_31_tuka_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..d802c85 --- /dev/null +++ b/src/objects/tol_umb_31/tol_umb_31.h @@ -0,0 +1,14 @@ +#ifndef OBJECT_TOL_UMB_31_H +#define OBJECT_TOL_UMB_31_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/objects/tol_umb_32/tol_umb_32.c b/src/objects/tol_umb_32/tol_umb_32.c new file mode 100644 index 0000000..dda8876 --- /dev/null +++ b/src/objects/tol_umb_32/tol_umb_32.c @@ -0,0 +1,8 @@ +#include "tol_umb_32.h" + +#include "assets/jp/objects/tol_umb_32/tol_umb_32_v.vtx.inc.c" +#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" +#include "assets/jp/objects/tol_umb_32/obj_shop_umb_32_kasa1_tex_txt.ci4.inc.c" +#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 new file mode 100644 index 0000000..ba50525 --- /dev/null +++ b/src/objects/tol_umb_32/tol_umb_32.h @@ -0,0 +1,13 @@ +#ifndef OBJECT_TOL_UMB_32_H +#define OBJECT_TOL_UMB_32_H + +#include "gbi.h" + +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[]; + +#endif diff --git a/src/overlays/actors/ovl_Tools/ac_tools.c b/src/overlays/actors/ovl_Tools/ac_tools.c index 31aec88..1bfaaf4 100644 --- a/src/overlays/actors/ovl_Tools/ac_tools.c +++ b/src/overlays/actors/ovl_Tools/ac_tools.c @@ -44,7 +44,7 @@ s32 aTOL_check_data_bank(ObjectExchangeBank* objectExchangeBank, ToolName toolNa s16 objectIndex) { s32 ret = -1; - if ((toolActor->actor.part == ACTOR_PART_PLAYER) && (toolName <= TOOL_UMBRELLA31) && + if ((toolActor->actor.part == ACTOR_PART_PLAYER) && (toolName <= TOOL_UMBRELLA32) && (common_data.toolClip->umbrellaObjectIndex != -1)) { ObjectStatus* objectStatus = &objectExchangeBank->status[common_data.toolClip->umbrellaObjectIndex]; Actor* temp_a0; @@ -95,14 +95,15 @@ ToolActor* aTOL_birth_proc(ToolName toolName, s32 arg1, ToolActor* toolActor, Ga ACTOR_T_TAMA, ACTOR_T_TAMA, }; static s16 objectTable[] = { - OBJECT_28, OBJECT_85, OBJECT_72, OBJECT_73, OBJECT_74, OBJECT_75, - OBJECT_76, OBJECT_77, OBJECT_78, OBJECT_79, OBJECT_80, OBJECT_81, - OBJECT_82, OBJECT_83, OBJECT_84, OBJECT_55, OBJECT_56, OBJECT_57, - OBJECT_58, OBJECT_59, OBJECT_60, OBJECT_61, OBJECT_62, OBJECT_63, - OBJECT_64, OBJECT_65, OBJECT_66, OBJECT_67, OBJECT_68, OBJECT_69, - OBJECT_70, OBJECT_71, OBJECT_45, OBJECT_TOL_UTIWA_1, OBJECT_TOL_UTIWA_1, OBJECT_TOL_CRACKER_1, - OBJECT_16, OBJECT_6, OBJECT_371, OBJECT_370, OBJECT_391, OBJECT_391, - OBJECT_391, OBJECT_391, + OBJECT_TOL_UMB_01, OBJECT_TOL_UMB_02, OBJECT_TOL_UMB_03, OBJECT_TOL_UMB_04, OBJECT_TOL_UMB_05, + OBJECT_TOL_UMB_06, OBJECT_TOL_UMB_07, OBJECT_TOL_UMB_08, OBJECT_TOL_UMB_09, OBJECT_TOL_UMB_10, + OBJECT_TOL_UMB_11, OBJECT_TOL_UMB_12, OBJECT_TOL_UMB_13, OBJECT_TOL_UMB_14, OBJECT_TOL_UMB_15, + OBJECT_TOL_UMB_16, OBJECT_TOL_UMB_17, OBJECT_TOL_UMB_18, OBJECT_TOL_UMB_19, OBJECT_TOL_UMB_20, + OBJECT_TOL_UMB_21, OBJECT_TOL_UMB_22, OBJECT_TOL_UMB_23, OBJECT_TOL_UMB_24, OBJECT_TOL_UMB_25, + OBJECT_TOL_UMB_26, OBJECT_TOL_UMB_27, OBJECT_TOL_UMB_28, OBJECT_TOL_UMB_29, OBJECT_TOL_UMB_30, + OBJECT_TOL_UMB_31, OBJECT_TOL_UMB_32, OBJECT_45, OBJECT_TOL_UTIWA_1, OBJECT_TOL_UTIWA_1, + OBJECT_TOL_CRACKER_1, OBJECT_16, OBJECT_6, OBJECT_371, OBJECT_370, + OBJECT_391, OBJECT_391, OBJECT_391, OBJECT_391, }; s32 pad[3] UNUSED; ToolActor* ret = NULL; diff --git a/src/overlays/actors/ovl_Tools/ac_tools.h b/src/overlays/actors/ovl_Tools/ac_tools.h index 758d1ea..6d43919 100644 --- a/src/overlays/actors/ovl_Tools/ac_tools.h +++ b/src/overlays/actors/ovl_Tools/ac_tools.h @@ -8,38 +8,38 @@ struct Game_Play; typedef enum ToolName { - /* 0x00 */ TOOL_UMBRELLA0, - /* 0x01 */ TOOL_UMBRELLA1, - /* 0x02 */ TOOL_UMBRELLA2, - /* 0x03 */ TOOL_UMBRELLA3, - /* 0x04 */ TOOL_UMBRELLA4, - /* 0x05 */ TOOL_UMBRELLA5, - /* 0x06 */ TOOL_UMBRELLA6, - /* 0x07 */ TOOL_UMBRELLA7, - /* 0x08 */ TOOL_UMBRELLA8, - /* 0x09 */ TOOL_UMBRELLA9, - /* 0x0A */ TOOL_UMBRELLA10, - /* 0x0B */ TOOL_UMBRELLA11, - /* 0x0C */ TOOL_UMBRELLA12, - /* 0x0D */ TOOL_UMBRELLA13, - /* 0x0E */ TOOL_UMBRELLA14, - /* 0x0F */ TOOL_UMBRELLA15, - /* 0x10 */ TOOL_UMBRELLA16, - /* 0x11 */ TOOL_UMBRELLA17, - /* 0x12 */ TOOL_UMBRELLA18, - /* 0x13 */ TOOL_UMBRELLA19, - /* 0x14 */ TOOL_UMBRELLA20, - /* 0x15 */ TOOL_UMBRELLA21, - /* 0x16 */ TOOL_UMBRELLA22, - /* 0x17 */ TOOL_UMBRELLA23, - /* 0x18 */ TOOL_UMBRELLA24, - /* 0x19 */ TOOL_UMBRELLA25, - /* 0x1A */ TOOL_UMBRELLA26, - /* 0x1B */ TOOL_UMBRELLA27, - /* 0x1C */ TOOL_UMBRELLA28, - /* 0x1D */ TOOL_UMBRELLA29, - /* 0x1E */ TOOL_UMBRELLA30, - /* 0x1F */ TOOL_UMBRELLA31, + /* 0x00 */ TOOL_UMBRELLA1, + /* 0x01 */ TOOL_UMBRELLA2, + /* 0x02 */ TOOL_UMBRELLA3, + /* 0x03 */ TOOL_UMBRELLA4, + /* 0x04 */ TOOL_UMBRELLA5, + /* 0x05 */ TOOL_UMBRELLA6, + /* 0x06 */ TOOL_UMBRELLA7, + /* 0x07 */ TOOL_UMBRELLA8, + /* 0x08 */ TOOL_UMBRELLA9, + /* 0x09 */ TOOL_UMBRELLA10, + /* 0x0A */ TOOL_UMBRELLA11, + /* 0x0B */ TOOL_UMBRELLA12, + /* 0x0C */ TOOL_UMBRELLA13, + /* 0x0D */ TOOL_UMBRELLA14, + /* 0x0E */ TOOL_UMBRELLA15, + /* 0x0F */ TOOL_UMBRELLA16, + /* 0x10 */ TOOL_UMBRELLA17, + /* 0x11 */ TOOL_UMBRELLA18, + /* 0x12 */ TOOL_UMBRELLA19, + /* 0x13 */ TOOL_UMBRELLA20, + /* 0x14 */ TOOL_UMBRELLA21, + /* 0x15 */ TOOL_UMBRELLA22, + /* 0x16 */ TOOL_UMBRELLA23, + /* 0x17 */ TOOL_UMBRELLA24, + /* 0x18 */ TOOL_UMBRELLA25, + /* 0x19 */ TOOL_UMBRELLA26, + /* 0x1A */ TOOL_UMBRELLA27, + /* 0x1B */ TOOL_UMBRELLA28, + /* 0x1C */ TOOL_UMBRELLA29, + /* 0x1D */ TOOL_UMBRELLA30, + /* 0x1E */ TOOL_UMBRELLA31, + /* 0x1F */ TOOL_UMBRELLA32, /* 0x20 */ TOOL_KEITAI, /* 0x21 */ TOOL_UTIWA, /* 0x22 */ TOOL_HANABI, diff --git a/yamls/jp/assets.yaml b/yamls/jp/assets.yaml index 59c0ca1..bdc2fe9 100644 --- a/yamls/jp/assets.yaml +++ b/yamls/jp/assets.yaml @@ -4255,356 +4255,758 @@ # - [0x1106000, data, assets/objects/object_01106000/object_01106000] - [0x1106A60] - - name: object_01107000 - type: bin # code + - name: tol_umb_01 + dir: objects/tol_umb_01 + type: code start: 0x1107000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1107000, data, assets/objects/object_01107000/object_01107000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_01] + - start: 0x1107000 + type: .data + name: tol_umb_01 + subsegments: + - [0x1107000, vtx, tol_umb_01_v] + - [0x1107380, gfx, kasa_umb01_model] + - [0x1107448, gfx, e_umb01_model] + - [0x1107508, af_palette, tol_umb_01_pal] + - [0x1107528, af_ci4, tol_umb_01_kasa_tex_txt, 32, 32, 0x1107508, 0x20] + - [0x1107728, af_ci4, tol_umb_01_tuka_tex_txt, 32, 32, 0x1107508, 0x20] - [0x1107930] - - name: object_01108000 - type: bin # code + - name: tol_umb_02 + dir: objects/tol_umb_02 + type: code start: 0x1108000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1108000, data, assets/objects/object_01108000/object_01108000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_02] + - start: 0x1108000 + type: .data + name: tol_umb_02 + subsegments: + - [0x1108000, vtx, tol_umb_02_v] + - [0x11083E0, gfx, kasa_umb02_model] + - [0x1108508, gfx, e_umb02_model] + - [0x11085C8, af_palette, tol_umb02_pal] + - [0x11085E8, af_ci4, tol_umb02_kasa2_tex_txt, 16, 64, 0x11085C8, 0x20] + - [0x11087E8, af_ci4, tol_umb02_kasa1_tex_txt, 16, 64, 0x11085C8, 0x20] + - [0x11089E8, af_ci4, tol_umb02_tuka_tex_txt, 32, 32, 0x11085C8, 0x20] - [0x1108BF0] - - name: object_01109000 - type: bin # code + - name: tol_umb_03 + dir: objects/tol_umb_03 + type: code start: 0x1109000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1109000, data, assets/objects/object_01109000/object_01109000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_03] + - start: 0x1109000 + type: .data + name: tol_umb_03 + subsegments: + - [0x1109000, vtx, tol_umb_03_v] + - [0x1109380, gfx, kasa_umb03_model] + - [0x1109450, gfx, e_umb03_model] + - [0x1109510, af_palette, tol_umb_03_pal] + - [0x1109530, af_ci4, tol_umb_03_kasa1_tex_txt, 32, 64, 0x1109510, 0x20] + - [0x1109930, af_ci4, tol_umb_03_tuka_tex_txt, 32, 32, 0x1109510, 0x20] - [0x1109B30] - - name: object_0110A000 - type: bin # code + - name: tol_umb_04 + dir: objects/tol_umb_04 + type: code start: 0x110A000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x110A000, data, assets/objects/object_0110A000/object_0110A000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_04] + - start: 0x110A000 + type: .data + name: tol_umb_04 + subsegments: + - [0x110A000, vtx, tol_umb_04_v] + - [0x110A380, gfx, kasa_umb04_model] + - [0x110A4C0, gfx, e_umb04_model] + - [0x110A580, af_palette, tol_umb_04_pal] + - [0x110A5A0, af_ci4, tol_umb_04_kasa1_tex_txt, 16, 32, 0x110A580, 0x20] + - [0x110A6A0, af_ci4, tol_umb_04_kasa2_tex_txt, 16, 32, 0x110A580, 0x20] + - [0x110A7A0, af_ci4, tol_umb_04_tuka_tex_txt, 32, 32, 0x110A580, 0x20] - [0x110A9A0] - - name: object_0110B000 - type: bin # code + - name: tol_umb_05 + dir: objects/tol_umb_05 + type: code start: 0x110B000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x110B000, data, assets/objects/object_0110B000/object_0110B000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_05] + - start: 0x110B000 + type: .data + name: tol_umb_05 + subsegments: + - [0x110B000, vtx, tol_umb_05_v] + - [0x110B380, gfx, kasa_umb05_model] + - [0x110B448, gfx, e_umb05_model] + - [0x110B508, af_palette, tol_umb_05_pal] + - [0x110B528, af_ci4, tol_umb_05_kasa_tex_txt, 32, 32, 0x110B508, 0x20] + - [0x110B728, af_ci4, tol_umb_05_tuka_tex_txt, 32, 32, 0x110B508, 0x20] - [0x110B930] - - name: object_0110C000 - type: bin # code + - name: tol_umb_06 + dir: objects/tol_umb_06 + type: code start: 0x110C000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x110C000, data, assets/objects/object_0110C000/object_0110C000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_06] + - start: 0x110C000 + type: .data + name: tol_umb_06 + subsegments: + - [0x110C000, vtx, tol_umb_06_v] + - [0x110C5E0, gfx, kasa_umb06_model] + - [0x110C6D0, gfx, e_umb06_model] + - [0x110C790, af_palette, tol_umb_06_pal] + - [0x110C7B0, af_ci4, tol_umb_06_kasa1_tex_txt, 32, 32, 0x110C790, 0x20] + - [0x110C9B0, af_ci4, tol_umb_06_tuka_tex_txt, 32, 32, 0x110C790, 0x20] - [0x110CBB0] - - name: object_0110D000 - type: bin # code + - name: tol_umb_07 + dir: objects/tol_umb_07 + type: code start: 0x110D000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x110D000, data, assets/objects/object_0110D000/object_0110D000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_07] + - start: 0x110D000 + type: .data + name: tol_umb_07 + subsegments: + - [0x110D000, vtx, tol_umb_07_v] + - [0x110D260, gfx, kasa_umb07_model] + - [0x110D380, gfx, e_umb07_model] + - [0x110D440, af_palette, tol_umb07_pal] + - [0x110D460, af_ci4, tol_umb07_kasa2_tex_txt, 16, 32, 0x110D440, 0x20] + - [0x110D560, af_ci4, tol_umb07_kasa1_tex_txt, 32, 64, 0x110D440, 0x20] + - [0x110D960, af_ci4, tol_umb07_tuka_tex_txt, 32, 32, 0x110D440, 0x20] - [0x110DB60] - - name: object_0110E000 - type: bin # code + - name: tol_umb_08 + dir: objects/tol_umb_08 + type: code start: 0x110E000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x110E000, data, assets/objects/object_0110E000/object_0110E000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_08] + - start: 0x110E000 + type: .data + name: tol_umb_08 + subsegments: + - [0x110E000, vtx, tol_umb_08_v] + - [0x110E390, gfx, kasa_umb08_model] + - [0x110E458, gfx, e_umb08_model] + - [0x110E570, af_palette, tol_umb08_pal] + - [0x110E590, af_ci4, tol_umb08_kasa1_tex_txt, 32, 32, 0x110E570, 0x20] + - [0x110E790, af_ci4, tol_umb08_kasa2_tex_txt, 8, 16, 0x110E570, 0x20] + - [0x110E7D0, af_ci4, tol_umb08_tuka_tex_txt, 32, 32, 0x110E570, 0x20] - [0x110E9D0] - - name: object_0110F000 - type: bin # code + + - name: tol_umb_09 + dir: objects/tol_umb_09 + type: code start: 0x110F000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x110F000, data, assets/objects/object_0110F000/object_0110F000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_09] + - start: 0x110F000 + type: .data + name: tol_umb_09 + subsegments: + - [0x110F000, vtx, tol_umb_09_v] + - [0x110F390, gfx, kasa_umb09_model] + - [0x110F458, gfx, e_umb09_model] + - [0x110F570, af_palette, tol_umb09_pal] + - [0x110F590, af_ci4, tol_umb09_kasa1_tex_txt, 32, 32, 0x110F570, 0x20] + - [0x110F790, af_ci4, tol_umb09_kasa2_tex_txt, 8, 16, 0x110F570, 0x20] + - [0x110F7D0, af_ci4, tol_umb09_tuka_tex_txt, 32, 32, 0x110F570, 0x20] - [0x110F9D0] - - name: object_01110000 - type: bin # code + - name: tol_umb_10 + dir: objects/tol_umb_10 + type: code start: 0x1110000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1110000, data, assets/objects/object_01110000/object_01110000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_10] + - start: 0x1110000 + type: .data + name: tol_umb_10 + subsegments: + - [0x1110000, vtx, tol_umb_10_v] + - [0x1110390, gfx, kasa_umb10_model] + - [0x1110458, gfx, e_umb10_model] + - [0x1110570, af_palette, tol_umb10_pal] + - [0x1110590, af_ci4, tol_umb10_kasa1_tex_txt, 16, 64, 0x1110570, 0x20] + - [0x1110790, af_ci4, tol_umb10_kasa2_tex_txt, 8, 16, 0x1110570, 0x20] + - [0x11107D0, af_ci4, tol_umb10_tuka_tex_txt, 32, 32, 0x1110570, 0x20] - [0x11109D0] - - name: object_01111000 - type: bin # code + - name: tol_umb_11 + dir: objects/tol_umb_11 + type: code start: 0x1111000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1111000, data, assets/objects/object_01111000/object_01111000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_11] + - start: 0x1111000 + type: .data + name: tol_umb_11 + subsegments: + - [0x1111000, vtx, tol_umb_11_v] + - [0x1111390, gfx, kasa_umb11_model] + - [0x1111458, gfx, e_umb11_model] + - [0x1111570, af_palette, tol_umb11_pal] + - [0x1111590, af_ci4, tol_umb11_kasa1_tex_txt, 16, 64, 0x1111570, 0x20] + - [0x1111790, af_ci4, tol_umb11_kasa2_tex_txt, 8, 16, 0x1111570, 0x20] + - [0x11117D0, af_ci4, tol_umb11_tuka_tex_txt, 32, 32, 0x1111570, 0x20] - [0x11119D0] - - name: object_01112000 - type: bin # code + - name: tol_umb_12 + dir: objects/tol_umb_12 + type: code start: 0x1112000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1112000, data, assets/objects/object_01112000/object_01112000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_12] + - start: 0x1112000 + type: .data + name: tol_umb_12 + subsegments: + - [0x1112000, vtx, tol_umb_12_v] + - [0x1112390, gfx, kasa_umb12_model] + - [0x1112458, gfx, e_umb12_model] + - [0x1112570, af_palette, tol_umb12_pal] + - [0x1112590, af_ci4, tol_umb12_kasa1_tex_txt, 32, 64, 0x1112570, 0x20] + - [0x1112990, af_ci4, tol_umb12_kasa2_tex_txt, 8, 16, 0x1112570, 0x20] + - [0x11129D0, af_ci4, tol_umb12_tuka_tex_txt, 32, 32, 0x1112570, 0x20] - [0x1112BD0] - - name: object_01113000 - type: bin # code + - name: tol_umb_13 + dir: objects/tol_umb_13 + type: code start: 0x1113000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1113000, data, assets/objects/object_01113000/object_01113000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_13] + - start: 0x1113000 + type: .data + name: tol_umb_13 + subsegments: + - [0x1113000, vtx, tol_umb_13_v] + - [0x1113390, gfx, kasa_umb13_model] + - [0x1113458, gfx, e_umb13_model] + - [0x1113570, af_palette, tol_umb13_pal] + - [0x1113590, af_ci4, tol_umb13_kasa1_tex_txt, 32, 32, 0x1113570, 0x20] + - [0x1113790, af_ci4, tol_umb13_kasa2_tex_txt, 8, 16, 0x1113570, 0x20] + - [0x11137D0, af_ci4, tol_umb13_tuka_tex_txt, 32, 32, 0x1113570, 0x20] - [0x11139D0] - - name: object_01114000 - type: bin # code + - name: tol_umb_14 + dir: objects/tol_umb_14 + type: code start: 0x1114000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1114000, data, assets/objects/object_01114000/object_01114000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_14] + - start: 0x1114000 + type: .data + name: tol_umb_14 + subsegments: + - [0x1114000, vtx, tol_umb_14_v] + - [0x1114380, gfx, kasa_umb14_model] + - [0x1114448, gfx, e_umb14_model] + - [0x1114508, af_palette, tol_umb_14_pal] + - [0x1114528, af_ci4, tol_umb_14_kasa_tex_txt, 32, 32, 0x1114508, 0x20] + - [0x1114728, af_ci4, tol_umb_14_tuka_tex_txt, 32, 32, 0x1114508, 0x20] - [0x1114930] - - name: object_01115000 - type: bin # code + - name: tol_umb_15 + dir: objects/tol_umb_15 + type: code start: 0x1115000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1115000, data, assets/objects/object_01115000/object_01115000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_15] + - start: 0x1115000 + type: .data + name: tol_umb_15 + subsegments: + - [0x1115000, vtx, tol_umb_15_v] + - [0x11153C0, gfx, kasa_umb15_model] + - [0x11154D8, gfx, e_umb15_model] + - [0x1115598, af_palette, tol_umb_15_pal] + - [0x11155B8, af_ci4, tol_umb_15_kasa1_tex_txt, 16, 32, 0x1115598, 0x20] + - [0x11156B8, af_ci4, tol_umb_15_kasa2_tex_txt, 32, 32, 0x1115598, 0x20] + - [0x11158B8, af_ci4, tol_umb_15_tuka_tex_txt, 32, 32, 0x1115598, 0x20] - [0x1115AC0] - - name: object_01116000 - type: bin # code + - name: tol_umb_16 + dir: objects/tol_umb_16 + type: code start: 0x1116000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1116000, data, assets/objects/object_01116000/object_01116000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_16] + - start: 0x1116000 + type: .data + name: tol_umb_16 + subsegments: + - [0x1116000, vtx, tol_umb_16_v] + - [0x1116380, gfx, kasa_umb16_model] + - [0x1116448, gfx, e_umb16_model] + - [0x1116508, af_palette, tol_umb_16_pal] + - [0x1116528, af_ci4, tol_umb_16_kasa1_tex_txt, 32, 32, 0x1116508, 0x20] + - [0x1116728, af_ci4, tol_umb_16_tuka_tex_txt, 32, 32, 0x1116508, 0x20] - [0x1116930] - - name: object_01117000 - type: bin # code + - name: tol_umb_17 + dir: objects/tol_umb_17 + type: code start: 0x1117000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1117000, data, assets/objects/object_01117000/object_01117000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_17] + - start: 0x1117000 + type: .data + name: tol_umb_17 + subsegments: + - [0x1117000, vtx, tol_umb_17_v] + - [0x11174D0, gfx, kasa_umb17_model] + - [0x11175D8, gfx, e_umb17_model] + - [0x1117680, af_palette, tol_umb_17_pal] + - [0x11176A0, af_ci4, tol_umb_17_kasa_tex_txt, 32, 32, 0x1117680, 0x20] + - [0x11178A0, af_ci4, tol_umb_17_tuka_tex_txt, 32, 32, 0x1117680, 0x20] - [0x1117AA0] - - name: object_01118000 - type: bin # code + - name: tol_umb_18 + dir: objects/tol_umb_18 + type: code start: 0x1118000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1118000, data, assets/objects/object_01118000/object_01118000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_18] + - start: 0x1118000 + type: .data + name: tol_umb_18 + subsegments: + - [0x1118000, vtx, tol_umb_18_v] + - [0x1118280, gfx, kasa_umb18_model] + - [0x1118348, gfx, e_umb18_model] + - [0x1118460, af_palette, tol_umb18_pal] + - [0x1118480, af_ci4, tol_umb18_kasa1_tex_txt, 16, 32, 0x1118460, 0x20] + - [0x1118580, af_ci4, tol_umb18_kasa2_tex_txt, 16, 16, 0x1118460, 0x20] + - [0x1118600, af_ci4, tol_umb18_tuka_tex_txt, 32, 32, 0x1118460, 0x20] - [0x1118800] - - name: object_01119000 - type: bin # code + - name: tol_umb_19 + dir: objects/tol_umb_19 + type: code start: 0x1119000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1119000, data, assets/objects/object_01119000/object_01119000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_19] + - start: 0x1119000 + type: .data + name: tol_umb_19 + subsegments: + - [0x1119000, vtx, tol_umb_19_v] + - [0x1119400, gfx, kasa_umb19_model] + - [0x11194E0, gfx, e_umb19_model] + - [0x1119610, af_palette, tol_umb_19_pal] + - [0x1119630, af_ci4, tol_umb_19_kasa_tex_txt, 32, 32, 0x1119610, 0x20] + - [0x1119830, af_ci4, tol_umb_19_tuka_tex_txt, 32, 32, 0x1119610, 0x20] + - [0x1119A30, af_ci4, tol_umb_19_e_tex_txt, 16, 16, 0x1119610, 0x20] - [0x1119AB0] - - name: object_0111A000 - type: bin # code + - name: tol_umb_20 + dir: objects/tol_umb_20 + type: code start: 0x111A000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x111A000, data, assets/objects/object_0111A000/object_0111A000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_20] + - start: 0x111A000 + type: .data + name: tol_umb_20 + subsegments: + - [0x111A000, vtx, tol_umb_20_v] + - [0x111A280, gfx, kasa_umb20_model] + - [0x111A338, gfx, e_umb20_model] + - [0x111A408, af_palette, tol_umb_20_pal] + - [0x111A428, af_ci4, tol_umb_20_kasa_tex_txt, 32, 64, 0x111A408, 0x20] + - [0x111A828, af_ci4, tol_umb_20_e_tex_txt, 16, 16, 0x111A408, 0x20] - [0x111A8B0] - - name: object_0111B000 - type: bin # code + - name: tol_umb_21 + dir: objects/tol_umb_21 + type: code start: 0x111B000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x111B000, data, assets/objects/object_0111B000/object_0111B000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_21] + - start: 0x111B000 + type: .data + name: tol_umb_21 + subsegments: + - [0x111B000, vtx, tol_umb_21_v] + - [0x111B380, gfx, kasa_umb21_model] + - [0x111B468, gfx, e_umb21_model] + - [0x111B520, af_palette, tol_umb_21_pal] + - [0x111B540, af_ci4, tol_umb_21_kasa_tex_txt, 64, 32, 0x111B520, 0x20] + - [0x111B940, af_ci4, tol_umb_21_tuka_tex_txt, 32, 32, 0x111B520, 0x20] - [0x111BB40] - - name: object_0111C000 - type: bin # code + - name: tol_umb_22 + dir: objects/tol_umb_22 + type: code start: 0x111C000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x111C000, data, assets/objects/object_0111C000/object_0111C000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_22] + - start: 0x111C000 + type: .data + name: tol_umb_22 + subsegments: + - [0x111C000, vtx, tol_umb_22_v] + - [0x111C480, gfx, kasa_umb22_model] + - [0x111C580, gfx, e_umb22_model] + - [0x111C620, af_palette, tol_umb_22_pal] + - [0x111C640, af_ci4, tol_umb_22_kasa_tex_txt, 32, 32, 0x111C620, 0x20] + - [0x111C840, af_ci4, tol_umb_22_e_tex_txt, 16, 32, 0x111C620, 0x20] - [0x111C940] - - name: object_0111D000 - type: bin # code + - name: tol_umb_23 + dir: objects/tol_umb_23 + type: code start: 0x111D000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x111D000, data, assets/objects/object_0111D000/object_0111D000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_23] + - start: 0x111D000 + type: .data + name: tol_umb_23 + subsegments: + - [0x111D000, vtx, tol_umb_23_v] + - [0x111D360, gfx, kasa_umb23_model] + - [0x111D428, gfx, e_umb23_model] + - [0x111D528, af_palette, tol_umb_23_pal] + - [0x111D548, af_ci4, tol_umb_23_kasa_tex_txt, 32, 64, 0x111D528, 0x20] + - [0x111D948, af_ci4, tol_umb_23_tuka_tex_txt, 32, 32, 0x111D528, 0x20] + - [0x111DB48, af_ci4, tol_umb_23_e_tex_txt, 16, 16, 0x111D528, 0x20] - [0x111DBD0] - - name: object_0111E000 - type: bin # code + - name: tol_umb_24 + dir: objects/tol_umb_24 + type: code start: 0x111E000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x111E000, data, assets/objects/object_0111E000/object_0111E000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_24] + - start: 0x111E000 + type: .data + name: tol_umb_24 + subsegments: + - [0x111E000, vtx, tol_umb_24_v] + - [0x111E3C0, gfx, kasa_umb24_model] + - [0x111E4D8, gfx, e_umb24_model] + - [0x111E598, af_palette, tol_umb_24_pal] + - [0x111E5B8, af_ci4, tol_umb_24_kasa1_tex_txt, 16, 32, 0x111E598, 0x20] + - [0x111E6B8, af_ci4, tol_umb_24_kasa2_tex_txt, 16, 32, 0x111E598, 0x20] + - [0x111E7B8, af_ci4, tol_umb_24_tuka_tex_txt, 32, 32, 0x111E598, 0x20] - [0x111E9C0] - - name: object_0111F000 - type: bin # code + - name: tol_umb_25 + dir: objects/tol_umb_25 + type: code start: 0x111F000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x111F000, data, assets/objects/object_0111F000/object_0111F000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_25] + - start: 0x111F000 + type: .data + name: tol_umb_25 + subsegments: + - [0x111F000, vtx, tol_umb_25_v] + - [0x111F350, gfx, kasa_umb25_model] + - [0x111F470, gfx, e_umb25_model] + - [0x111F510, af_palette, tol_umb_25_pal] + - [0x111F530, af_ci4, tol_umb_25_kasa_tex_txt, 32, 32, 0x111F510, 0x20] + - [0x111F730, af_ci4, tol_umb_25_ya_tex_txt, 16, 64, 0x111F510, 0x20] - [0x111F930] - - name: object_01120000 - type: bin # code + - name: tol_umb_26 + dir: objects/tol_umb_26 + type: code start: 0x1120000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1120000, data, assets/objects/object_01120000/object_01120000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_26] + - start: 0x1120000 + type: .data + name: tol_umb_26 + subsegments: + - [0x1120000, vtx, tol_umb_26_v] + - [0x11203C0, gfx, kasa_umb26_model] + - [0x11204D0, gfx, e_umb26_model] + - [0x1120590, af_palette, tol_umb_26_pal] + - [0x11205B0, af_ci4, tol_umb_26_kasa1_tex_txt, 16, 32, 0x1120590, 0x20] + - [0x11206B0, af_ci4, tol_umb_26_kasa2_tex_txt, 16, 32, 0x1120590, 0x20] + - [0x11207B0, af_ci4, tol_umb_26_tuka_tex_txt, 32, 32, 0x1120590, 0x20] - [0x11209B0] - - name: object_01121000 - type: bin # code + - name: tol_umb_27 + dir: objects/tol_umb_27 + type: code start: 0x1121000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1121000, data, assets/objects/object_01121000/object_01121000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_27] + - start: 0x1121000 + type: .data + name: tol_umb_27 + subsegments: + - [0x1121000, vtx, tol_umb_27_v] + - [0x11214B0, gfx, kasa_umb27_model] + - [0x11215F8, gfx, e_umb27_model] + - [0x1121698, af_palette, tol_umb_27_pal] + - [0x11216B8, af_ci4, tol_umb_27_kasa1_tex_txt, 32, 32, 0x1121698, 0x20] + - [0x11218B8, af_ci4, tol_umb_27_kasa2_tex_txt, 32, 32, 0x1121698, 0x20] + - [0x1121AB8, af_ci4, tol_umb_27_e_tex_txt, 16, 16, 0x1121698, 0x20] - [0x1121B40] - - name: object_01122000 - type: bin # code + - name: tol_umb_28 + dir: objects/tol_umb_28 + type: code start: 0x1122000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1122000, data, assets/objects/object_01122000/object_01122000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_28] + - start: 0x1122000 + type: .data + name: tol_umb_28 + subsegments: + - [0x1122000, vtx, tol_umb_28_v] + - [0x1122360, gfx, kasa_umb28_model] + - [0x1122428, gfx, e_umb28_model] + - [0x11224E0, af_palette, tol_umb_28_pal] + - [0x1122500, af_ci4, tol_umb_28_kasa_tex_txt, 32, 32, 0x11224E0, 0x20] + - [0x1122700, af_ci4, tol_umb_28_tuka_tex_txt, 32, 32, 0x11224E0, 0x20] - [0x1122900] - - name: object_01123000 - type: bin # code + - name: tol_umb_29 + dir: objects/tol_umb_29 + type: code start: 0x1123000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1123000, data, assets/objects/object_01123000/object_01123000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_29] + - start: 0x1123000 + type: .data + name: tol_umb_29 + subsegments: + - [0x1123000, vtx, tol_umb_29_v] + - [0x1123380, gfx, kasa_umb29_model] + - [0x1123448, gfx, e_umb29_model] + - [0x1123508, af_palette, tol_umb_29_pal] + - [0x1123528, af_ci4, tol_umb_29_kasa1_tex_txt, 32, 32, 0x1123508, 0x20] + - [0x1123728, af_ci4, tol_umb_29_tuka_tex_txt, 32, 32, 0x1123508, 0x20] - [0x1123930] - - name: object_01124000 - type: bin # code + - name: tol_umb_30 + dir: objects/tol_umb_30 + type: code start: 0x1124000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1124000, data, assets/objects/object_01124000/object_01124000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_30] + - start: 0x1124000 + type: .data + name: tol_umb_30 + subsegments: + - [0x1124000, vtx, tol_umb_30_v] + - [0x1124380, gfx, kasa_umb30_model] + - [0x1124450, gfx, e_umb30_model] + - [0x1124510, af_palette, obj_shop_umb_30_pal] + - [0x1124530, af_ci4, tol_umb_30_kasa1_tex_txt, 32, 32, 0x1124510, 0x20] + - [0x1124730, af_ci4, tol_umb_30_tuka_tex_txt, 32, 32, 0x1124510, 0x20] - [0x1124930] - - name: object_01125000 - type: bin # code + - name: tol_umb_31 + dir: objects/tol_umb_31 + type: code start: 0x1125000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1125000, data, assets/objects/object_01125000/object_01125000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_31] + - start: 0x1125000 + type: .data + name: tol_umb_31 + subsegments: + - [0x1125000, vtx, tol_umb_31_v] + - [0x1125360, gfx, kasa_umb31_model] + - [0x1125428, gfx, e_umb31_model] + - [0x1125528, af_palette, tol_umb_31_pal] + - [0x1125548, af_ci4, tol_umb_31_kasa_tex_txt, 32, 32, 0x1125528, 0x20] + - [0x1125748, af_ci4, tol_umb_31_tuka_tex_txt, 32, 32, 0x1125528, 0x20] + - [0x1125948, af_ci4, tol_umb_31_e_tex_txt, 16, 16, 0x1125528, 0x20] - [0x11259D0] - - name: object_01126000 - type: bin # code + - name: tol_umb_32 + dir: objects/tol_umb_32 + type: code start: 0x1126000 vram: 0x06000000 exclusive_ram_id: segment_06 compress: True align: 0x1000 - # subsegments: - # - [0x1126000, data, assets/objects/object_01126000/object_01126000] + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, tol_umb_32] + - start: 0x1126000 + type: .data + name: tol_umb_32 + subsegments: + - [0x1126000, vtx, tol_umb_32_v] + - [0x1126380, gfx, kasa_umb32_model] + - [0x1126448, gfx, e_umb32_model] + - [0x1126508, af_palette, obj_shop_umb_32_pal] + - [0x1126528, af_ci4, obj_shop_umb_32_kasa1_tex_txt, 32, 32, 0x1126508, 0x20] + - [0x1126728, af_ci4, obj_shop_umb_32_tuka1_tex_txt, 32, 32, 0x1126508, 0x20] - [0x1126930] - name: object_01127000 |