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/48 | |
| 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/48')
| -rw-r--r-- | arm9/modules/48/asm/module_48.s | 15 | ||||
| -rw-r--r-- | arm9/modules/48/src/module_48_sinit.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s index 32b5d3c8..ed66d753 100644 --- a/arm9/modules/48/asm/module_48.s +++ b/arm9/modules/48/asm/module_48.s @@ -3,18 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD48_02254840 -MOD48_02254840: ; 0x02254840 - ldr r3, _02254848 ; =Poketch_InitApp - ldr r0, _0225484C ; =MOD48_02254854 - ldr r1, _02254850 ; =MOD48_0225498C - bx r3 - .align 2, 0 -_02254848: .word Poketch_InitApp -_0225484C: .word MOD48_02254854 -_02254850: .word MOD48_0225498C - thumb_func_end MOD48_02254840 - thumb_func_start MOD48_02254854 MOD48_02254854: ; 0x02254854 push {r3, r4, r5, r6, r7, lr} @@ -996,6 +984,3 @@ MOD48_02254FD0: ; 0x02254FD0 .byte 0x00, 0x40, 0x02, 0x00, 0x00, 0x80, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0xC0, 0x02, 0x00, 0x00, 0x80, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x40, 0x03, 0x00, 0x00, 0x80, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00 - - .section .sinit - .word MOD48_02254840 diff --git a/arm9/modules/48/src/module_48_sinit.c b/arm9/modules/48/src/module_48_sinit.c new file mode 100644 index 00000000..6d2a342d --- /dev/null +++ b/arm9/modules/48/src/module_48_sinit.c @@ -0,0 +1,13 @@ +#include "global.h" + +extern void Poketch_InitApp(void *func1, void *func2); +extern void MOD48_02254854(); +extern void MOD48_0225498C(); + +THUMB_FUNC static void MOD48_02254840(void) +{ + Poketch_InitApp(MOD48_02254854, MOD48_0225498C); +} + +#define NitroStaticInit MOD48_02254840 +#include "sinit.h" |