diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s deleted file mode 100644 index 55477ff863..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel EnGirlA_Destroy -/* 0032C 80A3AA7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00330 80A3AA80 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00334 80A3AA84 8C8E019C */ lw $t6, 0x019C($a0) ## 0000019C -/* 00338 80A3AA88 51C00004 */ beql $t6, $zero, .L80A3AA9C -/* 0033C 80A3AA8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00340 80A3AA90 0C0295BC */ jal SkelAnime_Free -/* 00344 80A3AA94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00348 80A3AA98 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A3AA9C: -/* 0034C 80A3AA9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00350 80A3AAA0 03E00008 */ jr $ra -/* 00354 80A3AAA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Init.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Init.s deleted file mode 100644 index 0e50e4bd84..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Init.s +++ /dev/null @@ -1,29 +0,0 @@ -.rdata -glabel D_80A3D088 - .asciz "%s(%2d)初期設定\n" # %s(%2d) Default Settings - .balign 4 - -.text -glabel EnGirlA_Init -/* 002D8 80A3AA28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002DC 80A3AA2C AFBF0014 */ sw $ra, 0x0014($sp) -/* 002E0 80A3AA30 AFA40018 */ sw $a0, 0x0018($sp) -/* 002E4 80A3AA34 0C28E9D6 */ jal func_80A3A758 -/* 002E8 80A3AA38 AFA5001C */ sw $a1, 0x001C($sp) -/* 002EC 80A3AA3C 8FA40018 */ lw $a0, 0x0018($sp) -/* 002F0 80A3AA40 0C28EA34 */ jal func_80A3A8D0 -/* 002F4 80A3AA44 8FA5001C */ lw $a1, 0x001C($sp) -/* 002F8 80A3AA48 8FAE0018 */ lw $t6, 0x0018($sp) -/* 002FC 80A3AA4C 3C0580A4 */ lui $a1, %hi(D_80A3C590) ## $a1 = 80A40000 -/* 00300 80A3AA50 3C0480A4 */ lui $a0, %hi(D_80A3D088) ## $a0 = 80A40000 -/* 00304 80A3AA54 85C6001C */ lh $a2, 0x001C($t6) ## 0000001C -/* 00308 80A3AA58 2484D088 */ addiu $a0, $a0, %lo(D_80A3D088) ## $a0 = 80A3D088 -/* 0030C 80A3AA5C 00067880 */ sll $t7, $a2, 2 -/* 00310 80A3AA60 00AF2821 */ addu $a1, $a1, $t7 -/* 00314 80A3AA64 0C00084C */ jal osSyncPrintf - -/* 00318 80A3AA68 8CA5C590 */ lw $a1, %lo(D_80A3C590)($a1) -/* 0031C 80A3AA6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00320 80A3AA70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00324 80A3AA74 03E00008 */ jr $ra -/* 00328 80A3AA78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Update.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Update.s deleted file mode 100644 index 0f7a6f292f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel EnGirlA_Update -/* 01D24 80A3C474 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D28 80A3C478 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D2C 80A3C47C 8C990198 */ lw $t9, 0x0198($a0) ## 00000198 -/* 01D30 80A3C480 0320F809 */ jalr $ra, $t9 -/* 01D34 80A3C484 00000000 */ nop -/* 01D38 80A3C488 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D3C 80A3C48C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D40 80A3C490 03E00008 */ jr $ra -/* 01D44 80A3C494 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A750.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A750.s deleted file mode 100644 index c99c63a545..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A750.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80A3A750 -/* 00000 80A3A750 03E00008 */ jr $ra -/* 00004 80A3A754 AC850190 */ sw $a1, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s deleted file mode 100644 index a8726c0444..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s +++ /dev/null @@ -1,38 +0,0 @@ -.late_rodata -.late_rodata_alignment 8 -glabel jtbl_80A3D0A8 -.word L80A3A780 -.word L80A3A8C4 -.word L80A3A8C4 -.word L80A3A8C4 -.word func_80A3A858 -.word func_80A3A87C -.word func_80A3A8A0 -.word func_80A3A7A4 -.word func_80A3A7C8 -.word func_80A3A7EC -.word func_80A3A810 -.word func_80A3A834 - -.text -glabel func_80A3A758 -/* 00008 80A3A758 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 0000C 80A3A75C 25CFFFEF */ addiu $t7, $t6, 0xFFEF ## $t7 = FFFFFFEF -/* 00010 80A3A760 2DE1000C */ sltiu $at, $t7, 0x000C -/* 00014 80A3A764 10200057 */ beq $at, $zero, .L80A3A8C4 -/* 00018 80A3A768 000F7880 */ sll $t7, $t7, 2 -/* 0001C 80A3A76C 3C0180A4 */ lui $at, %hi(jtbl_80A3D0A8) ## $at = 80A40000 -/* 00020 80A3A770 002F0821 */ addu $at, $at, $t7 -/* 00024 80A3A774 8C2FD0A8 */ lw $t7, %lo(jtbl_80A3D0A8)($at) -/* 00028 80A3A778 01E00008 */ jr $t7 -/* 0002C 80A3A77C 00000000 */ nop -glabel L80A3A780 -/* 00030 80A3A780 3C188016 */ lui $t8, %hi(gSaveContext+0xef0) -/* 00034 80A3A784 9718F550 */ lhu $t8, %lo(gSaveContext+0xef0)($t8) -/* 00038 80A3A788 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 0003C 80A3A78C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00040 80A3A790 33190004 */ andi $t9, $t8, 0x0004 ## $t9 = 00000000 -/* 00044 80A3A794 5320004C */ beql $t9, $zero, .L80A3A8C8 -/* 00048 80A3A798 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0004C 80A3A79C 03E00008 */ jr $ra -/* 00050 80A3A7A0 A488001C */ sh $t0, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s deleted file mode 100644 index 7cd58fa5fb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A3A7A4 -/* 00054 80A3A7A4 3C098016 */ lui $t1, %hi(gSaveContext+0xef0) -/* 00058 80A3A7A8 9529F550 */ lhu $t1, %lo(gSaveContext+0xef0)($t1) -/* 0005C 80A3A7AC 240B0026 */ addiu $t3, $zero, 0x0026 ## $t3 = 00000026 -/* 00060 80A3A7B0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00064 80A3A7B4 312A0040 */ andi $t2, $t1, 0x0040 ## $t2 = 00000000 -/* 00068 80A3A7B8 51400043 */ beql $t2, $zero, .L80A3A8C8 -/* 0006C 80A3A7BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00070 80A3A7C0 03E00008 */ jr $ra -/* 00074 80A3A7C4 A48B001C */ sh $t3, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s deleted file mode 100644 index 39c2076a52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A3A7C8 -/* 00078 80A3A7C8 3C0C8016 */ lui $t4, %hi(gSaveContext+0xef0) -/* 0007C 80A3A7CC 958CF550 */ lhu $t4, %lo(gSaveContext+0xef0)($t4) -/* 00080 80A3A7D0 240E0026 */ addiu $t6, $zero, 0x0026 ## $t6 = 00000026 -/* 00084 80A3A7D4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00088 80A3A7D8 318D0080 */ andi $t5, $t4, 0x0080 ## $t5 = 00000000 -/* 0008C 80A3A7DC 51A0003A */ beql $t5, $zero, .L80A3A8C8 -/* 00090 80A3A7E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00094 80A3A7E4 03E00008 */ jr $ra -/* 00098 80A3A7E8 A48E001C */ sh $t6, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s deleted file mode 100644 index a621e4f38d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A3A7EC -/* 0009C 80A3A7EC 3C0F8016 */ lui $t7, %hi(gSaveContext+0xef0) -/* 000A0 80A3A7F0 95EFF550 */ lhu $t7, %lo(gSaveContext+0xef0)($t7) -/* 000A4 80A3A7F4 24190026 */ addiu $t9, $zero, 0x0026 ## $t9 = 00000026 -/* 000A8 80A3A7F8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 000AC 80A3A7FC 31F80100 */ andi $t8, $t7, 0x0100 ## $t8 = 00000000 -/* 000B0 80A3A800 53000031 */ beql $t8, $zero, .L80A3A8C8 -/* 000B4 80A3A804 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 000B8 80A3A808 03E00008 */ jr $ra -/* 000BC 80A3A80C A499001C */ sh $t9, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s deleted file mode 100644 index 017ab887b3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A3A810 -/* 000C0 80A3A810 3C088016 */ lui $t0, %hi(gSaveContext+0xef0) -/* 000C4 80A3A814 9508F550 */ lhu $t0, %lo(gSaveContext+0xef0)($t0) -/* 000C8 80A3A818 240A0026 */ addiu $t2, $zero, 0x0026 ## $t2 = 00000026 -/* 000CC 80A3A81C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 000D0 80A3A820 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 -/* 000D4 80A3A824 51200028 */ beql $t1, $zero, .L80A3A8C8 -/* 000D8 80A3A828 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 000DC 80A3A82C 03E00008 */ jr $ra -/* 000E0 80A3A830 A48A001C */ sh $t2, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s deleted file mode 100644 index 313cab62a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A3A834 -/* 000E4 80A3A834 3C0B8016 */ lui $t3, %hi(gSaveContext+0xef0) -/* 000E8 80A3A838 956BF550 */ lhu $t3, %lo(gSaveContext+0xef0)($t3) -/* 000EC 80A3A83C 240D0026 */ addiu $t5, $zero, 0x0026 ## $t5 = 00000026 -/* 000F0 80A3A840 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 000F4 80A3A844 316C0400 */ andi $t4, $t3, 0x0400 ## $t4 = 00000000 -/* 000F8 80A3A848 5180001F */ beql $t4, $zero, .L80A3A8C8 -/* 000FC 80A3A84C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00100 80A3A850 03E00008 */ jr $ra -/* 00104 80A3A854 A48D001C */ sh $t5, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s deleted file mode 100644 index dda0e1c325..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A3A858 -/* 00108 80A3A858 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef0) -/* 0010C 80A3A85C 95CEF550 */ lhu $t6, %lo(gSaveContext+0xef0)($t6) -/* 00110 80A3A860 24180026 */ addiu $t8, $zero, 0x0026 ## $t8 = 00000026 -/* 00114 80A3A864 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00118 80A3A868 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 -/* 0011C 80A3A86C 51E00016 */ beql $t7, $zero, .L80A3A8C8 -/* 00120 80A3A870 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00124 80A3A874 03E00008 */ jr $ra -/* 00128 80A3A878 A498001C */ sh $t8, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s deleted file mode 100644 index 7d0f86dc5a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A3A87C -/* 0012C 80A3A87C 3C198016 */ lui $t9, %hi(gSaveContext+0xef0) -/* 00130 80A3A880 9739F550 */ lhu $t9, %lo(gSaveContext+0xef0)($t9) -/* 00134 80A3A884 24090026 */ addiu $t1, $zero, 0x0026 ## $t1 = 00000026 -/* 00138 80A3A888 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0013C 80A3A88C 33280010 */ andi $t0, $t9, 0x0010 ## $t0 = 00000000 -/* 00140 80A3A890 5100000D */ beql $t0, $zero, .L80A3A8C8 -/* 00144 80A3A894 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00148 80A3A898 03E00008 */ jr $ra -/* 0014C 80A3A89C A489001C */ sh $t1, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s deleted file mode 100644 index 97806f497a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A3A8A0 -/* 00150 80A3A8A0 3C0A8016 */ lui $t2, %hi(gSaveContext+0xef0) -/* 00154 80A3A8A4 954AF550 */ lhu $t2, %lo(gSaveContext+0xef0)($t2) -/* 00158 80A3A8A8 240C0026 */ addiu $t4, $zero, 0x0026 ## $t4 = 00000026 -/* 0015C 80A3A8AC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00160 80A3A8B0 314B0020 */ andi $t3, $t2, 0x0020 ## $t3 = 00000000 -/* 00164 80A3A8B4 51600004 */ beql $t3, $zero, .L80A3A8C8 -/* 00168 80A3A8B8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0016C 80A3A8BC 03E00008 */ jr $ra -/* 00170 80A3A8C0 A48C001C */ sh $t4, 0x001C($a0) ## 0000001C -glabel L80A3A8C4 -.L80A3A8C4: -/* 00174 80A3A8C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A3A8C8: -/* 00178 80A3A8C8 03E00008 */ jr $ra -/* 0017C 80A3A8CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8D0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8D0.s deleted file mode 100644 index e1e4642274..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8D0.s +++ /dev/null @@ -1,347 +0,0 @@ -.rdata -glabel D_80A3CCD0 - .asciz "デクの実×5 " # Deku Fruit * 5 - .balign 4 - -glabel D_80A3CCE0 - .asciz "矢×30 " # Arrow * 30 - .balign 4 - -glabel D_80A3CCF0 - .asciz "矢×50 " # Arrow * 50 - .balign 4 - -glabel D_80A3CD00 - .asciz "爆弾×5 " # Bomb * 5 - .balign 4 - -glabel D_80A3CD10 - .asciz "デクの実×10 " # Deku fruit * 10 - .balign 4 - -glabel D_80A3CD20 - .asciz "デクの棒 " # Deku stick - .balign 4 - -glabel D_80A3CD30 - .asciz "爆弾×10 " # Bomb * 10 - .balign 4 - -glabel D_80A3CD40 - .asciz "さかな " # Fish - .balign 4 - -glabel D_80A3CD50 - .asciz "赤クスリ " # Red potion - .balign 4 - -glabel D_80A3CD60 - .asciz "緑クスリ " # Green potion - .balign 4 - -glabel D_80A3CD70 - .asciz "青クスリ " # Blue potion - .balign 4 - -glabel D_80A3CD80 - .asciz "巨人のナイフ " # Giant knife - .balign 4 - -glabel D_80A3CD90 - .asciz "ハイリアの盾 " # Hylian Shield - .balign 4 - -glabel D_80A3CDA0 - .asciz "デクの盾 " # Deku shield - .balign 4 - -glabel D_80A3CDB0 - .asciz "ゴロンの服 " # Goron tunic - .balign 4 - -glabel D_80A3CDC0 - .asciz "ゾ─ラの服 " # Zora's Tunic - .balign 4 - -glabel D_80A3CDD0 - .asciz "回復のハート " # Healing heart - .balign 4 - -glabel D_80A3CDE0 - .asciz "ロンロン牛乳 " # Lonlon milk - .balign 4 - -glabel D_80A3CDF0 - .asciz "鶏の卵 " # Chicken eggs - .balign 4 - -glabel D_80A3CE00 - .asciz "インゴー牛乳 " # Ingo milk - .balign 4 - -glabel D_80A3CE10 - .asciz "インゴー卵 " # Ingo egg - .balign 4 - -glabel D_80A3CE20 - .asciz "もだえ石 " # Stone of agony - .balign 4 - -glabel D_80A3CE30 - .asciz "大人の財布 " # Adult wallet - .balign 4 - -glabel D_80A3CE40 - .asciz "ハートの欠片 " # Piece of heart - .balign 4 - -glabel D_80A3CE50 - .asciz "ボムチュウ " # Bombchu - .balign 4 - -glabel D_80A3CE60 - .asciz "ボムチュウ " # Bombchu - .balign 4 - -glabel D_80A3CE70 - .asciz "ボムチュウ " # Bombchu - .balign 4 - -glabel D_80A3CE80 - .asciz "ボムチュウ " # Bombchu - .balign 4 - -glabel D_80A3CE90 - .asciz "ボムチュウ " # Bombchu - .balign 4 -glabel D_80A3CEA0 - .asciz "デクのタネ " # Deku seed - .balign 4 - -glabel D_80A3CEB0 - .asciz "キータンのお面" # Mask of Keaton - .balign 4 - -glabel D_80A3CEC0 - .asciz "こわそなお面 " # Spooky mask - .balign 4 - -glabel D_80A3CED0 - .asciz "ドクロのお面 " # Skull mask - .balign 4 - -glabel D_80A3CEE0 - .asciz "ウサギずきん " # Bunny hood - .balign 4 - -glabel D_80A3CEF0 - .asciz "まことの仮面 " # Makoto's Mask / Mask of Truth - .balign 4 - -glabel D_80A3CF00 - .asciz "ゾーラのお面 " # Zora Mask - .balign 4 - -glabel D_80A3CF10 - .asciz "ゴロンのお面 " # Goron Mask - .balign 4 - -glabel D_80A3CF20 - .asciz "ゲルドのお面 " # Gerudo Mask - .balign 4 -glabel D_80A3CF30 - .asciz "ＳＯＬＤＯＵＴ" - .balign 4 - -glabel D_80A3CF40 - .asciz "炎 " # Fire - .balign 4 - -glabel D_80A3CF50 - .asciz "虫 " # Bug - .balign 4 - -glabel D_80A3CF60 - .asciz "チョウチョ " # Butterfly - .balign 4 - -glabel D_80A3CF70 - .asciz "ポウ " # Poe - .balign 4 - -glabel D_80A3CF80 - .asciz "妖精の魂 " # Fairy spirit - .balign 4 - -glabel D_80A3CF90 - .asciz "矢×10 " # Arrows * 10 - .balign 4 - -glabel D_80A3CFA0 - .asciz "爆弾×20 " # Bombs * 20 - .balign 4 - -glabel D_80A3CFB0 - .asciz "爆弾×30 " # Bombs * 30 - .balign 4 - -glabel D_80A3CFC0 - .asciz "爆弾×5 " # Bombs * 5 - .balign 4 - -glabel D_80A3CFD0 - .asciz "赤クスリ " # Red potion - .balign 4 - -glabel D_80A3CFE0 - .asciz "赤クスリ " # Red potion - .balign 4 - -glabel D_80A3CFF0 - .asciz "%s(%2d)初期設定\n" # %s(%2d) Default Settings - .balign 4 - -glabel D_80A3D004 - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80A3D010 - .asciz "引数がおかしいよ(arg_data=%d)！！\n" # Something's off with the argument (arg_data=%d)!! - .balign 4 - -glabel D_80A3D034 - .asciz "\x1b[m" - .balign 4 - -glabel D_80A3D038 - .asciz "0" - .balign 4 - -glabel D_80A3D03C - .asciz "../z_en_girlA.c" - .balign 4 - -glabel D_80A3D04C - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80A3D058 - .asciz "バンクが無いよ！！(%s)\n" # No such bank!! (%s) - .balign 4 - -glabel D_80A3D070 - .asciz "\x1b[m" - .balign 4 - -glabel D_80A3D074 - .asciz "0" - .balign 4 - -glabel D_80A3D078 - .asciz "../z_en_girlA.c" - .balign 4 - -.text -glabel func_80A3A8D0 -/* 00180 80A3A8D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00184 80A3A8D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00188 80A3A8D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0018C 80A3A8DC AFA5002C */ sw $a1, 0x002C($sp) -/* 00190 80A3A8E0 8486001C */ lh $a2, 0x001C($a0) ## 0000001C -/* 00194 80A3A8E4 3C0F80A4 */ lui $t7, %hi(D_80A3C590) ## $t7 = 80A40000 -/* 00198 80A3A8E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0019C 80A3A8EC 25EFC590 */ addiu $t7, $t7, %lo(D_80A3C590) ## $t7 = 80A3C590 -/* 001A0 80A3A8F0 00067080 */ sll $t6, $a2, 2 -/* 001A4 80A3A8F4 01CF1021 */ addu $v0, $t6, $t7 -/* 001A8 80A3A8F8 3C0480A4 */ lui $a0, %hi(D_80A3CFF0) ## $a0 = 80A40000 -/* 001AC 80A3A8FC 2484CFF0 */ addiu $a0, $a0, %lo(D_80A3CFF0) ## $a0 = 80A3CFF0 -/* 001B0 80A3A900 8C450000 */ lw $a1, 0x0000($v0) ## 00000000 -/* 001B4 80A3A904 AFA20020 */ sw $v0, 0x0020($sp) -/* 001B8 80A3A908 0C00084C */ jal osSyncPrintf - -/* 001BC 80A3A90C A7A60026 */ sh $a2, 0x0026($sp) -/* 001C0 80A3A910 87A60026 */ lh $a2, 0x0026($sp) -/* 001C4 80A3A914 8FA4002C */ lw $a0, 0x002C($sp) -/* 001C8 80A3A918 3C0580A4 */ lui $a1, %hi(D_80A3C674) ## $a1 = 80A40000 -/* 001CC 80A3A91C 28C10032 */ slti $at, $a2, 0x0032 -/* 001D0 80A3A920 14200017 */ bne $at, $zero, .L80A3A980 -/* 001D4 80A3A924 0006C140 */ sll $t8, $a2, 5 -/* 001D8 80A3A928 04C30016 */ bgezl $a2, .L80A3A984 -/* 001DC 80A3A92C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001E0 80A3A930 0C00B55C */ jal Actor_Kill - -/* 001E4 80A3A934 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001E8 80A3A938 3C0480A4 */ lui $a0, %hi(D_80A3D004) ## $a0 = 80A40000 -/* 001EC 80A3A93C 0C00084C */ jal osSyncPrintf - -/* 001F0 80A3A940 2484D004 */ addiu $a0, $a0, %lo(D_80A3D004) ## $a0 = 80A3D004 -/* 001F4 80A3A944 3C0480A4 */ lui $a0, %hi(D_80A3D010) ## $a0 = 80A40000 -/* 001F8 80A3A948 2484D010 */ addiu $a0, $a0, %lo(D_80A3D010) ## $a0 = 80A3D010 -/* 001FC 80A3A94C 0C00084C */ jal osSyncPrintf - -/* 00200 80A3A950 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00204 80A3A954 3C0480A4 */ lui $a0, %hi(D_80A3D034) ## $a0 = 80A40000 -/* 00208 80A3A958 0C00084C */ jal osSyncPrintf - -/* 0020C 80A3A95C 2484D034 */ addiu $a0, $a0, %lo(D_80A3D034) ## $a0 = 80A3D034 -/* 00210 80A3A960 3C0480A4 */ lui $a0, %hi(D_80A3D038) ## $a0 = 80A40000 -/* 00214 80A3A964 3C0580A4 */ lui $a1, %hi(D_80A3D03C) ## $a1 = 80A40000 -/* 00218 80A3A968 24A5D03C */ addiu $a1, $a1, %lo(D_80A3D03C) ## $a1 = 80A3D03C -/* 0021C 80A3A96C 2484D038 */ addiu $a0, $a0, %lo(D_80A3D038) ## $a0 = 80A3D038 -/* 00220 80A3A970 0C0007FC */ jal __assert - -/* 00224 80A3A974 2406058D */ addiu $a2, $zero, 0x058D ## $a2 = 0000058D -/* 00228 80A3A978 10000027 */ beq $zero, $zero, .L80A3AA18 -/* 0022C 80A3A97C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A3A980: -/* 00230 80A3A980 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L80A3A984: -/* 00234 80A3A984 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00238 80A3A988 00B82821 */ addu $a1, $a1, $t8 -/* 0023C 80A3A98C 84A5C674 */ lh $a1, %lo(D_80A3C674)($a1) -/* 00240 80A3A990 00812021 */ addu $a0, $a0, $at -/* 00244 80A3A994 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00248 80A3A998 A7A60026 */ sh $a2, 0x0026($sp) -/* 0024C 80A3A99C 87A60026 */ lh $a2, 0x0026($sp) -/* 00250 80A3A9A0 A2020194 */ sb $v0, 0x0194($s0) ## 00000194 -/* 00254 80A3A9A4 82190194 */ lb $t9, 0x0194($s0) ## 00000194 -/* 00258 80A3A9A8 3C0980A4 */ lui $t1, %hi(func_80A3BFE4) ## $t1 = 80A40000 -/* 0025C 80A3A9AC 2529BFE4 */ addiu $t1, $t1, %lo(func_80A3BFE4) ## $t1 = 80A3BFE4 -/* 00260 80A3A9B0 07230017 */ bgezl $t9, .L80A3AA10 -/* 00264 80A3A9B4 A606001C */ sh $a2, 0x001C($s0) ## 0000001C -/* 00268 80A3A9B8 0C00B55C */ jal Actor_Kill - -/* 0026C 80A3A9BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00270 80A3A9C0 3C0480A4 */ lui $a0, %hi(D_80A3D04C) ## $a0 = 80A40000 -/* 00274 80A3A9C4 0C00084C */ jal osSyncPrintf - -/* 00278 80A3A9C8 2484D04C */ addiu $a0, $a0, %lo(D_80A3D04C) ## $a0 = 80A3D04C -/* 0027C 80A3A9CC 8FA80020 */ lw $t0, 0x0020($sp) -/* 00280 80A3A9D0 3C0480A4 */ lui $a0, %hi(D_80A3D058) ## $a0 = 80A40000 -/* 00284 80A3A9D4 2484D058 */ addiu $a0, $a0, %lo(D_80A3D058) ## $a0 = 80A3D058 -/* 00288 80A3A9D8 0C00084C */ jal osSyncPrintf - -/* 0028C 80A3A9DC 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 00290 80A3A9E0 3C0480A4 */ lui $a0, %hi(D_80A3D070) ## $a0 = 80A40000 -/* 00294 80A3A9E4 0C00084C */ jal osSyncPrintf - -/* 00298 80A3A9E8 2484D070 */ addiu $a0, $a0, %lo(D_80A3D070) ## $a0 = 80A3D070 -/* 0029C 80A3A9EC 3C0480A4 */ lui $a0, %hi(D_80A3D074) ## $a0 = 80A40000 -/* 002A0 80A3A9F0 3C0580A4 */ lui $a1, %hi(D_80A3D078) ## $a1 = 80A40000 -/* 002A4 80A3A9F4 24A5D078 */ addiu $a1, $a1, %lo(D_80A3D078) ## $a1 = 80A3D078 -/* 002A8 80A3A9F8 2484D074 */ addiu $a0, $a0, %lo(D_80A3D074) ## $a0 = 80A3D074 -/* 002AC 80A3A9FC 0C0007FC */ jal __assert - -/* 002B0 80A3AA00 2406059A */ addiu $a2, $zero, 0x059A ## $a2 = 0000059A -/* 002B4 80A3AA04 10000004 */ beq $zero, $zero, .L80A3AA18 -/* 002B8 80A3AA08 8FBF001C */ lw $ra, 0x001C($sp) -/* 002BC 80A3AA0C A606001C */ sh $a2, 0x001C($s0) ## 0000001C -.L80A3AA10: -/* 002C0 80A3AA10 AE090198 */ sw $t1, 0x0198($s0) ## 00000198 -/* 002C4 80A3AA14 8FBF001C */ lw $ra, 0x001C($sp) -.L80A3AA18: -/* 002C8 80A3AA18 8FB00018 */ lw $s0, 0x0018($sp) -/* 002CC 80A3AA1C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002D0 80A3AA20 03E00008 */ jr $ra -/* 002D4 80A3AA24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s deleted file mode 100644 index 9c5f2b3ded..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A3AAA8 -/* 00358 80A3AAA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0035C 80A3AAAC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00360 80A3AAB0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00364 80A3AAB4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00368 80A3AAB8 0C0218E2 */ jal Item_CheckObtainability -/* 0036C 80A3AABC 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 -/* 00370 80A3AAC0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00374 80A3AAC4 14410003 */ bne $v0, $at, .L80A3AAD4 -/* 00378 80A3AAC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0037C 80A3AACC 10000020 */ beq $zero, $zero, .L80A3AB50 -/* 00380 80A3AAD0 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80A3AAD4: -/* 00384 80A3AAD4 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00388 80A3AAD8 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 0038C 80A3AADC 3C088012 */ lui $t0, %hi(gUpgradeMasks) -/* 00390 80A3AAE0 8D0871B0 */ lw $t0, %lo(gUpgradeMasks)($t0) -/* 00394 80A3AAE4 8C5900A0 */ lw $t9, 0x00A0($v0) ## 8015E700 -/* 00398 80A3AAE8 3C0A8012 */ lui $t2, %hi(gUpgradeShifts) -/* 0039C 80A3AAEC 914A71F4 */ lbu $t2, %lo(gUpgradeShifts)($t2) -/* 003A0 80A3AAF0 3C0E8012 */ lui $t6, %hi(gItemSlots+3) -/* 003A4 80A3AAF4 91CE7467 */ lbu $t6, %lo(gItemSlots+3)($t6) -/* 003A8 80A3AAF8 03284824 */ and $t1, $t9, $t0 -/* 003AC 80A3AAFC 01495807 */ srav $t3, $t1, $t2 -/* 003B0 80A3AB00 000B6040 */ sll $t4, $t3, 1 -/* 003B4 80A3AB04 3C0D8012 */ lui $t5, %hi(gUpgradeCapacities) -/* 003B8 80A3AB08 01AC6821 */ addu $t5, $t5, $t4 -/* 003BC 80A3AB0C 004E7821 */ addu $t7, $v0, $t6 -/* 003C0 80A3AB10 81F8008C */ lb $t8, 0x008C($t7) ## 0000008C -/* 003C4 80A3AB14 95AD71FC */ lhu $t5, %lo(gUpgradeCapacities)($t5) -/* 003C8 80A3AB18 8FAF001C */ lw $t7, 0x001C($sp) -/* 003CC 80A3AB1C 030D082A */ slt $at, $t8, $t5 -/* 003D0 80A3AB20 54200004 */ bnel $at, $zero, .L80A3AB34 -/* 003D4 80A3AB24 844E0034 */ lh $t6, 0x0034($v0) ## 8015E694 -/* 003D8 80A3AB28 10000009 */ beq $zero, $zero, .L80A3AB50 -/* 003DC 80A3AB2C 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 003E0 80A3AB30 844E0034 */ lh $t6, 0x0034($v0) ## 00000036 -.L80A3AB34: -/* 003E4 80A3AB34 85F901C8 */ lh $t9, 0x01C8($t7) ## 000001C8 -/* 003E8 80A3AB38 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 003EC 80A3AB3C 01D9082A */ slt $at, $t6, $t9 -/* 003F0 80A3AB40 10200003 */ beq $at, $zero, .L80A3AB50 -/* 003F4 80A3AB44 00000000 */ nop -/* 003F8 80A3AB48 10000001 */ beq $zero, $zero, .L80A3AB50 -/* 003FC 80A3AB4C 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3AB50: -/* 00400 80A3AB50 03E00008 */ jr $ra -/* 00404 80A3AB54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s deleted file mode 100644 index 354407949a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80A3AB58 -/* 00408 80A3AB58 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0040C 80A3AB5C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00410 80A3AB60 3C0E8012 */ lui $t6, %hi(gBitFlags+0x4c) -/* 00414 80A3AB64 8DCE716C */ lw $t6, %lo(gBitFlags+0x4c)($t6) -/* 00418 80A3AB68 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 -/* 0041C 80A3AB6C AFA40000 */ sw $a0, 0x0000($sp) -/* 00420 80A3AB70 3C198012 */ lui $t9, %hi(gItemSlots+2) -/* 00424 80A3AB74 01CFC024 */ and $t8, $t6, $t7 -/* 00428 80A3AB78 17000003 */ bne $t8, $zero, .L80A3AB88 -/* 0042C 80A3AB7C 3C0B8012 */ lui $t3, %hi(gUpgradeMasks+4) -/* 00430 80A3AB80 03E00008 */ jr $ra -/* 00434 80A3AB84 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A3AB88: -/* 00438 80A3AB88 8C4A00A0 */ lw $t2, 0x00A0($v0) ## 000000A2 -/* 0043C 80A3AB8C 8D6B71B4 */ lw $t3, %lo(gUpgradeMasks+4)($t3) -/* 00440 80A3AB90 3C0D8012 */ lui $t5, %hi(gUpgradeShifts+1) -/* 00444 80A3AB94 91AD71F5 */ lbu $t5, %lo(gUpgradeShifts+1)($t5) -/* 00448 80A3AB98 93397466 */ lbu $t9, %lo(gItemSlots+2)($t9) -/* 0044C 80A3AB9C 014B6024 */ and $t4, $t2, $t3 -/* 00450 80A3ABA0 01AC7007 */ srav $t6, $t4, $t5 -/* 00454 80A3ABA4 000E7840 */ sll $t7, $t6, 1 -/* 00458 80A3ABA8 3C188012 */ lui $t8, %hi(gUpgradeCapacities+8) -/* 0045C 80A3ABAC 030FC021 */ addu $t8, $t8, $t7 -/* 00460 80A3ABB0 00594021 */ addu $t0, $v0, $t9 -/* 00464 80A3ABB4 8109008C */ lb $t1, 0x008C($t0) ## 0000008C -/* 00468 80A3ABB8 97187204 */ lhu $t8, %lo(gUpgradeCapacities+8)($t8) -/* 0046C 80A3ABBC 0138082A */ slt $at, $t1, $t8 -/* 00470 80A3ABC0 54200004 */ bnel $at, $zero, .L80A3ABD4 -/* 00474 80A3ABC4 84590034 */ lh $t9, 0x0034($v0) ## 00000036 -/* 00478 80A3ABC8 03E00008 */ jr $ra -/* 0047C 80A3ABCC 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A3ABD0: -/* 00480 80A3ABD0 84590034 */ lh $t9, 0x0034($v0) ## 00000036 -.L80A3ABD4: -/* 00484 80A3ABD4 84A801C8 */ lh $t0, 0x01C8($a1) ## 000001C8 -/* 00488 80A3ABD8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0048C 80A3ABDC 0328082A */ slt $at, $t9, $t0 -/* 00490 80A3ABE0 10200003 */ beq $at, $zero, .L80A3ABF0 -/* 00494 80A3ABE4 00000000 */ nop -/* 00498 80A3ABE8 03E00008 */ jr $ra -/* 0049C 80A3ABEC 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3ABF0: -/* 004A0 80A3ABF0 03E00008 */ jr $ra -/* 004A4 80A3ABF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s deleted file mode 100644 index 54a868bca1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80A3ABF8 -/* 004A8 80A3ABF8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 004AC 80A3ABFC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 004B0 80A3AC00 3C0F8012 */ lui $t7, %hi(gUpgradeMasks+0x1c) -/* 004B4 80A3AC04 8DEF71CC */ lw $t7, %lo(gUpgradeMasks+0x1c)($t7) -/* 004B8 80A3AC08 8C6E00A0 */ lw $t6, 0x00A0($v1) ## 8015E700 -/* 004BC 80A3AC0C 3C198012 */ lui $t9, %hi(gUpgradeShifts+7) -/* 004C0 80A3AC10 933971FB */ lbu $t9, %lo(gUpgradeShifts+7)($t9) -/* 004C4 80A3AC14 01CFC024 */ and $t8, $t6, $t7 -/* 004C8 80A3AC18 3C028012 */ lui $v0, %hi(gUpgradeCapacities+0x38) -/* 004CC 80A3AC1C 03384007 */ srav $t0, $t8, $t9 -/* 004D0 80A3AC20 00084840 */ sll $t1, $t0, 1 -/* 004D4 80A3AC24 00491021 */ addu $v0, $v0, $t1 -/* 004D8 80A3AC28 94427234 */ lhu $v0, %lo(gUpgradeCapacities+0x38)($v0) -/* 004DC 80A3AC2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004E0 80A3AC30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004E4 80A3AC34 1040000A */ beq $v0, $zero, .L80A3AC60 -/* 004E8 80A3AC38 AFA40018 */ sw $a0, 0x0018($sp) -/* 004EC 80A3AC3C 3C0A8012 */ lui $t2, %hi(gItemSlots+1) -/* 004F0 80A3AC40 914A7465 */ lbu $t2, %lo(gItemSlots+1)($t2) -/* 004F4 80A3AC44 006A5821 */ addu $t3, $v1, $t2 -/* 004F8 80A3AC48 816C008C */ lb $t4, 0x008C($t3) ## 0000008C -/* 004FC 80A3AC4C 0182082A */ slt $at, $t4, $v0 -/* 00500 80A3AC50 54200004 */ bnel $at, $zero, .L80A3AC64 -/* 00504 80A3AC54 846D0034 */ lh $t5, 0x0034($v1) ## 8015E694 -/* 00508 80A3AC58 10000010 */ beq $zero, $zero, .L80A3AC9C -/* 0050C 80A3AC5C 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A3AC60: -/* 00510 80A3AC60 846D0034 */ lh $t5, 0x0034($v1) ## 8015E694 -.L80A3AC64: -/* 00514 80A3AC64 84AE01C8 */ lh $t6, 0x01C8($a1) ## 000001C8 -/* 00518 80A3AC68 01AE082A */ slt $at, $t5, $t6 -/* 0051C 80A3AC6C 10200003 */ beq $at, $zero, .L80A3AC7C -/* 00520 80A3AC70 00000000 */ nop -/* 00524 80A3AC74 10000009 */ beq $zero, $zero, .L80A3AC9C -/* 00528 80A3AC78 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3AC7C: -/* 0052C 80A3AC7C 0C0218E2 */ jal Item_CheckObtainability -/* 00530 80A3AC80 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00534 80A3AC84 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00538 80A3AC88 54410004 */ bnel $v0, $at, .L80A3AC9C -/* 0053C 80A3AC8C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00540 80A3AC90 10000002 */ beq $zero, $zero, .L80A3AC9C -/* 00544 80A3AC94 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00548 80A3AC98 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3AC9C: -/* 0054C 80A3AC9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00550 80A3ACA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00554 80A3ACA4 03E00008 */ jr $ra -/* 00558 80A3ACA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s deleted file mode 100644 index 814661e7f7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80A3ACAC -/* 0055C 80A3ACAC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00560 80A3ACB0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00564 80A3ACB4 3C0F8012 */ lui $t7, %hi(gUpgradeMasks+0x18) -/* 00568 80A3ACB8 8DEF71C8 */ lw $t7, %lo(gUpgradeMasks+0x18)($t7) -/* 0056C 80A3ACBC 8C6E00A0 */ lw $t6, 0x00A0($v1) ## 8015E700 -/* 00570 80A3ACC0 3C198012 */ lui $t9, %hi(gUpgradeShifts+6) -/* 00574 80A3ACC4 933971FA */ lbu $t9, %lo(gUpgradeShifts+6)($t9) -/* 00578 80A3ACC8 01CFC024 */ and $t8, $t6, $t7 -/* 0057C 80A3ACCC 3C028012 */ lui $v0, %hi(gUpgradeCapacities+0x30) -/* 00580 80A3ACD0 03384007 */ srav $t0, $t8, $t9 -/* 00584 80A3ACD4 00084840 */ sll $t1, $t0, 1 -/* 00588 80A3ACD8 00491021 */ addu $v0, $v0, $t1 -/* 0058C 80A3ACDC 9442722C */ lhu $v0, %lo(gUpgradeCapacities+0x30)($v0) -/* 00590 80A3ACE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00594 80A3ACE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00598 80A3ACE8 1040000A */ beq $v0, $zero, .L80A3AD14 -/* 0059C 80A3ACEC AFA40018 */ sw $a0, 0x0018($sp) -/* 005A0 80A3ACF0 3C0A8012 */ lui $t2, %hi(gItemSlots) -/* 005A4 80A3ACF4 914A7464 */ lbu $t2, %lo(gItemSlots)($t2) -/* 005A8 80A3ACF8 006A5821 */ addu $t3, $v1, $t2 -/* 005AC 80A3ACFC 816C008C */ lb $t4, 0x008C($t3) ## 0000008C -/* 005B0 80A3AD00 0182082A */ slt $at, $t4, $v0 -/* 005B4 80A3AD04 54200004 */ bnel $at, $zero, .L80A3AD18 -/* 005B8 80A3AD08 846D0034 */ lh $t5, 0x0034($v1) ## 8015E694 -/* 005BC 80A3AD0C 10000010 */ beq $zero, $zero, .L80A3AD50 -/* 005C0 80A3AD10 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A3AD14: -/* 005C4 80A3AD14 846D0034 */ lh $t5, 0x0034($v1) ## 8015E694 -.L80A3AD18: -/* 005C8 80A3AD18 84AE01C8 */ lh $t6, 0x01C8($a1) ## 000001C8 -/* 005CC 80A3AD1C 01AE082A */ slt $at, $t5, $t6 -/* 005D0 80A3AD20 10200003 */ beq $at, $zero, .L80A3AD30 -/* 005D4 80A3AD24 00000000 */ nop -/* 005D8 80A3AD28 10000009 */ beq $zero, $zero, .L80A3AD50 -/* 005DC 80A3AD2C 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3AD30: -/* 005E0 80A3AD30 0C0218E2 */ jal Item_CheckObtainability -/* 005E4 80A3AD34 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 005E8 80A3AD38 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 005EC 80A3AD3C 54410004 */ bnel $v0, $at, .L80A3AD50 -/* 005F0 80A3AD40 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 005F4 80A3AD44 10000002 */ beq $zero, $zero, .L80A3AD50 -/* 005F8 80A3AD48 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 005FC 80A3AD4C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3AD50: -/* 00600 80A3AD50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00604 80A3AD54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00608 80A3AD58 03E00008 */ jr $ra -/* 0060C 80A3AD5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s deleted file mode 100644 index ff612c23fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A3AD60 -/* 00610 80A3AD60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00614 80A3AD64 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00618 80A3AD68 AFA40018 */ sw $a0, 0x0018($sp) -/* 0061C 80A3AD6C 0C021AAF */ jal Inventory_HasEmptyBottle -/* 00620 80A3AD70 AFA5001C */ sw $a1, 0x001C($sp) -/* 00624 80A3AD74 14400003 */ bne $v0, $zero, .L80A3AD84 -/* 00628 80A3AD78 8FAF001C */ lw $t7, 0x001C($sp) -/* 0062C 80A3AD7C 10000011 */ beq $zero, $zero, .L80A3ADC4 -/* 00630 80A3AD80 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -.L80A3AD84: -/* 00634 80A3AD84 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) -/* 00638 80A3AD88 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) -/* 0063C 80A3AD8C 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 -/* 00640 80A3AD90 01D8082A */ slt $at, $t6, $t8 -/* 00644 80A3AD94 10200003 */ beq $at, $zero, .L80A3ADA4 -/* 00648 80A3AD98 00000000 */ nop -/* 0064C 80A3AD9C 10000009 */ beq $zero, $zero, .L80A3ADC4 -/* 00650 80A3ADA0 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3ADA4: -/* 00654 80A3ADA4 0C0218E2 */ jal Item_CheckObtainability -/* 00658 80A3ADA8 24040019 */ addiu $a0, $zero, 0x0019 ## $a0 = 00000019 -/* 0065C 80A3ADAC 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00660 80A3ADB0 54410004 */ bnel $v0, $at, .L80A3ADC4 -/* 00664 80A3ADB4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00668 80A3ADB8 10000002 */ beq $zero, $zero, .L80A3ADC4 -/* 0066C 80A3ADBC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00670 80A3ADC0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3ADC4: -/* 00674 80A3ADC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00678 80A3ADC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0067C 80A3ADCC 03E00008 */ jr $ra -/* 00680 80A3ADD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s deleted file mode 100644 index c53f5986a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A3ADD4 -/* 00684 80A3ADD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00688 80A3ADD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0068C 80A3ADDC AFA40018 */ sw $a0, 0x0018($sp) -/* 00690 80A3ADE0 0C021AAF */ jal Inventory_HasEmptyBottle -/* 00694 80A3ADE4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00698 80A3ADE8 14400003 */ bne $v0, $zero, .L80A3ADF8 -/* 0069C 80A3ADEC 8FAF001C */ lw $t7, 0x001C($sp) -/* 006A0 80A3ADF0 10000011 */ beq $zero, $zero, .L80A3AE38 -/* 006A4 80A3ADF4 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -.L80A3ADF8: -/* 006A8 80A3ADF8 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) -/* 006AC 80A3ADFC 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) -/* 006B0 80A3AE00 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 -/* 006B4 80A3AE04 01D8082A */ slt $at, $t6, $t8 -/* 006B8 80A3AE08 10200003 */ beq $at, $zero, .L80A3AE18 -/* 006BC 80A3AE0C 00000000 */ nop -/* 006C0 80A3AE10 10000009 */ beq $zero, $zero, .L80A3AE38 -/* 006C4 80A3AE14 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3AE18: -/* 006C8 80A3AE18 0C0218E2 */ jal Item_CheckObtainability -/* 006CC 80A3AE1C 24040015 */ addiu $a0, $zero, 0x0015 ## $a0 = 00000015 -/* 006D0 80A3AE20 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 006D4 80A3AE24 54410004 */ bnel $v0, $at, .L80A3AE38 -/* 006D8 80A3AE28 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 006DC 80A3AE2C 10000002 */ beq $zero, $zero, .L80A3AE38 -/* 006E0 80A3AE30 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 006E4 80A3AE34 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3AE38: -/* 006E8 80A3AE38 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006EC 80A3AE3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006F0 80A3AE40 03E00008 */ jr $ra -/* 006F4 80A3AE44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s deleted file mode 100644 index 00fd19e65c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A3AE48 -/* 006F8 80A3AE48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006FC 80A3AE4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00700 80A3AE50 AFA40018 */ sw $a0, 0x0018($sp) -/* 00704 80A3AE54 0C021AAF */ jal Inventory_HasEmptyBottle -/* 00708 80A3AE58 AFA5001C */ sw $a1, 0x001C($sp) -/* 0070C 80A3AE5C 14400003 */ bne $v0, $zero, .L80A3AE6C -/* 00710 80A3AE60 8FAF001C */ lw $t7, 0x001C($sp) -/* 00714 80A3AE64 10000011 */ beq $zero, $zero, .L80A3AEAC -/* 00718 80A3AE68 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -.L80A3AE6C: -/* 0071C 80A3AE6C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) -/* 00720 80A3AE70 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) -/* 00724 80A3AE74 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 -/* 00728 80A3AE78 01D8082A */ slt $at, $t6, $t8 -/* 0072C 80A3AE7C 10200003 */ beq $at, $zero, .L80A3AE8C -/* 00730 80A3AE80 00000000 */ nop -/* 00734 80A3AE84 10000009 */ beq $zero, $zero, .L80A3AEAC -/* 00738 80A3AE88 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3AE8C: -/* 0073C 80A3AE8C 0C0218E2 */ jal Item_CheckObtainability -/* 00740 80A3AE90 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 -/* 00744 80A3AE94 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00748 80A3AE98 54410004 */ bnel $v0, $at, .L80A3AEAC -/* 0074C 80A3AE9C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00750 80A3AEA0 10000002 */ beq $zero, $zero, .L80A3AEAC -/* 00754 80A3AEA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00758 80A3AEA8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3AEAC: -/* 0075C 80A3AEAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00760 80A3AEB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00764 80A3AEB4 03E00008 */ jr $ra -/* 00768 80A3AEB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s deleted file mode 100644 index 89d6f45dbd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A3AEBC -/* 0076C 80A3AEBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00770 80A3AEC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00774 80A3AEC4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00778 80A3AEC8 0C021AAF */ jal Inventory_HasEmptyBottle -/* 0077C 80A3AECC AFA5001C */ sw $a1, 0x001C($sp) -/* 00780 80A3AED0 14400003 */ bne $v0, $zero, .L80A3AEE0 -/* 00784 80A3AED4 8FAF001C */ lw $t7, 0x001C($sp) -/* 00788 80A3AED8 10000011 */ beq $zero, $zero, .L80A3AF20 -/* 0078C 80A3AEDC 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -.L80A3AEE0: -/* 00790 80A3AEE0 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) -/* 00794 80A3AEE4 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) -/* 00798 80A3AEE8 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 -/* 0079C 80A3AEEC 01D8082A */ slt $at, $t6, $t8 -/* 007A0 80A3AEF0 10200003 */ beq $at, $zero, .L80A3AF00 -/* 007A4 80A3AEF4 00000000 */ nop -/* 007A8 80A3AEF8 10000009 */ beq $zero, $zero, .L80A3AF20 -/* 007AC 80A3AEFC 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3AF00: -/* 007B0 80A3AF00 0C0218E2 */ jal Item_CheckObtainability -/* 007B4 80A3AF04 24040017 */ addiu $a0, $zero, 0x0017 ## $a0 = 00000017 -/* 007B8 80A3AF08 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 007BC 80A3AF0C 54410004 */ bnel $v0, $at, .L80A3AF20 -/* 007C0 80A3AF10 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 007C4 80A3AF14 10000002 */ beq $zero, $zero, .L80A3AF20 -/* 007C8 80A3AF18 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 007CC 80A3AF1C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3AF20: -/* 007D0 80A3AF20 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007D4 80A3AF24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007D8 80A3AF28 03E00008 */ jr $ra -/* 007DC 80A3AF2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s deleted file mode 100644 index 40afe79458..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80A3AF30 -/* 007E0 80A3AF30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007E4 80A3AF34 AFA40018 */ sw $a0, 0x0018($sp) -/* 007E8 80A3AF38 3C048016 */ lui $a0, %hi(gSaveContext) -/* 007EC 80A3AF3C 3C038012 */ lui $v1, %hi(gBitFlags) -/* 007F0 80A3AF40 24637120 */ addiu $v1, %lo(gBitFlags) -/* 007F4 80A3AF44 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 007F8 80A3AF48 9482009C */ lhu $v0, 0x009C($a0) ## 8015E6FC -/* 007FC 80A3AF4C 8C6E0008 */ lw $t6, 0x0008($v1) ## 80127128 -/* 00800 80A3AF50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00804 80A3AF54 01C27824 */ and $t7, $t6, $v0 -/* 00808 80A3AF58 51E00008 */ beql $t7, $zero, .L80A3AF7C -/* 0080C 80A3AF5C 84880034 */ lh $t0, 0x0034($a0) ## 8015E694 -/* 00810 80A3AF60 8C78000C */ lw $t8, 0x000C($v1) ## 8012712C -/* 00814 80A3AF64 0302C824 */ and $t9, $t8, $v0 -/* 00818 80A3AF68 57200004 */ bnel $t9, $zero, .L80A3AF7C -/* 0081C 80A3AF6C 84880034 */ lh $t0, 0x0034($a0) ## 8015E694 -/* 00820 80A3AF70 10000010 */ beq $zero, $zero, .L80A3AFB4 -/* 00824 80A3AF74 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 00828 80A3AF78 84880034 */ lh $t0, 0x0034($a0) ## 8015E694 -.L80A3AF7C: -/* 0082C 80A3AF7C 84A901C8 */ lh $t1, 0x01C8($a1) ## 000001C8 -/* 00830 80A3AF80 0109082A */ slt $at, $t0, $t1 -/* 00834 80A3AF84 10200003 */ beq $at, $zero, .L80A3AF94 -/* 00838 80A3AF88 00000000 */ nop -/* 0083C 80A3AF8C 10000009 */ beq $zero, $zero, .L80A3AFB4 -/* 00840 80A3AF90 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3AF94: -/* 00844 80A3AF94 0C0218E2 */ jal Item_CheckObtainability -/* 00848 80A3AF98 2404003D */ addiu $a0, $zero, 0x003D ## $a0 = 0000003D -/* 0084C 80A3AF9C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00850 80A3AFA0 54410004 */ bnel $v0, $at, .L80A3AFB4 -/* 00854 80A3AFA4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00858 80A3AFA8 10000002 */ beq $zero, $zero, .L80A3AFB4 -/* 0085C 80A3AFAC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00860 80A3AFB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3AFB4: -/* 00864 80A3AFB4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00868 80A3AFB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0086C 80A3AFBC 03E00008 */ jr $ra -/* 00870 80A3AFC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s deleted file mode 100644 index 3d000206bf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A3AFC4 -/* 00874 80A3AFC4 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00878 80A3AFC8 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 0087C 80A3AFCC 3C0E8012 */ lui $t6, %hi(gBitFlags+0x14) -/* 00880 80A3AFD0 8DCE7134 */ lw $t6, %lo(gBitFlags+0x14)($t6) -/* 00884 80A3AFD4 944F009C */ lhu $t7, 0x009C($v0) ## 8015E6FC -/* 00888 80A3AFD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0088C 80A3AFDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00890 80A3AFE0 01CFC024 */ and $t8, $t6, $t7 -/* 00894 80A3AFE4 13000003 */ beq $t8, $zero, .L80A3AFF4 -/* 00898 80A3AFE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0089C 80A3AFEC 10000010 */ beq $zero, $zero, .L80A3B030 -/* 008A0 80A3AFF0 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A3AFF4: -/* 008A4 80A3AFF4 84590034 */ lh $t9, 0x0034($v0) ## 00000036 -/* 008A8 80A3AFF8 84A801C8 */ lh $t0, 0x01C8($a1) ## 000001C8 -/* 008AC 80A3AFFC 0328082A */ slt $at, $t9, $t0 -/* 008B0 80A3B000 10200003 */ beq $at, $zero, .L80A3B010 -/* 008B4 80A3B004 00000000 */ nop -/* 008B8 80A3B008 10000009 */ beq $zero, $zero, .L80A3B030 -/* 008BC 80A3B00C 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B010: -/* 008C0 80A3B010 0C0218E2 */ jal Item_CheckObtainability -/* 008C4 80A3B014 2404003F */ addiu $a0, $zero, 0x003F ## $a0 = 0000003F -/* 008C8 80A3B018 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 008CC 80A3B01C 54410004 */ bnel $v0, $at, .L80A3B030 -/* 008D0 80A3B020 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 008D4 80A3B024 10000002 */ beq $zero, $zero, .L80A3B030 -/* 008D8 80A3B028 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 008DC 80A3B02C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B030: -/* 008E0 80A3B030 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008E4 80A3B034 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008E8 80A3B038 03E00008 */ jr $ra -/* 008EC 80A3B03C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s deleted file mode 100644 index cdc99e04eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A3B040 -/* 008F0 80A3B040 3C028016 */ lui $v0, %hi(gSaveContext) -/* 008F4 80A3B044 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 008F8 80A3B048 3C0E8012 */ lui $t6, %hi(gBitFlags+0x10) -/* 008FC 80A3B04C 8DCE7130 */ lw $t6, %lo(gBitFlags+0x10)($t6) -/* 00900 80A3B050 944F009C */ lhu $t7, 0x009C($v0) ## 8015E6FC -/* 00904 80A3B054 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00908 80A3B058 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0090C 80A3B05C 01CFC024 */ and $t8, $t6, $t7 -/* 00910 80A3B060 13000003 */ beq $t8, $zero, .L80A3B070 -/* 00914 80A3B064 AFA40018 */ sw $a0, 0x0018($sp) -/* 00918 80A3B068 10000010 */ beq $zero, $zero, .L80A3B0AC -/* 0091C 80A3B06C 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A3B070: -/* 00920 80A3B070 84590034 */ lh $t9, 0x0034($v0) ## 00000036 -/* 00924 80A3B074 84A801C8 */ lh $t0, 0x01C8($a1) ## 000001C8 -/* 00928 80A3B078 0328082A */ slt $at, $t9, $t0 -/* 0092C 80A3B07C 10200003 */ beq $at, $zero, .L80A3B08C -/* 00930 80A3B080 00000000 */ nop -/* 00934 80A3B084 10000009 */ beq $zero, $zero, .L80A3B0AC -/* 00938 80A3B088 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B08C: -/* 0093C 80A3B08C 0C0218E2 */ jal Item_CheckObtainability -/* 00940 80A3B090 2404003E */ addiu $a0, $zero, 0x003E ## $a0 = 0000003E -/* 00944 80A3B094 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00948 80A3B098 54410004 */ bnel $v0, $at, .L80A3B0AC -/* 0094C 80A3B09C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00950 80A3B0A0 10000002 */ beq $zero, $zero, .L80A3B0AC -/* 00954 80A3B0A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00958 80A3B0A8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B0AC: -/* 0095C 80A3B0AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00960 80A3B0B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00964 80A3B0B4 03E00008 */ jr $ra -/* 00968 80A3B0B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s deleted file mode 100644 index ee5e4929b3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A3B0BC -/* 0096C 80A3B0BC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00970 80A3B0C0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00974 80A3B0C4 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 -/* 00978 80A3B0C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0097C 80A3B0CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00980 80A3B0D0 11C00003 */ beq $t6, $zero, .L80A3B0E0 -/* 00984 80A3B0D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00988 80A3B0D8 10000002 */ beq $zero, $zero, .L80A3B0E4 -/* 0098C 80A3B0DC 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80A3B0E0: -/* 00990 80A3B0E0 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -.L80A3B0E4: -/* 00994 80A3B0E4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00998 80A3B0E8 14410003 */ bne $v0, $at, .L80A3B0F8 -/* 0099C 80A3B0EC 3C0F8012 */ lui $t7, %hi(gBitFlags+0x24) -/* 009A0 80A3B0F0 10000017 */ beq $zero, $zero, .L80A3B150 -/* 009A4 80A3B0F4 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A3B0F8: -/* 009A8 80A3B0F8 8DEF7144 */ lw $t7, %lo(gBitFlags+0x24)($t7) -/* 009AC 80A3B0FC 9478009C */ lhu $t8, 0x009C($v1) ## 8015E6FC -/* 009B0 80A3B100 01F8C824 */ and $t9, $t7, $t8 -/* 009B4 80A3B104 53200004 */ beql $t9, $zero, .L80A3B118 -/* 009B8 80A3B108 84680034 */ lh $t0, 0x0034($v1) ## 8015E694 -/* 009BC 80A3B10C 10000010 */ beq $zero, $zero, .L80A3B150 -/* 009C0 80A3B110 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 009C4 80A3B114 84680034 */ lh $t0, 0x0034($v1) ## 8015E694 -.L80A3B118: -/* 009C8 80A3B118 84A901C8 */ lh $t1, 0x01C8($a1) ## 000001C8 -/* 009CC 80A3B11C 0109082A */ slt $at, $t0, $t1 -/* 009D0 80A3B120 10200003 */ beq $at, $zero, .L80A3B130 -/* 009D4 80A3B124 00000000 */ nop -/* 009D8 80A3B128 10000009 */ beq $zero, $zero, .L80A3B150 -/* 009DC 80A3B12C 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B130: -/* 009E0 80A3B130 0C0218E2 */ jal Item_CheckObtainability -/* 009E4 80A3B134 24040042 */ addiu $a0, $zero, 0x0042 ## $a0 = 00000042 -/* 009E8 80A3B138 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 009EC 80A3B13C 54410004 */ bnel $v0, $at, .L80A3B150 -/* 009F0 80A3B140 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 009F4 80A3B144 10000002 */ beq $zero, $zero, .L80A3B150 -/* 009F8 80A3B148 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 009FC 80A3B14C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B150: -/* 00A00 80A3B150 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A04 80A3B154 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A08 80A3B158 03E00008 */ jr $ra -/* 00A0C 80A3B15C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s deleted file mode 100644 index 95b50c721b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A3B160 -/* 00A10 80A3B160 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00A14 80A3B164 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00A18 80A3B168 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 -/* 00A1C 80A3B16C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A20 80A3B170 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A24 80A3B174 11C00003 */ beq $t6, $zero, .L80A3B184 -/* 00A28 80A3B178 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A2C 80A3B17C 10000002 */ beq $zero, $zero, .L80A3B188 -/* 00A30 80A3B180 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L80A3B184: -/* 00A34 80A3B184 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -.L80A3B188: -/* 00A38 80A3B188 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00A3C 80A3B18C 14410003 */ bne $v0, $at, .L80A3B19C -/* 00A40 80A3B190 3C0F8012 */ lui $t7, %hi(gBitFlags+0x28) -/* 00A44 80A3B194 10000017 */ beq $zero, $zero, .L80A3B1F4 -/* 00A48 80A3B198 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A3B19C: -/* 00A4C 80A3B19C 8DEF7148 */ lw $t7, %lo(gBitFlags+0x28)($t7) -/* 00A50 80A3B1A0 9478009C */ lhu $t8, 0x009C($v1) ## 8015E6FC -/* 00A54 80A3B1A4 01F8C824 */ and $t9, $t7, $t8 -/* 00A58 80A3B1A8 53200004 */ beql $t9, $zero, .L80A3B1BC -/* 00A5C 80A3B1AC 84680034 */ lh $t0, 0x0034($v1) ## 8015E694 -/* 00A60 80A3B1B0 10000010 */ beq $zero, $zero, .L80A3B1F4 -/* 00A64 80A3B1B4 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 00A68 80A3B1B8 84680034 */ lh $t0, 0x0034($v1) ## 8015E694 -.L80A3B1BC: -/* 00A6C 80A3B1BC 84A901C8 */ lh $t1, 0x01C8($a1) ## 000001C8 -/* 00A70 80A3B1C0 0109082A */ slt $at, $t0, $t1 -/* 00A74 80A3B1C4 10200003 */ beq $at, $zero, .L80A3B1D4 -/* 00A78 80A3B1C8 00000000 */ nop -/* 00A7C 80A3B1CC 10000009 */ beq $zero, $zero, .L80A3B1F4 -/* 00A80 80A3B1D0 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B1D4: -/* 00A84 80A3B1D4 0C0218E2 */ jal Item_CheckObtainability -/* 00A88 80A3B1D8 24040043 */ addiu $a0, $zero, 0x0043 ## $a0 = 00000043 -/* 00A8C 80A3B1DC 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00A90 80A3B1E0 54410004 */ bnel $v0, $at, .L80A3B1F4 -/* 00A94 80A3B1E4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00A98 80A3B1E8 10000002 */ beq $zero, $zero, .L80A3B1F4 -/* 00A9C 80A3B1EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00AA0 80A3B1F0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B1F4: -/* 00AA4 80A3B1F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AA8 80A3B1F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AAC 80A3B1FC 03E00008 */ jr $ra -/* 00AB0 80A3B200 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s deleted file mode 100644 index 23db56a6b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80A3B204 -/* 00AB4 80A3B204 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00AB8 80A3B208 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00ABC 80A3B20C 844E0030 */ lh $t6, 0x0030($v0) ## 8015E690 -/* 00AC0 80A3B210 844F002E */ lh $t7, 0x002E($v0) ## 8015E68E -/* 00AC4 80A3B214 AFA40000 */ sw $a0, 0x0000($sp) -/* 00AC8 80A3B218 55CF0004 */ bnel $t6, $t7, .L80A3B22C -/* 00ACC 80A3B21C 84580034 */ lh $t8, 0x0034($v0) ## 8015E694 -/* 00AD0 80A3B220 03E00008 */ jr $ra -/* 00AD4 80A3B224 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A3B228: -/* 00AD8 80A3B228 84580034 */ lh $t8, 0x0034($v0) ## 00000036 -.L80A3B22C: -/* 00ADC 80A3B22C 84B901C8 */ lh $t9, 0x01C8($a1) ## 000001C8 -/* 00AE0 80A3B230 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00AE4 80A3B234 0319082A */ slt $at, $t8, $t9 -/* 00AE8 80A3B238 10200003 */ beq $at, $zero, .L80A3B248 -/* 00AEC 80A3B23C 00000000 */ nop -/* 00AF0 80A3B240 03E00008 */ jr $ra -/* 00AF4 80A3B244 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B248: -/* 00AF8 80A3B248 03E00008 */ jr $ra -/* 00AFC 80A3B24C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s deleted file mode 100644 index 53ef154cb0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A3B250 -/* 00B00 80A3B250 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B04 80A3B254 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B08 80A3B258 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B0C 80A3B25C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) -/* 00B10 80A3B260 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) -/* 00B14 80A3B264 84AF01C8 */ lh $t7, 0x01C8($a1) ## 000001C8 -/* 00B18 80A3B268 01CF082A */ slt $at, $t6, $t7 -/* 00B1C 80A3B26C 10200003 */ beq $at, $zero, .L80A3B27C -/* 00B20 80A3B270 00000000 */ nop -/* 00B24 80A3B274 10000009 */ beq $zero, $zero, .L80A3B29C -/* 00B28 80A3B278 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B27C: -/* 00B2C 80A3B27C 0C0218E2 */ jal Item_CheckObtainability -/* 00B30 80A3B280 2404001A */ addiu $a0, $zero, 0x001A ## $a0 = 0000001A -/* 00B34 80A3B284 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00B38 80A3B288 54410004 */ bnel $v0, $at, .L80A3B29C -/* 00B3C 80A3B28C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00B40 80A3B290 10000002 */ beq $zero, $zero, .L80A3B29C -/* 00B44 80A3B294 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00B48 80A3B298 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B29C: -/* 00B4C 80A3B29C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B50 80A3B2A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B54 80A3B2A4 03E00008 */ jr $ra -/* 00B58 80A3B2A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s deleted file mode 100644 index 3979ae70a5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A3B2AC -/* 00B5C 80A3B2AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B60 80A3B2B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B64 80A3B2B4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B68 80A3B2B8 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) -/* 00B6C 80A3B2BC 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) -/* 00B70 80A3B2C0 84AF01C8 */ lh $t7, 0x01C8($a1) ## 000001C8 -/* 00B74 80A3B2C4 01CF082A */ slt $at, $t6, $t7 -/* 00B78 80A3B2C8 10200003 */ beq $at, $zero, .L80A3B2D8 -/* 00B7C 80A3B2CC 00000000 */ nop -/* 00B80 80A3B2D0 10000009 */ beq $zero, $zero, .L80A3B2F8 -/* 00B84 80A3B2D4 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B2D8: -/* 00B88 80A3B2D8 0C0218E2 */ jal Item_CheckObtainability -/* 00B8C 80A3B2DC 24040023 */ addiu $a0, $zero, 0x0023 ## $a0 = 00000023 -/* 00B90 80A3B2E0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00B94 80A3B2E4 54410004 */ bnel $v0, $at, .L80A3B2F8 -/* 00B98 80A3B2E8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00B9C 80A3B2EC 10000002 */ beq $zero, $zero, .L80A3B2F8 -/* 00BA0 80A3B2F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00BA4 80A3B2F4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B2F8: -/* 00BA8 80A3B2F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BAC 80A3B2FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BB0 80A3B300 03E00008 */ jr $ra -/* 00BB4 80A3B304 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B308.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B308.s deleted file mode 100644 index 04db6ece52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B308.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80A3B308 -/* 00BB8 80A3B308 AFA40000 */ sw $a0, 0x0000($sp) -/* 00BBC 80A3B30C AFA50004 */ sw $a1, 0x0004($sp) -/* 00BC0 80A3B310 03E00008 */ jr $ra -/* 00BC4 80A3B314 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B318.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B318.s deleted file mode 100644 index bf7f4ef83a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B318.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80A3B318 -/* 00BC8 80A3B318 AFA40000 */ sw $a0, 0x0000($sp) -/* 00BCC 80A3B31C AFA50004 */ sw $a1, 0x0004($sp) -/* 00BD0 80A3B320 03E00008 */ jr $ra -/* 00BD4 80A3B324 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s deleted file mode 100644 index 674497b311..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80A3B328 -/* 00BD8 80A3B328 3C0E8012 */ lui $t6, %hi(gItemSlots+9) -/* 00BDC 80A3B32C 91CE746D */ lbu $t6, %lo(gItemSlots+9)($t6) -/* 00BE0 80A3B330 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00BE4 80A3B334 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00BE8 80A3B338 004E7821 */ addu $t7, $v0, $t6 -/* 00BEC 80A3B33C 81F8008C */ lb $t8, 0x008C($t7) ## 0000008C -/* 00BF0 80A3B340 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BF4 80A3B344 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BF8 80A3B348 2B010032 */ slti $at, $t8, 0x0032 -/* 00BFC 80A3B34C 14200003 */ bne $at, $zero, .L80A3B35C -/* 00C00 80A3B350 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C04 80A3B354 10000010 */ beq $zero, $zero, .L80A3B398 -/* 00C08 80A3B358 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A3B35C: -/* 00C0C 80A3B35C 84590034 */ lh $t9, 0x0034($v0) ## 00000036 -/* 00C10 80A3B360 84A801C8 */ lh $t0, 0x01C8($a1) ## 000001C8 -/* 00C14 80A3B364 0328082A */ slt $at, $t9, $t0 -/* 00C18 80A3B368 10200003 */ beq $at, $zero, .L80A3B378 -/* 00C1C 80A3B36C 00000000 */ nop -/* 00C20 80A3B370 10000009 */ beq $zero, $zero, .L80A3B398 -/* 00C24 80A3B374 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B378: -/* 00C28 80A3B378 0C0218E2 */ jal Item_CheckObtainability -/* 00C2C 80A3B37C 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 00C30 80A3B380 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00C34 80A3B384 54410004 */ bnel $v0, $at, .L80A3B398 -/* 00C38 80A3B388 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00C3C 80A3B38C 10000002 */ beq $zero, $zero, .L80A3B398 -/* 00C40 80A3B390 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00C44 80A3B394 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B398: -/* 00C48 80A3B398 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C4C 80A3B39C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C50 80A3B3A0 03E00008 */ jr $ra -/* 00C54 80A3B3A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s deleted file mode 100644 index b23fd8ceba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80A3B3A8 -/* 00C58 80A3B3A8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00C5C 80A3B3AC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00C60 80A3B3B0 3C088012 */ lui $t0, %hi(gUpgradeMasks+0x14) -/* 00C64 80A3B3B4 8D0871C4 */ lw $t0, %lo(gUpgradeMasks+0x14)($t0) -/* 00C68 80A3B3B8 8C5900A0 */ lw $t9, 0x00A0($v0) ## 8015E700 -/* 00C6C 80A3B3BC 3C0A8012 */ lui $t2, %hi(gUpgradeShifts+5) -/* 00C70 80A3B3C0 914A71F9 */ lbu $t2, %lo(gUpgradeShifts+5)($t2) -/* 00C74 80A3B3C4 3C0E8012 */ lui $t6, %hi(gItemSlots+6) -/* 00C78 80A3B3C8 91CE746A */ lbu $t6, %lo(gItemSlots+6)($t6) -/* 00C7C 80A3B3CC 03284824 */ and $t1, $t9, $t0 -/* 00C80 80A3B3D0 01495807 */ srav $t3, $t1, $t2 -/* 00C84 80A3B3D4 000B6040 */ sll $t4, $t3, 1 -/* 00C88 80A3B3D8 3C0D8012 */ lui $t5, %hi(gUpgradeCapacities+0x28) -/* 00C8C 80A3B3DC 01AC6821 */ addu $t5, $t5, $t4 -/* 00C90 80A3B3E0 004E7821 */ addu $t7, $v0, $t6 -/* 00C94 80A3B3E4 81F8008C */ lb $t8, 0x008C($t7) ## 0000008C -/* 00C98 80A3B3E8 95AD7224 */ lhu $t5, %lo(gUpgradeCapacities+0x28)($t5) -/* 00C9C 80A3B3EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CA0 80A3B3F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CA4 80A3B3F4 030D082A */ slt $at, $t8, $t5 -/* 00CA8 80A3B3F8 14200003 */ bne $at, $zero, .L80A3B408 -/* 00CAC 80A3B3FC AFA40018 */ sw $a0, 0x0018($sp) -/* 00CB0 80A3B400 10000010 */ beq $zero, $zero, .L80A3B444 -/* 00CB4 80A3B404 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80A3B408: -/* 00CB8 80A3B408 844E0034 */ lh $t6, 0x0034($v0) ## 00000036 -/* 00CBC 80A3B40C 84AF01C8 */ lh $t7, 0x01C8($a1) ## 000001C8 -/* 00CC0 80A3B410 01CF082A */ slt $at, $t6, $t7 -/* 00CC4 80A3B414 10200003 */ beq $at, $zero, .L80A3B424 -/* 00CC8 80A3B418 00000000 */ nop -/* 00CCC 80A3B41C 10000009 */ beq $zero, $zero, .L80A3B444 -/* 00CD0 80A3B420 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B424: -/* 00CD4 80A3B424 0C0218E2 */ jal Item_CheckObtainability -/* 00CD8 80A3B428 24040058 */ addiu $a0, $zero, 0x0058 ## $a0 = 00000058 -/* 00CDC 80A3B42C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00CE0 80A3B430 54410004 */ bnel $v0, $at, .L80A3B444 -/* 00CE4 80A3B434 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00CE8 80A3B438 10000002 */ beq $zero, $zero, .L80A3B444 -/* 00CEC 80A3B43C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00CF0 80A3B440 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B444: -/* 00CF4 80A3B444 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CF8 80A3B448 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CFC 80A3B44C 03E00008 */ jr $ra -/* 00D00 80A3B450 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B454.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B454.s deleted file mode 100644 index c884935f30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B454.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80A3B454 -/* 00D04 80A3B454 AFA40000 */ sw $a0, 0x0000($sp) -/* 00D08 80A3B458 AFA50004 */ sw $a1, 0x0004($sp) -/* 00D0C 80A3B45C 03E00008 */ jr $ra -/* 00D10 80A3B460 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s deleted file mode 100644 index f59c579a30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A3B464 -/* 00D14 80A3B464 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D18 80A3B468 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D1C 80A3B46C AFA40018 */ sw $a0, 0x0018($sp) -/* 00D20 80A3B470 0C021AAF */ jal Inventory_HasEmptyBottle -/* 00D24 80A3B474 AFA5001C */ sw $a1, 0x001C($sp) -/* 00D28 80A3B478 14400003 */ bne $v0, $zero, .L80A3B488 -/* 00D2C 80A3B47C 8FAF001C */ lw $t7, 0x001C($sp) -/* 00D30 80A3B480 10000011 */ beq $zero, $zero, .L80A3B4C8 -/* 00D34 80A3B484 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -.L80A3B488: -/* 00D38 80A3B488 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) -/* 00D3C 80A3B48C 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) -/* 00D40 80A3B490 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 -/* 00D44 80A3B494 01D8082A */ slt $at, $t6, $t8 -/* 00D48 80A3B498 10200003 */ beq $at, $zero, .L80A3B4A8 -/* 00D4C 80A3B49C 00000000 */ nop -/* 00D50 80A3B4A0 10000009 */ beq $zero, $zero, .L80A3B4C8 -/* 00D54 80A3B4A4 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B4A8: -/* 00D58 80A3B4A8 0C0218E2 */ jal Item_CheckObtainability -/* 00D5C 80A3B4AC 2404001C */ addiu $a0, $zero, 0x001C ## $a0 = 0000001C -/* 00D60 80A3B4B0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00D64 80A3B4B4 54410004 */ bnel $v0, $at, .L80A3B4C8 -/* 00D68 80A3B4B8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00D6C 80A3B4BC 10000002 */ beq $zero, $zero, .L80A3B4C8 -/* 00D70 80A3B4C0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00D74 80A3B4C4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B4C8: -/* 00D78 80A3B4C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D7C 80A3B4CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D80 80A3B4D0 03E00008 */ jr $ra -/* 00D84 80A3B4D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s deleted file mode 100644 index 27814d9fa4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A3B4D8 -/* 00D88 80A3B4D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D8C 80A3B4DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D90 80A3B4E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00D94 80A3B4E4 0C021AAF */ jal Inventory_HasEmptyBottle -/* 00D98 80A3B4E8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00D9C 80A3B4EC 14400003 */ bne $v0, $zero, .L80A3B4FC -/* 00DA0 80A3B4F0 8FAF001C */ lw $t7, 0x001C($sp) -/* 00DA4 80A3B4F4 10000011 */ beq $zero, $zero, .L80A3B53C -/* 00DA8 80A3B4F8 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -.L80A3B4FC: -/* 00DAC 80A3B4FC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) -/* 00DB0 80A3B500 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) -/* 00DB4 80A3B504 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 -/* 00DB8 80A3B508 01D8082A */ slt $at, $t6, $t8 -/* 00DBC 80A3B50C 10200003 */ beq $at, $zero, .L80A3B51C -/* 00DC0 80A3B510 00000000 */ nop -/* 00DC4 80A3B514 10000009 */ beq $zero, $zero, .L80A3B53C -/* 00DC8 80A3B518 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B51C: -/* 00DCC 80A3B51C 0C0218E2 */ jal Item_CheckObtainability -/* 00DD0 80A3B520 2404001D */ addiu $a0, $zero, 0x001D ## $a0 = 0000001D -/* 00DD4 80A3B524 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00DD8 80A3B528 54410004 */ bnel $v0, $at, .L80A3B53C -/* 00DDC 80A3B52C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00DE0 80A3B530 10000002 */ beq $zero, $zero, .L80A3B53C -/* 00DE4 80A3B534 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00DE8 80A3B538 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B53C: -/* 00DEC 80A3B53C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00DF0 80A3B540 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00DF4 80A3B544 03E00008 */ jr $ra -/* 00DF8 80A3B548 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s deleted file mode 100644 index 06cc98cdad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A3B54C -/* 00DFC 80A3B54C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E00 80A3B550 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E04 80A3B554 AFA40018 */ sw $a0, 0x0018($sp) -/* 00E08 80A3B558 0C021AAF */ jal Inventory_HasEmptyBottle -/* 00E0C 80A3B55C AFA5001C */ sw $a1, 0x001C($sp) -/* 00E10 80A3B560 14400003 */ bne $v0, $zero, .L80A3B570 -/* 00E14 80A3B564 8FAF001C */ lw $t7, 0x001C($sp) -/* 00E18 80A3B568 10000011 */ beq $zero, $zero, .L80A3B5B0 -/* 00E1C 80A3B56C 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -.L80A3B570: -/* 00E20 80A3B570 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) -/* 00E24 80A3B574 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) -/* 00E28 80A3B578 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 -/* 00E2C 80A3B57C 01D8082A */ slt $at, $t6, $t8 -/* 00E30 80A3B580 10200003 */ beq $at, $zero, .L80A3B590 -/* 00E34 80A3B584 00000000 */ nop -/* 00E38 80A3B588 10000009 */ beq $zero, $zero, .L80A3B5B0 -/* 00E3C 80A3B58C 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B590: -/* 00E40 80A3B590 0C0218E2 */ jal Item_CheckObtainability -/* 00E44 80A3B594 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 -/* 00E48 80A3B598 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00E4C 80A3B59C 54410004 */ bnel $v0, $at, .L80A3B5B0 -/* 00E50 80A3B5A0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00E54 80A3B5A4 10000002 */ beq $zero, $zero, .L80A3B5B0 -/* 00E58 80A3B5A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00E5C 80A3B5AC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B5B0: -/* 00E60 80A3B5B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E64 80A3B5B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E68 80A3B5B8 03E00008 */ jr $ra -/* 00E6C 80A3B5BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s deleted file mode 100644 index 0b4314e1f2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A3B5C0 -/* 00E70 80A3B5C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E74 80A3B5C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E78 80A3B5C8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00E7C 80A3B5CC 0C021AAF */ jal Inventory_HasEmptyBottle -/* 00E80 80A3B5D0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00E84 80A3B5D4 14400003 */ bne $v0, $zero, .L80A3B5E4 -/* 00E88 80A3B5D8 8FAF001C */ lw $t7, 0x001C($sp) -/* 00E8C 80A3B5DC 10000011 */ beq $zero, $zero, .L80A3B624 -/* 00E90 80A3B5E0 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -.L80A3B5E4: -/* 00E94 80A3B5E4 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) -/* 00E98 80A3B5E8 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) -/* 00E9C 80A3B5EC 85F801C8 */ lh $t8, 0x01C8($t7) ## 000001C8 -/* 00EA0 80A3B5F0 01D8082A */ slt $at, $t6, $t8 -/* 00EA4 80A3B5F4 10200003 */ beq $at, $zero, .L80A3B604 -/* 00EA8 80A3B5F8 00000000 */ nop -/* 00EAC 80A3B5FC 10000009 */ beq $zero, $zero, .L80A3B624 -/* 00EB0 80A3B600 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -.L80A3B604: -/* 00EB4 80A3B604 0C0218E2 */ jal Item_CheckObtainability -/* 00EB8 80A3B608 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 00EBC 80A3B60C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00EC0 80A3B610 54410004 */ bnel $v0, $at, .L80A3B624 -/* 00EC4 80A3B614 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00EC8 80A3B618 10000002 */ beq $zero, $zero, .L80A3B624 -/* 00ECC 80A3B61C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00ED0 80A3B620 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3B624: -/* 00ED4 80A3B624 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00ED8 80A3B628 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00EDC 80A3B62C 03E00008 */ jr $ra -/* 00EE0 80A3B630 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B634.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B634.s deleted file mode 100644 index eaa03677d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B634.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A3B634 -/* 00EE4 80A3B634 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00EE8 80A3B638 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EEC 80A3B63C AFA40018 */ sw $a0, 0x0018($sp) -/* 00EF0 80A3B640 AFA5001C */ sw $a1, 0x001C($sp) -/* 00EF4 80A3B644 84A501CA */ lh $a1, 0x01CA($a1) ## 000001CA -/* 00EF8 80A3B648 0C021CCC */ jal Inventory_ChangeAmmo -/* 00EFC 80A3B64C 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 -/* 00F00 80A3B650 8FAF001C */ lw $t7, 0x001C($sp) -/* 00F04 80A3B654 85E401C8 */ lh $a0, 0x01C8($t7) ## 000001C8 -/* 00F08 80A3B658 00042023 */ subu $a0, $zero, $a0 -/* 00F0C 80A3B65C 00042400 */ sll $a0, $a0, 16 -/* 00F10 80A3B660 0C021CC3 */ jal Rupees_ChangeBy -/* 00F14 80A3B664 00042403 */ sra $a0, $a0, 16 -/* 00F18 80A3B668 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F1C 80A3B66C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F20 80A3B670 03E00008 */ jr $ra -/* 00F24 80A3B674 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B678.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B678.s deleted file mode 100644 index 56d459873f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B678.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80A3B678 -/* 00F28 80A3B678 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F2C 80A3B67C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F30 80A3B680 AFA5001C */ sw $a1, 0x001C($sp) -/* 00F34 80A3B684 84A201CA */ lh $v0, 0x01CA($a1) ## 000001CA -/* 00F38 80A3B688 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00F3C 80A3B68C 10410009 */ beq $v0, $at, .L80A3B6B4 -/* 00F40 80A3B690 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00F44 80A3B694 1041000B */ beq $v0, $at, .L80A3B6C4 -/* 00F48 80A3B698 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00F4C 80A3B69C 1041000D */ beq $v0, $at, .L80A3B6D4 -/* 00F50 80A3B6A0 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00F54 80A3B6A4 1041000F */ beq $v0, $at, .L80A3B6E4 -/* 00F58 80A3B6A8 00000000 */ nop -/* 00F5C 80A3B6AC 10000010 */ beq $zero, $zero, .L80A3B6F0 -/* 00F60 80A3B6B0 8FAF001C */ lw $t7, 0x001C($sp) -.L80A3B6B4: -/* 00F64 80A3B6B4 0C021344 */ jal Item_Give -/* 00F68 80A3B6B8 2405008E */ addiu $a1, $zero, 0x008E ## $a1 = 0000008E -/* 00F6C 80A3B6BC 1000000C */ beq $zero, $zero, .L80A3B6F0 -/* 00F70 80A3B6C0 8FAF001C */ lw $t7, 0x001C($sp) -.L80A3B6C4: -/* 00F74 80A3B6C4 0C021344 */ jal Item_Give -/* 00F78 80A3B6C8 2405008F */ addiu $a1, $zero, 0x008F ## $a1 = 0000008F -/* 00F7C 80A3B6CC 10000008 */ beq $zero, $zero, .L80A3B6F0 -/* 00F80 80A3B6D0 8FAF001C */ lw $t7, 0x001C($sp) -.L80A3B6D4: -/* 00F84 80A3B6D4 0C021344 */ jal Item_Give -/* 00F88 80A3B6D8 24050090 */ addiu $a1, $zero, 0x0090 ## $a1 = 00000090 -/* 00F8C 80A3B6DC 10000004 */ beq $zero, $zero, .L80A3B6F0 -/* 00F90 80A3B6E0 8FAF001C */ lw $t7, 0x001C($sp) -.L80A3B6E4: -/* 00F94 80A3B6E4 0C021344 */ jal Item_Give -/* 00F98 80A3B6E8 24050091 */ addiu $a1, $zero, 0x0091 ## $a1 = 00000091 -/* 00F9C 80A3B6EC 8FAF001C */ lw $t7, 0x001C($sp) -.L80A3B6F0: -/* 00FA0 80A3B6F0 85E401C8 */ lh $a0, 0x01C8($t7) ## 000001C8 -/* 00FA4 80A3B6F4 00042023 */ subu $a0, $zero, $a0 -/* 00FA8 80A3B6F8 00042400 */ sll $a0, $a0, 16 -/* 00FAC 80A3B6FC 0C021CC3 */ jal Rupees_ChangeBy -/* 00FB0 80A3B700 00042403 */ sra $a0, $a0, 16 -/* 00FB4 80A3B704 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FB8 80A3B708 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FBC 80A3B70C 03E00008 */ jr $ra -/* 00FC0 80A3B710 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B714.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B714.s deleted file mode 100644 index 04bbc6f8f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B714.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80A3B714 -/* 00FC4 80A3B714 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00FC8 80A3B718 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00FCC 80A3B71C AFA5001C */ sw $a1, 0x001C($sp) -/* 00FD0 80A3B720 84A201CA */ lh $v0, 0x01CA($a1) ## 000001CA -/* 00FD4 80A3B724 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00FD8 80A3B728 10410005 */ beq $v0, $at, .L80A3B740 -/* 00FDC 80A3B72C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00FE0 80A3B730 10410007 */ beq $v0, $at, .L80A3B750 -/* 00FE4 80A3B734 00000000 */ nop -/* 00FE8 80A3B738 10000008 */ beq $zero, $zero, .L80A3B75C -/* 00FEC 80A3B73C 8FAF001C */ lw $t7, 0x001C($sp) -.L80A3B740: -/* 00FF0 80A3B740 0C021344 */ jal Item_Give -/* 00FF4 80A3B744 2405008C */ addiu $a1, $zero, 0x008C ## $a1 = 0000008C -/* 00FF8 80A3B748 10000004 */ beq $zero, $zero, .L80A3B75C -/* 00FFC 80A3B74C 8FAF001C */ lw $t7, 0x001C($sp) -.L80A3B750: -/* 01000 80A3B750 0C021344 */ jal Item_Give -/* 01004 80A3B754 2405008D */ addiu $a1, $zero, 0x008D ## $a1 = 0000008D -/* 01008 80A3B758 8FAF001C */ lw $t7, 0x001C($sp) -.L80A3B75C: -/* 0100C 80A3B75C 85E401C8 */ lh $a0, 0x01C8($t7) ## 000001C8 -/* 01010 80A3B760 00042023 */ subu $a0, $zero, $a0 -/* 01014 80A3B764 00042400 */ sll $a0, $a0, 16 -/* 01018 80A3B768 0C021CC3 */ jal Rupees_ChangeBy -/* 0101C 80A3B76C 00042403 */ sra $a0, $a0, 16 -/* 01020 80A3B770 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01024 80A3B774 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01028 80A3B778 03E00008 */ jr $ra -/* 0102C 80A3B77C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B780.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B780.s deleted file mode 100644 index ce5c6ea40e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B780.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A3B780 -/* 01030 80A3B780 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01034 80A3B784 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01038 80A3B788 AFA5001C */ sw $a1, 0x001C($sp) -/* 0103C 80A3B78C 0C021344 */ jal Item_Give -/* 01040 80A3B790 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01044 80A3B794 8FAE001C */ lw $t6, 0x001C($sp) -/* 01048 80A3B798 85C401C8 */ lh $a0, 0x01C8($t6) ## 000001C8 -/* 0104C 80A3B79C 00042023 */ subu $a0, $zero, $a0 -/* 01050 80A3B7A0 00042400 */ sll $a0, $a0, 16 -/* 01054 80A3B7A4 0C021CC3 */ jal Rupees_ChangeBy -/* 01058 80A3B7A8 00042403 */ sra $a0, $a0, 16 -/* 0105C 80A3B7AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01060 80A3B7B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01064 80A3B7B4 03E00008 */ jr $ra -/* 01068 80A3B7B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s deleted file mode 100644 index 72ee00cb18..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A3B7BC -/* 0106C 80A3B7BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01070 80A3B7C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01074 80A3B7C4 0C02127B */ jal func_800849EC -/* 01078 80A3B7C8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0107C 80A3B7CC 8FAF001C */ lw $t7, 0x001C($sp) -/* 01080 80A3B7D0 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 01084 80A3B7D4 3C018016 */ lui $at, %hi(gSaveContext+0x36) -/* 01088 80A3B7D8 A42EE696 */ sh $t6, %lo(gSaveContext+0x36)($at) -/* 0108C 80A3B7DC 85E401C8 */ lh $a0, 0x01C8($t7) ## 000001C8 -/* 01090 80A3B7E0 00042023 */ subu $a0, $zero, $a0 -/* 01094 80A3B7E4 00042400 */ sll $a0, $a0, 16 -/* 01098 80A3B7E8 0C021CC3 */ jal Rupees_ChangeBy -/* 0109C 80A3B7EC 00042403 */ sra $a0, $a0, 16 -/* 010A0 80A3B7F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010A4 80A3B7F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010A8 80A3B7F8 03E00008 */ jr $ra -/* 010AC 80A3B7FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B800.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B800.s deleted file mode 100644 index 2aa74b4756..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B800.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A3B800 -/* 010B0 80A3B800 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010B4 80A3B804 AFBF0014 */ sw $ra, 0x0014($sp) -/* 010B8 80A3B808 AFA5001C */ sw $a1, 0x001C($sp) -/* 010BC 80A3B80C 0C021344 */ jal Item_Give -/* 010C0 80A3B810 2405003F */ addiu $a1, $zero, 0x003F ## $a1 = 0000003F -/* 010C4 80A3B814 8FAE001C */ lw $t6, 0x001C($sp) -/* 010C8 80A3B818 85C401C8 */ lh $a0, 0x01C8($t6) ## 000001C8 -/* 010CC 80A3B81C 00042023 */ subu $a0, $zero, $a0 -/* 010D0 80A3B820 00042400 */ sll $a0, $a0, 16 -/* 010D4 80A3B824 0C021CC3 */ jal Rupees_ChangeBy -/* 010D8 80A3B828 00042403 */ sra $a0, $a0, 16 -/* 010DC 80A3B82C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010E0 80A3B830 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010E4 80A3B834 03E00008 */ jr $ra -/* 010E8 80A3B838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B83C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B83C.s deleted file mode 100644 index 23584ad21b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B83C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A3B83C -/* 010EC 80A3B83C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010F0 80A3B840 AFBF0014 */ sw $ra, 0x0014($sp) -/* 010F4 80A3B844 AFA5001C */ sw $a1, 0x001C($sp) -/* 010F8 80A3B848 0C021344 */ jal Item_Give -/* 010FC 80A3B84C 2405003E */ addiu $a1, $zero, 0x003E ## $a1 = 0000003E -/* 01100 80A3B850 8FAE001C */ lw $t6, 0x001C($sp) -/* 01104 80A3B854 85C401C8 */ lh $a0, 0x01C8($t6) ## 000001C8 -/* 01108 80A3B858 00042023 */ subu $a0, $zero, $a0 -/* 0110C 80A3B85C 00042400 */ sll $a0, $a0, 16 -/* 01110 80A3B860 0C021CC3 */ jal Rupees_ChangeBy -/* 01114 80A3B864 00042403 */ sra $a0, $a0, 16 -/* 01118 80A3B868 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0111C 80A3B86C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01120 80A3B870 03E00008 */ jr $ra -/* 01124 80A3B874 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B878.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B878.s deleted file mode 100644 index 8c453a38c7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B878.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A3B878 -/* 01128 80A3B878 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0112C 80A3B87C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01130 80A3B880 AFA5001C */ sw $a1, 0x001C($sp) -/* 01134 80A3B884 0C021344 */ jal Item_Give -/* 01138 80A3B888 24050042 */ addiu $a1, $zero, 0x0042 ## $a1 = 00000042 -/* 0113C 80A3B88C 8FAE001C */ lw $t6, 0x001C($sp) -/* 01140 80A3B890 85C401C8 */ lh $a0, 0x01C8($t6) ## 000001C8 -/* 01144 80A3B894 00042023 */ subu $a0, $zero, $a0 -/* 01148 80A3B898 00042400 */ sll $a0, $a0, 16 -/* 0114C 80A3B89C 0C021CC3 */ jal Rupees_ChangeBy -/* 01150 80A3B8A0 00042403 */ sra $a0, $a0, 16 -/* 01154 80A3B8A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01158 80A3B8A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0115C 80A3B8AC 03E00008 */ jr $ra -/* 01160 80A3B8B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8B4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8B4.s deleted file mode 100644 index 9b3828b40a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8B4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A3B8B4 -/* 01164 80A3B8B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01168 80A3B8B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0116C 80A3B8BC AFA5001C */ sw $a1, 0x001C($sp) -/* 01170 80A3B8C0 0C021344 */ jal Item_Give -/* 01174 80A3B8C4 24050043 */ addiu $a1, $zero, 0x0043 ## $a1 = 00000043 -/* 01178 80A3B8C8 8FAE001C */ lw $t6, 0x001C($sp) -/* 0117C 80A3B8CC 85C401C8 */ lh $a0, 0x01C8($t6) ## 000001C8 -/* 01180 80A3B8D0 00042023 */ subu $a0, $zero, $a0 -/* 01184 80A3B8D4 00042400 */ sll $a0, $a0, 16 -/* 01188 80A3B8D8 0C021CC3 */ jal Rupees_ChangeBy -/* 0118C 80A3B8DC 00042403 */ sra $a0, $a0, 16 -/* 01190 80A3B8E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01194 80A3B8E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01198 80A3B8E8 03E00008 */ jr $ra -/* 0119C 80A3B8EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8F0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8F0.s deleted file mode 100644 index f57aace9ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8F0.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A3B8F0 -/* 011A0 80A3B8F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011A4 80A3B8F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 011A8 80A3B8F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 011AC 80A3B8FC 0C021C5D */ jal Health_ChangeBy -/* 011B0 80A3B900 84A501CA */ lh $a1, 0x01CA($a1) ## 000001CA -/* 011B4 80A3B904 8FAF001C */ lw $t7, 0x001C($sp) -/* 011B8 80A3B908 85E401C8 */ lh $a0, 0x01C8($t7) ## 000001C8 -/* 011BC 80A3B90C 00042023 */ subu $a0, $zero, $a0 -/* 011C0 80A3B910 00042400 */ sll $a0, $a0, 16 -/* 011C4 80A3B914 0C021CC3 */ jal Rupees_ChangeBy -/* 011C8 80A3B918 00042403 */ sra $a0, $a0, 16 -/* 011CC 80A3B91C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011D0 80A3B920 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 011D4 80A3B924 03E00008 */ jr $ra -/* 011D8 80A3B928 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B92C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B92C.s deleted file mode 100644 index f0adc30441..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B92C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A3B92C -/* 011DC 80A3B92C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011E0 80A3B930 AFBF0014 */ sw $ra, 0x0014($sp) -/* 011E4 80A3B934 AFA5001C */ sw $a1, 0x001C($sp) -/* 011E8 80A3B938 0C021344 */ jal Item_Give -/* 011EC 80A3B93C 2405001A */ addiu $a1, $zero, 0x001A ## $a1 = 0000001A -/* 011F0 80A3B940 8FAE001C */ lw $t6, 0x001C($sp) -/* 011F4 80A3B944 85C401C8 */ lh $a0, 0x01C8($t6) ## 000001C8 -/* 011F8 80A3B948 00042023 */ subu $a0, $zero, $a0 -/* 011FC 80A3B94C 00042400 */ sll $a0, $a0, 16 -/* 01200 80A3B950 0C021CC3 */ jal Rupees_ChangeBy -/* 01204 80A3B954 00042403 */ sra $a0, $a0, 16 -/* 01208 80A3B958 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0120C 80A3B95C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01210 80A3B960 03E00008 */ jr $ra -/* 01214 80A3B964 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B968.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B968.s deleted file mode 100644 index edcb07e44d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B968.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A3B968 -/* 01218 80A3B968 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0121C 80A3B96C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01220 80A3B970 AFA5001C */ sw $a1, 0x001C($sp) -/* 01224 80A3B974 0C021344 */ jal Item_Give -/* 01228 80A3B978 24050021 */ addiu $a1, $zero, 0x0021 ## $a1 = 00000021 -/* 0122C 80A3B97C 8FAE001C */ lw $t6, 0x001C($sp) -/* 01230 80A3B980 85C401C8 */ lh $a0, 0x01C8($t6) ## 000001C8 -/* 01234 80A3B984 00042023 */ subu $a0, $zero, $a0 -/* 01238 80A3B988 00042400 */ sll $a0, $a0, 16 -/* 0123C 80A3B98C 0C021CC3 */ jal Rupees_ChangeBy -/* 01240 80A3B990 00042403 */ sra $a0, $a0, 16 -/* 01244 80A3B994 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01248 80A3B998 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0124C 80A3B99C 03E00008 */ jr $ra -/* 01250 80A3B9A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9A4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9A4.s deleted file mode 100644 index d66ef84b82..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9A4.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80A3B9A4 -/* 01254 80A3B9A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01258 80A3B9A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0125C 80A3B9AC AFA40018 */ sw $a0, 0x0018($sp) -/* 01260 80A3B9B0 84A401C8 */ lh $a0, 0x01C8($a1) ## 000001C8 -/* 01264 80A3B9B4 00042023 */ subu $a0, $zero, $a0 -/* 01268 80A3B9B8 00042400 */ sll $a0, $a0, 16 -/* 0126C 80A3B9BC 0C021CC3 */ jal Rupees_ChangeBy -/* 01270 80A3B9C0 00042403 */ sra $a0, $a0, 16 -/* 01274 80A3B9C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01278 80A3B9C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0127C 80A3B9CC 03E00008 */ jr $ra -/* 01280 80A3B9D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9D4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9D4.s deleted file mode 100644 index 1055b7ca76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9D4.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80A3B9D4 -/* 01284 80A3B9D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01288 80A3B9D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0128C 80A3B9DC AFA40018 */ sw $a0, 0x0018($sp) -/* 01290 80A3B9E0 84A401C8 */ lh $a0, 0x01C8($a1) ## 000001C8 -/* 01294 80A3B9E4 00042023 */ subu $a0, $zero, $a0 -/* 01298 80A3B9E8 00042400 */ sll $a0, $a0, 16 -/* 0129C 80A3B9EC 0C021CC3 */ jal Rupees_ChangeBy -/* 012A0 80A3B9F0 00042403 */ sra $a0, $a0, 16 -/* 012A4 80A3B9F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012A8 80A3B9F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012AC 80A3B9FC 03E00008 */ jr $ra -/* 012B0 80A3BA00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA04.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA04.s deleted file mode 100644 index f2d2874a0c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA04.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A3BA04 -/* 012B4 80A3BA04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012B8 80A3BA08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012BC 80A3BA0C AFA5001C */ sw $a1, 0x001C($sp) -/* 012C0 80A3BA10 0C021344 */ jal Item_Give -/* 012C4 80A3BA14 24050095 */ addiu $a1, $zero, 0x0095 ## $a1 = 00000095 -/* 012C8 80A3BA18 8FAE001C */ lw $t6, 0x001C($sp) -/* 012CC 80A3BA1C 85C401C8 */ lh $a0, 0x01C8($t6) ## 000001C8 -/* 012D0 80A3BA20 00042023 */ subu $a0, $zero, $a0 -/* 012D4 80A3BA24 00042400 */ sll $a0, $a0, 16 -/* 012D8 80A3BA28 0C021CC3 */ jal Rupees_ChangeBy -/* 012DC 80A3BA2C 00042403 */ sra $a0, $a0, 16 -/* 012E0 80A3BA30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012E4 80A3BA34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012E8 80A3BA38 03E00008 */ jr $ra -/* 012EC 80A3BA3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA40.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA40.s deleted file mode 100644 index 50d548b91a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA40.s +++ /dev/null @@ -1,98 +0,0 @@ -.late_rodata -glabel jtbl_80A3D0D8 -.word L80A3BAFC -.word L80A3BB0C -.word L80A3BB1C -.word L80A3BB2C -.word L80A3BB3C - -.text -glabel func_80A3BA40 -/* 012F0 80A3BA40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012F4 80A3BA44 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012F8 80A3BA48 AFA5001C */ sw $a1, 0x001C($sp) -/* 012FC 80A3BA4C 84A2001C */ lh $v0, 0x001C($a1) ## 0000001C -/* 01300 80A3BA50 2841000A */ slti $at, $v0, 0x000A -/* 01304 80A3BA54 14200010 */ bne $at, $zero, .L80A3BA98 -/* 01308 80A3BA58 244FFFD9 */ addiu $t7, $v0, 0xFFD9 ## $t7 = FFFFFFD9 -/* 0130C 80A3BA5C 2841000B */ slti $at, $v0, 0x000B -/* 01310 80A3BA60 14200008 */ bne $at, $zero, .L80A3BA84 -/* 01314 80A3BA64 2DE10005 */ sltiu $at, $t7, 0x0005 -/* 01318 80A3BA68 10200036 */ beq $at, $zero, .L80A3BB44 -/* 0131C 80A3BA6C 000F7880 */ sll $t7, $t7, 2 -/* 01320 80A3BA70 3C0180A4 */ lui $at, %hi(jtbl_80A3D0D8) ## $at = 80A40000 -/* 01324 80A3BA74 002F0821 */ addu $at, $at, $t7 -/* 01328 80A3BA78 8C2FD0D8 */ lw $t7, %lo(jtbl_80A3D0D8)($at) -/* 0132C 80A3BA7C 01E00008 */ jr $t7 -/* 01330 80A3BA80 00000000 */ nop -.L80A3BA84: -/* 01334 80A3BA84 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01338 80A3BA88 10410018 */ beq $v0, $at, .L80A3BAEC -/* 0133C 80A3BA8C 00000000 */ nop -/* 01340 80A3BA90 1000002D */ beq $zero, $zero, .L80A3BB48 -/* 01344 80A3BA94 8FB8001C */ lw $t8, 0x001C($sp) -.L80A3BA98: -/* 01348 80A3BA98 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0134C 80A3BA9C 10410007 */ beq $v0, $at, .L80A3BABC -/* 01350 80A3BAA0 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01354 80A3BAA4 10410009 */ beq $v0, $at, .L80A3BACC -/* 01358 80A3BAA8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0135C 80A3BAAC 1041000B */ beq $v0, $at, .L80A3BADC -/* 01360 80A3BAB0 00000000 */ nop -/* 01364 80A3BAB4 10000024 */ beq $zero, $zero, .L80A3BB48 -/* 01368 80A3BAB8 8FB8001C */ lw $t8, 0x001C($sp) -.L80A3BABC: -/* 0136C 80A3BABC 0C021344 */ jal Item_Give -/* 01370 80A3BAC0 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 -/* 01374 80A3BAC4 10000020 */ beq $zero, $zero, .L80A3BB48 -/* 01378 80A3BAC8 8FB8001C */ lw $t8, 0x001C($sp) -.L80A3BACC: -/* 0137C 80A3BACC 0C021344 */ jal Item_Give -/* 01380 80A3BAD0 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015 -/* 01384 80A3BAD4 1000001C */ beq $zero, $zero, .L80A3BB48 -/* 01388 80A3BAD8 8FB8001C */ lw $t8, 0x001C($sp) -.L80A3BADC: -/* 0138C 80A3BADC 0C021344 */ jal Item_Give -/* 01390 80A3BAE0 24050016 */ addiu $a1, $zero, 0x0016 ## $a1 = 00000016 -/* 01394 80A3BAE4 10000018 */ beq $zero, $zero, .L80A3BB48 -/* 01398 80A3BAE8 8FB8001C */ lw $t8, 0x001C($sp) -.L80A3BAEC: -/* 0139C 80A3BAEC 0C021344 */ jal Item_Give -/* 013A0 80A3BAF0 24050017 */ addiu $a1, $zero, 0x0017 ## $a1 = 00000017 -/* 013A4 80A3BAF4 10000014 */ beq $zero, $zero, .L80A3BB48 -/* 013A8 80A3BAF8 8FB8001C */ lw $t8, 0x001C($sp) -glabel L80A3BAFC -/* 013AC 80A3BAFC 0C021344 */ jal Item_Give -/* 013B0 80A3BB00 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 013B4 80A3BB04 10000010 */ beq $zero, $zero, .L80A3BB48 -/* 013B8 80A3BB08 8FB8001C */ lw $t8, 0x001C($sp) -glabel L80A3BB0C -/* 013BC 80A3BB0C 0C021344 */ jal Item_Give -/* 013C0 80A3BB10 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D -/* 013C4 80A3BB14 1000000C */ beq $zero, $zero, .L80A3BB48 -/* 013C8 80A3BB18 8FB8001C */ lw $t8, 0x001C($sp) -glabel L80A3BB1C -/* 013CC 80A3BB1C 0C021344 */ jal Item_Give -/* 013D0 80A3BB20 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 013D4 80A3BB24 10000008 */ beq $zero, $zero, .L80A3BB48 -/* 013D8 80A3BB28 8FB8001C */ lw $t8, 0x001C($sp) -glabel L80A3BB2C -/* 013DC 80A3BB2C 0C021344 */ jal Item_Give -/* 013E0 80A3BB30 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 013E4 80A3BB34 10000004 */ beq $zero, $zero, .L80A3BB48 -/* 013E8 80A3BB38 8FB8001C */ lw $t8, 0x001C($sp) -glabel L80A3BB3C -/* 013EC 80A3BB3C 0C021344 */ jal Item_Give -/* 013F0 80A3BB40 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018 -.L80A3BB44: -/* 013F4 80A3BB44 8FB8001C */ lw $t8, 0x001C($sp) -.L80A3BB48: -/* 013F8 80A3BB48 870401C8 */ lh $a0, 0x01C8($t8) ## 000001C8 -/* 013FC 80A3BB4C 00042023 */ subu $a0, $zero, $a0 -/* 01400 80A3BB50 00042400 */ sll $a0, $a0, 16 -/* 01404 80A3BB54 0C021CC3 */ jal Rupees_ChangeBy -/* 01408 80A3BB58 00042403 */ sra $a0, $a0, 16 -/* 0140C 80A3BB5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01410 80A3BB60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01414 80A3BB64 03E00008 */ jr $ra -/* 01418 80A3BB68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s deleted file mode 100644 index 5a10bffd79..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s +++ /dev/null @@ -1,49 +0,0 @@ -.late_rodata -glabel D_80A3D0EC - .float 7.9 - -.text -glabel func_80A3BB6C -/* 0141C 80A3BB6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01420 80A3BB70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01424 80A3BB74 AFA40018 */ sw $a0, 0x0018($sp) -/* 01428 80A3BB78 84AE001C */ lh $t6, 0x001C($a1) ## 0000001C -/* 0142C 80A3BB7C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01430 80A3BB80 3C0F8016 */ lui $t7, %hi(gSaveContext+0xf06) -/* 01434 80A3BB84 55C10019 */ bnel $t6, $at, .L80A3BBEC -/* 01438 80A3BB88 84A401C8 */ lh $a0, 0x01C8($a1) ## 000001C8 -/* 0143C 80A3BB8C 95EFF566 */ lhu $t7, %lo(gSaveContext+0xf06)($t7) -/* 01440 80A3BB90 3C0180A4 */ lui $at, %hi(D_80A3D0EC) ## $at = 80A40000 -/* 01444 80A3BB94 31F80040 */ andi $t8, $t7, 0x0040 ## $t8 = 00000000 -/* 01448 80A3BB98 53000014 */ beql $t8, $zero, .L80A3BBEC -/* 0144C 80A3BB9C 84A401C8 */ lh $a0, 0x01C8($a1) ## 000001C8 -/* 01450 80A3BBA0 C42CD0EC */ lwc1 $f12, %lo(D_80A3D0EC)($at) -/* 01454 80A3BBA4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01458 80A3BBA8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0145C 80A3BBAC 4600010D */ trunc.w.s $f4, $f0 -/* 01460 80A3BBB0 8FA5001C */ lw $a1, 0x001C($sp) -/* 01464 80A3BBB4 3C0B80A4 */ lui $t3, %hi(D_80A3CCB4) ## $t3 = 80A40000 -/* 01468 80A3BBB8 44092000 */ mfc1 $t1, $f4 -/* 0146C 80A3BBBC 84B901C8 */ lh $t9, 0x01C8($a1) ## 000001C8 -/* 01470 80A3BBC0 00095040 */ sll $t2, $t1, 1 -/* 01474 80A3BBC4 016A5821 */ addu $t3, $t3, $t2 -/* 01478 80A3BBC8 856BCCB4 */ lh $t3, %lo(D_80A3CCB4)($t3) -/* 0147C 80A3BBCC 032B2023 */ subu $a0, $t9, $t3 -/* 01480 80A3BBD0 00042023 */ subu $a0, $zero, $a0 -/* 01484 80A3BBD4 00042400 */ sll $a0, $a0, 16 -/* 01488 80A3BBD8 0C021CC3 */ jal Rupees_ChangeBy -/* 0148C 80A3BBDC 00042403 */ sra $a0, $a0, 16 -/* 01490 80A3BBE0 10000007 */ beq $zero, $zero, .L80A3BC00 -/* 01494 80A3BBE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01498 80A3BBE8 84A401C8 */ lh $a0, 0x01C8($a1) ## 000001C8 -.L80A3BBEC: -/* 0149C 80A3BBEC 00042023 */ subu $a0, $zero, $a0 -/* 014A0 80A3BBF0 00042400 */ sll $a0, $a0, 16 -/* 014A4 80A3BBF4 0C021CC3 */ jal Rupees_ChangeBy -/* 014A8 80A3BBF8 00042403 */ sra $a0, $a0, 16 -/* 014AC 80A3BBFC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A3BC00: -/* 014B0 80A3BC00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014B4 80A3BC04 03E00008 */ jr $ra -/* 014B8 80A3BC08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC0C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC0C.s deleted file mode 100644 index 83c5315d49..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC0C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80A3BC0C -/* 014BC 80A3BC0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014C0 80A3BC10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 014C4 80A3BC14 AFA40018 */ sw $a0, 0x0018($sp) -/* 014C8 80A3BC18 84A401C8 */ lh $a0, 0x01C8($a1) ## 000001C8 -/* 014CC 80A3BC1C 00042023 */ subu $a0, $zero, $a0 -/* 014D0 80A3BC20 00042400 */ sll $a0, $a0, 16 -/* 014D4 80A3BC24 0C021CC3 */ jal Rupees_ChangeBy -/* 014D8 80A3BC28 00042403 */ sra $a0, $a0, 16 -/* 014DC 80A3BC2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014E0 80A3BC30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014E4 80A3BC34 03E00008 */ jr $ra -/* 014E8 80A3BC38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC3C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC3C.s deleted file mode 100644 index 42cdd43598..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC3C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80A3BC3C -/* 014EC 80A3BC3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014F0 80A3BC40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 014F4 80A3BC44 AFA40018 */ sw $a0, 0x0018($sp) -/* 014F8 80A3BC48 84A401C8 */ lh $a0, 0x01C8($a1) ## 000001C8 -/* 014FC 80A3BC4C 00042023 */ subu $a0, $zero, $a0 -/* 01500 80A3BC50 00042400 */ sll $a0, $a0, 16 -/* 01504 80A3BC54 0C021CC3 */ jal Rupees_ChangeBy -/* 01508 80A3BC58 00042403 */ sra $a0, $a0, 16 -/* 0150C 80A3BC5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01510 80A3BC60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01514 80A3BC64 03E00008 */ jr $ra -/* 01518 80A3BC68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s deleted file mode 100644 index b1ee45f137..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s +++ /dev/null @@ -1,91 +0,0 @@ -.late_rodata -glabel jtbl_80A3D0F0 -.word L80A3BD18 -.word L80A3BD30 -.word L80A3BD48 -.word L80A3BCA0 -.word L80A3BCB8 -.word L80A3BCD0 -.word L80A3BCE8 -.word L80A3BD00 - -.text -glabel func_80A3BC6C -/* 0151C 80A3BC6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01520 80A3BC70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01524 80A3BC74 AFA40018 */ sw $a0, 0x0018($sp) -/* 01528 80A3BC78 84AE001C */ lh $t6, 0x001C($a1) ## 0000001C -/* 0152C 80A3BC7C 25CFFFEB */ addiu $t7, $t6, 0xFFEB ## $t7 = FFFFFFEB -/* 01530 80A3BC80 2DE10008 */ sltiu $at, $t7, 0x0008 -/* 01534 80A3BC84 10200035 */ beq $at, $zero, .L80A3BD5C -/* 01538 80A3BC88 000F7880 */ sll $t7, $t7, 2 -/* 0153C 80A3BC8C 3C0180A4 */ lui $at, %hi(jtbl_80A3D0F0) ## $at = 80A40000 -/* 01540 80A3BC90 002F0821 */ addu $at, $at, $t7 -/* 01544 80A3BC94 8C2FD0F0 */ lw $t7, %lo(jtbl_80A3D0F0)($at) -/* 01548 80A3BC98 01E00008 */ jr $t7 -/* 0154C 80A3BC9C 00000000 */ nop -glabel L80A3BCA0 -/* 01550 80A3BCA0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01554 80A3BCA4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01558 80A3BCA8 94580EF0 */ lhu $t8, 0x0EF0($v0) ## 8015F550 -/* 0155C 80A3BCAC 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 -/* 01560 80A3BCB0 1000002A */ beq $zero, $zero, .L80A3BD5C -/* 01564 80A3BCB4 A4590EF0 */ sh $t9, 0x0EF0($v0) ## 8015F550 -glabel L80A3BCB8 -/* 01568 80A3BCB8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0156C 80A3BCBC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01570 80A3BCC0 94480EF0 */ lhu $t0, 0x0EF0($v0) ## 8015F550 -/* 01574 80A3BCC4 35090080 */ ori $t1, $t0, 0x0080 ## $t1 = 00000080 -/* 01578 80A3BCC8 10000024 */ beq $zero, $zero, .L80A3BD5C -/* 0157C 80A3BCCC A4490EF0 */ sh $t1, 0x0EF0($v0) ## 8015F550 -glabel L80A3BCD0 -/* 01580 80A3BCD0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01584 80A3BCD4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01588 80A3BCD8 944A0EF0 */ lhu $t2, 0x0EF0($v0) ## 8015F550 -/* 0158C 80A3BCDC 354B0100 */ ori $t3, $t2, 0x0100 ## $t3 = 00000100 -/* 01590 80A3BCE0 1000001E */ beq $zero, $zero, .L80A3BD5C -/* 01594 80A3BCE4 A44B0EF0 */ sh $t3, 0x0EF0($v0) ## 8015F550 -glabel L80A3BCE8 -/* 01598 80A3BCE8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0159C 80A3BCEC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 015A0 80A3BCF0 944C0EF0 */ lhu $t4, 0x0EF0($v0) ## 8015F550 -/* 015A4 80A3BCF4 358D0200 */ ori $t5, $t4, 0x0200 ## $t5 = 00000200 -/* 015A8 80A3BCF8 10000018 */ beq $zero, $zero, .L80A3BD5C -/* 015AC 80A3BCFC A44D0EF0 */ sh $t5, 0x0EF0($v0) ## 8015F550 -glabel L80A3BD00 -/* 015B0 80A3BD00 3C028016 */ lui $v0, %hi(gSaveContext) -/* 015B4 80A3BD04 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 015B8 80A3BD08 944E0EF0 */ lhu $t6, 0x0EF0($v0) ## 8015F550 -/* 015BC 80A3BD0C 35CF0400 */ ori $t7, $t6, 0x0400 ## $t7 = 00000400 -/* 015C0 80A3BD10 10000012 */ beq $zero, $zero, .L80A3BD5C -/* 015C4 80A3BD14 A44F0EF0 */ sh $t7, 0x0EF0($v0) ## 8015F550 -glabel L80A3BD18 -/* 015C8 80A3BD18 3C028016 */ lui $v0, %hi(gSaveContext) -/* 015CC 80A3BD1C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 015D0 80A3BD20 94580EF0 */ lhu $t8, 0x0EF0($v0) ## 8015F550 -/* 015D4 80A3BD24 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 -/* 015D8 80A3BD28 1000000C */ beq $zero, $zero, .L80A3BD5C -/* 015DC 80A3BD2C A4590EF0 */ sh $t9, 0x0EF0($v0) ## 8015F550 -glabel L80A3BD30 -/* 015E0 80A3BD30 3C028016 */ lui $v0, %hi(gSaveContext) -/* 015E4 80A3BD34 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 015E8 80A3BD38 94480EF0 */ lhu $t0, 0x0EF0($v0) ## 8015F550 -/* 015EC 80A3BD3C 35090010 */ ori $t1, $t0, 0x0010 ## $t1 = 00000010 -/* 015F0 80A3BD40 10000006 */ beq $zero, $zero, .L80A3BD5C -/* 015F4 80A3BD44 A4490EF0 */ sh $t1, 0x0EF0($v0) ## 8015F550 -glabel L80A3BD48 -/* 015F8 80A3BD48 3C028016 */ lui $v0, %hi(gSaveContext) -/* 015FC 80A3BD4C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01600 80A3BD50 944A0EF0 */ lhu $t2, 0x0EF0($v0) ## 8015F550 -/* 01604 80A3BD54 354B0020 */ ori $t3, $t2, 0x0020 ## $t3 = 00000020 -/* 01608 80A3BD58 A44B0EF0 */ sh $t3, 0x0EF0($v0) ## 8015F550 -.L80A3BD5C: -/* 0160C 80A3BD5C 84A401C8 */ lh $a0, 0x01C8($a1) ## 000001C8 -/* 01610 80A3BD60 00042023 */ subu $a0, $zero, $a0 -/* 01614 80A3BD64 00042400 */ sll $a0, $a0, 16 -/* 01618 80A3BD68 0C021CC3 */ jal Rupees_ChangeBy -/* 0161C 80A3BD6C 00042403 */ sra $a0, $a0, 16 -/* 01620 80A3BD70 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01624 80A3BD74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01628 80A3BD78 03E00008 */ jr $ra -/* 0162C 80A3BD7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD80.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD80.s deleted file mode 100644 index 1a9963fa97..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD80.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80A3BD80 -/* 01630 80A3BD80 AFA40000 */ sw $a0, 0x0000($sp) -/* 01634 80A3BD84 03E00008 */ jr $ra -/* 01638 80A3BD88 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s deleted file mode 100644 index c006924379..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s +++ /dev/null @@ -1,91 +0,0 @@ -.late_rodata -glabel jtbl_80A3D110 -.word L80A3BDE0 -.word L80A3BDFC -.word L80A3BE18 -.word L80A3BE34 -.word L80A3BE50 - -.text -glabel func_80A3BD8C -/* 0163C 80A3BD8C AFA40000 */ sw $a0, 0x0000($sp) -/* 01640 80A3BD90 84A3001C */ lh $v1, 0x001C($a1) ## 0000001C -/* 01644 80A3BD94 3C0F80A4 */ lui $t7, %hi(D_80A3C674) ## $t7 = 80A40000 -/* 01648 80A3BD98 25EFC674 */ addiu $t7, $t7, %lo(D_80A3C674) ## $t7 = 80A3C674 -/* 0164C 80A3BD9C 00037140 */ sll $t6, $v1, 5 -/* 01650 80A3BDA0 2861001E */ slti $at, $v1, 0x001E -/* 01654 80A3BDA4 1420003A */ bne $at, $zero, .L80A3BE90 -/* 01658 80A3BDA8 01CF1021 */ addu $v0, $t6, $t7 -/* 0165C 80A3BDAC 28610023 */ slti $at, $v1, 0x0023 -/* 01660 80A3BDB0 10200037 */ beq $at, $zero, .L80A3BE90 -/* 01664 80A3BDB4 2464FFE2 */ addiu $a0, $v1, 0xFFE2 ## $a0 = FFFFFFE2 -/* 01668 80A3BDB8 2478FFE2 */ addiu $t8, $v1, 0xFFE2 ## $t8 = FFFFFFE2 -/* 0166C 80A3BDBC 2F010005 */ sltiu $at, $t8, 0x0005 -/* 01670 80A3BDC0 10200029 */ beq $at, $zero, .L80A3BE68 -/* 01674 80A3BDC4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01678 80A3BDC8 0018C080 */ sll $t8, $t8, 2 -/* 0167C 80A3BDCC 3C0180A4 */ lui $at, %hi(jtbl_80A3D110) ## $at = 80A40000 -/* 01680 80A3BDD0 00380821 */ addu $at, $at, $t8 -/* 01684 80A3BDD4 8C38D110 */ lw $t8, %lo(jtbl_80A3D110)($at) -/* 01688 80A3BDD8 03000008 */ jr $t8 -/* 0168C 80A3BDDC 00000000 */ nop -glabel L80A3BDE0 -/* 01690 80A3BDE0 3C198016 */ lui $t9, %hi(gSaveContext+0xef6) -/* 01694 80A3BDE4 9739F556 */ lhu $t9, %lo(gSaveContext+0xef6)($t9) -/* 01698 80A3BDE8 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 -/* 0169C 80A3BDEC 1100001E */ beq $t0, $zero, .L80A3BE68 -/* 016A0 80A3BDF0 00000000 */ nop -/* 016A4 80A3BDF4 1000001C */ beq $zero, $zero, .L80A3BE68 -/* 016A8 80A3BDF8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -glabel L80A3BDFC -/* 016AC 80A3BDFC 3C098016 */ lui $t1, %hi(gSaveContext+0xef6) -/* 016B0 80A3BE00 9529F556 */ lhu $t1, %lo(gSaveContext+0xef6)($t1) -/* 016B4 80A3BE04 312A0400 */ andi $t2, $t1, 0x0400 ## $t2 = 00000000 -/* 016B8 80A3BE08 11400017 */ beq $t2, $zero, .L80A3BE68 -/* 016BC 80A3BE0C 00000000 */ nop -/* 016C0 80A3BE10 10000015 */ beq $zero, $zero, .L80A3BE68 -/* 016C4 80A3BE14 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -glabel L80A3BE18 -/* 016C8 80A3BE18 3C0B8016 */ lui $t3, %hi(gSaveContext+0xef6) -/* 016CC 80A3BE1C 956BF556 */ lhu $t3, %lo(gSaveContext+0xef6)($t3) -/* 016D0 80A3BE20 316C0200 */ andi $t4, $t3, 0x0200 ## $t4 = 00000000 -/* 016D4 80A3BE24 11800010 */ beq $t4, $zero, .L80A3BE68 -/* 016D8 80A3BE28 00000000 */ nop -/* 016DC 80A3BE2C 1000000E */ beq $zero, $zero, .L80A3BE68 -/* 016E0 80A3BE30 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -glabel L80A3BE34 -/* 016E4 80A3BE34 3C0D8016 */ lui $t5, %hi(gSaveContext+0xef6) -/* 016E8 80A3BE38 95ADF556 */ lhu $t5, %lo(gSaveContext+0xef6)($t5) -/* 016EC 80A3BE3C 31AE0800 */ andi $t6, $t5, 0x0800 ## $t6 = 00000000 -/* 016F0 80A3BE40 11C00009 */ beq $t6, $zero, .L80A3BE68 -/* 016F4 80A3BE44 00000000 */ nop -/* 016F8 80A3BE48 10000007 */ beq $zero, $zero, .L80A3BE68 -/* 016FC 80A3BE4C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -glabel L80A3BE50 -/* 01700 80A3BE50 3C0F8016 */ lui $t7, %hi(gSaveContext+0xef6) -/* 01704 80A3BE54 95EFF556 */ lhu $t7, %lo(gSaveContext+0xef6)($t7) -/* 01708 80A3BE58 31F80800 */ andi $t8, $t7, 0x0800 ## $t8 = 00000000 -/* 0170C 80A3BE5C 13000002 */ beq $t8, $zero, .L80A3BE68 -/* 01710 80A3BE60 00000000 */ nop -/* 01714 80A3BE64 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L80A3BE68: -/* 01718 80A3BE68 10C00006 */ beq $a2, $zero, .L80A3BE84 -/* 0171C 80A3BE6C 0004C840 */ sll $t9, $a0, 1 -/* 01720 80A3BE70 3C0880A4 */ lui $t0, %hi(D_80A3C668) ## $t0 = 80A40000 -/* 01724 80A3BE74 01194021 */ addu $t0, $t0, $t9 -/* 01728 80A3BE78 9508C668 */ lhu $t0, %lo(D_80A3C668)($t0) -/* 0172C 80A3BE7C 10000006 */ beq $zero, $zero, .L80A3BE98 -/* 01730 80A3BE80 A4A8010E */ sh $t0, 0x010E($a1) ## 0000010E -.L80A3BE84: -/* 01734 80A3BE84 9449000C */ lhu $t1, 0x000C($v0) ## 0000000C -/* 01738 80A3BE88 10000003 */ beq $zero, $zero, .L80A3BE98 -/* 0173C 80A3BE8C A4A9010E */ sh $t1, 0x010E($a1) ## 0000010E -.L80A3BE90: -/* 01740 80A3BE90 944A000C */ lhu $t2, 0x000C($v0) ## 0000000C -/* 01744 80A3BE94 A4AA010E */ sh $t2, 0x010E($a1) ## 0000010E -.L80A3BE98: -/* 01748 80A3BE98 3C0B80A4 */ lui $t3, %hi(func_80A3C4D4) ## $t3 = 80A40000 -/* 0174C 80A3BE9C 256BC4D4 */ addiu $t3, $t3, %lo(func_80A3C4D4) ## $t3 = 80A3C4D4 -/* 01750 80A3BEA0 A4A001A8 */ sh $zero, 0x01A8($a1) ## 000001A8 -/* 01754 80A3BEA4 03E00008 */ jr $ra -/* 01758 80A3BEA8 ACAB0134 */ sw $t3, 0x0134($a1) ## 00000134 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEAC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEAC.s deleted file mode 100644 index a06bd5a34e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEAC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80A3BEAC -/* 0175C 80A3BEAC AFA40000 */ sw $a0, 0x0000($sp) -/* 01760 80A3BEB0 84A2001C */ lh $v0, 0x001C($a1) ## 0000001C -/* 01764 80A3BEB4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01768 80A3BEB8 A4AE01A8 */ sh $t6, 0x01A8($a1) ## 000001A8 -/* 0176C 80A3BEBC 2841001E */ slti $at, $v0, 0x001E -/* 01770 80A3BEC0 14200005 */ bne $at, $zero, .L80A3BED8 -/* 01774 80A3BEC4 ACA00134 */ sw $zero, 0x0134($a1) ## 00000134 -/* 01778 80A3BEC8 28410026 */ slti $at, $v0, 0x0026 -/* 0177C 80A3BECC 10200002 */ beq $at, $zero, .L80A3BED8 -/* 01780 80A3BED0 240F00BD */ addiu $t7, $zero, 0x00BD ## $t7 = 000000BD -/* 01784 80A3BED4 A4AF010E */ sh $t7, 0x010E($a1) ## 0000010E -.L80A3BED8: -/* 01788 80A3BED8 03E00008 */ jr $ra -/* 0178C 80A3BEDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEE0.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEE0.s deleted file mode 100644 index 571adc2450..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEE0.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80A3BEE0 -/* 01790 80A3BEE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01794 80A3BEE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01798 80A3BEE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0179C 80A3BEEC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 017A0 80A3BEF0 0C28E9D6 */ jal func_80A3A758 -/* 017A4 80A3BEF4 AFA5001C */ sw $a1, 0x001C($sp) -/* 017A8 80A3BEF8 1040000E */ beq $v0, $zero, .L80A3BF34 -/* 017AC 80A3BEFC 8FA6001C */ lw $a2, 0x001C($sp) -/* 017B0 80A3BF00 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 017B4 80A3BF04 8FA50018 */ lw $a1, 0x0018($sp) -/* 017B8 80A3BF08 0C28EA34 */ jal func_80A3A8D0 -/* 017BC 80A3BF0C AFA6001C */ sw $a2, 0x001C($sp) -/* 017C0 80A3BF10 8FA6001C */ lw $a2, 0x001C($sp) -/* 017C4 80A3BF14 3C1880A4 */ lui $t8, %hi(D_80A3C674) ## $t8 = 80A40000 -/* 017C8 80A3BF18 2718C674 */ addiu $t8, $t8, %lo(D_80A3C674) ## $t8 = 80A3C674 -/* 017CC 80A3BF1C 84CE001C */ lh $t6, 0x001C($a2) ## 0000001C -/* 017D0 80A3BF20 000E7940 */ sll $t7, $t6, 5 -/* 017D4 80A3BF24 01F81021 */ addu $v0, $t7, $t8 -/* 017D8 80A3BF28 9459000C */ lhu $t9, 0x000C($v0) ## 0000000C -/* 017DC 80A3BF2C 10000005 */ beq $zero, $zero, .L80A3BF44 -/* 017E0 80A3BF30 A4D9010E */ sh $t9, 0x010E($a2) ## 0000010E -.L80A3BF34: -/* 017E4 80A3BF34 3C0880A4 */ lui $t0, %hi(func_80A3C4D4) ## $t0 = 80A40000 -/* 017E8 80A3BF38 2508C4D4 */ addiu $t0, $t0, %lo(func_80A3C4D4) ## $t0 = 80A3C4D4 -/* 017EC 80A3BF3C A4C001A8 */ sh $zero, 0x01A8($a2) ## 000001A8 -/* 017F0 80A3BF40 ACC80134 */ sw $t0, 0x0134($a2) ## 00000134 -.L80A3BF44: -/* 017F4 80A3BF44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 017F8 80A3BF48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 017FC 80A3BF4C 03E00008 */ jr $ra -/* 01800 80A3BF50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s deleted file mode 100644 index f8bd346673..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80A3BF54 -/* 01804 80A3BF54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01808 80A3BF58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0180C 80A3BF5C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01810 80A3BF60 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01814 80A3BF64 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 01818 80A3BF68 2841001E */ slti $at, $v0, 0x001E -/* 0181C 80A3BF6C 14200018 */ bne $at, $zero, .L80A3BFD0 -/* 01820 80A3BF70 28410026 */ slti $at, $v0, 0x0026 -/* 01824 80A3BF74 10200016 */ beq $at, $zero, .L80A3BFD0 -/* 01828 80A3BF78 2443FFE2 */ addiu $v1, $v0, 0xFFE2 ## $v1 = FFFFFFE2 -/* 0182C 80A3BF7C 3C0E8012 */ lui $t6, %hi(gItemSlots+0x21) -/* 01830 80A3BF80 91CE7485 */ lbu $t6, %lo(gItemSlots+0x21)($t6) -/* 01834 80A3BF84 3C0F8016 */ lui $t7, %hi(gSaveContext+0x74) -/* 01838 80A3BF88 0003C040 */ sll $t8, $v1, 1 -/* 0183C 80A3BF8C 3C1980A4 */ lui $t9, %hi(D_80A3C658) ## $t9 = 80A40000 -/* 01840 80A3BF90 0338C821 */ addu $t9, $t9, $t8 -/* 01844 80A3BF94 01EE7821 */ addu $t7, $t7, $t6 -/* 01848 80A3BF98 91EFE6D4 */ lbu $t7, %lo(gSaveContext+0x74)($t7) -/* 0184C 80A3BF9C 8739C658 */ lh $t9, %lo(D_80A3C658)($t9) -/* 01850 80A3BFA0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01854 80A3BFA4 15F90006 */ bne $t7, $t9, .L80A3BFC0 -/* 01858 80A3BFA8 00000000 */ nop -/* 0185C 80A3BFAC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01860 80A3BFB0 0C28EFAB */ jal func_80A3BEAC -/* 01864 80A3BFB4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01868 80A3BFB8 10000006 */ beq $zero, $zero, .L80A3BFD4 -/* 0186C 80A3BFBC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3BFC0: -/* 01870 80A3BFC0 0C28EF63 */ jal func_80A3BD8C -/* 01874 80A3BFC4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01878 80A3BFC8 10000002 */ beq $zero, $zero, .L80A3BFD4 -/* 0187C 80A3BFCC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A3BFD0: -/* 01880 80A3BFD0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A3BFD4: -/* 01884 80A3BFD4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01888 80A3BFD8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0188C 80A3BFDC 03E00008 */ jr $ra -/* 01890 80A3BFE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s deleted file mode 100644 index 94e4df8bb5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s +++ /dev/null @@ -1,288 +0,0 @@ -.rdata -glabel D_80A3D09C - .asciz "%s(%2d)\n" # %s(%2d) - .balign 4 - -.late_rodata -glabel jtbl_80A3D124 -.word L80A3C05C -.word L80A3C0AC -.word L80A3C0FC -.word L80A3C14C -.word L80A3C19C -.word L80A3C1F4 -.word L80A3C218 -.word L80A3C23C - -.text -glabel func_80A3BFE4 -/* 01894 80A3BFE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01898 80A3BFE8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0189C 80A3BFEC AFBF001C */ sw $ra, 0x001C($sp) -/* 018A0 80A3BFF0 AFA50034 */ sw $a1, 0x0034($sp) -/* 018A4 80A3BFF4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 018A8 80A3BFF8 8486001C */ lh $a2, 0x001C($a0) ## 0000001C -/* 018AC 80A3BFFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 018B0 80A3C000 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 018B4 80A3C004 00A12021 */ addu $a0, $a1, $at -/* 018B8 80A3C008 82050194 */ lb $a1, 0x0194($s0) ## 00000194 -/* 018BC 80A3C00C 0C026062 */ jal Object_IsLoaded - -/* 018C0 80A3C010 A7A6002E */ sh $a2, 0x002E($sp) -/* 018C4 80A3C014 104000E4 */ beq $v0, $zero, .L80A3C3A8 -/* 018C8 80A3C018 87A6002E */ lh $a2, 0x002E($sp) -/* 018CC 80A3C01C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 018D0 80A3C020 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 018D4 80A3C024 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 018D8 80A3C028 82180194 */ lb $t8, 0x0194($s0) ## 00000194 -/* 018DC 80A3C02C 01C17824 */ and $t7, $t6, $at -/* 018E0 80A3C030 2728FFE2 */ addiu $t0, $t9, 0xFFE2 ## $t0 = FFFFFFE2 -/* 018E4 80A3C034 2D010008 */ sltiu $at, $t0, 0x0008 -/* 018E8 80A3C038 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 018EC 80A3C03C 10200088 */ beq $at, $zero, .L80A3C260 -/* 018F0 80A3C040 A218001E */ sb $t8, 0x001E($s0) ## 0000001E -/* 018F4 80A3C044 00084080 */ sll $t0, $t0, 2 -/* 018F8 80A3C048 3C0180A4 */ lui $at, %hi(jtbl_80A3D124) ## $at = 80A40000 -/* 018FC 80A3C04C 00280821 */ addu $at, $at, $t0 -/* 01900 80A3C050 8C28D124 */ lw $t0, %lo(jtbl_80A3D124)($at) -/* 01904 80A3C054 01000008 */ jr $t0 -/* 01908 80A3C058 00000000 */ nop -glabel L80A3C05C -/* 0190C 80A3C05C 3C098016 */ lui $t1, %hi(gSaveContext+0xef6) -/* 01910 80A3C060 9529F556 */ lhu $t1, %lo(gSaveContext+0xef6)($t1) -/* 01914 80A3C064 3C0F80A4 */ lui $t7, %hi(D_80A3C674) ## $t7 = 80A40000 -/* 01918 80A3C068 25EFC674 */ addiu $t7, $t7, %lo(D_80A3C674) ## $t7 = 80A3C674 -/* 0191C 80A3C06C 312A0100 */ andi $t2, $t1, 0x0100 ## $t2 = 00000000 -/* 01920 80A3C070 11400008 */ beq $t2, $zero, .L80A3C094 -/* 01924 80A3C074 00067140 */ sll $t6, $a2, 5 -/* 01928 80A3C078 3C0D80A4 */ lui $t5, %hi(D_80A3C674) ## $t5 = 80A40000 -/* 0192C 80A3C07C 25ADC674 */ addiu $t5, $t5, %lo(D_80A3C674) ## $t5 = 80A3C674 -/* 01930 80A3C080 240B70B6 */ addiu $t3, $zero, 0x70B6 ## $t3 = 000070B6 -/* 01934 80A3C084 00066140 */ sll $t4, $a2, 5 -/* 01938 80A3C088 018D1821 */ addu $v1, $t4, $t5 -/* 0193C 80A3C08C 10000004 */ beq $zero, $zero, .L80A3C0A0 -/* 01940 80A3C090 A60B010E */ sh $t3, 0x010E($s0) ## 0000010E -.L80A3C094: -/* 01944 80A3C094 01CF1821 */ addu $v1, $t6, $t7 -/* 01948 80A3C098 9478000C */ lhu $t8, 0x000C($v1) ## 0000000C -/* 0194C 80A3C09C A618010E */ sh $t8, 0x010E($s0) ## 0000010E -.L80A3C0A0: -/* 01950 80A3C0A0 9479000E */ lhu $t9, 0x000E($v1) ## 0000000E -/* 01954 80A3C0A4 10000076 */ beq $zero, $zero, .L80A3C280 -/* 01958 80A3C0A8 A61901A0 */ sh $t9, 0x01A0($s0) ## 000001A0 -glabel L80A3C0AC -/* 0195C 80A3C0AC 3C088016 */ lui $t0, %hi(gSaveContext+0xef6) -/* 01960 80A3C0B0 9508F556 */ lhu $t0, %lo(gSaveContext+0xef6)($t0) -/* 01964 80A3C0B4 3C0E80A4 */ lui $t6, %hi(D_80A3C674) ## $t6 = 80A40000 -/* 01968 80A3C0B8 25CEC674 */ addiu $t6, $t6, %lo(D_80A3C674) ## $t6 = 80A3C674 -/* 0196C 80A3C0BC 31090400 */ andi $t1, $t0, 0x0400 ## $t1 = 00000000 -/* 01970 80A3C0C0 11200008 */ beq $t1, $zero, .L80A3C0E4 -/* 01974 80A3C0C4 00066940 */ sll $t5, $a2, 5 -/* 01978 80A3C0C8 3C0C80A4 */ lui $t4, %hi(D_80A3C674) ## $t4 = 80A40000 -/* 0197C 80A3C0CC 258CC674 */ addiu $t4, $t4, %lo(D_80A3C674) ## $t4 = 80A3C674 -/* 01980 80A3C0D0 240A70B5 */ addiu $t2, $zero, 0x70B5 ## $t2 = 000070B5 -/* 01984 80A3C0D4 00065940 */ sll $t3, $a2, 5 -/* 01988 80A3C0D8 016C1821 */ addu $v1, $t3, $t4 -/* 0198C 80A3C0DC 10000004 */ beq $zero, $zero, .L80A3C0F0 -/* 01990 80A3C0E0 A60A010E */ sh $t2, 0x010E($s0) ## 0000010E -.L80A3C0E4: -/* 01994 80A3C0E4 01AE1821 */ addu $v1, $t5, $t6 -/* 01998 80A3C0E8 946F000C */ lhu $t7, 0x000C($v1) ## 0000000C -/* 0199C 80A3C0EC A60F010E */ sh $t7, 0x010E($s0) ## 0000010E -.L80A3C0F0: -/* 019A0 80A3C0F0 9478000E */ lhu $t8, 0x000E($v1) ## 0000000E -/* 019A4 80A3C0F4 10000062 */ beq $zero, $zero, .L80A3C280 -/* 019A8 80A3C0F8 A61801A0 */ sh $t8, 0x01A0($s0) ## 000001A0 -glabel L80A3C0FC -/* 019AC 80A3C0FC 3C198016 */ lui $t9, %hi(gSaveContext+0xef6) -/* 019B0 80A3C100 9739F556 */ lhu $t9, %lo(gSaveContext+0xef6)($t9) -/* 019B4 80A3C104 3C0D80A4 */ lui $t5, %hi(D_80A3C674) ## $t5 = 80A40000 -/* 019B8 80A3C108 25ADC674 */ addiu $t5, $t5, %lo(D_80A3C674) ## $t5 = 80A3C674 -/* 019BC 80A3C10C 33280200 */ andi $t0, $t9, 0x0200 ## $t0 = 00000000 -/* 019C0 80A3C110 11000008 */ beq $t0, $zero, .L80A3C134 -/* 019C4 80A3C114 00066140 */ sll $t4, $a2, 5 -/* 019C8 80A3C118 3C0B80A4 */ lui $t3, %hi(D_80A3C674) ## $t3 = 80A40000 -/* 019CC 80A3C11C 256BC674 */ addiu $t3, $t3, %lo(D_80A3C674) ## $t3 = 80A3C674 -/* 019D0 80A3C120 240970B4 */ addiu $t1, $zero, 0x70B4 ## $t1 = 000070B4 -/* 019D4 80A3C124 00065140 */ sll $t2, $a2, 5 -/* 019D8 80A3C128 014B1821 */ addu $v1, $t2, $t3 -/* 019DC 80A3C12C 10000004 */ beq $zero, $zero, .L80A3C140 -/* 019E0 80A3C130 A609010E */ sh $t1, 0x010E($s0) ## 0000010E -.L80A3C134: -/* 019E4 80A3C134 018D1821 */ addu $v1, $t4, $t5 -/* 019E8 80A3C138 946E000C */ lhu $t6, 0x000C($v1) ## 0000000C -/* 019EC 80A3C13C A60E010E */ sh $t6, 0x010E($s0) ## 0000010E -.L80A3C140: -/* 019F0 80A3C140 946F000E */ lhu $t7, 0x000E($v1) ## 0000000E -/* 019F4 80A3C144 1000004E */ beq $zero, $zero, .L80A3C280 -/* 019F8 80A3C148 A60F01A0 */ sh $t7, 0x01A0($s0) ## 000001A0 -glabel L80A3C14C -/* 019FC 80A3C14C 3C188016 */ lui $t8, %hi(gSaveContext+0xef6) -/* 01A00 80A3C150 9718F556 */ lhu $t8, %lo(gSaveContext+0xef6)($t8) -/* 01A04 80A3C154 3C0C80A4 */ lui $t4, %hi(D_80A3C674) ## $t4 = 80A40000 -/* 01A08 80A3C158 258CC674 */ addiu $t4, $t4, %lo(D_80A3C674) ## $t4 = 80A3C674 -/* 01A0C 80A3C15C 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 01A10 80A3C160 13200008 */ beq $t9, $zero, .L80A3C184 -/* 01A14 80A3C164 00065940 */ sll $t3, $a2, 5 -/* 01A18 80A3C168 3C0A80A4 */ lui $t2, %hi(D_80A3C674) ## $t2 = 80A40000 -/* 01A1C 80A3C16C 254AC674 */ addiu $t2, $t2, %lo(D_80A3C674) ## $t2 = 80A3C674 -/* 01A20 80A3C170 240870B7 */ addiu $t0, $zero, 0x70B7 ## $t0 = 000070B7 -/* 01A24 80A3C174 00064940 */ sll $t1, $a2, 5 -/* 01A28 80A3C178 012A1821 */ addu $v1, $t1, $t2 -/* 01A2C 80A3C17C 10000004 */ beq $zero, $zero, .L80A3C190 -/* 01A30 80A3C180 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -.L80A3C184: -/* 01A34 80A3C184 016C1821 */ addu $v1, $t3, $t4 -/* 01A38 80A3C188 946D000C */ lhu $t5, 0x000C($v1) ## 0000000C -/* 01A3C 80A3C18C A60D010E */ sh $t5, 0x010E($s0) ## 0000010E -.L80A3C190: -/* 01A40 80A3C190 946E000E */ lhu $t6, 0x000E($v1) ## 0000000E -/* 01A44 80A3C194 1000003A */ beq $zero, $zero, .L80A3C280 -/* 01A48 80A3C198 A60E01A0 */ sh $t6, 0x01A0($s0) ## 000001A0 -glabel L80A3C19C -/* 01A4C 80A3C19C 3C0F8016 */ lui $t7, %hi(gSaveContext+0xef6) -/* 01A50 80A3C1A0 95EFF556 */ lhu $t7, %lo(gSaveContext+0xef6)($t7) -/* 01A54 80A3C1A4 3C0C80A4 */ lui $t4, %hi(D_80A3C674) ## $t4 = 80A40000 -/* 01A58 80A3C1A8 258CC674 */ addiu $t4, $t4, %lo(D_80A3C674) ## $t4 = 80A3C674 -/* 01A5C 80A3C1AC 31F80800 */ andi $t8, $t7, 0x0800 ## $t8 = 00000000 -/* 01A60 80A3C1B0 1300000A */ beq $t8, $zero, .L80A3C1DC -/* 01A64 80A3C1B4 00065940 */ sll $t3, $a2, 5 -/* 01A68 80A3C1B8 3C0980A4 */ lui $t1, %hi(D_80A3C674) ## $t1 = 80A40000 -/* 01A6C 80A3C1BC 241970BB */ addiu $t9, $zero, 0x70BB ## $t9 = 000070BB -/* 01A70 80A3C1C0 2529C674 */ addiu $t1, $t1, %lo(D_80A3C674) ## $t1 = 80A3C674 -/* 01A74 80A3C1C4 00064140 */ sll $t0, $a2, 5 -/* 01A78 80A3C1C8 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 01A7C 80A3C1CC 01091821 */ addu $v1, $t0, $t1 -/* 01A80 80A3C1D0 946A000E */ lhu $t2, 0x000E($v1) ## 0000000E -/* 01A84 80A3C1D4 1000002A */ beq $zero, $zero, .L80A3C280 -/* 01A88 80A3C1D8 A60A01A0 */ sh $t2, 0x01A0($s0) ## 000001A0 -.L80A3C1DC: -/* 01A8C 80A3C1DC 016C1821 */ addu $v1, $t3, $t4 -/* 01A90 80A3C1E0 946D000C */ lhu $t5, 0x000C($v1) ## 0000000C -/* 01A94 80A3C1E4 240E00EB */ addiu $t6, $zero, 0x00EB ## $t6 = 000000EB -/* 01A98 80A3C1E8 A60E01A0 */ sh $t6, 0x01A0($s0) ## 000001A0 -/* 01A9C 80A3C1EC 10000024 */ beq $zero, $zero, .L80A3C280 -/* 01AA0 80A3C1F0 A60D010E */ sh $t5, 0x010E($s0) ## 0000010E -glabel L80A3C1F4 -/* 01AA4 80A3C1F4 3C1880A4 */ lui $t8, %hi(D_80A3C674) ## $t8 = 80A40000 -/* 01AA8 80A3C1F8 2718C674 */ addiu $t8, $t8, %lo(D_80A3C674) ## $t8 = 80A3C674 -/* 01AAC 80A3C1FC 00067940 */ sll $t7, $a2, 5 -/* 01AB0 80A3C200 01F81821 */ addu $v1, $t7, $t8 -/* 01AB4 80A3C204 9479000C */ lhu $t9, 0x000C($v1) ## 0000000C -/* 01AB8 80A3C208 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 01ABC 80A3C20C 9468000E */ lhu $t0, 0x000E($v1) ## 0000000E -/* 01AC0 80A3C210 1000001B */ beq $zero, $zero, .L80A3C280 -/* 01AC4 80A3C214 A60801A0 */ sh $t0, 0x01A0($s0) ## 000001A0 -glabel L80A3C218 -/* 01AC8 80A3C218 3C0A80A4 */ lui $t2, %hi(D_80A3C674) ## $t2 = 80A40000 -/* 01ACC 80A3C21C 254AC674 */ addiu $t2, $t2, %lo(D_80A3C674) ## $t2 = 80A3C674 -/* 01AD0 80A3C220 00064940 */ sll $t1, $a2, 5 -/* 01AD4 80A3C224 012A1821 */ addu $v1, $t1, $t2 -/* 01AD8 80A3C228 946B000C */ lhu $t3, 0x000C($v1) ## 0000000C -/* 01ADC 80A3C22C A60B010E */ sh $t3, 0x010E($s0) ## 0000010E -/* 01AE0 80A3C230 946C000E */ lhu $t4, 0x000E($v1) ## 0000000E -/* 01AE4 80A3C234 10000012 */ beq $zero, $zero, .L80A3C280 -/* 01AE8 80A3C238 A60C01A0 */ sh $t4, 0x01A0($s0) ## 000001A0 -glabel L80A3C23C -/* 01AEC 80A3C23C 3C0E80A4 */ lui $t6, %hi(D_80A3C674) ## $t6 = 80A40000 -/* 01AF0 80A3C240 25CEC674 */ addiu $t6, $t6, %lo(D_80A3C674) ## $t6 = 80A3C674 -/* 01AF4 80A3C244 00066940 */ sll $t5, $a2, 5 -/* 01AF8 80A3C248 01AE1821 */ addu $v1, $t5, $t6 -/* 01AFC 80A3C24C 946F000C */ lhu $t7, 0x000C($v1) ## 0000000C -/* 01B00 80A3C250 A60F010E */ sh $t7, 0x010E($s0) ## 0000010E -/* 01B04 80A3C254 9478000E */ lhu $t8, 0x000E($v1) ## 0000000E -/* 01B08 80A3C258 10000009 */ beq $zero, $zero, .L80A3C280 -/* 01B0C 80A3C25C A61801A0 */ sh $t8, 0x01A0($s0) ## 000001A0 -.L80A3C260: -/* 01B10 80A3C260 3C0880A4 */ lui $t0, %hi(D_80A3C674) ## $t0 = 80A40000 -/* 01B14 80A3C264 2508C674 */ addiu $t0, $t0, %lo(D_80A3C674) ## $t0 = 80A3C674 -/* 01B18 80A3C268 0006C940 */ sll $t9, $a2, 5 -/* 01B1C 80A3C26C 03281821 */ addu $v1, $t9, $t0 -/* 01B20 80A3C270 9469000C */ lhu $t1, 0x000C($v1) ## 0000000C -/* 01B24 80A3C274 A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 01B28 80A3C278 946A000E */ lhu $t2, 0x000E($v1) ## 0000000E -/* 01B2C 80A3C27C A60A01A0 */ sh $t2, 0x01A0($s0) ## 000001A0 -.L80A3C280: -/* 01B30 80A3C280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B34 80A3C284 8FA50034 */ lw $a1, 0x0034($sp) -/* 01B38 80A3C288 AFA30024 */ sw $v1, 0x0024($sp) -/* 01B3C 80A3C28C 0C28EFD5 */ jal func_80A3BF54 -/* 01B40 80A3C290 A7A6002E */ sh $a2, 0x002E($sp) -/* 01B44 80A3C294 8FA30024 */ lw $v1, 0x0024($sp) -/* 01B48 80A3C298 14400008 */ bne $v0, $zero, .L80A3C2BC -/* 01B4C 80A3C29C 87A6002E */ lh $a2, 0x002E($sp) -/* 01B50 80A3C2A0 8FA40034 */ lw $a0, 0x0034($sp) -/* 01B54 80A3C2A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01B58 80A3C2A8 AFA30024 */ sw $v1, 0x0024($sp) -/* 01B5C 80A3C2AC 0C28EF63 */ jal func_80A3BD8C -/* 01B60 80A3C2B0 A7A6002E */ sh $a2, 0x002E($sp) -/* 01B64 80A3C2B4 8FA30024 */ lw $v1, 0x0024($sp) -/* 01B68 80A3C2B8 87A6002E */ lh $a2, 0x002E($sp) -.L80A3C2BC: -/* 01B6C 80A3C2BC 3C0B80A4 */ lui $t3, %hi(func_80A3BEAC) ## $t3 = 80A40000 -/* 01B70 80A3C2C0 3C0C80A4 */ lui $t4, %hi(func_80A3BEE0) ## $t4 = 80A40000 -/* 01B74 80A3C2C4 256BBEAC */ addiu $t3, $t3, %lo(func_80A3BEAC) ## $t3 = 80A3BEAC -/* 01B78 80A3C2C8 258CBEE0 */ addiu $t4, $t4, %lo(func_80A3BEE0) ## $t4 = 80A3BEE0 -/* 01B7C 80A3C2CC AE0B01AC */ sw $t3, 0x01AC($s0) ## 000001AC -/* 01B80 80A3C2D0 AE0C01B0 */ sw $t4, 0x01B0($s0) ## 000001B0 -/* 01B84 80A3C2D4 8C6D0010 */ lw $t5, 0x0010($v1) ## 00000010 -/* 01B88 80A3C2D8 00065880 */ sll $t3, $a2, 2 -/* 01B8C 80A3C2DC 3C0580A4 */ lui $a1, %hi(D_80A3C590) ## $a1 = 80A40000 -/* 01B90 80A3C2E0 AE0D01A4 */ sw $t5, 0x01A4($s0) ## 000001A4 -/* 01B94 80A3C2E4 8C6E0014 */ lw $t6, 0x0014($v1) ## 00000014 -/* 01B98 80A3C2E8 00AB2821 */ addu $a1, $a1, $t3 -/* 01B9C 80A3C2EC 3C0480A4 */ lui $a0, %hi(D_80A3D09C) ## $a0 = 80A40000 -/* 01BA0 80A3C2F0 AE0E01BC */ sw $t6, 0x01BC($s0) ## 000001BC -/* 01BA4 80A3C2F4 8C6F0018 */ lw $t7, 0x0018($v1) ## 00000018 -/* 01BA8 80A3C2F8 2484D09C */ addiu $a0, $a0, %lo(D_80A3D09C) ## $a0 = 80A3D09C -/* 01BAC 80A3C2FC AE0F01C0 */ sw $t7, 0x01C0($s0) ## 000001C0 -/* 01BB0 80A3C300 8C78001C */ lw $t8, 0x001C($v1) ## 0000001C -/* 01BB4 80A3C304 AE1801C4 */ sw $t8, 0x01C4($s0) ## 000001C4 -/* 01BB8 80A3C308 84790008 */ lh $t9, 0x0008($v1) ## 00000008 -/* 01BBC 80A3C30C A61901C8 */ sh $t9, 0x01C8($s0) ## 000001C8 -/* 01BC0 80A3C310 8468000A */ lh $t0, 0x000A($v1) ## 0000000A -/* 01BC4 80A3C314 A60801CA */ sh $t0, 0x01CA($s0) ## 000001CA -/* 01BC8 80A3C318 8C690004 */ lw $t1, 0x0004($v1) ## 00000004 -/* 01BCC 80A3C31C AE0901D0 */ sw $t1, 0x01D0($s0) ## 000001D0 -/* 01BD0 80A3C320 846A0002 */ lh $t2, 0x0002($v1) ## 00000002 -/* 01BD4 80A3C324 A60A01CC */ sh $t2, 0x01CC($s0) ## 000001CC -/* 01BD8 80A3C328 0C00084C */ jal osSyncPrintf - -/* 01BDC 80A3C32C 8CA5C590 */ lw $a1, %lo(D_80A3C590)($a1) -/* 01BE0 80A3C330 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 01BE4 80A3C334 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 01BE8 80A3C338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BEC 80A3C33C 01816824 */ and $t5, $t4, $at -/* 01BF0 80A3C340 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 01BF4 80A3C344 0C00B58B */ jal Actor_SetScale - -/* 01BF8 80A3C348 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 -/* 01BFC 80A3C34C 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 01C00 80A3C350 44812000 */ mtc1 $at, $f4 ## $f4 = 24.00 -/* 01C04 80A3C354 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01C08 80A3C358 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 01C0C 80A3C35C C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 01C10 80A3C360 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01C14 80A3C364 3C0580A4 */ lui $a1, %hi(func_80A3BD80) ## $a1 = 80A40000 -/* 01C18 80A3C368 24A5BD80 */ addiu $a1, $a1, %lo(func_80A3BD80) ## $a1 = 80A3BD80 -/* 01C1C 80A3C36C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C20 80A3C370 E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC -/* 01C24 80A3C374 E60600C4 */ swc1 $f6, 0x00C4($s0) ## 000000C4 -/* 01C28 80A3C378 E6080080 */ swc1 $f8, 0x0080($s0) ## 00000080 -/* 01C2C 80A3C37C 0C28E9D4 */ jal func_80A3A750 -/* 01C30 80A3C380 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 01C34 80A3C384 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 01C38 80A3C388 3C0F80A4 */ lui $t7, %hi(func_80A3C3BC) ## $t7 = 80A40000 -/* 01C3C 80A3C38C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01C40 80A3C390 25EFC3BC */ addiu $t7, $t7, %lo(func_80A3C3BC) ## $t7 = 80A3C3BC -/* 01C44 80A3C394 AE0E019C */ sw $t6, 0x019C($s0) ## 0000019C -/* 01C48 80A3C398 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 01C4C 80A3C39C A60001B4 */ sh $zero, 0x01B4($s0) ## 000001B4 -/* 01C50 80A3C3A0 A60001B8 */ sh $zero, 0x01B8($s0) ## 000001B8 -/* 01C54 80A3C3A4 A61801B6 */ sh $t8, 0x01B6($s0) ## 000001B6 -.L80A3C3A8: -/* 01C58 80A3C3A8 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C5C 80A3C3AC 8FB00018 */ lw $s0, 0x0018($sp) -/* 01C60 80A3C3B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01C64 80A3C3B4 03E00008 */ jr $ra -/* 01C68 80A3C3B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C3BC.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C3BC.s deleted file mode 100644 index f7d998eb65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C3BC.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80A3C3BC -/* 01C6C 80A3C3BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C70 80A3C3C0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01C74 80A3C3C4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01C78 80A3C3C8 AFA5002C */ sw $a1, 0x002C($sp) -/* 01C7C 80A3C3CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C80 80A3C3D0 0C00B58B */ jal Actor_SetScale - -/* 01C84 80A3C3D4 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 -/* 01C88 80A3C3D8 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 01C8C 80A3C3DC 44812000 */ mtc1 $at, $f4 ## $f4 = 24.00 -/* 01C90 80A3C3E0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01C94 80A3C3E4 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 01C98 80A3C3E8 E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC -/* 01C9C 80A3C3EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CA0 80A3C3F0 E60600C4 */ swc1 $f6, 0x00C4($s0) ## 000000C4 -/* 01CA4 80A3C3F4 0C28EFD5 */ jal func_80A3BF54 -/* 01CA8 80A3C3F8 8FA5002C */ lw $a1, 0x002C($sp) -/* 01CAC 80A3C3FC 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 01CB0 80A3C400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CB4 80A3C404 8FA5002C */ lw $a1, 0x002C($sp) -/* 01CB8 80A3C408 0320F809 */ jalr $ra, $t9 -/* 01CBC 80A3C40C 00000000 */ nop -/* 01CC0 80A3C410 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CC4 80A3C414 0C00B56E */ jal Actor_SetHeight - -/* 01CC8 80A3C418 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 01CCC 80A3C41C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 01CD0 80A3C420 24010026 */ addiu $at, $zero, 0x0026 ## $at = 00000026 -/* 01CD4 80A3C424 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 01CD8 80A3C428 51C1000E */ beql $t6, $at, .L80A3C464 -/* 01CDC 80A3C42C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01CE0 80A3C430 860F01B4 */ lh $t7, 0x01B4($s0) ## 000001B4 -/* 01CE4 80A3C434 260401B8 */ addiu $a0, $s0, 0x01B8 ## $a0 = 000001B8 -/* 01CE8 80A3C438 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01CEC 80A3C43C 11E00005 */ beq $t7, $zero, .L80A3C454 -/* 01CF0 80A3C440 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 01CF4 80A3C444 861801B8 */ lh $t8, 0x01B8($s0) ## 000001B8 -/* 01CF8 80A3C448 270801F4 */ addiu $t0, $t8, 0x01F4 ## $t0 = 000001F4 -/* 01CFC 80A3C44C 10000004 */ beq $zero, $zero, .L80A3C460 -/* 01D00 80A3C450 A60801B8 */ sh $t0, 0x01B8($s0) ## 000001B8 -.L80A3C454: -/* 01D04 80A3C454 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 01D08 80A3C458 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01D0C 80A3C45C AFA00010 */ sw $zero, 0x0010($sp) -.L80A3C460: -/* 01D10 80A3C460 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A3C464: -/* 01D14 80A3C464 8FB00020 */ lw $s0, 0x0020($sp) -/* 01D18 80A3C468 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D1C 80A3C46C 03E00008 */ jr $ra -/* 01D20 80A3C470 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C498.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C498.s deleted file mode 100644 index 23f91ad0c1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C498.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A3C498 -/* 01D48 80A3C498 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D4C 80A3C49C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D50 80A3C4A0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01D54 80A3C4A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01D58 80A3C4A8 AFA5001C */ sw $a1, 0x001C($sp) -/* 01D5C 80A3C4AC 0C00BAF3 */ jal func_8002EBCC -/* 01D60 80A3C4B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01D64 80A3C4B4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01D68 80A3C4B8 8FA5001C */ lw $a1, 0x001C($sp) -/* 01D6C 80A3C4BC 0C00BB60 */ jal func_8002ED80 -/* 01D70 80A3C4C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01D74 80A3C4C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D78 80A3C4C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D7C 80A3C4CC 03E00008 */ jr $ra -/* 01D80 80A3C4D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C4D4.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C4D4.s deleted file mode 100644 index 48c5bab520..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C4D4.s +++ /dev/null @@ -1,46 +0,0 @@ -.late_rodata -glabel D_80A3D144 - .float 0.017453292 - -.text -glabel func_80A3C4D4 -/* 01D84 80A3C4D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D88 80A3C4D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D8C 80A3C4DC AFA5001C */ sw $a1, 0x001C($sp) -/* 01D90 80A3C4E0 848E01B8 */ lh $t6, 0x01B8($a0) ## 000001B8 -/* 01D94 80A3C4E4 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 -/* 01D98 80A3C4E8 44814000 */ mtc1 $at, $f8 ## $f8 = 360.00 -/* 01D9C 80A3C4EC 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 01DA0 80A3C4F0 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 01DA4 80A3C4F4 44818000 */ mtc1 $at, $f16 ## $f16 = 65536.00 -/* 01DA8 80A3C4F8 468021A0 */ cvt.s.w $f6, $f4 -/* 01DAC 80A3C4FC 3C0180A4 */ lui $at, %hi(D_80A3D144) ## $at = 80A40000 -/* 01DB0 80A3C500 C424D144 */ lwc1 $f4, %lo(D_80A3D144)($at) -/* 01DB4 80A3C504 AFA40018 */ sw $a0, 0x0018($sp) -/* 01DB8 80A3C508 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01DBC 80A3C50C 46083282 */ mul.s $f10, $f6, $f8 -/* 01DC0 80A3C510 46105483 */ div.s $f18, $f10, $f16 -/* 01DC4 80A3C514 46049302 */ mul.s $f12, $f18, $f4 -/* 01DC8 80A3C518 0C034348 */ jal Matrix_RotateY -/* 01DCC 80A3C51C 00000000 */ nop -/* 01DD0 80A3C520 8FA70018 */ lw $a3, 0x0018($sp) -/* 01DD4 80A3C524 8FA5001C */ lw $a1, 0x001C($sp) -/* 01DD8 80A3C528 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01DDC 80A3C52C 8CE201D0 */ lw $v0, 0x01D0($a3) ## 000001D0 -/* 01DE0 80A3C530 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01DE4 80A3C534 50400005 */ beql $v0, $zero, .L80A3C54C -/* 01DE8 80A3C538 8FA4001C */ lw $a0, 0x001C($sp) -/* 01DEC 80A3C53C 0040F809 */ jalr $ra, $v0 -/* 01DF0 80A3C540 AFA70018 */ sw $a3, 0x0018($sp) -/* 01DF4 80A3C544 8FA70018 */ lw $a3, 0x0018($sp) -/* 01DF8 80A3C548 8FA4001C */ lw $a0, 0x001C($sp) -.L80A3C54C: -/* 01DFC 80A3C54C 0C01A528 */ jal func_800694A0 -/* 01E00 80A3C550 84E501CC */ lh $a1, 0x01CC($a3) ## 000001CC -/* 01E04 80A3C554 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E08 80A3C558 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E0C 80A3C55C 03E00008 */ jr $ra -/* 01E10 80A3C560 00000000 */ nop -/* 01E14 80A3C564 00000000 */ nop -/* 01E18 80A3C568 00000000 */ nop -/* 01E1C 80A3C56C 00000000 */ nop diff --git a/data/overlays/actors/z_en_girla.data.s b/data/overlays/actors/z_en_girla.data.s deleted file mode 100644 index abd9751b8e..0000000000 --- a/data/overlays/actors/z_en_girla.data.s +++ /dev/null @@ -1,288 +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_GirlA_InitVars - .word 0x00040600, 0x00000019, 0x00010000, 0x000001D4 -.word EnGirlA_Init -.word EnGirlA_Destroy -.word EnGirlA_Update -.word 0x00000000 -glabel D_80A3C590 - .word D_80A3CCD0 -.word D_80A3CCE0 -.word D_80A3CCF0 -.word D_80A3CD00 -.word D_80A3CD10 -.word D_80A3CD20 -.word D_80A3CD30 -.word D_80A3CD40 -.word D_80A3CD50 -.word D_80A3CD60 -.word D_80A3CD70 -.word D_80A3CD80 -.word D_80A3CD90 -.word D_80A3CDA0 -.word D_80A3CDB0 -.word D_80A3CDC0 -.word D_80A3CDD0 -.word D_80A3CDE0 -.word D_80A3CDF0 -.word D_80A3CE00 -.word D_80A3CE10 -.word D_80A3CE20 -.word D_80A3CE30 -.word D_80A3CE40 -.word D_80A3CE50 -.word D_80A3CE60 -.word D_80A3CE70 -.word D_80A3CE80 -.word D_80A3CE90 -.word D_80A3CEA0 -.word D_80A3CEB0 -.word D_80A3CEC0 -.word D_80A3CED0 -.word D_80A3CEE0 -.word D_80A3CEF0 -.word D_80A3CF00 -.word D_80A3CF10 -.word D_80A3CF20 -.word D_80A3CF30 -.word D_80A3CF40 -.word D_80A3CF50 -.word D_80A3CF60 -.word D_80A3CF70 -.word D_80A3CF80 -.word D_80A3CF90 -.word D_80A3CFA0 -.word D_80A3CFB0 -.word D_80A3CFC0 -.word D_80A3CFD0 -.word D_80A3CFE0 -glabel D_80A3C658 - .word 0x00240026, 0x00250027, 0x002B0029, 0x0028002A -glabel D_80A3C668 - .word 0x70B670B5, 0x70B470B7, 0x70BB0000 -glabel D_80A3C674 - .word 0x00BB0011, func_8002ED80, 0x000F0005, 0x00B2007F, 0x00000063 -.word func_80A3ABF8 -.word func_80A3B714 -.word func_80A3BB6C -.word 0x00D80025, func_8002EBCC, 0x003C001E, 0x00C1009B, 0x0000004A -.word func_80A3AAA8 -.word func_80A3B634 -.word func_80A3BB6C -.word 0x00D80026, func_8002EBCC, 0x005A0032, 0x00B0007D, 0x0000004B -.word func_80A3AAA8 -.word func_80A3B634 -.word func_80A3BB6C -.word 0x00CE001F, func_8002EBCC, 0x00190005, 0x00A3008B, 0x00000001 -.word func_80A3AB58 -.word func_80A3B678 -.word func_80A3BB6C -.word 0x00BB0011, func_8002ED80, 0x001E000A, 0x00A20087, 0x00000064 -.word func_80A3ABF8 -.word func_80A3B714 -.word func_80A3BB6C -.word 0x00C7001A, 0x00000000, 0x000A0001, 0x00A10088, 0x00000007 -.word func_80A3ACAC -.word func_80A3B780 -.word func_80A3BB6C -.word 0x00CE001F, func_8002EBCC, 0x0032000A, 0x00B1007C, 0x00000066 -.word func_80A3AB58 -.word func_80A3B678 -.word func_80A3BB6C -.word 0x00F4003E, func_8002ED80, 0x00C80001, 0x00B3007E, 0x0000006C -.word func_80A3AD60 -.word 0x00000000 -.word func_80A3BB6C -.word 0x00EB0037, func_8002EBCC, 0x001E0001, 0x00A5008E, 0x00000010 -.word func_80A3ADD4 -.word func_80A3BA40 -.word func_80A3BB6C -.word 0x00EB0036, func_8002EBCC, 0x001E0001, 0x00A6008F, 0x00000011 -.word func_80A3AE48 -.word func_80A3BA40 -.word func_80A3BB6C -.word 0x00EB0038, func_8002EBCC, 0x003C0001, 0x00A70090, 0x00000012 -.word func_80A3AEBC -.word func_80A3BA40 -.word func_80A3BB6C -.word 0x00F80042, func_8002EBCC, 0x03E80001, 0x00A80091, 0x00000028 -.word func_80A3AF30 -.word func_80A3B7BC -.word func_80A3BB6C -.word 0x00DC002B, func_8002EBCC, 0x00500001, 0x00A90092, 0x0000002A -.word func_80A3AFC4 -.word func_80A3B800 -.word func_80A3BB6C -.word 0x00CB001C, func_8002EBCC, 0x00280001, 0x009F0089, 0x00000029 -.word func_80A3B040 -.word func_80A3B83C -.word func_80A3BB6C -.word 0x00F2003B, 0x00000000, 0x00C80001, 0x00AA0093, 0x0000002C -.word func_80A3B0BC -.word func_80A3B878 -.word func_80A3BC0C -.word 0x00F2003C, 0x00000000, 0x012C0001, 0x00AB0094, 0x0000002D -.word func_80A3B160 -.word func_80A3B8B4 -.word func_80A3BC3C -.word 0x00B70008, 0x00000000, 0x000A0010, 0x00AC0095, 0x00000048 -.word func_80A3B204 -.word func_80A3B8F0 -.word func_80A3BB6C -.word 0x00DF002F -.word func_80A3C498 -.word 0x00640001, 0x00AD0097, 0x00000014 -.word func_80A3B250 -.word func_80A3B92C -.word func_80A3BB6C -.word 0x00DA0028, func_8002EBCC, 0x00640001, 0x00AE0099, 0x00000047 -.word func_80A3B2AC -.word func_80A3B968 -.word func_80A3BB6C -.word 0x00DF002F -.word func_80A3C498 -.word 0x27100001, 0x00B40085, 0x00000000 -.word func_80A3B308 -.word func_80A3B9A4 -.word func_80A3BB6C -.word 0x00DA0028, func_8002EBCC, 0x27100001, 0x00B50085, 0x00000000 -.word func_80A3B318 -.word func_80A3B9D4 -.word func_80A3BB6C -.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003 -.word func_80A3B328 -.word 0x00000000 -.word func_80A3BC6C -.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B -.word func_80A3B328 -.word 0x00000000 -.word func_80A3BC6C -.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B -.word func_80A3B328 -.word 0x00000000 -.word func_80A3BC6C -.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003 -.word func_80A3B328 -.word 0x00000000 -.word func_80A3BC6C -.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003 -.word func_80A3B328 -.word 0x00000000 -.word func_80A3BC6C -.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B -.word func_80A3B328 -.word 0x00000000 -.word func_80A3BC6C -.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B -.word func_80A3B328 -.word 0x00000000 -.word func_80A3BC6C -.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003 -.word func_80A3B328 -.word 0x00000000 -.word func_80A3BC6C -.word 0x01190047, func_8002EBCC, 0x001E001E, 0x00DF00DE, 0x00000069 -.word func_80A3B3A8 -.word func_80A3BA04 -.word func_80A3BB6C -.word 0x01340030, func_8002EBCC, 0x00000001, 0x70B270BE, 0x0000001A -.word func_80A3B3A8 -.word func_80A3BA04 -.word func_80A3BB6C -.word 0x01350031, func_8002EBCC, 0x00000001, 0x70B170BD, 0x00000018 -.word func_80A3B3A8 -.word func_80A3BA04 -.word func_80A3BB6C -.word 0x0136004E, func_8002EBCC, 0x00000001, 0x70B070BC, 0x00000017 -.word func_80A3B3A8 -.word func_80A3BA04 -.word func_80A3BB6C -.word 0x0137004F, func_8002EBCC, 0x00000001, 0x70B370BF, 0x0000001B -.word func_80A3B3A8 -.word func_80A3BA04 -.word func_80A3BB6C -.word 0x01380050 -.word func_80A3C498 -.word 0x00000001, 0x70AF70C3, 0x0000001C -.word func_80A3B3A8 -.word func_80A3BA04 -.word func_80A3BB6C -.word 0x0151005B, 0x00000000, 0x00000001, 0x70B970C1, 0x00000052 -.word func_80A3B3A8 -.word func_80A3BA04 -.word func_80A3BB6C -.word 0x0150005A, 0x00000000, 0x00000001, 0x70B870C0, 0x00000051 -.word func_80A3B3A8 -.word func_80A3BA04 -.word func_80A3BB6C -.word 0x0152005C, 0x00000000, 0x00000001, 0x70BA70C2, 0x00000053 -.word func_80A3B3A8 -.word func_80A3BA04 -.word func_80A3BB6C -.word 0x01480058, func_8002EBCC, 0x00000000, 0x00BD70C2, 0x00000053 -.word func_80A3B454 -.word 0x00000000, 0x00000000, 0x01730066, func_8002EBCC, 0x012C0001, 0x00B900B8, 0x0000006E -.word func_80A3B464 -.word func_80A3BA40 -.word func_80A3BB6C -.word 0x01740067 -.word func_80A3C498 -.word 0x00320001, 0x00BB00BA, 0x0000006D -.word func_80A3B4D8 -.word func_80A3BA40 -.word func_80A3BB6C -.word 0x0176006F -.word func_80A3C498 -.word 0x00320001, 0x506F5070, 0x00000070 -.word func_80A3B54C -.word func_80A3BA40 -.word func_80A3BB6C -.word 0x01760069 -.word func_80A3C498 -.word 0x001E0001, 0x506D506E, 0x0000006F -.word func_80A3B54C -.word func_80A3BA40 -.word func_80A3BB6C -.word 0x0177006A -.word func_80A3C498 -.word 0x00320001, 0x00B700B6, 0x00000013 -.word func_80A3B5C0 -.word func_80A3BA40 -.word func_80A3BB6C -.word 0x00D80024, func_8002EBCC, 0x0014000A, 0x00A0008A, 0x00000049 -.word func_80A3AAA8 -.word func_80A3B634 -.word func_80A3BB6C -.word 0x00CE001F, func_8002EBCC, 0x00500014, 0x001C0006, 0x00000067 -.word func_80A3AB58 -.word func_80A3B678 -.word func_80A3BB6C -.word 0x00CE001F, func_8002EBCC, 0x0078001E, 0x001D001E, 0x00000068 -.word func_80A3AB58 -.word func_80A3B678 -.word func_80A3BB6C -.word 0x00CE001F, func_8002EBCC, 0x00230005, 0x00CB00CA, 0x00000001 -.word func_80A3AB58 -.word func_80A3B678 -.word func_80A3BB6C -.word 0x00EB0037, func_8002EBCC, 0x00280001, 0x00640062, 0x00000010 -.word func_80A3ADD4 -.word func_80A3BA40 -.word func_80A3BB6C -.word 0x00EB0037, func_8002EBCC, 0x00320001, 0x00650063, 0x00000010 -.word func_80A3ADD4 -.word func_80A3BA40 -.word func_80A3BB6C -glabel D_80A3CCB4 - .word 0x0005000A, 0x000F0014, 0x0019001E, 0x00230028, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_girla.reloc.s b/data/overlays/actors/z_en_girla.reloc.s deleted file mode 100644 index 3d571a1e2d..0000000000 --- a/data/overlays/actors/z_en_girla.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_80A3D150 - .incbin "baserom/ovl_En_GirlA", 0x2A00, 0x00000590 diff --git a/spec b/spec index 3e33fd4f88..ac3ce8a26e 100644 --- a/spec +++ b/spec @@ -2510,8 +2510,7 @@ endseg beginseg name "ovl_En_GirlA" include "build/src/overlays/actors/ovl_En_GirlA/z_en_girla.o" - include "build/data/overlays/actors/z_en_girla.data.o" - include "build/data/overlays/actors/z_en_girla.reloc.o" + include "build/src/overlays/actors/ovl_En_GirlA/ovl_En_GirlA_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 22fb3e8011..7ef929f1b7 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -1,4 +1,11 @@ +/* + * File: z_en_girla.c + * Overlay: En_GirlA + * Description: Shop Items +*/ + #include "z_en_girla.h" +#include "vt.h" #define FLAGS 0x00000019 @@ -8,7 +15,60 @@ void EnGirlA_Init(Actor* thisx, GlobalContext* globalCtx); void EnGirlA_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnGirlA_Update(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80A3BEAC(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3BEE0(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3BFE4(EnGirlA* this, GlobalContext* globalCtx); +void func_80A3C3BC(EnGirlA* this, GlobalContext* globalCtx); +void func_80A3C498(Actor* thisx, GlobalContext* globalCtx, s32 flags); +void func_80A3C4D4(Actor* thisx, GlobalContext* globalCtx); + +s32 func_80A3AAA8(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3AB58(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3ABF8(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3ACAC(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3AD60(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3ADD4(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3AE48(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3AEBC(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3AF30(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3AFC4(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B040(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B0BC(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B160(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B204(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B250(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B2AC(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B308(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B318(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B328(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B3A8(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B454(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B464(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B4D8(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B54C(GlobalContext* globalCtx, EnGirlA* this); +s32 func_80A3B5C0(GlobalContext* globalCtx, EnGirlA* this); + +void func_80A3B714(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B634(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B678(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B780(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3BA40(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B7BC(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B800(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B83C(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B878(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B8B4(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B8F0(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B92C(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B968(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B9A4(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3B9D4(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3BA04(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3BB6C(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3BC0C(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3BC3C(GlobalContext* globalCtx, EnGirlA* this); +void func_80A3BC6C(GlobalContext* globalCtx, EnGirlA* this); + const ActorInit En_GirlA_InitVars = { ACTOR_EN_GIRLA, ACTORTYPE_PROP, @@ -20,139 +80,936 @@ const ActorInit En_GirlA_InitVars = { (ActorFunc)EnGirlA_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A750.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A758.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A7EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A810.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A834.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A858.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A87C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3A8D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AAA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AB58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ABF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ACAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AD60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3ADD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AE48.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AEBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AF30.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3AFC4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B040.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B0BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B160.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B204.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B250.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B2AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B308.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B318.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B328.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B3A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B454.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B464.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B4D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B54C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B5C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B634.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B678.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B714.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B780.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B7BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B800.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B83C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B878.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B8F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B92C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B968.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3B9D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BA40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BB6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BC6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BD8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BEE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BF54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3BFE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C3BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C498.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_GirlA/func_80A3C4D4.s") +char* D_80A3C590[] = { + "デクの実×5 ", "矢×30 ", "矢×50 ", "爆弾×5 ", "デクの実×10 ", "デクの棒 ", + "爆弾×10 ", "さかな ", "赤クスリ ", "緑クスリ ", "青クスリ ", "巨人のナイフ ", + "ハイリアの盾 ", "デクの盾 ", "ゴロンの服 ", "ゾ─ラの服 ", "回復のハート ", "ロンロン牛乳 ", + "鶏の卵 ", "インゴー牛乳 ", "インゴー卵 ", "もだえ石 ", "大人の財布 ", "ハートの欠片 ", + "ボムチュウ ", "ボムチュウ ", "ボムチュウ ", "ボムチュウ ", "ボムチュウ ", "デクのタネ ", + "キータンのお面", "こわそなお面 ", "ドクロのお面 ", "ウサギずきん ", "まことの仮面 ", "ゾーラのお面 ", + "ゴロンのお面 ", "ゲルドのお面 ", "ＳＯＬＤＯＵＴ", "炎 ", "虫 ", "チョウチョ ", + "ポウ ", "妖精の魂 ", "矢×10 ", "爆弾×20 ", "爆弾×30 ", "爆弾×5 ", + "赤クスリ ", "赤クスリ ", +}; + +s16 D_80A3C658[8] = { ITEM_MASK_KEATON, ITEM_MASK_SPOOKY, ITEM_MASK_SKULL, ITEM_MASK_BUNNY, + ITEM_MASK_TRUTH, ITEM_MASK_ZORA, ITEM_MASK_GORON, ITEM_MASK_GERUDO }; + +u16 D_80A3C668[5] = { 0x70B6, 0x70B5, 0x70B4, 0x70B7, 0x70BB }; + +typedef struct { + /* 0x00 */ s16 objID; + /* 0x02 */ s16 unk_02; + /* 0x04 */ void (*unk_04)(Actor*, GlobalContext*, s32); + /* 0x08 */ s16 unk_08; + /* 0x0A */ s16 unk_0A; + /* 0x0C */ u16 unk_0C; + /* 0x0C */ u16 unk_0E; + /* 0x10 */ s32 unk_10; + /* 0x14 */ s32 (*unk_14)(GlobalContext*, EnGirlA*); + /* 0x18 */ void (*unk_18)(GlobalContext*, EnGirlA*); + /* 0x1C */ void (*unk_1C)(GlobalContext*, EnGirlA*); +} ShopItemEntry; // size = 0x20 + +ShopItemEntry D_80A3C674[] = { + { 0x00BB, 0x0011, func_8002ED80, 0x000F, 0x0005, 0x00B2, 0x007F, GI_NUTS_5_2, func_80A3ABF8, func_80A3B714, + func_80A3BB6C }, + { 0x00D8, 0x0025, func_8002EBCC, 0x003C, 0x001E, 0x00C1, 0x009B, GI_ARROWS_MEDIUM, func_80A3AAA8, func_80A3B634, + func_80A3BB6C }, + { 0x00D8, 0x0026, func_8002EBCC, 0x005A, 0x0032, 0x00B0, 0x007D, GI_ARROWS_LARGE, func_80A3AAA8, func_80A3B634, + func_80A3BB6C }, + { 0x00CE, 0x001F, func_8002EBCC, 0x0019, 0x0005, 0x00A3, 0x008B, GI_BOMBS_5, func_80A3AB58, func_80A3B678, + func_80A3BB6C }, + { 0x00BB, 0x0011, func_8002ED80, 0x001E, 0x000A, 0x00A2, 0x0087, GI_NUTS_10, func_80A3ABF8, func_80A3B714, + func_80A3BB6C }, + { 0x00C7, 0x001A, NULL, 0x000A, 0x0001, 0x00A1, 0x0088, GI_STICKS_1, func_80A3ACAC, func_80A3B780, func_80A3BB6C }, + { 0x00CE, 0x001F, func_8002EBCC, 0x0032, 0x000A, 0x00B1, 0x007C, GI_BOMBS_10, func_80A3AB58, func_80A3B678, + func_80A3BB6C }, + { 0x00F4, 0x003E, func_8002ED80, 0x00C8, 0x0001, 0x00B3, 0x007E, GI_FISH, func_80A3AD60, NULL, func_80A3BB6C }, + { 0x00EB, 0x0037, func_8002EBCC, 0x001E, 0x0001, 0x00A5, 0x008E, GI_POTION_RED, func_80A3ADD4, func_80A3BA40, + func_80A3BB6C }, + { 0x00EB, 0x0036, func_8002EBCC, 0x001E, 0x0001, 0x00A6, 0x008F, GI_POTION_GREEN, func_80A3AE48, func_80A3BA40, + func_80A3BB6C }, + { 0x00EB, 0x0038, func_8002EBCC, 0x003C, 0x0001, 0x00A7, 0x0090, GI_POTION_BLUE, func_80A3AEBC, func_80A3BA40, + func_80A3BB6C }, + { 0x00F8, 0x0042, func_8002EBCC, 0x03E8, 0x0001, 0x00A8, 0x0091, GI_SWORD_KNIFE, func_80A3AF30, func_80A3B7BC, + func_80A3BB6C }, + { 0x00DC, 0x002B, func_8002EBCC, 0x0050, 0x0001, 0x00A9, 0x0092, GI_SHIELD_HYLIAN, func_80A3AFC4, func_80A3B800, + func_80A3BB6C }, + { 0x00CB, 0x001C, func_8002EBCC, 0x0028, 0x0001, 0x009F, 0x0089, GI_SHIELD_DEKU, func_80A3B040, func_80A3B83C, + func_80A3BB6C }, + { 0x00F2, 0x003B, NULL, 0x00C8, 0x0001, 0x00AA, 0x0093, GI_TUNIC_GORON, func_80A3B0BC, func_80A3B878, + func_80A3BC0C }, + { 0x00F2, 0x003C, NULL, 0x012C, 0x0001, 0x00AB, 0x0094, GI_TUNIC_ZORA, func_80A3B160, func_80A3B8B4, + func_80A3BC3C }, + { 0x00B7, 0x0008, NULL, 0x000A, 0x0010, 0x00AC, 0x0095, GI_HEART, func_80A3B204, func_80A3B8F0, func_80A3BB6C }, + { 0x00DF, 0x002F, func_80A3C498, 0x0064, 0x0001, 0x00AD, 0x0097, GI_MILK_BOTTLE, func_80A3B250, func_80A3B92C, + func_80A3BB6C }, + { 0x00DA, 0x0028, func_8002EBCC, 0x0064, 0x0001, 0x00AE, 0x0099, GI_WEIRD_EGG, func_80A3B2AC, func_80A3B968, + func_80A3BB6C }, + { 0x00DF, 0x002F, func_80A3C498, 0x2710, 0x0001, 0x00B4, 0x0085, GI_INVALID, func_80A3B308, func_80A3B9A4, + func_80A3BB6C }, + { 0x00DA, 0x0028, func_8002EBCC, 0x2710, 0x0001, 0x00B5, 0x0085, GI_INVALID, func_80A3B318, func_80A3B9D4, + func_80A3BB6C }, + { 0x00D9, 0x0027, func_8002EBCC, 0x0064, 0x000A, 0x00BC, 0x008C, GI_BOMBCHUS_10, func_80A3B328, NULL, + func_80A3BC6C }, + { 0x00D9, 0x0027, func_8002EBCC, 0x00B4, 0x0014, 0x0061, 0x002A, GI_BOMBCHUS_20, func_80A3B328, NULL, + func_80A3BC6C }, + { 0x00D9, 0x0027, func_8002EBCC, 0x00B4, 0x0014, 0x0061, 0x002A, GI_BOMBCHUS_20, func_80A3B328, NULL, + func_80A3BC6C }, + { 0x00D9, 0x0027, func_8002EBCC, 0x0064, 0x000A, 0x00BC, 0x008C, GI_BOMBCHUS_10, func_80A3B328, NULL, + func_80A3BC6C }, + { 0x00D9, 0x0027, func_8002EBCC, 0x0064, 0x000A, 0x00BC, 0x008C, GI_BOMBCHUS_10, func_80A3B328, NULL, + func_80A3BC6C }, + { 0x00D9, 0x0027, func_8002EBCC, 0x00B4, 0x0014, 0x0061, 0x002A, GI_BOMBCHUS_20, func_80A3B328, NULL, + func_80A3BC6C }, + { 0x00D9, 0x0027, func_8002EBCC, 0x00B4, 0x0014, 0x0061, 0x002A, GI_BOMBCHUS_20, func_80A3B328, NULL, + func_80A3BC6C }, + { 0x00D9, 0x0027, func_8002EBCC, 0x0064, 0x000A, 0x00BC, 0x008C, GI_BOMBCHUS_10, func_80A3B328, NULL, + func_80A3BC6C }, + { 0x0119, 0x0047, func_8002EBCC, 0x001E, 0x001E, 0x00DF, 0x00DE, GI_SEEDS_30, func_80A3B3A8, func_80A3BA04, + func_80A3BB6C }, + { 0x0134, 0x0030, func_8002EBCC, 0x0000, 0x0001, 0x70B2, 0x70BE, GI_MASK_KEATON, func_80A3B3A8, func_80A3BA04, + func_80A3BB6C }, + { 0x0135, 0x0031, func_8002EBCC, 0x0000, 0x0001, 0x70B1, 0x70BD, GI_MASK_SPOOKY, func_80A3B3A8, func_80A3BA04, + func_80A3BB6C }, + { 0x0136, 0x004E, func_8002EBCC, 0x0000, 0x0001, 0x70B0, 0x70BC, GI_MASK_SKULL, func_80A3B3A8, func_80A3BA04, + func_80A3BB6C }, + { 0x0137, 0x004F, func_8002EBCC, 0x0000, 0x0001, 0x70B3, 0x70BF, GI_MASK_BUNNY, func_80A3B3A8, func_80A3BA04, + func_80A3BB6C }, + { 0x0138, 0x0050, func_80A3C498, 0x0000, 0x0001, 0x70AF, 0x70C3, GI_MASK_TRUTH, func_80A3B3A8, func_80A3BA04, + func_80A3BB6C }, + { 0x0151, 0x005B, NULL, 0x0000, 0x0001, 0x70B9, 0x70C1, GI_MASK_ZORA, func_80A3B3A8, func_80A3BA04, func_80A3BB6C }, + { 0x0150, 0x005A, NULL, 0x0000, 0x0001, 0x70B8, 0x70C0, GI_MASK_GORON, func_80A3B3A8, func_80A3BA04, + func_80A3BB6C }, + { 0x0152, 0x005C, NULL, 0x0000, 0x0001, 0x70BA, 0x70C2, GI_MASK_GERUDO, func_80A3B3A8, func_80A3BA04, + func_80A3BB6C }, + { 0x0148, 0x0058, func_8002EBCC, 0x0000, 0x0000, 0x00BD, 0x70C2, GI_MASK_GERUDO, func_80A3B454, NULL, NULL }, + { 0x0173, 0x0066, func_8002EBCC, 0x012C, 0x0001, 0x00B9, 0x00B8, GI_BLUE_FIRE, func_80A3B464, func_80A3BA40, + func_80A3BB6C }, + { 0x0174, 0x0067, func_80A3C498, 0x0032, 0x0001, 0x00BB, 0x00BA, GI_BUGS, func_80A3B4D8, func_80A3BA40, + func_80A3BB6C }, + { 0x0176, 0x006F, func_80A3C498, 0x0032, 0x0001, 0x506F, 0x5070, GI_BIG_POE, func_80A3B54C, func_80A3BA40, + func_80A3BB6C }, + { 0x0176, 0x0069, func_80A3C498, 0x001E, 0x0001, 0x506D, 0x506E, GI_POE, func_80A3B54C, func_80A3BA40, + func_80A3BB6C }, + { 0x0177, 0x006A, func_80A3C498, 0x0032, 0x0001, 0x00B7, 0x00B6, GI_FAIRY, func_80A3B5C0, func_80A3BA40, + func_80A3BB6C }, + { 0x00D8, 0x0024, func_8002EBCC, 0x0014, 0x000A, 0x00A0, 0x008A, GI_ARROWS_SMALL, func_80A3AAA8, func_80A3B634, + func_80A3BB6C }, + { 0x00CE, 0x001F, func_8002EBCC, 0x0050, 0x0014, 0x001C, 0x0006, GI_BOMBS_20, func_80A3AB58, func_80A3B678, + func_80A3BB6C }, + { 0x00CE, 0x001F, func_8002EBCC, 0x0078, 0x001E, 0x001D, 0x001E, GI_BOMBS_30, func_80A3AB58, func_80A3B678, + func_80A3BB6C }, + { 0x00CE, 0x001F, func_8002EBCC, 0x0023, 0x0005, 0x00CB, 0x00CA, GI_BOMBS_5, func_80A3AB58, func_80A3B678, + func_80A3BB6C }, + { 0x00EB, 0x0037, func_8002EBCC, 0x0028, 0x0001, 0x0064, 0x0062, GI_POTION_RED, func_80A3ADD4, func_80A3BA40, + func_80A3BB6C }, + { 0x00EB, 0x0037, func_8002EBCC, 0x0032, 0x0001, 0x0065, 0x0063, GI_POTION_RED, func_80A3ADD4, func_80A3BA40, + func_80A3BB6C }, +}; + +s16 D_80A3CCB4[8] = { 0x0005, 0x000A, 0x000F, 0x0014, 0x0019, 0x001E, 0x0023, 0x0028 }; + +void func_80A3A750(EnGirlA* this, EnGirlAActionFunc func) { + this->actionFunc = func; +} + +s32 func_80A3A758(EnGirlA* this) { + switch (this->actor.params) { + case 17: + if (gSaveContext.itemGetInf[0] & 0x4) { + this->actor.params = 16; + return 1; + } + break; + case 24: + if (gSaveContext.itemGetInf[0] & 0x40) { + this->actor.params = 38; + return 1; + } + break; + case 25: + if (gSaveContext.itemGetInf[0] & 0x80) { + this->actor.params = 38; + return 1; + } + break; + case 26: + if (gSaveContext.itemGetInf[0] & 0x100) { + this->actor.params = 38; + return 1; + } + break; + case 27: + if (gSaveContext.itemGetInf[0] & 0x200) { + this->actor.params = 38; + return 1; + } + break; + case 28: + if (gSaveContext.itemGetInf[0] & 0x400) { + this->actor.params = 38; + return 1; + } + break; + case 21: + if (gSaveContext.itemGetInf[0] & 0x8) { + this->actor.params = 38; + return 1; + } + break; + case 22: + if (gSaveContext.itemGetInf[0] & 0x10) { + this->actor.params = 38; + return 1; + } + break; + case 23: + if (gSaveContext.itemGetInf[0] & 0x20) { + this->actor.params = 38; + return 1; + } + break; + } + return 0; +} + +void func_80A3A8D0(EnGirlA* this, GlobalContext* globalCtx) { + s16 params = this->actor.params; + + osSyncPrintf("%s(%2d)初期設定\n", D_80A3C590[params], params); + + if ((params >= 50) && (params < 0)) { + Actor_Kill(&this->actor); + osSyncPrintf(VT_COL(RED, WHITE)); + osSyncPrintf("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); + osSyncPrintf(VT_RST); + __assert("0", "../z_en_girlA.c", 1421); + return; + } + + this->unk_194 = Object_GetIndex(&globalCtx->objectCtx, D_80A3C674[params].objID); + + if (this->unk_194 < 0) { + Actor_Kill(&this->actor); + osSyncPrintf(VT_COL(RED, WHITE)); + osSyncPrintf("バンクが無いよ！！(%s)\n", D_80A3C590[params]); + osSyncPrintf(VT_RST); + __assert("0", "../z_en_girlA.c", 1434); + return; + } + + this->actor.params = params; + this->unk_198 = func_80A3BFE4; +} + +void EnGirlA_Init(Actor* thisx, GlobalContext* globalCtx) { + EnGirlA* this = THIS; + + func_80A3A758(this); + func_80A3A8D0(this, globalCtx); + osSyncPrintf("%s(%2d)初期設定\n", D_80A3C590[this->actor.params], this->actor.params); +} + +void EnGirlA_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnGirlA* this = THIS; + + if (this->unk_19C != 0) { + SkelAnime_Free(&this->skelAnime, globalCtx); + } +} + +s32 func_80A3AAA8(GlobalContext* globalCtx, EnGirlA* this) { + if (Item_CheckObtainability(ITEM_BOW) == ITEM_NONE) { + return 5; + } + if (AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + return 1; +} + +s32 func_80A3AB58(GlobalContext* globalCtx, EnGirlA* this) { + if (!CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) { + return 2; + } + if (AMMO(ITEM_BOMB) >= CUR_CAPACITY(UPG_BOMB_BAG)) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + return 1; +} + +s32 func_80A3ABF8(GlobalContext* globalCtx, EnGirlA* this) { + if ((CUR_CAPACITY(UPG_NUTS) != 0) && (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS))) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_NUT) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3ACAC(GlobalContext* globalCtx, EnGirlA* this) { + if ((CUR_CAPACITY(UPG_STICKS) != 0) && (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS))) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_STICK) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3AD60(GlobalContext* globalCtx, EnGirlA* this) { + if (!Inventory_HasEmptyBottle()) { + return 3; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_FISH) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3ADD4(GlobalContext* globalCtx, EnGirlA* this) { + if (!Inventory_HasEmptyBottle()) { + return 3; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_POTION_RED) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3AE48(GlobalContext* globalCtx, EnGirlA* this) { + if (!Inventory_HasEmptyBottle()) { + return 3; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_POTION_GREEN) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3AEBC(GlobalContext* globalCtx, EnGirlA* this) { + if (!Inventory_HasEmptyBottle()) { + return 3; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_POTION_BLUE) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3AF30(GlobalContext* globalCtx, EnGirlA* this) { + if ((gBitFlags[2] & gSaveContext.equipment) && !(gBitFlags[3] & gSaveContext.equipment)) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_SWORD_BGS) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3AFC4(GlobalContext* globalCtx, EnGirlA* this) { + if (gBitFlags[5] & gSaveContext.equipment) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_SHIELD_HYLIAN) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3B040(GlobalContext* globalCtx, EnGirlA* this) { + if (gBitFlags[4] & gSaveContext.equipment) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_SHIELD_DEKU) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3B0BC(GlobalContext* globalCtx, EnGirlA* this) { + if (LINK_AGE_IN_YEARS == YEARS_CHILD) { + return 2; + } + if (gBitFlags[9] & gSaveContext.equipment) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_TUNIC_GORON) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3B160(GlobalContext* globalCtx, EnGirlA* this) { + if (LINK_AGE_IN_YEARS == YEARS_CHILD) { + return 2; + } + if (gBitFlags[10] & gSaveContext.equipment) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_TUNIC_ZORA) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3B204(GlobalContext* globalCtx, EnGirlA* this) { + if (gSaveContext.healthCapacity == gSaveContext.health) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + return 1; +} + +s32 func_80A3B250(GlobalContext* globalCtx, EnGirlA* this) { + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_MILK_BOTTLE) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3B2AC(GlobalContext* globalCtx, EnGirlA* this) { + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_LETTER_ZELDA) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3B308(GlobalContext* globalCtx, EnGirlA* this) { + return 4; +} + +s32 func_80A3B318(GlobalContext* globalCtx, EnGirlA* this) { + return 4; +} + +s32 func_80A3B328(GlobalContext* globalCtx, EnGirlA* this) { + if (AMMO(ITEM_BOMBCHU) >= 50) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_BOMBCHU) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3B3A8(GlobalContext* globalCtx, EnGirlA* this) { + if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) { + return 2; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_SEEDS) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3B454(GlobalContext* globalCtx, EnGirlA* this) { + return 5; +} + +s32 func_80A3B464(GlobalContext* globalCtx, EnGirlA* this) { + if (!Inventory_HasEmptyBottle()) { + return 3; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_BLUE_FIRE) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3B4D8(GlobalContext* globalCtx, EnGirlA* this) { + if (!Inventory_HasEmptyBottle()) { + return 3; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_BUG) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3B54C(GlobalContext* globalCtx, EnGirlA* this) { + if (!Inventory_HasEmptyBottle()) { + return 3; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_POE) == ITEM_NONE) { + return 0; + } + return 1; +} + +s32 func_80A3B5C0(GlobalContext* globalCtx, EnGirlA* this) { + if (!Inventory_HasEmptyBottle()) { + return 3; + } + if (gSaveContext.rupees < this->unk_1C8) { + return 4; + } + if (Item_CheckObtainability(ITEM_FAIRY) == ITEM_NONE) { + return 0; + } + return 1; +} + +void func_80A3B634(GlobalContext* globalCtx, EnGirlA* this) { + Inventory_ChangeAmmo(ITEM_BOW, this->unk_1CA); + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B678(GlobalContext* globalCtx, EnGirlA* this) { + switch (this->unk_1CA) { + case 5: + Item_Give(globalCtx, ITEM_BOMBS_5); + break; + case 10: + Item_Give(globalCtx, ITEM_BOMBS_10); + break; + case 20: + Item_Give(globalCtx, ITEM_BOMBS_20); + break; + case 30: + Item_Give(globalCtx, ITEM_BOMBS_30); + break; + } + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B714(GlobalContext* globalCtx, EnGirlA* this) { + switch (this->unk_1CA) { + case 5: + Item_Give(globalCtx, ITEM_NUTS_5); + break; + case 10: + Item_Give(globalCtx, ITEM_NUTS_10); + break; + } + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B780(GlobalContext* globalCtx, EnGirlA* this) { + Item_Give(globalCtx, ITEM_STICK); + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B7BC(GlobalContext* globalCtx, EnGirlA* this) { + func_800849EC(globalCtx); + gSaveContext.bgsHitsLeft = 8; + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B800(GlobalContext* globalCtx, EnGirlA* this) { + Item_Give(globalCtx, ITEM_SHIELD_HYLIAN); + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B83C(GlobalContext* globalCtx, EnGirlA* this) { + Item_Give(globalCtx, ITEM_SHIELD_DEKU); + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B878(GlobalContext* globalCtx, EnGirlA* this) { + Item_Give(globalCtx, ITEM_TUNIC_GORON); + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B8B4(GlobalContext* globalCtx, EnGirlA* this) { + Item_Give(globalCtx, ITEM_TUNIC_ZORA); + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B8F0(GlobalContext* globalCtx, EnGirlA* this) { + Health_ChangeBy(globalCtx, this->unk_1CA); + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B92C(GlobalContext* globalCtx, EnGirlA* this) { + Item_Give(globalCtx, ITEM_MILK_BOTTLE); + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B968(GlobalContext* globalCtx, EnGirlA* this) { + Item_Give(globalCtx, ITEM_WEIRD_EGG); + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B9A4(GlobalContext* globalCtx, EnGirlA* this) { + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3B9D4(GlobalContext* globalCtx, EnGirlA* this) { + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3BA04(GlobalContext* globalCtx, EnGirlA* this) { + Item_Give(globalCtx, ITEM_SEEDS_30); + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3BA40(GlobalContext* globalCtx, EnGirlA* this) { + switch (this->actor.params) { + case 7: + Item_Give(globalCtx, ITEM_FISH); + break; + case 8: + Item_Give(globalCtx, ITEM_POTION_RED); + break; + case 9: + Item_Give(globalCtx, ITEM_POTION_GREEN); + break; + case 10: + Item_Give(globalCtx, ITEM_POTION_BLUE); + break; + case 39: + Item_Give(globalCtx, ITEM_BLUE_FIRE); + break; + case 40: + Item_Give(globalCtx, ITEM_BUG); + break; + case 41: + Item_Give(globalCtx, ITEM_BIG_POE); + break; + case 42: + Item_Give(globalCtx, ITEM_POE); + break; + case 43: + Item_Give(globalCtx, ITEM_FAIRY); + break; + } + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3BB6C(GlobalContext* globalCtx, EnGirlA* this) { + if (this->actor.params == 12) { + if (gSaveContext.infTable[7] & 0x40) { + Rupees_ChangeBy(-(this->unk_1C8 - D_80A3CCB4[(s32)Math_Rand_ZeroFloat(7.9f)])); + return; + } + } + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3BC0C(GlobalContext* globalCtx, EnGirlA* this) { + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3BC3C(GlobalContext* globalCtx, EnGirlA* this) { + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3BC6C(GlobalContext* globalCtx, EnGirlA* this) { + switch (this->actor.params) { + case 24: + gSaveContext.itemGetInf[0] |= 0x40; + break; + case 25: + gSaveContext.itemGetInf[0] |= 0x80; + break; + case 26: + gSaveContext.itemGetInf[0] |= 0x100; + break; + case 27: + gSaveContext.itemGetInf[0] |= 0x200; + break; + case 28: + gSaveContext.itemGetInf[0] |= 0x400; + break; + case 21: + gSaveContext.itemGetInf[0] |= 0x8; + break; + case 22: + gSaveContext.itemGetInf[0] |= 0x10; + break; + case 23: + gSaveContext.itemGetInf[0] |= 0x20; + break; + } + Rupees_ChangeBy(-this->unk_1C8); +} + +void func_80A3BD80(EnGirlA* this, GlobalContext* globalCtx) { +} + +void func_80A3BD8C(GlobalContext* globalCtx, EnGirlA* this) { + ShopItemEntry* tmp = &D_80A3C674[this->actor.params]; + s32 params = this->actor.params; + s32 params2; + s32 tmp3; + + if ((this->actor.params >= 30) && (this->actor.params < 35)) { + params2 = this->actor.params - 30; + tmp3 = 0; + switch (this->actor.params) { + case 30: + if (gSaveContext.itemGetInf[3] & 0x100) { + tmp3 = 1; + } + break; + case 31: + if (gSaveContext.itemGetInf[3] & 0x400) { + tmp3 = 1; + } + break; + case 32: + if (gSaveContext.itemGetInf[3] & 0x200) { + tmp3 = 1; + } + break; + case 33: + if (gSaveContext.itemGetInf[3] & 0x800) { + tmp3 = 1; + } + break; + case 34: + if (gSaveContext.itemGetInf[3] & 0x800) { + tmp3 = 1; + } + break; + } + if (tmp3 != 0) { + this->actor.textId = D_80A3C668[params2]; + } else { + this->actor.textId = tmp->unk_0C; + } + } else { + this->actor.textId = tmp->unk_0C; + } + this->unk_1A8 = 0; + this->actor.draw = func_80A3C4D4; +} + +void func_80A3BEAC(GlobalContext* globalCtx, EnGirlA* this) { + this->unk_1A8 = 1; + this->actor.draw = NULL; + if ((this->actor.params >= 30) && (this->actor.params < 38)) { + this->actor.textId = 0xBD; + } +} + +void func_80A3BEE0(GlobalContext* globalCtx, EnGirlA* this) { + ShopItemEntry* itemEntry; + + if (func_80A3A758(this)) { + func_80A3A8D0(this, globalCtx); + itemEntry = &D_80A3C674[this->actor.params]; + this->actor.textId = itemEntry->unk_0C; + } else { + this->unk_1A8 = 0; + this->actor.draw = func_80A3C4D4; + } +} + +s32 func_80A3BF54(EnGirlA* this, GlobalContext* globalCtx) { + s32 params; + + if ((this->actor.params >= 30) && (this->actor.params < 38)) { + params = this->actor.params - 30; + if (INV_CONTENT(ITEM_WEIRD_EGG) == D_80A3C658[params]) { + func_80A3BEAC(globalCtx, this); + } else { + func_80A3BD8C(globalCtx, this); + } + return 1; + } + return 0; +} + +void func_80A3BFE4(EnGirlA* this, GlobalContext* globalCtx) { + s16 params = this->actor.params; + ShopItemEntry* tmp = &D_80A3C674[params]; + + if (Object_IsLoaded(&globalCtx->objectCtx, this->unk_194)) { + this->actor.flags &= ~0x10; + this->actor.objBankIndex = this->unk_194; + switch (this->actor.params - 30) { + case 0: + if (gSaveContext.itemGetInf[3] & 0x100) { + this->actor.textId = 0x70B6; + } else { + this->actor.textId = tmp->unk_0C; + } + this->unk_1A0 = tmp->unk_0E; + break; + case 1: + if (gSaveContext.itemGetInf[3] & 0x400) { + this->actor.textId = 0x70B5; + } else { + this->actor.textId = tmp->unk_0C; + } + this->unk_1A0 = tmp->unk_0E; + break; + case 2: + if (gSaveContext.itemGetInf[3] & 0x200) { + this->actor.textId = 0x70B4; + } else { + this->actor.textId = tmp->unk_0C; + } + + this->unk_1A0 = tmp->unk_0E; + break; + case 3: + if (gSaveContext.itemGetInf[3] & 0x800) { + this->actor.textId = 0x70B7; + } else { + this->actor.textId = tmp->unk_0C; + } + + this->unk_1A0 = tmp->unk_0E; + break; + case 4: + if (gSaveContext.itemGetInf[3] & 0x800) { + this->actor.textId = 0x70BB; + this->unk_1A0 = tmp->unk_0E; + } else { + this->actor.textId = tmp->unk_0C; + this->unk_1A0 = 0xEB; + } + break; + case 5: + this->actor.textId = tmp->unk_0C; + this->unk_1A0 = tmp->unk_0E; + break; + case 6: + this->actor.textId = tmp->unk_0C; + this->unk_1A0 = tmp->unk_0E; + break; + case 7: + this->actor.textId = tmp->unk_0C; + this->unk_1A0 = tmp->unk_0E; + break; + default: + this->actor.textId = tmp->unk_0C; + this->unk_1A0 = tmp->unk_0E; + break; + } + if (func_80A3BF54(this, globalCtx) == 0) { + func_80A3BD8C(globalCtx, this); + } + + this->unk_1AC = func_80A3BEAC; + this->unk_1B0 = func_80A3BEE0; + this->unk_1A4 = tmp->unk_10; + this->unk_1BC = tmp->unk_14; + this->unk_1C0 = tmp->unk_18; + this->unk_1C4 = tmp->unk_1C; + this->unk_1C8 = tmp->unk_08; + this->unk_1CA = tmp->unk_0A; + this->unk_1D0 = tmp->unk_04; + this->unk_1CC = tmp->unk_02; + osSyncPrintf("%s(%2d)\n", D_80A3C590[params], params); + this->actor.flags &= ~1; + Actor_SetScale(&this->actor, 0.25f); + this->actor.shape.unk_08 = 24.0f; + this->actor.shape.unk_10 = 4.0f; + this->actor.groundY = this->actor.initPosRot.pos.y; + this->actor.gravity = 0.0f; + func_80A3A750(this, func_80A3BD80); + this->unk_19C = 1; + this->unk_198 = func_80A3C3BC; + this->unk_1B4 = 0; + this->unk_1B8 = 0; + this->unk_1B6 = this->actor.shape.rot.y; + } +} + +void func_80A3C3BC(EnGirlA* this, GlobalContext* globalCtx) { + Actor_SetScale(&this->actor, 0.25f); + this->actor.shape.unk_08 = 24.0f; + this->actor.shape.unk_10 = 4.0f; + func_80A3BF54(this, globalCtx); + this->actionFunc(this, globalCtx); + Actor_SetHeight(&this->actor, 5.0f); + this->actor.shape.rot.x = 0.0f; + if (this->actor.params != 38) { + if (this->unk_1B4 != 0) { + this->unk_1B8 += 0x1F4; + } else { + Math_SmoothScaleMaxMinS(&this->unk_1B8, 0, 10, 0x7D0, 0); + } + } +} + +void EnGirlA_Update(Actor* thisx, GlobalContext* globalCtx) { + EnGirlA* this = THIS; + + this->unk_198(this, globalCtx); +} + +void func_80A3C498(Actor* thisx, GlobalContext* globalCtx, s32 flags) { + func_8002EBCC(thisx, globalCtx, 0); + func_8002ED80(thisx, globalCtx, 0); +} + +void func_80A3C4D4(Actor* thisx, GlobalContext* globalCtx) { + EnGirlA* this = THIS; + + Matrix_RotateY(((this->unk_1B8 * 360.0f) / 65536.0f) * 0.017453292f, MTXMODE_APPLY); + if (this->unk_1D0 != NULL) { + this->unk_1D0(thisx, globalCtx, 0); + } + func_800694A0(globalCtx, this->unk_1CC); +} diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h index 9e755a2c49..648823a4c0 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h @@ -6,9 +6,38 @@ struct EnGirlA; +typedef void (*EnGirlAActionFunc)(struct EnGirlA*, GlobalContext*); +typedef void (*EnGirlA2Func)(GlobalContext*, struct EnGirlA*); +typedef void (*EnGirlA3Func)(Actor*, GlobalContext*, s32); + typedef struct EnGirlA { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x88]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnGirlAActionFunc actionFunc; + /* 0x0194 */ s8 unk_194; + /* 0x0195 */ s8 unk_195; + /* 0x0196 */ s16 unk_196; + /* 0x0198 */ EnGirlAActionFunc unk_198; + /* 0x019C */ s32 unk_19C; + /* 0x01A0 */ s16 unk_1A0; + /* 0x01A2 */ s16 unk_1A2; + /* 0x01A4 */ s32 unk_1A4; + /* 0x01A8 */ s16 unk_1A8; + /* 0x01AA */ s16 unk_1AA; + /* 0x01AC */ EnGirlA2Func unk_1AC; + /* 0x01B0 */ EnGirlA2Func unk_1B0; + /* 0x01B4 */ s16 unk_1B4; + /* 0x01B6 */ s16 unk_1B6; + /* 0x01B8 */ s16 unk_1B8; + /* 0x01BA */ s16 unk_1BA; + /* 0x01BC */ void* unk_1BC; + /* 0x01C0 */ void* unk_1C0; + /* 0x01C4 */ void* unk_1C4; + /* 0x01C8 */ s16 unk_1C8; + /* 0x01CA */ s16 unk_1CA; + /* 0x01CC */ s16 unk_1CC; + /* 0x01CE */ s16 unk_1CE; + /* 0x01D0 */ EnGirlA3Func unk_1D0; } EnGirlA; // size = 0x01D4 extern const ActorInit En_Girla_InitVars;