mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 11:54:39 +00:00
Code Issues Projects Releases Wiki Activity

five repeated functions

Browse source 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
This commit is contained in:
Anghelo 2021-01-26 13:00:15 -03:00
parent 764f972e61
commit efeae53e62
6 changed files with 63 additions and 364 deletions
Download patch file Download diff file Expand all files Collapse all files

42
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s
View file

@ -1,42 +0,0 @@
.late_rodata
glabel D_8097C228
.float 0.8
.text
glabel func_8097B128
/* 027F8 8097B128 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 027FC 8097B12C AFBF0014 */ sw $ra, 0x0014($sp)
/* 02800 8097B130 AFA5001C */ sw $a1, 0x001C($sp)
/* 02804 8097B134 0C25E60F */ jal func_8097983C
/* 02808 8097B138 AFA40018 */ sw $a0, 0x0018($sp)
/* 0280C 8097B13C 10400019 */ beq $v0, $zero, .L8097B1A4
/* 02810 8097B140 8FA40018 */ lw $a0, 0x0018($sp)
/* 02814 8097B144 3C060600 */ lui $a2, %hi(D_06001F70) ## $a2 = 06000000
/* 02818 8097B148 24C61F70 */ addiu $a2, $a2, %lo(D_06001F70) ## $a2 = 06001F70
/* 0281C 8097B14C 8FA5001C */ lw $a1, 0x001C($sp)
/* 02820 8097B150 0C25E3D8 */ jal func_80978F60
/* 02824 8097B154 AFA40018 */ sw $a0, 0x0018($sp)
/* 02828 8097B158 8FA40018 */ lw $a0, 0x0018($sp)
/* 0282C 8097B15C 3C018098 */ lui $at, %hi(D_8097C228) ## $at = 80980000
/* 02830 8097B160 C420C228 */ lwc1 $f0, %lo(D_8097C228)($at)
/* 02834 8097B164 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012
/* 02838 8097B168 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010
/* 0283C 8097B16C AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164
/* 02840 8097B170 AC8F0168 */ sw $t7, 0x0168($a0) ## 00000168
/* 02844 8097B174 24820050 */ addiu $v0, $a0, 0x0050 ## $v0 = 00000050
/* 02848 8097B178 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000050
/* 0284C 8097B17C C4480004 */ lwc1 $f8, 0x0004($v0) ## 00000054
/* 02850 8097B180 C4500008 */ lwc1 $f16, 0x0008($v0) ## 00000058
/* 02854 8097B184 46002182 */ mul.s $f6, $f4, $f0
/* 02858 8097B188 00000000 */ nop
/* 0285C 8097B18C 46004282 */ mul.s $f10, $f8, $f0
/* 02860 8097B190 00000000 */ nop
/* 02864 8097B194 46008482 */ mul.s $f18, $f16, $f0
/* 02868 8097B198 E4460000 */ swc1 $f6, 0x0000($v0) ## 00000050
/* 0286C 8097B19C E44A0004 */ swc1 $f10, 0x0004($v0) ## 00000054
/* 02870 8097B1A0 E4520008 */ swc1 $f18, 0x0008($v0) ## 00000058
.L8097B1A4:
/* 02874 8097B1A4 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02878 8097B1A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 0287C 8097B1AC 03E00008 */ jr $ra
/* 02880 8097B1B0 00000000 */ nop

76
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B22C.s
View file

