diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s index c7d27a06d4..3fb6aa3923 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s @@ -42,7 +42,7 @@ glabel BossDodongo_Init /* 00874 808C1A04 AFA00018 */ sw $zero, 0x0018($sp) /* 00878 808C1A08 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 0087C 808C1A0C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0087C 808C1A0C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00880 808C1A10 02402825 */ or $a1, $s2, $zero ## $a1 = 0600F0D8 /* 00884 808C1A14 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00888 808C1A18 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s index 06a6257458..3bc8df6524 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s @@ -13,7 +13,7 @@ glabel func_808C32F4 /* 02190 808C3320 10400050 */ beq $v0, $zero, .L808C3464 /* 02194 808C3324 8FA4003C */ lw $a0, 0x003C($sp) /* 02198 808C3328 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 0219C 808C332C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0219C 808C332C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 021A0 808C3330 24A5CAE0 */ addiu $a1, $a1, 0xCAE0 ## $a1 = 0601CAE0 /* 021A4 808C3334 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 021A8 808C3338 1000004A */ beq $zero, $zero, .L808C3464 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 3aad83ad2f..e56c259540 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 @@ -6,15 +6,15 @@ glabel func_808CB6A8 /* 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 func_800A51E8 +/* 00904 808CB6C4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 func_800A51E8 +/* 00914 808CB6D4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 func_800A51E8 +/* 00924 808CB6E4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 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 4eff467928..8e0d2a75f5 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 @@ -12,7 +12,7 @@ glabel func_808D2BD0 /* 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 func_800A51E8 +/* 00590 808D2C00 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s index 63b5e23ef0..3f85782db7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s @@ -12,7 +12,7 @@ glabel func_808D308C /* 00A40 808D30B0 8FA40020 */ lw $a0, 0x0020($sp) /* 00A44 808D30B4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A48 808D30B8 24A5AE90 */ addiu $a1, $a1, 0xAE90 ## $a1 = 0600AE90 -/* 00A4C 808D30BC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00A4C 808D30BC 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00A50 808D30C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00A54 808D30C4 8FA30020 */ lw $v1, 0x0020($sp) /* 00A58 808D30C8 3C18808D */ lui $t8, %hi(func_808D3140) ## $t8 = 808D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s index 60eb340f4a..68a34a31bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s @@ -51,7 +51,7 @@ glabel func_808D3140 /* 00B84 808D31F4 00000000 */ nop /* 00B88 808D31F8 45020007 */ bc1fl .L808D3218 /* 00B8C 808D31FC 4602603C */ c.lt.s $f12, $f2 -/* 00B90 808D3200 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00B90 808D3200 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00B94 808D3204 E7A2002C */ swc1 $f2, 0x002C($sp) /* 00B98 808D3208 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00B9C 808D320C 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 @@ -72,7 +72,7 @@ glabel func_808D3140 /* 00BD4 808D3244 00000000 */ nop /* 00BD8 808D3248 45020004 */ bc1fl .L808D325C /* 00BDC 808D324C 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC -/* 00BE0 808D3250 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00BE0 808D3250 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00BE4 808D3254 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00BE8 808D3258 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC .L808D325C: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s index 2c2602eb1e..723201ba84 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s @@ -9,7 +9,7 @@ glabel func_808D32B4 /* 00C60 808D32D0 AFA70020 */ sw $a3, 0x0020($sp) /* 00C64 808D32D4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00C68 808D32D8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00C6C 808D32DC 0C029490 */ jal func_800A5240 +/* 00C6C 808D32DC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00C70 808D32E0 AFAE001C */ sw $t6, 0x001C($sp) /* 00C74 808D32E4 8FA70020 */ lw $a3, 0x0020($sp) /* 00C78 808D32E8 3C0F808D */ lui $t7, %hi(func_808D3330) ## $t7 = 808D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s index 2f4dbe75da..767881bebb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s @@ -6,7 +6,7 @@ glabel func_808D3400 /* 00DA0 808D3410 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DA4 808D3414 24A573CC */ addiu $a1, $a1, 0x73CC ## $a1 = 060073CC /* 00DA8 808D3418 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00DAC 808D341C 0C029490 */ jal func_800A5240 +/* 00DAC 808D341C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00DB0 808D3420 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00DB4 808D3424 8FAF0018 */ lw $t7, 0x0018($sp) /* 00DB8 808D3428 3C0E808D */ lui $t6, %hi(func_808D3464) ## $t6 = 808D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s index 742018fa46..a00cbaef43 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s @@ -6,7 +6,7 @@ glabel func_808D39A8 /* 01348 808D39B8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0134C 808D39BC 24A5B7A4 */ addiu $a1, $a1, 0xB7A4 ## $a1 = 0600B7A4 /* 01350 808D39C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01354 808D39C4 0C029490 */ jal func_800A5240 +/* 01354 808D39C4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01358 808D39C8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0135C 808D39CC 8FAF0018 */ lw $t7, 0x0018($sp) /* 01360 808D39D0 3C0E808D */ lui $t6, %hi(func_808D3A08) ## $t6 = 808D0000 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 9ab26081e2..7218f015cf 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 @@ -6,7 +6,7 @@ glabel func_808D3A80 /* 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 func_800A51E8 +/* 0142C 808D3A9C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 01430 808D3AA0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01434 808D3AA4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01438 808D3AA8 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s index 4b8e33017f..046dbfde22 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s @@ -130,7 +130,7 @@ glabel func_808D3AE0 /* 01638 808D3CA8 8FA40060 */ lw $a0, 0x0060($sp) /* 0163C 808D3CAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01640 808D3CB0 24A5A86C */ addiu $a1, $a1, 0xA86C ## $a1 = 0600A86C -/* 01644 808D3CB4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01644 808D3CB4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01648 808D3CB8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0164C 808D3CBC 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 01650 808D3CC0 240A003C */ addiu $t2, $zero, 0x003C ## $t2 = 0000003C 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 840af8f064..cf1fd7a7f7 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 @@ -6,7 +6,7 @@ glabel func_808D3D38 /* 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 func_800A51E8 +/* 016E4 808D3D54 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 016E8 808D3D58 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 016EC 808D3D5C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 016F0 808D3D60 0C028800 */ jal SkelAnime_GetFrameCount 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 2286f57e48..d37f150f6a 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 @@ -22,7 +22,7 @@ glabel func_808D3D98 /* 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 func_800A51E8 +/* 01780 808D3DF0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 01784 808D3DF4 24A589DC */ addiu $a1, $a1, 0x89DC ## $a1 = 060089DC /* 01788 808D3DF8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0178C 808D3DFC 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s index cb99e16f98..7dcdd27e70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s @@ -204,7 +204,7 @@ glabel L808D41FC /* 01D48 808D43B8 8FA40044 */ lw $a0, 0x0044($sp) /* 01D4C 808D43BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01D50 808D43C0 24A589DC */ addiu $a1, $a1, 0x89DC ## $a1 = 060089DC -/* 01D54 808D43C4 0C029490 */ jal func_800A5240 +/* 01D54 808D43C4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01D58 808D43C8 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 01D5C 808D43CC 100000D7 */ beq $zero, $zero, .L808D472C /* 01D60 808D43D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s index 73a70ae971..c5976aeb0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s @@ -47,7 +47,7 @@ glabel func_808D779C /* 00FD0 808D7840 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 /* 00FD4 808D7844 24A55FFC */ addiu $a1, $a1, 0x5FFC ## $a1 = 06005FFC /* 00FD8 808D7848 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00FDC 808D784C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00FDC 808D784C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00FE0 808D7850 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00FE4 808D7854 10000005 */ beq $zero, $zero, .L808D786C /* 00FE8 808D7858 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s index b7d6659c00..90ce6763c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s @@ -110,7 +110,7 @@ glabel L808D79E8 /* 01250 808D7AC0 E54A002C */ swc1 $f10, 0x002C($t2) ## 0000002C /* 01254 808D7AC4 A200071A */ sb $zero, 0x071A($s0) ## 0000071A /* 01258 808D7AC8 8FA4004C */ lw $a0, 0x004C($sp) -/* 0125C 808D7ACC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0125C 808D7ACC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01260 808D7AD0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01264 808D7AD4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01268 808D7AD8 44818000 */ mtc1 $at, $f16 ## $f16 = 1000.00 @@ -647,7 +647,7 @@ glabel L808D8220 /* 019F8 808D8268 46809120 */ cvt.s.w $f4, $f18 /* 019FC 808D826C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01A00 808D8270 E60401CC */ swc1 $f4, 0x01CC($s0) ## 000001CC -/* 01A04 808D8274 0C029490 */ jal func_800A5240 +/* 01A04 808D8274 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01A08 808D8278 8FA4004C */ lw $a0, 0x004C($sp) /* 01A0C 808D827C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01A10 808D8280 2C61001F */ sltiu $at, $v1, 0x001F @@ -660,7 +660,7 @@ glabel L808D8220 /* 01A28 808D8298 8FA4004C */ lw $a0, 0x004C($sp) /* 01A2C 808D829C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01A30 808D82A0 24A56AF4 */ addiu $a1, $a1, 0x6AF4 ## $a1 = 06006AF4 -/* 01A34 808D82A4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01A34 808D82A4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01A38 808D82A8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01A3C 808D82AC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01A40 808D82B0 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -740,7 +740,7 @@ glabel L808D83A4 /* 01B54 808D83C4 8FA4004C */ lw $a0, 0x004C($sp) /* 01B58 808D83C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01B5C 808D83CC 24A54304 */ addiu $a1, $a1, 0x4304 ## $a1 = 06004304 -/* 01B60 808D83D0 0C029490 */ jal func_800A5240 +/* 01B60 808D83D0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01B64 808D83D4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01B68 808D83D8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01B6C 808D83DC 0C028800 */ jal SkelAnime_GetFrameCount @@ -762,7 +762,7 @@ glabel L808D83A4 /* 01BA4 808D8414 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01BA8 808D8418 24A589F8 */ addiu $a1, $a1, 0x89F8 ## $a1 = 060089F8 /* 01BAC 808D841C 8FA4004C */ lw $a0, 0x004C($sp) -/* 01BB0 808D8420 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01BB0 808D8420 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01BB4 808D8424 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01BB8 808D8428 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01BBC 808D842C 44819000 */ mtc1 $at, $f18 ## $f18 = 1000.00 @@ -790,7 +790,7 @@ glabel L808D8468 /* 01C0C 808D847C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01C10 808D8480 24A51F58 */ addiu $a1, $a1, 0x1F58 ## $a1 = 06001F58 /* 01C14 808D8484 8FA4004C */ lw $a0, 0x004C($sp) -/* 01C18 808D8488 0C029490 */ jal func_800A5240 +/* 01C18 808D8488 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01C1C 808D848C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01C20 808D8490 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01C24 808D8494 0C028800 */ jal SkelAnime_GetFrameCount @@ -894,7 +894,7 @@ glabel L808D8598 /* 01D88 808D85F8 8FA4004C */ lw $a0, 0x004C($sp) /* 01D8C 808D85FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01D90 808D8600 24A53018 */ addiu $a1, $a1, 0x3018 ## $a1 = 06003018 -/* 01D94 808D8604 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01D94 808D8604 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01D98 808D8608 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01D9C 808D860C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01DA0 808D8610 44819000 */ mtc1 $at, $f18 ## $f18 = 1000.00 @@ -919,7 +919,7 @@ glabel L808D8598 /* 01DE8 808D8658 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01DEC 808D865C 24A57268 */ addiu $a1, $a1, 0x7268 ## $a1 = 06007268 /* 01DF0 808D8660 8FA4004C */ lw $a0, 0x004C($sp) -/* 01DF4 808D8664 0C029490 */ jal func_800A5240 +/* 01DF4 808D8664 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01DF8 808D8668 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01DFC 808D866C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01E00 808D8670 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -1012,7 +1012,7 @@ glabel L808D86B4 /* 01F3C 808D87AC 8FA4004C */ lw $a0, 0x004C($sp) /* 01F40 808D87B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01F44 808D87B4 24A57A64 */ addiu $a1, $a1, 0x7A64 ## $a1 = 06007A64 -/* 01F48 808D87B8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01F48 808D87B8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01F4C 808D87BC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01F50 808D87C0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D87C4: @@ -1269,7 +1269,7 @@ glabel L808D8A98 /* 022EC 808D8B5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 022F0 808D8B60 24A58A88 */ addiu $a1, $a1, 0x8A88 ## $a1 = 06008A88 /* 022F4 808D8B64 8FA4004C */ lw $a0, 0x004C($sp) -/* 022F8 808D8B68 0C029490 */ jal func_800A5240 +/* 022F8 808D8B68 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 022FC 808D8B6C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02300 808D8B70 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s index 021d818092..b66307fac4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s @@ -42,7 +42,7 @@ glabel func_808D9018 /* 02840 808D90B0 AC2B6FC0 */ sw $t3, 0x6FC0($at) ## 80166FC0 /* 02844 808D90B4 24A5EA00 */ addiu $a1, $a1, 0xEA00 ## $a1 = 0600EA00 /* 02848 808D90B8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 0284C 808D90BC 0C029490 */ jal func_800A5240 +/* 0284C 808D90BC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02850 808D90C0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02854 808D90C4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02858 808D90C8 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s index 0678e68e92..02e1ab411a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s @@ -34,7 +34,7 @@ glabel func_808D90F8 /* 02900 808D9170 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 /* 02904 808D9174 24A5EA00 */ addiu $a1, $a1, 0xEA00 ## $a1 = 0600EA00 /* 02908 808D9178 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 0290C 808D917C 0C029490 */ jal func_800A5240 +/* 0290C 808D917C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02910 808D9180 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02914 808D9184 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02918 808D9188 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s index 564f1b3c77..96ca7de35f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s @@ -155,7 +155,7 @@ glabel L808D94C4 /* 02D10 808D9580 8FA40054 */ lw $a0, 0x0054($sp) /* 02D14 808D9584 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02D18 808D9588 24A5F19C */ addiu $a1, $a1, 0xF19C ## $a1 = 0600F19C -/* 02D1C 808D958C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02D1C 808D958C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 02D20 808D9590 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02D24 808D9594 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 02D28 808D9598 A60C0678 */ sh $t4, 0x0678($s0) ## 00000678 @@ -269,7 +269,7 @@ glabel L808D9654 /* 02EB8 808D9728 8FA40054 */ lw $a0, 0x0054($sp) /* 02EBC 808D972C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02EC0 808D9730 24A5B668 */ addiu $a1, $a1, 0xB668 ## $a1 = 0600B668 -/* 02EC4 808D9734 0C029490 */ jal func_800A5240 +/* 02EC4 808D9734 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02EC8 808D9738 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02ECC 808D973C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02ED0 808D9740 0C028800 */ jal SkelAnime_GetFrameCount @@ -373,7 +373,7 @@ glabel L808D9654 /* 03030 808D98A0 8FA40054 */ lw $a0, 0x0054($sp) /* 03034 808D98A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03038 808D98A8 24A5BE38 */ addiu $a1, $a1, 0xBE38 ## $a1 = 0600BE38 -/* 0303C 808D98AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0303C 808D98AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 03040 808D98B0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03044 808D98B4 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 /* 03048 808D98B8 A60C0678 */ sh $t4, 0x0678($s0) ## 00000678 @@ -413,7 +413,7 @@ glabel L808D9900 /* 030C0 808D9930 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 030C4 808D9934 24A50298 */ addiu $a1, $a1, 0x0298 ## $a1 = 06010298 /* 030C8 808D9938 8FA40054 */ lw $a0, 0x0054($sp) -/* 030CC 808D993C 0C029490 */ jal func_800A5240 +/* 030CC 808D993C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 030D0 808D9940 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 030D4 808D9944 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 030D8 808D9948 0C028800 */ jal SkelAnime_GetFrameCount @@ -506,7 +506,7 @@ glabel L808D9A54 /* 03220 808D9A90 8FA40054 */ lw $a0, 0x0054($sp) /* 03224 808D9A94 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03228 808D9A98 24A50514 */ addiu $a1, $a1, 0x0514 ## $a1 = 06010514 -/* 0322C 808D9A9C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0322C 808D9A9C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 03230 808D9AA0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03234 808D9AA4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 03238 808D9AA8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -807,7 +807,7 @@ glabel L808D9E8C /* 03664 808D9ED4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03668 808D9ED8 24A5ADDC */ addiu $a1, $a1, 0xADDC ## $a1 = 0600ADDC /* 0366C 808D9EDC 8FA40054 */ lw $a0, 0x0054($sp) -/* 03670 808D9EE0 0C029490 */ jal func_800A5240 +/* 03670 808D9EE0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 03674 808D9EE4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03678 808D9EE8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0367C 808D9EEC 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s index 207a20f749..0115c0656a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s @@ -131,7 +131,7 @@ glabel L808DAD6C /* 04674 808DAEE4 46803220 */ cvt.s.w $f8, $f6 /* 04678 808DAEE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000150 /* 0467C 808DAEEC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 04680 808DAEF0 0C029490 */ jal func_800A5240 +/* 04680 808DAEF0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04684 808DAEF4 E62801CC */ swc1 $f8, 0x01CC($s1) ## 000001CC /* 04688 808DAEF8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0468C 808DAEFC 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 @@ -255,7 +255,7 @@ glabel L808DB080 /* 04838 808DB0A8 468082A0 */ cvt.s.w $f10, $f16 /* 0483C 808DB0AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 /* 04840 808DB0B0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 04844 808DB0B4 0C029490 */ jal func_800A5240 +/* 04844 808DB0B4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04848 808DB0B8 E62A01CC */ swc1 $f10, 0x01CC($s1) ## 000001CC /* 0484C 808DB0BC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 04850 808DB0C0 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 @@ -292,7 +292,7 @@ glabel L808DB0D8 /* 048BC 808DB12C 468021A0 */ cvt.s.w $f6, $f4 /* 048C0 808DB130 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 /* 048C4 808DB134 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 048C8 808DB138 0C029490 */ jal func_800A5240 +/* 048C8 808DB138 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 048CC 808DB13C E62601CC */ swc1 $f6, 0x01CC($s1) ## 000001CC /* 048D0 808DB140 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s index d045e9add4..cf191d677f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s @@ -92,7 +92,7 @@ glabel L808DB404 /* 04BB8 808DB428 02002825 */ or $a1, $s0, $zero ## $a1 = 06001B0C /* 04BBC 808DB42C 468042A0 */ cvt.s.w $f10, $f8 /* 04BC0 808DB430 E62A01CC */ swc1 $f10, 0x01CC($s1) ## 000001CC -/* 04BC4 808DB434 0C029490 */ jal func_800A5240 +/* 04BC4 808DB434 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04BC8 808DB438 8FA4005C */ lw $a0, 0x005C($sp) /* 04BCC 808DB43C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 04BD0 808DB440 100001A4 */ beq $zero, $zero, .L808DBAD4 @@ -112,7 +112,7 @@ glabel L808DB448 /* 04C00 808DB470 02002825 */ or $a1, $s0, $zero ## $a1 = 06001FF8 /* 04C04 808DB474 468084A0 */ cvt.s.w $f18, $f16 /* 04C08 808DB478 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 04C0C 808DB47C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 04C0C 808DB47C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 04C10 808DB480 8FA4005C */ lw $a0, 0x005C($sp) /* 04C14 808DB484 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 04C18 808DB488 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 @@ -189,7 +189,7 @@ glabel L808DB498 /* 04D14 808DB584 02002825 */ or $a1, $s0, $zero ## $a1 = 06000540 /* 04D18 808DB588 46803220 */ cvt.s.w $f8, $f6 /* 04D1C 808DB58C E62801CC */ swc1 $f8, 0x01CC($s1) ## 000001CC -/* 04D20 808DB590 0C029490 */ jal func_800A5240 +/* 04D20 808DB590 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04D24 808DB594 8FA4005C */ lw $a0, 0x005C($sp) /* 04D28 808DB598 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 04D2C 808DB59C 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 @@ -474,7 +474,7 @@ glabel L808DB864 /* 050FC 808DB96C 02002825 */ or $a1, $s0, $zero ## $a1 = 06000FE8 /* 05100 808DB970 468084A0 */ cvt.s.w $f18, $f16 /* 05104 808DB974 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 05108 808DB978 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05108 808DB978 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0510C 808DB97C 8FA4005C */ lw $a0, 0x005C($sp) /* 05110 808DB980 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 05114 808DB984 A62D01C2 */ sh $t5, 0x01C2($s1) ## 000001C2 @@ -556,7 +556,7 @@ glabel L808DB99C /* 05220 808DBA90 02002825 */ or $a1, $s0, $zero ## $a1 = 06001440 /* 05224 808DBA94 468084A0 */ cvt.s.w $f18, $f16 /* 05228 808DBA98 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 0522C 808DBA9C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0522C 808DBA9C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 05230 808DBAA0 8FA4005C */ lw $a0, 0x005C($sp) /* 05234 808DBAA4 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 /* 05238 808DBAA8 1000000A */ beq $zero, $zero, .L808DBAD4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s index 66d9db4c3b..3e8eafd33f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s @@ -8,7 +8,7 @@ glabel func_808DBAF0 /* 05298 808DBB08 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0529C 808DBB0C 24A59A14 */ addiu $a1, $a1, 0x9A14 ## $a1 = 06009A14 /* 052A0 808DBB10 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 052A4 808DBB14 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 052A4 808DBB14 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 052A8 808DBB18 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 052AC 808DBB1C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 052B0 808DBB20 3C0E808E */ lui $t6, %hi(func_808DBB78) ## $t6 = 808E0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s index 6b6396a92c..c101d5c6c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s @@ -15,7 +15,7 @@ glabel func_808DBEC4 /* 05684 808DBEF4 468021A0 */ cvt.s.w $f6, $f4 /* 05688 808DBEF8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 0568C 808DBEFC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 05690 808DBF00 0C029490 */ jal func_800A5240 +/* 05690 808DBF00 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05694 808DBF04 E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC /* 05698 808DBF08 3C0E808E */ lui $t6, %hi(func_808DBF30) ## $t6 = 808E0000 /* 0569C 808DBF0C 25CEBF30 */ addiu $t6, $t6, %lo(func_808DBF30) ## $t6 = 808DBF30 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s index f847d7622c..9c9b722518 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s @@ -15,7 +15,7 @@ glabel func_808DC0E8 /* 058A8 808DC118 24A5738C */ addiu $a1, $a1, 0x738C ## $a1 = 0600738C /* 058AC 808DC11C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 058B0 808DC120 24640150 */ addiu $a0, $v1, 0x0150 ## $a0 = 00000150 -/* 058B4 808DC124 0C029490 */ jal func_800A5240 +/* 058B4 808DC124 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 058B8 808DC128 E46601CC */ swc1 $f6, 0x01CC($v1) ## 000001CC /* 058BC 808DC12C 8FAF0018 */ lw $t7, 0x0018($sp) /* 058C0 808DC130 3C0E808E */ lui $t6, %hi(func_808DC14C) ## $t6 = 808E0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s index dc31dfd953..136a971ad5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s @@ -33,7 +33,7 @@ glabel func_808DC14C /* 0594C 808DC1BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05950 808DC1C0 24A59A14 */ addiu $a1, $a1, 0x9A14 ## $a1 = 06009A14 /* 05954 808DC1C4 8FA40044 */ lw $a0, 0x0044($sp) -/* 05958 808DC1C8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05958 808DC1C8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0595C 808DC1CC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L808DC1D0: /* 05960 808DC1D0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 @@ -127,7 +127,7 @@ glabel func_808DC14C /* 05AA0 808DC310 8FA40044 */ lw $a0, 0x0044($sp) /* 05AA4 808DC314 00084880 */ sll $t1, $t0, 2 /* 05AA8 808DC318 00A92821 */ addu $a1, $a1, $t1 -/* 05AAC 808DC31C 0C029490 */ jal func_800A5240 +/* 05AAC 808DC31C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05AB0 808DC320 8CA54D38 */ lw $a1, %lo(D_808E4D38)($a1) /* 05AB4 808DC324 87AA004E */ lh $t2, 0x004E($sp) /* 05AB8 808DC328 3C0C808E */ lui $t4, %hi(D_808E4D40) ## $t4 = 808E0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s index ec71e30a61..b83acb2c8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s @@ -24,7 +24,7 @@ glabel func_808DC420 /* 05C00 808DC470 468021A0 */ cvt.s.w $f6, $f4 /* 05C04 808DC474 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 05C08 808DC478 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05C0C 808DC47C 0C029490 */ jal func_800A5240 +/* 05C0C 808DC47C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05C10 808DC480 E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC /* 05C14 808DC484 8FB80024 */ lw $t8, 0x0024($sp) /* 05C18 808DC488 AE180194 */ sw $t8, 0x0194($s0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s index 57a233c261..49ae8a14f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s @@ -40,7 +40,7 @@ glabel func_808DC4DC /* 05D00 808DC570 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05D04 808DC574 A60B01C2 */ sh $t3, 0x01C2($s0) ## 000001C2 /* 05D08 808DC578 24A5A598 */ addiu $a1, $a1, 0xA598 ## $a1 = 0600A598 -/* 05D0C 808DC57C 0C029490 */ jal func_800A5240 +/* 05D0C 808DC57C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05D10 808DC580 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 05D14 808DC584 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 05D18 808DC588 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s index 400804050d..7424dc5dbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s @@ -15,7 +15,7 @@ glabel func_808DC66C /* 05E2C 808DC69C 468021A0 */ cvt.s.w $f6, $f4 /* 05E30 808DC6A0 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 05E34 808DC6A4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05E38 808DC6A8 0C029490 */ jal func_800A5240 +/* 05E38 808DC6A8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05E3C 808DC6AC E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC /* 05E40 808DC6B0 3C048090 */ lui $a0, %hi(D_808F93C0) ## $a0 = 80900000 /* 05E44 808DC6B4 240E0046 */ addiu $t6, $zero, 0x0046 ## $t6 = 00000046 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s index c156327d25..e3c0faf1cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s @@ -35,7 +35,7 @@ glabel func_808DC75C /* 05F68 808DC7D8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 05F6C 808DC7DC 468021A0 */ cvt.s.w $f6, $f4 /* 05F70 808DC7E0 E66601CC */ swc1 $f6, 0x01CC($s3) ## 000001CC -/* 05F74 808DC7E4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05F74 808DC7E4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 05F78 808DC7E8 8FA40048 */ lw $a0, 0x0048($sp) /* 05F7C 808DC7EC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 05F80 808DC7F0 10000056 */ beq $zero, $zero, .L808DC94C @@ -60,7 +60,7 @@ glabel func_808DC75C /* 05FC4 808DC834 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 05FC8 808DC838 468042A0 */ cvt.s.w $f10, $f8 /* 05FCC 808DC83C E66A01CC */ swc1 $f10, 0x01CC($s3) ## 000001CC -/* 05FD0 808DC840 0C029490 */ jal func_800A5240 +/* 05FD0 808DC840 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05FD4 808DC844 8FA40048 */ lw $a0, 0x0048($sp) /* 05FD8 808DC848 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 05FDC 808DC84C A67801C2 */ sh $t8, 0x01C2($s3) ## 000001C2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s index 51fcc1e00e..9f84f465cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s @@ -28,7 +28,7 @@ glabel func_808DC9B4 /* 061A8 808DCA18 468021A0 */ cvt.s.w $f6, $f4 /* 061AC 808DCA1C 4406C000 */ mfc1 $a2, $f24 /* 061B0 808DCA20 02002825 */ or $a1, $s0, $zero ## $a1 = 06004884 -/* 061B4 808DCA24 0C029490 */ jal func_800A5240 +/* 061B4 808DCA24 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 061B8 808DCA28 E62601CC */ swc1 $f6, 0x01CC($s1) ## 000001CC /* 061BC 808DCA2C 3C028090 */ lui $v0, %hi(D_808F93C0) ## $v0 = 80900000 /* 061C0 808DCA30 244293C0 */ addiu $v0, $v0, %lo(D_808F93C0) ## $v0 = 808F93C0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s index ff7fc739bb..df0115845c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s @@ -92,7 +92,7 @@ glabel L808DCC88 /* 06448 808DCCB8 02002825 */ or $a1, $s0, $zero ## $a1 = 06004DA8 /* 0644C 808DCCBC 46805420 */ cvt.s.w $f16, $f10 /* 06450 808DCCC0 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 06454 808DCCC4 0C029490 */ jal func_800A5240 +/* 06454 808DCCC4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 06458 808DCCC8 8FA40038 */ lw $a0, 0x0038($sp) /* 0645C 808DCCCC 10000101 */ beq $zero, $zero, .L808DD0D4 /* 06460 808DCCD0 8FBF002C */ lw $ra, 0x002C($sp) @@ -113,7 +113,7 @@ glabel L808DCCD4 /* 06494 808DCD04 02002825 */ or $a1, $s0, $zero ## $a1 = 06003D40 /* 06498 808DCD08 46809120 */ cvt.s.w $f4, $f18 /* 0649C 808DCD0C E62401CC */ swc1 $f4, 0x01CC($s1) ## 000001CC -/* 064A0 808DCD10 0C029490 */ jal func_800A5240 +/* 064A0 808DCD10 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 064A4 808DCD14 8FA40038 */ lw $a0, 0x0038($sp) /* 064A8 808DCD18 100000EE */ beq $zero, $zero, .L808DD0D4 /* 064AC 808DCD1C 8FBF002C */ lw $ra, 0x002C($sp) @@ -145,7 +145,7 @@ glabel L808DCD20 /* 0650C 808DCD7C 02002825 */ or $a1, $s0, $zero ## $a1 = 060063CC /* 06510 808DCD80 46809120 */ cvt.s.w $f4, $f18 /* 06514 808DCD84 E62401CC */ swc1 $f4, 0x01CC($s1) ## 000001CC -/* 06518 808DCD88 0C029490 */ jal func_800A5240 +/* 06518 808DCD88 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0651C 808DCD8C 8FA40038 */ lw $a0, 0x0038($sp) /* 06520 808DCD90 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 /* 06524 808DCD94 240E0046 */ addiu $t6, $zero, 0x0046 ## $t6 = 00000046 @@ -177,7 +177,7 @@ glabel L808DCDA8 /* 06580 808DCDF0 02002825 */ or $a1, $s0, $zero ## $a1 = 060069A0 /* 06584 808DCDF4 46803220 */ cvt.s.w $f8, $f6 /* 06588 808DCDF8 E62801CC */ swc1 $f8, 0x01CC($s1) ## 000001CC -/* 0658C 808DCDFC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0658C 808DCDFC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 06590 808DCE00 8FA40038 */ lw $a0, 0x0038($sp) /* 06594 808DCE04 100000B3 */ beq $zero, $zero, .L808DD0D4 /* 06598 808DCE08 8FBF002C */ lw $ra, 0x002C($sp) @@ -205,7 +205,7 @@ glabel L808DCE0C /* 065E0 808DCE50 02002825 */ or $a1, $s0, $zero ## $a1 = 060058C4 /* 065E4 808DCE54 46805420 */ cvt.s.w $f16, $f10 /* 065E8 808DCE58 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 065EC 808DCE5C 0C029490 */ jal func_800A5240 +/* 065EC 808DCE5C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 065F0 808DCE60 8FA40038 */ lw $a0, 0x0038($sp) /* 065F4 808DCE64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 065F8 808DCE68 240C0050 */ addiu $t4, $zero, 0x0050 ## $t4 = 00000050 @@ -255,7 +255,7 @@ glabel L808DCEC8 /* 06698 808DCF08 02002825 */ or $a1, $s0, $zero ## $a1 = 06006028 /* 0669C 808DCF0C 468021A0 */ cvt.s.w $f6, $f4 /* 066A0 808DCF10 E62601CC */ swc1 $f6, 0x01CC($s1) ## 000001CC -/* 066A4 808DCF14 0C029490 */ jal func_800A5240 +/* 066A4 808DCF14 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 066A8 808DCF18 8FA40038 */ lw $a0, 0x0038($sp) /* 066AC 808DCF1C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 066B0 808DCF20 3C0B8090 */ lui $t3, %hi(D_808F93C0) ## $t3 = 80900000 @@ -300,7 +300,7 @@ glabel L808DCF74 /* 06738 808DCFA8 02002825 */ or $a1, $s0, $zero ## $a1 = 06008A88 /* 0673C 808DCFAC 46805420 */ cvt.s.w $f16, $f10 /* 06740 808DCFB0 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 06744 808DCFB4 0C029490 */ jal func_800A5240 +/* 06744 808DCFB4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 06748 808DCFB8 8FA40038 */ lw $a0, 0x0038($sp) /* 0674C 808DCFBC 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 06750 808DCFC0 A62F01C2 */ sh $t7, 0x01C2($s1) ## 000001C2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s index 49f070958f..7257856c82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s @@ -15,7 +15,7 @@ glabel func_808DD0E8 /* 068A8 808DD118 24A596B0 */ addiu $a1, $a1, 0x96B0 ## $a1 = 060096B0 /* 068AC 808DD11C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 068B0 808DD120 24640150 */ addiu $a0, $v1, 0x0150 ## $a0 = 00000150 -/* 068B4 808DD124 0C029490 */ jal func_800A5240 +/* 068B4 808DD124 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 068B8 808DD128 E46601CC */ swc1 $f6, 0x01CC($v1) ## 000001CC /* 068BC 808DD12C 8FAF0018 */ lw $t7, 0x0018($sp) /* 068C0 808DD130 3C0E808E */ lui $t6, %hi(func_808DD14C) ## $t6 = 808E0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s index 91d546684e..734a9e317d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s @@ -44,7 +44,7 @@ glabel func_808DD14C /* 06974 808DD1E4 468021A0 */ cvt.s.w $f6, $f4 /* 06978 808DD1E8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0697C 808DD1EC E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC -/* 06980 808DD1F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 06980 808DD1F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 06984 808DD1F4 8FA40024 */ lw $a0, 0x0024($sp) .L808DD1F8: /* 06988 808DD1F8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s index c5ee2ed0fa..a9f0306198 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s @@ -130,7 +130,7 @@ glabel L808FD644 /* 008A4 808FD7E4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 008A8 808FD7E8 A52B00B6 */ sh $t3, 0x00B6($t1) ## 000000B6 /* 008AC 808FD7EC E5260028 */ swc1 $f6, 0x0028($t1) ## 00000028 -/* 008B0 808FD7F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 008B0 808FD7F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 008B4 808FD7F4 E528002C */ swc1 $f8, 0x002C($t1) ## 0000002C /* 008B8 808FD7F8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 008BC 808FD7FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -744,7 +744,7 @@ glabel L808FDF70 /* 011B4 808FE0F4 24A52168 */ addiu $a1, $a1, 0x2168 ## $a1 = 06002168 /* 011B8 808FE0F8 AFA90088 */ sw $t1, 0x0088($sp) /* 011BC 808FE0FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 011C0 808FE100 0C029490 */ jal func_800A5240 +/* 011C0 808FE100 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 011C4 808FE104 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 011C8 808FE108 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 011CC 808FE10C 0C028800 */ jal SkelAnime_GetFrameCount @@ -854,7 +854,7 @@ glabel L808FE1C0 /* 01350 808FE290 24A52E6C */ addiu $a1, $a1, 0x2E6C ## $a1 = 06002E6C /* 01354 808FE294 8FA40050 */ lw $a0, 0x0050($sp) /* 01358 808FE298 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 0135C 808FE29C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0135C 808FE29C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01360 808FE2A0 AFA90088 */ sw $t1, 0x0088($sp) /* 01364 808FE2A4 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 01368 808FE2A8 44810000 */ mtc1 $at, $f0 ## $f0 = -200.00 @@ -1038,7 +1038,7 @@ glabel L808FE4C0 /* 01600 808FE540 8FA40050 */ lw $a0, 0x0050($sp) /* 01604 808FE544 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01608 808FE548 24A50BFC */ addiu $a1, $a1, 0x0BFC ## $a1 = 06000BFC -/* 0160C 808FE54C 0C029490 */ jal func_800A5240 +/* 0160C 808FE54C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01610 808FE550 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01614 808FE554 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01618 808FE558 0C028800 */ jal SkelAnime_GetFrameCount @@ -1057,7 +1057,7 @@ glabel L808FE4C0 /* 01644 808FE584 8FA40050 */ lw $a0, 0x0050($sp) /* 01648 808FE588 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0164C 808FE58C 24A53F38 */ addiu $a1, $a1, 0x3F38 ## $a1 = 06003F38 -/* 01650 808FE590 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01650 808FE590 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01654 808FE594 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01658 808FE598 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 0165C 808FE59C 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -1085,7 +1085,7 @@ glabel L808FE4C0 /* 016A8 808FE5E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 016AC 808FE5EC 24A53754 */ addiu $a1, $a1, 0x3754 ## $a1 = 06003754 /* 016B0 808FE5F0 8FA40050 */ lw $a0, 0x0050($sp) -/* 016B4 808FE5F4 0C029490 */ jal func_800A5240 +/* 016B4 808FE5F4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 016B8 808FE5F8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 016BC 808FE5FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 016C0 808FE600 0C028800 */ jal SkelAnime_GetFrameCount @@ -1160,7 +1160,7 @@ glabel L808FE63C /* 017AC 808FE6EC 8FA40050 */ lw $a0, 0x0050($sp) /* 017B0 808FE6F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 017B4 808FE6F4 24A528A8 */ addiu $a1, $a1, 0x28A8 ## $a1 = 060028A8 -/* 017B8 808FE6F8 0C029490 */ jal func_800A5240 +/* 017B8 808FE6F8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 017BC 808FE6FC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 017C0 808FE700 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 017C4 808FE704 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 @@ -1337,7 +1337,7 @@ glabel L808FE8E4 /* 01A48 808FE988 E60A03B8 */ swc1 $f10, 0x03B8($s0) ## 000003B8 /* 01A4C 808FE98C A60B039C */ sh $t3, 0x039C($s0) ## 0000039C /* 01A50 808FE990 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 01A54 808FE994 0C029490 */ jal func_800A5240 +/* 01A54 808FE994 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01A58 808FE998 8FA40050 */ lw $a0, 0x0050($sp) /* 01A5C 808FE99C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 01A60 808FE9A0 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 @@ -1546,7 +1546,7 @@ glabel L808FEB70 /* 01D64 808FECA4 E60E0420 */ swc1 $f14, 0x0420($s0) ## 00000420 /* 01D68 808FECA8 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 /* 01D6C 808FECAC 44061000 */ mfc1 $a2, $f2 -/* 01D70 808FECB0 0C029490 */ jal func_800A5240 +/* 01D70 808FECB0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01D74 808FECB4 8FA40050 */ lw $a0, 0x0050($sp) /* 01D78 808FECB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D7C 808FECBC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 @@ -2190,7 +2190,7 @@ glabel L808FF51C /* 026D4 808FF614 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 026D8 808FF618 24A547E0 */ addiu $a1, $a1, 0x47E0 ## $a1 = 060147E0 /* 026DC 808FF61C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 026E0 808FF620 0C029490 */ jal func_800A5240 +/* 026E0 808FF620 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 026E4 808FF624 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 026E8 808FF628 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 026EC 808FF62C 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s index 596224b294..5bf71a7530 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s @@ -34,7 +34,7 @@ glabel func_808FFDB0 /* 02EE8 808FFE28 AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 /* 02EEC 808FFE2C 24A5FFE4 */ addiu $a1, $a1, 0xFFE4 ## $a1 = 0600FFE4 /* 02EF0 808FFE30 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02EF4 808FFE34 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02EF4 808FFE34 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 02EF8 808FFE38 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 02EFC 808FFE3C 920B0334 */ lbu $t3, 0x0334($s0) ## 00000334 /* 02F00 808FFE40 3C0A8090 */ lui $t2, %hi(func_808FFEBC) ## $t2 = 80900000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s index 496ff372fb..adebb31e42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s @@ -7,7 +7,7 @@ glabel func_808FFF90 /* 03064 808FFFA4 24A5FFE4 */ addiu $a1, $a1, 0xFFE4 ## $a1 = 0600FFE4 /* 03068 808FFFA8 AFA70018 */ sw $a3, 0x0018($sp) /* 0306C 808FFFAC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03070 808FFFB0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 03070 808FFFB0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 03074 808FFFB4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 03078 808FFFB8 8FA70018 */ lw $a3, 0x0018($sp) /* 0307C 808FFFBC 3C0E8090 */ lui $t6, %hi(func_808FFFE0) ## $t6 = 80900000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s index 2fef18bae0..85d2343d6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s @@ -7,7 +7,7 @@ glabel func_809000A0 /* 03174 809000B4 24A56510 */ addiu $a1, $a1, 0x6510 ## $a1 = 06026510 /* 03178 809000B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0317C 809000BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03180 809000C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 03180 809000C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 03184 809000C4 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 03188 809000C8 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 0318C 809000CC 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s index 9d2de3f852..014c860532 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s @@ -36,7 +36,7 @@ glabel func_80900104 /* 03240 80900180 A60E01AC */ sh $t6, 0x01AC($s0) ## 000001AC /* 03244 80900184 24A56AF4 */ addiu $a1, $a1, 0x6AF4 ## $a1 = 06026AF4 /* 03248 80900188 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0324C 8090018C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0324C 8090018C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 03250 80900190 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03254 80900194 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 /* 03258 80900198 10000018 */ beq $zero, $zero, .L809001FC @@ -49,7 +49,7 @@ glabel func_80900104 /* 03270 809001B0 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 03274 809001B4 A61901AC */ sh $t9, 0x01AC($s0) ## 000001AC /* 03278 809001B8 24A57824 */ addiu $a1, $a1, 0x7824 ## $a1 = 06027824 -/* 0327C 809001BC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0327C 809001BC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 03280 809001C0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 03284 809001C4 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 03288 809001C8 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s index 58201c94e0..9f35eef3f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s @@ -6,7 +6,7 @@ glabel func_80900210 /* 032E0 80900220 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 032E4 80900224 24A5DFF0 */ addiu $a1, $a1, 0xDFF0 ## $a1 = 0600DFF0 /* 032E8 80900228 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 032EC 8090022C 0C029490 */ jal func_800A5240 +/* 032EC 8090022C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 032F0 80900230 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 032F4 80900234 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 032F8 80900238 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s index 6cd60ad523..9c5f42da78 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s @@ -7,7 +7,7 @@ glabel func_809002CC /* 033A0 809002E0 24A5E8EC */ addiu $a1, $a1, 0xE8EC ## $a1 = 0600E8EC /* 033A4 809002E4 AFA70018 */ sw $a3, 0x0018($sp) /* 033A8 809002E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 033AC 809002EC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 033AC 809002EC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 033B0 809002F0 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 033B4 809002F4 8FA70018 */ lw $a3, 0x0018($sp) /* 033B8 809002F8 3C0E8090 */ lui $t6, %hi(func_80900344) ## $t6 = 80900000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s index e45a37d378..85aa260d83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s @@ -66,7 +66,7 @@ glabel func_80900344 /* 034E8 80900428 45020007 */ bc1fl .L80900448 /* 034EC 8090042C 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 /* 034F0 80900430 A2000338 */ sb $zero, 0x0338($s0) ## 00000338 -/* 034F4 80900434 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 034F4 80900434 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 034F8 80900438 8FA40020 */ lw $a0, 0x0020($sp) /* 034FC 8090043C 1000001A */ beq $zero, $zero, .L809004A8 /* 03500 80900440 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -117,7 +117,7 @@ glabel func_80900344 /* 035A4 809004E4 45020006 */ bc1fl .L80900500 /* 035A8 809004E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 035AC 809004EC A20C0338 */ sb $t4, 0x0338($s0) ## 00000338 -/* 035B0 809004F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 035B0 809004F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 035B4 809004F4 E7A00024 */ swc1 $f0, 0x0024($sp) /* 035B8 809004F8 C7A00024 */ lwc1 $f0, 0x0024($sp) /* 035BC 809004FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s index fff7022f2d..1dbd0f9386 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s @@ -11,7 +11,7 @@ glabel func_80900580 /* 03664 809005A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03668 809005A8 24A5ADD0 */ addiu $a1, $a1, 0xADD0 ## $a1 = 0600ADD0 /* 0366C 809005AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03670 809005B0 0C029490 */ jal func_800A5240 +/* 03670 809005B0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 03674 809005B4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 03678 809005B8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0367C 809005BC 0C028800 */ jal SkelAnime_GetFrameCount @@ -30,7 +30,7 @@ glabel func_80900580 /* 036AC 809005EC E6100198 */ swc1 $f16, 0x0198($s0) ## 00000198 .L809005F0: /* 036B0 809005F0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 036B4 809005F4 0C029490 */ jal func_800A5240 +/* 036B4 809005F4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 036B8 809005F8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 036BC 809005FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 036C0 80900600 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s index 3c0710b207..c7ff9b47cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s @@ -7,7 +7,7 @@ glabel func_80900818 /* 038EC 8090082C 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 038F0 80900830 24A5A848 */ addiu $a1, $a1, 0xA848 ## $a1 = 0602A848 /* 038F4 80900834 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 038F8 80900838 0C029490 */ jal func_800A5240 +/* 038F8 80900838 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 038FC 8090083C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 03900 80900840 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 /* 03904 80900844 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s index 18a98d2bd0..dc750e3cc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s @@ -412,7 +412,7 @@ glabel L80900E4C /* 03F64 80900EA4 8FA4002C */ lw $a0, 0x002C($sp) /* 03F68 80900EA8 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 03F6C 80900EAC 24A54278 */ addiu $a1, $a1, 0x4278 ## $a1 = 06034278 -/* 03F70 80900EB0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 03F70 80900EB0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 03F74 80900EB4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03F78 80900EB8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 03F7C 80900EBC 1000004F */ beq $zero, $zero, .L80900FFC @@ -456,7 +456,7 @@ glabel L80900E4C /* 04004 80900F44 00000000 */ nop /* 04008 80900F48 4502002D */ bc1fl .L80901000 /* 0400C 80900F4C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 04010 80900F50 0C029490 */ jal func_800A5240 +/* 04010 80900F50 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04014 80900F54 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04018 80900F58 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s index 5c19414c42..433d1aa8c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s @@ -7,7 +7,7 @@ glabel func_80901020 /* 040F4 80901034 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 040F8 80901038 24A5A848 */ addiu $a1, $a1, 0xA848 ## $a1 = 0602A848 /* 040FC 8090103C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04100 80901040 0C029490 */ jal func_800A5240 +/* 04100 80901040 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04104 80901044 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 04108 80901048 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 /* 0410C 8090104C 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s index 7bbeb189a0..272180857c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s @@ -574,7 +574,7 @@ glabel L80901968 /* 04B18 80901A58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04B1C 80901A5C 24A53B1C */ addiu $a1, $a1, 0x3B1C ## $a1 = 06003B1C /* 04B20 80901A60 8FA40028 */ lw $a0, 0x0028($sp) -/* 04B24 80901A64 0C029490 */ jal func_800A5240 +/* 04B24 80901A64 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04B28 80901A68 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04B2C 80901A6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04B30 80901A70 0C028800 */ jal SkelAnime_GetFrameCount @@ -804,7 +804,7 @@ glabel L80901AB0 /* 04E70 80901DB0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04E74 80901DB4 24A57288 */ addiu $a1, $a1, 0x7288 ## $a1 = 06007288 /* 04E78 80901DB8 8FA40028 */ lw $a0, 0x0028($sp) -/* 04E7C 80901DBC 0C029490 */ jal func_800A5240 +/* 04E7C 80901DBC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04E80 80901DC0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04E84 80901DC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04E88 80901DC8 0C028800 */ jal SkelAnime_GetFrameCount @@ -878,7 +878,7 @@ glabel L80901E00 /* 04F78 80901EB8 8FA40028 */ lw $a0, 0x0028($sp) /* 04F7C 80901EBC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 04F80 80901EC0 24A58EB8 */ addiu $a1, $a1, 0x8EB8 ## $a1 = 06008EB8 -/* 04F84 80901EC4 0C029490 */ jal func_800A5240 +/* 04F84 80901EC4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04F88 80901EC8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04F8C 80901ECC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 04F90 80901ED0 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -1173,7 +1173,7 @@ glabel L80902290 /* 053A0 809022E0 8FA40028 */ lw $a0, 0x0028($sp) /* 053A4 809022E4 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 053A8 809022E8 24A54278 */ addiu $a1, $a1, 0x4278 ## $a1 = 06034278 -/* 053AC 809022EC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 053AC 809022EC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 053B0 809022F0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 053B4 809022F4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 053B8 809022F8 1000000E */ beq $zero, $zero, .L80902334 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s index 37587134e4..32ec8a0c4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s @@ -6,7 +6,7 @@ glabel func_80910D80 /* 00750 80910D90 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00754 80910D94 24A519A4 */ addiu $a1, $a1, 0x19A4 ## $a1 = 060019A4 /* 00758 80910D98 AFA60018 */ sw $a2, 0x0018($sp) -/* 0075C 80910D9C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0075C 80910D9C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00760 80910DA0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00764 80910DA4 8FA60018 */ lw $a2, 0x0018($sp) /* 00768 80910DA8 3C0E8091 */ lui $t6, %hi(func_80910DCC) ## $t6 = 80910000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s index 7b0b11cb82..ae15b62831 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s @@ -143,7 +143,7 @@ glabel func_80910DCC /* 00990 80910FD0 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00994 80910FD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00998 80910FD8 24A52684 */ addiu $a1, $a1, 0x2684 ## $a1 = 06002684 -/* 0099C 80910FDC 0C029490 */ jal func_800A5240 +/* 0099C 80910FDC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 009A0 80910FE0 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 009A4 80910FE4 8FAC0094 */ lw $t4, 0x0094($sp) /* 009A8 80910FE8 9183014C */ lbu $v1, 0x014C($t4) ## 0000014C @@ -153,7 +153,7 @@ glabel func_80910DCC /* 009B4 80910FF4 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 009B8 80910FF8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009BC 80910FFC 24A519A4 */ addiu $a1, $a1, 0x19A4 ## $a1 = 060019A4 -/* 009C0 80911000 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 009C0 80911000 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 009C4 80911004 3C06C150 */ lui $a2, 0xC150 ## $a2 = C1500000 /* 009C8 80911008 8FAD0094 */ lw $t5, 0x0094($sp) /* 009CC 8091100C 91A3014C */ lbu $v1, 0x014C($t5) ## 0000014C @@ -163,7 +163,7 @@ glabel func_80910DCC /* 009D8 80911018 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 009DC 8091101C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 009E0 80911020 24A5D99C */ addiu $a1, $a1, 0xD99C ## $a1 = 0600D99C -/* 009E4 80911024 0C029490 */ jal func_800A5240 +/* 009E4 80911024 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 009E8 80911028 3C06C0E0 */ lui $a2, 0xC0E0 ## $a2 = C0E00000 /* 009EC 8091102C C6640200 */ lwc1 $f4, 0x0200($s3) ## 00000200 /* 009F0 80911030 8E70011C */ lw $s0, 0x011C($s3) ## 0000011C @@ -193,7 +193,7 @@ glabel func_80910DCC /* 00A48 80911088 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00A4C 8091108C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A50 80911090 24A5DF80 */ addiu $a1, $a1, 0xDF80 ## $a1 = 0600DF80 -/* 00A54 80911094 0C029490 */ jal func_800A5240 +/* 00A54 80911094 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00A58 80911098 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 .L8091109C: /* 00A5C 8091109C 866201AA */ lh $v0, 0x01AA($s3) ## 000001AA diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s index 33009dae73..fbf3431012 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s @@ -5,7 +5,7 @@ glabel func_80911294 /* 00C60 809112A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00C64 809112A4 24A53CA4 */ addiu $a1, $a1, 0x3CA4 ## $a1 = 06003CA4 /* 00C68 809112A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C6C 809112AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00C6C 809112AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00C70 809112B0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00C74 809112B4 8FAF0018 */ lw $t7, 0x0018($sp) /* 00C78 809112B8 3C0E8091 */ lui $t6, %hi(func_809112D4) ## $t6 = 80910000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s index c764b0360e..783e9f1069 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s @@ -26,7 +26,7 @@ glabel func_809112D4 /* 00CE8 80911328 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00CEC 8091132C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00CF0 80911330 24A5D99C */ addiu $a1, $a1, 0xD99C ## $a1 = 0600D99C -/* 00CF4 80911334 0C029490 */ jal func_800A5240 +/* 00CF4 80911334 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00CF8 80911338 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 00CFC 8091133C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00D00 80911340 8E18011C */ lw $t8, 0x011C($s0) ## 0000011C @@ -60,7 +60,7 @@ glabel func_809112D4 /* 00D68 809113A8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00D6C 809113AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00D70 809113B0 24A53080 */ addiu $a1, $a1, 0x3080 ## $a1 = 06003080 -/* 00D74 809113B4 0C029490 */ jal func_800A5240 +/* 00D74 809113B4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00D78 809113B8 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 00D7C 809113BC 10000015 */ beq $zero, $zero, .L80911414 /* 00D80 809113C0 00000000 */ nop @@ -70,7 +70,7 @@ glabel func_809112D4 /* 00D8C 809113CC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00D90 809113D0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00D94 809113D4 24A5DF80 */ addiu $a1, $a1, 0xDF80 ## $a1 = 0600DF80 -/* 00D98 809113D8 0C029490 */ jal func_800A5240 +/* 00D98 809113D8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00D9C 809113DC 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 00DA0 809113E0 1000000C */ beq $zero, $zero, .L80911414 /* 00DA4 809113E4 00000000 */ nop @@ -80,7 +80,7 @@ glabel func_809112D4 /* 00DB0 809113F0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00DB4 809113F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DB8 809113F8 24A53CA4 */ addiu $a1, $a1, 0x3CA4 ## $a1 = 06003CA4 -/* 00DBC 809113FC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00DBC 809113FC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00DC0 80911400 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 00DC4 80911404 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 00DC8 80911408 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s index b84a63cf04..5faa37b828 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s @@ -7,7 +7,7 @@ glabel func_809114E8 /* 00EBC 809114FC 44066000 */ mfc1 $a2, $f12 /* 00EC0 80911500 24A50060 */ addiu $a1, $a1, 0x0060 ## $a1 = 06010060 /* 00EC4 80911504 AFA70018 */ sw $a3, 0x0018($sp) -/* 00EC8 80911508 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00EC8 80911508 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00ECC 8091150C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00ED0 80911510 8FA70018 */ lw $a3, 0x0018($sp) /* 00ED4 80911514 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s index 2aedae2b22..84258e5f56 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s @@ -14,7 +14,7 @@ glabel func_80911CB0 /* 0169C 80911CDC 468021A0 */ cvt.s.w $f6, $f4 /* 016A0 80911CE0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 016A4 80911CE4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 016A8 80911CE8 0C029490 */ jal func_800A5240 +/* 016A8 80911CE8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 016AC 80911CEC E60601D0 */ swc1 $f6, 0x01D0($s0) ## 000001D0 /* 016B0 80911CF0 3C0E8091 */ lui $t6, %hi(func_80911DD8) ## $t6 = 80910000 /* 016B4 80911CF4 25CE1DD8 */ addiu $t6, $t6, %lo(func_80911DD8) ## $t6 = 80911DD8 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s index e75e5ac3c1..46e23ef96d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s @@ -48,7 +48,7 @@ glabel func_80911DD8 /* 0183C 80911E7C 468042A0 */ cvt.s.w $f10, $f8 /* 01840 80911E80 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01844 80911E84 E60A01D0 */ swc1 $f10, 0x01D0($s0) ## 000001D0 -/* 01848 80911E88 0C029490 */ jal func_800A5240 +/* 01848 80911E88 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0184C 80911E8C 8FA40044 */ lw $a0, 0x0044($sp) /* 01850 80911E90 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A /* 01854 80911E94 A61801A4 */ sh $t8, 0x01A4($s0) ## 000001A4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s index ad45446347..007fde28f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s @@ -30,7 +30,7 @@ glabel func_80912020 /* 01A48 80912088 87A8001E */ lh $t0, 0x001E($sp) /* 01A4C 8091208C 00084880 */ sll $t1, $t0, 2 /* 01A50 80912090 00A92821 */ addu $a1, $a1, $t1 -/* 01A54 80912094 0C029490 */ jal func_800A5240 +/* 01A54 80912094 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01A58 80912098 8CA550D0 */ lw $a1, %lo(D_809150D0)($a1) /* 01A5C 8091209C 8FAB0020 */ lw $t3, 0x0020($sp) /* 01A60 809120A0 3C0A8091 */ lui $t2, %hi(func_809120BC) ## $t2 = 80910000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s index e87a5bb9bc..2515b6e630 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s @@ -21,7 +21,7 @@ glabel func_809121E0 /* 01BE8 80912228 468021A0 */ cvt.s.w $f6, $f4 /* 01BEC 8091222C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01BF0 80912230 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01BF4 80912234 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01BF4 80912234 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01BF8 80912238 E60601D0 */ swc1 $f6, 0x01D0($s0) ## 000001D0 /* 01BFC 8091223C 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 /* 01C00 80912240 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C @@ -38,7 +38,7 @@ glabel func_809121E0 /* 01C24 80912264 468042A0 */ cvt.s.w $f10, $f8 /* 01C28 80912268 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01C2C 8091226C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01C30 80912270 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01C30 80912270 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01C34 80912274 E60A01D0 */ swc1 $f10, 0x01D0($s0) ## 000001D0 .L80912278: /* 01C38 80912278 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s index 6891c65dd3..673954c863 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s @@ -35,7 +35,7 @@ glabel func_809122A4 /* 01CDC 8091231C 46805420 */ cvt.s.w $f16, $f10 /* 01CE0 80912320 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 01CE4 80912324 E61001D0 */ swc1 $f16, 0x01D0($s0) ## 000001D0 -/* 01CE8 80912328 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01CE8 80912328 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01CEC 8091232C 8FA40024 */ lw $a0, 0x0024($sp) /* 01CF0 80912330 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 01CF4 80912334 A60F01A2 */ sh $t7, 0x01A2($s0) ## 000001A2 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s index f51842f2b0..c1c2a5a9b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s @@ -15,7 +15,7 @@ glabel func_809123D4 /* 01DC4 80912404 24A50344 */ addiu $a1, $a1, 0x0344 ## $a1 = 06010344 /* 01DC8 80912408 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01DCC 8091240C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 01DD0 80912410 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01DD0 80912410 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01DD4 80912414 E4E601D0 */ swc1 $f6, 0x01D0($a3) ## 000001D0 /* 01DD8 80912418 8FA40018 */ lw $a0, 0x0018($sp) /* 01DDC 8091241C 3C0E8091 */ lui $t6, %hi(func_80912448) ## $t6 = 80910000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s index b820280bad..3607562c7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s @@ -15,7 +15,7 @@ glabel func_80912524 /* 01F14 80912554 24A529E0 */ addiu $a1, $a1, 0x29E0 ## $a1 = 060129E0 /* 01F18 80912558 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01F1C 8091255C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 01F20 80912560 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01F20 80912560 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01F24 80912564 E4E601D0 */ swc1 $f6, 0x01D0($a3) ## 000001D0 /* 01F28 80912568 8FA70018 */ lw $a3, 0x0018($sp) /* 01F2C 8091256C 3C0E8091 */ lui $t6, %hi(func_80912594) ## $t6 = 80910000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s index 9fcad929d7..d4486a8fc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s @@ -95,7 +95,7 @@ glabel func_80912594 /* 020A4 809126E4 02002825 */ or $a1, $s0, $zero ## $a1 = 06011F44 /* 020A8 809126E8 468021A0 */ cvt.s.w $f6, $f4 /* 020AC 809126EC E62601D0 */ swc1 $f6, 0x01D0($s1) ## 000001D0 -/* 020B0 809126F0 0C029490 */ jal func_800A5240 +/* 020B0 809126F0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 020B4 809126F4 8FA40070 */ lw $a0, 0x0070($sp) .L809126F8: /* 020B8 809126F8 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 @@ -121,7 +121,7 @@ glabel func_80912594 /* 020FC 8091273C 4406C000 */ mfc1 $a2, $f24 /* 02100 80912740 24A5267C */ addiu $a1, $a1, 0x267C ## $a1 = 0601267C /* 02104 80912744 E62A01D0 */ swc1 $f10, 0x01D0($s1) ## 000001D0 -/* 02108 80912748 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02108 80912748 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0210C 8091274C 8FA40070 */ lw $a0, 0x0070($sp) /* 02110 80912750 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 02114 80912754 A62901A2 */ sh $t1, 0x01A2($s1) ## 000001A2 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 494d2e8915..544ae1725b 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 @@ -6,7 +6,7 @@ glabel func_80912C94 /* 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 func_800A51E8 +/* 02670 80912CB0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02674 80912CB4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02678 80912CB8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0267C 80912CBC 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s index c38a483bd1..30be7307b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s @@ -224,7 +224,7 @@ glabel L80912FB4 /* 02A24 80913064 02002825 */ or $a1, $s0, $zero ## $a1 = 06000D84 /* 02A28 80913068 468042A0 */ cvt.s.w $f10, $f8 /* 02A2C 8091306C 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 -/* 02A30 80913070 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02A30 80913070 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 02A34 80913074 E64A01D0 */ swc1 $f10, 0x01D0($s2) ## 000001D0 /* 02A38 80913078 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 02A3C 8091307C A65901A2 */ sh $t9, 0x01A2($s2) ## 000001A2 @@ -459,7 +459,7 @@ glabel L809131C4 /* 02D84 809133C4 A64D035E */ sh $t5, 0x035E($s2) ## 0000035E /* 02D88 809133C8 A64E01BC */ sh $t6, 0x01BC($s2) ## 000001BC /* 02D8C 809133CC 24A5189C */ addiu $a1, $a1, 0x189C ## $a1 = 0600189C -/* 02D90 809133D0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02D90 809133D0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 02D94 809133D4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 02D98 809133D8 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02D9C 809133DC 44812000 */ mtc1 $at, $f4 ## $f4 = 14.00 @@ -513,7 +513,7 @@ glabel L80913424 /* 02E50 80913490 A64A035E */ sh $t2, 0x035E($s2) ## 0000035E /* 02E54 80913494 24A51AB0 */ addiu $a1, $a1, 0x1AB0 ## $a1 = 06001AB0 /* 02E58 80913498 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 02E5C 8091349C 0C029490 */ jal func_800A5240 +/* 02E5C 8091349C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02E60 809134A0 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 02E64 809134A4 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 /* 02E68 809134A8 A64001AE */ sh $zero, 0x01AE($s2) ## 000001AE diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s index fed9134134..a8338eaa14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s @@ -30,7 +30,7 @@ glabel BossGoma_Init /* 00298 80915CA8 AFA00018 */ sw $zero, 0x0018($sp) /* 0029C 80915CAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002A0 80915CB0 24A52678 */ addiu $a1, $a1, 0x2678 ## $a1 = 06012678 -/* 002A4 80915CB4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 002A4 80915CB4 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 002A8 80915CB8 8FA40044 */ lw $a0, 0x0044($sp) /* 002AC 80915CBC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 002B0 80915CC0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s index 472ed1cd0b..b7cb900e5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s @@ -23,7 +23,7 @@ glabel func_8092CC58 /* 006D4 8092CCA4 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C /* 006D8 8092CCA8 8FA40038 */ lw $a0, 0x0038($sp) /* 006DC 8092CCAC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 006E0 8092CCB0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 006E0 8092CCB0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 006E4 8092CCB4 AFA7004C */ sw $a3, 0x004C($sp) /* 006E8 8092CCB8 8FA7004C */ lw $a3, 0x004C($sp) .L8092CCBC: @@ -886,7 +886,7 @@ glabel func_8092CC58 /* 013BC 8092D98C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 013C0 8092D990 24A5C288 */ addiu $a1, $a1, 0xC288 ## $a1 = 0600C288 /* 013C4 8092D994 8FA40038 */ lw $a0, 0x0038($sp) -/* 013C8 8092D998 0C029490 */ jal func_800A5240 +/* 013C8 8092D998 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 013CC 8092D99C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 013D0 8092D9A0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 013D4 8092D9A4 0C24CF4B */ jal func_80933D2C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s index 12c9f77f3c..872c6dff8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s @@ -8,7 +8,7 @@ glabel func_8092DA6C /* 014B4 8092DA84 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 014B8 8092DA88 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 014BC 8092DA8C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 014C0 8092DA90 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 014C0 8092DA90 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 014C4 8092DA94 AFA70018 */ sw $a3, 0x0018($sp) /* 014C8 8092DA98 8FA70018 */ lw $a3, 0x0018($sp) .L8092DA9C: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s index 4a9e914a5d..d4f5ae40e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s @@ -6,7 +6,7 @@ glabel func_8092DCEC /* 0172C 8092DCFC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01730 8092DD00 24A5C9BC */ addiu $a1, $a1, 0xC9BC ## $a1 = 0600C9BC /* 01734 8092DD04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01738 8092DD08 0C029490 */ jal func_800A5240 +/* 01738 8092DD08 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0173C 8092DD0C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01740 8092DD10 10000008 */ beq $zero, $zero, .L8092DD34 /* 01744 8092DD14 8FAF0018 */ lw $t7, 0x0018($sp) @@ -15,7 +15,7 @@ glabel func_8092DCEC /* 0174C 8092DD1C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01750 8092DD20 24A5C5B0 */ addiu $a1, $a1, 0xC5B0 ## $a1 = 0600C5B0 /* 01754 8092DD24 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01758 8092DD28 0C029490 */ jal func_800A5240 +/* 01758 8092DD28 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0175C 8092DD2C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01760 8092DD30 8FAF0018 */ lw $t7, 0x0018($sp) .L8092DD34: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s index 47c64f9704..51b746c246 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s @@ -6,7 +6,7 @@ glabel func_8092DE48 /* 01888 8092DE58 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 /* 0188C 8092DE5C AFA70018 */ sw $a3, 0x0018($sp) /* 01890 8092DE60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01894 8092DE64 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01894 8092DE64 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01898 8092DE68 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0189C 8092DE6C 8FA70018 */ lw $a3, 0x0018($sp) /* 018A0 8092DE70 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s index b06ba36378..03da97f9c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s @@ -6,7 +6,7 @@ glabel func_8092E25C /* 01C9C 8092E26C 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C /* 01CA0 8092E270 AFA70018 */ sw $a3, 0x0018($sp) /* 01CA4 8092E274 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01CA8 8092E278 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01CA8 8092E278 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01CAC 8092E27C 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 /* 01CB0 8092E280 3C058093 */ lui $a1, %hi(D_80937340) ## $a1 = 80930000 /* 01CB4 8092E284 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s index b4ece4e402..7375e50227 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s @@ -6,7 +6,7 @@ glabel func_8092E34C /* 01D8C 8092E35C 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 /* 01D90 8092E360 AFA70018 */ sw $a3, 0x0018($sp) /* 01D94 8092E364 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D98 8092E368 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01D98 8092E368 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01D9C 8092E36C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01DA0 8092E370 8FA70018 */ lw $a3, 0x0018($sp) /* 01DA4 8092E374 3C188093 */ lui $t8, %hi(func_8092E3A0) ## $t8 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s index 41ce8d54bc..5a63263be9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s @@ -6,7 +6,7 @@ glabel func_8092E3E8 /* 01E28 8092E3F8 24A5C288 */ addiu $a1, $a1, 0xC288 ## $a1 = 0600C288 /* 01E2C 8092E3FC AFA70018 */ sw $a3, 0x0018($sp) /* 01E30 8092E400 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01E34 8092E404 0C029490 */ jal func_800A5240 +/* 01E34 8092E404 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01E38 8092E408 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01E3C 8092E40C 8FA70018 */ lw $a3, 0x0018($sp) /* 01E40 8092E410 3C188093 */ lui $t8, %hi(func_8092E438) ## $t8 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s index 4c7af98ec0..72db85e576 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s @@ -6,7 +6,7 @@ glabel func_8092E470 /* 01EB0 8092E480 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01EB4 8092E484 24A5B6FC */ addiu $a1, $a1, 0xB6FC ## $a1 = 0600B6FC /* 01EB8 8092E488 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01EBC 8092E48C 0C029490 */ jal func_800A5240 +/* 01EBC 8092E48C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01EC0 8092E490 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01EC4 8092E494 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01EC8 8092E498 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s index 94c5af3e3f..3dca913842 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s @@ -6,7 +6,7 @@ glabel func_8092E790 /* 021D0 8092E7A0 24A5ACD4 */ addiu $a1, $a1, 0xACD4 ## $a1 = 0600ACD4 /* 021D4 8092E7A4 AFA70018 */ sw $a3, 0x0018($sp) /* 021D8 8092E7A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 021DC 8092E7AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 021DC 8092E7AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 021E0 8092E7B0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 021E4 8092E7B4 8FA70018 */ lw $a3, 0x0018($sp) /* 021E8 8092E7B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s index 017bd6cd71..331a7c6ccd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s @@ -6,7 +6,7 @@ glabel func_8092E930 /* 02370 8092E940 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02374 8092E944 24A5CC6C */ addiu $a1, $a1, 0xCC6C ## $a1 = 0600CC6C /* 02378 8092E948 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0237C 8092E94C 0C029490 */ jal func_800A5240 +/* 0237C 8092E94C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02380 8092E950 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 02384 8092E954 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02388 8092E958 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s index 6053dc75fb..15329c9f41 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s @@ -6,7 +6,7 @@ glabel func_8092EA50 /* 02490 8092EA60 24A5D458 */ addiu $a1, $a1, 0xD458 ## $a1 = 0600D458 /* 02494 8092EA64 AFA70018 */ sw $a3, 0x0018($sp) /* 02498 8092EA68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0249C 8092EA6C 0C029490 */ jal func_800A5240 +/* 0249C 8092EA6C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 024A0 8092EA70 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 024A4 8092EA74 8FA70018 */ lw $a3, 0x0018($sp) /* 024A8 8092EA78 3C18FFCF */ lui $t8, 0xFFCF ## $t8 = FFCF0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s index 6f96d20bd0..7de87d9bbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s @@ -10,7 +10,7 @@ glabel func_8092EF28 /* 02978 8092EF48 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 /* 0297C 8092EF4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02980 8092EF50 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 02984 8092EF54 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02984 8092EF54 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 02988 8092EF58 AFAE002C */ sw $t6, 0x002C($sp) /* 0298C 8092EF5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02990 8092EF60 0C24CF4B */ jal func_80933D2C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s index 4f5bc5ebfb..ee0ae9801e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s @@ -6,7 +6,7 @@ glabel func_8092F30C /* 02D4C 8092F31C 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 /* 02D50 8092F320 AFA70018 */ sw $a3, 0x0018($sp) /* 02D54 8092F324 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02D58 8092F328 0C029490 */ jal func_800A5240 +/* 02D58 8092F328 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02D5C 8092F32C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 02D60 8092F330 8FA70018 */ lw $a3, 0x0018($sp) /* 02D64 8092F334 240E00A0 */ addiu $t6, $zero, 0x00A0 ## $t6 = 000000A0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s index d0e1d241e5..344e8cd3a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s @@ -17,7 +17,7 @@ glabel func_8092FBE4 /* 03650 8092FC20 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 03654 8092FC24 00084880 */ sll $t1, $t0, 2 /* 03658 8092FC28 00A92821 */ addu $a1, $a1, $t1 -/* 0365C 8092FC2C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0365C 8092FC2C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 03660 8092FC30 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) /* 03664 8092FC34 8FA70018 */ lw $a3, 0x0018($sp) /* 03668 8092FC38 3C0B8093 */ lui $t3, %hi(func_8092FC60) ## $t3 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s index 4e969cbeb5..bbabf6bf96 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s @@ -15,7 +15,7 @@ glabel func_8092FDD0 /* 03834 8092FE04 00A82821 */ addu $a1, $a1, $t0 /* 03838 8092FE08 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 0383C 8092FE0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03840 8092FE10 0C029490 */ jal func_800A5240 +/* 03840 8092FE10 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 03844 8092FE14 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 03848 8092FE18 8FA70018 */ lw $a3, 0x0018($sp) /* 0384C 8092FE1C 3C0A8093 */ lui $t2, %hi(func_8092FE44) ## $t2 = 80930000 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 cb4cc67eac..1241753bbb 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 @@ -12,7 +12,7 @@ glabel func_8092FF94 /* 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 func_800A51E8 +/* 039F8 8092FFC8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 039FC 8092FFCC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03A00 8092FFD0 8FA60018 */ lw $a2, 0x0018($sp) /* 03A04 8092FFD4 3C088093 */ lui $t0, %hi(func_8092FFF0) ## $t0 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s index 78c8a50c85..970cc2d1b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s @@ -15,7 +15,7 @@ glabel func_809300E4 /* 03B48 80930118 00A82821 */ addu $a1, $a1, $t0 /* 03B4C 8093011C 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 03B50 80930120 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03B54 80930124 0C029490 */ jal func_800A5240 +/* 03B54 80930124 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 03B58 80930128 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 03B5C 8093012C 8FA70018 */ lw $a3, 0x0018($sp) /* 03B60 80930130 3C0A8093 */ lui $t2, %hi(func_80930158) ## $t2 = 80930000 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 dcfb1d0dd7..30af99ea70 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 @@ -8,7 +8,7 @@ glabel func_80930238 /* 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 func_800A51E8 +/* 03C8C 8093025C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 03C90 80930260 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03C94 80930264 8FA60018 */ lw $a2, 0x0018($sp) /* 03C98 80930268 3C188093 */ lui $t8, %hi(func_80930284) ## $t8 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s index 4626cb4e93..16f8d54ff6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s @@ -18,7 +18,7 @@ glabel func_809303C8 /* 03E38 80930408 00095080 */ sll $t2, $t1, 2 /* 03E3C 8093040C 00AA2821 */ addu $a1, $a1, $t2 /* 03E40 80930410 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) -/* 03E44 80930414 0C029490 */ jal func_800A5240 +/* 03E44 80930414 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 03E48 80930418 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 /* 03E4C 8093041C 8FA70018 */ lw $a3, 0x0018($sp) /* 03E50 80930420 3C0B8093 */ lui $t3, %hi(func_8093043C) ## $t3 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s index 85129e0869..aac5cf6ab5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s @@ -15,7 +15,7 @@ glabel func_80930474 /* 03ED8 809304A8 00A82821 */ addu $a1, $a1, $t0 /* 03EDC 809304AC 8CA57884 */ lw $a1, %lo(D_80937884)($a1) /* 03EE0 809304B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03EE4 809304B4 0C029490 */ jal func_800A5240 +/* 03EE4 809304B4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 03EE8 809304B8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 03EEC 809304BC 8FA40018 */ lw $a0, 0x0018($sp) /* 03EF0 809304C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s index 534563ea7d..b5daf7607c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s @@ -91,7 +91,7 @@ glabel func_8093051C /* 04094 80930664 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 04098 80930668 000FC080 */ sll $t8, $t7, 2 /* 0409C 8093066C 00B82821 */ addu $a1, $a1, $t8 -/* 040A0 80930670 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 040A0 80930670 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 040A4 80930674 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) /* 040A8 80930678 1000002F */ beq $zero, $zero, .L80930738 /* 040AC 8093067C 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s index 0754560b33..579f050b16 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s @@ -16,7 +16,7 @@ glabel func_80930748 /* 041B0 80930780 00A82821 */ addu $a1, $a1, $t0 /* 041B4 80930784 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 041B8 80930788 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 041BC 8093078C 0C029490 */ jal func_800A5240 +/* 041BC 8093078C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 041C0 80930790 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 041C4 80930794 8FA70018 */ lw $a3, 0x0018($sp) /* 041C8 80930798 3C098093 */ lui $t1, %hi(func_809307B4) ## $t1 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s index c36e5d3c5f..3346e2b4ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s @@ -18,7 +18,7 @@ glabel func_809308A4 /* 04314 809308E4 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 04318 809308E8 00194080 */ sll $t0, $t9, 2 /* 0431C 809308EC 00A82821 */ addu $a1, $a1, $t0 -/* 04320 809308F0 0C029490 */ jal func_800A5240 +/* 04320 809308F0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04324 809308F4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 04328 809308F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0432C 809308FC 0C24CF20 */ jal func_80933C80 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s index f95b9d514c..da94b2c789 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s @@ -15,7 +15,7 @@ glabel func_80930B18 /* 0457C 80930B4C 00194080 */ sll $t0, $t9, 2 /* 04580 80930B50 00A82821 */ addu $a1, $a1, $t0 /* 04584 80930B54 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 04588 80930B58 0C029490 */ jal func_800A5240 +/* 04588 80930B58 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0458C 80930B5C 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 04590 80930B60 3C058094 */ lui $a1, %hi(D_80938C90) ## $a1 = 80940000 /* 04594 80930B64 8CA58C90 */ lw $a1, %lo(D_80938C90)($a1) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s index c05986db63..806418719b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s @@ -9,7 +9,7 @@ glabel func_80930CE4 /* 04730 80930D00 000E7880 */ sll $t7, $t6, 2 /* 04734 80930D04 00AF2821 */ addu $a1, $a1, $t7 /* 04738 80930D08 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 0473C 80930D0C 0C029490 */ jal func_800A5240 +/* 0473C 80930D0C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04740 80930D10 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 04744 80930D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04748 80930D18 0C24CF20 */ jal func_80933C80 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s index 1eb46259c0..ddb59d1607 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s @@ -15,7 +15,7 @@ glabel func_80930F80 /* 049E4 80930FB4 00A82821 */ addu $a1, $a1, $t0 /* 049E8 80930FB8 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) /* 049EC 80930FBC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 049F0 80930FC0 0C029490 */ jal func_800A5240 +/* 049F0 80930FC0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 049F4 80930FC4 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 049F8 80930FC8 8FA70018 */ lw $a3, 0x0018($sp) /* 049FC 80930FCC 3C098093 */ lui $t1, %hi(func_80930FE8) ## $t1 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s index 6120f286fa..420293f064 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s @@ -12,7 +12,7 @@ glabel func_80931044 /* 04A9C 8093106C 000E7880 */ sll $t7, $t6, 2 /* 04AA0 80931070 00AF2821 */ addu $a1, $a1, $t7 /* 04AA4 80931074 8CA57864 */ lw $a1, %lo(D_80937864)($a1) -/* 04AA8 80931078 0C029490 */ jal func_800A5240 +/* 04AA8 80931078 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04AAC 8093107C 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 04AB0 80931080 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04AB4 80931084 0C24CF3B */ jal func_80933CEC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s index 87ce4ce57b..4c0bf65039 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s @@ -26,7 +26,7 @@ glabel func_80931210 /* 04C9C 8093126C 000B6080 */ sll $t4, $t3, 2 /* 04CA0 80931270 00AC2821 */ addu $a1, $a1, $t4 /* 04CA4 80931274 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 04CA8 80931278 0C029490 */ jal func_800A5240 +/* 04CA8 80931278 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04CAC 8093127C 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 04CB0 80931280 3C058094 */ lui $a1, %hi(D_80938C90) ## $a1 = 80940000 /* 04CB4 80931284 8CA58C90 */ lw $a1, %lo(D_80938C90)($a1) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s index ef2e7421f3..63f6e45358 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s @@ -9,7 +9,7 @@ glabel func_809314F0 /* 04F3C 8093150C 00AF2821 */ addu $a1, $a1, $t7 /* 04F40 80931510 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 04F44 80931514 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04F48 80931518 0C029490 */ jal func_800A5240 +/* 04F48 80931518 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04F4C 8093151C 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 04F50 80931520 8FA40018 */ lw $a0, 0x0018($sp) /* 04F54 80931524 24180240 */ addiu $t8, $zero, 0x0240 ## $t8 = 00000240 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s index d0eb272758..c3a4f258cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s @@ -14,7 +14,7 @@ glabel func_80931788 /* 051E8 809317B8 00A92821 */ addu $a1, $a1, $t1 /* 051EC 809317BC 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 051F0 809317C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 051F4 809317C4 0C029490 */ jal func_800A5240 +/* 051F4 809317C4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 051F8 809317C8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 051FC 809317CC 8FA70018 */ lw $a3, 0x0018($sp) /* 05200 809317D0 3C0C8093 */ lui $t4, %hi(func_809317F8) ## $t4 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s index 8000f11181..a8fce135e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s @@ -15,7 +15,7 @@ glabel func_809318A0 /* 05304 809318D4 00A82821 */ addu $a1, $a1, $t0 /* 05308 809318D8 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 0530C 809318DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05310 809318E0 0C029490 */ jal func_800A5240 +/* 05310 809318E0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05314 809318E4 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 05318 809318E8 8FA70018 */ lw $a3, 0x0018($sp) /* 0531C 809318EC 3C0B8093 */ lui $t3, %hi(func_80931928) ## $t3 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s index efc0cd4891..8e6bebc402 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s @@ -9,7 +9,7 @@ glabel func_809319D0 /* 0541C 809319EC 00AF2821 */ addu $a1, $a1, $t7 /* 05420 809319F0 8CA57864 */ lw $a1, %lo(D_80937864)($a1) /* 05424 809319F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05428 809319F8 0C029490 */ jal func_800A5240 +/* 05428 809319F8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0542C 809319FC 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 05430 80931A00 8FA40018 */ lw $a0, 0x0018($sp) /* 05434 80931A04 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s index 6b96f86ca8..781d1230e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s @@ -9,7 +9,7 @@ glabel func_80931D04 /* 05750 80931D20 00AF2821 */ addu $a1, $a1, $t7 /* 05754 80931D24 8CA5786C */ lw $a1, %lo(D_8093786C)($a1) /* 05758 80931D28 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0575C 80931D2C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0575C 80931D2C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 05760 80931D30 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 05764 80931D34 8FA70018 */ lw $a3, 0x0018($sp) /* 05768 80931D38 3C198093 */ lui $t9, %hi(func_80931D5C) ## $t9 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s index 38c076a640..725bb23357 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s @@ -9,7 +9,7 @@ glabel func_80931E70 /* 058BC 80931E8C 00AF2821 */ addu $a1, $a1, $t7 /* 058C0 80931E90 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 058C4 80931E94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 058C8 80931E98 0C029490 */ jal func_800A5240 +/* 058C8 80931E98 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 058CC 80931E9C 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 058D0 80931EA0 8FA70018 */ lw $a3, 0x0018($sp) /* 058D4 80931EA4 3C188093 */ lui $t8, %hi(func_80931EC0) ## $t8 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s index 10feba0df1..b165c90bb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s @@ -35,7 +35,7 @@ glabel func_80931F84 /* 05A34 80932004 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 05A38 80932008 00194080 */ sll $t0, $t9, 2 /* 05A3C 8093200C 00A82821 */ addu $a1, $a1, $t0 -/* 05A40 80932010 0C029490 */ jal func_800A5240 +/* 05A40 80932010 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05A44 80932014 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 05A48 80932018 10000016 */ beq $zero, $zero, .L80932074 /* 05A4C 8093201C 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s index eedaae67a3..cd2c8eaa01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s @@ -15,7 +15,7 @@ glabel func_809322B4 /* 05D18 809322E8 00194080 */ sll $t0, $t9, 2 /* 05D1C 809322EC 00A82821 */ addu $a1, $a1, $t0 /* 05D20 809322F0 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 05D24 809322F4 0C029490 */ jal func_800A5240 +/* 05D24 809322F4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05D28 809322F8 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 05D2C 809322FC 24090024 */ addiu $t1, $zero, 0x0024 ## $t1 = 00000024 /* 05D30 80932300 A6090198 */ sh $t1, 0x0198($s0) ## 00000198 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s index f21a58f5aa..3c80d35d0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s @@ -36,7 +36,7 @@ glabel func_8093234C /* 05DF4 809323C4 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 05DF8 809323C8 00194080 */ sll $t0, $t9, 2 /* 05DFC 809323CC 00A82821 */ addu $a1, $a1, $t0 -/* 05E00 809323D0 0C029490 */ jal func_800A5240 +/* 05E00 809323D0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05E04 809323D4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 05E08 809323D8 10000009 */ beq $zero, $zero, .L80932400 /* 05E0C 809323DC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -46,7 +46,7 @@ glabel func_8093234C /* 05E18 809323E8 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 /* 05E1C 809323EC 00095080 */ sll $t2, $t1, 2 /* 05E20 809323F0 00AA2821 */ addu $a1, $a1, $t2 -/* 05E24 809323F4 0C029490 */ jal func_800A5240 +/* 05E24 809323F4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05E28 809323F8 8CA57864 */ lw $a1, %lo(D_80937864)($a1) /* 05E2C 809323FC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 .L80932400: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s index 9596a90e5e..f7bfe5fecc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s @@ -9,7 +9,7 @@ glabel func_809324A4 /* 05EF0 809324C0 00AF2821 */ addu $a1, $a1, $t7 /* 05EF4 809324C4 8CA57874 */ lw $a1, %lo(D_80937874)($a1) /* 05EF8 809324C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05EFC 809324CC 0C029490 */ jal func_800A5240 +/* 05EFC 809324CC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05F00 809324D0 3C064100 */ lui $a2, 0x4100 ## $a2 = 41000000 /* 05F04 809324D4 8FA70018 */ lw $a3, 0x0018($sp) /* 05F08 809324D8 3C188093 */ lui $t8, %hi(func_809324F4) ## $t8 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s index d00e4b9059..a49f4a18f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s @@ -9,7 +9,7 @@ glabel func_80932808 /* 06254 80932824 00AF2821 */ addu $a1, $a1, $t7 /* 06258 80932828 8CA57864 */ lw $a1, %lo(D_80937864)($a1) /* 0625C 8093282C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06260 80932830 0C029490 */ jal func_800A5240 +/* 06260 80932830 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 06264 80932834 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 06268 80932838 8FA70018 */ lw $a3, 0x0018($sp) /* 0626C 8093283C 3C188093 */ lui $t8, %hi(func_8093285C) ## $t8 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s index 1d60302f63..5a2aa6ae59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s @@ -9,7 +9,7 @@ glabel func_809329D4 /* 06420 809329F0 000E7880 */ sll $t7, $t6, 2 /* 06424 809329F4 00AF2821 */ addu $a1, $a1, $t7 /* 06428 809329F8 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) -/* 0642C 809329FC 0C029490 */ jal func_800A5240 +/* 0642C 809329FC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 06430 80932A00 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 06434 80932A04 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 /* 06438 80932A08 3C188093 */ lui $t8, %hi(func_80932C38) ## $t8 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s index f23748489b..c6ef3c462e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s @@ -85,7 +85,7 @@ glabel func_80932A80 /* 065D4 80932BA4 8FA40020 */ lw $a0, 0x0020($sp) /* 065D8 80932BA8 000B6080 */ sll $t4, $t3, 2 /* 065DC 80932BAC 00AC2821 */ addu $a1, $a1, $t4 -/* 065E0 80932BB0 0C029490 */ jal func_800A5240 +/* 065E0 80932BB0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 065E4 80932BB4 8CA57874 */ lw $a1, %lo(D_80937874)($a1) /* 065E8 80932BB8 10000004 */ beq $zero, $zero, .L80932BCC /* 065EC 80932BBC 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s index ffc87c2a53..774130187f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s @@ -10,7 +10,7 @@ glabel func_80932BDC /* 0662C 80932BFC 00AF2821 */ addu $a1, $a1, $t7 /* 06630 80932C00 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 06634 80932C04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06638 80932C08 0C029490 */ jal func_800A5240 +/* 06638 80932C08 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0663C 80932C0C 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 06640 80932C10 8FA70018 */ lw $a3, 0x0018($sp) /* 06644 80932C14 3C198093 */ lui $t9, %hi(func_80932C38) ## $t9 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s index f5c3ab7872..6d7ef5bb2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s @@ -15,7 +15,7 @@ glabel func_80932D10 /* 06774 80932D44 00A82821 */ addu $a1, $a1, $t0 /* 06778 80932D48 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 0677C 80932D4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06780 80932D50 0C029490 */ jal func_800A5240 +/* 06780 80932D50 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 06784 80932D54 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 06788 80932D58 8FA70018 */ lw $a3, 0x0018($sp) /* 0678C 80932D5C 240900A0 */ addiu $t1, $zero, 0x00A0 ## $t1 = 000000A0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s index b89380efac..6abb8c6a7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s @@ -64,7 +64,7 @@ glabel func_80932DAC /* 068B8 80932E88 8FA40020 */ lw $a0, 0x0020($sp) /* 068BC 80932E8C 00084880 */ sll $t1, $t0, 2 /* 068C0 80932E90 00A92821 */ addu $a1, $a1, $t1 -/* 068C4 80932E94 0C029490 */ jal func_800A5240 +/* 068C4 80932E94 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 068C8 80932E98 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 068CC 80932E9C 1000000E */ beq $zero, $zero, .L80932ED8 /* 068D0 80932EA0 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 @@ -80,7 +80,7 @@ glabel func_80932DAC /* 068F0 80932EC0 00AC2821 */ addu $a1, $a1, $t4 /* 068F4 80932EC4 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 068F8 80932EC8 8FA40020 */ lw $a0, 0x0020($sp) -/* 068FC 80932ECC 0C029490 */ jal func_800A5240 +/* 068FC 80932ECC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 06900 80932ED0 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 06904 80932ED4 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 .L80932ED8: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s index 232d2a9bdd..2eff642791 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s @@ -9,7 +9,7 @@ glabel func_80932FA0 /* 069EC 80932FBC 00AF2821 */ addu $a1, $a1, $t7 /* 069F0 80932FC0 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 069F4 80932FC4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 069F8 80932FC8 0C029490 */ jal func_800A5240 +/* 069F8 80932FC8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 069FC 80932FCC 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 06A00 80932FD0 8FA70018 */ lw $a3, 0x0018($sp) /* 06A04 80932FD4 3C188093 */ lui $t8, %hi(func_80932FF0) ## $t8 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s index ae31436017..033ea85ce5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s @@ -9,7 +9,7 @@ glabel func_80933064 /* 06AB0 80933080 00AF2821 */ addu $a1, $a1, $t7 /* 06AB4 80933084 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 06AB8 80933088 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06ABC 8093308C 0C029490 */ jal func_800A5240 +/* 06ABC 8093308C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 06AC0 80933090 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 06AC4 80933094 8FA70018 */ lw $a3, 0x0018($sp) /* 06AC8 80933098 3C188093 */ lui $t8, %hi(func_809330B4) ## $t8 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s index 4c9ba4cc09..12a7e5e561 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s @@ -9,7 +9,7 @@ glabel func_8093323C /* 06C88 80933258 00AF2821 */ addu $a1, $a1, $t7 /* 06C8C 8093325C 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) /* 06C90 80933260 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06C94 80933264 0C029490 */ jal func_800A5240 +/* 06C94 80933264 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 06C98 80933268 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 06C9C 8093326C 8FA70018 */ lw $a3, 0x0018($sp) /* 06CA0 80933270 3C188093 */ lui $t8, %hi(func_80933290) ## $t8 = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s index 73389e5246..b86af858ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s @@ -27,7 +27,7 @@ glabel func_80933290 /* 06D1C 809332EC 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 06D20 809332F0 000FC080 */ sll $t8, $t7, 2 /* 06D24 809332F4 00B82821 */ addu $a1, $a1, $t8 -/* 06D28 809332F8 0C029490 */ jal func_800A5240 +/* 06D28 809332F8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 06D2C 809332FC 8CA57884 */ lw $a1, %lo(D_80937884)($a1) /* 06D30 80933300 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 06D34 80933304 A2190195 */ sb $t9, 0x0195($s0) ## 00000195 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s index d867928f44..ef53c9da3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s @@ -15,7 +15,7 @@ glabel func_80933554 /* 06FB8 80933588 00194080 */ sll $t0, $t9, 2 /* 06FBC 8093358C 00A82821 */ addu $a1, $a1, $t0 /* 06FC0 80933590 8CA57864 */ lw $a1, %lo(D_80937864)($a1) -/* 06FC4 80933594 0C029490 */ jal func_800A5240 +/* 06FC4 80933594 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 06FC8 80933598 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 06FCC 8093359C 92090196 */ lbu $t1, 0x0196($s0) ## 00000196 /* 06FD0 809335A0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s index 84a20b44bb..58acd06511 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s @@ -307,7 +307,7 @@ glabel BossTw_Init /* 00E54 80939B24 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E58 80939B28 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 00E5C 80939B2C 8FA40048 */ lw $a0, 0x0048($sp) -/* 00E60 80939B30 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00E60 80939B30 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00E64 80939B34 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00E68 80939B38 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00E6C 80939B3C 100000BF */ beq $zero, $zero, .L80939E3C @@ -359,7 +359,7 @@ glabel BossTw_Init /* 00F14 80939BE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F18 80939BE8 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 00F1C 80939BEC 8FA40048 */ lw $a0, 0x0048($sp) -/* 00F20 80939BF0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00F20 80939BF0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00F24 80939BF4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00F28 80939BF8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00F2C 80939BFC 1000008F */ beq $zero, $zero, .L80939E3C @@ -394,7 +394,7 @@ glabel BossTw_Init /* 00F98 80939C68 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 00F9C 80939C6C 24A544B4 */ addiu $a1, $a1, 0x44B4 ## $a1 = 060244B4 /* 00FA0 80939C70 8FA40048 */ lw $a0, 0x0048($sp) -/* 00FA4 80939C74 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00FA4 80939C74 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00FA8 80939C78 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00FAC 80939C7C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00FB0 80939C80 95CEF542 */ lhu $t6, -0x0ABE($t6) ## 8015F542 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s index 6f3c963dac..07a4bcfe7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s @@ -19,7 +19,7 @@ glabel func_8093A0A8 /* 0141C 8093A0EC 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 01420 8093A0F0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 01424 8093A0F4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 01428 8093A0F8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01428 8093A0F8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0142C 8093A0FC E484FF60 */ swc1 $f4, -0x00A0($a0) ## 000004C8 /* 01430 8093A100 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s index 7777f36737..40bb7ef6fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s @@ -12,7 +12,7 @@ glabel func_8093A4DC /* 01834 8093A504 24A57688 */ addiu $a1, $a1, 0x7688 ## $a1 = 06007688 /* 01838 8093A508 AFA70020 */ sw $a3, 0x0020($sp) /* 0183C 8093A50C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 01840 8093A510 0C029490 */ jal func_800A5240 +/* 01840 8093A510 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01844 8093A514 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01848 8093A518 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0184C 8093A51C 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s index ecd084dbb6..ee6709f421 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s @@ -313,7 +313,7 @@ glabel func_8093B1AC /* 0292C 8093B5FC 8FA40074 */ lw $a0, 0x0074($sp) /* 02930 8093B600 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02934 8093B604 4406B000 */ mfc1 $a2, $f22 -/* 02938 8093B608 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02938 8093B608 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0293C 8093B60C 24A59398 */ addiu $a1, $a1, 0x9398 ## $a1 = 06009398 /* 02940 8093B610 3C018095 */ lui $at, %hi(D_8094AF00) ## $at = 80950000 /* 02944 8093B614 C42AAF00 */ lwc1 $f10, %lo(D_8094AF00)($at) @@ -326,7 +326,7 @@ glabel func_8093B1AC /* 0295C 8093B62C 26103614 */ addiu $s0, $s0, 0x3614 ## $s0 = 06003614 /* 02960 8093B630 4406B000 */ mfc1 $a2, $f22 /* 02964 8093B634 8FA40074 */ lw $a0, 0x0074($sp) -/* 02968 8093B638 0C029490 */ jal func_800A5240 +/* 02968 8093B638 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0296C 8093B63C 02002825 */ or $a1, $s0, $zero ## $a1 = 06003614 /* 02970 8093B640 0C028800 */ jal SkelAnime_GetFrameCount @@ -352,7 +352,7 @@ glabel func_8093B1AC /* 029B8 8093B688 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 029BC 8093B68C 24A53E34 */ addiu $a1, $a1, 0x3E34 ## $a1 = 06003E34 /* 029C0 8093B690 4406B000 */ mfc1 $a2, $f22 -/* 029C4 8093B694 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 029C4 8093B694 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 029C8 8093B698 8FA40074 */ lw $a0, 0x0074($sp) /* 029CC 8093B69C 3C018095 */ lui $at, %hi(D_8094AF04) ## $at = 80950000 /* 029D0 8093B6A0 C424AF04 */ lwc1 $f4, %lo(D_8094AF04)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s index 97e73bae2e..6b6869594c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s @@ -10,7 +10,7 @@ glabel func_8093C164 /* 034B4 8093C184 24A54548 */ addiu $a1, $a1, 0x4548 ## $a1 = 06004548 /* 034B8 8093C188 AFA70018 */ sw $a3, 0x0018($sp) /* 034BC 8093C18C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 034C0 8093C190 0C029490 */ jal func_800A5240 +/* 034C0 8093C190 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 034C4 8093C194 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 034C8 8093C198 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 034CC 8093C19C 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s index 25c28e4f7b..33ea49c9c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s @@ -10,7 +10,7 @@ glabel func_8093C25C /* 035AC 8093C27C 24A5578C */ addiu $a1, $a1, 0x578C ## $a1 = 0600578C /* 035B0 8093C280 AFA70018 */ sw $a3, 0x0018($sp) /* 035B4 8093C284 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 035B8 8093C288 0C029490 */ jal func_800A5240 +/* 035B8 8093C288 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 035BC 8093C28C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 035C0 8093C290 8FA70018 */ lw $a3, 0x0018($sp) /* 035C4 8093C294 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s index 1d4ba6887f..60806e3d8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s @@ -171,7 +171,7 @@ glabel func_8093C2C4 /* 03858 8093C528 8FA4003C */ lw $a0, 0x003C($sp) /* 0385C 8093C52C 1461000A */ bne $v1, $at, .L8093C558 /* 03860 8093C530 00000000 */ nop -/* 03864 8093C534 0C029490 */ jal func_800A5240 +/* 03864 8093C534 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 03868 8093C538 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0386C 8093C53C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03870 8093C540 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s index c04ca5beec..e56d083e6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s @@ -10,7 +10,7 @@ glabel func_8093C58C /* 038DC 8093C5AC 24A588C8 */ addiu $a1, $a1, 0x88C8 ## $a1 = 060088C8 /* 038E0 8093C5B0 AFA70018 */ sw $a3, 0x0018($sp) /* 038E4 8093C5B4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 038E8 8093C5B8 0C029490 */ jal func_800A5240 +/* 038E8 8093C5B8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 038EC 8093C5BC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 038F0 8093C5C0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 038F4 8093C5C4 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s index 4690391c77..87d578b84b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s @@ -11,7 +11,7 @@ glabel func_8093C684 /* 039D8 8093C6A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 039DC 8093C6AC 24A57CA8 */ addiu $a1, $a1, 0x7CA8 ## $a1 = 06007CA8 /* 039E0 8093C6B0 AFA40024 */ sw $a0, 0x0024($sp) -/* 039E4 8093C6B4 0C029490 */ jal func_800A5240 +/* 039E4 8093C6B4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 039E8 8093C6B8 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 039EC 8093C6BC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 039F0 8093C6C0 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s index 1187f3e5db..e009d1125e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s @@ -11,7 +11,7 @@ glabel func_8093C79C /* 03AF0 8093C7C0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 03AF4 8093C7C4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 03AF8 8093C7C8 E480FF60 */ swc1 $f0, -0x00A0($a0) ## 000004C8 -/* 03AFC 8093C7CC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 03AFC 8093C7CC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 03B00 8093C7D0 E480FB00 */ swc1 $f0, -0x0500($a0) ## 00000068 /* 03B04 8093C7D4 8FBF0014 */ lw $ra, 0x0014($sp) /* 03B08 8093C7D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s index 8e555b5ece..1bb5363a44 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s @@ -499,7 +499,7 @@ glabel func_8093C910 /* 04378 8093D048 26108E2C */ addiu $s0, $s0, 0x8E2C ## $s0 = 06038E2C /* 0437C 8093D04C 4406B000 */ mfc1 $a2, $f22 /* 04380 8093D050 02002825 */ or $a1, $s0, $zero ## $a1 = 06038E2C -/* 04384 8093D054 0C029490 */ jal func_800A5240 +/* 04384 8093D054 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04388 8093D058 26240568 */ addiu $a0, $s1, 0x0568 ## $a0 = 00000568 /* 0438C 8093D05C 0C028800 */ jal SkelAnime_GetFrameCount @@ -546,7 +546,7 @@ glabel func_8093C910 /* 04420 8093D0F0 02002025 */ or $a0, $s0, $zero ## $a0 = 06038E2C /* 04424 8093D0F4 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 04428 8093D0F8 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 -/* 0442C 8093D0FC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0442C 8093D0FC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 04430 8093D100 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 .L8093D104: /* 04434 8093D104 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s index ada7c0dd29..d6b2299649 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s @@ -10,7 +10,7 @@ glabel func_8093D3D8 /* 04728 8093D3F8 24A504A4 */ addiu $a1, $a1, 0x04A4 ## $a1 = 060004A4 /* 0472C 8093D3FC AFA70018 */ sw $a3, 0x0018($sp) /* 04730 8093D400 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 04734 8093D404 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 04734 8093D404 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 04738 8093D408 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0473C 8093D40C 8FAF0018 */ lw $t7, 0x0018($sp) /* 04740 8093D410 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s index fa27c4cba2..0f92475718 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s @@ -212,7 +212,7 @@ glabel L8093D7EC /* 04C08 8093D8D8 A1D00564 */ sb $s0, 0x0564($t6) ## 00000564 /* 04C0C 8093D8DC 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04C10 8093D8E0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 04C14 8093D8E4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 04C14 8093D8E4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 04C18 8093D8E8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04C1C 8093D8EC 3C014382 */ lui $at, 0x4382 ## $at = 43820000 /* 04C20 8093D8F0 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 @@ -430,7 +430,7 @@ glabel L8093DAB8 /* 04F4C 8093DC1C C428AFA0 */ lwc1 $f8, %lo(D_8094AFA0)($at) /* 04F50 8093DC20 E62806A0 */ swc1 $f8, 0x06A0($s1) ## 000006A0 /* 04F54 8093DC24 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 -/* 04F58 8093DC28 0C029490 */ jal func_800A5240 +/* 04F58 8093DC28 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 04F5C 8093DC2C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04F60 8093DC30 0C028800 */ jal SkelAnime_GetFrameCount @@ -630,7 +630,7 @@ glabel L8093DC4C /* 05214 8093DEE4 261088C8 */ addiu $s0, $s0, 0x88C8 ## $s0 = 060088C8 /* 05218 8093DEE8 02002825 */ or $a1, $s0, $zero ## $a1 = 060088C8 /* 0521C 8093DEEC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 05220 8093DEF0 0C029490 */ jal func_800A5240 +/* 05220 8093DEF0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 05224 8093DEF4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05228 8093DEF8 0C028800 */ jal SkelAnime_GetFrameCount @@ -656,7 +656,7 @@ glabel L8093DC4C /* 0526C 8093DF3C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05270 8093DF40 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05274 8093DF44 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05278 8093DF48 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05278 8093DF48 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0527C 8093DF4C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05280 8093DF50 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05284 8093DF54 44814000 */ mtc1 $at, $f8 ## $f8 = 1000.00 @@ -702,7 +702,7 @@ glabel L8093DC4C /* 05314 8093DFE4 A1D00564 */ sb $s0, 0x0564($t6) ## 00000564 /* 05318 8093DFE8 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 0531C 8093DFEC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05320 8093DFF0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05320 8093DFF0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 05324 8093DFF4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 000005CC /* 05328 8093DFF8 3C014382 */ lui $at, 0x4382 ## $at = 43820000 /* 0532C 8093DFFC 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 @@ -782,7 +782,7 @@ glabel L8093DC4C /* 0543C 8093E10C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05440 8093E110 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05444 8093E114 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05448 8093E118 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05448 8093E118 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0544C 8093E11C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05450 8093E120 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05454 8093E124 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -961,7 +961,7 @@ glabel L8093E258 /* 056E8 8093E3B8 C42AAFBC */ lwc1 $f10, %lo(D_8094AFBC)($at) /* 056EC 8093E3BC E62A06A0 */ swc1 $f10, 0x06A0($s1) ## 000006A0 /* 056F0 8093E3C0 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 -/* 056F4 8093E3C4 0C029490 */ jal func_800A5240 +/* 056F4 8093E3C4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 056F8 8093E3C8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 056FC 8093E3CC 0C028800 */ jal SkelAnime_GetFrameCount @@ -1158,7 +1158,7 @@ glabel L8093E3E8 /* 059A4 8093E674 261088C8 */ addiu $s0, $s0, 0x88C8 ## $s0 = 060088C8 /* 059A8 8093E678 02002825 */ or $a1, $s0, $zero ## $a1 = 060088C8 /* 059AC 8093E67C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 059B0 8093E680 0C029490 */ jal func_800A5240 +/* 059B0 8093E680 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 059B4 8093E684 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 059B8 8093E688 0C028800 */ jal SkelAnime_GetFrameCount @@ -1184,7 +1184,7 @@ glabel L8093E3E8 /* 059FC 8093E6CC 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05A00 8093E6D0 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05A04 8093E6D4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05A08 8093E6D8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05A08 8093E6D8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 05A0C 8093E6DC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05A10 8093E6E0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05A14 8093E6E4 44815000 */ mtc1 $at, $f10 ## $f10 = 1000.00 @@ -1282,7 +1282,7 @@ glabel L8093E3E8 /* 05B60 8093E830 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05B64 8093E834 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05B68 8093E838 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05B6C 8093E83C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05B6C 8093E83C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 05B70 8093E840 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05B74 8093E844 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05B78 8093E848 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s index f46944b66d..e8dc0008d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s @@ -10,7 +10,7 @@ glabel func_8093F108 /* 06458 8093F128 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 0645C 8093F12C 24A54374 */ addiu $a1, $a1, 0x4374 ## $a1 = 06024374 /* 06460 8093F130 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 06464 8093F134 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 06464 8093F134 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 06468 8093F138 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0646C 8093F13C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 06470 8093F140 A6000440 */ sh $zero, 0x0440($s0) ## 00000440 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s index e18e0c49c5..4514da0937 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s @@ -300,7 +300,7 @@ glabel func_8093F1C4 /* 06908 8093F5D8 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 0690C 8093F5DC 24A5230C */ addiu $a1, $a1, 0x230C ## $a1 = 0600230C /* 06910 8093F5E0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06914 8093F5E4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 06914 8093F5E4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 06918 8093F5E8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 80950568 /* 0691C 8093F5EC 10000018 */ beq $zero, $zero, .L8093F650 /* 06920 8093F5F0 93A20036 */ lbu $v0, 0x0036($sp) @@ -309,7 +309,7 @@ glabel func_8093F1C4 /* 06928 8093F5F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0692C 8093F5FC 24A51D10 */ addiu $a1, $a1, 0x1D10 ## $a1 = 06001D10 /* 06930 8093F600 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06934 8093F604 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 06934 8093F604 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 06938 8093F608 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 0693C 8093F60C 10000010 */ beq $zero, $zero, .L8093F650 /* 06940 8093F610 93A20036 */ lbu $v0, 0x0036($sp) @@ -318,7 +318,7 @@ glabel func_8093F1C4 /* 06948 8093F618 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0694C 8093F61C 24A517E0 */ addiu $a1, $a1, 0x17E0 ## $a1 = 060017E0 /* 06950 8093F620 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06954 8093F624 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 06954 8093F624 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 06958 8093F628 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 0695C 8093F62C 10000008 */ beq $zero, $zero, .L8093F650 /* 06960 8093F630 93A20036 */ lbu $v0, 0x0036($sp) @@ -327,7 +327,7 @@ glabel func_8093F1C4 /* 06968 8093F638 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0696C 8093F63C 24A512A4 */ addiu $a1, $a1, 0x12A4 ## $a1 = 060012A4 /* 06970 8093F640 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06974 8093F644 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 06974 8093F644 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 06978 8093F648 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 0697C 8093F64C 93A20036 */ lbu $v0, 0x0036($sp) .L8093F650: @@ -350,7 +350,7 @@ glabel func_8093F1C4 /* 069BC 8093F68C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 069C0 8093F690 24A5230C */ addiu $a1, $a1, 0x230C ## $a1 = 0600230C /* 069C4 8093F694 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 069C8 8093F698 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 069C8 8093F698 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 069CC 8093F69C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 80950568 /* 069D0 8093F6A0 10000018 */ beq $zero, $zero, .L8093F704 /* 069D4 8093F6A4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 @@ -359,7 +359,7 @@ glabel func_8093F1C4 /* 069DC 8093F6AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 069E0 8093F6B0 24A51D10 */ addiu $a1, $a1, 0x1D10 ## $a1 = 06001D10 /* 069E4 8093F6B4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 069E8 8093F6B8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 069E8 8093F6B8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 069EC 8093F6BC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 069F0 8093F6C0 10000010 */ beq $zero, $zero, .L8093F704 /* 069F4 8093F6C4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 @@ -368,7 +368,7 @@ glabel func_8093F1C4 /* 069FC 8093F6CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 06A00 8093F6D0 24A517E0 */ addiu $a1, $a1, 0x17E0 ## $a1 = 060017E0 /* 06A04 8093F6D4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06A08 8093F6D8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 06A08 8093F6D8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 06A0C 8093F6DC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 06A10 8093F6E0 10000008 */ beq $zero, $zero, .L8093F704 /* 06A14 8093F6E4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 @@ -377,7 +377,7 @@ glabel func_8093F1C4 /* 06A1C 8093F6EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 06A20 8093F6F0 24A512A4 */ addiu $a1, $a1, 0x12A4 ## $a1 = 060012A4 /* 06A24 8093F6F4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06A28 8093F6F8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 06A28 8093F6F8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 06A2C 8093F6FC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 06A30 8093F700 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F704: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s index 8331127ef8..6e039b3c39 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s @@ -50,7 +50,7 @@ glabel func_8093F9E4 /* 06DC4 8093FA94 14410005 */ bne $v0, $at, .L8093FAAC /* 06DC8 8093FA98 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 06DCC 8093FA9C 24A516DC */ addiu $a1, $a1, 0x16DC ## $a1 = 060216DC -/* 06DD0 8093FAA0 0C029490 */ jal func_800A5240 +/* 06DD0 8093FAA0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 06DD4 8093FAA4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 06DD8 8093FAA8 86420150 */ lh $v0, 0x0150($s2) ## 00000150 .L8093FAAC: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s index 5ab2efcce5..682a6416c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s @@ -10,7 +10,7 @@ glabel func_80949530 /* 10880 80949550 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 /* 10884 80949554 AFA70018 */ sw $a3, 0x0018($sp) /* 10888 80949558 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 1088C 8094955C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 1088C 8094955C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 10890 80949560 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 10894 80949564 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 10898 80949568 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s index bbedda8ecc..ad0c9039cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s @@ -10,7 +10,7 @@ glabel func_809496D0 /* 10A20 809496F0 24A56FBC */ addiu $a1, $a1, 0x6FBC ## $a1 = 06036FBC /* 10A24 809496F4 AFA70018 */ sw $a3, 0x0018($sp) /* 10A28 809496F8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 10A2C 809496FC 0C029490 */ jal func_800A5240 +/* 10A2C 809496FC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 10A30 80949700 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 10A34 80949704 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 /* 10A38 80949708 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s index 2a7c2ce228..7731583301 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s @@ -15,14 +15,14 @@ glabel func_80949920 /* 10C84 80949954 24A52700 */ addiu $a1, $a1, 0x2700 ## $a1 = 06022700 /* 10C88 80949958 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 10C8C 8094995C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 10C90 80949960 0C029490 */ jal func_800A5240 +/* 10C90 80949960 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 10C94 80949964 AFA70018 */ sw $a3, 0x0018($sp) /* 10C98 80949968 10000005 */ beq $zero, $zero, .L80949980 /* 10C9C 8094996C 00000000 */ nop .L80949970: /* 10CA0 80949970 24E40568 */ addiu $a0, $a3, 0x0568 ## $a0 = 00000568 /* 10CA4 80949974 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 10CA8 80949978 0C029490 */ jal func_800A5240 +/* 10CA8 80949978 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 10CAC 8094997C AFA70018 */ sw $a3, 0x0018($sp) .L80949980: /* 10CB0 80949980 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s index ca4d82e282..cb72e86315 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s @@ -10,7 +10,7 @@ glabel func_80949BFC /* 10F4C 80949C1C 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 /* 10F50 80949C20 AFA70018 */ sw $a3, 0x0018($sp) /* 10F54 80949C24 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 10F58 80949C28 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 10F58 80949C28 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 10F5C 80949C2C 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 10F60 80949C30 8FA70018 */ lw $a3, 0x0018($sp) /* 10F64 80949C34 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s index 37ba0f51d9..be3d2abc75 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s @@ -15,7 +15,7 @@ glabel func_80949CE4 /* 11048 80949D18 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 1104C 80949D1C 24A538F0 */ addiu $a1, $a1, 0x38F0 ## $a1 = 060338F0 /* 11050 80949D20 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11054 80949D24 0C029490 */ jal func_800A5240 +/* 11054 80949D24 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 11058 80949D28 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 /* 1105C 80949D2C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 11060 80949D30 24180096 */ addiu $t8, $zero, 0x0096 ## $t8 = 00000096 @@ -31,7 +31,7 @@ glabel func_80949CE4 /* 11084 80949D54 A609015A */ sh $t1, 0x015A($s0) ## 0000015A /* 11088 80949D58 24A54374 */ addiu $a1, $a1, 0x4374 ## $a1 = 06024374 /* 1108C 80949D5C 26040568 */ addiu $a0, $s0, 0x0568 ## $a0 = 00000568 -/* 11090 80949D60 0C029490 */ jal func_800A5240 +/* 11090 80949D60 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 11094 80949D64 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 11098 80949D68 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 1109C 80949D6C 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s index 20a4d356c6..ec378ec06f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s @@ -166,7 +166,7 @@ glabel func_80949E10 /* 11398 8094A068 24A55030 */ addiu $a1, $a1, 0x5030 ## $a1 = 06035030 /* 1139C 8094A06C E61001A4 */ swc1 $f16, 0x01A4($s0) ## 000001A4 /* 113A0 8094A070 8FA40038 */ lw $a0, 0x0038($sp) -/* 113A4 8094A074 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 113A4 8094A074 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 113A8 8094A078 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L8094A07C: /* 113AC 8094A07C 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s index d6192e8c2c..753c488db7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s @@ -7,7 +7,7 @@ glabel func_8094A0C4 /* 11408 8094A0D8 24A55988 */ addiu $a1, $a1, 0x5988 ## $a1 = 06035988 /* 1140C 8094A0DC AFA70018 */ sw $a3, 0x0018($sp) /* 11410 8094A0E0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11414 8094A0E4 0C029490 */ jal func_800A5240 +/* 11414 8094A0E4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 11418 8094A0E8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 1141C 8094A0EC 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 /* 11420 8094A0F0 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s index 05679e68a2..26026eed93 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s @@ -25,7 +25,7 @@ glabel func_8094A12C /* 114B0 8094A180 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 /* 114B4 8094A184 E60401A4 */ swc1 $f4, 0x01A4($s0) ## 000001A4 /* 114B8 8094A188 8FA40024 */ lw $a0, 0x0024($sp) -/* 114BC 8094A18C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 114BC 8094A18C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 114C0 8094A190 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L8094A194: /* 114C4 8094A194 860E0178 */ lh $t6, 0x0178($s0) ## 00000178 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s index 999c8c6e5e..98caa5d2fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s @@ -106,7 +106,7 @@ glabel func_8094A1C0 /* 11684 8094A354 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 11688 8094A358 4600320D */ trunc.w.s $f8, $f6 /* 1168C 8094A35C 440F4000 */ mfc1 $t7, $f8 -/* 11690 8094A360 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 11690 8094A360 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 11694 8094A364 A60F0030 */ sh $t7, 0x0030($s0) ## 00000030 /* 11698 8094A368 8FBF004C */ lw $ra, 0x004C($sp) /* 1169C 8094A36C D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s index 3e69aa2bc8..9e76f068d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s @@ -10,7 +10,7 @@ glabel func_8094A608 /* 11958 8094A628 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 /* 1195C 8094A62C AFA70018 */ sw $a3, 0x0018($sp) /* 11960 8094A630 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11964 8094A634 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 11964 8094A634 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 11968 8094A638 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 1196C 8094A63C 8FA70018 */ lw $a3, 0x0018($sp) /* 11970 8094A640 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s index ca599b3ed4..19c276bb1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s @@ -10,7 +10,7 @@ glabel func_8094A6D8 /* 11A28 8094A6F8 24A5A2D0 */ addiu $a1, $a1, 0xA2D0 ## $a1 = 0603A2D0 /* 11A2C 8094A6FC AFA70018 */ sw $a3, 0x0018($sp) /* 11A30 8094A700 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11A34 8094A704 0C029490 */ jal func_800A5240 +/* 11A34 8094A704 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 11A38 8094A708 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 11A3C 8094A70C 3C040604 */ lui $a0, 0x0604 ## $a0 = 06040000 /* 11A40 8094A710 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s index cd4093213e..3bcee349c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s @@ -6,7 +6,7 @@ glabel func_809AE538 /* 00628 809AE548 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 /* 0062C 809AE54C AFA70018 */ sw $a3, 0x0018($sp) /* 00630 809AE550 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00634 809AE554 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00634 809AE554 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00638 809AE558 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 0063C 809AE55C 8FA40018 */ lw $a0, 0x0018($sp) /* 00640 809AE560 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s index 0d31ea466d..30774c3638 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s @@ -6,7 +6,7 @@ glabel func_809AE59C /* 0068C 809AE5AC 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 /* 00690 809AE5B0 AFA70018 */ sw $a3, 0x0018($sp) /* 00694 809AE5B4 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00698 809AE5B8 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00698 809AE5B8 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 0069C 809AE5BC 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 006A0 809AE5C0 8FA40018 */ lw $a0, 0x0018($sp) /* 006A4 809AE5C4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s index 58ab6684e4..5925f03231 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s @@ -6,7 +6,7 @@ glabel func_809AE608 /* 006F8 809AE618 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 /* 006FC 809AE61C AFA70018 */ sw $a3, 0x0018($sp) /* 00700 809AE620 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00704 809AE624 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00704 809AE624 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00708 809AE628 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 0070C 809AE62C 8FA40018 */ lw $a0, 0x0018($sp) /* 00710 809AE630 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s index b8a089e9c8..f8d4ec6fdc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s @@ -6,7 +6,7 @@ glabel func_809AE664 /* 00754 809AE674 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 /* 00758 809AE678 AFA70018 */ sw $a3, 0x0018($sp) /* 0075C 809AE67C 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00760 809AE680 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00760 809AE680 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00764 809AE684 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 00768 809AE688 8FA40018 */ lw $a0, 0x0018($sp) /* 0076C 809AE68C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s index ca990e29eb..4ec75c55f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s @@ -6,7 +6,7 @@ glabel func_809AE6C0 /* 007B0 809AE6D0 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 /* 007B4 809AE6D4 AFA70018 */ sw $a3, 0x0018($sp) /* 007B8 809AE6D8 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 007BC 809AE6DC 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 007BC 809AE6DC 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 007C0 809AE6E0 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 007C4 809AE6E4 8FA40018 */ lw $a0, 0x0018($sp) /* 007C8 809AE6E8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 8034a09579..b2d42b69e0 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 func_800A51E8 +/* 00080 809B03F0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 90748134f2..f051cce188 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 @@ -10,7 +10,7 @@ glabel func_809B3CEC /* 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 func_800A51E8 +/* 003F8 809B3D18 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 003FC 809B3D1C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00400 809B3D20 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float 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 fdd865602c..03f3db9e2f 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 @@ -221,7 +221,7 @@ glabel func_809B3FDC /* 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 func_800A51E8 +/* 009E8 809B4308 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s index 550ef3a2f8..63b16060ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s @@ -5,7 +5,7 @@ glabel func_809B8E34 /* 00B60 809B8E40 AFBF001C */ sw $ra, 0x001C($sp) /* 00B64 809B8E44 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B68 809B8E48 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 00B6C 809B8E4C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00B6C 809B8E4C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00B70 809B8E50 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00B74 809B8E54 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s index ba6a5bc6a7..a782a49dd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s @@ -163,7 +163,7 @@ glabel func_809B8EF4 /* 00E60 809B9140 8FA40034 */ lw $a0, 0x0034($sp) /* 00E64 809B9144 45000005 */ bc1f .L809B915C /* 00E68 809B9148 00000000 */ nop -/* 00E6C 809B914C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00E6C 809B914C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00E70 809B9150 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 /* 00E74 809B9154 860B008A */ lh $t3, 0x008A($s0) ## 0000008A /* 00E78 809B9158 A60B026E */ sh $t3, 0x026E($s0) ## 0000026E @@ -192,7 +192,7 @@ glabel func_809B8EF4 /* 00EC8 809B91A8 1000001F */ beq $zero, $zero, .L809B9228 /* 00ECC 809B91AC AE0D0260 */ sw $t5, 0x0260($s0) ## 00000260 .L809B91B0: -/* 00ED0 809B91B0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00ED0 809B91B0 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00ED4 809B91B4 8FA40034 */ lw $a0, 0x0034($sp) /* 00ED8 809B91B8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -241,7 +241,7 @@ glabel func_809B8EF4 /* 00F7C 809B925C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F80 809B9260 55600026 */ bnel $t3, $zero, .L809B92FC /* 00F84 809B9264 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 -/* 00F88 809B9268 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00F88 809B9268 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00F8C 809B926C 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 /* 00F90 809B9270 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s index 6f46d3bc25..63b67b440a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s @@ -5,7 +5,7 @@ glabel func_809B96EC /* 01418 809B96F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0141C 809B96FC 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 01420 809B9700 AFA60018 */ sw $a2, 0x0018($sp) -/* 01424 809B9704 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01424 809B9704 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 01428 809B9708 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0142C 809B970C 8FA40018 */ lw $a0, 0x0018($sp) /* 01430 809B9710 3C014040 */ lui $at, 0x4040 ## $at = 40400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s index 6218a0be25..e033288553 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s @@ -6,7 +6,7 @@ glabel func_809B9A54 /* 01784 809B9A64 AFBF0014 */ sw $ra, 0x0014($sp) /* 01788 809B9A68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0178C 809B9A6C 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 -/* 01790 809B9A70 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01790 809B9A70 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 01794 809B9A74 AFA6001C */ sw $a2, 0x001C($sp) /* 01798 809B9A78 8FA6001C */ lw $a2, 0x001C($sp) /* 0179C 809B9A7C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s index 5449f0df45..0567023106 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s @@ -6,7 +6,7 @@ glabel func_809BA028 /* 01D58 809BA038 AFBF0014 */ sw $ra, 0x0014($sp) /* 01D5C 809BA03C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01D60 809BA040 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 01D64 809BA044 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01D64 809BA044 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 01D68 809BA048 AFA6001C */ sw $a2, 0x001C($sp) /* 01D6C 809BA04C 8FA6001C */ lw $a2, 0x001C($sp) /* 01D70 809BA050 3C014270 */ lui $at, 0x4270 ## $at = 42700000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s index f84a7f921d..47bb5e86fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s @@ -130,7 +130,7 @@ glabel func_809BA0D8 /* 01FC8 809BA2A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01FCC 809BA2AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01FD0 809BA2B0 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 -/* 01FD4 809BA2B4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01FD4 809BA2B4 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 01FD8 809BA2B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01FDC 809BA2BC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -151,7 +151,7 @@ glabel func_809BA0D8 /* 02014 809BA2F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02018 809BA2F8 51200004 */ beql $t1, $zero, .L809BA30C /* 0201C 809BA2FC 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 02020 809BA300 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 02020 809BA300 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 02024 809BA304 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 02028 809BA308 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 .L809BA30C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s index 46b913363f..55a2b8d0d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s @@ -15,7 +15,7 @@ glabel func_809BA458 /* 021AC 809BA48C 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 021B0 809BA490 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 021B4 809BA494 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 021B8 809BA498 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 021B8 809BA498 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 021BC 809BA49C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC /* 021C0 809BA4A0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 021C4 809BA4A4 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s index 9a58a7c9fd..b769f18f3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s @@ -5,7 +5,7 @@ glabel func_809BA590 /* 022BC 809BA59C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 022C0 809BA5A0 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 022C4 809BA5A4 AFA60018 */ sw $a2, 0x0018($sp) -/* 022C8 809BA5A8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 022C8 809BA5A8 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 022CC 809BA5AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 022D0 809BA5B0 8FA60018 */ lw $a2, 0x0018($sp) /* 022D4 809BA5B4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s index 6dca4864f9..c2a25eac7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s @@ -5,7 +5,7 @@ glabel func_809BD318 /* 006C4 809BD324 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006C8 809BD328 24A514B8 */ addiu $a1, $a1, 0x14B8 ## $a1 = 060014B8 /* 006CC 809BD32C AFA60018 */ sw $a2, 0x0018($sp) -/* 006D0 809BD330 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 006D0 809BD330 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 006D4 809BD334 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 006D8 809BD338 8FA60018 */ lw $a2, 0x0018($sp) /* 006DC 809BD33C 3C01809C */ lui $at, %hi(D_809BF534) ## $at = 809C0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s index 4c68e326d4..02766017f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s @@ -6,7 +6,7 @@ glabel func_809BD3F8 /* 007A8 809BD408 24A51CA4 */ addiu $a1, $a1, 0x1CA4 ## $a1 = 06001CA4 /* 007AC 809BD40C AFA70018 */ sw $a3, 0x0018($sp) /* 007B0 809BD410 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007B4 809BD414 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 007B4 809BD414 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 007B8 809BD418 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 007BC 809BD41C 8FA40018 */ lw $a0, 0x0018($sp) /* 007C0 809BD420 240E015E */ addiu $t6, $zero, 0x015E ## $t6 = 0000015E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s index ff216e1c46..5baf3d8715 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s @@ -6,7 +6,7 @@ glabel func_809BD4A4 /* 00854 809BD4B4 24A514B8 */ addiu $a1, $a1, 0x14B8 ## $a1 = 060014B8 /* 00858 809BD4B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0085C 809BD4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00860 809BD4C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00860 809BD4C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00864 809BD4C4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00868 809BD4C8 8FA70018 */ lw $a3, 0x0018($sp) /* 0086C 809BD4CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s index c67bd2f404..7acf9c1a7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s @@ -6,7 +6,7 @@ glabel func_809BD524 /* 008D4 809BD534 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008D8 809BD538 24A50D1C */ addiu $a1, $a1, 0x0D1C ## $a1 = 06000D1C /* 008DC 809BD53C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008E0 809BD540 0C029490 */ jal func_800A5240 +/* 008E0 809BD540 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 008E4 809BD544 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 008E8 809BD548 920F02FC */ lbu $t7, 0x02FC($s0) ## 000002FC /* 008EC 809BD54C 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s index 253089568f..1c2cc223ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s @@ -6,7 +6,7 @@ glabel func_809BD5E0 /* 00990 809BD5F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00994 809BD5F4 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 00998 809BD5F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0099C 809BD5FC 0C029490 */ jal func_800A5240 +/* 0099C 809BD5FC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 009A0 809BD600 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 009A4 809BD604 920F02FC */ lbu $t7, 0x02FC($s0) ## 000002FC /* 009A8 809BD608 240E0018 */ addiu $t6, $zero, 0x0018 ## $t6 = 00000018 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s index e687d901b2..c494adb979 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s @@ -6,7 +6,7 @@ glabel func_809BD658 /* 00A08 809BD668 24A50A74 */ addiu $a1, $a1, 0x0A74 ## $a1 = 06000A74 /* 00A0C 809BD66C AFA70018 */ sw $a3, 0x0018($sp) /* 00A10 809BD670 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A14 809BD674 0C029490 */ jal func_800A5240 +/* 00A14 809BD674 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00A18 809BD678 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A1C 809BD67C 8FA40018 */ lw $a0, 0x0018($sp) /* 00A20 809BD680 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s index 8fc37980da..a0c8925685 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s @@ -5,7 +5,7 @@ glabel func_809BFA14 /* 00180 809BFA20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00184 809BFA24 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 /* 00188 809BFA28 AFA60018 */ sw $a2, 0x0018($sp) -/* 0018C 809BFA2C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0018C 809BFA2C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00190 809BFA30 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00194 809BFA34 8FA60018 */ lw $a2, 0x0018($sp) /* 00198 809BFA38 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s index 410377e2f0..9463751ecc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s @@ -5,7 +5,7 @@ glabel func_809BFA8C /* 001F8 809BFA98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001FC 809BFA9C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 06000024 /* 00200 809BFAA0 AFA60018 */ sw $a2, 0x0018($sp) -/* 00204 809BFAA4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00204 809BFAA4 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00208 809BFAA8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0020C 809BFAAC 8FA60018 */ lw $a2, 0x0018($sp) /* 00210 809BFAB0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 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 0124253aaf..cb31752454 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 @@ -5,7 +5,7 @@ glabel func_809BFAE8 /* 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 func_800A51E8 +/* 00260 809BFB00 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00264 809BFB04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00268 809BFB08 8FA60018 */ lw $a2, 0x0018($sp) /* 0026C 809BFB0C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s index afac54700f..796fa18dc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s @@ -5,7 +5,7 @@ glabel func_809BFB5C /* 002C8 809BFB68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002CC 809BFB6C 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 /* 002D0 809BFB70 AFA60018 */ sw $a2, 0x0018($sp) -/* 002D4 809BFB74 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 002D4 809BFB74 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 002D8 809BFB78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002DC 809BFB7C 8FA60018 */ lw $a2, 0x0018($sp) /* 002E0 809BFB80 240E0060 */ addiu $t6, $zero, 0x0060 ## $t6 = 00000060 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s index db14117905..2eb6b4f776 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s @@ -7,7 +7,7 @@ glabel func_809BFBC4 /* 00338 809BFBD8 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 /* 0033C 809BFBDC 10AE0003 */ beq $a1, $t6, .L809BFBEC /* 00340 809BFBE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00344 809BFBE4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00344 809BFBE4 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00348 809BFBE8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C .L809BFBEC: /* 0034C 809BFBEC 8E0501DC */ lw $a1, 0x01DC($s0) ## 000001DC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s index 1936637ec8..5d0ff988b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s @@ -9,7 +9,7 @@ glabel func_809BFC48 /* 003C4 809BFC64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 003C8 809BFC68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003CC 809BFC6C 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 -/* 003D0 809BFC70 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 003D0 809BFC70 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 003D4 809BFC74 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C .L809BFC78: /* 003D8 809BFC78 921901E4 */ lbu $t9, 0x01E4($s0) ## 000001E4 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 22aa269fef..8db0eb3b99 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 @@ -5,7 +5,7 @@ glabel func_809CAE44 /* 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 func_800A51E8 +/* 0034C 809CAE5C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00350 809CAE60 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 00354 809CAE64 8FA4001C */ lw $a0, 0x001C($sp) /* 00358 809CAE68 8FAE0018 */ lw $t6, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s index 1b7d2fe138..faf1064691 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s @@ -6,7 +6,7 @@ glabel func_809CAEA0 /* 003A0 809CAEB0 24A51958 */ addiu $a1, $a1, 0x1958 ## $a1 = 06001958 /* 003A4 809CAEB4 AFA70018 */ sw $a3, 0x0018($sp) /* 003A8 809CAEB8 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 003AC 809CAEBC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 003AC 809CAEBC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 003B0 809CAEC0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 003B4 809CAEC4 8FA70018 */ lw $a3, 0x0018($sp) /* 003B8 809CAEC8 3C18809D */ lui $t8, %hi(func_809CB218) ## $t8 = 809D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s index 184110f589..541288bd45 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s @@ -6,7 +6,7 @@ glabel func_809CAEF4 /* 003F4 809CAF04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003F8 809CAF08 24A50290 */ addiu $a1, $a1, 0x0290 ## $a1 = 06000290 /* 003FC 809CAF0C 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00400 809CAF10 0C029490 */ jal func_800A5240 +/* 00400 809CAF10 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00404 809CAF14 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00408 809CAF18 860E01AE */ lh $t6, 0x01AE($s0) ## 000001AE /* 0040C 809CAF1C 3C0142FA */ lui $at, 0x42FA ## $at = 42FA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s index 8c217277b3..7a1df72ed9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s @@ -6,7 +6,7 @@ glabel func_809CB008 /* 00508 809CB018 24A51678 */ addiu $a1, $a1, 0x1678 ## $a1 = 06001678 /* 0050C 809CB01C AFA70018 */ sw $a3, 0x0018($sp) /* 00510 809CB020 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00514 809CB024 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00514 809CB024 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00518 809CB028 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0051C 809CB02C 8FA70018 */ lw $a3, 0x0018($sp) /* 00520 809CB030 3C0F809D */ lui $t7, %hi(func_809CB458) ## $t7 = 809D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s index 46e7347f81..fd02055ae3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s @@ -6,7 +6,7 @@ glabel func_809CE9A8 /* 002D8 809CE9B8 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 /* 002DC 809CE9BC AFA70018 */ sw $a3, 0x0018($sp) /* 002E0 809CE9C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002E4 809CE9C4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 002E4 809CE9C4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 002E8 809CE9C8 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 002EC 809CE9CC 8FA70018 */ lw $a3, 0x0018($sp) /* 002F0 809CE9D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s index f7e23fd7d7..17ce81bf98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s @@ -6,7 +6,7 @@ glabel func_809CF72C /* 0105C 809CF73C 24A521A0 */ addiu $a1, $a1, 0x21A0 ## $a1 = 060021A0 /* 01060 809CF740 AFA70018 */ sw $a3, 0x0018($sp) /* 01064 809CF744 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01068 809CF748 0C029490 */ jal func_800A5240 +/* 01068 809CF748 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0106C 809CF74C 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 01070 809CF750 8FA40018 */ lw $a0, 0x0018($sp) /* 01074 809CF754 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s index 67b9dc0285..b4431fc6c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s @@ -6,7 +6,7 @@ glabel func_809CF8F0 /* 01220 809CF900 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 /* 01224 809CF904 AFA70018 */ sw $a3, 0x0018($sp) /* 01228 809CF908 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0122C 809CF90C 0C029490 */ jal func_800A5240 +/* 0122C 809CF90C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01230 809CF910 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 01234 809CF914 8FA40018 */ lw $a0, 0x0018($sp) /* 01238 809CF918 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s index 0287a13ca8..32c617da03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s @@ -6,7 +6,7 @@ glabel func_809CFBA8 /* 014D8 809CFBB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 014DC 809CFBBC 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 /* 014E0 809CFBC0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 014E4 809CFBC4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 014E4 809CFBC4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 014E8 809CFBC8 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 014EC 809CFBCC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 014F0 809CFBD0 3C014130 */ lui $at, 0x4130 ## $at = 41300000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s index d8864f8d4d..98703cbc58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s @@ -6,7 +6,7 @@ glabel func_809CFF10 /* 01840 809CFF20 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 /* 01844 809CFF24 AFA70018 */ sw $a3, 0x0018($sp) /* 01848 809CFF28 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0184C 809CFF2C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0184C 809CFF2C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01850 809CFF30 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 01854 809CFF34 8FA40018 */ lw $a0, 0x0018($sp) /* 01858 809CFF38 3C014130 */ lui $at, 0x4130 ## $at = 41300000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s index 35549e9d13..1a336a8578 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s @@ -35,7 +35,7 @@ glabel EnCow_Init /* 00290 809DF090 AFA50040 */ sw $a1, 0x0040($sp) /* 00294 809DF094 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00298 809DF098 24A501CC */ addiu $a1, $a1, 0x01CC ## $a1 = 060001CC -/* 0029C 809DF09C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0029C 809DF09C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 002A0 809DF0A0 8FA40040 */ lw $a0, 0x0040($sp) /* 002A4 809DF0A4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 002A8 809DF0A8 AFA50040 */ sw $a1, 0x0040($sp) @@ -176,7 +176,7 @@ glabel EnCow_Init /* 00488 809DF288 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0048C 809DF28C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00490 809DF290 24A54348 */ addiu $a1, $a1, 0x4348 ## $a1 = 06004348 -/* 00494 809DF294 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00494 809DF294 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00498 809DF298 8FA40040 */ lw $a0, 0x0040($sp) /* 0049C 809DF29C 3C0B809E */ lui $t3, %hi(func_809DFE98) ## $t3 = 809E0000 /* 004A0 809DF2A0 3C0C809E */ lui $t4, %hi(func_809E0070) ## $t4 = 809E0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s index 68a1e3c357..f6638ff9e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s @@ -38,7 +38,7 @@ glabel func_809E0770 /* 005B8 809E07F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005BC 809E07FC 24A500F0 */ addiu $a1, $a1, 0x00F0 ## $a1 = 060000F0 /* 005C0 809E0800 24C4017C */ addiu $a0, $a2, 0x017C ## $a0 = 0000017C -/* 005C4 809E0804 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 005C4 809E0804 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 005C8 809E0808 AFA60018 */ sw $a2, 0x0018($sp) /* 005CC 809E080C 8FA60018 */ lw $a2, 0x0018($sp) /* 005D0 809E0810 24C40024 */ addiu $a0, $a2, 0x0024 ## $a0 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s index b1cb1a6a60..4b1c0f3417 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s @@ -12,7 +12,7 @@ glabel func_809E5F44 /* 00798 809E5F68 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 /* 0079C 809E5F6C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 007A0 809E5F70 A46E01C6 */ sh $t6, 0x01C6($v1) ## 000001C6 -/* 007A4 809E5F74 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 007A4 809E5F74 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 007A8 809E5F78 2464017C */ addiu $a0, $v1, 0x017C ## $a0 = 0000017C /* 007AC 809E5F7C 8FB80018 */ lw $t8, 0x0018($sp) /* 007B0 809E5F80 3C0F809E */ lui $t7, %hi(func_809E6ED4) ## $t7 = 809E0000 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 8756ba4e73..eb1d0723a9 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 @@ -5,7 +5,7 @@ glabel func_809E5FBC /* 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 func_800A51E8 +/* 00804 809E5FD4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00808 809E5FD8 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C /* 0080C 809E5FDC 8FA60018 */ lw $a2, 0x0018($sp) /* 00810 809E5FE0 3C0E809E */ lui $t6, %hi(func_809E7104) ## $t6 = 809E0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s index 2c7efd82c0..f8d5b80c7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s @@ -7,7 +7,7 @@ glabel func_809E60A8 /* 008EC 809E60BC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008F0 809E60C0 24A50208 */ addiu $a1, $a1, 0x0208 ## $a1 = 06000208 /* 008F4 809E60C4 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C -/* 008F8 809E60C8 0C029490 */ jal func_800A5240 +/* 008F8 809E60C8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 008FC 809E60CC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00900 809E60D0 920F0249 */ lbu $t7, 0x0249($s0) ## 00000249 /* 00904 809E60D4 8FAE002C */ lw $t6, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s index 92ef275ee8..06d5d680d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s @@ -80,7 +80,7 @@ glabel func_809E7104 /* 01A48 809E7218 00621824 */ and $v1, $v1, $v0 /* 01A4C 809E721C 10600054 */ beq $v1, $zero, .L809E7370 /* 01A50 809E7220 8FA40034 */ lw $a0, 0x0034($sp) -/* 01A54 809E7224 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 01A54 809E7224 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 01A58 809E7228 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 01A5C 809E722C 0C01DE1C */ jal Math_Sins ## sins? diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s index c8507ee4c1..1d6e8f5d03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s @@ -6,7 +6,7 @@ glabel func_809E96FC /* 001AC 809E970C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001B0 809E9710 24A50D1C */ addiu $a1, $a1, 0x0D1C ## $a1 = 06000D1C /* 001B4 809E9714 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001B8 809E9718 0C0294A7 */ jal func_800A529C +/* 001B8 809E9718 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 001BC 809E971C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 001C0 809E9720 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 /* 001C4 809E9724 0C01DF64 */ jal Math_Rand_S16Offset diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s index 6eb0172848..366db0bc53 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s @@ -5,7 +5,7 @@ glabel func_809E9770 /* 0021C 809E977C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00220 809E9780 24A50AF0 */ addiu $a1, $a1, 0x0AF0 ## $a1 = 06000AF0 /* 00224 809E9784 AFA60018 */ sw $a2, 0x0018($sp) -/* 00228 809E9788 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00228 809E9788 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 0022C 809E978C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00230 809E9790 8FA60018 */ lw $a2, 0x0018($sp) /* 00234 809E9794 3C0F809F */ lui $t7, %hi(func_809E9DFC) ## $t7 = 809F0000 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 615376f32b..16965f71c2 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 @@ -5,7 +5,7 @@ glabel func_809E97B8 /* 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 func_800A51E8 +/* 00270 809E97D0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00274 809E97D4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00278 809E97D8 8FA60018 */ lw $a2, 0x0018($sp) /* 0027C 809E97DC 3C0F809F */ lui $t7, %hi(func_809E9F6C) ## $t7 = 809F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s index 45877d1949..d1d9d9437f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s @@ -6,7 +6,7 @@ glabel func_809E9800 /* 002B0 809E9810 24A50E6C */ addiu $a1, $a1, 0x0E6C ## $a1 = 06000E6C /* 002B4 809E9814 AFA70018 */ sw $a3, 0x0018($sp) /* 002B8 809E9818 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002BC 809E981C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 002BC 809E981C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 002C0 809E9820 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 002C4 809E9824 8FA70018 */ lw $a3, 0x0018($sp) /* 002C8 809E9828 3C0E809F */ lui $t6, %hi(func_809E9F6C) ## $t6 = 809F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s index a7d2a5c3b7..b58e4ee8ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s @@ -5,7 +5,7 @@ glabel func_809E9868 /* 00314 809E9874 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00318 809E9878 24A504D8 */ addiu $a1, $a1, 0x04D8 ## $a1 = 060004D8 /* 0031C 809E987C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00320 809E9880 0C029490 */ jal func_800A5240 +/* 00320 809E9880 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00324 809E9884 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00328 809E9888 8FA40018 */ lw $a0, 0x0018($sp) /* 0032C 809E988C 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s index 68f747535d..33e9d07b0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s @@ -6,7 +6,7 @@ glabel func_809E98B4 /* 00364 809E98C4 24A508C4 */ addiu $a1, $a1, 0x08C4 ## $a1 = 060008C4 /* 00368 809E98C8 AFA70018 */ sw $a3, 0x0018($sp) /* 0036C 809E98CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00370 809E98D0 0C029490 */ jal func_800A5240 +/* 00370 809E98D0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00374 809E98D4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00378 809E98D8 8FA40018 */ lw $a0, 0x0018($sp) /* 0037C 809E98DC 240E0025 */ addiu $t6, $zero, 0x0025 ## $t6 = 00000025 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s index e18df59c54..ecc638777f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s @@ -5,7 +5,7 @@ glabel func_809E9920 /* 003CC 809E992C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003D0 809E9930 24A53650 */ addiu $a1, $a1, 0x3650 ## $a1 = 06003650 /* 003D4 809E9934 AFA60018 */ sw $a2, 0x0018($sp) -/* 003D8 809E9938 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 003D8 809E9938 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 003DC 809E993C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 003E0 809E9940 8FA60018 */ lw $a2, 0x0018($sp) /* 003E4 809E9944 3C19809F */ lui $t9, %hi(func_809EA240) ## $t9 = 809F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s index b21177d05b..5155a74c89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s @@ -5,7 +5,7 @@ glabel func_809E9978 /* 00424 809E9984 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00428 809E9988 24A51024 */ addiu $a1, $a1, 0x1024 ## $a1 = 06001024 /* 0042C 809E998C AFA60018 */ sw $a2, 0x0018($sp) -/* 00430 809E9990 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00430 809E9990 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00434 809E9994 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00438 809E9998 8FA60018 */ lw $a2, 0x0018($sp) /* 0043C 809E999C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s index d47312471b..9ed8f34a32 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s @@ -6,7 +6,7 @@ glabel func_809E99D8 /* 00488 809E99E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0048C 809E99EC 24A50368 */ addiu $a1, $a1, 0x0368 ## $a1 = 06000368 /* 00490 809E99F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00494 809E99F4 0C029490 */ jal func_800A5240 +/* 00494 809E99F4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00498 809E99F8 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0049C 809E99FC 8E0E0304 */ lw $t6, 0x0304($s0) ## 00000304 /* 004A0 809E9A00 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s index ca4d31a437..047742dc35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s @@ -6,7 +6,7 @@ glabel func_809E9AB4 /* 00564 809E9AC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00568 809E9AC8 24A50368 */ addiu $a1, $a1, 0x0368 ## $a1 = 06000368 /* 0056C 809E9ACC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00570 809E9AD0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00570 809E9AD0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00574 809E9AD4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00578 809E9AD8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0057C 809E9ADC 3C0F809F */ lui $t7, %hi(func_809EA534) ## $t7 = 809F0000 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 9c8c4d3304..fc7cc9792d 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 @@ -5,7 +5,7 @@ glabel func_809E9B48 /* 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 func_800A51E8 +/* 00600 809E9B60 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00604 809E9B64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00608 809E9B68 8FA40018 */ lw $a0, 0x0018($sp) /* 0060C 809E9B6C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s index cae848fd3a..c1661bde96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s @@ -82,7 +82,7 @@ glabel func_809E9F6C /* 00B2C 809EA08C 8FA40038 */ lw $a0, 0x0038($sp) /* 00B30 809EA090 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B34 809EA094 24A501C4 */ addiu $a1, $a1, 0x01C4 ## $a1 = 060001C4 -/* 00B38 809EA098 0C029490 */ jal func_800A5240 +/* 00B38 809EA098 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00B3C 809EA09C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00B40 809EA0A0 86020196 */ lh $v0, 0x0196($s0) ## 00000196 /* 00B44 809EA0A4 10400002 */ beq $v0, $zero, .L809EA0B0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s index 6e3e8ab7c8..91ef278aeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s @@ -5,7 +5,7 @@ glabel func_809EB05C /* 00328 809EB068 AFBF001C */ sw $ra, 0x001C($sp) /* 0032C 809EB06C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00330 809EB070 24A53A8C */ addiu $a1, $a1, 0x3A8C ## $a1 = 06003A8C -/* 00334 809EB074 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00334 809EB074 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00338 809EB078 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0033C 809EB07C 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 00340 809EB080 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s index f7bb5ccf86..5538c7d548 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s @@ -7,7 +7,7 @@ glabel func_809EB4D8 /* 007AC 809EB4EC 24A55880 */ addiu $a1, $a1, 0x5880 ## $a1 = 06005880 /* 007B0 809EB4F0 AFA70018 */ sw $a3, 0x0018($sp) /* 007B4 809EB4F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007B8 809EB4F8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 007B8 809EB4F8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 007BC 809EB4FC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 007C0 809EB500 8FA40018 */ lw $a0, 0x0018($sp) /* 007C4 809EB504 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s index 136f956d23..2501bb5858 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s @@ -6,7 +6,7 @@ glabel func_809EB5C4 /* 00894 809EB5D4 24A54658 */ addiu $a1, $a1, 0x4658 ## $a1 = 06004658 /* 00898 809EB5D8 AFA70018 */ sw $a3, 0x0018($sp) /* 0089C 809EB5DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008A0 809EB5E0 0C029490 */ jal func_800A5240 +/* 008A0 809EB5E0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 008A4 809EB5E4 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 008A8 809EB5E8 8FA40018 */ lw $a0, 0x0018($sp) /* 008AC 809EB5EC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 8ea9957d09..749a148a9e 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 @@ -64,7 +64,7 @@ glabel func_809EB624 glabel L809EB708 /* 009C8 809EB708 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009CC 809EB70C 24A51A3C */ addiu $a1, $a1, 0x1A3C ## $a1 = 06001A3C -/* 009D0 809EB710 0C02947A */ jal func_800A51E8 +/* 009D0 809EB710 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 009D4 809EB714 8FA40034 */ lw $a0, 0x0034($sp) /* 009D8 809EB718 920C0250 */ lbu $t4, 0x0250($s0) ## 00000250 /* 009DC 809EB71C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s index e9f46fee95..9f9358e992 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s @@ -6,7 +6,7 @@ glabel func_809EB934 /* 00C04 809EB944 24A52148 */ addiu $a1, $a1, 0x2148 ## $a1 = 06002148 /* 00C08 809EB948 AFA70018 */ sw $a3, 0x0018($sp) /* 00C0C 809EB94C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C10 809EB950 0C029490 */ jal func_800A5240 +/* 00C10 809EB950 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00C14 809EB954 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 00C18 809EB958 8FA40018 */ lw $a0, 0x0018($sp) /* 00C1C 809EB95C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s index 86486014e0..4d4e22c5cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s @@ -6,7 +6,7 @@ glabel func_809EBB48 /* 00E18 809EBB58 24A53D6C */ addiu $a1, $a1, 0x3D6C ## $a1 = 06003D6C /* 00E1C 809EBB5C AFA70018 */ sw $a3, 0x0018($sp) /* 00E20 809EBB60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E24 809EBB64 0C029490 */ jal func_800A5240 +/* 00E24 809EBB64 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00E28 809EBB68 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 00E2C 809EBB6C 8FA70018 */ lw $a3, 0x0018($sp) /* 00E30 809EBB70 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s index 1948706b42..0936e33d38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s @@ -6,7 +6,7 @@ glabel func_809EBCF0 /* 00FC0 809EBD00 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00FC4 809EBD04 24A532BC */ addiu $a1, $a1, 0x32BC ## $a1 = 060032BC /* 00FC8 809EBD08 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FCC 809EBD0C 0C029490 */ jal func_800A5240 +/* 00FCC 809EBD0C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00FD0 809EBD10 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 00FD4 809EBD14 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 00FD8 809EBD18 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s index 3a0e5ff7a4..8df88948d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s @@ -21,7 +21,7 @@ glabel func_809EBD78 /* 0107C 809EBDBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01080 809EBDC0 14410005 */ bne $v0, $at, .L809EBDD8 /* 01084 809EBDC4 24A5375C */ addiu $a1, $a1, 0x375C ## $a1 = 0600375C -/* 01088 809EBDC8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01088 809EBDC8 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 0108C 809EBDCC AFA60020 */ sw $a2, 0x0020($sp) /* 01090 809EBDD0 8FA60020 */ lw $a2, 0x0020($sp) /* 01094 809EBDD4 84C2025C */ lh $v0, 0x025C($a2) ## 0000025C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s index aad42736e2..8733165d2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s @@ -5,7 +5,7 @@ glabel func_809EC9C8 /* 00154 809EC9D4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00158 809EC9D8 24A515B0 */ addiu $a1, $a1, 0x15B0 ## $a1 = 060015B0 /* 0015C 809EC9DC AFA60018 */ sw $a2, 0x0018($sp) -/* 00160 809EC9E0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00160 809EC9E0 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00164 809EC9E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00168 809EC9E8 8FA60018 */ lw $a2, 0x0018($sp) /* 0016C 809EC9EC 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s index b3d5ec5855..3fe09760a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s @@ -6,7 +6,7 @@ glabel func_809F89CC /* 0078C 809F89DC 24A54C20 */ addiu $a1, $a1, 0x4C20 ## $a1 = 06004C20 /* 00790 809F89E0 AFA70018 */ sw $a3, 0x0018($sp) /* 00794 809F89E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00798 809F89E8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00798 809F89E8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0079C 809F89EC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 007A0 809F89F0 8FA70018 */ lw $a3, 0x0018($sp) /* 007A4 809F89F4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s index a1a0dd8b0c..11f03d1f7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s @@ -6,7 +6,7 @@ glabel func_809F8AD8 /* 00898 809F8AE8 24A528F0 */ addiu $a1, $a1, 0x28F0 ## $a1 = 060028F0 /* 0089C 809F8AEC AFA70018 */ sw $a3, 0x0018($sp) /* 008A0 809F8AF0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008A4 809F8AF4 0C029490 */ jal func_800A5240 +/* 008A4 809F8AF4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 008A8 809F8AF8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 008AC 809F8AFC 8FA40018 */ lw $a0, 0x0018($sp) /* 008B0 809F8B00 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 bbdb3f1a13..c9591fb6f6 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 @@ -5,7 +5,7 @@ glabel func_809F8B2C /* 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 func_800A51E8 +/* 008F4 809F8B44 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 008F8 809F8B48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 008FC 809F8B4C 8FA40018 */ lw $a0, 0x0018($sp) /* 00900 809F8B50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s index aeb63f9130..3012018470 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s @@ -6,7 +6,7 @@ glabel func_809F9760 /* 01520 809F9770 24A51A44 */ addiu $a1, $a1, 0x1A44 ## $a1 = 06001A44 /* 01524 809F9774 AFA70018 */ sw $a3, 0x0018($sp) /* 01528 809F9778 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0152C 809F977C 0C029490 */ jal func_800A5240 +/* 0152C 809F977C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01530 809F9780 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 01534 809F9784 8FA40018 */ lw $a0, 0x0018($sp) /* 01538 809F9788 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s index 98d2b92e1d..ce6612c9b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s @@ -80,7 +80,7 @@ glabel func_809F97C0 /* 01680 809F98D0 AFA70058 */ sw $a3, 0x0058($sp) /* 01684 809F98D4 8FA50058 */ lw $a1, 0x0058($sp) /* 01688 809F98D8 8FA40038 */ lw $a0, 0x0038($sp) -/* 0168C 809F98DC 0C0294A7 */ jal func_800A529C +/* 0168C 809F98DC 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 01690 809F98E0 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 01694 809F98E4 3C03FFCF */ lui $v1, 0xFFCF ## $v1 = FFCF0000 /* 01698 809F98E8 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s index 7aaaa11360..4670a52cd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s @@ -7,7 +7,7 @@ glabel func_809F9A80 /* 01844 809F9A94 24A513C4 */ addiu $a1, $a1, 0x13C4 ## $a1 = 060013C4 /* 01848 809F9A98 AFA70018 */ sw $a3, 0x0018($sp) /* 0184C 809F9A9C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01850 809F9AA0 0C029490 */ jal func_800A5240 +/* 01850 809F9AA0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01854 809F9AA4 3C06C100 */ lui $a2, 0xC100 ## $a2 = C1000000 /* 01858 809F9AA8 8FA40018 */ lw $a0, 0x0018($sp) /* 0185C 809F9AAC 24053804 */ addiu $a1, $zero, 0x3804 ## $a1 = 00003804 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s index 5a79d485fa..36c875a62b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s @@ -40,7 +40,7 @@ glabel func_809FC5D0 /* 00490 809FC660 AFA70040 */ sw $a3, 0x0040($sp) /* 00494 809FC664 000D7080 */ sll $t6, $t5, 2 /* 00498 809FC668 00AE2821 */ addu $a1, $a1, $t6 -/* 0049C 809FC66C 0C0294A7 */ jal func_800A529C +/* 0049C 809FC66C 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 004A0 809FC670 8CA5CECC */ lw $a1, %lo(D_809FCECC)($a1) /* 004A4 809FC674 8FA70040 */ lw $a3, 0x0040($sp) /* 004A8 809FC678 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s index 5ef062509e..a7ab644d5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s @@ -7,7 +7,7 @@ glabel func_80A00218 /* 0028C 80A0022C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00290 80A00230 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 /* 00294 80A00234 24A512AC */ addiu $a1, $a1, 0x12AC ## $a1 = 060012AC -/* 00298 80A00238 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00298 80A00238 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 0029C 80A0023C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002A0 80A00240 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 002A4 80A00244 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 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 2d9d198a6c..4a1679ba5e 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 @@ -8,7 +8,7 @@ glabel func_80A003DC /* 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 func_800A51E8 +/* 00460 80A00400 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s index 739816bd51..06be42382d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s @@ -18,7 +18,7 @@ glabel func_80A004BC /* 00558 80A004F8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0055C 80A004FC 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 00560 80A00500 46083280 */ add.s $f10, $f6, $f8 -/* 00564 80A00504 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00564 80A00504 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00568 80A00508 E4EA0280 */ swc1 $f10, 0x0280($a3) ## 00000280 /* 0056C 80A0050C 8FA70018 */ lw $a3, 0x0018($sp) /* 00570 80A00510 3C1880A0 */ lui $t8, %hi(func_80A00C70) ## $t8 = 80A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s index 5c9eda3452..4be9e2ba65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s @@ -6,7 +6,7 @@ glabel func_80A00588 /* 005F8 80A00598 24A504C4 */ addiu $a1, $a1, 0x04C4 ## $a1 = 060004C4 /* 005FC 80A0059C AFA70018 */ sw $a3, 0x0018($sp) /* 00600 80A005A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00604 80A005A4 0C029490 */ jal func_800A5240 +/* 00604 80A005A4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00608 80A005A8 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0060C 80A005AC 8FA70018 */ lw $a3, 0x0018($sp) /* 00610 80A005B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s index 406ed0c659..404a28c5ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s @@ -20,7 +20,7 @@ glabel func_80A006B0 /* 00758 80A006F8 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 /* 0075C 80A006FC 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 00760 80A00700 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00764 80A00704 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00764 80A00704 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00768 80A00708 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 0076C 80A0070C 10000007 */ beq $zero, $zero, .L80A0072C /* 00770 80A00710 92080298 */ lbu $t0, 0x0298($s0) ## 00000298 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 50860e761b..4f1f133b02 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 @@ -5,7 +5,7 @@ glabel func_80A17780 /* 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 func_800A51E8 +/* 00288 80A17798 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 0028C 80A1779C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00290 80A177A0 8FA60018 */ lw $a2, 0x0018($sp) /* 00294 80A177A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s index 02bfeaf0b4..be95e092e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s @@ -5,7 +5,7 @@ glabel func_80A177C8 /* 002C4 80A177D4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002C8 80A177D8 24A5A054 */ addiu $a1, $a1, 0xA054 ## $a1 = 0600A054 /* 002CC 80A177DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002D0 80A177E0 0C029490 */ jal func_800A5240 +/* 002D0 80A177E0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 002D4 80A177E4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 002D8 80A177E8 8FAF0018 */ lw $t7, 0x0018($sp) /* 002DC 80A177EC 3C0E80A2 */ lui $t6, %hi(func_80A185C4) ## $t6 = 80A20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s index 078946b3d7..a46c225f00 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s @@ -10,7 +10,7 @@ glabel func_80A17808 /* 00318 80A17828 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 /* 0031C 80A1782C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00320 80A17830 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 00324 80A17834 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00324 80A17834 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00328 80A17838 AFA70018 */ sw $a3, 0x0018($sp) /* 0032C 80A1783C 10000005 */ beq $zero, $zero, .L80A17854 /* 00330 80A17840 8FA70018 */ lw $a3, 0x0018($sp) 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 7637068277..bb18bc56cf 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 @@ -5,7 +5,7 @@ glabel func_80A17894 /* 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 func_800A51E8 +/* 0039C 80A178AC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 003A0 80A178B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 003A4 80A178B4 8FA60018 */ lw $a2, 0x0018($sp) /* 003A8 80A178B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s index c38725dd96..0ab430118d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s @@ -15,7 +15,7 @@ glabel func_80A17908 /* 0042C 80A1793C 24A52158 */ addiu $a1, $a1, 0x2158 ## $a1 = 06002158 /* 00430 80A17940 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00434 80A17944 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00438 80A17948 0C029490 */ jal func_800A5240 +/* 00438 80A17948 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0043C 80A1794C A7A30036 */ sh $v1, 0x0036($sp) /* 00440 80A17950 10000015 */ beq $zero, $zero, .L80A179A8 /* 00444 80A17954 87A30036 */ lh $v1, 0x0036($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s index a7559e869d..aa7006012c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s @@ -6,7 +6,7 @@ glabel func_80A17D4C /* 0084C 80A17D5C 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 /* 00850 80A17D60 AFA70018 */ sw $a3, 0x0018($sp) /* 00854 80A17D64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00858 80A17D68 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00858 80A17D68 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 0085C 80A17D6C 3C064090 */ lui $a2, 0x4090 ## $a2 = 40900000 /* 00860 80A17D70 8FA70018 */ lw $a3, 0x0018($sp) /* 00864 80A17D74 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s index a1684128da..6d0bb630e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s @@ -10,7 +10,7 @@ glabel func_80A17D9C /* 008AC 80A17DBC 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 /* 008B0 80A17DC0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 008B4 80A17DC4 3C064090 */ lui $a2, 0x4090 ## $a2 = 40900000 -/* 008B8 80A17DC8 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 008B8 80A17DC8 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 008BC 80A17DCC AFA70018 */ sw $a3, 0x0018($sp) /* 008C0 80A17DD0 8FA70018 */ lw $a3, 0x0018($sp) .L80A17DD4: 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 45b5777c8b..6f8d973870 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 @@ -5,7 +5,7 @@ glabel func_80A1817C /* 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 func_800A51E8 +/* 00C84 80A18194 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00C88 80A18198 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00C8C 80A1819C 8FA40018 */ lw $a0, 0x0018($sp) /* 00C90 80A181A0 848E019A */ lh $t6, 0x019A($a0) ## 0000019A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s index 8b3bb5d8d1..c0a105b96c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s @@ -6,7 +6,7 @@ glabel func_80A18254 /* 00D54 80A18264 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00D58 80A18268 24A50590 */ addiu $a1, $a1, 0x0590 ## $a1 = 06000590 /* 00D5C 80A1826C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00D60 80A18270 0C029490 */ jal func_800A5240 +/* 00D60 80A18270 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00D64 80A18274 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00D68 80A18278 8E0E0304 */ lw $t6, 0x0304($s0) ## 00000304 /* 00D6C 80A1827C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 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 4d289f3858..102982b5f0 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 @@ -5,7 +5,7 @@ glabel func_80A18310 /* 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 func_800A51E8 +/* 00E18 80A18328 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00E1C 80A1832C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00E20 80A18330 8FA60018 */ lw $a2, 0x0018($sp) /* 00E24 80A18334 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 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 222fd53494..db127cf202 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 @@ -171,13 +171,13 @@ glabel func_80A198EC /* 02640 80A19B50 15400007 */ bne $t2, $zero, .L80A19B70 /* 02644 80A19B54 00000000 */ nop /* 02648 80A19B58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0264C 80A19B5C 0C02947A */ jal func_800A51E8 +/* 0264C 80A19B5C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 /* 0265C 80A19B6C A60B0194 */ sh $t3, 0x0194($s0) ## 00000194 .L80A19B70: -/* 02660 80A19B70 0C02947A */ jal func_800A51E8 +/* 02660 80A19B70 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02664 80A19B74 24A59DB0 */ addiu $a1, $a1, 0x9DB0 ## $a1 = FFFF9DB0 /* 02668 80A19B78 A6000194 */ sh $zero, 0x0194($s0) ## 00000194 .L80A19B7C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s index b36aa92696..bb0d481f1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s @@ -27,7 +27,7 @@ glabel EnFu_Init /* 00060 80A1D870 8FA40044 */ lw $a0, 0x0044($sp) /* 00064 80A1D874 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00068 80A1D878 24A50B04 */ addiu $a1, $a1, 0x0B04 ## $a1 = 06000B04 -/* 0006C 80A1D87C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0006C 80A1D87C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00070 80A1D880 8FA40034 */ lw $a0, 0x0034($sp) /* 00074 80A1D884 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00078 80A1D888 AFA50034 */ sw $a1, 0x0034($sp) 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 0e4b3357e1..5891c0526b 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 func_800A51E8 +/* 0006C 80A309DC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 62de9111f0..a825463ad1 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 @@ -9,7 +9,7 @@ glabel func_80A323B0 /* 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 func_800A51E8 +/* 01A64 80A323D4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 01A68 80A323D8 8DC502B0 */ lw $a1, 0x02B0($t6) ## 000002B0 .L80A323DC: /* 01A6C 80A323DC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s index 728e2666b9..023b97f479 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s @@ -26,7 +26,7 @@ glabel EnGe2_Init /* 00100 80A32CD0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00104 80A32CD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00108 80A32CD8 24A59ED4 */ addiu $a1, $a1, 0x9ED4 ## $a1 = 06009ED4 -/* 0010C 80A32CDC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0010C 80A32CDC 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00110 80A32CE0 8FA40030 */ lw $a0, 0x0030($sp) /* 00114 80A32CE4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00118 80A32CE8 AFA50030 */ sw $a1, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s index d0737217bd..076a10dfc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s @@ -26,7 +26,7 @@ glabel EnGe3_Init /* 00100 80A34720 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00104 80A34724 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00108 80A34728 24A5B07C */ addiu $a1, $a1, 0xB07C ## $a1 = 0600B07C -/* 0010C 80A3472C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0010C 80A3472C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00110 80A34730 8FA40034 */ lw $a0, 0x0034($sp) /* 00114 80A34734 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00118 80A34738 AFA50034 */ sw $a1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s index 5d4b9db5e0..7c9e321b1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s @@ -6,7 +6,7 @@ glabel func_80A35974 /* 00674 80A35984 24A5ADF8 */ addiu $a1, $a1, 0xADF8 ## $a1 = 0600ADF8 /* 00678 80A35988 AFA70018 */ sw $a3, 0x0018($sp) /* 0067C 80A3598C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00680 80A35990 0C0294A7 */ jal func_800A529C +/* 00680 80A35990 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 00684 80A35994 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00688 80A35998 8FA40018 */ lw $a0, 0x0018($sp) /* 0068C 80A3599C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s index 4b948f2694..9f80a45634 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s @@ -6,7 +6,7 @@ glabel func_80A35D48 /* 00A48 80A35D58 24A5B6D4 */ addiu $a1, $a1, 0xB6D4 ## $a1 = 0600B6D4 /* 00A4C 80A35D5C AFA70018 */ sw $a3, 0x0018($sp) /* 00A50 80A35D60 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00A54 80A35D64 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00A54 80A35D64 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00A58 80A35D68 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 00A5C 80A35D6C 8FA70018 */ lw $a3, 0x0018($sp) /* 00A60 80A35D70 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s index 39c8429876..da6194681a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s @@ -6,7 +6,7 @@ glabel func_80A367E4 /* 014E4 80A367F4 24A5A814 */ addiu $a1, $a1, 0xA814 ## $a1 = 0600A814 /* 014E8 80A367F8 AFA70018 */ sw $a3, 0x0018($sp) /* 014EC 80A367FC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 014F0 80A36800 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 014F0 80A36800 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 014F4 80A36804 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 014F8 80A36808 8FA40018 */ lw $a0, 0x0018($sp) /* 014FC 80A3680C 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 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 46ca1a03a2..ef7a26434a 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 @@ -5,7 +5,7 @@ glabel func_80A37670 /* 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 func_800A51E8 +/* 02378 80A37688 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 0237C 80A3768C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02380 80A37690 8FA60018 */ lw $a2, 0x0018($sp) /* 02384 80A37694 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s index 53990442db..c03a369f71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s @@ -6,7 +6,7 @@ glabel func_80A37D70 /* 02A70 80A37D80 24A51390 */ addiu $a1, $a1, 0x1390 ## $a1 = 06001390 /* 02A74 80A37D84 AFA70018 */ sw $a3, 0x0018($sp) /* 02A78 80A37D88 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02A7C 80A37D8C 0C029490 */ jal func_800A5240 +/* 02A7C 80A37D8C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02A80 80A37D90 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 02A84 80A37D94 8FA40018 */ lw $a0, 0x0018($sp) /* 02A88 80A37D98 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s index ef8da270e5..b987e9832c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s @@ -21,7 +21,7 @@ glabel func_80A37EF0 /* 02C28 80A37F38 57010006 */ bnel $t8, $at, .L80A37F54 /* 02C2C 80A37F3C 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80A37F40: -/* 02C30 80A37F40 0C0294A7 */ jal func_800A529C +/* 02C30 80A37F40 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 02C34 80A37F44 AFA70018 */ sw $a3, 0x0018($sp) /* 02C38 80A37F48 8FA70018 */ lw $a3, 0x0018($sp) /* 02C3C 80A37F4C 90E202FE */ lbu $v0, 0x02FE($a3) ## 000002FE diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s index 7f98a30044..d570dc1ab5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s @@ -6,7 +6,7 @@ glabel func_80A38054 /* 02D54 80A38064 24A52280 */ addiu $a1, $a1, 0x2280 ## $a1 = 06002280 /* 02D58 80A38068 AFA70018 */ sw $a3, 0x0018($sp) /* 02D5C 80A3806C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02D60 80A38070 0C029490 */ jal func_800A5240 +/* 02D60 80A38070 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02D64 80A38074 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02D68 80A38078 8FA70018 */ lw $a3, 0x0018($sp) /* 02D6C 80A3807C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s index 5ed7312298..b0662941c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s @@ -6,7 +6,7 @@ glabel func_80A3907C /* 03D7C 80A3908C 24A51E10 */ addiu $a1, $a1, 0x1E10 ## $a1 = 06001E10 /* 03D80 80A39090 AFA70018 */ sw $a3, 0x0018($sp) /* 03D84 80A39094 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 03D88 80A39098 0C029490 */ jal func_800A5240 +/* 03D88 80A39098 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 03D8C 80A3909C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 03D90 80A390A0 8FA70018 */ lw $a3, 0x0018($sp) /* 03D94 80A390A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s index 22c8d33b7f..179a65ad08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s @@ -153,7 +153,7 @@ glabel EnGoma_Init /* 00220 80A490E0 8FA40044 */ lw $a0, 0x0044($sp) /* 00224 80A490E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00228 80A490E8 24A51548 */ addiu $a1, $a1, 0x1548 ## $a1 = 06001548 -/* 0022C 80A490EC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0022C 80A490EC 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00230 80A490F0 8FA40034 */ lw $a0, 0x0034($sp) /* 00234 80A490F4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00238 80A490F8 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s index 90a3d04286..8981de5720 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s @@ -12,7 +12,7 @@ glabel func_80A4A470 /* 015D8 80A4A498 24A51548 */ addiu $a1, $a1, 0x1548 ## $a1 = 06001548 /* 015DC 80A4A49C AFA70018 */ sw $a3, 0x0018($sp) /* 015E0 80A4A4A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 015E4 80A4A4A4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 015E4 80A4A4A4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 015E8 80A4A4A8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 015EC 80A4A4AC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 015F0 80A4A4B0 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s index 38c9e99634..c81909489c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s @@ -6,7 +6,7 @@ glabel func_80A57454 /* 00264 80A57464 24A52B90 */ addiu $a1, $a1, 0x2B90 ## $a1 = 06002B90 /* 00268 80A57468 AFA70018 */ sw $a3, 0x0018($sp) /* 0026C 80A5746C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00270 80A57470 0C0294A7 */ jal func_800A529C +/* 00270 80A57470 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 00274 80A57474 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00278 80A57478 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 /* 0027C 80A5747C 0C01DF64 */ jal Math_Rand_S16Offset diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s index 79b9476a22..73120597c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s @@ -5,7 +5,7 @@ glabel func_80A574D4 /* 002E0 80A574E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002E4 80A574E4 24A52894 */ addiu $a1, $a1, 0x2894 ## $a1 = 06002894 /* 002E8 80A574E8 AFA60018 */ sw $a2, 0x0018($sp) -/* 002EC 80A574EC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 002EC 80A574EC 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 002F0 80A574F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002F4 80A574F4 8FA60018 */ lw $a2, 0x0018($sp) /* 002F8 80A574F8 3C0F80A5 */ lui $t7, %hi(func_80A57B60) ## $t7 = 80A50000 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 71a727a5c9..91bd707928 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 @@ -4,7 +4,7 @@ glabel func_80A5751C /* 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 func_800A51E8 +/* 00330 80A57530 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00334 80A57534 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00338 80A57538 8FAF0018 */ lw $t7, 0x0018($sp) /* 0033C 80A5753C 3C0E80A5 */ lui $t6, %hi(func_80A57CA8) ## $t6 = 80A50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s index acd872fc34..21d24161cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s @@ -6,7 +6,7 @@ glabel func_80A57558 /* 00368 80A57568 24A52F7C */ addiu $a1, $a1, 0x2F7C ## $a1 = 06002F7C /* 0036C 80A5756C AFA70018 */ sw $a3, 0x0018($sp) /* 00370 80A57570 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00374 80A57574 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00374 80A57574 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00378 80A57578 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0037C 80A5757C 8FA70018 */ lw $a3, 0x0018($sp) /* 00380 80A57580 3C0E80A5 */ lui $t6, %hi(func_80A57CA8) ## $t6 = 80A50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s index ff3c7d94e6..b1d9702e37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s @@ -5,7 +5,7 @@ glabel func_80A575C0 /* 003CC 80A575CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003D0 80A575D0 24A524CC */ addiu $a1, $a1, 0x24CC ## $a1 = 060024CC /* 003D4 80A575D4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003D8 80A575D8 0C029490 */ jal func_800A5240 +/* 003D8 80A575D8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 003DC 80A575DC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 003E0 80A575E0 8FA40018 */ lw $a0, 0x0018($sp) /* 003E4 80A575E4 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s index 1abf173fb7..84c3aef005 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s @@ -6,7 +6,7 @@ glabel func_80A5760C /* 0041C 80A5761C 24A526C4 */ addiu $a1, $a1, 0x26C4 ## $a1 = 060026C4 /* 00420 80A57620 AFA70018 */ sw $a3, 0x0018($sp) /* 00424 80A57624 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00428 80A57628 0C029490 */ jal func_800A5240 +/* 00428 80A57628 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0042C 80A5762C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00430 80A57630 8FA40018 */ lw $a0, 0x0018($sp) /* 00434 80A57634 240E0025 */ addiu $t6, $zero, 0x0025 ## $t6 = 00000025 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s index b236070367..edbdec9885 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s @@ -5,7 +5,7 @@ glabel func_80A576FC /* 00508 80A57708 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0050C 80A5770C 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 /* 00510 80A57710 AFA60018 */ sw $a2, 0x0018($sp) -/* 00514 80A57714 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00514 80A57714 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00518 80A57718 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0051C 80A5771C 8FA60018 */ lw $a2, 0x0018($sp) /* 00520 80A57720 3C0F80A6 */ lui $t7, %hi(func_80A58028) ## $t7 = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s index 77486665a8..d9cbf3513e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s @@ -6,7 +6,7 @@ glabel func_80A57744 /* 00554 80A57754 24A52E84 */ addiu $a1, $a1, 0x2E84 ## $a1 = 06002E84 /* 00558 80A57758 AFA70018 */ sw $a3, 0x0018($sp) /* 0055C 80A5775C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00560 80A57760 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00560 80A57760 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00564 80A57764 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00568 80A57768 8FA70018 */ lw $a3, 0x0018($sp) /* 0056C 80A5776C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s index bb9b4c8b82..5325663371 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s @@ -7,7 +7,7 @@ glabel func_80A57790 /* 005A4 80A577A4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005A8 80A577A8 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 /* 005AC 80A577AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005B0 80A577B0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 005B0 80A577B0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 005B4 80A577B4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 005B8 80A577B8 92180226 */ lbu $t8, 0x0226($s0) ## 00000226 /* 005BC 80A577BC 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s index 89e412f76e..b131ba617d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s @@ -5,7 +5,7 @@ glabel func_80A57850 /* 0065C 80A5785C AFBF0024 */ sw $ra, 0x0024($sp) /* 00660 80A57860 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00664 80A57864 24A529BC */ addiu $a1, $a1, 0x29BC ## $a1 = 060029BC -/* 00668 80A57868 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00668 80A57868 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 0066C 80A5786C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00670 80A57870 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00674 80A57874 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE 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 5e1257ea18..3f76dac808 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 @@ -384,7 +384,7 @@ glabel EnHorse_Init /* 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 func_800A51E8 +/* 01324 80A5C614 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 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 d0af29255b..b1de44e0fc 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 @@ -14,7 +14,7 @@ glabel func_80A5D748 /* 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 func_800A51E8 +/* 02494 80A5D784 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02498 80A5D788 8D050010 */ lw $a1, 0x0010($t0) ## 80A60010 /* 0249C 80A5D78C 8FBF0014 */ lw $ra, 0x0014($sp) /* 024A0 80A5D790 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 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 b699365347..f3e50d3036 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 @@ -12,7 +12,7 @@ glabel func_80A5DB0C /* 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 func_800A51E8 +/* 02850 80A5DB40 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02854 80A5DB44 8D050014 */ lw $a1, 0x0014($t0) ## 80A60014 /* 02858 80A5DB48 8FBF0014 */ lw $ra, 0x0014($sp) /* 0285C 80A5DB4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 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 05bda3093d..e495ef24da 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 @@ -15,7 +15,7 @@ glabel func_80A5DD58 /* 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 func_800A51E8 +/* 02AA8 80A5DD98 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02AAC 80A5DD9C 8D050018 */ lw $a1, 0x0018($t0) ## 80A60018 /* 02AB0 80A5DDA0 8FBF0014 */ lw $ra, 0x0014($sp) /* 02AB4 80A5DDA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 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 1ef445772b..b5f54c26f3 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 @@ -14,7 +14,7 @@ glabel func_80A5DDB0 /* 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 func_800A51E8 +/* 02AFC 80A5DDEC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02B00 80A5DDF0 AFA60018 */ sw $a2, 0x0018($sp) /* 02B04 80A5DDF4 8FA60018 */ lw $a2, 0x0018($sp) /* 02B08 80A5DDF8 3C0180A6 */ lui $at, %hi(D_80A668C0) ## $at = 80A60000 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 d6305f09af..678383cf48 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 @@ -95,7 +95,7 @@ glabel func_80A5F890 /* 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 func_800A51E8 +/* 0470C 80A5F9FC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 04710 80A5FA00 AFA40030 */ sw $a0, 0x0030($sp) /* 04714 80A5FA04 8E090228 */ lw $t1, 0x0228($s0) ## 00000228 /* 04718 80A5FA08 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s index 5080502a34..17c1aed0a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s @@ -20,7 +20,7 @@ glabel func_80A60294 /* 04FEC 80A602DC 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC /* 04FF0 80A602E0 8D050018 */ lw $a1, 0x0018($t0) ## 80A60018 /* 04FF4 80A602E4 44064000 */ mfc1 $a2, $f8 -/* 04FF8 80A602E8 0C0294A7 */ jal func_800A529C +/* 04FF8 80A602E8 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 04FFC 80A602EC 00000000 */ nop /* 05000 80A602F0 8FBF0014 */ lw $ra, 0x0014($sp) /* 05004 80A602F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s index 87df6361ea..44d8acf731 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s @@ -78,7 +78,7 @@ glabel func_80A60300 /* 05134 80A60424 8FA40024 */ lw $a0, 0x0024($sp) /* 05138 80A60428 44069000 */ mfc1 $a2, $f18 /* 0513C 80A6042C 016D7021 */ addu $t6, $t3, $t5 -/* 05140 80A60430 0C0294A7 */ jal func_800A529C +/* 05140 80A60430 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 05144 80A60434 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 05148 80A60438 8FBF001C */ lw $ra, 0x001C($sp) .L80A6043C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s index bb00f5462a..1a6711e240 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s @@ -138,7 +138,7 @@ glabel func_80A605E0 /* 054F0 80A607E0 3C0680A6 */ lui $a2, %hi(D_80A65E78) ## $a2 = 80A60000 /* 054F4 80A607E4 8CC65E78 */ lw $a2, %lo(D_80A65E78)($a2) /* 054F8 80A607E8 8FA40028 */ lw $a0, 0x0028($sp) -/* 054FC 80A607EC 0C0294A7 */ jal func_800A529C +/* 054FC 80A607EC 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 05500 80A607F0 8F250018 */ lw $a1, 0x0018($t9) ## 80A60018 /* 05504 80A607F4 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC /* 05508 80A607F8 3C0180A6 */ lui $at, %hi(D_80A66910) ## $at = 80A60000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s index 28dad16603..56c46f65aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s @@ -49,7 +49,7 @@ glabel func_80A60AFC /* 058C8 80A60BB8 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) /* 058CC 80A60BBC 8D450018 */ lw $a1, 0x0018($t2) ## 80A60018 /* 058D0 80A60BC0 44064000 */ mfc1 $a2, $f8 -/* 058D4 80A60BC4 0C0294A7 */ jal func_800A529C +/* 058D4 80A60BC4 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 058D8 80A60BC8 00000000 */ nop /* 058DC 80A60BCC 8FBF0014 */ lw $ra, 0x0014($sp) /* 058E0 80A60BD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s index 1540640f1e..681e7dc797 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s @@ -78,7 +78,7 @@ glabel func_80A60BDC /* 05A10 80A60D00 8FA40024 */ lw $a0, 0x0024($sp) /* 05A14 80A60D04 44069000 */ mfc1 $a2, $f18 /* 05A18 80A60D08 016D7021 */ addu $t6, $t3, $t5 -/* 05A1C 80A60D0C 0C0294A7 */ jal func_800A529C +/* 05A1C 80A60D0C 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 05A20 80A60D10 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 05A24 80A60D14 8FBF001C */ lw $ra, 0x001C($sp) .L80A60D18: 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 ddec1afe23..371b9a7b00 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 @@ -48,7 +48,7 @@ glabel EnHorseGanon_Init /* 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 func_800A51E8 +/* 00384 80A689E4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s index 4067d107b4..75c922889f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s @@ -4,7 +4,7 @@ glabel func_80A68AC4 /* 0046C 80A68ACC AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 00470 80A68AD0 3C0580A7 */ lui $a1, %hi(D_80A691C0) ## $a1 = 80A70000 /* 00474 80A68AD4 8CA591C0 */ lw $a1, %lo(D_80A691C0)($a1) -/* 00478 80A68AD8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00478 80A68AD8 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 0047C 80A68ADC 248401A0 */ addiu $a0, $a0, 0x01A0 ## $a0 = 000001A0 /* 00480 80A68AE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00484 80A68AE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $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 1564dabbee..531e67a2b9 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 @@ -48,7 +48,7 @@ glabel EnHorseLinkChild_Init /* 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 func_800A51E8 +/* 00350 80A69720 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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) 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 ae1a842056..d1fd73903a 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 @@ -16,7 +16,7 @@ glabel func_80A6988C /* 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 func_800A51E8 +/* 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) 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 d545c442cd..de90220082 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 @@ -173,7 +173,7 @@ glabel EnHorseNormal_Init /* 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 func_800A51E8 +/* 003E4 80A6B634 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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) @@ -246,7 +246,7 @@ glabel EnHorseNormal_Init /* 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 func_800A51E8 +/* 004F4 80A6B744 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 004F8 80A6B748 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) /* 004FC 80A6B74C 0C29B1AC */ jal func_80A6C6B0 /* 00500 80A6B750 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -292,7 +292,7 @@ glabel EnHorseNormal_Init /* 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 func_800A51E8 +/* 005A8 80A6B7F8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 005AC 80A6B7FC 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) /* 005B0 80A6B800 0C29B133 */ jal func_80A6C4CC /* 005B4 80A6B804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -306,7 +306,7 @@ glabel EnHorseNormal_Init /* 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 func_800A51E8 +/* 005DC 80A6B82C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 005E0 80A6B830 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) /* 005E4 80A6B834 1000000F */ beq $zero, $zero, .L80A6B874 /* 005E8 80A6B838 8602001C */ lh $v0, 0x001C($s0) ## 0000001C @@ -322,7 +322,7 @@ glabel EnHorseNormal_Init /* 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 func_800A51E8 +/* 00618 80A6B868 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 0061C 80A6B86C 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) /* 00620 80A6B870 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A6B874: 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 59992dae84..a451b06c2c 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 @@ -15,7 +15,7 @@ glabel func_80A6BBAC /* 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 func_800A51E8 +/* 00998 80A6BBE8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 0099C 80A6BBEC 24C401A0 */ addiu $a0, $a2, 0x01A0 ## $a0 = 000001A0 /* 009A0 80A6BBF0 8FBF0014 */ lw $ra, 0x0014($sp) /* 009A4 80A6BBF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 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 0864e59f66..46dbefd8ed 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 @@ -48,7 +48,7 @@ glabel EnHorseZelda_Init /* 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 func_800A51E8 +/* 002C8 80A6DB98 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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) 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 9a449fc28d..c0b2238574 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 @@ -14,7 +14,7 @@ glabel func_80A6DC7C /* 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 func_800A51E8 +/* 003E4 80A6DCB4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 003E8 80A6DCB8 24C401A0 */ addiu $a0, $a2, 0x01A0 ## $a0 = 000001A0 /* 003EC 80A6DCBC 8FBF0014 */ lw $ra, 0x0014($sp) /* 003F0 80A6DCC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s index 277e2bbfac..4cb5e7a0bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s @@ -27,7 +27,7 @@ glabel EnHs_Init /* 00068 80A6E408 8FA40044 */ lw $a0, 0x0044($sp) /* 0006C 80A6E40C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00070 80A6E410 24A505C0 */ addiu $a1, $a1, 0x05C0 ## $a1 = 060005C0 -/* 00074 80A6E414 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00074 80A6E414 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00078 80A6E418 8FA40034 */ lw $a0, 0x0034($sp) /* 0007C 80A6E41C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00080 80A6E420 AFA50034 */ sw $a1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s index d03943622b..6ef6ea98fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s @@ -27,7 +27,7 @@ glabel EnHs2_Init /* 00060 80A6F000 8FA40044 */ lw $a0, 0x0044($sp) /* 00064 80A6F004 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00068 80A6F008 24A505C0 */ addiu $a1, $a1, 0x05C0 ## $a1 = 060005C0 -/* 0006C 80A6F00C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0006C 80A6F00C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00070 80A6F010 8FA40034 */ lw $a0, 0x0034($sp) /* 00074 80A6F014 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00078 80A6F018 AFA50034 */ sw $a1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s index 88f1c11cac..5fdb009ae8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s @@ -45,7 +45,7 @@ glabel EnJj_Init /* 000A8 80A878A8 AFA50044 */ sw $a1, 0x0044($sp) /* 000AC 80A878AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 000B0 80A878B0 24A51F4C */ addiu $a1, $a1, 0x1F4C ## $a1 = 06001F4C -/* 000B4 80A878B4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 000B4 80A878B4 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 000B8 80A878B8 8FA40044 */ lw $a0, 0x0044($sp) /* 000BC 80A878BC A600030A */ sh $zero, 0x030A($s0) ## 0000030A /* 000C0 80A878C0 A200030E */ sb $zero, 0x030E($s0) ## 0000030E 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 701517328b..39fb113059 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 func_800A51E8 +/* 00074 80A88E84 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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_80AA6830.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s index 07f135400a..292be15a6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s @@ -6,7 +6,7 @@ glabel func_80AA6830 /* 007F0 80AA6840 24A541A8 */ addiu $a1, $a1, 0x41A8 ## $a1 = 060041A8 /* 007F4 80AA6844 AFA70018 */ sw $a3, 0x0018($sp) /* 007F8 80AA6848 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 007FC 80AA684C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 007FC 80AA684C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00800 80AA6850 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 00804 80AA6854 8FA70018 */ lw $a3, 0x0018($sp) /* 00808 80AA6858 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s index 66e403993f..4414085fd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s @@ -5,7 +5,7 @@ glabel func_80AA6898 /* 00854 80AA68A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00858 80AA68A8 24A5EBE4 */ addiu $a1, $a1, 0xEBE4 ## $a1 = 0600EBE4 /* 0085C 80AA68AC AFA60018 */ sw $a2, 0x0018($sp) -/* 00860 80AA68B0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00860 80AA68B0 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00864 80AA68B4 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C /* 00868 80AA68B8 8FA60018 */ lw $a2, 0x0018($sp) /* 0086C 80AA68BC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s index 0022229e87..fbaeab44ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s @@ -7,7 +7,7 @@ glabel func_80AA68FC /* 008C0 80AA6910 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008C4 80AA6914 24A541A8 */ addiu $a1, $a1, 0x41A8 ## $a1 = 060041A8 /* 008C8 80AA6918 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 008CC 80AA691C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 008CC 80AA691C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 008D0 80AA6920 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 008D4 80AA6924 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 008D8 80AA6928 24040028 */ addiu $a0, $zero, 0x0028 ## $a0 = 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s index 916efbfaaa..db431facbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s @@ -13,7 +13,7 @@ glabel func_80AA6AC8 /* 00AA0 80AA6AF0 468021A0 */ cvt.s.w $f6, $f4 /* 00AA4 80AA6AF4 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C /* 00AA8 80AA6AF8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 00AAC 80AA6AFC 0C029490 */ jal func_800A5240 +/* 00AAC 80AA6AFC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00AB0 80AA6B00 E7A60024 */ swc1 $f6, 0x0024($sp) /* 00AB4 80AA6B04 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00AB8 80AA6B08 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s index 45f8de0dec..0da0e1c2f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s @@ -5,7 +5,7 @@ glabel func_80AA6B80 /* 00B3C 80AA6B8C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B40 80AA6B90 24A52F10 */ addiu $a1, $a1, 0x2F10 ## $a1 = 06002F10 /* 00B44 80AA6B94 AFA60018 */ sw $a2, 0x0018($sp) -/* 00B48 80AA6B98 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00B48 80AA6B98 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00B4C 80AA6B9C 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C /* 00B50 80AA6BA0 8FA40018 */ lw $a0, 0x0018($sp) /* 00B54 80AA6BA4 0C00BE0A */ jal Audio_PlayActorSound2 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 9afc93bb1a..26d23347fc 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 @@ -5,7 +5,7 @@ glabel func_80AA6CC0 /* 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 func_800A51E8 +/* 00C88 80AA6CD8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00C8C 80AA6CDC 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C /* 00C90 80AA6CE0 8FA40018 */ lw $a0, 0x0018($sp) /* 00C94 80AA6CE4 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B 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 cefa551c6f..10cbc0bf71 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 @@ -5,7 +5,7 @@ glabel func_80AA6D20 /* 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 func_800A51E8 +/* 00CE8 80AA6D38 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00CEC 80AA6D3C 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C /* 00CF0 80AA6D40 8FA40018 */ lw $a0, 0x0018($sp) /* 00CF4 80AA6D44 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 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 d8cdf5eff7..2a3c798bb1 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 @@ -5,7 +5,7 @@ glabel func_80AA6E1C /* 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 func_800A51E8 +/* 00DE4 80AA6E34 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00DE8 80AA6E38 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C /* 00DEC 80AA6E3C 8FA40018 */ lw $a0, 0x0018($sp) /* 00DF0 80AA6E40 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s index 2aded4b6b3..5341c05208 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s @@ -6,7 +6,7 @@ glabel func_80AA6F04 /* 00EC4 80AA6F14 24A5BE58 */ addiu $a1, $a1, 0xBE58 ## $a1 = 0600BE58 /* 00EC8 80AA6F18 AFA70018 */ sw $a3, 0x0018($sp) /* 00ECC 80AA6F1C 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00ED0 80AA6F20 0C029490 */ jal func_800A5240 +/* 00ED0 80AA6F20 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00ED4 80AA6F24 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 00ED8 80AA6F28 8FA40018 */ lw $a0, 0x0018($sp) /* 00EDC 80AA6F2C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s index ae2a7d8cf1..ff5760c7fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s @@ -26,7 +26,7 @@ glabel func_80AA6F8C /* 00F98 80AA6FE8 24A51950 */ addiu $a1, $a1, 0x1950 ## $a1 = 06001950 /* 00F9C 80AA6FEC 11000003 */ beq $t0, $zero, .L80AA6FFC /* 00FA0 80AA6FF0 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 00FA4 80AA6FF4 0C0294A7 */ jal func_800A529C +/* 00FA4 80AA6FF4 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 00FA8 80AA6FF8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80AA6FFC: /* 00FAC 80AA6FFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s index 4ddede938c..f749e80465 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s @@ -27,7 +27,7 @@ glabel func_80AA77D0 /* 017DC 80AA782C 10400007 */ beq $v0, $zero, .L80AA784C /* 017E0 80AA7830 8FA4003C */ lw $a0, 0x003C($sp) /* 017E4 80AA7834 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 017E8 80AA7838 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 017E8 80AA7838 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 017EC 80AA783C 24A52F10 */ addiu $a1, $a1, 0x2F10 ## $a1 = 06002F10 /* 017F0 80AA7840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 017F4 80AA7844 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s index f5fd701f9a..d94c9f3575 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s @@ -23,7 +23,7 @@ glabel func_80AA7CAC /* 01CAC 80AA7CFC 10400007 */ beq $v0, $zero, .L80AA7D1C /* 01CB0 80AA7D00 8FA4003C */ lw $a0, 0x003C($sp) /* 01CB4 80AA7D04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01CB8 80AA7D08 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01CB8 80AA7D08 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 01CBC 80AA7D0C 24A52F10 */ addiu $a1, $a1, 0x2F10 ## $a1 = 06002F10 /* 01CC0 80AA7D10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01CC4 80AA7D14 0C00BE0A */ jal Audio_PlayActorSound2 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 3701229514..406b760ea0 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 @@ -14,7 +14,7 @@ glabel func_80AA8378 /* 02354 80AA83A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02358 80AA83A8 11C00011 */ beq $t6, $zero, .L80AA83F0 /* 0235C 80AA83AC 00000000 */ nop -/* 02360 80AA83B0 0C02947A */ jal func_800A51E8 +/* 02360 80AA83B0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s index 9f716340a5..2e2a060774 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s @@ -20,7 +20,7 @@ glabel func_80AA8E88 /* 02E7C 80AA8ECC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02E80 80AA8ED0 24A51950 */ addiu $a1, $a1, 0x1950 ## $a1 = 06001950 /* 02E84 80AA8ED4 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 02E88 80AA8ED8 0C029490 */ jal func_800A5240 +/* 02E88 80AA8ED8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02E8C 80AA8EDC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02E90 80AA8EE0 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 02E94 80AA8EE4 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 @@ -28,7 +28,7 @@ glabel func_80AA8E88 /* 02E9C 80AA8EEC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L80AA8EF0: /* 02EA0 80AA8EF0 24A5095C */ addiu $a1, $a1, 0x095C ## $a1 = 0000095C -/* 02EA4 80AA8EF4 0C029490 */ jal func_800A5240 +/* 02EA4 80AA8EF4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02EA8 80AA8EF8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02EAC 80AA8EFC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 02EB0 80AA8F00 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s index 62caa0e296..f7724eb865 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s @@ -20,7 +20,7 @@ glabel func_80AA8FC8 /* 02FBC 80AA900C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02FC0 80AA9010 24A516B4 */ addiu $a1, $a1, 0x16B4 ## $a1 = 060016B4 /* 02FC4 80AA9014 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 02FC8 80AA9018 0C029490 */ jal func_800A5240 +/* 02FC8 80AA9018 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02FCC 80AA901C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02FD0 80AA9020 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 02FD4 80AA9024 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 @@ -28,7 +28,7 @@ glabel func_80AA8FC8 /* 02FDC 80AA902C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L80AA9030: /* 02FE0 80AA9030 24A516B4 */ addiu $a1, $a1, 0x16B4 ## $a1 = 000016B4 -/* 02FE4 80AA9034 0C029490 */ jal func_800A5240 +/* 02FE4 80AA9034 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02FE8 80AA9038 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02FEC 80AA903C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 02FF0 80AA9040 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s index 7b101908da..f3f7eac070 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s @@ -33,7 +33,7 @@ glabel EnMk_Init /* 00078 80AAC978 8FA40044 */ lw $a0, 0x0044($sp) /* 0007C 80AAC97C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00080 80AAC980 24A50D88 */ addiu $a1, $a1, 0x0D88 ## $a1 = 06000D88 -/* 00084 80AAC984 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00084 80AAC984 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00088 80AAC988 8FA40034 */ lw $a0, 0x0034($sp) /* 0008C 80AAC98C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00090 80AAC990 AFA50034 */ sw $a1, 0x0034($sp) 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 a26e29edd0..88cd535d52 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 @@ -14,7 +14,7 @@ glabel func_80AC0AB4 /* 00484 80AC0AE4 A48F00B6 */ sh $t7, 0x00B6($a0) ## 000000B6 /* 00488 80AC0AE8 AFA60018 */ sw $a2, 0x0018($sp) /* 0048C 80AC0AEC 24A53C64 */ addiu $a1, $a1, 0x3C64 ## $a1 = 06003C64 -/* 00490 80AC0AF0 0C02947A */ jal func_800A51E8 +/* 00490 80AC0AF0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00494 80AC0AF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00498 80AC0AF8 8FA40018 */ lw $a0, 0x0018($sp) /* 0049C 80AC0AFC 0C2B0224 */ jal func_80AC0890 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 f679e80abb..037dffc8e7 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 @@ -4,7 +4,7 @@ glabel func_80AC0B24 /* 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 func_800A51E8 +/* 004D8 80AC0B38 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 004DC 80AC0B3C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 004E0 80AC0B40 8FAF0018 */ lw $t7, 0x0018($sp) /* 004E4 80AC0B44 3C0E80AC */ lui $t6, %hi(func_80AC10A8) ## $t6 = 80AC0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s index 32effd58b9..0850a802c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s @@ -5,7 +5,7 @@ glabel func_80AC0B60 /* 0050C 80AC0B6C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00510 80AC0B70 24A50DDC */ addiu $a1, $a1, 0x0DDC ## $a1 = 06000DDC /* 00514 80AC0B74 AFA60018 */ sw $a2, 0x0018($sp) -/* 00518 80AC0B78 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00518 80AC0B78 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 0051C 80AC0B7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00520 80AC0B80 8FA60018 */ lw $a2, 0x0018($sp) /* 00524 80AC0B84 3C0E80AC */ lui $t6, %hi(func_80AC12D8) ## $t6 = 80AC0000 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 199096f09d..99c6f5b6ea 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 @@ -6,7 +6,7 @@ glabel func_80AC0BC0 /* 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 func_800A51E8 +/* 0057C 80AC0BDC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s index fabb0278d1..cf7b506361 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s @@ -6,7 +6,7 @@ glabel func_80AC0CAC /* 0065C 80AC0CBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00660 80AC0CC0 24A53910 */ addiu $a1, $a1, 0x3910 ## $a1 = 06003910 /* 00664 80AC0CC4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00668 80AC0CC8 0C029490 */ jal func_800A5240 +/* 00668 80AC0CC8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0066C 80AC0CCC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00670 80AC0CD0 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B /* 00674 80AC0CD4 AFAE0010 */ sw $t6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s index 6136f2c931..a5b2a21602 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s @@ -6,7 +6,7 @@ glabel func_80AC0D34 /* 006E4 80AC0D44 24A508FC */ addiu $a1, $a1, 0x08FC ## $a1 = 060008FC /* 006E8 80AC0D48 AFA70018 */ sw $a3, 0x0018($sp) /* 006EC 80AC0D4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006F0 80AC0D50 0C029490 */ jal func_800A5240 +/* 006F0 80AC0D50 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 006F4 80AC0D54 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 006F8 80AC0D58 8FA70018 */ lw $a3, 0x0018($sp) /* 006FC 80AC0D5C 3C0E80AC */ lui $t6, %hi(func_80AC14A8) ## $t6 = 80AC0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s index 563905e637..598e691e2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s @@ -5,7 +5,7 @@ glabel func_80ACFEB0 /* 00A1C 80ACFEBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A20 80ACFEC0 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 /* 00A24 80ACFEC4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00A28 80ACFEC8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00A28 80ACFEC8 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00A2C 80ACFECC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00A30 80ACFED0 8FA40018 */ lw $a0, 0x0018($sp) /* 00A34 80ACFED4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s index 75d4b68dca..773637d52d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s @@ -5,7 +5,7 @@ glabel func_80AD0558 /* 010C4 80AD0564 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 010C8 80AD0568 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 /* 010CC 80AD056C AFA60018 */ sw $a2, 0x0018($sp) -/* 010D0 80AD0570 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 010D0 80AD0570 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 010D4 80AD0574 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 010D8 80AD0578 8FA40018 */ lw $a0, 0x0018($sp) /* 010DC 80AD057C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s index f203bf00d9..dc2c8aa614 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s @@ -5,7 +5,7 @@ glabel func_80AD0720 /* 0128C 80AD072C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01290 80AD0730 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 /* 01294 80AD0734 AFA60018 */ sw $a2, 0x0018($sp) -/* 01298 80AD0738 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01298 80AD0738 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 0129C 80AD073C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 012A0 80AD0740 8FA40018 */ lw $a0, 0x0018($sp) /* 012A4 80AD0744 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E 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 605a517c06..a861997d40 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 @@ -7,7 +7,7 @@ glabel func_80AD0B3C /* 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 func_800A51E8 +/* 016BC 80AD0B5C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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) 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 4ed4a46c28..3ec4709acf 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 @@ -5,7 +5,7 @@ glabel func_80AD0D3C /* 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 func_800A51E8 +/* 018B4 80AD0D54 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 018B8 80AD0D58 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 018BC 80AD0D5C 8FA40018 */ lw $a0, 0x0018($sp) /* 018C0 80AD0D60 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s index 914f05ae42..c59ca8a693 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s @@ -5,7 +5,7 @@ glabel func_80AD0F38 /* 01AA4 80AD0F44 AFBF001C */ sw $ra, 0x001C($sp) /* 01AA8 80AD0F48 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01AAC 80AD0F4C 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 -/* 01AB0 80AD0F50 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01AB0 80AD0F50 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 01AB4 80AD0F54 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01AB8 80AD0F58 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s index 696034e88a..02bd904111 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s @@ -6,7 +6,7 @@ glabel func_80AD1440 /* 01FB0 80AD1450 24A50844 */ addiu $a1, $a1, 0x0844 ## $a1 = 06000844 /* 01FB4 80AD1454 AFA70018 */ sw $a3, 0x0018($sp) /* 01FB8 80AD1458 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01FBC 80AD145C 0C029490 */ jal func_800A5240 +/* 01FBC 80AD145C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01FC0 80AD1460 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 01FC4 80AD1464 8FA40018 */ lw $a0, 0x0018($sp) /* 01FC8 80AD1468 3C01C110 */ lui $at, 0xC110 ## $at = C1100000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s index 22097a45c3..b0a7cb3f8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s @@ -17,7 +17,7 @@ glabel func_80AD17E8 /* 02384 80AD1824 15000011 */ bne $t0, $zero, .L80AD186C .L80AD1828: /* 02388 80AD1828 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0238C 80AD182C 0C029490 */ jal func_800A5240 +/* 0238C 80AD182C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02390 80AD1830 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02394 80AD1834 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 02398 80AD1838 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s index 2ff10dfba6..e54aa3ed3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s @@ -5,7 +5,7 @@ glabel func_80AD1AA8 /* 02614 80AD1AB4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02618 80AD1AB8 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 /* 0261C 80AD1ABC AFA60018 */ sw $a2, 0x0018($sp) -/* 02620 80AD1AC0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 02620 80AD1AC0 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 02624 80AD1AC4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02628 80AD1AC8 8FA40018 */ lw $a0, 0x0018($sp) /* 0262C 80AD1ACC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s index 67ea56f782..2b7de06751 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s @@ -14,7 +14,7 @@ glabel func_80AD2E64 /* 001E4 80AD2E94 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 /* 001E8 80AD2E98 AFA70020 */ sw $a3, 0x0020($sp) /* 001EC 80AD2E9C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001F0 80AD2EA0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 001F0 80AD2EA0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 001F4 80AD2EA4 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 001F8 80AD2EA8 8FA9001C */ lw $t1, 0x001C($sp) /* 001FC 80AD2EAC 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s index 70885b066b..e44a77ec59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s @@ -5,7 +5,7 @@ glabel func_80AD2FBC /* 00318 80AD2FC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0031C 80AD2FCC 24A50924 */ addiu $a1, $a1, 0x0924 ## $a1 = 06000924 /* 00320 80AD2FD0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00324 80AD2FD4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00324 80AD2FD4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00328 80AD2FD8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0032C 80AD2FDC 8FAF0018 */ lw $t7, 0x0018($sp) /* 00330 80AD2FE0 3C0E80AD */ lui $t6, %hi(func_80AD3194) ## $t6 = 80AD0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s index b8169112dd..83ac4ef496 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s @@ -6,7 +6,7 @@ glabel func_80AD2FFC /* 0035C 80AD300C 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 /* 00360 80AD3010 AFA70018 */ sw $a3, 0x0018($sp) /* 00364 80AD3014 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00368 80AD3018 0C029490 */ jal func_800A5240 +/* 00368 80AD3018 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0036C 80AD301C 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 00370 80AD3020 8FA40018 */ lw $a0, 0x0018($sp) /* 00374 80AD3024 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 0608685f10..bb4e1f22e5 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 @@ -5,7 +5,7 @@ glabel func_80AD3E2C /* 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 func_800A51E8 +/* 00344 80AD3E44 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00348 80AD3E48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0034C 80AD3E4C 8FA40018 */ lw $a0, 0x0018($sp) /* 00350 80AD3E50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s index 7dadf32356..b62075caec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s @@ -7,7 +7,7 @@ glabel func_80AD3F4C /* 00460 80AD3F60 24A50924 */ addiu $a1, $a1, 0x0924 ## $a1 = 06000924 /* 00464 80AD3F64 AFA60020 */ sw $a2, 0x0020($sp) /* 00468 80AD3F68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0046C 80AD3F6C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 0046C 80AD3F6C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00470 80AD3F70 AFAE001C */ sw $t6, 0x001C($sp) /* 00474 80AD3F74 8FA60020 */ lw $a2, 0x0020($sp) /* 00478 80AD3F78 90CF0255 */ lbu $t7, 0x0255($a2) ## 00000255 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s index 13beff3544..16762c276a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s @@ -6,7 +6,7 @@ glabel func_80AD3FF0 /* 00500 80AD4000 24A50608 */ addiu $a1, $a1, 0x0608 ## $a1 = 06000608 /* 00504 80AD4004 AFA70018 */ sw $a3, 0x0018($sp) /* 00508 80AD4008 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0050C 80AD400C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0050C 80AD400C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00510 80AD4010 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00514 80AD4014 8FA70018 */ lw $a3, 0x0018($sp) /* 00518 80AD4018 3C014140 */ lui $at, 0x4140 ## $at = 41400000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s index 3bfc48362c..79e5000bdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s @@ -6,7 +6,7 @@ glabel func_80AD4084 /* 00594 80AD4094 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00598 80AD4098 24A50454 */ addiu $a1, $a1, 0x0454 ## $a1 = 06000454 /* 0059C 80AD409C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005A0 80AD40A0 0C029490 */ jal func_800A5240 +/* 005A0 80AD40A0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 005A4 80AD40A4 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 005A8 80AD40A8 8E0E0280 */ lw $t6, 0x0280($s0) ## 00000280 /* 005AC 80AD40AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s index e5b1c13f06..9bedbe3d27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s @@ -6,7 +6,7 @@ glabel func_80AD4190 /* 006A0 80AD41A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006A4 80AD41A4 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 /* 006A8 80AD41A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006AC 80AD41AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 006AC 80AD41AC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 006B0 80AD41B0 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 006B4 80AD41B4 920F0255 */ lbu $t7, 0x0255($s0) ## 00000255 /* 006B8 80AD41B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s index fcbc56939e..c63f0560e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s @@ -6,7 +6,7 @@ glabel func_80AD9368 /* 003E8 80AD9378 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC /* 003EC 80AD937C AFA70018 */ sw $a3, 0x0018($sp) /* 003F0 80AD9380 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003F4 80AD9384 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 003F4 80AD9384 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 003F8 80AD9388 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 003FC 80AD938C 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 00400 80AD9390 0C01DF64 */ jal Math_Rand_S16Offset diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s index b92be2bd44..6c534f596b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s @@ -10,7 +10,7 @@ glabel func_80AD93C4 /* 00454 80AD93E4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 00458 80AD93E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0045C 80AD93EC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00460 80AD93F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00460 80AD93F0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00464 80AD93F4 AFA70018 */ sw $a3, 0x0018($sp) /* 00468 80AD93F8 8FA70018 */ lw $a3, 0x0018($sp) .L80AD93FC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s index 426b34a668..5f1e0575b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s @@ -14,7 +14,7 @@ glabel func_80AD944C .L80AD947C: /* 004EC 80AD947C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 004F0 80AD9480 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 004F4 80AD9484 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 004F4 80AD9484 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 004F8 80AD9488 AFA70018 */ sw $a3, 0x0018($sp) /* 004FC 80AD948C 8FA70018 */ lw $a3, 0x0018($sp) /* 00500 80AD9490 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s index 69bf91dc2f..ffd584a05c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s @@ -16,7 +16,7 @@ glabel func_80AD94E0 /* 00588 80AD9518 24A50114 */ addiu $a1, $a1, 0x0114 ## $a1 = 06000114 /* 0058C 80AD951C AFA70018 */ sw $a3, 0x0018($sp) /* 00590 80AD9520 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00594 80AD9524 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00594 80AD9524 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00598 80AD9528 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0059C 80AD952C 8FA70018 */ lw $a3, 0x0018($sp) .L80AD9530: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s index 69a4462cbd..b991adf58c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s @@ -6,7 +6,7 @@ glabel func_80AD9568 /* 005E8 80AD9578 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 005EC 80AD957C AFA70018 */ sw $a3, 0x0018($sp) /* 005F0 80AD9580 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005F4 80AD9584 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 005F4 80AD9584 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 005F8 80AD9588 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 005FC 80AD958C 8FA70018 */ lw $a3, 0x0018($sp) /* 00600 80AD9590 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s index 00f8847dec..59a111fe6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s @@ -6,7 +6,7 @@ glabel func_80AD95D8 /* 00658 80AD95E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0065C 80AD95EC 24A508C0 */ addiu $a1, $a1, 0x08C0 ## $a1 = 060008C0 /* 00660 80AD95F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00664 80AD95F4 0C029490 */ jal func_800A5240 +/* 00664 80AD95F4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00668 80AD95F8 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0066C 80AD95FC 8E0502B4 */ lw $a1, 0x02B4($s0) ## 000002B4 /* 00670 80AD9600 50A00011 */ beql $a1, $zero, .L80AD9648 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s index 2cbf07fa74..9b8e761b73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s @@ -6,7 +6,7 @@ glabel func_80AD96A4 /* 00724 80AD96B4 24A50A54 */ addiu $a1, $a1, 0x0A54 ## $a1 = 06000A54 /* 00728 80AD96B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0072C 80AD96BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00730 80AD96C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00730 80AD96C0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00734 80AD96C4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00738 80AD96C8 8FA70018 */ lw $a3, 0x0018($sp) /* 0073C 80AD96CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s index 1e3e59cb16..d6bcdb7cb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s @@ -93,7 +93,7 @@ glabel func_80AD9AA8 /* 00C54 80AD9BE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00C58 80AD9BE8 24A50680 */ addiu $a1, $a1, 0x0680 ## $a1 = 06000680 /* 00C5C 80AD9BEC AD300118 */ sw $s0, 0x0118($t1) ## 00000118 -/* 00C60 80AD9BF0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00C60 80AD9BF0 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00C64 80AD9BF4 ACF00118 */ sw $s0, 0x0118($a3) ## 00000118 /* 00C68 80AD9BF8 3C0B80AE */ lui $t3, %hi(func_80ADB2B8) ## $t3 = 80AE0000 /* 00C6C 80AD9BFC 240A00A0 */ addiu $t2, $zero, 0x00A0 ## $t2 = 000000A0 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 7fac6b77b8..e65f2aa11b 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 @@ -8,7 +8,7 @@ glabel func_80AD9D44 /* 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 func_800A51E8 +/* 00DD8 80AD9D68 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00DDC 80AD9D6C 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C /* 00DE0 80AD9D70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DE4 80AD9D74 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s index 047d9f546b..ec6f4fa85e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s @@ -7,7 +7,7 @@ glabel func_80AD9DF0 /* 00E74 80AD9E04 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C /* 00E78 80AD9E08 AFA70020 */ sw $a3, 0x0020($sp) /* 00E7C 80AD9E0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E80 80AD9E10 0C029490 */ jal func_800A5240 +/* 00E80 80AD9E10 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00E84 80AD9E14 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00E88 80AD9E18 8FA70020 */ lw $a3, 0x0020($sp) /* 00E8C 80AD9E1C 3C1980AE */ lui $t9, %hi(func_80ADB4B0) ## $t9 = 80AE0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s index bbd5604414..fc020d6bff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s @@ -6,7 +6,7 @@ glabel func_80AD9E60 /* 00EE0 80AD9E70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00EE4 80AD9E74 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 00EE8 80AD9E78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00EEC 80AD9E7C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00EEC 80AD9E7C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00EF0 80AD9E80 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00EF4 80AD9E84 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00EF8 80AD9E88 0C028800 */ jal SkelAnime_GetFrameCount diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s index a5a8f3a393..abe1739968 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s @@ -6,7 +6,7 @@ glabel func_80AD9F1C /* 00F9C 80AD9F2C 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 00FA0 80AD9F30 AFA70018 */ sw $a3, 0x0018($sp) /* 00FA4 80AD9F34 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FA8 80AD9F38 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00FA8 80AD9F38 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00FAC 80AD9F3C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00FB0 80AD9F40 8FA70018 */ lw $a3, 0x0018($sp) /* 00FB4 80AD9F44 3C0B80AE */ lui $t3, %hi(func_80ADB770) ## $t3 = 80AE0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s index 2491bdccdc..f8256d84c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s @@ -23,7 +23,7 @@ glabel func_80AD9F90 .L80AD9FE0: /* 01050 80AD9FE0 24C4014C */ addiu $a0, $a2, 0x014C ## $a0 = 0000014C /* 01054 80AD9FE4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 01058 80AD9FE8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01058 80AD9FE8 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 0105C 80AD9FEC AFA60018 */ sw $a2, 0x0018($sp) /* 01060 80AD9FF0 8FA60018 */ lw $a2, 0x0018($sp) /* 01064 80AD9FF4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s index ca857f145e..e3b63e6e0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s @@ -6,7 +6,7 @@ glabel func_80ADA028 /* 010A8 80ADA038 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC /* 010AC 80ADA03C AFA70018 */ sw $a3, 0x0018($sp) /* 010B0 80ADA040 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010B4 80ADA044 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 010B4 80ADA044 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 010B8 80ADA048 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 010BC 80ADA04C 8FA70018 */ lw $a3, 0x0018($sp) /* 010C0 80ADA050 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s index 44f6ddaec7..ef8cdec52a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s @@ -5,7 +5,7 @@ glabel func_80ADA25C /* 012D8 80ADA268 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 012DC 80ADA26C 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC /* 012E0 80ADA270 AFA70018 */ sw $a3, 0x0018($sp) -/* 012E4 80ADA274 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 012E4 80ADA274 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 012E8 80ADA278 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 012EC 80ADA27C 8FA40018 */ lw $a0, 0x0018($sp) /* 012F0 80ADA280 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s index 61cb945e46..31b4a976a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s @@ -7,7 +7,7 @@ glabel func_80ADA2BC /* 01340 80ADA2D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01344 80ADA2D4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 01348 80ADA2D8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0134C 80ADA2DC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0134C 80ADA2DC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01350 80ADA2E0 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01354 80ADA2E4 92020194 */ lbu $v0, 0x0194($s0) ## 00000194 /* 01358 80ADA2E8 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s index 4082cbfab9..6da4dec8d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s @@ -5,7 +5,7 @@ glabel func_80ADE114 /* 003D0 80ADE120 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 003D4 80ADE124 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 003D8 80ADE128 8DC5000C */ lw $a1, 0x000C($t6) ## 0000000C -/* 003DC 80ADE12C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 003DC 80ADE12C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 003E0 80ADE130 AFA60018 */ sw $a2, 0x0018($sp) /* 003E4 80ADE134 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 003E8 80ADE138 0C01DF64 */ jal Math_Rand_S16Offset diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s index 4f9e3ab8b3..fae3b0984a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s @@ -5,7 +5,7 @@ glabel func_80ADE16C /* 00428 80ADE178 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 0042C 80ADE17C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00430 80ADE180 8DC50010 */ lw $a1, 0x0010($t6) ## 00000010 -/* 00434 80ADE184 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00434 80ADE184 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00438 80ADE188 AFA60018 */ sw $a2, 0x0018($sp) /* 0043C 80ADE18C 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F /* 00440 80ADE190 0C01DF64 */ jal Math_Rand_S16Offset diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s index 298cfbf62e..844d04fb1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s @@ -5,7 +5,7 @@ glabel func_80ADE1BC /* 00478 80ADE1C8 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 0047C 80ADE1CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00480 80ADE1D0 8DC50010 */ lw $a1, 0x0010($t6) ## 00000010 -/* 00484 80ADE1D4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00484 80ADE1D4 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00488 80ADE1D8 AFA60018 */ sw $a2, 0x0018($sp) /* 0048C 80ADE1DC 8FA60018 */ lw $a2, 0x0018($sp) /* 00490 80ADE1E0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s index 1d520d24e3..c254edbc47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s @@ -10,12 +10,12 @@ glabel func_80ADE20C /* 004DC 80ADE22C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004E0 80ADE230 24A501A8 */ addiu $a1, $a1, 0x01A8 ## $a1 = 060001A8 /* 004E4 80ADE234 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004E8 80ADE238 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 004E8 80ADE238 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 004EC 80ADE23C 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 004F0 80ADE240 10000004 */ beq $zero, $zero, .L80ADE254 /* 004F4 80ADE244 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80ADE248: -/* 004F8 80ADE248 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 004F8 80ADE248 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 004FC 80ADE24C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00500 80ADE250 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80ADE254: 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 cfb5d38f42..24d840399c 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 @@ -10,12 +10,12 @@ glabel func_80ADE28C /* 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 func_800A5240 +/* 00568 80ADE2B8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0056C 80ADE2BC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 00570 80ADE2C0 10000004 */ beq $zero, $zero, .L80ADE2D4 /* 00574 80ADE2C4 8E0F02F8 */ lw $t7, 0x02F8($s0) ## 000002F8 .L80ADE2C8: -/* 00578 80ADE2C8 0C02947A */ jal func_800A51E8 +/* 00578 80ADE2C8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 0057C 80ADE2CC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00580 80ADE2D0 8E0F02F8 */ lw $t7, 0x02F8($s0) ## 000002F8 .L80ADE2D4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s index 825ceadcc1..b143528c9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s @@ -6,7 +6,7 @@ glabel func_80ADE368 /* 00628 80ADE378 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0062C 80ADE37C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00630 80ADE380 8DC50018 */ lw $a1, 0x0018($t6) ## 00000018 -/* 00634 80ADE384 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00634 80ADE384 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00638 80ADE388 AFA70018 */ sw $a3, 0x0018($sp) /* 0063C 80ADE38C 8FA70018 */ lw $a3, 0x0018($sp) /* 00640 80ADE390 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s index 8d1cdba9df..8b1053c4bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s @@ -13,7 +13,7 @@ glabel func_80ADE3DC /* 006B8 80ADE408 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006BC 80ADE40C 24A511C4 */ addiu $a1, $a1, 0x11C4 ## $a1 = 060011C4 /* 006C0 80ADE410 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006C4 80ADE414 0C0294A7 */ jal func_800A529C +/* 006C4 80ADE414 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 006C8 80ADE418 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 006CC 80ADE41C 3C1980AE */ lui $t9, %hi(func_80ADEF38) ## $t9 = 80AE0000 /* 006D0 80ADE420 2739EF38 */ addiu $t9, $t9, %lo(func_80ADEF38) ## $t9 = 80ADEF38 @@ -23,7 +23,7 @@ glabel func_80ADE3DC /* 006DC 80ADE42C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006E0 80ADE430 24A50FE4 */ addiu $a1, $a1, 0x0FE4 ## $a1 = 06000FE4 /* 006E4 80ADE434 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 006E8 80ADE438 0C0294A7 */ jal func_800A529C +/* 006E8 80ADE438 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 006EC 80ADE43C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 006F0 80ADE440 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 006F4 80ADE444 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 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 a60a3f2b53..791a65e234 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 @@ -5,7 +5,7 @@ glabel func_80ADE4C8 /* 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 func_800A51E8 +/* 00790 80ADE4E0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00794 80ADE4E4 AFA60018 */ sw $a2, 0x0018($sp) /* 00798 80ADE4E8 8FA60018 */ lw $a2, 0x0018($sp) /* 0079C 80ADE4EC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s index a87c7e8d7c..94393feab1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s @@ -5,7 +5,7 @@ glabel func_80ADE514 /* 007D0 80ADE520 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 007D4 80ADE524 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 007D8 80ADE528 8DC5000C */ lw $a1, 0x000C($t6) ## 0000000C -/* 007DC 80ADE52C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 007DC 80ADE52C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 007E0 80ADE530 AFA60018 */ sw $a2, 0x0018($sp) /* 007E4 80ADE534 8FA60018 */ lw $a2, 0x0018($sp) /* 007E8 80ADE538 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s index 7391a0f501..6944eda882 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s @@ -10,13 +10,13 @@ glabel func_80AE269C /* 002BC 80AE26BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002C0 80AE26C0 24A587D0 */ addiu $a1, $a1, 0x87D0 ## $a1 = 060087D0 /* 002C4 80AE26C4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 002C8 80AE26C8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 002C8 80AE26C8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 002CC 80AE26CC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 002D0 80AE26D0 10000004 */ beq $zero, $zero, .L80AE26E4 /* 002D4 80AE26D4 00000000 */ nop .L80AE26D8: /* 002D8 80AE26D8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 002DC 80AE26DC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 002DC 80AE26DC 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 002E0 80AE26E0 24A55D98 */ addiu $a1, $a1, 0x5D98 ## $a1 = 00005D98 .L80AE26E4: /* 002E4 80AE26E4 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s index 95e0cf8fe0..334a8163de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s @@ -45,12 +45,12 @@ glabel func_80AE2744 /* 003E0 80AE27E0 00000000 */ nop /* 003E4 80AE27E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003E8 80AE27E8 24A55D98 */ addiu $a1, $a1, 0x5D98 ## $a1 = 06005D98 -/* 003EC 80AE27EC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 003EC 80AE27EC 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 003F0 80AE27F0 8FA4002C */ lw $a0, 0x002C($sp) /* 003F4 80AE27F4 10000018 */ beq $zero, $zero, .L80AE2858 /* 003F8 80AE27F8 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 .L80AE27FC: -/* 003FC 80AE27FC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 003FC 80AE27FC 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00400 80AE2800 24A557AC */ addiu $a1, $a1, 0x57AC ## $a1 = 000057AC /* 00404 80AE2804 10000014 */ beq $zero, $zero, .L80AE2858 /* 00408 80AE2808 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 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 3f6934ba76..8a8b3109c9 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 @@ -5,7 +5,7 @@ glabel func_80AE33F0 /* 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 func_800A51E8 +/* 01008 80AE3408 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 0100C 80AE340C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01010 80AE3410 8FA40018 */ lw $a0, 0x0018($sp) /* 01014 80AE3414 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s index fc24bc2ccf..9172bcf72c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s @@ -28,7 +28,7 @@ glabel func_80AE3454 glabel L80AE34B4 /* 010B4 80AE34B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 010B8 80AE34B8 24A54268 */ addiu $a1, $a1, 0x4268 ## $a1 = 06004268 -/* 010BC 80AE34BC 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 010BC 80AE34BC 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 010C0 80AE34C0 8FA40034 */ lw $a0, 0x0034($sp) /* 010C4 80AE34C4 92090304 */ lbu $t1, 0x0304($s0) ## 00000304 /* 010C8 80AE34C8 8FA4004C */ lw $a0, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s index e9750e00c3..a31408d31d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s @@ -6,7 +6,7 @@ glabel func_80AE392C /* 0153C 80AE393C 24A58040 */ addiu $a1, $a1, 0x8040 ## $a1 = 06008040 /* 01540 80AE3940 AFA70018 */ sw $a3, 0x0018($sp) /* 01544 80AE3944 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01548 80AE3948 0C029490 */ jal func_800A5240 +/* 01548 80AE3948 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0154C 80AE394C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 01550 80AE3950 8FA40018 */ lw $a0, 0x0018($sp) /* 01554 80AE3954 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s index 351fcf2b37..b20236bc36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s @@ -6,7 +6,7 @@ glabel func_80AE3A8C /* 0169C 80AE3A9C 24A574F0 */ addiu $a1, $a1, 0x74F0 ## $a1 = 060074F0 /* 016A0 80AE3AA0 AFA70018 */ sw $a3, 0x0018($sp) /* 016A4 80AE3AA4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 016A8 80AE3AA8 0C029490 */ jal func_800A5240 +/* 016A8 80AE3AA8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 016AC 80AE3AAC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 016B0 80AE3AB0 8FA70018 */ lw $a3, 0x0018($sp) /* 016B4 80AE3AB4 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s index 348a5033ee..69a0bd49e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s @@ -6,7 +6,7 @@ glabel func_80AE3C20 /* 01830 80AE3C30 24A56E88 */ addiu $a1, $a1, 0x6E88 ## $a1 = 06006E88 /* 01834 80AE3C34 AFA70018 */ sw $a3, 0x0018($sp) /* 01838 80AE3C38 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 0183C 80AE3C3C 0C029490 */ jal func_800A5240 +/* 0183C 80AE3C3C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01840 80AE3C40 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 01844 80AE3C44 8FA40018 */ lw $a0, 0x0018($sp) /* 01848 80AE3C48 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s index c41530f71d..ced67613a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s @@ -6,7 +6,7 @@ glabel func_80AFA880 /* 00170 80AFA890 24A5139C */ addiu $a1, $a1, 0x139C ## $a1 = 0600139C /* 00174 80AFA894 AFA70018 */ sw $a3, 0x0018($sp) /* 00178 80AFA898 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0017C 80AFA89C 0C0294A7 */ jal func_800A529C +/* 0017C 80AFA89C 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 00180 80AFA8A0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00184 80AFA8A4 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 /* 00188 80AFA8A8 0C01DF64 */ jal Math_Rand_S16Offset diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s index ff4217e4d7..8b97b46f1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s @@ -5,7 +5,7 @@ glabel func_80AFA8E8 /* 001D4 80AFA8F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001D8 80AFA8F8 24A50BA0 */ addiu $a1, $a1, 0x0BA0 ## $a1 = 06000BA0 /* 001DC 80AFA8FC AFA60018 */ sw $a2, 0x0018($sp) -/* 001E0 80AFA900 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 001E0 80AFA900 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 001E4 80AFA904 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 001E8 80AFA908 8FA60018 */ lw $a2, 0x0018($sp) /* 001EC 80AFA90C 3C0F80B0 */ lui $t7, %hi(func_80AFACE0) ## $t7 = 80B00000 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 184ab5aa45..c5e92893a4 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 @@ -4,7 +4,7 @@ glabel func_80AFA930 /* 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 func_800A51E8 +/* 00224 80AFA944 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00228 80AFA948 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0022C 80AFA94C 8FAF0018 */ lw $t7, 0x0018($sp) /* 00230 80AFA950 3C0E80B0 */ lui $t6, %hi(func_80AFAE28) ## $t6 = 80B00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s index c4e3a01a1d..f827cee1b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s @@ -6,7 +6,7 @@ glabel func_80AFA96C /* 0025C 80AFA97C 24A54574 */ addiu $a1, $a1, 0x4574 ## $a1 = 06004574 /* 00260 80AFA980 AFA70018 */ sw $a3, 0x0018($sp) /* 00264 80AFA984 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00268 80AFA988 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00268 80AFA988 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0026C 80AFA98C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00270 80AFA990 8FA70018 */ lw $a3, 0x0018($sp) /* 00274 80AFA994 3C0E80B0 */ lui $t6, %hi(func_80AFAE28) ## $t6 = 80B00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s index c59506cbb0..0b6cc91f23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s @@ -5,7 +5,7 @@ glabel func_80AFA9D4 /* 002C0 80AFA9E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002C4 80AFA9E4 24A5039C */ addiu $a1, $a1, 0x039C ## $a1 = 0600039C /* 002C8 80AFA9E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002CC 80AFA9EC 0C029490 */ jal func_800A5240 +/* 002CC 80AFA9EC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 002D0 80AFA9F0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 002D4 80AFA9F4 8FA40018 */ lw $a0, 0x0018($sp) /* 002D8 80AFA9F8 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s index f48bcb8949..7314be8138 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s @@ -6,7 +6,7 @@ glabel func_80AFAA20 /* 00310 80AFAA30 24A50764 */ addiu $a1, $a1, 0x0764 ## $a1 = 06000764 /* 00314 80AFAA34 AFA70018 */ sw $a3, 0x0018($sp) /* 00318 80AFAA38 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0031C 80AFAA3C 0C029490 */ jal func_800A5240 +/* 0031C 80AFAA3C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00320 80AFAA40 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00324 80AFAA44 8FA40018 */ lw $a0, 0x0018($sp) /* 00328 80AFAA48 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s index 8980de9cb1..85871c7a29 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s @@ -6,7 +6,7 @@ glabel func_80AFCDF8 /* 00468 80AFCE08 24A51854 */ addiu $a1, $a1, 0x1854 ## $a1 = 06001854 /* 0046C 80AFCE0C AFA70018 */ sw $a3, 0x0018($sp) /* 00470 80AFCE10 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00474 80AFCE14 0C0294A7 */ jal func_800A529C +/* 00474 80AFCE14 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 00478 80AFCE18 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0047C 80AFCE1C 8FA40018 */ lw $a0, 0x0018($sp) /* 00480 80AFCE20 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s index 429b51c29f..cad6021a75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s @@ -6,7 +6,7 @@ glabel func_80AFD644 /* 00CB4 80AFD654 24A50D98 */ addiu $a1, $a1, 0x0D98 ## $a1 = 06000D98 /* 00CB8 80AFD658 AFA70018 */ sw $a3, 0x0018($sp) /* 00CBC 80AFD65C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00CC0 80AFD660 0C029490 */ jal func_800A5240 +/* 00CC0 80AFD660 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00CC4 80AFD664 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 00CC8 80AFD668 8FA70018 */ lw $a3, 0x0018($sp) /* 00CCC 80AFD66C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s index 564273449f..9ee1aa3368 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s @@ -7,7 +7,7 @@ glabel func_80AFD7B4 /* 00E28 80AFD7C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E2C 80AFD7CC 24A509DC */ addiu $a1, $a1, 0x09DC ## $a1 = 060009DC /* 00E30 80AFD7D0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E34 80AFD7D4 0C029490 */ jal func_800A5240 +/* 00E34 80AFD7D4 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00E38 80AFD7D8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 00E3C 80AFD7DC 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 /* 00E40 80AFD7E0 8602008A */ lh $v0, 0x008A($s0) ## 0000008A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s index fe58b3b9c0..3bf84c1862 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s @@ -38,7 +38,7 @@ glabel func_80B07734 /* 00284 80B077C4 8FA40034 */ lw $a0, 0x0034($sp) /* 00288 80B077C8 000E7880 */ sll $t7, $t6, 2 /* 0028C 80B077CC 00AF2821 */ addu $a1, $a1, $t7 -/* 00290 80B077D0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00290 80B077D0 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00294 80B077D4 8CA5B454 */ lw $a1, %lo(D_80B0B454)($a1) /* 00298 80B077D8 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 0029C 80B077DC 3C0880B1 */ lui $t0, %hi(D_80B0B484) ## $t0 = 80B10000 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 9999e226a7..b7d20e2cd1 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 func_800A51E8 +/* 00270 80B13D10 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 func_800A51E8 +/* 002AC 80B13D4C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 func_800A51E8 +/* 00378 80B13E18 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 func_800A51E8 +/* 003FC 80B13E9C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 func_800A51E8 +/* 00438 80B13ED8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 func_800A51E8 +/* 006F8 80B14198 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 func_800A51E8 +/* 0072C 80B141CC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 func_800A51E8 +/* 00774 80B14214 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 7c1608ad57..4e660aeb39 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 @@ -21,7 +21,7 @@ glabel func_80B14570 /* 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 func_800A51E8 +/* 00B28 80B145C8 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00B2C 80B145CC 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 00B30 80B145D0 8FA40018 */ lw $a0, 0x0018($sp) /* 00B34 80B145D4 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 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 ea61232af0..bc68413eb2 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 @@ -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 func_800A51E8 +/* 01144 80B14BE4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 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 6a5bdfd523..bf1047ce7d 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 @@ -9,7 +9,7 @@ glabel func_80B167C0 /* 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 func_800A51E8 +/* 02D44 80B167E4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02D48 80B167E8 8DC502E4 */ lw $a1, 0x02E4($t6) ## 000002E4 .L80B167EC: /* 02D4C 80B167EC 8FBF0014 */ lw $ra, 0x0014($sp) 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 3bef14eb9b..d8f5f4e6d4 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 @@ -9,7 +9,7 @@ glabel func_80B167FC /* 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 func_800A51E8 +/* 02D80 80B16820 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02D84 80B16824 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 /* 02D88 80B16828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02D8C 80B1682C 0C00BE0A */ jal Audio_PlayActorSound2 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 2061f8fb26..f40ad123c8 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 @@ -15,7 +15,7 @@ glabel func_80B16854 /* 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 func_800A51E8 +/* 02DEC 80B1688C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s index 4d4f685f4d..af52f03419 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s @@ -5,7 +5,7 @@ glabel func_8085FDD0 /* 0078C 8085FDDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00790 8085FDE0 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C /* 00794 8085FDE4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00798 8085FDE8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00798 8085FDE8 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 0079C 8085FDEC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 007A0 8085FDF0 8FA40018 */ lw $a0, 0x0018($sp) /* 007A4 8085FDF4 3C014060 */ lui $at, 0x4060 ## $at = 40600000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s index c62561092d..8e9d4754e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s @@ -5,7 +5,7 @@ glabel func_8085FF28 /* 008E4 8085FF34 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008E8 8085FF38 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C /* 008EC 8085FF3C AFA60018 */ sw $a2, 0x0018($sp) -/* 008F0 8085FF40 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 008F0 8085FF40 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 008F4 8085FF44 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 008F8 8085FF48 8FA40018 */ lw $a0, 0x0018($sp) /* 008FC 8085FF4C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s index 972d24f43d..0fa9c1b16a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s @@ -5,7 +5,7 @@ glabel func_80860068 /* 00A24 80860074 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A28 80860078 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C /* 00A2C 8086007C AFA60018 */ sw $a2, 0x0018($sp) -/* 00A30 80860080 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00A30 80860080 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00A34 80860084 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 00A38 80860088 8FA60018 */ lw $a2, 0x0018($sp) /* 00A3C 8086008C 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s index 523f46043a..6ee9557b1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s @@ -8,7 +8,7 @@ glabel func_80860318 /* 00CE0 80860330 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 00CE4 80860334 AFA40024 */ sw $a0, 0x0024($sp) /* 00CE8 80860338 24A5C438 */ addiu $a1, $a1, 0xC438 ## $a1 = 0600C438 -/* 00CEC 8086033C 0C0294A7 */ jal func_800A529C +/* 00CEC 8086033C 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 00CF0 80860340 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00CF4 80860344 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s index 75d46a7ea1..7f79c7c312 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s @@ -24,7 +24,7 @@ glabel func_80860438 /* 00E38 80860488 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00E3C 8086048C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00E40 80860490 24A581B4 */ addiu $a1, $a1, 0x81B4 ## $a1 = 060081B4 -/* 00E44 80860494 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00E44 80860494 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00E48 80860498 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 00E4C 8086049C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s index 7e393fd06c..a24e3dcd12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s @@ -5,7 +5,7 @@ glabel func_80860BDC /* 01598 80860BE8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0159C 80860BEC 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 /* 015A0 80860BF0 AFA60018 */ sw $a2, 0x0018($sp) -/* 015A4 80860BF4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 015A4 80860BF4 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 015A8 80860BF8 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 015AC 80860BFC 8FA40018 */ lw $a0, 0x0018($sp) /* 015B0 80860C00 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s index 5151d34318..036d24d348 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s @@ -5,7 +5,7 @@ glabel func_80860EC0 /* 0187C 80860ECC AFBF001C */ sw $ra, 0x001C($sp) /* 01880 80860ED0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01884 80860ED4 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 -/* 01888 80860ED8 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 01888 80860ED8 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 0188C 80860EDC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01890 80860EE0 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F /* 01894 80860EE4 0C03F66B */ jal Math_Rand_ZeroOne 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 fcc44027ef..7f2a377492 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 @@ -5,7 +5,7 @@ glabel func_80861418 /* 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 func_800A51E8 +/* 01DE0 80861430 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 01DE4 80861434 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01DE8 80861438 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 /* 01DEC 8086143C 0C03E291 */ jal func_800F8A44 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 307d013769..8db171c7b2 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 @@ -5,7 +5,7 @@ glabel func_808615A4 /* 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 func_800A51E8 +/* 01F6C 808615BC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 01F70 808615C0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01F74 808615C4 8FA40018 */ lw $a0, 0x0018($sp) /* 01F78 808615C8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 10078b2bc4..0b711d8807 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 @@ -5,7 +5,7 @@ glabel func_8086181C /* 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 func_800A51E8 +/* 021E4 80861834 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 021E8 80861838 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 021EC 8086183C 8FA40018 */ lw $a0, 0x0018($sp) /* 021F0 80861840 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 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 03b2fb86f6..0799adaceb 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 @@ -5,7 +5,7 @@ glabel func_8086194C /* 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 func_800A51E8 +/* 02314 80861964 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02318 80861968 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 0231C 8086196C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02320 80861970 0C00BE0A */ jal Audio_PlayActorSound2 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 d9ce008b2b..9d09ef9e80 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 @@ -5,7 +5,7 @@ glabel func_80861B94 /* 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 func_800A51E8 +/* 0255C 80861BAC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02560 80861BB0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02564 80861BB4 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 /* 02568 80861BB8 0C03E291 */ jal func_800F8A44 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 7d549111da..2050501ff8 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 @@ -14,7 +14,7 @@ glabel func_80861C40 /* 0261C 80861C6C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02620 80861C70 55C0000F */ bnel $t6, $zero, .L80861CB0 /* 02624 80861C74 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02628 80861C78 0C02947A */ jal func_800A51E8 +/* 02628 80861C78 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 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 81fbf0ae17..6a8f6a6b0f 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 @@ -5,7 +5,7 @@ glabel func_80861D50 /* 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 func_800A51E8 +/* 02718 80861D68 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 0271C 80861D6C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02720 80861D70 8FA40018 */ lw $a0, 0x0018($sp) /* 02724 80861D74 3C014160 */ lui $at, 0x4160 ## $at = 41600000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s index a0c2e4f81d..e2716898f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s @@ -6,7 +6,7 @@ glabel func_80862050 /* 02A10 80862060 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C /* 02A14 80862064 AFA70018 */ sw $a3, 0x0018($sp) /* 02A18 80862068 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02A1C 8086206C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02A1C 8086206C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 02A20 80862070 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02A24 80862074 8FA40018 */ lw $a0, 0x0018($sp) /* 02A28 80862078 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 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 2459139401..d453e12f6c 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 @@ -5,7 +5,7 @@ glabel func_80862154 /* 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 func_800A51E8 +/* 02B1C 8086216C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02B20 80862170 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02B24 80862174 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02B28 80862178 0C00BE0A */ jal Audio_PlayActorSound2 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 49525d17fa..7dd014689a 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 @@ -5,7 +5,7 @@ glabel func_80862398 /* 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 func_800A51E8 +/* 02D60 808623B0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 02D64 808623B4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02D68 808623B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02D6C 808623BC 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s index 1c0a674b65..5e240cd73b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s @@ -41,7 +41,7 @@ glabel func_80862578 /* 02FC0 80862610 A60907E0 */ sh $t1, 0x07E0($s0) ## 000007E0 .L80862614: /* 02FC4 80862614 24A58604 */ addiu $a1, $a1, 0x8604 ## $a1 = 06008604 -/* 02FC8 80862618 0C0294A7 */ jal func_800A529C +/* 02FC8 80862618 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 02FCC 8086261C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80862620: /* 02FD0 80862620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s index 09d1df6519..1753eb4fbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s @@ -16,7 +16,7 @@ glabel func_808627C4 .L808627FC: /* 031AC 808627FC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 031B0 80862800 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 -/* 031B4 80862804 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 031B4 80862804 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 031B8 80862808 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 031BC 8086280C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 031C0 80862810 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 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 3c969feca0..3a395c9f79 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 @@ -6,7 +6,7 @@ glabel func_80862FA8 /* 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 func_800A51E8 +/* 03974 80862FC4 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 03978 80862FC8 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 0397C 80862FCC 8FA40018 */ lw $a0, 0x0018($sp) /* 03980 80862FD0 0C00BE0A */ jal Audio_PlayActorSound2 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 cc69c284e5..598493a8d4 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 @@ -6,7 +6,7 @@ glabel func_808630F0 /* 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 func_800A51E8 +/* 03ABC 8086310C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 03AC0 80863110 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 03AC4 80863114 8FA40018 */ lw $a0, 0x0018($sp) /* 03AC8 80863118 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s index ed0d469333..c181117ede 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s @@ -7,7 +7,7 @@ glabel func_80864158 /* 04B1C 8086416C 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 /* 04B20 80864170 AFA70018 */ sw $a3, 0x0018($sp) /* 04B24 80864174 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 04B28 80864178 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 04B28 80864178 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 04B2C 8086417C 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 04B30 80864180 8FA70018 */ lw $a3, 0x0018($sp) /* 04B34 80864184 C7A4001C */ lwc1 $f4, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s index 7bec3646d9..e3183fc796 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s @@ -6,7 +6,7 @@ glabel func_80B18C5C /* 001EC 80B18C6C 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 /* 001F0 80B18C70 AFA70018 */ sw $a3, 0x0018($sp) /* 001F4 80B18C74 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001F8 80B18C78 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 001F8 80B18C78 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 001FC 80B18C7C 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 00200 80B18C80 8FA70018 */ lw $a3, 0x0018($sp) /* 00204 80B18C84 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 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 f7cfbef141..995571090c 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 @@ -5,7 +5,7 @@ glabel func_80B18E08 /* 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 func_800A51E8 +/* 003A0 80B18E20 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 003A4 80B18E24 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 003A8 80B18E28 8FA60018 */ lw $a2, 0x0018($sp) /* 003AC 80B18E2C 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 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 94a1656b1e..404ea2b307 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 func_800A51E8 +/* 006BC 80B1913C 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 006C0 80B19140 8CA5B634 */ lw $a1, %lo(D_80B1B634)($a1) .L80B19144: /* 006C4 80B19144 860202E0 */ lh $v0, 0x02E0($s0) ## 000002E0 @@ -308,7 +308,7 @@ glabel func_80B18E7C /* 0083C 80B192BC 8FA40038 */ lw $a0, 0x0038($sp) /* 00840 80B192C0 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 000012E4 /* 00844 80B192C4 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 00848 80B192C8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00848 80B192C8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0084C 80B192CC AFA70040 */ sw $a3, 0x0040($sp) /* 00850 80B192D0 8FA70040 */ lw $a3, 0x0040($sp) /* 00854 80B192D4 8E0A02EC */ lw $t2, 0x02EC($s0) ## 000002EC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s index e5d0a5ef10..b7993270f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s @@ -5,7 +5,7 @@ glabel func_80B19524 /* 00AB0 80B19530 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AB4 80B19534 24A50A14 */ addiu $a1, $a1, 0x0A14 ## $a1 = 06000A14 /* 00AB8 80B19538 AFA60018 */ sw $a2, 0x0018($sp) -/* 00ABC 80B1953C 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00ABC 80B1953C 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00AC0 80B19540 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00AC4 80B19544 8FA60018 */ lw $a2, 0x0018($sp) /* 00AC8 80B19548 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s index 46aef46900..8056a61399 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s @@ -5,7 +5,7 @@ glabel func_80B1985C /* 00DE8 80B19868 AFBF001C */ sw $ra, 0x001C($sp) /* 00DEC 80B1986C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DF0 80B19870 24A50C70 */ addiu $a1, $a1, 0x0C70 ## $a1 = 06000C70 -/* 00DF4 80B19874 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00DF4 80B19874 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00DF8 80B19878 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00DFC 80B1987C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00E00 80B19880 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s index eb3cd0919c..381b3e8aac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s @@ -8,7 +8,7 @@ glabel func_80B19E28 /* 013C0 80B19E40 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 /* 013C4 80B19E44 AFA70018 */ sw $a3, 0x0018($sp) /* 013C8 80B19E48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 013CC 80B19E4C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 013CC 80B19E4C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 013D0 80B19E50 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 013D4 80B19E54 8FA40018 */ lw $a0, 0x0018($sp) /* 013D8 80B19E58 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s index b80a03a9a1..f32218ddb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s @@ -6,7 +6,7 @@ glabel func_80B1A76C /* 01CFC 80B1A77C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01D00 80B1A780 24A50A14 */ addiu $a1, $a1, 0x0A14 ## $a1 = 06000A14 /* 01D04 80B1A784 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D08 80B1A788 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 01D08 80B1A788 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 01D0C 80B1A78C 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 01D10 80B1A790 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D14 80B1A794 0C00BE0A */ jal Audio_PlayActorSound2 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 27c13e901c..50538e25f3 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 func_800A51E8 +/* 000BC 80B22DAC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 func_800A51E8 +/* 00120 80B22E10 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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_Tr/EnTr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s index b545ee13ec..cd6cd78bb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s @@ -51,7 +51,7 @@ glabel EnTr_Update /* 00F7C 80B23C6C 240539B0 */ addiu $a1, $zero, 0x39B0 ## $a1 = 000039B0 /* 00F80 80B23C70 8FA40034 */ lw $a0, 0x0034($sp) .L80B23C74: -/* 00F84 80B23C74 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00F84 80B23C74 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00F88 80B23C78 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 /* 00F8C 80B23C7C 1000001B */ beq $zero, $zero, .L80B23CEC /* 00F90 80B23C80 00000000 */ nop @@ -83,7 +83,7 @@ glabel EnTr_Update /* 00FEC 80B23CDC 10000003 */ beq $zero, $zero, .L80B23CEC /* 00FF0 80B23CE0 00000000 */ nop .L80B23CE4: -/* 00FF4 80B23CE4 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00FF4 80B23CE4 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00FF8 80B23CE8 8FA40034 */ lw $a0, 0x0034($sp) .L80B23CEC: /* 00FFC 80B23CEC 10000004 */ beq $zero, $zero, .L80B23D00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s index 2d44891c69..a60e8b6656 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s @@ -37,7 +37,7 @@ glabel func_80B23820 /* 00BB4 80B238A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00BB8 80B238A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00BBC 80B238AC 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 -/* 00BC0 80B238B0 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00BC0 80B238B0 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00BC4 80B238B4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00BC8 80B238B8 3C053B44 */ lui $a1, 0x3B44 ## $a1 = 3B440000 /* 00BCC 80B238BC AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s index 3063fdfd2b..74579a4091 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s @@ -45,7 +45,7 @@ glabel func_80B23A88 /* 00E3C 80B23B2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E40 80B23B30 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E44 80B23B34 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 -/* 00E48 80B23B38 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00E48 80B23B38 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00E4C 80B23B3C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00E50 80B23B40 10000019 */ beq $zero, $zero, .L80B23BA8 /* 00E54 80B23B44 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 @@ -62,7 +62,7 @@ glabel func_80B23A88 /* 00E78 80B23B68 AFA70024 */ sw $a3, 0x0024($sp) /* 00E7C 80B23B6C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E80 80B23B70 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 -/* 00E84 80B23B74 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00E84 80B23B74 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00E88 80B23B78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00E8C 80B23B7C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 00E90 80B23B80 8FA70024 */ lw $a3, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s index 848b71cc8c..6e18e388ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s @@ -5,7 +5,7 @@ glabel func_80B26878 /* 001D4 80B26884 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001D8 80B26888 24A514AC */ addiu $a1, $a1, 0x14AC ## $a1 = 060014AC /* 001DC 80B2688C AFA60018 */ sw $a2, 0x0018($sp) -/* 001E0 80B26890 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 001E0 80B26890 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 001E4 80B26894 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 001E8 80B26898 8FA60018 */ lw $a2, 0x0018($sp) /* 001EC 80B2689C 3C1880B2 */ lui $t8, %hi(func_80B27098) ## $t8 = 80B20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s index 2e421fca59..a2547da818 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s @@ -6,7 +6,7 @@ glabel func_80B268FC /* 0025C 80B2690C 24A50710 */ addiu $a1, $a1, 0x0710 ## $a1 = 06000710 /* 00260 80B26910 AFA70090 */ sw $a3, 0x0090($sp) /* 00264 80B26914 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00268 80B26918 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00268 80B26918 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0026C 80B2691C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00270 80B26920 8FA70090 */ lw $a3, 0x0090($sp) /* 00274 80B26924 27A2003C */ addiu $v0, $sp, 0x003C ## $v0 = FFFFFFAC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s index d17c29e4a6..b04d97ccf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s @@ -6,7 +6,7 @@ glabel func_80B26B4C /* 004AC 80B26B5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004B0 80B26B60 24A50854 */ addiu $a1, $a1, 0x0854 ## $a1 = 06000854 /* 004B4 80B26B64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004B8 80B26B68 0C029490 */ jal func_800A5240 +/* 004B8 80B26B68 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 004BC 80B26B6C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 004C0 80B26B70 240E001E */ addiu $t6, $zero, 0x001E ## $t6 = 0000001E /* 004C4 80B26B74 AFAE0010 */ sw $t6, 0x0010($sp) 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 47e061d0e1..dd9c293201 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 @@ -4,7 +4,7 @@ glabel func_80B26BBC /* 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 func_800A51E8 +/* 00520 80B26BD0 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 00524 80B26BD4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00528 80B26BD8 8FAF0018 */ lw $t7, 0x0018($sp) /* 0052C 80B26BDC 3C0E80B2 */ lui $t6, %hi(func_80B2742C) ## $t6 = 80B20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s index f23ceb364a..3f05806422 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s @@ -6,7 +6,7 @@ glabel func_80B26D54 /* 006B4 80B26D64 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006B8 80B26D68 24A50710 */ addiu $a1, $a1, 0x0710 ## $a1 = 06000710 /* 006BC 80B26D6C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006C0 80B26D70 0C029490 */ jal func_800A5240 +/* 006C0 80B26D70 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 006C4 80B26D74 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 006C8 80B26D78 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 006CC 80B26D7C 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s index 0c119b80d2..ffb7dc7f89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s @@ -6,7 +6,7 @@ glabel func_80B26E40 /* 007A0 80B26E50 24A514AC */ addiu $a1, $a1, 0x14AC ## $a1 = 060014AC /* 007A4 80B26E54 AFA70018 */ sw $a3, 0x0018($sp) /* 007A8 80B26E58 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007AC 80B26E5C 0C029490 */ jal func_800A5240 +/* 007AC 80B26E5C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 007B0 80B26E60 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 007B4 80B26E64 8FA70018 */ lw $a3, 0x0018($sp) /* 007B8 80B26E68 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s index 3ed8e03846..2704e1aa2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s @@ -74,13 +74,13 @@ glabel func_80B2A300 /* 00210 80B2A410 14410005 */ bne $v0, $at, .L80B2A428 /* 00214 80B2A414 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 .L80B2A418: -/* 00218 80B2A418 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00218 80B2A418 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 0021C 80B2A41C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00220 80B2A420 10000005 */ beq $zero, $zero, .L80B2A438 /* 00224 80B2A424 8FBF002C */ lw $ra, 0x002C($sp) .L80B2A428: /* 00228 80B2A428 02002025 */ or $a0, $s0, $zero ## $a0 = 00000330 -/* 0022C 80B2A42C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 0022C 80B2A42C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00230 80B2A430 8FA50044 */ lw $a1, 0x0044($sp) /* 00234 80B2A434 8FBF002C */ lw $ra, 0x002C($sp) .L80B2A438: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s index 95b6471018..ed9df84e84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s @@ -29,7 +29,7 @@ glabel func_80B2A448 /* 002B4 80B2A4B4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 002B8 80B2A4B8 01215021 */ addu $t2, $t1, $at /* 002BC 80B2A4BC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 002C0 80B2A4C0 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 002C0 80B2A4C0 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 002C4 80B2A4C4 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 /* 002C8 80B2A4C8 8FBF0024 */ lw $ra, 0x0024($sp) /* 002CC 80B2A4CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s index 5d7c9ea554..1e78e521bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s @@ -27,12 +27,12 @@ glabel func_80B2A4D8 /* 0033C 80B2A53C 10610006 */ beq $v1, $at, .L80B2A558 /* 00340 80B2A540 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00344 80B2A544 25040198 */ addiu $a0, $t0, 0x0198 ## $a0 = 00000198 -/* 00348 80B2A548 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00348 80B2A548 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 0034C 80B2A54C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 /* 00350 80B2A550 10000004 */ beq $zero, $zero, .L80B2A564 /* 00354 80B2A554 8FBF0014 */ lw $ra, 0x0014($sp) .L80B2A558: -/* 00358 80B2A558 0C0294A7 */ jal func_800A529C +/* 00358 80B2A558 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 0035C 80B2A55C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00360 80B2A560 8FBF0014 */ lw $ra, 0x0014($sp) .L80B2A564: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s index d9e2d23b96..88ba0293ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s @@ -285,7 +285,7 @@ glabel func_80B2A75C /* 00940 80B2AB40 24A52928 */ addiu $a1, $a1, 0x2928 ## $a1 = 06002928 /* 00944 80B2AB44 10AD01D1 */ beq $a1, $t5, .L80B2B28C /* 00948 80B2AB48 8FA40040 */ lw $a0, 0x0040($sp) -/* 0094C 80B2AB4C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 0094C 80B2AB4C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00950 80B2AB50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00954 80B2AB54 100001CE */ beq $zero, $zero, .L80B2B290 /* 00958 80B2AB58 8FBF003C */ lw $ra, 0x003C($sp) @@ -295,7 +295,7 @@ glabel func_80B2A75C /* 00964 80B2AB64 24A54AA4 */ addiu $a1, $a1, 0x4AA4 ## $a1 = 06004AA4 /* 00968 80B2AB68 10AE01C8 */ beq $a1, $t6, .L80B2B28C /* 0096C 80B2AB6C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00970 80B2AB70 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00970 80B2AB70 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00974 80B2AB74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00978 80B2AB78 100001C5 */ beq $zero, $zero, .L80B2B290 /* 0097C 80B2AB7C 8FBF003C */ lw $ra, 0x003C($sp) @@ -312,7 +312,7 @@ glabel func_80B2A75C /* 009A4 80B2ABA4 24A51D28 */ addiu $a1, $a1, 0x1D28 ## $a1 = 06001D28 /* 009A8 80B2ABA8 10B901B8 */ beq $a1, $t9, .L80B2B28C /* 009AC 80B2ABAC 8FA40040 */ lw $a0, 0x0040($sp) -/* 009B0 80B2ABB0 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 009B0 80B2ABB0 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 009B4 80B2ABB4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 009B8 80B2ABB8 100001B5 */ beq $zero, $zero, .L80B2B290 /* 009BC 80B2ABBC 8FBF003C */ lw $ra, 0x003C($sp) @@ -322,7 +322,7 @@ glabel func_80B2A75C /* 009C8 80B2ABC8 24A53858 */ addiu $a1, $a1, 0x3858 ## $a1 = 06003858 /* 009CC 80B2ABCC 10AA01AF */ beq $a1, $t2, .L80B2B28C /* 009D0 80B2ABD0 8FA40040 */ lw $a0, 0x0040($sp) -/* 009D4 80B2ABD4 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 009D4 80B2ABD4 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 009D8 80B2ABD8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 009DC 80B2ABDC 100001AC */ beq $zero, $zero, .L80B2B290 /* 009E0 80B2ABE0 8FBF003C */ lw $ra, 0x003C($sp) @@ -343,7 +343,7 @@ glabel L80B2AC10 /* 00A14 80B2AC14 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A18 80B2AC18 8FA40040 */ lw $a0, 0x0040($sp) /* 00A1C 80B2AC1C 24A50F54 */ addiu $a1, $a1, 0x0F54 ## $a1 = 06000F54 -/* 00A20 80B2AC20 0C029490 */ jal func_800A5240 +/* 00A20 80B2AC20 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00A24 80B2AC24 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A28 80B2AC28 920D01E5 */ lbu $t5, 0x01E5($s0) ## 000001E5 /* 00A2C 80B2AC2C 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 @@ -354,7 +354,7 @@ glabel L80B2AC38 /* 00A3C 80B2AC3C 8FA40040 */ lw $a0, 0x0040($sp) /* 00A40 80B2AC40 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A44 80B2AC44 24A514F4 */ addiu $a1, $a1, 0x14F4 ## $a1 = 060014F4 -/* 00A48 80B2AC48 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00A48 80B2AC48 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00A4C 80B2AC4C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A50 80B2AC50 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 00A54 80B2AC54 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 @@ -366,7 +366,7 @@ glabel L80B2AC60 /* 00A68 80B2AC68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A6C 80B2AC6C 8FA40040 */ lw $a0, 0x0040($sp) /* 00A70 80B2AC70 24A508A0 */ addiu $a1, $a1, 0x08A0 ## $a1 = 060008A0 -/* 00A74 80B2AC74 0C029490 */ jal func_800A5240 +/* 00A74 80B2AC74 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00A78 80B2AC78 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A7C 80B2AC7C 921901E5 */ lbu $t9, 0x01E5($s0) ## 000001E5 /* 00A80 80B2AC80 272A0001 */ addiu $t2, $t9, 0x0001 ## $t2 = 00000001 @@ -377,7 +377,7 @@ glabel L80B2AC8C /* 00A90 80B2AC90 8FA40040 */ lw $a0, 0x0040($sp) /* 00A94 80B2AC94 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A98 80B2AC98 24A50BC8 */ addiu $a1, $a1, 0x0BC8 ## $a1 = 06000BC8 -/* 00A9C 80B2AC9C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00A9C 80B2AC9C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00AA0 80B2ACA0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00AA4 80B2ACA4 920B01E5 */ lbu $t3, 0x01E5($s0) ## 000001E5 /* 00AA8 80B2ACA8 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 @@ -389,7 +389,7 @@ glabel L80B2ACB4 /* 00ABC 80B2ACBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AC0 80B2ACC0 8FA40040 */ lw $a0, 0x0040($sp) /* 00AC4 80B2ACC4 24A514F4 */ addiu $a1, $a1, 0x14F4 ## $a1 = 060014F4 -/* 00AC8 80B2ACC8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00AC8 80B2ACC8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00ACC 80B2ACCC 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 /* 00AD0 80B2ACD0 920D01E5 */ lbu $t5, 0x01E5($s0) ## 000001E5 /* 00AD4 80B2ACD4 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 @@ -401,7 +401,7 @@ glabel L80B2ACE0 /* 00AE8 80B2ACE8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AEC 80B2ACEC 24A52928 */ addiu $a1, $a1, 0x2928 ## $a1 = 06002928 /* 00AF0 80B2ACF0 8FA40040 */ lw $a0, 0x0040($sp) -/* 00AF4 80B2ACF4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00AF4 80B2ACF4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00AF8 80B2ACF8 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 /* 00AFC 80B2ACFC 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 00B00 80B2AD00 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 @@ -417,7 +417,7 @@ glabel L80B2AD0C /* 00B20 80B2AD20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B24 80B2AD24 24A505B4 */ addiu $a1, $a1, 0x05B4 ## $a1 = 060005B4 /* 00B28 80B2AD28 8FA40040 */ lw $a0, 0x0040($sp) -/* 00B2C 80B2AD2C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00B2C 80B2AD2C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00B30 80B2AD30 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00B34 80B2AD34 921901E5 */ lbu $t9, 0x01E5($s0) ## 000001E5 /* 00B38 80B2AD38 272A0001 */ addiu $t2, $t9, 0x0001 ## $t2 = 00000001 @@ -434,7 +434,7 @@ glabel L80B2AD44 /* 00B5C 80B2AD5C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 00B60 80B2AD60 1481014A */ bne $a0, $at, .L80B2B28C /* 00B64 80B2AD64 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 00B68 80B2AD68 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00B68 80B2AD68 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00B6C 80B2AD6C 8FA40040 */ lw $a0, 0x0040($sp) /* 00B70 80B2AD70 10000147 */ beq $zero, $zero, .L80B2B290 /* 00B74 80B2AD74 8FBF003C */ lw $ra, 0x003C($sp) @@ -521,7 +521,7 @@ glabel L80B2AD44 /* 00CA0 80B2AEA0 24A52574 */ addiu $a1, $a1, 0x2574 ## $a1 = 06002574 /* 00CA4 80B2AEA4 10AA00F9 */ beq $a1, $t2, .L80B2B28C /* 00CA8 80B2AEA8 8FA40040 */ lw $a0, 0x0040($sp) -/* 00CAC 80B2AEAC 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00CAC 80B2AEAC 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00CB0 80B2AEB0 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 00CB4 80B2AEB4 920B01E5 */ lbu $t3, 0x01E5($s0) ## 000001E5 /* 00CB8 80B2AEB8 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 @@ -543,7 +543,7 @@ glabel L80B2AD44 /* 00CF4 80B2AEF4 24A529CC */ addiu $a1, $a1, 0x29CC ## $a1 = 060029CC /* 00CF8 80B2AEF8 10AF00E4 */ beq $a1, $t7, .L80B2B28C /* 00CFC 80B2AEFC 8FA40040 */ lw $a0, 0x0040($sp) -/* 00D00 80B2AF00 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00D00 80B2AF00 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00D04 80B2AF04 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00D08 80B2AF08 921801E5 */ lbu $t8, 0x01E5($s0) ## 000001E5 /* 00D0C 80B2AF0C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 @@ -580,7 +580,7 @@ glabel L80B2AD44 /* 00D80 80B2AF80 24A51410 */ addiu $a1, $a1, 0x1410 ## $a1 = 06001410 /* 00D84 80B2AF84 10AE00C1 */ beq $a1, $t6, .L80B2B28C /* 00D88 80B2AF88 8FA40040 */ lw $a0, 0x0040($sp) -/* 00D8C 80B2AF8C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00D8C 80B2AF8C 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00D90 80B2AF90 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 00D94 80B2AF94 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 00D98 80B2AF98 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 @@ -602,7 +602,7 @@ glabel L80B2AD44 /* 00DD4 80B2AFD4 24A50450 */ addiu $a1, $a1, 0x0450 ## $a1 = 06000450 /* 00DD8 80B2AFD8 10AB00AC */ beq $a1, $t3, .L80B2B28C /* 00DDC 80B2AFDC 8FA40040 */ lw $a0, 0x0040($sp) -/* 00DE0 80B2AFE0 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00DE0 80B2AFE0 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00DE4 80B2AFE4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00DE8 80B2AFE8 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 /* 00DEC 80B2AFEC 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 @@ -628,7 +628,7 @@ glabel L80B2AD44 /* 00E34 80B2B034 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E38 80B2B038 24A5504C */ addiu $a1, $a1, 0x504C ## $a1 = 0600504C /* 00E3C 80B2B03C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00E40 80B2B040 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00E40 80B2B040 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00E44 80B2B044 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E48 80B2B048 920E01E5 */ lbu $t6, 0x01E5($s0) ## 000001E5 /* 00E4C 80B2B04C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 @@ -643,7 +643,7 @@ glabel L80B2AD44 /* 00E6C 80B2B06C 8FA40040 */ lw $a0, 0x0040($sp) /* 00E70 80B2B070 57210087 */ bnel $t9, $at, .L80B2B290 /* 00E74 80B2B074 8FBF003C */ lw $ra, 0x003C($sp) -/* 00E78 80B2B078 0C029490 */ jal func_800A5240 +/* 00E78 80B2B078 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00E7C 80B2B07C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00E80 80B2B080 920A01E5 */ lbu $t2, 0x01E5($s0) ## 000001E5 /* 00E84 80B2B084 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 @@ -654,7 +654,7 @@ glabel L80B2AD44 /* 00E94 80B2B094 8FA40040 */ lw $a0, 0x0040($sp) /* 00E98 80B2B098 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E9C 80B2B09C 24A548FC */ addiu $a1, $a1, 0x48FC ## $a1 = 060048FC -/* 00EA0 80B2B0A0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00EA0 80B2B0A0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00EA4 80B2B0A4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00EA8 80B2B0A8 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 /* 00EAC 80B2B0AC 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 @@ -695,7 +695,7 @@ glabel L80B2AD44 /* 00F2C 80B2B12C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F30 80B2B130 24A54534 */ addiu $a1, $a1, 0x4534 ## $a1 = 06004534 /* 00F34 80B2B134 8FA40040 */ lw $a0, 0x0040($sp) -/* 00F38 80B2B138 0C029490 */ jal func_800A5240 +/* 00F38 80B2B138 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00F3C 80B2B13C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00F40 80B2B140 920A01E5 */ lbu $t2, 0x01E5($s0) ## 000001E5 /* 00F44 80B2B144 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 @@ -706,7 +706,7 @@ glabel L80B2AD44 /* 00F54 80B2B154 8FA40040 */ lw $a0, 0x0040($sp) /* 00F58 80B2B158 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F5C 80B2B15C 24A548B0 */ addiu $a1, $a1, 0x48B0 ## $a1 = 060048B0 -/* 00F60 80B2B160 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00F60 80B2B160 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00F64 80B2B164 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00F68 80B2B168 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 /* 00F6C 80B2B16C 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 @@ -741,7 +741,7 @@ glabel L80B2AD44 /* 00FD8 80B2B1D8 1701002C */ bne $t8, $at, .L80B2B28C /* 00FDC 80B2B1DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00FE0 80B2B1E0 24A550A8 */ addiu $a1, $a1, 0x50A8 ## $a1 = 060050A8 -/* 00FE4 80B2B1E4 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackSpeed +/* 00FE4 80B2B1E4 0C0294E1 */ jal SkelAnime_ChangeAnimationPlaybackRepeat /* 00FE8 80B2B1E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FEC 80B2B1EC 921901E5 */ lbu $t9, 0x01E5($s0) ## 000001E5 /* 00FF0 80B2B1F0 272A0001 */ addiu $t2, $t9, 0x0001 ## $t2 = 00000001 @@ -756,7 +756,7 @@ glabel L80B2AD44 /* 01010 80B2B210 8FA40040 */ lw $a0, 0x0040($sp) /* 01014 80B2B214 5581001E */ bnel $t4, $at, .L80B2B290 /* 01018 80B2B218 8FBF003C */ lw $ra, 0x003C($sp) -/* 0101C 80B2B21C 0C029490 */ jal func_800A5240 +/* 0101C 80B2B21C 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01020 80B2B220 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 01024 80B2B224 920D01E5 */ lbu $t5, 0x01E5($s0) ## 000001E5 /* 01028 80B2B228 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 @@ -767,7 +767,7 @@ glabel L80B2AD44 /* 01038 80B2B238 8FA40040 */ lw $a0, 0x0040($sp) /* 0103C 80B2B23C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01040 80B2B240 24A53D84 */ addiu $a1, $a1, 0x3D84 ## $a1 = 06003D84 -/* 01044 80B2B244 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01044 80B2B244 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01048 80B2B248 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0104C 80B2B24C 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 01050 80B2B250 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 @@ -781,7 +781,7 @@ glabel L80B2AD44 /* 0106C 80B2B26C 8FA40040 */ lw $a0, 0x0040($sp) /* 01070 80B2B270 552A0007 */ bnel $t1, $t2, .L80B2B290 /* 01074 80B2B274 8FBF003C */ lw $ra, 0x003C($sp) -/* 01078 80B2B278 0C029490 */ jal func_800A5240 +/* 01078 80B2B278 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 0107C 80B2B27C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01080 80B2B280 920B01E5 */ lbu $t3, 0x01E5($s0) ## 000001E5 /* 01084 80B2B284 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s index 4e9ba388b7..b22a8a1e2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s @@ -18,7 +18,7 @@ glabel func_80B32384 /* 00130 80B323C0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00134 80B323C4 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 00138 80B323C8 46083280 */ add.s $f10, $f6, $f8 -/* 0013C 80B323CC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0013C 80B323CC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00140 80B323D0 E4EA027C */ swc1 $f10, 0x027C($a3) ## 0000027C /* 00144 80B323D4 8FA70018 */ lw $a3, 0x0018($sp) /* 00148 80B323D8 3C014020 */ lui $at, 0x4020 ## $at = 40200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s index 3e0ca38788..7290c9b583 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s @@ -6,7 +6,7 @@ glabel func_80B32434 /* 001B4 80B32444 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 001B8 80B32448 AFA70018 */ sw $a3, 0x0018($sp) /* 001BC 80B3244C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001C0 80B32450 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 001C0 80B32450 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 001C4 80B32454 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 001C8 80B32458 8FA70018 */ lw $a3, 0x0018($sp) /* 001CC 80B3245C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s index 12a6532829..df79a373b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s @@ -6,7 +6,7 @@ glabel func_80B32724 /* 004A4 80B32734 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004A8 80B32738 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 004AC 80B3273C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004B0 80B32740 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 004B0 80B32740 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 004B4 80B32744 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 004B8 80B32748 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 /* 004BC 80B3274C A60E0194 */ sh $t6, 0x0194($s0) ## 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s index 3f8c435bbc..0b8f29636a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s @@ -6,7 +6,7 @@ glabel func_80B3455C /* 008BC 80B3456C 24A5A4AC */ addiu $a1, $a1, 0xA4AC ## $a1 = 0600A4AC /* 008C0 80B34570 AFA70018 */ sw $a3, 0x0018($sp) /* 008C4 80B34574 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 008C8 80B34578 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 008C8 80B34578 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 008CC 80B3457C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 008D0 80B34580 8FA70018 */ lw $a3, 0x0018($sp) /* 008D4 80B34584 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s index eb1a0c31f1..aad8c6c1e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s @@ -6,7 +6,7 @@ glabel func_80B34CFC /* 0105C 80B34D0C 24A598C8 */ addiu $a1, $a1, 0x98C8 ## $a1 = 060098C8 /* 01060 80B34D10 AFA70018 */ sw $a3, 0x0018($sp) /* 01064 80B34D14 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01068 80B34D18 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01068 80B34D18 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0106C 80B34D1C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 01070 80B34D20 8FA40018 */ lw $a0, 0x0018($sp) /* 01074 80B34D24 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A 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 41087fdfa3..25f22961c3 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 @@ -5,7 +5,7 @@ glabel func_80B35540 /* 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 func_800A51E8 +/* 018A8 80B35558 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 018AC 80B3555C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 018B0 80B35560 8FA40018 */ lw $a0, 0x0018($sp) /* 018B4 80B35564 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s index b174293724..42ba21b6a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s @@ -6,7 +6,7 @@ glabel func_80B35B94 /* 01EF4 80B35BA4 24A54AD0 */ addiu $a1, $a1, 0x4AD0 ## $a1 = 06004AD0 /* 01EF8 80B35BA8 AFA70018 */ sw $a3, 0x0018($sp) /* 01EFC 80B35BAC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01F00 80B35BB0 0C029490 */ jal func_800A5240 +/* 01F00 80B35BB0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01F04 80B35BB4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01F08 80B35BB8 8FA40018 */ lw $a0, 0x0018($sp) /* 01F0C 80B35BBC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s index c16e8661af..c69519f7a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s @@ -19,7 +19,7 @@ glabel func_80B35D18 /* 020A4 80B35D54 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 020A8 80B35D58 24A59B20 */ addiu $a1, $a1, 0x9B20 ## $a1 = 06009B20 /* 020AC 80B35D5C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 020B0 80B35D60 0C0294A7 */ jal func_800A529C +/* 020B0 80B35D60 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 020B4 80B35D64 24E40188 */ addiu $a0, $a3, 0x0188 ## $a0 = 00000188 /* 020B8 80B35D68 8FA40018 */ lw $a0, 0x0018($sp) /* 020BC 80B35D6C 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s index 2365da0609..0aff87f45e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s @@ -6,7 +6,7 @@ glabel func_80B35E4C /* 021AC 80B35E5C 24A59B20 */ addiu $a1, $a1, 0x9B20 ## $a1 = 06009B20 /* 021B0 80B35E60 AFA70018 */ sw $a3, 0x0018($sp) /* 021B4 80B35E64 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 021B8 80B35E68 0C029490 */ jal func_800A5240 +/* 021B8 80B35E68 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 021BC 80B35E6C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 021C0 80B35E70 8FA70018 */ lw $a3, 0x0018($sp) /* 021C4 80B35E74 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s index 8819d8af72..4c34583780 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s @@ -6,7 +6,7 @@ glabel func_80B36C8C /* 02FEC 80B36C9C 24A55430 */ addiu $a1, $a1, 0x5430 ## $a1 = 06005430 /* 02FF0 80B36CA0 AFA70018 */ sw $a3, 0x0018($sp) /* 02FF4 80B36CA4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02FF8 80B36CA8 0C029490 */ jal func_800A5240 +/* 02FF8 80B36CA8 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 02FFC 80B36CAC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 03000 80B36CB0 8FA70018 */ lw $a3, 0x0018($sp) /* 03004 80B36CB4 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s index 3a2f6eaf6c..041b848069 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s @@ -7,7 +7,7 @@ glabel func_80B456B4 /* 01678 80B456C8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0167C 80B456CC 24A58138 */ addiu $a1, $a1, 0x8138 ## $a1 = 06008138 /* 01680 80B456D0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01684 80B456D4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01684 80B456D4 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01688 80B456D8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 0168C 80B456DC 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 01690 80B456E0 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s index cd8fae9d21..0251a53b4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s @@ -6,7 +6,7 @@ glabel func_80B4604C /* 0200C 80B4605C 24A58138 */ addiu $a1, $a1, 0x8138 ## $a1 = 06008138 /* 02010 80B46060 AFA70018 */ sw $a3, 0x0018($sp) /* 02014 80B46064 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02018 80B46068 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 02018 80B46068 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0201C 80B4606C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02020 80B46070 8FA40018 */ lw $a0, 0x0018($sp) /* 02024 80B46074 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s index 99f753eb3f..fb1a9da2a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s @@ -27,7 +27,7 @@ glabel func_80B462E4 .L80B46348: /* 022F8 80B46348 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 022FC 80B4634C 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 -/* 02300 80B46350 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 02300 80B46350 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 02304 80B46354 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02308 80B46358 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 0230C 80B4635C 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s index 9c49e4b93e..b4225a6c5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s @@ -39,7 +39,7 @@ glabel func_80B47050 /* 03084 80B470D4 A4E803F6 */ sh $t0, 0x03F6($a3) ## 000003F6 .L80B470D8: /* 03088 80B470D8 44061000 */ mfc1 $a2, $f2 -/* 0308C 80B470DC 0C0294A7 */ jal func_800A529C +/* 0308C 80B470DC 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 03090 80B470E0 AFA70018 */ sw $a3, 0x0018($sp) /* 03094 80B470E4 8FA70018 */ lw $a3, 0x0018($sp) .L80B470E8: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s index 82e44a159a..ffbb1026ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s @@ -7,7 +7,7 @@ glabel func_80B474E4 /* 034A8 80B474F8 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) /* 034AC 80B474FC AFA70018 */ sw $a3, 0x0018($sp) /* 034B0 80B47500 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 034B4 80B47504 0C029490 */ jal func_800A5240 +/* 034B4 80B47504 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 034B8 80B47508 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 034BC 80B4750C 8FA40018 */ lw $a0, 0x0018($sp) /* 034C0 80B47510 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 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 05883445b3..0cbd6866a0 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 @@ -7,7 +7,7 @@ glabel func_80B4779C /* 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 func_800A51E8 +/* 0376C 80B477BC 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s index a9385b30dc..8424a19a04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s @@ -286,7 +286,7 @@ glabel func_80B4781C /* 03BE0 80B47C30 3C0580B5 */ lui $a1, %hi(D_80B4A280) ## $a1 = 80B50000 /* 03BE4 80B47C34 00AC2821 */ addu $a1, $a1, $t4 /* 03BE8 80B47C38 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) -/* 03BEC 80B47C3C 0C0294A7 */ jal func_800A529C +/* 03BEC 80B47C3C 0C0294A7 */ jal SkelAnime_ChangeAnimationPlaybackStop /* 03BF0 80B47C40 8FA60070 */ lw $a2, 0x0070($sp) .L80B47C44: /* 03BF4 80B47C44 0C02927F */ jal SkelAnime_FrameUpdateMatrix 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 ef33346224..0d75de3b12 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 @@ -6,7 +6,7 @@ glabel func_80B47C64 /* 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 func_800A51E8 +/* 03C30 80B47C80 0C02947A */ jal SkelAnimeChangeAnimationDefaultStop /* 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 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s index c9ce1b34ab..13d14c2f1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s @@ -27,7 +27,7 @@ glabel func_80B483E4 .L80B48448: /* 043F8 80B48448 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 043FC 80B4844C 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 -/* 04400 80B48450 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 04400 80B48450 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 04404 80B48454 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04408 80B48458 8FAF0034 */ lw $t7, 0x0034($sp) /* 0440C 80B4845C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s index ea5802dcf9..e5b48abc48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s @@ -7,7 +7,7 @@ glabel func_80B49B60 /* 05B24 80B49B74 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 /* 05B28 80B49B78 AFA70018 */ sw $a3, 0x0018($sp) /* 05B2C 80B49B7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05B30 80B49B80 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 05B30 80B49B80 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 05B34 80B49B84 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 05B38 80B49B88 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s index 66d4c336fe..8eac5ba866 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s @@ -6,7 +6,7 @@ glabel func_80B62B04 /* 00154 80B62B14 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00158 80B62B18 24A5E8A0 */ addiu $a1, $a1, 0xE8A0 ## $a1 = 0600E8A0 /* 0015C 80B62B1C AFA60018 */ sw $a2, 0x0018($sp) -/* 00160 80B62B20 0C0294BE */ jal SkelAnime_ChangeAnimationDefault +/* 00160 80B62B20 0C0294BE */ jal SkelAnime_ChangeAnimationDefaultRepeat /* 00164 80B62B24 24840250 */ addiu $a0, $a0, 0x0250 ## $a0 = 00000250 /* 00168 80B62B28 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 0016C 80B62B2C 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s index 7643494135..a6fa026336 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s @@ -604,7 +604,7 @@ glabel L80B632DC /* 00A44 80B63404 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A48 80B63408 24A5DDB8 */ addiu $a1, $a1, 0xDDB8 ## $a1 = 0600DDB8 /* 00A4C 80B6340C 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 -/* 00A50 80B63410 0C029490 */ jal func_800A5240 +/* 00A50 80B63410 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 00A54 80B63414 3C06C100 */ lui $a2, 0xC100 ## $a2 = C1000000 /* 00A58 80B63418 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00A5C 80B6341C A20F014C */ sb $t7, 0x014C($s0) ## 0000014C @@ -1161,7 +1161,7 @@ glabel L80B63988 /* 0121C 80B63BDC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01220 80B63BE0 002C0821 */ addu $at, $at, $t4 /* 01224 80B63BE4 A42B0AFA */ sh $t3, 0x0AFA($at) ## 00010AFA -/* 01228 80B63BE8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01228 80B63BE8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0122C 80B63BEC A60D01CA */ sh $t5, 0x01CA($s0) ## 000001CA /* 01230 80B63BF0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 01234 80B63BF4 240F004B */ addiu $t7, $zero, 0x004B ## $t7 = 0000004B diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s index 1dfaa9d4b5..bc6c223642 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s @@ -17,7 +17,7 @@ glabel func_80B63D84 /* 01400 80B63DC0 24840250 */ addiu $a0, $a0, 0x0250 ## $a0 = 00000250 /* 01404 80B63DC4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01408 80B63DC8 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 0140C 80B63DCC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0140C 80B63DCC 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01410 80B63DD0 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC /* 01414 80B63DD4 3C0880B6 */ lui $t0, %hi(func_80B6404C) ## $t0 = 80B60000 /* 01418 80B63DD8 2508404C */ addiu $t0, $t0, %lo(func_80B6404C) ## $t0 = 80B6404C diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s index 0997f1bdd0..aefad149ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s @@ -97,7 +97,7 @@ glabel func_80B6404C /* 017E4 80B641A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 017E8 80B641A8 24A5B4C8 */ addiu $a1, $a1, 0xB4C8 ## $a1 = 0600B4C8 /* 017EC 80B641AC 8FA40044 */ lw $a0, 0x0044($sp) -/* 017F0 80B641B0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 017F0 80B641B0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 017F4 80B641B4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 017F8 80B641B8 240B8000 */ addiu $t3, $zero, 0x8000 ## $t3 = FFFF8000 /* 017FC 80B641BC 1000001E */ beq $zero, $zero, .L80B64238 diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s index 023c87d9d0..be8580f20b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s @@ -35,7 +35,7 @@ glabel func_80B6424C /* 01904 80B642C4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01908 80B642C8 24A5C65C */ addiu $a1, $a1, 0xC65C ## $a1 = 0600C65C /* 0190C 80B642CC 8FA40044 */ lw $a0, 0x0044($sp) -/* 01910 80B642D0 0C029490 */ jal func_800A5240 +/* 01910 80B642D0 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01914 80B642D4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80B642D8: /* 01918 80B642D8 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 @@ -167,7 +167,7 @@ glabel func_80B6424C /* 01ACC 80B6448C 8FA40044 */ lw $a0, 0x0044($sp) /* 01AD0 80B64490 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01AD4 80B64494 24A5B9D0 */ addiu $a1, $a1, 0xB9D0 ## $a1 = 0600B9D0 -/* 01AD8 80B64498 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01AD8 80B64498 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01ADC 80B6449C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01AE0 80B644A0 860301D6 */ lh $v1, 0x01D6($s0) ## 000001D6 .L80B644A4: @@ -182,7 +182,7 @@ glabel func_80B6424C /* 01B00 80B644C0 8FA40044 */ lw $a0, 0x0044($sp) /* 01B04 80B644C4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01B08 80B644C8 24A5CB1C */ addiu $a1, $a1, 0xCB1C ## $a1 = 0600CB1C -/* 01B0C 80B644CC 0C029490 */ jal func_800A5240 +/* 01B0C 80B644CC 0C029490 */ jal SkelAnime_ChangeAnimationTransitionStop /* 01B10 80B644D0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01B14 80B644D4 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 01B18 80B644D8 A209014C */ sb $t1, 0x014C($s0) ## 0000014C @@ -359,7 +359,7 @@ glabel func_80B6424C /* 01D7C 80B6473C A60B01D4 */ sh $t3, 0x01D4($s0) ## 000001D4 /* 01D80 80B64740 AE0C01FC */ sw $t4, 0x01FC($s0) ## 000001FC /* 01D84 80B64744 44060000 */ mfc1 $a2, $f0 -/* 01D88 80B64748 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01D88 80B64748 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01D8C 80B6474C 8FA40044 */ lw $a0, 0x0044($sp) /* 01D90 80B64750 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 /* 01D94 80B64754 A20D014C */ sb $t5, 0x014C($s0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s index b90b47e405..502547bc4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s @@ -207,7 +207,7 @@ glabel func_80B6476C /* 02090 80B64A50 AE0D01FC */ sw $t5, 0x01FC($s0) ## 000001FC /* 02094 80B64A54 44060000 */ mfc1 $a2, $f0 /* 02098 80B64A58 8FA4004C */ lw $a0, 0x004C($sp) -/* 0209C 80B64A5C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0209C 80B64A5C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 020A0 80B64A60 AFA20050 */ sw $v0, 0x0050($sp) /* 020A4 80B64A64 8FA20050 */ lw $v0, 0x0050($sp) /* 020A8 80B64A68 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s index 1a26a72311..8f4bad596e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s @@ -76,7 +76,7 @@ glabel Fishing_Init /* 00CB8 80B6A658 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00CBC 80B6A65C 24A5453C */ addiu $a1, $a1, 0x453C ## $a1 = 0600453C /* 00CC0 80B6A660 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 -/* 00CC4 80B6A664 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 00CC4 80B6A664 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 00CC8 80B6A668 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00CCC 80B6A66C 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 00CD0 80B6A670 44812000 */ mtc1 $at, $f4 ## $f4 = 160.00 @@ -527,7 +527,7 @@ glabel Fishing_Init /* 0131C 80B6ACBC AFA00018 */ sw $zero, 0x0018($sp) /* 01320 80B6ACC0 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 /* 01324 80B6ACC4 02202825 */ or $a1, $s1, $zero ## $a1 = 0600007C -/* 01328 80B6ACC8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 01328 80B6ACC8 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0132C 80B6ACCC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01330 80B6ACD0 10000010 */ beq $zero, $zero, .L80B6AD14 /* 01334 80B6ACD4 00000000 */ nop @@ -545,7 +545,7 @@ glabel Fishing_Init /* 01360 80B6AD00 AFA00018 */ sw $zero, 0x0018($sp) /* 01364 80B6AD04 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 /* 01368 80B6AD08 02202825 */ or $a1, $s1, $zero ## $a1 = 0600CFE0 -/* 0136C 80B6AD0C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0136C 80B6AD0C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 01370 80B6AD10 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80B6AD14: /* 01374 80B6AD14 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s index 695aa5c295..8716d31c67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s @@ -4027,7 +4027,7 @@ glabel L80B748A0 /* 0B5B0 80B74F50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0B5B4 80B74F54 24A5007C */ addiu $a1, $a1, 0x007C ## $a1 = 0600007C /* 0B5B8 80B74F58 8FA4004C */ lw $a0, 0x004C($sp) -/* 0B5BC 80B74F5C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0B5BC 80B74F5C 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0B5C0 80B74F60 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0B5C4 80B74F64 10000011 */ beq $zero, $zero, .L80B74FAC /* 0B5C8 80B74F68 3C014402 */ lui $at, 0x4402 ## $at = 44020000 @@ -4045,7 +4045,7 @@ glabel L80B748A0 /* 0B5F4 80B74F94 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0B5F8 80B74F98 24A5CFE0 */ addiu $a1, $a1, 0xCFE0 ## $a1 = 0600CFE0 /* 0B5FC 80B74F9C 8FA4004C */ lw $a0, 0x004C($sp) -/* 0B600 80B74FA0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRate +/* 0B600 80B74FA0 0C0294D3 */ jal SkelAnime_ChangeAnimationTransitionRepeat /* 0B604 80B74FA4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0B608 80B74FA8 3C014402 */ lui $at, 0x4402 ## $at = 44020000 .L80B74FAC: diff --git a/include/functions.h b/include/functions.h index 12e36c1a5a..4696a562d2 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1207,12 +1207,12 @@ 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 func_800A51E8(SkelAnime* skelAnime, AnimationHeader* animationseg); -void func_800A5240(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 transitionRate); -void func_800A529C(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed); -void SkelAnime_ChangeAnimationDefault(SkelAnime* skelAnime, AnimationHeader* animationseg); -void SkelAnime_ChangeAnimationTransitionRate(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 transitionRate); -void SkelAnime_ChangeAnimationPlaybackSpeed(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed); +void SkelAnimeChangeAnimationDefaultStop(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 func_800A5428(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* index); void func_800A54FC(SkelAnime* skelAnime, Vec3f* pos, s16 angle); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 49870ef410..e055cd356c 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1310,7 +1310,7 @@ void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHead } if (animationSeg != NULL) { - SkelAnime_ChangeAnimationDefault(skelAnime, animationSeg); + SkelAnime_ChangeAnimationDefaultRepeat(skelAnime, animationSeg); } } @@ -1344,7 +1344,7 @@ void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHe } if (animationSeg != NULL) { - SkelAnime_ChangeAnimationDefault(skelAnime, animationSeg); + SkelAnime_ChangeAnimationDefaultRepeat(skelAnime, animationSeg); } } @@ -1367,7 +1367,7 @@ void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, Skeleton } if (animationSeg != NULL) { - SkelAnime_ChangeAnimationDefault(skelAnime, animationSeg); + SkelAnime_ChangeAnimationDefaultRepeat(skelAnime, animationSeg); } } @@ -1565,35 +1565,35 @@ void SkelAnime_ChangeAnimationImpl(SkelAnime* skelAnime, AnimationHeader* animat } void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed, f32 frame, - f32 frameCount, u8 unk1, f32 transitionRate) { - SkelAnime_ChangeAnimationImpl(skelAnime, animationSeg, playbackSpeed, frame, frameCount, unk1, transitionRate, 0); + f32 frameCount, u8 mode, f32 transitionRate) { + SkelAnime_ChangeAnimationImpl(skelAnime, animationSeg, playbackSpeed, frame, frameCount, mode, transitionRate, 0); } - -void func_800A51E8(SkelAnime* skelAnime, AnimationHeader* animationSeg) { +//SkelAnimeChangeAnimationDefaultStop +void SkelAnimeChangeAnimationDefaultStop(SkelAnime* skelAnime, AnimationHeader* animationSeg) { SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, 0.0f); } -void func_800A5240(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { +void SkelAnime_ChangeAnimationTransitionStop(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, transitionRate); } - -void func_800A529C(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed) { +//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); } -void SkelAnime_ChangeAnimationDefault(SkelAnime* skelAnime, AnimationHeader* animationSeg) { +void SkelAnime_ChangeAnimationDefaultRepeat(SkelAnime* skelAnime, AnimationHeader* animationSeg) { SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 0, 0.0f); } -void SkelAnime_ChangeAnimationTransitionRate(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { +void SkelAnime_ChangeAnimationTransitionRepeat(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0.0f, 0.0f, 0, transitionRate); } -void SkelAnime_ChangeAnimationPlaybackSpeed(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed) { +void SkelAnime_ChangeAnimationPlaybackRepeat(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed) { SkelAnime_ChangeAnimation(skelAnime, animationSeg, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 0, 0.0f); } 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 f73a427c87..7561fe825e 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); - func_800A51E8(&this->skelAnime, &D_0600039C); + SkelAnimeChangeAnimationDefaultStop(&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 48f1cae778..11b358e5f5 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -161,18 +161,18 @@ static void EnWallmas_LandStart(EnWallmas* this, GlobalContext* globalCtx) { } static void EnWallmas_StandStart(EnWallmas* this) { - func_800A51E8(&this->skelAnime, &D_0600A054); + SkelAnimeChangeAnimationDefaultStop(&this->skelAnime, &D_0600A054); this->actionFunc = (ActorFunc)&EnWallmas_Stand; } static void EnWallmas_WalkStart(EnWallmas* this) { - func_800A529C(&this->skelAnime, &D_060041F4, 3.0f); + SkelAnime_ChangeAnimationPlaybackStop(&this->skelAnime, &D_060041F4, 3.0f); this->actionFunc = (ActorFunc)&EnWallmas_Walk; this->actor.speedXZ = 3.0f; } static void EnWallmas_JumpToCeilingStart(EnWallmas* this) { - func_800A51E8(&this->skelAnime, &D_06009244); + SkelAnimeChangeAnimationDefaultStop(&this->skelAnime, &D_06009244); this->actionFunc = (ActorFunc)&EnWallmas_JumpToCeiling; this->actor.speedXZ = 0.0f; } @@ -190,7 +190,7 @@ static void EnWallmas_ReturnToCeilingStart(EnWallmas* this) { } static void EnWallmas_TakeDamageStart(EnWallmas* this) { - func_800A5240(&this->skelAnime, &D_06000590, -3.0f); + SkelAnime_ChangeAnimationTransitionStop(&this->skelAnime, &D_06000590, -3.0f); if ((this->colCylinder.body.colliding->toucher.flags & 0x1F824) != 0) { this->actor.posRot.rot.y = this->colCylinder.base.ac->posRot.rot.y; } else { @@ -204,7 +204,7 @@ static void EnWallmas_TakeDamageStart(EnWallmas* this) { } static void EnWallmas_DamageCoolDownStart(EnWallmas* this) { - func_800A51E8(&this->skelAnime, &D_06000EA4); + SkelAnimeChangeAnimationDefaultStop(&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; @@ -223,7 +223,7 @@ static void EnWallMas_DieBegin(EnWallmas* this, GlobalContext* globalCtx) { } static void EnWallmas_TakePlayerBegin(EnWallmas* this, GlobalContext* globalCtx) { - func_800A5240(&this->skelAnime, &D_06009520, -5.0f); + SkelAnime_ChangeAnimationTransitionStop(&this->skelAnime, &D_06009520, -5.0f); this->timer = -0x1e; this->actionFunc = (ActorFunc)&EnWallmas_TakePlayer; this->actor.speedXZ = 0.0f;