mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-17 05:15:16 +00:00
Code Issues Projects Releases Wiki Activity

Decompile Gameplay_Keep and fix all existing decompiled objects (#595)

Browse source 
* First batch of files

* Add missing folders back

* Fix missing folders again

* Finish fixing existing texture files

* Gameplay_Keep XML finished

* Most actor gameplay_keep undefined syms removed

* Only ~200 gkeep symbols remain

* All gkeep symbols that ZAP supports are fixed

* Cleanup, and make gkeep names more accurate

* Starting to figure out what some unknown blobs are, merge zeldaret in

* fix a few more things

* refactor gkeep

* Change how gitkeep is handled

* gkeep xml cleanup

* Gkeep finished, now just waiting up ZAP updates

* 100 link animations finished

* 150 link animations finished

* 200 link animations finished

* 250 link animations finished

* 350 link animations finished

* 400 link animations finished

* 450 link animations finished

* 500 link animations finished

* 550 link animations finished

* All Link animations finished

cannot build yet because ZAP doesn't have LinkAnimationHeader yet

* xml changes for new zap stuff

* finish gameplay_keep

* fixing existing objects

* ready for pr besides zap padding issue

* mostly ready for pr

* format all c files

* all conflicts fixed

* make changes that roman requested

* fix thing i didn't mean to change

* some animation symbols renamed

* fixed roman's stuff

* lifemeter hardcoded pointers removed

* fix issue with incorrect data in gameplay_keep

* removed unused asm

* fixed most of fig's comments

* fix all of fig's comments

* reformat files

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* fixed stuff

* fixed most of roman's comments

* remove leading zeroes

* should build now

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "f84d8337b"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "f84d8337b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* all of gkeep symbols fixed

* compiler error fixed

* format files

* final changes

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Zelllll 2021-01-24 18:36:40 -06:00 • committed by GitHub
parent 84195fcef6
commit 20c1f4e648
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
198 changed files with 4775 additions and 4232 deletions
Download patch file Download diff file Expand all files Collapse all files

4
asm/non_matchings/code/z_actor/func_8002FBAC.s
View file

@ -529,8 +529,8 @@ glabel func_8002FBAC
/* AA746C 800302CC 0C0346A2 */ jal Matrix_NewMtx
/* AA7470 800302D0 AFA20058 */ sw $v0, 0x58($sp)
/* AA7474 800302D4 8FA30058 */ lw $v1, 0x58($sp)
/* AA7478 800302D8 3C040401 */ lui $a0, %hi(gGameKeepMoteDL0) # $a0, 0x401
/* AA747C 800302DC 24840130 */ addiu $a0, %lo(gGameKeepMoteDL0) # addiu $a0, $a0, 0x130
/* AA7478 800302D8 3C040401 */ lui $a0, %hi(gEffFlash1DL) # $a0, 0x401
/* AA747C 800302DC 24840130 */ addiu $a0, %lo(gEffFlash1DL) # addiu $a0, $a0, 0x130
/* AA7480 800302E0 AC620004 */ sw $v0, 4($v1)
/* AA7484 800302E4 8FA500EC */ lw $a1, 0xec($sp)
/* AA7488 800302E8 3C18DE00 */ li $t8, 0xDE000000 # 0.000000

6
asm/non_matchings/code/z_kankyo/func_800730DC.s
View file

@ -446,7 +446,7 @@ glabel func_800730DC
/* AEA8B0 80073710 3C0E0405 */ li $t6, 0x04050000 # 0.000000
/* AEA8B4 80073714 244C0008 */ addiu $t4, $v0, 8
/* AEA8B8 80073718 AE0C02C0 */ sw $t4, 0x2c0($s0)
/* AEA8BC 8007371C 25CED1C0 */ addiu $t6, %lo(D_0404D1C0) # addiu $t6, $t6, -0x2e40
/* AEA8BC 8007371C 25CED1C0 */ addiu $t6, %lo(gSunDL) # addiu $t6, $t6, -0x2e40
/* AEA8C0 80073720 3C18DE00 */ li $t8, 0xDE000000 # 0.000000
/* AEA8C4 80073724 AC580000 */ sw $t8, ($v0)
/* AEA8C8 80073728 AC4E0004 */ sw $t6, 4($v0)
@ -587,11 +587,11 @@ glabel func_800730DC
/* AEAAD0 80073930 AC4F0000 */ sw $t7, ($v0)
/* AEAAD4 80073934 AC4D0004 */ sw $t5, 4($v0)
/* AEAAD8 80073938 8E0202C0 */ lw $v0, 0x2c0($s0)
/* AEAADC 8007393C 3C0A0404 */ lui $t2, %hi(D_04038F00) # $t2, 0x404
/* AEAADC 8007393C 3C0A0404 */ lui $t2, %hi(gMoonDL) # $t2, 0x404
/* AEAAE0 80073940 44CCF800 */ ctc1 $t4, $31
/* AEAAE4 80073944 24590008 */ addiu $t9, $v0, 8
/* AEAAE8 80073948 AE1902C0 */ sw $t9, 0x2c0($s0)
/* AEAAEC 8007394C 254A8F00 */ addiu $t2, %lo(D_04038F00) # addiu $t2, $t2, -0x7100
/* AEAAEC 8007394C 254A8F00 */ addiu $t2, %lo(gMoonDL) # addiu $t2, $t2, -0x7100
/* AEAAF0 80073950 3C09DE00 */ lui $t1, 0xde00
/* AEAAF4 80073954 AC490000 */ sw $t1, ($v0)
/* AEAAF8 80073958 AC4A0004 */ sw $t2, 4($v0)

4
asm/non_matchings/code/z_kankyo/func_80073A5C.s
View file

@ -600,8 +600,8 @@ glabel func_80073A5C
/* AEB468 800742C8 2A21000A */ slti $at, $s1, 0xa
.L800742CC:
/* AEB46C 800742CC 8E0702D0 */ lw $a3, 0x2d0($s0)
/* AEB470 800742D0 3C030403 */ lui $v1, %hi(D_04037730) # $v1, 0x403
/* AEB474 800742D4 24637730 */ addiu $v1, %lo(D_04037730) # addiu $v1, $v1, 0x7730
/* AEB470 800742D0 3C030403 */ lui $v1, %hi(gEffBurnMark1DL) # $v1, 0x403
/* AEB474 800742D4 24637730 */ addiu $v1, %lo(gEffBurnMark1DL) # addiu $v1, $v1, 0x7730
/* AEB478 800742D8 24E80008 */ addiu $t0, $a3, 8
/* AEB47C 800742DC AE0802D0 */ sw $t0, 0x2d0($s0)
/* AEB480 800742E0 3C0FDE00 */ lui $t7, 0xde00

6
asm/non_matchings/code/z_kankyo/func_80074704.s
View file

@ -157,8 +157,8 @@ glabel func_80074704
/* AEBA78 800748D8 C43EC7DC */ lwc1 $f30, %lo(D_8013C7DC)($at)
/* AEBA7C 800748DC 3C0142C8 */ li $at, 0x42C80000 # 0.000000
/* AEBA80 800748E0 4481E000 */ mtc1 $at, $f28
/* AEBA84 800748E4 3C0B0405 */ lui $t3, %hi(D_04048160) # $t3, 0x405
/* AEBA88 800748E8 256B8160 */ addiu $t3, %lo(D_04048160) # addiu $t3, $t3, -0x7ea0
/* AEBA84 800748E4 3C0B0405 */ lui $t3, %hi(gRaindropDL) # $t3, 0x405
/* AEBA88 800748E8 256B8160 */ addiu $t3, %lo(gRaindropDL) # addiu $t3, $t3, -0x7ea0
/* AEBA8C 800748EC 3C018014 */ lui $at, %hi(D_8013C7E0)
/* AEBA90 800748F0 3C130100 */ lui $s3, 0x100
/* AEBA94 800748F4 3C17DA38 */ lui $s7, (0xDA380003 >> 16) # lui $s7, 0xda38
@ -293,7 +293,7 @@ glabel func_80074704
/* AEBC90 80074AF0 C438C7F0 */ lwc1 $f24, %lo(D_8013C7F0)($at)
/* AEBC94 80074AF4 3C014000 */ lui $at, 0x4000
/* AEBC98 80074AF8 3C0A0402 */ li $t2, 0x04020000 # 0.000000
/* AEBC9C 80074AFC 254AA0B0 */ addiu $t2, %lo(D_0401A0B0) # addiu $t2, $t2, -0x5f50
/* AEBC9C 80074AFC 254AA0B0 */ addiu $t2, %lo(gEffShockwaveDL) # addiu $t2, $t2, -0x5f50
/* AEBCA0 80074B00 4481B000 */ mtc1 $at, $f22
/* AEBCA4 80074B04 AFAA007C */ sw $t2, 0x7c($sp)
.L80074B08:

4
asm/non_matchings/code/z_kankyo/func_8007542C.s
View file

@ -195,8 +195,8 @@ glabel func_8007542C
/* AEC850 800756B0 C6060014 */ lwc1 $f6, 0x14($s0)
/* AEC854 800756B4 460A4400 */ add.s $f16, $f8, $f10
/* AEC858 800756B8 3C150100 */ lui $s5, 0x100
/* AEC85C 800756BC 3C160403 */ lui $s6, %hi(D_0402CF30) # $s6, 0x403
/* AEC860 800756C0 26D6CF30 */ addiu $s6, %lo(D_0402CF30) # addiu $s6, $s6, -0x30d0
/* AEC85C 800756BC 3C160403 */ lui $s6, %hi(gEffLightningDL) # $s6, 0x403
/* AEC860 800756C0 26D6CF30 */ addiu $s6, %lo(gEffLightningDL) # addiu $s6, $s6, -0x30d0
/* AEC864 800756C4 44068000 */ mfc1 $a2, $f16
/* AEC868 800756C8 26B50000 */ addiu $s5, $s5, 0
/* AEC86C 800756CC 0C034261 */ jal Matrix_Translate