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 /src/main.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 4c71ed1f9..d069ab3bc 100644 --- a/src/main.c +++ b/src/main.c @@ -69,7 +69,7 @@ bool8 gSoftResetDisabled; IntrFunc gIntrTable[INTR_COUNT]; u8 gLinkVSyncDisabled; u32 IntrMain_Buffer[0x200]; -u8 gPcmDmaCounter; +s8 gPcmDmaCounter; static EWRAM_DATA u16 gTrainerId = 0; |