diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240268_AFDDA8.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240268_AFDDA8.s deleted file mode 100644 index 96268db26b..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240268_AFDDA8.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_AFDDA8 -/* AFDDA8 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDDAC 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* AFDDB0 80240270 0080802D */ daddu $s0, $a0, $zero -/* AFDDB4 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* AFDDB8 80240278 8E02000C */ lw $v0, 0xc($s0) -/* AFDDBC 8024027C 0C0B1EAF */ jal get_variable -/* AFDDC0 80240280 8C450000 */ lw $a1, ($v0) -/* AFDDC4 80240284 00021140 */ sll $v0, $v0, 5 -/* AFDDC8 80240288 AE000084 */ sw $zero, 0x84($s0) -/* AFDDCC 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* AFDDD0 80240290 00220821 */ addu $at, $at, $v0 -/* AFDDD4 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* AFDDD8 80240298 30420040 */ andi $v0, $v0, 0x40 -/* AFDDDC 8024029C 10400002 */ beqz $v0, .L802402A8 -/* AFDDE0 802402A0 24020001 */ addiu $v0, $zero, 1 -/* AFDDE4 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* AFDDE8 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* AFDDEC 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* AFDDF0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* AFDDF4 802402B4 03E00008 */ jr $ra -/* AFDDF8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* AFDDFC 802402BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_802405E8_A57A98.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_802405E8_A57A98.s deleted file mode 100644 index 8582105a4d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_802405E8_A57A98.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E8_A57A98 -/* A57A98 802405E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A57A9C 802405EC AFB00010 */ sw $s0, 0x10($sp) -/* A57AA0 802405F0 0080802D */ daddu $s0, $a0, $zero -/* A57AA4 802405F4 AFBF0014 */ sw $ra, 0x14($sp) -/* A57AA8 802405F8 8E02000C */ lw $v0, 0xc($s0) -/* A57AAC 802405FC 0C0B1EAF */ jal get_variable -/* A57AB0 80240600 8C450000 */ lw $a1, ($v0) -/* A57AB4 80240604 00021140 */ sll $v0, $v0, 5 -/* A57AB8 80240608 AE000084 */ sw $zero, 0x84($s0) -/* A57ABC 8024060C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* A57AC0 80240610 00220821 */ addu $at, $at, $v0 -/* A57AC4 80240614 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* A57AC8 80240618 30420040 */ andi $v0, $v0, 0x40 -/* A57ACC 8024061C 10400002 */ beqz $v0, .L80240628 -/* A57AD0 80240620 24020001 */ addiu $v0, $zero, 1 -/* A57AD4 80240624 AE020084 */ sw $v0, 0x84($s0) -.L80240628: -/* A57AD8 80240628 8FBF0014 */ lw $ra, 0x14($sp) -/* A57ADC 8024062C 8FB00010 */ lw $s0, 0x10($sp) -/* A57AE0 80240630 24020002 */ addiu $v0, $zero, 2 -/* A57AE4 80240634 03E00008 */ jr $ra -/* A57AE8 80240638 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240268_DAD668.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240268_DAD668.s deleted file mode 100644 index 13f7c32e66..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240268_DAD668.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_DAD668 -/* DAD668 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DAD66C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* DAD670 80240270 0080802D */ daddu $s0, $a0, $zero -/* DAD674 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* DAD678 80240278 8E02000C */ lw $v0, 0xc($s0) -/* DAD67C 8024027C 0C0B1EAF */ jal get_variable -/* DAD680 80240280 8C450000 */ lw $a1, ($v0) -/* DAD684 80240284 00021140 */ sll $v0, $v0, 5 -/* DAD688 80240288 AE000084 */ sw $zero, 0x84($s0) -/* DAD68C 8024028C 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* DAD690 80240290 00220821 */ addu $at, $at, $v0 -/* DAD694 80240294 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* DAD698 80240298 30420040 */ andi $v0, $v0, 0x40 -/* DAD69C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* DAD6A0 802402A0 24020001 */ addiu $v0, $zero, 1 -/* DAD6A4 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* DAD6A8 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* DAD6AC 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* DAD6B0 802402B0 24020002 */ addiu $v0, $zero, 2 -/* DAD6B4 802402B4 03E00008 */ jr $ra -/* DAD6B8 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243188_DC0438.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243188_DC0438.s deleted file mode 100644 index 42ec6f4440..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243188_DC0438.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243188_DC0438 -/* DC0438 80243188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DC043C 8024318C AFB00010 */ sw $s0, 0x10($sp) -/* DC0440 80243190 0080802D */ daddu $s0, $a0, $zero -/* DC0444 80243194 AFBF0014 */ sw $ra, 0x14($sp) -/* DC0448 80243198 8E02000C */ lw $v0, 0xc($s0) -/* DC044C 8024319C 0C0B1EAF */ jal get_variable -/* DC0450 802431A0 8C450000 */ lw $a1, ($v0) -/* DC0454 802431A4 00021140 */ sll $v0, $v0, 5 -/* DC0458 802431A8 AE000084 */ sw $zero, 0x84($s0) -/* DC045C 802431AC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* DC0460 802431B0 00220821 */ addu $at, $at, $v0 -/* DC0464 802431B4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* DC0468 802431B8 30420040 */ andi $v0, $v0, 0x40 -/* DC046C 802431BC 10400002 */ beqz $v0, .L802431C8 -/* DC0470 802431C0 24020001 */ addiu $v0, $zero, 1 -/* DC0474 802431C4 AE020084 */ sw $v0, 0x84($s0) -.L802431C8: -/* DC0478 802431C8 8FBF0014 */ lw $ra, 0x14($sp) -/* DC047C 802431CC 8FB00010 */ lw $s0, 0x10($sp) -/* DC0480 802431D0 24020002 */ addiu $v0, $zero, 2 -/* DC0484 802431D4 03E00008 */ jr $ra -/* DC0488 802431D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s deleted file mode 100644 index 64d72913b6..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BC8_889798 -/* 889798 80240BC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88979C 80240BCC AFB00010 */ sw $s0, 0x10($sp) -/* 8897A0 80240BD0 0080802D */ daddu $s0, $a0, $zero -/* 8897A4 80240BD4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8897A8 80240BD8 8E02000C */ lw $v0, 0xc($s0) -/* 8897AC 80240BDC 0C0B1EAF */ jal get_variable -/* 8897B0 80240BE0 8C450000 */ lw $a1, ($v0) -/* 8897B4 80240BE4 00021140 */ sll $v0, $v0, 5 -/* 8897B8 80240BE8 AE000084 */ sw $zero, 0x84($s0) -/* 8897BC 80240BEC 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 8897C0 80240BF0 00220821 */ addu $at, $at, $v0 -/* 8897C4 80240BF4 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 8897C8 80240BF8 30420040 */ andi $v0, $v0, 0x40 -/* 8897CC 80240BFC 10400002 */ beqz $v0, .L80240C08 -/* 8897D0 80240C00 24020001 */ addiu $v0, $zero, 1 -/* 8897D4 80240C04 AE020084 */ sw $v0, 0x84($s0) -.L80240C08: -/* 8897D8 80240C08 8FBF0014 */ lw $ra, 0x14($sp) -/* 8897DC 80240C0C 8FB00010 */ lw $s0, 0x10($sp) -/* 8897E0 80240C10 24020002 */ addiu $v0, $zero, 2 -/* 8897E4 80240C14 03E00008 */ jr $ra -/* 8897E8 80240C18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_kkj/kkj_20/AFDB40.c b/src/world/area_kkj/kkj_20/AFDB40.c index 2f097b7bc5..2e108f9795 100644 --- a/src/world/area_kkj/kkj_20/AFDB40.c +++ b/src/world/area_kkj/kkj_20/AFDB40.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240000_AFDB40); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240268_AFDDA8); +#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index f8d7e3f3c6..98dc749486 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240380_A57830); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_802405E8_A57A98); +#include "world/common/CheckItemFlags40.inc.c" #include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 4b88139136..9b0c4d9b90 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240268_DAD668); +#include "world/common/CheckItemFlags40.inc.c" #include "world/common/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index 81540d7fc0..b0f70af2c5 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243188_DC0438); +#include "world/common/CheckItemFlags40.inc.c" #include "world/common/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index f03919cbbc..f7a9adc3e3 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240960_889530); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240BC8_889798); +#include "world/common/CheckItemFlags40.inc.c" #include "world/common/Set8009A650_40.inc.c" diff --git a/src/world/area_trd/trd_00/999F80.c b/src/world/area_trd/trd_00/999F80.c index 8cdac08b6e..19386980cc 100644 --- a/src/world/area_trd/trd_00/999F80.c +++ b/src/world/area_trd/trd_00/999F80.c @@ -6,13 +6,4 @@ INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240310_999F80); #include "world/common/SomeItemEntityFunc.inc.c" -ApiStatus func_80240578_99A1E8(ScriptInstance* script, s32 isInitialCall) { - s32 itemIndex = get_variable(script, *script->ptrReadPos); - - script->varTable[0] = 0; - if (gItemTable[itemIndex].typeFlags & 0x40) { - script->varTable[0] = 1; - } - - return ApiStatus_DONE2; -} +#include "world/common/CheckItemFlags40.inc.c"