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

tidying

Browse Source
This commit is contained in:
Ethan Roseman 2020-08-11 22:54:09 -04:00
parent f49e67b4b9
commit d7d871e24a
2 changed files with 0 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
papermario/asm/nonmatchings/code_80850_len_3060/update_coin_counter.s
View File

@ -1,91 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel update_coin_counter
/* 08288C 800E93DC 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 082890 800E93E0 AFB00010 */ sw $s0, 0x10($sp)
/* 082894 800E93E4 3C108011 */ lui $s0, 0x8011
/* 082898 800E93E8 2610EF58 */ addiu $s0, $s0, -0x10a8
/* 08289C 800E93EC AFB10014 */ sw $s1, 0x14($sp)
/* 0828A0 800E93F0 3C118011 */ lui $s1, 0x8011
/* 0828A4 800E93F4 2631F290 */ addiu $s1, $s1, -0xd70
/* 0828A8 800E93F8 AFBF0018 */ sw $ra, 0x18($sp)
/* 0828AC 800E93FC 9203006D */ lbu $v1, 0x6d($s0)
/* 0828B0 800E9400 8202006D */ lb $v0, 0x6d($s0)
/* 0828B4 800E9404 10400010 */ beqz $v0, .L800E9448
/* 0828B8 800E9408 2462FFFF */ addiu $v0, $v1, -1
/* 0828BC 800E940C A202006D */ sb $v0, 0x6d($s0)
/* 0828C0 800E9410 00021600 */ sll $v0, $v0, 0x18
/* 0828C4 800E9414 1440000A */ bnez $v0, .L800E9440
/* 0828C8 800E9418 00000000 */ nop
/* 0828CC 800E941C 8E040064 */ lw $a0, 0x64($s0)
/* 0828D0 800E9420 04800007 */ bltz $a0, .L800E9440
/* 0828D4 800E9424 00000000 */ nop
/* 0828D8 800E9428 0C05123D */ jal free_icon
/* 0828DC 800E942C 00000000 */ nop
/* 0828E0 800E9430 0C05123D */ jal free_icon
/* 0828E4 800E9434 8E040068 */ lw $a0, 0x68($s0)
/* 0828E8 800E9438 2402FFFF */ addiu $v0, $zero, -1
/* 0828EC 800E943C AE020064 */ sw $v0, 0x64($s0)
.L800E9440:
/* 0828F0 800E9440 3C018011 */ lui $at, 0x8011
/* 0828F4 800E9444 A420CD12 */ sh $zero, -0x32ee($at)
.L800E9448:
/* 0828F8 800E9448 8204006C */ lb $a0, 0x6c($s0)
/* 0828FC 800E944C 1080002D */ beqz $a0, .L800E9504
/* 082900 800E9450 00000000 */ nop
/* 082904 800E9454 86030040 */ lh $v1, 0x40($s0)
/* 082908 800E9458 8622000C */ lh $v0, 0xc($s1)
/* 08290C 800E945C 14620008 */ bne $v1, $v0, .L800E9480
/* 082910 800E9460 2882001F */ slti $v0, $a0, 0x1f
/* 082914 800E9464 14400003 */ bnez $v0, .L800E9474
/* 082918 800E9468 2402001E */ addiu $v0, $zero, 0x1e
/* 08291C 800E946C A202006C */ sb $v0, 0x6c($s0)
/* 082920 800E9470 86030040 */ lh $v1, 0x40($s0)
.L800E9474:
/* 082924 800E9474 8622000C */ lh $v0, 0xc($s1)
/* 082928 800E9478 10620005 */ beq $v1, $v0, .L800E9490
/* 08292C 800E947C 00000000 */ nop
.L800E9480:
/* 082930 800E9480 8202006C */ lb $v0, 0x6c($s0)
/* 082934 800E9484 2842001F */ slti $v0, $v0, 0x1f
/* 082938 800E9488 1040001E */ beqz $v0, .L800E9504
/* 08293C 800E948C 00000000 */ nop
.L800E9490:
/* 082940 800E9490 9202006C */ lbu $v0, 0x6c($s0)
/* 082944 800E9494 2442FFFF */ addiu $v0, $v0, -1
/* 082948 800E9498 A202006C */ sb $v0, 0x6c($s0)
/* 08294C 800E949C 00021600 */ sll $v0, $v0, 0x18
/* 082950 800E94A0 14400018 */ bnez $v0, .L800E9504
/* 082954 800E94A4 00000000 */ nop
/* 082958 800E94A8 3C058014 */ lui $a1, 0x8014
/* 08295C 800E94AC 24A57574 */ addiu $a1, $a1, 0x7574
/* 082960 800E94B0 0C051F9F */ jal func_80147E7C
/* 082964 800E94B4 24040014 */ addiu $a0, $zero, 0x14
/* 082968 800E94B8 8E03005C */ lw $v1, 0x5c($s0)
/* 08296C 800E94BC 8E040060 */ lw $a0, 0x60($s0)
/* 082970 800E94C0 2402000F */ addiu $v0, $zero, 0xf
/* 082974 800E94C4 A202006D */ sb $v0, 0x6d($s0)
/* 082978 800E94C8 9625000C */ lhu $a1, 0xc($s1)
/* 08297C 800E94CC 24020001 */ addiu $v0, $zero, 1
/* 082980 800E94D0 3C018011 */ lui $at, 0x8011
/* 082984 800E94D4 A420CD10 */ sh $zero, -0x32f0($at)
/* 082988 800E94D8 3C018011 */ lui $at, 0x8011
/* 08298C 800E94DC A422CD12 */ sh $v0, -0x32ee($at)
/* 082990 800E94E0 8202006E */ lb $v0, 0x6e($s0)
/* 082994 800E94E4 AE030064 */ sw $v1, 0x64($s0)
/* 082998 800E94E8 9203006E */ lbu $v1, 0x6e($s0)
/* 08299C 800E94EC AE040068 */ sw $a0, 0x68($s0)
/* 0829A0 800E94F0 04400004 */ bltz $v0, .L800E9504
/* 0829A4 800E94F4 A6050040 */ sh $a1, 0x40($s0)
/* 0829A8 800E94F8 2402FFFF */ addiu $v0, $zero, -1
/* 0829AC 800E94FC A2030044 */ sb $v1, 0x44($s0)
/* 0829B0 800E9500 A202006E */ sb $v0, 0x6e($s0)
.L800E9504:
/* 0829B4 800E9504 8FBF0018 */ lw $ra, 0x18($sp)
/* 0829B8 800E9508 8FB10014 */ lw $s1, 0x14($sp)
/* 0829BC 800E950C 8FB00010 */ lw $s0, 0x10($sp)
/* 0829C0 800E9510 03E00008 */ jr $ra
/* 0829C4 800E9514 27BD0020 */ addiu $sp, $sp, 0x20

1
papermario/src/code_80850_len_3060.c
View File

@ -298,7 +298,6 @@ void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) {
draw_number(uiStatus->displayCoins, posX + 58, posY + 4, 1, 10, 255, 3);
}
// INCLUDE_ASM(code_80850_len_3060, update_coin_counter);
void update_coin_counter(void) {
ui_status* uiStatus = &gUIStatus;
player_data* playerData = &gPlayerData;