From e09f7c3fe231fe63882f20d8e65c41a4df87f61b Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 26 Jan 2020 23:28:12 +1000 Subject: [PATCH] Decompile coverSetFlag --- src/game/game_187770.c | 2 +- src/game/pad.c | 15 ++++----------- src/include/game/pad.h | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/game/game_187770.c b/src/game/game_187770.c index 2a69536e0..6557a0d3a 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -17196,7 +17196,7 @@ glabel func0f194b40 .L0f196a58: /* f196a58: 04820004 */ bltzl $a0,.L0f196a6c /* f196a5c: 828a0007 */ lb $t2,0x7($s4) -/* f196a60: 0fc45942 */ jal func0f116508 +/* f196a60: 0fc45942 */ jal coverSetFlag /* f196a64: 24050100 */ addiu $a1,$zero,0x100 .L0f196a68: /* f196a68: 828a0007 */ lb $t2,0x7($s4) diff --git a/src/game/pad.c b/src/game/pad.c index 9f675c5d2..95caead10 100644 --- a/src/game/pad.c +++ b/src/game/pad.c @@ -835,17 +835,10 @@ void coverSetFlag0002(s32 covernum, bool enable) } } -GLOBAL_ASM( -glabel func0f116508 -/* f116508: 3c0e800a */ lui $t6,0x800a -/* f11650c: 8dce2360 */ lw $t6,0x2360($t6) -/* f116510: 00047840 */ sll $t7,$a0,0x1 -/* f116514: 01cf1021 */ addu $v0,$t6,$t7 -/* f116518: 94580000 */ lhu $t8,0x0($v0) -/* f11651c: 0305c825 */ or $t9,$t8,$a1 -/* f116520: 03e00008 */ jr $ra -/* f116524: a4590000 */ sh $t9,0x0($v0) -); +void coverSetFlag(s32 covernum, u32 flag) +{ + g_CoverFlags[covernum] |= flag; +} GLOBAL_ASM( glabel func0f116528 diff --git a/src/include/game/pad.h b/src/include/game/pad.h index cff00dee2..01fc43fb8 100644 --- a/src/include/game/pad.h +++ b/src/include/game/pad.h @@ -14,7 +14,7 @@ s32 func0f1162d0(void); u32 func0f1162e0(s16 cover, struct coord **pos); u32 func0f11645c(void); void coverSetFlag0002(s32 covernum, bool enable); -u32 func0f116508(void); +void coverSetFlag(s32 covernum, u32 flag); u32 func0f116528(void); u32 func0f11654c(void); u32 func0f1165b0(void);