@ -1,76 +0,0 @@
glabel func_8097B22C
/* 028FC 8097B22C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0
/* 02900 8097B230 AFB10018 */ sw $s1, 0x0018($sp)
/* 02904 8097B234 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000
/* 02908 8097B238 AFBF001C */ sw $ra, 0x001C($sp)
/* 0290C 8097B23C AFB00014 */ sw $s0, 0x0014($sp)
/* 02910 8097B240 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 02914 8097B244 0C25E5F9 */ jal func_809797E4
/* 02918 8097B248 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004
/* 0291C 8097B24C 10400005 */ beq $v0, $zero, .L8097B264
/* 02920 8097B250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02924 8097B254 0C00B55C */ jal Actor_Kill
/* 02928 8097B258 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 0292C 8097B25C 1000002E */ beq $zero, $zero, .L8097B318
/* 02930 8097B260 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
.L8097B264:
/* 02934 8097B264 0C25EC6D */ jal func_8097B1B4
/* 02938 8097B268 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 0293C 8097B26C 10400014 */ beq $v0, $zero, .L8097B2C0
/* 02940 8097B270 27AE0030 */ addiu $t6, $sp, 0x0030 ## $t6 = FFFFFFF0
/* 02944 8097B274 3C0F8098 */ lui $t7, %hi(D_8097BEAC) ## $t7 = 80980000
/* 02948 8097B278 25EFBEAC */ addiu $t7, $t7, %lo(D_8097BEAC) ## $t7 = 8097BEAC
/* 0294C 8097B27C 8DF90000 */ lw $t9, 0x0000($t7) ## 8097BEAC
/* 02950 8097B280 8DF80004 */ lw $t8, 0x0004($t7) ## 8097BEB0
/* 02954 8097B284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02958 8097B288 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF0
/* 0295C 8097B28C 8DF90008 */ lw $t9, 0x0008($t7) ## 8097BEB4
/* 02960 8097B290 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 02964 8097B294 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4
/* 02968 8097B298 0C25E2E4 */ jal func_80978B90
/* 0296C 8097B29C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8
/* 02970 8097B2A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02974 8097B2A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 02978 8097B2A8 0C25EC3B */ jal func_8097B0EC
/* 0297C 8097B2AC 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFF0
/* 02980 8097B2B0 0C00B55C */ jal Actor_Kill
/* 02984 8097B2B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02988 8097B2B8 10000017 */ beq $zero, $zero, .L8097B318
/* 0298C 8097B2BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
.L8097B2C0:
/* 02990 8097B2C0 8E080268 */ lw $t0, 0x0268($s0) ## 00000268
/* 02994 8097B2C4 51000014 */ beql $t0, $zero, .L8097B318
/* 02998 8097B2C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 0299C 8097B2CC 8E0B026C */ lw $t3, 0x026C($s0) ## 0000026C
/* 029A0 8097B2D0 27A90024 */ addiu $t1, $sp, 0x0024 ## $t1 = FFFFFFE4
/* 029A4 8097B2D4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00
/* 029A8 8097B2D8 AD2B0000 */ sw $t3, 0x0000($t1) ## FFFFFFE4
/* 029AC 8097B2DC 8E0A0270 */ lw $t2, 0x0270($s0) ## 00000270
/* 029B0 8097B2E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 029B4 8097B2E4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 029B8 8097B2E8 AD2A0004 */ sw $t2, 0x0004($t1) ## FFFFFFE8
/* 029BC 8097B2EC 8E0B0274 */ lw $t3, 0x0274($s0) ## 00000274
/* 029C0 8097B2F0 AD2B0008 */ sw $t3, 0x0008($t1) ## FFFFFFEC
/* 029C4 8097B2F4 0C25E2E4 */ jal func_80978B90
/* 029C8 8097B2F8 E7A40028 */ swc1 $f4, 0x0028($sp)
/* 029CC 8097B2FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 029D0 8097B300 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 029D4 8097B304 0C25EC3B */ jal func_8097B0EC
/* 029D8 8097B308 27A60024 */ addiu $a2, $sp, 0x0024 ## $a2 = FFFFFFE4
/* 029DC 8097B30C 0C00B55C */ jal Actor_Kill
/* 029E0 8097B310 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 029E4 8097B314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
.L8097B318:
/* 029E8 8097B318 0C25EBBA */ jal func_8097AEE8
/* 029EC 8097B31C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 029F0 8097B320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 029F4 8097B324 0C25EC20 */ jal func_8097B080
/* 029F8 8097B328 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 029FC 8097B32C 8FBF001C */ lw $ra, 0x001C($sp)
/* 02A00 8097B330 8FB00014 */ lw $s0, 0x0014($sp)
/* 02A04 8097B334 8FB10018 */ lw $s1, 0x0018($sp)
/* 02A08 8097B338 03E00008 */ jr $ra
/* 02A0C 8097B33C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000

42
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B6C4.s
View file

@ -1,42 +0,0 @@
.late_rodata
glabel D_8097C22C
.float 0.8
.text
glabel func_8097B6C4
/* 02D94 8097B6C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02D98 8097B6C8 AFBF0014 */ sw $ra, 0x0014($sp)
/* 02D9C 8097B6CC AFA5001C */ sw $a1, 0x001C($sp)
/* 02DA0 8097B6D0 0C25E60F */ jal func_8097983C
/* 02DA4 8097B6D4 AFA40018 */ sw $a0, 0x0018($sp)
/* 02DA8 8097B6D8 10400019 */ beq $v0, $zero, .L8097B740
/* 02DAC 8097B6DC 8FA40018 */ lw $a0, 0x0018($sp)
/* 02DB0 8097B6E0 3C060600 */ lui $a2, %hi(D_06002448) ## $a2 = 06000000
/* 02DB4 8097B6E4 24C62448 */ addiu $a2, $a2, %lo(D_06002448) ## $a2 = 06002448
/* 02DB8 8097B6E8 8FA5001C */ lw $a1, 0x001C($sp)
/* 02DBC 8097B6EC 0C25E3D8 */ jal func_80978F60
/* 02DC0 8097B6F0 AFA40018 */ sw $a0, 0x0018($sp)
/* 02DC4 8097B6F4 8FA40018 */ lw $a0, 0x0018($sp)
/* 02DC8 8097B6F8 3C018098 */ lui $at, %hi(D_8097C22C) ## $at = 80980000
/* 02DCC 8097B6FC C420C22C */ lwc1 $f0, %lo(D_8097C22C)($at)
/* 02DD0 8097B700 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013
/* 02DD4 8097B704 240F0011 */ addiu $t7, $zero, 0x0011 ## $t7 = 00000011
/* 02DD8 8097B708 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164
/* 02DDC 8097B70C AC8F0168 */ sw $t7, 0x0168($a0) ## 00000168
/* 02DE0 8097B710 24820050 */ addiu $v0, $a0, 0x0050 ## $v0 = 00000050
/* 02DE4 8097B714 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000050
/* 02DE8 8097B718 C4480004 */ lwc1 $f8, 0x0004($v0) ## 00000054
/* 02DEC 8097B71C C4500008 */ lwc1 $f16, 0x0008($v0) ## 00000058
/* 02DF0 8097B720 46002182 */ mul.s $f6, $f4, $f0
/* 02DF4 8097B724 00000000 */ nop
/* 02DF8 8097B728 46004282 */ mul.s $f10, $f8, $f0
/* 02DFC 8097B72C 00000000 */ nop
/* 02E00 8097B730 46008482 */ mul.s $f18, $f16, $f0
/* 02E04 8097B734 E4460000 */ swc1 $f6, 0x0000($v0) ## 00000050
/* 02E08 8097B738 E44A0004 */ swc1 $f10, 0x0004($v0) ## 00000054
/* 02E0C 8097B73C E4520008 */ swc1 $f18, 0x0008($v0) ## 00000058
.L8097B740:
/* 02E10 8097B740 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02E14 8097B744 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 02E18 8097B748 03E00008 */ jr $ra
/* 02E1C 8097B74C 00000000 */ nop

