diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-07-27 10:59:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 10:59:58 -0400 |
| commit | bb6d2a9a3178b421ed5c6cb738e93257834d1f54 (patch) | |
| tree | f410221677f32a44ebb71c93eeb4609c6217c48b /arm9/modules/38 | |
| parent | 8e1946da03f96b5696d3f8f248a2b675ba80d594 (diff) | |
| parent | 1a6f96cf99c403b5fa22bd94a45db55c0adaff9e (diff) | |
Merge pull request #245 from red031000/master
finish poketch sinit sections + 62 sinit + arm7 RTC cleanup
Diffstat (limited to 'arm9/modules/38')
| -rw-r--r-- | arm9/modules/38/asm/module_38.s | 15 | ||||
| -rw-r--r-- | arm9/modules/38/src/module_38_sinit.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s index 59871d4a..fafafb07 100644 --- a/arm9/modules/38/asm/module_38.s +++ b/arm9/modules/38/asm/module_38.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD38_02254840 -MOD38_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD38_02254854 - ldr r1, _02254850 ; =MOD38_02254990 - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD38_02254854 -_02254850: .word MOD38_02254990 - thumb_func_end MOD38_02254840 - thumb_func_start MOD38_02254854 MOD38_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} @@ -1254,6 +1242,3 @@ MOD38_02255300: ; 0x02255300 .byte 0x00, 0x40, 0x0C, 0x00, 0x00, 0x80, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0xC0, 0x06, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x40, 0x0C, 0x00, 0x00, 0x80, 0x04, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 - - .section .sinit - .word MOD38_02254840 diff --git a/arm9/modules/38/src/module_38_sinit.c b/arm9/modules/38/src/module_38_sinit.c new file mode 100644 index 00000000..6c41dda8 --- /dev/null +++ b/arm9/modules/38/src/module_38_sinit.c @@ -0,0 +1,13 @@ +#include "global.h" + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD38_02254854(); +extern void MOD38_02254990(); + +THUMB_FUNC static void MOD38_02254840(void) +{ + Poketch_InitApp(MOD38_02254854, MOD38_02254990); +} + +#define NitroStaticInit MOD38_02254840 +#include "sinit.h" |