From bfa719011a44c95ebc5863366bd6009d878a4e95 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 20 Nov 2020 18:01:08 -0500 Subject: [PATCH] Removing extras --- .../iwa_01/90FBD0/func_80240954_910004.s | 21 ------------------- .../kpa_09/A4F0A0/func_802404D4_A4F4D4.s | 21 ------------------- .../kpa_102/A93A50/func_80240744_A93E84.s | 21 ------------------- .../kpa_111/A99590/func_802405A4_A99B34.s | 21 ------------------- .../kpa_115/A9ED40/func_802405A4_A9F2E4.s | 21 ------------------- .../kpa_50/A609D0/func_80240434_A60E04.s | 21 ------------------- .../kpa_52/A671E0/func_80240514_A67614.s | 21 ------------------- .../omo_02/D9D510/func_80241D7C_D9F24C.s | 21 ------------------- .../omo_09/DCD6B0/func_8024278C_DCF45C.s | 21 ------------------- .../omo_17/DEF400/func_802428E0_DF1780.s | 21 ------------------- 10 files changed, 210 deletions(-) delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954_910004.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954_910004.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954_910004.s deleted file mode 100644 index e936bd2749..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954_910004.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240954_910004 -/* 910004 80240954 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 910008 80240958 AFB10014 */ sw $s1, 0x14($sp) -/* 91000C 8024095C 0080882D */ daddu $s1, $a0, $zero -/* 910010 80240960 AFBF0018 */ sw $ra, 0x18($sp) -/* 910014 80240964 AFB00010 */ sw $s0, 0x10($sp) -/* 910018 80240968 8E300148 */ lw $s0, 0x148($s1) -/* 91001C 8024096C 0C00EABB */ jal get_npc_unsafe -/* 910020 80240970 86040008 */ lh $a0, 8($s0) -/* 910024 80240974 96030076 */ lhu $v1, 0x76($s0) -/* 910028 80240978 A443008E */ sh $v1, 0x8e($v0) -/* 91002C 8024097C 24020021 */ addiu $v0, $zero, 0x21 -/* 910030 80240980 AE220070 */ sw $v0, 0x70($s1) -/* 910034 80240984 8FBF0018 */ lw $ra, 0x18($sp) -/* 910038 80240988 8FB10014 */ lw $s1, 0x14($sp) -/* 91003C 8024098C 8FB00010 */ lw $s0, 0x10($sp) -/* 910040 80240990 03E00008 */ jr $ra -/* 910044 80240994 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s deleted file mode 100644 index 0870874688..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A4F4D4 802404D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4F4D8 802404D8 AFB10014 */ sw $s1, 0x14($sp) -/* A4F4DC 802404DC 0080882D */ daddu $s1, $a0, $zero -/* A4F4E0 802404E0 AFBF0018 */ sw $ra, 0x18($sp) -/* A4F4E4 802404E4 AFB00010 */ sw $s0, 0x10($sp) -/* A4F4E8 802404E8 8E300148 */ lw $s0, 0x148($s1) -/* A4F4EC 802404EC 0C00EABB */ jal get_npc_unsafe -/* A4F4F0 802404F0 86040008 */ lh $a0, 8($s0) -/* A4F4F4 802404F4 96030076 */ lhu $v1, 0x76($s0) -/* A4F4F8 802404F8 A443008E */ sh $v1, 0x8e($v0) -/* A4F4FC 802404FC 24020021 */ addiu $v0, $zero, 0x21 -/* A4F500 80240500 AE220070 */ sw $v0, 0x70($s1) -/* A4F504 80240504 8FBF0018 */ lw $ra, 0x18($sp) -/* A4F508 80240508 8FB10014 */ lw $s1, 0x14($sp) -/* A4F50C 8024050C 8FB00010 */ lw $s0, 0x10($sp) -/* A4F510 80240510 03E00008 */ jr $ra -/* A4F514 80240514 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s deleted file mode 100644 index 200bede539..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A93E84 80240744 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A93E88 80240748 AFB10014 */ sw $s1, 0x14($sp) -/* A93E8C 8024074C 0080882D */ daddu $s1, $a0, $zero -/* A93E90 80240750 AFBF0018 */ sw $ra, 0x18($sp) -/* A93E94 80240754 AFB00010 */ sw $s0, 0x10($sp) -/* A93E98 80240758 8E300148 */ lw $s0, 0x148($s1) -/* A93E9C 8024075C 0C00EABB */ jal get_npc_unsafe -/* A93EA0 80240760 86040008 */ lh $a0, 8($s0) -/* A93EA4 80240764 96030076 */ lhu $v1, 0x76($s0) -/* A93EA8 80240768 A443008E */ sh $v1, 0x8e($v0) -/* A93EAC 8024076C 24020021 */ addiu $v0, $zero, 0x21 -/* A93EB0 80240770 AE220070 */ sw $v0, 0x70($s1) -/* A93EB4 80240774 8FBF0018 */ lw $ra, 0x18($sp) -/* A93EB8 80240778 8FB10014 */ lw $s1, 0x14($sp) -/* A93EBC 8024077C 8FB00010 */ lw $s0, 0x10($sp) -/* A93EC0 80240780 03E00008 */ jr $ra -/* A93EC4 80240784 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s deleted file mode 100644 index 99bd529326..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A99B34 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A99B38 802405A8 AFB10014 */ sw $s1, 0x14($sp) -/* A99B3C 802405AC 0080882D */ daddu $s1, $a0, $zero -/* A99B40 802405B0 AFBF0018 */ sw $ra, 0x18($sp) -/* A99B44 802405B4 AFB00010 */ sw $s0, 0x10($sp) -/* A99B48 802405B8 8E300148 */ lw $s0, 0x148($s1) -/* A99B4C 802405BC 0C00EABB */ jal get_npc_unsafe -/* A99B50 802405C0 86040008 */ lh $a0, 8($s0) -/* A99B54 802405C4 96030076 */ lhu $v1, 0x76($s0) -/* A99B58 802405C8 A443008E */ sh $v1, 0x8e($v0) -/* A99B5C 802405CC 24020021 */ addiu $v0, $zero, 0x21 -/* A99B60 802405D0 AE220070 */ sw $v0, 0x70($s1) -/* A99B64 802405D4 8FBF0018 */ lw $ra, 0x18($sp) -/* A99B68 802405D8 8FB10014 */ lw $s1, 0x14($sp) -/* A99B6C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* A99B70 802405E0 03E00008 */ jr $ra -/* A99B74 802405E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s deleted file mode 100644 index efbe6554a6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A9F2E4 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A9F2E8 802405A8 AFB10014 */ sw $s1, 0x14($sp) -/* A9F2EC 802405AC 0080882D */ daddu $s1, $a0, $zero -/* A9F2F0 802405B0 AFBF0018 */ sw $ra, 0x18($sp) -/* A9F2F4 802405B4 AFB00010 */ sw $s0, 0x10($sp) -/* A9F2F8 802405B8 8E300148 */ lw $s0, 0x148($s1) -/* A9F2FC 802405BC 0C00EABB */ jal get_npc_unsafe -/* A9F300 802405C0 86040008 */ lh $a0, 8($s0) -/* A9F304 802405C4 96030076 */ lhu $v1, 0x76($s0) -/* A9F308 802405C8 A443008E */ sh $v1, 0x8e($v0) -/* A9F30C 802405CC 24020021 */ addiu $v0, $zero, 0x21 -/* A9F310 802405D0 AE220070 */ sw $v0, 0x70($s1) -/* A9F314 802405D4 8FBF0018 */ lw $ra, 0x18($sp) -/* A9F318 802405D8 8FB10014 */ lw $s1, 0x14($sp) -/* A9F31C 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* A9F320 802405E0 03E00008 */ jr $ra -/* A9F324 802405E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s deleted file mode 100644 index 4686f622aa..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A60E04 80240434 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A60E08 80240438 AFB10014 */ sw $s1, 0x14($sp) -/* A60E0C 8024043C 0080882D */ daddu $s1, $a0, $zero -/* A60E10 80240440 AFBF0018 */ sw $ra, 0x18($sp) -/* A60E14 80240444 AFB00010 */ sw $s0, 0x10($sp) -/* A60E18 80240448 8E300148 */ lw $s0, 0x148($s1) -/* A60E1C 8024044C 0C00EABB */ jal get_npc_unsafe -/* A60E20 80240450 86040008 */ lh $a0, 8($s0) -/* A60E24 80240454 96030076 */ lhu $v1, 0x76($s0) -/* A60E28 80240458 A443008E */ sh $v1, 0x8e($v0) -/* A60E2C 8024045C 24020021 */ addiu $v0, $zero, 0x21 -/* A60E30 80240460 AE220070 */ sw $v0, 0x70($s1) -/* A60E34 80240464 8FBF0018 */ lw $ra, 0x18($sp) -/* A60E38 80240468 8FB10014 */ lw $s1, 0x14($sp) -/* A60E3C 8024046C 8FB00010 */ lw $s0, 0x10($sp) -/* A60E40 80240470 03E00008 */ jr $ra -/* A60E44 80240474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s deleted file mode 100644 index 4f04470e70..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* A67614 80240514 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A67618 80240518 AFB10014 */ sw $s1, 0x14($sp) -/* A6761C 8024051C 0080882D */ daddu $s1, $a0, $zero -/* A67620 80240520 AFBF0018 */ sw $ra, 0x18($sp) -/* A67624 80240524 AFB00010 */ sw $s0, 0x10($sp) -/* A67628 80240528 8E300148 */ lw $s0, 0x148($s1) -/* A6762C 8024052C 0C00EABB */ jal get_npc_unsafe -/* A67630 80240530 86040008 */ lh $a0, 8($s0) -/* A67634 80240534 96030076 */ lhu $v1, 0x76($s0) -/* A67638 80240538 A443008E */ sh $v1, 0x8e($v0) -/* A6763C 8024053C 24020021 */ addiu $v0, $zero, 0x21 -/* A67640 80240540 AE220070 */ sw $v0, 0x70($s1) -/* A67644 80240544 8FBF0018 */ lw $ra, 0x18($sp) -/* A67648 80240548 8FB10014 */ lw $s1, 0x14($sp) -/* A6764C 8024054C 8FB00010 */ lw $s0, 0x10($sp) -/* A67650 80240550 03E00008 */ jr $ra -/* A67654 80240554 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s deleted file mode 100644 index 8edbbc232a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* D9F24C 80241D7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D9F250 80241D80 AFB10014 */ sw $s1, 0x14($sp) -/* D9F254 80241D84 0080882D */ daddu $s1, $a0, $zero -/* D9F258 80241D88 AFBF0018 */ sw $ra, 0x18($sp) -/* D9F25C 80241D8C AFB00010 */ sw $s0, 0x10($sp) -/* D9F260 80241D90 8E300148 */ lw $s0, 0x148($s1) -/* D9F264 80241D94 0C00EABB */ jal get_npc_unsafe -/* D9F268 80241D98 86040008 */ lh $a0, 8($s0) -/* D9F26C 80241D9C 96030076 */ lhu $v1, 0x76($s0) -/* D9F270 80241DA0 A443008E */ sh $v1, 0x8e($v0) -/* D9F274 80241DA4 24020021 */ addiu $v0, $zero, 0x21 -/* D9F278 80241DA8 AE220070 */ sw $v0, 0x70($s1) -/* D9F27C 80241DAC 8FBF0018 */ lw $ra, 0x18($sp) -/* D9F280 80241DB0 8FB10014 */ lw $s1, 0x14($sp) -/* D9F284 80241DB4 8FB00010 */ lw $s0, 0x10($sp) -/* D9F288 80241DB8 03E00008 */ jr $ra -/* D9F28C 80241DBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s deleted file mode 100644 index 1c6f75d13f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* DCF45C 8024278C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCF460 80242790 AFB10014 */ sw $s1, 0x14($sp) -/* DCF464 80242794 0080882D */ daddu $s1, $a0, $zero -/* DCF468 80242798 AFBF0018 */ sw $ra, 0x18($sp) -/* DCF46C 8024279C AFB00010 */ sw $s0, 0x10($sp) -/* DCF470 802427A0 8E300148 */ lw $s0, 0x148($s1) -/* DCF474 802427A4 0C00EABB */ jal get_npc_unsafe -/* DCF478 802427A8 86040008 */ lh $a0, 8($s0) -/* DCF47C 802427AC 96030076 */ lhu $v1, 0x76($s0) -/* DCF480 802427B0 A443008E */ sh $v1, 0x8e($v0) -/* DCF484 802427B4 24020021 */ addiu $v0, $zero, 0x21 -/* DCF488 802427B8 AE220070 */ sw $v0, 0x70($s1) -/* DCF48C 802427BC 8FBF0018 */ lw $ra, 0x18($sp) -/* DCF490 802427C0 8FB10014 */ lw $s1, 0x14($sp) -/* DCF494 802427C4 8FB00010 */ lw $s0, 0x10($sp) -/* DCF498 802427C8 03E00008 */ jr $ra -/* DCF49C 802427CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s deleted file mode 100644 index f463d4ee4d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnkSetDurationFunc -/* DF1780 802428E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DF1784 802428E4 AFB10014 */ sw $s1, 0x14($sp) -/* DF1788 802428E8 0080882D */ daddu $s1, $a0, $zero -/* DF178C 802428EC AFBF0018 */ sw $ra, 0x18($sp) -/* DF1790 802428F0 AFB00010 */ sw $s0, 0x10($sp) -/* DF1794 802428F4 8E300148 */ lw $s0, 0x148($s1) -/* DF1798 802428F8 0C00EABB */ jal get_npc_unsafe -/* DF179C 802428FC 86040008 */ lh $a0, 8($s0) -/* DF17A0 80242900 96030076 */ lhu $v1, 0x76($s0) -/* DF17A4 80242904 A443008E */ sh $v1, 0x8e($v0) -/* DF17A8 80242908 24020021 */ addiu $v0, $zero, 0x21 -/* DF17AC 8024290C AE220070 */ sw $v0, 0x70($s1) -/* DF17B0 80242910 8FBF0018 */ lw $ra, 0x18($sp) -/* DF17B4 80242914 8FB10014 */ lw $s1, 0x14($sp) -/* DF17B8 80242918 8FB00010 */ lw $s0, 0x10($sp) -/* DF17BC 8024291C 03E00008 */ jr $ra -/* DF17C0 80242920 27BD0020 */ addiu $sp, $sp, 0x20