From 8a95d84a82f594f10deb2fc5c271e4a161665968 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 25 Oct 2020 21:23:02 -0400 Subject: [PATCH] SyncStatusMenu and another --- .../flo_00/C9EE30/func_8024137C_C9F29C.s | 12 --------- .../kmr_02/8B0070/func_8024293C_8B29AC.s | 12 --------- .../trd_00/999F80/func_80240578_99A1E8.s | 27 ------------------- .../trd_00/99A240/func_8024060C_99A27C.s | 13 --------- src/world/area_flo/flo_00/C9EE30.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_trd/trd_00/999F80.c | 11 +++++++- src/world/area_trd/trd_00/99A240.c | 2 +- src/world/common/SyncStatusMenu.inc.c | 6 +++++ 9 files changed, 19 insertions(+), 68 deletions(-) delete mode 100644 asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024137C_C9F29C.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C_8B29AC.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240578_99A1E8.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_00/99A240/func_8024060C_99A27C.s create mode 100644 src/world/common/SyncStatusMenu.inc.c diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024137C_C9F29C.s b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024137C_C9F29C.s deleted file mode 100644 index 1c169d7a02..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_8024137C_C9F29C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024137C_C9F29C -/* C9F29C 8024137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9F2A0 80241380 AFBF0010 */ sw $ra, 0x10($sp) -/* C9F2A4 80241384 0C03A6DB */ jal sync_status_menu -/* C9F2A8 80241388 00000000 */ nop -/* C9F2AC 8024138C 8FBF0010 */ lw $ra, 0x10($sp) -/* C9F2B0 80241390 24020002 */ addiu $v0, $zero, 2 -/* C9F2B4 80241394 03E00008 */ jr $ra -/* C9F2B8 80241398 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C_8B29AC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C_8B29AC.s deleted file mode 100644 index 3978689a5f..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C_8B29AC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024293C_8B29AC -/* 8B29AC 8024293C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B29B0 80242940 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B29B4 80242944 0C03A6DB */ jal sync_status_menu -/* 8B29B8 80242948 00000000 */ nop -/* 8B29BC 8024294C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B29C0 80242950 24020002 */ addiu $v0, $zero, 2 -/* 8B29C4 80242954 03E00008 */ jr $ra -/* 8B29C8 80242958 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240578_99A1E8.s b/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240578_99A1E8.s deleted file mode 100644 index a5bf4221ed..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240578_99A1E8.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_99A1E8 -/* 99A1E8 80240578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99A1EC 8024057C AFB00010 */ sw $s0, 0x10($sp) -/* 99A1F0 80240580 0080802D */ daddu $s0, $a0, $zero -/* 99A1F4 80240584 AFBF0014 */ sw $ra, 0x14($sp) -/* 99A1F8 80240588 8E02000C */ lw $v0, 0xc($s0) -/* 99A1FC 8024058C 0C0B1EAF */ jal get_variable -/* 99A200 80240590 8C450000 */ lw $a1, ($v0) -/* 99A204 80240594 00021140 */ sll $v0, $v0, 5 -/* 99A208 80240598 AE000084 */ sw $zero, 0x84($s0) -/* 99A20C 8024059C 3C018008 */ lui $at, 0x8008 -/* 99A210 802405A0 00220821 */ addu $at, $at, $v0 -/* 99A214 802405A4 942278F8 */ lhu $v0, 0x78f8($at) -/* 99A218 802405A8 30420040 */ andi $v0, $v0, 0x40 -/* 99A21C 802405AC 10400002 */ beqz $v0, .L802405B8 -/* 99A220 802405B0 24020001 */ addiu $v0, $zero, 1 -/* 99A224 802405B4 AE020084 */ sw $v0, 0x84($s0) -.L802405B8: -/* 99A228 802405B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 99A22C 802405BC 8FB00010 */ lw $s0, 0x10($sp) -/* 99A230 802405C0 24020002 */ addiu $v0, $zero, 2 -/* 99A234 802405C4 03E00008 */ jr $ra -/* 99A238 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 99A23C 802405CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_00/99A240/func_8024060C_99A27C.s b/asm/nonmatchings/world/area_trd/trd_00/99A240/func_8024060C_99A27C.s deleted file mode 100644 index 54032f4e15..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_00/99A240/func_8024060C_99A27C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024060C_99A27C -/* 99A27C 8024060C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99A280 80240610 AFBF0010 */ sw $ra, 0x10($sp) -/* 99A284 80240614 0C03A6DB */ jal sync_status_menu -/* 99A288 80240618 00000000 */ nop -/* 99A28C 8024061C 8FBF0010 */ lw $ra, 0x10($sp) -/* 99A290 80240620 24020002 */ addiu $v0, $zero, 2 -/* 99A294 80240624 03E00008 */ jr $ra -/* 99A298 80240628 27BD0018 */ addiu $sp, $sp, 0x18 -/* 99A29C 8024062C 00000000 */ nop diff --git a/src/world/area_flo/flo_00/C9EE30.c b/src/world/area_flo/flo_00/C9EE30.c index 240f0b096a..45f3636178 100644 --- a/src/world/area_flo/flo_00/C9EE30.c +++ b/src/world/area_flo/flo_00/C9EE30.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_802410B4_C9EFD4); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_802411EC_C9F10C); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_8024137C_C9F29C); +#include "world/common/SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_8024139C_C9F2BC); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 4d6e48cabc..9d942f4147 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -130,7 +130,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024280C_8B287C); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242860_8B28D0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024293C_8B29AC); +#include "world/common/SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024295C_8B29CC); diff --git a/src/world/area_trd/trd_00/999F80.c b/src/world/area_trd/trd_00/999F80.c index fb778088de..ae394c4661 100644 --- a/src/world/area_trd/trd_00/999F80.c +++ b/src/world/area_trd/trd_00/999F80.c @@ -6,4 +6,13 @@ INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240310_999F80); #include "world/common/SomeItemEntityFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240578_99A1E8); +static 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; +} diff --git a/src/world/area_trd/trd_00/99A240.c b/src/world/area_trd/trd_00/99A240.c index 43b397440d..8c56eab5d2 100644 --- a/src/world/area_trd/trd_00/99A240.c +++ b/src/world/area_trd/trd_00/99A240.c @@ -10,4 +10,4 @@ static ApiStatus PostChapter1StatUpdate(ScriptInstance* script, s32 isInitialCal return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_trd/trd_00/99A240", func_8024060C_99A27C); +#include "world/common/SyncStatusMenu.inc.c" diff --git a/src/world/common/SyncStatusMenu.inc.c b/src/world/common/SyncStatusMenu.inc.c new file mode 100644 index 0000000000..81a2257d75 --- /dev/null +++ b/src/world/common/SyncStatusMenu.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus SyncStatusMenu(ScriptInstance* script, s32 isInitialCall) { + sync_status_menu(); + return ApiStatus_DONE2; +}