diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-13 15:49:46 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-13 15:49:46 -0400 |
commit | b4a380c571a3eaf79392dd1b632087fb5107f04f (patch) | |
tree | 3662afd6c1c3cfadb0759b5042c55f849b81c28f /arm7/lib/src/OS_reset.c | |
parent | 01eea396ed25500e15752d7edfe76cb1031bee60 (diff) | |
parent | 1406a7a34713f0305160583b056721a5dd525df7 (diff) |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm7/lib/src/OS_reset.c')
-rw-r--r-- | arm7/lib/src/OS_reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arm7/lib/src/OS_reset.c b/arm7/lib/src/OS_reset.c index c40fcff3..e0f380f8 100644 --- a/arm7/lib/src/OS_reset.c +++ b/arm7/lib/src/OS_reset.c @@ -1,6 +1,7 @@ #include "function_target.h" #include "OS_reset.h" #include "OS_interrupt.h" +#include "OS_terminate_proc.h" static u16 OSi_IsInitReset = 0; vu16 OSi_IsResetOccurred = 0; @@ -10,7 +11,6 @@ extern OSIrqMask OS_SetIrqMask(OSIrqMask mask); extern OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask); extern void SND_Shutdown(void); extern void PXI_SetFifoRecvCallback(u32 param1, void* callback); -extern void OS_Terminate(void); extern u32 PXI_SendWordByFifo(u32 param1, u32 data, u32 param2); extern void FUN_038073EC(void); //OSi_DoResetSystem, in wram |