mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

Decompile z_kankyo (#956)

Browse source 
* working

* start color switch

* progress

* progress

* progress on bgm func

* progress

* game over matched (except the rodata meme)

* start update

* progress

* lightning docs done

* progress

* progress

* progress

* progress

* progress

* can compile at least

* suns state, progress on kankyo_update

* some new names

* progress

* progress

* progress

* new functions

* cleanup

* more matches

* another match

* now functional

* format

* better match

* hugely improved update

* cleanup/review

* remove old changes

* review2

* review3

* missed one

* review4

* change asm filenames

* update doorwarp1

* review5

* Kankyo_ -> Environment_

* format

* merge master and format functions.h

Co-authored-by: Jacob Young <jacobly0@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911 2021-09-20 11:51:35 -05:00 • committed by GitHub
parent 50095d427c
commit e51f50f0ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
139 changed files with 3478 additions and 6277 deletions
Download patch file Download diff file Expand all files Collapse all files

2
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s
View file

@ -91,7 +91,7 @@ glabel BossGanon_Draw
/* 0A59C 808E0E0C E61002F4 */ swc1 $f16, 0x02F4($s0) ## 000002F4
/* 0A5A0 808E0E10 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 0A5A4 808E0E14 E60A02F0 */ swc1 $f10, 0x02F0($s0) ## 000002F0
/* 0A5A8 808E0E18 0C02F228 */ jal func_800BC8A0
/* 0A5A8 808E0E18 0C02F228 */ jal Gameplay_SetFog
/* 0A5AC 808E0E1C 8E4502C0 */ lw $a1, 0x02C0($s2) ## 000002C0
/* 0A5B0 808E0E20 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0
/* 0A5B4 808E0E24 0C238F61 */ jal func_808E3D84

12
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Update.s
View file

@ -1204,18 +1204,18 @@ glabel L808DE3B0
/* 07D14 808DE584 92AE066C */ lbu $t6, 0x066C($s5) ## 0000066C
.L808DE588:
/* 07D18 808DE588 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001
/* 07D1C 808DE58C 3C018016 */ lui $at, %hi(D_8015FCF0)
/* 07D1C 808DE58C 3C018016 */ lui $at, %hi(gCustomLensFlareOn)
/* 07D20 808DE590 11C0001C */ beq $t6, $zero, .L808DE604
/* 07D24 808DE594 00000000 */ nop
/* 07D28 808DE598 3C018016 */ lui $at, %hi(D_8015FCF0)
/* 07D2C 808DE59C A02FFCF0 */ sb $t7, %lo(D_8015FCF0)($at)
/* 07D28 808DE598 3C018016 */ lui $at, %hi(gCustomLensFlareOn)
/* 07D2C 808DE59C A02FFCF0 */ sb $t7, %lo(gCustomLensFlareOn)($at)
/* 07D30 808DE5A0 92B8066C */ lbu $t8, 0x066C($s5) ## 0000066C
/* 07D34 808DE5A4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001
/* 07D38 808DE5A8 5701000A */ bnel $t8, $at, .L808DE5D4
/* 07D3C 808DE5AC C6A60670 */ lwc1 $f6, 0x0670($s5) ## 00000670
/* 07D40 808DE5B0 8EA90024 */ lw $t1, 0x0024($s5) ## 00000024
/* 07D44 808DE5B4 3C198016 */ lui $t9, %hi(D_8015FCF8)
/* 07D48 808DE5B8 2739FCF8 */ addiu $t9, %lo(D_8015FCF8)
/* 07D44 808DE5B4 3C198016 */ lui $t9, %hi(gCustomLensFlarePos)
/* 07D48 808DE5B8 2739FCF8 */ addiu $t9, %lo(gCustomLensFlarePos)
/* 07D4C 808DE5BC AF290000 */ sw $t1, 0x0000($t9) ## 8015FCF8
/* 07D50 808DE5C0 8EA80028 */ lw $t0, 0x0028($s5) ## 00000028
/* 07D54 808DE5C4 AF280004 */ sw $t0, 0x0004($t9) ## 8015FCFC
@ -1236,7 +1236,7 @@ glabel L808DE3B0
/* 07D8C 808DE5FC 10000002 */ beq $zero, $zero, .L808DE608
/* 07D90 808DE600 A420FD0C */ sh $zero, %lo(D_8015FD0C)($at)
.L808DE604:
/* 07D94 808DE604 A020FCF0 */ sb $zero, %lo(D_8015FCF0)($at)
/* 07D94 808DE604 A020FCF0 */ sb $zero, %lo(gCustomLensFlareOn)($at)
.L808DE608:
/* 07D98 808DE608 92A20274 */ lbu $v0, 0x0274($s5) ## 00000274
/* 07D9C 808DE60C 3C014248 */ lui $at, 0x4248 ## $at = 42480000

4
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s
View file

@ -305,10 +305,10 @@ glabel L808DB498
/* 04E78 808DB6E8 8E2B0278 */ lw $t3, 0x0278($s1) ## 00000278
/* 04E7C 808DB6EC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001
/* 04E80 808DB6F0 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002
/* 04E84 808DB6F4 3C098016 */ lui $t1, %hi(D_8015FCF8)
/* 04E84 808DB6F4 3C098016 */ lui $t1, %hi(gCustomLensFlarePos)
/* 04E88 808DB6F8 A639066E */ sh $t9, 0x066E($s1) ## 0000066E
/* 04E8C 808DB6FC A228066C */ sb $t0, 0x066C($s1) ## 0000066C
/* 04E90 808DB700 2529FCF8 */ addiu $t1, %lo(D_8015FCF8)
/* 04E90 808DB700 2529FCF8 */ addiu $t1, %lo(gCustomLensFlarePos)
/* 04E94 808DB704 AD2B0000 */ sw $t3, 0x0000($t1) ## 8015FCF8
/* 04E98 808DB708 8E2A027C */ lw $t2, 0x027C($s1) ## 0000027C
/* 04E9C 808DB70C AD2A0004 */ sw $t2, 0x0004($t1) ## 8015FCFC

4
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s
View file

@ -44,12 +44,12 @@ glabel func_808DC14C
/* 05960 808DC1D0 3C014140 */ lui $at, 0x4140 ## $at = 41400000
/* 05964 808DC1D4 44810000 */ mtc1 $at, $f0 ## $f0 = 12.00
/* 05968 808DC1D8 C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168
/* 0596C 808DC1DC 3C088016 */ lui $t0, %hi(D_8015FCF8)
/* 0596C 808DC1DC 3C088016 */ lui $t0, %hi(gCustomLensFlarePos)
/* 05970 808DC1E0 44050000 */ mfc1 $a1, $f0
/* 05974 808DC1E4 4600203E */ c.le.s $f4, $f0
/* 05978 808DC1E8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002
/* 0597C 808DC1EC 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002
/* 05980 808DC1F0 2508FCF8 */ addiu $t0, %lo(D_8015FCF8)
/* 05980 808DC1F0 2508FCF8 */ addiu $t0, %lo(gCustomLensFlarePos)
/* 05984 808DC1F4 45000009 */ bc1f .L808DC21C
/* 05988 808DC1F8 00000000 */ nop
/* 0598C 808DC1FC 8E0A0260 */ lw $t2, 0x0260($s0) ## 00000260

4
asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1034.s
View file

@ -68,8 +68,8 @@ glabel func_808E1034
/* 0A840 808E10B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
.L808E10B4:
/* 0A844 808E10B4 862900B6 */ lh $t1, 0x00B6($s1) ## 000000B6
/* 0A848 808E10B8 3C0B8016 */ lui $t3, %hi(D_8015FCF8)
/* 0A84C 808E10BC 256BFCF8 */ addiu $t3, %lo(D_8015FCF8)
/* 0A848 808E10B8 3C0B8016 */ lui $t3, %hi(gCustomLensFlarePos)
/* 0A84C 808E10BC 256BFCF8 */ addiu $t3, %lo(gCustomLensFlarePos)
/* 0A850 808E10C0 252A1000 */ addiu $t2, $t1, 0x1000 ## $t2 = 00001000
/* 0A854 808E10C4 A62A00B6 */ sh $t2, 0x00B6($s1) ## 000000B6
/* 0A858 808E10C8 A467066E */ sh $a3, 0x066E($v1) ## 0000066E

2
asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s
View file

@ -124,7 +124,7 @@ glabel func_80BA4D7C
/* 02454 80BA4EF4 E7B20074 */ swc1 $f18, 0x0074($sp)
/* 02458 80BA4EF8 E7B00070 */ swc1 $f16, 0x0070($sp)
/* 0245C 80BA4EFC E7A2006C */ swc1 $f2, 0x006C($sp)
/* 02460 80BA4F00 0C01BE4F */ jal func_8006F93C
/* 02460 80BA4F00 0C01BE4F */ jal Environment_LerpWeight
/* 02464 80BA4F04 AFA80058 */ sw $t0, 0x0058($sp)
/* 02468 80BA4F08 C7A2006C */ lwc1 $f2, 0x006C($sp)
/* 0246C 80BA4F0C C7AA0060 */ lwc1 $f10, 0x0060($sp)