Skip to content

Commit

Permalink
Use asset extractor for more symbols
Browse files Browse the repository at this point in the history
  • Loading branch information
LagoLunatic committed Nov 2, 2024
1 parent a250311 commit 6b31312
Show file tree
Hide file tree
Showing 10 changed files with 290 additions and 9,658 deletions.
81 changes: 81 additions & 0 deletions config/GZLE01/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1028,6 +1028,21 @@ modules:
hash: 7cef0d0967ffbdae93dfc4a28ef0b8a672b052c9
splits: config/GZLE01/rels/d_a_bwdg/splits.txt
symbols: config/GZLE01/rels/d_a_bwdg/symbols.txt
extract:
- symbol: l_B_sand2TEX
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
- symbol: l_Hsand1DL
binary: assets/l_Hsand1DL.bin
header: assets/l_Hsand1DL.h
- symbol: l_matDL
binary: assets/l_matDL.bin
header: assets/l_matDL.h
header_type: none
custom_type: matDL

- object: files/rels/d_a_bwds.rel
hash: 8b66ae454ccfa973424e666bc6f4e9d9e1521263
Expand Down Expand Up @@ -1939,6 +1954,19 @@ modules:
hash: 36cd36d17a50769045c087cbb56b26f4ad3a2b6e
splits: config/GZLE01/rels/d_a_sail/splits.txt
symbols: config/GZLE01/rels/d_a_sail/symbols.txt
extract:
- symbol: l_sail_DL
binary: assets/l_sail_DL.bin
header: assets/l_sail_DL.h
- symbol: l_sail_matDL
binary: assets/l_sail_matDL.bin
header: assets/l_sail_matDL.h
- symbol: l_Txa_kizoku_mastTEX
binary: assets/l_Txa_kizoku_mastTEX.bin
header: assets/l_Txa_kizoku_mastTEX.h
- symbol: l_AmastDL
binary: assets/l_AmastDL.bin
header: assets/l_AmastDL.h

- object: files/rels/d_a_salvage_tbox.rel
hash: 2ba5fbbd1af3135c5cdd0d97ad68899bb2627908
Expand Down Expand Up @@ -2243,3 +2271,56 @@ extract:
header: assets/l_matDL__d_hookshot.h
header_type: none
custom_type: matDL

- 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_YballDL
binary: assets/l_YballDL.bin
header: assets/l_YballDL.h
- symbol: l_YballMatDL
binary: assets/l_YballMatDL.bin
header: assets/l_YballMatDL.h

- symbol: l_K_kusa_00TEX
binary: assets/l_K_kusa_00TEX.bin
header: assets/l_K_kusa_00TEX.h
- symbol: l_Vmori_00DL
binary: assets/l_Vmori_00DL.bin
header: assets/l_Vmori_00DL.h
- symbol: l_Vmori_01DL
binary: assets/l_Vmori_01DL.bin
header: assets/l_Vmori_01DL.h
- symbol: l_Vmori_matDL
binary: assets/l_Vmori_matDL.bin
header: assets/l_Vmori_matDL.h
header_type: none
custom_type: matDL
- symbol: l_Txa_ob_kusa_aTEX
binary: assets/l_Txa_ob_kusa_aTEX.bin
header: assets/l_Txa_ob_kusa_aTEX.h
- symbol: l_Oba_kusa_aDL
binary: assets/l_Oba_kusa_aDL.bin
header: assets/l_Oba_kusa_aDL.h
- symbol: l_Oba_kusa_a_cutDL
binary: assets/l_Oba_kusa_a_cutDL.bin
header: assets/l_Oba_kusa_a_cutDL.h
- symbol: l_matDL!.data:0x80379ae0
binary: assets/l_matDL__d_grass.bin
header: assets/l_matDL__d_grass.h
header_type: none
custom_type: matDL

- symbol: l_sightMatDL
binary: assets/l_sightMatDL.bin
header: assets/l_sightMatDL.h
- symbol: l_sightDL!.data:0x8038a860
binary: assets/l_sightDL__d_a_boomerang.bin
header: assets/l_sightDL__d_a_boomerang.h

