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_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_Ru2/EnRu2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Destroy.s deleted file mode 100644 index 1ff0adf344..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel EnRu2_Destroy -/* 00090 80AF25E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00094 80AF25E4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00098 80AF25E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0009C 80AF25EC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000A0 80AF25F0 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 000A4 80AF25F4 24C502C8 */ addiu $a1, $a2, 0x02C8 ## $a1 = 000002C8 -/* 000A8 80AF25F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000AC 80AF25FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000B0 80AF2600 03E00008 */ jr $ra -/* 000B4 80AF2604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s deleted file mode 100644 index f613af3182..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel EnRu2_Draw -/* 01B34 80AF4084 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01B38 80AF4088 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01B3C 80AF408C 8C8202AC */ lw $v0, 0x02AC($a0) ## 000002AC -/* 01B40 80AF4090 04400008 */ bltz $v0, .L80AF40B4 -/* 01B44 80AF4094 28410003 */ slti $at, $v0, 0x0003 -/* 01B48 80AF4098 10200006 */ beq $at, $zero, .L80AF40B4 -/* 01B4C 80AF409C 00027080 */ sll $t6, $v0, 2 -/* 01B50 80AF40A0 3C0380AF */ lui $v1, %hi(D_80AF510C) ## $v1 = 80AF0000 -/* 01B54 80AF40A4 006E1821 */ addu $v1, $v1, $t6 -/* 01B58 80AF40A8 8C63510C */ lw $v1, %lo(D_80AF510C)($v1) -/* 01B5C 80AF40AC 14600006 */ bne $v1, $zero, .L80AF40C8 -/* 01B60 80AF40B0 00000000 */ nop -.L80AF40B4: -/* 01B64 80AF40B4 3C0480AF */ lui $a0, %hi(D_80AF5244) ## $a0 = 80AF0000 -/* 01B68 80AF40B8 0C00084C */ jal osSyncPrintf - -/* 01B6C 80AF40BC 24845244 */ addiu $a0, $a0, %lo(D_80AF5244) ## $a0 = 80AF5244 -/* 01B70 80AF40C0 10000004 */ beq $zero, $zero, .L80AF40D4 -/* 01B74 80AF40C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF40C8: -/* 01B78 80AF40C8 0060F809 */ jalr $ra, $v1 -/* 01B7C 80AF40CC 00000000 */ nop -/* 01B80 80AF40D0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF40D4: -/* 01B84 80AF40D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B88 80AF40D8 03E00008 */ jr $ra -/* 01B8C 80AF40DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s deleted file mode 100644 index 49f5582a9c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel EnRu2_Init -/* 018CC 80AF3E1C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 018D0 80AF3E20 AFB10028 */ sw $s1, 0x0028($sp) -/* 018D4 80AF3E24 AFB00024 */ sw $s0, 0x0024($sp) -/* 018D8 80AF3E28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 018DC 80AF3E2C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 018E0 80AF3E30 AFBF002C */ sw $ra, 0x002C($sp) -/* 018E4 80AF3E34 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 018E8 80AF3E38 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 018EC 80AF3E3C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 018F0 80AF3E40 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 018F4 80AF3E44 0C00AC78 */ jal ActorShape_Init - -/* 018F8 80AF3E48 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 018FC 80AF3E4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01900 80AF3E50 0C2BC954 */ jal func_80AF2550 -/* 01904 80AF3E54 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01908 80AF3E58 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0190C 80AF3E5C 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 01910 80AF3E60 260F021A */ addiu $t7, $s0, 0x021A ## $t7 = 0000021A -/* 01914 80AF3E64 24180017 */ addiu $t8, $zero, 0x0017 ## $t8 = 00000017 -/* 01918 80AF3E68 AFB80018 */ sw $t8, 0x0018($sp) -/* 0191C 80AF3E6C AFAF0014 */ sw $t7, 0x0014($sp) -/* 01920 80AF3E70 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01924 80AF3E74 24C6C700 */ addiu $a2, $a2, 0xC700 ## $a2 = 0600C700 -/* 01928 80AF3E78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0192C 80AF3E7C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01930 80AF3E80 0C0291BE */ jal SkelAnime_InitSV -/* 01934 80AF3E84 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01938 80AF3E88 0C2BC9A8 */ jal func_80AF26A0 -/* 0193C 80AF3E8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01940 80AF3E90 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01944 80AF3E94 10410009 */ beq $v0, $at, .L80AF3EBC -/* 01948 80AF3E98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0194C 80AF3E9C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01950 80AF3EA0 1041000A */ beq $v0, $at, .L80AF3ECC -/* 01954 80AF3EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01958 80AF3EA8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0195C 80AF3EAC 1041000B */ beq $v0, $at, .L80AF3EDC -/* 01960 80AF3EB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01964 80AF3EB4 1000000D */ beq $zero, $zero, .L80AF3EEC -/* 01968 80AF3EB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AF3EBC: -/* 0196C 80AF3EBC 0C2BCB87 */ jal func_80AF2E1C -/* 01970 80AF3EC0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01974 80AF3EC4 1000000C */ beq $zero, $zero, .L80AF3EF8 -/* 01978 80AF3EC8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3ECC: -/* 0197C 80AF3ECC 0C2BCCE5 */ jal func_80AF3394 -/* 01980 80AF3ED0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01984 80AF3ED4 10000008 */ beq $zero, $zero, .L80AF3EF8 -/* 01988 80AF3ED8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3EDC: -/* 0198C 80AF3EDC 0C2BCDD1 */ jal func_80AF3744 -/* 01990 80AF3EE0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01994 80AF3EE4 10000004 */ beq $zero, $zero, .L80AF3EF8 -/* 01998 80AF3EE8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3EEC: -/* 0199C 80AF3EEC 0C2BCA65 */ jal func_80AF2994 -/* 019A0 80AF3EF0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 019A4 80AF3EF4 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3EF8: -/* 019A8 80AF3EF8 A20002C2 */ sb $zero, 0x02C2($s0) ## 000002C2 -/* 019AC 80AF3EFC A21902C3 */ sb $t9, 0x02C3($s0) ## 000002C3 -/* 019B0 80AF3F00 8FBF002C */ lw $ra, 0x002C($sp) -/* 019B4 80AF3F04 8FB10028 */ lw $s1, 0x0028($sp) -/* 019B8 80AF3F08 8FB00024 */ lw $s0, 0x0024($sp) -/* 019BC 80AF3F0C 03E00008 */ jr $ra -/* 019C0 80AF3F10 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s deleted file mode 100644 index 7a961cce3d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel EnRu2_Update -/* 01870 80AF3DC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01874 80AF3DC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01878 80AF3DC8 8C8202A8 */ lw $v0, 0x02A8($a0) ## 000002A8 -/* 0187C 80AF3DCC 04400008 */ bltz $v0, .L80AF3DF0 -/* 01880 80AF3DD0 28410014 */ slti $at, $v0, 0x0014 -/* 01884 80AF3DD4 10200006 */ beq $at, $zero, .L80AF3DF0 -/* 01888 80AF3DD8 00027080 */ sll $t6, $v0, 2 -/* 0188C 80AF3DDC 3C0380AF */ lui $v1, %hi(D_80AF50BC) ## $v1 = 80AF0000 -/* 01890 80AF3DE0 006E1821 */ addu $v1, $v1, $t6 -/* 01894 80AF3DE4 8C6350BC */ lw $v1, %lo(D_80AF50BC)($v1) -/* 01898 80AF3DE8 14600006 */ bne $v1, $zero, .L80AF3E04 -/* 0189C 80AF3DEC 00000000 */ nop -.L80AF3DF0: -/* 018A0 80AF3DF0 3C0480AF */ lui $a0, %hi(D_80AF51E8) ## $a0 = 80AF0000 -/* 018A4 80AF3DF4 0C00084C */ jal osSyncPrintf - -/* 018A8 80AF3DF8 248451E8 */ addiu $a0, $a0, %lo(D_80AF51E8) ## $a0 = 80AF51E8 -/* 018AC 80AF3DFC 10000004 */ beq $zero, $zero, .L80AF3E10 -/* 018B0 80AF3E00 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF3E04: -/* 018B4 80AF3E04 0060F809 */ jalr $ra, $v1 -/* 018B8 80AF3E08 00000000 */ nop -/* 018BC 80AF3E0C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF3E10: -/* 018C0 80AF3E10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018C4 80AF3E14 03E00008 */ jr $ra -/* 018C8 80AF3E18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s deleted file mode 100644 index f212f997ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AF2550 -/* 00000 80AF2550 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 80AF2554 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 80AF2558 AFA50024 */ sw $a1, 0x0024($sp) -/* 0000C 80AF255C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80AF2560 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80AF2564 24C502C8 */ addiu $a1, $a2, 0x02C8 ## $a1 = 000002C8 -/* 00018 80AF2568 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80AF256C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00020 80AF2570 AFA60020 */ sw $a2, 0x0020($sp) -/* 00024 80AF2574 3C0780AF */ lui $a3, %hi(D_80AF40E0) ## $a3 = 80AF0000 -/* 00028 80AF2578 8FA50018 */ lw $a1, 0x0018($sp) -/* 0002C 80AF257C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00030 80AF2580 24E740E0 */ addiu $a3, $a3, %lo(D_80AF40E0) ## $a3 = 80AF40E0 -/* 00034 80AF2584 0C017114 */ jal func_8005C450 -/* 00038 80AF2588 8FA40024 */ lw $a0, 0x0024($sp) -/* 0003C 80AF258C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00040 80AF2590 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00044 80AF2594 03E00008 */ jr $ra -/* 00048 80AF2598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s deleted file mode 100644 index 3d1d77a6b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AF259C -/* 0004C 80AF259C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00050 80AF25A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00054 80AF25A4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00058 80AF25A8 248602C8 */ addiu $a2, $a0, 0x02C8 ## $a2 = 000002C8 -/* 0005C 80AF25AC 00C02825 */ or $a1, $a2, $zero ## $a1 = 000002C8 -/* 00060 80AF25B0 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 00064 80AF25B4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00068 80AF25B8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0006C 80AF25BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00070 80AF25C0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00074 80AF25C4 8FA60018 */ lw $a2, 0x0018($sp) -/* 00078 80AF25C8 0C01767D */ jal Actor_CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 0007C 80AF25CC 00812821 */ addu $a1, $a0, $at -/* 00080 80AF25D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00084 80AF25D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00088 80AF25D8 03E00008 */ jr $ra -/* 0008C 80AF25DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s deleted file mode 100644 index 689b173d4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AF2608 -/* 000B8 80AF2608 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 000BC 80AF260C AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C0 80AF2610 848E02A6 */ lh $t6, 0x02A6($a0) ## 000002A6 -/* 000C4 80AF2614 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 000C8 80AF2618 24C302A6 */ addiu $v1, $a2, 0x02A6 ## $v1 = 000002A6 -/* 000CC 80AF261C 15C00003 */ bne $t6, $zero, .L80AF262C -/* 000D0 80AF2620 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 000D4 80AF2624 10000005 */ beq $zero, $zero, .L80AF263C -/* 000D8 80AF2628 248302A6 */ addiu $v1, $a0, 0x02A6 ## $v1 = 000002A6 -.L80AF262C: -/* 000DC 80AF262C 846F0000 */ lh $t7, 0x0000($v1) ## 000002A6 -/* 000E0 80AF2630 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 000E4 80AF2634 A4780000 */ sh $t8, 0x0000($v1) ## 000002A6 -/* 000E8 80AF2638 84620000 */ lh $v0, 0x0000($v1) ## 000002A6 -.L80AF263C: -/* 000EC 80AF263C 14400008 */ bne $v0, $zero, .L80AF2660 -/* 000F0 80AF2640 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 000F4 80AF2644 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 000F8 80AF2648 AFA3001C */ sw $v1, 0x001C($sp) -/* 000FC 80AF264C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00100 80AF2650 AFA60038 */ sw $a2, 0x0038($sp) -/* 00104 80AF2654 8FA3001C */ lw $v1, 0x001C($sp) -/* 00108 80AF2658 8FA60038 */ lw $a2, 0x0038($sp) -/* 0010C 80AF265C A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80AF2660: -/* 00110 80AF2660 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 00114 80AF2664 24C202A4 */ addiu $v0, $a2, 0x02A4 ## $v0 = 000002A4 -/* 00118 80AF2668 A4590000 */ sh $t9, 0x0000($v0) ## 000002A4 -/* 0011C 80AF266C 84480000 */ lh $t0, 0x0000($v0) ## 000002A4 -/* 00120 80AF2670 29010003 */ slti $at, $t0, 0x0003 -/* 00124 80AF2674 54200003 */ bnel $at, $zero, .L80AF2684 -/* 00128 80AF2678 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0012C 80AF267C A4400000 */ sh $zero, 0x0000($v0) ## 000002A4 -/* 00130 80AF2680 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2684: -/* 00134 80AF2684 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00138 80AF2688 03E00008 */ jr $ra -/* 0013C 80AF268C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s deleted file mode 100644 index e35fb3ef0d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80AF2690 -/* 00140 80AF2690 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 00144 80AF2694 00031A03 */ sra $v1, $v1, 8 -/* 00148 80AF2698 03E00008 */ jr $ra -/* 0014C 80AF269C 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s deleted file mode 100644 index ac6cdd053e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80AF26A0 -/* 00150 80AF26A0 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 00154 80AF26A4 03E00008 */ jr $ra -/* 00158 80AF26A8 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s deleted file mode 100644 index fde59c5635..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80AF26AC -/* 0015C 80AF26AC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00160 80AF26B0 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 00164 80AF26B4 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00168 80AF26B8 AC8002AC */ sw $zero, 0x02AC($a0) ## 000002AC -/* 0016C 80AF26BC AC8002B4 */ sw $zero, 0x02B4($a0) ## 000002B4 -/* 00170 80AF26C0 AC8002B8 */ sw $zero, 0x02B8($a0) ## 000002B8 -/* 00174 80AF26C4 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00178 80AF26C8 03E00008 */ jr $ra -/* 0017C 80AF26CC E48402B0 */ swc1 $f4, 0x02B0($a0) ## 000002B0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s deleted file mode 100644 index 1c75801b74..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AF26D0 -/* 00180 80AF26D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00184 80AF26D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00188 80AF26D8 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 0018C 80AF26DC 3C0F80AF */ lui $t7, %hi(D_80AF4118) ## $t7 = 80AF0000 -/* 00190 80AF26E0 3C1980AF */ lui $t9, %hi(D_80AF4118) ## $t9 = 80AF0000 -/* 00194 80AF26E4 15C0000D */ bne $t6, $zero, .L80AF271C -/* 00198 80AF26E8 00000000 */ nop -/* 0019C 80AF26EC 8DEF4118 */ lw $t7, %lo(D_80AF4118)($t7) -/* 001A0 80AF26F0 51E00011 */ beql $t7, $zero, .L80AF2738 -/* 001A4 80AF26F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001A8 80AF26F8 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 001AC 80AF26FC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 001B0 80AF2700 17010003 */ bne $t8, $at, .L80AF2710 -/* 001B4 80AF2704 00000000 */ nop -/* 001B8 80AF2708 0C2BC9AB */ jal func_80AF26AC -/* 001BC 80AF270C 00000000 */ nop -.L80AF2710: -/* 001C0 80AF2710 3C0180AF */ lui $at, %hi(D_80AF4118) ## $at = 80AF0000 -/* 001C4 80AF2714 10000007 */ beq $zero, $zero, .L80AF2734 -/* 001C8 80AF2718 AC204118 */ sw $zero, %lo(D_80AF4118)($at) -.L80AF271C: -/* 001CC 80AF271C 8F394118 */ lw $t9, %lo(D_80AF4118)($t9) -/* 001D0 80AF2720 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 001D4 80AF2724 3C0180AF */ lui $at, %hi(D_80AF4118) ## $at = 80AF0000 -/* 001D8 80AF2728 57200003 */ bnel $t9, $zero, .L80AF2738 -/* 001DC 80AF272C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001E0 80AF2730 AC284118 */ sw $t0, %lo(D_80AF4118)($at) -.L80AF2734: -/* 001E4 80AF2734 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2738: -/* 001E8 80AF2738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001EC 80AF273C 03E00008 */ jr $ra -/* 001F0 80AF2740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s deleted file mode 100644 index 34e34f9d32..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AF2744 -/* 001F4 80AF2744 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001F8 80AF2748 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 001FC 80AF274C 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00200 80AF2750 AFA50024 */ sw $a1, 0x0024($sp) -/* 00204 80AF2754 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00208 80AF2758 AFBF001C */ sw $ra, 0x001C($sp) -/* 0020C 80AF275C AFA40020 */ sw $a0, 0x0020($sp) -/* 00210 80AF2760 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00214 80AF2764 44070000 */ mfc1 $a3, $f0 -/* 00218 80AF2768 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0021C 80AF276C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00220 80AF2770 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 00224 80AF2774 0C00B92D */ jal func_8002E4B4 -/* 00228 80AF2778 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0022C 80AF277C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00230 80AF2780 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00234 80AF2784 03E00008 */ jr $ra -/* 00238 80AF2788 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s deleted file mode 100644 index 5d835e03d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80AF278C -/* 0023C 80AF278C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00240 80AF2790 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00244 80AF2794 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00248 80AF2798 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0024C 80AF279C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00250 80AF27A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00254 80AF27A4 03E00008 */ jr $ra -/* 00258 80AF27A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s deleted file mode 100644 index fc14a3d230..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AF27AC -/* 0025C 80AF27AC 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 00260 80AF27B0 00057880 */ sll $t7, $a1, 2 -/* 00264 80AF27B4 008FC021 */ addu $t8, $a0, $t7 -/* 00268 80AF27B8 11C00003 */ beq $t6, $zero, .L80AF27C8 -/* 0026C 80AF27BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00270 80AF27C0 03E00008 */ jr $ra -/* 00274 80AF27C4 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -.L80AF27C8: -/* 00278 80AF27C8 03E00008 */ jr $ra -/* 0027C 80AF27CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s deleted file mode 100644 index 79024f5ba2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF27D0 -/* 00280 80AF27D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00284 80AF27D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00288 80AF27D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0028C 80AF27DC AFA5001C */ sw $a1, 0x001C($sp) -/* 00290 80AF27E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00294 80AF27E4 AFA60020 */ sw $a2, 0x0020($sp) -/* 00298 80AF27E8 0C2BC9EB */ jal func_80AF27AC -/* 0029C 80AF27EC 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 002A0 80AF27F0 10400007 */ beq $v0, $zero, .L80AF2810 -/* 002A4 80AF27F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002A8 80AF27F8 97AE0022 */ lhu $t6, 0x0022($sp) -/* 002AC 80AF27FC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 002B0 80AF2800 55CF0004 */ bnel $t6, $t7, .L80AF2814 -/* 002B4 80AF2804 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 002B8 80AF2808 10000002 */ beq $zero, $zero, .L80AF2814 -/* 002BC 80AF280C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AF2810: -/* 002C0 80AF2810 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AF2814: -/* 002C4 80AF2814 03E00008 */ jr $ra -/* 002C8 80AF2818 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s deleted file mode 100644 index 383bf66480..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF281C -/* 002CC 80AF281C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002D0 80AF2820 AFA40018 */ sw $a0, 0x0018($sp) -/* 002D4 80AF2824 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002D8 80AF2828 AFA5001C */ sw $a1, 0x001C($sp) -/* 002DC 80AF282C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002E0 80AF2830 AFA60020 */ sw $a2, 0x0020($sp) -/* 002E4 80AF2834 0C2BC9EB */ jal func_80AF27AC -/* 002E8 80AF2838 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 002EC 80AF283C 10400007 */ beq $v0, $zero, .L80AF285C -/* 002F0 80AF2840 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002F4 80AF2844 97AE0022 */ lhu $t6, 0x0022($sp) -/* 002F8 80AF2848 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 002FC 80AF284C 51CF0004 */ beql $t6, $t7, .L80AF2860 -/* 00300 80AF2850 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00304 80AF2854 10000002 */ beq $zero, $zero, .L80AF2860 -/* 00308 80AF2858 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AF285C: -/* 0030C 80AF285C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AF2860: -/* 00310 80AF2860 03E00008 */ jr $ra -/* 00314 80AF2864 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s deleted file mode 100644 index 9fc4706ad8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AF2868 -/* 00318 80AF2868 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0031C 80AF286C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00320 80AF2870 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00324 80AF2874 AFA5001C */ sw $a1, 0x001C($sp) -/* 00328 80AF2878 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0032C 80AF287C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00330 80AF2880 0C2BC9EB */ jal func_80AF27AC -/* 00334 80AF2884 AFA70018 */ sw $a3, 0x0018($sp) -/* 00338 80AF2888 10400013 */ beq $v0, $zero, .L80AF28D8 -/* 0033C 80AF288C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00340 80AF2890 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 00344 80AF2894 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00348 80AF2898 00000000 */ nop -/* 0034C 80AF289C 468021A0 */ cvt.s.w $f6, $f4 -/* 00350 80AF28A0 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 00354 80AF28A4 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 00358 80AF28A8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 0035C 80AF28AC 00000000 */ nop -/* 00360 80AF28B0 468042A0 */ cvt.s.w $f10, $f8 -/* 00364 80AF28B4 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 00368 80AF28B8 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 0036C 80AF28BC 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00370 80AF28C0 00000000 */ nop -/* 00374 80AF28C4 468084A0 */ cvt.s.w $f18, $f16 -/* 00378 80AF28C8 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 0037C 80AF28CC 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 00380 80AF28D0 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 00384 80AF28D4 A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L80AF28D8: -/* 00388 80AF28D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0038C 80AF28DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00390 80AF28E0 03E00008 */ jr $ra -/* 00394 80AF28E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s deleted file mode 100644 index 3f85287827..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AF28E8 -/* 00398 80AF28E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0039C 80AF28EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 003A0 80AF28F0 AFA40028 */ sw $a0, 0x0028($sp) -/* 003A4 80AF28F4 AFA5002C */ sw $a1, 0x002C($sp) -/* 003A8 80AF28F8 AFA60030 */ sw $a2, 0x0030($sp) -/* 003AC 80AF28FC AFA70034 */ sw $a3, 0x0034($sp) -/* 003B0 80AF2900 0C028800 */ jal SkelAnime_GetFrameCount - -/* 003B4 80AF2904 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003B8 80AF2908 8FAE0038 */ lw $t6, 0x0038($sp) -/* 003BC 80AF290C 8FA40028 */ lw $a0, 0x0028($sp) -/* 003C0 80AF2910 8FA5002C */ lw $a1, 0x002C($sp) -/* 003C4 80AF2914 15C00007 */ bne $t6, $zero, .L80AF2934 -/* 003C8 80AF2918 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003CC 80AF291C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 003D0 80AF2920 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 003D4 80AF2924 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 003D8 80AF2928 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 003DC 80AF292C 10000006 */ beq $zero, $zero, .L80AF2948 -/* 003E0 80AF2930 468020A0 */ cvt.s.w $f2, $f4 -.L80AF2934: -/* 003E4 80AF2934 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 003E8 80AF2938 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 003EC 80AF293C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 003F0 80AF2940 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 003F4 80AF2944 46803020 */ cvt.s.w $f0, $f6 -.L80AF2948: -/* 003F8 80AF2948 93AF0033 */ lbu $t7, 0x0033($sp) -/* 003FC 80AF294C C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00400 80AF2950 44066000 */ mfc1 $a2, $f12 -/* 00404 80AF2954 44070000 */ mfc1 $a3, $f0 -/* 00408 80AF2958 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 0040C 80AF295C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00410 80AF2960 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00414 80AF2964 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00418 80AF2968 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0041C 80AF296C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00420 80AF2970 03E00008 */ jr $ra -/* 00424 80AF2974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s deleted file mode 100644 index 11cb83a6a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AF2978 -/* 00428 80AF2978 AFA50004 */ sw $a1, 0x0004($sp) -/* 0042C 80AF297C 3C0180AF */ lui $at, %hi(D_80AF527C) ## $at = 80AF0000 -/* 00430 80AF2980 C426527C */ lwc1 $f6, %lo(D_80AF527C)($at) -/* 00434 80AF2984 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 00438 80AF2988 46062200 */ add.s $f8, $f4, $f6 -/* 0043C 80AF298C 03E00008 */ jr $ra -/* 00440 80AF2990 E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s deleted file mode 100644 index d786125b6a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AF2994 -/* 00444 80AF2994 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00448 80AF2998 AFA50024 */ sw $a1, 0x0024($sp) -/* 0044C 80AF299C AFBF001C */ sw $ra, 0x001C($sp) -/* 00450 80AF29A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00454 80AF29A4 AFA40020 */ sw $a0, 0x0020($sp) -/* 00458 80AF29A8 24A50DE8 */ addiu $a1, $a1, 0x0DE8 ## $a1 = 06000DE8 -/* 0045C 80AF29AC AFA00010 */ sw $zero, 0x0010($sp) -/* 00460 80AF29B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00464 80AF29B4 0C2BCA3A */ jal func_80AF28E8 -/* 00468 80AF29B8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0046C 80AF29BC 3C0180AF */ lui $at, %hi(D_80AF5280) ## $at = 80AF0000 -/* 00470 80AF29C0 C4245280 */ lwc1 $f4, %lo(D_80AF5280)($at) -/* 00474 80AF29C4 8FAE0020 */ lw $t6, 0x0020($sp) -/* 00478 80AF29C8 E5C400BC */ swc1 $f4, 0x00BC($t6) ## 000000BC -/* 0047C 80AF29CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00480 80AF29D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00484 80AF29D4 03E00008 */ jr $ra -/* 00488 80AF29D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s deleted file mode 100644 index b3860facea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80AF29DC -/* 0048C 80AF29DC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00490 80AF29E0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00494 80AF29E4 AFA40038 */ sw $a0, 0x0038($sp) -/* 00498 80AF29E8 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 0049C 80AF29EC C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028 -/* 004A0 80AF29F0 C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 004A4 80AF29F4 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 004A8 80AF29F8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 004AC 80AF29FC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 004B0 80AF2A00 AFAE0028 */ sw $t6, 0x0028($sp) -/* 004B4 80AF2A04 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 004B8 80AF2A08 AFA00024 */ sw $zero, 0x0024($sp) -/* 004BC 80AF2A0C AFA00020 */ sw $zero, 0x0020($sp) -/* 004C0 80AF2A10 AFA0001C */ sw $zero, 0x001C($sp) -/* 004C4 80AF2A14 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 004C8 80AF2A18 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 004CC 80AF2A1C E7A20014 */ swc1 $f2, 0x0014($sp) -/* 004D0 80AF2A20 0C00C916 */ jal Actor_SpawnAttached - -/* 004D4 80AF2A24 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 004D8 80AF2A28 8FBF0034 */ lw $ra, 0x0034($sp) -/* 004DC 80AF2A2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 004E0 80AF2A30 03E00008 */ jr $ra -/* 004E4 80AF2A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s deleted file mode 100644 index 1d1a377d57..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AF2A38 -/* 004E8 80AF2A38 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 004EC 80AF2A3C AFBF0034 */ sw $ra, 0x0034($sp) -/* 004F0 80AF2A40 AFA40038 */ sw $a0, 0x0038($sp) -/* 004F4 80AF2A44 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 004F8 80AF2A48 8CC21C44 */ lw $v0, 0x1C44($a2) ## 00001C44 -/* 004FC 80AF2A4C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00500 80AF2A50 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 00504 80AF2A54 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 00508 80AF2A58 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 0050C 80AF2A5C C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 00510 80AF2A60 46062080 */ add.s $f2, $f4, $f6 -/* 00514 80AF2A64 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00518 80AF2A68 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 0051C 80AF2A6C AFAE0028 */ sw $t6, 0x0028($sp) -/* 00520 80AF2A70 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00524 80AF2A74 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00528 80AF2A78 AFA6003C */ sw $a2, 0x003C($sp) -/* 0052C 80AF2A7C AFA00024 */ sw $zero, 0x0024($sp) -/* 00530 80AF2A80 AFA00020 */ sw $zero, 0x0020($sp) -/* 00534 80AF2A84 AFA0001C */ sw $zero, 0x001C($sp) -/* 00538 80AF2A88 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 0053C 80AF2A8C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00540 80AF2A90 0C00C916 */ jal Actor_SpawnAttached - -/* 00544 80AF2A94 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 00548 80AF2A98 8FA4003C */ lw $a0, 0x003C($sp) -/* 0054C 80AF2A9C 0C021344 */ jal Item_Give -/* 00550 80AF2AA0 24050068 */ addiu $a1, $zero, 0x0068 ## $a1 = 00000068 -/* 00554 80AF2AA4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00558 80AF2AA8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0055C 80AF2AAC 03E00008 */ jr $ra -/* 00560 80AF2AB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s deleted file mode 100644 index f7d6b1819b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AF2AB4 -/* 00564 80AF2AB4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00568 80AF2AB8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0056C 80AF2ABC 904E1415 */ lbu $t6, 0x1415($v0) ## 8015FA75 -/* 00570 80AF2AC0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00574 80AF2AC4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00578 80AF2AC8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0057C 80AF2ACC 15C10019 */ bne $t6, $at, .L80AF2B34 -/* 00580 80AF2AD0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00584 80AF2AD4 8C4F1360 */ lw $t7, 0x1360($v0) ## 8015F9C0 -/* 00588 80AF2AD8 3C0880AF */ lui $t0, %hi(D_80AF411C) ## $t0 = 80AF0000 -/* 0058C 80AF2ADC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00590 80AF2AE0 29E10004 */ slti $at, $t7, 0x0004 -/* 00594 80AF2AE4 10200013 */ beq $at, $zero, .L80AF2B34 -/* 00598 80AF2AE8 2508411C */ addiu $t0, $t0, %lo(D_80AF411C) ## $t0 = 80AF411C -/* 0059C 80AF2AEC 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 005A0 80AF2AF0 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 005A4 80AF2AF4 ACA81D68 */ sw $t0, 0x1D68($a1) ## 00001D68 -/* 005A8 80AF2AF8 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 005AC 80AF2AFC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005B0 80AF2B00 A0491414 */ sb $t1, 0x1414($v0) ## 8015FA74 -/* 005B4 80AF2B04 24050068 */ addiu $a1, $zero, 0x0068 ## $a1 = 00000068 -/* 005B8 80AF2B08 0C021344 */ jal Item_Give -/* 005BC 80AF2B0C AFA3001C */ sw $v1, 0x001C($sp) -/* 005C0 80AF2B10 8FAA0028 */ lw $t2, 0x0028($sp) -/* 005C4 80AF2B14 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 005C8 80AF2B18 8FA3001C */ lw $v1, 0x001C($sp) -/* 005CC 80AF2B1C 85420032 */ lh $v0, 0x0032($t2) ## 00000032 -/* 005D0 80AF2B20 00411021 */ addu $v0, $v0, $at -/* 005D4 80AF2B24 00021400 */ sll $v0, $v0, 16 -/* 005D8 80AF2B28 00021403 */ sra $v0, $v0, 16 -/* 005DC 80AF2B2C A46200B6 */ sh $v0, 0x00B6($v1) ## 000000B6 -/* 005E0 80AF2B30 A4620032 */ sh $v0, 0x0032($v1) ## 00000032 -.L80AF2B34: -/* 005E4 80AF2B34 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005E8 80AF2B38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 005EC 80AF2B3C 03E00008 */ jr $ra -/* 005F0 80AF2B40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s deleted file mode 100644 index 085a12eb0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF2B44 -/* 005F4 80AF2B44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005F8 80AF2B48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005FC 80AF2B4C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00600 80AF2B50 51C0000D */ beql $t6, $zero, .L80AF2B88 -/* 00604 80AF2B54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00608 80AF2B58 8CA21D98 */ lw $v0, 0x1D98($a1) ## 00001D98 -/* 0060C 80AF2B5C 5040000A */ beql $v0, $zero, .L80AF2B88 -/* 00610 80AF2B60 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00614 80AF2B64 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00618 80AF2B68 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 0061C 80AF2B6C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00620 80AF2B70 546F0005 */ bnel $v1, $t7, .L80AF2B88 -/* 00624 80AF2B74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00628 80AF2B78 AC8302A8 */ sw $v1, 0x02A8($a0) ## 000002A8 -/* 0062C 80AF2B7C 0C2BCA77 */ jal func_80AF29DC -/* 00630 80AF2B80 AC9802AC */ sw $t8, 0x02AC($a0) ## 000002AC -/* 00634 80AF2B84 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2B88: -/* 00638 80AF2B88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0063C 80AF2B8C 03E00008 */ jr $ra -/* 00640 80AF2B90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s deleted file mode 100644 index b313c39a50..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF2B94 -/* 00644 80AF2B94 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00648 80AF2B98 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 0064C 80AF2B9C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00650 80AF2BA0 4604003E */ c.le.s $f0, $f4 -/* 00654 80AF2BA4 00000000 */ nop -/* 00658 80AF2BA8 45000003 */ bc1f .L80AF2BB8 -/* 0065C 80AF2BAC 00000000 */ nop -/* 00660 80AF2BB0 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00664 80AF2BB4 E48000BC */ swc1 $f0, 0x00BC($a0) ## 000000BC -.L80AF2BB8: -/* 00668 80AF2BB8 03E00008 */ jr $ra -/* 0066C 80AF2BBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s deleted file mode 100644 index f9c7fbc101..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AF2BC0 -/* 00670 80AF2BC0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00674 80AF2BC4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00678 80AF2BC8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0067C 80AF2BCC 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00680 80AF2BD0 51C0001D */ beql $t6, $zero, .L80AF2C48 -/* 00684 80AF2BD4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00688 80AF2BD8 8CA21D98 */ lw $v0, 0x1D98($a1) ## 00001D98 -/* 0068C 80AF2BDC 5040001A */ beql $v0, $zero, .L80AF2C48 -/* 00690 80AF2BE0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00694 80AF2BE4 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00698 80AF2BE8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0069C 80AF2BEC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 006A0 80AF2BF0 55E10015 */ bnel $t7, $at, .L80AF2C48 -/* 006A4 80AF2BF4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006A8 80AF2BF8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 006AC 80AF2BFC 2484D3DC */ addiu $a0, $a0, 0xD3DC ## $a0 = 0600D3DC -/* 006B0 80AF2C00 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 006B4 80AF2C04 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006B8 80AF2C08 8FA40028 */ lw $a0, 0x0028($sp) -/* 006BC 80AF2C0C 468021A0 */ cvt.s.w $f6, $f4 -/* 006C0 80AF2C10 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 006C4 80AF2C14 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 006C8 80AF2C18 44070000 */ mfc1 $a3, $f0 -/* 006CC 80AF2C1C AFB80014 */ sw $t8, 0x0014($sp) -/* 006D0 80AF2C20 24A5D3DC */ addiu $a1, $a1, 0xD3DC ## $a1 = 0600D3DC -/* 006D4 80AF2C24 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006D8 80AF2C28 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006DC 80AF2C2C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006E0 80AF2C30 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006E4 80AF2C34 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 006E8 80AF2C38 8FA80028 */ lw $t0, 0x0028($sp) -/* 006EC 80AF2C3C 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 006F0 80AF2C40 AD1902A8 */ sw $t9, 0x02A8($t0) ## 000002A8 -/* 006F4 80AF2C44 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AF2C48: -/* 006F8 80AF2C48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006FC 80AF2C4C 03E00008 */ jr $ra -/* 00700 80AF2C50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s deleted file mode 100644 index 320c5c7620..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AF2C54 -/* 00704 80AF2C54 10A00002 */ beq $a1, $zero, .L80AF2C60 -/* 00708 80AF2C58 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0070C 80AF2C5C AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -.L80AF2C60: -/* 00710 80AF2C60 03E00008 */ jr $ra -/* 00714 80AF2C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s deleted file mode 100644 index 769fc1fb10..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AF2C68 -/* 00718 80AF2C68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0071C 80AF2C6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00720 80AF2C70 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00724 80AF2C74 51C0000C */ beql $t6, $zero, .L80AF2CA8 -/* 00728 80AF2C78 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0072C 80AF2C7C 8CA21DA4 */ lw $v0, 0x1DA4($a1) ## 00001DA4 -/* 00730 80AF2C80 50400009 */ beql $v0, $zero, .L80AF2CA8 -/* 00734 80AF2C84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00738 80AF2C88 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 0073C 80AF2C8C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00740 80AF2C90 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00744 80AF2C94 55E10004 */ bnel $t7, $at, .L80AF2CA8 -/* 00748 80AF2C98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0074C 80AF2C9C 0C2BCA8E */ jal func_80AF2A38 -/* 00750 80AF2CA0 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 00754 80AF2CA4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2CA8: -/* 00758 80AF2CA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0075C 80AF2CAC 03E00008 */ jr $ra -/* 00760 80AF2CB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s deleted file mode 100644 index 79fddbcbb2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF2CB4 -/* 00764 80AF2CB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00768 80AF2CB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0076C 80AF2CBC 0C2BCAAD */ jal func_80AF2AB4 -/* 00770 80AF2CC0 00000000 */ nop -/* 00774 80AF2CC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00778 80AF2CC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0077C 80AF2CCC 03E00008 */ jr $ra -/* 00780 80AF2CD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s deleted file mode 100644 index 667ac6cdf9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF2CD4 -/* 00784 80AF2CD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00788 80AF2CD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0078C 80AF2CDC 0C2BCAD1 */ jal func_80AF2B44 -/* 00790 80AF2CE0 00000000 */ nop -/* 00794 80AF2CE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00798 80AF2CE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0079C 80AF2CEC 03E00008 */ jr $ra -/* 007A0 80AF2CF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s deleted file mode 100644 index d2ba0a40bf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AF2CF4 -/* 007A4 80AF2CF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007A8 80AF2CF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007AC 80AF2CFC 0C2BCA5E */ jal func_80AF2978 -/* 007B0 80AF2D00 AFA40018 */ sw $a0, 0x0018($sp) -/* 007B4 80AF2D04 0C2BC9E3 */ jal func_80AF278C -/* 007B8 80AF2D08 8FA40018 */ lw $a0, 0x0018($sp) -/* 007BC 80AF2D0C 0C2BC982 */ jal func_80AF2608 -/* 007C0 80AF2D10 8FA40018 */ lw $a0, 0x0018($sp) -/* 007C4 80AF2D14 0C2BCAE5 */ jal func_80AF2B94 -/* 007C8 80AF2D18 8FA40018 */ lw $a0, 0x0018($sp) -/* 007CC 80AF2D1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007D0 80AF2D20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007D4 80AF2D24 03E00008 */ jr $ra -/* 007D8 80AF2D28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s deleted file mode 100644 index dd3cd8cb0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF2D2C -/* 007DC 80AF2D2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007E0 80AF2D30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007E4 80AF2D34 AFA40018 */ sw $a0, 0x0018($sp) -/* 007E8 80AF2D38 0C2BC9D1 */ jal func_80AF2744 -/* 007EC 80AF2D3C AFA5001C */ sw $a1, 0x001C($sp) -/* 007F0 80AF2D40 0C2BC9E3 */ jal func_80AF278C -/* 007F4 80AF2D44 8FA40018 */ lw $a0, 0x0018($sp) -/* 007F8 80AF2D48 0C2BC982 */ jal func_80AF2608 -/* 007FC 80AF2D4C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00800 80AF2D50 8FA40018 */ lw $a0, 0x0018($sp) -/* 00804 80AF2D54 0C2BCAF0 */ jal func_80AF2BC0 -/* 00808 80AF2D58 8FA5001C */ lw $a1, 0x001C($sp) -/* 0080C 80AF2D5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00810 80AF2D60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00814 80AF2D64 03E00008 */ jr $ra -/* 00818 80AF2D68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s deleted file mode 100644 index b41252d63a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF2D6C -/* 0081C 80AF2D6C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00820 80AF2D70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00824 80AF2D74 0C2BC9D1 */ jal func_80AF2744 -/* 00828 80AF2D78 AFA40020 */ sw $a0, 0x0020($sp) -/* 0082C 80AF2D7C 0C2BC9E3 */ jal func_80AF278C -/* 00830 80AF2D80 8FA40020 */ lw $a0, 0x0020($sp) -/* 00834 80AF2D84 AFA2001C */ sw $v0, 0x001C($sp) -/* 00838 80AF2D88 0C2BC982 */ jal func_80AF2608 -/* 0083C 80AF2D8C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00840 80AF2D90 8FA40020 */ lw $a0, 0x0020($sp) -/* 00844 80AF2D94 0C2BCB15 */ jal func_80AF2C54 -/* 00848 80AF2D98 8FA5001C */ lw $a1, 0x001C($sp) -/* 0084C 80AF2D9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00850 80AF2DA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00854 80AF2DA4 03E00008 */ jr $ra -/* 00858 80AF2DA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s deleted file mode 100644 index 04362a1956..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF2DAC -/* 0085C 80AF2DAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00860 80AF2DB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00864 80AF2DB4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00868 80AF2DB8 0C2BC9D1 */ jal func_80AF2744 -/* 0086C 80AF2DBC AFA5001C */ sw $a1, 0x001C($sp) -/* 00870 80AF2DC0 0C2BC9E3 */ jal func_80AF278C -/* 00874 80AF2DC4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00878 80AF2DC8 0C2BC982 */ jal func_80AF2608 -/* 0087C 80AF2DCC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00880 80AF2DD0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00884 80AF2DD4 0C2BCB1A */ jal func_80AF2C68 -/* 00888 80AF2DD8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0088C 80AF2DDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00890 80AF2DE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00894 80AF2DE4 03E00008 */ jr $ra -/* 00898 80AF2DE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s deleted file mode 100644 index 2d037773b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF2DEC -/* 0089C 80AF2DEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008A0 80AF2DF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 008A4 80AF2DF4 0C2BC9D1 */ jal func_80AF2744 -/* 008A8 80AF2DF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 008AC 80AF2DFC 0C2BC9E3 */ jal func_80AF278C -/* 008B0 80AF2E00 8FA40018 */ lw $a0, 0x0018($sp) -/* 008B4 80AF2E04 0C2BC982 */ jal func_80AF2608 -/* 008B8 80AF2E08 8FA40018 */ lw $a0, 0x0018($sp) -/* 008BC 80AF2E0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008C0 80AF2E10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008C4 80AF2E14 03E00008 */ jr $ra -/* 008C8 80AF2E18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s deleted file mode 100644 index 086d1c763d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AF2E1C -/* 008CC 80AF2E1C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 008D0 80AF2E20 AFA50024 */ sw $a1, 0x0024($sp) -/* 008D4 80AF2E24 AFBF001C */ sw $ra, 0x001C($sp) -/* 008D8 80AF2E28 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008DC 80AF2E2C 24A504CC */ addiu $a1, $a1, 0x04CC ## $a1 = 060004CC -/* 008E0 80AF2E30 AFA00010 */ sw $zero, 0x0010($sp) -/* 008E4 80AF2E34 AFA40020 */ sw $a0, 0x0020($sp) -/* 008E8 80AF2E38 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 008EC 80AF2E3C 0C2BCA3A */ jal func_80AF28E8 -/* 008F0 80AF2E40 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008F4 80AF2E44 8FA40020 */ lw $a0, 0x0020($sp) -/* 008F8 80AF2E48 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 008FC 80AF2E4C AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00900 80AF2E50 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00904 80AF2E54 8FBF001C */ lw $ra, 0x001C($sp) -/* 00908 80AF2E58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0090C 80AF2E5C 03E00008 */ jr $ra -/* 00910 80AF2E60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s deleted file mode 100644 index 2b3d701f17..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF2E64 -/* 00914 80AF2E64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00918 80AF2E68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0091C 80AF2E6C 0C01E233 */ jal func_800788CC -/* 00920 80AF2E70 24044834 */ addiu $a0, $zero, 0x4834 ## $a0 = 00004834 -/* 00924 80AF2E74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00928 80AF2E78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0092C 80AF2E7C 03E00008 */ jr $ra -/* 00930 80AF2E80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s deleted file mode 100644 index c5e1a0555a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AF2E84 -/* 00934 80AF2E84 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00938 80AF2E88 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 0093C 80AF2E8C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00940 80AF2E90 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00944 80AF2E94 AFA40038 */ sw $a0, 0x0038($sp) -/* 00948 80AF2E98 C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 0094C 80AF2E9C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00950 80AF2EA0 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00954 80AF2EA4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00958 80AF2EA8 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 0095C 80AF2EAC 85CF147A */ lh $t7, 0x147A($t6) ## 8016147A -/* 00960 80AF2EB0 44815000 */ mtc1 $at, $f10 ## $f10 = 24.00 -/* 00964 80AF2EB4 C4B20028 */ lwc1 $f18, 0x0028($a1) ## 00000028 -/* 00968 80AF2EB8 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 0096C 80AF2EBC 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 00970 80AF2EC0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00974 80AF2EC4 46803220 */ cvt.s.w $f8, $f6 -/* 00978 80AF2EC8 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 0097C 80AF2ECC 460A4400 */ add.s $f16, $f8, $f10 -/* 00980 80AF2ED0 46128100 */ add.s $f4, $f16, $f18 -/* 00984 80AF2ED4 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00988 80AF2ED8 C4A6002C */ lwc1 $f6, 0x002C($a1) ## 0000002C -/* 0098C 80AF2EDC AFB80028 */ sw $t8, 0x0028($sp) -/* 00990 80AF2EE0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00994 80AF2EE4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00998 80AF2EE8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0099C 80AF2EEC 0C00C916 */ jal Actor_SpawnAttached - -/* 009A0 80AF2EF0 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 009A4 80AF2EF4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 009A8 80AF2EF8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 009AC 80AF2EFC 03E00008 */ jr $ra -/* 009B0 80AF2F00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s deleted file mode 100644 index af5a05397c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF2F04 -/* 009B4 80AF2F04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009B8 80AF2F08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 009BC 80AF2F0C AFA40018 */ sw $a0, 0x0018($sp) -/* 009C0 80AF2F10 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 009C4 80AF2F14 0C2BC9F4 */ jal func_80AF27D0 -/* 009C8 80AF2F18 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 009CC 80AF2F1C 1040000A */ beq $v0, $zero, .L80AF2F48 -/* 009D0 80AF2F20 8FA40018 */ lw $a0, 0x0018($sp) -/* 009D4 80AF2F24 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 009D8 80AF2F28 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 009DC 80AF2F2C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 009E0 80AF2F30 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 009E4 80AF2F34 AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 009E8 80AF2F38 AC8002B4 */ sw $zero, 0x02B4($a0) ## 000002B4 -/* 009EC 80AF2F3C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 009F0 80AF2F40 0C2BCB99 */ jal func_80AF2E64 -/* 009F4 80AF2F44 E48402B0 */ swc1 $f4, 0x02B0($a0) ## 000002B0 -.L80AF2F48: -/* 009F8 80AF2F48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009FC 80AF2F4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A00 80AF2F50 03E00008 */ jr $ra -/* 00A04 80AF2F54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s deleted file mode 100644 index b171bf8054..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_80AF2F58 -/* 00A08 80AF2F58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A0C 80AF2F5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A10 80AF2F60 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A14 80AF2F64 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00A18 80AF2F68 0C2BC9F4 */ jal func_80AF27D0 -/* 00A1C 80AF2F6C 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 00A20 80AF2F70 10400025 */ beq $v0, $zero, .L80AF3008 -/* 00A24 80AF2F74 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A28 80AF2F78 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00A2C 80AF2F7C 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00A30 80AF2F80 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00A34 80AF2F84 248202B0 */ addiu $v0, $a0, 0x02B0 ## $v0 = 000002B0 -/* 00A38 80AF2F88 C4440000 */ lwc1 $f4, 0x0000($v0) ## 000002B0 -/* 00A3C 80AF2F8C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00A40 80AF2F90 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00A44 80AF2F94 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 -/* 00A48 80AF2F98 46062200 */ add.s $f8, $f4, $f6 -/* 00A4C 80AF2F9C 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 -/* 00A50 80AF2FA0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00A54 80AF2FA4 E4480000 */ swc1 $f8, 0x0000($v0) ## 000002B0 -/* 00A58 80AF2FA8 8CAE0000 */ lw $t6, 0x0000($a1) ## 8015FA90 -/* 00A5C 80AF2FAC C4400000 */ lwc1 $f0, 0x0000($v0) ## 000002B0 -/* 00A60 80AF2FB0 85CF145E */ lh $t7, 0x145E($t6) ## 0000145E -/* 00A64 80AF2FB4 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00A68 80AF2FB8 00000000 */ nop -/* 00A6C 80AF2FBC 46805420 */ cvt.s.w $f16, $f10 -/* 00A70 80AF2FC0 46028480 */ add.s $f18, $f16, $f2 -/* 00A74 80AF2FC4 4600903E */ c.le.s $f18, $f0 -/* 00A78 80AF2FC8 00000000 */ nop -/* 00A7C 80AF2FCC 45000020 */ bc1f .L80AF3050 -/* 00A80 80AF2FD0 00000000 */ nop -/* 00A84 80AF2FD4 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 00A88 80AF2FD8 AC9902AC */ sw $t9, 0x02AC($a0) ## 000002AC -/* 00A8C 80AF2FDC 8CA80000 */ lw $t0, 0x0000($a1) ## 8015FA90 -/* 00A90 80AF2FE0 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00A94 80AF2FE4 8509145E */ lh $t1, 0x145E($t0) ## 0000145E -/* 00A98 80AF2FE8 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 00A9C 80AF2FEC 00000000 */ nop -/* 00AA0 80AF2FF0 468021A0 */ cvt.s.w $f6, $f4 -/* 00AA4 80AF2FF4 46023200 */ add.s $f8, $f6, $f2 -/* 00AA8 80AF2FF8 E4480000 */ swc1 $f8, 0x0000($v0) ## 000002B0 -/* 00AAC 80AF2FFC AC8302B4 */ sw $v1, 0x02B4($a0) ## 000002B4 -/* 00AB0 80AF3000 10000026 */ beq $zero, $zero, .L80AF309C -/* 00AB4 80AF3004 A08300C8 */ sb $v1, 0x00C8($a0) ## 000000C8 -.L80AF3008: -/* 00AB8 80AF3008 248202B0 */ addiu $v0, $a0, 0x02B0 ## $v0 = 000002B0 -/* 00ABC 80AF300C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00AC0 80AF3010 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00AC4 80AF3014 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 000002B0 -/* 00AC8 80AF3018 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00ACC 80AF301C 46105481 */ sub.s $f18, $f10, $f16 -/* 00AD0 80AF3020 E4520000 */ swc1 $f18, 0x0000($v0) ## 000002B0 -/* 00AD4 80AF3024 C4400000 */ lwc1 $f0, 0x0000($v0) ## 000002B0 -/* 00AD8 80AF3028 4602003E */ c.le.s $f0, $f2 -/* 00ADC 80AF302C 00000000 */ nop -/* 00AE0 80AF3030 45000007 */ bc1f .L80AF3050 -/* 00AE4 80AF3034 240A0007 */ addiu $t2, $zero, 0x0007 ## $t2 = 00000007 -/* 00AE8 80AF3038 AC8A02A8 */ sw $t2, 0x02A8($a0) ## 000002A8 -/* 00AEC 80AF303C AC8002AC */ sw $zero, 0x02AC($a0) ## 000002AC -/* 00AF0 80AF3040 E4420000 */ swc1 $f2, 0x0000($v0) ## 000002B0 -/* 00AF4 80AF3044 AC8002B4 */ sw $zero, 0x02B4($a0) ## 000002B4 -/* 00AF8 80AF3048 10000014 */ beq $zero, $zero, .L80AF309C -/* 00AFC 80AF304C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L80AF3050: -/* 00B00 80AF3050 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00B04 80AF3054 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 -/* 00B08 80AF3058 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 -/* 00B0C 80AF305C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00B10 80AF3060 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00B14 80AF3064 856C145E */ lh $t4, 0x145E($t3) ## 0000145E -/* 00B18 80AF3068 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00B1C 80AF306C 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 00B20 80AF3070 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00B24 80AF3074 00000000 */ nop -/* 00B28 80AF3078 468021A0 */ cvt.s.w $f6, $f4 -/* 00B2C 80AF307C 46023200 */ add.s $f8, $f6, $f2 -/* 00B30 80AF3080 46080283 */ div.s $f10, $f0, $f8 -/* 00B34 80AF3084 46105482 */ mul.s $f18, $f10, $f16 -/* 00B38 80AF3088 4600910D */ trunc.w.s $f4, $f18 -/* 00B3C 80AF308C 44022000 */ mfc1 $v0, $f4 -/* 00B40 80AF3090 00000000 */ nop -/* 00B44 80AF3094 AC8202B4 */ sw $v0, 0x02B4($a0) ## 000002B4 -/* 00B48 80AF3098 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L80AF309C: -/* 00B4C 80AF309C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B50 80AF30A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B54 80AF30A4 03E00008 */ jr $ra -/* 00B58 80AF30A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s deleted file mode 100644 index 1233bca3e4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AF30AC -/* 00B5C 80AF30AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B60 80AF30B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B64 80AF30B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B68 80AF30B8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B6C 80AF30BC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00B70 80AF30C0 0C2BCA07 */ jal func_80AF281C -/* 00B74 80AF30C4 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 00B78 80AF30C8 1040001A */ beq $v0, $zero, .L80AF3134 -/* 00B7C 80AF30CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B80 80AF30D0 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00B84 80AF30D4 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00B88 80AF30D8 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00B8C 80AF30DC AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 00B90 80AF30E0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00B94 80AF30E4 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 00B98 80AF30E8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00B9C 80AF30EC 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 00BA0 80AF30F0 8719145E */ lh $t9, 0x145E($t8) ## 8016145E -/* 00BA4 80AF30F4 8C8902B8 */ lw $t1, 0x02B8($a0) ## 000002B8 -/* 00BA8 80AF30F8 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00BAC 80AF30FC 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00BB0 80AF3100 AC8802B4 */ sw $t0, 0x02B4($a0) ## 000002B4 -/* 00BB4 80AF3104 468021A0 */ cvt.s.w $f6, $f4 -/* 00BB8 80AF3108 46083280 */ add.s $f10, $f6, $f8 -/* 00BBC 80AF310C 15200007 */ bne $t1, $zero, .L80AF312C -/* 00BC0 80AF3110 E48A02B0 */ swc1 $f10, 0x02B0($a0) ## 000002B0 -/* 00BC4 80AF3114 8FA5001C */ lw $a1, 0x001C($sp) -/* 00BC8 80AF3118 0C2BCBA1 */ jal func_80AF2E84 -/* 00BCC 80AF311C AFA40018 */ sw $a0, 0x0018($sp) -/* 00BD0 80AF3120 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BD4 80AF3124 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00BD8 80AF3128 AC8A02B8 */ sw $t2, 0x02B8($a0) ## 000002B8 -.L80AF312C: -/* 00BDC 80AF312C 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00BE0 80AF3130 A08B00C8 */ sb $t3, 0x00C8($a0) ## 000000C8 -.L80AF3134: -/* 00BE4 80AF3134 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BE8 80AF3138 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BEC 80AF313C 03E00008 */ jr $ra -/* 00BF0 80AF3140 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s deleted file mode 100644 index 4cf90133af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF3144 -/* 00BF4 80AF3144 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BF8 80AF3148 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BFC 80AF314C AFA40018 */ sw $a0, 0x0018($sp) -/* 00C00 80AF3150 0C2BCBC1 */ jal func_80AF2F04 -/* 00C04 80AF3154 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C08 80AF3158 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C0C 80AF315C 0C2BC9B4 */ jal func_80AF26D0 -/* 00C10 80AF3160 8FA5001C */ lw $a1, 0x001C($sp) -/* 00C14 80AF3164 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C18 80AF3168 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C1C 80AF316C 03E00008 */ jr $ra -/* 00C20 80AF3170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s deleted file mode 100644 index 718a91d4ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF3174 -/* 00C24 80AF3174 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C28 80AF3178 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C2C 80AF317C AFB00018 */ sw $s0, 0x0018($sp) -/* 00C30 80AF3180 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C34 80AF3184 0C2BC9D1 */ jal func_80AF2744 -/* 00C38 80AF3188 AFA50024 */ sw $a1, 0x0024($sp) -/* 00C3C 80AF318C 0C2BC9E3 */ jal func_80AF278C -/* 00C40 80AF3190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C44 80AF3194 0C2BC982 */ jal func_80AF2608 -/* 00C48 80AF3198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C4C 80AF319C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C50 80AF31A0 0C2BCBD6 */ jal func_80AF2F58 -/* 00C54 80AF31A4 8FA50024 */ lw $a1, 0x0024($sp) -/* 00C58 80AF31A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C5C 80AF31AC 0C2BC9B4 */ jal func_80AF26D0 -/* 00C60 80AF31B0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00C64 80AF31B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C68 80AF31B8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00C6C 80AF31BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C70 80AF31C0 03E00008 */ jr $ra -/* 00C74 80AF31C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s deleted file mode 100644 index 535bc924d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF31C8 -/* 00C78 80AF31C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C7C 80AF31CC AFBF001C */ sw $ra, 0x001C($sp) -/* 00C80 80AF31D0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00C84 80AF31D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C88 80AF31D8 0C2BC9D1 */ jal func_80AF2744 -/* 00C8C 80AF31DC AFA50024 */ sw $a1, 0x0024($sp) -/* 00C90 80AF31E0 0C2BC9E3 */ jal func_80AF278C -/* 00C94 80AF31E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C98 80AF31E8 0C2BC982 */ jal func_80AF2608 -/* 00C9C 80AF31EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CA0 80AF31F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CA4 80AF31F4 0C2BCC2B */ jal func_80AF30AC -/* 00CA8 80AF31F8 8FA50024 */ lw $a1, 0x0024($sp) -/* 00CAC 80AF31FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CB0 80AF3200 0C2BC9B4 */ jal func_80AF26D0 -/* 00CB4 80AF3204 8FA50024 */ lw $a1, 0x0024($sp) -/* 00CB8 80AF3208 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CBC 80AF320C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00CC0 80AF3210 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00CC4 80AF3214 03E00008 */ jr $ra -/* 00CC8 80AF3218 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s deleted file mode 100644 index 8c78114c54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s +++ /dev/null @@ -1,97 +0,0 @@ -glabel func_80AF321C -/* 00CCC 80AF321C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00CD0 80AF3220 AFBF002C */ sw $ra, 0x002C($sp) -/* 00CD4 80AF3224 AFB00028 */ sw $s0, 0x0028($sp) -/* 00CD8 80AF3228 AFA40078 */ sw $a0, 0x0078($sp) -/* 00CDC 80AF322C AFA5007C */ sw $a1, 0x007C($sp) -/* 00CE0 80AF3230 848202A4 */ lh $v0, 0x02A4($a0) ## 000002A4 -/* 00CE4 80AF3234 3C1880AF */ lui $t8, %hi(D_80AF410C) ## $t8 = 80AF0000 -/* 00CE8 80AF3238 3C0680AF */ lui $a2, %hi(D_80AF5140) ## $a2 = 80AF0000 -/* 00CEC 80AF323C 00027880 */ sll $t7, $v0, 2 -/* 00CF0 80AF3240 030FC021 */ addu $t8, $t8, $t7 -/* 00CF4 80AF3244 8F18410C */ lw $t8, %lo(D_80AF410C)($t8) -/* 00CF8 80AF3248 24C65140 */ addiu $a2, $a2, %lo(D_80AF5140) ## $a2 = 80AF5140 -/* 00CFC 80AF324C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 00D00 80AF3250 AFB80068 */ sw $t8, 0x0068($sp) -/* 00D04 80AF3254 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00D08 80AF3258 24070108 */ addiu $a3, $zero, 0x0108 ## $a3 = 00000108 -/* 00D0C 80AF325C 0C031AB1 */ jal func_800C6AC4 -/* 00D10 80AF3260 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00D14 80AF3264 8FA9007C */ lw $t1, 0x007C($sp) -/* 00D18 80AF3268 0C024F61 */ jal func_80093D84 -/* 00D1C 80AF326C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00D20 80AF3270 8FA70068 */ lw $a3, 0x0068($sp) -/* 00D24 80AF3274 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00D28 80AF3278 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00D2C 80AF327C 00076100 */ sll $t4, $a3, 4 -/* 00D30 80AF3280 000C6F02 */ srl $t5, $t4, 28 -/* 00D34 80AF3284 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00D38 80AF3288 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00D3C 80AF328C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00D40 80AF3290 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 00D44 80AF3294 000D7080 */ sll $t6, $t5, 2 -/* 00D48 80AF3298 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00D4C 80AF329C 01CF2021 */ addu $a0, $t6, $t7 -/* 00D50 80AF32A0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00D54 80AF32A4 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 00D58 80AF32A8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00D5C 80AF32AC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00D60 80AF32B0 00E12824 */ and $a1, $a3, $at -/* 00D64 80AF32B4 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00D68 80AF32B8 0305C821 */ addu $t9, $t8, $a1 -/* 00D6C 80AF32BC 03264821 */ addu $t1, $t9, $a2 -/* 00D70 80AF32C0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00D74 80AF32C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00D78 80AF32C8 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00D7C 80AF32CC 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 00D80 80AF32D0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00D84 80AF32D4 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00D88 80AF32D8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00D8C 80AF32DC 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 00D90 80AF32E0 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 00D94 80AF32E4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00D98 80AF32E8 01856821 */ addu $t5, $t4, $a1 -/* 00D9C 80AF32EC 01A67021 */ addu $t6, $t5, $a2 -/* 00DA0 80AF32F0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00DA4 80AF32F4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00DA8 80AF32F8 8FA80078 */ lw $t0, 0x0078($sp) -/* 00DAC 80AF32FC 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 -/* 00DB0 80AF3300 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00DB4 80AF3304 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00DB8 80AF3308 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00DBC 80AF330C 8D1902B4 */ lw $t9, 0x02B4($t0) ## 000002B4 -/* 00DC0 80AF3310 258C6280 */ addiu $t4, $t4, 0x6280 ## $t4 = 80116280 -/* 00DC4 80AF3314 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 -/* 00DC8 80AF3318 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 -/* 00DCC 80AF331C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00DD0 80AF3320 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00DD4 80AF3324 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00DD8 80AF3328 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00DDC 80AF332C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00DE0 80AF3330 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00DE4 80AF3334 2502014C */ addiu $v0, $t0, 0x014C ## $v0 = 0000014C -/* 00DE8 80AF3338 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 00DEC 80AF333C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 00DF0 80AF3340 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00DF4 80AF3344 AFA00018 */ sw $zero, 0x0018($sp) -/* 00DF8 80AF3348 AFA00014 */ sw $zero, 0x0014($sp) -/* 00DFC 80AF334C AFA00010 */ sw $zero, 0x0010($sp) -/* 00E00 80AF3350 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 00E04 80AF3354 8FA4007C */ lw $a0, 0x007C($sp) -/* 00E08 80AF3358 0C0289CF */ jal SkelAnime_DrawSV2 -/* 00E0C 80AF335C AFAD001C */ sw $t5, 0x001C($sp) -/* 00E10 80AF3360 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00E14 80AF3364 8FAE007C */ lw $t6, 0x007C($sp) -/* 00E18 80AF3368 3C0680AF */ lui $a2, %hi(D_80AF5164) ## $a2 = 80AF0000 -/* 00E1C 80AF336C 24C65164 */ addiu $a2, $a2, %lo(D_80AF5164) ## $a2 = 80AF5164 -/* 00E20 80AF3370 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 00E24 80AF3374 24070123 */ addiu $a3, $zero, 0x0123 ## $a3 = 00000123 -/* 00E28 80AF3378 0C031AD5 */ jal func_800C6B54 -/* 00E2C 80AF337C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00E30 80AF3380 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E34 80AF3384 8FB00028 */ lw $s0, 0x0028($sp) -/* 00E38 80AF3388 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 00E3C 80AF338C 03E00008 */ jr $ra -/* 00E40 80AF3390 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s deleted file mode 100644 index d14eb5eb82..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AF3394 -/* 00E44 80AF3394 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E48 80AF3398 AFA50024 */ sw $a1, 0x0024($sp) -/* 00E4C 80AF339C AFBF001C */ sw $ra, 0x001C($sp) -/* 00E50 80AF33A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00E54 80AF33A4 24A5E630 */ addiu $a1, $a1, 0xE630 ## $a1 = 0600E630 -/* 00E58 80AF33A8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00E5C 80AF33AC AFA40020 */ sw $a0, 0x0020($sp) -/* 00E60 80AF33B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E64 80AF33B4 0C2BCA3A */ jal func_80AF28E8 -/* 00E68 80AF33B8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E6C 80AF33BC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00E70 80AF33C0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 00E74 80AF33C4 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00E78 80AF33C8 AC8002AC */ sw $zero, 0x02AC($a0) ## 000002AC -/* 00E7C 80AF33CC A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00E80 80AF33D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E84 80AF33D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E88 80AF33D8 03E00008 */ jr $ra -/* 00E8C 80AF33DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s deleted file mode 100644 index 9823343f9b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AF33E0 -/* 00E90 80AF33E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00E94 80AF33E4 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00E98 80AF33E8 C48402B0 */ lwc1 $f4, 0x02B0($a0) ## 000002B0 -/* 00E9C 80AF33EC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00EA0 80AF33F0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00EA4 80AF33F4 46062200 */ add.s $f8, $f4, $f6 -/* 00EA8 80AF33F8 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 00EAC 80AF33FC 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00EB0 80AF3400 E48802B0 */ swc1 $f8, 0x02B0($a0) ## 000002B0 -/* 00EB4 80AF3404 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00EB8 80AF3408 C48402B0 */ lwc1 $f4, 0x02B0($a0) ## 000002B0 -/* 00EBC 80AF340C 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 00EC0 80AF3410 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00EC4 80AF3414 00000000 */ nop -/* 00EC8 80AF3418 46805420 */ cvt.s.w $f16, $f10 -/* 00ECC 80AF341C 46128000 */ add.s $f0, $f16, $f18 -/* 00ED0 80AF3420 4604003E */ c.le.s $f0, $f4 -/* 00ED4 80AF3424 00000000 */ nop -/* 00ED8 80AF3428 45020005 */ bc1fl .L80AF3440 -/* 00EDC 80AF342C C48602B0 */ lwc1 $f6, 0x02B0($a0) ## 000002B0 -/* 00EE0 80AF3430 AC8202B4 */ sw $v0, 0x02B4($a0) ## 000002B4 -/* 00EE4 80AF3434 03E00008 */ jr $ra -/* 00EE8 80AF3438 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L80AF343C: -/* 00EEC 80AF343C C48602B0 */ lwc1 $f6, 0x02B0($a0) ## 000002B0 -.L80AF3440: -/* 00EF0 80AF3440 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00EF4 80AF3444 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 00EF8 80AF3448 46003203 */ div.s $f8, $f6, $f0 -/* 00EFC 80AF344C 460A4402 */ mul.s $f16, $f8, $f10 -/* 00F00 80AF3450 4600848D */ trunc.w.s $f18, $f16 -/* 00F04 80AF3454 44029000 */ mfc1 $v0, $f18 -/* 00F08 80AF3458 00000000 */ nop -/* 00F0C 80AF345C AC8202B4 */ sw $v0, 0x02B4($a0) ## 000002B4 -/* 00F10 80AF3460 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -/* 00F14 80AF3464 03E00008 */ jr $ra -/* 00F18 80AF3468 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s deleted file mode 100644 index 845ce43dbb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AF346C -/* 00F1C 80AF346C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F20 80AF3470 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F24 80AF3474 AFA40018 */ sw $a0, 0x0018($sp) -/* 00F28 80AF3478 0C2BCA1A */ jal func_80AF2868 -/* 00F2C 80AF347C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00F30 80AF3480 8FA40018 */ lw $a0, 0x0018($sp) -/* 00F34 80AF3484 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 00F38 80AF3488 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00F3C 80AF348C AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00F40 80AF3490 AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 00F44 80AF3494 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F48 80AF3498 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F4C 80AF349C 03E00008 */ jr $ra -/* 00F50 80AF34A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s deleted file mode 100644 index 1103c7db74..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AF34A4 -/* 00F54 80AF34A4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00F58 80AF34A8 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00F5C 80AF34AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00F60 80AF34B0 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 00F64 80AF34B4 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 00F68 80AF34B8 C48402B0 */ lwc1 $f4, 0x02B0($a0) ## 000002B0 -/* 00F6C 80AF34BC 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 00F70 80AF34C0 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 00F74 80AF34C4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00F78 80AF34C8 46803220 */ cvt.s.w $f8, $f6 -/* 00F7C 80AF34CC 460A4400 */ add.s $f16, $f8, $f10 -/* 00F80 80AF34D0 4604803E */ c.le.s $f16, $f4 -/* 00F84 80AF34D4 00000000 */ nop -/* 00F88 80AF34D8 45000003 */ bc1f .L80AF34E8 -/* 00F8C 80AF34DC 00000000 */ nop -/* 00F90 80AF34E0 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 00F94 80AF34E4 AC9902AC */ sw $t9, 0x02AC($a0) ## 000002AC -.L80AF34E8: -/* 00F98 80AF34E8 03E00008 */ jr $ra -/* 00F9C 80AF34EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s deleted file mode 100644 index 5bdad613a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF34F0 -/* 00FA0 80AF34F0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00FA4 80AF34F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00FA8 80AF34F8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00FAC 80AF34FC AFA40020 */ sw $a0, 0x0020($sp) -/* 00FB0 80AF3500 24A5DCAC */ addiu $a1, $a1, 0xDCAC ## $a1 = 0600DCAC -/* 00FB4 80AF3504 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FB8 80AF3508 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00FBC 80AF350C 0C2BCA3A */ jal func_80AF28E8 -/* 00FC0 80AF3510 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FC4 80AF3514 8FAF0020 */ lw $t7, 0x0020($sp) -/* 00FC8 80AF3518 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 00FCC 80AF351C ADEE02A8 */ sw $t6, 0x02A8($t7) ## 000002A8 -/* 00FD0 80AF3520 8FBF001C */ lw $ra, 0x001C($sp) -/* 00FD4 80AF3524 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00FD8 80AF3528 03E00008 */ jr $ra -/* 00FDC 80AF352C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s deleted file mode 100644 index 487c66e2fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AF3530 -/* 00FE0 80AF3530 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00FE4 80AF3534 10A00007 */ beq $a1, $zero, .L80AF3554 -/* 00FE8 80AF3538 AFBF001C */ sw $ra, 0x001C($sp) -/* 00FEC 80AF353C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00FF0 80AF3540 24A5F03C */ addiu $a1, $a1, 0xF03C ## $a1 = 0600F03C -/* 00FF4 80AF3544 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00FF8 80AF3548 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FFC 80AF354C 0C2BCA3A */ jal func_80AF28E8 -/* 01000 80AF3550 AFA00010 */ sw $zero, 0x0010($sp) -.L80AF3554: -/* 01004 80AF3554 8FBF001C */ lw $ra, 0x001C($sp) -/* 01008 80AF3558 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0100C 80AF355C 03E00008 */ jr $ra -/* 01010 80AF3560 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s deleted file mode 100644 index f8cf36a43c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80AF3564 -/* 01014 80AF3564 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01018 80AF3568 AFA40020 */ sw $a0, 0x0020($sp) -/* 0101C 80AF356C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01020 80AF3570 AFA50024 */ sw $a1, 0x0024($sp) -/* 01024 80AF3574 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01028 80AF3578 0C2BC9EB */ jal func_80AF27AC -/* 0102C 80AF357C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01030 80AF3580 1040001C */ beq $v0, $zero, .L80AF35F4 -/* 01034 80AF3584 8FA70020 */ lw $a3, 0x0020($sp) -/* 01038 80AF3588 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 0103C 80AF358C 8CE302BC */ lw $v1, 0x02BC($a3) ## 000002BC -/* 01040 80AF3590 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01044 80AF3594 50C30018 */ beql $a2, $v1, .L80AF35F8 -/* 01048 80AF3598 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0104C 80AF359C 10C10006 */ beq $a2, $at, .L80AF35B8 -/* 01050 80AF35A0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01054 80AF35A4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01058 80AF35A8 10C10008 */ beq $a2, $at, .L80AF35CC -/* 0105C 80AF35AC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01060 80AF35B0 1000000A */ beq $zero, $zero, .L80AF35DC -/* 01064 80AF35B4 3C0480AF */ lui $a0, %hi(D_80AF5188) ## $a0 = 80AF0000 -.L80AF35B8: -/* 01068 80AF35B8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0106C 80AF35BC 0C2BCD1B */ jal func_80AF346C -/* 01070 80AF35C0 AFA60018 */ sw $a2, 0x0018($sp) -/* 01074 80AF35C4 10000009 */ beq $zero, $zero, .L80AF35EC -/* 01078 80AF35C8 8FA60018 */ lw $a2, 0x0018($sp) -.L80AF35CC: -/* 0107C 80AF35CC 0C2BCD3C */ jal func_80AF34F0 -/* 01080 80AF35D0 AFA60018 */ sw $a2, 0x0018($sp) -/* 01084 80AF35D4 10000005 */ beq $zero, $zero, .L80AF35EC -/* 01088 80AF35D8 8FA60018 */ lw $a2, 0x0018($sp) -.L80AF35DC: -/* 0108C 80AF35DC 24845188 */ addiu $a0, $a0, %lo(D_80AF5188) ## $a0 = 00005188 -/* 01090 80AF35E0 0C00084C */ jal osSyncPrintf - -/* 01094 80AF35E4 AFA60018 */ sw $a2, 0x0018($sp) -/* 01098 80AF35E8 8FA60018 */ lw $a2, 0x0018($sp) -.L80AF35EC: -/* 0109C 80AF35EC 8FAE0020 */ lw $t6, 0x0020($sp) -/* 010A0 80AF35F0 ADC602BC */ sw $a2, 0x02BC($t6) ## 000002BC -.L80AF35F4: -/* 010A4 80AF35F4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF35F8: -/* 010A8 80AF35F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 010AC 80AF35FC 03E00008 */ jr $ra -/* 010B0 80AF3600 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s deleted file mode 100644 index 8b3f60163c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF3604 -/* 010B4 80AF3604 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010B8 80AF3608 AFBF0014 */ sw $ra, 0x0014($sp) -/* 010BC 80AF360C 0C2BCD59 */ jal func_80AF3564 -/* 010C0 80AF3610 00000000 */ nop -/* 010C4 80AF3614 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010C8 80AF3618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010CC 80AF361C 03E00008 */ jr $ra -/* 010D0 80AF3620 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s deleted file mode 100644 index 24efa97a58..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AF3624 -/* 010D4 80AF3624 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 010D8 80AF3628 AFBF001C */ sw $ra, 0x001C($sp) -/* 010DC 80AF362C AFB00018 */ sw $s0, 0x0018($sp) -/* 010E0 80AF3630 0C2BC9D1 */ jal func_80AF2744 -/* 010E4 80AF3634 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010E8 80AF3638 0C2BC9E3 */ jal func_80AF278C -/* 010EC 80AF363C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010F0 80AF3640 0C2BC982 */ jal func_80AF2608 -/* 010F4 80AF3644 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010F8 80AF3648 0C2BCCF8 */ jal func_80AF33E0 -/* 010FC 80AF364C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01100 80AF3650 0C2BCD29 */ jal func_80AF34A4 -/* 01104 80AF3654 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01108 80AF3658 8FBF001C */ lw $ra, 0x001C($sp) -/* 0110C 80AF365C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01110 80AF3660 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01114 80AF3664 03E00008 */ jr $ra -/* 01118 80AF3668 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s deleted file mode 100644 index 8758f99720..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF366C -/* 0111C 80AF366C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01120 80AF3670 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01124 80AF3674 AFA40018 */ sw $a0, 0x0018($sp) -/* 01128 80AF3678 0C2BC9D1 */ jal func_80AF2744 -/* 0112C 80AF367C AFA5001C */ sw $a1, 0x001C($sp) -/* 01130 80AF3680 0C2BC9E3 */ jal func_80AF278C -/* 01134 80AF3684 8FA40018 */ lw $a0, 0x0018($sp) -/* 01138 80AF3688 0C2BC982 */ jal func_80AF2608 -/* 0113C 80AF368C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01140 80AF3690 8FA40018 */ lw $a0, 0x0018($sp) -/* 01144 80AF3694 0C2BCD59 */ jal func_80AF3564 -/* 01148 80AF3698 8FA5001C */ lw $a1, 0x001C($sp) -/* 0114C 80AF369C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01150 80AF36A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01154 80AF36A4 03E00008 */ jr $ra -/* 01158 80AF36A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s deleted file mode 100644 index 0b2a0ac35f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF36AC -/* 0115C 80AF36AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01160 80AF36B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01164 80AF36B4 0C2BC9D1 */ jal func_80AF2744 -/* 01168 80AF36B8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0116C 80AF36BC 0C2BC9E3 */ jal func_80AF278C -/* 01170 80AF36C0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01174 80AF36C4 AFA2001C */ sw $v0, 0x001C($sp) -/* 01178 80AF36C8 0C2BC982 */ jal func_80AF2608 -/* 0117C 80AF36CC 8FA40020 */ lw $a0, 0x0020($sp) -/* 01180 80AF36D0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01184 80AF36D4 0C2BCD4C */ jal func_80AF3530 -/* 01188 80AF36D8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0118C 80AF36DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01190 80AF36E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01194 80AF36E4 03E00008 */ jr $ra -/* 01198 80AF36E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s deleted file mode 100644 index 808be51d67..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF36EC -/* 0119C 80AF36EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011A0 80AF36F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 011A4 80AF36F4 0C2BC9A4 */ jal func_80AF2690 -/* 011A8 80AF36F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 011AC 80AF36FC 8FA4001C */ lw $a0, 0x001C($sp) -/* 011B0 80AF3700 0C00B2DD */ jal Flags_SetSwitch - -/* 011B4 80AF3704 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 011B8 80AF3708 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011BC 80AF370C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 011C0 80AF3710 03E00008 */ jr $ra -/* 011C4 80AF3714 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s deleted file mode 100644 index 64983facbb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF3718 -/* 011C8 80AF3718 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011CC 80AF371C AFBF0014 */ sw $ra, 0x0014($sp) -/* 011D0 80AF3720 0C2BC9A4 */ jal func_80AF2690 -/* 011D4 80AF3724 AFA5001C */ sw $a1, 0x001C($sp) -/* 011D8 80AF3728 8FA4001C */ lw $a0, 0x001C($sp) -/* 011DC 80AF372C 0C00B2D0 */ jal Flags_GetSwitch - -/* 011E0 80AF3730 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 011E4 80AF3734 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011E8 80AF3738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 011EC 80AF373C 03E00008 */ jr $ra -/* 011F0 80AF3740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s deleted file mode 100644 index 0eeb483e60..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AF3744 -/* 011F4 80AF3744 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 011F8 80AF3748 AFBF001C */ sw $ra, 0x001C($sp) -/* 011FC 80AF374C 0C2BCDC6 */ jal func_80AF3718 -/* 01200 80AF3750 AFA40020 */ sw $a0, 0x0020($sp) -/* 01204 80AF3754 10400005 */ beq $v0, $zero, .L80AF376C -/* 01208 80AF3758 8FA40020 */ lw $a0, 0x0020($sp) -/* 0120C 80AF375C 0C00B55C */ jal Actor_Kill - -/* 01210 80AF3760 00000000 */ nop -/* 01214 80AF3764 1000000E */ beq $zero, $zero, .L80AF37A0 -/* 01218 80AF3768 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF376C: -/* 0121C 80AF376C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01220 80AF3770 24A50DE8 */ addiu $a1, $a1, 0x0DE8 ## $a1 = 06000DE8 -/* 01224 80AF3774 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01228 80AF3778 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0122C 80AF377C AFA00010 */ sw $zero, 0x0010($sp) -/* 01230 80AF3780 0C2BCA3A */ jal func_80AF28E8 -/* 01234 80AF3784 AFA40020 */ sw $a0, 0x0020($sp) -/* 01238 80AF3788 8FA40020 */ lw $a0, 0x0020($sp) -/* 0123C 80AF378C 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 01240 80AF3790 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01244 80AF3794 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 01248 80AF3798 AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 0124C 80AF379C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF37A0: -/* 01250 80AF37A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01254 80AF37A4 03E00008 */ jr $ra -/* 01258 80AF37A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s deleted file mode 100644 index e45ef9f10d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF37AC -/* 0125C 80AF37AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01260 80AF37B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01264 80AF37B4 0C03D719 */ jal func_800F5C64 -/* 01268 80AF37B8 24040051 */ addiu $a0, $zero, 0x0051 ## $a0 = 00000051 -/* 0126C 80AF37BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01270 80AF37C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01274 80AF37C4 03E00008 */ jr $ra -/* 01278 80AF37C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s deleted file mode 100644 index 4a2b428053..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80AF37CC -/* 0127C 80AF37CC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01280 80AF37D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01284 80AF37D4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01288 80AF37D8 948E02C0 */ lhu $t6, 0x02C0($a0) ## 000002C0 -/* 0128C 80AF37DC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 01290 80AF37E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01294 80AF37E4 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01298 80AF37E8 A48F02C0 */ sh $t7, 0x02C0($a0) ## 000002C0 -/* 0129C 80AF37EC 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 012A0 80AF37F0 960602C0 */ lhu $a2, 0x02C0($s0) ## 000002C0 -/* 012A4 80AF37F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 012A8 80AF37F8 87041458 */ lh $a0, 0x1458($t8) ## 80161458 -/* 012AC 80AF37FC AFA00010 */ sw $zero, 0x0010($sp) -/* 012B0 80AF3800 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 012B4 80AF3804 24840096 */ addiu $a0, $a0, 0x0096 ## $a0 = 00000096 -/* 012B8 80AF3808 0C01BE6F */ jal func_8006F9BC -/* 012BC 80AF380C 3084FFFF */ andi $a0, $a0, 0xFFFF ## $a0 = 00000096 -/* 012C0 80AF3810 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 012C4 80AF3814 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 -/* 012C8 80AF3818 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 012CC 80AF381C 46003202 */ mul.s $f8, $f6, $f0 -/* 012D0 80AF3820 46082280 */ add.s $f10, $f4, $f8 -/* 012D4 80AF3824 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 012D8 80AF3828 8FBF0024 */ lw $ra, 0x0024($sp) -/* 012DC 80AF382C 8FB00020 */ lw $s0, 0x0020($sp) -/* 012E0 80AF3830 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012E4 80AF3834 03E00008 */ jr $ra -/* 012E8 80AF3838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s deleted file mode 100644 index 200e319c54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF383C -/* 012EC 80AF383C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 012F0 80AF3840 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 012F4 80AF3844 3C01C34A */ lui $at, 0xC34A ## $at = C34A0000 -/* 012F8 80AF3848 C4420024 */ lwc1 $f2, 0x0024($v0) ## 00000024 -/* 012FC 80AF384C 44813000 */ mtc1 $at, $f6 ## $f6 = -202.00 -/* 01300 80AF3850 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01304 80AF3854 46001101 */ sub.s $f4, $f2, $f0 -/* 01308 80AF3858 4604303E */ c.le.s $f6, $f4 -/* 0130C 80AF385C 00000000 */ nop -/* 01310 80AF3860 45000003 */ bc1f .L80AF3870 -/* 01314 80AF3864 00000000 */ nop -/* 01318 80AF3868 03E00008 */ jr $ra -/* 0131C 80AF386C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AF3870: -/* 01320 80AF3870 03E00008 */ jr $ra -/* 01324 80AF3874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s deleted file mode 100644 index bdb9f97316..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80AF3878 -/* 01328 80AF3878 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0132C 80AF387C AFBF001C */ sw $ra, 0x001C($sp) -/* 01330 80AF3880 AFA40020 */ sw $a0, 0x0020($sp) -/* 01334 80AF3884 0C2BCE0F */ jal func_80AF383C -/* 01338 80AF3888 AFA50024 */ sw $a1, 0x0024($sp) -/* 0133C 80AF388C 5040000D */ beql $v0, $zero, .L80AF38C4 -/* 01340 80AF3890 8FBF001C */ lw $ra, 0x001C($sp) -/* 01344 80AF3894 0C02FF21 */ jal func_800BFC84 -/* 01348 80AF3898 8FA40024 */ lw $a0, 0x0024($sp) -/* 0134C 80AF389C 14400008 */ bne $v0, $zero, .L80AF38C0 -/* 01350 80AF38A0 8FA70020 */ lw $a3, 0x0020($sp) -/* 01354 80AF38A4 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01358 80AF38A8 ACEE02A8 */ sw $t6, 0x02A8($a3) ## 000002A8 -/* 0135C 80AF38AC AFA00010 */ sw $zero, 0x0010($sp) -/* 01360 80AF38B0 8FA40024 */ lw $a0, 0x0024($sp) -/* 01364 80AF38B4 24050C3A */ addiu $a1, $zero, 0x0C3A ## $a1 = 00000C3A -/* 01368 80AF38B8 0C02003E */ jal func_800800F8 -/* 0136C 80AF38BC 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -.L80AF38C0: -/* 01370 80AF38C0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF38C4: -/* 01374 80AF38C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01378 80AF38C8 03E00008 */ jr $ra -/* 0137C 80AF38CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s deleted file mode 100644 index 036e20adba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80AF38D0 -/* 01380 80AF38D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01384 80AF38D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01388 80AF38D8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0138C 80AF38DC 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01390 80AF38E0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01394 80AF38E4 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 01398 80AF38E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0139C 80AF38EC 8FA40024 */ lw $a0, 0x0024($sp) -/* 013A0 80AF38F0 24050C3A */ addiu $a1, $zero, 0x0C3A ## $a1 = 00000C3A -/* 013A4 80AF38F4 0C02003E */ jal func_800800F8 -/* 013A8 80AF38F8 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 013AC 80AF38FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 013B0 80AF3900 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 013B4 80AF3904 03E00008 */ jr $ra -/* 013B8 80AF3908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s deleted file mode 100644 index 88401c4a2e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80AF390C -/* 013BC 80AF390C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013C0 80AF3910 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013C4 80AF3914 AFA5001C */ sw $a1, 0x001C($sp) -/* 013C8 80AF3918 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 013CC 80AF391C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 013D0 80AF3920 C48402C4 */ lwc1 $f4, 0x02C4($a0) ## 000002C4 -/* 013D4 80AF3924 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 013D8 80AF3928 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 013DC 80AF392C 46062200 */ add.s $f8, $f4, $f6 -/* 013E0 80AF3930 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 -/* 013E4 80AF3934 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 013E8 80AF3938 E48802C4 */ swc1 $f8, 0x02C4($a0) ## 000002C4 -/* 013EC 80AF393C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 013F0 80AF3940 C48A02C4 */ lwc1 $f10, 0x02C4($a0) ## 000002C4 -/* 013F4 80AF3944 844E1460 */ lh $t6, 0x1460($v0) ## 80161460 -/* 013F8 80AF3948 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 013FC 80AF394C 00000000 */ nop -/* 01400 80AF3950 468084A0 */ cvt.s.w $f18, $f16 -/* 01404 80AF3954 46049180 */ add.s $f6, $f18, $f4 -/* 01408 80AF3958 46065032 */ c.eq.s $f10, $f6 -/* 0140C 80AF395C 00000000 */ nop -/* 01410 80AF3960 45020006 */ bc1fl .L80AF397C -/* 01414 80AF3964 844F145C */ lh $t7, 0x145C($v0) ## 8016145C -/* 01418 80AF3968 0C2BCDEB */ jal func_80AF37AC -/* 0141C 80AF396C 00000000 */ nop -/* 01420 80AF3970 10000017 */ beq $zero, $zero, .L80AF39D0 -/* 01424 80AF3974 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01428 80AF3978 844F145C */ lh $t7, 0x145C($v0) ## 0000145C -.L80AF397C: -/* 0142C 80AF397C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 01430 80AF3980 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 -/* 01434 80AF3984 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 01438 80AF3988 C4EA02C4 */ lwc1 $f10, 0x02C4($a3) ## 000002C4 -/* 0143C 80AF398C 2418403E */ addiu $t8, $zero, 0x403E ## $t8 = 0000403E -/* 01440 80AF3990 46804420 */ cvt.s.w $f16, $f8 -/* 01444 80AF3994 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 0000403E -/* 01448 80AF3998 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0144C 80AF399C 46128100 */ add.s $f4, $f16, $f18 -/* 01450 80AF39A0 460A203C */ c.lt.s $f4, $f10 -/* 01454 80AF39A4 00000000 */ nop -/* 01458 80AF39A8 45020009 */ bc1fl .L80AF39D0 -/* 0145C 80AF39AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01460 80AF39B0 A4F8010E */ sh $t8, 0x010E($a3) ## 0000010E -/* 01464 80AF39B4 AFA70018 */ sw $a3, 0x0018($sp) -/* 01468 80AF39B8 0C042DA0 */ jal func_8010B680 -/* 0146C 80AF39BC 8FA4001C */ lw $a0, 0x001C($sp) -/* 01470 80AF39C0 8FA70018 */ lw $a3, 0x0018($sp) -/* 01474 80AF39C4 24190011 */ addiu $t9, $zero, 0x0011 ## $t9 = 00000011 -/* 01478 80AF39C8 ACF902A8 */ sw $t9, 0x02A8($a3) ## 000002A8 -/* 0147C 80AF39CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF39D0: -/* 01480 80AF39D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01484 80AF39D4 03E00008 */ jr $ra -/* 01488 80AF39D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s deleted file mode 100644 index d28577a1db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_80AF39DC -/* 0148C 80AF39DC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01490 80AF39E0 AFB10018 */ sw $s1, 0x0018($sp) -/* 01494 80AF39E4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01498 80AF39E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0149C 80AF39EC AFB00014 */ sw $s0, 0x0014($sp) -/* 014A0 80AF39F0 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 014A4 80AF39F4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 014A8 80AF39F8 0C042F6F */ jal func_8010BDBC -/* 014AC 80AF39FC AFA40024 */ sw $a0, 0x0024($sp) -/* 014B0 80AF3A00 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 014B4 80AF3A04 14620023 */ bne $v1, $v0, .L80AF3A94 -/* 014B8 80AF3A08 A3A20033 */ sb $v0, 0x0033($sp) -/* 014BC 80AF3A0C 922E02C3 */ lbu $t6, 0x02C3($s1) ## 000002C3 -/* 014C0 80AF3A10 3C0480AF */ lui $a0, %hi(D_80AF51C4) ## $a0 = 80AF0000 -/* 014C4 80AF3A14 506E0020 */ beql $v1, $t6, .L80AF3A98 -/* 014C8 80AF3A18 93AC0033 */ lbu $t4, 0x0033($sp) -/* 014CC 80AF3A1C 0C00084C */ jal osSyncPrintf - -/* 014D0 80AF3A20 248451C4 */ addiu $a0, $a0, %lo(D_80AF51C4) ## $a0 = 80AF51C4 -/* 014D4 80AF3A24 922F02C2 */ lbu $t7, 0x02C2($s1) ## 000002C2 -/* 014D8 80AF3A28 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 014DC 80AF3A2C 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 014E0 80AF3A30 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 014E4 80AF3A34 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000001 -/* 014E8 80AF3A38 0321001A */ div $zero, $t9, $at -/* 014EC 80AF3A3C 00004010 */ mfhi $t0 -/* 014F0 80AF3A40 A23802C2 */ sb $t8, 0x02C2($s1) ## 000002C2 -/* 014F4 80AF3A44 14680013 */ bne $v1, $t0, .L80AF3A94 -/* 014F8 80AF3A48 3C0480AF */ lui $a0, %hi(D_80AF51D8) ## $a0 = 80AF0000 -/* 014FC 80AF3A4C 8E031C44 */ lw $v1, 0x1C44($s0) ## 00001C44 -/* 01500 80AF3A50 248451D8 */ addiu $a0, $a0, %lo(D_80AF51D8) ## $a0 = 80AF51D8 -/* 01504 80AF3A54 0C00084C */ jal osSyncPrintf - -/* 01508 80AF3A58 AFA3002C */ sw $v1, 0x002C($sp) -/* 0150C 80AF3A5C 860907A0 */ lh $t1, 0x07A0($s0) ## 000007A0 -/* 01510 80AF3A60 00095080 */ sll $t2, $t1, 2 -/* 01514 80AF3A64 020A5821 */ addu $t3, $s0, $t2 -/* 01518 80AF3A68 0C016C69 */ jal func_8005B1A4 -/* 0151C 80AF3A6C 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 01520 80AF3A70 3C01444D */ lui $at, 0x444D ## $at = 444D0000 -/* 01524 80AF3A74 8FA3002C */ lw $v1, 0x002C($sp) -/* 01528 80AF3A78 44812000 */ mtc1 $at, $f4 ## $f4 = 820.00 -/* 0152C 80AF3A7C 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 01530 80AF3A80 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01534 80AF3A84 44814000 */ mtc1 $at, $f8 ## $f8 = 180.00 -/* 01538 80AF3A88 E4640024 */ swc1 $f4, 0x0024($v1) ## 00000024 -/* 0153C 80AF3A8C E4660028 */ swc1 $f6, 0x0028($v1) ## 00000028 -/* 01540 80AF3A90 E468002C */ swc1 $f8, 0x002C($v1) ## 0000002C -.L80AF3A94: -/* 01544 80AF3A94 93AC0033 */ lbu $t4, 0x0033($sp) -.L80AF3A98: -/* 01548 80AF3A98 A22C02C3 */ sb $t4, 0x02C3($s1) ## 000002C3 -/* 0154C 80AF3A9C 0C042F6F */ jal func_8010BDBC -/* 01550 80AF3AA0 8FA40024 */ lw $a0, 0x0024($sp) -/* 01554 80AF3AA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01558 80AF3AA8 14410007 */ bne $v0, $at, .L80AF3AC8 -/* 0155C 80AF3AAC 240D0012 */ addiu $t5, $zero, 0x0012 ## $t5 = 00000012 -/* 01560 80AF3AB0 AE2D02A8 */ sw $t5, 0x02A8($s1) ## 000002A8 -/* 01564 80AF3AB4 860E07A0 */ lh $t6, 0x07A0($s0) ## 000007A0 -/* 01568 80AF3AB8 000E7880 */ sll $t7, $t6, 2 -/* 0156C 80AF3ABC 020FC021 */ addu $t8, $s0, $t7 -/* 01570 80AF3AC0 0C016C69 */ jal func_8005B1A4 -/* 01574 80AF3AC4 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -.L80AF3AC8: -/* 01578 80AF3AC8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0157C 80AF3ACC 8FB00014 */ lw $s0, 0x0014($sp) -/* 01580 80AF3AD0 8FB10018 */ lw $s1, 0x0018($sp) -/* 01584 80AF3AD4 03E00008 */ jr $ra -/* 01588 80AF3AD8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s deleted file mode 100644 index ea97beb1cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AF3ADC -/* 0158C 80AF3ADC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01590 80AF3AE0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01594 80AF3AE4 AFA50024 */ sw $a1, 0x0024($sp) -/* 01598 80AF3AE8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0159C 80AF3AEC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 015A0 80AF3AF0 C48402C4 */ lwc1 $f4, 0x02C4($a0) ## 000002C4 -/* 015A4 80AF3AF4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 015A8 80AF3AF8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 015AC 80AF3AFC 46062200 */ add.s $f8, $f4, $f6 -/* 015B0 80AF3B00 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 015B4 80AF3B04 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 015B8 80AF3B08 24A5F8B8 */ addiu $a1, $a1, 0xF8B8 ## $a1 = 0600F8B8 -/* 015BC 80AF3B0C E48802C4 */ swc1 $f8, 0x02C4($a0) ## 000002C4 -/* 015C0 80AF3B10 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 015C4 80AF3B14 C48602C4 */ lwc1 $f6, 0x02C4($a0) ## 000002C4 -/* 015C8 80AF3B18 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 015CC 80AF3B1C 85CF145E */ lh $t7, 0x145E($t6) ## 8016145E -/* 015D0 80AF3B20 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 015D4 80AF3B24 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 015D8 80AF3B28 00000000 */ nop -/* 015DC 80AF3B2C 46805420 */ cvt.s.w $f16, $f10 -/* 015E0 80AF3B30 46128100 */ add.s $f4, $f16, $f18 -/* 015E4 80AF3B34 4606203C */ c.lt.s $f4, $f6 -/* 015E8 80AF3B38 00000000 */ nop -/* 015EC 80AF3B3C 4502000A */ bc1fl .L80AF3B68 -/* 015F0 80AF3B40 8FBF001C */ lw $ra, 0x001C($sp) -/* 015F4 80AF3B44 AFA00010 */ sw $zero, 0x0010($sp) -/* 015F8 80AF3B48 0C2BCA3A */ jal func_80AF28E8 -/* 015FC 80AF3B4C AFA40020 */ sw $a0, 0x0020($sp) -/* 01600 80AF3B50 8FA40020 */ lw $a0, 0x0020($sp) -/* 01604 80AF3B54 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 -/* 01608 80AF3B58 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 0160C 80AF3B5C 0C2BCDBB */ jal func_80AF36EC -/* 01610 80AF3B60 8FA50024 */ lw $a1, 0x0024($sp) -/* 01614 80AF3B64 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF3B68: -/* 01618 80AF3B68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0161C 80AF3B6C 03E00008 */ jr $ra -/* 01620 80AF3B70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3B74.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3B74.s deleted file mode 100644 index b7e2c4224b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3B74.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AF3B74 -/* 01624 80AF3B74 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01628 80AF3B78 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 0162C 80AF3B7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01630 80AF3B80 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01634 80AF3B84 AFA5001C */ sw $a1, 0x001C($sp) -/* 01638 80AF3B88 8459145A */ lh $t9, 0x145A($v0) ## 8016145A -/* 0163C 80AF3B8C 844E1458 */ lh $t6, 0x1458($v0) ## 80161458 -/* 01640 80AF3B90 948C02C0 */ lhu $t4, 0x02C0($a0) ## 000002C0 -/* 01644 80AF3B94 27290028 */ addiu $t1, $t9, 0x0028 ## $t1 = 00000028 -/* 01648 80AF3B98 25D80096 */ addiu $t8, $t6, 0x0096 ## $t8 = 00000096 -/* 0164C 80AF3B9C 03095021 */ addu $t2, $t8, $t1 -/* 01650 80AF3BA0 314BFFFF */ andi $t3, $t2, 0xFFFF ## $t3 = 00000000 -/* 01654 80AF3BA4 016C082A */ slt $at, $t3, $t4 -/* 01658 80AF3BA8 50200004 */ beql $at, $zero, .L80AF3BBC -/* 0165C 80AF3BAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01660 80AF3BB0 0C00B55C */ jal Actor_Kill - -/* 01664 80AF3BB4 00000000 */ nop -/* 01668 80AF3BB8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF3BBC: -/* 0166C 80AF3BBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01670 80AF3BC0 03E00008 */ jr $ra -/* 01674 80AF3BC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s deleted file mode 100644 index f98bec8beb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF3BC8 -/* 01678 80AF3BC8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0167C 80AF3BCC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01680 80AF3BD0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01684 80AF3BD4 0C2BCE1E */ jal func_80AF3878 -/* 01688 80AF3BD8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0168C 80AF3BDC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01690 80AF3BE0 0C00B56E */ jal Actor_SetHeight - -/* 01694 80AF3BE4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 01698 80AF3BE8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0169C 80AF3BEC 0C2BC967 */ jal func_80AF259C -/* 016A0 80AF3BF0 8FA5001C */ lw $a1, 0x001C($sp) -/* 016A4 80AF3BF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 016A8 80AF3BF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 016AC 80AF3BFC 03E00008 */ jr $ra -/* 016B0 80AF3C00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s deleted file mode 100644 index 000a220f15..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AF3C04 -/* 016B4 80AF3C04 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 016B8 80AF3C08 AFBF001C */ sw $ra, 0x001C($sp) -/* 016BC 80AF3C0C AFB00018 */ sw $s0, 0x0018($sp) -/* 016C0 80AF3C10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 016C4 80AF3C14 0C2BC9D1 */ jal func_80AF2744 -/* 016C8 80AF3C18 AFA50024 */ sw $a1, 0x0024($sp) -/* 016CC 80AF3C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016D0 80AF3C20 0C2BC967 */ jal func_80AF259C -/* 016D4 80AF3C24 8FA50024 */ lw $a1, 0x0024($sp) -/* 016D8 80AF3C28 0C2BC9E3 */ jal func_80AF278C -/* 016DC 80AF3C2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E0 80AF3C30 0C2BC982 */ jal func_80AF2608 -/* 016E4 80AF3C34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E8 80AF3C38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016EC 80AF3C3C 0C00B56E */ jal Actor_SetHeight - -/* 016F0 80AF3C40 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 016F4 80AF3C44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016F8 80AF3C48 0C2BCE34 */ jal func_80AF38D0 -/* 016FC 80AF3C4C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01700 80AF3C50 8FBF001C */ lw $ra, 0x001C($sp) -/* 01704 80AF3C54 8FB00018 */ lw $s0, 0x0018($sp) -/* 01708 80AF3C58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0170C 80AF3C5C 03E00008 */ jr $ra -/* 01710 80AF3C60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s deleted file mode 100644 index f5457c574c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF3C64 -/* 01714 80AF3C64 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01718 80AF3C68 AFBF001C */ sw $ra, 0x001C($sp) -/* 0171C 80AF3C6C AFB00018 */ sw $s0, 0x0018($sp) -/* 01720 80AF3C70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01724 80AF3C74 0C2BC9D1 */ jal func_80AF2744 -/* 01728 80AF3C78 AFA50024 */ sw $a1, 0x0024($sp) -/* 0172C 80AF3C7C 0C2BC9E3 */ jal func_80AF278C -/* 01730 80AF3C80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01734 80AF3C84 0C2BC982 */ jal func_80AF2608 -/* 01738 80AF3C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0173C 80AF3C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01740 80AF3C90 0C00B56E */ jal Actor_SetHeight - -/* 01744 80AF3C94 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 01748 80AF3C98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0174C 80AF3C9C 0C2BCE43 */ jal func_80AF390C -/* 01750 80AF3CA0 8FA50024 */ lw $a1, 0x0024($sp) -/* 01754 80AF3CA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01758 80AF3CA8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0175C 80AF3CAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01760 80AF3CB0 03E00008 */ jr $ra -/* 01764 80AF3CB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s deleted file mode 100644 index 9ceea8b97c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF3CB8 -/* 01768 80AF3CB8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0176C 80AF3CBC AFBF001C */ sw $ra, 0x001C($sp) -/* 01770 80AF3CC0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01774 80AF3CC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01778 80AF3CC8 0C2BC9D1 */ jal func_80AF2744 -/* 0177C 80AF3CCC AFA50024 */ sw $a1, 0x0024($sp) -/* 01780 80AF3CD0 0C2BC9E3 */ jal func_80AF278C -/* 01784 80AF3CD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01788 80AF3CD8 0C2BC982 */ jal func_80AF2608 -/* 0178C 80AF3CDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01790 80AF3CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01794 80AF3CE4 0C00B56E */ jal Actor_SetHeight - -/* 01798 80AF3CE8 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 0179C 80AF3CEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017A0 80AF3CF0 0C2BCE77 */ jal func_80AF39DC -/* 017A4 80AF3CF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 017A8 80AF3CF8 8FBF001C */ lw $ra, 0x001C($sp) -/* 017AC 80AF3CFC 8FB00018 */ lw $s0, 0x0018($sp) -/* 017B0 80AF3D00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 017B4 80AF3D04 03E00008 */ jr $ra -/* 017B8 80AF3D08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s deleted file mode 100644 index a6cc530e71..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF3D0C -/* 017BC 80AF3D0C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 017C0 80AF3D10 AFBF001C */ sw $ra, 0x001C($sp) -/* 017C4 80AF3D14 AFB00018 */ sw $s0, 0x0018($sp) -/* 017C8 80AF3D18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 017CC 80AF3D1C 0C2BC9D1 */ jal func_80AF2744 -/* 017D0 80AF3D20 AFA50024 */ sw $a1, 0x0024($sp) -/* 017D4 80AF3D24 0C2BC9E3 */ jal func_80AF278C -/* 017D8 80AF3D28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017DC 80AF3D2C 0C2BC982 */ jal func_80AF2608 -/* 017E0 80AF3D30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017E4 80AF3D34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017E8 80AF3D38 0C00B56E */ jal Actor_SetHeight - -/* 017EC 80AF3D3C 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 017F0 80AF3D40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017F4 80AF3D44 0C2BCEB7 */ jal func_80AF3ADC -/* 017F8 80AF3D48 8FA50024 */ lw $a1, 0x0024($sp) -/* 017FC 80AF3D4C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01800 80AF3D50 8FB00018 */ lw $s0, 0x0018($sp) -/* 01804 80AF3D54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01808 80AF3D58 03E00008 */ jr $ra -/* 0180C 80AF3D5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s deleted file mode 100644 index b7564d1f25..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AF3D60 -/* 01810 80AF3D60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01814 80AF3D64 AFBF001C */ sw $ra, 0x001C($sp) -/* 01818 80AF3D68 AFB00018 */ sw $s0, 0x0018($sp) -/* 0181C 80AF3D6C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01820 80AF3D70 0C2BCDF3 */ jal func_80AF37CC -/* 01824 80AF3D74 AFA50024 */ sw $a1, 0x0024($sp) -/* 01828 80AF3D78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0182C 80AF3D7C 0C2BC9D1 */ jal func_80AF2744 -/* 01830 80AF3D80 8FA50024 */ lw $a1, 0x0024($sp) -/* 01834 80AF3D84 0C2BC9E3 */ jal func_80AF278C -/* 01838 80AF3D88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0183C 80AF3D8C 0C2BC982 */ jal func_80AF2608 -/* 01840 80AF3D90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01844 80AF3D94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01848 80AF3D98 0C00B56E */ jal Actor_SetHeight - -/* 0184C 80AF3D9C 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 01850 80AF3DA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01854 80AF3DA4 0C2BCEDD */ jal func_80AF3B74 -/* 01858 80AF3DA8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0185C 80AF3DAC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01860 80AF3DB0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01864 80AF3DB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01868 80AF3DB8 03E00008 */ jr $ra -/* 0186C 80AF3DBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s deleted file mode 100644 index 26c87ec112..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80AF3F14 -/* 019C4 80AF3F14 AFA40000 */ sw $a0, 0x0000($sp) -/* 019C8 80AF3F18 03E00008 */ jr $ra -/* 019CC 80AF3F1C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s deleted file mode 100644 index 940c453b94..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel func_80AF3F20 -/* 019D0 80AF3F20 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 019D4 80AF3F24 AFBF0024 */ sw $ra, 0x0024($sp) -/* 019D8 80AF3F28 AFA40070 */ sw $a0, 0x0070($sp) -/* 019DC 80AF3F2C AFA50074 */ sw $a1, 0x0074($sp) -/* 019E0 80AF3F30 848202A4 */ lh $v0, 0x02A4($a0) ## 000002A4 -/* 019E4 80AF3F34 3C1880AF */ lui $t8, %hi(D_80AF410C) ## $t8 = 80AF0000 -/* 019E8 80AF3F38 3C0680AF */ lui $a2, %hi(D_80AF5224) ## $a2 = 80AF0000 -/* 019EC 80AF3F3C 00027880 */ sll $t7, $v0, 2 -/* 019F0 80AF3F40 030FC021 */ addu $t8, $t8, $t7 -/* 019F4 80AF3F44 8F18410C */ lw $t8, %lo(D_80AF410C)($t8) -/* 019F8 80AF3F48 24C65224 */ addiu $a2, $a2, %lo(D_80AF5224) ## $a2 = 80AF5224 -/* 019FC 80AF3F4C 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 01A00 80AF3F50 AFB80060 */ sw $t8, 0x0060($sp) -/* 01A04 80AF3F54 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01A08 80AF3F58 24070282 */ addiu $a3, $zero, 0x0282 ## $a3 = 00000282 -/* 01A0C 80AF3F5C 0C031AB1 */ jal func_800C6AC4 -/* 01A10 80AF3F60 AFA50058 */ sw $a1, 0x0058($sp) -/* 01A14 80AF3F64 8FA90074 */ lw $t1, 0x0074($sp) -/* 01A18 80AF3F68 0C024F46 */ jal func_80093D18 -/* 01A1C 80AF3F6C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 01A20 80AF3F70 8FA80058 */ lw $t0, 0x0058($sp) -/* 01A24 80AF3F74 8FA70060 */ lw $a3, 0x0060($sp) -/* 01A28 80AF3F78 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01A2C 80AF3F7C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01A30 80AF3F80 00076100 */ sll $t4, $a3, 4 -/* 01A34 80AF3F84 000C6F02 */ srl $t5, $t4, 28 -/* 01A38 80AF3F88 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01A3C 80AF3F8C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 01A40 80AF3F90 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 01A44 80AF3F94 000D7080 */ sll $t6, $t5, 2 -/* 01A48 80AF3F98 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 01A4C 80AF3F9C AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 01A50 80AF3FA0 01CF2021 */ addu $a0, $t6, $t7 -/* 01A54 80AF3FA4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01A58 80AF3FA8 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 01A5C 80AF3FAC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01A60 80AF3FB0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01A64 80AF3FB4 00E12824 */ and $a1, $a3, $at -/* 01A68 80AF3FB8 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 01A6C 80AF3FBC 0305C821 */ addu $t9, $t8, $a1 -/* 01A70 80AF3FC0 03264821 */ addu $t1, $t9, $a2 -/* 01A74 80AF3FC4 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 01A78 80AF3FC8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01A7C 80AF3FCC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01A80 80AF3FD0 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 01A84 80AF3FD4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 01A88 80AF3FD8 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 01A8C 80AF3FDC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01A90 80AF3FE0 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 01A94 80AF3FE4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01A98 80AF3FE8 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 01A9C 80AF3FEC 01856821 */ addu $t5, $t4, $a1 -/* 01AA0 80AF3FF0 01A67021 */ addu $t6, $t5, $a2 -/* 01AA4 80AF3FF4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01AA8 80AF3FF8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01AAC 80AF3FFC 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 -/* 01AB0 80AF4000 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 01AB4 80AF4004 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01AB8 80AF4008 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01ABC 80AF400C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01AC0 80AF4010 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01AC4 80AF4014 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01AC8 80AF4018 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 -/* 01ACC 80AF401C 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290 -/* 01AD0 80AF4020 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01AD4 80AF4024 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 01AD8 80AF4028 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01ADC 80AF402C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01AE0 80AF4030 8FA30070 */ lw $v1, 0x0070($sp) -/* 01AE4 80AF4034 8FA40074 */ lw $a0, 0x0074($sp) -/* 01AE8 80AF4038 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 01AEC 80AF403C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 01AF0 80AF4040 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 01AF4 80AF4044 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01AF8 80AF4048 AFA00014 */ sw $zero, 0x0014($sp) -/* 01AFC 80AF404C AFA00010 */ sw $zero, 0x0010($sp) -/* 01B00 80AF4050 0C0286B2 */ jal SkelAnime_DrawSV -/* 01B04 80AF4054 AFA30018 */ sw $v1, 0x0018($sp) -/* 01B08 80AF4058 8FAC0074 */ lw $t4, 0x0074($sp) -/* 01B0C 80AF405C 3C0680AF */ lui $a2, %hi(D_80AF5234) ## $a2 = 80AF0000 -/* 01B10 80AF4060 24C65234 */ addiu $a2, $a2, %lo(D_80AF5234) ## $a2 = 80AF5234 -/* 01B14 80AF4064 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 01B18 80AF4068 24070297 */ addiu $a3, $zero, 0x0297 ## $a3 = 00000297 -/* 01B1C 80AF406C 0C031AD5 */ jal func_800C6B54 -/* 01B20 80AF4070 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 01B24 80AF4074 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01B28 80AF4078 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 01B2C 80AF407C 03E00008 */ jr $ra -/* 01B30 80AF4080 00000000 */ nop - - 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_ru2.data.s b/data/overlays/actors/z_en_ru2.data.s deleted file mode 100644 index 70702ce4f0..0000000000 --- a/data/overlays/actors/z_en_ru2.data.s +++ /dev/null @@ -1,50 +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_80AF40E0 - .word 0x0A000900, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000080, 0x00000000, 0x00010000, 0x001E0064, 0x00000000, 0x00000000 -glabel D_80AF410C - .word 0x06000F20, 0x060022E0, 0x06002AE0 -glabel D_80AF4118 - .word 0x00000000 -glabel D_80AF411C - .word 0x00000023, 0x00000D0A, 0x00000020, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x00000005, 0x00010000, 0x033D0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0002033D, 0x033E0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0004033E, 0x03820000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020382, 0x03B40000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0xC02B851F, 0x00000000, 0x000303B4, 0x0D0A0000, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000005, 0x000D0000, 0x00F00000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000500F0, 0x02080000, 0x40000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030208, 0x02260000, 0x40000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050226, 0x03210000, 0x40000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00130321, 0x07A40000, 0xC0000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000031, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFF0, 0xFFFFFF87, 0x00000000, 0xFFFFFFF0, 0xFFFFFF87, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000005, 0x00050000, 0x01800000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x00060180, 0x01C60000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x000501C6, 0x022A0000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x0006022A, 0x02700000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x00050270, 0x0BB90000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000000, 0x0000002A, 0x00000003, 0x00010000, 0x00920000, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020092, 0x02F20000, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000302F2, 0x0A440000, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, 0x0001032A, 0x03370337, 0x0000002D, 0x00000001, 0x00050339, 0x03570357, 0x0000002D, 0x00000001, 0x00010442, 0x04610461, 0x00000001, 0x00010000, 0x012D0000, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00470000, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00471FBC, 0x00000000, 0x432F65F8, 0xFD97001E, 0x0047D5E0, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00470000, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00471F98, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00470000, 0x00000000, 0x4311CC7C, 0xFE38006B, 0x00380000, 0x00000000, 0x42726667, 0xFFB40036, 0x00470164, 0x00000000, 0x42726667, 0x00740036, 0x00602100, 0x00000000, 0x42726667, 0x00EC000B, 0x00400049, 0x00000000, 0x42726667, 0x00EC000B, 0x0040204C, 0x00000000, 0x42726667, 0x00EC000B, 0x0040E990, 0xFF000000, 0x42726667, 0x00EC000B, 0x00400000, 0x00000001, 0x00010107, 0x05CC0000, 0x00000000, 0x4228E87B, 0x00A10035, 0x001A0000, 0x00000000, 0x4228E87B, 0x00A10035, 0x001A1FBC, 0x00000000, 0x4228E87B, 0x00A10035, 0x001AD5E0, 0x00000000, 0x4228E87B, 0x00820009, 0x00600000, 0x00000000, 0x4228E87B, 0x00820009, 0x00601F98, 0x00000000, 0x4228E87B, 0x00820009, 0x00600000, 0x00000000, 0x4228E87B, 0x00820009, 0x00600000, 0xFF000000, 0x4228E87B, 0x00820009, 0x00600164, 0x00000001, 0x0001017F, 0x05C20000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00221FBC, 0x00000000, 0x428C743C, 0x00CF002D, 0x0022D5E0, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, 0xFF000000, 0x428C743C, 0x00CF002D, 0x00221F98, 0x00000001, 0x000101C5, 0x06080000, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00460000, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00461FBC, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x0046D5E0, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00460000, 0xFF000000, 0x42341BB1, 0xFFC6005A, 0x00461F98, 0x00000001, 0x00010229, 0x066C0000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00221FBC, 0x00000000, 0x428C743C, 0x00CF002D, 0x0022D5E0, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, 0xFF000000, 0x428C743C, 0x00CF002D, 0x00221F98, 0x00000001, 0x0001026F, 0x06B20000, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00000000, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00001FBC, 0x00000000, 0x4271B55A, 0x00A1003B, 0x0000D5E0, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00000000, 0xFF000000, 0x4271B55A, 0x00A1003B, 0x00001F98, 0x00000001, 0x000102B5, 0x06F80000, 0x00000000, 0x4271B55A, 0x00970052, 0x00230000, 0x00000000, 0x4271B55A, 0x00970052, 0x00231FBC, 0x00000000, 0x4271B55A, 0x00970052, 0x0023D5E0, 0x00000000, 0x4271B55A, 0x00970052, 0x00230000, 0xFF000000, 0x4271B55A, 0x00970052, 0x00231F98, 0x00000001, 0x000102FB, 0x03B00000, 0x00000000, 0x4271B55A, 0x00E60007, 0x00180000, 0x00000000, 0x4271B55A, 0x00E60007, 0x00181FBC, 0x00000000, 0x4271B55A, 0x00E60007, 0x0018D5E0, 0x00000000, 0x4271B55A, 0x00CF003E, 0x000F0000, 0x00000000, 0x428CDAA2, 0x00E600F0, 0x00181F98, 0x00000000, 0x428CDAA2, 0x00E600F0, 0x00180000, 0x00000000, 0x428CDAA2, 0x00E600F0, 0x00180000, 0xFF000000, 0x428CDAA2, 0x00E600F0, 0x00180164, 0x00000001, 0x00010337, 0x048D0000, 0x00000000, 0x42700000, 0x000D0356, 0x00020000, 0x00000000, 0x42700000, 0x00090355, 0x00051FBC, 0x00000000, 0x42700000, 0xFFFD0355, 0x0005D5E0, 0x00000000, 0x42700000, 0xFFF70355, 0xFFFA0000, 0x00000000, 0x42700000, 0xFFFE0354, 0xFFEF1F98, 0x00000000, 0x42700000, 0x00090354, 0xFFEF0000, 0x00000000, 0x42700000, 0x00100354, 0xFFFA0000, 0x00000000, 0x42700000, 0x00090354, 0x00050164, 0xFF000000, 0x42700000, 0xFFFD0353, 0x00052100, 0x00000005, 0x00010383, 0x08200000, 0x00000000, 0x4289332C, 0x00000021, 0xFFE50000, 0x00000000, 0x4289332C, 0x00000021, 0xFFE51FBC, 0x00000000, 0x4289332C, 0x00000044, 0xFFE6D5E0, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60000, 0x00000000, 0x4289332C, 0x00000067, 0xFFE61F98, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60000, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60000, 0xFF000000, 0x4289332C, 0x00000067, 0xFFE60164, 0x00000002, 0x00010000, 0x014A0000, 0x001E0014, 0x432F65F8, 0xFD77FFB5, 0x00650000, 0x00E20014, 0x432F65F8, 0xFD74FFB5, 0x00621FBC, 0x001E0014, 0x432F65F8, 0xFD6EFFB5, 0x0057D5E0, 0x00E20014, 0x432F65F8, 0xFD5A007F, 0x00470000, 0x00000014, 0x432F65F8, 0xFD290000, 0x00471F98, 0x00000014, 0x4311CC7C, 0xFDFF0000, 0x002B0000, 0x0000001E, 0x42726667, 0xFEA30059, 0x002F0000, 0x0000001E, 0x42726667, 0x0006003D, 0x00010164, 0x0000001E, 0x42726667, 0x00210042, 0x001C2100, 0x0000001E, 0x42726667, 0x009E002A, 0x00010049, 0x0000001E, 0x42726667, 0x009E002A, 0x0001204C, 0x0000001E, 0x42726667, 0x009E002A, 0x0001E990, 0xFF00001E, 0x42726667, 0x009E002A, 0x00010000, 0x00000002, 0x00010107, 0x05E90000, 0x0000001E, 0x4228E87B, 0x0142003E, 0xFF860000, 0x0000001E, 0x4228E87B, 0x0142003E, 0xFF861FBC, 0x00000032, 0x4228E87B, 0x0142003E, 0xFF86D5E0, 0x00000032, 0x4228E87B, 0x00E8003F, 0xFFAD0000, 0x0000001E, 0x4228E87B, 0x00E8003F, 0xFFAD1F98, 0x000003E8, 0x4228E87B, 0x00E8003F, 0xFFAD0000, 0x0000001E, 0x4228E87B, 0x00E8003F, 0xFFAD0000, 0xFF00001E, 0x4228E87B, 0x00E8003F, 0xFFAD0164, 0x00000002, 0x0001017F, 0x05DF0000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF971FBC, 0x000003E8, 0x428C743C, 0x0033003E, 0xFF97D5E0, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0xFF00001E, 0x428C743C, 0x0033003E, 0xFF971F98, 0x00000002, 0x000101C5, 0x06250000, 0x0000001E, 0x42341BB1, 0x00660016, 0xFFE10000, 0x0000001E, 0x42341BB1, 0x00660016, 0xFFE11FBC, 0x000003E8, 0x42341BB1, 0x00660016, 0xFFE1D5E0, 0x0000001E, 0x42341BB1, 0x00660016, 0xFFE10000, 0xFF00001E, 0x42341BB1, 0x00660016, 0xFFE11F98, 0x00000002, 0x00010229, 0x06890000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF971FBC, 0x000003E8, 0x428C743C, 0x0033003E, 0xFF97D5E0, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0xFF00001E, 0x428C743C, 0x0033003E, 0xFF971F98, 0x00000002, 0x0001026F, 0x06CF0000, 0x0000001E, 0x4271B55A, 0x015B0016, 0x00000000, 0x0000001E, 0x4271B55A, 0x015B0016, 0x00001FBC, 0x000003E8, 0x4271B55A, 0x015B0016, 0x0000D5E0, 0x0000001E, 0x4271B55A, 0x015B0016, 0x00000000, 0xFF00001E, 0x4271B55A, 0x015B0016, 0x00001F98, 0x00000002, 0x000102B5, 0x07150000, 0x0000001E, 0x4271B55A, 0x0102FFE2, 0xFFCA0000, 0x0000001E, 0x4271B55A, 0x0102FFE2, 0xFFCA1FBC, 0x000003E8, 0x4271B55A, 0x0102FFE2, 0xFFCAD5E0, 0x0000001E, 0x4271B55A, 0x0102FFE2, 0xFFCA0000, 0xFF00001E, 0x4271B55A, 0x0102FFE2, 0xFFCA1F98, 0x00000002, 0x000102FB, 0x03CD0000, 0x0000001E, 0x4271B55A, 0x00600069, 0xFFE30000, 0x00000028, 0x4271B55A, 0x00600069, 0xFFE31FBC, 0x0000000F, 0x4271B55A, 0x00600069, 0xFFE3D5E0, 0x0000000F, 0x42701BC0, 0x006E00C4, 0xFFE60000, 0x00000014, 0x428CDAA2, 0x00B9018F, 0x00061F98, 0x0000001E, 0x428CDAA2, 0x00B9018F, 0x00060000, 0x0000001E, 0x428CDAA2, 0x00B9018F, 0x00060000, 0xFF00001E, 0x428CDAA2, 0x00B9018F, 0x00060164, 0x00000002, 0x00010337, 0x04BE0000, 0x00000032, 0x42700000, 0x00030006, 0xFFFA0000, 0x00000028, 0x42700000, 0x00030006, 0xFFFA1FBC, 0x0000001E, 0x424BFFF7, 0x00030006, 0xFFFAD5E0, 0x00000014, 0x41A4CC7E, 0x00030006, 0xFFFA0000, 0x00000033, 0x412CCC23, 0x00030006, 0xFFFA1F98, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA0000, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA0000, 0x00000032, 0x4123328A, 0x00030006, 0xFFFA0164, 0xFF000032, 0x412FFF56, 0x00030006, 0xFFFA2100, 0x00000006, 0x00010383, 0x083D0000, 0x0000001E, 0x4289332C, 0x00000064, 0x00050000, 0x0000001E, 0x4289332C, 0x00000065, 0x00061FBC, 0x0000001E, 0x4289332C, 0x00010063, 0x0029D5E0, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100000, 0x0000001E, 0x4289332C, 0x0000002A, 0x00101F98, 0x000003E8, 0x4289332C, 0x0000002A, 0x00100000, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100000, 0xFF00001E, 0x4289332C, 0x0000002A, 0x00100164, 0x0000003E, 0x00000001, 0x00040000, 0x0BB8C10F, 0x00000000, 0x0000004D, 0x00000050, 0xFFFFFFFE, 0x00000000, 0x00000050, 0x00000000, 0xBCD242E7, 0x00000000, 0x3CD242E7, 0x00000013, 0x0000000E, 0xFFFF0000, 0x018AFFFF, 0xFFFFFFFF, 0x4041018A, 0x01BC0000, 0x00000000, 0xFFFF01BC, 0x01D0FFFF, 0xFFFFFFFF, 0x404601D0, 0x021F0000, 0x00000000, 0xFFFF021F, 0x0234FFFF, 0xFFFFFFFF, 0x40490234, 0x02650000, 0x00000000, 0xFFFF0265, 0x027AFFFF, 0xFFFFFFFF, 0x4047027A, 0x02AC0000, 0x00000000, 0xFFFF02AC, 0x02C0FFFF, 0xFFFFFFFF, 0x404A02C0, 0x02EE0000, 0x00000000, 0xFFFF02EE, 0x043DFFFF, 0xFFFFFFFF, 0x003D043D, 0x04420000, 0x00000000, 0xFFFF0442, 0x047EFFFF, 0xFFFFFFFF, 0x4042047E, 0x04880000, 0x00000000, 0x000003E8, 0x00000001, 0x001504A6, 0x04BD04BD, 0x00000056, 0x00000001, 0x00440384, 0x03850000, 0x00000000, 0x00000000, 0xFFFFFFC7, 0x00000034, 0x00000000, 0xFFFFFFC7, 0x00000034, 0x00000000, 0x00000000, 0x00000000, 0x0000007C, 0x00000001, 0x00040320, 0x03520000, 0x00000000, 0x00000000, 0xFFFFFFC6, 0x00000030, 0x00000000, 0xFFFFFFC6, 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 -glabel D_80AF50BC - .word func_80AF2CB4 -.word func_80AF2CD4 -.word func_80AF2CF4 -.word func_80AF2D2C -.word func_80AF2D6C -.word func_80AF2DAC -.word func_80AF2DEC -.word func_80AF3144 -.word func_80AF3174 -.word func_80AF31C8 -.word func_80AF3604 -.word func_80AF3624 -.word func_80AF366C -.word func_80AF36AC -.word func_80AF3BC8 -.word func_80AF3C04 -.word func_80AF3C64 -.word func_80AF3CB8 -.word func_80AF3D0C -.word func_80AF3D60 -glabel D_80AF510C - .word func_80AF3F14 -.word func_80AF3F20 -.word func_80AF321C -glabel En_Ru2_InitVars - .word 0x00D20400, 0x00000010, 0x00CA0000, 0x00000314 -.word EnRu2_Init -.word EnRu2_Destroy -.word EnRu2_Update -.word EnRu2_Draw -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_ru2.reloc.s b/data/overlays/actors/z_en_ru2.reloc.s deleted file mode 100644 index 953647ce15..0000000000 --- a/data/overlays/actors/z_en_ru2.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_80AF5290 - -.incbin "baserom/ovl_En_Ru2", 0x2D40, 0x000002D0 diff --git a/data/overlays/actors/z_en_ru2.rodata.s b/data/overlays/actors/z_en_ru2.rodata.s deleted file mode 100644 index 867fc783bc..0000000000 --- a/data/overlays/actors/z_en_ru2.rodata.s +++ /dev/null @@ -1,51 +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_80AF5140 - .asciz "../z_en_ru2_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AF5164 - .asciz "../z_en_ru2_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AF5188 - .asciz "En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.balign 4 - -glabel D_80AF51C4 - .word 0xA4AAA4EC, 0xA4ACBEAE, 0xBEBEA4C0, 0xA1AA200A, 0x00000000 -glabel D_80AF51D8 - .word 0xA4A6A4AA, 0xA4EAA4E3, 0xA1BCA1AA, 0x200A0000 -glabel D_80AF51E8 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.balign 4 - -glabel D_80AF5224 - .asciz "../z_en_ru2.c" - .balign 4 - -glabel D_80AF5234 - .asciz "../z_en_ru2.c" - .balign 4 - -glabel D_80AF5244 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AF527C - .word 0x42A6AAAB -glabel D_80AF5280 - .word 0xC61C4000, 0x00000000, 0x00000000, 0x00000000 - - 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 66ef3fb28d..b5262044f6 100644 --- a/include/functions.h +++ b/include/functions.h @@ -831,6 +831,7 @@ void func_8006EE48(UNK_TYPE); // ? func_8006F0FC(?); // ? func_8006F140(?); f32 func_8006F93C(u16, u16, u16); +f32 func_8006F9BC(u16, u16, u16, u16, u16); // ? func_8006FB94(?); // ? func_8006FC88(?); // ? func_80070600(?); @@ -1055,20 +1056,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/variables.h b/include/variables.h index 3b708c37b2..e44e42f026 100644 --- a/include/variables.h +++ b/include/variables.h @@ -185,7 +185,8 @@ extern EffectTableInfo EffectSS2Info; // 801158B0 //extern ? D_80115F68; //extern ? D_80115F6C; //extern ? D_80115F70; -extern ActorOverlay gActorOverlayTable[471]; // original name: "actor_dlftbls" +extern Gfx D_80116280[]; +extern ActorOverlay gActorOverlayTable[471]; // original name: "actor_dlftbls" 801162A0 extern s32 gMaxProfile; //extern ? D_80119E2C; //extern ? D_80119E52; diff --git a/include/z64.h b/include/z64.h index c6ff0a1723..dfa5d3376f 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1277,4 +1277,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/include/z64actor.h b/include/z64actor.h index 9a18e6d5c4..91a1f9f716 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -275,9 +275,9 @@ typedef struct { typedef struct { /* 0x00 */ ColliderBodyInfo body; - /* 0x06 */ ColliderBodyInfoInner inner; - /* 0x20 */ ColliderDimensions dim; -} ColliderCylinderInit; // size = 0x2C + /* 0x08 */ ColliderBodyInfoInner inner; + /* 0x22 */ ColliderDimensions dim; +} ColliderCylinderInit; // size = 0x2E typedef struct { /* 0x00 */ Actor* actor; diff --git a/spec b/spec index 32ca30a07d..e74c81aecf 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" @@ -3471,9 +3466,7 @@ endseg beginseg name "ovl_En_Ru2" include "build/src/overlays/actors/ovl_En_Ru2/z_en_ru2.o" - include "build/data/overlays/actors/z_en_ru2.data.o" - include "build/data/overlays/actors/z_en_ru2.rodata.o" - include "build/data/overlays/actors/z_en_ru2.reloc.o" + include "build/src/overlays/actors/ovl_En_Ru2/z_en_ru2_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 49086f289a..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) { @@ -4064,7 +4064,6 @@ void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* ar Vec3f D_80116268 = { 0.0f, -1.5f, 0.0f }; Vec3f D_80116274 = { 0.0f, -0.2f, 0.0f }; -// unused Gfx D_80116280[] = { gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA), 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_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 074787c20a..fcbebee7b3 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -1,14 +1,78 @@ +/* + * File: z_en_ru2.c + * Overlay: En_Ru2 + * Description: + */ + #include "z_en_ru2.h" +#include + #define ROOM 0x00 #define FLAGS 0x00000010 -void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx); -void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx); -void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx); -void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx); +static void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx); +static void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx); +static void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx); +static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx); + +static void func_80AF2CB4(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2D2C(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2DAC(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3144(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3174(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3604(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3624(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF366C(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx); + +static void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx); + +static void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx); + +static ColliderCylinderInit D_80AF40E0 = { + 0x0A, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00000080, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x001E, 0x0064, 0x0000, 0x0000, 0x0000, 0x0000, +}; + +static u32 D_80AF410C[] = { + 0x06000F20, + 0x060022E0, + 0x06002AE0, +}; + +static u32 D_80AF4118 = 0; + +#include "z_en_ru2_cutscene_data.c" + +static ActorFunc D_80AF50BC[] = { + (ActorFunc)func_80AF2CB4, (ActorFunc)func_80AF2CD4, (ActorFunc)func_80AF2CF4, (ActorFunc)func_80AF2D2C, + (ActorFunc)func_80AF2D6C, (ActorFunc)func_80AF2DAC, (ActorFunc)func_80AF2DEC, (ActorFunc)func_80AF3144, + (ActorFunc)func_80AF3174, (ActorFunc)func_80AF31C8, (ActorFunc)func_80AF3604, (ActorFunc)func_80AF3624, + (ActorFunc)func_80AF366C, (ActorFunc)func_80AF36AC, (ActorFunc)func_80AF3BC8, (ActorFunc)func_80AF3C04, + (ActorFunc)func_80AF3C64, (ActorFunc)func_80AF3CB8, (ActorFunc)func_80AF3D0C, (ActorFunc)func_80AF3D60, +}; + +static ActorFunc D_80AF510C[] = { + (ActorFunc)func_80AF3F14, + (ActorFunc)func_80AF3F20, + (ActorFunc)func_80AF321C, +}; -/* const ActorInit En_Ru2_InitVars = { ACTOR_EN_RU2, ACTORTYPE_NPC, @@ -21,155 +85,729 @@ const ActorInit En_Ru2_InitVars = { (ActorFunc)EnRu2_Update, (ActorFunc)EnRu2_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3B74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s") +extern AnimationHeader* D_060004CC; +extern SkeletonHeader* D_0600C700; +extern AnimationHeader* D_0600D3DC; +extern AnimationHeader* D_0600DCAC; +extern AnimationHeader* D_06000DE8; +extern AnimationHeader* D_0600E630; +extern AnimationHeader* D_0600F03C; +extern AnimationHeader* D_0600F8B8; + +static void func_80AF2550(EnRu2* this, GlobalContext* globalCtx) { + EnRu2* thisLocal = this; + ActorCollider_AllocCylinder(globalCtx, &thisLocal->collider); + func_8005C450(globalCtx, &thisLocal->collider, &this->actor, &D_80AF40E0); +} + +static void func_80AF259C(EnRu2* this, GlobalContext* globalCtx) { + s32 pad; + ColliderCylinderMain* collider = &this->collider; + Actor* thisx = &this->actor; + s32 pad2[2]; + + ActorCollider_Cylinder_Update(thisx, collider); + Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, collider); +} + +static void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx) { + ColliderCylinderMain* collider = &this->collider; + ActorCollider_FreeCylinder(globalCtx, collider); +} + +static void func_80AF2608(EnRu2* this) { + s32 pad[3]; + s16* unk_2A6 = &this->unk_2A6; + s16* unk_2A4 = &this->unk_2A4; + + if (!DECR(*unk_2A6)) { + *unk_2A6 = Math_Rand_S16Offset(0x3C, 0x3C); + } + + *unk_2A4 = *unk_2A6; + if (*unk_2A4 >= 3) { + *unk_2A4 = 0; + } +} + +s32 func_80AF2690(EnRu2* this) { + s32 params_shift = this->actor.params >> 8; + return params_shift & 0xFF; +} + +s32 func_80AF26A0(EnRu2* this) { + s16 params = this->actor.params; + return params & 0xFF; +} + +static void func_80AF26AC(EnRu2* this) { + this->action = 7; + this->drawConfig = 0; + this->unk_2B4 = 0; + this->unk_2B8 = 0; + this->actor.shape.unk_14 = 0; + this->unk_2B0 = 0.0f; +} + +static void func_80AF26D0(EnRu2* this, GlobalContext* globalCtx) { + s32 one; // Needed to match + if (globalCtx->csCtx.state == 0) { + if (D_80AF4118 != 0) { + if (this->actor.params == 2) { + func_80AF26AC(this); + } + D_80AF4118 = 0; + return; + } + } else { + one = 1; + if (D_80AF4118 == 0) { + D_80AF4118 = one; + } + } +} + +static void func_80AF2744(EnRu2* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 4); +} + +s32 EnRu2_FrameUpdateMatrix(EnRu2* this) { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +CsCmdActorAction* func_80AF27AC(GlobalContext* globalCtx, s32 actorActionIdx) { + if (globalCtx->csCtx.state != 0) { + return globalCtx->csCtx.actorActions[actorActionIdx]; + } + return NULL; +} + +s32 func_80AF27D0(EnRu2* this, GlobalContext* globalCtx, u16 arg2, s32 actorActionIdx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, actorActionIdx); + + if (csCmdActorAction != NULL && csCmdActorAction->action == arg2) { + return 1; + } + return 0; +} + +s32 func_80AF281C(EnRu2* this, GlobalContext* globalCtx, u16 arg2, s32 actorActionIdx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, actorActionIdx); + + if (csCmdActorAction != NULL && csCmdActorAction->action != arg2) { + return 1; + } + return 0; +} + +static void func_80AF2868(EnRu2* this, GlobalContext* globalCtx, u32 actorActionIdx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, actorActionIdx); + s16 newRotY; + Actor* thisx = &this->actor; + + if (csCmdActorAction != NULL) { + thisx->posRot.pos.x = csCmdActorAction->startPos.x; + thisx->posRot.pos.y = csCmdActorAction->startPos.y; + thisx->posRot.pos.z = csCmdActorAction->startPos.z; + newRotY = csCmdActorAction->rot.y; + thisx->shape.rot.y = newRotY; + thisx->posRot.rot.y = newRotY; + } +} + +static void func_80AF28E8(EnRu2* this, AnimationHeader* animation, u8 arg2, f32 transitionRate, s32 arg4) { + f32 frameCount = SkelAnime_GetFrameCount(&animation->genericHeader); + f32 playbackSpeed; + f32 unk0; + f32 fc; + + if (arg4 == 0) { + unk0 = 0.0f; + fc = frameCount; + playbackSpeed = 1.0f; + } else { + unk0 = frameCount; + fc = 0.0f; + playbackSpeed = -1.0f; + } + + SkelAnime_ChangeAnimation(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, transitionRate); +} + +static void func_80AF2978(EnRu2* this, GlobalContext* globalCtx) { + this->actor.shape.unk_08 += 83.333336f; +} + +static void func_80AF2994(EnRu2* this, GlobalContext* globalCtx) { + func_80AF28E8(this, &D_06000DE8, 0, 0.0f, 0); + this->actor.shape.unk_08 = -10000.0f; +} + +static void func_80AF29DC(EnRu2* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + f32 posX = thisx->posRot.pos.x; + f32 posY = thisx->posRot.pos.y; + f32 posZ = thisx->posRot.pos.z; + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); +} + +static void func_80AF2A38(EnRu2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 posX = player->actor.posRot.pos.x; + f32 posY = player->actor.posRot.pos.y + 50.0f; + f32 posZ = player->actor.posRot.pos.z; + + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, + 10); + Item_Give(globalCtx, ITEM_MEDALLION_WATER); +} + +static void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx) { + s32 pad[2]; + Player* player; + s16 temp; + + if (gSaveContext.chamber_cutscene_num == 2 && gSaveContext.scene_setup_index < 4) { + player = PLAYER; + this->action = 1; + globalCtx->csCtx.segment = &D_80AF411C; + gSaveContext.cutscene_trigger = 2; + Item_Give(globalCtx, ITEM_MEDALLION_WATER); + temp = this->actor.posRot.rot.y + 0x8000; + player->actor.shape.rot.y = temp; + player->actor.posRot.rot.y = temp; + } +} + +static void func_80AF2B44(EnRu2* this, GlobalContext* globalCtx) { + CutsceneContext* csCtx = &globalCtx->csCtx; + CsCmdActorAction* csCmdActorAction; + if (csCtx->state != 0) { + csCmdActorAction = csCtx->actorActions[3]; + if (csCmdActorAction != NULL && csCmdActorAction->action == 2) { + this->action = 2; + this->drawConfig = 1; + func_80AF29DC(this, globalCtx); + } + } +} + +static void func_80AF2B94(EnRu2* this) { + if (this->actor.shape.unk_08 >= 0.0f) { + this->action = 3; + this->actor.shape.unk_08 = 0.0f; + } +} + +static void func_80AF2BC0(EnRu2* this, GlobalContext* globalCtx) { + AnimationHeader* animation = &D_0600D3DC; + CsCmdActorAction* csCmdActorAction; + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.actorActions[3]; + if (csCmdActorAction != NULL && csCmdActorAction->action == 3) { + SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, + 0.0f); + this->action = 4; + } + } +} + +static void func_80AF2C54(EnRu2* this, UNK_TYPE arg1) { + if (arg1 != 0) { + this->action = 5; + } +} + +static void func_80AF2C68(EnRu2* this, GlobalContext* globalCtx) { + CsCmdActorAction* csCmdActorAction; + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.actorActions[6]; + if (csCmdActorAction != NULL && csCmdActorAction->action == 2) { + this->action = 6; + func_80AF2A38(this, globalCtx); + } + } +} + +static void func_80AF2CB4(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2AB4(this, globalCtx); +} + +static void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2B44(this, globalCtx); +} + +static void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2978(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2B94(this); +} + +static void func_80AF2D2C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2BC0(this, globalCtx); +} + +static void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx) { + UNK_TYPE something; + + func_80AF2744(this, globalCtx); + something = EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2C54(this, something); +} + +static void func_80AF2DAC(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2C68(this, globalCtx); +} + +static void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); +} + +static void func_80AF2E1C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF28E8(this, &D_060004CC, 2, 0.0f, 0); + this->action = 7; + this->actor.shape.unk_14 = 0; +} + +static void func_80AF2E64() { + func_800788CC(NA_SE_SY_WHITE_OUT_T); +} + +static void func_80AF2E84(EnRu2* this, GlobalContext* globalCtx) { + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, + kREG(19) + 24.0f + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 8); +} + +static void func_80AF2F04(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF27D0(this, globalCtx, 4, 3)) { + this->action = 8; + this->drawConfig = 2; + this->unk_2B4 = 0; + this->actor.shape.unk_14 = 0; + this->unk_2B0 = 0.0f; + func_80AF2E64(); + } +} + +static void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) { + f32* unk_2B0 = &this->unk_2B0; + s32 something; + + if (func_80AF27D0(this, globalCtx, 4, 3)) { + *unk_2B0 += 1.0f; + if (*unk_2B0 >= kREG(5) + 10.0f) { + this->action = 9; + this->drawConfig = 1; + *unk_2B0 = kREG(5) + 10.0f; + this->unk_2B4 = 0xFF; + this->actor.shape.unk_14 = 0xFF; + return; + } + } else { + *unk_2B0 -= 1.0f; + if (*unk_2B0 <= 0.0f) { + this->action = 7; + this->drawConfig = 0; + *unk_2B0 = 0.0f; + this->unk_2B4 = 0; + this->actor.shape.unk_14 = 0; + return; + } + } + something = (*unk_2B0 / (kREG(5) + 10.0f)) * 255.0f; + this->unk_2B4 = something; + this->actor.shape.unk_14 = something; +} + +static void func_80AF30AC(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF281C(this, globalCtx, 4, 3)) { + this->action = 8; + this->drawConfig = 2; + this->unk_2B0 = kREG(5) + 10.0f; + this->unk_2B4 = 0xFF; + if (this->unk_2B8 == 0) { + func_80AF2E84(this, globalCtx); + this->unk_2B8 = 1; + } + this->actor.shape.unk_14 = 0xFF; + } +} + +static void func_80AF3144(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2F04(this, globalCtx); + func_80AF26D0(this, globalCtx); +} + +static void func_80AF3174(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2F58(this, globalCtx); + func_80AF26D0(this, globalCtx); +} + +static void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF30AC(this, globalCtx); + func_80AF26D0(this, globalCtx); +} + +static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 temp = this->unk_2A4; + UNK_PTR addr = D_80AF410C[temp]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* gfxArr[4]; + + func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264); + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_2B4); + gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]); + + gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, + skelAnime->dListCount, NULL, NULL, NULL, gfxCtx->polyXlu.p); + + func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); +} + +static void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) { + func_80AF28E8(this, &D_0600E630, 0, 0.0f, 0); + this->action = 10; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +static void func_80AF33E0(EnRu2* this) { + f32* unk_2B0 = &this->unk_2B0; + f32 temp_f0; + s32 temp_f18; + + *unk_2B0 += 1.0f; + + temp_f0 = kREG(17) + 10.0f; + if (temp_f0 <= *unk_2B0) { + this->unk_2B4 = 0xFF; + this->actor.shape.unk_14 = 0xFF; + } else { + temp_f18 = (*unk_2B0 / temp_f0) * 255.0f; + this->unk_2B4 = temp_f18; + this->actor.shape.unk_14 = temp_f18; + } +} + +static void func_80AF346C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2868(this, globalCtx, 3); + this->action = 11; + this->drawConfig = 2; +} + +static void func_80AF34A4(EnRu2* this) { + if (this->unk_2B0 >= kREG(17) + 10.0f) { + this->action = 12; + this->drawConfig = 1; + } +} + +static void func_80AF34F0(EnRu2* this) { + func_80AF28E8(this, &D_0600DCAC, 2, 0.0f, 0); + this->action = 13; +} + +static void func_80AF3530(EnRu2* this, UNK_TYPE arg1) { + if (arg1 != 0) { + func_80AF28E8(this, &D_0600F03C, 0, 0.0f, 0); + } +} + +static void func_80AF3564(EnRu2* this, GlobalContext* globalCtx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, 3); + s32 action; + s32 unk_2BC; + + if (csCmdActorAction != NULL) { + action = csCmdActorAction->action; + unk_2BC = this->unk_2BC; + if (action != unk_2BC) { + switch (action) { + case 7: + func_80AF346C(this, globalCtx); + break; + case 8: + func_80AF34F0(this); + break; + default: + osSyncPrintf("En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + break; + } + this->unk_2BC = action; + } + } +} + +static void func_80AF3604(EnRu2* this, GlobalContext* globalCtx) { + func_80AF3564(this, globalCtx); +} + +static void func_80AF3624(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF33E0(this); + func_80AF34A4(this); +} + +static void func_80AF366C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF3564(this, globalCtx); +} + +static void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx) { + UNK_TYPE something; + + func_80AF2744(this, globalCtx); + something = EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF3530(this, something); +} + +static void func_80AF36EC(EnRu2* this, GlobalContext* globalCtx) { + Flags_SetSwitch(globalCtx, func_80AF2690(this)); +} + +s32 func_80AF3718(EnRu2* this, GlobalContext* globalCtx) { + return Flags_GetSwitch(globalCtx, func_80AF2690(this)); +} + +static void func_80AF3744(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF3718(this, globalCtx)) { + Actor_Kill(&this->actor); + } else { + func_80AF28E8(this, &D_06000DE8, 0, 0.0f, 0); + this->action = 14; + this->drawConfig = 1; + } +} + +static void func_80AF37AC() { + func_800F5C64(0x51); +} + +static void func_80AF37CC(EnRu2* this) { + f32 funcFloat; + this->unk_2C0 += 1; + funcFloat = func_8006F9BC((kREG(2) + 0x96) & 0xFFFF, 0, this->unk_2C0, 8, 0); + this->actor.posRot.pos.y = this->actor.initPosRot.pos.y + (300.0f * funcFloat); +} + +s32 func_80AF383C(EnRu2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 thisPosX = this->actor.posRot.pos.x; + f32 playerPosX = player->actor.posRot.pos.x; + if (playerPosX - thisPosX >= -202.0f) { + return 1; + } + return 0; +} + +static void func_80AF3878(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF383C(this, globalCtx) && !func_800BFC84(globalCtx)) { + this->action = 16; + func_800800F8(globalCtx, 0xC3A, -0x63, &this->actor, 0); + } +} + +static void func_80AF38D0(EnRu2* this, GlobalContext* globalCtx) { + this->action = 16; + func_800800F8(globalCtx, 0xC3A, -0x63, &this->actor, 0); +} + +static void func_80AF390C(EnRu2* this, GlobalContext* globalCtx) { + f32* unk_2C4 = &this->unk_2C4; + *unk_2C4 += 1.0f; + if (*unk_2C4 == kREG(6) + 40.0f) { + func_80AF37AC(); + } else if (*unk_2C4 > kREG(4) + 50.0f) { + this->actor.textId = 0x403E; + func_8010B680(globalCtx, this->actor.textId, 0); + this->action = 17; + } +} + +static void func_80AF39DC(EnRu2* this, GlobalContext* globalCtx) { + s32 pad; + MessageContext* msgCtx; + s32 pad2; + u8 dialogState; + Player* player; + s32 pad3; + + msgCtx = &globalCtx->msgCtx; + dialogState = func_8010BDBC(msgCtx); + + if (dialogState == 3) { + if (this->unk_2C3 != 3) { + osSyncPrintf("おれが小松だ！ \n"); + this->unk_2C2++; + if (this->unk_2C2 % 6 == 3) { + player = PLAYER; + osSyncPrintf("うおりゃー！ \n"); + func_8005B1A4(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]); + player->actor.posRot.pos.x = 820.0f; + player->actor.posRot.pos.y = 0.0f; + player->actor.posRot.pos.z = 180.0f; + } + } + } + + this->unk_2C3 = dialogState; + if (func_8010BDBC(msgCtx) == 2) { + this->action = 18; + func_8005B1A4(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]); + } +} + +static void func_80AF3ADC(EnRu2* this, GlobalContext* globalCtx) { + this->unk_2C4 += 1.0f; + if (this->unk_2C4 > kREG(5) + 100.0f) { + func_80AF28E8(this, &D_0600F8B8, 0, -12.0f, 0); + this->action = 0x13; + func_80AF36EC(this, globalCtx); + } +} + +static void func_80AF3B74(EnRu2* this, GlobalContext* globalCtx) { + if (this->unk_2C0 > (((u16)(kREG(3) + 0x28)) + ((u16)(kREG(2) + 0x96)) & 0xFFFF)) { + Actor_Kill(&this->actor); + } +} + +static void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx) { + func_80AF3878(this, globalCtx); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF259C(this, globalCtx); +} + +static void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + func_80AF259C(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF38D0(this, globalCtx); +} + +static void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF390C(this, globalCtx); +} + +static void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF39DC(this, globalCtx); +} + +static void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF3ADC(this, globalCtx); +} + +static void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx) { + func_80AF37CC(this); + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF3B74(this, globalCtx); +} + +static void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx) { + if (this->action < 0 || this->action >= 20 || D_80AF50BC[this->action] == 0) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + D_80AF50BC[this->action](this, globalCtx); +} + +static void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx) { + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + func_80AF2550(this, globalCtx); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600C700, NULL, &this->unk_190, &this->unk_21A, 0x17); + + switch (func_80AF26A0(this)) { + case 2: + func_80AF2E1C(this, globalCtx); + break; + case 3: + func_80AF3394(this, globalCtx); + break; + case 4: + func_80AF3744(this, globalCtx); + break; + default: + func_80AF2994(this, globalCtx); + break; + } + + this->unk_2C2 = 0; + this->unk_2C3 = 3; +} + +static void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx) { +} + +static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 temp = this->unk_2A4; + UNK_PTR addr = D_80AF410C[temp]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* gfxArr[4]; + + func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 642); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF); + gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + + SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, + &this->actor); + func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663); +} + +static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) { + if (this->drawConfig < 0 || this->drawConfig >= 3 || D_80AF510C[this->drawConfig] == 0) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + D_80AF510C[this->drawConfig](this, globalCtx); +} diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h index 36f2dbf86f..441e6ccc51 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h @@ -6,7 +6,24 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C8]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ s8 unk_190; // likely a struct + /* 0x0191 */ char unk_191[0x89]; + /* 0x021A */ s8 unk_21A; // another of the same struct + /* 0x021B */ char unk_21B[0x89]; + /* 0x02A4 */ s16 unk_2A4; + /* 0x02A6 */ s16 unk_2A6; + /* 0x02A8 */ s32 action; + /* 0x02AC */ s32 drawConfig; + /* 0x02B0 */ f32 unk_2B0; + /* 0x02B4 */ u32 unk_2B4; + /* 0x02B8 */ s32 unk_2B8; + /* 0x02BC */ s32 unk_2BC; + /* 0x02C0 */ u16 unk_2C0; + /* 0x02C2 */ u8 unk_2C2; + /* 0x02C3 */ u8 unk_2C3; + /* 0x02C4 */ f32 unk_2C4; + /* 0x02C8 */ ColliderCylinderMain collider; } EnRu2; // size = 0x0314 extern const ActorInit En_Ru2_InitVars; diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c new file mode 100644 index 0000000000..8f8d3cb13f --- /dev/null +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c @@ -0,0 +1,116 @@ +#include "z_en_ru2.h" + +static u32 D_80AF411C[] = { + 0x00000023, 0x00000D0A, 0x00000020, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, + 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x00000005, + 0x00010000, 0x033D0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x0002033D, 0x033E0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, + 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0004033E, 0x03820000, 0x00000000, + 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00020382, 0x03B40000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000052, 0x00000000, + 0x00000000, 0xC02B851F, 0x00000000, 0x000303B4, 0x0D0A0000, 0x00000000, 0x00000000, 0x00000052, 0x00000000, + 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000005, 0x000D0000, + 0x00F00000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x000500F0, 0x02080000, 0x40000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, + 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030208, 0x02260000, 0x40000000, 0x00000000, + 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050226, + 0x03210000, 0x40000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00130321, 0x07A40000, 0xC0000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, + 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000031, 0x00000001, 0x00010000, 0x0BB80000, + 0x00000000, 0x00000000, 0xFFFFFFF0, 0xFFFFFF87, 0x00000000, 0xFFFFFFF0, 0xFFFFFF87, 0x00000000, 0x00000000, + 0x00000000, 0x00000004, 0x00000005, 0x00050000, 0x01800000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, + 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x00060180, 0x01C60000, 0x00000000, + 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, + 0x000501C6, 0x022A0000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, + 0x00000000, 0x00000000, 0x00000000, 0x0006022A, 0x02700000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, + 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x00050270, 0x0BB90000, 0x00000000, + 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, + 0x00000027, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFE, 0x00000000, + 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000000, 0x0000002A, 0x00000003, 0x00010000, 0x00920000, + 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00020092, 0x02F20000, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x000000C3, 0x00000006, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000302F2, 0x0A440000, 0x00000000, 0x000000C3, 0x00000006, + 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, + 0x0001032A, 0x03370337, 0x0000002D, 0x00000001, 0x00050339, 0x03570357, 0x0000002D, 0x00000001, 0x00010442, + 0x04610461, 0x00000001, 0x00010000, 0x012D0000, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00470000, 0x00000000, + 0x432F65F8, 0xFD97001E, 0x00471FBC, 0x00000000, 0x432F65F8, 0xFD97001E, 0x0047D5E0, 0x00000000, 0x432F65F8, + 0xFD97001E, 0x00470000, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00471F98, 0x00000000, 0x432F65F8, 0xFD97001E, + 0x00470000, 0x00000000, 0x4311CC7C, 0xFE38006B, 0x00380000, 0x00000000, 0x42726667, 0xFFB40036, 0x00470164, + 0x00000000, 0x42726667, 0x00740036, 0x00602100, 0x00000000, 0x42726667, 0x00EC000B, 0x00400049, 0x00000000, + 0x42726667, 0x00EC000B, 0x0040204C, 0x00000000, 0x42726667, 0x00EC000B, 0x0040E990, 0xFF000000, 0x42726667, + 0x00EC000B, 0x00400000, 0x00000001, 0x00010107, 0x05CC0000, 0x00000000, 0x4228E87B, 0x00A10035, 0x001A0000, + 0x00000000, 0x4228E87B, 0x00A10035, 0x001A1FBC, 0x00000000, 0x4228E87B, 0x00A10035, 0x001AD5E0, 0x00000000, + 0x4228E87B, 0x00820009, 0x00600000, 0x00000000, 0x4228E87B, 0x00820009, 0x00601F98, 0x00000000, 0x4228E87B, + 0x00820009, 0x00600000, 0x00000000, 0x4228E87B, 0x00820009, 0x00600000, 0xFF000000, 0x4228E87B, 0x00820009, + 0x00600164, 0x00000001, 0x0001017F, 0x05C20000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, 0x00000000, + 0x428C743C, 0x00CF002D, 0x00221FBC, 0x00000000, 0x428C743C, 0x00CF002D, 0x0022D5E0, 0x00000000, 0x428C743C, + 0x00CF002D, 0x00220000, 0xFF000000, 0x428C743C, 0x00CF002D, 0x00221F98, 0x00000001, 0x000101C5, 0x06080000, + 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00460000, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00461FBC, 0x00000000, + 0x42341BB1, 0xFFC6005A, 0x0046D5E0, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00460000, 0xFF000000, 0x42341BB1, + 0xFFC6005A, 0x00461F98, 0x00000001, 0x00010229, 0x066C0000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, + 0x00000000, 0x428C743C, 0x00CF002D, 0x00221FBC, 0x00000000, 0x428C743C, 0x00CF002D, 0x0022D5E0, 0x00000000, + 0x428C743C, 0x00CF002D, 0x00220000, 0xFF000000, 0x428C743C, 0x00CF002D, 0x00221F98, 0x00000001, 0x0001026F, + 0x06B20000, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00000000, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00001FBC, + 0x00000000, 0x4271B55A, 0x00A1003B, 0x0000D5E0, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00000000, 0xFF000000, + 0x4271B55A, 0x00A1003B, 0x00001F98, 0x00000001, 0x000102B5, 0x06F80000, 0x00000000, 0x4271B55A, 0x00970052, + 0x00230000, 0x00000000, 0x4271B55A, 0x00970052, 0x00231FBC, 0x00000000, 0x4271B55A, 0x00970052, 0x0023D5E0, + 0x00000000, 0x4271B55A, 0x00970052, 0x00230000, 0xFF000000, 0x4271B55A, 0x00970052, 0x00231F98, 0x00000001, + 0x000102FB, 0x03B00000, 0x00000000, 0x4271B55A, 0x00E60007, 0x00180000, 0x00000000, 0x4271B55A, 0x00E60007, + 0x00181FBC, 0x00000000, 0x4271B55A, 0x00E60007, 0x0018D5E0, 0x00000000, 0x4271B55A, 0x00CF003E, 0x000F0000, + 0x00000000, 0x428CDAA2, 0x00E600F0, 0x00181F98, 0x00000000, 0x428CDAA2, 0x00E600F0, 0x00180000, 0x00000000, + 0x428CDAA2, 0x00E600F0, 0x00180000, 0xFF000000, 0x428CDAA2, 0x00E600F0, 0x00180164, 0x00000001, 0x00010337, + 0x048D0000, 0x00000000, 0x42700000, 0x000D0356, 0x00020000, 0x00000000, 0x42700000, 0x00090355, 0x00051FBC, + 0x00000000, 0x42700000, 0xFFFD0355, 0x0005D5E0, 0x00000000, 0x42700000, 0xFFF70355, 0xFFFA0000, 0x00000000, + 0x42700000, 0xFFFE0354, 0xFFEF1F98, 0x00000000, 0x42700000, 0x00090354, 0xFFEF0000, 0x00000000, 0x42700000, + 0x00100354, 0xFFFA0000, 0x00000000, 0x42700000, 0x00090354, 0x00050164, 0xFF000000, 0x42700000, 0xFFFD0353, + 0x00052100, 0x00000005, 0x00010383, 0x08200000, 0x00000000, 0x4289332C, 0x00000021, 0xFFE50000, 0x00000000, + 0x4289332C, 0x00000021, 0xFFE51FBC, 0x00000000, 0x4289332C, 0x00000044, 0xFFE6D5E0, 0x00000000, 0x4289332C, + 0x00000067, 0xFFE60000, 0x00000000, 0x4289332C, 0x00000067, 0xFFE61F98, 0x00000000, 0x4289332C, 0x00000067, + 0xFFE60000, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60000, 0xFF000000, 0x4289332C, 0x00000067, 0xFFE60164, + 0x00000002, 0x00010000, 0x014A0000, 0x001E0014, 0x432F65F8, 0xFD77FFB5, 0x00650000, 0x00E20014, 0x432F65F8, + 0xFD74FFB5, 0x00621FBC, 0x001E0014, 0x432F65F8, 0xFD6EFFB5, 0x0057D5E0, 0x00E20014, 0x432F65F8, 0xFD5A007F, + 0x00470000, 0x00000014, 0x432F65F8, 0xFD290000, 0x00471F98, 0x00000014, 0x4311CC7C, 0xFDFF0000, 0x002B0000, + 0x0000001E, 0x42726667, 0xFEA30059, 0x002F0000, 0x0000001E, 0x42726667, 0x0006003D, 0x00010164, 0x0000001E, + 0x42726667, 0x00210042, 0x001C2100, 0x0000001E, 0x42726667, 0x009E002A, 0x00010049, 0x0000001E, 0x42726667, + 0x009E002A, 0x0001204C, 0x0000001E, 0x42726667, 0x009E002A, 0x0001E990, 0xFF00001E, 0x42726667, 0x009E002A, + 0x00010000, 0x00000002, 0x00010107, 0x05E90000, 0x0000001E, 0x4228E87B, 0x0142003E, 0xFF860000, 0x0000001E, + 0x4228E87B, 0x0142003E, 0xFF861FBC, 0x00000032, 0x4228E87B, 0x0142003E, 0xFF86D5E0, 0x00000032, 0x4228E87B, + 0x00E8003F, 0xFFAD0000, 0x0000001E, 0x4228E87B, 0x00E8003F, 0xFFAD1F98, 0x000003E8, 0x4228E87B, 0x00E8003F, + 0xFFAD0000, 0x0000001E, 0x4228E87B, 0x00E8003F, 0xFFAD0000, 0xFF00001E, 0x4228E87B, 0x00E8003F, 0xFFAD0164, + 0x00000002, 0x0001017F, 0x05DF0000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0x0000001E, 0x428C743C, + 0x0033003E, 0xFF971FBC, 0x000003E8, 0x428C743C, 0x0033003E, 0xFF97D5E0, 0x0000001E, 0x428C743C, 0x0033003E, + 0xFF970000, 0xFF00001E, 0x428C743C, 0x0033003E, 0xFF971F98, 0x00000002, 0x000101C5, 0x06250000, 0x0000001E, + 0x42341BB1, 0x00660016, 0xFFE10000, 0x0000001E, 0x42341BB1, 0x00660016, 0xFFE11FBC, 0x000003E8, 0x42341BB1, + 0x00660016, 0xFFE1D5E0, 0x0000001E, 0x42341BB1, 0x00660016, 0xFFE10000, 0xFF00001E, 0x42341BB1, 0x00660016, + 0xFFE11F98, 0x00000002, 0x00010229, 0x06890000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0x0000001E, + 0x428C743C, 0x0033003E, 0xFF971FBC, 0x000003E8, 0x428C743C, 0x0033003E, 0xFF97D5E0, 0x0000001E, 0x428C743C, + 0x0033003E, 0xFF970000, 0xFF00001E, 0x428C743C, 0x0033003E, 0xFF971F98, 0x00000002, 0x0001026F, 0x06CF0000, + 0x0000001E, 0x4271B55A, 0x015B0016, 0x00000000, 0x0000001E, 0x4271B55A, 0x015B0016, 0x00001FBC, 0x000003E8, + 0x4271B55A, 0x015B0016, 0x0000D5E0, 0x0000001E, 0x4271B55A, 0x015B0016, 0x00000000, 0xFF00001E, 0x4271B55A, + 0x015B0016, 0x00001F98, 0x00000002, 0x000102B5, 0x07150000, 0x0000001E, 0x4271B55A, 0x0102FFE2, 0xFFCA0000, + 0x0000001E, 0x4271B55A, 0x0102FFE2, 0xFFCA1FBC, 0x000003E8, 0x4271B55A, 0x0102FFE2, 0xFFCAD5E0, 0x0000001E, + 0x4271B55A, 0x0102FFE2, 0xFFCA0000, 0xFF00001E, 0x4271B55A, 0x0102FFE2, 0xFFCA1F98, 0x00000002, 0x000102FB, + 0x03CD0000, 0x0000001E, 0x4271B55A, 0x00600069, 0xFFE30000, 0x00000028, 0x4271B55A, 0x00600069, 0xFFE31FBC, + 0x0000000F, 0x4271B55A, 0x00600069, 0xFFE3D5E0, 0x0000000F, 0x42701BC0, 0x006E00C4, 0xFFE60000, 0x00000014, + 0x428CDAA2, 0x00B9018F, 0x00061F98, 0x0000001E, 0x428CDAA2, 0x00B9018F, 0x00060000, 0x0000001E, 0x428CDAA2, + 0x00B9018F, 0x00060000, 0xFF00001E, 0x428CDAA2, 0x00B9018F, 0x00060164, 0x00000002, 0x00010337, 0x04BE0000, + 0x00000032, 0x42700000, 0x00030006, 0xFFFA0000, 0x00000028, 0x42700000, 0x00030006, 0xFFFA1FBC, 0x0000001E, + 0x424BFFF7, 0x00030006, 0xFFFAD5E0, 0x00000014, 0x41A4CC7E, 0x00030006, 0xFFFA0000, 0x00000033, 0x412CCC23, + 0x00030006, 0xFFFA1F98, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA0000, 0x00000032, 0x412665BD, 0x00030006, + 0xFFFA0000, 0x00000032, 0x4123328A, 0x00030006, 0xFFFA0164, 0xFF000032, 0x412FFF56, 0x00030006, 0xFFFA2100, + 0x00000006, 0x00010383, 0x083D0000, 0x0000001E, 0x4289332C, 0x00000064, 0x00050000, 0x0000001E, 0x4289332C, + 0x00000065, 0x00061FBC, 0x0000001E, 0x4289332C, 0x00010063, 0x0029D5E0, 0x0000001E, 0x4289332C, 0x0000002A, + 0x00100000, 0x0000001E, 0x4289332C, 0x0000002A, 0x00101F98, 0x000003E8, 0x4289332C, 0x0000002A, 0x00100000, + 0x0000001E, 0x4289332C, 0x0000002A, 0x00100000, 0xFF00001E, 0x4289332C, 0x0000002A, 0x00100164, 0x0000003E, + 0x00000001, 0x00040000, 0x0BB8C10F, 0x00000000, 0x0000004D, 0x00000050, 0xFFFFFFFE, 0x00000000, 0x00000050, + 0x00000000, 0xBCD242E7, 0x00000000, 0x3CD242E7, 0x00000013, 0x0000000E, 0xFFFF0000, 0x018AFFFF, 0xFFFFFFFF, + 0x4041018A, 0x01BC0000, 0x00000000, 0xFFFF01BC, 0x01D0FFFF, 0xFFFFFFFF, 0x404601D0, 0x021F0000, 0x00000000, + 0xFFFF021F, 0x0234FFFF, 0xFFFFFFFF, 0x40490234, 0x02650000, 0x00000000, 0xFFFF0265, 0x027AFFFF, 0xFFFFFFFF, + 0x4047027A, 0x02AC0000, 0x00000000, 0xFFFF02AC, 0x02C0FFFF, 0xFFFFFFFF, 0x404A02C0, 0x02EE0000, 0x00000000, + 0xFFFF02EE, 0x043DFFFF, 0xFFFFFFFF, 0x003D043D, 0x04420000, 0x00000000, 0xFFFF0442, 0x047EFFFF, 0xFFFFFFFF, + 0x4042047E, 0x04880000, 0x00000000, 0x000003E8, 0x00000001, 0x001504A6, 0x04BD04BD, 0x00000056, 0x00000001, + 0x00440384, 0x03850000, 0x00000000, 0x00000000, 0xFFFFFFC7, 0x00000034, 0x00000000, 0xFFFFFFC7, 0x00000034, + 0x00000000, 0x00000000, 0x00000000, 0x0000007C, 0x00000001, 0x00040320, 0x03520000, 0x00000000, 0x00000000, + 0xFFFFFFC6, 0x00000030, 0x00000000, 0xFFFFFFC6, 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, + 0x00000000, +}; diff --git a/undefined_syms.txt b/undefined_syms.txt index dc9c125878..bf16c85954 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -411,6 +411,19 @@ D_060006D0 = 0x060006D0; D_06000000 = 0x06000000; D_06000350 = 0x06000350; +// z_en_ru2 +D_060004CC = 0x060004CC; +D_06000F20 = 0x06000F20; +D_060022E0 = 0x060022E0; +D_06002AE0 = 0x06002AE0; +D_0600C700 = 0x0600C700; +D_0600D3DC = 0x0600D3DC; +D_0600DCAC = 0x0600DCAC; +D_06000DE8 = 0x06000DE8; +D_0600E630 = 0x0600E630; +D_0600F03C = 0x0600F03C; +D_0600F8B8 = 0x0600F8B8; + // z_bg_mjin D_06000140 = 0x06000140; D_06000330 = 0x06000330;