From 75f570f4ac4e760ef1431ddc41e50a95ed24d099 Mon Sep 17 00:00:00 2001 From: KrimtonZ Date: Tue, 31 Mar 2020 18:29:09 -0500 Subject: [PATCH] skelanime wip --- .../code/z_skelanime/func_800A5408.s | 10 - .../actors/ovl_Boss_Fd/func_808CB6A8.s | 18 +- .../actors/ovl_Boss_Fd2/func_808D2BD0.s | 66 +-- .../actors/ovl_Boss_Fd2/func_808D3A80.s | 18 +- .../actors/ovl_Boss_Fd2/func_808D3D38.s | 18 +- .../actors/ovl_Boss_Fd2/func_808D3D98.s | 62 +-- .../actors/ovl_Boss_Ganondrof/func_80912C94.s | 24 +- .../actors/ovl_Boss_Sst/func_8092FF94.s | 20 +- .../actors/ovl_Boss_Sst/func_80930238.s | 18 +- .../overlays/actors/ovl_En_Ani/EnAni_Init.s | 2 +- .../actors/ovl_En_Arrow/func_809B3CEC.s | 48 +-- .../actors/ovl_En_Arrow/func_809B3FDC.s | 336 ++++++++-------- .../actors/ovl_En_Bili/func_809BFAE8.s | 12 +- .../actors/ovl_En_Brob/func_809CAE44.s | 20 +- .../actors/ovl_En_Dekubaba/func_809E5FBC.s | 12 +- .../actors/ovl_En_Dekunuts/func_809E97B8.s | 12 +- .../actors/ovl_En_Dekunuts/func_809E9B48.s | 14 +- .../overlays/actors/ovl_En_Dh/func_809EB624.s | 126 +++--- .../actors/ovl_En_Dodongo/func_809F8B2C.s | 14 +- .../actors/ovl_En_Eiyer/func_80A003DC.s | 28 +- .../actors/ovl_En_Floormas/func_80A17780.s | 12 +- .../actors/ovl_En_Floormas/func_80A17894.s | 12 +- .../actors/ovl_En_Floormas/func_80A1817C.s | 16 +- .../actors/ovl_En_Floormas/func_80A18310.s | 12 +- .../actors/ovl_En_Floormas/func_80A198EC.s | 148 +++---- .../overlays/actors/ovl_En_Ge1/EnGe1_Init.s | 2 +- .../actors/ovl_En_Ge1/func_80A323B0.s | 20 +- .../actors/ovl_En_GeldB/func_80A37670.s | 18 +- .../actors/ovl_En_Hintnuts/func_80A5751C.s | 12 +- .../actors/ovl_En_Horse/EnHorse_Init.s | 312 +++++++-------- .../actors/ovl_En_Horse/func_80A5D748.s | 14 +- .../actors/ovl_En_Horse/func_80A5DB0C.s | 14 +- .../actors/ovl_En_Horse/func_80A5DD58.s | 14 +- .../actors/ovl_En_Horse/func_80A5DDB0.s | 28 +- .../actors/ovl_En_Horse/func_80A5F890.s | 212 +++++----- .../ovl_En_Horse_Ganon/EnHorseGanon_Init.s | 50 +-- .../EnHorseLinkChild_Init.s | 84 ++-- .../ovl_En_Horse_Link_Child/func_80A6988C.s | 26 +- .../ovl_En_Horse_Normal/EnHorseNormal_Init.s | 272 ++++++------- .../ovl_En_Horse_Normal/func_80A6BBAC.s | 18 +- .../ovl_En_Horse_Zelda/EnHorseZelda_Init.s | 50 +-- .../actors/ovl_En_Horse_Zelda/func_80A6DC7C.s | 16 +- .../overlays/actors/ovl_En_Js/EnJs_Init.s | 2 +- .../overlays/actors/ovl_En_Mb/func_80AA6CC0.s | 18 +- .../overlays/actors/ovl_En_Mb/func_80AA6D20.s | 18 +- .../overlays/actors/ovl_En_Mb/func_80AA6E1C.s | 18 +- .../overlays/actors/ovl_En_Mb/func_80AA8378.s | 36 +- .../actors/ovl_En_Okuta/func_80AC0AB4.s | 20 +- .../actors/ovl_En_Okuta/func_80AC0B24.s | 12 +- .../actors/ovl_En_Okuta/func_80AC0BC0.s | 46 +-- .../actors/ovl_En_Peehat/func_80AD0B3C.s | 14 +- .../actors/ovl_En_Peehat/func_80AD0D3C.s | 14 +- .../actors/ovl_En_Po_Field/func_80AD3E2C.s | 24 +- .../actors/ovl_En_Po_Sisters/func_80AD9D44.s | 32 +- .../actors/ovl_En_Poh/func_80ADE28C.s | 32 +- .../actors/ovl_En_Poh/func_80ADE4C8.s | 12 +- .../overlays/actors/ovl_En_Rd/func_80AE33F0.s | 14 +- .../actors/ovl_En_Shopnuts/func_80AFA930.s | 12 +- .../actors/ovl_En_Skj/func_80AFF5F0.s | 14 +- .../actors/ovl_En_Skj/func_80AFFFBC.s | 18 +- .../overlays/actors/ovl_En_Ta/EnTa_Init.s | 16 +- .../overlays/actors/ovl_En_Ta/func_80B14570.s | 22 +- .../overlays/actors/ovl_En_Ta/func_80B14B6C.s | 26 +- .../overlays/actors/ovl_En_Ta/func_80B167C0.s | 20 +- .../overlays/actors/ovl_En_Ta/func_80B167FC.s | 22 +- .../overlays/actors/ovl_En_Ta/func_80B16854.s | 42 +- .../actors/ovl_En_Test/func_80861418.s | 18 +- .../actors/ovl_En_Test/func_808615A4.s | 14 +- .../actors/ovl_En_Test/func_8086181C.s | 20 +- .../actors/ovl_En_Test/func_8086194C.s | 22 +- .../actors/ovl_En_Test/func_80861B94.s | 20 +- .../actors/ovl_En_Test/func_80861C40.s | 50 +-- .../actors/ovl_En_Test/func_80861D50.s | 18 +- .../actors/ovl_En_Test/func_80862154.s | 20 +- .../actors/ovl_En_Test/func_80862398.s | 20 +- .../actors/ovl_En_Test/func_80862FA8.s | 34 +- .../actors/ovl_En_Test/func_808630F0.s | 34 +- .../actors/ovl_En_Tite/func_80B18E08.s | 18 +- .../actors/ovl_En_Tite/func_80B18E7C.s | 2 +- .../overlays/actors/ovl_En_Tr/EnTr_Init.s | 4 +- .../actors/ovl_En_Vali/func_80B26BBC.s | 12 +- .../overlays/actors/ovl_En_Wf/func_80B35540.s | 14 +- .../overlays/actors/ovl_En_Zf/func_80B4779C.s | 28 +- .../overlays/actors/ovl_En_Zf/func_80B47C64.s | 28 +- .../actors/ovl_player_actor/func_80832264.s | 8 +- .../actors/ovl_player_actor/func_80832284.s | 8 +- .../actors/ovl_player_actor/func_808322A4.s | 10 +- .../actors/ovl_player_actor/func_808322D0.s | 10 +- .../actors/ovl_player_actor/func_80832FFC.s | 24 +- .../actors/ovl_player_actor/func_808330AC.s | 24 +- .../actors/ovl_player_actor/func_8083328C.s | 12 +- .../actors/ovl_player_actor/func_80834894.s | 20 +- .../actors/ovl_player_actor/func_80834C74.s | 48 +-- .../actors/ovl_player_actor/func_80834D2C.s | 64 +-- .../actors/ovl_player_actor/func_808351D4.s | 136 +++---- .../actors/ovl_player_actor/func_808353D8.s | 110 ++--- .../actors/ovl_player_actor/func_80835688.s | 28 +- .../actors/ovl_player_actor/func_808356E8.s | 54 +-- .../actors/ovl_player_actor/func_80835884.s | 34 +- .../actors/ovl_player_actor/func_808358F0.s | 2 +- .../actors/ovl_player_actor/func_80835B60.s | 36 +- .../actors/ovl_player_actor/func_808382DC.s | 374 ++++++++--------- .../actors/ovl_player_actor/func_80838A14.s | 220 +++++----- .../actors/ovl_player_actor/func_8083A9B8.s | 24 +- .../actors/ovl_player_actor/func_8083AF44.s | 44 +- .../actors/ovl_player_actor/func_8083BC04.s | 32 +- .../actors/ovl_player_actor/func_8083CD00.s | 20 +- .../actors/ovl_player_actor/func_8083F070.s | 24 +- .../actors/ovl_player_actor/func_8084CC98.s | 2 +- .../actors/ovl_player_actor/func_808507F4.s | 156 ++++---- baserom.z64.txt | 378 ++++++++++++++++++ include/functions.h | 14 +- src/code/z_skelanime.c | 143 ++++--- src/overlays/actors/ovl_En_Ds/z_en_ds.c | 2 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 6 +- 115 files changed, 2798 insertions(+), 2389 deletions(-) delete mode 100644 asm/non_matchings/code/z_skelanime/func_800A5408.s create mode 100644 baserom.z64.txt diff --git a/asm/non_matchings/code/z_skelanime/func_800A5408.s b/asm/non_matchings/code/z_skelanime/func_800A5408.s deleted file mode 100644 index dbec4d43e7..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5408.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800A5408 -/* B1C5A8 800A5408 C486001C */ lwc1 $f6, 0x1c($a0) -/* B1C5AC 800A540C C480000C */ lwc1 $f0, 0xc($a0) -/* B1C5B0 800A5410 C4840010 */ lwc1 $f4, 0x10($a0) -/* B1C5B4 800A5414 46003207 */ neg.s $f8, $f6 -/* B1C5B8 800A5418 E4800010 */ swc1 $f0, 0x10($a0) -/* B1C5BC 800A541C E488001C */ swc1 $f8, 0x1c($a0) -/* B1C5C0 800A5420 03E00008 */ jr $ra -/* B1C5C4 800A5424 E484000C */ swc1 $f4, 0xc($a0) - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s index e56c259540..52905ccd44 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s @@ -1,20 +1,20 @@ glabel func_808CB6A8 /* 008E8 808CB6A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 008EC 808CB6AC AFB00018 */ sw $s0, 0x0018($sp) -/* 008F0 808CB6B0 AFA50024 */ sw $a1, 0x0024($sp) +/* 008EC 808CB6AC AFB00018 */ sw $s0, 0x0018($sp) +/* 008F0 808CB6B0 AFA50024 */ sw $a1, 0x0024($sp) /* 008F4 808CB6B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008F8 808CB6B8 AFBF001C */ sw $ra, 0x001C($sp) +/* 008F8 808CB6B8 AFBF001C */ sw $ra, 0x001C($sp) /* 008FC 808CB6BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00900 808CB6C0 24A515E4 */ addiu $a1, $a1, 0x15E4 ## $a1 = 060115E4 -/* 00904 808CB6C4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00904 808CB6C4 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00908 808CB6C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0090C 808CB6CC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00910 808CB6D0 24A51524 */ addiu $a1, $a1, 0x1524 ## $a1 = 06011524 -/* 00914 808CB6D4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00914 808CB6D4 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00918 808CB6D8 26040190 */ addiu $a0, $s0, 0x0190 ## $a0 = 00000190 /* 0091C 808CB6DC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00920 808CB6E0 24A51464 */ addiu $a1, $a1, 0x1464 ## $a1 = 06011464 -/* 00924 808CB6E4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00924 808CB6E4 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00928 808CB6E8 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 /* 0092C 808CB6EC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00930 808CB6F0 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 @@ -22,10 +22,10 @@ glabel func_808CB6A8 /* 00938 808CB6F8 25CEB718 */ addiu $t6, $t6, %lo(func_808CB718) ## $t6 = 808CB718 /* 0093C 808CB6FC AE0E0218 */ sw $t6, 0x0218($s0) ## 00000218 /* 00940 808CB700 E60402AC */ swc1 $f4, 0x02AC($s0) ## 000002AC -/* 00944 808CB704 8FBF001C */ lw $ra, 0x001C($sp) -/* 00948 808CB708 8FB00018 */ lw $s0, 0x0018($sp) +/* 00944 808CB704 8FBF001C */ lw $ra, 0x001C($sp) +/* 00948 808CB708 8FB00018 */ lw $s0, 0x0018($sp) /* 0094C 808CB70C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00950 808CB710 03E00008 */ jr $ra +/* 00950 808CB710 03E00008 */ jr $ra /* 00954 808CB714 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s index 8e0d2a75f5..c33934690b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s @@ -1,18 +1,18 @@ glabel func_808D2BD0 /* 00560 808D2BD0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00564 808D2BD4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00568 808D2BD8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0056C 808D2BDC AFA5002C */ sw $a1, 0x002C($sp) +/* 00564 808D2BD4 AFBF001C */ sw $ra, 0x001C($sp) +/* 00568 808D2BD8 AFB00018 */ sw $s0, 0x0018($sp) +/* 0056C 808D2BDC AFA5002C */ sw $a1, 0x002C($sp) /* 00570 808D2BE0 8C8E0118 */ lw $t6, 0x0118($a0) ## 00000118 /* 00574 808D2BE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00578 808D2BE8 3C04808D */ lui $a0, %hi(D_808D62D0) ## $a0 = 808D0000 /* 0057C 808D2BEC 248462D0 */ addiu $a0, $a0, %lo(D_808D62D0) ## $a0 = 808D62D0 /* 00580 808D2BF0 0C00084C */ jal osSyncPrintf - -/* 00584 808D2BF4 AFAE0024 */ sw $t6, 0x0024($sp) + +/* 00584 808D2BF4 AFAE0024 */ sw $t6, 0x0024($sp) /* 00588 808D2BF8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0058C 808D2BFC 24A5C1D0 */ addiu $a1, $a1, 0xC1D0 ## $a1 = 0600C1D0 -/* 00590 808D2C00 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00590 808D2C00 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00594 808D2C04 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00598 808D2C08 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0059C 808D2C0C 3C0F808D */ lui $t7, %hi(func_808D2CE0) ## $t7 = 808D0000 @@ -21,59 +21,59 @@ glabel func_808D2BD0 /* 005A8 808D2C18 3C01808D */ lui $at, %hi(D_808D647C) ## $at = 808D0000 /* 005AC 808D2C1C E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 /* 005B0 808D2C20 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 005B4 808D2C24 C42C647C */ lwc1 $f12, %lo(D_808D647C)($at) -/* 005B8 808D2C28 4600018D */ trunc.w.s $f6, $f0 + +/* 005B4 808D2C24 C42C647C */ lwc1 $f12, %lo(D_808D647C)($at) +/* 005B8 808D2C28 4600018D */ trunc.w.s $f6, $f0 /* 005BC 808D2C2C 3C0B808D */ lui $t3, %hi(D_808D6124) ## $t3 = 808D0000 /* 005C0 808D2C30 256B6124 */ addiu $t3, $t3, %lo(D_808D6124) ## $t3 = 808D6124 /* 005C4 808D2C34 3C04808D */ lui $a0, %hi(D_808D62DC) ## $a0 = 808D0000 -/* 005C8 808D2C38 44193000 */ mfc1 $t9, $f6 +/* 005C8 808D2C38 44193000 */ mfc1 $t9, $f6 /* 005CC 808D2C3C 248462DC */ addiu $a0, $a0, %lo(D_808D62DC) ## $a0 = 808D62DC -/* 005D0 808D2C40 00194400 */ sll $t0, $t9, 16 -/* 005D4 808D2C44 00084C03 */ sra $t1, $t0, 16 -/* 005D8 808D2C48 00095080 */ sll $t2, $t1, 2 -/* 005DC 808D2C4C 01495023 */ subu $t2, $t2, $t1 -/* 005E0 808D2C50 000A5080 */ sll $t2, $t2, 2 -/* 005E4 808D2C54 014B1021 */ addu $v0, $t2, $t3 +/* 005D0 808D2C40 00194400 */ sll $t0, $t9, 16 +/* 005D4 808D2C44 00084C03 */ sra $t1, $t0, 16 +/* 005D8 808D2C48 00095080 */ sll $t2, $t1, 2 +/* 005DC 808D2C4C 01495023 */ subu $t2, $t2, $t1 +/* 005E0 808D2C50 000A5080 */ sll $t2, $t2, 2 +/* 005E4 808D2C54 014B1021 */ addu $v0, $t2, $t3 /* 005E8 808D2C58 C4480000 */ lwc1 $f8, 0x0000($v0) ## 00000000 /* 005EC 808D2C5C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 005F0 808D2C60 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 00000008 /* 005F4 808D2C64 A6000198 */ sh $zero, 0x0198($s0) ## 00000198 /* 005F8 808D2C68 0C00084C */ jal osSyncPrintf - + /* 005FC 808D2C6C E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 00600 808D2C70 8FA30024 */ lw $v1, 0x0024($sp) +/* 00600 808D2C70 8FA30024 */ lw $v1, 0x0024($sp) /* 00604 808D2C74 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A /* 00608 808D2C78 A60C01BC */ sh $t4, 0x01BC($s0) ## 000001BC -/* 0060C 808D2C7C 50600014 */ beql $v1, $zero, .L808D2CD0 -/* 00610 808D2C80 8FBF001C */ lw $ra, 0x001C($sp) +/* 0060C 808D2C7C 50600014 */ beql $v1, $zero, .L808D2CD0 +/* 00610 808D2C80 8FBF001C */ lw $ra, 0x001C($sp) /* 00614 808D2C84 806200AF */ lb $v0, 0x00AF($v1) ## 000000AF -/* 00618 808D2C88 28410012 */ slti $at, $v0, 0x0012 -/* 0061C 808D2C8C 54200004 */ bnel $at, $zero, .L808D2CA0 -/* 00620 808D2C90 2841000C */ slti $at, $v0, 0x000C -/* 00624 808D2C94 1000000D */ beq $zero, $zero, .L808D2CCC +/* 00618 808D2C88 28410012 */ slti $at, $v0, 0x0012 +/* 0061C 808D2C8C 54200004 */ bnel $at, $zero, .L808D2CA0 +/* 00620 808D2C90 2841000C */ slti $at, $v0, 0x000C +/* 00624 808D2C94 1000000D */ beq $zero, $zero, .L808D2CCC /* 00628 808D2C98 A60001AC */ sh $zero, 0x01AC($s0) ## 000001AC -/* 0062C 808D2C9C 2841000C */ slti $at, $v0, 0x000C +/* 0062C 808D2C9C 2841000C */ slti $at, $v0, 0x000C .L808D2CA0: -/* 00630 808D2CA0 14200003 */ bne $at, $zero, .L808D2CB0 +/* 00630 808D2CA0 14200003 */ bne $at, $zero, .L808D2CB0 /* 00634 808D2CA4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00638 808D2CA8 10000008 */ beq $zero, $zero, .L808D2CCC +/* 00638 808D2CA8 10000008 */ beq $zero, $zero, .L808D2CCC /* 0063C 808D2CAC A60D01AC */ sh $t5, 0x01AC($s0) ## 000001AC .L808D2CB0: -/* 00640 808D2CB0 28410006 */ slti $at, $v0, 0x0006 -/* 00644 808D2CB4 14200004 */ bne $at, $zero, .L808D2CC8 +/* 00640 808D2CB0 28410006 */ slti $at, $v0, 0x0006 +/* 00644 808D2CB4 14200004 */ bne $at, $zero, .L808D2CC8 /* 00648 808D2CB8 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 0064C 808D2CBC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00650 808D2CC0 10000002 */ beq $zero, $zero, .L808D2CCC +/* 00650 808D2CC0 10000002 */ beq $zero, $zero, .L808D2CCC /* 00654 808D2CC4 A60E01AC */ sh $t6, 0x01AC($s0) ## 000001AC .L808D2CC8: /* 00658 808D2CC8 A60F01AC */ sh $t7, 0x01AC($s0) ## 000001AC .L808D2CCC: -/* 0065C 808D2CCC 8FBF001C */ lw $ra, 0x001C($sp) +/* 0065C 808D2CCC 8FBF001C */ lw $ra, 0x001C($sp) .L808D2CD0: -/* 00660 808D2CD0 8FB00018 */ lw $s0, 0x0018($sp) +/* 00660 808D2CD0 8FB00018 */ lw $s0, 0x0018($sp) /* 00664 808D2CD4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00668 808D2CD8 03E00008 */ jr $ra +/* 00668 808D2CD8 03E00008 */ jr $ra /* 0066C 808D2CDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s index 7218f015cf..5e4318f9ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s @@ -1,28 +1,28 @@ glabel func_808D3A80 /* 01410 808D3A80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01414 808D3A84 AFA5001C */ sw $a1, 0x001C($sp) -/* 01418 808D3A88 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01414 808D3A84 AFA5001C */ sw $a1, 0x001C($sp) +/* 01418 808D3A88 AFBF0014 */ sw $ra, 0x0014($sp) /* 0141C 808D3A8C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 01420 808D3A90 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01424 808D3A94 24A5A31C */ addiu $a1, $a1, 0xA31C ## $a1 = 0600A31C -/* 01428 808D3A98 AFA60018 */ sw $a2, 0x0018($sp) -/* 0142C 808D3A9C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 01428 808D3A98 AFA60018 */ sw $a2, 0x0018($sp) +/* 0142C 808D3A9C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 01430 808D3AA0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01434 808D3AA4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01438 808D3AA8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0143C 808D3AAC 2484A31C */ addiu $a0, $a0, 0xA31C ## $a0 = 0600A31C /* 01440 808D3AB0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01444 808D3AB4 8FA60018 */ lw $a2, 0x0018($sp) +/* 01444 808D3AB4 8FA60018 */ lw $a2, 0x0018($sp) /* 01448 808D3AB8 3C0E808D */ lui $t6, %hi(func_808D3AE0) ## $t6 = 808D0000 -/* 0144C 808D3ABC 468021A0 */ cvt.s.w $f6, $f4 +/* 0144C 808D3ABC 468021A0 */ cvt.s.w $f6, $f4 /* 01450 808D3AC0 25CE3AE0 */ addiu $t6, $t6, %lo(func_808D3AE0) ## $t6 = 808D3AE0 /* 01454 808D3AC4 ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 /* 01458 808D3AC8 A4C00198 */ sh $zero, 0x0198($a2) ## 00000198 /* 0145C 808D3ACC E4C601F0 */ swc1 $f6, 0x01F0($a2) ## 000001F0 -/* 01460 808D3AD0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01460 808D3AD0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01464 808D3AD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01468 808D3AD8 03E00008 */ jr $ra +/* 01468 808D3AD8 03E00008 */ jr $ra /* 0146C 808D3ADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s index cf1fd7a7f7..d3438e7731 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s @@ -1,28 +1,28 @@ glabel func_808D3D38 /* 016C8 808D3D38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 016CC 808D3D3C AFA5001C */ sw $a1, 0x001C($sp) -/* 016D0 808D3D40 AFBF0014 */ sw $ra, 0x0014($sp) +/* 016CC 808D3D3C AFA5001C */ sw $a1, 0x001C($sp) +/* 016D0 808D3D40 AFBF0014 */ sw $ra, 0x0014($sp) /* 016D4 808D3D44 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 016D8 808D3D48 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 016DC 808D3D4C 24A57850 */ addiu $a1, $a1, 0x7850 ## $a1 = 06007850 -/* 016E0 808D3D50 AFA60018 */ sw $a2, 0x0018($sp) -/* 016E4 808D3D54 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 016E0 808D3D50 AFA60018 */ sw $a2, 0x0018($sp) +/* 016E4 808D3D54 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 016E8 808D3D58 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 016EC 808D3D5C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 016F0 808D3D60 0C028800 */ jal SkelAnime_GetFrameCount - + /* 016F4 808D3D64 24847850 */ addiu $a0, $a0, 0x7850 ## $a0 = 06007850 /* 016F8 808D3D68 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 016FC 808D3D6C 8FA60018 */ lw $a2, 0x0018($sp) +/* 016FC 808D3D6C 8FA60018 */ lw $a2, 0x0018($sp) /* 01700 808D3D70 3C0E808D */ lui $t6, %hi(func_808D3D98) ## $t6 = 808D0000 -/* 01704 808D3D74 468021A0 */ cvt.s.w $f6, $f4 +/* 01704 808D3D74 468021A0 */ cvt.s.w $f6, $f4 /* 01708 808D3D78 25CE3D98 */ addiu $t6, $t6, %lo(func_808D3D98) ## $t6 = 808D3D98 /* 0170C 808D3D7C ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 /* 01710 808D3D80 A4C00198 */ sh $zero, 0x0198($a2) ## 00000198 /* 01714 808D3D84 E4C601F0 */ swc1 $f6, 0x01F0($a2) ## 000001F0 -/* 01718 808D3D88 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01718 808D3D88 8FBF0014 */ lw $ra, 0x0014($sp) /* 0171C 808D3D8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01720 808D3D90 03E00008 */ jr $ra +/* 01720 808D3D90 03E00008 */ jr $ra /* 01724 808D3D94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s index d37f150f6a..1641652bfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s @@ -1,89 +1,89 @@ glabel func_808D3D98 /* 01728 808D3D98 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0172C 808D3D9C AFBF001C */ sw $ra, 0x001C($sp) -/* 01730 808D3DA0 AFB10018 */ sw $s1, 0x0018($sp) -/* 01734 808D3DA4 AFB00014 */ sw $s0, 0x0014($sp) -/* 01738 808D3DA8 AFA5002C */ sw $a1, 0x002C($sp) +/* 0172C 808D3D9C AFBF001C */ sw $ra, 0x001C($sp) +/* 01730 808D3DA0 AFB10018 */ sw $s1, 0x0018($sp) +/* 01734 808D3DA4 AFB00014 */ sw $s0, 0x0014($sp) +/* 01738 808D3DA8 AFA5002C */ sw $a1, 0x002C($sp) /* 0173C 808D3DAC 8C8E0118 */ lw $t6, 0x0118($a0) ## 00000118 /* 01740 808D3DB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01744 808D3DB4 2491014C */ addiu $s1, $a0, 0x014C ## $s1 = 0000014C /* 01748 808D3DB8 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 0174C 808D3DBC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01750 808D3DC0 AFAE0024 */ sw $t6, 0x0024($sp) + +/* 01750 808D3DC0 AFAE0024 */ sw $t6, 0x0024($sp) /* 01754 808D3DC4 86030198 */ lh $v1, 0x0198($s0) ## 00000198 /* 01758 808D3DC8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 0175C 808D3DCC A20F0194 */ sb $t7, 0x0194($s0) ## 00000194 -/* 01760 808D3DD0 14600012 */ bne $v1, $zero, .L808D3E1C +/* 01760 808D3DD0 14600012 */ bne $v1, $zero, .L808D3E1C /* 01764 808D3DD4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01768 808D3DD8 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 0176C 808D3DDC 0C0295B2 */ jal func_800A56C8 +/* 0176C 808D3DDC 0C0295B2 */ jal func_800A56C8 /* 01770 808D3DE0 8E0501F0 */ lw $a1, 0x01F0($s0) ## 000001F0 -/* 01774 808D3DE4 10400033 */ beq $v0, $zero, .L808D3EB4 +/* 01774 808D3DE4 10400033 */ beq $v0, $zero, .L808D3EB4 /* 01778 808D3DE8 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 0177C 808D3DEC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01780 808D3DF0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 01780 808D3DF0 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 01784 808D3DF4 24A589DC */ addiu $a1, $a1, 0x89DC ## $a1 = 060089DC /* 01788 808D3DF8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0178C 808D3DFC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01790 808D3E00 248489DC */ addiu $a0, $a0, 0x89DC ## $a0 = 060089DC /* 01794 808D3E04 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01798 808D3E08 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 0179C 808D3E0C A6180198 */ sh $t8, 0x0198($s0) ## 00000198 -/* 017A0 808D3E10 468021A0 */ cvt.s.w $f6, $f4 -/* 017A4 808D3E14 10000027 */ beq $zero, $zero, .L808D3EB4 +/* 017A0 808D3E10 468021A0 */ cvt.s.w $f6, $f4 +/* 017A4 808D3E14 10000027 */ beq $zero, $zero, .L808D3EB4 /* 017A8 808D3E18 E60601F0 */ swc1 $f6, 0x01F0($s0) ## 000001F0 .L808D3E1C: -/* 017AC 808D3E1C 14610018 */ bne $v1, $at, .L808D3E80 +/* 017AC 808D3E1C 14610018 */ bne $v1, $at, .L808D3E80 /* 017B0 808D3E20 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 017B4 808D3E24 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 017B8 808D3E28 0C0295B2 */ jal func_800A56C8 +/* 017B8 808D3E28 0C0295B2 */ jal func_800A56C8 /* 017BC 808D3E2C 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 017C0 808D3E30 10400003 */ beq $v0, $zero, .L808D3E40 +/* 017C0 808D3E30 10400003 */ beq $v0, $zero, .L808D3E40 /* 017C4 808D3E34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 017C8 808D3E38 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 017CC 808D3E3C 240538D6 */ addiu $a1, $zero, 0x38D6 ## $a1 = 000038D6 .L808D3E40: /* 017D0 808D3E40 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 017D4 808D3E44 0C0295B2 */ jal func_800A56C8 +/* 017D4 808D3E44 0C0295B2 */ jal func_800A56C8 /* 017D8 808D3E48 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 017DC 808D3E4C 10400004 */ beq $v0, $zero, .L808D3E60 +/* 017DC 808D3E4C 10400004 */ beq $v0, $zero, .L808D3E60 /* 017E0 808D3E50 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 017E4 808D3E54 8FA80024 */ lw $t0, 0x0024($sp) +/* 017E4 808D3E54 8FA80024 */ lw $t0, 0x0024($sp) /* 017E8 808D3E58 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 017EC 808D3E5C A5190250 */ sh $t9, 0x0250($t0) ## 00000250 .L808D3E60: -/* 017F0 808D3E60 0C0295B2 */ jal func_800A56C8 +/* 017F0 808D3E60 0C0295B2 */ jal func_800A56C8 /* 017F4 808D3E64 8E0501F0 */ lw $a1, 0x01F0($s0) ## 000001F0 -/* 017F8 808D3E68 10400012 */ beq $v0, $zero, .L808D3EB4 +/* 017F8 808D3E68 10400012 */ beq $v0, $zero, .L808D3EB4 /* 017FC 808D3E6C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 01800 808D3E70 240A0019 */ addiu $t2, $zero, 0x0019 ## $t2 = 00000019 /* 01804 808D3E74 A6090198 */ sh $t1, 0x0198($s0) ## 00000198 -/* 01808 808D3E78 1000000E */ beq $zero, $zero, .L808D3EB4 +/* 01808 808D3E78 1000000E */ beq $zero, $zero, .L808D3EB4 /* 0180C 808D3E7C A60A01BC */ sh $t2, 0x01BC($s0) ## 000001BC .L808D3E80: /* 01810 808D3E80 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 /* 01814 808D3E84 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01818 808D3E88 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0181C 808D3E8C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01820 808D3E90 860B01BC */ lh $t3, 0x01BC($s0) ## 000001BC /* 01824 808D3E94 3C0C808D */ lui $t4, %hi(func_808D4748) ## $t4 = 808D0000 /* 01828 808D3E98 258C4748 */ addiu $t4, $t4, %lo(func_808D4748) ## $t4 = 808D4748 -/* 0182C 808D3E9C 55600006 */ bnel $t3, $zero, .L808D3EB8 -/* 01830 808D3EA0 8FBF001C */ lw $ra, 0x001C($sp) +/* 0182C 808D3E9C 55600006 */ bnel $t3, $zero, .L808D3EB8 +/* 01830 808D3EA0 8FBF001C */ lw $ra, 0x001C($sp) /* 01834 808D3EA4 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 01838 808D3EA8 8FAE0024 */ lw $t6, 0x0024($sp) +/* 01838 808D3EA8 8FAE0024 */ lw $t6, 0x0024($sp) /* 0183C 808D3EAC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 01840 808D3EB0 A1CD02D8 */ sb $t5, 0x02D8($t6) ## 000002D8 .L808D3EB4: -/* 01844 808D3EB4 8FBF001C */ lw $ra, 0x001C($sp) +/* 01844 808D3EB4 8FBF001C */ lw $ra, 0x001C($sp) .L808D3EB8: -/* 01848 808D3EB8 8FB00014 */ lw $s0, 0x0014($sp) -/* 0184C 808D3EBC 8FB10018 */ lw $s1, 0x0018($sp) -/* 01850 808D3EC0 03E00008 */ jr $ra +/* 01848 808D3EB8 8FB00014 */ lw $s0, 0x0014($sp) +/* 0184C 808D3EBC 8FB10018 */ lw $s1, 0x0018($sp) +/* 01850 808D3EC0 03E00008 */ jr $ra /* 01854 808D3EC4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s index 544ae1725b..9977ec8d93 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s @@ -1,44 +1,44 @@ glabel func_80912C94 /* 02654 80912C94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02658 80912C98 AFB00018 */ sw $s0, 0x0018($sp) -/* 0265C 80912C9C AFA50024 */ sw $a1, 0x0024($sp) +/* 02658 80912C98 AFB00018 */ sw $s0, 0x0018($sp) +/* 0265C 80912C9C AFA50024 */ sw $a1, 0x0024($sp) /* 02660 80912CA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02664 80912CA4 AFBF001C */ sw $ra, 0x001C($sp) +/* 02664 80912CA4 AFBF001C */ sw $ra, 0x001C($sp) /* 02668 80912CA8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0266C 80912CAC 24A5090C */ addiu $a1, $a1, 0x090C ## $a1 = 0600090C -/* 02670 80912CB0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02670 80912CB0 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02674 80912CB4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02678 80912CB8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0267C 80912CBC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02680 80912CC0 2484090C */ addiu $a0, $a0, 0x090C ## $a0 = 0600090C /* 02684 80912CC4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02688 80912CC8 3C0E8091 */ lui $t6, %hi(func_80912D2C) ## $t6 = 80910000 /* 0268C 80912CCC 25CE2D2C */ addiu $t6, $t6, %lo(func_80912D2C) ## $t6 = 80912D2C -/* 02690 80912CD0 468021A0 */ cvt.s.w $f6, $f4 +/* 02690 80912CD0 468021A0 */ cvt.s.w $f6, $f4 /* 02694 80912CD4 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 /* 02698 80912CD8 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 0269C 80912CDC 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 026A0 80912CE0 0C03E803 */ jal Audio_SetBGM - + /* 026A4 80912CE4 E60601D0 */ swc1 $f6, 0x01D0($s0) ## 000001D0 /* 026A8 80912CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 026AC 80912CEC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 026B0 80912CF0 240538AF */ addiu $a1, $zero, 0x38AF ## $a1 = 000038AF /* 026B4 80912CF4 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 026B8 80912CF8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 026BC 80912CFC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 026C0 80912D00 24080032 */ addiu $t0, $zero, 0x0032 ## $t0 = 00000032 -/* 026C4 80912D04 0301C824 */ and $t9, $t8, $at +/* 026C4 80912D04 0301C824 */ and $t9, $t8, $at /* 026C8 80912D08 A60F035E */ sh $t7, 0x035E($s0) ## 0000035E /* 026CC 80912D0C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 026D0 80912D10 A6000194 */ sh $zero, 0x0194($s0) ## 00000194 /* 026D4 80912D14 A20801C8 */ sb $t0, 0x01C8($s0) ## 000001C8 -/* 026D8 80912D18 8FBF001C */ lw $ra, 0x001C($sp) -/* 026DC 80912D1C 8FB00018 */ lw $s0, 0x0018($sp) +/* 026D8 80912D18 8FBF001C */ lw $ra, 0x001C($sp) +/* 026DC 80912D1C 8FB00018 */ lw $s0, 0x0018($sp) /* 026E0 80912D20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 026E4 80912D24 03E00008 */ jr $ra +/* 026E4 80912D24 03E00008 */ jr $ra /* 026E8 80912D28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s index 1241753bbb..3414ab8641 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s @@ -1,26 +1,26 @@ glabel func_8092FF94 /* 039C4 8092FF94 3C0F8094 */ lui $t7, %hi(D_80938CA0) ## $t7 = 80940000 -/* 039C8 8092FF98 8DEF8CA0 */ lw $t7, %lo(D_80938CA0)($t7) +/* 039C8 8092FF98 8DEF8CA0 */ lw $t7, %lo(D_80938CA0)($t7) /* 039CC 8092FF9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 039D0 8092FFA0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 039D0 8092FFA0 AFBF0014 */ sw $ra, 0x0014($sp) /* 039D4 8092FFA4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 039D8 8092FFA8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 039DC 8092FFAC A5EE001C */ sh $t6, 0x001C($t7) ## 8094001C /* 039E0 8092FFB0 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C /* 039E4 8092FFB4 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 039E8 8092FFB8 AFA60018 */ sw $a2, 0x0018($sp) -/* 039EC 8092FFBC 0018C880 */ sll $t9, $t8, 2 -/* 039F0 8092FFC0 00B92821 */ addu $a1, $a1, $t9 -/* 039F4 8092FFC4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 039F8 8092FFC8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 039E8 8092FFB8 AFA60018 */ sw $a2, 0x0018($sp) +/* 039EC 8092FFBC 0018C880 */ sll $t9, $t8, 2 +/* 039F0 8092FFC0 00B92821 */ addu $a1, $a1, $t9 +/* 039F4 8092FFC4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 039F8 8092FFC8 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 039FC 8092FFCC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03A00 8092FFD0 8FA60018 */ lw $a2, 0x0018($sp) +/* 03A00 8092FFD0 8FA60018 */ lw $a2, 0x0018($sp) /* 03A04 8092FFD4 3C088093 */ lui $t0, %hi(func_8092FFF0) ## $t0 = 80930000 /* 03A08 8092FFD8 2508FFF0 */ addiu $t0, $t0, %lo(func_8092FFF0) ## $t0 = 8092FFF0 /* 03A0C 8092FFDC ACC80190 */ sw $t0, 0x0190($a2) ## 00000190 -/* 03A10 8092FFE0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03A10 8092FFE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 03A14 8092FFE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03A18 8092FFE8 03E00008 */ jr $ra +/* 03A18 8092FFE8 03E00008 */ jr $ra /* 03A1C 8092FFEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s index 30af99ea70..8e914f8823 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s @@ -1,22 +1,22 @@ glabel func_80930238 /* 03C68 80930238 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03C6C 8093023C AFBF0014 */ sw $ra, 0x0014($sp) +/* 03C6C 8093023C AFBF0014 */ sw $ra, 0x0014($sp) /* 03C70 80930240 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 03C74 80930244 84CE001C */ lh $t6, 0x001C($a2) ## 0000001C /* 03C78 80930248 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 03C7C 8093024C AFA60018 */ sw $a2, 0x0018($sp) -/* 03C80 80930250 000E7880 */ sll $t7, $t6, 2 -/* 03C84 80930254 00AF2821 */ addu $a1, $a1, $t7 -/* 03C88 80930258 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 03C8C 8093025C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 03C7C 8093024C AFA60018 */ sw $a2, 0x0018($sp) +/* 03C80 80930250 000E7880 */ sll $t7, $t6, 2 +/* 03C84 80930254 00AF2821 */ addu $a1, $a1, $t7 +/* 03C88 80930258 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 03C8C 8093025C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 03C90 80930260 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03C94 80930264 8FA60018 */ lw $a2, 0x0018($sp) +/* 03C94 80930264 8FA60018 */ lw $a2, 0x0018($sp) /* 03C98 80930268 3C188093 */ lui $t8, %hi(func_80930284) ## $t8 = 80930000 /* 03C9C 8093026C 27180284 */ addiu $t8, $t8, %lo(func_80930284) ## $t8 = 80930284 /* 03CA0 80930270 ACD80190 */ sw $t8, 0x0190($a2) ## 00000190 -/* 03CA4 80930274 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03CA4 80930274 8FBF0014 */ lw $ra, 0x0014($sp) /* 03CA8 80930278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03CAC 8093027C 03E00008 */ jr $ra +/* 03CAC 8093027C 03E00008 */ jr $ra /* 03CB0 80930280 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s index b2d42b69e0..edf92ba5c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s @@ -31,7 +31,7 @@ glabel EnAni_Init /* 00074 809B03E4 8FA40044 */ lw $a0, 0x0044($sp) /* 00078 809B03E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0007C 809B03EC 24A576EC */ addiu $a1, $a1, 0x76EC ## $a1 = 060076EC -/* 00080 809B03F0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00080 809B03F0 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00084 809B03F4 8FA40034 */ lw $a0, 0x0034($sp) /* 00088 809B03F8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0008C 809B03FC AFA50034 */ sw $a1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s index f051cce188..c7e26de66a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s @@ -1,16 +1,16 @@ glabel func_809B3CEC /* 003CC 809B3CEC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003D0 809B3CF0 AFB00018 */ sw $s0, 0x0018($sp) -/* 003D4 809B3CF4 AFA40020 */ sw $a0, 0x0020($sp) +/* 003D0 809B3CF0 AFB00018 */ sw $s0, 0x0018($sp) +/* 003D4 809B3CF4 AFA40020 */ sw $a0, 0x0020($sp) /* 003D8 809B3CF8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003DC 809B3CFC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003E0 809B3D00 AFBF001C */ sw $ra, 0x001C($sp) +/* 003E0 809B3D00 AFBF001C */ sw $ra, 0x001C($sp) /* 003E4 809B3D04 3C05809B */ lui $a1, %hi(func_809B4640) ## $a1 = 809B0000 -/* 003E8 809B3D08 0C26CE48 */ jal func_809B3920 +/* 003E8 809B3D08 0C26CE48 */ jal func_809B3920 /* 003EC 809B3D0C 24A54640 */ addiu $a1, $a1, %lo(func_809B4640) ## $a1 = 809B4640 /* 003F0 809B3D10 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 /* 003F4 809B3D14 24A54310 */ addiu $a1, $a1, 0x4310 ## $a1 = 04004310 -/* 003F8 809B3D18 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 003F8 809B3D18 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 003FC 809B3D1C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00400 809B3D20 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -21,45 +21,45 @@ glabel func_809B3CEC /* 00414 809B3D34 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 00418 809B3D38 86180032 */ lh $t8, 0x0032($s0) ## 00000032 /* 0041C 809B3D3C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00420 809B3D40 46060201 */ sub.s $f8, $f0, $f6 -/* 00424 809B3D44 46082282 */ mul.s $f10, $f4, $f8 -/* 00428 809B3D48 4600540D */ trunc.w.s $f16, $f10 -/* 0042C 809B3D4C 440F8000 */ mfc1 $t7, $f16 +/* 00420 809B3D40 46060201 */ sub.s $f8, $f0, $f6 +/* 00424 809B3D44 46082282 */ mul.s $f10, $f4, $f8 +/* 00428 809B3D48 4600540D */ trunc.w.s $f16, $f10 +/* 0042C 809B3D4C 440F8000 */ mfc1 $t7, $f16 /* 00430 809B3D50 00000000 */ nop -/* 00434 809B3D54 030FC821 */ addu $t9, $t8, $t7 -/* 00438 809B3D58 03214021 */ addu $t0, $t9, $at +/* 00434 809B3D54 030FC821 */ addu $t9, $t8, $t7 +/* 00438 809B3D58 03214021 */ addu $t0, $t9, $at /* 0043C 809B3D5C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00440 809B3D60 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 /* 00444 809B3D64 3C01809B */ lui $at, %hi(D_809B4F48) ## $at = 809B0000 -/* 00448 809B3D68 C4224F48 */ lwc1 $f2, %lo(D_809B4F48)($at) +/* 00448 809B3D68 C4224F48 */ lwc1 $f2, %lo(D_809B4F48)($at) /* 0044C 809B3D6C C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 /* 00450 809B3D70 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 -/* 00454 809B3D74 46001182 */ mul.s $f6, $f2, $f0 -/* 00458 809B3D78 46061100 */ add.s $f4, $f2, $f6 -/* 0045C 809B3D7C 46049202 */ mul.s $f8, $f18, $f4 -/* 00460 809B3D80 46085400 */ add.s $f16, $f10, $f8 +/* 00454 809B3D74 46001182 */ mul.s $f6, $f2, $f0 +/* 00458 809B3D78 46061100 */ add.s $f4, $f2, $f6 +/* 0045C 809B3D7C 46049202 */ mul.s $f8, $f18, $f4 +/* 00460 809B3D80 46085400 */ add.s $f16, $f10, $f8 /* 00464 809B3D84 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00468 809B3D88 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 0046C 809B3D8C 3C01809B */ lui $at, %hi(D_809B4F4C) ## $at = 809B0000 -/* 00470 809B3D90 C4264F4C */ lwc1 $f6, %lo(D_809B4F4C)($at) +/* 00470 809B3D90 C4264F4C */ lwc1 $f6, %lo(D_809B4F4C)($at) /* 00474 809B3D94 3C01809B */ lui $at, %hi(D_809B4F50) ## $at = 809B0000 -/* 00478 809B3D98 C4324F50 */ lwc1 $f18, %lo(D_809B4F50)($at) +/* 00478 809B3D98 C4324F50 */ lwc1 $f18, %lo(D_809B4F50)($at) /* 0047C 809B3D9C C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 /* 00480 809B3DA0 3C01BFC0 */ lui $at, 0xBFC0 ## $at = BFC00000 -/* 00484 809B3DA4 46009102 */ mul.s $f4, $f18, $f0 +/* 00484 809B3DA4 46009102 */ mul.s $f4, $f18, $f0 /* 00488 809B3DA8 44819000 */ mtc1 $at, $f18 ## $f18 = -1.50 /* 0048C 809B3DAC 24090032 */ addiu $t1, $zero, 0x0032 ## $t1 = 00000032 /* 00490 809B3DB0 A2090248 */ sb $t1, 0x0248($s0) ## 00000248 /* 00494 809B3DB4 E612006C */ swc1 $f18, 0x006C($s0) ## 0000006C -/* 00498 809B3DB8 46043280 */ add.s $f10, $f6, $f4 -/* 0049C 809B3DBC 460A4402 */ mul.s $f16, $f8, $f10 +/* 00498 809B3DB8 46043280 */ add.s $f10, $f6, $f4 +/* 0049C 809B3DBC 460A4402 */ mul.s $f16, $f8, $f10 /* 004A0 809B3DC0 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 004A4 809B3DC4 8FBF001C */ lw $ra, 0x001C($sp) -/* 004A8 809B3DC8 8FB00018 */ lw $s0, 0x0018($sp) +/* 004A4 809B3DC4 8FBF001C */ lw $ra, 0x001C($sp) +/* 004A8 809B3DC8 8FB00018 */ lw $s0, 0x0018($sp) /* 004AC 809B3DCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004B0 809B3DD0 03E00008 */ jr $ra +/* 004B0 809B3DD0 03E00008 */ jr $ra /* 004B4 809B3DD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s index 03f3db9e2f..ab4cde081b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s @@ -1,89 +1,89 @@ glabel func_809B3FDC /* 006BC 809B3FDC 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 006C0 809B3FE0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 006C4 809B3FE4 AFB00030 */ sw $s0, 0x0030($sp) -/* 006C8 809B3FE8 AFA5009C */ sw $a1, 0x009C($sp) +/* 006C0 809B3FE0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 006C4 809B3FE4 AFB00030 */ sw $s0, 0x0030($sp) +/* 006C8 809B3FE8 AFA5009C */ sw $a1, 0x009C($sp) /* 006CC 809B3FEC 90820248 */ lbu $v0, 0x0248($a0) ## 00000248 /* 006D0 809B3FF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006D4 809B3FF4 14400003 */ bne $v0, $zero, .L809B4004 +/* 006D4 809B3FF4 14400003 */ bne $v0, $zero, .L809B4004 /* 006D8 809B3FF8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 006DC 809B3FFC 10000004 */ beq $zero, $zero, .L809B4010 +/* 006DC 809B3FFC 10000004 */ beq $zero, $zero, .L809B4010 /* 006E0 809B4000 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L809B4004: /* 006E4 809B4004 31C200FF */ andi $v0, $t6, 0x00FF ## $v0 = 000000FF /* 006E8 809B4008 00401825 */ or $v1, $v0, $zero ## $v1 = 000000FF /* 006EC 809B400C A20E0248 */ sb $t6, 0x0248($s0) ## 00000248 .L809B4010: -/* 006F0 809B4010 54600006 */ bnel $v1, $zero, .L809B402C +/* 006F0 809B4010 54600006 */ bnel $v1, $zero, .L809B402C /* 006F4 809B4014 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006F8 809B4018 0C00B55C */ jal Actor_Kill - + /* 006FC 809B401C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00700 809B4020 1000016B */ beq $zero, $zero, .L809B45D0 -/* 00704 809B4024 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00700 809B4020 1000016B */ beq $zero, $zero, .L809B45D0 +/* 00704 809B4024 8FBF0034 */ lw $ra, 0x0034($sp) /* 00708 809B4028 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 .L809B402C: /* 0070C 809B402C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 00710 809B4030 04410004 */ bgez $v0, .L809B4044 -/* 00714 809B4034 468021A0 */ cvt.s.w $f6, $f4 +/* 00710 809B4030 04410004 */ bgez $v0, .L809B4044 +/* 00714 809B4034 468021A0 */ cvt.s.w $f6, $f4 /* 00718 809B4038 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 /* 0071C 809B403C 00000000 */ nop -/* 00720 809B4040 46083180 */ add.s $f6, $f6, $f8 +/* 00720 809B4040 46083180 */ add.s $f6, $f6, $f8 .L809B4044: /* 00724 809B4044 3C01809B */ lui $at, %hi(D_809B4F54) ## $at = 809B0000 -/* 00728 809B4048 C42A4F54 */ lwc1 $f10, %lo(D_809B4F54)($at) +/* 00728 809B4048 C42A4F54 */ lwc1 $f10, %lo(D_809B4F54)($at) /* 0072C 809B404C 3C01809B */ lui $at, %hi(D_809B4F58) ## $at = 809B0000 -/* 00730 809B4050 460A303C */ c.lt.s $f6, $f10 +/* 00730 809B4050 460A303C */ c.lt.s $f6, $f10 /* 00734 809B4054 00000000 */ nop -/* 00738 809B4058 45020004 */ bc1fl .L809B406C +/* 00738 809B4058 45020004 */ bc1fl .L809B406C /* 0073C 809B405C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00740 809B4060 C4304F58 */ lwc1 $f16, %lo(D_809B4F58)($at) +/* 00740 809B4060 C4304F58 */ lwc1 $f16, %lo(D_809B4F58)($at) /* 00744 809B4064 E610006C */ swc1 $f16, 0x006C($s0) ## 0000006C /* 00748 809B4068 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L809B406C: -/* 0074C 809B406C 0002182B */ sltu $v1, $zero, $v0 -/* 00750 809B4070 10600007 */ beq $v1, $zero, .L809B4090 -/* 00754 809B4074 28410009 */ slti $at, $v0, 0x0009 -/* 00758 809B4078 2843000A */ slti $v1, $v0, 0x000A -/* 0075C 809B407C 10600004 */ beq $v1, $zero, .L809B4090 +/* 0074C 809B406C 0002182B */ sltu $v1, $zero, $v0 +/* 00750 809B4070 10600007 */ beq $v1, $zero, .L809B4090 +/* 00754 809B4074 28410009 */ slti $at, $v0, 0x0009 +/* 00758 809B4078 2843000A */ slti $v1, $v0, 0x000A +/* 0075C 809B407C 10600004 */ beq $v1, $zero, .L809B4090 /* 00760 809B4080 00000000 */ nop /* 00764 809B4084 920301A0 */ lbu $v1, 0x01A0($s0) ## 000001A0 /* 00768 809B4088 30630002 */ andi $v1, $v1, 0x0002 ## $v1 = 00000000 -/* 0076C 809B408C 0003182B */ sltu $v1, $zero, $v1 +/* 0076C 809B408C 0003182B */ sltu $v1, $zero, $v1 .L809B4090: -/* 00770 809B4090 14600006 */ bne $v1, $zero, .L809B40AC +/* 00770 809B4090 14600006 */ bne $v1, $zero, .L809B40AC /* 00774 809B4094 00000000 */ nop /* 00778 809B4098 920F024A */ lbu $t7, 0x024A($s0) ## 0000024A /* 0077C 809B409C 26040210 */ addiu $a0, $s0, 0x0210 ## $a0 = 00000210 /* 00780 809B40A0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00784 809B40A4 11E000A8 */ beq $t7, $zero, .L809B4348 +/* 00784 809B40A4 11E000A8 */ beq $t7, $zero, .L809B4348 /* 00788 809B40A8 00000000 */ nop .L809B40AC: -/* 0078C 809B40AC 14200039 */ bne $at, $zero, .L809B4194 -/* 00790 809B40B0 8FA4009C */ lw $a0, 0x009C($sp) -/* 00794 809B40B4 10600013 */ beq $v1, $zero, .L809B4104 +/* 0078C 809B40AC 14200039 */ bne $at, $zero, .L809B4194 +/* 00790 809B40B0 8FA4009C */ lw $a0, 0x009C($sp) +/* 00794 809B40B4 10600013 */ beq $v1, $zero, .L809B4104 /* 00798 809B40B8 24071825 */ addiu $a3, $zero, 0x1825 ## $a3 = 00001825 /* 0079C 809B40BC C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 007A0 809B40C0 C6040100 */ lwc1 $f4, 0x0100($s0) ## 00000100 /* 007A4 809B40C4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 007A8 809B40C8 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 007AC 809B40CC 46049200 */ add.s $f8, $f18, $f4 +/* 007AC 809B40CC 46049200 */ add.s $f8, $f18, $f4 /* 007B0 809B40D0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 007B4 809B40D4 C6100104 */ lwc1 $f16, 0x0104($s0) ## 00000104 /* 007B8 809B40D8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 007BC 809B40DC 46004182 */ mul.s $f6, $f8, $f0 -/* 007C0 809B40E0 46105480 */ add.s $f18, $f10, $f16 +/* 007BC 809B40DC 46004182 */ mul.s $f6, $f8, $f0 +/* 007C0 809B40E0 46105480 */ add.s $f18, $f10, $f16 /* 007C4 809B40E4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 007C8 809B40E8 46009102 */ mul.s $f4, $f18, $f0 +/* 007C8 809B40E8 46009102 */ mul.s $f4, $f18, $f0 /* 007CC 809B40EC E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 007D0 809B40F0 C6060108 */ lwc1 $f6, 0x0108($s0) ## 00000108 -/* 007D4 809B40F4 46064280 */ add.s $f10, $f8, $f6 +/* 007D4 809B40F4 46064280 */ add.s $f10, $f8, $f6 /* 007D8 809B40F8 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 007DC 809B40FC 46005402 */ mul.s $f16, $f10, $f0 +/* 007DC 809B40FC 46005402 */ mul.s $f16, $f10, $f0 /* 007E0 809B4100 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C .L809B4104: /* 007E4 809B4104 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 007E8 809B4108 14410013 */ bne $v0, $at, .L809B4158 +/* 007E8 809B4108 14410013 */ bne $v0, $at, .L809B4158 /* 007EC 809B410C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 007F0 809B4110 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 /* 007F4 809B4114 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF @@ -91,77 +91,77 @@ glabel func_809B3FDC /* 007FC 809B411C A7380D38 */ sh $t8, 0x0D38($t9) ## 80160D38 /* 00800 809B4120 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 00804 809B4124 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00808 809B4128 8FA5009C */ lw $a1, 0x009C($sp) -/* 0080C 809B412C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00808 809B4128 8FA5009C */ lw $a1, 0x009C($sp) +/* 0080C 809B412C E7B20010 */ swc1 $f18, 0x0010($sp) /* 00810 809B4130 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 00814 809B4134 AFA00024 */ sw $zero, 0x0024($sp) -/* 00818 809B4138 AFA00020 */ sw $zero, 0x0020($sp) -/* 0081C 809B413C AFA0001C */ sw $zero, 0x001C($sp) -/* 00820 809B4140 AFA00018 */ sw $zero, 0x0018($sp) +/* 00814 809B4134 AFA00024 */ sw $zero, 0x0024($sp) +/* 00818 809B4138 AFA00020 */ sw $zero, 0x0020($sp) +/* 0081C 809B413C AFA0001C */ sw $zero, 0x001C($sp) +/* 00820 809B4140 AFA00018 */ sw $zero, 0x0018($sp) /* 00824 809B4144 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C48 /* 00828 809B4148 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 0082C 809B414C E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00830 809B4150 10000001 */ beq $zero, $zero, .L809B4158 +/* 0082C 809B414C E7A40014 */ swc1 $f4, 0x0014($sp) +/* 00830 809B4150 10000001 */ beq $zero, $zero, .L809B4158 /* 00834 809B4154 2407182B */ addiu $a3, $zero, 0x182B ## $a3 = 0000182B .L809B4158: /* 00838 809B4158 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0083C 809B415C AFA50044 */ sw $a1, 0x0044($sp) -/* 00840 809B4160 8FA4009C */ lw $a0, 0x009C($sp) +/* 0083C 809B415C AFA50044 */ sw $a1, 0x0044($sp) +/* 00840 809B4160 8FA4009C */ lw $a0, 0x009C($sp) /* 00844 809B4164 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00848 809B4168 0C00A700 */ jal func_80029C00 -/* 0084C 809B416C A7A70072 */ sh $a3, 0x0072($sp) -/* 00850 809B4170 97A70072 */ lhu $a3, 0x0072($sp) -/* 00854 809B4174 8FA4009C */ lw $a0, 0x009C($sp) -/* 00858 809B4178 8FA50044 */ lw $a1, 0x0044($sp) +/* 00848 809B4168 0C00A700 */ jal func_80029C00 +/* 0084C 809B416C A7A70072 */ sh $a3, 0x0072($sp) +/* 00850 809B4170 97A70072 */ lhu $a3, 0x0072($sp) +/* 00854 809B4174 8FA4009C */ lw $a0, 0x009C($sp) +/* 00858 809B4178 8FA50044 */ lw $a1, 0x0044($sp) /* 0085C 809B417C 0C01AEB6 */ jal Audio_PlaySoundAtPosition - + /* 00860 809B4180 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 00864 809B4184 0C00B55C */ jal Actor_Kill - + /* 00868 809B4188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0086C 809B418C 1000009E */ beq $zero, $zero, .L809B4408 +/* 0086C 809B418C 1000009E */ beq $zero, $zero, .L809B4408 /* 00870 809B4190 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C .L809B4194: /* 00874 809B4194 26070024 */ addiu $a3, $s0, 0x0024 ## $a3 = 00000024 -/* 00878 809B4198 AFA70044 */ sw $a3, 0x0044($sp) +/* 00878 809B4198 AFA70044 */ sw $a3, 0x0044($sp) /* 0087C 809B419C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00880 809B41A0 24060096 */ addiu $a2, $zero, 0x0096 ## $a2 = 00000096 -/* 00884 809B41A4 0C00A732 */ jal func_80029CC8 -/* 00888 809B41A8 AFA30050 */ sw $v1, 0x0050($sp) -/* 0088C 809B41AC 8FA30050 */ lw $v1, 0x0050($sp) -/* 00890 809B41B0 5060004D */ beql $v1, $zero, .L809B42E8 +/* 00884 809B41A4 0C00A732 */ jal func_80029CC8 +/* 00888 809B41A8 AFA30050 */ sw $v1, 0x0050($sp) +/* 0088C 809B41AC 8FA30050 */ lw $v1, 0x0050($sp) +/* 00890 809B41B0 5060004D */ beql $v1, $zero, .L809B42E8 /* 00894 809B41B4 9208024A */ lbu $t0, 0x024A($s0) ## 0000024A /* 00898 809B41B8 8E0301C8 */ lw $v1, 0x01C8($s0) ## 000001C8 /* 0089C 809B41BC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 008A0 809B41C0 90690014 */ lbu $t1, 0x0014($v1) ## 00000014 -/* 008A4 809B41C4 51210048 */ beql $t1, $at, .L809B42E8 +/* 008A4 809B41C4 51210048 */ beql $t1, $at, .L809B42E8 /* 008A8 809B41C8 9208024A */ lbu $t0, 0x024A($s0) ## 0000024A /* 008AC 809B41CC 8E020194 */ lw $v0, 0x0194($s0) ## 00000194 /* 008B0 809B41D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 008B4 809B41D4 8C4A0130 */ lw $t2, 0x0130($v0) ## 00000130 -/* 008B8 809B41D8 51400024 */ beql $t2, $zero, .L809B426C +/* 008B8 809B41D8 51400024 */ beql $t2, $zero, .L809B426C /* 008BC 809B41DC 92090249 */ lbu $t1, 0x0249($s0) ## 00000249 /* 008C0 809B41E0 920B01A0 */ lbu $t3, 0x01A0($s0) ## 000001A0 /* 008C4 809B41E4 316C0004 */ andi $t4, $t3, 0x0004 ## $t4 = 00000000 -/* 008C8 809B41E8 55800020 */ bnel $t4, $zero, .L809B426C +/* 008C8 809B41E8 55800020 */ bnel $t4, $zero, .L809B426C /* 008CC 809B41EC 92090249 */ lbu $t1, 0x0249($s0) ## 00000249 /* 008D0 809B41F0 8C4D0004 */ lw $t5, 0x0004($v0) ## 00000004 /* 008D4 809B41F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 008D8 809B41F8 31AE4000 */ andi $t6, $t5, 0x4000 ## $t6 = 00000000 -/* 008DC 809B41FC 51C0001B */ beql $t6, $zero, .L809B426C +/* 008DC 809B41FC 51C0001B */ beql $t6, $zero, .L809B426C /* 008E0 809B4200 92090249 */ lbu $t1, 0x0249($s0) ## 00000249 /* 008E4 809B4204 AE02024C */ sw $v0, 0x024C($s0) ## 0000024C -/* 008E8 809B4208 AFA2006C */ sw $v0, 0x006C($sp) -/* 008EC 809B420C 0C26CF76 */ jal func_809B3DD8 -/* 008F0 809B4210 8FA5009C */ lw $a1, 0x009C($sp) -/* 008F4 809B4214 8FA2006C */ lw $v0, 0x006C($sp) -/* 008F8 809B4218 8FA50044 */ lw $a1, 0x0044($sp) +/* 008E8 809B4208 AFA2006C */ sw $v0, 0x006C($sp) +/* 008EC 809B420C 0C26CF76 */ jal func_809B3DD8 +/* 008F0 809B4210 8FA5009C */ lw $a1, 0x009C($sp) +/* 008F4 809B4214 8FA2006C */ lw $v0, 0x006C($sp) +/* 008F8 809B4218 8FA50044 */ lw $a1, 0x0044($sp) /* 008FC 809B421C 26060250 */ addiu $a2, $s0, 0x0250 ## $a2 = 00000250 /* 00900 809B4220 0C01DFB4 */ jal Math_Vec3f_Diff ## Vec3f_Sub /* 00904 809B4224 24440024 */ addiu $a0, $v0, 0x0024 ## $a0 = 00000024 -/* 00908 809B4228 8FA2006C */ lw $v0, 0x006C($sp) +/* 00908 809B4228 8FA2006C */ lw $v0, 0x006C($sp) /* 0090C 809B422C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 00910 809B4230 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 /* 00914 809B4234 8C4F0004 */ lw $t7, 0x0004($v0) ## 00000004 @@ -170,12 +170,12 @@ glabel func_809B3FDC /* 00920 809B4240 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 /* 00924 809B4244 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 /* 00928 809B4248 921901A0 */ lbu $t9, 0x01A0($s0) ## 000001A0 -/* 0092C 809B424C 46004182 */ mul.s $f6, $f8, $f0 +/* 0092C 809B424C 46004182 */ mul.s $f6, $f8, $f0 /* 00930 809B4250 3328FFFD */ andi $t0, $t9, 0xFFFD ## $t0 = 00000000 -/* 00934 809B4254 46005402 */ mul.s $f16, $f10, $f0 +/* 00934 809B4254 46005402 */ mul.s $f16, $f10, $f0 /* 00938 809B4258 A20801A0 */ sb $t0, 0x01A0($s0) ## 000001A0 /* 0093C 809B425C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00940 809B4260 10000068 */ beq $zero, $zero, .L809B4404 +/* 00940 809B4260 10000068 */ beq $zero, $zero, .L809B4404 /* 00944 809B4264 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 00948 809B4268 92090249 */ lbu $t1, 0x0249($s0) ## 00000249 .L809B426C: @@ -185,133 +185,133 @@ glabel func_809B3FDC /* 00958 809B4278 A20C0249 */ sb $t4, 0x0249($s0) ## 00000249 /* 0095C 809B427C 906D0016 */ lbu $t5, 0x0016($v1) ## 00000016 /* 00960 809B4280 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 -/* 00964 809B4284 11C00010 */ beq $t6, $zero, .L809B42C8 +/* 00964 809B4284 11C00010 */ beq $t6, $zero, .L809B42C8 /* 00968 809B4288 00000000 */ nop /* 0096C 809B428C 846F000E */ lh $t7, 0x000E($v1) ## 0000000E /* 00970 809B4290 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 /* 00974 809B4294 00000000 */ nop -/* 00978 809B4298 46809120 */ cvt.s.w $f4, $f18 +/* 00978 809B4298 46809120 */ cvt.s.w $f4, $f18 /* 0097C 809B429C E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 00980 809B42A0 84780010 */ lh $t8, 0x0010($v1) ## 00000010 /* 00984 809B42A4 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 /* 00988 809B42A8 00000000 */ nop -/* 0098C 809B42AC 468041A0 */ cvt.s.w $f6, $f8 +/* 0098C 809B42AC 468041A0 */ cvt.s.w $f6, $f8 /* 00990 809B42B0 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 00994 809B42B4 84790012 */ lh $t9, 0x0012($v1) ## 00000012 /* 00998 809B42B8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0099C 809B42BC 00000000 */ nop -/* 009A0 809B42C0 46805420 */ cvt.s.w $f16, $f10 +/* 009A0 809B42C0 46805420 */ cvt.s.w $f16, $f10 /* 009A4 809B42C4 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C .L809B42C8: -/* 009A8 809B42C8 0C26CF3B */ jal func_809B3CEC -/* 009AC 809B42CC 8FA4009C */ lw $a0, 0x009C($sp) +/* 009A8 809B42C8 0C26CF3B */ jal func_809B3CEC +/* 009AC 809B42CC 8FA4009C */ lw $a0, 0x009C($sp) /* 009B0 809B42D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009B4 809B42D4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 009B8 809B42D8 24051814 */ addiu $a1, $zero, 0x1814 ## $a1 = 00001814 -/* 009BC 809B42DC 1000004A */ beq $zero, $zero, .L809B4408 +/* 009BC 809B42DC 1000004A */ beq $zero, $zero, .L809B4408 /* 009C0 809B42E0 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C /* 009C4 809B42E4 9208024A */ lbu $t0, 0x024A($s0) ## 0000024A .L809B42E8: /* 009C8 809B42E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009CC 809B42EC 3C05809B */ lui $a1, %hi(func_809B45E0) ## $a1 = 809B0000 -/* 009D0 809B42F0 51000045 */ beql $t0, $zero, .L809B4408 +/* 009D0 809B42F0 51000045 */ beql $t0, $zero, .L809B4408 /* 009D4 809B42F4 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C -/* 009D8 809B42F8 0C26CE48 */ jal func_809B3920 +/* 009D8 809B42F8 0C26CE48 */ jal func_809B3920 /* 009DC 809B42FC 24A545E0 */ addiu $a1, $a1, %lo(func_809B45E0) ## $a1 = 809B45E0 /* 009E0 809B4300 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 /* 009E4 809B4304 24A5436C */ addiu $a1, $a1, 0x436C ## $a1 = 0400436C -/* 009E8 809B4308 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 009E8 809B4308 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 009EC 809B430C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 009F0 809B4310 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 009F4 809B4314 240A003C */ addiu $t2, $zero, 0x003C ## $t2 = 0000003C /* 009F8 809B4318 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 009FC 809B431C 05200003 */ bltz $t1, .L809B432C +/* 009FC 809B431C 05200003 */ bltz $t1, .L809B432C /* 00A00 809B4320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A04 809B4324 10000002 */ beq $zero, $zero, .L809B4330 +/* 00A04 809B4324 10000002 */ beq $zero, $zero, .L809B4330 /* 00A08 809B4328 A20A0248 */ sb $t2, 0x0248($s0) ## 00000248 .L809B432C: /* 00A0C 809B432C A20B0248 */ sb $t3, 0x0248($s0) ## 00000248 .L809B4330: /* 00A10 809B4330 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A14 809B4334 24051815 */ addiu $a1, $zero, 0x1815 ## $a1 = 00001815 /* 00A18 809B4338 920C0249 */ lbu $t4, 0x0249($s0) ## 00000249 /* 00A1C 809B433C 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00A20 809B4340 10000030 */ beq $zero, $zero, .L809B4404 +/* 00A20 809B4340 10000030 */ beq $zero, $zero, .L809B4404 /* 00A24 809B4344 A20D0249 */ sb $t5, 0x0249($s0) ## 00000249 .L809B4348: /* 00A28 809B4348 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy -/* 00A2C 809B434C AFA50044 */ sw $a1, 0x0044($sp) +/* 00A2C 809B434C AFA50044 */ sw $a1, 0x0044($sp) /* 00A30 809B4350 0C00B638 */ jal Actor_MoveForward - + /* 00A34 809B4354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A38 809B4358 8FA4009C */ lw $a0, 0x009C($sp) +/* 00A38 809B4358 8FA4009C */ lw $a0, 0x009C($sp) /* 00A3C 809B435C 260E0074 */ addiu $t6, $s0, 0x0074 ## $t6 = 00000074 /* 00A40 809B4360 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00A44 809B4364 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00A48 809B4368 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00A4C 809B436C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00A50 809B4370 27A90090 */ addiu $t1, $sp, 0x0090 ## $t1 = FFFFFFF8 -/* 00A54 809B4374 AFA90024 */ sw $t1, 0x0024($sp) -/* 00A58 809B4378 AFA80020 */ sw $t0, 0x0020($sp) -/* 00A5C 809B437C AFB9001C */ sw $t9, 0x001C($sp) -/* 00A60 809B4380 AFB80018 */ sw $t8, 0x0018($sp) -/* 00A64 809B4384 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00A68 809B4388 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00A54 809B4374 AFA90024 */ sw $t1, 0x0024($sp) +/* 00A58 809B4378 AFA80020 */ sw $t0, 0x0020($sp) +/* 00A5C 809B437C AFB9001C */ sw $t9, 0x001C($sp) +/* 00A60 809B4380 AFB80018 */ sw $t8, 0x0018($sp) +/* 00A64 809B4384 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00A68 809B4388 AFAE0010 */ sw $t6, 0x0010($sp) /* 00A6C 809B438C 26050100 */ addiu $a1, $s0, 0x0100 ## $a1 = 00000100 -/* 00A70 809B4390 8FA60044 */ lw $a2, 0x0044($sp) +/* 00A70 809B4390 8FA60044 */ lw $a2, 0x0044($sp) /* 00A74 809B4394 27A70084 */ addiu $a3, $sp, 0x0084 ## $a3 = FFFFFFEC -/* 00A78 809B4398 0C00F80B */ jal func_8003E02C +/* 00A78 809B4398 0C00F80B */ jal func_8003E02C /* 00A7C 809B439C 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 /* 00A80 809B43A0 304A00FF */ andi $t2, $v0, 0x00FF ## $t2 = 00000000 -/* 00A84 809B43A4 1140000E */ beq $t2, $zero, .L809B43E0 +/* 00A84 809B43A4 1140000E */ beq $t2, $zero, .L809B43E0 /* 00A88 809B43A8 A202024A */ sb $v0, 0x024A($s0) ## 0000024A /* 00A8C 809B43AC 8E060074 */ lw $a2, 0x0074($s0) ## 00000074 /* 00A90 809B43B0 27AB0084 */ addiu $t3, $sp, 0x0084 ## $t3 = FFFFFFEC -/* 00A94 809B43B4 AFAB0010 */ sw $t3, 0x0010($sp) -/* 00A98 809B43B8 8FA4009C */ lw $a0, 0x009C($sp) +/* 00A94 809B43B4 AFAB0010 */ sw $t3, 0x0010($sp) +/* 00A98 809B43B8 8FA4009C */ lw $a0, 0x009C($sp) /* 00A9C 809B43BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00AA0 809B43C0 0C00BE7B */ jal func_8002F9EC -/* 00AA4 809B43C4 8FA70090 */ lw $a3, 0x0090($sp) +/* 00AA0 809B43C0 0C00BE7B */ jal func_8002F9EC +/* 00AA4 809B43C4 8FA70090 */ lw $a3, 0x0090($sp) /* 00AA8 809B43C8 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 00AAC 809B43CC 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy -/* 00AB0 809B43D0 8FA50044 */ lw $a1, 0x0044($sp) -/* 00AB4 809B43D4 8FA40044 */ lw $a0, 0x0044($sp) +/* 00AB0 809B43D0 8FA50044 */ lw $a1, 0x0044($sp) +/* 00AB4 809B43D4 8FA40044 */ lw $a0, 0x0044($sp) /* 00AB8 809B43D8 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 00ABC 809B43DC 27A50084 */ addiu $a1, $sp, 0x0084 ## $a1 = FFFFFFEC .L809B43E0: /* 00AC0 809B43E0 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 00AC4 809B43E4 29810009 */ slti $at, $t4, 0x0009 -/* 00AC8 809B43E8 50200007 */ beql $at, $zero, .L809B4408 +/* 00AC4 809B43E4 29810009 */ slti $at, $t4, 0x0009 +/* 00AC8 809B43E8 50200007 */ beql $at, $zero, .L809B4408 /* 00ACC 809B43EC 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C /* 00AD0 809B43F0 C60E0060 */ lwc1 $f14, 0x0060($s0) ## 00000060 /* 00AD4 809B43F4 C60C0068 */ lwc1 $f12, 0x0068($s0) ## 00000068 /* 00AD8 809B43F8 0C034199 */ jal atan2s - -/* 00ADC 809B43FC 46007387 */ neg.s $f14, $f14 + +/* 00ADC 809B43FC 46007387 */ neg.s $f14, $f14 /* 00AE0 809B4400 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 .L809B4404: /* 00AE4 809B4404 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C .L809B4408: -/* 00AE8 809B4408 50400071 */ beql $v0, $zero, .L809B45D0 -/* 00AEC 809B440C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00AE8 809B4408 50400071 */ beql $v0, $zero, .L809B45D0 +/* 00AEC 809B440C 8FBF0034 */ lw $ra, 0x0034($sp) /* 00AF0 809B4410 8C4D0130 */ lw $t5, 0x0130($v0) ## 00000130 /* 00AF4 809B4414 26040210 */ addiu $a0, $s0, 0x0210 ## $a0 = 00000210 /* 00AF8 809B4418 26050250 */ addiu $a1, $s0, 0x0250 ## $a1 = 00000250 -/* 00AFC 809B441C 11A0006A */ beq $t5, $zero, .L809B45C8 -/* 00B00 809B4420 8FAE009C */ lw $t6, 0x009C($sp) +/* 00AFC 809B441C 11A0006A */ beq $t5, $zero, .L809B45C8 +/* 00B00 809B4420 8FAE009C */ lw $t6, 0x009C($sp) /* 00B04 809B4424 25CF07C0 */ addiu $t7, $t6, 0x07C0 ## $t7 = 000007C0 -/* 00B08 809B4428 AFAF003C */ sw $t7, 0x003C($sp) +/* 00B08 809B4428 AFAF003C */ sw $t7, 0x003C($sp) /* 00B0C 809B442C 27A60060 */ addiu $a2, $sp, 0x0060 ## $a2 = FFFFFFC8 /* 00B10 809B4430 0C01DFA7 */ jal Math_Vec3f_Sum ## Vec3f_Add -/* 00B14 809B4434 AFA50040 */ sw $a1, 0x0040($sp) -/* 00B18 809B4438 8FA40044 */ lw $a0, 0x0044($sp) -/* 00B1C 809B443C 8FA50040 */ lw $a1, 0x0040($sp) +/* 00B14 809B4434 AFA50040 */ sw $a1, 0x0040($sp) +/* 00B18 809B4438 8FA40044 */ lw $a0, 0x0044($sp) +/* 00B1C 809B443C 8FA50040 */ lw $a1, 0x0040($sp) /* 00B20 809B4440 0C01DFA7 */ jal Math_Vec3f_Sum ## Vec3f_Add /* 00B24 809B4444 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFBC @@ -321,73 +321,73 @@ glabel func_809B3FDC /* 00B34 809B4454 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 00B38 809B4458 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00B3C 809B445C 27AB0090 */ addiu $t3, $sp, 0x0090 ## $t3 = FFFFFFF8 -/* 00B40 809B4460 AFAB0024 */ sw $t3, 0x0024($sp) -/* 00B44 809B4464 AFAA0020 */ sw $t2, 0x0020($sp) -/* 00B48 809B4468 AFA9001C */ sw $t1, 0x001C($sp) -/* 00B4C 809B446C AFA80018 */ sw $t0, 0x0018($sp) -/* 00B50 809B4470 AFB90014 */ sw $t9, 0x0014($sp) -/* 00B54 809B4474 AFB80010 */ sw $t8, 0x0010($sp) -/* 00B58 809B4478 8FA4003C */ lw $a0, 0x003C($sp) +/* 00B40 809B4460 AFAB0024 */ sw $t3, 0x0024($sp) +/* 00B44 809B4464 AFAA0020 */ sw $t2, 0x0020($sp) +/* 00B48 809B4468 AFA9001C */ sw $t1, 0x001C($sp) +/* 00B4C 809B446C AFA80018 */ sw $t0, 0x0018($sp) +/* 00B50 809B4470 AFB90014 */ sw $t9, 0x0014($sp) +/* 00B54 809B4474 AFB80010 */ sw $t8, 0x0010($sp) +/* 00B58 809B4478 8FA4003C */ lw $a0, 0x003C($sp) /* 00B5C 809B447C 27A50060 */ addiu $a1, $sp, 0x0060 ## $a1 = FFFFFFC8 /* 00B60 809B4480 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFBC -/* 00B64 809B4484 0C00F7A1 */ jal func_8003DE84 +/* 00B64 809B4484 0C00F7A1 */ jal func_8003DE84 /* 00B68 809B4488 27A70084 */ addiu $a3, $sp, 0x0084 ## $a3 = FFFFFFEC -/* 00B6C 809B448C 1040003D */ beq $v0, $zero, .L809B4584 -/* 00B70 809B4490 8FA40044 */ lw $a0, 0x0044($sp) -/* 00B74 809B4494 C7B20084 */ lwc1 $f18, 0x0084($sp) -/* 00B78 809B4498 C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 00B7C 809B449C C7A80084 */ lwc1 $f8, 0x0084($sp) +/* 00B6C 809B448C 1040003D */ beq $v0, $zero, .L809B4584 +/* 00B70 809B4490 8FA40044 */ lw $a0, 0x0044($sp) +/* 00B74 809B4494 C7B20084 */ lwc1 $f18, 0x0084($sp) +/* 00B78 809B4498 C7A40054 */ lwc1 $f4, 0x0054($sp) +/* 00B7C 809B449C C7A80084 */ lwc1 $f8, 0x0084($sp) /* 00B80 809B44A0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00B84 809B44A4 4612203E */ c.le.s $f4, $f18 +/* 00B84 809B44A4 4612203E */ c.le.s $f4, $f18 /* 00B88 809B44A8 00000000 */ nop -/* 00B8C 809B44AC 45020008 */ bc1fl .L809B44D0 +/* 00B8C 809B44AC 45020008 */ bc1fl .L809B44D0 /* 00B90 809B44B0 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 /* 00B94 809B44B4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00B98 809B44B8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00B9C 809B44BC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00BA0 809B44C0 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 00BA4 809B44C4 10000005 */ beq $zero, $zero, .L809B44DC -/* 00BA8 809B44C8 46001006 */ mov.s $f0, $f2 +/* 00BA4 809B44C4 10000005 */ beq $zero, $zero, .L809B44DC +/* 00BA8 809B44C8 46001006 */ mov.s $f0, $f2 /* 00BAC 809B44CC 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 .L809B44D0: /* 00BB0 809B44D0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00BB4 809B44D4 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00BB8 809B44D8 46006006 */ mov.s $f0, $f12 +/* 00BB8 809B44D8 46006006 */ mov.s $f0, $f12 .L809B44DC: -/* 00BBC 809B44DC 46080180 */ add.s $f6, $f0, $f8 +/* 00BBC 809B44DC 46080180 */ add.s $f6, $f0, $f8 /* 00BC0 809B44E0 8E0C024C */ lw $t4, 0x024C($s0) ## 0000024C /* 00BC4 809B44E4 E5860024 */ swc1 $f6, 0x0024($t4) ## 00000024 -/* 00BC8 809B44E8 C7AA0088 */ lwc1 $f10, 0x0088($sp) -/* 00BCC 809B44EC C7B00058 */ lwc1 $f16, 0x0058($sp) -/* 00BD0 809B44F0 C7B20088 */ lwc1 $f18, 0x0088($sp) -/* 00BD4 809B44F4 460A803E */ c.le.s $f16, $f10 +/* 00BC8 809B44E8 C7AA0088 */ lwc1 $f10, 0x0088($sp) +/* 00BCC 809B44EC C7B00058 */ lwc1 $f16, 0x0058($sp) +/* 00BD0 809B44F0 C7B20088 */ lwc1 $f18, 0x0088($sp) +/* 00BD4 809B44F4 460A803E */ c.le.s $f16, $f10 /* 00BD8 809B44F8 00000000 */ nop -/* 00BDC 809B44FC 45020004 */ bc1fl .L809B4510 -/* 00BE0 809B4500 46006006 */ mov.s $f0, $f12 -/* 00BE4 809B4504 10000002 */ beq $zero, $zero, .L809B4510 -/* 00BE8 809B4508 46001006 */ mov.s $f0, $f2 -/* 00BEC 809B450C 46006006 */ mov.s $f0, $f12 +/* 00BDC 809B44FC 45020004 */ bc1fl .L809B4510 +/* 00BE0 809B4500 46006006 */ mov.s $f0, $f12 +/* 00BE4 809B4504 10000002 */ beq $zero, $zero, .L809B4510 +/* 00BE8 809B4508 46001006 */ mov.s $f0, $f2 +/* 00BEC 809B450C 46006006 */ mov.s $f0, $f12 .L809B4510: -/* 00BF0 809B4510 46120100 */ add.s $f4, $f0, $f18 +/* 00BF0 809B4510 46120100 */ add.s $f4, $f0, $f18 /* 00BF4 809B4514 8E0D024C */ lw $t5, 0x024C($s0) ## 0000024C /* 00BF8 809B4518 E5A40028 */ swc1 $f4, 0x0028($t5) ## 00000028 -/* 00BFC 809B451C C7A8008C */ lwc1 $f8, 0x008C($sp) -/* 00C00 809B4520 C7A6005C */ lwc1 $f6, 0x005C($sp) -/* 00C04 809B4524 C7AA008C */ lwc1 $f10, 0x008C($sp) -/* 00C08 809B4528 4608303E */ c.le.s $f6, $f8 +/* 00BFC 809B451C C7A8008C */ lwc1 $f8, 0x008C($sp) +/* 00C00 809B4520 C7A6005C */ lwc1 $f6, 0x005C($sp) +/* 00C04 809B4524 C7AA008C */ lwc1 $f10, 0x008C($sp) +/* 00C08 809B4528 4608303E */ c.le.s $f6, $f8 /* 00C0C 809B452C 00000000 */ nop -/* 00C10 809B4530 45020004 */ bc1fl .L809B4544 -/* 00C14 809B4534 46006006 */ mov.s $f0, $f12 -/* 00C18 809B4538 10000002 */ beq $zero, $zero, .L809B4544 -/* 00C1C 809B453C 46001006 */ mov.s $f0, $f2 -/* 00C20 809B4540 46006006 */ mov.s $f0, $f12 +/* 00C10 809B4530 45020004 */ bc1fl .L809B4544 +/* 00C14 809B4534 46006006 */ mov.s $f0, $f12 +/* 00C18 809B4538 10000002 */ beq $zero, $zero, .L809B4544 +/* 00C1C 809B453C 46001006 */ mov.s $f0, $f2 +/* 00C20 809B4540 46006006 */ mov.s $f0, $f12 .L809B4544: -/* 00C24 809B4544 460A0400 */ add.s $f16, $f0, $f10 +/* 00C24 809B4544 460A0400 */ add.s $f16, $f0, $f10 /* 00C28 809B4548 8E0E024C */ lw $t6, 0x024C($s0) ## 0000024C /* 00C2C 809B454C E5D0002C */ swc1 $f16, 0x002C($t6) ## 0000002C /* 00C30 809B4550 8E04024C */ lw $a0, 0x024C($s0) ## 0000024C -/* 00C34 809B4554 8FA60040 */ lw $a2, 0x0040($sp) -/* 00C38 809B4558 8FA50044 */ lw $a1, 0x0044($sp) +/* 00C34 809B4554 8FA60040 */ lw $a2, 0x0040($sp) +/* 00C38 809B4558 8FA50044 */ lw $a1, 0x0044($sp) /* 00C3C 809B455C 0C01DFB4 */ jal Math_Vec3f_Diff ## Vec3f_Sub /* 00C40 809B4560 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 @@ -395,38 +395,38 @@ glabel func_809B3FDC /* 00C48 809B4568 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 00C4C 809B456C 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF /* 00C50 809B4570 8C4F0004 */ lw $t7, 0x0004($v0) ## 00000004 -/* 00C54 809B4574 01E1C024 */ and $t8, $t7, $at +/* 00C54 809B4574 01E1C024 */ and $t8, $t7, $at /* 00C58 809B4578 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00C5C 809B457C 10000005 */ beq $zero, $zero, .L809B4594 +/* 00C5C 809B457C 10000005 */ beq $zero, $zero, .L809B4594 /* 00C60 809B4580 AE00024C */ sw $zero, 0x024C($s0) ## 0000024C .L809B4584: /* 00C64 809B4584 8E06024C */ lw $a2, 0x024C($s0) ## 0000024C -/* 00C68 809B4588 8FA50040 */ lw $a1, 0x0040($sp) +/* 00C68 809B4588 8FA50040 */ lw $a1, 0x0040($sp) /* 00C6C 809B458C 0C01DFA7 */ jal Math_Vec3f_Sum ## Vec3f_Add /* 00C70 809B4590 24C60024 */ addiu $a2, $a2, 0x0024 ## $a2 = 00000024 .L809B4594: /* 00C74 809B4594 9219024A */ lbu $t9, 0x024A($s0) ## 0000024A -/* 00C78 809B4598 5320000D */ beql $t9, $zero, .L809B45D0 -/* 00C7C 809B459C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00C78 809B4598 5320000D */ beql $t9, $zero, .L809B45D0 +/* 00C7C 809B459C 8FBF0034 */ lw $ra, 0x0034($sp) /* 00C80 809B45A0 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C -/* 00C84 809B45A4 5040000A */ beql $v0, $zero, .L809B45D0 -/* 00C88 809B45A8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00C84 809B45A4 5040000A */ beql $v0, $zero, .L809B45D0 +/* 00C88 809B45A8 8FBF0034 */ lw $ra, 0x0034($sp) /* 00C8C 809B45AC 8C480004 */ lw $t0, 0x0004($v0) ## 00000004 /* 00C90 809B45B0 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 00C94 809B45B4 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 00C98 809B45B8 01014824 */ and $t1, $t0, $at +/* 00C98 809B45B8 01014824 */ and $t1, $t0, $at /* 00C9C 809B45BC AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00CA0 809B45C0 10000002 */ beq $zero, $zero, .L809B45CC +/* 00CA0 809B45C0 10000002 */ beq $zero, $zero, .L809B45CC /* 00CA4 809B45C4 AE00024C */ sw $zero, 0x024C($s0) ## 0000024C .L809B45C8: /* 00CA8 809B45C8 AE00024C */ sw $zero, 0x024C($s0) ## 0000024C .L809B45CC: -/* 00CAC 809B45CC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00CAC 809B45CC 8FBF0034 */ lw $ra, 0x0034($sp) .L809B45D0: -/* 00CB0 809B45D0 8FB00030 */ lw $s0, 0x0030($sp) +/* 00CB0 809B45D0 8FB00030 */ lw $s0, 0x0030($sp) /* 00CB4 809B45D4 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 00CB8 809B45D8 03E00008 */ jr $ra +/* 00CB8 809B45D8 03E00008 */ jr $ra /* 00CBC 809B45DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s index cb31752454..b075b24c8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s @@ -1,13 +1,13 @@ glabel func_809BFAE8 /* 00248 809BFAE8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0024C 809BFAEC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0024C 809BFAEC AFBF0014 */ sw $ra, 0x0014($sp) /* 00250 809BFAF0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00254 809BFAF4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00258 809BFAF8 24A50064 */ addiu $a1, $a1, 0x0064 ## $a1 = 06000064 -/* 0025C 809BFAFC AFA60018 */ sw $a2, 0x0018($sp) -/* 00260 809BFB00 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 0025C 809BFAFC AFA60018 */ sw $a2, 0x0018($sp) +/* 00260 809BFB00 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00264 809BFB04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00268 809BFB08 8FA60018 */ lw $a2, 0x0018($sp) +/* 00268 809BFB08 8FA60018 */ lw $a2, 0x0018($sp) /* 0026C 809BFB0C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00270 809BFB10 3C18809C */ lui $t8, %hi(func_809C04B4) ## $t8 = 809C0000 /* 00274 809BFB14 90CE01E4 */ lbu $t6, 0x01E4($a2) ## 000001E4 @@ -17,9 +17,9 @@ glabel func_809BFAE8 /* 00284 809BFB24 A0CF01E4 */ sb $t7, 0x01E4($a2) ## 000001E4 /* 00288 809BFB28 E4C00068 */ swc1 $f0, 0x0068($a2) ## 00000068 /* 0028C 809BFB2C E4C00060 */ swc1 $f0, 0x0060($a2) ## 00000060 -/* 00290 809BFB30 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00290 809BFB30 8FBF0014 */ lw $ra, 0x0014($sp) /* 00294 809BFB34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00298 809BFB38 03E00008 */ jr $ra +/* 00298 809BFB38 03E00008 */ jr $ra /* 0029C 809BFB3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s index 8db0eb3b99..8230ead551 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s @@ -1,26 +1,26 @@ glabel func_809CAE44 /* 00334 809CAE44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00338 809CAE48 AFA5001C */ sw $a1, 0x001C($sp) -/* 0033C 809CAE4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00340 809CAE50 AFA40018 */ sw $a0, 0x0018($sp) +/* 00338 809CAE48 AFA5001C */ sw $a1, 0x001C($sp) +/* 0033C 809CAE4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00340 809CAE50 AFA40018 */ sw $a0, 0x0018($sp) /* 00344 809CAE54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00348 809CAE58 24A51750 */ addiu $a1, $a1, 0x1750 ## $a1 = 06001750 -/* 0034C 809CAE5C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 0034C 809CAE5C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00350 809CAE60 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00354 809CAE64 8FA4001C */ lw $a0, 0x001C($sp) -/* 00358 809CAE68 8FAE0018 */ lw $t6, 0x0018($sp) +/* 00354 809CAE64 8FA4001C */ lw $a0, 0x001C($sp) +/* 00358 809CAE68 8FAE0018 */ lw $t6, 0x0018($sp) /* 0035C 809CAE6C 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00360 809CAE70 0C00FAFE */ jal func_8003EBF8 +/* 00360 809CAE70 0C00FAFE */ jal func_8003EBF8 /* 00364 809CAE74 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00368 809CAE78 8FA20018 */ lw $v0, 0x0018($sp) +/* 00368 809CAE78 8FA20018 */ lw $v0, 0x0018($sp) /* 0036C 809CAE7C 3C18809D */ lui $t8, %hi(func_809CB114) ## $t8 = 809D0000 /* 00370 809CAE80 240F03E8 */ addiu $t7, $zero, 0x03E8 ## $t7 = 000003E8 /* 00374 809CAE84 2718B114 */ addiu $t8, $t8, %lo(func_809CB114) ## $t8 = 809CB114 /* 00378 809CAE88 A44F01AE */ sh $t7, 0x01AE($v0) ## 000001AE /* 0037C 809CAE8C AC5801A8 */ sw $t8, 0x01A8($v0) ## 000001A8 -/* 00380 809CAE90 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00380 809CAE90 8FBF0014 */ lw $ra, 0x0014($sp) /* 00384 809CAE94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00388 809CAE98 03E00008 */ jr $ra +/* 00388 809CAE98 03E00008 */ jr $ra /* 0038C 809CAE9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s index eb1d0723a9..2c1c46b032 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s @@ -1,20 +1,20 @@ glabel func_809E5FBC /* 007EC 809E5FBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007F0 809E5FC0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 007F0 809E5FC0 AFBF0014 */ sw $ra, 0x0014($sp) /* 007F4 809E5FC4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 007F8 809E5FC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007FC 809E5FCC 24A50208 */ addiu $a1, $a1, 0x0208 ## $a1 = 06000208 -/* 00800 809E5FD0 AFA60018 */ sw $a2, 0x0018($sp) -/* 00804 809E5FD4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00800 809E5FD0 AFA60018 */ sw $a2, 0x0018($sp) +/* 00804 809E5FD4 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00808 809E5FD8 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C -/* 0080C 809E5FDC 8FA60018 */ lw $a2, 0x0018($sp) +/* 0080C 809E5FDC 8FA60018 */ lw $a2, 0x0018($sp) /* 00810 809E5FE0 3C0E809E */ lui $t6, %hi(func_809E7104) ## $t6 = 809E0000 /* 00814 809E5FE4 25CE7104 */ addiu $t6, $t6, %lo(func_809E7104) ## $t6 = 809E7104 /* 00818 809E5FE8 A4C001C6 */ sh $zero, 0x01C6($a2) ## 000001C6 /* 0081C 809E5FEC ACCE01C0 */ sw $t6, 0x01C0($a2) ## 000001C0 -/* 00820 809E5FF0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00820 809E5FF0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00824 809E5FF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00828 809E5FF8 03E00008 */ jr $ra +/* 00828 809E5FF8 03E00008 */ jr $ra /* 0082C 809E5FFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s index 16965f71c2..126c9cc071 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s @@ -1,21 +1,21 @@ glabel func_809E97B8 /* 00258 809E97B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0025C 809E97BC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0025C 809E97BC AFBF0014 */ sw $ra, 0x0014($sp) /* 00260 809E97C0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00264 809E97C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00268 809E97C8 24A501C4 */ addiu $a1, $a1, 0x01C4 ## $a1 = 060001C4 -/* 0026C 809E97CC AFA60018 */ sw $a2, 0x0018($sp) -/* 00270 809E97D0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 0026C 809E97CC AFA60018 */ sw $a2, 0x0018($sp) +/* 00270 809E97D0 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00274 809E97D4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00278 809E97D8 8FA60018 */ lw $a2, 0x0018($sp) +/* 00278 809E97D8 8FA60018 */ lw $a2, 0x0018($sp) /* 0027C 809E97DC 3C0F809F */ lui $t7, %hi(func_809E9F6C) ## $t7 = 809F0000 /* 00280 809E97E0 25EF9F6C */ addiu $t7, $t7, %lo(func_809E9F6C) ## $t7 = 809E9F6C /* 00284 809E97E4 84CE019A */ lh $t6, 0x019A($a2) ## 0000019A /* 00288 809E97E8 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 0028C 809E97EC A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 -/* 00290 809E97F0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00290 809E97F0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00294 809E97F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00298 809E97F8 03E00008 */ jr $ra +/* 00298 809E97F8 03E00008 */ jr $ra /* 0029C 809E97FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s index fc7cc9792d..fc2f3cbd80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s @@ -1,24 +1,24 @@ glabel func_809E9B48 /* 005E8 809E9B48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005EC 809E9B4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 005EC 809E9B4C AFBF0014 */ sw $ra, 0x0014($sp) /* 005F0 809E9B50 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 005F4 809E9B54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005F8 809E9B58 24A506B0 */ addiu $a1, $a1, 0x06B0 ## $a1 = 060006B0 -/* 005FC 809E9B5C AFA60018 */ sw $a2, 0x0018($sp) -/* 00600 809E9B60 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 005FC 809E9B5C AFA60018 */ sw $a2, 0x0018($sp) +/* 00600 809E9B60 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00604 809E9B64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00608 809E9B68 8FA40018 */ lw $a0, 0x0018($sp) +/* 00608 809E9B68 8FA40018 */ lw $a0, 0x0018($sp) /* 0060C 809E9B6C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00610 809E9B70 3C0E809F */ lui $t6, %hi(func_809EA5B0) ## $t6 = 809F0000 /* 00614 809E9B74 25CEA5B0 */ addiu $t6, $t6, %lo(func_809EA5B0) ## $t6 = 809EA5B0 /* 00618 809E9B78 24053881 */ addiu $a1, $zero, 0x3881 ## $a1 = 00003881 /* 0061C 809E9B7C AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 /* 00620 809E9B80 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00624 809E9B84 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00628 809E9B88 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00628 809E9B88 8FBF0014 */ lw $ra, 0x0014($sp) /* 0062C 809E9B8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00630 809E9B90 03E00008 */ jr $ra +/* 00630 809E9B90 03E00008 */ jr $ra /* 00634 809E9B94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s index 749a148a9e..21796e0f60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s @@ -1,30 +1,30 @@ glabel func_809EB624 /* 008E4 809EB624 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 008E8 809EB628 AFB00028 */ sw $s0, 0x0028($sp) +/* 008E8 809EB628 AFB00028 */ sw $s0, 0x0028($sp) /* 008EC 809EB62C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008F0 809EB630 AFBF002C */ sw $ra, 0x002C($sp) +/* 008F0 809EB630 AFBF002C */ sw $ra, 0x002C($sp) /* 008F4 809EB634 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008F8 809EB638 AFA50044 */ sw $a1, 0x0044($sp) +/* 008F8 809EB638 AFA50044 */ sw $a1, 0x0044($sp) /* 008FC 809EB63C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00900 809EB640 AFA40034 */ sw $a0, 0x0034($sp) -/* 00904 809EB644 10400005 */ beq $v0, $zero, .L809EB65C + +/* 00900 809EB640 AFA40034 */ sw $a0, 0x0034($sp) +/* 00904 809EB644 10400005 */ beq $v0, $zero, .L809EB65C /* 00908 809EB648 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0090C 809EB64C 920E0250 */ lbu $t6, 0x0250($s0) ## 00000250 /* 00910 809EB650 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00914 809EB654 10000023 */ beq $zero, $zero, .L809EB6E4 +/* 00914 809EB654 10000023 */ beq $zero, $zero, .L809EB6E4 /* 00918 809EB658 A20F0250 */ sb $t7, 0x0250($s0) ## 00000250 .L809EB65C: /* 0091C 809EB65C 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00920 809EB660 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 /* 00924 809EB664 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00928 809EB668 4606203C */ c.lt.s $f4, $f6 +/* 00928 809EB668 4606203C */ c.lt.s $f4, $f6 /* 0092C 809EB66C 00000000 */ nop -/* 00930 809EB670 45030005 */ bc1tl .L809EB688 +/* 00930 809EB670 45030005 */ bc1tl .L809EB688 /* 00934 809EB674 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00938 809EB678 0C00B821 */ jal func_8002E084 +/* 00938 809EB678 0C00B821 */ jal func_8002E084 /* 0093C 809EB67C 24052AAA */ addiu $a1, $zero, 0x2AAA ## $a1 = 00002AAA -/* 00940 809EB680 14400018 */ bne $v0, $zero, .L809EB6E4 +/* 00940 809EB680 14400018 */ bne $v0, $zero, .L809EB6E4 /* 00944 809EB684 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 .L809EB688: /* 00948 809EB688 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 @@ -32,14 +32,14 @@ glabel func_809EB624 /* 00950 809EB690 8E070164 */ lw $a3, 0x0164($s0) ## 00000164 /* 00954 809EB694 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00958 809EB698 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0095C 809EB69C AFB80014 */ sw $t8, 0x0014($sp) +/* 0095C 809EB69C AFB80014 */ sw $t8, 0x0014($sp) /* 00960 809EB6A0 24A54658 */ addiu $a1, $a1, 0x4658 ## $a1 = 06004658 -/* 00964 809EB6A4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00964 809EB6A4 8FA40034 */ lw $a0, 0x0034($sp) /* 00968 809EB6A8 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 0096C 809EB6AC E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 0096C 809EB6AC E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00970 809EB6B0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00974 809EB6B4 E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 00974 809EB6B4 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00978 809EB6B8 8E0802C8 */ lw $t0, 0x02C8($s0) ## 000002C8 /* 0097C 809EB6BC 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 00980 809EB6C0 A2190250 */ sb $t9, 0x0250($s0) ## 00000250 @@ -53,43 +53,43 @@ glabel func_809EB624 /* 009A0 809EB6E0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 .L809EB6E4: /* 009A4 809EB6E4 920B0250 */ lbu $t3, 0x0250($s0) ## 00000250 -/* 009A8 809EB6E8 2D610006 */ sltiu $at, $t3, 0x0006 -/* 009AC 809EB6EC 1020008A */ beq $at, $zero, .L809EB918 -/* 009B0 809EB6F0 000B5880 */ sll $t3, $t3, 2 +/* 009A8 809EB6E8 2D610006 */ sltiu $at, $t3, 0x0006 +/* 009AC 809EB6EC 1020008A */ beq $at, $zero, .L809EB918 +/* 009B0 809EB6F0 000B5880 */ sll $t3, $t3, 2 /* 009B4 809EB6F4 3C01809F */ lui $at, %hi(jtbl_809EC6C0) ## $at = 809F0000 -/* 009B8 809EB6F8 002B0821 */ addu $at, $at, $t3 -/* 009BC 809EB6FC 8C2BC6C0 */ lw $t3, %lo(jtbl_809EC6C0)($at) -/* 009C0 809EB700 01600008 */ jr $t3 +/* 009B8 809EB6F8 002B0821 */ addu $at, $at, $t3 +/* 009BC 809EB6FC 8C2BC6C0 */ lw $t3, %lo(jtbl_809EC6C0)($at) +/* 009C0 809EB700 01600008 */ jr $t3 /* 009C4 809EB704 00000000 */ nop glabel L809EB708 /* 009C8 809EB708 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009CC 809EB70C 24A51A3C */ addiu $a1, $a1, 0x1A3C ## $a1 = 06001A3C -/* 009D0 809EB710 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop -/* 009D4 809EB714 8FA40034 */ lw $a0, 0x0034($sp) +/* 009D0 809EB710 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop +/* 009D4 809EB714 8FA40034 */ lw $a0, 0x0034($sp) /* 009D8 809EB718 920C0250 */ lbu $t4, 0x0250($s0) ## 00000250 /* 009DC 809EB71C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009E0 809EB720 24053900 */ addiu $a1, $zero, 0x3900 ## $a1 = 00003900 /* 009E4 809EB724 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 /* 009E8 809EB728 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 009EC 809EB72C A20D0250 */ sb $t5, 0x0250($s0) ## 00000250 glabel L809EB730 /* 009F0 809EB730 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 009F4 809EB734 AFA00010 */ sw $zero, 0x0010($sp) +/* 009F4 809EB734 AFA00010 */ sw $zero, 0x0010($sp) /* 009F8 809EB738 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 009FC 809EB73C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00A00 809EB740 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00A04 809EB744 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC -/* 00A08 809EB748 10000074 */ beq $zero, $zero, .L809EB91C +/* 00A08 809EB748 10000074 */ beq $zero, $zero, .L809EB91C /* 00A0C 809EB74C 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 glabel L809EB750 /* 00A10 809EB750 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00A14 809EB754 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 /* 00A18 809EB758 C6100164 */ lwc1 $f16, 0x0164($s0) ## 00000164 -/* 00A1C 809EB75C 4610903E */ c.le.s $f18, $f16 +/* 00A1C 809EB75C 4610903E */ c.le.s $f18, $f16 /* 00A20 809EB760 00000000 */ nop -/* 00A24 809EB764 4502000E */ bc1fl .L809EB7A0 +/* 00A24 809EB764 4502000E */ bc1fl .L809EB7A0 /* 00A28 809EB768 920302BC */ lbu $v1, 0x02BC($s0) ## 000002BC /* 00A2C 809EB76C 8E0F02C8 */ lw $t7, 0x02C8($s0) ## 000002C8 /* 00A30 809EB770 240E0011 */ addiu $t6, $zero, 0x0011 ## $t6 = 00000011 @@ -106,7 +106,7 @@ glabel L809EB750 /* 00A5C 809EB79C 920302BC */ lbu $v1, 0x02BC($s0) ## 000002BC .L809EB7A0: /* 00A60 809EB7A0 306A0004 */ andi $t2, $v1, 0x0004 ## $t2 = 00000000 -/* 00A64 809EB7A4 11400010 */ beq $t2, $zero, .L809EB7E8 +/* 00A64 809EB7A4 11400010 */ beq $t2, $zero, .L809EB7E8 /* 00A68 809EB7A8 30790002 */ andi $t9, $v1, 0x0002 ## $t9 = 00000000 /* 00A6C 809EB7AC 8E0C02C8 */ lw $t4, 0x02C8($s0) ## 000002C8 /* 00A70 809EB7B0 306BFFF9 */ andi $t3, $v1, 0xFFF9 ## $t3 = 00000000 @@ -121,76 +121,76 @@ glabel L809EB750 /* 00A94 809EB7D4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 00A98 809EB7D8 920F0250 */ lbu $t7, 0x0250($s0) ## 00000250 /* 00A9C 809EB7DC 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00AA0 809EB7E0 1000004D */ beq $zero, $zero, .L809EB918 +/* 00AA0 809EB7E0 1000004D */ beq $zero, $zero, .L809EB918 /* 00AA4 809EB7E4 A2180250 */ sb $t8, 0x0250($s0) ## 00000250 .L809EB7E8: -/* 00AA8 809EB7E8 1320004B */ beq $t9, $zero, .L809EB918 +/* 00AA8 809EB7E8 1320004B */ beq $t9, $zero, .L809EB918 /* 00AAC 809EB7EC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00AB0 809EB7F0 44810000 */ mtc1 $at, $f0 ## $f0 = 8.00 /* 00AB4 809EB7F4 3068FFFD */ andi $t0, $v1, 0xFFFD ## $t0 = 00000000 /* 00AB8 809EB7F8 A20802BC */ sb $t0, 0x02BC($s0) ## 000002BC /* 00ABC 809EB7FC 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 00AC0 809EB800 44060000 */ mfc1 $a2, $f0 -/* 00AC4 809EB804 8FA40044 */ lw $a0, 0x0044($sp) +/* 00AC0 809EB800 44060000 */ mfc1 $a2, $f0 +/* 00AC4 809EB804 8FA40044 */ lw $a0, 0x0044($sp) /* 00AC8 809EB808 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00ACC 809EB80C 0C00BDC7 */ jal func_8002F71C -/* 00AD0 809EB810 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00AD4 809EB814 10000041 */ beq $zero, $zero, .L809EB91C +/* 00ACC 809EB80C 0C00BDC7 */ jal func_8002F71C +/* 00AD0 809EB810 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00AD4 809EB814 10000041 */ beq $zero, $zero, .L809EB91C /* 00AD8 809EB818 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 glabel L809EB81C /* 00ADC 809EB81C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00AE0 809EB820 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00AE4 809EB824 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 /* 00AE8 809EB828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AEC 809EB82C 4604303E */ c.le.s $f6, $f4 +/* 00AEC 809EB82C 4604303E */ c.le.s $f6, $f4 /* 00AF0 809EB830 00000000 */ nop -/* 00AF4 809EB834 45000017 */ bc1f .L809EB894 +/* 00AF4 809EB834 45000017 */ bc1f .L809EB894 /* 00AF8 809EB838 00000000 */ nop -/* 00AFC 809EB83C 0C00B821 */ jal func_8002E084 +/* 00AFC 809EB83C 0C00B821 */ jal func_8002E084 /* 00B00 809EB840 24052AAA */ addiu $a1, $zero, 0x2AAA ## $a1 = 00002AAA -/* 00B04 809EB844 10400013 */ beq $v0, $zero, .L809EB894 +/* 00B04 809EB844 10400013 */ beq $v0, $zero, .L809EB894 /* 00B08 809EB848 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00B0C 809EB84C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B10 809EB850 24844658 */ addiu $a0, $a0, 0x4658 ## $a0 = 06004658 /* 00B14 809EB854 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00B18 809EB858 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00B1C 809EB85C 44818000 */ mtc1 $at, $f16 ## $f16 = -6.00 -/* 00B20 809EB860 468042A0 */ cvt.s.w $f10, $f8 +/* 00B20 809EB860 468042A0 */ cvt.s.w $f10, $f8 /* 00B24 809EB864 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B28 809EB868 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00B2C 809EB86C AFA90014 */ sw $t1, 0x0014($sp) +/* 00B2C 809EB86C AFA90014 */ sw $t1, 0x0014($sp) /* 00B30 809EB870 24A54658 */ addiu $a1, $a1, 0x4658 ## $a1 = 06004658 -/* 00B34 809EB874 8FA40034 */ lw $a0, 0x0034($sp) -/* 00B38 809EB878 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00B34 809EB874 8FA40034 */ lw $a0, 0x0034($sp) +/* 00B38 809EB878 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00B3C 809EB87C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B40 809EB880 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 00B44 809EB884 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B48 809EB888 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 00B4C 809EB88C 10000022 */ beq $zero, $zero, .L809EB918 + +/* 00B48 809EB888 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 00B4C 809EB88C 10000022 */ beq $zero, $zero, .L809EB918 /* 00B50 809EB890 A2000250 */ sb $zero, 0x0250($s0) ## 00000250 .L809EB894: /* 00B54 809EB894 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00B58 809EB898 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B5C 809EB89C 24844658 */ addiu $a0, $a0, 0x4658 ## $a0 = 06004658 /* 00B60 809EB8A0 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 00B64 809EB8A4 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00B68 809EB8A8 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 -/* 00B6C 809EB8AC 468094A0 */ cvt.s.w $f18, $f18 +/* 00B6C 809EB8AC 468094A0 */ cvt.s.w $f18, $f18 /* 00B70 809EB8B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00B74 809EB8B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B78 809EB8B8 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 00B7C 809EB8BC AFAA0014 */ sw $t2, 0x0014($sp) +/* 00B7C 809EB8BC AFAA0014 */ sw $t2, 0x0014($sp) /* 00B80 809EB8C0 24A54658 */ addiu $a1, $a1, 0x4658 ## $a1 = 06004658 -/* 00B84 809EB8C4 44079000 */ mfc1 $a3, $f18 -/* 00B88 809EB8C8 8FA40034 */ lw $a0, 0x0034($sp) +/* 00B84 809EB8C4 44079000 */ mfc1 $a3, $f18 +/* 00B88 809EB8C8 8FA40034 */ lw $a0, 0x0034($sp) /* 00B8C 809EB8CC 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 00B90 809EB8D0 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00B90 809EB8D0 E7A60018 */ swc1 $f6, 0x0018($sp) /* 00B94 809EB8D4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B98 809EB8D8 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 00B98 809EB8D8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00B9C 809EB8DC 920B0250 */ lbu $t3, 0x0250($s0) ## 00000250 /* 00BA0 809EB8E0 8E0D02C8 */ lw $t5, 0x02C8($s0) ## 000002C8 /* 00BA4 809EB8E4 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 @@ -202,20 +202,20 @@ glabel L809EB81C /* 00BBC 809EB8FC A0400005 */ sb $zero, 0x0005($v0) ## 00000005 /* 00BC0 809EB900 8E0202C8 */ lw $v0, 0x02C8($s0) ## 000002C8 /* 00BC4 809EB904 904F0005 */ lbu $t7, 0x0005($v0) ## 00000005 -/* 00BC8 809EB908 10000003 */ beq $zero, $zero, .L809EB918 +/* 00BC8 809EB908 10000003 */ beq $zero, $zero, .L809EB918 /* 00BCC 809EB90C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 glabel L809EB910 -/* 00BD0 809EB910 0C27ACCD */ jal func_809EB334 +/* 00BD0 809EB910 0C27ACCD */ jal func_809EB334 /* 00BD4 809EB914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 glabel L809EB918 .L809EB918: /* 00BD8 809EB918 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 .L809EB91C: /* 00BDC 809EB91C A6180032 */ sh $t8, 0x0032($s0) ## 00000032 -/* 00BE0 809EB920 8FBF002C */ lw $ra, 0x002C($sp) -/* 00BE4 809EB924 8FB00028 */ lw $s0, 0x0028($sp) +/* 00BE0 809EB920 8FBF002C */ lw $ra, 0x002C($sp) +/* 00BE4 809EB924 8FB00028 */ lw $s0, 0x0028($sp) /* 00BE8 809EB928 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00BEC 809EB92C 03E00008 */ jr $ra +/* 00BEC 809EB92C 03E00008 */ jr $ra /* 00BF0 809EB930 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s index c9591fb6f6..ec60517eec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s @@ -1,23 +1,23 @@ glabel func_809F8B2C /* 008DC 809F8B2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008E0 809F8B30 AFBF0014 */ sw $ra, 0x0014($sp) +/* 008E0 809F8B30 AFBF0014 */ sw $ra, 0x0014($sp) /* 008E4 809F8B34 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 008E8 809F8B38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008EC 809F8B3C 24A53088 */ addiu $a1, $a1, 0x3088 ## $a1 = 06003088 -/* 008F0 809F8B40 AFA60018 */ sw $a2, 0x0018($sp) -/* 008F4 809F8B44 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 008F0 809F8B40 AFA60018 */ sw $a2, 0x0018($sp) +/* 008F4 809F8B44 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 008F8 809F8B48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008FC 809F8B4C 8FA40018 */ lw $a0, 0x0018($sp) +/* 008FC 809F8B4C 8FA40018 */ lw $a0, 0x0018($sp) /* 00900 809F8B50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00904 809F8B54 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00908 809F8B58 3C0580A0 */ lui $a1, %hi(func_809F8D0C) ## $a1 = 80A00000 /* 0090C 809F8B5C 24A58D0C */ addiu $a1, $a1, %lo(func_809F8D0C) ## $a1 = 809F8D0C /* 00910 809F8B60 AC8E0304 */ sw $t6, 0x0304($a0) ## 00000304 -/* 00914 809F8B64 0C27E094 */ jal func_809F8250 +/* 00914 809F8B64 0C27E094 */ jal func_809F8250 /* 00918 809F8B68 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 0091C 809F8B6C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0091C 809F8B6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00920 809F8B70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00924 809F8B74 03E00008 */ jr $ra +/* 00924 809F8B74 03E00008 */ jr $ra /* 00928 809F8B78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s index 4a1679ba5e..2869d75d34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s @@ -1,14 +1,14 @@ glabel func_80A003DC /* 0043C 80A003DC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00440 80A003E0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00444 80A003E4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00448 80A003E8 AFA50034 */ sw $a1, 0x0034($sp) +/* 00444 80A003E4 AFB00020 */ sw $s0, 0x0020($sp) +/* 00448 80A003E8 AFA50034 */ sw $a1, 0x0034($sp) /* 0044C 80A003EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00450 80A003F0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00450 80A003F0 AFBF0024 */ sw $ra, 0x0024($sp) /* 00454 80A003F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00458 80A003F8 24A50704 */ addiu $a1, $a1, 0x0704 ## $a1 = 06000704 /* 0045C 80A003FC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00460 80A00400 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00460 80A00400 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00464 80A00404 E484FF1C */ swc1 $f4, -0x00E4($a0) ## 00000068 /* 00468 80A00408 3C0EFFCF */ lui $t6, 0xFFCF ## $t6 = FFCF0000 /* 0046C 80A0040C 35CEFFFF */ ori $t6, $t6, 0xFFFF ## $t6 = FFCFFFFF @@ -34,27 +34,27 @@ glabel func_80A003DC /* 004BC 80A0045C AE180284 */ sw $t8, 0x0284($s0) ## 00000284 /* 004C0 80A00460 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 /* 004C4 80A00464 E60800BC */ swc1 $f8, 0x00BC($s0) ## 000000BC -/* 004C8 80A00468 AFA2002C */ sw $v0, 0x002C($sp) +/* 004C8 80A00468 AFA2002C */ sw $v0, 0x002C($sp) /* 004CC 80A0046C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004D0 80A00470 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 004D4 80A00474 240538C2 */ addiu $a1, $zero, 0x38C2 ## $a1 = 000038C2 /* 004D8 80A00478 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 004DC 80A0047C 240D02BC */ addiu $t5, $zero, 0x02BC ## $t5 = 000002BC -/* 004E0 80A00480 AFAD0014 */ sw $t5, 0x0014($sp) -/* 004E4 80A00484 AFAC0010 */ sw $t4, 0x0010($sp) -/* 004E8 80A00488 8FA40034 */ lw $a0, 0x0034($sp) -/* 004EC 80A0048C 8FA5002C */ lw $a1, 0x002C($sp) +/* 004E0 80A00480 AFAD0014 */ sw $t5, 0x0014($sp) +/* 004E4 80A00484 AFAC0010 */ sw $t4, 0x0010($sp) +/* 004E8 80A00488 8FA40034 */ lw $a0, 0x0034($sp) +/* 004EC 80A0048C 8FA5002C */ lw $a1, 0x002C($sp) /* 004F0 80A00490 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 004F4 80A00494 0C00A527 */ jal func_8002949C +/* 004F4 80A00494 0C00A527 */ jal func_8002949C /* 004F8 80A00498 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004FC 80A0049C 3C0E80A0 */ lui $t6, %hi(func_80A00B18) ## $t6 = 80A00000 /* 00500 80A004A0 25CE0B18 */ addiu $t6, $t6, %lo(func_80A00B18) ## $t6 = 80A00B18 /* 00504 80A004A4 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00508 80A004A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0050C 80A004AC 8FB00020 */ lw $s0, 0x0020($sp) +/* 00508 80A004A8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0050C 80A004AC 8FB00020 */ lw $s0, 0x0020($sp) /* 00510 80A004B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00514 80A004B4 03E00008 */ jr $ra +/* 00514 80A004B4 03E00008 */ jr $ra /* 00518 80A004B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s index 4f1f133b02..00f1ee8ca6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s @@ -1,21 +1,21 @@ glabel func_80A17780 /* 00270 80A17780 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00274 80A17784 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00274 80A17784 AFBF0014 */ sw $ra, 0x0014($sp) /* 00278 80A17788 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0027C 80A1778C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00280 80A17790 24A59DB0 */ addiu $a1, $a1, 0x9DB0 ## $a1 = 06009DB0 -/* 00284 80A17794 AFA60018 */ sw $a2, 0x0018($sp) -/* 00288 80A17798 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00284 80A17794 AFA60018 */ sw $a2, 0x0018($sp) +/* 00288 80A17798 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 0028C 80A1779C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00290 80A177A0 8FA60018 */ lw $a2, 0x0018($sp) +/* 00290 80A177A0 8FA60018 */ lw $a2, 0x0018($sp) /* 00294 80A177A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00298 80A177A8 3C0E80A2 */ lui $t6, %hi(func_80A18500) ## $t6 = 80A20000 /* 0029C 80A177AC 25CE8500 */ addiu $t6, $t6, %lo(func_80A18500) ## $t6 = 80A18500 /* 002A0 80A177B0 ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 /* 002A4 80A177B4 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 002A8 80A177B8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002A8 80A177B8 8FBF0014 */ lw $ra, 0x0014($sp) /* 002AC 80A177BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002B0 80A177C0 03E00008 */ jr $ra +/* 002B0 80A177C0 03E00008 */ jr $ra /* 002B4 80A177C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s index bb18bc56cf..e9e9366f3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s @@ -1,21 +1,21 @@ glabel func_80A17894 /* 00384 80A17894 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00388 80A17898 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00388 80A17898 AFBF0014 */ sw $ra, 0x0014($sp) /* 0038C 80A1789C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00390 80A178A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00394 80A178A4 24A59244 */ addiu $a1, $a1, 0x9244 ## $a1 = 06009244 -/* 00398 80A178A8 AFA60018 */ sw $a2, 0x0018($sp) -/* 0039C 80A178AC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00398 80A178A8 AFA60018 */ sw $a2, 0x0018($sp) +/* 0039C 80A178AC 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 003A0 80A178B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003A4 80A178B4 8FA60018 */ lw $a2, 0x0018($sp) +/* 003A4 80A178B4 8FA60018 */ lw $a2, 0x0018($sp) /* 003A8 80A178B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 003AC 80A178BC 3C0E80A2 */ lui $t6, %hi(func_80A187AC) ## $t6 = 80A20000 /* 003B0 80A178C0 25CE87AC */ addiu $t6, $t6, %lo(func_80A187AC) ## $t6 = 80A187AC /* 003B4 80A178C4 ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 /* 003B8 80A178C8 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 003BC 80A178CC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003BC 80A178CC 8FBF0014 */ lw $ra, 0x0014($sp) /* 003C0 80A178D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003C4 80A178D4 03E00008 */ jr $ra +/* 003C4 80A178D4 03E00008 */ jr $ra /* 003C8 80A178D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s index 6f8d973870..34e615dd75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s @@ -1,25 +1,25 @@ glabel func_80A1817C /* 00C6C 80A1817C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C70 80A18180 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00C70 80A18180 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C74 80A18184 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00C78 80A18188 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00C7C 80A1818C 24A59DB0 */ addiu $a1, $a1, 0x9DB0 ## $a1 = 06009DB0 -/* 00C80 80A18190 AFA60018 */ sw $a2, 0x0018($sp) -/* 00C84 80A18194 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00C80 80A18190 AFA60018 */ sw $a2, 0x0018($sp) +/* 00C84 80A18194 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00C88 80A18198 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C8C 80A1819C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00C8C 80A1819C 8FA40018 */ lw $a0, 0x0018($sp) /* 00C90 80A181A0 848E019A */ lh $t6, 0x019A($a0) ## 0000019A /* 00C94 80A181A4 A4800194 */ sh $zero, 0x0194($a0) ## 00000194 /* 00C98 80A181A8 25CF05DC */ addiu $t7, $t6, 0x05DC ## $t7 = 000005DC -/* 00C9C 80A181AC 0C285DD2 */ jal func_80A17748 +/* 00C9C 80A181AC 0C285DD2 */ jal func_80A17748 /* 00CA0 80A181B0 A48F019A */ sh $t7, 0x019A($a0) ## 0000019A -/* 00CA4 80A181B4 8FA60018 */ lw $a2, 0x0018($sp) +/* 00CA4 80A181B4 8FA60018 */ lw $a2, 0x0018($sp) /* 00CA8 80A181B8 3C1880A2 */ lui $t8, %hi(func_80A198EC) ## $t8 = 80A20000 /* 00CAC 80A181BC 271898EC */ addiu $t8, $t8, %lo(func_80A198EC) ## $t8 = 80A198EC /* 00CB0 80A181C0 ACD80190 */ sw $t8, 0x0190($a2) ## 00000190 -/* 00CB4 80A181C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00CB4 80A181C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00CB8 80A181C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CBC 80A181CC 03E00008 */ jr $ra +/* 00CBC 80A181CC 03E00008 */ jr $ra /* 00CC0 80A181D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s index 102982b5f0..d10115c1b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s @@ -1,13 +1,13 @@ glabel func_80A18310 /* 00E00 80A18310 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E04 80A18314 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00E04 80A18314 AFBF0014 */ sw $ra, 0x0014($sp) /* 00E08 80A18318 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00E0C 80A1831C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E10 80A18320 24A50EA4 */ addiu $a1, $a1, 0x0EA4 ## $a1 = 06000EA4 -/* 00E14 80A18324 AFA60018 */ sw $a2, 0x0018($sp) -/* 00E18 80A18328 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00E14 80A18324 AFA60018 */ sw $a2, 0x0018($sp) +/* 00E18 80A18328 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00E1C 80A1832C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E20 80A18330 8FA60018 */ lw $a2, 0x0018($sp) +/* 00E20 80A18330 8FA60018 */ lw $a2, 0x0018($sp) /* 00E24 80A18334 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00E28 80A18338 3C0F80A2 */ lui $t7, %hi(func_80A19C6C) ## $t7 = 80A20000 /* 00E2C 80A1833C 84CE00B6 */ lh $t6, 0x00B6($a2) ## 000000B6 @@ -16,9 +16,9 @@ glabel func_80A18310 /* 00E38 80A18348 E4C00068 */ swc1 $f0, 0x0068($a2) ## 00000068 /* 00E3C 80A1834C E4C00060 */ swc1 $f0, 0x0060($a2) ## 00000060 /* 00E40 80A18350 A4CE0032 */ sh $t6, 0x0032($a2) ## 00000032 -/* 00E44 80A18354 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00E44 80A18354 8FBF0014 */ lw $ra, 0x0014($sp) /* 00E48 80A18358 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E4C 80A1835C 03E00008 */ jr $ra +/* 00E4C 80A1835C 03E00008 */ jr $ra /* 00E50 80A18360 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s index db127cf202..8222b26fcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s @@ -1,49 +1,49 @@ glabel func_80A198EC /* 023DC 80A198EC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 023E0 80A198F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 023E4 80A198F4 AFB00018 */ sw $s0, 0x0018($sp) -/* 023E8 80A198F8 AFA50044 */ sw $a1, 0x0044($sp) +/* 023E0 80A198F0 AFBF001C */ sw $ra, 0x001C($sp) +/* 023E4 80A198F4 AFB00018 */ sw $s0, 0x0018($sp) +/* 023E8 80A198F8 AFA50044 */ sw $a1, 0x0044($sp) /* 023EC 80A198FC 8482019A */ lh $v0, 0x019A($a0) ## 0000019A /* 023F0 80A19900 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 023F4 80A19904 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 023F8 80A19908 10400003 */ beq $v0, $zero, .L80A19918 +/* 023F8 80A19908 10400003 */ beq $v0, $zero, .L80A19918 /* 023FC 80A1990C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 02400 80A19910 A48E019A */ sh $t6, 0x019A($a0) ## 0000019A /* 02404 80A19914 8482019A */ lh $v0, 0x019A($a0) ## 0000019A .L80A19918: /* 02408 80A19918 8E040118 */ lw $a0, 0x0118($s0) ## 00000118 -/* 0240C 80A1991C 14400016 */ bne $v0, $zero, .L80A19978 +/* 0240C 80A1991C 14400016 */ bne $v0, $zero, .L80A19978 /* 02410 80A19920 8E07011C */ lw $a3, 0x011C($s0) ## 0000011C /* 02414 80A19924 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 02418 80A19928 3C0280A2 */ lui $v0, %hi(func_80A19B9C) ## $v0 = 80A20000 /* 0241C 80A1992C 24429B9C */ addiu $v0, $v0, %lo(func_80A19B9C) ## $v0 = 80A19B9C -/* 02420 80A19930 104F0008 */ beq $v0, $t7, .L80A19954 -/* 02424 80A19934 8FA50044 */ lw $a1, 0x0044($sp) -/* 02428 80A19938 AFA20028 */ sw $v0, 0x0028($sp) -/* 0242C 80A1993C AFA60034 */ sw $a2, 0x0034($sp) -/* 02430 80A19940 0C285F7F */ jal func_80A17DFC -/* 02434 80A19944 AFA70038 */ sw $a3, 0x0038($sp) -/* 02438 80A19948 8FA20028 */ lw $v0, 0x0028($sp) -/* 0243C 80A1994C 8FA60034 */ lw $a2, 0x0034($sp) -/* 02440 80A19950 8FA70038 */ lw $a3, 0x0038($sp) +/* 02420 80A19930 104F0008 */ beq $v0, $t7, .L80A19954 +/* 02424 80A19934 8FA50044 */ lw $a1, 0x0044($sp) +/* 02428 80A19938 AFA20028 */ sw $v0, 0x0028($sp) +/* 0242C 80A1993C AFA60034 */ sw $a2, 0x0034($sp) +/* 02430 80A19940 0C285F7F */ jal func_80A17DFC +/* 02434 80A19944 AFA70038 */ sw $a3, 0x0038($sp) +/* 02438 80A19948 8FA20028 */ lw $v0, 0x0028($sp) +/* 0243C 80A1994C 8FA60034 */ lw $a2, 0x0034($sp) +/* 02440 80A19950 8FA70038 */ lw $a3, 0x0038($sp) .L80A19954: /* 02444 80A19954 8CF80190 */ lw $t8, 0x0190($a3) ## 00000190 /* 02448 80A19958 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0244C 80A1995C 8FA50044 */ lw $a1, 0x0044($sp) -/* 02450 80A19960 50580017 */ beql $v0, $t8, .L80A199C0 +/* 0244C 80A1995C 8FA50044 */ lw $a1, 0x0044($sp) +/* 02450 80A19960 50580017 */ beql $v0, $t8, .L80A199C0 /* 02454 80A19964 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 -/* 02458 80A19968 0C285F7F */ jal func_80A17DFC -/* 0245C 80A1996C AFA60034 */ sw $a2, 0x0034($sp) -/* 02460 80A19970 10000012 */ beq $zero, $zero, .L80A199BC -/* 02464 80A19974 8FA60034 */ lw $a2, 0x0034($sp) +/* 02458 80A19968 0C285F7F */ jal func_80A17DFC +/* 0245C 80A1996C AFA60034 */ sw $a2, 0x0034($sp) +/* 02460 80A19970 10000012 */ beq $zero, $zero, .L80A199BC +/* 02464 80A19974 8FA60034 */ lw $a2, 0x0034($sp) .L80A19978: /* 02468 80A19978 8C830190 */ lw $v1, 0x0190($a0) ## 00000190 /* 0246C 80A1997C 3C0280A2 */ lui $v0, %hi(func_80A19B9C) ## $v0 = 80A20000 /* 02470 80A19980 24429B9C */ addiu $v0, $v0, %lo(func_80A19B9C) ## $v0 = 80A19B9C -/* 02474 80A19984 10430005 */ beq $v0, $v1, .L80A1999C +/* 02474 80A19984 10430005 */ beq $v0, $v1, .L80A1999C /* 02478 80A19988 3C1980A2 */ lui $t9, %hi(func_80A19230) ## $t9 = 80A20000 /* 0247C 80A1998C 27399230 */ addiu $t9, $t9, %lo(func_80A19230) ## $t9 = 80A19230 -/* 02480 80A19990 53230003 */ beql $t9, $v1, .L80A199A0 +/* 02480 80A19990 53230003 */ beql $t9, $v1, .L80A199A0 /* 02484 80A19994 8CE30190 */ lw $v1, 0x0190($a3) ## 00000190 /* 02488 80A19998 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 .L80A1999C: @@ -51,62 +51,62 @@ glabel func_80A198EC .L80A199A0: /* 02490 80A199A0 3C0880A2 */ lui $t0, %hi(func_80A19230) ## $t0 = 80A20000 /* 02494 80A199A4 25089230 */ addiu $t0, $t0, %lo(func_80A19230) ## $t0 = 80A19230 -/* 02498 80A199A8 50430005 */ beql $v0, $v1, .L80A199C0 +/* 02498 80A199A8 50430005 */ beql $v0, $v1, .L80A199C0 /* 0249C 80A199AC C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 -/* 024A0 80A199B0 51030003 */ beql $t0, $v1, .L80A199C0 +/* 024A0 80A199B0 51030003 */ beql $t0, $v1, .L80A199C0 /* 024A4 80A199B4 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 /* 024A8 80A199B8 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000002 .L80A199BC: /* 024AC 80A199BC C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 .L80A199C0: /* 024B0 80A199C0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 024B4 80A199C4 14C1000B */ bne $a2, $at, .L80A199F4 -/* 024B8 80A199C8 46001306 */ mov.s $f12, $f2 +/* 024B4 80A199C4 14C1000B */ bne $a2, $at, .L80A199F4 +/* 024B8 80A199C8 46001306 */ mov.s $f12, $f2 /* 024BC 80A199CC 3C053BE5 */ lui $a1, 0x3BE5 ## $a1 = 3BE50000 /* 024C0 80A199D0 3C063A03 */ lui $a2, 0x3A03 ## $a2 = 3A030000 /* 024C4 80A199D4 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A03126F /* 024C8 80A199D8 34A56042 */ ori $a1, $a1, 0x6042 ## $a1 = 3BE56042 /* 024CC 80A199DC 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 024D0 80A199E0 0C01DE80 */ jal Math_ApproxF - -/* 024D4 80A199E4 E7AC0030 */ swc1 $f12, 0x0030($sp) -/* 024D8 80A199E8 C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 024DC 80A199EC 1000000B */ beq $zero, $zero, .L80A19A1C + +/* 024D4 80A199E4 E7AC0030 */ swc1 $f12, 0x0030($sp) +/* 024D8 80A199E8 C7AC0030 */ lwc1 $f12, 0x0030($sp) +/* 024DC 80A199EC 1000000B */ beq $zero, $zero, .L80A19A1C /* 024E0 80A199F0 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 .L80A199F4: -/* 024E4 80A199F4 14C00009 */ bne $a2, $zero, .L80A19A1C +/* 024E4 80A199F4 14C00009 */ bne $a2, $zero, .L80A19A1C /* 024E8 80A199F8 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 024EC 80A199FC 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 024F0 80A19A00 3C063A03 */ lui $a2, 0x3A03 ## $a2 = 3A030000 /* 024F4 80A19A04 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A03126F /* 024F8 80A19A08 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 024FC 80A19A0C 0C01DE80 */ jal Math_ApproxF - -/* 02500 80A19A10 E7AC0030 */ swc1 $f12, 0x0030($sp) -/* 02504 80A19A14 C7AC0030 */ lwc1 $f12, 0x0030($sp) + +/* 02500 80A19A10 E7AC0030 */ swc1 $f12, 0x0030($sp) +/* 02504 80A19A14 C7AC0030 */ lwc1 $f12, 0x0030($sp) /* 02508 80A19A18 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 .L80A19A1C: /* 0250C 80A19A1C E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 /* 02510 80A19A20 E6020054 */ swc1 $f2, 0x0054($s0) ## 00000054 /* 02514 80A19A24 3C0180A2 */ lui $at, %hi(D_80A1A5A0) ## $at = 80A20000 -/* 02518 80A19A28 C424A5A0 */ lwc1 $f4, %lo(D_80A1A5A0)($at) +/* 02518 80A19A28 C424A5A0 */ lwc1 $f4, %lo(D_80A1A5A0)($at) /* 0251C 80A19A2C 3C0180A2 */ lui $at, %hi(D_80A1A5A4) ## $at = 80A20000 -/* 02520 80A19A30 46046032 */ c.eq.s $f12, $f4 +/* 02520 80A19A30 46046032 */ c.eq.s $f12, $f4 /* 02524 80A19A34 00000000 */ nop -/* 02528 80A19A38 45030007 */ bc1tl .L80A19A58 -/* 0252C 80A19A3C 46026032 */ c.eq.s $f12, $f2 -/* 02530 80A19A40 C426A5A4 */ lwc1 $f6, %lo(D_80A1A5A4)($at) -/* 02534 80A19A44 46066032 */ c.eq.s $f12, $f6 +/* 02528 80A19A38 45030007 */ bc1tl .L80A19A58 +/* 0252C 80A19A3C 46026032 */ c.eq.s $f12, $f2 +/* 02530 80A19A40 C426A5A4 */ lwc1 $f6, %lo(D_80A1A5A4)($at) +/* 02534 80A19A44 46066032 */ c.eq.s $f12, $f6 /* 02538 80A19A48 00000000 */ nop -/* 0253C 80A19A4C 45000008 */ bc1f .L80A19A70 +/* 0253C 80A19A4C 45000008 */ bc1f .L80A19A70 /* 02540 80A19A50 00000000 */ nop -/* 02544 80A19A54 46026032 */ c.eq.s $f12, $f2 +/* 02544 80A19A54 46026032 */ c.eq.s $f12, $f2 .L80A19A58: /* 02548 80A19A58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0254C 80A19A5C 45010004 */ bc1t .L80A19A70 +/* 0254C 80A19A5C 45010004 */ bc1t .L80A19A70 /* 02550 80A19A60 00000000 */ nop /* 02554 80A19A64 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02558 80A19A68 24053934 */ addiu $a1, $zero, 0x3934 ## $a1 = 00003934 /* 0255C 80A19A6C C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 .L80A19A70: @@ -117,78 +117,78 @@ glabel func_80A198EC /* 02570 80A19A80 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 /* 02574 80A19A84 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 /* 02578 80A19A88 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0257C 80A19A8C 468042A0 */ cvt.s.w $f10, $f8 -/* 02580 80A19A90 46005402 */ mul.s $f16, $f10, $f0 +/* 0257C 80A19A8C 468042A0 */ cvt.s.w $f10, $f8 +/* 02580 80A19A90 46005402 */ mul.s $f16, $f10, $f0 /* 02584 80A19A94 00000000 */ nop -/* 02588 80A19A98 46028482 */ mul.s $f18, $f16, $f2 -/* 0258C 80A19A9C 4600910D */ trunc.w.s $f4, $f18 -/* 02590 80A19AA0 440B2000 */ mfc1 $t3, $f4 +/* 02588 80A19A98 46028482 */ mul.s $f18, $f16, $f2 +/* 0258C 80A19A9C 4600910D */ trunc.w.s $f4, $f18 +/* 02590 80A19AA0 440B2000 */ mfc1 $t3, $f4 /* 02594 80A19AA4 00000000 */ nop /* 02598 80A19AA8 A60B0308 */ sh $t3, 0x0308($s0) ## 00000308 /* 0259C 80A19AAC 844C0022 */ lh $t4, 0x0022($v0) ## 80A1A492 /* 025A0 80A19AB0 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 /* 025A4 80A19AB4 00000000 */ nop -/* 025A8 80A19AB8 46803220 */ cvt.s.w $f8, $f6 -/* 025AC 80A19ABC 46004282 */ mul.s $f10, $f8, $f0 +/* 025A8 80A19AB8 46803220 */ cvt.s.w $f8, $f6 +/* 025AC 80A19ABC 46004282 */ mul.s $f10, $f8, $f0 /* 025B0 80A19AC0 00000000 */ nop -/* 025B4 80A19AC4 46025402 */ mul.s $f16, $f10, $f2 -/* 025B8 80A19AC8 4600848D */ trunc.w.s $f18, $f16 -/* 025BC 80A19ACC 440E9000 */ mfc1 $t6, $f18 +/* 025B4 80A19AC4 46025402 */ mul.s $f16, $f10, $f2 +/* 025B8 80A19AC8 4600848D */ trunc.w.s $f18, $f16 +/* 025BC 80A19ACC 440E9000 */ mfc1 $t6, $f18 /* 025C0 80A19AD0 00000000 */ nop /* 025C4 80A19AD4 A60E030A */ sh $t6, 0x030A($s0) ## 0000030A /* 025C8 80A19AD8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 025CC 80A19ADC AFA40024 */ sw $a0, 0x0024($sp) -/* 025D0 80A19AE0 10400026 */ beq $v0, $zero, .L80A19B7C -/* 025D4 80A19AE4 8FA40024 */ lw $a0, 0x0024($sp) + +/* 025CC 80A19ADC AFA40024 */ sw $a0, 0x0024($sp) +/* 025D0 80A19AE0 10400026 */ beq $v0, $zero, .L80A19B7C +/* 025D4 80A19AE4 8FA40024 */ lw $a0, 0x0024($sp) /* 025D8 80A19AE8 3C0180A2 */ lui $at, %hi(D_80A1A5A8) ## $at = 80A20000 -/* 025DC 80A19AEC C426A5A8 */ lwc1 $f6, %lo(D_80A1A5A8)($at) +/* 025DC 80A19AEC C426A5A8 */ lwc1 $f6, %lo(D_80A1A5A8)($at) /* 025E0 80A19AF0 C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 -/* 025E4 80A19AF4 4604303E */ c.le.s $f6, $f4 +/* 025E4 80A19AF4 4604303E */ c.le.s $f6, $f4 /* 025E8 80A19AF8 00000000 */ nop -/* 025EC 80A19AFC 45020013 */ bc1fl .L80A19B4C +/* 025EC 80A19AFC 45020013 */ bc1fl .L80A19B4C /* 025F0 80A19B00 860A0194 */ lh $t2, 0x0194($s0) ## 00000194 /* 025F4 80A19B04 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 025F8 80A19B08 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 025FC 80A19B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02600 80A19B10 01E1C024 */ and $t8, $t7, $at -/* 02604 80A19B14 0C285DDA */ jal func_80A17768 +/* 02600 80A19B10 01E1C024 */ and $t8, $t7, $at +/* 02604 80A19B14 0C285DDA */ jal func_80A17768 /* 02608 80A19B18 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 0260C 80A19B1C 921902F6 */ lbu $t9, 0x02F6($s0) ## 000002F6 /* 02610 80A19B20 A600001C */ sh $zero, 0x001C($s0) ## 0000001C /* 02614 80A19B24 3C0980A2 */ lui $t1, %hi(D_80A1A49C) ## $t1 = 80A20000 /* 02618 80A19B28 37280004 */ ori $t0, $t9, 0x0004 ## $t0 = 00000004 /* 0261C 80A19B2C A20802F6 */ sb $t0, 0x02F6($s0) ## 000002F6 -/* 02620 80A19B30 9129A49C */ lbu $t1, %lo(D_80A1A49C)($t1) +/* 02620 80A19B30 9129A49C */ lbu $t1, %lo(D_80A1A49C)($t1) /* 02624 80A19B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02628 80A19B38 0C285DF2 */ jal func_80A177C8 +/* 02628 80A19B38 0C285DF2 */ jal func_80A177C8 /* 0262C 80A19B3C A20900AF */ sb $t1, 0x00AF($s0) ## 000000AF -/* 02630 80A19B40 1000000F */ beq $zero, $zero, .L80A19B80 +/* 02630 80A19B40 1000000F */ beq $zero, $zero, .L80A19B80 /* 02634 80A19B44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02638 80A19B48 860A0194 */ lh $t2, 0x0194($s0) ## 00000194 .L80A19B4C: /* 0263C 80A19B4C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02640 80A19B50 15400007 */ bne $t2, $zero, .L80A19B70 +/* 02640 80A19B50 15400007 */ bne $t2, $zero, .L80A19B70 /* 02644 80A19B54 00000000 */ nop /* 02648 80A19B58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0264C 80A19B5C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 0264C 80A19B5C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02650 80A19B60 24A539B0 */ addiu $a1, $a1, 0x39B0 ## $a1 = 060039B0 /* 02654 80A19B64 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02658 80A19B68 10000004 */ beq $zero, $zero, .L80A19B7C +/* 02658 80A19B68 10000004 */ beq $zero, $zero, .L80A19B7C /* 0265C 80A19B6C A60B0194 */ sh $t3, 0x0194($s0) ## 00000194 .L80A19B70: -/* 02660 80A19B70 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02660 80A19B70 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02664 80A19B74 24A59DB0 */ addiu $a1, $a1, 0x9DB0 ## $a1 = FFFF9DB0 /* 02668 80A19B78 A6000194 */ sh $zero, 0x0194($s0) ## 00000194 .L80A19B7C: /* 0266C 80A19B7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A19B80: -/* 02670 80A19B80 0C00BE5D */ jal func_8002F974 +/* 02670 80A19B80 0C00BE5D */ jal func_8002F974 /* 02674 80A19B84 24053133 */ addiu $a1, $zero, 0x3133 ## $a1 = 00003133 -/* 02678 80A19B88 8FBF001C */ lw $ra, 0x001C($sp) -/* 0267C 80A19B8C 8FB00018 */ lw $s0, 0x0018($sp) +/* 02678 80A19B88 8FBF001C */ lw $ra, 0x001C($sp) +/* 0267C 80A19B8C 8FB00018 */ lw $s0, 0x0018($sp) /* 02680 80A19B90 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02684 80A19B94 03E00008 */ jr $ra +/* 02684 80A19B94 03E00008 */ jr $ra /* 02688 80A19B98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s index 5891c0526b..3e458b0f02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s @@ -27,7 +27,7 @@ glabel EnGe1_Init /* 00060 80A309D0 8FA40044 */ lw $a0, 0x0044($sp) /* 00064 80A309D4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00068 80A309D8 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 -/* 0006C 80A309DC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 0006C 80A309DC 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00070 80A309E0 8FA40030 */ lw $a0, 0x0030($sp) /* 00074 80A309E4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00078 80A309E8 AFA50030 */ sw $a1, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s index a825463ad1..b505812bb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s @@ -1,20 +1,20 @@ glabel func_80A323B0 /* 01A40 80A323B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01A44 80A323B4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01A48 80A323B8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01A44 80A323B4 AFA40020 */ sw $a0, 0x0020($sp) +/* 01A48 80A323B8 AFBF0014 */ sw $ra, 0x0014($sp) /* 01A4C 80A323BC 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 /* 01A50 80A323C0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01A54 80A323C4 AFA4001C */ sw $a0, 0x001C($sp) -/* 01A58 80A323C8 10400004 */ beq $v0, $zero, .L80A323DC -/* 01A5C 80A323CC 8FA4001C */ lw $a0, 0x001C($sp) -/* 01A60 80A323D0 8FAE0020 */ lw $t6, 0x0020($sp) -/* 01A64 80A323D4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop + +/* 01A54 80A323C4 AFA4001C */ sw $a0, 0x001C($sp) +/* 01A58 80A323C8 10400004 */ beq $v0, $zero, .L80A323DC +/* 01A5C 80A323CC 8FA4001C */ lw $a0, 0x001C($sp) +/* 01A60 80A323D0 8FAE0020 */ lw $t6, 0x0020($sp) +/* 01A64 80A323D4 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 01A68 80A323D8 8DC502B0 */ lw $a1, 0x02B0($t6) ## 000002B0 .L80A323DC: -/* 01A6C 80A323DC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01A6C 80A323DC 8FBF0014 */ lw $ra, 0x0014($sp) /* 01A70 80A323E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01A74 80A323E4 03E00008 */ jr $ra +/* 01A74 80A323E4 03E00008 */ jr $ra /* 01A78 80A323E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s index ef7a26434a..81ee6bbbe9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s @@ -1,13 +1,13 @@ glabel func_80A37670 /* 02360 80A37670 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02364 80A37674 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02364 80A37674 AFBF0014 */ sw $ra, 0x0014($sp) /* 02368 80A37678 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0236C 80A3767C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02370 80A37680 24A503CC */ addiu $a1, $a1, 0x03CC ## $a1 = 060003CC -/* 02374 80A37684 AFA60018 */ sw $a2, 0x0018($sp) -/* 02378 80A37688 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02374 80A37684 AFA60018 */ sw $a2, 0x0018($sp) +/* 02378 80A37688 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 0237C 80A3768C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02380 80A37690 8FA60018 */ lw $a2, 0x0018($sp) +/* 02380 80A37690 8FA60018 */ lw $a2, 0x0018($sp) /* 02384 80A37694 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 02388 80A37698 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 /* 0238C 80A3769C 90CE037C */ lbu $t6, 0x037C($a2) ## 0000037C @@ -17,15 +17,15 @@ glabel func_80A37670 /* 0239C 80A376AC A0CF037C */ sb $t7, 0x037C($a2) ## 0000037C /* 023A0 80A376B0 A4C00312 */ sh $zero, 0x0312($a2) ## 00000312 /* 023A4 80A376B4 24C400E4 */ addiu $a0, $a2, 0x00E4 ## $a0 = 000000E4 -/* 023A8 80A376B8 0C03E291 */ jal func_800F8A44 +/* 023A8 80A376B8 0C03E291 */ jal func_800F8A44 /* 023AC 80A376BC E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 023B0 80A376C0 3C0580A3 */ lui $a1, %hi(func_80A376E0) ## $a1 = 80A30000 -/* 023B4 80A376C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 023B8 80A376C8 0C28D4C4 */ jal func_80A35310 +/* 023B4 80A376C4 8FA40018 */ lw $a0, 0x0018($sp) +/* 023B8 80A376C8 0C28D4C4 */ jal func_80A35310 /* 023BC 80A376CC 24A576E0 */ addiu $a1, $a1, %lo(func_80A376E0) ## $a1 = 80A376E0 -/* 023C0 80A376D0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 023C0 80A376D0 8FBF0014 */ lw $ra, 0x0014($sp) /* 023C4 80A376D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 023C8 80A376D8 03E00008 */ jr $ra +/* 023C8 80A376D8 03E00008 */ jr $ra /* 023CC 80A376DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s index 91bd707928..6db689aaa2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s @@ -1,18 +1,18 @@ glabel func_80A5751C /* 0031C 80A5751C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00320 80A57520 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00324 80A57524 AFA40018 */ sw $a0, 0x0018($sp) +/* 00320 80A57520 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00324 80A57524 AFA40018 */ sw $a0, 0x0018($sp) /* 00328 80A57528 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0032C 80A5752C 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 06000168 -/* 00330 80A57530 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00330 80A57530 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00334 80A57534 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00338 80A57538 8FAF0018 */ lw $t7, 0x0018($sp) +/* 00338 80A57538 8FAF0018 */ lw $t7, 0x0018($sp) /* 0033C 80A5753C 3C0E80A5 */ lui $t6, %hi(func_80A57CA8) ## $t6 = 80A50000 /* 00340 80A57540 25CE7CA8 */ addiu $t6, $t6, %lo(func_80A57CA8) ## $t6 = 80A57CA8 /* 00344 80A57544 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 00348 80A57548 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00348 80A57548 8FBF0014 */ lw $ra, 0x0014($sp) /* 0034C 80A5754C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00350 80A57550 03E00008 */ jr $ra +/* 00350 80A57550 03E00008 */ jr $ra /* 00354 80A57554 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s index 3f76dac808..0afc30e8f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s @@ -1,25 +1,25 @@ glabel EnHorse_Init /* 00DE0 80A5C0D0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00DE4 80A5C0D4 AFB10030 */ sw $s1, 0x0030($sp) +/* 00DE4 80A5C0D4 AFB10030 */ sw $s1, 0x0030($sp) /* 00DE8 80A5C0D8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00DEC 80A5C0DC 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 /* 00DF0 80A5C0E0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00DF4 80A5C0E4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00DF8 80A5C0E8 AFB0002C */ sw $s0, 0x002C($sp) +/* 00DF4 80A5C0E4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00DF8 80A5C0E8 AFB0002C */ sw $s0, 0x002C($sp) /* 00DFC 80A5C0EC 3C0580A6 */ lui $a1, %hi(D_80A66664) ## $a1 = 80A60000 /* 00E00 80A5C0F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00E04 80A5C0F4 24A56664 */ addiu $a1, $a1, %lo(D_80A66664) ## $a1 = 80A66664 /* 00E08 80A5C0F8 0C01E037 */ jal Actor_ProcessInitChain - + /* 00E0C 80A5C0FC A5C00E60 */ sh $zero, 0x0E60($t6) ## 80160E60 -/* 00E10 80A5C100 0C297032 */ jal func_80A5C0C8 +/* 00E10 80A5C100 0C297032 */ jal func_80A5C0C8 /* 00E14 80A5C104 260403C8 */ addiu $a0, $s0, 0x03C8 ## $a0 = 000003C8 /* 00E18 80A5C108 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00E1C 80A5C10C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 /* 00E20 80A5C110 26180024 */ addiu $t8, $s0, 0x0024 ## $t8 = 00000024 /* 00E24 80A5C114 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00E28 80A5C118 A5E005BE */ sh $zero, 0x05BE($t7) ## 801605BE -/* 00E2C 80A5C11C AFB8003C */ sw $t8, 0x003C($sp) +/* 00E2C 80A5C11C AFB8003C */ sw $t8, 0x003C($sp) /* 00E30 80A5C120 8F090000 */ lw $t1, 0x0000($t8) ## 00000024 /* 00E34 80A5C124 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 /* 00E38 80A5C128 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -29,57 +29,57 @@ glabel EnHorse_Init /* 00E48 80A5C138 C604025C */ lwc1 $f4, 0x025C($s0) ## 0000025C /* 00E4C 80A5C13C 8F090008 */ lw $t1, 0x0008($t8) ## 0000002C /* 00E50 80A5C140 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 -/* 00E54 80A5C144 46062200 */ add.s $f8, $f4, $f6 +/* 00E54 80A5C144 46062200 */ add.s $f8, $f4, $f6 /* 00E58 80A5C148 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 /* 00E5C 80A5C14C AE090260 */ sw $t1, 0x0260($s0) ## 00000260 /* 00E60 80A5C150 E608025C */ swc1 $f8, 0x025C($s0) ## 0000025C /* 00E64 80A5C154 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00E68 80A5C158 844A055C */ lh $t2, 0x055C($v0) ## 8016055C -/* 00E6C 80A5C15C 15400002 */ bne $t2, $zero, .L80A5C168 +/* 00E6C 80A5C15C 15400002 */ bne $t2, $zero, .L80A5C168 /* 00E70 80A5C160 240B0046 */ addiu $t3, $zero, 0x0046 ## $t3 = 00000046 /* 00E74 80A5C164 A44B055C */ sh $t3, 0x055C($v0) ## 8016055C .L80A5C168: /* 00E78 80A5C168 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00E7C 80A5C16C 304C8000 */ andi $t4, $v0, 0x8000 ## $t4 = 00000000 -/* 00E80 80A5C170 11800021 */ beq $t4, $zero, .L80A5C1F8 +/* 00E80 80A5C170 11800021 */ beq $t4, $zero, .L80A5C1F8 /* 00E84 80A5C174 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 00E88 80A5C178 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 00E8C 80A5C17C 00416824 */ and $t5, $v0, $at +/* 00E8C 80A5C17C 00416824 */ and $t5, $v0, $at /* 00E90 80A5C180 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00E94 80A5C184 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00E98 80A5C188 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 00E9C 80A5C18C A60D001C */ sh $t5, 0x001C($s0) ## 0000001C /* 00EA0 80A5C190 AE0E0158 */ sw $t6, 0x0158($s0) ## 00000158 -/* 00EA4 80A5C194 02212021 */ addu $a0, $s1, $at -/* 00EA8 80A5C198 AFA40038 */ sw $a0, 0x0038($sp) +/* 00EA4 80A5C194 02212021 */ addu $a0, $s1, $at +/* 00EA8 80A5C198 AFA40038 */ sw $a0, 0x0038($sp) /* 00EAC 80A5C19C 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 00EB0 80A5C1A0 240500D2 */ addiu $a1, $zero, 0x00D2 ## $a1 = 000000D2 -/* 00EB4 80A5C1A4 00027E00 */ sll $t7, $v0, 24 -/* 00EB8 80A5C1A8 000FC603 */ sra $t8, $t7, 24 -/* 00EBC 80A5C1AC 07010005 */ bgez $t8, .L80A5C1C4 +/* 00EB4 80A5C1A4 00027E00 */ sll $t7, $v0, 24 +/* 00EB8 80A5C1A8 000FC603 */ sra $t8, $t7, 24 +/* 00EBC 80A5C1AC 07010005 */ bgez $t8, .L80A5C1C4 /* 00EC0 80A5C1B0 A202015C */ sb $v0, 0x015C($s0) ## 0000015C /* 00EC4 80A5C1B4 0C00B55C */ jal Actor_Kill - + /* 00EC8 80A5C1B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ECC 80A5C1BC 10000192 */ beq $zero, $zero, .L80A5C808 -/* 00ED0 80A5C1C0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00ECC 80A5C1BC 10000192 */ beq $zero, $zero, .L80A5C808 +/* 00ED0 80A5C1C0 8FBF0034 */ lw $ra, 0x0034($sp) .L80A5C1C4: -/* 00ED4 80A5C1C4 8FA40038 */ lw $a0, 0x0038($sp) +/* 00ED4 80A5C1C4 8FA40038 */ lw $a0, 0x0038($sp) .L80A5C1C8: /* 00ED8 80A5C1C8 0C026062 */ jal Object_IsLoaded - + /* 00EDC 80A5C1CC 8205015C */ lb $a1, 0x015C($s0) ## 0000015C -/* 00EE0 80A5C1D0 5040FFFD */ beql $v0, $zero, .L80A5C1C8 -/* 00EE4 80A5C1D4 8FA40038 */ lw $a0, 0x0038($sp) +/* 00EE0 80A5C1D0 5040FFFD */ beql $v0, $zero, .L80A5C1C8 +/* 00EE4 80A5C1D4 8FA40038 */ lw $a0, 0x0038($sp) /* 00EE8 80A5C1D8 8219015C */ lb $t9, 0x015C($s0) ## 0000015C /* 00EEC 80A5C1DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00EF0 80A5C1E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00EF4 80A5C1E4 0C00B591 */ jal Actor_SetObjectDependency - + /* 00EF8 80A5C1E8 A219001E */ sb $t9, 0x001E($s0) ## 0000001E /* 00EFC 80A5C1EC 2408000C */ addiu $t0, $zero, 0x000C ## $t0 = 0000000C -/* 00F00 80A5C1F0 10000004 */ beq $zero, $zero, .L80A5C204 +/* 00F00 80A5C1F0 10000004 */ beq $zero, $zero, .L80A5C204 /* 00F04 80A5C1F4 AE080208 */ sw $t0, 0x0208($s0) ## 00000208 .L80A5C1F8: /* 00F08 80A5C1F8 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E @@ -88,79 +88,79 @@ glabel EnHorse_Init .L80A5C204: /* 00F14 80A5C204 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 00F18 80A5C208 24017FFF */ addiu $at, $zero, 0x7FFF ## $at = 00007FFF -/* 00F1C 80A5C20C 15410002 */ bne $t2, $at, .L80A5C218 +/* 00F1C 80A5C20C 15410002 */ bne $t2, $at, .L80A5C218 /* 00F20 80A5C210 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 00F24 80A5C214 A60B001C */ sh $t3, 0x001C($s0) ## 0000001C .L80A5C218: /* 00F28 80A5C218 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 /* 00F2C 80A5C21C 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 00F30 80A5C220 14410003 */ bne $v0, $at, .L80A5C230 +/* 00F30 80A5C220 14410003 */ bne $v0, $at, .L80A5C230 /* 00F34 80A5C224 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 00F38 80A5C228 1000003B */ beq $zero, $zero, .L80A5C318 +/* 00F38 80A5C228 1000003B */ beq $zero, $zero, .L80A5C318 /* 00F3C 80A5C22C AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 .L80A5C230: /* 00F40 80A5C230 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D -/* 00F44 80A5C234 54410009 */ bnel $v0, $at, .L80A5C25C +/* 00F44 80A5C234 54410009 */ bnel $v0, $at, .L80A5C25C /* 00F48 80A5C238 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00F4C 80A5C23C 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 /* 00F50 80A5C240 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00F54 80A5C244 3C0E0005 */ lui $t6, 0x0005 ## $t6 = 00050000 -/* 00F58 80A5C248 55A10004 */ bnel $t5, $at, .L80A5C25C +/* 00F58 80A5C248 55A10004 */ bnel $t5, $at, .L80A5C25C /* 00F5C 80A5C24C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00F60 80A5C250 10000031 */ beq $zero, $zero, .L80A5C318 +/* 00F60 80A5C250 10000031 */ beq $zero, $zero, .L80A5C318 /* 00F64 80A5C254 AE0E01F0 */ sw $t6, 0x01F0($s0) ## 000001F0 /* 00F68 80A5C258 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A5C25C: /* 00F6C 80A5C25C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00F70 80A5C260 3C0F000B */ lui $t7, 0x000B ## $t7 = 000B0000 -/* 00F74 80A5C264 54410004 */ bnel $v0, $at, .L80A5C278 +/* 00F74 80A5C264 54410004 */ bnel $v0, $at, .L80A5C278 /* 00F78 80A5C268 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00F7C 80A5C26C 1000002A */ beq $zero, $zero, .L80A5C318 +/* 00F7C 80A5C26C 1000002A */ beq $zero, $zero, .L80A5C318 /* 00F80 80A5C270 AE0F01F0 */ sw $t7, 0x01F0($s0) ## 000001F0 /* 00F84 80A5C274 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 .L80A5C278: -/* 00F88 80A5C278 14410021 */ bne $v0, $at, .L80A5C300 +/* 00F88 80A5C278 14410021 */ bne $v0, $at, .L80A5C300 /* 00F8C 80A5C27C 3C18000A */ lui $t8, 0x000A ## $t8 = 000A0000 /* 00F90 80A5C280 AE1801F0 */ sw $t8, 0x01F0($s0) ## 000001F0 /* 00F94 80A5C284 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 00F98 80A5C288 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 00F9C 80A5C28C 14400006 */ bne $v0, $zero, .L80A5C2A8 +/* 00F9C 80A5C28C 14400006 */ bne $v0, $zero, .L80A5C2A8 /* 00FA0 80A5C290 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 00FA4 80A5C294 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 /* 00FA8 80A5C298 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 00FAC 80A5C29C 87280556 */ lh $t0, 0x0556($t9) ## 80160556 -/* 00FB0 80A5C2A0 1100000A */ beq $t0, $zero, .L80A5C2CC +/* 00FB0 80A5C2A0 1100000A */ beq $t0, $zero, .L80A5C2CC /* 00FB4 80A5C2A4 00000000 */ nop .L80A5C2A8: /* 00FB8 80A5C2A8 8E0901F0 */ lw $t1, 0x01F0($s0) ## 000001F0 /* 00FBC 80A5C2AC 3C01FFFD */ lui $at, 0xFFFD ## $at = FFFD0000 /* 00FC0 80A5C2B0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFDFFFF -/* 00FC4 80A5C2B4 01215024 */ and $t2, $t1, $at +/* 00FC4 80A5C2B4 01215024 */ and $t2, $t1, $at /* 00FC8 80A5C2B8 3C010400 */ lui $at, 0x0400 ## $at = 04000000 /* 00FCC 80A5C2BC AE0A01F0 */ sw $t2, 0x01F0($s0) ## 000001F0 /* 00FD0 80A5C2C0 01416025 */ or $t4, $t2, $at ## $t4 = 04000000 -/* 00FD4 80A5C2C4 10000014 */ beq $zero, $zero, .L80A5C318 +/* 00FD4 80A5C2C4 10000014 */ beq $zero, $zero, .L80A5C318 /* 00FD8 80A5C2C8 AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 .L80A5C2CC: /* 00FDC 80A5C2CC 95ADFA5A */ lhu $t5, -0x05A6($t5) ## 8015FA5A /* 00FE0 80A5C2D0 31AE0040 */ andi $t6, $t5, 0x0040 ## $t6 = 00000000 -/* 00FE4 80A5C2D4 51C00011 */ beql $t6, $zero, .L80A5C31C +/* 00FE4 80A5C2D4 51C00011 */ beql $t6, $zero, .L80A5C31C /* 00FE8 80A5C2D8 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 /* 00FEC 80A5C2DC 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 /* 00FF0 80A5C2E0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00FF4 80A5C2E4 55E1000D */ bnel $t7, $at, .L80A5C31C +/* 00FF4 80A5C2E4 55E1000D */ bnel $t7, $at, .L80A5C31C /* 00FF8 80A5C2E8 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 /* 00FFC 80A5C2EC 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 /* 01000 80A5C2F0 3C010030 */ lui $at, 0x0030 ## $at = 00300000 /* 01004 80A5C2F4 0301C825 */ or $t9, $t8, $at ## $t9 = 00300000 -/* 01008 80A5C2F8 10000007 */ beq $zero, $zero, .L80A5C318 +/* 01008 80A5C2F8 10000007 */ beq $zero, $zero, .L80A5C318 /* 0100C 80A5C2FC AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 .L80A5C300: /* 01010 80A5C300 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01014 80A5C304 14410003 */ bne $v0, $at, .L80A5C314 +/* 01014 80A5C304 14410003 */ bne $v0, $at, .L80A5C314 /* 01018 80A5C308 24080080 */ addiu $t0, $zero, 0x0080 ## $t0 = 00000080 -/* 0101C 80A5C30C 10000002 */ beq $zero, $zero, .L80A5C318 +/* 0101C 80A5C30C 10000002 */ beq $zero, $zero, .L80A5C318 /* 01020 80A5C310 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 .L80A5C314: /* 01024 80A5C314 AE0001F0 */ sw $zero, 0x01F0($s0) ## 000001F0 @@ -168,21 +168,21 @@ glabel EnHorse_Init /* 01028 80A5C318 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 .L80A5C31C: /* 0102C 80A5C31C 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 01030 80A5C320 15210012 */ bne $t1, $at, .L80A5C36C +/* 01030 80A5C320 15210012 */ bne $t1, $at, .L80A5C36C /* 01034 80A5C324 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 01038 80A5C328 954AFA5A */ lhu $t2, -0x05A6($t2) ## 8015FA5A /* 0103C 80A5C32C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 01040 80A5C330 314B000F */ andi $t3, $t2, 0x000F ## $t3 = 00000000 -/* 01044 80A5C334 5561000E */ bnel $t3, $at, .L80A5C370 +/* 01044 80A5C334 5561000E */ bnel $t3, $at, .L80A5C370 /* 01048 80A5C338 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 0104C 80A5C33C 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 01050 80A5C340 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01054 80A5C344 14400009 */ bne $v0, $zero, .L80A5C36C +/* 01054 80A5C344 14400009 */ bne $v0, $zero, .L80A5C36C /* 01058 80A5C348 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 0105C 80A5C34C 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 /* 01060 80A5C350 858D0556 */ lh $t5, 0x0556($t4) ## 80160556 -/* 01064 80A5C354 55A00006 */ bnel $t5, $zero, .L80A5C370 +/* 01064 80A5C354 55A00006 */ bnel $t5, $zero, .L80A5C370 /* 01068 80A5C358 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 0106C 80A5C35C 8E0E01F0 */ lw $t6, 0x01F0($s0) ## 000001F0 /* 01070 80A5C360 3C010200 */ lui $at, 0x0200 ## $at = 02000000 @@ -193,7 +193,7 @@ glabel EnHorse_Init .L80A5C370: /* 01080 80A5C370 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 01084 80A5C374 0C00B58B */ jal Actor_SetScale - + /* 01088 80A5C378 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0108C 80A5C37C 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 01090 80A5C380 44815000 */ mtc1 $at, $f10 ## $f10 = -3.50 @@ -203,57 +203,57 @@ glabel EnHorse_Init /* 010A0 80A5C390 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 010A4 80A5C394 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 010A8 80A5C398 0C00AC78 */ jal ActorShape_Init - + /* 010AC 80A5C39C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 010B0 80A5C3A0 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 010B4 80A5C3A4 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 010B8 80A5C3A8 AE18014C */ sw $t8, 0x014C($s0) ## 0000014C /* 010BC 80A5C3AC 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 /* 010C0 80A5C3B0 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 010C4 80A5C3B4 AFA50040 */ sw $a1, 0x0040($sp) +/* 010C4 80A5C3B4 AFA50040 */ sw $a1, 0x0040($sp) /* 010C8 80A5C3B8 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 010CC 80A5C3BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 010D0 80A5C3C0 3C0780A6 */ lui $a3, %hi(D_80A65EAC) ## $a3 = 80A60000 -/* 010D4 80A5C3C4 8FA50040 */ lw $a1, 0x0040($sp) +/* 010D4 80A5C3C4 8FA50040 */ lw $a1, 0x0040($sp) /* 010D8 80A5C3C8 24E75EAC */ addiu $a3, $a3, %lo(D_80A65EAC) ## $a3 = 80A65EAC /* 010DC 80A5C3CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 010E0 80A5C3D0 0C01712B */ jal ActorCollider_InitCylinder - + /* 010E4 80A5C3D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 010E8 80A5C3D8 260502C4 */ addiu $a1, $s0, 0x02C4 ## $a1 = 000002C4 -/* 010EC 80A5C3DC AFA50040 */ sw $a1, 0x0040($sp) +/* 010EC 80A5C3DC AFA50040 */ sw $a1, 0x0040($sp) /* 010F0 80A5C3E0 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 010F4 80A5C3E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 010F8 80A5C3E8 3C0780A6 */ lui $a3, %hi(D_80A65ED8) ## $a3 = 80A60000 -/* 010FC 80A5C3EC 8FA50040 */ lw $a1, 0x0040($sp) +/* 010FC 80A5C3EC 8FA50040 */ lw $a1, 0x0040($sp) /* 01100 80A5C3F0 24E75ED8 */ addiu $a3, $a3, %lo(D_80A65ED8) ## $a3 = 80A65ED8 /* 01104 80A5C3F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01108 80A5C3F8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0110C 80A5C3FC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 01110 80A5C400 26050310 */ addiu $a1, $s0, 0x0310 ## $a1 = 00000310 -/* 01114 80A5C404 AFA50040 */ sw $a1, 0x0040($sp) -/* 01118 80A5C408 0C016EFE */ jal func_8005BBF8 +/* 01114 80A5C404 AFA50040 */ sw $a1, 0x0040($sp) +/* 01118 80A5C408 0C016EFE */ jal func_8005BBF8 /* 0111C 80A5C40C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01120 80A5C410 3C0780A6 */ lui $a3, %hi(D_80A65F28) ## $a3 = 80A60000 /* 01124 80A5C414 26190330 */ addiu $t9, $s0, 0x0330 ## $t9 = 00000330 -/* 01128 80A5C418 8FA50040 */ lw $a1, 0x0040($sp) -/* 0112C 80A5C41C AFB90010 */ sw $t9, 0x0010($sp) +/* 01128 80A5C418 8FA50040 */ lw $a1, 0x0040($sp) +/* 0112C 80A5C41C AFB90010 */ sw $t9, 0x0010($sp) /* 01130 80A5C420 24E75F28 */ addiu $a3, $a3, %lo(D_80A65F28) ## $a3 = 80A65F28 /* 01134 80A5C424 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01138 80A5C428 0C017014 */ jal func_8005C050 +/* 01138 80A5C428 0C017014 */ jal func_8005C050 /* 0113C 80A5C42C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 01140 80A5C430 0C016C80 */ jal CollisionBtlTbl_Get - + /* 01144 80A5C434 2404000B */ addiu $a0, $zero, 0x000B ## $a0 = 0000000B /* 01148 80A5C438 3C0680A6 */ lui $a2, %hi(D_80A65F38) ## $a2 = 80A60000 /* 0114C 80A5C43C 24C65F38 */ addiu $a2, $a2, %lo(D_80A65F38) ## $a2 = 80A65F38 /* 01150 80A5C440 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01154 80A5C444 0C0187B5 */ jal func_80061ED4 +/* 01154 80A5C444 0C0187B5 */ jal func_80061ED4 /* 01158 80A5C448 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0115C 80A5C44C 8FA8003C */ lw $t0, 0x003C($sp) +/* 0115C 80A5C44C 8FA8003C */ lw $t0, 0x003C($sp) /* 01160 80A5C450 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 01164 80A5C454 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 /* 01168 80A5C458 8D0A0000 */ lw $t2, 0x0000($t0) ## 00000000 @@ -265,99 +265,99 @@ glabel EnHorse_Init /* 01180 80A5C470 C612003C */ lwc1 $f18, 0x003C($s0) ## 0000003C /* 01184 80A5C474 8D0A0008 */ lw $t2, 0x0008($t0) ## 00000008 /* 01188 80A5C478 AE00020C */ sw $zero, 0x020C($s0) ## 0000020C -/* 0118C 80A5C47C 46049180 */ add.s $f6, $f18, $f4 +/* 0118C 80A5C47C 46049180 */ add.s $f6, $f18, $f4 /* 01190 80A5C480 AE0A0040 */ sw $t2, 0x0040($s0) ## 00000040 /* 01194 80A5C484 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C /* 01198 80A5C488 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -/* 0119C 80A5C48C 54410035 */ bnel $v0, $at, .L80A5C564 +/* 0119C 80A5C48C 54410035 */ bnel $v0, $at, .L80A5C564 /* 011A0 80A5C490 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 011A4 80A5C494 8D6BF9C0 */ lw $t3, -0x0640($t3) ## 8015F9C0 -/* 011A8 80A5C498 29610004 */ slti $at, $t3, 0x0004 -/* 011AC 80A5C49C 50200031 */ beql $at, $zero, .L80A5C564 +/* 011A8 80A5C498 29610004 */ slti $at, $t3, 0x0004 +/* 011AC 80A5C49C 50200031 */ beql $at, $zero, .L80A5C564 /* 011B0 80A5C4A0 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 011B4 80A5C4A4 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 /* 011B8 80A5C4A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 011BC 80A5C4AC 1581001C */ bne $t4, $at, .L80A5C520 +/* 011BC 80A5C4AC 1581001C */ bne $t4, $at, .L80A5C520 /* 011C0 80A5C4B0 00000000 */ nop /* 011C4 80A5C4B4 860D0034 */ lh $t5, 0x0034($s0) ## 00000034 /* 011C8 80A5C4B8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 011CC 80A5C4BC 11A00004 */ beq $t5, $zero, .L80A5C4D0 +/* 011CC 80A5C4BC 11A00004 */ beq $t5, $zero, .L80A5C4D0 /* 011D0 80A5C4C0 00000000 */ nop /* 011D4 80A5C4C4 8DCEE670 */ lw $t6, -0x1990($t6) ## 8015E670 -/* 011D8 80A5C4C8 11C00005 */ beq $t6, $zero, .L80A5C4E0 +/* 011D8 80A5C4C8 11C00005 */ beq $t6, $zero, .L80A5C4E0 /* 011DC 80A5C4CC 00000000 */ nop .L80A5C4D0: /* 011E0 80A5C4D0 0C00B55C */ jal Actor_Kill - + /* 011E4 80A5C4D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011E8 80A5C4D8 100000CB */ beq $zero, $zero, .L80A5C808 -/* 011EC 80A5C4DC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 011E8 80A5C4D8 100000CB */ beq $zero, $zero, .L80A5C808 +/* 011EC 80A5C4DC 8FBF0034 */ lw $ra, 0x0034($sp) .L80A5C4E0: /* 011F0 80A5C4E0 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 011F4 80A5C4E4 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 011F8 80A5C4E8 50400006 */ beql $v0, $zero, .L80A5C504 +/* 011F8 80A5C4E8 50400006 */ beql $v0, $zero, .L80A5C504 /* 011FC 80A5C4EC 860F0034 */ lh $t7, 0x0034($s0) ## 00000034 /* 01200 80A5C4F0 0C00B55C */ jal Actor_Kill - + /* 01204 80A5C4F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01208 80A5C4F8 100000C3 */ beq $zero, $zero, .L80A5C808 -/* 0120C 80A5C4FC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01208 80A5C4F8 100000C3 */ beq $zero, $zero, .L80A5C808 +/* 0120C 80A5C4FC 8FBF0034 */ lw $ra, 0x0034($sp) /* 01210 80A5C500 860F0034 */ lh $t7, 0x0034($s0) ## 00000034 .L80A5C504: /* 01214 80A5C504 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01218 80A5C508 51E10030 */ beql $t7, $at, .L80A5C5CC +/* 01218 80A5C508 51E10030 */ beql $t7, $at, .L80A5C5CC /* 0121C 80A5C50C 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 /* 01220 80A5C510 0C00B55C */ jal Actor_Kill - + /* 01224 80A5C514 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01228 80A5C518 100000BB */ beq $zero, $zero, .L80A5C808 -/* 0122C 80A5C51C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01228 80A5C518 100000BB */ beq $zero, $zero, .L80A5C808 +/* 0122C 80A5C51C 8FBF0034 */ lw $ra, 0x0034($sp) .L80A5C520: /* 01230 80A5C520 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 01234 80A5C524 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01238 80A5C528 14400027 */ bne $v0, $zero, .L80A5C5C8 +/* 01238 80A5C528 14400027 */ bne $v0, $zero, .L80A5C5C8 /* 0123C 80A5C52C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 01240 80A5C530 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 /* 01244 80A5C534 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 01248 80A5C538 87190556 */ lh $t9, 0x0556($t8) ## 80160556 -/* 0124C 80A5C53C 57200023 */ bnel $t9, $zero, .L80A5C5CC +/* 0124C 80A5C53C 57200023 */ bnel $t9, $zero, .L80A5C5CC /* 01250 80A5C540 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 /* 01254 80A5C544 8D08E670 */ lw $t0, -0x1990($t0) ## 8015E670 -/* 01258 80A5C548 51000020 */ beql $t0, $zero, .L80A5C5CC +/* 01258 80A5C548 51000020 */ beql $t0, $zero, .L80A5C5CC /* 0125C 80A5C54C 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 /* 01260 80A5C550 0C00B55C */ jal Actor_Kill - + /* 01264 80A5C554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01268 80A5C558 100000AB */ beq $zero, $zero, .L80A5C808 -/* 0126C 80A5C55C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01268 80A5C558 100000AB */ beq $zero, $zero, .L80A5C808 +/* 0126C 80A5C55C 8FBF0034 */ lw $ra, 0x0034($sp) /* 01270 80A5C560 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 .L80A5C564: -/* 01274 80A5C564 14410018 */ bne $v0, $at, .L80A5C5C8 +/* 01274 80A5C564 14410018 */ bne $v0, $at, .L80A5C5C8 /* 01278 80A5C568 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 0127C 80A5C56C 8D29E670 */ lw $t1, -0x1990($t1) ## 8015E670 -/* 01280 80A5C570 1120000D */ beq $t1, $zero, .L80A5C5A8 +/* 01280 80A5C570 1120000D */ beq $t1, $zero, .L80A5C5A8 /* 01284 80A5C574 00000000 */ nop /* 01288 80A5C578 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0128C 80A5C57C 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01290 80A5C580 14400009 */ bne $v0, $zero, .L80A5C5A8 +/* 01290 80A5C580 14400009 */ bne $v0, $zero, .L80A5C5A8 /* 01294 80A5C584 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 01298 80A5C588 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 /* 0129C 80A5C58C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 012A0 80A5C590 854B0556 */ lh $t3, 0x0556($t2) ## 80160556 -/* 012A4 80A5C594 15600004 */ bne $t3, $zero, .L80A5C5A8 +/* 012A4 80A5C594 15600004 */ bne $t3, $zero, .L80A5C5A8 /* 012A8 80A5C598 00000000 */ nop /* 012AC 80A5C59C 8D8CE664 */ lw $t4, -0x199C($t4) ## 8015E664 -/* 012B0 80A5C5A0 51800006 */ beql $t4, $zero, .L80A5C5BC +/* 012B0 80A5C5A0 51800006 */ beql $t4, $zero, .L80A5C5BC /* 012B4 80A5C5A4 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 .L80A5C5A8: /* 012B8 80A5C5A8 0C00B55C */ jal Actor_Kill - + /* 012BC 80A5C5AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012C0 80A5C5B0 10000095 */ beq $zero, $zero, .L80A5C808 -/* 012C4 80A5C5B4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 012C0 80A5C5B0 10000095 */ beq $zero, $zero, .L80A5C808 +/* 012C4 80A5C5B4 8FBF0034 */ lw $ra, 0x0034($sp) /* 012C8 80A5C5B8 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 .L80A5C5BC: /* 012CC 80A5C5BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -368,23 +368,23 @@ glabel EnHorse_Init .L80A5C5CC: /* 012DC 80A5C5CC 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 /* 012E0 80A5C5D0 3C0680A6 */ lui $a2, %hi(D_80A65E84) ## $a2 = 80A60000 -/* 012E4 80A5C5D4 00021080 */ sll $v0, $v0, 2 -/* 012E8 80A5C5D8 01E27821 */ addu $t7, $t7, $v0 -/* 012EC 80A5C5DC 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 012F0 80A5C5E0 00C23021 */ addu $a2, $a2, $v0 -/* 012F4 80A5C5E4 8CC65E84 */ lw $a2, %lo(D_80A65E84)($a2) +/* 012E4 80A5C5D4 00021080 */ sll $v0, $v0, 2 +/* 012E8 80A5C5D8 01E27821 */ addu $t7, $t7, $v0 +/* 012EC 80A5C5DC 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) +/* 012F0 80A5C5E0 00C23021 */ addu $a2, $a2, $v0 +/* 012F4 80A5C5E4 8CC65E84 */ lw $a2, %lo(D_80A65E84)($a2) /* 012F8 80A5C5E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 012FC 80A5C5EC 26050160 */ addiu $a1, $s0, 0x0160 ## $a1 = 00000160 -/* 01300 80A5C5F0 0C02998F */ jal func_800A663C +/* 01300 80A5C5F0 0C02998F */ jal func_800A663C /* 01304 80A5C5F4 8DE70000 */ lw $a3, 0x0000($t7) ## 80A60000 /* 01308 80A5C5F8 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 /* 0130C 80A5C5FC 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 01310 80A5C600 AE000210 */ sw $zero, 0x0210($s0) ## 00000210 -/* 01314 80A5C604 0018C880 */ sll $t9, $t8, 2 -/* 01318 80A5C608 01194021 */ addu $t0, $t0, $t9 -/* 0131C 80A5C60C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 01314 80A5C604 0018C880 */ sll $t9, $t8, 2 +/* 01318 80A5C608 01194021 */ addu $t0, $t0, $t9 +/* 0131C 80A5C60C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 01320 80A5C610 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 01324 80A5C614 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 01324 80A5C614 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 01328 80A5C618 8D050000 */ lw $a1, 0x0000($t0) ## 80A60000 /* 0132C 80A5C61C 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 /* 01330 80A5C620 A2090238 */ sb $t1, 0x0238($s0) ## 00000238 @@ -392,130 +392,130 @@ glabel EnHorse_Init /* 01338 80A5C628 AE000244 */ sw $zero, 0x0244($s0) ## 00000244 /* 0133C 80A5C62C A200037A */ sb $zero, 0x037A($s0) ## 0000037A /* 01340 80A5C630 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01344 80A5C634 0C296FF6 */ jal func_80A5BFD8 +/* 01344 80A5C634 0C296FF6 */ jal func_80A5BFD8 /* 01348 80A5C638 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0134C 80A5C63C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01350 80A5C640 0C296FFB */ jal func_80A5BFEC +/* 01350 80A5C640 0C296FFB */ jal func_80A5BFEC /* 01354 80A5C644 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01358 80A5C648 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0135C 80A5C64C 0C29702D */ jal func_80A5C0B4 +/* 0135C 80A5C64C 0C29702D */ jal func_80A5C0B4 /* 01360 80A5C650 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01364 80A5C654 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 01368 80A5C658 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0136C 80A5C65C 54410006 */ bnel $v0, $at, .L80A5C678 +/* 0136C 80A5C65C 54410006 */ bnel $v0, $at, .L80A5C678 /* 01370 80A5C660 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01374 80A5C664 0C297C11 */ jal func_80A5F044 +/* 01374 80A5C664 0C297C11 */ jal func_80A5F044 /* 01378 80A5C668 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0137C 80A5C66C 10000062 */ beq $zero, $zero, .L80A5C7F8 +/* 0137C 80A5C66C 10000062 */ beq $zero, $zero, .L80A5C7F8 /* 01380 80A5C670 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 01384 80A5C674 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 .L80A5C678: -/* 01388 80A5C678 5441002A */ bnel $v0, $at, .L80A5C724 +/* 01388 80A5C678 5441002A */ bnel $v0, $at, .L80A5C724 /* 0138C 80A5C67C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01390 80A5C680 0C297F2B */ jal func_80A5FCAC +/* 01390 80A5C680 0C297F2B */ jal func_80A5FCAC /* 01394 80A5C684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01398 80A5C688 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 0139C 80A5C68C 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 013A0 80A5C690 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 013A4 80A5C694 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 013A4 80A5C694 E7A80010 */ swc1 $f8, 0x0010($sp) /* 013A8 80A5C698 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 013AC 80A5C69C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 013B0 80A5C6A0 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 013B4 80A5C6A4 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 013B4 80A5C6A4 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 013B8 80A5C6A8 860A00B4 */ lh $t2, 0x00B4($s0) ## 000000B4 /* 013BC 80A5C6AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 013C0 80A5C6B0 240600CB */ addiu $a2, $zero, 0x00CB ## $a2 = 000000CB -/* 013C4 80A5C6B4 AFAA0018 */ sw $t2, 0x0018($sp) +/* 013C4 80A5C6B4 AFAA0018 */ sw $t2, 0x0018($sp) /* 013C8 80A5C6B8 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -/* 013CC 80A5C6BC AFAD0024 */ sw $t5, 0x0024($sp) -/* 013D0 80A5C6C0 AFAC0020 */ sw $t4, 0x0020($sp) +/* 013CC 80A5C6BC AFAD0024 */ sw $t5, 0x0024($sp) +/* 013D0 80A5C6C0 AFAC0020 */ sw $t4, 0x0020($sp) /* 013D4 80A5C6C4 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 013D8 80A5C6C8 AFAB001C */ sw $t3, 0x001C($sp) -/* 013DC 80A5C6CC 14400007 */ bne $v0, $zero, .L80A5C6EC +/* 013D8 80A5C6C8 AFAB001C */ sw $t3, 0x001C($sp) +/* 013DC 80A5C6CC 14400007 */ bne $v0, $zero, .L80A5C6EC /* 013E0 80A5C6D0 AE02038C */ sw $v0, 0x038C($s0) ## 0000038C /* 013E4 80A5C6D4 3C0480A6 */ lui $a0, %hi(D_80A66800) ## $a0 = 80A60000 /* 013E8 80A5C6D8 3C0580A6 */ lui $a1, %hi(D_80A6681C) ## $a1 = 80A60000 /* 013EC 80A5C6DC 24A5681C */ addiu $a1, $a1, %lo(D_80A6681C) ## $a1 = 80A6681C /* 013F0 80A5C6E0 24846800 */ addiu $a0, $a0, %lo(D_80A66800) ## $a0 = 80A66800 /* 013F4 80A5C6E4 0C0007FC */ jal __assert - + /* 013F8 80A5C6E8 24060C05 */ addiu $a2, $zero, 0x0C05 ## $a2 = 00000C05 .L80A5C6EC: /* 013FC 80A5C6EC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 01400 80A5C6F0 95CEFA5A */ lhu $t6, -0x05A6($t6) ## 8015FA5A /* 01404 80A5C6F4 3C01414A */ lui $at, 0x414A ## $at = 414A0000 /* 01408 80A5C6F8 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 -/* 0140C 80A5C6FC 55E00006 */ bnel $t7, $zero, .L80A5C718 +/* 0140C 80A5C6FC 55E00006 */ bnel $t7, $zero, .L80A5C718 /* 01410 80A5C700 44819000 */ mtc1 $at, $f18 ## $f18 = 12.62 /* 01414 80A5C704 3C0180A6 */ lui $at, %hi(D_80A6687C) ## $at = 80A60000 -/* 01418 80A5C708 C430687C */ lwc1 $f16, %lo(D_80A6687C)($at) -/* 0141C 80A5C70C 10000039 */ beq $zero, $zero, .L80A5C7F4 +/* 01418 80A5C708 C430687C */ lwc1 $f16, %lo(D_80A6687C)($at) +/* 0141C 80A5C70C 10000039 */ beq $zero, $zero, .L80A5C7F4 /* 01420 80A5C710 E6100398 */ swc1 $f16, 0x0398($s0) ## 00000398 /* 01424 80A5C714 44819000 */ mtc1 $at, $f18 ## $f18 = -0.00 .L80A5C718: -/* 01428 80A5C718 10000036 */ beq $zero, $zero, .L80A5C7F4 +/* 01428 80A5C718 10000036 */ beq $zero, $zero, .L80A5C7F4 /* 0142C 80A5C71C E6120398 */ swc1 $f18, 0x0398($s0) ## 00000398 /* 01430 80A5C720 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 .L80A5C724: -/* 01434 80A5C724 14410005 */ bne $v0, $at, .L80A5C73C +/* 01434 80A5C724 14410005 */ bne $v0, $at, .L80A5C73C /* 01438 80A5C728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0143C 80A5C72C 0C298416 */ jal func_80A61058 +/* 0143C 80A5C72C 0C298416 */ jal func_80A61058 /* 01440 80A5C730 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01444 80A5C734 10000030 */ beq $zero, $zero, .L80A5C7F8 +/* 01444 80A5C734 10000030 */ beq $zero, $zero, .L80A5C7F8 /* 01448 80A5C738 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A5C73C: /* 0144C 80A5C73C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01450 80A5C740 54410008 */ bnel $v0, $at, .L80A5C764 +/* 01450 80A5C740 54410008 */ bnel $v0, $at, .L80A5C764 /* 01454 80A5C744 863800A4 */ lh $t8, 0x00A4($s1) ## 000000A4 -/* 01458 80A5C748 0C298503 */ jal func_80A6140C +/* 01458 80A5C748 0C298503 */ jal func_80A6140C /* 0145C 80A5C74C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01460 80A5C750 0C02126A */ jal Interface_InitHorsebackArchery +/* 01460 80A5C750 0C02126A */ jal Interface_InitHorsebackArchery /* 01464 80A5C754 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01468 80A5C758 10000027 */ beq $zero, $zero, .L80A5C7F8 +/* 01468 80A5C758 10000027 */ beq $zero, $zero, .L80A5C7F8 /* 0146C 80A5C75C A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 01470 80A5C760 863800A4 */ lh $t8, 0x00A4($s1) ## 000000A4 .L80A5C764: /* 01474 80A5C764 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 01478 80A5C768 5701000E */ bnel $t8, $at, .L80A5C7A4 +/* 01478 80A5C768 5701000E */ bnel $t8, $at, .L80A5C7A4 /* 0147C 80A5C76C 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 /* 01480 80A5C770 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 01484 80A5C774 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01488 80A5C778 14400009 */ bne $v0, $zero, .L80A5C7A0 +/* 01488 80A5C778 14400009 */ bne $v0, $zero, .L80A5C7A0 /* 0148C 80A5C77C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 01490 80A5C780 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 /* 01494 80A5C784 87280556 */ lh $t0, 0x0556($t9) ## 80160556 -/* 01498 80A5C788 55000006 */ bnel $t0, $zero, .L80A5C7A4 +/* 01498 80A5C788 55000006 */ bnel $t0, $zero, .L80A5C7A4 /* 0149C 80A5C78C 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -/* 014A0 80A5C790 0C298681 */ jal func_80A61A04 +/* 014A0 80A5C790 0C298681 */ jal func_80A61A04 /* 014A4 80A5C794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014A8 80A5C798 10000017 */ beq $zero, $zero, .L80A5C7F8 +/* 014A8 80A5C798 10000017 */ beq $zero, $zero, .L80A5C7F8 /* 014AC 80A5C79C A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A5C7A0: /* 014B0 80A5C7A0 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 .L80A5C7A4: /* 014B4 80A5C7A4 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 014B8 80A5C7A8 54410006 */ bnel $v0, $at, .L80A5C7C4 +/* 014B8 80A5C7A8 54410006 */ bnel $v0, $at, .L80A5C7C4 /* 014BC 80A5C7AC 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D -/* 014C0 80A5C7B0 0C297CEA */ jal func_80A5F3A8 +/* 014C0 80A5C7B0 0C297CEA */ jal func_80A5F3A8 /* 014C4 80A5C7B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014C8 80A5C7B8 1000000F */ beq $zero, $zero, .L80A5C7F8 +/* 014C8 80A5C7B8 1000000F */ beq $zero, $zero, .L80A5C7F8 /* 014CC 80A5C7BC A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 014D0 80A5C7C0 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D .L80A5C7C4: -/* 014D4 80A5C7C4 14410009 */ bne $v0, $at, .L80A5C7EC +/* 014D4 80A5C7C4 14410009 */ bne $v0, $at, .L80A5C7EC /* 014D8 80A5C7C8 00000000 */ nop /* 014DC 80A5C7CC 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 014E0 80A5C7D0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 014E4 80A5C7D4 15210005 */ bne $t1, $at, .L80A5C7EC +/* 014E4 80A5C7D4 15210005 */ bne $t1, $at, .L80A5C7EC /* 014E8 80A5C7D8 00000000 */ nop -/* 014EC 80A5C7DC 0C297CEA */ jal func_80A5F3A8 +/* 014EC 80A5C7DC 0C297CEA */ jal func_80A5F3A8 /* 014F0 80A5C7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014F4 80A5C7E4 10000004 */ beq $zero, $zero, .L80A5C7F8 +/* 014F4 80A5C7E4 10000004 */ beq $zero, $zero, .L80A5C7F8 /* 014F8 80A5C7E8 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A5C7EC: -/* 014FC 80A5C7EC 0C297CF7 */ jal func_80A5F3DC +/* 014FC 80A5C7EC 0C297CF7 */ jal func_80A5F3DC /* 01500 80A5C7F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A5C7F4: /* 01504 80A5C7F4 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 @@ -523,11 +523,11 @@ glabel EnHorse_Init /* 01508 80A5C7F8 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 /* 0150C 80A5C7FC A6020034 */ sh $v0, 0x0034($s0) ## 00000034 /* 01510 80A5C800 A6020018 */ sh $v0, 0x0018($s0) ## 00000018 -/* 01514 80A5C804 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01514 80A5C804 8FBF0034 */ lw $ra, 0x0034($sp) .L80A5C808: -/* 01518 80A5C808 8FB0002C */ lw $s0, 0x002C($sp) -/* 0151C 80A5C80C 8FB10030 */ lw $s1, 0x0030($sp) -/* 01520 80A5C810 03E00008 */ jr $ra +/* 01518 80A5C808 8FB0002C */ lw $s0, 0x002C($sp) +/* 0151C 80A5C80C 8FB10030 */ lw $s1, 0x0030($sp) +/* 01520 80A5C810 03E00008 */ jr $ra /* 01524 80A5C814 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s index b1de44e0fc..46a5518329 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s @@ -1,6 +1,6 @@ glabel func_80A5D748 /* 02458 80A5D748 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0245C 80A5D74C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0245C 80A5D74C AFBF0014 */ sw $ra, 0x0014($sp) /* 02460 80A5D750 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 /* 02464 80A5D754 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 02468 80A5D758 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -11,14 +11,14 @@ glabel func_80A5D748 /* 0247C 80A5D76C 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 /* 02480 80A5D770 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 02484 80A5D774 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02488 80A5D778 0018C880 */ sll $t9, $t8, 2 -/* 0248C 80A5D77C 01194021 */ addu $t0, $t0, $t9 -/* 02490 80A5D780 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 02494 80A5D784 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02488 80A5D778 0018C880 */ sll $t9, $t8, 2 +/* 0248C 80A5D77C 01194021 */ addu $t0, $t0, $t9 +/* 02490 80A5D780 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 02494 80A5D784 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02498 80A5D788 8D050010 */ lw $a1, 0x0010($t0) ## 80A60010 -/* 0249C 80A5D78C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0249C 80A5D78C 8FBF0014 */ lw $ra, 0x0014($sp) /* 024A0 80A5D790 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 024A4 80A5D794 03E00008 */ jr $ra +/* 024A4 80A5D794 03E00008 */ jr $ra /* 024A8 80A5D798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s index f3e50d3036..5737fca69e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s @@ -1,6 +1,6 @@ glabel func_80A5DB0C /* 0281C 80A5DB0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02820 80A5DB10 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02820 80A5DB10 AFBF0014 */ sw $ra, 0x0014($sp) /* 02824 80A5DB14 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 /* 02828 80A5DB18 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 0282C 80A5DB1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -9,14 +9,14 @@ glabel func_80A5DB0C /* 02838 80A5DB28 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 /* 0283C 80A5DB2C 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 02840 80A5DB30 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02844 80A5DB34 0018C880 */ sll $t9, $t8, 2 -/* 02848 80A5DB38 01194021 */ addu $t0, $t0, $t9 -/* 0284C 80A5DB3C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 02850 80A5DB40 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02844 80A5DB34 0018C880 */ sll $t9, $t8, 2 +/* 02848 80A5DB38 01194021 */ addu $t0, $t0, $t9 +/* 0284C 80A5DB3C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 02850 80A5DB40 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02854 80A5DB44 8D050014 */ lw $a1, 0x0014($t0) ## 80A60014 -/* 02858 80A5DB48 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02858 80A5DB48 8FBF0014 */ lw $ra, 0x0014($sp) /* 0285C 80A5DB4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02860 80A5DB50 03E00008 */ jr $ra +/* 02860 80A5DB50 03E00008 */ jr $ra /* 02864 80A5DB54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s index e495ef24da..2e9e8b9d55 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s @@ -1,6 +1,6 @@ glabel func_80A5DD58 /* 02A68 80A5DD58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A6C 80A5DD5C AFBF0014 */ sw $ra, 0x0014($sp) +/* 02A6C 80A5DD5C AFBF0014 */ sw $ra, 0x0014($sp) /* 02A70 80A5DD60 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 02A74 80A5DD64 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 /* 02A78 80A5DD68 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -12,14 +12,14 @@ glabel func_80A5DD58 /* 02A90 80A5DD80 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 /* 02A94 80A5DD84 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 02A98 80A5DD88 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02A9C 80A5DD8C 0018C880 */ sll $t9, $t8, 2 -/* 02AA0 80A5DD90 01194021 */ addu $t0, $t0, $t9 -/* 02AA4 80A5DD94 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 02AA8 80A5DD98 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02A9C 80A5DD8C 0018C880 */ sll $t9, $t8, 2 +/* 02AA0 80A5DD90 01194021 */ addu $t0, $t0, $t9 +/* 02AA4 80A5DD94 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 02AA8 80A5DD98 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02AAC 80A5DD9C 8D050018 */ lw $a1, 0x0018($t0) ## 80A60018 -/* 02AB0 80A5DDA0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02AB0 80A5DDA0 8FBF0014 */ lw $ra, 0x0014($sp) /* 02AB4 80A5DDA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02AB8 80A5DDA8 03E00008 */ jr $ra +/* 02AB8 80A5DDA8 03E00008 */ jr $ra /* 02ABC 80A5DDAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s index b5f54c26f3..87f92dbe2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s @@ -1,7 +1,7 @@ glabel func_80A5DDB0 /* 02AC0 80A5DDB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02AC4 80A5DDB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02AC8 80A5DDB8 AFA5001C */ sw $a1, 0x001C($sp) +/* 02AC4 80A5DDB4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02AC8 80A5DDB8 AFA5001C */ sw $a1, 0x001C($sp) /* 02ACC 80A5DDBC 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 02AD0 80A5DDC0 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 /* 02AD4 80A5DDC4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -10,28 +10,28 @@ glabel func_80A5DDB0 /* 02AE0 80A5DDD0 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 /* 02AE4 80A5DDD4 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 02AE8 80A5DDD8 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02AEC 80A5DDDC 0018C880 */ sll $t9, $t8, 2 -/* 02AF0 80A5DDE0 01194021 */ addu $t0, $t0, $t9 -/* 02AF4 80A5DDE4 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 02AEC 80A5DDDC 0018C880 */ sll $t9, $t8, 2 +/* 02AF0 80A5DDE0 01194021 */ addu $t0, $t0, $t9 +/* 02AF4 80A5DDE4 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 02AF8 80A5DDE8 8D050018 */ lw $a1, 0x0018($t0) ## 80A60018 -/* 02AFC 80A5DDEC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop -/* 02B00 80A5DDF0 AFA60018 */ sw $a2, 0x0018($sp) -/* 02B04 80A5DDF4 8FA60018 */ lw $a2, 0x0018($sp) +/* 02AFC 80A5DDEC 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop +/* 02B00 80A5DDF0 AFA60018 */ sw $a2, 0x0018($sp) +/* 02B04 80A5DDF4 8FA60018 */ lw $a2, 0x0018($sp) /* 02B08 80A5DDF8 3C0180A6 */ lui $at, %hi(D_80A668C0) ## $at = 80A60000 -/* 02B0C 80A5DDFC C42868C0 */ lwc1 $f8, %lo(D_80A668C0)($at) +/* 02B0C 80A5DDFC C42868C0 */ lwc1 $f8, %lo(D_80A668C0)($at) /* 02B10 80A5DE00 8CC201CC */ lw $v0, 0x01CC($a2) ## 000001CC /* 02B14 80A5DE04 C4C6025C */ lwc1 $f6, 0x025C($a2) ## 0000025C /* 02B18 80A5DE08 84490002 */ lh $t1, 0x0002($v0) ## 00000002 /* 02B1C 80A5DE0C ACC00244 */ sw $zero, 0x0244($a2) ## 00000244 /* 02B20 80A5DE10 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 /* 02B24 80A5DE14 00000000 */ nop -/* 02B28 80A5DE18 46802020 */ cvt.s.w $f0, $f4 -/* 02B2C 80A5DE1C 46080282 */ mul.s $f10, $f0, $f8 -/* 02B30 80A5DE20 460A3400 */ add.s $f16, $f6, $f10 +/* 02B28 80A5DE18 46802020 */ cvt.s.w $f0, $f4 +/* 02B2C 80A5DE1C 46080282 */ mul.s $f10, $f0, $f8 +/* 02B30 80A5DE20 460A3400 */ add.s $f16, $f6, $f10 /* 02B34 80A5DE24 E4D0025C */ swc1 $f16, 0x025C($a2) ## 0000025C -/* 02B38 80A5DE28 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02B38 80A5DE28 8FBF0014 */ lw $ra, 0x0014($sp) /* 02B3C 80A5DE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02B40 80A5DE30 03E00008 */ jr $ra +/* 02B40 80A5DE30 03E00008 */ jr $ra /* 02B44 80A5DE34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s index 678383cf48..bd4fe5bcbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s @@ -2,38 +2,38 @@ glabel func_80A5F890 /* 045A0 80A5F890 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 045A4 80A5F894 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 045A8 80A5F898 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 045AC 80A5F89C AFBF0024 */ sw $ra, 0x0024($sp) -/* 045B0 80A5F8A0 AFB00020 */ sw $s0, 0x0020($sp) -/* 045B4 80A5F8A4 AFA50044 */ sw $a1, 0x0044($sp) +/* 045AC 80A5F89C AFBF0024 */ sw $ra, 0x0024($sp) +/* 045B0 80A5F8A0 AFB00020 */ sw $s0, 0x0020($sp) +/* 045B4 80A5F8A4 AFA50044 */ sw $a1, 0x0044($sp) /* 045B8 80A5F8A8 A5C005BE */ sh $zero, 0x05BE($t6) ## 801605BE -/* 045BC 80A5F8AC 8FAF0044 */ lw $t7, 0x0044($sp) +/* 045BC 80A5F8AC 8FAF0044 */ lw $t7, 0x0044($sp) /* 045C0 80A5F8B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 045C4 80A5F8B4 0C00B6E3 */ jal func_8002DB8C +/* 045C4 80A5F8B4 0C00B6E3 */ jal func_8002DB8C /* 045C8 80A5F8B8 8DE51C44 */ lw $a1, 0x1C44($t7) ## 00001C44 -/* 045CC 80A5F8BC E7A0003C */ swc1 $f0, 0x003C($sp) +/* 045CC 80A5F8BC E7A0003C */ swc1 $f0, 0x003C($sp) /* 045D0 80A5F8C0 8E020370 */ lw $v0, 0x0370($s0) ## 00000370 /* 045D4 80A5F8C4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 045D8 80A5F8C8 10410002 */ beq $v0, $at, .L80A5F8D4 +/* 045D8 80A5F8C8 10410002 */ beq $v0, $at, .L80A5F8D4 /* 045DC 80A5F8CC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 045E0 80A5F8D0 1441005A */ bne $v0, $at, .L80A5FA3C +/* 045E0 80A5F8D0 1441005A */ bne $v0, $at, .L80A5FA3C .L80A5F8D4: /* 045E4 80A5F8D4 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 045E8 80A5F8D8 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 /* 045EC 80A5F8DC 00000000 */ nop -/* 045F0 80A5F8E0 4600203C */ c.lt.s $f4, $f0 +/* 045F0 80A5F8E0 4600203C */ c.lt.s $f4, $f0 /* 045F4 80A5F8E4 00000000 */ nop -/* 045F8 80A5F8E8 45020055 */ bc1fl .L80A5FA40 +/* 045F8 80A5F8E8 45020055 */ bc1fl .L80A5FA40 /* 045FC 80A5F8EC 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 /* 04600 80A5F8F0 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 /* 04604 80A5F8F4 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 04608 80A5F8F8 30588000 */ andi $t8, $v0, 0x8000 ## $t8 = 00000000 -/* 0460C 80A5F8FC 1700004F */ bne $t8, $zero, .L80A5FA3C +/* 0460C 80A5F8FC 1700004F */ bne $t8, $zero, .L80A5FA3C /* 04610 80A5F900 34488000 */ ori $t0, $v0, 0x8000 ## $t0 = 00008000 /* 04614 80A5F904 AE190210 */ sw $t9, 0x0210($s0) ## 00000210 /* 04618 80A5F908 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -/* 0461C 80A5F90C 8FA90044 */ lw $t1, 0x0044($sp) +/* 0461C 80A5F90C 8FA90044 */ lw $t1, 0x0044($sp) /* 04620 80A5F910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04624 80A5F914 0C00B69E */ jal func_8002DA78 +/* 04624 80A5F914 0C00B69E */ jal func_8002DA78 /* 04628 80A5F918 8D251C44 */ lw $a1, 0x1C44($t1) ## 00001C44 /* 0462C 80A5F91C A6020376 */ sh $v0, 0x0376($s0) ## 00000376 /* 04630 80A5F920 860A0376 */ lh $t2, 0x0376($s0) ## 00000376 @@ -41,62 +41,62 @@ glabel func_80A5F890 /* 04638 80A5F928 3C0180A6 */ lui $at, %hi(D_80A668E0) ## $at = 80A60000 /* 0463C 80A5F92C 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 /* 04640 80A5F930 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 -/* 04644 80A5F934 C43268E0 */ lwc1 $f18, %lo(D_80A668E0)($at) -/* 04648 80A5F938 46803220 */ cvt.s.w $f8, $f6 +/* 04644 80A5F934 C43268E0 */ lwc1 $f18, %lo(D_80A668E0)($at) +/* 04648 80A5F938 46803220 */ cvt.s.w $f8, $f6 /* 0464C 80A5F93C 3C0180A6 */ lui $at, %hi(D_80A668E8) ## $at = 80A60000 -/* 04650 80A5F940 46805420 */ cvt.s.w $f16, $f10 -/* 04654 80A5F944 46104001 */ sub.s $f0, $f8, $f16 -/* 04658 80A5F948 4600903C */ c.lt.s $f18, $f0 +/* 04650 80A5F940 46805420 */ cvt.s.w $f16, $f10 +/* 04654 80A5F944 46104001 */ sub.s $f0, $f8, $f16 +/* 04658 80A5F948 4600903C */ c.lt.s $f18, $f0 /* 0465C 80A5F94C 00000000 */ nop -/* 04660 80A5F950 45000005 */ bc1f .L80A5F968 +/* 04660 80A5F950 45000005 */ bc1f .L80A5F968 /* 04664 80A5F954 00000000 */ nop /* 04668 80A5F958 3C0180A6 */ lui $at, %hi(D_80A668E4) ## $at = 80A60000 -/* 0466C 80A5F95C C42468E4 */ lwc1 $f4, %lo(D_80A668E4)($at) -/* 04670 80A5F960 10000009 */ beq $zero, $zero, .L80A5F988 -/* 04674 80A5F964 46040001 */ sub.s $f0, $f0, $f4 +/* 0466C 80A5F95C C42468E4 */ lwc1 $f4, %lo(D_80A668E4)($at) +/* 04670 80A5F960 10000009 */ beq $zero, $zero, .L80A5F988 +/* 04674 80A5F964 46040001 */ sub.s $f0, $f0, $f4 .L80A5F968: -/* 04678 80A5F968 C42668E8 */ lwc1 $f6, %lo(D_80A668E8)($at) +/* 04678 80A5F968 C42668E8 */ lwc1 $f6, %lo(D_80A668E8)($at) /* 0467C 80A5F96C 3C0180A6 */ lui $at, %hi(D_80A668EC) ## $at = 80A60000 -/* 04680 80A5F970 4606003C */ c.lt.s $f0, $f6 +/* 04680 80A5F970 4606003C */ c.lt.s $f0, $f6 /* 04684 80A5F974 00000000 */ nop -/* 04688 80A5F978 45020004 */ bc1fl .L80A5F98C +/* 04688 80A5F978 45020004 */ bc1fl .L80A5F98C /* 0468C 80A5F97C 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 -/* 04690 80A5F980 C42A68EC */ lwc1 $f10, %lo(D_80A668EC)($at) -/* 04694 80A5F984 460A0000 */ add.s $f0, $f0, $f10 +/* 04690 80A5F980 C42A68EC */ lwc1 $f10, %lo(D_80A668EC)($at) +/* 04694 80A5F984 460A0000 */ add.s $f0, $f0, $f10 .L80A5F988: /* 04698 80A5F988 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 .L80A5F98C: /* 0469C 80A5F98C 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 /* 046A0 80A5F990 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 -/* 046A4 80A5F994 000C6880 */ sll $t5, $t4, 2 -/* 046A8 80A5F998 01CD7021 */ addu $t6, $t6, $t5 -/* 046AC 80A5F99C 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 046B0 80A5F9A0 000FC080 */ sll $t8, $t7, 2 -/* 046B4 80A5F9A4 01D8C821 */ addu $t9, $t6, $t8 +/* 046A4 80A5F994 000C6880 */ sll $t5, $t4, 2 +/* 046A8 80A5F998 01CD7021 */ addu $t6, $t6, $t5 +/* 046AC 80A5F99C 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) +/* 046B0 80A5F9A0 000FC080 */ sll $t8, $t7, 2 +/* 046B4 80A5F9A4 01D8C821 */ addu $t9, $t6, $t8 /* 046B8 80A5F9A8 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 046BC 80A5F9AC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 046C0 80A5F9B0 E7A00038 */ swc1 $f0, 0x0038($sp) + +/* 046C0 80A5F9B0 E7A00038 */ swc1 $f0, 0x0038($sp) /* 046C4 80A5F9B4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 046C8 80A5F9B8 C7A00038 */ lwc1 $f0, 0x0038($sp) +/* 046C8 80A5F9B8 C7A00038 */ lwc1 $f0, 0x0038($sp) /* 046CC 80A5F9BC 8E0A0158 */ lw $t2, 0x0158($s0) ## 00000158 -/* 046D0 80A5F9C0 46804420 */ cvt.s.w $f16, $f8 +/* 046D0 80A5F9C0 46804420 */ cvt.s.w $f16, $f8 /* 046D4 80A5F9C4 3C0C80A6 */ lui $t4, %hi(D_80A65E58) ## $t4 = 80A60000 -/* 046D8 80A5F9C8 000A5880 */ sll $t3, $t2, 2 +/* 046D8 80A5F9C8 000A5880 */ sll $t3, $t2, 2 /* 046DC 80A5F9CC 8E0D0210 */ lw $t5, 0x0210($s0) ## 00000210 -/* 046E0 80A5F9D0 018B6021 */ addu $t4, $t4, $t3 +/* 046E0 80A5F9D0 018B6021 */ addu $t4, $t4, $t3 /* 046E4 80A5F9D4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 046E8 80A5F9D8 46100483 */ div.s $f18, $f0, $f16 -/* 046EC 80A5F9DC 000D7880 */ sll $t7, $t5, 2 -/* 046F0 80A5F9E0 4600910D */ trunc.w.s $f4, $f18 -/* 046F4 80A5F9E4 44092000 */ mfc1 $t1, $f4 +/* 046E8 80A5F9D8 46100483 */ div.s $f18, $f0, $f16 +/* 046EC 80A5F9DC 000D7880 */ sll $t7, $t5, 2 +/* 046F0 80A5F9E0 4600910D */ trunc.w.s $f4, $f18 +/* 046F4 80A5F9E4 44092000 */ mfc1 $t1, $f4 /* 046F8 80A5F9E8 00000000 */ nop /* 046FC 80A5F9EC A6090378 */ sh $t1, 0x0378($s0) ## 00000378 -/* 04700 80A5F9F0 8D8C5E58 */ lw $t4, %lo(D_80A65E58)($t4) -/* 04704 80A5F9F4 018F7021 */ addu $t6, $t4, $t7 +/* 04700 80A5F9F0 8D8C5E58 */ lw $t4, %lo(D_80A65E58)($t4) +/* 04704 80A5F9F4 018F7021 */ addu $t6, $t4, $t7 /* 04708 80A5F9F8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 0470C 80A5F9FC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop -/* 04710 80A5FA00 AFA40030 */ sw $a0, 0x0030($sp) +/* 0470C 80A5F9FC 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop +/* 04710 80A5FA00 AFA40030 */ sw $a0, 0x0030($sp) /* 04714 80A5FA04 8E090228 */ lw $t1, 0x0228($s0) ## 00000228 /* 04718 80A5FA08 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 /* 0471C 80A5FA0C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -105,11 +105,11 @@ glabel func_80A5F890 /* 04728 80A5FA18 8E090230 */ lw $t1, 0x0230($s0) ## 00000230 /* 0472C 80A5FA1C 8E08022C */ lw $t0, 0x022C($s0) ## 0000022C /* 04730 80A5FA20 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 04734 80A5FA24 0301C824 */ and $t9, $t8, $at +/* 04734 80A5FA24 0301C824 */ and $t9, $t8, $at /* 04738 80A5FA28 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 /* 0473C 80A5FA2C E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 /* 04740 80A5FA30 AE090224 */ sw $t1, 0x0224($s0) ## 00000224 -/* 04744 80A5FA34 10000027 */ beq $zero, $zero, .L80A5FAD4 +/* 04744 80A5FA34 10000027 */ beq $zero, $zero, .L80A5FAD4 /* 04748 80A5FA38 AE080220 */ sw $t0, 0x0220($s0) ## 00000220 .L80A5FA3C: /* 0474C 80A5FA3C 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 @@ -117,79 +117,79 @@ glabel func_80A5F890 /* 04750 80A5FA40 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 04754 80A5FA44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04758 80A5FA48 314B8000 */ andi $t3, $t2, 0x8000 ## $t3 = 00000000 -/* 0475C 80A5FA4C 1160001D */ beq $t3, $zero, .L80A5FAC4 +/* 0475C 80A5FA4C 1160001D */ beq $t3, $zero, .L80A5FAC4 /* 04760 80A5FA50 00000000 */ nop /* 04764 80A5FA54 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 /* 04768 80A5FA58 860C0378 */ lh $t4, 0x0378($s0) ## 00000378 /* 0476C 80A5FA5C 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 /* 04770 80A5FA60 C6080214 */ lwc1 $f8, 0x0214($s0) ## 00000214 -/* 04774 80A5FA64 01AC7821 */ addu $t7, $t5, $t4 +/* 04774 80A5FA64 01AC7821 */ addu $t7, $t5, $t4 /* 04778 80A5FA68 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 0477C 80A5FA6C 4608503C */ c.lt.s $f10, $f8 +/* 0477C 80A5FA6C 4608503C */ c.lt.s $f10, $f8 /* 04780 80A5FA70 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 04784 80A5FA74 45000010 */ bc1f .L80A5FAB8 +/* 04784 80A5FA74 45000010 */ bc1f .L80A5FAB8 /* 04788 80A5FA78 A60E00B6 */ sh $t6, 0x00B6($s0) ## 000000B6 /* 0478C 80A5FA7C 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 /* 04790 80A5FA80 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B /* 04794 80A5FA84 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 04798 80A5FA88 30580800 */ andi $t8, $v0, 0x0800 ## $t8 = 00000000 -/* 0479C 80A5FA8C 1700000A */ bne $t8, $zero, .L80A5FAB8 +/* 0479C 80A5FA8C 1700000A */ bne $t8, $zero, .L80A5FAB8 /* 047A0 80A5FA90 34590800 */ ori $t9, $v0, 0x0800 ## $t9 = 00000800 /* 047A4 80A5FA94 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 /* 047A8 80A5FA98 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 /* 047AC 80A5FA9C AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 /* 047B0 80A5FAA0 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 /* 047B4 80A5FAA4 250733E0 */ addiu $a3, $t0, 0x33E0 ## $a3 = 801333E0 -/* 047B8 80A5FAA8 AFA70010 */ sw $a3, 0x0010($sp) -/* 047BC 80A5FAAC AFA90014 */ sw $t1, 0x0014($sp) +/* 047B8 80A5FAA8 AFA70010 */ sw $a3, 0x0010($sp) +/* 047BC 80A5FAAC AFA90014 */ sw $t1, 0x0014($sp) /* 047C0 80A5FAB0 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 047C4 80A5FAB4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L80A5FAB8: /* 047C8 80A5FAB8 260A01AC */ addiu $t2, $s0, 0x01AC ## $t2 = 000001AC -/* 047CC 80A5FABC 10000005 */ beq $zero, $zero, .L80A5FAD4 -/* 047D0 80A5FAC0 AFAA0030 */ sw $t2, 0x0030($sp) +/* 047CC 80A5FABC 10000005 */ beq $zero, $zero, .L80A5FAD4 +/* 047D0 80A5FAC0 AFAA0030 */ sw $t2, 0x0030($sp) .L80A5FAC4: -/* 047D4 80A5FAC4 0C297222 */ jal func_80A5C888 -/* 047D8 80A5FAC8 8FA50044 */ lw $a1, 0x0044($sp) +/* 047D4 80A5FAC4 0C297222 */ jal func_80A5C888 +/* 047D8 80A5FAC8 8FA50044 */ lw $a1, 0x0044($sp) /* 047DC 80A5FACC 260B01AC */ addiu $t3, $s0, 0x01AC ## $t3 = 000001AC -/* 047E0 80A5FAD0 AFAB0030 */ sw $t3, 0x0030($sp) +/* 047E0 80A5FAD0 AFAB0030 */ sw $t3, 0x0030($sp) .L80A5FAD4: /* 047E4 80A5FAD4 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 /* 047E8 80A5FAD8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 047EC 80A5FADC 14410008 */ bne $v0, $at, .L80A5FB00 +/* 047EC 80A5FADC 14410008 */ bne $v0, $at, .L80A5FB00 /* 047F0 80A5FAE0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 047F4 80A5FAE4 44810000 */ mtc1 $at, $f0 ## $f0 = 8.00 /* 047F8 80A5FAE8 3C0180A6 */ lui $at, %hi(D_80A668F0) ## $at = 80A60000 /* 047FC 80A5FAEC E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 04800 80A5FAF0 C43068F0 */ lwc1 $f16, %lo(D_80A668F0)($at) -/* 04804 80A5FAF4 46100482 */ mul.s $f18, $f0, $f16 -/* 04808 80A5FAF8 1000001D */ beq $zero, $zero, .L80A5FB70 +/* 04800 80A5FAF0 C43068F0 */ lwc1 $f16, %lo(D_80A668F0)($at) +/* 04804 80A5FAF4 46100482 */ mul.s $f18, $f0, $f16 +/* 04808 80A5FAF8 1000001D */ beq $zero, $zero, .L80A5FB70 /* 0480C 80A5FAFC E61201C8 */ swc1 $f18, 0x01C8($s0) ## 000001C8 .L80A5FB00: /* 04810 80A5FB00 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04814 80A5FB04 14410008 */ bne $v0, $at, .L80A5FB28 +/* 04814 80A5FB04 14410008 */ bne $v0, $at, .L80A5FB28 /* 04818 80A5FB08 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 0481C 80A5FB0C 44810000 */ mtc1 $at, $f0 ## $f0 = 6.00 /* 04820 80A5FB10 3C013EC0 */ lui $at, 0x3EC0 ## $at = 3EC00000 /* 04824 80A5FB14 44812000 */ mtc1 $at, $f4 ## $f4 = 0.38 /* 04828 80A5FB18 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 0482C 80A5FB1C 46040182 */ mul.s $f6, $f0, $f4 -/* 04830 80A5FB20 10000013 */ beq $zero, $zero, .L80A5FB70 +/* 0482C 80A5FB1C 46040182 */ mul.s $f6, $f0, $f4 +/* 04830 80A5FB20 10000013 */ beq $zero, $zero, .L80A5FB70 /* 04834 80A5FB24 E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 .L80A5FB28: /* 04838 80A5FB28 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0483C 80A5FB2C 1441000B */ bne $v0, $at, .L80A5FB5C +/* 0483C 80A5FB2C 1441000B */ bne $v0, $at, .L80A5FB5C /* 04840 80A5FB30 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 04844 80A5FB34 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 /* 04848 80A5FB38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0484C 80A5FB3C 0C296E72 */ jal func_80A5B9C8 +/* 0484C 80A5FB3C 0C296E72 */ jal func_80A5B9C8 /* 04850 80A5FB40 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 04854 80A5FB44 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 04858 80A5FB48 44818000 */ mtc1 $at, $f16 ## $f16 = 0.75 /* 0485C 80A5FB4C C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 04860 80A5FB50 46104482 */ mul.s $f18, $f8, $f16 -/* 04864 80A5FB54 10000006 */ beq $zero, $zero, .L80A5FB70 +/* 04860 80A5FB50 46104482 */ mul.s $f18, $f8, $f16 +/* 04864 80A5FB54 10000006 */ beq $zero, $zero, .L80A5FB70 /* 04868 80A5FB58 E61201C8 */ swc1 $f18, 0x01C8($s0) ## 000001C8 .L80A5FB5C: /* 0486C 80A5FB5C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -200,7 +200,7 @@ glabel func_80A5F890 .L80A5FB70: /* 04880 80A5FB70 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 /* 04884 80A5FB74 31AC8000 */ andi $t4, $t5, 0x8000 ## $t4 = 00000000 -/* 04888 80A5FB78 15800023 */ bne $t4, $zero, .L80A5FC08 +/* 04888 80A5FB78 15800023 */ bne $t4, $zero, .L80A5FC08 /* 0488C 80A5FB7C 00000000 */ nop /* 04890 80A5FB80 860F0250 */ lh $t7, 0x0250($s0) ## 00000250 /* 04894 80A5FB84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -209,14 +209,14 @@ glabel func_80A5F890 /* 048A0 80A5FB90 A60E0250 */ sh $t6, 0x0250($s0) ## 00000250 /* 048A4 80A5FB94 86180250 */ lh $t8, 0x0250($s0) ## 00000250 /* 048A8 80A5FB98 26190228 */ addiu $t9, $s0, 0x0228 ## $t9 = 00000228 -/* 048AC 80A5FB9C 2B01012D */ slti $at, $t8, 0x012D -/* 048B0 80A5FBA0 14200019 */ bne $at, $zero, .L80A5FC08 +/* 048AC 80A5FB9C 2B01012D */ slti $at, $t8, 0x012D +/* 048B0 80A5FBA0 14200019 */ bne $at, $zero, .L80A5FC08 /* 048B4 80A5FBA4 00000000 */ nop -/* 048B8 80A5FBA8 AFB9002C */ sw $t9, 0x002C($sp) -/* 048BC 80A5FBAC 0C297CF7 */ jal func_80A5F3DC -/* 048C0 80A5FBB0 AFA50034 */ sw $a1, 0x0034($sp) -/* 048C4 80A5FBB4 8FA8002C */ lw $t0, 0x002C($sp) -/* 048C8 80A5FBB8 8FA50034 */ lw $a1, 0x0034($sp) +/* 048B8 80A5FBA8 AFB9002C */ sw $t9, 0x002C($sp) +/* 048BC 80A5FBAC 0C297CF7 */ jal func_80A5F3DC +/* 048C0 80A5FBB0 AFA50034 */ sw $a1, 0x0034($sp) +/* 048C4 80A5FBB4 8FA8002C */ lw $t0, 0x002C($sp) +/* 048C8 80A5FBB8 8FA50034 */ lw $a1, 0x0034($sp) /* 048CC 80A5FBBC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 048D0 80A5FBC0 8D0A0000 */ lw $t2, 0x0000($t0) ## 00000000 /* 048D4 80A5FBC4 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 @@ -230,59 +230,59 @@ glabel func_80A5F890 /* 048F4 80A5FBE4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 048F8 80A5FBE8 ACAA0008 */ sw $t2, 0x0008($a1) ## 00000008 /* 048FC 80A5FBEC 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 04900 80A5FBF0 000B6900 */ sll $t5, $t3, 4 -/* 04904 80A5FBF4 05A10004 */ bgez $t5, .L80A5FC08 +/* 04900 80A5FBF0 000B6900 */ sll $t5, $t3, 4 +/* 04904 80A5FBF4 05A10004 */ bgez $t5, .L80A5FC08 /* 04908 80A5FBF8 00000000 */ nop -/* 0490C 80A5FBFC AFA70010 */ sw $a3, 0x0010($sp) +/* 0490C 80A5FBFC AFA70010 */ sw $a3, 0x0010($sp) /* 04910 80A5FC00 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 04914 80A5FC04 AFAC0014 */ sw $t4, 0x0014($sp) + +/* 04914 80A5FC04 AFAC0014 */ sw $t4, 0x0014($sp) .L80A5FC08: /* 04918 80A5FC08 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0491C 80A5FC0C 8FA40030 */ lw $a0, 0x0030($sp) -/* 04920 80A5FC10 50400022 */ beql $v0, $zero, .L80A5FC9C -/* 04924 80A5FC14 8FBF0024 */ lw $ra, 0x0024($sp) + +/* 0491C 80A5FC0C 8FA40030 */ lw $a0, 0x0030($sp) +/* 04920 80A5FC10 50400022 */ beql $v0, $zero, .L80A5FC9C +/* 04924 80A5FC14 8FBF0024 */ lw $ra, 0x0024($sp) /* 04928 80A5FC18 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 /* 0492C 80A5FC1C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04930 80A5FC20 54410006 */ bnel $v0, $at, .L80A5FC3C +/* 04930 80A5FC20 54410006 */ bnel $v0, $at, .L80A5FC3C /* 04934 80A5FC24 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04938 80A5FC28 0C296EB3 */ jal func_80A5BACC +/* 04938 80A5FC28 0C296EB3 */ jal func_80A5BACC /* 0493C 80A5FC2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04940 80A5FC30 10000007 */ beq $zero, $zero, .L80A5FC50 +/* 04940 80A5FC30 10000007 */ beq $zero, $zero, .L80A5FC50 /* 04944 80A5FC34 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 /* 04948 80A5FC38 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 .L80A5FC3C: -/* 0494C 80A5FC3C 54410004 */ bnel $v0, $at, .L80A5FC50 +/* 0494C 80A5FC3C 54410004 */ bnel $v0, $at, .L80A5FC50 /* 04950 80A5FC40 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 -/* 04954 80A5FC44 0C296EA1 */ jal func_80A5BA84 +/* 04954 80A5FC44 0C296EA1 */ jal func_80A5BA84 /* 04958 80A5FC48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0495C 80A5FC4C 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 .L80A5FC50: /* 04960 80A5FC50 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 04964 80A5FC54 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 04968 80A5FC58 01E17024 */ and $t6, $t7, $at +/* 04968 80A5FC58 01E17024 */ and $t6, $t7, $at /* 0496C 80A5FC5C AE0E01F0 */ sw $t6, 0x01F0($s0) ## 000001F0 /* 04970 80A5FC60 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 04974 80A5FC64 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 04978 80A5FC68 C7AA003C */ lwc1 $f10, 0x003C($sp) +/* 04978 80A5FC68 C7AA003C */ lwc1 $f10, 0x003C($sp) /* 0497C 80A5FC6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04980 80A5FC70 4608503C */ c.lt.s $f10, $f8 +/* 04980 80A5FC70 4608503C */ c.lt.s $f10, $f8 /* 04984 80A5FC74 00000000 */ nop -/* 04988 80A5FC78 45000005 */ bc1f .L80A5FC90 +/* 04988 80A5FC78 45000005 */ bc1f .L80A5FC90 /* 0498C 80A5FC7C 00000000 */ nop -/* 04990 80A5FC80 0C297CF7 */ jal func_80A5F3DC +/* 04990 80A5FC80 0C297CF7 */ jal func_80A5F3DC /* 04994 80A5FC84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04998 80A5FC88 10000004 */ beq $zero, $zero, .L80A5FC9C -/* 0499C 80A5FC8C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04998 80A5FC88 10000004 */ beq $zero, $zero, .L80A5FC9C +/* 0499C 80A5FC8C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A5FC90: -/* 049A0 80A5FC90 0C297DD8 */ jal func_80A5F760 -/* 049A4 80A5FC94 8FA50044 */ lw $a1, 0x0044($sp) -/* 049A8 80A5FC98 8FBF0024 */ lw $ra, 0x0024($sp) +/* 049A0 80A5FC90 0C297DD8 */ jal func_80A5F760 +/* 049A4 80A5FC94 8FA50044 */ lw $a1, 0x0044($sp) +/* 049A8 80A5FC98 8FBF0024 */ lw $ra, 0x0024($sp) .L80A5FC9C: -/* 049AC 80A5FC9C 8FB00020 */ lw $s0, 0x0020($sp) +/* 049AC 80A5FC9C 8FB00020 */ lw $s0, 0x0020($sp) /* 049B0 80A5FCA0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 049B4 80A5FCA4 03E00008 */ jr $ra +/* 049B4 80A5FCA4 03E00008 */ jr $ra /* 049B8 80A5FCA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s index 371b9a7b00..33b891fb62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s @@ -1,18 +1,18 @@ glabel EnHorseGanon_Init /* 002CC 80A6892C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 002D0 80A68930 AFB10020 */ sw $s1, 0x0020($sp) +/* 002D0 80A68930 AFB10020 */ sw $s1, 0x0020($sp) /* 002D4 80A68934 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 002D8 80A68938 AFBF0024 */ sw $ra, 0x0024($sp) -/* 002DC 80A6893C AFB0001C */ sw $s0, 0x001C($sp) +/* 002D8 80A68938 AFBF0024 */ sw $ra, 0x0024($sp) +/* 002DC 80A6893C AFB0001C */ sw $s0, 0x001C($sp) /* 002E0 80A68940 3C0580A7 */ lui $a1, %hi(D_80A692C0) ## $a1 = 80A70000 /* 002E4 80A68944 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 002E8 80A68948 0C01E037 */ jal Actor_ProcessInitChain - + /* 002EC 80A6894C 24A592C0 */ addiu $a1, $a1, %lo(D_80A692C0) ## $a1 = 80A692C0 /* 002F0 80A68950 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 /* 002F4 80A68954 34A56A7F */ ori $a1, $a1, 0x6A7F ## $a1 = 3C3C6A7F /* 002F8 80A68958 0C00B58B */ jal Actor_SetScale - + /* 002FC 80A6895C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00300 80A68960 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 00304 80A68964 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 @@ -22,7 +22,7 @@ glabel EnHorseGanon_Init /* 00314 80A68974 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00318 80A68978 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 0031C 80A6897C 0C00AC78 */ jal ActorShape_Init - + /* 00320 80A68980 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 00324 80A68984 8E0E0028 */ lw $t6, 0x0028($s0) ## 00000028 /* 00328 80A68988 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -32,7 +32,7 @@ glabel EnHorseGanon_Init /* 00338 80A68998 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 0033C 80A6899C AE0F0038 */ sw $t7, 0x0038($s0) ## 00000038 /* 00340 80A689A0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00344 80A689A4 460A4400 */ add.s $f16, $f8, $f10 +/* 00344 80A689A4 460A4400 */ add.s $f16, $f8, $f10 /* 00348 80A689A8 8E0F002C */ lw $t7, 0x002C($s0) ## 0000002C /* 0034C 80A689AC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00350 80A689B0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 @@ -43,48 +43,48 @@ glabel EnHorseGanon_Init /* 00364 80A689C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00368 80A689C8 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 0036C 80A689CC E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00370 80A689D0 0C02998F */ jal func_800A663C +/* 00370 80A689D0 0C02998F */ jal func_800A663C /* 00374 80A689D4 AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 /* 00378 80A689D8 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 /* 0037C 80A689DC 3C0580A7 */ lui $a1, %hi(D_80A691B0) ## $a1 = 80A70000 -/* 00380 80A689E0 8CA591B0 */ lw $a1, %lo(D_80A691B0)($a1) -/* 00384 80A689E4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00380 80A689E0 8CA591B0 */ lw $a1, %lo(D_80A691B0)($a1) +/* 00384 80A689E4 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00388 80A689E8 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 0038C 80A689EC 260501FC */ addiu $a1, $s0, 0x01FC ## $a1 = 000001FC -/* 00390 80A689F0 AFA50028 */ sw $a1, 0x0028($sp) +/* 00390 80A689F0 AFA50028 */ sw $a1, 0x0028($sp) /* 00394 80A689F4 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00398 80A689F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0039C 80A689FC 3C0780A7 */ lui $a3, %hi(D_80A691E0) ## $a3 = 80A70000 -/* 003A0 80A68A00 8FA50028 */ lw $a1, 0x0028($sp) +/* 003A0 80A68A00 8FA50028 */ lw $a1, 0x0028($sp) /* 003A4 80A68A04 24E791E0 */ addiu $a3, $a3, %lo(D_80A691E0) ## $a3 = 80A691E0 /* 003A8 80A68A08 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 003AC 80A68A0C 0C01712B */ jal ActorCollider_InitCylinder - + /* 003B0 80A68A10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 003B4 80A68A14 26050248 */ addiu $a1, $s0, 0x0248 ## $a1 = 00000248 -/* 003B8 80A68A18 AFA50028 */ sw $a1, 0x0028($sp) -/* 003BC 80A68A1C 0C016EFE */ jal func_8005BBF8 +/* 003B8 80A68A18 AFA50028 */ sw $a1, 0x0028($sp) +/* 003BC 80A68A1C 0C016EFE */ jal func_8005BBF8 /* 003C0 80A68A20 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 003C4 80A68A24 3C0780A7 */ lui $a3, %hi(D_80A69230) ## $a3 = 80A70000 /* 003C8 80A68A28 26180268 */ addiu $t8, $s0, 0x0268 ## $t8 = 00000268 -/* 003CC 80A68A2C 8FA50028 */ lw $a1, 0x0028($sp) -/* 003D0 80A68A30 AFB80010 */ sw $t8, 0x0010($sp) +/* 003CC 80A68A2C 8FA50028 */ lw $a1, 0x0028($sp) +/* 003D0 80A68A30 AFB80010 */ sw $t8, 0x0010($sp) /* 003D4 80A68A34 24E79230 */ addiu $a3, $a3, %lo(D_80A69230) ## $a3 = 80A69230 /* 003D8 80A68A38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003DC 80A68A3C 0C017014 */ jal func_8005C050 +/* 003DC 80A68A3C 0C017014 */ jal func_8005C050 /* 003E0 80A68A40 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 003E4 80A68A44 3C0680A7 */ lui $a2, %hi(D_80A69240) ## $a2 = 80A70000 /* 003E8 80A68A48 24C69240 */ addiu $a2, $a2, %lo(D_80A69240) ## $a2 = 80A69240 /* 003EC 80A68A4C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 003F0 80A68A50 0C0187B5 */ jal func_80061ED4 +/* 003F0 80A68A50 0C0187B5 */ jal func_80061ED4 /* 003F4 80A68A54 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003F8 80A68A58 0C29A2B1 */ jal func_80A68AC4 +/* 003F8 80A68A58 0C29A2B1 */ jal func_80A68AC4 /* 003FC 80A68A5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00400 80A68A60 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00404 80A68A64 8FB0001C */ lw $s0, 0x001C($sp) -/* 00408 80A68A68 8FB10020 */ lw $s1, 0x0020($sp) -/* 0040C 80A68A6C 03E00008 */ jr $ra +/* 00400 80A68A60 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00404 80A68A64 8FB0001C */ lw $s0, 0x001C($sp) +/* 00408 80A68A68 8FB10020 */ lw $s1, 0x0020($sp) +/* 0040C 80A68A6C 03E00008 */ jr $ra /* 00410 80A68A70 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s index 531e67a2b9..9e9129c8b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s @@ -1,17 +1,17 @@ glabel EnHorseLinkChild_Init /* 00298 80A69668 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0029C 80A6966C AFA5003C */ sw $a1, 0x003C($sp) -/* 002A0 80A69670 AFBF0024 */ sw $ra, 0x0024($sp) -/* 002A4 80A69674 AFB00020 */ sw $s0, 0x0020($sp) +/* 0029C 80A6966C AFA5003C */ sw $a1, 0x003C($sp) +/* 002A0 80A69670 AFBF0024 */ sw $ra, 0x0024($sp) +/* 002A4 80A69674 AFB00020 */ sw $s0, 0x0020($sp) /* 002A8 80A69678 3C0580A7 */ lui $a1, %hi(D_80A6AF78) ## $a1 = 80A70000 /* 002AC 80A6967C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 002B0 80A69680 0C01E037 */ jal Actor_ProcessInitChain - + /* 002B4 80A69684 24A5AF78 */ addiu $a1, $a1, %lo(D_80A6AF78) ## $a1 = 80A6AF78 /* 002B8 80A69688 3C053BA3 */ lui $a1, 0x3BA3 ## $a1 = 3BA30000 /* 002BC 80A6968C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3BA3D70A /* 002C0 80A69690 0C00B58B */ jal Actor_SetScale - + /* 002C4 80A69694 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002C8 80A69698 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 002CC 80A6969C 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 @@ -21,7 +21,7 @@ glabel EnHorseLinkChild_Init /* 002DC 80A696AC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 002E0 80A696B0 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 002E4 80A696B4 0C00AC78 */ jal ActorShape_Init - + /* 002E8 80A696B8 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 002EC 80A696BC 8E0F0028 */ lw $t7, 0x0028($s0) ## 00000028 /* 002F0 80A696C0 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -31,7 +31,7 @@ glabel EnHorseLinkChild_Init /* 00300 80A696D0 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 00304 80A696D4 AE180038 */ sw $t8, 0x0038($s0) ## 00000038 /* 00308 80A696D8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0030C 80A696DC 460A4400 */ add.s $f16, $f8, $f10 +/* 0030C 80A696DC 460A4400 */ add.s $f16, $f8, $f10 /* 00310 80A696E0 8E18002C */ lw $t8, 0x002C($s0) ## 0000002C /* 00314 80A696E4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00318 80A696E8 AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C @@ -40,92 +40,92 @@ glabel EnHorseLinkChild_Init /* 00324 80A696F4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00328 80A696F8 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 0032C 80A696FC AE180040 */ sw $t8, 0x0040($s0) ## 00000040 -/* 00330 80A69700 8FA4003C */ lw $a0, 0x003C($sp) +/* 00330 80A69700 8FA4003C */ lw $a0, 0x003C($sp) /* 00334 80A69704 24E72F98 */ addiu $a3, $a3, 0x2F98 ## $a3 = 06002F98 /* 00338 80A69708 24C67B20 */ addiu $a2, $a2, 0x7B20 ## $a2 = 06007B20 -/* 0033C 80A6970C 0C02998F */ jal func_800A663C +/* 0033C 80A6970C 0C02998F */ jal func_800A663C /* 00340 80A69710 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 00344 80A69714 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 /* 00348 80A69718 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 0034C 80A6971C 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 00350 80A69720 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 0034C 80A6971C 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 00350 80A69720 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00354 80A69724 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 00358 80A69728 260501F4 */ addiu $a1, $s0, 0x01F4 ## $a1 = 000001F4 -/* 0035C 80A6972C AFA50028 */ sw $a1, 0x0028($sp) +/* 0035C 80A6972C AFA50028 */ sw $a1, 0x0028($sp) /* 00360 80A69730 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00364 80A69734 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00364 80A69734 8FA4003C */ lw $a0, 0x003C($sp) /* 00368 80A69738 3C0780A7 */ lui $a3, %hi(D_80A6AEF4) ## $a3 = 80A70000 -/* 0036C 80A6973C 8FA50028 */ lw $a1, 0x0028($sp) +/* 0036C 80A6973C 8FA50028 */ lw $a1, 0x0028($sp) /* 00370 80A69740 24E7AEF4 */ addiu $a3, $a3, %lo(D_80A6AEF4) ## $a3 = 80A6AEF4 -/* 00374 80A69744 8FA4003C */ lw $a0, 0x003C($sp) -/* 00378 80A69748 0C017114 */ jal func_8005C450 +/* 00374 80A69744 8FA4003C */ lw $a0, 0x003C($sp) +/* 00378 80A69748 0C017114 */ jal func_8005C450 /* 0037C 80A6974C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00380 80A69750 26050240 */ addiu $a1, $s0, 0x0240 ## $a1 = 00000240 -/* 00384 80A69754 AFA50028 */ sw $a1, 0x0028($sp) -/* 00388 80A69758 0C016EFE */ jal func_8005BBF8 -/* 0038C 80A6975C 8FA4003C */ lw $a0, 0x003C($sp) +/* 00384 80A69754 AFA50028 */ sw $a1, 0x0028($sp) +/* 00388 80A69758 0C016EFE */ jal func_8005BBF8 +/* 0038C 80A6975C 8FA4003C */ lw $a0, 0x003C($sp) /* 00390 80A69760 3C0780A7 */ lui $a3, %hi(D_80A6AF44) ## $a3 = 80A70000 /* 00394 80A69764 26190260 */ addiu $t9, $s0, 0x0260 ## $t9 = 00000260 -/* 00398 80A69768 8FA50028 */ lw $a1, 0x0028($sp) -/* 0039C 80A6976C AFB90010 */ sw $t9, 0x0010($sp) +/* 00398 80A69768 8FA50028 */ lw $a1, 0x0028($sp) +/* 0039C 80A6976C AFB90010 */ sw $t9, 0x0010($sp) /* 003A0 80A69770 24E7AF44 */ addiu $a3, $a3, %lo(D_80A6AF44) ## $a3 = 80A6AF44 -/* 003A4 80A69774 8FA4003C */ lw $a0, 0x003C($sp) -/* 003A8 80A69778 0C017014 */ jal func_8005C050 +/* 003A4 80A69774 8FA4003C */ lw $a0, 0x003C($sp) +/* 003A8 80A69778 0C017014 */ jal func_8005C050 /* 003AC 80A6977C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 003B0 80A69780 3C0680A7 */ lui $a2, %hi(D_80A6AF54) ## $a2 = 80A70000 /* 003B4 80A69784 24C6AF54 */ addiu $a2, $a2, %lo(D_80A6AF54) ## $a2 = 80A6AF54 /* 003B8 80A69788 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 003BC 80A6978C 0C0187B5 */ jal func_80061ED4 +/* 003BC 80A6978C 0C0187B5 */ jal func_80061ED4 /* 003C0 80A69790 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003C4 80A69794 AE0001F0 */ sw $zero, 0x01F0($s0) ## 000001F0 /* 003C8 80A69798 A20001EC */ sb $zero, 0x01EC($s0) ## 000001EC /* 003CC 80A6979C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 003D0 80A697A0 8D08F9C0 */ lw $t0, -0x0640($t0) ## 8015F9C0 -/* 003D4 80A697A4 8FA9003C */ lw $t1, 0x003C($sp) -/* 003D8 80A697A8 29010004 */ slti $at, $t0, 0x0004 -/* 003DC 80A697AC 54200006 */ bnel $at, $zero, .L80A697C8 +/* 003D4 80A697A4 8FA9003C */ lw $t1, 0x003C($sp) +/* 003D8 80A697A8 29010004 */ slti $at, $t0, 0x0004 +/* 003DC 80A697AC 54200006 */ bnel $at, $zero, .L80A697C8 /* 003E0 80A697B0 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 -/* 003E4 80A697B4 0C29A7B0 */ jal func_80A69EC0 +/* 003E4 80A697B4 0C29A7B0 */ jal func_80A69EC0 /* 003E8 80A697B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003EC 80A697BC 10000017 */ beq $zero, $zero, .L80A6981C +/* 003EC 80A697BC 10000017 */ beq $zero, $zero, .L80A6981C /* 003F0 80A697C0 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 003F4 80A697C4 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 .L80A697C8: /* 003F8 80A697C8 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 003FC 80A697CC 15410010 */ bne $t2, $at, .L80A69810 +/* 003FC 80A697CC 15410010 */ bne $t2, $at, .L80A69810 /* 00400 80A697D0 00000000 */ nop /* 00404 80A697D4 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 00408 80A697D8 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 -/* 0040C 80A697DC 14400005 */ bne $v0, $zero, .L80A697F4 +/* 0040C 80A697DC 14400005 */ bne $v0, $zero, .L80A697F4 /* 00410 80A697E0 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 00414 80A697E4 0C00B55C */ jal Actor_Kill - + /* 00418 80A697E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0041C 80A697EC 1000000F */ beq $zero, $zero, .L80A6982C -/* 00420 80A697F0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0041C 80A697EC 1000000F */ beq $zero, $zero, .L80A6982C +/* 00420 80A697F0 8FBF0024 */ lw $ra, 0x0024($sp) .L80A697F4: /* 00424 80A697F4 956BF536 */ lhu $t3, -0x0ACA($t3) ## FFFFF536 /* 00428 80A697F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0042C 80A697FC 316C0040 */ andi $t4, $t3, 0x0040 ## $t4 = 00000000 -/* 00430 80A69800 0C29A7B0 */ jal func_80A69EC0 +/* 00430 80A69800 0C29A7B0 */ jal func_80A69EC0 /* 00434 80A69804 AE0C02A0 */ sw $t4, 0x02A0($s0) ## 000002A0 -/* 00438 80A69808 10000004 */ beq $zero, $zero, .L80A6981C +/* 00438 80A69808 10000004 */ beq $zero, $zero, .L80A6981C /* 0043C 80A6980C A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A69810: -/* 00440 80A69810 0C29A7B0 */ jal func_80A69EC0 +/* 00440 80A69810 0C29A7B0 */ jal func_80A69EC0 /* 00444 80A69814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00448 80A69818 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A6981C: /* 0044C 80A6981C 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 /* 00450 80A69820 A6020034 */ sh $v0, 0x0034($s0) ## 00000034 /* 00454 80A69824 A6020018 */ sh $v0, 0x0018($s0) ## 00000018 -/* 00458 80A69828 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00458 80A69828 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6982C: -/* 0045C 80A6982C 8FB00020 */ lw $s0, 0x0020($sp) +/* 0045C 80A6982C 8FB00020 */ lw $s0, 0x0020($sp) /* 00460 80A69830 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00464 80A69834 03E00008 */ jr $ra +/* 00464 80A69834 03E00008 */ jr $ra /* 00468 80A69838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s index d1fd73903a..302948553f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s @@ -1,30 +1,30 @@ glabel func_80A6988C /* 004BC 80A6988C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004C0 80A69890 AFBF0014 */ sw $ra, 0x0014($sp) +/* 004C0 80A69890 AFBF0014 */ sw $ra, 0x0014($sp) /* 004C4 80A69894 8C8E0150 */ lw $t6, 0x0150($a0) ## 00000150 /* 004C8 80A69898 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 004CC 80A6989C AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 004D0 80A698A0 25C20001 */ addiu $v0, $t6, 0x0001 ## $v0 = 00000001 -/* 004D4 80A698A4 28410005 */ slti $at, $v0, 0x0005 -/* 004D8 80A698A8 14200003 */ bne $at, $zero, .L80A698B8 +/* 004D4 80A698A4 28410005 */ slti $at, $v0, 0x0005 +/* 004D8 80A698A8 14200003 */ bne $at, $zero, .L80A698B8 /* 004DC 80A698AC AC820150 */ sw $v0, 0x0150($a0) ## 00000150 /* 004E0 80A698B0 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 /* 004E4 80A698B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A698B8: -/* 004E8 80A698B8 0002C080 */ sll $t8, $v0, 2 +/* 004E8 80A698B8 0002C080 */ sll $t8, $v0, 2 /* 004EC 80A698BC 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 004F0 80A698C0 00B82821 */ addu $a1, $a1, $t8 -/* 004F4 80A698C4 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 004F0 80A698C0 00B82821 */ addu $a1, $a1, $t8 +/* 004F4 80A698C4 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) /* 004F8 80A698C8 24C401A0 */ addiu $a0, $a2, 0x01A0 ## $a0 = 000001A0 -/* 004FC 80A698CC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop -/* 00500 80A698D0 AFA60018 */ sw $a2, 0x0018($sp) -/* 00504 80A698D4 0C29A569 */ jal func_80A695A4 -/* 00508 80A698D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0050C 80A698DC 8FA60018 */ lw $a2, 0x0018($sp) +/* 004FC 80A698CC 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop +/* 00500 80A698D0 AFA60018 */ sw $a2, 0x0018($sp) +/* 00504 80A698D4 0C29A569 */ jal func_80A695A4 +/* 00508 80A698D8 8FA40018 */ lw $a0, 0x0018($sp) +/* 0050C 80A698DC 8FA60018 */ lw $a2, 0x0018($sp) /* 00510 80A698E0 E4C001BC */ swc1 $f0, 0x01BC($a2) ## 000001BC -/* 00514 80A698E4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00514 80A698E4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00518 80A698E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0051C 80A698EC 03E00008 */ jr $ra +/* 0051C 80A698EC 03E00008 */ jr $ra /* 00520 80A698F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s index de90220082..cc42264fec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s @@ -1,17 +1,17 @@ glabel EnHorseNormal_Init /* 00180 80A6B3D0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00184 80A6B3D4 AFA5003C */ sw $a1, 0x003C($sp) -/* 00188 80A6B3D8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0018C 80A6B3DC AFB00020 */ sw $s0, 0x0020($sp) +/* 00184 80A6B3D4 AFA5003C */ sw $a1, 0x003C($sp) +/* 00188 80A6B3D8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0018C 80A6B3DC AFB00020 */ sw $s0, 0x0020($sp) /* 00190 80A6B3E0 3C0580A7 */ lui $a1, %hi(D_80A6D4EC) ## $a1 = 80A70000 /* 00194 80A6B3E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00198 80A6B3E8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0019C 80A6B3EC 24A5D4EC */ addiu $a1, $a1, %lo(D_80A6D4EC) ## $a1 = 80A6D4EC /* 001A0 80A6B3F0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 001A4 80A6B3F4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 001A8 80A6B3F8 0C00B58B */ jal Actor_SetScale - + /* 001AC 80A6B3FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001B0 80A6B400 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 001B4 80A6B404 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 @@ -21,7 +21,7 @@ glabel EnHorseNormal_Init /* 001C4 80A6B414 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 001C8 80A6B418 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 001CC 80A6B41C 0C00AC78 */ jal ActorShape_Init - + /* 001D0 80A6B420 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 001D4 80A6B424 8E0E0028 */ lw $t6, 0x0028($s0) ## 00000028 /* 001D8 80A6B428 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -31,7 +31,7 @@ glabel EnHorseNormal_Init /* 001E8 80A6B438 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 001EC 80A6B43C AE0F0038 */ sw $t7, 0x0038($s0) ## 00000038 /* 001F0 80A6B440 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 001F4 80A6B444 460A4400 */ add.s $f16, $f8, $f10 +/* 001F4 80A6B444 460A4400 */ add.s $f16, $f8, $f10 /* 001F8 80A6B448 8E0F002C */ lw $t7, 0x002C($s0) ## 0000002C /* 001FC 80A6B44C AE00014C */ sw $zero, 0x014C($s0) ## 0000014C /* 00200 80A6B450 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 @@ -39,123 +39,123 @@ glabel EnHorseNormal_Init /* 00208 80A6B458 26050228 */ addiu $a1, $s0, 0x0228 ## $a1 = 00000228 /* 0020C 80A6B45C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 00210 80A6B460 AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 -/* 00214 80A6B464 AFA50028 */ sw $a1, 0x0028($sp) +/* 00214 80A6B464 AFA50028 */ sw $a1, 0x0028($sp) /* 00218 80A6B468 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0021C 80A6B46C 8FA4003C */ lw $a0, 0x003C($sp) + +/* 0021C 80A6B46C 8FA4003C */ lw $a0, 0x003C($sp) /* 00220 80A6B470 3C0780A7 */ lui $a3, %hi(D_80A6D394) ## $a3 = 80A70000 -/* 00224 80A6B474 8FA50028 */ lw $a1, 0x0028($sp) +/* 00224 80A6B474 8FA50028 */ lw $a1, 0x0028($sp) /* 00228 80A6B478 24E7D394 */ addiu $a3, $a3, %lo(D_80A6D394) ## $a3 = 80A6D394 -/* 0022C 80A6B47C 8FA4003C */ lw $a0, 0x003C($sp) +/* 0022C 80A6B47C 8FA4003C */ lw $a0, 0x003C($sp) /* 00230 80A6B480 0C01712B */ jal ActorCollider_InitCylinder - + /* 00234 80A6B484 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00238 80A6B488 26050274 */ addiu $a1, $s0, 0x0274 ## $a1 = 00000274 -/* 0023C 80A6B48C AFA50028 */ sw $a1, 0x0028($sp) -/* 00240 80A6B490 0C016EFE */ jal func_8005BBF8 -/* 00244 80A6B494 8FA4003C */ lw $a0, 0x003C($sp) +/* 0023C 80A6B48C AFA50028 */ sw $a1, 0x0028($sp) +/* 00240 80A6B490 0C016EFE */ jal func_8005BBF8 +/* 00244 80A6B494 8FA4003C */ lw $a0, 0x003C($sp) /* 00248 80A6B498 3C0780A7 */ lui $a3, %hi(D_80A6D410) ## $a3 = 80A70000 /* 0024C 80A6B49C 26180294 */ addiu $t8, $s0, 0x0294 ## $t8 = 00000294 -/* 00250 80A6B4A0 8FA50028 */ lw $a1, 0x0028($sp) -/* 00254 80A6B4A4 AFB80010 */ sw $t8, 0x0010($sp) +/* 00250 80A6B4A0 8FA50028 */ lw $a1, 0x0028($sp) +/* 00254 80A6B4A4 AFB80010 */ sw $t8, 0x0010($sp) /* 00258 80A6B4A8 24E7D410 */ addiu $a3, $a3, %lo(D_80A6D410) ## $a3 = 80A6D410 -/* 0025C 80A6B4AC 8FA4003C */ lw $a0, 0x003C($sp) -/* 00260 80A6B4B0 0C017014 */ jal func_8005C050 +/* 0025C 80A6B4AC 8FA4003C */ lw $a0, 0x003C($sp) +/* 00260 80A6B4B0 0C017014 */ jal func_8005C050 /* 00264 80A6B4B4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00268 80A6B4B8 260502D4 */ addiu $a1, $s0, 0x02D4 ## $a1 = 000002D4 -/* 0026C 80A6B4BC AFA50028 */ sw $a1, 0x0028($sp) +/* 0026C 80A6B4BC AFA50028 */ sw $a1, 0x0028($sp) /* 00270 80A6B4C0 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00274 80A6B4C4 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00274 80A6B4C4 8FA4003C */ lw $a0, 0x003C($sp) /* 00278 80A6B4C8 3C0780A7 */ lui $a3, %hi(D_80A6D3C0) ## $a3 = 80A70000 -/* 0027C 80A6B4CC 8FA50028 */ lw $a1, 0x0028($sp) +/* 0027C 80A6B4CC 8FA50028 */ lw $a1, 0x0028($sp) /* 00280 80A6B4D0 24E7D3C0 */ addiu $a3, $a3, %lo(D_80A6D3C0) ## $a3 = 80A6D3C0 -/* 00284 80A6B4D4 8FA4003C */ lw $a0, 0x003C($sp) +/* 00284 80A6B4D4 8FA4003C */ lw $a0, 0x003C($sp) /* 00288 80A6B4D8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0028C 80A6B4DC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00290 80A6B4E0 3C0680A7 */ lui $a2, %hi(D_80A6D420) ## $a2 = 80A70000 /* 00294 80A6B4E4 24C6D420 */ addiu $a2, $a2, %lo(D_80A6D420) ## $a2 = 80A6D420 /* 00298 80A6B4E8 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 0029C 80A6B4EC 0C0187B5 */ jal func_80061ED4 +/* 0029C 80A6B4EC 0C0187B5 */ jal func_80061ED4 /* 002A0 80A6B4F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 002A4 80A6B4F4 8FB9003C */ lw $t9, 0x003C($sp) +/* 002A4 80A6B4F4 8FB9003C */ lw $t9, 0x003C($sp) /* 002A8 80A6B4F8 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 /* 002AC 80A6B4FC 872200A4 */ lh $v0, 0x00A4($t9) ## 000000A4 -/* 002B0 80A6B500 5441007A */ bnel $v0, $at, .L80A6B6EC +/* 002B0 80A6B500 5441007A */ bnel $v0, $at, .L80A6B6EC /* 002B4 80A6B504 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 002B8 80A6B508 86080034 */ lh $t0, 0x0034($s0) ## 00000034 /* 002BC 80A6B50C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 002C0 80A6B510 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 002C4 80A6B514 11000004 */ beq $t0, $zero, .L80A6B528 +/* 002C4 80A6B514 11000004 */ beq $t0, $zero, .L80A6B528 /* 002C8 80A6B518 00000000 */ nop /* 002CC 80A6B51C 8C490010 */ lw $t1, 0x0010($v0) ## 8015E670 -/* 002D0 80A6B520 51200006 */ beql $t1, $zero, .L80A6B53C +/* 002D0 80A6B520 51200006 */ beql $t1, $zero, .L80A6B53C /* 002D4 80A6B524 8C4A0004 */ lw $t2, 0x0004($v0) ## 8015E664 .L80A6B528: /* 002D8 80A6B528 0C00B55C */ jal Actor_Kill - + /* 002DC 80A6B52C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E0 80A6B530 100000DE */ beq $zero, $zero, .L80A6B8AC -/* 002E4 80A6B534 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002E0 80A6B530 100000DE */ beq $zero, $zero, .L80A6B8AC +/* 002E4 80A6B534 8FBF0024 */ lw $ra, 0x0024($sp) /* 002E8 80A6B538 8C4A0004 */ lw $t2, 0x0004($v0) ## 00000004 .L80A6B53C: -/* 002EC 80A6B53C 11400015 */ beq $t2, $zero, .L80A6B594 +/* 002EC 80A6B53C 11400015 */ beq $t2, $zero, .L80A6B594 /* 002F0 80A6B540 00000000 */ nop /* 002F4 80A6B544 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 002F8 80A6B548 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 -/* 002FC 80A6B54C 5040000A */ beql $v0, $zero, .L80A6B578 +/* 002FC 80A6B54C 5040000A */ beql $v0, $zero, .L80A6B578 /* 00300 80A6B550 860C0034 */ lh $t4, 0x0034($s0) ## 00000034 /* 00304 80A6B554 860B0034 */ lh $t3, 0x0034($s0) ## 00000034 /* 00308 80A6B558 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0030C 80A6B55C 51610026 */ beql $t3, $at, .L80A6B5F8 +/* 0030C 80A6B55C 51610026 */ beql $t3, $at, .L80A6B5F8 /* 00310 80A6B560 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 00314 80A6B564 0C00B55C */ jal Actor_Kill - + /* 00318 80A6B568 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0031C 80A6B56C 100000CF */ beq $zero, $zero, .L80A6B8AC -/* 00320 80A6B570 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0031C 80A6B56C 100000CF */ beq $zero, $zero, .L80A6B8AC +/* 00320 80A6B570 8FBF0024 */ lw $ra, 0x0024($sp) /* 00324 80A6B574 860C0034 */ lh $t4, 0x0034($s0) ## 00000034 .L80A6B578: /* 00328 80A6B578 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0032C 80A6B57C 5181001E */ beql $t4, $at, .L80A6B5F8 +/* 0032C 80A6B57C 5181001E */ beql $t4, $at, .L80A6B5F8 /* 00330 80A6B580 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 00334 80A6B584 0C00B55C */ jal Actor_Kill - + /* 00338 80A6B588 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0033C 80A6B58C 100000C7 */ beq $zero, $zero, .L80A6B8AC -/* 00340 80A6B590 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0033C 80A6B58C 100000C7 */ beq $zero, $zero, .L80A6B8AC +/* 00340 80A6B590 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6B594: /* 00344 80A6B594 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 00348 80A6B598 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 0034C 80A6B59C 14400005 */ bne $v0, $zero, .L80A6B5B4 +/* 0034C 80A6B59C 14400005 */ bne $v0, $zero, .L80A6B5B4 /* 00350 80A6B5A0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 00354 80A6B5A4 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 /* 00358 80A6B5A8 85AE0556 */ lh $t6, 0x0556($t5) ## 80160556 -/* 0035C 80A6B5AC 51C0000A */ beql $t6, $zero, .L80A6B5D8 +/* 0035C 80A6B5AC 51C0000A */ beql $t6, $zero, .L80A6B5D8 /* 00360 80A6B5B0 86180034 */ lh $t8, 0x0034($s0) ## 00000034 .L80A6B5B4: /* 00364 80A6B5B4 860F0034 */ lh $t7, 0x0034($s0) ## 00000034 /* 00368 80A6B5B8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0036C 80A6B5BC 51E1000E */ beql $t7, $at, .L80A6B5F8 +/* 0036C 80A6B5BC 51E1000E */ beql $t7, $at, .L80A6B5F8 /* 00370 80A6B5C0 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 00374 80A6B5C4 0C00B55C */ jal Actor_Kill - + /* 00378 80A6B5C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0037C 80A6B5CC 100000B7 */ beq $zero, $zero, .L80A6B8AC -/* 00380 80A6B5D0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0037C 80A6B5CC 100000B7 */ beq $zero, $zero, .L80A6B8AC +/* 00380 80A6B5D0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00384 80A6B5D4 86180034 */ lh $t8, 0x0034($s0) ## 00000034 .L80A6B5D8: /* 00388 80A6B5D8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0038C 80A6B5DC 53010006 */ beql $t8, $at, .L80A6B5F8 +/* 0038C 80A6B5DC 53010006 */ beql $t8, $at, .L80A6B5F8 /* 00390 80A6B5E0 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 00394 80A6B5E4 0C00B55C */ jal Actor_Kill - + /* 00398 80A6B5E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0039C 80A6B5EC 100000AF */ beq $zero, $zero, .L80A6B8AC -/* 003A0 80A6B5F0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0039C 80A6B5EC 100000AF */ beq $zero, $zero, .L80A6B8AC +/* 003A0 80A6B5F0 8FBF0024 */ lw $ra, 0x0024($sp) /* 003A4 80A6B5F4 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A6B5F8: /* 003A8 80A6B5F8 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 @@ -163,188 +163,188 @@ glabel EnHorseNormal_Init /* 003B0 80A6B600 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 003B4 80A6B604 A6020034 */ sh $v0, 0x0034($s0) ## 00000034 /* 003B8 80A6B608 A6020018 */ sh $v0, 0x0018($s0) ## 00000018 -/* 003BC 80A6B60C 8FA4003C */ lw $a0, 0x003C($sp) +/* 003BC 80A6B60C 8FA4003C */ lw $a0, 0x003C($sp) /* 003C0 80A6B610 24E74580 */ addiu $a3, $a3, 0x4580 ## $a3 = 06004580 /* 003C4 80A6B614 24C69FAC */ addiu $a2, $a2, 0x9FAC ## $a2 = 06009FAC -/* 003C8 80A6B618 0C02998F */ jal func_800A663C +/* 003C8 80A6B618 0C02998F */ jal func_800A663C /* 003CC 80A6B61C 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 003D0 80A6B620 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 /* 003D4 80A6B624 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 /* 003D8 80A6B628 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 003DC 80A6B62C 00194080 */ sll $t0, $t9, 2 -/* 003E0 80A6B630 00A82821 */ addu $a1, $a1, $t0 -/* 003E4 80A6B634 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop -/* 003E8 80A6B638 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 003DC 80A6B62C 00194080 */ sll $t0, $t9, 2 +/* 003E0 80A6B630 00A82821 */ addu $a1, $a1, $t0 +/* 003E4 80A6B634 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop +/* 003E8 80A6B638 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) /* 003EC 80A6B63C 3C0180A7 */ lui $at, %hi(D_80A6D5B0) ## $at = 80A70000 -/* 003F0 80A6B640 C432D5B0 */ lwc1 $f18, %lo(D_80A6D5B0)($at) +/* 003F0 80A6B640 C432D5B0 */ lwc1 $f18, %lo(D_80A6D5B0)($at) /* 003F4 80A6B644 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 -/* 003F8 80A6B648 46009032 */ c.eq.s $f18, $f0 +/* 003F8 80A6B648 46009032 */ c.eq.s $f18, $f0 /* 003FC 80A6B64C 00000000 */ nop -/* 00400 80A6B650 4502000E */ bc1fl .L80A6B68C +/* 00400 80A6B650 4502000E */ bc1fl .L80A6B68C /* 00404 80A6B654 3C01445C */ lui $at, 0x445C ## $at = 445C0000 /* 00408 80A6B658 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0040C 80A6B65C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 00410 80A6B660 3C0180A7 */ lui $at, %hi(D_80A6D5B4) ## $at = 80A70000 -/* 00414 80A6B664 46062032 */ c.eq.s $f4, $f6 +/* 00414 80A6B664 46062032 */ c.eq.s $f4, $f6 /* 00418 80A6B668 00000000 */ nop -/* 0041C 80A6B66C 45020007 */ bc1fl .L80A6B68C +/* 0041C 80A6B66C 45020007 */ bc1fl .L80A6B68C /* 00420 80A6B670 3C01445C */ lui $at, 0x445C ## $at = 445C0000 -/* 00424 80A6B674 C428D5B4 */ lwc1 $f8, %lo(D_80A6D5B4)($at) +/* 00424 80A6B674 C428D5B4 */ lwc1 $f8, %lo(D_80A6D5B4)($at) /* 00428 80A6B678 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 0042C 80A6B67C 460A4032 */ c.eq.s $f8, $f10 +/* 0042C 80A6B67C 460A4032 */ c.eq.s $f8, $f10 /* 00430 80A6B680 00000000 */ nop -/* 00434 80A6B684 45010014 */ bc1t .L80A6B6D8 +/* 00434 80A6B684 45010014 */ bc1t .L80A6B6D8 /* 00438 80A6B688 3C01445C */ lui $at, 0x445C ## $at = 445C0000 .L80A6B68C: /* 0043C 80A6B68C 44818000 */ mtc1 $at, $f16 ## $f16 = 880.00 /* 00440 80A6B690 00000000 */ nop -/* 00444 80A6B694 46008032 */ c.eq.s $f16, $f0 +/* 00444 80A6B694 46008032 */ c.eq.s $f16, $f0 /* 00448 80A6B698 00000000 */ nop -/* 0044C 80A6B69C 45020075 */ bc1fl .L80A6B874 +/* 0044C 80A6B69C 45020075 */ bc1fl .L80A6B874 /* 00450 80A6B6A0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00454 80A6B6A4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00458 80A6B6A8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 0045C 80A6B6AC 3C0180A7 */ lui $at, %hi(D_80A6D5B8) ## $at = 80A70000 -/* 00460 80A6B6B0 46049032 */ c.eq.s $f18, $f4 +/* 00460 80A6B6B0 46049032 */ c.eq.s $f18, $f4 /* 00464 80A6B6B4 00000000 */ nop -/* 00468 80A6B6B8 4502006E */ bc1fl .L80A6B874 +/* 00468 80A6B6B8 4502006E */ bc1fl .L80A6B874 /* 0046C 80A6B6BC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00470 80A6B6C0 C426D5B8 */ lwc1 $f6, %lo(D_80A6D5B8)($at) +/* 00470 80A6B6C0 C426D5B8 */ lwc1 $f6, %lo(D_80A6D5B8)($at) /* 00474 80A6B6C4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00478 80A6B6C8 46083032 */ c.eq.s $f6, $f8 +/* 00478 80A6B6C8 46083032 */ c.eq.s $f6, $f8 /* 0047C 80A6B6CC 00000000 */ nop -/* 00480 80A6B6D0 45020068 */ bc1fl .L80A6B874 +/* 00480 80A6B6D0 45020068 */ bc1fl .L80A6B874 /* 00484 80A6B6D4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A6B6D8: -/* 00488 80A6B6D8 0C29B1AC */ jal func_80A6C6B0 +/* 00488 80A6B6D8 0C29B1AC */ jal func_80A6C6B0 /* 0048C 80A6B6DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00490 80A6B6E0 10000072 */ beq $zero, $zero, .L80A6B8AC -/* 00494 80A6B6E4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00490 80A6B6E0 10000072 */ beq $zero, $zero, .L80A6B8AC +/* 00494 80A6B6E4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00498 80A6B6E8 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 .L80A6B6EC: -/* 0049C 80A6B6EC 5441001C */ bnel $v0, $at, .L80A6B760 +/* 0049C 80A6B6EC 5441001C */ bnel $v0, $at, .L80A6B760 /* 004A0 80A6B6F0 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D /* 004A4 80A6B6F4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 004A8 80A6B6F8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 004AC 80A6B6FC 8C490010 */ lw $t1, 0x0010($v0) ## 8015E670 -/* 004B0 80A6B700 8FA4003C */ lw $a0, 0x003C($sp) +/* 004B0 80A6B700 8FA4003C */ lw $a0, 0x003C($sp) /* 004B4 80A6B704 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 -/* 004B8 80A6B708 15200005 */ bne $t1, $zero, .L80A6B720 +/* 004B8 80A6B708 15200005 */ bne $t1, $zero, .L80A6B720 /* 004BC 80A6B70C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 004C0 80A6B710 0C00B55C */ jal Actor_Kill - + /* 004C4 80A6B714 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004C8 80A6B718 10000064 */ beq $zero, $zero, .L80A6B8AC -/* 004CC 80A6B71C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 004C8 80A6B718 10000064 */ beq $zero, $zero, .L80A6B8AC +/* 004CC 80A6B71C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6B720: /* 004D0 80A6B720 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 004D4 80A6B724 24E74580 */ addiu $a3, $a3, 0x4580 ## $a3 = 06004580 -/* 004D8 80A6B728 0C02998F */ jal func_800A663C +/* 004D8 80A6B728 0C02998F */ jal func_800A663C /* 004DC 80A6B72C 24C69FAC */ addiu $a2, $a2, 0x9FAC ## $a2 = FFFF9FAC /* 004E0 80A6B730 8E0A0150 */ lw $t2, 0x0150($s0) ## 00000150 /* 004E4 80A6B734 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 /* 004E8 80A6B738 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 004EC 80A6B73C 000A5880 */ sll $t3, $t2, 2 -/* 004F0 80A6B740 00AB2821 */ addu $a1, $a1, $t3 -/* 004F4 80A6B744 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop -/* 004F8 80A6B748 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 004FC 80A6B74C 0C29B1AC */ jal func_80A6C6B0 +/* 004EC 80A6B73C 000A5880 */ sll $t3, $t2, 2 +/* 004F0 80A6B740 00AB2821 */ addu $a1, $a1, $t3 +/* 004F4 80A6B744 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop +/* 004F8 80A6B748 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 004FC 80A6B74C 0C29B1AC */ jal func_80A6C6B0 /* 00500 80A6B750 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00504 80A6B754 10000055 */ beq $zero, $zero, .L80A6B8AC -/* 00508 80A6B758 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00504 80A6B754 10000055 */ beq $zero, $zero, .L80A6B8AC +/* 00508 80A6B758 8FBF0024 */ lw $ra, 0x0024($sp) /* 0050C 80A6B75C 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D .L80A6B760: -/* 00510 80A6B760 14410036 */ bne $v0, $at, .L80A6B83C -/* 00514 80A6B764 8FA4003C */ lw $a0, 0x003C($sp) +/* 00510 80A6B760 14410036 */ bne $v0, $at, .L80A6B83C +/* 00514 80A6B764 8FA4003C */ lw $a0, 0x003C($sp) /* 00518 80A6B768 3C0180A7 */ lui $at, %hi(D_80A6D5BC) ## $at = 80A70000 -/* 0051C 80A6B76C C42AD5BC */ lwc1 $f10, %lo(D_80A6D5BC)($at) +/* 0051C 80A6B76C C42AD5BC */ lwc1 $f10, %lo(D_80A6D5BC)($at) /* 00520 80A6B770 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 /* 00524 80A6B774 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00528 80A6B778 3C0180A7 */ lui $at, %hi(D_80A6D5C0) ## $at = 80A70000 -/* 0052C 80A6B77C 46105032 */ c.eq.s $f10, $f16 +/* 0052C 80A6B77C 46105032 */ c.eq.s $f10, $f16 /* 00530 80A6B780 24C69FAC */ addiu $a2, $a2, 0x9FAC ## $a2 = 06009FAC -/* 00534 80A6B784 8FA4003C */ lw $a0, 0x003C($sp) +/* 00534 80A6B784 8FA4003C */ lw $a0, 0x003C($sp) /* 00538 80A6B788 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 -/* 0053C 80A6B78C 45000020 */ bc1f .L80A6B810 +/* 0053C 80A6B78C 45000020 */ bc1f .L80A6B810 /* 00540 80A6B790 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00544 80A6B794 C432D5C0 */ lwc1 $f18, %lo(D_80A6D5C0)($at) +/* 00544 80A6B794 C432D5C0 */ lwc1 $f18, %lo(D_80A6D5C0)($at) /* 00548 80A6B798 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 0054C 80A6B79C 3C0180A7 */ lui $at, %hi(D_80A6D5C4) ## $at = 80A70000 -/* 00550 80A6B7A0 46049032 */ c.eq.s $f18, $f4 +/* 00550 80A6B7A0 46049032 */ c.eq.s $f18, $f4 /* 00554 80A6B7A4 00000000 */ nop -/* 00558 80A6B7A8 45000019 */ bc1f .L80A6B810 +/* 00558 80A6B7A8 45000019 */ bc1f .L80A6B810 /* 0055C 80A6B7AC 00000000 */ nop -/* 00560 80A6B7B0 C426D5C4 */ lwc1 $f6, %lo(D_80A6D5C4)($at) +/* 00560 80A6B7B0 C426D5C4 */ lwc1 $f6, %lo(D_80A6D5C4)($at) /* 00564 80A6B7B4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00568 80A6B7B8 46083032 */ c.eq.s $f6, $f8 +/* 00568 80A6B7B8 46083032 */ c.eq.s $f6, $f8 /* 0056C 80A6B7BC 00000000 */ nop -/* 00570 80A6B7C0 45000013 */ bc1f .L80A6B810 +/* 00570 80A6B7C0 45000013 */ bc1f .L80A6B810 /* 00574 80A6B7C4 00000000 */ nop /* 00578 80A6B7C8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 0057C 80A6B7CC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00580 80A6B7D0 24E74580 */ addiu $a3, $a3, 0x4580 ## $a3 = 06004580 /* 00584 80A6B7D4 24C69FAC */ addiu $a2, $a2, 0x9FAC ## $a2 = 06009FAC -/* 00588 80A6B7D8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0058C 80A6B7DC 0C02998F */ jal func_800A663C +/* 00588 80A6B7D8 8FA4003C */ lw $a0, 0x003C($sp) +/* 0058C 80A6B7DC 0C02998F */ jal func_800A663C /* 00590 80A6B7E0 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 00594 80A6B7E4 8E0C0150 */ lw $t4, 0x0150($s0) ## 00000150 /* 00598 80A6B7E8 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 /* 0059C 80A6B7EC 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 005A0 80A6B7F0 000C6880 */ sll $t5, $t4, 2 -/* 005A4 80A6B7F4 00AD2821 */ addu $a1, $a1, $t5 -/* 005A8 80A6B7F8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop -/* 005AC 80A6B7FC 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 005B0 80A6B800 0C29B133 */ jal func_80A6C4CC +/* 005A0 80A6B7F0 000C6880 */ sll $t5, $t4, 2 +/* 005A4 80A6B7F4 00AD2821 */ addu $a1, $a1, $t5 +/* 005A8 80A6B7F8 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop +/* 005AC 80A6B7FC 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 005B0 80A6B800 0C29B133 */ jal func_80A6C4CC /* 005B4 80A6B804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005B8 80A6B808 10000028 */ beq $zero, $zero, .L80A6B8AC -/* 005BC 80A6B80C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 005B8 80A6B808 10000028 */ beq $zero, $zero, .L80A6B8AC +/* 005BC 80A6B80C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6B810: -/* 005C0 80A6B810 0C02998F */ jal func_800A663C +/* 005C0 80A6B810 0C02998F */ jal func_800A663C /* 005C4 80A6B814 24E74580 */ addiu $a3, $a3, 0x4580 ## $a3 = 00004580 /* 005C8 80A6B818 8E0E0150 */ lw $t6, 0x0150($s0) ## 00000150 /* 005CC 80A6B81C 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 /* 005D0 80A6B820 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 005D4 80A6B824 000E7880 */ sll $t7, $t6, 2 -/* 005D8 80A6B828 00AF2821 */ addu $a1, $a1, $t7 -/* 005DC 80A6B82C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop -/* 005E0 80A6B830 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 005E4 80A6B834 1000000F */ beq $zero, $zero, .L80A6B874 +/* 005D4 80A6B824 000E7880 */ sll $t7, $t6, 2 +/* 005D8 80A6B828 00AF2821 */ addu $a1, $a1, $t7 +/* 005DC 80A6B82C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop +/* 005E0 80A6B830 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 005E4 80A6B834 1000000F */ beq $zero, $zero, .L80A6B874 /* 005E8 80A6B838 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A6B83C: /* 005EC 80A6B83C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 005F0 80A6B840 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 005F4 80A6B844 24E74580 */ addiu $a3, $a3, 0x4580 ## $a3 = 06004580 /* 005F8 80A6B848 24C69FAC */ addiu $a2, $a2, 0x9FAC ## $a2 = 06009FAC -/* 005FC 80A6B84C 0C02998F */ jal func_800A663C +/* 005FC 80A6B84C 0C02998F */ jal func_800A663C /* 00600 80A6B850 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 00604 80A6B854 8E180150 */ lw $t8, 0x0150($s0) ## 00000150 /* 00608 80A6B858 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 /* 0060C 80A6B85C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 00610 80A6B860 0018C880 */ sll $t9, $t8, 2 -/* 00614 80A6B864 00B92821 */ addu $a1, $a1, $t9 -/* 00618 80A6B868 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop -/* 0061C 80A6B86C 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 00610 80A6B860 0018C880 */ sll $t9, $t8, 2 +/* 00614 80A6B864 00B92821 */ addu $a1, $a1, $t9 +/* 00618 80A6B868 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop +/* 0061C 80A6B86C 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) /* 00620 80A6B870 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A6B874: /* 00624 80A6B874 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 /* 00628 80A6B878 304800F0 */ andi $t0, $v0, 0x00F0 ## $t0 = 00000000 -/* 0062C 80A6B87C 15010008 */ bne $t0, $at, .L80A6B8A0 +/* 0062C 80A6B87C 15010008 */ bne $t0, $at, .L80A6B8A0 /* 00630 80A6B880 3049000F */ andi $t1, $v0, 0x000F ## $t1 = 00000000 /* 00634 80A6B884 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00638 80A6B888 11210005 */ beq $t1, $at, .L80A6B8A0 +/* 00638 80A6B888 11210005 */ beq $t1, $at, .L80A6B8A0 /* 0063C 80A6B88C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00640 80A6B890 0C29AE47 */ jal func_80A6B91C -/* 00644 80A6B894 8FA5003C */ lw $a1, 0x003C($sp) -/* 00648 80A6B898 10000004 */ beq $zero, $zero, .L80A6B8AC -/* 0064C 80A6B89C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00640 80A6B890 0C29AE47 */ jal func_80A6B91C +/* 00644 80A6B894 8FA5003C */ lw $a1, 0x003C($sp) +/* 00648 80A6B898 10000004 */ beq $zero, $zero, .L80A6B8AC +/* 0064C 80A6B89C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6B8A0: -/* 00650 80A6B8A0 0C29AF12 */ jal func_80A6BC48 +/* 00650 80A6B8A0 0C29AF12 */ jal func_80A6BC48 /* 00654 80A6B8A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00658 80A6B8A8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00658 80A6B8A8 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6B8AC: -/* 0065C 80A6B8AC 8FB00020 */ lw $s0, 0x0020($sp) +/* 0065C 80A6B8AC 8FB00020 */ lw $s0, 0x0020($sp) /* 00660 80A6B8B0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00664 80A6B8B4 03E00008 */ jr $ra +/* 00664 80A6B8B4 03E00008 */ jr $ra /* 00668 80A6B8B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s index a451b06c2c..e01ffb1c4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s @@ -1,25 +1,25 @@ glabel func_80A6BBAC /* 0095C 80A6BBAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00960 80A6BBB0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00960 80A6BBB0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00964 80A6BBB4 8C8E0150 */ lw $t6, 0x0150($a0) ## 00000150 /* 00968 80A6BBB8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0096C 80A6BBBC AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 00970 80A6BBC0 25C20001 */ addiu $v0, $t6, 0x0001 ## $v0 = 00000001 -/* 00974 80A6BBC4 28410009 */ slti $at, $v0, 0x0009 -/* 00978 80A6BBC8 14200003 */ bne $at, $zero, .L80A6BBD8 +/* 00974 80A6BBC4 28410009 */ slti $at, $v0, 0x0009 +/* 00978 80A6BBC8 14200003 */ bne $at, $zero, .L80A6BBD8 /* 0097C 80A6BBCC AC820150 */ sw $v0, 0x0150($a0) ## 00000150 /* 00980 80A6BBD0 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 /* 00984 80A6BBD4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A6BBD8: -/* 00988 80A6BBD8 0002C080 */ sll $t8, $v0, 2 +/* 00988 80A6BBD8 0002C080 */ sll $t8, $v0, 2 /* 0098C 80A6BBDC 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 00990 80A6BBE0 00B82821 */ addu $a1, $a1, $t8 -/* 00994 80A6BBE4 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 00998 80A6BBE8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00990 80A6BBE0 00B82821 */ addu $a1, $a1, $t8 +/* 00994 80A6BBE4 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 00998 80A6BBE8 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 0099C 80A6BBEC 24C401A0 */ addiu $a0, $a2, 0x01A0 ## $a0 = 000001A0 -/* 009A0 80A6BBF0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 009A0 80A6BBF0 8FBF0014 */ lw $ra, 0x0014($sp) /* 009A4 80A6BBF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009A8 80A6BBF8 03E00008 */ jr $ra +/* 009A8 80A6BBF8 03E00008 */ jr $ra /* 009AC 80A6BBFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s index 46dbefd8ed..1b425b2ba4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s @@ -1,18 +1,18 @@ glabel EnHorseZelda_Init /* 00210 80A6DAE0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00214 80A6DAE4 AFB10020 */ sw $s1, 0x0020($sp) +/* 00214 80A6DAE4 AFB10020 */ sw $s1, 0x0020($sp) /* 00218 80A6DAE8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0021C 80A6DAEC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00220 80A6DAF0 AFB0001C */ sw $s0, 0x001C($sp) +/* 0021C 80A6DAEC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00220 80A6DAF0 AFB0001C */ sw $s0, 0x001C($sp) /* 00224 80A6DAF4 3C0580A7 */ lui $a1, %hi(D_80A6E2B0) ## $a1 = 80A70000 /* 00228 80A6DAF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0022C 80A6DAFC 0C01E037 */ jal Actor_ProcessInitChain - + /* 00230 80A6DB00 24A5E2B0 */ addiu $a1, $a1, %lo(D_80A6E2B0) ## $a1 = 80A6E2B0 /* 00234 80A6DB04 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 /* 00238 80A6DB08 34A56A7F */ ori $a1, $a1, 0x6A7F ## $a1 = 3C3C6A7F /* 0023C 80A6DB0C 0C00B58B */ jal Actor_SetScale - + /* 00240 80A6DB10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00244 80A6DB14 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 00248 80A6DB18 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 @@ -22,7 +22,7 @@ glabel EnHorseZelda_Init /* 00258 80A6DB28 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0025C 80A6DB2C 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 00260 80A6DB30 0C00AC78 */ jal ActorShape_Init - + /* 00264 80A6DB34 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 00268 80A6DB38 8E0E0028 */ lw $t6, 0x0028($s0) ## 00000028 /* 0026C 80A6DB3C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -32,7 +32,7 @@ glabel EnHorseZelda_Init /* 0027C 80A6DB4C 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 00280 80A6DB50 AE0F0038 */ sw $t7, 0x0038($s0) ## 00000038 /* 00284 80A6DB54 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00288 80A6DB58 460A4400 */ add.s $f16, $f8, $f10 +/* 00288 80A6DB58 460A4400 */ add.s $f16, $f8, $f10 /* 0028C 80A6DB5C 8E0F002C */ lw $t7, 0x002C($s0) ## 0000002C /* 00290 80A6DB60 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00294 80A6DB64 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 @@ -43,48 +43,48 @@ glabel EnHorseZelda_Init /* 002A8 80A6DB78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002AC 80A6DB7C 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 002B0 80A6DB80 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 002B4 80A6DB84 0C02998F */ jal func_800A663C +/* 002B4 80A6DB84 0C02998F */ jal func_800A663C /* 002B8 80A6DB88 AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 /* 002BC 80A6DB8C AE000150 */ sw $zero, 0x0150($s0) ## 00000150 /* 002C0 80A6DB90 3C0580A7 */ lui $a1, %hi(D_80A6E1D0) ## $a1 = 80A70000 -/* 002C4 80A6DB94 8CA5E1D0 */ lw $a1, %lo(D_80A6E1D0)($a1) -/* 002C8 80A6DB98 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 002C4 80A6DB94 8CA5E1D0 */ lw $a1, %lo(D_80A6E1D0)($a1) +/* 002C8 80A6DB98 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 002CC 80A6DB9C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 002D0 80A6DBA0 260501FC */ addiu $a1, $s0, 0x01FC ## $a1 = 000001FC -/* 002D4 80A6DBA4 AFA50028 */ sw $a1, 0x0028($sp) +/* 002D4 80A6DBA4 AFA50028 */ sw $a1, 0x0028($sp) /* 002D8 80A6DBA8 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 002DC 80A6DBAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002E0 80A6DBB0 3C0780A7 */ lui $a3, %hi(D_80A6E1D8) ## $a3 = 80A70000 -/* 002E4 80A6DBB4 8FA50028 */ lw $a1, 0x0028($sp) +/* 002E4 80A6DBB4 8FA50028 */ lw $a1, 0x0028($sp) /* 002E8 80A6DBB8 24E7E1D8 */ addiu $a3, $a3, %lo(D_80A6E1D8) ## $a3 = 80A6E1D8 /* 002EC 80A6DBBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002F0 80A6DBC0 0C017114 */ jal func_8005C450 +/* 002F0 80A6DBC0 0C017114 */ jal func_8005C450 /* 002F4 80A6DBC4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002F8 80A6DBC8 26050248 */ addiu $a1, $s0, 0x0248 ## $a1 = 00000248 -/* 002FC 80A6DBCC AFA50028 */ sw $a1, 0x0028($sp) -/* 00300 80A6DBD0 0C016EFE */ jal func_8005BBF8 +/* 002FC 80A6DBCC AFA50028 */ sw $a1, 0x0028($sp) +/* 00300 80A6DBD0 0C016EFE */ jal func_8005BBF8 /* 00304 80A6DBD4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00308 80A6DBD8 3C0780A7 */ lui $a3, %hi(D_80A6E228) ## $a3 = 80A70000 /* 0030C 80A6DBDC 26180268 */ addiu $t8, $s0, 0x0268 ## $t8 = 00000268 -/* 00310 80A6DBE0 8FA50028 */ lw $a1, 0x0028($sp) -/* 00314 80A6DBE4 AFB80010 */ sw $t8, 0x0010($sp) +/* 00310 80A6DBE0 8FA50028 */ lw $a1, 0x0028($sp) +/* 00314 80A6DBE4 AFB80010 */ sw $t8, 0x0010($sp) /* 00318 80A6DBE8 24E7E228 */ addiu $a3, $a3, %lo(D_80A6E228) ## $a3 = 80A6E228 /* 0031C 80A6DBEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00320 80A6DBF0 0C017014 */ jal func_8005C050 +/* 00320 80A6DBF0 0C017014 */ jal func_8005C050 /* 00324 80A6DBF4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00328 80A6DBF8 3C0680A7 */ lui $a2, %hi(D_80A6E238) ## $a2 = 80A70000 /* 0032C 80A6DBFC 24C6E238 */ addiu $a2, $a2, %lo(D_80A6E238) ## $a2 = 80A6E238 /* 00330 80A6DC00 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00334 80A6DC04 0C0187B5 */ jal func_80061ED4 +/* 00334 80A6DC04 0C0187B5 */ jal func_80061ED4 /* 00338 80A6DC08 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0033C 80A6DC0C AE000150 */ sw $zero, 0x0150($s0) ## 00000150 -/* 00340 80A6DC10 0C29B71F */ jal func_80A6DC7C +/* 00340 80A6DC10 0C29B71F */ jal func_80A6DC7C /* 00344 80A6DC14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00348 80A6DC18 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0034C 80A6DC1C 8FB0001C */ lw $s0, 0x001C($sp) -/* 00350 80A6DC20 8FB10020 */ lw $s1, 0x0020($sp) -/* 00354 80A6DC24 03E00008 */ jr $ra +/* 00348 80A6DC18 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0034C 80A6DC1C 8FB0001C */ lw $s0, 0x001C($sp) +/* 00350 80A6DC20 8FB10020 */ lw $s1, 0x0020($sp) +/* 00354 80A6DC24 03E00008 */ jr $ra /* 00358 80A6DC28 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s index c0b2238574..f68efcccae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s @@ -1,24 +1,24 @@ glabel func_80A6DC7C /* 003AC 80A6DC7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003B0 80A6DC80 AFBF0014 */ sw $ra, 0x0014($sp) +/* 003B0 80A6DC80 AFBF0014 */ sw $ra, 0x0014($sp) /* 003B4 80A6DC84 8C8E0150 */ lw $t6, 0x0150($a0) ## 00000150 /* 003B8 80A6DC88 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 003BC 80A6DC8C AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 003C0 80A6DC90 25C20001 */ addiu $v0, $t6, 0x0001 ## $v0 = 00000001 -/* 003C4 80A6DC94 18400003 */ blez $v0, .L80A6DCA4 +/* 003C4 80A6DC94 18400003 */ blez $v0, .L80A6DCA4 /* 003C8 80A6DC98 AC820150 */ sw $v0, 0x0150($a0) ## 00000150 /* 003CC 80A6DC9C AC800150 */ sw $zero, 0x0150($a0) ## 00000150 /* 003D0 80A6DCA0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A6DCA4: -/* 003D4 80A6DCA4 0002C080 */ sll $t8, $v0, 2 +/* 003D4 80A6DCA4 0002C080 */ sll $t8, $v0, 2 /* 003D8 80A6DCA8 3C0580A7 */ lui $a1, %hi(D_80A6E1D0) ## $a1 = 80A70000 -/* 003DC 80A6DCAC 00B82821 */ addu $a1, $a1, $t8 -/* 003E0 80A6DCB0 8CA5E1D0 */ lw $a1, %lo(D_80A6E1D0)($a1) -/* 003E4 80A6DCB4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 003DC 80A6DCAC 00B82821 */ addu $a1, $a1, $t8 +/* 003E0 80A6DCB0 8CA5E1D0 */ lw $a1, %lo(D_80A6E1D0)($a1) +/* 003E4 80A6DCB4 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 003E8 80A6DCB8 24C401A0 */ addiu $a0, $a2, 0x01A0 ## $a0 = 000001A0 -/* 003EC 80A6DCBC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003EC 80A6DCBC 8FBF0014 */ lw $ra, 0x0014($sp) /* 003F0 80A6DCC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003F4 80A6DCC4 03E00008 */ jr $ra +/* 003F4 80A6DCC4 03E00008 */ jr $ra /* 003F8 80A6DCC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s index 39fb113059..9dee287cb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s @@ -27,7 +27,7 @@ glabel EnJs_Init /* 00068 80A88E78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0006C 80A88E7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00070 80A88E80 24A5045C */ addiu $a1, $a1, 0x045C ## $a1 = 0600045C -/* 00074 80A88E84 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00074 80A88E84 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00078 80A88E88 8FA40044 */ lw $a0, 0x0044($sp) /* 0007C 80A88E8C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00080 80A88E90 AFA50044 */ sw $a1, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s index 26d23347fc..42f7ea3054 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s @@ -1,28 +1,28 @@ glabel func_80AA6CC0 /* 00C70 80AA6CC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C74 80AA6CC4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00C74 80AA6CC4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C78 80AA6CC8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00C7C 80AA6CCC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00C80 80AA6CD0 24A59280 */ addiu $a1, $a1, 0x9280 ## $a1 = 06009280 -/* 00C84 80AA6CD4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00C88 80AA6CD8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00C84 80AA6CD4 AFA60018 */ sw $a2, 0x0018($sp) +/* 00C88 80AA6CD8 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00C8C 80AA6CDC 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00C90 80AA6CE0 8FA40018 */ lw $a0, 0x0018($sp) +/* 00C90 80AA6CE0 8FA40018 */ lw $a0, 0x0018($sp) /* 00C94 80AA6CE4 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B /* 00C98 80AA6CE8 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 00C9C 80AA6CEC 240538B9 */ addiu $a1, $zero, 0x38B9 ## $a1 = 000038B9 /* 00CA0 80AA6CF0 AC8E0320 */ sw $t6, 0x0320($a0) ## 00000320 /* 00CA4 80AA6CF4 A480032A */ sh $zero, 0x032A($a0) ## 0000032A /* 00CA8 80AA6CF8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00CAC 80AA6CFC A48F032E */ sh $t7, 0x032E($a0) ## 0000032E /* 00CB0 80AA6D00 3C0580AA */ lui $a1, %hi(func_80AA7310) ## $a1 = 80AA0000 -/* 00CB4 80AA6D04 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CB8 80AA6D08 0C2A9814 */ jal func_80AA6050 +/* 00CB4 80AA6D04 8FA40018 */ lw $a0, 0x0018($sp) +/* 00CB8 80AA6D08 0C2A9814 */ jal func_80AA6050 /* 00CBC 80AA6D0C 24A57310 */ addiu $a1, $a1, %lo(func_80AA7310) ## $a1 = 80AA7310 -/* 00CC0 80AA6D10 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00CC0 80AA6D10 8FBF0014 */ lw $ra, 0x0014($sp) /* 00CC4 80AA6D14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CC8 80AA6D18 03E00008 */ jr $ra +/* 00CC8 80AA6D18 03E00008 */ jr $ra /* 00CCC 80AA6D1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s index 10cbc0bf71..ac98a4e0ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s @@ -1,13 +1,13 @@ glabel func_80AA6D20 /* 00CD0 80AA6D20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CD4 80AA6D24 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00CD4 80AA6D24 AFBF0014 */ sw $ra, 0x0014($sp) /* 00CD8 80AA6D28 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00CDC 80AA6D2C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00CE0 80AA6D30 24A59280 */ addiu $a1, $a1, 0x9280 ## $a1 = 06009280 -/* 00CE4 80AA6D34 AFA60018 */ sw $a2, 0x0018($sp) -/* 00CE8 80AA6D38 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00CE4 80AA6D34 AFA60018 */ sw $a2, 0x0018($sp) +/* 00CE8 80AA6D38 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00CEC 80AA6D3C 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00CF0 80AA6D40 8FA40018 */ lw $a0, 0x0018($sp) +/* 00CF0 80AA6D40 8FA40018 */ lw $a0, 0x0018($sp) /* 00CF4 80AA6D44 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 00CF8 80AA6D48 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 /* 00CFC 80AA6D4C 948F0088 */ lhu $t7, 0x0088($a0) ## 00000088 @@ -23,15 +23,15 @@ glabel func_80AA6D20 /* 00D24 80AA6D74 A499032E */ sh $t9, 0x032E($a0) ## 0000032E /* 00D28 80AA6D78 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 00D2C 80AA6D7C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00D30 80AA6D80 E4860060 */ swc1 $f6, 0x0060($a0) ## 00000060 /* 00D34 80AA6D84 3C0580AA */ lui $a1, %hi(func_80AA74BC) ## $a1 = 80AA0000 -/* 00D38 80AA6D88 8FA40018 */ lw $a0, 0x0018($sp) -/* 00D3C 80AA6D8C 0C2A9814 */ jal func_80AA6050 +/* 00D38 80AA6D88 8FA40018 */ lw $a0, 0x0018($sp) +/* 00D3C 80AA6D8C 0C2A9814 */ jal func_80AA6050 /* 00D40 80AA6D90 24A574BC */ addiu $a1, $a1, %lo(func_80AA74BC) ## $a1 = 80AA74BC -/* 00D44 80AA6D94 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00D44 80AA6D94 8FBF0014 */ lw $ra, 0x0014($sp) /* 00D48 80AA6D98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D4C 80AA6D9C 03E00008 */ jr $ra +/* 00D4C 80AA6D9C 03E00008 */ jr $ra /* 00D50 80AA6DA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s index 2a3c798bb1..cfff38bcb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s @@ -1,28 +1,28 @@ glabel func_80AA6E1C /* 00DCC 80AA6E1C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00DD0 80AA6E20 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00DD0 80AA6E20 AFBF0014 */ sw $ra, 0x0014($sp) /* 00DD4 80AA6E24 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00DD8 80AA6E28 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00DDC 80AA6E2C 24A5C44C */ addiu $a1, $a1, 0xC44C ## $a1 = 0600C44C -/* 00DE0 80AA6E30 AFA60018 */ sw $a2, 0x0018($sp) -/* 00DE4 80AA6E34 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00DE0 80AA6E30 AFA60018 */ sw $a2, 0x0018($sp) +/* 00DE4 80AA6E34 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00DE8 80AA6E38 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00DEC 80AA6E3C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00DEC 80AA6E3C 8FA40018 */ lw $a0, 0x0018($sp) /* 00DF0 80AA6E40 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 00DF4 80AA6E44 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 00DF8 80AA6E48 240538BE */ addiu $a1, $zero, 0x38BE ## $a1 = 000038BE /* 00DFC 80AA6E4C AC8E0320 */ sw $t6, 0x0320($a0) ## 00000320 /* 00E00 80AA6E50 A480032A */ sh $zero, 0x032A($a0) ## 0000032A /* 00E04 80AA6E54 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00E08 80AA6E58 A48F032E */ sh $t7, 0x032E($a0) ## 0000032E /* 00E0C 80AA6E5C 3C0580AB */ lui $a1, %hi(func_80AA8378) ## $a1 = 80AB0000 -/* 00E10 80AA6E60 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E14 80AA6E64 0C2A9814 */ jal func_80AA6050 +/* 00E10 80AA6E60 8FA40018 */ lw $a0, 0x0018($sp) +/* 00E14 80AA6E64 0C2A9814 */ jal func_80AA6050 /* 00E18 80AA6E68 24A58378 */ addiu $a1, $a1, %lo(func_80AA8378) ## $a1 = 80AA8378 -/* 00E1C 80AA6E6C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00E1C 80AA6E6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00E20 80AA6E70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E24 80AA6E74 03E00008 */ jr $ra +/* 00E24 80AA6E74 03E00008 */ jr $ra /* 00E28 80AA6E78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s index 406b760ea0..16b51006b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s @@ -1,44 +1,44 @@ glabel func_80AA8378 /* 02328 80AA8378 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0232C 80AA837C AFB00018 */ sw $s0, 0x0018($sp) +/* 0232C 80AA837C AFB00018 */ sw $s0, 0x0018($sp) /* 02330 80AA8380 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02334 80AA8384 AFBF001C */ sw $ra, 0x001C($sp) +/* 02334 80AA8384 AFBF001C */ sw $ra, 0x001C($sp) /* 02338 80AA8388 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 0233C 80AA838C AFA5002C */ sw $a1, 0x002C($sp) +/* 0233C 80AA838C AFA5002C */ sw $a1, 0x002C($sp) /* 02340 80AA8390 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02344 80AA8394 AFA40024 */ sw $a0, 0x0024($sp) -/* 02348 80AA8398 10400017 */ beq $v0, $zero, .L80AA83F8 -/* 0234C 80AA839C 8FA40024 */ lw $a0, 0x0024($sp) + +/* 02344 80AA8394 AFA40024 */ sw $a0, 0x0024($sp) +/* 02348 80AA8398 10400017 */ beq $v0, $zero, .L80AA83F8 +/* 0234C 80AA839C 8FA40024 */ lw $a0, 0x0024($sp) /* 02350 80AA83A0 860E032E */ lh $t6, 0x032E($s0) ## 0000032E /* 02354 80AA83A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02358 80AA83A8 11C00011 */ beq $t6, $zero, .L80AA83F0 +/* 02358 80AA83A8 11C00011 */ beq $t6, $zero, .L80AA83F0 /* 0235C 80AA83AC 00000000 */ nop -/* 02360 80AA83B0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02360 80AA83B0 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02364 80AA83B4 24A5E18C */ addiu $a1, $a1, 0xE18C ## $a1 = 0600E18C /* 02368 80AA83B8 A600032E */ sh $zero, 0x032E($s0) ## 0000032E /* 0236C 80AA83BC C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 /* 02370 80AA83C0 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 02374 80AA83C4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02378 80AA83C8 0C02A800 */ jal func_800AA000 +/* 02378 80AA83C8 0C02A800 */ jal func_800AA000 /* 0237C 80AA83CC 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 02380 80AA83D0 8FA4002C */ lw $a0, 0x002C($sp) +/* 02380 80AA83D0 8FA4002C */ lw $a0, 0x002C($sp) /* 02384 80AA83D4 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 02388 80AA83D8 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 /* 0238C 80AA83DC 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 02390 80AA83E0 0C016A87 */ jal func_8005AA1C +/* 02390 80AA83E0 0C016A87 */ jal func_8005AA1C /* 02394 80AA83E4 248401E0 */ addiu $a0, $a0, 0x01E0 ## $a0 = 000001E0 -/* 02398 80AA83E8 10000004 */ beq $zero, $zero, .L80AA83FC -/* 0239C 80AA83EC 8FBF001C */ lw $ra, 0x001C($sp) +/* 02398 80AA83E8 10000004 */ beq $zero, $zero, .L80AA83FC +/* 0239C 80AA83EC 8FBF001C */ lw $ra, 0x001C($sp) .L80AA83F0: -/* 023A0 80AA83F0 0C2A9A26 */ jal func_80AA6898 +/* 023A0 80AA83F0 0C2A9A26 */ jal func_80AA6898 /* 023A4 80AA83F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AA83F8: -/* 023A8 80AA83F8 8FBF001C */ lw $ra, 0x001C($sp) +/* 023A8 80AA83F8 8FBF001C */ lw $ra, 0x001C($sp) .L80AA83FC: -/* 023AC 80AA83FC 8FB00018 */ lw $s0, 0x0018($sp) +/* 023AC 80AA83FC 8FB00018 */ lw $s0, 0x0018($sp) /* 023B0 80AA8400 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 023B4 80AA8404 03E00008 */ jr $ra +/* 023B4 80AA8404 03E00008 */ jr $ra /* 023B8 80AA8408 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s index 88cd535d52..7a9ef9599f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s @@ -1,7 +1,7 @@ glabel func_80AC0AB4 /* 00454 80AC0AB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00458 80AC0AB8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0045C 80AC0ABC AFBF0014 */ sw $ra, 0x0014($sp) +/* 00458 80AC0AB8 AFA5001C */ sw $a1, 0x001C($sp) +/* 0045C 80AC0ABC AFBF0014 */ sw $ra, 0x0014($sp) /* 00460 80AC0AC0 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 /* 00464 80AC0AC4 848F008A */ lh $t7, 0x008A($a0) ## 0000008A /* 00468 80AC0AC8 3C0E80AC */ lui $t6, %hi(EnOkuta_Draw) ## $t6 = 80AC0000 @@ -12,20 +12,20 @@ glabel func_80AC0AB4 /* 0047C 80AC0ADC AC990004 */ sw $t9, 0x0004($a0) ## 00000004 /* 00480 80AC0AE0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00484 80AC0AE4 A48F00B6 */ sh $t7, 0x00B6($a0) ## 000000B6 -/* 00488 80AC0AE8 AFA60018 */ sw $a2, 0x0018($sp) +/* 00488 80AC0AE8 AFA60018 */ sw $a2, 0x0018($sp) /* 0048C 80AC0AEC 24A53C64 */ addiu $a1, $a1, 0x3C64 ## $a1 = 06003C64 -/* 00490 80AC0AF0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00490 80AC0AF0 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00494 80AC0AF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00498 80AC0AF8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0049C 80AC0AFC 0C2B0224 */ jal func_80AC0890 -/* 004A0 80AC0B00 8FA5001C */ lw $a1, 0x001C($sp) -/* 004A4 80AC0B04 8FA60018 */ lw $a2, 0x0018($sp) +/* 00498 80AC0AF8 8FA40018 */ lw $a0, 0x0018($sp) +/* 0049C 80AC0AFC 0C2B0224 */ jal func_80AC0890 +/* 004A0 80AC0B00 8FA5001C */ lw $a1, 0x001C($sp) +/* 004A4 80AC0B04 8FA60018 */ lw $a2, 0x0018($sp) /* 004A8 80AC0B08 3C0880AC */ lui $t0, %hi(func_80AC0F64) ## $t0 = 80AC0000 /* 004AC 80AC0B0C 25080F64 */ addiu $t0, $t0, %lo(func_80AC0F64) ## $t0 = 80AC0F64 /* 004B0 80AC0B10 ACC80190 */ sw $t0, 0x0190($a2) ## 00000190 -/* 004B4 80AC0B14 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004B4 80AC0B14 8FBF0014 */ lw $ra, 0x0014($sp) /* 004B8 80AC0B18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004BC 80AC0B1C 03E00008 */ jr $ra +/* 004BC 80AC0B1C 03E00008 */ jr $ra /* 004C0 80AC0B20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s index 037dffc8e7..6db616ba96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s @@ -1,18 +1,18 @@ glabel func_80AC0B24 /* 004C4 80AC0B24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004C8 80AC0B28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004CC 80AC0B2C AFA40018 */ sw $a0, 0x0018($sp) +/* 004C8 80AC0B28 AFBF0014 */ sw $ra, 0x0014($sp) +/* 004CC 80AC0B2C AFA40018 */ sw $a0, 0x0018($sp) /* 004D0 80AC0B30 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004D4 80AC0B34 24A50AC0 */ addiu $a1, $a1, 0x0AC0 ## $a1 = 06000AC0 -/* 004D8 80AC0B38 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 004D8 80AC0B38 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 004DC 80AC0B3C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004E0 80AC0B40 8FAF0018 */ lw $t7, 0x0018($sp) +/* 004E0 80AC0B40 8FAF0018 */ lw $t7, 0x0018($sp) /* 004E4 80AC0B44 3C0E80AC */ lui $t6, %hi(func_80AC10A8) ## $t6 = 80AC0000 /* 004E8 80AC0B48 25CE10A8 */ addiu $t6, $t6, %lo(func_80AC10A8) ## $t6 = 80AC10A8 /* 004EC 80AC0B4C ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 004F0 80AC0B50 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004F0 80AC0B50 8FBF0014 */ lw $ra, 0x0014($sp) /* 004F4 80AC0B54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004F8 80AC0B58 03E00008 */ jr $ra +/* 004F8 80AC0B58 03E00008 */ jr $ra /* 004FC 80AC0B5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s index 99c6f5b6ea..a7196209b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s @@ -1,17 +1,17 @@ glabel func_80AC0BC0 /* 00560 80AC0BC0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00564 80AC0BC4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00568 80AC0BC8 AFA5002C */ sw $a1, 0x002C($sp) +/* 00564 80AC0BC4 AFB00018 */ sw $s0, 0x0018($sp) +/* 00568 80AC0BC8 AFA5002C */ sw $a1, 0x002C($sp) /* 0056C 80AC0BCC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00570 80AC0BD0 AFBF001C */ sw $ra, 0x001C($sp) +/* 00570 80AC0BD0 AFBF001C */ sw $ra, 0x001C($sp) /* 00574 80AC0BD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00578 80AC0BD8 24A50344 */ addiu $a1, $a1, 0x0344 ## $a1 = 06000344 -/* 0057C 80AC0BDC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 0057C 80AC0BDC 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00580 80AC0BE0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00584 80AC0BE4 8E0E0190 */ lw $t6, 0x0190($s0) ## 00000190 /* 00588 80AC0BE8 3C0280AC */ lui $v0, %hi(func_80AC12D8) ## $v0 = 80AC0000 /* 0058C 80AC0BEC 244212D8 */ addiu $v0, $v0, %lo(func_80AC12D8) ## $v0 = 80AC12D8 -/* 00590 80AC0BF0 104E0003 */ beq $v0, $t6, .L80AC0C00 +/* 00590 80AC0BF0 104E0003 */ beq $v0, $t6, .L80AC0C00 /* 00594 80AC0BF4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00598 80AC0BF8 860F0196 */ lh $t7, 0x0196($s0) ## 00000196 /* 0059C 80AC0BFC A60F0194 */ sh $t7, 0x0194($s0) ## 00000194 @@ -22,47 +22,47 @@ glabel func_80AC0BC0 /* 005AC 80AC0C0C C6040094 */ lwc1 $f4, 0x0094($s0) ## 00000094 /* 005B0 80AC0C10 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 005B4 80AC0C14 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 005B8 80AC0C18 46062000 */ add.s $f0, $f4, $f6 +/* 005B8 80AC0C18 46062000 */ add.s $f0, $f4, $f6 /* 005BC 80AC0C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005C0 80AC0C20 4602003C */ c.lt.s $f0, $f2 +/* 005C0 80AC0C20 4602003C */ c.lt.s $f0, $f2 /* 005C4 80AC0C24 E6000360 */ swc1 $f0, 0x0360($s0) ## 00000360 -/* 005C8 80AC0C28 45020004 */ bc1fl .L80AC0C3C +/* 005C8 80AC0C28 45020004 */ bc1fl .L80AC0C3C /* 005CC 80AC0C2C C6080360 */ lwc1 $f8, 0x0360($s0) ## 00000360 -/* 005D0 80AC0C30 10000003 */ beq $zero, $zero, .L80AC0C40 +/* 005D0 80AC0C30 10000003 */ beq $zero, $zero, .L80AC0C40 /* 005D4 80AC0C34 E6020360 */ swc1 $f2, 0x0360($s0) ## 00000360 /* 005D8 80AC0C38 C6080360 */ lwc1 $f8, 0x0360($s0) ## 00000360 .L80AC0C3C: /* 005DC 80AC0C3C E6080360 */ swc1 $f8, 0x0360($s0) ## 00000360 .L80AC0C40: /* 005E0 80AC0C40 C6000360 */ lwc1 $f0, 0x0360($s0) ## 00000360 -/* 005E4 80AC0C44 8FA5002C */ lw $a1, 0x002C($sp) -/* 005E8 80AC0C48 4600503C */ c.lt.s $f10, $f0 +/* 005E4 80AC0C44 8FA5002C */ lw $a1, 0x002C($sp) +/* 005E8 80AC0C48 4600503C */ c.lt.s $f10, $f0 /* 005EC 80AC0C4C 00000000 */ nop -/* 005F0 80AC0C50 45020006 */ bc1fl .L80AC0C6C +/* 005F0 80AC0C50 45020006 */ bc1fl .L80AC0C6C /* 005F4 80AC0C54 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 005F8 80AC0C58 0C2B0269 */ jal func_80AC09A4 -/* 005FC 80AC0C5C AFA20024 */ sw $v0, 0x0024($sp) -/* 00600 80AC0C60 8FA20024 */ lw $v0, 0x0024($sp) +/* 005F8 80AC0C58 0C2B0269 */ jal func_80AC09A4 +/* 005FC 80AC0C5C AFA20024 */ sw $v0, 0x0024($sp) +/* 00600 80AC0C60 8FA20024 */ lw $v0, 0x0024($sp) /* 00604 80AC0C64 C6000360 */ lwc1 $f0, 0x0360($s0) ## 00000360 /* 00608 80AC0C68 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L80AC0C6C: /* 0060C 80AC0C6C 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 /* 00610 80AC0C70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00614 80AC0C74 240538C2 */ addiu $a1, $zero, 0x38C2 ## $a1 = 000038C2 -/* 00618 80AC0C78 4600803C */ c.lt.s $f16, $f0 +/* 00618 80AC0C78 4600803C */ c.lt.s $f16, $f0 /* 0061C 80AC0C7C 00000000 */ nop -/* 00620 80AC0C80 45020005 */ bc1fl .L80AC0C98 +/* 00620 80AC0C80 45020005 */ bc1fl .L80AC0C98 /* 00624 80AC0C84 AE020190 */ sw $v0, 0x0190($s0) ## 00000190 /* 00628 80AC0C88 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0062C 80AC0C8C AFA20024 */ sw $v0, 0x0024($sp) -/* 00630 80AC0C90 8FA20024 */ lw $v0, 0x0024($sp) + +/* 0062C 80AC0C8C AFA20024 */ sw $v0, 0x0024($sp) +/* 00630 80AC0C90 8FA20024 */ lw $v0, 0x0024($sp) /* 00634 80AC0C94 AE020190 */ sw $v0, 0x0190($s0) ## 00000190 .L80AC0C98: -/* 00638 80AC0C98 8FBF001C */ lw $ra, 0x001C($sp) -/* 0063C 80AC0C9C 8FB00018 */ lw $s0, 0x0018($sp) +/* 00638 80AC0C98 8FBF001C */ lw $ra, 0x001C($sp) +/* 0063C 80AC0C9C 8FB00018 */ lw $s0, 0x0018($sp) /* 00640 80AC0CA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00644 80AC0CA4 03E00008 */ jr $ra +/* 00644 80AC0CA4 03E00008 */ jr $ra /* 00648 80AC0CA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s index a861997d40..7c7ed35af0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s @@ -1,21 +1,21 @@ glabel func_80AD0B3C /* 0169C 80AD0B3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 016A0 80AD0B40 AFBF0014 */ sw $ra, 0x0014($sp) +/* 016A0 80AD0B40 AFBF0014 */ sw $ra, 0x0014($sp) /* 016A4 80AD0B44 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 016A8 80AD0B48 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 016AC 80AD0B4C AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 /* 016B0 80AD0B50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 016B4 80AD0B54 24A50350 */ addiu $a1, $a1, 0x0350 ## $a1 = 06000350 -/* 016B8 80AD0B58 AFA60018 */ sw $a2, 0x0018($sp) -/* 016BC 80AD0B5C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 016B8 80AD0B58 AFA60018 */ sw $a2, 0x0018($sp) +/* 016BC 80AD0B5C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 016C0 80AD0B60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 016C4 80AD0B64 3C0580AD */ lui $a1, %hi(func_80AD0B84) ## $a1 = 80AD0000 -/* 016C8 80AD0B68 8FA40018 */ lw $a0, 0x0018($sp) -/* 016CC 80AD0B6C 0C2B3D28 */ jal func_80ACF4A0 +/* 016C8 80AD0B68 8FA40018 */ lw $a0, 0x0018($sp) +/* 016CC 80AD0B6C 0C2B3D28 */ jal func_80ACF4A0 /* 016D0 80AD0B70 24A50B84 */ addiu $a1, $a1, %lo(func_80AD0B84) ## $a1 = 80AD0B84 -/* 016D4 80AD0B74 8FBF0014 */ lw $ra, 0x0014($sp) +/* 016D4 80AD0B74 8FBF0014 */ lw $ra, 0x0014($sp) /* 016D8 80AD0B78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 016DC 80AD0B7C 03E00008 */ jr $ra +/* 016DC 80AD0B7C 03E00008 */ jr $ra /* 016E0 80AD0B80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s index 3ec4709acf..90c8730652 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s @@ -1,21 +1,21 @@ glabel func_80AD0D3C /* 0189C 80AD0D3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018A0 80AD0D40 AFBF0014 */ sw $ra, 0x0014($sp) +/* 018A0 80AD0D40 AFBF0014 */ sw $ra, 0x0014($sp) /* 018A4 80AD0D44 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 018A8 80AD0D48 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 018AC 80AD0D4C 24A50350 */ addiu $a1, $a1, 0x0350 ## $a1 = 06000350 -/* 018B0 80AD0D50 AFA60018 */ sw $a2, 0x0018($sp) -/* 018B4 80AD0D54 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 018B0 80AD0D50 AFA60018 */ sw $a2, 0x0018($sp) +/* 018B4 80AD0D54 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 018B8 80AD0D58 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 018BC 80AD0D5C 8FA40018 */ lw $a0, 0x0018($sp) +/* 018BC 80AD0D5C 8FA40018 */ lw $a0, 0x0018($sp) /* 018C0 80AD0D60 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 018C4 80AD0D64 3C0580AD */ lui $a1, %hi(func_80AD0D84) ## $a1 = 80AD0000 /* 018C8 80AD0D68 24A50D84 */ addiu $a1, $a1, %lo(func_80AD0D84) ## $a1 = 80AD0D84 -/* 018CC 80AD0D6C 0C2B3D28 */ jal func_80ACF4A0 +/* 018CC 80AD0D6C 0C2B3D28 */ jal func_80ACF4A0 /* 018D0 80AD0D70 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 018D4 80AD0D74 8FBF0014 */ lw $ra, 0x0014($sp) +/* 018D4 80AD0D74 8FBF0014 */ lw $ra, 0x0014($sp) /* 018D8 80AD0D78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018DC 80AD0D7C 03E00008 */ jr $ra +/* 018DC 80AD0D7C 03E00008 */ jr $ra /* 018E0 80AD0D80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s index bb4e1f22e5..78dec8c8d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s @@ -1,13 +1,13 @@ glabel func_80AD3E2C /* 0032C 80AD3E2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00330 80AD3E30 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00330 80AD3E30 AFBF0014 */ sw $ra, 0x0014($sp) /* 00334 80AD3E34 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00338 80AD3E38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0033C 80AD3E3C 24A50F9C */ addiu $a1, $a1, 0x0F9C ## $a1 = 06000F9C -/* 00340 80AD3E40 AFA60018 */ sw $a2, 0x0018($sp) -/* 00344 80AD3E44 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00340 80AD3E40 AFA60018 */ sw $a2, 0x0018($sp) +/* 00344 80AD3E44 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00348 80AD3E48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0034C 80AD3E4C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0034C 80AD3E4C 8FA40018 */ lw $a0, 0x0018($sp) /* 00350 80AD3E50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00354 80AD3E54 3C0E80AD */ lui $t6, %hi(EnPoField_Draw) ## $t6 = 80AD0000 /* 00358 80AD3E58 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF @@ -21,15 +21,15 @@ glabel func_80AD3E2C /* 00378 80AD3E78 A0800217 */ sb $zero, 0x0217($a0) ## 00000217 /* 0037C 80AD3E7C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 /* 00380 80AD3E80 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00384 80AD3E84 E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 00388 80AD3E88 8FA60018 */ lw $a2, 0x0018($sp) +/* 00388 80AD3E88 8FA60018 */ lw $a2, 0x0018($sp) /* 0038C 80AD3E8C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00390 80AD3E90 3C0F80AD */ lui $t7, %hi(func_80AD48CC) ## $t7 = 80AD0000 /* 00394 80AD3E94 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C /* 00398 80AD3E98 C4C60028 */ lwc1 $f6, 0x0028($a2) ## 00000028 /* 0039C 80AD3E9C 25EF48CC */ addiu $t7, $t7, %lo(func_80AD48CC) ## $t7 = 80AD48CC -/* 003A0 80AD3EA0 17010013 */ bne $t8, $at, .L80AD3EF0 +/* 003A0 80AD3EA0 17010013 */ bne $t8, $at, .L80AD3EF0 /* 003A4 80AD3EA4 E4C6000C */ swc1 $f6, 0x000C($a2) ## 0000000C /* 003A8 80AD3EA8 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 003AC 80AD3EAC 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 @@ -44,10 +44,10 @@ glabel func_80AD3E2C /* 003D0 80AD3ED0 3C0180AD */ lui $at, %hi(D_80AD723C) ## $at = 80AD0000 /* 003D4 80AD3ED4 E4C80068 */ swc1 $f8, 0x0068($a2) ## 00000068 /* 003D8 80AD3ED8 E4CA00C4 */ swc1 $f10, 0x00C4($a2) ## 000000C4 -/* 003DC 80AD3EDC C430723C */ lwc1 $f16, %lo(D_80AD723C)($at) +/* 003DC 80AD3EDC C430723C */ lwc1 $f16, %lo(D_80AD723C)($at) /* 003E0 80AD3EE0 240A005A */ addiu $t2, $zero, 0x005A ## $t2 = 0000005A /* 003E4 80AD3EE4 A0CA0117 */ sb $t2, 0x0117($a2) ## 00000117 -/* 003E8 80AD3EE8 10000013 */ beq $zero, $zero, .L80AD3F38 +/* 003E8 80AD3EE8 10000013 */ beq $zero, $zero, .L80AD3F38 /* 003EC 80AD3EEC E4D0021C */ swc1 $f16, 0x021C($a2) ## 0000021C .L80AD3EF0: /* 003F0 80AD3EF0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -65,14 +65,14 @@ glabel func_80AD3E2C /* 00420 80AD3F20 844D0024 */ lh $t5, 0x0024($v0) ## 80AD70A4 /* 00424 80AD3F24 E4C400C4 */ swc1 $f4, 0x00C4($a2) ## 000000C4 /* 00428 80AD3F28 A4CD0288 */ sh $t5, 0x0288($a2) ## 00000288 -/* 0042C 80AD3F2C C4267240 */ lwc1 $f6, %lo(D_80AD7240)($at) +/* 0042C 80AD3F2C C4267240 */ lwc1 $f6, %lo(D_80AD7240)($at) /* 00430 80AD3F30 A0CE0117 */ sb $t6, 0x0117($a2) ## 00000117 /* 00434 80AD3F34 E4C6021C */ swc1 $f6, 0x021C($a2) ## 0000021C .L80AD3F38: /* 00438 80AD3F38 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 0043C 80AD3F3C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0043C 80AD3F3C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00440 80AD3F40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00444 80AD3F44 03E00008 */ jr $ra +/* 00444 80AD3F44 03E00008 */ jr $ra /* 00448 80AD3F48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s index e65f2aa11b..14f4ee2ca6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s @@ -1,40 +1,40 @@ glabel func_80AD9D44 /* 00DB4 80AD9D44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00DB8 80AD9D48 AFBF002C */ sw $ra, 0x002C($sp) -/* 00DBC 80AD9D4C AFB00028 */ sw $s0, 0x0028($sp) +/* 00DB8 80AD9D48 AFBF002C */ sw $ra, 0x002C($sp) +/* 00DBC 80AD9D4C AFB00028 */ sw $s0, 0x0028($sp) /* 00DC0 80AD9D50 908E0194 */ lbu $t6, 0x0194($a0) ## 00000194 /* 00DC4 80AD9D54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00DC8 80AD9D58 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00DCC 80AD9D5C 15C10009 */ bne $t6, $at, .L80AD9D84 +/* 00DCC 80AD9D5C 15C10009 */ bne $t6, $at, .L80AD9D84 /* 00DD0 80AD9D60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00DD4 80AD9D64 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00DD8 80AD9D68 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00DD8 80AD9D68 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00DDC 80AD9D6C 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C /* 00DE0 80AD9D70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DE4 80AD9D74 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00DE8 80AD9D78 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 -/* 00DEC 80AD9D7C 10000011 */ beq $zero, $zero, .L80AD9DC4 +/* 00DEC 80AD9D7C 10000011 */ beq $zero, $zero, .L80AD9DC4 /* 00DF0 80AD9D80 00000000 */ nop .L80AD9D84: /* 00DF4 80AD9D84 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00DF8 80AD9D88 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DFC 80AD9D8C 2484119C */ addiu $a0, $a0, 0x119C ## $a0 = 0600119C /* 00E00 80AD9D90 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00E04 80AD9D94 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00E08 80AD9D98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E0C 80AD9D9C 468021A0 */ cvt.s.w $f6, $f4 +/* 00E0C 80AD9D9C 468021A0 */ cvt.s.w $f6, $f4 /* 00E10 80AD9DA0 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 00E14 80AD9DA4 44070000 */ mfc1 $a3, $f0 -/* 00E18 80AD9DA8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00E14 80AD9DA4 44070000 */ mfc1 $a3, $f0 +/* 00E18 80AD9DA8 AFAF0014 */ sw $t7, 0x0014($sp) /* 00E1C 80AD9DAC 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C /* 00E20 80AD9DB0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00E24 80AD9DB4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00E24 80AD9DB4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00E28 80AD9DB8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 00E2C 80AD9DBC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00E30 80AD9DC0 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 00E30 80AD9DC0 E7A00018 */ swc1 $f0, 0x0018($sp) .L80AD9DC4: /* 00E34 80AD9DC4 3C1980AE */ lui $t9, %hi(func_80ADB9F0) ## $t9 = 80AE0000 /* 00E38 80AD9DC8 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 @@ -42,10 +42,10 @@ glabel func_80AD9D44 /* 00E40 80AD9DD0 A2000231 */ sb $zero, 0x0231($s0) ## 00000231 /* 00E44 80AD9DD4 A2180199 */ sb $t8, 0x0199($s0) ## 00000199 /* 00E48 80AD9DD8 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 00E4C 80AD9DDC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E50 80AD9DE0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00E4C 80AD9DDC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00E50 80AD9DE0 8FB00028 */ lw $s0, 0x0028($sp) /* 00E54 80AD9DE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00E58 80AD9DE8 03E00008 */ jr $ra +/* 00E58 80AD9DE8 03E00008 */ jr $ra /* 00E5C 80AD9DEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s index 24d840399c..c802dd08a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s @@ -1,21 +1,21 @@ glabel func_80ADE28C /* 0053C 80ADE28C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00540 80ADE290 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00544 80ADE294 AFB00020 */ sw $s0, 0x0020($sp) +/* 00540 80ADE290 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00544 80ADE294 AFB00020 */ sw $s0, 0x0020($sp) /* 00548 80ADE298 908E0197 */ lbu $t6, 0x0197($a0) ## 00000197 /* 0054C 80ADE29C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00550 80ADE2A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00554 80ADE2A4 15C00008 */ bne $t6, $zero, .L80ADE2C8 +/* 00554 80ADE2A4 15C00008 */ bne $t6, $zero, .L80ADE2C8 /* 00558 80ADE2A8 24A50570 */ addiu $a1, $a1, 0x0570 ## $a1 = 06000570 /* 0055C 80ADE2AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00560 80ADE2B0 24A504EC */ addiu $a1, $a1, 0x04EC ## $a1 = 060004EC /* 00564 80ADE2B4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00568 80ADE2B8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop +/* 00568 80ADE2B8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0056C 80ADE2BC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 00570 80ADE2C0 10000004 */ beq $zero, $zero, .L80ADE2D4 +/* 00570 80ADE2C0 10000004 */ beq $zero, $zero, .L80ADE2D4 /* 00574 80ADE2C4 8E0F02F8 */ lw $t7, 0x02F8($s0) ## 000002F8 .L80ADE2C8: -/* 00578 80ADE2C8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00578 80ADE2C8 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 0057C 80ADE2CC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00580 80ADE2D0 8E0F02F8 */ lw $t7, 0x02F8($s0) ## 000002F8 .L80ADE2D4: @@ -23,18 +23,18 @@ glabel func_80ADE28C /* 00588 80ADE2D8 3421F824 */ ori $at, $at, 0xF824 ## $at = 0001F824 /* 0058C 80ADE2DC 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 /* 00590 80ADE2E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00594 80ADE2E4 0301C824 */ and $t9, $t8, $at -/* 00598 80ADE2E8 13200005 */ beq $t9, $zero, .L80ADE300 +/* 00594 80ADE2E4 0301C824 */ and $t9, $t8, $at +/* 00598 80ADE2E8 13200005 */ beq $t9, $zero, .L80ADE300 /* 0059C 80ADE2EC 00000000 */ nop /* 005A0 80ADE2F0 8E0802C4 */ lw $t0, 0x02C4($s0) ## 000002C4 /* 005A4 80ADE2F4 85090032 */ lh $t1, 0x0032($t0) ## 00000032 -/* 005A8 80ADE2F8 10000006 */ beq $zero, $zero, .L80ADE314 +/* 005A8 80ADE2F8 10000006 */ beq $zero, $zero, .L80ADE314 /* 005AC 80ADE2FC A6090032 */ sh $t1, 0x0032($s0) ## 00000032 .L80ADE300: -/* 005B0 80ADE300 0C00B69E */ jal func_8002DA78 +/* 005B0 80ADE300 0C00B69E */ jal func_8002DA78 /* 005B4 80ADE304 8E0502C4 */ lw $a1, 0x02C4($s0) ## 000002C4 /* 005B8 80ADE308 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 005BC 80ADE30C 00415021 */ addu $t2, $v0, $at +/* 005BC 80ADE30C 00415021 */ addu $t2, $v0, $at /* 005C0 80ADE310 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 .L80ADE314: /* 005C4 80ADE314 920B02CD */ lbu $t3, 0x02CD($s0) ## 000002CD @@ -44,19 +44,19 @@ glabel func_80ADE28C /* 005D4 80ADE324 A20C02CD */ sb $t4, 0x02CD($s0) ## 000002CD /* 005D8 80ADE328 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 /* 005DC 80ADE32C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 005E0 80ADE330 AFAD0010 */ sw $t5, 0x0010($sp) +/* 005E0 80ADE330 AFAD0010 */ sw $t5, 0x0010($sp) /* 005E4 80ADE334 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005E8 80ADE338 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 005EC 80ADE33C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 005F0 80ADE340 0C00D09B */ jal func_8003426C +/* 005F0 80ADE340 0C00D09B */ jal func_8003426C /* 005F4 80ADE344 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 005F8 80ADE348 3C0E80AE */ lui $t6, %hi(func_80ADEECC) ## $t6 = 80AE0000 /* 005FC 80ADE34C 25CEEECC */ addiu $t6, $t6, %lo(func_80ADEECC) ## $t6 = 80ADEECC /* 00600 80ADE350 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00604 80ADE354 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00608 80ADE358 8FB00020 */ lw $s0, 0x0020($sp) +/* 00604 80ADE354 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00608 80ADE358 8FB00020 */ lw $s0, 0x0020($sp) /* 0060C 80ADE35C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00610 80ADE360 03E00008 */ jr $ra +/* 00610 80ADE360 03E00008 */ jr $ra /* 00614 80ADE364 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s index 791a65e234..a12a857511 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s @@ -1,22 +1,22 @@ glabel func_80ADE4C8 /* 00778 80ADE4C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0077C 80ADE4CC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0077C 80ADE4CC AFBF0014 */ sw $ra, 0x0014($sp) /* 00780 80ADE4D0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00784 80ADE4D4 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 00788 80ADE4D8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0078C 80ADE4DC 8DC50010 */ lw $a1, 0x0010($t6) ## 00000010 -/* 00790 80ADE4E0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop -/* 00794 80ADE4E4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00798 80ADE4E8 8FA60018 */ lw $a2, 0x0018($sp) +/* 00790 80ADE4E0 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop +/* 00794 80ADE4E4 AFA60018 */ sw $a2, 0x0018($sp) +/* 00798 80ADE4E8 8FA60018 */ lw $a2, 0x0018($sp) /* 0079C 80ADE4EC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 007A0 80ADE4F0 44812000 */ mtc1 $at, $f4 ## $f4 = -5.00 /* 007A4 80ADE4F4 3C0F80AE */ lui $t7, %hi(func_80ADF574) ## $t7 = 80AE0000 /* 007A8 80ADE4F8 25EFF574 */ addiu $t7, $t7, %lo(func_80ADF574) ## $t7 = 80ADF574 /* 007AC 80ADE4FC ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 007B0 80ADE500 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 007B4 80ADE504 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007B4 80ADE504 8FBF0014 */ lw $ra, 0x0014($sp) /* 007B8 80ADE508 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007BC 80ADE50C 03E00008 */ jr $ra +/* 007BC 80ADE50C 03E00008 */ jr $ra /* 007C0 80ADE510 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s index 8a8b3109c9..0661a1b85c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s @@ -1,13 +1,13 @@ glabel func_80AE33F0 /* 00FF0 80AE33F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00FF4 80AE33F4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00FF4 80AE33F4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00FF8 80AE33F8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00FFC 80AE33FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01000 80AE3400 24A54ADC */ addiu $a1, $a1, 0x4ADC ## $a1 = 06004ADC -/* 01004 80AE3404 AFA60018 */ sw $a2, 0x0018($sp) -/* 01008 80AE3408 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 01004 80AE3404 AFA60018 */ sw $a2, 0x0018($sp) +/* 01008 80AE3408 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 0100C 80AE340C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01010 80AE3410 8FA40018 */ lw $a0, 0x0018($sp) +/* 01010 80AE3410 8FA40018 */ lw $a0, 0x0018($sp) /* 01014 80AE3414 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01018 80AE3418 300E00FF */ andi $t6, $zero, 0x00FF ## $t6 = 00000000 /* 0101C 80AE341C 240F00C8 */ addiu $t7, $zero, 0x00C8 ## $t7 = 000000C8 @@ -18,11 +18,11 @@ glabel func_80AE33F0 /* 01030 80AE3430 A0800304 */ sb $zero, 0x0304($a0) ## 00000304 /* 01034 80AE3434 A08F0319 */ sb $t7, 0x0319($a0) ## 00000319 /* 01038 80AE3438 A098031B */ sb $t8, 0x031B($a0) ## 0000031B -/* 0103C 80AE343C 0C2B8900 */ jal func_80AE2400 +/* 0103C 80AE343C 0C2B8900 */ jal func_80AE2400 /* 01040 80AE3440 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01044 80AE3444 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01044 80AE3444 8FBF0014 */ lw $ra, 0x0014($sp) /* 01048 80AE3448 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0104C 80AE344C 03E00008 */ jr $ra +/* 0104C 80AE344C 03E00008 */ jr $ra /* 01050 80AE3450 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s index c5e92893a4..cf14fadd66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s @@ -1,18 +1,18 @@ glabel func_80AFA930 /* 00210 80AFA930 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00214 80AFA934 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00218 80AFA938 AFA40018 */ sw $a0, 0x0018($sp) +/* 00214 80AFA934 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00218 80AFA938 AFA40018 */ sw $a0, 0x0018($sp) /* 0021C 80AFA93C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00220 80AFA940 24A501EC */ addiu $a1, $a1, 0x01EC ## $a1 = 060001EC -/* 00224 80AFA944 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00224 80AFA944 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00228 80AFA948 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0022C 80AFA94C 8FAF0018 */ lw $t7, 0x0018($sp) +/* 0022C 80AFA94C 8FAF0018 */ lw $t7, 0x0018($sp) /* 00230 80AFA950 3C0E80B0 */ lui $t6, %hi(func_80AFAE28) ## $t6 = 80B00000 /* 00234 80AFA954 25CEAE28 */ addiu $t6, $t6, %lo(func_80AFAE28) ## $t6 = 80AFAE28 /* 00238 80AFA958 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 0023C 80AFA95C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0023C 80AFA95C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00240 80AFA960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00244 80AFA964 03E00008 */ jr $ra +/* 00244 80AFA964 03E00008 */ jr $ra /* 00248 80AFA968 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s index a14be323b0..8c0a660258 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s @@ -1,15 +1,15 @@ glabel func_80AFF5F0 /* 01340 80AFF5F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01344 80AFF5F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01348 80AFF5F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0134C 80AFF5FC 0C029502 */ jal func_800A5408 +/* 01344 80AFF5F4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01348 80AFF5F8 AFA40018 */ sw $a0, 0x0018($sp) +/* 0134C 80AFF5FC 0C029502 */ jal SkelAnime_AnimationReverse /* 01350 80AFF600 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01354 80AFF604 8FA40018 */ lw $a0, 0x0018($sp) -/* 01358 80AFF608 0C2BF8CE */ jal func_80AFE338 +/* 01354 80AFF604 8FA40018 */ lw $a0, 0x0018($sp) +/* 01358 80AFF608 0C2BF8CE */ jal func_80AFE338 /* 0135C 80AFF60C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 01360 80AFF610 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01360 80AFF610 8FBF0014 */ lw $ra, 0x0014($sp) /* 01364 80AFF614 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01368 80AFF618 03E00008 */ jr $ra +/* 01368 80AFF618 03E00008 */ jr $ra /* 0136C 80AFF61C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s index c62b968089..09e82ad58b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s @@ -4,23 +4,23 @@ glabel func_80AFFFBC /* 01D14 80AFFFC4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01D18 80AFFFC8 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 /* 01D1C 80AFFFCC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D20 80AFFFD0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01D20 80AFFFD0 AFBF0014 */ sw $ra, 0x0014($sp) /* 01D24 80AFFFD4 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 /* 01D28 80AFFFD8 E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -/* 01D2C 80AFFFDC AFA40018 */ sw $a0, 0x0018($sp) -/* 01D30 80AFFFE0 0C2BF8AC */ jal func_80AFE2B0 +/* 01D2C 80AFFFDC AFA40018 */ sw $a0, 0x0018($sp) +/* 01D30 80AFFFE0 0C2BF8AC */ jal func_80AFE2B0 /* 01D34 80AFFFE4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01D38 80AFFFE8 8FA60018 */ lw $a2, 0x0018($sp) -/* 01D3C 80AFFFEC 0C029502 */ jal func_800A5408 +/* 01D38 80AFFFE8 8FA60018 */ lw $a2, 0x0018($sp) +/* 01D3C 80AFFFEC 0C029502 */ jal SkelAnime_AnimationReverse /* 01D40 80AFFFF0 24C4014C */ addiu $a0, $a2, 0x014C ## $a0 = 0000014C -/* 01D44 80AFFFF4 8FA40018 */ lw $a0, 0x0018($sp) +/* 01D44 80AFFFF4 8FA40018 */ lw $a0, 0x0018($sp) /* 01D48 80AFFFF8 24050011 */ addiu $a1, $zero, 0x0011 ## $a1 = 00000011 /* 01D4C 80AFFFFC C4880158 */ lwc1 $f8, 0x0158($a0) ## 00000158 -/* 01D50 80B00000 0C2BF8CE */ jal func_80AFE338 +/* 01D50 80B00000 0C2BF8CE */ jal func_80AFE338 /* 01D54 80B00004 E4880164 */ swc1 $f8, 0x0164($a0) ## 00000164 -/* 01D58 80B00008 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01D58 80B00008 8FBF0014 */ lw $ra, 0x0014($sp) /* 01D5C 80B0000C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D60 80B00010 03E00008 */ jr $ra +/* 01D60 80B00010 03E00008 */ jr $ra /* 01D64 80B00014 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s index b7d20e2cd1..a031b30d14 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s @@ -107,7 +107,7 @@ glabel EnTa_Init /* 00264 80B13D04 A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 00268 80B13D08 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0026C 80B13D0C 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 00270 80B13D10 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00270 80B13D10 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00274 80B13D14 8FA40038 */ lw $a0, 0x0038($sp) /* 00278 80B13D18 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 /* 0027C 80B13D1C 25CE1C94 */ addiu $t6, $t6, 0x1C94 ## $t6 = 06001C94 @@ -123,7 +123,7 @@ glabel EnTa_Init /* 002A0 80B13D40 A60F02B4 */ sh $t7, 0x02B4($s0) ## 000002B4 /* 002A4 80B13D44 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002A8 80B13D48 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 002AC 80B13D4C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 002AC 80B13D4C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 002B0 80B13D50 8FA40038 */ lw $a0, 0x0038($sp) /* 002B4 80B13D54 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 002B8 80B13D58 44813000 */ mtc1 $at, $f6 ## $f6 = 54.00 @@ -183,7 +183,7 @@ glabel EnTa_Init /* 0036C 80B13E0C A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 00370 80B13E10 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00374 80B13E14 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 00378 80B13E18 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00378 80B13E18 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 0037C 80B13E1C 8FA40038 */ lw $a0, 0x0038($sp) /* 00380 80B13E20 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 /* 00384 80B13E24 25AD1C94 */ addiu $t5, $t5, 0x1C94 ## $t5 = 06001C94 @@ -220,7 +220,7 @@ glabel EnTa_Init /* 003F0 80B13E90 A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 003F4 80B13E94 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003F8 80B13E98 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 003FC 80B13E9C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 003FC 80B13E9C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00400 80B13EA0 8FA40038 */ lw $a0, 0x0038($sp) /* 00404 80B13EA4 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 /* 00408 80B13EA8 27181C94 */ addiu $t8, $t8, 0x1C94 ## $t8 = 06001C94 @@ -236,7 +236,7 @@ glabel EnTa_Init /* 0042C 80B13ECC A61902B4 */ sh $t9, 0x02B4($s0) ## 000002B4 /* 00430 80B13ED0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00434 80B13ED4 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 00438 80B13ED8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00438 80B13ED8 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 0043C 80B13EDC 8FA40038 */ lw $a0, 0x0038($sp) /* 00440 80B13EE0 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 00444 80B13EE4 44814000 */ mtc1 $at, $f8 ## $f8 = 54.00 @@ -425,7 +425,7 @@ glabel EnTa_Init /* 006EC 80B1418C A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 006F0 80B14190 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006F4 80B14194 24A517E8 */ addiu $a1, $a1, 0x17E8 ## $a1 = 060017E8 -/* 006F8 80B14198 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 006F8 80B14198 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 006FC 80B1419C 8FA40038 */ lw $a0, 0x0038($sp) /* 00700 80B141A0 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 /* 00704 80B141A4 25EF17E8 */ addiu $t7, $t7, 0x17E8 ## $t7 = 060017E8 @@ -439,7 +439,7 @@ glabel EnTa_Init /* 00720 80B141C0 A61802B4 */ sh $t8, 0x02B4($s0) ## 000002B4 /* 00724 80B141C4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00728 80B141C8 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 0072C 80B141CC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 0072C 80B141CC 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00730 80B141D0 8FA40038 */ lw $a0, 0x0038($sp) /* 00734 80B141D4 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 00738 80B141D8 44812000 */ mtc1 $at, $f4 ## $f4 = 54.00 @@ -458,7 +458,7 @@ glabel EnTa_Init /* 00768 80B14208 A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 /* 0076C 80B1420C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00770 80B14210 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 00774 80B14214 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00774 80B14214 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00778 80B14218 8FA40038 */ lw $a0, 0x0038($sp) /* 0077C 80B1421C 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 00780 80B14220 44813000 */ mtc1 $at, $f6 ## $f6 = 54.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s index 4e660aeb39..399181a77b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s @@ -1,39 +1,39 @@ glabel func_80B14570 /* 00AD0 80B14570 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AD4 80B14574 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AD8 80B14578 AFA5001C */ sw $a1, 0x001C($sp) +/* 00AD4 80B14574 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00AD8 80B14578 AFA5001C */ sw $a1, 0x001C($sp) /* 00ADC 80B1457C 948E02E0 */ lhu $t6, 0x02E0($a0) ## 000002E0 /* 00AE0 80B14580 849802CC */ lh $t8, 0x02CC($a0) ## 000002CC /* 00AE4 80B14584 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00AE8 80B14588 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 00AEC 80B1458C 17000016 */ bne $t8, $zero, .L80B145E8 +/* 00AEC 80B1458C 17000016 */ bne $t8, $zero, .L80B145E8 /* 00AF0 80B14590 A48F02E0 */ sh $t7, 0x02E0($a0) ## 000002E0 /* 00AF4 80B14594 3C0580B1 */ lui $a1, %hi(func_80B144D8) ## $a1 = 80B10000 /* 00AF8 80B14598 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 /* 00AFC 80B1459C 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 /* 00B00 80B145A0 24A544D8 */ addiu $a1, $a1, %lo(func_80B144D8) ## $a1 = 80B144D8 -/* 00B04 80B145A4 0C2C4EA8 */ jal func_80B13AA0 -/* 00B08 80B145A8 AFA70018 */ sw $a3, 0x0018($sp) -/* 00B0C 80B145AC 8FA70018 */ lw $a3, 0x0018($sp) +/* 00B04 80B145A4 0C2C4EA8 */ jal func_80B13AA0 +/* 00B08 80B145A8 AFA70018 */ sw $a3, 0x0018($sp) +/* 00B0C 80B145AC 8FA70018 */ lw $a3, 0x0018($sp) /* 00B10 80B145B0 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 00B14 80B145B4 2408003C */ addiu $t0, $zero, 0x003C ## $t0 = 0000003C /* 00B18 80B145B8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00B1C 80B145BC 24A5E3D8 */ addiu $a1, $a1, 0xE3D8 ## $a1 = 0600E3D8 /* 00B20 80B145C0 A4F902CE */ sh $t9, 0x02CE($a3) ## 000002CE /* 00B24 80B145C4 A4E802CC */ sh $t0, 0x02CC($a3) ## 000002CC -/* 00B28 80B145C8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00B28 80B145C8 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00B2C 80B145CC 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 00B30 80B145D0 8FA40018 */ lw $a0, 0x0018($sp) +/* 00B30 80B145D0 8FA40018 */ lw $a0, 0x0018($sp) /* 00B34 80B145D4 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 /* 00B38 80B145D8 25291C94 */ addiu $t1, $t1, 0x1C94 ## $t1 = 06001C94 /* 00B3C 80B145DC 24056851 */ addiu $a1, $zero, 0x6851 ## $a1 = 00006851 /* 00B40 80B145E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00B44 80B145E4 AC8902E4 */ sw $t1, 0x02E4($a0) ## 000002E4 .L80B145E8: -/* 00B48 80B145E8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00B48 80B145E8 8FBF0014 */ lw $ra, 0x0014($sp) /* 00B4C 80B145EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B50 80B145F0 03E00008 */ jr $ra +/* 00B50 80B145F0 03E00008 */ jr $ra /* 00B54 80B145F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s index bc68413eb2..a5a0b12fb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s @@ -1,24 +1,24 @@ glabel func_80B14B6C /* 010CC 80B14B6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 010D0 80B14B70 AFB00020 */ sw $s0, 0x0020($sp) +/* 010D0 80B14B70 AFB00020 */ sw $s0, 0x0020($sp) /* 010D4 80B14B74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010D8 80B14B78 AFBF0024 */ sw $ra, 0x0024($sp) -/* 010DC 80B14B7C AFA5002C */ sw $a1, 0x002C($sp) -/* 010E0 80B14B80 0C042F6F */ jal func_8010BDBC +/* 010D8 80B14B78 AFBF0024 */ sw $ra, 0x0024($sp) +/* 010DC 80B14B7C AFA5002C */ sw $a1, 0x002C($sp) +/* 010E0 80B14B80 0C042F6F */ jal func_8010BDBC /* 010E4 80B14B84 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 /* 010E8 80B14B88 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 010EC 80B14B8C 1441001A */ bne $v0, $at, .L80B14BF8 -/* 010F0 80B14B90 8FA4002C */ lw $a0, 0x002C($sp) +/* 010EC 80B14B8C 1441001A */ bne $v0, $at, .L80B14BF8 +/* 010F0 80B14B90 8FA4002C */ lw $a0, 0x002C($sp) /* 010F4 80B14B94 2405104F */ addiu $a1, $zero, 0x104F ## $a1 = 0000104F /* 010F8 80B14B98 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D /* 010FC 80B14B9C 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 01100 80B14BA0 0C02003E */ jal func_800800F8 -/* 01104 80B14BA4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01100 80B14BA0 0C02003E */ jal func_800800F8 +/* 01104 80B14BA4 AFA00010 */ sw $zero, 0x0010($sp) /* 01108 80B14BA8 3C0580B1 */ lui $a1, %hi(func_80B14AF4) ## $a1 = 80B10000 /* 0110C 80B14BAC 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 /* 01110 80B14BB0 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 /* 01114 80B14BB4 24A54AF4 */ addiu $a1, $a1, %lo(func_80B14AF4) ## $a1 = 80B14AF4 -/* 01118 80B14BB8 0C2C4EA8 */ jal func_80B13AA0 +/* 01118 80B14BB8 0C2C4EA8 */ jal func_80B13AA0 /* 0111C 80B14BBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01120 80B14BC0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01124 80B14BC4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 @@ -29,7 +29,7 @@ glabel func_80B14B6C /* 01138 80B14BD8 24A5CF28 */ addiu $a1, $a1, 0xCF28 ## $a1 = 0600CF28 /* 0113C 80B14BDC 35F80010 */ ori $t8, $t7, 0x0010 ## $t8 = 00000010 /* 01140 80B14BE0 A4580ED6 */ sh $t8, 0x0ED6($v0) ## 8015F536 -/* 01144 80B14BE4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 01144 80B14BE4 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 01148 80B14BE8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0114C 80B14BEC 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 /* 01150 80B14BF0 2739C858 */ addiu $t9, $t9, 0xC858 ## $t9 = 0600C858 @@ -38,10 +38,10 @@ glabel func_80B14B6C /* 01158 80B14BF8 960802E0 */ lhu $t0, 0x02E0($s0) ## 000002E0 /* 0115C 80B14BFC 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 /* 01160 80B14C00 A60902E0 */ sh $t1, 0x02E0($s0) ## 000002E0 -/* 01164 80B14C04 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01168 80B14C08 8FB00020 */ lw $s0, 0x0020($sp) +/* 01164 80B14C04 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01168 80B14C08 8FB00020 */ lw $s0, 0x0020($sp) /* 0116C 80B14C0C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01170 80B14C10 03E00008 */ jr $ra +/* 01170 80B14C10 03E00008 */ jr $ra /* 01174 80B14C14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s index bf1047ce7d..f9f02ce6ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s @@ -1,20 +1,20 @@ glabel func_80B167C0 /* 02D20 80B167C0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02D24 80B167C4 AFA40020 */ sw $a0, 0x0020($sp) -/* 02D28 80B167C8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02D24 80B167C4 AFA40020 */ sw $a0, 0x0020($sp) +/* 02D28 80B167C8 AFBF0014 */ sw $ra, 0x0014($sp) /* 02D2C 80B167CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02D30 80B167D0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02D34 80B167D4 AFA4001C */ sw $a0, 0x001C($sp) -/* 02D38 80B167D8 10400004 */ beq $v0, $zero, .L80B167EC -/* 02D3C 80B167DC 8FA4001C */ lw $a0, 0x001C($sp) -/* 02D40 80B167E0 8FAE0020 */ lw $t6, 0x0020($sp) -/* 02D44 80B167E4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop + +/* 02D34 80B167D4 AFA4001C */ sw $a0, 0x001C($sp) +/* 02D38 80B167D8 10400004 */ beq $v0, $zero, .L80B167EC +/* 02D3C 80B167DC 8FA4001C */ lw $a0, 0x001C($sp) +/* 02D40 80B167E0 8FAE0020 */ lw $t6, 0x0020($sp) +/* 02D44 80B167E4 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02D48 80B167E8 8DC502E4 */ lw $a1, 0x02E4($t6) ## 000002E4 .L80B167EC: -/* 02D4C 80B167EC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02D4C 80B167EC 8FBF0014 */ lw $ra, 0x0014($sp) /* 02D50 80B167F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02D54 80B167F4 03E00008 */ jr $ra +/* 02D54 80B167F4 03E00008 */ jr $ra /* 02D58 80B167F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s index d8f5f4e6d4..7c9b919a66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s @@ -1,28 +1,28 @@ glabel func_80B167FC /* 02D5C 80B167FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02D60 80B16800 AFB00018 */ sw $s0, 0x0018($sp) +/* 02D60 80B16800 AFB00018 */ sw $s0, 0x0018($sp) /* 02D64 80B16804 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D68 80B16808 AFBF001C */ sw $ra, 0x001C($sp) +/* 02D68 80B16808 AFBF001C */ sw $ra, 0x001C($sp) /* 02D6C 80B1680C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02D70 80B16810 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02D74 80B16814 AFA40024 */ sw $a0, 0x0024($sp) -/* 02D78 80B16818 10400006 */ beq $v0, $zero, .L80B16834 -/* 02D7C 80B1681C 8FA40024 */ lw $a0, 0x0024($sp) -/* 02D80 80B16820 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop + +/* 02D74 80B16814 AFA40024 */ sw $a0, 0x0024($sp) +/* 02D78 80B16818 10400006 */ beq $v0, $zero, .L80B16834 +/* 02D7C 80B1681C 8FA40024 */ lw $a0, 0x0024($sp) +/* 02D80 80B16820 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02D84 80B16824 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 /* 02D88 80B16828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02D8C 80B1682C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02D90 80B16830 24056850 */ addiu $a1, $zero, 0x6850 ## $a1 = 00006850 .L80B16834: /* 02D94 80B16834 960E02E0 */ lhu $t6, 0x02E0($s0) ## 000002E0 /* 02D98 80B16838 35CF000C */ ori $t7, $t6, 0x000C ## $t7 = 0000000C /* 02D9C 80B1683C A60F02E0 */ sh $t7, 0x02E0($s0) ## 000002E0 -/* 02DA0 80B16840 8FBF001C */ lw $ra, 0x001C($sp) -/* 02DA4 80B16844 8FB00018 */ lw $s0, 0x0018($sp) +/* 02DA0 80B16840 8FBF001C */ lw $ra, 0x001C($sp) +/* 02DA4 80B16844 8FB00018 */ lw $s0, 0x0018($sp) /* 02DA8 80B16848 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02DAC 80B1684C 03E00008 */ jr $ra +/* 02DAC 80B1684C 03E00008 */ jr $ra /* 02DB0 80B16850 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s index f40ad123c8..86de124f04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s @@ -1,33 +1,33 @@ glabel func_80B16854 /* 02DB4 80B16854 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02DB8 80B16858 AFBF001C */ sw $ra, 0x001C($sp) -/* 02DBC 80B1685C AFB00018 */ sw $s0, 0x0018($sp) +/* 02DB8 80B16858 AFBF001C */ sw $ra, 0x001C($sp) +/* 02DBC 80B1685C AFB00018 */ sw $s0, 0x0018($sp) /* 02DC0 80B16860 848202E2 */ lh $v0, 0x02E2($a0) ## 000002E2 /* 02DC4 80B16864 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02DC8 80B16868 18400003 */ blez $v0, .L80B16878 +/* 02DC8 80B16868 18400003 */ blez $v0, .L80B16878 /* 02DCC 80B1686C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02DD0 80B16870 10000029 */ beq $zero, $zero, .L80B16918 +/* 02DD0 80B16870 10000029 */ beq $zero, $zero, .L80B16918 /* 02DD4 80B16874 A48E02E2 */ sh $t6, 0x02E2($a0) ## 000002E2 .L80B16878: /* 02DD8 80B16878 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02DDC 80B1687C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02DE0 80B16880 AFA40024 */ sw $a0, 0x0024($sp) -/* 02DE4 80B16884 1040000F */ beq $v0, $zero, .L80B168C4 -/* 02DE8 80B16888 8FA40024 */ lw $a0, 0x0024($sp) -/* 02DEC 80B1688C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop + +/* 02DE0 80B16880 AFA40024 */ sw $a0, 0x0024($sp) +/* 02DE4 80B16884 1040000F */ beq $v0, $zero, .L80B168C4 +/* 02DE8 80B16888 8FA40024 */ lw $a0, 0x0024($sp) +/* 02DEC 80B1688C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02DF0 80B16890 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 /* 02DF4 80B16894 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 02DF8 80B16898 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 02DFC 80B1689C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 02E00 80B168A0 00000000 */ nop /* 02E04 80B168A4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 02E08 80B168A8 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 02E0C 80B168AC 00000000 */ nop -/* 02E10 80B168B0 46040180 */ add.s $f6, $f0, $f4 -/* 02E14 80B168B4 4600320D */ trunc.w.s $f8, $f6 -/* 02E18 80B168B8 44184000 */ mfc1 $t8, $f8 +/* 02E10 80B168B0 46040180 */ add.s $f6, $f0, $f4 +/* 02E14 80B168B4 4600320D */ trunc.w.s $f8, $f6 +/* 02E18 80B168B8 44184000 */ mfc1 $t8, $f8 /* 02E1C 80B168BC 00000000 */ nop /* 02E20 80B168C0 A61802E2 */ sh $t8, 0x02E2($s0) ## 000002E2 .L80B168C4: @@ -36,17 +36,17 @@ glabel func_80B16854 /* 02E2C 80B168CC C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 /* 02E30 80B168D0 3C014254 */ lui $at, 0x4254 ## $at = 42540000 /* 02E34 80B168D4 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 02E38 80B168D8 460A003C */ c.lt.s $f0, $f10 +/* 02E38 80B168D8 460A003C */ c.lt.s $f0, $f10 /* 02E3C 80B168DC 00000000 */ nop -/* 02E40 80B168E0 4502000A */ bc1fl .L80B1690C +/* 02E40 80B168E0 4502000A */ bc1fl .L80B1690C /* 02E44 80B168E4 A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 /* 02E48 80B168E8 44818000 */ mtc1 $at, $f16 ## $f16 = 53.00 /* 02E4C 80B168EC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02E50 80B168F0 4600803E */ c.le.s $f16, $f0 +/* 02E50 80B168F0 4600803E */ c.le.s $f16, $f0 /* 02E54 80B168F4 00000000 */ nop -/* 02E58 80B168F8 45020004 */ bc1fl .L80B1690C +/* 02E58 80B168F8 45020004 */ bc1fl .L80B1690C /* 02E5C 80B168FC A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 -/* 02E60 80B16900 10000002 */ beq $zero, $zero, .L80B1690C +/* 02E60 80B16900 10000002 */ beq $zero, $zero, .L80B1690C /* 02E64 80B16904 A61902B4 */ sh $t9, 0x02B4($s0) ## 000002B4 /* 02E68 80B16908 A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 .L80B1690C: @@ -57,10 +57,10 @@ glabel func_80B16854 /* 02E78 80B16918 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 /* 02E7C 80B1691C 356C0004 */ ori $t4, $t3, 0x0004 ## $t4 = 00000004 /* 02E80 80B16920 A60C02E0 */ sh $t4, 0x02E0($s0) ## 000002E0 -/* 02E84 80B16924 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E88 80B16928 8FB00018 */ lw $s0, 0x0018($sp) +/* 02E84 80B16924 8FBF001C */ lw $ra, 0x001C($sp) +/* 02E88 80B16928 8FB00018 */ lw $s0, 0x0018($sp) /* 02E8C 80B1692C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02E90 80B16930 03E00008 */ jr $ra +/* 02E90 80B16930 03E00008 */ jr $ra /* 02E94 80B16934 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s index 7f2a377492..7502ce1eb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s @@ -1,14 +1,14 @@ glabel func_80861418 /* 01DC8 80861418 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01DCC 8086141C AFB00018 */ sw $s0, 0x0018($sp) +/* 01DCC 8086141C AFB00018 */ sw $s0, 0x0018($sp) /* 01DD0 80861420 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01DD4 80861424 AFBF001C */ sw $ra, 0x001C($sp) +/* 01DD4 80861424 AFBF001C */ sw $ra, 0x001C($sp) /* 01DD8 80861428 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01DDC 8086142C 24A5B00C */ addiu $a1, $a1, 0xB00C ## $a1 = 0600B00C -/* 01DE0 80861430 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 01DE0 80861430 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 01DE4 80861434 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01DE8 80861438 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 01DEC 8086143C 0C03E291 */ jal func_800F8A44 +/* 01DEC 8086143C 0C03E291 */ jal func_800F8A44 /* 01DF0 80861440 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 /* 01DF4 80861444 920E086C */ lbu $t6, 0x086C($s0) ## 0000086C /* 01DF8 80861448 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -19,19 +19,19 @@ glabel func_80861418 /* 01E0C 8086145C A21807C8 */ sb $t8, 0x07C8($s0) ## 000007C8 /* 01E10 80861460 24A5149C */ addiu $a1, $a1, %lo(func_8086149C) ## $a1 = 8086149C /* 01E14 80861464 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E18 80861468 0C217D94 */ jal func_8085F650 +/* 01E18 80861468 0C217D94 */ jal func_8085F650 /* 01E1C 8086146C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 01E20 80861470 920807DE */ lbu $t0, 0x07DE($s0) ## 000007DE /* 01E24 80861474 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 /* 01E28 80861478 A2190879 */ sb $t9, 0x0879($s0) ## 00000879 -/* 01E2C 8086147C 11000002 */ beq $t0, $zero, .L80861488 +/* 01E2C 8086147C 11000002 */ beq $t0, $zero, .L80861488 /* 01E30 80861480 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 01E34 80861484 A20907DE */ sb $t1, 0x07DE($s0) ## 000007DE .L80861488: -/* 01E38 80861488 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E3C 8086148C 8FB00018 */ lw $s0, 0x0018($sp) +/* 01E38 80861488 8FBF001C */ lw $ra, 0x001C($sp) +/* 01E3C 8086148C 8FB00018 */ lw $s0, 0x0018($sp) /* 01E40 80861490 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E44 80861494 03E00008 */ jr $ra +/* 01E44 80861494 03E00008 */ jr $ra /* 01E48 80861498 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s index 8db171c7b2..ce621cbd8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s @@ -1,23 +1,23 @@ glabel func_808615A4 /* 01F54 808615A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01F58 808615A8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01F58 808615A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 01F5C 808615AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 01F60 808615B0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01F64 808615B4 24A5B4E4 */ addiu $a1, $a1, 0xB4E4 ## $a1 = 0600B4E4 -/* 01F68 808615B8 AFA60018 */ sw $a2, 0x0018($sp) -/* 01F6C 808615BC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 01F68 808615B8 AFA60018 */ sw $a2, 0x0018($sp) +/* 01F6C 808615BC 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 01F70 808615C0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01F74 808615C4 8FA40018 */ lw $a0, 0x0018($sp) +/* 01F74 808615C4 8FA40018 */ lw $a0, 0x0018($sp) /* 01F78 808615C8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01F7C 808615CC 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 /* 01F80 808615D0 3C058086 */ lui $a1, %hi(func_808615F4) ## $a1 = 80860000 /* 01F84 808615D4 24A515F4 */ addiu $a1, $a1, %lo(func_808615F4) ## $a1 = 808615F4 /* 01F88 808615D8 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 01F8C 808615DC 0C217D94 */ jal func_8085F650 +/* 01F8C 808615DC 0C217D94 */ jal func_8085F650 /* 01F90 808615E0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01F94 808615E4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01F94 808615E4 8FBF0014 */ lw $ra, 0x0014($sp) /* 01F98 808615E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F9C 808615EC 03E00008 */ jr $ra +/* 01F9C 808615EC 03E00008 */ jr $ra /* 01FA0 808615F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s index 0b711d8807..f3cd54ead5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s @@ -1,13 +1,13 @@ glabel func_8086181C /* 021CC 8086181C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 021D0 80861820 AFBF0014 */ sw $ra, 0x0014($sp) +/* 021D0 80861820 AFBF0014 */ sw $ra, 0x0014($sp) /* 021D4 80861824 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 021D8 80861828 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 021DC 8086182C 24A5BE4C */ addiu $a1, $a1, 0xBE4C ## $a1 = 0600BE4C -/* 021E0 80861830 AFA60018 */ sw $a2, 0x0018($sp) -/* 021E4 80861834 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 021E0 80861830 AFA60018 */ sw $a2, 0x0018($sp) +/* 021E4 80861834 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 021E8 80861838 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 021EC 8086183C 8FA40018 */ lw $a0, 0x0018($sp) +/* 021EC 8086183C 8FA40018 */ lw $a0, 0x0018($sp) /* 021F0 80861840 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 021F4 80861844 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 /* 021F8 80861848 908E086C */ lbu $t6, 0x086C($a0) ## 0000086C @@ -18,18 +18,18 @@ glabel func_8086181C /* 0220C 8086185C A08F086C */ sb $t7, 0x086C($a0) ## 0000086C /* 02210 80861860 A09807C8 */ sb $t8, 0x07C8($a0) ## 000007C8 /* 02214 80861864 A0990879 */ sb $t9, 0x0879($a0) ## 00000879 -/* 02218 80861868 0C217D94 */ jal func_8085F650 +/* 02218 80861868 0C217D94 */ jal func_8085F650 /* 0221C 8086186C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 02220 80861870 8FA60018 */ lw $a2, 0x0018($sp) +/* 02220 80861870 8FA60018 */ lw $a2, 0x0018($sp) /* 02224 80861874 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 02228 80861878 90C807DE */ lbu $t0, 0x07DE($a2) ## 000007DE -/* 0222C 8086187C 51000003 */ beql $t0, $zero, .L8086188C -/* 02230 80861880 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0222C 8086187C 51000003 */ beql $t0, $zero, .L8086188C +/* 02230 80861880 8FBF0014 */ lw $ra, 0x0014($sp) /* 02234 80861884 A0C907DE */ sb $t1, 0x07DE($a2) ## 000007DE -/* 02238 80861888 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02238 80861888 8FBF0014 */ lw $ra, 0x0014($sp) .L8086188C: /* 0223C 8086188C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02240 80861890 03E00008 */ jr $ra +/* 02240 80861890 03E00008 */ jr $ra /* 02244 80861894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s index 0799adaceb..0d8a8b08a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s @@ -1,15 +1,15 @@ glabel func_8086194C /* 022FC 8086194C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02300 80861950 AFB00018 */ sw $s0, 0x0018($sp) +/* 02300 80861950 AFB00018 */ sw $s0, 0x0018($sp) /* 02304 80861954 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02308 80861958 AFBF001C */ sw $ra, 0x001C($sp) +/* 02308 80861958 AFBF001C */ sw $ra, 0x001C($sp) /* 0230C 8086195C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02310 80861960 24A51978 */ addiu $a1, $a1, 0x1978 ## $a1 = 06001978 -/* 02314 80861964 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02314 80861964 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02318 80861968 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 0231C 8086196C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02320 80861970 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02324 80861974 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C /* 02328 80861978 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 /* 0232C 8086197C 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 @@ -17,20 +17,20 @@ glabel func_8086194C /* 02334 80861984 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 /* 02338 80861988 AE0F07E8 */ sw $t7, 0x07E8($s0) ## 000007E8 /* 0233C 8086198C 24A519EC */ addiu $a1, $a1, %lo(func_808619EC) ## $a1 = 808619EC -/* 02340 80861990 0C217D94 */ jal func_8085F650 +/* 02340 80861990 0C217D94 */ jal func_8085F650 /* 02344 80861994 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02348 80861998 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE /* 0234C 8086199C 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 02350 808619A0 53000003 */ beql $t8, $zero, .L808619B0 +/* 02350 808619A0 53000003 */ beql $t8, $zero, .L808619B0 /* 02354 808619A4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 02358 808619A8 A21907DE */ sb $t9, 0x07DE($s0) ## 000007DE /* 0235C 808619AC 8608001C */ lh $t0, 0x001C($s0) ## 0000001C .L808619B0: /* 02360 808619B0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02364 808619B4 11010004 */ beq $t0, $at, .L808619C8 +/* 02364 808619B4 11010004 */ beq $t0, $at, .L808619C8 /* 02368 808619B8 3C01C130 */ lui $at, 0xC130 ## $at = C1300000 /* 0236C 808619BC 44812000 */ mtc1 $at, $f4 ## $f4 = -11.00 -/* 02370 808619C0 10000005 */ beq $zero, $zero, .L808619D8 +/* 02370 808619C0 10000005 */ beq $zero, $zero, .L808619D8 /* 02374 808619C4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L808619C8: /* 02378 808619C8 3C01C0E0 */ lui $at, 0xC0E0 ## $at = C0E00000 @@ -38,10 +38,10 @@ glabel func_8086194C /* 02380 808619D0 00000000 */ nop /* 02384 808619D4 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 .L808619D8: -/* 02388 808619D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0238C 808619DC 8FB00018 */ lw $s0, 0x0018($sp) +/* 02388 808619D8 8FBF001C */ lw $ra, 0x001C($sp) +/* 0238C 808619DC 8FB00018 */ lw $s0, 0x0018($sp) /* 02390 808619E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02394 808619E4 03E00008 */ jr $ra +/* 02394 808619E4 03E00008 */ jr $ra /* 02398 808619E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s index 9d09ef9e80..0fbd49c12e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s @@ -1,14 +1,14 @@ glabel func_80861B94 /* 02544 80861B94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02548 80861B98 AFB00018 */ sw $s0, 0x0018($sp) +/* 02548 80861B98 AFB00018 */ sw $s0, 0x0018($sp) /* 0254C 80861B9C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02550 80861BA0 AFBF001C */ sw $ra, 0x001C($sp) +/* 02550 80861BA0 AFBF001C */ sw $ra, 0x001C($sp) /* 02554 80861BA4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02558 80861BA8 24A5A324 */ addiu $a1, $a1, 0xA324 ## $a1 = 0600A324 -/* 0255C 80861BAC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 0255C 80861BAC 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02560 80861BB0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02564 80861BB4 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 02568 80861BB8 0C03E291 */ jal func_800F8A44 +/* 02568 80861BB8 0C03E291 */ jal func_800F8A44 /* 0256C 80861BBC 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 /* 02570 80861BC0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02574 80861BC4 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -21,7 +21,7 @@ glabel func_80861B94 /* 02590 80861BE0 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C /* 02594 80861BE4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 02598 80861BE8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0259C 80861BEC E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 025A0 80861BF0 9218086C */ lbu $t8, 0x086C($s0) ## 0000086C /* 025A4 80861BF4 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 @@ -30,19 +30,19 @@ glabel func_80861B94 /* 025B0 80861C00 A219086C */ sb $t9, 0x086C($s0) ## 0000086C /* 025B4 80861C04 24A51C40 */ addiu $a1, $a1, %lo(func_80861C40) ## $a1 = 80861C40 /* 025B8 80861C08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025BC 80861C0C 0C217D94 */ jal func_8085F650 +/* 025BC 80861C0C 0C217D94 */ jal func_8085F650 /* 025C0 80861C10 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 025C4 80861C14 920907DE */ lbu $t1, 0x07DE($s0) ## 000007DE /* 025C8 80861C18 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 /* 025CC 80861C1C A2080879 */ sb $t0, 0x0879($s0) ## 00000879 -/* 025D0 80861C20 11200002 */ beq $t1, $zero, .L80861C2C +/* 025D0 80861C20 11200002 */ beq $t1, $zero, .L80861C2C /* 025D4 80861C24 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 025D8 80861C28 A20A07DE */ sb $t2, 0x07DE($s0) ## 000007DE .L80861C2C: -/* 025DC 80861C2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 025E0 80861C30 8FB00018 */ lw $s0, 0x0018($sp) +/* 025DC 80861C2C 8FBF001C */ lw $ra, 0x001C($sp) +/* 025E0 80861C30 8FB00018 */ lw $s0, 0x0018($sp) /* 025E4 80861C34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 025E8 80861C38 03E00008 */ jr $ra +/* 025E8 80861C38 03E00008 */ jr $ra /* 025EC 80861C3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s index 2050501ff8..73736e9345 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s @@ -1,69 +1,69 @@ glabel func_80861C40 /* 025F0 80861C40 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 025F4 80861C44 AFB00018 */ sw $s0, 0x0018($sp) +/* 025F4 80861C44 AFB00018 */ sw $s0, 0x0018($sp) /* 025F8 80861C48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 025FC 80861C4C AFBF001C */ sw $ra, 0x001C($sp) +/* 025FC 80861C4C AFBF001C */ sw $ra, 0x001C($sp) /* 02600 80861C50 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02604 80861C54 AFA5002C */ sw $a1, 0x002C($sp) +/* 02604 80861C54 AFA5002C */ sw $a1, 0x002C($sp) /* 02608 80861C58 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0260C 80861C5C AFA40024 */ sw $a0, 0x0024($sp) -/* 02610 80861C60 10400016 */ beq $v0, $zero, .L80861CBC -/* 02614 80861C64 8FA40024 */ lw $a0, 0x0024($sp) + +/* 0260C 80861C5C AFA40024 */ sw $a0, 0x0024($sp) +/* 02610 80861C60 10400016 */ beq $v0, $zero, .L80861CBC +/* 02614 80861C64 8FA40024 */ lw $a0, 0x0024($sp) /* 02618 80861C68 8E0E07E8 */ lw $t6, 0x07E8($s0) ## 000007E8 /* 0261C 80861C6C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02620 80861C70 55C0000F */ bnel $t6, $zero, .L80861CB0 +/* 02620 80861C70 55C0000F */ bnel $t6, $zero, .L80861CB0 /* 02624 80861C74 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02628 80861C78 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02628 80861C78 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 0262C 80861C7C 24A5A99C */ addiu $a1, $a1, 0xA99C ## $a1 = 0600A99C /* 02630 80861C80 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 02634 80861C84 AE0207E8 */ sw $v0, 0x07E8($s0) ## 000007E8 /* 02638 80861C88 A2020808 */ sb $v0, 0x0808($s0) ## 00000808 /* 0263C 80861C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02640 80861C90 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02644 80861C94 24053839 */ addiu $a1, $zero, 0x3839 ## $a1 = 00003839 /* 02648 80861C98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0264C 80861C9C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02650 80861CA0 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C -/* 02654 80861CA4 10000006 */ beq $zero, $zero, .L80861CC0 +/* 02654 80861CA4 10000006 */ beq $zero, $zero, .L80861CC0 /* 02658 80861CA8 8E0F07E8 */ lw $t7, 0x07E8($s0) ## 000007E8 /* 0265C 80861CAC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80861CB0: /* 02660 80861CB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02664 80861CB4 0C21801A */ jal func_80860068 +/* 02664 80861CB4 0C21801A */ jal func_80860068 /* 02668 80861CB8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L80861CBC: /* 0266C 80861CBC 8E0F07E8 */ lw $t7, 0x07E8($s0) ## 000007E8 .L80861CC0: /* 02670 80861CC0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02674 80861CC4 51E0000A */ beql $t7, $zero, .L80861CF0 +/* 02674 80861CC4 51E0000A */ beql $t7, $zero, .L80861CF0 /* 02678 80861CC8 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 /* 0267C 80861CCC C60601A0 */ lwc1 $f6, 0x01A0($s0) ## 000001A0 /* 02680 80861CD0 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 02684 80861CD4 00000000 */ nop -/* 02688 80861CD8 4606403E */ c.le.s $f8, $f6 +/* 02688 80861CD8 4606403E */ c.le.s $f8, $f6 /* 0268C 80861CDC 00000000 */ nop -/* 02690 80861CE0 45020003 */ bc1fl .L80861CF0 +/* 02690 80861CE0 45020003 */ bc1fl .L80861CF0 /* 02694 80861CE4 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 /* 02698 80861CE8 A2000808 */ sb $zero, 0x0808($s0) ## 00000808 /* 0269C 80861CEC C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 .L80861CF0: /* 026A0 80861CF0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 026A4 80861CF4 4600503E */ c.le.s $f10, $f0 +/* 026A4 80861CF4 4600503E */ c.le.s $f10, $f0 /* 026A8 80861CF8 00000000 */ nop -/* 026AC 80861CFC 45020010 */ bc1fl .L80861D40 -/* 026B0 80861D00 8FBF001C */ lw $ra, 0x001C($sp) +/* 026AC 80861CFC 45020010 */ bc1fl .L80861D40 +/* 026B0 80861D00 8FBF001C */ lw $ra, 0x001C($sp) /* 026B4 80861D04 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 026B8 80861D08 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 /* 026BC 80861D0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026C0 80861D10 46101032 */ c.eq.s $f2, $f16 +/* 026C0 80861D10 46101032 */ c.eq.s $f2, $f16 /* 026C4 80861D14 00000000 */ nop -/* 026C8 80861D18 45030006 */ bc1tl .L80861D34 +/* 026C8 80861D18 45030006 */ bc1tl .L80861D34 /* 026CC 80861D1C E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 /* 026D0 80861D20 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 026D4 80861D24 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B /* 026D8 80861D28 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 026DC 80861D2C C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 @@ -71,11 +71,11 @@ glabel func_80861C40 .L80861D34: /* 026E4 80861D34 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 /* 026E8 80861D38 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 026EC 80861D3C 8FBF001C */ lw $ra, 0x001C($sp) +/* 026EC 80861D3C 8FBF001C */ lw $ra, 0x001C($sp) .L80861D40: -/* 026F0 80861D40 8FB00018 */ lw $s0, 0x0018($sp) +/* 026F0 80861D40 8FB00018 */ lw $s0, 0x0018($sp) /* 026F4 80861D44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 026F8 80861D48 03E00008 */ jr $ra +/* 026F8 80861D48 03E00008 */ jr $ra /* 026FC 80861D4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s index 6a8f6a6b0f..a09d66b334 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s @@ -1,13 +1,13 @@ glabel func_80861D50 /* 02700 80861D50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02704 80861D54 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02704 80861D54 AFBF0014 */ sw $ra, 0x0014($sp) /* 02708 80861D58 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0270C 80861D5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02710 80861D60 24A5A324 */ addiu $a1, $a1, 0xA324 ## $a1 = 0600A324 -/* 02714 80861D64 AFA60018 */ sw $a2, 0x0018($sp) -/* 02718 80861D68 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02714 80861D64 AFA60018 */ sw $a2, 0x0018($sp) +/* 02718 80861D68 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 0271C 80861D6C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02720 80861D70 8FA40018 */ lw $a0, 0x0018($sp) +/* 02720 80861D70 8FA40018 */ lw $a0, 0x0018($sp) /* 02724 80861D74 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02728 80861D78 44812000 */ mtc1 $at, $f4 ## $f4 = 14.00 /* 0272C 80861D7C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -18,17 +18,17 @@ glabel func_80861D50 /* 02740 80861D90 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 /* 02744 80861D94 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 /* 02748 80861D98 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0274C 80861D9C E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -/* 02750 80861DA0 8FA40018 */ lw $a0, 0x0018($sp) +/* 02750 80861DA0 8FA40018 */ lw $a0, 0x0018($sp) /* 02754 80861DA4 3C058086 */ lui $a1, %hi(func_80861DC8) ## $a1 = 80860000 /* 02758 80861DA8 24A51DC8 */ addiu $a1, $a1, %lo(func_80861DC8) ## $a1 = 80861DC8 /* 0275C 80861DAC 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 02760 80861DB0 0C217D94 */ jal func_8085F650 +/* 02760 80861DB0 0C217D94 */ jal func_8085F650 /* 02764 80861DB4 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 02768 80861DB8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02768 80861DB8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0276C 80861DBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02770 80861DC0 03E00008 */ jr $ra +/* 02770 80861DC0 03E00008 */ jr $ra /* 02774 80861DC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s index d453e12f6c..1ea9474e22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s @@ -1,15 +1,15 @@ glabel func_80862154 /* 02B04 80862154 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02B08 80862158 AFB00020 */ sw $s0, 0x0020($sp) +/* 02B08 80862158 AFB00020 */ sw $s0, 0x0020($sp) /* 02B0C 8086215C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02B10 80862160 AFBF0024 */ sw $ra, 0x0024($sp) +/* 02B10 80862160 AFBF0024 */ sw $ra, 0x0024($sp) /* 02B14 80862164 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02B18 80862168 24A58604 */ addiu $a1, $a1, 0x8604 ## $a1 = 06008604 -/* 02B1C 8086216C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02B1C 8086216C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02B20 80862170 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02B24 80862174 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02B28 80862178 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02B2C 8086217C 2405383A */ addiu $a1, $zero, 0x383A ## $a1 = 0000383A /* 02B30 80862180 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 02B34 80862184 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 @@ -17,20 +17,20 @@ glabel func_80862154 /* 02B3C 8086218C A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 /* 02B40 80862190 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 02B44 80862194 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 02B48 80862198 AFAF0010 */ sw $t7, 0x0010($sp) +/* 02B48 80862198 AFAF0010 */ sw $t7, 0x0010($sp) /* 02B4C 8086219C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02B50 808621A0 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 02B54 808621A4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02B58 808621A8 0C00D09B */ jal func_8003426C +/* 02B58 808621A8 0C00D09B */ jal func_8003426C /* 02B5C 808621AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02B60 808621B0 3C058086 */ lui $a1, %hi(func_808621D4) ## $a1 = 80860000 /* 02B64 808621B4 24A521D4 */ addiu $a1, $a1, %lo(func_808621D4) ## $a1 = 808621D4 -/* 02B68 808621B8 0C217D94 */ jal func_8085F650 +/* 02B68 808621B8 0C217D94 */ jal func_8085F650 /* 02B6C 808621BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B70 808621C0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02B74 808621C4 8FB00020 */ lw $s0, 0x0020($sp) +/* 02B70 808621C0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02B74 808621C4 8FB00020 */ lw $s0, 0x0020($sp) /* 02B78 808621C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02B7C 808621CC 03E00008 */ jr $ra +/* 02B7C 808621CC 03E00008 */ jr $ra /* 02B80 808621D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s index 7dd014689a..9ef4b6374d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s @@ -1,15 +1,15 @@ glabel func_80862398 /* 02D48 80862398 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02D4C 8086239C AFB00020 */ sw $s0, 0x0020($sp) +/* 02D4C 8086239C AFB00020 */ sw $s0, 0x0020($sp) /* 02D50 808623A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D54 808623A4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 02D54 808623A4 AFBF0024 */ sw $ra, 0x0024($sp) /* 02D58 808623A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02D5C 808623AC 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 02D60 808623B0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 02D60 808623B0 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 02D64 808623B4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02D68 808623B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02D6C 808623BC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02D70 808623C0 2405383A */ addiu $a1, $zero, 0x383A ## $a1 = 0000383A /* 02D74 808623C4 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 02D78 808623C8 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 @@ -17,20 +17,20 @@ glabel func_80862398 /* 02D80 808623D0 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 /* 02D84 808623D4 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 02D88 808623D8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 02D8C 808623DC AFAF0010 */ sw $t7, 0x0010($sp) +/* 02D8C 808623DC AFAF0010 */ sw $t7, 0x0010($sp) /* 02D90 808623E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02D94 808623E4 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 02D98 808623E8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02D9C 808623EC 0C00D09B */ jal func_8003426C +/* 02D9C 808623EC 0C00D09B */ jal func_8003426C /* 02DA0 808623F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02DA4 808623F4 3C058086 */ lui $a1, %hi(func_80862418) ## $a1 = 80860000 /* 02DA8 808623F8 24A52418 */ addiu $a1, $a1, %lo(func_80862418) ## $a1 = 80862418 -/* 02DAC 808623FC 0C217D94 */ jal func_8085F650 +/* 02DAC 808623FC 0C217D94 */ jal func_8085F650 /* 02DB0 80862400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02DB4 80862404 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02DB8 80862408 8FB00020 */ lw $s0, 0x0020($sp) +/* 02DB4 80862404 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02DB8 80862408 8FB00020 */ lw $s0, 0x0020($sp) /* 02DBC 8086240C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02DC0 80862410 03E00008 */ jr $ra +/* 02DC0 80862410 03E00008 */ jr $ra /* 02DC4 80862414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s index 3a395c9f79..61729cf9b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s @@ -1,45 +1,45 @@ glabel func_80862FA8 /* 03958 80862FA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0395C 80862FAC AFA5001C */ sw $a1, 0x001C($sp) -/* 03960 80862FB0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0395C 80862FAC AFA5001C */ sw $a1, 0x001C($sp) +/* 03960 80862FB0 AFBF0014 */ sw $ra, 0x0014($sp) /* 03964 80862FB4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 03968 80862FB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0396C 80862FBC 24A51420 */ addiu $a1, $a1, 0x1420 ## $a1 = 06001420 -/* 03970 80862FC0 AFA60018 */ sw $a2, 0x0018($sp) -/* 03974 80862FC4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 03970 80862FC0 AFA60018 */ sw $a2, 0x0018($sp) +/* 03974 80862FC4 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 03978 80862FC8 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 0397C 80862FCC 8FA40018 */ lw $a0, 0x0018($sp) +/* 0397C 80862FCC 8FA40018 */ lw $a0, 0x0018($sp) /* 03980 80862FD0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03984 80862FD4 2405383B */ addiu $a1, $zero, 0x383B ## $a1 = 0000383B -/* 03988 80862FD8 8FA60018 */ lw $a2, 0x0018($sp) +/* 03988 80862FD8 8FA60018 */ lw $a2, 0x0018($sp) /* 0398C 80862FDC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 03990 80862FE0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 03994 80862FE4 8CCE0004 */ lw $t6, 0x0004($a2) ## 00000004 /* 03998 80862FE8 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C /* 0399C 80862FEC A0C007DE */ sb $zero, 0x07DE($a2) ## 000007DE -/* 039A0 80862FF0 01C17824 */ and $t7, $t6, $at -/* 039A4 80862FF4 2B010004 */ slti $at, $t8, 0x0004 +/* 039A0 80862FF0 01C17824 */ and $t7, $t6, $at +/* 039A4 80862FF4 2B010004 */ slti $at, $t8, 0x0004 /* 039A8 80862FF8 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 /* 039AC 80862FFC A0C00114 */ sb $zero, 0x0114($a2) ## 00000114 -/* 039B0 80863000 10200009 */ beq $at, $zero, .L80863028 +/* 039B0 80863000 10200009 */ beq $at, $zero, .L80863028 /* 039B4 80863004 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 039B8 80863008 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 039BC 8086300C 3C058086 */ lui $a1, %hi(func_80863044) ## $a1 = 80860000 /* 039C0 80863010 A0D907C8 */ sb $t9, 0x07C8($a2) ## 000007C8 /* 039C4 80863014 24A53044 */ addiu $a1, $a1, %lo(func_80863044) ## $a1 = 80863044 -/* 039C8 80863018 0C217D94 */ jal func_8085F650 +/* 039C8 80863018 0C217D94 */ jal func_8085F650 /* 039CC 8086301C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 039D0 80863020 10000005 */ beq $zero, $zero, .L80863038 -/* 039D4 80863024 8FBF0014 */ lw $ra, 0x0014($sp) +/* 039D0 80863020 10000005 */ beq $zero, $zero, .L80863038 +/* 039D4 80863024 8FBF0014 */ lw $ra, 0x0014($sp) .L80863028: /* 039D8 80863028 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 039DC 8086302C 0C218B6F */ jal func_80862DBC -/* 039E0 80863030 8FA5001C */ lw $a1, 0x001C($sp) -/* 039E4 80863034 8FBF0014 */ lw $ra, 0x0014($sp) +/* 039DC 8086302C 0C218B6F */ jal func_80862DBC +/* 039E0 80863030 8FA5001C */ lw $a1, 0x001C($sp) +/* 039E4 80863034 8FBF0014 */ lw $ra, 0x0014($sp) .L80863038: /* 039E8 80863038 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 039EC 8086303C 03E00008 */ jr $ra +/* 039EC 8086303C 03E00008 */ jr $ra /* 039F0 80863040 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s index 598493a8d4..6f5dbb3af3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s @@ -1,45 +1,45 @@ glabel func_808630F0 /* 03AA0 808630F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03AA4 808630F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03AA8 808630F8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03AA4 808630F4 AFA5001C */ sw $a1, 0x001C($sp) +/* 03AA8 808630F8 AFBF0014 */ sw $ra, 0x0014($sp) /* 03AAC 808630FC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 03AB0 80863100 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03AB4 80863104 24A59A90 */ addiu $a1, $a1, 0x9A90 ## $a1 = 06009A90 -/* 03AB8 80863108 AFA60018 */ sw $a2, 0x0018($sp) -/* 03ABC 8086310C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 03AB8 80863108 AFA60018 */ sw $a2, 0x0018($sp) +/* 03ABC 8086310C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 03AC0 80863110 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 03AC4 80863114 8FA40018 */ lw $a0, 0x0018($sp) +/* 03AC4 80863114 8FA40018 */ lw $a0, 0x0018($sp) /* 03AC8 80863118 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03ACC 8086311C 2405383B */ addiu $a1, $zero, 0x383B ## $a1 = 0000383B -/* 03AD0 80863120 8FA60018 */ lw $a2, 0x0018($sp) +/* 03AD0 80863120 8FA60018 */ lw $a2, 0x0018($sp) /* 03AD4 80863124 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 03AD8 80863128 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 03ADC 8086312C 84CF001C */ lh $t7, 0x001C($a2) ## 0000001C /* 03AE0 80863130 A0CE07C8 */ sb $t6, 0x07C8($a2) ## 000007C8 /* 03AE4 80863134 A0C00114 */ sb $zero, 0x0114($a2) ## 00000114 -/* 03AE8 80863138 29E10004 */ slti $at, $t7, 0x0004 +/* 03AE8 80863138 29E10004 */ slti $at, $t7, 0x0004 /* 03AEC 8086313C A0C007DE */ sb $zero, 0x07DE($a2) ## 000007DE -/* 03AF0 80863140 1020000B */ beq $at, $zero, .L80863170 +/* 03AF0 80863140 1020000B */ beq $at, $zero, .L80863170 /* 03AF4 80863144 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 03AF8 80863148 8CD80004 */ lw $t8, 0x0004($a2) ## 00000004 /* 03AFC 8086314C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 03B00 80863150 3C058086 */ lui $a1, %hi(func_8086318C) ## $a1 = 80860000 -/* 03B04 80863154 0301C824 */ and $t9, $t8, $at +/* 03B04 80863154 0301C824 */ and $t9, $t8, $at /* 03B08 80863158 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 /* 03B0C 8086315C 24A5318C */ addiu $a1, $a1, %lo(func_8086318C) ## $a1 = 8086318C -/* 03B10 80863160 0C217D94 */ jal func_8085F650 +/* 03B10 80863160 0C217D94 */ jal func_8085F650 /* 03B14 80863164 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03B18 80863168 10000005 */ beq $zero, $zero, .L80863180 -/* 03B1C 8086316C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03B18 80863168 10000005 */ beq $zero, $zero, .L80863180 +/* 03B1C 8086316C 8FBF0014 */ lw $ra, 0x0014($sp) .L80863170: /* 03B20 80863170 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03B24 80863174 0C218B6F */ jal func_80862DBC -/* 03B28 80863178 8FA5001C */ lw $a1, 0x001C($sp) -/* 03B2C 8086317C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03B24 80863174 0C218B6F */ jal func_80862DBC +/* 03B28 80863178 8FA5001C */ lw $a1, 0x001C($sp) +/* 03B2C 8086317C 8FBF0014 */ lw $ra, 0x0014($sp) .L80863180: /* 03B30 80863180 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03B34 80863184 03E00008 */ jr $ra +/* 03B34 80863184 03E00008 */ jr $ra /* 03B38 80863188 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s index 995571090c..53ab7dcf13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s @@ -1,21 +1,21 @@ glabel func_80B18E08 /* 00388 80B18E08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0038C 80B18E0C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0038C 80B18E0C AFBF0014 */ sw $ra, 0x0014($sp) /* 00390 80B18E10 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00394 80B18E14 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00398 80B18E18 24A5083C */ addiu $a1, $a1, 0x083C ## $a1 = 0600083C -/* 0039C 80B18E1C AFA60018 */ sw $a2, 0x0018($sp) -/* 003A0 80B18E20 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 0039C 80B18E1C AFA60018 */ sw $a2, 0x0018($sp) +/* 003A0 80B18E20 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 003A4 80B18E24 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003A8 80B18E28 8FA60018 */ lw $a2, 0x0018($sp) +/* 003A8 80B18E28 8FA60018 */ lw $a2, 0x0018($sp) /* 003AC 80B18E2C 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 /* 003B0 80B18E30 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 003B4 80B18E34 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 003B8 80B18E38 A0CE02BC */ sb $t6, 0x02BC($a2) ## 000002BC /* 003BC 80B18E3C 0C01DF64 */ jal Math_Rand_S16Offset - + /* 003C0 80B18E40 A4C002E0 */ sh $zero, 0x02E0($a2) ## 000002E0 -/* 003C4 80B18E44 8FA40018 */ lw $a0, 0x0018($sp) +/* 003C4 80B18E44 8FA40018 */ lw $a0, 0x0018($sp) /* 003C8 80B18E48 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 003CC 80B18E4C 3C0580B2 */ lui $a1, %hi(func_80B18E7C) ## $a1 = 80B20000 /* 003D0 80B18E50 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 @@ -23,11 +23,11 @@ glabel func_80B18E08 /* 003D8 80B18E58 A08202E2 */ sb $v0, 0x02E2($a0) ## 000002E2 /* 003DC 80B18E5C E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 003E0 80B18E60 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 003E4 80B18E64 0C2C62A0 */ jal func_80B18A80 +/* 003E4 80B18E64 0C2C62A0 */ jal func_80B18A80 /* 003E8 80B18E68 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 003EC 80B18E6C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003EC 80B18E6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 003F0 80B18E70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003F4 80B18E74 03E00008 */ jr $ra +/* 003F4 80B18E74 03E00008 */ jr $ra /* 003F8 80B18E78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s index 404ea2b307..a3f508c660 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s @@ -198,7 +198,7 @@ glabel func_80B18E7C /* 006B0 80B19130 13230004 */ beq $t9, $v1, .L80B19144 /* 006B4 80B19134 3C0580B2 */ lui $a1, %hi(D_80B1B634) ## $a1 = 80B20000 /* 006B8 80B19138 00A82821 */ addu $a1, $a1, $t0 -/* 006BC 80B1913C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 006BC 80B1913C 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 006C0 80B19140 8CA5B634 */ lw $a1, %lo(D_80B1B634)($a1) .L80B19144: /* 006C4 80B19144 860202E0 */ lh $v0, 0x02E0($s0) ## 000002E0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s index 50538e25f3..aed80cdfe9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s @@ -47,7 +47,7 @@ glabel EnTr_Init /* 000B0 80B22DA0 24C61688 */ addiu $a2, $a2, 0x1688 ## $a2 = 06011688 /* 000B4 80B22DA4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 000B8 80B22DA8 24A53FC8 */ addiu $a1, $a1, 0x3FC8 ## $a1 = 06003FC8 -/* 000BC 80B22DAC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 000BC 80B22DAC 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 000C0 80B22DB0 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 000C4 80B22DB4 3C0580B2 */ lui $a1, %hi(func_80B23A88) ## $a1 = 80B20000 /* 000C8 80B22DB8 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 @@ -73,7 +73,7 @@ glabel EnTr_Init /* 00114 80B22E04 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C /* 00118 80B22E08 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0011C 80B22E0C 24A51CDC */ addiu $a1, $a1, 0x1CDC ## $a1 = 06001CDC -/* 00120 80B22E10 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00120 80B22E10 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00124 80B22E14 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00128 80B22E18 3C0580B2 */ lui $a1, %hi(func_80B23A88) ## $a1 = 80B20000 /* 0012C 80B22E1C AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s index dd9c293201..1dea2efde4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s @@ -1,18 +1,18 @@ glabel func_80B26BBC /* 0050C 80B26BBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00510 80B26BC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00514 80B26BC4 AFA40018 */ sw $a0, 0x0018($sp) +/* 00510 80B26BC0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00514 80B26BC4 AFA40018 */ sw $a0, 0x0018($sp) /* 00518 80B26BC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0051C 80B26BCC 24A50B34 */ addiu $a1, $a1, 0x0B34 ## $a1 = 06000B34 -/* 00520 80B26BD0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 00520 80B26BD0 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 00524 80B26BD4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00528 80B26BD8 8FAF0018 */ lw $t7, 0x0018($sp) +/* 00528 80B26BD8 8FAF0018 */ lw $t7, 0x0018($sp) /* 0052C 80B26BDC 3C0E80B2 */ lui $t6, %hi(func_80B2742C) ## $t6 = 80B20000 /* 00530 80B26BE0 25CE742C */ addiu $t6, $t6, %lo(func_80B2742C) ## $t6 = 80B2742C /* 00534 80B26BE4 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 00538 80B26BE8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00538 80B26BE8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0053C 80B26BEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00540 80B26BF0 03E00008 */ jr $ra +/* 00540 80B26BF0 03E00008 */ jr $ra /* 00544 80B26BF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s index 25f22961c3..653a01473a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s @@ -1,13 +1,13 @@ glabel func_80B35540 /* 01890 80B35540 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01894 80B35544 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01894 80B35544 AFBF0014 */ sw $ra, 0x0014($sp) /* 01898 80B35548 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0189C 80B3554C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 018A0 80B35550 24A54638 */ addiu $a1, $a1, 0x4638 ## $a1 = 06004638 -/* 018A4 80B35554 AFA60018 */ sw $a2, 0x0018($sp) -/* 018A8 80B35558 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 018A4 80B35554 AFA60018 */ sw $a2, 0x0018($sp) +/* 018A8 80B35558 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 018AC 80B3555C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 018B0 80B35560 8FA40018 */ lw $a0, 0x0018($sp) +/* 018B0 80B35560 8FA40018 */ lw $a0, 0x0018($sp) /* 018B4 80B35564 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 018B8 80B35568 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 018BC 80B3556C 908E0314 */ lbu $t6, 0x0314($a0) ## 00000314 @@ -24,11 +24,11 @@ glabel func_80B35540 /* 018E8 80B35598 AC8802E8 */ sw $t0, 0x02E8($a0) ## 000002E8 /* 018EC 80B3559C E4840198 */ swc1 $f4, 0x0198($a0) ## 00000198 /* 018F0 80B355A0 A49800B6 */ sh $t8, 0x00B6($a0) ## 000000B6 -/* 018F4 80B355A4 0C2CCF2C */ jal func_80B33CB0 +/* 018F4 80B355A4 0C2CCF2C */ jal func_80B33CB0 /* 018F8 80B355A8 E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -/* 018FC 80B355AC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 018FC 80B355AC 8FBF0014 */ lw $ra, 0x0014($sp) /* 01900 80B355B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01904 80B355B4 03E00008 */ jr $ra +/* 01904 80B355B4 03E00008 */ jr $ra /* 01908 80B355B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s index 0cbd6866a0..2243cf12bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s @@ -1,35 +1,35 @@ glabel func_80B4779C /* 0374C 80B4779C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03750 80B477A0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03754 80B477A4 AFA5002C */ sw $a1, 0x002C($sp) -/* 03758 80B477A8 AFBF001C */ sw $ra, 0x001C($sp) +/* 03750 80B477A0 AFB00018 */ sw $s0, 0x0018($sp) +/* 03754 80B477A4 AFA5002C */ sw $a1, 0x002C($sp) +/* 03758 80B477A8 AFBF001C */ sw $ra, 0x001C($sp) /* 0375C 80B477AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03760 80B477B0 AC8003E4 */ sw $zero, 0x03E4($a0) ## 000003E4 /* 03764 80B477B4 3C0580B5 */ lui $a1, %hi(D_80B4A280) ## $a1 = 80B50000 -/* 03768 80B477B8 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) -/* 0376C 80B477BC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 03768 80B477B8 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) +/* 0376C 80B477BC 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 03770 80B477C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03774 80B477C4 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 /* 03778 80B477C8 AE0E03DC */ sw $t6, 0x03DC($s0) ## 000003DC /* 0377C 80B477CC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 03780 80B477D0 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 03784 80B477D4 0C2D11AA */ jal func_80B446A8 -/* 03788 80B477D8 AFA40024 */ sw $a0, 0x0024($sp) -/* 0378C 80B477DC 8FA40024 */ lw $a0, 0x0024($sp) +/* 03784 80B477D4 0C2D11AA */ jal func_80B446A8 +/* 03788 80B477D8 AFA40024 */ sw $a0, 0x0024($sp) +/* 0378C 80B477DC 8FA40024 */ lw $a0, 0x0024($sp) /* 03790 80B477E0 A60203FE */ sh $v0, 0x03FE($s0) ## 000003FE -/* 03794 80B477E4 8FA7002C */ lw $a3, 0x002C($sp) +/* 03794 80B477E4 8FA7002C */ lw $a3, 0x002C($sp) /* 03798 80B477E8 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 0379C 80B477EC 0C2D121C */ jal func_80B44870 +/* 0379C 80B477EC 0C2D121C */ jal func_80B44870 /* 037A0 80B477F0 86060400 */ lh $a2, 0x0400($s0) ## 00000400 /* 037A4 80B477F4 3C0580B4 */ lui $a1, %hi(func_80B4781C) ## $a1 = 80B40000 /* 037A8 80B477F8 A6020402 */ sh $v0, 0x0402($s0) ## 00000402 /* 037AC 80B477FC 24A5781C */ addiu $a1, $a1, %lo(func_80B4781C) ## $a1 = 80B4781C -/* 037B0 80B47800 0C2D1014 */ jal func_80B44050 +/* 037B0 80B47800 0C2D1014 */ jal func_80B44050 /* 037B4 80B47804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037B8 80B47808 8FBF001C */ lw $ra, 0x001C($sp) -/* 037BC 80B4780C 8FB00018 */ lw $s0, 0x0018($sp) +/* 037B8 80B47808 8FBF001C */ lw $ra, 0x001C($sp) +/* 037BC 80B4780C 8FB00018 */ lw $s0, 0x0018($sp) /* 037C0 80B47810 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 037C4 80B47814 03E00008 */ jr $ra +/* 037C4 80B47814 03E00008 */ jr $ra /* 037C8 80B47818 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s index 0d75de3b12..01ed76b1cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s @@ -1,40 +1,40 @@ glabel func_80B47C64 /* 03C14 80B47C64 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03C18 80B47C68 AFB00018 */ sw $s0, 0x0018($sp) -/* 03C1C 80B47C6C AFA5002C */ sw $a1, 0x002C($sp) +/* 03C18 80B47C68 AFB00018 */ sw $s0, 0x0018($sp) +/* 03C1C 80B47C6C AFA5002C */ sw $a1, 0x002C($sp) /* 03C20 80B47C70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03C24 80B47C74 AFBF001C */ sw $ra, 0x001C($sp) +/* 03C24 80B47C74 AFBF001C */ sw $ra, 0x001C($sp) /* 03C28 80B47C78 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03C2C 80B47C7C 24A5366C */ addiu $a1, $a1, 0x366C ## $a1 = 0601366C -/* 03C30 80B47C80 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop +/* 03C30 80B47C80 0C02947A */ jal SkelAnime_ChangeAnimationDefaultStop /* 03C34 80B47C84 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03C38 80B47C88 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 /* 03C3C 80B47C8C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 03C40 80B47C90 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 03C44 80B47C94 24180015 */ addiu $t8, $zero, 0x0015 ## $t8 = 00000015 -/* 03C48 80B47C98 01C17821 */ addu $t7, $t6, $at +/* 03C48 80B47C98 01C17821 */ addu $t7, $t6, $at /* 03C4C 80B47C9C A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 03C50 80B47CA0 AE1803DC */ sw $t8, 0x03DC($s0) ## 000003DC /* 03C54 80B47CA4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 03C58 80B47CA8 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE /* 03C5C 80B47CAC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 03C60 80B47CB0 0C2D11AA */ jal func_80B446A8 -/* 03C64 80B47CB4 AFA40024 */ sw $a0, 0x0024($sp) -/* 03C68 80B47CB8 8FA40024 */ lw $a0, 0x0024($sp) +/* 03C60 80B47CB0 0C2D11AA */ jal func_80B446A8 +/* 03C64 80B47CB4 AFA40024 */ sw $a0, 0x0024($sp) +/* 03C68 80B47CB8 8FA40024 */ lw $a0, 0x0024($sp) /* 03C6C 80B47CBC A60203FE */ sh $v0, 0x03FE($s0) ## 000003FE -/* 03C70 80B47CC0 8FA7002C */ lw $a3, 0x002C($sp) +/* 03C70 80B47CC0 8FA7002C */ lw $a3, 0x002C($sp) /* 03C74 80B47CC4 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 03C78 80B47CC8 0C2D121C */ jal func_80B44870 +/* 03C78 80B47CC8 0C2D121C */ jal func_80B44870 /* 03C7C 80B47CCC 86060400 */ lh $a2, 0x0400($s0) ## 00000400 /* 03C80 80B47CD0 3C0580B4 */ lui $a1, %hi(func_80B47CF8) ## $a1 = 80B40000 /* 03C84 80B47CD4 A6020402 */ sh $v0, 0x0402($s0) ## 00000402 /* 03C88 80B47CD8 24A57CF8 */ addiu $a1, $a1, %lo(func_80B47CF8) ## $a1 = 80B47CF8 -/* 03C8C 80B47CDC 0C2D1014 */ jal func_80B44050 +/* 03C8C 80B47CDC 0C2D1014 */ jal func_80B44050 /* 03C90 80B47CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C94 80B47CE4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03C98 80B47CE8 8FB00018 */ lw $s0, 0x0018($sp) +/* 03C94 80B47CE4 8FBF001C */ lw $ra, 0x001C($sp) +/* 03C98 80B47CE8 8FB00018 */ lw $s0, 0x0018($sp) /* 03C9C 80B47CEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03CA0 80B47CF0 03E00008 */ jr $ra +/* 03CA0 80B47CF0 03E00008 */ jr $ra /* 03CA4 80B47CF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s index fbeb1c17a8..5e7d557e7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s @@ -1,11 +1,11 @@ glabel func_80832264 /* 00054 80832264 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00058 80832268 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0005C 8083226C 0C02901F */ jal func_800A407C +/* 00058 80832268 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0005C 8083226C 0C02901F */ jal SkelAnime_LinkChangeAnimationDefaultStop /* 00060 80832270 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00064 80832274 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00064 80832274 8FBF0014 */ lw $ra, 0x0014($sp) /* 00068 80832278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0006C 8083227C 03E00008 */ jr $ra +/* 0006C 8083227C 03E00008 */ jr $ra /* 00070 80832280 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s index a0371afb3e..9312264cbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s @@ -1,11 +1,11 @@ glabel func_80832284 /* 00074 80832284 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00078 80832288 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0007C 8083228C 0C029050 */ jal func_800A4140 +/* 00078 80832288 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0007C 8083228C 0C029050 */ jal SkelAnime_LinkChangeAnimationDefaultRepeat /* 00080 80832290 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00084 80832294 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00084 80832294 8FBF0014 */ lw $ra, 0x0014($sp) /* 00088 80832298 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0008C 8083229C 03E00008 */ jr $ra +/* 0008C 8083229C 03E00008 */ jr $ra /* 00090 808322A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s index af5cf8738f..f871a97bd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s @@ -1,14 +1,14 @@ glabel func_808322A4 /* 00094 808322A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00098 808322A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0009C 808322AC AFA5001C */ sw $a1, 0x001C($sp) +/* 00098 808322A8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0009C 808322AC AFA5001C */ sw $a1, 0x001C($sp) /* 000A0 808322B0 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 000A4 808322B4 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 000A8 808322B8 0C029067 */ jal func_800A419C +/* 000A8 808322B8 0C029067 */ jal SkelAnime_LinkChangeAnimationPlaybackRepeat /* 000AC 808322BC 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 000B0 808322C0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 000B0 808322C0 8FBF0014 */ lw $ra, 0x0014($sp) /* 000B4 808322C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000B8 808322C8 03E00008 */ jr $ra +/* 000B8 808322C8 03E00008 */ jr $ra /* 000BC 808322CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s index 83b8d3ea7c..200d65b156 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s @@ -1,14 +1,14 @@ glabel func_808322D0 /* 000C0 808322D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000C4 808322D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C8 808322D8 AFA5001C */ sw $a1, 0x001C($sp) +/* 000C4 808322D4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 000C8 808322D8 AFA5001C */ sw $a1, 0x001C($sp) /* 000CC 808322DC 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 000D0 808322E0 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 000D4 808322E4 0C029037 */ jal func_800A40DC +/* 000D4 808322E4 0C029037 */ jal SkelAnime_LinkChangeAnimationPlaybackStop /* 000D8 808322E8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 000DC 808322EC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 000DC 808322EC 8FBF0014 */ lw $ra, 0x0014($sp) /* 000E0 808322F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000E4 808322F4 03E00008 */ jr $ra +/* 000E4 808322F4 03E00008 */ jr $ra /* 000E8 808322F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s index 8c2175c412..9ee6c297d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s @@ -1,19 +1,19 @@ glabel func_80832FFC /* 00DEC 80832FFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00DF0 80833000 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00DF4 80833004 AFA5001C */ sw $a1, 0x001C($sp) -/* 00DF8 80833008 AFA70024 */ sw $a3, 0x0024($sp) -/* 00DFC 8083300C AFA40018 */ sw $a0, 0x0018($sp) -/* 00E00 80833010 8FA70028 */ lw $a3, 0x0028($sp) -/* 00E04 80833014 0C029037 */ jal func_800A40DC +/* 00DF0 80833000 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00DF4 80833004 AFA5001C */ sw $a1, 0x001C($sp) +/* 00DF8 80833008 AFA70024 */ sw $a3, 0x0024($sp) +/* 00DFC 8083300C AFA40018 */ sw $a0, 0x0018($sp) +/* 00E00 80833010 8FA70028 */ lw $a3, 0x0028($sp) +/* 00E04 80833014 0C029037 */ jal SkelAnime_LinkChangeAnimationPlaybackStop /* 00E08 80833018 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00E0C 8083301C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E10 80833020 8FA5001C */ lw $a1, 0x001C($sp) -/* 00E14 80833024 0C20CBD5 */ jal func_80832F54 -/* 00E18 80833028 8FA60024 */ lw $a2, 0x0024($sp) -/* 00E1C 8083302C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00E0C 8083301C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00E10 80833020 8FA5001C */ lw $a1, 0x001C($sp) +/* 00E14 80833024 0C20CBD5 */ jal func_80832F54 +/* 00E18 80833028 8FA60024 */ lw $a2, 0x0024($sp) +/* 00E1C 8083302C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00E20 80833030 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E24 80833034 03E00008 */ jr $ra +/* 00E24 80833034 03E00008 */ jr $ra /* 00E28 80833038 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s index 55b2189945..79cc6c7cd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s @@ -1,19 +1,19 @@ glabel func_808330AC /* 00E9C 808330AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00EA0 808330B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EA4 808330B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00EA8 808330B8 AFA70024 */ sw $a3, 0x0024($sp) -/* 00EAC 808330BC AFA40018 */ sw $a0, 0x0018($sp) -/* 00EB0 808330C0 8FA70028 */ lw $a3, 0x0028($sp) -/* 00EB4 808330C4 0C029067 */ jal func_800A419C +/* 00EA0 808330B0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00EA4 808330B4 AFA5001C */ sw $a1, 0x001C($sp) +/* 00EA8 808330B8 AFA70024 */ sw $a3, 0x0024($sp) +/* 00EAC 808330BC AFA40018 */ sw $a0, 0x0018($sp) +/* 00EB0 808330C0 8FA70028 */ lw $a3, 0x0028($sp) +/* 00EB4 808330C4 0C029067 */ jal SkelAnime_LinkChangeAnimationPlaybackRepeat /* 00EB8 808330C8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00EBC 808330CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00EC0 808330D0 8FA5001C */ lw $a1, 0x001C($sp) -/* 00EC4 808330D4 0C20CBD5 */ jal func_80832F54 -/* 00EC8 808330D8 8FA60024 */ lw $a2, 0x0024($sp) -/* 00ECC 808330DC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00EBC 808330CC 8FA40018 */ lw $a0, 0x0018($sp) +/* 00EC0 808330D0 8FA5001C */ lw $a1, 0x001C($sp) +/* 00EC4 808330D4 0C20CBD5 */ jal func_80832F54 +/* 00EC8 808330D8 8FA60024 */ lw $a2, 0x0024($sp) +/* 00ECC 808330DC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00ED0 808330E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00ED4 808330E4 03E00008 */ jr $ra +/* 00ED4 808330E4 03E00008 */ jr $ra /* 00ED8 808330E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s index cbdd14247c..f2134828e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s @@ -1,14 +1,14 @@ glabel func_8083328C /* 0107C 8083328C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01080 80833290 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01084 80833294 AFA5001C */ sw $a1, 0x001C($sp) +/* 01080 80833290 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01084 80833294 AFA5001C */ sw $a1, 0x001C($sp) /* 01088 80833298 3C078085 */ lui $a3, %hi(D_808535E8) ## $a3 = 80850000 -/* 0108C 8083329C 8CE735E8 */ lw $a3, %lo(D_808535E8)($a3) -/* 01090 808332A0 0C029037 */ jal func_800A40DC +/* 0108C 8083329C 8CE735E8 */ lw $a3, %lo(D_808535E8)($a3) +/* 01090 808332A0 0C029037 */ jal SkelAnime_LinkChangeAnimationPlaybackStop /* 01094 808332A4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 01098 808332A8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01098 808332A8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0109C 808332AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010A0 808332B0 03E00008 */ jr $ra +/* 010A0 808332B0 03E00008 */ jr $ra /* 010A4 808332B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s index e19ec6e985..74917f3169 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s @@ -1,26 +1,26 @@ glabel func_80834894 /* 02684 80834894 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02688 80834898 AFBF001C */ sw $ra, 0x001C($sp) -/* 0268C 8083489C AFB00018 */ sw $s0, 0x0018($sp) +/* 02688 80834898 AFBF001C */ sw $ra, 0x001C($sp) +/* 0268C 8083489C AFB00018 */ sw $s0, 0x0018($sp) /* 02690 808348A0 3C058083 */ lui $a1, %hi(func_80834C74) ## $a1 = 80830000 /* 02694 808348A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02698 808348A8 0C20CD8E */ jal func_80833638 +/* 02698 808348A8 0C20CD8E */ jal func_80833638 /* 0269C 808348AC 24A54C74 */ addiu $a1, $a1, %lo(func_80834C74) ## $a1 = 80834C74 /* 026A0 808348B0 820E0154 */ lb $t6, 0x0154($s0) ## 00000154 -/* 026A4 808348B4 05C10003 */ bgez $t6, .L808348C4 +/* 026A4 808348B4 05C10003 */ bgez $t6, .L808348C4 /* 026A8 808348B8 00000000 */ nop -/* 026AC 808348BC 0C023B1C */ jal func_8008EC70 +/* 026AC 808348BC 0C023B1C */ jal func_8008EC70 /* 026B0 808348C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L808348C4: -/* 026B4 808348C4 0C029502 */ jal func_800A5408 +/* 026B4 808348C4 0C029502 */ jal SkelAnime_AnimationReverse /* 026B8 808348C8 260406C8 */ addiu $a0, $s0, 0x06C8 ## $a0 = 000006C8 /* 026BC 808348CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026C0 808348D0 0C00BDF7 */ jal func_8002F7DC +/* 026C0 808348D0 0C00BDF7 */ jal func_8002F7DC /* 026C4 808348D4 24051826 */ addiu $a1, $zero, 0x1826 ## $a1 = 00001826 -/* 026C8 808348D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 026CC 808348DC 8FB00018 */ lw $s0, 0x0018($sp) +/* 026C8 808348D8 8FBF001C */ lw $ra, 0x001C($sp) +/* 026CC 808348DC 8FB00018 */ lw $s0, 0x0018($sp) /* 026D0 808348E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 026D4 808348E4 03E00008 */ jr $ra +/* 026D4 808348E4 03E00008 */ jr $ra /* 026D8 808348E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s index fc4e29dce7..8a8bc1c7d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s @@ -1,51 +1,51 @@ glabel func_80834C74 /* 02A64 80834C74 3C0E8085 */ lui $t6, %hi(D_80853618) ## $t6 = 80850000 -/* 02A68 80834C78 8DCE3618 */ lw $t6, %lo(D_80853618)($t6) +/* 02A68 80834C78 8DCE3618 */ lw $t6, %lo(D_80853618)($t6) /* 02A6C 80834C7C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02A70 80834C80 3C028085 */ lui $v0, %hi(D_80853614) ## $v0 = 80850000 /* 02A74 80834C84 24423614 */ addiu $v0, $v0, %lo(D_80853614) ## $v0 = 80853614 -/* 02A78 80834C88 AFB00018 */ sw $s0, 0x0018($sp) +/* 02A78 80834C88 AFB00018 */ sw $s0, 0x0018($sp) /* 02A7C 80834C8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02A80 80834C90 AFBF001C */ sw $ra, 0x001C($sp) -/* 02A84 80834C94 AFA5002C */ sw $a1, 0x002C($sp) -/* 02A88 80834C98 15C00006 */ bne $t6, $zero, .L80834CB4 +/* 02A80 80834C90 AFBF001C */ sw $ra, 0x001C($sp) +/* 02A84 80834C94 AFA5002C */ sw $a1, 0x002C($sp) +/* 02A88 80834C98 15C00006 */ bne $t6, $zero, .L80834CB4 /* 02A8C 80834C9C AC4E0000 */ sw $t6, 0x0000($v0) ## 80853614 /* 02A90 80834CA0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02A94 80834CA4 0C028EF0 */ jal func_800A3BC0 +/* 02A94 80834CA4 0C028EF0 */ jal func_800A3BC0 /* 02A98 80834CA8 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 02A9C 80834CAC 5040001A */ beql $v0, $zero, .L80834D18 +/* 02A9C 80834CAC 5040001A */ beql $v0, $zero, .L80834D18 /* 02AA0 80834CB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80834CB4: /* 02AA4 80834CB4 82180151 */ lb $t8, 0x0151($s0) ## 00000151 /* 02AA8 80834CB8 3C058085 */ lui $a1, %hi(D_80853EDC) ## $a1 = 80850000 /* 02AAC 80834CBC 260806C8 */ addiu $t0, $s0, 0x06C8 ## $t0 = 000006C8 -/* 02AB0 80834CC0 0018C880 */ sll $t9, $t8, 2 -/* 02AB4 80834CC4 00B92821 */ addu $a1, $a1, $t9 -/* 02AB8 80834CC8 8CA53EDC */ lw $a1, %lo(D_80853EDC)($a1) -/* 02ABC 80834CCC AFA80024 */ sw $t0, 0x0024($sp) -/* 02AC0 80834CD0 0C20CD8E */ jal func_80833638 +/* 02AB0 80834CC0 0018C880 */ sll $t9, $t8, 2 +/* 02AB4 80834CC4 00B92821 */ addu $a1, $a1, $t9 +/* 02AB8 80834CC8 8CA53EDC */ lw $a1, %lo(D_80853EDC)($a1) +/* 02ABC 80834CCC AFA80024 */ sw $t0, 0x0024($sp) +/* 02AC0 80834CD0 0C20CD8E */ jal func_80833638 /* 02AC4 80834CD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02AC8 80834CD8 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B /* 02ACC 80834CDC 3C068085 */ lui $a2, %hi(D_80853914) ## $a2 = 80850000 -/* 02AD0 80834CE0 8FA4002C */ lw $a0, 0x002C($sp) -/* 02AD4 80834CE4 00095080 */ sll $t2, $t1, 2 -/* 02AD8 80834CE8 00CA3021 */ addu $a2, $a2, $t2 -/* 02ADC 80834CEC 8CC63914 */ lw $a2, %lo(D_80853914)($a2) -/* 02AE0 80834CF0 0C029050 */ jal func_800A4140 -/* 02AE4 80834CF4 8FA50024 */ lw $a1, 0x0024($sp) +/* 02AD0 80834CE0 8FA4002C */ lw $a0, 0x002C($sp) +/* 02AD4 80834CE4 00095080 */ sll $t2, $t1, 2 +/* 02AD8 80834CE8 00CA3021 */ addu $a2, $a2, $t2 +/* 02ADC 80834CEC 8CC63914 */ lw $a2, %lo(D_80853914)($a2) +/* 02AE0 80834CF0 0C029050 */ jal SkelAnime_LinkChangeAnimationDefaultRepeat +/* 02AE4 80834CF4 8FA50024 */ lw $a1, 0x0024($sp) /* 02AE8 80834CF8 8E19082C */ lw $t9, 0x082C($s0) ## 0000082C /* 02AEC 80834CFC A20006AC */ sb $zero, 0x06AC($s0) ## 000006AC -/* 02AF0 80834D00 8FA5002C */ lw $a1, 0x002C($sp) -/* 02AF4 80834D04 0320F809 */ jalr $ra, $t9 +/* 02AF0 80834D00 8FA5002C */ lw $a1, 0x002C($sp) +/* 02AF4 80834D04 0320F809 */ jalr $ra, $t9 /* 02AF8 80834D08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AFC 80834D0C 10000002 */ beq $zero, $zero, .L80834D18 +/* 02AFC 80834D0C 10000002 */ beq $zero, $zero, .L80834D18 /* 02B00 80834D10 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02B04 80834D14 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80834D18: -/* 02B08 80834D18 8FBF001C */ lw $ra, 0x001C($sp) -/* 02B0C 80834D1C 8FB00018 */ lw $s0, 0x0018($sp) +/* 02B08 80834D18 8FBF001C */ lw $ra, 0x001C($sp) +/* 02B0C 80834D1C 8FB00018 */ lw $s0, 0x0018($sp) /* 02B10 80834D20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02B14 80834D24 03E00008 */ jr $ra +/* 02B14 80834D24 03E00008 */ jr $ra /* 02B18 80834D28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s index fe018d3e64..2f6fc654f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s @@ -1,81 +1,81 @@ glabel func_80834D2C /* 02B1C 80834D2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02B20 80834D30 AFBF001C */ sw $ra, 0x001C($sp) -/* 02B24 80834D34 AFB00018 */ sw $s0, 0x0018($sp) -/* 02B28 80834D38 AFA50024 */ sw $a1, 0x0024($sp) +/* 02B20 80834D30 AFBF001C */ sw $ra, 0x001C($sp) +/* 02B24 80834D34 AFB00018 */ sw $s0, 0x0018($sp) +/* 02B28 80834D38 AFA50024 */ sw $a1, 0x0024($sp) /* 02B2C 80834D3C 808E0151 */ lb $t6, 0x0151($a0) ## 00000151 /* 02B30 80834D40 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 02B34 80834D44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02B38 80834D48 11C10014 */ beq $t6, $at, .L80834D9C +/* 02B38 80834D48 11C10014 */ beq $t6, $at, .L80834D9C /* 02B3C 80834D4C 00000000 */ nop -/* 02B40 80834D50 0C20D10B */ jal func_8083442C +/* 02B40 80834D50 0C20D10B */ jal func_8083442C /* 02B44 80834D54 00000000 */ nop -/* 02B48 80834D58 14400003 */ bne $v0, $zero, .L80834D68 +/* 02B48 80834D58 14400003 */ bne $v0, $zero, .L80834D68 /* 02B4C 80834D5C 00000000 */ nop -/* 02B50 80834D60 10000033 */ beq $zero, $zero, .L80834E30 +/* 02B50 80834D60 10000033 */ beq $zero, $zero, .L80834E30 /* 02B54 80834D64 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80834D68: -/* 02B58 80834D68 0C023C41 */ jal func_8008F104 +/* 02B58 80834D68 0C023C41 */ jal func_8008F104 /* 02B5C 80834D6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B60 80834D70 14400004 */ bne $v0, $zero, .L80834D84 -/* 02B64 80834D74 8FA40024 */ lw $a0, 0x0024($sp) +/* 02B60 80834D70 14400004 */ bne $v0, $zero, .L80834D84 +/* 02B64 80834D74 8FA40024 */ lw $a0, 0x0024($sp) /* 02B68 80834D78 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 02B6C 80834D7C 10000003 */ beq $zero, $zero, .L80834D8C +/* 02B6C 80834D7C 10000003 */ beq $zero, $zero, .L80834D8C /* 02B70 80834D80 24C626A0 */ addiu $a2, $a2, 0x26A0 ## $a2 = 040026A0 .L80834D84: /* 02B74 80834D84 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 02B78 80834D88 24C62CA0 */ addiu $a2, $a2, 0x2CA0 ## $a2 = 04002CA0 .L80834D8C: -/* 02B7C 80834D8C 0C02901F */ jal func_800A407C +/* 02B7C 80834D8C 0C02901F */ jal SkelAnime_LinkChangeAnimationDefaultStop /* 02B80 80834D90 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 02B84 80834D94 1000000D */ beq $zero, $zero, .L80834DCC +/* 02B84 80834D94 1000000D */ beq $zero, $zero, .L80834DCC /* 02B88 80834D98 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C .L80834D9C: /* 02B8C 80834D9C 3C058083 */ lui $a1, %hi(func_80835884) ## $a1 = 80830000 /* 02B90 80834DA0 24A55884 */ addiu $a1, $a1, %lo(func_80835884) ## $a1 = 80835884 -/* 02B94 80834DA4 0C20CD8E */ jal func_80833638 +/* 02B94 80834DA4 0C20CD8E */ jal func_80833638 /* 02B98 80834DA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02B9C 80834DAC 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 02BA0 80834DB0 A60F0834 */ sh $t7, 0x0834($s0) ## 00000834 /* 02BA4 80834DB4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 02BA8 80834DB8 24C62628 */ addiu $a2, $a2, 0x2628 ## $a2 = 04002628 -/* 02BAC 80834DBC 8FA40024 */ lw $a0, 0x0024($sp) -/* 02BB0 80834DC0 0C02901F */ jal func_800A407C +/* 02BAC 80834DBC 8FA40024 */ lw $a0, 0x0024($sp) +/* 02BB0 80834DC0 0C02901F */ jal SkelAnime_LinkChangeAnimationDefaultStop /* 02BB4 80834DC4 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 02BB8 80834DC8 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C .L80834DCC: -/* 02BBC 80834DCC 8FA40024 */ lw $a0, 0x0024($sp) +/* 02BBC 80834DCC 8FA40024 */ lw $a0, 0x0024($sp) /* 02BC0 80834DD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02BC4 80834DD4 0018CA00 */ sll $t9, $t8, 8 -/* 02BC8 80834DD8 07210005 */ bgez $t9, .L80834DF0 +/* 02BC4 80834DD4 0018CA00 */ sll $t9, $t8, 8 +/* 02BC8 80834DD8 07210005 */ bgez $t9, .L80834DF0 /* 02BCC 80834DDC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 02BD0 80834DE0 0C20C8A1 */ jal func_80832284 +/* 02BD0 80834DE0 0C20C8A1 */ jal func_80832284 /* 02BD4 80834DE4 24C63380 */ addiu $a2, $a2, 0x3380 ## $a2 = 04003380 -/* 02BD8 80834DE8 10000011 */ beq $zero, $zero, .L80834E30 +/* 02BD8 80834DE8 10000011 */ beq $zero, $zero, .L80834E30 /* 02BDC 80834DEC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80834DF0: /* 02BE0 80834DF0 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 /* 02BE4 80834DF4 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 02BE8 80834DF8 5120000D */ beql $t1, $zero, .L80834E30 +/* 02BE8 80834DF8 5120000D */ beql $t1, $zero, .L80834E30 /* 02BEC 80834DFC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02BF0 80834E00 0C20CED5 */ jal func_80833B54 +/* 02BF0 80834E00 0C20CED5 */ jal func_80833B54 /* 02BF4 80834E04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02BF8 80834E08 14400008 */ bne $v0, $zero, .L80834E2C -/* 02BFC 80834E0C 8FA40024 */ lw $a0, 0x0024($sp) +/* 02BF8 80834E08 14400008 */ bne $v0, $zero, .L80834E2C +/* 02BFC 80834E0C 8FA40024 */ lw $a0, 0x0024($sp) /* 02C00 80834E10 920A015B */ lbu $t2, 0x015B($s0) ## 0000015B /* 02C04 80834E14 3C068085 */ lui $a2, %hi(D_80853914) ## $a2 = 80850000 /* 02C08 80834E18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02C0C 80834E1C 000A5880 */ sll $t3, $t2, 2 -/* 02C10 80834E20 00CB3021 */ addu $a2, $a2, $t3 -/* 02C14 80834E24 0C20C8A1 */ jal func_80832284 -/* 02C18 80834E28 8CC63914 */ lw $a2, %lo(D_80853914)($a2) +/* 02C0C 80834E1C 000A5880 */ sll $t3, $t2, 2 +/* 02C10 80834E20 00CB3021 */ addu $a2, $a2, $t3 +/* 02C14 80834E24 0C20C8A1 */ jal func_80832284 +/* 02C18 80834E28 8CC63914 */ lw $a2, %lo(D_80853914)($a2) .L80834E2C: /* 02C1C 80834E2C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80834E30: -/* 02C20 80834E30 8FBF001C */ lw $ra, 0x001C($sp) -/* 02C24 80834E34 8FB00018 */ lw $s0, 0x0018($sp) +/* 02C20 80834E30 8FBF001C */ lw $ra, 0x001C($sp) +/* 02C24 80834E34 8FB00018 */ lw $s0, 0x0018($sp) /* 02C28 80834E38 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02C2C 80834E3C 03E00008 */ jr $ra +/* 02C2C 80834E3C 03E00008 */ jr $ra /* 02C30 80834E40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s index 878b6b4b18..0d5b659fc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s @@ -1,149 +1,149 @@ glabel func_808351D4 /* 02FC4 808351D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02FC8 808351D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 02FCC 808351DC AFB00018 */ sw $s0, 0x0018($sp) +/* 02FC8 808351D8 AFBF001C */ sw $ra, 0x001C($sp) +/* 02FCC 808351DC AFB00018 */ sw $s0, 0x0018($sp) /* 02FD0 808351E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02FD4 808351E4 0C023C41 */ jal func_8008F104 -/* 02FD8 808351E8 AFA50034 */ sw $a1, 0x0034($sp) -/* 02FDC 808351EC 14400003 */ bne $v0, $zero, .L808351FC +/* 02FD4 808351E4 0C023C41 */ jal func_8008F104 +/* 02FD8 808351E8 AFA50034 */ sw $a1, 0x0034($sp) +/* 02FDC 808351EC 14400003 */ bne $v0, $zero, .L808351FC /* 02FE0 808351F0 260406C0 */ addiu $a0, $s0, 0x06C0 ## $a0 = 000006C0 -/* 02FE4 808351F4 10000003 */ beq $zero, $zero, .L80835204 -/* 02FE8 808351F8 AFA0002C */ sw $zero, 0x002C($sp) +/* 02FE4 808351F4 10000003 */ beq $zero, $zero, .L80835204 +/* 02FE8 808351F8 AFA0002C */ sw $zero, 0x002C($sp) .L808351FC: /* 02FEC 808351FC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02FF0 80835200 AFAE002C */ sw $t6, 0x002C($sp) +/* 02FF0 80835200 AFAE002C */ sw $t6, 0x002C($sp) .L80835204: /* 02FF4 80835204 240504B0 */ addiu $a1, $zero, 0x04B0 ## $a1 = 000004B0 /* 02FF8 80835208 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 02FFC 8083520C 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 /* 03000 80835210 960F06AE */ lhu $t7, 0x06AE($s0) ## 000006AE /* 03004 80835214 82190836 */ lb $t9, 0x0836($s0) ## 00000836 /* 03008 80835218 35F80100 */ ori $t8, $t7, 0x0100 ## $t8 = 00000100 -/* 0300C 8083521C 17200014 */ bne $t9, $zero, .L80835270 +/* 0300C 8083521C 17200014 */ bne $t9, $zero, .L80835270 /* 03010 80835220 A61806AE */ sh $t8, 0x06AE($s0) ## 000006AE -/* 03014 80835224 0C20CCD4 */ jal func_80833350 +/* 03014 80835224 0C20CCD4 */ jal func_80833350 /* 03018 80835228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0301C 8083522C 54400011 */ bnel $v0, $zero, .L80835274 +/* 0301C 8083522C 54400011 */ bnel $v0, $zero, .L80835274 /* 03020 80835230 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 03024 80835234 8E0901BC */ lw $t1, 0x01BC($s0) ## 000001BC /* 03028 80835238 3C080400 */ lui $t0, 0x0400 ## $t0 = 04000000 /* 0302C 8083523C 250826E8 */ addiu $t0, $t0, 0x26E8 ## $t0 = 040026E8 -/* 03030 80835240 1509000B */ bne $t0, $t1, .L80835270 -/* 03034 80835244 8FA40034 */ lw $a0, 0x0034($sp) -/* 03038 80835248 8FAA002C */ lw $t2, 0x002C($sp) +/* 03030 80835240 1509000B */ bne $t0, $t1, .L80835270 +/* 03034 80835244 8FA40034 */ lw $a0, 0x0034($sp) +/* 03038 80835248 8FAA002C */ lw $t2, 0x002C($sp) /* 0303C 8083524C 3C068085 */ lui $a2, %hi(D_808543CC) ## $a2 = 80850000 /* 03040 80835250 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 03044 80835254 000A5880 */ sll $t3, $t2, 2 -/* 03048 80835258 00CB3021 */ addu $a2, $a2, $t3 -/* 0304C 8083525C 0C02901F */ jal func_800A407C -/* 03050 80835260 8CC643CC */ lw $a2, %lo(D_808543CC)($a2) +/* 03044 80835254 000A5880 */ sll $t3, $t2, 2 +/* 03048 80835258 00CB3021 */ addu $a2, $a2, $t3 +/* 0304C 8083525C 0C02901F */ jal SkelAnime_LinkChangeAnimationDefaultStop +/* 03050 80835260 8CC643CC */ lw $a2, %lo(D_808543CC)($a2) /* 03054 80835264 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 03058 80835268 10000017 */ beq $zero, $zero, .L808352C8 +/* 03058 80835268 10000017 */ beq $zero, $zero, .L808352C8 /* 0305C 8083526C A20C0836 */ sb $t4, 0x0836($s0) ## 00000836 .L80835270: /* 03060 80835270 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 .L80835274: -/* 03064 80835274 AFA50024 */ sw $a1, 0x0024($sp) -/* 03068 80835278 0C028EF0 */ jal func_800A3BC0 -/* 0306C 8083527C 8FA40034 */ lw $a0, 0x0034($sp) -/* 03070 80835280 1040000B */ beq $v0, $zero, .L808352B0 -/* 03074 80835284 8FA50024 */ lw $a1, 0x0024($sp) -/* 03078 80835288 8FAD002C */ lw $t5, 0x002C($sp) +/* 03064 80835274 AFA50024 */ sw $a1, 0x0024($sp) +/* 03068 80835278 0C028EF0 */ jal func_800A3BC0 +/* 0306C 8083527C 8FA40034 */ lw $a0, 0x0034($sp) +/* 03070 80835280 1040000B */ beq $v0, $zero, .L808352B0 +/* 03074 80835284 8FA50024 */ lw $a1, 0x0024($sp) +/* 03078 80835288 8FAD002C */ lw $t5, 0x002C($sp) /* 0307C 8083528C 3C068085 */ lui $a2, %hi(D_808543D4) ## $a2 = 80850000 -/* 03080 80835290 8FA40034 */ lw $a0, 0x0034($sp) -/* 03084 80835294 000D7080 */ sll $t6, $t5, 2 -/* 03088 80835298 00CE3021 */ addu $a2, $a2, $t6 -/* 0308C 8083529C 0C029050 */ jal func_800A4140 -/* 03090 808352A0 8CC643D4 */ lw $a2, %lo(D_808543D4)($a2) +/* 03080 80835290 8FA40034 */ lw $a0, 0x0034($sp) +/* 03084 80835294 000D7080 */ sll $t6, $t5, 2 +/* 03088 80835298 00CE3021 */ addu $a2, $a2, $t6 +/* 0308C 8083529C 0C029050 */ jal SkelAnime_LinkChangeAnimationDefaultRepeat +/* 03090 808352A0 8CC643D4 */ lw $a2, %lo(D_808543D4)($a2) /* 03094 808352A4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03098 808352A8 10000007 */ beq $zero, $zero, .L808352C8 +/* 03098 808352A8 10000007 */ beq $zero, $zero, .L808352C8 /* 0309C 808352AC A20F0836 */ sb $t7, 0x0836($s0) ## 00000836 .L808352B0: /* 030A0 808352B0 82180836 */ lb $t8, 0x0836($s0) ## 00000836 /* 030A4 808352B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 030A8 808352B8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 030AC 808352BC 57010003 */ bnel $t8, $at, .L808352CC +/* 030AC 808352BC 57010003 */ bnel $t8, $at, .L808352CC /* 030B0 808352C0 86020834 */ lh $v0, 0x0834($s0) ## 00000834 /* 030B4 808352C4 A2190836 */ sb $t9, 0x0836($s0) ## 00000836 .L808352C8: /* 030B8 808352C8 86020834 */ lh $v0, 0x0834($s0) ## 00000834 .L808352CC: /* 030BC 808352CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 030C0 808352D0 2841000B */ slti $at, $v0, 0x000B -/* 030C4 808352D4 14200002 */ bne $at, $zero, .L808352E0 +/* 030C0 808352D0 2841000B */ slti $at, $v0, 0x000B +/* 030C4 808352D4 14200002 */ bne $at, $zero, .L808352E0 /* 030C8 808352D8 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 030CC 808352DC A6080834 */ sh $t0, 0x0834($s0) ## 00000834 .L808352E0: -/* 030D0 808352E0 0C20D3AE */ jal func_80834EB8 -/* 030D4 808352E4 8FA50034 */ lw $a1, 0x0034($sp) +/* 030D0 808352E0 0C20D3AE */ jal func_80834EB8 +/* 030D4 808352E4 8FA50034 */ lw $a1, 0x0034($sp) /* 030D8 808352E8 82090836 */ lb $t1, 0x0836($s0) ## 00000836 -/* 030DC 808352EC 59200033 */ blezl $t1, .L808353BC +/* 030DC 808352EC 59200033 */ blezl $t1, .L808353BC /* 030E0 808352F0 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 030E4 808352F4 860A0860 */ lh $t2, 0x0860($s0) ## 00000860 /* 030E8 808352F8 3C0B8085 */ lui $t3, %hi(D_80853618) ## $t3 = 80850000 -/* 030EC 808352FC 05400007 */ bltz $t2, .L8083531C +/* 030EC 808352FC 05400007 */ bltz $t2, .L8083531C /* 030F0 80835300 00000000 */ nop -/* 030F4 80835304 8D6B3618 */ lw $t3, %lo(D_80853618)($t3) -/* 030F8 80835308 5560002C */ bnel $t3, $zero, .L808353BC +/* 030F4 80835304 8D6B3618 */ lw $t3, %lo(D_80853618)($t3) +/* 030F8 80835308 5560002C */ bnel $t3, $zero, .L808353BC /* 030FC 8083530C 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 03100 80835310 0C20D39F */ jal func_80834E7C -/* 03104 80835314 8FA40034 */ lw $a0, 0x0034($sp) -/* 03108 80835318 14400027 */ bne $v0, $zero, .L808353B8 +/* 03100 80835310 0C20D39F */ jal func_80834E7C +/* 03104 80835314 8FA40034 */ lw $a0, 0x0034($sp) +/* 03108 80835318 14400027 */ bne $v0, $zero, .L808353B8 .L8083531C: /* 0310C 8083531C 3C058083 */ lui $a1, %hi(func_808353D8) ## $a1 = 80830000 /* 03110 80835320 24A553D8 */ addiu $a1, $a1, %lo(func_808353D8) ## $a1 = 808353D8 -/* 03114 80835324 0C20CD8E */ jal func_80833638 +/* 03114 80835324 0C20CD8E */ jal func_80833638 /* 03118 80835328 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0311C 8083532C 860C0860 */ lh $t4, 0x0860($s0) ## 00000860 -/* 03120 80835330 8FAD002C */ lw $t5, 0x002C($sp) -/* 03124 80835334 0582001B */ bltzl $t4, .L808353A4 +/* 03120 80835330 8FAD002C */ lw $t5, 0x002C($sp) +/* 03124 80835334 0582001B */ bltzl $t4, .L808353A4 /* 03128 80835338 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 0312C 8083533C 15A00011 */ bne $t5, $zero, .L80835384 -/* 03130 80835340 8FA40034 */ lw $a0, 0x0034($sp) -/* 03134 80835344 0C20D429 */ jal func_808350A4 +/* 0312C 8083533C 15A00011 */ bne $t5, $zero, .L80835384 +/* 03130 80835340 8FA40034 */ lw $a0, 0x0034($sp) +/* 03134 80835344 0C20D429 */ jal func_808350A4 /* 03138 80835348 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0313C 8083534C 14400014 */ bne $v0, $zero, .L808353A0 +/* 0313C 8083534C 14400014 */ bne $v0, $zero, .L808353A0 /* 03140 80835350 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03144 80835354 86020860 */ lh $v0, 0x0860($s0) ## 00000860 /* 03148 80835358 3C058085 */ lui $a1, %hi(D_808543DA) ## $a1 = 80850000 -/* 0314C 8083535C 04400003 */ bltz $v0, .L8083536C -/* 03150 80835360 00021823 */ subu $v1, $zero, $v0 -/* 03154 80835364 10000001 */ beq $zero, $zero, .L8083536C +/* 0314C 8083535C 04400003 */ bltz $v0, .L8083536C +/* 03150 80835360 00021823 */ subu $v1, $zero, $v0 +/* 03154 80835364 10000001 */ beq $zero, $zero, .L8083536C /* 03158 80835368 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L8083536C: -/* 0315C 8083536C 00037040 */ sll $t6, $v1, 1 -/* 03160 80835370 00AE2821 */ addu $a1, $a1, $t6 -/* 03164 80835374 0C00BDF7 */ jal func_8002F7DC -/* 03168 80835378 94A543DA */ lhu $a1, %lo(D_808543DA)($a1) -/* 0316C 8083537C 10000009 */ beq $zero, $zero, .L808353A4 +/* 0315C 8083536C 00037040 */ sll $t6, $v1, 1 +/* 03160 80835370 00AE2821 */ addu $a1, $a1, $t6 +/* 03164 80835374 0C00BDF7 */ jal func_8002F7DC +/* 03168 80835378 94A543DA */ lhu $a1, %lo(D_808543DA)($a1) +/* 0316C 8083537C 10000009 */ beq $zero, $zero, .L808353A4 /* 03170 80835380 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A .L80835384: /* 03174 80835384 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 03178 80835388 8FA40034 */ lw $a0, 0x0034($sp) +/* 03178 80835388 8FA40034 */ lw $a0, 0x0034($sp) /* 0317C 8083538C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 03180 80835390 53000004 */ beql $t8, $zero, .L808353A4 +/* 03180 80835390 53000004 */ beql $t8, $zero, .L808353A4 /* 03184 80835394 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 03188 80835398 0C20D429 */ jal func_808350A4 +/* 03188 80835398 0C20D429 */ jal func_808350A4 /* 0318C 8083539C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 .L808353A0: /* 03190 808353A0 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A .L808353A4: /* 03194 808353A4 A6190834 */ sh $t9, 0x0834($s0) ## 00000834 -/* 03198 808353A8 0C20C884 */ jal func_80832210 +/* 03198 808353A8 0C20C884 */ jal func_80832210 /* 0319C 808353AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031A0 808353B0 10000005 */ beq $zero, $zero, .L808353C8 -/* 031A4 808353B4 8FBF001C */ lw $ra, 0x001C($sp) +/* 031A0 808353B0 10000005 */ beq $zero, $zero, .L808353C8 +/* 031A4 808353B4 8FBF001C */ lw $ra, 0x001C($sp) .L808353B8: /* 031A8 808353B8 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C .L808353BC: /* 031AC 808353BC 35090200 */ ori $t1, $t0, 0x0200 ## $t1 = 00000200 /* 031B0 808353C0 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 031B4 808353C4 8FBF001C */ lw $ra, 0x001C($sp) +/* 031B4 808353C4 8FBF001C */ lw $ra, 0x001C($sp) .L808353C8: -/* 031B8 808353C8 8FB00018 */ lw $s0, 0x0018($sp) +/* 031B8 808353C8 8FB00018 */ lw $s0, 0x0018($sp) /* 031BC 808353CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 031C0 808353D0 03E00008 */ jr $ra +/* 031C0 808353D0 03E00008 */ jr $ra /* 031C4 808353D4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s index 230eb35071..af14976f82 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s @@ -1,126 +1,126 @@ glabel func_808353D8 /* 031C8 808353D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 031CC 808353DC AFB00018 */ sw $s0, 0x0018($sp) +/* 031CC 808353DC AFB00018 */ sw $s0, 0x0018($sp) /* 031D0 808353E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 031D4 808353E4 AFA5002C */ sw $a1, 0x002C($sp) +/* 031D4 808353E4 AFA5002C */ sw $a1, 0x002C($sp) /* 031D8 808353E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 031DC 808353EC AFBF001C */ sw $ra, 0x001C($sp) +/* 031DC 808353EC AFBF001C */ sw $ra, 0x001C($sp) /* 031E0 808353F0 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 031E4 808353F4 0C028EF0 */ jal func_800A3BC0 -/* 031E8 808353F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 031EC 808353FC 0C023C41 */ jal func_8008F104 +/* 031E4 808353F4 0C028EF0 */ jal func_800A3BC0 +/* 031E8 808353F8 AFA50024 */ sw $a1, 0x0024($sp) +/* 031EC 808353FC 0C023C41 */ jal func_8008F104 /* 031F0 80835400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031F4 80835404 50400008 */ beql $v0, $zero, .L80835428 -/* 031F8 80835408 8FA4002C */ lw $a0, 0x002C($sp) -/* 031FC 8083540C 0C20D3EF */ jal func_80834FBC +/* 031F4 80835404 50400008 */ beql $v0, $zero, .L80835428 +/* 031F8 80835408 8FA4002C */ lw $a0, 0x002C($sp) +/* 031FC 8083540C 0C20D3EF */ jal func_80834FBC /* 03200 80835410 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03204 80835414 54400004 */ bnel $v0, $zero, .L80835428 -/* 03208 80835418 8FA4002C */ lw $a0, 0x002C($sp) -/* 0320C 8083541C 10000055 */ beq $zero, $zero, .L80835574 +/* 03204 80835414 54400004 */ bnel $v0, $zero, .L80835428 +/* 03208 80835418 8FA4002C */ lw $a0, 0x002C($sp) +/* 0320C 8083541C 10000055 */ beq $zero, $zero, .L80835574 /* 03210 80835420 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03214 80835424 8FA4002C */ lw $a0, 0x002C($sp) +/* 03214 80835424 8FA4002C */ lw $a0, 0x002C($sp) .L80835428: -/* 03218 80835428 0C20D1D6 */ jal func_80834758 +/* 03218 80835428 0C20D1D6 */ jal func_80834758 /* 0321C 8083542C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03220 80835430 14400027 */ bne $v0, $zero, .L808354D0 +/* 03220 80835430 14400027 */ bne $v0, $zero, .L808354D0 /* 03224 80835434 3C0E8085 */ lui $t6, %hi(D_80853614) ## $t6 = 80850000 -/* 03228 80835438 8DCE3614 */ lw $t6, %lo(D_80853614)($t6) -/* 0322C 8083543C 55C0000D */ bnel $t6, $zero, .L80835474 +/* 03228 80835438 8DCE3614 */ lw $t6, %lo(D_80853614)($t6) +/* 0322C 8083543C 55C0000D */ bnel $t6, $zero, .L80835474 /* 03230 80835440 86020860 */ lh $v0, 0x0860($s0) ## 00000860 /* 03234 80835444 860F0860 */ lh $t7, 0x0860($s0) ## 00000860 /* 03238 80835448 3C188085 */ lui $t8, %hi(D_80853618) ## $t8 = 80850000 -/* 0323C 8083544C 05E10004 */ bgez $t7, .L80835460 +/* 0323C 8083544C 05E10004 */ bgez $t7, .L80835460 /* 03240 80835450 00000000 */ nop -/* 03244 80835454 8F183618 */ lw $t8, %lo(D_80853618)($t8) -/* 03248 80835458 57000006 */ bnel $t8, $zero, .L80835474 +/* 03244 80835454 8F183618 */ lw $t8, %lo(D_80853618)($t8) +/* 03248 80835458 57000006 */ bnel $t8, $zero, .L80835474 /* 0324C 8083545C 86020860 */ lh $v0, 0x0860($s0) ## 00000860 .L80835460: -/* 03250 80835460 0C20D391 */ jal func_80834E44 -/* 03254 80835464 8FA4002C */ lw $a0, 0x002C($sp) -/* 03258 80835468 5040001A */ beql $v0, $zero, .L808354D4 +/* 03250 80835460 0C20D391 */ jal func_80834E44 +/* 03254 80835464 8FA4002C */ lw $a0, 0x002C($sp) +/* 03258 80835468 5040001A */ beql $v0, $zero, .L808354D4 /* 0325C 8083546C 86020834 */ lh $v0, 0x0834($s0) ## 00000834 /* 03260 80835470 86020860 */ lh $v0, 0x0860($s0) ## 00000860 .L80835474: /* 03264 80835474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03268 80835478 04400003 */ bltz $v0, .L80835488 -/* 0326C 8083547C 0002C823 */ subu $t9, $zero, $v0 -/* 03270 80835480 10000002 */ beq $zero, $zero, .L8083548C +/* 03268 80835478 04400003 */ bltz $v0, .L80835488 +/* 0326C 8083547C 0002C823 */ subu $t9, $zero, $v0 +/* 03270 80835480 10000002 */ beq $zero, $zero, .L8083548C /* 03274 80835484 A6020860 */ sh $v0, 0x0860($s0) ## 00000860 .L80835488: /* 03278 80835488 A6190860 */ sh $t9, 0x0860($s0) ## 00000860 .L8083548C: -/* 0327C 8083548C 0C20D10B */ jal func_8083442C -/* 03280 80835490 8FA5002C */ lw $a1, 0x002C($sp) -/* 03284 80835494 50400037 */ beql $v0, $zero, .L80835574 +/* 0327C 8083548C 0C20D10B */ jal func_8083442C +/* 03280 80835490 8FA5002C */ lw $a1, 0x002C($sp) +/* 03284 80835494 50400037 */ beql $v0, $zero, .L80835574 /* 03288 80835498 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0328C 8083549C 0C023C41 */ jal func_8008F104 +/* 0328C 8083549C 0C023C41 */ jal func_8008F104 /* 03290 808354A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03294 808354A4 10400004 */ beq $v0, $zero, .L808354B8 -/* 03298 808354A8 8FA4002C */ lw $a0, 0x002C($sp) +/* 03294 808354A4 10400004 */ beq $v0, $zero, .L808354B8 +/* 03298 808354A8 8FA4002C */ lw $a0, 0x002C($sp) /* 0329C 808354AC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 032A0 808354B0 1000002F */ beq $zero, $zero, .L80835570 +/* 032A0 808354B0 1000002F */ beq $zero, $zero, .L80835570 /* 032A4 808354B4 A2080836 */ sb $t0, 0x0836($s0) ## 00000836 .L808354B8: /* 032A8 808354B8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 032AC 808354BC 24C626B8 */ addiu $a2, $a2, 0x26B8 ## $a2 = 040026B8 -/* 032B0 808354C0 0C02901F */ jal func_800A407C -/* 032B4 808354C4 8FA50024 */ lw $a1, 0x0024($sp) -/* 032B8 808354C8 1000002A */ beq $zero, $zero, .L80835574 +/* 032B0 808354C0 0C02901F */ jal SkelAnime_LinkChangeAnimationDefaultStop +/* 032B4 808354C4 8FA50024 */ lw $a1, 0x0024($sp) +/* 032B8 808354C8 1000002A */ beq $zero, $zero, .L80835574 /* 032BC 808354CC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L808354D0: /* 032C0 808354D0 86020834 */ lh $v0, 0x0834($s0) ## 00000834 .L808354D4: -/* 032C4 808354D4 10400002 */ beq $v0, $zero, .L808354E0 +/* 032C4 808354D4 10400002 */ beq $v0, $zero, .L808354E0 /* 032C8 808354D8 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = 00000000 /* 032CC 808354DC A6090834 */ sh $t1, 0x0834($s0) ## 00000834 .L808354E0: -/* 032D0 808354E0 0C20CEF3 */ jal func_80833BCC +/* 032D0 808354E0 0C20CEF3 */ jal func_80833BCC /* 032D4 808354E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032D8 808354E8 54400009 */ bnel $v0, $zero, .L80835510 +/* 032D8 808354E8 54400009 */ bnel $v0, $zero, .L80835510 /* 032DC 808354EC 86020834 */ lh $v0, 0x0834($s0) ## 00000834 /* 032E0 808354F0 920A06AD */ lbu $t2, 0x06AD($s0) ## 000006AD -/* 032E4 808354F4 55400006 */ bnel $t2, $zero, .L80835510 +/* 032E4 808354F4 55400006 */ bnel $t2, $zero, .L80835510 /* 032E8 808354F8 86020834 */ lh $v0, 0x0834($s0) ## 00000834 /* 032EC 808354FC 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 032F0 80835500 000B62C0 */ sll $t4, $t3, 11 -/* 032F4 80835504 05810007 */ bgez $t4, .L80835524 +/* 032F0 80835500 000B62C0 */ sll $t4, $t3, 11 +/* 032F4 80835504 05810007 */ bgez $t4, .L80835524 /* 032F8 80835508 00000000 */ nop /* 032FC 8083550C 86020834 */ lh $v0, 0x0834($s0) ## 00000834 .L80835510: -/* 03300 80835510 14400002 */ bne $v0, $zero, .L8083551C +/* 03300 80835510 14400002 */ bne $v0, $zero, .L8083551C /* 03304 80835514 244D0001 */ addiu $t5, $v0, 0x0001 ## $t5 = 00000001 /* 03308 80835518 A60D0834 */ sh $t5, 0x0834($s0) ## 00000834 .L8083551C: -/* 0330C 8083551C 10000015 */ beq $zero, $zero, .L80835574 +/* 0330C 8083551C 10000015 */ beq $zero, $zero, .L80835574 /* 03310 80835520 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80835524: -/* 03314 80835524 0C023C41 */ jal func_8008F104 +/* 03314 80835524 0C023C41 */ jal func_8008F104 /* 03318 80835528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0331C 8083552C 10400007 */ beq $v0, $zero, .L8083554C +/* 0331C 8083552C 10400007 */ beq $v0, $zero, .L8083554C /* 03320 80835530 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03324 80835534 3C058083 */ lui $a1, %hi(func_8083501C) ## $a1 = 80830000 /* 03328 80835538 24A5501C */ addiu $a1, $a1, %lo(func_8083501C) ## $a1 = 8083501C -/* 0332C 8083553C 0C20CD8E */ jal func_80833638 +/* 0332C 8083553C 0C20CD8E */ jal func_80833638 /* 03330 80835540 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03334 80835544 1000000A */ beq $zero, $zero, .L80835570 +/* 03334 80835544 1000000A */ beq $zero, $zero, .L80835570 /* 03338 80835548 A6000834 */ sh $zero, 0x0834($s0) ## 00000834 .L8083554C: /* 0333C 8083554C 3C058083 */ lui $a1, %hi(func_80835588) ## $a1 = 80830000 -/* 03340 80835550 0C20CD8E */ jal func_80833638 +/* 03340 80835550 0C20CD8E */ jal func_80833638 /* 03344 80835554 24A55588 */ addiu $a1, $a1, %lo(func_80835588) ## $a1 = 80835588 /* 03348 80835558 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 0334C 8083555C 24C626B0 */ addiu $a2, $a2, 0x26B0 ## $a2 = 040026B0 -/* 03350 80835560 8FA4002C */ lw $a0, 0x002C($sp) -/* 03354 80835564 0C02901F */ jal func_800A407C -/* 03358 80835568 8FA50024 */ lw $a1, 0x0024($sp) +/* 03350 80835560 8FA4002C */ lw $a0, 0x002C($sp) +/* 03354 80835564 0C02901F */ jal SkelAnime_LinkChangeAnimationDefaultStop +/* 03358 80835568 8FA50024 */ lw $a1, 0x0024($sp) /* 0335C 8083556C A6000834 */ sh $zero, 0x0834($s0) ## 00000834 .L80835570: /* 03360 80835570 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80835574: -/* 03364 80835574 8FBF001C */ lw $ra, 0x001C($sp) -/* 03368 80835578 8FB00018 */ lw $s0, 0x0018($sp) +/* 03364 80835574 8FBF001C */ lw $ra, 0x001C($sp) +/* 03368 80835578 8FB00018 */ lw $s0, 0x0018($sp) /* 0336C 8083557C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03370 80835580 03E00008 */ jr $ra +/* 03370 80835580 03E00008 */ jr $ra /* 03374 80835584 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s index 5f09ac6d65..c34c0de58a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s @@ -1,28 +1,28 @@ glabel func_80835688 /* 03478 80835688 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0347C 8083568C AFA5001C */ sw $a1, 0x001C($sp) +/* 0347C 8083568C AFA5001C */ sw $a1, 0x001C($sp) /* 03480 80835690 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 03484 80835694 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03488 80835698 AFA40018 */ sw $a0, 0x0018($sp) +/* 03484 80835694 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03488 80835698 AFA40018 */ sw $a0, 0x0018($sp) /* 0348C 8083569C 8CA603AC */ lw $a2, 0x03AC($a1) ## 000003AC -/* 03490 808356A0 AFA50018 */ sw $a1, 0x0018($sp) -/* 03494 808356A4 0C20D591 */ jal func_80835644 -/* 03498 808356A8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0349C 808356AC 1440000A */ bne $v0, $zero, .L808356D8 -/* 034A0 808356B0 8FA40018 */ lw $a0, 0x0018($sp) +/* 03490 808356A0 AFA50018 */ sw $a1, 0x0018($sp) +/* 03494 808356A4 0C20D591 */ jal func_80835644 +/* 03498 808356A8 8FA4001C */ lw $a0, 0x001C($sp) +/* 0349C 808356AC 1440000A */ bne $v0, $zero, .L808356D8 +/* 034A0 808356B0 8FA40018 */ lw $a0, 0x0018($sp) /* 034A4 808356B4 3C058083 */ lui $a1, %hi(func_808356E8) ## $a1 = 80830000 -/* 034A8 808356B8 0C20CD8E */ jal func_80833638 +/* 034A8 808356B8 0C20CD8E */ jal func_80833638 /* 034AC 808356BC 24A556E8 */ addiu $a1, $a1, %lo(func_808356E8) ## $a1 = 808356E8 -/* 034B0 808356C0 8FA50018 */ lw $a1, 0x0018($sp) +/* 034B0 808356C0 8FA50018 */ lw $a1, 0x0018($sp) /* 034B4 808356C4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 034B8 808356C8 24C62E10 */ addiu $a2, $a2, 0x2E10 ## $a2 = 04002E10 -/* 034BC 808356CC 8FA4001C */ lw $a0, 0x001C($sp) -/* 034C0 808356D0 0C029050 */ jal func_800A4140 +/* 034BC 808356CC 8FA4001C */ lw $a0, 0x001C($sp) +/* 034C0 808356D0 0C029050 */ jal SkelAnime_LinkChangeAnimationDefaultRepeat /* 034C4 808356D4 24A506C8 */ addiu $a1, $a1, 0x06C8 ## $a1 = 000006C8 .L808356D8: -/* 034C8 808356D8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 034C8 808356D8 8FBF0014 */ lw $ra, 0x0014($sp) /* 034CC 808356DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 034D0 808356E0 03E00008 */ jr $ra +/* 034D0 808356E0 03E00008 */ jr $ra /* 034D4 808356E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s index e030140e11..9b7186e5e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s @@ -1,73 +1,73 @@ glabel func_808356E8 /* 034D8 808356E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 034DC 808356EC AFBF001C */ sw $ra, 0x001C($sp) -/* 034E0 808356F0 AFB10018 */ sw $s1, 0x0018($sp) -/* 034E4 808356F4 AFB00014 */ sw $s0, 0x0014($sp) +/* 034DC 808356EC AFBF001C */ sw $ra, 0x001C($sp) +/* 034E0 808356F0 AFB10018 */ sw $s1, 0x0018($sp) +/* 034E4 808356F4 AFB00014 */ sw $s0, 0x0014($sp) /* 034E8 808356F8 8C8E03AC */ lw $t6, 0x03AC($a0) ## 000003AC /* 034EC 808356FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 034F0 80835700 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 034F4 80835704 15C00004 */ bne $t6, $zero, .L80835718 -/* 034F8 80835708 AFAE0024 */ sw $t6, 0x0024($sp) +/* 034F4 80835704 15C00004 */ bne $t6, $zero, .L80835718 +/* 034F8 80835708 AFAE0024 */ sw $t6, 0x0024($sp) /* 034FC 8083570C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03500 80835710 0C20D191 */ jal func_80834644 +/* 03500 80835710 0C20D191 */ jal func_80834644 /* 03504 80835714 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 .L80835718: /* 03508 80835718 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0350C 8083571C 0C20D1D6 */ jal func_80834758 +/* 0350C 8083571C 0C20D1D6 */ jal func_80834758 /* 03510 80835720 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03514 80835724 50400004 */ beql $v0, $zero, .L80835738 +/* 03514 80835724 50400004 */ beql $v0, $zero, .L80835738 /* 03518 80835728 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 0351C 8083572C 10000029 */ beq $zero, $zero, .L808357D4 +/* 0351C 8083572C 10000029 */ beq $zero, $zero, .L808357D4 /* 03520 80835730 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 03524 80835734 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C .L80835738: /* 03528 80835738 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 0352C 8083573C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03530 80835740 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 03534 80835744 13200021 */ beq $t9, $zero, .L808357CC +/* 03534 80835744 13200021 */ beq $t9, $zero, .L808357CC /* 03538 80835748 00000000 */ nop /* 0353C 8083574C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03540 80835750 0C028EF0 */ jal func_800A3BC0 -/* 03544 80835754 AFA50020 */ sw $a1, 0x0020($sp) -/* 03548 80835758 10400005 */ beq $v0, $zero, .L80835770 -/* 0354C 8083575C 8FA50020 */ lw $a1, 0x0020($sp) +/* 03540 80835750 0C028EF0 */ jal func_800A3BC0 +/* 03544 80835754 AFA50020 */ sw $a1, 0x0020($sp) +/* 03548 80835758 10400005 */ beq $v0, $zero, .L80835770 +/* 0354C 8083575C 8FA50020 */ lw $a1, 0x0020($sp) /* 03550 80835760 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 03554 80835764 24C62E10 */ addiu $a2, $a2, 0x2E10 ## $a2 = 04002E10 -/* 03558 80835768 0C029050 */ jal func_800A4140 +/* 03558 80835768 0C029050 */ jal SkelAnime_LinkChangeAnimationDefaultRepeat /* 0355C 8083576C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80835770: -/* 03560 80835770 8FA80024 */ lw $t0, 0x0024($sp) +/* 03560 80835770 8FA80024 */ lw $t0, 0x0024($sp) /* 03564 80835774 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 03568 80835778 85090000 */ lh $t1, 0x0000($t0) ## 00000000 -/* 0356C 8083577C 15210011 */ bne $t1, $at, .L808357C4 +/* 0356C 8083577C 15210011 */ bne $t1, $at, .L808357C4 /* 03570 80835780 00000000 */ nop /* 03574 80835784 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 03578 80835788 C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 -/* 0357C 8083578C 4604303E */ c.le.s $f6, $f4 +/* 0357C 8083578C 4604303E */ c.le.s $f6, $f4 /* 03580 80835790 00000000 */ nop -/* 03584 80835794 4500000B */ bc1f .L808357C4 +/* 03584 80835794 4500000B */ bc1f .L808357C4 /* 03588 80835798 00000000 */ nop /* 0358C 8083579C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 03590 808357A0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 03594 808357A4 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 03598 808357A8 4600848D */ trunc.w.s $f18, $f16 +/* 03598 808357A8 4600848D */ trunc.w.s $f18, $f16 /* 0359C 808357AC 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 /* 035A0 808357B0 44815000 */ mtc1 $at, $f10 ## $f10 = -0.50 /* 035A4 808357B4 E6080070 */ swc1 $f8, 0x0070($s0) ## 00000070 -/* 035A8 808357B8 440B9000 */ mfc1 $t3, $f18 +/* 035A8 808357B8 440B9000 */ mfc1 $t3, $f18 /* 035AC 808357BC E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 035B0 808357C0 A60B0894 */ sh $t3, 0x0894($s0) ## 00000894 .L808357C4: -/* 035B4 808357C4 10000003 */ beq $zero, $zero, .L808357D4 +/* 035B4 808357C4 10000003 */ beq $zero, $zero, .L808357D4 /* 035B8 808357C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L808357CC: -/* 035BC 808357CC 0C20D217 */ jal func_8083485C +/* 035BC 808357CC 0C20D217 */ jal func_8083485C /* 035C0 808357D0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L808357D4: -/* 035C4 808357D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 035C8 808357D8 8FB00014 */ lw $s0, 0x0014($sp) -/* 035CC 808357DC 8FB10018 */ lw $s1, 0x0018($sp) -/* 035D0 808357E0 03E00008 */ jr $ra +/* 035C4 808357D4 8FBF001C */ lw $ra, 0x001C($sp) +/* 035C8 808357D8 8FB00014 */ lw $s0, 0x0014($sp) +/* 035CC 808357DC 8FB10018 */ lw $s1, 0x0018($sp) +/* 035D0 808357E0 03E00008 */ jr $ra /* 035D4 808357E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s index 9c68f08440..a12a26ffad 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s @@ -1,31 +1,31 @@ glabel func_80835884 /* 03674 80835884 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03678 80835888 AFA40020 */ sw $a0, 0x0020($sp) -/* 0367C 8083588C AFA50024 */ sw $a1, 0x0024($sp) +/* 03678 80835888 AFA40020 */ sw $a0, 0x0020($sp) +/* 0367C 8083588C AFA50024 */ sw $a1, 0x0024($sp) /* 03680 80835890 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03684 80835894 8FA50020 */ lw $a1, 0x0020($sp) -/* 03688 80835898 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03684 80835894 8FA50020 */ lw $a1, 0x0020($sp) +/* 03688 80835898 AFBF0014 */ sw $ra, 0x0014($sp) /* 0368C 8083589C 24A506C8 */ addiu $a1, $a1, 0x06C8 ## $a1 = 000006C8 -/* 03690 808358A0 0C028EF0 */ jal func_800A3BC0 -/* 03694 808358A4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03698 808358A8 10400009 */ beq $v0, $zero, .L808358D0 -/* 0369C 808358AC 8FA40020 */ lw $a0, 0x0020($sp) +/* 03690 808358A0 0C028EF0 */ jal func_800A3BC0 +/* 03694 808358A4 AFA5001C */ sw $a1, 0x001C($sp) +/* 03698 808358A8 10400009 */ beq $v0, $zero, .L808358D0 +/* 0369C 808358AC 8FA40020 */ lw $a0, 0x0020($sp) /* 036A0 808358B0 3C058083 */ lui $a1, %hi(func_808358F0) ## $a1 = 80830000 -/* 036A4 808358B4 0C20CD8E */ jal func_80833638 +/* 036A4 808358B4 0C20CD8E */ jal func_80833638 /* 036A8 808358B8 24A558F0 */ addiu $a1, $a1, %lo(func_808358F0) ## $a1 = 808358F0 /* 036AC 808358BC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 036B0 808358C0 24C62638 */ addiu $a2, $a2, 0x2638 ## $a2 = 04002638 -/* 036B4 808358C4 8FA40024 */ lw $a0, 0x0024($sp) -/* 036B8 808358C8 0C029050 */ jal func_800A4140 -/* 036BC 808358CC 8FA5001C */ lw $a1, 0x001C($sp) +/* 036B4 808358C4 8FA40024 */ lw $a0, 0x0024($sp) +/* 036B8 808358C8 0C029050 */ jal SkelAnime_LinkChangeAnimationDefaultRepeat +/* 036BC 808358CC 8FA5001C */ lw $a1, 0x001C($sp) .L808358D0: -/* 036C0 808358D0 8FA40020 */ lw $a0, 0x0020($sp) -/* 036C4 808358D4 0C20D3AE */ jal func_80834EB8 -/* 036C8 808358D8 8FA50024 */ lw $a1, 0x0024($sp) -/* 036CC 808358DC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 036C0 808358D0 8FA40020 */ lw $a0, 0x0020($sp) +/* 036C4 808358D4 0C20D3AE */ jal func_80834EB8 +/* 036C8 808358D8 8FA50024 */ lw $a1, 0x0024($sp) +/* 036CC 808358DC 8FBF0014 */ lw $ra, 0x0014($sp) /* 036D0 808358E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 036D4 808358E4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 036D8 808358E8 03E00008 */ jr $ra +/* 036D8 808358E8 03E00008 */ jr $ra /* 036DC 808358EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s index 48ad61b41e..16e8724231 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s @@ -63,7 +63,7 @@ glabel func_808358F0 /* 037C8 808359D8 10000001 */ beq $zero, $zero, .L808359E0 /* 037CC 808359DC 24C62608 */ addiu $a2, $a2, 0x2608 ## $a2 = 04002608 .L808359E0: -/* 037D0 808359E0 0C02901F */ jal func_800A407C +/* 037D0 808359E0 0C02901F */ jal SkelAnime_LinkChangeAnimationDefaultStop /* 037D4 808359E4 8FA50024 */ lw $a1, 0x0024($sp) .L808359E8: /* 037D8 808359E8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s index eded448249..7d1aa94866 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s @@ -1,47 +1,47 @@ glabel func_80835B60 /* 03950 80835B60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03954 80835B64 AFB00018 */ sw $s0, 0x0018($sp) +/* 03954 80835B64 AFB00018 */ sw $s0, 0x0018($sp) /* 03958 80835B68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0395C 80835B6C AFBF001C */ sw $ra, 0x001C($sp) -/* 03960 80835B70 AFA50024 */ sw $a1, 0x0024($sp) +/* 0395C 80835B6C AFBF001C */ sw $ra, 0x001C($sp) +/* 03960 80835B70 AFA50024 */ sw $a1, 0x0024($sp) /* 03964 80835B74 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03968 80835B78 0C20D1D6 */ jal func_80834758 +/* 03968 80835B78 0C20D1D6 */ jal func_80834758 /* 0396C 80835B7C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03970 80835B80 50400004 */ beql $v0, $zero, .L80835B94 +/* 03970 80835B80 50400004 */ beql $v0, $zero, .L80835B94 /* 03974 80835B84 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 03978 80835B88 1000001A */ beq $zero, $zero, .L80835BF4 +/* 03978 80835B88 1000001A */ beq $zero, $zero, .L80835BF4 /* 0397C 80835B8C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 03980 80835B90 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C .L80835B94: /* 03984 80835B94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03988 80835B98 3C058083 */ lui $a1, %hi(func_80835C08) ## $a1 = 80830000 -/* 0398C 80835B9C 000E7980 */ sll $t7, $t6, 6 -/* 03990 80835BA0 05E00014 */ bltz $t7, .L80835BF4 +/* 0398C 80835B9C 000E7980 */ sll $t7, $t6, 6 +/* 03990 80835BA0 05E00014 */ bltz $t7, .L80835BF4 /* 03994 80835BA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03998 80835BA8 0C20CD8E */ jal func_80833638 +/* 03998 80835BA8 0C20CD8E */ jal func_80833638 /* 0399C 80835BAC 24A55C08 */ addiu $a1, $a1, %lo(func_80835C08) ## $a1 = 80835C08 /* 039A0 80835BB0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 039A4 80835BB4 24C625F8 */ addiu $a2, $a2, 0x25F8 ## $a2 = 040025F8 -/* 039A8 80835BB8 8FA40024 */ lw $a0, 0x0024($sp) -/* 039AC 80835BBC 0C02901F */ jal func_800A407C +/* 039A8 80835BB8 8FA40024 */ lw $a0, 0x0024($sp) +/* 039AC 80835BBC 0C02901F */ jal SkelAnime_LinkChangeAnimationDefaultStop /* 039B0 80835BC0 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 039B4 80835BC4 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 /* 039B8 80835BC8 24A55EF8 */ addiu $a1, $a1, 0x5EF8 ## $a1 = 80125EF8 -/* 039BC 80835BCC 0C20D5FA */ jal func_808357E8 +/* 039BC 80835BCC 0C20D5FA */ jal func_808357E8 /* 039C0 80835BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 039C4 80835BD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039C8 80835BD8 0C00BDF7 */ jal func_8002F7DC +/* 039C8 80835BD8 0C00BDF7 */ jal func_8002F7DC /* 039CC 80835BDC 24050836 */ addiu $a1, $zero, 0x0836 ## $a1 = 00000836 /* 039D0 80835BE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039D4 80835BE4 0C20C9A6 */ jal func_80832698 +/* 039D4 80835BE4 0C20C9A6 */ jal func_80832698 /* 039D8 80835BE8 24056800 */ addiu $a1, $zero, 0x6800 ## $a1 = 00006800 -/* 039DC 80835BEC 10000001 */ beq $zero, $zero, .L80835BF4 +/* 039DC 80835BEC 10000001 */ beq $zero, $zero, .L80835BF4 /* 039E0 80835BF0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80835BF4: -/* 039E4 80835BF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 039E8 80835BF8 8FB00018 */ lw $s0, 0x0018($sp) +/* 039E4 80835BF4 8FBF001C */ lw $ra, 0x001C($sp) +/* 039E8 80835BF8 8FB00018 */ lw $s0, 0x0018($sp) /* 039EC 80835BFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 039F0 80835C00 03E00008 */ jr $ra +/* 039F0 80835C00 03E00008 */ jr $ra /* 039F4 80835C04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s index ea947b773c..57a431bb6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s @@ -1,99 +1,99 @@ glabel func_808382DC /* 060CC 808382DC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 060D0 808382E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 060D4 808382E4 AFB00028 */ sw $s0, 0x0028($sp) -/* 060D8 808382E8 AFA50074 */ sw $a1, 0x0074($sp) +/* 060D0 808382E0 AFBF002C */ sw $ra, 0x002C($sp) +/* 060D4 808382E4 AFB00028 */ sw $s0, 0x0028($sp) +/* 060D8 808382E8 AFA50074 */ sw $a1, 0x0074($sp) /* 060DC 808382EC 808E0A86 */ lb $t6, 0x0A86($a0) ## 00000A86 /* 060E0 808382F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 060E4 808382F4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 060E8 808382F8 11C00009 */ beq $t6, $zero, .L80838320 +/* 060E8 808382F8 11C00009 */ beq $t6, $zero, .L80838320 /* 060EC 808382FC 00000000 */ nop -/* 060F0 80838300 0C023A37 */ jal func_8008E8DC +/* 060F0 80838300 0C023A37 */ jal func_8008E8DC /* 060F4 80838304 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 060F8 80838308 14400187 */ bne $v0, $zero, .L80838928 -/* 060FC 8083830C 8FA40074 */ lw $a0, 0x0074($sp) -/* 06100 80838310 0C214C38 */ jal func_808530E0 +/* 060F8 80838308 14400187 */ bne $v0, $zero, .L80838928 +/* 060FC 8083830C 8FA40074 */ lw $a0, 0x0074($sp) +/* 06100 80838310 0C214C38 */ jal func_808530E0 /* 06104 80838314 2405FFF0 */ addiu $a1, $zero, 0xFFF0 ## $a1 = FFFFFFF0 -/* 06108 80838318 10000183 */ beq $zero, $zero, .L80838928 +/* 06108 80838318 10000183 */ beq $zero, $zero, .L80838928 /* 0610C 8083831C A2000A86 */ sb $zero, 0x0A86($s0) ## 00000A86 .L80838320: -/* 06110 80838320 0C00B721 */ jal func_8002DC84 +/* 06110 80838320 0C00B721 */ jal func_8002DC84 /* 06114 80838324 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06118 80838328 C60406C4 */ lwc1 $f4, 0x06C4($s0) ## 000006C4 /* 0611C 8083832C C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 /* 06120 80838330 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 06124 80838334 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 06128 80838338 46062202 */ mul.s $f8, $f4, $f6 +/* 06128 80838338 46062202 */ mul.s $f8, $f4, $f6 /* 0612C 8083833C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 06130 80838340 460A0401 */ sub.s $f16, $f0, $f10 +/* 06130 80838340 460A0401 */ sub.s $f16, $f0, $f10 /* 06134 80838344 24056805 */ addiu $a1, $zero, 0x6805 ## $a1 = 00006805 -/* 06138 80838348 4608803C */ c.lt.s $f16, $f8 +/* 06138 80838348 4608803C */ c.lt.s $f16, $f8 /* 0613C 8083834C 00000000 */ nop -/* 06140 80838350 45000002 */ bc1f .L8083835C +/* 06140 80838350 45000002 */ bc1f .L8083835C /* 06144 80838354 00000000 */ nop /* 06148 80838358 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8083835C: -/* 0614C 8083835C 5440000F */ bnel $v0, $zero, .L8083839C +/* 0614C 8083835C 5440000F */ bnel $v0, $zero, .L8083839C /* 06150 80838360 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06154 80838364 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 /* 06158 80838368 3C048085 */ lui $a0, %hi(D_808535E4) ## $a0 = 80850000 /* 0615C 8083836C 31F80100 */ andi $t8, $t7, 0x0100 ## $t8 = 00000000 -/* 06160 80838370 5700000A */ bnel $t8, $zero, .L8083839C +/* 06160 80838370 5700000A */ bnel $t8, $zero, .L8083839C /* 06164 80838374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06168 80838378 8C8435E4 */ lw $a0, %lo(D_808535E4)($a0) +/* 06168 80838378 8C8435E4 */ lw $a0, %lo(D_808535E4)($a0) /* 0616C 8083837C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 06170 80838380 50810006 */ beql $a0, $at, .L8083839C +/* 06170 80838380 50810006 */ beql $a0, $at, .L8083839C /* 06174 80838384 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06178 80838388 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 -/* 0617C 8083838C 00194800 */ sll $t1, $t9, 0 -/* 06180 80838390 05230044 */ bgezl $t1, .L808384A4 +/* 0617C 8083838C 00194800 */ sll $t1, $t9, 0 +/* 06180 80838390 05230044 */ bgezl $t1, .L808384A4 /* 06184 80838394 920208A1 */ lbu $v0, 0x08A1($s0) ## 000008A1 /* 06188 80838398 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8083839C: -/* 0618C 8083839C 0C20C9A6 */ jal func_80832698 -/* 06190 808383A0 AFA20068 */ sw $v0, 0x0068($sp) -/* 06194 808383A4 8FA20068 */ lw $v0, 0x0068($sp) -/* 06198 808383A8 8FA40074 */ lw $a0, 0x0074($sp) -/* 0619C 808383AC 50400008 */ beql $v0, $zero, .L808383D0 +/* 0618C 8083839C 0C20C9A6 */ jal func_80832698 +/* 06190 808383A0 AFA20068 */ sw $v0, 0x0068($sp) +/* 06194 808383A4 8FA20068 */ lw $v0, 0x0068($sp) +/* 06198 808383A8 8FA40074 */ lw $a0, 0x0074($sp) +/* 0619C 808383AC 50400008 */ beql $v0, $zero, .L808383D0 /* 061A0 808383B0 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 -/* 061A4 808383B4 0C030322 */ jal func_800C0C88 -/* 061A8 808383B8 8FA40074 */ lw $a0, 0x0074($sp) -/* 061AC 808383BC 0C026528 */ jal func_800994A0 -/* 061B0 808383C0 8FA40074 */ lw $a0, 0x0074($sp) -/* 061B4 808383C4 1000002B */ beq $zero, $zero, .L80838474 +/* 061A4 808383B4 0C030322 */ jal func_800C0C88 +/* 061A8 808383B8 8FA40074 */ lw $a0, 0x0074($sp) +/* 061AC 808383BC 0C026528 */ jal func_800994A0 +/* 061B0 808383C0 8FA40074 */ lw $a0, 0x0074($sp) +/* 061B4 808383C4 1000002B */ beq $zero, $zero, .L80838474 /* 061B8 808383C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 061BC 808383CC 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 .L808383D0: /* 061C0 808383D0 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 061C4 808383D4 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 061C8 808383D8 14620004 */ bne $v1, $v0, .L808383EC -/* 061CC 808383DC 01445021 */ addu $t2, $t2, $a0 +/* 061C8 808383D8 14620004 */ bne $v1, $v0, .L808383EC +/* 061CC 808383DC 01445021 */ addu $t2, $t2, $a0 /* 061D0 808383E0 814A1CBC */ lb $t2, 0x1CBC($t2) ## 00011CBC /* 061D4 808383E4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 061D8 808383E8 11410008 */ beq $t2, $at, .L8083840C +/* 061D8 808383E8 11410008 */ beq $t2, $at, .L8083840C .L808383EC: /* 061DC 808383EC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 061E0 808383F0 1441001D */ bne $v0, $at, .L80838468 +/* 061E0 808383F0 1441001D */ bne $v0, $at, .L80838468 /* 061E4 808383F4 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 061E8 808383F8 01645821 */ addu $t3, $t3, $a0 +/* 061E8 808383F8 01645821 */ addu $t3, $t3, $a0 /* 061EC 808383FC 816B1CBC */ lb $t3, 0x1CBC($t3) ## 00011CBC /* 061F0 80838400 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 061F4 80838404 15610018 */ bne $t3, $at, .L80838468 +/* 061F4 80838404 15610018 */ bne $t3, $at, .L80838468 /* 061F8 80838408 00000000 */ nop .L8083840C: -/* 061FC 8083840C 14620004 */ bne $v1, $v0, .L80838420 +/* 061FC 8083840C 14620004 */ bne $v1, $v0, .L80838420 /* 06200 80838410 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 06204 80838414 3C028085 */ lui $v0, %hi(D_808544D4) ## $v0 = 80850000 -/* 06208 80838418 10000003 */ beq $zero, $zero, .L80838428 +/* 06208 80838418 10000003 */ beq $zero, $zero, .L80838428 /* 0620C 8083841C 244244D4 */ addiu $v0, $v0, %lo(D_808544D4) ## $v0 = 808544D4 .L80838420: /* 06210 80838420 3C028085 */ lui $v0, %hi(D_808544E4) ## $v0 = 80850000 /* 06214 80838424 244244E4 */ addiu $v0, $v0, %lo(D_808544E4) ## $v0 = 808544E4 .L80838428: /* 06218 80838428 24060DFF */ addiu $a2, $zero, 0x0DFF ## $a2 = 00000DFF -/* 0621C 8083842C 0C0302BD */ jal func_800C0AF4 -/* 06220 80838430 AFA20060 */ sw $v0, 0x0060($sp) -/* 06224 80838434 8FA20060 */ lw $v0, 0x0060($sp) +/* 0621C 8083842C 0C0302BD */ jal func_800C0AF4 +/* 06220 80838430 AFA20060 */ sw $v0, 0x0060($sp) +/* 06224 80838434 8FA20060 */ lw $v0, 0x0060($sp) /* 06228 80838438 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 0622C 8083843C 258CF9C8 */ addiu $t4, $t4, 0xF9C8 ## $t4 = 8015F9C8 /* 06230 80838440 8C4E0000 */ lw $t6, 0x0000($v0) ## 00000000 @@ -104,43 +104,43 @@ glabel func_808382DC /* 06244 80838454 8C4E0008 */ lw $t6, 0x0008($v0) ## 00000008 /* 06248 80838458 AD8E0008 */ sw $t6, 0x0008($t4) ## 8015F9D0 /* 0624C 8083845C 844F000C */ lh $t7, 0x000C($v0) ## 0000000C -/* 06250 80838460 8FA40074 */ lw $a0, 0x0074($sp) +/* 06250 80838460 8FA40074 */ lw $a0, 0x0074($sp) /* 06254 80838464 A42FF9D4 */ sh $t7, -0x062C($at) ## 8015F9D4 .L80838468: -/* 06258 80838468 0C0302D8 */ jal func_800C0B60 +/* 06258 80838468 0C0302D8 */ jal func_800C0B60 /* 0625C 8083846C 00000000 */ nop /* 06260 80838470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80838474: -/* 06264 80838474 0C20C9A6 */ jal func_80832698 +/* 06264 80838474 0C20C9A6 */ jal func_80832698 /* 06268 80838478 2405680C */ addiu $a1, $zero, 0x680C ## $a1 = 0000680C -/* 0626C 8083847C 8FB90074 */ lw $t9, 0x0074($sp) +/* 0626C 8083847C 8FB90074 */ lw $t9, 0x0074($sp) /* 06270 80838480 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 06274 80838484 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 06278 80838488 00390821 */ addu $at, $at, $t9 +/* 06278 80838488 00390821 */ addu $at, $at, $t9 /* 0627C 8083848C A0381DE9 */ sb $t8, 0x1DE9($at) ## 00011DE9 -/* 06280 80838490 0C01E221 */ jal func_80078884 +/* 06280 80838490 0C01E221 */ jal func_80078884 /* 06284 80838494 24045801 */ addiu $a0, $zero, 0x5801 ## $a0 = 00005801 -/* 06288 80838498 10000124 */ beq $zero, $zero, .L8083892C +/* 06288 80838498 10000124 */ beq $zero, $zero, .L8083892C /* 0628C 8083849C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 06290 808384A0 920208A1 */ lbu $v0, 0x08A1($s0) ## 000008A1 .L808384A4: -/* 06294 808384A4 10400023 */ beq $v0, $zero, .L80838534 -/* 06298 808384A8 28410002 */ slti $at, $v0, 0x0002 -/* 0629C 808384AC 10200003 */ beq $at, $zero, .L808384BC +/* 06294 808384A4 10400023 */ beq $v0, $zero, .L80838534 +/* 06298 808384A8 28410002 */ slti $at, $v0, 0x0002 +/* 0629C 808384AC 10200003 */ beq $at, $zero, .L808384BC /* 062A0 808384B0 27AA005C */ addiu $t2, $sp, 0x005C ## $t2 = FFFFFFEC /* 062A4 808384B4 82090A78 */ lb $t1, 0x0A78($s0) ## 00000A78 -/* 062A8 808384B8 1520001E */ bne $t1, $zero, .L80838534 +/* 062A8 808384B8 1520001E */ bne $t1, $zero, .L80838534 .L808384BC: /* 062AC 808384BC 3C0B8085 */ lui $t3, %hi(D_808544D0) ## $t3 = 80850000 /* 062B0 808384C0 256B44D0 */ addiu $t3, $t3, %lo(D_808544D0) ## $t3 = 808544D0 /* 062B4 808384C4 996D0002 */ lwr $t5, 0x0002($t3) ## 808544D2 /* 062B8 808384C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 062BC 808384CC 0C20E0A0 */ jal func_80838280 +/* 062BC 808384CC 0C20E0A0 */ jal func_80838280 /* 062C0 808384D0 B94D0002 */ swr $t5, 0x0002($t2) ## FFFFFFEE /* 062C4 808384D4 920208A1 */ lbu $v0, 0x08A1($s0) ## 000008A1 /* 062C8 808384D8 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 062CC 808384DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 062D0 808384E0 14620004 */ bne $v1, $v0, .L808384F4 +/* 062D0 808384E0 14620004 */ bne $v1, $v0, .L808384F4 /* 062D4 808384E4 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 062D8 808384E8 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 /* 062DC 808384EC A20E0891 */ sb $t6, 0x0891($s0) ## 00000891 @@ -149,276 +149,276 @@ glabel func_808382DC /* 062E4 808384F4 920F00B0 */ lbu $t7, 0x00B0($s0) ## 000000B0 /* 062E8 808384F8 921808A0 */ lbu $t8, 0x08A0($s0) ## 000008A0 /* 062EC 808384FC C61208A8 */ lwc1 $f18, 0x08A8($s0) ## 000008A8 -/* 062F0 80838500 03A23021 */ addu $a2, $sp, $v0 -/* 062F4 80838504 01F8C821 */ addu $t9, $t7, $t8 +/* 062F0 80838500 03A23021 */ addu $a2, $sp, $v0 +/* 062F4 80838504 01F8C821 */ addu $t9, $t7, $t8 /* 062F8 80838508 A21900B0 */ sb $t9, 0x00B0($s0) ## 000000B0 /* 062FC 8083850C 90C6005B */ lbu $a2, 0x005B($a2) ## 0000005B /* 06300 80838510 8E0708A4 */ lw $a3, 0x08A4($s0) ## 000008A4 -/* 06304 80838514 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 06304 80838514 E7B20010 */ swc1 $f18, 0x0010($sp) /* 06308 80838518 860908A2 */ lh $t1, 0x08A2($s0) ## 000008A2 -/* 0630C 8083851C AFAA0018 */ sw $t2, 0x0018($sp) -/* 06310 80838520 8FA40074 */ lw $a0, 0x0074($sp) -/* 06314 80838524 0C20DF03 */ jal func_80837C0C -/* 06318 80838528 AFA90014 */ sw $t1, 0x0014($sp) -/* 0631C 8083852C 100000FF */ beq $zero, $zero, .L8083892C +/* 0630C 8083851C AFAA0018 */ sw $t2, 0x0018($sp) +/* 06310 80838520 8FA40074 */ lw $a0, 0x0074($sp) +/* 06314 80838524 0C20DF03 */ jal func_80837C0C +/* 06318 80838528 AFA90014 */ sw $t1, 0x0014($sp) +/* 0631C 8083852C 100000FF */ beq $zero, $zero, .L8083892C /* 06320 80838530 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80838534: /* 06324 80838534 920805F5 */ lbu $t0, 0x05F5($s0) ## 000005F5 /* 06328 80838538 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 /* 0632C 8083853C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 06330 80838540 31080080 */ andi $t0, $t0, 0x0080 ## $t0 = 00000000 -/* 06334 80838544 0008402B */ sltu $t0, $zero, $t0 -/* 06338 80838548 1500000F */ bne $t0, $zero, .L80838588 +/* 06334 80838544 0008402B */ sltu $t0, $zero, $t0 +/* 06338 80838548 1500000F */ bne $t0, $zero, .L80838588 /* 0633C 8083854C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 06340 80838550 82030A78 */ lb $v1, 0x0A78($s0) ## 00000A78 -/* 06344 80838554 04630069 */ bgezl $v1, .L808386FC +/* 06344 80838554 04630069 */ bgezl $v1, .L808386FC /* 06348 80838558 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 /* 0634C 8083855C 920B04A9 */ lbu $t3, 0x04A9($s0) ## 000004A9 /* 06350 80838560 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 -/* 06354 80838564 51800065 */ beql $t4, $zero, .L808386FC +/* 06354 80838564 51800065 */ beql $t4, $zero, .L808386FC /* 06358 80838568 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 /* 0635C 8083856C 8E0204C8 */ lw $v0, 0x04C8($s0) ## 000004C8 -/* 06360 80838570 50400062 */ beql $v0, $zero, .L808386FC +/* 06360 80838570 50400062 */ beql $v0, $zero, .L808386FC /* 06364 80838574 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 /* 06368 80838578 904D0010 */ lbu $t5, 0x0010($v0) ## 00000011 -/* 0636C 8083857C 000D7080 */ sll $t6, $t5, 2 -/* 06370 80838580 05C3005E */ bgezl $t6, .L808386FC +/* 0636C 8083857C 000D7080 */ sll $t6, $t5, 2 +/* 06370 80838580 05C3005E */ bgezl $t6, .L808386FC /* 06374 80838584 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 .L80838588: /* 06378 80838588 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0637C 8083858C AFA00010 */ sw $zero, 0x0010($sp) -/* 06380 80838590 0C20C993 */ jal func_8083264C -/* 06384 80838594 AFA80064 */ sw $t0, 0x0064($sp) -/* 06388 80838598 0C023A74 */ jal func_8008E9D0 +/* 0637C 8083858C AFA00010 */ sw $zero, 0x0010($sp) +/* 06380 80838590 0C20C993 */ jal func_8083264C +/* 06384 80838594 AFA80064 */ sw $t0, 0x0064($sp) +/* 06388 80838598 0C023A74 */ jal func_8008E9D0 /* 0638C 8083859C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06390 808385A0 54400049 */ bnel $v0, $zero, .L808386C8 -/* 06394 808385A4 8FA90064 */ lw $t1, 0x0064($sp) +/* 06390 808385A0 54400049 */ bnel $v0, $zero, .L808386C8 +/* 06394 808385A4 8FA90064 */ lw $t1, 0x0064($sp) /* 06398 808385A8 820F0A78 */ lb $t7, 0x0A78($s0) ## 00000A78 /* 0639C 808385AC 3C198084 */ lui $t9, %hi(func_80843188) ## $t9 = 80840000 -/* 063A0 808385B0 05E2003B */ bltzl $t7, .L808386A0 +/* 063A0 808385B0 05E2003B */ bltzl $t7, .L808386A0 /* 063A4 808385B4 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C /* 063A8 808385B8 8E180674 */ lw $t8, 0x0674($s0) ## 00000674 /* 063AC 808385BC 27393188 */ addiu $t9, $t9, %lo(func_80843188) ## $t9 = 80843188 /* 063B0 808385C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 063B4 808385C4 03194826 */ xor $t1, $t8, $t9 -/* 063B8 808385C8 2D290001 */ sltiu $t1, $t1, 0x0001 -/* 063BC 808385CC 0C20CCAE */ jal func_808332B8 -/* 063C0 808385D0 AFA90054 */ sw $t1, 0x0054($sp) -/* 063C4 808385D4 14400006 */ bne $v0, $zero, .L808385F0 -/* 063C8 808385D8 8FA40074 */ lw $a0, 0x0074($sp) +/* 063B4 808385C4 03194826 */ xor $t1, $t8, $t9 +/* 063B8 808385C8 2D290001 */ sltiu $t1, $t1, 0x0001 +/* 063BC 808385CC 0C20CCAE */ jal func_808332B8 +/* 063C0 808385D0 AFA90054 */ sw $t1, 0x0054($sp) +/* 063C4 808385D4 14400006 */ bne $v0, $zero, .L808385F0 +/* 063C8 808385D8 8FA40074 */ lw $a0, 0x0074($sp) /* 063CC 808385DC 3C068084 */ lui $a2, %hi(func_808435C4) ## $a2 = 80840000 /* 063D0 808385E0 24C635C4 */ addiu $a2, $a2, %lo(func_808435C4) ## $a2 = 808435C4 /* 063D4 808385E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 063D8 808385E8 0C20D716 */ jal func_80835C58 +/* 063D8 808385E8 0C20D716 */ jal func_80835C58 /* 063DC 808385EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 .L808385F0: -/* 063E0 808385F0 8FA20054 */ lw $v0, 0x0054($sp) +/* 063E0 808385F0 8FA20054 */ lw $v0, 0x0054($sp) /* 063E4 808385F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 063E8 808385F8 3C058083 */ lui $a1, %hi(func_80834BD4) ## $a1 = 80830000 -/* 063EC 808385FC 00025600 */ sll $t2, $v0, 24 -/* 063F0 80838600 000A5E03 */ sra $t3, $t2, 24 -/* 063F4 80838604 1560001C */ bne $t3, $zero, .L80838678 +/* 063EC 808385FC 00025600 */ sll $t2, $v0, 24 +/* 063F0 80838600 000A5E03 */ sra $t3, $t2, 24 +/* 063F4 80838604 1560001C */ bne $t3, $zero, .L80838678 /* 063F8 80838608 A202084F */ sb $v0, 0x084F($s0) ## 0000084F -/* 063FC 8083860C 0C20CD8E */ jal func_80833638 +/* 063FC 8083860C 0C20CD8E */ jal func_80833638 /* 06400 80838610 24A54BD4 */ addiu $a1, $a1, %lo(func_80834BD4) ## $a1 = 80834BD4 /* 06404 80838614 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 06408 80838618 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 0640C 8083861C C6040870 */ lwc1 $f4, 0x0870($s0) ## 00000870 -/* 06410 80838620 4606203C */ c.lt.s $f4, $f6 +/* 06410 80838620 4606203C */ c.lt.s $f4, $f6 /* 06414 80838624 00000000 */ nop -/* 06418 80838628 45000008 */ bc1f .L8083864C +/* 06418 80838628 45000008 */ bc1f .L8083864C /* 0641C 8083862C 00000000 */ nop -/* 06420 80838630 0C023C68 */ jal func_8008F1A0 +/* 06420 80838630 0C023C68 */ jal func_8008F1A0 /* 06424 80838634 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06428 80838638 00026080 */ sll $t4, $v0, 2 +/* 06428 80838638 00026080 */ sll $t4, $v0, 2 /* 0642C 8083863C 3C068085 */ lui $a2, %hi(D_808543BC) ## $a2 = 80850000 -/* 06430 80838640 00CC3021 */ addu $a2, $a2, $t4 -/* 06434 80838644 10000007 */ beq $zero, $zero, .L80838664 -/* 06438 80838648 8CC643BC */ lw $a2, %lo(D_808543BC)($a2) +/* 06430 80838640 00CC3021 */ addu $a2, $a2, $t4 +/* 06434 80838644 10000007 */ beq $zero, $zero, .L80838664 +/* 06438 80838648 8CC643BC */ lw $a2, %lo(D_808543BC)($a2) .L8083864C: -/* 0643C 8083864C 0C023C68 */ jal func_8008F1A0 +/* 0643C 8083864C 0C023C68 */ jal func_8008F1A0 /* 06440 80838650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06444 80838654 00026880 */ sll $t5, $v0, 2 +/* 06444 80838654 00026880 */ sll $t5, $v0, 2 /* 06448 80838658 3C068085 */ lui $a2, %hi(D_808543B4) ## $a2 = 80850000 -/* 0644C 8083865C 00CD3021 */ addu $a2, $a2, $t5 -/* 06450 80838660 8CC643B4 */ lw $a2, %lo(D_808543B4)($a2) +/* 0644C 8083865C 00CD3021 */ addu $a2, $a2, $t5 +/* 06450 80838660 8CC643B4 */ lw $a2, %lo(D_808543B4)($a2) .L80838664: -/* 06454 80838664 8FA40074 */ lw $a0, 0x0074($sp) -/* 06458 80838668 0C02901F */ jal func_800A407C +/* 06454 80838664 8FA40074 */ lw $a0, 0x0074($sp) +/* 06458 80838668 0C02901F */ jal SkelAnime_LinkChangeAnimationDefaultStop /* 0645C 8083866C 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 06460 80838670 1000000B */ beq $zero, $zero, .L808386A0 +/* 06460 80838670 1000000B */ beq $zero, $zero, .L808386A0 /* 06464 80838674 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C .L80838678: -/* 06468 80838678 0C023C68 */ jal func_8008F1A0 +/* 06468 80838678 0C023C68 */ jal func_8008F1A0 /* 0646C 8083867C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06470 80838680 00027080 */ sll $t6, $v0, 2 +/* 06470 80838680 00027080 */ sll $t6, $v0, 2 /* 06474 80838684 3C068085 */ lui $a2, %hi(D_808543C4) ## $a2 = 80850000 -/* 06478 80838688 00CE3021 */ addu $a2, $a2, $t6 -/* 0647C 8083868C 8CC643C4 */ lw $a2, %lo(D_808543C4)($a2) -/* 06480 80838690 8FA40074 */ lw $a0, 0x0074($sp) -/* 06484 80838694 0C20C899 */ jal func_80832264 +/* 06478 80838688 00CE3021 */ addu $a2, $a2, $t6 +/* 0647C 8083868C 8CC643C4 */ lw $a2, %lo(D_808543C4)($a2) +/* 06480 80838690 8FA40074 */ lw $a0, 0x0074($sp) +/* 06484 80838694 0C20C899 */ jal func_80832264 /* 06488 80838698 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0648C 8083869C 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C .L808386A0: /* 06490 808386A0 3C010020 */ lui $at, 0x0020 ## $at = 00200000 /* 06494 808386A4 34216000 */ ori $at, $at, 0x6000 ## $at = 00206000 -/* 06498 808386A8 01E1C024 */ and $t8, $t7, $at -/* 0649C 808386AC 17000005 */ bne $t8, $zero, .L808386C4 +/* 06498 808386A8 01E1C024 */ and $t8, $t7, $at +/* 0649C 808386AC 17000005 */ bne $t8, $zero, .L808386C4 /* 064A0 808386B0 3C01C190 */ lui $at, 0xC190 ## $at = C1900000 /* 064A4 808386B4 44815000 */ mtc1 $at, $f10 ## $f10 = -18.00 /* 064A8 808386B8 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 064AC 808386BC E60A0838 */ swc1 $f10, 0x0838($s0) ## 00000838 /* 064B0 808386C0 A619083C */ sh $t9, 0x083C($s0) ## 0000083C .L808386C4: -/* 064B4 808386C4 8FA90064 */ lw $t1, 0x0064($sp) +/* 064B4 808386C4 8FA90064 */ lw $t1, 0x0064($sp) .L808386C8: -/* 064B8 808386C8 11200009 */ beq $t1, $zero, .L808386F0 +/* 064B8 808386C8 11200009 */ beq $t1, $zero, .L808386F0 /* 064BC 808386CC 00000000 */ nop /* 064C0 808386D0 8E0A0620 */ lw $t2, 0x0620($s0) ## 00000620 /* 064C4 808386D4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 064C8 808386D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 064CC 808386DC 914B0004 */ lbu $t3, 0x0004($t2) ## 00000004 -/* 064D0 808386E0 15610003 */ bne $t3, $at, .L808386F0 +/* 064D0 808386E0 15610003 */ bne $t3, $at, .L808386F0 /* 064D4 808386E4 00000000 */ nop -/* 064D8 808386E8 0C20E067 */ jal func_8083819C -/* 064DC 808386EC 8FA50074 */ lw $a1, 0x0074($sp) +/* 064D8 808386E8 0C20E067 */ jal func_8083819C +/* 064DC 808386EC 8FA50074 */ lw $a1, 0x0074($sp) .L808386F0: -/* 064E0 808386F0 1000008E */ beq $zero, $zero, .L8083892C +/* 064E0 808386F0 1000008E */ beq $zero, $zero, .L8083892C /* 064E4 808386F4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 064E8 808386F8 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 .L808386FC: -/* 064EC 808386FC 15800012 */ bne $t4, $zero, .L80838748 +/* 064EC 808386FC 15800012 */ bne $t4, $zero, .L80838748 /* 064F0 80838700 00000000 */ nop -/* 064F4 80838704 1C600010 */ bgtz $v1, .L80838748 +/* 064F4 80838704 1C600010 */ bgtz $v1, .L80838748 /* 064F8 80838708 00000000 */ nop /* 064FC 8083870C 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -/* 06500 80838710 00026940 */ sll $t5, $v0, 5 -/* 06504 80838714 05A0000C */ bltz $t5, .L80838748 +/* 06500 80838710 00026940 */ sll $t5, $v0, 5 +/* 06504 80838714 05A0000C */ bltz $t5, .L80838748 /* 06508 80838718 00000000 */ nop /* 0650C 8083871C 920E0444 */ lbu $t6, 0x0444($s0) ## 00000444 -/* 06510 80838720 15C00009 */ bne $t6, $zero, .L80838748 +/* 06510 80838720 15C00009 */ bne $t6, $zero, .L80838748 /* 06514 80838724 00000000 */ nop /* 06518 80838728 920F04F4 */ lbu $t7, 0x04F4($s0) ## 000004F4 /* 0651C 8083872C 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 06520 80838730 17000005 */ bne $t8, $zero, .L80838748 +/* 06520 80838730 17000005 */ bne $t8, $zero, .L80838748 /* 06524 80838734 00000000 */ nop /* 06528 80838738 92190574 */ lbu $t9, 0x0574($s0) ## 00000574 /* 0652C 8083873C 33290002 */ andi $t1, $t9, 0x0002 ## $t1 = 00000000 -/* 06530 80838740 51200004 */ beql $t1, $zero, .L80838754 +/* 06530 80838740 51200004 */ beql $t1, $zero, .L80838754 /* 06534 80838744 920A04A9 */ lbu $t2, 0x04A9($s0) ## 000004A9 .L80838748: -/* 06538 80838748 10000078 */ beq $zero, $zero, .L8083892C +/* 06538 80838748 10000078 */ beq $zero, $zero, .L8083892C /* 0653C 8083874C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 06540 80838750 920A04A9 */ lbu $t2, 0x04A9($s0) ## 000004A9 .L80838754: /* 06544 80838754 314B0002 */ andi $t3, $t2, 0x0002 ## $t3 = 00000000 -/* 06548 80838758 11600035 */ beq $t3, $zero, .L80838830 +/* 06548 80838758 11600035 */ beq $t3, $zero, .L80838830 /* 0654C 8083875C 00000000 */ nop /* 06550 80838760 8E0704A0 */ lw $a3, 0x04A0($s0) ## 000004A0 /* 06554 80838764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06558 80838768 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E /* 0655C 8083876C 8CEC0004 */ lw $t4, 0x0004($a3) ## 00000004 -/* 06560 80838770 000C69C0 */ sll $t5, $t4, 7 -/* 06564 80838774 05A30006 */ bgezl $t5, .L80838790 -/* 06568 80838778 00027100 */ sll $t6, $v0, 4 -/* 0656C 8083877C 0C00BDF7 */ jal func_8002F7DC -/* 06570 80838780 AFA70050 */ sw $a3, 0x0050($sp) -/* 06574 80838784 8FA70050 */ lw $a3, 0x0050($sp) +/* 06560 80838770 000C69C0 */ sll $t5, $t4, 7 +/* 06564 80838774 05A30006 */ bgezl $t5, .L80838790 +/* 06568 80838778 00027100 */ sll $t6, $v0, 4 +/* 0656C 8083877C 0C00BDF7 */ jal func_8002F7DC +/* 06570 80838780 AFA70050 */ sw $a3, 0x0050($sp) +/* 06574 80838784 8FA70050 */ lw $a3, 0x0050($sp) /* 06578 80838788 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -/* 0657C 8083878C 00027100 */ sll $t6, $v0, 4 +/* 0657C 8083878C 00027100 */ sll $t6, $v0, 4 .L80838790: -/* 06580 80838790 05C30004 */ bgezl $t6, .L808387A4 +/* 06580 80838790 05C30004 */ bgezl $t6, .L808387A4 /* 06584 80838794 920200B3 */ lbu $v0, 0x00B3($s0) ## 000000B3 -/* 06588 80838798 10000014 */ beq $zero, $zero, .L808387EC +/* 06588 80838798 10000014 */ beq $zero, $zero, .L808387EC /* 0658C 8083879C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 06590 808387A0 920200B3 */ lbu $v0, 0x00B3($s0) ## 000000B3 .L808387A4: /* 06594 808387A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 06598 808387A8 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 0659C 808387AC 14410003 */ bne $v0, $at, .L808387BC +/* 0659C 808387AC 14410003 */ bne $v0, $at, .L808387BC /* 065A0 808387B0 00000000 */ nop -/* 065A4 808387B4 1000000D */ beq $zero, $zero, .L808387EC +/* 065A4 808387B4 1000000D */ beq $zero, $zero, .L808387EC /* 065A8 808387B8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 .L808387BC: -/* 065AC 808387BC 14620003 */ bne $v1, $v0, .L808387CC +/* 065AC 808387BC 14620003 */ bne $v1, $v0, .L808387CC /* 065B0 808387C0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 065B4 808387C4 10000009 */ beq $zero, $zero, .L808387EC +/* 065B4 808387C4 10000009 */ beq $zero, $zero, .L808387EC /* 065B8 808387C8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L808387CC: -/* 065BC 808387CC 14410003 */ bne $v0, $at, .L808387DC +/* 065BC 808387CC 14410003 */ bne $v0, $at, .L808387DC /* 065C0 808387D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 065C4 808387D4 10000005 */ beq $zero, $zero, .L808387EC +/* 065C4 808387D4 10000005 */ beq $zero, $zero, .L808387EC /* 065C8 808387D8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 .L808387DC: -/* 065CC 808387DC 0C20E0A0 */ jal func_80838280 -/* 065D0 808387E0 AFA70050 */ sw $a3, 0x0050($sp) -/* 065D4 808387E4 8FA70050 */ lw $a3, 0x0050($sp) +/* 065CC 808387DC 0C20E0A0 */ jal func_80838280 +/* 065D0 808387E0 AFA70050 */ sw $a3, 0x0050($sp) +/* 065D4 808387E4 8FA70050 */ lw $a3, 0x0050($sp) /* 065D8 808387E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 .L808387EC: /* 065DC 808387EC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 065E0 808387F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 065E4 808387F4 0C00B69E */ jal func_8002DA78 -/* 065E8 808387F8 AFA6004C */ sw $a2, 0x004C($sp) +/* 065E4 808387F4 0C00B69E */ jal func_8002DA78 +/* 065E8 808387F8 AFA6004C */ sw $a2, 0x004C($sp) /* 065EC 808387FC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 065F0 80838800 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 065F4 80838804 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 065F8 80838808 AFAF0018 */ sw $t7, 0x0018($sp) -/* 065FC 8083880C 8FA6004C */ lw $a2, 0x004C($sp) -/* 06600 80838810 8FA40074 */ lw $a0, 0x0074($sp) +/* 065F8 80838808 AFAF0018 */ sw $t7, 0x0018($sp) +/* 065FC 8083880C 8FA6004C */ lw $a2, 0x004C($sp) +/* 06600 80838810 8FA40074 */ lw $a0, 0x0074($sp) /* 06604 80838814 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 06608 80838818 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 0660C 8083881C AFA20014 */ sw $v0, 0x0014($sp) -/* 06610 80838820 0C20DF03 */ jal func_80837C0C -/* 06614 80838824 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 06618 80838828 10000040 */ beq $zero, $zero, .L8083892C +/* 0660C 8083881C AFA20014 */ sw $v0, 0x0014($sp) +/* 06610 80838820 0C20DF03 */ jal func_80837C0C +/* 06614 80838824 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 06618 80838828 10000040 */ beq $zero, $zero, .L8083892C /* 0661C 8083882C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80838830: -/* 06620 80838830 10600003 */ beq $v1, $zero, .L80838840 +/* 06620 80838830 10600003 */ beq $v1, $zero, .L80838840 /* 06624 80838834 00000000 */ nop -/* 06628 80838838 1000003C */ beq $zero, $zero, .L8083892C +/* 06628 80838838 1000003C */ beq $zero, $zero, .L8083892C /* 0662C 8083883C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80838840: -/* 06630 80838840 0C20E051 */ jal func_80838144 +/* 06630 80838840 0C20E051 */ jal func_80838144 /* 06634 80838844 00000000 */ nop /* 06638 80838848 8E050074 */ lw $a1, 0x0074($s0) ## 00000074 -/* 0663C 8083884C 8FA40074 */ lw $a0, 0x0074($sp) +/* 0663C 8083884C 8FA40074 */ lw $a0, 0x0074($sp) /* 06640 80838850 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 06644 80838854 10A00006 */ beq $a1, $zero, .L80838870 +/* 06644 80838854 10A00006 */ beq $a1, $zero, .L80838870 /* 06648 80838858 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 /* 0664C 8083885C 9206007C */ lbu $a2, 0x007C($s0) ## 0000007C -/* 06650 80838860 0C010842 */ jal func_80042108 -/* 06654 80838864 AFA20048 */ sw $v0, 0x0048($sp) -/* 06658 80838868 1440001C */ bne $v0, $zero, .L808388DC -/* 0665C 8083886C 8FA30048 */ lw $v1, 0x0048($sp) +/* 06650 80838860 0C010842 */ jal func_80042108 +/* 06654 80838864 AFA20048 */ sw $v0, 0x0048($sp) +/* 06658 80838868 1440001C */ bne $v0, $zero, .L808388DC +/* 0665C 8083886C 8FA30048 */ lw $v1, 0x0048($sp) .L80838870: -/* 06660 80838870 0460000F */ bltz $v1, .L808388B0 -/* 06664 80838874 8FA40074 */ lw $a0, 0x0074($sp) +/* 06660 80838870 0460000F */ bltz $v1, .L808388B0 +/* 06664 80838874 8FA40074 */ lw $a0, 0x0074($sp) /* 06668 80838878 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 /* 0666C 8083887C 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 06670 80838880 AFA30048 */ sw $v1, 0x0048($sp) -/* 06674 80838884 0C010842 */ jal func_80042108 +/* 06670 80838880 AFA30048 */ sw $v1, 0x0048($sp) +/* 06674 80838884 0C010842 */ jal func_80042108 /* 06678 80838888 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0667C 8083888C 10400008 */ beq $v0, $zero, .L808388B0 -/* 06680 80838890 8FA30048 */ lw $v1, 0x0048($sp) +/* 0667C 8083888C 10400008 */ beq $v0, $zero, .L808388B0 +/* 06680 80838890 8FA30048 */ lw $v1, 0x0048($sp) /* 06684 80838894 3C198085 */ lui $t9, %hi(D_808544F4) ## $t9 = 80850000 -/* 06688 80838898 0323C821 */ addu $t9, $t9, $v1 -/* 0668C 8083889C 933944F4 */ lbu $t9, %lo(D_808544F4)($t9) +/* 06688 80838898 0323C821 */ addu $t9, $t9, $v1 +/* 0668C 8083889C 933944F4 */ lbu $t9, %lo(D_808544F4)($t9) /* 06690 808388A0 92180A79 */ lbu $t8, 0x0A79($s0) ## 00000A79 -/* 06694 808388A4 0319082A */ slt $at, $t8, $t9 -/* 06698 808388A8 5020000D */ beql $at, $zero, .L808388E0 +/* 06694 808388A4 0319082A */ slt $at, $t8, $t9 +/* 06698 808388A8 5020000D */ beql $at, $zero, .L808388E0 /* 0669C 808388AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L808388B0: -/* 066A0 808388B0 0460001B */ bltz $v1, .L80838920 +/* 066A0 808388B0 0460001B */ bltz $v1, .L80838920 /* 066A4 808388B4 00000000 */ nop /* 066A8 808388B8 8209014C */ lb $t1, 0x014C($s0) ## 0000014C /* 066AC 808388BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 066B0 808388C0 3C0B8085 */ lui $t3, %hi(D_808544F4) ## $t3 = 80850000 -/* 066B4 808388C4 15210005 */ bne $t1, $at, .L808388DC -/* 066B8 808388C8 01635821 */ addu $t3, $t3, $v1 +/* 066B4 808388C4 15210005 */ bne $t1, $at, .L808388DC +/* 066B8 808388C8 01635821 */ addu $t3, $t3, $v1 /* 066BC 808388CC 920A0A79 */ lbu $t2, 0x0A79($s0) ## 00000A79 -/* 066C0 808388D0 916B44F4 */ lbu $t3, %lo(D_808544F4)($t3) -/* 066C4 808388D4 014B082A */ slt $at, $t2, $t3 -/* 066C8 808388D8 14200011 */ bne $at, $zero, .L80838920 +/* 066C0 808388D0 916B44F4 */ lbu $t3, %lo(D_808544F4)($t3) +/* 066C4 808388D4 014B082A */ slt $at, $t2, $t3 +/* 066C8 808388D8 14200011 */ bne $at, $zero, .L80838920 .L808388DC: /* 066CC 808388DC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L808388E0: @@ -426,28 +426,28 @@ glabel func_808382DC /* 066D4 808388E4 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 /* 066D8 808388E8 A2000A79 */ sb $zero, 0x0A79($s0) ## 00000A79 /* 066DC 808388EC A20C00B0 */ sb $t4, 0x00B0($s0) ## 000000B0 -/* 066E0 808388F0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 066E0 808388F0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 066E4 808388F4 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 /* 066E8 808388F8 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 066EC 808388FC AFAE0018 */ sw $t6, 0x0018($sp) -/* 066F0 80838900 8FA40074 */ lw $a0, 0x0074($sp) +/* 066EC 808388FC AFAE0018 */ sw $t6, 0x0018($sp) +/* 066F0 80838900 8FA40074 */ lw $a0, 0x0074($sp) /* 066F4 80838904 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 066F8 80838908 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 066FC 8083890C 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 06700 80838910 0C20DF03 */ jal func_80837C0C -/* 06704 80838914 AFAD0014 */ sw $t5, 0x0014($sp) -/* 06708 80838918 10000004 */ beq $zero, $zero, .L8083892C +/* 06700 80838910 0C20DF03 */ jal func_80837C0C +/* 06704 80838914 AFAD0014 */ sw $t5, 0x0014($sp) +/* 06708 80838918 10000004 */ beq $zero, $zero, .L8083892C /* 0670C 8083891C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80838920: -/* 06710 80838920 10000002 */ beq $zero, $zero, .L8083892C +/* 06710 80838920 10000002 */ beq $zero, $zero, .L8083892C /* 06714 80838924 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80838928: /* 06718 80838928 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8083892C: -/* 0671C 8083892C 8FBF002C */ lw $ra, 0x002C($sp) -/* 06720 80838930 8FB00028 */ lw $s0, 0x0028($sp) +/* 0671C 8083892C 8FBF002C */ lw $ra, 0x002C($sp) +/* 06720 80838930 8FB00028 */ lw $s0, 0x0028($sp) /* 06724 80838934 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 06728 80838938 03E00008 */ jr $ra +/* 06728 80838938 03E00008 */ jr $ra /* 0672C 8083893C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s index abd6f8bf3e..e4930ee945 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s @@ -1,132 +1,132 @@ glabel func_80838A14 /* 06804 80838A14 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 06808 80838A18 AFBF001C */ sw $ra, 0x001C($sp) -/* 0680C 80838A1C AFB00018 */ sw $s0, 0x0018($sp) -/* 06810 80838A20 AFA50044 */ sw $a1, 0x0044($sp) +/* 06808 80838A18 AFBF001C */ sw $ra, 0x001C($sp) +/* 0680C 80838A1C AFB00018 */ sw $s0, 0x0018($sp) +/* 06810 80838A20 AFA50044 */ sw $a1, 0x0044($sp) /* 06814 80838A24 8C82067C */ lw $v0, 0x067C($a0) ## 0000067C /* 06818 80838A28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0681C 80838A2C 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 -/* 06820 80838A30 55C000EC */ bnel $t6, $zero, .L80838DE4 +/* 06820 80838A30 55C000EC */ bnel $t6, $zero, .L80838DE4 /* 06824 80838A34 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 /* 06828 80838A38 908F088C */ lbu $t7, 0x088C($a0) ## 0000088C -/* 0682C 80838A3C 0002C100 */ sll $t8, $v0, 4 -/* 06830 80838A40 29E10002 */ slti $at, $t7, 0x0002 -/* 06834 80838A44 542000E7 */ bnel $at, $zero, .L80838DE4 +/* 0682C 80838A3C 0002C100 */ sll $t8, $v0, 4 +/* 06830 80838A40 29E10002 */ slti $at, $t7, 0x0002 +/* 06834 80838A44 542000E7 */ bnel $at, $zero, .L80838DE4 /* 06838 80838A48 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 0683C 80838A4C 07030008 */ bgezl $t8, .L80838A70 +/* 0683C 80838A4C 07030008 */ bgezl $t8, .L80838A70 /* 06840 80838A50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06844 80838A54 8C990678 */ lw $t9, 0x0678($a0) ## 00000678 /* 06848 80838A58 C4840884 */ lwc1 $f4, 0x0884($a0) ## 00000884 /* 0684C 80838A5C C7260014 */ lwc1 $f6, 0x0014($t9) ## 00000014 -/* 06850 80838A60 4606203C */ c.lt.s $f4, $f6 +/* 06850 80838A60 4606203C */ c.lt.s $f4, $f6 /* 06854 80838A64 00000000 */ nop -/* 06858 80838A68 450000DD */ bc1f .L80838DE0 +/* 06858 80838A68 450000DD */ bc1f .L80838DE0 /* 0685C 80838A6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80838A70: -/* 06860 80838A70 0C20CCAE */ jal func_808332B8 -/* 06864 80838A74 AFA0003C */ sw $zero, 0x003C($sp) -/* 06868 80838A78 1040001F */ beq $v0, $zero, .L80838AF8 -/* 0686C 80838A7C 8FA3003C */ lw $v1, 0x003C($sp) +/* 06860 80838A70 0C20CCAE */ jal func_808332B8 +/* 06864 80838A74 AFA0003C */ sw $zero, 0x003C($sp) +/* 06868 80838A78 1040001F */ beq $v0, $zero, .L80838AF8 +/* 0686C 80838A7C 8FA3003C */ lw $v1, 0x003C($sp) /* 06870 80838A80 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 06874 80838A84 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 06878 80838A88 C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 -/* 0687C 80838A8C 460A403C */ c.lt.s $f8, $f10 +/* 0687C 80838A8C 460A403C */ c.lt.s $f8, $f10 /* 06880 80838A90 00000000 */ nop -/* 06884 80838A94 4502000F */ bc1fl .L80838AD4 +/* 06884 80838A94 4502000F */ bc1fl .L80838AD4 /* 06888 80838A98 820A014F */ lb $t2, 0x014F($s0) ## 0000014F /* 0688C 80838A9C 9208088C */ lbu $t0, 0x088C($s0) ## 0000088C -/* 06890 80838AA0 29010002 */ slti $at, $t0, 0x0002 -/* 06894 80838AA4 14200008 */ bne $at, $zero, .L80838AC8 +/* 06890 80838AA0 29010002 */ slti $at, $t0, 0x0002 +/* 06894 80838AA4 14200008 */ bne $at, $zero, .L80838AC8 /* 06898 80838AA8 00000000 */ nop /* 0689C 80838AAC 8E090678 */ lw $t1, 0x0678($s0) ## 00000678 /* 068A0 80838AB0 C6120884 */ lwc1 $f18, 0x0884($s0) ## 00000884 /* 068A4 80838AB4 C5300010 */ lwc1 $f16, 0x0010($t1) ## 00000010 -/* 068A8 80838AB8 4612803C */ c.lt.s $f16, $f18 +/* 068A8 80838AB8 4612803C */ c.lt.s $f16, $f18 /* 068AC 80838ABC 00000000 */ nop -/* 068B0 80838AC0 4502001F */ bc1fl .L80838B40 +/* 068B0 80838AC0 4502001F */ bc1fl .L80838B40 /* 068B4 80838AC4 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C .L80838AC8: -/* 068B8 80838AC8 100000E4 */ beq $zero, $zero, .L80838E5C +/* 068B8 80838AC8 100000E4 */ beq $zero, $zero, .L80838E5C /* 068BC 80838ACC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 068C0 80838AD0 820A014F */ lb $t2, 0x014F($s0) ## 0000014F .L80838AD4: /* 068C4 80838AD4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 068C8 80838AD8 15410005 */ bne $t2, $at, .L80838AF0 +/* 068C8 80838AD8 15410005 */ bne $t2, $at, .L80838AF0 /* 068CC 80838ADC 00000000 */ nop /* 068D0 80838AE0 920B088C */ lbu $t3, 0x088C($s0) ## 0000088C -/* 068D4 80838AE4 29610003 */ slti $at, $t3, 0x0003 -/* 068D8 80838AE8 54200015 */ bnel $at, $zero, .L80838B40 +/* 068D4 80838AE4 29610003 */ slti $at, $t3, 0x0003 +/* 068D8 80838AE8 54200015 */ bnel $at, $zero, .L80838B40 /* 068DC 80838AEC 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C .L80838AF0: -/* 068E0 80838AF0 100000DA */ beq $zero, $zero, .L80838E5C +/* 068E0 80838AF0 100000DA */ beq $zero, $zero, .L80838E5C /* 068E4 80838AF4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80838AF8: /* 068E8 80838AF8 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 /* 068EC 80838AFC 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 068F0 80838B00 11A0000C */ beq $t5, $zero, .L80838B34 +/* 068F0 80838B00 11A0000C */ beq $t5, $zero, .L80838B34 /* 068F4 80838B04 00000000 */ nop /* 068F8 80838B08 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 /* 068FC 80838B0C C6040884 */ lwc1 $f4, 0x0884($s0) ## 00000884 /* 06900 80838B10 C5C60014 */ lwc1 $f6, 0x0014($t6) ## 00000014 -/* 06904 80838B14 4604303E */ c.le.s $f6, $f4 +/* 06904 80838B14 4604303E */ c.le.s $f6, $f4 /* 06908 80838B18 00000000 */ nop -/* 0690C 80838B1C 45020008 */ bc1fl .L80838B40 +/* 0690C 80838B1C 45020008 */ bc1fl .L80838B40 /* 06910 80838B20 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C /* 06914 80838B24 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 06918 80838B28 000FC100 */ sll $t8, $t7, 4 -/* 0691C 80838B2C 07030004 */ bgezl $t8, .L80838B40 +/* 06918 80838B28 000FC100 */ sll $t8, $t7, 4 +/* 0691C 80838B2C 07030004 */ bgezl $t8, .L80838B40 /* 06920 80838B30 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C .L80838B34: -/* 06924 80838B34 100000C9 */ beq $zero, $zero, .L80838E5C +/* 06924 80838B34 100000C9 */ beq $zero, $zero, .L80838E5C /* 06928 80838B38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0692C 80838B3C 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C .L80838B40: /* 06930 80838B40 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 /* 06934 80838B44 3C088085 */ lui $t0, %hi(D_808535F0) ## $t0 = 80850000 -/* 06938 80838B48 13210016 */ beq $t9, $at, .L80838BA4 +/* 06938 80838B48 13210016 */ beq $t9, $at, .L80838BA4 /* 0693C 80838B4C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 06940 80838B50 8D0835F0 */ lw $t0, %lo(D_808535F0)($t0) +/* 06940 80838B50 8D0835F0 */ lw $t0, %lo(D_808535F0)($t0) /* 06944 80838B54 31090040 */ andi $t1, $t0, 0x0040 ## $t1 = 00000000 -/* 06948 80838B58 51200013 */ beql $t1, $zero, .L80838BA8 +/* 06948 80838B58 51200013 */ beql $t1, $zero, .L80838BA8 /* 0694C 80838B5C 9218088D */ lbu $t8, 0x088D($s0) ## 0000088D /* 06950 80838B60 920A088D */ lbu $t2, 0x088D($s0) ## 0000088D -/* 06954 80838B64 29410006 */ slti $at, $t2, 0x0006 -/* 06958 80838B68 1420001B */ bne $at, $zero, .L80838BD8 +/* 06954 80838B64 29410006 */ slti $at, $t2, 0x0006 +/* 06958 80838B68 1420001B */ bne $at, $zero, .L80838BD8 /* 0695C 80838B6C 00000000 */ nop /* 06960 80838B70 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 /* 06964 80838B74 3C0D8086 */ lui $t5, %hi(D_80858AB4) ## $t5 = 80860000 /* 06968 80838B78 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 0696C 80838B7C 356C0004 */ ori $t4, $t3, 0x0004 ## $t4 = 00000004 /* 06970 80838B80 AE0C0680 */ sw $t4, 0x0680($s0) ## 00000680 -/* 06974 80838B84 8DAD8AB4 */ lw $t5, %lo(D_80858AB4)($t5) +/* 06974 80838B84 8DAD8AB4 */ lw $t5, %lo(D_80858AB4)($t5) /* 06978 80838B88 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF /* 0697C 80838B8C 95AE000C */ lhu $t6, 0x000C($t5) ## 8086000C -/* 06980 80838B90 01C17827 */ nor $t7, $t6, $at -/* 06984 80838B94 15E00010 */ bne $t7, $zero, .L80838BD8 +/* 06980 80838B90 01C17827 */ nor $t7, $t6, $at +/* 06984 80838B94 15E00010 */ bne $t7, $zero, .L80838BD8 /* 06988 80838B98 00000000 */ nop -/* 0698C 80838B9C 1000000E */ beq $zero, $zero, .L80838BD8 +/* 0698C 80838B9C 1000000E */ beq $zero, $zero, .L80838BD8 /* 06990 80838BA0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80838BA4: /* 06994 80838BA4 9218088D */ lbu $t8, 0x088D($s0) ## 0000088D .L80838BA8: /* 06998 80838BA8 3C198086 */ lui $t9, %hi(D_80858AB4) ## $t9 = 80860000 -/* 0699C 80838BAC 2B010006 */ slti $at, $t8, 0x0006 -/* 069A0 80838BB0 50200009 */ beql $at, $zero, .L80838BD8 +/* 0699C 80838BAC 2B010006 */ slti $at, $t8, 0x0006 +/* 069A0 80838BB0 50200009 */ beql $at, $zero, .L80838BD8 /* 069A4 80838BB4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 069A8 80838BB8 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) +/* 069A8 80838BB8 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) /* 069AC 80838BBC 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 069B0 80838BC0 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF /* 069B4 80838BC4 9728000C */ lhu $t0, 0x000C($t9) ## 8086000C -/* 069B8 80838BC8 01014827 */ nor $t1, $t0, $at -/* 069BC 80838BCC 15200002 */ bne $t1, $zero, .L80838BD8 +/* 069B8 80838BC8 01014827 */ nor $t1, $t0, $at +/* 069BC 80838BCC 15200002 */ bne $t1, $zero, .L80838BD8 /* 069C0 80838BD0 00000000 */ nop /* 069C4 80838BD4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80838BD8: -/* 069C8 80838BD8 1060009F */ beq $v1, $zero, .L80838E58 -/* 069CC 80838BDC 8FA40044 */ lw $a0, 0x0044($sp) +/* 069C8 80838BD8 1060009F */ beq $v1, $zero, .L80838E58 +/* 069CC 80838BDC 8FA40044 */ lw $a0, 0x0044($sp) /* 069D0 80838BE0 3C068084 */ lui $a2, %hi(func_80845668) ## $a2 = 80840000 /* 069D4 80838BE4 24C65668 */ addiu $a2, $a2, %lo(func_80845668) ## $a2 = 80845668 -/* 069D8 80838BE8 0C20D716 */ jal func_80835C58 +/* 069D8 80838BE8 0C20D716 */ jal func_80835C58 /* 069DC 80838BEC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 069E0 80838BF0 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C /* 069E4 80838BF4 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 @@ -137,165 +137,165 @@ glabel func_80838A14 /* 069F8 80838C08 C5880014 */ lwc1 $f8, 0x0014($t4) ## 00000014 /* 069FC 80838C0C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 06A00 80838C10 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 06A04 80838C14 4600403E */ c.le.s $f8, $f0 +/* 06A04 80838C14 4600403E */ c.le.s $f8, $f0 /* 06A08 80838C18 00000000 */ nop -/* 06A0C 80838C1C 45020006 */ bc1fl .L80838C38 +/* 06A0C 80838C1C 45020006 */ bc1fl .L80838C38 /* 06A10 80838C20 8E020074 */ lw $v0, 0x0074($s0) ## 00000074 /* 06A14 80838C24 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 06A18 80838C28 24C62D48 */ addiu $a2, $a2, 0x2D48 ## $a2 = 04002D48 -/* 06A1C 80838C2C 10000059 */ beq $zero, $zero, .L80838D94 +/* 06A1C 80838C2C 10000059 */ beq $zero, $zero, .L80838D94 /* 06A20 80838C30 E60A0838 */ swc1 $f10, 0x0838($s0) ## 00000838 /* 06A24 80838C34 8E020074 */ lw $v0, 0x0074($s0) ## 00000074 .L80838C38: /* 06A28 80838C38 3C018085 */ lui $at, %hi(D_80855374) ## $at = 80850000 -/* 06A2C 80838C3C C42C5374 */ lwc1 $f12, %lo(D_80855374)($at) +/* 06A2C 80838C3C C42C5374 */ lwc1 $f12, %lo(D_80855374)($at) /* 06A30 80838C40 844D0008 */ lh $t5, 0x0008($v0) ## 00000008 /* 06A34 80838C44 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 06A38 80838C48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06A3C 80838C4C 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 /* 06A40 80838C50 00000000 */ nop -/* 06A44 80838C54 468084A0 */ cvt.s.w $f18, $f16 -/* 06A48 80838C58 460C9102 */ mul.s $f4, $f18, $f12 +/* 06A44 80838C54 468084A0 */ cvt.s.w $f18, $f16 +/* 06A48 80838C58 460C9102 */ mul.s $f4, $f18, $f12 /* 06A4C 80838C5C 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 06A50 80838C60 E7A4002C */ swc1 $f4, 0x002C($sp) +/* 06A50 80838C60 E7A4002C */ swc1 $f4, 0x002C($sp) /* 06A54 80838C64 844E000C */ lh $t6, 0x000C($v0) ## 0000000C /* 06A58 80838C68 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 /* 06A5C 80838C6C 00000000 */ nop -/* 06A60 80838C70 46803220 */ cvt.s.w $f8, $f6 -/* 06A64 80838C74 460C4282 */ mul.s $f10, $f8, $f12 -/* 06A68 80838C78 E7AA0028 */ swc1 $f10, 0x0028($sp) +/* 06A60 80838C70 46803220 */ cvt.s.w $f8, $f6 +/* 06A64 80838C74 460C4282 */ mul.s $f10, $f8, $f12 +/* 06A68 80838C78 E7AA0028 */ swc1 $f10, 0x0028($sp) /* 06A6C 80838C7C C6100888 */ lwc1 $f16, 0x0888($s0) ## 00000888 /* 06A70 80838C80 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 06A74 80838C84 46128080 */ add.s $f2, $f16, $f18 +/* 06A74 80838C84 46128080 */ add.s $f2, $f16, $f18 /* 06A78 80838C88 35F84000 */ ori $t8, $t7, 0x4000 ## $t8 = 00004000 /* 06A7C 80838C8C AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 06A80 80838C90 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 06A84 80838C94 0C20CCAE */ jal func_808332B8 -/* 06A88 80838C98 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 06A8C 80838C9C C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 06A90 80838CA0 1040000F */ beq $v0, $zero, .L80838CE0 -/* 06A94 80838CA4 C7A20024 */ lwc1 $f2, 0x0024($sp) +/* 06A80 80838C90 E7A00034 */ swc1 $f0, 0x0034($sp) +/* 06A84 80838C94 0C20CCAE */ jal func_808332B8 +/* 06A88 80838C98 E7A20024 */ swc1 $f2, 0x0024($sp) +/* 06A8C 80838C9C C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 06A90 80838CA0 1040000F */ beq $v0, $zero, .L80838CE0 +/* 06A94 80838CA4 C7A20024 */ lwc1 $f2, 0x0024($sp) /* 06A98 80838CA8 8E190678 */ lw $t9, 0x0678($s0) ## 00000678 /* 06A9C 80838CAC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 06AA0 80838CB0 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 /* 06AA4 80838CB4 C7260008 */ lwc1 $f6, 0x0008($t9) ## 00000008 /* 06AA8 80838CB8 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 06AAC 80838CBC 3C01F7FF */ lui $at, 0xF7FF ## $at = F7FF0000 -/* 06AB0 80838CC0 46062202 */ mul.s $f8, $f4, $f6 +/* 06AB0 80838CC0 46062202 */ mul.s $f8, $f4, $f6 /* 06AB4 80838CC4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = F7FFFFFF /* 06AB8 80838CC8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 06ABC 80838CCC 01014824 */ and $t1, $t0, $at +/* 06ABC 80838CCC 01014824 */ and $t1, $t0, $at /* 06AC0 80838CD0 24C632E8 */ addiu $a2, $a2, 0x32E8 ## $a2 = 040032E8 /* 06AC4 80838CD4 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 06AC8 80838CD8 10000016 */ beq $zero, $zero, .L80838D34 -/* 06ACC 80838CDC 46080001 */ sub.s $f0, $f0, $f8 +/* 06AC8 80838CD8 10000016 */ beq $zero, $zero, .L80838D34 +/* 06ACC 80838CDC 46080001 */ sub.s $f0, $f0, $f8 .L80838CE0: /* 06AD0 80838CE0 8E020678 */ lw $v0, 0x0678($s0) ## 00000678 /* 06AD4 80838CE4 3C014224 */ lui $at, 0x4224 ## $at = 42240000 /* 06AD8 80838CE8 C44A0018 */ lwc1 $f10, 0x0018($v0) ## 00000018 -/* 06ADC 80838CEC 4600503E */ c.le.s $f10, $f0 +/* 06ADC 80838CEC 4600503E */ c.le.s $f10, $f0 /* 06AE0 80838CF0 00000000 */ nop -/* 06AE4 80838CF4 4502000A */ bc1fl .L80838D20 +/* 06AE4 80838CF4 4502000A */ bc1fl .L80838D20 /* 06AE8 80838CF8 44813000 */ mtc1 $at, $f6 ## $f6 = 41.00 /* 06AEC 80838CFC 3C01426C */ lui $at, 0x426C ## $at = 426C0000 /* 06AF0 80838D00 44818000 */ mtc1 $at, $f16 ## $f16 = 59.00 /* 06AF4 80838D04 C4520008 */ lwc1 $f18, 0x0008($v0) ## 00000008 /* 06AF8 80838D08 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 06AFC 80838D0C 24C62D40 */ addiu $a2, $a2, 0x2D40 ## $a2 = 04002D40 -/* 06B00 80838D10 46128102 */ mul.s $f4, $f16, $f18 -/* 06B04 80838D14 10000007 */ beq $zero, $zero, .L80838D34 -/* 06B08 80838D18 46040001 */ sub.s $f0, $f0, $f4 +/* 06B00 80838D10 46128102 */ mul.s $f4, $f16, $f18 +/* 06B04 80838D14 10000007 */ beq $zero, $zero, .L80838D34 +/* 06B08 80838D18 46040001 */ sub.s $f0, $f0, $f4 /* 06B0C 80838D1C 44813000 */ mtc1 $at, $f6 ## $f6 = 59.00 .L80838D20: /* 06B10 80838D20 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000008 /* 06B14 80838D24 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 06B18 80838D28 24C62D38 */ addiu $a2, $a2, 0x2D38 ## $a2 = 04002D38 -/* 06B1C 80838D2C 46083282 */ mul.s $f10, $f6, $f8 -/* 06B20 80838D30 460A0001 */ sub.s $f0, $f0, $f10 +/* 06B1C 80838D2C 46083282 */ mul.s $f10, $f6, $f8 +/* 06B20 80838D30 460A0001 */ sub.s $f0, $f0, $f10 .L80838D34: /* 06B24 80838D34 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 06B28 80838D38 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 /* 06B2C 80838D3C C61000BC */ lwc1 $f16, 0x00BC($s0) ## 000000BC /* 06B30 80838D40 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 06B34 80838D44 46120102 */ mul.s $f4, $f0, $f18 +/* 06B34 80838D44 46120102 */ mul.s $f4, $f0, $f18 /* 06B38 80838D48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06B3C 80838D4C 46048181 */ sub.s $f6, $f16, $f4 +/* 06B3C 80838D4C 46048181 */ sub.s $f6, $f16, $f4 /* 06B40 80838D50 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 06B44 80838D54 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 06B48 80838D58 C7AA002C */ lwc1 $f10, 0x002C($sp) +/* 06B48 80838D58 C7AA002C */ lwc1 $f10, 0x002C($sp) /* 06B4C 80838D5C C6060884 */ lwc1 $f6, 0x0884($s0) ## 00000884 -/* 06B50 80838D60 460A1482 */ mul.s $f18, $f2, $f10 -/* 06B54 80838D64 46062280 */ add.s $f10, $f4, $f6 +/* 06B50 80838D60 460A1482 */ mul.s $f18, $f2, $f10 +/* 06B54 80838D64 46062280 */ add.s $f10, $f4, $f6 /* 06B58 80838D68 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 06B5C 80838D6C 46124401 */ sub.s $f16, $f8, $f18 +/* 06B5C 80838D6C 46124401 */ sub.s $f16, $f8, $f18 /* 06B60 80838D70 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 06B64 80838D74 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 -/* 06B68 80838D78 C7B20028 */ lwc1 $f18, 0x0028($sp) -/* 06B6C 80838D7C 46121402 */ mul.s $f16, $f2, $f18 -/* 06B70 80838D80 46104101 */ sub.s $f4, $f8, $f16 +/* 06B68 80838D78 C7B20028 */ lwc1 $f18, 0x0028($sp) +/* 06B6C 80838D7C 46121402 */ mul.s $f16, $f2, $f18 +/* 06B70 80838D80 46104101 */ sub.s $f4, $f8, $f16 /* 06B74 80838D84 E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 06B78 80838D88 0C20C889 */ jal func_80832224 -/* 06B7C 80838D8C AFA60038 */ sw $a2, 0x0038($sp) -/* 06B80 80838D90 8FA60038 */ lw $a2, 0x0038($sp) +/* 06B78 80838D88 0C20C889 */ jal func_80832224 +/* 06B7C 80838D8C AFA60038 */ sw $a2, 0x0038($sp) +/* 06B80 80838D90 8FA60038 */ lw $a2, 0x0038($sp) .L80838D94: /* 06B84 80838D94 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 /* 06B88 80838D98 3C073FA6 */ lui $a3, 0x3FA6 ## $a3 = 3FA60000 /* 06B8C 80838D9C 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3FA66666 /* 06B90 80838DA0 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 06B94 80838DA4 A60B0088 */ sh $t3, 0x0088($s0) ## 00000088 -/* 06B98 80838DA8 8FA40044 */ lw $a0, 0x0044($sp) -/* 06B9C 80838DAC 0C029037 */ jal func_800A40DC +/* 06B98 80838DA8 8FA40044 */ lw $a0, 0x0044($sp) +/* 06B9C 80838DAC 0C029037 */ jal SkelAnime_LinkChangeAnimationPlaybackStop /* 06BA0 80838DB0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 06BA4 80838DB4 0C028CC4 */ jal func_800A3310 -/* 06BA8 80838DB8 8FA40044 */ lw $a0, 0x0044($sp) +/* 06BA4 80838DB4 0C028CC4 */ jal func_800A3310 +/* 06BA8 80838DB8 8FA40044 */ lw $a0, 0x0044($sp) /* 06BAC 80838DBC 8603007E */ lh $v1, 0x007E($s0) ## 0000007E /* 06BB0 80838DC0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 06BB4 80838DC4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 06BB8 80838DC8 00611821 */ addu $v1, $v1, $at -/* 06BBC 80838DCC 00031C00 */ sll $v1, $v1, 16 -/* 06BC0 80838DD0 00031C03 */ sra $v1, $v1, 16 +/* 06BB8 80838DC8 00611821 */ addu $v1, $v1, $at +/* 06BBC 80838DCC 00031C00 */ sll $v1, $v1, 16 +/* 06BC0 80838DD0 00031C03 */ sra $v1, $v1, 16 /* 06BC4 80838DD4 A603083C */ sh $v1, 0x083C($s0) ## 0000083C -/* 06BC8 80838DD8 10000020 */ beq $zero, $zero, .L80838E5C +/* 06BC8 80838DD8 10000020 */ beq $zero, $zero, .L80838E5C /* 06BCC 80838DDC A60300B6 */ sh $v1, 0x00B6($s0) ## 000000B6 .L80838DE0: /* 06BD0 80838DE0 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 .L80838DE4: /* 06BD4 80838DE4 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 06BD8 80838DE8 51A0001C */ beql $t5, $zero, .L80838E5C +/* 06BD8 80838DE8 51A0001C */ beql $t5, $zero, .L80838E5C /* 06BDC 80838DEC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 06BE0 80838DF0 920E088C */ lbu $t6, 0x088C($s0) ## 0000088C /* 06BE4 80838DF4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06BE8 80838DF8 55C10018 */ bnel $t6, $at, .L80838E5C +/* 06BE8 80838DF8 55C10018 */ bnel $t6, $at, .L80838E5C /* 06BEC 80838DFC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 06BF0 80838E00 920F088D */ lbu $t7, 0x088D($s0) ## 0000088D -/* 06BF4 80838E04 29E10003 */ slti $at, $t7, 0x0003 -/* 06BF8 80838E08 14200013 */ bne $at, $zero, .L80838E58 +/* 06BF4 80838E04 29E10003 */ slti $at, $t7, 0x0003 +/* 06BF8 80838E08 14200013 */ bne $at, $zero, .L80838E58 /* 06BFC 80838E0C 3C018085 */ lui $at, %hi(D_80855378) ## $at = 80850000 -/* 06C00 80838E10 C42A5378 */ lwc1 $f10, %lo(D_80855378)($at) +/* 06C00 80838E10 C42A5378 */ lwc1 $f10, %lo(D_80855378)($at) /* 06C04 80838E14 C6060884 */ lwc1 $f6, 0x0884($s0) ## 00000884 /* 06C08 80838E18 3C0140B0 */ lui $at, 0x40B0 ## $at = 40B00000 /* 06C0C 80838E1C 44814000 */ mtc1 $at, $f8 ## $f8 = 5.50 -/* 06C10 80838E20 460A3482 */ mul.s $f18, $f6, $f10 +/* 06C10 80838E20 460A3482 */ mul.s $f18, $f6, $f10 /* 06C14 80838E24 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 /* 06C18 80838E28 24A52FE0 */ addiu $a1, $a1, 0x2FE0 ## $a1 = 04002FE0 /* 06C1C 80838E2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06C20 80838E30 8FA70044 */ lw $a3, 0x0044($sp) -/* 06C24 80838E34 46089000 */ add.s $f0, $f18, $f8 -/* 06C28 80838E38 44060000 */ mfc1 $a2, $f0 -/* 06C2C 80838E3C 0C20E27A */ jal func_808389E8 +/* 06C20 80838E30 8FA70044 */ lw $a3, 0x0044($sp) +/* 06C24 80838E34 46089000 */ add.s $f0, $f18, $f8 +/* 06C28 80838E38 44060000 */ mfc1 $a2, $f0 +/* 06C2C 80838E3C 0C20E27A */ jal func_808389E8 /* 06C30 80838E40 00000000 */ nop /* 06C34 80838E44 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 06C38 80838E48 44818000 */ mtc1 $at, $f16 ## $f16 = 2.50 /* 06C3C 80838E4C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 06C40 80838E50 10000002 */ beq $zero, $zero, .L80838E5C +/* 06C40 80838E50 10000002 */ beq $zero, $zero, .L80838E5C /* 06C44 80838E54 E6100838 */ swc1 $f16, 0x0838($s0) ## 00000838 .L80838E58: /* 06C48 80838E58 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80838E5C: -/* 06C4C 80838E5C 8FBF001C */ lw $ra, 0x001C($sp) -/* 06C50 80838E60 8FB00018 */ lw $s0, 0x0018($sp) +/* 06C4C 80838E5C 8FBF001C */ lw $ra, 0x001C($sp) +/* 06C50 80838E60 8FB00018 */ lw $s0, 0x0018($sp) /* 06C54 80838E64 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 06C58 80838E68 03E00008 */ jr $ra +/* 06C58 80838E68 03E00008 */ jr $ra /* 06C5C 80838E6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s index 4b9bdc7b4c..abecce343b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s @@ -1,25 +1,25 @@ glabel func_8083A9B8 /* 087A8 8083A9B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 087AC 8083A9BC AFA40018 */ sw $a0, 0x0018($sp) -/* 087B0 8083A9C0 AFA60020 */ sw $a2, 0x0020($sp) +/* 087AC 8083A9BC AFA40018 */ sw $a0, 0x0018($sp) +/* 087B0 8083A9C0 AFA60020 */ sw $a2, 0x0020($sp) /* 087B4 8083A9C4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 087B8 8083A9C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 087BC 8083A9CC AFA5001C */ sw $a1, 0x001C($sp) +/* 087B8 8083A9C8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 087BC 8083A9CC AFA5001C */ sw $a1, 0x001C($sp) /* 087C0 8083A9D0 3C068085 */ lui $a2, %hi(func_8084BDFC) ## $a2 = 80850000 /* 087C4 8083A9D4 24C6BDFC */ addiu $a2, $a2, %lo(func_8084BDFC) ## $a2 = 8084BDFC -/* 087C8 8083A9D8 8FA50018 */ lw $a1, 0x0018($sp) -/* 087CC 8083A9DC 0C20D716 */ jal func_80835C58 +/* 087C8 8083A9D8 8FA50018 */ lw $a1, 0x0018($sp) +/* 087CC 8083A9DC 0C20D716 */ jal func_80835C58 /* 087D0 8083A9E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 087D4 8083A9E4 8FA50018 */ lw $a1, 0x0018($sp) +/* 087D4 8083A9E4 8FA50018 */ lw $a1, 0x0018($sp) /* 087D8 8083A9E8 3C073FA6 */ lui $a3, 0x3FA6 ## $a3 = 3FA60000 /* 087DC 8083A9EC 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3FA66666 -/* 087E0 8083A9F0 8FA40020 */ lw $a0, 0x0020($sp) -/* 087E4 8083A9F4 8FA6001C */ lw $a2, 0x001C($sp) -/* 087E8 8083A9F8 0C029037 */ jal func_800A40DC +/* 087E0 8083A9F0 8FA40020 */ lw $a0, 0x0020($sp) +/* 087E4 8083A9F4 8FA6001C */ lw $a2, 0x001C($sp) +/* 087E8 8083A9F8 0C029037 */ jal SkelAnime_LinkChangeAnimationPlaybackStop /* 087EC 8083A9FC 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 087F0 8083AA00 8FBF0014 */ lw $ra, 0x0014($sp) +/* 087F0 8083AA00 8FBF0014 */ lw $ra, 0x0014($sp) /* 087F4 8083AA04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 087F8 8083AA08 03E00008 */ jr $ra +/* 087F8 8083AA08 03E00008 */ jr $ra /* 087FC 8083AA0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s index 56768617f6..790dd0f517 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s @@ -1,56 +1,56 @@ glabel func_8083AF44 /* 08D34 8083AF44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 08D38 8083AF48 AFA60038 */ sw $a2, 0x0038($sp) -/* 08D3C 8083AF4C AFBF0024 */ sw $ra, 0x0024($sp) -/* 08D40 8083AF50 AFB00020 */ sw $s0, 0x0020($sp) +/* 08D38 8083AF48 AFA60038 */ sw $a2, 0x0038($sp) +/* 08D3C 8083AF4C AFBF0024 */ sw $ra, 0x0024($sp) +/* 08D40 8083AF50 AFB00020 */ sw $s0, 0x0020($sp) /* 08D44 8083AF54 3C068085 */ lui $a2, %hi(func_808507F4) ## $a2 = 80850000 /* 08D48 8083AF58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 08D4C 8083AF5C AFA50034 */ sw $a1, 0x0034($sp) +/* 08D4C 8083AF5C AFA50034 */ sw $a1, 0x0034($sp) /* 08D50 8083AF60 24C607F4 */ addiu $a2, $a2, %lo(func_808507F4) ## $a2 = 808507F4 -/* 08D54 8083AF64 0C20D779 */ jal func_80835DE4 +/* 08D54 8083AF64 0C20D779 */ jal func_80835DE4 /* 08D58 8083AF68 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08D5C 8083AF6C 8FA30038 */ lw $v1, 0x0038($sp) -/* 08D60 8083AF70 8FAF0034 */ lw $t7, 0x0034($sp) +/* 08D5C 8083AF6C 8FA30038 */ lw $v1, 0x0038($sp) +/* 08D60 8083AF70 8FAF0034 */ lw $t7, 0x0034($sp) /* 08D64 8083AF74 3C188085 */ lui $t8, %hi(D_80854390) ## $t8 = 80850000 /* 08D68 8083AF78 27184390 */ addiu $t8, $t8, %lo(D_80854390) ## $t8 = 80854390 /* 08D6C 8083AF7C 246EFFFD */ addiu $t6, $v1, 0xFFFD ## $t6 = FFFFFFFD -/* 08D70 8083AF80 00781021 */ addu $v0, $v1, $t8 +/* 08D70 8083AF80 00781021 */ addu $v0, $v1, $t8 /* 08D74 8083AF84 A1EE084F */ sb $t6, 0x084F($t7) ## 0000084F -/* 08D78 8083AF88 AFA2002C */ sw $v0, 0x002C($sp) +/* 08D78 8083AF88 AFA2002C */ sw $v0, 0x002C($sp) /* 08D7C 8083AF8C 90450000 */ lbu $a1, 0x0000($v0) ## 00000000 /* 08D80 8083AF90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D84 8083AF94 0C021DC2 */ jal func_80087708 +/* 08D84 8083AF94 0C021DC2 */ jal func_80087708 /* 08D88 8083AF98 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 08D8C 8083AF9C 8FA50034 */ lw $a1, 0x0034($sp) +/* 08D8C 8083AF9C 8FA50034 */ lw $a1, 0x0034($sp) /* 08D90 8083AFA0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 08D94 8083AFA4 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 /* 08D98 8083AFA8 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 /* 08D9C 8083AFAC 24C62D28 */ addiu $a2, $a2, 0x2D28 ## $a2 = 04002D28 /* 08DA0 8083AFB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08DA4 8083AFB4 0C029037 */ jal func_800A40DC +/* 08DA4 8083AFB4 0C029037 */ jal SkelAnime_LinkChangeAnimationPlaybackStop /* 08DA8 8083AFB8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 08DAC 8083AFBC 8FB9002C */ lw $t9, 0x002C($sp) +/* 08DAC 8083AFBC 8FB9002C */ lw $t9, 0x002C($sp) /* 08DB0 8083AFC0 3C088085 */ lui $t0, %hi(D_80854395) ## $t0 = 80850000 /* 08DB4 8083AFC4 25084395 */ addiu $t0, $t0, %lo(D_80854395) ## $t0 = 80854395 -/* 08DB8 8083AFC8 1728000A */ bne $t9, $t0, .L8083AFF4 +/* 08DB8 8083AFC8 1728000A */ bne $t9, $t0, .L8083AFF4 /* 08DBC 8083AFCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08DC0 8083AFD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08DC4 8083AFD4 2405044C */ addiu $a1, $zero, 0x044C ## $a1 = 0000044C /* 08DC8 8083AFD8 2406FF9B */ addiu $a2, $zero, 0xFF9B ## $a2 = FFFFFF9B /* 08DCC 8083AFDC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08DD0 8083AFE0 0C02003E */ jal func_800800F8 -/* 08DD4 8083AFE4 AFA00010 */ sw $zero, 0x0010($sp) -/* 08DD8 8083AFE8 8FA90034 */ lw $t1, 0x0034($sp) -/* 08DDC 8083AFEC 10000003 */ beq $zero, $zero, .L8083AFFC +/* 08DD0 8083AFE0 0C02003E */ jal func_800800F8 +/* 08DD4 8083AFE4 AFA00010 */ sw $zero, 0x0010($sp) +/* 08DD8 8083AFE8 8FA90034 */ lw $t1, 0x0034($sp) +/* 08DDC 8083AFEC 10000003 */ beq $zero, $zero, .L8083AFFC /* 08DE0 8083AFF0 A522046C */ sh $v0, 0x046C($t1) ## 0000046C .L8083AFF4: -/* 08DE4 8083AFF4 0C20D7A9 */ jal func_80835EA4 +/* 08DE4 8083AFF4 0C20D7A9 */ jal func_80835EA4 /* 08DE8 8083AFF8 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A .L8083AFFC: -/* 08DEC 8083AFFC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 08DF0 8083B000 8FB00020 */ lw $s0, 0x0020($sp) +/* 08DEC 8083AFFC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 08DF0 8083B000 8FB00020 */ lw $s0, 0x0020($sp) /* 08DF4 8083B004 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 08DF8 8083B008 03E00008 */ jr $ra +/* 08DF8 8083B008 03E00008 */ jr $ra /* 08DFC 8083B00C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s index 649d9333fa..a29c9699b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s @@ -1,33 +1,33 @@ glabel func_8083BC04 /* 099F4 8083BC04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 099F8 8083BC08 AFA40018 */ sw $a0, 0x0018($sp) -/* 099FC 8083BC0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 09A00 8083BC10 AFA5001C */ sw $a1, 0x001C($sp) +/* 099F8 8083BC08 AFA40018 */ sw $a0, 0x0018($sp) +/* 099FC 8083BC0C AFBF0014 */ sw $ra, 0x0014($sp) +/* 09A00 8083BC10 AFA5001C */ sw $a1, 0x001C($sp) /* 09A04 8083BC14 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 09A08 8083BC18 3C068084 */ lui $a2, %hi(func_80844708) ## $a2 = 80840000 /* 09A0C 8083BC1C 24C64708 */ addiu $a2, $a2, %lo(func_80844708) ## $a2 = 80844708 -/* 09A10 8083BC20 8FA50018 */ lw $a1, 0x0018($sp) -/* 09A14 8083BC24 0C20D716 */ jal func_80835C58 +/* 09A10 8083BC20 8FA50018 */ lw $a1, 0x0018($sp) +/* 09A14 8083BC24 0C20D716 */ jal func_80835C58 /* 09A18 8083BC28 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 09A1C 8083BC2C 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 /* 09A20 8083BC30 44812000 */ mtc1 $at, $f4 ## $f4 = 1.25 /* 09A24 8083BC34 3C018085 */ lui $at, %hi(D_808535E8) ## $at = 80850000 -/* 09A28 8083BC38 C42635E8 */ lwc1 $f6, %lo(D_808535E8)($at) -/* 09A2C 8083BC3C 8FA20018 */ lw $v0, 0x0018($sp) +/* 09A28 8083BC38 C42635E8 */ lwc1 $f6, %lo(D_808535E8)($at) +/* 09A2C 8083BC3C 8FA20018 */ lw $v0, 0x0018($sp) /* 09A30 8083BC40 3C068085 */ lui $a2, %hi(D_80853A94) ## $a2 = 80850000 -/* 09A34 8083BC44 46062202 */ mul.s $f8, $f4, $f6 +/* 09A34 8083BC44 46062202 */ mul.s $f8, $f4, $f6 /* 09A38 8083BC48 904E015B */ lbu $t6, 0x015B($v0) ## 0000015B -/* 09A3C 8083BC4C 8FA4001C */ lw $a0, 0x001C($sp) +/* 09A3C 8083BC4C 8FA4001C */ lw $a0, 0x001C($sp) /* 09A40 8083BC50 244501B4 */ addiu $a1, $v0, 0x01B4 ## $a1 = 000001B4 -/* 09A44 8083BC54 000E7880 */ sll $t7, $t6, 2 -/* 09A48 8083BC58 00CF3021 */ addu $a2, $a2, $t7 -/* 09A4C 8083BC5C 8CC63A94 */ lw $a2, %lo(D_80853A94)($a2) -/* 09A50 8083BC60 44074000 */ mfc1 $a3, $f8 -/* 09A54 8083BC64 0C029037 */ jal func_800A40DC +/* 09A44 8083BC54 000E7880 */ sll $t7, $t6, 2 +/* 09A48 8083BC58 00CF3021 */ addu $a2, $a2, $t7 +/* 09A4C 8083BC5C 8CC63A94 */ lw $a2, %lo(D_80853A94)($a2) +/* 09A50 8083BC60 44074000 */ mfc1 $a3, $f8 +/* 09A54 8083BC64 0C029037 */ jal SkelAnime_LinkChangeAnimationPlaybackStop /* 09A58 8083BC68 00000000 */ nop -/* 09A5C 8083BC6C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 09A5C 8083BC6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 09A60 8083BC70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 09A64 8083BC74 03E00008 */ jr $ra +/* 09A64 8083BC74 03E00008 */ jr $ra /* 09A68 8083BC78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s index 50cc9268b4..cd089bbcd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s @@ -1,24 +1,24 @@ glabel func_8083CD00 /* 0AAF0 8083CD00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0AAF4 8083CD04 AFA40018 */ sw $a0, 0x0018($sp) -/* 0AAF8 8083CD08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0AAFC 8083CD0C AFA5001C */ sw $a1, 0x001C($sp) +/* 0AAF4 8083CD04 AFA40018 */ sw $a0, 0x0018($sp) +/* 0AAF8 8083CD08 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0AAFC 8083CD0C AFA5001C */ sw $a1, 0x001C($sp) /* 0AB00 8083CD10 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0AB04 8083CD14 3C068084 */ lui $a2, %hi(func_8084251C) ## $a2 = 80840000 /* 0AB08 8083CD18 24C6251C */ addiu $a2, $a2, %lo(func_8084251C) ## $a2 = 8084251C -/* 0AB0C 8083CD1C 8FA50018 */ lw $a1, 0x0018($sp) -/* 0AB10 8083CD20 0C20D716 */ jal func_80835C58 +/* 0AB0C 8083CD1C 8FA50018 */ lw $a1, 0x0018($sp) +/* 0AB10 8083CD20 0C20D716 */ jal func_80835C58 /* 0AB14 8083CD24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0AB18 8083CD28 8FA50018 */ lw $a1, 0x0018($sp) +/* 0AB18 8083CD28 8FA50018 */ lw $a1, 0x0018($sp) /* 0AB1C 8083CD2C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 0AB20 8083CD30 24C624E8 */ addiu $a2, $a2, 0x24E8 ## $a2 = 040024E8 -/* 0AB24 8083CD34 8FA4001C */ lw $a0, 0x001C($sp) +/* 0AB24 8083CD34 8FA4001C */ lw $a0, 0x001C($sp) /* 0AB28 8083CD38 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 0AB2C 8083CD3C 0C029037 */ jal func_800A40DC +/* 0AB2C 8083CD3C 0C029037 */ jal SkelAnime_LinkChangeAnimationPlaybackStop /* 0AB30 8083CD40 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 0AB34 8083CD44 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0AB34 8083CD44 8FBF0014 */ lw $ra, 0x0014($sp) /* 0AB38 8083CD48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0AB3C 8083CD4C 03E00008 */ jr $ra +/* 0AB3C 8083CD4C 03E00008 */ jr $ra /* 0AB40 8083CD50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s index fa98e09c32..0c42abcca4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s @@ -1,25 +1,25 @@ glabel func_8083F070 /* 0CE60 8083F070 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0CE64 8083F074 AFA40018 */ sw $a0, 0x0018($sp) -/* 0CE68 8083F078 AFA60020 */ sw $a2, 0x0020($sp) +/* 0CE64 8083F074 AFA40018 */ sw $a0, 0x0018($sp) +/* 0CE68 8083F078 AFA60020 */ sw $a2, 0x0020($sp) /* 0CE6C 8083F07C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0CE70 8083F080 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0CE74 8083F084 AFA5001C */ sw $a1, 0x001C($sp) +/* 0CE70 8083F080 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0CE74 8083F084 AFA5001C */ sw $a1, 0x001C($sp) /* 0CE78 8083F088 3C068085 */ lui $a2, %hi(func_8084C5F8) ## $a2 = 80850000 /* 0CE7C 8083F08C 24C6C5F8 */ addiu $a2, $a2, %lo(func_8084C5F8) ## $a2 = 8084C5F8 -/* 0CE80 8083F090 8FA50018 */ lw $a1, 0x0018($sp) -/* 0CE84 8083F094 0C20D76B */ jal func_80835DAC +/* 0CE80 8083F090 8FA50018 */ lw $a1, 0x0018($sp) +/* 0CE84 8083F094 0C20D76B */ jal func_80835DAC /* 0CE88 8083F098 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0CE8C 8083F09C 8FA50018 */ lw $a1, 0x0018($sp) +/* 0CE8C 8083F09C 8FA50018 */ lw $a1, 0x0018($sp) /* 0CE90 8083F0A0 3C073FAA */ lui $a3, 0x3FAA ## $a3 = 3FAA0000 /* 0CE94 8083F0A4 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3FAAAAAB -/* 0CE98 8083F0A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0CE9C 8083F0AC 8FA6001C */ lw $a2, 0x001C($sp) -/* 0CEA0 8083F0B0 0C029037 */ jal func_800A40DC +/* 0CE98 8083F0A8 8FA40020 */ lw $a0, 0x0020($sp) +/* 0CE9C 8083F0AC 8FA6001C */ lw $a2, 0x001C($sp) +/* 0CEA0 8083F0B0 0C029037 */ jal SkelAnime_LinkChangeAnimationPlaybackStop /* 0CEA4 8083F0B4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 0CEA8 8083F0B8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0CEA8 8083F0B8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0CEAC 8083F0BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0CEB0 8083F0C0 03E00008 */ jr $ra +/* 0CEB0 8083F0C0 03E00008 */ jr $ra /* 0CEB4 8083F0C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s index 4ca89fda3a..e5729df99f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s @@ -388,7 +388,7 @@ glabel func_8084CC98 .L8084D210: /* 1B000 8084D210 50C00006 */ beql $a2, $zero, .L8084D22C /* 1B004 8084D214 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 1B008 8084D218 0C02901F */ jal func_800A407C +/* 1B008 8084D218 0C02901F */ jal SkelAnime_LinkChangeAnimationDefaultStop /* 1B00C 8084D21C 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 1B010 8084D220 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 1B014 8084D224 A219084F */ sb $t9, 0x084F($s0) ## 0000084F diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s index 5d42224759..b786f55abb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s @@ -1,127 +1,127 @@ glabel func_808507F4 /* 1E5E4 808507F4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1E5E8 808507F8 AFB00018 */ sw $s0, 0x0018($sp) +/* 1E5E8 808507F8 AFB00018 */ sw $s0, 0x0018($sp) /* 1E5EC 808507FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1E5F0 80850800 AFA5002C */ sw $a1, 0x002C($sp) +/* 1E5F0 80850800 AFA5002C */ sw $a1, 0x002C($sp) /* 1E5F4 80850804 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1E5F8 80850808 AFBF001C */ sw $ra, 0x001C($sp) +/* 1E5F8 80850808 AFBF001C */ sw $ra, 0x001C($sp) /* 1E5FC 8085080C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1E600 80850810 0C028EF0 */ jal func_800A3BC0 -/* 1E604 80850814 AFA50020 */ sw $a1, 0x0020($sp) -/* 1E608 80850818 5040004C */ beql $v0, $zero, .L8085094C +/* 1E600 80850810 0C028EF0 */ jal func_800A3BC0 +/* 1E604 80850814 AFA50020 */ sw $a1, 0x0020($sp) +/* 1E608 80850818 5040004C */ beql $v0, $zero, .L8085094C /* 1E60C 8085081C 86020850 */ lh $v0, 0x0850($s0) ## 00000850 /* 1E610 80850820 8203084F */ lb $v1, 0x084F($s0) ## 0000084F -/* 1E614 80850824 04630013 */ bgezl $v1, .L80850874 +/* 1E614 80850824 04630013 */ bgezl $v1, .L80850874 /* 1E618 80850828 86180850 */ lh $t8, 0x0850($s0) ## 00000850 /* 1E61C 8085082C 820E0154 */ lb $t6, 0x0154($s0) ## 00000154 /* 1E620 80850830 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 1E624 80850834 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 1E628 80850838 11C10003 */ beq $t6, $at, .L80850848 +/* 1E628 80850838 11C10003 */ beq $t6, $at, .L80850848 /* 1E62C 8085083C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 1E630 80850840 844F13F0 */ lh $t7, 0x13F0($v0) ## 8015FA50 -/* 1E634 80850844 15E000A2 */ bne $t7, $zero, .L80850AD0 +/* 1E634 80850844 15E000A2 */ bne $t7, $zero, .L80850AD0 .L80850848: /* 1E638 80850848 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E63C 8085084C 0C20E7FF */ jal func_80839FFC -/* 1E640 80850850 8FA5002C */ lw $a1, 0x002C($sp) -/* 1E644 80850854 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E648 80850858 0C030129 */ jal func_800C04A4 +/* 1E63C 8085084C 0C20E7FF */ jal func_80839FFC +/* 1E640 80850850 8FA5002C */ lw $a1, 0x002C($sp) +/* 1E644 80850854 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E648 80850858 0C030129 */ jal func_800C04A4 /* 1E64C 8085085C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1E650 80850860 0C016C69 */ jal func_8005B1A4 +/* 1E650 80850860 0C016C69 */ jal func_8005B1A4 /* 1E654 80850864 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1E658 80850868 10000099 */ beq $zero, $zero, .L80850AD0 +/* 1E658 80850868 10000099 */ beq $zero, $zero, .L80850AD0 /* 1E65C 8085086C 00000000 */ nop /* 1E660 80850870 86180850 */ lh $t8, 0x0850($s0) ## 00000850 .L80850874: -/* 1E664 80850874 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E668 80850878 8FA50020 */ lw $a1, 0x0020($sp) -/* 1E66C 8085087C 17000023 */ bne $t8, $zero, .L8085090C -/* 1E670 80850880 00036880 */ sll $t5, $v1, 2 -/* 1E674 80850884 0003C880 */ sll $t9, $v1, 2 +/* 1E664 80850874 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E668 80850878 8FA50020 */ lw $a1, 0x0020($sp) +/* 1E66C 8085087C 17000023 */ bne $t8, $zero, .L8085090C +/* 1E670 80850880 00036880 */ sll $t5, $v1, 2 +/* 1E674 80850884 0003C880 */ sll $t9, $v1, 2 /* 1E678 80850888 3C068085 */ lui $a2, %hi(D_80854A58) ## $a2 = 80850000 -/* 1E67C 8085088C 00D93021 */ addu $a2, $a2, $t9 +/* 1E67C 8085088C 00D93021 */ addu $a2, $a2, $t9 /* 1E680 80850890 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 /* 1E684 80850894 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 -/* 1E688 80850898 8CC64A58 */ lw $a2, %lo(D_80854A58)($a2) -/* 1E68C 8085089C 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E690 808508A0 0C029037 */ jal func_800A40DC -/* 1E694 808508A4 8FA50020 */ lw $a1, 0x0020($sp) -/* 1E698 808508A8 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E688 80850898 8CC64A58 */ lw $a2, %lo(D_80854A58)($a2) +/* 1E68C 8085089C 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E690 808508A0 0C029037 */ jal SkelAnime_LinkChangeAnimationPlaybackStop +/* 1E694 808508A4 8FA50020 */ lw $a1, 0x0020($sp) +/* 1E698 808508A8 8FA4002C */ lw $a0, 0x002C($sp) /* 1E69C 808508AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E6A0 808508B0 0C211A80 */ jal func_80846A00 +/* 1E6A0 808508B0 0C211A80 */ jal func_80846A00 /* 1E6A4 808508B4 8206084F */ lb $a2, 0x084F($s0) ## 0000084F -/* 1E6A8 808508B8 10400010 */ beq $v0, $zero, .L808508FC +/* 1E6A8 808508B8 10400010 */ beq $v0, $zero, .L808508FC /* 1E6AC 808508BC 00000000 */ nop /* 1E6B0 808508C0 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 1E6B4 808508C4 820A084F */ lb $t2, 0x084F($s0) ## 0000084F /* 1E6B8 808508C8 3C013000 */ lui $at, 0x3000 ## $at = 30000000 /* 1E6BC 808508CC 01014825 */ or $t1, $t0, $at ## $t1 = 30000000 -/* 1E6C0 808508D0 15400005 */ bne $t2, $zero, .L808508E8 +/* 1E6C0 808508D0 15400005 */ bne $t2, $zero, .L808508E8 /* 1E6C4 808508D4 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C /* 1E6C8 808508D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 1E6CC 808508DC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 1E6D0 808508E0 804B13B3 */ lb $t3, 0x13B3($v0) ## 8015FA13 -/* 1E6D4 808508E4 1D600014 */ bgtz $t3, .L80850938 +/* 1E6D4 808508E4 1D600014 */ bgtz $t3, .L80850938 .L808508E8: /* 1E6D8 808508E8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 1E6DC 808508EC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 1E6E0 808508F0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 1E6E4 808508F4 10000010 */ beq $zero, $zero, .L80850938 +/* 1E6E4 808508F4 10000010 */ beq $zero, $zero, .L80850938 /* 1E6E8 808508F8 A44C13F0 */ sh $t4, 0x13F0($v0) ## 8015FA50 .L808508FC: -/* 1E6EC 808508FC 0C021DB2 */ jal func_800876C8 -/* 1E6F0 80850900 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E6F4 80850904 1000000D */ beq $zero, $zero, .L8085093C +/* 1E6EC 808508FC 0C021DB2 */ jal func_800876C8 +/* 1E6F0 80850900 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E6F4 80850904 1000000D */ beq $zero, $zero, .L8085093C /* 1E6F8 80850908 86180850 */ lh $t8, 0x0850($s0) ## 00000850 .L8085090C: /* 1E6FC 8085090C 3C068085 */ lui $a2, %hi(D_80854A64) ## $a2 = 80850000 -/* 1E700 80850910 00CD3021 */ addu $a2, $a2, $t5 +/* 1E700 80850910 00CD3021 */ addu $a2, $a2, $t5 /* 1E704 80850914 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 /* 1E708 80850918 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 -/* 1E70C 8085091C 0C029067 */ jal func_800A419C -/* 1E710 80850920 8CC64A64 */ lw $a2, %lo(D_80854A64)($a2) +/* 1E70C 8085091C 0C029067 */ jal SkelAnime_LinkChangeAnimationPlaybackRepeat +/* 1E710 80850920 8CC64A64 */ lw $a2, %lo(D_80854A64)($a2) /* 1E714 80850924 820E084F */ lb $t6, 0x084F($s0) ## 0000084F /* 1E718 80850928 240FFFF6 */ addiu $t7, $zero, 0xFFF6 ## $t7 = FFFFFFF6 -/* 1E71C 8085092C 55C00003 */ bnel $t6, $zero, .L8085093C +/* 1E71C 8085092C 55C00003 */ bnel $t6, $zero, .L8085093C /* 1E720 80850930 86180850 */ lh $t8, 0x0850($s0) ## 00000850 /* 1E724 80850934 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 .L80850938: /* 1E728 80850938 86180850 */ lh $t8, 0x0850($s0) ## 00000850 .L8085093C: /* 1E72C 8085093C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 1E730 80850940 10000063 */ beq $zero, $zero, .L80850AD0 +/* 1E730 80850940 10000063 */ beq $zero, $zero, .L80850AD0 /* 1E734 80850944 A6190850 */ sh $t9, 0x0850($s0) ## 00000850 /* 1E738 80850948 86020850 */ lh $v0, 0x0850($s0) ## 00000850 .L8085094C: -/* 1E73C 8085094C 0441002B */ bgez $v0, .L808509FC +/* 1E73C 8085094C 0441002B */ bgez $v0, .L808509FC /* 1E740 80850950 24480001 */ addiu $t0, $v0, 0x0001 ## $t0 = 00000001 /* 1E744 80850954 A6080850 */ sh $t0, 0x0850($s0) ## 00000850 /* 1E748 80850958 86090850 */ lh $t1, 0x0850($s0) ## 00000850 /* 1E74C 8085095C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 1E750 80850960 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 1E754 80850964 1520005A */ bne $t1, $zero, .L80850AD0 +/* 1E754 80850964 1520005A */ bne $t1, $zero, .L80850AD0 /* 1E758 80850968 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 1E75C 8085096C A04A13B3 */ sb $t2, 0x13B3($v0) ## 8015FA13 -/* 1E760 80850970 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E760 80850970 8FA4002C */ lw $a0, 0x002C($sp) /* 1E764 80850974 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 1E768 80850978 0C0302BD */ jal func_800C0AF4 +/* 1E768 80850978 0C0302BD */ jal func_800C0AF4 /* 1E76C 8085097C 240606FF */ addiu $a2, $zero, 0x06FF ## $a2 = 000006FF /* 1E770 80850980 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 1E774 80850984 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 1E778 80850988 C4441368 */ lwc1 $f4, 0x1368($v0) ## 8015F9C8 /* 1E77C 8085098C C448136C */ lwc1 $f8, 0x136C($v0) ## 8015F9CC /* 1E780 80850990 C4501370 */ lwc1 $f16, 0x1370($v0) ## 8015F9D0 -/* 1E784 80850994 4600218D */ trunc.w.s $f6, $f4 +/* 1E784 80850994 4600218D */ trunc.w.s $f6, $f4 /* 1E788 80850998 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 1E78C 8085099C AC4B0E80 */ sw $t3, 0x0E80($v0) ## 8015F4E0 -/* 1E790 808509A0 4600428D */ trunc.w.s $f10, $f8 -/* 1E794 808509A4 440D3000 */ mfc1 $t5, $f6 +/* 1E790 808509A0 4600428D */ trunc.w.s $f10, $f8 +/* 1E794 808509A4 440D3000 */ mfc1 $t5, $f6 /* 1E798 808509A8 84481374 */ lh $t0, 0x1374($v0) ## 8015F9D4 -/* 1E79C 808509AC 4600848D */ trunc.w.s $f18, $f16 +/* 1E79C 808509AC 4600848D */ trunc.w.s $f18, $f16 /* 1E7A0 808509B0 AC4D0E64 */ sw $t5, 0x0E64($v0) ## 8015F4C4 -/* 1E7A4 808509B4 440F5000 */ mfc1 $t7, $f10 +/* 1E7A4 808509B4 440F5000 */ mfc1 $t7, $f10 /* 1E7A8 808509B8 844A1378 */ lh $t2, 0x1378($v0) ## 8015F9D8 -/* 1E7AC 808509BC 44199000 */ mfc1 $t9, $f18 +/* 1E7AC 808509BC 44199000 */ mfc1 $t9, $f18 /* 1E7B0 808509C0 904B137A */ lbu $t3, 0x137A($v0) ## 8015F9DA /* 1E7B4 808509C4 8C4C137C */ lw $t4, 0x137C($v0) ## 8015F9DC /* 1E7B8 808509C8 8C4D1380 */ lw $t5, 0x1380($v0) ## 8015F9E0 @@ -135,71 +135,71 @@ glabel func_808507F4 /* 1E7D8 808509E8 AC4B0E7C */ sw $t3, 0x0E7C($v0) ## 8015F4DC /* 1E7DC 808509EC AC4C0E84 */ sw $t4, 0x0E84($v0) ## 8015F4E4 /* 1E7E0 808509F0 AC4D0E88 */ sw $t5, 0x0E88($v0) ## 8015F4E8 -/* 1E7E4 808509F4 10000036 */ beq $zero, $zero, .L80850AD0 +/* 1E7E4 808509F4 10000036 */ beq $zero, $zero, .L80850AD0 /* 1E7E8 808509F8 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 .L808509FC: /* 1E7EC 808509FC 8203084F */ lb $v1, 0x084F($s0) ## 0000084F -/* 1E7F0 80850A00 04600033 */ bltz $v1, .L80850AD0 +/* 1E7F0 80850A00 04600033 */ bltz $v1, .L80850AD0 /* 1E7F4 80850A04 00000000 */ nop -/* 1E7F8 80850A08 14400007 */ bne $v0, $zero, .L80850A28 +/* 1E7F8 80850A08 14400007 */ bne $v0, $zero, .L80850A28 /* 1E7FC 80850A0C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 1E800 80850A10 3C058085 */ lui $a1, %hi(D_80854A80) ## $a1 = 80850000 /* 1E804 80850A14 24A54A80 */ addiu $a1, $a1, %lo(D_80854A80) ## $a1 = 80854A80 -/* 1E808 80850A18 0C20CA49 */ jal func_80832924 +/* 1E808 80850A18 0C20CA49 */ jal func_80832924 /* 1E80C 80850A1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E810 80850A20 1000002B */ beq $zero, $zero, .L80850AD0 +/* 1E810 80850A20 1000002B */ beq $zero, $zero, .L80850AD0 /* 1E814 80850A24 00000000 */ nop .L80850A28: -/* 1E818 80850A28 14410016 */ bne $v0, $at, .L80850A84 +/* 1E818 80850A28 14410016 */ bne $v0, $at, .L80850A84 /* 1E81C 80850A2C 3C0A8085 */ lui $t2, %hi(D_80854A7C) ## $t2 = 80850000 /* 1E820 80850A30 3C188085 */ lui $t8, %hi(D_80854A8C) ## $t8 = 80850000 /* 1E824 80850A34 27184A8C */ addiu $t8, $t8, %lo(D_80854A8C) ## $t8 = 80854A8C -/* 1E828 80850A38 000378C0 */ sll $t7, $v1, 3 -/* 1E82C 80850A3C 01F82821 */ addu $a1, $t7, $t8 -/* 1E830 80850A40 0C20CA49 */ jal func_80832924 +/* 1E828 80850A38 000378C0 */ sll $t7, $v1, 3 +/* 1E82C 80850A3C 01F82821 */ addu $a1, $t7, $t8 +/* 1E830 80850A40 0C20CA49 */ jal func_80832924 /* 1E834 80850A44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1E838 80850A48 8219084F */ lb $t9, 0x084F($s0) ## 0000084F /* 1E83C 80850A4C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1E840 80850A50 8FA40020 */ lw $a0, 0x0020($sp) -/* 1E844 80850A54 1721001E */ bne $t9, $at, .L80850AD0 +/* 1E840 80850A50 8FA40020 */ lw $a0, 0x0020($sp) +/* 1E844 80850A54 1721001E */ bne $t9, $at, .L80850AD0 /* 1E848 80850A58 00000000 */ nop -/* 1E84C 80850A5C 0C02914C */ jal func_800A4530 +/* 1E84C 80850A5C 0C02914C */ jal func_800A4530 /* 1E850 80850A60 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 1E854 80850A64 1040001A */ beq $v0, $zero, .L80850AD0 +/* 1E854 80850A64 1040001A */ beq $v0, $zero, .L80850AD0 /* 1E858 80850A68 00000000 */ nop /* 1E85C 80850A6C 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 1E860 80850A70 3C01CFFF */ lui $at, 0xCFFF ## $at = CFFF0000 /* 1E864 80850A74 3421FFFF */ ori $at, $at, 0xFFFF ## $at = CFFFFFFF -/* 1E868 80850A78 01014824 */ and $t1, $t0, $at -/* 1E86C 80850A7C 10000014 */ beq $zero, $zero, .L80850AD0 +/* 1E868 80850A78 01014824 */ and $t1, $t0, $at +/* 1E86C 80850A7C 10000014 */ beq $zero, $zero, .L80850AD0 /* 1E870 80850A80 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C .L80850A84: -/* 1E874 80850A84 01435021 */ addu $t2, $t2, $v1 -/* 1E878 80850A88 914A4A7C */ lbu $t2, %lo(D_80854A7C)($t2) +/* 1E874 80850A84 01435021 */ addu $t2, $t2, $v1 +/* 1E878 80850A88 914A4A7C */ lbu $t2, %lo(D_80854A7C)($t2) /* 1E87C 80850A8C 244B0001 */ addiu $t3, $v0, 0x0001 ## $t3 = 00000001 /* 1E880 80850A90 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 -/* 1E884 80850A94 0142202A */ slt $a0, $t2, $v0 -/* 1E888 80850A98 1080000D */ beq $a0, $zero, .L80850AD0 -/* 1E88C 80850A9C 8FA50020 */ lw $a1, 0x0020($sp) -/* 1E890 80850AA0 00036080 */ sll $t4, $v1, 2 +/* 1E884 80850A94 0142202A */ slt $a0, $t2, $v0 +/* 1E888 80850A98 1080000D */ beq $a0, $zero, .L80850AD0 +/* 1E88C 80850A9C 8FA50020 */ lw $a1, 0x0020($sp) +/* 1E890 80850AA0 00036080 */ sll $t4, $v1, 2 /* 1E894 80850AA4 3C068085 */ lui $a2, %hi(D_80854A70) ## $a2 = 80850000 -/* 1E898 80850AA8 00CC3021 */ addu $a2, $a2, $t4 +/* 1E898 80850AA8 00CC3021 */ addu $a2, $a2, $t4 /* 1E89C 80850AAC 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 /* 1E8A0 80850AB0 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 -/* 1E8A4 80850AB4 8CC64A70 */ lw $a2, %lo(D_80854A70)($a2) -/* 1E8A8 80850AB8 0C029037 */ jal func_800A40DC -/* 1E8AC 80850ABC 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E8A4 80850AB4 8CC64A70 */ lw $a2, %lo(D_80854A70)($a2) +/* 1E8A8 80850AB8 0C029037 */ jal SkelAnime_LinkChangeAnimationPlaybackStop +/* 1E8AC 80850ABC 8FA4002C */ lw $a0, 0x002C($sp) /* 1E8B0 80850AC0 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 /* 1E8B4 80850AC4 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF /* 1E8B8 80850AC8 A20E084F */ sb $t6, 0x084F($s0) ## 0000084F /* 1E8BC 80850ACC A60D083C */ sh $t5, 0x083C($s0) ## 0000083C .L80850AD0: -/* 1E8C0 80850AD0 0C20DC87 */ jal func_8083721C +/* 1E8C0 80850AD0 0C20DC87 */ jal func_8083721C /* 1E8C4 80850AD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E8C8 80850AD8 8FBF001C */ lw $ra, 0x001C($sp) -/* 1E8CC 80850ADC 8FB00018 */ lw $s0, 0x0018($sp) +/* 1E8C8 80850AD8 8FBF001C */ lw $ra, 0x001C($sp) +/* 1E8CC 80850ADC 8FB00018 */ lw $s0, 0x0018($sp) /* 1E8D0 80850AE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1E8D4 80850AE4 03E00008 */ jr $ra +/* 1E8D4 80850AE4 03E00008 */ jr $ra /* 1E8D8 80850AE8 00000000 */ nop diff --git a/baserom.z64.txt b/baserom.z64.txt new file mode 100644 index 0000000000..afc6a1d8e8 --- /dev/null +++ b/baserom.z64.txt @@ -0,0 +1,378 @@ +00FDC000 00037800 object_link_boy +01014000 0002CF80 object_link_child +01041000 00006000 object_box +01047000 00013180 object_human +0105B000 00003C80 object_okuta +0105F000 000050E0 object_poh +01065000 0000A070 object_wallmaster +01070000 0001D530 object_dy_obj +0108E000 000018C0 object_firefly +01090000 00009940 object_dodongo +0109A000 000040A0 object_fire +0109F000 00002540 object_niw +010A2000 00003A30 object_tite +010A6000 00001EF0 object_reeba +010A8000 00001C90 object_peehat +010AA000 00030CE0 object_kingdodongo +010DB000 0000DF10 object_horse +010E9000 000163A0 object_zf +01100000 0001F600 object_goma +01120000 000143C0 object_zl1 +01135000 00004220 object_gol +0113A000 000010C0 object_bubble +0113C000 000020F0 object_dodojr +0113F000 00004770 object_torch2 +01144000 00005850 object_bl +0114A000 00001CF0 object_tp +0114C000 00004710 object_oA1 +01151000 00005BB0 object_st +01157000 00002260 object_bw +0115A000 00003420 object_ei +0115E000 00009FC0 object_horse_normal +01168000 000066B0 object_oB1 +0116F000 00002150 object_o_anime +01172000 000016C0 object_spot04_objects +01174000 00008760 object_ddan_objects +0117D000 00017D20 object_hidan_objects +01195000 0000C090 object_horse_ganon +011A2000 000056D0 object_oA2 +011A8000 00001C10 object_spot00_objects +011AA000 000141A0 object_mb +011BF000 00001A00 object_bombf +011C1000 0000E800 object_sk2 +011D0000 00006810 object_oE1 +011D7000 00005060 object_oE_anime +011DD000 00005A70 object_oE2 +011E3000 00009080 object_ydan_objects +011ED000 00013000 object_gnd +01200000 00005B50 object_am +01206000 000039C0 object_dekubaba +0120A000 00002130 object_oA3 +0120D000 00001730 object_oA4 +0120F000 000016B0 object_oA5 +01211000 00001A00 object_oA6 +01213000 00001550 object_oA7 +01215000 0000BAC0 object_jj +01221000 000017B0 object_oA8 +01223000 00000520 object_oA9 +01224000 000040E0 object_oB2 +01229000 00004490 object_oB3 +0122E000 00001870 object_oB4 +01230000 00007160 object_horse_zelda +01238000 00005060 object_opening_demo1 +0123E000 00002CB0 object_warp1 +01241000 00000640 object_b_heart +01242000 00003660 object_dekunuts +01246000 00007120 object_oE3 +0124E000 00004FD0 object_oE4 +01253000 00008B10 object_menkuri_objects +0125C000 000055C0 object_oE5 +01262000 00002E50 object_oE6 +01265000 00002A60 object_oE7 +01268000 000033D0 object_oE8 +0126C000 00002F10 object_oE9 +0126F000 000029D0 object_oE10 +01272000 000031F0 object_oE11 +01276000 000037C0 object_oE12 +0127A000 00004850 object_vali +0127F000 00002EB0 object_oA10 +01282000 000015C0 object_oA11 +01284000 0000B320 object_mizu_objects +01290000 000121E0 object_fhg +012A3000 00009B50 object_ossan +012AD000 000054F0 object_mori_hineri1 +012B3000 00001A40 object_Bb +012B5000 00008450 object_toki_objects +012BE000 000014F0 object_yukabyun +012C0000 00010D80 object_zl2 +012D1000 00001290 object_mjin +012D3000 00001000 object_mjin_flash +012D4000 00001000 object_mjin_dark +012D5000 00001000 object_mjin_flame +012D6000 00001000 object_mjin_ice +012D7000 00001000 object_mjin_soul +012D8000 00001000 object_mjin_wind +012D9000 00001B60 object_mjin_oka +012DB000 0001D6B0 object_haka_objects +012F9000 00002DA0 object_spot06_objects +012FC000 00008D50 object_ice_objects +01305000 00003630 object_relay_objects +01309000 000034C0 object_mori_hineri1a +0130D000 00004400 object_mori_hineri2 +01312000 000060B0 object_mori_hineri2a +01319000 00008A10 object_mori_objects +01322000 00009E00 object_mori_tex +0132C000 00005600 object_spot08_obj +01332000 00000010 object_warp2 +01333000 00002FE0 object_hata +01336000 000021A0 object_bird +01339000 000087D0 object_wood02 +01342000 00001F40 object_lightbox +01344000 00001600 object_pu_box +01346000 000023E0 object_trap +01349000 00001590 object_vase +0134B000 00012230 object_im +0135E000 0000E3F0 object_ta +0136D000 0000BE50 object_tk +01379000 0001C100 object_xc +01396000 00003F70 object_vm +0139A000 0001F1B0 object_bv +013BA000 00006AF0 object_hakach_objects +013C1000 00000AA0 object_efc_crystal_light +013C2000 00000D00 object_efc_fire_ball +013C3000 00000010 object_efc_flash +013C4000 000012D0 object_efc_lgt_shower +013C6000 000017D0 object_efc_star_field +013C8000 00004350 object_god_lgt +013CD000 00001280 object_light_ring +013CF000 00002910 object_triforce_spot +013D2000 00005140 object_medal +013D8000 0000CD10 object_bdan_objects +013E5000 0000C6E0 object_sd +013F2000 0000EFF0 object_rd +01401000 0000E3C0 object_po_sisters +01410000 00001AE0 object_heavy_object +01412000 00011A00 object_gndd +01424000 00011670 object_fd +01436000 00012030 object_du +01449000 00007DE0 object_fw +01451000 00008B20 object_horse_link_child +0145A000 00016620 object_spot02_objects +01471000 00001460 object_haka +01473000 00013A80 object_ru1 +01487000 00003C90 object_syokudai +0148B000 00011A90 object_fd2 +0149D000 000090C0 object_dh +014A7000 00007B50 object_rl +014AF000 000012F0 object_efc_tw +014B1000 00000010 object_demo_tre_lgt +014B2000 00000A20 object_gi_key +014B3000 00001D00 object_mir_ray +014B5000 00001AA0 object_brob +014B7000 00003680 object_gi_jewel +014BB000 00018890 object_spot09_obj +014D4000 0000CA10 object_spot18_obj +014E1000 000075C0 object_bdoor +014E9000 00001830 object_spot17_obj +014EB000 00003A20 object_shop_dungen +014EF000 000181E0 object_nb +01508000 00009070 object_mo +01512000 00002CA0 object_sb +01515000 00000D20 object_gi_melody +01516000 000001F0 object_gi_heart +01517000 00000D10 object_gi_compass +01518000 00001010 object_gi_bosskey +0151A000 00005370 object_gi_medal +01520000 000011C0 object_gi_nuts +01522000 00015230 object_sa +01538000 000017B0 object_gi_hearts +0153A000 00000CB0 object_gi_arrowcase +0153B000 00000E60 object_gi_bombpouch +0153C000 00018C50 object_in +01555000 00012E30 object_tr +01568000 00001500 object_spot16_obj +0156A000 00006560 object_oE1s +01571000 00004E00 object_oE4s +01576000 0000A640 object_os_anime +01581000 000008F0 object_gi_bottle +01582000 000006C0 object_gi_stick +01583000 00001160 object_gi_map +01585000 000105A0 object_oF1d_map +01596000 0000F8D0 object_ru2 +015A6000 00000D50 object_gi_shield_1 +015A7000 00003510 object_dekujr +015AB000 000011D0 object_gi_magicpot +015AD000 00000CB0 object_gi_bomb_1 +015AE000 000088A0 object_oF1s +015B7000 00009EF0 object_ma2 +015C1000 00001B70 object_gi_purse +015C3000 0000AF70 object_hni +015CE000 0003AFB0 object_tw +01609000 00000E00 object_rr +0160A000 00002BF0 object_bxa +0160D000 000039A0 object_anubice +01611000 00001340 object_gi_gerudo +01613000 00001B10 object_gi_arrow +01615000 000006A0 object_gi_bomb_2 +01616000 00001320 object_gi_egg +01618000 00000DF0 object_gi_scale +01619000 00001070 object_gi_shield_2 +0161B000 00001560 object_gi_hookshot +0161D000 00000BB0 object_gi_ocarina +0161E000 00001470 object_gi_milk +01620000 00008D80 object_ma1 +01629000 00011500 object_ganon +0163B000 0001ABB0 object_sst +01656000 00002170 object_ny +01659000 0000B4B0 object_fr +01665000 00000C60 object_gi_pachinko +01666000 00000DA0 object_gi_boomerang +01667000 00000D30 object_gi_bow +01668000 00001180 object_gi_glasses +0166A000 000018D0 object_gi_liquid +0166C000 00007700 object_ani +01674000 00003BA0 object_demo_6k +01678000 000012C0 object_gi_shield_3 +0167A000 00000E00 object_gi_letter +0167B000 00001D00 object_spot15_obj +0167D000 0001C140 object_jya_obj +0169A000 00001860 object_gi_clothes +0169C000 000008C0 object_gi_bean +0169D000 00000950 object_gi_fish +0169E000 00000B80 object_gi_saw +0169F000 00000CC0 object_gi_hammer +016A0000 00000C10 object_gi_grass +016A1000 000008C0 object_gi_longsword +016A2000 00002490 object_spot01_objects +016A5000 0000A150 object_md +016B0000 000059C0 object_km1 +016B6000 000068E0 object_kw1 +016BD000 0000C040 object_zo +016CA000 000086E0 object_kz +016D3000 00001470 object_umajump +016D5000 000004C0 object_masterkokiri +016D6000 00002CA0 object_masterkokirihead +016D9000 00000110 object_mastergolon +016DA000 000007A0 object_masterzoora +016DB000 000056B0 object_aob +016E1000 000205D0 object_ik +01702000 000059B0 object_ahg +01708000 000029D0 object_cne +0170B000 000019F0 object_gi_niwatori +0170D000 00008E30 object_skj +01716000 00000C80 object_gi_bottle_letter +01717000 00004190 object_bji +0171C000 00004290 object_bba +01721000 00000C10 object_gi_ocarina_0 +01722000 00004780 object_ds +01727000 00006FB0 object_ane +0172E000 00005CC0 object_boj +01734000 00001660 object_spot03_object +01736000 00006D30 object_spot07_object +0173D000 000034D0 object_fz +01741000 00004F20 object_bob +01746000 0000A4B0 object_ge1 +01751000 00000E50 object_yabusame_point +01752000 00001BC0 object_gi_boots_2 +01754000 00000AC0 object_gi_seed +01755000 00001280 object_gnd_magic +01757000 00001390 object_d_elevator +01759000 00001760 object_d_hsblock +0175B000 00001800 object_d_lift +0175D000 000026E0 object_mamenoki +01760000 000018A0 object_goroiwa +01762000 00007160 object_toryo +0176A000 00008870 object_daiku +01773000 00000DA0 object_nwc +01774000 00013890 object_blkobj +01788000 000002D0 object_gm +01789000 00003DD0 object_ms +0178D000 00006270 object_hs +01794000 000011F0 object_ingate +01796000 00002420 object_lightswitch +01799000 00000380 object_kusa +0179A000 000019F0 object_tsubo +0179C000 00001960 object_gi_gloves +0179E000 00000850 object_gi_coin +0179F000 000017B0 object_kanban +017A1000 000015F0 object_gjyo_objects +017A3000 000100C0 object_owl +017B4000 00005E00 object_mk +017BA000 00006CA0 object_fu +017C1000 00000DF0 object_gi_ki_tan_mask +017C2000 00000A90 object_gi_redead_mask +017C3000 00000CE0 object_gi_skj_mask +017C4000 00000F00 object_gi_rabit_mask +017C5000 00001860 object_gi_truth_mask +017C7000 00001170 object_ganon_objects +017C9000 00000DB0 object_siofuki +017CA000 00000A80 object_stream +017CB000 00008070 object_mm +017D4000 00003B90 object_fa +017D8000 00004670 object_os +017DD000 00000970 object_gi_eye_lotion +017DE000 00000B80 object_gi_powder +017DF000 00000CD0 object_gi_mushroom +017E0000 000012A0 object_gi_ticketstone +017E2000 00000990 object_gi_brokensword +017E3000 00005F30 object_js +017E9000 00008550 object_cs +017F2000 00000C20 object_gi_prescription +017F3000 00000BF0 object_gi_bracelet +017F4000 000004D0 object_gi_soldout +017F5000 00001110 object_gi_frog +017F7000 00025940 object_mag +0181D000 000009A0 object_door_gerudo +0181E000 000135F0 object_gt +01832000 000028F0 object_efc_erupc +01835000 0000B610 object_zl2_anime1 +01841000 0000AAE0 object_zl2_anime2 +0184C000 000017B0 object_gi_golonmask +0184E000 00001630 object_gi_zoramask +01850000 00001400 object_gi_gerudomask +01852000 00035BF0 object_ganon2 +01888000 000067C0 object_ka +0188F000 00004FF0 object_ts +01894000 00001200 object_zg +01896000 00001E70 object_gi_hoverboots +01898000 00000E80 object_gi_m_arrow +01899000 00004270 object_ds2 +0189E000 0000C930 object_ec +018AB000 000155F0 object_fish +018C1000 00000650 object_gi_sutaru +018C2000 00000C50 object_gi_goddess +018C3000 00005C00 object_ssh +018C9000 00006BD0 object_bigokuta +018D0000 000072C0 object_bg +018D8000 000012F0 object_spot05_objects +018DA000 000023C0 object_spot12_obj +018DD000 00000B00 object_bombiwa +018DE000 00003140 object_hintnuts +018E2000 00004880 object_rs +018E7000 00001E20 object_spot00_break +018E9000 00009EF0 object_gla +018F3000 00004590 object_shopnuts +018F8000 0000B6F0 object_geldb +01904000 00009C90 object_gr +0190E000 000072A0 object_dog +01916000 00002660 object_jya_iron +01919000 00002280 object_jya_door +0191C000 00000010 object_spot01_objects2 +0191D000 00001A90 object_spot11_obj +0191F000 000010C0 object_kibako2 +01921000 000037D0 object_dns +01925000 00002E30 object_dnk +01928000 00000FE0 object_gi_fire +01929000 00000BF0 object_gi_insect +0192A000 00000BD0 object_gi_butterfly +0192B000 00000DB0 object_gi_ghost +0192C000 00000FB0 object_gi_soul +0192D000 000034F0 object_bowl +01931000 00006A40 object_po_field +01938000 0000ED10 object_demo_kekkai +01947000 00001050 object_efc_doughnut +01949000 00001050 object_gi_dekupouch +0194B000 0000BC40 object_ganon_anime1 +01957000 00010530 object_ganon_anime2 +01968000 000147F0 object_ganon_anime3 +0197D000 00000800 object_gi_rupy +0197E000 00003C90 object_spot01_matoya +01982000 000021E0 object_spot01_matoyab +01985000 00006FA0 object_po_composer +0198C000 0000AE50 object_mu +01997000 0000A500 object_wf +019A2000 00004810 object_skb +019A7000 0000A720 object_gj +019B2000 00000FB0 object_geff +019B3000 00003970 object_haka_door +019B7000 00000A80 object_gs +019B8000 0000C900 object_ps +019C5000 00001150 object_bwall +019C7000 000010D0 object_crow +019C9000 00004EB0 object_cow +019CE000 00002210 object_cob +019D1000 00000D20 object_gi_sword_1 +019D2000 00001BE0 object_door_killer +019D4000 00000970 object_ouke_haka +019D5000 00000B60 object_timeblock +019D6000 0001CE20 object_zl4 diff --git a/include/functions.h b/include/functions.h index 4696a562d2..15d8d4143d 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1173,17 +1173,17 @@ void SkelAnime_InitLinkAnimetion(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, s32 flags, Vec3s* actorDrawTbl, Vec3s* arg6, s32 limbBufCount); void func_800A3B8C(SkelAnime* skelAnime); -void func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime); +s32 func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime); void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime); void func_800A3EE8(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2); void SkelAnime_LinkChangeAnimation(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed, f32 frame, f32 frameCount, u8 arg6, f32 transitionRate); -void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg); -void func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, +void SkelAnime_LinkChangeAnimationDefaultStop(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg); +void SkelAnime_LinkChangeAnimationPlaybackStop(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed); -void func_800A4140(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg); -void func_800A419C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, +void SkelAnime_LinkChangeAnimationDefaultRepeat(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg); +void SkelAnime_LinkChangeAnimationPlaybackRepeat(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed); void func_800A41FC(GlobalContext* globalCtx, SkelAnime* skelAnime); void func_800A425C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, @@ -1207,13 +1207,13 @@ void SkelAnime_ChangeAnimationImpl(SkelAnime* skelAnime, AnimationHeader* animat f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2); void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed, f32 unk0, f32 frameCount, u8 unk1, f32 transitionRate); -void SkelAnimeChangeAnimationDefaultStop(SkelAnime* skelAnime, AnimationHeader* animationseg); +void SkelAnime_ChangeAnimationDefaultStop(SkelAnime* skelAnime, AnimationHeader* animationseg); void SkelAnime_ChangeAnimationTransitionStop(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 transitionRate); void SkelAnime_ChangeAnimationPlaybackStop(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed); void SkelAnime_ChangeAnimationDefaultRepeat(SkelAnime* skelAnime, AnimationHeader* animationseg); void SkelAnime_ChangeAnimationTransitionRepeat(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 transitionRate); void SkelAnime_ChangeAnimationPlaybackRepeat(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed); -void func_800A5408(SkelAnime* skelAnime); +void SkelAnime_AnimationReverse(SkelAnime* skelAnime); void func_800A5428(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* index); void func_800A54FC(SkelAnime* skelAnime, Vec3f* pos, s16 angle); s32 func_800A56C8(SkelAnime* skelAnime, f32 arg1); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index e055cd356c..ca38ec0465 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -3,7 +3,7 @@ #include #define ONE_THIRD (1.0f / 3.0f) - +#define NON_MATCHING s32 func_800A3D70(GlobalContext*, SkelAnime*); s32 func_800A3E0C(GlobalContext*, SkelAnime*); s32 func_800A4D9C(SkelAnime* skelAnime); @@ -17,7 +17,7 @@ void SkelAnime_AnimationType2Loaded(GlobalContext* globalCtx, AnimationEntryType void SkelAnime_AnimationType3Loaded(GlobalContext* globalCtx, AnimationEntryType3* entry); void SkelAnime_AnimationType4Loaded(GlobalContext* globalCtx, AnimationEntryType4* entry); void SkelAnime_AnimationType5Loaded(GlobalContext* globalCtx, AnimationEntryType5* entry); -//#define NON_MATCHING + //.data u32 D_8012A480 = 0; static AnimationEntryCallback sAnimationLoadDone[] = { @@ -768,7 +768,61 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* acto return gfx; } +#ifdef NON_MATCHING +s32 func_800A29BC(s32 arg0, s32 arg1, Vec3s *arg2) +{ + s16* temp_t1; + s16* temp_a3; + AnimationHeader *temp_v0; + s32 phi_v0; + s32 t; + + temp_v0 = SEGMENTED_TO_VIRTUAL(arg0); + t = temp_v0->genericHeader.unk_02; + temp_a3 = SEGMENTED_TO_VIRTUAL(temp_v0->rotationIndexSeg); + temp_t1 = SEGMENTED_TO_VIRTUAL(temp_v0->rotationValueSeg); + + arg2->x = arg1 < temp_a3[0] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[1]] : temp_t1[temp_a3[1]]; + arg2->y = arg1 < temp_a3[2] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[3]] : temp_t1[temp_a3[3]]; + arg2->z = arg1 < temp_a3[4] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[5]] : temp_t1[temp_a3[5]]; + + phi_v0 = 1; + arg2++; + temp_a3 += 6; + + if(t > 0){ + if(t & 1){ + phi_v0++; + arg2->x = arg1 < temp_a3[0] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[1]] : temp_t1[temp_a3[1]]; + arg2->y = arg1 < temp_a3[2] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[3]] : temp_t1[temp_a3[3]]; + arg2->z = arg1 < temp_a3[4] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[5]] : temp_t1[temp_a3[5]]; + temp_a3 += 6; + arg2++; + if(t + 1 == phi_v0){ + goto ret; + } + } + do{ + phi_v0 += 2; + arg2->x = arg1 < temp_a3[0] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[1]] : temp_t1[temp_a3[1]]; + arg2->y = arg1 < temp_a3[2] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[3]] : temp_t1[temp_a3[3]]; + arg2->z = arg1 < temp_a3[4] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[5]] : temp_t1[temp_a3[5]]; + temp_a3 += 6; + arg2++; + arg2->x = arg1 < temp_a3[0] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[1]] : temp_t1[temp_a3[1]]; + arg2->y = arg1 < temp_a3[2] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[3]] : temp_t1[temp_a3[3]]; + arg2->z = arg1 < temp_a3[4] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[5]] : temp_t1[temp_a3[5]]; + temp_a3 += 6; + arg2++; + } while(phi_v0 != t + 1); + + } +ret: + return t; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A29BC.s") +#endif s16 func_800A2DBC(GenericAnimationHeader* animationSeg) { GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); @@ -1067,8 +1121,8 @@ void func_800A3B8C(SkelAnime* skelAnime) { skelAnime->transCurrentFrame = 0.0f; } -void func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime) { - skelAnime->animUpdate(globalCtx, skelAnime); +s32 func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime) { + return skelAnime->animUpdate(globalCtx, skelAnime); } s32 func_800A3BE4(GlobalContext* globalCtx, SkelAnime* skelAnime) { @@ -1176,23 +1230,23 @@ void SkelAnime_LinkChangeAnimation(GlobalContext* globalCtx, SkelAnime* skelAnim skelAnime->animPlaybackSpeed = playbackSpeed; } -void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg) { +void SkelAnime_LinkChangeAnimationDefaultStop(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg) { SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 2, 0.0f); } -void func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, +void SkelAnime_LinkChangeAnimationPlaybackStop(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed) { SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 2, 0.0f); } -void func_800A4140(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg) { +void SkelAnime_LinkChangeAnimationDefaultRepeat(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg) { SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 0, 0.0f); } -void func_800A419C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, +void SkelAnime_LinkChangeAnimationPlaybackRepeat(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed) { SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 0, 0.0f); @@ -1259,21 +1313,17 @@ s32 func_800A4478(SkelAnime* skelAnime, f32 arg1, f32 updateRate) { nextFrame = skelAnime->animCurrentFrame - updateSpeed; if (nextFrame < 0.0f) { nextFrame += skelAnime->totalFrames; - } else { - if (skelAnime->totalFrames <= nextFrame) { - nextFrame -= skelAnime->totalFrames; - } + } else if (skelAnime->totalFrames <= nextFrame) { + nextFrame -= skelAnime->totalFrames; } - if (arg1 == 0.0f) { - if (0.0f < updateSpeed) { - arg1 = skelAnime->totalFrames; - } + + if ((arg1 == 0.0f) && (updateSpeed > 0.0f)) { + arg1 = skelAnime->totalFrames; } + temp_f12 = (nextFrame + updateSpeed) - arg1; - if (0.0f <= (temp_f12 * updateSpeed)) { - if (((temp_f12 - updateSpeed) * updateSpeed) < 0.0f) { - return 1; - } + if ((0.0f <= (temp_f12 * updateSpeed)) && (((temp_f12 - updateSpeed) * updateSpeed) < 0.0f)) { + return 1; } return 0; } @@ -1433,33 +1483,31 @@ s32 func_800A4AD8(SkelAnime* skelAnime) { return 0; } -#ifdef NON_MATCHING -// regalloc void func_800A4C58(SkelAnime* skelAnime) { - char pad[6]; - f32 temp_f0; + s32 t; + f32 updateRate; + char pad[4]; + Vec3s sp38[98]; f32 temp_f10; - Vec3s sp38[97]; - s32 temp_f8; f32 temp_f2; SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, skelAnime->animCurrentFrame, skelAnime->limbCount, skelAnime->actorDrawTbl); if (skelAnime->mode & 0x1) { - temp_f8 = (s32)skelAnime->animCurrentFrame; - temp_f10 = temp_f8; - temp_f8++; + t = (s32)skelAnime->animCurrentFrame; + temp_f10 = t; temp_f2 = skelAnime->animCurrentFrame - temp_f10; - if (temp_f8 >= (s32)skelAnime->totalFrames) { - temp_f8 = 0; + t++; + if (t >= (s32)skelAnime->totalFrames) { + t = 0; } - SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, temp_f8, skelAnime->limbCount, sp38); + SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, t, skelAnime->limbCount, sp38); SkelAnime_InterpolateRotation(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, sp38, temp_f2); } if (skelAnime->transCurrentFrame != 0) { - skelAnime->transCurrentFrame -= skelAnime->transitionStep * (R_UPDATE_RATE * ONE_THIRD); - temp_f0 = skelAnime->transCurrentFrame; - if (temp_f0 <= 0.0f) { + updateRate = R_UPDATE_RATE * ONE_THIRD; + skelAnime->transCurrentFrame -= skelAnime->transitionStep * updateRate; + if (skelAnime->transCurrentFrame <= 0.0f) { skelAnime->transCurrentFrame = 0.0f; return; } @@ -1467,9 +1515,6 @@ void func_800A4C58(SkelAnime* skelAnime) { skelAnime->transCurrentFrame); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4C58.s") -#endif s32 func_800A4D9C(SkelAnime* skelAnime) { f32 updateRate = R_UPDATE_RATE * ONE_THIRD; @@ -1568,8 +1613,8 @@ void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, AnimationHeader* animationS f32 frameCount, u8 mode, f32 transitionRate) { SkelAnime_ChangeAnimationImpl(skelAnime, animationSeg, playbackSpeed, frame, frameCount, mode, transitionRate, 0); } -//SkelAnimeChangeAnimationDefaultStop -void SkelAnimeChangeAnimationDefaultStop(SkelAnime* skelAnime, AnimationHeader* animationSeg) { + +void SkelAnime_ChangeAnimationDefaultStop(SkelAnime* skelAnime, AnimationHeader* animationSeg) { SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, 0.0f); } @@ -1578,7 +1623,7 @@ void SkelAnime_ChangeAnimationTransitionStop(SkelAnime* skelAnime, AnimationHead SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, transitionRate); } -//SkelAnime_ChangeAnimationPlaybackStop + void SkelAnime_ChangeAnimationPlaybackStop(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed) { SkelAnime_ChangeAnimation(skelAnime, animationSeg, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, 0.0f); @@ -1598,24 +1643,20 @@ void SkelAnime_ChangeAnimationPlaybackRepeat(SkelAnime* skelAnime, AnimationHead SkelAnime_GetFrameCount(&animationSeg->genericHeader), 0, 0.0f); } -void func_800A53DC(SkelAnime* skelAnime) { +void SkelAnime_AnimationSetStop(SkelAnime* skelAnime) { skelAnime->mode = 2; skelAnime->animFrameCount = skelAnime->totalFrames; func_800A49B0(skelAnime); } -#ifdef NON_MATCHING -// regalloc -void func_800A5408(SkelAnime* skelAnime) { - f32 frameCount = skelAnime->animFrameCount; - skelAnime->animFrameCount = skelAnime->initialFrame; +void SkelAnime_AnimationReverse(SkelAnime* skelAnime) { + f32 initialFrame = skelAnime->initialFrame; + + skelAnime->initialFrame = skelAnime->animFrameCount; skelAnime->animPlaybackSpeed = -skelAnime->animPlaybackSpeed; - skelAnime->initialFrame = frameCount; + skelAnime->animFrameCount = initialFrame; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A5408.s") -#endif void func_800A5428(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* index) { s32 i; diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index 7561fe825e..97b7b90845 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -55,7 +55,7 @@ void EnDs_Init(EnDs* this, GlobalContext* globalCtx) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 36.0f); SkelAnime_InitSV(globalCtx, skelAnime, &D_06004768, &D_0600039C, &this->actorDrawTable, &this->unk_1B4, 6); - SkelAnimeChangeAnimationDefaultStop(&this->skelAnime, &D_0600039C); + SkelAnime_ChangeAnimationDefaultStop(&this->skelAnime, &D_0600039C); this->actor.sub_98.mass = 0xFF; diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 11b358e5f5..a18638bb68 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -161,7 +161,7 @@ static void EnWallmas_LandStart(EnWallmas* this, GlobalContext* globalCtx) { } static void EnWallmas_StandStart(EnWallmas* this) { - SkelAnimeChangeAnimationDefaultStop(&this->skelAnime, &D_0600A054); + SkelAnime_ChangeAnimationDefaultStop(&this->skelAnime, &D_0600A054); this->actionFunc = (ActorFunc)&EnWallmas_Stand; } @@ -172,7 +172,7 @@ static void EnWallmas_WalkStart(EnWallmas* this) { } static void EnWallmas_JumpToCeilingStart(EnWallmas* this) { - SkelAnimeChangeAnimationDefaultStop(&this->skelAnime, &D_06009244); + SkelAnime_ChangeAnimationDefaultStop(&this->skelAnime, &D_06009244); this->actionFunc = (ActorFunc)&EnWallmas_JumpToCeiling; this->actor.speedXZ = 0.0f; } @@ -204,7 +204,7 @@ static void EnWallmas_TakeDamageStart(EnWallmas* this) { } static void EnWallmas_DamageCoolDownStart(EnWallmas* this) { - SkelAnimeChangeAnimationDefaultStop(&this->skelAnime, &D_06000EA4); + SkelAnime_ChangeAnimationDefaultStop(&this->skelAnime, &D_06000EA4); this->actor.speedXZ = 0.0f; this->actor.velocity.y = 0.0f; this->actor.posRot.rot.y = this->actor.shape.rot.y;