- symbol: l_sightDL!.data:0x8038fc80
binary: assets/l_sightDL__d_a_player_main.bin
header: assets/l_sightDL__d_a_player_main.h
81 changes: 81 additions & 0 deletions config/GZLJ01/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,21 @@ modules:
- object: files/rels/d_a_bwdg.rel
splits: config/GZLJ01/rels/d_a_bwdg/splits.txt
symbols: config/GZLJ01/rels/d_a_bwdg/symbols.txt
extract:
- symbol: l_B_sand2TEX
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
- symbol: l_Hsand1DL
binary: assets/l_Hsand1DL.bin
header: assets/l_Hsand1DL.h
- symbol: l_matDL
binary: assets/l_matDL.bin
header: assets/l_matDL.h
header_type: none
custom_type: matDL

- object: files/rels/d_a_bwds.rel
splits: config/GZLJ01/rels/d_a_bwds/splits.txt
Expand Down Expand Up @@ -1554,6 +1569,19 @@ modules:
- object: files/rels/d_a_sail.rel
splits: config/GZLJ01/rels/d_a_sail/splits.txt
symbols: config/GZLJ01/rels/d_a_sail/symbols.txt
extract:
- symbol: l_sail_DL
binary: assets/l_sail_DL.bin
header: assets/l_sail_DL.h
- symbol: l_sail_matDL
binary: assets/l_sail_matDL.bin
header: assets/l_sail_matDL.h
- symbol: l_Txa_kizoku_mastTEX
binary: assets/l_Txa_kizoku_mastTEX.bin
header: assets/l_Txa_kizoku_mastTEX.h
- symbol: l_AmastDL
binary: assets/l_AmastDL.bin
header: assets/l_AmastDL.h

- object: files/rels/d_a_salvage_tbox.rel
splits: config/GZLJ01/rels/d_a_salvage_tbox/splits.txt
Expand Down Expand Up @@ -1827,3 +1855,56 @@ extract:
header: assets/l_matDL__d_hookshot.h
header_type: none
custom_type: matDL

- 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_YballDL
binary: assets/l_YballDL.bin
header: assets/l_YballDL.h
- symbol: l_YballMatDL
binary: assets/l_YballMatDL.bin
header: assets/l_YballMatDL.h

- symbol: l_K_kusa_00TEX
binary: assets/l_K_kusa_00TEX.bin
header: assets/l_K_kusa_00TEX.h
- symbol: l_Vmori_00DL
binary: assets/l_Vmori_00DL.bin
header: assets/l_Vmori_00DL.h
- symbol: l_Vmori_01DL
binary: assets/l_Vmori_01DL.bin
header: assets/l_Vmori_01DL.h
- symbol: l_Vmori_matDL
binary: assets/l_Vmori_matDL.bin
header: assets/l_Vmori_matDL.h
header_type: none
custom_type: matDL
- symbol: l_Txa_ob_kusa_aTEX
binary: assets/l_Txa_ob_kusa_aTEX.bin
header: assets/l_Txa_ob_kusa_aTEX.h
- symbol: l_Oba_kusa_aDL
binary: assets/l_Oba_kusa_aDL.bin
header: assets/l_Oba_kusa_aDL.h
- symbol: l_Oba_kusa_a_cutDL
binary: assets/l_Oba_kusa_a_cutDL.bin
header: assets/l_Oba_kusa_a_cutDL.h
- symbol: l_matDL!.data:0x8036cf80
binary: assets/l_matDL__d_grass.bin
header: assets/l_matDL__d_grass.h
header_type: none
custom_type: matDL

- symbol: l_sightMatDL
binary: assets/l_sightMatDL.bin
header: assets/l_sightMatDL.h
- symbol: l_sightDL!.data:0x8037df00
binary: assets/l_sightDL__d_a_boomerang.bin
header: assets/l_sightDL__d_a_boomerang.h

- symbol: l_sightDL!.data:0x80383320
binary: assets/l_sightDL__d_a_player_main.bin
header: assets/l_sightDL__d_a_player_main.h
81 changes: 81 additions & 0 deletions config/GZLP01/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,21 @@ modules:
- object: files/rels/d_a_bwdg.rel
splits: config/GZLP01/rels/d_a_bwdg/splits.txt
symbols: config/GZLP01/rels/d_a_bwdg/symbols.txt
extract:
- symbol: l_B_sand2TEX
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
- symbol: l_Hsand1DL
binary: assets/l_Hsand1DL.bin
header: assets/l_Hsand1DL.h
- symbol: l_matDL
binary: assets/l_matDL.bin
header: assets/l_matDL.h
header_type: none
custom_type: matDL

