mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

"Decompile" more objects. (#784)

Browse source 
* Object_hakach_objects OK and fix a warning in z_play.c

* Object Warp1 OK

* Object_spot16_obj OK

* object_cs Skeleton and limbs OK

* Limbs are broken

* Limbs OK

* Object_CS OK

* Object_jya_door OK

* fix errors and add new lines

* PR fixes (AngheloAlf)

* PR fixes (EllipticEllipsis)

* PR fixes (Fig)

* Rename Spot16 and Jya

* GraveYard -> Graveyard

* PR fixes

* -s

* PR fixes
This commit is contained in:
louist103 2021-05-30 12:30:38 -04:00 • committed by GitHub
parent 515ebdce9d
commit f6470eaa08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 291 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

12
asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s
View file

@ -11,10 +11,10 @@ glabel func_80998C90
/* 00520 80998CA0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 00524 80998CA4 AFBF002C */ sw $ra, 0x002C($sp)
/* 00528 80998CA8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C
/* 0052C 80998CAC 3C060600 */ lui $a2, %hi(D_06002CA8) ## $a2 = 06000000
/* 00530 80998CB0 3C070600 */ lui $a3, %hi(D_06001374) ## $a3 = 06000000
/* 00534 80998CB4 24E71374 */ addiu $a3, $a3, %lo(D_06001374) ## $a3 = 06001374
/* 00538 80998CB8 24C62CA8 */ addiu $a2, $a2, %lo(D_06002CA8) ## $a2 = 06002CA8
/* 0052C 80998CAC 3C060600 */ lui $a2, %hi(gBlueWarpSkel) ## $a2 = 06000000
/* 00530 80998CB0 3C070600 */ lui $a3, %hi(gBlueWarpAnim) ## $a3 = 06000000
/* 00534 80998CB4 24E71374 */ addiu $a3, $a3, %lo(gBlueWarpAnim) ## $a3 = 06001374
/* 00538 80998CB8 24C62CA8 */ addiu $a2, $a2, %lo(gBlueWarpSkel) ## $a2 = 06002CA8
/* 0053C 80998CBC AFA50034 */ sw $a1, 0x0034($sp)
/* 00540 80998CC0 AFA00010 */ sw $zero, 0x0010($sp)
/* 00544 80998CC4 AFA00014 */ sw $zero, 0x0014($sp)
@ -25,14 +25,14 @@ glabel func_80998C90
/* 00554 80998CD4 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00
/* 00558 80998CD8 3C014220 */ lui $at, 0x4220 ## $at = 42200000
/* 0055C 80998CDC 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00
/* 00560 80998CE0 3C050600 */ lui $a1, %hi(D_06001374) ## $a1 = 06000000
/* 00560 80998CE0 3C050600 */ lui $a1, %hi(gBlueWarpAnim) ## $a1 = 06000000
/* 00564 80998CE4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002
/* 00568 80998CE8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001
/* 0056C 80998CEC 44061000 */ mfc1 $a2, $f2
/* 00570 80998CF0 44071000 */ mfc1 $a3, $f2
/* 00574 80998CF4 AFAF001C */ sw $t7, 0x001C($sp)
/* 00578 80998CF8 AFAE0014 */ sw $t6, 0x0014($sp)
/* 0057C 80998CFC 24A51374 */ addiu $a1, $a1, %lo(D_06001374) ## $a1 = 06001374
/* 0057C 80998CFC 24A51374 */ addiu $a1, $a1, %lo(gBlueWarpAnim) ## $a1 = 06001374
/* 00580 80998D00 8FA40034 */ lw $a0, 0x0034($sp)
/* 00584 80998D04 E7A20010 */ swc1 $f2, 0x0010($sp)
/* 00588 80998D08 0C0293F9 */ jal Animation_ChangeImpl

24
asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s
View file

@ -12,22 +12,22 @@ glabel func_80998E5C
/* 006F0 80998E70 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 006F4 80998E74 AFBF002C */ sw $ra, 0x002C($sp)
/* 006F8 80998E78 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C
/* 006FC 80998E7C 3C060600 */ lui $a2, %hi(D_06002CA8) ## $a2 = 06000000
/* 00700 80998E80 3C070600 */ lui $a3, %hi(D_06001374) ## $a3 = 06000000
/* 00704 80998E84 24E71374 */ addiu $a3, $a3, %lo(D_06001374) ## $a3 = 06001374
/* 00708 80998E88 24C62CA8 */ addiu $a2, $a2, %lo(D_06002CA8) ## $a2 = 06002CA8
/* 006FC 80998E7C 3C060600 */ lui $a2, %hi(gBlueWarpSkel) ## $a2 = 06000000
/* 00700 80998E80 3C070600 */ lui $a3, %hi(gBlueWarpAnim) ## $a3 = 06000000
/* 00704 80998E84 24E71374 */ addiu $a3, $a3, %lo(gBlueWarpAnim) ## $a3 = 06001374
/* 00708 80998E88 24C62CA8 */ addiu $a2, $a2, %lo(gBlueWarpSkel) ## $a2 = 06002CA8
/* 0070C 80998E8C AFA50034 */ sw $a1, 0x0034($sp)
/* 00710 80998E90 AFA00010 */ sw $zero, 0x0010($sp)
/* 00714 80998E94 AFA00014 */ sw $zero, 0x0014($sp)
/* 00718 80998E98 0C02915F */ jal SkelAnime_Init
/* 0071C 80998E9C AFA00018 */ sw $zero, 0x0018($sp)
/* 00720 80998EA0 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000
/* 00720 80998EA0 3C040600 */ lui $a0, %hi(gBlueWarpAnim) ## $a0 = 06000000
/* 00724 80998EA4 0C028800 */ jal Animation_GetLastFrame
/* 00728 80998EA8 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374
/* 0072C 80998EAC 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000
/* 00730 80998EB0 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374
/* 00728 80998EA8 24841374 */ addiu $a0, $a0, %lo(gBlueWarpAnim) ## $a0 = 06001374
/* 0072C 80998EAC 3C040600 */ lui $a0, %hi(gBlueWarpAnim) ## $a0 = 06000000
/* 00730 80998EB0 24841374 */ addiu $a0, $a0, %lo(gBlueWarpAnim) ## $a0 = 06001374
/* 00734 80998EB4 0C028800 */ jal Animation_GetLastFrame
/* 00738 80998EB8 A7A2003A */ sh $v0, 0x003A($sp)
@ -36,23 +36,23 @@ glabel func_80998E5C
/* 00744 80998EC4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00
/* 00748 80998EC8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00
/* 0074C 80998ECC 46803220 */ cvt.s.w $f8, $f6
/* 00750 80998ED0 3C050600 */ lui $a1, %hi(D_06001374) ## $a1 = 06000000
/* 00750 80998ED0 3C050600 */ lui $a1, %hi(gBlueWarpAnim) ## $a1 = 06000000
/* 00754 80998ED4 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002
/* 00758 80998ED8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001
/* 0075C 80998EDC AFB8001C */ sw $t8, 0x001C($sp)
/* 00760 80998EE0 46802120 */ cvt.s.w $f4, $f4
/* 00764 80998EE4 AFAF0014 */ sw $t7, 0x0014($sp)
/* 00768 80998EE8 24A51374 */ addiu $a1, $a1, %lo(D_06001374) ## $a1 = 06001374
/* 00768 80998EE8 24A51374 */ addiu $a1, $a1, %lo(gBlueWarpAnim) ## $a1 = 06001374
/* 0076C 80998EEC E7A80010 */ swc1 $f8, 0x0010($sp)
/* 00770 80998EF0 8FA40034 */ lw $a0, 0x0034($sp)
/* 00774 80998EF4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000
/* 00778 80998EF8 44072000 */ mfc1 $a3, $f4
/* 0077C 80998EFC 0C0293F9 */ jal Animation_ChangeImpl
/* 00780 80998F00 E7A00018 */ swc1 $f0, 0x0018($sp)
/* 00784 80998F04 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000
/* 00784 80998F04 3C040600 */ lui $a0, %hi(gBlueWarpAnim) ## $a0 = 06000000
/* 00788 80998F08 0C028800 */ jal Animation_GetLastFrame
/* 0078C 80998F0C 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374
/* 0078C 80998F0C 24841374 */ addiu $a0, $a0, %lo(gBlueWarpAnim) ## $a0 = 06001374
/* 00790 80998F10 3C01809A */ lui $at, %hi(D_8099C728) ## $at = 809A0000
/* 00794 80998F14 C422C728 */ lwc1 $f2, %lo(D_8099C728)($at)
/* 00798 80998F18 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00

24
asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s
View file

@ -20,22 +20,22 @@ glabel func_80998FF4
/* 00884 80999004 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 00888 80999008 AFBF002C */ sw $ra, 0x002C($sp)
/* 0088C 8099900C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C
/* 00890 80999010 3C060600 */ lui $a2, %hi(D_06002CA8) ## $a2 = 06000000
/* 00894 80999014 3C070600 */ lui $a3, %hi(D_06001374) ## $a3 = 06000000
/* 00898 80999018 24E71374 */ addiu $a3, $a3, %lo(D_06001374) ## $a3 = 06001374
/* 0089C 8099901C 24C62CA8 */ addiu $a2, $a2, %lo(D_06002CA8) ## $a2 = 06002CA8
/* 00890 80999010 3C060600 */ lui $a2, %hi(gBlueWarpSkel) ## $a2 = 06000000
/* 00894 80999014 3C070600 */ lui $a3, %hi(gBlueWarpAnim) ## $a3 = 06000000
/* 00898 80999018 24E71374 */ addiu $a3, $a3, %lo(gBlueWarpAnim) ## $a3 = 06001374
/* 0089C 8099901C 24C62CA8 */ addiu $a2, $a2, %lo(gBlueWarpSkel) ## $a2 = 06002CA8
/* 008A0 80999020 AFA50034 */ sw $a1, 0x0034($sp)
/* 008A4 80999024 AFA00010 */ sw $zero, 0x0010($sp)
/* 008A8 80999028 AFA00014 */ sw $zero, 0x0014($sp)
/* 008AC 8099902C 0C02915F */ jal SkelAnime_Init
/* 008B0 80999030 AFA00018 */ sw $zero, 0x0018($sp)
/* 008B4 80999034 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000
/* 008B4 80999034 3C040600 */ lui $a0, %hi(gBlueWarpAnim) ## $a0 = 06000000
/* 008B8 80999038 0C028800 */ jal Animation_GetLastFrame
/* 008BC 8099903C 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374
/* 008C0 80999040 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000
/* 008C4 80999044 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374
/* 008BC 8099903C 24841374 */ addiu $a0, $a0, %lo(gBlueWarpAnim) ## $a0 = 06001374
/* 008C0 80999040 3C040600 */ lui $a0, %hi(gBlueWarpAnim) ## $a0 = 06000000
/* 008C4 80999044 24841374 */ addiu $a0, $a0, %lo(gBlueWarpAnim) ## $a0 = 06001374
/* 008C8 80999048 0C028800 */ jal Animation_GetLastFrame
/* 008CC 8099904C A7A2003C */ sh $v0, 0x003C($sp)
@ -44,23 +44,23 @@ glabel func_80998FF4
/* 008D8 80999058 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00
/* 008DC 8099905C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00
/* 008E0 80999060 46803220 */ cvt.s.w $f8, $f6
/* 008E4 80999064 3C050600 */ lui $a1, %hi(D_06001374) ## $a1 = 06000000
/* 008E4 80999064 3C050600 */ lui $a1, %hi(gBlueWarpAnim) ## $a1 = 06000000
/* 008E8 80999068 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002
/* 008EC 8099906C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001
/* 008F0 80999070 AFB8001C */ sw $t8, 0x001C($sp)
/* 008F4 80999074 46802120 */ cvt.s.w $f4, $f4
/* 008F8 80999078 AFAF0014 */ sw $t7, 0x0014($sp)
/* 008FC 8099907C 24A51374 */ addiu $a1, $a1, %lo(D_06001374) ## $a1 = 06001374
/* 008FC 8099907C 24A51374 */ addiu $a1, $a1, %lo(gBlueWarpAnim) ## $a1 = 06001374
/* 00900 80999080 E7A80010 */ swc1 $f8, 0x0010($sp)
/* 00904 80999084 8FA40034 */ lw $a0, 0x0034($sp)
/* 00908 80999088 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000
/* 0090C 8099908C 44072000 */ mfc1 $a3, $f4
/* 00910 80999090 0C0293F9 */ jal Animation_ChangeImpl
/* 00914 80999094 E7A00018 */ swc1 $f0, 0x0018($sp)
/* 00918 80999098 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000
/* 00918 80999098 3C040600 */ lui $a0, %hi(gBlueWarpAnim) ## $a0 = 06000000
/* 0091C 8099909C 0C028800 */ jal Animation_GetLastFrame
/* 00920 809990A0 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374
/* 00920 809990A0 24841374 */ addiu $a0, $a0, %lo(gBlueWarpAnim) ## $a0 = 06001374
/* 00924 809990A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000
/* 00928 809990A8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00
/* 0092C 809990AC 3C01809A */ lui $at, %hi(D_8099C72C) ## $at = 809A0000

12
asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s
View file

@ -21,12 +21,12 @@ glabel func_8099A508
/* 01DD0 8099A550 0C03DCE3 */ jal Audio_PlaySoundGeneral
/* 01DD4 8099A554 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004
/* 01DD8 8099A558 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000
/* 01DD8 8099A558 3C040600 */ lui $a0, %hi(gBlueWarpAnim) ## $a0 = 06000000
/* 01DDC 8099A55C 0C028800 */ jal Animation_GetLastFrame
/* 01DE0 8099A560 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374
/* 01DE4 8099A564 3C040600 */ lui $a0, %hi(D_06001374) ## $a0 = 06000000
/* 01DE8 8099A568 24841374 */ addiu $a0, $a0, %lo(D_06001374) ## $a0 = 06001374
/* 01DE0 8099A560 24841374 */ addiu $a0, $a0, %lo(gBlueWarpAnim) ## $a0 = 06001374
/* 01DE4 8099A564 3C040600 */ lui $a0, %hi(gBlueWarpAnim) ## $a0 = 06000000
/* 01DE8 8099A568 24841374 */ addiu $a0, $a0, %lo(gBlueWarpAnim) ## $a0 = 06001374
/* 01DEC 8099A56C 0C028800 */ jal Animation_GetLastFrame
/* 01DF0 8099A570 A7A20030 */ sh $v0, 0x0030($sp)
@ -36,13 +36,13 @@ glabel func_8099A508
/* 01E00 8099A580 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00
/* 01E04 8099A584 46803220 */ cvt.s.w $f8, $f6
/* 01E08 8099A588 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00
/* 01E0C 8099A58C 3C050600 */ lui $a1, %hi(D_06001374) ## $a1 = 06000000
/* 01E0C 8099A58C 3C050600 */ lui $a1, %hi(gBlueWarpAnim) ## $a1 = 06000000
/* 01E10 8099A590 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002
/* 01E14 8099A594 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001
/* 01E18 8099A598 46802120 */ cvt.s.w $f4, $f4
/* 01E1C 8099A59C AFA8001C */ sw $t0, 0x001C($sp)
/* 01E20 8099A5A0 AFB90014 */ sw $t9, 0x0014($sp)
/* 01E24 8099A5A4 24A51374 */ addiu $a1, $a1, %lo(D_06001374) ## $a1 = 06001374
/* 01E24 8099A5A4 24A51374 */ addiu $a1, $a1, %lo(gBlueWarpAnim) ## $a1 = 06001374
/* 01E28 8099A5A8 E7A80010 */ swc1 $f8, 0x0010($sp)
/* 01E2C 8099A5AC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C
/* 01E30 8099A5B0 44072000 */ mfc1 $a3, $f4

4
asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s
View file

@ -585,10 +585,10 @@ glabel func_8099B5EC
/* 036A8 8099BE28 AFA2008C */ sw $v0, 0x008C($sp)
/* 036AC 8099BE2C 8FA3008C */ lw $v1, 0x008C($sp)
/* 036B0 8099BE30 8FA800D8 */ lw $t0, 0x00D8($sp)
/* 036B4 8099BE34 3C040600 */ lui $a0, %hi(D_060001A0) ## $a0 = 06000000
/* 036B4 8099BE34 3C040600 */ lui $a0, %hi(gBlueWarpLightBeamDL) ## $a0 = 06000000
/* 036B8 8099BE38 AC620004 */ sw $v0, 0x0004($v1) ## 00000004
/* 036BC 8099BE3C 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0
/* 036C0 8099BE40 248401A0 */ addiu $a0, $a0, %lo(D_060001A0) ## $a0 = 060001A0
/* 036C0 8099BE40 248401A0 */ addiu $a0, $a0, %lo(gBlueWarpLightBeamDL) ## $a0 = 060001A0
/* 036C4 8099BE44 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000
/* 036C8 8099BE48 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008
/* 036CC 8099BE4C AD0D02D0 */ sw $t5, 0x02D0($t0) ## 000002D0