76
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B750.s
View file

@ -1,76 +0,0 @@
glabel func_8097B750
/* 02E20 8097B750 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0
/* 02E24 8097B754 AFB10018 */ sw $s1, 0x0018($sp)
/* 02E28 8097B758 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000
/* 02E2C 8097B75C AFBF001C */ sw $ra, 0x001C($sp)
/* 02E30 8097B760 AFB00014 */ sw $s0, 0x0014($sp)
/* 02E34 8097B764 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 02E38 8097B768 0C25E5F9 */ jal func_809797E4
/* 02E3C 8097B76C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004
/* 02E40 8097B770 10400005 */ beq $v0, $zero, .L8097B788
/* 02E44 8097B774 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02E48 8097B778 0C00B55C */ jal Actor_Kill
/* 02E4C 8097B77C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02E50 8097B780 1000002E */ beq $zero, $zero, .L8097B83C
/* 02E54 8097B784 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
.L8097B788:
/* 02E58 8097B788 0C25ED84 */ jal func_8097B610
/* 02E5C 8097B78C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 02E60 8097B790 10400014 */ beq $v0, $zero, .L8097B7E4
/* 02E64 8097B794 27AE0030 */ addiu $t6, $sp, 0x0030 ## $t6 = FFFFFFF0
/* 02E68 8097B798 3C0F8098 */ lui $t7, %hi(D_8097BEB8) ## $t7 = 80980000
/* 02E6C 8097B79C 25EFBEB8 */ addiu $t7, $t7, %lo(D_8097BEB8) ## $t7 = 8097BEB8
/* 02E70 8097B7A0 8DF90000 */ lw $t9, 0x0000($t7) ## 8097BEB8
/* 02E74 8097B7A4 8DF80004 */ lw $t8, 0x0004($t7) ## 8097BEBC
/* 02E78 8097B7A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02E7C 8097B7AC ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF0
/* 02E80 8097B7B0 8DF90008 */ lw $t9, 0x0008($t7) ## 8097BEC0
/* 02E84 8097B7B4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 02E88 8097B7B8 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4
/* 02E8C 8097B7BC 0C25E2E4 */ jal func_80978B90
/* 02E90 8097B7C0 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8
/* 02E94 8097B7C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02E98 8097B7C8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 02E9C 8097B7CC 0C25EDA2 */ jal func_8097B688
/* 02EA0 8097B7D0 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFF0
/* 02EA4 8097B7D4 0C00B55C */ jal Actor_Kill
/* 02EA8 8097B7D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02EAC 8097B7DC 10000017 */ beq $zero, $zero, .L8097B83C
/* 02EB0 8097B7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
.L8097B7E4:
/* 02EB4 8097B7E4 8E080268 */ lw $t0, 0x0268($s0) ## 00000268
/* 02EB8 8097B7E8 51000014 */ beql $t0, $zero, .L8097B83C
/* 02EBC 8097B7EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02EC0 8097B7F0 8E0B026C */ lw $t3, 0x026C($s0) ## 0000026C
/* 02EC4 8097B7F4 27A90024 */ addiu $t1, $sp, 0x0024 ## $t1 = FFFFFFE4
/* 02EC8 8097B7F8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00
/* 02ECC 8097B7FC AD2B0000 */ sw $t3, 0x0000($t1) ## FFFFFFE4
/* 02ED0 8097B800 8E0A0270 */ lw $t2, 0x0270($s0) ## 00000270
/* 02ED4 8097B804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02ED8 8097B808 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 02EDC 8097B80C AD2A0004 */ sw $t2, 0x0004($t1) ## FFFFFFE8
/* 02EE0 8097B810 8E0B0274 */ lw $t3, 0x0274($s0) ## 00000274
/* 02EE4 8097B814 AD2B0008 */ sw $t3, 0x0008($t1) ## FFFFFFEC
/* 02EE8 8097B818 0C25E2E4 */ jal func_80978B90
/* 02EEC 8097B81C E7A40028 */ swc1 $f4, 0x0028($sp)
/* 02EF0 8097B820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02EF4 8097B824 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 02EF8 8097B828 0C25EDA2 */ jal func_8097B688
/* 02EFC 8097B82C 27A60024 */ addiu $a2, $sp, 0x0024 ## $a2 = FFFFFFE4
/* 02F00 8097B830 0C00B55C */ jal Actor_Kill
/* 02F04 8097B834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02F08 8097B838 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
.L8097B83C:
/* 02F0C 8097B83C 0C25ED14 */ jal func_8097B450
/* 02F10 8097B840 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 02F14 8097B844 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 02F18 8097B848 0C25ED69 */ jal func_8097B5A4
/* 02F1C 8097B84C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 02F20 8097B850 8FBF001C */ lw $ra, 0x001C($sp)
/* 02F24 8097B854 8FB00014 */ lw $s0, 0x0014($sp)
/* 02F28 8097B858 8FB10018 */ lw $s1, 0x0018($sp)
/* 02F2C 8097B85C 03E00008 */ jr $ra
/* 02F30 8097B860 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000

42
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B9BC.s
View file

@ -1,42 +0,0 @@
.late_rodata
glabel D_8097C230
.float 0.8
.text
glabel func_8097B9BC
/* 0308C 8097B9BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 03090 8097B9C0 AFBF0014 */ sw $ra, 0x0014($sp)
/* 03094 8097B9C4 AFA5001C */ sw $a1, 0x001C($sp)
/* 03098 8097B9C8 0C25E60F */ jal func_8097983C
/* 0309C 8097B9CC AFA40018 */ sw $a0, 0x0018($sp)
/* 030A0 8097B9D0 10400019 */ beq $v0, $zero, .L8097BA38
/* 030A4 8097B9D4 8FA40018 */ lw $a0, 0x0018($sp)
/* 030A8 8097B9D8 3C060600 */ lui $a2, %hi(D_06003AF0) ## $a2 = 06000000
/* 030AC 8097B9DC 24C63AF0 */ addiu $a2, $a2, %lo(D_06003AF0) ## $a2 = 06003AF0
/* 030B0 8097B9E0 8FA5001C */ lw $a1, 0x001C($sp)
/* 030B4 8097B9E4 0C25E3D8 */ jal func_80978F60
/* 030B8 8097B9E8 AFA40018 */ sw $a0, 0x0018($sp)
/* 030BC 8097B9EC 8FA40018 */ lw $a0, 0x0018($sp)
/* 030C0 8097B9F0 3C018098 */ lui $at, %hi(D_8097C230) ## $at = 80980000
/* 030C4 8097B9F4 C420C230 */ lwc1 $f0, %lo(D_8097C230)($at)
/* 030C8 8097B9F8 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014
/* 030CC 8097B9FC 240F0012 */ addiu $t7, $zero, 0x0012 ## $t7 = 00000012
/* 030D0 8097BA00 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164
/* 030D4 8097BA04 AC8F0168 */ sw $t7, 0x0168($a0) ## 00000168
/* 030D8 8097BA08 24820050 */ addiu $v0, $a0, 0x0050 ## $v0 = 00000050
/* 030DC 8097BA0C C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000050
/* 030E0 8097BA10 C4480004 */ lwc1 $f8, 0x0004($v0) ## 00000054
/* 030E4 8097BA14 C4500008 */ lwc1 $f16, 0x0008($v0) ## 00000058
/* 030E8 8097BA18 46002182 */ mul.s $f6, $f4, $f0
/* 030EC 8097BA1C 00000000 */ nop
/* 030F0 8097BA20 46004282 */ mul.s $f10, $f8, $f0
/* 030F4 8097BA24 00000000 */ nop
/* 030F8 8097BA28 46008482 */ mul.s $f18, $f16, $f0
/* 030FC 8097BA2C E4460000 */ swc1 $f6, 0x0000($v0) ## 00000050
/* 03100 8097BA30 E44A0004 */ swc1 $f10, 0x0004($v0) ## 00000054
/* 03104 8097BA34 E4520008 */ swc1 $f18, 0x0008($v0) ## 00000058
.L8097BA38:
/* 03108 8097BA38 8FBF0014 */ lw $ra, 0x0014($sp)
/* 0310C 8097BA3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 03110 8097BA40 03E00008 */ jr $ra
/* 03114 8097BA44 00000000 */ nop

