summaryrefslogtreecommitdiff
path: root/arm9/modules/47
diff options
context:
space:
mode:
authorred031000 <rubenru09@aol.com>2020-07-27 14:38:25 +0100
committerred031000 <rubenru09@aol.com>2020-07-27 14:38:25 +0100
commitb0cf87ca3640d912d047de41343b4ff9e5f44c6e (patch)
tree9cc1d5eb50c2af0e6b7f3a04191f789b0bd755d4 /arm9/modules/47
parent7c2a848ecccb95d010d8c0836c5d9c6a96b39da0 (diff)
decomp module static init sections
Diffstat (limited to 'arm9/modules/47')
-rw-r--r--arm9/modules/47/asm/module_47.s12
-rw-r--r--arm9/modules/47/src/module_47_sinit.c13
2 files changed, 11 insertions, 14 deletions
diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s
index 549b6c3a..3c2ae879 100644
--- a/arm9/modules/47/asm/module_47.s
+++ b/arm9/modules/47/asm/module_47.s
@@ -3,18 +3,6 @@
.section .text
.balign 4, 0
- thumb_func_start MOD47_02254840
-MOD47_02254840: ; 0x02254840
- ldr r3, _02254848 ; =Poketch_InitApp
- ldr r0, _0225484C ; =MOD47_02254854
- ldr r1, _02254850 ; =MOD47_0225491C
- bx r3
- .align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD47_02254854
-_02254850: .word MOD47_0225491C
- thumb_func_end MOD47_02254840
-
thumb_func_start MOD47_02254854
MOD47_02254854: ; 0x02254854
push {r3, r4, r5, r6, r7, lr}
diff --git a/arm9/modules/47/src/module_47_sinit.c b/arm9/modules/47/src/module_47_sinit.c
index f8e3041a..f255cafa 100644
--- a/arm9/modules/47/src/module_47_sinit.c
+++ b/arm9/modules/47/src/module_47_sinit.c
@@ -1,4 +1,13 @@
-#define NitroStaticInit MOD47_02254840
#include "global.h"
-extern void MOD47_02254840(void);
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD47_02254854();
+extern void MOD47_0225491C();
+
+THUMB_FUNC static void MOD47_02254840(void)
+{
+ Poketch_InitApp(MOD47_02254854, MOD47_0225491C);
+}
+
+#define NitroStaticInit MOD47_02254840
#include "sinit.h"