diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index d30f944ab..7db9fe751 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -5598,7 +5598,7 @@ glabel ai0087 /* f053400: afbf0014 */ sw $ra,0x14($sp) /* f053404: 01cf1021 */ addu $v0,$t6,$t7 /* f053408: 90450002 */ lbu $a1,0x2($v0) -/* f05340c: 0fc12894 */ jal func0f04a250 +/* f05340c: 0fc12894 */ jal decrementByte /* f053410: 24840112 */ addiu $a0,$a0,0x112 /* f053414: 3c03800a */ lui $v1,0x800a /* f053418: 24639fc0 */ addiu $v1,$v1,-24640 @@ -5779,7 +5779,7 @@ glabel ai008d /* f053618: afbf0014 */ sw $ra,0x14($sp) /* f05361c: 01cf1021 */ addu $v0,$t6,$t7 /* f053620: 90450002 */ lbu $a1,0x2($v0) -/* f053624: 0fc12894 */ jal func0f04a250 +/* f053624: 0fc12894 */ jal decrementByte /* f053628: 24840113 */ addiu $a0,$a0,0x113 /* f05362c: 3c03800a */ lui $v1,0x800a /* f053630: 24639fc0 */ addiu $v1,$v1,-24640 diff --git a/src/game/game_000000.c b/src/game/game_000000.c index 1b9a54906..bb7542cfd 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -83690,21 +83690,15 @@ glabel func0f04a1ac /* f04a24c: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f04a250 -/* f04a250: afa50004 */ sw $a1,0x4($sp) -/* f04a254: 90820000 */ lbu $v0,0x0($a0) -/* f04a258: 30a300ff */ andi $v1,$a1,0xff -/* f04a25c: 0043082a */ slt $at,$v0,$v1 -/* f04a260: 10200003 */ beqz $at,.L0f04a270 -/* f04a264: 00437823 */ subu $t7,$v0,$v1 -/* f04a268: 03e00008 */ jr $ra -/* f04a26c: a0800000 */ sb $zero,0x0($a0) -.L0f04a270: -/* f04a270: a08f0000 */ sb $t7,0x0($a0) -/* f04a274: 03e00008 */ jr $ra -/* f04a278: 00000000 */ sll $zero,$zero,0x0 -); +void decrementByte(u8 *dst, u8 amount) +{ + if (*dst < amount) { + *dst = 0; + return; + } + + *dst -= amount; +} void incrementByte(u8 *dst, u8 amount) {