mirror of
https://github.com/farisawan-2000/kirby64.git
synced 2024-11-27 07:00:51 +00:00
symbolized ovl1_7 in preparation of splitting
This commit is contained in:
farisawan-2000
parent
4cd54686b6
commit
bcc0c2ecf9
@ -1,24 +0,0 @@
|
||||
glabel func_8011E1E8
|
||||
/* 0A6C58 8011E1E8 28A10008 */ slti $at, $a1, 8
|
||||
/* 0A6C5C 8011E1EC 54200004 */ bnezl $at, .L8011E200_ovl2
|
||||
/* 0A6C60 8011E1F0 28810008 */ slti $at, $a0, 8
|
||||
/* 0A6C64 8011E1F4 03E00008 */ jr $ra
|
||||
/* 0A6C68 8011E1F8 00A01025 */ move $v0, $a1
|
||||
|
||||
/* 0A6C6C 8011E1FC 28810008 */ slti $at, $a0, 8
|
||||
.L8011E200_ovl2:
|
||||
/* 0A6C70 8011E200 14200003 */ bnez $at, .L8011E210_ovl2
|
||||
/* 0A6C74 8011E204 000470C0 */ sll $t6, $a0, 3
|
||||
/* 0A6C78 8011E208 03E00008 */ jr $ra
|
||||
/* 0A6C7C 8011E20C 00801025 */ move $v0, $a0
|
||||
|
||||
.L8011E210_ovl2:
|
||||
/* 0A6C80 8011E210 01C47021 */ addu $t6, $t6, $a0
|
||||
/* 0A6C84 8011E214 000E7100 */ sll $t6, $t6, 4
|
||||
/* 0A6C88 8011E218 00057880 */ sll $t7, $a1, 2
|
||||
/* 0A6C8C 8011E21C 01CFC021 */ addu $t8, $t6, $t7
|
||||
/* 0A6C90 8011E220 3C028012 */ lui $v0, %hi(D_80126EF8)
|
||||
/* 0A6C94 8011E224 00581021 */ addu $v0, $v0, $t8
|
||||
/* 0A6C98 8011E228 8C426EF8 */ lw $v0, %lo(D_80126EF8)($v0)
|
||||
/* 0A6C9C 8011E22C 03E00008 */ jr $ra
|
||||
/* 0A6CA0 8011E230 00000000 */ nop
|
||||
@ -1,35 +0,0 @@
|
||||
glabel func_8011E2A0
|
||||
/* 0A6D10 8011E2A0 3C028013 */ lui $v0, %hi(gKirbyState) # $v0, 0x8013
|
||||
/* 0A6D14 8011E2A4 2442E7C0 */ addiu $v0, %lo(gKirbyState) # addiu $v0, $v0, -0x1840
|
||||
/* 0A6D18 8011E2A8 8C4E0034 */ lw $t6, 0x34($v0)
|
||||
/* 0A6D1C 8011E2AC 31CF4000 */ andi $t7, $t6, 0x4000
|
||||
/* 0A6D20 8011E2B0 55E00017 */ bnezl $t7, .L8011E310_ovl2
|
||||
/* 0A6D24 8011E2B4 44800000 */ mtc1 $zero, $f0
|
||||
/* 0A6D28 8011E2B8 8C580114 */ lw $t8, 0x114($v0)
|
||||
/* 0A6D2C 8011E2BC 3C018013 */ lui $at, %hi(D_80128F18) # $at, 0x8013
|
||||
/* 0A6D30 8011E2C0 C42C8F18 */ lwc1 $f12, %lo(D_80128F18)($at)
|
||||
/* 0A6D34 8011E2C4 97190010 */ lhu $t9, 0x10($t8)
|
||||
/* 0A6D38 8011E2C8 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000
|
||||
/* 0A6D3C 8011E2CC 44992000 */ mtc1 $t9, $f4
|
||||
/* 0A6D40 8011E2D0 07210004 */ bgez $t9, .L8011E2E4_ovl2
|
||||
/* 0A6D44 8011E2D4 468021A0 */ cvt.s.w $f6, $f4
|
||||
/* 0A6D48 8011E2D8 44814000 */ mtc1 $at, $f8
|
||||
/* 0A6D4C 8011E2DC 00000000 */ nop
|
||||
/* 0A6D50 8011E2E0 46083180 */ add.s $f6, $f6, $f8
|
||||
.L8011E2E4_ovl2:
|
||||
/* 0A6D54 8011E2E4 460C3082 */ mul.s $f2, $f6, $f12
|
||||
/* 0A6D58 8011E2E8 44805000 */ mtc1 $zero, $f10
|
||||
/* 0A6D5C 8011E2EC 00000000 */ nop
|
||||
/* 0A6D60 8011E2F0 460A1032 */ c.eq.s $f2, $f10
|
||||
/* 0A6D64 8011E2F4 00000000 */ nop
|
||||
/* 0A6D68 8011E2F8 45030005 */ bc1tl .L8011E310_ovl2
|
||||
/* 0A6D6C 8011E2FC 44800000 */ mtc1 $zero, $f0
|
||||
/* 0A6D70 8011E300 460C1002 */ mul.s $f0, $f2, $f12
|
||||
/* 0A6D74 8011E304 03E00008 */ jr $ra
|
||||
/* 0A6D78 8011E308 00000000 */ nop
|
||||
|
||||
/* 0A6D7C 8011E30C 44800000 */ mtc1 $zero, $f0
|
||||
.L8011E310_ovl2:
|
||||
/* 0A6D80 8011E310 00000000 */ nop
|
||||
/* 0A6D84 8011E314 03E00008 */ jr $ra
|
||||
/* 0A6D88 8011E318 00000000 */ nop
|
||||
@ -1,10 +0,0 @@
|
||||
glabel func_8011E31C
|
||||
/* 0A6D8C 8011E31C 3C028013 */ lui $v0, %hi(gPositionState) # $v0, 0x8013
|
||||
/* 0A6D90 8011E320 2442E968 */ addiu $v0, %lo(gPositionState) # addiu $v0, $v0, -0x1698
|
||||
/* 0A6D94 8011E324 C4440028 */ lwc1 $f4, 0x28($v0)
|
||||
/* 0A6D98 8011E328 E4840000 */ swc1 $f4, ($a0)
|
||||
/* 0A6D9C 8011E32C C4460048 */ lwc1 $f6, 0x48($v0)
|
||||
/* 0A6DA0 8011E330 E4860004 */ swc1 $f6, 4($a0)
|
||||
/* 0A6DA4 8011E334 C4480030 */ lwc1 $f8, 0x30($v0)
|
||||
/* 0A6DA8 8011E338 03E00008 */ jr $ra
|
||||
/* 0A6DAC 8011E33C E4880008 */ swc1 $f8, 8($a0)
|
||||
@ -1,44 +0,0 @@
|
||||
glabel func_8011E438
|
||||
/* 0A6EA8 8011E438 3C028013 */ lui $v0, %hi(gKirbyState) # $v0, 0x8013
|
||||
/* 0A6EAC 8011E43C 2442E7C0 */ addiu $v0, %lo(gKirbyState) # addiu $v0, $v0, -0x1840
|
||||
/* 0A6EB0 8011E440 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 0A6EB4 8011E444 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 0A6EB8 8011E448 240E0001 */ li $t6, 1
|
||||
/* 0A6EBC 8011E44C A0400004 */ sb $zero, 4($v0)
|
||||
/* 0A6EC0 8011E450 A04E0017 */ sb $t6, 0x17($v0)
|
||||
/* 0A6EC4 8011E454 AC4000A0 */ sw $zero, 0xa0($v0)
|
||||
/* 0A6EC8 8011E458 24040048 */ li $a0, 72
|
||||
/* 0A6ECC 8011E45C 0C048BE5 */ jal set_kirby_action_2
|
||||
/* 0A6ED0 8011E460 2405001C */ li $a1, 28
|
||||
/* 0A6ED4 8011E464 44801000 */ mtc1 $zero, $f2
|
||||
/* 0A6ED8 8011E468 3C02800E */ lui $v0, %hi(D_800E6850) # $v0, 0x800e
|
||||
/* 0A6EDC 8011E46C 24426850 */ addiu $v0, %lo(D_800E6850) # addiu $v0, $v0, 0x6850
|
||||
/* 0A6EE0 8011E470 E4420000 */ swc1 $f2, ($v0)
|
||||
/* 0A6EE4 8011E474 C4400000 */ lwc1 $f0, ($v0)
|
||||
/* 0A6EE8 8011E478 3C01800E */ lui $at, %hi(D_800E6690) # $at, 0x800e
|
||||
/* 0A6EEC 8011E47C 3C03800E */ lui $v1, %hi(D_800E48D0) # $v1, 0x800e
|
||||
/* 0A6EF0 8011E480 E4206690 */ swc1 $f0, %lo(D_800E6690)($at)
|
||||
/* 0A6EF4 8011E484 3C01800E */ lui $at, %hi(D_800E64D0) # $at, 0x800e
|
||||
/* 0A6EF8 8011E488 E42064D0 */ swc1 $f0, %lo(D_800E64D0)($at)
|
||||
/* 0A6EFC 8011E48C 3C01800E */ lui $at, %hi(D_800E3210) # $at, 0x800e
|
||||
/* 0A6F00 8011E490 E4223210 */ swc1 $f2, %lo(D_800E3210)($at)
|
||||
/* 0A6F04 8011E494 3C018013 */ lui $at, %hi(D_80128F20) # $at, 0x8013
|
||||
/* 0A6F08 8011E498 C4248F20 */ lwc1 $f4, %lo(D_80128F20)($at)
|
||||
/* 0A6F0C 8011E49C 3C01800E */ lui $at, %hi(D_800E3750) # $at, 0x800e
|
||||
/* 0A6F10 8011E4A0 246348D0 */ addiu $v1, %lo(D_800E48D0) # addiu $v1, $v1, 0x48d0
|
||||
/* 0A6F14 8011E4A4 E4243750 */ swc1 $f4, %lo(D_800E3750)($at)
|
||||
/* 0A6F18 8011E4A8 3C014180 */ li $at, 0x41800000 # 16.000000
|
||||
/* 0A6F1C 8011E4AC 44813000 */ mtc1 $at, $f6
|
||||
/* 0A6F20 8011E4B0 3C01800E */ lui $at, %hi(D_800E3C90) # $at, 0x800e
|
||||
/* 0A6F24 8011E4B4 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 0A6F28 8011E4B8 E4263C90 */ swc1 $f6, %lo(D_800E3C90)($at)
|
||||
/* 0A6F2C 8011E4BC 3C018013 */ lui $at, %hi(D_80128F24) # $at, 0x8013
|
||||
/* 0A6F30 8011E4C0 C4288F24 */ lwc1 $f8, %lo(D_80128F24)($at)
|
||||
/* 0A6F34 8011E4C4 3C01800E */ lui $at, %hi(D_800E4710) # $at, 0x800e
|
||||
/* 0A6F38 8011E4C8 E4680000 */ swc1 $f8, ($v1)
|
||||
/* 0A6F3C 8011E4CC C4600000 */ lwc1 $f0, ($v1)
|
||||
/* 0A6F40 8011E4D0 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
/* 0A6F44 8011E4D4 E4204710 */ swc1 $f0, %lo(D_800E4710)($at)
|
||||
/* 0A6F48 8011E4D8 3C01800E */ lui $at, %hi(D_800E4550)
|
||||
/* 0A6F4C 8011E4DC 03E00008 */ jr $ra
|
||||
/* 0A6F50 8011E4E0 E4204550 */ swc1 $f0, %lo(D_800E4550)($at)
|
||||
@ -1,55 +0,0 @@
|
||||
glabel func_80120A28
|
||||
/* 0A9498 80120A28 3C038005 */ lui $v1, %hi(D_8004A7C4) # $v1, 0x8005
|
||||
/* 0A949C 80120A2C 8C63A7C4 */ lw $v1, %lo(D_8004A7C4)($v1)
|
||||
/* 0A94A0 80120A30 27BDFFD0 */ addiu $sp, $sp, -0x30
|
||||
/* 0A94A4 80120A34 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 0A94A8 80120A38 8C620000 */ lw $v0, ($v1)
|
||||
/* 0A94AC 80120A3C 3C0E800F */ lui $t6, %hi(D_800E8AE0)
|
||||
/* 0A94B0 80120A40 3C01800E */ lui $at, %hi(D_800E6A10)
|
||||
/* 0A94B4 80120A44 00021080 */ sll $v0, $v0, 2
|
||||
/* 0A94B8 80120A48 01C27021 */ addu $t6, $t6, $v0
|
||||
/* 0A94BC 80120A4C 8DCE8AE0 */ lw $t6, %lo(D_800E8AE0)($t6)
|
||||
/* 0A94C0 80120A50 00220821 */ addu $at, $at, $v0
|
||||
/* 0A94C4 80120A54 31CF0006 */ andi $t7, $t6, 6
|
||||
/* 0A94C8 80120A58 11E0000F */ beqz $t7, .L80120A98_ovl2
|
||||
/* 0A94CC 80120A5C 00000000 */ nop
|
||||
/* 0A94D0 80120A60 C4246A10 */ lwc1 $f4, %lo(D_800E6A10)($at)
|
||||
/* 0A94D4 80120A64 3C018013 */ lui $at, %hi(D_80129068) # $at, 0x8013
|
||||
/* 0A94D8 80120A68 C4269068 */ lwc1 $f6, %lo(D_80129068)($at)
|
||||
/* 0A94DC 80120A6C 3C01800E */ lui $at, %hi(D_800E6690)
|
||||
/* 0A94E0 80120A70 00220821 */ addu $at, $at, $v0
|
||||
/* 0A94E4 80120A74 46062202 */ mul.s $f8, $f4, $f6
|
||||
/* 0A94E8 80120A78 44805000 */ mtc1 $zero, $f10
|
||||
/* 0A94EC 80120A7C E4286690 */ swc1 $f8, %lo(D_800E6690)($at)
|
||||
/* 0A94F0 80120A80 8C780000 */ lw $t8, ($v1)
|
||||
/* 0A94F4 80120A84 3C01800E */ lui $at, %hi(D_800E6850)
|
||||
/* 0A94F8 80120A88 0018C880 */ sll $t9, $t8, 2
|
||||
/* 0A94FC 80120A8C 00390821 */ addu $at, $at, $t9
|
||||
/* 0A9500 80120A90 10000015 */ b .L80120AE8_ovl2
|
||||
/* 0A9504 80120A94 E42A6850 */ swc1 $f10, %lo(D_800E6850)($at)
|
||||
.L80120A98_ovl2:
|
||||
/* 0A9508 80120A98 0C0482BE */ jal func_80120AF8
|
||||
/* 0A950C 80120A9C 27A40024 */ addiu $a0, $sp, 0x24
|
||||
/* 0A9510 80120AA0 3C038005 */ lui $v1, %hi(D_8004A7C4) # $v1, 0x8005
|
||||
/* 0A9514 80120AA4 8C63A7C4 */ lw $v1, %lo(D_8004A7C4)($v1)
|
||||
/* 0A9518 80120AA8 3C01800E */ lui $at, %hi(D_800E6A10)
|
||||
/* 0A951C 80120AAC C7B2002C */ lwc1 $f18, 0x2c($sp)
|
||||
/* 0A9520 80120AB0 8C620000 */ lw $v0, ($v1)
|
||||
/* 0A9524 80120AB4 44803000 */ mtc1 $zero, $f6
|
||||
/* 0A9528 80120AB8 00021080 */ sll $v0, $v0, 2
|
||||
/* 0A952C 80120ABC 00220821 */ addu $at, $at, $v0
|
||||
/* 0A9530 80120AC0 C4306A10 */ lwc1 $f16, %lo(D_800E6A10)($at)
|
||||
/* 0A9534 80120AC4 3C01800E */ lui $at, %hi(D_800E6690)
|
||||
/* 0A9538 80120AC8 00220821 */ addu $at, $at, $v0
|
||||
/* 0A953C 80120ACC 46128102 */ mul.s $f4, $f16, $f18
|
||||
/* 0A9540 80120AD0 E4246690 */ swc1 $f4, %lo(D_800E6690)($at)
|
||||
/* 0A9544 80120AD4 8C680000 */ lw $t0, ($v1)
|
||||
/* 0A9548 80120AD8 3C01800E */ lui $at, %hi(D_800E6850)
|
||||
/* 0A954C 80120ADC 00084880 */ sll $t1, $t0, 2
|
||||
/* 0A9550 80120AE0 00290821 */ addu $at, $at, $t1
|
||||
/* 0A9554 80120AE4 E4266850 */ swc1 $f6, %lo(D_800E6850)($at)
|
||||
.L80120AE8_ovl2:
|
||||
/* 0A9558 80120AE8 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 0A955C 80120AEC 27BD0030 */ addiu $sp, $sp, 0x30
|
||||
/* 0A9560 80120AF0 03E00008 */ jr $ra
|
||||
/* 0A9564 80120AF4 00000000 */ nop
|
||||
@ -1,58 +0,0 @@
|
||||
glabel func_80120AF8
|
||||
/* 0A9568 80120AF8 3C0E8005 */ lui $t6, %hi(D_8004A7C4) # $t6, 0x8005
|
||||
/* 0A956C 80120AFC 8DCEA7C4 */ lw $t6, %lo(D_8004A7C4)($t6)
|
||||
/* 0A9570 80120B00 3C0F800F */ lui $t7, %hi(D_800E8920)
|
||||
/* 0A9574 80120B04 3C18800F */ lui $t8, %hi(D_800E8AE0)
|
||||
/* 0A9578 80120B08 8DC20000 */ lw $v0, ($t6)
|
||||
/* 0A957C 80120B0C 3C038013 */ lui $v1, %hi(gKirbyState) # $v1, 0x8013
|
||||
/* 0A9580 80120B10 2463E7C0 */ addiu $v1, %lo(gKirbyState) # addiu $v1, $v1, -0x1840
|
||||
/* 0A9584 80120B14 00021080 */ sll $v0, $v0, 2
|
||||
/* 0A9588 80120B18 01E27821 */ addu $t7, $t7, $v0
|
||||
/* 0A958C 80120B1C 8DEF8920 */ lw $t7, %lo(D_800E8920)($t7)
|
||||
/* 0A9590 80120B20 0302C021 */ addu $t8, $t8, $v0
|
||||
/* 0A9594 80120B24 55E00013 */ bnezl $t7, .L80120B74_ovl2
|
||||
/* 0A9598 80120B28 9468010A */ lhu $t0, 0x10a($v1)
|
||||
/* 0A959C 80120B2C 8F188AE0 */ lw $t8, %lo(D_800E8AE0)($t8)
|
||||
/* 0A95A0 80120B30 3C018013 */ lui $at, %hi(D_80129070)
|
||||
/* 0A95A4 80120B34 33190006 */ andi $t9, $t8, 6
|
||||
/* 0A95A8 80120B38 13200005 */ beqz $t9, .L80120B50_ovl2
|
||||
/* 0A95AC 80120B3C 00000000 */ nop
|
||||
/* 0A95B0 80120B40 3C018013 */ lui $at, %hi(D_80129070) # $at, 0x8013
|
||||
/* 0A95B4 80120B44 C424906C */ lwc1 $f4, %lo(D_8012906C)($at)
|
||||
/* 0A95B8 80120B48 10000003 */ b .L80120B58_ovl2
|
||||
/* 0A95BC 80120B4C E4840008 */ swc1 $f4, 8($a0)
|
||||
.L80120B50_ovl2:
|
||||
/* 0A95C0 80120B50 C4269070 */ lwc1 $f6, %lo(D_80129070)($at)
|
||||
/* 0A95C4 80120B54 E4860008 */ swc1 $f6, 8($a0)
|
||||
.L80120B58_ovl2:
|
||||
/* 0A95C8 80120B58 3C013F80 */ li $at, 0x3F800000 # 1.000000
|
||||
/* 0A95CC 80120B5C 44810000 */ mtc1 $at, $f0
|
||||
/* 0A95D0 80120B60 00000000 */ nop
|
||||
/* 0A95D4 80120B64 E4800004 */ swc1 $f0, 4($a0)
|
||||
/* 0A95D8 80120B68 03E00008 */ jr $ra
|
||||
/* 0A95DC 80120B6C E4800000 */ swc1 $f0, ($a0)
|
||||
|
||||
/* 0A95E0 80120B70 9468010A */ lhu $t0, 0x10a($v1)
|
||||
.L80120B74_ovl2:
|
||||
/* 0A95E4 80120B74 2405001C */ li $a1, 28
|
||||
/* 0A95E8 80120B78 3C028013 */ lui $v0, %hi(D_80128434) # $v0, 0x8013
|
||||
/* 0A95EC 80120B7C 01050019 */ multu $t0, $a1
|
||||
/* 0A95F0 80120B80 24428434 */ addiu $v0, %lo(D_80128434) # addiu $v0, $v0, -0x7bcc
|
||||
/* 0A95F4 80120B84 00004812 */ mflo $t1
|
||||
/* 0A95F8 80120B88 00495021 */ addu $t2, $v0, $t1
|
||||
/* 0A95FC 80120B8C C5480000 */ lwc1 $f8, ($t2)
|
||||
/* 0A9600 80120B90 E4880000 */ swc1 $f8, ($a0)
|
||||
/* 0A9604 80120B94 946B010A */ lhu $t3, 0x10a($v1)
|
||||
/* 0A9608 80120B98 01650019 */ multu $t3, $a1
|
||||
/* 0A960C 80120B9C 00006012 */ mflo $t4
|
||||
/* 0A9610 80120BA0 004C6821 */ addu $t5, $v0, $t4
|
||||
/* 0A9614 80120BA4 C5AA0004 */ lwc1 $f10, 4($t5)
|
||||
/* 0A9618 80120BA8 E48A0004 */ swc1 $f10, 4($a0)
|
||||
/* 0A961C 80120BAC 946E010A */ lhu $t6, 0x10a($v1)
|
||||
/* 0A9620 80120BB0 01C50019 */ multu $t6, $a1
|
||||
/* 0A9624 80120BB4 00007812 */ mflo $t7
|
||||
/* 0A9628 80120BB8 004FC021 */ addu $t8, $v0, $t7
|
||||
/* 0A962C 80120BBC C7100008 */ lwc1 $f16, 8($t8)
|
||||
/* 0A9630 80120BC0 E4900008 */ swc1 $f16, 8($a0)
|
||||
/* 0A9634 80120BC4 03E00008 */ jr $ra
|
||||
/* 0A9638 80120BC8 00000000 */ nop
|
||||
@ -1,17 +0,0 @@
|
||||
glabel func_801219C8
|
||||
/* 0AA438 801219C8 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 0AA43C 801219CC AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 0AA440 801219D0 0C048577 */ jal func_801215DC
|
||||
/* 0AA444 801219D4 00000000 */ nop
|
||||
/* 0AA448 801219D8 24010002 */ li $at, 2
|
||||
/* 0AA44C 801219DC 14410005 */ bne $v0, $at, .L801219F4_ovl2
|
||||
/* 0AA450 801219E0 3C028013 */ lui $v0, %hi(gKirbyState) # $v0, 0x8013
|
||||
/* 0AA454 801219E4 2442E7C0 */ addiu $v0, %lo(gKirbyState) # addiu $v0, $v0, -0x1840
|
||||
/* 0AA458 801219E8 8C4E0034 */ lw $t6, 0x34($v0)
|
||||
/* 0AA45C 801219EC 35CF0001 */ ori $t7, $t6, 1
|
||||
/* 0AA460 801219F0 AC4F0034 */ sw $t7, 0x34($v0)
|
||||
.L801219F4_ovl2:
|
||||
/* 0AA464 801219F4 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 0AA468 801219F8 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
/* 0AA46C 801219FC 03E00008 */ jr $ra
|
||||
/* 0AA470 80121A00 00000000 */ nop
|
||||
@ -1,67 +0,0 @@
|
||||
glabel func_80122460
|
||||
/* 0AAED0 80122460 3C038013 */ lui $v1, %hi(gKirbyState) # $v1, 0x8013
|
||||
/* 0AAED4 80122464 2463E7C0 */ addiu $v1, %lo(gKirbyState) # addiu $v1, $v1, -0x1840
|
||||
/* 0AAED8 80122468 8C6E00E4 */ lw $t6, 0xe4($v1)
|
||||
/* 0AAEDC 8012246C 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 0AAEE0 80122470 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 0AAEE4 80122474 11C00019 */ beqz $t6, .L801224DC_ovl2
|
||||
/* 0AAEE8 80122478 3C0F8005 */ lui $t7, %hi(D_8004A7C4) # $t7, 0x8005
|
||||
/* 0AAEEC 8012247C 8DEFA7C4 */ lw $t7, %lo(D_8004A7C4)($t7)
|
||||
/* 0AAEF0 80122480 3C01800E */ lui $at, %hi(D_800E3210)
|
||||
/* 0AAEF4 80122484 44802000 */ mtc1 $zero, $f4
|
||||
/* 0AAEF8 80122488 8DF80000 */ lw $t8, ($t7)
|
||||
/* 0AAEFC 8012248C 0018C880 */ sll $t9, $t8, 2
|
||||
/* 0AAF00 80122490 00390821 */ addu $at, $at, $t9
|
||||
/* 0AAF04 80122494 C4263210 */ lwc1 $f6, %lo(D_800E3210)($at)
|
||||
/* 0AAF08 80122498 4606203C */ c.lt.s $f4, $f6
|
||||
/* 0AAF0C 8012249C 00000000 */ nop
|
||||
/* 0AAF10 801224A0 4502000F */ bc1fl .L801224E0_ovl2
|
||||
/* 0AAF14 801224A4 8C6800E8 */ lw $t0, 0xe8($v1)
|
||||
/* 0AAF18 801224A8 94620100 */ lhu $v0, 0x100($v1)
|
||||
/* 0AAF1C 801224AC 24010004 */ li $at, 4
|
||||
/* 0AAF20 801224B0 3C048013 */ lui $a0, %hi(gPositionState) # $a0, 0x8013
|
||||
/* 0AAF24 801224B4 10410003 */ beq $v0, $at, .L801224C4_ovl2
|
||||
/* 0AAF28 801224B8 24010005 */ li $at, 5
|
||||
/* 0AAF2C 801224BC 54410022 */ bnel $v0, $at, .L80122548_ovl2
|
||||
/* 0AAF30 801224C0 00001025 */ move $v0, $zero
|
||||
.L801224C4_ovl2:
|
||||
/* 0AAF34 801224C4 0C043629 */ jal func_8010D8A4
|
||||
/* 0AAF38 801224C8 2484E968 */ addiu $a0, %lo(gPositionState) # addiu $a0, $a0, -0x1698
|
||||
/* 0AAF3C 801224CC 5040001E */ beql $v0, $zero, .L80122548_ovl2
|
||||
/* 0AAF40 801224D0 00001025 */ move $v0, $zero
|
||||
/* 0AAF44 801224D4 1000001C */ b .L80122548_ovl2
|
||||
/* 0AAF48 801224D8 24020001 */ li $v0, 1
|
||||
.L801224DC_ovl2:
|
||||
/* 0AAF4C 801224DC 8C6800E8 */ lw $t0, 0xe8($v1)
|
||||
.L801224E0_ovl2:
|
||||
/* 0AAF50 801224E0 3C098005 */ lui $t1, %hi(D_8004A7C4) # $t1, 0x8005
|
||||
/* 0AAF54 801224E4 51000018 */ beql $t0, $zero, .L80122548_ovl2
|
||||
/* 0AAF58 801224E8 00001025 */ move $v0, $zero
|
||||
/* 0AAF5C 801224EC 8D29A7C4 */ lw $t1, %lo(D_8004A7C4)($t1)
|
||||
/* 0AAF60 801224F0 3C01800E */ lui $at, %hi(D_800E3210)
|
||||
/* 0AAF64 801224F4 44804000 */ mtc1 $zero, $f8
|
||||
/* 0AAF68 801224F8 8D2A0000 */ lw $t2, ($t1)
|
||||
/* 0AAF6C 801224FC 000A5880 */ sll $t3, $t2, 2
|
||||
/* 0AAF70 80122500 002B0821 */ addu $at, $at, $t3
|
||||
/* 0AAF74 80122504 C42A3210 */ lwc1 $f10, %lo(D_800E3210)($at)
|
||||
/* 0AAF78 80122508 4608503E */ c.le.s $f10, $f8
|
||||
/* 0AAF7C 8012250C 00000000 */ nop
|
||||
/* 0AAF80 80122510 4502000D */ bc1fl .L80122548_ovl2
|
||||
/* 0AAF84 80122514 00001025 */ move $v0, $zero
|
||||
/* 0AAF88 80122518 946C0102 */ lhu $t4, 0x102($v1)
|
||||
/* 0AAF8C 8012251C 24010004 */ li $at, 4
|
||||
/* 0AAF90 80122520 3C048013 */ lui $a0, %hi(gPositionState) # $a0, 0x8013
|
||||
/* 0AAF94 80122524 55810008 */ bnel $t4, $at, .L80122548_ovl2
|
||||
/* 0AAF98 80122528 00001025 */ move $v0, $zero
|
||||
/* 0AAF9C 8012252C 0C043629 */ jal func_8010D8A4
|
||||
/* 0AAFA0 80122530 2484E968 */ addiu $a0, %lo(gPositionState) # addiu $a0, $a0, -0x1698
|
||||
/* 0AAFA4 80122534 50400004 */ beql $v0, $zero, .L80122548_ovl2
|
||||
/* 0AAFA8 80122538 00001025 */ move $v0, $zero
|
||||
/* 0AAFAC 8012253C 10000002 */ b .L80122548_ovl2
|
||||
/* 0AAFB0 80122540 24020001 */ li $v0, 1
|
||||
/* 0AAFB4 80122544 00001025 */ move $v0, $zero
|
||||
.L80122548_ovl2:
|
||||
/* 0AAFB8 80122548 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 0AAFBC 8012254C 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
/* 0AAFC0 80122550 03E00008 */ jr $ra
|
||||
/* 0AAFC4 80122554 00000000 */ nop
|
||||
@ -1,31 +0,0 @@
|
||||
glabel func_80122A10
|
||||
/* 0AB480 80122A10 27BDFFE0 */ addiu $sp, $sp, -0x20
|
||||
/* 0AB484 80122A14 AFB00018 */ sw $s0, 0x18($sp)
|
||||
/* 0AB488 80122A18 3C108013 */ lui $s0, %hi(D_8012E894) # $s0, 0x8013
|
||||
/* 0AB48C 80122A1C 8610E894 */ lh $s0, %lo(D_8012E894)($s0)
|
||||
/* 0AB490 80122A20 AFBF001C */ sw $ra, 0x1c($sp)
|
||||
/* 0AB494 80122A24 00803825 */ move $a3, $a0
|
||||
/* 0AB498 80122A28 1A00000B */ blez $s0, .L80122A58_ovl2
|
||||
/* 0AB49C 80122A2C 2A010005 */ slti $at, $s0, 5
|
||||
/* 0AB4A0 80122A30 10200009 */ beqz $at, .L80122A58_ovl2
|
||||
/* 0AB4A4 80122A34 00002025 */ move $a0, $zero
|
||||
/* 0AB4A8 80122A38 00107080 */ sll $t6, $s0, 2
|
||||
/* 0AB4AC 80122A3C 3C068013 */ lui $a2, %hi(D_80128420)
|
||||
/* 0AB4B0 80122A40 00CE3021 */ addu $a2, $a2, $t6
|
||||
/* 0AB4B4 80122A44 8CC68420 */ lw $a2, %lo(D_80128420)($a2)
|
||||
/* 0AB4B8 80122A48 0C02A040 */ jal func_800A8100
|
||||
/* 0AB4BC 80122A4C 24050001 */ li $a1, 1
|
||||
/* 0AB4C0 80122A50 10000007 */ b .L80122A70_ovl2
|
||||
/* 0AB4C4 80122A54 8FBF001C */ lw $ra, 0x1c($sp)
|
||||
.L80122A58_ovl2:
|
||||
/* 0AB4C8 80122A58 3C048013 */ lui $a0, %hi(D_80128DC0) # $a0, 0x8013
|
||||
/* 0AB4CC 80122A5C 24848DC0 */ addiu $a0, %lo(D_80128DC0) # addiu $a0, $a0, -0x7240
|
||||
/* 0AB4D0 80122A60 24050005 */ li $a1, 5
|
||||
/* 0AB4D4 80122A64 0C02909C */ jal print_error_stub
|
||||
/* 0AB4D8 80122A68 02003025 */ move $a2, $s0
|
||||
/* 0AB4DC 80122A6C 8FBF001C */ lw $ra, 0x1c($sp)
|
||||
.L80122A70_ovl2:
|
||||
/* 0AB4E0 80122A70 8FB00018 */ lw $s0, 0x18($sp)
|
||||
/* 0AB4E4 80122A74 27BD0020 */ addiu $sp, $sp, 0x20
|
||||
/* 0AB4E8 80122A78 03E00008 */ jr $ra
|
||||
/* 0AB4EC 80122A7C 00000000 */ nop
|
||||
10364
asm/ovl1/ovl1_7.s
10364
asm/ovl1/ovl1_7.s
File diff suppressed because it is too large
Load Diff
@ -937,47 +937,13 @@ glabel D_80128DB8
|
||||
glabel D_80128DBC
|
||||
.word 0x780A0000
|
||||
|
||||
|
||||
# new file?
|
||||
|
||||
|
||||
.balign 4
|
||||
glabel D_80128DC0
|
||||
.word 0x706C7964
|
||||
|
||||
glabel D_80128DC4
|
||||
.word 0x6D672070
|
||||
|
||||
glabel D_80128DC8
|
||||
.word 0x74636C20
|
||||
|
||||
glabel D_80128DCC
|
||||
.word 0x6B696E64
|
||||
|
||||
glabel D_80128DD0
|
||||
.word 0x206F7665
|
||||
|
||||
glabel D_80128DD4
|
||||
.word 0x72215B70
|
||||
|
||||
glabel D_80128DD8
|
||||
.word 0x6C796C69
|
||||
|
||||
glabel D_80128DDC
|
||||
.word 0x622E6363
|
||||
|
||||
glabel D_80128DE0
|
||||
.word 0x5D206D61
|
||||
|
||||
glabel D_80128DE4
|
||||
.word 0x783A2025
|
||||
|
||||
glabel D_80128DE8
|
||||
.word 0x782C206B
|
||||
|
||||
glabel D_80128DEC
|
||||
.word 0x696E643A
|
||||
|
||||
glabel D_80128DF0
|
||||
.word 0x2025780A
|
||||
|
||||
glabel D_80128DF4
|
||||
.word 0x00000000
|
||||
.asciiz "plydmg ptcl kind over![plylib.cc] max: %x, kind: %x\n"
|
||||
|
||||
glabel D_80128DF8
|
||||
.word 0x8011C778
|
||||
|
||||
@ -95,6 +95,15 @@ typedef struct Controller_800D6FE8 {
|
||||
s8 stickY;
|
||||
} Controller_800D6FE8;
|
||||
|
||||
struct KirbyState_114 {
|
||||
u32 unk0;
|
||||
u32 unk4;
|
||||
u32 unk8;
|
||||
u32 unkC;
|
||||
u16 unk10;
|
||||
u16 unk12;
|
||||
};
|
||||
|
||||
// 0x8012E7C0
|
||||
// TODO: populate with actual values
|
||||
struct KirbyState {
|
||||
@ -202,7 +211,8 @@ struct KirbyState {
|
||||
u16 unk10A;
|
||||
u32 unk10C;
|
||||
u32 unk110;
|
||||
u32 unk114;
|
||||
// todo: verify this
|
||||
struct KirbyState_114 *unk114;
|
||||
u32 unk118;
|
||||
u32 unk11C;
|
||||
u32 unk120;
|
||||
|
||||
@ -40,10 +40,10 @@ void init_dynamic_buffer(struct DynamicBuffer *tracker, u32 id, void *start, u32
|
||||
}
|
||||
|
||||
extern u32 D_8004A504;
|
||||
#include <PR/gbi.h>
|
||||
|
||||
// takes a u32 color and either returns it
|
||||
// or packs it into an rgba16 value that gDPSetFillColor can use
|
||||
#include <PR/gbi.h>
|
||||
u32 func_800078F0(u32 color) {
|
||||
// Is this a GPACK_RGBA5551?
|
||||
u32 temp_v0 = ((((color >> 0x10) & 0xF800) | ((color >> 0xD) & 0x7C0)) | ((color >> 0xA) & 0x3E)) | ((color >> 7) & 1);
|
||||
|
||||
@ -159,12 +159,8 @@ block_5:
|
||||
} else {
|
||||
goto block_5;
|
||||
}
|
||||
temp_f0_2 = atan2f(phi_f12, (*gEntitiesPosYArray + 20.0f) - gEntitiesPosYArray[temp_v0]);
|
||||
if (temp_f0_2 < 0.0f) {
|
||||
phi_f2 = -temp_f0_2;
|
||||
} else {
|
||||
phi_f2 = temp_f0_2;
|
||||
}
|
||||
temp_f0_2 = atan2f(phi_f12, (gEntitiesPosYArray[0] + 20.0f) - gEntitiesPosYArray[temp_v0]);
|
||||
phi_f2 = ABSF(temp_f0_2);
|
||||
temp_f14 = D_801F4A50_ovl10;
|
||||
if (temp_f14 < phi_f2) {
|
||||
if (1.0f == D_800E6A10[D_8004A7C4->objId]) {
|
||||
@ -173,11 +169,7 @@ block_5:
|
||||
phi_f12_2 = D_801F4A58_ovl10.unk0;
|
||||
}
|
||||
} else {
|
||||
if (temp_f0_2 < 0.0f) {
|
||||
phi_f2_2 = -temp_f0_2;
|
||||
} else {
|
||||
phi_f2_2 = temp_f0_2;
|
||||
}
|
||||
phi_f2_2 = ABSF(temp_f0_2);
|
||||
temp_f0_3 = D_801F4A58_ovl10.unk4A60;
|
||||
phi_f12_2 = temp_f0_2;
|
||||
if (phi_f2_2 < temp_f0_3) {
|
||||
@ -262,19 +254,16 @@ GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_2/func_801E3748_ovl10.s")
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
void func_801E3770_ovl10(void *arg0) {
|
||||
struct UnkStruct800E1B50 *sp1C;
|
||||
struct UnkStruct8004A7C4 *temp_v0;
|
||||
struct UnkStruct800E1B50 *sp1C = D_800E1B50[D_8004A7C4->objId];
|
||||
|
||||
sp1C = D_800E1B50[D_8004A7C4->objId];
|
||||
if ((func_800B9DF8(2) != 0) && (D_800D6B70 == 0)) {
|
||||
func_8019BB58_ovl10();
|
||||
D_800D6E40 = D_800D6E40 + 1;
|
||||
func_8019D958_ovl10(D_8004A7C4->unk2);
|
||||
D_800D6E40++;
|
||||
func_8019D958_ovl10((u16) D_8004A7C4->unk0);
|
||||
}
|
||||
arg0->unk48 = &D_800B113C;
|
||||
temp_v0 = D_8004A7C4;
|
||||
D_800DEF90[temp_v0->objId] = &D_801DB678;
|
||||
D_800E8920[temp_v0->objId] = 1;
|
||||
D_800DEF90[D_8004A7C4->objId] = &D_801DB678;
|
||||
D_800E8920[D_8004A7C4->objId] = 1;
|
||||
func_800FF0A8(sp1C->unk80);
|
||||
func_800A447C(D_800E7880[D_8004A7C4->objId], 9, &D_801F4400_ovl10);
|
||||
}
|
||||
|
||||
@ -100,17 +100,13 @@ void func_801E4668_ovl17(void *arg0) {
|
||||
sp31 = ((0 * sp29) * 1.0f) + ((sp2D * (1 - 0)) * 1.0f);
|
||||
sp32 = ((0 * sp2A) * 1.0f) + ((sp2E * (1 - 0)) * 1.0f);
|
||||
while (phi_s1 != NULL) {
|
||||
temp_v0 = phi_s1->unk80;
|
||||
phi_v0 = temp_v0;
|
||||
if (temp_v0 != 0) {
|
||||
loop_2:
|
||||
phi_v0 = phi_s1->unk80;
|
||||
while (phi_v0 != 0) {
|
||||
// struct copy
|
||||
phi_v0->unk58 = (unaligned s32) *temp_s0;
|
||||
phi_v0->unk60 = (unaligned s32) *temp_s0;
|
||||
temp_v0_2 = phi_v0->unk0;
|
||||
phi_v0 = temp_v0_2;
|
||||
if (temp_v0_2 != 0) {
|
||||
goto loop_2;
|
||||
}
|
||||
|
||||
phi_v0 = phi_v0->unk0;
|
||||
}
|
||||
phi_s1 = func_8000BE90(phi_s1);
|
||||
}
|
||||
|
||||
1091
src/ovl2/ovl2_8.c
1091
src/ovl2/ovl2_8.c
File diff suppressed because it is too large
Load Diff
@ -11,7 +11,7 @@
|
||||
void *temp_v1;
|
||||
s32 phi_a1;
|
||||
|
||||
temp_a2 = arg2 & 0xFF;
|
||||
temp_a2 = arg2 & 0xFF;func_8011BF4C
|
||||
if (temp_a2 >= 0x11) {
|
||||
print_error_stub(arg3, &D_80196E10, 0x10, temp_a2, temp_a2);
|
||||
return 0;
|
||||
|
||||
5
tools/temp_tools/ugh.py
Normal file
5
tools/temp_tools/ugh.py
Normal file
@ -0,0 +1,5 @@
|
||||
import sys, os
|
||||
with open(sys.argv[1]) as f:
|
||||
for line in f:
|
||||
tok = line.split()
|
||||
os.system("./rename_sym.sh "+tok[0]+" "+tok[1])
|
||||
7
tools/temp_tools/ugh.txt
Normal file
7
tools/temp_tools/ugh.txt
Normal file
@ -0,0 +1,7 @@
|
||||
D_800E25D0 gEntitiesPosXArray
|
||||
D_800E2790 gEntitiesPosYArray
|
||||
D_800E2950 gEntitiesPosZArray
|
||||
D_800E4010 gEntitiesAngleXArray
|
||||
D_800E41D0 gEntitiesAngleYArray
|
||||
D_800E4390 gEntitiesAngleZArray
|
||||
D_800DF4D0 gSegment4StartArray
|
||||
Loading…
Reference in New Issue
Block a user