mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-31 08:06:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup z_lifemeter (#552)

Browse Source 
* z_lifemeter cleanup finished, one non-matching

* made Health_UpdateData a bit better, nowhere near matching still

* lifemeter done for now

* fixed define issue

* improve z_lifemeter, still doesn't match

* z_lifemeter done

* Rename functions

* Add files via upload

* Update Health_Update.s

* fix missing symbols in asm file

* Update Health_Update.s

* Update Health_Update.s

* fixed stuff

* Add files via upload

* Delete Health_Update.s

* Rename things according to Roman's suggestions

* lifemeter done hopefully

* fix unused asm that for some reason didn't merge

* fix feedback

* compiles right now

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
This commit is contained in:
Zelllll
2021-01-10 15:33:58 -06:00
committed by GitHub
parent bda5b83346
commit a0e2ce7211
10 changed files with 305 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/code/z_lifemeter/Health_UpdateData.s → asm/non_matchings/code/z_lifemeter/HealthMeter_Update.s
+59 -59
View File
@@ -3,7 +3,7 @@ glabel D_8013C888
.float 0.1
.text
glabel Health_UpdateData
glabel HealthMeter_Update
/* AEFBD8 80078A38 3C0E0001 */ lui $t6, 1
/* AEFBDC 80078A3C 01C47021 */ addu $t6, $t6, $a0
/* AEFBE0 80078A40 85CE06EE */ lh $t6, 0x6ee($t6)
@@ -52,41 +52,41 @@ glabel Health_UpdateData
/* AEFC80 80078AE0 A444021A */ sh $a0, 0x21a($v0)
/* AEFC84 80078AE4 A44B021E */ sh $t3, 0x21e($v0)
/* AEFC88 80078AE8 A44C0222 */ sh $t4, 0x222($v0)
/* AEFC8C 80078AEC 3C0D8012 */ lui $t5, %hi(D_8011FF10) # $t5, 0x8012
/* AEFC90 80078AF0 85ADFF10 */ lh $t5, %lo(D_8011FF10)($t5)
/* AEFC94 80078AF4 3C0E8012 */ lui $t6, %hi(D_8011FF10+2) # $t6, 0x8012
/* AEFC98 80078AF8 3C0F8012 */ lui $t7, %hi(D_8011FF10+4) # $t7, 0x8012
/* AEFC8C 80078AEC 3C0D8012 */ lui $t5, %hi(sHeartsPrimColors) # $t5, 0x8012
/* AEFC90 80078AF0 85ADFF10 */ lh $t5, %lo(sHeartsPrimColors)($t5)
/* AEFC94 80078AF4 3C0E8012 */ lui $t6, %hi(sHeartsPrimColors+2) # $t6, 0x8012
/* AEFC98 80078AF8 3C0F8012 */ lui $t7, %hi(sHeartsPrimColors+4) # $t7, 0x8012
/* AEFC9C 80078AFC A44D0210 */ sh $t5, 0x210($v0)
/* AEFCA0 80078B00 85CEFF12 */ lh $t6, %lo(D_8011FF10+2)($t6)
/* AEFCA4 80078B04 3C188012 */ lui $t8, %hi(D_8011FF24) # $t8, 0x8012
/* AEFCA8 80078B08 3C198012 */ lui $t9, %hi(D_8011FF24+2) # $t9, 0x8012
/* AEFCA0 80078B00 85CEFF12 */ lh $t6, %lo(sHeartsPrimColors+2)($t6)
/* AEFCA4 80078B04 3C188012 */ lui $t8, %hi(sHeartsEnvColors) # $t8, 0x8012
/* AEFCA8 80078B08 3C198012 */ lui $t9, %hi(sHeartsEnvColors+2) # $t9, 0x8012
/* AEFCAC 80078B0C A44E0214 */ sh $t6, 0x214($v0)
/* AEFCB0 80078B10 85EFFF14 */ lh $t7, %lo(D_8011FF10+4)($t7)
/* AEFCB4 80078B14 3C0B8012 */ lui $t3, %hi(D_8011FF24+4) # $t3, 0x8012
/* AEFCB8 80078B18 3C078012 */ lui $a3, %hi(D_8011FF38) # $a3, 0x8012
/* AEFCB0 80078B10 85EFFF14 */ lh $t7, %lo(sHeartsPrimColors+4)($t7)
/* AEFCB4 80078B14 3C0B8012 */ lui $t3, %hi(sHeartsEnvColors+4) # $t3, 0x8012
/* AEFCB8 80078B18 3C078012 */ lui $a3, %hi(sHeartsPrimFactors) # $a3, 0x8012
/* AEFCBC 80078B1C A44F0218 */ sh $t7, 0x218($v0)
/* AEFCC0 80078B20 8718FF24 */ lh $t8, %lo(D_8011FF24)($t8)
/* AEFCC4 80078B24 24E7FF38 */ addiu $a3, %lo(D_8011FF38) # addiu $a3, $a3, -0xc8
/* AEFCC8 80078B28 3C088012 */ lui $t0, %hi(D_8011FF4C) # $t0, 0x8012
/* AEFCC0 80078B20 8718FF24 */ lh $t8, %lo(sHeartsEnvColors)($t8)
/* AEFCC4 80078B24 24E7FF38 */ addiu $a3, %lo(sHeartsPrimFactors) # addiu $a3, $a3, -0xc8
/* AEFCC8 80078B28 3C088012 */ lui $t0, %hi(sHeartsEnvFactors) # $t0, 0x8012
/* AEFCCC 80078B2C A458021C */ sh $t8, 0x21c($v0)
/* AEFCD0 80078B30 8739FF26 */ lh $t9, %lo(D_8011FF24+2)($t9)
/* AEFCD4 80078B34 2508FF4C */ addiu $t0, %lo(D_8011FF4C) # addiu $t0, $t0, -0xb4
/* AEFCD8 80078B38 3C018016 */ lui $at, %hi(D_8015FDD0+6) # $at, 0x8016
/* AEFCD0 80078B30 8739FF26 */ lh $t9, %lo(sHeartsEnvColors+2)($t9)
/* AEFCD4 80078B34 2508FF4C */ addiu $t0, %lo(sHeartsEnvFactors) # addiu $t0, $t0, -0xb4
/* AEFCD8 80078B38 3C018016 */ lui $at, %hi(sBeatingHeartsDDPrim+6) # $at, 0x8016
/* AEFCDC 80078B3C A4590220 */ sh $t9, 0x220($v0)
/* AEFCE0 80078B40 856BFF28 */ lh $t3, %lo(D_8011FF24+4)($t3)
/* AEFCE4 80078B44 3C098016 */ lui $t1, %hi(D_8015FDC0) # $t1, 0x8016
/* AEFCE8 80078B48 2529FDC0 */ addiu $t1, %lo(D_8015FDC0) # addiu $t1, $t1, -0x240
/* AEFCE0 80078B40 856BFF28 */ lh $t3, %lo(sHeartsEnvColors+4)($t3)
/* AEFCE4 80078B44 3C098016 */ lui $t1, %hi(sHeartsDDPrim) # $t1, 0x8016
/* AEFCE8 80078B48 2529FDC0 */ addiu $t1, %lo(sHeartsDDPrim) # addiu $t1, $t1, -0x240
/* AEFCEC 80078B4C A44B0224 */ sh $t3, 0x224($v0)
/* AEFCF0 80078B50 84EC0000 */ lh $t4, ($a3)
/* AEFCF4 80078B54 84EE0002 */ lh $t6, 2($a3)
/* AEFCF8 80078B58 84F80004 */ lh $t8, 4($a3)
/* AEFCFC 80078B5C 448C5000 */ mtc1 $t4, $f10
/* AEFD00 80078B60 448E3000 */ mtc1 $t6, $f6
/* AEFD04 80078B64 3C078016 */ lui $a3, %hi(D_8015FDD0) # $a3, 0x8016
/* AEFD04 80078B64 3C078016 */ lui $a3, %hi(sBeatingHeartsDDPrim) # $a3, 0x8016
/* AEFD08 80078B68 46805420 */ cvt.s.w $f16, $f10
/* AEFD0C 80078B6C 24E7FDD0 */ addiu $a3, %lo(D_8015FDD0) # addiu $a3, $a3, -0x230
/* AEFD10 80078B70 3C0A8016 */ lui $t2, %hi(D_8015FDC8)
/* AEFD14 80078B74 254AFDC8 */ addiu $t2, %lo(D_8015FDC8) # addiu $t2, $t2, -0x238
/* AEFD0C 80078B6C 24E7FDD0 */ addiu $a3, %lo(sBeatingHeartsDDPrim) # addiu $a3, $a3, -0x230
/* AEFD10 80078B70 3C0A8016 */ lui $t2, %hi(sHeartsDDEnv)
/* AEFD14 80078B74 254AFDC8 */ addiu $t2, %lo(sHeartsDDEnv) # addiu $t2, $t2, -0x238
/* AEFD18 80078B78 46803220 */ cvt.s.w $f8, $f6
/* AEFD1C 80078B7C 46008482 */ mul.s $f18, $f16, $f0
/* AEFD20 80078B80 4600910D */ trunc.w.s $f4, $f18
@@ -121,11 +121,11 @@ glabel Health_UpdateData
/* AEFD94 80078BF4 85190004 */ lh $t9, 4($t0)
/* AEFD98 80078BF8 448D5000 */ mtc1 $t5, $f10
/* AEFD9C 80078BFC 448F3000 */ mtc1 $t7, $f6
/* AEFDA0 80078C00 3C088016 */ lui $t0, %hi(D_8015FDE0) # $t0, 0x8016
/* AEFDA0 80078C00 3C088016 */ lui $t0, %hi(sBeatingHeartsDDEnv) # $t0, 0x8016
/* AEFDA4 80078C04 46805420 */ cvt.s.w $f16, $f10
/* AEFDA8 80078C08 2508FDE0 */ addiu $t0, %lo(D_8015FDE0) # addiu $t0, $t0, -0x220
/* AEFDAC 80078C0C 3C0F8012 */ lui $t7, %hi(D_8011FF60) # $t7, 0x8012
/* AEFDB0 80078C10 3C0B8012 */ lui $t3, %hi(D_8011FF74)
/* AEFDA8 80078C08 2508FDE0 */ addiu $t0, %lo(sBeatingHeartsDDEnv) # addiu $t0, $t0, -0x220
/* AEFDAC 80078C0C 3C0F8012 */ lui $t7, %hi(sHeartsDDPrimColors) # $t7, 0x8012
/* AEFDB0 80078C10 3C0B8012 */ lui $t3, %hi(sHeartsDDEnvColors)
/* AEFDB4 80078C14 46803220 */ cvt.s.w $f8, $f6
/* AEFDB8 80078C18 46008482 */ mul.s $f18, $f16, $f0
/* AEFDBC 80078C1C 4600910D */ trunc.w.s $f4, $f18
@@ -151,7 +151,7 @@ glabel Health_UpdateData
/* AEFE0C 80078C6C 331900FF */ andi $t9, $t8, 0xff
/* AEFE10 80078C70 44054000 */ mfc1 $a1, $f8
/* AEFE14 80078C74 A459020A */ sh $t9, 0x20a($v0)
/* AEFE18 80078C78 3C188012 */ lui $t8, %hi(D_8011FF60+2) # $t8, 0x8012
/* AEFE18 80078C78 3C188012 */ lui $t8, %hi(sHeartsDDPrimColors+2) # $t8, 0x8012
/* AEFE1C 80078C7C 00052C00 */ sll $a1, $a1, 0x10
/* AEFE20 80078C80 00052C03 */ sra $a1, $a1, 0x10
/* AEFE24 80078C84 24AC003C */ addiu $t4, $a1, 0x3c
@@ -163,49 +163,49 @@ glabel Health_UpdateData
/* AEFE3C 80078C9C A4E60004 */ sh $a2, 4($a3)
/* AEFE40 80078CA0 A5000002 */ sh $zero, 2($t0)
/* AEFE44 80078CA4 A5000004 */ sh $zero, 4($t0)
/* AEFE48 80078CA8 3C0E8012 */ lui $t6, %hi(D_8011FF88) # $t6, 0x8012
/* AEFE4C 80078CAC 85CEFF88 */ lh $t6, %lo(D_8011FF88)($t6)
/* AEFE50 80078CB0 85EFFF60 */ lh $t7, %lo(D_8011FF60)($t7)
/* AEFE54 80078CB4 8718FF62 */ lh $t8, %lo(D_8011FF60+2)($t8)
/* AEFE48 80078CA8 3C0E8012 */ lui $t6, %hi(sHeartsDDPrimFactors) # $t6, 0x8012
/* AEFE4C 80078CAC 85CEFF88 */ lh $t6, %lo(sHeartsDDPrimFactors)($t6)
/* AEFE50 80078CB0 85EFFF60 */ lh $t7, %lo(sHeartsDDPrimColors)($t7)
/* AEFE54 80078CB4 8718FF62 */ lh $t8, %lo(sHeartsDDPrimColors+2)($t8)
/* AEFE58 80078CB8 448E5000 */ mtc1 $t6, $f10
/* AEFE5C 80078CBC 3C198012 */ lui $t9, %hi(D_8011FF60+4) # $t9, 0x8012
/* AEFE60 80078CC0 8739FF64 */ lh $t9, %lo(D_8011FF60+4)($t9)
/* AEFE5C 80078CBC 3C198012 */ lui $t9, %hi(sHeartsDDPrimColors+4) # $t9, 0x8012
/* AEFE60 80078CC0 8739FF64 */ lh $t9, %lo(sHeartsDDPrimColors+4)($t9)
/* AEFE64 80078CC4 46805420 */ cvt.s.w $f16, $f10
/* AEFE68 80078CC8 A42FFDD6 */ sh $t7, %lo(D_8015FDD0+6)($at)
/* AEFE6C 80078CCC 3C018016 */ lui $at, %hi(D_8015FDD0+8) # $at, 0x8016
/* AEFE70 80078CD0 856BFF74 */ lh $t3, %lo(D_8011FF74)($t3)
/* AEFE74 80078CD4 A438FDD8 */ sh $t8, %lo(D_8015FDD0+8)($at)
/* AEFE78 80078CD8 3C188012 */ lui $t8, %hi(D_8011FF88+2) # $t8, 0x8012
/* AEFE68 80078CC8 A42FFDD6 */ sh $t7, %lo(sBeatingHeartsDDPrim+6)($at)
/* AEFE6C 80078CCC 3C018016 */ lui $at, %hi(sBeatingHeartsDDPrim+8) # $at, 0x8016
/* AEFE70 80078CD0 856BFF74 */ lh $t3, %lo(sHeartsDDEnvColors)($t3)
/* AEFE74 80078CD4 A438FDD8 */ sh $t8, %lo(sBeatingHeartsDDPrim+8)($at)
/* AEFE78 80078CD8 3C188012 */ lui $t8, %hi(sHeartsDDPrimFactors+2) # $t8, 0x8012
/* AEFE7C 80078CDC 46008482 */ mul.s $f18, $f16, $f0
/* AEFE80 80078CE0 A439FDDA */ sh $t9, %lo(D_8015FDD0+0xa)($at)
/* AEFE84 80078CE4 8718FF8A */ lh $t8, %lo(D_8011FF88+2)($t8)
/* AEFE88 80078CE8 3C018016 */ lui $at, %hi(D_8015FDE0+6) # $at, 0x8016
/* AEFE8C 80078CEC A42BFDE6 */ sh $t3, %lo(D_8015FDE0+6)($at)
/* AEFE90 80078CF0 3C0B8012 */ lui $t3, %hi(D_8011FF88+4)
/* AEFE94 80078CF4 856BFF8C */ lh $t3, %lo(D_8011FF88+4)($t3)
/* AEFE80 80078CE0 A439FDDA */ sh $t9, %lo(sBeatingHeartsDDPrim+0xa)($at)
/* AEFE84 80078CE4 8718FF8A */ lh $t8, %lo(sHeartsDDPrimFactors+2)($t8)
/* AEFE88 80078CE8 3C018016 */ lui $at, %hi(sBeatingHeartsDDEnv+6) # $at, 0x8016
/* AEFE8C 80078CEC A42BFDE6 */ sh $t3, %lo(sBeatingHeartsDDEnv+6)($at)
/* AEFE90 80078CF0 3C0B8012 */ lui $t3, %hi(sHeartsDDPrimFactors+4)
/* AEFE94 80078CF4 856BFF8C */ lh $t3, %lo(sHeartsDDPrimFactors+4)($t3)
/* AEFE98 80078CF8 44983000 */ mtc1 $t8, $f6
/* AEFE9C 80078CFC 4600910D */ trunc.w.s $f4, $f18
/* AEFEA0 80078D00 448B9000 */ mtc1 $t3, $f18
/* AEFEA4 80078D04 3C0D8012 */ lui $t5, %hi(D_8011FF74+4) # $t5, 0x8012
/* AEFEA4 80078D04 3C0D8012 */ lui $t5, %hi(sHeartsDDEnvColors+4) # $t5, 0x8012
/* AEFEA8 80078D08 46803220 */ cvt.s.w $f8, $f6
/* AEFEAC 80078D0C 44032000 */ mfc1 $v1, $f4
/* AEFEB0 80078D10 85ADFF78 */ lh $t5, %lo(D_8011FF74+4)($t5)
/* AEFEB4 80078D14 3C0C8012 */ lui $t4, %hi(D_8011FF74+2) # $t4, 0x8012
/* AEFEB8 80078D18 858CFF76 */ lh $t4, %lo(D_8011FF74+2)($t4)
/* AEFEB0 80078D10 85ADFF78 */ lh $t5, %lo(sHeartsDDEnvColors+4)($t5)
/* AEFEB4 80078D14 3C0C8012 */ lui $t4, %hi(sHeartsDDEnvColors+2) # $t4, 0x8012
/* AEFEB8 80078D18 858CFF76 */ lh $t4, %lo(sHeartsDDEnvColors+2)($t4)
/* AEFEBC 80078D1C 46809120 */ cvt.s.w $f4, $f18
/* AEFEC0 80078D20 46004282 */ mul.s $f10, $f8, $f0
/* AEFEC4 80078D24 00031C00 */ sll $v1, $v1, 0x10
/* AEFEC8 80078D28 3C018016 */ lui $at, %hi(D_8015FDE0+8) # $at, 0x8016
/* AEFEC8 80078D28 3C018016 */ lui $at, %hi(sBeatingHeartsDDEnv+8) # $at, 0x8016
/* AEFECC 80078D2C 00031C03 */ sra $v1, $v1, 0x10
/* AEFED0 80078D30 246E00FF */ addiu $t6, $v1, 0xff
/* AEFED4 80078D34 46002182 */ mul.s $f6, $f4, $f0
/* AEFED8 80078D38 A42DFDEA */ sh $t5, %lo(D_8015FDE0+0xa)($at)
/* AEFED8 80078D38 A42DFDEA */ sh $t5, %lo(sBeatingHeartsDDEnv+0xa)($at)
/* AEFEDC 80078D3C 31CF00FF */ andi $t7, $t6, 0xff
/* AEFEE0 80078D40 A42CFDE8 */ sh $t4, %lo(D_8015FDE0+8)($at)
/* AEFEE0 80078D40 A42CFDE8 */ sh $t4, %lo(sBeatingHeartsDDEnv+8)($at)
/* AEFEE4 80078D44 A52F0000 */ sh $t7, ($t1)
/* AEFEE8 80078D48 3C0F8012 */ lui $t7, %hi(D_8011FF9C) # $t7, 0x8012
/* AEFEE8 80078D48 3C0F8012 */ lui $t7, %hi(sHeartsDDEnvFactors) # $t7, 0x8012
/* AEFEEC 80078D4C 4600540D */ trunc.w.s $f16, $f10
/* AEFEF0 80078D50 3C0C8012 */ lui $t4, %hi(D_8011FF9C+4) # $t4, 0x8012
/* AEFEF0 80078D50 3C0C8012 */ lui $t4, %hi(sHeartsDDEnvFactors+4) # $t4, 0x8012
/* AEFEF4 80078D54 4600320D */ trunc.w.s $f8, $f6
/* AEFEF8 80078D58 44048000 */ mfc1 $a0, $f16
/* AEFEFC 80078D5C 44054000 */ mfc1 $a1, $f8
@@ -219,11 +219,11 @@ glabel Health_UpdateData
/* AEFF1C 80078D7C 31AE00FF */ andi $t6, $t5, 0xff
/* AEFF20 80078D80 A52B0002 */ sh $t3, 2($t1)
/* AEFF24 80078D84 A52E0004 */ sh $t6, 4($t1)
/* AEFF28 80078D88 85EFFF9C */ lh $t7, %lo(D_8011FF9C)($t7)
/* AEFF2C 80078D8C 3C198012 */ lui $t9, %hi(D_8011FF9C+2)
/* AEFF30 80078D90 8739FF9E */ lh $t9, %lo(D_8011FF9C+2)($t9)
/* AEFF28 80078D88 85EFFF9C */ lh $t7, %lo(sHeartsDDEnvFactors)($t7)
/* AEFF2C 80078D8C 3C198012 */ lui $t9, %hi(sHeartsDDEnvFactors+2)
/* AEFF30 80078D90 8739FF9E */ lh $t9, %lo(sHeartsDDEnvFactors+2)($t9)
/* AEFF34 80078D94 448F5000 */ mtc1 $t7, $f10
/* AEFF38 80078D98 858CFFA0 */ lh $t4, %lo(D_8011FF9C+4)($t4)
/* AEFF38 80078D98 858CFFA0 */ lh $t4, %lo(sHeartsDDEnvFactors+4)($t4)
/* AEFF3C 80078D9C 44993000 */ mtc1 $t9, $f6
/* AEFF40 80078DA0 46805420 */ cvt.s.w $f16, $f10
/* AEFF44 80078DA4 46803220 */ cvt.s.w $f8, $f6
asm/non_matchings/code/z_parameter/Interface_Draw.s
+1 -1
View File
@@ -140,7 +140,7 @@ glabel Interface_Draw
/* B01C74 8008AAD4 02E02025 */ move $a0, $s7
/* B01C78 8008AAD8 0C022A65 */ jal func_8008A994
/* B01C7C 8008AADC 02C02025 */ move $a0, $s6
/* B01C80 8008AAE0 0C01E3C7 */ jal Health_Draw
/* B01C80 8008AAE0 0C01E3C7 */ jal HealthMeter_Draw
/* B01C84 8008AAE4 02E02025 */ move $a0, $s7
/* B01C88 8008AAE8 0C025148 */ jal func_80094520
/* B01C8C 8008AAEC 8EE40000 */ lw $a0, ($s7)