summaryrefslogtreecommitdiff
path: root/include/gba
diff options
context:
space:
mode:
Diffstat (limited to 'include/gba')
-rw-r--r--include/gba/defines.h3
-rw-r--r--include/gba/m4a_internal.h2
2 files changed, 4 insertions, 1 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))
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h
index 659302fd5..339a0774e 100644
--- a/include/gba/m4a_internal.h
+++ b/include/gba/m4a_internal.h
@@ -368,7 +368,7 @@ extern const u8 gNoiseTable[];
extern const struct PokemonCrySong gPokemonCrySongTemplate;
-extern const struct ToneData voicegroup_pokemon_cry;
+extern const struct ToneData voicegroup000;
extern char gNumMusicPlayers[];
extern char gMaxLines[];