diff options
| author | SuperDude88 <82904174+SuperDude88@users.noreply.github.com> | 2026-07-13 16:51:24 -0400 |
|---|---|---|
| committer | SuperDude88 <82904174+SuperDude88@users.noreply.github.com> | 2026-07-13 17:09:49 -0400 |
| commit | fbf39c24c9c1d539378816afdabdf50172522b7c (patch) | |
| tree | 9baab04834898cf9556884071443e85846775d04 | |
| parent | 99f93ebe98d144f48e4e494724a163b026fe9d91 (diff) | |
Extract Embedded Model Data
| -rw-r--r-- | config/D44J01/config.yml | 263 | ||||
| -rw-r--r-- | config/GZLE01/config.yml | 263 | ||||
| -rw-r--r-- | config/GZLJ01/config.yml | 263 | ||||
| -rw-r--r-- | config/GZLP01/config.yml | 263 | ||||
| -rw-r--r-- | include/d/d_flower.h | 4 | ||||
| -rw-r--r-- | include/d/d_grass.h | 4 | ||||
| -rw-r--r-- | src/d/actor/d_a_bwdg.cpp | 2 | ||||
| -rw-r--r-- | src/d/actor/d_a_goal_flag.cpp | 99 | ||||
| -rw-r--r-- | src/d/actor/d_a_hookshot.cpp | 31 | ||||
| -rw-r--r-- | src/d/actor/d_a_majuu_flag.cpp | 94 | ||||
| -rw-r--r-- | src/d/actor/d_a_pirate_flag.cpp | 65 | ||||
| -rw-r--r-- | src/d/actor/d_a_sail.cpp | 222 | ||||
| -rw-r--r-- | src/d/d_chain.cpp | 31 | ||||
| -rw-r--r-- | src/d/d_drawlist.cpp | 225 | ||||
| -rw-r--r-- | src/d/d_flower.cpp | 33 | ||||
| -rw-r--r-- | src/d/d_grass.cpp | 115 | ||||
| -rw-r--r-- | src/d/d_magma.cpp | 43 | ||||
| -rw-r--r-- | src/d/d_tree.cpp | 118 | ||||
| -rw-r--r-- | src/d/d_wood.cpp | 103 |
19 files changed, 1107 insertions, 1134 deletions
diff --git a/config/D44J01/config.yml b/config/D44J01/config.yml index 16be222d..b28cab30 100644 --- a/config/D44J01/config.yml +++ b/config/D44J01/config.yml @@ -311,6 +311,16 @@ modules: - symbol: l_flag02TEX binary: assets/l_flag02TEX.bin header: assets/l_flag02TEX.h + - symbol: l_majuu_flag_pos + binary: assets/l_majuu_flag_pos.bin + header: assets/l_majuu_flag_pos.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_majuu_flag.bin + header: assets/l_texCoord__d_a_majuu_flag.h + header_type: none + custom_type: cXy - symbol: l_majuu_flag_matDL binary: assets/l_majuu_flag_matDL.bin header: assets/l_majuu_flag_matDL.h @@ -626,6 +636,16 @@ modules: # map: orig/D44J01/files/maps/d_a_pirate_flag.map ldscript_template: config/GZLE01/rels/ldscript.tpl extract: + - symbol: l_pos + binary: assets/l_pos__d_a_pirate_flag.bin + header: assets/l_pos__d_a_pirate_flag.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_pirate_flag.bin + header: assets/l_texCoord__d_a_pirate_flag.h + header_type: none + custom_type: cXy - symbol: l_pirate_flag_DL binary: assets/l_pirate_flag_DL.bin header: assets/l_pirate_flag_DL.h @@ -1442,8 +1462,10 @@ modules: binary: assets/l_B_sand2TEX.bin header: assets/l_B_sand2TEX.h - symbol: l_texCoord - binary: assets/l_texCoord.bin - header: assets/l_texCoord.h + binary: assets/l_texCoord__d_a_bwdg.bin + header: assets/l_texCoord__d_a_bwdg.h + header_type: none + custom_type: cXy - symbol: l_Hsand1DL binary: assets/l_Hsand1DL.bin header: assets/l_Hsand1DL.h @@ -1568,6 +1590,16 @@ modules: - symbol: l_txa_dummy_hataTEX binary: assets/l_txa_dummy_hataTEX.bin header: assets/l_txa_dummy_hataTEX.h + - symbol: l_pos + binary: assets/l_pos__d_a_goal_flag.bin + header: assets/l_pos__d_a_goal_flag.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_goal_flag.bin + header: assets/l_texCoord__d_a_goal_flag.h + header_type: none + custom_type: cXy - symbol: l_goal_flag_DL binary: assets/l_goal_flag_DL.bin header: assets/l_goal_flag_DL.h @@ -2753,6 +2785,16 @@ modules: # map: orig/D44J01/files/maps/d_a_sail.map ldscript_template: config/GZLE01/rels/ldscript.tpl extract: + - symbol: l_pos + binary: assets/l_pos__d_a_sail.bin + header: assets/l_pos__d_a_sail.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_sail.bin + header: assets/l_texCoord__d_a_sail.h + header_type: none + custom_type: cXy - symbol: l_sail_DL binary: assets/l_sail_DL.bin header: assets/l_sail_DL.h @@ -2762,6 +2804,21 @@ modules: - symbol: l_Txa_kizoku_mastTEX binary: assets/l_Txa_kizoku_mastTEX.bin header: assets/l_Txa_kizoku_mastTEX.h + - symbol: l_mast_pos + binary: assets/l_mast_pos__d_a_sail.bin + header: assets/l_mast_pos__d_a_sail.h + header_type: none + custom_type: Vec + - symbol: l_mast_color + binary: assets/l_mast_color__d_a_sail.bin + header: assets/l_mast_color__d_a_sail.h + header_type: none + custom_type: GXColor + - symbol: l_mast_texCoord + binary: assets/l_mast_texCoord__d_a_sail.bin + header: assets/l_mast_texCoord__d_a_sail.h + header_type: none + custom_type: cXy - symbol: l_AmastDL binary: assets/l_AmastDL.bin header: assets/l_AmastDL.h @@ -3010,15 +3067,43 @@ extract: - symbol: l_frontNoZSubMat binary: assets/l_frontNoZSubMat.bin header: assets/l_frontNoZSubMat.h +- symbol: l_bonboriPos + binary: assets/l_bonboriPos__d_drawlist.bin + header: assets/l_bonboriPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_bonboriDL binary: assets/l_bonboriDL.bin header: assets/l_bonboriDL.h +- symbol: l_s_beam_checkPos + binary: assets/l_s_beam_checkPos__d_drawlist.bin + header: assets/l_s_beam_checkPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_s_beam_checkDL binary: assets/l_s_beam_checkDL.bin header: assets/l_s_beam_checkDL.h +- symbol: l_cubePos + binary: assets/l_cubePos__d_drawlist.bin + header: assets/l_cubePos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_cubeDL binary: assets/l_cubeDL.bin header: assets/l_cubeDL.h +- symbol: l_bonbori2Pos + binary: assets/l_bonbori2Pos__d_drawlist.bin + header: assets/l_bonbori2Pos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_bonbori2DL binary: assets/l_bonbori2DL.bin header: assets/l_bonbori2DL.h @@ -3026,6 +3111,13 @@ extract: binary: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.bin header: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.h rename: l_matDL +- symbol: l_shadowVolPos + binary: assets/l_shadowVolPos__d_drawlist.bin + header: assets/l_shadowVolPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_shadowVolDL binary: assets/l_shadowVolDL.bin header: assets/l_shadowVolDL.h @@ -3044,6 +3136,13 @@ extract: - symbol: l_backSubMat binary: assets/l_backSubMat.bin header: assets/l_backSubMat.h +- symbol: l_simpleShadowPos + binary: assets/l_simpleShadowPos__d_drawlist.bin + header: assets/l_simpleShadowPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_shadowVolumeDL binary: assets/l_shadowVolumeDL.bin header: assets/l_shadowVolumeDL.h @@ -3071,6 +3170,27 @@ extract: - symbol: l_Txq_bessou_hanaTEX binary: assets/l_Txq_bessou_hanaTEX.bin header: assets/l_Txq_bessou_hanaTEX.h +- symbol: l_pos3 + binary: assets/l_pos3__d_flower.bin + header: assets/l_pos3__d_flower.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_color3 + binary: assets/l_color3__d_flower.bin + header: assets/l_color3__d_flower.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_texCoord3 + binary: assets/l_texCoord3__d_flower.bin + header: assets/l_texCoord3__d_flower.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_QbsafDL binary: assets/l_QbsafDL.bin header: assets/l_QbsafDL.h @@ -3080,6 +3200,21 @@ extract: - symbol: l_Txo_ob_flower_white_64x64TEX binary: assets/l_Txo_ob_flower_white_64x64TEX.bin header: assets/l_Txo_ob_flower_white_64x64TEX.h +- symbol: l_pos!.data:0x80376A20 + binary: assets/l_pos__d_flower.bin + header: assets/l_pos__d_flower.h + header_type: none + custom_type: Vec +- symbol: l_color!.sdata:0x803EA1A8 + binary: assets/l_color__d_flower.bin + header: assets/l_color__d_flower.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x80376C60 + binary: assets/l_texCoord__d_flower.bin + header: assets/l_texCoord__d_flower.h + header_type: none + custom_type: cXy - symbol: l_OhanaDL binary: assets/l_OhanaDL.bin header: assets/l_OhanaDL.h @@ -3089,6 +3224,27 @@ extract: - symbol: l_Txo_ob_flower_pink_64x64TEX binary: assets/l_Txo_ob_flower_pink_64x64TEX.bin header: assets/l_Txo_ob_flower_pink_64x64TEX.h +- symbol: l_pos2 + binary: assets/l_pos2__d_flower.bin + header: assets/l_pos2__d_flower.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_color2 + binary: assets/l_color2__d_flower.bin + header: assets/l_color2__d_flower.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_texCoord2 + binary: assets/l_texCoord2__d_flower.bin + header: assets/l_texCoord2__d_flower.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_Ohana_highDL binary: assets/l_Ohana_highDL.bin header: assets/l_Ohana_highDL.h @@ -3115,6 +3271,24 @@ extract: binary: assets/l_Txa_swood_bTEX.bin header: assets/l_Txa_swood_bTEX.h rename: l_Txa_swood_bTEX +- symbol: l_pos__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_pos__d_wood.bin + header: assets/l_pos__d_wood.h + header_type: none + custom_type: Vec + rename: l_pos +- symbol: l_color__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_color__d_wood.bin + header: assets/l_color__d_wood.h + header_type: none + custom_type: GXColor + rename: l_color +- symbol: l_texCoord__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_texCoord__d_wood.bin + header: assets/l_texCoord__d_wood.h + header_type: none + custom_type: cXy + rename: l_texCoord - symbol: l_Oba_swood_bDL__Q25dWood20@unnamed@d_wood_cpp@ binary: assets/l_Oba_swood_bDL.bin header: assets/l_Oba_swood_bDL.h @@ -3133,6 +3307,21 @@ extract: - symbol: l_Txa_swood_aTEX binary: assets/l_Txa_swood_aTEX.bin header: assets/l_Txa_swood_aTEX.h +- symbol: l_pos!.data:0x8036E460 + binary: assets/l_pos__d_tree.bin + header: assets/l_pos__d_tree.h + header_type: none + custom_type: Vec +- symbol: l_color!.data:0x8036E82C + binary: assets/l_color__d_tree.bin + header: assets/l_color__d_tree.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x8036E854 + binary: assets/l_texCoord__d_tree.bin + header: assets/l_texCoord__d_tree.h + header_type: none + custom_type: cXy - symbol: l_Oba_swood_noneDL binary: assets/l_Oba_swood_noneDL.bin header: assets/l_Oba_swood_noneDL.h @@ -3170,6 +3359,16 @@ extract: - symbol: l_chainS3TCTEX!.data:0x8036a960 binary: assets/l_chainS3TCTEX__d_chain.bin header: assets/l_chainS3TCTEX__d_chain.h +- symbol: l_pos!.data:0x8036AB60 + binary: assets/l_pos__d_chain.bin + header: assets/l_pos__d_chain.h + header_type: none + custom_type: Vec +- symbol: l_texCoord!.data:0x8036ABF0 + binary: assets/l_texCoord__d_chain.bin + header: assets/l_texCoord__d_chain.h + header_type: none + custom_type: cXy - symbol: l_chainDL!.data:0x8036ac60 binary: assets/l_chainDL__d_chain.bin header: assets/l_chainDL__d_chain.h @@ -3182,6 +3381,16 @@ extract: - symbol: l_chainS3TCTEX!.data:0x8037fec0 binary: assets/l_chainS3TCTEX__d_hookshot.bin header: assets/l_chainS3TCTEX__d_hookshot.h +- symbol: l_pos!.data:0x803800C0 + binary: assets/l_pos__d_hookshot.bin + header: assets/l_pos__d_hookshot.h + header_type: none + custom_type: Vec +- symbol: l_texCoord!.data:0x80380150 + binary: assets/l_texCoord__d_hookshot.bin + header: assets/l_texCoord__d_hookshot.h + header_type: none + custom_type: cXy - symbol: l_chainDL!.data:0x803801c0 binary: assets/l_chainDL__d_hookshot.bin header: assets/l_chainDL__d_hookshot.h @@ -3191,12 +3400,26 @@ extract: header_type: none custom_type: matDL +- symbol: l_YfloorPos + binary: assets/l_YfloorPos__d_magma.bin + header: assets/l_YfloorPos__d_magma.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_YfloorDL binary: assets/l_YfloorDL.bin header: assets/l_YfloorDL.h - symbol: l_YfloorMatDL binary: assets/l_YfloorMatDL.bin header: assets/l_YfloorMatDL.h +- symbol: l_YballPos + binary: assets/l_YballPos__d_magma.bin + header: assets/l_YballPos__d_magma.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_YballDL binary: assets/l_YballDL.bin header: assets/l_YballDL.h @@ -3207,6 +3430,27 @@ extract: - symbol: l_K_kusa_00TEX binary: assets/l_K_kusa_00TEX.bin header: assets/l_K_kusa_00TEX.h +- symbol: l_Vmori_pos + binary: assets/l_Vmori_pos.bin + header: assets/l_Vmori_pos.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_Vmori_color + binary: assets/l_Vmori_color.bin + header: assets/l_Vmori_color.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_Vmori_texCoord + binary: assets/l_Vmori_texCoord.bin + header: assets/l_Vmori_texCoord.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_Vmori_00DL binary: assets/l_Vmori_00DL.bin header: assets/l_Vmori_00DL.h @@ -3221,6 +3465,21 @@ extract: - symbol: l_Txa_ob_kusa_aTEX binary: assets/l_Txa_ob_kusa_aTEX.bin header: assets/l_Txa_ob_kusa_aTEX.h +- symbol: l_pos!.data:0x8036D740 + binary: assets/l_pos__d_grass.bin + header: assets/l_pos__d_grass.h + header_type: none + custom_type: Vec +- symbol: l_color!.data:0x8036D884 + binary: assets/l_color__d_grass.bin + header: assets/l_color__d_grass.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x8036D8A4 + binary: assets/l_texCoord__d_grass.bin + header: assets/l_texCoord__d_grass.h + header_type: none + custom_type: cXy - symbol: l_Oba_kusa_aDL binary: assets/l_Oba_kusa_aDL.bin header: assets/l_Oba_kusa_aDL.h diff --git a/config/GZLE01/config.yml b/config/GZLE01/config.yml index 27f53939..8937fe2c 100644 --- a/config/GZLE01/config.yml +++ b/config/GZLE01/config.yml @@ -269,6 +269,16 @@ modules: - symbol: l_flag02TEX binary: assets/l_flag02TEX.bin header: assets/l_flag02TEX.h + - symbol: l_majuu_flag_pos + binary: assets/l_majuu_flag_pos.bin + header: assets/l_majuu_flag_pos.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_majuu_flag.bin + header: assets/l_texCoord__d_a_majuu_flag.h + header_type: none + custom_type: cXy - symbol: l_majuu_flag_matDL binary: assets/l_majuu_flag_matDL.bin header: assets/l_majuu_flag_matDL.h @@ -540,6 +550,16 @@ modules: symbols: config/GZLE01/rels/d_a_pirate_flag/symbols.txt ldscript_template: config/GZLE01/rels/ldscript.tpl extract: + - symbol: l_pos + binary: assets/l_pos__d_a_pirate_flag.bin + header: assets/l_pos__d_a_pirate_flag.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_pirate_flag.bin + header: assets/l_texCoord__d_a_pirate_flag.h + header_type: none + custom_type: cXy - symbol: l_pirate_flag_DL binary: assets/l_pirate_flag_DL.bin header: assets/l_pirate_flag_DL.h @@ -1253,8 +1273,10 @@ modules: binary: assets/l_B_sand2TEX.bin header: assets/l_B_sand2TEX.h - symbol: l_texCoord - binary: assets/l_texCoord.bin - header: assets/l_texCoord.h + binary: assets/l_texCoord__d_a_bwdg.bin + header: assets/l_texCoord__d_a_bwdg.h + header_type: none + custom_type: cXy - symbol: l_Hsand1DL binary: assets/l_Hsand1DL.bin header: assets/l_Hsand1DL.h @@ -1357,6 +1379,16 @@ modules: - symbol: l_txa_dummy_hataTEX binary: assets/l_txa_dummy_hataTEX.bin header: assets/l_txa_dummy_hataTEX.h + - symbol: l_pos + binary: assets/l_pos__d_a_goal_flag.bin + header: assets/l_pos__d_a_goal_flag.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_goal_flag.bin + header: assets/l_texCoord__d_a_goal_flag.h + header_type: none + custom_type: cXy - symbol: l_goal_flag_DL binary: assets/l_goal_flag_DL.bin header: assets/l_goal_flag_DL.h @@ -2369,6 +2401,16 @@ modules: symbols: config/GZLE01/rels/d_a_sail/symbols.txt ldscript_template: config/GZLE01/rels/ldscript.tpl extract: + - symbol: l_pos + binary: assets/l_pos__d_a_sail.bin + header: assets/l_pos__d_a_sail.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_sail.bin + header: assets/l_texCoord__d_a_sail.h + header_type: none + custom_type: cXy - symbol: l_sail_DL binary: assets/l_sail_DL.bin header: assets/l_sail_DL.h @@ -2378,6 +2420,21 @@ modules: - symbol: l_Txa_kizoku_mastTEX binary: assets/l_Txa_kizoku_mastTEX.bin header: assets/l_Txa_kizoku_mastTEX.h + - symbol: l_mast_pos + binary: assets/l_mast_pos__d_a_sail.bin + header: assets/l_mast_pos__d_a_sail.h + header_type: none + custom_type: Vec + - symbol: l_mast_color + binary: assets/l_mast_color__d_a_sail.bin + header: assets/l_mast_color__d_a_sail.h + header_type: none + custom_type: GXColor + - symbol: l_mast_texCoord + binary: assets/l_mast_texCoord__d_a_sail.bin + header: assets/l_mast_texCoord__d_a_sail.h + header_type: none + custom_type: cXy - symbol: l_AmastDL binary: assets/l_AmastDL.bin header: assets/l_AmastDL.h @@ -2588,15 +2645,43 @@ extract: - symbol: l_frontNoZSubMat binary: assets/l_frontNoZSubMat.bin header: assets/l_frontNoZSubMat.h +- symbol: l_bonboriPos + binary: assets/l_bonboriPos__d_drawlist.bin + header: assets/l_bonboriPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_bonboriDL binary: assets/l_bonboriDL.bin header: assets/l_bonboriDL.h +- symbol: l_s_beam_checkPos + binary: assets/l_s_beam_checkPos__d_drawlist.bin + header: assets/l_s_beam_checkPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_s_beam_checkDL binary: assets/l_s_beam_checkDL.bin header: assets/l_s_beam_checkDL.h +- symbol: l_cubePos + binary: assets/l_cubePos__d_drawlist.bin + header: assets/l_cubePos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_cubeDL binary: assets/l_cubeDL.bin header: assets/l_cubeDL.h +- symbol: l_bonbori2Pos + binary: assets/l_bonbori2Pos__d_drawlist.bin + header: assets/l_bonbori2Pos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_bonbori2DL binary: assets/l_bonbori2DL.bin header: assets/l_bonbori2DL.h @@ -2604,6 +2689,13 @@ extract: binary: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.bin header: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.h rename: l_matDL +- symbol: l_shadowVolPos + binary: assets/l_shadowVolPos__d_drawlist.bin + header: assets/l_shadowVolPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_shadowVolDL binary: assets/l_shadowVolDL.bin header: assets/l_shadowVolDL.h @@ -2622,6 +2714,13 @@ extract: - symbol: l_backSubMat binary: assets/l_backSubMat.bin header: assets/l_backSubMat.h +- symbol: l_simpleShadowPos + binary: assets/l_simpleShadowPos__d_drawlist.bin + header: assets/l_simpleShadowPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_shadowVolumeDL binary: assets/l_shadowVolumeDL.bin header: assets/l_shadowVolumeDL.h @@ -2649,6 +2748,27 @@ extract: - symbol: l_Txq_bessou_hanaTEX binary: assets/l_Txq_bessou_hanaTEX.bin header: assets/l_Txq_bessou_hanaTEX.h +- symbol: l_pos3 + binary: assets/l_pos3__d_flower.bin + header: assets/l_pos3__d_flower.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_color3 + binary: assets/l_color3__d_flower.bin + header: assets/l_color3__d_flower.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_texCoord3 + binary: assets/l_texCoord3__d_flower.bin + header: assets/l_texCoord3__d_flower.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_QbsafDL binary: assets/l_QbsafDL.bin header: assets/l_QbsafDL.h @@ -2658,6 +2778,21 @@ extract: - symbol: l_Txo_ob_flower_white_64x64TEX binary: assets/l_Txo_ob_flower_white_64x64TEX.bin header: assets/l_Txo_ob_flower_white_64x64TEX.h +- symbol: l_pos!.data:0x80382AA0 + binary: assets/l_pos__d_flower.bin + header: assets/l_pos__d_flower.h + header_type: none + custom_type: Vec +- symbol: l_color!.sdata:0x803F6260 + binary: assets/l_color__d_flower.bin + header: assets/l_color__d_flower.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x80382CE0 + binary: assets/l_texCoord__d_flower.bin + header: assets/l_texCoord__d_flower.h + header_type: none + custom_type: cXy - symbol: l_OhanaDL binary: assets/l_OhanaDL.bin header: assets/l_OhanaDL.h @@ -2667,6 +2802,27 @@ extract: - symbol: l_Txo_ob_flower_pink_64x64TEX binary: assets/l_Txo_ob_flower_pink_64x64TEX.bin header: assets/l_Txo_ob_flower_pink_64x64TEX.h +- symbol: l_pos2 + binary: assets/l_pos2__d_flower.bin + header: assets/l_pos2__d_flower.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_color2 + binary: assets/l_color2__d_flower.bin + header: assets/l_color2__d_flower.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_texCoord2 + binary: assets/l_texCoord2__d_flower.bin + header: assets/l_texCoord2__d_flower.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_Ohana_highDL binary: assets/l_Ohana_highDL.bin header: assets/l_Ohana_highDL.h @@ -2693,6 +2849,24 @@ extract: binary: assets/l_Txa_swood_bTEX.bin header: assets/l_Txa_swood_bTEX.h rename: l_Txa_swood_bTEX +- symbol: l_pos__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_pos__d_wood.bin + header: assets/l_pos__d_wood.h + header_type: none + custom_type: Vec + rename: l_pos +- symbol: l_color__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_color__d_wood.bin + header: assets/l_color__d_wood.h + header_type: none + custom_type: GXColor + rename: l_color +- symbol: l_texCoord__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_texCoord__d_wood.bin + header: assets/l_texCoord__d_wood.h + header_type: none + custom_type: cXy + rename: l_texCoord - symbol: l_Oba_swood_bDL__Q25dWood20@unnamed@d_wood_cpp@ binary: assets/l_Oba_swood_bDL.bin header: assets/l_Oba_swood_bDL.h @@ -2711,6 +2885,21 @@ extract: - symbol: l_Txa_swood_aTEX binary: assets/l_Txa_swood_aTEX.bin header: assets/l_Txa_swood_aTEX.h +- symbol: l_pos!.data:0x8037A4E0 + binary: assets/l_pos__d_tree.bin + header: assets/l_pos__d_tree.h + header_type: none + custom_type: Vec +- symbol: l_color!.data:0x8037A8AC + binary: assets/l_color__d_tree.bin + header: assets/l_color__d_tree.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x8037A8D4 + binary: assets/l_texCoord__d_tree.bin + header: assets/l_texCoord__d_tree.h + header_type: none + custom_type: cXy - symbol: l_Oba_swood_noneDL binary: assets/l_Oba_swood_noneDL.bin header: assets/l_Oba_swood_noneDL.h @@ -2748,6 +2937,16 @@ extract: - symbol: l_chainS3TCTEX!.data:0x803769e0 binary: assets/l_chainS3TCTEX__d_chain.bin header: assets/l_chainS3TCTEX__d_chain.h +- symbol: l_pos!.data:0x80376BE0 + binary: assets/l_pos__d_chain.bin + header: assets/l_pos__d_chain.h + header_type: none + custom_type: Vec +- symbol: l_texCoord!.data:0x80376C70 + binary: assets/l_texCoord__d_chain.bin + header: assets/l_texCoord__d_chain.h + header_type: none + custom_type: cXy - symbol: l_chainDL!.data:0x80376ce0 binary: assets/l_chainDL__d_chain.bin header: assets/l_chainDL__d_chain.h @@ -2760,6 +2959,16 @@ extract: - symbol: l_chainS3TCTEX!.data:0x8038bd40 binary: assets/l_chainS3TCTEX__d_hookshot.bin header: assets/l_chainS3TCTEX__d_hookshot.h +- symbol: l_pos!.data:0x8038BF40 + binary: assets/l_pos__d_hookshot.bin + header: assets/l_pos__d_hookshot.h + header_type: none + custom_type: Vec +- symbol: l_texCoord!.data:0x8038BFD0 + binary: assets/l_texCoord__d_hookshot.bin + header: assets/l_texCoord__d_hookshot.h + header_type: none + custom_type: cXy - symbol: l_chainDL!.data:0x8038c040 binary: assets/l_chainDL__d_hookshot.bin header: assets/l_chainDL__d_hookshot.h @@ -2769,12 +2978,26 @@ extract: header_type: none custom_type: matDL +- symbol: l_YfloorPos + binary: assets/l_YfloorPos__d_magma.bin + header: assets/l_YfloorPos__d_magma.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_YfloorDL binary: assets/l_YfloorDL.bin header: assets/l_YfloorDL.h - symbol: l_YfloorMatDL binary: assets/l_YfloorMatDL.bin header: assets/l_YfloorMatDL.h +- symbol: l_YballPos + binary: assets/l_YballPos__d_magma.bin + header: assets/l_YballPos__d_magma.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_YballDL binary: assets/l_YballDL.bin header: assets/l_YballDL.h @@ -2785,6 +3008,27 @@ extract: - symbol: l_K_kusa_00TEX binary: assets/l_K_kusa_00TEX.bin header: assets/l_K_kusa_00TEX.h +- symbol: l_Vmori_pos + binary: assets/l_Vmori_pos.bin + header: assets/l_Vmori_pos.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_Vmori_color + binary: assets/l_Vmori_color.bin + header: assets/l_Vmori_color.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_Vmori_texCoord + binary: assets/l_Vmori_texCoord.bin + header: assets/l_Vmori_texCoord.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_Vmori_00DL binary: assets/l_Vmori_00DL.bin header: assets/l_Vmori_00DL.h @@ -2799,6 +3043,21 @@ extract: - symbol: l_Txa_ob_kusa_aTEX binary: assets/l_Txa_ob_kusa_aTEX.bin header: assets/l_Txa_ob_kusa_aTEX.h +- symbol: l_pos!.data:0x803797C0 + binary: assets/l_pos__d_grass.bin + header: assets/l_pos__d_grass.h + header_type: none + custom_type: Vec +- symbol: l_color!.data:0x80379904 + binary: assets/l_color__d_grass.bin + header: assets/l_color__d_grass.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x80379924 + binary: assets/l_texCoord__d_grass.bin + header: assets/l_texCoord__d_grass.h + header_type: none + custom_type: cXy - symbol: l_Oba_kusa_aDL binary: assets/l_Oba_kusa_aDL.bin header: assets/l_Oba_kusa_aDL.h diff --git a/config/GZLJ01/config.yml b/config/GZLJ01/config.yml index c443534b..9995da03 100644 --- a/config/GZLJ01/config.yml +++ b/config/GZLJ01/config.yml @@ -227,6 +227,16 @@ modules: - symbol: l_flag02TEX binary: assets/l_flag02TEX.bin header: assets/l_flag02TEX.h + - symbol: l_majuu_flag_pos + binary: assets/l_majuu_flag_pos.bin + header: assets/l_majuu_flag_pos.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_majuu_flag.bin + header: assets/l_texCoord__d_a_majuu_flag.h + header_type: none + custom_type: cXy - symbol: l_majuu_flag_matDL binary: assets/l_majuu_flag_matDL.bin header: assets/l_majuu_flag_matDL.h @@ -454,6 +464,16 @@ modules: symbols: config/GZLJ01/rels/d_a_pirate_flag/symbols.txt ldscript_template: config/GZLE01/rels/ldscript.tpl extract: + - symbol: l_pos + binary: assets/l_pos__d_a_pirate_flag.bin + header: assets/l_pos__d_a_pirate_flag.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_pirate_flag.bin + header: assets/l_texCoord__d_a_pirate_flag.h + header_type: none + custom_type: cXy - symbol: l_pirate_flag_DL binary: assets/l_pirate_flag_DL.bin header: assets/l_pirate_flag_DL.h @@ -1050,8 +1070,10 @@ modules: binary: assets/l_B_sand2TEX.bin header: assets/l_B_sand2TEX.h - symbol: l_texCoord - binary: assets/l_texCoord.bin - header: assets/l_texCoord.h + binary: assets/l_texCoord__d_a_bwdg.bin + header: assets/l_texCoord__d_a_bwdg.h + header_type: none + custom_type: cXy - symbol: l_Hsand1DL binary: assets/l_Hsand1DL.bin header: assets/l_Hsand1DL.h @@ -1139,6 +1161,16 @@ modules: - symbol: l_txa_dummy_hataTEX binary: assets/l_txa_dummy_hataTEX.bin header: assets/l_txa_dummy_hataTEX.h + - symbol: l_pos + binary: assets/l_pos__d_a_goal_flag.bin + header: assets/l_pos__d_a_goal_flag.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_goal_flag.bin + header: assets/l_texCoord__d_a_goal_flag.h + header_type: none + custom_type: cXy - symbol: l_goal_flag_DL binary: assets/l_goal_flag_DL.bin header: assets/l_goal_flag_DL.h @@ -1984,6 +2016,16 @@ modules: symbols: config/GZLJ01/rels/d_a_sail/symbols.txt ldscript_template: config/GZLE01/rels/ldscript.tpl extract: + - symbol: l_pos + binary: assets/l_pos__d_a_sail.bin + header: assets/l_pos__d_a_sail.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_sail.bin + header: assets/l_texCoord__d_a_sail.h + header_type: none + custom_type: cXy - symbol: l_sail_DL binary: assets/l_sail_DL.bin header: assets/l_sail_DL.h @@ -1993,6 +2035,21 @@ modules: - symbol: l_Txa_kizoku_mastTEX binary: assets/l_Txa_kizoku_mastTEX.bin header: assets/l_Txa_kizoku_mastTEX.h + - symbol: l_mast_pos + binary: assets/l_mast_pos__d_a_sail.bin + header: assets/l_mast_pos__d_a_sail.h + header_type: none + custom_type: Vec + - symbol: l_mast_color + binary: assets/l_mast_color__d_a_sail.bin + header: assets/l_mast_color__d_a_sail.h + header_type: none + custom_type: GXColor + - symbol: l_mast_texCoord + binary: assets/l_mast_texCoord__d_a_sail.bin + header: assets/l_mast_texCoord__d_a_sail.h + header_type: none + custom_type: cXy - symbol: l_AmastDL binary: assets/l_AmastDL.bin header: assets/l_AmastDL.h @@ -2172,15 +2229,43 @@ extract: - symbol: l_frontNoZSubMat binary: assets/l_frontNoZSubMat.bin header: assets/l_frontNoZSubMat.h +- symbol: l_bonboriPos + binary: assets/l_bonboriPos__d_drawlist.bin + header: assets/l_bonboriPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_bonboriDL binary: assets/l_bonboriDL.bin header: assets/l_bonboriDL.h +- symbol: l_s_beam_checkPos + binary: assets/l_s_beam_checkPos__d_drawlist.bin + header: assets/l_s_beam_checkPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_s_beam_checkDL binary: assets/l_s_beam_checkDL.bin header: assets/l_s_beam_checkDL.h +- symbol: l_cubePos + binary: assets/l_cubePos__d_drawlist.bin + header: assets/l_cubePos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_cubeDL binary: assets/l_cubeDL.bin header: assets/l_cubeDL.h +- symbol: l_bonbori2Pos + binary: assets/l_bonbori2Pos__d_drawlist.bin + header: assets/l_bonbori2Pos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_bonbori2DL binary: assets/l_bonbori2DL.bin header: assets/l_bonbori2DL.h @@ -2188,6 +2273,13 @@ extract: binary: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.bin header: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.h rename: l_matDL +- symbol: l_shadowVolPos + binary: assets/l_shadowVolPos__d_drawlist.bin + header: assets/l_shadowVolPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_shadowVolDL binary: assets/l_shadowVolDL.bin header: assets/l_shadowVolDL.h @@ -2206,6 +2298,13 @@ extract: - symbol: l_backSubMat binary: assets/l_backSubMat.bin header: assets/l_backSubMat.h +- symbol: l_simpleShadowPos + binary: assets/l_simpleShadowPos__d_drawlist.bin + header: assets/l_simpleShadowPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_shadowVolumeDL binary: assets/l_shadowVolumeDL.bin header: assets/l_shadowVolumeDL.h @@ -2233,6 +2332,27 @@ extract: - symbol: l_Txq_bessou_hanaTEX binary: assets/l_Txq_bessou_hanaTEX.bin header: assets/l_Txq_bessou_hanaTEX.h +- symbol: l_pos3 + binary: assets/l_pos3__d_flower.bin + header: assets/l_pos3__d_flower.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_color3 + binary: assets/l_color3__d_flower.bin + header: assets/l_color3__d_flower.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_texCoord3 + binary: assets/l_texCoord3__d_flower.bin + header: assets/l_texCoord3__d_flower.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_QbsafDL binary: assets/l_QbsafDL.bin header: assets/l_QbsafDL.h @@ -2242,6 +2362,21 @@ extract: - symbol: l_Txo_ob_flower_white_64x64TEX binary: assets/l_Txo_ob_flower_white_64x64TEX.bin header: assets/l_Txo_ob_flower_white_64x64TEX.h +- symbol: l_pos!.data:0x80375F40 + binary: assets/l_pos__d_flower.bin + header: assets/l_pos__d_flower.h + header_type: none + custom_type: Vec +- symbol: l_color!.sdata:0x803E9748 + binary: assets/l_color__d_flower.bin + header: assets/l_color__d_flower.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x80376180 + binary: assets/l_texCoord__d_flower.bin + header: assets/l_texCoord__d_flower.h + header_type: none + custom_type: cXy - symbol: l_OhanaDL binary: assets/l_OhanaDL.bin header: assets/l_OhanaDL.h @@ -2251,6 +2386,27 @@ extract: - symbol: l_Txo_ob_flower_pink_64x64TEX binary: assets/l_Txo_ob_flower_pink_64x64TEX.bin header: assets/l_Txo_ob_flower_pink_64x64TEX.h +- symbol: l_pos2 + binary: assets/l_pos2__d_flower.bin + header: assets/l_pos2__d_flower.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_color2 + binary: assets/l_color2__d_flower.bin + header: assets/l_color2__d_flower.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_texCoord2 + binary: assets/l_texCoord2__d_flower.bin + header: assets/l_texCoord2__d_flower.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_Ohana_highDL binary: assets/l_Ohana_highDL.bin header: assets/l_Ohana_highDL.h @@ -2277,6 +2433,24 @@ extract: binary: assets/l_Txa_swood_bTEX.bin header: assets/l_Txa_swood_bTEX.h rename: l_Txa_swood_bTEX +- symbol: l_pos__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_pos__d_wood.bin + header: assets/l_pos__d_wood.h + header_type: none + custom_type: Vec + rename: l_pos +- symbol: l_color__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_color__d_wood.bin + header: assets/l_color__d_wood.h + header_type: none + custom_type: GXColor + rename: l_color +- symbol: l_texCoord__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_texCoord__d_wood.bin + header: assets/l_texCoord__d_wood.h + header_type: none + custom_type: cXy + rename: l_texCoord - symbol: l_Oba_swood_bDL__Q25dWood20@unnamed@d_wood_cpp@ binary: assets/l_Oba_swood_bDL.bin header: assets/l_Oba_swood_bDL.h @@ -2295,6 +2469,21 @@ extract: - symbol: l_Txa_swood_aTEX binary: assets/l_Txa_swood_aTEX.bin header: assets/l_Txa_swood_aTEX.h +- symbol: l_pos!.data:0x8036D980 + binary: assets/l_pos__d_tree.bin + header: assets/l_pos__d_tree.h + header_type: none + custom_type: Vec +- symbol: l_color!.data:0x8036DD4C + binary: assets/l_color__d_tree.bin + header: assets/l_color__d_tree.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x8036DD74 + binary: assets/l_texCoord__d_tree.bin + header: assets/l_texCoord__d_tree.h + header_type: none + custom_type: cXy - symbol: l_Oba_swood_noneDL binary: assets/l_Oba_swood_noneDL.bin header: assets/l_Oba_swood_noneDL.h @@ -2332,6 +2521,16 @@ extract: - symbol: l_chainS3TCTEX!.data:0x80369e80 binary: assets/l_chainS3TCTEX__d_chain.bin header: assets/l_chainS3TCTEX__d_chain.h +- symbol: l_pos!.data:0x8036A080 + binary: assets/l_pos__d_chain.bin + header: assets/l_pos__d_chain.h + header_type: none + custom_type: Vec +- symbol: l_texCoord!.data:0x8036A110 + binary: assets/l_texCoord__d_chain.bin + header: assets/l_texCoord__d_chain.h + header_type: none + custom_type: cXy - symbol: l_chainDL!.data:0x8036a180 binary: assets/l_chainDL__d_chain.bin header: assets/l_chainDL__d_chain.h @@ -2344,6 +2543,16 @@ extract: - symbol: l_chainS3TCTEX!.data:0x8037f3e0 binary: assets/l_chainS3TCTEX__d_hookshot.bin header: assets/l_chainS3TCTEX__d_hookshot.h +- symbol: l_pos!.data:0x8037F5E0 + binary: assets/l_pos__d_hookshot.bin + header: assets/l_pos__d_hookshot.h + header_type: none + custom_type: Vec +- symbol: l_texCoord!.data:0x8037F670 + binary: assets/l_texCoord__d_hookshot.bin + header: assets/l_texCoord__d_hookshot.h + header_type: none + custom_type: cXy - symbol: l_chainDL!.data:0x8037f6e0 binary: assets/l_chainDL__d_hookshot.bin header: assets/l_chainDL__d_hookshot.h @@ -2353,12 +2562,26 @@ extract: header_type: none custom_type: matDL +- symbol: l_YfloorPos + binary: assets/l_YfloorPos__d_magma.bin + header: assets/l_YfloorPos__d_magma.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_YfloorDL binary: assets/l_YfloorDL.bin header: assets/l_YfloorDL.h - symbol: l_YfloorMatDL binary: assets/l_YfloorMatDL.bin header: assets/l_YfloorMatDL.h +- symbol: l_YballPos + binary: assets/l_YballPos__d_magma.bin + header: assets/l_YballPos__d_magma.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_YballDL binary: assets/l_YballDL.bin header: assets/l_YballDL.h @@ -2369,6 +2592,27 @@ extract: - symbol: l_K_kusa_00TEX binary: assets/l_K_kusa_00TEX.bin header: assets/l_K_kusa_00TEX.h +- symbol: l_Vmori_pos + binary: assets/l_Vmori_pos.bin + header: assets/l_Vmori_pos.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_Vmori_color + binary: assets/l_Vmori_color.bin + header: assets/l_Vmori_color.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_Vmori_texCoord + binary: assets/l_Vmori_texCoord.bin + header: assets/l_Vmori_texCoord.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_Vmori_00DL binary: assets/l_Vmori_00DL.bin header: assets/l_Vmori_00DL.h @@ -2383,6 +2627,21 @@ extract: - symbol: l_Txa_ob_kusa_aTEX binary: assets/l_Txa_ob_kusa_aTEX.bin header: assets/l_Txa_ob_kusa_aTEX.h +- symbol: l_pos!.data:0x8036CC60 + binary: assets/l_pos__d_grass.bin + header: assets/l_pos__d_grass.h + header_type: none + custom_type: Vec +- symbol: l_color!.data:0x8036CDA4 + binary: assets/l_color__d_grass.bin + header: assets/l_color__d_grass.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x8036CDC4 + binary: assets/l_texCoord__d_grass.bin + header: assets/l_texCoord__d_grass.h + header_type: none + custom_type: cXy - symbol: l_Oba_kusa_aDL binary: assets/l_Oba_kusa_aDL.bin header: assets/l_Oba_kusa_aDL.h diff --git a/config/GZLP01/config.yml b/config/GZLP01/config.yml index 92dff7b5..fb547fbb 100644 --- a/config/GZLP01/config.yml +++ b/config/GZLP01/config.yml @@ -227,6 +227,16 @@ modules: - symbol: l_flag02TEX binary: assets/l_flag02TEX.bin header: assets/l_flag02TEX.h + - symbol: l_majuu_flag_pos + binary: assets/l_majuu_flag_pos.bin + header: assets/l_majuu_flag_pos.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_majuu_flag.bin + header: assets/l_texCoord__d_a_majuu_flag.h + header_type: none + custom_type: cXy - symbol: l_majuu_flag_matDL binary: assets/l_majuu_flag_matDL.bin header: assets/l_majuu_flag_matDL.h @@ -454,6 +464,16 @@ modules: symbols: config/GZLP01/rels/d_a_pirate_flag/symbols.txt ldscript_template: config/GZLE01/rels/ldscript.tpl extract: + - symbol: l_pos + binary: assets/l_pos__d_a_pirate_flag.bin + header: assets/l_pos__d_a_pirate_flag.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_pirate_flag.bin + header: assets/l_texCoord__d_a_pirate_flag.h + header_type: none + custom_type: cXy - symbol: l_pirate_flag_DL binary: assets/l_pirate_flag_DL.bin header: assets/l_pirate_flag_DL.h @@ -1050,8 +1070,10 @@ modules: binary: assets/l_B_sand2TEX.bin header: assets/l_B_sand2TEX.h - symbol: l_texCoord - binary: assets/l_texCoord.bin - header: assets/l_texCoord.h + binary: assets/l_texCoord__d_a_bwdg.bin + header: assets/l_texCoord__d_a_bwdg.h + header_type: none + custom_type: cXy - symbol: l_Hsand1DL binary: assets/l_Hsand1DL.bin header: assets/l_Hsand1DL.h @@ -1139,6 +1161,16 @@ modules: - symbol: l_txa_dummy_hataTEX binary: assets/l_txa_dummy_hataTEX.bin header: assets/l_txa_dummy_hataTEX.h + - symbol: l_pos + binary: assets/l_pos__d_a_goal_flag.bin + header: assets/l_pos__d_a_goal_flag.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_goal_flag.bin + header: assets/l_texCoord__d_a_goal_flag.h + header_type: none + custom_type: cXy - symbol: l_goal_flag_DL binary: assets/l_goal_flag_DL.bin header: assets/l_goal_flag_DL.h @@ -1984,6 +2016,16 @@ modules: symbols: config/GZLP01/rels/d_a_sail/symbols.txt ldscript_template: config/GZLE01/rels/ldscript.tpl extract: + - symbol: l_pos + binary: assets/l_pos__d_a_sail.bin + header: assets/l_pos__d_a_sail.h + header_type: none + custom_type: Vec + - symbol: l_texCoord + binary: assets/l_texCoord__d_a_sail.bin + header: assets/l_texCoord__d_a_sail.h + header_type: none + custom_type: cXy - symbol: l_sail_DL binary: assets/l_sail_DL.bin header: assets/l_sail_DL.h @@ -1993,6 +2035,21 @@ modules: - symbol: l_Txa_kizoku_mastTEX binary: assets/l_Txa_kizoku_mastTEX.bin header: assets/l_Txa_kizoku_mastTEX.h + - symbol: l_mast_pos + binary: assets/l_mast_pos__d_a_sail.bin + header: assets/l_mast_pos__d_a_sail.h + header_type: none + custom_type: Vec + - symbol: l_mast_color + binary: assets/l_mast_color__d_a_sail.bin + header: assets/l_mast_color__d_a_sail.h + header_type: none + custom_type: GXColor + - symbol: l_mast_texCoord + binary: assets/l_mast_texCoord__d_a_sail.bin + header: assets/l_mast_texCoord__d_a_sail.h + header_type: none + custom_type: cXy - symbol: l_AmastDL binary: assets/l_AmastDL.bin header: assets/l_AmastDL.h @@ -2184,15 +2241,43 @@ extract: - symbol: l_frontNoZSubMat binary: assets/l_frontNoZSubMat.bin header: assets/l_frontNoZSubMat.h +- symbol: l_bonboriPos + binary: assets/l_bonboriPos__d_drawlist.bin + header: assets/l_bonboriPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_bonboriDL binary: assets/l_bonboriDL.bin header: assets/l_bonboriDL.h +- symbol: l_s_beam_checkPos + binary: assets/l_s_beam_checkPos__d_drawlist.bin + header: assets/l_s_beam_checkPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_s_beam_checkDL binary: assets/l_s_beam_checkDL.bin header: assets/l_s_beam_checkDL.h +- symbol: l_cubePos + binary: assets/l_cubePos__d_drawlist.bin + header: assets/l_cubePos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_cubeDL binary: assets/l_cubeDL.bin header: assets/l_cubeDL.h +- symbol: l_bonbori2Pos + binary: assets/l_bonbori2Pos__d_drawlist.bin + header: assets/l_bonbori2Pos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_bonbori2DL binary: assets/l_bonbori2DL.bin header: assets/l_bonbori2DL.h @@ -2200,6 +2285,13 @@ extract: binary: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.bin header: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.h rename: l_matDL +- symbol: l_shadowVolPos + binary: assets/l_shadowVolPos__d_drawlist.bin + header: assets/l_shadowVolPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_shadowVolDL binary: assets/l_shadowVolDL.bin header: assets/l_shadowVolDL.h @@ -2218,6 +2310,13 @@ extract: - symbol: l_backSubMat binary: assets/l_backSubMat.bin header: assets/l_backSubMat.h +- symbol: l_simpleShadowPos + binary: assets/l_simpleShadowPos__d_drawlist.bin + header: assets/l_simpleShadowPos__d_drawlist.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_shadowVolumeDL binary: assets/l_shadowVolumeDL.bin header: assets/l_shadowVolumeDL.h @@ -2245,6 +2344,27 @@ extract: - symbol: l_Txq_bessou_hanaTEX binary: assets/l_Txq_bessou_hanaTEX.bin header: assets/l_Txq_bessou_hanaTEX.h +- symbol: l_pos3 + binary: assets/l_pos3__d_flower.bin + header: assets/l_pos3__d_flower.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_color3 + binary: assets/l_color3__d_flower.bin + header: assets/l_color3__d_flower.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_texCoord3 + binary: assets/l_texCoord3__d_flower.bin + header: assets/l_texCoord3__d_flower.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_QbsafDL binary: assets/l_QbsafDL.bin header: assets/l_QbsafDL.h @@ -2254,6 +2374,21 @@ extract: - symbol: l_Txo_ob_flower_white_64x64TEX binary: assets/l_Txo_ob_flower_white_64x64TEX.bin header: assets/l_Txo_ob_flower_white_64x64TEX.h +- symbol: l_pos!.data:0x80389780 + binary: assets/l_pos__d_flower.bin + header: assets/l_pos__d_flower.h + header_type: none + custom_type: Vec +- symbol: l_color!.sdata:0x803FDA60 + binary: assets/l_color__d_flower.bin + header: assets/l_color__d_flower.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x803899C0 + binary: assets/l_texCoord__d_flower.bin + header: assets/l_texCoord__d_flower.h + header_type: none + custom_type: cXy - symbol: l_OhanaDL binary: assets/l_OhanaDL.bin header: assets/l_OhanaDL.h @@ -2263,6 +2398,27 @@ extract: - symbol: l_Txo_ob_flower_pink_64x64TEX binary: assets/l_Txo_ob_flower_pink_64x64TEX.bin header: assets/l_Txo_ob_flower_pink_64x64TEX.h +- symbol: l_pos2 + binary: assets/l_pos2__d_flower.bin + header: assets/l_pos2__d_flower.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_color2 + binary: assets/l_color2__d_flower.bin + header: assets/l_color2__d_flower.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_texCoord2 + binary: assets/l_texCoord2__d_flower.bin + header: assets/l_texCoord2__d_flower.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_Ohana_highDL binary: assets/l_Ohana_highDL.bin header: assets/l_Ohana_highDL.h @@ -2289,6 +2445,24 @@ extract: binary: assets/l_Txa_swood_bTEX.bin header: assets/l_Txa_swood_bTEX.h rename: l_Txa_swood_bTEX +- symbol: l_pos__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_pos__d_wood.bin + header: assets/l_pos__d_wood.h + header_type: none + custom_type: Vec + rename: l_pos +- symbol: l_color__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_color__d_wood.bin + header: assets/l_color__d_wood.h + header_type: none + custom_type: GXColor + rename: l_color +- symbol: l_texCoord__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_texCoord__d_wood.bin + header: assets/l_texCoord__d_wood.h + header_type: none + custom_type: cXy + rename: l_texCoord - symbol: l_Oba_swood_bDL__Q25dWood20@unnamed@d_wood_cpp@ binary: assets/l_Oba_swood_bDL.bin header: assets/l_Oba_swood_bDL.h @@ -2307,6 +2481,21 @@ extract: - symbol: l_Txa_swood_aTEX binary: assets/l_Txa_swood_aTEX.bin header: assets/l_Txa_swood_aTEX.h +- symbol: l_pos!.data:0x803811C0 + binary: assets/l_pos__d_tree.bin + header: assets/l_pos__d_tree.h + header_type: none + custom_type: Vec +- symbol: l_color!.data:0x8038158C + binary: assets/l_color__d_tree.bin + header: assets/l_color__d_tree.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x803815B4 + binary: assets/l_texCoord__d_tree.bin + header: assets/l_texCoord__d_tree.h + header_type: none + custom_type: cXy - symbol: l_Oba_swood_noneDL binary: assets/l_Oba_swood_noneDL.bin header: assets/l_Oba_swood_noneDL.h @@ -2344,6 +2533,16 @@ extract: - symbol: l_chainS3TCTEX!.data:0x8037d6c0 binary: assets/l_chainS3TCTEX__d_chain.bin header: assets/l_chainS3TCTEX__d_chain.h +- symbol: l_pos!.data:0x8037D8C0 + binary: assets/l_pos__d_chain.bin + header: assets/l_pos__d_chain.h + header_type: none + custom_type: Vec +- symbol: l_texCoord!.data:0x8037D950 + binary: assets/l_texCoord__d_chain.bin + header: assets/l_texCoord__d_chain.h + header_type: none + custom_type: cXy - symbol: l_chainDL!.data:0x8037d9c0 binary: assets/l_chainDL__d_chain.bin header: assets/l_chainDL__d_chain.h @@ -2356,6 +2555,16 @@ extract: - symbol: l_chainS3TCTEX!.data:0x80392a20 binary: assets/l_chainS3TCTEX__d_hookshot.bin header: assets/l_chainS3TCTEX__d_hookshot.h +- symbol: l_pos!.data:0x80392C20 + binary: assets/l_pos__d_hookshot.bin + header: assets/l_pos__d_hookshot.h + header_type: none + custom_type: Vec +- symbol: l_texCoord!.data:0x80392CB0 + binary: assets/l_texCoord__d_hookshot.bin + header: assets/l_texCoord__d_hookshot.h + header_type: none + custom_type: cXy - symbol: l_chainDL!.data:0x80392d20 binary: assets/l_chainDL__d_hookshot.bin header: assets/l_chainDL__d_hookshot.h @@ -2365,12 +2574,26 @@ extract: header_type: none custom_type: matDL +- symbol: l_YfloorPos + binary: assets/l_YfloorPos__d_magma.bin + header: assets/l_YfloorPos__d_magma.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_YfloorDL binary: assets/l_YfloorDL.bin header: assets/l_YfloorDL.h - symbol: l_YfloorMatDL binary: assets/l_YfloorMatDL.bin header: assets/l_YfloorMatDL.h +- symbol: l_YballPos + binary: assets/l_YballPos__d_magma.bin + header: assets/l_YballPos__d_magma.h + header_type: none + custom_type: Vec + custom_data: + scope: global - symbol: l_YballDL binary: assets/l_YballDL.bin header: assets/l_YballDL.h @@ -2381,6 +2604,27 @@ extract: - symbol: l_K_kusa_00TEX binary: assets/l_K_kusa_00TEX.bin header: assets/l_K_kusa_00TEX.h +- symbol: l_Vmori_pos + binary: assets/l_Vmori_pos.bin + header: assets/l_Vmori_pos.h + header_type: none + custom_type: Vec + custom_data: + scope: global +- symbol: l_Vmori_color + binary: assets/l_Vmori_color.bin + header: assets/l_Vmori_color.h + header_type: none + custom_type: GXColor + custom_data: + scope: global +- symbol: l_Vmori_texCoord + binary: assets/l_Vmori_texCoord.bin + header: assets/l_Vmori_texCoord.h + header_type: none + custom_type: cXy + custom_data: + scope: global - symbol: l_Vmori_00DL binary: assets/l_Vmori_00DL.bin header: assets/l_Vmori_00DL.h @@ -2395,6 +2639,21 @@ extract: - symbol: l_Txa_ob_kusa_aTEX binary: assets/l_Txa_ob_kusa_aTEX.bin header: assets/l_Txa_ob_kusa_aTEX.h +- symbol: l_pos!.data:0x803804A0 + binary: assets/l_pos__d_grass.bin + header: assets/l_pos__d_grass.h + header_type: none + custom_type: Vec +- symbol: l_color!.data:0x803805E4 + binary: assets/l_color__d_grass.bin + header: assets/l_color__d_grass.h + header_type: none + custom_type: GXColor +- symbol: l_texCoord!.data:0x80380604 + binary: assets/l_texCoord__d_grass.bin + header: assets/l_texCoord__d_grass.h + header_type: none + custom_type: cXy - symbol: l_Oba_kusa_aDL binary: assets/l_Oba_kusa_aDL.bin header: assets/l_Oba_kusa_aDL.h diff --git a/include/d/d_flower.h b/include/d/d_flower.h index e811c7ab..ffb772cb 100644 --- a/include/d/d_flower.h +++ b/include/d/d_flower.h @@ -88,9 +88,9 @@ public: /* 0x45F8 */ s16 field_0x45f8; /* 0x45FA */ u8 field_0x45FA[0x45FC - 0x45FA]; /* 0x45FC */ cXyz field_0x45fc; - /* 0x4608 */ f32* field_0x4608; + /* 0x4608 */ Vec* field_0x4608; /* 0x460C */ GXColor* field_0x460c; - /* 0x4610 */ f32* field_0x4610; + /* 0x4610 */ cXy* field_0x4610; /* 0x4614 */ void* field_0x4614; /* 0x4618 */ u32 field_0x4618; /* 0x461C */ void* field_0x461c; diff --git a/include/d/d_grass.h b/include/d/d_grass.h index d08d4ba0..e8c58994 100644 --- a/include/d/d_grass.h +++ b/include/d/d_grass.h @@ -79,9 +79,9 @@ public: /* 0x00014 */ dGrass_data_c mGrassData[1500]; /* 0x18E84 */ dGrass_anm_c mGrassAnm[104]; /* 0x1A544 */ dGrass_room_c mGrassRoom[64]; - /* 0x1A644 */ f32* mpPosArr; + /* 0x1A644 */ Vec* mpPosArr; /* 0x1A648 */ GXColor* mpColorArr; - /* 0x1A64C */ f32* mpTexCoordArr; + /* 0x1A64C */ cXy* mpTexCoordArr; /* 0x1A650 */ void* mpMatDL; /* 0x1A654 */ u32 mMatDLSize; /* 0x1A658 */ void* mpDL; diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp index 596c687c..38da876f 100644 --- a/src/d/actor/d_a_bwdg.cpp +++ b/src/d/actor/d_a_bwdg.cpp @@ -17,7 +17,7 @@ static bwd_class* boss; #include "assets/l_B_sand2TEX.h" const u16 l_B_sand2TEX__width = 512; const u16 l_B_sand2TEX__height = 256; -#include "assets/l_texCoord.h" +#include "assets/l_texCoord__d_a_bwdg.h" #include "assets/l_Hsand1DL.h" #include "assets/l_matDL__d_a_bwdg.h" l_matDL__d_a_bwdg(l_B_sand2TEX); diff --git a/src/d/actor/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp index b3abd288..4c8e13bc 100644 --- a/src/d/actor/d_a_goal_flag.cpp +++ b/src/d/actor/d_a_goal_flag.cpp @@ -15,105 +15,12 @@ #include "res/Object/Gflag.h" #include "res/Object/Tgflag.h" #include "d/d_path.h" - -#include "assets/l_txa_dummy_hataTEX.h" #include "m_Do/m_Do_controller_pad.h" -static Vec l_pos[] = { - { -1000.0f, 0.0f, 0.0f }, - { -750.0f, 0.0f, 0.0f }, - { -500.0f, 0.0f, 0.0f }, - { -250.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - { 250.0f, 0.0f, 0.0f }, - { 500.0f, 0.0f, 0.0f }, - { 750.0f, 0.0f, 0.0f }, - { 1000.0f, 0.0f, 0.0f }, - { -1000.0f, -100.0f, 0.0f }, - { -750.0f, -100.0f, 0.0f }, - { -500.0f, -100.0f, 0.0f }, - { -250.0f, -100.0f, 0.0f }, - { 0.0f, -100.0f, 0.0f }, - { 250.0f, -100.0f, 0.0f }, - { 500.0f, -100.0f, 0.0f }, - { 750.0f, -100.0f, 0.0f }, - { 1000.0f, -100.0f, 0.0f }, - { -1000.0f, -200.0f, 0.0f }, - { -750.0f, -200.0f, 0.0f }, - { -500.0f, -200.0f, 0.0f }, - { -250.0f, -200.0f, 0.0f }, - { 0.0f, -200.0f, 0.0f }, - { 250.0f, -200.0f, 0.0f }, - { 500.0f, -200.0f, 0.0f }, - { 750.0f, -200.0f, 0.0f }, - { 1000.0f, -200.0f, 0.0f }, - { -1000.0f, -300.0f, 0.0f }, - { -750.0f, -300.0f, 0.0f }, - { -500.0f, -300.0f, 0.0f }, - { -250.0f, -300.0f, 0.0f }, - { 0.0f, -300.0f, 0.0f }, - { 250.0f, -300.0f, 0.0f }, - { 500.0f, -300.0f, 0.0f }, - { 750.0f, -300.0f, 0.0f }, - { 1000.0f, -300.0f, 0.0f }, - { -1000.0f, -400.0f, 0.0f }, - { -750.0f, -400.0f, 0.0f }, - { -500.0f, -400.0f, 0.0f }, - { -250.0f, -400.0f, 0.0f }, - { 0.0f, -400.0f, 0.0f }, - { 250.0f, -400.0f, 0.0f }, - { 500.0f, -400.0f, 0.0f }, - { 750.0f, -400.0f, 0.0f }, - { 1000.0f, -400.0f, 0.0f } -}; +#include "assets/l_txa_dummy_hataTEX.h" -static cXy l_texCoord[] = { - { 1.0f, 0.0f }, - { 0.875f, 0.0f }, - { 0.75f, 0.0f }, - { 0.625f, 0.0f }, - { 0.5f, 0.0f }, - { 0.375f, 0.0f }, - { 0.25f, 0.0f }, - { 0.125f, 0.0f }, - { 0.0f, 0.0f }, - { 1.0f, 0.25f }, - { 0.875f, 0.25f }, - { 0.75f, 0.25f }, - { 0.625f, 0.25f }, - { 0.5f, 0.25f }, - { 0.375f, 0.25f }, - { 0.25f, 0.25f }, - { 0.125f, 0.25f }, - { 0.0f, 0.25f }, - { 1.0f, 0.5f }, - { 0.875f, 0.5f }, - { 0.75f, 0.5f }, - { 0.625f, 0.5f }, - { 0.5f, 0.5f }, - { 0.375f, 0.5f }, - { 0.25f, 0.5f }, - { 0.125f, 0.5f }, - { 0.0f, 0.5f }, - { 1.0f, 0.75f }, - { 0.875f, 0.75f }, - { 0.75f, 0.75f }, - { 0.625f, 0.75f }, - { 0.5f, 0.75f }, - { 0.375f, 0.75f }, - { 0.25f, 0.75f }, - { 0.125f, 0.75f }, - { 0.0f, 0.75f }, - { 1.0f, 1.0f }, - { 0.875f, 1.0f }, - { 0.75f, 1.0f }, - { 0.625f, 1.0f }, - { 0.5f, 1.0f }, - { 0.375f, 1.0f }, - { 0.25f, 1.0f }, - { 0.125f, 1.0f }, - { 0.0f, 1.0f } -}; +#include "assets/l_pos__d_a_goal_flag.h" +#include "assets/l_texCoord__d_a_goal_flag.h" #include "assets/l_goal_flag_DL.h" #include "assets/l_goal_flag_matDL.h" diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index a8f74f01..c994ef06 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -15,35 +15,8 @@ const u16 l_chainS3TCTEX__width = 32; const u16 l_chainS3TCTEX__height = 32; -static Vec l_pos[] = { - {-2.0f, 1.522254f, -0.0f}, - {-2.0f, 1.522254f, 7.0f}, - {2.0f, 1.522254f, -0.0f}, - {-3.5f, 0.0f, -1.5f}, - {-3.5f, 0.0f, 8.5f}, - {3.5f, 0.0f, -1.5f}, - {-2.0f, -1.522254f, -0.0f}, - {-2.0f, -1.522254f, 7.0f}, - {2.0f, -1.522254f, -0.0f}, - {2.0f, 1.522254f, 7.0f}, - {3.5f, 0.0f, 8.5f}, - {2.0f, -1.522254f, 7.0f}, -}; - -static cXy l_texCoord[] = { - {0.02736f, 0.041406f}, - {0.97264f, 0.041406f}, - {0.830848f, 0.40324f}, - {0.169152f, 0.40324f}, - {0.03125f, 0.0f}, - {0.96875f, 0.0f}, - {0.767857f, 0.494086f}, - {0.232143f, 0.494086f}, - {0.038462f, 0.48226f}, - {0.038462f, 0.983522f}, - {0.961538f, 0.48226f}, - {0.961538f, 0.983522f}, -}; +#include "assets/l_pos__d_hookshot.h" +#include "assets/l_texCoord__d_hookshot.h" #include "assets/l_chainDL__d_hookshot.h" diff --git a/src/d/actor/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp index 241a0a8b..9a5e8d92 100644 --- a/src/d/actor/d_a_majuu_flag.cpp +++ b/src/d/actor/d_a_majuu_flag.cpp @@ -61,98 +61,8 @@ static u8 unused1[16] = {0}; // IWYU pragma: keep #include "assets/l_flag02TEX.h" -static Vec l_majuu_flag_pos[] = { - {0.0f, -255.0f, 1300.0f}, {0.0f, -306.0f, 1040.0f}, {0.0f, -204.0f, 1040.0f}, {0.0f, -357.0f, 780.0f}, {0.0f, -255.0f, 780.0f}, {0.0f, -153.0f, 780.0f}, - {0.0f, -408.0f, 520.0f}, {0.0f, -306.0f, 520.0f}, {0.0f, -204.0f, 520.0f}, {0.0f, -102.0f, 520.0f}, {0.0f, -459.0f, 260.0f}, {0.0f, -357.0f, 260.0f}, - {0.0f, -255.0f, 260.0f}, {0.0f, -153.0f, 260.0f}, {0.0f, -51.0f, 260.0f}, {0.0f, -510.0f, 0.0f}, {0.0f, -408.0f, 0.0f}, {0.0f, -306.0f, 0.0f}, - {0.0f, -204.0f, 0.0f}, {0.0f, -102.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, -}; -static f32 l_texCoord[][2] = { - { - -0.280444f, - 1.069755f, - }, - { - 0.241439f, - 0.90587097f, - }, - { - 0.24137f, - 1.10964f, - }, - { - 0.91434f, - 0.707848f, - }, - { - 0.91426998f, - 1.069345f, - }, - { - 1.352905f, - 0.52748799f, - }, - { - 1.352837f, - 0.954527f, - }, - { - 1.39049f, - 0.34673199f, - }, - { - 1.390421f, - 0.70902097f, - }, - { - -0.28037399f, - 0.70746398f, - }, - { - 0.241509f, - 0.52670997f, - }, - { - 0.91441f, - 0.346349f, - }, - { - 1.352974f, - 0.100449f, - }, - { - -0.280306f, - 0.34517899f, - }, - { - 0.241579f, - 0.147549f, - }, - { - 0.91447997f, - -0.015147f, - }, - { - -0.28023499f, - -0.017113f, - }, - { - 0.241649f, - -0.186406f, - }, - { - -0.27530599f, - 1.1664619f, - }, - { - -0.280164f, - -0.061744f, - }, - { - 1.396762f, - 0.528265f, - }, -}; +#include "assets/l_majuu_flag_pos.h" +#include "assets/l_texCoord__d_a_majuu_flag.h" #include "assets/l_majuu_flagDL.h" #include "assets/l_majuu_flag_matDL.h" diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp index baec29ad..a6ad7548 100644 --- a/src/d/actor/d_a_pirate_flag.cpp +++ b/src/d/actor/d_a_pirate_flag.cpp @@ -43,69 +43,8 @@ public: /* 0x1C */ f32 m1C; }; -static Vec l_pos[25] = { - {0.0f, 2200.0f, 0.0f}, - {0.0f, 2200.0f, 200.0f}, - {0.0f, 2200.0f, 400.0f}, - {0.0f, 2200.0f, 600.0f}, - {0.0f, 2200.0f, 800.0f}, - - {0.0f, 2100.0f, 0.0f}, - {0.0f, 2100.0f, 200.0f}, - {0.0f, 2100.0f, 400.0f}, - {0.0f, 2100.0f, 600.0f}, - {0.0f, 2100.0f, 800.0f}, - - {0.0f, 2000.0f, 0.0f}, - {0.0f, 2000.0f, 200.0f}, - {0.0f, 2000.0f, 400.0f}, - {0.0f, 2000.0f, 600.0f}, - {0.0f, 2000.0f, 800.0f}, - - {0.0f, 1900.0f, 0.0f}, - {0.0f, 1900.0f, 200.0f}, - {0.0f, 1900.0f, 400.0f}, - {0.0f, 1900.0f, 600.0f}, - {0.0f, 1900.0f, 800.0f}, - - {0.0f, 1800.0f, 0.0f}, - {0.0f, 1800.0f, 200.0f}, - {0.0f, 1800.0f, 400.0f}, - {0.0f, 1800.0f, 600.0f}, - {0.0f, 1800.0f, 800.0f}, -}; - -static cXy l_texCoord[] = { - {0.0f, 0.0f}, - {0.25f, 0.0f}, - {0.5f, 0.0f}, - {0.75f, 0.0f}, - {1.0f, 0.0f}, - - {0.0f, 0.25f}, - {0.25f, 0.25f}, - {0.5f, 0.25f}, - {0.75f, 0.25f}, - {1.0f, 0.25f}, - - {0.0f, 0.5f}, - {0.25f, 0.5f}, - {0.5f, 0.5f}, - {0.75f, 0.5f}, - {1.0f, 0.5f}, - - {0.0f, 0.75f}, - {0.25f, 0.75f}, - {0.5f, 0.75f}, - {0.75f, 0.75f}, - {1.0f, 0.75f}, - - {0.0f, 1.0f}, - {0.25f, 1.0f}, - {0.5f, 1.0f}, - {0.75f, 1.0f}, - {1.0f, 1.0f}, -}; +#include "assets/l_pos__d_a_pirate_flag.h" +#include "assets/l_texCoord__d_a_pirate_flag.h" #include "assets/l_pirate_flag_DL.h" #include "assets/l_pirate_flag_matDL.h" diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp index f33e3268..c66e48cc 100644 --- a/src/d/actor/d_a_sail.cpp +++ b/src/d/actor/d_a_sail.cpp @@ -55,228 +55,16 @@ public: static daObjPirateship::Act_c* l_p_ship; static daSail_HIO_c l_HIO; -static Vec l_pos[] = { - {-840.0f, 0.0f, 0.0f}, - {-560.0f, 0.0f, 0.0f}, - {-280.0f, 0.0f, 0.0f}, - {0.0f, 0.0f, 0.0f}, - {280.0f, 0.0f, 0.0f}, - {560.0f, 0.0f, 0.0f}, - {840.0f, 0.0f, 0.0f}, - {-840.0f, -100.0f, 0.0f}, - {-560.0f, -100.0f, 0.0f}, - {-280.0f, -100.0f, 0.0f}, - {0.0f, -100.0f, 0.0f}, - {280.0f, -100.0f, 0.0f}, - {560.0f, -100.0f, 0.0f}, - {840.0f, -100.0f, 0.0f}, - {-840.0f, -200.0f, 0.0f}, - {-560.0f, -200.0f, 0.0f}, - {-280.0f, -200.0f, 0.0f}, - {0.0f, -200.0f, 0.0f}, - {280.0f, -200.0f, 0.0f}, - {560.0f, -200.0f, 0.0f}, - {840.0f, -200.0f, 0.0f}, - {-840.0f, -300.0f, 0.0f}, - {-560.0f, -300.0f, 0.0f}, - {-280.0f, -300.0f, 0.0f}, - {0.0f, -300.0f, 0.0f}, - {280.0f, -300.0f, 0.0f}, - {560.0f, -300.0f, 0.0f}, - {840.0f, -300.0f, 0.0f}, - {-840.0f, -400.0f, 0.0f}, - {-560.0f, -400.0f, 0.0f}, - {-280.0f, -400.0f, 0.0f}, - {0.0f, -400.0f, 0.0f}, - {280.0f, -400.0f, 0.0f}, - {560.0f, -400.0f, 0.0f}, - {840.0f, -400.0f, 0.0f}, - {-840.0f, -500.0f, 0.0f}, - {-560.0f, -500.0f, 0.0f}, - {-280.0f, -500.0f, 0.0f}, - {0.0f, -500.0f, 0.0f}, - {280.0f, -500.0f, 0.0f}, - {560.0f, -500.0f, 0.0f}, - {840.0f, -500.0f, 0.0f}, - {-840.0f, -600.0f, 0.0f}, - {-560.0f, -600.0f, 0.0f}, - {-280.0f, -600.0f, 0.0f}, - {0.0f, -600.0f, 0.0f}, - {280.0f, -600.0f, 0.0f}, - {560.0f, -600.0f, 0.0f}, - {840.0f, -600.0f, 0.0f}, - {-840.0f, -700.0f, 0.0f}, - {-560.0f, -700.0f, 0.0f}, - {-280.0f, -700.0f, 0.0f}, - {0.0f, -700.0f, 0.0f}, - {280.0f, -700.0f, 0.0f}, - {560.0f, -700.0f, 0.0f}, - {840.0f, -700.0f, 0.0f}, - {-840.0f, -800.0f, 0.0f}, - {-560.0f, -800.0f, 0.0f}, - {-280.0f, -800.0f, 0.0f}, - {0.0f, -800.0f, 0.0f}, - {280.0f, -800.0f, 0.0f}, - {560.0f, -800.0f, 0.0f}, - {840.0f, -800.0f, 0.0f}, - {-840.0f, -900.0f, 0.0f}, - {-560.0f, -900.0f, 0.0f}, - {-280.0f, -900.0f, 0.0f}, - {0.0f, -900.0f, 0.0f}, - {280.0f, -900.0f, 0.0f}, - {560.0f, -900.0f, 0.0f}, - {840.0f, -900.0f, 0.0f}, - {-840.0f, -1000.0f, 0.0f}, - {-560.0f, -1000.0f, 0.0f}, - {-280.0f, -1000.0f, 0.0f}, - {0.0f, -1000.0f, 0.0f}, - {280.0f, -1000.0f, 0.0f}, - {560.0f, -1000.0f, 0.0f}, - {840.0f, -1000.0f, 0.0f}, - {-840.0f, -1100.0f, 0.0f}, - {-560.0f, -1100.0f, 0.0f}, - {-280.0f, -1100.0f, 0.0f}, - {0.0f, -1100.0f, 0.0f}, - {280.0f, -1100.0f, 0.0f}, - {560.0f, -1100.0f, 0.0f}, - {840.0f, -1100.0f, 0.0f}, -}; - -static cXy l_texCoord[] = { - {0.0f, 0.0f}, - {0.165f, 0.0f}, - {0.33f, 0.0f}, - {0.495f, 0.0f}, - {0.66f, 0.0f}, - {0.825f, 0.0f}, - {1.0f, 0.0f}, - {0.0f, 0.09f}, - {0.165f, 0.09f}, - {0.33f, 0.09f}, - {0.495f, 0.09f}, - {0.66f, 0.09f}, - {0.825f, 0.09f}, - {1.0f, 0.09f}, - {0.0f, 0.18f}, - {0.165f, 0.18f}, - {0.33f, 0.18f}, - {0.495f, 0.18f}, - {0.66f, 0.18f}, - {0.825f, 0.18f}, - {1.0f, 0.18f}, - {0.0f, 0.27f}, - {0.165f, 0.27f}, - {0.33f, 0.27f}, - {0.495f, 0.27f}, - {0.66f, 0.27f}, - {0.825f, 0.27f}, - {1.0f, 0.27f}, - {0.0f, 0.36f}, - {0.165f, 0.36f}, - {0.33f, 0.36f}, - {0.495f, 0.36f}, - {0.66f, 0.36f}, - {0.825f, 0.36f}, - {1.0f, 0.36f}, - {0.0f, 0.45f}, - {0.165f, 0.45f}, - {0.33f, 0.45f}, - {0.495f, 0.45f}, - {0.66f, 0.45f}, - {0.825f, 0.45f}, - {1.0f, 0.45f}, - {0.0f, 0.54f}, - {0.165f, 0.54f}, - {0.33f, 0.54f}, - {0.495f, 0.54f}, - {0.66f, 0.54f}, - {0.825f, 0.54f}, - {1.0f, 0.54f}, - {0.0f, 0.63f}, - {0.165f, 0.63f}, - {0.33f, 0.63f}, - {0.495f, 0.63f}, - {0.66f, 0.63f}, - {0.825f, 0.63f}, - {1.0f, 0.63f}, - {0.0f, 0.72f}, - {0.165f, 0.72f}, - {0.33f, 0.72f}, - {0.495f, 0.72f}, - {0.66f, 0.72f}, - {0.825f, 0.72f}, - {1.0f, 0.72f}, - {0.0f, 0.81f}, - {0.165f, 0.81f}, - {0.33f, 0.81f}, - {0.495f, 0.81f}, - {0.66f, 0.81f}, - {0.825f, 0.81f}, - {1.0f, 0.81f}, - {0.0f, 0.9f}, - {0.165f, 0.9f}, - {0.33f, 0.9f}, - {0.495f, 0.9f}, - {0.66f, 0.9f}, - {0.825f, 0.9f}, - {1.0f, 0.9f}, - {0.0f, 1.0f}, - {0.165f, 1.0f}, - {0.33f, 1.0f}, - {0.495f, 1.0f}, - {0.66f, 1.0f}, - {0.825f, 1.0f}, - {1.0f, 1.0f}, -}; +#include "assets/l_pos__d_a_sail.h" +#include "assets/l_texCoord__d_a_sail.h" #include "assets/l_sail_DL.h" #include "assets/l_sail_matDL.h" #include "assets/l_Txa_kizoku_mastTEX.h" -static Vec l_mast_pos[] = { - {900.0f, 9.676933f, -16.760941f}, - {900.0f, -9.676933f, -16.760941f}, - {900.0f, -19.353867f, -0.000004f}, - {900.0f, -9.676933f, 16.760941f}, - {900.0f, 9.676933f, 16.760941f}, - {900.0f, 19.353867f, -0.000001f}, - {-900.0f, 9.676933f, -16.760941f}, - {-900.0f, -9.676933f, -16.760941f}, - {-900.0f, -19.353867f, -0.000004f}, - {-900.0f, -9.676933f, 16.760941f}, - {-900.0f, 9.676933f, 16.760941f}, - {-900.0f, 19.353867f, -0.000001f}, - {900.0f, -0.000001f, -0.000001f}, - {-900.0f, -0.000001f, -0.000001f}, - {0.0f, 6.105309f, 28.277588f}, - {0.0f, -26.54686f, 28.277588f}, - {0.0f, -42.875366f, -0.000005f}, - {0.0f, -26.546822f, -28.277588f}, - {0.0f, 6.105347f, -28.277588f}, - {0.0f, 22.42897f, 0.0f}, -}; - -static GXColor l_mast_color[] = { - {0xA8, 0xA8, 0xA8, 0xFF}, - {0x5D, 0x5D, 0x5D, 0xFF}, - {0xF3, 0xF3, 0xF3, 0xFF}, - {0xC6, 0xC6, 0xC6, 0xFF}, - {0x38, 0x38, 0x38, 0xFF}, - {0x56, 0x56, 0x56, 0xFF}, - {0x0B, 0x0B, 0x0B, 0xFF}, - {0xA1, 0xA1, 0xA1, 0xFF}, -}; - -static cXy l_mast_texCoord[] = { - {1.0f, 0.0f}, - {1.0f, 1.0f}, - {0.0f, 1.0f}, - {0.0f, 0.0f}, - {0.881686f, 1.0f}, - {0.89115f, 0.0f}, - {0.888606f, 1.0f}, - {0.888606f, 0.0f}, -}; +#include "assets/l_mast_pos__d_a_sail.h" +#include "assets/l_mast_color__d_a_sail.h" +#include "assets/l_mast_texCoord__d_a_sail.h" #include "assets/l_AmastDL.h" diff --git a/src/d/d_chain.cpp b/src/d/d_chain.cpp index 12666293..8826b9b9 100644 --- a/src/d/d_chain.cpp +++ b/src/d/d_chain.cpp @@ -13,35 +13,8 @@ const u16 l_chainS3TCTEX__width = 32; const u16 l_chainS3TCTEX__height = 32; -static Vec l_pos[] = { - { -2.0f, 1.522254f, -0.0f }, - { -2.0f, 1.522254f, 7.0f }, - { 2.0f, 1.522254f, -0.0f }, - { -3.5f, 0.0f, -1.5f }, - { -3.5f, 0.0f, 8.5f }, - { 3.5f, 0.0f, -1.5f }, - { -2.0f, -1.522254f, -0.0f }, - { -2.0f, -1.522254f, 7.0f }, - { 2.0f, -1.522254f, -0.0f }, - { 2.0f, 1.522254f, 7.0f }, - { 3.5f, 0.0f, 8.5f }, - { 2.0f, -1.522254f, 7.0f }, - -}; -static cXy l_texCoord[] = { - { 0.02736f, 0.041406f }, - { 0.97264f, 0.041406f }, - { 0.830848f, 0.40324f }, - { 0.169152f, 0.40324f }, - { 0.03125f, 0.0f }, - { 0.96875f, 0.0f }, - { 0.767857f, 0.494086f }, - { 0.232143f, 0.494086f }, - { 0.038462f, 0.48226f }, - { 0.038462f, 0.983522f }, - { 0.961538f, 0.48226f }, - { 0.961538f, 0.983522f }, -}; +#include "assets/l_pos__d_chain.h" +#include "assets/l_texCoord__d_chain.h" #include "assets/l_chainDL__d_chain.h" diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 6f8a0ed0..05528a2a 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -774,196 +774,20 @@ void dDlst_alphaModelData_c::set(u8 type, Mtx mtx, u8 alpha) { #include "assets/l_frontZMat.h" #include "assets/l_frontNoZSubMat.h" -static Vec l_bonboriPos[] = { - {0.0f, -200.0f, 0.0f}, - {0.0f, 200.0f, 0.0f}, - {100.0f, -173.205093f, 0.0f}, - {160.02063f, -100.0f, -66.282722f}, - {200.0f, 0.000006f, 0.0f}, - {160.020615f, 100.000008f, -66.282715f}, - {99.999992f, 173.205093f, 0.0f}, - {70.710678f, -173.205093f, -70.710678f}, - {66.282715f, -100.0f, -160.02063f}, - {141.421356f, 0.000006f, -141.421356f}, - {66.282707f, 100.000008f, -160.020615f}, - {70.71067f, 173.205093f, -70.71067f}, - {0.0f, -173.205093f, -100.0f}, - {-66.282722f, -100.0f, -160.02063f}, - {0.0f, 0.000006f, -200.0f}, - {-66.282715f, 100.000008f, -160.020615f}, - {0.0f, 173.205093f, -99.999985f}, - {-70.710678f, -173.205093f, -70.710678f}, - {-160.02063f, -100.0f, -66.282715f}, - {-141.421356f, 0.000006f, -141.421356f}, - {-160.020615f, 100.000008f, -66.282707f}, - {-70.710663f, 173.205093f, -70.710663f}, - {-100.0f, -173.205093f, 0.0f}, - {-160.02063f, -100.0f, 66.282722f}, - {-200.0f, 0.000006f, 0.0f}, - {-160.020615f, 100.000008f, 66.282715f}, - {-99.999985f, 173.205093f, 0.0f}, - {-70.710678f, -173.205093f, 70.710678f}, - {-66.282715f, -100.0f, 160.02063f}, - {-141.421356f, 0.000006f, 141.421356f}, - {-66.282707f, 100.000008f, 160.020615f}, - {-70.710663f, 173.205093f, 70.710663f}, - {0.0f, -173.205093f, 100.0f}, - {66.282722f, -100.0f, 160.02063f}, - {0.0f, 0.000006f, 200.0f}, - {66.282715f, 100.000008f, 160.020615f}, - {0.0f, 173.205093f, 99.999985f}, - {70.710678f, -173.205093f, 70.710678f}, - {160.02063f, -100.0f, 66.282715f}, - {141.421356f, 0.000006f, 141.421356f}, - {160.020615f, 100.000008f, 66.282707f}, - {70.710663f, 173.205093f, 70.710663f}, -}; +#include "assets/l_bonboriPos__d_drawlist.h" + #include "assets/l_bonboriDL.h" -static Vec l_s_beam_checkPos[] = { - {-97.608604f, -300.359589f, -0.000003f}, - {-255.533127f, -185.632721f, 0.000074f}, - {97.596741f, -300.359589f, -0.000003f}, - {255.521301f, -185.632492f, 0.000074f}, - {315.842987f, 0.00022f, 0.000074f}, - {255.521301f, 185.63269f, 0.000074f}, - {97.596741f, 300.359558f, 0.000074f}, - {-97.608643f, 300.359558f, 0.000074f}, - {-255.533127f, 185.632385f, 0.000074f}, - {-315.855103f, 0.000068f, 0.000074f}, - {449.556976f, 326.593872f, 9589.144531f}, - {-449.568787f, 326.593262f, 9589.144531f}, - {-171.723236f, 528.439392f, 9589.144531f}, - {171.711975f, 528.439392f, 9589.144531f}, - {555.685181f, 0.000297f, 9589.144531f}, - {-555.697266f, 0.000068f, 9589.144531f}, - {449.556976f, -326.593475f, 9589.144531f}, - {-449.568787f, -326.593842f, 9589.144531f}, - {171.711975f, -528.439453f, 9589.144531f}, - {-171.723236f, -528.439453f, 9589.144531f}, - {-178.75293f, -245.999161f, -0.000003f}, - {-0.005948f, -304.071503f, -0.000003f}, - {178.741028f, -245.999008f, -0.000003f}, - {289.212738f, -93.963249f, 0.000074f}, - {289.212738f, 93.963455f, 0.000074f}, - {178.741028f, 245.99913f, 0.000074f}, - {-0.005986f, 304.071564f, 0.000074f}, - {-178.75293f, 245.998978f, 0.000074f}, - {-289.224701f, 93.963226f, 0.000074f}, - {-289.224701f, -93.963333f, 0.000074f}, - {-326.284088f, 449.037415f, 9589.144531f}, - {-0.00591f, 555.040955f, 9589.144531f}, - {326.272583f, 449.037415f, 9589.144531f}, - {527.922791f, 171.517319f, 9589.144531f}, - {-527.934937f, 171.516785f, 9589.144531f}, - {527.922791f, -171.516815f, 9589.144531f}, - {-527.934937f, -171.517044f, 9589.144531f}, - {326.272583f, -449.037384f, 9589.144531f}, - {-0.005872f, -555.040894f, 9589.144531f}, - {-326.284027f, -449.037384f, 9589.144531f}, -}; +#include "assets/l_s_beam_checkPos__d_drawlist.h" + #include "assets/l_s_beam_checkDL.h" -static Vec l_cubePos[] = { - {-0.5f, -0.5f, -0.5f}, - {-0.5f, -0.5f, 0.5f}, - {-0.5f, 0.5f, -0.5f}, - {-0.5f, 0.5f, 0.5f}, - {0.5f, -0.5f, -0.5f}, - {0.5f, -0.5f, 0.5f}, - {0.5f, 0.5f, -0.5f}, - {0.5f, 0.5f, 0.5f}, -}; +#include "assets/l_cubePos__d_drawlist.h" + #include "assets/l_cubeDL.h" -static Vec l_bonbori2Pos[] = { - {33.141357f, -92.387955f, -19.134167f}, - {19.134172f, -92.387955f, -33.141354f}, - {0.000003f, -92.387955f, -38.268341f}, - {-19.134167f, -92.387955f, -33.141357f}, - {-33.141354f, -92.387955f, -19.134171f}, - {-38.268341f, -92.387955f, -0.000002f}, - {-33.141357f, -92.387955f, 19.134169f}, - {-19.134172f, -92.387955f, 33.141357f}, - {-0.000001f, -92.387955f, 38.268341f}, - {19.134171f, -92.387955f, 33.141357f}, - {33.141357f, -92.387955f, 19.134172f}, - {38.268345f, -92.387955f, 0.0f}, - {61.23724f, -70.710678f, -35.355331f}, - {35.355339f, -70.710678f, -61.237236f}, - {0.000005f, -70.710678f, -70.71067f}, - {-35.355331f, -70.710678f, -61.23724f}, - {-61.237236f, -70.710678f, -35.355335f}, - {-70.71067f, -70.710678f, -0.000003f}, - {-61.23724f, -70.710678f, 35.355331f}, - {-35.355339f, -70.710678f, 61.23724f}, - {-0.000002f, -70.710678f, 70.71067f}, - {35.355335f, -70.710678f, 61.237244f}, - {61.237244f, -70.710678f, 35.355339f}, - {70.710678f, -70.710678f, 0.0f}, - {80.010307f, -38.268341f, -46.193966f}, - {46.193977f, -38.268341f, -80.0103f}, - {0.000007f, -38.268341f, -92.387939f}, - {-46.193966f, -38.268341f, -80.010307f}, - {-80.0103f, -38.268341f, -46.193974f}, - {-92.387939f, -38.268341f, -0.000004f}, - {-80.010307f, -38.268341f, 46.193966f}, - {-46.193977f, -38.268341f, 80.010307f}, - {-0.000002f, -38.268341f, 92.387939f}, - {46.193974f, -38.268341f, 80.010307f}, - {80.010307f, -38.268341f, 46.193977f}, - {92.387955f, -38.268341f, 0.0f}, - {86.602531f, 0.0f, -49.999989f}, - {50.0f, 0.0f, -86.602524f}, - {0.000007f, 0.0f, -99.999992f}, - {-49.999989f, 0.0f, -86.602531f}, - {-86.602524f, 0.0f, -49.999996f}, - {-99.999992f, 0.0f, -0.000005f}, - {-86.602531f, 0.0f, 49.999989f}, - {-50.0f, 0.0f, 86.602531f}, - {-0.000003f, 0.0f, 99.999992f}, - {49.999996f, 0.0f, 86.602531f}, - {86.602531f, 0.0f, 50.0f}, - {100.0f, 0.0f, 0.0f}, - {80.010307f, 38.268341f, -46.193966f}, - {46.193977f, 38.268341f, -80.0103f}, - {0.000007f, 38.268341f, -92.387939f}, - {-46.193966f, 38.268341f, -80.010307f}, - {-80.0103f, 38.268341f, -46.193974f}, - {-92.387939f, 38.268341f, -0.000004f}, - {-80.010307f, 38.268341f, 46.193966f}, - {-46.193977f, 38.268341f, 80.010307f}, - {-0.000002f, 38.268341f, 92.387939f}, - {46.193974f, 38.268341f, 80.010307f}, - {80.010307f, 38.268341f, 46.193977f}, - {92.387955f, 38.268341f, 0.0f}, - {61.23724f, 70.710678f, -35.355331f}, - {35.355339f, 70.710678f, -61.237236f}, - {0.000005f, 70.710678f, -70.71067f}, - {-35.355331f, 70.710678f, -61.23724f}, - {-61.237236f, 70.710678f, -35.355335f}, - {-70.71067f, 70.710678f, -0.000003f}, - {-61.23724f, 70.710678f, 35.355331f}, - {-35.355339f, 70.710678f, 61.23724f}, - {-0.000002f, 70.710678f, 70.71067f}, - {35.355335f, 70.710678f, 61.237244f}, - {61.237244f, 70.710678f, 35.355339f}, - {70.710678f, 70.710678f, 0.0f}, - {33.141357f, 92.387955f, -19.134167f}, - {19.134172f, 92.387955f, -33.141354f}, - {0.000003f, 92.387955f, -38.268341f}, - {-19.134167f, 92.387955f, -33.141357f}, - {-33.141354f, 92.387955f, -19.134171f}, - {-38.268341f, 92.387955f, -0.000002f}, - {-33.141357f, 92.387955f, 19.134169f}, - {-19.134172f, 92.387955f, 33.141357f}, - {-0.000001f, 92.387955f, 38.268341f}, - {19.134171f, 92.387955f, 33.141357f}, - {33.141357f, 92.387955f, 19.134172f}, - {38.268345f, 92.387955f, 0.0f}, - {0.0f, -100.0f, 0.0f}, - {0.0f, 100.0f, 0.0f}, -}; +#include "assets/l_bonbori2Pos__d_drawlist.h" + #include "assets/l_bonbori2DL.h" /* 80082838-80082E44 .text draw__22dDlst_alphaModelData_cFPA4_f */ @@ -1144,16 +968,8 @@ BOOL dDlst_alphaModel_c::draw(Mtx mtx) { return TRUE; } -static Vec l_shadowVolPos[] = { - {-1.0f, -1.0f, 0.0f}, - {-1.0f, -1.0f, -300.0f}, - {-1.0f, 1.0f, 0.0f}, - {-1.0f, 1.0f, -300.0f}, - {1.0f, -1.0f, 0.0f}, - {1.0f, -1.0f, -300.0f}, - {1.0f, 1.0f, 0.0f}, - {1.0f, 1.0f, -300.0f}, -}; +#include "assets/l_shadowVolPos__d_drawlist.h" + #include "assets/l_shadowVolDL.h" #include "assets/l_shadowProjMat.h" #include "assets/l_shadowVolMat.h" @@ -1161,22 +977,7 @@ static Vec l_shadowVolPos[] = { #include "assets/l_frontMat.h" #include "assets/l_backSubMat.h" -static Vec l_simpleShadowPos[] = { - {0.0f, -1.0f, 0.0f}, - {0.0f, 0.0f, 0.0f}, - {1.0f, -1.0f, -1.0f}, - {1.0f, 0.0f, -1.0f}, - {-1.0f, -1.0f, -1.0f}, - {-1.0f, 0.0f, -1.0f}, - {-1.0f, -1.0f, 1.0f}, - {-1.0f, 0.0f, 1.0f}, - {1.0f, -1.0f, 1.0f}, - {1.0f, 0.0f, 1.0f}, - {-1.0f, 1.0f, -1.0f}, - {1.0f, 1.0f, -1.0f}, - {1.0f, 1.0f, 1.0f}, - {-1.0f, 1.0f, 1.0f}, -}; +#include "assets/l_simpleShadowPos__d_drawlist.h" #include "assets/l_shadowVolumeDL.h" @@ -2003,7 +1804,7 @@ void dDlst_alphaVolPacket::draw() { GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); GXClearVtxDesc(); GXSetVtxDesc(GX_VA_POS, GX_INDEX8); - GXSetArray(GX_VA_POS, (void*)l_simpleShadowPos, sizeof(*l_simpleShadowPos)); + GXSetArray(GX_VA_POS, l_simpleShadowPos, sizeof(*l_simpleShadowPos)); GXLoadPosMtxImm(mtx, GX_PNMTX0); GXSetCurrentMtx(GX_PNMTX0); GXCallDisplayList(l_frontMat, 0x40); @@ -2024,7 +1825,7 @@ void dDlst_alphaInvVolPacket::draw() { GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); GXClearVtxDesc(); GXSetVtxDesc(GX_VA_POS, GX_INDEX8); - GXSetArray(GX_VA_POS, (void*)l_simpleShadowPos, sizeof(*l_simpleShadowPos)); + GXSetArray(GX_VA_POS, l_simpleShadowPos, sizeof(*l_simpleShadowPos)); GXLoadPosMtxImm(mtx, GX_PNMTX0); GXSetCurrentMtx(GX_PNMTX0); GXSetTevColor(GX_TEVREG0, g_whiteColor); diff --git a/src/d/d_flower.cpp b/src/d/d_flower.cpp index 81f1cad1..f8303480 100644 --- a/src/d/d_flower.cpp +++ b/src/d/d_flower.cpp @@ -14,8 +14,9 @@ const u16 l_Txq_bessou_hanaTEX__width = 0x40; const u16 l_Txq_bessou_hanaTEX__height = 0x80; -f32 l_pos3[] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}; -f32 l_texCoord3[] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}; +#include "assets/l_pos3__d_flower.h" +#include "assets/l_color3__d_flower.h" +#include "assets/l_texCoord3__d_flower.h" #include "assets/l_QbsafDL.h" #include "assets/l_QbsfwDL.h" @@ -24,8 +25,9 @@ f32 l_texCoord3[] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}; const u16 l_Txo_ob_flower_white_64x64TEX__width = 0x40; const u16 l_Txo_ob_flower_white_64x64TEX__height = 0x40; -f32 l_pos[] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}; -f32 l_texCoord[] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}; +#include "assets/l_pos__d_flower.h" +#include "assets/l_color__d_flower.h" +#include "assets/l_texCoord__d_flower.h" #include "assets/l_OhanaDL.h" #include "assets/l_Ohana_gutDL.h" @@ -33,15 +35,11 @@ f32 l_texCoord[] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}; #include "assets/l_Txo_ob_flower_pink_64x64TEX.h" const u16 l_Txo_ob_flower_pink_64x64TEX__width = 0x40; const u16 l_Txo_ob_flower_pink_64x64TEX__height = 0x40; -f32 l_pos2[] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}; -GXColor l_color2[] = { - {0xCC, 0xCC, 0xCC, 0xFF}, - {0x7F, 0x7F, 0x7F, 0xFF}, - {0xB2, 0xB2, 0xB2, 0xFF}, - {0xE5, 0xE5, 0xE5, 0xFF}, - {0xFF, 0xFF, 0xFF, 0xFF}, -}; -f32 l_texCoord2[] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}; + + +#include "assets/l_pos2__d_flower.h" +#include "assets/l_color2__d_flower.h" +#include "assets/l_texCoord2__d_flower.h" #include "assets/l_Ohana_highDL.h" #include "assets/l_Ohana_high_gutDL.h" @@ -57,15 +55,6 @@ l_matDL2(l_Txo_ob_flower_pink_64x64TEX) static bool l_CutSoundFlag = false; -GXColor l_color3[] = { - {0xFF, 0xFF, 0xFF, 0xFF}, - {0x80, 0x80, 0x80, 0xFF}, -}; -static GXColor l_color[] = { - {0xFF, 0xFF, 0xFF, 0xFF}, - {0xB2, 0xB2, 0xB2, 0xFF}, -}; - /* 800BFA9C-800BFD28 .text WorkCo__14dFlower_data_cFP10fopAc_ac_cUli */ void dFlower_data_c::WorkCo(fopAc_ac_c* param_1, u32 param_2, int param_3) { cXyz temp1; diff --git a/src/d/d_grass.cpp b/src/d/d_grass.cpp index 3cf4f831..6f2fe6f1 100644 --- a/src/d/d_grass.cpp +++ b/src/d/d_grass.cpp @@ -21,55 +21,9 @@ const u32 l_K_kusa_00TEX__width = 64; const u32 l_K_kusa_00TEX__height = 128; -static Vec l_Vmori_pos[] = { - {0.0f, -0.0f, 0.0f}, - {-20.232309f, 2.398434f, -12.457211f}, - {-22.421972f, 96.708992f, -32.329994f}, - {-0.689661f, 28.224686f, -17.54632f}, - {18.556299f, 68.562164f, -34.307945f}, - {18.543142f, 2.398434f, -11.276213f}, - {-0.200689f, 2.398434f, 21.652548f}, - {-25.964092f, 96.708992f, 30.826571f}, - {-14.926651f, 28.224686f, 6.578368f}, - {-35.45715f, 68.562164f, -0.097443f}, - {36.34602f, 96.708992f, 0.33899f}, - {13.406961f, 28.224686f, 6.463065f}, - {22.201593f, 68.562164f, 30.207361f}, - {-17.307545f, 92.651337f, -11.431835f}, - {-0.689661f, 28.224686f, -17.546318f}, - {16.828806f, 92.651367f, -10.67745f}, - {-0.098656f, 85.026367f, 19.19121f}, - {-14.926647f, 28.224686f, 6.578368f}, - {-0.479885f, 11.192533f, -13.94727f}, - {11.278254f, 12.157036f, 6.079208f}, - {-12.355106f, 13.254459f, 6.175385f}, - {-15.73156f, 5.409967f, -8.529058f}, - {13.355361f, 5.409967f, -8.554744f}, - {-0.305629f, 4.337076f, 16.596081f}, - {-0.479884f, 11.192533f, -13.94727f}, - {-12.355103f, 13.254459f, 6.175385f}, - {11.278254f, 12.157036f, 6.079209f}, -}; - -static GXColor l_Vmori_color[] = { - {0xFF, 0xFF, 0xFF, 0xFF}, - {0x41, 0x41, 0x41, 0xFF}, - {0xDD, 0xCF, 0x71, 0xFF}, - {0, 0x2E, 0x1, 0xFF}, - {0xAE, 0xA4, 0x57, 0xFF}, -}; - -static cXy l_Vmori_texCoord[] = { - {0.006063f, 0.998037f}, - {0.659757f, 0.0f}, - {0.974817f, 1.0f}, - {-0.00456f, 1.0f}, - {0.980413f, 1.0f}, - {0.980413f, 1.002798f}, - {0.933797f, 0.82872f}, - {0.938976f, 0.84993f}, - {0.940903f, 0.138216f}, -}; +#include "assets/l_Vmori_pos.h" +#include "assets/l_Vmori_color.h" +#include "assets/l_Vmori_texCoord.h" #include "assets/l_Vmori_00DL.h" #include "assets/l_Vmori_01DL.h" @@ -80,58 +34,9 @@ l_Vmori_matDL(l_K_kusa_00TEX); const u32 l_Txa_ob_kusa_aTEX__width = 64; const u32 l_Txa_ob_kusa_aTEX__height = 64; -static Vec l_pos[] = { - {0.0f, -0.0f, 0.0f}, - {-20.232309f, 7.048814f, -12.457211f}, - {-22.421972f, 96.708992f, -32.329994f}, - {-0.689661f, 28.224686f, -17.54632f}, - {18.556299f, 68.562164f, -34.307945f}, - {18.543142f, 7.048814f, -11.276213f}, - {-0.200689f, 4.806987f, 21.652548f}, - {-25.964092f, 96.708992f, 30.826571f}, - {-14.926651f, 28.224686f, 6.578368f}, - {-35.45715f, 68.562164f, -0.097443f}, - {36.34602f, 96.708992f, 0.33899f}, - {13.406961f, 28.224686f, 6.463065f}, - {22.201593f, 68.562164f, 30.207361f}, - {-17.307545f, 92.651337f, -11.431835f}, - {-0.689661f, 28.224686f, -17.546318f}, - {16.828806f, 92.651367f, -10.67745f}, - {-0.098656f, 85.026367f, 19.19121f}, - {-14.926647f, 28.224686f, 6.578368f}, - {-0.479885f, 11.192533f, -13.94727f}, - {11.278254f, 12.157036f, 6.079208f}, - {-12.355106f, 13.254459f, 6.175385f}, - {-15.73156f, 5.409967f, -8.529058f}, - {13.355361f, 5.409967f, -8.554744f}, - {-0.305629f, 4.337076f, 16.596081f}, - {-0.479884f, 11.192533f, -13.94727f}, - {-12.355103f, 13.254459f, 6.175385f}, - {11.278254f, 12.157036f, 6.079209f}, -}; - -static GXColor l_color[] = { - {0x87, 0x87, 0x87, 0xFF}, - {0xFF, 0xFF, 0xFF, 0xFF}, - {0x6E, 0x6E, 0x6E, 0xFF}, - {0x69, 0x69, 0x69, 0xFF}, - {0x7B, 0x7B, 0x7B, 0xFF}, - {0x76, 0x76, 0x76, 0xFF}, - {0xB1, 0xB1, 0xB1, 0xFF}, - {0xCC, 0xCC, 0xCC, 0xFF}, -}; - -static cXy l_texCoord[] = { - {0.375f, 0.625f}, - {1.0f, 0.0f}, - {1.0f, 1.0f}, - {2.0f, 1.0f}, - {0.0f, 1.0f}, - {1.625f, 0.625f}, - {0.0f, 0.5f}, - {0.5f, 0.0f}, - {0.0f, 0.0f}, -}; +#include "assets/l_pos__d_grass.h" +#include "assets/l_color__d_grass.h" +#include "assets/l_texCoord__d_grass.h" #include "assets/l_Oba_kusa_aDL.h" #include "assets/l_Oba_kusa_a_cutDL.h" @@ -319,9 +224,9 @@ dGrass_packet_c::dGrass_packet_c() { for (s32 i = 0; i < 8; i++, angle += 0x2000) setAnm(i, angle); if (strncmp(dComIfGp_getStartStageName(), "kin", sizeof("kin")-1) == 0 || strcmp(dComIfGp_getStartStageName(), "Xboss1") == 0) { - mpPosArr = (f32*)l_Vmori_pos; + mpPosArr = l_Vmori_pos; mpColorArr = l_Vmori_color; - mpTexCoordArr = (f32*)l_Vmori_texCoord; + mpTexCoordArr = l_Vmori_texCoord; mpMatDL = l_Vmori_matDL; mMatDLSize = 0xa0; mpDL = l_Vmori_00DL; @@ -331,9 +236,9 @@ dGrass_packet_c::dGrass_packet_c() { mCoParticle = dPa_name::ID_IT_SN_O_KINDANKUSA_RUN; mAtParticle = dPa_name::ID_IT_SN_O_KINDANKUSA_KEN; } else { - mpPosArr = (f32*)l_pos; + mpPosArr = l_pos; mpColorArr = l_color; - mpTexCoordArr = (f32*)l_texCoord; + mpTexCoordArr = l_texCoord; mpMatDL = l_matDL; mMatDLSize = 0xa0; mpDL = l_Oba_kusa_aDL; diff --git a/src/d/d_magma.cpp b/src/d/d_magma.cpp index fb4b0fe3..a834ea0c 100644 --- a/src/d/d_magma.cpp +++ b/src/d/d_magma.cpp @@ -14,51 +14,12 @@ static Mtx l_kuroOrthoMtx; static Mtx l_colOrthoMtx; -static Vec l_YfloorPos[] = { - { -500.0f, -0.0f, 500.0f }, - { 500.0f, -0.0f, 500.0f }, - { -500.0f, 0.0f, -500.0f }, - { 500.0f, 0.0f, -500.0f }, -}; +#include "assets/l_YfloorPos__d_magma.h" #include "assets/l_YfloorDL.h" #include "assets/l_YfloorMatDL.h" -static Vec l_YballPos[] = { - {172.280487f, -7.398514f, -167.445663f}, - {0.000006f, -7.398514f, -236.803879f}, - {-172.280487f, -7.398515f, -167.445648f}, - {-243.641357f, -7.398515f, 0.000004f}, - {-172.280487f, -7.398514f, 167.445602f}, - {0.000008f, -7.398514f, 236.803879f}, - {172.280487f, -7.398514f, 167.445602f}, - {243.641403f, -7.398514f, -0.000015f}, - {150.773376f, 13.801255f, -149.81015f}, - {0.000006f, 13.801253f, -211.863525f}, - {-150.773346f, 13.801253f, -149.81015f}, - {-213.225739f, 13.801253f, 0.000002f}, - {-150.773346f, 13.801253f, 149.810089f}, - {0.000008f, 13.801253f, 211.86348f}, - {150.773376f, 13.801255f, 149.81012f}, - {213.225739f, 13.801255f, -0.000014f}, - {121.820717f, 31.773548f, -118.401939f}, - {0.000006f, 31.773548f, -167.445648f}, - {-121.820679f, 31.773542f, -118.401939f}, - {-172.280487f, 31.773542f, 0.000001f}, - {-121.820679f, 31.773542f, 118.401939f}, - {0.000007f, 31.773548f, 167.445602f}, - {121.820717f, 31.773548f, 118.401909f}, - {172.280487f, 31.773548f, -0.000012f}, - {65.928886f, 43.782257f, -64.078682f}, - {0.000006f, 43.782257f, -90.620918f}, - {-65.928879f, 43.782257f, -64.078674f}, - {-93.237503f, 43.782257f, -0.000002f}, - {-65.928879f, 43.782257f, 64.078667f}, - {0.000007f, 43.782257f, 90.620911f}, - {65.928886f, 43.782257f, 64.078667f}, - {93.237541f, 43.782257f, -0.000009f}, - {0.000007f, 47.999146f, -0.000006f}, -}; +#include "assets/l_YballPos__d_magma.h" #include "assets/l_YballDL.h" #include "assets/l_YballMatDL.h" diff --git a/src/d/d_tree.cpp b/src/d/d_tree.cpp index 7537356f..934f78c2 100644 --- a/src/d/d_tree.cpp +++ b/src/d/d_tree.cpp @@ -10,121 +10,9 @@ const u16 l_Txa_swood_aTEX__width = 64; const u16 l_Txa_swood_aTEX__height = 64; -static Vec l_pos[] = { - {-10.0f, 105.608147f, 5.0f}, - {10.0f, 105.608147f, 5.0f}, - {0.0f, 115.841797f, 0.0f}, - {-19.090694f, 190.686432f, 37.321354f}, - {0.0f, 105.608147f, -10.0f}, - {41.625153f, 211.34726f, -14.772539f}, - {-33.026093f, 215.296951f, -44.96241f}, - {-10.0f, 20.0f, 5.0f}, - {10.0f, 20.0f, 5.0f}, - {0.0f, 20.0f, -10.0f}, - {10.0f, 105.608147f, -5.0f}, - {10.0f, 20.0f, -5.0f}, - {-10.0f, 105.608147f, -5.0f}, - {-10.0f, 20.0f, -5.0f}, - {0.0f, 105.608147f, 10.0f}, - {0.0f, 20.0f, 10.0f}, - {-10.0f, 0.0f, 5.0f}, - {10.0f, 0.0f, 5.0f}, - {0.0f, 0.0f, -10.0f}, - {10.0f, 0.0f, -5.0f}, - {-10.0f, 0.0f, -5.0f}, - {0.0f, 0.0f, 10.0f}, - {2.909025f, 212.994461f, -45.632366f}, - {-10.776078f, 184.271301f, 5.599532f}, - {33.920052f, 212.994461f, 34.134495f}, - {72.31778f, 168.951508f, 19.206579f}, - {86.002876f, 197.674683f, -32.025314f}, - {41.30674f, 168.951508f, -60.560272f}, - {-10.575331f, 211.978516f, -22.376558f}, - {14.409488f, 243.166702f, 23.706152f}, - {58.760258f, 202.669464f, 34.361908f}, - {96.549309f, 224.54863f, -8.227419f}, - {71.564476f, 193.360443f, -54.310123f}, - {27.213718f, 233.857651f, -64.965866f}, - {41.625156f, 211.347275f, -14.772542f}, - {22.596979f, 256.019928f, -40.096336f}, - {14.065658f, 241.755569f, -4.058219f}, - {44.6987f, 256.019958f, 16.753942f}, - {73.287094f, 230.837082f, 5.639604f}, - {81.818398f, 245.101456f, -30.398512f}, - {51.185356f, 230.837082f, -51.210663f}, - {-7.857542f, 194.658112f, -10.762144f}, - {-53.937096f, 156.796143f, -1.809134f}, - {-66.201447f, 183.508667f, 50.850483f}, - {-28.940256f, 145.54512f, 79.264961f}, - {17.139292f, 183.407074f, 70.311951f}, - {29.403631f, 156.69455f, 17.652328f}, - {-19.090696f, 190.686417f, 37.321354f}, - {-33.985317f, 188.75563f, -13.250698f}, - {-70.496834f, 213.49118f, 28.887436f}, - {-54.248596f, 175.144028f, 73.452583f}, - {-4.665742f, 206.592773f, 89.977669f}, - {31.845766f, 181.857224f, 47.839523f}, - {15.597519f, 220.204346f, 3.274376f}, - {-19.090696f, 190.686432f, 37.321358f}, - {-12.561728f, 237.465271f, 9.606261f}, - {-45.613617f, 216.75177f, 16.922333f}, - {-54.143745f, 229.519012f, 53.517914f}, - {-27.798243f, 208.733109f, 74.704277f}, - {5.253643f, 229.446609f, 67.388199f}, - {13.783756f, 216.679367f, 30.792624f}, - {-65.836937f, 200.599899f, -79.042107f}, - {-78.85379f, 178.159485f, -24.599487f}, - {-47.995983f, 222.830963f, 1.654331f}, - {2.405176f, 189.776688f, -0.382604f}, - {15.422019f, 212.217102f, -54.825226f}, - {-15.435799f, 167.545624f, -81.079041f}, - {-33.026093f, 215.296951f, -44.962418f}, - {-81.844887f, 199.673126f, -57.441658f}, - {-73.009483f, 243.963348f, -16.443239f}, - {-21.627028f, 220.240952f, 6.308706f}, - {14.903163f, 244.573044f, -36.047581f}, - {6.067755f, 200.282806f, -77.045998f}, - {-45.314705f, 224.005219f, -99.797928f}, - {-33.026093f, 215.296967f, -44.962421f}, - {-59.207829f, 247.753891f, -80.459984f}, - {-68.884155f, 237.886353f, -43.257812f}, - {-46.492485f, 263.598114f, -22.947197f}, - {-10.970461f, 246.166f, -25.998304f}, - {-1.294143f, 256.033539f, -63.200481f}, - {-23.685818f, 230.321808f, -83.511086f}, -}; - -static GXColor l_color[] = { - {0x80, 0x80, 0x80, 0xFF}, - {0x8D, 0x8D, 0x8D, 0xFF}, - {0x99, 0x99, 0x99, 0xFF}, - {0xFF, 0xFF, 0xFF, 0xFF}, - {0x9C, 0x9C, 0x9C, 0xFF}, - {0x97, 0x97, 0x97, 0xFF}, - {0x8C, 0x8C, 0x8C, 0xFF}, - {0x33, 0x33, 0x33, 0xFF}, - {0x66, 0x66, 0x66, 0xFF}, - {0xBF, 0xBF, 0xBF, 0xFF}, -}; - -static cXy l_texCoord[] = { - {0.862864f, 0.532151f}, - {0.864665f, 1.0f}, - {0.878197f, 1.0f}, - {0.878197f, 0.53125f}, - {0.0f, 0.73413f}, - {0.15625f, 0.625f}, - {0.156459f, 0.375f}, - {0.0f, 0.259522f}, - {-0.15625f, 0.375f}, - {-0.15625f, 0.625f}, - {0.5f, 1.0f}, - {1.0f, 0.0f}, - {0.0f, 0.0f}, - {0.878197f, 0.990122f}, - {0.878197f, 0.871582f}, - {0.878197f, 0.625094f}, -}; +#include "assets/l_pos__d_tree.h" +#include "assets/l_color__d_tree.h" +#include "assets/l_texCoord__d_tree.h" #include "assets/l_Oba_swood_noneDL.h" #include "assets/l_Oba_swood_a_cuttDL.h" diff --git a/src/d/d_wood.cpp b/src/d/d_wood.cpp index 0b11c7eb..d559cc3d 100644 --- a/src/d/d_wood.cpp +++ b/src/d/d_wood.cpp @@ -74,106 +74,9 @@ namespace { const u16 l_Txa_swood_bTEX__width = 64; const u16 l_Txa_swood_bTEX__height = 64; -static Vec l_pos[] = { - {0.000022f, 14.922843f, -89.982368f}, - {-77.927017f, 14.922843f, -44.991203f}, - {-77.927025f, 14.922843f, 44.991173f}, - {-0.000008f, 14.922843f, 89.982353f}, - {77.92701f, 14.922843f, 44.99118f}, - {77.92701f, 14.922843f, -44.99118f}, - {0.0f, 86.107872f, 0.0f}, - {48.073795f, 32.79335f, -83.266212f}, - {-48.073753f, 32.79335f, -83.266228f}, - {-96.147537f, 32.79335f, -0.000015f}, - {-48.073772f, 32.79335f, 83.266212f}, - {48.073757f, 32.79335f, 83.266212f}, - {96.14753f, 32.79335f, 0.0f}, - {0.0f, 94.79158f, 0.0f}, - {46.784023f, 67.793831f, -81.032257f}, - {-46.783981f, 67.793831f, -81.032272f}, - {-93.568001f, 67.793831f, -0.000015f}, - {-46.784004f, 67.793831f, 81.032257f}, - {46.783993f, 67.793831f, 81.032257f}, - {93.567993f, 67.793831f, 0.0f}, - {0.0f, 105.391602f, 0.0f}, - {28.882326f, 98.615974f, -50.02562f}, - {-28.882303f, 98.615974f, -50.025642f}, - {-57.764622f, 98.615974f, -0.000009f}, - {-28.882315f, 98.615974f, 50.02562f}, - {28.882305f, 98.615974f, 50.02562f}, - {57.764614f, 98.615974f, 0.0f}, - {0.0f, 109.061028f, 0.0f}, - {41.2393f, 1.173791f, -71.42852f}, - {-41.239262f, 1.173791f, -71.428535f}, - {-82.478554f, 1.173791f, -0.000013f}, - {-41.239281f, 1.173791f, 71.42852f}, - {41.239265f, 1.173791f, 71.42852f}, - {82.478539f, 1.173791f, 0.0f}, - {0.0f, 70.268173f, 0.0f}, - {0.000025f, 50.810505f, -97.695068f}, - {-84.6064f, 50.810505f, -48.847549f}, - {-84.606422f, 50.810505f, 48.847519f}, - {-0.00001f, 50.810505f, 97.695053f}, - {84.6064f, 50.810505f, 48.84753f}, - {84.6064f, 50.810505f, -48.847527f}, - {0.0f, 102.071098f, 0.0f}, - {0.000021f, 82.279785f, -80.035629f}, - {-69.312889f, 82.279785f, -40.017834f}, - {-69.312904f, 82.279785f, 40.017811f}, - {-0.000008f, 82.279785f, 80.035637f}, - {69.312889f, 82.279785f, 40.017818f}, - {69.312889f, 82.279785f, -40.017815f}, - {0.0f, 109.022469f, 0.0f}, - {3.255973f, 0.0f, -5.921541f}, - {3.255973f, 0.0f, 5.921541f}, - {-5.16166f, 0.0f, 0.0f}, - {0.114389f, 11.775252f, -0.249098f}, - {-0.862972f, 19.754194f, 8.598756f}, - {-9.357565f, 19.58444f, 11.268269f}, - {-8.081571f, 19.758448f, 3.069652f}, - {-2.221876f, 19.009287f, -8.072796f}, - {-9.50218f, 19.009287f, -4.024319f}, - {-8.414586f, 19.009287f, -12.021413f}, - {13.461897f, 22.025139f, 1.575613f}, - {5.560989f, 22.025139f, 4.229024f}, - {5.656257f, 22.025139f, -3.749505f}, -}; - -static GXColor l_color[] = { - {0x7F, 0x7F, 0x7F, 0xFF}, - {0x98, 0x98, 0x99, 0xFF}, - {0x99, 0x99, 0x99, 0xFF}, - {0xCC, 0xCC, 0xCC, 0xFF}, - {0xFF, 0xFF, 0xFF, 0xFF}, - {0x66, 0x66, 0x66, 0xFF}, - {0xB2, 0xB2, 0xB2, 0xFF}, - {0xE5, 0xE5, 0xE5, 0xFF}, - {0xF4, 0xF4, 0xF4, 0xFF}, - {0xAB, 0xAB, 0xAB, 0xFF}, - {0xFC, 0xFC, 0xFC, 0xFF}, - {0xF7, 0xF7, 0xF7, 0xFF}, - {0xF8, 0xF8, 0xF8, 0xFF}, - {0xC3, 0xC3, 0xC3, 0xFF}, - {0xA1, 0xA1, 0xA1, 0xFF}, - {0xF5, 0xF5, 0xF5, 0xFF}, - {0xFB, 0xFB, 0xFB, 0xFF}, - {0x73, 0x73, 0x73, 0xFF}, - {0x43, 0x43, 0x43, 0xFF}, - {0x9A, 0x9A, 0x9A, 0xFF}, -}; - -static cXy l_texCoord[] = { - {0.5f, 1.0f}, - {1.0f, 0.0f}, - {0.0f, 0.0f}, - {1.0f, 0.455793f}, - {1.0f, 0.75f}, - {0.705793f, 0.75f}, - {0.958472f, 1.0f}, - {0.792867f, 0.75f}, - {0.958472f, 0.75f}, - {0.792867f, 1.0f}, -}; +#include "assets/l_pos__d_wood.h" +#include "assets/l_color__d_wood.h" +#include "assets/l_texCoord__d_wood.h" #include "assets/l_Oba_swood_bDL.h" #include "assets/l_Oba_swood_b_cutDL.h" |
