From 3a53233b1d1cd666ecd70dad121f5b6681ae9dbe Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 29 Oct 2020 23:37:25 -0400 Subject: [PATCH] Unk800E98C4SyncStatusMenu --- .../area_dro/dro_02/9694C0/func_802434A4_96C664.s | 14 -------------- .../area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s | 14 -------------- .../area_jan/jan_03/B34BD0/func_802414D0_B360A0.s | 14 -------------- .../area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s | 14 -------------- .../area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s | 14 -------------- .../area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s | 14 -------------- .../area_kpa/kpa_91/A86A50/func_80241548_A87F98.s | 14 -------------- .../area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s | 14 -------------- .../area_mac/mac_01/8017D0/func_802437CC_80404C.s | 14 -------------- .../area_mac/mac_01/8017D0/func_8024552C_805DAC.s | 13 ------------- .../area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s | 14 -------------- .../area_sam/sam_02/D05F60/func_80240850_D05F80.s | 14 -------------- .../area_sam/sam_06/D203E0/func_80241F70_D21E00.s | 14 -------------- src/world/area_dro/dro_02/9694C0.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_kkj/kkj_20/AFDE00.c | 2 +- src/world/area_kmr/kmr_02/8B30E0.c | 2 +- src/world/area_kmr/kmr_20/8ED0C0.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 7 +++++-- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_sam/sam_02/D05F60.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/common/Unk800E98C4SyncStatusMenu.inc.c | 7 +++++++ 26 files changed, 23 insertions(+), 194 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s create mode 100644 src/world/common/Unk800E98C4SyncStatusMenu.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s deleted file mode 100644 index 8c4bc6cba2..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802434A4_96C664 -/* 96C664 802434A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C668 802434A8 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C66C 802434AC 0C03A631 */ jal func_800E98C4 -/* 96C670 802434B0 00000000 */ nop -/* 96C674 802434B4 0C03A6DB */ jal sync_status_menu -/* 96C678 802434B8 00000000 */ nop -/* 96C67C 802434BC 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C680 802434C0 24020002 */ addiu $v0, $zero, 2 -/* 96C684 802434C4 03E00008 */ jr $ra -/* 96C688 802434C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s deleted file mode 100644 index 3db6a153dc..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421C8_A1D2C8 -/* A1D2C8 802421C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D2CC 802421CC AFBF0010 */ sw $ra, 0x10($sp) -/* A1D2D0 802421D0 0C03A631 */ jal func_800E98C4 -/* A1D2D4 802421D4 00000000 */ nop -/* A1D2D8 802421D8 0C03A6DB */ jal sync_status_menu -/* A1D2DC 802421DC 00000000 */ nop -/* A1D2E0 802421E0 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D2E4 802421E4 24020002 */ addiu $v0, $zero, 2 -/* A1D2E8 802421E8 03E00008 */ jr $ra -/* A1D2EC 802421EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s deleted file mode 100644 index bc22b1c1ed..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414D0_B360A0 -/* B360A0 802414D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B360A4 802414D4 AFBF0010 */ sw $ra, 0x10($sp) -/* B360A8 802414D8 0C03A631 */ jal func_800E98C4 -/* B360AC 802414DC 00000000 */ nop -/* B360B0 802414E0 0C03A6DB */ jal sync_status_menu -/* B360B4 802414E4 00000000 */ nop -/* B360B8 802414E8 8FBF0010 */ lw $ra, 0x10($sp) -/* B360BC 802414EC 24020002 */ addiu $v0, $zero, 2 -/* B360C0 802414F0 03E00008 */ jr $ra -/* B360C4 802414F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s deleted file mode 100644 index d12c22dc00..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_AFDE20 -/* AFDE20 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDE24 802402E4 AFBF0010 */ sw $ra, 0x10($sp) -/* AFDE28 802402E8 0C03A631 */ jal func_800E98C4 -/* AFDE2C 802402EC 00000000 */ nop -/* AFDE30 802402F0 0C03A6DB */ jal sync_status_menu -/* AFDE34 802402F4 00000000 */ nop -/* AFDE38 802402F8 8FBF0010 */ lw $ra, 0x10($sp) -/* AFDE3C 802402FC 24020002 */ addiu $v0, $zero, 2 -/* AFDE40 80240300 03E00008 */ jr $ra -/* AFDE44 80240304 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s deleted file mode 100644 index 148f155323..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243090_8B3100 -/* 8B3100 80243090 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3104 80243094 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B3108 80243098 0C03A631 */ jal func_800E98C4 -/* 8B310C 8024309C 00000000 */ nop -/* 8B3110 802430A0 0C03A6DB */ jal sync_status_menu -/* 8B3114 802430A4 00000000 */ nop -/* 8B3118 802430A8 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B311C 802430AC 24020002 */ addiu $v0, $zero, 2 -/* 8B3120 802430B0 03E00008 */ jr $ra -/* 8B3124 802430B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s deleted file mode 100644 index f55916e467..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C0_8ED0E0 -/* 8ED0E0 802412C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED0E4 802412C4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED0E8 802412C8 0C03A631 */ jal func_800E98C4 -/* 8ED0EC 802412CC 00000000 */ nop -/* 8ED0F0 802412D0 0C03A6DB */ jal sync_status_menu -/* 8ED0F4 802412D4 00000000 */ nop -/* 8ED0F8 802412D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED0FC 802412DC 24020002 */ addiu $v0, $zero, 2 -/* 8ED100 802412E0 03E00008 */ jr $ra -/* 8ED104 802412E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s deleted file mode 100644 index a19bca4574..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241548_A87F98 -/* A87F98 80241548 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A87F9C 8024154C AFBF0010 */ sw $ra, 0x10($sp) -/* A87FA0 80241550 0C03A631 */ jal func_800E98C4 -/* A87FA4 80241554 00000000 */ nop -/* A87FA8 80241558 0C03A6DB */ jal sync_status_menu -/* A87FAC 8024155C 00000000 */ nop -/* A87FB0 80241560 8FBF0010 */ lw $ra, 0x10($sp) -/* A87FB4 80241564 24020002 */ addiu $v0, $zero, 2 -/* A87FB8 80241568 03E00008 */ jr $ra -/* A87FBC 8024156C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s deleted file mode 100644 index 4076386945..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241628_A8E0A8 -/* A8E0A8 80241628 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E0AC 8024162C AFBF0010 */ sw $ra, 0x10($sp) -/* A8E0B0 80241630 0C03A631 */ jal func_800E98C4 -/* A8E0B4 80241634 00000000 */ nop -/* A8E0B8 80241638 0C03A6DB */ jal sync_status_menu -/* A8E0BC 8024163C 00000000 */ nop -/* A8E0C0 80241640 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E0C4 80241644 24020002 */ addiu $v0, $zero, 2 -/* A8E0C8 80241648 03E00008 */ jr $ra -/* A8E0CC 8024164C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s deleted file mode 100644 index f08b379a6a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802437CC_80404C -/* 80404C 802437CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 804050 802437D0 AFBF0010 */ sw $ra, 0x10($sp) -/* 804054 802437D4 0C03A631 */ jal func_800E98C4 -/* 804058 802437D8 00000000 */ nop -/* 80405C 802437DC 0C03A6DB */ jal sync_status_menu -/* 804060 802437E0 00000000 */ nop -/* 804064 802437E4 8FBF0010 */ lw $ra, 0x10($sp) -/* 804068 802437E8 24020002 */ addiu $v0, $zero, 2 -/* 80406C 802437EC 03E00008 */ jr $ra -/* 804070 802437F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s deleted file mode 100644 index 0bc23d492d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024552C_805DAC -/* 805DAC 8024552C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805DB0 80245530 AFBF0010 */ sw $ra, 0x10($sp) -/* 805DB4 80245534 0C03BCE9 */ jal func_800EF3A4 -/* 805DB8 80245538 00000000 */ nop -/* 805DBC 8024553C 8FBF0010 */ lw $ra, 0x10($sp) -/* 805DC0 80245540 24020002 */ addiu $v0, $zero, 2 -/* 805DC4 80245544 03E00008 */ jr $ra -/* 805DC8 80245548 27BD0018 */ addiu $sp, $sp, 0x18 -/* 805DCC 8024554C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s deleted file mode 100644 index 98cc382f6f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A8C_9C5E6C -/* 9C5E6C 80240A8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5E70 80240A90 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C5E74 80240A94 0C03A631 */ jal func_800E98C4 -/* 9C5E78 80240A98 00000000 */ nop -/* 9C5E7C 80240A9C 0C03A6DB */ jal sync_status_menu -/* 9C5E80 80240AA0 00000000 */ nop -/* 9C5E84 80240AA4 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C5E88 80240AA8 24020002 */ addiu $v0, $zero, 2 -/* 9C5E8C 80240AAC 03E00008 */ jr $ra -/* 9C5E90 80240AB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s deleted file mode 100644 index 79f4dca6c4..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240850_D05F80 -/* D05F80 80240850 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D05F84 80240854 AFBF0010 */ sw $ra, 0x10($sp) -/* D05F88 80240858 0C03A631 */ jal func_800E98C4 -/* D05F8C 8024085C 00000000 */ nop -/* D05F90 80240860 0C03A6DB */ jal sync_status_menu -/* D05F94 80240864 00000000 */ nop -/* D05F98 80240868 8FBF0010 */ lw $ra, 0x10($sp) -/* D05F9C 8024086C 24020002 */ addiu $v0, $zero, 2 -/* D05FA0 80240870 03E00008 */ jr $ra -/* D05FA4 80240874 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s deleted file mode 100644 index ab125b4731..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F70_D21E00 -/* D21E00 80241F70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21E04 80241F74 AFBF0010 */ sw $ra, 0x10($sp) -/* D21E08 80241F78 0C03A631 */ jal func_800E98C4 -/* D21E0C 80241F7C 00000000 */ nop -/* D21E10 80241F80 0C03A6DB */ jal sync_status_menu -/* D21E14 80241F84 00000000 */ nop -/* D21E18 80241F88 8FBF0010 */ lw $ra, 0x10($sp) -/* D21E1C 80241F8C 24020002 */ addiu $v0, $zero, 2 -/* D21E20 80241F90 03E00008 */ jr $ra -/* D21E24 80241F94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index b83f6531db..80a476decc 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802433E8_96C5A8); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434A4_96C664); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index e114a963e1..deae16f636 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC_A1D0BC); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421C8_A1D2C8); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 68be87c175..a6dba2e1a9 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802411B4_B35D84); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414D0_B360A0); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8); diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c index f7b897aa31..65a0137d53 100644 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ b/src/world/area_kkj/kkj_20/AFDE00.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802402E0_AFDE20); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240308_AFDE48); diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index 9ffcee5159..90ab04e118 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243090_8B3100); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128); diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index 86177005f7..591ef2d39c 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412C0_8ED0E0); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index c84dd51ff4..db6b873542 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241224_A87C74); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241548_A87F98); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 63d71a56a1..a94ad62287 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241304_A8DD84); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241628_A8E0A8); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 342f3881ba..a2816f87f5 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -94,7 +94,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802437CC_80404C); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_804074); @@ -189,4 +189,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802454B4_805D34); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245504_805D84); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024552C_805DAC); +ApiStatus func_8024552C_805DAC(ScriptInstance* script, s32 isInitialCall) { + func_800EF3A4(); + return ApiStatus_DONE2; +} diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index f3d8467455..bdc56984a6 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802407F4_9C5BD4); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240A8C_9C5E6C); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 670a7c10e5..f611159bfe 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240850_D05F80); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 2e87ca9e37..8e573c3ed6 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F70_D21E00); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28); diff --git a/src/world/common/Unk800E98C4SyncStatusMenu.inc.c b/src/world/common/Unk800E98C4SyncStatusMenu.inc.c new file mode 100644 index 0000000000..90e4efc6a3 --- /dev/null +++ b/src/world/common/Unk800E98C4SyncStatusMenu.inc.c @@ -0,0 +1,7 @@ +#include "common.h" + +static ApiStatus Unk800E98C4SyncStatusMenu(ScriptInstance* script, s32 isInitialCall) { + func_800E98C4(); + sync_status_menu(); + return ApiStatus_DONE2; +}