1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-02 17:44:25 +00:00

func_80978F60 and func_80979860

Signed-off-by: angie <angheloalf95@gmail.com>
This commit is contained in:
angie 2021-01-27 00:39:27 -03:00
parent 3356fb91c4
commit 5ba3eb50b8
No known key found for this signature in database
GPG key ID: E5212BA1B6FEA700
3 changed files with 97 additions and 667 deletions

View file

@ -1,33 +0,0 @@
glabel func_80978F60
/* 00630 80978F60 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8
/* 00634 80978F64 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00638 80978F68 AFA40028 */ sw $a0, 0x0028($sp)
/* 0063C 80978F6C AFA5002C */ sw $a1, 0x002C($sp)
/* 00640 80978F70 10C00012 */ beq $a2, $zero, .L80978FBC
/* 00644 80978F74 AFA60030 */ sw $a2, 0x0030($sp)
/* 00648 80978F78 3C058098 */ lui $a1, %hi(D_8097BE84) ## $a1 = 80980000
/* 0064C 80978F7C 0C01E037 */ jal Actor_ProcessInitChain
/* 00650 80978F80 24A5BE84 */ addiu $a1, $a1, %lo(D_8097BE84) ## $a1 = 8097BE84
/* 00654 80978F84 8FA40028 */ lw $a0, 0x0028($sp)
/* 00658 80978F88 0C010D20 */ jal DynaPolyActor_Init
/* 0065C 80978F8C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000
/* 00660 80978F90 AFA00018 */ sw $zero, 0x0018($sp)
/* 00664 80978F94 8FA40030 */ lw $a0, 0x0030($sp)
/* 00668 80978F98 0C010620 */ jal CollisionHeader_GetVirtual
/* 0066C 80978F9C 27A50018 */ addiu $a1, $sp, 0x0018 ## $a1 = FFFFFFF0
/* 00670 80978FA0 8FA4002C */ lw $a0, 0x002C($sp)
/* 00674 80978FA4 8FA60028 */ lw $a2, 0x0028($sp)
/* 00678 80978FA8 8FA70018 */ lw $a3, 0x0018($sp)
/* 0067C 80978FAC 0C00FA9D */ jal DynaPoly_SetBgActor
## DynaPoly_SetBgActor
/* 00680 80978FB0 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810
/* 00684 80978FB4 8FAF0028 */ lw $t7, 0x0028($sp)
/* 00688 80978FB8 ADE2014C */ sw $v0, 0x014C($t7) ## 0000014C
.L80978FBC:
/* 0068C 80978FBC 8FBF0014 */ lw $ra, 0x0014($sp)
/* 00690 80978FC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000
/* 00694 80978FC4 03E00008 */ jr $ra
/* 00698 80978FC8 00000000 */ nop

View file

