mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28 from Roman971/z_path.c

Browse source 
Rename/document some small files and Decompile z_path.c
This commit is contained in:
fig02 2020-03-23 18:09:18 -04:00 committed by GitHub
commit 78a4684e32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 163 additions and 259 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
asm/code_8008E4E0.s
View file

@ -1,132 +0,0 @@
.include "macro.inc"
# 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
/* B056C0 8008E520 27BDFFE0 */ addiu $sp, $sp, -0x20
/* B056C4 8008E524 AFA60028 */ sw $a2, 0x28($sp)
/* B056C8 8008E528 00063400 */ sll $a2, $a2, 0x10
/* B056CC 8008E52C 00063403 */ sra $a2, $a2, 0x10
/* B056D0 8008E530 AFBF0014 */ sw $ra, 0x14($sp)
/* B056D4 8008E534 14A00005 */ bnez $a1, .L8008E54C
/* B056D8 8008E538 AFA7002C */ sw $a3, 0x2c($sp)
/* B056DC 8008E53C 3C01BF80 */ li $at, 0xBF800000 # 0.000000
/* B056E0 8008E540 44810000 */ mtc1 $at, $f0
/* B056E4 8008E544 1000002E */ b .L8008E600
/* B056E8 8008E548 8FBF0014 */ lw $ra, 0x14($sp)
.L8008E54C:
/* B056EC 8008E54C 8CA30004 */ lw $v1, 4($a1)
/* B056F0 8008E550 3C198016 */ lui $t9, %hi(gSegments)
/* B056F4 8008E554 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff
/* B056F8 8008E558 00037100 */ sll $t6, $v1, 4
/* B056FC 8008E55C 000E7F02 */ srl $t7, $t6, 0x1c
/* B05700 8008E560 000FC080 */ sll $t8, $t7, 2
/* B05704 8008E564 0338C821 */ addu $t9, $t9, $t8
/* B05708 8008E568 8F396FA8 */ lw $t9, %lo(gSegments)($t9)
/* B0570C 8008E56C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff
/* B05710 8008E570 00614024 */ and $t0, $v1, $at
/* B05714 8008E574 00064880 */ sll $t1, $a2, 2
/* B05718 8008E578 3C018000 */ lui $at, 0x8000
/* B0571C 8008E57C 01264823 */ subu $t1, $t1, $a2
/* B05720 8008E580 03281021 */ addu $v0, $t9, $t0
/* B05724 8008E584 00411021 */ addu $v0, $v0, $at
/* B05728 8008E588 00094840 */ sll $t1, $t1, 1
/* B0572C 8008E58C 01221021 */ addu $v0, $t1, $v0
/* B05730 8008E590 844A0000 */ lh $t2, ($v0)
/* B05734 8008E594 844B0004 */ lh $t3, 4($v0)
/* B05738 8008E598 C4880024 */ lwc1 $f8, 0x24($a0)
/* B0573C 8008E59C 448A2000 */ mtc1 $t2, $f4
/* B05740 8008E5A0 448B5000 */ mtc1 $t3, $f10
/* B05744 8008E5A4 C492002C */ lwc1 $f18, 0x2c($a0)
/* B05748 8008E5A8 468021A0 */ cvt.s.w $f6, $f4
/* B0574C 8008E5AC 46805420 */ cvt.s.w $f16, $f10
/* B05750 8008E5B0 46083301 */ sub.s $f12, $f6, $f8
/* B05754 8008E5B4 46128381 */ sub.s $f14, $f16, $f18
/* B05758 8008E5B8 E7AC001C */ swc1 $f12, 0x1c($sp)
/* B0575C 8008E5BC 0C03F494 */ jal Math_atan2f
/* B05760 8008E5C0 E7AE0018 */ swc1 $f14, 0x18($sp)
/* B05764 8008E5C4 3C018014 */ lui $at, %hi(D_8013E760)
/* B05768 8008E5C8 C424E760 */ lwc1 $f4, %lo(D_8013E760)($at)
/* B0576C 8008E5CC C7AC001C */ lwc1 $f12, 0x1c($sp)
/* B05770 8008E5D0 C7AE0018 */ lwc1 $f14, 0x18($sp)
/* B05774 8008E5D4 46040182 */ mul.s $f6, $f0, $f4
/* B05778 8008E5D8 8FAE002C */ lw $t6, 0x2c($sp)
/* B0577C 8008E5DC 460C6282 */ mul.s $f10, $f12, $f12
/* B05780 8008E5E0 00000000 */ nop
/* B05784 8008E5E4 460E7402 */ mul.s $f16, $f14, $f14
/* B05788 8008E5E8 4600320D */ trunc.w.s $f8, $f6
/* B0578C 8008E5EC 46105000 */ add.s $f0, $f10, $f16
/* B05790 8008E5F0 440D4000 */ mfc1 $t5, $f8
/* B05794 8008E5F4 00000000 */ nop
/* B05798 8008E5F8 A5CD0000 */ sh $t5, ($t6)
/* B0579C 8008E5FC 8FBF0014 */ lw $ra, 0x14($sp)
.L8008E600:
/* 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

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

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)

2
asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s
View file

@ -6,7 +6,7 @@ glabel func_80A44CE4
/* 01FC4 80A44CF4 AFA50034 */ sw $a1, 0x0034($sp)
/* 01FC8 80A44CF8 82060210 */ lb $a2, 0x0210($s0) ## 00000210
/* 01FCC 80A44CFC 8E050208 */ lw $a1, 0x0208($s0) ## 00000208
/* 01FD0 80A44D00 0C023948 */ jal func_8008E520
/* 01FD0 80A44D00 0C023948 */ jal Path_OrientAndGetDistSq
/* 01FD4 80A44D04 27A7002E */ addiu $a3, $sp, 0x002E ## $a3 = FFFFFFFE
/* 01FD8 80A44D08 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001
/* 01FDC 80A44D0C AFAE0010 */ sw $t6, 0x0010($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s
View file

@ -4,7 +4,7 @@ glabel func_80A44D84
/* 0205C 80A44D8C 80860210 */ lb $a2, 0x0210($a0) ## 00000210
/* 02060 80A44D90 8C850208 */ lw $a1, 0x0208($a0) ## 00000208
/* 02064 80A44D94 AFA40020 */ sw $a0, 0x0020($sp)
/* 02068 80A44D98 0C023948 */ jal func_8008E520
/* 02068 80A44D98 0C023948 */ jal Path_OrientAndGetDistSq
/* 0206C 80A44D9C 27A7001E */ addiu $a3, $sp, 0x001E ## $a3 = FFFFFFFE
/* 02070 80A44DA0 8FA40020 */ lw $a0, 0x0020($sp)
/* 02074 80A44DA4 87AE001E */ lh $t6, 0x001E($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s
View file

@ -17,7 +17,7 @@ glabel func_80A462D8
/* 035E4 80A46314 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007
/* 035E8 80A46318 8E040208 */ lw $a0, 0x0208($s0) ## 00000208
/* 035EC 80A4631C 260504AC */ addiu $a1, $s0, 0x04AC ## $a1 = 000004AC
/* 035F0 80A46320 0C023983 */ jal func_8008E60C
/* 035F0 80A46320 0C023983 */ jal Path_CopyLastPoint
/* 035F4 80A46324 AFA50020 */ sw $a1, 0x0020($sp)
/* 035F8 80A46328 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024
/* 035FC 80A4632C 0C01E01A */ jal Math_Vec3f_Yaw

4
asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s
View file

@ -7,11 +7,11 @@ glabel func_80A53278
/* 003EC 80A5328C A080030B */ sb $zero, 0x030B($a0) ## 0000030B
/* 003F0 80A53290 A480030E */ sh $zero, 0x030E($a0) ## 0000030E
/* 003F4 80A53294 8FA40024 */ lw $a0, 0x0024($sp)
/* 003F8 80A53298 0C01B0D8 */ jal func_8006C360
/* 003F8 80A53298 0C01B0D8 */ jal Text_GetFaceReaction
/* 003FC 80A5329C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005
/* 00400 80A532A0 1040000C */ beq $v0, $zero, .L80A532D4
/* 00404 80A532A4 8FA40024 */ lw $a0, 0x0024($sp)
/* 00408 80A532A8 0C01B0D8 */ jal func_8006C360
/* 00408 80A532A8 0C01B0D8 */ jal Text_GetFaceReaction
/* 0040C 80A532AC 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005
/* 00410 80A532B0 3C1880A5 */ lui $t8, %hi(func_80A5475C) ## $t8 = 80A50000
/* 00414 80A532B4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001

4
asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s
View file

@ -50,7 +50,7 @@ glabel func_80A5399C
/* 00BA8 80A53A48 8FA40024 */ lw $a0, 0x0024($sp)
/* 00BAC 80A53A4C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005
/* 00BB0 80A53A50 A7A3001E */ sh $v1, 0x001E($sp)
/* 00BB4 80A53A54 0C01B0D8 */ jal func_8006C360
/* 00BB4 80A53A54 0C01B0D8 */ jal Text_GetFaceReaction
/* 00BB8 80A53A58 AFA60020 */ sw $a2, 0x0020($sp)
/* 00BBC 80A53A5C 87A3001E */ lh $v1, 0x001E($sp)
/* 00BC0 80A53A60 1040000D */ beq $v0, $zero, .L80A53A98
@ -58,7 +58,7 @@ glabel func_80A5399C
/* 00BC8 80A53A68 1460000B */ bne $v1, $zero, .L80A53A98
/* 00BCC 80A53A6C 8FA40024 */ lw $a0, 0x0024($sp)
/* 00BD0 80A53A70 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005
/* 00BD4 80A53A74 0C01B0D8 */ jal func_8006C360
/* 00BD4 80A53A74 0C01B0D8 */ jal Text_GetFaceReaction
/* 00BD8 80A53A78 AFA60020 */ sw $a2, 0x0020($sp)
/* 00BDC 80A53A7C 8FA60020 */ lw $a2, 0x0020($sp)
/* 00BE0 80A53A80 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001

4
asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s
View file

@ -10,12 +10,12 @@ glabel func_80A53AD4
/* 00C54 80A53AF4 AFAF0024 */ sw $t7, 0x0024($sp)
/* 00C58 80A53AF8 8FA4002C */ lw $a0, 0x002C($sp)
/* 00C5C 80A53AFC 0C01B0D8 */ jal func_8006C360
/* 00C5C 80A53AFC 0C01B0D8 */ jal Text_GetFaceReaction
/* 00C60 80A53B00 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005
/* 00C64 80A53B04 10400006 */ beq $v0, $zero, .L80A53B20
/* 00C68 80A53B08 2418200E */ addiu $t8, $zero, 0x200E ## $t8 = 0000200E
/* 00C6C 80A53B0C 8FA4002C */ lw $a0, 0x002C($sp)
/* 00C70 80A53B10 0C01B0D8 */ jal func_8006C360
/* 00C70 80A53B10 0C01B0D8 */ jal Text_GetFaceReaction
/* 00C74 80A53B14 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005
/* 00C78 80A53B18 10000002 */ beq $zero, $zero, .L80A53B24
/* 00C7C 80A53B1C A602010E */ sh $v0, 0x010E($s0) ## 0000010E

2
asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s
View file

@ -8,7 +8,7 @@ glabel func_80A5475C
/* 018D4 80A54774 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C
/* 018D8 80A54778 8FA4001C */ lw $a0, 0x001C($sp)
/* 018DC 80A5477C 0C01B0D8 */ jal func_8006C360
/* 018DC 80A5477C 0C01B0D8 */ jal Text_GetFaceReaction
/* 018E0 80A54780 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005
/* 018E4 80A54784 10400011 */ beq $v0, $zero, .L80A547CC
/* 018E8 80A54788 8FA60018 */ lw $a2, 0x0018($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s
View file

@ -22,14 +22,14 @@ glabel func_80A563BC
/* 00334 80A56404 01CF1821 */ addu $v1, $t6, $t7
/* 00338 80A56408 8C650000 */ lw $a1, 0x0000($v1) ## 00000000
/* 0033C 80A5640C AFA30018 */ sw $v1, 0x0018($sp)
/* 00340 80A56410 0C01B0D8 */ jal func_8006C360
/* 00340 80A56410 0C01B0D8 */ jal Text_GetFaceReaction
/* 00344 80A56414 AFA60020 */ sw $a2, 0x0020($sp)
/* 00348 80A56418 8FA30018 */ lw $v1, 0x0018($sp)
/* 0034C 80A5641C 1040000D */ beq $v0, $zero, .L80A56454
/* 00350 80A56420 8FA60020 */ lw $a2, 0x0020($sp)
/* 00354 80A56424 8FA40024 */ lw $a0, 0x0024($sp)
/* 00358 80A56428 8C650000 */ lw $a1, 0x0000($v1) ## 00000000
/* 0035C 80A5642C 0C01B0D8 */ jal func_8006C360
/* 0035C 80A5642C 0C01B0D8 */ jal Text_GetFaceReaction
/* 00360 80A56430 AFA60020 */ sw $a2, 0x0020($sp)
/* 00364 80A56434 8FA60020 */ lw $a2, 0x0020($sp)
/* 00368 80A56438 3C1980A5 */ lui $t9, %hi(func_80A56B40) ## $t9 = 80A50000

4
asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s
View file

@ -23,7 +23,7 @@ glabel func_80A56614
/* 00590 80A56660 8C650000 */ lw $a1, 0x0000($v1) ## 00000000
/* 00594 80A56664 AFA30018 */ sw $v1, 0x0018($sp)
/* 00598 80A56668 AFA60020 */ sw $a2, 0x0020($sp)
/* 0059C 80A5666C 0C01B0D8 */ jal func_8006C360
/* 0059C 80A5666C 0C01B0D8 */ jal Text_GetFaceReaction
/* 005A0 80A56670 AFA70024 */ sw $a3, 0x0024($sp)
/* 005A4 80A56674 8FA30018 */ lw $v1, 0x0018($sp)
/* 005A8 80A56678 8FA60020 */ lw $a2, 0x0020($sp)
@ -31,7 +31,7 @@ glabel func_80A56614
/* 005B0 80A56680 8FA70024 */ lw $a3, 0x0024($sp)
/* 005B4 80A56684 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000
/* 005B8 80A56688 8C650000 */ lw $a1, 0x0000($v1) ## 00000000
/* 005BC 80A5668C 0C01B0D8 */ jal func_8006C360
/* 005BC 80A5668C 0C01B0D8 */ jal Text_GetFaceReaction
/* 005C0 80A56690 AFA60020 */ sw $a2, 0x0020($sp)
/* 005C4 80A56694 8FA60020 */ lw $a2, 0x0020($sp)
/* 005C8 80A56698 3C1980A5 */ lui $t9, %hi(func_80A56B40) ## $t9 = 80A50000

2
asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s
View file

@ -26,7 +26,7 @@ glabel func_80A56B40
.L80A56B98:
/* 00AC8 80A56B98 00AE2821 */ addu $a1, $a1, $t6
/* 00ACC 80A56B9C 8CA56EF0 */ lw $a1, %lo(D_80A56EF0)($a1)
/* 00AD0 80A56BA0 0C01B0D8 */ jal func_8006C360
/* 00AD0 80A56BA0 0C01B0D8 */ jal Text_GetFaceReaction
/* 00AD4 80A56BA4 AFA60018 */ sw $a2, 0x0018($sp)
/* 00AD8 80A56BA8 10400013 */ beq $v0, $zero, .L80A56BF8
/* 00ADC 80A56BAC 8FA60018 */ lw $a2, 0x0018($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s
View file

@ -4,7 +4,7 @@ glabel func_80A6F1A4
/* 0020C 80A6F1AC AFBF0014 */ sw $ra, 0x0014($sp)
/* 00210 80A6F1B0 AFA5001C */ sw $a1, 0x001C($sp)
/* 00214 80A6F1B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 00218 80A6F1B8 0C01B0D8 */ jal func_8006C360
/* 00218 80A6F1B8 0C01B0D8 */ jal Text_GetFaceReaction
/* 0021C 80A6F1BC 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009
/* 00220 80A6F1C0 14400002 */ bne $v0, $zero, .L80A6F1CC
/* 00224 80A6F1C4 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s
View file

@ -8,7 +8,7 @@ glabel func_80A6F810
/* 00278 80A6F828 30A5007F */ andi $a1, $a1, 0x007F ## $a1 = 00000000
/* 0027C 80A6F82C 24A50025 */ addiu $a1, $a1, 0x0025 ## $a1 = 00000025
/* 00280 80A6F830 AFA40020 */ sw $a0, 0x0020($sp)
/* 00284 80A6F834 0C01B0D8 */ jal func_8006C360
/* 00284 80A6F834 0C01B0D8 */ jal Text_GetFaceReaction
/* 00288 80A6F838 AFA3001C */ sw $v1, 0x001C($sp)
/* 0028C 80A6F83C 8FA3001C */ lw $v1, 0x001C($sp)
/* 00290 80A6F840 8FA40020 */ lw $a0, 0x0020($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s
View file

@ -130,7 +130,7 @@ glabel func_80A70E34
/* 01A6C 80A7101C 30A50780 */ andi $a1, $a1, 0x0780 ## $a1 = 00000000
/* 01A70 80A71020 000529C3 */ sra $a1, $a1, 7
/* 01A74 80A71024 00052C00 */ sll $a1, $a1, 16
/* 01A78 80A71028 0C023938 */ jal func_8008E4E0
/* 01A78 80A71028 0C023938 */ jal Path_GetByIndex
/* 01A7C 80A7102C 00052C03 */ sra $a1, $a1, 16
/* 01A80 80A71030 860B001C */ lh $t3, 0x001C($s0) ## 0000001C
/* 01A84 80A71034 AE020210 */ sw $v0, 0x0210($s0) ## 00000210

2
asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s
View file

@ -6,7 +6,7 @@ glabel func_80A711B4
/* 01C14 80A711C4 AFA50034 */ sw $a1, 0x0034($sp)
/* 01C18 80A711C8 82060214 */ lb $a2, 0x0214($s0) ## 00000214
/* 01C1C 80A711CC 8E050210 */ lw $a1, 0x0210($s0) ## 00000210
/* 01C20 80A711D0 0C023948 */ jal func_8008E520
/* 01C20 80A711D0 0C023948 */ jal Path_OrientAndGetDistSq
/* 01C24 80A711D4 27A7002E */ addiu $a3, $sp, 0x002E ## $a3 = FFFFFFFE
/* 01C28 80A711D8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001
/* 01C2C 80A711DC AFAE0010 */ sw $t6, 0x0010($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s
View file

@ -35,7 +35,7 @@ glabel func_80A7134C
/* 01E18 80A713C8 8E050210 */ lw $a1, 0x0210($s0) ## 00000210
/* 01E1C 80A713CC 82060214 */ lb $a2, 0x0214($s0) ## 00000214
/* 01E20 80A713D0 27A70036 */ addiu $a3, $sp, 0x0036 ## $a3 = FFFFFFFE
/* 01E24 80A713D4 0C023948 */ jal func_8008E520
/* 01E24 80A713D4 0C023948 */ jal Path_OrientAndGetDistSq
/* 01E28 80A713D8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068
/* 01E2C 80A713DC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001
/* 01E30 80A713E0 AFA80010 */ sw $t0, 0x0010($sp)

2
asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s
View file

@ -3,7 +3,7 @@ glabel func_80A79010
/* 00064 80A79014 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00068 80A79018 8C8E1C44 */ lw $t6, 0x1C44($a0) ## 00001C44
/* 0006C 80A7901C 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019
/* 00070 80A79020 0C01B0D8 */ jal func_8006C360
/* 00070 80A79020 0C01B0D8 */ jal Text_GetFaceReaction
/* 00074 80A79024 AFAE001C */ sw $t6, 0x001C($sp)
/* 00078 80A79028 10400003 */ beq $v0, $zero, .L80A79038
/* 0007C 80A7902C 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s
View file

@ -3,7 +3,7 @@ glabel func_80A79168
/* 001BC 80A7916C AFBF0014 */ sw $ra, 0x0014($sp)
/* 001C0 80A79170 AFA5001C */ sw $a1, 0x001C($sp)
/* 001C4 80A79174 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019
/* 001C8 80A79178 0C01B0D8 */ jal func_8006C360
/* 001C8 80A79178 0C01B0D8 */ jal Text_GetFaceReaction
/* 001CC 80A7917C AFA40018 */ sw $a0, 0x0018($sp)
/* 001D0 80A79180 8FA40018 */ lw $a0, 0x0018($sp)
/* 001D4 80A79184 10400003 */ beq $v0, $zero, .L80A79194

6
asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s
View file

@ -21,7 +21,7 @@ glabel func_80A97610
/* 008AC 80A9765C 14610007 */ bne $v1, $at, .L80A9767C
.L80A97660:
/* 008B0 80A97660 24050013 */ addiu $a1, $zero, 0x0013 ## $a1 = 00000013
/* 008B4 80A97664 0C01B0D8 */ jal func_8006C360
/* 008B4 80A97664 0C01B0D8 */ jal Text_GetFaceReaction
/* 008B8 80A97668 AFA60024 */ sw $a2, 0x0024($sp)
/* 008BC 80A9766C 8FA60024 */ lw $a2, 0x0024($sp)
/* 008C0 80A97670 84C3001C */ lh $v1, 0x001C($a2) ## 0000001C
@ -43,7 +43,7 @@ glabel func_80A97610
.L80A976AC:
/* 008FC 80A976AC 8FA40020 */ lw $a0, 0x0020($sp)
/* 00900 80A976B0 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014
/* 00904 80A976B4 0C01B0D8 */ jal func_8006C360
/* 00904 80A976B4 0C01B0D8 */ jal Text_GetFaceReaction
/* 00908 80A976B8 AFA60024 */ sw $a2, 0x0024($sp)
/* 0090C 80A976BC 8FA60024 */ lw $a2, 0x0024($sp)
/* 00910 80A976C0 3044FFFF */ andi $a0, $v0, 0xFFFF ## $a0 = 00000000
@ -54,7 +54,7 @@ glabel func_80A97610
/* 00920 80A976D0 14610006 */ bne $v1, $at, .L80A976EC
/* 00924 80A976D4 24050012 */ addiu $a1, $zero, 0x0012 ## $a1 = 00000012
/* 00928 80A976D8 8FA40020 */ lw $a0, 0x0020($sp)
/* 0092C 80A976DC 0C01B0D8 */ jal func_8006C360
/* 0092C 80A976DC 0C01B0D8 */ jal Text_GetFaceReaction
/* 00930 80A976E0 AFA60024 */ sw $a2, 0x0024($sp)
/* 00934 80A976E4 8FA60024 */ lw $a2, 0x0024($sp)
/* 00938 80A976E8 3044FFFF */ andi $a0, $v0, 0xFFFF ## $a0 = 00000000

4
asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s
View file

@ -169,7 +169,7 @@ glabel func_80A99048
/* 02508 80A992B8 00052C00 */ sll $a1, $a1, 16
/* 0250C 80A992BC 00052C03 */ sra $a1, $a1, 16
/* 02510 80A992C0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF
/* 02514 80A992C4 0C023938 */ jal func_8008E4E0
/* 02514 80A992C4 0C023938 */ jal Path_GetByIndex
/* 02518 80A992C8 E6040220 */ swc1 $f4, 0x0220($s0) ## 00000220
/* 0251C 80A992CC C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024
/* 02520 80A992D0 AE0201E4 */ sw $v0, 0x01E4($s0) ## 000001E4
@ -209,7 +209,7 @@ glabel func_80A99048
/* 025A4 80A99354 10000006 */ beq $zero, $zero, .L80A99370
/* 025A8 80A99358 A60901DA */ sh $t1, 0x01DA($s0) ## 000001DA
.L80A9935C:
/* 025AC 80A9935C 0C023983 */ jal func_8008E60C
/* 025AC 80A9935C 0C023983 */ jal Path_CopyLastPoint
/* 025B0 80A99360 8E0401E4 */ lw $a0, 0x01E4($s0) ## 000001E4
.L80A99364:
/* 025B4 80A99364 3C0B80AA */ lui $t3, %hi(func_80A99384) ## $t3 = 80AA0000

2
asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s
View file

@ -3,7 +3,7 @@ glabel func_80A9C658
/* 0010C 80A9C65C AFBF0014 */ sw $ra, 0x0014($sp)
/* 00110 80A9C660 AFA5001C */ sw $a1, 0x001C($sp)
/* 00114 80A9C664 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E
/* 00118 80A9C668 0C01B0D8 */ jal func_8006C360
/* 00118 80A9C668 0C01B0D8 */ jal Text_GetFaceReaction
/* 0011C 80A9C66C AFA40018 */ sw $a0, 0x0018($sp)
/* 00120 80A9C670 8FA40018 */ lw $a0, 0x0018($sp)
/* 00124 80A9C674 8FA5001C */ lw $a1, 0x001C($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s
View file

@ -2,7 +2,7 @@ glabel func_80AA0690
/* 00000 80AA0690 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 00004 80AA0694 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00008 80AA0698 AFA5001C */ sw $a1, 0x001C($sp)
/* 0000C 80AA069C 0C01B0D8 */ jal func_8006C360
/* 0000C 80AA069C 0C01B0D8 */ jal Text_GetFaceReaction
/* 00010 80AA06A0 24050017 */ addiu $a1, $zero, 0x0017 ## $a1 = 00000017
/* 00014 80AA06A4 10400003 */ beq $v0, $zero, .L80AA06B4
/* 00018 80AA06A8 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s
View file

@ -2,7 +2,7 @@ glabel func_80AA19A0
/* 00000 80AA19A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 00004 80AA19A4 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00008 80AA19A8 AFA5001C */ sw $a1, 0x001C($sp)
/* 0000C 80AA19AC 0C01B0D8 */ jal func_8006C360
/* 0000C 80AA19AC 0C01B0D8 */ jal Text_GetFaceReaction
/* 00010 80AA19B0 24050017 */ addiu $a1, $zero, 0x0017 ## $a1 = 00000017
/* 00014 80AA19B4 10400003 */ beq $v0, $zero, .L80AA19C4
/* 00018 80AA19B8 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s
View file

@ -2,7 +2,7 @@ glabel func_80AAACF8
/* 00AA8 80AAACF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 00AAC 80AAACFC AFBF0014 */ sw $ra, 0x0014($sp)
/* 00AB0 80AAAD00 AFA5001C */ sw $a1, 0x001C($sp)
/* 00AB4 80AAAD04 0C01B0D8 */ jal func_8006C360
/* 00AB4 80AAAD04 0C01B0D8 */ jal Text_GetFaceReaction
/* 00AB8 80AAAD08 24050011 */ addiu $a1, $zero, 0x0011 ## $a1 = 00000011
/* 00ABC 80AAAD0C 8FA4001C */ lw $a0, 0x001C($sp)
/* 00AC0 80AAAD10 10400003 */ beq $v0, $zero, .L80AAAD20

2
asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s
View file

@ -119,7 +119,7 @@ glabel func_80AAD080
/* 00930 80AAD230 8FBF002C */ lw $ra, 0x002C($sp)
.L80AAD234:
/* 00934 80AAD234 8FA40044 */ lw $a0, 0x0044($sp)
/* 00938 80AAD238 0C01B0D8 */ jal func_8006C360
/* 00938 80AAD238 0C01B0D8 */ jal Text_GetFaceReaction
/* 0093C 80AAD23C 2405001A */ addiu $a1, $zero, 0x001A ## $a1 = 0000001A
/* 00940 80AAD240 3059FFFF */ andi $t9, $v0, 0xFFFF ## $t9 = 00000000
/* 00944 80AAD244 17200003 */ bne $t9, $zero, .L80AAD254

2
asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s
View file

@ -5,7 +5,7 @@ glabel func_80AADC34
/* 004D0 80AADC40 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44
/* 004D4 80AADC44 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 004D8 80AADC48 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C
/* 004DC 80AADC4C 0C01B0D8 */ jal func_8006C360
/* 004DC 80AADC4C 0C01B0D8 */ jal Text_GetFaceReaction
/* 004E0 80AADC50 AFAE001C */ sw $t6, 0x001C($sp)
/* 004E4 80AADC54 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000
/* 004E8 80AADC58 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660

2
asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s
View file

@ -3,7 +3,7 @@ glabel func_80AB0584
/* 00168 80AB0588 AFBF0014 */ sw $ra, 0x0014($sp)
/* 0016C 80AB058C AFA5001C */ sw $a1, 0x001C($sp)
/* 00170 80AB0590 84A5001C */ lh $a1, 0x001C($a1) ## 0000001C
/* 00174 80AB0594 0C01B0D8 */ jal func_8006C360
/* 00174 80AB0594 0C01B0D8 */ jal Text_GetFaceReaction
/* 00178 80AB0598 24A5003A */ addiu $a1, $a1, 0x003A ## $a1 = 0000003A
/* 0017C 80AB059C 10400003 */ beq $v0, $zero, .L80AB05AC
/* 00180 80AB05A0 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s
View file

@ -15,7 +15,7 @@ glabel func_80AB3B04
/* 02DA4 80AB3B34 35F80009 */ ori $t8, $t7, 0x0009 ## $t8 = 00000009
/* 02DA8 80AB3B38 ACD80004 */ sw $t8, 0x0004($a2) ## 00000004
/* 02DAC 80AB3B3C AFA60018 */ sw $a2, 0x0018($sp)
/* 02DB0 80AB3B40 0C01B0D8 */ jal func_8006C360
/* 02DB0 80AB3B40 0C01B0D8 */ jal Text_GetFaceReaction
/* 02DB4 80AB3B44 8FA4001C */ lw $a0, 0x001C($sp)
/* 02DB8 80AB3B48 8FA60018 */ lw $a2, 0x0018($sp)
/* 02DBC 80AB3B4C 3059FFFF */ andi $t9, $v0, 0xFFFF ## $t9 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s
View file

@ -4,7 +4,7 @@ glabel func_80AB9D60
/* 00128 80AB9D68 AFBF0024 */ sw $ra, 0x0024($sp)
/* 0012C 80AB9D6C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 00130 80AB9D70 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008
/* 00134 80AB9D74 0C01B0D8 */ jal func_8006C360
/* 00134 80AB9D74 0C01B0D8 */ jal Text_GetFaceReaction
/* 00138 80AB9D78 AFA60030 */ sw $a2, 0x0030($sp)
/* 0013C 80AB9D7C 8FA30028 */ lw $v1, 0x0028($sp)
/* 00140 80AB9D80 10400002 */ beq $v0, $zero, .L80AB9D8C

6
asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s
View file

@ -137,11 +137,11 @@ glabel func_80ABA244
/* 007F0 80ABA430 85ADB3A0 */ lh $t5, %lo(D_80ABB3A0)($t5)
/* 007F4 80ABA434 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008
/* 007F8 80ABA438 A64D010E */ sh $t5, 0x010E($s2) ## 0000010E
/* 007FC 80ABA43C 0C01B0D8 */ jal func_8006C360
/* 007FC 80ABA43C 0C01B0D8 */ jal Text_GetFaceReaction
/* 00800 80ABA440 8FA4002C */ lw $a0, 0x002C($sp)
/* 00804 80ABA444 10400006 */ beq $v0, $zero, .L80ABA460
/* 00808 80ABA448 8FA4002C */ lw $a0, 0x002C($sp)
/* 0080C 80ABA44C 0C01B0D8 */ jal func_8006C360
/* 0080C 80ABA44C 0C01B0D8 */ jal Text_GetFaceReaction
/* 00810 80ABA450 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008
/* 00814 80ABA454 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006
/* 00818 80ABA458 A642010E */ sh $v0, 0x010E($s2) ## 0000010E
@ -200,7 +200,7 @@ glabel func_80ABA244
/* 008C8 80ABA508 2484B5C0 */ addiu $a0, $a0, %lo(D_80ABB5C0) ## $a0 = 80ABB5C0
/* 008CC 80ABA50C 8FA4002C */ lw $a0, 0x002C($sp)
/* 008D0 80ABA510 0C01B0D8 */ jal func_8006C360
/* 008D0 80ABA510 0C01B0D8 */ jal Text_GetFaceReaction
/* 008D4 80ABA514 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008
/* 008D8 80ABA518 54400048 */ bnel $v0, $zero, .L80ABA63C
/* 008DC 80ABA51C 8FBF0024 */ lw $ra, 0x0024($sp)

4
asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s
View file

@ -8,11 +8,11 @@ glabel func_80ABAD7C
/* 01154 80ABAD94 A48E010E */ sh $t6, 0x010E($a0) ## 0000010E
/* 01158 80ABAD98 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000
/* 0115C 80ABAD9C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 01160 80ABADA0 0C01B0D8 */ jal func_8006C360
/* 01160 80ABADA0 0C01B0D8 */ jal Text_GetFaceReaction
/* 01164 80ABADA4 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008
/* 01168 80ABADA8 10400004 */ beq $v0, $zero, .L80ABADBC
/* 0116C 80ABADAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 01170 80ABADB0 0C01B0D8 */ jal func_8006C360
/* 01170 80ABADB0 0C01B0D8 */ jal Text_GetFaceReaction
/* 01174 80ABADB4 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008
/* 01178 80ABADB8 A602010E */ sh $v0, 0x010E($s0) ## 0000010E
.L80ABADBC:

2
asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s
View file

@ -11,7 +11,7 @@ glabel func_80AEFDC0
/* 051D4 80AEFDE4 35CF0009 */ ori $t7, $t6, 0x0009 ## $t7 = 00000009
/* 051D8 80AEFDE8 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004
/* 051DC 80AEFDEC AFA60018 */ sw $a2, 0x0018($sp)
/* 051E0 80AEFDF0 0C01B0D8 */ jal func_8006C360
/* 051E0 80AEFDF0 0C01B0D8 */ jal Text_GetFaceReaction
/* 051E4 80AEFDF4 8FA4001C */ lw $a0, 0x001C($sp)
/* 051E8 80AEFDF8 8FA60018 */ lw $a2, 0x0018($sp)
/* 051EC 80AEFDFC 3058FFFF */ andi $t8, $v0, 0xFFFF ## $t8 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s
View file

@ -3,7 +3,7 @@ glabel func_80AF55E0
/* 00084 80AF55E4 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00088 80AF55E8 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000
/* 0008C 80AF55EC AFA6001C */ sw $a2, 0x001C($sp)
/* 00090 80AF55F0 0C01B0D8 */ jal func_8006C360
/* 00090 80AF55F0 0C01B0D8 */ jal Text_GetFaceReaction
/* 00094 80AF55F4 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010
/* 00098 80AF55F8 8FA6001C */ lw $a2, 0x001C($sp)
/* 0009C 80AF55FC 10400003 */ beq $v0, $zero, .L80AF560C

4
asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s
View file

@ -99,7 +99,7 @@ glabel func_80AFF7D8
/* 0169C 80AFF94C 316C0200 */ andi $t4, $t3, 0x0200 ## $t4 = 00000000
/* 016A0 80AFF950 11800009 */ beq $t4, $zero, .L80AFF978
/* 016A4 80AFF954 00000000 */ nop
/* 016A8 80AFF958 0C01B0D8 */ jal func_8006C360
/* 016A8 80AFF958 0C01B0D8 */ jal Text_GetFaceReaction
/* 016AC 80AFF95C 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015
/* 016B0 80AFF960 304DFFFF */ andi $t5, $v0, 0xFFFF ## $t5 = 00000000
/* 016B4 80AFF964 15A00015 */ bne $t5, $zero, .L80AFF9BC
@ -124,7 +124,7 @@ glabel func_80AFF7D8
/* 016F8 80AFF9A8 10000004 */ beq $zero, $zero, .L80AFF9BC
/* 016FC 80AFF9AC A61802C4 */ sh $t8, 0x02C4($s0) ## 000002C4
.L80AFF9B0:
/* 01700 80AFF9B0 0C01B0D8 */ jal func_8006C360
/* 01700 80AFF9B0 0C01B0D8 */ jal Text_GetFaceReaction
/* 01704 80AFF9B4 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015
/* 01708 80AFF9B8 A60202C4 */ sh $v0, 0x02C4($s0) ## 000002C4
.L80AFF9BC:

2
asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s
View file

@ -129,7 +129,7 @@ glabel func_80B03A00
/* 01944 80B03BB4 2405000D */ addiu $a1, $zero, 0x000D ## $a1 = 0000000D
/* 01948 80B03BB8 57200031 */ bnel $t9, $zero, .L80B03C80
/* 0194C 80B03BBC 8FBF0014 */ lw $ra, 0x0014($sp)
/* 01950 80B03BC0 0C01B0D8 */ jal func_8006C360
/* 01950 80B03BC0 0C01B0D8 */ jal Text_GetFaceReaction
/* 01954 80B03BC4 AFA70018 */ sw $a3, 0x0018($sp)
/* 01958 80B03BC8 8FA70018 */ lw $a3, 0x0018($sp)
/* 0195C 80B03BCC 3048FFFF */ andi $t0, $v0, 0xFFFF ## $t0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s
View file

@ -4,7 +4,7 @@ glabel func_80B13AAC
/* 00014 80B13AB4 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00018 80B13AB8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 0001C 80B13ABC 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018
/* 00020 80B13AC0 0C01B0D8 */ jal func_8006C360
/* 00020 80B13AC0 0C01B0D8 */ jal Text_GetFaceReaction
/* 00024 80B13AC4 AFA60018 */ sw $a2, 0x0018($sp)
/* 00028 80B13AC8 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000
/* 0002C 80B13ACC 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660

2
asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s
View file

@ -5,7 +5,7 @@ glabel func_80B16504
/* 02A70 80B16510 AFBF001C */ sw $ra, 0x001C($sp)
/* 02A74 80B16514 AFA5002C */ sw $a1, 0x002C($sp)
/* 02A78 80B16518 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 02A7C 80B1651C 0C01B0D8 */ jal func_8006C360
/* 02A7C 80B1651C 0C01B0D8 */ jal Text_GetFaceReaction
/* 02A80 80B16520 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018
/* 02A84 80B16524 A7A20026 */ sh $v0, 0x0026($sp)
/* 02A88 80B16528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s
View file

@ -3,7 +3,7 @@ glabel func_80B18360
/* 00004 80B18364 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00008 80B18368 AFA5001C */ sw $a1, 0x001C($sp)
/* 0000C 80B1836C AFA40018 */ sw $a0, 0x0018($sp)
/* 00010 80B18370 0C01B0D8 */ jal func_8006C360
/* 00010 80B18370 0C01B0D8 */ jal Text_GetFaceReaction
/* 00014 80B18374 24050024 */ addiu $a1, $zero, 0x0024 ## $a1 = 00000024
/* 00018 80B18378 8FA4001C */ lw $a0, 0x001C($sp)
/* 0001C 80B1837C 10400003 */ beq $v0, $zero, .L80B1838C

2
asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s
View file

@ -3,7 +3,7 @@ glabel func_80B206A0
/* 00534 80B206A4 AFA40018 */ sw $a0, 0x0018($sp)
/* 00538 80B206A8 AFBF0014 */ sw $ra, 0x0014($sp)
/* 0053C 80B206AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 00540 80B206B0 0C01B0D8 */ jal func_8006C360
/* 00540 80B206B0 0C01B0D8 */ jal Text_GetFaceReaction
/* 00544 80B206B4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000
/* 00548 80B206B8 14400026 */ bne $v0, $zero, .L80B20754
/* 0054C 80B206BC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s
View file

@ -2,7 +2,7 @@ glabel func_80B5B90C
/* 0015C 80B5B90C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 00160 80B5B910 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00164 80B5B914 AFA5001C */ sw $a1, 0x001C($sp)
/* 00168 80B5B918 0C01B0D8 */ jal func_8006C360
/* 00168 80B5B918 0C01B0D8 */ jal Text_GetFaceReaction
/* 0016C 80B5B91C 24050016 */ addiu $a1, $zero, 0x0016 ## $a1 = 00000016
/* 00170 80B5B920 10400003 */ beq $v0, $zero, .L80B5B930
/* 00174 80B5B924 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s
View file

@ -2,7 +2,7 @@ glabel func_80B61024
/* 00E04 80B61024 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 00E08 80B61028 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00E0C 80B6102C AFA5001C */ sw $a1, 0x001C($sp)
/* 00E10 80B61030 0C01B0D8 */ jal func_8006C360
/* 00E10 80B61030 0C01B0D8 */ jal Text_GetFaceReaction
/* 00E14 80B61034 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D
/* 00E18 80B61038 10400003 */ beq $v0, $zero, .L80B61048
/* 00E1C 80B6103C 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000

0
asm/code_80092500.s → asm/z_quake.s
View file

11
data/code_8008E4E0.rodata.s
View file

@ -1,11 +0,0 @@
.include "macro.inc"
# 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 .rodata
glabel D_8013E760
.incbin "baserom.z64", 0xBB5900, 0x10

0
data/code_80026B00.bss.s → data/z_effect.bss.s
View file

0
data/code_80026B00.data.s → data/z_effect.data.s
View file

0
data/code_80092500.bss.s → data/z_quake.bss.s
View file

0
data/code_80092500.data.s → data/z_quake.data.s
View file

0
data/code_80092500.rodata.s → data/z_quake.rodata.s
View file

6
include/functions.h
View file

@ -800,7 +800,7 @@ void Audio_PlaySoundAtPosition(GlobalContext* globalCtx, Vec3f* pos2, s32 radius
// ? func_8006BE88(?);
// ? func_8006BF1C(?);
// ? func_8006C0FC(?);
u16 func_8006C360(GlobalContext*, u32);
u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet);
// ? func_8006C3A0(?);
// ? func_8006C3D0(?);
void func_8006C438(GlobalContext* globalCtx, s16 arg1);
@ -1005,7 +1005,9 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2);
void func_80088B34(s16 arg0);
void Interface_Draw(GlobalContext* globalCtx);
void Interface_Update(GlobalContext* globalCtx);
f32 func_8008E520(Actor* actor, Path* path, s16, s16*);
Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max);
f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw);
void Path_CopyLastPoint(Path* path, Vec3f* dest);
// ? func_8008E6A0(?);
// ? func_8008E6AC(?);
// ? func_8008E750(?);

4
include/z64scene.h
View file

@ -328,8 +328,8 @@ typedef struct {
} WaterBoxHeader;
typedef struct {
/* 0x00 */ u8 count; // Total number of points in the path for the actor to follow
/* 0x04 */ Vec3s* path; // Segment Address of the start of the path list
/* 0x00 */ u8 count; // number of points in the path
/* 0x04 */ Vec3s* points; // Segment Address to the array of points
} Path; // size = 0x8
typedef union {

19
spec
View file

@ -280,9 +280,9 @@ beginseg
include "build/data/z_eff_shield_particle.data.o"
include "build/src/code/z_eff_spark.o"
include "build/src/code/z_eff_ss_dead.o"
include "build/src/code/code_80026B00.o"
include "build/data/code_80026B00.data.o"
include "build/data/code_80026B00.bss.o"
include "build/src/code/z_effect.o"
include "build/data/z_effect.data.o"
include "build/data/z_effect.bss.o"
include "build/src/code/z_effect_soft_sprite.o"
include "build/data/z_effect_soft_sprite.data.o"
include "build/src/code/z_effect_soft_sprite_old_init.o"
@ -315,7 +315,7 @@ beginseg
include "build/asm/code_8006BA00.o"
include "build/src/code/z_elf_message.o"
include "build/data/z_elf_message.data.o"
include "build/src/code/code_8006C360.o"
include "build/src/code/z_face_reaction.o"
include "build/src/code/code_8006C3A0.o"
include "build/src/code/code_8006C510.o"
include "build/src/code/z_fcurve_data_skelanime.o"
@ -348,17 +348,16 @@ beginseg
include "build/data/z_map_exp.data.o"
include "build/data/z_map_exp.bss.o"
include "build/src/code/z_parameter.o"
include "build/asm/code_8008E4E0.o"
include "build/data/code_8008E4E0.rodata.o"
include "build/src/code/z_path.o"
include "build/asm/code_8008E6A0.o"
include "build/src/code/z_player_lib.o"
include "build/data/z_player_lib.data.o"
include "build/data/z_player_lib.bss.o"
include "build/src/code/z_prenmi.o"
include "build/asm/code_80092500.o"
include "build/data/code_80092500.data.o"
include "build/data/code_80092500.rodata.o"
include "build/data/code_80092500.bss.o"
include "build/asm/z_quake.o"
include "build/data/z_quake.data.o"
include "build/data/z_quake.rodata.o"
include "build/data/z_quake.bss.o"
include "build/src/code/z_rcp.o"
include "build/data/z_rcp.data.o"
include "build/src/code/z_room.o"

26
src/code/code_80026B00.c
View file

@ -1,26 +0,0 @@
#include <ultra64.h>
#include <global.h>
GlobalContext* func_80026B00(void) {
return D_80157DA0;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026B0C.s")
void func_80026C1C(u8* arg0) {
arg0[0] = 0;
arg0[1] = 0;
arg0[2] = 0;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026C2C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/Effect_Add.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026E74.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026F70.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_8002709C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_800271A8.s")

26
src/code/z_effect.c Normal file
View file

@ -0,0 +1,26 @@
#include <ultra64.h>
#include <global.h>
GlobalContext* func_80026B00(void) {
return D_80157DA0;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026B0C.s")
void func_80026C1C(u8* arg0) {
arg0[0] = 0;
arg0[1] = 0;
arg0[2] = 0;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026C2C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/Effect_Add.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026E74.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026F70.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_8002709C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_800271A8.s")

8
src/code/code_8006C360.c → src/code/z_face_reaction.c
View file

@ -1,7 +1,7 @@
#include <ultra64.h>
#include <global.h>
u16 D_8011F3F0[60][9] = {
u16 sReactionTextIds[60][9] = {
{ 0x0000, 0x7124, 0x7127, 0x7126, 0x7125, 0x7127, 0x7124, 0x7125, 0x7127 },
{ 0x0000, 0x7128, 0x7129, 0x7128, 0x7128, 0x7128, 0x7128, 0x712A, 0x712B },
{ 0x0000, 0x7128, 0x712B, 0x7128, 0x7128, 0x7129, 0x7128, 0x712B, 0x7128 },
@ -64,7 +64,7 @@ u16 D_8011F3F0[60][9] = {
{ 0x0000, 0x7104, 0x7105, 0x7107, 0x7105, 0x710C, 0x7105, 0x7107, 0x7107 },
};
u16 func_8006C360(GlobalContext* globalCtx, u32 idx) {
u8 mask = func_8008F080(globalCtx);
return D_8011F3F0[idx][mask];
u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet) {
u8 currentMask = func_8008F080(globalCtx);
return sReactionTextIds[reactionSet][currentMask];
}

46
src/code/z_path.c Normal file
View file

@ -0,0 +1,46 @@
#include <ultra64.h>
#include <global.h>
Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max) {
Path* path;
if (index != max) {
path = &globalCtx->setupPathList[index];
} else {
path = NULL;
}
return path;
}
f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw) {
f32 dx;
f32 dz;
Vec3s* pointPos;
if (path == NULL) {
return -1.0;
}
pointPos = SEGMENTED_TO_VIRTUAL(path->points);
pointPos = &pointPos[waypoint];
dx = pointPos->x - actor->posRot.pos.x;
dz = pointPos->z - actor->posRot.pos.z;
*yaw = Math_atan2f(dx, dz) * (32768 / M_PI);
return SQ(dx) + SQ(dz);
}
void Path_CopyLastPoint(Path* path, Vec3f* dest) {
Vec3s* pointPos;
if (path != NULL) {
pointPos = &((Vec3s*)SEGMENTED_TO_VIRTUAL(path->points))[path->count - 1];
dest->x = pointPos->x;
dest->y = pointPos->y;
dest->z = pointPos->z;
}
}

4
src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -224,7 +224,7 @@ static s32 EnDog_Orient(EnDog* this, GlobalContext* globalCtx) {
s16 targetYaw;
f32 waypointDistSq;
waypointDistSq = func_8008E520(&this->actor, this->path, this->waypoint, &targetYaw);
waypointDistSq = Path_OrientAndGetDistSq(&this->actor, this->path, this->waypoint, &targetYaw);
Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, targetYaw, 10, 1000, 1);
if ((waypointDistSq > 0.0f) && (waypointDistSq < 1000.0f)) {
@ -261,7 +261,7 @@ static void EnDog_Init(EnDog* this, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.0075f);
this->waypoint = 0;
this->actor.gravity = -1.0f;
this->path = func_8008E4E0(globalCtx, (s16)((this->actor.params & 0x00F0) >> 4), 0xF);
this->path = Path_GetByIndex(globalCtx, (this->actor.params & 0x00F0) >> 4, 0xF);
switch (globalCtx->sceneNum) {
case SCENE_MARKET_NIGHT:

6
src/overlays/actors/ovl_En_Ms/z_en_ms.c
View file

@ -67,13 +67,13 @@ extern D_060005EC;
extern D_06003DC0;
static void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) {
this->actor.textId = func_8006C360(globalCtx, 0x1B);
this->actor.textId = Text_GetFaceReaction(globalCtx, 0x1B);
if (this->actor.textId == 0) {
if (BEANS_BOUGHT >= 10) {
this->actor.textId = 0x406B;
return;
} else {
this->actor.textId = offerTextIds[BEANS_BOUGHT];
}
this->actor.textId = offerTextIds[BEANS_BOUGHT];
}
}

4
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View file

@ -335,7 +335,7 @@ s32 EnTk_Orient(EnTk* this, GlobalContext* globalCtx) {
}
path = &globalCtx->setupPathList[0];
point = SEGMENTED_TO_VIRTUAL(path->path);
point = SEGMENTED_TO_VIRTUAL(path->points);
point += this->currentWaypoint;
dx = point->x - this->actor.posRot.pos.x;
@ -359,7 +359,7 @@ s32 EnTk_Orient(EnTk* this, GlobalContext* globalCtx) {
u16 func_80B1C54C(GlobalContext* globalCtx, Actor* a1) {
u16 ret;
ret = func_8006C360(globalCtx, 14);
ret = Text_GetFaceReaction(globalCtx, 14);
if (ret != 0) {
return ret;
}