From 050cc1277792384cebbecba0f0d9db8c6a856577 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Thu, 7 Nov 2024 16:07:37 -0500 Subject: [PATCH] Use dtk asset extractor for in-function statics as well --- config/GZLE01/config.yml | 74 ++++++++++----- config/GZLJ01/config.yml | 74 ++++++++++----- config/GZLP01/config.yml | 74 ++++++++++----- configure.py | 2 +- src/d/actor/d_a_bwdg.cpp | 4 +- src/d/d_drawlist.cpp | 36 +------- src/d/d_wood.cpp | 195 +-------------------------------------- src/m_Do/m_Do_ext.cpp | 68 ++------------ 8 files changed, 167 insertions(+), 360 deletions(-) diff --git a/config/GZLE01/config.yml b/config/GZLE01/config.yml index a19289be..bfaf2fcf 100644 --- a/config/GZLE01/config.yml +++ b/config/GZLE01/config.yml @@ -1039,8 +1039,8 @@ modules: binary: assets/l_Hsand1DL.bin header: assets/l_Hsand1DL.h - symbol: l_matDL - binary: assets/l_matDL.bin - header: assets/l_matDL.h + binary: assets/l_matDL__d_a_bwdg.bin + header: assets/l_matDL__d_a_bwdg.h header_type: none custom_type: matDL @@ -2155,9 +2155,10 @@ extract: - symbol: l_bonbori2DL binary: assets/l_bonbori2DL.bin header: assets/l_bonbori2DL.h -# - symbol: l_matDL$5108 -# binary: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.bin -# header: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.h +- symbol: l_matDL$5108 + 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_shadowVolDL binary: assets/l_shadowVolDL.bin header: assets/l_shadowVolDL.h @@ -2188,28 +2189,36 @@ extract: - symbol: l_shadowSealDL binary: assets/l_shadowSealDL.bin header: assets/l_shadowSealDL.h -# - symbol: l_matDL$5761 -# binary: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.bin -# header: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.h +- symbol: l_matDL$5761 + binary: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.bin + header: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.h + rename: l_matDL - symbol: l_mirrorProjMat binary: assets/l_mirrorProjMat.bin header: assets/l_mirrorProjMat.h -# - symbol: l_backMat$6018 -# binary: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.bin -# header: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h - -# - symbol: l_Txa_swood_bTEX__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_Txa_swood_bTEX.bin -# header: assets/l_Txa_swood_bTEX.h -# - symbol: l_Oba_swood_bDL__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_Oba_swood_bDL.bin -# header: assets/l_Oba_swood_bDL.h -# - symbol: l_Oba_swood_b_cutDL__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_Oba_swood_b_cutDL.bin -# header: assets/l_Oba_swood_b_cutDL.h -# - symbol: l_matDL__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_matDL.bin -# header: assets/l_matDL.h +- symbol: l_backMat$6018 + binary: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.bin + header: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h + rename: l_backMat + +- symbol: l_Txa_swood_bTEX__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_Txa_swood_bTEX.bin + header: assets/l_Txa_swood_bTEX.h + rename: l_Txa_swood_bTEX +- symbol: l_Oba_swood_bDL__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_Oba_swood_bDL.bin + header: assets/l_Oba_swood_bDL.h + rename: l_Oba_swood_bDL +- symbol: l_Oba_swood_b_cutDL__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_Oba_swood_b_cutDL.bin + header: assets/l_Oba_swood_b_cutDL.h + rename: l_Oba_swood_b_cutDL +- symbol: l_matDL__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_matDL__d_wood.bin + header: assets/l_matDL__d_wood.h + rename: l_matDL + header_type: none + custom_type: matDL - symbol: l_Txa_swood_aTEX binary: assets/l_Txa_swood_aTEX.bin @@ -2324,3 +2333,20 @@ extract: - symbol: l_sightDL!.data:0x8038fc80 binary: assets/l_sightDL__d_a_player_main.bin header: assets/l_sightDL__d_a_player_main.h + +- symbol: l_invisibleMat$7212 + binary: assets/l_invisibleMat__draw__19mDoExt_invJntPacketFv.bin + header: assets/l_invisibleMat__draw__19mDoExt_invJntPacketFv.h + rename: l_invisibleMat +- symbol: l_matDL!.data:0x80371860 + binary: assets/l_matDL__m_Do_ext.bin + header: assets/l_matDL__m_Do_ext.h +- symbol: l_toonMatDL + binary: assets/l_toonMatDL.bin + header: assets/l_toonMatDL.h +- symbol: l_mat1DL + binary: assets/l_mat1DL.bin + header: assets/l_mat1DL.h +- symbol: l_toonMat1DL + binary: assets/l_toonMat1DL.bin + header: assets/l_toonMat1DL.h diff --git a/config/GZLJ01/config.yml b/config/GZLJ01/config.yml index c8abaddc..9f8f3c2a 100644 --- a/config/GZLJ01/config.yml +++ b/config/GZLJ01/config.yml @@ -836,8 +836,8 @@ modules: binary: assets/l_Hsand1DL.bin header: assets/l_Hsand1DL.h - symbol: l_matDL - binary: assets/l_matDL.bin - header: assets/l_matDL.h + binary: assets/l_matDL__d_a_bwdg.bin + header: assets/l_matDL__d_a_bwdg.h header_type: none custom_type: matDL @@ -1739,9 +1739,10 @@ extract: - symbol: l_bonbori2DL binary: assets/l_bonbori2DL.bin header: assets/l_bonbori2DL.h -# - symbol: l_matDL$5108 -# binary: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.bin -# header: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.h +- symbol: l_matDL$5108 + 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_shadowVolDL binary: assets/l_shadowVolDL.bin header: assets/l_shadowVolDL.h @@ -1772,28 +1773,36 @@ extract: - symbol: l_shadowSealDL binary: assets/l_shadowSealDL.bin header: assets/l_shadowSealDL.h -# - symbol: l_matDL$5761 -# binary: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.bin -# header: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.h +- symbol: l_matDL$5761 + binary: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.bin + header: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.h + rename: l_matDL - symbol: l_mirrorProjMat binary: assets/l_mirrorProjMat.bin header: assets/l_mirrorProjMat.h -# - symbol: l_backMat$6016 -# binary: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.bin -# header: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h - -# - symbol: l_Txa_swood_bTEX__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_Txa_swood_bTEX.bin -# header: assets/l_Txa_swood_bTEX.h -# - symbol: l_Oba_swood_bDL__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_Oba_swood_bDL.bin -# header: assets/l_Oba_swood_bDL.h -# - symbol: l_Oba_swood_b_cutDL__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_Oba_swood_b_cutDL.bin -# header: assets/l_Oba_swood_b_cutDL.h -# - symbol: l_matDL__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_matDL.bin -# header: assets/l_matDL.h +- symbol: l_backMat$6016 + binary: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.bin + header: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h + rename: l_backMat + +- symbol: l_Txa_swood_bTEX__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_Txa_swood_bTEX.bin + header: assets/l_Txa_swood_bTEX.h + rename: l_Txa_swood_bTEX +- symbol: l_Oba_swood_bDL__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_Oba_swood_bDL.bin + header: assets/l_Oba_swood_bDL.h + rename: l_Oba_swood_bDL +- symbol: l_Oba_swood_b_cutDL__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_Oba_swood_b_cutDL.bin + header: assets/l_Oba_swood_b_cutDL.h + rename: l_Oba_swood_b_cutDL +- symbol: l_matDL__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_matDL__d_wood.bin + header: assets/l_matDL__d_wood.h + rename: l_matDL + header_type: none + custom_type: matDL - symbol: l_Txa_swood_aTEX binary: assets/l_Txa_swood_aTEX.bin @@ -1908,3 +1917,20 @@ extract: - symbol: l_sightDL!.data:0x80383320 binary: assets/l_sightDL__d_a_player_main.bin header: assets/l_sightDL__d_a_player_main.h + +- symbol: l_invisibleMat$7242 + binary: assets/l_invisibleMat__draw__19mDoExt_invJntPacketFv.bin + header: assets/l_invisibleMat__draw__19mDoExt_invJntPacketFv.h + rename: l_invisibleMat +- symbol: l_matDL!.data:0x80364d00 + binary: assets/l_matDL__m_Do_ext.bin + header: assets/l_matDL__m_Do_ext.h +- symbol: l_toonMatDL + binary: assets/l_toonMatDL.bin + header: assets/l_toonMatDL.h +- symbol: l_mat1DL + binary: assets/l_mat1DL.bin + header: assets/l_mat1DL.h +- symbol: l_toonMat1DL + binary: assets/l_toonMat1DL.bin + header: assets/l_toonMat1DL.h diff --git a/config/GZLP01/config.yml b/config/GZLP01/config.yml index 552aa173..cf00c820 100644 --- a/config/GZLP01/config.yml +++ b/config/GZLP01/config.yml @@ -836,8 +836,8 @@ modules: binary: assets/l_Hsand1DL.bin header: assets/l_Hsand1DL.h - symbol: l_matDL - binary: assets/l_matDL.bin - header: assets/l_matDL.h + binary: assets/l_matDL__d_a_bwdg.bin + header: assets/l_matDL__d_a_bwdg.h header_type: none custom_type: matDL @@ -1751,9 +1751,10 @@ extract: - symbol: l_bonbori2DL binary: assets/l_bonbori2DL.bin header: assets/l_bonbori2DL.h -# - symbol: l_matDL$5108 -# binary: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.bin -# header: assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.h +- symbol: l_matDL$5108 + 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_shadowVolDL binary: assets/l_shadowVolDL.bin header: assets/l_shadowVolDL.h @@ -1784,28 +1785,36 @@ extract: - symbol: l_shadowSealDL binary: assets/l_shadowSealDL.bin header: assets/l_shadowSealDL.h -# - symbol: l_matDL$5761 -# binary: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.bin -# header: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.h +- symbol: l_matDL$5761 + binary: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.bin + header: assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.h + rename: l_matDL - symbol: l_mirrorProjMat binary: assets/l_mirrorProjMat.bin header: assets/l_mirrorProjMat.h -# - symbol: l_backMat$6018 -# binary: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.bin -# header: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h - -# - symbol: l_Txa_swood_bTEX__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_Txa_swood_bTEX.bin -# header: assets/l_Txa_swood_bTEX.h -# - symbol: l_Oba_swood_bDL__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_Oba_swood_bDL.bin -# header: assets/l_Oba_swood_bDL.h -# - symbol: l_Oba_swood_b_cutDL__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_Oba_swood_b_cutDL.bin -# header: assets/l_Oba_swood_b_cutDL.h -# - symbol: l_matDL__Q25dWood20@unnamed@d_wood_cpp@ -# binary: assets/l_matDL.bin -# header: assets/l_matDL.h +- symbol: l_backMat$6018 + binary: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.bin + header: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h + rename: l_backMat + +- symbol: l_Txa_swood_bTEX__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_Txa_swood_bTEX.bin + header: assets/l_Txa_swood_bTEX.h + rename: l_Txa_swood_bTEX +- symbol: l_Oba_swood_bDL__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_Oba_swood_bDL.bin + header: assets/l_Oba_swood_bDL.h + rename: l_Oba_swood_bDL +- symbol: l_Oba_swood_b_cutDL__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_Oba_swood_b_cutDL.bin + header: assets/l_Oba_swood_b_cutDL.h + rename: l_Oba_swood_b_cutDL +- symbol: l_matDL__Q25dWood20@unnamed@d_wood_cpp@ + binary: assets/l_matDL__d_wood.bin + header: assets/l_matDL__d_wood.h + rename: l_matDL + header_type: none + custom_type: matDL - symbol: l_Txa_swood_aTEX binary: assets/l_Txa_swood_aTEX.bin @@ -1920,3 +1929,20 @@ extract: - symbol: l_sightDL!.data:0x80396960 binary: assets/l_sightDL__d_a_player_main.bin header: assets/l_sightDL__d_a_player_main.h + +- symbol: l_invisibleMat$7212 + binary: assets/l_invisibleMat__draw__19mDoExt_invJntPacketFv.bin + header: assets/l_invisibleMat__draw__19mDoExt_invJntPacketFv.h + rename: l_invisibleMat +- symbol: l_matDL!.data:0x80378540 + binary: assets/l_matDL__m_Do_ext.bin + header: assets/l_matDL__m_Do_ext.h +- symbol: l_toonMatDL + binary: assets/l_toonMatDL.bin + header: assets/l_toonMatDL.h +- symbol: l_mat1DL + binary: assets/l_mat1DL.bin + header: assets/l_mat1DL.h +- symbol: l_toonMat1DL + binary: assets/l_toonMat1DL.bin + header: assets/l_toonMat1DL.h diff --git a/configure.py b/configure.py index 44cfdf49..770a1f6d 100644 --- a/configure.py +++ b/configure.py @@ -1777,7 +1777,7 @@ def emit_build_rule(asset): "inputs": out_dir / "bin" / asset["binary"], "outputs": out_dir / "include" / asset["header"], "variables": { - "symbol": asset["symbol"], + "symbol": asset.get("rename") or asset["symbol"], "scope": custom_data.get("scope", "local") }, "implicit": Path("tools/converters/matDL_dis.py"), diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp index d40ae9be..1bd7a8d6 100644 --- a/src/d/actor/d_a_bwdg.cpp +++ b/src/d/actor/d_a_bwdg.cpp @@ -21,8 +21,8 @@ const u16 l_B_sand2TEX__width = 512; const u16 l_B_sand2TEX__height = 256; #include "assets/l_texCoord.h" #include "assets/l_Hsand1DL.h" -#include "assets/l_matDL.h" -l_matDL(l_B_sand2TEX); +#include "assets/l_matDL__d_a_bwdg.h" +l_matDL__d_a_bwdg(l_B_sand2TEX); // Fakematch: These are supposed to be in-function statics inside daBwdg_packet_c::draw(). // But for some reason, defining them inside the function causes the function to load them as well diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 79400169..93257ef9 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -1137,16 +1137,7 @@ BOOL dDlst_alphaModel_c::draw(Mtx mtx) { if (mNum == 0) return FALSE; -// #include "assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.h" - static char l_matDL[] ALIGN_DECL(32) = { - 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0A, 0x00, - 0x00, 0x00, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFC, 0x61, 0xC1, - 0x08, 0xFF, 0xD0, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0xF3, 0x7F, 0x00, 0x00, 0x61, 0xEE, - 0x00, 0x00, 0x00, 0x61, 0xEF, 0x00, 0x00, 0x00, 0x61, 0xF0, 0x00, 0x00, 0x00, 0x61, 0xF1, - 0x00, 0x00, 0x00, 0x61, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - }; + #include "assets/l_matDL__draw__18dDlst_alphaModel_cFPA4_f.h" static GXVtxDescList l_vtxDescList[] = { {GX_VA_POS, GX_INDEX8}, @@ -1716,18 +1707,7 @@ void dDlst_shadowControl_c::reset() { /* 80084DEC-80084EF0 .text imageDraw__21dDlst_shadowControl_cFPA4_f */ void dDlst_shadowControl_c::imageDraw(Mtx mtx) { -// #include "assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.h" - static char l_matDL[] ALIGN_DECL(32) = { - 0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, - 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0C, 0x80, 0x80, 0x80, 0x80, 0x61, 0x28, 0x38, - 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFA, 0x61, 0xC1, 0x08, 0xFF, 0xF0, 0x61, 0x43, 0x00, - 0x00, 0x41, 0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, - 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x40, 0x10, - 0x61, 0xEE, 0x00, 0x00, 0x00, 0x61, 0xEF, 0x00, 0x00, 0x00, 0x61, 0xF0, 0x00, 0x00, 0x00, - 0x61, 0xF1, 0x00, 0x00, 0x00, 0x61, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - }; + #include "assets/l_matDL__imageDraw__21dDlst_shadowControl_cFPA4_f.h" GXSetViewport(0.0f, 0.0f, 256.0f, 256.0f, 0.0f, 1.0f); GXSetScissor(0, 0, 0x100, 0x100); @@ -2013,17 +1993,7 @@ void dDlst_alphaVolPacket::draw() { /* 80085AF4-80085BBC .text draw__23dDlst_alphaInvVolPacketFv */ void dDlst_alphaInvVolPacket::draw() { -// #include "assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h" - static char l_backMat[] ALIGN_DECL(32) = { - 0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, - 0x00, 0x04, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, - 0x08, 0xFF, 0x90, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x07, 0x61, 0x41, - 0x00, 0x01, 0x14, 0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, - 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x80, - 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, - }; + #include "assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h" GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); GXClearVtxDesc(); diff --git a/src/d/d_wood.cpp b/src/d/d_wood.cpp index 05466d38..2c54e43b 100644 --- a/src/d/d_wood.cpp +++ b/src/d/d_wood.cpp @@ -26,9 +26,6 @@ #include "weak_data_2100_2080.h" // IWYU pragma: keep -#define CONST_U32(v) ((u8)((v) >> 16)), ((u8)((v) >> 8)), ((u8)((v) >> 0)) -#define IMAGE_ADDR(addr) CONST_U32((u32)(addr) >> 5) - //----------------------------------------- // Types //----------------------------------------- @@ -77,137 +74,7 @@ namespace dWood { namespace { // .data -// #include "assets/l_Txa_swood_bTEX.h" -u8 l_Txa_swood_bTEX[] ALIGN_DECL(32) = { - 0x34, 0x66, 0x3C, 0xE7, 0xFF, 0xFF, 0x55, 0x80, 0x3C, 0x86, 0x3C, 0xE7, 0xFF, 0xFF, 0x5B, 0x95, - 0x2C, 0x05, 0x2B, 0xC4, 0x2D, 0xA0, 0xA0, 0x00, 0x3C, 0xC7, 0x2C, 0x05, 0x78, 0x57, 0x55, 0x55, - 0x00, 0x00, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0x7F, 0x3C, 0xA7, 0x3D, 0x07, 0xFF, 0xFF, 0xFA, 0x81, - 0x2C, 0x25, 0x3C, 0xC7, 0x5D, 0x55, 0x95, 0x24, 0x3C, 0xE7, 0x2B, 0xE5, 0x0A, 0x37, 0xD5, 0x75, - 0x3C, 0xC7, 0x3C, 0xE7, 0xFF, 0xFF, 0x3F, 0x4F, 0x00, 0x00, 0x3C, 0xC7, 0xFF, 0xFF, 0xFF, 0xFD, - 0x3C, 0xA7, 0x3C, 0xE7, 0xAF, 0x5D, 0x55, 0x14, 0x3C, 0xC7, 0x2C, 0x05, 0x00, 0x00, 0x0B, 0xD5, - 0x00, 0x00, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0x57, 0x3C, 0xE7, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, - 0x34, 0x46, 0x3C, 0xE7, 0x57, 0x57, 0x17, 0x17, 0x3C, 0xC7, 0x3C, 0xC7, 0xFF, 0xFF, 0xFF, 0xFF, - 0x3C, 0xE7, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, 0x3C, 0xE7, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, - 0x3C, 0xC7, 0x3C, 0xC7, 0xFF, 0xFF, 0xFF, 0xFF, 0x3C, 0xE7, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, - 0x3C, 0xE7, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x3C, 0xE7, 0xFF, 0xFD, 0xF5, 0xF5, - 0x3C, 0xC7, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0x95, 0x34, 0x25, 0x3C, 0xE7, 0xF5, 0xD5, 0xD6, 0xD4, - 0x3C, 0xC7, 0x3C, 0xE7, 0xFF, 0x7F, 0x87, 0x55, 0x3C, 0xE7, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, - 0x3C, 0xC7, 0x2B, 0xE5, 0xE0, 0x5C, 0x56, 0x5F, 0x3C, 0xA7, 0x3C, 0xE7, 0x7F, 0x7F, 0x5D, 0x95, - 0x3C, 0xE7, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, 0x3C, 0xE7, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, - 0x2C, 0x25, 0x3C, 0xC7, 0xF5, 0x55, 0x56, 0x40, 0x3C, 0xC7, 0x2B, 0xC5, 0x00, 0x00, 0xFF, 0x5D, - 0x2C, 0x25, 0x2B, 0xE5, 0xAE, 0x38, 0x03, 0x3E, 0x2C, 0x25, 0x2B, 0xC5, 0x80, 0xA0, 0x72, 0xAE, - 0x2C, 0x25, 0x2B, 0xC5, 0x2A, 0xE2, 0xE0, 0x62, 0x2C, 0x05, 0x23, 0x84, 0x05, 0xA5, 0x25, 0x85, - 0x2C, 0x25, 0x2B, 0xE5, 0xE1, 0x9A, 0xFC, 0x3A, 0x2C, 0x05, 0x2B, 0xE5, 0x82, 0xC3, 0x00, 0xC2, - 0x2C, 0x05, 0x23, 0x84, 0x80, 0x60, 0x58, 0x56, 0x2C, 0x05, 0x2B, 0xC5, 0x80, 0x03, 0xF0, 0x0E, - 0x3C, 0xE7, 0x2C, 0x05, 0x81, 0x85, 0xF7, 0x55, 0x34, 0x46, 0x2B, 0xE5, 0xFB, 0xE9, 0xFA, 0xB4, - 0x2C, 0x05, 0x23, 0x84, 0x00, 0x28, 0xD0, 0x58, 0x3C, 0xE7, 0x2B, 0xE5, 0x54, 0x5C, 0x77, 0x5D, - 0x34, 0x86, 0x3C, 0xE7, 0x17, 0x17, 0x9F, 0x5F, 0x3C, 0xE7, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, - 0x2C, 0x05, 0x3C, 0xC7, 0x5F, 0x55, 0x95, 0x01, 0x00, 0x00, 0x3C, 0xE7, 0xFD, 0x5D, 0x5F, 0x5F, - 0x3C, 0xC7, 0x3C, 0xE7, 0xFF, 0xFF, 0xF9, 0x55, 0x3C, 0xC7, 0x3C, 0xE7, 0xFD, 0xFD, 0x59, 0x41, - 0x3C, 0xE7, 0x2B, 0xC5, 0x00, 0x0F, 0x0D, 0x01, 0x3C, 0xA7, 0x23, 0x84, 0x00, 0xFA, 0xEF, 0xF7, - 0x3C, 0xE7, 0x2C, 0x05, 0x00, 0x26, 0x25, 0x25, 0x3C, 0xE7, 0x2C, 0x05, 0x01, 0x0D, 0xF5, 0x55, - 0x3D, 0x07, 0x2C, 0x05, 0x25, 0xF5, 0x55, 0x55, 0x2C, 0x05, 0x23, 0x84, 0x00, 0x20, 0x00, 0x60, - 0x2C, 0x05, 0x2B, 0xC5, 0x08, 0x00, 0x60, 0x82, 0x3C, 0xC7, 0x2B, 0xE5, 0xC2, 0x6D, 0x55, 0xF5, - 0x2C, 0x05, 0x2B, 0xC5, 0x30, 0x02, 0x02, 0x00, 0x2C, 0x05, 0x23, 0x84, 0x0A, 0x0D, 0x0D, 0x15, - 0x2C, 0x25, 0x2B, 0xE5, 0x98, 0x5B, 0xA3, 0x89, 0x2C, 0x05, 0x2B, 0xC5, 0x20, 0x00, 0x02, 0x0C, - 0x2C, 0x05, 0x23, 0x64, 0xA8, 0x78, 0x58, 0xFC, 0x2C, 0x05, 0x2B, 0xE5, 0x20, 0x90, 0x09, 0x02, - 0x2C, 0x25, 0x2B, 0xC5, 0xA2, 0xB8, 0x98, 0x02, 0x2C, 0x25, 0x23, 0x84, 0x85, 0x2D, 0x3D, 0x89, - 0x2C, 0x25, 0x2B, 0xE5, 0x26, 0x76, 0x7A, 0x82, 0x2C, 0x05, 0x2B, 0xA4, 0x01, 0x02, 0x02, 0x02, - 0x2B, 0x84, 0x23, 0x64, 0x08, 0x00, 0x20, 0x00, 0x2C, 0x05, 0x23, 0x84, 0x03, 0x81, 0x49, 0x6D, - 0x23, 0x84, 0x23, 0x64, 0x00, 0x00, 0x02, 0x22, 0x23, 0x84, 0x23, 0x64, 0x02, 0x00, 0x00, 0x00, - 0x2C, 0x25, 0x23, 0x84, 0x58, 0x7A, 0x7A, 0x70, 0x2C, 0x05, 0x2B, 0xE5, 0xA0, 0x80, 0x00, 0x23, - 0x2C, 0x25, 0x23, 0x84, 0x78, 0x68, 0x60, 0xEF, 0x2C, 0x05, 0x2B, 0xC5, 0x02, 0x98, 0x20, 0x55, - 0x3C, 0xC7, 0x2C, 0x05, 0x5C, 0x50, 0x70, 0x40, 0x3C, 0xC7, 0x3C, 0xE7, 0x7F, 0xBF, 0xFF, 0x5F, - 0x3C, 0xC7, 0x2C, 0x05, 0x78, 0x55, 0x55, 0x55, 0x3C, 0xE7, 0x2B, 0xC5, 0x00, 0xE0, 0x58, 0xE0, - 0x34, 0x46, 0x3C, 0xE7, 0xD4, 0xF5, 0xFD, 0xFD, 0x3C, 0xE7, 0x2C, 0x05, 0x55, 0xD5, 0x0B, 0x03, - 0x2B, 0xE5, 0x3C, 0xE7, 0xD5, 0x58, 0x58, 0x56, 0x34, 0x46, 0x2B, 0xE5, 0x03, 0x5F, 0x7D, 0x7D, - 0x2C, 0x05, 0x2B, 0xC5, 0x03, 0x08, 0x00, 0x82, 0x2C, 0x05, 0x23, 0x84, 0x5C, 0x56, 0xD5, 0xD5, - 0x2C, 0x05, 0x2B, 0xE5, 0x02, 0x08, 0x88, 0x00, 0x2C, 0x25, 0x23, 0x84, 0x95, 0x35, 0x25, 0x2D, - 0x2C, 0x05, 0x23, 0x84, 0x08, 0x02, 0x03, 0x4D, 0x2B, 0xC5, 0x23, 0x84, 0x17, 0xFF, 0xFF, 0x75, - 0x2B, 0xC5, 0x23, 0x64, 0x8B, 0xFF, 0xFF, 0xAD, 0x23, 0x84, 0x23, 0x64, 0x00, 0x00, 0x08, 0x08, - 0x2C, 0x05, 0x23, 0x84, 0x5C, 0x5C, 0x58, 0x70, 0x2C, 0x05, 0x2B, 0xC5, 0xE0, 0x08, 0x00, 0x08, - 0x2C, 0x05, 0x23, 0x84, 0x60, 0xC2, 0xC0, 0x80, 0x2C, 0x25, 0x2B, 0xC5, 0x0A, 0x0A, 0xCA, 0x88, - 0x2C, 0x05, 0x2B, 0xC5, 0x02, 0xA0, 0x00, 0x62, 0x2C, 0x05, 0x2B, 0xE5, 0x02, 0x00, 0xF0, 0x51, - 0x2C, 0x25, 0x2B, 0xC5, 0x60, 0x0B, 0x28, 0xF0, 0x2C, 0x25, 0x2B, 0xC5, 0x8B, 0x7E, 0xAA, 0x82, - 0x2C, 0x05, 0x23, 0x84, 0xD5, 0x35, 0x25, 0x09, 0x23, 0x84, 0x23, 0x64, 0x80, 0x00, 0x00, 0x00, - 0x2C, 0x05, 0x23, 0x84, 0x01, 0x02, 0x00, 0x03, 0x2B, 0xE5, 0x23, 0x84, 0x55, 0x57, 0xD5, 0x15, - 0x23, 0x84, 0x23, 0x64, 0x02, 0x00, 0x00, 0x80, 0x2C, 0x05, 0x23, 0x84, 0x55, 0x56, 0x50, 0x80, - 0x2C, 0x05, 0x23, 0x84, 0x78, 0x70, 0x50, 0x58, 0x2C, 0x05, 0x2B, 0xC5, 0x0E, 0x00, 0x00, 0x02, - 0x34, 0x86, 0x2B, 0xE5, 0x5E, 0xDC, 0x7D, 0x5F, 0x2C, 0x25, 0x3D, 0x07, 0x97, 0x7F, 0x9F, 0x27, - 0x34, 0x46, 0x2B, 0xC5, 0xA7, 0xFA, 0xDB, 0xE2, 0x3C, 0xE7, 0x2C, 0x05, 0x70, 0x58, 0x5C, 0x5C, - 0x3C, 0xC7, 0x3C, 0xE7, 0xD5, 0xFD, 0xFF, 0xFF, 0x2C, 0x05, 0x3C, 0xE7, 0x80, 0x58, 0xD4, 0x50, - 0x3C, 0xC7, 0x3C, 0xE7, 0xFF, 0x7E, 0x7D, 0x3D, 0x3C, 0xE7, 0x2C, 0x05, 0x25, 0x25, 0x3D, 0x00, - 0x2C, 0x05, 0x23, 0x84, 0x00, 0x00, 0x0B, 0x35, 0x2C, 0x05, 0x23, 0x84, 0x09, 0xB5, 0x55, 0x55, - 0x3C, 0x86, 0x23, 0x84, 0x95, 0xEF, 0xEE, 0x00, 0x2C, 0x05, 0x23, 0x84, 0x75, 0x05, 0x0D, 0x05, - 0x23, 0x84, 0x23, 0x64, 0x00, 0x80, 0x80, 0x02, 0x2B, 0xE5, 0x23, 0x84, 0x57, 0x54, 0xDC, 0x50, - 0x23, 0x84, 0x23, 0x64, 0x02, 0x00, 0x80, 0x02, 0x2C, 0x05, 0x23, 0x64, 0xF0, 0x60, 0x40, 0xC0, - 0x2C, 0x25, 0x2B, 0xE5, 0x0A, 0xBA, 0xAB, 0xB8, 0x8B, 0x28, 0x2C, 0x05, 0x55, 0x57, 0x58, 0xE0, - 0x83, 0x28, 0x2C, 0x05, 0x57, 0x5C, 0x60, 0x80, 0x8B, 0x28, 0x83, 0x48, 0x4F, 0xBF, 0xFF, 0xFF, - 0x2C, 0x25, 0x2B, 0xA4, 0xE0, 0x2A, 0xAA, 0xA2, 0x2C, 0x25, 0x2B, 0xE5, 0x3C, 0x3E, 0x16, 0x3B, - 0x2C, 0x05, 0x2B, 0xA4, 0x08, 0x24, 0x08, 0x00, 0x2C, 0x05, 0x2B, 0xC5, 0x03, 0x00, 0x00, 0x28, - 0x2C, 0x05, 0x2B, 0xC5, 0x07, 0x00, 0x00, 0x02, 0x2C, 0x05, 0x23, 0x84, 0x35, 0x25, 0x0D, 0x09, - 0x2C, 0x25, 0x2B, 0xE5, 0x82, 0x82, 0xEB, 0xA2, 0x2C, 0x05, 0x23, 0x84, 0x81, 0x02, 0x08, 0x00, - 0x2C, 0x25, 0x23, 0x84, 0x5C, 0x5C, 0x54, 0x56, 0x2C, 0x05, 0x2B, 0xC5, 0x32, 0x02, 0x0E, 0x80, - 0x2B, 0xE5, 0x23, 0x84, 0x57, 0x54, 0x94, 0x3C, 0x3C, 0xA7, 0x2B, 0xE5, 0x75, 0xD6, 0x58, 0xE0, - 0x2C, 0x05, 0x3C, 0xE7, 0x25, 0x25, 0x17, 0x17, 0x3C, 0xC7, 0x3C, 0xE7, 0x85, 0x55, 0xFF, 0xFF, - 0x3C, 0xC7, 0x3C, 0xE7, 0x1F, 0x5F, 0xBF, 0x5F, 0x3C, 0xE7, 0x3D, 0x07, 0xFF, 0xFF, 0xFC, 0xFD, - 0x3C, 0xC7, 0x3C, 0xE7, 0x3F, 0x7F, 0xFF, 0xFF, 0x3C, 0xC7, 0x3C, 0xE7, 0x55, 0xFF, 0xFF, 0xFF, - 0x2B, 0xE5, 0x3C, 0xC7, 0xFF, 0x57, 0x55, 0x49, 0x00, 0x00, 0x3C, 0xE7, 0xFF, 0xFF, 0xFF, 0x7F, - 0x3C, 0xA7, 0x3C, 0xE7, 0x5D, 0xFE, 0xF4, 0xF6, 0x2C, 0x25, 0x23, 0x84, 0x25, 0x25, 0x25, 0x25, - 0x3C, 0x86, 0x3C, 0xE7, 0xF4, 0xF6, 0xFE, 0x55, 0x3C, 0xC7, 0x23, 0x84, 0xF5, 0xFD, 0xBD, 0x2F, - 0x2C, 0x05, 0x23, 0x84, 0x55, 0x56, 0x5C, 0x58, 0x8B, 0x28, 0x33, 0xE5, 0x56, 0x58, 0x60, 0x80, - 0x83, 0x28, 0x2B, 0xA4, 0x56, 0x58, 0x60, 0xC0, 0xA4, 0x2C, 0x83, 0x28, 0x55, 0x55, 0x55, 0x54, - 0x8B, 0x49, 0x83, 0x08, 0x80, 0x00, 0x02, 0x0C, 0xA4, 0x2C, 0x83, 0x28, 0x55, 0x55, 0x55, 0x25, - 0xEE, 0x73, 0x83, 0x28, 0x56, 0x70, 0xC0, 0x00, 0xEE, 0x73, 0x8B, 0x48, 0x0D, 0x01, 0x01, 0x01, - 0x2C, 0x05, 0x2B, 0xC5, 0x07, 0x28, 0x80, 0x00, 0x2C, 0x25, 0x2B, 0xE5, 0x28, 0x28, 0xD6, 0x6A, - 0x2C, 0x25, 0x2B, 0xE5, 0x8A, 0xEA, 0xE8, 0xE0, 0x2C, 0x05, 0x2B, 0xE5, 0x00, 0x80, 0xA2, 0xB0, - 0x2C, 0x05, 0x2B, 0xE5, 0x02, 0x20, 0x08, 0x01, 0x2C, 0x25, 0x2B, 0xC5, 0x2A, 0xA5, 0x8A, 0x68, - 0x2C, 0x05, 0x2B, 0xE5, 0x20, 0x02, 0x03, 0x20, 0x2C, 0x05, 0x2B, 0xC5, 0x08, 0x02, 0x20, 0xE0, - 0x2C, 0x05, 0x2B, 0xC5, 0x00, 0x00, 0x09, 0x02, 0x34, 0x25, 0x2B, 0xE5, 0x00, 0x28, 0xE4, 0x8F, - 0x2C, 0x05, 0x2B, 0xE5, 0x0A, 0xC1, 0x88, 0x20, 0x2C, 0x05, 0x2B, 0xA5, 0x02, 0xC0, 0x0A, 0x0D, - 0x3C, 0xE7, 0x2C, 0x05, 0x80, 0x70, 0x56, 0x75, 0x2C, 0x05, 0x3C, 0xE7, 0xF5, 0x76, 0x54, 0x58, - 0x2C, 0x05, 0x2B, 0xE5, 0x82, 0x22, 0x00, 0x00, 0x3C, 0xA7, 0x2C, 0x05, 0x85, 0x55, 0x5D, 0x55, - 0x34, 0x86, 0x2B, 0xE5, 0xF4, 0x5C, 0xDE, 0xDF, 0x34, 0x46, 0x3C, 0xE7, 0x7D, 0x55, 0x55, 0x54, - 0x2C, 0x05, 0x2B, 0xE5, 0x0A, 0xE0, 0x0E, 0x08, 0x45, 0x07, 0x2C, 0x05, 0x8D, 0xE5, 0x55, 0x55, - 0x3C, 0xE7, 0x2C, 0x05, 0x02, 0x2D, 0xD7, 0x55, 0x83, 0x28, 0x2C, 0x25, 0x57, 0x5C, 0x70, 0x40, - 0x8B, 0x28, 0x2B, 0xE5, 0x55, 0x56, 0x5C, 0x58, 0x83, 0x28, 0x6B, 0x67, 0x40, 0x00, 0x00, 0x00, - 0x93, 0x89, 0x83, 0x07, 0xFF, 0xFF, 0xFD, 0xFC, 0xEE, 0x73, 0x83, 0x08, 0x5C, 0x70, 0xC0, 0x00, - 0xBC, 0xCE, 0x83, 0x28, 0x54, 0x54, 0x57, 0x55, 0xEE, 0x74, 0x83, 0x28, 0x00, 0x00, 0x80, 0x5F, - 0xEE, 0x94, 0xE6, 0x52, 0x1E, 0x60, 0x80, 0x02, 0xEE, 0x93, 0x83, 0x08, 0x09, 0x09, 0x09, 0x09, - 0xEE, 0x74, 0xAC, 0x8D, 0x00, 0x00, 0x00, 0x55, 0xEE, 0x74, 0x83, 0x08, 0x0D, 0x0D, 0x25, 0xD5, - 0x2C, 0x25, 0x2B, 0xC5, 0x0B, 0xAB, 0x98, 0x08, 0x2C, 0x25, 0x2B, 0xE5, 0xAF, 0xA8, 0x22, 0xAC, - 0x2C, 0x25, 0x2B, 0xE5, 0xEE, 0x7B, 0xDA, 0xAC, 0x2C, 0x05, 0x2B, 0xC5, 0x1C, 0x22, 0x0C, 0x0A, - 0x2C, 0x05, 0x2B, 0xE5, 0x01, 0x50, 0xE2, 0x80, 0x2C, 0x05, 0x2B, 0xE5, 0x80, 0x20, 0xE2, 0x8B, - 0x2C, 0x25, 0x2B, 0xE5, 0x6E, 0xA6, 0xB8, 0x8A, 0x2C, 0x25, 0x2B, 0xC5, 0x3A, 0x3E, 0x0A, 0x00, - 0x2C, 0x05, 0x2B, 0xA4, 0x20, 0x00, 0x20, 0x24, 0x2C, 0x05, 0x23, 0x84, 0x01, 0x23, 0x03, 0x08, - 0x2C, 0x25, 0x2B, 0xE5, 0x96, 0xF0, 0xA0, 0x8F, 0x2C, 0x05, 0x2B, 0xC5, 0x40, 0x80, 0x02, 0x02, - 0x2B, 0xE5, 0x23, 0x84, 0xC0, 0x70, 0x5C, 0xF6, 0x2C, 0x25, 0x2B, 0xE5, 0x28, 0xBE, 0xB8, 0xAD, - 0x2B, 0xE5, 0x23, 0x84, 0x9D, 0x35, 0x25, 0x07, 0x2C, 0x05, 0x23, 0x84, 0x80, 0x40, 0x70, 0x70, - 0x2C, 0x05, 0x2B, 0xC5, 0x00, 0x92, 0x30, 0x00, 0x2C, 0x05, 0x23, 0x64, 0x02, 0x8B, 0x2D, 0xD5, - 0x2C, 0x05, 0x2B, 0x84, 0x00, 0x03, 0x09, 0x0D, 0x2C, 0x25, 0x23, 0x84, 0x57, 0x57, 0x56, 0x5C, - 0x5B, 0x87, 0x2B, 0xE5, 0x5C, 0xD5, 0x55, 0x55, 0x8B, 0x48, 0x2C, 0x05, 0x80, 0x58, 0x5C, 0x5C, - 0x2C, 0x05, 0x2B, 0xC5, 0x00, 0x87, 0x00, 0x20, 0xA3, 0xA8, 0x2C, 0x05, 0x58, 0x55, 0x55, 0x5C, - 0xA3, 0xC8, 0x83, 0x28, 0x55, 0x55, 0xFF, 0x00, 0xA3, 0xC8, 0x83, 0x28, 0x55, 0x55, 0xFF, 0x00, - 0xA3, 0xC8, 0x7A, 0xE7, 0xAA, 0x55, 0xFF, 0x00, 0xA3, 0xC8, 0x7A, 0xE7, 0xAA, 0x55, 0xFF, 0x00, - 0xA3, 0xC8, 0x83, 0x28, 0x55, 0x55, 0xFF, 0x00, 0xA3, 0xC8, 0x83, 0x28, 0x55, 0x55, 0xFF, 0x00, - 0xA3, 0xC8, 0x7A, 0xE7, 0xAA, 0x55, 0xFF, 0x00, 0xA3, 0xA8, 0x7A, 0xE7, 0xAA, 0x55, 0xFF, 0x00, - 0x2C, 0x25, 0x2B, 0xE5, 0xAA, 0x51, 0xA1, 0xE1, 0x2C, 0x25, 0x2B, 0xE5, 0x52, 0xA0, 0xC2, 0x40, - 0x2C, 0x25, 0x2B, 0x84, 0x82, 0x02, 0xA0, 0x70, 0x2C, 0x25, 0x2B, 0xE5, 0x82, 0xE3, 0xAA, 0x08, - 0x2C, 0x25, 0x2B, 0xC5, 0x2B, 0xBE, 0xAA, 0x08, 0x2C, 0x05, 0x2B, 0xC5, 0x0A, 0xC3, 0x88, 0x08, - 0x2C, 0x05, 0x2B, 0xE5, 0x80, 0x4F, 0x8A, 0x01, 0x2C, 0x25, 0x2B, 0xE5, 0x06, 0x0A, 0xCF, 0xCD, - 0x2C, 0x25, 0x2B, 0xE5, 0xA6, 0xCA, 0x82, 0x2A, 0x2C, 0x05, 0x2B, 0xC5, 0x20, 0x00, 0x0A, 0x04, - 0x2C, 0x25, 0x2B, 0xE5, 0xBA, 0xB0, 0x8A, 0x8F, 0x2C, 0x05, 0x2B, 0xE5, 0x00, 0x38, 0x14, 0x02, - 0x2C, 0x25, 0x23, 0x84, 0x05, 0x8D, 0x89, 0x01, 0x2C, 0x05, 0x23, 0x84, 0x5C, 0x54, 0xD6, 0x55, - 0x2C, 0x05, 0x2B, 0xE5, 0x21, 0x00, 0x80, 0x42, 0x2C, 0x05, 0x23, 0x84, 0x55, 0x95, 0x35, 0x25, - 0x2B, 0xE5, 0x23, 0x84, 0x05, 0x35, 0x1D, 0xD5, 0x2C, 0x25, 0x23, 0x84, 0x58, 0x70, 0x60, 0xC0, - 0x2C, 0x05, 0x23, 0x84, 0x57, 0x5C, 0x58, 0x70, 0x2C, 0x25, 0x2B, 0xE5, 0xEB, 0x26, 0x0A, 0x01, - 0x2C, 0x25, 0x2B, 0xC5, 0xBA, 0x22, 0x2A, 0xA8, 0xAB, 0xA8, 0x2C, 0x05, 0x5C, 0x55, 0x55, 0x5C, - 0x2C, 0x05, 0x2B, 0xC5, 0x88, 0x08, 0x38, 0x2C, 0xA3, 0xA8, 0x2C, 0x05, 0x58, 0x55, 0x55, 0x55, - 0xA3, 0xC8, 0x7A, 0xE7, 0xAA, 0x55, 0xFF, 0x00, 0xA3, 0xC8, 0x7A, 0xE7, 0xAA, 0x55, 0xFF, 0x00, - 0x93, 0x47, 0x73, 0x07, 0x00, 0x7F, 0xAA, 0xAA, 0x93, 0x47, 0x7A, 0xE7, 0x00, 0x55, 0xAA, 0xAA, - 0xA3, 0xC8, 0x7A, 0xE7, 0xAA, 0x55, 0xFF, 0x00, 0xA3, 0xC8, 0x7A, 0xE7, 0xAA, 0x55, 0xFF, 0x00, - 0x93, 0x47, 0x7A, 0xE7, 0x00, 0x55, 0xAA, 0xAA, 0x93, 0x47, 0x7A, 0xE7, 0x00, 0x55, 0xAA, 0xAA, -}; +#include "assets/l_Txa_swood_bTEX.h" const u16 l_Txa_swood_bTEX__width = 64; const u16 l_Txa_swood_bTEX__height = 64; @@ -312,62 +179,10 @@ cXy l_texCoord[] = { {0.792867f, 1.0f}, }; -// #include "assets/l_Oba_swood_bDL.h" -u8 l_Oba_swood_bDL[] ALIGN_DECL(32) = { - 0x98, 0x00, 0x05, 0x2A, 0x07, 0x02, 0x2F, 0x07, 0x01, 0x30, 0x07, 0x00, 0x2E, 0x07, 0x02, 0x2D, - 0x07, 0x01, 0x98, 0x00, 0x05, 0x2D, 0x07, 0x01, 0x2C, 0x07, 0x02, 0x30, 0x07, 0x00, 0x2B, 0x07, - 0x01, 0x2A, 0x07, 0x02, 0x98, 0x00, 0x05, 0x23, 0x06, 0x02, 0x28, 0x06, 0x01, 0x29, 0x06, 0x00, - 0x27, 0x06, 0x02, 0x26, 0x06, 0x01, 0x98, 0x00, 0x05, 0x26, 0x06, 0x01, 0x25, 0x06, 0x02, 0x29, - 0x06, 0x00, 0x24, 0x06, 0x01, 0x23, 0x06, 0x02, 0x98, 0x00, 0x05, 0x1C, 0x05, 0x02, 0x21, 0x05, - 0x01, 0x22, 0x05, 0x00, 0x20, 0x05, 0x02, 0x1F, 0x05, 0x01, 0x98, 0x00, 0x05, 0x1F, 0x05, 0x01, - 0x1E, 0x05, 0x02, 0x22, 0x05, 0x00, 0x1D, 0x05, 0x01, 0x1C, 0x05, 0x02, 0x98, 0x00, 0x05, 0x15, - 0x04, 0x02, 0x1A, 0x04, 0x01, 0x1B, 0x04, 0x00, 0x19, 0x04, 0x02, 0x18, 0x04, 0x01, 0x98, 0x00, - 0x05, 0x18, 0x04, 0x01, 0x17, 0x04, 0x02, 0x1B, 0x04, 0x00, 0x16, 0x04, 0x01, 0x15, 0x04, 0x02, - 0x98, 0x00, 0x05, 0x0E, 0x03, 0x02, 0x13, 0x03, 0x01, 0x14, 0x03, 0x00, 0x12, 0x03, 0x02, 0x11, - 0x03, 0x01, 0x98, 0x00, 0x05, 0x11, 0x03, 0x01, 0x10, 0x03, 0x02, 0x14, 0x03, 0x00, 0x0F, 0x03, - 0x01, 0x0E, 0x03, 0x02, 0x98, 0x00, 0x05, 0x07, 0x02, 0x02, 0x0C, 0x02, 0x01, 0x0D, 0x01, 0x00, - 0x0B, 0x02, 0x02, 0x0A, 0x02, 0x01, 0x98, 0x00, 0x05, 0x0A, 0x02, 0x01, 0x09, 0x02, 0x02, 0x0D, - 0x01, 0x00, 0x08, 0x02, 0x01, 0x07, 0x02, 0x02, 0x98, 0x00, 0x05, 0x00, 0x00, 0x02, 0x05, 0x00, - 0x01, 0x06, 0x00, 0x00, 0x04, 0x00, 0x02, 0x03, 0x00, 0x01, 0x98, 0x00, 0x05, 0x03, 0x00, 0x01, - 0x02, 0x00, 0x02, 0x06, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -u8 l_Oba_swood_b_cutDL[] ALIGN_DECL(32) = { - 0x98, 0x00, 0x04, 0x31, 0x13, 0x06, 0x32, 0x11, 0x09, 0x3B, 0x0D, 0x08, 0x3C, 0x0B, 0x07, 0x98, - 0x00, 0x04, 0x3B, 0x0D, 0x07, 0x3D, 0x0C, 0x08, 0x31, 0x13, 0x09, 0x34, 0x00, 0x06, 0x98, 0x00, - 0x04, 0x31, 0x13, 0x06, 0x34, 0x00, 0x09, 0x38, 0x0A, 0x08, 0x39, 0x08, 0x07, 0x98, 0x00, 0x04, - 0x33, 0x12, 0x06, 0x31, 0x13, 0x09, 0x3A, 0x09, 0x08, 0x38, 0x0A, 0x07, 0x98, 0x00, 0x04, 0x3A, - 0x09, 0x07, 0x39, 0x08, 0x08, 0x33, 0x12, 0x09, 0x34, 0x00, 0x06, 0x98, 0x00, 0x04, 0x36, 0x0E, - 0x08, 0x33, 0x12, 0x06, 0x37, 0x0F, 0x07, 0x34, 0x00, 0x09, 0x98, 0x00, 0x04, 0x33, 0x12, 0x09, - 0x36, 0x0E, 0x07, 0x32, 0x11, 0x06, 0x35, 0x10, 0x08, 0x98, 0x00, 0x04, 0x32, 0x11, 0x06, 0x34, - 0x00, 0x09, 0x3C, 0x0B, 0x08, 0x3D, 0x0C, 0x07, 0x98, 0x00, 0x04, 0x32, 0x11, 0x09, 0x35, 0x10, - 0x07, 0x34, 0x00, 0x06, 0x37, 0x0F, 0x08, 0x98, 0x00, 0x03, 0x36, 0x0E, 0x03, 0x37, 0x0F, 0x04, - 0x35, 0x10, 0x05, 0x98, 0x00, 0x03, 0x3C, 0x0B, 0x03, 0x3D, 0x0C, 0x04, 0x3B, 0x0D, 0x05, 0x98, - 0x00, 0x03, 0x39, 0x08, 0x03, 0x3A, 0x09, 0x04, 0x38, 0x0A, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -u8 l_matDL[] ALIGN_DECL(32) = { - 0x61, 0x80, 0x00, 0x01, 0x3A, - 0x61, 0x84, 0x00, 0x00, 0x00, - 0x61, 0x88, 0xE0, 0xFC, 0x3F, - 0x61, 0x94, IMAGE_ADDR(&l_Txa_swood_bTEX), - 0x61, 0x30, 0x00, (l_Txa_swood_bTEX__width >> 0x08), (l_Txa_swood_bTEX__width >> 0x00), - 0x61, 0x31, 0x00, (l_Txa_swood_bTEX__height >> 0x08), (l_Txa_swood_bTEX__height >> 0x00), - 0x10, 0x00, 0x00, 0x10, 0x40, 0xFF, 0xFF, 0x42, 0x80, - 0x08, 0x30, 0x3C, 0xF3, 0xCF, 0x00, 0x10, 0x00, 0x00, - 0x10, 0x18, 0x3C, 0xF3, 0xCF, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x05, 0x43, 0x61, - 0x28, 0x3C, 0x00, 0x00, 0x61, 0xC0, 0x08, 0x24, 0xAF, 0x61, 0xC1, 0x08, 0xFF, 0xF0, 0x61, 0x28, - 0x3C, 0x00, 0x00, 0x61, 0xC2, 0x08, 0xF0, 0x8F, 0x61, 0xC3, 0x08, 0xEE, 0x70, 0x61, 0x40, 0x00, - 0x00, 0x17, 0x61, 0xF3, 0x64, 0x00, 0x00, 0x61, 0xF3, 0x64, 0xFE, 0xFE, 0x10, 0x00, 0x00, 0x10, - 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, - 0x00, 0x04, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, -}; +#include "assets/l_Oba_swood_bDL.h" +#include "assets/l_Oba_swood_b_cutDL.h" +#include "assets/l_matDL__d_wood.h" +l_matDL__d_wood(l_Txa_swood_bTEX); // .rodata const Attr_c L_attr = { diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index b1f61bf9..55ae8555 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -1740,17 +1740,8 @@ void mDoExt_onCupOffAupPacket::draw() { /* 800142F4-800143B8 .text draw__19mDoExt_invJntPacketFv */ void mDoExt_invJntPacket::draw() { - static u8 l_invisibleMat[] ALIGN_DECL(32) = { - 0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, - 0x00, 0x04, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFC, 0x61, 0xC1, - 0x08, 0xFF, 0xF0, 0x61, 0xF3, 0x7F, 0x00, 0x00, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, - 0x00, 0x00, 0x17, 0x61, 0xEE, 0x00, 0x00, 0x00, 0x61, 0xEF, 0x00, 0x00, 0x00, 0x61, 0xF0, - 0x00, 0x00, 0x00, 0x61, 0xF1, 0x00, 0x00, 0x00, 0x61, 0xF2, 0x00, 0x00, 0x00, 0x61, 0x41, - 0x00, 0x00, 0x04, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, - 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x40, 0x10, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - }; + #include "assets/l_invisibleMat__draw__19mDoExt_invJntPacketFv.h" + GXCallDisplayList(l_invisibleMat, 0x80); J3DModelData* modelData = mModel->getModelData(); J3DJoint* joint = modelData->getJointNodePointer(mJntNum); @@ -1766,57 +1757,10 @@ void mDoExt_invJntPacket::draw() { GFSetBlendModeEtc(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_CLEAR, 1, 0, 1); } -u8 l_matDL[] ALIGN_DECL(32) = { - 0x08, 0x30, 0x3C, 0xF3, 0xCF, 0x00, 0x10, 0x00, 0x00, 0x10, 0x18, 0x3C, 0xF3, 0xCF, 0x00, 0x10, - 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x05, 0x06, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x05, - 0x02, 0x10, 0x00, 0x00, 0x10, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0C, 0xFF, - 0xFF, 0xFF, 0xFF, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xF6, 0xAF, 0x61, 0xC1, 0x08, - 0xFF, 0xE0, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x17, 0x61, 0x41, 0x00, 0x00, - 0x0C, 0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, - 0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -u8 l_toonMatDL[] ALIGN_DECL(32) = { - 0x08, 0x30, 0x3C, 0xF3, 0xCF, 0x00, 0x10, 0x00, 0x00, 0x10, 0x18, 0x3C, 0xF3, 0xCF, 0x00, 0x10, - 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x05, 0x06, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x05, - 0x02, 0x10, 0x00, 0x00, 0x10, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0C, 0xFF, - 0xFF, 0xFF, 0xFF, 0x61, 0x28, 0x00, 0x00, 0x00, 0x61, 0xC0, 0x08, 0x24, 0xAF, 0x61, 0xC1, 0x08, - 0xFF, 0xF0, 0x61, 0x28, 0x00, 0x00, 0x00, 0x61, 0xC2, 0x08, 0xF6, 0x0F, 0x61, 0xC3, 0x08, 0xFF, - 0xE0, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x17, 0x61, 0x41, 0x00, 0x00, 0x0C, - 0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, - 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x04, 0x10, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -u8 l_mat1DL[] ALIGN_DECL(32) = { - 0x10, 0x00, 0x00, 0x10, 0x40, 0xFF, 0xFF, 0x42, 0x80, 0x08, 0x30, 0x3C, 0xF3, 0xCF, 0x00, 0x10, - 0x00, 0x00, 0x10, 0x18, 0x3C, 0xF3, 0xCF, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x05, - 0x06, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x05, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0A, 0x00, - 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x28, 0x38, 0x00, - 0x40, 0x61, 0xC0, 0x08, 0xFA, 0x8F, 0x61, 0xC1, 0x08, 0xFF, 0xF0, 0x61, 0x43, 0x00, 0x00, 0x41, - 0x61, 0x40, 0x00, 0x00, 0x17, 0x61, 0x41, 0x00, 0x00, 0x0C, 0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, - 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, - 0x01, 0x61, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -u8 l_toonMat1DL[] ALIGN_DECL(32) = { - 0x10, 0x00, 0x00, 0x10, 0x40, 0xFF, 0xFF, 0x42, 0x80, 0x08, 0x30, 0x3C, 0xF3, 0xCF, 0x00, 0x10, - 0x00, 0x00, 0x10, 0x18, 0x3C, 0xF3, 0xCF, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x05, - 0x06, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x05, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0A, 0x00, - 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x28, 0x3C, 0x00, - 0x00, 0x61, 0xC0, 0x08, 0x24, 0xAF, 0x61, 0xC1, 0x08, 0xFF, 0xF0, 0x61, 0x28, 0x3C, 0x00, 0x00, - 0x61, 0xC2, 0x08, 0xF0, 0x8F, 0x61, 0xC3, 0x08, 0xFF, 0xE0, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, - 0x40, 0x00, 0x00, 0x17, 0x61, 0x41, 0x00, 0x00, 0x0C, 0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, - 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, - 0x61, 0x00, 0x00, 0x04, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, -}; +#include "assets/l_matDL__m_Do_ext.h" +#include "assets/l_toonMatDL.h" +#include "assets/l_mat1DL.h" +#include "assets/l_toonMat1DL.h" /* 800143B8-80014580 .text init__15mDoExt_3Dline_cFUsii */ int mDoExt_3Dline_c::init(u16 numSegments, int hasSize, int hasTex) {