pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

3

Browse Source
This commit is contained in:
Ethan Roseman 2020-08-09 00:37:06 -04:00
parent 3545f7b6f7
commit 9f0eb9abdd
4 changed files with 14 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
papermario/asm/nonmatchings/code_80850_len_3060/func_800E96C8.s
View File

@ -1,20 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.include "include/macro.inc"
glabel func_800E96C8
/* 082B78 800E96C8 3C028011 */ lui $v0, 0x8011
/* 082B7C 800E96CC 8442CD10 */ lh $v0, -0x32f0($v0)
/* 082B80 800E96D0 3C038011 */ lui $v1, 0x8011
/* 082B84 800E96D4 2463EF58 */ addiu $v1, $v1, -0x10a8
/* 082B88 800E96D8 10400005 */ beqz $v0, .L800E96F0
/* 082B8C 800E96DC 00000000 */ nop
/* 082B90 800E96E0 8062006C */ lb $v0, 0x6c($v1)
/* 082B94 800E96E4 14400002 */ bnez $v0, .L800E96F0
/* 082B98 800E96E8 24020001 */ addiu $v0, $zero, 1
/* 082B9C 800E96EC A062006C */ sb $v0, 0x6c($v1)
.L800E96F0:
/* 082BA0 800E96F0 03E00008 */ jr $ra
/* 082BA4 800E96F4 00000000 */ nop

20
papermario/asm/nonmatchings/code_80850_len_3060/func_800E9894.s
View File

@ -1,20 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.include "include/macro.inc"
glabel status_menu_enable_ignore_changes
/* 082D44 800E9894 24020001 */ addiu $v0, $zero, 1
/* 082D48 800E9898 3C018011 */ lui $at, 0x8011
/* 082D4C 800E989C A022EF9C */ sb $v0, -0x1064($at)
/* 082D50 800E98A0 03E00008 */ jr $ra
/* 082D54 800E98A4 00000000 */ nop
/* 082D58 800E98A8 3C028011 */ lui $v0, 0x8011
/* 082D5C 800E98AC 2442EF58 */ addiu $v0, $v0, -0x10a8
/* 082D60 800E98B0 24030001 */ addiu $v1, $zero, 1
/* 082D64 800E98B4 A0430044 */ sb $v1, 0x44($v0)
/* 082D68 800E98B8 24030012 */ addiu $v1, $zero, 0x12
/* 082D6C 800E98BC 03E00008 */ jr $ra
/* 082D70 800E98C0 A4430036 */ sh $v1, 0x36($v0)

20
papermario/asm/nonmatchings/code_80850_len_3060/hide_coin_counter.s
View File

@ -1,20 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.include "include/macro.inc"
glabel hide_coin_counter
/* 082B48 800E9698 3C028011 */ lui $v0, 0x8011
/* 082B4C 800E969C 8442CD10 */ lh $v0, -0x32f0($v0)
/* 082B50 800E96A0 3C038011 */ lui $v1, 0x8011
/* 082B54 800E96A4 2463EF58 */ addiu $v1, $v1, -0x10a8
/* 082B58 800E96A8 10400005 */ beqz $v0, .L800E96C0
/* 082B5C 800E96AC 00000000 */ nop
/* 082B60 800E96B0 8062006C */ lb $v0, 0x6c($v1)
/* 082B64 800E96B4 14400002 */ bnez $v0, .L800E96C0
/* 082B68 800E96B8 2402003C */ addiu $v0, $zero, 0x3c
/* 082B6C 800E96BC A062006C */ sb $v0, 0x6c($v1)
.L800E96C0:
/* 082B70 800E96C0 03E00008 */ jr $ra
/* 082B74 800E96C4 00000000 */ nop

16
papermario/src/code_80850_len_3060.c
View File

@ -196,9 +196,21 @@ INCLUDE_ASM(code_80850_len_3060, update_coin_counter);
INCLUDE_ASM(code_80850_len_3060, show_coin_counter); INCLUDE_ASM(code_80850_len_3060, show_coin_counter);
INCLUDE_ASM(code_80850_len_3060, hide_coin_counter); void hide_coin_counter(void) {
ui_status* uiStatus = &gUIStatus;
INCLUDE_ASM(code_80850_len_3060, func_800E96C8); if ((D_8010CD10 != 0) && (uiStatus->unk_6C == 0)) {
uiStatus->unk_6C = 60;
}
}
void func_800E96C8(void) {
ui_status* uiStatus = &gUIStatus;
if ((D_8010CD10 != 0) && (uiStatus->unk_6C == 0)) {
uiStatus->unk_6C = 1;
}
}
s32 ShowCoinCounter(ScriptContext* script) { s32 ShowCoinCounter(ScriptContext* script) {
if (get_variable(script, *script->ptrReadPos)) { if (get_variable(script, *script->ptrReadPos)) {