hackern64/HackerOoT
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerOoT.git synced 2026-01-21 10:37:37 -08:00
Code Issues Packages Projects Releases Wiki Activity

Split z_path.c and Rename some small files and functions

Browse Source
This commit is contained in:
Roman971
2020-03-23 21:18:53 +01:00
parent 2f3f556bfb
commit d2729f9d88
77 changed files with 187 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
asm/non_matchings/code/code_80026B00/Effect_Add.s → asm/non_matchings/code/z_effect/Effect_Add.s
View File

0
asm/non_matchings/code/code_80026B00/func_80026B0C.s → asm/non_matchings/code/z_effect/func_80026B0C.s
View File

0
asm/non_matchings/code/code_80026B00/func_80026C2C.s → asm/non_matchings/code/z_effect/func_80026C2C.s
View File

0
asm/non_matchings/code/code_80026B00/func_80026E74.s → asm/non_matchings/code/z_effect/func_80026E74.s
View File

0
asm/non_matchings/code/code_80026B00/func_80026F70.s → asm/non_matchings/code/z_effect/func_80026F70.s
View File

0
asm/non_matchings/code/code_80026B00/func_8002709C.s → asm/non_matchings/code/z_effect/func_8002709C.s
View File

0
asm/non_matchings/code/code_80026B00/func_800271A8.s → asm/non_matchings/code/z_effect/func_800271A8.s
View File

39
asm/non_matchings/code/z_path/Path_CopyLastPoint.s Normal file
View File

@@ -0,0 +1,39 @@
glabel Path_CopyLastPoint
/* B057AC 8008E60C 10800022 */ beqz $a0, .L8008E698
/* B057B0 8008E610 3C198016 */ lui $t9, %hi(gSegments)
/* B057B4 8008E614 8C830004 */ lw $v1, 4($a0)
/* B057B8 8008E618 908A0000 */ lbu $t2, ($a0)
/* B057BC 8008E61C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff
/* B057C0 8008E620 00037100 */ sll $t6, $v1, 4
/* B057C4 8008E624 000E7F02 */ srl $t7, $t6, 0x1c
/* B057C8 8008E628 000FC080 */ sll $t8, $t7, 2
/* B057CC 8008E62C 0338C821 */ addu $t9, $t9, $t8
/* B057D0 8008E630 8F396FA8 */ lw $t9, %lo(gSegments)($t9)
/* B057D4 8008E634 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff
/* B057D8 8008E638 00614024 */ and $t0, $v1, $at
/* B057DC 8008E63C 000A5880 */ sll $t3, $t2, 2
/* B057E0 8008E640 016A5823 */ subu $t3, $t3, $t2
/* B057E4 8008E644 000B5840 */ sll $t3, $t3, 1
/* B057E8 8008E648 3C017FFF */ lui $at, (0x7FFFFFFA >> 16) # lui $at, 0x7fff
/* B057EC 8008E64C 03284821 */ addu $t1, $t9, $t0
/* B057F0 8008E650 012B1021 */ addu $v0, $t1, $t3
/* B057F4 8008E654 3421FFFA */ ori $at, (0x7FFFFFFA & 0xFFFF) # ori $at, $at, 0xfffa
/* B057F8 8008E658 00411021 */ addu $v0, $v0, $at
/* B057FC 8008E65C 844C0000 */ lh $t4, ($v0)
/* B05800 8008E660 448C2000 */ mtc1 $t4, $f4
/* B05804 8008E664 00000000 */ nop
/* B05808 8008E668 468021A0 */ cvt.s.w $f6, $f4
/* B0580C 8008E66C E4A60000 */ swc1 $f6, ($a1)
/* B05810 8008E670 844D0002 */ lh $t5, 2($v0)
/* B05814 8008E674 448D4000 */ mtc1 $t5, $f8
/* B05818 8008E678 00000000 */ nop
/* B0581C 8008E67C 468042A0 */ cvt.s.w $f10, $f8
/* B05820 8008E680 E4AA0004 */ swc1 $f10, 4($a1)
/* B05824 8008E684 844E0004 */ lh $t6, 4($v0)
/* B05828 8008E688 448E8000 */ mtc1 $t6, $f16
/* B0582C 8008E68C 00000000 */ nop
/* B05830 8008E690 468084A0 */ cvt.s.w $f18, $f16
/* B05834 8008E694 E4B20008 */ swc1 $f18, 8($a1)
.L8008E698:
/* B05838 8008E698 03E00008 */ jr $ra
/* B0583C 8008E69C 00000000 */ nop

