From 0b35e2ff770f77b17504f7e72780f8af6c4a6e2d Mon Sep 17 00:00:00 2001 From: GliMusings Date: Wed, 30 Jun 2021 19:11:50 -0500 Subject: unk_02064E20 matching --- arm9/src/unk_02064E20.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 arm9/src/unk_02064E20.c (limited to 'arm9/src') diff --git a/arm9/src/unk_02064E20.c b/arm9/src/unk_02064E20.c new file mode 100644 index 00000000..270004c5 --- /dev/null +++ b/arm9/src/unk_02064E20.c @@ -0,0 +1,18 @@ +#include "global.h" +#include "script.h" +#include "scrcmd.h" +#include "unk_02025484.h" +#include "unk_02024E64.h" +#include "unk_02064E20.h" + +THUMB_FUNC void FUN_02064E20(struct UnkSavStruct80* unk0) +{ + struct unk_2025484 * r4 = (struct unk_2025484 *)FUN_02024ED8(ScriptEnvironment_GetSav2Ptr(unk0)); + if((u32)FUN_020254B4(r4) == 6) + { + return; + } + FUN_02025490(r4, 6); + u16 * ptr0 = (u16 *)FUN_020254A0(r4 , 6); + ptr0[0] = 2; +} -- cgit v1.2.3 From 2b644a764835f018c78778f99efbfbaaa3471016 Mon Sep 17 00:00:00 2001 From: GliMusings Date: Wed, 30 Jun 2021 20:18:05 -0500 Subject: unk_020061E8 matching --- arm9/src/unk_020061E8.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 arm9/src/unk_020061E8.c (limited to 'arm9/src') diff --git a/arm9/src/unk_020061E8.c b/arm9/src/unk_020061E8.c new file mode 100644 index 00000000..da8eac1b --- /dev/null +++ b/arm9/src/unk_020061E8.c @@ -0,0 +1,35 @@ +#include "global.h" +#include "heap.h" +#include "unk_0200CA44.h" +#include "unk_020061E8.h" + +extern struct TextPrinter *FUN_0201B6C8(void); + +THUMB_FUNC BOOL FUN_020061E8(void (*r0)(u32, struct TextPrinter *), u32 r1, u32 r2, u32 r3) +{ + void * r4; + if(r1 != 0) + { + r4 = AllocFromHeap(r3, r1); + if(r4 == 0) + { + return FALSE; + } // _02006202 + memset(r4, 0, r1); + } // _0200620C + else + { + r4 = NULL; + } // _0200620E + return FUN_0200CA44(r0, r4, r2); +} + +THUMB_FUNC void FUN_0200621C(s32 r4) +{ + struct TextPrinter * r0 = FUN_0201B6C8(); + if(r0 != NULL) + { + FreeToHeap(r0); + } + FUN_0200CAB4(r4); +} -- cgit v1.2.3 From 24f7cbde0538943fed6ab2185122e7d0c0522795 Mon Sep 17 00:00:00 2001 From: GliMusings Date: Wed, 30 Jun 2021 20:42:04 -0500 Subject: unk_020222E8 matching --- arm9/src/palette.c | 5 +---- arm9/src/unk_020222E8.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 arm9/src/unk_020222E8.c (limited to 'arm9/src') diff --git a/arm9/src/palette.c b/arm9/src/palette.c index 6726a0ec..e4c42cc4 100644 --- a/arm9/src/palette.c +++ b/arm9/src/palette.c @@ -3,11 +3,8 @@ #include "MI_memory.h" #include "gf_gfx_loader.h" #include "unk_0200CA44.h" +#include "unk_020222E8.h" -extern void *FUN_020222E8(); -extern void *FUN_020222F8(); -extern void *FUN_02022308(); -extern void *FUN_02022310(); extern int abs(int); THUMB_FUNC struct PaletteData *FUN_02002FD0(u32 heap_id) diff --git a/arm9/src/unk_020222E8.c b/arm9/src/unk_020222E8.c new file mode 100644 index 00000000..30a2a2c4 --- /dev/null +++ b/arm9/src/unk_020222E8.c @@ -0,0 +1,33 @@ +#include "global.h" +#include "unk_020222E8.h" + +THUMB_FUNC void * FUN_020222E8() +{ + return 0x5 << 0x18; +} + +THUMB_FUNC void * FUN_020222F0() +{ + return 0x2 << 0x8; +} + +THUMB_FUNC void * FUN_020222F8() +{ + return 0x05000400; +} + +THUMB_FUNC void * FUN_02022300() +{ + return 0x2 << 0x8; +} + +THUMB_FUNC void * FUN_02022308() +{ + return 0x05000200; +} + +THUMB_FUNC void * FUN_02022310() +{ + return 0x05000600; +} + -- cgit v1.2.3 From 5ddd65e0c3e9d669252c4d1e0bab3ca652afe171 Mon Sep 17 00:00:00 2001 From: GliMusings Date: Wed, 30 Jun 2021 20:49:53 -0500 Subject: Beautify --- arm9/src/unk_020061E8.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arm9/src') diff --git a/arm9/src/unk_020061E8.c b/arm9/src/unk_020061E8.c index da8eac1b..424fea34 100644 --- a/arm9/src/unk_020061E8.c +++ b/arm9/src/unk_020061E8.c @@ -14,13 +14,13 @@ THUMB_FUNC BOOL FUN_020061E8(void (*r0)(u32, struct TextPrinter *), u32 r1, u32 if(r4 == 0) { return FALSE; - } // _02006202 + } memset(r4, 0, r1); - } // _0200620C + } else { r4 = NULL; - } // _0200620E + } return FUN_0200CA44(r0, r4, r2); } -- cgit v1.2.3 From c2bf79632520de7963788973b32649db3c55ff97 Mon Sep 17 00:00:00 2001 From: GliMusings Date: Wed, 30 Jun 2021 21:19:22 -0500 Subject: Added some includes --- arm9/src/unk_02064E20.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arm9/src') diff --git a/arm9/src/unk_02064E20.c b/arm9/src/unk_02064E20.c index 270004c5..8586981b 100644 --- a/arm9/src/unk_02064E20.c +++ b/arm9/src/unk_02064E20.c @@ -1,5 +1,4 @@ #include "global.h" -#include "script.h" #include "scrcmd.h" #include "unk_02025484.h" #include "unk_02024E64.h" -- cgit v1.2.3