diff --git a/asm/code_800D31A0.s b/asm/code_800D31A0.s deleted file mode 100644 index 6828f4d684..0000000000 --- a/asm/code_800D31A0.s +++ /dev/null @@ -1,48 +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_800D31A0 -/* B4A340 800D31A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4A344 800D31A4 AFBF0014 */ sw $ra, 0x14($sp) -/* B4A348 800D31A8 3C048014 */ lui $a0, %hi(D_80146670) # $a0, 0x8014 -/* B4A34C 800D31AC 0C00084C */ jal osSyncPrintf -/* B4A350 800D31B0 24846670 */ addiu $a0, %lo(D_80146670) # addiu $a0, $a0, 0x6670 -.L800D31B4: -/* B4A354 800D31B4 0C03FD2B */ jal func_800FF4AC -/* B4A358 800D31B8 240403E8 */ li $a0, 1000 -/* B4A35C 800D31BC 1000FFFD */ b .L800D31B4 -/* B4A360 800D31C0 00000000 */ nop -/* B4A364 800D31C4 00000000 */ nop -/* B4A368 800D31C8 00000000 */ nop -/* B4A36C 800D31CC 00000000 */ nop -/* B4A370 800D31D0 00000000 */ nop -/* B4A374 800D31D4 00000000 */ nop -/* B4A378 800D31D8 00000000 */ nop -/* B4A37C 800D31DC 00000000 */ nop -/* B4A380 800D31E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B4A384 800D31E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B4A388 800D31E8 03E00008 */ jr $ra -/* B4A38C 800D31EC 00000000 */ nop - -glabel func_800D31F0 -/* B4A390 800D31F0 3C0E8016 */ lui $t6, %hi(gPadMgr) # $t6, 0x8016 -/* B4A394 800D31F4 25CE68C0 */ addiu $t6, %lo(gPadMgr) # addiu $t6, $t6, 0x68c0 -/* B4A398 800D31F8 91CF02A8 */ lbu $t7, 0x2a8($t6) -/* B4A39C 800D31FC 3C018013 */ lui $at, %hi(D_8012DBC0) -/* B4A3A0 800D3200 31F80002 */ andi $t8, $t7, 2 -/* B4A3A4 800D3204 0018C82B */ sltu $t9, $zero, $t8 -/* B4A3A8 800D3208 03E00008 */ jr $ra -/* B4A3AC 800D320C AC39DBC0 */ sw $t9, %lo(D_8012DBC0)($at) - -glabel func_800D3210 -/* B4A3B0 800D3210 3C018013 */ lui $at, %hi(D_8012DBC0) -/* B4A3B4 800D3214 03E00008 */ jr $ra -/* B4A3B8 800D3218 AC20DBC0 */ sw $zero, %lo(D_8012DBC0)($at) diff --git a/asm/non_matchings/code/z_camera/func_800588B4.s b/asm/non_matchings/code/z_camera/func_800588B4.s index 75de2174e2..02066ad4f7 100644 --- a/asm/non_matchings/code/z_camera/func_800588B4.s +++ b/asm/non_matchings/code/z_camera/func_800588B4.s @@ -213,7 +213,7 @@ glabel func_800588B4 /* ACFD30 80058B90 856C02F6 */ lh $t4, 0x2f6($t3) /* ACFD34 80058B94 5180000A */ beql $t4, $zero, .L80058BC0 /* ACFD38 80058B98 8FB9002C */ lw $t9, 0x2c($sp) -/* ACFD3C 80058B9C 0C024BEB */ jal func_80092FAC +/* ACFD3C 80058B9C 0C024BEB */ jal Quake_RemoveFromIdx /* ACFD40 80058BA0 85A40000 */ lh $a0, ($t5) /* ACFD44 80058BA4 8FAF002C */ lw $t7, 0x2c($sp) /* ACFD48 80058BA8 240EFFFF */ li $t6, -1 @@ -227,31 +227,31 @@ glabel func_800588B4 /* ACFD64 80058BC4 87240000 */ lh $a0, ($t9) /* ACFD68 80058BC8 50810006 */ beql $a0, $at, .L80058BE4 /* ACFD6C 80058BCC 02002025 */ move $a0, $s0 -/* ACFD70 80058BD0 0C024B8F */ jal func_80092E3C +/* ACFD70 80058BD0 0C024B8F */ jal Quake_GetCountdown /* ACFD74 80058BD4 00000000 */ nop /* ACFD78 80058BD8 2401000A */ li $at, 10 /* ACFD7C 80058BDC 14410015 */ bne $v0, $at, .L80058C34 /* ACFD80 80058BE0 02002025 */ move $a0, $s0 .L80058BE4: -/* ACFD84 80058BE4 0C024BE2 */ jal func_80092F88 +/* ACFD84 80058BE4 0C024BE2 */ jal Quake_Add /* ACFD88 80058BE8 24050005 */ li $a1, 5 /* ACFD8C 80058BEC 8FA8002C */ lw $t0, 0x2c($sp) /* ACFD90 80058BF0 10400010 */ beqz $v0, .L80058C34 /* ACFD94 80058BF4 A5020000 */ sh $v0, ($t0) /* ACFD98 80058BF8 8FA9002C */ lw $t1, 0x2c($sp) /* ACFD9C 80058BFC 24050226 */ li $a1, 550 -/* ACFDA0 80058C00 0C024B6B */ jal func_80092DAC +/* ACFDA0 80058C00 0C024B6B */ jal Quake_SetSpeed /* ACFDA4 80058C04 85240000 */ lh $a0, ($t1) /* ACFDA8 80058C08 8FAA002C */ lw $t2, 0x2c($sp) /* ACFDAC 80058C0C 24050001 */ li $a1, 1 /* ACFDB0 80058C10 24060001 */ li $a2, 1 /* ACFDB4 80058C14 85440000 */ lh $a0, ($t2) /* ACFDB8 80058C18 AFA00010 */ sw $zero, 0x10($sp) -/* ACFDBC 80058C1C 0C024B9C */ jal func_80092E70 +/* ACFDBC 80058C1C 0C024B9C */ jal Quake_SetQuakeValues /* ACFDC0 80058C20 240700B4 */ li $a3, 180 /* ACFDC4 80058C24 8FAB002C */ lw $t3, 0x2c($sp) /* ACFDC8 80058C28 240503E8 */ li $a1, 1000 -/* ACFDCC 80058C2C 0C024B7C */ jal func_80092DF0 +/* ACFDCC 80058C2C 0C024B7C */ jal Quake_SetCountdown /* ACFDD0 80058C30 85640000 */ lh $a0, ($t3) .L80058C34: /* ACFDD4 80058C34 86020150 */ lh $v0, 0x150($s0) @@ -295,7 +295,7 @@ glabel func_800588B4 /* ACFE60 80058CC0 85C40000 */ lh $a0, ($t6) /* ACFE64 80058CC4 50800004 */ beql $a0, $zero, .L80058CD8 /* ACFE68 80058CC8 A6000150 */ sh $zero, 0x150($s0) -/* ACFE6C 80058CCC 0C024BEB */ jal func_80092FAC +/* ACFE6C 80058CCC 0C024BEB */ jal Quake_RemoveFromIdx /* ACFE70 80058CD0 00000000 */ nop /* ACFE74 80058CD4 A6000150 */ sh $zero, 0x150($s0) .L80058CD8: diff --git a/asm/non_matchings/code/z_camera/func_800591EC.s b/asm/non_matchings/code/z_camera/func_800591EC.s index 8028c89968..53c215eadf 100644 --- a/asm/non_matchings/code/z_camera/func_800591EC.s +++ b/asm/non_matchings/code/z_camera/func_800591EC.s @@ -626,7 +626,7 @@ glabel func_800591EC /* AD0BB8 80059A18 10000126 */ b .L80059EB4 /* AD0BBC 80059A1C 8FA200E0 */ lw $v0, 0xe0($sp) .L80059A20: -/* AD0BC0 80059A20 0C024BFC */ jal func_80092FF0 +/* AD0BC0 80059A20 0C024BFC */ jal Quake_Calc /* AD0BC4 80059A24 27A5005C */ addiu $a1, $sp, 0x5c /* AD0BC8 80059A28 10400038 */ beqz $v0, .L80059B0C /* AD0BCC 80059A2C AFA200A8 */ sw $v0, 0xa8($sp) diff --git a/asm/non_matchings/code/z_camera/func_8005AA1C.s b/asm/non_matchings/code/z_camera/func_8005AA1C.s index 84ba5ca39f..ff26772c11 100644 --- a/asm/non_matchings/code/z_camera/func_8005AA1C.s +++ b/asm/non_matchings/code/z_camera/func_8005AA1C.s @@ -4,7 +4,7 @@ glabel func_8005AA1C /* AD1BC4 8005AA24 AFA5002C */ sw $a1, 0x2c($sp) /* AD1BC8 8005AA28 AFA60030 */ sw $a2, 0x30($sp) /* AD1BCC 8005AA2C AFA70034 */ sw $a3, 0x34($sp) -/* AD1BD0 8005AA30 0C024BE2 */ jal func_80092F88 +/* AD1BD0 8005AA30 0C024BE2 */ jal Quake_Add /* AD1BD4 8005AA34 24050003 */ li $a1, 3 /* AD1BD8 8005AA38 00022400 */ sll $a0, $v0, 0x10 /* AD1BDC 8005AA3C 14400003 */ bnez $v0, .L8005AA4C @@ -13,16 +13,16 @@ glabel func_8005AA1C /* AD1BE8 8005AA48 00001025 */ move $v0, $zero .L8005AA4C: /* AD1BEC 8005AA4C 240561A8 */ li $a1, 25000 -/* AD1BF0 8005AA50 0C024B6B */ jal func_80092DAC +/* AD1BF0 8005AA50 0C024B6B */ jal Quake_SetSpeed /* AD1BF4 8005AA54 A7A40026 */ sh $a0, 0x26($sp) /* AD1BF8 8005AA58 87A40026 */ lh $a0, 0x26($sp) /* AD1BFC 8005AA5C 87A50032 */ lh $a1, 0x32($sp) /* AD1C00 8005AA60 00003025 */ move $a2, $zero /* AD1C04 8005AA64 00003825 */ move $a3, $zero -/* AD1C08 8005AA68 0C024B9C */ jal func_80092E70 +/* AD1C08 8005AA68 0C024B9C */ jal Quake_SetQuakeValues /* AD1C0C 8005AA6C AFA00010 */ sw $zero, 0x10($sp) /* AD1C10 8005AA70 87A40026 */ lh $a0, 0x26($sp) -/* AD1C14 8005AA74 0C024B7C */ jal func_80092DF0 +/* AD1C14 8005AA74 0C024B7C */ jal Quake_SetCountdown /* AD1C18 8005AA78 87A50036 */ lh $a1, 0x36($sp) /* AD1C1C 8005AA7C 24020001 */ li $v0, 1 .L8005AA80: diff --git a/asm/non_matchings/code/z_demo/func_80064824.s b/asm/non_matchings/code/z_demo/func_80064824.s index 98859be542..87f7f684b4 100644 --- a/asm/non_matchings/code/z_demo/func_80064824.s +++ b/asm/non_matchings/code/z_demo/func_80064824.s @@ -276,22 +276,22 @@ glabel L80064B78 /* ADBD24 80064B84 24050006 */ li $a1, 6 /* ADBD28 80064B88 000B6080 */ sll $t4, $t3, 2 /* ADBD2C 80064B8C 020C6821 */ addu $t5, $s0, $t4 -/* ADBD30 80064B90 0C024BE2 */ jal func_80092F88 +/* ADBD30 80064B90 0C024BE2 */ jal Quake_Add /* ADBD34 80064B94 8DA40790 */ lw $a0, 0x790($t5) /* ADBD38 80064B98 3C108016 */ lui $s0, %hi(D_8015FCCA) # $s0, 0x8016 /* ADBD3C 80064B9C 2610FCCA */ addiu $s0, %lo(D_8015FCCA) # addiu $s0, $s0, -0x336 /* ADBD40 80064BA0 A6020000 */ sh $v0, ($s0) /* ADBD44 80064BA4 86040000 */ lh $a0, ($s0) -/* ADBD48 80064BA8 0C024B6B */ jal func_80092DAC +/* ADBD48 80064BA8 0C024B6B */ jal Quake_SetSpeed /* ADBD4C 80064BAC 24057FFF */ li $a1, 32767 /* ADBD50 80064BB0 86040000 */ lh $a0, ($s0) /* ADBD54 80064BB4 24050004 */ li $a1, 4 /* ADBD58 80064BB8 00003025 */ move $a2, $zero /* ADBD5C 80064BBC 240703E8 */ li $a3, 1000 -/* ADBD60 80064BC0 0C024B9C */ jal func_80092E70 +/* ADBD60 80064BC0 0C024B9C */ jal Quake_SetQuakeValues /* ADBD64 80064BC4 AFA00010 */ sw $zero, 0x10($sp) /* ADBD68 80064BC8 86040000 */ lh $a0, ($s0) -/* ADBD6C 80064BCC 0C024B7C */ jal func_80092DF0 +/* ADBD6C 80064BCC 0C024B7C */ jal Quake_SetCountdown /* ADBD70 80064BD0 24050320 */ li $a1, 800 /* ADBD74 80064BD4 100000F4 */ b .L80064FA8 /* ADBD78 80064BD8 8FBF002C */ lw $ra, 0x2c($sp) @@ -299,7 +299,7 @@ glabel L80064BDC /* ADBD7C 80064BDC 104000F1 */ beqz $v0, .L80064FA4 /* ADBD80 80064BE0 3C108016 */ lui $s0, %hi(D_8015FCCA) # $s0, 0x8016 /* ADBD84 80064BE4 2610FCCA */ addiu $s0, %lo(D_8015FCCA) # addiu $s0, $s0, -0x336 -/* ADBD88 80064BE8 0C024BEB */ jal func_80092FAC +/* ADBD88 80064BE8 0C024BEB */ jal Quake_RemoveFromIdx /* ADBD8C 80064BEC 86040000 */ lh $a0, ($s0) /* ADBD90 80064BF0 100000ED */ b .L80064FA8 /* ADBD94 80064BF4 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/code/z_onepointdemo/func_8007C850.s b/asm/non_matchings/code/z_onepointdemo/func_8007C850.s index 66a257bf2e..34b5097e30 100644 --- a/asm/non_matchings/code/z_onepointdemo/func_8007C850.s +++ b/asm/non_matchings/code/z_onepointdemo/func_8007C850.s @@ -1180,12 +1180,12 @@ glabel func_8007C850 /* AF4260 8007D0C0 0C030202 */ jal func_800C0808 /* AF4264 8007D0C4 2407003C */ li $a3, 60 /* AF4268 8007D0C8 02602025 */ move $a0, $s3 -/* AF426C 8007D0CC 0C024BE2 */ jal func_80092F88 +/* AF426C 8007D0CC 0C024BE2 */ jal Quake_Add /* AF4270 8007D0D0 24050005 */ li $a1, 5 /* AF4274 8007D0D4 00022400 */ sll $a0, $v0, 0x10 /* AF4278 8007D0D8 00408825 */ move $s1, $v0 /* AF427C 8007D0DC 00042403 */ sra $a0, $a0, 0x10 -/* AF4280 8007D0E0 0C024B6B */ jal func_80092DAC +/* AF4280 8007D0E0 0C024B6B */ jal Quake_SetSpeed /* AF4284 8007D0E4 24050190 */ li $a1, 400 /* AF4288 8007D0E8 00118400 */ sll $s0, $s1, 0x10 /* AF428C 8007D0EC 00108403 */ sra $s0, $s0, 0x10 @@ -1195,11 +1195,11 @@ glabel func_8007C850 /* AF429C 8007D0FC 00042403 */ sra $a0, $a0, 0x10 /* AF42A0 8007D100 24050004 */ li $a1, 4 /* AF42A4 8007D104 24060005 */ li $a2, 5 -/* AF42A8 8007D108 0C024B9C */ jal func_80092E70 +/* AF42A8 8007D108 0C024B9C */ jal Quake_SetQuakeValues /* AF42AC 8007D10C 24070028 */ li $a3, 40 /* AF42B0 8007D110 00102400 */ sll $a0, $s0, 0x10 /* AF42B4 8007D114 00042403 */ sra $a0, $a0, 0x10 -/* AF42B8 8007D118 0C024B7C */ jal func_80092DF0 +/* AF42B8 8007D118 0C024B7C */ jal Quake_SetCountdown /* AF42BC 8007D11C 24050640 */ li $a1, 1600 /* AF42C0 8007D120 10000BA6 */ b .L8007FFBC /* AF42C4 8007D124 8FBF0044 */ lw $ra, 0x44($sp) @@ -1288,12 +1288,12 @@ glabel func_8007C850 /* AF43FC 8007D25C 0C030202 */ jal func_800C0808 /* AF4400 8007D260 2407003C */ li $a3, 60 /* AF4404 8007D264 02602025 */ move $a0, $s3 -/* AF4408 8007D268 0C024BE2 */ jal func_80092F88 +/* AF4408 8007D268 0C024BE2 */ jal Quake_Add /* AF440C 8007D26C 24050005 */ li $a1, 5 /* AF4410 8007D270 00022400 */ sll $a0, $v0, 0x10 /* AF4414 8007D274 00408825 */ move $s1, $v0 /* AF4418 8007D278 00042403 */ sra $a0, $a0, 0x10 -/* AF441C 8007D27C 0C024B6B */ jal func_80092DAC +/* AF441C 8007D27C 0C024B6B */ jal Quake_SetSpeed /* AF4420 8007D280 24050190 */ li $a1, 400 /* AF4424 8007D284 00118400 */ sll $s0, $s1, 0x10 /* AF4428 8007D288 00108403 */ sra $s0, $s0, 0x10 @@ -1303,11 +1303,11 @@ glabel func_8007C850 /* AF4438 8007D298 00042403 */ sra $a0, $a0, 0x10 /* AF443C 8007D29C 24050002 */ li $a1, 2 /* AF4440 8007D2A0 24060003 */ li $a2, 3 -/* AF4444 8007D2A4 0C024B9C */ jal func_80092E70 +/* AF4444 8007D2A4 0C024B9C */ jal Quake_SetQuakeValues /* AF4448 8007D2A8 240700C8 */ li $a3, 200 /* AF444C 8007D2AC 00102400 */ sll $a0, $s0, 0x10 /* AF4450 8007D2B0 00042403 */ sra $a0, $a0, 0x10 -/* AF4454 8007D2B4 0C024B7C */ jal func_80092DF0 +/* AF4454 8007D2B4 0C024B7C */ jal Quake_SetCountdown /* AF4458 8007D2B8 2405270F */ li $a1, 9999 /* AF445C 8007D2BC 10000B3F */ b .L8007FFBC /* AF4460 8007D2C0 8FBF0044 */ lw $ra, 0x44($sp) @@ -1324,12 +1324,12 @@ glabel func_8007C850 /* AF4488 8007D2E8 0C030202 */ jal func_800C0808 /* AF448C 8007D2EC 2407003C */ li $a3, 60 /* AF4490 8007D2F0 02602025 */ move $a0, $s3 -/* AF4494 8007D2F4 0C024BE2 */ jal func_80092F88 +/* AF4494 8007D2F4 0C024BE2 */ jal Quake_Add /* AF4498 8007D2F8 24050005 */ li $a1, 5 /* AF449C 8007D2FC 00022400 */ sll $a0, $v0, 0x10 /* AF44A0 8007D300 00408825 */ move $s1, $v0 /* AF44A4 8007D304 00042403 */ sra $a0, $a0, 0x10 -/* AF44A8 8007D308 0C024B6B */ jal func_80092DAC +/* AF44A8 8007D308 0C024B6B */ jal Quake_SetSpeed /* AF44AC 8007D30C 24050190 */ li $a1, 400 /* AF44B0 8007D310 00118400 */ sll $s0, $s1, 0x10 /* AF44B4 8007D314 00108403 */ sra $s0, $s0, 0x10 @@ -1338,11 +1338,11 @@ glabel func_8007C850 /* AF44C0 8007D320 24050002 */ li $a1, 2 /* AF44C4 8007D324 24060002 */ li $a2, 2 /* AF44C8 8007D328 24070032 */ li $a3, 50 -/* AF44CC 8007D32C 0C024B9C */ jal func_80092E70 +/* AF44CC 8007D32C 0C024B9C */ jal Quake_SetQuakeValues /* AF44D0 8007D330 AFA00010 */ sw $zero, 0x10($sp) /* AF44D4 8007D334 00102400 */ sll $a0, $s0, 0x10 /* AF44D8 8007D338 00042403 */ sra $a0, $a0, 0x10 -/* AF44DC 8007D33C 0C024B7C */ jal func_80092DF0 +/* AF44DC 8007D33C 0C024B7C */ jal Quake_SetCountdown /* AF44E0 8007D340 24050118 */ li $a1, 280 /* AF44E4 8007D344 10000B1D */ b .L8007FFBC /* AF44E8 8007D348 8FBF0044 */ lw $ra, 0x44($sp) @@ -1388,12 +1388,12 @@ glabel func_8007C850 /* AF457C 8007D3DC 0C030202 */ jal func_800C0808 /* AF4580 8007D3E0 2407003C */ li $a3, 60 /* AF4584 8007D3E4 02602025 */ move $a0, $s3 -/* AF4588 8007D3E8 0C024BE2 */ jal func_80092F88 +/* AF4588 8007D3E8 0C024BE2 */ jal Quake_Add /* AF458C 8007D3EC 24050005 */ li $a1, 5 /* AF4590 8007D3F0 00022400 */ sll $a0, $v0, 0x10 /* AF4594 8007D3F4 00408825 */ move $s1, $v0 /* AF4598 8007D3F8 00042403 */ sra $a0, $a0, 0x10 -/* AF459C 8007D3FC 0C024B6B */ jal func_80092DAC +/* AF459C 8007D3FC 0C024B6B */ jal Quake_SetSpeed /* AF45A0 8007D400 24050190 */ li $a1, 400 /* AF45A4 8007D404 00118400 */ sll $s0, $s1, 0x10 /* AF45A8 8007D408 00108403 */ sra $s0, $s0, 0x10 @@ -1402,11 +1402,11 @@ glabel func_8007C850 /* AF45B4 8007D414 24050002 */ li $a1, 2 /* AF45B8 8007D418 24060002 */ li $a2, 2 /* AF45BC 8007D41C 24070032 */ li $a3, 50 -/* AF45C0 8007D420 0C024B9C */ jal func_80092E70 +/* AF45C0 8007D420 0C024B9C */ jal Quake_SetQuakeValues /* AF45C4 8007D424 AFA00010 */ sw $zero, 0x10($sp) /* AF45C8 8007D428 00102400 */ sll $a0, $s0, 0x10 /* AF45CC 8007D42C 00042403 */ sra $a0, $a0, 0x10 -/* AF45D0 8007D430 0C024B7C */ jal func_80092DF0 +/* AF45D0 8007D430 0C024B7C */ jal Quake_SetCountdown /* AF45D4 8007D434 2405003C */ li $a1, 60 /* AF45D8 8007D438 10000AE0 */ b .L8007FFBC /* AF45DC 8007D43C 8FBF0044 */ lw $ra, 0x44($sp) @@ -2002,12 +2002,12 @@ glabel L8007DCF8 /* AF4EBC 8007DD1C 0C030202 */ jal func_800C0808 /* AF4EC0 8007DD20 2407003C */ li $a3, 60 /* AF4EC4 8007DD24 02602025 */ move $a0, $s3 -/* AF4EC8 8007DD28 0C024BE2 */ jal func_80092F88 +/* AF4EC8 8007DD28 0C024BE2 */ jal Quake_Add /* AF4ECC 8007DD2C 24050003 */ li $a1, 3 /* AF4ED0 8007DD30 00022400 */ sll $a0, $v0, 0x10 /* AF4ED4 8007DD34 00408825 */ move $s1, $v0 /* AF4ED8 8007DD38 00042403 */ sra $a0, $a0, 0x10 -/* AF4EDC 8007DD3C 0C024B6B */ jal func_80092DAC +/* AF4EDC 8007DD3C 0C024B6B */ jal Quake_SetSpeed /* AF4EE0 8007DD40 240555F0 */ li $a1, 22000 /* AF4EE4 8007DD44 00118400 */ sll $s0, $s1, 0x10 /* AF4EE8 8007DD48 00108403 */ sra $s0, $s0, 0x10 @@ -2016,11 +2016,11 @@ glabel L8007DCF8 /* AF4EF4 8007DD54 24050002 */ li $a1, 2 /* AF4EF8 8007DD58 00003025 */ move $a2, $zero /* AF4EFC 8007DD5C 240700C8 */ li $a3, 200 -/* AF4F00 8007DD60 0C024B9C */ jal func_80092E70 +/* AF4F00 8007DD60 0C024B9C */ jal Quake_SetQuakeValues /* AF4F04 8007DD64 AFA00010 */ sw $zero, 0x10($sp) /* AF4F08 8007DD68 00102400 */ sll $a0, $s0, 0x10 /* AF4F0C 8007DD6C 00042403 */ sra $a0, $a0, 0x10 -/* AF4F10 8007DD70 0C024B7C */ jal func_80092DF0 +/* AF4F10 8007DD70 0C024B7C */ jal Quake_SetCountdown /* AF4F14 8007DD74 2405000A */ li $a1, 10 /* AF4F18 8007DD78 10000890 */ b .L8007FFBC /* AF4F1C 8007DD7C 8FBF0044 */ lw $ra, 0x44($sp) @@ -2115,12 +2115,12 @@ glabel L8007DE9C /* AF5070 8007DED0 0C030202 */ jal func_800C0808 /* AF5074 8007DED4 2407003C */ li $a3, 60 /* AF5078 8007DED8 02602025 */ move $a0, $s3 -/* AF507C 8007DEDC 0C024BE2 */ jal func_80092F88 +/* AF507C 8007DEDC 0C024BE2 */ jal Quake_Add /* AF5080 8007DEE0 24050001 */ li $a1, 1 /* AF5084 8007DEE4 00022400 */ sll $a0, $v0, 0x10 /* AF5088 8007DEE8 00408825 */ move $s1, $v0 /* AF508C 8007DEEC 00042403 */ sra $a0, $a0, 0x10 -/* AF5090 8007DEF0 0C024B6B */ jal func_80092DAC +/* AF5090 8007DEF0 0C024B6B */ jal Quake_SetSpeed /* AF5094 8007DEF4 24055DC0 */ li $a1, 24000 /* AF5098 8007DEF8 00118400 */ sll $s0, $s1, 0x10 /* AF509C 8007DEFC 00108403 */ sra $s0, $s0, 0x10 @@ -2129,11 +2129,11 @@ glabel L8007DE9C /* AF50A8 8007DF08 24050002 */ li $a1, 2 /* AF50AC 8007DF0C 00003025 */ move $a2, $zero /* AF50B0 8007DF10 00003825 */ move $a3, $zero -/* AF50B4 8007DF14 0C024B9C */ jal func_80092E70 +/* AF50B4 8007DF14 0C024B9C */ jal Quake_SetQuakeValues /* AF50B8 8007DF18 AFA00010 */ sw $zero, 0x10($sp) /* AF50BC 8007DF1C 00102400 */ sll $a0, $s0, 0x10 /* AF50C0 8007DF20 00042403 */ sra $a0, $a0, 0x10 -/* AF50C4 8007DF24 0C024B7C */ jal func_80092DF0 +/* AF50C4 8007DF24 0C024B7C */ jal Quake_SetCountdown /* AF50C8 8007DF28 240500A0 */ li $a1, 160 /* AF50CC 8007DF2C 10000823 */ b .L8007FFBC /* AF50D0 8007DF30 8FBF0044 */ lw $ra, 0x44($sp) @@ -2263,12 +2263,12 @@ glabel L8007DF78 /* AF52A4 8007E104 00017043 */ sra $t6, $at, 1 .L8007E108: /* AF52A8 8007E108 018E7821 */ addu $t7, $t4, $t6 -/* AF52AC 8007E10C 0C024BE2 */ jal func_80092F88 +/* AF52AC 8007E10C 0C024BE2 */ jal Quake_Add /* AF52B0 8007E110 A46FFFDC */ sh $t7, -0x24($v1) /* AF52B4 8007E114 00022400 */ sll $a0, $v0, 0x10 /* AF52B8 8007E118 00408825 */ move $s1, $v0 /* AF52BC 8007E11C 00042403 */ sra $a0, $a0, 0x10 -/* AF52C0 8007E120 0C024B6B */ jal func_80092DAC +/* AF52C0 8007E120 0C024B6B */ jal Quake_SetSpeed /* AF52C4 8007E124 24057530 */ li $a1, 30000 /* AF52C8 8007E128 00118400 */ sll $s0, $s1, 0x10 /* AF52CC 8007E12C 00108403 */ sra $s0, $s0, 0x10 @@ -2277,11 +2277,11 @@ glabel L8007DF78 /* AF52D8 8007E138 24050002 */ li $a1, 2 /* AF52DC 8007E13C 24060001 */ li $a2, 1 /* AF52E0 8007E140 24070001 */ li $a3, 1 -/* AF52E4 8007E144 0C024B9C */ jal func_80092E70 +/* AF52E4 8007E144 0C024B9C */ jal Quake_SetQuakeValues /* AF52E8 8007E148 AFA00010 */ sw $zero, 0x10($sp) /* AF52EC 8007E14C 00102400 */ sll $a0, $s0, 0x10 /* AF52F0 8007E150 00042403 */ sra $a0, $a0, 0x10 -/* AF52F4 8007E154 0C024B7C */ jal func_80092DF0 +/* AF52F4 8007E154 0C024B7C */ jal Quake_SetCountdown /* AF52F8 8007E158 240500C8 */ li $a1, 200 /* AF52FC 8007E15C 10000797 */ b .L8007FFBC /* AF5300 8007E160 8FBF0044 */ lw $ra, 0x44($sp) @@ -2656,12 +2656,12 @@ glabel L8007E5DC /* AF58A0 8007E700 0C030136 */ jal func_800C04D8 /* AF58A4 8007E704 27A700B4 */ addiu $a3, $sp, 0xb4 /* AF58A8 8007E708 02602025 */ move $a0, $s3 -/* AF58AC 8007E70C 0C024BE2 */ jal func_80092F88 +/* AF58AC 8007E70C 0C024BE2 */ jal Quake_Add /* AF58B0 8007E710 24050003 */ li $a1, 3 /* AF58B4 8007E714 00022400 */ sll $a0, $v0, 0x10 /* AF58B8 8007E718 00408825 */ move $s1, $v0 /* AF58BC 8007E71C 00042403 */ sra $a0, $a0, 0x10 -/* AF58C0 8007E720 0C024B6B */ jal func_80092DAC +/* AF58C0 8007E720 0C024B6B */ jal Quake_SetSpeed /* AF58C4 8007E724 240555F0 */ li $a1, 22000 /* AF58C8 8007E728 00118400 */ sll $s0, $s1, 0x10 /* AF58CC 8007E72C 00108403 */ sra $s0, $s0, 0x10 @@ -2670,11 +2670,11 @@ glabel L8007E5DC /* AF58D8 8007E738 24050001 */ li $a1, 1 /* AF58DC 8007E73C 00003025 */ move $a2, $zero /* AF58E0 8007E740 00003825 */ move $a3, $zero -/* AF58E4 8007E744 0C024B9C */ jal func_80092E70 +/* AF58E4 8007E744 0C024B9C */ jal Quake_SetQuakeValues /* AF58E8 8007E748 AFA00010 */ sw $zero, 0x10($sp) /* AF58EC 8007E74C 00102400 */ sll $a0, $s0, 0x10 /* AF58F0 8007E750 00042403 */ sra $a0, $a0, 0x10 -/* AF58F4 8007E754 0C024B7C */ jal func_80092DF0 +/* AF58F4 8007E754 0C024B7C */ jal Quake_SetCountdown /* AF58F8 8007E758 2405005A */ li $a1, 90 /* AF58FC 8007E75C 10000617 */ b .L8007FFBC /* AF5900 8007E760 8FBF0044 */ lw $ra, 0x44($sp) @@ -2858,12 +2858,12 @@ glabel L8007E914 /* AF5BB4 8007EA14 02602025 */ move $a0, $s3 /* AF5BB8 8007EA18 02602025 */ move $a0, $s3 .L8007EA1C: -/* AF5BBC 8007EA1C 0C024BE2 */ jal func_80092F88 +/* AF5BBC 8007EA1C 0C024BE2 */ jal Quake_Add /* AF5BC0 8007EA20 24050001 */ li $a1, 1 /* AF5BC4 8007EA24 00022400 */ sll $a0, $v0, 0x10 /* AF5BC8 8007EA28 00408825 */ move $s1, $v0 /* AF5BCC 8007EA2C 00042403 */ sra $a0, $a0, 0x10 -/* AF5BD0 8007EA30 0C024B6B */ jal func_80092DAC +/* AF5BD0 8007EA30 0C024B6B */ jal Quake_SetSpeed /* AF5BD4 8007EA34 24057D00 */ li $a1, 32000 /* AF5BD8 8007EA38 00118400 */ sll $s0, $s1, 0x10 /* AF5BDC 8007EA3C 00108403 */ sra $s0, $s0, 0x10 @@ -2872,14 +2872,14 @@ glabel L8007E914 /* AF5BE8 8007EA48 00002825 */ move $a1, $zero /* AF5BEC 8007EA4C 00003025 */ move $a2, $zero /* AF5BF0 8007EA50 24070014 */ li $a3, 20 -/* AF5BF4 8007EA54 0C024B9C */ jal func_80092E70 +/* AF5BF4 8007EA54 0C024B9C */ jal Quake_SetQuakeValues /* AF5BF8 8007EA58 AFA00010 */ sw $zero, 0x10($sp) /* AF5BFC 8007EA5C 86450000 */ lh $a1, ($s2) /* AF5C00 8007EA60 00102400 */ sll $a0, $s0, 0x10 /* AF5C04 8007EA64 00042403 */ sra $a0, $a0, 0x10 /* AF5C08 8007EA68 24A5FFF6 */ addiu $a1, $a1, -0xa /* AF5C0C 8007EA6C 00052C00 */ sll $a1, $a1, 0x10 -/* AF5C10 8007EA70 0C024B7C */ jal func_80092DF0 +/* AF5C10 8007EA70 0C024B7C */ jal Quake_SetCountdown /* AF5C14 8007EA74 00052C03 */ sra $a1, $a1, 0x10 /* AF5C18 8007EA78 10000550 */ b .L8007FFBC /* AF5C1C 8007EA7C 8FBF0044 */ lw $ra, 0x44($sp) @@ -2926,12 +2926,12 @@ glabel L8007EA80 /* AF5CBC 8007EB1C 0C01F1DB */ jal func_8007C76C /* AF5CC0 8007EB20 24840050 */ addiu $a0, $a0, 0x50 /* AF5CC4 8007EB24 02602025 */ move $a0, $s3 -/* AF5CC8 8007EB28 0C024BE2 */ jal func_80092F88 +/* AF5CC8 8007EB28 0C024BE2 */ jal Quake_Add /* AF5CCC 8007EB2C 24050001 */ li $a1, 1 /* AF5CD0 8007EB30 00022400 */ sll $a0, $v0, 0x10 /* AF5CD4 8007EB34 00408825 */ move $s1, $v0 /* AF5CD8 8007EB38 00042403 */ sra $a0, $a0, 0x10 -/* AF5CDC 8007EB3C 0C024B6B */ jal func_80092DAC +/* AF5CDC 8007EB3C 0C024B6B */ jal Quake_SetSpeed /* AF5CE0 8007EB40 24054E20 */ li $a1, 20000 /* AF5CE4 8007EB44 00118400 */ sll $s0, $s1, 0x10 /* AF5CE8 8007EB48 00108403 */ sra $s0, $s0, 0x10 @@ -2940,14 +2940,14 @@ glabel L8007EA80 /* AF5CF4 8007EB54 24050001 */ li $a1, 1 /* AF5CF8 8007EB58 00003025 */ move $a2, $zero /* AF5CFC 8007EB5C 24070032 */ li $a3, 50 -/* AF5D00 8007EB60 0C024B9C */ jal func_80092E70 +/* AF5D00 8007EB60 0C024B9C */ jal Quake_SetQuakeValues /* AF5D04 8007EB64 AFA00010 */ sw $zero, 0x10($sp) /* AF5D08 8007EB68 86850000 */ lh $a1, ($s4) /* AF5D0C 8007EB6C 00102400 */ sll $a0, $s0, 0x10 /* AF5D10 8007EB70 00042403 */ sra $a0, $a0, 0x10 /* AF5D14 8007EB74 24A5FFEC */ addiu $a1, $a1, -0x14 /* AF5D18 8007EB78 00052C00 */ sll $a1, $a1, 0x10 -/* AF5D1C 8007EB7C 0C024B7C */ jal func_80092DF0 +/* AF5D1C 8007EB7C 0C024B7C */ jal Quake_SetCountdown /* AF5D20 8007EB80 00052C03 */ sra $a1, $a1, 0x10 /* AF5D24 8007EB84 1000050D */ b .L8007FFBC /* AF5D28 8007EB88 8FBF0044 */ lw $ra, 0x44($sp) @@ -2990,12 +2990,12 @@ glabel L8007EBE4 /* AF5DB4 8007EC14 0C0301E3 */ jal func_800C078C /* AF5DB8 8007EC18 00003025 */ move $a2, $zero /* AF5DBC 8007EC1C 02602025 */ move $a0, $s3 -/* AF5DC0 8007EC20 0C024BE2 */ jal func_80092F88 +/* AF5DC0 8007EC20 0C024BE2 */ jal Quake_Add /* AF5DC4 8007EC24 24050001 */ li $a1, 1 /* AF5DC8 8007EC28 00022400 */ sll $a0, $v0, 0x10 /* AF5DCC 8007EC2C 00408825 */ move $s1, $v0 /* AF5DD0 8007EC30 00042403 */ sra $a0, $a0, 0x10 -/* AF5DD4 8007EC34 0C024B6B */ jal func_80092DAC +/* AF5DD4 8007EC34 0C024B6B */ jal Quake_SetSpeed /* AF5DD8 8007EC38 24057D00 */ li $a1, 32000 /* AF5DDC 8007EC3C 00118400 */ sll $s0, $s1, 0x10 /* AF5DE0 8007EC40 00108403 */ sra $s0, $s0, 0x10 @@ -3004,11 +3004,11 @@ glabel L8007EBE4 /* AF5DEC 8007EC4C 24050002 */ li $a1, 2 /* AF5DF0 8007EC50 00003025 */ move $a2, $zero /* AF5DF4 8007EC54 00003825 */ move $a3, $zero -/* AF5DF8 8007EC58 0C024B9C */ jal func_80092E70 +/* AF5DF8 8007EC58 0C024B9C */ jal Quake_SetQuakeValues /* AF5DFC 8007EC5C AFA00010 */ sw $zero, 0x10($sp) /* AF5E00 8007EC60 00102400 */ sll $a0, $s0, 0x10 /* AF5E04 8007EC64 00042403 */ sra $a0, $a0, 0x10 -/* AF5E08 8007EC68 0C024B7C */ jal func_80092DF0 +/* AF5E08 8007EC68 0C024B7C */ jal Quake_SetCountdown /* AF5E0C 8007EC6C 87A500FA */ lh $a1, 0xfa($sp) /* AF5E10 8007EC70 100004D2 */ b .L8007FFBC /* AF5E14 8007EC74 8FBF0044 */ lw $ra, 0x44($sp) @@ -3052,12 +3052,12 @@ glabel L8007EC78 /* AF5EA8 8007ED08 0C030202 */ jal func_800C0808 /* AF5EAC 8007ED0C 2407003C */ li $a3, 60 /* AF5EB0 8007ED10 02602025 */ move $a0, $s3 -/* AF5EB4 8007ED14 0C024BE2 */ jal func_80092F88 +/* AF5EB4 8007ED14 0C024BE2 */ jal Quake_Add /* AF5EB8 8007ED18 24050003 */ li $a1, 3 /* AF5EBC 8007ED1C 00022400 */ sll $a0, $v0, 0x10 /* AF5EC0 8007ED20 00408825 */ move $s1, $v0 /* AF5EC4 8007ED24 00042403 */ sra $a0, $a0, 0x10 -/* AF5EC8 8007ED28 0C024B6B */ jal func_80092DAC +/* AF5EC8 8007ED28 0C024B6B */ jal Quake_SetSpeed /* AF5ECC 8007ED2C 24052EE0 */ li $a1, 12000 /* AF5ED0 8007ED30 00118400 */ sll $s0, $s1, 0x10 /* AF5ED4 8007ED34 00108403 */ sra $s0, $s0, 0x10 @@ -3066,11 +3066,11 @@ glabel L8007EC78 /* AF5EE0 8007ED40 00002825 */ move $a1, $zero /* AF5EE4 8007ED44 00003025 */ move $a2, $zero /* AF5EE8 8007ED48 240703E8 */ li $a3, 1000 -/* AF5EEC 8007ED4C 0C024B9C */ jal func_80092E70 +/* AF5EEC 8007ED4C 0C024B9C */ jal Quake_SetQuakeValues /* AF5EF0 8007ED50 AFA00010 */ sw $zero, 0x10($sp) /* AF5EF4 8007ED54 00102400 */ sll $a0, $s0, 0x10 /* AF5EF8 8007ED58 00042403 */ sra $a0, $a0, 0x10 -/* AF5EFC 8007ED5C 0C024B7C */ jal func_80092DF0 +/* AF5EFC 8007ED5C 0C024B7C */ jal Quake_SetCountdown /* AF5F00 8007ED60 24050005 */ li $a1, 5 /* AF5F04 8007ED64 10000495 */ b .L8007FFBC /* AF5F08 8007ED68 8FBF0044 */ lw $ra, 0x44($sp) @@ -3109,12 +3109,12 @@ glabel L8007ED6C /* AF5F88 8007EDE8 0C030202 */ jal func_800C0808 /* AF5F8C 8007EDEC 2407003C */ li $a3, 60 /* AF5F90 8007EDF0 02602025 */ move $a0, $s3 -/* AF5F94 8007EDF4 0C024BE2 */ jal func_80092F88 +/* AF5F94 8007EDF4 0C024BE2 */ jal Quake_Add /* AF5F98 8007EDF8 24050003 */ li $a1, 3 /* AF5F9C 8007EDFC 00022400 */ sll $a0, $v0, 0x10 /* AF5FA0 8007EE00 00408825 */ move $s1, $v0 /* AF5FA4 8007EE04 00042403 */ sra $a0, $a0, 0x10 -/* AF5FA8 8007EE08 0C024B6B */ jal func_80092DAC +/* AF5FA8 8007EE08 0C024B6B */ jal Quake_SetSpeed /* AF5FAC 8007EE0C 24052EE0 */ li $a1, 12000 /* AF5FB0 8007EE10 00118400 */ sll $s0, $s1, 0x10 /* AF5FB4 8007EE14 00108403 */ sra $s0, $s0, 0x10 @@ -3123,11 +3123,11 @@ glabel L8007ED6C /* AF5FC0 8007EE20 00002825 */ move $a1, $zero /* AF5FC4 8007EE24 00003025 */ move $a2, $zero /* AF5FC8 8007EE28 240703E8 */ li $a3, 1000 -/* AF5FCC 8007EE2C 0C024B9C */ jal func_80092E70 +/* AF5FCC 8007EE2C 0C024B9C */ jal Quake_SetQuakeValues /* AF5FD0 8007EE30 AFA00010 */ sw $zero, 0x10($sp) /* AF5FD4 8007EE34 00102400 */ sll $a0, $s0, 0x10 /* AF5FD8 8007EE38 00042403 */ sra $a0, $a0, 0x10 -/* AF5FDC 8007EE3C 0C024B7C */ jal func_80092DF0 +/* AF5FDC 8007EE3C 0C024B7C */ jal Quake_SetCountdown /* AF5FE0 8007EE40 24050005 */ li $a1, 5 /* AF5FE4 8007EE44 1000045D */ b .L8007FFBC /* AF5FE8 8007EE48 8FBF0044 */ lw $ra, 0x44($sp) @@ -3244,12 +3244,12 @@ glabel L8007EFBC /* AF6190 8007EFF0 0C030202 */ jal func_800C0808 /* AF6194 8007EFF4 2407003C */ li $a3, 60 /* AF6198 8007EFF8 02602025 */ move $a0, $s3 -/* AF619C 8007EFFC 0C024BE2 */ jal func_80092F88 +/* AF619C 8007EFFC 0C024BE2 */ jal Quake_Add /* AF61A0 8007F000 24050001 */ li $a1, 1 /* AF61A4 8007F004 00022400 */ sll $a0, $v0, 0x10 /* AF61A8 8007F008 00408825 */ move $s1, $v0 /* AF61AC 8007F00C 00042403 */ sra $a0, $a0, 0x10 -/* AF61B0 8007F010 0C024B6B */ jal func_80092DAC +/* AF61B0 8007F010 0C024B6B */ jal Quake_SetSpeed /* AF61B4 8007F014 24057D00 */ li $a1, 32000 /* AF61B8 8007F018 00118400 */ sll $s0, $s1, 0x10 /* AF61BC 8007F01C 00108403 */ sra $s0, $s0, 0x10 @@ -3258,11 +3258,11 @@ glabel L8007EFBC /* AF61C8 8007F028 24050004 */ li $a1, 4 /* AF61CC 8007F02C 00003025 */ move $a2, $zero /* AF61D0 8007F030 00003825 */ move $a3, $zero -/* AF61D4 8007F034 0C024B9C */ jal func_80092E70 +/* AF61D4 8007F034 0C024B9C */ jal Quake_SetQuakeValues /* AF61D8 8007F038 AFA00010 */ sw $zero, 0x10($sp) /* AF61DC 8007F03C 00102400 */ sll $a0, $s0, 0x10 /* AF61E0 8007F040 00042403 */ sra $a0, $a0, 0x10 -/* AF61E4 8007F044 0C024B7C */ jal func_80092DF0 +/* AF61E4 8007F044 0C024B7C */ jal Quake_SetCountdown /* AF61E8 8007F048 24050014 */ li $a1, 20 /* AF61EC 8007F04C 100003DB */ b .L8007FFBC /* AF61F0 8007F050 8FBF0044 */ lw $ra, 0x44($sp) @@ -3283,12 +3283,12 @@ glabel L8007F054 /* AF6228 8007F088 0C030202 */ jal func_800C0808 /* AF622C 8007F08C 2407003C */ li $a3, 60 /* AF6230 8007F090 02602025 */ move $a0, $s3 -/* AF6234 8007F094 0C024BE2 */ jal func_80092F88 +/* AF6234 8007F094 0C024BE2 */ jal Quake_Add /* AF6238 8007F098 24050001 */ li $a1, 1 /* AF623C 8007F09C 00022400 */ sll $a0, $v0, 0x10 /* AF6240 8007F0A0 00408825 */ move $s1, $v0 /* AF6244 8007F0A4 00042403 */ sra $a0, $a0, 0x10 -/* AF6248 8007F0A8 0C024B6B */ jal func_80092DAC +/* AF6248 8007F0A8 0C024B6B */ jal Quake_SetSpeed /* AF624C 8007F0AC 24057D00 */ li $a1, 32000 /* AF6250 8007F0B0 00118400 */ sll $s0, $s1, 0x10 /* AF6254 8007F0B4 00108403 */ sra $s0, $s0, 0x10 @@ -3297,11 +3297,11 @@ glabel L8007F054 /* AF6260 8007F0C0 24050002 */ li $a1, 2 /* AF6264 8007F0C4 00003025 */ move $a2, $zero /* AF6268 8007F0C8 00003825 */ move $a3, $zero -/* AF626C 8007F0CC 0C024B9C */ jal func_80092E70 +/* AF626C 8007F0CC 0C024B9C */ jal Quake_SetQuakeValues /* AF6270 8007F0D0 AFA00010 */ sw $zero, 0x10($sp) /* AF6274 8007F0D4 00102400 */ sll $a0, $s0, 0x10 /* AF6278 8007F0D8 00042403 */ sra $a0, $a0, 0x10 -/* AF627C 8007F0DC 0C024B7C */ jal func_80092DF0 +/* AF627C 8007F0DC 0C024B7C */ jal Quake_SetCountdown /* AF6280 8007F0E0 2405000A */ li $a1, 10 /* AF6284 8007F0E4 100003B5 */ b .L8007FFBC /* AF6288 8007F0E8 8FBF0044 */ lw $ra, 0x44($sp) @@ -3328,12 +3328,12 @@ glabel L8007F0EC /* AF62D8 8007F138 AE8F067C */ sw $t7, 0x67c($s4) /* AF62DC 8007F13C A6980110 */ sh $t8, 0x110($s4) /* AF62E0 8007F140 02602025 */ move $a0, $s3 -/* AF62E4 8007F144 0C024BE2 */ jal func_80092F88 +/* AF62E4 8007F144 0C024BE2 */ jal Quake_Add /* AF62E8 8007F148 24050001 */ li $a1, 1 /* AF62EC 8007F14C 00022400 */ sll $a0, $v0, 0x10 /* AF62F0 8007F150 00408825 */ move $s1, $v0 /* AF62F4 8007F154 00042403 */ sra $a0, $a0, 0x10 -/* AF62F8 8007F158 0C024B6B */ jal func_80092DAC +/* AF62F8 8007F158 0C024B6B */ jal Quake_SetSpeed /* AF62FC 8007F15C 24057D00 */ li $a1, 32000 /* AF6300 8007F160 00118400 */ sll $s0, $s1, 0x10 /* AF6304 8007F164 00108403 */ sra $s0, $s0, 0x10 @@ -3342,11 +3342,11 @@ glabel L8007F0EC /* AF6310 8007F170 24050002 */ li $a1, 2 /* AF6314 8007F174 00003025 */ move $a2, $zero /* AF6318 8007F178 00003825 */ move $a3, $zero -/* AF631C 8007F17C 0C024B9C */ jal func_80092E70 +/* AF631C 8007F17C 0C024B9C */ jal Quake_SetQuakeValues /* AF6320 8007F180 AFA00010 */ sw $zero, 0x10($sp) /* AF6324 8007F184 00102400 */ sll $a0, $s0, 0x10 /* AF6328 8007F188 00042403 */ sra $a0, $a0, 0x10 -/* AF632C 8007F18C 0C024B7C */ jal func_80092DF0 +/* AF632C 8007F18C 0C024B7C */ jal Quake_SetCountdown /* AF6330 8007F190 2405000A */ li $a1, 10 /* AF6334 8007F194 10000389 */ b .L8007FFBC /* AF6338 8007F198 8FBF0044 */ lw $ra, 0x44($sp) @@ -3367,12 +3367,12 @@ glabel L8007F19C /* AF6370 8007F1D0 0C030202 */ jal func_800C0808 /* AF6374 8007F1D4 2407003C */ li $a3, 60 /* AF6378 8007F1D8 02602025 */ move $a0, $s3 -/* AF637C 8007F1DC 0C024BE2 */ jal func_80092F88 +/* AF637C 8007F1DC 0C024BE2 */ jal Quake_Add /* AF6380 8007F1E0 24050001 */ li $a1, 1 /* AF6384 8007F1E4 00022400 */ sll $a0, $v0, 0x10 /* AF6388 8007F1E8 00408825 */ move $s1, $v0 /* AF638C 8007F1EC 00042403 */ sra $a0, $a0, 0x10 -/* AF6390 8007F1F0 0C024B6B */ jal func_80092DAC +/* AF6390 8007F1F0 0C024B6B */ jal Quake_SetSpeed /* AF6394 8007F1F4 24057D00 */ li $a1, 32000 /* AF6398 8007F1F8 00118400 */ sll $s0, $s1, 0x10 /* AF639C 8007F1FC 00108403 */ sra $s0, $s0, 0x10 @@ -3381,11 +3381,11 @@ glabel L8007F19C /* AF63A8 8007F208 24050001 */ li $a1, 1 /* AF63AC 8007F20C 00003025 */ move $a2, $zero /* AF63B0 8007F210 2407000A */ li $a3, 10 -/* AF63B4 8007F214 0C024B9C */ jal func_80092E70 +/* AF63B4 8007F214 0C024B9C */ jal Quake_SetQuakeValues /* AF63B8 8007F218 AFA00010 */ sw $zero, 0x10($sp) /* AF63BC 8007F21C 00102400 */ sll $a0, $s0, 0x10 /* AF63C0 8007F220 00042403 */ sra $a0, $a0, 0x10 -/* AF63C4 8007F224 0C024B7C */ jal func_80092DF0 +/* AF63C4 8007F224 0C024B7C */ jal Quake_SetCountdown /* AF63C8 8007F228 24050014 */ li $a1, 20 /* AF63CC 8007F22C 10000363 */ b .L8007FFBC /* AF63D0 8007F230 8FBF0044 */ lw $ra, 0x44($sp) @@ -3587,12 +3587,12 @@ glabel L8007F4EC /* AF66B8 8007F518 0C030202 */ jal func_800C0808 /* AF66BC 8007F51C 2407003C */ li $a3, 60 /* AF66C0 8007F520 02602025 */ move $a0, $s3 -/* AF66C4 8007F524 0C024BE2 */ jal func_80092F88 +/* AF66C4 8007F524 0C024BE2 */ jal Quake_Add /* AF66C8 8007F528 24050003 */ li $a1, 3 /* AF66CC 8007F52C 00022400 */ sll $a0, $v0, 0x10 /* AF66D0 8007F530 00408825 */ move $s1, $v0 /* AF66D4 8007F534 00042403 */ sra $a0, $a0, 0x10 -/* AF66D8 8007F538 0C024B6B */ jal func_80092DAC +/* AF66D8 8007F538 0C024B6B */ jal Quake_SetSpeed /* AF66DC 8007F53C 24052EE0 */ li $a1, 12000 /* AF66E0 8007F540 00118400 */ sll $s0, $s1, 0x10 /* AF66E4 8007F544 00108403 */ sra $s0, $s0, 0x10 @@ -3601,14 +3601,14 @@ glabel L8007F4EC /* AF66F0 8007F550 00002825 */ move $a1, $zero /* AF66F4 8007F554 24060001 */ li $a2, 1 /* AF66F8 8007F558 24070064 */ li $a3, 100 -/* AF66FC 8007F55C 0C024B9C */ jal func_80092E70 +/* AF66FC 8007F55C 0C024B9C */ jal Quake_SetQuakeValues /* AF6700 8007F560 AFA00010 */ sw $zero, 0x10($sp) /* AF6704 8007F564 87A500FA */ lh $a1, 0xfa($sp) /* AF6708 8007F568 00102400 */ sll $a0, $s0, 0x10 /* AF670C 8007F56C 00042403 */ sra $a0, $a0, 0x10 /* AF6710 8007F570 24A5FFB0 */ addiu $a1, $a1, -0x50 /* AF6714 8007F574 00052C00 */ sll $a1, $a1, 0x10 -/* AF6718 8007F578 0C024B7C */ jal func_80092DF0 +/* AF6718 8007F578 0C024B7C */ jal Quake_SetCountdown /* AF671C 8007F57C 00052C03 */ sra $a1, $a1, 0x10 /* AF6720 8007F580 1000028E */ b .L8007FFBC /* AF6724 8007F584 8FBF0044 */ lw $ra, 0x44($sp) @@ -3641,12 +3641,12 @@ glabel L8007F588 /* AF6784 8007F5E4 0C00B7CE */ jal func_8002DF38 /* AF6788 8007F5E8 24060001 */ li $a2, 1 /* AF678C 8007F5EC 02602025 */ move $a0, $s3 -/* AF6790 8007F5F0 0C024BE2 */ jal func_80092F88 +/* AF6790 8007F5F0 0C024BE2 */ jal Quake_Add /* AF6794 8007F5F4 24050003 */ li $a1, 3 /* AF6798 8007F5F8 00022400 */ sll $a0, $v0, 0x10 /* AF679C 8007F5FC 00408825 */ move $s1, $v0 /* AF67A0 8007F600 00042403 */ sra $a0, $a0, 0x10 -/* AF67A4 8007F604 0C024B6B */ jal func_80092DAC +/* AF67A4 8007F604 0C024B6B */ jal Quake_SetSpeed /* AF67A8 8007F608 24052EE0 */ li $a1, 12000 /* AF67AC 8007F60C 00118400 */ sll $s0, $s1, 0x10 /* AF67B0 8007F610 00108403 */ sra $s0, $s0, 0x10 @@ -3655,14 +3655,14 @@ glabel L8007F588 /* AF67BC 8007F61C 00002825 */ move $a1, $zero /* AF67C0 8007F620 24060001 */ li $a2, 1 /* AF67C4 8007F624 2407000A */ li $a3, 10 -/* AF67C8 8007F628 0C024B9C */ jal func_80092E70 +/* AF67C8 8007F628 0C024B9C */ jal Quake_SetQuakeValues /* AF67CC 8007F62C AFA00010 */ sw $zero, 0x10($sp) /* AF67D0 8007F630 87A500FA */ lh $a1, 0xfa($sp) /* AF67D4 8007F634 00102400 */ sll $a0, $s0, 0x10 /* AF67D8 8007F638 00042403 */ sra $a0, $a0, 0x10 /* AF67DC 8007F63C 24A5FFF6 */ addiu $a1, $a1, -0xa /* AF67E0 8007F640 00052C00 */ sll $a1, $a1, 0x10 -/* AF67E4 8007F644 0C024B7C */ jal func_80092DF0 +/* AF67E4 8007F644 0C024B7C */ jal Quake_SetCountdown /* AF67E8 8007F648 00052C03 */ sra $a1, $a1, 0x10 /* AF67EC 8007F64C 1000025B */ b .L8007FFBC /* AF67F0 8007F650 8FBF0044 */ lw $ra, 0x44($sp) diff --git a/asm/non_matchings/code/z_play/func_800BCA64.s b/asm/non_matchings/code/z_play/func_800BCA64.s index 51173f7073..14b540a6fc 100644 --- a/asm/non_matchings/code/z_play/func_800BCA64.s +++ b/asm/non_matchings/code/z_play/func_800BCA64.s @@ -71,7 +71,7 @@ glabel func_800BCA64 /* B33C80 800BCAE0 02002825 */ move $a1, $s0 /* B33C84 800BCAE4 0C03DA0A */ jal func_800F6828 /* B33C88 800BCAE8 00002025 */ move $a0, $zero -/* B33C8C 800BCAEC 0C024BCE */ jal func_80092F38 +/* B33C8C 800BCAEC 0C024BCE */ jal Quake_Init /* B33C90 800BCAF0 00000000 */ nop /* B33C94 800BCAF4 00002025 */ move $a0, $zero /* B33C98 800BCAF8 02201025 */ move $v0, $s1 diff --git a/asm/non_matchings/code/z_scene_table/func_8009BEEC.s b/asm/non_matchings/code/z_scene_table/func_8009BEEC.s index b0d9726800..e3a4107e28 100644 --- a/asm/non_matchings/code/z_scene_table/func_8009BEEC.s +++ b/asm/non_matchings/code/z_scene_table/func_8009BEEC.s @@ -24,12 +24,12 @@ glabel func_8009BEEC /* B130C4 8009BF24 000FC080 */ sll $t8, $t7, 2 /* B130C8 8009BF28 0098C821 */ addu $t9, $a0, $t8 /* B130CC 8009BF2C 8F240790 */ lw $a0, 0x790($t9) -/* B130D0 8009BF30 0C024BE2 */ jal func_80092F88 +/* B130D0 8009BF30 0C024BE2 */ jal Quake_Add /* B130D4 8009BF34 AFA2002C */ sw $v0, 0x2c($sp) /* B130D8 8009BF38 00022400 */ sll $a0, $v0, 0x10 /* B130DC 8009BF3C AFA20034 */ sw $v0, 0x34($sp) /* B130E0 8009BF40 00042403 */ sra $a0, $a0, 0x10 -/* B130E4 8009BF44 0C024B6B */ jal func_80092DAC +/* B130E4 8009BF44 0C024B6B */ jal Quake_SetSpeed /* B130E8 8009BF48 24052710 */ li $a1, 10000 /* B130EC 8009BF4C 87B00036 */ lh $s0, 0x36($sp) /* B130F0 8009BF50 24050004 */ li $a1, 4 @@ -37,11 +37,11 @@ glabel func_8009BEEC /* B130F8 8009BF58 00102400 */ sll $a0, $s0, 0x10 /* B130FC 8009BF5C 00042403 */ sra $a0, $a0, 0x10 /* B13100 8009BF60 00003825 */ move $a3, $zero -/* B13104 8009BF64 0C024B9C */ jal func_80092E70 +/* B13104 8009BF64 0C024B9C */ jal Quake_SetQuakeValues /* B13108 8009BF68 AFA00010 */ sw $zero, 0x10($sp) /* B1310C 8009BF6C 00102400 */ sll $a0, $s0, 0x10 /* B13110 8009BF70 00042403 */ sra $a0, $a0, 0x10 -/* B13114 8009BF74 0C024B7C */ jal func_80092DF0 +/* B13114 8009BF74 0C024B7C */ jal Quake_SetCountdown /* B13118 8009BF78 2405007F */ li $a1, 127 /* B1311C 8009BF7C 8FA8002C */ lw $t0, 0x2c($sp) /* B13120 8009BF80 8D031DE4 */ lw $v1, 0x1de4($t0) @@ -61,7 +61,7 @@ glabel func_8009BEEC /* B13154 8009BFB4 24050003 */ li $a1, 3 /* B13158 8009BFB8 000A5880 */ sll $t3, $t2, 2 /* B1315C 8009BFBC 022B6021 */ addu $t4, $s1, $t3 -/* B13160 8009BFC0 0C024BE2 */ jal func_80092F88 +/* B13160 8009BFC0 0C024BE2 */ jal Quake_Add /* B13164 8009BFC4 8D840790 */ lw $a0, 0x790($t4) /* B13168 8009BFC8 0C03F66B */ jal Math_Rand_ZeroOne /* B1316C 8009BFCC AFA20034 */ sw $v0, 0x34($sp) @@ -78,7 +78,7 @@ glabel func_8009BEEC /* B13198 8009BFF8 44059000 */ mfc1 $a1, $f18 /* B1319C 8009BFFC 00000000 */ nop /* B131A0 8009C000 00052C00 */ sll $a1, $a1, 0x10 -/* B131A4 8009C004 0C024B6B */ jal func_80092DAC +/* B131A4 8009C004 0C024B6B */ jal Quake_SetSpeed /* B131A8 8009C008 00052C03 */ sra $a1, $a1, 0x10 /* B131AC 8009C00C 0C03F66B */ jal Math_Rand_ZeroOne /* B131B0 8009C010 00000000 */ nop @@ -97,7 +97,7 @@ glabel func_8009BEEC /* B131E4 8009C044 44058000 */ mfc1 $a1, $f16 /* B131E8 8009C048 00000000 */ nop /* B131EC 8009C04C 00052C00 */ sll $a1, $a1, 0x10 -/* B131F0 8009C050 0C024B9C */ jal func_80092E70 +/* B131F0 8009C050 0C024B9C */ jal Quake_SetQuakeValues /* B131F4 8009C054 00052C03 */ sra $a1, $a1, 0x10 /* B131F8 8009C058 0C03F66B */ jal Math_Rand_ZeroOne /* B131FC 8009C05C 00000000 */ nop @@ -113,7 +113,7 @@ glabel func_8009BEEC /* B13224 8009C084 44055000 */ mfc1 $a1, $f10 /* B13228 8009C088 00000000 */ nop /* B1322C 8009C08C 00052C00 */ sll $a1, $a1, 0x10 -/* B13230 8009C090 0C024B7C */ jal func_80092DF0 +/* B13230 8009C090 0C024B7C */ jal Quake_SetCountdown /* B13234 8009C094 00052C03 */ sra $a1, $a1, 0x10 /* B13238 8009C098 8FBF0024 */ lw $ra, 0x24($sp) .L8009C09C: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/func_8086C29C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/func_8086C29C.s index 55e0433a45..e714104d7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/func_8086C29C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/func_8086C29C.s @@ -16,12 +16,12 @@ glabel func_8086C29C /* 00634 8086C2D4 0018C880 */ sll $t9, $t8, 2 /* 00638 8086C2D8 00B94021 */ addu $t0, $a1, $t9 /* 0063C 8086C2DC 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 00640 8086C2E0 0C024BE2 */ jal func_80092F88 +/* 00640 8086C2E0 0C024BE2 */ jal Quake_Add /* 00644 8086C2E4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00648 8086C2E8 00022400 */ sll $a0, $v0, 16 /* 0064C 8086C2EC AFA20044 */ sw $v0, 0x0044($sp) /* 00650 8086C2F0 00042403 */ sra $a0, $a0, 16 -/* 00654 8086C2F4 0C024B6B */ jal func_80092DAC +/* 00654 8086C2F4 0C024B6B */ jal Quake_SetSpeed /* 00658 8086C2F8 24053A98 */ addiu $a1, $zero, 0x3A98 ## $a1 = 00003A98 /* 0065C 8086C2FC 87A40046 */ lh $a0, 0x0046($sp) /* 00660 8086C300 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 @@ -29,10 +29,10 @@ glabel func_8086C29C /* 00668 8086C308 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0066C 8086C30C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00670 8086C310 240700FA */ addiu $a3, $zero, 0x00FA ## $a3 = 000000FA -/* 00674 8086C314 0C024B9C */ jal func_80092E70 +/* 00674 8086C314 0C024B9C */ jal Quake_SetQuakeValues /* 00678 8086C318 AFA40040 */ sw $a0, 0x0040($sp) /* 0067C 8086C31C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00680 8086C320 0C024B7C */ jal func_80092DF0 +/* 00680 8086C320 0C024B7C */ jal Quake_SetCountdown /* 00684 8086C324 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A .L8086C328: /* 00688 8086C328 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s index 65f1c322de..bcb159579e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s @@ -142,24 +142,24 @@ glabel func_8086F464 /* 00510 8086F670 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00514 8086F674 00194080 */ sll $t0, $t9, 2 /* 00518 8086F678 02684821 */ addu $t1, $s3, $t0 -/* 0051C 8086F67C 0C024BE2 */ jal func_80092F88 +/* 0051C 8086F67C 0C024BE2 */ jal Quake_Add /* 00520 8086F680 8D240790 */ lw $a0, 0x0790($t1) ## 00000790 /* 00524 8086F684 00028400 */ sll $s0, $v0, 16 /* 00528 8086F688 00022400 */ sll $a0, $v0, 16 /* 0052C 8086F68C 00108403 */ sra $s0, $s0, 16 /* 00530 8086F690 00042403 */ sra $a0, $a0, 16 -/* 00534 8086F694 0C024B6B */ jal func_80092DAC +/* 00534 8086F694 0C024B6B */ jal Quake_SetSpeed /* 00538 8086F698 24057FFF */ addiu $a1, $zero, 0x7FFF ## $a1 = 00007FFF /* 0053C 8086F69C 00102400 */ sll $a0, $s0, 16 /* 00540 8086F6A0 00042403 */ sra $a0, $a0, 16 /* 00544 8086F6A4 2405012C */ addiu $a1, $zero, 0x012C ## $a1 = 0000012C /* 00548 8086F6A8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0054C 8086F6AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00550 8086F6B0 0C024B9C */ jal func_80092E70 +/* 00550 8086F6B0 0C024B9C */ jal Quake_SetQuakeValues /* 00554 8086F6B4 AFA00010 */ sw $zero, 0x0010($sp) /* 00558 8086F6B8 00102400 */ sll $a0, $s0, 16 /* 0055C 8086F6BC 00042403 */ sra $a0, $a0, 16 -/* 00560 8086F6C0 0C024B7C */ jal func_80092DF0 +/* 00560 8086F6C0 0C024B7C */ jal Quake_SetCountdown /* 00564 8086F6C4 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 00568 8086F6C8 3C0B8087 */ lui $t3, %hi(func_8086F718) ## $t3 = 80870000 /* 0056C 8086F6CC 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s index b4234b7807..d2a246f26f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s @@ -17,22 +17,22 @@ glabel func_8087D720 /* 0079C 8087D75C 00194080 */ sll $t0, $t9, 2 /* 007A0 8087D760 00A84821 */ addu $t1, $a1, $t0 /* 007A4 8087D764 8D240790 */ lw $a0, 0x0790($t1) ## 00000790 -/* 007A8 8087D768 0C024BE2 */ jal func_80092F88 +/* 007A8 8087D768 0C024BE2 */ jal Quake_Add /* 007AC 8087D76C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 007B0 8087D770 00022400 */ sll $a0, $v0, 16 /* 007B4 8087D774 AFA20030 */ sw $v0, 0x0030($sp) /* 007B8 8087D778 00042403 */ sra $a0, $a0, 16 -/* 007BC 8087D77C 0C024B6B */ jal func_80092DAC +/* 007BC 8087D77C 0C024B6B */ jal Quake_SetSpeed /* 007C0 8087D780 24057530 */ addiu $a1, $zero, 0x7530 ## $a1 = 00007530 /* 007C4 8087D784 87A40032 */ lh $a0, 0x0032($sp) /* 007C8 8087D788 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 007CC 8087D78C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 007D0 8087D790 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 007D4 8087D794 AFA00010 */ sw $zero, 0x0010($sp) -/* 007D8 8087D798 0C024B9C */ jal func_80092E70 +/* 007D8 8087D798 0C024B9C */ jal Quake_SetQuakeValues /* 007DC 8087D79C AFA4002C */ sw $a0, 0x002C($sp) /* 007E0 8087D7A0 8FA4002C */ lw $a0, 0x002C($sp) -/* 007E4 8087D7A4 0C024B7C */ jal func_80092DF0 +/* 007E4 8087D7A4 0C024B7C */ jal Quake_SetCountdown /* 007E8 8087D7A8 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 007EC 8087D7AC 10000007 */ beq $zero, $zero, .L8087D7CC /* 007F0 8087D7B0 86030168 */ lh $v1, 0x0168($s0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s index f5db0e74d5..84a7fc1e8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s @@ -48,12 +48,12 @@ glabel func_808843B0 /* 00CC8 80884458 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 00CCC 8088445C 000E7880 */ sll $t7, $t6, 2 /* 00CD0 80884460 020FC021 */ addu $t8, $s0, $t7 -/* 00CD4 80884464 0C024BE2 */ jal func_80092F88 +/* 00CD4 80884464 0C024BE2 */ jal Quake_Add /* 00CD8 80884468 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 /* 00CDC 8088446C 00022400 */ sll $a0, $v0, 16 /* 00CE0 80884470 AFA2002C */ sw $v0, 0x002C($sp) /* 00CE4 80884474 00042403 */ sra $a0, $a0, 16 -/* 00CE8 80884478 0C024B6B */ jal func_80092DAC +/* 00CE8 80884478 0C024B6B */ jal Quake_SetSpeed /* 00CEC 8088447C 240561A8 */ addiu $a1, $zero, 0x61A8 ## $a1 = 000061A8 /* 00CF0 80884480 87B0002E */ lh $s0, 0x002E($sp) /* 00CF4 80884484 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 @@ -61,11 +61,11 @@ glabel func_808843B0 /* 00CFC 8088448C 00102400 */ sll $a0, $s0, 16 /* 00D00 80884490 00042403 */ sra $a0, $a0, 16 /* 00D04 80884494 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00D08 80884498 0C024B9C */ jal func_80092E70 +/* 00D08 80884498 0C024B9C */ jal Quake_SetQuakeValues /* 00D0C 8088449C AFA00010 */ sw $zero, 0x0010($sp) /* 00D10 808844A0 00102400 */ sll $a0, $s0, 16 /* 00D14 808844A4 00042403 */ sra $a0, $a0, 16 -/* 00D18 808844A8 0C024B7C */ jal func_80092DF0 +/* 00D18 808844A8 0C024B7C */ jal Quake_SetCountdown /* 00D1C 808844AC 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A /* 00D20 808844B0 3C198088 */ lui $t9, %hi(func_808844D0) ## $t9 = 80880000 /* 00D24 808844B4 273944D0 */ addiu $t9, $t9, %lo(func_808844D0) ## $t9 = 808844D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s index 34288e0a66..a3c00594fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s @@ -62,43 +62,43 @@ glabel func_80884658 /* 00FA8 80884738 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 00FAC 8088473C 000FC080 */ sll $t8, $t7, 2 /* 00FB0 80884740 0238C821 */ addu $t9, $s1, $t8 -/* 00FB4 80884744 0C024BE2 */ jal func_80092F88 +/* 00FB4 80884744 0C024BE2 */ jal Quake_Add /* 00FB8 80884748 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 /* 00FBC 8088474C 00022400 */ sll $a0, $v0, 16 /* 00FC0 80884750 AFA20040 */ sw $v0, 0x0040($sp) /* 00FC4 80884754 00042403 */ sra $a0, $a0, 16 -/* 00FC8 80884758 0C024B6B */ jal func_80092DAC +/* 00FC8 80884758 0C024B6B */ jal Quake_SetSpeed /* 00FCC 8088475C 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 /* 00FD0 80884760 87A40042 */ lh $a0, 0x0042($sp) /* 00FD4 80884764 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E /* 00FD8 80884768 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 00FDC 8088476C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 00FE0 80884770 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FE4 80884774 0C024B9C */ jal func_80092E70 +/* 00FE4 80884774 0C024B9C */ jal Quake_SetQuakeValues /* 00FE8 80884778 AFA40028 */ sw $a0, 0x0028($sp) /* 00FEC 8088477C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00FF0 80884780 0C024B7C */ jal func_80092DF0 +/* 00FF0 80884780 0C024B7C */ jal Quake_SetCountdown /* 00FF4 80884784 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 00FF8 80884788 862807A0 */ lh $t0, 0x07A0($s1) ## 000007A0 /* 00FFC 8088478C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 01000 80884790 00084880 */ sll $t1, $t0, 2 /* 01004 80884794 02295021 */ addu $t2, $s1, $t1 -/* 01008 80884798 0C024BE2 */ jal func_80092F88 +/* 01008 80884798 0C024BE2 */ jal Quake_Add /* 0100C 8088479C 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 /* 01010 808847A0 00022400 */ sll $a0, $v0, 16 /* 01014 808847A4 AFA20040 */ sw $v0, 0x0040($sp) /* 01018 808847A8 00042403 */ sra $a0, $a0, 16 -/* 0101C 808847AC 0C024B6B */ jal func_80092DAC +/* 0101C 808847AC 0C024B6B */ jal Quake_SetSpeed /* 01020 808847B0 24052EE0 */ addiu $a1, $zero, 0x2EE0 ## $a1 = 00002EE0 /* 01024 808847B4 87A40042 */ lh $a0, 0x0042($sp) /* 01028 808847B8 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 0102C 808847BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01030 808847C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01034 808847C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01038 808847C8 0C024B9C */ jal func_80092E70 +/* 01038 808847C8 0C024B9C */ jal Quake_SetQuakeValues /* 0103C 808847CC AFA40028 */ sw $a0, 0x0028($sp) /* 01040 808847D0 8FA40028 */ lw $a0, 0x0028($sp) -/* 01044 808847D4 0C024B7C */ jal func_80092DF0 +/* 01044 808847D4 0C024B7C */ jal Quake_SetCountdown /* 01048 808847D8 240503E7 */ addiu $a1, $zero, 0x03E7 ## $a1 = 000003E7 /* 0104C 808847DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01050 808847E0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 @@ -116,22 +116,22 @@ glabel func_80884658 /* 01074 80884804 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01078 80884808 000B6080 */ sll $t4, $t3, 2 /* 0107C 8088480C 022C6821 */ addu $t5, $s1, $t4 -/* 01080 80884810 0C024BE2 */ jal func_80092F88 +/* 01080 80884810 0C024BE2 */ jal Quake_Add /* 01084 80884814 8DA40790 */ lw $a0, 0x0790($t5) ## 00000790 /* 01088 80884818 00022400 */ sll $a0, $v0, 16 /* 0108C 8088481C AFA20040 */ sw $v0, 0x0040($sp) /* 01090 80884820 00042403 */ sra $a0, $a0, 16 -/* 01094 80884824 0C024B6B */ jal func_80092DAC +/* 01094 80884824 0C024B6B */ jal Quake_SetSpeed /* 01098 80884828 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 /* 0109C 8088482C 87A40042 */ lh $a0, 0x0042($sp) /* 010A0 80884830 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 /* 010A4 80884834 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 010A8 80884838 24070078 */ addiu $a3, $zero, 0x0078 ## $a3 = 00000078 /* 010AC 8088483C AFA00010 */ sw $zero, 0x0010($sp) -/* 010B0 80884840 0C024B9C */ jal func_80092E70 +/* 010B0 80884840 0C024B9C */ jal Quake_SetQuakeValues /* 010B4 80884844 AFA40028 */ sw $a0, 0x0028($sp) /* 010B8 80884848 8FA40028 */ lw $a0, 0x0028($sp) -/* 010BC 8088484C 0C024B7C */ jal func_80092DF0 +/* 010BC 8088484C 0C024B7C */ jal Quake_SetCountdown /* 010C0 80884850 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 /* 010C4 80884854 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 010C8 80884858 3C0E8088 */ lui $t6, %hi(func_80884978) ## $t6 = 80880000 @@ -152,22 +152,22 @@ glabel func_80884658 /* 010F8 80884888 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 010FC 8088488C 000FC080 */ sll $t8, $t7, 2 /* 01100 80884890 0238C821 */ addu $t9, $s1, $t8 -/* 01104 80884894 0C024BE2 */ jal func_80092F88 +/* 01104 80884894 0C024BE2 */ jal Quake_Add /* 01108 80884898 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 /* 0110C 8088489C 00022400 */ sll $a0, $v0, 16 /* 01110 808848A0 AFA20040 */ sw $v0, 0x0040($sp) /* 01114 808848A4 00042403 */ sra $a0, $a0, 16 -/* 01118 808848A8 0C024B6B */ jal func_80092DAC +/* 01118 808848A8 0C024B6B */ jal Quake_SetSpeed /* 0111C 808848AC 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 /* 01120 808848B0 87A40042 */ lh $a0, 0x0042($sp) /* 01124 808848B4 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E /* 01128 808848B8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0112C 808848BC 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 01130 808848C0 AFA00010 */ sw $zero, 0x0010($sp) -/* 01134 808848C4 0C024B9C */ jal func_80092E70 +/* 01134 808848C4 0C024B9C */ jal Quake_SetQuakeValues /* 01138 808848C8 AFA40028 */ sw $a0, 0x0028($sp) /* 0113C 808848CC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01140 808848D0 0C024B7C */ jal func_80092DF0 +/* 01140 808848D0 0C024B7C */ jal Quake_SetCountdown /* 01144 808848D4 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 /* 01148 808848D8 3C088088 */ lui $t0, %hi(func_80884978) ## $t0 = 80880000 /* 0114C 808848DC 25084978 */ addiu $t0, $t0, %lo(func_80884978) ## $t0 = 80884978 @@ -178,22 +178,22 @@ glabel func_80884658 /* 0115C 808848EC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01160 808848F0 00095080 */ sll $t2, $t1, 2 /* 01164 808848F4 022A5821 */ addu $t3, $s1, $t2 -/* 01168 808848F8 0C024BE2 */ jal func_80092F88 +/* 01168 808848F8 0C024BE2 */ jal Quake_Add /* 0116C 808848FC 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 /* 01170 80884900 00022400 */ sll $a0, $v0, 16 /* 01174 80884904 AFA20040 */ sw $v0, 0x0040($sp) /* 01178 80884908 00042403 */ sra $a0, $a0, 16 -/* 0117C 8088490C 0C024B6B */ jal func_80092DAC +/* 0117C 8088490C 0C024B6B */ jal Quake_SetSpeed /* 01180 80884910 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 /* 01184 80884914 87A40042 */ lh $a0, 0x0042($sp) /* 01188 80884918 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E /* 0118C 8088491C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 01190 80884920 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 01194 80884924 AFA00010 */ sw $zero, 0x0010($sp) -/* 01198 80884928 0C024B9C */ jal func_80092E70 +/* 01198 80884928 0C024B9C */ jal Quake_SetQuakeValues /* 0119C 8088492C AFA40028 */ sw $a0, 0x0028($sp) /* 011A0 80884930 8FA40028 */ lw $a0, 0x0028($sp) -/* 011A4 80884934 0C024B7C */ jal func_80092DF0 +/* 011A4 80884934 0C024B7C */ jal Quake_SetCountdown /* 011A8 80884938 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 /* 011AC 8088493C 3C0C8088 */ lui $t4, %hi(func_80884978) ## $t4 = 80880000 /* 011B0 80884940 258C4978 */ addiu $t4, $t4, %lo(func_80884978) ## $t4 = 80884978 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s index 2889fabf69..848498e992 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s @@ -50,22 +50,22 @@ glabel func_80888860 /* 008D8 80888918 844807A0 */ lh $t0, 0x07A0($v0) ## 000007A0 /* 008DC 8088891C 00084880 */ sll $t1, $t0, 2 /* 008E0 80888920 00495021 */ addu $t2, $v0, $t1 -/* 008E4 80888924 0C024BE2 */ jal func_80092F88 +/* 008E4 80888924 0C024BE2 */ jal Quake_Add /* 008E8 80888928 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 /* 008EC 8088892C 00022400 */ sll $a0, $v0, 16 /* 008F0 80888930 AFA2002C */ sw $v0, 0x002C($sp) /* 008F4 80888934 00042403 */ sra $a0, $a0, 16 -/* 008F8 80888938 0C024B6B */ jal func_80092DAC +/* 008F8 80888938 0C024B6B */ jal Quake_SetSpeed /* 008FC 8088893C 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 00900 80888940 87A4002E */ lh $a0, 0x002E($sp) /* 00904 80888944 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00908 80888948 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0090C 8088894C 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 00910 80888950 AFA00010 */ sw $zero, 0x0010($sp) -/* 00914 80888954 0C024B9C */ jal func_80092E70 +/* 00914 80888954 0C024B9C */ jal Quake_SetQuakeValues /* 00918 80888958 AFA40028 */ sw $a0, 0x0028($sp) /* 0091C 8088895C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00920 80888960 0C024B7C */ jal func_80092DF0 +/* 00920 80888960 0C024B7C */ jal Quake_SetCountdown /* 00924 80888964 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00928 80888968 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0092C 8088896C 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s index a9abac1011..3284cd0d33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s @@ -80,22 +80,22 @@ glabel func_80888A58 /* 00B38 80888B78 844E07A0 */ lh $t6, 0x07A0($v0) ## 000007A0 /* 00B3C 80888B7C 000E7880 */ sll $t7, $t6, 2 /* 00B40 80888B80 004FC021 */ addu $t8, $v0, $t7 -/* 00B44 80888B84 0C024BE2 */ jal func_80092F88 +/* 00B44 80888B84 0C024BE2 */ jal Quake_Add /* 00B48 80888B88 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 /* 00B4C 80888B8C 00022400 */ sll $a0, $v0, 16 /* 00B50 80888B90 AFA2002C */ sw $v0, 0x002C($sp) /* 00B54 80888B94 00042403 */ sra $a0, $a0, 16 -/* 00B58 80888B98 0C024B6B */ jal func_80092DAC +/* 00B58 80888B98 0C024B6B */ jal Quake_SetSpeed /* 00B5C 80888B9C 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 00B60 80888BA0 87A4002E */ lh $a0, 0x002E($sp) /* 00B64 80888BA4 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00B68 80888BA8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00B6C 80888BAC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00B70 80888BB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00B74 80888BB4 0C024B9C */ jal func_80092E70 +/* 00B74 80888BB4 0C024B9C */ jal Quake_SetQuakeValues /* 00B78 80888BB8 AFA40028 */ sw $a0, 0x0028($sp) /* 00B7C 80888BBC 8FA40028 */ lw $a0, 0x0028($sp) -/* 00B80 80888BC0 0C024B7C */ jal func_80092DF0 +/* 00B80 80888BC0 0C024B7C */ jal Quake_SetCountdown /* 00B84 80888BC4 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 /* 00B88 80888BC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00B8C 80888BCC 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s index 7fb32f6182..c6d547e333 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s @@ -26,22 +26,22 @@ glabel func_80899950 /* 00268 808999A8 845807A0 */ lh $t8, 0x07A0($v0) ## 000007A0 /* 0026C 808999AC 0018C880 */ sll $t9, $t8, 2 /* 00270 808999B0 00594021 */ addu $t0, $v0, $t9 -/* 00274 808999B4 0C024BE2 */ jal func_80092F88 +/* 00274 808999B4 0C024BE2 */ jal Quake_Add /* 00278 808999B8 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 /* 0027C 808999BC 00022400 */ sll $a0, $v0, 16 /* 00280 808999C0 AFA20024 */ sw $v0, 0x0024($sp) /* 00284 808999C4 00042403 */ sra $a0, $a0, 16 -/* 00288 808999C8 0C024B6B */ jal func_80092DAC +/* 00288 808999C8 0C024B6B */ jal Quake_SetSpeed /* 0028C 808999CC 240561A8 */ addiu $a1, $zero, 0x61A8 ## $a1 = 000061A8 /* 00290 808999D0 87A40026 */ lh $a0, 0x0026($sp) /* 00294 808999D4 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 00298 808999D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0029C 808999DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 002A0 808999E0 AFA00010 */ sw $zero, 0x0010($sp) -/* 002A4 808999E4 0C024B9C */ jal func_80092E70 +/* 002A4 808999E4 0C024B9C */ jal Quake_SetQuakeValues /* 002A8 808999E8 AFA40020 */ sw $a0, 0x0020($sp) /* 002AC 808999EC 8FA40020 */ lw $a0, 0x0020($sp) -/* 002B0 808999F0 0C024B7C */ jal func_80092DF0 +/* 002B0 808999F0 0C024B7C */ jal Quake_SetCountdown /* 002B4 808999F4 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 .L808999F8: /* 002B8 808999F8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s index cf26bc27ce..07625a221d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s @@ -14,22 +14,22 @@ glabel func_808A10D4 /* 00544 808A1104 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 00548 808A1108 0018C880 */ sll $t9, $t8, 2 /* 0054C 808A110C 00594021 */ addu $t0, $v0, $t9 -/* 00550 808A1110 0C024BE2 */ jal func_80092F88 +/* 00550 808A1110 0C024BE2 */ jal Quake_Add /* 00554 808A1114 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 /* 00558 808A1118 00022400 */ sll $a0, $v0, 16 /* 0055C 808A111C AFA20028 */ sw $v0, 0x0028($sp) /* 00560 808A1120 00042403 */ sra $a0, $a0, 16 -/* 00564 808A1124 0C024B6B */ jal func_80092DAC +/* 00564 808A1124 0C024B6B */ jal Quake_SetSpeed /* 00568 808A1128 240561A8 */ addiu $a1, $zero, 0x61A8 ## $a1 = 000061A8 /* 0056C 808A112C 87A4002A */ lh $a0, 0x002A($sp) /* 00570 808A1130 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00574 808A1134 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00578 808A1138 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0057C 808A113C AFA00010 */ sw $zero, 0x0010($sp) -/* 00580 808A1140 0C024B9C */ jal func_80092E70 +/* 00580 808A1140 0C024B9C */ jal Quake_SetQuakeValues /* 00584 808A1144 AFA40024 */ sw $a0, 0x0024($sp) /* 00588 808A1148 8FA40024 */ lw $a0, 0x0024($sp) -/* 0058C 808A114C 0C024B7C */ jal func_80092DF0 +/* 0058C 808A114C 0C024B7C */ jal Quake_SetCountdown /* 00590 808A1150 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 /* 00594 808A1154 8FBF001C */ lw $ra, 0x001C($sp) /* 00598 808A1158 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s index 88e08a4ea6..7449221fb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s @@ -71,12 +71,12 @@ glabel func_808A5A0C /* 005A4 808A5B14 84CD07A0 */ lh $t5, 0x07A0($a2) ## 000007A0 /* 005A8 808A5B18 000D7080 */ sll $t6, $t5, 2 /* 005AC 808A5B1C 00CE7821 */ addu $t7, $a2, $t6 -/* 005B0 808A5B20 0C024BE2 */ jal func_80092F88 +/* 005B0 808A5B20 0C024BE2 */ jal Quake_Add /* 005B4 808A5B24 8DE40790 */ lw $a0, 0x0790($t7) ## 00000790 /* 005B8 808A5B28 00022400 */ sll $a0, $v0, 16 /* 005BC 808A5B2C AFA2002C */ sw $v0, 0x002C($sp) /* 005C0 808A5B30 00042403 */ sra $a0, $a0, 16 -/* 005C4 808A5B34 0C024B6B */ jal func_80092DAC +/* 005C4 808A5B34 0C024B6B */ jal Quake_SetSpeed /* 005C8 808A5B38 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 005CC 808A5B3C 87B0002E */ lh $s0, 0x002E($sp) /* 005D0 808A5B40 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 @@ -84,11 +84,11 @@ glabel func_808A5A0C /* 005D8 808A5B48 00102400 */ sll $a0, $s0, 16 /* 005DC 808A5B4C 00042403 */ sra $a0, $a0, 16 /* 005E0 808A5B50 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005E4 808A5B54 0C024B9C */ jal func_80092E70 +/* 005E4 808A5B54 0C024B9C */ jal Quake_SetQuakeValues /* 005E8 808A5B58 AFA00010 */ sw $zero, 0x0010($sp) /* 005EC 808A5B5C 00102400 */ sll $a0, $s0, 16 /* 005F0 808A5B60 00042403 */ sra $a0, $a0, 16 -/* 005F4 808A5B64 0C024B7C */ jal func_80092DF0 +/* 005F4 808A5B64 0C024B7C */ jal Quake_SetCountdown /* 005F8 808A5B68 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 005FC 808A5B6C 8FBF0024 */ lw $ra, 0x0024($sp) .L808A5B70: diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s index c91637a99a..e35f3bd1a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s @@ -54,22 +54,22 @@ glabel func_809973E8 /* 01204 809974A4 0C030129 */ jal func_800C04A4 /* 01208 809974A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0120C 809974AC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 01210 809974B0 0C024BE2 */ jal func_80092F88 +/* 01210 809974B0 0C024BE2 */ jal Quake_Add /* 01214 809974B4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01218 809974B8 00022400 */ sll $a0, $v0, 16 /* 0121C 809974BC AFA20044 */ sw $v0, 0x0044($sp) /* 01220 809974C0 00042403 */ sra $a0, $a0, 16 -/* 01224 809974C4 0C024B6B */ jal func_80092DAC +/* 01224 809974C4 0C024B6B */ jal Quake_SetSpeed /* 01228 809974C8 240580E8 */ addiu $a1, $zero, 0x80E8 ## $a1 = FFFF80E8 /* 0122C 809974CC 87A40046 */ lh $a0, 0x0046($sp) /* 01230 809974D0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 01234 809974D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01238 809974D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0123C 809974DC AFA00010 */ sw $zero, 0x0010($sp) -/* 01240 809974E0 0C024B9C */ jal func_80092E70 +/* 01240 809974E0 0C024B9C */ jal Quake_SetQuakeValues /* 01244 809974E4 AFA4003C */ sw $a0, 0x003C($sp) /* 01248 809974E8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0124C 809974EC 0C024B7C */ jal func_80092DF0 +/* 0124C 809974EC 0C024B7C */ jal Quake_SetCountdown /* 01250 809974F0 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A /* 01254 809974F4 C60C008C */ lwc1 $f12, 0x008C($s0) ## 0000008C /* 01258 809974F8 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s index 3d839b5d58..5cf08c88f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s @@ -10,7 +10,7 @@ glabel func_8099803C /* 01DBC 8099805C 0C030129 */ jal func_800C04A4 /* 01DC0 80998060 00052C03 */ sra $a1, $a1, 16 /* 01DC4 80998064 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 01DC8 80998068 0C024BE2 */ jal func_80092F88 +/* 01DC8 80998068 0C024BE2 */ jal Quake_Add /* 01DCC 8099806C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01DD0 80998070 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 01DD4 80998074 A7A20026 */ sh $v0, 0x0026($sp) @@ -19,16 +19,16 @@ glabel func_8099803C /* 01DE0 80998080 0C02A7DB */ jal func_800A9F6C /* 01DE4 80998084 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 01DE8 80998088 87A40026 */ lh $a0, 0x0026($sp) -/* 01DEC 8099808C 0C024B6B */ jal func_80092DAC +/* 01DEC 8099808C 0C024B6B */ jal Quake_SetSpeed /* 01DF0 80998090 24054E20 */ addiu $a1, $zero, 0x4E20 ## $a1 = 00004E20 /* 01DF4 80998094 87A40026 */ lh $a0, 0x0026($sp) /* 01DF8 80998098 87A5002E */ lh $a1, 0x002E($sp) /* 01DFC 8099809C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01E00 809980A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01E04 809980A4 0C024B9C */ jal func_80092E70 +/* 01E04 809980A4 0C024B9C */ jal Quake_SetQuakeValues /* 01E08 809980A8 AFA00010 */ sw $zero, 0x0010($sp) /* 01E0C 809980AC 87A40026 */ lh $a0, 0x0026($sp) -/* 01E10 809980B0 0C024B7C */ jal func_80092DF0 +/* 01E10 809980B0 0C024B7C */ jal Quake_SetCountdown /* 01E14 809980B4 87A50032 */ lh $a1, 0x0032($sp) /* 01E18 809980B8 8FBF001C */ lw $ra, 0x001C($sp) /* 01E1C 809980BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Destroy.s deleted file mode 100644 index ad0db85ec6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Destroy.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel EnDs_Destroy -/* 000D0 809FD100 AFA40000 */ sw $a0, 0x0000($sp) -/* 000D4 809FD104 03E00008 */ jr $ra -/* 000D8 809FD108 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s deleted file mode 100644 index 49ddd6d419..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel EnDs_Draw -/* 00A8C 809FDABC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A90 809FDAC0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A94 809FDAC4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00A98 809FDAC8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00A9C 809FDACC 0C0250F2 */ jal func_800943C8 -/* 00AA0 809FDAD0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00AA4 809FDAD4 8FA20028 */ lw $v0, 0x0028($sp) -/* 00AA8 809FDAD8 3C0F80A0 */ lui $t7, %hi(func_809FDA38) ## $t7 = 80A00000 -/* 00AAC 809FDADC 3C1880A0 */ lui $t8, %hi(func_809FDA7C) ## $t8 = 80A00000 -/* 00AB0 809FDAE0 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 -/* 00AB4 809FDAE4 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C -/* 00AB8 809FDAE8 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 00ABC 809FDAEC 2718DA7C */ addiu $t8, $t8, %lo(func_809FDA7C) ## $t8 = 809FDA7C -/* 00AC0 809FDAF0 25EFDA38 */ addiu $t7, $t7, %lo(func_809FDA38) ## $t7 = 809FDA38 -/* 00AC4 809FDAF4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00AC8 809FDAF8 AFB80014 */ sw $t8, 0x0014($sp) -/* 00ACC 809FDAFC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00AD0 809FDB00 0C0286B2 */ jal SkelAnime_DrawSV -/* 00AD4 809FDB04 AFA20018 */ sw $v0, 0x0018($sp) -/* 00AD8 809FDB08 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00ADC 809FDB0C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AE0 809FDB10 03E00008 */ jr $ra -/* 00AE4 809FDB14 00000000 */ nop -/* 00AE8 809FDB18 00000000 */ nop -/* 00AEC 809FDB1C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s deleted file mode 100644 index 36fd0b23f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel EnDs_Init -/* 00000 809FD030 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809FD034 AFB00028 */ sw $s0, 0x0028($sp) -/* 00008 809FD038 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 809FD03C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 809FD040 AFA5003C */ sw $a1, 0x003C($sp) -/* 00014 809FD044 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00018 809FD048 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 0001C 809FD04C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00020 809FD050 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00024 809FD054 0C00AC78 */ jal ActorShape_Init - -/* 00028 809FD058 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 -/* 0002C 809FD05C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00030 809FD060 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00034 809FD064 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00038 809FD068 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 0003C 809FD06C 260F01B4 */ addiu $t7, $s0, 0x01B4 ## $t7 = 000001B4 -/* 00040 809FD070 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00044 809FD074 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 809FD078 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 809FD07C AFAE0010 */ sw $t6, 0x0010($sp) -/* 00050 809FD080 24E7039C */ addiu $a3, $a3, 0x039C ## $a3 = 0600039C -/* 00054 809FD084 24C64768 */ addiu $a2, $a2, 0x4768 ## $a2 = 06004768 -/* 00058 809FD088 AFA50030 */ sw $a1, 0x0030($sp) -/* 0005C 809FD08C 0C0291BE */ jal SkelAnime_InitSV -/* 00060 809FD090 8FA4003C */ lw $a0, 0x003C($sp) -/* 00064 809FD094 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00068 809FD098 24A5039C */ addiu $a1, $a1, 0x039C ## $a1 = 0600039C -/* 0006C 809FD09C 0C02947A */ jal func_800A51E8 -/* 00070 809FD0A0 8FA40030 */ lw $a0, 0x0030($sp) -/* 00074 809FD0A4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00078 809FD0A8 3C053C54 */ lui $a1, 0x3C54 ## $a1 = 3C540000 -/* 0007C 809FD0AC A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE -/* 00080 809FD0B0 34A5FDF4 */ ori $a1, $a1, 0xFDF4 ## $a1 = 3C54FDF4 -/* 00084 809FD0B4 0C00B58B */ jal Actor_SetScale - -/* 00088 809FD0B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0008C 809FD0BC 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 00090 809FD0C0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00094 809FD0C4 3C0880A0 */ lui $t0, %hi(func_809FD7B4) ## $t0 = 80A00000 -/* 00098 809FD0C8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0009C 809FD0CC 2508D7B4 */ addiu $t0, $t0, %lo(func_809FD7B4) ## $t0 = 809FD7B4 -/* 000A0 809FD0D0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 000A4 809FD0D4 01415824 */ and $t3, $t2, $at -/* 000A8 809FD0D8 AE0801EC */ sw $t0, 0x01EC($s0) ## 000001EC -/* 000AC 809FD0DC A209001F */ sb $t1, 0x001F($s0) ## 0000001F -/* 000B0 809FD0E0 A60001E8 */ sh $zero, 0x01E8($s0) ## 000001E8 -/* 000B4 809FD0E4 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 000B8 809FD0E8 E60401E4 */ swc1 $f4, 0x01E4($s0) ## 000001E4 -/* 000BC 809FD0EC 8FBF002C */ lw $ra, 0x002C($sp) -/* 000C0 809FD0F0 8FB00028 */ lw $s0, 0x0028($sp) -/* 000C4 809FD0F4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000C8 809FD0F8 03E00008 */ jr $ra -/* 000CC 809FD0FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Update.s deleted file mode 100644 index df02d4f5b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Update.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel EnDs_Update -/* 00900 809FD930 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00904 809FD934 AFB00028 */ sw $s0, 0x0028($sp) -/* 00908 809FD938 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0090C 809FD93C AFBF002C */ sw $ra, 0x002C($sp) -/* 00910 809FD940 AFA50034 */ sw $a1, 0x0034($sp) -/* 00914 809FD944 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00918 809FD948 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0091C 809FD94C 50400005 */ beql $v0, $zero, .L809FD964 -/* 00920 809FD950 8E1901EC */ lw $t9, 0x01EC($s0) ## 000001EC -/* 00924 809FD954 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00928 809FD958 00000000 */ nop -/* 0092C 809FD95C E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 -/* 00930 809FD960 8E1901EC */ lw $t9, 0x01EC($s0) ## 000001EC -.L809FD964: -/* 00934 809FD964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00938 809FD968 8FA50034 */ lw $a1, 0x0034($sp) -/* 0093C 809FD96C 0320F809 */ jalr $ra, $t9 -/* 00940 809FD970 00000000 */ nop -/* 00944 809FD974 960E01E8 */ lhu $t6, 0x01E8($s0) ## 000001E8 -/* 00948 809FD978 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 -/* 0094C 809FD97C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00950 809FD980 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00954 809FD984 11E0000E */ beq $t7, $zero, .L809FD9C0 -/* 00958 809FD988 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 0095C 809FD98C 8E080038 */ lw $t0, 0x0038($s0) ## 00000038 -/* 00960 809FD990 8FA40034 */ lw $a0, 0x0034($sp) -/* 00964 809FD994 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00968 809FD998 AFA80010 */ sw $t0, 0x0010($sp) -/* 0096C 809FD99C 8E18003C */ lw $t8, 0x003C($s0) ## 0000003C -/* 00970 809FD9A0 260601D8 */ addiu $a2, $s0, 0x01D8 ## $a2 = 000001D8 -/* 00974 809FD9A4 260701DE */ addiu $a3, $s0, 0x01DE ## $a3 = 000001DE -/* 00978 809FD9A8 AFB80014 */ sw $t8, 0x0014($sp) -/* 0097C 809FD9AC 8E080040 */ lw $t0, 0x0040($s0) ## 00000040 -/* 00980 809FD9B0 0C00E0A4 */ jal func_80038290 -/* 00984 809FD9B4 AFA80018 */ sw $t0, 0x0018($sp) -/* 00988 809FD9B8 1000001B */ beq $zero, $zero, .L809FDA28 -/* 0098C 809FD9BC 8FBF002C */ lw $ra, 0x002C($sp) -.L809FD9C0: -/* 00990 809FD9C0 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 00994 809FD9C4 AFA90010 */ sw $t1, 0x0010($sp) -/* 00998 809FD9C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0099C 809FD9CC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 009A0 809FD9D0 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 -/* 009A4 809FD9D4 AFAA0010 */ sw $t2, 0x0010($sp) -/* 009A8 809FD9D8 260401DA */ addiu $a0, $s0, 0x01DA ## $a0 = 000001DA -/* 009AC 809FD9DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009B0 809FD9E0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 009B4 809FD9E4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 009B8 809FD9E8 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 009BC 809FD9EC 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 009C0 809FD9F0 AFAB0010 */ sw $t3, 0x0010($sp) -/* 009C4 809FD9F4 260401DE */ addiu $a0, $s0, 0x01DE ## $a0 = 000001DE -/* 009C8 809FD9F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009CC 809FD9FC 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 009D0 809FDA00 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 009D4 809FDA04 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 009D8 809FDA08 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 009DC 809FDA0C AFAC0010 */ sw $t4, 0x0010($sp) -/* 009E0 809FDA10 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 -/* 009E4 809FDA14 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009E8 809FDA18 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 009EC 809FDA1C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 009F0 809FDA20 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 009F4 809FDA24 8FBF002C */ lw $ra, 0x002C($sp) -.L809FDA28: -/* 009F8 809FDA28 8FB00028 */ lw $s0, 0x0028($sp) -/* 009FC 809FDA2C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A00 809FDA30 03E00008 */ jr $ra -/* 00A04 809FDA34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD10C.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD10C.s deleted file mode 100644 index 5ed3725ce8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD10C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_809FD10C -/* 000DC 809FD10C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000E0 809FD110 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000E4 809FD114 0C00BCCD */ jal func_8002F334 -/* 000E8 809FD118 AFA40018 */ sw $a0, 0x0018($sp) -/* 000EC 809FD11C 10400009 */ beq $v0, $zero, .L809FD144 -/* 000F0 809FD120 8FA40018 */ lw $a0, 0x0018($sp) -/* 000F4 809FD124 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 000F8 809FD128 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 000FC 809FD12C 3C0E80A0 */ lui $t6, %hi(func_809FD7B4) ## $t6 = 80A00000 -/* 00100 809FD130 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 00104 809FD134 25CED7B4 */ addiu $t6, $t6, %lo(func_809FD7B4) ## $t6 = 809FD7B4 -/* 00108 809FD138 01E1C024 */ and $t8, $t7, $at -/* 0010C 809FD13C AC8E01EC */ sw $t6, 0x01EC($a0) ## 000001EC -/* 00110 809FD140 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -.L809FD144: -/* 00114 809FD144 949901E8 */ lhu $t9, 0x01E8($a0) ## 000001E8 -/* 00118 809FD148 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 0011C 809FD14C A48801E8 */ sh $t0, 0x01E8($a0) ## 000001E8 -/* 00120 809FD150 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00124 809FD154 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00128 809FD158 03E00008 */ jr $ra -/* 0012C 809FD15C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD160.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD160.s deleted file mode 100644 index 8126cd21f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD160.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_809FD160 -/* 00130 809FD160 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00134 809FD164 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00138 809FD168 AFA40018 */ sw $a0, 0x0018($sp) -/* 0013C 809FD16C AFA5001C */ sw $a1, 0x001C($sp) -/* 00140 809FD170 0C042F6F */ jal func_8010BDBC -/* 00144 809FD174 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00148 809FD178 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0014C 809FD17C 5441000C */ bnel $v0, $at, .L809FD1B0 -/* 00150 809FD180 8FA20018 */ lw $v0, 0x0018($sp) -/* 00154 809FD184 0C041AF2 */ jal func_80106BC8 -/* 00158 809FD188 8FA4001C */ lw $a0, 0x001C($sp) -/* 0015C 809FD18C 50400008 */ beql $v0, $zero, .L809FD1B0 -/* 00160 809FD190 8FA20018 */ lw $v0, 0x0018($sp) -/* 00164 809FD194 0C041B33 */ jal func_80106CCC -/* 00168 809FD198 8FA4001C */ lw $a0, 0x001C($sp) -/* 0016C 809FD19C 8FA20018 */ lw $v0, 0x0018($sp) -/* 00170 809FD1A0 3C0E80A0 */ lui $t6, %hi(func_809FD7B4) ## $t6 = 80A00000 -/* 00174 809FD1A4 25CED7B4 */ addiu $t6, $t6, %lo(func_809FD7B4) ## $t6 = 809FD7B4 -/* 00178 809FD1A8 AC4E01EC */ sw $t6, 0x01EC($v0) ## 000001EC -/* 0017C 809FD1AC 8FA20018 */ lw $v0, 0x0018($sp) -.L809FD1B0: -/* 00180 809FD1B0 944F01E8 */ lhu $t7, 0x01E8($v0) ## 000001E8 -/* 00184 809FD1B4 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00188 809FD1B8 A45801E8 */ sh $t8, 0x01E8($v0) ## 000001E8 -/* 0018C 809FD1BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00190 809FD1C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00194 809FD1C4 03E00008 */ jr $ra -/* 00198 809FD1C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD1CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD1CC.s deleted file mode 100644 index 401d81c1b0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD1CC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_809FD1CC -/* 0019C 809FD1CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001A0 809FD1D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001A4 809FD1D4 AFA5001C */ sw $a1, 0x001C($sp) -/* 001A8 809FD1D8 0C00BC65 */ jal func_8002F194 -/* 001AC 809FD1DC AFA40018 */ sw $a0, 0x0018($sp) -/* 001B0 809FD1E0 10400005 */ beq $v0, $zero, .L809FD1F8 -/* 001B4 809FD1E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 001B8 809FD1E8 3C0E80A0 */ lui $t6, %hi(func_809FD10C) ## $t6 = 80A00000 -/* 001BC 809FD1EC 25CED10C */ addiu $t6, $t6, %lo(func_809FD10C) ## $t6 = 809FD10C -/* 001C0 809FD1F0 10000008 */ beq $zero, $zero, .L809FD214 -/* 001C4 809FD1F4 AC8E01EC */ sw $t6, 0x01EC($a0) ## 000001EC -.L809FD1F8: -/* 001C8 809FD1F8 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 001CC 809FD1FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001D0 809FD200 3C06447A */ lui $a2, 0x447A ## $a2 = 447A0000 -/* 001D4 809FD204 01E1C025 */ or $t8, $t7, $at ## $t8 = 00010000 -/* 001D8 809FD208 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 001DC 809FD20C 0C00BCB3 */ jal func_8002F2CC -/* 001E0 809FD210 8FA5001C */ lw $a1, 0x001C($sp) -.L809FD214: -/* 001E4 809FD214 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001E8 809FD218 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001EC 809FD21C 03E00008 */ jr $ra -/* 001F0 809FD220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD224.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD224.s deleted file mode 100644 index c2d26d0249..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD224.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_809FD224 -/* 001F4 809FD224 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001F8 809FD228 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001FC 809FD22C 0C00BCCD */ jal func_8002F334 -/* 00200 809FD230 AFA40018 */ sw $a0, 0x0018($sp) -/* 00204 809FD234 1040000F */ beq $v0, $zero, .L809FD274 -/* 00208 809FD238 8FA40018 */ lw $a0, 0x0018($sp) -/* 0020C 809FD23C 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 00210 809FD240 3C0F80A0 */ lui $t7, %hi(func_809FD1CC) ## $t7 = 80A00000 -/* 00214 809FD244 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 00218 809FD248 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0021C 809FD24C 240E504F */ addiu $t6, $zero, 0x504F ## $t6 = 0000504F -/* 00220 809FD250 25EFD1CC */ addiu $t7, $t7, %lo(func_809FD1CC) ## $t7 = 809FD1CC -/* 00224 809FD254 0301C824 */ and $t9, $t8, $at -/* 00228 809FD258 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0022C 809FD25C A48E010E */ sh $t6, 0x010E($a0) ## 0000010E -/* 00230 809FD260 AC8F01EC */ sw $t7, 0x01EC($a0) ## 000001EC -/* 00234 809FD264 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00238 809FD268 94480EF6 */ lhu $t0, 0x0EF6($v0) ## 8015F556 -/* 0023C 809FD26C 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00240 809FD270 A4490EF6 */ sh $t1, 0x0EF6($v0) ## 8015F556 -.L809FD274: -/* 00244 809FD274 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00248 809FD278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0024C 809FD27C 03E00008 */ jr $ra -/* 00250 809FD280 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD284.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD284.s deleted file mode 100644 index ecb6f96883..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD284.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_809FD284 -/* 00254 809FD284 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00258 809FD288 AFBF001C */ sw $ra, 0x001C($sp) -/* 0025C 809FD28C AFA50024 */ sw $a1, 0x0024($sp) -/* 00260 809FD290 0C00BD04 */ jal func_8002F410 -/* 00264 809FD294 AFA40020 */ sw $a0, 0x0020($sp) -/* 00268 809FD298 10400008 */ beq $v0, $zero, .L809FD2BC -/* 0026C 809FD29C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00270 809FD2A0 3C0E80A0 */ lui $t6, %hi(func_809FD224) ## $t6 = 80A00000 -/* 00274 809FD2A4 25CED224 */ addiu $t6, $t6, %lo(func_809FD224) ## $t6 = 809FD224 -/* 00278 809FD2A8 AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 0027C 809FD2AC AC8E01EC */ sw $t6, 0x01EC($a0) ## 000001EC -/* 00280 809FD2B0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00284 809FD2B4 10000009 */ beq $zero, $zero, .L809FD2DC -/* 00288 809FD2B8 A420FA32 */ sh $zero, -0x05CE($at) ## 8015FA32 -.L809FD2BC: -/* 0028C 809FD2BC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00290 809FD2C0 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00294 809FD2C4 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 00298 809FD2C8 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 0029C 809FD2CC 8FA50024 */ lw $a1, 0x0024($sp) -/* 002A0 809FD2D0 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 002A4 809FD2D4 0C00BD0D */ jal func_8002F434 -/* 002A8 809FD2D8 E7A40010 */ swc1 $f4, 0x0010($sp) -.L809FD2DC: -/* 002AC 809FD2DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 002B0 809FD2E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 002B4 809FD2E4 03E00008 */ jr $ra -/* 002B8 809FD2E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD2EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD2EC.s deleted file mode 100644 index 14adfa57be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD2EC.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_809FD2EC -/* 002BC 809FD2EC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002C0 809FD2F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 002C4 809FD2F4 AFA40020 */ sw $a0, 0x0020($sp) -/* 002C8 809FD2F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 002CC 809FD2FC 0C042F6F */ jal func_8010BDBC -/* 002D0 809FD300 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 002D4 809FD304 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 002D8 809FD308 54410014 */ bnel $v0, $at, .L809FD35C -/* 002DC 809FD30C 8FBF001C */ lw $ra, 0x001C($sp) -/* 002E0 809FD310 0C041AF2 */ jal func_80106BC8 -/* 002E4 809FD314 8FA40024 */ lw $a0, 0x0024($sp) -/* 002E8 809FD318 50400010 */ beql $v0, $zero, .L809FD35C -/* 002EC 809FD31C 8FBF001C */ lw $ra, 0x001C($sp) -/* 002F0 809FD320 0C041B33 */ jal func_80106CCC -/* 002F4 809FD324 8FA40024 */ lw $a0, 0x0024($sp) -/* 002F8 809FD328 8FA40020 */ lw $a0, 0x0020($sp) -/* 002FC 809FD32C 3C0E80A0 */ lui $t6, %hi(func_809FD284) ## $t6 = 80A00000 -/* 00300 809FD330 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00304 809FD334 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00308 809FD338 25CED284 */ addiu $t6, $t6, %lo(func_809FD284) ## $t6 = 809FD284 -/* 0030C 809FD33C 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 00310 809FD340 AC8E01EC */ sw $t6, 0x01EC($a0) ## 000001EC -/* 00314 809FD344 8FA50024 */ lw $a1, 0x0024($sp) -/* 00318 809FD348 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 0031C 809FD34C 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 00320 809FD350 0C00BD0D */ jal func_8002F434 -/* 00324 809FD354 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00328 809FD358 8FBF001C */ lw $ra, 0x001C($sp) -.L809FD35C: -/* 0032C 809FD35C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00330 809FD360 03E00008 */ jr $ra -/* 00334 809FD364 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD368.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD368.s deleted file mode 100644 index 2dae152659..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD368.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_809FD368 -/* 00338 809FD368 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0033C 809FD36C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00340 809FD370 AFB00020 */ sw $s0, 0x0020($sp) -/* 00344 809FD374 AFA5002C */ sw $a1, 0x002C($sp) -/* 00348 809FD378 948201EA */ lhu $v0, 0x01EA($a0) ## 000001EA -/* 0034C 809FD37C 3C0F80A0 */ lui $t7, %hi(func_809FD2EC) ## $t7 = 80A00000 -/* 00350 809FD380 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00354 809FD384 18400004 */ blez $v0, .L809FD398 -/* 00358 809FD388 25EFD2EC */ addiu $t7, $t7, %lo(func_809FD2EC) ## $t7 = 809FD2EC -/* 0035C 809FD38C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00360 809FD390 10000005 */ beq $zero, $zero, .L809FD3A8 -/* 00364 809FD394 A48E01EA */ sh $t6, 0x01EA($a0) ## 000001EA -.L809FD398: -/* 00368 809FD398 AE0F01EC */ sw $t7, 0x01EC($s0) ## 000001EC -/* 0036C 809FD39C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00370 809FD3A0 0C042DC8 */ jal func_8010B720 -/* 00374 809FD3A4 2405504D */ addiu $a1, $zero, 0x504D ## $a1 = 0000504D -.L809FD3A8: -/* 00378 809FD3A8 3C063CF5 */ lui $a2, 0x3CF5 ## $a2 = 3CF50000 -/* 0037C 809FD3AC 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F -/* 00380 809FD3B0 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 -/* 00384 809FD3B4 0C01DE80 */ jal Math_ApproxF - -/* 00388 809FD3B8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0038C 809FD3BC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00390 809FD3C0 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 00394 809FD3C4 C60001E4 */ lwc1 $f0, 0x01E4($s0) ## 000001E4 -/* 00398 809FD3C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0039C 809FD3CC 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 003A0 809FD3D0 46002181 */ sub.s $f6, $f4, $f0 -/* 003A4 809FD3D4 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 003A8 809FD3D8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 003AC 809FD3DC 8FA4002C */ lw $a0, 0x002C($sp) -/* 003B0 809FD3E0 46060202 */ mul.s $f8, $f0, $f6 -/* 003B4 809FD3E4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 003B8 809FD3E8 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 003BC 809FD3EC 44054000 */ mfc1 $a1, $f8 -/* 003C0 809FD3F0 0C01DCEA */ jal func_800773A8 -/* 003C4 809FD3F4 00000000 */ nop -/* 003C8 809FD3F8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003CC 809FD3FC 8FB00020 */ lw $s0, 0x0020($sp) -/* 003D0 809FD400 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 003D4 809FD404 03E00008 */ jr $ra -/* 003D8 809FD408 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD40C.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD40C.s deleted file mode 100644 index 695c3f9dab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD40C.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_809FD40C -/* 003DC 809FD40C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003E0 809FD410 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003E4 809FD414 948201EA */ lhu $v0, 0x01EA($a0) ## 000001EA -/* 003E8 809FD418 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 003EC 809FD41C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 003F0 809FD420 18400004 */ blez $v0, .L809FD434 -/* 003F4 809FD424 3C0F80A0 */ lui $t7, %hi(func_809FD368) ## $t7 = 80A00000 -/* 003F8 809FD428 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 003FC 809FD42C 10000008 */ beq $zero, $zero, .L809FD450 -/* 00400 809FD430 A48E01EA */ sh $t6, 0x01EA($a0) ## 000001EA -.L809FD434: -/* 00404 809FD434 25EFD368 */ addiu $t7, $t7, %lo(func_809FD368) ## $t7 = 809FD368 -/* 00408 809FD438 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 0040C 809FD43C ACCF01EC */ sw $t7, 0x01EC($a2) ## 000001EC -/* 00410 809FD440 A4D801EA */ sh $t8, 0x01EA($a2) ## 000001EA -/* 00414 809FD444 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00418 809FD448 0C00B2ED */ jal Flags_UnsetSwitch - -/* 0041C 809FD44C 2405003F */ addiu $a1, $zero, 0x003F ## $a1 = 0000003F -.L809FD450: -/* 00420 809FD450 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00424 809FD454 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00428 809FD458 03E00008 */ jr $ra -/* 0042C 809FD45C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD460.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD460.s deleted file mode 100644 index fd9b127e81..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD460.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_809FD460 -/* 00430 809FD460 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00434 809FD464 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00438 809FD468 AFB00020 */ sw $s0, 0x0020($sp) -/* 0043C 809FD46C AFA5002C */ sw $a1, 0x002C($sp) -/* 00440 809FD470 948201EA */ lhu $v0, 0x01EA($a0) ## 000001EA -/* 00444 809FD474 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00448 809FD478 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 0044C 809FD47C 18400004 */ blez $v0, .L809FD490 -/* 00450 809FD480 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 -/* 00454 809FD484 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00458 809FD488 10000006 */ beq $zero, $zero, .L809FD4A4 -/* 0045C 809FD48C A48E01EA */ sh $t6, 0x01EA($a0) ## 000001EA -.L809FD490: -/* 00460 809FD490 3C0F80A0 */ lui $t7, %hi(func_809FD40C) ## $t7 = 80A00000 -/* 00464 809FD494 25EFD40C */ addiu $t7, $t7, %lo(func_809FD40C) ## $t7 = 809FD40C -/* 00468 809FD498 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 0046C 809FD49C AE0F01EC */ sw $t7, 0x01EC($s0) ## 000001EC -/* 00470 809FD4A0 A61801EA */ sh $t8, 0x01EA($s0) ## 000001EA -.L809FD4A4: -/* 00474 809FD4A4 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 -/* 00478 809FD4A8 0C01DE80 */ jal Math_ApproxF - -/* 0047C 809FD4AC 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A -/* 00480 809FD4B0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00484 809FD4B4 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 00488 809FD4B8 C60001E4 */ lwc1 $f0, 0x01E4($s0) ## 000001E4 -/* 0048C 809FD4BC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00490 809FD4C0 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 00494 809FD4C4 46002181 */ sub.s $f6, $f4, $f0 -/* 00498 809FD4C8 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 0049C 809FD4CC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 004A0 809FD4D0 8FA4002C */ lw $a0, 0x002C($sp) -/* 004A4 809FD4D4 46060202 */ mul.s $f8, $f0, $f6 -/* 004A8 809FD4D8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 004AC 809FD4DC E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 004B0 809FD4E0 44054000 */ mfc1 $a1, $f8 -/* 004B4 809FD4E4 0C01DCEA */ jal func_800773A8 -/* 004B8 809FD4E8 00000000 */ nop -/* 004BC 809FD4EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004C0 809FD4F0 8FB00020 */ lw $s0, 0x0020($sp) -/* 004C4 809FD4F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004C8 809FD4F8 03E00008 */ jr $ra -/* 004CC 809FD4FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD500.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD500.s deleted file mode 100644 index 94b6d15111..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD500.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_809FD500 -/* 004D0 809FD500 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004D4 809FD504 AFBF001C */ sw $ra, 0x001C($sp) -/* 004D8 809FD508 AFB00018 */ sw $s0, 0x0018($sp) -/* 004DC 809FD50C AFA40028 */ sw $a0, 0x0028($sp) -/* 004E0 809FD510 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 004E4 809FD514 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 004E8 809FD518 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 004EC 809FD51C 0C042F6F */ jal func_8010BDBC -/* 004F0 809FD520 AFAE0024 */ sw $t6, 0x0024($sp) -/* 004F4 809FD524 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 004F8 809FD528 54410024 */ bnel $v0, $at, .L809FD5BC -/* 004FC 809FD52C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00500 809FD530 0C041AF2 */ jal func_80106BC8 -/* 00504 809FD534 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00508 809FD538 1040001F */ beq $v0, $zero, .L809FD5B8 -/* 0050C 809FD53C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00510 809FD540 00501021 */ addu $v0, $v0, $s0 -/* 00514 809FD544 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00518 809FD548 3C0F80A0 */ lui $t7, %hi(func_809FD460) ## $t7 = 80A00000 -/* 0051C 809FD54C 25EFD460 */ addiu $t7, $t7, %lo(func_809FD460) ## $t7 = 809FD460 -/* 00520 809FD550 10400006 */ beq $v0, $zero, .L809FD56C -/* 00524 809FD554 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 00528 809FD558 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0052C 809FD55C 10410010 */ beq $v0, $at, .L809FD5A0 -/* 00530 809FD560 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00534 809FD564 10000015 */ beq $zero, $zero, .L809FD5BC -/* 00538 809FD568 8FBF001C */ lw $ra, 0x001C($sp) -.L809FD56C: -/* 0053C 809FD56C 8FA20028 */ lw $v0, 0x0028($sp) -/* 00540 809FD570 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00544 809FD574 2405003F */ addiu $a1, $zero, 0x003F ## $a1 = 0000003F -/* 00548 809FD578 AC4F01EC */ sw $t7, 0x01EC($v0) ## 000101EC -/* 0054C 809FD57C 0C00B2DD */ jal Flags_SetSwitch - -/* 00550 809FD580 A45801EA */ sh $t8, 0x01EA($v0) ## 000101EA -/* 00554 809FD584 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00558 809FD588 00300821 */ addu $at, $at, $s0 -/* 0055C 809FD58C 24190037 */ addiu $t9, $zero, 0x0037 ## $t9 = 00000037 -/* 00560 809FD590 A03903DC */ sb $t9, 0x03DC($at) ## 000103DC -/* 00564 809FD594 8FA80024 */ lw $t0, 0x0024($sp) -/* 00568 809FD598 10000007 */ beq $zero, $zero, .L809FD5B8 -/* 0056C 809FD59C A1000693 */ sb $zero, 0x0693($t0) ## 00000693 -.L809FD5A0: -/* 00570 809FD5A0 0C042DC8 */ jal func_8010B720 -/* 00574 809FD5A4 2405504C */ addiu $a1, $zero, 0x504C ## $a1 = 0000504C -/* 00578 809FD5A8 8FAA0028 */ lw $t2, 0x0028($sp) -/* 0057C 809FD5AC 3C0980A0 */ lui $t1, %hi(func_809FD10C) ## $t1 = 80A00000 -/* 00580 809FD5B0 2529D10C */ addiu $t1, $t1, %lo(func_809FD10C) ## $t1 = 809FD10C -/* 00584 809FD5B4 AD4901EC */ sw $t1, 0x01EC($t2) ## 000001EC -.L809FD5B8: -/* 00588 809FD5B8 8FBF001C */ lw $ra, 0x001C($sp) -.L809FD5BC: -/* 0058C 809FD5BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00590 809FD5C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00594 809FD5C4 03E00008 */ jr $ra -/* 00598 809FD5C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD5CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD5CC.s deleted file mode 100644 index 425238aa39..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD5CC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_809FD5CC -/* 0059C 809FD5CC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 005A0 809FD5D0 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 -/* 005A4 809FD5D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005A8 809FD5D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005AC 809FD5DC 29C10064 */ slti $at, $t6, 0x0064 -/* 005B0 809FD5E0 10200003 */ beq $at, $zero, .L809FD5F0 -/* 005B4 809FD5E4 00000000 */ nop -/* 005B8 809FD5E8 10000008 */ beq $zero, $zero, .L809FD60C -/* 005BC 809FD5EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809FD5F0: -/* 005C0 809FD5F0 0C021AAF */ jal Inventory_HasEmptyBottle -/* 005C4 809FD5F4 00000000 */ nop -/* 005C8 809FD5F8 54400004 */ bnel $v0, $zero, .L809FD60C -/* 005CC 809FD5FC 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 005D0 809FD600 10000002 */ beq $zero, $zero, .L809FD60C -/* 005D4 809FD604 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 005D8 809FD608 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L809FD60C: -/* 005DC 809FD60C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005E0 809FD610 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005E4 809FD614 03E00008 */ jr $ra -/* 005E8 809FD618 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD61C.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD61C.s deleted file mode 100644 index e5fd4bcca4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD61C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_809FD61C -/* 005EC 809FD61C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 005F0 809FD620 AFBF001C */ sw $ra, 0x001C($sp) -/* 005F4 809FD624 AFA50024 */ sw $a1, 0x0024($sp) -/* 005F8 809FD628 0C00BD04 */ jal func_8002F410 -/* 005FC 809FD62C AFA40020 */ sw $a0, 0x0020($sp) -/* 00600 809FD630 10400006 */ beq $v0, $zero, .L809FD64C -/* 00604 809FD634 8FA40020 */ lw $a0, 0x0020($sp) -/* 00608 809FD638 3C0E80A0 */ lui $t6, %hi(func_809FD10C) ## $t6 = 80A00000 -/* 0060C 809FD63C 25CED10C */ addiu $t6, $t6, %lo(func_809FD10C) ## $t6 = 809FD10C -/* 00610 809FD640 AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 00614 809FD644 10000009 */ beq $zero, $zero, .L809FD66C -/* 00618 809FD648 AC8E01EC */ sw $t6, 0x01EC($a0) ## 000001EC -.L809FD64C: -/* 0061C 809FD64C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00620 809FD650 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00624 809FD654 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 00628 809FD658 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 0062C 809FD65C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00630 809FD660 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 00634 809FD664 0C00BD0D */ jal func_8002F434 -/* 00638 809FD668 E7A40010 */ swc1 $f4, 0x0010($sp) -.L809FD66C: -/* 0063C 809FD66C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00640 809FD670 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00644 809FD674 03E00008 */ jr $ra -/* 00648 809FD678 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD67C.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD67C.s deleted file mode 100644 index 130f7fbb65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD67C.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_809FD67C -/* 0064C 809FD67C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00650 809FD680 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00654 809FD684 AFB00020 */ sw $s0, 0x0020($sp) -/* 00658 809FD688 AFA40028 */ sw $a0, 0x0028($sp) -/* 0065C 809FD68C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00660 809FD690 0C042F6F */ jal func_8010BDBC -/* 00664 809FD694 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00668 809FD698 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0066C 809FD69C 54410041 */ bnel $v0, $at, .L809FD7A4 -/* 00670 809FD6A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00674 809FD6A4 0C041AF2 */ jal func_80106BC8 -/* 00678 809FD6A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0067C 809FD6AC 1040003C */ beq $v0, $zero, .L809FD7A0 -/* 00680 809FD6B0 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00684 809FD6B4 00501021 */ addu $v0, $v0, $s0 -/* 00688 809FD6B8 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 0068C 809FD6BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00690 809FD6C0 10400005 */ beq $v0, $zero, .L809FD6D8 -/* 00694 809FD6C4 00000000 */ nop -/* 00698 809FD6C8 1041002F */ beq $v0, $at, .L809FD788 -/* 0069C 809FD6CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006A0 809FD6D0 10000030 */ beq $zero, $zero, .L809FD794 -/* 006A4 809FD6D4 8FAB0028 */ lw $t3, 0x0028($sp) -.L809FD6D8: -/* 006A8 809FD6D8 0C27F573 */ jal func_809FD5CC -/* 006AC 809FD6DC 00000000 */ nop -/* 006B0 809FD6E0 10400009 */ beq $v0, $zero, .L809FD708 -/* 006B4 809FD6E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006B8 809FD6E8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 006BC 809FD6EC 1041000A */ beq $v0, $at, .L809FD718 -/* 006C0 809FD6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006C4 809FD6F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 006C8 809FD6F8 1041000E */ beq $v0, $at, .L809FD734 -/* 006CC 809FD6FC 00000000 */ nop -/* 006D0 809FD700 10000024 */ beq $zero, $zero, .L809FD794 -/* 006D4 809FD704 8FAB0028 */ lw $t3, 0x0028($sp) -.L809FD708: -/* 006D8 809FD708 0C042DC8 */ jal func_8010B720 -/* 006DC 809FD70C 2405500E */ addiu $a1, $zero, 0x500E ## $a1 = 0000500E -/* 006E0 809FD710 10000020 */ beq $zero, $zero, .L809FD794 -/* 006E4 809FD714 8FAB0028 */ lw $t3, 0x0028($sp) -.L809FD718: -/* 006E8 809FD718 0C042DC8 */ jal func_8010B720 -/* 006EC 809FD71C 24050096 */ addiu $a1, $zero, 0x0096 ## $a1 = 00000096 -/* 006F0 809FD720 8FAF0028 */ lw $t7, 0x0028($sp) -/* 006F4 809FD724 3C0E80A0 */ lui $t6, %hi(func_809FD160) ## $t6 = 80A00000 -/* 006F8 809FD728 25CED160 */ addiu $t6, $t6, %lo(func_809FD160) ## $t6 = 809FD160 -/* 006FC 809FD72C 1000001C */ beq $zero, $zero, .L809FD7A0 -/* 00700 809FD730 ADEE01EC */ sw $t6, 0x01EC($t7) ## 000001EC -.L809FD734: -/* 00704 809FD734 0C021CC3 */ jal Rupees_ChangeBy -/* 00708 809FD738 2404FF9C */ addiu $a0, $zero, 0xFF9C ## $a0 = FFFFFF9C -/* 0070C 809FD73C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00710 809FD740 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 00714 809FD744 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 00718 809FD748 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 0071C 809FD74C 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 00720 809FD750 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 00724 809FD754 0301C824 */ and $t9, $t8, $at -/* 00728 809FD758 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0072C 809FD75C 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00730 809FD760 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00734 809FD764 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00738 809FD768 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 0073C 809FD76C 0C00BD0D */ jal func_8002F434 -/* 00740 809FD770 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00744 809FD774 8FA90028 */ lw $t1, 0x0028($sp) -/* 00748 809FD778 3C0880A0 */ lui $t0, %hi(func_809FD61C) ## $t0 = 80A00000 -/* 0074C 809FD77C 2508D61C */ addiu $t0, $t0, %lo(func_809FD61C) ## $t0 = 809FD61C -/* 00750 809FD780 10000007 */ beq $zero, $zero, .L809FD7A0 -/* 00754 809FD784 AD2801EC */ sw $t0, 0x01EC($t1) ## 000001EC -.L809FD788: -/* 00758 809FD788 0C042DC8 */ jal func_8010B720 -/* 0075C 809FD78C 2405500D */ addiu $a1, $zero, 0x500D ## $a1 = 0000500D -/* 00760 809FD790 8FAB0028 */ lw $t3, 0x0028($sp) -.L809FD794: -/* 00764 809FD794 3C0A80A0 */ lui $t2, %hi(func_809FD10C) ## $t2 = 80A00000 -/* 00768 809FD798 254AD10C */ addiu $t2, $t2, %lo(func_809FD10C) ## $t2 = 809FD10C -/* 0076C 809FD79C AD6A01EC */ sw $t2, 0x01EC($t3) ## 000001EC -.L809FD7A0: -/* 00770 809FD7A0 8FBF0024 */ lw $ra, 0x0024($sp) -.L809FD7A4: -/* 00774 809FD7A4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00778 809FD7A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0077C 809FD7AC 03E00008 */ jr $ra -/* 00780 809FD7B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD7B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD7B4.s deleted file mode 100644 index bd5e8c3484..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD7B4.s +++ /dev/null @@ -1,106 +0,0 @@ -glabel func_809FD7B4 -/* 00784 809FD7B4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00788 809FD7B8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0078C 809FD7BC AFB00020 */ sw $s0, 0x0020($sp) -/* 00790 809FD7C0 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00794 809FD7C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00798 809FD7C8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0079C 809FD7CC 0C00BC65 */ jal func_8002F194 -/* 007A0 809FD7D0 AFA3002C */ sw $v1, 0x002C($sp) -/* 007A4 809FD7D4 8FA3002C */ lw $v1, 0x002C($sp) -/* 007A8 809FD7D8 10400035 */ beq $v0, $zero, .L809FD8B0 -/* 007AC 809FD7DC 8FA50034 */ lw $a1, 0x0034($sp) -/* 007B0 809FD7E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 007B4 809FD7E4 0C00BCDA */ jal func_8002F368 -/* 007B8 809FD7E8 AFA3002C */ sw $v1, 0x002C($sp) -/* 007BC 809FD7EC 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 007C0 809FD7F0 14410014 */ bne $v0, $at, .L809FD844 -/* 007C4 809FD7F4 8FA3002C */ lw $v1, 0x002C($sp) -/* 007C8 809FD7F8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 007CC 809FD7FC 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 007D0 809FD800 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 007D4 809FD804 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 007D8 809FD808 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 007DC 809FD80C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 -/* 007E0 809FD810 AFAE0014 */ sw $t6, 0x0014($sp) -/* 007E4 809FD814 AFA70010 */ sw $a3, 0x0010($sp) -/* 007E8 809FD818 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 007EC 809FD81C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 007F0 809FD820 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 007F4 809FD824 AFA3002C */ sw $v1, 0x002C($sp) -/* 007F8 809FD828 8FA3002C */ lw $v1, 0x002C($sp) -/* 007FC 809FD82C 240F504A */ addiu $t7, $zero, 0x504A ## $t7 = 0000504A -/* 00800 809FD830 3C1880A0 */ lui $t8, %hi(func_809FD500) ## $t8 = 80A00000 -/* 00804 809FD834 2718D500 */ addiu $t8, $t8, %lo(func_809FD500) ## $t8 = 809FD500 -/* 00808 809FD838 A46F010E */ sh $t7, 0x010E($v1) ## 0000010E -/* 0080C 809FD83C 10000037 */ beq $zero, $zero, .L809FD91C -/* 00810 809FD840 AE1801EC */ sw $t8, 0x01EC($s0) ## 000001EC -.L809FD844: -/* 00814 809FD844 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00818 809FD848 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0081C 809FD84C 94590EF6 */ lhu $t9, 0x0EF6($v0) ## 8015F556 -/* 00820 809FD850 3C1880A0 */ lui $t8, %hi(func_809FD10C) ## $t8 = 80A00000 -/* 00824 809FD854 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 -/* 00828 809FD858 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 0082C 809FD85C 11000007 */ beq $t0, $zero, .L809FD87C -/* 00830 809FD860 2718D10C */ addiu $t8, $t8, %lo(func_809FD10C) ## $t8 = 809FD10C -/* 00834 809FD864 2409500C */ addiu $t1, $zero, 0x500C ## $t1 = 0000500C -/* 00838 809FD868 3C0A80A0 */ lui $t2, %hi(func_809FD67C) ## $t2 = 80A00000 -/* 0083C 809FD86C A469010E */ sh $t1, 0x010E($v1) ## 0000010E -/* 00840 809FD870 254AD67C */ addiu $t2, $t2, %lo(func_809FD67C) ## $t2 = 809FD67C -/* 00844 809FD874 10000029 */ beq $zero, $zero, .L809FD91C -/* 00848 809FD878 AE0A01EC */ sw $t2, 0x01EC($s0) ## 000001EC -.L809FD87C: -/* 0084C 809FD87C 916B7494 */ lbu $t3, 0x7494($t3) ## 80127494 -/* 00850 809FD880 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 00854 809FD884 240E5049 */ addiu $t6, $zero, 0x5049 ## $t6 = 00005049 -/* 00858 809FD888 004B6021 */ addu $t4, $v0, $t3 -/* 0085C 809FD88C 918D0074 */ lbu $t5, 0x0074($t4) ## 00000074 -/* 00860 809FD890 240F5048 */ addiu $t7, $zero, 0x5048 ## $t7 = 00005048 -/* 00864 809FD894 55A10004 */ bnel $t5, $at, .L809FD8A8 -/* 00868 809FD898 A46F010E */ sh $t7, 0x010E($v1) ## 0000010E -/* 0086C 809FD89C 10000002 */ beq $zero, $zero, .L809FD8A8 -/* 00870 809FD8A0 A46E010E */ sh $t6, 0x010E($v1) ## 0000010E -/* 00874 809FD8A4 A46F010E */ sh $t7, 0x010E($v1) ## 0000010E -.L809FD8A8: -/* 00878 809FD8A8 1000001C */ beq $zero, $zero, .L809FD91C -/* 0087C 809FD8AC AE1801EC */ sw $t8, 0x01EC($s0) ## 000001EC -.L809FD8B0: -/* 00880 809FD8B0 8619008A */ lh $t9, 0x008A($s0) ## 0000008A -/* 00884 809FD8B4 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00888 809FD8B8 24095048 */ addiu $t1, $zero, 0x5048 ## $t1 = 00005048 -/* 0088C 809FD8BC A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 00890 809FD8C0 03281023 */ subu $v0, $t9, $t0 -/* 00894 809FD8C4 00021400 */ sll $v0, $v0, 16 -/* 00898 809FD8C8 00021403 */ sra $v0, $v0, 16 -/* 0089C 809FD8CC 04400003 */ bltz $v0, .L809FD8DC -/* 008A0 809FD8D0 00021823 */ subu $v1, $zero, $v0 -/* 008A4 809FD8D4 10000001 */ beq $zero, $zero, .L809FD8DC -/* 008A8 809FD8D8 00401825 */ or $v1, $v0, $zero ## $v1 = 8015E660 -.L809FD8DC: -/* 008AC 809FD8DC 28612151 */ slti $at, $v1, 0x2151 -/* 008B0 809FD8E0 1020000E */ beq $at, $zero, .L809FD91C -/* 008B4 809FD8E4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 008B8 809FD8E8 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 008BC 809FD8EC C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 008C0 809FD8F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008C4 809FD8F4 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 008C8 809FD8F8 4606203C */ c.lt.s $f4, $f6 -/* 008CC 809FD8FC 00000000 */ nop -/* 008D0 809FD900 45020007 */ bc1fl .L809FD920 -/* 008D4 809FD904 8FBF0024 */ lw $ra, 0x0024($sp) -/* 008D8 809FD908 0C00BCA6 */ jal func_8002F298 -/* 008DC 809FD90C 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 008E0 809FD910 960A01E8 */ lhu $t2, 0x01E8($s0) ## 000001E8 -/* 008E4 809FD914 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 008E8 809FD918 A60B01E8 */ sh $t3, 0x01E8($s0) ## 000001E8 -.L809FD91C: -/* 008EC 809FD91C 8FBF0024 */ lw $ra, 0x0024($sp) -.L809FD920: -/* 008F0 809FD920 8FB00020 */ lw $s0, 0x0020($sp) -/* 008F4 809FD924 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 008F8 809FD928 03E00008 */ jr $ra -/* 008FC 809FD92C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA38.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA38.s deleted file mode 100644 index 737128a909..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA38.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_809FDA38 -/* 00A08 809FDA38 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00A0C 809FDA3C AFA40000 */ sw $a0, 0x0000($sp) -/* 00A10 809FDA40 AFA60008 */ sw $a2, 0x0008($sp) -/* 00A14 809FDA44 14A1000B */ bne $a1, $at, .L809FDA74 -/* 00A18 809FDA48 AFA7000C */ sw $a3, 0x000C($sp) -/* 00A1C 809FDA4C 8FA20014 */ lw $v0, 0x0014($sp) -/* 00A20 809FDA50 8FA30010 */ lw $v1, 0x0010($sp) -/* 00A24 809FDA54 844F01DA */ lh $t7, 0x01DA($v0) ## 000001DA -/* 00A28 809FDA58 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -/* 00A2C 809FDA5C 84790004 */ lh $t9, 0x0004($v1) ## 00000004 -/* 00A30 809FDA60 01CFC021 */ addu $t8, $t6, $t7 -/* 00A34 809FDA64 A4780000 */ sh $t8, 0x0000($v1) ## 00000000 -/* 00A38 809FDA68 844801D8 */ lh $t0, 0x01D8($v0) ## 000001D8 -/* 00A3C 809FDA6C 03284821 */ addu $t1, $t9, $t0 -/* 00A40 809FDA70 A4690004 */ sh $t1, 0x0004($v1) ## 00000004 -.L809FDA74: -/* 00A44 809FDA74 03E00008 */ jr $ra -/* 00A48 809FDA78 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA7C.s deleted file mode 100644 index b05e34c9b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA7C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_809FDA7C -/* 00A4C 809FDA7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A50 809FDA80 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00A54 809FDA84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A58 809FDA88 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A5C 809FDA8C AFA60020 */ sw $a2, 0x0020($sp) -/* 00A60 809FDA90 14A10006 */ bne $a1, $at, .L809FDAAC -/* 00A64 809FDA94 AFA70024 */ sw $a3, 0x0024($sp) -/* 00A68 809FDA98 8FA50028 */ lw $a1, 0x0028($sp) -/* 00A6C 809FDA9C 3C0480A0 */ lui $a0, %hi(D_809FDB40) ## $a0 = 80A00000 -/* 00A70 809FDAA0 2484DB40 */ addiu $a0, $a0, %lo(D_809FDB40) ## $a0 = 809FDB40 -/* 00A74 809FDAA4 0C0346BD */ jal Matrix_MultVec3f -/* 00A78 809FDAA8 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L809FDAAC: -/* 00A7C 809FDAAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A80 809FDAB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A84 809FDAB4 03E00008 */ jr $ra -/* 00A88 809FDAB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s index feb6cc0c99..6ccf4c161b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s @@ -113,21 +113,21 @@ glabel func_80A07A4C /* 0025C 80A07BEC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00260 80A07BF0 000E7880 */ sll $t7, $t6, 2 /* 00264 80A07BF4 00CFC021 */ addu $t8, $a2, $t7 -/* 00268 80A07BF8 0C024BE2 */ jal func_80092F88 +/* 00268 80A07BF8 0C024BE2 */ jal Quake_Add /* 0026C 80A07BFC 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 /* 00270 80A07C00 00022400 */ sll $a0, $v0, 16 /* 00274 80A07C04 A7A2002A */ sh $v0, 0x002A($sp) /* 00278 80A07C08 00042403 */ sra $a0, $a0, 16 -/* 0027C 80A07C0C 0C024B6B */ jal func_80092DAC +/* 0027C 80A07C0C 0C024B6B */ jal Quake_SetSpeed /* 00280 80A07C10 24057FFF */ addiu $a1, $zero, 0x7FFF ## $a1 = 00007FFF /* 00284 80A07C14 87A4002A */ lh $a0, 0x002A($sp) /* 00288 80A07C18 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 0028C 80A07C1C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00290 80A07C20 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00294 80A07C24 0C024B9C */ jal func_80092E70 +/* 00294 80A07C24 0C024B9C */ jal Quake_SetQuakeValues /* 00298 80A07C28 AFA00010 */ sw $zero, 0x0010($sp) /* 0029C 80A07C2C 87A4002A */ lh $a0, 0x002A($sp) -/* 002A0 80A07C30 0C024B7C */ jal func_80092DF0 +/* 002A0 80A07C30 0C024B7C */ jal Quake_SetCountdown /* 002A4 80A07C34 2405012C */ addiu $a1, $zero, 0x012C ## $a1 = 0000012C /* 002A8 80A07C38 24080000 */ addiu $t0, $zero, 0x0000 ## $t0 = 00000000 /* 002AC 80A07C3C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s index f3c9edfe03..7eaf2d880c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s @@ -22,22 +22,22 @@ glabel func_80A4696C /* 03C8C 80A469BC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 03C90 80A469C0 00084880 */ sll $t1, $t0, 2 /* 03C94 80A469C4 00495021 */ addu $t2, $v0, $t1 -/* 03C98 80A469C8 0C024BE2 */ jal func_80092F88 +/* 03C98 80A469C8 0C024BE2 */ jal Quake_Add /* 03C9C 80A469CC 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 /* 03CA0 80A469D0 00022400 */ sll $a0, $v0, 16 /* 03CA4 80A469D4 AFA20030 */ sw $v0, 0x0030($sp) /* 03CA8 80A469D8 00042403 */ sra $a0, $a0, 16 -/* 03CAC 80A469DC 0C024B6B */ jal func_80092DAC +/* 03CAC 80A469DC 0C024B6B */ jal Quake_SetSpeed /* 03CB0 80A469E0 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 03CB4 80A469E4 87A40032 */ lh $a0, 0x0032($sp) /* 03CB8 80A469E8 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 03CBC 80A469EC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 03CC0 80A469F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 03CC4 80A469F4 AFA00010 */ sw $zero, 0x0010($sp) -/* 03CC8 80A469F8 0C024B9C */ jal func_80092E70 +/* 03CC8 80A469F8 0C024B9C */ jal Quake_SetQuakeValues /* 03CCC 80A469FC AFA4002C */ sw $a0, 0x002C($sp) /* 03CD0 80A46A00 8FA4002C */ lw $a0, 0x002C($sp) -/* 03CD4 80A46A04 0C024B7C */ jal func_80092DF0 +/* 03CD4 80A46A04 0C024B7C */ jal Quake_SetCountdown /* 03CD8 80A46A08 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 /* 03CDC 80A46A0C 10000004 */ beq $zero, $zero, .L80A46A20 /* 03CE0 80A46A10 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s index 4363f46031..e544acf2ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s @@ -80,22 +80,22 @@ glabel func_80A4CB78 /* 0100C 80A4CCAC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01010 80A4CCB0 000A5880 */ sll $t3, $t2, 2 /* 01014 80A4CCB4 022B6021 */ addu $t4, $s1, $t3 -/* 01018 80A4CCB8 0C024BE2 */ jal func_80092F88 +/* 01018 80A4CCB8 0C024BE2 */ jal Quake_Add /* 0101C 80A4CCBC 8D840790 */ lw $a0, 0x0790($t4) ## 00000790 /* 01020 80A4CCC0 00022400 */ sll $a0, $v0, 16 /* 01024 80A4CCC4 AFA2006C */ sw $v0, 0x006C($sp) /* 01028 80A4CCC8 00042403 */ sra $a0, $a0, 16 -/* 0102C 80A4CCCC 0C024B6B */ jal func_80092DAC +/* 0102C 80A4CCCC 0C024B6B */ jal Quake_SetSpeed /* 01030 80A4CCD0 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 01034 80A4CCD4 87A4006E */ lh $a0, 0x006E($sp) /* 01038 80A4CCD8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 0103C 80A4CCDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01040 80A4CCE0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01044 80A4CCE4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01048 80A4CCE8 0C024B9C */ jal func_80092E70 +/* 01048 80A4CCE8 0C024B9C */ jal Quake_SetQuakeValues /* 0104C 80A4CCEC AFA4002C */ sw $a0, 0x002C($sp) /* 01050 80A4CCF0 8FA4002C */ lw $a0, 0x002C($sp) -/* 01054 80A4CCF4 0C024B7C */ jal func_80092DF0 +/* 01054 80A4CCF4 0C024B7C */ jal Quake_SetCountdown /* 01058 80A4CCF8 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 /* 0105C 80A4CCFC 920F01D3 */ lbu $t7, 0x01D3($s0) ## 000001D3 .L80A4CD00: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s index c5ebaf2eb4..f206b8d042 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s @@ -58,12 +58,12 @@ glabel func_80A7F514 /* 0118C 80A7F5EC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01190 80A7F5F0 000E7880 */ sll $t7, $t6, 2 /* 01194 80A7F5F4 022FC021 */ addu $t8, $s1, $t7 -/* 01198 80A7F5F8 0C024BE2 */ jal func_80092F88 +/* 01198 80A7F5F8 0C024BE2 */ jal Quake_Add /* 0119C 80A7F5FC 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 /* 011A0 80A7F600 00022400 */ sll $a0, $v0, 16 /* 011A4 80A7F604 AFA20040 */ sw $v0, 0x0040($sp) /* 011A8 80A7F608 00042403 */ sra $a0, $a0, 16 -/* 011AC 80A7F60C 0C024B6B */ jal func_80092DAC +/* 011AC 80A7F60C 0C024B6B */ jal Quake_SetSpeed /* 011B0 80A7F610 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 011B4 80A7F614 87B10042 */ lh $s1, 0x0042($sp) /* 011B8 80A7F618 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 @@ -71,11 +71,11 @@ glabel func_80A7F514 /* 011C0 80A7F620 00112400 */ sll $a0, $s1, 16 /* 011C4 80A7F624 00042403 */ sra $a0, $a0, 16 /* 011C8 80A7F628 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 011CC 80A7F62C 0C024B9C */ jal func_80092E70 +/* 011CC 80A7F62C 0C024B9C */ jal Quake_SetQuakeValues /* 011D0 80A7F630 AFA00010 */ sw $zero, 0x0010($sp) /* 011D4 80A7F634 00112400 */ sll $a0, $s1, 16 /* 011D8 80A7F638 00042403 */ sra $a0, $a0, 16 -/* 011DC 80A7F63C 0C024B7C */ jal func_80092DF0 +/* 011DC 80A7F63C 0C024B7C */ jal Quake_SetCountdown /* 011E0 80A7F640 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 /* 011E4 80A7F644 C60C008C */ lwc1 $f12, 0x008C($s0) ## 0000008C /* 011E8 80A7F648 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s index 83ff2eda83..b4dd47324c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s @@ -112,21 +112,21 @@ glabel func_80B2EE9C /* 0024C 80B2F03C 844A07A0 */ lh $t2, 0x07A0($v0) ## 000007A0 /* 00250 80B2F040 000A5880 */ sll $t3, $t2, 2 /* 00254 80B2F044 004B6821 */ addu $t5, $v0, $t3 -/* 00258 80B2F048 0C024BE2 */ jal func_80092F88 +/* 00258 80B2F048 0C024BE2 */ jal Quake_Add /* 0025C 80B2F04C 8DA40790 */ lw $a0, 0x0790($t5) ## 00000790 /* 00260 80B2F050 00022400 */ sll $a0, $v0, 16 /* 00264 80B2F054 A7A20032 */ sh $v0, 0x0032($sp) /* 00268 80B2F058 00042403 */ sra $a0, $a0, 16 -/* 0026C 80B2F05C 0C024B6B */ jal func_80092DAC +/* 0026C 80B2F05C 0C024B6B */ jal Quake_SetSpeed /* 00270 80B2F060 24057FFF */ addiu $a1, $zero, 0x7FFF ## $a1 = 00007FFF /* 00274 80B2F064 87A40032 */ lh $a0, 0x0032($sp) /* 00278 80B2F068 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 /* 0027C 80B2F06C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00280 80B2F070 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00284 80B2F074 0C024B9C */ jal func_80092E70 +/* 00284 80B2F074 0C024B9C */ jal Quake_SetQuakeValues /* 00288 80B2F078 AFA00010 */ sw $zero, 0x0010($sp) /* 0028C 80B2F07C 87A40032 */ lh $a0, 0x0032($sp) -/* 00290 80B2F080 0C024B7C */ jal func_80092DF0 +/* 00290 80B2F080 0C024B7C */ jal Quake_SetCountdown /* 00294 80B2F084 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 /* 00298 80B2F088 3C0E80B3 */ lui $t6, %hi(func_80B2F0B8) ## $t6 = 80B30000 /* 0029C 80B2F08C 25CEF0B8 */ addiu $t6, $t6, %lo(func_80B2F0B8) ## $t6 = 80B2F0B8 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s index 088df3caf5..43f6fc13d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s @@ -25,22 +25,22 @@ glabel func_80B96560 /* 004E8 80B965B8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 004EC 80B965BC 00084880 */ sll $t1, $t0, 2 /* 004F0 80B965C0 00695021 */ addu $t2, $v1, $t1 -/* 004F4 80B965C4 0C024BE2 */ jal func_80092F88 +/* 004F4 80B965C4 0C024BE2 */ jal Quake_Add /* 004F8 80B965C8 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 /* 004FC 80B965CC 00022400 */ sll $a0, $v0, 16 /* 00500 80B965D0 AFA20030 */ sw $v0, 0x0030($sp) /* 00504 80B965D4 00042403 */ sra $a0, $a0, 16 -/* 00508 80B965D8 0C024B6B */ jal func_80092DAC +/* 00508 80B965D8 0C024B6B */ jal Quake_SetSpeed /* 0050C 80B965DC 24052710 */ addiu $a1, $zero, 0x2710 ## $a1 = 00002710 /* 00510 80B965E0 87A40032 */ lh $a0, 0x0032($sp) /* 00514 80B965E4 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 00518 80B965E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0051C 80B965EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00520 80B965F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00524 80B965F4 0C024B9C */ jal func_80092E70 +/* 00524 80B965F4 0C024B9C */ jal Quake_SetQuakeValues /* 00528 80B965F8 AFA4002C */ sw $a0, 0x002C($sp) /* 0052C 80B965FC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00530 80B96600 0C024B7C */ jal func_80092DF0 +/* 00530 80B96600 0C024B7C */ jal Quake_SetCountdown /* 00534 80B96604 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00538 80B96608 0C2E5993 */ jal func_80B9664C /* 0053C 80B9660C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s index 20394ae1c3..505fd54ac3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s @@ -7,22 +7,22 @@ glabel func_808429B4 /* 107B8 808429C8 0C030129 */ jal func_800C04A4 /* 107BC 808429CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 107C0 808429D0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 107C4 808429D4 0C024BE2 */ jal func_80092F88 +/* 107C4 808429D4 0C024BE2 */ jal Quake_Add /* 107C8 808429D8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 107CC 808429DC 00022400 */ sll $a0, $v0, 16 /* 107D0 808429E0 AFA2002C */ sw $v0, 0x002C($sp) /* 107D4 808429E4 00042403 */ sra $a0, $a0, 16 -/* 107D8 808429E8 0C024B6B */ jal func_80092DAC +/* 107D8 808429E8 0C024B6B */ jal Quake_SetSpeed /* 107DC 808429EC 87A50036 */ lh $a1, 0x0036($sp) /* 107E0 808429F0 87A4002E */ lh $a0, 0x002E($sp) /* 107E4 808429F4 87A5003A */ lh $a1, 0x003A($sp) /* 107E8 808429F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 107EC 808429FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 107F0 80842A00 AFA00010 */ sw $zero, 0x0010($sp) -/* 107F4 80842A04 0C024B9C */ jal func_80092E70 +/* 107F4 80842A04 0C024B9C */ jal Quake_SetQuakeValues /* 107F8 80842A08 AFA40024 */ sw $a0, 0x0024($sp) /* 107FC 80842A0C 8FA40024 */ lw $a0, 0x0024($sp) -/* 10800 80842A10 0C024B7C */ jal func_80092DF0 +/* 10800 80842A10 0C024B7C */ jal Quake_SetCountdown /* 10804 80842A14 87A5003E */ lh $a1, 0x003E($sp) /* 10808 80842A18 8FBF001C */ lw $ra, 0x001C($sp) /* 1080C 80842A1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/z_quake.s b/asm/z_quake.s deleted file mode 100644 index c442fe4e0d..0000000000 --- a/asm/z_quake.s +++ /dev/null @@ -1,1036 +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_80092500 -/* B096A0 80092500 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B096A4 80092504 AFBF0014 */ sw $ra, 0x14($sp) -/* B096A8 80092508 AFA40030 */ sw $a0, 0x30($sp) -/* B096AC 8009250C 00A03825 */ move $a3, $a1 -/* B096B0 80092510 AFA70034 */ sw $a3, 0x34($sp) -/* B096B4 80092514 00C02825 */ move $a1, $a2 -/* B096B8 80092518 0C01F097 */ jal func_8007C25C -/* B096BC 8009251C 27A40018 */ addiu $a0, $sp, 0x18 -/* B096C0 80092520 8FA70034 */ lw $a3, 0x34($sp) -/* B096C4 80092524 C7A60018 */ lwc1 $f6, 0x18($sp) -/* B096C8 80092528 C7B0001C */ lwc1 $f16, 0x1c($sp) -/* B096CC 8009252C C4E40000 */ lwc1 $f4, ($a3) -/* B096D0 80092530 27AE0024 */ addiu $t6, $sp, 0x24 -/* B096D4 80092534 8FA20030 */ lw $v0, 0x30($sp) -/* B096D8 80092538 46062200 */ add.s $f8, $f4, $f6 -/* B096DC 8009253C C7A60020 */ lwc1 $f6, 0x20($sp) -/* B096E0 80092540 E7A80024 */ swc1 $f8, 0x24($sp) -/* B096E4 80092544 C4EA0004 */ lwc1 $f10, 4($a3) -/* B096E8 80092548 46105480 */ add.s $f18, $f10, $f16 -/* B096EC 8009254C E7B20028 */ swc1 $f18, 0x28($sp) -/* B096F0 80092550 C4E40008 */ lwc1 $f4, 8($a3) -/* B096F4 80092554 46062200 */ add.s $f8, $f4, $f6 -/* B096F8 80092558 E7A8002C */ swc1 $f8, 0x2c($sp) -/* B096FC 8009255C 8DD80000 */ lw $t8, ($t6) -/* B09700 80092560 AC580000 */ sw $t8, ($v0) -/* B09704 80092564 8DCF0004 */ lw $t7, 4($t6) -/* B09708 80092568 AC4F0004 */ sw $t7, 4($v0) -/* B0970C 8009256C 8DD80008 */ lw $t8, 8($t6) -/* B09710 80092570 AC580008 */ sw $t8, 8($v0) -/* B09714 80092574 8FBF0014 */ lw $ra, 0x14($sp) -/* B09718 80092578 27BD0030 */ addiu $sp, $sp, 0x30 -/* B0971C 8009257C 03E00008 */ jr $ra -/* B09720 80092580 00000000 */ nop - -glabel func_80092584 -/* B09724 80092584 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B09728 80092588 AFBF0024 */ sw $ra, 0x24($sp) -/* B0972C 8009258C AFB10020 */ sw $s1, 0x20($sp) -/* B09730 80092590 AFB0001C */ sw $s0, 0x1c($sp) -/* B09734 80092594 F7B40010 */ sdc1 $f20, 0x10($sp) -/* B09738 80092598 AFA50064 */ sw $a1, 0x64($sp) -/* B0973C 8009259C AFA7006C */ sw $a3, 0x6c($sp) -/* B09740 800925A0 8C820004 */ lw $v0, 4($a0) -/* B09744 800925A4 848E001C */ lh $t6, 0x1c($a0) -/* B09748 800925A8 4486A000 */ mtc1 $a2, $f20 -/* B0974C 800925AC 00A03825 */ move $a3, $a1 -/* B09750 800925B0 00808025 */ move $s0, $a0 -/* B09754 800925B4 24460050 */ addiu $a2, $v0, 0x50 -/* B09758 800925B8 11C00031 */ beqz $t6, .L80092680 -/* B0975C 800925BC 2451005C */ addiu $s1, $v0, 0x5c -/* B09760 800925C0 44800000 */ mtc1 $zero, $f0 -/* B09764 800925C4 27A4003C */ addiu $a0, $sp, 0x3c -/* B09768 800925C8 02202825 */ move $a1, $s1 -/* B0976C 800925CC AFA70064 */ sw $a3, 0x64($sp) -/* B09770 800925D0 E7A0004C */ swc1 $f0, 0x4c($sp) -/* B09774 800925D4 E7A00050 */ swc1 $f0, 0x50($sp) -/* B09778 800925D8 0C01F124 */ jal func_8007C490 -/* B0977C 800925DC E7A00054 */ swc1 $f0, 0x54($sp) -/* B09780 800925E0 860F000C */ lh $t7, 0xc($s0) -/* B09784 800925E4 87B80040 */ lh $t8, 0x40($sp) -/* B09788 800925E8 87AA0042 */ lh $t2, 0x42($sp) -/* B0978C 800925EC 448F2000 */ mtc1 $t7, $f4 -/* B09790 800925F0 27B1004C */ addiu $s1, $sp, 0x4c -/* B09794 800925F4 02202025 */ move $a0, $s1 -/* B09798 800925F8 468021A0 */ cvt.s.w $f6, $f4 -/* B0979C 800925FC 02202825 */ move $a1, $s1 -/* B097A0 80092600 27A60044 */ addiu $a2, $sp, 0x44 -/* B097A4 80092604 46143202 */ mul.s $f8, $f6, $f20 -/* B097A8 80092608 E7A80044 */ swc1 $f8, 0x44($sp) -/* B097AC 8009260C 86190014 */ lh $t9, 0x14($s0) -/* B097B0 80092610 03194021 */ addu $t0, $t8, $t9 -/* B097B4 80092614 25094000 */ addiu $t1, $t0, 0x4000 -/* B097B8 80092618 A7A90048 */ sh $t1, 0x48($sp) -/* B097BC 8009261C 860B0016 */ lh $t3, 0x16($s0) -/* B097C0 80092620 014B6021 */ addu $t4, $t2, $t3 -/* B097C4 80092624 0C024940 */ jal func_80092500 -/* B097C8 80092628 A7AC004A */ sh $t4, 0x4a($sp) -/* B097CC 8009262C 860D000E */ lh $t5, 0xe($s0) -/* B097D0 80092630 C7B2006C */ lwc1 $f18, 0x6c($sp) -/* B097D4 80092634 87AE0040 */ lh $t6, 0x40($sp) -/* B097D8 80092638 448D5000 */ mtc1 $t5, $f10 -/* B097DC 8009263C 87B90042 */ lh $t9, 0x42($sp) -/* B097E0 80092640 02202025 */ move $a0, $s1 -/* B097E4 80092644 46805420 */ cvt.s.w $f16, $f10 -/* B097E8 80092648 02202825 */ move $a1, $s1 -/* B097EC 8009264C 27A60044 */ addiu $a2, $sp, 0x44 -/* B097F0 80092650 46128102 */ mul.s $f4, $f16, $f18 -/* B097F4 80092654 E7A40044 */ swc1 $f4, 0x44($sp) -/* B097F8 80092658 860F0014 */ lh $t7, 0x14($s0) -/* B097FC 8009265C 01CFC021 */ addu $t8, $t6, $t7 -/* B09800 80092660 A7B80048 */ sh $t8, 0x48($sp) -/* B09804 80092664 86080016 */ lh $t0, 0x16($s0) -/* B09808 80092668 03284821 */ addu $t1, $t9, $t0 -/* B0980C 8009266C 252A4000 */ addiu $t2, $t1, 0x4000 -/* B09810 80092670 0C024940 */ jal func_80092500 -/* B09814 80092674 A7AA004A */ sh $t2, 0x4a($sp) -/* B09818 80092678 1000001B */ b .L800926E8 -/* B0981C 8009267C 8FA70064 */ lw $a3, 0x64($sp) -.L80092680: -/* B09820 80092680 44800000 */ mtc1 $zero, $f0 -/* B09824 80092684 C7A4006C */ lwc1 $f4, 0x6c($sp) -/* B09828 80092688 27B1004C */ addiu $s1, $sp, 0x4c -/* B0982C 8009268C E7A0004C */ swc1 $f0, 0x4c($sp) -/* B09830 80092690 860B000C */ lh $t3, 0xc($s0) -/* B09834 80092694 E7A00054 */ swc1 $f0, 0x54($sp) -/* B09838 80092698 02202025 */ move $a0, $s1 -/* B0983C 8009269C 448B3000 */ mtc1 $t3, $f6 -/* B09840 800926A0 02202825 */ move $a1, $s1 -/* B09844 800926A4 27A60044 */ addiu $a2, $sp, 0x44 -/* B09848 800926A8 46803220 */ cvt.s.w $f8, $f6 -/* B0984C 800926AC 46144282 */ mul.s $f10, $f8, $f20 -/* B09850 800926B0 E7AA0050 */ swc1 $f10, 0x50($sp) -/* B09854 800926B4 860C000E */ lh $t4, 0xe($s0) -/* B09858 800926B8 448C8000 */ mtc1 $t4, $f16 -/* B0985C 800926BC 00000000 */ nop -/* B09860 800926C0 468084A0 */ cvt.s.w $f18, $f16 -/* B09864 800926C4 46049182 */ mul.s $f6, $f18, $f4 -/* B09868 800926C8 E7A60044 */ swc1 $f6, 0x44($sp) -/* B0986C 800926CC 860D0014 */ lh $t5, 0x14($s0) -/* B09870 800926D0 A7AD0048 */ sh $t5, 0x48($sp) -/* B09874 800926D4 860E0016 */ lh $t6, 0x16($s0) -/* B09878 800926D8 AFA70064 */ sw $a3, 0x64($sp) -/* B0987C 800926DC 0C024940 */ jal func_80092500 -/* B09880 800926E0 A7AE004A */ sh $t6, 0x4a($sp) -/* B09884 800926E4 8FA70064 */ lw $a3, 0x64($sp) -.L800926E8: -/* B09888 800926E8 8E380000 */ lw $t8, ($s1) -/* B0988C 800926EC 27A20030 */ addiu $v0, $sp, 0x30 -/* B09890 800926F0 8E2F0004 */ lw $t7, 4($s1) -/* B09894 800926F4 AC580000 */ sw $t8, ($v0) -/* B09898 800926F8 8E380008 */ lw $t8, 8($s1) -/* B0989C 800926FC 8C480000 */ lw $t0, ($v0) -/* B098A0 80092700 AC4F0004 */ sw $t7, 4($v0) -/* B098A4 80092704 AC580008 */ sw $t8, 8($v0) -/* B098A8 80092708 ACE8000C */ sw $t0, 0xc($a3) -/* B098AC 8009270C 8C590004 */ lw $t9, 4($v0) -/* B098B0 80092710 3C014700 */ li $at, 0x47000000 # 0.000000 -/* B098B4 80092714 44814000 */ mtc1 $at, $f8 -/* B098B8 80092718 ACF90010 */ sw $t9, 0x10($a3) -/* B098BC 8009271C 8C480008 */ lw $t0, 8($v0) -/* B098C0 80092720 46144282 */ mul.s $f10, $f8, $f20 -/* B098C4 80092724 ACE80014 */ sw $t0, 0x14($a3) -/* B098C8 80092728 8C4A0000 */ lw $t2, ($v0) -/* B098CC 8009272C ACEA0000 */ sw $t2, ($a3) -/* B098D0 80092730 4600540D */ trunc.w.s $f16, $f10 -/* B098D4 80092734 8C490004 */ lw $t1, 4($v0) -/* B098D8 80092738 ACE90004 */ sw $t1, 4($a3) -/* B098DC 8009273C 8C4A0008 */ lw $t2, 8($v0) -/* B098E0 80092740 440C8000 */ mfc1 $t4, $f16 -/* B098E4 80092744 ACEA0008 */ sw $t2, 8($a3) -/* B098E8 80092748 A4EC001A */ sh $t4, 0x1a($a3) -/* B098EC 8009274C 860D0012 */ lh $t5, 0x12($s0) -/* B098F0 80092750 448D9000 */ mtc1 $t5, $f18 -/* B098F4 80092754 00000000 */ nop -/* B098F8 80092758 46809120 */ cvt.s.w $f4, $f18 -/* B098FC 8009275C 46142182 */ mul.s $f6, $f4, $f20 -/* B09900 80092760 4600320D */ trunc.w.s $f8, $f6 -/* B09904 80092764 440F4000 */ mfc1 $t7, $f8 -/* B09908 80092768 00000000 */ nop -/* B0990C 8009276C A4EF0018 */ sh $t7, 0x18($a3) -/* B09910 80092770 86180010 */ lh $t8, 0x10($s0) -/* B09914 80092774 44985000 */ mtc1 $t8, $f10 -/* B09918 80092778 00000000 */ nop -/* B0991C 8009277C 46805420 */ cvt.s.w $f16, $f10 -/* B09920 80092780 46148482 */ mul.s $f18, $f16, $f20 -/* B09924 80092784 4600910D */ trunc.w.s $f4, $f18 -/* B09928 80092788 44082000 */ mfc1 $t0, $f4 -/* B0992C 8009278C 00000000 */ nop -/* B09930 80092790 A4E8001C */ sh $t0, 0x1c($a3) -/* B09934 80092794 8FBF0024 */ lw $ra, 0x24($sp) -/* B09938 80092798 8FB10020 */ lw $s1, 0x20($sp) -/* B0993C 8009279C 8FB0001C */ lw $s0, 0x1c($sp) -/* B09940 800927A0 D7B40010 */ ldc1 $f20, 0x10($sp) -/* B09944 800927A4 03E00008 */ jr $ra -/* B09948 800927A8 27BD0060 */ addiu $sp, $sp, 0x60 - -glabel func_800927AC -/* B0994C 800927AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B09950 800927B0 AFBF001C */ sw $ra, 0x1c($sp) -/* B09954 800927B4 AFB00018 */ sw $s0, 0x18($sp) -/* B09958 800927B8 AFA5002C */ sw $a1, 0x2c($sp) -/* B0995C 800927BC 8483001E */ lh $v1, 0x1e($a0) -/* B09960 800927C0 00808025 */ move $s0, $a0 -/* B09964 800927C4 58600016 */ blezl $v1, .L80092820 -/* B09968 800927C8 8FBF001C */ lw $ra, 0x1c($sp) -/* B0996C 800927CC 848E001A */ lh $t6, 0x1a($a0) -/* B09970 800927D0 01C30019 */ multu $t6, $v1 -/* B09974 800927D4 00002012 */ mflo $a0 -/* B09978 800927D8 00042400 */ sll $a0, $a0, 0x10 -/* B0997C 800927DC 0C01DE1C */ jal Math_Sins -/* B09980 800927E0 00042403 */ sra $a0, $a0, 0x10 -/* B09984 800927E4 0C03F66B */ jal Math_Rand_ZeroOne -/* B09988 800927E8 E7A00020 */ swc1 $f0, 0x20($sp) -/* B0998C 800927EC C7A20020 */ lwc1 $f2, 0x20($sp) -/* B09990 800927F0 02002025 */ move $a0, $s0 -/* B09994 800927F4 8FA5002C */ lw $a1, 0x2c($sp) -/* B09998 800927F8 46020102 */ mul.s $f4, $f0, $f2 -/* B0999C 800927FC 44061000 */ mfc1 $a2, $f2 -/* B099A0 80092800 44072000 */ mfc1 $a3, $f4 -/* B099A4 80092804 0C024961 */ jal func_80092584 -/* B099A8 80092808 00000000 */ nop -/* B099AC 8009280C 860F001E */ lh $t7, 0x1e($s0) -/* B099B0 80092810 25F8FFFF */ addiu $t8, $t7, -1 -/* B099B4 80092814 A618001E */ sh $t8, 0x1e($s0) -/* B099B8 80092818 8603001E */ lh $v1, 0x1e($s0) -/* B099BC 8009281C 8FBF001C */ lw $ra, 0x1c($sp) -.L80092820: -/* B099C0 80092820 8FB00018 */ lw $s0, 0x18($sp) -/* B099C4 80092824 27BD0028 */ addiu $sp, $sp, 0x28 -/* B099C8 80092828 03E00008 */ jr $ra -/* B099CC 8009282C 00601025 */ move $v0, $v1 - -glabel func_80092830 -/* B099D0 80092830 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B099D4 80092834 AFBF001C */ sw $ra, 0x1c($sp) -/* B099D8 80092838 AFB00018 */ sw $s0, 0x18($sp) -/* B099DC 8009283C AFA50024 */ sw $a1, 0x24($sp) -/* B099E0 80092840 8483001E */ lh $v1, 0x1e($a0) -/* B099E4 80092844 00808025 */ move $s0, $a0 -/* B099E8 80092848 58600011 */ blezl $v1, .L80092890 -/* B099EC 8009284C 8FBF001C */ lw $ra, 0x1c($sp) -/* B099F0 80092850 848E001A */ lh $t6, 0x1a($a0) -/* B099F4 80092854 01C30019 */ multu $t6, $v1 -/* B099F8 80092858 00002012 */ mflo $a0 -/* B099FC 8009285C 00042400 */ sll $a0, $a0, 0x10 -/* B09A00 80092860 0C01DE1C */ jal Math_Sins -/* B09A04 80092864 00042403 */ sra $a0, $a0, 0x10 -/* B09A08 80092868 44060000 */ mfc1 $a2, $f0 -/* B09A0C 8009286C 44070000 */ mfc1 $a3, $f0 -/* B09A10 80092870 02002025 */ move $a0, $s0 -/* B09A14 80092874 0C024961 */ jal func_80092584 -/* B09A18 80092878 8FA50024 */ lw $a1, 0x24($sp) -/* B09A1C 8009287C 860F001E */ lh $t7, 0x1e($s0) -/* B09A20 80092880 25F8FFFF */ addiu $t8, $t7, -1 -/* B09A24 80092884 A618001E */ sh $t8, 0x1e($s0) -/* B09A28 80092888 8603001E */ lh $v1, 0x1e($s0) -/* B09A2C 8009288C 8FBF001C */ lw $ra, 0x1c($sp) -.L80092890: -/* B09A30 80092890 8FB00018 */ lw $s0, 0x18($sp) -/* B09A34 80092894 27BD0020 */ addiu $sp, $sp, 0x20 -/* B09A38 80092898 03E00008 */ jr $ra -/* B09A3C 8009289C 00601025 */ move $v0, $v1 - -glabel func_800928A0 -/* B09A40 800928A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B09A44 800928A4 AFBF001C */ sw $ra, 0x1c($sp) -/* B09A48 800928A8 AFB00018 */ sw $s0, 0x18($sp) -/* B09A4C 800928AC AFA5002C */ sw $a1, 0x2c($sp) -/* B09A50 800928B0 848E001E */ lh $t6, 0x1e($a0) -/* B09A54 800928B4 8498001A */ lh $t8, 0x1a($a0) -/* B09A58 800928B8 00808025 */ move $s0, $a0 -/* B09A5C 800928BC 25CFFFFF */ addiu $t7, $t6, -1 -/* B09A60 800928C0 A48F001E */ sh $t7, 0x1e($a0) -/* B09A64 800928C4 8499001E */ lh $t9, 0x1e($a0) -/* B09A68 800928C8 3328000F */ andi $t0, $t9, 0xf -/* B09A6C 800928CC 250901F4 */ addiu $t1, $t0, 0x1f4 -/* B09A70 800928D0 03090019 */ multu $t8, $t1 -/* B09A74 800928D4 00002012 */ mflo $a0 -/* B09A78 800928D8 00042400 */ sll $a0, $a0, 0x10 -/* B09A7C 800928DC 0C01DE1C */ jal Math_Sins -/* B09A80 800928E0 00042403 */ sra $a0, $a0, 0x10 -/* B09A84 800928E4 0C03F66B */ jal Math_Rand_ZeroOne -/* B09A88 800928E8 E7A00020 */ swc1 $f0, 0x20($sp) -/* B09A8C 800928EC C7A20020 */ lwc1 $f2, 0x20($sp) -/* B09A90 800928F0 02002025 */ move $a0, $s0 -/* B09A94 800928F4 8FA5002C */ lw $a1, 0x2c($sp) -/* B09A98 800928F8 46020102 */ mul.s $f4, $f0, $f2 -/* B09A9C 800928FC 44061000 */ mfc1 $a2, $f2 -/* B09AA0 80092900 44072000 */ mfc1 $a3, $f4 -/* B09AA4 80092904 0C024961 */ jal func_80092584 -/* B09AA8 80092908 00000000 */ nop -/* B09AAC 8009290C 8FBF001C */ lw $ra, 0x1c($sp) -/* B09AB0 80092910 8FB00018 */ lw $s0, 0x18($sp) -/* B09AB4 80092914 27BD0028 */ addiu $sp, $sp, 0x28 -/* B09AB8 80092918 03E00008 */ jr $ra -/* B09ABC 8009291C 24020001 */ li $v0, 1 - -glabel func_80092920 -/* B09AC0 80092920 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B09AC4 80092924 AFBF001C */ sw $ra, 0x1c($sp) -/* B09AC8 80092928 AFB00018 */ sw $s0, 0x18($sp) -/* B09ACC 8009292C AFA50024 */ sw $a1, 0x24($sp) -/* B09AD0 80092930 8483001E */ lh $v1, 0x1e($a0) -/* B09AD4 80092934 00808025 */ move $s0, $a0 -/* B09AD8 80092938 5860001A */ blezl $v1, .L800929A4 -/* B09ADC 8009293C 8FBF001C */ lw $ra, 0x1c($sp) -/* B09AE0 80092940 848E001A */ lh $t6, 0x1a($a0) -/* B09AE4 80092944 01C30019 */ multu $t6, $v1 -/* B09AE8 80092948 00002012 */ mflo $a0 -/* B09AEC 8009294C 00042400 */ sll $a0, $a0, 0x10 -/* B09AF0 80092950 0C01DE1C */ jal Math_Sins -/* B09AF4 80092954 00042403 */ sra $a0, $a0, 0x10 -/* B09AF8 80092958 860F001E */ lh $t7, 0x1e($s0) -/* B09AFC 8009295C 86180002 */ lh $t8, 2($s0) -/* B09B00 80092960 02002025 */ move $a0, $s0 -/* B09B04 80092964 448F2000 */ mtc1 $t7, $f4 -/* B09B08 80092968 44984000 */ mtc1 $t8, $f8 -/* B09B0C 8009296C 8FA50024 */ lw $a1, 0x24($sp) -/* B09B10 80092970 468021A0 */ cvt.s.w $f6, $f4 -/* B09B14 80092974 468042A0 */ cvt.s.w $f10, $f8 -/* B09B18 80092978 460A3403 */ div.s $f16, $f6, $f10 -/* B09B1C 8009297C 46100082 */ mul.s $f2, $f0, $f16 -/* B09B20 80092980 44061000 */ mfc1 $a2, $f2 -/* B09B24 80092984 44071000 */ mfc1 $a3, $f2 -/* B09B28 80092988 0C024961 */ jal func_80092584 -/* B09B2C 8009298C 00000000 */ nop -/* B09B30 80092990 8619001E */ lh $t9, 0x1e($s0) -/* B09B34 80092994 2728FFFF */ addiu $t0, $t9, -1 -/* B09B38 80092998 A608001E */ sh $t0, 0x1e($s0) -/* B09B3C 8009299C 8603001E */ lh $v1, 0x1e($s0) -/* B09B40 800929A0 8FBF001C */ lw $ra, 0x1c($sp) -.L800929A4: -/* B09B44 800929A4 8FB00018 */ lw $s0, 0x18($sp) -/* B09B48 800929A8 27BD0020 */ addiu $sp, $sp, 0x20 -/* B09B4C 800929AC 03E00008 */ jr $ra -/* B09B50 800929B0 00601025 */ move $v0, $v1 - -glabel func_800929B4 -/* B09B54 800929B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B09B58 800929B8 AFBF0014 */ sw $ra, 0x14($sp) -/* B09B5C 800929BC AFA50024 */ sw $a1, 0x24($sp) -/* B09B60 800929C0 8483001E */ lh $v1, 0x1e($a0) -/* B09B64 800929C4 58600013 */ blezl $v1, .L80092A14 -/* B09B68 800929C8 8FBF0014 */ lw $ra, 0x14($sp) -/* B09B6C 800929CC 0C03F66B */ jal Math_Rand_ZeroOne -/* B09B70 800929D0 AFA40020 */ sw $a0, 0x20($sp) -/* B09B74 800929D4 0C03F66B */ jal Math_Rand_ZeroOne -/* B09B78 800929D8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B09B7C 800929DC C7A2001C */ lwc1 $f2, 0x1c($sp) -/* B09B80 800929E0 8FA40020 */ lw $a0, 0x20($sp) -/* B09B84 800929E4 8FA50024 */ lw $a1, 0x24($sp) -/* B09B88 800929E8 46020102 */ mul.s $f4, $f0, $f2 -/* B09B8C 800929EC 44061000 */ mfc1 $a2, $f2 -/* B09B90 800929F0 44072000 */ mfc1 $a3, $f4 -/* B09B94 800929F4 0C024961 */ jal func_80092584 -/* B09B98 800929F8 00000000 */ nop -/* B09B9C 800929FC 8FA40020 */ lw $a0, 0x20($sp) -/* B09BA0 80092A00 848E001E */ lh $t6, 0x1e($a0) -/* B09BA4 80092A04 25CFFFFF */ addiu $t7, $t6, -1 -/* B09BA8 80092A08 A48F001E */ sh $t7, 0x1e($a0) -/* B09BAC 80092A0C 8483001E */ lh $v1, 0x1e($a0) -/* B09BB0 80092A10 8FBF0014 */ lw $ra, 0x14($sp) -.L80092A14: -/* B09BB4 80092A14 27BD0020 */ addiu $sp, $sp, 0x20 -/* B09BB8 80092A18 00601025 */ move $v0, $v1 -/* B09BBC 80092A1C 03E00008 */ jr $ra -/* B09BC0 80092A20 00000000 */ nop - -glabel func_80092A24 -/* B09BC4 80092A24 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B09BC8 80092A28 AFBF001C */ sw $ra, 0x1c($sp) -/* B09BCC 80092A2C AFB00018 */ sw $s0, 0x18($sp) -/* B09BD0 80092A30 AFA5002C */ sw $a1, 0x2c($sp) -/* B09BD4 80092A34 8483001E */ lh $v1, 0x1e($a0) -/* B09BD8 80092A38 00808025 */ move $s0, $a0 -/* B09BDC 80092A3C 5860001A */ blezl $v1, .L80092AA8 -/* B09BE0 80092A40 8FBF001C */ lw $ra, 0x1c($sp) -/* B09BE4 80092A44 0C03F66B */ jal Math_Rand_ZeroOne -/* B09BE8 80092A48 00000000 */ nop -/* B09BEC 80092A4C 860E001E */ lh $t6, 0x1e($s0) -/* B09BF0 80092A50 860F0002 */ lh $t7, 2($s0) -/* B09BF4 80092A54 448E2000 */ mtc1 $t6, $f4 -/* B09BF8 80092A58 448F4000 */ mtc1 $t7, $f8 -/* B09BFC 80092A5C 468021A0 */ cvt.s.w $f6, $f4 -/* B09C00 80092A60 468042A0 */ cvt.s.w $f10, $f8 -/* B09C04 80092A64 460A3403 */ div.s $f16, $f6, $f10 -/* B09C08 80092A68 46100082 */ mul.s $f2, $f0, $f16 -/* B09C0C 80092A6C 0C03F66B */ jal Math_Rand_ZeroOne -/* B09C10 80092A70 E7A20024 */ swc1 $f2, 0x24($sp) -/* B09C14 80092A74 C7A20024 */ lwc1 $f2, 0x24($sp) -/* B09C18 80092A78 02002025 */ move $a0, $s0 -/* B09C1C 80092A7C 8FA5002C */ lw $a1, 0x2c($sp) -/* B09C20 80092A80 46020482 */ mul.s $f18, $f0, $f2 -/* B09C24 80092A84 44061000 */ mfc1 $a2, $f2 -/* B09C28 80092A88 44079000 */ mfc1 $a3, $f18 -/* B09C2C 80092A8C 0C024961 */ jal func_80092584 -/* B09C30 80092A90 00000000 */ nop -/* B09C34 80092A94 8618001E */ lh $t8, 0x1e($s0) -/* B09C38 80092A98 2719FFFF */ addiu $t9, $t8, -1 -/* B09C3C 80092A9C A619001E */ sh $t9, 0x1e($s0) -/* B09C40 80092AA0 8603001E */ lh $v1, 0x1e($s0) -/* B09C44 80092AA4 8FBF001C */ lw $ra, 0x1c($sp) -.L80092AA8: -/* B09C48 80092AA8 8FB00018 */ lw $s0, 0x18($sp) -/* B09C4C 80092AAC 27BD0028 */ addiu $sp, $sp, 0x28 -/* B09C50 80092AB0 03E00008 */ jr $ra -/* B09C54 80092AB4 00601025 */ move $v0, $v1 - -glabel func_80092AB8 -/* B09C58 80092AB8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B09C5C 80092ABC 3C028016 */ lui $v0, %hi(D_80160020) # $v0, 0x8016 -/* B09C60 80092AC0 AFBF0014 */ sw $ra, 0x14($sp) -/* B09C64 80092AC4 3C050001 */ lui $a1, 1 -/* B09C68 80092AC8 24420020 */ addiu $v0, %lo(D_80160020) # addiu $v0, $v0, 0x20 -/* B09C6C 80092ACC 8FA70018 */ lw $a3, 0x18($sp) -/* B09C70 80092AD0 00002025 */ move $a0, $zero -/* B09C74 80092AD4 24060004 */ li $a2, 4 -.L80092AD8: -/* B09C78 80092AD8 8C4E0008 */ lw $t6, 8($v0) -/* B09C7C 80092ADC 55C00005 */ bnezl $t6, .L80092AF4 -/* B09C80 80092AE0 8443001E */ lh $v1, 0x1e($v0) -/* B09C84 80092AE4 00803825 */ move $a3, $a0 -/* B09C88 80092AE8 1000000A */ b .L80092B14 -/* B09C8C 80092AEC 3C050002 */ lui $a1, 2 -/* B09C90 80092AF0 8443001E */ lh $v1, 0x1e($v0) -.L80092AF4: -/* B09C94 80092AF4 0065082A */ slt $at, $v1, $a1 -/* B09C98 80092AF8 50200004 */ beql $at, $zero, .L80092B0C -/* B09C9C 80092AFC 24840001 */ addiu $a0, $a0, 1 -/* B09CA0 80092B00 00602825 */ move $a1, $v1 -/* B09CA4 80092B04 00803825 */ move $a3, $a0 -/* B09CA8 80092B08 24840001 */ addiu $a0, $a0, 1 -.L80092B0C: -/* B09CAC 80092B0C 1486FFF2 */ bne $a0, $a2, .L80092AD8 -/* B09CB0 80092B10 24420024 */ addiu $v0, $v0, 0x24 -.L80092B14: -/* B09CB4 80092B14 3C010002 */ lui $at, 2 -/* B09CB8 80092B18 10A10006 */ beq $a1, $at, .L80092B34 -/* B09CBC 80092B1C 3C048014 */ lui $a0, %hi(D_8013E9E0) # $a0, 0x8014 -/* B09CC0 80092B20 2484E9E0 */ addiu $a0, %lo(D_8013E9E0) # addiu $a0, $a0, -0x1620 -/* B09CC4 80092B24 00E02825 */ move $a1, $a3 -/* B09CC8 80092B28 0C00084C */ jal osSyncPrintf -/* B09CCC 80092B2C AFA70018 */ sw $a3, 0x18($sp) -/* B09CD0 80092B30 8FA70018 */ lw $a3, 0x18($sp) -.L80092B34: -/* B09CD4 80092B34 8FBF0014 */ lw $ra, 0x14($sp) -/* B09CD8 80092B38 00071400 */ sll $v0, $a3, 0x10 -/* B09CDC 80092B3C 00021403 */ sra $v0, $v0, 0x10 -/* B09CE0 80092B40 03E00008 */ jr $ra -/* B09CE4 80092B44 27BD0020 */ addiu $sp, $sp, 0x20 - -glabel func_80092B48 -/* B09CE8 80092B48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B09CEC 80092B4C AFBF0014 */ sw $ra, 0x14($sp) -/* B09CF0 80092B50 AFA40020 */ sw $a0, 0x20($sp) -/* B09CF4 80092B54 0C024AAE */ jal func_80092AB8 -/* B09CF8 80092B58 AFA50024 */ sw $a1, 0x24($sp) -/* B09CFC 80092B5C 000270C0 */ sll $t6, $v0, 3 -/* B09D00 80092B60 01C27021 */ addu $t6, $t6, $v0 -/* B09D04 80092B64 3C0F8016 */ lui $t7, %hi(D_80160020) # $t7, 0x8016 -/* B09D08 80092B68 25EF0020 */ addiu $t7, %lo(D_80160020) # addiu $t7, $t7, 0x20 -/* B09D0C 80092B6C 000E7080 */ sll $t6, $t6, 2 -/* B09D10 80092B70 01CF2021 */ addu $a0, $t6, $t7 -/* B09D14 80092B74 A7A2001E */ sh $v0, 0x1e($sp) -/* B09D18 80092B78 AFA40018 */ sw $a0, 0x18($sp) -/* B09D1C 80092B7C 00002825 */ move $a1, $zero -/* B09D20 80092B80 0C041A18 */ jal func_80106860 -/* B09D24 80092B84 24060024 */ li $a2, 36 -/* B09D28 80092B88 8FA30018 */ lw $v1, 0x18($sp) -/* B09D2C 80092B8C 8FA40020 */ lw $a0, 0x20($sp) -/* B09D30 80092B90 24080001 */ li $t0, 1 -/* B09D34 80092B94 AC640004 */ sw $a0, 4($v1) -/* B09D38 80092B98 84980164 */ lh $t8, 0x164($a0) -/* B09D3C 80092B9C A4780020 */ sh $t8, 0x20($v1) -/* B09D40 80092BA0 8FB90024 */ lw $t9, 0x24($sp) -/* B09D44 80092BA4 A468001C */ sh $t0, 0x1c($v1) -/* B09D48 80092BA8 0C03F66B */ jal Math_Rand_ZeroOne -/* B09D4C 80092BAC AC790008 */ sw $t9, 8($v1) -/* B09D50 80092BB0 3C014780 */ li $at, 0x47800000 # 0.000000 -/* B09D54 80092BB4 44812000 */ mtc1 $at, $f4 -/* B09D58 80092BB8 87AE001E */ lh $t6, 0x1e($sp) -/* B09D5C 80092BBC 8FA20018 */ lw $v0, 0x18($sp) -/* B09D60 80092BC0 46040182 */ mul.s $f6, $f0, $f4 -/* B09D64 80092BC4 3C048012 */ lui $a0, %hi(D_80126254) # $a0, 0x8012 -/* B09D68 80092BC8 24846254 */ addiu $a0, %lo(D_80126254) # addiu $a0, $a0, 0x6254 -/* B09D6C 80092BCC 4600320D */ trunc.w.s $f8, $f6 -/* B09D70 80092BD0 440C4000 */ mfc1 $t4, $f8 -/* B09D74 80092BD4 00000000 */ nop -/* B09D78 80092BD8 318DFFFC */ andi $t5, $t4, 0xfffc -/* B09D7C 80092BDC 01AE7821 */ addu $t7, $t5, $t6 -/* B09D80 80092BE0 A44F0000 */ sh $t7, ($v0) -/* B09D84 80092BE4 84980000 */ lh $t8, ($a0) -/* B09D88 80092BE8 8FBF0014 */ lw $ra, 0x14($sp) -/* B09D8C 80092BEC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B09D90 80092BF0 27190001 */ addiu $t9, $t8, 1 -/* B09D94 80092BF4 03E00008 */ jr $ra -/* B09D98 80092BF8 A4990000 */ sh $t9, ($a0) - -glabel func_80092BFC -/* B09D9C 80092BFC 3C028012 */ lui $v0, %hi(D_80126254) # $v0, 0x8012 -/* B09DA0 80092C00 240EFFFF */ li $t6, -1 -/* B09DA4 80092C04 24426254 */ addiu $v0, %lo(D_80126254) # addiu $v0, $v0, 0x6254 -/* B09DA8 80092C08 AC800008 */ sw $zero, 8($a0) -/* B09DAC 80092C0C A48E001E */ sh $t6, 0x1e($a0) -/* B09DB0 80092C10 844F0000 */ lh $t7, ($v0) -/* B09DB4 80092C14 25F8FFFF */ addiu $t8, $t7, -1 -/* B09DB8 80092C18 03E00008 */ jr $ra -/* B09DBC 80092C1C A4580000 */ sh $t8, ($v0) - -glabel func_80092C20 -/* B09DC0 80092C20 AFA40000 */ sw $a0, ($sp) -/* B09DC4 80092C24 00042400 */ sll $a0, $a0, 0x10 -/* B09DC8 80092C28 00042403 */ sra $a0, $a0, 0x10 -/* B09DCC 80092C2C 308E0003 */ andi $t6, $a0, 3 -/* B09DD0 80092C30 000E78C0 */ sll $t7, $t6, 3 -/* B09DD4 80092C34 01EE7821 */ addu $t7, $t7, $t6 -/* B09DD8 80092C38 3C188016 */ lui $t8, %hi(D_80160020) # $t8, 0x8016 -/* B09DDC 80092C3C 27180020 */ addiu $t8, %lo(D_80160020) # addiu $t8, $t8, 0x20 -/* B09DE0 80092C40 000F7880 */ sll $t7, $t7, 2 -/* B09DE4 80092C44 01F81821 */ addu $v1, $t7, $t8 -/* B09DE8 80092C48 8C790008 */ lw $t9, 8($v1) -/* B09DEC 80092C4C 57200004 */ bnezl $t9, .L80092C60 -/* B09DF0 80092C50 84680000 */ lh $t0, ($v1) -/* B09DF4 80092C54 03E00008 */ jr $ra -/* B09DF8 80092C58 00001025 */ move $v0, $zero -/* B09DFC 80092C5C 84680000 */ lh $t0, ($v1) -.L80092C60: -/* B09E00 80092C60 00601025 */ move $v0, $v1 -/* B09E04 80092C64 10880003 */ beq $a0, $t0, .L80092C74 -/* B09E08 80092C68 00000000 */ nop -/* B09E0C 80092C6C 03E00008 */ jr $ra -/* B09E10 80092C70 00001025 */ move $v0, $zero -.L80092C74: -/* B09E14 80092C74 03E00008 */ jr $ra -/* B09E18 80092C78 00000000 */ nop - -glabel func_80092C7C -/* B09E1C 80092C7C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B09E20 80092C80 AFA5001C */ sw $a1, 0x1c($sp) -/* B09E24 80092C84 AFA60020 */ sw $a2, 0x20($sp) -/* B09E28 80092C88 00063400 */ sll $a2, $a2, 0x10 -/* B09E2C 80092C8C 00052C00 */ sll $a1, $a1, 0x10 -/* B09E30 80092C90 AFA40018 */ sw $a0, 0x18($sp) -/* B09E34 80092C94 00042400 */ sll $a0, $a0, 0x10 -/* B09E38 80092C98 00052C03 */ sra $a1, $a1, 0x10 -/* B09E3C 80092C9C 00063403 */ sra $a2, $a2, 0x10 -/* B09E40 80092CA0 AFBF0014 */ sw $ra, 0x14($sp) -/* B09E44 80092CA4 00042403 */ sra $a0, $a0, 0x10 -/* B09E48 80092CA8 A7A60022 */ sh $a2, 0x22($sp) -/* B09E4C 80092CAC 0C024B08 */ jal func_80092C20 -/* B09E50 80092CB0 A7A5001E */ sh $a1, 0x1e($sp) -/* B09E54 80092CB4 87A5001E */ lh $a1, 0x1e($sp) -/* B09E58 80092CB8 14400003 */ bnez $v0, .L80092CC8 -/* B09E5C 80092CBC 87A60022 */ lh $a2, 0x22($sp) -/* B09E60 80092CC0 10000036 */ b .L80092D9C -/* B09E64 80092CC4 00001025 */ move $v0, $zero -.L80092CC8: -/* B09E68 80092CC8 28A10081 */ slti $at, $a1, 0x81 -/* B09E6C 80092CCC 14200007 */ bnez $at, .L80092CEC -/* B09E70 80092CD0 24010100 */ li $at, 256 -/* B09E74 80092CD4 10A1002C */ beq $a1, $at, .L80092D88 -/* B09E78 80092CD8 24010200 */ li $at, 512 -/* B09E7C 80092CDC 50A1002F */ beql $a1, $at, .L80092D9C -/* B09E80 80092CE0 A446001C */ sh $a2, 0x1c($v0) -/* B09E84 80092CE4 1000002E */ b .L80092DA0 -/* B09E88 80092CE8 8FBF0014 */ lw $ra, 0x14($sp) -.L80092CEC: -/* B09E8C 80092CEC 28A10041 */ slti $at, $a1, 0x41 -/* B09E90 80092CF0 14200005 */ bnez $at, .L80092D08 -/* B09E94 80092CF4 24010080 */ li $at, 128 -/* B09E98 80092CF8 10A10021 */ beq $a1, $at, .L80092D80 -/* B09E9C 80092CFC 00000000 */ nop -/* B09EA0 80092D00 10000027 */ b .L80092DA0 -/* B09EA4 80092D04 8FBF0014 */ lw $ra, 0x14($sp) -.L80092D08: -/* B09EA8 80092D08 28A10021 */ slti $at, $a1, 0x21 -/* B09EAC 80092D0C 14200006 */ bnez $at, .L80092D28 -/* B09EB0 80092D10 24AEFFFF */ addiu $t6, $a1, -1 -/* B09EB4 80092D14 24010040 */ li $at, 64 -/* B09EB8 80092D18 10A10017 */ beq $a1, $at, .L80092D78 -/* B09EBC 80092D1C 00000000 */ nop -/* B09EC0 80092D20 1000001F */ b .L80092DA0 -/* B09EC4 80092D24 8FBF0014 */ lw $ra, 0x14($sp) -.L80092D28: -/* B09EC8 80092D28 2DC10020 */ sltiu $at, $t6, 0x20 -/* B09ECC 80092D2C 1020001B */ beqz $at, .L80092D9C -/* B09ED0 80092D30 000E7080 */ sll $t6, $t6, 2 -/* B09ED4 80092D34 3C018014 */ lui $at, %hi(jtbl_8013EA58) -/* B09ED8 80092D38 002E0821 */ addu $at, $at, $t6 -/* B09EDC 80092D3C 8C2EEA58 */ lw $t6, %lo(jtbl_8013EA58)($at) -/* B09EE0 80092D40 01C00008 */ jr $t6 -/* B09EE4 80092D44 00000000 */ nop -glabel L80092D48 -/* B09EE8 80092D48 10000014 */ b .L80092D9C -/* B09EEC 80092D4C A446001A */ sh $a2, 0x1a($v0) -glabel L80092D50 -/* B09EF0 80092D50 10000012 */ b .L80092D9C -/* B09EF4 80092D54 A446000C */ sh $a2, 0xc($v0) -glabel L80092D58 -/* B09EF8 80092D58 10000010 */ b .L80092D9C -/* B09EFC 80092D5C A446000E */ sh $a2, 0xe($v0) -glabel L80092D60 -/* B09F00 80092D60 1000000E */ b .L80092D9C -/* B09F04 80092D64 A4460010 */ sh $a2, 0x10($v0) -glabel L80092D68 -/* B09F08 80092D68 1000000C */ b .L80092D9C -/* B09F0C 80092D6C A4460012 */ sh $a2, 0x12($v0) -glabel L80092D70 -/* B09F10 80092D70 1000000A */ b .L80092D9C -/* B09F14 80092D74 A4460014 */ sh $a2, 0x14($v0) -.L80092D78: -/* B09F18 80092D78 10000008 */ b .L80092D9C -/* B09F1C 80092D7C A4460016 */ sh $a2, 0x16($v0) -.L80092D80: -/* B09F20 80092D80 10000006 */ b .L80092D9C -/* B09F24 80092D84 A4460018 */ sh $a2, 0x18($v0) -.L80092D88: -/* B09F28 80092D88 A446001E */ sh $a2, 0x1e($v0) -/* B09F2C 80092D8C 844F001E */ lh $t7, 0x1e($v0) -/* B09F30 80092D90 10000002 */ b .L80092D9C -/* B09F34 80092D94 A44F0002 */ sh $t7, 2($v0) -/* B09F38 80092D98 A446001C */ sh $a2, 0x1c($v0) -.L80092D9C: -glabel L80092D9C -/* B09F3C 80092D9C 8FBF0014 */ lw $ra, 0x14($sp) -.L80092DA0: -/* B09F40 80092DA0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B09F44 80092DA4 03E00008 */ jr $ra -/* B09F48 80092DA8 00000000 */ nop - -glabel func_80092DAC -/* B09F4C 80092DAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B09F50 80092DB0 AFA40018 */ sw $a0, 0x18($sp) -/* B09F54 80092DB4 00042400 */ sll $a0, $a0, 0x10 -/* B09F58 80092DB8 AFBF0014 */ sw $ra, 0x14($sp) -/* B09F5C 80092DBC 00042403 */ sra $a0, $a0, 0x10 -/* B09F60 80092DC0 0C024B08 */ jal func_80092C20 -/* B09F64 80092DC4 AFA5001C */ sw $a1, 0x1c($sp) -/* B09F68 80092DC8 10400004 */ beqz $v0, .L80092DDC -/* B09F6C 80092DCC 87AE001E */ lh $t6, 0x1e($sp) -/* B09F70 80092DD0 A44E001A */ sh $t6, 0x1a($v0) -/* B09F74 80092DD4 10000002 */ b .L80092DE0 -/* B09F78 80092DD8 24020001 */ li $v0, 1 -.L80092DDC: -/* B09F7C 80092DDC 00001025 */ move $v0, $zero -.L80092DE0: -/* B09F80 80092DE0 8FBF0014 */ lw $ra, 0x14($sp) -/* B09F84 80092DE4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B09F88 80092DE8 03E00008 */ jr $ra -/* B09F8C 80092DEC 00000000 */ nop - -glabel func_80092DF0 -/* B09F90 80092DF0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B09F94 80092DF4 AFA40018 */ sw $a0, 0x18($sp) -/* B09F98 80092DF8 00042400 */ sll $a0, $a0, 0x10 -/* B09F9C 80092DFC AFBF0014 */ sw $ra, 0x14($sp) -/* B09FA0 80092E00 00042403 */ sra $a0, $a0, 0x10 -/* B09FA4 80092E04 0C024B08 */ jal func_80092C20 -/* B09FA8 80092E08 AFA5001C */ sw $a1, 0x1c($sp) -/* B09FAC 80092E0C 10400006 */ beqz $v0, .L80092E28 -/* B09FB0 80092E10 87AE001E */ lh $t6, 0x1e($sp) -/* B09FB4 80092E14 A44E001E */ sh $t6, 0x1e($v0) -/* B09FB8 80092E18 844F001E */ lh $t7, 0x1e($v0) -/* B09FBC 80092E1C A44F0002 */ sh $t7, 2($v0) -/* B09FC0 80092E20 10000002 */ b .L80092E2C -/* B09FC4 80092E24 24020001 */ li $v0, 1 -.L80092E28: -/* B09FC8 80092E28 00001025 */ move $v0, $zero -.L80092E2C: -/* B09FCC 80092E2C 8FBF0014 */ lw $ra, 0x14($sp) -/* B09FD0 80092E30 27BD0018 */ addiu $sp, $sp, 0x18 -/* B09FD4 80092E34 03E00008 */ jr $ra -/* B09FD8 80092E38 00000000 */ nop - -glabel func_80092E3C -/* B09FDC 80092E3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B09FE0 80092E40 AFA40018 */ sw $a0, 0x18($sp) -/* B09FE4 80092E44 00042400 */ sll $a0, $a0, 0x10 -/* B09FE8 80092E48 AFBF0014 */ sw $ra, 0x14($sp) -/* B09FEC 80092E4C 0C024B08 */ jal func_80092C20 -/* B09FF0 80092E50 00042403 */ sra $a0, $a0, 0x10 -/* B09FF4 80092E54 10400003 */ beqz $v0, .L80092E64 -/* B09FF8 80092E58 8FBF0014 */ lw $ra, 0x14($sp) -/* B09FFC 80092E5C 10000002 */ b .L80092E68 -/* B0A000 80092E60 8442001E */ lh $v0, 0x1e($v0) -.L80092E64: -/* B0A004 80092E64 00001025 */ move $v0, $zero -.L80092E68: -/* B0A008 80092E68 03E00008 */ jr $ra -/* B0A00C 80092E6C 27BD0018 */ addiu $sp, $sp, 0x18 - -glabel func_80092E70 -/* B0A010 80092E70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A014 80092E74 AFA40018 */ sw $a0, 0x18($sp) -/* B0A018 80092E78 00042400 */ sll $a0, $a0, 0x10 -/* B0A01C 80092E7C AFBF0014 */ sw $ra, 0x14($sp) -/* B0A020 80092E80 00042403 */ sra $a0, $a0, 0x10 -/* B0A024 80092E84 AFA5001C */ sw $a1, 0x1c($sp) -/* B0A028 80092E88 AFA60020 */ sw $a2, 0x20($sp) -/* B0A02C 80092E8C 0C024B08 */ jal func_80092C20 -/* B0A030 80092E90 AFA70024 */ sw $a3, 0x24($sp) -/* B0A034 80092E94 1040000A */ beqz $v0, .L80092EC0 -/* B0A038 80092E98 87AE001E */ lh $t6, 0x1e($sp) -/* B0A03C 80092E9C A44E000C */ sh $t6, 0xc($v0) -/* B0A040 80092EA0 87AF0022 */ lh $t7, 0x22($sp) -/* B0A044 80092EA4 A44F000E */ sh $t7, 0xe($v0) -/* B0A048 80092EA8 87B80026 */ lh $t8, 0x26($sp) -/* B0A04C 80092EAC A4580010 */ sh $t8, 0x10($v0) -/* B0A050 80092EB0 87B9002A */ lh $t9, 0x2a($sp) -/* B0A054 80092EB4 A4590012 */ sh $t9, 0x12($v0) -/* B0A058 80092EB8 10000002 */ b .L80092EC4 -/* B0A05C 80092EBC 24020001 */ li $v0, 1 -.L80092EC0: -/* B0A060 80092EC0 00001025 */ move $v0, $zero -.L80092EC4: -/* B0A064 80092EC4 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A068 80092EC8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A06C 80092ECC 03E00008 */ jr $ra -/* B0A070 80092ED0 00000000 */ nop - -glabel func_80092ED4 -/* B0A074 80092ED4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A078 80092ED8 AFA40018 */ sw $a0, 0x18($sp) -/* B0A07C 80092EDC 00042400 */ sll $a0, $a0, 0x10 -/* B0A080 80092EE0 AFBF0014 */ sw $ra, 0x14($sp) -/* B0A084 80092EE4 00042403 */ sra $a0, $a0, 0x10 -/* B0A088 80092EE8 AFA5001C */ sw $a1, 0x1c($sp) -/* B0A08C 80092EEC AFA60020 */ sw $a2, 0x20($sp) -/* B0A090 80092EF0 0C024B08 */ jal func_80092C20 -/* B0A094 80092EF4 AFA70024 */ sw $a3, 0x24($sp) -/* B0A098 80092EF8 1040000A */ beqz $v0, .L80092F24 -/* B0A09C 80092EFC 87AE001E */ lh $t6, 0x1e($sp) -/* B0A0A0 80092F00 A44E001C */ sh $t6, 0x1c($v0) -/* B0A0A4 80092F04 27AF0020 */ addiu $t7, $sp, 0x20 -/* B0A0A8 80092F08 8DF90000 */ lw $t9, ($t7) -/* B0A0AC 80092F0C A8590014 */ swl $t9, 0x14($v0) -/* B0A0B0 80092F10 B8590017 */ swr $t9, 0x17($v0) -/* B0A0B4 80092F14 95F90004 */ lhu $t9, 4($t7) -/* B0A0B8 80092F18 A4590018 */ sh $t9, 0x18($v0) -/* B0A0BC 80092F1C 10000002 */ b .L80092F28 -/* B0A0C0 80092F20 24020001 */ li $v0, 1 -.L80092F24: -/* B0A0C4 80092F24 00001025 */ move $v0, $zero -.L80092F28: -/* B0A0C8 80092F28 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A0CC 80092F2C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A0D0 80092F30 03E00008 */ jr $ra -/* B0A0D4 80092F34 00000000 */ nop - -glabel func_80092F38 -/* B0A0D8 80092F38 3C048016 */ lui $a0, %hi(D_80160020) # $a0, 0x8016 -/* B0A0DC 80092F3C 24840020 */ addiu $a0, %lo(D_80160020) # addiu $a0, $a0, 0x20 -/* B0A0E0 80092F40 00001025 */ move $v0, $zero -/* B0A0E4 80092F44 24050024 */ li $a1, 36 -.L80092F48: -/* B0A0E8 80092F48 00450019 */ multu $v0, $a1 -/* B0A0EC 80092F4C 24420001 */ addiu $v0, $v0, 1 -/* B0A0F0 80092F50 00021400 */ sll $v0, $v0, 0x10 -/* B0A0F4 80092F54 00021403 */ sra $v0, $v0, 0x10 -/* B0A0F8 80092F58 28410004 */ slti $at, $v0, 4 -/* B0A0FC 80092F5C 00007012 */ mflo $t6 -/* B0A100 80092F60 008E1821 */ addu $v1, $a0, $t6 -/* B0A104 80092F64 AC600008 */ sw $zero, 8($v1) -/* B0A108 80092F68 1420FFF7 */ bnez $at, .L80092F48 -/* B0A10C 80092F6C A460001E */ sh $zero, 0x1e($v1) -/* B0A110 80092F70 240F0001 */ li $t7, 1 -/* B0A114 80092F74 3C018012 */ lui $at, %hi(D_80126250) # $at, 0x8012 -/* B0A118 80092F78 A42F6250 */ sh $t7, %lo(D_80126250)($at) -/* B0A11C 80092F7C 3C018012 */ lui $at, %hi(D_80126254) -/* B0A120 80092F80 03E00008 */ jr $ra -/* B0A124 80092F84 A4206254 */ sh $zero, %lo(D_80126254)($at) - -glabel func_80092F88 -/* B0A128 80092F88 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A12C 80092F8C AFBF0014 */ sw $ra, 0x14($sp) -/* B0A130 80092F90 0C024AD2 */ jal func_80092B48 -/* B0A134 80092F94 00000000 */ nop -/* B0A138 80092F98 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A13C 80092F9C 84420000 */ lh $v0, ($v0) -/* B0A140 80092FA0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A144 80092FA4 03E00008 */ jr $ra -/* B0A148 80092FA8 00000000 */ nop - -glabel func_80092FAC -/* B0A14C 80092FAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A150 80092FB0 AFA40018 */ sw $a0, 0x18($sp) -/* B0A154 80092FB4 00042400 */ sll $a0, $a0, 0x10 -/* B0A158 80092FB8 AFBF0014 */ sw $ra, 0x14($sp) -/* B0A15C 80092FBC 0C024B08 */ jal func_80092C20 -/* B0A160 80092FC0 00042403 */ sra $a0, $a0, 0x10 -/* B0A164 80092FC4 10400005 */ beqz $v0, .L80092FDC -/* B0A168 80092FC8 00402025 */ move $a0, $v0 -/* B0A16C 80092FCC 0C024AFF */ jal func_80092BFC -/* B0A170 80092FD0 00000000 */ nop -/* B0A174 80092FD4 10000002 */ b .L80092FE0 -/* B0A178 80092FD8 24020001 */ li $v0, 1 -.L80092FDC: -/* B0A17C 80092FDC 00001025 */ move $v0, $zero -.L80092FE0: -/* B0A180 80092FE0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A184 80092FE4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A188 80092FE8 03E00008 */ jr $ra -/* B0A18C 80092FEC 00000000 */ nop - -glabel func_80092FF0 -/* B0A190 80092FF0 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* B0A194 80092FF4 44800000 */ mtc1 $zero, $f0 -/* B0A198 80092FF8 AFBF004C */ sw $ra, 0x4c($sp) -/* B0A19C 80092FFC AFB40048 */ sw $s4, 0x48($sp) -/* B0A1A0 80093000 AFB30044 */ sw $s3, 0x44($sp) -/* B0A1A4 80093004 AFB20040 */ sw $s2, 0x40($sp) -/* B0A1A8 80093008 AFB1003C */ sw $s1, 0x3c($sp) -/* B0A1AC 8009300C AFB00038 */ sw $s0, 0x38($sp) -/* B0A1B0 80093010 F7BA0030 */ sdc1 $f26, 0x30($sp) -/* B0A1B4 80093014 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B0A1B8 80093018 F7B60020 */ sdc1 $f22, 0x20($sp) -/* B0A1BC 8009301C F7B40018 */ sdc1 $f20, 0x18($sp) -/* B0A1C0 80093020 AFA400B8 */ sw $a0, 0xb8($sp) -/* B0A1C4 80093024 8C8F008C */ lw $t7, 0x8c($a0) -/* B0A1C8 80093028 E7A00068 */ swc1 $f0, 0x68($sp) -/* B0A1CC 8009302C E7A0006C */ swc1 $f0, 0x6c($sp) -/* B0A1D0 80093030 E7A00070 */ swc1 $f0, 0x70($sp) -/* B0A1D4 80093034 AFAF0064 */ sw $t7, 0x64($sp) -/* B0A1D8 80093038 A4A00018 */ sh $zero, 0x18($a1) -/* B0A1DC 8009303C A4A0001A */ sh $zero, 0x1a($a1) -/* B0A1E0 80093040 A4A0001C */ sh $zero, 0x1c($a1) -/* B0A1E4 80093044 3C188012 */ lui $t8, %hi(D_80126254) # $t8, 0x8012 -/* B0A1E8 80093048 E4A00000 */ swc1 $f0, ($a1) -/* B0A1EC 8009304C E4A00004 */ swc1 $f0, 4($a1) -/* B0A1F0 80093050 E4A00008 */ swc1 $f0, 8($a1) -/* B0A1F4 80093054 E4A0000C */ swc1 $f0, 0xc($a1) -/* B0A1F8 80093058 E4A00010 */ swc1 $f0, 0x10($a1) -/* B0A1FC 8009305C E4A00014 */ swc1 $f0, 0x14($a1) -/* B0A200 80093060 E4A00020 */ swc1 $f0, 0x20($a1) -/* B0A204 80093064 87186254 */ lh $t8, %lo(D_80126254)($t8) -/* B0A208 80093068 00A08025 */ move $s0, $a1 -/* B0A20C 8009306C 00009025 */ move $s2, $zero -/* B0A210 80093070 17000003 */ bnez $t8, .L80093080 -/* B0A214 80093074 3C118016 */ lui $s1, %hi(D_80160020) # $s1, 0x8016 -/* B0A218 80093078 100000AE */ b .L80093334 -/* B0A21C 8009307C 00001025 */ move $v0, $zero -.L80093080: -/* B0A220 80093080 3C018014 */ lui $at, %hi(D_8013EAD8) -/* B0A224 80093084 C43AEAD8 */ lwc1 $f26, %lo(D_8013EAD8)($at) -/* B0A228 80093088 26310020 */ addiu $s1, %lo(D_80160020) # addiu $s1, $s1, 0x20 -/* B0A22C 8009308C 27B40068 */ addiu $s4, $sp, 0x68 -/* B0A230 80093090 27B3008C */ addiu $s3, $sp, 0x8c -/* B0A234 80093094 8E260008 */ lw $a2, 8($s1) -.L80093098: -/* B0A238 80093098 10C0009F */ beqz $a2, .L80093318 -/* B0A23C 8009309C 00000000 */ nop -/* B0A240 800930A0 86250020 */ lh $a1, 0x20($s1) -/* B0A244 800930A4 8FB90064 */ lw $t9, 0x64($sp) -/* B0A248 800930A8 3C048014 */ lui $a0, %hi(D_8013EA20) -/* B0A24C 800930AC 00054080 */ sll $t0, $a1, 2 -/* B0A250 800930B0 03284821 */ addu $t1, $t9, $t0 -/* B0A254 800930B4 8D2A0790 */ lw $t2, 0x790($t1) -/* B0A258 800930B8 8FAD00B8 */ lw $t5, 0xb8($sp) -/* B0A25C 800930BC 55400008 */ bnezl $t2, .L800930E0 -/* B0A260 800930C0 8E2B0004 */ lw $t3, 4($s1) -/* B0A264 800930C4 0C00084C */ jal osSyncPrintf -/* B0A268 800930C8 2484EA20 */ addiu $a0, %lo(D_8013EA20) # addiu $a0, $a0, -0x15e0 -/* B0A26C 800930CC 0C024AFF */ jal func_80092BFC -/* B0A270 800930D0 02202025 */ move $a0, $s1 -/* B0A274 800930D4 10000090 */ b .L80093318 -/* B0A278 800930D8 00000000 */ nop -/* B0A27C 800930DC 8E2B0004 */ lw $t3, 4($s1) -.L800930E0: -/* B0A280 800930E0 85AE0164 */ lh $t6, 0x164($t5) -/* B0A284 800930E4 8622001A */ lh $v0, 0x1a($s1) -/* B0A288 800930E8 856C0164 */ lh $t4, 0x164($t3) -/* B0A28C 800930EC 00021823 */ negu $v1, $v0 -/* B0A290 800930F0 018E3826 */ xor $a3, $t4, $t6 -/* B0A294 800930F4 04400003 */ bltz $v0, .L80093104 -/* B0A298 800930F8 0007382B */ sltu $a3, $zero, $a3 -/* B0A29C 800930FC 10000001 */ b .L80093104 -/* B0A2A0 80093100 00401825 */ move $v1, $v0 -.L80093104: -/* B0A2A4 80093104 44832000 */ mtc1 $v1, $f4 -/* B0A2A8 80093108 3C014700 */ li $at, 0x47000000 # 0.000000 -/* B0A2AC 8009310C 44814000 */ mtc1 $at, $f8 -/* B0A2B0 80093110 468021A0 */ cvt.s.w $f6, $f4 -/* B0A2B4 80093114 00067880 */ sll $t7, $a2, 2 -/* B0A2B8 80093118 3C198012 */ lui $t9, %hi(D_80126258) -/* B0A2BC 8009311C 032FC821 */ addu $t9, $t9, $t7 -/* B0A2C0 80093120 8F396258 */ lw $t9, %lo(D_80126258)($t9) -/* B0A2C4 80093124 02202025 */ move $a0, $s1 -/* B0A2C8 80093128 46083583 */ div.s $f22, $f6, $f8 -/* B0A2CC 8009312C 02602825 */ move $a1, $s3 -/* B0A2D0 80093130 AFA70074 */ sw $a3, 0x74($sp) -/* B0A2D4 80093134 0320F809 */ jalr $t9 -/* B0A2D8 80093138 4600B606 */ mov.s $f24, $f22 -/* B0A2DC 8009313C 14400005 */ bnez $v0, .L80093154 -/* B0A2E0 80093140 8FA70074 */ lw $a3, 0x74($sp) -/* B0A2E4 80093144 0C024AFF */ jal func_80092BFC -/* B0A2E8 80093148 02202025 */ move $a0, $s1 -/* B0A2EC 8009314C 10000072 */ b .L80093318 -/* B0A2F0 80093150 00000000 */ nop -.L80093154: -/* B0A2F4 80093154 14E00070 */ bnez $a3, .L80093318 -/* B0A2F8 80093158 02602025 */ move $a0, $s3 -/* B0A2FC 8009315C C6000000 */ lwc1 $f0, ($s0) -/* B0A300 80093160 C7AA008C */ lwc1 $f10, 0x8c($sp) -/* B0A304 80093164 46000085 */ abs.s $f2, $f0 -/* B0A308 80093168 46005005 */ abs.s $f0, $f10 -/* B0A30C 8009316C 4600103C */ c.lt.s $f2, $f0 -/* B0A310 80093170 00000000 */ nop -/* B0A314 80093174 45020003 */ bc1fl .L80093184 -/* B0A318 80093178 C6000004 */ lwc1 $f0, 4($s0) -/* B0A31C 8009317C E60A0000 */ swc1 $f10, ($s0) -/* B0A320 80093180 C6000004 */ lwc1 $f0, 4($s0) -.L80093184: -/* B0A324 80093184 C7B00090 */ lwc1 $f16, 0x90($sp) -/* B0A328 80093188 46000085 */ abs.s $f2, $f0 -/* B0A32C 8009318C 46008005 */ abs.s $f0, $f16 -/* B0A330 80093190 4600103C */ c.lt.s $f2, $f0 -/* B0A334 80093194 00000000 */ nop -/* B0A338 80093198 45020003 */ bc1fl .L800931A8 -/* B0A33C 8009319C C6000008 */ lwc1 $f0, 8($s0) -/* B0A340 800931A0 E6100004 */ swc1 $f16, 4($s0) -/* B0A344 800931A4 C6000008 */ lwc1 $f0, 8($s0) -.L800931A8: -/* B0A348 800931A8 C7B20094 */ lwc1 $f18, 0x94($sp) -/* B0A34C 800931AC 46000085 */ abs.s $f2, $f0 -/* B0A350 800931B0 46009005 */ abs.s $f0, $f18 -/* B0A354 800931B4 4600103C */ c.lt.s $f2, $f0 -/* B0A358 800931B8 00000000 */ nop -/* B0A35C 800931BC 45020003 */ bc1fl .L800931CC -/* B0A360 800931C0 C600000C */ lwc1 $f0, 0xc($s0) -/* B0A364 800931C4 E6120008 */ swc1 $f18, 8($s0) -/* B0A368 800931C8 C600000C */ lwc1 $f0, 0xc($s0) -.L800931CC: -/* B0A36C 800931CC C7A40098 */ lwc1 $f4, 0x98($sp) -/* B0A370 800931D0 46000085 */ abs.s $f2, $f0 -/* B0A374 800931D4 46002005 */ abs.s $f0, $f4 -/* B0A378 800931D8 4600103C */ c.lt.s $f2, $f0 -/* B0A37C 800931DC 00000000 */ nop -/* B0A380 800931E0 45020003 */ bc1fl .L800931F0 -/* B0A384 800931E4 C6000010 */ lwc1 $f0, 0x10($s0) -/* B0A388 800931E8 E604000C */ swc1 $f4, 0xc($s0) -/* B0A38C 800931EC C6000010 */ lwc1 $f0, 0x10($s0) -.L800931F0: -/* B0A390 800931F0 C7A6009C */ lwc1 $f6, 0x9c($sp) -/* B0A394 800931F4 46000085 */ abs.s $f2, $f0 -/* B0A398 800931F8 46003005 */ abs.s $f0, $f6 -/* B0A39C 800931FC 4600103C */ c.lt.s $f2, $f0 -/* B0A3A0 80093200 00000000 */ nop -/* B0A3A4 80093204 45020003 */ bc1fl .L80093214 -/* B0A3A8 80093208 C6000014 */ lwc1 $f0, 0x14($s0) -/* B0A3AC 8009320C E6060010 */ swc1 $f6, 0x10($s0) -/* B0A3B0 80093210 C6000014 */ lwc1 $f0, 0x14($s0) -.L80093214: -/* B0A3B4 80093214 C7A800A0 */ lwc1 $f8, 0xa0($sp) -/* B0A3B8 80093218 46000085 */ abs.s $f2, $f0 -/* B0A3BC 8009321C 46004005 */ abs.s $f0, $f8 -/* B0A3C0 80093220 4600103C */ c.lt.s $f2, $f0 -/* B0A3C4 80093224 00000000 */ nop -/* B0A3C8 80093228 45020003 */ bc1fl .L80093238 -/* B0A3CC 8009322C 86180018 */ lh $t8, 0x18($s0) -/* B0A3D0 80093230 E6080014 */ swc1 $f8, 0x14($s0) -/* B0A3D4 80093234 86180018 */ lh $t8, 0x18($s0) -.L80093238: -/* B0A3D8 80093238 87A800A4 */ lh $t0, 0xa4($sp) -/* B0A3DC 8009323C 0308082A */ slt $at, $t8, $t0 -/* B0A3E0 80093240 50200005 */ beql $at, $zero, .L80093258 -/* B0A3E4 80093244 860A001C */ lh $t2, 0x1c($s0) -/* B0A3E8 80093248 A6080018 */ sh $t0, 0x18($s0) -/* B0A3EC 8009324C 87A900A6 */ lh $t1, 0xa6($sp) -/* B0A3F0 80093250 A609001A */ sh $t1, 0x1a($s0) -/* B0A3F4 80093254 860A001C */ lh $t2, 0x1c($s0) -.L80093258: -/* B0A3F8 80093258 87AB00A8 */ lh $t3, 0xa8($sp) -/* B0A3FC 8009325C 014B082A */ slt $at, $t2, $t3 -/* B0A400 80093260 10200002 */ beqz $at, .L8009326C -/* B0A404 80093264 00000000 */ nop -/* B0A408 80093268 A60B001C */ sh $t3, 0x1c($s0) -.L8009326C: -/* B0A40C 8009326C 0C01EFE4 */ jal func_8007BF90 -/* B0A410 80093270 02802825 */ move $a1, $s4 -/* B0A414 80093274 46160502 */ mul.s $f20, $f0, $f22 -/* B0A418 80093278 27A40098 */ addiu $a0, $sp, 0x98 -/* B0A41C 8009327C 0C01EFE4 */ jal func_8007BF90 -/* B0A420 80093280 02802825 */ move $a1, $s4 -/* B0A424 80093284 46160082 */ mul.s $f2, $f0, $f22 -/* B0A428 80093288 26520001 */ addiu $s2, $s2, 1 -/* B0A42C 8009328C 4602A03C */ c.lt.s $f20, $f2 -/* B0A430 80093290 00000000 */ nop -/* B0A434 80093294 45020003 */ bc1fl .L800932A4 -/* B0A438 80093298 860D0018 */ lh $t5, 0x18($s0) -/* B0A43C 8009329C 46001506 */ mov.s $f20, $f2 -/* B0A440 800932A0 860D0018 */ lh $t5, 0x18($s0) -.L800932A4: -/* B0A444 800932A4 448D5000 */ mtc1 $t5, $f10 -/* B0A448 800932A8 00000000 */ nop -/* B0A44C 800932AC 46805420 */ cvt.s.w $f16, $f10 -/* B0A450 800932B0 461A8482 */ mul.s $f18, $f16, $f26 -/* B0A454 800932B4 00000000 */ nop -/* B0A458 800932B8 46189002 */ mul.s $f0, $f18, $f24 -/* B0A45C 800932BC 4600A03C */ c.lt.s $f20, $f0 -/* B0A460 800932C0 00000000 */ nop -/* B0A464 800932C4 45000002 */ bc1f .L800932D0 -/* B0A468 800932C8 00000000 */ nop -/* B0A46C 800932CC 46000506 */ mov.s $f20, $f0 -.L800932D0: -/* B0A470 800932D0 860C001C */ lh $t4, 0x1c($s0) -/* B0A474 800932D4 448C2000 */ mtc1 $t4, $f4 -/* B0A478 800932D8 00000000 */ nop -/* B0A47C 800932DC 468021A0 */ cvt.s.w $f6, $f4 -/* B0A480 800932E0 461A3202 */ mul.s $f8, $f6, $f26 -/* B0A484 800932E4 00000000 */ nop -/* B0A488 800932E8 46184002 */ mul.s $f0, $f8, $f24 -/* B0A48C 800932EC 4600A03C */ c.lt.s $f20, $f0 -/* B0A490 800932F0 00000000 */ nop -/* B0A494 800932F4 45000002 */ bc1f .L80093300 -/* B0A498 800932F8 00000000 */ nop -/* B0A49C 800932FC 46000506 */ mov.s $f20, $f0 -.L80093300: -/* B0A4A0 80093300 C60A0020 */ lwc1 $f10, 0x20($s0) -/* B0A4A4 80093304 4614503C */ c.lt.s $f10, $f20 -/* B0A4A8 80093308 00000000 */ nop -/* B0A4AC 8009330C 45000002 */ bc1f .L80093318 -/* B0A4B0 80093310 00000000 */ nop -/* B0A4B4 80093314 E6140020 */ swc1 $f20, 0x20($s0) -.L80093318: -/* B0A4B8 80093318 3C0E8016 */ lui $t6, %hi(D_80160020+0x24*4) # $t6, 0x8016 -/* B0A4BC 8009331C 25CE00B0 */ addiu $t6, %lo(D_80160020+0x24*4) # addiu $t6, $t6, 0xb0 -/* B0A4C0 80093320 26310024 */ addiu $s1, $s1, 0x24 -/* B0A4C4 80093324 562EFF5C */ bnel $s1, $t6, .L80093098 -/* B0A4C8 80093328 8E260008 */ lw $a2, 8($s1) -/* B0A4CC 8009332C 00121400 */ sll $v0, $s2, 0x10 -/* B0A4D0 80093330 00021403 */ sra $v0, $v0, 0x10 -.L80093334: -/* B0A4D4 80093334 8FBF004C */ lw $ra, 0x4c($sp) -/* B0A4D8 80093338 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B0A4DC 8009333C D7B60020 */ ldc1 $f22, 0x20($sp) -/* B0A4E0 80093340 D7B80028 */ ldc1 $f24, 0x28($sp) -/* B0A4E4 80093344 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* B0A4E8 80093348 8FB00038 */ lw $s0, 0x38($sp) -/* B0A4EC 8009334C 8FB1003C */ lw $s1, 0x3c($sp) -/* B0A4F0 80093350 8FB20040 */ lw $s2, 0x40($sp) -/* B0A4F4 80093354 8FB30044 */ lw $s3, 0x44($sp) -/* B0A4F8 80093358 8FB40048 */ lw $s4, 0x48($sp) -/* B0A4FC 8009335C 03E00008 */ jr $ra -/* B0A500 80093360 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/data/code_800D31A0.data.s b/data/code_800D31A0.data.s deleted file mode 100644 index 2769270570..0000000000 --- a/data/code_800D31A0.data.s +++ /dev/null @@ -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 .data - -glabel D_8012DBC0 - .incbin "baserom.z64", 0xBA4D60, 0x10 diff --git a/data/code_800D31A0.rodata.s b/data/code_800D31A0.rodata.s deleted file mode 100644 index bc59589dd8..0000000000 --- a/data/code_800D31A0.rodata.s +++ /dev/null @@ -1,14 +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 - -.align 4 - -glabel D_80146670 - .asciz "\x1b[31m\n**** Freeze!! ****\n\x1b[m" - .balign 4 diff --git a/data/overlays/actors/z_en_ds.data.s b/data/overlays/actors/z_en_ds.data.s deleted file mode 100644 index e25cfb1e6c..0000000000 --- a/data/overlays/actors/z_en_ds.data.s +++ /dev/null @@ -1,18 +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 .data - -glabel En_Ds_InitVars - .word 0x01490400, 0x00000009, 0x010F0000, 0x000001F0 -.word EnDs_Init -.word EnDs_Destroy -.word EnDs_Update -.word EnDs_Draw -glabel D_809FDB40 - .word 0x44898000, 0x43FA0000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_ds.reloc.s b/data/overlays/actors/z_en_ds.reloc.s deleted file mode 100644 index ee25105444..0000000000 --- a/data/overlays/actors/z_en_ds.reloc.s +++ /dev/null @@ -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_809FDB50 - -.incbin "baserom/ovl_En_Ds", 0xB20, 0x000000E0 diff --git a/data/z_quake.bss.s b/data/z_quake.bss.s deleted file mode 100644 index 5b88b46466..0000000000 --- a/data/z_quake.bss.s +++ /dev/null @@ -1,14 +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 .bss - -glabel D_80160020 - .space 0x30 - -glabel D_80160050 - .space 0x60 diff --git a/data/z_quake.data.s b/data/z_quake.data.s deleted file mode 100644 index 0ae0ac1708..0000000000 --- a/data/z_quake.data.s +++ /dev/null @@ -1,17 +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 .data - -glabel D_80126250 - .incbin "baserom.z64", 0xB9D3F0, 0x4 - -glabel D_80126254 - .incbin "baserom.z64", 0xB9D3F4, 0x4 - -glabel D_80126258 - .incbin "baserom.z64", 0xB9D3F8, 0x28 diff --git a/data/z_quake.rodata.s b/data/z_quake.rodata.s deleted file mode 100644 index 66d56c13a5..0000000000 --- a/data/z_quake.rodata.s +++ /dev/null @@ -1,55 +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 - -.align 4 - -glabel D_8013E9E0 - .asciz "\x1b[43;30mquake: too many request %d is changed new one !!\n\x1b[m" - .balign 4 - -glabel D_8013EA20 - .asciz "\x1b[43;30mquake: stopped! 'coz camera [%d] killed!!\n\x1b[m" - .balign 4 - -glabel jtbl_8013EA58 - .word L80092D48 - .word L80092D50 - .word L80092D9C - .word L80092D58 - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D60 - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D68 - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D70 - -glabel D_8013EAD8 - .float 0.005 diff --git a/include/functions.h b/include/functions.h index 7d864fdbef..cf29419d29 100644 --- a/include/functions.h +++ b/include/functions.h @@ -858,6 +858,7 @@ f32 func_800746DC(); // ? func_800766C4(?); // ? func_8007672C(?); // ? func_80076934(?); +void func_800773A8(GlobalContext* globalCtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4); s32 func_800775CC(); void func_800775D8(); s32 func_800775E4(); @@ -1056,20 +1057,28 @@ u8 func_80090480(GlobalContext* globalCtx, Collider* collider, UNK_PTR a2, Vec3f // ? func_80091880(?); // ? func_80091A24(?); void PreNMI_Init(PreNMIContext* prenmiCtx); -// ? func_80092500(?); -// ? func_80092584(?); -// ? func_80092AB8(?); -// ? func_80092B48(?); -// ? func_80092BFC(?); -// ? func_80092C20(?); -void func_80092DAC(s16, s16); -void func_80092DF0(s16, s16); -// ? func_80092E3C(?); -void func_80092E70(s16, s16, UNK_TYPE, UNK_TYPE, UNK_TYPE); -// ? func_80092F38(?); -s16 func_80092F88(Camera*, UNK_TYPE); -// ? func_80092FAC(?); -// ? func_80092FF0(?); +Vec3f* Quake_AddVec(Vec3f* dst, Vec3f* arg1, struct_80045714* arg2); +void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x); +s16 Quake_Callback1(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_Callback2(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_Callback3(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_Callback4(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_Callback5(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_Callback6(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_GetFreeIndex(); +QuakeRequest* Quake_AddImpl(Camera* cam, u32 callbackIdx); +void Quake_Remove(QuakeRequest* req); +QuakeRequest* Quake_GetRequest(s16 idx); +QuakeRequest* Quake_SetValue(s16 idx, s16 valueType, s16 value); +u32 Quake_SetSpeed(s16 idx, s16 value); +u32 Quake_SetCountdown(s16 idx, s16 value); +s16 Quake_GetCountdown(s16 idx); +u32 Quake_SetQuakeValues(s16 idx, s16 y, s16 x, s16 zoom, s16 rotZ); +u32 Quake_SetUnkValues(s16 idx, s16 arg1, SubQuakeRequest14 arg2); +void Quake_Init(); +s16 Quake_Add(Camera* cam, u32 callbackIdx); +u32 Quake_RemoveFromIdx(s16 idx); +s16 Quake_Calc(Camera* camera, UnkQuakeCalcStruct* camData); // ? func_80093370(?); // ? func_80093708(?); // ? func_8009373C(?); diff --git a/include/z64.h b/include/z64.h index 297968a212..37149e9766 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1279,4 +1279,43 @@ typedef struct { /* 0x10 */ OSTime resetTime; } PreNmiBuff; // size = 0x18 (actually osAppNmiBuffer is 0x40 bytes large but the rest is unused) +typedef struct { + /* 0x00 */ s16 unk_00; + /* 0x02 */ s16 unk_02; + /* 0x04 */ s16 unk_04; +} SubQuakeRequest14; + +typedef struct { + /* 0x00 */ s16 randIdx; + /* 0x02 */ s16 countdownMax; + /* 0x04 */ Camera* cam; + /* 0x08 */ u32 callbackIdx; + /* 0x0C */ s16 y; + /* 0x0E */ s16 x; + /* 0x10 */ s16 zoom; + /* 0x12 */ s16 rotZ; + /* 0x14 */ SubQuakeRequest14 unk_14; + /* 0x1A */ s16 speed; + /* 0x1C */ s16 unk_1C; + /* 0x1E */ s16 countdown; + /* 0x20 */ s16 camPtrIdx; +} QuakeRequest; // size = 0x24 + +typedef struct { + /* 0x00 */ Vec3f vec1; + /* 0x0C */ Vec3f vec2; + /* 0x18 */ s16 rotZ; + /* 0x1A */ s16 unk_1A; + /* 0x1C */ s16 zoom; +} ShakeInfo; // size = 0x1E + +typedef struct { + /* 0x00 */ Vec3f vec1; + /* 0x0C */ Vec3f vec2; + /* 0x18 */ s16 rotZ; + /* 0x1A */ s16 unk_1A; + /* 0x1C */ s16 zoom; + /* 0x20 */ f32 unk_20; +} UnkQuakeCalcStruct; // size = 0x24 + #endif diff --git a/spec b/spec index 867e375450..da12c066a4 100644 --- a/spec +++ b/spec @@ -354,10 +354,7 @@ beginseg 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/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_quake.o" include "build/src/code/z_rcp.o" include "build/data/z_rcp.data.o" include "build/src/code/z_room.o" @@ -457,9 +454,7 @@ beginseg include "build/data/sys_ucode.data.o" include "build/asm/code_800D2E30.o" include "build/data/code_800D2E30.data.o" - include "build/asm/code_800D31A0.o" - include "build/data/code_800D31A0.data.o" - include "build/data/code_800D31A0.rodata.o" + include "build/src/code/code_800D31A0.o" include "build/src/code/irqmgr.o" include "build/src/code/debug_malloc.o" include "build/src/code/fault.o" @@ -2585,8 +2580,7 @@ endseg beginseg name "ovl_En_Ds" include "build/src/overlays/actors/ovl_En_Ds/z_en_ds.o" - include "build/data/overlays/actors/z_en_ds.data.o" - include "build/data/overlays/actors/z_en_ds.reloc.o" + include "build/src/overlays/actors/ovl_En_Ds/z_en_ds_reloc.o" endseg beginseg diff --git a/src/code/code_800D31A0.c b/src/code/code_800D31A0.c new file mode 100644 index 0000000000..3f73824402 --- /dev/null +++ b/src/code/code_800D31A0.c @@ -0,0 +1,24 @@ +#include +#include +#include + +extern PadMgr gPadMgr; + +u32 D_8012DBC0 = false; + +void func_800D31A0() { + osSyncPrintf(VT_FGCOL(RED) "\n**** Freeze!! ****\n" VT_RST); + while (true) { + func_800FF4AC(1000); // msleep + } +} + +void func_800D31F0() { + PadMgr* padMgr = (PadMgr*)(u32)&gPadMgr; // cast required to match + + D_8012DBC0 = (padMgr->unk_2A8 & 2) != 0; +} + +void func_800D3210() { + D_8012DBC0 = false; +} diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 05546dde18..fdea5158a6 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3516,17 +3516,17 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) } void func_80033DB8(GlobalContext* globalCtx, s16 arg1, s16 arg2) { - s16 var = func_80092F88(&globalCtx->cameraCtx.activeCameras[0], 3); - func_80092DAC(var, 20000); - func_80092E70(var, arg1, 0, 0, 0); - func_80092DF0(var, arg2); + s16 var = Quake_Add(&globalCtx->cameraCtx.activeCameras[0], 3); + Quake_SetSpeed(var, 20000); + Quake_SetQuakeValues(var, arg1, 0, 0, 0); + Quake_SetCountdown(var, arg2); } void func_80033E1C(GlobalContext* globalCtx, s16 arg1, s16 arg2, s16 arg3) { - s16 var = func_80092F88(&globalCtx->cameraCtx.activeCameras[0], 3); - func_80092DAC(var, arg3); - func_80092E70(var, arg1, 0, 0, 0); - func_80092DF0(var, arg2); + s16 var = Quake_Add(&globalCtx->cameraCtx.activeCameras[0], 3); + Quake_SetSpeed(var, arg3); + Quake_SetQuakeValues(var, arg1, 0, 0, 0); + Quake_SetCountdown(var, arg2); } void func_80033E88(Actor* actor, GlobalContext* globalCtx, s16 arg2, s16 arg3) { diff --git a/src/code/z_demo.c b/src/code/z_demo.c index dd47227d41..436dbfc15c 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -272,15 +272,15 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* break; case 16: if (sp3F != 0) { - D_8015FCCA = func_80092F88(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 6); - func_80092DAC(D_8015FCCA, 0x7FFF); - func_80092E70(D_8015FCCA, 4, 0, 1000, 0); - func_80092DF0(D_8015FCCA, 800); + D_8015FCCA = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 6); + Quake_SetSpeed(D_8015FCCA, 0x7FFF); + Quake_SetQuakeValues(D_8015FCCA, 4, 0, 1000, 0); + Quake_SetCountdown(D_8015FCCA, 800); } break; case 17: if (sp3F != 0) { - func_80092FAC(D_8015FCCA); + Quake_RemoveFromIdx(D_8015FCCA); } break; case 18: diff --git a/src/code/z_quake.c b/src/code/z_quake.c new file mode 100644 index 0000000000..50db67ec5f --- /dev/null +++ b/src/code/z_quake.c @@ -0,0 +1,391 @@ +#include +#include + +QuakeRequest sQuakeRequest[4]; +s16 D_80126250 = 1; +s16 sQuakeRequestCount = 0; +s16 (*sQuakeCallbacks[])(QuakeRequest*, ShakeInfo*) = { + NULL, Quake_Callback1, Quake_Callback2, Quake_Callback3, Quake_Callback4, Quake_Callback5, Quake_Callback6, +}; + +Vec3f* Quake_AddVec(Vec3f* dst, Vec3f* arg1, struct_80045714* arg2) { + Vec3f vec1; + Vec3f vec2; + + func_8007C25C(&vec2, arg2); + vec1.x = arg1->x + vec2.x; + vec1.y = arg1->y + vec2.y; + vec1.z = arg1->z + vec2.z; + *dst = vec1; + return dst; +} + +void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x) { + Vec3f* unk50 = &req->cam->unk_50; + Vec3f* unk5C = &req->cam->unk_5C; + + Vec3f vec; + struct_80045714 struc2; + struct_80045714 struc1; + Vec3f vec2; + + if (req->unk_1C) { + vec.x = 0; + vec.y = 0; + vec.z = 0; + func_8007C490(&struc1, unk5C, unk50); + struc2.unk_00 = req->y * y; + struc2.unk_04 = struc1.unk_04 + req->unk_14.unk_00 + 0x4000; + struc2.unk_06 = struc1.unk_06 + req->unk_14.unk_02; + Quake_AddVec(&vec, &vec, &struc2); + struc2.unk_00 = req->x * x; + struc2.unk_04 = struc1.unk_04 + req->unk_14.unk_00; + struc2.unk_06 = struc1.unk_06 + req->unk_14.unk_02 + 0x4000; + Quake_AddVec(&vec, &vec, &struc2); + } else { + vec.x = 0; + vec.y = req->y * y; + vec.z = 0; + struc2.unk_00 = req->x * x; + struc2.unk_04 = req->unk_14.unk_00; + struc2.unk_06 = req->unk_14.unk_02; + Quake_AddVec(&vec, &vec, &struc2); + } + + vec2 = vec; + shake->vec2 = vec2; + shake->vec1 = vec2; + shake->unk_1A = (f32)0x8000 * y; + shake->rotZ = req->rotZ * y; + shake->zoom = req->zoom * y; +} + +s16 Quake_Callback1(QuakeRequest* req, ShakeInfo* shake) { + u32 pad; + if (req->countdown > 0) { + f32 a = Math_Sins(req->speed * req->countdown); + Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + req->countdown--; + } + return req->countdown; +} + +s16 Quake_Callback5(QuakeRequest* req, ShakeInfo* shake) { + if (req->countdown > 0) { + f32 a = Math_Sins(req->speed * req->countdown); + Quake_UpdateShakeInfo(req, shake, a, a); + req->countdown--; + } + return req->countdown; +} + +s16 Quake_Callback6(QuakeRequest* req, ShakeInfo* shake) { + u32 pad; + f32 a; + + req->countdown--; + a = Math_Sins(req->speed * ((req->countdown & 0xF) + 500)); + Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + return 1; +} + +s16 Quake_Callback3(QuakeRequest* req, ShakeInfo* shake) { + if (req->countdown > 0) { + f32 a = Math_Sins(req->speed * req->countdown) * ((f32)req->countdown / (f32)req->countdownMax); + Quake_UpdateShakeInfo(req, shake, a, a); + req->countdown--; + } + return req->countdown; +} + +s16 Quake_Callback2(QuakeRequest* req, ShakeInfo* shake) { + if (req->countdown > 0) { + f32 a = Math_Rand_ZeroOne(); + Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + req->countdown--; + } + return req->countdown; +} + +s16 Quake_Callback4(QuakeRequest* req, ShakeInfo* shake) { + if (req->countdown > 0) { + f32 a = Math_Rand_ZeroOne() * ((f32)req->countdown / (f32)req->countdownMax); + Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + req->countdown--; + } + return req->countdown; +} + +s16 Quake_GetFreeIndex() { + s32 i; + s32 ret; + s32 min = 0x10000; + + for (i = 0; i < ARRAY_COUNT(sQuakeRequest); i++) { + if (sQuakeRequest[i].callbackIdx == 0) { + ret = i; + min = 0x20000; + break; + } + + if (sQuakeRequest[i].countdown < min) { + min = sQuakeRequest[i].countdown; + ret = i; + } + } + + if (min != 0x20000) { + osSyncPrintf(VT_COL(YELLOW, BLACK) "quake: too many request %d is changed new one !!\n" VT_RST, ret); + } + + return ret; +} + +QuakeRequest* Quake_AddImpl(Camera* cam, u32 callbackIdx) { + s16 idx = Quake_GetFreeIndex(); + QuakeRequest* req = sQuakeRequest + idx; + + func_80106860(req, 0, sizeof(QuakeRequest)); // memset + req->cam = cam; + req->camPtrIdx = cam->unk_164; + req->callbackIdx = callbackIdx; + req->unk_1C = 1; + req->randIdx = ((s16)(Math_Rand_ZeroOne() * (f32)0x10000) & ~3) + idx; + sQuakeRequestCount++; + + return req; +} + +void Quake_Remove(QuakeRequest* req) { + req->callbackIdx = 0; + req->countdown = -1; + sQuakeRequestCount--; +} + +QuakeRequest* Quake_GetRequest(s16 idx) { + QuakeRequest* req = sQuakeRequest + (idx & 3); + if (req->callbackIdx == 0) { + return NULL; + } + + if (idx != req->randIdx) { + return NULL; + } + + return req; +} + +QuakeRequest* Quake_SetValue(s16 idx, s16 valueType, s16 value) { + QuakeRequest* req; + + req = Quake_GetRequest(idx); + if (req == NULL) { + return NULL; + } else { + switch (valueType) { + case 1: + req->speed = value; + break; + case 2: + req->y = value; + break; + case 4: + req->x = value; + break; + case 8: + req->zoom = value; + break; + case 0x10: + req->rotZ = value; + break; + case 0x20: + req->unk_14.unk_00 = value; + break; + case 0x40: + req->unk_14.unk_02 = value; + break; + case 0x80: + req->unk_14.unk_04 = value; + break; + case 0x100: + req->countdown = value; + req->countdownMax = req->countdown; + break; + case 0x200: + req->unk_1C = value; + break; + } + } +} + +u32 Quake_SetSpeed(s16 idx, s16 value) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + req->speed = value; + return true; + } + return false; +} + +u32 Quake_SetCountdown(s16 idx, s16 value) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + req->countdown = value; + req->countdownMax = req->countdown; + return true; + } + return false; +} + +s16 Quake_GetCountdown(s16 idx) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + return req->countdown; + } + return 0; +} + +u32 Quake_SetQuakeValues(s16 idx, s16 y, s16 x, s16 zoom, s16 rotZ) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + req->y = y; + req->x = x; + req->zoom = zoom; + req->rotZ = rotZ; + return true; + } + return false; +} + +u32 Quake_SetUnkValues(s16 idx, s16 arg1, SubQuakeRequest14 arg2) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + req->unk_1C = arg1; + + req->unk_14 = arg2; + return true; + } + return false; +} + +void Quake_Init() { + s16 i; + for (i = 0; i < ARRAY_COUNT(sQuakeRequest); i++) { + sQuakeRequest[i].callbackIdx = 0; + sQuakeRequest[i].countdown = 0; + } + D_80126250 = 1; + sQuakeRequestCount = 0; +} + +s16 Quake_Add(Camera* cam, u32 callbackIdx) { + return Quake_AddImpl(cam, callbackIdx)->randIdx; +} + +u32 Quake_RemoveFromIdx(s16 idx) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + Quake_Remove(req); + return true; + } + return false; +} + +s16 Quake_Calc(Camera* camera, UnkQuakeCalcStruct* camData) { + f32 max; + f32 max2; + QuakeRequest* req; + ShakeInfo shake; + f32 absSpeedDiv; + s16* temp; + u32 pad2; + s32 idx; + s32 ret; + u32 eq; + Vec3f vec; + GlobalContext* globalCtx; + + globalCtx = camera->globalCtx; + vec.x = 0.0f; + vec.y = 0.0f; + vec.z = 0.0f; + camData->rotZ = 0; + camData->unk_1A = 0; + camData->zoom = 0; + camData->vec1.x = 0.0f; + camData->vec1.y = 0.0f; + camData->vec1.z = 0.0f; + camData->vec2.x = 0.0f; + camData->vec2.y = 0.0f; + camData->vec2.z = 0.0f; + camData->unk_20 = 0.0f; + + if (sQuakeRequestCount == 0) { + return 0; + } + + ret = 0; + for (idx = 0; idx < ARRAY_COUNT(sQuakeRequest); idx++) { + req = &sQuakeRequest[idx]; + if (req->callbackIdx != 0) { + if (globalCtx->cameraCtx.activeCameraPtrs[req->camPtrIdx] == 0) { + osSyncPrintf(VT_COL(YELLOW, BLACK) "quake: stopped! 'coz camera [%d] killed!!\n" VT_RST, + req->camPtrIdx); + Quake_Remove(req); + } else { + temp = &camera->unk_164; + eq = req->cam->unk_164 != *temp; + absSpeedDiv = ABS(req->speed) / (f32)0x8000; + if (sQuakeCallbacks[req->callbackIdx](req, &shake) == 0) { + Quake_Remove(req); + } else if (eq == 0) { + if (fabsf(camData->vec1.x) < fabsf(shake.vec1.x)) { + camData->vec1.x = shake.vec1.x; + } + if (fabsf(camData->vec1.y) < fabsf(shake.vec1.y)) { + camData->vec1.y = shake.vec1.y; + } + if (fabsf(camData->vec1.z) < fabsf(shake.vec1.z)) { + camData->vec1.z = shake.vec1.z; + } + if (fabsf(camData->vec2.x) < fabsf(shake.vec2.x)) { + camData->vec2.x = shake.vec2.x; + } + if (fabsf(camData->vec2.y) < fabsf(shake.vec2.y)) { + camData->vec2.y = shake.vec2.y; + } + if (fabsf(camData->vec2.z) < fabsf(shake.vec2.z)) { + camData->vec2.z = shake.vec2.z; + } + if (camData->rotZ < shake.rotZ) { + camData->rotZ = shake.rotZ; + camData->unk_1A = shake.unk_1A; + } + if (camData->zoom < shake.zoom) { + camData->zoom = shake.zoom; + } + + max = func_8007BF90(&shake.vec1, &vec) * absSpeedDiv; + max2 = func_8007BF90(&shake.vec2, &vec) * absSpeedDiv; + if (max < max2) { + max = max2; + } + max2 = (camData->rotZ * 0.005f) * absSpeedDiv; + if (max < max2) { + max = max2; + } + max2 = (camData->zoom * 0.005f) * absSpeedDiv; + if (max < max2) { + max = max2; + } + if (camData->unk_20 < max) { + camData->unk_20 = max; + } + + ret++; + } + } + } + } + return ret; +} diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 1bdfde9e32..c353df3676 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -1236,17 +1236,17 @@ void func_8009BEEC(GlobalContext* globalCtx) { s32 var; if (globalCtx->gameplayFrames % 128 == 13) { - var = func_80092F88(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 2); - func_80092DAC(var, 10000); - func_80092E70(var, 4, 0, 0, 0); - func_80092DF0(var, 127); + var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 2); + Quake_SetSpeed(var, 10000); + Quake_SetQuakeValues(var, 4, 0, 0, 0); + Quake_SetCountdown(var, 127); } if ((globalCtx->gameplayFrames % 64 == 0) && (Math_Rand_ZeroOne() > 0.6f)) { - var = func_80092F88(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); - func_80092DAC(var, 32000.0f + (Math_Rand_ZeroOne() * 3000.0f)); - func_80092E70(var, 10.0f - (Math_Rand_ZeroOne() * 9.0f), 0, 0, 0); - func_80092DF0(var, 48.0f - (Math_Rand_ZeroOne() * 15.0f)); + var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); + Quake_SetSpeed(var, 32000.0f + (Math_Rand_ZeroOne() * 3000.0f)); + Quake_SetQuakeValues(var, 10.0f - (Math_Rand_ZeroOne() * 9.0f), 0, 0, 0); + Quake_SetCountdown(var, 48.0f - (Math_Rand_ZeroOne() * 15.0f)); } } #else diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index a9894f43d2..3e9034157d 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -111,10 +111,10 @@ static void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx) { if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.x, 0x4000, this->unk_168)) { func_80899A08(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_TRAP_BOUND); - var = func_80092F88(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); - func_80092DAC(var, 25000); - func_80092E70(var, 2, 0, 0, 0); - func_80092DF0(var, 0x10); + var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); + Quake_SetSpeed(var, 25000); + Quake_SetQuakeValues(var, 2, 0, 0, 0); + Quake_SetCountdown(var, 0x10); } } diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index f8a190be0b..9247305d8e 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -115,10 +115,10 @@ static void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx) { Math_ApproxF(&thisx->velocity.y, 1.6f, 0.03f); if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y + 200.0f, thisx->velocity.y)) { func_808B3274(this); - var = func_80092F88(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); - func_80092DAC(var, -0x3CB0); - func_80092E70(var, 3, 0, 0, 0); - func_80092DF0(var, 0xC); + var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); + Quake_SetSpeed(var, -0x3CB0); + Quake_SetQuakeValues(var, 3, 0, 0, 0); + Quake_SetCountdown(var, 0xC); Audio_PlayActorSound2(thisx, NA_SE_EV_BRIDGE_OPEN_STOP); } else { func_8002F974(thisx, 0x2067); diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index f2656d950b..f73a427c87 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -1,3 +1,9 @@ +/* + * File: z_en_ds.c + * Overlay: ovl_En_Ds + * Description: Potion Shop Granny + */ + #include "z_en_ds.h" #define ROOM 0x00 @@ -8,7 +14,24 @@ void EnDs_Destroy(EnDs* this, GlobalContext* globalCtx); void EnDs_Update(EnDs* this, GlobalContext* globalCtx); void EnDs_Draw(EnDs* this, GlobalContext* globalCtx); -/* +void EnDs_Talk(EnDs* this, GlobalContext* globalCtx); +void EnDs_TalkNoEmptyBottle(EnDs* this, GlobalContext* globalCtx); +void EnDs_TalkAfterGiveOddPotion(EnDs* this, GlobalContext* globalCtx); +void EnDs_DisplayOddPotionText(EnDs* this, GlobalContext* globalCtx); +void EnDs_GiveOddPotion(EnDs* this, GlobalContext* globalCtx); +void EnDs_TalkAfterBrewOddPotion(EnDs* this, GlobalContext* globalCtx); +void EnDs_BrewOddPotion3(EnDs* this, GlobalContext* globalCtx); +void EnDs_BrewOddPotion2(EnDs* this, GlobalContext* globalCtx); +void EnDs_BrewOddPotion1(EnDs* this, GlobalContext* globalCtx); +void EnDs_OfferOddPotion(EnDs* this, GlobalContext* globalCtx); +int EnDs_CheckRupeesAndBottle(); +void EnDs_GiveBluePotion(EnDs* this, GlobalContext* globalCtx); +void EnDs_OfferBluePotion(EnDs* this, GlobalContext* globalCtx); +void EnDs_Wait(EnDs* this, GlobalContext* globalCtx); + +UNK_TYPE func_809FDA38(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, EnDs* this); +void func_809FDA7C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* this); + const ActorInit En_Ds_InitVars = { ACTOR_EN_DS, ACTORTYPE_NPC, @@ -21,43 +44,250 @@ const ActorInit En_Ds_InitVars = { (ActorFunc)EnDs_Update, (ActorFunc)EnDs_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Destroy.s") +extern SkeletonHeader D_06004768; +extern AnimationHeader D_0600039C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD10C.s") +Vec3f mtxSrc = { 1100.0f, 500.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD160.s") +void EnDs_Init(EnDs* this, GlobalContext* globalCtx) { + SkelAnime* skelAnime = &this->skelAnime; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD1CC.s") + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 36.0f); + SkelAnime_InitSV(globalCtx, skelAnime, &D_06004768, &D_0600039C, &this->actorDrawTable, &this->unk_1B4, 6); + func_800A51E8(&this->skelAnime, &D_0600039C); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD224.s") + this->actor.sub_98.mass = 0xFF; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD284.s") + Actor_SetScale(this, 0.013f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD2EC.s") + this->actionFunc = EnDs_Wait; + this->actor.unk_1F = 1; + this->unk_1E8 = 0; + this->actor.flags &= ~0x1; + this->unk_1E4 = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD368.s") +void EnDs_Destroy(EnDs* this, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD40C.s") +void EnDs_Talk(EnDs* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx) != 0) { + this->actionFunc = EnDs_Wait; + this->actor.flags &= ~0x10000; + } + this->unk_1E8 |= 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD460.s") +void EnDs_TalkNoEmptyBottle(EnDs* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + func_80106CCC(globalCtx); + this->actionFunc = EnDs_Wait; + } + this->unk_1E8 |= 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD500.s") +void EnDs_TalkAfterGiveOddPotion(EnDs* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx) != 0) { + this->actionFunc = EnDs_Talk; + } else { + this->actor.flags |= 0x10000; + func_8002F2CC(&this->actor, globalCtx, 1000.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD5CC.s") +void EnDs_DisplayOddPotionText(EnDs* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx) != 0) { + this->actor.textId = 0x504F; + this->actionFunc = EnDs_TalkAfterGiveOddPotion; + this->actor.flags &= ~0x100; + gSaveContext.item_get_inf[3] |= 1; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD61C.s") +void EnDs_GiveOddPotion(EnDs* this, GlobalContext* globalCtx) { + if (func_8002F410(&this->actor, globalCtx) != 0) { + this->actor.attachedA = NULL; + this->actionFunc = EnDs_DisplayOddPotionText; + gSaveContext.timer_2_state = 0; + } else { + func_8002F434(&this->actor, globalCtx, GI_ODD_POTION, 10000.0f, 50.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD67C.s") +void EnDs_TalkAfterBrewOddPotion(EnDs* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + func_80106CCC(globalCtx); + this->actionFunc = EnDs_GiveOddPotion; + func_8002F434(&this->actor, globalCtx, GI_ODD_POTION, 10000.0f, 50.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD7B4.s") +void EnDs_BrewOddPotion3(EnDs* this, GlobalContext* globalCtx) { + if (this->brewTimer > 0) { + this->brewTimer -= 1; + } else { + this->actionFunc = EnDs_TalkAfterBrewOddPotion; + func_8010B720(globalCtx, 0x504D); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Update.s") + Math_ApproxF(&this->unk_1E4, 0, 0.03f); + func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0.1f, 1.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA38.s") +void EnDs_BrewOddPotion2(EnDs* this, GlobalContext* globalCtx) { + if (this->brewTimer > 0) { + this->brewTimer -= 1; + } else { + this->actionFunc = EnDs_BrewOddPotion3; + this->brewTimer = 60; + Flags_UnsetSwitch(globalCtx, 0x3F); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA7C.s") +void EnDs_BrewOddPotion1(EnDs* this, GlobalContext* globalCtx) { + if (this->brewTimer > 0) { + this->brewTimer -= 1; + } else { + this->actionFunc = EnDs_BrewOddPotion2; + this->brewTimer = 20; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s") + Math_ApproxF(&this->unk_1E4, 1.0f, 0.01f); + func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0.1f, 1.0f); +} + +void EnDs_OfferOddPotion(EnDs* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // yes + this->actionFunc = EnDs_BrewOddPotion1; + this->brewTimer = 60; + Flags_SetSwitch(globalCtx, 0x3F); + globalCtx->msgCtx.msgMode = 0x37; + player->exchangeItemId = 0; + break; + case 1: // no + func_8010B720(globalCtx, 0x504C); + this->actionFunc = EnDs_Talk; + } + } +} + +int EnDs_CheckRupeesAndBottle() { + if (gSaveContext.rupees < 100) { + return 0; + } else if (Inventory_HasEmptyBottle() == 0) { + return 1; + } else { + return 2; + } +} + +void EnDs_GiveBluePotion(EnDs* this, GlobalContext* globalCtx) { + if (func_8002F410(&this->actor, globalCtx) != 0) { + this->actor.attachedA = NULL; + this->actionFunc = EnDs_Talk; + } else { + func_8002F434(&this->actor, globalCtx, GI_POTION_BLUE, 10000.0f, 50.0f); + } +} + +void EnDs_OfferBluePotion(EnDs* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // yes + switch (EnDs_CheckRupeesAndBottle()) { + case 0: // have less than 100 rupees + func_8010B720(globalCtx, 0x500E); + break; + case 1: // have 100 rupees but no empty bottle + func_8010B720(globalCtx, 0x96); + this->actionFunc = EnDs_TalkNoEmptyBottle; + return; + case 2: // have 100 rupees and empty bottle + Rupees_ChangeBy(-100); + this->actor.flags &= ~0x10000; + func_8002F434(this, globalCtx, GI_POTION_BLUE, 10000.0f, 50.0f); + this->actionFunc = EnDs_GiveBluePotion; + return; + } + break; + case 1: // no + func_8010B720(globalCtx, 0x500D); + } + this->actionFunc = EnDs_Talk; + } +} + +void EnDs_Wait(EnDs* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 unkAngle; + + if (func_8002F194(&this->actor, globalCtx) != 0) { + if (func_8002F368(globalCtx) == 8) { + Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + player->actor.textId = 0x504A; + this->actionFunc = EnDs_OfferOddPotion; + } else if (gSaveContext.item_get_inf[3] & 1) { + player->actor.textId = 0x500C; + this->actionFunc = EnDs_OfferBluePotion; + } else { + if (INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_ODD_MUSHROOM) { + player->actor.textId = 0x5049; + } else { + player->actor.textId = 0x5048; + } + this->actionFunc = EnDs_Talk; + } + } else { + unkAngle = this->actor.rotTowardsLinkY - this->actor.shape.rot.y; + this->actor.textId = 0x5048; + + if ((ABS(unkAngle) < 0x2151) && (this->actor.xzDistanceFromLink < 200.0f)) { + func_8002F298(this, globalCtx, 100.0f, 8); + this->unk_1E8 |= 1; + } + } +} + +void EnDs_Update(EnDs* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + this->skelAnime.animCurrentFrame = 0.0f; + } + + this->actionFunc(this, globalCtx); + + if (this->unk_1E8 & 1) { + func_80038290(globalCtx, this, &this->unk_1D8, &this->unk_1DE, this->actor.posRot2.pos); + } else { + Math_SmoothScaleMaxMinS(&this->unk_1D8.x, 0, 6, 0x1838, 100); + Math_SmoothScaleMaxMinS(&this->unk_1D8.y, 0, 6, 0x1838, 100); + Math_SmoothScaleMaxMinS(&this->unk_1DE.x, 0, 6, 0x1838, 100); + Math_SmoothScaleMaxMinS(&this->unk_1DE.y, 0, 6, 0x1838, 100); + } +} + +UNK_TYPE func_809FDA38(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, EnDs* this) { + EnDs* enDs = this; + + if (limbIndex == 5) { + rot->x += this->unk_1D8.y; + rot->z += this->unk_1D8.x; + } + return 0; +} + +void func_809FDA7C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { + if (limbIndex == 5) { + Matrix_MultVec3f(&mtxSrc, &actor->posRot2.pos); + } +} + +void EnDs_Draw(EnDs* this, GlobalContext* globalCtx) { + func_800943C8(globalCtx->state.gfxCtx); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, + &func_809FDA38, &func_809FDA7C, this); +} diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.h b/src/overlays/actors/ovl_En_Ds/z_en_ds.h index 83a850659f..7a1f4e9c9e 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.h +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.h @@ -6,7 +6,17 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xA4]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s actorDrawTable; + /* 0x0196 */ char unk_194[0x1E]; + /* 0x01B4 */ Vec3s unk_1B4; + /* 0x01BA */ char unk_1B8[0x1E]; + /* 0x01D8 */ Vec3s unk_1D8; + /* 0x01DE */ Vec3s unk_1DE; + /* 0x01E4 */ float unk_1E4; + /* 0x01E8 */ u16 unk_1E8; + /* 0x01EA */ u16 brewTimer; + /* 0x01EC */ ActorFunc actionFunc; } EnDs; // size = 0x01F0 extern const ActorInit En_Ds_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index 1eba1b2b14..d4e050db8d 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -463,4 +463,8 @@ D_060011D4 = 0x060011D4; D_06001080 = 0x06001080; // z_skelanime -link_animetion_segment = 0x07000000; \ No newline at end of file +link_animetion_segment = 0x07000000; + +// z_en_ds +D_06004768 = 0x06004768; +D_0600039C = 0x0600039C; \ No newline at end of file