summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornotyourav <65437533+notyourav@users.noreply.github.com>2023-12-17 13:19:58 -0800
committerGitHub <noreply@github.com>2023-12-17 13:19:58 -0800
commit5bac16fe2186d494919cf477af12b5a6b8442f64 (patch)
tree2fdec0d14a155e75efcbb7a21760256183213c5c
parentf5939d862d4dcfd1fc3ae1b01c75a2883630ebda (diff)
parenta4450f5a4d5ec0653ad799b25686fc58ab06176c (diff)
Merge pull request #652 from AtariDreams/sub_0806FC24
-rw-r--r--src/physics.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/physics.c b/src/physics.c
index f3f554fd..b0cc10b0 100644
--- a/src/physics.c
+++ b/src/physics.c
@@ -404,14 +404,11 @@ bool32 CheckPlayerProximity(u32 x, u32 y, u32 distX, u32 DistY) {
}
bool32 sub_0806FC24(u32 param_1, u32 param_2) {
- register u32 rv asm("r0");
u32 val = sub_08007DD6(param_1, gUnk_080046A4);
- if (val) {
- rv = (*(gUnk_080047F6 + (val << 2)) >> param_2) & 0x1;
- } else {
- rv = 0;
- }
- return rv;
+ if (!val)
+ return 0;
+
+ return (*(gUnk_080047F6 + (val << 2)) >> param_2) & 0x1;
}
const u16* sub_0806FC50(u32 param_1, u32 param_2) {