diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s deleted file mode 100644 index 386088e150..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel EnRl_Destroy -/* 00000 80AE72B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80AE72B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80AE72B8 0C0295BC */ jal SkelAnime_Free -/* 0000C 80AE72BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 80AE72C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00014 80AE72C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 80AE72C8 03E00008 */ jr $ra -/* 0001C 80AE72CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s deleted file mode 100644 index fbff0a024a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s +++ /dev/null @@ -1,35 +0,0 @@ -.rdata -glabel D_80AE829C - .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel EnRl_Draw -/* 00E90 80AE8140 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E94 80AE8144 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E98 80AE8148 8C820198 */ lw $v0, 0x0198($a0) ## 00000198 -/* 00E9C 80AE814C 04400008 */ bltz $v0, .L80AE8170 -/* 00EA0 80AE8150 28410003 */ slti $at, $v0, 0x0003 -/* 00EA4 80AE8154 10200006 */ beq $at, $zero, .L80AE8170 -/* 00EA8 80AE8158 00027080 */ sll $t6, $v0, 2 -/* 00EAC 80AE815C 3C0380AF */ lui $v1, %hi(D_80AE81D0) ## $v1 = 80AF0000 -/* 00EB0 80AE8160 006E1821 */ addu $v1, $v1, $t6 -/* 00EB4 80AE8164 8C6381D0 */ lw $v1, %lo(D_80AE81D0)($v1) -/* 00EB8 80AE8168 14600006 */ bne $v1, $zero, .L80AE8184 -/* 00EBC 80AE816C 00000000 */ nop -.L80AE8170: -/* 00EC0 80AE8170 3C0480AF */ lui $a0, %hi(D_80AE829C) ## $a0 = 80AF0000 -/* 00EC4 80AE8174 0C00084C */ jal osSyncPrintf - -/* 00EC8 80AE8178 2484829C */ addiu $a0, $a0, %lo(D_80AE829C) ## $a0 = 80AE829C -/* 00ECC 80AE817C 10000004 */ beq $zero, $zero, .L80AE8190 -/* 00ED0 80AE8180 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE8184: -/* 00ED4 80AE8184 0060F809 */ jalr $ra, $v1 -/* 00ED8 80AE8188 00000000 */ nop -/* 00EDC 80AE818C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE8190: -/* 00EE0 80AE8190 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00EE4 80AE8194 03E00008 */ jr $ra -/* 00EE8 80AE8198 00000000 */ nop -/* 00EEC 80AE819C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s deleted file mode 100644 index fc31ae5dc3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel EnRl_Init -/* 00CB8 80AE7F68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CBC 80AE7F6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CC0 80AE7F70 AFA40018 */ sw $a0, 0x0018($sp) -/* 00CC4 80AE7F74 AFA5001C */ sw $a1, 0x001C($sp) -/* 00CC8 80AE7F78 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00CCC 80AE7F7C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00CD0 80AE7F80 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00CD4 80AE7F84 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00CD8 80AE7F88 0C00AC78 */ jal ActorShape_Init - -/* 00CDC 80AE7F8C 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 00CE0 80AE7F90 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CE4 80AE7F94 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00CE8 80AE7F98 8FA5001C */ lw $a1, 0x001C($sp) -/* 00CEC 80AE7F9C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00CF0 80AE7FA0 15C10005 */ bne $t6, $at, .L80AE7FB8 -/* 00CF4 80AE7FA4 00000000 */ nop -/* 00CF8 80AE7FA8 0C2B9E1E */ jal func_80AE7878 -/* 00CFC 80AE7FAC 00000000 */ nop -/* 00D00 80AE7FB0 10000004 */ beq $zero, $zero, .L80AE7FC4 -/* 00D04 80AE7FB4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE7FB8: -/* 00D08 80AE7FB8 0C2B9D51 */ jal func_80AE7544 -/* 00D0C 80AE7FBC 00000000 */ nop -/* 00D10 80AE7FC0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE7FC4: -/* 00D14 80AE7FC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D18 80AE7FC8 03E00008 */ jr $ra -/* 00D1C 80AE7FCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s deleted file mode 100644 index 0445f028a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80AE8240 - .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel EnRl_Update -/* 00C5C 80AE7F0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C60 80AE7F10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C64 80AE7F14 8C820194 */ lw $v0, 0x0194($a0) ## 00000194 -/* 00C68 80AE7F18 04400008 */ bltz $v0, .L80AE7F3C -/* 00C6C 80AE7F1C 28410008 */ slti $at, $v0, 0x0008 -/* 00C70 80AE7F20 10200006 */ beq $at, $zero, .L80AE7F3C -/* 00C74 80AE7F24 00027080 */ sll $t6, $v0, 2 -/* 00C78 80AE7F28 3C0380AF */ lui $v1, %hi(D_80AE81B0) ## $v1 = 80AF0000 -/* 00C7C 80AE7F2C 006E1821 */ addu $v1, $v1, $t6 -/* 00C80 80AE7F30 8C6381B0 */ lw $v1, %lo(D_80AE81B0)($v1) -/* 00C84 80AE7F34 14600006 */ bne $v1, $zero, .L80AE7F50 -/* 00C88 80AE7F38 00000000 */ nop -.L80AE7F3C: -/* 00C8C 80AE7F3C 3C0480AF */ lui $a0, %hi(D_80AE8240) ## $a0 = 80AF0000 -/* 00C90 80AE7F40 0C00084C */ jal osSyncPrintf - -/* 00C94 80AE7F44 24848240 */ addiu $a0, $a0, %lo(D_80AE8240) ## $a0 = 80AE8240 -/* 00C98 80AE7F48 10000004 */ beq $zero, $zero, .L80AE7F5C -/* 00C9C 80AE7F4C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE7F50: -/* 00CA0 80AE7F50 0060F809 */ jalr $ra, $v1 -/* 00CA4 80AE7F54 00000000 */ nop -/* 00CA8 80AE7F58 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE7F5C: -/* 00CAC 80AE7F5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CB0 80AE7F60 03E00008 */ jr $ra -/* 00CB4 80AE7F64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s deleted file mode 100644 index af6ff27336..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AE72D0 -/* 00020 80AE72D0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00024 80AE72D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00028 80AE72D8 848E0192 */ lh $t6, 0x0192($a0) ## 00000192 -/* 0002C 80AE72DC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00030 80AE72E0 24C30192 */ addiu $v1, $a2, 0x0192 ## $v1 = 00000192 -/* 00034 80AE72E4 15C00003 */ bne $t6, $zero, .L80AE72F4 -/* 00038 80AE72E8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0003C 80AE72EC 10000005 */ beq $zero, $zero, .L80AE7304 -/* 00040 80AE72F0 24830192 */ addiu $v1, $a0, 0x0192 ## $v1 = 00000192 -.L80AE72F4: -/* 00044 80AE72F4 846F0000 */ lh $t7, 0x0000($v1) ## 00000192 -/* 00048 80AE72F8 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 0004C 80AE72FC A4780000 */ sh $t8, 0x0000($v1) ## 00000192 -/* 00050 80AE7300 84620000 */ lh $v0, 0x0000($v1) ## 00000192 -.L80AE7304: -/* 00054 80AE7304 14400008 */ bne $v0, $zero, .L80AE7328 -/* 00058 80AE7308 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 0005C 80AE730C 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 00060 80AE7310 AFA3001C */ sw $v1, 0x001C($sp) -/* 00064 80AE7314 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00068 80AE7318 AFA60038 */ sw $a2, 0x0038($sp) -/* 0006C 80AE731C 8FA3001C */ lw $v1, 0x001C($sp) -/* 00070 80AE7320 8FA60038 */ lw $a2, 0x0038($sp) -/* 00074 80AE7324 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80AE7328: -/* 00078 80AE7328 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 0007C 80AE732C 24C20190 */ addiu $v0, $a2, 0x0190 ## $v0 = 00000190 -/* 00080 80AE7330 A4590000 */ sh $t9, 0x0000($v0) ## 00000190 -/* 00084 80AE7334 84480000 */ lh $t0, 0x0000($v0) ## 00000190 -/* 00088 80AE7338 29010003 */ slti $at, $t0, 0x0003 -/* 0008C 80AE733C 54200003 */ bnel $at, $zero, .L80AE734C -/* 00090 80AE7340 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00094 80AE7344 A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 00098 80AE7348 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE734C: -/* 0009C 80AE734C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000A0 80AE7350 03E00008 */ jr $ra -/* 000A4 80AE7354 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s deleted file mode 100644 index a2f2be4d99..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AE7358 -/* 000A8 80AE7358 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 000AC 80AE735C AFB00028 */ sw $s0, 0x0028($sp) -/* 000B0 80AE7360 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000B4 80AE7364 AFBF002C */ sw $ra, 0x002C($sp) -/* 000B8 80AE7368 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 000BC 80AE736C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 000C0 80AE7370 24840A3C */ addiu $a0, $a0, 0x0A3C ## $a0 = 06000A3C -/* 000C4 80AE7374 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 000C8 80AE7378 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 000CC 80AE737C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 000D0 80AE7380 468021A0 */ cvt.s.w $f6, $f4 -/* 000D4 80AE7384 44070000 */ mfc1 $a3, $f0 -/* 000D8 80AE7388 24A50A3C */ addiu $a1, $a1, 0x0A3C ## $a1 = 06000A3C -/* 000DC 80AE738C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 000E0 80AE7390 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 000E4 80AE7394 AFA00014 */ sw $zero, 0x0014($sp) -/* 000E8 80AE7398 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 000EC 80AE739C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 000F0 80AE73A0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 000F4 80AE73A4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 000F8 80AE73A8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 000FC 80AE73AC AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 00100 80AE73B0 AE000198 */ sw $zero, 0x0198($s0) ## 00000198 -/* 00104 80AE73B4 AE0001A0 */ sw $zero, 0x01A0($s0) ## 000001A0 -/* 00108 80AE73B8 AE0001A4 */ sw $zero, 0x01A4($s0) ## 000001A4 -/* 0010C 80AE73BC A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 -/* 00110 80AE73C0 E608019C */ swc1 $f8, 0x019C($s0) ## 0000019C -/* 00114 80AE73C4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00118 80AE73C8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0011C 80AE73CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00120 80AE73D0 03E00008 */ jr $ra -/* 00124 80AE73D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s deleted file mode 100644 index 6ae6cdcaf3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80AE73D8 -/* 00128 80AE73D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0012C 80AE73DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00130 80AE73E0 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00134 80AE73E4 3C0F80AF */ lui $t7, %hi(D_80AE81AC) ## $t7 = 80AF0000 -/* 00138 80AE73E8 3C1980AF */ lui $t9, %hi(D_80AE81AC) ## $t9 = 80AF0000 -/* 0013C 80AE73EC 15C0000D */ bne $t6, $zero, .L80AE7424 -/* 00140 80AE73F0 00000000 */ nop -/* 00144 80AE73F4 8DEF81AC */ lw $t7, %lo(D_80AE81AC)($t7) -/* 00148 80AE73F8 51E00011 */ beql $t7, $zero, .L80AE7440 -/* 0014C 80AE73FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00150 80AE7400 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 00154 80AE7404 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00158 80AE7408 17010003 */ bne $t8, $at, .L80AE7418 -/* 0015C 80AE740C 00000000 */ nop -/* 00160 80AE7410 0C2B9CD6 */ jal func_80AE7358 -/* 00164 80AE7414 00000000 */ nop -.L80AE7418: -/* 00168 80AE7418 3C0180AF */ lui $at, %hi(D_80AE81AC) ## $at = 80AF0000 -/* 0016C 80AE741C 10000007 */ beq $zero, $zero, .L80AE743C -/* 00170 80AE7420 AC2081AC */ sw $zero, %lo(D_80AE81AC)($at) -.L80AE7424: -/* 00174 80AE7424 8F3981AC */ lw $t9, %lo(D_80AE81AC)($t9) -/* 00178 80AE7428 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0017C 80AE742C 3C0180AF */ lui $at, %hi(D_80AE81AC) ## $at = 80AF0000 -/* 00180 80AE7430 57200003 */ bnel $t9, $zero, .L80AE7440 -/* 00184 80AE7434 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00188 80AE7438 AC2881AC */ sw $t0, %lo(D_80AE81AC)($at) -.L80AE743C: -/* 0018C 80AE743C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE7440: -/* 00190 80AE7440 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00194 80AE7444 03E00008 */ jr $ra -/* 00198 80AE7448 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s deleted file mode 100644 index bcb392177a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AE744C -/* 0019C 80AE744C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001A0 80AE7450 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 001A4 80AE7454 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 001A8 80AE7458 AFA50024 */ sw $a1, 0x0024($sp) -/* 001AC 80AE745C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 001B0 80AE7460 AFBF001C */ sw $ra, 0x001C($sp) -/* 001B4 80AE7464 AFA40020 */ sw $a0, 0x0020($sp) -/* 001B8 80AE7468 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 001BC 80AE746C 44070000 */ mfc1 $a3, $f0 -/* 001C0 80AE7470 AFAE0014 */ sw $t6, 0x0014($sp) -/* 001C4 80AE7474 8FA40024 */ lw $a0, 0x0024($sp) -/* 001C8 80AE7478 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 001CC 80AE747C 0C00B92D */ jal func_8002E4B4 -/* 001D0 80AE7480 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 001D4 80AE7484 8FBF001C */ lw $ra, 0x001C($sp) -/* 001D8 80AE7488 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001DC 80AE748C 03E00008 */ jr $ra -/* 001E0 80AE7490 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s deleted file mode 100644 index 7285a87aa7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AE7494 -/* 001E4 80AE7494 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001E8 80AE7498 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001EC 80AE749C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 001F0 80AE74A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001F4 80AE74A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001F8 80AE74A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001FC 80AE74AC 03E00008 */ jr $ra -/* 00200 80AE74B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s deleted file mode 100644 index 65d0148eca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AE74B4 -/* 00204 80AE74B4 AFA40000 */ sw $a0, 0x0000($sp) -/* 00208 80AE74B8 AFA60008 */ sw $a2, 0x0008($sp) -/* 0020C 80AE74BC 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00210 80AE74C0 00077880 */ sll $t7, $a3, 2 -/* 00214 80AE74C4 30C6FFFF */ andi $a2, $a2, 0xFFFF ## $a2 = 00000000 -/* 00218 80AE74C8 11C00009 */ beq $t6, $zero, .L80AE74F0 -/* 0021C 80AE74CC 00AFC021 */ addu $t8, $a1, $t7 -/* 00220 80AE74D0 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 00224 80AE74D4 50400007 */ beql $v0, $zero, .L80AE74F4 -/* 00228 80AE74D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0022C 80AE74DC 94590000 */ lhu $t9, 0x0000($v0) ## 00000000 -/* 00230 80AE74E0 54D90004 */ bnel $a2, $t9, .L80AE74F4 -/* 00234 80AE74E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00238 80AE74E8 03E00008 */ jr $ra -/* 0023C 80AE74EC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AE74F0: -/* 00240 80AE74F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AE74F4: -/* 00244 80AE74F4 03E00008 */ jr $ra -/* 00248 80AE74F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s deleted file mode 100644 index ade3595376..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AE74FC -/* 0024C 80AE74FC AFA40000 */ sw $a0, 0x0000($sp) -/* 00250 80AE7500 AFA60008 */ sw $a2, 0x0008($sp) -/* 00254 80AE7504 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00258 80AE7508 00077880 */ sll $t7, $a3, 2 -/* 0025C 80AE750C 30C6FFFF */ andi $a2, $a2, 0xFFFF ## $a2 = 00000000 -/* 00260 80AE7510 11C00009 */ beq $t6, $zero, .L80AE7538 -/* 00264 80AE7514 00AFC021 */ addu $t8, $a1, $t7 -/* 00268 80AE7518 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 0026C 80AE751C 50400007 */ beql $v0, $zero, .L80AE753C -/* 00270 80AE7520 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00274 80AE7524 94590000 */ lhu $t9, 0x0000($v0) ## 00000000 -/* 00278 80AE7528 50D90004 */ beql $a2, $t9, .L80AE753C -/* 0027C 80AE752C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00280 80AE7530 03E00008 */ jr $ra -/* 00284 80AE7534 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AE7538: -/* 00288 80AE7538 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AE753C: -/* 0028C 80AE753C 03E00008 */ jr $ra -/* 00290 80AE7540 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s deleted file mode 100644 index c16d0db17e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AE7544 -/* 00294 80AE7544 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00298 80AE7548 AFA40028 */ sw $a0, 0x0028($sp) -/* 0029C 80AE754C AFA5002C */ sw $a1, 0x002C($sp) -/* 002A0 80AE7550 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002A4 80AE7554 8FA50028 */ lw $a1, 0x0028($sp) -/* 002A8 80AE7558 AFBF0024 */ sw $ra, 0x0024($sp) -/* 002AC 80AE755C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 002B0 80AE7560 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 002B4 80AE7564 24E70A3C */ addiu $a3, $a3, 0x0A3C ## $a3 = 06000A3C -/* 002B8 80AE7568 24C67B38 */ addiu $a2, $a2, 0x7B38 ## $a2 = 06007B38 -/* 002BC 80AE756C AFA00010 */ sw $zero, 0x0010($sp) -/* 002C0 80AE7570 AFA00014 */ sw $zero, 0x0014($sp) -/* 002C4 80AE7574 AFA00018 */ sw $zero, 0x0018($sp) -/* 002C8 80AE7578 0C0291BE */ jal SkelAnime_InitSV -/* 002CC 80AE757C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 002D0 80AE7580 8FBF0024 */ lw $ra, 0x0024($sp) -/* 002D4 80AE7584 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002D8 80AE7588 03E00008 */ jr $ra -/* 002DC 80AE758C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s deleted file mode 100644 index 4d27b1b2ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80AE7590 -/* 002E0 80AE7590 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 002E4 80AE7594 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) -/* 002E8 80AE7598 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) -/* 002EC 80AE759C AFBF0034 */ sw $ra, 0x0034($sp) -/* 002F0 80AE75A0 AFB00030 */ sw $s0, 0x0030($sp) -/* 002F4 80AE75A4 AFA40038 */ sw $a0, 0x0038($sp) -/* 002F8 80AE75A8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 002FC 80AE75AC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00300 80AE75B0 15C10028 */ bne $t6, $at, .L80AE7654 -/* 00304 80AE75B4 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 00308 80AE75B8 24010044 */ addiu $at, $zero, 0x0044 ## $at = 00000044 -/* 0030C 80AE75BC 54410026 */ bnel $v0, $at, .L80AE7658 -/* 00310 80AE75C0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00314 80AE75C4 90AF1D6C */ lbu $t7, 0x1D6C($a1) ## 00001D6C -/* 00318 80AE75C8 51E00023 */ beql $t7, $zero, .L80AE7658 -/* 0031C 80AE75CC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00320 80AE75D0 8CA21DA4 */ lw $v0, 0x1DA4($a1) ## 00001DA4 -/* 00324 80AE75D4 50400020 */ beql $v0, $zero, .L80AE7658 -/* 00328 80AE75D8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0032C 80AE75DC 94580000 */ lhu $t8, 0x0000($v0) ## 00000000 -/* 00330 80AE75E0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00334 80AE75E4 5701001C */ bnel $t8, $at, .L80AE7658 -/* 00338 80AE75E8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0033C 80AE75EC 8C8801A8 */ lw $t0, 0x01A8($a0) ## 000001A8 -/* 00340 80AE75F0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00344 80AE75F4 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00348 80AE75F8 15000016 */ bne $t0, $zero, .L80AE7654 -/* 0034C 80AE75FC 2406008B */ addiu $a2, $zero, 0x008B ## $a2 = 0000008B -/* 00350 80AE7600 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00354 80AE7604 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 00358 80AE7608 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E -/* 0035C 80AE760C C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 00360 80AE7610 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 00364 80AE7614 C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 00368 80AE7618 44070000 */ mfc1 $a3, $f0 -/* 0036C 80AE761C 46062080 */ add.s $f2, $f4, $f6 -/* 00370 80AE7620 AFA90024 */ sw $t1, 0x0024($sp) -/* 00374 80AE7624 AFA00020 */ sw $zero, 0x0020($sp) -/* 00378 80AE7628 AFA0001C */ sw $zero, 0x001C($sp) -/* 0037C 80AE762C E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00380 80AE7630 AFA00018 */ sw $zero, 0x0018($sp) -/* 00384 80AE7634 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00388 80AE7638 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 0038C 80AE763C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00390 80AE7640 0C021344 */ jal Item_Give -/* 00394 80AE7644 2405006B */ addiu $a1, $zero, 0x006B ## $a1 = 0000006B -/* 00398 80AE7648 8FAB0038 */ lw $t3, 0x0038($sp) -/* 0039C 80AE764C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 003A0 80AE7650 AD6A01A8 */ sw $t2, 0x01A8($t3) ## 000001A8 -.L80AE7654: -/* 003A4 80AE7654 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AE7658: -/* 003A8 80AE7658 8FB00030 */ lw $s0, 0x0030($sp) -/* 003AC 80AE765C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 003B0 80AE7660 03E00008 */ jr $ra -/* 003B4 80AE7664 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s deleted file mode 100644 index 01b96223c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AE7668 -/* 003B8 80AE7668 84830032 */ lh $v1, 0x0032($a0) ## 00000032 -/* 003BC 80AE766C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 003C0 80AE7670 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 003C4 80AE7674 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 003C8 80AE7678 00611821 */ addu $v1, $v1, $at -/* 003CC 80AE767C 00031C00 */ sll $v1, $v1, 16 -/* 003D0 80AE7680 AC860198 */ sw $a2, 0x0198($a0) ## 00000198 -/* 003D4 80AE7684 AC860194 */ sw $a2, 0x0194($a0) ## 00000194 -/* 003D8 80AE7688 00031C03 */ sra $v1, $v1, 16 -/* 003DC 80AE768C A44300B6 */ sh $v1, 0x00B6($v0) ## 000000B6 -/* 003E0 80AE7690 03E00008 */ jr $ra -/* 003E4 80AE7694 A4430032 */ sh $v1, 0x0032($v0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s deleted file mode 100644 index 9c3604d99f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80AE7698 -/* 003E8 80AE7698 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003EC 80AE769C AFBF0024 */ sw $ra, 0x0024($sp) -/* 003F0 80AE76A0 AFA40028 */ sw $a0, 0x0028($sp) -/* 003F4 80AE76A4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 003F8 80AE76A8 51C0001D */ beql $t6, $zero, .L80AE7720 -/* 003FC 80AE76AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00400 80AE76B0 8CA21D8C */ lw $v0, 0x1D8C($a1) ## 00001D8C -/* 00404 80AE76B4 5040001A */ beql $v0, $zero, .L80AE7720 -/* 00408 80AE76B8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0040C 80AE76BC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00410 80AE76C0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00414 80AE76C4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00418 80AE76C8 55E10015 */ bnel $t7, $at, .L80AE7720 -/* 0041C 80AE76CC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00420 80AE76D0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00424 80AE76D4 2484040C */ addiu $a0, $a0, 0x040C ## $a0 = 0600040C -/* 00428 80AE76D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0042C 80AE76DC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00430 80AE76E0 8FA40028 */ lw $a0, 0x0028($sp) -/* 00434 80AE76E4 468021A0 */ cvt.s.w $f6, $f4 -/* 00438 80AE76E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0043C 80AE76EC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00440 80AE76F0 44070000 */ mfc1 $a3, $f0 -/* 00444 80AE76F4 AFB80014 */ sw $t8, 0x0014($sp) -/* 00448 80AE76F8 24A5040C */ addiu $a1, $a1, 0x040C ## $a1 = 0600040C -/* 0044C 80AE76FC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00450 80AE7700 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00454 80AE7704 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00458 80AE7708 0C029468 */ jal SkelAnime_ChangeAnim - -/* 0045C 80AE770C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00460 80AE7710 8FA80028 */ lw $t0, 0x0028($sp) -/* 00464 80AE7714 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00468 80AE7718 AD190194 */ sw $t9, 0x0194($t0) ## 00000194 -/* 0046C 80AE771C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE7720: -/* 00470 80AE7720 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00474 80AE7724 03E00008 */ jr $ra -/* 00478 80AE7728 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s deleted file mode 100644 index f24db61fe7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80AE772C -/* 0047C 80AE772C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00480 80AE7730 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00484 80AE7734 10A00014 */ beq $a1, $zero, .L80AE7788 -/* 00488 80AE7738 AFA40028 */ sw $a0, 0x0028($sp) -/* 0048C 80AE773C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00490 80AE7740 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00494 80AE7744 24840830 */ addiu $a0, $a0, 0x0830 ## $a0 = 06000830 -/* 00498 80AE7748 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0049C 80AE774C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 004A0 80AE7750 8FA40028 */ lw $a0, 0x0028($sp) -/* 004A4 80AE7754 468021A0 */ cvt.s.w $f6, $f4 -/* 004A8 80AE7758 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004AC 80AE775C 44070000 */ mfc1 $a3, $f0 -/* 004B0 80AE7760 24A50830 */ addiu $a1, $a1, 0x0830 ## $a1 = 06000830 -/* 004B4 80AE7764 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 004B8 80AE7768 AFA00014 */ sw $zero, 0x0014($sp) -/* 004BC 80AE776C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 004C0 80AE7770 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004C4 80AE7774 0C029468 */ jal SkelAnime_ChangeAnim - -/* 004C8 80AE7778 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 004CC 80AE777C 8FAF0028 */ lw $t7, 0x0028($sp) -/* 004D0 80AE7780 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 004D4 80AE7784 ADEE0194 */ sw $t6, 0x0194($t7) ## 00000194 -.L80AE7788: -/* 004D8 80AE7788 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004DC 80AE778C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004E0 80AE7790 03E00008 */ jr $ra -/* 004E4 80AE7794 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s deleted file mode 100644 index 74186b01f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AE7798 -/* 004E8 80AE7798 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004EC 80AE779C AFBF0014 */ sw $ra, 0x0014($sp) -/* 004F0 80AE77A0 0C2B9D9A */ jal func_80AE7668 -/* 004F4 80AE77A4 00000000 */ nop -/* 004F8 80AE77A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004FC 80AE77AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00500 80AE77B0 03E00008 */ jr $ra -/* 00504 80AE77B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s deleted file mode 100644 index 09025ebffd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AE77B8 -/* 00508 80AE77B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0050C 80AE77BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00510 80AE77C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00514 80AE77C4 0C2B9D13 */ jal func_80AE744C -/* 00518 80AE77C8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0051C 80AE77CC 0C2B9D25 */ jal func_80AE7494 -/* 00520 80AE77D0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00524 80AE77D4 0C2B9CB4 */ jal func_80AE72D0 -/* 00528 80AE77D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0052C 80AE77DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00530 80AE77E0 0C2B9DA6 */ jal func_80AE7698 -/* 00534 80AE77E4 8FA5001C */ lw $a1, 0x001C($sp) -/* 00538 80AE77E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0053C 80AE77EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00540 80AE77F0 03E00008 */ jr $ra -/* 00544 80AE77F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s deleted file mode 100644 index fac0e64dcd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AE77F8 -/* 00548 80AE77F8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0054C 80AE77FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00550 80AE7800 0C2B9D13 */ jal func_80AE744C -/* 00554 80AE7804 AFA40020 */ sw $a0, 0x0020($sp) -/* 00558 80AE7808 0C2B9D25 */ jal func_80AE7494 -/* 0055C 80AE780C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00560 80AE7810 AFA2001C */ sw $v0, 0x001C($sp) -/* 00564 80AE7814 0C2B9CB4 */ jal func_80AE72D0 -/* 00568 80AE7818 8FA40020 */ lw $a0, 0x0020($sp) -/* 0056C 80AE781C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00570 80AE7820 0C2B9DCB */ jal func_80AE772C -/* 00574 80AE7824 8FA5001C */ lw $a1, 0x001C($sp) -/* 00578 80AE7828 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0057C 80AE782C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00580 80AE7830 03E00008 */ jr $ra -/* 00584 80AE7834 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s deleted file mode 100644 index 1df3ae08ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AE7838 -/* 00588 80AE7838 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0058C 80AE783C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00590 80AE7840 AFA40018 */ sw $a0, 0x0018($sp) -/* 00594 80AE7844 0C2B9D13 */ jal func_80AE744C -/* 00598 80AE7848 AFA5001C */ sw $a1, 0x001C($sp) -/* 0059C 80AE784C 0C2B9D25 */ jal func_80AE7494 -/* 005A0 80AE7850 8FA40018 */ lw $a0, 0x0018($sp) -/* 005A4 80AE7854 0C2B9CB4 */ jal func_80AE72D0 -/* 005A8 80AE7858 8FA40018 */ lw $a0, 0x0018($sp) -/* 005AC 80AE785C 8FA40018 */ lw $a0, 0x0018($sp) -/* 005B0 80AE7860 0C2B9D64 */ jal func_80AE7590 -/* 005B4 80AE7864 8FA5001C */ lw $a1, 0x001C($sp) -/* 005B8 80AE7868 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005BC 80AE786C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005C0 80AE7870 03E00008 */ jr $ra -/* 005C4 80AE7874 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s deleted file mode 100644 index 3eee0803f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AE7878 -/* 005C8 80AE7878 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005CC 80AE787C AFA40028 */ sw $a0, 0x0028($sp) -/* 005D0 80AE7880 AFA5002C */ sw $a1, 0x002C($sp) -/* 005D4 80AE7884 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005D8 80AE7888 8FA50028 */ lw $a1, 0x0028($sp) -/* 005DC 80AE788C AFBF0024 */ sw $ra, 0x0024($sp) -/* 005E0 80AE7890 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 005E4 80AE7894 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 005E8 80AE7898 24E70A3C */ addiu $a3, $a3, 0x0A3C ## $a3 = 06000A3C -/* 005EC 80AE789C 24C67B38 */ addiu $a2, $a2, 0x7B38 ## $a2 = 06007B38 -/* 005F0 80AE78A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 005F4 80AE78A4 AFA00014 */ sw $zero, 0x0014($sp) -/* 005F8 80AE78A8 AFA00018 */ sw $zero, 0x0018($sp) -/* 005FC 80AE78AC 0C0291BE */ jal SkelAnime_InitSV -/* 00600 80AE78B0 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00604 80AE78B4 8FA20028 */ lw $v0, 0x0028($sp) -/* 00608 80AE78B8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 0060C 80AE78BC AC4E0194 */ sw $t6, 0x0194($v0) ## 00000194 -/* 00610 80AE78C0 A04000C8 */ sb $zero, 0x00C8($v0) ## 000000C8 -/* 00614 80AE78C4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00618 80AE78C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0061C 80AE78CC 03E00008 */ jr $ra -/* 00620 80AE78D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s deleted file mode 100644 index bc9f97766e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80AE78D4 -/* 00624 80AE78D4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00628 80AE78D8 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 0062C 80AE78DC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00630 80AE78E0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00634 80AE78E4 AFA40038 */ sw $a0, 0x0038($sp) -/* 00638 80AE78E8 C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 0063C 80AE78EC 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 00640 80AE78F0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 00644 80AE78F4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00648 80AE78F8 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 0064C 80AE78FC 85CF1478 */ lh $t7, 0x1478($t6) ## 80161478 -/* 00650 80AE7900 44815000 */ mtc1 $at, $f10 ## $f10 = 22.00 -/* 00654 80AE7904 C4B20028 */ lwc1 $f18, 0x0028($a1) ## 00000028 -/* 00658 80AE7908 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 0065C 80AE790C 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00660 80AE7910 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00664 80AE7914 46803220 */ cvt.s.w $f8, $f6 -/* 00668 80AE7918 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 0066C 80AE791C 460A4400 */ add.s $f16, $f8, $f10 -/* 00670 80AE7920 46128100 */ add.s $f4, $f16, $f18 -/* 00674 80AE7924 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00678 80AE7928 C4A6002C */ lwc1 $f6, 0x002C($a1) ## 0000002C -/* 0067C 80AE792C AFB80028 */ sw $t8, 0x0028($sp) -/* 00680 80AE7930 AFA00024 */ sw $zero, 0x0024($sp) -/* 00684 80AE7934 AFA00020 */ sw $zero, 0x0020($sp) -/* 00688 80AE7938 AFA0001C */ sw $zero, 0x001C($sp) -/* 0068C 80AE793C 0C00C916 */ jal Actor_SpawnAsChild - -/* 00690 80AE7940 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00694 80AE7944 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00698 80AE7948 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0069C 80AE794C 03E00008 */ jr $ra -/* 006A0 80AE7950 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s deleted file mode 100644 index c944ca8380..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AE7954 -/* 006A4 80AE7954 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006A8 80AE7958 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006AC 80AE795C AFA40018 */ sw $a0, 0x0018($sp) -/* 006B0 80AE7960 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 006B4 80AE7964 0C2B9D2D */ jal func_80AE74B4 -/* 006B8 80AE7968 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 006BC 80AE796C 10400009 */ beq $v0, $zero, .L80AE7994 -/* 006C0 80AE7970 8FA40018 */ lw $a0, 0x0018($sp) -/* 006C4 80AE7974 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 006C8 80AE7978 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 006CC 80AE797C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 006D0 80AE7980 AC8E0194 */ sw $t6, 0x0194($a0) ## 00000194 -/* 006D4 80AE7984 AC8F0198 */ sw $t7, 0x0198($a0) ## 00000198 -/* 006D8 80AE7988 AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 006DC 80AE798C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 006E0 80AE7990 E484019C */ swc1 $f4, 0x019C($a0) ## 0000019C -.L80AE7994: -/* 006E4 80AE7994 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006E8 80AE7998 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006EC 80AE799C 03E00008 */ jr $ra -/* 006F0 80AE79A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s deleted file mode 100644 index 6868f893c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_80AE79A4 -/* 006F4 80AE79A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006F8 80AE79A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006FC 80AE79AC AFA40018 */ sw $a0, 0x0018($sp) -/* 00700 80AE79B0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00704 80AE79B4 0C2B9D2D */ jal func_80AE74B4 -/* 00708 80AE79B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0070C 80AE79BC 10400025 */ beq $v0, $zero, .L80AE7A54 -/* 00710 80AE79C0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00714 80AE79C4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00718 80AE79C8 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 0071C 80AE79CC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00720 80AE79D0 2482019C */ addiu $v0, $a0, 0x019C ## $v0 = 0000019C -/* 00724 80AE79D4 C4440000 */ lwc1 $f4, 0x0000($v0) ## 0000019C -/* 00728 80AE79D8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0072C 80AE79DC 3C058016 */ lui $a1, %hi(gGameInfo) -/* 00730 80AE79E0 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 00734 80AE79E4 46062200 */ add.s $f8, $f4, $f6 -/* 00738 80AE79E8 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 0073C 80AE79EC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00740 80AE79F0 E4480000 */ swc1 $f8, 0x0000($v0) ## 0000019C -/* 00744 80AE79F4 8CAE0000 */ lw $t6, 0x0000($a1) ## 8015FA90 -/* 00748 80AE79F8 C4400000 */ lwc1 $f0, 0x0000($v0) ## 0000019C -/* 0074C 80AE79FC 85CF145E */ lh $t7, 0x145E($t6) ## 0000145E -/* 00750 80AE7A00 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00754 80AE7A04 00000000 */ nop -/* 00758 80AE7A08 46805420 */ cvt.s.w $f16, $f10 -/* 0075C 80AE7A0C 46028480 */ add.s $f18, $f16, $f2 -/* 00760 80AE7A10 4600903E */ c.le.s $f18, $f0 -/* 00764 80AE7A14 00000000 */ nop -/* 00768 80AE7A18 45000020 */ bc1f .L80AE7A9C -/* 0076C 80AE7A1C 00000000 */ nop -/* 00770 80AE7A20 AC980194 */ sw $t8, 0x0194($a0) ## 00000194 -/* 00774 80AE7A24 AC990198 */ sw $t9, 0x0198($a0) ## 00000198 -/* 00778 80AE7A28 8CA80000 */ lw $t0, 0x0000($a1) ## 8015FA90 -/* 0077C 80AE7A2C 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00780 80AE7A30 8509145E */ lh $t1, 0x145E($t0) ## 0000145E -/* 00784 80AE7A34 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 00788 80AE7A38 00000000 */ nop -/* 0078C 80AE7A3C 468021A0 */ cvt.s.w $f6, $f4 -/* 00790 80AE7A40 46023200 */ add.s $f8, $f6, $f2 -/* 00794 80AE7A44 E4480000 */ swc1 $f8, 0x0000($v0) ## 0000019C -/* 00798 80AE7A48 AC8301A0 */ sw $v1, 0x01A0($a0) ## 000001A0 -/* 0079C 80AE7A4C 10000026 */ beq $zero, $zero, .L80AE7AE8 -/* 007A0 80AE7A50 A08300C8 */ sb $v1, 0x00C8($a0) ## 000000C8 -.L80AE7A54: -/* 007A4 80AE7A54 2482019C */ addiu $v0, $a0, 0x019C ## $v0 = 0000019C -/* 007A8 80AE7A58 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 007AC 80AE7A5C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 007B0 80AE7A60 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 0000019C -/* 007B4 80AE7A64 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 007B8 80AE7A68 46105481 */ sub.s $f18, $f10, $f16 -/* 007BC 80AE7A6C E4520000 */ swc1 $f18, 0x0000($v0) ## 0000019C -/* 007C0 80AE7A70 C4400000 */ lwc1 $f0, 0x0000($v0) ## 0000019C -/* 007C4 80AE7A74 4602003E */ c.le.s $f0, $f2 -/* 007C8 80AE7A78 00000000 */ nop -/* 007CC 80AE7A7C 45000007 */ bc1f .L80AE7A9C -/* 007D0 80AE7A80 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 007D4 80AE7A84 AC8A0194 */ sw $t2, 0x0194($a0) ## 00000194 -/* 007D8 80AE7A88 AC800198 */ sw $zero, 0x0198($a0) ## 00000198 -/* 007DC 80AE7A8C E4420000 */ swc1 $f2, 0x0000($v0) ## 0000019C -/* 007E0 80AE7A90 AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 007E4 80AE7A94 10000014 */ beq $zero, $zero, .L80AE7AE8 -/* 007E8 80AE7A98 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L80AE7A9C: -/* 007EC 80AE7A9C 3C058016 */ lui $a1, %hi(gGameInfo) -/* 007F0 80AE7AA0 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 007F4 80AE7AA4 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 -/* 007F8 80AE7AA8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 007FC 80AE7AAC 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00800 80AE7AB0 856C145E */ lh $t4, 0x145E($t3) ## 0000145E -/* 00804 80AE7AB4 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00808 80AE7AB8 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 0080C 80AE7ABC 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00810 80AE7AC0 00000000 */ nop -/* 00814 80AE7AC4 468021A0 */ cvt.s.w $f6, $f4 -/* 00818 80AE7AC8 46023200 */ add.s $f8, $f6, $f2 -/* 0081C 80AE7ACC 46080283 */ div.s $f10, $f0, $f8 -/* 00820 80AE7AD0 46105482 */ mul.s $f18, $f10, $f16 -/* 00824 80AE7AD4 4600910D */ trunc.w.s $f4, $f18 -/* 00828 80AE7AD8 44022000 */ mfc1 $v0, $f4 -/* 0082C 80AE7ADC 00000000 */ nop -/* 00830 80AE7AE0 AC8201A0 */ sw $v0, 0x01A0($a0) ## 000001A0 -/* 00834 80AE7AE4 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L80AE7AE8: -/* 00838 80AE7AE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0083C 80AE7AEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00840 80AE7AF0 03E00008 */ jr $ra -/* 00844 80AE7AF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s deleted file mode 100644 index 1ed83f7729..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_80AE7AF8 -/* 00848 80AE7AF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0084C 80AE7AFC AFBF002C */ sw $ra, 0x002C($sp) -/* 00850 80AE7B00 AFB00028 */ sw $s0, 0x0028($sp) -/* 00854 80AE7B04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00858 80AE7B08 AFA50034 */ sw $a1, 0x0034($sp) -/* 0085C 80AE7B0C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00860 80AE7B10 0C2B9D2D */ jal func_80AE74B4 -/* 00864 80AE7B14 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00868 80AE7B18 10400015 */ beq $v0, $zero, .L80AE7B70 -/* 0086C 80AE7B1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00870 80AE7B20 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00874 80AE7B24 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00878 80AE7B28 2484040C */ addiu $a0, $a0, 0x040C ## $a0 = 0600040C -/* 0087C 80AE7B2C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00880 80AE7B30 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00884 80AE7B34 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 00888 80AE7B38 468021A0 */ cvt.s.w $f6, $f4 -/* 0088C 80AE7B3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00890 80AE7B40 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00894 80AE7B44 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00898 80AE7B48 24A5040C */ addiu $a1, $a1, 0x040C ## $a1 = 0600040C -/* 0089C 80AE7B4C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 008A0 80AE7B50 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 008A4 80AE7B54 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008A8 80AE7B58 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008AC 80AE7B5C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 008B0 80AE7B60 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 008B4 80AE7B64 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 008B8 80AE7B68 1000001E */ beq $zero, $zero, .L80AE7BE4 -/* 008BC 80AE7B6C AE0F0194 */ sw $t7, 0x0194($s0) ## 00000194 -.L80AE7B70: -/* 008C0 80AE7B70 8FA50034 */ lw $a1, 0x0034($sp) -/* 008C4 80AE7B74 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 008C8 80AE7B78 0C2B9D3F */ jal func_80AE74FC -/* 008CC 80AE7B7C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008D0 80AE7B80 10400018 */ beq $v0, $zero, .L80AE7BE4 -/* 008D4 80AE7B84 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 008D8 80AE7B88 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 008DC 80AE7B8C AE180194 */ sw $t8, 0x0194($s0) ## 00000194 -/* 008E0 80AE7B90 AE190198 */ sw $t9, 0x0198($s0) ## 00000198 -/* 008E4 80AE7B94 3C088016 */ lui $t0, %hi(gGameInfo) -/* 008E8 80AE7B98 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 008EC 80AE7B9C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 008F0 80AE7BA0 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 008F4 80AE7BA4 8509145E */ lh $t1, 0x145E($t0) ## 8016145E -/* 008F8 80AE7BA8 8E0B01A4 */ lw $t3, 0x01A4($s0) ## 000001A4 -/* 008FC 80AE7BAC 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00900 80AE7BB0 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 00904 80AE7BB4 AE0A01A0 */ sw $t2, 0x01A0($s0) ## 000001A0 -/* 00908 80AE7BB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0090C 80AE7BBC 46805420 */ cvt.s.w $f16, $f10 -/* 00910 80AE7BC0 46128100 */ add.s $f4, $f16, $f18 -/* 00914 80AE7BC4 15600005 */ bne $t3, $zero, .L80AE7BDC -/* 00918 80AE7BC8 E604019C */ swc1 $f4, 0x019C($s0) ## 0000019C -/* 0091C 80AE7BCC 0C2B9E35 */ jal func_80AE78D4 -/* 00920 80AE7BD0 8FA50034 */ lw $a1, 0x0034($sp) -/* 00924 80AE7BD4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00928 80AE7BD8 AE0C01A4 */ sw $t4, 0x01A4($s0) ## 000001A4 -.L80AE7BDC: -/* 0092C 80AE7BDC 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 00930 80AE7BE0 A20D00C8 */ sb $t5, 0x00C8($s0) ## 000000C8 -.L80AE7BE4: -/* 00934 80AE7BE4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00938 80AE7BE8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0093C 80AE7BEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00940 80AE7BF0 03E00008 */ jr $ra -/* 00944 80AE7BF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s deleted file mode 100644 index c6123a3da2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80AE7BF8 -/* 00948 80AE7BF8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0094C 80AE7BFC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00950 80AE7C00 10A00014 */ beq $a1, $zero, .L80AE7C54 -/* 00954 80AE7C04 AFA40028 */ sw $a0, 0x0028($sp) -/* 00958 80AE7C08 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0095C 80AE7C0C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00960 80AE7C10 24840830 */ addiu $a0, $a0, 0x0830 ## $a0 = 06000830 -/* 00964 80AE7C14 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00968 80AE7C18 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0096C 80AE7C1C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00970 80AE7C20 468021A0 */ cvt.s.w $f6, $f4 -/* 00974 80AE7C24 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00978 80AE7C28 44070000 */ mfc1 $a3, $f0 -/* 0097C 80AE7C2C 24A50830 */ addiu $a1, $a1, 0x0830 ## $a1 = 06000830 -/* 00980 80AE7C30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00984 80AE7C34 AFA00014 */ sw $zero, 0x0014($sp) -/* 00988 80AE7C38 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0098C 80AE7C3C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00990 80AE7C40 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00994 80AE7C44 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00998 80AE7C48 8FAF0028 */ lw $t7, 0x0028($sp) -/* 0099C 80AE7C4C 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 009A0 80AE7C50 ADEE0194 */ sw $t6, 0x0194($t7) ## 00000194 -.L80AE7C54: -/* 009A4 80AE7C54 8FBF0024 */ lw $ra, 0x0024($sp) -/* 009A8 80AE7C58 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 009AC 80AE7C5C 03E00008 */ jr $ra -/* 009B0 80AE7C60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s deleted file mode 100644 index 550b67a062..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AE7C64 -/* 009B4 80AE7C64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009B8 80AE7C68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 009BC 80AE7C6C AFA40018 */ sw $a0, 0x0018($sp) -/* 009C0 80AE7C70 0C2B9E55 */ jal func_80AE7954 -/* 009C4 80AE7C74 AFA5001C */ sw $a1, 0x001C($sp) -/* 009C8 80AE7C78 8FA40018 */ lw $a0, 0x0018($sp) -/* 009CC 80AE7C7C 0C2B9CF6 */ jal func_80AE73D8 -/* 009D0 80AE7C80 8FA5001C */ lw $a1, 0x001C($sp) -/* 009D4 80AE7C84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009D8 80AE7C88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009DC 80AE7C8C 03E00008 */ jr $ra -/* 009E0 80AE7C90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s deleted file mode 100644 index 68005f9f82..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AE7C94 -/* 009E4 80AE7C94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 009E8 80AE7C98 AFBF001C */ sw $ra, 0x001C($sp) -/* 009EC 80AE7C9C AFB00018 */ sw $s0, 0x0018($sp) -/* 009F0 80AE7CA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009F4 80AE7CA4 0C2B9D13 */ jal func_80AE744C -/* 009F8 80AE7CA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 009FC 80AE7CAC 0C2B9D25 */ jal func_80AE7494 -/* 00A00 80AE7CB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A04 80AE7CB4 0C2B9CB4 */ jal func_80AE72D0 -/* 00A08 80AE7CB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A0C 80AE7CBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A10 80AE7CC0 0C2B9E69 */ jal func_80AE79A4 -/* 00A14 80AE7CC4 8FA50024 */ lw $a1, 0x0024($sp) -/* 00A18 80AE7CC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A1C 80AE7CCC 0C2B9CF6 */ jal func_80AE73D8 -/* 00A20 80AE7CD0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00A24 80AE7CD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A28 80AE7CD8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A2C 80AE7CDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00A30 80AE7CE0 03E00008 */ jr $ra -/* 00A34 80AE7CE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s deleted file mode 100644 index b88353f560..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AE7CE8 -/* 00A38 80AE7CE8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A3C 80AE7CEC AFBF001C */ sw $ra, 0x001C($sp) -/* 00A40 80AE7CF0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A44 80AE7CF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A48 80AE7CF8 0C2B9D13 */ jal func_80AE744C -/* 00A4C 80AE7CFC AFA5002C */ sw $a1, 0x002C($sp) -/* 00A50 80AE7D00 0C2B9D25 */ jal func_80AE7494 -/* 00A54 80AE7D04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A58 80AE7D08 AFA20024 */ sw $v0, 0x0024($sp) -/* 00A5C 80AE7D0C 0C2B9CB4 */ jal func_80AE72D0 -/* 00A60 80AE7D10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A64 80AE7D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A68 80AE7D18 0C2B9EFE */ jal func_80AE7BF8 -/* 00A6C 80AE7D1C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00A70 80AE7D20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A74 80AE7D24 0C2B9CF6 */ jal func_80AE73D8 -/* 00A78 80AE7D28 8FA5002C */ lw $a1, 0x002C($sp) -/* 00A7C 80AE7D2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A80 80AE7D30 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A84 80AE7D34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A88 80AE7D38 03E00008 */ jr $ra -/* 00A8C 80AE7D3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s deleted file mode 100644 index 21c22401ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AE7D40 -/* 00A90 80AE7D40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A94 80AE7D44 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A98 80AE7D48 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A9C 80AE7D4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AA0 80AE7D50 0C2B9D13 */ jal func_80AE744C -/* 00AA4 80AE7D54 AFA50024 */ sw $a1, 0x0024($sp) -/* 00AA8 80AE7D58 0C2B9D25 */ jal func_80AE7494 -/* 00AAC 80AE7D5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AB0 80AE7D60 0C2B9CB4 */ jal func_80AE72D0 -/* 00AB4 80AE7D64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AB8 80AE7D68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ABC 80AE7D6C 0C2B9EBE */ jal func_80AE7AF8 -/* 00AC0 80AE7D70 8FA50024 */ lw $a1, 0x0024($sp) -/* 00AC4 80AE7D74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AC8 80AE7D78 0C2B9CF6 */ jal func_80AE73D8 -/* 00ACC 80AE7D7C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00AD0 80AE7D80 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AD4 80AE7D84 8FB00018 */ lw $s0, 0x0018($sp) -/* 00AD8 80AE7D88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00ADC 80AE7D8C 03E00008 */ jr $ra -/* 00AE0 80AE7D90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s deleted file mode 100644 index be9012ef01..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s +++ /dev/null @@ -1,105 +0,0 @@ -.rdata -glabel D_80AE8200 - .asciz "../z_en_rl_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AE8220 - .asciz "../z_en_rl_inKenjyanomaDemo02.c" - .balign 4 - -.text -glabel func_80AE7D94 -/* 00AE4 80AE7D94 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00AE8 80AE7D98 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AEC 80AE7D9C AFB00028 */ sw $s0, 0x0028($sp) -/* 00AF0 80AE7DA0 AFA40078 */ sw $a0, 0x0078($sp) -/* 00AF4 80AE7DA4 AFA5007C */ sw $a1, 0x007C($sp) -/* 00AF8 80AE7DA8 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 00AFC 80AE7DAC 3C1880AF */ lui $t8, %hi(D_80AE81A0) ## $t8 = 80AF0000 -/* 00B00 80AE7DB0 3C0680AF */ lui $a2, %hi(D_80AE8200) ## $a2 = 80AF0000 -/* 00B04 80AE7DB4 00027880 */ sll $t7, $v0, 2 -/* 00B08 80AE7DB8 030FC021 */ addu $t8, $t8, $t7 -/* 00B0C 80AE7DBC 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) -/* 00B10 80AE7DC0 24C68200 */ addiu $a2, $a2, %lo(D_80AE8200) ## $a2 = 80AE8200 -/* 00B14 80AE7DC4 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 00B18 80AE7DC8 AFB80068 */ sw $t8, 0x0068($sp) -/* 00B1C 80AE7DCC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00B20 80AE7DD0 24070130 */ addiu $a3, $zero, 0x0130 ## $a3 = 00000130 -/* 00B24 80AE7DD4 0C031AB1 */ jal Graph_OpenDisps -/* 00B28 80AE7DD8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B2C 80AE7DDC 8FA9007C */ lw $t1, 0x007C($sp) -/* 00B30 80AE7DE0 0C024F61 */ jal func_80093D84 -/* 00B34 80AE7DE4 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00B38 80AE7DE8 8FA70068 */ lw $a3, 0x0068($sp) -/* 00B3C 80AE7DEC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00B40 80AE7DF0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00B44 80AE7DF4 00076100 */ sll $t4, $a3, 4 -/* 00B48 80AE7DF8 000C6F02 */ srl $t5, $t4, 28 -/* 00B4C 80AE7DFC 3C0F8016 */ lui $t7, %hi(gSegments) -/* 00B50 80AE7E00 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00B54 80AE7E04 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00B58 80AE7E08 25EF6FA8 */ addiu $t7, %lo(gSegments) -/* 00B5C 80AE7E0C 000D7080 */ sll $t6, $t5, 2 -/* 00B60 80AE7E10 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00B64 80AE7E14 01CF2021 */ addu $a0, $t6, $t7 -/* 00B68 80AE7E18 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00B6C 80AE7E1C 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 00B70 80AE7E20 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00B74 80AE7E24 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00B78 80AE7E28 00E12824 */ and $a1, $a3, $at -/* 00B7C 80AE7E2C 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00B80 80AE7E30 0305C821 */ addu $t9, $t8, $a1 -/* 00B84 80AE7E34 03264821 */ addu $t1, $t9, $a2 -/* 00B88 80AE7E38 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00B8C 80AE7E3C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00B90 80AE7E40 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00B94 80AE7E44 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 00B98 80AE7E48 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00B9C 80AE7E4C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00BA0 80AE7E50 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00BA4 80AE7E54 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 00BA8 80AE7E58 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 00BAC 80AE7E5C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00BB0 80AE7E60 01856821 */ addu $t5, $t4, $a1 -/* 00BB4 80AE7E64 01A67021 */ addu $t6, $t5, $a2 -/* 00BB8 80AE7E68 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00BBC 80AE7E6C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00BC0 80AE7E70 8FA80078 */ lw $t0, 0x0078($sp) -/* 00BC4 80AE7E74 3C0C8011 */ lui $t4, %hi(D_80116280) -/* 00BC8 80AE7E78 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00BCC 80AE7E7C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00BD0 80AE7E80 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00BD4 80AE7E84 8D1901A0 */ lw $t9, 0x01A0($t0) ## 000001A0 -/* 00BD8 80AE7E88 258C6280 */ addiu $t4, %lo(D_80116280) -/* 00BDC 80AE7E8C 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 -/* 00BE0 80AE7E90 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 -/* 00BE4 80AE7E94 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00BE8 80AE7E98 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00BEC 80AE7E9C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00BF0 80AE7EA0 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00BF4 80AE7EA4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00BF8 80AE7EA8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00BFC 80AE7EAC 2502014C */ addiu $v0, $t0, 0x014C ## $v0 = 0000014C -/* 00C00 80AE7EB0 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 00C04 80AE7EB4 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 00C08 80AE7EB8 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00C0C 80AE7EBC AFA00018 */ sw $zero, 0x0018($sp) -/* 00C10 80AE7EC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C14 80AE7EC4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C18 80AE7EC8 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 00C1C 80AE7ECC 8FA4007C */ lw $a0, 0x007C($sp) -/* 00C20 80AE7ED0 0C0289CF */ jal SkelAnime_DrawSV2 -/* 00C24 80AE7ED4 AFAD001C */ sw $t5, 0x001C($sp) -/* 00C28 80AE7ED8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00C2C 80AE7EDC 8FAE007C */ lw $t6, 0x007C($sp) -/* 00C30 80AE7EE0 3C0680AF */ lui $a2, %hi(D_80AE8220) ## $a2 = 80AF0000 -/* 00C34 80AE7EE4 24C68220 */ addiu $a2, $a2, %lo(D_80AE8220) ## $a2 = 80AE8220 -/* 00C38 80AE7EE8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 00C3C 80AE7EEC 2407014B */ addiu $a3, $zero, 0x014B ## $a3 = 0000014B -/* 00C40 80AE7EF0 0C031AD5 */ jal Graph_CloseDisps -/* 00C44 80AE7EF4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00C48 80AE7EF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C4C 80AE7EFC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00C50 80AE7F00 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 00C54 80AE7F04 03E00008 */ jr $ra -/* 00C58 80AE7F08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s deleted file mode 100644 index fd2d0aca5c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80AE7FD0 -/* 00D20 80AE7FD0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00D24 80AE7FD4 03E00008 */ jr $ra -/* 00D28 80AE7FD8 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s deleted file mode 100644 index c2884262f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s +++ /dev/null @@ -1,100 +0,0 @@ -.rdata -glabel D_80AE827C - .asciz "../z_en_rl.c" - .balign 4 - -glabel D_80AE828C - .asciz "../z_en_rl.c" - .balign 4 - -.text -glabel func_80AE7FDC -/* 00D2C 80AE7FDC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00D30 80AE7FE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D34 80AE7FE4 AFA40070 */ sw $a0, 0x0070($sp) -/* 00D38 80AE7FE8 AFA50074 */ sw $a1, 0x0074($sp) -/* 00D3C 80AE7FEC 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 00D40 80AE7FF0 3C1880AF */ lui $t8, %hi(D_80AE81A0) ## $t8 = 80AF0000 -/* 00D44 80AE7FF4 3C0680AF */ lui $a2, %hi(D_80AE827C) ## $a2 = 80AF0000 -/* 00D48 80AE7FF8 00027880 */ sll $t7, $v0, 2 -/* 00D4C 80AE7FFC 030FC021 */ addu $t8, $t8, $t7 -/* 00D50 80AE8000 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) -/* 00D54 80AE8004 24C6827C */ addiu $a2, $a2, %lo(D_80AE827C) ## $a2 = 80AE827C -/* 00D58 80AE8008 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 00D5C 80AE800C AFB80060 */ sw $t8, 0x0060($sp) -/* 00D60 80AE8010 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00D64 80AE8014 240701A0 */ addiu $a3, $zero, 0x01A0 ## $a3 = 000001A0 -/* 00D68 80AE8018 0C031AB1 */ jal Graph_OpenDisps -/* 00D6C 80AE801C AFA50058 */ sw $a1, 0x0058($sp) -/* 00D70 80AE8020 8FA90074 */ lw $t1, 0x0074($sp) -/* 00D74 80AE8024 0C024F46 */ jal func_80093D18 -/* 00D78 80AE8028 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00D7C 80AE802C 8FA80058 */ lw $t0, 0x0058($sp) -/* 00D80 80AE8030 8FA70060 */ lw $a3, 0x0060($sp) -/* 00D84 80AE8034 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00D88 80AE8038 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00D8C 80AE803C 00076100 */ sll $t4, $a3, 4 -/* 00D90 80AE8040 000C6F02 */ srl $t5, $t4, 28 -/* 00D94 80AE8044 3C0F8016 */ lui $t7, %hi(gSegments) -/* 00D98 80AE8048 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00D9C 80AE804C 25EF6FA8 */ addiu $t7, %lo(gSegments) -/* 00DA0 80AE8050 000D7080 */ sll $t6, $t5, 2 -/* 00DA4 80AE8054 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00DA8 80AE8058 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 00DAC 80AE805C 01CF2021 */ addu $a0, $t6, $t7 -/* 00DB0 80AE8060 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00DB4 80AE8064 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 00DB8 80AE8068 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00DBC 80AE806C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00DC0 80AE8070 00E12824 */ and $a1, $a3, $at -/* 00DC4 80AE8074 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00DC8 80AE8078 0305C821 */ addu $t9, $t8, $a1 -/* 00DCC 80AE807C 03264821 */ addu $t1, $t9, $a2 -/* 00DD0 80AE8080 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00DD4 80AE8084 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00DD8 80AE8088 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00DDC 80AE808C 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 00DE0 80AE8090 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00DE4 80AE8094 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 00DE8 80AE8098 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00DEC 80AE809C 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 00DF0 80AE80A0 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00DF4 80AE80A4 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 00DF8 80AE80A8 01856821 */ addu $t5, $t4, $a1 -/* 00DFC 80AE80AC 01A67021 */ addu $t6, $t5, $a2 -/* 00E00 80AE80B0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00E04 80AE80B4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00E08 80AE80B8 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) -/* 00E0C 80AE80BC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 00E10 80AE80C0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00E14 80AE80C4 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 00E18 80AE80C8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00E1C 80AE80CC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00E20 80AE80D0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00E24 80AE80D4 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 -/* 00E28 80AE80D8 256B6290 */ addiu $t3, %lo(D_80116280+0x10) -/* 00E2C 80AE80DC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00E30 80AE80E0 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 00E34 80AE80E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00E38 80AE80E8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00E3C 80AE80EC 8FA30070 */ lw $v1, 0x0070($sp) -/* 00E40 80AE80F0 8FA40074 */ lw $a0, 0x0074($sp) -/* 00E44 80AE80F4 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 00E48 80AE80F8 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 00E4C 80AE80FC 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 00E50 80AE8100 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00E54 80AE8104 AFA00014 */ sw $zero, 0x0014($sp) -/* 00E58 80AE8108 AFA00010 */ sw $zero, 0x0010($sp) -/* 00E5C 80AE810C 0C0286B2 */ jal SkelAnime_DrawSV -/* 00E60 80AE8110 AFA30018 */ sw $v1, 0x0018($sp) -/* 00E64 80AE8114 8FAC0074 */ lw $t4, 0x0074($sp) -/* 00E68 80AE8118 3C0680AF */ lui $a2, %hi(D_80AE828C) ## $a2 = 80AF0000 -/* 00E6C 80AE811C 24C6828C */ addiu $a2, $a2, %lo(D_80AE828C) ## $a2 = 80AE828C -/* 00E70 80AE8120 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 00E74 80AE8124 240701B5 */ addiu $a3, $zero, 0x01B5 ## $a3 = 000001B5 -/* 00E78 80AE8128 0C031AD5 */ jal Graph_CloseDisps -/* 00E7C 80AE812C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00E80 80AE8130 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E84 80AE8134 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 00E88 80AE8138 03E00008 */ jr $ra -/* 00E8C 80AE813C 00000000 */ nop diff --git a/data/overlays/actors/z_en_rl.data.s b/data/overlays/actors/z_en_rl.data.s deleted file mode 100644 index a8f61cbc66..0000000000 --- a/data/overlays/actors/z_en_rl.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80AE81A0 - .word 0x06003620, 0x06003960, 0x06003B60 -glabel D_80AE81AC - .word 0x00000000 -glabel D_80AE81B0 - .word func_80AE7798 -.word func_80AE77B8 -.word func_80AE77F8 -.word func_80AE7838 -.word func_80AE7C64 -.word func_80AE7C94 -.word func_80AE7CE8 -.word func_80AE7D40 -glabel D_80AE81D0 - .word func_80AE7FD0 -.word func_80AE7FDC -.word func_80AE7D94 -glabel En_Rl_InitVars - .word 0x00A60400, 0x00000010, 0x00A70000, 0x000001AC -.word EnRl_Init -.word EnRl_Destroy -.word EnRl_Update -.word EnRl_Draw -.word 0x00000000 - diff --git a/data/overlays/actors/z_en_rl.reloc.s b/data/overlays/actors/z_en_rl.reloc.s deleted file mode 100644 index 9d32cd0465..0000000000 --- a/data/overlays/actors/z_en_rl.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80AE82E0 - .incbin "baserom/ovl_En_Rl", 0x1030, 0x00000160 diff --git a/spec b/spec index cb319b86d8..5fe66d53ed 100644 --- a/spec +++ b/spec @@ -2957,8 +2957,7 @@ endseg beginseg name "ovl_En_Rl" include "build/src/overlays/actors/ovl_En_Rl/z_en_rl.o" - include "build/data/overlays/actors/z_en_rl.data.o" - include "build/data/overlays/actors/z_en_rl.reloc.o" + include "build/src/overlays/actors/ovl_En_Rl/ovl_En_Rl_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index bb849aa836..78ea321bbb 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -1,4 +1,11 @@ +/* + * File: z_en_rl.c + * Overlay: En_Rl + * Description: Rauru + */ + #include "z_en_rl.h" +#include "vt.h" #define FLAGS 0x00000010 @@ -9,7 +16,376 @@ void EnRl_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnRl_Update(Actor* thisx, GlobalContext* globalCtx); void EnRl_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80AE7798(EnRl* this, GlobalContext* globalCtx); +void func_80AE77B8(EnRl* this, GlobalContext* globalCtx); +void func_80AE77F8(EnRl* this, GlobalContext* globalCtx); +void func_80AE7838(EnRl* this, GlobalContext* globalCtx); +void func_80AE7C64(EnRl* this, GlobalContext* globalCtx); +void func_80AE7C94(EnRl* this, GlobalContext* globalCtx); +void func_80AE7CE8(EnRl* this, GlobalContext* globalCtx); +void func_80AE7D40(EnRl* this, GlobalContext* globalCtx); +void func_80AE7FD0(EnRl* this, GlobalContext* globalCtx); +void func_80AE7FDC(EnRl* this, GlobalContext* globalCtx); +void func_80AE7D94(EnRl* this, GlobalContext* globalCtx); + +UNK_PTR D_80AE81A0[] = { 0x06003620, 0x06003960, 0x06003B60 }; + +extern SkeletonHeader D_06007B38; +extern AnimationHeader D_06000A3C; +extern AnimationHeader D_06000830; +extern AnimationHeader D_0600040C; + +void EnRl_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnRl* this = THIS; + + SkelAnime_Free(&this->skelAnime, globalCtx); +} + +void func_80AE72D0(EnRl* this) { + s32 pad[3]; + s16* timer = &this->timer; + s16* eyeTextureIndex = &this->eyeTextureIndex; + + if (DECR(*timer) == 0) { + *timer = Math_Rand_S16Offset(60, 60); + } + + *eyeTextureIndex = *timer; + if (*eyeTextureIndex > 2) { + *eyeTextureIndex = 0; + } +} + +void func_80AE7358(EnRl* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000A3C, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06000A3C.genericHeader), + 0, 0.0f); + this->action = 4; + this->drawConfig = 0; + this->alpha = 0; + this->lightBallSpawned = 0; + this->actor.shape.unk_14 = 0; + this->unk_19C = 0.0f; +} + +void func_80AE73D8(EnRl* this, GlobalContext* globalCtx) { + static s32 D_80AE81AC = 0; + + if (globalCtx->csCtx.state == 0) { + if (D_80AE81AC) { + if (this->actor.params == 2) { + func_80AE7358(this); + } + D_80AE81AC = 0; + } + } else if (!D_80AE81AC) { + D_80AE81AC = 1; + } +} + +void func_80AE744C(EnRl* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5); +} + +s32 func_80AE7494(EnRl* this) { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +s32 func_80AE74B4(EnRl* this, GlobalContext* globalCtx, u16 arg2, s32 arg3) { + CsCmdActorAction* csCmdActorAction; + + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.npcActions[arg3]; + if (csCmdActorAction != NULL && csCmdActorAction->action == arg2) { + return 1; + } + } + return 0; +} + +s32 func_80AE74FC(EnRl* this, GlobalContext* globalCtx, u16 arg2, s32 arg3) { + CsCmdActorAction* csCmdActorAction; + + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.npcActions[arg3]; + if (csCmdActorAction != NULL && csCmdActorAction->action != arg2) { + return 1; + } + } + return 0; +} + +void func_80AE7544(EnRl* this, GlobalContext* globalCtx) { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06007B38, &D_06000A3C, 0, 0, 0); +} + +void func_80AE7590(EnRl* this, GlobalContext* globalCtx) { + s32 pad; + Player* player; + Vec3f pos; + s16 sceneNum = globalCtx->sceneNum; + + if (gSaveContext.sceneSetupIndex == 4 && sceneNum == SCENE_KENJYANOMA && globalCtx->csCtx.state != 0 && + globalCtx->csCtx.npcActions[6] != NULL && globalCtx->csCtx.npcActions[6]->action == 2 && + !this->lightMedallionGiven) { + player = PLAYER; + pos.x = player->actor.posRot.pos.x; + pos.y = player->actor.posRot.pos.y + 80.0f; + pos.z = player->actor.posRot.pos.z; + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_EFFECT, pos.x, pos.y, pos.z, 0, 0, 0, 0xE); + Item_Give(globalCtx, ITEM_MEDALLION_LIGHT); + this->lightMedallionGiven = 1; + } +} + +void func_80AE7668(EnRl* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->drawConfig = 1; + this->action = 1; + player->actor.posRot.rot.y = player->actor.shape.rot.y = this->actor.posRot.rot.y + 0x8000; +} + +void func_80AE7698(EnRl* this, GlobalContext* globalCtx) { + CsCmdActorAction* csCmdActorAction; + + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.npcActions[0]; + if (csCmdActorAction != NULL && csCmdActorAction->action == 3) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600040C, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_0600040C.genericHeader), 2, 0.0f); + this->action = 2; + } + } +} + +void func_80AE772C(EnRl* this, s32 arg1) { + if (arg1) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000830, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06000830.genericHeader), 0, 0.0f); + this->action = 3; + } +} + +void func_80AE7798(EnRl* this, GlobalContext* globalCtx) { + func_80AE7668(this, globalCtx); +} + +void func_80AE77B8(EnRl* this, GlobalContext* globalCtx) { + func_80AE744C(this, globalCtx); + func_80AE7494(this); + func_80AE72D0(this); + func_80AE7698(this, globalCtx); +} + +void func_80AE77F8(EnRl* this, GlobalContext* globalCtx) { + s32 temp; + + func_80AE744C(this, globalCtx); + temp = func_80AE7494(this); + func_80AE72D0(this); + func_80AE772C(this, temp); +} + +void func_80AE7838(EnRl* this, GlobalContext* globalCtx) { + func_80AE744C(this, globalCtx); + func_80AE7494(this); + func_80AE72D0(this); + func_80AE7590(this, globalCtx); +} + +void func_80AE7878(EnRl* this, GlobalContext* globalCtx) { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06007B38, &D_06000A3C, 0, 0, 0); + this->action = 4; + this->actor.shape.unk_14 = 0; +} + +void func_80AE78D4(EnRl* this, GlobalContext* globalCtx) { + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, + kREG(18) + 22.0f + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 5); +} + +void func_80AE7954(EnRl* this, GlobalContext* globalCtx) { + if (func_80AE74B4(this, globalCtx, 4, 0)) { + this->action = 5; + this->drawConfig = 2; + this->alpha = 0; + this->actor.shape.unk_14 = 0; + this->unk_19C = 0.0f; + } +} + +void func_80AE79A4(EnRl* this, GlobalContext* globalCtx) { + f32* unk_19C = &this->unk_19C; + s32 alpha = 255; + + if (func_80AE74B4(this, globalCtx, 4, 0)) { + *unk_19C += 1.0f; + if (*unk_19C >= kREG(5) + 10.0f) { + this->action = 7; + this->drawConfig = 1; + *unk_19C = kREG(5) + 10.0f; + this->alpha = alpha; + this->actor.shape.unk_14 = alpha; + return; + } + } else { + *unk_19C -= 1.0f; + if (*unk_19C <= 0.0f) { + this->action = 4; + this->drawConfig = 0; + *unk_19C = 0.0f; + this->alpha = 0; + this->actor.shape.unk_14 = 0; + return; + } + } + alpha = (*unk_19C / (kREG(5) + 10.0f)) * 255.0f; + this->alpha = alpha; + this->actor.shape.unk_14 = alpha; +} + +void func_80AE7AF8(EnRl* this, GlobalContext* globalCtx) { + if (func_80AE74B4(this, globalCtx, 3, 0)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600040C, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_0600040C.genericHeader), 2, -8.0f); + this->action = 6; + } else if (func_80AE74FC(this, globalCtx, 4, 0)) { + this->action = 5; + this->drawConfig = 2; + this->unk_19C = kREG(5) + 10.0f; + this->alpha = 255; + if (!this->lightBallSpawned) { + func_80AE78D4(this, globalCtx); + this->lightBallSpawned = 1; + } + this->actor.shape.unk_14 = 0xFF; + } +} + +void func_80AE7BF8(EnRl* this, s32 arg1) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000830, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06000830.genericHeader), 0, 0.0f); + this->action = 7; + } +} + +void func_80AE7C64(EnRl* this, GlobalContext* globalCtx) { + func_80AE7954(this, globalCtx); + func_80AE73D8(this, globalCtx); +} + +void func_80AE7C94(EnRl* this, GlobalContext* globalCtx) { + func_80AE744C(this, globalCtx); + func_80AE7494(this); + func_80AE72D0(this); + func_80AE79A4(this, globalCtx); + func_80AE73D8(this, globalCtx); +} + +void func_80AE7CE8(EnRl* this, GlobalContext* globalCtx) { + s32 temp; + + func_80AE744C(this, globalCtx); + temp = func_80AE7494(this); + func_80AE72D0(this); + func_80AE7BF8(this, temp); + func_80AE73D8(this, globalCtx); +} + +void func_80AE7D40(EnRl* this, GlobalContext* globalCtx) { + func_80AE744C(this, globalCtx); + func_80AE7494(this); + func_80AE72D0(this); + func_80AE7AF8(this, globalCtx); + func_80AE73D8(this, globalCtx); +} + +void func_80AE7D94(EnRl* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 temp = this->eyeTextureIndex; + s32 addr = D_80AE81A0[temp]; + SkelAnime* skelAnime = &this->skelAnime; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_rl_inKenjyanomaDemo02.c", 304); + + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(oGfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->alpha); + gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, D_80116280); + + oGfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, + skelAnime->dListCount, NULL, NULL, NULL, oGfxCtx->polyXlu.p); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_rl_inKenjyanomaDemo02.c", 331); +} + +EnRlActionFunc sActionFuncs[] = { + func_80AE7798, func_80AE77B8, func_80AE77F8, func_80AE7838, + func_80AE7C64, func_80AE7C94, func_80AE7CE8, func_80AE7D40, +}; + +void EnRl_Update(Actor* thisx, GlobalContext* globalCtx) { + EnRl* this = THIS; + + if ((this->action < 0) || (this->action > 7) || (sActionFuncs[this->action] == NULL)) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sActionFuncs[this->action](this, globalCtx); +} + +void EnRl_Init(Actor* thisx, GlobalContext* globalCtx) { + EnRl* this = THIS; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 50.0f); + if (this->actor.params == 2) { + func_80AE7878(this, globalCtx); + } else { + func_80AE7544(this, globalCtx); + } +} +void func_80AE7FD0(EnRl* this, GlobalContext* globalCtx) { +} + +void func_80AE7FDC(EnRl* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 temp = this->eyeTextureIndex; + s32 addr = D_80AE81A0[temp]; + SkelAnime* skelAnime = &this->skelAnime; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_rl.c", 416); + + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 255); + gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + + SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, NULL, NULL, + &this->actor); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_rl.c", 437); +} + +EnRlDrawFunc sDrawFuncs[] = { + func_80AE7FD0, + func_80AE7FDC, + func_80AE7D94, +}; + +void EnRl_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnRl* this = THIS; + + if (this->drawConfig < 0 || this->drawConfig >= 3 || sDrawFuncs[this->drawConfig] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sDrawFuncs[this->drawConfig](this, globalCtx); +} + const ActorInit En_Rl_InitVars = { ACTOR_EN_RL, ACTORTYPE_NPC, @@ -20,70 +396,4 @@ const ActorInit En_Rl_InitVars = { (ActorFunc)EnRl_Destroy, (ActorFunc)EnRl_Update, (ActorFunc)EnRl_Draw, -}; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s") +}; \ No newline at end of file diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.h b/src/overlays/actors/ovl_En_Rl/z_en_rl.h index c0ab9c7d6c..6a6dc234e6 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.h +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.h @@ -6,9 +6,20 @@ struct EnRl; +typedef void (*EnRlActionFunc)(struct EnRl*, GlobalContext*); +typedef void (*EnRlDrawFunc)(struct EnRl*, GlobalContext*); + typedef struct EnRl { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x60]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ s16 eyeTextureIndex; + /* 0x0192 */ s16 timer; + /* 0x0194 */ s32 action; + /* 0x0198 */ s32 drawConfig; + /* 0x019C */ f32 unk_19C; + /* 0x01A0 */ s32 alpha; + /* 0x01A4 */ u32 lightBallSpawned; + /* 0x01A8 */ s32 lightMedallionGiven; } EnRl; // size = 0x01AC extern const ActorInit En_Rl_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index 686c4fee5a..21a4f30768 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1234,6 +1234,12 @@ D_040184B0 = 0x040184B0; D_0601BFB0 = 0x0601BFB0; D_0601C160 = 0x0601C160; +// z_en_rl +D_06007B38 = 0x06007B38; +D_06000A3C = 0x06000A3C; +D_06000830 = 0x06000830; +D_0600040C = 0x0600040C; + // z_en_takara_man D_06004FE0 = 0x06004FE0; D_06000498 = 0x06000498;