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

EnMb documented (Moblins) (#861)

Browse source 
* Document Moblins (EnMb)

* Use actual decomp-style function names

* Add renamed functions to actorfixer.py

* Add general documentation and add EnMbType enum to check moblin subtype

* Add fig's doc comment on Actor_TestFloorInDirection

* Revert documentation on z_eff_ss_dead.c

* remove `gSPFogPosition(?,?)` comments on `gSPFogFactor` uses in z_rcp.c

* run formatter
This commit is contained in:
Dragorn421 2021-08-08 13:28:28 +02:00 • committed by GitHub
parent ca2ea1ce2d
commit 9455c885f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 1095 additions and 1004 deletions
Download patch file Download diff file Expand all files Collapse all files

2
asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3487C.s
View file

@ -320,7 +320,7 @@ glabel func_80B3487C
/* 01024 80B34CD4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000
/* 01028 80B34CD8 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024
/* 0102C 80B34CDC 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000
/* 01030 80B34CE0 0C00CC98 */ jal Actor_SpawnFloorDust
/* 01030 80B34CE0 0C00CC98 */ jal Actor_SpawnFloorDustRing
/* 01034 80B34CE4 E7A80014 */ swc1 $f8, 0x0014($sp)
.L80B34CE8:
/* 01038 80B34CE8 8FBF0034 */ lw $ra, 0x0034($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35024.s
View file

@ -53,7 +53,7 @@ glabel func_80B35024
/* 01418 80B350C8 14400008 */ bne $v0, $zero, .L80B350EC
/* 0141C 80B350CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 01420 80B350D0 8FA5005C */ lw $a1, 0x005C($sp)
/* 01424 80B350D4 0C00CE6E */ jal func_800339B8
/* 01424 80B350D4 0C00CE6E */ jal Actor_TestFloorInDirection
/* 01428 80B350D8 8E060068 */ lw $a2, 0x0068($s0) ## 00000068
/* 0142C 80B350DC 54400019 */ bnel $v0, $zero, .L80B35144
/* 01430 80B350E0 8FA4005C */ lw $a0, 0x005C($sp)
@ -281,7 +281,7 @@ glabel func_80B35024
/* 01744 80B353F4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000
/* 01748 80B353F8 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024
/* 0174C 80B353FC 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000
/* 01750 80B35400 0C00CC98 */ jal Actor_SpawnFloorDust
/* 01750 80B35400 0C00CC98 */ jal Actor_SpawnFloorDustRing
/* 01754 80B35404 E7A80014 */ swc1 $f8, 0x0014($sp)
/* 01758 80B35408 8FAB005C */ lw $t3, 0x005C($sp)
.L80B3540C:

2
asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B355BC.s
View file

@ -135,7 +135,7 @@ glabel func_80B355BC
/* 01AC0 80B35770 AFB80018 */ sw $t8, 0x0018($sp)
/* 01AC4 80B35774 AFAF0010 */ sw $t7, 0x0010($sp)
/* 01AC8 80B35778 8FA4004C */ lw $a0, 0x004C($sp)
/* 01ACC 80B3577C 0C00CC98 */ jal Actor_SpawnFloorDust
/* 01ACC 80B3577C 0C00CC98 */ jal Actor_SpawnFloorDustRing
/* 01AD0 80B35780 E7AA0014 */ swc1 $f10, 0x0014($sp)
/* 01AD4 80B35784 8E0902E8 */ lw $t1, 0x02E8($s0) ## 000002E8
/* 01AD8 80B35788 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF

4
asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36740.s
View file

@ -33,7 +33,7 @@ glabel func_80B36740
/* 02AEC 80B3679C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02AF0 80B367A0 8FA50074 */ lw $a1, 0x0074($sp)
/* 02AF4 80B367A4 8E060068 */ lw $a2, 0x0068($s0) ## 00000068
/* 02AF8 80B367A8 0C00CE6E */ jal func_800339B8
/* 02AF8 80B367A8 0C00CE6E */ jal Actor_TestFloorInDirection
/* 02AFC 80B367AC 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6
/* 02B00 80B367B0 54400018 */ bnel $v0, $zero, .L80B36814
/* 02B04 80B367B4 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6
@ -365,7 +365,7 @@ glabel func_80B36740
/* 02F94 80B36C44 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000
/* 02F98 80B36C48 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024
/* 02F9C 80B36C4C 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000
/* 02FA0 80B36C50 0C00CC98 */ jal Actor_SpawnFloorDust
/* 02FA0 80B36C50 0C00CC98 */ jal Actor_SpawnFloorDustRing
/* 02FA4 80B36C54 E7A60014 */ swc1 $f6, 0x0014($sp)
/* 02FA8 80B36C58 8FAF003C */ lw $t7, 0x003C($sp)
.L80B36C5C:

4
asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s
View file

@ -105,7 +105,7 @@ glabel func_80B45174
/* 01294 80B452E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000
/* 01298 80B452E8 260604F0 */ addiu $a2, $s0, 0x04F0 ## $a2 = 000004F0
/* 0129C 80B452EC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000
/* 012A0 80B452F0 0C00CC98 */ jal Actor_SpawnFloorDust
/* 012A0 80B452F0 0C00CC98 */ jal Actor_SpawnFloorDustRing
/* 012A4 80B452F4 E7A80014 */ swc1 $f8, 0x0014($sp)
/* 012A8 80B452F8 3C014000 */ lui $at, 0x4000 ## $at = 40000000
/* 012AC 80B452FC 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00
@ -118,7 +118,7 @@ glabel func_80B45174
/* 012C8 80B45318 AFA00018 */ sw $zero, 0x0018($sp)
/* 012CC 80B4531C AFA0001C */ sw $zero, 0x001C($sp)
/* 012D0 80B45320 AFA00020 */ sw $zero, 0x0020($sp)
/* 012D4 80B45324 0C00CC98 */ jal Actor_SpawnFloorDust
/* 012D4 80B45324 0C00CC98 */ jal Actor_SpawnFloorDustRing
/* 012D8 80B45328 E7AA0014 */ swc1 $f10, 0x0014($sp)
.L80B4532C:
/* 012DC 80B4532C 0C02927F */ jal SkelAnime_Update

4
asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s
View file

@ -11,7 +11,7 @@ glabel func_80B462E4
/* 022B8 80B46308 3C064220 */ lui $a2, 0x4220 ## $a2 = 42200000
/* 022BC 80B4630C 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF
/* 022C0 80B46310 00073C00 */ sll $a3, $a3, 16
/* 022C4 80B46314 0C00CE6E */ jal func_800339B8
/* 022C4 80B46314 0C00CE6E */ jal Actor_TestFloorInDirection
/* 022C8 80B46318 00073C03 */ sra $a3, $a3, 16
/* 022CC 80B4631C 1440000A */ bne $v0, $zero, .L80B46348
/* 022D0 80B46320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
@ -20,7 +20,7 @@ glabel func_80B462E4
/* 022DC 80B4632C 3C06C220 */ lui $a2, 0xC220 ## $a2 = C2200000
/* 022E0 80B46330 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF
/* 022E4 80B46334 00073C00 */ sll $a3, $a3, 16
/* 022E8 80B46338 0C00CE6E */ jal func_800339B8
/* 022E8 80B46338 0C00CE6E */ jal Actor_TestFloorInDirection
/* 022EC 80B4633C 00073C03 */ sra $a3, $a3, 16
/* 022F0 80B46340 10400021 */ beq $v0, $zero, .L80B463C8
/* 022F4 80B46344 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B463E4.s
View file

@ -126,7 +126,7 @@ glabel func_80B463E4
/* 02538 80B46588 8FA5005C */ lw $a1, 0x005C($sp)
/* 0253C 80B4658C 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF
/* 02540 80B46590 00073C00 */ sll $a3, $a3, 16
/* 02544 80B46594 0C00CE6E */ jal func_800339B8
/* 02544 80B46594 0C00CE6E */ jal Actor_TestFloorInDirection
/* 02548 80B46598 00073C03 */ sra $a3, $a3, 16
/* 0254C 80B4659C 5440003B */ bnel $v0, $zero, .L80B4668C
/* 02550 80B465A0 8FA4005C */ lw $a0, 0x005C($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s
View file

@ -210,7 +210,7 @@ glabel func_80B4781C
/* 03AA8 80B47AF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000
/* 03AAC 80B47AFC 260604F0 */ addiu $a2, $s0, 0x04F0 ## $a2 = 000004F0
/* 03AB0 80B47B00 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000
/* 03AB4 80B47B04 0C00CC98 */ jal Actor_SpawnFloorDust
/* 03AB4 80B47B04 0C00CC98 */ jal Actor_SpawnFloorDustRing
/* 03AB8 80B47B08 E7A60014 */ swc1 $f6, 0x0014($sp)
/* 03ABC 80B47B0C 3C014000 */ lui $at, 0x4000 ## $at = 40000000
/* 03AC0 80B47B10 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00
@ -223,7 +223,7 @@ glabel func_80B4781C
/* 03ADC 80B47B2C AFA00018 */ sw $zero, 0x0018($sp)
/* 03AE0 80B47B30 AFA0001C */ sw $zero, 0x001C($sp)
/* 03AE4 80B47B34 AFA00020 */ sw $zero, 0x0020($sp)
/* 03AE8 80B47B38 0C00CC98 */ jal Actor_SpawnFloorDust
/* 03AE8 80B47B38 0C00CC98 */ jal Actor_SpawnFloorDustRing
/* 03AEC 80B47B3C E7A80014 */ swc1 $f8, 0x0014($sp)
/* 03AF0 80B47B40 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090
/* 03AF4 80B47B44 C7B00074 */ lwc1 $f16, 0x0074($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s
View file

@ -11,7 +11,7 @@ glabel func_80B483E4
/* 043B8 80B48408 3C064220 */ lui $a2, 0x4220 ## $a2 = 42200000
/* 043BC 80B4840C 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF
/* 043C0 80B48410 00073C00 */ sll $a3, $a3, 16
/* 043C4 80B48414 0C00CE6E */ jal func_800339B8
/* 043C4 80B48414 0C00CE6E */ jal Actor_TestFloorInDirection
/* 043C8 80B48418 00073C03 */ sra $a3, $a3, 16
/* 043CC 80B4841C 1440000A */ bne $v0, $zero, .L80B48448
/* 043D0 80B48420 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
@ -20,7 +20,7 @@ glabel func_80B483E4
/* 043DC 80B4842C 3C06C220 */ lui $a2, 0xC220 ## $a2 = C2200000
/* 043E0 80B48430 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF
/* 043E4 80B48434 00073C00 */ sll $a3, $a3, 16
/* 043E8 80B48438 0C00CE6E */ jal func_800339B8
/* 043E8 80B48438 0C00CE6E */ jal Actor_TestFloorInDirection
/* 043EC 80B4843C 00073C03 */ sra $a3, $a3, 16
/* 043F0 80B48440 10400046 */ beq $v0, $zero, .L80B4855C
/* 043F4 80B48444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48578.s
View file

@ -47,7 +47,7 @@ glabel func_80B48578
/* 045B4 80B48604 A7A80056 */ sh $t0, 0x0056($sp)
/* 045B8 80B48608 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF
/* 045BC 80B4860C 00073C00 */ sll $a3, $a3, 16
/* 045C0 80B48610 0C00CE6E */ jal func_800339B8
/* 045C0 80B48610 0C00CE6E */ jal Actor_TestFloorInDirection
/* 045C4 80B48614 00073C03 */ sra $a3, $a3, 16
/* 045C8 80B48618 1440003B */ bne $v0, $zero, .L80B48708
/* 045CC 80B4861C 87A80056 */ lh $t0, 0x0056($sp)