diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-07-27 17:21:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 17:21:41 +0300 |
| commit | 8e1946da03f96b5696d3f8f248a2b675ba80d594 (patch) | |
| tree | 70d3aa714ecc4e221b11437672b3da8f36049d7e /arm9/modules/41 | |
| parent | 4f8385ac24e8904662af24bbc0d81317c8ff1ea6 (diff) | |
| parent | 777da6f2ee89661596d6e7c129e6d025c6f2841c (diff) | |
Merge pull request #244 from red031000/master
split arm7 NVRAM and some RTC
Diffstat (limited to 'arm9/modules/41')
| -rw-r--r-- | arm9/modules/41/asm/module_41.s | 12 | ||||
| -rw-r--r-- | arm9/modules/41/src/module_41_sinit.c | 13 |
2 files changed, 11 insertions, 14 deletions
diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s index 13762a02..a60736df 100644 --- a/arm9/modules/41/asm/module_41.s +++ b/arm9/modules/41/asm/module_41.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD41_02254840 -MOD41_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD41_02254854 - ldr r1, _02254850 ; =MOD41_02254AD8 - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD41_02254854 -_02254850: .word MOD41_02254AD8 - thumb_func_end MOD41_02254840 - thumb_func_start MOD41_02254854 MOD41_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} diff --git a/arm9/modules/41/src/module_41_sinit.c b/arm9/modules/41/src/module_41_sinit.c index 9d0d5aa8..1e119d0f 100644 --- a/arm9/modules/41/src/module_41_sinit.c +++ b/arm9/modules/41/src/module_41_sinit.c @@ -1,4 +1,13 @@ -#define NitroStaticInit MOD41_02254840 #include "global.h" -extern void MOD41_02254840(void); + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD41_02254854(); +extern void MOD41_02254AD8(); + +THUMB_FUNC static void MOD41_02254840(void) +{ + Poketch_InitApp(MOD41_02254854, MOD41_02254AD8); +} + +#define NitroStaticInit MOD41_02254840 #include "sinit.h" |