diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-08 11:55:16 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-08 11:55:16 -0400 |
| commit | 782eca721768b17d51d79e36b519e95d8d9e5b9b (patch) | |
| tree | 7ab6dcdcffbb9e4c02ae8b8dc5ce9df7a9113d78 /arm9/lib/src/OS_reset.c | |
| parent | d3bd9a77bb8ca065d295911aca7fbd2da4a846f5 (diff) | |
| parent | f76cec09f8a2995244256d4b097d9eed2bebd34a (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into libfs
Diffstat (limited to 'arm9/lib/src/OS_reset.c')
| -rw-r--r-- | arm9/lib/src/OS_reset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c index 774b392b..c21d20ab 100644 --- a/arm9/lib/src/OS_reset.c +++ b/arm9/lib/src/OS_reset.c @@ -5,19 +5,19 @@ #include "function_target.h" #include "OS_reset.h" #include "MB_mb.h" +#include "OS_terminate_proc.h" extern u16 OSi_IsInitReset; extern vu16 OSi_IsResetOccurred; extern void PXI_Init(); extern u32 PXI_IsCallbackReady(u32 param1, u32 param2); extern void PXI_SetFifoRecvCallback(u32 param1, void* callback); -extern void OS_Terminate(); extern u32 PXI_SendWordByFifo(u32 param1, u32 data, u32 param2); extern void CARD_LockRom(u16 lockId); extern void MI_StopDma(u32 dma); extern void OS_SetIrqMask(u32 mask); extern void OS_ResetRequestIrqMask(u32 mask); -extern void OSi_DoResetSystem(); +extern void OSi_DoResetSystem(); //in itcm, should technically be in this file ARM_FUNC void OS_InitReset() { if (OSi_IsInitReset) { |