diff --git a/include/sprite_data.h b/include/sprite_data.h index 6694cc9..297018d 100644 --- a/include/sprite_data.h +++ b/include/sprite_data.h @@ -97,16 +97,17 @@ extern OBJ_ATTR *grabbed_front_sprite; #define TYPES_PAL1 3 #define TYPES_PAL2 4 #define GB_CART_PAL 5 -#define FLAG_PAL 6 -#define MENU_PAL_RED 7 -#define MENU_PAL_BLU 8 -#define MENU_PAL_GRN 9 -#define MENU_PAL_BRN 10 -#define MENU_PAL_PNK 11 +#define GB_FLAG_PAL 6 +#define GBA_FLAG_PAL 7 +#define MENU_PAL_RED 8 +#define MENU_PAL_BLU 9 +#define MENU_PAL_GRN 10 +#define MENU_PAL_BRN 11 +#define MENU_PAL_PNK 12 #define MENU_PAL_START MENU_PAL_RED -#define GBA_CART_PAL 12 -#define LINK_CABLE_PAL 13 -#define PULLED_SPRITE_PAL 14 +#define GBA_CART_PAL 13 +#define LINK_CABLE_PAL 14 +#define PULLED_SPRITE_PAL 15 enum FlexBackground { diff --git a/source/sprite_data.cpp b/source/sprite_data.cpp index 27e1951..4b57ea1 100644 --- a/source/sprite_data.cpp +++ b/source/sprite_data.cpp @@ -871,9 +871,9 @@ void load_select_sprites(GameBoyROM currROM) break; } - load_sprite_compressed(gb_flag, gb_flag_tiles, curr_tile_id, FLAG_PAL, ATTR0_WIDE, ATTR1_SIZE_32x64, 1); - load_sprite_compressed(gba_flag, gb_flag_tiles, curr_tile_id, FLAG_PAL, ATTR0_WIDE, ATTR1_SIZE_32x64, 1); - tonccpy(pal_obj_mem + (FLAG_PAL * 16), gb_flag_palette, 16); // Grit is being stupid. + load_sprite_compressed(gb_flag, gb_flag_tiles, curr_tile_id, GB_FLAG_PAL, ATTR0_WIDE, ATTR1_SIZE_32x64, 1); + load_sprite_compressed(gba_flag, gb_flag_tiles, curr_tile_id, GBA_FLAG_PAL, ATTR0_WIDE, ATTR1_SIZE_32x64, 1); + tonccpy(pal_obj_mem + (GB_FLAG_PAL * 16), gb_flag_palette, 16); // Grit is being stupid. const unsigned int *gba_cart_tiles = 0; const unsigned short *gba_cart_palette = 0; @@ -945,9 +945,9 @@ void load_select_sprites(GameBoyROM currROM) break; } - load_sprite_compressed(gba_flag, gba_flag_tiles, curr_tile_id, FLAG_PAL, ATTR0_WIDE, ATTR1_SIZE_32x64, 1); - load_sprite_compressed(gba_flag, gba_flag_tiles, curr_tile_id, FLAG_PAL, ATTR0_WIDE, ATTR1_SIZE_32x64, 1); - tonccpy(pal_obj_mem + (FLAG_PAL * 16), gba_flag_palette, 16); // Grit is being stupid. + load_sprite_compressed(gba_flag, gba_flag_tiles, curr_tile_id, GBA_FLAG_PAL, ATTR0_WIDE, ATTR1_SIZE_32x64, 1); + load_sprite_compressed(gba_flag, gba_flag_tiles, curr_tile_id, GBA_FLAG_PAL, ATTR0_WIDE, ATTR1_SIZE_32x64, 1); + tonccpy(pal_obj_mem + (GBA_FLAG_PAL * 16), gba_flag_palette, 16); // Grit is being stupid. } // tile ID, VH Flip, Palette Bank