diff --git a/.gitignore b/.gitignore index 3bec7105a3..e2d49cd0b5 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ assets bin/ build/ docs/doxygen/ + +.vscode/launch.json diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241364_BE00F4.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241364_BE00F4.s deleted file mode 100644 index 548e6c4f91..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241364_BE00F4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241364_BE00F4 -/* BE00F4 80241364 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE00F8 80241368 AFB00010 */ sw $s0, 0x10($sp) -/* BE00FC 8024136C 0080802D */ daddu $s0, $a0, $zero -/* BE0100 80241370 AFBF0018 */ sw $ra, 0x18($sp) -/* BE0104 80241374 AFB10014 */ sw $s1, 0x14($sp) -/* BE0108 80241378 8E02000C */ lw $v0, 0xc($s0) -/* BE010C 8024137C 8C510000 */ lw $s1, ($v0) -/* BE0110 80241380 0C0B1EAF */ jal get_variable -/* BE0114 80241384 0220282D */ daddu $a1, $s1, $zero -/* BE0118 80241388 3C03FFF0 */ lui $v1, 0xfff0 -/* BE011C 8024138C 3463FFFF */ ori $v1, $v1, 0xffff -/* BE0120 80241390 0200202D */ daddu $a0, $s0, $zero -/* BE0124 80241394 00431024 */ and $v0, $v0, $v1 -/* BE0128 80241398 00021140 */ sll $v0, $v0, 5 -/* BE012C 8024139C 3C068008 */ lui $a2, %hi(gItemTable) -/* BE0130 802413A0 00C23021 */ addu $a2, $a2, $v0 -/* BE0134 802413A4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* BE0138 802413A8 0C0B2026 */ jal set_variable -/* BE013C 802413AC 0220282D */ daddu $a1, $s1, $zero -/* BE0140 802413B0 8FBF0018 */ lw $ra, 0x18($sp) -/* BE0144 802413B4 8FB10014 */ lw $s1, 0x14($sp) -/* BE0148 802413B8 8FB00010 */ lw $s0, 0x10($sp) -/* BE014C 802413BC 24020002 */ addiu $v0, $zero, 2 -/* BE0150 802413C0 03E00008 */ jr $ra -/* BE0154 802413C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s index 8fde1529c8..527eb53dde 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s @@ -108,7 +108,7 @@ glabel func_802422B0_BFFB30 /* BFFCC4 80242444 00000000 */ nop /* BFFCC8 80242448 0280202D */ daddu $a0, $s4, $zero /* BFFCCC 8024244C 0220282D */ daddu $a1, $s1, $zero -/* BFFCD0 80242450 0C09061D */ jal func_80241874 +/* BFFCD0 80242450 0C09061D */ jal func_80241874_BFF0F4 /* BFFCD4 80242454 0260302D */ daddu $a2, $s3, $zero /* BFFCD8 80242458 8E830070 */ lw $v1, 0x70($s4) /* BFFCDC 8024245C 2402000F */ addiu $v0, $zero, 0xf diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_802400B4_C3D134.s b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_802400B4_C3D134.s deleted file mode 100644 index a5213b7278..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_802400B4_C3D134.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_C3D134 -/* C3D134 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3D138 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* C3D13C 802400BC 0080802D */ daddu $s0, $a0, $zero -/* C3D140 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C3D144 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* C3D148 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* C3D14C 802400CC 8C510000 */ lw $s1, ($v0) -/* C3D150 802400D0 0C0B1EAF */ jal get_variable -/* C3D154 802400D4 0220282D */ daddu $a1, $s1, $zero -/* C3D158 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* C3D15C 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* C3D160 802400E0 0200202D */ daddu $a0, $s0, $zero -/* C3D164 802400E4 00431024 */ and $v0, $v0, $v1 -/* C3D168 802400E8 00021140 */ sll $v0, $v0, 5 -/* C3D16C 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* C3D170 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* C3D174 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C3D178 802400F8 0C0B2026 */ jal set_variable -/* C3D17C 802400FC 0220282D */ daddu $a1, $s1, $zero -/* C3D180 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* C3D184 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* C3D188 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* C3D18C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* C3D190 80240110 03E00008 */ jr $ra -/* C3D194 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_802400B4_C4DFA4.s b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_802400B4_C4DFA4.s deleted file mode 100644 index 25833d3eca..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_802400B4_C4DFA4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_C4DFA4 -/* C4DFA4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4DFA8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* C4DFAC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* C4DFB0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C4DFB4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* C4DFB8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* C4DFBC 802400CC 8C510000 */ lw $s1, ($v0) -/* C4DFC0 802400D0 0C0B1EAF */ jal get_variable -/* C4DFC4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* C4DFC8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* C4DFCC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* C4DFD0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* C4DFD4 802400E4 00431024 */ and $v0, $v0, $v1 -/* C4DFD8 802400E8 00021140 */ sll $v0, $v0, 5 -/* C4DFDC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* C4DFE0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* C4DFE4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C4DFE8 802400F8 0C0B2026 */ jal set_variable -/* C4DFEC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* C4DFF0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* C4DFF4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* C4DFF8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* C4DFFC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* C4E000 80240110 03E00008 */ jr $ra -/* C4E004 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80241064_C56FA4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80241064_C56FA4.s deleted file mode 100644 index 663bf368e2..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80241064_C56FA4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241064_C56FA4 -/* C56FA4 80241064 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C56FA8 80241068 AFB00010 */ sw $s0, 0x10($sp) -/* C56FAC 8024106C 0080802D */ daddu $s0, $a0, $zero -/* C56FB0 80241070 AFBF0018 */ sw $ra, 0x18($sp) -/* C56FB4 80241074 AFB10014 */ sw $s1, 0x14($sp) -/* C56FB8 80241078 8E02000C */ lw $v0, 0xc($s0) -/* C56FBC 8024107C 8C510000 */ lw $s1, ($v0) -/* C56FC0 80241080 0C0B1EAF */ jal get_variable -/* C56FC4 80241084 0220282D */ daddu $a1, $s1, $zero -/* C56FC8 80241088 3C03FFF0 */ lui $v1, 0xfff0 -/* C56FCC 8024108C 3463FFFF */ ori $v1, $v1, 0xffff -/* C56FD0 80241090 0200202D */ daddu $a0, $s0, $zero -/* C56FD4 80241094 00431024 */ and $v0, $v0, $v1 -/* C56FD8 80241098 00021140 */ sll $v0, $v0, 5 -/* C56FDC 8024109C 3C068008 */ lui $a2, %hi(gItemTable) -/* C56FE0 802410A0 00C23021 */ addu $a2, $a2, $v0 -/* C56FE4 802410A4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C56FE8 802410A8 0C0B2026 */ jal set_variable -/* C56FEC 802410AC 0220282D */ daddu $a1, $s1, $zero -/* C56FF0 802410B0 8FBF0018 */ lw $ra, 0x18($sp) -/* C56FF4 802410B4 8FB10014 */ lw $s1, 0x14($sp) -/* C56FF8 802410B8 8FB00010 */ lw $s0, 0x10($sp) -/* C56FFC 802410BC 24020002 */ addiu $v0, $zero, 2 -/* C57000 802410C0 03E00008 */ jr $ra -/* C57004 802410C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241524.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241524.s deleted file mode 100644 index c70ed986d0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241524.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241524 -/* 95C724 80241524 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95C728 80241528 AFB00010 */ sw $s0, 0x10($sp) -/* 95C72C 8024152C 0080802D */ daddu $s0, $a0, $zero -/* 95C730 80241530 AFBF0018 */ sw $ra, 0x18($sp) -/* 95C734 80241534 AFB10014 */ sw $s1, 0x14($sp) -/* 95C738 80241538 8E02000C */ lw $v0, 0xc($s0) -/* 95C73C 8024153C 8C510000 */ lw $s1, ($v0) -/* 95C740 80241540 0C0B1EAF */ jal get_variable -/* 95C744 80241544 0220282D */ daddu $a1, $s1, $zero -/* 95C748 80241548 3C03FFF0 */ lui $v1, 0xfff0 -/* 95C74C 8024154C 3463FFFF */ ori $v1, $v1, 0xffff -/* 95C750 80241550 0200202D */ daddu $a0, $s0, $zero -/* 95C754 80241554 00431024 */ and $v0, $v0, $v1 -/* 95C758 80241558 00021140 */ sll $v0, $v0, 5 -/* 95C75C 8024155C 3C068008 */ lui $a2, %hi(gItemTable) -/* 95C760 80241560 00C23021 */ addu $a2, $a2, $v0 -/* 95C764 80241564 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 95C768 80241568 0C0B2026 */ jal set_variable -/* 95C76C 8024156C 0220282D */ daddu $a1, $s1, $zero -/* 95C770 80241570 8FBF0018 */ lw $ra, 0x18($sp) -/* 95C774 80241574 8FB10014 */ lw $s1, 0x14($sp) -/* 95C778 80241578 8FB00010 */ lw $s0, 0x10($sp) -/* 95C77C 8024157C 24020002 */ addiu $v0, $zero, 2 -/* 95C780 80241580 03E00008 */ jr $ra -/* 95C784 80241584 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243514_95E714.s b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243514_95E714.s deleted file mode 100644 index cb13d1cce3..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243514_95E714.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243514_95E714 -/* 95E714 80243514 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95E718 80243518 AFB00010 */ sw $s0, 0x10($sp) -/* 95E71C 8024351C 0080802D */ daddu $s0, $a0, $zero -/* 95E720 80243520 AFBF0018 */ sw $ra, 0x18($sp) -/* 95E724 80243524 AFB10014 */ sw $s1, 0x14($sp) -/* 95E728 80243528 8E02000C */ lw $v0, 0xc($s0) -/* 95E72C 8024352C 8C510000 */ lw $s1, ($v0) -/* 95E730 80243530 0C0B1EAF */ jal get_variable -/* 95E734 80243534 0220282D */ daddu $a1, $s1, $zero -/* 95E738 80243538 3C03FFF0 */ lui $v1, 0xfff0 -/* 95E73C 8024353C 3463FFFF */ ori $v1, $v1, 0xffff -/* 95E740 80243540 0200202D */ daddu $a0, $s0, $zero -/* 95E744 80243544 00431024 */ and $v0, $v0, $v1 -/* 95E748 80243548 00021140 */ sll $v0, $v0, 5 -/* 95E74C 8024354C 3C068008 */ lui $a2, %hi(gItemTable) -/* 95E750 80243550 00C23021 */ addu $a2, $a2, $v0 -/* 95E754 80243554 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 95E758 80243558 0C0B2026 */ jal set_variable -/* 95E75C 8024355C 0220282D */ daddu $a1, $s1, $zero -/* 95E760 80243560 8FBF0018 */ lw $ra, 0x18($sp) -/* 95E764 80243564 8FB10014 */ lw $s1, 0x14($sp) -/* 95E768 80243568 8FB00010 */ lw $s0, 0x10($sp) -/* 95E76C 8024356C 24020002 */ addiu $v0, $zero, 2 -/* 95E770 80243570 03E00008 */ jr $ra -/* 95E774 80243574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802403B4_969574.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802403B4_969574.s deleted file mode 100644 index 9f49ee3cc5..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802403B4_969574.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403B4_969574 -/* 969574 802403B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 969578 802403B8 AFB00010 */ sw $s0, 0x10($sp) -/* 96957C 802403BC 0080802D */ daddu $s0, $a0, $zero -/* 969580 802403C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 969584 802403C4 AFB10014 */ sw $s1, 0x14($sp) -/* 969588 802403C8 8E02000C */ lw $v0, 0xc($s0) -/* 96958C 802403CC 8C510000 */ lw $s1, ($v0) -/* 969590 802403D0 0C0B1EAF */ jal get_variable -/* 969594 802403D4 0220282D */ daddu $a1, $s1, $zero -/* 969598 802403D8 3C03FFF0 */ lui $v1, 0xfff0 -/* 96959C 802403DC 3463FFFF */ ori $v1, $v1, 0xffff -/* 9695A0 802403E0 0200202D */ daddu $a0, $s0, $zero -/* 9695A4 802403E4 00431024 */ and $v0, $v0, $v1 -/* 9695A8 802403E8 00021140 */ sll $v0, $v0, 5 -/* 9695AC 802403EC 3C068008 */ lui $a2, %hi(gItemTable) -/* 9695B0 802403F0 00C23021 */ addu $a2, $a2, $v0 -/* 9695B4 802403F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 9695B8 802403F8 0C0B2026 */ jal set_variable -/* 9695BC 802403FC 0220282D */ daddu $a1, $s1, $zero -/* 9695C0 80240400 8FBF0018 */ lw $ra, 0x18($sp) -/* 9695C4 80240404 8FB10014 */ lw $s1, 0x14($sp) -/* 9695C8 80240408 8FB00010 */ lw $s0, 0x10($sp) -/* 9695CC 8024040C 24020002 */ addiu $v0, $zero, 2 -/* 9695D0 80240410 03E00008 */ jr $ra -/* 9695D4 80240414 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44.s index 84c3d34889..2f2198d4bb 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44.s @@ -269,7 +269,7 @@ glabel func_80241B44 /* E0727C 80241F1C 08090810 */ j .L80242040 /* E07280 80241F20 26F70001 */ addiu $s7, $s7, 1 /* E07284 80241F24 0260202D */ daddu $a0, $s3, $zero -/* E07288 80241F28 0C0902BE */ jal func_80240AF8 +/* E07288 80241F28 0C0902BE */ jal func_80240AF8_E05E58 /* E0728C 80241F2C 0200282D */ daddu $a1, $s0, $zero /* E07290 80241F30 08090810 */ j .L80242040 /* E07294 80241F34 26F70001 */ addiu $s7, $s7, 1 diff --git a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_802400F4_CA7394.s b/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_802400F4_CA7394.s deleted file mode 100644 index 6c2f06a846..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_802400F4_CA7394.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F4_CA7394 -/* CA7394 802400F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CA7398 802400F8 AFB00010 */ sw $s0, 0x10($sp) -/* CA739C 802400FC 0080802D */ daddu $s0, $a0, $zero -/* CA73A0 80240100 AFBF0018 */ sw $ra, 0x18($sp) -/* CA73A4 80240104 AFB10014 */ sw $s1, 0x14($sp) -/* CA73A8 80240108 8E02000C */ lw $v0, 0xc($s0) -/* CA73AC 8024010C 8C510000 */ lw $s1, ($v0) -/* CA73B0 80240110 0C0B1EAF */ jal get_variable -/* CA73B4 80240114 0220282D */ daddu $a1, $s1, $zero -/* CA73B8 80240118 3C03FFF0 */ lui $v1, 0xfff0 -/* CA73BC 8024011C 3463FFFF */ ori $v1, $v1, 0xffff -/* CA73C0 80240120 0200202D */ daddu $a0, $s0, $zero -/* CA73C4 80240124 00431024 */ and $v0, $v0, $v1 -/* CA73C8 80240128 00021140 */ sll $v0, $v0, 5 -/* CA73CC 8024012C 3C068008 */ lui $a2, %hi(gItemTable) -/* CA73D0 80240130 00C23021 */ addu $a2, $a2, $v0 -/* CA73D4 80240134 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* CA73D8 80240138 0C0B2026 */ jal set_variable -/* CA73DC 8024013C 0220282D */ daddu $a1, $s1, $zero -/* CA73E0 80240140 8FBF0018 */ lw $ra, 0x18($sp) -/* CA73E4 80240144 8FB10014 */ lw $s1, 0x14($sp) -/* CA73E8 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* CA73EC 8024014C 24020002 */ addiu $v0, $zero, 2 -/* CA73F0 80240150 03E00008 */ jr $ra -/* CA73F4 80240154 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index 0ed773d0ee..40dfea12a9 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -83,7 +83,7 @@ glabel func_8024162C_CB662C /* CB675C 8024175C 0000102D */ daddu $v0, $zero, $zero /* CB6760 80241760 0280202D */ daddu $a0, $s4, $zero /* CB6764 80241764 0200282D */ daddu $a1, $s0, $zero -/* CB6768 80241768 0C0902BE */ jal func_80240AF8 +/* CB6768 80241768 0C0902BE */ jal func_80240AF8_CB5AF8 /* CB676C 8024176C 0260302D */ daddu $a2, $s3, $zero /* CB6770 80241770 0280202D */ daddu $a0, $s4, $zero /* CB6774 80241774 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240134.s b/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240134.s deleted file mode 100644 index 5a50395e39..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240134.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240134 -/* CB9334 80240134 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CB9338 80240138 AFB00010 */ sw $s0, 0x10($sp) -/* CB933C 8024013C 0080802D */ daddu $s0, $a0, $zero -/* CB9340 80240140 AFBF0018 */ sw $ra, 0x18($sp) -/* CB9344 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* CB9348 80240148 8E02000C */ lw $v0, 0xc($s0) -/* CB934C 8024014C 8C510000 */ lw $s1, ($v0) -/* CB9350 80240150 0C0B1EAF */ jal get_variable -/* CB9354 80240154 0220282D */ daddu $a1, $s1, $zero -/* CB9358 80240158 3C03FFF0 */ lui $v1, 0xfff0 -/* CB935C 8024015C 3463FFFF */ ori $v1, $v1, 0xffff -/* CB9360 80240160 0200202D */ daddu $a0, $s0, $zero -/* CB9364 80240164 00431024 */ and $v0, $v0, $v1 -/* CB9368 80240168 00021140 */ sll $v0, $v0, 5 -/* CB936C 8024016C 3C068008 */ lui $a2, %hi(gItemTable) -/* CB9370 80240170 00C23021 */ addu $a2, $a2, $v0 -/* CB9374 80240174 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* CB9378 80240178 0C0B2026 */ jal set_variable -/* CB937C 8024017C 0220282D */ daddu $a1, $s1, $zero -/* CB9380 80240180 8FBF0018 */ lw $ra, 0x18($sp) -/* CB9384 80240184 8FB10014 */ lw $s1, 0x14($sp) -/* CB9388 80240188 8FB00010 */ lw $s0, 0x10($sp) -/* CB938C 8024018C 24020002 */ addiu $v0, $zero, 2 -/* CB9390 80240190 03E00008 */ jr $ra -/* CB9394 80240194 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240330_CC1160.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240330_CC1160.s deleted file mode 100644 index ac55af8dfd..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240330_CC1160.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240330_CC1160 -/* CC1160 80240330 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CC1164 80240334 AFB00010 */ sw $s0, 0x10($sp) -/* CC1168 80240338 0080802D */ daddu $s0, $a0, $zero -/* CC116C 8024033C AFBF0018 */ sw $ra, 0x18($sp) -/* CC1170 80240340 AFB10014 */ sw $s1, 0x14($sp) -/* CC1174 80240344 8E02000C */ lw $v0, 0xc($s0) -/* CC1178 80240348 8C510000 */ lw $s1, ($v0) -/* CC117C 8024034C 0C0B1EAF */ jal get_variable -/* CC1180 80240350 0220282D */ daddu $a1, $s1, $zero -/* CC1184 80240354 3C03FFF0 */ lui $v1, 0xfff0 -/* CC1188 80240358 3463FFFF */ ori $v1, $v1, 0xffff -/* CC118C 8024035C 0200202D */ daddu $a0, $s0, $zero -/* CC1190 80240360 00431024 */ and $v0, $v0, $v1 -/* CC1194 80240364 00021140 */ sll $v0, $v0, 5 -/* CC1198 80240368 3C068008 */ lui $a2, %hi(gItemTable) -/* CC119C 8024036C 00C23021 */ addu $a2, $a2, $v0 -/* CC11A0 80240370 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* CC11A4 80240374 0C0B2026 */ jal set_variable -/* CC11A8 80240378 0220282D */ daddu $a1, $s1, $zero -/* CC11AC 8024037C 8FBF0018 */ lw $ra, 0x18($sp) -/* CC11B0 80240380 8FB10014 */ lw $s1, 0x14($sp) -/* CC11B4 80240384 8FB00010 */ lw $s0, 0x10($sp) -/* CC11B8 80240388 24020002 */ addiu $v0, $zero, 2 -/* CC11BC 8024038C 03E00008 */ jr $ra -/* CC11C0 80240390 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802408A4.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802408A4.s deleted file mode 100644 index 326c45dd49..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802408A4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A4 -/* A0C594 802408A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A0C598 802408A8 AFB00010 */ sw $s0, 0x10($sp) -/* A0C59C 802408AC 0080802D */ daddu $s0, $a0, $zero -/* A0C5A0 802408B0 AFBF0018 */ sw $ra, 0x18($sp) -/* A0C5A4 802408B4 AFB10014 */ sw $s1, 0x14($sp) -/* A0C5A8 802408B8 8E02000C */ lw $v0, 0xc($s0) -/* A0C5AC 802408BC 8C510000 */ lw $s1, ($v0) -/* A0C5B0 802408C0 0C0B1EAF */ jal get_variable -/* A0C5B4 802408C4 0220282D */ daddu $a1, $s1, $zero -/* A0C5B8 802408C8 3C03FFF0 */ lui $v1, 0xfff0 -/* A0C5BC 802408CC 3463FFFF */ ori $v1, $v1, 0xffff -/* A0C5C0 802408D0 0200202D */ daddu $a0, $s0, $zero -/* A0C5C4 802408D4 00431024 */ and $v0, $v0, $v1 -/* A0C5C8 802408D8 00021140 */ sll $v0, $v0, 5 -/* A0C5CC 802408DC 3C068008 */ lui $a2, %hi(gItemTable) -/* A0C5D0 802408E0 00C23021 */ addu $a2, $a2, $v0 -/* A0C5D4 802408E4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* A0C5D8 802408E8 0C0B2026 */ jal set_variable -/* A0C5DC 802408EC 0220282D */ daddu $a1, $s1, $zero -/* A0C5E0 802408F0 8FBF0018 */ lw $ra, 0x18($sp) -/* A0C5E4 802408F4 8FB10014 */ lw $s1, 0x14($sp) -/* A0C5E8 802408F8 8FB00010 */ lw $s0, 0x10($sp) -/* A0C5EC 802408FC 24020002 */ addiu $v0, $zero, 2 -/* A0C5F0 80240900 03E00008 */ jr $ra -/* A0C5F4 80240904 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242558.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242558.s deleted file mode 100644 index 41dea5d8a8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242558.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242558 -/* A1D658 80242558 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1D65C 8024255C AFB00010 */ sw $s0, 0x10($sp) -/* A1D660 80242560 0080802D */ daddu $s0, $a0, $zero -/* A1D664 80242564 AFBF0018 */ sw $ra, 0x18($sp) -/* A1D668 80242568 AFB10014 */ sw $s1, 0x14($sp) -/* A1D66C 8024256C 8E02000C */ lw $v0, 0xc($s0) -/* A1D670 80242570 8C510000 */ lw $s1, ($v0) -/* A1D674 80242574 0C0B1EAF */ jal get_variable -/* A1D678 80242578 0220282D */ daddu $a1, $s1, $zero -/* A1D67C 8024257C 3C03FFF0 */ lui $v1, 0xfff0 -/* A1D680 80242580 3463FFFF */ ori $v1, $v1, 0xffff -/* A1D684 80242584 0200202D */ daddu $a0, $s0, $zero -/* A1D688 80242588 00431024 */ and $v0, $v0, $v1 -/* A1D68C 8024258C 00021140 */ sll $v0, $v0, 5 -/* A1D690 80242590 3C068008 */ lui $a2, %hi(gItemTable) -/* A1D694 80242594 00C23021 */ addu $a2, $a2, $v0 -/* A1D698 80242598 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* A1D69C 8024259C 0C0B2026 */ jal set_variable -/* A1D6A0 802425A0 0220282D */ daddu $a1, $s1, $zero -/* A1D6A4 802425A4 8FBF0018 */ lw $ra, 0x18($sp) -/* A1D6A8 802425A8 8FB10014 */ lw $s1, 0x14($sp) -/* A1D6AC 802425AC 8FB00010 */ lw $s0, 0x10($sp) -/* A1D6B0 802425B0 24020002 */ addiu $v0, $zero, 2 -/* A1D6B4 802425B4 03E00008 */ jr $ra -/* A1D6B8 802425B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0.s index aadefe523f..e0c8dce309 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0.s @@ -39,7 +39,7 @@ glabel func_802409B0 /* A27904 80240A34 C6000000 */ lwc1 $f0, ($s0) /* A27908 80240A38 46800020 */ cvt.s.w $f0, $f0 /* A2790C 80240A3C 44070000 */ mfc1 $a3, $f0 -/* A27910 80240A40 0C0901CD */ jal func_80240734 +/* A27910 80240A40 0C0901CD */ jal func_80240734_A27604 /* A27914 80240A44 24040001 */ addiu $a0, $zero, 1 /* A27918 80240A48 C6200000 */ lwc1 $f0, ($s1) /* A2791C 80240A4C 8E020000 */ lw $v0, ($s0) diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84.s index 85ed5a5458..34152cc743 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84.s @@ -39,7 +39,7 @@ glabel func_80240A84 /* A279D8 80240B08 C6000000 */ lwc1 $f0, ($s0) /* A279DC 80240B0C 46800020 */ cvt.s.w $f0, $f0 /* A279E0 80240B10 44070000 */ mfc1 $a3, $f0 -/* A279E4 80240B14 0C0901CD */ jal func_80240734 +/* A279E4 80240B14 0C0901CD */ jal func_80240734_A27604 /* A279E8 80240B18 24040005 */ addiu $a0, $zero, 5 /* A279EC 80240B1C C6200000 */ lwc1 $f0, ($s1) /* A279F0 80240B20 8E020000 */ lw $v0, ($s0) diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802403C4_A398A4.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802403C4_A398A4.s deleted file mode 100644 index 4b69f1e5f8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802403C4_A398A4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4_A398A4 -/* A398A4 802403C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A398A8 802403C8 AFB00010 */ sw $s0, 0x10($sp) -/* A398AC 802403CC 0080802D */ daddu $s0, $a0, $zero -/* A398B0 802403D0 AFBF0018 */ sw $ra, 0x18($sp) -/* A398B4 802403D4 AFB10014 */ sw $s1, 0x14($sp) -/* A398B8 802403D8 8E02000C */ lw $v0, 0xc($s0) -/* A398BC 802403DC 8C510000 */ lw $s1, ($v0) -/* A398C0 802403E0 0C0B1EAF */ jal get_variable -/* A398C4 802403E4 0220282D */ daddu $a1, $s1, $zero -/* A398C8 802403E8 3C03FFF0 */ lui $v1, 0xfff0 -/* A398CC 802403EC 3463FFFF */ ori $v1, $v1, 0xffff -/* A398D0 802403F0 0200202D */ daddu $a0, $s0, $zero -/* A398D4 802403F4 00431024 */ and $v0, $v0, $v1 -/* A398D8 802403F8 00021140 */ sll $v0, $v0, 5 -/* A398DC 802403FC 3C068008 */ lui $a2, %hi(gItemTable) -/* A398E0 80240400 00C23021 */ addu $a2, $a2, $v0 -/* A398E4 80240404 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* A398E8 80240408 0C0B2026 */ jal set_variable -/* A398EC 8024040C 0220282D */ daddu $a1, $s1, $zero -/* A398F0 80240410 8FBF0018 */ lw $ra, 0x18($sp) -/* A398F4 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* A398F8 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* A398FC 8024041C 24020002 */ addiu $v0, $zero, 2 -/* A39900 80240420 03E00008 */ jr $ra -/* A39904 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241158.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241158.s deleted file mode 100644 index ff427fd2d7..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241158.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241158 -/* A3A638 80241158 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3A63C 8024115C AFB00010 */ sw $s0, 0x10($sp) -/* A3A640 80241160 0080802D */ daddu $s0, $a0, $zero -/* A3A644 80241164 AFBF0018 */ sw $ra, 0x18($sp) -/* A3A648 80241168 AFB10014 */ sw $s1, 0x14($sp) -/* A3A64C 8024116C 8E02000C */ lw $v0, 0xc($s0) -/* A3A650 80241170 8C510000 */ lw $s1, ($v0) -/* A3A654 80241174 0C0B1EAF */ jal get_variable -/* A3A658 80241178 0220282D */ daddu $a1, $s1, $zero -/* A3A65C 8024117C 3C03FFF0 */ lui $v1, 0xfff0 -/* A3A660 80241180 3463FFFF */ ori $v1, $v1, 0xffff -/* A3A664 80241184 0200202D */ daddu $a0, $s0, $zero -/* A3A668 80241188 00431024 */ and $v0, $v0, $v1 -/* A3A66C 8024118C 00021140 */ sll $v0, $v0, 5 -/* A3A670 80241190 3C068008 */ lui $a2, %hi(gItemTable) -/* A3A674 80241194 00C23021 */ addu $a2, $a2, $v0 -/* A3A678 80241198 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* A3A67C 8024119C 0C0B2026 */ jal set_variable -/* A3A680 802411A0 0220282D */ daddu $a1, $s1, $zero -/* A3A684 802411A4 8FBF0018 */ lw $ra, 0x18($sp) -/* A3A688 802411A8 8FB10014 */ lw $s1, 0x14($sp) -/* A3A68C 802411AC 8FB00010 */ lw $s0, 0x10($sp) -/* A3A690 802411B0 24020002 */ addiu $v0, $zero, 2 -/* A3A694 802411B4 03E00008 */ jr $ra -/* A3A698 802411B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242084_A3B564.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242084_A3B564.s deleted file mode 100644 index c1db92aa39..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242084_A3B564.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242084_A3B564 -/* A3B564 80242084 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3B568 80242088 AFB00010 */ sw $s0, 0x10($sp) -/* A3B56C 8024208C 0080802D */ daddu $s0, $a0, $zero -/* A3B570 80242090 AFBF0018 */ sw $ra, 0x18($sp) -/* A3B574 80242094 AFB10014 */ sw $s1, 0x14($sp) -/* A3B578 80242098 8E02000C */ lw $v0, 0xc($s0) -/* A3B57C 8024209C 8C510000 */ lw $s1, ($v0) -/* A3B580 802420A0 0C0B1EAF */ jal get_variable -/* A3B584 802420A4 0220282D */ daddu $a1, $s1, $zero -/* A3B588 802420A8 3C03FFF0 */ lui $v1, 0xfff0 -/* A3B58C 802420AC 3463FFFF */ ori $v1, $v1, 0xffff -/* A3B590 802420B0 0200202D */ daddu $a0, $s0, $zero -/* A3B594 802420B4 00431024 */ and $v0, $v0, $v1 -/* A3B598 802420B8 00021140 */ sll $v0, $v0, 5 -/* A3B59C 802420BC 3C068008 */ lui $a2, %hi(gItemTable) -/* A3B5A0 802420C0 00C23021 */ addu $a2, $a2, $v0 -/* A3B5A4 802420C4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* A3B5A8 802420C8 0C0B2026 */ jal set_variable -/* A3B5AC 802420CC 0220282D */ daddu $a1, $s1, $zero -/* A3B5B0 802420D0 8FBF0018 */ lw $ra, 0x18($sp) -/* A3B5B4 802420D4 8FB10014 */ lw $s1, 0x14($sp) -/* A3B5B8 802420D8 8FB00010 */ lw $s0, 0x10($sp) -/* A3B5BC 802420DC 24020002 */ addiu $v0, $zero, 2 -/* A3B5C0 802420E0 03E00008 */ jr $ra -/* A3B5C4 802420E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_802400B4_986594.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_802400B4_986594.s deleted file mode 100644 index 5039480e02..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_802400B4_986594.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_986594 -/* 986594 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 986598 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* 98659C 802400BC 0080802D */ daddu $s0, $a0, $zero -/* 9865A0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9865A4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* 9865A8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* 9865AC 802400CC 8C510000 */ lw $s1, ($v0) -/* 9865B0 802400D0 0C0B1EAF */ jal get_variable -/* 9865B4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* 9865B8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* 9865BC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* 9865C0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* 9865C4 802400E4 00431024 */ and $v0, $v0, $v1 -/* 9865C8 802400E8 00021140 */ sll $v0, $v0, 5 -/* 9865CC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* 9865D0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* 9865D4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 9865D8 802400F8 0C0B2026 */ jal set_variable -/* 9865DC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* 9865E0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* 9865E4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* 9865E8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* 9865EC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* 9865F0 80240110 03E00008 */ jr $ra -/* 9865F4 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_802400B4_90CCF4.s b/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_802400B4_90CCF4.s deleted file mode 100644 index cdf4fdf652..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_802400B4_90CCF4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_90CCF4 -/* 90CCF4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 90CCF8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* 90CCFC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* 90CD00 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 90CD04 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* 90CD08 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* 90CD0C 802400CC 8C510000 */ lw $s1, ($v0) -/* 90CD10 802400D0 0C0B1EAF */ jal get_variable -/* 90CD14 802400D4 0220282D */ daddu $a1, $s1, $zero -/* 90CD18 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* 90CD1C 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* 90CD20 802400E0 0200202D */ daddu $a0, $s0, $zero -/* 90CD24 802400E4 00431024 */ and $v0, $v0, $v1 -/* 90CD28 802400E8 00021140 */ sll $v0, $v0, 5 -/* 90CD2C 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* 90CD30 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* 90CD34 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 90CD38 802400F8 0C0B2026 */ jal set_variable -/* 90CD3C 802400FC 0220282D */ daddu $a1, $s1, $zero -/* 90CD40 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* 90CD44 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* 90CD48 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* 90CD4C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* 90CD50 80240110 03E00008 */ jr $ra -/* 90CD54 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802400B4_918C64.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802400B4_918C64.s deleted file mode 100644 index 77bf9c3f90..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802400B4_918C64.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_918C64 -/* 918C64 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 918C68 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* 918C6C 802400BC 0080802D */ daddu $s0, $a0, $zero -/* 918C70 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 918C74 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* 918C78 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* 918C7C 802400CC 8C510000 */ lw $s1, ($v0) -/* 918C80 802400D0 0C0B1EAF */ jal get_variable -/* 918C84 802400D4 0220282D */ daddu $a1, $s1, $zero -/* 918C88 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* 918C8C 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* 918C90 802400E0 0200202D */ daddu $a0, $s0, $zero -/* 918C94 802400E4 00431024 */ and $v0, $v0, $v1 -/* 918C98 802400E8 00021140 */ sll $v0, $v0, 5 -/* 918C9C 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* 918CA0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* 918CA4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 918CA8 802400F8 0C0B2026 */ jal set_variable -/* 918CAC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* 918CB0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* 918CB4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* 918CB8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* 918CBC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* 918CC0 80240110 03E00008 */ jr $ra -/* 918CC4 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0.s index 6cb140a1b2..2652961fc9 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0.s @@ -106,7 +106,7 @@ glabel func_80240FD0 /* 919D00 80241150 0200302D */ daddu $a2, $s0, $zero /* 919D04 80241154 0260202D */ daddu $a0, $s3, $zero /* 919D08 80241158 0280282D */ daddu $a1, $s4, $zero -/* 919D0C 8024115C 0C090145 */ jal func_80240514 +/* 919D0C 8024115C 0C090145 */ jal func_80240514_9190C4 /* 919D10 80241160 0200302D */ daddu $a2, $s0, $zero /* 919D14 80241164 8E630070 */ lw $v1, 0x70($s3) /* 919D18 80241168 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s index 8d47fd48c4..8bd8afd955 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s @@ -27,7 +27,7 @@ glabel func_80240410_91E980 /* 91E9D4 80240464 50400008 */ beql $v0, $zero, .L80240488 /* 91E9D8 80240468 26100001 */ addiu $s0, $s0, 1 /* 91E9DC 8024046C 0200202D */ daddu $a0, $s0, $zero -/* 91E9E0 80240470 0C0900F1 */ jal func_802403C4 +/* 91E9E0 80240470 0C0900F1 */ jal func_802403C4_91E934 /* 91E9E4 80240474 00122C03 */ sra $a1, $s2, 0x10 /* 91E9E8 80240478 10540003 */ beq $v0, $s4, .L80240488 /* 91E9EC 8024047C 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s index 38df538efe..6f5fa6b66c 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s @@ -49,7 +49,7 @@ glabel func_802404BC_91EA2C /* 91EAD8 80240568 AE300108 */ sw $s0, 0x108($s1) /* 91EADC 8024056C 8C420000 */ lw $v0, ($v0) /* 91EAE0 80240570 02E0282D */ daddu $a1, $s7, $zero -/* 91EAE4 80240574 0C0900F1 */ jal func_802403C4 +/* 91EAE4 80240574 0C0900F1 */ jal func_802403C4_91E934 /* 91EAE8 80240578 AE220084 */ sw $v0, 0x84($s1) /* 91EAEC 8024057C 0040202D */ daddu $a0, $v0, $zero /* 91EAF0 80240580 04800011 */ bltz $a0, .L802405C8 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802404A8_B209E8.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802404A8_B209E8.s deleted file mode 100644 index 5ce7aed7f5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802404A8_B209E8.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A8_B209E8 -/* B209E8 802404A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B209EC 802404AC AFB00010 */ sw $s0, 0x10($sp) -/* B209F0 802404B0 0080802D */ daddu $s0, $a0, $zero -/* B209F4 802404B4 AFBF0018 */ sw $ra, 0x18($sp) -/* B209F8 802404B8 AFB10014 */ sw $s1, 0x14($sp) -/* B209FC 802404BC 8E02000C */ lw $v0, 0xc($s0) -/* B20A00 802404C0 8C510000 */ lw $s1, ($v0) -/* B20A04 802404C4 0C0B1EAF */ jal get_variable -/* B20A08 802404C8 0220282D */ daddu $a1, $s1, $zero -/* B20A0C 802404CC 3C03FFF0 */ lui $v1, 0xfff0 -/* B20A10 802404D0 3463FFFF */ ori $v1, $v1, 0xffff -/* B20A14 802404D4 0200202D */ daddu $a0, $s0, $zero -/* B20A18 802404D8 00431024 */ and $v0, $v0, $v1 -/* B20A1C 802404DC 00021140 */ sll $v0, $v0, 5 -/* B20A20 802404E0 3C068008 */ lui $a2, %hi(gItemTable) -/* B20A24 802404E4 00C23021 */ addu $a2, $a2, $v0 -/* B20A28 802404E8 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* B20A2C 802404EC 0C0B2026 */ jal set_variable -/* B20A30 802404F0 0220282D */ daddu $a1, $s1, $zero -/* B20A34 802404F4 8FBF0018 */ lw $ra, 0x18($sp) -/* B20A38 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* B20A3C 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* B20A40 80240500 24020002 */ addiu $v0, $zero, 2 -/* B20A44 80240504 03E00008 */ jr $ra -/* B20A48 80240508 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802416C8_B2DB38.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802416C8_B2DB38.s deleted file mode 100644 index d181eec6cf..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802416C8_B2DB38.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C8_B2DB38 -/* B2DB38 802416C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2DB3C 802416CC AFB00010 */ sw $s0, 0x10($sp) -/* B2DB40 802416D0 0080802D */ daddu $s0, $a0, $zero -/* B2DB44 802416D4 AFBF0018 */ sw $ra, 0x18($sp) -/* B2DB48 802416D8 AFB10014 */ sw $s1, 0x14($sp) -/* B2DB4C 802416DC 8E02000C */ lw $v0, 0xc($s0) -/* B2DB50 802416E0 8C510000 */ lw $s1, ($v0) -/* B2DB54 802416E4 0C0B1EAF */ jal get_variable -/* B2DB58 802416E8 0220282D */ daddu $a1, $s1, $zero -/* B2DB5C 802416EC 3C03FFF0 */ lui $v1, 0xfff0 -/* B2DB60 802416F0 3463FFFF */ ori $v1, $v1, 0xffff -/* B2DB64 802416F4 0200202D */ daddu $a0, $s0, $zero -/* B2DB68 802416F8 00431024 */ and $v0, $v0, $v1 -/* B2DB6C 802416FC 00021140 */ sll $v0, $v0, 5 -/* B2DB70 80241700 3C068008 */ lui $a2, %hi(gItemTable) -/* B2DB74 80241704 00C23021 */ addu $a2, $a2, $v0 -/* B2DB78 80241708 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* B2DB7C 8024170C 0C0B2026 */ jal set_variable -/* B2DB80 80241710 0220282D */ daddu $a1, $s1, $zero -/* B2DB84 80241714 8FBF0018 */ lw $ra, 0x18($sp) -/* B2DB88 80241718 8FB10014 */ lw $s1, 0x14($sp) -/* B2DB8C 8024171C 8FB00010 */ lw $s0, 0x10($sp) -/* B2DB90 80241720 24020002 */ addiu $v0, $zero, 2 -/* B2DB94 80241724 03E00008 */ jr $ra -/* B2DB98 80241728 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241C50.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241C50.s deleted file mode 100644 index 4295a2a648..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241C50.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C50 -/* B36820 80241C50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B36824 80241C54 AFB00010 */ sw $s0, 0x10($sp) -/* B36828 80241C58 0080802D */ daddu $s0, $a0, $zero -/* B3682C 80241C5C AFBF0018 */ sw $ra, 0x18($sp) -/* B36830 80241C60 AFB10014 */ sw $s1, 0x14($sp) -/* B36834 80241C64 8E02000C */ lw $v0, 0xc($s0) -/* B36838 80241C68 8C510000 */ lw $s1, ($v0) -/* B3683C 80241C6C 0C0B1EAF */ jal get_variable -/* B36840 80241C70 0220282D */ daddu $a1, $s1, $zero -/* B36844 80241C74 3C03FFF0 */ lui $v1, 0xfff0 -/* B36848 80241C78 3463FFFF */ ori $v1, $v1, 0xffff -/* B3684C 80241C7C 0200202D */ daddu $a0, $s0, $zero -/* B36850 80241C80 00431024 */ and $v0, $v0, $v1 -/* B36854 80241C84 00021140 */ sll $v0, $v0, 5 -/* B36858 80241C88 3C068008 */ lui $a2, %hi(gItemTable) -/* B3685C 80241C8C 00C23021 */ addu $a2, $a2, $v0 -/* B36860 80241C90 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* B36864 80241C94 0C0B2026 */ jal set_variable -/* B36868 80241C98 0220282D */ daddu $a1, $s1, $zero -/* B3686C 80241C9C 8FBF0018 */ lw $ra, 0x18($sp) -/* B36870 80241CA0 8FB10014 */ lw $s1, 0x14($sp) -/* B36874 80241CA4 8FB00010 */ lw $s0, 0x10($sp) -/* B36878 80241CA8 24020002 */ addiu $v0, $zero, 2 -/* B3687C 80241CAC 03E00008 */ jr $ra -/* B36880 80241CB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240404_B44B74.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240404_B44B74.s deleted file mode 100644 index 94b3a904da..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240404_B44B74.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_B44B74 -/* B44B74 80240404 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B44B78 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* B44B7C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* B44B80 80240410 AFBF0018 */ sw $ra, 0x18($sp) -/* B44B84 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* B44B88 80240418 8E02000C */ lw $v0, 0xc($s0) -/* B44B8C 8024041C 8C510000 */ lw $s1, ($v0) -/* B44B90 80240420 0C0B1EAF */ jal get_variable -/* B44B94 80240424 0220282D */ daddu $a1, $s1, $zero -/* B44B98 80240428 3C03FFF0 */ lui $v1, 0xfff0 -/* B44B9C 8024042C 3463FFFF */ ori $v1, $v1, 0xffff -/* B44BA0 80240430 0200202D */ daddu $a0, $s0, $zero -/* B44BA4 80240434 00431024 */ and $v0, $v0, $v1 -/* B44BA8 80240438 00021140 */ sll $v0, $v0, 5 -/* B44BAC 8024043C 3C068008 */ lui $a2, %hi(gItemTable) -/* B44BB0 80240440 00C23021 */ addu $a2, $a2, $v0 -/* B44BB4 80240444 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* B44BB8 80240448 0C0B2026 */ jal set_variable -/* B44BBC 8024044C 0220282D */ daddu $a1, $s1, $zero -/* B44BC0 80240450 8FBF0018 */ lw $ra, 0x18($sp) -/* B44BC4 80240454 8FB10014 */ lw $s1, 0x14($sp) -/* B44BC8 80240458 8FB00010 */ lw $s0, 0x10($sp) -/* B44BCC 8024045C 24020002 */ addiu $v0, $zero, 2 -/* B44BD0 80240460 03E00008 */ jr $ra -/* B44BD4 80240464 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s index 6fbd08fe3d..f7a9e014ba 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s @@ -95,7 +95,7 @@ glabel func_80241494_B4BF04 /* B4C064 802415F4 00000000 */ nop /* B4C068 802415F8 0260202D */ daddu $a0, $s3, $zero /* B4C06C 802415FC 0280282D */ daddu $a1, $s4, $zero -/* B4C070 80241600 0C090229 */ jal func_802408A4 +/* B4C070 80241600 0C090229 */ jal func_802408A4_B4B314 /* B4C074 80241604 0200302D */ daddu $a2, $s0, $zero /* B4C078 80241608 0260202D */ daddu $a0, $s3, $zero /* B4C07C 8024160C 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s index ea213b214d..d1c7f51216 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s @@ -27,7 +27,7 @@ glabel func_80240780_B5EA30 /* B5EA84 802407D4 50400008 */ beql $v0, $zero, .L802407F8 /* B5EA88 802407D8 26100001 */ addiu $s0, $s0, 1 /* B5EA8C 802407DC 0200202D */ daddu $a0, $s0, $zero -/* B5EA90 802407E0 0C0901CD */ jal func_80240734 +/* B5EA90 802407E0 0C0901CD */ jal func_80240734_B5E9E4 /* B5EA94 802407E4 00122C03 */ sra $a1, $s2, 0x10 /* B5EA98 802407E8 10540003 */ beq $v0, $s4, .L802407F8 /* B5EA9C 802407EC 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s index 885465981f..18c144befd 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s @@ -49,7 +49,7 @@ glabel func_8024082C_B5EADC /* B5EB88 802408D8 AE300108 */ sw $s0, 0x108($s1) /* B5EB8C 802408DC 8C420000 */ lw $v0, ($v0) /* B5EB90 802408E0 02E0282D */ daddu $a1, $s7, $zero -/* B5EB94 802408E4 0C0901CD */ jal func_80240734 +/* B5EB94 802408E4 0C0901CD */ jal func_80240734_B5E9E4 /* B5EB98 802408E8 AE220084 */ sw $v0, 0x84($s1) /* B5EB9C 802408EC 0040202D */ daddu $a0, $v0, $zero /* B5EBA0 802408F0 04800011 */ bltz $a0, .L80240938 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84.s index b4e5b67e7a..578141c20a 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84.s @@ -153,7 +153,7 @@ glabel func_80241C84 /* B6016C 80241EBC 00000000 */ nop /* B60170 80241EC0 0C09059A */ jal func_80241668 /* B60174 80241EC4 0240202D */ daddu $a0, $s2, $zero -/* B60178 80241EC8 0C0905B5 */ jal func_802416D4 +/* B60178 80241EC8 0C0905B5 */ jal func_802416D4_B5F984 /* B6017C 80241ECC 0240202D */ daddu $a0, $s2, $zero /* B60180 80241ED0 8E430070 */ lw $v1, 0x70($s2) /* B60184 80241ED4 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38.s index 964e013d22..cd71bb90e9 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38.s @@ -153,7 +153,7 @@ glabel func_80241F38 /* B60420 80242170 00000000 */ nop /* B60424 80242174 0C09059A */ jal func_80241668 /* B60428 80242178 0240202D */ daddu $a0, $s2, $zero -/* B6042C 8024217C 0C0905B5 */ jal func_802416D4 +/* B6042C 8024217C 0C0905B5 */ jal func_802416D4_B5F984 /* B60430 80242180 0240202D */ daddu $a0, $s2, $zero /* B60434 80242184 8E430070 */ lw $v1, 0x70($s2) /* B60438 80242188 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240F44_B850C4.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240F44_B850C4.s deleted file mode 100644 index ce5ddf8897..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240F44_B850C4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F44_B850C4 -/* B850C4 80240F44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B850C8 80240F48 AFB00010 */ sw $s0, 0x10($sp) -/* B850CC 80240F4C 0080802D */ daddu $s0, $a0, $zero -/* B850D0 80240F50 AFBF0018 */ sw $ra, 0x18($sp) -/* B850D4 80240F54 AFB10014 */ sw $s1, 0x14($sp) -/* B850D8 80240F58 8E02000C */ lw $v0, 0xc($s0) -/* B850DC 80240F5C 8C510000 */ lw $s1, ($v0) -/* B850E0 80240F60 0C0B1EAF */ jal get_variable -/* B850E4 80240F64 0220282D */ daddu $a1, $s1, $zero -/* B850E8 80240F68 3C03FFF0 */ lui $v1, 0xfff0 -/* B850EC 80240F6C 3463FFFF */ ori $v1, $v1, 0xffff -/* B850F0 80240F70 0200202D */ daddu $a0, $s0, $zero -/* B850F4 80240F74 00431024 */ and $v0, $v0, $v1 -/* B850F8 80240F78 00021140 */ sll $v0, $v0, 5 -/* B850FC 80240F7C 3C068008 */ lui $a2, %hi(gItemTable) -/* B85100 80240F80 00C23021 */ addu $a2, $a2, $v0 -/* B85104 80240F84 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* B85108 80240F88 0C0B2026 */ jal set_variable -/* B8510C 80240F8C 0220282D */ daddu $a1, $s1, $zero -/* B85110 80240F90 8FBF0018 */ lw $ra, 0x18($sp) -/* B85114 80240F94 8FB10014 */ lw $s1, 0x14($sp) -/* B85118 80240F98 8FB00010 */ lw $s0, 0x10($sp) -/* B8511C 80240F9C 24020002 */ addiu $v0, $zero, 2 -/* B85120 80240FA0 03E00008 */ jr $ra -/* B85124 80240FA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802400B4_AF1D14.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802400B4_AF1D14.s deleted file mode 100644 index 7248ebe6ce..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802400B4_AF1D14.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_AF1D14 -/* AF1D14 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF1D18 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* AF1D1C 802400BC 0080802D */ daddu $s0, $a0, $zero -/* AF1D20 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* AF1D24 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* AF1D28 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* AF1D2C 802400CC 8C510000 */ lw $s1, ($v0) -/* AF1D30 802400D0 0C0B1EAF */ jal get_variable -/* AF1D34 802400D4 0220282D */ daddu $a1, $s1, $zero -/* AF1D38 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* AF1D3C 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* AF1D40 802400E0 0200202D */ daddu $a0, $s0, $zero -/* AF1D44 802400E4 00431024 */ and $v0, $v0, $v1 -/* AF1D48 802400E8 00021140 */ sll $v0, $v0, 5 -/* AF1D4C 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* AF1D50 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* AF1D54 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* AF1D58 802400F8 0C0B2026 */ jal set_variable -/* AF1D5C 802400FC 0220282D */ daddu $a1, $s1, $zero -/* AF1D60 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* AF1D64 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* AF1D68 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* AF1D6C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* AF1D70 80240110 03E00008 */ jr $ra -/* AF1D74 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_802400B4_AFDBF4.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_802400B4_AFDBF4.s deleted file mode 100644 index 7f77b044b7..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_802400B4_AFDBF4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_AFDBF4 -/* AFDBF4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AFDBF8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* AFDBFC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* AFDC00 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* AFDC04 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* AFDC08 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* AFDC0C 802400CC 8C510000 */ lw $s1, ($v0) -/* AFDC10 802400D0 0C0B1EAF */ jal get_variable -/* AFDC14 802400D4 0220282D */ daddu $a1, $s1, $zero -/* AFDC18 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* AFDC1C 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* AFDC20 802400E0 0200202D */ daddu $a0, $s0, $zero -/* AFDC24 802400E4 00431024 */ and $v0, $v0, $v1 -/* AFDC28 802400E8 00021140 */ sll $v0, $v0, 5 -/* AFDC2C 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* AFDC30 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* AFDC34 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* AFDC38 802400F8 0C0B2026 */ jal set_variable -/* AFDC3C 802400FC 0220282D */ daddu $a1, $s1, $zero -/* AFDC40 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* AFDC44 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* AFDC48 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* AFDC4C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* AFDC50 80240110 03E00008 */ jr $ra -/* AFDC54 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240444.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240444.s deleted file mode 100644 index 5a6a5b8ec2..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240444.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240444 -/* 8B04B4 80240444 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B04B8 80240448 AFB00010 */ sw $s0, 0x10($sp) -/* 8B04BC 8024044C 0080802D */ daddu $s0, $a0, $zero -/* 8B04C0 80240450 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B04C4 80240454 AFB10014 */ sw $s1, 0x14($sp) -/* 8B04C8 80240458 8E02000C */ lw $v0, 0xc($s0) -/* 8B04CC 8024045C 8C510000 */ lw $s1, ($v0) -/* 8B04D0 80240460 0C0B1EAF */ jal get_variable -/* 8B04D4 80240464 0220282D */ daddu $a1, $s1, $zero -/* 8B04D8 80240468 3C03FFF0 */ lui $v1, 0xfff0 -/* 8B04DC 8024046C 3463FFFF */ ori $v1, $v1, 0xffff -/* 8B04E0 80240470 0200202D */ daddu $a0, $s0, $zero -/* 8B04E4 80240474 00431024 */ and $v0, $v0, $v1 -/* 8B04E8 80240478 00021140 */ sll $v0, $v0, 5 -/* 8B04EC 8024047C 3C068008 */ lui $a2, %hi(gItemTable) -/* 8B04F0 80240480 00C23021 */ addu $a2, $a2, $v0 -/* 8B04F4 80240484 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 8B04F8 80240488 0C0B2026 */ jal set_variable -/* 8B04FC 8024048C 0220282D */ daddu $a1, $s1, $zero -/* 8B0500 80240490 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B0504 80240494 8FB10014 */ lw $s1, 0x14($sp) -/* 8B0508 80240498 8FB00010 */ lw $s0, 0x10($sp) -/* 8B050C 8024049C 24020002 */ addiu $v0, $zero, 2 -/* 8B0510 802404A0 03E00008 */ jr $ra -/* 8B0514 802404A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024037C.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024037C.s deleted file mode 100644 index 7ee1ec41e8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024037C.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024037C -/* 8CAC7C 8024037C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8CAC80 80240380 AFB00010 */ sw $s0, 0x10($sp) -/* 8CAC84 80240384 0080802D */ daddu $s0, $a0, $zero -/* 8CAC88 80240388 AFBF0018 */ sw $ra, 0x18($sp) -/* 8CAC8C 8024038C AFB10014 */ sw $s1, 0x14($sp) -/* 8CAC90 80240390 8E02000C */ lw $v0, 0xc($s0) -/* 8CAC94 80240394 8C510000 */ lw $s1, ($v0) -/* 8CAC98 80240398 0C0B1EAF */ jal get_variable -/* 8CAC9C 8024039C 0220282D */ daddu $a1, $s1, $zero -/* 8CACA0 802403A0 3C03FFF0 */ lui $v1, 0xfff0 -/* 8CACA4 802403A4 3463FFFF */ ori $v1, $v1, 0xffff -/* 8CACA8 802403A8 0200202D */ daddu $a0, $s0, $zero -/* 8CACAC 802403AC 00431024 */ and $v0, $v0, $v1 -/* 8CACB0 802403B0 00021140 */ sll $v0, $v0, 5 -/* 8CACB4 802403B4 3C068008 */ lui $a2, %hi(gItemTable) -/* 8CACB8 802403B8 00C23021 */ addu $a2, $a2, $v0 -/* 8CACBC 802403BC 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 8CACC0 802403C0 0C0B2026 */ jal set_variable -/* 8CACC4 802403C4 0220282D */ daddu $a1, $s1, $zero -/* 8CACC8 802403C8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8CACCC 802403CC 8FB10014 */ lw $s1, 0x14($sp) -/* 8CACD0 802403D0 8FB00010 */ lw $s0, 0x10($sp) -/* 8CACD4 802403D4 24020002 */ addiu $v0, $zero, 2 -/* 8CACD8 802403D8 03E00008 */ jr $ra -/* 8CACDC 802403DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_802400B4_8D8584.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_802400B4_8D8584.s deleted file mode 100644 index 8d867a8335..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_802400B4_8D8584.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_8D8584 -/* 8D8584 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D8588 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D858C 802400BC 0080802D */ daddu $s0, $a0, $zero -/* 8D8590 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8D8594 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* 8D8598 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* 8D859C 802400CC 8C510000 */ lw $s1, ($v0) -/* 8D85A0 802400D0 0C0B1EAF */ jal get_variable -/* 8D85A4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* 8D85A8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* 8D85AC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* 8D85B0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* 8D85B4 802400E4 00431024 */ and $v0, $v0, $v1 -/* 8D85B8 802400E8 00021140 */ sll $v0, $v0, 5 -/* 8D85BC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* 8D85C0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* 8D85C4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 8D85C8 802400F8 0C0B2026 */ jal set_variable -/* 8D85CC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* 8D85D0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* 8D85D4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* 8D85D8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* 8D85DC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* 8D85E0 80240110 03E00008 */ jr $ra -/* 8D85E4 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_802416D4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_802416D4.s deleted file mode 100644 index ef823c3d18..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_802416D4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416D4 -/* 8ED4F4 802416D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8ED4F8 802416D8 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED4FC 802416DC 0080802D */ daddu $s0, $a0, $zero -/* 8ED500 802416E0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8ED504 802416E4 AFB10014 */ sw $s1, 0x14($sp) -/* 8ED508 802416E8 8E02000C */ lw $v0, 0xc($s0) -/* 8ED50C 802416EC 8C510000 */ lw $s1, ($v0) -/* 8ED510 802416F0 0C0B1EAF */ jal get_variable -/* 8ED514 802416F4 0220282D */ daddu $a1, $s1, $zero -/* 8ED518 802416F8 3C03FFF0 */ lui $v1, 0xfff0 -/* 8ED51C 802416FC 3463FFFF */ ori $v1, $v1, 0xffff -/* 8ED520 80241700 0200202D */ daddu $a0, $s0, $zero -/* 8ED524 80241704 00431024 */ and $v0, $v0, $v1 -/* 8ED528 80241708 00021140 */ sll $v0, $v0, 5 -/* 8ED52C 8024170C 3C068008 */ lui $a2, %hi(gItemTable) -/* 8ED530 80241710 00C23021 */ addu $a2, $a2, $v0 -/* 8ED534 80241714 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 8ED538 80241718 0C0B2026 */ jal set_variable -/* 8ED53C 8024171C 0220282D */ daddu $a1, $s1, $zero -/* 8ED540 80241720 8FBF0018 */ lw $ra, 0x18($sp) -/* 8ED544 80241724 8FB10014 */ lw $s1, 0x14($sp) -/* 8ED548 80241728 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED54C 8024172C 24020002 */ addiu $v0, $zero, 2 -/* 8ED550 80241730 03E00008 */ jr $ra -/* 8ED554 80241734 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240434_A578E4.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240434_A578E4.s deleted file mode 100644 index c77d44ff35..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240434_A578E4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434_A578E4 -/* A578E4 80240434 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A578E8 80240438 AFB00010 */ sw $s0, 0x10($sp) -/* A578EC 8024043C 0080802D */ daddu $s0, $a0, $zero -/* A578F0 80240440 AFBF0018 */ sw $ra, 0x18($sp) -/* A578F4 80240444 AFB10014 */ sw $s1, 0x14($sp) -/* A578F8 80240448 8E02000C */ lw $v0, 0xc($s0) -/* A578FC 8024044C 8C510000 */ lw $s1, ($v0) -/* A57900 80240450 0C0B1EAF */ jal get_variable -/* A57904 80240454 0220282D */ daddu $a1, $s1, $zero -/* A57908 80240458 3C03FFF0 */ lui $v1, 0xfff0 -/* A5790C 8024045C 3463FFFF */ ori $v1, $v1, 0xffff -/* A57910 80240460 0200202D */ daddu $a0, $s0, $zero -/* A57914 80240464 00431024 */ and $v0, $v0, $v1 -/* A57918 80240468 00021140 */ sll $v0, $v0, 5 -/* A5791C 8024046C 3C068008 */ lui $a2, %hi(gItemTable) -/* A57920 80240470 00C23021 */ addu $a2, $a2, $v0 -/* A57924 80240474 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* A57928 80240478 0C0B2026 */ jal set_variable -/* A5792C 8024047C 0220282D */ daddu $a1, $s1, $zero -/* A57930 80240480 8FBF0018 */ lw $ra, 0x18($sp) -/* A57934 80240484 8FB10014 */ lw $s1, 0x14($sp) -/* A57938 80240488 8FB00010 */ lw $s0, 0x10($sp) -/* A5793C 8024048C 24020002 */ addiu $v0, $zero, 2 -/* A57940 80240490 03E00008 */ jr $ra -/* A57944 80240494 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_802403C4_A59754.s b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_802403C4_A59754.s deleted file mode 100644 index 341e076842..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_802403C4_A59754.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4_A59754 -/* A59754 802403C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A59758 802403C8 AFB00010 */ sw $s0, 0x10($sp) -/* A5975C 802403CC 0080802D */ daddu $s0, $a0, $zero -/* A59760 802403D0 AFBF0018 */ sw $ra, 0x18($sp) -/* A59764 802403D4 AFB10014 */ sw $s1, 0x14($sp) -/* A59768 802403D8 8E02000C */ lw $v0, 0xc($s0) -/* A5976C 802403DC 8C510000 */ lw $s1, ($v0) -/* A59770 802403E0 0C0B1EAF */ jal get_variable -/* A59774 802403E4 0220282D */ daddu $a1, $s1, $zero -/* A59778 802403E8 3C03FFF0 */ lui $v1, 0xfff0 -/* A5977C 802403EC 3463FFFF */ ori $v1, $v1, 0xffff -/* A59780 802403F0 0200202D */ daddu $a0, $s0, $zero -/* A59784 802403F4 00431024 */ and $v0, $v0, $v1 -/* A59788 802403F8 00021140 */ sll $v0, $v0, 5 -/* A5978C 802403FC 3C068008 */ lui $a2, %hi(gItemTable) -/* A59790 80240400 00C23021 */ addu $a2, $a2, $v0 -/* A59794 80240404 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* A59798 80240408 0C0B2026 */ jal set_variable -/* A5979C 8024040C 0220282D */ daddu $a1, $s1, $zero -/* A597A0 80240410 8FBF0018 */ lw $ra, 0x18($sp) -/* A597A4 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* A597A8 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* A597AC 8024041C 24020002 */ addiu $v0, $zero, 2 -/* A597B0 80240420 03E00008 */ jr $ra -/* A597B4 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index edb6cb3a51..db96113509 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s @@ -186,7 +186,7 @@ glabel func_80240FD4_A680D4 /* A68388 80241288 0260202D */ daddu $a0, $s3, $zero /* A6838C 8024128C 080904B3 */ j .L802412CC /* A68390 80241290 00000000 */ nop -/* A68394 80241294 0C090145 */ jal func_80240514 +/* A68394 80241294 0C090145 */ jal func_80240514_A67614 /* A68398 80241298 0260202D */ daddu $a0, $s3, $zero /* A6839C 8024129C 080904B3 */ j .L802412CC /* A683A0 802412A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242080_C5C7C0.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242080_C5C7C0.s deleted file mode 100644 index be74099cea..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242080_C5C7C0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242080_C5C7C0 -/* C5C7C0 80242080 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5C7C4 80242084 AFB00010 */ sw $s0, 0x10($sp) -/* C5C7C8 80242088 0080802D */ daddu $s0, $a0, $zero -/* C5C7CC 8024208C AFBF0018 */ sw $ra, 0x18($sp) -/* C5C7D0 80242090 AFB10014 */ sw $s1, 0x14($sp) -/* C5C7D4 80242094 8E02000C */ lw $v0, 0xc($s0) -/* C5C7D8 80242098 8C510000 */ lw $s1, ($v0) -/* C5C7DC 8024209C 0C0B1EAF */ jal get_variable -/* C5C7E0 802420A0 0220282D */ daddu $a1, $s1, $zero -/* C5C7E4 802420A4 3C03FFF0 */ lui $v1, 0xfff0 -/* C5C7E8 802420A8 3463FFFF */ ori $v1, $v1, 0xffff -/* C5C7EC 802420AC 0200202D */ daddu $a0, $s0, $zero -/* C5C7F0 802420B0 00431024 */ and $v0, $v0, $v1 -/* C5C7F4 802420B4 00021140 */ sll $v0, $v0, 5 -/* C5C7F8 802420B8 3C068008 */ lui $a2, %hi(gItemTable) -/* C5C7FC 802420BC 00C23021 */ addu $a2, $a2, $v0 -/* C5C800 802420C0 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C5C804 802420C4 0C0B2026 */ jal set_variable -/* C5C808 802420C8 0220282D */ daddu $a1, $s1, $zero -/* C5C80C 802420CC 8FBF0018 */ lw $ra, 0x18($sp) -/* C5C810 802420D0 8FB10014 */ lw $s1, 0x14($sp) -/* C5C814 802420D4 8FB00010 */ lw $s0, 0x10($sp) -/* C5C818 802420D8 24020002 */ addiu $v0, $zero, 2 -/* C5C81C 802420DC 03E00008 */ jr $ra -/* C5C820 802420E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242650.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242650.s deleted file mode 100644 index 560860d068..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242650.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242650 -/* C63360 80242650 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C63364 80242654 AFB00010 */ sw $s0, 0x10($sp) -/* C63368 80242658 0080802D */ daddu $s0, $a0, $zero -/* C6336C 8024265C AFBF0018 */ sw $ra, 0x18($sp) -/* C63370 80242660 AFB10014 */ sw $s1, 0x14($sp) -/* C63374 80242664 8E02000C */ lw $v0, 0xc($s0) -/* C63378 80242668 8C510000 */ lw $s1, ($v0) -/* C6337C 8024266C 0C0B1EAF */ jal get_variable -/* C63380 80242670 0220282D */ daddu $a1, $s1, $zero -/* C63384 80242674 3C03FFF0 */ lui $v1, 0xfff0 -/* C63388 80242678 3463FFFF */ ori $v1, $v1, 0xffff -/* C6338C 8024267C 0200202D */ daddu $a0, $s0, $zero -/* C63390 80242680 00431024 */ and $v0, $v0, $v1 -/* C63394 80242684 00021140 */ sll $v0, $v0, 5 -/* C63398 80242688 3C068008 */ lui $a2, %hi(gItemTable) -/* C6339C 8024268C 00C23021 */ addu $a2, $a2, $v0 -/* C633A0 80242690 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C633A4 80242694 0C0B2026 */ jal set_variable -/* C633A8 80242698 0220282D */ daddu $a1, $s1, $zero -/* C633AC 8024269C 8FBF0018 */ lw $ra, 0x18($sp) -/* C633B0 802426A0 8FB10014 */ lw $s1, 0x14($sp) -/* C633B4 802426A4 8FB00010 */ lw $s0, 0x10($sp) -/* C633B8 802426A8 24020002 */ addiu $v0, $zero, 2 -/* C633BC 802426AC 03E00008 */ jr $ra -/* C633C0 802426B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240844_C71CC4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240844_C71CC4.s deleted file mode 100644 index 46a06d2c4e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240844_C71CC4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240844_C71CC4 -/* C71CC4 80240844 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C71CC8 80240848 AFB00010 */ sw $s0, 0x10($sp) -/* C71CCC 8024084C 0080802D */ daddu $s0, $a0, $zero -/* C71CD0 80240850 AFBF0018 */ sw $ra, 0x18($sp) -/* C71CD4 80240854 AFB10014 */ sw $s1, 0x14($sp) -/* C71CD8 80240858 8E02000C */ lw $v0, 0xc($s0) -/* C71CDC 8024085C 8C510000 */ lw $s1, ($v0) -/* C71CE0 80240860 0C0B1EAF */ jal get_variable -/* C71CE4 80240864 0220282D */ daddu $a1, $s1, $zero -/* C71CE8 80240868 3C03FFF0 */ lui $v1, 0xfff0 -/* C71CEC 8024086C 3463FFFF */ ori $v1, $v1, 0xffff -/* C71CF0 80240870 0200202D */ daddu $a0, $s0, $zero -/* C71CF4 80240874 00431024 */ and $v0, $v0, $v1 -/* C71CF8 80240878 00021140 */ sll $v0, $v0, 5 -/* C71CFC 8024087C 3C068008 */ lui $a2, %hi(gItemTable) -/* C71D00 80240880 00C23021 */ addu $a2, $a2, $v0 -/* C71D04 80240884 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C71D08 80240888 0C0B2026 */ jal set_variable -/* C71D0C 8024088C 0220282D */ daddu $a1, $s1, $zero -/* C71D10 80240890 8FBF0018 */ lw $ra, 0x18($sp) -/* C71D14 80240894 8FB10014 */ lw $s1, 0x14($sp) -/* C71D18 80240898 8FB00010 */ lw $s0, 0x10($sp) -/* C71D1C 8024089C 24020002 */ addiu $v0, $zero, 2 -/* C71D20 802408A0 03E00008 */ jr $ra -/* C71D24 802408A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243360.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243360.s deleted file mode 100644 index 7a68fe48da..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243360.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243360 -/* C7A040 80243360 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7A044 80243364 AFB00010 */ sw $s0, 0x10($sp) -/* C7A048 80243368 0080802D */ daddu $s0, $a0, $zero -/* C7A04C 8024336C AFBF0018 */ sw $ra, 0x18($sp) -/* C7A050 80243370 AFB10014 */ sw $s1, 0x14($sp) -/* C7A054 80243374 8E02000C */ lw $v0, 0xc($s0) -/* C7A058 80243378 8C510000 */ lw $s1, ($v0) -/* C7A05C 8024337C 0C0B1EAF */ jal get_variable -/* C7A060 80243380 0220282D */ daddu $a1, $s1, $zero -/* C7A064 80243384 3C03FFF0 */ lui $v1, 0xfff0 -/* C7A068 80243388 3463FFFF */ ori $v1, $v1, 0xffff -/* C7A06C 8024338C 0200202D */ daddu $a0, $s0, $zero -/* C7A070 80243390 00431024 */ and $v0, $v0, $v1 -/* C7A074 80243394 00021140 */ sll $v0, $v0, 5 -/* C7A078 80243398 3C068008 */ lui $a2, %hi(gItemTable) -/* C7A07C 8024339C 00C23021 */ addu $a2, $a2, $v0 -/* C7A080 802433A0 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C7A084 802433A4 0C0B2026 */ jal set_variable -/* C7A088 802433A8 0220282D */ daddu $a1, $s1, $zero -/* C7A08C 802433AC 8FBF0018 */ lw $ra, 0x18($sp) -/* C7A090 802433B0 8FB10014 */ lw $s1, 0x14($sp) -/* C7A094 802433B4 8FB00010 */ lw $s0, 0x10($sp) -/* C7A098 802433B8 24020002 */ addiu $v0, $zero, 2 -/* C7A09C 802433BC 03E00008 */ jr $ra -/* C7A0A0 802433C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s index fc4d2fc2c7..866fa80ace 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s @@ -153,7 +153,7 @@ glabel func_8024092C_C863DC /* C86614 80240B64 00000000 */ nop /* C86618 80240B68 0C0900C4 */ jal func_80240310 /* C8661C 80240B6C 0240202D */ daddu $a0, $s2, $zero -/* C86620 80240B70 0C0900DF */ jal func_8024037C +/* C86620 80240B70 0C0900DF */ jal func_8024037C_C85E2C /* C86624 80240B74 0240202D */ daddu $a0, $s2, $zero /* C86628 80240B78 8E430070 */ lw $v1, 0x70($s2) /* C8662C 80240B7C 24020020 */ addiu $v0, $zero, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242650_C88100.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242650_C88100.s deleted file mode 100644 index c37789fcd3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242650_C88100.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242650_C88100 -/* C88100 80242650 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C88104 80242654 AFB00010 */ sw $s0, 0x10($sp) -/* C88108 80242658 0080802D */ daddu $s0, $a0, $zero -/* C8810C 8024265C AFBF0018 */ sw $ra, 0x18($sp) -/* C88110 80242660 AFB10014 */ sw $s1, 0x14($sp) -/* C88114 80242664 8E02000C */ lw $v0, 0xc($s0) -/* C88118 80242668 8C510000 */ lw $s1, ($v0) -/* C8811C 8024266C 0C0B1EAF */ jal get_variable -/* C88120 80242670 0220282D */ daddu $a1, $s1, $zero -/* C88124 80242674 3C03FFF0 */ lui $v1, 0xfff0 -/* C88128 80242678 3463FFFF */ ori $v1, $v1, 0xffff -/* C8812C 8024267C 0200202D */ daddu $a0, $s0, $zero -/* C88130 80242680 00431024 */ and $v0, $v0, $v1 -/* C88134 80242684 00021140 */ sll $v0, $v0, 5 -/* C88138 80242688 3C068008 */ lui $a2, %hi(gItemTable) -/* C8813C 8024268C 00C23021 */ addu $a2, $a2, $v0 -/* C88140 80242690 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C88144 80242694 0C0B2026 */ jal set_variable -/* C88148 80242698 0220282D */ daddu $a1, $s1, $zero -/* C8814C 8024269C 8FBF0018 */ lw $ra, 0x18($sp) -/* C88150 802426A0 8FB10014 */ lw $s1, 0x14($sp) -/* C88154 802426A4 8FB00010 */ lw $s0, 0x10($sp) -/* C88158 802426A8 24020002 */ addiu $v0, $zero, 2 -/* C8815C 802426AC 03E00008 */ jr $ra -/* C88160 802426B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024151C.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024151C.s deleted file mode 100644 index c990efc3c4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024151C.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024151C -/* C8F0CC 8024151C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8F0D0 80241520 AFB00010 */ sw $s0, 0x10($sp) -/* C8F0D4 80241524 0080802D */ daddu $s0, $a0, $zero -/* C8F0D8 80241528 AFBF0018 */ sw $ra, 0x18($sp) -/* C8F0DC 8024152C AFB10014 */ sw $s1, 0x14($sp) -/* C8F0E0 80241530 8E02000C */ lw $v0, 0xc($s0) -/* C8F0E4 80241534 8C510000 */ lw $s1, ($v0) -/* C8F0E8 80241538 0C0B1EAF */ jal get_variable -/* C8F0EC 8024153C 0220282D */ daddu $a1, $s1, $zero -/* C8F0F0 80241540 3C03FFF0 */ lui $v1, 0xfff0 -/* C8F0F4 80241544 3463FFFF */ ori $v1, $v1, 0xffff -/* C8F0F8 80241548 0200202D */ daddu $a0, $s0, $zero -/* C8F0FC 8024154C 00431024 */ and $v0, $v0, $v1 -/* C8F100 80241550 00021140 */ sll $v0, $v0, 5 -/* C8F104 80241554 3C068008 */ lui $a2, %hi(gItemTable) -/* C8F108 80241558 00C23021 */ addu $a2, $a2, $v0 -/* C8F10C 8024155C 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C8F110 80241560 0C0B2026 */ jal set_variable -/* C8F114 80241564 0220282D */ daddu $a1, $s1, $zero -/* C8F118 80241568 8FBF0018 */ lw $ra, 0x18($sp) -/* C8F11C 8024156C 8FB10014 */ lw $s1, 0x14($sp) -/* C8F120 80241570 8FB00010 */ lw $s0, 0x10($sp) -/* C8F124 80241574 24020002 */ addiu $v0, $zero, 2 -/* C8F128 80241578 03E00008 */ jr $ra -/* C8F12C 8024157C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802403C4_C962F4.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802403C4_C962F4.s deleted file mode 100644 index c83eba0f10..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802403C4_C962F4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4_C962F4 -/* C962F4 802403C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C962F8 802403C8 AFB00010 */ sw $s0, 0x10($sp) -/* C962FC 802403CC 0080802D */ daddu $s0, $a0, $zero -/* C96300 802403D0 AFBF0018 */ sw $ra, 0x18($sp) -/* C96304 802403D4 AFB10014 */ sw $s1, 0x14($sp) -/* C96308 802403D8 8E02000C */ lw $v0, 0xc($s0) -/* C9630C 802403DC 8C510000 */ lw $s1, ($v0) -/* C96310 802403E0 0C0B1EAF */ jal get_variable -/* C96314 802403E4 0220282D */ daddu $a1, $s1, $zero -/* C96318 802403E8 3C03FFF0 */ lui $v1, 0xfff0 -/* C9631C 802403EC 3463FFFF */ ori $v1, $v1, 0xffff -/* C96320 802403F0 0200202D */ daddu $a0, $s0, $zero -/* C96324 802403F4 00431024 */ and $v0, $v0, $v1 -/* C96328 802403F8 00021140 */ sll $v0, $v0, 5 -/* C9632C 802403FC 3C068008 */ lui $a2, %hi(gItemTable) -/* C96330 80240400 00C23021 */ addu $a2, $a2, $v0 -/* C96334 80240404 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* C96338 80240408 0C0B2026 */ jal set_variable -/* C9633C 8024040C 0220282D */ daddu $a1, $s1, $zero -/* C96340 80240410 8FBF0018 */ lw $ra, 0x18($sp) -/* C96344 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* C96348 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* C9634C 8024041C 24020002 */ addiu $v0, $zero, 2 -/* C96350 80240420 03E00008 */ jr $ra -/* C96354 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802406E4.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802406E4.s deleted file mode 100644 index ee209fa678..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802406E4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E4 -/* 7EB3F4 802406E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EB3F8 802406E8 AFB00010 */ sw $s0, 0x10($sp) -/* 7EB3FC 802406EC 0080802D */ daddu $s0, $a0, $zero -/* 7EB400 802406F0 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EB404 802406F4 AFB10014 */ sw $s1, 0x14($sp) -/* 7EB408 802406F8 8E02000C */ lw $v0, 0xc($s0) -/* 7EB40C 802406FC 8C510000 */ lw $s1, ($v0) -/* 7EB410 80240700 0C0B1EAF */ jal get_variable -/* 7EB414 80240704 0220282D */ daddu $a1, $s1, $zero -/* 7EB418 80240708 3C03FFF0 */ lui $v1, 0xfff0 -/* 7EB41C 8024070C 3463FFFF */ ori $v1, $v1, 0xffff -/* 7EB420 80240710 0200202D */ daddu $a0, $s0, $zero -/* 7EB424 80240714 00431024 */ and $v0, $v0, $v1 -/* 7EB428 80240718 00021140 */ sll $v0, $v0, 5 -/* 7EB42C 8024071C 3C068008 */ lui $a2, %hi(gItemTable) -/* 7EB430 80240720 00C23021 */ addu $a2, $a2, $v0 -/* 7EB434 80240724 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 7EB438 80240728 0C0B2026 */ jal set_variable -/* 7EB43C 8024072C 0220282D */ daddu $a1, $s1, $zero -/* 7EB440 80240730 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EB444 80240734 8FB10014 */ lw $s1, 0x14($sp) -/* 7EB448 80240738 8FB00010 */ lw $s0, 0x10($sp) -/* 7EB44C 8024073C 24020002 */ addiu $v0, $zero, 2 -/* 7EB450 80240740 03E00008 */ jr $ra -/* 7EB454 80240744 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802434B4.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802434B4.s deleted file mode 100644 index 5ee985bf6a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802434B4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802434B4 -/* 7EE1C4 802434B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EE1C8 802434B8 AFB00010 */ sw $s0, 0x10($sp) -/* 7EE1CC 802434BC 0080802D */ daddu $s0, $a0, $zero -/* 7EE1D0 802434C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EE1D4 802434C4 AFB10014 */ sw $s1, 0x14($sp) -/* 7EE1D8 802434C8 8E02000C */ lw $v0, 0xc($s0) -/* 7EE1DC 802434CC 8C510000 */ lw $s1, ($v0) -/* 7EE1E0 802434D0 0C0B1EAF */ jal get_variable -/* 7EE1E4 802434D4 0220282D */ daddu $a1, $s1, $zero -/* 7EE1E8 802434D8 3C03FFF0 */ lui $v1, 0xfff0 -/* 7EE1EC 802434DC 3463FFFF */ ori $v1, $v1, 0xffff -/* 7EE1F0 802434E0 0200202D */ daddu $a0, $s0, $zero -/* 7EE1F4 802434E4 00431024 */ and $v0, $v0, $v1 -/* 7EE1F8 802434E8 00021140 */ sll $v0, $v0, 5 -/* 7EE1FC 802434EC 3C068008 */ lui $a2, %hi(gItemTable) -/* 7EE200 802434F0 00C23021 */ addu $a2, $a2, $v0 -/* 7EE204 802434F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 7EE208 802434F8 0C0B2026 */ jal set_variable -/* 7EE20C 802434FC 0220282D */ daddu $a1, $s1, $zero -/* 7EE210 80243500 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EE214 80243504 8FB10014 */ lw $s1, 0x14($sp) -/* 7EE218 80243508 8FB00010 */ lw $s0, 0x10($sp) -/* 7EE21C 8024350C 24020002 */ addiu $v0, $zero, 2 -/* 7EE220 80243510 03E00008 */ jr $ra -/* 7EE224 80243514 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241FC4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241FC4.s deleted file mode 100644 index ce49bc1ea9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241FC4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FC4 -/* 802844 80241FC4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 802848 80241FC8 AFB00010 */ sw $s0, 0x10($sp) -/* 80284C 80241FCC 0080802D */ daddu $s0, $a0, $zero -/* 802850 80241FD0 AFBF0018 */ sw $ra, 0x18($sp) -/* 802854 80241FD4 AFB10014 */ sw $s1, 0x14($sp) -/* 802858 80241FD8 8E02000C */ lw $v0, 0xc($s0) -/* 80285C 80241FDC 8C510000 */ lw $s1, ($v0) -/* 802860 80241FE0 0C0B1EAF */ jal get_variable -/* 802864 80241FE4 0220282D */ daddu $a1, $s1, $zero -/* 802868 80241FE8 3C03FFF0 */ lui $v1, 0xfff0 -/* 80286C 80241FEC 3463FFFF */ ori $v1, $v1, 0xffff -/* 802870 80241FF0 0200202D */ daddu $a0, $s0, $zero -/* 802874 80241FF4 00431024 */ and $v0, $v0, $v1 -/* 802878 80241FF8 00021140 */ sll $v0, $v0, 5 -/* 80287C 80241FFC 3C068008 */ lui $a2, %hi(gItemTable) -/* 802880 80242000 00C23021 */ addu $a2, $a2, $v0 -/* 802884 80242004 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 802888 80242008 0C0B2026 */ jal set_variable -/* 80288C 8024200C 0220282D */ daddu $a1, $s1, $zero -/* 802890 80242010 8FBF0018 */ lw $ra, 0x18($sp) -/* 802894 80242014 8FB10014 */ lw $s1, 0x14($sp) -/* 802898 80242018 8FB00010 */ lw $s0, 0x10($sp) -/* 80289C 8024201C 24020002 */ addiu $v0, $zero, 2 -/* 8028A0 80242020 03E00008 */ jr $ra -/* 8028A4 80242024 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241874.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241874.s deleted file mode 100644 index 587427fe9b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241874.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241874 -/* 824B34 80241874 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 824B38 80241878 AFB00010 */ sw $s0, 0x10($sp) -/* 824B3C 8024187C 0080802D */ daddu $s0, $a0, $zero -/* 824B40 80241880 AFBF0018 */ sw $ra, 0x18($sp) -/* 824B44 80241884 AFB10014 */ sw $s1, 0x14($sp) -/* 824B48 80241888 8E02000C */ lw $v0, 0xc($s0) -/* 824B4C 8024188C 8C510000 */ lw $s1, ($v0) -/* 824B50 80241890 0C0B1EAF */ jal get_variable -/* 824B54 80241894 0220282D */ daddu $a1, $s1, $zero -/* 824B58 80241898 3C03FFF0 */ lui $v1, 0xfff0 -/* 824B5C 8024189C 3463FFFF */ ori $v1, $v1, 0xffff -/* 824B60 802418A0 0200202D */ daddu $a0, $s0, $zero -/* 824B64 802418A4 00431024 */ and $v0, $v0, $v1 -/* 824B68 802418A8 00021140 */ sll $v0, $v0, 5 -/* 824B6C 802418AC 3C068008 */ lui $a2, %hi(gItemTable) -/* 824B70 802418B0 00C23021 */ addu $a2, $a2, $v0 -/* 824B74 802418B4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 824B78 802418B8 0C0B2026 */ jal set_variable -/* 824B7C 802418BC 0220282D */ daddu $a1, $s1, $zero -/* 824B80 802418C0 8FBF0018 */ lw $ra, 0x18($sp) -/* 824B84 802418C4 8FB10014 */ lw $s1, 0x14($sp) -/* 824B88 802418C8 8FB00010 */ lw $s0, 0x10($sp) -/* 824B8C 802418CC 24020002 */ addiu $v0, $zero, 2 -/* 824B90 802418D0 03E00008 */ jr $ra -/* 824B94 802418D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240564.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240564.s deleted file mode 100644 index a3731db6ef..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240564.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240564 -/* 831D64 80240564 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 831D68 80240568 AFB00010 */ sw $s0, 0x10($sp) -/* 831D6C 8024056C 0080802D */ daddu $s0, $a0, $zero -/* 831D70 80240570 AFBF0018 */ sw $ra, 0x18($sp) -/* 831D74 80240574 AFB10014 */ sw $s1, 0x14($sp) -/* 831D78 80240578 8E02000C */ lw $v0, 0xc($s0) -/* 831D7C 8024057C 8C510000 */ lw $s1, ($v0) -/* 831D80 80240580 0C0B1EAF */ jal get_variable -/* 831D84 80240584 0220282D */ daddu $a1, $s1, $zero -/* 831D88 80240588 3C03FFF0 */ lui $v1, 0xfff0 -/* 831D8C 8024058C 3463FFFF */ ori $v1, $v1, 0xffff -/* 831D90 80240590 0200202D */ daddu $a0, $s0, $zero -/* 831D94 80240594 00431024 */ and $v0, $v0, $v1 -/* 831D98 80240598 00021140 */ sll $v0, $v0, 5 -/* 831D9C 8024059C 3C068008 */ lui $a2, %hi(gItemTable) -/* 831DA0 802405A0 00C23021 */ addu $a2, $a2, $v0 -/* 831DA4 802405A4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 831DA8 802405A8 0C0B2026 */ jal set_variable -/* 831DAC 802405AC 0220282D */ daddu $a1, $s1, $zero -/* 831DB0 802405B0 8FBF0018 */ lw $ra, 0x18($sp) -/* 831DB4 802405B4 8FB10014 */ lw $s1, 0x14($sp) -/* 831DB8 802405B8 8FB00010 */ lw $s0, 0x10($sp) -/* 831DBC 802405BC 24020002 */ addiu $v0, $zero, 2 -/* 831DC0 802405C0 03E00008 */ jr $ra -/* 831DC4 802405C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240514.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240514.s deleted file mode 100644 index c6d5c7c747..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240514.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240514 -/* 8430E4 80240514 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8430E8 80240518 AFB00010 */ sw $s0, 0x10($sp) -/* 8430EC 8024051C 0080802D */ daddu $s0, $a0, $zero -/* 8430F0 80240520 AFBF0018 */ sw $ra, 0x18($sp) -/* 8430F4 80240524 AFB10014 */ sw $s1, 0x14($sp) -/* 8430F8 80240528 8E02000C */ lw $v0, 0xc($s0) -/* 8430FC 8024052C 8C510000 */ lw $s1, ($v0) -/* 843100 80240530 0C0B1EAF */ jal get_variable -/* 843104 80240534 0220282D */ daddu $a1, $s1, $zero -/* 843108 80240538 3C03FFF0 */ lui $v1, 0xfff0 -/* 84310C 8024053C 3463FFFF */ ori $v1, $v1, 0xffff -/* 843110 80240540 0200202D */ daddu $a0, $s0, $zero -/* 843114 80240544 00431024 */ and $v0, $v0, $v1 -/* 843118 80240548 00021140 */ sll $v0, $v0, 5 -/* 84311C 8024054C 3C068008 */ lui $a2, %hi(gItemTable) -/* 843120 80240550 00C23021 */ addu $a2, $a2, $v0 -/* 843124 80240554 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 843128 80240558 0C0B2026 */ jal set_variable -/* 84312C 8024055C 0220282D */ daddu $a1, $s1, $zero -/* 843130 80240560 8FBF0018 */ lw $ra, 0x18($sp) -/* 843134 80240564 8FB10014 */ lw $s1, 0x14($sp) -/* 843138 80240568 8FB00010 */ lw $s0, 0x10($sp) -/* 84313C 8024056C 24020002 */ addiu $v0, $zero, 2 -/* 843140 80240570 03E00008 */ jr $ra -/* 843144 80240574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802413D4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802413D4.s deleted file mode 100644 index 7d5de81c02..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802413D4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413D4 -/* 853544 802413D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 853548 802413D8 AFB00010 */ sw $s0, 0x10($sp) -/* 85354C 802413DC 0080802D */ daddu $s0, $a0, $zero -/* 853550 802413E0 AFBF0018 */ sw $ra, 0x18($sp) -/* 853554 802413E4 AFB10014 */ sw $s1, 0x14($sp) -/* 853558 802413E8 8E02000C */ lw $v0, 0xc($s0) -/* 85355C 802413EC 8C510000 */ lw $s1, ($v0) -/* 853560 802413F0 0C0B1EAF */ jal get_variable -/* 853564 802413F4 0220282D */ daddu $a1, $s1, $zero -/* 853568 802413F8 3C03FFF0 */ lui $v1, 0xfff0 -/* 85356C 802413FC 3463FFFF */ ori $v1, $v1, 0xffff -/* 853570 80241400 0200202D */ daddu $a0, $s0, $zero -/* 853574 80241404 00431024 */ and $v0, $v0, $v1 -/* 853578 80241408 00021140 */ sll $v0, $v0, 5 -/* 85357C 8024140C 3C068008 */ lui $a2, %hi(gItemTable) -/* 853580 80241410 00C23021 */ addu $a2, $a2, $v0 -/* 853584 80241414 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 853588 80241418 0C0B2026 */ jal set_variable -/* 85358C 8024141C 0220282D */ daddu $a1, $s1, $zero -/* 853590 80241420 8FBF0018 */ lw $ra, 0x18($sp) -/* 853594 80241424 8FB10014 */ lw $s1, 0x14($sp) -/* 853598 80241428 8FB00010 */ lw $s0, 0x10($sp) -/* 85359C 8024142C 24020002 */ addiu $v0, $zero, 2 -/* 8535A0 80241430 03E00008 */ jr $ra -/* 8535A4 80241434 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_802410C8_B9EA28.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_802410C8_B9EA28.s deleted file mode 100644 index 91a3c08cfc..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_802410C8_B9EA28.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410C8_B9EA28 -/* B9EA28 802410C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B9EA2C 802410CC AFB00010 */ sw $s0, 0x10($sp) -/* B9EA30 802410D0 0080802D */ daddu $s0, $a0, $zero -/* B9EA34 802410D4 AFBF0018 */ sw $ra, 0x18($sp) -/* B9EA38 802410D8 AFB10014 */ sw $s1, 0x14($sp) -/* B9EA3C 802410DC 8E02000C */ lw $v0, 0xc($s0) -/* B9EA40 802410E0 8C510000 */ lw $s1, ($v0) -/* B9EA44 802410E4 0C0B1EAF */ jal get_variable -/* B9EA48 802410E8 0220282D */ daddu $a1, $s1, $zero -/* B9EA4C 802410EC 3C03FFF0 */ lui $v1, 0xfff0 -/* B9EA50 802410F0 3463FFFF */ ori $v1, $v1, 0xffff -/* B9EA54 802410F4 0200202D */ daddu $a0, $s0, $zero -/* B9EA58 802410F8 00431024 */ and $v0, $v0, $v1 -/* B9EA5C 802410FC 00021140 */ sll $v0, $v0, 5 -/* B9EA60 80241100 3C068008 */ lui $a2, %hi(gItemTable) -/* B9EA64 80241104 00C23021 */ addu $a2, $a2, $v0 -/* B9EA68 80241108 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* B9EA6C 8024110C 0C0B2026 */ jal set_variable -/* B9EA70 80241110 0220282D */ daddu $a1, $s1, $zero -/* B9EA74 80241114 8FBF0018 */ lw $ra, 0x18($sp) -/* B9EA78 80241118 8FB10014 */ lw $s1, 0x14($sp) -/* B9EA7C 8024111C 8FB00010 */ lw $s0, 0x10($sp) -/* B9EA80 80241120 24020002 */ addiu $v0, $zero, 2 -/* B9EA84 80241124 03E00008 */ jr $ra -/* B9EA88 80241128 27BD0020 */ addiu $sp, $sp, 0x20 -/* B9EA8C 8024112C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s index 6efb64e04e..e6458117a0 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s @@ -129,7 +129,7 @@ glabel func_80240E60_BAAFA0 /* BAB188 80241048 0000102D */ daddu $v0, $zero, $zero /* BAB18C 8024104C 0260202D */ daddu $a0, $s3, $zero /* BAB190 80241050 0280282D */ daddu $a1, $s4, $zero -/* BAB194 80241054 0C090387 */ jal func_80240E1C +/* BAB194 80241054 0C090387 */ jal func_80240E1C_BAAF5C /* BAB198 80241058 0200302D */ daddu $a2, $s0, $zero .L8024105C: /* BAB19C 8024105C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E1C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E1C.s deleted file mode 100644 index b0634851ec..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E1C.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E1C -/* 9C61FC 80240E1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C6200 80240E20 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6204 80240E24 0080802D */ daddu $s0, $a0, $zero -/* 9C6208 80240E28 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C620C 80240E2C AFB10014 */ sw $s1, 0x14($sp) -/* 9C6210 80240E30 8E02000C */ lw $v0, 0xc($s0) -/* 9C6214 80240E34 8C510000 */ lw $s1, ($v0) -/* 9C6218 80240E38 0C0B1EAF */ jal get_variable -/* 9C621C 80240E3C 0220282D */ daddu $a1, $s1, $zero -/* 9C6220 80240E40 3C03FFF0 */ lui $v1, 0xfff0 -/* 9C6224 80240E44 3463FFFF */ ori $v1, $v1, 0xffff -/* 9C6228 80240E48 0200202D */ daddu $a0, $s0, $zero -/* 9C622C 80240E4C 00431024 */ and $v0, $v0, $v1 -/* 9C6230 80240E50 00021140 */ sll $v0, $v0, 5 -/* 9C6234 80240E54 3C068008 */ lui $a2, %hi(gItemTable) -/* 9C6238 80240E58 00C23021 */ addu $a2, $a2, $v0 -/* 9C623C 80240E5C 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 9C6240 80240E60 0C0B2026 */ jal set_variable -/* 9C6244 80240E64 0220282D */ daddu $a1, $s1, $zero -/* 9C6248 80240E68 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C624C 80240E6C 8FB10014 */ lw $s1, 0x14($sp) -/* 9C6250 80240E70 8FB00010 */ lw $s0, 0x10($sp) -/* 9C6254 80240E74 24020002 */ addiu $v0, $zero, 2 -/* 9C6258 80240E78 03E00008 */ jr $ra -/* 9C625C 80240E7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240394_9D73B4.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240394_9D73B4.s deleted file mode 100644 index 5855c8310c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240394_9D73B4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394_9D73B4 -/* 9D73B4 80240394 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D73B8 80240398 AFB00010 */ sw $s0, 0x10($sp) -/* 9D73BC 8024039C 0080802D */ daddu $s0, $a0, $zero -/* 9D73C0 802403A0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D73C4 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D73C8 802403A8 8E02000C */ lw $v0, 0xc($s0) -/* 9D73CC 802403AC 8C510000 */ lw $s1, ($v0) -/* 9D73D0 802403B0 0C0B1EAF */ jal get_variable -/* 9D73D4 802403B4 0220282D */ daddu $a1, $s1, $zero -/* 9D73D8 802403B8 3C03FFF0 */ lui $v1, 0xfff0 -/* 9D73DC 802403BC 3463FFFF */ ori $v1, $v1, 0xffff -/* 9D73E0 802403C0 0200202D */ daddu $a0, $s0, $zero -/* 9D73E4 802403C4 00431024 */ and $v0, $v0, $v1 -/* 9D73E8 802403C8 00021140 */ sll $v0, $v0, 5 -/* 9D73EC 802403CC 3C068008 */ lui $a2, %hi(gItemTable) -/* 9D73F0 802403D0 00C23021 */ addu $a2, $a2, $v0 -/* 9D73F4 802403D4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 9D73F8 802403D8 0C0B2026 */ jal set_variable -/* 9D73FC 802403DC 0220282D */ daddu $a1, $s1, $zero -/* 9D7400 802403E0 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D7404 802403E4 8FB10014 */ lw $s1, 0x14($sp) -/* 9D7408 802403E8 8FB00010 */ lw $s0, 0x10($sp) -/* 9D740C 802403EC 24020002 */ addiu $v0, $zero, 2 -/* 9D7410 802403F0 03E00008 */ jr $ra -/* 9D7414 802403F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802419C4.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802419C4.s deleted file mode 100644 index f547ce74a7..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802419C4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419C4 -/* 9D89E4 802419C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D89E8 802419C8 AFB00010 */ sw $s0, 0x10($sp) -/* 9D89EC 802419CC 0080802D */ daddu $s0, $a0, $zero -/* 9D89F0 802419D0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D89F4 802419D4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D89F8 802419D8 8E02000C */ lw $v0, 0xc($s0) -/* 9D89FC 802419DC 8C510000 */ lw $s1, ($v0) -/* 9D8A00 802419E0 0C0B1EAF */ jal get_variable -/* 9D8A04 802419E4 0220282D */ daddu $a1, $s1, $zero -/* 9D8A08 802419E8 3C03FFF0 */ lui $v1, 0xfff0 -/* 9D8A0C 802419EC 3463FFFF */ ori $v1, $v1, 0xffff -/* 9D8A10 802419F0 0200202D */ daddu $a0, $s0, $zero -/* 9D8A14 802419F4 00431024 */ and $v0, $v0, $v1 -/* 9D8A18 802419F8 00021140 */ sll $v0, $v0, 5 -/* 9D8A1C 802419FC 3C068008 */ lui $a2, %hi(gItemTable) -/* 9D8A20 80241A00 00C23021 */ addu $a2, $a2, $v0 -/* 9D8A24 80241A04 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 9D8A28 80241A08 0C0B2026 */ jal set_variable -/* 9D8A2C 80241A0C 0220282D */ daddu $a1, $s1, $zero -/* 9D8A30 80241A10 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D8A34 80241A14 8FB10014 */ lw $s1, 0x14($sp) -/* 9D8A38 80241A18 8FB00010 */ lw $s0, 0x10($sp) -/* 9D8A3C 80241A1C 24020002 */ addiu $v0, $zero, 2 -/* 9D8A40 80241A20 03E00008 */ jr $ra -/* 9D8A44 80241A24 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243E64.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243E64.s deleted file mode 100644 index 44806e5d41..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243E64.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243E64 -/* 9DAE84 80243E64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9DAE88 80243E68 AFB00010 */ sw $s0, 0x10($sp) -/* 9DAE8C 80243E6C 0080802D */ daddu $s0, $a0, $zero -/* 9DAE90 80243E70 AFBF0018 */ sw $ra, 0x18($sp) -/* 9DAE94 80243E74 AFB10014 */ sw $s1, 0x14($sp) -/* 9DAE98 80243E78 8E02000C */ lw $v0, 0xc($s0) -/* 9DAE9C 80243E7C 8C510000 */ lw $s1, ($v0) -/* 9DAEA0 80243E80 0C0B1EAF */ jal get_variable -/* 9DAEA4 80243E84 0220282D */ daddu $a1, $s1, $zero -/* 9DAEA8 80243E88 3C03FFF0 */ lui $v1, 0xfff0 -/* 9DAEAC 80243E8C 3463FFFF */ ori $v1, $v1, 0xffff -/* 9DAEB0 80243E90 0200202D */ daddu $a0, $s0, $zero -/* 9DAEB4 80243E94 00431024 */ and $v0, $v0, $v1 -/* 9DAEB8 80243E98 00021140 */ sll $v0, $v0, 5 -/* 9DAEBC 80243E9C 3C068008 */ lui $a2, %hi(gItemTable) -/* 9DAEC0 80243EA0 00C23021 */ addu $a2, $a2, $v0 -/* 9DAEC4 80243EA4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 9DAEC8 80243EA8 0C0B2026 */ jal set_variable -/* 9DAECC 80243EAC 0220282D */ daddu $a1, $s1, $zero -/* 9DAED0 80243EB0 8FBF0018 */ lw $ra, 0x18($sp) -/* 9DAED4 80243EB4 8FB10014 */ lw $s1, 0x14($sp) -/* 9DAED8 80243EB8 8FB00010 */ lw $s0, 0x10($sp) -/* 9DAEDC 80243EBC 24020002 */ addiu $v0, $zero, 2 -/* 9DAEE0 80243EC0 03E00008 */ jr $ra -/* 9DAEE4 80243EC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240894.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240894.s deleted file mode 100644 index b878cc181b..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240894.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240894 -/* BBDA34 80240894 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBDA38 80240898 AFB00010 */ sw $s0, 0x10($sp) -/* BBDA3C 8024089C 0080802D */ daddu $s0, $a0, $zero -/* BBDA40 802408A0 AFBF0018 */ sw $ra, 0x18($sp) -/* BBDA44 802408A4 AFB10014 */ sw $s1, 0x14($sp) -/* BBDA48 802408A8 8E02000C */ lw $v0, 0xc($s0) -/* BBDA4C 802408AC 8C510000 */ lw $s1, ($v0) -/* BBDA50 802408B0 0C0B1EAF */ jal get_variable -/* BBDA54 802408B4 0220282D */ daddu $a1, $s1, $zero -/* BBDA58 802408B8 3C03FFF0 */ lui $v1, 0xfff0 -/* BBDA5C 802408BC 3463FFFF */ ori $v1, $v1, 0xffff -/* BBDA60 802408C0 0200202D */ daddu $a0, $s0, $zero -/* BBDA64 802408C4 00431024 */ and $v0, $v0, $v1 -/* BBDA68 802408C8 00021140 */ sll $v0, $v0, 5 -/* BBDA6C 802408CC 3C068008 */ lui $a2, %hi(gItemTable) -/* BBDA70 802408D0 00C23021 */ addu $a2, $a2, $v0 -/* BBDA74 802408D4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* BBDA78 802408D8 0C0B2026 */ jal set_variable -/* BBDA7C 802408DC 0220282D */ daddu $a1, $s1, $zero -/* BBDA80 802408E0 8FBF0018 */ lw $ra, 0x18($sp) -/* BBDA84 802408E4 8FB10014 */ lw $s1, 0x14($sp) -/* BBDA88 802408E8 8FB00010 */ lw $s0, 0x10($sp) -/* BBDA8C 802408EC 24020002 */ addiu $v0, $zero, 2 -/* BBDA90 802408F0 03E00008 */ jr $ra -/* BBDA94 802408F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240224_BC44A4.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240224_BC44A4.s deleted file mode 100644 index c72cd99a30..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240224_BC44A4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240224_BC44A4 -/* BC44A4 80240224 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC44A8 80240228 AFB00010 */ sw $s0, 0x10($sp) -/* BC44AC 8024022C 0080802D */ daddu $s0, $a0, $zero -/* BC44B0 80240230 AFBF0018 */ sw $ra, 0x18($sp) -/* BC44B4 80240234 AFB10014 */ sw $s1, 0x14($sp) -/* BC44B8 80240238 8E02000C */ lw $v0, 0xc($s0) -/* BC44BC 8024023C 8C510000 */ lw $s1, ($v0) -/* BC44C0 80240240 0C0B1EAF */ jal get_variable -/* BC44C4 80240244 0220282D */ daddu $a1, $s1, $zero -/* BC44C8 80240248 3C03FFF0 */ lui $v1, 0xfff0 -/* BC44CC 8024024C 3463FFFF */ ori $v1, $v1, 0xffff -/* BC44D0 80240250 0200202D */ daddu $a0, $s0, $zero -/* BC44D4 80240254 00431024 */ and $v0, $v0, $v1 -/* BC44D8 80240258 00021140 */ sll $v0, $v0, 5 -/* BC44DC 8024025C 3C068008 */ lui $a2, %hi(gItemTable) -/* BC44E0 80240260 00C23021 */ addu $a2, $a2, $v0 -/* BC44E4 80240264 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* BC44E8 80240268 0C0B2026 */ jal set_variable -/* BC44EC 8024026C 0220282D */ daddu $a1, $s1, $zero -/* BC44F0 80240270 8FBF0018 */ lw $ra, 0x18($sp) -/* BC44F4 80240274 8FB10014 */ lw $s1, 0x14($sp) -/* BC44F8 80240278 8FB00010 */ lw $s0, 0x10($sp) -/* BC44FC 8024027C 24020002 */ addiu $v0, $zero, 2 -/* BC4500 80240280 03E00008 */ jr $ra -/* BC4504 80240284 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802409F4_BC8854.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802409F4_BC8854.s deleted file mode 100644 index c30a018847..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802409F4_BC8854.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409F4_BC8854 -/* BC8854 802409F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC8858 802409F8 AFB00010 */ sw $s0, 0x10($sp) -/* BC885C 802409FC 0080802D */ daddu $s0, $a0, $zero -/* BC8860 80240A00 AFBF0018 */ sw $ra, 0x18($sp) -/* BC8864 80240A04 AFB10014 */ sw $s1, 0x14($sp) -/* BC8868 80240A08 8E02000C */ lw $v0, 0xc($s0) -/* BC886C 80240A0C 8C510000 */ lw $s1, ($v0) -/* BC8870 80240A10 0C0B1EAF */ jal get_variable -/* BC8874 80240A14 0220282D */ daddu $a1, $s1, $zero -/* BC8878 80240A18 3C03FFF0 */ lui $v1, 0xfff0 -/* BC887C 80240A1C 3463FFFF */ ori $v1, $v1, 0xffff -/* BC8880 80240A20 0200202D */ daddu $a0, $s0, $zero -/* BC8884 80240A24 00431024 */ and $v0, $v0, $v1 -/* BC8888 80240A28 00021140 */ sll $v0, $v0, 5 -/* BC888C 80240A2C 3C068008 */ lui $a2, %hi(gItemTable) -/* BC8890 80240A30 00C23021 */ addu $a2, $a2, $v0 -/* BC8894 80240A34 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* BC8898 80240A38 0C0B2026 */ jal set_variable -/* BC889C 80240A3C 0220282D */ daddu $a1, $s1, $zero -/* BC88A0 80240A40 8FBF0018 */ lw $ra, 0x18($sp) -/* BC88A4 80240A44 8FB10014 */ lw $s1, 0x14($sp) -/* BC88A8 80240A48 8FB00010 */ lw $s0, 0x10($sp) -/* BC88AC 80240A4C 24020002 */ addiu $v0, $zero, 2 -/* BC88B0 80240A50 03E00008 */ jr $ra -/* BC88B4 80240A54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_802400B4_BCECA4.s b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_802400B4_BCECA4.s deleted file mode 100644 index 7464b2bb2d..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_802400B4_BCECA4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_BCECA4 -/* BCECA4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCECA8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* BCECAC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* BCECB0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* BCECB4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* BCECB8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* BCECBC 802400CC 8C510000 */ lw $s1, ($v0) -/* BCECC0 802400D0 0C0B1EAF */ jal get_variable -/* BCECC4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* BCECC8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* BCECCC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* BCECD0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* BCECD4 802400E4 00431024 */ and $v0, $v0, $v1 -/* BCECD8 802400E8 00021140 */ sll $v0, $v0, 5 -/* BCECDC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* BCECE0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* BCECE4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* BCECE8 802400F8 0C0B2026 */ jal set_variable -/* BCECEC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* BCECF0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* BCECF4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* BCECF8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* BCECFC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* BCED00 80240110 03E00008 */ jr $ra -/* BCED04 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A10.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A10.s index 3c371d326b..b4d18554d1 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A10.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A10.s @@ -16,7 +16,7 @@ glabel func_80240A10 /* BCF62C 80240A3C 0220202D */ daddu $a0, $s1, $zero /* BCF630 80240A40 0240282D */ daddu $a1, $s2, $zero /* BCF634 80240A44 0260302D */ daddu $a2, $s3, $zero -/* BCF638 80240A48 0C090159 */ jal func_80240564 +/* BCF638 80240A48 0C090159 */ jal func_80240564_BCF154 /* BCF63C 80240A4C AC500000 */ sw $s0, ($v0) /* BCF640 80240A50 8FBF0020 */ lw $ra, 0x20($sp) /* BCF644 80240A54 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s index 0c732b2580..8aa90cb768 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s @@ -139,7 +139,7 @@ glabel func_802416D0_D9EBA0 /* D9EDA4 802418D4 00000000 */ nop /* D9EDA8 802418D8 0280202D */ daddu $a0, $s4, $zero /* D9EDAC 802418DC 0260282D */ daddu $a1, $s3, $zero -/* D9EDB0 802418E0 0C0904F5 */ jal func_802413D4 +/* D9EDB0 802418E0 0C0904F5 */ jal func_802413D4_D9E8A4 /* D9EDB4 802418E4 02A0302D */ daddu $a2, $s5, $zero /* D9EDB8 802418E8 08090648 */ j .L80241920 /* D9EDBC 802418EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802400B4_DAD4B4.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802400B4_DAD4B4.s deleted file mode 100644 index e75a7c3a6a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802400B4_DAD4B4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_DAD4B4 -/* DAD4B4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DAD4B8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* DAD4BC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* DAD4C0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* DAD4C4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* DAD4C8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* DAD4CC 802400CC 8C510000 */ lw $s1, ($v0) -/* DAD4D0 802400D0 0C0B1EAF */ jal get_variable -/* DAD4D4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* DAD4D8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* DAD4DC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* DAD4E0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* DAD4E4 802400E4 00431024 */ and $v0, $v0, $v1 -/* DAD4E8 802400E8 00021140 */ sll $v0, $v0, 5 -/* DAD4EC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* DAD4F0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* DAD4F4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* DAD4F8 802400F8 0C0B2026 */ jal set_variable -/* DAD4FC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* DAD500 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* DAD504 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* DAD508 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* DAD50C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* DAD510 80240110 03E00008 */ jr $ra -/* DAD514 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240924_DB8234.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240924_DB8234.s deleted file mode 100644 index 7ca91911cc..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240924_DB8234.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240924_DB8234 -/* DB8234 80240924 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB8238 80240928 AFB00010 */ sw $s0, 0x10($sp) -/* DB823C 8024092C 0080802D */ daddu $s0, $a0, $zero -/* DB8240 80240930 AFBF0018 */ sw $ra, 0x18($sp) -/* DB8244 80240934 AFB10014 */ sw $s1, 0x14($sp) -/* DB8248 80240938 8E02000C */ lw $v0, 0xc($s0) -/* DB824C 8024093C 8C510000 */ lw $s1, ($v0) -/* DB8250 80240940 0C0B1EAF */ jal get_variable -/* DB8254 80240944 0220282D */ daddu $a1, $s1, $zero -/* DB8258 80240948 3C03FFF0 */ lui $v1, 0xfff0 -/* DB825C 8024094C 3463FFFF */ ori $v1, $v1, 0xffff -/* DB8260 80240950 0200202D */ daddu $a0, $s0, $zero -/* DB8264 80240954 00431024 */ and $v0, $v0, $v1 -/* DB8268 80240958 00021140 */ sll $v0, $v0, 5 -/* DB826C 8024095C 3C068008 */ lui $a2, %hi(gItemTable) -/* DB8270 80240960 00C23021 */ addu $a2, $a2, $v0 -/* DB8274 80240964 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* DB8278 80240968 0C0B2026 */ jal set_variable -/* DB827C 8024096C 0220282D */ daddu $a1, $s1, $zero -/* DB8280 80240970 8FBF0018 */ lw $ra, 0x18($sp) -/* DB8284 80240974 8FB10014 */ lw $s1, 0x14($sp) -/* DB8288 80240978 8FB00010 */ lw $s0, 0x10($sp) -/* DB828C 8024097C 24020002 */ addiu $v0, $zero, 2 -/* DB8290 80240980 03E00008 */ jr $ra -/* DB8294 80240984 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242FD4_DC0284.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242FD4_DC0284.s deleted file mode 100644 index b8e40cf1b2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242FD4_DC0284.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FD4_DC0284 -/* DC0284 80242FD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC0288 80242FD8 AFB00010 */ sw $s0, 0x10($sp) -/* DC028C 80242FDC 0080802D */ daddu $s0, $a0, $zero -/* DC0290 80242FE0 AFBF0018 */ sw $ra, 0x18($sp) -/* DC0294 80242FE4 AFB10014 */ sw $s1, 0x14($sp) -/* DC0298 80242FE8 8E02000C */ lw $v0, 0xc($s0) -/* DC029C 80242FEC 8C510000 */ lw $s1, ($v0) -/* DC02A0 80242FF0 0C0B1EAF */ jal get_variable -/* DC02A4 80242FF4 0220282D */ daddu $a1, $s1, $zero -/* DC02A8 80242FF8 3C03FFF0 */ lui $v1, 0xfff0 -/* DC02AC 80242FFC 3463FFFF */ ori $v1, $v1, 0xffff -/* DC02B0 80243000 0200202D */ daddu $a0, $s0, $zero -/* DC02B4 80243004 00431024 */ and $v0, $v0, $v1 -/* DC02B8 80243008 00021140 */ sll $v0, $v0, 5 -/* DC02BC 8024300C 3C068008 */ lui $a2, %hi(gItemTable) -/* DC02C0 80243010 00C23021 */ addu $a2, $a2, $v0 -/* DC02C4 80243014 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* DC02C8 80243018 0C0B2026 */ jal set_variable -/* DC02CC 8024301C 0220282D */ daddu $a1, $s1, $zero -/* DC02D0 80243020 8FBF0018 */ lw $ra, 0x18($sp) -/* DC02D4 80243024 8FB10014 */ lw $s1, 0x14($sp) -/* DC02D8 80243028 8FB00010 */ lw $s0, 0x10($sp) -/* DC02DC 8024302C 24020002 */ addiu $v0, $zero, 2 -/* DC02E0 80243030 03E00008 */ jr $ra -/* DC02E4 80243034 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_802407D4_DCD4A4.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_802407D4_DCD4A4.s deleted file mode 100644 index d38dcf2fd1..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_802407D4_DCD4A4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D4_DCD4A4 -/* DCD4A4 802407D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCD4A8 802407D8 AFB00010 */ sw $s0, 0x10($sp) -/* DCD4AC 802407DC 0080802D */ daddu $s0, $a0, $zero -/* DCD4B0 802407E0 AFBF0018 */ sw $ra, 0x18($sp) -/* DCD4B4 802407E4 AFB10014 */ sw $s1, 0x14($sp) -/* DCD4B8 802407E8 8E02000C */ lw $v0, 0xc($s0) -/* DCD4BC 802407EC 8C510000 */ lw $s1, ($v0) -/* DCD4C0 802407F0 0C0B1EAF */ jal get_variable -/* DCD4C4 802407F4 0220282D */ daddu $a1, $s1, $zero -/* DCD4C8 802407F8 3C03FFF0 */ lui $v1, 0xfff0 -/* DCD4CC 802407FC 3463FFFF */ ori $v1, $v1, 0xffff -/* DCD4D0 80240800 0200202D */ daddu $a0, $s0, $zero -/* DCD4D4 80240804 00431024 */ and $v0, $v0, $v1 -/* DCD4D8 80240808 00021140 */ sll $v0, $v0, 5 -/* DCD4DC 8024080C 3C068008 */ lui $a2, %hi(gItemTable) -/* DCD4E0 80240810 00C23021 */ addu $a2, $a2, $v0 -/* DCD4E4 80240814 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* DCD4E8 80240818 0C0B2026 */ jal set_variable -/* DCD4EC 8024081C 0220282D */ daddu $a1, $s1, $zero -/* DCD4F0 80240820 8FBF0018 */ lw $ra, 0x18($sp) -/* DCD4F4 80240824 8FB10014 */ lw $s1, 0x14($sp) -/* DCD4F8 80240828 8FB00010 */ lw $s0, 0x10($sp) -/* DCD4FC 8024082C 24020002 */ addiu $v0, $zero, 2 -/* DCD500 80240830 03E00008 */ jr $ra -/* DCD504 80240834 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_802412E4_DE3774.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_802412E4_DE3774.s deleted file mode 100644 index 3c5a9e07b8..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_802412E4_DE3774.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E4_DE3774 -/* DE3774 802412E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE3778 802412E8 AFB00010 */ sw $s0, 0x10($sp) -/* DE377C 802412EC 0080802D */ daddu $s0, $a0, $zero -/* DE3780 802412F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DE3784 802412F4 AFB10014 */ sw $s1, 0x14($sp) -/* DE3788 802412F8 8E02000C */ lw $v0, 0xc($s0) -/* DE378C 802412FC 8C510000 */ lw $s1, ($v0) -/* DE3790 80241300 0C0B1EAF */ jal get_variable -/* DE3794 80241304 0220282D */ daddu $a1, $s1, $zero -/* DE3798 80241308 3C03FFF0 */ lui $v1, 0xfff0 -/* DE379C 8024130C 3463FFFF */ ori $v1, $v1, 0xffff -/* DE37A0 80241310 0200202D */ daddu $a0, $s0, $zero -/* DE37A4 80241314 00431024 */ and $v0, $v0, $v1 -/* DE37A8 80241318 00021140 */ sll $v0, $v0, 5 -/* DE37AC 8024131C 3C068008 */ lui $a2, %hi(gItemTable) -/* DE37B0 80241320 00C23021 */ addu $a2, $a2, $v0 -/* DE37B4 80241324 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* DE37B8 80241328 0C0B2026 */ jal set_variable -/* DE37BC 8024132C 0220282D */ daddu $a1, $s1, $zero -/* DE37C0 80241330 8FBF0018 */ lw $ra, 0x18($sp) -/* DE37C4 80241334 8FB10014 */ lw $s1, 0x14($sp) -/* DE37C8 80241338 8FB00010 */ lw $s0, 0x10($sp) -/* DE37CC 8024133C 24020002 */ addiu $v0, $zero, 2 -/* DE37D0 80241340 03E00008 */ jr $ra -/* DE37D4 80241344 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240414_AB0404.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240414_AB0404.s deleted file mode 100644 index 29784db7b7..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240414_AB0404.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240414_AB0404 -/* AB0404 80240414 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AB0408 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* AB040C 8024041C 0080802D */ daddu $s0, $a0, $zero -/* AB0410 80240420 AFBF0018 */ sw $ra, 0x18($sp) -/* AB0414 80240424 AFB10014 */ sw $s1, 0x14($sp) -/* AB0418 80240428 8E02000C */ lw $v0, 0xc($s0) -/* AB041C 8024042C 8C510000 */ lw $s1, ($v0) -/* AB0420 80240430 0C0B1EAF */ jal get_variable -/* AB0424 80240434 0220282D */ daddu $a1, $s1, $zero -/* AB0428 80240438 3C03FFF0 */ lui $v1, 0xfff0 -/* AB042C 8024043C 3463FFFF */ ori $v1, $v1, 0xffff -/* AB0430 80240440 0200202D */ daddu $a0, $s0, $zero -/* AB0434 80240444 00431024 */ and $v0, $v0, $v1 -/* AB0438 80240448 00021140 */ sll $v0, $v0, 5 -/* AB043C 8024044C 3C068008 */ lui $a2, %hi(gItemTable) -/* AB0440 80240450 00C23021 */ addu $a2, $a2, $v0 -/* AB0444 80240454 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* AB0448 80240458 0C0B2026 */ jal set_variable -/* AB044C 8024045C 0220282D */ daddu $a1, $s1, $zero -/* AB0450 80240460 8FBF0018 */ lw $ra, 0x18($sp) -/* AB0454 80240464 8FB10014 */ lw $s1, 0x14($sp) -/* AB0458 80240468 8FB00010 */ lw $s0, 0x10($sp) -/* AB045C 8024046C 24020002 */ addiu $v0, $zero, 2 -/* AB0460 80240470 03E00008 */ jr $ra -/* AB0464 80240474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240FD4_D56B84.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240FD4_D56B84.s deleted file mode 100644 index 5688f46237..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240FD4_D56B84.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD4_D56B84 -/* D56B84 80240FD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D56B88 80240FD8 AFB00010 */ sw $s0, 0x10($sp) -/* D56B8C 80240FDC 0080802D */ daddu $s0, $a0, $zero -/* D56B90 80240FE0 AFBF0018 */ sw $ra, 0x18($sp) -/* D56B94 80240FE4 AFB10014 */ sw $s1, 0x14($sp) -/* D56B98 80240FE8 8E02000C */ lw $v0, 0xc($s0) -/* D56B9C 80240FEC 8C510000 */ lw $s1, ($v0) -/* D56BA0 80240FF0 0C0B1EAF */ jal get_variable -/* D56BA4 80240FF4 0220282D */ daddu $a1, $s1, $zero -/* D56BA8 80240FF8 3C03FFF0 */ lui $v1, 0xfff0 -/* D56BAC 80240FFC 3463FFFF */ ori $v1, $v1, 0xffff -/* D56BB0 80241000 0200202D */ daddu $a0, $s0, $zero -/* D56BB4 80241004 00431024 */ and $v0, $v0, $v1 -/* D56BB8 80241008 00021140 */ sll $v0, $v0, 5 -/* D56BBC 8024100C 3C068008 */ lui $a2, %hi(gItemTable) -/* D56BC0 80241010 00C23021 */ addu $a2, $a2, $v0 -/* D56BC4 80241014 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D56BC8 80241018 0C0B2026 */ jal set_variable -/* D56BCC 8024101C 0220282D */ daddu $a1, $s1, $zero -/* D56BD0 80241020 8FBF0018 */ lw $ra, 0x18($sp) -/* D56BD4 80241024 8FB10014 */ lw $s1, 0x14($sp) -/* D56BD8 80241028 8FB00010 */ lw $s0, 0x10($sp) -/* D56BDC 8024102C 24020002 */ addiu $v0, $zero, 2 -/* D56BE0 80241030 03E00008 */ jr $ra -/* D56BE4 80241034 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240FD4_D624D4.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240FD4_D624D4.s deleted file mode 100644 index 8b4d9e795f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240FD4_D624D4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD4_D624D4 -/* D624D4 80240FD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D624D8 80240FD8 AFB00010 */ sw $s0, 0x10($sp) -/* D624DC 80240FDC 0080802D */ daddu $s0, $a0, $zero -/* D624E0 80240FE0 AFBF0018 */ sw $ra, 0x18($sp) -/* D624E4 80240FE4 AFB10014 */ sw $s1, 0x14($sp) -/* D624E8 80240FE8 8E02000C */ lw $v0, 0xc($s0) -/* D624EC 80240FEC 8C510000 */ lw $s1, ($v0) -/* D624F0 80240FF0 0C0B1EAF */ jal get_variable -/* D624F4 80240FF4 0220282D */ daddu $a1, $s1, $zero -/* D624F8 80240FF8 3C03FFF0 */ lui $v1, 0xfff0 -/* D624FC 80240FFC 3463FFFF */ ori $v1, $v1, 0xffff -/* D62500 80241000 0200202D */ daddu $a0, $s0, $zero -/* D62504 80241004 00431024 */ and $v0, $v0, $v1 -/* D62508 80241008 00021140 */ sll $v0, $v0, 5 -/* D6250C 8024100C 3C068008 */ lui $a2, %hi(gItemTable) -/* D62510 80241010 00C23021 */ addu $a2, $a2, $v0 -/* D62514 80241014 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D62518 80241018 0C0B2026 */ jal set_variable -/* D6251C 8024101C 0220282D */ daddu $a1, $s1, $zero -/* D62520 80241020 8FBF0018 */ lw $ra, 0x18($sp) -/* D62524 80241024 8FB10014 */ lw $s1, 0x14($sp) -/* D62528 80241028 8FB00010 */ lw $s0, 0x10($sp) -/* D6252C 8024102C 24020002 */ addiu $v0, $zero, 2 -/* D62530 80241030 03E00008 */ jr $ra -/* D62534 80241034 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80241004.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80241004.s deleted file mode 100644 index 9870645354..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80241004.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241004 -/* D63D14 80241004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D63D18 80241008 AFB00010 */ sw $s0, 0x10($sp) -/* D63D1C 8024100C 0080802D */ daddu $s0, $a0, $zero -/* D63D20 80241010 AFBF0018 */ sw $ra, 0x18($sp) -/* D63D24 80241014 AFB10014 */ sw $s1, 0x14($sp) -/* D63D28 80241018 8E02000C */ lw $v0, 0xc($s0) -/* D63D2C 8024101C 8C510000 */ lw $s1, ($v0) -/* D63D30 80241020 0C0B1EAF */ jal get_variable -/* D63D34 80241024 0220282D */ daddu $a1, $s1, $zero -/* D63D38 80241028 3C03FFF0 */ lui $v1, 0xfff0 -/* D63D3C 8024102C 3463FFFF */ ori $v1, $v1, 0xffff -/* D63D40 80241030 0200202D */ daddu $a0, $s0, $zero -/* D63D44 80241034 00431024 */ and $v0, $v0, $v1 -/* D63D48 80241038 00021140 */ sll $v0, $v0, 5 -/* D63D4C 8024103C 3C068008 */ lui $a2, %hi(gItemTable) -/* D63D50 80241040 00C23021 */ addu $a2, $a2, $v0 -/* D63D54 80241044 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D63D58 80241048 0C0B2026 */ jal set_variable -/* D63D5C 8024104C 0220282D */ daddu $a1, $s1, $zero -/* D63D60 80241050 8FBF0018 */ lw $ra, 0x18($sp) -/* D63D64 80241054 8FB10014 */ lw $s1, 0x14($sp) -/* D63D68 80241058 8FB00010 */ lw $s0, 0x10($sp) -/* D63D6C 8024105C 24020002 */ addiu $v0, $zero, 2 -/* D63D70 80241060 03E00008 */ jr $ra -/* D63D74 80241064 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240FD4_D68CD4.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240FD4_D68CD4.s deleted file mode 100644 index 403c05ed54..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240FD4_D68CD4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD4_D68CD4 -/* D68CD4 80240FD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D68CD8 80240FD8 AFB00010 */ sw $s0, 0x10($sp) -/* D68CDC 80240FDC 0080802D */ daddu $s0, $a0, $zero -/* D68CE0 80240FE0 AFBF0018 */ sw $ra, 0x18($sp) -/* D68CE4 80240FE4 AFB10014 */ sw $s1, 0x14($sp) -/* D68CE8 80240FE8 8E02000C */ lw $v0, 0xc($s0) -/* D68CEC 80240FEC 8C510000 */ lw $s1, ($v0) -/* D68CF0 80240FF0 0C0B1EAF */ jal get_variable -/* D68CF4 80240FF4 0220282D */ daddu $a1, $s1, $zero -/* D68CF8 80240FF8 3C03FFF0 */ lui $v1, 0xfff0 -/* D68CFC 80240FFC 3463FFFF */ ori $v1, $v1, 0xffff -/* D68D00 80241000 0200202D */ daddu $a0, $s0, $zero -/* D68D04 80241004 00431024 */ and $v0, $v0, $v1 -/* D68D08 80241008 00021140 */ sll $v0, $v0, 5 -/* D68D0C 8024100C 3C068008 */ lui $a2, %hi(gItemTable) -/* D68D10 80241010 00C23021 */ addu $a2, $a2, $v0 -/* D68D14 80241014 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D68D18 80241018 0C0B2026 */ jal set_variable -/* D68D1C 8024101C 0220282D */ daddu $a1, $s1, $zero -/* D68D20 80241020 8FBF0018 */ lw $ra, 0x18($sp) -/* D68D24 80241024 8FB10014 */ lw $s1, 0x14($sp) -/* D68D28 80241028 8FB00010 */ lw $s0, 0x10($sp) -/* D68D2C 8024102C 24020002 */ addiu $v0, $zero, 2 -/* D68D30 80241030 03E00008 */ jr $ra -/* D68D34 80241034 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80241004_D7A9F4.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80241004_D7A9F4.s deleted file mode 100644 index 97021b7723..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80241004_D7A9F4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241004_D7A9F4 -/* D7A9F4 80241004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7A9F8 80241008 AFB00010 */ sw $s0, 0x10($sp) -/* D7A9FC 8024100C 0080802D */ daddu $s0, $a0, $zero -/* D7AA00 80241010 AFBF0018 */ sw $ra, 0x18($sp) -/* D7AA04 80241014 AFB10014 */ sw $s1, 0x14($sp) -/* D7AA08 80241018 8E02000C */ lw $v0, 0xc($s0) -/* D7AA0C 8024101C 8C510000 */ lw $s1, ($v0) -/* D7AA10 80241020 0C0B1EAF */ jal get_variable -/* D7AA14 80241024 0220282D */ daddu $a1, $s1, $zero -/* D7AA18 80241028 3C03FFF0 */ lui $v1, 0xfff0 -/* D7AA1C 8024102C 3463FFFF */ ori $v1, $v1, 0xffff -/* D7AA20 80241030 0200202D */ daddu $a0, $s0, $zero -/* D7AA24 80241034 00431024 */ and $v0, $v0, $v1 -/* D7AA28 80241038 00021140 */ sll $v0, $v0, 5 -/* D7AA2C 8024103C 3C068008 */ lui $a2, %hi(gItemTable) -/* D7AA30 80241040 00C23021 */ addu $a2, $a2, $v0 -/* D7AA34 80241044 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D7AA38 80241048 0C0B2026 */ jal set_variable -/* D7AA3C 8024104C 0220282D */ daddu $a1, $s1, $zero -/* D7AA40 80241050 8FBF0018 */ lw $ra, 0x18($sp) -/* D7AA44 80241054 8FB10014 */ lw $s1, 0x14($sp) -/* D7AA48 80241058 8FB00010 */ lw $s0, 0x10($sp) -/* D7AA4C 8024105C 24020002 */ addiu $v0, $zero, 2 -/* D7AA50 80241060 03E00008 */ jr $ra -/* D7AA54 80241064 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80241004_D7C2A4.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80241004_D7C2A4.s deleted file mode 100644 index bcb6d85cc8..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80241004_D7C2A4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241004_D7C2A4 -/* D7C2A4 80241004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7C2A8 80241008 AFB00010 */ sw $s0, 0x10($sp) -/* D7C2AC 8024100C 0080802D */ daddu $s0, $a0, $zero -/* D7C2B0 80241010 AFBF0018 */ sw $ra, 0x18($sp) -/* D7C2B4 80241014 AFB10014 */ sw $s1, 0x14($sp) -/* D7C2B8 80241018 8E02000C */ lw $v0, 0xc($s0) -/* D7C2BC 8024101C 8C510000 */ lw $s1, ($v0) -/* D7C2C0 80241020 0C0B1EAF */ jal get_variable -/* D7C2C4 80241024 0220282D */ daddu $a1, $s1, $zero -/* D7C2C8 80241028 3C03FFF0 */ lui $v1, 0xfff0 -/* D7C2CC 8024102C 3463FFFF */ ori $v1, $v1, 0xffff -/* D7C2D0 80241030 0200202D */ daddu $a0, $s0, $zero -/* D7C2D4 80241034 00431024 */ and $v0, $v0, $v1 -/* D7C2D8 80241038 00021140 */ sll $v0, $v0, 5 -/* D7C2DC 8024103C 3C068008 */ lui $a2, %hi(gItemTable) -/* D7C2E0 80241040 00C23021 */ addu $a2, $a2, $v0 -/* D7C2E4 80241044 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D7C2E8 80241048 0C0B2026 */ jal set_variable -/* D7C2EC 8024104C 0220282D */ daddu $a1, $s1, $zero -/* D7C2F0 80241050 8FBF0018 */ lw $ra, 0x18($sp) -/* D7C2F4 80241054 8FB10014 */ lw $s1, 0x14($sp) -/* D7C2F8 80241058 8FB00010 */ lw $s0, 0x10($sp) -/* D7C2FC 8024105C 24020002 */ addiu $v0, $zero, 2 -/* D7C300 80241060 03E00008 */ jr $ra -/* D7C304 80241064 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A04_D8FC54.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A04_D8FC54.s deleted file mode 100644 index ead90d0611..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A04_D8FC54.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A04_D8FC54 -/* D8FC54 80242A04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8FC58 80242A08 AFB00010 */ sw $s0, 0x10($sp) -/* D8FC5C 80242A0C 0080802D */ daddu $s0, $a0, $zero -/* D8FC60 80242A10 AFBF0018 */ sw $ra, 0x18($sp) -/* D8FC64 80242A14 AFB10014 */ sw $s1, 0x14($sp) -/* D8FC68 80242A18 8E02000C */ lw $v0, 0xc($s0) -/* D8FC6C 80242A1C 8C510000 */ lw $s1, ($v0) -/* D8FC70 80242A20 0C0B1EAF */ jal get_variable -/* D8FC74 80242A24 0220282D */ daddu $a1, $s1, $zero -/* D8FC78 80242A28 3C03FFF0 */ lui $v1, 0xfff0 -/* D8FC7C 80242A2C 3463FFFF */ ori $v1, $v1, 0xffff -/* D8FC80 80242A30 0200202D */ daddu $a0, $s0, $zero -/* D8FC84 80242A34 00431024 */ and $v0, $v0, $v1 -/* D8FC88 80242A38 00021140 */ sll $v0, $v0, 5 -/* D8FC8C 80242A3C 3C068008 */ lui $a2, %hi(gItemTable) -/* D8FC90 80242A40 00C23021 */ addu $a2, $a2, $v0 -/* D8FC94 80242A44 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D8FC98 80242A48 0C0B2026 */ jal set_variable -/* D8FC9C 80242A4C 0220282D */ daddu $a1, $s1, $zero -/* D8FCA0 80242A50 8FBF0018 */ lw $ra, 0x18($sp) -/* D8FCA4 80242A54 8FB10014 */ lw $s1, 0x14($sp) -/* D8FCA8 80242A58 8FB00010 */ lw $s0, 0x10($sp) -/* D8FCAC 80242A5C 24020002 */ addiu $v0, $zero, 2 -/* D8FCB0 80242A60 03E00008 */ jr $ra -/* D8FCB4 80242A64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C.s index acbbf585c2..47eb6f40a1 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C.s @@ -90,7 +90,7 @@ glabel func_8024156C /* D945EC 802416AC 8E22006C */ lw $v0, 0x6c($s1) /* D945F0 802416B0 14400006 */ bnez $v0, .L802416CC /* D945F4 802416B4 00000000 */ nop -/* D945F8 802416B8 0C090456 */ jal func_80241158 +/* D945F8 802416B8 0C090456 */ jal func_80241158_D94098 /* D945FC 802416BC 0240202D */ daddu $a0, $s2, $zero /* D94600 802416C0 10400002 */ beqz $v0, .L802416CC /* D94604 802416C4 2402001E */ addiu $v0, $zero, 0x1e diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802407B4.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802407B4.s deleted file mode 100644 index f0e6e226ac..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802407B4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407B4 -/* CF8324 802407B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF8328 802407B8 AFB00010 */ sw $s0, 0x10($sp) -/* CF832C 802407BC 0080802D */ daddu $s0, $a0, $zero -/* CF8330 802407C0 AFBF0018 */ sw $ra, 0x18($sp) -/* CF8334 802407C4 AFB10014 */ sw $s1, 0x14($sp) -/* CF8338 802407C8 8E02000C */ lw $v0, 0xc($s0) -/* CF833C 802407CC 8C510000 */ lw $s1, ($v0) -/* CF8340 802407D0 0C0B1EAF */ jal get_variable -/* CF8344 802407D4 0220282D */ daddu $a1, $s1, $zero -/* CF8348 802407D8 3C03FFF0 */ lui $v1, 0xfff0 -/* CF834C 802407DC 3463FFFF */ ori $v1, $v1, 0xffff -/* CF8350 802407E0 0200202D */ daddu $a0, $s0, $zero -/* CF8354 802407E4 00431024 */ and $v0, $v0, $v1 -/* CF8358 802407E8 00021140 */ sll $v0, $v0, 5 -/* CF835C 802407EC 3C068008 */ lui $a2, %hi(gItemTable) -/* CF8360 802407F0 00C23021 */ addu $a2, $a2, $v0 -/* CF8364 802407F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* CF8368 802407F8 0C0B2026 */ jal set_variable -/* CF836C 802407FC 0220282D */ daddu $a1, $s1, $zero -/* CF8370 80240800 8FBF0018 */ lw $ra, 0x18($sp) -/* CF8374 80240804 8FB10014 */ lw $s1, 0x14($sp) -/* CF8378 80240808 8FB00010 */ lw $s0, 0x10($sp) -/* CF837C 8024080C 24020002 */ addiu $v0, $zero, 2 -/* CF8380 80240810 03E00008 */ jr $ra -/* CF8384 80240814 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240BE0_D06310.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240BE0_D06310.s deleted file mode 100644 index bdc7708f93..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240BE0_D06310.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE0_D06310 -/* D06310 80240BE0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D06314 80240BE4 AFB00010 */ sw $s0, 0x10($sp) -/* D06318 80240BE8 0080802D */ daddu $s0, $a0, $zero -/* D0631C 80240BEC AFBF0018 */ sw $ra, 0x18($sp) -/* D06320 80240BF0 AFB10014 */ sw $s1, 0x14($sp) -/* D06324 80240BF4 8E02000C */ lw $v0, 0xc($s0) -/* D06328 80240BF8 8C510000 */ lw $s1, ($v0) -/* D0632C 80240BFC 0C0B1EAF */ jal get_variable -/* D06330 80240C00 0220282D */ daddu $a1, $s1, $zero -/* D06334 80240C04 3C03FFF0 */ lui $v1, 0xfff0 -/* D06338 80240C08 3463FFFF */ ori $v1, $v1, 0xffff -/* D0633C 80240C0C 0200202D */ daddu $a0, $s0, $zero -/* D06340 80240C10 00431024 */ and $v0, $v0, $v1 -/* D06344 80240C14 00021140 */ sll $v0, $v0, 5 -/* D06348 80240C18 3C068008 */ lui $a2, %hi(gItemTable) -/* D0634C 80240C1C 00C23021 */ addu $a2, $a2, $v0 -/* D06350 80240C20 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D06354 80240C24 0C0B2026 */ jal set_variable -/* D06358 80240C28 0220282D */ daddu $a1, $s1, $zero -/* D0635C 80240C2C 8FBF0018 */ lw $ra, 0x18($sp) -/* D06360 80240C30 8FB10014 */ lw $s1, 0x14($sp) -/* D06364 80240C34 8FB00010 */ lw $s0, 0x10($sp) -/* D06368 80240C38 24020002 */ addiu $v0, $zero, 2 -/* D0636C 80240C3C 03E00008 */ jr $ra -/* D06370 80240C40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241AFC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241AFC.s deleted file mode 100644 index 329b346069..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241AFC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AFC -/* D2198C 80241AFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D21990 80241B00 AFB00010 */ sw $s0, 0x10($sp) -/* D21994 80241B04 0080802D */ daddu $s0, $a0, $zero -/* D21998 80241B08 AFBF0018 */ sw $ra, 0x18($sp) -/* D2199C 80241B0C AFB10014 */ sw $s1, 0x14($sp) -/* D219A0 80241B10 8E02000C */ lw $v0, 0xc($s0) -/* D219A4 80241B14 8C510000 */ lw $s1, ($v0) -/* D219A8 80241B18 0C0B1EAF */ jal get_variable -/* D219AC 80241B1C 0220282D */ daddu $a1, $s1, $zero -/* D219B0 80241B20 3C03FFF0 */ lui $v1, 0xfff0 -/* D219B4 80241B24 3463FFFF */ ori $v1, $v1, 0xffff -/* D219B8 80241B28 0200202D */ daddu $a0, $s0, $zero -/* D219BC 80241B2C 00431024 */ and $v0, $v0, $v1 -/* D219C0 80241B30 00021140 */ sll $v0, $v0, 5 -/* D219C4 80241B34 3C068008 */ lui $a2, %hi(gItemTable) -/* D219C8 80241B38 00C23021 */ addu $a2, $a2, $v0 -/* D219CC 80241B3C 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D219D0 80241B40 0C0B2026 */ jal set_variable -/* D219D4 80241B44 0220282D */ daddu $a1, $s1, $zero -/* D219D8 80241B48 8FBF0018 */ lw $ra, 0x18($sp) -/* D219DC 80241B4C 8FB10014 */ lw $s1, 0x14($sp) -/* D219E0 80241B50 8FB00010 */ lw $s0, 0x10($sp) -/* D219E4 80241B54 24020002 */ addiu $v0, $zero, 2 -/* D219E8 80241B58 03E00008 */ jr $ra -/* D219EC 80241B5C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s index 9c98d94262..4b99bf72a5 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s @@ -159,7 +159,7 @@ glabel func_8024135C /* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 /* D31230 802415B0 1462000D */ bne $v1, $v0, .L802415E8 /* D31234 802415B4 00000000 */ nop -/* D31238 802415B8 0C090387 */ jal func_80240E1C +/* D31238 802415B8 0C090387 */ jal func_80240E1C_D30A9C /* D3123C 802415BC 0240202D */ daddu $a0, $s2, $zero /* D31240 802415C0 8E430070 */ lw $v1, 0x70($s2) /* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_802400B4_D363A4.s b/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_802400B4_D363A4.s deleted file mode 100644 index f5a32d0ec2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_802400B4_D363A4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_D363A4 -/* D363A4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D363A8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* D363AC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* D363B0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* D363B4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* D363B8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* D363BC 802400CC 8C510000 */ lw $s1, ($v0) -/* D363C0 802400D0 0C0B1EAF */ jal get_variable -/* D363C4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* D363C8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* D363CC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* D363D0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* D363D4 802400E4 00431024 */ and $v0, $v0, $v1 -/* D363D8 802400E8 00021140 */ sll $v0, $v0, 5 -/* D363DC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* D363E0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* D363E4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D363E8 802400F8 0C0B2026 */ jal set_variable -/* D363EC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* D363F0 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* D363F4 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* D363F8 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* D363FC 8024010C 24020002 */ addiu $v0, $zero, 2 -/* D36400 80240110 03E00008 */ jr $ra -/* D36404 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802400B4_D378B4.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802400B4_D378B4.s deleted file mode 100644 index 690f867dd2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_802400B4_D378B4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4_D378B4 -/* D378B4 802400B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D378B8 802400B8 AFB00010 */ sw $s0, 0x10($sp) -/* D378BC 802400BC 0080802D */ daddu $s0, $a0, $zero -/* D378C0 802400C0 AFBF0018 */ sw $ra, 0x18($sp) -/* D378C4 802400C4 AFB10014 */ sw $s1, 0x14($sp) -/* D378C8 802400C8 8E02000C */ lw $v0, 0xc($s0) -/* D378CC 802400CC 8C510000 */ lw $s1, ($v0) -/* D378D0 802400D0 0C0B1EAF */ jal get_variable -/* D378D4 802400D4 0220282D */ daddu $a1, $s1, $zero -/* D378D8 802400D8 3C03FFF0 */ lui $v1, 0xfff0 -/* D378DC 802400DC 3463FFFF */ ori $v1, $v1, 0xffff -/* D378E0 802400E0 0200202D */ daddu $a0, $s0, $zero -/* D378E4 802400E4 00431024 */ and $v0, $v0, $v1 -/* D378E8 802400E8 00021140 */ sll $v0, $v0, 5 -/* D378EC 802400EC 3C068008 */ lui $a2, %hi(gItemTable) -/* D378F0 802400F0 00C23021 */ addu $a2, $a2, $v0 -/* D378F4 802400F4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D378F8 802400F8 0C0B2026 */ jal set_variable -/* D378FC 802400FC 0220282D */ daddu $a1, $s1, $zero -/* D37900 80240100 8FBF0018 */ lw $ra, 0x18($sp) -/* D37904 80240104 8FB10014 */ lw $s1, 0x14($sp) -/* D37908 80240108 8FB00010 */ lw $s0, 0x10($sp) -/* D3790C 8024010C 24020002 */ addiu $v0, $zero, 2 -/* D37910 80240110 03E00008 */ jr $ra -/* D37914 80240114 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240884_D3AE54.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240884_D3AE54.s deleted file mode 100644 index 41570ea6e1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240884_D3AE54.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240884_D3AE54 -/* D3AE54 80240884 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3AE58 80240888 AFB00010 */ sw $s0, 0x10($sp) -/* D3AE5C 8024088C 0080802D */ daddu $s0, $a0, $zero -/* D3AE60 80240890 AFBF0018 */ sw $ra, 0x18($sp) -/* D3AE64 80240894 AFB10014 */ sw $s1, 0x14($sp) -/* D3AE68 80240898 8E02000C */ lw $v0, 0xc($s0) -/* D3AE6C 8024089C 8C510000 */ lw $s1, ($v0) -/* D3AE70 802408A0 0C0B1EAF */ jal get_variable -/* D3AE74 802408A4 0220282D */ daddu $a1, $s1, $zero -/* D3AE78 802408A8 3C03FFF0 */ lui $v1, 0xfff0 -/* D3AE7C 802408AC 3463FFFF */ ori $v1, $v1, 0xffff -/* D3AE80 802408B0 0200202D */ daddu $a0, $s0, $zero -/* D3AE84 802408B4 00431024 */ and $v0, $v0, $v1 -/* D3AE88 802408B8 00021140 */ sll $v0, $v0, 5 -/* D3AE8C 802408BC 3C068008 */ lui $a2, %hi(gItemTable) -/* D3AE90 802408C0 00C23021 */ addu $a2, $a2, $v0 -/* D3AE94 802408C4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* D3AE98 802408C8 0C0B2026 */ jal set_variable -/* D3AE9C 802408CC 0220282D */ daddu $a1, $s1, $zero -/* D3AEA0 802408D0 8FBF0018 */ lw $ra, 0x18($sp) -/* D3AEA4 802408D4 8FB10014 */ lw $s1, 0x14($sp) -/* D3AEA8 802408D8 8FB00010 */ lw $s0, 0x10($sp) -/* D3AEAC 802408DC 24020002 */ addiu $v0, $zero, 2 -/* D3AEB0 802408E0 03E00008 */ jr $ra -/* D3AEB4 802408E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240AF8.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240AF8.s deleted file mode 100644 index 3f9f64b545..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240AF8.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AF8 -/* 92ADA8 80240AF8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 92ADAC 80240AFC AFB00010 */ sw $s0, 0x10($sp) -/* 92ADB0 80240B00 0080802D */ daddu $s0, $a0, $zero -/* 92ADB4 80240B04 AFBF0018 */ sw $ra, 0x18($sp) -/* 92ADB8 80240B08 AFB10014 */ sw $s1, 0x14($sp) -/* 92ADBC 80240B0C 8E02000C */ lw $v0, 0xc($s0) -/* 92ADC0 80240B10 8C510000 */ lw $s1, ($v0) -/* 92ADC4 80240B14 0C0B1EAF */ jal get_variable -/* 92ADC8 80240B18 0220282D */ daddu $a1, $s1, $zero -/* 92ADCC 80240B1C 3C03FFF0 */ lui $v1, 0xfff0 -/* 92ADD0 80240B20 3463FFFF */ ori $v1, $v1, 0xffff -/* 92ADD4 80240B24 0200202D */ daddu $a0, $s0, $zero -/* 92ADD8 80240B28 00431024 */ and $v0, $v0, $v1 -/* 92ADDC 80240B2C 00021140 */ sll $v0, $v0, 5 -/* 92ADE0 80240B30 3C068008 */ lui $a2, %hi(gItemTable) -/* 92ADE4 80240B34 00C23021 */ addu $a2, $a2, $v0 -/* 92ADE8 80240B38 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 92ADEC 80240B3C 0C0B2026 */ jal set_variable -/* 92ADF0 80240B40 0220282D */ daddu $a1, $s1, $zero -/* 92ADF4 80240B44 8FBF0018 */ lw $ra, 0x18($sp) -/* 92ADF8 80240B48 8FB10014 */ lw $s1, 0x14($sp) -/* 92ADFC 80240B4C 8FB00010 */ lw $s0, 0x10($sp) -/* 92AE00 80240B50 24020002 */ addiu $v0, $zero, 2 -/* 92AE04 80240B54 03E00008 */ jr $ra -/* 92AE08 80240B58 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240E90_940440.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240E90_940440.s deleted file mode 100644 index 3616ee158d..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240E90_940440.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90_940440 -/* 940440 80240E90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 940444 80240E94 AFB00010 */ sw $s0, 0x10($sp) -/* 940448 80240E98 0080802D */ daddu $s0, $a0, $zero -/* 94044C 80240E9C AFBF0018 */ sw $ra, 0x18($sp) -/* 940450 80240EA0 AFB10014 */ sw $s1, 0x14($sp) -/* 940454 80240EA4 8E02000C */ lw $v0, 0xc($s0) -/* 940458 80240EA8 8C510000 */ lw $s1, ($v0) -/* 94045C 80240EAC 0C0B1EAF */ jal get_variable -/* 940460 80240EB0 0220282D */ daddu $a1, $s1, $zero -/* 940464 80240EB4 3C03FFF0 */ lui $v1, 0xfff0 -/* 940468 80240EB8 3463FFFF */ ori $v1, $v1, 0xffff -/* 94046C 80240EBC 0200202D */ daddu $a0, $s0, $zero -/* 940470 80240EC0 00431024 */ and $v0, $v0, $v1 -/* 940474 80240EC4 00021140 */ sll $v0, $v0, 5 -/* 940478 80240EC8 3C068008 */ lui $a2, %hi(gItemTable) -/* 94047C 80240ECC 00C23021 */ addu $a2, $a2, $v0 -/* 940480 80240ED0 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 940484 80240ED4 0C0B2026 */ jal set_variable -/* 940488 80240ED8 0220282D */ daddu $a1, $s1, $zero -/* 94048C 80240EDC 8FBF0018 */ lw $ra, 0x18($sp) -/* 940490 80240EE0 8FB10014 */ lw $s1, 0x14($sp) -/* 940494 80240EE4 8FB00010 */ lw $s0, 0x10($sp) -/* 940498 80240EE8 24020002 */ addiu $v0, $zero, 2 -/* 94049C 80240EEC 03E00008 */ jr $ra -/* 9404A0 80240EF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802400F4_945FC4.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802400F4_945FC4.s deleted file mode 100644 index 4b25e53905..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802400F4_945FC4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F4_945FC4 -/* 945FC4 802400F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 945FC8 802400F8 AFB00010 */ sw $s0, 0x10($sp) -/* 945FCC 802400FC 0080802D */ daddu $s0, $a0, $zero -/* 945FD0 80240100 AFBF0018 */ sw $ra, 0x18($sp) -/* 945FD4 80240104 AFB10014 */ sw $s1, 0x14($sp) -/* 945FD8 80240108 8E02000C */ lw $v0, 0xc($s0) -/* 945FDC 8024010C 8C510000 */ lw $s1, ($v0) -/* 945FE0 80240110 0C0B1EAF */ jal get_variable -/* 945FE4 80240114 0220282D */ daddu $a1, $s1, $zero -/* 945FE8 80240118 3C03FFF0 */ lui $v1, 0xfff0 -/* 945FEC 8024011C 3463FFFF */ ori $v1, $v1, 0xffff -/* 945FF0 80240120 0200202D */ daddu $a0, $s0, $zero -/* 945FF4 80240124 00431024 */ and $v0, $v0, $v1 -/* 945FF8 80240128 00021140 */ sll $v0, $v0, 5 -/* 945FFC 8024012C 3C068008 */ lui $a2, %hi(gItemTable) -/* 946000 80240130 00C23021 */ addu $a2, $a2, $v0 -/* 946004 80240134 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 946008 80240138 0C0B2026 */ jal set_variable -/* 94600C 8024013C 0220282D */ daddu $a1, $s1, $zero -/* 946010 80240140 8FBF0018 */ lw $ra, 0x18($sp) -/* 946014 80240144 8FB10014 */ lw $s1, 0x14($sp) -/* 946018 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* 94601C 8024014C 24020002 */ addiu $v0, $zero, 2 -/* 946020 80240150 03E00008 */ jr $ra -/* 946024 80240154 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_802403C4.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_802403C4.s deleted file mode 100644 index a28cb6f68c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_802403C4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4 -/* 86CB04 802403C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 86CB08 802403C8 AFB00010 */ sw $s0, 0x10($sp) -/* 86CB0C 802403CC 0080802D */ daddu $s0, $a0, $zero -/* 86CB10 802403D0 AFBF0018 */ sw $ra, 0x18($sp) -/* 86CB14 802403D4 AFB10014 */ sw $s1, 0x14($sp) -/* 86CB18 802403D8 8E02000C */ lw $v0, 0xc($s0) -/* 86CB1C 802403DC 8C510000 */ lw $s1, ($v0) -/* 86CB20 802403E0 0C0B1EAF */ jal get_variable -/* 86CB24 802403E4 0220282D */ daddu $a1, $s1, $zero -/* 86CB28 802403E8 3C03FFF0 */ lui $v1, 0xfff0 -/* 86CB2C 802403EC 3463FFFF */ ori $v1, $v1, 0xffff -/* 86CB30 802403F0 0200202D */ daddu $a0, $s0, $zero -/* 86CB34 802403F4 00431024 */ and $v0, $v0, $v1 -/* 86CB38 802403F8 00021140 */ sll $v0, $v0, 5 -/* 86CB3C 802403FC 3C068008 */ lui $a2, %hi(gItemTable) -/* 86CB40 80240400 00C23021 */ addu $a2, $a2, $v0 -/* 86CB44 80240404 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 86CB48 80240408 0C0B2026 */ jal set_variable -/* 86CB4C 8024040C 0220282D */ daddu $a1, $s1, $zero -/* 86CB50 80240410 8FBF0018 */ lw $ra, 0x18($sp) -/* 86CB54 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* 86CB58 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* 86CB5C 8024041C 24020002 */ addiu $v0, $zero, 2 -/* 86CB60 80240420 03E00008 */ jr $ra -/* 86CB64 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240734.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240734.s deleted file mode 100644 index 1231ea3beb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240734.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240734 -/* 8754F4 80240734 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8754F8 80240738 AFB00010 */ sw $s0, 0x10($sp) -/* 8754FC 8024073C 0080802D */ daddu $s0, $a0, $zero -/* 875500 80240740 AFBF0018 */ sw $ra, 0x18($sp) -/* 875504 80240744 AFB10014 */ sw $s1, 0x14($sp) -/* 875508 80240748 8E02000C */ lw $v0, 0xc($s0) -/* 87550C 8024074C 8C510000 */ lw $s1, ($v0) -/* 875510 80240750 0C0B1EAF */ jal get_variable -/* 875514 80240754 0220282D */ daddu $a1, $s1, $zero -/* 875518 80240758 3C03FFF0 */ lui $v1, 0xfff0 -/* 87551C 8024075C 3463FFFF */ ori $v1, $v1, 0xffff -/* 875520 80240760 0200202D */ daddu $a0, $s0, $zero -/* 875524 80240764 00431024 */ and $v0, $v0, $v1 -/* 875528 80240768 00021140 */ sll $v0, $v0, 5 -/* 87552C 8024076C 3C068008 */ lui $a2, %hi(gItemTable) -/* 875530 80240770 00C23021 */ addu $a2, $a2, $v0 -/* 875534 80240774 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 875538 80240778 0C0B2026 */ jal set_variable -/* 87553C 8024077C 0220282D */ daddu $a1, $s1, $zero -/* 875540 80240780 8FBF0018 */ lw $ra, 0x18($sp) -/* 875544 80240784 8FB10014 */ lw $s1, 0x14($sp) -/* 875548 80240788 8FB00010 */ lw $s0, 0x10($sp) -/* 87554C 8024078C 24020002 */ addiu $v0, $zero, 2 -/* 875550 80240790 03E00008 */ jr $ra -/* 875554 80240794 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A14.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A14.s deleted file mode 100644 index 6aa512e951..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A14.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A14 -/* 8895E4 80240A14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8895E8 80240A18 AFB00010 */ sw $s0, 0x10($sp) -/* 8895EC 80240A1C 0080802D */ daddu $s0, $a0, $zero -/* 8895F0 80240A20 AFBF0018 */ sw $ra, 0x18($sp) -/* 8895F4 80240A24 AFB10014 */ sw $s1, 0x14($sp) -/* 8895F8 80240A28 8E02000C */ lw $v0, 0xc($s0) -/* 8895FC 80240A2C 8C510000 */ lw $s1, ($v0) -/* 889600 80240A30 0C0B1EAF */ jal get_variable -/* 889604 80240A34 0220282D */ daddu $a1, $s1, $zero -/* 889608 80240A38 3C03FFF0 */ lui $v1, 0xfff0 -/* 88960C 80240A3C 3463FFFF */ ori $v1, $v1, 0xffff -/* 889610 80240A40 0200202D */ daddu $a0, $s0, $zero -/* 889614 80240A44 00431024 */ and $v0, $v0, $v1 -/* 889618 80240A48 00021140 */ sll $v0, $v0, 5 -/* 88961C 80240A4C 3C068008 */ lui $a2, %hi(gItemTable) -/* 889620 80240A50 00C23021 */ addu $a2, $a2, $v0 -/* 889624 80240A54 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 889628 80240A58 0C0B2026 */ jal set_variable -/* 88962C 80240A5C 0220282D */ daddu $a1, $s1, $zero -/* 889630 80240A60 8FBF0018 */ lw $ra, 0x18($sp) -/* 889634 80240A64 8FB10014 */ lw $s1, 0x14($sp) -/* 889638 80240A68 8FB00010 */ lw $s0, 0x10($sp) -/* 88963C 80240A6C 24020002 */ addiu $v0, $zero, 2 -/* 889640 80240A70 03E00008 */ jr $ra -/* 889644 80240A74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240A14_8905B4.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240A14_8905B4.s deleted file mode 100644 index 627c96d39f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240A14_8905B4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A14_8905B4 -/* 8905B4 80240A14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8905B8 80240A18 AFB00010 */ sw $s0, 0x10($sp) -/* 8905BC 80240A1C 0080802D */ daddu $s0, $a0, $zero -/* 8905C0 80240A20 AFBF0018 */ sw $ra, 0x18($sp) -/* 8905C4 80240A24 AFB10014 */ sw $s1, 0x14($sp) -/* 8905C8 80240A28 8E02000C */ lw $v0, 0xc($s0) -/* 8905CC 80240A2C 8C510000 */ lw $s1, ($v0) -/* 8905D0 80240A30 0C0B1EAF */ jal get_variable -/* 8905D4 80240A34 0220282D */ daddu $a1, $s1, $zero -/* 8905D8 80240A38 3C03FFF0 */ lui $v1, 0xfff0 -/* 8905DC 80240A3C 3463FFFF */ ori $v1, $v1, 0xffff -/* 8905E0 80240A40 0200202D */ daddu $a0, $s0, $zero -/* 8905E4 80240A44 00431024 */ and $v0, $v0, $v1 -/* 8905E8 80240A48 00021140 */ sll $v0, $v0, 5 -/* 8905EC 80240A4C 3C068008 */ lui $a2, %hi(gItemTable) -/* 8905F0 80240A50 00C23021 */ addu $a2, $a2, $v0 -/* 8905F4 80240A54 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 8905F8 80240A58 0C0B2026 */ jal set_variable -/* 8905FC 80240A5C 0220282D */ daddu $a1, $s1, $zero -/* 890600 80240A60 8FBF0018 */ lw $ra, 0x18($sp) -/* 890604 80240A64 8FB10014 */ lw $s1, 0x14($sp) -/* 890608 80240A68 8FB00010 */ lw $s0, 0x10($sp) -/* 89060C 80240A6C 24020002 */ addiu $v0, $zero, 2 -/* 890610 80240A70 03E00008 */ jr $ra -/* 890614 80240A74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_802403C4_99A034.s b/asm/nonmatchings/world/area_trd/trd_00/999F80/func_802403C4_99A034.s deleted file mode 100644 index e00e156a3f..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_802403C4_99A034.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C4_99A034 -/* 99A034 802403C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99A038 802403C8 AFB00010 */ sw $s0, 0x10($sp) -/* 99A03C 802403CC 0080802D */ daddu $s0, $a0, $zero -/* 99A040 802403D0 AFBF0018 */ sw $ra, 0x18($sp) -/* 99A044 802403D4 AFB10014 */ sw $s1, 0x14($sp) -/* 99A048 802403D8 8E02000C */ lw $v0, 0xc($s0) -/* 99A04C 802403DC 8C510000 */ lw $s1, ($v0) -/* 99A050 802403E0 0C0B1EAF */ jal get_variable -/* 99A054 802403E4 0220282D */ daddu $a1, $s1, $zero -/* 99A058 802403E8 3C03FFF0 */ lui $v1, 0xfff0 -/* 99A05C 802403EC 3463FFFF */ ori $v1, $v1, 0xffff -/* 99A060 802403F0 0200202D */ daddu $a0, $s0, $zero -/* 99A064 802403F4 00431024 */ and $v0, $v0, $v1 -/* 99A068 802403F8 00021140 */ sll $v0, $v0, 5 -/* 99A06C 802403FC 3C068008 */ lui $a2, %hi(gItemTable) -/* 99A070 80240400 00C23021 */ addu $a2, $a2, $v0 -/* 99A074 80240404 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 99A078 80240408 0C0B2026 */ jal set_variable -/* 99A07C 8024040C 0220282D */ daddu $a1, $s1, $zero -/* 99A080 80240410 8FBF0018 */ lw $ra, 0x18($sp) -/* 99A084 80240414 8FB10014 */ lw $s1, 0x14($sp) -/* 99A088 80240418 8FB00010 */ lw $s0, 0x10($sp) -/* 99A08C 8024041C 24020002 */ addiu $v0, $zero, 2 -/* 99A090 80240420 03E00008 */ jr $ra -/* 99A094 80240424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/include/enums.h b/include/enums.h index ad3959bcc5..8b669f3116 100644 --- a/include/enums.h +++ b/include/enums.h @@ -554,6 +554,9 @@ typedef UNK_TYPE Cam; #define Cam_TATTLE 0x00000002 #define Cam_CAM3 0x00000003 + +#define LOOKUP_ITEM(itemID) gItemTable[itemID & ~0xF0000] + typedef s16 ItemId; #define ItemId_JUMP 0x00000001 #define ItemId_SPIN_JUMP 0x00000002 diff --git a/src/world/area_arn/arn_03/BDED90.c b/src/world/area_arn/arn_03/BDED90.c index 2d42073ff8..ab9b8fad13 100644 --- a/src/world/area_arn/arn_03/BDED90.c +++ b/src/world/area_arn/arn_03/BDED90.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_8024113C_BDFECC); INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802412B0_BE0040); -INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80241364_BE00F4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802413C8); diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index 286bc563bb..45de3f3eac 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240000_C3D080); -INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_802400B4_C3D134); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240118_C3D198); diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index 529ee715bb..aadd18307f 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240000_C4DEF0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_802400B4_C4DFA4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240118_C4E008); diff --git a/src/world/area_dgb/dgb_18/C56EF0.c b/src/world/area_dgb/dgb_18/C56EF0.c index d25d7ccbe0..381afe3a99 100644 --- a/src/world/area_dgb/dgb_18/C56EF0.c +++ b/src/world/area_dgb/dgb_18/C56EF0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", func_80240FB0_C56EF0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", func_80241064_C56FA4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", func_802410C8_C57008); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 5e2933b685..015f7f8137 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241174_95C374); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241470); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241524); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241588); diff --git a/src/world/area_dro/dro_01/95E660.c b/src/world/area_dro/dro_01/95E660.c index 9d21c808ab..d9a18f99b2 100644 --- a/src/world/area_dro/dro_01/95E660.c +++ b/src/world/area_dro/dro_01/95E660.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243460); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243514_95E714); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243578); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index ebcee8cdf3..10ca1d8a63 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240300_9694C0); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802403B4_969574); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240418_9695D8); diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index 7f958df947..467e2c322b 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_03/CA72E0", func_80240040_CA72E0); -INCLUDE_ASM(s32, "world/area_flo/flo_03/CA72E0", func_802400F4_CA7394); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_03/CA72E0", func_80240158_CA73F8); diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index 9e3fd22902..e08872f9f7 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9280", func_80240080_CB9280); -INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9280", func_80240134); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9280", func_80240198_CB9398); diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index a1d1709c68..c2bc451038 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_802400B0_CC0EE0); INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_8024027C_CC10AC); -INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_80240330_CC1160); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_80240394_CC11C4); diff --git a/src/world/area_hos/hos_00/A0C4E0.c b/src/world/area_hos/hos_00/A0C4E0.c index 10e5ff162b..3b19074131 100644 --- a/src/world/area_hos/hos_00/A0C4E0.c +++ b/src/world/area_hos/hos_00/A0C4E0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4E0", func_802407F0_A0C4E0); -INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4E0", func_802408A4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4E0", func_80240908_A0C5F8); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index b3d2bdd594..ec9ee31936 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -48,7 +48,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024249C); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242558); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425BC); diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index ed834425b2..d23d0f8f2e 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240310_A397F0); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802403C4_A398A4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240428_A39908); diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c index 7260468d8b..2dd54629cb 100644 --- a/src/world/area_hos/hos_06/A3A230.c +++ b/src/world/area_hos/hos_06/A3A230.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241008); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802410A4); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241158); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802411BC); diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c index 41408c511a..64f4ee3729 100644 --- a/src/world/area_hos/hos_06/A3B4B0.c +++ b/src/world/area_hos/hos_06/A3B4B0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80241FD0_A3B4B0); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80242084_A3B564); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_802420E8); diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c index e4c632804d..80db2723ab 100644 --- a/src/world/area_isk/isk_09/9864E0.c +++ b/src/world/area_isk/isk_09/9864E0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240000_9864E0); -INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_802400B4_986594); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240118_9865F8); diff --git a/src/world/area_iwa/iwa_00/90CC40.c b/src/world/area_iwa/iwa_00/90CC40.c index 052468c14c..731409f45a 100644 --- a/src/world/area_iwa/iwa_00/90CC40.c +++ b/src/world/area_iwa/iwa_00/90CC40.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_00/90CC40", func_80240000_90CC40); -INCLUDE_ASM(s32, "world/area_iwa/iwa_00/90CC40", func_802400B4_90CCF4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_00/90CC40", func_80240118_90CD58); diff --git a/src/world/area_iwa/iwa_03/918BB0.c b/src/world/area_iwa/iwa_03/918BB0.c index bb35497ff8..d935829516 100644 --- a/src/world/area_iwa/iwa_03/918BB0.c +++ b/src/world/area_iwa/iwa_03/918BB0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240000_918BB0); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_802400B4_918C64); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240118_918CC8); diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index f923e86eeb..9034729e0c 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240340_B20880); INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802403F4_B20934); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802404A8_B209E8); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024050C_B20A4C); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 3a5a7ecfb8..ace1ea61e8 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241578); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241614_B2DA84); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802416C8_B2DB38); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024172C); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index a69b17d07e..deec82df2c 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -80,7 +80,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B00); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241C50); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CB4); diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c index 5adf93dc2e..bb85dc0b7d 100644 --- a/src/world/area_jan/jan_04/B44AC0.c +++ b/src/world/area_jan/jan_04/B44AC0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240350_B44AC0); -INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240404_B44B74); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240468); diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 46d4c75559..e513ae1236 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240B94_B84D14); INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240E90_B85010); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240F44_B850C4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FA8); diff --git a/src/world/area_kkj/kkj_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c index b4532f7424..4bc6955945 100644 --- a/src/world/area_kkj/kkj_17/AF1C60.c +++ b/src/world/area_kkj/kkj_17/AF1C60.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240000_AF1C60); -INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_802400B4_AF1D14); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240118_AF1D78); diff --git a/src/world/area_kkj/kkj_20/AFDB40.c b/src/world/area_kkj/kkj_20/AFDB40.c index fdb3337bc8..96c9f99fe7 100644 --- a/src/world/area_kkj/kkj_20/AFDB40.c +++ b/src/world/area_kkj/kkj_20/AFDB40.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240000_AFDB40); -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_802400B4_AFDBF4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240118_AFDC58); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 9377abffeb..e4e5fe4f0b 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240370_8B03E0); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240444); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404A8); diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c index ec69cc2c26..50f09ae2e0 100644 --- a/src/world/area_kmr/kmr_04/8CA960.c +++ b/src/world/area_kmr/kmr_04/8CA960.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_8024029C); INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8); -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_8024037C); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802403E0_8CACE0); diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 23c353bff1..8a19b9afba 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802400B4_8D8584); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240118); diff --git a/src/world/area_kmr/kmr_20/8ED440.c b/src/world/area_kmr/kmr_20/8ED440.c index 9ead355872..391afcd51e 100644 --- a/src/world/area_kmr/kmr_20/8ED440.c +++ b/src/world/area_kmr/kmr_20/8ED440.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_80241620); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_802416D4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_80241738); diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 4de9d56ec8..1d2d282704 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240380_A57830); -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240434_A578E4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240498); diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c index e7c292633c..6421fc0ef5 100644 --- a/src/world/area_kpa/kpa_15/A596A0.c +++ b/src/world/area_kpa/kpa_15/A596A0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240310_A596A0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_802403C4_A59754); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240428_A597B8); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index 1fcaea26f7..e7855880b4 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241DE4_C5C524); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241FCC_C5C70C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242080_C5C7C0); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802420E4_C5C824); diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index e9a66200c6..927b447893 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -48,7 +48,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024234C_C6305C); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024259C_C632AC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242650); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802426B4_C633C4); diff --git a/src/world/area_kzn/kzn_08/C71C10.c b/src/world/area_kzn/kzn_08/C71C10.c index b24b7b0122..5b0d8cf620 100644 --- a/src/world/area_kzn/kzn_08/C71C10.c +++ b/src/world/area_kzn/kzn_08/C71C10.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_80240790_C71C10); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_80240844_C71CC4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_802408A8_C71D28); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index bd31db9c6b..75f2b630af 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -48,7 +48,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243238_C79F18); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802432AC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243360); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802433C4_C7A0A4); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index e337c75937..d8ab053a35 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -48,7 +48,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242528_C87FD8); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024259C_C8804C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242650_C88100); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802426B4_C88164); diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index 8f93194de5..aa79ea2963 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_8024140C); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241468); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_8024151C); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241580); diff --git a/src/world/area_kzn/kzn_20/C96240.c b/src/world/area_kzn/kzn_20/C96240.c index a44cdb9ce8..ab82cab366 100644 --- a/src/world/area_kzn/kzn_20/C96240.c +++ b/src/world/area_kzn/kzn_20/C96240.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240310_C96240); -INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802403C4_C962F4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240428_C96358); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index cd6211cbee..10b0c67e7d 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802406E4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240748); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 4685a4d518..70637591bc 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243104); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243400); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802434B4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243518); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 39a190a368..ba942fc1e3 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241C14); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241FC4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242028); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index e572cf7cda..6948367dae 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802414C4); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241874); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418D8); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index cac3cea04e..a61e199728 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240320); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240564); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405C8); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 622cc6c984..a12cdede54 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240514); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240578); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 446f6cd802..2d2c17f5d7 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241024); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802413D4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241438); diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index c212531b95..0e7a74894c 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -18,4 +18,4 @@ INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240DF0_B9E750); INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80241014); -INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_802410C8_B9EA28); +#include "world/common/GetItemName.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 71cb4da84e..c3116bc43d 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D60); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", delete_player_actor_9C6148); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E1C); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E80_9C6260); diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 1347db38b8..87a21d7a1d 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_8024023C_9D725C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802402E0_9D7300); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240394_9D73B4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802403F8); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index a7a34cd175..c5050b591e 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241614); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802419C4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A28); diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c index f6e3560058..896bd5fee2 100644 --- a/src/world/area_nok/nok_02/9DA8F0.c +++ b/src/world/area_nok/nok_02/9DA8F0.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243D14); INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243DB0_9DADD0); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243E64); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243EC8); diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c index f2fcf80d36..4f2a3fc740 100644 --- a/src/world/area_obk/obk_01/BBD980.c +++ b/src/world/area_obk/obk_01/BBD980.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_802407E0_BBD980); -INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240894); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_802408F8_BBDA98); diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index 95024331de..9067f49ed8 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240170_BC43F0); -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240224_BC44A4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240288); diff --git a/src/world/area_obk/obk_04/BC7EB0.c b/src/world/area_obk/obk_04/BC7EB0.c index 09c5c1e81b..47be1c0b0e 100644 --- a/src/world/area_obk/obk_04/BC7EB0.c +++ b/src/world/area_obk/obk_04/BC7EB0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240910_BC8770); INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240940_BC87A0); -INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_802409F4_BC8854); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240A58); diff --git a/src/world/area_obk/obk_07/BCEBF0.c b/src/world/area_obk/obk_07/BCEBF0.c index 41b378dcf1..24518a16e1 100644 --- a/src/world/area_obk/obk_07/BCEBF0.c +++ b/src/world/area_obk/obk_07/BCEBF0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240000_BCEBF0); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_802400B4_BCECA4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240118_BCED08); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 1634b5ddeb..2d770adf6f 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802400B4_DAD4B4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240118_DAD518); diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c index c1f6325dda..175d1fe4f6 100644 --- a/src/world/area_omo/omo_06/DB8180.c +++ b/src/world/area_omo/omo_06/DB8180.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240870_DB8180); -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240924_DB8234); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240988); diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index 1310e05d5c..7cdaafb08f 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242FD4_DC0284); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243038); diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c index ab8886cdfc..355198a5fa 100644 --- a/src/world/area_omo/omo_09/DCD3F0.c +++ b/src/world/area_omo/omo_09/DCD3F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240720_DCD3F0); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_802407D4_DCD4A4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240838); diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c index 8fe80dcbb6..8d7969f6b2 100644 --- a/src/world/area_omo/omo_13/DE36C0.c +++ b/src/world/area_omo/omo_13/DE36C0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241230_DE36C0); -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_802412E4_DE3774); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241348); diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index cc08c3b91f..405bcfb07d 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240360_AB0350); -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240414_AB0404); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240478_AB0468); diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index 2aa07ca7a4..d466056b86 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240EEC_D56A9C); INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0); -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240FD4_D56B84); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80241038_D56BE8); diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index 167f135b50..00c21637a3 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240EEC_D623EC); INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240F20_D62420); -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240FD4_D624D4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80241038_D62538); diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index 2f410082f4..b92f956a62 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F1C_D63C2C); INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F50_D63C60); -INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80241004); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80241068_D63D78); diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index 414656e54b..3f02725ff3 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240EEC_D68BEC); INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240F20_D68C20); -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240FD4_D68CD4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80241038_D68D38); diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index f62e10c295..8d47531b47 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F1C_D7A90C); INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F50_D7A940); -INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80241004_D7A9F4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80241068_D7AA58); diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index cc758d5f2b..1d11cd9dba 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F1C_D7C1BC); INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F50_D7C1F0); -INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80241004_D7C2A4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80241068_D7C308); diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c index 1bf735822e..c24aca1e08 100644 --- a/src/world/area_pra/pra_35/D8FBA0.c +++ b/src/world/area_pra/pra_35/D8FBA0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242950); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242A04_D8FC54); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242A68); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index d6b69128e7..2a8b48aa26 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240664); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802407B4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240818_CF8388); @@ -80,6 +80,10 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241B20_CF9690); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241C90_CF9800); +// Identical to GetItemName but since there is already one inclusion of it in this file, +// we can't include it again. This makes me think there is an undetected file boundary here, +// or there's something else about the area system we're not aware of +//#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241D44_CF98B4); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241DA8); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 0ead8a71ec..457be5ad1b 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B24_D06254); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B2C_D0625C); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240BE0_D06310); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C44_D06374); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 63eca055d6..5374291e2a 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024185C); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241A48); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241AFC); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241B60); diff --git a/src/world/area_sam/sam_09/D362F0.c b/src/world/area_sam/sam_09/D362F0.c index c80053c84e..c090d59e17 100644 --- a/src/world/area_sam/sam_09/D362F0.c +++ b/src/world/area_sam/sam_09/D362F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_09/D362F0", func_80240000_D362F0); -INCLUDE_ASM(s32, "world/area_sam/sam_09/D362F0", func_802400B4_D363A4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_09/D362F0", func_80240118_D36408); diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c index 3e2f1a23b9..2ef9a1c795 100644 --- a/src/world/area_sam/sam_10/D37800.c +++ b/src/world/area_sam/sam_10/D37800.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240000_D37800); -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_802400B4_D378B4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240118_D37918); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index a2a18b8428..aff6c40d25 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240884_D3AE54); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408E8_D3AEB8); diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index 98d82008c7..ee0c5018b1 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_802409A8); INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240A44); -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240AF8); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240B5C); diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 55592babaf..038cd85e95 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240B64_940114); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240DDC_94038C); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240E90_940440); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240EF4); diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c index 8ccb7b2b50..ed6994c2c3 100644 --- a/src/world/area_sbk/sbk_34/945F10.c +++ b/src/world/area_sbk/sbk_34/945F10.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240040_945F10); -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_802400F4_945FC4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240158); diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c index b5ec3fdb27..f23d183b34 100644 --- a/src/world/area_tik/tik_02/86CA50.c +++ b/src/world/area_tik/tik_02/86CA50.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240310); -INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_802403C4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240428); diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index 462e572794..0216a36dbf 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240310_8750D0); INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680); -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240734); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240798); diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index 48255ef686..ed3ff00b59 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_802405F0_8891C0); INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240960_889530); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240A14); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240A78); diff --git a/src/world/area_tik/tik_15/890190.c b/src/world/area_tik/tik_15/890190.c index df8870b565..437b3acb33 100644 --- a/src/world/area_tik/tik_15/890190.c +++ b/src/world/area_tik/tik_15/890190.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_802405F0_890190); INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240960_890500); -INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240A14_8905B4); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240A78_890618); diff --git a/src/world/area_trd/trd_00/999F80.c b/src/world/area_trd/trd_00/999F80.c index ea0385b5f9..3fd7939919 100644 --- a/src/world/area_trd/trd_00/999F80.c +++ b/src/world/area_trd/trd_00/999F80.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240310_999F80); -INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_802403C4_99A034); +#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240428_99A098); diff --git a/src/world/common/GetItemName.inc.c b/src/world/common/GetItemName.inc.c new file mode 100644 index 0000000000..ee3a6220d0 --- /dev/null +++ b/src/world/common/GetItemName.inc.c @@ -0,0 +1,9 @@ +#include "common.h" + +static ApiStatus GetItemName(ScriptInstance* script, s32 isInitialCall) { + Bytecode a0 = *script->ptrReadPos; + s32 itemID = get_variable(script, a0); + + set_variable(script, a0, LOOKUP_ITEM(itemID).nameString); + return ApiStatus_DONE2; +} diff --git a/tools/assist.py b/tools/assist.py index 67ee32784a..9d18efefaa 100755 --- a/tools/assist.py +++ b/tools/assist.py @@ -93,6 +93,13 @@ def get_map_offsets(syms): return offsets +def is_zeros(vals): + for val in vals: + if val != 0: + return False + return True + + def diff_syms(qb, tb): if len(tb) < 8: return 0 @@ -105,6 +112,9 @@ def diff_syms(qb, tb): smaller = qb len_ratio = len(smaller) / len(larger) + + if abs(len(larger) - len(smaller)) < 16 and is_zeros(larger[len(smaller):]): + len_ratio = 1 n_bytes = len(smaller) matches = 0 @@ -122,6 +132,8 @@ def get_matches(query): ret = {} for symbol in map_offsets: if symbol is not None and query != symbol: + if symbol == "func_802410C8_B9EA28": + dog = 5 target_bytes = get_symbol_bytes(map_offsets, symbol) if target_bytes is not None: score = diff_syms(query_bytes, target_bytes) @@ -157,7 +169,7 @@ def do_query(query): parser = argparse.ArgumentParser(description="Tools to assist with decomp") parser.add_argument("query", help="function or file") parser.add_argument("--threshold", help="score threshold between 0 and 1 (higher is more restrictive)", type=float, default=0.95, required=False) -parser.add_argument("--num-out", help="number of functions to display", type=int, default=10, required=False) +parser.add_argument("--num-out", help="number of functions to display", type=int, default=100, required=False) args = parser.parse_args() diff --git a/tools/substitute.py b/tools/substitute.py new file mode 100755 index 0000000000..0f1b79efb3 --- /dev/null +++ b/tools/substitute.py @@ -0,0 +1,48 @@ +#!/usr/bin/python3 + +import argparse +from collections import OrderedDict +import os +import re +import pickle +import sys + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = script_dir + "/../" +src_dir = root_dir + "src/" + + +parser = argparse.ArgumentParser(description="Replace many functions with one") +parser.add_argument("from_list", help="path to line-separated file of functions to be replaced") + +args = parser.parse_args() + +from_funcs = [] + +with open(args.from_list) as f: + from_text = f.readlines() + +to_line = from_text[0].strip() + +for from_line in from_text[1:]: + if len(from_line.strip()) > 0: + from_funcs.append(from_line.rstrip().split(" ")[-1]) + +for root, dirs, files in os.walk(src_dir): + for f_name in files: + if f_name.endswith(".c"): + if f_name == "D8FBA0.c": + dog = 5 + + f_path = os.path.join(root, f_name) + with open(f_path) as f: + f_text_orig = f.read() + + f_text = f_text_orig + for func in from_funcs: + search_pattern = re.compile("\n.*" + func + "\).*\n") + f_text = re.sub(search_pattern, "\n" + to_line + "\n", f_text) + if f_text != f_text_orig: + with open(f_path, "w", newline="\n") as f: + f.write(f_text) +