diff --git a/papermario/asm/nonmatchings/code_80850_len_3060/ShowCoinCounter.s b/papermario/asm/nonmatchings/code_80850_len_3060/ShowCoinCounter.s deleted file mode 100644 index 39efda7f71..0000000000 --- a/papermario/asm/nonmatchings/code_80850_len_3060/ShowCoinCounter.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.include "include/macro.inc" - -glabel ShowCoinCounter -/* 082BA8 800E96F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 082BAC 800E96FC AFBF0010 */ sw $ra, 0x10($sp) -/* 082BB0 800E9700 8C82000C */ lw $v0, 0xc($a0) -/* 082BB4 800E9704 0C0B1EAF */ jal get_variable -/* 082BB8 800E9708 8C450000 */ lw $a1, ($v0) -/* 082BBC 800E970C 10400005 */ beqz $v0, .L800E9724 -/* 082BC0 800E9710 00000000 */ nop -/* 082BC4 800E9714 0C03A546 */ jal show_coin_counter -/* 082BC8 800E9718 00000000 */ nop -/* 082BCC 800E971C 0803A5CB */ j .L800E972C -/* 082BD0 800E9720 00000000 */ nop - -.L800E9724: -/* 082BD4 800E9724 0C03A5A6 */ jal hide_coin_counter -/* 082BD8 800E9728 00000000 */ nop -.L800E972C: -/* 082BDC 800E972C 8FBF0010 */ lw $ra, 0x10($sp) -/* 082BE0 800E9730 24020002 */ addiu $v0, $zero, 2 -/* 082BE4 800E9734 03E00008 */ jr $ra -/* 082BE8 800E9738 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/papermario/asm/nonmatchings/code_80850_len_3060/open_status_menu_long.s b/papermario/asm/nonmatchings/code_80850_len_3060/open_status_menu_long.s deleted file mode 100644 index 37e449d4b9..0000000000 --- a/papermario/asm/nonmatchings/code_80850_len_3060/open_status_menu_long.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.include "include/macro.inc" - -glabel open_status_menu_long -/* 082C10 800E9760 3C038011 */ lui $v1, 0x8011 -/* 082C14 800E9764 2463EF58 */ addiu $v1, $v1, -0x10a8 -/* 082C18 800E9768 8062003A */ lb $v0, 0x3a($v1) -/* 082C1C 800E976C 10400005 */ beqz $v0, .L800E9784 -/* 082C20 800E9770 240200D2 */ addiu $v0, $zero, 0xd2 -/* 082C24 800E9774 A4620038 */ sh $v0, 0x38($v1) -/* 082C28 800E9778 24020001 */ addiu $v0, $zero, 1 -/* 082C2C 800E977C A060003A */ sb $zero, 0x3a($v1) -/* 082C30 800E9780 A062003B */ sb $v0, 0x3b($v1) -.L800E9784: -/* 082C34 800E9784 03E00008 */ jr $ra -/* 082C38 800E9788 00000000 */ nop - diff --git a/papermario/asm/nonmatchings/code_80850_len_3060/open_status_menu_short.s b/papermario/asm/nonmatchings/code_80850_len_3060/open_status_menu_short.s deleted file mode 100644 index 335705da23..0000000000 --- a/papermario/asm/nonmatchings/code_80850_len_3060/open_status_menu_short.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.include "include/macro.inc" - -glabel open_status_menu_short -/* 082C3C 800E978C 3C038011 */ lui $v1, 0x8011 -/* 082C40 800E9790 2463EF58 */ addiu $v1, $v1, -0x10a8 -/* 082C44 800E9794 8062003A */ lb $v0, 0x3a($v1) -/* 082C48 800E9798 10400005 */ beqz $v0, .L800E97B0 -/* 082C4C 800E979C 24020069 */ addiu $v0, $zero, 0x69 -/* 082C50 800E97A0 A4620038 */ sh $v0, 0x38($v1) -/* 082C54 800E97A4 24020001 */ addiu $v0, $zero, 1 -/* 082C58 800E97A8 A060003A */ sb $zero, 0x3a($v1) -/* 082C5C 800E97AC A062003B */ sb $v0, 0x3b($v1) -.L800E97B0: -/* 082C60 800E97B0 03E00008 */ jr $ra -/* 082C64 800E97B4 00000000 */ nop - diff --git a/papermario/src/code_80850_len_3060.c b/papermario/src/code_80850_len_3060.c index 29dd80edd0..3e8823ed3a 100644 --- a/papermario/src/code_80850_len_3060.c +++ b/papermario/src/code_80850_len_3060.c @@ -107,13 +107,38 @@ INCLUDE_ASM(code_80850_len_3060, hide_coin_counter); INCLUDE_ASM(code_80850_len_3060, func_800E96C8); -INCLUDE_ASM(code_80850_len_3060, ShowCoinCounter); +s32 ShowCoinCounter(ScriptContext* script) { + if (get_variable(script, *script->ptrReadPos)) { + show_coin_counter(); + } else { + hide_coin_counter(); + } + return 2; +} + INCLUDE_ASM(code_80850_len_3060, func_800E973C); -INCLUDE_ASM(code_80850_len_3060, open_status_menu_long); +void open_status_menu_long(void) { + ui_status* uiStatus = &gUIStatus; -INCLUDE_ASM(code_80850_len_3060, open_status_menu_short); + if (uiStatus->hidden) { + uiStatus->showTimer = 210; + uiStatus->hidden = 0; + uiStatus->unk_3B = 1; + } +} + + +void open_status_menu_short(void) { + ui_status* uiStatus = &gUIStatus; + + if (uiStatus->hidden) { + uiStatus->showTimer = 105; + uiStatus->hidden = 0; + uiStatus->unk_3B = 1; + } +} INCLUDE_ASM(code_80850_len_3060, func_800E97B8);