summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Calixte <remicalixte.rmc@gmail.com>2021-03-15 21:51:27 +0100
committerRémi Calixte <remicalixte.rmc@gmail.com>2021-03-16 13:55:35 +0100
commitf3adb8eda9602941397cac94e76caf8b51781d0b (patch)
treea9b18d404412db1ada03544d6624ae3267d6e011
parent66f2e4ed4df708280904a21e4a92558e7fcc5866 (diff)
decomp MOD52_021D750C
-rw-r--r--arm9/global.inc1
-rw-r--r--arm9/modules/52/asm/module_52.s14
-rw-r--r--arm9/modules/52/src/module_52_c.c9
3 files changed, 10 insertions, 14 deletions
diff --git a/arm9/global.inc b/arm9/global.inc
index 15f291a0..83a492ba 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -8521,3 +8521,4 @@
.extern CountAlivePokemon
.extern MOD52_021D74E0
.extern MOD52_021D74F8
+.extern MOD52_021D750C \ No newline at end of file
diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s
index 457373a1..5c456f0c 100644
--- a/arm9/modules/52/asm/module_52.s
+++ b/arm9/modules/52/asm/module_52.s
@@ -4,20 +4,6 @@
.balign 4, 0
- thumb_func_start MOD52_021D750C
-MOD52_021D750C: ; 0x021D750C
- push {r3, lr}
- mov r0, #0x4d
- bl FUN_020168D0
- mov r0, #0
- ldr r1, _021D7524 ; =UNK_020FD144
- mvn r0, r0
- bl RegisterMainOverlay
- mov r0, #1
- pop {r3, pc}
- nop
-_021D7524: .word UNK_020FD144
- thumb_func_end MOD52_021D750C
thumb_func_start MOD52_021D7528
MOD52_021D7528: ; 0x021D7528
diff --git a/arm9/modules/52/src/module_52_c.c b/arm9/modules/52/src/module_52_c.c
index 61877176..bc059dff 100644
--- a/arm9/modules/52/src/module_52_c.c
+++ b/arm9/modules/52/src/module_52_c.c
@@ -4,7 +4,9 @@
extern void FUN_0201681C(u32 param0, u32 heap_id, u32 param2);
+extern int FUN_020168D0(u32 heap_id);
extern void MOD52_021D769C(u32 heap_id, int param1);
+extern struct Unk21DBE18 UNK_020FD144;
THUMB_FUNC int MOD52_021D74E0() {
FUN_0201681C(3, 0x4d, 2 << 16);
@@ -20,3 +22,10 @@ THUMB_FUNC int MOD52_021D74F8(struct UnkStruct_02006234 *param0) {
return 1;
}
+
+THUMB_FUNC int MOD52_021D750C() {
+ FUN_020168D0(0x4d);
+ RegisterMainOverlay(-1, &UNK_020FD144);
+
+ return 1;
+} \ No newline at end of file