summaryrefslogtreecommitdiff
path: root/arm9/modules/31
diff options
context:
space:
mode:
authorred031000 <rubenru09@aol.com>2020-07-27 15:22:11 +0100
committerred031000 <rubenru09@aol.com>2020-07-27 15:22:49 +0100
commit1f06dab55e56cdf757ad52e652faf7ac40fce26a (patch)
treed6cad90e85c0d209b32eb8624d5d4ee060ad7326 /arm9/modules/31
parent8e1946da03f96b5696d3f8f248a2b675ba80d594 (diff)
finish poketch sinit sections
Diffstat (limited to 'arm9/modules/31')
-rw-r--r--arm9/modules/31/asm/module_31.s15
-rw-r--r--arm9/modules/31/src/module_31_sinit.c13
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/31/asm/module_31.s b/arm9/modules/31/asm/module_31.s
index 47018f81..8bdedda5 100644
--- a/arm9/modules/31/asm/module_31.s
+++ b/arm9/modules/31/asm/module_31.s
@@ -3,18 +3,6 @@
.section .text
.balign 4, 0
- thumb_func_start MOD31_02254840
-MOD31_02254840: ; 0x02254840
- ldr r3, _02254848 ; =Poketch_InitApp
- ldr r0, _0225484C ; =MOD31_02254854
- ldr r1, _02254850 ; =MOD31_02254954
- bx r3
- .align 2, 0
-_02254848: .word Poketch_InitApp
-_0225484C: .word MOD31_02254854
-_02254850: .word MOD31_02254954
- thumb_func_end MOD31_02254840
-
thumb_func_start MOD31_02254854
MOD31_02254854: ; 0x02254854
push {r3, r4, r5, r6, r7, lr}
@@ -749,6 +737,3 @@ MOD31_02254DE4: ; 0x02254DE4
.word 0x02, MOD31_02254CB8, 0x00
.word 0x03, MOD31_02254CF8, 0x00
.word 0x00, 0x00000000, 0x00
-
- .section .sinit
- .word MOD31_02254840
diff --git a/arm9/modules/31/src/module_31_sinit.c b/arm9/modules/31/src/module_31_sinit.c
new file mode 100644
index 00000000..89eadae8
--- /dev/null
+++ b/arm9/modules/31/src/module_31_sinit.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+extern void Poketch_InitApp(void *func1, void *func2);
+extern void MOD31_02254854();
+extern void MOD31_02254954();
+
+THUMB_FUNC static void MOD31_02254840(void)
+{
+ Poketch_InitApp(MOD31_02254854, MOD31_02254954);
+}
+
+#define NitroStaticInit MOD31_02254840
+#include "sinit.h"