summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Luke <5251299+ethanpepro@users.noreply.github.com>2021-03-15 14:44:23 -0400
committerJames Luke <5251299+ethanpepro@users.noreply.github.com>2021-03-15 14:44:23 -0400
commit119f9d3310a64d04a874aa3bb04b8c13b05dab5b (patch)
treefc3e3fb92a60ea58e5a0f8dceea7415ab0408dfd
parentff109c169cb508e0811bd1f0097f97ee594bfd54 (diff)
Update with the requested changes
-rw-r--r--arm9/src/unk_0204AEA8.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arm9/src/unk_0204AEA8.c b/arm9/src/unk_0204AEA8.c
index 23dd6960..9c572a8e 100644
--- a/arm9/src/unk_0204AEA8.c
+++ b/arm9/src/unk_0204AEA8.c
@@ -3,12 +3,10 @@
#include "unk_0204639C.h"
#include "unk_0204AEA8.h"
-#pragma thumb on
-
extern void MOD05_021E3444(u32, struct UnkStruct_0204639C *, u32);
-extern void FUN_0200433C(u32, u32, u32);
+extern void FUN_0200433C(u32, u16, u32);
-BOOL FUN_0204AEA8(struct UnkStruct_0204639C *a0)
+THUMB_FUNC BOOL FUN_0204AEA8(struct UnkStruct_0204639C *a0)
{
struct UnkStruct_0204639C *v0 = FUN_02046528(a0);
u32 *v1 = FUN_0204652C(a0);
@@ -17,7 +15,7 @@ BOOL FUN_0204AEA8(struct UnkStruct_0204639C *a0)
{
case 0:
MOD05_021E3444(v1[2], v0, (u32)v1 + 4);
- FUN_0200433C(5, ((v1[3] << 16) >> 16), 1);
+ FUN_0200433C(5, (u16)v1[3], 1);
v1[0]++;
break;
case 1:
@@ -32,7 +30,7 @@ BOOL FUN_0204AEA8(struct UnkStruct_0204639C *a0)
return FALSE;
}
-void FUN_0204AEF8(struct UnkStruct_0204639C *a0, u32 a1, u32 a2)
+THUMB_FUNC void FUN_0204AEF8(struct UnkStruct_0204639C *a0, u32 a1, u32 a2)
{
u32 *v0 = AllocFromHeapAtEnd(11, 4 * sizeof(u32));