From d945a8bf2fc1fb61cf8f2c3e572fe378ba45bdae Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Fri, 7 Sep 2018 19:24:33 -0500 Subject: Macroize main_menu and general cleanup --- include/gba/io_reg.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/gba') diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 9327d6cb0..03faa1a87 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -574,8 +574,6 @@ #define WINOUT_WINOBJ_OBJ (1 << 12) #define WINOUT_WINOBJ_CLR (1 << 13) -#define WINHV_COORDS(m, n) (((m) << 8) | (n)) - // BLDCNT // Bits 0-5 select layers for the 1st target #define BLDCNT_TGT1_BG0 (1 << 0) -- cgit v1.2.3 From d50554bb8e90d314ae0131e925224406992a4c97 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 22 Sep 2018 15:02:49 -0500 Subject: Use macros and defines in tileset_anims --- include/gba/defines.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/gba') 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)) -- cgit v1.2.3 From e93f1182e6b11ee277943808a68c534173f36b60 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 22 Sep 2018 16:42:34 -0400 Subject: Rename voicegroups --- include/gba/m4a_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/gba') 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[]; -- cgit v1.2.3