diff --git a/asm/nonmatchings/code_f8f60_len_1560/EnableStatusMenu.s b/asm/nonmatchings/code_f8f60_len_1560/EnableStatusMenu.s deleted file mode 100644 index f893983e7e..0000000000 --- a/asm/nonmatchings/code_f8f60_len_1560/EnableStatusMenu.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel EnableStatusMenu -/* 0FA348 802D5998 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0FA34C 802D599C AFBF0010 */ sw $ra, 0x10($sp) -/* 0FA350 802D59A0 8C82000C */ lw $v0, 0xc($a0) -/* 0FA354 802D59A4 0C0B1EAF */ jal get_variable -/* 0FA358 802D59A8 8C450000 */ lw $a1, ($v0) -/* 0FA35C 802D59AC 10400005 */ beqz $v0, .L802D59C4 -/* 0FA360 802D59B0 00000000 */ nop -/* 0FA364 802D59B4 0C03A6CC */ jal decrement_status_menu_disabled -/* 0FA368 802D59B8 00000000 */ nop -/* 0FA36C 802D59BC 080B5673 */ j .L802D59CC -/* 0FA370 802D59C0 00000000 */ nop - -.L802D59C4: -/* 0FA374 802D59C4 0C03A6D5 */ jal increment_status_menu_disabled -/* 0FA378 802D59C8 00000000 */ nop -.L802D59CC: -/* 0FA37C 802D59CC 8FBF0010 */ lw $ra, 0x10($sp) -/* 0FA380 802D59D0 24020002 */ addiu $v0, $zero, 2 -/* 0FA384 802D59D4 03E00008 */ jr $ra -/* 0FA388 802D59D8 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/nonmatchings/code_f8f60_len_1560/ShowStatusMenu.s b/asm/nonmatchings/code_f8f60_len_1560/ShowStatusMenu.s deleted file mode 100644 index 7b0659bd0c..0000000000 --- a/asm/nonmatchings/code_f8f60_len_1560/ShowStatusMenu.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel ShowStatusMenu -/* 0FA38C 802D59DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0FA390 802D59E0 AFBF0010 */ sw $ra, 0x10($sp) -/* 0FA394 802D59E4 8C82000C */ lw $v0, 0xc($a0) -/* 0FA398 802D59E8 0C0B1EAF */ jal get_variable -/* 0FA39C 802D59EC 8C450000 */ lw $a1, ($v0) -/* 0FA3A0 802D59F0 10400007 */ beqz $v0, .L802D5A10 -/* 0FA3A4 802D59F4 00000000 */ nop -/* 0FA3A8 802D59F8 0C03A625 */ jal status_menu_enable_ignore_changes -/* 0FA3AC 802D59FC 00000000 */ nop -/* 0FA3B0 802D5A00 0C03A5EE */ jal func_800E97B8 -/* 0FA3B4 802D5A04 00000000 */ nop -/* 0FA3B8 802D5A08 080B5686 */ j .L802D5A18 -/* 0FA3BC 802D5A0C 00000000 */ nop - -.L802D5A10: -/* 0FA3C0 802D5A10 0C03A631 */ jal status_menu_disable_ignore_changes -/* 0FA3C4 802D5A14 00000000 */ nop -.L802D5A18: -/* 0FA3C8 802D5A18 8FBF0010 */ lw $ra, 0x10($sp) -/* 0FA3CC 802D5A1C 24020002 */ addiu $v0, $zero, 2 -/* 0FA3D0 802D5A20 03E00008 */ jr $ra -/* 0FA3D4 802D5A24 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/src/code_f8f60_len_1560.c b/src/code_f8f60_len_1560.c index 8b940cae2e..0e55337a61 100644 --- a/src/code_f8f60_len_1560.c +++ b/src/code_f8f60_len_1560.c @@ -202,9 +202,26 @@ INCLUDE_ASM(code_f8f60_len_1560, SetValueByRef); INCLUDE_ASM(code_f8f60_len_1560, GetValueByRef); -INCLUDE_ASM(code_f8f60_len_1560, EnableStatusMenu); +s32 EnableStatusMenu(script_context* script, s32 initialCall) { + if (get_variable(script, *script->ptrReadPos) != 0) { + decrement_status_menu_disabled(); + } else { + increment_status_menu_disabled(); + } -INCLUDE_ASM(code_f8f60_len_1560, ShowStatusMenu); + return 2; +} + +s32 ShowStatusMenu(script_context* script, s32 initialCall) { + if (get_variable(script, *script->ptrReadPos) != 0) { + status_menu_enable_ignore_changes(); + func_800E97B8(); + } else { + status_menu_disable_ignore_changes(); + } + + return 2; +} INCLUDE_ASM(code_f8f60_len_1560, SetGameMode);