diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index 410abe1c1..e85e2d270 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -1420,7 +1420,7 @@ glabel func0f19ab70 /* f19ac28: 00164880 */ sll $t1,$s6,0x2 /* f19ac2c: 27aa016c */ addiu $t2,$sp,0x16c /* f19ac30: 012a8021 */ addu $s0,$t1,$t2 -/* f19ac34: 0fc4594a */ jal func0f116528 +/* f19ac34: 0fc4594a */ jal coverUnsetFlag /* f19ac38: 24050100 */ addiu $a1,$zero,0x100 /* f19ac3c: ae120000 */ sw $s2,0x0($s0) /* f19ac40: 26d60001 */ addiu $s6,$s6,0x1 diff --git a/src/game/pad.c b/src/game/pad.c index 95caead10..b2ebcceeb 100644 --- a/src/game/pad.c +++ b/src/game/pad.c @@ -840,18 +840,10 @@ void coverSetFlag(s32 covernum, u32 flag) g_CoverFlags[covernum] |= flag; } -GLOBAL_ASM( -glabel func0f116528 -/* f116528: 3c0e800a */ lui $t6,0x800a -/* f11652c: 8dce2360 */ lw $t6,0x2360($t6) -/* f116530: 00047840 */ sll $t7,$a0,0x1 -/* f116534: 00a0c827 */ nor $t9,$a1,$zero -/* f116538: 01cf1021 */ addu $v0,$t6,$t7 -/* f11653c: 94580000 */ lhu $t8,0x0($v0) -/* f116540: 03194024 */ and $t0,$t8,$t9 -/* f116544: 03e00008 */ jr $ra -/* f116548: a4480000 */ sh $t0,0x0($v0) -); +void coverUnsetFlag(s32 covernum, u32 flag) +{ + g_CoverFlags[covernum] &= ~flag; +} GLOBAL_ASM( glabel func0f11654c diff --git a/src/include/game/pad.h b/src/include/game/pad.h index 01fc43fb8..e14a4af2a 100644 --- a/src/include/game/pad.h +++ b/src/include/game/pad.h @@ -15,7 +15,7 @@ u32 func0f1162e0(s16 cover, struct coord **pos); u32 func0f11645c(void); void coverSetFlag0002(s32 covernum, bool enable); void coverSetFlag(s32 covernum, u32 flag); -u32 func0f116528(void); +void coverUnsetFlag(s32 covernum, u32 flag); u32 func0f11654c(void); u32 func0f1165b0(void);