@ -1,519 +0,0 @@
.rdata
glabel D_8097C098
.asciz "\x1b[31mDemo_Gj_Setup_Move_common : arg_data = %d\n\x1b[m"
.balign 4
.late_rodata
glabel jtbl_8097C1E8
.word L809798D0
.word L809799A8
.word L80979A80
.word L80979B58
.word L80979C30
.word L80979D08
.word L80979DE0
glabel D_8097C204
.float 0.01
glabel D_8097C208
.float 0.01
glabel D_8097C20C
.float 0.01
glabel D_8097C210
.float 0.01
glabel D_8097C214
.float 0.01
glabel D_8097C218
.float 0.01
glabel D_8097C21C
.float 0.01
glabel D_8097C220
.word 0x4622F983
glabel D_8097C224
.word 0x4622F983
.text
glabel func_80979860
/* 00F30 80979860 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8
/* 00F34 80979864 AFBF001C */ sw $ra, 0x001C($sp)
/* 00F38 80979868 AFB00018 */ sw $s0, 0x0018($sp)
/* 00F3C 8097986C AFA5003C */ sw $a1, 0x003C($sp)
/* 00F40 80979870 8C820178 */ lw $v0, 0x0178($a0) ## 00000178
/* 00F44 80979874 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 00F48 80979878 504001C4 */ beql $v0, $zero, .L80979F8C
/* 00F4C 8097987C 8FBF001C */ lw $ra, 0x001C($sp)
/* 00F50 80979880 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024
/* 00F54 80979884 C4460024 */ lwc1 $f6, 0x0024($v0) ## 00000024
/* 00F58 80979888 C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C
/* 00F5C 8097988C C44A002C */ lwc1 $f10, 0x002C($v0) ## 0000002C
/* 00F60 80979890 46062301 */ sub.s $f12, $f4, $f6
/* 00F64 80979894 460A4381 */ sub.s $f14, $f8, $f10
/* 00F68 80979898 E7AC0024 */ swc1 $f12, 0x0024($sp)
/* 00F6C 8097989C 0C25E254 */ jal func_80978950
/* 00F70 809798A0 E7AE0020 */ swc1 $f14, 0x0020($sp)
/* 00F74 809798A4 244EFFF8 */ addiu $t6, $v0, 0xFFF8 ## $t6 = FFFFFFF8
/* 00F78 809798A8 2DC10007 */ sltiu $at, $t6, 0x0007
/* 00F7C 809798AC C7AC0024 */ lwc1 $f12, 0x0024($sp)
/* 00F80 809798B0 10200181 */ beq $at, $zero, .L80979EB8
/* 00F84 809798B4 C7AE0020 */ lwc1 $f14, 0x0020($sp)
/* 00F88 809798B8 000E7080 */ sll $t6, $t6, 2
/* 00F8C 809798BC 3C018098 */ lui $at, %hi(jtbl_8097C1E8) ## $at = 80980000
/* 00F90 809798C0 002E0821 */ addu $at, $at, $t6
/* 00F94 809798C4 8C2EC1E8 */ lw $t6, %lo(jtbl_8097C1E8)($at)
/* 00F98 809798C8 01C00008 */ jr $t6
/* 00F9C 809798CC 00000000 */ nop
glabel L809798D0
/* 00FA0 809798D0 3C028016 */ lui $v0, %hi(gGameInfo)
/* 00FA4 809798D4 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 00FA8 809798D8 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 00FAC 809798DC 3C018098 */ lui $at, %hi(D_8097C204) ## $at = 80980000
/* 00FB0 809798E0 C420C204 */ lwc1 $f0, %lo(D_8097C204)($at)
/* 00FB4 809798E4 85F81474 */ lh $t8, 0x1474($t7) ## 00001474
/* 00FB8 809798E8 3C014120 */ lui $at, 0x4120 ## $at = 41200000
/* 00FBC 809798EC 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00
/* 00FC0 809798F0 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00
/* 00FC4 809798F4 3C014220 */ lui $at, 0x4220 ## $at = 42200000
/* 00FC8 809798F8 26030172 */ addiu $v1, $s0, 0x0172 ## $v1 = 00000172
/* 00FCC 809798FC 468084A0 */ cvt.s.w $f18, $f16
/* 00FD0 80979900 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00
/* 00FD4 80979904 3C01C1E8 */ lui $at, 0xC1E8 ## $at = C1E80000
/* 00FD8 80979908 46049180 */ add.s $f6, $f18, $f4
/* 00FDC 8097990C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068
/* 00FE0 80979910 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90
/* 00FE4 80979914 87281476 */ lh $t0, 0x1476($t9) ## 00001476
/* 00FE8 80979918 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00
/* 00FEC 8097991C 00000000 */ nop
/* 00FF0 80979920 468042A0 */ cvt.s.w $f10, $f8
/* 00FF4 80979924 46105480 */ add.s $f18, $f10, $f16
/* 00FF8 80979928 44815000 */ mtc1 $at, $f10 ## $f10 = -29.00
/* 00FFC 8097992C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000
/* 01000 80979930 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060
/* 01004 80979934 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 01008 80979938 852A1478 */ lh $t2, 0x1478($t1) ## 00001478
/* 0100C 8097993C A46A0000 */ sh $t2, 0x0000($v1) ## 00000172
/* 01010 80979940 8C4B0000 */ lw $t3, 0x0000($v0) ## 8015FA90
/* 01014 80979944 856C147A */ lh $t4, 0x147A($t3) ## 0000147A
/* 01018 80979948 258D03E8 */ addiu $t5, $t4, 0x03E8 ## $t5 = 000003E8
/* 0101C 8097994C A46D0002 */ sh $t5, 0x0002($v1) ## 00000174
/* 01020 80979950 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015FA90
/* 01024 80979954 85CF147C */ lh $t7, 0x147C($t6) ## 00001474
/* 01028 80979958 25F80BB8 */ addiu $t8, $t7, 0x0BB8 ## $t8 = 00000BB8
/* 0102C 8097995C A4780004 */ sh $t8, 0x0004($v1) ## 00000176
/* 01030 80979960 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90
/* 01034 80979964 8728147E */ lh $t0, 0x147E($t9) ## 0000147E
/* 01038 80979968 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00
/* 0103C 8097996C 00000000 */ nop
/* 01040 80979970 468021A0 */ cvt.s.w $f6, $f4
/* 01044 80979974 46003202 */ mul.s $f8, $f6, $f0
/* 01048 80979978 460A4400 */ add.s $f16, $f8, $f10
/* 0104C 8097997C 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00
/* 01050 80979980 E6100070 */ swc1 $f16, 0x0070($s0) ## 00000070
/* 01054 80979984 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 01058 80979988 852A1480 */ lh $t2, 0x1480($t1) ## 00001480
/* 0105C 8097998C 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00
/* 01060 80979990 00000000 */ nop
/* 01064 80979994 46809120 */ cvt.s.w $f4, $f18
/* 01068 80979998 46002182 */ mul.s $f6, $f4, $f0
/* 0106C 8097999C 46083280 */ add.s $f10, $f6, $f8
/* 01070 809799A0 1000014D */ beq $zero, $zero, .L80979ED8
/* 01074 809799A4 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C
glabel L809799A8
/* 01078 809799A8 3C028016 */ lui $v0, %hi(gGameInfo)
/* 0107C 809799AC 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 01080 809799B0 8C4B0000 */ lw $t3, 0x0000($v0) ## 8015FA90
/* 01084 809799B4 3C018098 */ lui $at, %hi(D_8097C208) ## $at = 80980000
/* 01088 809799B8 C420C208 */ lwc1 $f0, %lo(D_8097C208)($at)
/* 0108C 809799BC 856C148E */ lh $t4, 0x148E($t3) ## 0000148E
/* 01090 809799C0 3C014120 */ lui $at, 0x4120 ## $at = 41200000
/* 01094 809799C4 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00
/* 01098 809799C8 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00
/* 0109C 809799CC 3C014220 */ lui $at, 0x4220 ## $at = 42200000
/* 010A0 809799D0 26030172 */ addiu $v1, $s0, 0x0172 ## $v1 = 00000172
/* 010A4 809799D4 468084A0 */ cvt.s.w $f18, $f16
/* 010A8 809799D8 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00
/* 010AC 809799DC 3C01C1E8 */ lui $at, 0xC1E8 ## $at = C1E80000
/* 010B0 809799E0 46049180 */ add.s $f6, $f18, $f4
/* 010B4 809799E4 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068
/* 010B8 809799E8 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90
/* 010BC 809799EC 85AE1490 */ lh $t6, 0x1490($t5) ## 00001878
/* 010C0 809799F0 448E4000 */ mtc1 $t6, $f8 ## $f8 = NaN
/* 010C4 809799F4 00000000 */ nop
/* 010C8 809799F8 468042A0 */ cvt.s.w $f10, $f8
/* 010CC 809799FC 46105480 */ add.s $f18, $f10, $f16
/* 010D0 80979A00 44815000 */ mtc1 $at, $f10 ## $f10 = -29.00
/* 010D4 80979A04 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000
/* 010D8 80979A08 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060
/* 010DC 80979A0C 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 010E0 80979A10 85F81492 */ lh $t8, 0x1492($t7) ## 00001492
/* 010E4 80979A14 A4780000 */ sh $t8, 0x0000($v1) ## 00000172
/* 010E8 80979A18 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90
/* 010EC 80979A1C 87281494 */ lh $t0, 0x1494($t9) ## 00001494
/* 010F0 80979A20 250903E8 */ addiu $t1, $t0, 0x03E8 ## $t1 = 000003E8
/* 010F4 80979A24 A4690002 */ sh $t1, 0x0002($v1) ## 00000174
/* 010F8 80979A28 8C4A0000 */ lw $t2, 0x0000($v0) ## 8015FA90
/* 010FC 80979A2C 854B1496 */ lh $t3, 0x1496($t2) ## 00001496
/* 01100 80979A30 256C0BB8 */ addiu $t4, $t3, 0x0BB8 ## $t4 = 00000BB8
/* 01104 80979A34 A46C0004 */ sh $t4, 0x0004($v1) ## 00000176
/* 01108 80979A38 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90
/* 0110C 80979A3C 85AE1498 */ lh $t6, 0x1498($t5) ## 00001880
/* 01110 80979A40 448E2000 */ mtc1 $t6, $f4 ## $f4 = NaN
/* 01114 80979A44 00000000 */ nop
/* 01118 80979A48 468021A0 */ cvt.s.w $f6, $f4
/* 0111C 80979A4C 46003202 */ mul.s $f8, $f6, $f0
/* 01120 80979A50 460A4400 */ add.s $f16, $f8, $f10
/* 01124 80979A54 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00
/* 01128 80979A58 E6100070 */ swc1 $f16, 0x0070($s0) ## 00000070
/* 0112C 80979A5C 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 01130 80979A60 85F8149A */ lh $t8, 0x149A($t7) ## 0000149A
/* 01134 80979A64 44989000 */ mtc1 $t8, $f18 ## $f18 = 0.00
/* 01138 80979A68 00000000 */ nop
/* 0113C 80979A6C 46809120 */ cvt.s.w $f4, $f18
/* 01140 80979A70 46002182 */ mul.s $f6, $f4, $f0
/* 01144 80979A74 46083280 */ add.s $f10, $f6, $f8
/* 01148 80979A78 10000117 */ beq $zero, $zero, .L80979ED8
/* 0114C 80979A7C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C
glabel L80979A80
/* 01150 80979A80 3C028016 */ lui $v0, %hi(gGameInfo)
/* 01154 80979A84 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 01158 80979A88 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90
/* 0115C 80979A8C 3C018098 */ lui $at, %hi(D_8097C20C) ## $at = 80980000
/* 01160 80979A90 C420C20C */ lwc1 $f0, %lo(D_8097C20C)($at)
/* 01164 80979A94 872814A8 */ lh $t0, 0x14A8($t9) ## 000014A8
/* 01168 80979A98 3C014120 */ lui $at, 0x4120 ## $at = 41200000
/* 0116C 80979A9C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00
/* 01170 80979AA0 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00
/* 01174 80979AA4 3C014220 */ lui $at, 0x4220 ## $at = 42200000
/* 01178 80979AA8 26030172 */ addiu $v1, $s0, 0x0172 ## $v1 = 00000172
/* 0117C 80979AAC 468084A0 */ cvt.s.w $f18, $f16
/* 01180 80979AB0 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00
/* 01184 80979AB4 3C01C1E8 */ lui $at, 0xC1E8 ## $at = C1E80000
/* 01188 80979AB8 46049180 */ add.s $f6, $f18, $f4
/* 0118C 80979ABC E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068
/* 01190 80979AC0 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 01194 80979AC4 852A14AA */ lh $t2, 0x14AA($t1) ## 00001892
/* 01198 80979AC8 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00
/* 0119C 80979ACC 00000000 */ nop
/* 011A0 80979AD0 468042A0 */ cvt.s.w $f10, $f8
/* 011A4 80979AD4 46105480 */ add.s $f18, $f10, $f16
/* 011A8 80979AD8 44815000 */ mtc1 $at, $f10 ## $f10 = -29.00
/* 011AC 80979ADC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000
/* 011B0 80979AE0 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060
/* 011B4 80979AE4 8C4B0000 */ lw $t3, 0x0000($v0) ## 8015FA90
/* 011B8 80979AE8 856C14AC */ lh $t4, 0x14AC($t3) ## 000014AC
/* 011BC 80979AEC A46C0000 */ sh $t4, 0x0000($v1) ## 00000172
/* 011C0 80979AF0 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90
/* 011C4 80979AF4 85AE14AE */ lh $t6, 0x14AE($t5) ## 00001896
/* 011C8 80979AF8 25CF03E8 */ addiu $t7, $t6, 0x03E8 ## $t7 = 000003E0
/* 011CC 80979AFC A46F0002 */ sh $t7, 0x0002($v1) ## 00000174
/* 011D0 80979B00 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90
/* 011D4 80979B04 871914B0 */ lh $t9, 0x14B0($t8) ## 00002068
/* 011D8 80979B08 27280BB8 */ addiu $t0, $t9, 0x0BB8 ## $t0 = 00000BB8
/* 011DC 80979B0C A4680004 */ sh $t0, 0x0004($v1) ## 00000176
/* 011E0 80979B10 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 011E4 80979B14 852A14B2 */ lh $t2, 0x14B2($t1) ## 0000189A
/* 011E8 80979B18 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00
/* 011EC 80979B1C 00000000 */ nop
/* 011F0 80979B20 468021A0 */ cvt.s.w $f6, $f4
/* 011F4 80979B24 46003202 */ mul.s $f8, $f6, $f0
/* 011F8 80979B28 460A4400 */ add.s $f16, $f8, $f10
/* 011FC 80979B2C 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00
/* 01200 80979B30 E6100070 */ swc1 $f16, 0x0070($s0) ## 00000070
/* 01204 80979B34 8C4B0000 */ lw $t3, 0x0000($v0) ## 8015FA90
/* 01208 80979B38 856C14B4 */ lh $t4, 0x14B4($t3) ## 000014B4
/* 0120C 80979B3C 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00
/* 01210 80979B40 00000000 */ nop
/* 01214 80979B44 46809120 */ cvt.s.w $f4, $f18
/* 01218 80979B48 46002182 */ mul.s $f6, $f4, $f0
/* 0121C 80979B4C 46083280 */ add.s $f10, $f6, $f8
/* 01220 80979B50 100000E1 */ beq $zero, $zero, .L80979ED8
/* 01224 80979B54 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C
glabel L80979B58
/* 01228 80979B58 3C028016 */ lui $v0, %hi(gGameInfo)
/* 0122C 80979B5C 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 01230 80979B60 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90
/* 01234 80979B64 3C018098 */ lui $at, %hi(D_8097C210) ## $at = 80980000
/* 01238 80979B68 C420C210 */ lwc1 $f0, %lo(D_8097C210)($at)
/* 0123C 80979B6C 85AE14C2 */ lh $t6, 0x14C2($t5) ## 000018AA
/* 01240 80979B70 3C014120 */ lui $at, 0x4120 ## $at = 41200000
/* 01244 80979B74 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00
/* 01248 80979B78 448E8000 */ mtc1 $t6, $f16 ## $f16 = NaN
/* 0124C 80979B7C 3C014220 */ lui $at, 0x4220 ## $at = 42200000
/* 01250 80979B80 26030172 */ addiu $v1, $s0, 0x0172 ## $v1 = 00000172
/* 01254 80979B84 468084A0 */ cvt.s.w $f18, $f16
/* 01258 80979B88 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00
/* 0125C 80979B8C 3C01C1E8 */ lui $at, 0xC1E8 ## $at = C1E80000
/* 01260 80979B90 46049180 */ add.s $f6, $f18, $f4
/* 01264 80979B94 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068
/* 01268 80979B98 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 0126C 80979B9C 85F814C4 */ lh $t8, 0x14C4($t7) ## 000018A4
/* 01270 80979BA0 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00
/* 01274 80979BA4 00000000 */ nop
/* 01278 80979BA8 468042A0 */ cvt.s.w $f10, $f8
/* 0127C 80979BAC 46105480 */ add.s $f18, $f10, $f16
/* 01280 80979BB0 44815000 */ mtc1 $at, $f10 ## $f10 = -29.00
/* 01284 80979BB4 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000
/* 01288 80979BB8 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060
/* 0128C 80979BBC 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90
/* 01290 80979BC0 872814C6 */ lh $t0, 0x14C6($t9) ## 000014C6
/* 01294 80979BC4 A4680000 */ sh $t0, 0x0000($v1) ## 00000172
/* 01298 80979BC8 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 0129C 80979BCC 852A14C8 */ lh $t2, 0x14C8($t1) ## 000018B0
/* 012A0 80979BD0 254B03E8 */ addiu $t3, $t2, 0x03E8 ## $t3 = 000003E8
/* 012A4 80979BD4 A46B0002 */ sh $t3, 0x0002($v1) ## 00000174
/* 012A8 80979BD8 8C4C0000 */ lw $t4, 0x0000($v0) ## 8015FA90
/* 012AC 80979BDC 858D14CA */ lh $t5, 0x14CA($t4) ## 00002082
/* 012B0 80979BE0 25AE0BB8 */ addiu $t6, $t5, 0x0BB8 ## $t6 = 00000FA0
/* 012B4 80979BE4 A46E0004 */ sh $t6, 0x0004($v1) ## 00000176
/* 012B8 80979BE8 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 012BC 80979BEC 85F814CC */ lh $t8, 0x14CC($t7) ## 000018AC
/* 012C0 80979BF0 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00
/* 012C4 80979BF4 00000000 */ nop
/* 012C8 80979BF8 468021A0 */ cvt.s.w $f6, $f4
/* 012CC 80979BFC 46003202 */ mul.s $f8, $f6, $f0
/* 012D0 80979C00 460A4400 */ add.s $f16, $f8, $f10
/* 012D4 80979C04 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00
/* 012D8 80979C08 E6100070 */ swc1 $f16, 0x0070($s0) ## 00000070
/* 012DC 80979C0C 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90
/* 012E0 80979C10 872814CE */ lh $t0, 0x14CE($t9) ## 000014CE
/* 012E4 80979C14 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00
/* 012E8 80979C18 00000000 */ nop
/* 012EC 80979C1C 46809120 */ cvt.s.w $f4, $f18
/* 012F0 80979C20 46002182 */ mul.s $f6, $f4, $f0
/* 012F4 80979C24 46083280 */ add.s $f10, $f6, $f8
/* 012F8 80979C28 100000AB */ beq $zero, $zero, .L80979ED8
/* 012FC 80979C2C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C
glabel L80979C30
/* 01300 80979C30 3C028016 */ lui $v0, %hi(gGameInfo)
/* 01304 80979C34 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 01308 80979C38 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 0130C 80979C3C 3C018098 */ lui $at, %hi(D_8097C214) ## $at = 80980000
/* 01310 80979C40 C420C214 */ lwc1 $f0, %lo(D_8097C214)($at)
/* 01314 80979C44 852A14DC */ lh $t2, 0x14DC($t1) ## 000018C4
/* 01318 80979C48 3C014120 */ lui $at, 0x4120 ## $at = 41200000
/* 0131C 80979C4C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00
/* 01320 80979C50 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00
/* 01324 80979C54 3C014220 */ lui $at, 0x4220 ## $at = 42200000
/* 01328 80979C58 26030172 */ addiu $v1, $s0, 0x0172 ## $v1 = 00000172
/* 0132C 80979C5C 468084A0 */ cvt.s.w $f18, $f16
/* 01330 80979C60 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00
/* 01334 80979C64 3C01C1E8 */ lui $at, 0xC1E8 ## $at = C1E80000
/* 01338 80979C68 46049180 */ add.s $f6, $f18, $f4
/* 0133C 80979C6C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068
/* 01340 80979C70 8C4B0000 */ lw $t3, 0x0000($v0) ## 8015FA90
/* 01344 80979C74 856C14DE */ lh $t4, 0x14DE($t3) ## 000018C6
/* 01348 80979C78 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00
/* 0134C 80979C7C 00000000 */ nop
/* 01350 80979C80 468042A0 */ cvt.s.w $f10, $f8
/* 01354 80979C84 46105480 */ add.s $f18, $f10, $f16
/* 01358 80979C88 44815000 */ mtc1 $at, $f10 ## $f10 = -29.00
/* 0135C 80979C8C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000
/* 01360 80979C90 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060
/* 01364 80979C94 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90
/* 01368 80979C98 85AE14E0 */ lh $t6, 0x14E0($t5) ## 000018C8
/* 0136C 80979C9C A46E0000 */ sh $t6, 0x0000($v1) ## 00000172
/* 01370 80979CA0 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 01374 80979CA4 85F814E2 */ lh $t8, 0x14E2($t7) ## 000018C2
/* 01378 80979CA8 271903E8 */ addiu $t9, $t8, 0x03E8 ## $t9 = 00000FA0
/* 0137C 80979CAC A4790002 */ sh $t9, 0x0002($v1) ## 00000174
/* 01380 80979CB0 8C480000 */ lw $t0, 0x0000($v0) ## 8015FA90
/* 01384 80979CB4 850914E4 */ lh $t1, 0x14E4($t0) ## 0000209C
/* 01388 80979CB8 252A0BB8 */ addiu $t2, $t1, 0x0BB8 ## $t2 = 00000FA0
/* 0138C 80979CBC A46A0004 */ sh $t2, 0x0004($v1) ## 00000176
/* 01390 80979CC0 8C4B0000 */ lw $t3, 0x0000($v0) ## 8015FA90
/* 01394 80979CC4 856C14E6 */ lh $t4, 0x14E6($t3) ## 000018CE
/* 01398 80979CC8 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00
/* 0139C 80979CCC 00000000 */ nop
/* 013A0 80979CD0 468021A0 */ cvt.s.w $f6, $f4
/* 013A4 80979CD4 46003202 */ mul.s $f8, $f6, $f0
/* 013A8 80979CD8 460A4400 */ add.s $f16, $f8, $f10
/* 013AC 80979CDC 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00
/* 013B0 80979CE0 E6100070 */ swc1 $f16, 0x0070($s0) ## 00000070
/* 013B4 80979CE4 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90
/* 013B8 80979CE8 85AE14E8 */ lh $t6, 0x14E8($t5) ## 000018D0
/* 013BC 80979CEC 448E9000 */ mtc1 $t6, $f18 ## $f18 = 0.00
/* 013C0 80979CF0 00000000 */ nop
/* 013C4 80979CF4 46809120 */ cvt.s.w $f4, $f18
/* 013C8 80979CF8 46002182 */ mul.s $f6, $f4, $f0
/* 013CC 80979CFC 46083280 */ add.s $f10, $f6, $f8
/* 013D0 80979D00 10000075 */ beq $zero, $zero, .L80979ED8
/* 013D4 80979D04 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C
glabel L80979D08
/* 013D8 80979D08 3C028016 */ lui $v0, %hi(gGameInfo)
/* 013DC 80979D0C 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 013E0 80979D10 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 013E4 80979D14 3C018098 */ lui $at, %hi(D_8097C218) ## $at = 80980000
/* 013E8 80979D18 C420C218 */ lwc1 $f0, %lo(D_8097C218)($at)
/* 013EC 80979D1C 85F814F6 */ lh $t8, 0x14F6($t7) ## 000018D6
/* 013F0 80979D20 3C014120 */ lui $at, 0x4120 ## $at = 41200000
/* 013F4 80979D24 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00
/* 013F8 80979D28 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00
/* 013FC 80979D2C 3C014220 */ lui $at, 0x4220 ## $at = 42200000
/* 01400 80979D30 26030172 */ addiu $v1, $s0, 0x0172 ## $v1 = 00000172
/* 01404 80979D34 468084A0 */ cvt.s.w $f18, $f16
/* 01408 80979D38 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00
/* 0140C 80979D3C 3C01C1E8 */ lui $at, 0xC1E8 ## $at = C1E80000
/* 01410 80979D40 46049180 */ add.s $f6, $f18, $f4
/* 01414 80979D44 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068
/* 01418 80979D48 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90
/* 0141C 80979D4C 872814F8 */ lh $t0, 0x14F8($t9) ## 00002498
/* 01420 80979D50 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00
/* 01424 80979D54 00000000 */ nop
/* 01428 80979D58 468042A0 */ cvt.s.w $f10, $f8
/* 0142C 80979D5C 46105480 */ add.s $f18, $f10, $f16
/* 01430 80979D60 44815000 */ mtc1 $at, $f10 ## $f10 = -29.00
/* 01434 80979D64 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000
/* 01438 80979D68 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060
/* 0143C 80979D6C 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 01440 80979D70 852A14FA */ lh $t2, 0x14FA($t1) ## 000018E2
/* 01444 80979D74 A46A0000 */ sh $t2, 0x0000($v1) ## 00000172
/* 01448 80979D78 8C4B0000 */ lw $t3, 0x0000($v0) ## 8015FA90
/* 0144C 80979D7C 856C14FC */ lh $t4, 0x14FC($t3) ## 000018E4
/* 01450 80979D80 258D03E8 */ addiu $t5, $t4, 0x03E8 ## $t5 = 00000FA0
/* 01454 80979D84 A46D0002 */ sh $t5, 0x0002($v1) ## 00000174
/* 01458 80979D88 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015FA90
/* 0145C 80979D8C 85CF14FE */ lh $t7, 0x14FE($t6) ## 0000249E
/* 01460 80979D90 25F80BB8 */ addiu $t8, $t7, 0x0BB8 ## $t8 = 00000F98
/* 01464 80979D94 A4780004 */ sh $t8, 0x0004($v1) ## 00000176
/* 01468 80979D98 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90
/* 0146C 80979D9C 87281500 */ lh $t0, 0x1500($t9) ## 000024A0
/* 01470 80979DA0 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00
/* 01474 80979DA4 00000000 */ nop
/* 01478 80979DA8 468021A0 */ cvt.s.w $f6, $f4
/* 0147C 80979DAC 46003202 */ mul.s $f8, $f6, $f0
/* 01480 80979DB0 460A4400 */ add.s $f16, $f8, $f10
/* 01484 80979DB4 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00
/* 01488 80979DB8 E6100070 */ swc1 $f16, 0x0070($s0) ## 00000070
/* 0148C 80979DBC 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 01490 80979DC0 852A1502 */ lh $t2, 0x1502($t1) ## 000018EA
/* 01494 80979DC4 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00
/* 01498 80979DC8 00000000 */ nop
/* 0149C 80979DCC 46809120 */ cvt.s.w $f4, $f18
/* 014A0 80979DD0 46002182 */ mul.s $f6, $f4, $f0
/* 014A4 80979DD4 46083280 */ add.s $f10, $f6, $f8
/* 014A8 80979DD8 1000003F */ beq $zero, $zero, .L80979ED8
/* 014AC 80979DDC E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C
glabel L80979DE0
/* 014B0 80979DE0 3C028016 */ lui $v0, %hi(gGameInfo)
/* 014B4 80979DE4 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 014B8 80979DE8 8C4B0000 */ lw $t3, 0x0000($v0) ## 8015FA90
/* 014BC 80979DEC 3C018098 */ lui $at, %hi(D_8097C21C) ## $at = 80980000
/* 014C0 80979DF0 C420C21C */ lwc1 $f0, %lo(D_8097C21C)($at)
/* 014C4 80979DF4 856C1510 */ lh $t4, 0x1510($t3) ## 000018F8
/* 014C8 80979DF8 3C014120 */ lui $at, 0x4120 ## $at = 41200000
/* 014CC 80979DFC 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00
/* 014D0 80979E00 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00
/* 014D4 80979E04 3C01428C */ lui $at, 0x428C ## $at = 428C0000
/* 014D8 80979E08 26030172 */ addiu $v1, $s0, 0x0172 ## $v1 = 00000172
/* 014DC 80979E0C 468084A0 */ cvt.s.w $f18, $f16
/* 014E0 80979E10 44818000 */ mtc1 $at, $f16 ## $f16 = 70.00
/* 014E4 80979E14 3C01C1E8 */ lui $at, 0xC1E8 ## $at = C1E80000
/* 014E8 80979E18 46049180 */ add.s $f6, $f18, $f4
/* 014EC 80979E1C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068
/* 014F0 80979E20 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90
/* 014F4 80979E24 85AE1512 */ lh $t6, 0x1512($t5) ## 000024B2
/* 014F8 80979E28 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00
/* 014FC 80979E2C 00000000 */ nop
/* 01500 80979E30 468042A0 */ cvt.s.w $f10, $f8
/* 01504 80979E34 46105480 */ add.s $f18, $f10, $f16
/* 01508 80979E38 44815000 */ mtc1 $at, $f10 ## $f10 = -29.00
/* 0150C 80979E3C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000
/* 01510 80979E40 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060
/* 01514 80979E44 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 01518 80979E48 85F81472 */ lh $t8, 0x1472($t7) ## 00001852
/* 0151C 80979E4C A4780000 */ sh $t8, 0x0000($v1) ## 00000172
/* 01520 80979E50 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90
/* 01524 80979E54 87281470 */ lh $t0, 0x1470($t9) ## 00002410
/* 01528 80979E58 250903E8 */ addiu $t1, $t0, 0x03E8 ## $t1 = 00000FA0
/* 0152C 80979E5C A4690002 */ sh $t1, 0x0002($v1) ## 00000174
/* 01530 80979E60 8C4A0000 */ lw $t2, 0x0000($v0) ## 8015FA90
/* 01534 80979E64 854B146E */ lh $t3, 0x146E($t2) ## 0000240E
/* 01538 80979E68 256C0BB8 */ addiu $t4, $t3, 0x0BB8 ## $t4 = 00000FA0
/* 0153C 80979E6C A46C0004 */ sh $t4, 0x0004($v1) ## 00000176
/* 01540 80979E70 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90
/* 01544 80979E74 85AE146C */ lh $t6, 0x146C($t5) ## 0000240C
/* 01548 80979E78 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00
/* 0154C 80979E7C 00000000 */ nop
/* 01550 80979E80 468021A0 */ cvt.s.w $f6, $f4
/* 01554 80979E84 46003202 */ mul.s $f8, $f6, $f0
/* 01558 80979E88 460A4400 */ add.s $f16, $f8, $f10
/* 0155C 80979E8C 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00
/* 01560 80979E90 E6100070 */ swc1 $f16, 0x0070($s0) ## 00000070
/* 01564 80979E94 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 01568 80979E98 85F8146A */ lh $t8, 0x146A($t7) ## 0000184A
/* 0156C 80979E9C 44989000 */ mtc1 $t8, $f18 ## $f18 = 0.00
/* 01570 80979EA0 00000000 */ nop
/* 01574 80979EA4 46809120 */ cvt.s.w $f4, $f18
/* 01578 80979EA8 46002182 */ mul.s $f6, $f4, $f0
/* 0157C 80979EAC 46083280 */ add.s $f10, $f6, $f8
/* 01580 80979EB0 10000009 */ beq $zero, $zero, .L80979ED8
/* 01584 80979EB4 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C
.L80979EB8:
/* 01588 80979EB8 3C048098 */ lui $a0, %hi(D_8097C098) ## $a0 = 80980000
/* 0158C 80979EBC 8605001C */ lh $a1, 0x001C($s0) ## 0000001C
/* 01590 80979EC0 E7AE0020 */ swc1 $f14, 0x0020($sp)
/* 01594 80979EC4 E7AC0024 */ swc1 $f12, 0x0024($sp)
/* 01598 80979EC8 0C00084C */ jal osSyncPrintf
/* 0159C 80979ECC 2484C098 */ addiu $a0, $a0, %lo(D_8097C098) ## $a0 = 8097C098
/* 015A0 80979ED0 C7AC0024 */ lwc1 $f12, 0x0024($sp)
/* 015A4 80979ED4 C7AE0020 */ lwc1 $f14, 0x0020($sp)
.L80979ED8:
/* 015A8 80979ED8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00
/* 015AC 80979EDC 00000000 */ nop
/* 015B0 80979EE0 46006032 */ c.eq.s $f12, $f0
/* 015B4 80979EE4 00000000 */ nop
/* 015B8 80979EE8 4500001E */ bc1f .L80979F64
/* 015BC 80979EEC 00000000 */ nop
/* 015C0 80979EF0 46007032 */ c.eq.s $f14, $f0
/* 015C4 80979EF4 8FB9003C */ lw $t9, 0x003C($sp)
/* 015C8 80979EF8 4500001A */ bc1f .L80979F64
/* 015CC 80979EFC 00000000 */ nop
/* 015D0 80979F00 8F231C44 */ lw $v1, 0x1C44($t9) ## 00001C44
/* 015D4 80979F04 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024
/* 015D8 80979F08 C4520000 */ lwc1 $f18, 0x0000($v0) ## 00000024
/* 015DC 80979F0C C4700024 */ lwc1 $f16, 0x0024($v1) ## 00000024
/* 015E0 80979F10 C4460008 */ lwc1 $f6, 0x0008($v0) ## 0000002C
/* 015E4 80979F14 C464002C */ lwc1 $f4, 0x002C($v1) ## 0000002C
/* 015E8 80979F18 46128301 */ sub.s $f12, $f16, $f18
/* 015EC 80979F1C 46062381 */ sub.s $f14, $f4, $f6
/* 015F0 80979F20 46006032 */ c.eq.s $f12, $f0
/* 015F4 80979F24 00000000 */ nop
/* 015F8 80979F28 45000005 */ bc1f .L80979F40
/* 015FC 80979F2C 00000000 */ nop
/* 01600 80979F30 46007032 */ c.eq.s $f14, $f0
/* 01604 80979F34 00000000 */ nop
/* 01608 80979F38 45030014 */ bc1tl .L80979F8C
/* 0160C 80979F3C 8FBF001C */ lw $ra, 0x001C($sp)
.L80979F40:
/* 01610 80979F40 0C03F494 */ jal Math_FAtan2F
/* 01614 80979F44 00000000 */ nop
/* 01618 80979F48 3C018098 */ lui $at, %hi(D_8097C220) ## $at = 80980000
/* 0161C 80979F4C C428C220 */ lwc1 $f8, %lo(D_8097C220)($at)
/* 01620 80979F50 46080282 */ mul.s $f10, $f0, $f8
/* 01624 80979F54 4600540D */ trunc.w.s $f16, $f10
/* 01628 80979F58 44098000 */ mfc1 $t1, $f16
/* 0162C 80979F5C 1000000A */ beq $zero, $zero, .L80979F88
/* 01630 80979F60 A6090032 */ sh $t1, 0x0032($s0) ## 00000032
.L80979F64:
/* 01634 80979F64 0C03F494 */ jal Math_FAtan2F
/* 01638 80979F68 00000000 */ nop
/* 0163C 80979F6C 3C018098 */ lui $at, %hi(D_8097C224) ## $at = 80980000
/* 01640 80979F70 C432C224 */ lwc1 $f18, %lo(D_8097C224)($at)
/* 01644 80979F74 46120102 */ mul.s $f4, $f0, $f18
/* 01648 80979F78 4600218D */ trunc.w.s $f6, $f4
/* 0164C 80979F7C 440B3000 */ mfc1 $t3, $f6
/* 01650 80979F80 00000000 */ nop
/* 01654 80979F84 A60B0032 */ sh $t3, 0x0032($s0) ## 00000032
.L80979F88:
/* 01658 80979F88 8FBF001C */ lw $ra, 0x001C($sp)
.L80979F8C:
/* 0165C 80979F8C 8FB00018 */ lw $s0, 0x0018($sp)
/* 01660 80979F90 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000
/* 01664 80979F94 03E00008 */ jr $ra
/* 01668 80979F98 00000000 */ nop

