Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-10-01 12:56:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work

Browse Source
This commit is contained in:
PikalaxALT
2020-05-29 09:22:02 -04:00
parent 1576074134 03100d9a6c
commit 0cb8e5bbae
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arm9/lib/include/OS_system.h
View File

@@ -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

2
arm9/lib/src/OS_system.c
View File

@@ -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