From 2ea328286b033c24496ab610f25bbcb75cd32e87 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 21 Oct 2020 22:27:59 -0400 Subject: [PATCH] Set8009A650_40 --- .../dgb_04/C36530/func_802423D0_C38900.s | 11 --- .../flo_08/CAED40/func_80240000_CAED40.s | 11 --- .../flo_16/CD1F10/func_802400E0_CD1F10.s | 11 --- .../isk_10/988B60/func_80240000_988B60.s | 11 --- .../iwa_10/91E6D0/func_802402F0_91E860.s | 11 --- .../jan_08/B5E910/func_80240660_B5E910.s | 11 --- .../kzn_04/C68440/func_80240310_C68440.s | 11 --- .../kzn_09/C76CE0/func_80240000_C76CE0.s | 11 --- .../omo_11/DDCFC0/func_80240790_DDCFC0.s | 11 --- .../sam_08/D2FC80/func_80240000_D2FC80.s | 11 --- .../sbk_32/944AA0/func_80240040_944AA0.s | 73 ------------------- .../sbk_44/94D5E0/func_80240040_94D5E0.s | 73 ------------------- .../sbk_46/94E9E0/func_80240040_94E9E0.s | 73 ------------------- .../sbk_51/9509B0/func_80240040_9509B0.s | 73 ------------------- .../sbk_56/953FC0/func_80240080_954040.s | 11 --- .../tik_07/879BE0/func_802402E0_879EC0.s | 11 --- .../tik_10/8866D0/func_80240680_886A40.s | 11 --- .../tik_12/8891C0/func_80240C1C_8897EC.s | 11 --- .../tik_17/892A50/func_80240030_892A50.s | 11 --- .../tik_19/897BD0/func_802405F0_897BD0.s | 11 --- src/world/area_dgb/dgb_04/C36530.c | 2 +- src/world/area_flo/flo_08/CAED40.c | 2 +- src/world/area_flo/flo_16/CD1F10.c | 2 +- src/world/area_isk/isk_10/988B60.c | 2 +- src/world/area_iwa/iwa_10/91E6D0.c | 2 +- src/world/area_jan/jan_08/B5E910.c | 2 +- src/world/area_kzn/kzn_04/C68440.c | 2 +- src/world/area_kzn/kzn_09/C76CE0.c | 2 +- src/world/area_omo/omo_11/DDCFC0.c | 2 +- src/world/area_sam/sam_08/D2FC80.c | 2 +- src/world/area_sbk/sbk_32/944AA0.c | 4 +- src/world/area_sbk/sbk_44/94D5E0.c | 4 +- src/world/area_sbk/sbk_46/94E9E0.c | 4 +- src/world/area_sbk/sbk_51/9509B0.c | 4 +- src/world/area_sbk/sbk_56/953FC0.c | 2 +- src/world/area_tik/tik_07/879BE0.c | 2 +- src/world/area_tik/tik_10/8866D0.c | 2 +- src/world/area_tik/tik_12/8891C0.c | 2 +- src/world/area_tik/tik_17/892A50.c | 2 +- src/world/area_tik/tik_19/897BD0.c | 2 +- src/world/common/Set8009A650_40.inc.c | 6 ++ 41 files changed, 26 insertions(+), 496 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423D0_C38900.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240000_CAED40.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802400E0_CD1F10.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240000_988B60.s delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802402F0_91E860.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240660_B5E910.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240310_C68440.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240000_C76CE0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240790_DDCFC0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240000_D2FC80.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_32/944AA0/func_80240040_944AA0.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_44/94D5E0/func_80240040_94D5E0.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_46/94E9E0/func_80240040_94E9E0.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_51/9509B0/func_80240040_9509B0.s delete mode 100644 asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240080_954040.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402E0_879EC0.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240680_886A40.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C1C_8897EC.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240030_892A50.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802405F0_897BD0.s create mode 100644 src/world/common/Set8009A650_40.inc.c diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423D0_C38900.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423D0_C38900.s deleted file mode 100644 index a3b4400de2..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423D0_C38900.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423D0_C38900 -/* C38900 802423D0 3C03800A */ lui $v1, %hi(D_8009A650) -/* C38904 802423D4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* C38908 802423D8 8C620000 */ lw $v0, ($v1) -/* C3890C 802423DC 34420040 */ ori $v0, $v0, 0x40 -/* C38910 802423E0 AC620000 */ sw $v0, ($v1) -/* C38914 802423E4 03E00008 */ jr $ra -/* C38918 802423E8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240000_CAED40.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240000_CAED40.s deleted file mode 100644 index f1b24eb292..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240000_CAED40.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_CAED40 -/* CAED40 80240000 3C03800A */ lui $v1, %hi(D_8009A650) -/* CAED44 80240004 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* CAED48 80240008 8C620000 */ lw $v0, ($v1) -/* CAED4C 8024000C 34420040 */ ori $v0, $v0, 0x40 -/* CAED50 80240010 AC620000 */ sw $v0, ($v1) -/* CAED54 80240014 03E00008 */ jr $ra -/* CAED58 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802400E0_CD1F10.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802400E0_CD1F10.s deleted file mode 100644 index c7b0d6ded7..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802400E0_CD1F10.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E0_CD1F10 -/* CD1F10 802400E0 3C03800A */ lui $v1, %hi(D_8009A650) -/* CD1F14 802400E4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* CD1F18 802400E8 8C620000 */ lw $v0, ($v1) -/* CD1F1C 802400EC 34420040 */ ori $v0, $v0, 0x40 -/* CD1F20 802400F0 AC620000 */ sw $v0, ($v1) -/* CD1F24 802400F4 03E00008 */ jr $ra -/* CD1F28 802400F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240000_988B60.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240000_988B60.s deleted file mode 100644 index 5171c4fb00..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240000_988B60.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_988B60 -/* 988B60 80240000 3C03800A */ lui $v1, %hi(D_8009A650) -/* 988B64 80240004 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 988B68 80240008 8C620000 */ lw $v0, ($v1) -/* 988B6C 8024000C 34420040 */ ori $v0, $v0, 0x40 -/* 988B70 80240010 AC620000 */ sw $v0, ($v1) -/* 988B74 80240014 03E00008 */ jr $ra -/* 988B78 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802402F0_91E860.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802402F0_91E860.s deleted file mode 100644 index 4136538a5e..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802402F0_91E860.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0_91E860 -/* 91E860 802402F0 3C03800A */ lui $v1, %hi(D_8009A650) -/* 91E864 802402F4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 91E868 802402F8 8C620000 */ lw $v0, ($v1) -/* 91E86C 802402FC 34420040 */ ori $v0, $v0, 0x40 -/* 91E870 80240300 AC620000 */ sw $v0, ($v1) -/* 91E874 80240304 03E00008 */ jr $ra -/* 91E878 80240308 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240660_B5E910.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240660_B5E910.s deleted file mode 100644 index 28d52fb115..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240660_B5E910.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240660_B5E910 -/* B5E910 80240660 3C03800A */ lui $v1, %hi(D_8009A650) -/* B5E914 80240664 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* B5E918 80240668 8C620000 */ lw $v0, ($v1) -/* B5E91C 8024066C 34420040 */ ori $v0, $v0, 0x40 -/* B5E920 80240670 AC620000 */ sw $v0, ($v1) -/* B5E924 80240674 03E00008 */ jr $ra -/* B5E928 80240678 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240310_C68440.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240310_C68440.s deleted file mode 100644 index 32a3b2ea67..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240310_C68440.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310_C68440 -/* C68440 80240310 3C03800A */ lui $v1, %hi(D_8009A650) -/* C68444 80240314 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* C68448 80240318 8C620000 */ lw $v0, ($v1) -/* C6844C 8024031C 34420040 */ ori $v0, $v0, 0x40 -/* C68450 80240320 AC620000 */ sw $v0, ($v1) -/* C68454 80240324 03E00008 */ jr $ra -/* C68458 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240000_C76CE0.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240000_C76CE0.s deleted file mode 100644 index 9ffa5e1db7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240000_C76CE0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C76CE0 -/* C76CE0 80240000 3C03800A */ lui $v1, %hi(D_8009A650) -/* C76CE4 80240004 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* C76CE8 80240008 8C620000 */ lw $v0, ($v1) -/* C76CEC 8024000C 34420040 */ ori $v0, $v0, 0x40 -/* C76CF0 80240010 AC620000 */ sw $v0, ($v1) -/* C76CF4 80240014 03E00008 */ jr $ra -/* C76CF8 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240790_DDCFC0.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240790_DDCFC0.s deleted file mode 100644 index 0e94d02b2d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240790_DDCFC0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240790_DDCFC0 -/* DDCFC0 80240790 3C03800A */ lui $v1, %hi(D_8009A650) -/* DDCFC4 80240794 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* DDCFC8 80240798 8C620000 */ lw $v0, ($v1) -/* DDCFCC 8024079C 34420040 */ ori $v0, $v0, 0x40 -/* DDCFD0 802407A0 AC620000 */ sw $v0, ($v1) -/* DDCFD4 802407A4 03E00008 */ jr $ra -/* DDCFD8 802407A8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240000_D2FC80.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240000_D2FC80.s deleted file mode 100644 index a614bce540..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240000_D2FC80.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D2FC80 -/* D2FC80 80240000 3C03800A */ lui $v1, %hi(D_8009A650) -/* D2FC84 80240004 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* D2FC88 80240008 8C620000 */ lw $v0, ($v1) -/* D2FC8C 8024000C 34420040 */ ori $v0, $v0, 0x40 -/* D2FC90 80240010 AC620000 */ sw $v0, ($v1) -/* D2FC94 80240014 03E00008 */ jr $ra -/* D2FC98 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sbk/sbk_32/944AA0/func_80240040_944AA0.s b/asm/nonmatchings/world/area_sbk/sbk_32/944AA0/func_80240040_944AA0.s deleted file mode 100644 index 3e7d6e49eb..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_32/944AA0/func_80240040_944AA0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_944AA0 -/* 944AA0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 944AA4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 944AA8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 944AAC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 944AB0 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 944AB4 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 944AB8 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 944ABC 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 944AC0 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 944AC4 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 944AC8 80240068 0260202D */ daddu $a0, $s3, $zero -/* 944ACC 8024006C 8E050000 */ lw $a1, ($s0) -/* 944AD0 80240070 0C0B1EAF */ jal get_variable -/* 944AD4 80240074 26100004 */ addiu $s0, $s0, 4 -/* 944AD8 80240078 8E050000 */ lw $a1, ($s0) -/* 944ADC 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 944AE0 80240080 0260202D */ daddu $a0, $s3, $zero -/* 944AE4 80240084 0C0B1EAF */ jal get_variable -/* 944AE8 80240088 0040882D */ daddu $s1, $v0, $zero -/* 944AEC 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 944AF0 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 944AF4 80240094 8E120000 */ lw $s2, ($s0) -/* 944AF8 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 944AFC 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 944B00 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 944B04 802400A4 08090030 */ j .L802400C0 -/* 944B08 802400A8 00000000 */ nop -.L802400AC: -/* 944B0C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 944B10 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 944B14 802400B4 14400005 */ bnez $v0, .L802400CC -/* 944B18 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 944B1C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 944B20 802400C0 0C00EABB */ jal get_npc_unsafe -/* 944B24 802400C4 00000000 */ nop -/* 944B28 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 944B2C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 944B30 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 944B34 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 944B38 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 944B3C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 944B40 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 944B44 802400E4 0C0B1EAF */ jal get_variable -/* 944B48 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 944B4C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 944B50 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 944B54 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 944B58 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 944B5C 802400FC 44810000 */ mtc1 $at, $f0 -/* 944B60 80240100 00000000 */ nop -/* 944B64 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 944B68 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 944B6C 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 944B70 80240110 44061000 */ mfc1 $a2, $f2 -/* 944B74 80240114 0C04D083 */ jal set_item_entity_position -/* 944B78 80240118 0280202D */ daddu $a0, $s4, $zero -/* 944B7C 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 944B80 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 944B84 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 944B88 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 944B8C 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 944B90 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 944B94 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 944B98 80240138 03E00008 */ jr $ra -/* 944B9C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_44/94D5E0/func_80240040_94D5E0.s b/asm/nonmatchings/world/area_sbk/sbk_44/94D5E0/func_80240040_94D5E0.s deleted file mode 100644 index bbaaaeb5f4..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_44/94D5E0/func_80240040_94D5E0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_94D5E0 -/* 94D5E0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 94D5E4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 94D5E8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 94D5EC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 94D5F0 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 94D5F4 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 94D5F8 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 94D5FC 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 94D600 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 94D604 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 94D608 80240068 0260202D */ daddu $a0, $s3, $zero -/* 94D60C 8024006C 8E050000 */ lw $a1, ($s0) -/* 94D610 80240070 0C0B1EAF */ jal get_variable -/* 94D614 80240074 26100004 */ addiu $s0, $s0, 4 -/* 94D618 80240078 8E050000 */ lw $a1, ($s0) -/* 94D61C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 94D620 80240080 0260202D */ daddu $a0, $s3, $zero -/* 94D624 80240084 0C0B1EAF */ jal get_variable -/* 94D628 80240088 0040882D */ daddu $s1, $v0, $zero -/* 94D62C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 94D630 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 94D634 80240094 8E120000 */ lw $s2, ($s0) -/* 94D638 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 94D63C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 94D640 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 94D644 802400A4 08090030 */ j .L802400C0 -/* 94D648 802400A8 00000000 */ nop -.L802400AC: -/* 94D64C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 94D650 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 94D654 802400B4 14400005 */ bnez $v0, .L802400CC -/* 94D658 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 94D65C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 94D660 802400C0 0C00EABB */ jal get_npc_unsafe -/* 94D664 802400C4 00000000 */ nop -/* 94D668 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 94D66C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 94D670 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 94D674 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 94D678 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 94D67C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 94D680 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 94D684 802400E4 0C0B1EAF */ jal get_variable -/* 94D688 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 94D68C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 94D690 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 94D694 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 94D698 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 94D69C 802400FC 44810000 */ mtc1 $at, $f0 -/* 94D6A0 80240100 00000000 */ nop -/* 94D6A4 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 94D6A8 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 94D6AC 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 94D6B0 80240110 44061000 */ mfc1 $a2, $f2 -/* 94D6B4 80240114 0C04D083 */ jal set_item_entity_position -/* 94D6B8 80240118 0280202D */ daddu $a0, $s4, $zero -/* 94D6BC 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 94D6C0 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 94D6C4 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 94D6C8 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 94D6CC 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 94D6D0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 94D6D4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 94D6D8 80240138 03E00008 */ jr $ra -/* 94D6DC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_46/94E9E0/func_80240040_94E9E0.s b/asm/nonmatchings/world/area_sbk/sbk_46/94E9E0/func_80240040_94E9E0.s deleted file mode 100644 index 5a3b9839cd..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_46/94E9E0/func_80240040_94E9E0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_94E9E0 -/* 94E9E0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 94E9E4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 94E9E8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 94E9EC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 94E9F0 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 94E9F4 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 94E9F8 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 94E9FC 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 94EA00 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 94EA04 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 94EA08 80240068 0260202D */ daddu $a0, $s3, $zero -/* 94EA0C 8024006C 8E050000 */ lw $a1, ($s0) -/* 94EA10 80240070 0C0B1EAF */ jal get_variable -/* 94EA14 80240074 26100004 */ addiu $s0, $s0, 4 -/* 94EA18 80240078 8E050000 */ lw $a1, ($s0) -/* 94EA1C 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 94EA20 80240080 0260202D */ daddu $a0, $s3, $zero -/* 94EA24 80240084 0C0B1EAF */ jal get_variable -/* 94EA28 80240088 0040882D */ daddu $s1, $v0, $zero -/* 94EA2C 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 94EA30 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 94EA34 80240094 8E120000 */ lw $s2, ($s0) -/* 94EA38 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 94EA3C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 94EA40 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 94EA44 802400A4 08090030 */ j .L802400C0 -/* 94EA48 802400A8 00000000 */ nop -.L802400AC: -/* 94EA4C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 94EA50 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 94EA54 802400B4 14400005 */ bnez $v0, .L802400CC -/* 94EA58 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 94EA5C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 94EA60 802400C0 0C00EABB */ jal get_npc_unsafe -/* 94EA64 802400C4 00000000 */ nop -/* 94EA68 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 94EA6C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 94EA70 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 94EA74 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 94EA78 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 94EA7C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 94EA80 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 94EA84 802400E4 0C0B1EAF */ jal get_variable -/* 94EA88 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 94EA8C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 94EA90 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 94EA94 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 94EA98 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 94EA9C 802400FC 44810000 */ mtc1 $at, $f0 -/* 94EAA0 80240100 00000000 */ nop -/* 94EAA4 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 94EAA8 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 94EAAC 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 94EAB0 80240110 44061000 */ mfc1 $a2, $f2 -/* 94EAB4 80240114 0C04D083 */ jal set_item_entity_position -/* 94EAB8 80240118 0280202D */ daddu $a0, $s4, $zero -/* 94EABC 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 94EAC0 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 94EAC4 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 94EAC8 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 94EACC 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 94EAD0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 94EAD4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 94EAD8 80240138 03E00008 */ jr $ra -/* 94EADC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_51/9509B0/func_80240040_9509B0.s b/asm/nonmatchings/world/area_sbk/sbk_51/9509B0/func_80240040_9509B0.s deleted file mode 100644 index 17e2d1ac91..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_51/9509B0/func_80240040_9509B0.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_9509B0 -/* 9509B0 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9509B4 80240044 AFB3001C */ sw $s3, 0x1c($sp) -/* 9509B8 80240048 0080982D */ daddu $s3, $a0, $zero -/* 9509BC 8024004C AFBF0024 */ sw $ra, 0x24($sp) -/* 9509C0 80240050 AFB40020 */ sw $s4, 0x20($sp) -/* 9509C4 80240054 AFB20018 */ sw $s2, 0x18($sp) -/* 9509C8 80240058 AFB10014 */ sw $s1, 0x14($sp) -/* 9509CC 8024005C AFB00010 */ sw $s0, 0x10($sp) -/* 9509D0 80240060 8E70000C */ lw $s0, 0xc($s3) -/* 9509D4 80240064 50A0001D */ beql $a1, $zero, .L802400DC -/* 9509D8 80240068 0260202D */ daddu $a0, $s3, $zero -/* 9509DC 8024006C 8E050000 */ lw $a1, ($s0) -/* 9509E0 80240070 0C0B1EAF */ jal get_variable -/* 9509E4 80240074 26100004 */ addiu $s0, $s0, 4 -/* 9509E8 80240078 8E050000 */ lw $a1, ($s0) -/* 9509EC 8024007C 26100004 */ addiu $s0, $s0, 4 -/* 9509F0 80240080 0260202D */ daddu $a0, $s3, $zero -/* 9509F4 80240084 0C0B1EAF */ jal get_variable -/* 9509F8 80240088 0040882D */ daddu $s1, $v0, $zero -/* 9509FC 8024008C 0040A02D */ daddu $s4, $v0, $zero -/* 950A00 80240090 2402FFFF */ addiu $v0, $zero, -1 -/* 950A04 80240094 8E120000 */ lw $s2, ($s0) -/* 950A08 80240098 16220004 */ bne $s1, $v0, .L802400AC -/* 950A0C 8024009C 3C02EFE8 */ lui $v0, 0xefe8 -/* 950A10 802400A0 8E64014C */ lw $a0, 0x14c($s3) -/* 950A14 802400A4 08090030 */ j .L802400C0 -/* 950A18 802400A8 00000000 */ nop -.L802400AC: -/* 950A1C 802400AC 34422080 */ ori $v0, $v0, 0x2080 -/* 950A20 802400B0 0222102A */ slt $v0, $s1, $v0 -/* 950A24 802400B4 14400005 */ bnez $v0, .L802400CC -/* 950A28 802400B8 0220802D */ daddu $s0, $s1, $zero -/* 950A2C 802400BC 0220202D */ daddu $a0, $s1, $zero -.L802400C0: -/* 950A30 802400C0 0C00EABB */ jal get_npc_unsafe -/* 950A34 802400C4 00000000 */ nop -/* 950A38 802400C8 0040802D */ daddu $s0, $v0, $zero -.L802400CC: -/* 950A3C 802400CC AE700070 */ sw $s0, 0x70($s3) -/* 950A40 802400D0 AE740074 */ sw $s4, 0x74($s3) -/* 950A44 802400D4 AE720078 */ sw $s2, 0x78($s3) -/* 950A48 802400D8 0260202D */ daddu $a0, $s3, $zero -.L802400DC: -/* 950A4C 802400DC 8C900070 */ lw $s0, 0x70($a0) -/* 950A50 802400E0 8C850078 */ lw $a1, 0x78($a0) -/* 950A54 802400E4 0C0B1EAF */ jal get_variable -/* 950A58 802400E8 8C940074 */ lw $s4, 0x74($a0) -/* 950A5C 802400EC 1040000C */ beqz $v0, .L80240120 -/* 950A60 802400F0 24020002 */ addiu $v0, $zero, 2 -/* 950A64 802400F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* 950A68 802400F8 3C0141F0 */ lui $at, 0x41f0 -/* 950A6C 802400FC 44810000 */ mtc1 $at, $f0 -/* 950A70 80240100 00000000 */ nop -/* 950A74 80240104 46001080 */ add.s $f2, $f2, $f0 -/* 950A78 80240108 8E050038 */ lw $a1, 0x38($s0) -/* 950A7C 8024010C 8E070040 */ lw $a3, 0x40($s0) -/* 950A80 80240110 44061000 */ mfc1 $a2, $f2 -/* 950A84 80240114 0C04D083 */ jal set_item_entity_position -/* 950A88 80240118 0280202D */ daddu $a0, $s4, $zero -/* 950A8C 8024011C 0000102D */ daddu $v0, $zero, $zero -.L80240120: -/* 950A90 80240120 8FBF0024 */ lw $ra, 0x24($sp) -/* 950A94 80240124 8FB40020 */ lw $s4, 0x20($sp) -/* 950A98 80240128 8FB3001C */ lw $s3, 0x1c($sp) -/* 950A9C 8024012C 8FB20018 */ lw $s2, 0x18($sp) -/* 950AA0 80240130 8FB10014 */ lw $s1, 0x14($sp) -/* 950AA4 80240134 8FB00010 */ lw $s0, 0x10($sp) -/* 950AA8 80240138 03E00008 */ jr $ra -/* 950AAC 8024013C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240080_954040.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240080_954040.s deleted file mode 100644 index 33afa251a1..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240080_954040.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240080_954040 -/* 954040 80240080 3C03800A */ lui $v1, %hi(D_8009A650) -/* 954044 80240084 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 954048 80240088 8C620000 */ lw $v0, ($v1) -/* 95404C 8024008C 34420040 */ ori $v0, $v0, 0x40 -/* 954050 80240090 AC620000 */ sw $v0, ($v1) -/* 954054 80240094 03E00008 */ jr $ra -/* 954058 80240098 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402E0_879EC0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402E0_879EC0.s deleted file mode 100644 index 3d41df8c90..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402E0_879EC0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_879EC0 -/* 879EC0 802402E0 3C03800A */ lui $v1, %hi(D_8009A650) -/* 879EC4 802402E4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 879EC8 802402E8 8C620000 */ lw $v0, ($v1) -/* 879ECC 802402EC 34420040 */ ori $v0, $v0, 0x40 -/* 879ED0 802402F0 AC620000 */ sw $v0, ($v1) -/* 879ED4 802402F4 03E00008 */ jr $ra -/* 879ED8 802402F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240680_886A40.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240680_886A40.s deleted file mode 100644 index d31a7784bd..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240680_886A40.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_886A40 -/* 886A40 80240680 3C03800A */ lui $v1, %hi(D_8009A650) -/* 886A44 80240684 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 886A48 80240688 8C620000 */ lw $v0, ($v1) -/* 886A4C 8024068C 34420040 */ ori $v0, $v0, 0x40 -/* 886A50 80240690 AC620000 */ sw $v0, ($v1) -/* 886A54 80240694 03E00008 */ jr $ra -/* 886A58 80240698 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C1C_8897EC.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C1C_8897EC.s deleted file mode 100644 index 4976ff5f9e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C1C_8897EC.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C1C_8897EC -/* 8897EC 80240C1C 3C03800A */ lui $v1, %hi(D_8009A650) -/* 8897F0 80240C20 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 8897F4 80240C24 8C620000 */ lw $v0, ($v1) -/* 8897F8 80240C28 34420040 */ ori $v0, $v0, 0x40 -/* 8897FC 80240C2C AC620000 */ sw $v0, ($v1) -/* 889800 80240C30 03E00008 */ jr $ra -/* 889804 80240C34 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240030_892A50.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240030_892A50.s deleted file mode 100644 index c16d33736b..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240030_892A50.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_892A50 -/* 892A50 80240030 3C03800A */ lui $v1, %hi(D_8009A650) -/* 892A54 80240034 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 892A58 80240038 8C620000 */ lw $v0, ($v1) -/* 892A5C 8024003C 34420040 */ ori $v0, $v0, 0x40 -/* 892A60 80240040 AC620000 */ sw $v0, ($v1) -/* 892A64 80240044 03E00008 */ jr $ra -/* 892A68 80240048 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802405F0_897BD0.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802405F0_897BD0.s deleted file mode 100644 index e969a5f423..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802405F0_897BD0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0_897BD0 -/* 897BD0 802405F0 3C03800A */ lui $v1, %hi(D_8009A650) -/* 897BD4 802405F4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 897BD8 802405F8 8C620000 */ lw $v0, ($v1) -/* 897BDC 802405FC 34420040 */ ori $v0, $v0, 0x40 -/* 897BE0 80240600 AC620000 */ sw $v0, ($v1) -/* 897BE4 80240604 03E00008 */ jr $ra -/* 897BE8 80240608 24020002 */ addiu $v0, $zero, 2 diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 73669aa16b..a46fbd874a 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241E3C_C3836C); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242154_C38684); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802423D0_C38900); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802423EC_C3891C); diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c index 018b97fc89..2db00bd256 100644 --- a/src/world/area_flo/flo_08/CAED40.c +++ b/src/world/area_flo/flo_08/CAED40.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240000_CAED40); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_8024001C_CAED5C); diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index f6f75d65f5..8543113df2 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802400E0_CD1F10); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802400FC_CD1F2C); diff --git a/src/world/area_isk/isk_10/988B60.c b/src/world/area_isk/isk_10/988B60.c index 3720b759c8..2627003fdd 100644 --- a/src/world/area_isk/isk_10/988B60.c +++ b/src/world/area_isk/isk_10/988B60.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240000_988B60); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024001C_988B7C); diff --git a/src/world/area_iwa/iwa_10/91E6D0.c b/src/world/area_iwa/iwa_10/91E6D0.c index 4f5a3e32b4..8e4b90d277 100644 --- a/src/world/area_iwa/iwa_10/91E6D0.c +++ b/src/world/area_iwa/iwa_10/91E6D0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240160_91E6D0); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802402F0_91E860); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_8024030C_91E87C); diff --git a/src/world/area_jan/jan_08/B5E910.c b/src/world/area_jan/jan_08/B5E910.c index 2b73cdea52..4338315b64 100644 --- a/src/world/area_jan/jan_08/B5E910.c +++ b/src/world/area_jan/jan_08/B5E910.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240660_B5E910); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_8024067C_B5E92C); diff --git a/src/world/area_kzn/kzn_04/C68440.c b/src/world/area_kzn/kzn_04/C68440.c index ae4d979b7d..61eff96ef0 100644 --- a/src/world/area_kzn/kzn_04/C68440.c +++ b/src/world/area_kzn/kzn_04/C68440.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240310_C68440); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_8024032C_C6845C); diff --git a/src/world/area_kzn/kzn_09/C76CE0.c b/src/world/area_kzn/kzn_09/C76CE0.c index 06dfa03a35..3aacb5fd3e 100644 --- a/src/world/area_kzn/kzn_09/C76CE0.c +++ b/src/world/area_kzn/kzn_09/C76CE0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240000_C76CE0); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_8024001C_C76CFC); diff --git a/src/world/area_omo/omo_11/DDCFC0.c b/src/world/area_omo/omo_11/DDCFC0.c index 7def07cec9..fc97a2ce33 100644 --- a/src/world/area_omo/omo_11/DDCFC0.c +++ b/src/world/area_omo/omo_11/DDCFC0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240790_DDCFC0); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802407AC_DDCFDC); diff --git a/src/world/area_sam/sam_08/D2FC80.c b/src/world/area_sam/sam_08/D2FC80.c index 5893ea3e34..d6b5311d10 100644 --- a/src/world/area_sam/sam_08/D2FC80.c +++ b/src/world/area_sam/sam_08/D2FC80.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240000_D2FC80); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_8024001C_D2FC9C); diff --git a/src/world/area_sbk/sbk_32/944AA0.c b/src/world/area_sbk/sbk_32/944AA0.c index 9015629261..98d13ccfd6 100644 --- a/src/world/area_sbk/sbk_32/944AA0.c +++ b/src/world/area_sbk/sbk_32/944AA0.c @@ -1,5 +1,3 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_32/944AA0", func_80240040_944AA0); +#include "world/common/Bandit_DropCoin.inc.c" #include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_44/94D5E0.c b/src/world/area_sbk/sbk_44/94D5E0.c index 6190cc2076..98d13ccfd6 100644 --- a/src/world/area_sbk/sbk_44/94D5E0.c +++ b/src/world/area_sbk/sbk_44/94D5E0.c @@ -1,5 +1,3 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_44/94D5E0", func_80240040_94D5E0); +#include "world/common/Bandit_DropCoin.inc.c" #include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_46/94E9E0.c b/src/world/area_sbk/sbk_46/94E9E0.c index efd8c4e1b0..98d13ccfd6 100644 --- a/src/world/area_sbk/sbk_46/94E9E0.c +++ b/src/world/area_sbk/sbk_46/94E9E0.c @@ -1,5 +1,3 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_46/94E9E0", func_80240040_94E9E0); +#include "world/common/Bandit_DropCoin.inc.c" #include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_51/9509B0.c b/src/world/area_sbk/sbk_51/9509B0.c index 9c4aa717af..98d13ccfd6 100644 --- a/src/world/area_sbk/sbk_51/9509B0.c +++ b/src/world/area_sbk/sbk_51/9509B0.c @@ -1,5 +1,3 @@ -#include "common.h" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_51/9509B0", func_80240040_9509B0); +#include "world/common/Bandit_DropCoin.inc.c" #include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_56/953FC0.c b/src/world/area_sbk/sbk_56/953FC0.c index b23a705c98..9190770678 100644 --- a/src/world/area_sbk/sbk_56/953FC0.c +++ b/src/world/area_sbk/sbk_56/953FC0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240038_953FF8); INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024005C_95401C); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240080_954040); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024009C_95405C); diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index c1e2481eaa..46f9f2e1f3 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802401D0_879DB0); INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_8024023C_879E1C); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802402E0_879EC0); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802402FC_879EDC); diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c index 8c970f0f44..b2f34eb196 100644 --- a/src/world/area_tik/tik_10/8866D0.c +++ b/src/world/area_tik/tik_10/8866D0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240310_8866D0); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240680_886A40); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_8024069C_886A5C); diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index 743c2e5257..3946736bbc 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240A78_889648); INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240BC8_889798); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C1C_8897EC); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C38_889808); diff --git a/src/world/area_tik/tik_17/892A50.c b/src/world/area_tik/tik_17/892A50.c index b39058a8ee..415251c62c 100644 --- a/src/world/area_tik/tik_17/892A50.c +++ b/src/world/area_tik/tik_17/892A50.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240030_892A50); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024004C_892A6C); diff --git a/src/world/area_tik/tik_19/897BD0.c b/src/world/area_tik/tik_19/897BD0.c index d2e77956d8..497cdb8946 100644 --- a/src/world/area_tik/tik_19/897BD0.c +++ b/src/world/area_tik/tik_19/897BD0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802405F0_897BD0); +#include "world/common/Set8009A650_40.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_8024060C_897BEC); diff --git a/src/world/common/Set8009A650_40.inc.c b/src/world/common/Set8009A650_40.inc.c new file mode 100644 index 0000000000..8d3dbe7aa2 --- /dev/null +++ b/src/world/common/Set8009A650_40.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus Set8009A650_40(ScriptInstance* script, s32 isInitialCall) { + D_8009A650[0] |= 0x40; + return ApiStatus_DONE2; +}