View file

@ -446,13 +446,11 @@ s32 func_80978EE4(DemoGj *this, GlobalContext *globalCtx) {
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978EE4.s")
#endif
void func_80978F60(DemoGj* this, GlobalContext* globalCtx, CollisionHeader *arg2);
#ifdef NON_MATCHING
void func_80978F60(DemoGj* this, GlobalContext* globalCtx, CollisionHeader *arg2) {
GlobalContext* glb_ctx;
Actor* actor;
DynaCollisionContext* colctx_dyna;
CollisionHeader *sp18;
CollisionHeader *header;
actor = &this->dyna.actor;
glb_ctx = globalCtx;
@ -461,14 +459,11 @@ void func_80978F60(DemoGj* this, GlobalContext* globalCtx, CollisionHeader *arg2
if (arg2 != NULL) {
Actor_ProcessInitChain(actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
sp18 = NULL;
CollisionHeader_GetVirtual(arg2, &sp18);
this->dyna.bgId = DynaPoly_SetBgActor(glb_ctx, colctx_dyna, actor, sp18);
header = NULL;
CollisionHeader_GetVirtual(arg2, &header);
this->dyna.bgId = DynaPoly_SetBgActor(glb_ctx, colctx_dyna, actor, header);
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978F60.s")
#endif
s32 func_80978FCC(DemoGj* this, GlobalContext* globalCtx, s32 arg2, s32 arg3, CollisionHeader* arg4) {
if (func_80978EBC() == 0) {
@ -657,138 +652,115 @@ s32 func_8097983C(DemoGj *this, GlobalContext* globalCtx) {
return func_809797E4(this, 2);
}
void func_80979860(DemoGj *this, GlobalContext *globalCtx);
#ifdef NON_MATCHING
void func_80979860(DemoGj *this, GlobalContext *globalCtx) {
//f32 sp24;
//f32 sp20;
Actor *temp_v0;
Actor *temp_v1_8;
PosRot *temp_v0_2;
Vec3s *temp_v1;
Vec3s *temp_v1_2;
Vec3s *temp_v1_3;
Vec3s *temp_v1_4;
Vec3s *temp_v1_5;
Vec3s *temp_v1_6;
Vec3s *temp_v1_7;
f32 temp_f10;
//f32 temp_f12;
f32 temp_f12_2;
//f32 temp_f14;
f32 temp_f14_2;
f32 temp_f4;
f32 temp_f6;
f32 temp_f8;
u32 temp_t6;
Actor* actor = &this->dyna.actor;
temp_v0 = this->ganon;
if (temp_v0 != 0) {
temp_f4 = this->dyna.actor.world.pos.x;
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_t6 = func_80978950(this) - 8;
switch (temp_t6) {
Player* player;
Vec3f* pos;
Vec3s *unk_172;
f32 xDistance;
f32 zDistance;
pos = &actor->world.pos;
if (this->ganon != NULL) {
xDistance = actor->world.pos.x - this->ganon->world.pos.x;
zDistance = actor->world.pos.z - this->ganon->world.pos.z;
unk_172 = &this->unk_172;
switch (func_80978950(this) - 8) {
case 0:
temp_v1 = &this->unk_172;
this->dyna.actor.speedXZ = (f32) gGameInfo->data[2608] + 10.0f;
this->dyna.actor.velocity.y = (f32) gGameInfo->data[2609] + 40.0f;
temp_v1->x = gGameInfo->data[2610];
temp_v1->y = gGameInfo->data[2611] + 0x3E8;
temp_v1->z = gGameInfo->data[2612] + 0xBB8;
this->dyna.actor.minVelocityY = ((f32) gGameInfo->data[2613] * 0.01f) + -29.0f;
this->dyna.actor.gravity = ((f32) gGameInfo->data[2614] * 0.01f) + -5.0f;
actor->speedXZ = (f32) kREG(16) + 10.0f;
actor->velocity.y = (f32) kREG(17) + 40.0f;
unk_172->x = (s16) (kREG(18));
unk_172->y = (s16) (kREG(19) + 0x3E8);
unk_172->z = (s16) (kREG(20) + 0xBB8);
actor->minVelocityY = ((f32) kREG(21) * 0.01f) + -29.0f;
actor->gravity = ((f32) kREG(22) * 0.01f) + -5.0f;
break;
case 1:
temp_v1_2 = &this->unk_172;
this->dyna.actor.speedXZ = (f32) gGameInfo->data[2621] + 10.0f;
this->dyna.actor.velocity.y = (f32) gGameInfo->data[2622] + 40.0f;
temp_v1_2->x = gGameInfo->data[2623];
temp_v1_2->y = gGameInfo->data[2624] + 0x3E8;
temp_v1_2->z = gGameInfo->data[2625] + 0xBB8;
this->dyna.actor.minVelocityY = ((f32) gGameInfo->data[2626] * 0.01f) + -29.0f;
this->dyna.actor.gravity = ((f32) gGameInfo->data[2627] * 0.01f) + -5.0f;
actor->speedXZ = (f32) kREG(29) + 10.0f;
actor->velocity.y = (f32) kREG(30) + 40.0f;
unk_172->x = (s16) (kREG(31));
unk_172->y = (s16) (kREG(32) + 0x3E8);
unk_172->z = (s16) (kREG(33) + 0xBB8);
actor->minVelocityY = ((f32) kREG(34) * 0.01f) + -29.0f;
actor->gravity = ((f32) kREG(35) * 0.01f) + -5.0f;
break;
case 2:
temp_v1_3 = &this->unk_172;
this->dyna.actor.speedXZ = (f32) gGameInfo->data[2634] + 10.0f;
this->dyna.actor.velocity.y = (f32) gGameInfo->data[2635] + 40.0f;
temp_v1_3->x = gGameInfo->data[2636];
temp_v1_3->y = gGameInfo->data[2637] + 0x3E8;
temp_v1_3->z = gGameInfo->data[2638] + 0xBB8;
this->dyna.actor.minVelocityY = ((f32) gGameInfo->data[2639] * 0.01f) + -29.0f;
this->dyna.actor.gravity = ((f32) gGameInfo->data[2640] * 0.01f) + -5.0f;
actor->speedXZ = (f32) kREG(42) + 10.0f;
actor->velocity.y = (f32) kREG(43) + 40.0f;
unk_172->x = (s16) (kREG(44));
unk_172->y = (s16) (kREG(45) + 0x3E8);
unk_172->z = (s16) (kREG(46) + 0xBB8);
actor->minVelocityY = ((f32) kREG(47) * 0.01f) + -29.0f;
actor->gravity = ((f32) kREG(48) * 0.01f) + -5.0f;
break;
case 3:
temp_v1_4 = &this->unk_172;
this->dyna.actor.speedXZ = (f32) gGameInfo->data[2647] + 10.0f;
this->dyna.actor.velocity.y = (f32) gGameInfo->data[2648] + 40.0f;
temp_v1_4->x = gGameInfo->data[2649];
temp_v1_4->y = gGameInfo->data[2650] + 0x3E8;
temp_v1_4->z = gGameInfo->data[2651] + 0xBB8;
this->dyna.actor.minVelocityY = ((f32) gGameInfo->data[2652] * 0.01f) + -29.0f;
this->dyna.actor.gravity = ((f32) gGameInfo->data[2653] * 0.01f) + -5.0f;
actor->speedXZ = (f32) kREG(55) + 10.0f;
actor->velocity.y = (f32) kREG(56) + 40.0f;
unk_172->x = (s16) (kREG(57));
unk_172->y = (s16) (kREG(58) + 0x3E8);
unk_172->z = (s16) (kREG(59) + 0xBB8);
actor->minVelocityY = ((f32) kREG(60) * 0.01f) + -29.0f;
actor->gravity = ((f32) kREG(61) * 0.01f) + -5.0f;
break;
case 4:
temp_v1_5 = &this->unk_172;
this->dyna.actor.speedXZ = (f32) gGameInfo->data[2660] + 10.0f;
this->dyna.actor.velocity.y = (f32) gGameInfo->data[2661] + 40.0f;
temp_v1_5->x = gGameInfo->data[2662];
temp_v1_5->y = gGameInfo->data[2663] + 0x3E8;
temp_v1_5->z = gGameInfo->data[2664] + 0xBB8;
this->dyna.actor.minVelocityY = ((f32) gGameInfo->data[2665] * 0.01f) + -29.0f;
this->dyna.actor.gravity = ((f32) gGameInfo->data[2666] * 0.01f) + -5.0f;
actor->speedXZ = (f32) kREG(68) + 10.0f;
actor->velocity.y = (f32) kREG(69) + 40.0f;
unk_172->x = (s16) (kREG(70));
unk_172->y = (s16) (kREG(71) + 0x3E8);
unk_172->z = (s16) (kREG(72) + 0xBB8);
actor->minVelocityY = ((f32) kREG(73) * 0.01f) + -29.0f;
actor->gravity = ((f32) kREG(74) * 0.01f) + -5.0f;
break;
case 5:
temp_v1_6 = &this->unk_172;
this->dyna.actor.speedXZ = (f32) gGameInfo->data[2673] + 10.0f;
this->dyna.actor.velocity.y = (f32) gGameInfo->data[2674] + 40.0f;
temp_v1_6->x = gGameInfo->data[2675];
temp_v1_6->y = gGameInfo->data[2676] + 0x3E8;
temp_v1_6->z = gGameInfo->data[2677] + 0xBB8;
this->dyna.actor.minVelocityY = ((f32) gGameInfo->data[2678] * 0.01f) + -29.0f;
this->dyna.actor.gravity = ((f32) gGameInfo->data[2679] * 0.01f) + -5.0f;
actor->speedXZ = (f32) kREG(81) + 10.0f;
actor->velocity.y = (f32) kREG(82) + 40.0f;
unk_172->x = (s16) (kREG(83));
unk_172->y = (s16) (kREG(84) + 0x3E8);
unk_172->z = (s16) (kREG(85) + 0xBB8);
actor->minVelocityY = ((f32) kREG(86) * 0.01f) + -29.0f;
actor->gravity = ((f32) kREG(87) * 0.01f) + -5.0f;
break;
case 6:
temp_v1_7 = &this->unk_172;
this->dyna.actor.speedXZ = (f32) gGameInfo->data[2686] + 10.0f;
this->dyna.actor.velocity.y = (f32) gGameInfo->data[2687] + 70.0f;
temp_v1_7->x = gGameInfo->data[2607];
temp_v1_7->y = gGameInfo->data[2606] + 0x3E8;
temp_v1_7->z = gGameInfo->data[2605] + 0xBB8;
this->dyna.actor.minVelocityY = ((f32) gGameInfo->data[2604] * 0.01f) + -29.0f;
this->dyna.actor.gravity = ((f32) gGameInfo->data[2603] * 0.01f) + -5.0f;
actor->speedXZ = (f32) kREG(94) + 10.0f;
actor->velocity.y = (f32) kREG(95) + 70.0f;
unk_172->x = (s16) (kREG(15));
unk_172->y = (s16) (kREG(14) + 0x3E8);
unk_172->z = (s16) (kREG(13) + 0xBB8);
actor->minVelocityY = ((f32) kREG(12) * 0.01f) + -29.0f;
actor->gravity = ((f32) kREG(11) * 0.01f) + -5.0f;
break;
default:
//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);
osSyncPrintf("\x1b[31mDemo_Gj_Setup_Move_common : そんなarg_dataには対応していない = %d\n\x1b[m", actor->params);
break;
}
if (((temp_f4 - temp_f6) == 0.0f) && ((temp_f8 - temp_f10) == 0.0f)) {
temp_v1_8 = globalCtx->actorCtx.actorLists[2].head;
temp_v0_2 = &this->dyna.actor.world;
temp_f12_2 = temp_v1_8->world.pos.x - temp_v0_2->pos.x;
temp_f14_2 = temp_v1_8->world.pos.z - temp_v0_2->pos.z;
if (temp_f12_2 != 0.0f || temp_f14_2 != 0.0f) {
this->dyna.actor.world.rot.y = (s16) (s32) (Math_FAtan2F(temp_f12_2, temp_f14_2) * 10430.378f);
if ((xDistance == 0.0f) && (zDistance == 0.0f)) {
player = PLAYER;
xDistance = player->actor.world.pos.x - pos->x;
zDistance = player->actor.world.pos.z - pos->z;
if (xDistance != 0.0f || zDistance != 0.0f) {
actor->world.rot.y = (Math_FAtan2F(xDistance, zDistance) * (0x8000/M_PI));
return;
}
} else {
this->dyna.actor.world.rot.y = (s16) (s32) (Math_FAtan2F(temp_f4 - temp_f6, temp_f8 - temp_f10) * 10430.378f);
actor->world.rot.y = (Math_FAtan2F(xDistance, zDistance) * (0x8000/M_PI));
}
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s")
#endif
void func_80979F9C(DemoGj* this){
if (func_809797E4(this, 3) != 0) {
@ -1130,6 +1102,16 @@ void func_8097AC30(DemoGj *this, GlobalContext *globalCtx);
}
}
*/
/*
void func_8097AC30(DemoGj *this, GlobalContext *globalCtx) {
if (this->unk_17C == 0) {
if ((globalCtx->gameplayFrames % 3) == 2) {
func_80978AFC(globalCtx, &D_8097BEA0, 300.0f);
}
func_80979F9C(this);
}
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s")
void func_8097AC9C(DemoGj *this, GlobalContext *globalCtx) {