18
asm/non_matchings/code/z_path/Path_GetByIndex.s Normal file
View File

@@ -0,0 +1,18 @@
glabel Path_GetByIndex
/* B05680 8008E4E0 AFA50004 */ sw $a1, 4($sp)
/* B05684 8008E4E4 AFA60008 */ sw $a2, 8($sp)
/* B05688 8008E4E8 00063400 */ sll $a2, $a2, 0x10
/* B0568C 8008E4EC 00052C00 */ sll $a1, $a1, 0x10
/* B05690 8008E4F0 00052C03 */ sra $a1, $a1, 0x10
/* B05694 8008E4F4 00063403 */ sra $a2, $a2, 0x10
/* B05698 8008E4F8 10A60007 */ beq $a1, $a2, .L8008E518
/* B0569C 8008E4FC 00001825 */ move $v1, $zero
/* B056A0 8008E500 3C0E0001 */ lui $t6, 1
/* B056A4 8008E504 01C47021 */ addu $t6, $t6, $a0
/* B056A8 8008E508 8DCE1E08 */ lw $t6, 0x1e08($t6)
/* B056AC 8008E50C 000578C0 */ sll $t7, $a1, 3
/* B056B0 8008E510 03E00008 */ jr $ra
/* B056B4 8008E514 01CF1021 */ addu $v0, $t6, $t7
.L8008E518:
/* B056B8 8008E518 03E00008 */ jr $ra
/* B056BC 8008E51C 00601025 */ move $v0, $v1

75
asm/code_8008E4E0.s → asm/non_matchings/code/z_path/Path_OrientAndGetDistSq.s
View File

