diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-05 13:28:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-05 13:28:02 -0400 |
| commit | 60c9307cae1c4e5ca18c90181fe0a227db95562a (patch) | |
| tree | 48852e434188ddd2d2954bcde7ae59a50ef2da8e /arm9/lib | |
| parent | 6c31958c9daa124877b31cf8456a890d3c736bc1 (diff) | |
| parent | 9595aa2bee8b1c87342cf20cff10c2675aa1006f (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib')
| -rw-r--r-- | arm9/lib/include/OS_init.h | 10 | ||||
| -rw-r--r-- | arm9/lib/include/OS_system.h | 10 | ||||
| -rw-r--r-- | arm9/lib/include/types.h | 6 |
3 files changed, 9 insertions, 17 deletions
diff --git a/arm9/lib/include/OS_init.h b/arm9/lib/include/OS_init.h index 88c696cd..6792c900 100644 --- a/arm9/lib/include/OS_init.h +++ b/arm9/lib/include/OS_init.h @@ -1,9 +1,5 @@ -// -// Created by mart on 4/12/20. -// - -#ifndef POKEDIAMOND_OS_INIT_H -#define POKEDIAMOND_OS_INIT_H +#ifndef POKEDIAMOND_ARM9_OS_INIT_H +#define POKEDIAMOND_ARM9_OS_INIT_H #include "types.h" #include "consts.h" @@ -29,4 +25,4 @@ void OS_Init(void); -#endif //POKEDIAMOND_OS_INIT_H +#endif //POKEDIAMOND_ARM9_OS_INIT_H diff --git a/arm9/lib/include/OS_system.h b/arm9/lib/include/OS_system.h index c2b8572a..a5426c17 100644 --- a/arm9/lib/include/OS_system.h +++ b/arm9/lib/include/OS_system.h @@ -1,9 +1,5 @@ -// -// Created by mart on 4/23/20. -// - -#ifndef POKEDIAMOND_OS_SYSTEM_H -#define POKEDIAMOND_OS_SYSTEM_H +#ifndef POKEDIAMOND_ARM9_OS_SYSTEM_H +#define POKEDIAMOND_ARM9_OS_SYSTEM_H #include "function_target.h" #include "consts.h" @@ -36,4 +32,4 @@ OSProcMode OS_GetProcMode(void); void OS_SpinWait(u32 cycles); void OS_WaitVBlankIntr(void); -#endif //POKEDIAMOND_OS_SYSTEM_H +#endif //POKEDIAMOND_ARM9_OS_SYSTEM_H diff --git a/arm9/lib/include/types.h b/arm9/lib/include/types.h index 40f8207d..ca11e244 100644 --- a/arm9/lib/include/types.h +++ b/arm9/lib/include/types.h @@ -1,5 +1,5 @@ -#ifndef POKEDIAMOND_NITRO_TYPES_H -#define POKEDIAMOND_NITRO_TYPES_H +#ifndef POKEDIAMOND_ARM9_TYPES_H +#define POKEDIAMOND_ARM9_TYPES_H typedef unsigned char u8; typedef unsigned short int u16; @@ -47,4 +47,4 @@ typedef int BOOL; #endif // __cplusplus #endif -#endif //POKEDIAMOND_NITRO_TYPES_H +#endif //POKEDIAMOND_ARM9_TYPES_H |