149
src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
View file

@ -660,8 +660,8 @@ s32 func_8097983C(DemoGj *this, GlobalContext* globalCtx) {
void func_80979860(DemoGj *this, GlobalContext *globalCtx);
#ifdef NON_MATCHING
void func_80979860(DemoGj *this, GlobalContext *globalCtx) {
f32 sp24;
f32 sp20;
//f32 sp24;
//f32 sp20;
Actor *temp_v0;
Actor *temp_v1_8;
PosRot *temp_v0_2;
@ -673,9 +673,9 @@ void func_80979860(DemoGj *this, GlobalContext *globalCtx) {
Vec3s *temp_v1_6;
Vec3s *temp_v1_7;
f32 temp_f10;
f32 temp_f12;
//f32 temp_f12;
f32 temp_f12_2;
f32 temp_f14;
//f32 temp_f14;
f32 temp_f14_2;
f32 temp_f4;
f32 temp_f6;
@ -688,10 +688,10 @@ void func_80979860(DemoGj *this, GlobalContext *globalCtx) {
temp_f6 = temp_v0->world.pos.x;
temp_f8 = this->dyna.actor.world.pos.z;
temp_f10 = temp_v0->world.pos.z;
temp_f12 = temp_f4 - temp_f6;
temp_f14 = temp_f8 - temp_f10;
sp24 = temp_f12;
sp20 = temp_f14;
//temp_f12 = temp_f4 - temp_f6;
//temp_f14 = temp_f8 - temp_f10;
//sp24 = temp_f12;
//sp20 = temp_f14;
temp_t6 = func_80978950(this) - 8;
switch (temp_t6) {
case 0:
@ -765,8 +765,8 @@ void func_80979860(DemoGj *this, GlobalContext *globalCtx) {
this->dyna.actor.gravity = ((f32) gGameInfo->data[2603] * 0.01f) + -5.0f;
break;
default:
sp20 = temp_f14;
sp24 = temp_f12;
//sp20 = temp_f14;
//sp24 = temp_f12;
// Demo_Gj_Setup_Move_common : This arg_data is not supported = %d
osSyncPrintf((const char *) "\x1b[31mDemo_Gj_Setup_Move_common : そんなarg_dataには対応していない = %d\n\x1b[m", this->dyna.actor.params);
break;
@ -1219,6 +1219,7 @@ void func_8097AE5C(DemoGj *this, GlobalContext *globalCtx) {
void func_8097AEDC(DemoGj *this, GlobalContext *globalCtx) {
}
void func_8097AEE8(DemoGj *this, GlobalContext *globalCtx);
/*
void *func_8097AEE8(void *arg0, ? arg1) {
s16 sp22;
@ -1286,26 +1287,18 @@ void func_8097B0EC(DemoGj *this, GlobalContext *globalCtx, Vec3f *arg2) {
func_80978C20(this, globalCtx, &aux, arg2);
}
void func_8097B128(DemoGj *this, GlobalContext *globalCtx);
/*
void func_8097B128(DemoGj *this, GlobalContext *globalCtx) {
DemoGj *temp_a0;
Vec3f *temp_v0;
Vec3f *scale = &this->dyna.actor.scale;
temp_a0 = this;
if (func_8097983C(this, globalCtx) != 0) {
this = temp_a0;
func_80978F60(temp_a0, globalCtx, &D_06001F70);
func_80978F60(this, globalCtx, &D_06001F70);
this->unk_164 = 0x12;
this->unk_168 = 0x10;
temp_v0 = &this->dyna.actor.scale;
temp_v0->x = temp_v0->x * 0.8f;
temp_v0->y = temp_v0->y * 0.8f;
temp_v0->z = temp_v0->z * 0.8f;
scale->x *= 0.8f;
scale->y *= 0.8f;
scale->z *= 0.8f;
}
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s")
s32 func_8097B1B4(DemoGj *this, GlobalContext *globalCtx) {
if (func_809789A4(this, globalCtx, &this->unk_184.base) != 0) {
@ -1320,36 +1313,36 @@ s32 func_8097B1B4(DemoGj *this, GlobalContext *globalCtx) {
return 0;
}
void func_8097B22C(DemoGj *this, GlobalContext *globalCtx);
/*
void func_8097B22C(DemoGj *this, GlobalContext *globalCtx) {
? sp30;
f32 sp28;
? sp24;
s32 pad;
if (func_809797E4(4) != 0) {
Actor_Kill(&this->dyna.actor);
Vec3f sp30;
Vec3f sp24;
Actor* actor = &this->dyna.actor;
if (func_809797E4(this, 4) != 0) {
Actor_Kill(actor);
} else if (func_8097B1B4(this, globalCtx) != 0) {
sp30.unk0 = (s32) D_8097BEAC.unk0;
sp30.unk4 = (s32) D_8097BEAC.unk4;
sp30.unk8 = (s32) D_8097BEAC.unk8;
sp30 = D_8097BEAC;
func_80978B90(this, globalCtx);
func_8097B0EC(this, globalCtx, &sp30);
Actor_Kill(&this->dyna.actor);
Actor_Kill(actor);
} else if (this->unk_268 != 0) {
sp24.unk0 = (s32) this->unk26C;
sp24.unk4 = (s32) this->unk270;
sp24.unk8 = (s32) this->unk274;
sp28 = 0.0f;
sp24 = this->unk_26C;
sp24.y = 0.0f;
func_80978B90(this, globalCtx);
func_8097B0EC(this, globalCtx, &sp24);
Actor_Kill(&this->dyna.actor);
Actor_Kill(actor);
}
func_8097AEE8(this, globalCtx);
func_8097B080(this, globalCtx);
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B22C.s")
void func_8097B340(DemoGj *this, GlobalContext *globalCtx) {
func_80978EE4(this, globalCtx);
@ -1375,6 +1368,7 @@ void func_8097B3C4(DemoGj *this, GlobalContext *globalCtx) {
void func_8097B444(DemoGj *this, GlobalContext *globalCtx) {
}
void func_8097B450(DemoGj *this, GlobalContext *globalCtx);
/*
void *func_8097B450(void *arg0, ? arg1) {
s16 sp22;
@ -1449,57 +1443,49 @@ void func_8097B688(DemoGj *this, GlobalContext *globalCtx, Vec3f *arg2) {
func_80978C20(this, globalCtx, &aux, arg2);
}
void func_8097B6C4(DemoGj *this, GlobalContext *globalCtx);
/*
void func_8097B6C4(DemoGj *this, GlobalContext *globalCtx) {
DemoGj *temp_a0;
Vec3f *temp_v0;
Vec3f *scale = &this->dyna.actor.scale;
temp_a0 = this;
if (func_8097983C(this, globalCtx) != 0) {
this = temp_a0;
func_80978F60(temp_a0, globalCtx, &D_06002448);
func_80978F60(this, globalCtx, &D_06002448);
this->unk_164 = 0x13;
this->unk_168 = 0x11;
temp_v0 = &this->dyna.actor.scale;
temp_v0->x = temp_v0->x * 0.8f;
temp_v0->y = temp_v0->y * 0.8f;
temp_v0->z = temp_v0->z * 0.8f;
scale->x *= 0.8f;
scale->y *= 0.8f;
scale->z *= 0.8f;
}
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B6C4.s")
void func_8097B750(DemoGj *this, GlobalContext *globalCtx);
/*
void func_8097B750(DemoGj *this, GlobalContext *globalCtx) {
? sp30;
f32 sp28;
? sp24;
s32 pad;
if (func_809797E4(4) != 0) {
Actor_Kill(&this->dyna.actor);
Vec3f sp30;
Vec3f sp24;
Actor* actor = &this->dyna.actor;
if (func_809797E4(this, 4) != 0) {
Actor_Kill(actor);
} else if (func_8097B610(this, globalCtx) != 0) {
sp30.unk0 = (s32) D_8097BEB8.unk0;
sp30.unk4 = (s32) D_8097BEB8.unk4;
sp30.unk8 = (s32) D_8097BEB8.unk8;
sp30 = D_8097BEB8;
func_80978B90(this, globalCtx);
func_8097B688(this, globalCtx, &sp30);
Actor_Kill(&this->dyna.actor);
Actor_Kill(actor);
} else if (this->unk_268 != 0) {
sp24.unk0 = (s32) this->unk26C;
sp24.unk4 = (s32) this->unk270;
sp24.unk8 = (s32) this->unk274;
sp28 = 0.0f;
sp24 = this->unk_26C;
sp24.y = 0.0f;
func_80978B90(this, globalCtx);
func_8097B688(this, globalCtx, &sp24);
Actor_Kill(&this->dyna.actor);
Actor_Kill(actor);
}
func_8097B450(this, globalCtx);
func_8097B5A4(this, globalCtx);
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B750.s")
void func_8097B864(DemoGj *this, GlobalContext *globalCtx) {
func_80978EE4(this, globalCtx);
@ -1531,33 +1517,24 @@ void func_8097B93C(DemoGj *this, GlobalContext *globalCtx, Vec3f *arg2) {
aux.z = this->dyna.actor.world.pos.z;
func_80978C20(this, globalCtx, &aux, arg2);
aux.x = this->dyna.actor.world.pos.x;
aux.y = this->dyna.actor.world.pos.y + 100.0f;
aux.z = this->dyna.actor.world.pos.z;
func_80978C20(this, globalCtx, &aux, arg2);
}
void func_8097B9BC(DemoGj *this, GlobalContext *globalCtx);
/*
void func_8097B9BC(DemoGj *this, GlobalContext *globalCtx) {
DemoGj *temp_a0;
Vec3f *temp_v0;
Vec3f *scale = &this->dyna.actor.scale;
temp_a0 = this;
if (func_8097983C(this, globalCtx) != 0) {
this = temp_a0;
func_80978F60(temp_a0, globalCtx, (CollisionHeader *) &D_06003AF0);
func_80978F60(this, globalCtx, &D_06003AF0);
this->unk_164 = 0x14;
this->unk_168 = 0x12;
temp_v0 = &this->dyna.actor.scale;
temp_v0->x = temp_v0->x * 0.8f;
temp_v0->y = temp_v0->y * 0.8f;
temp_v0->z = temp_v0->z * 0.8f;
scale->x *= 0.8f;
scale->y *= 0.8f;
scale->z *= 0.8f;
}
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B9BC.s")
void func_8097BA48(DemoGj *this, GlobalContext *globalCtx) {
Actor* actor = &this->dyna.actor;