- object: files/rels/d_a_bwds.rel
splits: config/GZLP01/rels/d_a_bwds/splits.txt
Expand Down Expand Up @@ -1554,6 +1569,19 @@ modules:
- object: files/rels/d_a_sail.rel
splits: config/GZLP01/rels/d_a_sail/splits.txt
symbols: config/GZLP01/rels/d_a_sail/symbols.txt
extract:
- symbol: l_sail_DL
binary: assets/l_sail_DL.bin
header: assets/l_sail_DL.h
- symbol: l_sail_matDL
binary: assets/l_sail_matDL.bin
header: assets/l_sail_matDL.h
- symbol: l_Txa_kizoku_mastTEX
binary: assets/l_Txa_kizoku_mastTEX.bin
header: assets/l_Txa_kizoku_mastTEX.h
- symbol: l_AmastDL
binary: assets/l_AmastDL.bin
header: assets/l_AmastDL.h

- object: files/rels/d_a_salvage_tbox.rel
splits: config/GZLP01/rels/d_a_salvage_tbox/splits.txt
Expand Down Expand Up @@ -1839,3 +1867,56 @@ extract:
header: assets/l_matDL__d_hookshot.h
header_type: none
custom_type: matDL

- 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_YballDL
binary: assets/l_YballDL.bin
header: assets/l_YballDL.h
- symbol: l_YballMatDL
binary: assets/l_YballMatDL.bin
header: assets/l_YballMatDL.h

- symbol: l_K_kusa_00TEX
binary: assets/l_K_kusa_00TEX.bin
header: assets/l_K_kusa_00TEX.h
- symbol: l_Vmori_00DL
binary: assets/l_Vmori_00DL.bin
header: assets/l_Vmori_00DL.h
- symbol: l_Vmori_01DL
binary: assets/l_Vmori_01DL.bin
header: assets/l_Vmori_01DL.h
- symbol: l_Vmori_matDL
binary: assets/l_Vmori_matDL.bin
header: assets/l_Vmori_matDL.h
header_type: none
custom_type: matDL
- symbol: l_Txa_ob_kusa_aTEX
binary: assets/l_Txa_ob_kusa_aTEX.bin
header: assets/l_Txa_ob_kusa_aTEX.h
- symbol: l_Oba_kusa_aDL
binary: assets/l_Oba_kusa_aDL.bin
header: assets/l_Oba_kusa_aDL.h
- symbol: l_Oba_kusa_a_cutDL
binary: assets/l_Oba_kusa_a_cutDL.bin
header: assets/l_Oba_kusa_a_cutDL.h
- symbol: l_matDL!.data:0x803807c0
binary: assets/l_matDL__d_grass.bin
header: assets/l_matDL__d_grass.h
header_type: none
custom_type: matDL

- symbol: l_sightMatDL
binary: assets/l_sightMatDL.bin
header: assets/l_sightMatDL.h
- symbol: l_sightDL!.data:0x80391540
binary: assets/l_sightDL__d_a_boomerang.bin
header: assets/l_sightDL__d_a_boomerang.h

- symbol: l_sightDL!.data:0x80396960
binary: assets/l_sightDL__d_a_player_main.bin
header: assets/l_sightDL__d_a_player_main.h
3 changes: 3 additions & 0 deletions src/d/actor/d_a_boomerang.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
#include "d/actor/d_a_boomerang.h"
#include "d/d_procname.h"

#include "assets/l_sightMatDL.h"
#include "assets/l_sightDL__d_a_boomerang.h"

/* 800E0C08-800E0D44 .text initBlur__18daBoomerang_blur_cFPA4_fs */
void daBoomerang_blur_c::initBlur(MtxP, s16) {
/* Nonmatching */
Expand Down
8 changes: 7 additions & 1 deletion src/d/actor/d_a_bwdg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@

static bwd_class* boss;

#include "d/actor/d_a_bwdg_data.inc"
#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_Hsand1DL.h"
#include "assets/l_matDL.h"
l_matDL(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
Expand Down
Loading

0 comments on commit 6b31312

Please sign in to comment.