mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +00:00
Code Issues Projects Releases Wiki Activity

Updated Texture Asset Handling (#478)

Browse source 
* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Fixed newline issue with ZAPD

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Fixed merge issues.

* Fixed makefile merge error

* Fixed additional merge error

* Fixed several more merge issues

* Commented out gameplay_keep and sk2 extraction, since currently unused.

* Reenabled gameplay_keep extraction since it's used in the spec

* Fixed build error

* Removed test struct

* Fixed makefile error that would happen on fresh builds

* Fixed merge issue

* Removed relative paths

* Multithreading on extraction, spec uses numbers, few changes to XMLs

* Removed redundant code from the extract_assets script

* object_sk2 and object_spot09_obj OK

* object_spot11_obj OK

* object_spot17_obj OK

* Test: One of the gameplay_keep dlists given a proper symbol

* Updated asset symbol names based on new naming scheme

* XMLs use "Offset" instead of "Address" now

* Fixed merge issues, updated ovl_Magic_Dark xml and gfx file

* Updated to use latest build of ZAPD

* Updated ZAPD again

* Updated ZAP to remove assimp dependency

* Jenkins Test: Added .gitkeep file

* Updated ZAP once more

* Updated png file name to comply with new naming scheme.

* Fixed bad include

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
This commit is contained in:
Nicholas Estelami 2020-12-26 06:39:52 -05:00 • committed by GitHub
parent 8fa6cb6ff9
commit b95643b397
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
182 changed files with 2249 additions and 1472 deletions
Download patch file Download diff file Expand all files Collapse all files

13
undefined_syms.txt
View file

@ -223,7 +223,6 @@ D_04006020 = 0x04006020;
D_0400C808 = 0x0400C808;
D_0400C820 = 0x0400C820;
D_0400CB70 = 0x0400CB70;
D_04010130 = 0x04010130;
D_04015720 = 0x04015720;
D_04015760 = 0x04015760;
D_040184B0 = 0x040184B0;
@ -291,9 +290,6 @@ D_06004E98 = 0x06004E98;
D_05017870 = 0x05017870;
D_05017A60 = 0x05017A60;
// z_en_vase
D_06000000 = 0x06000000;
// z_door_toki
D_06007888 = 0x06007888;
@ -304,12 +300,7 @@ D_060007D0 = 0x060007D0;
D_06001A38 = 0x06001A38;
D_06001C58 = 0x06001C58;
// z_bg_spot09_obj
D_06008010 = 0x06008010;
// z_bg_spot11_bakudankabe
D_06001A58 = 0x06001A58;
D_06001980 = 0x06001980;
D_0500A880 = 0x0500A880;
// z_bg_spot12_gate
@ -526,9 +517,6 @@ D_06001D8C = 0x06001D8C;
D_06002348 = 0x06002348;
D_06002E54 = 0x06002E54;
// z_bg_spot17_funen
D_06000B40 = 0x06000B40;
// z_bg_spot17_bakudankabe
D_06000A38 = 0x06000A38;
D_060008A0 = 0x060008A0;
@ -1591,7 +1579,6 @@ D_06005EA0 = 0x06005EA0;
D_0600018C = 0x0600018C;
// z_demo_effect
D_04010130 = 0x04010130;
D_06001240 = 0x06001240;
D_060010E0 = 0x060010E0;
D_060020A0 = 0x060020A0;