@@ -1,34 +1,9 @@
.include "macro.inc"
.late_rodata
glabel D_8013E760
.float 10430.378 # 32768 / M_PI
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .text
.align 4
glabel func_8008E4E0
/* B05680 8008E4E0 AFA50004 */ sw $a1, 4($sp)
/* B05684 8008E4E4 AFA60008 */ sw $a2, 8($sp)
/* B05688 8008E4E8 00063400 */ sll $a2, $a2, 0x10
/* B0568C 8008E4EC 00052C00 */ sll $a1, $a1, 0x10
/* B05690 8008E4F0 00052C03 */ sra $a1, $a1, 0x10
/* B05694 8008E4F4 00063403 */ sra $a2, $a2, 0x10
/* B05698 8008E4F8 10A60007 */ beq $a1, $a2, .L8008E518
/* B0569C 8008E4FC 00001825 */ move $v1, $zero
/* B056A0 8008E500 3C0E0001 */ lui $t6, 1
/* B056A4 8008E504 01C47021 */ addu $t6, $t6, $a0
/* B056A8 8008E508 8DCE1E08 */ lw $t6, 0x1e08($t6)
/* B056AC 8008E50C 000578C0 */ sll $t7, $a1, 3
/* B056B0 8008E510 03E00008 */ jr $ra
/* B056B4 8008E514 01CF1021 */ addu $v0, $t6, $t7
.L8008E518:
/* B056B8 8008E518 03E00008 */ jr $ra
/* B056BC 8008E51C 00601025 */ move $v0, $v1
glabel func_8008E520
.text
glabel Path_OrientAndGetDistSq
/* B056C0 8008E520 27BDFFE0 */ addiu $sp, $sp, -0x20
/* B056C4 8008E524 AFA60028 */ sw $a2, 0x28($sp)
/* B056C8 8008E528 00063400 */ sll $a2, $a2, 0x10
@@ -90,43 +65,3 @@ glabel func_8008E520
/* B057A0 8008E600 27BD0020 */ addiu $sp, $sp, 0x20
/* B057A4 8008E604 03E00008 */ jr $ra
/* B057A8 8008E608 00000000 */ nop
glabel func_8008E60C
/* B057AC 8008E60C 10800022 */ beqz $a0, .L8008E698
/* B057B0 8008E610 3C198016 */ lui $t9, %hi(gSegments)
/* B057B4 8008E614 8C830004 */ lw $v1, 4($a0)
/* B057B8 8008E618 908A0000 */ lbu $t2, ($a0)
/* B057BC 8008E61C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff
/* B057C0 8008E620 00037100 */ sll $t6, $v1, 4
/* B057C4 8008E624 000E7F02 */ srl $t7, $t6, 0x1c
/* B057C8 8008E628 000FC080 */ sll $t8, $t7, 2
/* B057CC 8008E62C 0338C821 */ addu $t9, $t9, $t8
/* B057D0 8008E630 8F396FA8 */ lw $t9, %lo(gSegments)($t9)
/* B057D4 8008E634 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff
/* B057D8 8008E638 00614024 */ and $t0, $v1, $at
/* B057DC 8008E63C 000A5880 */ sll $t3, $t2, 2
/* B057E0 8008E640 016A5823 */ subu $t3, $t3, $t2
/* B057E4 8008E644 000B5840 */ sll $t3, $t3, 1
/* B057E8 8008E648 3C017FFF */ lui $at, (0x7FFFFFFA >> 16) # lui $at, 0x7fff
/* B057EC 8008E64C 03284821 */ addu $t1, $t9, $t0
/* B057F0 8008E650 012B1021 */ addu $v0, $t1, $t3
/* B057F4 8008E654 3421FFFA */ ori $at, (0x7FFFFFFA & 0xFFFF) # ori $at, $at, 0xfffa
/* B057F8 8008E658 00411021 */ addu $v0, $v0, $at
/* B057FC 8008E65C 844C0000 */ lh $t4, ($v0)
/* B05800 8008E660 448C2000 */ mtc1 $t4, $f4
/* B05804 8008E664 00000000 */ nop
/* B05808 8008E668 468021A0 */ cvt.s.w $f6, $f4
/* B0580C 8008E66C E4A60000 */ swc1 $f6, ($a1)
/* B05810 8008E670 844D0002 */ lh $t5, 2($v0)
/* B05814 8008E674 448D4000 */ mtc1 $t5, $f8
/* B05818 8008E678 00000000 */ nop
/* B0581C 8008E67C 468042A0 */ cvt.s.w $f10, $f8
/* B05820 8008E680 E4AA0004 */ swc1 $f10, 4($a1)
/* B05824 8008E684 844E0004 */ lh $t6, 4($v0)
/* B05828 8008E688 448E8000 */ mtc1 $t6, $f16
/* B0582C 8008E68C 00000000 */ nop
/* B05830 8008E690 468084A0 */ cvt.s.w $f18, $f16
/* B05834 8008E694 E4B20008 */ swc1 $f18, 8($a1)
.L8008E698:
/* B05838 8008E698 03E00008 */ jr $ra
/* B0583C 8008E69C 00000000 */ nop

2
asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B064C.s
View File

