mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +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

4
asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s
View file

@ -43,11 +43,11 @@ glabel func_8096865C
/* 01D4C 8096869C 8FAA0064 */ lw $t2, 0x0064($sp)
/* 01D50 809686A0 8459001C */ lh $t9, 0x001C($v0) ## 0000001C
/* 01D54 809686A4 3C090401 */ lui $t1, %hi(D_040101A8) ## $t1 = 04010000
/* 01D58 809686A8 3C080401 */ lui $t0, %hi(D_04010130) ## $t0 = 04010000
/* 01D58 809686A8 3C080401 */ lui $t0, %hi(gGameKeepMoteDL0) ## $t0 = 04010000
/* 01D5C 809686AC 2B210009 */ slti $at, $t9, 0x0009
/* 01D60 809686B0 14200004 */ bne $at, $zero, .L809686C4
/* 01D64 809686B4 252901A8 */ addiu $t1, $t1, %lo(D_040101A8) ## $t1 = 040101A8
/* 01D68 809686B8 25080130 */ addiu $t0, $t0, %lo(D_04010130) ## $t0 = 04010130
/* 01D68 809686B8 25080130 */ addiu $t0, $t0, %lo(gGameKeepMoteDL0) ## $t0 = 04010130
/* 01D6C 809686BC 10000002 */ beq $zero, $zero, .L809686C8
/* 01D70 809686C0 AFA80054 */ sw $t0, 0x0054($sp)
.L809686C4:

4
asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s
View file

@ -79,10 +79,10 @@ glabel func_809688C4
/* 0205C 809689AC 46083302 */ mul.s $f12, $f6, $f8
/* 02060 809689B0 0C034348 */ jal Matrix_RotateY
/* 02064 809689B4 00000000 */ nop
/* 02068 809689B8 3C0F0401 */ lui $t7, %hi(D_04010130) ## $t7 = 04010000
/* 02068 809689B8 3C0F0401 */ lui $t7, %hi(gGameKeepMoteDL0) ## $t7 = 04010000
/* 0206C 809689BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 02070 809689C0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0
/* 02074 809689C4 25EF0130 */ addiu $t7, $t7, %lo(D_04010130) ## $t7 = 04010130
/* 02074 809689C4 25EF0130 */ addiu $t7, $t7, %lo(gGameKeepMoteDL0) ## $t7 = 04010130
/* 02078 809689C8 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00
/* 0207C 809689CC AFAF0058 */ sw $t7, 0x0058($sp)
/* 02080 809689D0 02E1F021 */ addu $s8, $s7, $at

4
asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s
View file

@ -390,8 +390,8 @@ glabel func_8098ABC0
/* 02274 8098B0F4 93AF00B7 */ lbu $t7, 0x00B7($sp)
/* 02278 8098B0F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 0227C 8098B0FC 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0
/* 02280 8098B100 3C0D0401 */ lui $t5, %hi(D_04010130) ## $t5 = 04010000
/* 02284 8098B104 25AD0130 */ addiu $t5, $t5, %lo(D_04010130) ## $t5 = 04010130
/* 02280 8098B100 3C0D0401 */ lui $t5, %hi(gGameKeepMoteDL0) ## $t5 = 04010000
/* 02284 8098B104 25AD0130 */ addiu $t5, $t5, %lo(gGameKeepMoteDL0) ## $t5 = 04010130
/* 02288 8098B108 02417021 */ addu $t6, $s2, $at
/* 0228C 8098B10C AFAE0078 */ sw $t6, 0x0078($sp)
/* 02290 8098B110 11E00007 */ beq $t7, $zero, .L8098B130

4
asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s
View file

@ -309,8 +309,8 @@ glabel func_8098B354
/* 028E4 8098B764 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 028E8 8098B768 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0
/* 028EC 8098B76C 44060000 */ mfc1 $a2, $f0
/* 028F0 8098B770 3C150401 */ lui $s5, %hi(D_04010130) ## $s5 = 04010000
/* 028F4 8098B774 26B50130 */ addiu $s5, $s5, %lo(D_04010130) ## $s5 = 04010130
/* 028F0 8098B770 3C150401 */ lui $s5, %hi(gGameKeepMoteDL0) ## $s5 = 04010000
/* 028F4 8098B774 26B50130 */ addiu $s5, $s5, %lo(gGameKeepMoteDL0) ## $s5 = 04010130
/* 028F8 8098B778 02C19021 */ addu $s2, $s6, $at
/* 028FC 8098B77C 0C034261 */ jal Matrix_Translate
/* 02900 8098B780 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000