diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Destroy.s deleted file mode 100644 index 168215df9b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel EnWonderTalk2_Destroy -/* 00000 80B39ED0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 80B39ED4 03E00008 */ jr $ra -/* 00008 80B39ED8 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Init.s deleted file mode 100644 index 92f39f9c6f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Init.s +++ /dev/null @@ -1,207 +0,0 @@ -.rdata -glabel D_80B3A8F0 - .asciz "\n\n" - .balign 4 - -glabel D_80B3A8F4 - .asciz "\x1b[32m☆☆☆☆☆ 透明メッセージ君 ☆☆☆☆☆ %x\n\x1b[m" - .balign 4 - -glabel D_80B3A928 - .asciz "\n\n" - .balign 4 - -glabel D_80B3A92C - .asciz "\x1b[33m☆☆☆☆☆ 元は？ ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80B3A95C - .asciz "\x1b[35m☆☆☆☆☆ レンジは？ ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80B3A98C - .asciz "\x1b[36m☆☆☆☆☆ は、範囲わ？ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80B3A9BC - .asciz "\n\n" - .balign 4 - -glabel D_80B3A9C0 - .asciz "\n\n" - .balign 4 - -glabel D_80B3A9C4 - .asciz "\n\n" - .balign 4 - -glabel D_80B3A9C8 - .asciz "\x1b[32m☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -.text -glabel EnWonderTalk2_Init -/* 0000C 80B39EDC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00010 80B39EE0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00014 80B39EE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 80B39EE8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0001C 80B39EEC 3C0480B4 */ lui $a0, %hi(D_80B3A8F0) ## $a0 = 80B40000 -/* 00020 80B39EF0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00024 80B39EF4 0C00084C */ jal osSyncPrintf - -/* 00028 80B39EF8 2484A8F0 */ addiu $a0, $a0, %lo(D_80B3A8F0) ## $a0 = 80B3A8F0 -/* 0002C 80B39EFC 3C0480B4 */ lui $a0, %hi(D_80B3A8F4) ## $a0 = 80B40000 -/* 00030 80B39F00 2484A8F4 */ addiu $a0, $a0, %lo(D_80B3A8F4) ## $a0 = 80B3A8F4 -/* 00034 80B39F04 0C00084C */ jal osSyncPrintf - -/* 00038 80B39F08 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 0003C 80B39F0C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00040 80B39F10 86040034 */ lh $a0, 0x0034($s0) ## 00000034 -/* 00044 80B39F14 3C0880B4 */ lui $t0, %hi(D_80B3A8E0) ## $t0 = 80B40000 -/* 00048 80B39F18 000E7983 */ sra $t7, $t6, 6 -/* 0004C 80B39F1C 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 00050 80B39F20 18800035 */ blez $a0, .L80B39FF8 -/* 00054 80B39F24 A6180150 */ sh $t8, 0x0150($s0) ## 00000150 -/* 00058 80B39F28 00041400 */ sll $v0, $a0, 16 -/* 0005C 80B39F2C 00021403 */ sra $v0, $v0, 16 -/* 00060 80B39F30 2841000B */ slti $at, $v0, 0x000B -/* 00064 80B39F34 14200007 */ bne $at, $zero, .L80B39F54 -/* 00068 80B39F38 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80B39F3C: -/* 0006C 80B39F3C 2442FFF6 */ addiu $v0, $v0, 0xFFF6 ## $v0 = FFFFFFF6 -/* 00070 80B39F40 00021400 */ sll $v0, $v0, 16 -/* 00074 80B39F44 00021403 */ sra $v0, $v0, 16 -/* 00078 80B39F48 2841000B */ slti $at, $v0, 0x000B -/* 0007C 80B39F4C 1020FFFB */ beq $at, $zero, .L80B39F3C -/* 00080 80B39F50 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -.L80B39F54: -/* 00084 80B39F54 44822000 */ mtc1 $v0, $f4 ## $f4 = NaN -/* 00088 80B39F58 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0008C 80B39F5C 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 00090 80B39F60 468021A0 */ cvt.s.w $f6, $f4 -/* 00094 80B39F64 28610007 */ slti $at, $v1, 0x0007 -/* 00098 80B39F68 3C0480B4 */ lui $a0, %hi(D_80B3A928) ## $a0 = 80B40000 -/* 0009C 80B39F6C 46083282 */ mul.s $f10, $f6, $f8 -/* 000A0 80B39F70 14200002 */ bne $at, $zero, .L80B39F7C -/* 000A4 80B39F74 E60A015C */ swc1 $f10, 0x015C($s0) ## 0000015C -/* 000A8 80B39F78 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80B39F7C: -/* 000AC 80B39F7C 0003C840 */ sll $t9, $v1, 1 -/* 000B0 80B39F80 01194021 */ addu $t0, $t0, $t9 -/* 000B4 80B39F84 8508A8E0 */ lh $t0, %lo(D_80B3A8E0)($t0) -/* 000B8 80B39F88 2484A928 */ addiu $a0, $a0, %lo(D_80B3A928) ## $a0 = 80B3A928 -/* 000BC 80B39F8C 0C00084C */ jal osSyncPrintf - -/* 000C0 80B39F90 A208001F */ sb $t0, 0x001F($s0) ## 0000001F -/* 000C4 80B39F94 3C0480B4 */ lui $a0, %hi(D_80B3A92C) ## $a0 = 80B40000 -/* 000C8 80B39F98 2484A92C */ addiu $a0, $a0, %lo(D_80B3A92C) ## $a0 = 80B3A92C -/* 000CC 80B39F9C 0C00084C */ jal osSyncPrintf - -/* 000D0 80B39FA0 86050034 */ lh $a1, 0x0034($s0) ## 00000034 -/* 000D4 80B39FA4 3C0480B4 */ lui $a0, %hi(D_80B3A95C) ## $a0 = 80B40000 -/* 000D8 80B39FA8 2484A95C */ addiu $a0, $a0, %lo(D_80B3A95C) ## $a0 = 80B3A95C -/* 000DC 80B39FAC 0C00084C */ jal osSyncPrintf - -/* 000E0 80B39FB0 8205001F */ lb $a1, 0x001F($s0) ## 0000001F -/* 000E4 80B39FB4 C610015C */ lwc1 $f16, 0x015C($s0) ## 0000015C -/* 000E8 80B39FB8 3C0480B4 */ lui $a0, %hi(D_80B3A98C) ## $a0 = 80B40000 -/* 000EC 80B39FBC 2484A98C */ addiu $a0, $a0, %lo(D_80B3A98C) ## $a0 = 80B3A98C -/* 000F0 80B39FC0 460084A1 */ cvt.d.s $f18, $f16 -/* 000F4 80B39FC4 44079000 */ mfc1 $a3, $f18 -/* 000F8 80B39FC8 44069800 */ mfc1 $a2, $f19 -/* 000FC 80B39FCC 0C00084C */ jal osSyncPrintf - -/* 00100 80B39FD0 00000000 */ nop -/* 00104 80B39FD4 3C0480B4 */ lui $a0, %hi(D_80B3A9BC) ## $a0 = 80B40000 -/* 00108 80B39FD8 0C00084C */ jal osSyncPrintf - -/* 0010C 80B39FDC 2484A9BC */ addiu $a0, $a0, %lo(D_80B3A9BC) ## $a0 = 80B3A9BC -/* 00110 80B39FE0 3C0480B4 */ lui $a0, %hi(D_80B3A9C0) ## $a0 = 80B40000 -/* 00114 80B39FE4 0C00084C */ jal osSyncPrintf - -/* 00118 80B39FE8 2484A9C0 */ addiu $a0, $a0, %lo(D_80B3A9C0) ## $a0 = 80B3A9C0 -/* 0011C 80B39FEC 3C0480B4 */ lui $a0, %hi(D_80B3A9C4) ## $a0 = 80B40000 -/* 00120 80B39FF0 0C00084C */ jal osSyncPrintf - -/* 00124 80B39FF4 2484A9C4 */ addiu $a0, $a0, %lo(D_80B3A9C4) ## $a0 = 80B3A9C4 -.L80B39FF8: -/* 00128 80B39FF8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 0012C 80B39FFC 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 -/* 00130 80B3A000 8E090028 */ lw $t1, 0x0028($s0) ## 00000028 -/* 00134 80B3A004 304B003F */ andi $t3, $v0, 0x003F ## $t3 = 00000000 -/* 00138 80B3A008 A60B0152 */ sh $t3, 0x0152($s0) ## 00000152 -/* 0013C 80B3A00C 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -/* 00140 80B3A010 AE0A0164 */ sw $t2, 0x0164($s0) ## 00000164 -/* 00144 80B3A014 8E0A002C */ lw $t2, 0x002C($s0) ## 0000002C -/* 00148 80B3A018 00026383 */ sra $t4, $v0, 14 -/* 0014C 80B3A01C 318D0003 */ andi $t5, $t4, 0x0003 ## $t5 = 00000000 -/* 00150 80B3A020 2401003F */ addiu $at, $zero, 0x003F ## $at = 0000003F -/* 00154 80B3A024 A60D0154 */ sh $t5, 0x0154($s0) ## 00000154 -/* 00158 80B3A028 AE090168 */ sw $t1, 0x0168($s0) ## 00000168 -/* 0015C 80B3A02C 14A10004 */ bne $a1, $at, .L80B3A040 -/* 00160 80B3A030 AE0A016C */ sw $t2, 0x016C($s0) ## 0000016C -/* 00164 80B3A034 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 00168 80B3A038 A60E0152 */ sh $t6, 0x0152($s0) ## 00000152 -/* 0016C 80B3A03C 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -.L80B3A040: -/* 00170 80B3A040 04A2000D */ bltzl $a1, .L80B3A078 -/* 00174 80B3A044 86020154 */ lh $v0, 0x0154($s0) ## 00000154 -/* 00178 80B3A048 0C00B2D0 */ jal Flags_GetSwitch - -/* 0017C 80B3A04C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00180 80B3A050 10400008 */ beq $v0, $zero, .L80B3A074 -/* 00184 80B3A054 3C0480B4 */ lui $a0, %hi(D_80B3A9C8) ## $a0 = 80B40000 -/* 00188 80B3A058 2484A9C8 */ addiu $a0, $a0, %lo(D_80B3A9C8) ## $a0 = 80B3A9C8 -/* 0018C 80B3A05C 0C00084C */ jal osSyncPrintf - -/* 00190 80B3A060 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -/* 00194 80B3A064 0C00B55C */ jal Actor_Kill - -/* 00198 80B3A068 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0019C 80B3A06C 10000023 */ beq $zero, $zero, .L80B3A0FC -/* 001A0 80B3A070 8FBF001C */ lw $ra, 0x001C($sp) -.L80B3A074: -/* 001A4 80B3A074 86020154 */ lh $v0, 0x0154($s0) ## 00000154 -.L80B3A078: -/* 001A8 80B3A078 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001AC 80B3A07C 8FAF0024 */ lw $t7, 0x0024($sp) -/* 001B0 80B3A080 14410010 */ bne $v0, $at, .L80B3A0C4 -/* 001B4 80B3A084 3C0B80B4 */ lui $t3, %hi(func_80B3A10C) ## $t3 = 80B40000 -/* 001B8 80B3A088 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 -/* 001BC 80B3A08C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 001C0 80B3A090 5701000D */ bnel $t8, $at, .L80B3A0C8 -/* 001C4 80B3A094 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 001C8 80B3A098 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -/* 001CC 80B3A09C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 001D0 80B3A0A0 10A10008 */ beq $a1, $at, .L80B3A0C4 -/* 001D4 80B3A0A4 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 -/* 001D8 80B3A0A8 10A10006 */ beq $a1, $at, .L80B3A0C4 -/* 001DC 80B3A0AC 2401002F */ addiu $at, $zero, 0x002F ## $at = 0000002F -/* 001E0 80B3A0B0 10A10004 */ beq $a1, $at, .L80B3A0C4 -/* 001E4 80B3A0B4 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 001E8 80B3A0B8 A6190154 */ sh $t9, 0x0154($s0) ## 00000154 -/* 001EC 80B3A0BC A200015A */ sb $zero, 0x015A($s0) ## 0000015A -/* 001F0 80B3A0C0 86020154 */ lh $v0, 0x0154($s0) ## 00000154 -.L80B3A0C4: -/* 001F4 80B3A0C4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80B3A0C8: -/* 001F8 80B3A0C8 1441000A */ bne $v0, $at, .L80B3A0F4 -/* 001FC 80B3A0CC 256BA10C */ addiu $t3, $t3, %lo(func_80B3A10C) ## $t3 = 80B3A10C -/* 00200 80B3A0D0 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 00204 80B3A0D4 3C01F7FF */ lui $at, 0xF7FF ## $at = F7FF0000 -/* 00208 80B3A0D8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = F7FFFFFF -/* 0020C 80B3A0DC 3C0A80B4 */ lui $t2, %hi(func_80B3A770) ## $t2 = 80B40000 -/* 00210 80B3A0E0 254AA770 */ addiu $t2, $t2, %lo(func_80B3A770) ## $t2 = 80B3A770 -/* 00214 80B3A0E4 01014824 */ and $t1, $t0, $at -/* 00218 80B3A0E8 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 0021C 80B3A0EC 10000002 */ beq $zero, $zero, .L80B3A0F8 -/* 00220 80B3A0F0 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -.L80B3A0F4: -/* 00224 80B3A0F4 AE0B014C */ sw $t3, 0x014C($s0) ## 0000014C -.L80B3A0F8: -/* 00228 80B3A0F8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B3A0FC: -/* 0022C 80B3A0FC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00230 80B3A100 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00234 80B3A104 03E00008 */ jr $ra -/* 00238 80B3A108 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s deleted file mode 100644 index 8813f2e7a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel EnWonderTalk2_Update -/* 008AC 80B3A77C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 008B0 80B3A780 AFBF0044 */ sw $ra, 0x0044($sp) -/* 008B4 80B3A784 AFA5004C */ sw $a1, 0x004C($sp) -/* 008B8 80B3A788 AFA40048 */ sw $a0, 0x0048($sp) -/* 008BC 80B3A78C 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C -/* 008C0 80B3A790 0320F809 */ jalr $ra, $t9 -/* 008C4 80B3A794 00000000 */ nop -/* 008C8 80B3A798 8FA40048 */ lw $a0, 0x0048($sp) -/* 008CC 80B3A79C C4840168 */ lwc1 $f4, 0x0168($a0) ## 00000168 -/* 008D0 80B3A7A0 8C850160 */ lw $a1, 0x0160($a0) ## 00000160 -/* 008D4 80B3A7A4 0C00B56E */ jal Actor_SetHeight - -/* 008D8 80B3A7A8 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 -/* 008DC 80B3A7AC 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 008E0 80B3A7B0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 008E4 80B3A7B4 8FA40048 */ lw $a0, 0x0048($sp) -/* 008E8 80B3A7B8 85CF12D4 */ lh $t7, 0x12D4($t6) ## 801612D4 -/* 008EC 80B3A7BC 51E0003C */ beql $t7, $zero, .L80B3A8B0 -/* 008F0 80B3A7C0 8FBF0044 */ lw $ra, 0x0044($sp) -/* 008F4 80B3A7C4 84820158 */ lh $v0, 0x0158($a0) ## 00000158 -/* 008F8 80B3A7C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 008FC 80B3A7CC 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00900 80B3A7D0 10400020 */ beq $v0, $zero, .L80B3A854 -/* 00904 80B3A7D4 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00908 80B3A7D8 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 -/* 0090C 80B3A7DC 17000033 */ bne $t8, $zero, .L80B3A8AC -/* 00910 80B3A7E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00914 80B3A7E4 84880032 */ lh $t0, 0x0032($a0) ## 00000032 -/* 00918 80B3A7E8 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 0091C 80B3A7EC C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 -/* 00920 80B3A7F0 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C -/* 00924 80B3A7F4 84870030 */ lh $a3, 0x0030($a0) ## 00000030 -/* 00928 80B3A7F8 AFA80010 */ sw $t0, 0x0010($sp) -/* 0092C 80B3A7FC 84890034 */ lh $t1, 0x0034($a0) ## 00000034 -/* 00930 80B3A800 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00934 80B3A804 8FAE004C */ lw $t6, 0x004C($sp) -/* 00938 80B3A808 240A0046 */ addiu $t2, $zero, 0x0046 ## $t2 = 00000046 -/* 0093C 80B3A80C 240B0046 */ addiu $t3, $zero, 0x0046 ## $t3 = 00000046 -/* 00940 80B3A810 240C0046 */ addiu $t4, $zero, 0x0046 ## $t4 = 00000046 -/* 00944 80B3A814 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 00948 80B3A818 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 0094C 80B3A81C AFB90034 */ sw $t9, 0x0034($sp) -/* 00950 80B3A820 AFAD0030 */ sw $t5, 0x0030($sp) -/* 00954 80B3A824 AFAC002C */ sw $t4, 0x002C($sp) -/* 00958 80B3A828 AFAB0028 */ sw $t3, 0x0028($sp) -/* 0095C 80B3A82C AFAA0024 */ sw $t2, 0x0024($sp) -/* 00960 80B3A830 AFA90014 */ sw $t1, 0x0014($sp) -/* 00964 80B3A834 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00968 80B3A838 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 0096C 80B3A83C E7A00020 */ swc1 $f0, 0x0020($sp) -/* 00970 80B3A840 8DCF0000 */ lw $t7, 0x0000($t6) ## 80160000 -/* 00974 80B3A844 0C018FA7 */ jal DebugDisplay_AddObject - -/* 00978 80B3A848 AFAF0038 */ sw $t7, 0x0038($sp) -/* 0097C 80B3A84C 10000018 */ beq $zero, $zero, .L80B3A8B0 -/* 00980 80B3A850 8FBF0044 */ lw $ra, 0x0044($sp) -.L80B3A854: -/* 00984 80B3A854 84980032 */ lh $t8, 0x0032($a0) ## 00000032 -/* 00988 80B3A858 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 0098C 80B3A85C C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 -/* 00990 80B3A860 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C -/* 00994 80B3A864 84870030 */ lh $a3, 0x0030($a0) ## 00000030 -/* 00998 80B3A868 AFB80010 */ sw $t8, 0x0010($sp) -/* 0099C 80B3A86C 84880034 */ lh $t0, 0x0034($a0) ## 00000034 -/* 009A0 80B3A870 44810000 */ mtc1 $at, $f0 ## $f0 = 0.00 -/* 009A4 80B3A874 8FAC004C */ lw $t4, 0x004C($sp) -/* 009A8 80B3A878 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 -/* 009AC 80B3A87C AFAB0034 */ sw $t3, 0x0034($sp) -/* 009B0 80B3A880 AFAA0030 */ sw $t2, 0x0030($sp) -/* 009B4 80B3A884 AFA9002C */ sw $t1, 0x002C($sp) -/* 009B8 80B3A888 AFA00028 */ sw $zero, 0x0028($sp) -/* 009BC 80B3A88C AFA00024 */ sw $zero, 0x0024($sp) -/* 009C0 80B3A890 AFA80014 */ sw $t0, 0x0014($sp) -/* 009C4 80B3A894 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 009C8 80B3A898 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 009CC 80B3A89C E7A00020 */ swc1 $f0, 0x0020($sp) -/* 009D0 80B3A8A0 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 009D4 80B3A8A4 0C018FA7 */ jal DebugDisplay_AddObject - -/* 009D8 80B3A8A8 AFAD0038 */ sw $t5, 0x0038($sp) -.L80B3A8AC: -/* 009DC 80B3A8AC 8FBF0044 */ lw $ra, 0x0044($sp) -.L80B3A8B0: -/* 009E0 80B3A8B0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 009E4 80B3A8B4 03E00008 */ jr $ra -/* 009E8 80B3A8B8 00000000 */ nop -/* 009EC 80B3A8BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A10C.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A10C.s deleted file mode 100644 index 37e0c31d3d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A10C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B3A10C -/* 0023C 80B3A10C AFA50004 */ sw $a1, 0x0004($sp) -/* 00240 80B3A110 84980150 */ lh $t8, 0x0150($a0) ## 00000150 -/* 00244 80B3A114 84820154 */ lh $v0, 0x0154($a0) ## 00000154 -/* 00248 80B3A118 240F0200 */ addiu $t7, $zero, 0x0200 ## $t7 = 00000200 -/* 0024C 80B3A11C A48F010E */ sh $t7, 0x010E($a0) ## 0000010E -/* 00250 80B3A120 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00254 80B3A124 01F8C825 */ or $t9, $t7, $t8 ## $t9 = 00000200 -/* 00258 80B3A128 10410004 */ beq $v0, $at, .L80B3A13C -/* 0025C 80B3A12C A499010E */ sh $t9, 0x010E($a0) ## 0000010E -/* 00260 80B3A130 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00264 80B3A134 14410005 */ bne $v0, $at, .L80B3A14C -/* 00268 80B3A138 3C0980B4 */ lui $t1, %hi(func_80B3A15C) ## $t1 = 80B40000 -.L80B3A13C: -/* 0026C 80B3A13C 3C0880B4 */ lui $t0, %hi(func_80B3A4F8) ## $t0 = 80B40000 -/* 00270 80B3A140 2508A4F8 */ addiu $t0, $t0, %lo(func_80B3A4F8) ## $t0 = 80B3A4F8 -/* 00274 80B3A144 03E00008 */ jr $ra -/* 00278 80B3A148 AC88014C */ sw $t0, 0x014C($a0) ## 0000014C -.L80B3A14C: -/* 0027C 80B3A14C 2529A15C */ addiu $t1, $t1, %lo(func_80B3A15C) ## $t1 = 80B3A15C -/* 00280 80B3A150 AC89014C */ sw $t1, 0x014C($a0) ## 0000014C -/* 00284 80B3A154 03E00008 */ jr $ra -/* 00288 80B3A158 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A15C.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A15C.s deleted file mode 100644 index b7bc062a1e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A15C.s +++ /dev/null @@ -1,231 +0,0 @@ -.rdata -glabel D_80B3AA08 - .asciz "\x1b[35m☆☆☆☆☆ セーブしたよ！おもいっきり！ %x\n\x1b[m" - .balign 4 - -glabel D_80B3AA3C - .asciz "\n\n" - .balign 4 - -glabel D_80B3AA40 - .asciz "\x1b[32m☆☆☆☆☆ 透明メッセージ君せっと %x\n\x1b[m" - .balign 4 - -glabel D_80B3AA70 - .asciz "\x1b[33m☆☆☆☆☆ セーブ情報 %x\n\x1b[m" - .balign 4 - -glabel D_80B3AAA0 - .asciz "\x1b[35m☆☆☆☆☆ 指定メッセージ種類 %x\n\x1b[m" - .balign 4 - -glabel D_80B3AAD0 - .asciz "\x1b[36m☆☆☆☆☆ 実質メッセージ種類 %x\n\x1b[m" - .balign 4 - -glabel D_80B3AB00 - .asciz "\x1b[32m☆☆☆☆☆ 指定範囲 %d\n\x1b[m" - .balign 4 - -glabel D_80B3AB30 - .asciz "\x1b[33m☆☆☆☆☆ 処理範囲 %f\n\x1b[m" - .balign 4 - -glabel D_80B3AB60 - .asciz "\x1b[35m ☆☆ 通常 ☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B3AB7C - .asciz "\x1b[35m ☆☆ チェックのみ ☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B3ABA0 - .asciz "\x1b[35m ☆☆ ロックのみ ☆☆ \n\x1b[m" - .balign 4 - -.text -glabel func_80B3A15C -/* 0028C 80B3A15C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00290 80B3A160 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00294 80B3A164 AFB00020 */ sw $s0, 0x0020($sp) -/* 00298 80B3A168 AFA50034 */ sw $a1, 0x0034($sp) -/* 0029C 80B3A16C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 002A0 80B3A170 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002A4 80B3A174 AFAF002C */ sw $t7, 0x002C($sp) -/* 002A8 80B3A178 84980158 */ lh $t8, 0x0158($a0) ## 00000158 -/* 002AC 80B3A17C 84860152 */ lh $a2, 0x0152($a0) ## 00000152 -/* 002B0 80B3A180 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 002B4 80B3A184 04C00010 */ bltz $a2, .L80B3A1C8 -/* 002B8 80B3A188 A4990158 */ sh $t9, 0x0158($a0) ## 00000158 -/* 002BC 80B3A18C 8FA40034 */ lw $a0, 0x0034($sp) -/* 002C0 80B3A190 0C00B2D0 */ jal Flags_GetSwitch - -/* 002C4 80B3A194 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 002C8 80B3A198 5040000C */ beql $v0, $zero, .L80B3A1CC -/* 002CC 80B3A19C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002D0 80B3A1A0 9208015A */ lbu $t0, 0x015A($s0) ## 0000015A -/* 002D4 80B3A1A4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 002D8 80B3A1A8 55000086 */ bnel $t0, $zero, .L80B3A3C4 -/* 002DC 80B3A1AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 002E0 80B3A1B0 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 002E4 80B3A1B4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 002E8 80B3A1B8 A20B015A */ sb $t3, 0x015A($s0) ## 0000015A -/* 002EC 80B3A1BC 01215024 */ and $t2, $t1, $at -/* 002F0 80B3A1C0 1000007F */ beq $zero, $zero, .L80B3A3C0 -/* 002F4 80B3A1C4 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -.L80B3A1C8: -/* 002F8 80B3A1C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B3A1CC: -/* 002FC 80B3A1CC 0C00BC65 */ jal func_8002F194 -/* 00300 80B3A1D0 8FA50034 */ lw $a1, 0x0034($sp) -/* 00304 80B3A1D4 10400013 */ beq $v0, $zero, .L80B3A224 -/* 00308 80B3A1D8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0030C 80B3A1DC 86060152 */ lh $a2, 0x0152($s0) ## 00000152 -/* 00310 80B3A1E0 04C0000C */ bltz $a2, .L80B3A214 -/* 00314 80B3A1E4 00000000 */ nop -/* 00318 80B3A1E8 860C0154 */ lh $t4, 0x0154($s0) ## 00000154 -/* 0031C 80B3A1EC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00320 80B3A1F0 8FA40034 */ lw $a0, 0x0034($sp) -/* 00324 80B3A1F4 11810007 */ beq $t4, $at, .L80B3A214 -/* 00328 80B3A1F8 00000000 */ nop -/* 0032C 80B3A1FC 0C00B2DD */ jal Flags_SetSwitch - -/* 00330 80B3A200 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00334 80B3A204 3C0480B4 */ lui $a0, %hi(D_80B3AA08) ## $a0 = 80B40000 -/* 00338 80B3A208 2484AA08 */ addiu $a0, $a0, %lo(D_80B3AA08) ## $a0 = 80B3AA08 -/* 0033C 80B3A20C 0C00084C */ jal osSyncPrintf - -/* 00340 80B3A210 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -.L80B3A214: -/* 00344 80B3A214 3C0D80B4 */ lui $t5, %hi(func_80B3A10C) ## $t5 = 80B40000 -/* 00348 80B3A218 25ADA10C */ addiu $t5, $t5, %lo(func_80B3A10C) ## $t5 = 80B3A10C -/* 0034C 80B3A21C 10000068 */ beq $zero, $zero, .L80B3A3C0 -/* 00350 80B3A220 AE0D014C */ sw $t5, 0x014C($s0) ## 0000014C -.L80B3A224: -/* 00354 80B3A224 860E008A */ lh $t6, 0x008A($s0) ## 0000008A -/* 00358 80B3A228 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 0035C 80B3A22C 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -/* 00360 80B3A230 8FB8002C */ lw $t8, 0x002C($sp) -/* 00364 80B3A234 01CF1023 */ subu $v0, $t6, $t7 -/* 00368 80B3A238 00021400 */ sll $v0, $v0, 16 -/* 0036C 80B3A23C 00021403 */ sra $v0, $v0, 16 -/* 00370 80B3A240 04400004 */ bltz $v0, .L80B3A254 -/* 00374 80B3A244 00021823 */ subu $v1, $zero, $v0 -/* 00378 80B3A248 00021C00 */ sll $v1, $v0, 16 -/* 0037C 80B3A24C 10000003 */ beq $zero, $zero, .L80B3A25C -/* 00380 80B3A250 00031C03 */ sra $v1, $v1, 16 -.L80B3A254: -/* 00384 80B3A254 00031C00 */ sll $v1, $v1, 16 -/* 00388 80B3A258 00031C03 */ sra $v1, $v1, 16 -.L80B3A25C: -/* 0038C 80B3A25C C602015C */ lwc1 $f2, 0x015C($s0) ## 0000015C -/* 00390 80B3A260 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 00394 80B3A264 46022180 */ add.s $f6, $f4, $f2 -/* 00398 80B3A268 4608303C */ c.lt.s $f6, $f8 -/* 0039C 80B3A26C 00000000 */ nop -/* 003A0 80B3A270 45030054 */ bc1tl .L80B3A3C4 -/* 003A4 80B3A274 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003A8 80B3A278 C70A0028 */ lwc1 $f10, 0x0028($t8) ## 00000028 -/* 003AC 80B3A27C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 003B0 80B3A280 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 003B4 80B3A284 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 003B8 80B3A288 46105001 */ sub.s $f0, $f10, $f16 -/* 003BC 80B3A28C 28614000 */ slti $at, $v1, 0x4000 -/* 003C0 80B3A290 46000005 */ abs.s $f0, $f0 -/* 003C4 80B3A294 4600903C */ c.lt.s $f18, $f0 -/* 003C8 80B3A298 00000000 */ nop -/* 003CC 80B3A29C 45030049 */ bc1tl .L80B3A3C4 -/* 003D0 80B3A2A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003D4 80B3A2A4 50200047 */ beql $at, $zero, .L80B3A3C4 -/* 003D8 80B3A2A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003DC 80B3A2AC 86190158 */ lh $t9, 0x0158($s0) ## 00000158 -/* 003E0 80B3A2B0 3C0480B4 */ lui $a0, %hi(D_80B3AA3C) ## $a0 = 80B40000 -/* 003E4 80B3A2B4 2B210002 */ slti $at, $t9, 0x0002 -/* 003E8 80B3A2B8 54200037 */ bnel $at, $zero, .L80B3A398 -/* 003EC 80B3A2BC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 003F0 80B3A2C0 0C00084C */ jal osSyncPrintf - -/* 003F4 80B3A2C4 2484AA3C */ addiu $a0, $a0, %lo(D_80B3AA3C) ## $a0 = 80B3AA3C -/* 003F8 80B3A2C8 3C0480B4 */ lui $a0, %hi(D_80B3AA40) ## $a0 = 80B40000 -/* 003FC 80B3A2CC 2484AA40 */ addiu $a0, $a0, %lo(D_80B3AA40) ## $a0 = 80B3AA40 -/* 00400 80B3A2D0 0C00084C */ jal osSyncPrintf - -/* 00404 80B3A2D4 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00408 80B3A2D8 3C0480B4 */ lui $a0, %hi(D_80B3AA70) ## $a0 = 80B40000 -/* 0040C 80B3A2DC 2484AA70 */ addiu $a0, $a0, %lo(D_80B3AA70) ## $a0 = 80B3AA70 -/* 00410 80B3A2E0 0C00084C */ jal osSyncPrintf - -/* 00414 80B3A2E4 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -/* 00418 80B3A2E8 3C0480B4 */ lui $a0, %hi(D_80B3AAA0) ## $a0 = 80B40000 -/* 0041C 80B3A2EC 2484AAA0 */ addiu $a0, $a0, %lo(D_80B3AAA0) ## $a0 = 80B3AAA0 -/* 00420 80B3A2F0 0C00084C */ jal osSyncPrintf - -/* 00424 80B3A2F4 86050150 */ lh $a1, 0x0150($s0) ## 00000150 -/* 00428 80B3A2F8 3C0480B4 */ lui $a0, %hi(D_80B3AAD0) ## $a0 = 80B40000 -/* 0042C 80B3A2FC 2484AAD0 */ addiu $a0, $a0, %lo(D_80B3AAD0) ## $a0 = 80B3AAD0 -/* 00430 80B3A300 0C00084C */ jal osSyncPrintf - -/* 00434 80B3A304 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 00438 80B3A308 3C0480B4 */ lui $a0, %hi(D_80B3AB00) ## $a0 = 80B40000 -/* 0043C 80B3A30C 2484AB00 */ addiu $a0, $a0, %lo(D_80B3AB00) ## $a0 = 80B3AB00 -/* 00440 80B3A310 0C00084C */ jal osSyncPrintf - -/* 00444 80B3A314 86050034 */ lh $a1, 0x0034($s0) ## 00000034 -/* 00448 80B3A318 C604015C */ lwc1 $f4, 0x015C($s0) ## 0000015C -/* 0044C 80B3A31C 3C0480B4 */ lui $a0, %hi(D_80B3AB30) ## $a0 = 80B40000 -/* 00450 80B3A320 2484AB30 */ addiu $a0, $a0, %lo(D_80B3AB30) ## $a0 = 80B3AB30 -/* 00454 80B3A324 460021A1 */ cvt.d.s $f6, $f4 -/* 00458 80B3A328 44073000 */ mfc1 $a3, $f6 -/* 0045C 80B3A32C 44063800 */ mfc1 $a2, $f7 -/* 00460 80B3A330 0C00084C */ jal osSyncPrintf - -/* 00464 80B3A334 00000000 */ nop -/* 00468 80B3A338 86020154 */ lh $v0, 0x0154($s0) ## 00000154 -/* 0046C 80B3A33C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00470 80B3A340 3C0480B4 */ lui $a0, %hi(D_80B3AB60) ## $a0 = 80B40000 -/* 00474 80B3A344 10400008 */ beq $v0, $zero, .L80B3A368 -/* 00478 80B3A348 00000000 */ nop -/* 0047C 80B3A34C 1041000A */ beq $v0, $at, .L80B3A378 -/* 00480 80B3A350 3C0480B4 */ lui $a0, %hi(D_80B3AB7C) ## $a0 = 80B40000 -/* 00484 80B3A354 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00488 80B3A358 1041000B */ beq $v0, $at, .L80B3A388 -/* 0048C 80B3A35C 3C0480B4 */ lui $a0, %hi(D_80B3ABA0) ## $a0 = 80B40000 -/* 00490 80B3A360 1000000C */ beq $zero, $zero, .L80B3A394 -/* 00494 80B3A364 C602015C */ lwc1 $f2, 0x015C($s0) ## 0000015C -.L80B3A368: -/* 00498 80B3A368 0C00084C */ jal osSyncPrintf - -/* 0049C 80B3A36C 2484AB60 */ addiu $a0, $a0, %lo(D_80B3AB60) ## $a0 = 80B3AB60 -/* 004A0 80B3A370 10000008 */ beq $zero, $zero, .L80B3A394 -/* 004A4 80B3A374 C602015C */ lwc1 $f2, 0x015C($s0) ## 0000015C -.L80B3A378: -/* 004A8 80B3A378 0C00084C */ jal osSyncPrintf - -/* 004AC 80B3A37C 2484AB7C */ addiu $a0, $a0, %lo(D_80B3AB7C) ## $a0 = FFFFAB7C -/* 004B0 80B3A380 10000004 */ beq $zero, $zero, .L80B3A394 -/* 004B4 80B3A384 C602015C */ lwc1 $f2, 0x015C($s0) ## 0000015C -.L80B3A388: -/* 004B8 80B3A388 0C00084C */ jal osSyncPrintf - -/* 004BC 80B3A38C 2484ABA0 */ addiu $a0, $a0, %lo(D_80B3ABA0) ## $a0 = FFFFABA0 -/* 004C0 80B3A390 C602015C */ lwc1 $f2, 0x015C($s0) ## 0000015C -.L80B3A394: -/* 004C4 80B3A394 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -.L80B3A398: -/* 004C8 80B3A398 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 004CC 80B3A39C A6000158 */ sh $zero, 0x0158($s0) ## 00000158 -/* 004D0 80B3A3A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 004D4 80B3A3A4 46081280 */ add.s $f10, $f2, $f8 -/* 004D8 80B3A3A8 8FA50034 */ lw $a1, 0x0034($sp) -/* 004DC 80B3A3AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004E0 80B3A3B0 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 004E4 80B3A3B4 44065000 */ mfc1 $a2, $f10 -/* 004E8 80B3A3B8 0C00BC71 */ jal func_8002F1C4 -/* 004EC 80B3A3BC 00000000 */ nop -.L80B3A3C0: -/* 004F0 80B3A3C0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B3A3C4: -/* 004F4 80B3A3C4 8FB00020 */ lw $s0, 0x0020($sp) -/* 004F8 80B3A3C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 004FC 80B3A3CC 03E00008 */ jr $ra -/* 00500 80B3A3D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s deleted file mode 100644 index b21caf7b65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s +++ /dev/null @@ -1,94 +0,0 @@ -.rdata -glabel D_80B3ABC0 - .asciz "\x1b[35m☆☆☆☆☆ わー %d\n\x1b[m" - .balign 4 - -glabel D_80B3ABDC - .asciz "\x1b[35m☆☆☆☆☆ (強制)セーブしたよ！おもいっきり！ %x\n\x1b[m" - .balign 4 - -.text -glabel func_80B3A3D4 -/* 00504 80B3A3D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00508 80B3A3D8 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 0050C 80B3A3DC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 00510 80B3A3E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00514 80B3A3E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00518 80B3A3E8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0051C 80B3A3EC 85CF12D8 */ lh $t7, 0x12D8($t6) ## 801612D8 -/* 00520 80B3A3F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00524 80B3A3F4 51E00008 */ beql $t7, $zero, .L80B3A418 -/* 00528 80B3A3F8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0052C 80B3A3FC 0C042F6F */ jal func_8010BDBC -/* 00530 80B3A400 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00534 80B3A404 3C0480B4 */ lui $a0, %hi(D_80B3ABC0) ## $a0 = 80B40000 -/* 00538 80B3A408 2484ABC0 */ addiu $a0, $a0, %lo(D_80B3ABC0) ## $a0 = 80B3ABC0 -/* 0053C 80B3A40C 0C00084C */ jal osSyncPrintf - -/* 00540 80B3A410 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00544 80B3A414 8FA40034 */ lw $a0, 0x0034($sp) -.L80B3A418: -/* 00548 80B3A418 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 0054C 80B3A41C 0C042F6F */ jal func_8010BDBC -/* 00550 80B3A420 AFA40024 */ sw $a0, 0x0024($sp) -/* 00554 80B3A424 10400010 */ beq $v0, $zero, .L80B3A468 -/* 00558 80B3A428 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0055C 80B3A42C 10410003 */ beq $v0, $at, .L80B3A43C -/* 00560 80B3A430 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00564 80B3A434 5441002C */ bnel $v0, $at, .L80B3A4E8 -/* 00568 80B3A438 8FBF001C */ lw $ra, 0x001C($sp) -.L80B3A43C: -/* 0056C 80B3A43C 0C041AF2 */ jal func_80106BC8 -/* 00570 80B3A440 8FA40034 */ lw $a0, 0x0034($sp) -/* 00574 80B3A444 50400028 */ beql $v0, $zero, .L80B3A4E8 -/* 00578 80B3A448 8FBF001C */ lw $ra, 0x001C($sp) -/* 0057C 80B3A44C 0C042F6F */ jal func_8010BDBC -/* 00580 80B3A450 8FA40024 */ lw $a0, 0x0024($sp) -/* 00584 80B3A454 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00588 80B3A458 54410004 */ bnel $v0, $at, .L80B3A46C -/* 0058C 80B3A45C 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -/* 00590 80B3A460 0C041B33 */ jal func_80106CCC -/* 00594 80B3A464 8FA40034 */ lw $a0, 0x0034($sp) -.L80B3A468: -/* 00598 80B3A468 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -.L80B3A46C: -/* 0059C 80B3A46C 04A2000C */ bltzl $a1, .L80B3A4A0 -/* 005A0 80B3A470 86190154 */ lh $t9, 0x0154($s0) ## 00000154 -/* 005A4 80B3A474 86180154 */ lh $t8, 0x0154($s0) ## 00000154 -/* 005A8 80B3A478 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 005AC 80B3A47C 53010008 */ beql $t8, $at, .L80B3A4A0 -/* 005B0 80B3A480 86190154 */ lh $t9, 0x0154($s0) ## 00000154 -/* 005B4 80B3A484 0C00B2DD */ jal Flags_SetSwitch - -/* 005B8 80B3A488 8FA40034 */ lw $a0, 0x0034($sp) -/* 005BC 80B3A48C 3C0480B4 */ lui $a0, %hi(D_80B3ABDC) ## $a0 = 80B40000 -/* 005C0 80B3A490 2484ABDC */ addiu $a0, $a0, %lo(D_80B3ABDC) ## $a0 = 80B3ABDC -/* 005C4 80B3A494 0C00084C */ jal osSyncPrintf - -/* 005C8 80B3A498 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -/* 005CC 80B3A49C 86190154 */ lh $t9, 0x0154($s0) ## 00000154 -.L80B3A4A0: -/* 005D0 80B3A4A0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 005D4 80B3A4A4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 005D8 80B3A4A8 17210002 */ bne $t9, $at, .L80B3A4B4 -/* 005DC 80B3A4AC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005E0 80B3A4B0 A208015A */ sb $t0, 0x015A($s0) ## 0000015A -.L80B3A4B4: -/* 005E4 80B3A4B4 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 005E8 80B3A4B8 2401FFEE */ addiu $at, $zero, 0xFFEE ## $at = FFFFFFEE -/* 005EC 80B3A4BC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 005F0 80B3A4C0 01215024 */ and $t2, $t1, $at -/* 005F4 80B3A4C4 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 005F8 80B3A4C8 0C00B7D5 */ jal func_8002DF54 -/* 005FC 80B3A4CC 8FA40034 */ lw $a0, 0x0034($sp) -/* 00600 80B3A4D0 3C0C80B4 */ lui $t4, %hi(func_80B3A4F8) ## $t4 = 80B40000 -/* 00604 80B3A4D4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00608 80B3A4D8 258CA4F8 */ addiu $t4, $t4, %lo(func_80B3A4F8) ## $t4 = 80B3A4F8 -/* 0060C 80B3A4DC A60B0156 */ sh $t3, 0x0156($s0) ## 00000156 -/* 00610 80B3A4E0 AE0C014C */ sw $t4, 0x014C($s0) ## 0000014C -/* 00614 80B3A4E4 8FBF001C */ lw $ra, 0x001C($sp) -.L80B3A4E8: -/* 00618 80B3A4E8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0061C 80B3A4EC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00620 80B3A4F0 03E00008 */ jr $ra -/* 00624 80B3A4F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s deleted file mode 100644 index 736d7049ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s +++ /dev/null @@ -1,242 +0,0 @@ -.rdata -glabel D_80B3AC18 - .asciz "\x1b[35m☆☆☆☆☆ きょり %f\n\x1b[m" - .balign 4 - -glabel D_80B3AC38 - .asciz "\n\n" - .balign 4 - -glabel D_80B3AC3C - .asciz "\x1b[32m☆☆☆☆☆ 透明メッセージ君せっと %x\n\x1b[m" - .balign 4 - -glabel D_80B3AC6C - .asciz "\x1b[33m☆☆☆☆☆ セーブ情報 %x\n\x1b[m" - .balign 4 - -glabel D_80B3AC9C - .asciz "\x1b[35m☆☆☆☆☆ 指定メッセージ種類 %x\n\x1b[m" - .balign 4 - -glabel D_80B3ACCC - .asciz "\x1b[36m☆☆☆☆☆ 実質メッセージ種類 %x\n\x1b[m" - .balign 4 - -glabel D_80B3ACFC - .asciz "\x1b[32m☆☆☆☆☆ 指定範囲 %d\n\x1b[m" - .balign 4 - -glabel D_80B3AD2C - .asciz "\x1b[33m☆☆☆☆☆ 処理範囲 %f\n\x1b[m" - .balign 4 - -glabel D_80B3AD5C - .asciz "\x1b[35m☆☆☆☆☆ レンジは？ %d\n\x1b[m" - .balign 4 - -glabel D_80B3AD84 - .asciz "\n\n" - .balign 4 - -glabel D_80B3AD88 - .asciz "\n\n" - .balign 4 - -glabel D_80B3AD8C - .asciz "\x1b[35m ☆☆ 強制 ☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B3ADA8 - .asciz "\x1b[31m ☆☆ ゲルドの修練場強制チェックのみ ☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B3ADDC - .asciz "\n\n" - .balign 4 - -.text -glabel func_80B3A4F8 -/* 00628 80B3A4F8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0062C 80B3A4FC AFBF001C */ sw $ra, 0x001C($sp) -/* 00630 80B3A500 AFB00018 */ sw $s0, 0x0018($sp) -/* 00634 80B3A504 AFA5002C */ sw $a1, 0x002C($sp) -/* 00638 80B3A508 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 0063C 80B3A50C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00640 80B3A510 AFAF0024 */ sw $t7, 0x0024($sp) -/* 00644 80B3A514 84980158 */ lh $t8, 0x0158($a0) ## 00000158 -/* 00648 80B3A518 84860152 */ lh $a2, 0x0152($a0) ## 00000152 -/* 0064C 80B3A51C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00650 80B3A520 04C00010 */ bltz $a2, .L80B3A564 -/* 00654 80B3A524 A4990158 */ sh $t9, 0x0158($a0) ## 00000158 -/* 00658 80B3A528 8FA4002C */ lw $a0, 0x002C($sp) -/* 0065C 80B3A52C 0C00B2D0 */ jal Flags_GetSwitch - -/* 00660 80B3A530 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00664 80B3A534 5040000C */ beql $v0, $zero, .L80B3A568 -/* 00668 80B3A538 860C0154 */ lh $t4, 0x0154($s0) ## 00000154 -/* 0066C 80B3A53C 9208015A */ lbu $t0, 0x015A($s0) ## 0000015A -/* 00670 80B3A540 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00674 80B3A544 55000086 */ bnel $t0, $zero, .L80B3A760 -/* 00678 80B3A548 8FBF001C */ lw $ra, 0x001C($sp) -/* 0067C 80B3A54C 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 00680 80B3A550 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00684 80B3A554 A20B015A */ sb $t3, 0x015A($s0) ## 0000015A -/* 00688 80B3A558 01215024 */ and $t2, $t1, $at -/* 0068C 80B3A55C 1000007F */ beq $zero, $zero, .L80B3A75C -/* 00690 80B3A560 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -.L80B3A564: -/* 00694 80B3A564 860C0154 */ lh $t4, 0x0154($s0) ## 00000154 -.L80B3A568: -/* 00698 80B3A568 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0069C 80B3A56C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 006A0 80B3A570 15810004 */ bne $t4, $at, .L80B3A584 -/* 006A4 80B3A574 00000000 */ nop -/* 006A8 80B3A578 920D015A */ lbu $t5, 0x015A($s0) ## 0000015A -/* 006AC 80B3A57C 55A00078 */ bnel $t5, $zero, .L80B3A760 -/* 006B0 80B3A580 8FBF001C */ lw $ra, 0x001C($sp) -.L80B3A584: -/* 006B4 80B3A584 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 006B8 80B3A588 85CF12D8 */ lh $t7, 0x12D8($t6) ## 801612D8 -/* 006BC 80B3A58C 51E0000A */ beql $t7, $zero, .L80B3A5B8 -/* 006C0 80B3A590 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 006C4 80B3A594 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 006C8 80B3A598 3C0480B4 */ lui $a0, %hi(D_80B3AC18) ## $a0 = 80B40000 -/* 006CC 80B3A59C 2484AC18 */ addiu $a0, $a0, %lo(D_80B3AC18) ## $a0 = 80B3AC18 -/* 006D0 80B3A5A0 460021A1 */ cvt.d.s $f6, $f4 -/* 006D4 80B3A5A4 44073000 */ mfc1 $a3, $f6 -/* 006D8 80B3A5A8 44063800 */ mfc1 $a2, $f7 -/* 006DC 80B3A5AC 0C00084C */ jal osSyncPrintf - -/* 006E0 80B3A5B0 00000000 */ nop -/* 006E4 80B3A5B4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -.L80B3A5B8: -/* 006E8 80B3A5B8 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 006EC 80B3A5BC C610015C */ lwc1 $f16, 0x015C($s0) ## 0000015C -/* 006F0 80B3A5C0 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 006F4 80B3A5C4 8FB80024 */ lw $t8, 0x0024($sp) -/* 006F8 80B3A5C8 46105480 */ add.s $f18, $f10, $f16 -/* 006FC 80B3A5CC 4612403C */ c.lt.s $f8, $f18 -/* 00700 80B3A5D0 00000000 */ nop -/* 00704 80B3A5D4 45020061 */ bc1fl .L80B3A75C -/* 00708 80B3A5D8 A6000156 */ sh $zero, 0x0156($s0) ## 00000156 -/* 0070C 80B3A5DC C7040028 */ lwc1 $f4, 0x0028($t8) ## 00000028 -/* 00710 80B3A5E0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00714 80B3A5E4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00718 80B3A5E8 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 0071C 80B3A5EC 46062001 */ sub.s $f0, $f4, $f6 -/* 00720 80B3A5F0 46000005 */ abs.s $f0, $f0 -/* 00724 80B3A5F4 460A003C */ c.lt.s $f0, $f10 -/* 00728 80B3A5F8 00000000 */ nop -/* 0072C 80B3A5FC 45020057 */ bc1fl .L80B3A75C -/* 00730 80B3A600 A6000156 */ sh $zero, 0x0156($s0) ## 00000156 -/* 00734 80B3A604 0C02FF21 */ jal Gameplay_InCsMode -/* 00738 80B3A608 8FA4002C */ lw $a0, 0x002C($sp) -/* 0073C 80B3A60C 54400053 */ bnel $v0, $zero, .L80B3A75C -/* 00740 80B3A610 A6000156 */ sh $zero, 0x0156($s0) ## 00000156 -/* 00744 80B3A614 86190158 */ lh $t9, 0x0158($s0) ## 00000158 -/* 00748 80B3A618 3C0480B4 */ lui $a0, %hi(D_80B3AC38) ## $a0 = 80B40000 -/* 0074C 80B3A61C 2B210002 */ slti $at, $t9, 0x0002 -/* 00750 80B3A620 5420003C */ bnel $at, $zero, .L80B3A714 -/* 00754 80B3A624 86080156 */ lh $t0, 0x0156($s0) ## 00000156 -/* 00758 80B3A628 0C00084C */ jal osSyncPrintf - -/* 0075C 80B3A62C 2484AC38 */ addiu $a0, $a0, %lo(D_80B3AC38) ## $a0 = 80B3AC38 -/* 00760 80B3A630 3C0480B4 */ lui $a0, %hi(D_80B3AC3C) ## $a0 = 80B40000 -/* 00764 80B3A634 2484AC3C */ addiu $a0, $a0, %lo(D_80B3AC3C) ## $a0 = 80B3AC3C -/* 00768 80B3A638 0C00084C */ jal osSyncPrintf - -/* 0076C 80B3A63C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00770 80B3A640 3C0480B4 */ lui $a0, %hi(D_80B3AC6C) ## $a0 = 80B40000 -/* 00774 80B3A644 2484AC6C */ addiu $a0, $a0, %lo(D_80B3AC6C) ## $a0 = 80B3AC6C -/* 00778 80B3A648 0C00084C */ jal osSyncPrintf - -/* 0077C 80B3A64C 86050152 */ lh $a1, 0x0152($s0) ## 00000152 -/* 00780 80B3A650 3C0480B4 */ lui $a0, %hi(D_80B3AC9C) ## $a0 = 80B40000 -/* 00784 80B3A654 2484AC9C */ addiu $a0, $a0, %lo(D_80B3AC9C) ## $a0 = 80B3AC9C -/* 00788 80B3A658 0C00084C */ jal osSyncPrintf - -/* 0078C 80B3A65C 86050150 */ lh $a1, 0x0150($s0) ## 00000150 -/* 00790 80B3A660 3C0480B4 */ lui $a0, %hi(D_80B3ACCC) ## $a0 = 80B40000 -/* 00794 80B3A664 2484ACCC */ addiu $a0, $a0, %lo(D_80B3ACCC) ## $a0 = 80B3ACCC -/* 00798 80B3A668 0C00084C */ jal osSyncPrintf - -/* 0079C 80B3A66C 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 007A0 80B3A670 3C0480B4 */ lui $a0, %hi(D_80B3ACFC) ## $a0 = 80B40000 -/* 007A4 80B3A674 2484ACFC */ addiu $a0, $a0, %lo(D_80B3ACFC) ## $a0 = 80B3ACFC -/* 007A8 80B3A678 0C00084C */ jal osSyncPrintf - -/* 007AC 80B3A67C 86050034 */ lh $a1, 0x0034($s0) ## 00000034 -/* 007B0 80B3A680 C610015C */ lwc1 $f16, 0x015C($s0) ## 0000015C -/* 007B4 80B3A684 3C0480B4 */ lui $a0, %hi(D_80B3AD2C) ## $a0 = 80B40000 -/* 007B8 80B3A688 2484AD2C */ addiu $a0, $a0, %lo(D_80B3AD2C) ## $a0 = 80B3AD2C -/* 007BC 80B3A68C 46008221 */ cvt.d.s $f8, $f16 -/* 007C0 80B3A690 44074000 */ mfc1 $a3, $f8 -/* 007C4 80B3A694 44064800 */ mfc1 $a2, $f9 -/* 007C8 80B3A698 0C00084C */ jal osSyncPrintf - -/* 007CC 80B3A69C 00000000 */ nop -/* 007D0 80B3A6A0 3C0480B4 */ lui $a0, %hi(D_80B3AD5C) ## $a0 = 80B40000 -/* 007D4 80B3A6A4 2484AD5C */ addiu $a0, $a0, %lo(D_80B3AD5C) ## $a0 = 80B3AD5C -/* 007D8 80B3A6A8 0C00084C */ jal osSyncPrintf - -/* 007DC 80B3A6AC 8205001F */ lb $a1, 0x001F($s0) ## 0000001F -/* 007E0 80B3A6B0 3C0480B4 */ lui $a0, %hi(D_80B3AD84) ## $a0 = 80B40000 -/* 007E4 80B3A6B4 0C00084C */ jal osSyncPrintf - -/* 007E8 80B3A6B8 2484AD84 */ addiu $a0, $a0, %lo(D_80B3AD84) ## $a0 = 80B3AD84 -/* 007EC 80B3A6BC 3C0480B4 */ lui $a0, %hi(D_80B3AD88) ## $a0 = 80B40000 -/* 007F0 80B3A6C0 0C00084C */ jal osSyncPrintf - -/* 007F4 80B3A6C4 2484AD88 */ addiu $a0, $a0, %lo(D_80B3AD88) ## $a0 = 80B3AD88 -/* 007F8 80B3A6C8 86020154 */ lh $v0, 0x0154($s0) ## 00000154 -/* 007FC 80B3A6CC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00800 80B3A6D0 3C0480B4 */ lui $a0, %hi(D_80B3AD8C) ## $a0 = 80B40000 -/* 00804 80B3A6D4 10410005 */ beq $v0, $at, .L80B3A6EC -/* 00808 80B3A6D8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0080C 80B3A6DC 10410007 */ beq $v0, $at, .L80B3A6FC -/* 00810 80B3A6E0 3C0480B4 */ lui $a0, %hi(D_80B3ADA8) ## $a0 = 80B40000 -/* 00814 80B3A6E4 10000007 */ beq $zero, $zero, .L80B3A704 -/* 00818 80B3A6E8 00000000 */ nop -.L80B3A6EC: -/* 0081C 80B3A6EC 0C00084C */ jal osSyncPrintf - -/* 00820 80B3A6F0 2484AD8C */ addiu $a0, $a0, %lo(D_80B3AD8C) ## $a0 = 80B3AD8C -/* 00824 80B3A6F4 10000003 */ beq $zero, $zero, .L80B3A704 -/* 00828 80B3A6F8 00000000 */ nop -.L80B3A6FC: -/* 0082C 80B3A6FC 0C00084C */ jal osSyncPrintf - -/* 00830 80B3A700 2484ADA8 */ addiu $a0, $a0, %lo(D_80B3ADA8) ## $a0 = FFFFADA8 -.L80B3A704: -/* 00834 80B3A704 3C0480B4 */ lui $a0, %hi(D_80B3ADDC) ## $a0 = 80B40000 -/* 00838 80B3A708 0C00084C */ jal osSyncPrintf - -/* 0083C 80B3A70C 2484ADDC */ addiu $a0, $a0, %lo(D_80B3ADDC) ## $a0 = 80B3ADDC -/* 00840 80B3A710 86080156 */ lh $t0, 0x0156($s0) ## 00000156 -.L80B3A714: -/* 00844 80B3A714 A6000158 */ sh $zero, 0x0158($s0) ## 00000158 -/* 00848 80B3A718 8FA4002C */ lw $a0, 0x002C($sp) -/* 0084C 80B3A71C 1500000F */ bne $t0, $zero, .L80B3A75C -/* 00850 80B3A720 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00854 80B3A724 0C042DA0 */ jal func_8010B680 -/* 00858 80B3A728 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 0085C 80B3A72C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00860 80B3A730 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00864 80B3A734 0C00B7D5 */ jal func_8002DF54 -/* 00868 80B3A738 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 0086C 80B3A73C 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 00870 80B3A740 3C0B80B4 */ lui $t3, %hi(func_80B3A3D4) ## $t3 = 80B40000 -/* 00874 80B3A744 256BA3D4 */ addiu $t3, $t3, %lo(func_80B3A3D4) ## $t3 = 80B3A3D4 -/* 00878 80B3A748 352A0011 */ ori $t2, $t1, 0x0011 ## $t2 = 00000011 -/* 0087C 80B3A74C AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 00880 80B3A750 10000002 */ beq $zero, $zero, .L80B3A75C -/* 00884 80B3A754 AE0B014C */ sw $t3, 0x014C($s0) ## 0000014C -/* 00888 80B3A758 A6000156 */ sh $zero, 0x0156($s0) ## 00000156 -.L80B3A75C: -/* 0088C 80B3A75C 8FBF001C */ lw $ra, 0x001C($sp) -.L80B3A760: -/* 00890 80B3A760 8FB00018 */ lw $s0, 0x0018($sp) -/* 00894 80B3A764 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00898 80B3A768 03E00008 */ jr $ra -/* 0089C 80B3A76C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A770.s b/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A770.s deleted file mode 100644 index 02f328c89f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A770.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B3A770 -/* 008A0 80B3A770 AFA40000 */ sw $a0, 0x0000($sp) -/* 008A4 80B3A774 03E00008 */ jr $ra -/* 008A8 80B3A778 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/data/overlays/actors/z_en_wonder_talk2.data.s b/data/overlays/actors/z_en_wonder_talk2.data.s deleted file mode 100644 index 61c3f1bf39..0000000000 --- a/data/overlays/actors/z_en_wonder_talk2.data.s +++ /dev/null @@ -1,20 +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_Wonder_Talk2_InitVars - .word 0x01850700, 0x08000009, 0x00010000, 0x00000170 -.word EnWonderTalk2_Init -.word EnWonderTalk2_Destroy -.word EnWonderTalk2_Update -.word 0x00000000 -glabel D_80B3A8E0 - .word 0x00060000, 0x00010002, 0x00030004, 0x00050000 - diff --git a/data/overlays/actors/z_en_wonder_talk2.reloc.s b/data/overlays/actors/z_en_wonder_talk2.reloc.s deleted file mode 100644 index 63a9b801b7..0000000000 --- a/data/overlays/actors/z_en_wonder_talk2.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_80B3ADE0 - .incbin "baserom/ovl_En_Wonder_Talk2", 0xF10, 0x00000190 diff --git a/spec b/spec index 88d9486ca1..fbc1787687 100644 --- a/spec +++ b/spec @@ -3359,8 +3359,7 @@ endseg beginseg name "ovl_En_Wonder_Talk2" include "build/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.o" - include "build/data/overlays/actors/z_en_wonder_talk2.data.o" - include "build/data/overlays/actors/z_en_wonder_talk2.reloc.o" + include "build/src/overlays/actors/ovl_En_Wonder_Talk2/ovl_En_Wonder_Talk2_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index ac9ad7546a..1231c142f6 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -5,6 +5,7 @@ */ #include "z_en_wonder_talk2.h" +#include #define FLAGS 0x08000009 @@ -14,7 +15,12 @@ void EnWonderTalk2_Init(Actor* thisx, GlobalContext* globalCtx); void EnWonderTalk2_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnWonderTalk2_Update(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80B3A10C(EnWonderTalk2* this, GlobalContext* globalCtx); +void func_80B3A4F8(EnWonderTalk2* this, GlobalContext* globalCtx); +void func_80B3A15C(EnWonderTalk2* this, GlobalContext* globalCtx); +void func_80B3A3D4(EnWonderTalk2* this, GlobalContext* globalCtx); +void EnWonderTalk2_DoNothing(EnWonderTalk2* this, GlobalContext* globalCtx); + const ActorInit En_Wonder_Talk2_InitVars = { ACTOR_EN_WONDER_TALK2, ACTORTYPE_ITEMACTION, @@ -26,19 +32,266 @@ const ActorInit En_Wonder_Talk2_InitVars = { (ActorFunc)EnWonderTalk2_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Init.s") +s16 D_80B3A8E0[] = { 0x6, 0x0, 0x1, 0x2, 0x3, 0x4, 0x5 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A10C.s") +void EnWonderTalk2_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A15C.s") +void EnWonderTalk2_Init(Actor* thisx, GlobalContext* globalCtx) { + EnWonderTalk2* this = THIS; + s32 offsetCounter; + s16 zOffset; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A3D4.s") + osSyncPrintf("\n\n"); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + this->unk_150 = (this->actor.params >> 6) & 0xFF; + if (this->actor.posRot.rot.z > 0) { + offsetCounter = 0; + zOffset = this->actor.posRot.rot.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A4F8.s") + while (zOffset > 10) { + zOffset -= 10; + offsetCounter += 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/func_80B3A770.s") + this->unk_15C = zOffset * 40.0f; + if (offsetCounter > 6) { + offsetCounter = 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wonder_Talk2/EnWonderTalk2_Update.s") + this->actor.unk_1F = D_80B3A8E0[offsetCounter]; + + osSyncPrintf("\n\n"); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元は？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.posRot.rot.z); + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ レンジは？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.unk_1F); + osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ は、範囲わ？ ☆☆☆☆☆ %f\n" VT_RST, this->unk_15C); + osSyncPrintf("\n\n"); + osSyncPrintf("\n\n"); + osSyncPrintf("\n\n"); + } + this->posRot = this->actor.posRot.pos; + this->switchFlag = (this->actor.params & 0x3F); + this->unk_154 = ((this->actor.params >> 0xE) & 3); + + if (this->switchFlag == 0x3F) { + this->switchFlag = -1; + } + if (this->switchFlag >= 0 && Flags_GetSwitch(globalCtx, this->switchFlag)) { + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + Actor_Kill(&this->actor); + return; + } + if ((this->unk_154 == 1) && (globalCtx->sceneNum == SCENE_MEN) && (this->switchFlag != 8) && + (this->switchFlag != 0x16) && (this->switchFlag != 0x2F)) { + + this->unk_15A = 0; + this->unk_154 = 4; + } + if (this->unk_154 == 3) { + this->actor.flags &= ~0x8000000; + this->actionFunc = EnWonderTalk2_DoNothing; + } else { + this->actionFunc = func_80B3A10C; + } +} + +void func_80B3A10C(EnWonderTalk2* this, GlobalContext* globalCtx) { + this->actor.textId = 0x200; + this->actor.textId |= this->unk_150; + if (this->unk_154 == 1 || this->unk_154 == 4) { + this->actionFunc = func_80B3A4F8; + } else { + this->actionFunc = func_80B3A15C; + } +} + +void func_80B3A15C(EnWonderTalk2* this, GlobalContext* globalCtx) { + Player* player; + Actor* actor; + s16 yawDiff; + s16 yawDiffTemp; + + actor = &this->actor; + player = PLAYER; + this->unk_158++; + if (this->switchFlag >= 0 && Flags_GetSwitch(globalCtx, this->switchFlag)) { + if (this->unk_15A == 0) { + this->actor.flags &= -2; + this->unk_15A = 1; + } + } else { + if (func_8002F194(&this->actor, globalCtx) != 0) { + if ((this->switchFlag >= 0) && (this->unk_154 != 2)) { + Flags_SetSwitch(globalCtx, this->switchFlag); + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ セーブしたよ！おもいっきり！ %x\n" VT_RST, this->switchFlag); + } + + this->actionFunc = func_80B3A10C; + return; + } + + yawDiffTemp = this->actor.yawTowardsLink - this->actor.posRot.rot.y; + yawDiff = ABS(yawDiffTemp); + + if ((!((40.0f + this->unk_15C) < (*actor).xzDistFromLink)) && + ((!(fabsf(player->actor.posRot.pos.y - (*actor).posRot.pos.y) > 100.0f)) && (yawDiff < 0x4000))) { + if (this->unk_158 >= 2) { + osSyncPrintf("\n\n"); + // Transparent Message Kimi Set + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君せっと %x\n" VT_RST, this->actor.params); + // Save Information + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報 \t %x\n" VT_RST, this->switchFlag); + // Specified message type + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 指定メッセージ種類 %x\n" VT_RST, this->unk_150); + // Actual message type + osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類 %x\n" VT_RST, this->actor.textId); + // Specified range + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲 %d\n" VT_RST, this->actor.posRot.rot.z); + // Processing range + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 処理範囲 %f\n" VT_RST, this->unk_15C); + switch (this->unk_154) { + case 0: + // Normal + osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆ 通常 ☆☆ \n" VT_RST); + break; + case 2: + // Check only + osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆ チェックのみ ☆☆ \n" VT_RST); + break; + case 3: + // Lock only + osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆ ロックのみ ☆☆ \n" VT_RST); + break; + } + } + + this->unk_158 = 0; + func_8002F1C4(&this->actor, globalCtx, this->unk_15C + 50.0f, 100.0f, 0); + } + } +} + +void func_80B3A3D4(EnWonderTalk2* this, GlobalContext* globalCtx) { + if (BREG(2)) { + // Oh + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ わー %d\n" VT_RST, func_8010BDBC(&globalCtx->msgCtx)); + } + + switch (func_8010BDBC(&globalCtx->msgCtx)) { + case 5: + case 6: + if (func_80106BC8(globalCtx)) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5) { + func_80106CCC(globalCtx); + } + } else { + break; + } + case 0: + if ((this->switchFlag >= 0) && (this->unk_154 != 4)) { + Flags_SetSwitch(globalCtx, this->switchFlag); + // (Forced) I saved! It's all about it! + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ (強制)セーブしたよ！おもいっきり！ %x\n" VT_RST, this->switchFlag); + } + + if (this->unk_154 == 4) { + this->unk_15A = 1; + } + this->actor.flags &= ~0x11; + func_8002DF54(globalCtx, NULL, 7); + this->unk_156 = 1; + this->actionFunc = func_80B3A4F8; + break; + } +} + +void func_80B3A4F8(EnWonderTalk2* this, GlobalContext* globalCtx) { + Player* player; + + player = PLAYER; + this->unk_158++; + if (this->switchFlag >= 0 && Flags_GetSwitch(globalCtx, this->switchFlag)) { + if (this->unk_15A == 0) { + this->actor.flags &= ~1; + this->unk_15A = 1; + } + } else { + if ((this->unk_154 != 4) || (this->unk_15A == 0)) { + if (BREG(2) != 0) { + // distance + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ きょり %f\n" VT_RST, this->actor.xzDistFromLink); + } + if (((this->actor.xzDistFromLink < (40.0f + this->unk_15C)) && + (fabsf(player->actor.posRot.pos.y - this->actor.posRot.pos.y) < 100.0f)) && + !Gameplay_InCsMode(globalCtx)) { + if (this->unk_158 >= 2) { + osSyncPrintf("\n\n"); + // Transparent Message Kimi Seto + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君せっと %x\n" VT_RST, this->actor.params); + // Save Information + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報 \t %x\n" VT_RST, this->switchFlag); + // Specified message type + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 指定メッセージ種類 %x\n" VT_RST, this->unk_150); + // Real message type + osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類 %x\n" VT_RST, this->actor.textId); + // Specified range + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲 %d\n" VT_RST, this->actor.posRot.rot.z); + // Processing range + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 処理範囲 %f\n" VT_RST, this->unk_15C); + // What is your range? + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ レンジは？ \t\t %d\n" VT_RST, this->actor.unk_1F); + osSyncPrintf("\n\n"); + osSyncPrintf("\n\n"); + switch (this->unk_154) { + case 1: + // Compulsion + osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆ 強制 ☆☆ \n" VT_RST); + break; + case 4: + // Geld Training Center Forced Check Only + osSyncPrintf(VT_FGCOL(RED) " ☆☆ ゲルドの修練場強制チェックのみ ☆☆ \n" VT_RST); + break; + } + + osSyncPrintf("\n\n"); + } + this->unk_158 = 0; + if (this->unk_156 == 0) { + func_8010B680(globalCtx, this->actor.textId, NULL); + func_8002DF54(globalCtx, NULL, 8); + this->actor.flags |= 0x11; + this->actionFunc = func_80B3A3D4; + } + + } else { + this->unk_156 = 0; + } + } + } +} + +void EnWonderTalk2_DoNothing(EnWonderTalk2* this, GlobalContext* globalCtx) { +} + +void EnWonderTalk2_Update(Actor* thisx, GlobalContext* globalCtx) { + EnWonderTalk2* this = THIS; + + this->actionFunc(this, globalCtx); + this->actor.posRot.pos.y = this->posRot.y; + + Actor_SetHeight(&this->actor, this->height); + if (BREG(0) != 0) { + if (this->unk_158 != 0) { + if ((this->unk_158 & 1) == 0) { + DebugDisplay_AddObject(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, + this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z, + 1.0f, 1.0f, 1.0f, 70, 70, 70, 255, 4, globalCtx->state.gfxCtx); + } + } else { + DebugDisplay_AddObject(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, + this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z, 1.0f, + 1.0f, 1.0f, 0, 0, 255, 255, 4, globalCtx->state.gfxCtx); + } + } +} diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h index 2cf21e8b39..c399e678ec 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h @@ -6,9 +6,21 @@ struct EnWonderTalk2; +typedef void (*EnWonderTalk2Func)(struct EnWonderTalk2*, GlobalContext*); + typedef struct EnWonderTalk2 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x24]; + /* 0x014C */ EnWonderTalk2Func actionFunc; + /* 0x0150 */ s16 unk_150; // specified message type + /* 0x0152 */ s16 switchFlag; + /* 0x0154 */ s16 unk_154; + /* 0x0156 */ s16 unk_156; + /* 0x0158 */ s16 unk_158; + /* 0x015A */ u8 unk_15A; + /* 0x015B */ u8 unk_15B; + /* 0x015C */ f32 unk_15C; // processing range + /* 0x0160 */ f32 height; + /* 0x0164 */ Vec3f posRot; } EnWonderTalk2; // size = 0x0170 extern const ActorInit En_Wonder_Talk2_InitVars;