diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-29 09:22:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-29 09:22:02 -0400 |
| commit | 0cb8e5bbaec817507ccfca6a79f7976e7975d6cf (patch) | |
| tree | f3681b02d8cf1518fd3001a863217e273955a8df | |
| parent | 157607413404080ce48939fdcff371961e983381 (diff) | |
| parent | 03100d9a6c0da43f02e3b1f3d3e062ecf884d8b4 (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
| -rw-r--r-- | arm9/lib/include/OS_system.h | 2 | ||||
| -rw-r--r-- | arm9/lib/src/OS_system.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arm9/lib/include/OS_system.h b/arm9/lib/include/OS_system.h index 6e156f9d..c2b8572a 100644 --- a/arm9/lib/include/OS_system.h +++ b/arm9/lib/include/OS_system.h @@ -33,7 +33,7 @@ OSIntrMode OS_DisableInterrupts_IrqAndFiq(void); OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state); OSIntrMode OS_GetCpsrIrq(void); OSProcMode OS_GetProcMode(void); -void OS_SpinWait(void); +void OS_SpinWait(u32 cycles); void OS_WaitVBlankIntr(void); #endif //POKEDIAMOND_OS_SYSTEM_H diff --git a/arm9/lib/src/OS_system.c b/arm9/lib/src/OS_system.c index b703fc38..de6b187a 100644 --- a/arm9/lib/src/OS_system.c +++ b/arm9/lib/src/OS_system.c @@ -60,7 +60,7 @@ ARM_FUNC asm OSProcMode OS_GetProcMode(void) { bx lr } -ARM_FUNC asm void OS_SpinWait(void) { +ARM_FUNC asm void OS_SpinWait(u32 cycles) { subs r0, r0, #0x4 bhs OS_SpinWait bx lr |