@@ -5,7 +5,7 @@ glabel func_809B064C
/* 002E8 809B0658 AFA50024 */ sw $a1, 0x0024($sp)
/* 002EC 809B065C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 002F0 809B0660 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A
/* 002F4 809B0664 0C01B0D8 */ jal func_8006C360
/* 002F4 809B0664 0C01B0D8 */ jal Text_GetFaceReaction
/* 002F8 809B0668 AFA70020 */ sw $a3, 0x0020($sp)
/* 002FC 809B066C 8FA50024 */ lw $a1, 0x0024($sp)
/* 00300 809B0670 8FA70020 */ lw $a3, 0x0020($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s
View File

@@ -5,7 +5,7 @@ glabel func_809E1CB8
/* 00414 809E1CC4 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44
/* 00418 809E1CC8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 0041C 809E1CCC 2405000F */ addiu $a1, $zero, 0x000F ## $a1 = 0000000F
/* 00420 809E1CD0 0C01B0D8 */ jal func_8006C360
/* 00420 809E1CD0 0C01B0D8 */ jal Text_GetFaceReaction
/* 00424 809E1CD4 AFAE001C */ sw $t6, 0x001C($sp)
/* 00428 809E1CD8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000
/* 0042C 809E1CDC 95EFF556 */ lhu $t7, -0x0AAA($t7) ## 8015F556

2
asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s
View File

@@ -50,7 +50,7 @@ glabel func_809E47EC
/* 00584 809E48A4 33280003 */ andi $t0, $t9, 0x0003 ## $t0 = 00000000
/* 00588 809E48A8 00084880 */ sll $t1, $t0, 2
/* 0058C 809E48AC 00A92821 */ addu $a1, $a1, $t1
/* 00590 809E48B0 0C01B0D8 */ jal func_8006C360
/* 00590 809E48B0 0C01B0D8 */ jal Text_GetFaceReaction
/* 00594 809E48B4 8CA55570 */ lw $a1, %lo(D_809E5570)($a1)
/* 00598 809E48B8 304AFFFF */ andi $t2, $v0, 0xFFFF ## $t2 = 00000000
/* 0059C 809E48BC 15400035 */ bne $t2, $zero, .L809E4994

4
asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s
View File

@@ -53,11 +53,11 @@ glabel func_809EDD4C
/* 00594 809EDE04 10000030 */ beq $zero, $zero, .L809EDEC8
/* 00598 809EDE08 AE080280 */ sw $t0, 0x0280($s0) ## 00000280
.L809EDE0C:
/* 0059C 809EDE0C 0C01B0D8 */ jal func_8006C360
/* 0059C 809EDE0C 0C01B0D8 */ jal Text_GetFaceReaction
/* 005A0 809EDE10 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D
/* 005A4 809EDE14 10400007 */ beq $v0, $zero, .L809EDE34
/* 005A8 809EDE18 8FA40024 */ lw $a0, 0x0024($sp)
/* 005AC 809EDE1C 0C01B0D8 */ jal func_8006C360
/* 005AC 809EDE1C 0C01B0D8 */ jal Text_GetFaceReaction
/* 005B0 809EDE20 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D
/* 005B4 809EDE24 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006
/* 005B8 809EDE28 A602010E */ sh $v0, 0x010E($s0) ## 0000010E

2
asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s
View File

@@ -2,7 +2,7 @@ glabel func_809FDC38
/* 00008 809FDC38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 0000C 809FDC3C AFBF0014 */ sw $ra, 0x0014($sp)
/* 00010 809FDC40 AFA5001C */ sw $a1, 0x001C($sp)
/* 00014 809FDC44 0C01B0D8 */ jal func_8006C360
/* 00014 809FDC44 0C01B0D8 */ jal Text_GetFaceReaction
/* 00018 809FDC48 24050021 */ addiu $a1, $zero, 0x0021 ## $a1 = 00000021
/* 0001C 809FDC4C 10400003 */ beq $v0, $zero, .L809FDC5C
/* 00020 809FDC50 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s
View File

@@ -4,7 +4,7 @@ glabel func_80A1DA9C
/* 00294 80A1DAA4 AFBF0024 */ sw $ra, 0x0024($sp)
/* 00298 80A1DAA8 AFA50034 */ sw $a1, 0x0034($sp)
/* 0029C 80A1DAAC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 002A0 80A1DAB0 0C01B0D8 */ jal func_8006C360
/* 002A0 80A1DAB0 0C01B0D8 */ jal Text_GetFaceReaction
/* 002A4 80A1DAB4 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B
/* 002A8 80A1DAB8 14400009 */ bne $v0, $zero, .L80A1DAE0
/* 002AC 80A1DABC 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s
View File

@@ -4,7 +4,7 @@ glabel func_80A3118C
/* 00824 80A31194 AFBF001C */ sw $ra, 0x001C($sp)
/* 00828 80A31198 AFA50024 */ sw $a1, 0x0024($sp)
/* 0082C 80A3119C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 00830 80A311A0 0C01B0D8 */ jal func_8006C360
/* 00830 80A311A0 0C01B0D8 */ jal Text_GetFaceReaction
/* 00834 80A311A4 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022
/* 00838 80A311A8 14400002 */ bne $v0, $zero, .L80A311B4
/* 0083C 80A311AC 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s
View File

@@ -4,7 +4,7 @@ glabel func_80A31880
/* 00F18 80A31888 AFBF0024 */ sw $ra, 0x0024($sp)
/* 00F1C 80A3188C AFA5002C */ sw $a1, 0x002C($sp)
/* 00F20 80A31890 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 00F24 80A31894 0C01B0D8 */ jal func_8006C360
/* 00F24 80A31894 0C01B0D8 */ jal Text_GetFaceReaction
/* 00F28 80A31898 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022
/* 00F2C 80A3189C 14400002 */ bne $v0, $zero, .L80A318A8
/* 00F30 80A318A0 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000

6
asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s
View File

@@ -99,7 +99,7 @@ glabel L80A46594
/* 03908 80A46638 A20F0216 */ sb $t7, 0x0216($s0) ## 00000216
/* 0390C 80A4663C 8FA40044 */ lw $a0, 0x0044($sp)
/* 03910 80A46640 00052C03 */ sra $a1, $a1, 16
/* 03914 80A46644 0C023938 */ jal func_8008E4E0
/* 03914 80A46644 0C023938 */ jal Path_GetByIndex
/* 03918 80A46648 2406001F */ addiu $a2, $zero, 0x001F ## $a2 = 0000001F
/* 0391C 80A4664C 8603001C */ lh $v1, 0x001C($s0) ## 0000001C
/* 03920 80A46650 AE020208 */ sw $v0, 0x0208($s0) ## 00000208
@@ -163,7 +163,7 @@ glabel L80A46704
/* 039E8 80A46718 53200024 */ beql $t9, $zero, .L80A467AC
/* 039EC 80A4671C 3059EFFF */ andi $t9, $v0, 0xEFFF ## $t9 = 00000000
/* 039F0 80A46720 8E040208 */ lw $a0, 0x0208($s0) ## 00000208
/* 039F4 80A46724 0C023983 */ jal func_8008E60C
/* 039F4 80A46724 0C023983 */ jal Path_CopyLastPoint
/* 039F8 80A46728 AFA50030 */ sw $a1, 0x0030($sp)
/* 039FC 80A4672C 8FA50030 */ lw $a1, 0x0030($sp)
/* 03A00 80A46730 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000
@@ -299,7 +299,7 @@ glabel L80A468FC
/* 03BE0 80A46910 1120000B */ beq $t1, $zero, .L80A46940
/* 03BE4 80A46914 00000000 */ nop
/* 03BE8 80A46918 8E040208 */ lw $a0, 0x0208($s0) ## 00000208
/* 03BEC 80A4691C 0C023983 */ jal func_8008E60C
/* 03BEC 80A4691C 0C023983 */ jal Path_CopyLastPoint
/* 03BF0 80A46920 AFA50030 */ sw $a1, 0x0030($sp)
/* 03BF4 80A46924 8FA50030 */ lw $a1, 0x0030($sp)
/* 03BF8 80A46928 8CAB0000 */ lw $t3, 0x0000($a1) ## 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s
View File

@@ -4,7 +4,7 @@ glabel func_80A44534
/* 0180C 80A4453C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000
/* 01810 80A44540 AFA6001C */ sw $a2, 0x001C($sp)
/* 01814 80A44544 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020
/* 01818 80A44548 0C01B0D8 */ jal func_8006C360
/* 01818 80A44548 0C01B0D8 */ jal Text_GetFaceReaction
/* 0181C 80A4454C AFA40018 */ sw $a0, 0x0018($sp)
/* 01820 80A44550 8FA40018 */ lw $a0, 0x0018($sp)
/* 01824 80A44554 8FA6001C */ lw $a2, 0x001C($sp)

Some files were not shown because too many files have changed in this diff Show More