summaryrefslogtreecommitdiff
path: root/include/gba/defines.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-10-13 10:22:58 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-10-13 10:22:58 -0500
commitb24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (patch)
tree7b51d7b9cb9a370fe1dd9db8eeadc23089ba1328 /include/gba/defines.h
parentfa9d1759bd7fa17ced37225bd31d46466da857c6 (diff)
parenta2a6700966cc802185577e44ba88a9154429c93b (diff)
Merge remote-tracking branch 'upstream/master' into shop
# Conflicts: # asm/shop.s
Diffstat (limited to 'include/gba/defines.h')
-rw-r--r--include/gba/defines.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/gba/defines.h b/include/gba/defines.h
index 1eed6303d..16f1315d0 100644
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -61,6 +61,9 @@
#define TILE_SIZE_4BPP 32
#define TILE_SIZE_8BPP 64
+#define TILE_OFFSET_4BPP(n) ((n) * TILE_SIZE_4BPP)
+#define TILE_OFFSET_8BPP(n) ((n) * TILE_SIZE_8BPP)
+
#define TOTAL_OBJ_TILE_COUNT 1024
#define WIN_RANGE(a, b) (((a) << 8) | (b))