From 285396f1424236a7d33d9abe375e643115eb379d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 15:48:48 -0500 Subject: [PATCH] CheckItemFlags40 --- .../dgb_06/C3D080/func_80240268_C3D2E8.s | 27 ------------------- .../dgb_12/C4DEF0/func_80240268_C4E158.s | 27 ------------------- .../dgb_18/C56EF0/begin_battle_C57158.s | 27 ------------------- .../hos_06/A3B4B0/func_80242238_A3B718.s | 26 ------------------ .../isk_09/9864E0/func_80240268_986748.s | 26 ------------------ .../iwa_03/918BB0/func_80240268_918E18.s | 26 ------------------ .../jan_04/B44AC0/func_802405B8_B44D28.s | 27 ------------------- .../kkj_17/AF1C60/func_80240268_AF1EC8.s | 26 ------------------ .../kmr_10/8D84D0/func_80240268_8D8738.s | 26 ------------------ .../kpa_15/A596A0/func_80240578_A59908.s | 27 ------------------- .../kzn_08/C71C10/func_802409F8_C71E78.s | 27 ------------------- .../obk_07/BCEBF0/func_80240268_BCEE58.s | 27 ------------------- .../omo_06/DB8180/func_80240AD8_DB83E8.s | 27 ------------------- .../omo_09/DCD3F0/func_80240988_DCD658.s | 27 ------------------- .../omo_13/DE36C0/func_80241498_DE3928.s | 27 ------------------- .../pra_05/D55BD0/func_80241188_D56D38.s | 27 ------------------- .../pra_11/D61520/func_80241188_D62688.s | 27 ------------------- .../pra_12/D62D10/func_802411B8_D63EC8.s | 27 ------------------- .../pra_14/D67D20/func_80241188_D68E88.s | 27 ------------------- .../pra_27/D799F0/func_802411B8_D7ABA8.s | 27 ------------------- .../pra_28/D7B2A0/func_802411B8_D7C458.s | 27 ------------------- .../pra_35/D8FBA0/func_80242BB8_D8FE08.s | 27 ------------------- .../sam_01/CF7E80/func_80241EF8_CF9A68.s | 27 ------------------- .../sam_10/D37800/func_80240268_D37A68.s | 26 ------------------ .../tik_02/86CA50/func_80240578_86CCB8.s | 27 ------------------- .../tik_05/8750D0/func_802408E8_8756A8.s | 26 ------------------ src/world/area_dgb/dgb_06/C3D080.c | 2 +- src/world/area_dgb/dgb_12/C4DEF0.c | 2 +- src/world/area_dgb/dgb_18/C56EF0.c | 2 +- src/world/area_hos/hos_06/A3B4B0.c | 2 +- src/world/area_isk/isk_09/9864E0.c | 2 +- src/world/area_iwa/iwa_03/918BB0.c | 2 +- src/world/area_jan/jan_04/B44AC0.c | 2 +- src/world/area_kkj/kkj_17/AF1C60.c | 2 +- src/world/area_kmr/kmr_10/8D84D0.c | 2 +- src/world/area_kpa/kpa_15/A596A0.c | 2 +- src/world/area_kzn/kzn_08/C71C10.c | 2 +- src/world/area_obk/obk_07/BCEBF0.c | 2 +- src/world/area_omo/omo_06/DB8180.c | 2 +- src/world/area_omo/omo_09/DCD3F0.c | 2 +- src/world/area_omo/omo_13/DE36C0.c | 2 +- src/world/area_pra/pra_05/D55BD0.c | 2 +- src/world/area_pra/pra_11/D61520.c | 2 +- src/world/area_pra/pra_12/D62D10.c | 2 +- src/world/area_pra/pra_14/D67D20.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 2 +- src/world/area_pra/pra_28/D7B2A0.c | 2 +- src/world/area_pra/pra_35/D8FBA0.c | 2 +- src/world/area_sam/sam_01/CF7E80.c | 2 +- src/world/area_sam/sam_10/D37800.c | 2 +- src/world/area_tik/tik_02/86CA50.c | 2 +- src/world/area_tik/tik_05/8750D0.c | 2 +- src/world/common/CheckItemFlags40.inc.c | 13 +++++++++ 53 files changed, 39 insertions(+), 721 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s delete mode 100644 asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s create mode 100644 src/world/common/CheckItemFlags40.inc.c diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s deleted file mode 100644 index c423a6bfed..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240268_C3D2E8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_C3D2E8 -/* C3D2E8 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C3D2EC 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* C3D2F0 80240270 0080802D */ daddu $s0, $a0, $zero -/* C3D2F4 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* C3D2F8 80240278 8E02000C */ lw $v0, 0xc($s0) -/* C3D2FC 8024027C 0C0B1EAF */ jal get_variable -/* C3D300 80240280 8C450000 */ lw $a1, ($v0) -/* C3D304 80240284 00021140 */ sll $v0, $v0, 5 -/* C3D308 80240288 AE000084 */ sw $zero, 0x84($s0) -/* C3D30C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* C3D310 80240290 00220821 */ addu $at, $at, $v0 -/* C3D314 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* C3D318 80240298 30420040 */ andi $v0, $v0, 0x40 -/* C3D31C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* C3D320 802402A0 24020001 */ addiu $v0, $zero, 1 -/* C3D324 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* C3D328 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C3D32C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* C3D330 802402B0 24020002 */ addiu $v0, $zero, 2 -/* C3D334 802402B4 03E00008 */ jr $ra -/* C3D338 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* C3D33C 802402BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s deleted file mode 100644 index 0f38f76d59..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240268_C4E158.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_C4E158 -/* C4E158 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C4E15C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* C4E160 80240270 0080802D */ daddu $s0, $a0, $zero -/* C4E164 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* C4E168 80240278 8E02000C */ lw $v0, 0xc($s0) -/* C4E16C 8024027C 0C0B1EAF */ jal get_variable -/* C4E170 80240280 8C450000 */ lw $a1, ($v0) -/* C4E174 80240284 00021140 */ sll $v0, $v0, 5 -/* C4E178 80240288 AE000084 */ sw $zero, 0x84($s0) -/* C4E17C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* C4E180 80240290 00220821 */ addu $at, $at, $v0 -/* C4E184 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* C4E188 80240298 30420040 */ andi $v0, $v0, 0x40 -/* C4E18C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* C4E190 802402A0 24020001 */ addiu $v0, $zero, 1 -/* C4E194 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* C4E198 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C4E19C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* C4E1A0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* C4E1A4 802402B4 03E00008 */ jr $ra -/* C4E1A8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* C4E1AC 802402BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s deleted file mode 100644 index 6127881d49..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/begin_battle_C57158.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel begin_battle_C57158 -/* C57158 80241218 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5715C 8024121C AFB00010 */ sw $s0, 0x10($sp) -/* C57160 80241220 0080802D */ daddu $s0, $a0, $zero -/* C57164 80241224 AFBF0014 */ sw $ra, 0x14($sp) -/* C57168 80241228 8E02000C */ lw $v0, 0xc($s0) -/* C5716C 8024122C 0C0B1EAF */ jal get_variable -/* C57170 80241230 8C450000 */ lw $a1, ($v0) -/* C57174 80241234 00021140 */ sll $v0, $v0, 5 -/* C57178 80241238 AE000084 */ sw $zero, 0x84($s0) -/* C5717C 8024123C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* C57180 80241240 00220821 */ addu $at, $at, $v0 -/* C57184 80241244 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* C57188 80241248 30420040 */ andi $v0, $v0, 0x40 -/* C5718C 8024124C 10400002 */ beqz $v0, .L80241258 -/* C57190 80241250 24020001 */ addiu $v0, $zero, 1 -/* C57194 80241254 AE020084 */ sw $v0, 0x84($s0) -.L80241258: -/* C57198 80241258 8FBF0014 */ lw $ra, 0x14($sp) -/* C5719C 8024125C 8FB00010 */ lw $s0, 0x10($sp) -/* C571A0 80241260 24020002 */ addiu $v0, $zero, 2 -/* C571A4 80241264 03E00008 */ jr $ra -/* C571A8 80241268 27BD0018 */ addiu $sp, $sp, 0x18 -/* C571AC 8024126C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s deleted file mode 100644 index 7875e2d598..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242238_A3B718 -/* A3B718 80242238 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3B71C 8024223C AFB00010 */ sw $s0, 0x10($sp) -/* A3B720 80242240 0080802D */ daddu $s0, $a0, $zero -/* A3B724 80242244 AFBF0014 */ sw $ra, 0x14($sp) -/* A3B728 80242248 8E02000C */ lw $v0, 0xc($s0) -/* A3B72C 8024224C 0C0B1EAF */ jal get_variable -/* A3B730 80242250 8C450000 */ lw $a1, ($v0) -/* A3B734 80242254 00021140 */ sll $v0, $v0, 5 -/* A3B738 80242258 AE000084 */ sw $zero, 0x84($s0) -/* A3B73C 8024225C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* A3B740 80242260 00220821 */ addu $at, $at, $v0 -/* A3B744 80242264 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* A3B748 80242268 30420040 */ andi $v0, $v0, 0x40 -/* A3B74C 8024226C 10400002 */ beqz $v0, .L80242278 -/* A3B750 80242270 24020001 */ addiu $v0, $zero, 1 -/* A3B754 80242274 AE020084 */ sw $v0, 0x84($s0) -.L80242278: -/* A3B758 80242278 8FBF0014 */ lw $ra, 0x14($sp) -/* A3B75C 8024227C 8FB00010 */ lw $s0, 0x10($sp) -/* A3B760 80242280 24020002 */ addiu $v0, $zero, 2 -/* A3B764 80242284 03E00008 */ jr $ra -/* A3B768 80242288 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s deleted file mode 100644 index e5a231ce10..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240268_986748.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_986748 -/* 986748 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 98674C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* 986750 80240270 0080802D */ daddu $s0, $a0, $zero -/* 986754 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* 986758 80240278 8E02000C */ lw $v0, 0xc($s0) -/* 98675C 8024027C 0C0B1EAF */ jal get_variable -/* 986760 80240280 8C450000 */ lw $a1, ($v0) -/* 986764 80240284 00021140 */ sll $v0, $v0, 5 -/* 986768 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 98676C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 986770 80240290 00220821 */ addu $at, $at, $v0 -/* 986774 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 986778 80240298 30420040 */ andi $v0, $v0, 0x40 -/* 98677C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* 986780 802402A0 24020001 */ addiu $v0, $zero, 1 -/* 986784 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* 986788 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 98678C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* 986790 802402B0 24020002 */ addiu $v0, $zero, 2 -/* 986794 802402B4 03E00008 */ jr $ra -/* 986798 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s deleted file mode 100644 index c0afdfea60..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240268_918E18.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_918E18 -/* 918E18 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 918E1C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* 918E20 80240270 0080802D */ daddu $s0, $a0, $zero -/* 918E24 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* 918E28 80240278 8E02000C */ lw $v0, 0xc($s0) -/* 918E2C 8024027C 0C0B1EAF */ jal get_variable -/* 918E30 80240280 8C450000 */ lw $a1, ($v0) -/* 918E34 80240284 00021140 */ sll $v0, $v0, 5 -/* 918E38 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 918E3C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 918E40 80240290 00220821 */ addu $at, $at, $v0 -/* 918E44 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 918E48 80240298 30420040 */ andi $v0, $v0, 0x40 -/* 918E4C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* 918E50 802402A0 24020001 */ addiu $v0, $zero, 1 -/* 918E54 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* 918E58 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 918E5C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* 918E60 802402B0 24020002 */ addiu $v0, $zero, 2 -/* 918E64 802402B4 03E00008 */ jr $ra -/* 918E68 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s deleted file mode 100644 index 64cdc774c2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_802405B8_B44D28.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405B8_B44D28 -/* B44D28 802405B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B44D2C 802405BC AFB00010 */ sw $s0, 0x10($sp) -/* B44D30 802405C0 0080802D */ daddu $s0, $a0, $zero -/* B44D34 802405C4 AFBF0014 */ sw $ra, 0x14($sp) -/* B44D38 802405C8 8E02000C */ lw $v0, 0xc($s0) -/* B44D3C 802405CC 0C0B1EAF */ jal get_variable -/* B44D40 802405D0 8C450000 */ lw $a1, ($v0) -/* B44D44 802405D4 00021140 */ sll $v0, $v0, 5 -/* B44D48 802405D8 AE000084 */ sw $zero, 0x84($s0) -/* B44D4C 802405DC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* B44D50 802405E0 00220821 */ addu $at, $at, $v0 -/* B44D54 802405E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* B44D58 802405E8 30420040 */ andi $v0, $v0, 0x40 -/* B44D5C 802405EC 10400002 */ beqz $v0, .L802405F8 -/* B44D60 802405F0 24020001 */ addiu $v0, $zero, 1 -/* B44D64 802405F4 AE020084 */ sw $v0, 0x84($s0) -.L802405F8: -/* B44D68 802405F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B44D6C 802405FC 8FB00010 */ lw $s0, 0x10($sp) -/* B44D70 80240600 24020002 */ addiu $v0, $zero, 2 -/* B44D74 80240604 03E00008 */ jr $ra -/* B44D78 80240608 27BD0018 */ addiu $sp, $sp, 0x18 -/* B44D7C 8024060C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s deleted file mode 100644 index f9e8671c71..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240268_AF1EC8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_AF1EC8 -/* AF1EC8 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF1ECC 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* AF1ED0 80240270 0080802D */ daddu $s0, $a0, $zero -/* AF1ED4 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* AF1ED8 80240278 8E02000C */ lw $v0, 0xc($s0) -/* AF1EDC 8024027C 0C0B1EAF */ jal get_variable -/* AF1EE0 80240280 8C450000 */ lw $a1, ($v0) -/* AF1EE4 80240284 00021140 */ sll $v0, $v0, 5 -/* AF1EE8 80240288 AE000084 */ sw $zero, 0x84($s0) -/* AF1EEC 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* AF1EF0 80240290 00220821 */ addu $at, $at, $v0 -/* AF1EF4 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* AF1EF8 80240298 30420040 */ andi $v0, $v0, 0x40 -/* AF1EFC 8024029C 10400002 */ beqz $v0, .L802402A8 -/* AF1F00 802402A0 24020001 */ addiu $v0, $zero, 1 -/* AF1F04 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* AF1F08 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* AF1F0C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* AF1F10 802402B0 24020002 */ addiu $v0, $zero, 2 -/* AF1F14 802402B4 03E00008 */ jr $ra -/* AF1F18 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s deleted file mode 100644 index a29f9e2c23..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_8D8738 -/* 8D8738 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D873C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* 8D8740 80240270 0080802D */ daddu $s0, $a0, $zero -/* 8D8744 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D8748 80240278 8E02000C */ lw $v0, 0xc($s0) -/* 8D874C 8024027C 0C0B1EAF */ jal get_variable -/* 8D8750 80240280 8C450000 */ lw $a1, ($v0) -/* 8D8754 80240284 00021140 */ sll $v0, $v0, 5 -/* 8D8758 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 8D875C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 8D8760 80240290 00220821 */ addu $at, $at, $v0 -/* 8D8764 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 8D8768 80240298 30420040 */ andi $v0, $v0, 0x40 -/* 8D876C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* 8D8770 802402A0 24020001 */ addiu $v0, $zero, 1 -/* 8D8774 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* 8D8778 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D877C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* 8D8780 802402B0 24020002 */ addiu $v0, $zero, 2 -/* 8D8784 802402B4 03E00008 */ jr $ra -/* 8D8788 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s deleted file mode 100644 index cd959556c0..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240578_A59908.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578_A59908 -/* A59908 80240578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A5990C 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* A59910 80240580 0080802D */ daddu $s0, $a0, $zero -/* A59914 80240584 AFBF0014 */ sw $ra, 0x14($sp) -/* A59918 80240588 8E02000C */ lw $v0, 0xc($s0) -/* A5991C 8024058C 0C0B1EAF */ jal get_variable -/* A59920 80240590 8C450000 */ lw $a1, ($v0) -/* A59924 80240594 00021140 */ sll $v0, $v0, 5 -/* A59928 80240598 AE000084 */ sw $zero, 0x84($s0) -/* A5992C 8024059C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* A59930 802405A0 00220821 */ addu $at, $at, $v0 -/* A59934 802405A4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* A59938 802405A8 30420040 */ andi $v0, $v0, 0x40 -/* A5993C 802405AC 10400002 */ beqz $v0, .L802405B8 -/* A59940 802405B0 24020001 */ addiu $v0, $zero, 1 -/* A59944 802405B4 AE020084 */ sw $v0, 0x84($s0) -.L802405B8: -/* A59948 802405B8 8FBF0014 */ lw $ra, 0x14($sp) -/* A5994C 802405BC 8FB00010 */ lw $s0, 0x10($sp) -/* A59950 802405C0 24020002 */ addiu $v0, $zero, 2 -/* A59954 802405C4 03E00008 */ jr $ra -/* A59958 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A5995C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s deleted file mode 100644 index e08f09b538..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_802409F8_C71E78.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409F8_C71E78 -/* C71E78 802409F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C71E7C 802409FC AFB00010 */ sw $s0, 0x10($sp) -/* C71E80 80240A00 0080802D */ daddu $s0, $a0, $zero -/* C71E84 80240A04 AFBF0014 */ sw $ra, 0x14($sp) -/* C71E88 80240A08 8E02000C */ lw $v0, 0xc($s0) -/* C71E8C 80240A0C 0C0B1EAF */ jal get_variable -/* C71E90 80240A10 8C450000 */ lw $a1, ($v0) -/* C71E94 80240A14 00021140 */ sll $v0, $v0, 5 -/* C71E98 80240A18 AE000084 */ sw $zero, 0x84($s0) -/* C71E9C 80240A1C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* C71EA0 80240A20 00220821 */ addu $at, $at, $v0 -/* C71EA4 80240A24 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* C71EA8 80240A28 30420040 */ andi $v0, $v0, 0x40 -/* C71EAC 80240A2C 10400002 */ beqz $v0, .L80240A38 -/* C71EB0 80240A30 24020001 */ addiu $v0, $zero, 1 -/* C71EB4 80240A34 AE020084 */ sw $v0, 0x84($s0) -.L80240A38: -/* C71EB8 80240A38 8FBF0014 */ lw $ra, 0x14($sp) -/* C71EBC 80240A3C 8FB00010 */ lw $s0, 0x10($sp) -/* C71EC0 80240A40 24020002 */ addiu $v0, $zero, 2 -/* C71EC4 80240A44 03E00008 */ jr $ra -/* C71EC8 80240A48 27BD0018 */ addiu $sp, $sp, 0x18 -/* C71ECC 80240A4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s deleted file mode 100644 index e1d91b4109..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240268_BCEE58.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_BCEE58 -/* BCEE58 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BCEE5C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* BCEE60 80240270 0080802D */ daddu $s0, $a0, $zero -/* BCEE64 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* BCEE68 80240278 8E02000C */ lw $v0, 0xc($s0) -/* BCEE6C 8024027C 0C0B1EAF */ jal get_variable -/* BCEE70 80240280 8C450000 */ lw $a1, ($v0) -/* BCEE74 80240284 00021140 */ sll $v0, $v0, 5 -/* BCEE78 80240288 AE000084 */ sw $zero, 0x84($s0) -/* BCEE7C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* BCEE80 80240290 00220821 */ addu $at, $at, $v0 -/* BCEE84 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* BCEE88 80240298 30420040 */ andi $v0, $v0, 0x40 -/* BCEE8C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* BCEE90 802402A0 24020001 */ addiu $v0, $zero, 1 -/* BCEE94 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* BCEE98 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* BCEE9C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* BCEEA0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* BCEEA4 802402B4 03E00008 */ jr $ra -/* BCEEA8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* BCEEAC 802402BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s deleted file mode 100644 index 2fdc7b1b90..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD8_DB83E8 -/* DB83E8 80240AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB83EC 80240ADC AFB00010 */ sw $s0, 0x10($sp) -/* DB83F0 80240AE0 0080802D */ daddu $s0, $a0, $zero -/* DB83F4 80240AE4 AFBF0014 */ sw $ra, 0x14($sp) -/* DB83F8 80240AE8 8E02000C */ lw $v0, 0xc($s0) -/* DB83FC 80240AEC 0C0B1EAF */ jal get_variable -/* DB8400 80240AF0 8C450000 */ lw $a1, ($v0) -/* DB8404 80240AF4 00021140 */ sll $v0, $v0, 5 -/* DB8408 80240AF8 AE000084 */ sw $zero, 0x84($s0) -/* DB840C 80240AFC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* DB8410 80240B00 00220821 */ addu $at, $at, $v0 -/* DB8414 80240B04 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* DB8418 80240B08 30420040 */ andi $v0, $v0, 0x40 -/* DB841C 80240B0C 10400002 */ beqz $v0, .L80240B18 -/* DB8420 80240B10 24020001 */ addiu $v0, $zero, 1 -/* DB8424 80240B14 AE020084 */ sw $v0, 0x84($s0) -.L80240B18: -/* DB8428 80240B18 8FBF0014 */ lw $ra, 0x14($sp) -/* DB842C 80240B1C 8FB00010 */ lw $s0, 0x10($sp) -/* DB8430 80240B20 24020002 */ addiu $v0, $zero, 2 -/* DB8434 80240B24 03E00008 */ jr $ra -/* DB8438 80240B28 27BD0018 */ addiu $sp, $sp, 0x18 -/* DB843C 80240B2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s deleted file mode 100644 index 77117b7c23..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240988_DCD658.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240988_DCD658 -/* DCD658 80240988 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DCD65C 8024098C AFB00010 */ sw $s0, 0x10($sp) -/* DCD660 80240990 0080802D */ daddu $s0, $a0, $zero -/* DCD664 80240994 AFBF0014 */ sw $ra, 0x14($sp) -/* DCD668 80240998 8E02000C */ lw $v0, 0xc($s0) -/* DCD66C 8024099C 0C0B1EAF */ jal get_variable -/* DCD670 802409A0 8C450000 */ lw $a1, ($v0) -/* DCD674 802409A4 00021140 */ sll $v0, $v0, 5 -/* DCD678 802409A8 AE000084 */ sw $zero, 0x84($s0) -/* DCD67C 802409AC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* DCD680 802409B0 00220821 */ addu $at, $at, $v0 -/* DCD684 802409B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* DCD688 802409B8 30420040 */ andi $v0, $v0, 0x40 -/* DCD68C 802409BC 10400002 */ beqz $v0, .L802409C8 -/* DCD690 802409C0 24020001 */ addiu $v0, $zero, 1 -/* DCD694 802409C4 AE020084 */ sw $v0, 0x84($s0) -.L802409C8: -/* DCD698 802409C8 8FBF0014 */ lw $ra, 0x14($sp) -/* DCD69C 802409CC 8FB00010 */ lw $s0, 0x10($sp) -/* DCD6A0 802409D0 24020002 */ addiu $v0, $zero, 2 -/* DCD6A4 802409D4 03E00008 */ jr $ra -/* DCD6A8 802409D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* DCD6AC 802409DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s deleted file mode 100644 index c65da6908b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241498_DE3928.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241498_DE3928 -/* DE3928 80241498 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DE392C 8024149C AFB00010 */ sw $s0, 0x10($sp) -/* DE3930 802414A0 0080802D */ daddu $s0, $a0, $zero -/* DE3934 802414A4 AFBF0014 */ sw $ra, 0x14($sp) -/* DE3938 802414A8 8E02000C */ lw $v0, 0xc($s0) -/* DE393C 802414AC 0C0B1EAF */ jal get_variable -/* DE3940 802414B0 8C450000 */ lw $a1, ($v0) -/* DE3944 802414B4 00021140 */ sll $v0, $v0, 5 -/* DE3948 802414B8 AE000084 */ sw $zero, 0x84($s0) -/* DE394C 802414BC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* DE3950 802414C0 00220821 */ addu $at, $at, $v0 -/* DE3954 802414C4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* DE3958 802414C8 30420040 */ andi $v0, $v0, 0x40 -/* DE395C 802414CC 10400002 */ beqz $v0, .L802414D8 -/* DE3960 802414D0 24020001 */ addiu $v0, $zero, 1 -/* DE3964 802414D4 AE020084 */ sw $v0, 0x84($s0) -.L802414D8: -/* DE3968 802414D8 8FBF0014 */ lw $ra, 0x14($sp) -/* DE396C 802414DC 8FB00010 */ lw $s0, 0x10($sp) -/* DE3970 802414E0 24020002 */ addiu $v0, $zero, 2 -/* DE3974 802414E4 03E00008 */ jr $ra -/* DE3978 802414E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* DE397C 802414EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s deleted file mode 100644 index af10412f52..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241188_D56D38 -/* D56D38 80241188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D56D3C 8024118C AFB00010 */ sw $s0, 0x10($sp) -/* D56D40 80241190 0080802D */ daddu $s0, $a0, $zero -/* D56D44 80241194 AFBF0014 */ sw $ra, 0x14($sp) -/* D56D48 80241198 8E02000C */ lw $v0, 0xc($s0) -/* D56D4C 8024119C 0C0B1EAF */ jal get_variable -/* D56D50 802411A0 8C450000 */ lw $a1, ($v0) -/* D56D54 802411A4 00021140 */ sll $v0, $v0, 5 -/* D56D58 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D56D5C 802411AC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D56D60 802411B0 00220821 */ addu $at, $at, $v0 -/* D56D64 802411B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D56D68 802411B8 30420040 */ andi $v0, $v0, 0x40 -/* D56D6C 802411BC 10400002 */ beqz $v0, .L802411C8 -/* D56D70 802411C0 24020001 */ addiu $v0, $zero, 1 -/* D56D74 802411C4 AE020084 */ sw $v0, 0x84($s0) -.L802411C8: -/* D56D78 802411C8 8FBF0014 */ lw $ra, 0x14($sp) -/* D56D7C 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* D56D80 802411D0 24020002 */ addiu $v0, $zero, 2 -/* D56D84 802411D4 03E00008 */ jr $ra -/* D56D88 802411D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D56D8C 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s deleted file mode 100644 index 7b9aedc5ab..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80241188_D62688.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241188_D62688 -/* D62688 80241188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6268C 8024118C AFB00010 */ sw $s0, 0x10($sp) -/* D62690 80241190 0080802D */ daddu $s0, $a0, $zero -/* D62694 80241194 AFBF0014 */ sw $ra, 0x14($sp) -/* D62698 80241198 8E02000C */ lw $v0, 0xc($s0) -/* D6269C 8024119C 0C0B1EAF */ jal get_variable -/* D626A0 802411A0 8C450000 */ lw $a1, ($v0) -/* D626A4 802411A4 00021140 */ sll $v0, $v0, 5 -/* D626A8 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D626AC 802411AC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D626B0 802411B0 00220821 */ addu $at, $at, $v0 -/* D626B4 802411B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D626B8 802411B8 30420040 */ andi $v0, $v0, 0x40 -/* D626BC 802411BC 10400002 */ beqz $v0, .L802411C8 -/* D626C0 802411C0 24020001 */ addiu $v0, $zero, 1 -/* D626C4 802411C4 AE020084 */ sw $v0, 0x84($s0) -.L802411C8: -/* D626C8 802411C8 8FBF0014 */ lw $ra, 0x14($sp) -/* D626CC 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* D626D0 802411D0 24020002 */ addiu $v0, $zero, 2 -/* D626D4 802411D4 03E00008 */ jr $ra -/* D626D8 802411D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D626DC 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s deleted file mode 100644 index 2cdd966250..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802411B8_D63EC8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B8_D63EC8 -/* D63EC8 802411B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D63ECC 802411BC AFB00010 */ sw $s0, 0x10($sp) -/* D63ED0 802411C0 0080802D */ daddu $s0, $a0, $zero -/* D63ED4 802411C4 AFBF0014 */ sw $ra, 0x14($sp) -/* D63ED8 802411C8 8E02000C */ lw $v0, 0xc($s0) -/* D63EDC 802411CC 0C0B1EAF */ jal get_variable -/* D63EE0 802411D0 8C450000 */ lw $a1, ($v0) -/* D63EE4 802411D4 00021140 */ sll $v0, $v0, 5 -/* D63EE8 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D63EEC 802411DC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D63EF0 802411E0 00220821 */ addu $at, $at, $v0 -/* D63EF4 802411E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D63EF8 802411E8 30420040 */ andi $v0, $v0, 0x40 -/* D63EFC 802411EC 10400002 */ beqz $v0, .L802411F8 -/* D63F00 802411F0 24020001 */ addiu $v0, $zero, 1 -/* D63F04 802411F4 AE020084 */ sw $v0, 0x84($s0) -.L802411F8: -/* D63F08 802411F8 8FBF0014 */ lw $ra, 0x14($sp) -/* D63F0C 802411FC 8FB00010 */ lw $s0, 0x10($sp) -/* D63F10 80241200 24020002 */ addiu $v0, $zero, 2 -/* D63F14 80241204 03E00008 */ jr $ra -/* D63F18 80241208 27BD0018 */ addiu $sp, $sp, 0x18 -/* D63F1C 8024120C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s deleted file mode 100644 index e6c3810e5d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80241188_D68E88.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241188_D68E88 -/* D68E88 80241188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D68E8C 8024118C AFB00010 */ sw $s0, 0x10($sp) -/* D68E90 80241190 0080802D */ daddu $s0, $a0, $zero -/* D68E94 80241194 AFBF0014 */ sw $ra, 0x14($sp) -/* D68E98 80241198 8E02000C */ lw $v0, 0xc($s0) -/* D68E9C 8024119C 0C0B1EAF */ jal get_variable -/* D68EA0 802411A0 8C450000 */ lw $a1, ($v0) -/* D68EA4 802411A4 00021140 */ sll $v0, $v0, 5 -/* D68EA8 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D68EAC 802411AC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D68EB0 802411B0 00220821 */ addu $at, $at, $v0 -/* D68EB4 802411B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D68EB8 802411B8 30420040 */ andi $v0, $v0, 0x40 -/* D68EBC 802411BC 10400002 */ beqz $v0, .L802411C8 -/* D68EC0 802411C0 24020001 */ addiu $v0, $zero, 1 -/* D68EC4 802411C4 AE020084 */ sw $v0, 0x84($s0) -.L802411C8: -/* D68EC8 802411C8 8FBF0014 */ lw $ra, 0x14($sp) -/* D68ECC 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* D68ED0 802411D0 24020002 */ addiu $v0, $zero, 2 -/* D68ED4 802411D4 03E00008 */ jr $ra -/* D68ED8 802411D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D68EDC 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s deleted file mode 100644 index 531b0ab6d9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802411B8_D7ABA8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B8_D7ABA8 -/* D7ABA8 802411B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7ABAC 802411BC AFB00010 */ sw $s0, 0x10($sp) -/* D7ABB0 802411C0 0080802D */ daddu $s0, $a0, $zero -/* D7ABB4 802411C4 AFBF0014 */ sw $ra, 0x14($sp) -/* D7ABB8 802411C8 8E02000C */ lw $v0, 0xc($s0) -/* D7ABBC 802411CC 0C0B1EAF */ jal get_variable -/* D7ABC0 802411D0 8C450000 */ lw $a1, ($v0) -/* D7ABC4 802411D4 00021140 */ sll $v0, $v0, 5 -/* D7ABC8 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D7ABCC 802411DC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D7ABD0 802411E0 00220821 */ addu $at, $at, $v0 -/* D7ABD4 802411E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D7ABD8 802411E8 30420040 */ andi $v0, $v0, 0x40 -/* D7ABDC 802411EC 10400002 */ beqz $v0, .L802411F8 -/* D7ABE0 802411F0 24020001 */ addiu $v0, $zero, 1 -/* D7ABE4 802411F4 AE020084 */ sw $v0, 0x84($s0) -.L802411F8: -/* D7ABE8 802411F8 8FBF0014 */ lw $ra, 0x14($sp) -/* D7ABEC 802411FC 8FB00010 */ lw $s0, 0x10($sp) -/* D7ABF0 80241200 24020002 */ addiu $v0, $zero, 2 -/* D7ABF4 80241204 03E00008 */ jr $ra -/* D7ABF8 80241208 27BD0018 */ addiu $sp, $sp, 0x18 -/* D7ABFC 8024120C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s deleted file mode 100644 index 63e76797cf..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802411B8_D7C458.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B8_D7C458 -/* D7C458 802411B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7C45C 802411BC AFB00010 */ sw $s0, 0x10($sp) -/* D7C460 802411C0 0080802D */ daddu $s0, $a0, $zero -/* D7C464 802411C4 AFBF0014 */ sw $ra, 0x14($sp) -/* D7C468 802411C8 8E02000C */ lw $v0, 0xc($s0) -/* D7C46C 802411CC 0C0B1EAF */ jal get_variable -/* D7C470 802411D0 8C450000 */ lw $a1, ($v0) -/* D7C474 802411D4 00021140 */ sll $v0, $v0, 5 -/* D7C478 802411D8 AE000084 */ sw $zero, 0x84($s0) -/* D7C47C 802411DC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D7C480 802411E0 00220821 */ addu $at, $at, $v0 -/* D7C484 802411E4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D7C488 802411E8 30420040 */ andi $v0, $v0, 0x40 -/* D7C48C 802411EC 10400002 */ beqz $v0, .L802411F8 -/* D7C490 802411F0 24020001 */ addiu $v0, $zero, 1 -/* D7C494 802411F4 AE020084 */ sw $v0, 0x84($s0) -.L802411F8: -/* D7C498 802411F8 8FBF0014 */ lw $ra, 0x14($sp) -/* D7C49C 802411FC 8FB00010 */ lw $s0, 0x10($sp) -/* D7C4A0 80241200 24020002 */ addiu $v0, $zero, 2 -/* D7C4A4 80241204 03E00008 */ jr $ra -/* D7C4A8 80241208 27BD0018 */ addiu $sp, $sp, 0x18 -/* D7C4AC 8024120C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s deleted file mode 100644 index 56d903bf8b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BB8_D8FE08 -/* D8FE08 80242BB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8FE0C 80242BBC AFB00010 */ sw $s0, 0x10($sp) -/* D8FE10 80242BC0 0080802D */ daddu $s0, $a0, $zero -/* D8FE14 80242BC4 AFBF0014 */ sw $ra, 0x14($sp) -/* D8FE18 80242BC8 8E02000C */ lw $v0, 0xc($s0) -/* D8FE1C 80242BCC 0C0B1EAF */ jal get_variable -/* D8FE20 80242BD0 8C450000 */ lw $a1, ($v0) -/* D8FE24 80242BD4 00021140 */ sll $v0, $v0, 5 -/* D8FE28 80242BD8 AE000084 */ sw $zero, 0x84($s0) -/* D8FE2C 80242BDC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D8FE30 80242BE0 00220821 */ addu $at, $at, $v0 -/* D8FE34 80242BE4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D8FE38 80242BE8 30420040 */ andi $v0, $v0, 0x40 -/* D8FE3C 80242BEC 10400002 */ beqz $v0, .L80242BF8 -/* D8FE40 80242BF0 24020001 */ addiu $v0, $zero, 1 -/* D8FE44 80242BF4 AE020084 */ sw $v0, 0x84($s0) -.L80242BF8: -/* D8FE48 80242BF8 8FBF0014 */ lw $ra, 0x14($sp) -/* D8FE4C 80242BFC 8FB00010 */ lw $s0, 0x10($sp) -/* D8FE50 80242C00 24020002 */ addiu $v0, $zero, 2 -/* D8FE54 80242C04 03E00008 */ jr $ra -/* D8FE58 80242C08 27BD0018 */ addiu $sp, $sp, 0x18 -/* D8FE5C 80242C0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s deleted file mode 100644 index 3648ece98f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241EF8_CF9A68.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EF8_CF9A68 -/* CF9A68 80241EF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF9A6C 80241EFC AFB00010 */ sw $s0, 0x10($sp) -/* CF9A70 80241F00 0080802D */ daddu $s0, $a0, $zero -/* CF9A74 80241F04 AFBF0014 */ sw $ra, 0x14($sp) -/* CF9A78 80241F08 8E02000C */ lw $v0, 0xc($s0) -/* CF9A7C 80241F0C 0C0B1EAF */ jal get_variable -/* CF9A80 80241F10 8C450000 */ lw $a1, ($v0) -/* CF9A84 80241F14 00021140 */ sll $v0, $v0, 5 -/* CF9A88 80241F18 AE000084 */ sw $zero, 0x84($s0) -/* CF9A8C 80241F1C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* CF9A90 80241F20 00220821 */ addu $at, $at, $v0 -/* CF9A94 80241F24 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* CF9A98 80241F28 30420040 */ andi $v0, $v0, 0x40 -/* CF9A9C 80241F2C 10400002 */ beqz $v0, .L80241F38 -/* CF9AA0 80241F30 24020001 */ addiu $v0, $zero, 1 -/* CF9AA4 80241F34 AE020084 */ sw $v0, 0x84($s0) -.L80241F38: -/* CF9AA8 80241F38 8FBF0014 */ lw $ra, 0x14($sp) -/* CF9AAC 80241F3C 8FB00010 */ lw $s0, 0x10($sp) -/* CF9AB0 80241F40 24020002 */ addiu $v0, $zero, 2 -/* CF9AB4 80241F44 03E00008 */ jr $ra -/* CF9AB8 80241F48 27BD0018 */ addiu $sp, $sp, 0x18 -/* CF9ABC 80241F4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s deleted file mode 100644 index 403bdbdf18..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240268_D37A68.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_D37A68 -/* D37A68 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D37A6C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* D37A70 80240270 0080802D */ daddu $s0, $a0, $zero -/* D37A74 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* D37A78 80240278 8E02000C */ lw $v0, 0xc($s0) -/* D37A7C 8024027C 0C0B1EAF */ jal get_variable -/* D37A80 80240280 8C450000 */ lw $a1, ($v0) -/* D37A84 80240284 00021140 */ sll $v0, $v0, 5 -/* D37A88 80240288 AE000084 */ sw $zero, 0x84($s0) -/* D37A8C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* D37A90 80240290 00220821 */ addu $at, $at, $v0 -/* D37A94 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* D37A98 80240298 30420040 */ andi $v0, $v0, 0x40 -/* D37A9C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* D37AA0 802402A0 24020001 */ addiu $v0, $zero, 1 -/* D37AA4 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* D37AA8 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* D37AAC 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* D37AB0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* D37AB4 802402B4 03E00008 */ jr $ra -/* D37AB8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s deleted file mode 100644 index de36c223b6..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240578_86CCB8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578_86CCB8 -/* 86CCB8 80240578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86CCBC 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* 86CCC0 80240580 0080802D */ daddu $s0, $a0, $zero -/* 86CCC4 80240584 AFBF0014 */ sw $ra, 0x14($sp) -/* 86CCC8 80240588 8E02000C */ lw $v0, 0xc($s0) -/* 86CCCC 8024058C 0C0B1EAF */ jal get_variable -/* 86CCD0 80240590 8C450000 */ lw $a1, ($v0) -/* 86CCD4 80240594 00021140 */ sll $v0, $v0, 5 -/* 86CCD8 80240598 AE000084 */ sw $zero, 0x84($s0) -/* 86CCDC 8024059C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 86CCE0 802405A0 00220821 */ addu $at, $at, $v0 -/* 86CCE4 802405A4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 86CCE8 802405A8 30420040 */ andi $v0, $v0, 0x40 -/* 86CCEC 802405AC 10400002 */ beqz $v0, .L802405B8 -/* 86CCF0 802405B0 24020001 */ addiu $v0, $zero, 1 -/* 86CCF4 802405B4 AE020084 */ sw $v0, 0x84($s0) -.L802405B8: -/* 86CCF8 802405B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 86CCFC 802405BC 8FB00010 */ lw $s0, 0x10($sp) -/* 86CD00 802405C0 24020002 */ addiu $v0, $zero, 2 -/* 86CD04 802405C4 03E00008 */ jr $ra -/* 86CD08 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 86CD0C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s deleted file mode 100644 index e9417584aa..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408E8_8756A8 -/* 8756A8 802408E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8756AC 802408EC AFB00010 */ sw $s0, 0x10($sp) -/* 8756B0 802408F0 0080802D */ daddu $s0, $a0, $zero -/* 8756B4 802408F4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8756B8 802408F8 8E02000C */ lw $v0, 0xc($s0) -/* 8756BC 802408FC 0C0B1EAF */ jal get_variable -/* 8756C0 80240900 8C450000 */ lw $a1, ($v0) -/* 8756C4 80240904 00021140 */ sll $v0, $v0, 5 -/* 8756C8 80240908 AE000084 */ sw $zero, 0x84($s0) -/* 8756CC 8024090C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 8756D0 80240910 00220821 */ addu $at, $at, $v0 -/* 8756D4 80240914 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 8756D8 80240918 30420040 */ andi $v0, $v0, 0x40 -/* 8756DC 8024091C 10400002 */ beqz $v0, .L80240928 -/* 8756E0 80240920 24020001 */ addiu $v0, $zero, 1 -/* 8756E4 80240924 AE020084 */ sw $v0, 0x84($s0) -.L80240928: -/* 8756E8 80240928 8FBF0014 */ lw $ra, 0x14($sp) -/* 8756EC 8024092C 8FB00010 */ lw $s0, 0x10($sp) -/* 8756F0 80240930 24020002 */ addiu $v0, $zero, 2 -/* 8756F4 80240934 03E00008 */ jr $ra -/* 8756F8 80240938 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index 1471fa65ca..08ae3e5fa4 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240000_C3D080); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240268_C3D2E8); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index d5b7c68242..df5f5c27fc 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240000_C4DEF0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240268_C4E158); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_dgb/dgb_18/C56EF0.c b/src/world/area_dgb/dgb_18/C56EF0.c index 7a74c96951..16efad6d8a 100644 --- a/src/world/area_dgb/dgb_18/C56EF0.c +++ b/src/world/area_dgb/dgb_18/C56EF0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", func_80240FB0_C56EF0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", begin_battle_C57158); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c index deb9883e50..79a7d216f8 100644 --- a/src/world/area_hos/hos_06/A3B4B0.c +++ b/src/world/area_hos/hos_06/A3B4B0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80241FD0_A3B4B0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80242238_A3B718); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_8024228C_A3B76C); diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c index 8139d4e67d..84e963a1d5 100644 --- a/src/world/area_isk/isk_09/9864E0.c +++ b/src/world/area_isk/isk_09/9864E0.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240000_9864E0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240268_986748); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_802402BC_98679C); diff --git a/src/world/area_iwa/iwa_03/918BB0.c b/src/world/area_iwa/iwa_03/918BB0.c index 88c66109a5..5a85b2942f 100644 --- a/src/world/area_iwa/iwa_03/918BB0.c +++ b/src/world/area_iwa/iwa_03/918BB0.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240000_918BB0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240268_918E18); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_802402BC_918E6C); diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c index eb4ec0bf20..26bb0f5f45 100644 --- a/src/world/area_jan/jan_04/B44AC0.c +++ b/src/world/area_jan/jan_04/B44AC0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240350_B44AC0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_802405B8_B44D28); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_kkj/kkj_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c index b8158372c1..c656a4150f 100644 --- a/src/world/area_kkj/kkj_17/AF1C60.c +++ b/src/world/area_kkj/kkj_17/AF1C60.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240000_AF1C60); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240268_AF1EC8); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_802402BC_AF1F1C); diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index b6fe6e8913..7ade274f5b 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240268_8D8738); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802402BC_8D878C); diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c index 7667f67e77..d311dc3f57 100644 --- a/src/world/area_kpa/kpa_15/A596A0.c +++ b/src/world/area_kpa/kpa_15/A596A0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240310_A596A0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240578_A59908); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71C10.c b/src/world/area_kzn/kzn_08/C71C10.c index 45d3806333..df32b34791 100644 --- a/src/world/area_kzn/kzn_08/C71C10.c +++ b/src/world/area_kzn/kzn_08/C71C10.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_80240790_C71C10); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_802409F8_C71E78); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_obk/obk_07/BCEBF0.c b/src/world/area_obk/obk_07/BCEBF0.c index fc12fd89b2..2b40c4a695 100644 --- a/src/world/area_obk/obk_07/BCEBF0.c +++ b/src/world/area_obk/obk_07/BCEBF0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240000_BCEBF0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240268_BCEE58); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c index f700b956d2..fa7b3fb67c 100644 --- a/src/world/area_omo/omo_06/DB8180.c +++ b/src/world/area_omo/omo_06/DB8180.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240870_DB8180); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240AD8_DB83E8); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c index 580b5ccca3..2c926ed605 100644 --- a/src/world/area_omo/omo_09/DCD3F0.c +++ b/src/world/area_omo/omo_09/DCD3F0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240720_DCD3F0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240988_DCD658); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c index ed8e7fbb17..81b3f5db67 100644 --- a/src/world/area_omo/omo_13/DE36C0.c +++ b/src/world/area_omo/omo_13/DE36C0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241230_DE36C0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241498_DE3928); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index 5923069bbf..bf201d80df 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -32,4 +32,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80241188_D56D38); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index b29e0eb8e5..b5aa5bfc93 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -32,4 +32,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240F20_D62420); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80241188_D62688); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index 36a4a29249..9b32793842 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F50_D63C60); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_802411B8_D63EC8); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index 0869525b6c..1e1f1de106 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -32,4 +32,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240F20_D68C20); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80241188_D68E88); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index bcea4c8d5c..43aee5fc08 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F50_D7A940); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_802411B8_D7ABA8); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index f9804c79ff..b6851b8fee 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F50_D7C1F0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_802411B8_D7C458); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c index 66476e5833..ad243b6b9f 100644 --- a/src/world/area_pra/pra_35/D8FBA0.c +++ b/src/world/area_pra/pra_35/D8FBA0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242950_D8FBA0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242BB8_D8FE08); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 3da3677484..f7fc1e9651 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -84,4 +84,4 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241D44_CF98B4); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241EF8_CF9A68); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c index fee35719cc..0f9904054e 100644 --- a/src/world/area_sam/sam_10/D37800.c +++ b/src/world/area_sam/sam_10/D37800.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240000_D37800); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240268_D37A68); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_802402BC_D37ABC); diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c index 356fa762d9..ae8715539d 100644 --- a/src/world/area_tik/tik_02/86CA50.c +++ b/src/world/area_tik/tik_02/86CA50.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240310_86CA50); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240578_86CCB8); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index 3d5e6177df..afa714dfa2 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680_875440); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_802408E8_8756A8); +#include "world/common/CheckItemFlags40.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_8024093C_8756FC); diff --git a/src/world/common/CheckItemFlags40.inc.c b/src/world/common/CheckItemFlags40.inc.c new file mode 100644 index 0000000000..7c0bad9a33 --- /dev/null +++ b/src/world/common/CheckItemFlags40.inc.c @@ -0,0 +1,13 @@ +#include "common.h" + +static ApiStatus CheckItemFlags40(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 itemIndex = get_variable(script, *args++); + + script->varTable[0] = FALSE; + if (gItemTable[itemIndex].typeFlags & 0x40) { + script->varTable[0] = TRUE; + } + + return ApiStatus_DONE2; +}