diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /include/main.h | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/main.h')
| -rw-r--r-- | include/main.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/main.h b/include/main.h index 3de34de13..0d441035d 100644 --- a/include/main.h +++ b/include/main.h @@ -1,8 +1,6 @@ #ifndef GUARD_MAIN_H #define GUARD_MAIN_H -#include "global.h" - typedef void (*MainCallback)(void); typedef void (*IntrCallback)(void); typedef void (*IntrFunc)(void); @@ -53,7 +51,7 @@ extern bool8 gSoftResetDisabled; extern IntrFunc gIntrTable[]; extern u8 gLinkVSyncDisabled; extern u32 IntrMain_Buffer[]; -extern u8 gPcmDmaCounter; +extern s8 gPcmDmaCounter; void AgbMain(void); void SetMainCallback2(MainCallback callback); |