diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s deleted file mode 100644 index badc2b53c4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnNiwLady_Destroy -/* 000F8 80AB9D38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000FC 80AB9D3C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00100 80AB9D40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00104 80AB9D44 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00108 80AB9D48 0C0170EB */ jal Collider_DestroyCylinder - -/* 0010C 80AB9D4C 24C502B0 */ addiu $a1, $a2, 0x02B0 ## $a1 = 000002B0 -/* 00110 80AB9D50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00114 80AB9D54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00118 80AB9D58 03E00008 */ jr $ra -/* 0011C 80AB9D5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s deleted file mode 100644 index 15e639791a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s +++ /dev/null @@ -1,84 +0,0 @@ -.rdata -glabel D_80ABB420 - .asciz "\x1b[32m☆☆☆☆☆ ねぇちゃんうっふん ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80ABB458 - .asciz "\n\n" - .balign 4 - -.text -glabel EnNiwLady_Init -/* 00000 80AB9C40 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 80AB9C44 AFB00018 */ sw $s0, 0x0018($sp) -/* 00008 80AB9C48 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0000C 80AB9C4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00010 80AB9C50 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00014 80AB9C54 AFBF001C */ sw $ra, 0x001C($sp) -/* 00018 80AB9C58 AFA50034 */ sw $a1, 0x0034($sp) -/* 0001C 80AB9C5C 00A12021 */ addu $a0, $a1, $at -/* 00020 80AB9C60 AFA40024 */ sw $a0, 0x0024($sp) -/* 00024 80AB9C64 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00028 80AB9C68 24050110 */ addiu $a1, $zero, 0x0110 ## $a1 = 00000110 -/* 0002C 80AB9C6C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00030 80AB9C70 A2020280 */ sb $v0, 0x0280($s0) ## 00000280 -/* 00034 80AB9C74 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00038 80AB9C78 240500C5 */ addiu $a1, $zero, 0x00C5 ## $a1 = 000000C5 -/* 0003C 80AB9C7C A2020281 */ sb $v0, 0x0281($s0) ## 00000281 -/* 00040 80AB9C80 820E0281 */ lb $t6, 0x0281($s0) ## 00000281 -/* 00044 80AB9C84 05C00004 */ bltz $t6, .L80AB9C98 -/* 00048 80AB9C88 00000000 */ nop -/* 0004C 80AB9C8C 820F0280 */ lb $t7, 0x0280($s0) ## 00000280 -/* 00050 80AB9C90 05E30006 */ bgezl $t7, .L80AB9CAC -/* 00054 80AB9C94 A6000278 */ sh $zero, 0x0278($s0) ## 00000278 -.L80AB9C98: -/* 00058 80AB9C98 0C00B55C */ jal Actor_Kill - -/* 0005C 80AB9C9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00060 80AB9CA0 10000021 */ beq $zero, $zero, .L80AB9D28 -/* 00064 80AB9CA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00068 80AB9CA8 A6000278 */ sh $zero, 0x0278($s0) ## 00000278 -.L80AB9CAC: -/* 0006C 80AB9CAC 8FB80034 */ lw $t8, 0x0034($sp) -/* 00070 80AB9CB0 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 00074 80AB9CB4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00078 80AB9CB8 871900A4 */ lh $t9, 0x00A4($t8) ## 000000A4 -/* 0007C 80AB9CBC 3C098016 */ lui $t1, %hi(gSaveContext+0x10) -/* 00080 80AB9CC0 3C0480AC */ lui $a0, %hi(D_80ABB420) ## $a0 = 80AC0000 -/* 00084 80AB9CC4 57210003 */ bnel $t9, $at, .L80AB9CD4 -/* 00088 80AB9CC8 86050278 */ lh $a1, 0x0278($s0) ## 00000278 -/* 0008C 80AB9CCC A6080278 */ sh $t0, 0x0278($s0) ## 00000278 -/* 00090 80AB9CD0 86050278 */ lh $a1, 0x0278($s0) ## 00000278 -.L80AB9CD4: -/* 00094 80AB9CD4 10A00008 */ beq $a1, $zero, .L80AB9CF8 -/* 00098 80AB9CD8 00000000 */ nop -/* 0009C 80AB9CDC 8D29E670 */ lw $t1, %lo(gSaveContext+0x10)($t1) -/* 000A0 80AB9CE0 15200005 */ bne $t1, $zero, .L80AB9CF8 -/* 000A4 80AB9CE4 00000000 */ nop -/* 000A8 80AB9CE8 0C00B55C */ jal Actor_Kill - -/* 000AC 80AB9CEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000B0 80AB9CF0 1000000D */ beq $zero, $zero, .L80AB9D28 -/* 000B4 80AB9CF4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AB9CF8: -/* 000B8 80AB9CF8 0C00084C */ jal osSyncPrintf - -/* 000BC 80AB9CFC 2484B420 */ addiu $a0, $a0, %lo(D_80ABB420) ## $a0 = FFFFB420 -/* 000C0 80AB9D00 3C0480AC */ lui $a0, %hi(D_80ABB458) ## $a0 = 80AC0000 -/* 000C4 80AB9D04 0C00084C */ jal osSyncPrintf - -/* 000C8 80AB9D08 2484B458 */ addiu $a0, $a0, %lo(D_80ABB458) ## $a0 = 80ABB458 -/* 000CC 80AB9D0C 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 000D0 80AB9D10 44812000 */ mtc1 $at, $f4 ## $f4 = 600.00 -/* 000D4 80AB9D14 3C0A80AC */ lui $t2, %hi(func_80AB9F24) ## $t2 = 80AC0000 -/* 000D8 80AB9D18 254A9F24 */ addiu $t2, $t2, %lo(func_80AB9F24) ## $t2 = 80AB9F24 -/* 000DC 80AB9D1C AE0A0250 */ sw $t2, 0x0250($s0) ## 00000250 -/* 000E0 80AB9D20 E60400F4 */ swc1 $f4, 0x00F4($s0) ## 000000F4 -/* 000E4 80AB9D24 8FBF001C */ lw $ra, 0x001C($sp) -.L80AB9D28: -/* 000E8 80AB9D28 8FB00018 */ lw $s0, 0x0018($sp) -/* 000EC 80AB9D2C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 000F0 80AB9D30 03E00008 */ jr $ra -/* 000F4 80AB9D34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s deleted file mode 100644 index eba94aa2c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s +++ /dev/null @@ -1,168 +0,0 @@ -glabel EnNiwLady_Update -/* 01200 80ABAE40 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01204 80ABAE44 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01208 80ABAE48 AFB00020 */ sw $s0, 0x0020($sp) -/* 0120C 80ABAE4C AFA5003C */ sw $a1, 0x003C($sp) -/* 01210 80ABAE50 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01214 80ABAE54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01218 80ABAE58 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 0121C 80ABAE5C 0C00B56E */ jal Actor_SetHeight - -/* 01220 80ABAE60 AFA2002C */ sw $v0, 0x002C($sp) -/* 01224 80ABAE64 8FA2002C */ lw $v0, 0x002C($sp) -/* 01228 80ABAE68 3C198016 */ lui $t9, %hi(gSaveContext+4) -/* 0122C 80ABAE6C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01230 80ABAE70 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -/* 01234 80ABAE74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01238 80ABAE78 26050288 */ addiu $a1, $s0, 0x0288 ## $a1 = 00000288 -/* 0123C 80ABAE7C AE1802A0 */ sw $t8, 0x02A0($s0) ## 000002A0 -/* 01240 80ABAE80 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 -/* 01244 80ABAE84 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01248 80ABAE88 AE0F02A4 */ sw $t7, 0x02A4($s0) ## 000002A4 -/* 0124C 80ABAE8C 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C -/* 01250 80ABAE90 AE1802A8 */ sw $t8, 0x02A8($s0) ## 000002A8 -/* 01254 80ABAE94 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) -/* 01258 80ABAE98 13200006 */ beq $t9, $zero, .L80ABAEB4 -/* 0125C 80ABAE9C 00000000 */ nop -/* 01260 80ABAEA0 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 01264 80ABAEA4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01268 80ABAEA8 00000000 */ nop -/* 0126C 80ABAEAC 46062201 */ sub.s $f8, $f4, $f6 -/* 01270 80ABAEB0 E60802A4 */ swc1 $f8, 0x02A4($s0) ## 000002A4 -.L80ABAEB4: -/* 01274 80ABAEB4 0C00D285 */ jal func_80034A14 -/* 01278 80ABAEB8 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 0127C 80ABAEBC 8A090290 */ lwl $t1, 0x0290($s0) ## 00000290 -/* 01280 80ABAEC0 8A0B0296 */ lwl $t3, 0x0296($s0) ## 00000296 -/* 01284 80ABAEC4 9A090293 */ lwr $t1, 0x0293($s0) ## 00000293 -/* 01288 80ABAEC8 9A0B0299 */ lwr $t3, 0x0299($s0) ## 00000299 -/* 0128C 80ABAECC 920C0276 */ lbu $t4, 0x0276($s0) ## 00000276 -/* 01290 80ABAED0 AA090254 */ swl $t1, 0x0254($s0) ## 00000254 -/* 01294 80ABAED4 AA0B025A */ swl $t3, 0x025A($s0) ## 0000025A -/* 01298 80ABAED8 BA090257 */ swr $t1, 0x0257($s0) ## 00000257 -/* 0129C 80ABAEDC BA0B025D */ swr $t3, 0x025D($s0) ## 0000025D -/* 012A0 80ABAEE0 96090294 */ lhu $t1, 0x0294($s0) ## 00000294 -/* 012A4 80ABAEE4 960B029A */ lhu $t3, 0x029A($s0) ## 0000029A -/* 012A8 80ABAEE8 26040256 */ addiu $a0, $s0, 0x0256 ## $a0 = 00000256 -/* 012AC 80ABAEEC A6090258 */ sh $t1, 0x0258($s0) ## 00000258 -/* 012B0 80ABAEF0 15800006 */ bne $t4, $zero, .L80ABAF0C -/* 012B4 80ABAEF4 A60B025E */ sh $t3, 0x025E($s0) ## 0000025E -/* 012B8 80ABAEF8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 012BC 80ABAEFC 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 012C0 80ABAF00 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 012C4 80ABAF04 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 012C8 80ABAF08 AFA00010 */ sw $zero, 0x0010($sp) -.L80ABAF0C: -/* 012CC 80ABAF0C 820E0281 */ lb $t6, 0x0281($s0) ## 00000281 -/* 012D0 80ABAF10 8FAD003C */ lw $t5, 0x003C($sp) -/* 012D4 80ABAF14 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 012D8 80ABAF18 000E7900 */ sll $t7, $t6, 4 -/* 012DC 80ABAF1C 01EE7821 */ addu $t7, $t7, $t6 -/* 012E0 80ABAF20 000F7880 */ sll $t7, $t7, 2 -/* 012E4 80ABAF24 01AFC021 */ addu $t8, $t5, $t7 -/* 012E8 80ABAF28 0338C821 */ addu $t9, $t9, $t8 -/* 012EC 80ABAF2C 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 -/* 012F0 80ABAF30 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 012F4 80ABAF34 03214021 */ addu $t0, $t9, $at -/* 012F8 80ABAF38 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 012FC 80ABAF3C AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) -/* 01300 80ABAF40 82090281 */ lb $t1, 0x0281($s0) ## 00000281 -/* 01304 80ABAF44 05220052 */ bltzl $t1, .L80ABB090 -/* 01308 80ABAF48 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0130C 80ABAF4C 860A027E */ lh $t2, 0x027E($s0) ## 0000027E -/* 01310 80ABAF50 5140000D */ beql $t2, $zero, .L80ABAF88 -/* 01314 80ABAF54 8FA4003C */ lw $a0, 0x003C($sp) -/* 01318 80ABAF58 8602026E */ lh $v0, 0x026E($s0) ## 0000026E -/* 0131C 80ABAF5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01320 80ABAF60 10400006 */ beq $v0, $zero, .L80ABAF7C -/* 01324 80ABAF64 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF -/* 01328 80ABAF68 A60B026E */ sh $t3, 0x026E($s0) ## 0000026E -/* 0132C 80ABAF6C 8606026E */ lh $a2, 0x026E($s0) ## 0000026E -/* 01330 80ABAF70 0C2AE758 */ jal func_80AB9D60 -/* 01334 80ABAF74 8FA5003C */ lw $a1, 0x003C($sp) -/* 01338 80ABAF78 A600026E */ sh $zero, 0x026E($s0) ## 0000026E -.L80ABAF7C: -/* 0133C 80ABAF7C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01340 80ABAF80 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01344 80ABAF84 8FA4003C */ lw $a0, 0x003C($sp) -.L80ABAF88: -/* 01348 80ABAF88 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0134C 80ABAF8C 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 01350 80ABAF90 24050110 */ addiu $a1, $zero, 0x0110 ## $a1 = 00000110 -/* 01354 80ABAF94 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 01358 80ABAF98 00812021 */ addu $a0, $a0, $at -/* 0135C 80ABAF9C A2020280 */ sb $v0, 0x0280($s0) ## 00000280 -/* 01360 80ABAFA0 820C0280 */ lb $t4, 0x0280($s0) ## 00000280 -/* 01364 80ABAFA4 0582003A */ bltzl $t4, .L80ABB090 -/* 01368 80ABAFA8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0136C 80ABAFAC 8E190250 */ lw $t9, 0x0250($s0) ## 00000250 -/* 01370 80ABAFB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01374 80ABAFB4 8FA5003C */ lw $a1, 0x003C($sp) -/* 01378 80ABAFB8 0320F809 */ jalr $ra, $t9 -/* 0137C 80ABAFBC 00000000 */ nop -/* 01380 80ABAFC0 86020264 */ lh $v0, 0x0264($s0) ## 00000264 -/* 01384 80ABAFC4 10400002 */ beq $v0, $zero, .L80ABAFD0 -/* 01388 80ABAFC8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 0138C 80ABAFCC A60E0264 */ sh $t6, 0x0264($s0) ## 00000264 -.L80ABAFD0: -/* 01390 80ABAFD0 86020266 */ lh $v0, 0x0266($s0) ## 00000266 -/* 01394 80ABAFD4 10400003 */ beq $v0, $zero, .L80ABAFE4 -/* 01398 80ABAFD8 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF -/* 0139C 80ABAFDC A60D0266 */ sh $t5, 0x0266($s0) ## 00000266 -/* 013A0 80ABAFE0 86020266 */ lh $v0, 0x0266($s0) ## 00000266 -.L80ABAFE4: -/* 013A4 80ABAFE4 860F0260 */ lh $t7, 0x0260($s0) ## 00000260 -/* 013A8 80ABAFE8 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 013AC 80ABAFEC 14400010 */ bne $v0, $zero, .L80ABB030 -/* 013B0 80ABAFF0 A6180260 */ sh $t8, 0x0260($s0) ## 00000260 -/* 013B4 80ABAFF4 8608027C */ lh $t0, 0x027C($s0) ## 0000027C -/* 013B8 80ABAFF8 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 013BC 80ABAFFC A609027C */ sh $t1, 0x027C($s0) ## 0000027C -/* 013C0 80ABB000 860A027C */ lh $t2, 0x027C($s0) ## 0000027C -/* 013C4 80ABB004 29410003 */ slti $at, $t2, 0x0003 -/* 013C8 80ABB008 14200009 */ bne $at, $zero, .L80ABB030 -/* 013CC 80ABB00C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 013D0 80ABB010 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 013D4 80ABB014 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 013D8 80ABB018 A600027C */ sh $zero, 0x027C($s0) ## 0000027C -/* 013DC 80ABB01C 4600028D */ trunc.w.s $f10, $f0 -/* 013E0 80ABB020 440E5000 */ mfc1 $t6, $f10 -/* 013E4 80ABB024 00000000 */ nop -/* 013E8 80ABB028 25CD0014 */ addiu $t5, $t6, 0x0014 ## $t5 = 00000014 -/* 013EC 80ABB02C A60D0266 */ sh $t5, 0x0266($s0) ## 00000266 -.L80ABB030: -/* 013F0 80ABB030 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 013F4 80ABB034 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 013F8 80ABB038 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 013FC 80ABB03C 44818000 */ mtc1 $at, $f16 ## $f16 = 60.00 -/* 01400 80ABB040 240F001D */ addiu $t7, $zero, 0x001D ## $t7 = 0000001D -/* 01404 80ABB044 44060000 */ mfc1 $a2, $f0 -/* 01408 80ABB048 44070000 */ mfc1 $a3, $f0 -/* 0140C 80ABB04C AFAF0014 */ sw $t7, 0x0014($sp) -/* 01410 80ABB050 8FA4003C */ lw $a0, 0x003C($sp) -/* 01414 80ABB054 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01418 80ABB058 0C00B92D */ jal func_8002E4B4 -/* 0141C 80ABB05C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01420 80ABB060 260602B0 */ addiu $a2, $s0, 0x02B0 ## $a2 = 000002B0 -/* 01424 80ABB064 00C02825 */ or $a1, $a2, $zero ## $a1 = 000002B0 -/* 01428 80ABB068 AFA60028 */ sw $a2, 0x0028($sp) -/* 0142C 80ABB06C 0C0189B7 */ jal Collider_CylinderUpdate - -/* 01430 80ABB070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01434 80ABB074 8FA4003C */ lw $a0, 0x003C($sp) -/* 01438 80ABB078 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0143C 80ABB07C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01440 80ABB080 8FA60028 */ lw $a2, 0x0028($sp) -/* 01444 80ABB084 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 01448 80ABB088 00812821 */ addu $a1, $a0, $at -/* 0144C 80ABB08C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ABB090: -/* 01450 80ABB090 8FB00020 */ lw $s0, 0x0020($sp) -/* 01454 80ABB094 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01458 80ABB098 03E00008 */ jr $ra -/* 0145C 80ABB09C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s deleted file mode 100644 index e15a96f2ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s +++ /dev/null @@ -1,166 +0,0 @@ -.late_rodata -glabel jtbl_80ABB744 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E80 -.word L80AB9E34 -.word L80AB9DE8 -.word L80AB9DE4 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9F14 -.word L80AB9E80 -.word L80AB9E34 -.word L80AB9E34 -.word L80AB9E80 -.word L80AB9E34 -.word L80AB9E80 -.word L80AB9E80 -.word L80AB9E80 -.word L80AB9E80 -.word L80AB9E34 - -.text -glabel func_80AB9D60 -/* 00120 80AB9D60 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00124 80AB9D64 AFA40028 */ sw $a0, 0x0028($sp) -/* 00128 80AB9D68 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0012C 80AB9D6C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00130 80AB9D70 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 00134 80AB9D74 0C01B0D8 */ jal Text_GetFaceReaction -/* 00138 80AB9D78 AFA60030 */ sw $a2, 0x0030($sp) -/* 0013C 80AB9D7C 8FA30028 */ lw $v1, 0x0028($sp) -/* 00140 80AB9D80 10400002 */ beq $v0, $zero, .L80AB9D8C -/* 00144 80AB9D84 8FA60030 */ lw $a2, 0x0030($sp) -/* 00148 80AB9D88 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -.L80AB9D8C: -/* 0014C 80AB9D8C 846E0270 */ lh $t6, 0x0270($v1) ## 00000270 -/* 00150 80AB9D90 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00154 80AB9D94 28C1001E */ slti $at, $a2, 0x001E -/* 00158 80AB9D98 50CE005F */ beql $a2, $t6, .L80AB9F18 -/* 0015C 80AB9D9C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00160 80AB9DA0 A0600275 */ sb $zero, 0x0275($v1) ## 00000275 -/* 00164 80AB9DA4 A0620276 */ sb $v0, 0x0276($v1) ## 00000276 -/* 00168 80AB9DA8 14200006 */ bne $at, $zero, .L80AB9DC4 -/* 0016C 80AB9DAC A4660270 */ sh $a2, 0x0270($v1) ## 00000270 -/* 00170 80AB9DB0 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 00174 80AB9DB4 10C10045 */ beq $a2, $at, .L80AB9ECC -/* 00178 80AB9DB8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0017C 80AB9DBC 10000056 */ beq $zero, $zero, .L80AB9F18 -/* 00180 80AB9DC0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AB9DC4: -/* 00184 80AB9DC4 2CC1001E */ sltiu $at, $a2, 0x001E -/* 00188 80AB9DC8 10200052 */ beq $at, $zero, .L80AB9F14 -/* 0018C 80AB9DCC 00067880 */ sll $t7, $a2, 2 -/* 00190 80AB9DD0 3C0180AC */ lui $at, %hi(jtbl_80ABB744) ## $at = 80AC0000 -/* 00194 80AB9DD4 002F0821 */ addu $at, $at, $t7 -/* 00198 80AB9DD8 8C2FB744 */ lw $t7, %lo(jtbl_80ABB744)($at) -/* 0019C 80AB9DDC 01E00008 */ jr $t7 -/* 001A0 80AB9DE0 00000000 */ nop -glabel L80AB9DE4 -/* 001A4 80AB9DE4 A0620275 */ sb $v0, 0x0275($v1) ## 00000275 -glabel L80AB9DE8 -/* 001A8 80AB9DE8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 001AC 80AB9DEC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 001B0 80AB9DF0 248407D0 */ addiu $a0, $a0, 0x07D0 ## $a0 = 060007D0 -/* 001B4 80AB9DF4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 001B8 80AB9DF8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 001BC 80AB9DFC 8FA30028 */ lw $v1, 0x0028($sp) -/* 001C0 80AB9E00 468021A0 */ cvt.s.w $f6, $f4 -/* 001C4 80AB9E04 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 001C8 80AB9E08 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001CC 80AB9E0C 24A507D0 */ addiu $a1, $a1, 0x07D0 ## $a1 = 060007D0 -/* 001D0 80AB9E10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 001D4 80AB9E14 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 001D8 80AB9E18 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 001DC 80AB9E1C AFA00014 */ sw $zero, 0x0014($sp) -/* 001E0 80AB9E20 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 001E4 80AB9E24 0C029468 */ jal SkelAnime_ChangeAnim - -/* 001E8 80AB9E28 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 001EC 80AB9E2C 1000003A */ beq $zero, $zero, .L80AB9F18 -/* 001F0 80AB9E30 8FBF0024 */ lw $ra, 0x0024($sp) -glabel L80AB9E34 -/* 001F4 80AB9E34 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 001F8 80AB9E38 0C028800 */ jal SkelAnime_GetFrameCount - -/* 001FC 80AB9E3C 24849F94 */ addiu $a0, $a0, 0x9F94 ## $a0 = 06009F94 -/* 00200 80AB9E40 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00204 80AB9E44 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00208 80AB9E48 8FA30028 */ lw $v1, 0x0028($sp) -/* 0020C 80AB9E4C 46805420 */ cvt.s.w $f16, $f10 -/* 00210 80AB9E50 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00214 80AB9E54 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00218 80AB9E58 24A59F94 */ addiu $a1, $a1, 0x9F94 ## $a1 = 06009F94 -/* 0021C 80AB9E5C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00220 80AB9E60 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00224 80AB9E64 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00228 80AB9E68 AFA00014 */ sw $zero, 0x0014($sp) -/* 0022C 80AB9E6C 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00230 80AB9E70 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00234 80AB9E74 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00238 80AB9E78 10000027 */ beq $zero, $zero, .L80AB9F18 -/* 0023C 80AB9E7C 8FBF0024 */ lw $ra, 0x0024($sp) -glabel L80AB9E80 -/* 00240 80AB9E80 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00244 80AB9E84 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00248 80AB9E88 24840718 */ addiu $a0, $a0, 0x0718 ## $a0 = 06000718 -/* 0024C 80AB9E8C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00250 80AB9E90 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00254 80AB9E94 8FA30028 */ lw $v1, 0x0028($sp) -/* 00258 80AB9E98 468021A0 */ cvt.s.w $f6, $f4 -/* 0025C 80AB9E9C 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00260 80AB9EA0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00264 80AB9EA4 24A50718 */ addiu $a1, $a1, 0x0718 ## $a1 = 06000718 -/* 00268 80AB9EA8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0026C 80AB9EAC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00270 80AB9EB0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00274 80AB9EB4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00278 80AB9EB8 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 0027C 80AB9EBC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00280 80AB9EC0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00284 80AB9EC4 10000014 */ beq $zero, $zero, .L80AB9F18 -/* 00288 80AB9EC8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AB9ECC: -/* 0028C 80AB9ECC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00290 80AB9ED0 2484A630 */ addiu $a0, $a0, 0xA630 ## $a0 = FFFFA630 -/* 00294 80AB9ED4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00298 80AB9ED8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 0029C 80AB9EDC 8FA30028 */ lw $v1, 0x0028($sp) -/* 002A0 80AB9EE0 46805420 */ cvt.s.w $f16, $f10 -/* 002A4 80AB9EE4 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 002A8 80AB9EE8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 002AC 80AB9EEC 24A5A630 */ addiu $a1, $a1, 0xA630 ## $a1 = 0600A630 -/* 002B0 80AB9EF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 002B4 80AB9EF4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 002B8 80AB9EF8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 002BC 80AB9EFC AFA00014 */ sw $zero, 0x0014($sp) -/* 002C0 80AB9F00 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 002C4 80AB9F04 0C029468 */ jal SkelAnime_ChangeAnim - -/* 002C8 80AB9F08 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 002CC 80AB9F0C 8FA30028 */ lw $v1, 0x0028($sp) -/* 002D0 80AB9F10 A0600276 */ sb $zero, 0x0276($v1) ## 00000276 -glabel L80AB9F14 -.L80AB9F14: -/* 002D4 80AB9F14 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AB9F18: -/* 002D8 80AB9F18 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002DC 80AB9F1C 03E00008 */ jr $ra -/* 002E0 80AB9F20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s deleted file mode 100644 index b04a56ae0c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s +++ /dev/null @@ -1,210 +0,0 @@ -glabel func_80AB9F24 -/* 002E4 80AB9F24 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 002E8 80AB9F28 AFB00028 */ sw $s0, 0x0028($sp) -/* 002EC 80AB9F2C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 002F0 80AB9F30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002F4 80AB9F34 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 002F8 80AB9F38 AFBF002C */ sw $ra, 0x002C($sp) -/* 002FC 80AB9F3C AFA5004C */ sw $a1, 0x004C($sp) -/* 00300 80AB9F40 00A12021 */ addu $a0, $a1, $at -/* 00304 80AB9F44 82050280 */ lb $a1, 0x0280($s0) ## 00000280 -/* 00308 80AB9F48 0C026062 */ jal Object_IsLoaded - -/* 0030C 80AB9F4C AFA40038 */ sw $a0, 0x0038($sp) -/* 00310 80AB9F50 104000AD */ beq $v0, $zero, .L80ABA208 -/* 00314 80AB9F54 8FA40038 */ lw $a0, 0x0038($sp) -/* 00318 80AB9F58 0C026062 */ jal Object_IsLoaded - -/* 0031C 80AB9F5C 82050281 */ lb $a1, 0x0281($s0) ## 00000281 -/* 00320 80AB9F60 104000A9 */ beq $v0, $zero, .L80ABA208 -/* 00324 80AB9F64 8FA4004C */ lw $a0, 0x004C($sp) -/* 00328 80AB9F68 820E0280 */ lb $t6, 0x0280($s0) ## 00000280 -/* 0032C 80AB9F6C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 00330 80AB9F70 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00334 80AB9F74 000E7900 */ sll $t7, $t6, 4 -/* 00338 80AB9F78 01EE7821 */ addu $t7, $t7, $t6 -/* 0033C 80AB9F7C 000F7880 */ sll $t7, $t7, 2 -/* 00340 80AB9F80 008FC021 */ addu $t8, $a0, $t7 -/* 00344 80AB9F84 0338C821 */ addu $t9, $t9, $t8 -/* 00348 80AB9F88 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 -/* 0034C 80AB9F8C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00350 80AB9F90 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00354 80AB9F94 03214021 */ addu $t0, $t9, $at -/* 00358 80AB9F98 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 0035C 80AB9F9C 26090190 */ addiu $t1, $s0, 0x0190 ## $t1 = 00000190 -/* 00360 80AB9FA0 260A01F0 */ addiu $t2, $s0, 0x01F0 ## $t2 = 000001F0 -/* 00364 80AB9FA4 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 00368 80AB9FA8 AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) -/* 0036C 80AB9FAC AFAB0018 */ sw $t3, 0x0018($sp) -/* 00370 80AB9FB0 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00374 80AB9FB4 AFA90010 */ sw $t1, 0x0010($sp) -/* 00378 80AB9FB8 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 0037C 80AB9FBC AFA50038 */ sw $a1, 0x0038($sp) -/* 00380 80AB9FC0 0C0291BE */ jal SkelAnime_InitSV -/* 00384 80AB9FC4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00388 80AB9FC8 820D0281 */ lb $t5, 0x0281($s0) ## 00000281 -/* 0038C 80AB9FCC 8FAC004C */ lw $t4, 0x004C($sp) -/* 00390 80AB9FD0 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 00394 80AB9FD4 000D7100 */ sll $t6, $t5, 4 -/* 00398 80AB9FD8 01CD7021 */ addu $t6, $t6, $t5 -/* 0039C 80AB9FDC 000E7080 */ sll $t6, $t6, 2 -/* 003A0 80AB9FE0 018E7821 */ addu $t7, $t4, $t6 -/* 003A4 80AB9FE4 030FC021 */ addu $t8, $t8, $t7 -/* 003A8 80AB9FE8 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 -/* 003AC 80AB9FEC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 003B0 80AB9FF0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 003B4 80AB9FF4 0301C821 */ addu $t9, $t8, $at -/* 003B8 80AB9FF8 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 003BC 80AB9FFC AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) -/* 003C0 80ABA000 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 003C4 80ABA004 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 -/* 003C8 80ABA008 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 003CC 80ABA00C A608027E */ sh $t0, 0x027E($s0) ## 0000027E -/* 003D0 80ABA010 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 003D4 80ABA014 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003D8 80ABA018 0C00B58B */ jal Actor_SetScale - -/* 003DC 80ABA01C E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 003E0 80ABA020 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 003E4 80ABA024 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 003E8 80ABA028 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 003EC 80ABA02C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 003F0 80ABA030 0C00AC78 */ jal ActorShape_Init - -/* 003F4 80ABA034 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 003F8 80ABA038 260502B0 */ addiu $a1, $s0, 0x02B0 ## $a1 = 000002B0 -/* 003FC 80ABA03C AFA50034 */ sw $a1, 0x0034($sp) -/* 00400 80ABA040 0C0170D9 */ jal Collider_InitCylinder - -/* 00404 80ABA044 8FA4004C */ lw $a0, 0x004C($sp) -/* 00408 80ABA048 3C0780AC */ lui $a3, %hi(D_80ABB3C4) ## $a3 = 80AC0000 -/* 0040C 80ABA04C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00410 80ABA050 24E7B3C4 */ addiu $a3, $a3, %lo(D_80ABB3C4) ## $a3 = 80ABB3C4 -/* 00414 80ABA054 8FA4004C */ lw $a0, 0x004C($sp) -/* 00418 80ABA058 0C01712B */ jal Collider_SetCylinder - -/* 0041C 80ABA05C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00420 80ABA060 86030278 */ lh $v1, 0x0278($s0) ## 00000278 -/* 00424 80ABA064 3C0A80AC */ lui $t2, %hi(func_80ABB228) ## $t2 = 80AC0000 -/* 00428 80ABA068 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 0042C 80ABA06C 254AB228 */ addiu $t2, $t2, %lo(func_80ABB228) ## $t2 = 80ABB228 -/* 00430 80ABA070 A2000272 */ sb $zero, 0x0272($s0) ## 00000272 -/* 00434 80ABA074 A209001F */ sb $t1, 0x001F($s0) ## 0000001F -/* 00438 80ABA078 10600006 */ beq $v1, $zero, .L80ABA094 -/* 0043C 80ABA07C AE0A0134 */ sw $t2, 0x0134($s0) ## 00000134 -/* 00440 80ABA080 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00444 80ABA084 10610047 */ beq $v1, $at, .L80ABA1A4 -/* 00448 80ABA088 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0044C 80ABA08C 1000005F */ beq $zero, $zero, .L80ABA20C -/* 00450 80ABA090 8FBF002C */ lw $ra, 0x002C($sp) -.L80ABA094: -/* 00454 80ABA094 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00458 80ABA098 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 0045C 80ABA09C 944B0EF0 */ lhu $t3, 0x0EF0($v0) ## 8015F550 -/* 00460 80ABA0A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00464 80ABA0A4 316D1000 */ andi $t5, $t3, 0x1000 ## $t5 = 00000000 -/* 00468 80ABA0A8 15A0001D */ bne $t5, $zero, .L80ABA120 -/* 0046C 80ABA0AC 00000000 */ nop -/* 00470 80ABA0B0 8C4C0004 */ lw $t4, 0x0004($v0) ## 8015E664 -/* 00474 80ABA0B4 1180001A */ beq $t4, $zero, .L80ABA120 -/* 00478 80ABA0B8 00000000 */ nop -/* 0047C 80ABA0BC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00480 80ABA0C0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00484 80ABA0C4 2484A630 */ addiu $a0, $a0, 0xA630 ## $a0 = 0600A630 -/* 00488 80ABA0C8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0048C 80ABA0CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00490 80ABA0D0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00494 80ABA0D4 46803220 */ cvt.s.w $f8, $f6 -/* 00498 80ABA0D8 44070000 */ mfc1 $a3, $f0 -/* 0049C 80ABA0DC 24A5A630 */ addiu $a1, $a1, 0xA630 ## $a1 = 0600A630 -/* 004A0 80ABA0E0 8FA40038 */ lw $a0, 0x0038($sp) -/* 004A4 80ABA0E4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 004A8 80ABA0E8 AFA00014 */ sw $zero, 0x0014($sp) -/* 004AC 80ABA0EC 4600428D */ trunc.w.s $f10, $f8 -/* 004B0 80ABA0F0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 004B4 80ABA0F4 440F5000 */ mfc1 $t7, $f10 -/* 004B8 80ABA0F8 00000000 */ nop -/* 004BC 80ABA0FC 000FC400 */ sll $t8, $t7, 16 -/* 004C0 80ABA100 0018CC03 */ sra $t9, $t8, 16 -/* 004C4 80ABA104 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 004C8 80ABA108 00000000 */ nop -/* 004CC 80ABA10C 468084A0 */ cvt.s.w $f18, $f16 -/* 004D0 80ABA110 0C029468 */ jal SkelAnime_ChangeAnim - -/* 004D4 80ABA114 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 004D8 80ABA118 10000017 */ beq $zero, $zero, .L80ABA178 -/* 004DC 80ABA11C 00000000 */ nop -.L80ABA120: -/* 004E0 80ABA120 0C028800 */ jal SkelAnime_GetFrameCount - -/* 004E4 80ABA124 248407D0 */ addiu $a0, $a0, 0x07D0 ## $a0 = 000007D0 -/* 004E8 80ABA128 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 004EC 80ABA12C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 004F0 80ABA130 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004F4 80ABA134 468021A0 */ cvt.s.w $f6, $f4 -/* 004F8 80ABA138 44070000 */ mfc1 $a3, $f0 -/* 004FC 80ABA13C 24A507D0 */ addiu $a1, $a1, 0x07D0 ## $a1 = 060007D0 -/* 00500 80ABA140 8FA40038 */ lw $a0, 0x0038($sp) -/* 00504 80ABA144 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00508 80ABA148 AFA00014 */ sw $zero, 0x0014($sp) -/* 0050C 80ABA14C 4600320D */ trunc.w.s $f8, $f6 -/* 00510 80ABA150 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00514 80ABA154 44094000 */ mfc1 $t1, $f8 -/* 00518 80ABA158 00000000 */ nop -/* 0051C 80ABA15C 00095400 */ sll $t2, $t1, 16 -/* 00520 80ABA160 000A5C03 */ sra $t3, $t2, 16 -/* 00524 80ABA164 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 -/* 00528 80ABA168 00000000 */ nop -/* 0052C 80ABA16C 46805420 */ cvt.s.w $f16, $f10 -/* 00530 80ABA170 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00534 80ABA174 E7B00010 */ swc1 $f16, 0x0010($sp) -.L80ABA178: -/* 00538 80ABA178 3C0D8016 */ lui $t5, %hi(gSaveContext+4) -/* 0053C 80ABA17C 8DADE664 */ lw $t5, %lo(gSaveContext+4)($t5) -/* 00540 80ABA180 3C0E80AC */ lui $t6, %hi(func_80ABA21C) ## $t6 = 80AC0000 -/* 00544 80ABA184 3C0C80AC */ lui $t4, %hi(func_80ABA778) ## $t4 = 80AC0000 -/* 00548 80ABA188 15A00004 */ bne $t5, $zero, .L80ABA19C -/* 0054C 80ABA18C 25CEA21C */ addiu $t6, $t6, %lo(func_80ABA21C) ## $t6 = 80ABA21C -/* 00550 80ABA190 258CA778 */ addiu $t4, $t4, %lo(func_80ABA778) ## $t4 = 80ABA778 -/* 00554 80ABA194 1000001C */ beq $zero, $zero, .L80ABA208 -/* 00558 80ABA198 AE0C0250 */ sw $t4, 0x0250($s0) ## 00000250 -.L80ABA19C: -/* 0055C 80ABA19C 1000001A */ beq $zero, $zero, .L80ABA208 -/* 00560 80ABA1A0 AE0E0250 */ sw $t6, 0x0250($s0) ## 00000250 -.L80ABA1A4: -/* 00564 80ABA1A4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00568 80ABA1A8 248407D0 */ addiu $a0, $a0, 0x07D0 ## $a0 = 000007D0 -/* 0056C 80ABA1AC 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 00570 80ABA1B0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00574 80ABA1B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00578 80ABA1B8 46809120 */ cvt.s.w $f4, $f18 -/* 0057C 80ABA1BC 44070000 */ mfc1 $a3, $f0 -/* 00580 80ABA1C0 24A507D0 */ addiu $a1, $a1, 0x07D0 ## $a1 = 060007D0 -/* 00584 80ABA1C4 8FA40038 */ lw $a0, 0x0038($sp) -/* 00588 80ABA1C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0058C 80ABA1CC AFA00014 */ sw $zero, 0x0014($sp) -/* 00590 80ABA1D0 4600218D */ trunc.w.s $f6, $f4 -/* 00594 80ABA1D4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00598 80ABA1D8 44183000 */ mfc1 $t8, $f6 -/* 0059C 80ABA1DC 00000000 */ nop -/* 005A0 80ABA1E0 0018CC00 */ sll $t9, $t8, 16 -/* 005A4 80ABA1E4 00194403 */ sra $t0, $t9, 16 -/* 005A8 80ABA1E8 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 005AC 80ABA1EC 00000000 */ nop -/* 005B0 80ABA1F0 468042A0 */ cvt.s.w $f10, $f8 -/* 005B4 80ABA1F4 0C029468 */ jal SkelAnime_ChangeAnim - -/* 005B8 80ABA1F8 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 005BC 80ABA1FC 3C0980AC */ lui $t1, %hi(func_80ABAD38) ## $t1 = 80AC0000 -/* 005C0 80ABA200 2529AD38 */ addiu $t1, $t1, %lo(func_80ABAD38) ## $t1 = 80ABAD38 -/* 005C4 80ABA204 AE090250 */ sw $t1, 0x0250($s0) ## 00000250 -.L80ABA208: -/* 005C8 80ABA208 8FBF002C */ lw $ra, 0x002C($sp) -.L80ABA20C: -/* 005CC 80ABA20C 8FB00028 */ lw $s0, 0x0028($sp) -/* 005D0 80ABA210 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 005D4 80ABA214 03E00008 */ jr $ra -/* 005D8 80ABA218 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA21C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA21C.s deleted file mode 100644 index 334b9f09c7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA21C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80ABA21C -/* 005DC 80ABA21C 3C0E80AC */ lui $t6, %hi(D_80ABB3A0) ## $t6 = 80AC0000 -/* 005E0 80ABA220 85CEB3A0 */ lh $t6, %lo(D_80ABB3A0)($t6) -/* 005E4 80ABA224 AFA50004 */ sw $a1, 0x0004($sp) -/* 005E8 80ABA228 3C1880AC */ lui $t8, %hi(func_80ABA244) ## $t8 = 80AC0000 -/* 005EC 80ABA22C 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 005F0 80ABA230 2718A244 */ addiu $t8, $t8, %lo(func_80ABA244) ## $t8 = 80ABA244 -/* 005F4 80ABA234 A48F0262 */ sh $t7, 0x0262($a0) ## 00000262 -/* 005F8 80ABA238 AC980250 */ sw $t8, 0x0250($a0) ## 00000250 -/* 005FC 80ABA23C 03E00008 */ jr $ra -/* 00600 80ABA240 A48E010E */ sh $t6, 0x010E($a0) ## 0000010E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s deleted file mode 100644 index 544a3aa6b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s +++ /dev/null @@ -1,348 +0,0 @@ -.rdata -glabel D_80ABB45C - .asciz "\x1b[32m☆ 鶏柵内ＧＥＴ！☆ %x\n\x1b[m" - .balign 4 - -glabel D_80ABB47C - .asciz "\n\n" - .balign 4 - -glabel D_80ABB480 - .asciz "\x1b[33m☆☆☆☆☆ ねぇちゃん選択 ☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80ABB4B0 - .asciz "\x1b[33m☆☆☆☆☆ ねぇちゃんハート ☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80ABB4E8 - .asciz "\x1b[33m☆☆☆☆☆ ねぇちゃん保存 ☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80ABB520 - .asciz "\x1b[33m☆☆☆☆☆ ねぇちゃん今 ☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80ABB550 - .asciz "\x1b[32m☆☆☆☆☆ this->actor.talk_message ☆☆ %x\n\x1b[m" - .balign 4 - -glabel D_80ABB588 - .asciz "\x1b[32m☆☆☆☆☆ this->message_end_code ☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80ABB5C0 - .asciz "\n\n" - .balign 4 - -glabel D_80ABB5C4 - .asciz "\x1b[36m☆☆☆☆☆ 柵内BIT変更前 ☆☆ %x\n\x1b[m" - .balign 4 - -glabel D_80ABB5F0 - .asciz "\x1b[36m☆☆☆☆☆ 柵内BIT変更後 ☆☆ %x\n\x1b[m" - .balign 4 - -glabel D_80ABB61C - .asciz "\n\n" - .balign 4 - -.late_rodata -glabel D_80ABB7BC - .word 0x44C94000 - -.text -glabel func_80ABA244 -/* 00604 80ABA244 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00608 80ABA248 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0060C 80ABA24C AFB30020 */ sw $s3, 0x0020($sp) -/* 00610 80ABA250 AFB2001C */ sw $s2, 0x001C($sp) -/* 00614 80ABA254 AFB10018 */ sw $s1, 0x0018($sp) -/* 00618 80ABA258 AFB00014 */ sw $s0, 0x0014($sp) -/* 0061C 80ABA25C AFA5002C */ sw $a1, 0x002C($sp) -/* 00620 80ABA260 A4800268 */ sh $zero, 0x0268($a0) ## 00000268 -/* 00624 80ABA264 8FAE002C */ lw $t6, 0x002C($sp) -/* 00628 80ABA268 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 0062C 80ABA26C 8DD01C64 */ lw $s0, 0x1C64($t6) ## 00001C64 -/* 00630 80ABA270 12000044 */ beq $s0, $zero, .L80ABA384 -/* 00634 80ABA274 3C138016 */ lui $s3, %hi(gSaveContext) -/* 00638 80ABA278 3C1180AC */ lui $s1, %hi(D_80ABB3B4) ## $s1 = 80AC0000 -/* 0063C 80ABA27C 2631B3B4 */ addiu $s1, $s1, %lo(D_80ABB3B4) ## $s1 = 80ABB3B4 -/* 00640 80ABA280 2673E660 */ addiu $s3, %lo(gSaveContext) -/* 00644 80ABA284 860F0000 */ lh $t7, 0x0000($s0) ## 00000000 -.L80ABA288: -/* 00648 80ABA288 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 0064C 80ABA28C 15E1003A */ bne $t7, $at, .L80ABA378 -/* 00650 80ABA290 3C0143A5 */ lui $at, 0x43A5 ## $at = 43A50000 -/* 00654 80ABA294 44813000 */ mtc1 $at, $f6 ## $f6 = 330.00 -/* 00658 80ABA298 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0065C 80ABA29C 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 00660 80ABA2A0 44814000 */ mtc1 $at, $f8 ## $f8 = 90.00 -/* 00664 80ABA2A4 46062001 */ sub.s $f0, $f4, $f6 -/* 00668 80ABA2A8 3C0180AC */ lui $at, %hi(D_80ABB7BC) ## $at = 80AC0000 -/* 0066C 80ABA2AC 8642026C */ lh $v0, 0x026C($s2) ## 0000026C -/* 00670 80ABA2B0 46000005 */ abs.s $f0, $f0 -/* 00674 80ABA2B4 4608003C */ c.lt.s $f0, $f8 -/* 00678 80ABA2B8 00000000 */ nop -/* 0067C 80ABA2BC 45000024 */ bc1f .L80ABA350 -/* 00680 80ABA2C0 00000000 */ nop -/* 00684 80ABA2C4 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00688 80ABA2C8 C430B7BC */ lwc1 $f16, %lo(D_80ABB7BC)($at) -/* 0068C 80ABA2CC 3C01433E */ lui $at, 0x433E ## $at = 433E0000 -/* 00690 80ABA2D0 44819000 */ mtc1 $at, $f18 ## $f18 = 190.00 -/* 00694 80ABA2D4 46105001 */ sub.s $f0, $f10, $f16 -/* 00698 80ABA2D8 46000005 */ abs.s $f0, $f0 -/* 0069C 80ABA2DC 4612003C */ c.lt.s $f0, $f18 -/* 006A0 80ABA2E0 00000000 */ nop -/* 006A4 80ABA2E4 4500001A */ bc1f .L80ABA350 -/* 006A8 80ABA2E8 00000000 */ nop -/* 006AC 80ABA2EC 54400015 */ bnel $v0, $zero, .L80ABA344 -/* 006B0 80ABA2F0 86480268 */ lh $t0, 0x0268($s2) ## 00000268 -/* 006B4 80ABA2F4 861902AA */ lh $t9, 0x02AA($s0) ## 000002AA -/* 006B8 80ABA2F8 96780F2A */ lhu $t8, 0x0F2A($s3) ## 8015F58A -/* 006BC 80ABA2FC 3C0C8016 */ lui $t4, %hi(gGameInfo) -/* 006C0 80ABA300 00194040 */ sll $t0, $t9, 1 -/* 006C4 80ABA304 02284821 */ addu $t1, $s1, $t0 -/* 006C8 80ABA308 852A0000 */ lh $t2, 0x0000($t1) ## 00000000 -/* 006CC 80ABA30C 030A5825 */ or $t3, $t8, $t2 ## $t3 = 00000000 -/* 006D0 80ABA310 A66B0F2A */ sh $t3, 0x0F2A($s3) ## 8015F58A -/* 006D4 80ABA314 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) -/* 006D8 80ABA318 858D12D6 */ lh $t5, 0x12D6($t4) ## 801612D6 -/* 006DC 80ABA31C 51A00009 */ beql $t5, $zero, .L80ABA344 -/* 006E0 80ABA320 86480268 */ lh $t0, 0x0268($s2) ## 00000268 -/* 006E4 80ABA324 860E02AA */ lh $t6, 0x02AA($s0) ## 000002AA -/* 006E8 80ABA328 3C0480AC */ lui $a0, %hi(D_80ABB45C) ## $a0 = 80AC0000 -/* 006EC 80ABA32C 2484B45C */ addiu $a0, $a0, %lo(D_80ABB45C) ## $a0 = 80ABB45C -/* 006F0 80ABA330 000E7840 */ sll $t7, $t6, 1 -/* 006F4 80ABA334 022FC821 */ addu $t9, $s1, $t7 -/* 006F8 80ABA338 0C00084C */ jal osSyncPrintf - -/* 006FC 80ABA33C 87250000 */ lh $a1, 0x0000($t9) ## 00000000 -/* 00700 80ABA340 86480268 */ lh $t0, 0x0268($s2) ## 00000268 -.L80ABA344: -/* 00704 80ABA344 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00708 80ABA348 1000000B */ beq $zero, $zero, .L80ABA378 -/* 0070C 80ABA34C A6490268 */ sh $t1, 0x0268($s2) ## 00000268 -.L80ABA350: -/* 00710 80ABA350 5440000A */ bnel $v0, $zero, .L80ABA37C -/* 00714 80ABA354 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -/* 00718 80ABA358 860A02AA */ lh $t2, 0x02AA($s0) ## 000002AA -/* 0071C 80ABA35C 96780F2A */ lhu $t8, 0x0F2A($s3) ## 8015F58A -/* 00720 80ABA360 000A5840 */ sll $t3, $t2, 1 -/* 00724 80ABA364 022B6021 */ addu $t4, $s1, $t3 -/* 00728 80ABA368 858D0000 */ lh $t5, 0x0000($t4) ## 00000000 -/* 0072C 80ABA36C 01A07027 */ nor $t6, $t5, $zero -/* 00730 80ABA370 030E7824 */ and $t7, $t8, $t6 -/* 00734 80ABA374 A66F0F2A */ sh $t7, 0x0F2A($s3) ## 8015F58A -.L80ABA378: -/* 00738 80ABA378 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -.L80ABA37C: -/* 0073C 80ABA37C 5600FFC2 */ bnel $s0, $zero, .L80ABA288 -/* 00740 80ABA380 860F0000 */ lh $t7, 0x0000($s0) ## 00000000 -.L80ABA384: -/* 00744 80ABA384 3C198016 */ lui $t9, %hi(gGameInfo) -/* 00748 80ABA388 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) -/* 0074C 80ABA38C 3C138016 */ lui $s3, %hi(gSaveContext) -/* 00750 80ABA390 2673E660 */ addiu $s3, %lo(gSaveContext) -/* 00754 80ABA394 872212E2 */ lh $v0, 0x12E2($t9) ## 801612E2 -/* 00758 80ABA398 10400002 */ beq $v0, $zero, .L80ABA3A4 -/* 0075C 80ABA39C 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 00760 80ABA3A0 A6480268 */ sh $t0, 0x0268($s2) ## 00000268 -.L80ABA3A4: -/* 00764 80ABA3A4 8FB0002C */ lw $s0, 0x002C($sp) -/* 00768 80ABA3A8 86510268 */ lh $s1, 0x0268($s2) ## 00000268 -/* 0076C 80ABA3AC 261020D8 */ addiu $s0, $s0, 0x20D8 ## $s0 = 000020D8 -/* 00770 80ABA3B0 0C042F6F */ jal func_8010BDBC -/* 00774 80ABA3B4 02002025 */ or $a0, $s0, $zero ## $a0 = 000020D8 -/* 00778 80ABA3B8 50400006 */ beql $v0, $zero, .L80ABA3D4 -/* 0077C 80ABA3BC 24090065 */ addiu $t1, $zero, 0x0065 ## $t1 = 00000065 -/* 00780 80ABA3C0 0C042F6F */ jal func_8010BDBC -/* 00784 80ABA3C4 02002025 */ or $a0, $s0, $zero ## $a0 = 000020D8 -/* 00788 80ABA3C8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0078C 80ABA3CC 14410002 */ bne $v0, $at, .L80ABA3D8 -/* 00790 80ABA3D0 24090065 */ addiu $t1, $zero, 0x0065 ## $t1 = 00000065 -.L80ABA3D4: -/* 00794 80ABA3D4 A649026E */ sh $t1, 0x026E($s2) ## 0000026E -.L80ABA3D8: -/* 00798 80ABA3D8 864A0268 */ lh $t2, 0x0268($s2) ## 00000268 -/* 0079C 80ABA3DC 3C0D80AC */ lui $t5, %hi(D_80ABB3A0) ## $t5 = 80AC0000 -/* 007A0 80ABA3E0 29410007 */ slti $at, $t2, 0x0007 -/* 007A4 80ABA3E4 5420000A */ bnel $at, $zero, .L80ABA410 -/* 007A8 80ABA3E8 864B026C */ lh $t3, 0x026C($s2) ## 0000026C -/* 007AC 80ABA3EC 8642026C */ lh $v0, 0x026C($s2) ## 0000026C -/* 007B0 80ABA3F0 24110008 */ addiu $s1, $zero, 0x0008 ## $s1 = 00000008 -/* 007B4 80ABA3F4 28410002 */ slti $at, $v0, 0x0002 -/* 007B8 80ABA3F8 50200005 */ beql $at, $zero, .L80ABA410 -/* 007BC 80ABA3FC 864B026C */ lh $t3, 0x026C($s2) ## 0000026C -/* 007C0 80ABA400 54400003 */ bnel $v0, $zero, .L80ABA410 -/* 007C4 80ABA404 864B026C */ lh $t3, 0x026C($s2) ## 0000026C -/* 007C8 80ABA408 24110007 */ addiu $s1, $zero, 0x0007 ## $s1 = 00000007 -/* 007CC 80ABA40C 864B026C */ lh $t3, 0x026C($s2) ## 0000026C -.L80ABA410: -/* 007D0 80ABA410 2A210007 */ slti $at, $s1, 0x0007 -/* 007D4 80ABA414 51600005 */ beql $t3, $zero, .L80ABA42C -/* 007D8 80ABA418 00116040 */ sll $t4, $s1, 1 -/* 007DC 80ABA41C 50200003 */ beql $at, $zero, .L80ABA42C -/* 007E0 80ABA420 00116040 */ sll $t4, $s1, 1 -/* 007E4 80ABA424 24110009 */ addiu $s1, $zero, 0x0009 ## $s1 = 00000009 -/* 007E8 80ABA428 00116040 */ sll $t4, $s1, 1 -.L80ABA42C: -/* 007EC 80ABA42C 01AC6821 */ addu $t5, $t5, $t4 -/* 007F0 80ABA430 85ADB3A0 */ lh $t5, %lo(D_80ABB3A0)($t5) -/* 007F4 80ABA434 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 007F8 80ABA438 A64D010E */ sh $t5, 0x010E($s2) ## 0000010E -/* 007FC 80ABA43C 0C01B0D8 */ jal Text_GetFaceReaction -/* 00800 80ABA440 8FA4002C */ lw $a0, 0x002C($sp) -/* 00804 80ABA444 10400006 */ beq $v0, $zero, .L80ABA460 -/* 00808 80ABA448 8FA4002C */ lw $a0, 0x002C($sp) -/* 0080C 80ABA44C 0C01B0D8 */ jal Text_GetFaceReaction -/* 00810 80ABA450 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 00814 80ABA454 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00818 80ABA458 A642010E */ sh $v0, 0x010E($s2) ## 0000010E -/* 0081C 80ABA45C A6580262 */ sh $t8, 0x0262($s2) ## 00000262 -.L80ABA460: -/* 00820 80ABA460 864E026C */ lh $t6, 0x026C($s2) ## 0000026C -/* 00824 80ABA464 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00828 80ABA468 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0082C 80ABA46C 11C00005 */ beq $t6, $zero, .L80ABA484 -/* 00830 80ABA470 00000000 */ nop -/* 00834 80ABA474 12210003 */ beq $s1, $at, .L80ABA484 -/* 00838 80ABA478 240F000B */ addiu $t7, $zero, 0x000B ## $t7 = 0000000B -/* 0083C 80ABA47C 2411000A */ addiu $s1, $zero, 0x000A ## $s1 = 0000000A -/* 00840 80ABA480 A64F026E */ sh $t7, 0x026E($s2) ## 0000026E -.L80ABA484: -/* 00844 80ABA484 0C00BC65 */ jal func_8002F194 -/* 00848 80ABA488 8FA5002C */ lw $a1, 0x002C($sp) -/* 0084C 80ABA48C 10400067 */ beq $v0, $zero, .L80ABA62C -/* 00850 80ABA490 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00854 80ABA494 3C0480AC */ lui $a0, %hi(D_80ABB47C) ## $a0 = 80AC0000 -/* 00858 80ABA498 0C00084C */ jal osSyncPrintf - -/* 0085C 80ABA49C 2484B47C */ addiu $a0, $a0, %lo(D_80ABB47C) ## $a0 = 80ABB47C -/* 00860 80ABA4A0 3C0480AC */ lui $a0, %hi(D_80ABB480) ## $a0 = 80AC0000 -/* 00864 80ABA4A4 2484B480 */ addiu $a0, $a0, %lo(D_80ABB480) ## $a0 = 80ABB480 -/* 00868 80ABA4A8 0C00084C */ jal osSyncPrintf - -/* 0086C 80ABA4AC 02202825 */ or $a1, $s1, $zero ## $a1 = 0000000A -/* 00870 80ABA4B0 3C0480AC */ lui $a0, %hi(D_80ABB4B0) ## $a0 = 80AC0000 -/* 00874 80ABA4B4 2484B4B0 */ addiu $a0, $a0, %lo(D_80ABB4B0) ## $a0 = 80ABB4B0 -/* 00878 80ABA4B8 0C00084C */ jal osSyncPrintf - -/* 0087C 80ABA4BC 8645026C */ lh $a1, 0x026C($s2) ## 0000026C -/* 00880 80ABA4C0 3C0480AC */ lui $a0, %hi(D_80ABB4E8) ## $a0 = 80AC0000 -/* 00884 80ABA4C4 2484B4E8 */ addiu $a0, $a0, %lo(D_80ABB4E8) ## $a0 = 80ABB4E8 -/* 00888 80ABA4C8 0C00084C */ jal osSyncPrintf - -/* 0088C 80ABA4CC 8645026A */ lh $a1, 0x026A($s2) ## 0000026A -/* 00890 80ABA4D0 3C0480AC */ lui $a0, %hi(D_80ABB520) ## $a0 = 80AC0000 -/* 00894 80ABA4D4 2484B520 */ addiu $a0, $a0, %lo(D_80ABB520) ## $a0 = 80ABB520 -/* 00898 80ABA4D8 0C00084C */ jal osSyncPrintf - -/* 0089C 80ABA4DC 86450268 */ lh $a1, 0x0268($s2) ## 00000268 -/* 008A0 80ABA4E0 3C0480AC */ lui $a0, %hi(D_80ABB550) ## $a0 = 80AC0000 -/* 008A4 80ABA4E4 2484B550 */ addiu $a0, $a0, %lo(D_80ABB550) ## $a0 = 80ABB550 -/* 008A8 80ABA4E8 0C00084C */ jal osSyncPrintf - -/* 008AC 80ABA4EC 9645010E */ lhu $a1, 0x010E($s2) ## 0000010E -/* 008B0 80ABA4F0 3C0480AC */ lui $a0, %hi(D_80ABB588) ## $a0 = 80AC0000 -/* 008B4 80ABA4F4 2484B588 */ addiu $a0, $a0, %lo(D_80ABB588) ## $a0 = 80ABB588 -/* 008B8 80ABA4F8 0C00084C */ jal osSyncPrintf - -/* 008BC 80ABA4FC 86450262 */ lh $a1, 0x0262($s2) ## 00000262 -/* 008C0 80ABA500 3C0480AC */ lui $a0, %hi(D_80ABB5C0) ## $a0 = 80AC0000 -/* 008C4 80ABA504 0C00084C */ jal osSyncPrintf - -/* 008C8 80ABA508 2484B5C0 */ addiu $a0, $a0, %lo(D_80ABB5C0) ## $a0 = 80ABB5C0 -/* 008CC 80ABA50C 8FA4002C */ lw $a0, 0x002C($sp) -/* 008D0 80ABA510 0C01B0D8 */ jal Text_GetFaceReaction -/* 008D4 80ABA514 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 008D8 80ABA518 54400048 */ bnel $v0, $zero, .L80ABA63C -/* 008DC 80ABA51C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 008E0 80ABA520 9659010E */ lhu $t9, 0x010E($s2) ## 0000010E -/* 008E4 80ABA524 2401503C */ addiu $at, $zero, 0x503C ## $at = 0000503C -/* 008E8 80ABA528 26240001 */ addiu $a0, $s1, 0x0001 ## $a0 = 0000000B -/* 008EC 80ABA52C 5721000C */ bnel $t9, $at, .L80ABA560 -/* 008F0 80ABA530 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 008F4 80ABA534 0C01E221 */ jal func_80078884 -/* 008F8 80ABA538 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 008FC 80ABA53C 3C0A80AC */ lui $t2, %hi(func_80ABA654) ## $t2 = 80AC0000 -/* 00900 80ABA540 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00904 80ABA544 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 00908 80ABA548 254AA654 */ addiu $t2, $t2, %lo(func_80ABA654) ## $t2 = 80ABA654 -/* 0090C 80ABA54C A648026C */ sh $t0, 0x026C($s2) ## 0000026C -/* 00910 80ABA550 A6490262 */ sh $t1, 0x0262($s2) ## 00000262 -/* 00914 80ABA554 10000038 */ beq $zero, $zero, .L80ABA638 -/* 00918 80ABA558 AE4A0250 */ sw $t2, 0x0250($s2) ## 00000250 -/* 0091C 80ABA55C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -.L80ABA560: -/* 00920 80ABA560 1621001B */ bne $s1, $at, .L80ABA5D0 -/* 00924 80ABA564 A644026E */ sh $a0, 0x026E($s2) ## 0000026E -/* 00928 80ABA568 0C01E221 */ jal func_80078884 -/* 0092C 80ABA56C 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 00930 80ABA570 864D0268 */ lh $t5, 0x0268($s2) ## 00000268 -/* 00934 80ABA574 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00938 80ABA578 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 -/* 0093C 80ABA57C A64B026C */ sh $t3, 0x026C($s2) ## 0000026C -/* 00940 80ABA580 A64C0262 */ sh $t4, 0x0262($s2) ## 00000262 -/* 00944 80ABA584 3C0480AC */ lui $a0, %hi(D_80ABB5C4) ## $a0 = 80AC0000 -/* 00948 80ABA588 A64D026A */ sh $t5, 0x026A($s2) ## 0000026A -/* 0094C 80ABA58C 96650F2A */ lhu $a1, 0x0F2A($s3) ## 8015F58A -/* 00950 80ABA590 0C00084C */ jal osSyncPrintf - -/* 00954 80ABA594 2484B5C4 */ addiu $a0, $a0, %lo(D_80ABB5C4) ## $a0 = 80ABB5C4 -/* 00958 80ABA598 96780F2A */ lhu $t8, 0x0F2A($s3) ## 8015F58A -/* 0095C 80ABA59C 3C0480AC */ lui $a0, %hi(D_80ABB5F0) ## $a0 = 80AC0000 -/* 00960 80ABA5A0 2484B5F0 */ addiu $a0, $a0, %lo(D_80ABB5F0) ## $a0 = 80ABB5F0 -/* 00964 80ABA5A4 330E01FF */ andi $t6, $t8, 0x01FF ## $t6 = 00000000 -/* 00968 80ABA5A8 A66E0F2A */ sh $t6, 0x0F2A($s3) ## 8015F58A -/* 0096C 80ABA5AC 0C00084C */ jal osSyncPrintf - -/* 00970 80ABA5B0 31C5FFFF */ andi $a1, $t6, 0xFFFF ## $a1 = 00000000 -/* 00974 80ABA5B4 3C0480AC */ lui $a0, %hi(D_80ABB61C) ## $a0 = 80AC0000 -/* 00978 80ABA5B8 0C00084C */ jal osSyncPrintf - -/* 0097C 80ABA5BC 2484B61C */ addiu $a0, $a0, %lo(D_80ABB61C) ## $a0 = 80ABB61C -/* 00980 80ABA5C0 3C0F80AC */ lui $t7, %hi(func_80ABA654) ## $t7 = 80AC0000 -/* 00984 80ABA5C4 25EFA654 */ addiu $t7, $t7, %lo(func_80ABA654) ## $t7 = 80ABA654 -/* 00988 80ABA5C8 1000001B */ beq $zero, $zero, .L80ABA638 -/* 0098C 80ABA5CC AE4F0250 */ sw $t7, 0x0250($s2) ## 00000250 -.L80ABA5D0: -/* 00990 80ABA5D0 86420268 */ lh $v0, 0x0268($s2) ## 00000268 -/* 00994 80ABA5D4 8643026A */ lh $v1, 0x026A($s2) ## 0000026A -/* 00998 80ABA5D8 1043000F */ beq $v0, $v1, .L80ABA618 -/* 0099C 80ABA5DC 0043082A */ slt $at, $v0, $v1 -/* 009A0 80ABA5E0 50200007 */ beql $at, $zero, .L80ABA600 -/* 009A4 80ABA5E4 28810009 */ slti $at, $a0, 0x0009 -/* 009A8 80ABA5E8 0C01E221 */ jal func_80078884 -/* 009AC 80ABA5EC 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 009B0 80ABA5F0 86420268 */ lh $v0, 0x0268($s2) ## 00000268 -/* 009B4 80ABA5F4 10000008 */ beq $zero, $zero, .L80ABA618 -/* 009B8 80ABA5F8 8643026A */ lh $v1, 0x026A($s2) ## 0000026A -/* 009BC 80ABA5FC 28810009 */ slti $at, $a0, 0x0009 -.L80ABA600: -/* 009C0 80ABA600 50200006 */ beql $at, $zero, .L80ABA61C -/* 009C4 80ABA604 0062082A */ slt $at, $v1, $v0 -/* 009C8 80ABA608 0C01E221 */ jal func_80078884 -/* 009CC 80ABA60C 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 009D0 80ABA610 86420268 */ lh $v0, 0x0268($s2) ## 00000268 -/* 009D4 80ABA614 8643026A */ lh $v1, 0x026A($s2) ## 0000026A -.L80ABA618: -/* 009D8 80ABA618 0062082A */ slt $at, $v1, $v0 -.L80ABA61C: -/* 009DC 80ABA61C 50200007 */ beql $at, $zero, .L80ABA63C -/* 009E0 80ABA620 8FBF0024 */ lw $ra, 0x0024($sp) -/* 009E4 80ABA624 10000004 */ beq $zero, $zero, .L80ABA638 -/* 009E8 80ABA628 A642026A */ sh $v0, 0x026A($s2) ## 0000026A -.L80ABA62C: -/* 009EC 80ABA62C 8FA5002C */ lw $a1, 0x002C($sp) -/* 009F0 80ABA630 0C00BCB3 */ jal func_8002F2CC -/* 009F4 80ABA634 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -.L80ABA638: -/* 009F8 80ABA638 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ABA63C: -/* 009FC 80ABA63C 8FB00014 */ lw $s0, 0x0014($sp) -/* 00A00 80ABA640 8FB10018 */ lw $s1, 0x0018($sp) -/* 00A04 80ABA644 8FB2001C */ lw $s2, 0x001C($sp) -/* 00A08 80ABA648 8FB30020 */ lw $s3, 0x0020($sp) -/* 00A0C 80ABA64C 03E00008 */ jr $ra -/* 00A10 80ABA650 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s deleted file mode 100644 index 8a246473fb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s +++ /dev/null @@ -1,95 +0,0 @@ -.rdata -glabel D_80ABB620 - .asciz "\x1b[32m☆☆☆☆☆ ハート ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80ABB64C - .asciz "\x1b[33m☆☆☆☆☆ 爆弾 ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80ABB678 - .asciz "\n\n" - .balign 4 - -.text -glabel func_80ABA654 -/* 00A14 80ABA654 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A18 80ABA658 AFB0001C */ sw $s0, 0x001C($sp) -/* 00A1C 80ABA65C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A20 80ABA660 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A24 80ABA664 AFB10020 */ sw $s1, 0x0020($sp) -/* 00A28 80ABA668 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00A2C 80ABA66C 0C042F6F */ jal func_8010BDBC -/* 00A30 80ABA670 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00A34 80ABA674 860E0262 */ lh $t6, 0x0262($s0) ## 00000262 -/* 00A38 80ABA678 55C2003B */ bnel $t6, $v0, .L80ABA768 -/* 00A3C 80ABA67C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A40 80ABA680 0C041AF2 */ jal func_80106BC8 -/* 00A44 80ABA684 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A48 80ABA688 50400037 */ beql $v0, $zero, .L80ABA768 -/* 00A4C 80ABA68C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A50 80ABA690 0C041B33 */ jal func_80106CCC -/* 00A54 80ABA694 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A58 80ABA698 3C0480AC */ lui $a0, %hi(D_80ABB620) ## $a0 = 80AC0000 -/* 00A5C 80ABA69C 2484B620 */ addiu $a0, $a0, %lo(D_80ABB620) ## $a0 = 80ABB620 -/* 00A60 80ABA6A0 0C00084C */ jal osSyncPrintf - -/* 00A64 80ABA6A4 8605026C */ lh $a1, 0x026C($s0) ## 0000026C -/* 00A68 80ABA6A8 3C0480AC */ lui $a0, %hi(D_80ABB64C) ## $a0 = 80AC0000 -/* 00A6C 80ABA6AC 2484B64C */ addiu $a0, $a0, %lo(D_80ABB64C) ## $a0 = 80ABB64C -/* 00A70 80ABA6B0 0C00084C */ jal osSyncPrintf - -/* 00A74 80ABA6B4 92050272 */ lbu $a1, 0x0272($s0) ## 00000272 -/* 00A78 80ABA6B8 3C0480AC */ lui $a0, %hi(D_80ABB678) ## $a0 = 80AC0000 -/* 00A7C 80ABA6BC 0C00084C */ jal osSyncPrintf - -/* 00A80 80ABA6C0 2484B678 */ addiu $a0, $a0, %lo(D_80ABB678) ## $a0 = 80ABB678 -/* 00A84 80ABA6C4 240F000B */ addiu $t7, $zero, 0x000B ## $t7 = 0000000B -/* 00A88 80ABA6C8 A60F026E */ sh $t7, 0x026E($s0) ## 0000026E -/* 00A8C 80ABA6CC 3C188016 */ lui $t8, %hi(gSaveContext+0xef0) -/* 00A90 80ABA6D0 9718F550 */ lhu $t8, %lo(gSaveContext+0xef0)($t8) -/* 00A94 80ABA6D4 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F -/* 00A98 80ABA6D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A9C 80ABA6DC 33191000 */ andi $t9, $t8, 0x1000 ## $t9 = 00000000 -/* 00AA0 80ABA6E0 1720000D */ bne $t9, $zero, .L80ABA718 -/* 00AA4 80ABA6E4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00AA8 80ABA6E8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00AAC 80ABA6EC 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00AB0 80ABA6F0 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -/* 00AB4 80ABA6F4 AE080284 */ sw $t0, 0x0284($s0) ## 00000284 -/* 00AB8 80ABA6F8 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F -/* 00ABC 80ABA6FC 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 00AC0 80ABA700 0C00BD0D */ jal func_8002F434 -/* 00AC4 80ABA704 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00AC8 80ABA708 3C0980AC */ lui $t1, %hi(func_80ABAC00) ## $t1 = 80AC0000 -/* 00ACC 80ABA70C 2529AC00 */ addiu $t1, $t1, %lo(func_80ABAC00) ## $t1 = 80ABAC00 -/* 00AD0 80ABA710 10000014 */ beq $zero, $zero, .L80ABA764 -/* 00AD4 80ABA714 AE090250 */ sw $t1, 0x0250($s0) ## 00000250 -.L80ABA718: -/* 00AD8 80ABA718 860A026C */ lh $t2, 0x026C($s0) ## 0000026C -/* 00ADC 80ABA71C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00AE0 80ABA720 240B0055 */ addiu $t3, $zero, 0x0055 ## $t3 = 00000055 -/* 00AE4 80ABA724 1541000C */ bne $t2, $at, .L80ABA758 -/* 00AE8 80ABA728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AEC 80ABA72C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00AF0 80ABA730 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 00AF4 80ABA734 AE0B0284 */ sw $t3, 0x0284($s0) ## 00000284 -/* 00AF8 80ABA738 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00AFC 80ABA73C 24060055 */ addiu $a2, $zero, 0x0055 ## $a2 = 00000055 -/* 00B00 80ABA740 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 00B04 80ABA744 0C00BD0D */ jal func_8002F434 -/* 00B08 80ABA748 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00B0C 80ABA74C 3C0C80AC */ lui $t4, %hi(func_80ABAC00) ## $t4 = 80AC0000 -/* 00B10 80ABA750 258CAC00 */ addiu $t4, $t4, %lo(func_80ABAC00) ## $t4 = 80ABAC00 -/* 00B14 80ABA754 AE0C0250 */ sw $t4, 0x0250($s0) ## 00000250 -.L80ABA758: -/* 00B18 80ABA758 3C0D80AC */ lui $t5, %hi(func_80ABA244) ## $t5 = 80AC0000 -/* 00B1C 80ABA75C 25ADA244 */ addiu $t5, $t5, %lo(func_80ABA244) ## $t5 = 80ABA244 -/* 00B20 80ABA760 AE0D0250 */ sw $t5, 0x0250($s0) ## 00000250 -.L80ABA764: -/* 00B24 80ABA764 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ABA768: -/* 00B28 80ABA768 8FB0001C */ lw $s0, 0x001C($sp) -/* 00B2C 80ABA76C 8FB10020 */ lw $s1, 0x0020($sp) -/* 00B30 80ABA770 03E00008 */ jr $ra -/* 00B34 80ABA774 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s deleted file mode 100644 index 12b610ad21..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s +++ /dev/null @@ -1,76 +0,0 @@ -.rdata -glabel D_80ABB67C - .asciz "\x1b[32m☆☆☆☆☆ アダルトメッセージチェック ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.text -glabel func_80ABA778 -/* 00B38 80ABA778 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B3C 80ABA77C AFA5001C */ sw $a1, 0x001C($sp) -/* 00B40 80ABA780 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00B44 80ABA784 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B48 80ABA788 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B4C 80ABA78C 3C0480AC */ lui $a0, %hi(D_80ABB67C) ## $a0 = 80AC0000 -/* 00B50 80ABA790 2484B67C */ addiu $a0, $a0, %lo(D_80ABB67C) ## $a0 = 80ABB67C -/* 00B54 80ABA794 0C00084C */ jal osSyncPrintf - -/* 00B58 80ABA798 AFA50018 */ sw $a1, 0x0018($sp) -/* 00B5C 80ABA79C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00B60 80ABA7A0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00B64 80ABA7A4 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 00B68 80ABA7A8 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00B6C 80ABA7AC A4AE0262 */ sh $t6, 0x0262($a1) ## 00000262 -/* 00B70 80ABA7B0 A0A00273 */ sb $zero, 0x0273($a1) ## 00000273 -/* 00B74 80ABA7B4 944F0EF4 */ lhu $t7, 0x0EF4($v0) ## 8015F554 -/* 00B78 80ABA7B8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00B7C 80ABA7BC 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 00B80 80ABA7C0 31F81000 */ andi $t8, $t7, 0x1000 ## $t8 = 00000000 -/* 00B84 80ABA7C4 1700000B */ bne $t8, $zero, .L80ABA7F4 -/* 00B88 80ABA7C8 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00B8C 80ABA7CC 90B90274 */ lbu $t9, 0x0274($a1) ## 00000274 -/* 00B90 80ABA7D0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00B94 80ABA7D4 53200004 */ beql $t9, $zero, .L80ABA7E8 -/* 00B98 80ABA7D8 A4A0027A */ sh $zero, 0x027A($a1) ## 0000027A -/* 00B9C 80ABA7DC 10000002 */ beq $zero, $zero, .L80ABA7E8 -/* 00BA0 80ABA7E0 A4A8027A */ sh $t0, 0x027A($a1) ## 0000027A -/* 00BA4 80ABA7E4 A4A0027A */ sh $zero, 0x027A($a1) ## 0000027A -.L80ABA7E8: -/* 00BA8 80ABA7E8 A0A90273 */ sb $t1, 0x0273($a1) ## 00000273 -/* 00BAC 80ABA7EC 10000015 */ beq $zero, $zero, .L80ABA844 -/* 00BB0 80ABA7F0 A4AA0262 */ sh $t2, 0x0262($a1) ## 00000262 -.L80ABA7F4: -/* 00BB4 80ABA7F4 A4AB027A */ sh $t3, 0x027A($a1) ## 0000027A -/* 00BB8 80ABA7F8 944C0EF4 */ lhu $t4, 0x0EF4($v0) ## 8015F554 -/* 00BBC 80ABA7FC 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00BC0 80ABA800 318D4000 */ andi $t5, $t4, 0x4000 ## $t5 = 00000000 -/* 00BC4 80ABA804 55A00010 */ bnel $t5, $zero, .L80ABA848 -/* 00BC8 80ABA808 84AB027A */ lh $t3, 0x027A($a1) ## 0000027A -/* 00BCC 80ABA80C A4AE027A */ sh $t6, 0x027A($a1) ## 0000027A -/* 00BD0 80ABA810 944F0EE0 */ lhu $t7, 0x0EE0($v0) ## 8015F540 -/* 00BD4 80ABA814 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 00BD8 80ABA818 31F80400 */ andi $t8, $t7, 0x0400 ## $t8 = 00000000 -/* 00BDC 80ABA81C 53000009 */ beql $t8, $zero, .L80ABA844 -/* 00BE0 80ABA820 A4AA027A */ sh $t2, 0x027A($a1) ## 0000027A -/* 00BE4 80ABA824 90A80277 */ lbu $t0, 0x0277($a1) ## 00000277 -/* 00BE8 80ABA828 24190009 */ addiu $t9, $zero, 0x0009 ## $t9 = 00000009 -/* 00BEC 80ABA82C A4B9027A */ sh $t9, 0x027A($a1) ## 0000027A -/* 00BF0 80ABA830 11000004 */ beq $t0, $zero, .L80ABA844 -/* 00BF4 80ABA834 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 00BF8 80ABA838 10000002 */ beq $zero, $zero, .L80ABA844 -/* 00BFC 80ABA83C A4A9027A */ sh $t1, 0x027A($a1) ## 0000027A -/* 00C00 80ABA840 A4AA027A */ sh $t2, 0x027A($a1) ## 0000027A -.L80ABA844: -/* 00C04 80ABA844 84AB027A */ lh $t3, 0x027A($a1) ## 0000027A -.L80ABA848: -/* 00C08 80ABA848 3C0D80AC */ lui $t5, %hi(D_80ABB3F0) ## $t5 = 80AC0000 -/* 00C0C 80ABA84C 3C0E80AC */ lui $t6, %hi(func_80ABA878) ## $t6 = 80AC0000 -/* 00C10 80ABA850 000B6040 */ sll $t4, $t3, 1 -/* 00C14 80ABA854 01AC6821 */ addu $t5, $t5, $t4 -/* 00C18 80ABA858 85ADB3F0 */ lh $t5, %lo(D_80ABB3F0)($t5) -/* 00C1C 80ABA85C 25CEA878 */ addiu $t6, $t6, %lo(func_80ABA878) ## $t6 = 80ABA878 -/* 00C20 80ABA860 ACAE0250 */ sw $t6, 0x0250($a1) ## 00000250 -/* 00C24 80ABA864 A4AD010E */ sh $t5, 0x010E($a1) ## 0000010E -/* 00C28 80ABA868 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C2C 80ABA86C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C30 80ABA870 03E00008 */ jr $ra -/* 00C34 80ABA874 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s deleted file mode 100644 index 65608ba9d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_80ABA878 -/* 00C38 80ABA878 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00C3C 80ABA87C AFB00018 */ sw $s0, 0x0018($sp) -/* 00C40 80ABA880 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C44 80ABA884 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00C48 80ABA888 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C4C 80ABA88C 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00C50 80ABA890 AFA40024 */ sw $a0, 0x0024($sp) -/* 00C54 80ABA894 AFA50034 */ sw $a1, 0x0034($sp) -/* 00C58 80ABA898 0C042F6F */ jal func_8010BDBC -/* 00C5C 80ABA89C AFAE002C */ sw $t6, 0x002C($sp) -/* 00C60 80ABA8A0 10400005 */ beq $v0, $zero, .L80ABA8B8 -/* 00C64 80ABA8A4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00C68 80ABA8A8 0C042F6F */ jal func_8010BDBC -/* 00C6C 80ABA8AC 00000000 */ nop -/* 00C70 80ABA8B0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00C74 80ABA8B4 14410002 */ bne $v0, $at, .L80ABA8C0 -.L80ABA8B8: -/* 00C78 80ABA8B8 240F000B */ addiu $t7, $zero, 0x000B ## $t7 = 0000000B -/* 00C7C 80ABA8BC A60F026E */ sh $t7, 0x026E($s0) ## 0000026E -.L80ABA8C0: -/* 00C80 80ABA8C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C84 80ABA8C4 0C00BC65 */ jal func_8002F194 -/* 00C88 80ABA8C8 8FA50034 */ lw $a1, 0x0034($sp) -/* 00C8C 80ABA8CC 10400031 */ beq $v0, $zero, .L80ABA994 -/* 00C90 80ABA8D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C94 80ABA8D4 0C00BCDA */ jal func_8002F368 -/* 00C98 80ABA8D8 8FA40034 */ lw $a0, 0x0034($sp) -/* 00C9C 80ABA8DC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00CA0 80ABA8E0 14410014 */ bne $v0, $at, .L80ABA934 -/* 00CA4 80ABA8E4 3C188016 */ lui $t8, %hi(gSaveContext+0xee0) -/* 00CA8 80ABA8E8 9718F540 */ lhu $t8, %lo(gSaveContext+0xee0)($t8) -/* 00CAC 80ABA8EC 33190400 */ andi $t9, $t8, 0x0400 ## $t9 = 00000000 -/* 00CB0 80ABA8F0 13200010 */ beq $t9, $zero, .L80ABA934 -/* 00CB4 80ABA8F4 00000000 */ nop -/* 00CB8 80ABA8F8 0C01E221 */ jal func_80078884 -/* 00CBC 80ABA8FC 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 00CC0 80ABA900 3C0880AC */ lui $t0, %hi(D_80ABB3FA) ## $t0 = 80AC0000 -/* 00CC4 80ABA904 8508B3FA */ lh $t0, %lo(D_80ABB3FA)($t0) -/* 00CC8 80ABA908 8FA9002C */ lw $t1, 0x002C($sp) -/* 00CCC 80ABA90C 3C0D80AC */ lui $t5, %hi(func_80ABAB08) ## $t5 = 80AC0000 -/* 00CD0 80ABA910 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 00CD4 80ABA914 A528010E */ sh $t0, 0x010E($t1) ## 0000010E -/* 00CD8 80ABA918 860A027A */ lh $t2, 0x027A($s0) ## 0000027A -/* 00CDC 80ABA91C 25ADAB08 */ addiu $t5, $t5, %lo(func_80ABAB08) ## $t5 = 80ABAB08 -/* 00CE0 80ABA920 A60C0262 */ sh $t4, 0x0262($s0) ## 00000262 -/* 00CE4 80ABA924 254B0015 */ addiu $t3, $t2, 0x0015 ## $t3 = 00000015 -/* 00CE8 80ABA928 A60B026E */ sh $t3, 0x026E($s0) ## 0000026E -/* 00CEC 80ABA92C 1000001D */ beq $zero, $zero, .L80ABA9A4 -/* 00CF0 80ABA930 AE0D0250 */ sw $t5, 0x0250($s0) ## 00000250 -.L80ABA934: -/* 00CF4 80ABA934 10400009 */ beq $v0, $zero, .L80ABA95C -/* 00CF8 80ABA938 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00CFC 80ABA93C 3C0E80AC */ lui $t6, %hi(D_80ABB3FE) ## $t6 = 80AC0000 -/* 00D00 80ABA940 85CEB3FE */ lh $t6, %lo(D_80ABB3FE)($t6) -/* 00D04 80ABA944 8FAF002C */ lw $t7, 0x002C($sp) -/* 00D08 80ABA948 A5EE010E */ sh $t6, 0x010E($t7) ## 0000010E -/* 00D0C 80ABA94C 8618027A */ lh $t8, 0x027A($s0) ## 0000027A -/* 00D10 80ABA950 27190015 */ addiu $t9, $t8, 0x0015 ## $t9 = 00000015 -/* 00D14 80ABA954 10000013 */ beq $zero, $zero, .L80ABA9A4 -/* 00D18 80ABA958 A619026E */ sh $t9, 0x026E($s0) ## 0000026E -.L80ABA95C: -/* 00D1C 80ABA95C 8609027A */ lh $t1, 0x027A($s0) ## 0000027A -/* 00D20 80ABA960 920B0273 */ lbu $t3, 0x0273($s0) ## 00000273 -/* 00D24 80ABA964 A2080274 */ sb $t0, 0x0274($s0) ## 00000274 -/* 00D28 80ABA968 252A0015 */ addiu $t2, $t1, 0x0015 ## $t2 = 00000015 -/* 00D2C 80ABA96C 15600005 */ bne $t3, $zero, .L80ABA984 -/* 00D30 80ABA970 A60A026E */ sh $t2, 0x026E($s0) ## 0000026E -/* 00D34 80ABA974 3C0C80AC */ lui $t4, %hi(func_80ABA778) ## $t4 = 80AC0000 -/* 00D38 80ABA978 258CA778 */ addiu $t4, $t4, %lo(func_80ABA778) ## $t4 = 80ABA778 -/* 00D3C 80ABA97C 10000009 */ beq $zero, $zero, .L80ABA9A4 -/* 00D40 80ABA980 AE0C0250 */ sw $t4, 0x0250($s0) ## 00000250 -.L80ABA984: -/* 00D44 80ABA984 3C0D80AC */ lui $t5, %hi(func_80ABA9B8) ## $t5 = 80AC0000 -/* 00D48 80ABA988 25ADA9B8 */ addiu $t5, $t5, %lo(func_80ABA9B8) ## $t5 = 80ABA9B8 -/* 00D4C 80ABA98C 10000005 */ beq $zero, $zero, .L80ABA9A4 -/* 00D50 80ABA990 AE0D0250 */ sw $t5, 0x0250($s0) ## 00000250 -.L80ABA994: -/* 00D54 80ABA994 8FA50034 */ lw $a1, 0x0034($sp) -/* 00D58 80ABA998 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 00D5C 80ABA99C 0C00BCA6 */ jal func_8002F298 -/* 00D60 80ABA9A0 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -.L80ABA9A4: -/* 00D64 80ABA9A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D68 80ABA9A8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D6C 80ABA9AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00D70 80ABA9B0 03E00008 */ jr $ra -/* 00D74 80ABA9B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA9B8.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA9B8.s deleted file mode 100644 index 83b959cec0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA9B8.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_80ABA9B8 -/* 00D78 80ABA9B8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D7C 80ABA9BC AFB0001C */ sw $s0, 0x001C($sp) -/* 00D80 80ABA9C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D84 80ABA9C4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D88 80ABA9C8 AFB10020 */ sw $s1, 0x0020($sp) -/* 00D8C 80ABA9CC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00D90 80ABA9D0 0C042F6F */ jal func_8010BDBC -/* 00D94 80ABA9D4 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00D98 80ABA9D8 860E0262 */ lh $t6, 0x0262($s0) ## 00000262 -/* 00D9C 80ABA9DC 55C2002B */ bnel $t6, $v0, .L80ABAA8C -/* 00DA0 80ABA9E0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DA4 80ABA9E4 0C041AF2 */ jal func_80106BC8 -/* 00DA8 80ABA9E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DAC 80ABA9EC 10400026 */ beq $v0, $zero, .L80ABAA88 -/* 00DB0 80ABA9F0 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00DB4 80ABA9F4 00511021 */ addu $v0, $v0, $s1 -/* 00DB8 80ABA9F8 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00DBC 80ABA9FC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00DC0 80ABAA00 10400005 */ beq $v0, $zero, .L80ABAA18 -/* 00DC4 80ABAA04 00000000 */ nop -/* 00DC8 80ABAA08 10410012 */ beq $v0, $at, .L80ABAA54 -/* 00DCC 80ABAA0C 3C1880AC */ lui $t8, %hi(D_80ABB3F6) ## $t8 = 80AC0000 -/* 00DD0 80ABAA10 1000001E */ beq $zero, $zero, .L80ABAA8C -/* 00DD4 80ABAA14 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ABAA18: -/* 00DD8 80ABAA18 0C041B33 */ jal func_80106CCC -/* 00DDC 80ABAA1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DE0 80ABAA20 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00DE4 80ABAA24 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 00DE8 80ABAA28 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -/* 00DEC 80ABAA2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DF0 80ABAA30 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00DF4 80ABAA34 2406001D */ addiu $a2, $zero, 0x001D ## $a2 = 0000001D -/* 00DF8 80ABAA38 3C074348 */ lui $a3, 0x4348 ## $a3 = 43480000 -/* 00DFC 80ABAA3C 0C00BD0D */ jal func_8002F434 -/* 00E00 80ABAA40 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00E04 80ABAA44 3C0F80AC */ lui $t7, %hi(func_80ABAC00) ## $t7 = 80AC0000 -/* 00E08 80ABAA48 25EFAC00 */ addiu $t7, $t7, %lo(func_80ABAC00) ## $t7 = 80ABAC00 -/* 00E0C 80ABAA4C 1000000E */ beq $zero, $zero, .L80ABAA88 -/* 00E10 80ABAA50 AE0F0250 */ sw $t7, 0x0250($s0) ## 00000250 -.L80ABAA54: -/* 00E14 80ABAA54 8619027A */ lh $t9, 0x027A($s0) ## 0000027A -/* 00E18 80ABAA58 8718B3F6 */ lh $t8, %lo(D_80ABB3F6)($t8) -/* 00E1C 80ABAA5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E20 80ABAA60 27280015 */ addiu $t0, $t9, 0x0015 ## $t0 = 00000015 -/* 00E24 80ABAA64 A608026E */ sh $t0, 0x026E($s0) ## 0000026E -/* 00E28 80ABAA68 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 00E2C 80ABAA6C 0C042DC8 */ jal func_8010B720 -/* 00E30 80ABAA70 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 00000000 -/* 00E34 80ABAA74 3C0A80AC */ lui $t2, %hi(func_80ABAA9C) ## $t2 = 80AC0000 -/* 00E38 80ABAA78 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 00E3C 80ABAA7C 254AAA9C */ addiu $t2, $t2, %lo(func_80ABAA9C) ## $t2 = 80ABAA9C -/* 00E40 80ABAA80 A6090262 */ sh $t1, 0x0262($s0) ## 00000262 -/* 00E44 80ABAA84 AE0A0250 */ sw $t2, 0x0250($s0) ## 00000250 -.L80ABAA88: -/* 00E48 80ABAA88 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ABAA8C: -/* 00E4C 80ABAA8C 8FB0001C */ lw $s0, 0x001C($sp) -/* 00E50 80ABAA90 8FB10020 */ lw $s1, 0x0020($sp) -/* 00E54 80ABAA94 03E00008 */ jr $ra -/* 00E58 80ABAA98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAA9C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAA9C.s deleted file mode 100644 index 99b8dbc025..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAA9C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80ABAA9C -/* 00E5C 80ABAA9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E60 80ABAAA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E64 80ABAAA4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00E68 80ABAAA8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00E6C 80ABAAAC 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 00E70 80ABAAB0 A48E026E */ sh $t6, 0x026E($a0) ## 0000026E -/* 00E74 80ABAAB4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00E78 80ABAAB8 0C042F6F */ jal func_8010BDBC -/* 00E7C 80ABAABC 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00E80 80ABAAC0 8FB80018 */ lw $t8, 0x0018($sp) -/* 00E84 80ABAAC4 87190262 */ lh $t9, 0x0262($t8) ## 00000262 -/* 00E88 80ABAAC8 5722000C */ bnel $t9, $v0, .L80ABAAFC -/* 00E8C 80ABAACC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E90 80ABAAD0 0C041AF2 */ jal func_80106BC8 -/* 00E94 80ABAAD4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00E98 80ABAAD8 50400008 */ beql $v0, $zero, .L80ABAAFC -/* 00E9C 80ABAADC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00EA0 80ABAAE0 0C041B33 */ jal func_80106CCC -/* 00EA4 80ABAAE4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00EA8 80ABAAE8 8FA90018 */ lw $t1, 0x0018($sp) -/* 00EAC 80ABAAEC 3C0880AC */ lui $t0, %hi(func_80ABA778) ## $t0 = 80AC0000 -/* 00EB0 80ABAAF0 2508A778 */ addiu $t0, $t0, %lo(func_80ABA778) ## $t0 = 80ABA778 -/* 00EB4 80ABAAF4 AD280250 */ sw $t0, 0x0250($t1) ## 00000250 -/* 00EB8 80ABAAF8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ABAAFC: -/* 00EBC 80ABAAFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00EC0 80ABAB00 03E00008 */ jr $ra -/* 00EC4 80ABAB04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAB08.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAB08.s deleted file mode 100644 index 244a56ee15..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAB08.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_80ABAB08 -/* 00EC8 80ABAB08 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00ECC 80ABAB0C AFB0001C */ sw $s0, 0x001C($sp) -/* 00ED0 80ABAB10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00ED4 80ABAB14 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00ED8 80ABAB18 AFB10020 */ sw $s1, 0x0020($sp) -/* 00EDC 80ABAB1C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00EE0 80ABAB20 0C042F6F */ jal func_8010BDBC -/* 00EE4 80ABAB24 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00EE8 80ABAB28 860E0262 */ lh $t6, 0x0262($s0) ## 00000262 -/* 00EEC 80ABAB2C 55C20030 */ bnel $t6, $v0, .L80ABABF0 -/* 00EF0 80ABAB30 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00EF4 80ABAB34 0C041AF2 */ jal func_80106BC8 -/* 00EF8 80ABAB38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00EFC 80ABAB3C 1040002B */ beq $v0, $zero, .L80ABABEC -/* 00F00 80ABAB40 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00F04 80ABAB44 00511021 */ addu $v0, $v0, $s1 -/* 00F08 80ABAB48 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00F0C 80ABAB4C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00F10 80ABAB50 10400005 */ beq $v0, $zero, .L80ABAB68 -/* 00F14 80ABAB54 00000000 */ nop -/* 00F18 80ABAB58 10410012 */ beq $v0, $at, .L80ABABA4 -/* 00F1C 80ABAB5C 00000000 */ nop -/* 00F20 80ABAB60 10000023 */ beq $zero, $zero, .L80ABABF0 -/* 00F24 80ABAB64 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ABAB68: -/* 00F28 80ABAB68 0C041B33 */ jal func_80106CCC -/* 00F2C 80ABAB6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F30 80ABAB70 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00F34 80ABAB74 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 00F38 80ABAB78 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -/* 00F3C 80ABAB7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F40 80ABAB80 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00F44 80ABAB84 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E -/* 00F48 80ABAB88 3C074348 */ lui $a3, 0x4348 ## $a3 = 43480000 -/* 00F4C 80ABAB8C 0C00BD0D */ jal func_8002F434 -/* 00F50 80ABAB90 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00F54 80ABAB94 3C0F80AC */ lui $t7, %hi(func_80ABAC00) ## $t7 = 80AC0000 -/* 00F58 80ABAB98 25EFAC00 */ addiu $t7, $t7, %lo(func_80ABAC00) ## $t7 = 80ABAC00 -/* 00F5C 80ABAB9C 10000013 */ beq $zero, $zero, .L80ABABEC -/* 00F60 80ABABA0 AE0F0250 */ sw $t7, 0x0250($s0) ## 00000250 -.L80ABABA4: -/* 00F64 80ABABA4 0C041B33 */ jal func_80106CCC -/* 00F68 80ABABA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F6C 80ABABAC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00F70 80ABABB0 8608027A */ lh $t0, 0x027A($s0) ## 0000027A -/* 00F74 80ABABB4 A2180277 */ sb $t8, 0x0277($s0) ## 00000277 -/* 00F78 80ABABB8 3C1980AC */ lui $t9, %hi(D_80ABB400) ## $t9 = 80AC0000 -/* 00F7C 80ABABBC 8739B400 */ lh $t9, %lo(D_80ABB400)($t9) -/* 00F80 80ABABC0 25090015 */ addiu $t1, $t0, 0x0015 ## $t1 = 00000015 -/* 00F84 80ABABC4 A609026E */ sh $t1, 0x026E($s0) ## 0000026E -/* 00F88 80ABABC8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F8C 80ABABCC A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 00F90 80ABABD0 0C042DC8 */ jal func_8010B720 -/* 00F94 80ABABD4 3325FFFF */ andi $a1, $t9, 0xFFFF ## $a1 = 00000000 -/* 00F98 80ABABD8 3C0B80AC */ lui $t3, %hi(func_80ABAA9C) ## $t3 = 80AC0000 -/* 00F9C 80ABABDC 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 00FA0 80ABABE0 256BAA9C */ addiu $t3, $t3, %lo(func_80ABAA9C) ## $t3 = 80ABAA9C -/* 00FA4 80ABABE4 A60A0262 */ sh $t2, 0x0262($s0) ## 00000262 -/* 00FA8 80ABABE8 AE0B0250 */ sw $t3, 0x0250($s0) ## 00000250 -.L80ABABEC: -/* 00FAC 80ABABEC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80ABABF0: -/* 00FB0 80ABABF0 8FB0001C */ lw $s0, 0x001C($sp) -/* 00FB4 80ABABF4 8FB10020 */ lw $s1, 0x0020($sp) -/* 00FB8 80ABABF8 03E00008 */ jr $ra -/* 00FBC 80ABABFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s deleted file mode 100644 index 052f613b05..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80ABAC00 -/* 00FC0 80ABAC00 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00FC4 80ABAC04 AFBF001C */ sw $ra, 0x001C($sp) -/* 00FC8 80ABAC08 AFA50024 */ sw $a1, 0x0024($sp) -/* 00FCC 80ABAC0C 0C00BD04 */ jal Actor_HasParent -/* 00FD0 80ABAC10 AFA40020 */ sw $a0, 0x0020($sp) -/* 00FD4 80ABAC14 10400005 */ beq $v0, $zero, .L80ABAC2C -/* 00FD8 80ABAC18 8FA40020 */ lw $a0, 0x0020($sp) -/* 00FDC 80ABAC1C 3C0E80AC */ lui $t6, %hi(func_80ABAC84) ## $t6 = 80AC0000 -/* 00FE0 80ABAC20 25CEAC84 */ addiu $t6, $t6, %lo(func_80ABAC84) ## $t6 = 80ABAC84 -/* 00FE4 80ABAC24 10000013 */ beq $zero, $zero, .L80ABAC74 -/* 00FE8 80ABAC28 AC8E0250 */ sw $t6, 0x0250($a0) ## 00000250 -.L80ABAC2C: -/* 00FEC 80ABAC2C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00FF0 80ABAC30 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00FF4 80ABAC34 8C4F0004 */ lw $t7, 0x0004($v0) ## 8015E664 -/* 00FF8 80ABAC38 8C860284 */ lw $a2, 0x0284($a0) ## 00000284 -/* 00FFC 80ABAC3C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01000 80ABAC40 15E00008 */ bne $t7, $zero, .L80ABAC64 -/* 01004 80ABAC44 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01008 80ABAC48 94580EF4 */ lhu $t8, 0x0EF4($v0) ## 8015F554 -/* 0100C 80ABAC4C 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E -/* 01010 80ABAC50 33191000 */ andi $t9, $t8, 0x1000 ## $t9 = 00000000 -/* 01014 80ABAC54 17200003 */ bne $t9, $zero, .L80ABAC64 -/* 01018 80ABAC58 00000000 */ nop -/* 0101C 80ABAC5C 10000001 */ beq $zero, $zero, .L80ABAC64 -/* 01020 80ABAC60 2406001D */ addiu $a2, $zero, 0x001D ## $a2 = 0000001D -.L80ABAC64: -/* 01024 80ABAC64 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 01028 80ABAC68 3C074348 */ lui $a3, 0x4348 ## $a3 = 43480000 -/* 0102C 80ABAC6C 0C00BD0D */ jal func_8002F434 -/* 01030 80ABAC70 E7A40010 */ swc1 $f4, 0x0010($sp) -.L80ABAC74: -/* 01034 80ABAC74 8FBF001C */ lw $ra, 0x001C($sp) -/* 01038 80ABAC78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0103C 80ABAC7C 03E00008 */ jr $ra -/* 01040 80ABAC80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s deleted file mode 100644 index 870d3f6a12..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s +++ /dev/null @@ -1,58 +0,0 @@ -.rdata -glabel D_80ABB6B8 - .asciz "\x1b[32m☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.text -glabel func_80ABAC84 -/* 01044 80ABAC84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01048 80ABAC88 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0104C 80ABAC8C AFA40018 */ sw $a0, 0x0018($sp) -/* 01050 80ABAC90 AFA5001C */ sw $a1, 0x001C($sp) -/* 01054 80ABAC94 0C042F6F */ jal func_8010BDBC -/* 01058 80ABAC98 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 0105C 80ABAC9C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01060 80ABACA0 54410022 */ bnel $v0, $at, .L80ABAD2C -/* 01064 80ABACA4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01068 80ABACA8 0C041AF2 */ jal func_80106BC8 -/* 0106C 80ABACAC 8FA4001C */ lw $a0, 0x001C($sp) -/* 01070 80ABACB0 1040001D */ beq $v0, $zero, .L80ABAD28 -/* 01074 80ABACB4 3C0480AC */ lui $a0, %hi(D_80ABB6B8) ## $a0 = 80AC0000 -/* 01078 80ABACB8 0C00084C */ jal osSyncPrintf - -/* 0107C 80ABACBC 2484B6B8 */ addiu $a0, $a0, %lo(D_80ABB6B8) ## $a0 = 80ABB6B8 -/* 01080 80ABACC0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01084 80ABACC4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01088 80ABACC8 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 -/* 0108C 80ABACCC 8FA30018 */ lw $v1, 0x0018($sp) -/* 01090 80ABACD0 3C0880AC */ lui $t0, %hi(func_80ABA778) ## $t0 = 80AC0000 -/* 01094 80ABACD4 15C0000D */ bne $t6, $zero, .L80ABAD0C -/* 01098 80ABACD8 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 -/* 0109C 80ABACDC 94430EF4 */ lhu $v1, 0x0EF4($v0) ## 8015F554 -/* 010A0 80ABACE0 306F1000 */ andi $t7, $v1, 0x1000 ## $t7 = 00000000 -/* 010A4 80ABACE4 15E00004 */ bne $t7, $zero, .L80ABACF8 -/* 010A8 80ABACE8 34794000 */ ori $t9, $v1, 0x4000 ## $t9 = 00004000 -/* 010AC 80ABACEC 34781000 */ ori $t8, $v1, 0x1000 ## $t8 = 00001000 -/* 010B0 80ABACF0 10000002 */ beq $zero, $zero, .L80ABACFC -/* 010B4 80ABACF4 A4580EF4 */ sh $t8, 0x0EF4($v0) ## 8015F554 -.L80ABACF8: -/* 010B8 80ABACF8 A4590EF4 */ sh $t9, 0x0EF4($v0) ## 8015F554 -.L80ABACFC: -/* 010BC 80ABACFC 8FA90018 */ lw $t1, 0x0018($sp) -/* 010C0 80ABAD00 2508A778 */ addiu $t0, $t0, %lo(func_80ABA778) ## $t0 = 80ABA778 -/* 010C4 80ABAD04 10000008 */ beq $zero, $zero, .L80ABAD28 -/* 010C8 80ABAD08 AD280250 */ sw $t0, 0x0250($t1) ## 00000250 -.L80ABAD0C: -/* 010CC 80ABAD0C 944A0EF0 */ lhu $t2, 0x0EF0($v0) ## 8015F550 -/* 010D0 80ABAD10 3C0D80AC */ lui $t5, %hi(func_80ABA244) ## $t5 = 80AC0000 -/* 010D4 80ABAD14 25ADA244 */ addiu $t5, $t5, %lo(func_80ABA244) ## $t5 = 80ABA244 -/* 010D8 80ABAD18 354B1000 */ ori $t3, $t2, 0x1000 ## $t3 = 00001000 -/* 010DC 80ABAD1C A44B0EF0 */ sh $t3, 0x0EF0($v0) ## 8015F550 -/* 010E0 80ABAD20 A46C0262 */ sh $t4, 0x0262($v1) ## 00000262 -/* 010E4 80ABAD24 AC6D0250 */ sw $t5, 0x0250($v1) ## 00000250 -.L80ABAD28: -/* 010E8 80ABAD28 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ABAD2C: -/* 010EC 80ABAD2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010F0 80ABAD30 03E00008 */ jr $ra -/* 010F4 80ABAD34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD38.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD38.s deleted file mode 100644 index 235187134f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD38.s +++ /dev/null @@ -1,25 +0,0 @@ -.rdata -glabel D_80ABB6E4 - .asciz "\x1b[32m☆☆☆☆☆ 通常メッセージチェック ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.text -glabel func_80ABAD38 -/* 010F8 80ABAD38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010FC 80ABAD3C AFA40018 */ sw $a0, 0x0018($sp) -/* 01100 80ABAD40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01104 80ABAD44 3C0480AC */ lui $a0, %hi(D_80ABB6E4) ## $a0 = 80AC0000 -/* 01108 80ABAD48 AFA5001C */ sw $a1, 0x001C($sp) -/* 0110C 80ABAD4C 0C00084C */ jal osSyncPrintf - -/* 01110 80ABAD50 2484B6E4 */ addiu $a0, $a0, %lo(D_80ABB6E4) ## $a0 = 80ABB6E4 -/* 01114 80ABAD54 8FA20018 */ lw $v0, 0x0018($sp) -/* 01118 80ABAD58 3C0F80AC */ lui $t7, %hi(func_80ABAD7C) ## $t7 = 80AC0000 -/* 0111C 80ABAD5C 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 01120 80ABAD60 25EFAD7C */ addiu $t7, $t7, %lo(func_80ABAD7C) ## $t7 = 80ABAD7C -/* 01124 80ABAD64 A44E0262 */ sh $t6, 0x0262($v0) ## 00000262 -/* 01128 80ABAD68 AC4F0250 */ sw $t7, 0x0250($v0) ## 00000250 -/* 0112C 80ABAD6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01130 80ABAD70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01134 80ABAD74 03E00008 */ jr $ra -/* 01138 80ABAD78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s deleted file mode 100644 index 71907307fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80ABAD7C -/* 0113C 80ABAD7C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01140 80ABAD80 AFB00014 */ sw $s0, 0x0014($sp) -/* 01144 80ABAD84 AFBF001C */ sw $ra, 0x001C($sp) -/* 01148 80ABAD88 AFB10018 */ sw $s1, 0x0018($sp) -/* 0114C 80ABAD8C 240E503D */ addiu $t6, $zero, 0x503D ## $t6 = 0000503D -/* 01150 80ABAD90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01154 80ABAD94 A48E010E */ sh $t6, 0x010E($a0) ## 0000010E -/* 01158 80ABAD98 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0115C 80ABAD9C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01160 80ABADA0 0C01B0D8 */ jal Text_GetFaceReaction -/* 01164 80ABADA4 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 01168 80ABADA8 10400004 */ beq $v0, $zero, .L80ABADBC -/* 0116C 80ABADAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01170 80ABADB0 0C01B0D8 */ jal Text_GetFaceReaction -/* 01174 80ABADB4 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 01178 80ABADB8 A602010E */ sh $v0, 0x010E($s0) ## 0000010E -.L80ABADBC: -/* 0117C 80ABADBC 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 01180 80ABADC0 0C042F6F */ jal func_8010BDBC -/* 01184 80ABADC4 AFA40024 */ sw $a0, 0x0024($sp) -/* 01188 80ABADC8 10400005 */ beq $v0, $zero, .L80ABADE0 -/* 0118C 80ABADCC 8FA40024 */ lw $a0, 0x0024($sp) -/* 01190 80ABADD0 0C042F6F */ jal func_8010BDBC -/* 01194 80ABADD4 00000000 */ nop -/* 01198 80ABADD8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0119C 80ABADDC 14410002 */ bne $v0, $at, .L80ABADE8 -.L80ABADE0: -/* 011A0 80ABADE0 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 011A4 80ABADE4 A60F026E */ sh $t7, 0x026E($s0) ## 0000026E -.L80ABADE8: -/* 011A8 80ABADE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011AC 80ABADEC 0C00BC65 */ jal func_8002F194 -/* 011B0 80ABADF0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 011B4 80ABADF4 1040000A */ beq $v0, $zero, .L80ABAE20 -/* 011B8 80ABADF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011BC 80ABADFC 8619027A */ lh $t9, 0x027A($s0) ## 0000027A -/* 011C0 80ABAE00 3C0980AC */ lui $t1, %hi(func_80ABAD38) ## $t1 = 80AC0000 -/* 011C4 80ABAE04 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 011C8 80ABAE08 2529AD38 */ addiu $t1, $t1, %lo(func_80ABAD38) ## $t1 = 80ABAD38 -/* 011CC 80ABAE0C 27280009 */ addiu $t0, $t9, 0x0009 ## $t0 = 00000009 -/* 011D0 80ABAE10 A2180274 */ sb $t8, 0x0274($s0) ## 00000274 -/* 011D4 80ABAE14 A608026E */ sh $t0, 0x026E($s0) ## 0000026E -/* 011D8 80ABAE18 10000004 */ beq $zero, $zero, .L80ABAE2C -/* 011DC 80ABAE1C AE090250 */ sw $t1, 0x0250($s0) ## 00000250 -.L80ABAE20: -/* 011E0 80ABAE20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 011E4 80ABAE24 0C00BCB3 */ jal func_8002F2CC -/* 011E8 80ABAE28 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -.L80ABAE2C: -/* 011EC 80ABAE2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 011F0 80ABAE30 8FB00014 */ lw $s0, 0x0014($sp) -/* 011F4 80ABAE34 8FB10018 */ lw $s1, 0x0018($sp) -/* 011F8 80ABAE38 03E00008 */ jr $ra -/* 011FC 80ABAE3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0A0.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0A0.s deleted file mode 100644 index dcbce66fdf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0A0.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80ABB0A0 -/* 01460 80ABB0A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01464 80ABB0A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01468 80ABB0A8 0C031A73 */ jal Graph_Alloc - -/* 0146C 80ABB0AC 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 01470 80ABB0B0 3C0EDF00 */ lui $t6, 0xDF00 ## $t6 = DF000000 -/* 01474 80ABB0B4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 01478 80ABB0B8 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 0147C 80ABB0BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01480 80ABB0C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01484 80ABB0C4 03E00008 */ jr $ra -/* 01488 80ABB0C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0CC.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0CC.s deleted file mode 100644 index 58bdf49a1e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0CC.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_80ABB0CC -/* 0148C 80ABB0CC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01490 80ABB0D0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 01494 80ABB0D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01498 80ABB0D8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0149C 80ABB0DC AFA60030 */ sw $a2, 0x0030($sp) -/* 014A0 80ABB0E0 14A1000B */ bne $a1, $at, .L80ABB110 -/* 014A4 80ABB0E4 AFA70034 */ sw $a3, 0x0034($sp) -/* 014A8 80ABB0E8 8FA20038 */ lw $v0, 0x0038($sp) -/* 014AC 80ABB0EC 8FA3003C */ lw $v1, 0x003C($sp) -/* 014B0 80ABB0F0 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 014B4 80ABB0F4 846F0256 */ lh $t7, 0x0256($v1) ## 00000256 -/* 014B8 80ABB0F8 84590004 */ lh $t9, 0x0004($v0) ## 00000004 -/* 014BC 80ABB0FC 01CFC021 */ addu $t8, $t6, $t7 -/* 014C0 80ABB100 A4580000 */ sh $t8, 0x0000($v0) ## 00000000 -/* 014C4 80ABB104 84680254 */ lh $t0, 0x0254($v1) ## 00000254 -/* 014C8 80ABB108 03284821 */ addu $t1, $t9, $t0 -/* 014CC 80ABB10C A4490004 */ sh $t1, 0x0004($v0) ## 00000004 -.L80ABB110: -/* 014D0 80ABB110 24040008 */ addiu $a0, $zero, 0x0008 ## $a0 = 00000008 -/* 014D4 80ABB114 8FA20038 */ lw $v0, 0x0038($sp) -/* 014D8 80ABB118 14A40005 */ bne $a1, $a0, .L80ABB130 -/* 014DC 80ABB11C 8FA3003C */ lw $v1, 0x003C($sp) -/* 014E0 80ABB120 844A0000 */ lh $t2, 0x0000($v0) ## 00000000 -/* 014E4 80ABB124 846B025C */ lh $t3, 0x025C($v1) ## 0000025C -/* 014E8 80ABB128 014B6021 */ addu $t4, $t2, $t3 -/* 014EC 80ABB12C A44C0000 */ sh $t4, 0x0000($v0) ## 00000000 -.L80ABB130: -/* 014F0 80ABB130 906D0275 */ lbu $t5, 0x0275($v1) ## 00000275 -/* 014F4 80ABB134 51A00038 */ beql $t5, $zero, .L80ABB218 -/* 014F8 80ABB138 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014FC 80ABB13C 10A40005 */ beq $a1, $a0, .L80ABB154 -/* 01500 80ABB140 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01504 80ABB144 10A10003 */ beq $a1, $at, .L80ABB154 -/* 01508 80ABB148 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 0150C 80ABB14C 54A10032 */ bnel $a1, $at, .L80ABB218 -/* 01510 80ABB150 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ABB154: -/* 01514 80ABB154 8FAE0028 */ lw $t6, 0x0028($sp) -/* 01518 80ABB158 00051880 */ sll $v1, $a1, 2 -/* 0151C 80ABB15C 00651823 */ subu $v1, $v1, $a1 -/* 01520 80ABB160 000318C0 */ sll $v1, $v1, 3 -/* 01524 80ABB164 8DCF009C */ lw $t7, 0x009C($t6) ## 0000009C -/* 01528 80ABB168 00651821 */ addu $v1, $v1, $a1 -/* 0152C 80ABB16C 00031840 */ sll $v1, $v1, 1 -/* 01530 80ABB170 24780814 */ addiu $t8, $v1, 0x0814 ## $t8 = 00000814 -/* 01534 80ABB174 01F80019 */ multu $t7, $t8 -/* 01538 80ABB178 AFA30018 */ sw $v1, 0x0018($sp) -/* 0153C 80ABB17C 00002012 */ mflo $a0 -/* 01540 80ABB180 00042400 */ sll $a0, $a0, 16 -/* 01544 80ABB184 0C01DE1C */ jal Math_Sins - ## sins? -/* 01548 80ABB188 00042403 */ sra $a0, $a0, 16 -/* 0154C 80ABB18C 8FA20038 */ lw $v0, 0x0038($sp) -/* 01550 80ABB190 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01554 80ABB194 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 -/* 01558 80ABB198 84590002 */ lh $t9, 0x0002($v0) ## 00000002 -/* 0155C 80ABB19C 8FA30018 */ lw $v1, 0x0018($sp) -/* 01560 80ABB1A0 46080282 */ mul.s $f10, $f0, $f8 -/* 01564 80ABB1A4 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 01568 80ABB1A8 246C0940 */ addiu $t4, $v1, 0x0940 ## $t4 = 00000940 -/* 0156C 80ABB1AC 468021A0 */ cvt.s.w $f6, $f4 -/* 01570 80ABB1B0 460A3400 */ add.s $f16, $f6, $f10 -/* 01574 80ABB1B4 4600848D */ trunc.w.s $f18, $f16 -/* 01578 80ABB1B8 44099000 */ mfc1 $t1, $f18 -/* 0157C 80ABB1BC 00000000 */ nop -/* 01580 80ABB1C0 A4490002 */ sh $t1, 0x0002($v0) ## 00000002 -/* 01584 80ABB1C4 8FAA0028 */ lw $t2, 0x0028($sp) -/* 01588 80ABB1C8 8D4B009C */ lw $t3, 0x009C($t2) ## 0000009C -/* 0158C 80ABB1CC 016C0019 */ multu $t3, $t4 -/* 01590 80ABB1D0 00002012 */ mflo $a0 -/* 01594 80ABB1D4 00042400 */ sll $a0, $a0, 16 -/* 01598 80ABB1D8 0C01DE0D */ jal Math_Coss - ## coss? -/* 0159C 80ABB1DC 00042403 */ sra $a0, $a0, 16 -/* 015A0 80ABB1E0 8FA20038 */ lw $v0, 0x0038($sp) -/* 015A4 80ABB1E4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 015A8 80ABB1E8 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 015AC 80ABB1EC 844D0004 */ lh $t5, 0x0004($v0) ## 00000004 -/* 015B0 80ABB1F0 46060282 */ mul.s $f10, $f0, $f6 -/* 015B4 80ABB1F4 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 015B8 80ABB1F8 00000000 */ nop -/* 015BC 80ABB1FC 46802220 */ cvt.s.w $f8, $f4 -/* 015C0 80ABB200 460A4400 */ add.s $f16, $f8, $f10 -/* 015C4 80ABB204 4600848D */ trunc.w.s $f18, $f16 -/* 015C8 80ABB208 440F9000 */ mfc1 $t7, $f18 -/* 015CC 80ABB20C 00000000 */ nop -/* 015D0 80ABB210 A44F0004 */ sh $t7, 0x0004($v0) ## 00000004 -/* 015D4 80ABB214 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ABB218: -/* 015D8 80ABB218 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 015DC 80ABB21C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 015E0 80ABB220 03E00008 */ jr $ra -/* 015E4 80ABB224 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s deleted file mode 100644 index a9f1146d5c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s +++ /dev/null @@ -1,98 +0,0 @@ -.rdata -glabel D_80ABB71C - .asciz "../z_en_niw_lady.c" - .balign 4 - -glabel D_80ABB730 - .asciz "../z_en_niw_lady.c" - .balign 4 - -.text -glabel func_80ABB228 -/* 015E8 80ABB228 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 015EC 80ABB22C AFB10028 */ sw $s1, 0x0028($sp) -/* 015F0 80ABB230 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 015F4 80ABB234 AFBF002C */ sw $ra, 0x002C($sp) -/* 015F8 80ABB238 AFB00024 */ sw $s0, 0x0024($sp) -/* 015FC 80ABB23C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01600 80ABB240 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01604 80ABB244 3C0680AC */ lui $a2, %hi(D_80ABB71C) ## $a2 = 80AC0000 -/* 01608 80ABB248 24C6B71C */ addiu $a2, $a2, %lo(D_80ABB71C) ## $a2 = 80ABB71C -/* 0160C 80ABB24C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 -/* 01610 80ABB250 24070543 */ addiu $a3, $zero, 0x0543 ## $a3 = 00000543 -/* 01614 80ABB254 0C031AB1 */ jal Graph_OpenDisps -/* 01618 80ABB258 AFA50054 */ sw $a1, 0x0054($sp) -/* 0161C 80ABB25C 860E027E */ lh $t6, 0x027E($s0) ## 0000027E -/* 01620 80ABB260 8FA80054 */ lw $t0, 0x0054($sp) -/* 01624 80ABB264 11C00039 */ beq $t6, $zero, .L80ABB34C -/* 01628 80ABB268 00000000 */ nop -/* 0162C 80ABB26C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01630 80ABB270 0C024F46 */ jal func_80093D18 -/* 01634 80ABB274 AFA80054 */ sw $t0, 0x0054($sp) -/* 01638 80ABB278 8FA80054 */ lw $t0, 0x0054($sp) -/* 0163C 80ABB27C 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 01640 80ABB280 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01644 80ABB284 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01648 80ABB288 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 0164C 80ABB28C 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 01650 80ABB290 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01654 80ABB294 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01658 80ABB298 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0165C 80ABB29C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01660 80ABB2A0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01664 80ABB2A4 3C0480AC */ lui $a0, %hi(D_80ABB408) ## $a0 = 80AC0000 -/* 01668 80ABB2A8 3C198016 */ lui $t9, %hi(gSegments) -/* 0166C 80ABB2AC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01670 80ABB2B0 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 01674 80ABB2B4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01678 80ABB2B8 860B027C */ lh $t3, 0x027C($s0) ## 0000027C -/* 0167C 80ABB2BC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01680 80ABB2C0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01684 80ABB2C4 000B6080 */ sll $t4, $t3, 2 -/* 01688 80ABB2C8 008C2021 */ addu $a0, $a0, $t4 -/* 0168C 80ABB2CC 8C84B408 */ lw $a0, %lo(D_80ABB408)($a0) -/* 01690 80ABB2D0 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 01694 80ABB2D4 358C0030 */ ori $t4, $t4, 0x0030 ## $t4 = DB060030 -/* 01698 80ABB2D8 00047100 */ sll $t6, $a0, 4 -/* 0169C 80ABB2DC 000E7F02 */ srl $t7, $t6, 28 -/* 016A0 80ABB2E0 000FC080 */ sll $t8, $t7, 2 -/* 016A4 80ABB2E4 0338C821 */ addu $t9, $t9, $t8 -/* 016A8 80ABB2E8 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 016AC 80ABB2EC 00816824 */ and $t5, $a0, $at -/* 016B0 80ABB2F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 016B4 80ABB2F4 01B94821 */ addu $t1, $t5, $t9 -/* 016B8 80ABB2F8 01215021 */ addu $t2, $t1, $at -/* 016BC 80ABB2FC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 016C0 80ABB300 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 016C4 80ABB304 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 016C8 80ABB308 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 016CC 80ABB30C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 016D0 80ABB310 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 016D4 80ABB314 0C2AEC28 */ jal func_80ABB0A0 -/* 016D8 80ABB318 AFA20038 */ sw $v0, 0x0038($sp) -/* 016DC 80ABB31C 8FA30038 */ lw $v1, 0x0038($sp) -/* 016E0 80ABB320 3C0E80AC */ lui $t6, %hi(func_80ABB0CC) ## $t6 = 80AC0000 -/* 016E4 80ABB324 25CEB0CC */ addiu $t6, $t6, %lo(func_80ABB0CC) ## $t6 = 80ABB0CC -/* 016E8 80ABB328 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 016EC 80ABB32C 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 016F0 80ABB330 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 016F4 80ABB334 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 016F8 80ABB338 AFB00018 */ sw $s0, 0x0018($sp) -/* 016FC 80ABB33C AFA00014 */ sw $zero, 0x0014($sp) -/* 01700 80ABB340 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01704 80ABB344 0C0286B2 */ jal SkelAnime_DrawSV -/* 01708 80ABB348 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80ABB34C: -/* 0170C 80ABB34C 3C0680AC */ lui $a2, %hi(D_80ABB730) ## $a2 = 80AC0000 -/* 01710 80ABB350 24C6B730 */ addiu $a2, $a2, %lo(D_80ABB730) ## $a2 = 80ABB730 -/* 01714 80ABB354 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 -/* 01718 80ABB358 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0171C 80ABB35C 0C031AD5 */ jal Graph_CloseDisps -/* 01720 80ABB360 2407055A */ addiu $a3, $zero, 0x055A ## $a3 = 0000055A -/* 01724 80ABB364 8FBF002C */ lw $ra, 0x002C($sp) -/* 01728 80ABB368 8FB00024 */ lw $s0, 0x0024($sp) -/* 0172C 80ABB36C 8FB10028 */ lw $s1, 0x0028($sp) -/* 01730 80ABB370 03E00008 */ jr $ra -/* 01734 80ABB374 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 01738 80ABB378 00000000 */ nop -/* 0173C 80ABB37C 00000000 */ nop diff --git a/data/overlays/actors/z_en_niw_lady.data.s b/data/overlays/actors/z_en_niw_lady.data.s deleted file mode 100644 index 0b887d0885..0000000000 --- a/data/overlays/actors/z_en_niw_lady.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 En_Niw_Lady_InitVars - .word 0x013C0400, 0x00000019, 0x01100000, 0x000002FC -.word EnNiwLady_Init -.word EnNiwLady_Destroy -.word EnNiwLady_Update -.word 0x00000000 -glabel D_80ABB3A0 - .word 0x50365070, 0x50725037, 0x50385039, 0x503A503B, 0x503D503C -glabel D_80ABB3B4 - .word 0x02000400, 0x08001000, 0x20004000, 0x80000000 -glabel D_80ABB3C4 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010100, 0x000A000A, 0x00000000, 0x00000000 -glabel D_80ABB3F0 - .byte 0x50, 0x3E, 0x50, 0x3F, 0x50, 0x47 -glabel D_80ABB3F6 - .byte 0x50, 0x40, 0x50, 0x42 -glabel D_80ABB3FA - .byte 0x50, 0x43, 0x50, 0x44 -glabel D_80ABB3FE - .byte 0x00, 0xCF -glabel D_80ABB400 - .word 0x50455042, 0x50270000 -glabel D_80ABB408 - .word 0x060008C8, 0x060010C8, 0x060018C8, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_niw_lady.reloc.s b/data/overlays/actors/z_en_niw_lady.reloc.s deleted file mode 100644 index d945be5bdb..0000000000 --- a/data/overlays/actors/z_en_niw_lady.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_80ABB7C0 - .incbin "baserom/ovl_En_Niw_Lady", 0x1B80, 0x00000290 diff --git a/spec b/spec index 3d03d7f2d1..dc2cf9c0a4 100644 --- a/spec +++ b/spec @@ -2781,8 +2781,7 @@ endseg beginseg name "ovl_En_Niw_Lady" include "build/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.o" - include "build/data/overlays/actors/z_en_niw_lady.data.o" - include "build/data/overlays/actors/z_en_niw_lady.reloc.o" + include "build/src/overlays/actors/ovl_En_Niw_Lady/ovl_En_Niw_Lady_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 7fa0264aa2..85b107c910 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -1,4 +1,6 @@ #include "z_en_niw_lady.h" +#include "overlays/actors/ovl_En_Niw/z_en_niw.h" +#include "vt.h" #define FLAGS 0x00000019 @@ -8,7 +10,21 @@ void EnNiwLady_Init(Actor* thisx, GlobalContext* globalCtx); void EnNiwLady_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnNiwLady_Update(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80AB9F24(EnNiwLady* this, GlobalContext* globalCtx); +void EnNiwLady_Draw(Actor* thisx, GlobalContext* globalCtx); +void func_80ABA21C(EnNiwLady* this, GlobalContext* globalCtx); +void func_80ABAD38(EnNiwLady* this, GlobalContext* globalCtx); +void func_80ABA778(EnNiwLady* this, GlobalContext* globalCtx); +void func_80ABA878(EnNiwLady* this, GlobalContext* globalCtx); +void func_80ABA9B8(EnNiwLady* this, GlobalContext* globalCtx); +void func_80ABAB08(EnNiwLady* this, GlobalContext* globalCtx); +void func_80ABAC00(EnNiwLady* this, GlobalContext* globalCtx); +void func_80ABAA9C(EnNiwLady* this, GlobalContext* globalCtx); +void func_80ABAC84(EnNiwLady* this, GlobalContext* globalCtx); +void func_80ABA244(EnNiwLady* this, GlobalContext* globalCtx); +void func_80ABA654(EnNiwLady* this, GlobalContext* globalCtx); +void func_80ABAD7C(EnNiwLady* this, GlobalContext* globalCtx); + const ActorInit En_Niw_Lady_InitVars = { ACTOR_EN_NIW_LADY, ACTORTYPE_NPC, @@ -20,43 +36,539 @@ const ActorInit En_Niw_Lady_InitVars = { (ActorFunc)EnNiwLady_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Destroy.s") +static s16 sMissingCuccoTextIds[] = { + 0x5036, 0x5070, 0x5072, 0x5037, 0x5038, 0x5039, 0x503A, 0x503B, 0x503D, 0x503C, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s") +static s16 D_80ABB3B4[] = { + 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000, 0x8000, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 10, 10, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA21C.s") +extern SkeletonHeader D_060000F0; +extern AnimationHeader D_06000718; +extern AnimationHeader D_060007D0; +extern AnimationHeader D_06009F94; +extern AnimationHeader D_0600A630; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s") +void EnNiwLady_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnNiwLady* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA654.s") + this->objectAneIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_ANE); + this->objectOsAnimeIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_OS_ANIME); + if ((this->objectOsAnimeIndex < 0) || (this->objectAneIndex < 0)) { + Actor_Kill(thisx); + return; + } + this->unk_278 = 0; + if (globalCtx->sceneNum == SCENE_LABO) { + this->unk_278 = 1; + } + if ((this->unk_278 != 0) && (gSaveContext.nightFlag == 0)) { + Actor_Kill(thisx); + return; + } + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ねぇちゃんうっふん ☆☆☆☆☆ %d\n" VT_RST, this->unk_278); + osSyncPrintf("\n\n"); + this->actionFunc = func_80AB9F24; + thisx->uncullZoneForward = 600.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA778.s") +void EnNiwLady_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnNiwLady* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA878.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA9B8.s") +void EnNiwLady_ChoseAnimation(EnNiwLady* this, GlobalContext* globalCtx, s32 arg2) { + f32 frames; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAA9C.s") + if (Text_GetFaceReaction(globalCtx, 8) != 0) { + arg2 = 8; + } + if (arg2 != this->unk_270) { + this->unk_275 = 0; + this->unk_276 = 1; + this->unk_270 = arg2; + switch (arg2) { + case 10: + this->unk_275 = 1; + case 9: + frames = SkelAnime_GetFrameCount(&D_060007D0); + SkelAnime_ChangeAnim(&this->skelAnime, &D_060007D0, 1.0f, 0.0f, frames, 0, -10.0f); + break; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 8: + case 21: + case 22: + case 24: + case 29: + frames = SkelAnime_GetFrameCount(&D_06009F94); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06009F94, 1.0f, 0.0f, frames, 0, -10.0f); + break; + case 7: + case 20: + case 23: + case 25: + case 26: + case 27: + case 28: + frames = SkelAnime_GetFrameCount(&D_06000718); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000718, 1.0f, 0.0f, frames, 0, -10.0f); + break; + case 100: + frames = SkelAnime_GetFrameCount(&D_0600A630); + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600A630, 1.0f, 0.0f, frames, 0, -10.0f); + this->unk_276 = 0; + break; + } + return; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAB08.s") +void func_80AB9F24(EnNiwLady* this, GlobalContext* globalCtx) { + f32 frames; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC00.s") + if (Object_IsLoaded(&globalCtx->objectCtx, this->objectAneIndex) && + Object_IsLoaded(&globalCtx->objectCtx, this->objectOsAnimeIndex)) { + gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objectAneIndex].segment); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_060000F0, NULL, &this->limbDrawTable, + &this->transitionDrawTable, 16); + gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objectOsAnimeIndex].segment); + this->unk_27E = 1; + this->actor.gravity = -3.0f; + Actor_SetScale(&this->actor, 0.01f); + ActorShape_Init(&this->actor.shape, 0.0f, &ActorShadow_DrawFunc_Circle, 20.0f); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->unk_272 = 0; + this->actor.unk_1F = 6; + this->actor.draw = EnNiwLady_Draw; + switch (this->unk_278) { + case 0: + if (!(gSaveContext.itemGetInf[0] & 0x1000) && LINK_IS_CHILD) { + frames = SkelAnime_GetFrameCount(&D_0600A630); + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600A630, 1.0f, 0.0f, (s16)frames, 0, 0.0f); + } else { + frames = SkelAnime_GetFrameCount(&D_060007D0); + SkelAnime_ChangeAnim(&this->skelAnime, &D_060007D0, 1.0f, 0.0f, (s16)frames, 0, 0.0f); + } + if (LINK_IS_ADULT) { + this->actionFunc = func_80ABA778; + } else { + this->actionFunc = func_80ABA21C; + } + return; + case 1: + frames = SkelAnime_GetFrameCount(&D_060007D0); + SkelAnime_ChangeAnim(&this->skelAnime, &D_060007D0, 1.0f, 0.0f, (s16)frames, 0, 0.0f); + this->actionFunc = func_80ABAD38; + return; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAC84.s") +void func_80ABA21C(EnNiwLady* this, GlobalContext* globalCtx) { + this->actor.textId = sMissingCuccoTextIds[0]; + this->unk_262 = 6; + this->actionFunc = func_80ABA244; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD38.s") +void func_80ABA244(EnNiwLady* this, GlobalContext* globalCtx) { + EnNiw* currentCucco; + s32 phi_s1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s") + this->cuccosInPen = 0; + currentCucco = (EnNiw*)globalCtx->actorCtx.actorList[ACTORTYPE_PROP].first; + while (currentCucco != NULL) { + if (currentCucco->actor.id == ACTOR_EN_NIW) { + if ((fabsf(currentCucco->actor.posRot.pos.x - 330.0f) < 90.0f) && + (fabsf(currentCucco->actor.posRot.pos.z - 1610.0f) < 190.0f)) { + if (this->unk_26C == 0) { + gSaveContext.infTable[25] |= D_80ABB3B4[currentCucco->unk_2AA]; + if (BREG(1) != 0) { + // GET inside the chicken fence! + osSyncPrintf(VT_FGCOL(GREEN) "☆ 鶏柵内ＧＥＴ！☆ %x\n" VT_RST, + D_80ABB3B4[currentCucco->unk_2AA]); + } + } + this->cuccosInPen++; + } else if (this->unk_26C == 0) { + gSaveContext.infTable[25] &= ~D_80ABB3B4[currentCucco->unk_2AA]; + } + } + currentCucco = currentCucco->actor.next; + } + if (BREG(7) != 0) { + this->cuccosInPen = BREG(7) - 1; + } + phi_s1 = this->cuccosInPen; + if ((func_8010BDBC(&globalCtx->msgCtx) == 0) || (func_8010BDBC(&globalCtx->msgCtx) == 6)) { + this->unk_26E = 101; + } + if (this->cuccosInPen >= 7) { + phi_s1 = 8; + if ((this->unk_26C < 2) && (this->unk_26C == 0)) { + phi_s1 = 7; + } + } + if ((this->unk_26C != 0) && (phi_s1 < 7)) { + phi_s1 = 9; + } + this->actor.textId = sMissingCuccoTextIds[phi_s1]; + if (Text_GetFaceReaction(globalCtx, 8) != 0) { + this->actor.textId = Text_GetFaceReaction(globalCtx, 8); + this->unk_262 = 6; + } + if ((this->unk_26C != 0) && (phi_s1 != 9)) { + phi_s1 = 10; + this->unk_26E = 11; + } + if (func_8002F194(&this->actor, globalCtx)) { + osSyncPrintf("\n\n"); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃん選択\t ☆☆☆☆ %d\n" VT_RST, phi_s1); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃんハート ☆☆☆☆ %d\n" VT_RST, this->unk_26C); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃん保存 ☆☆☆☆ %d\n" VT_RST, this->unk_26A); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃん今\t ☆☆☆☆ %d\n" VT_RST, this->cuccosInPen); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ this->actor.talk_message ☆☆ %x\n" VT_RST, this->actor.textId); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ this->message_end_code ☆☆ %d\n" VT_RST, this->unk_262); + osSyncPrintf("\n\n"); + if (Text_GetFaceReaction(globalCtx, 8) == 0) { + if (this->actor.textId == 0x503C) { + func_80078884(NA_SE_SY_ERROR); + this->unk_26C = 2; + this->unk_262 = 5; + this->actionFunc = func_80ABA654; + return; + } + this->unk_26E = phi_s1 + 1; + if (phi_s1 == 7) { + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + this->unk_26C = 1; + this->unk_262 = 5; + this->unk_26A = this->cuccosInPen; + osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 柵内BIT変更前 ☆☆ %x\n" VT_RST, gSaveContext.infTable[25]); + gSaveContext.infTable[25] &= 0x1FF; + osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 柵内BIT変更後 ☆☆ %x\n" VT_RST, gSaveContext.infTable[25]); + osSyncPrintf("\n\n"); + this->actionFunc = func_80ABA654; + return; + } + if (this->unk_26A != this->cuccosInPen) { + if (this->cuccosInPen < this->unk_26A) { + func_80078884(NA_SE_SY_ERROR); + } else if (phi_s1 + 1 < 9) { + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + } + } + if (this->unk_26A < this->cuccosInPen) { + this->unk_26A = this->cuccosInPen; + return; + } + } + } else { + func_8002F2CC(&this->actor, globalCtx, 100.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/EnNiwLady_Update.s") +void func_80ABA654(EnNiwLady* this, GlobalContext* globalCtx) { + if (this->unk_262 == func_8010BDBC(&globalCtx->msgCtx) && func_80106BC8(globalCtx) != 0) { + func_80106CCC(globalCtx); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ハート ☆☆☆☆☆ %d\n" VT_RST, this->unk_26C); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 爆弾 ☆☆☆☆☆ %d\n" VT_RST, this->unk_272); + osSyncPrintf("\n\n"); + this->unk_26E = 0xB; + if (!(gSaveContext.itemGetInf[0] & 0x1000)) { + this->actor.parent = NULL; + this->unk_284 = 0xF; + func_8002F434(&this->actor, globalCtx, 0xF, 100.0f, 50.0f); + this->actionFunc = func_80ABAC00; + return; + } + if (this->unk_26C == 1) { + this->unk_284 = 0x55; + func_8002F434(&this->actor, globalCtx, 0x55, 100.0f, 50.0f); + this->actionFunc = func_80ABAC00; + } + this->actionFunc = func_80ABA244; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0A0.s") +static s16 sTradeItemTextIds[] = { 0x503E, 0x503F, 0x5047, 0x5040, 0x5042, 0x5043, + 0x5044, 0x00CF, 0x5045, 0x5042, 0x5027 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB0CC.s") +void func_80ABA778(EnNiwLady* this, GlobalContext* globalCtx) { + //☆☆☆☆☆ Adult message check ☆☆☆☆☆ + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ アダルトメッセージチェック ☆☆☆☆☆ \n" VT_RST); + this->unk_262 = 6; + this->unk_273 = 0; + if (!(gSaveContext.itemGetInf[2] & 0x1000)) { + if (this->unk_274 != 0) { + this->unk_27A = 1; + } else { + this->unk_27A = 0; + } + this->unk_273 = 1; + this->unk_262 = 4; + } else { + this->unk_27A = 2; + if (!(gSaveContext.itemGetInf[2] & 0x4000)) { + this->unk_27A = 3; + if (gSaveContext.eventChkInf[6] & 0x400) { + this->unk_27A = 9; + if (this->unk_277 != 0) { + this->unk_27A = 10; + } + } else { + this->unk_27A = 4; + } + } + } + this->actor.textId = sTradeItemTextIds[this->unk_27A]; + this->actionFunc = func_80ABA878; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s") +void func_80ABA878(EnNiwLady* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s8 playerExchangeItemId; + + if ((func_8010BDBC(&globalCtx->msgCtx) == 0) || (func_8010BDBC(&globalCtx->msgCtx) == 6)) { + this->unk_26E = 11; + } + if (func_8002F194(&this->actor, globalCtx) != 0) { + playerExchangeItemId = func_8002F368(globalCtx); + if ((playerExchangeItemId == 6) && (gSaveContext.eventChkInf[6] & 0x400)) { + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + player->actor.textId = sTradeItemTextIds[5]; + this->unk_26E = this->unk_27A + 21; + this->unk_262 = 4; + this->actionFunc = func_80ABAB08; + } else if (playerExchangeItemId != 0) { + player->actor.textId = sTradeItemTextIds[7]; + this->unk_26E = this->unk_27A + 21; + } else { + this->unk_274 = 1; + this->unk_26E = this->unk_27A + 21; + this->actionFunc = !this->unk_273 ? func_80ABA778 : func_80ABA9B8; + } + } else { + func_8002F298(&this->actor, globalCtx, 50.0f, 6); + } +} + +void func_80ABA9B8(EnNiwLady* this, GlobalContext* globalCtx) { + if ((this->unk_262 == func_8010BDBC(&globalCtx->msgCtx)) && (func_80106BC8(globalCtx) != 0)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + func_80106CCC(globalCtx); + this->actor.parent = NULL; + func_8002F434(&this->actor, globalCtx, GI_POCKET_EGG, 200.0f, 100.0f); + this->actionFunc = func_80ABAC00; + break; + case 1: + this->actor.textId = sTradeItemTextIds[3]; + this->unk_26E = this->unk_27A + 21; + func_8010B720(globalCtx, this->actor.textId); + this->unk_262 = 5; + this->actionFunc = func_80ABAA9C; + break; + } + } +} + +void func_80ABAA9C(EnNiwLady* this, GlobalContext* globalCtx) { + this->unk_26E = 11; + if ((this->unk_262 == func_8010BDBC(&globalCtx->msgCtx)) && (func_80106BC8(globalCtx) != 0)) { + func_80106CCC(globalCtx); + this->actionFunc = func_80ABA778; + } +} + +void func_80ABAB08(EnNiwLady* this, GlobalContext* globalCtx) { + if ((this->unk_262 == func_8010BDBC(&globalCtx->msgCtx)) && (func_80106BC8(globalCtx) != 0)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + func_80106CCC(globalCtx); + this->actor.parent = NULL; + func_8002F434(&this->actor, globalCtx, 0xE, 200.0f, 100.0f); + this->actionFunc = func_80ABAC00; + break; + case 1: + func_80106CCC(globalCtx); + this->unk_277 = 1; + this->actor.textId = sTradeItemTextIds[8]; + this->unk_26E = this->unk_27A + 21; + func_8010B720(globalCtx, this->actor.textId); + this->unk_262 = 5; + this->actionFunc = func_80ABAA9C; + break; + } + } +} + +void func_80ABAC00(EnNiwLady* this, GlobalContext* globalCtx) { + s32 getItemId; + + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actionFunc = func_80ABAC84; + } else { + getItemId = this->unk_284; + if (LINK_IS_ADULT) { + getItemId = !(gSaveContext.itemGetInf[2] & 0x1000) ? GI_POCKET_EGG : GI_COJIRO; + } + func_8002F434(&this->actor, globalCtx, getItemId, 200.0f, 100.0f); + } +} + +void func_80ABAC84(EnNiwLady* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) != 6) || (func_80106BC8(globalCtx) == 0)) { + return; + } + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); + if (LINK_IS_ADULT) { + if (!(gSaveContext.itemGetInf[2] & 0x1000)) { + gSaveContext.itemGetInf[2] |= 0x1000; + } else { + gSaveContext.itemGetInf[2] |= 0x4000; + } + this->actionFunc = func_80ABA778; + } else { + gSaveContext.itemGetInf[0] |= 0x1000; + this->unk_262 = 6; + this->actionFunc = func_80ABA244; + } +} + +void func_80ABAD38(EnNiwLady* this, GlobalContext* globalCtx) { + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 通常メッセージチェック ☆☆☆☆☆ \n" VT_RST); + this->unk_262 = 6; + this->actionFunc = func_80ABAD7C; +} + +void func_80ABAD7C(EnNiwLady* this, GlobalContext* globalCtx) { + this->actor.textId = 0x503D; + if (Text_GetFaceReaction(globalCtx, 8) != 0) { + this->actor.textId = Text_GetFaceReaction(globalCtx, 8); + } + if ((func_8010BDBC(&globalCtx->msgCtx) == 0) || (func_8010BDBC(&globalCtx->msgCtx) == 6)) { + this->unk_26E = 8; + } + if (func_8002F194(&this->actor, globalCtx) != 0) { + this->unk_274 = 1; + this->unk_26E = this->unk_27A + 9; + this->actionFunc = func_80ABAD38; + } else { + func_8002F2CC(&this->actor, globalCtx, 100.0f); + } +} + +void EnNiwLady_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnNiwLady* this = THIS; + Player* player = PLAYER; + + Actor_SetHeight(thisx, 60.0f); + this->unk_288.unk_18 = player->actor.posRot.pos; + if (LINK_IS_CHILD) { + this->unk_288.unk_18.y = player->actor.posRot.pos.y - 10.0f; + } + func_80034A14(thisx, &this->unk_288, 2, 4); + this->unk_254 = this->unk_288.unk_08; + this->unk_25A = this->unk_288.unk_0E; + if (this->unk_276 == 0) { + Math_SmoothScaleMaxMinS(&this->unk_254.y, 0, 5, 3000, 0); + } + gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objectOsAnimeIndex].segment); + if (this->objectOsAnimeIndex >= 0) { + if (this->unk_27E != 0) { + if (this->unk_26E != 0) { + this->unk_26E--; + EnNiwLady_ChoseAnimation(this, globalCtx, this->unk_26E); + this->unk_26E = 0; + } + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + } + this->objectAneIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_ANE); + if (this->objectAneIndex >= 0) { + this->actionFunc(this, globalCtx); + if (this->unusedTimer2 != 0) { + this->unusedTimer2--; + } + if (this->unusedRandomTimer != 0) { + this->unusedRandomTimer--; + } + this->unusedTimer++; + if (this->unusedRandomTimer == 0) { + this->faceState++; + if (this->faceState >= 3) { + this->faceState = 0; + this->unusedRandomTimer = ((s16)Math_Rand_ZeroFloat(60.0f) + 0x14); + } + } + func_8002E4B4(globalCtx, thisx, 20.0f, 20.0f, 60.0f, 0x1D); + Collider_CylinderUpdate(thisx, &this->collider); + if (1) {} + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); + } + } +} + +Gfx* func_80ABB0A0(GraphicsContext* gfxCtx) { + Gfx* dList; + + dList = Graph_Alloc(gfxCtx, sizeof(Gfx)); + gSPEndDisplayList(dList); + return dList; +} + +s32 EnNiwLady_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* thisx) { + EnNiwLady* this = THIS; + s32 pad; + + if (limbIndex == 15) { + rot->x += this->unk_254.y; + rot->z += this->unk_254.x; + } + if (limbIndex == 8) { + rot->x += this->unk_25A.y; + } + if (this->unk_275 != 0) { + if ((limbIndex == 8) || (limbIndex == 10) || (limbIndex == 13)) { + rot->y += (Math_Sins((globalCtx->state.frames * ((limbIndex * 0x32) + 0x814))) * 200.0f); + rot->z += (Math_Coss((globalCtx->state.frames * ((limbIndex * 0x32) + 0x940))) * 200.0f); + } + } + return 0; +} + +void EnNiwLady_Draw(Actor* thisx, GlobalContext* globalCtx) { + static Gfx* D_80ABB408[] = { 0x060008C8, 0x060010C8, 0x060018C8 }; + EnNiwLady* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_niw_lady.c", 1347); + if (this->unk_27E != 0) { + func_80093D18(globalCtx->state.gfxCtx); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80ABB408[this->faceState])); + gSPSegment(POLY_OPA_DISP++, 0x0C, func_80ABB0A0(globalCtx->state.gfxCtx)); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, + EnNiwLady_OverrideLimbDraw, 0, thisx); + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_niw_lady.c", 1370); +} diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h index 0a4afefaa6..cf84a257f4 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h @@ -6,9 +6,40 @@ struct EnNiwLady; +typedef void (*EnNiwLadyActionFunc)(struct EnNiwLady*, GlobalContext*); + typedef struct EnNiwLady { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1B0]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s limbDrawTable[16]; + /* 0x01F0 */ Vec3s transitionDrawTable[16]; + /* 0x0250 */ EnNiwLadyActionFunc actionFunc; + /* 0x0254 */ Vec3s unk_254; + /* 0x025A */ Vec3s unk_25A; + /* 0x0260 */ s16 unusedTimer; + /* 0x0262 */ s16 unk_262; // "message_end_code" + /* 0x0264 */ s16 unusedTimer2; + /* 0x0266 */ s16 unusedRandomTimer; + /* 0x0268 */ s16 cuccosInPen; + /* 0x026A */ s16 unk_26A; + /* 0x026C */ s16 unk_26C; + /* 0x026E */ s16 unk_26E; + /* 0x0270 */ s16 unk_270; + /* 0x0272 */ u8 unk_272; + /* 0x0273 */ u8 unk_273; + /* 0x0274 */ u8 unk_274; + /* 0x0275 */ u8 unk_275; + /* 0x0276 */ u8 unk_276; + /* 0x0277 */ u8 unk_277; + /* 0x0278 */ s16 unk_278; + /* 0x027A */ s16 unk_27A; + /* 0x027C */ s16 faceState; + /* 0x027E */ s16 unk_27E; + /* 0x0280 */ s8 objectAneIndex; + /* 0x0281 */ s8 objectOsAnimeIndex; + /* 0x0284 */ s32 unk_284; + /* 0x0288 */ struct_80034A14_arg1 unk_288; + /* 0x02B0 */ ColliderCylinder collider; } EnNiwLady; // size = 0x02FC extern const ActorInit En_Niw_Lady_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index f2953286b8..7b9174deab 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1304,6 +1304,13 @@ D_06000970 = 0x06000970; // z_bg_jya_goroiwa D_060006B0 = 0x060006B0; +// z_en_niw_lady +D_060000F0 = 0x060000F0; +D_0600A630 = 0x0600A630; +D_060007D0 = 0x060007D0; +D_06000718 = 0x06000718; +D_06009F94 = 0x06009F94; + // z_en_js D_0600045C = 0x0600045C; D_06005EA0 = 0x06005EA0;