diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-19 20:21:53 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-19 21:57:29 -0500 |
| commit | 4c12ad00d21b43d0946b2a0ba3ee471af9262673 (patch) | |
| tree | 3a133ce12022949fc3ea8a7147c0d3c72a97e0b6 /include/gba | |
| parent | ea8b1011d30c3f70f1da79553d8ed887b12596f2 (diff) | |
| parent | a40f05490040350b8973728fdebe5a48360d4fac (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'include/gba')
| -rw-r--r-- | include/gba/io_reg.h | 2 | ||||
| -rw-r--r-- | include/gba/syscall.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index df79b084d..071a89bc5 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -461,7 +461,7 @@ #define REG_DMA3CNT_L (*(vu16 *)REG_ADDR_DMA3CNT_L) #define REG_DMA3CNT_H (*(vu16 *)REG_ADDR_DMA3CNT_H) -#define REG_TMCNT(n) (*(vu16 *)(REG_ADDR_TMCNT + ((n) * 4))) +#define REG_TMCNT(n) (*(vu32 *)(REG_ADDR_TMCNT + ((n) * 4))) #define REG_TMCNT_L(n) (*(vu16 *)(REG_ADDR_TMCNT_L + ((n) * 4))) #define REG_TMCNT_H(n) (*(vu16 *)(REG_ADDR_TMCNT_H + ((n) * 4))) #define REG_TM0CNT (*(vu32 *)REG_ADDR_TM0CNT) diff --git a/include/gba/syscall.h b/include/gba/syscall.h index f3382b874..56cd4ba58 100644 --- a/include/gba/syscall.h +++ b/include/gba/syscall.h @@ -45,4 +45,6 @@ void RLUnCompVram(const void *src, void *dest); int MultiBoot(struct MultiBootParam *mp); +s32 Div(s32 num, s32 denom); + #endif // GUARD_GBA_SYSCALL_H |