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

En_River_Sound OK (#833)

* match en_river_sound

* remove asm

* some docs

* more docs

* saria song

* review stuff
This commit is contained in:
Zelllll 2021-06-01 12:17:45 -05:00 committed by GitHub
parent 9de0b13141
commit 175aaf4f26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 116 additions and 202 deletions

View file

@ -1,93 +0,0 @@
glabel func_80AE6A54
/* 00124 80AE6A54 C48A0000 */ lwc1 $f10, 0x0000($a0) ## 00000000
/* 00128 80AE6A58 C4C80000 */ lwc1 $f8, 0x0000($a2) ## 00000000
/* 0012C 80AE6A5C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8
/* 00130 80AE6A60 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000
/* 00134 80AE6A64 46085481 */ sub.s $f18, $f10, $f8
/* 00138 80AE6A68 E7B20014 */ swc1 $f18, 0x0014($sp)
/* 0013C 80AE6A6C C4C60004 */ lwc1 $f6, 0x0004($a2) ## 00000004
/* 00140 80AE6A70 C4900004 */ lwc1 $f16, 0x0004($a0) ## 00000004
/* 00144 80AE6A74 46068101 */ sub.s $f4, $f16, $f6
/* 00148 80AE6A78 E7A40018 */ swc1 $f4, 0x0018($sp)
/* 0014C 80AE6A7C C4C80008 */ lwc1 $f8, 0x0008($a2) ## 00000008
/* 00150 80AE6A80 C48A0008 */ lwc1 $f10, 0x0008($a0) ## 00000008
/* 00154 80AE6A84 46085481 */ sub.s $f18, $f10, $f8
/* 00158 80AE6A88 E7B2001C */ swc1 $f18, 0x001C($sp)
/* 0015C 80AE6A8C C4C60000 */ lwc1 $f6, 0x0000($a2) ## 00000000
/* 00160 80AE6A90 C4B00000 */ lwc1 $f16, 0x0000($a1) ## 00000000
/* 00164 80AE6A94 46068101 */ sub.s $f4, $f16, $f6
/* 00168 80AE6A98 E7A40020 */ swc1 $f4, 0x0020($sp)
/* 0016C 80AE6A9C C4C80004 */ lwc1 $f8, 0x0004($a2) ## 00000004
/* 00170 80AE6AA0 C4AA0004 */ lwc1 $f10, 0x0004($a1) ## 00000004
/* 00174 80AE6AA4 46085481 */ sub.s $f18, $f10, $f8
/* 00178 80AE6AA8 C7A80014 */ lwc1 $f8, 0x0014($sp)
/* 0017C 80AE6AAC C7AA0020 */ lwc1 $f10, 0x0020($sp)
/* 00180 80AE6AB0 E7B20024 */ swc1 $f18, 0x0024($sp)
/* 00184 80AE6AB4 C4C60008 */ lwc1 $f6, 0x0008($a2) ## 00000008
/* 00188 80AE6AB8 C4B00008 */ lwc1 $f16, 0x0008($a1) ## 00000008
/* 0018C 80AE6ABC 46085481 */ sub.s $f18, $f10, $f8
/* 00190 80AE6AC0 E7AA0000 */ swc1 $f10, 0x0000($sp)
/* 00194 80AE6AC4 E7A80004 */ swc1 $f8, 0x0004($sp)
/* 00198 80AE6AC8 46068101 */ sub.s $f4, $f16, $f6
/* 0019C 80AE6ACC C7B00024 */ lwc1 $f16, 0x0024($sp)
/* 001A0 80AE6AD0 C7A60018 */ lwc1 $f6, 0x0018($sp)
/* 001A4 80AE6AD4 E7B20008 */ swc1 $f18, 0x0008($sp)
/* 001A8 80AE6AD8 E7A40028 */ swc1 $f4, 0x0028($sp)
/* 001AC 80AE6ADC 46068101 */ sub.s $f4, $f16, $f6
/* 001B0 80AE6AE0 E7B0000C */ swc1 $f16, 0x000C($sp)
/* 001B4 80AE6AE4 C7AA0028 */ lwc1 $f10, 0x0028($sp)
/* 001B8 80AE6AE8 C7B00008 */ lwc1 $f16, 0x0008($sp)
/* 001BC 80AE6AEC C7A8001C */ lwc1 $f8, 0x001C($sp)
/* 001C0 80AE6AF0 E7A60008 */ swc1 $f6, 0x0008($sp)
/* 001C4 80AE6AF4 C7A60004 */ lwc1 $f6, 0x0004($sp)
/* 001C8 80AE6AF8 E7B2002C */ swc1 $f18, 0x002C($sp)
/* 001CC 80AE6AFC 46085481 */ sub.s $f18, $f10, $f8
/* 001D0 80AE6B00 E7AA0004 */ swc1 $f10, 0x0004($sp)
/* 001D4 80AE6B04 46068182 */ mul.s $f6, $f16, $f6
/* 001D8 80AE6B08 C7AA0008 */ lwc1 $f10, 0x0008($sp)
/* 001DC 80AE6B0C E7A40030 */ swc1 $f4, 0x0030($sp)
/* 001E0 80AE6B10 E7B20034 */ swc1 $f18, 0x0034($sp)
/* 001E4 80AE6B14 460A2282 */ mul.s $f10, $f4, $f10
/* 001E8 80AE6B18 460A3180 */ add.s $f6, $f6, $f10
/* 001EC 80AE6B1C 46124282 */ mul.s $f10, $f8, $f18
/* 001F0 80AE6B20 C7A80000 */ lwc1 $f8, 0x0000($sp)
/* 001F4 80AE6B24 46065000 */ add.s $f0, $f10, $f6
/* 001F8 80AE6B28 46088282 */ mul.s $f10, $f16, $f8
/* 001FC 80AE6B2C C7A6000C */ lwc1 $f6, 0x000C($sp)
/* 00200 80AE6B30 46062202 */ mul.s $f8, $f4, $f6
/* 00204 80AE6B34 46085180 */ add.s $f6, $f10, $f8
/* 00208 80AE6B38 C7AA0004 */ lwc1 $f10, 0x0004($sp)
/* 0020C 80AE6B3C 46125202 */ mul.s $f8, $f10, $f18
/* 00210 80AE6B40 46064280 */ add.s $f10, $f8, $f6
/* 00214 80AE6B44 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00
/* 00218 80AE6B48 46005202 */ mul.s $f8, $f10, $f0
/* 0021C 80AE6B4C 4606403C */ c.lt.s $f8, $f6
/* 00220 80AE6B50 00000000 */ nop
/* 00224 80AE6B54 45000018 */ bc1f .L80AE6BB8
/* 00228 80AE6B58 00000000 */ nop
/* 0022C 80AE6B5C 46108282 */ mul.s $f10, $f16, $f16
/* 00230 80AE6B60 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001
/* 00234 80AE6B64 46042202 */ mul.s $f8, $f4, $f4
/* 00238 80AE6B68 46085180 */ add.s $f6, $f10, $f8
/* 0023C 80AE6B6C 46129102 */ mul.s $f4, $f18, $f18
/* 00240 80AE6B70 46000207 */ neg.s $f8, $f0
/* 00244 80AE6B74 46062280 */ add.s $f10, $f4, $f6
/* 00248 80AE6B78 C4840000 */ lwc1 $f4, 0x0000($a0) ## 00000000
/* 0024C 80AE6B7C 460A4003 */ div.s $f0, $f8, $f10
/* 00250 80AE6B80 46008482 */ mul.s $f18, $f16, $f0
/* 00254 80AE6B84 46049180 */ add.s $f6, $f18, $f4
/* 00258 80AE6B88 E4E60000 */ swc1 $f6, 0x0000($a3) ## 00000000
/* 0025C 80AE6B8C C7A80030 */ lwc1 $f8, 0x0030($sp)
/* 00260 80AE6B90 C4900004 */ lwc1 $f16, 0x0004($a0) ## 00000004
/* 00264 80AE6B94 46004282 */ mul.s $f10, $f8, $f0
/* 00268 80AE6B98 46105480 */ add.s $f18, $f10, $f16
/* 0026C 80AE6B9C E4F20004 */ swc1 $f18, 0x0004($a3) ## 00000004
/* 00270 80AE6BA0 C7A40034 */ lwc1 $f4, 0x0034($sp)
/* 00274 80AE6BA4 C4880008 */ lwc1 $f8, 0x0008($a0) ## 00000008
/* 00278 80AE6BA8 46002182 */ mul.s $f6, $f4, $f0
/* 0027C 80AE6BAC 46083280 */ add.s $f10, $f6, $f8
/* 00280 80AE6BB0 10000001 */ beq $zero, $zero, .L80AE6BB8
/* 00284 80AE6BB4 E4EA0008 */ swc1 $f10, 0x0008($a3) ## 00000008
.L80AE6BB8:
/* 00288 80AE6BB8 03E00008 */ jr $ra
/* 0028C 80AE6BBC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000