diff --git a/Makefile b/Makefile index 6f7350d1ec..fd7ade0f21 100644 --- a/Makefile +++ b/Makefile @@ -562,7 +562,7 @@ $(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.c @echo "$(CC1) -o $@ $<" @$(shell mkdir -p $(shell dirname '$(C_BUILDDIR)/$*.i')) @$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i - @$(PREPROC) $(C_BUILDDIR)/$*.i | $(CC1) $(PROLOGUE_FIX) $(CC1FLAGS) -o $(C_BUILDDIR)/$*.s - + @$(PREPROC) $(C_BUILDDIR)/$*.i $(PLATFORM) "" | $(CC1) $(PROLOGUE_FIX) $(CC1FLAGS) -o $(C_BUILDDIR)/$*.s - ifeq ($(PLATFORM), gba) @printf ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s endif @@ -594,7 +594,7 @@ $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s @echo "$(AS) -o $@ $<" - @$(PREPROC) $< "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - # Scan the ASM data dependencies to determine if any .inc files have changed $(DATA_ASM_BUILDDIR)/%.d: $(DATA_ASM_SUBDIR)/%.s @@ -608,7 +608,7 @@ endif $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s @echo "$(AS) -o $@ $<" - @$(PREPROC) $< "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - ### SUB-PROGRAMS ### diff --git a/chao_garden/Makefile b/chao_garden/Makefile index ca0f3455ad..6c7fc17671 100644 --- a/chao_garden/Makefile +++ b/chao_garden/Makefile @@ -177,7 +177,7 @@ endif $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep) @echo "$(CC1) -o $@ $<" @$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i - @$(PREPROC) $(C_BUILDDIR)/$*.i | $(CC1) $(CC1FLAGS) -o $(C_BUILDDIR)/$*.s + @$(PREPROC) $(C_BUILDDIR)/$*.i $(PLATFORM) "" | $(CC1) $(CC1FLAGS) -o $(C_BUILDDIR)/$*.s @printf ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s @$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s @@ -200,7 +200,7 @@ endif $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) @echo "$(AS) -o $@ $<" - @$(PREPROC) $< | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s @echo "$(AS) -I sound -o $@ $<" diff --git a/chao_garden/config.mk b/chao_garden/config.mk index 74593ae0e4..0290e9f15f 100644 --- a/chao_garden/config.mk +++ b/chao_garden/config.mk @@ -1,6 +1,7 @@ ### Build Configuration ### # Default variables +PLATFORM ?= gba GAME_REVISION ?= 0 GAME_REGION ?= USA DEBUG ?= 0 diff --git a/chao_garden/include/global.h b/chao_garden/include/global.h index 26a6d7be89..a2690ffd58 100644 --- a/chao_garden/include/global.h +++ b/chao_garden/include/global.h @@ -73,10 +73,6 @@ // Converts a Q24.8 fixed-point format number to a regular integer #define Q_24_8_TO_INT(n) ((int)((n) >> 8)) -#define RED_VALUE(color) ((color)&0x1F) -#define GREEN_VALUE(color) (((color) >> 5) & 0x1F) -#define BLUE_VALUE(color) (((color) >> 10) & 0x1F) - #define ABS(aValue) ((aValue) >= 0 ? (aValue) : -(aValue)) #define RECT_DISTANCE(aXA, aYA, aXB, aYB) (ABS((aXA) - (aXB)) + ABS((aYA) - (aYB))) diff --git a/chao_garden/songs.mk b/chao_garden/songs.mk index 151cbe3f1b..ba938b20fe 100644 --- a/chao_garden/songs.mk +++ b/chao_garden/songs.mk @@ -2,7 +2,7 @@ STD_REVERB = 0 $(MID_BUILDDIR)/%.o: $(MID_SUBDIR)/%.s @echo "$(AS) -I sound -o $@ $<" - @$(PREPROC) $< "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ $(MID_SUBDIR)/mus_garden.s: %.s: %.mid $(MID2AGB) $< $@ -E -R$(STD_REVERB) -G0 -V100 diff --git a/data/maps/zone_1/act_1/tilemaps/bg/header.c b/data/maps/zone_1/act_1/tilemaps/bg/header.c index 7fae62e345..fada46cda3 100644 --- a/data/maps/zone_1/act_1/tilemaps/bg/header.c +++ b/data/maps/zone_1/act_1/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_1_act_1_bg[] = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_1_act_1_bg[] = INCPAL("data/maps/zone_1/act_1/tilemaps/bg/palette.pal"); const u8 Tiles_zone_1_act_1_bg[] = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_1_act_1_bg[] = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_1_act_1_bg = { .tilesSize = sizeof(Tiles_zone_1_act_1_bg), .palette = Palette_zone_1_act_1_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_1_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_1_bg), .map = Tilemap_zone_1_act_1_bg, }; diff --git a/data/maps/zone_1/act_1/tilemaps/fg/header.c b/data/maps/zone_1/act_1/tilemaps/fg/header.c index 82e06e703d..5662dd7500 100644 --- a/data/maps/zone_1/act_1/tilemaps/fg/header.c +++ b/data/maps/zone_1/act_1/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_1_act_1_fg[] = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_1_act_1_fg[] = INCPAL("data/maps/zone_1/act_1/tilemaps/fg/palette.pal"); const u8 Tileset_zone_1_act_1_fg[] = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_1_act_1_fg[] = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_1_act_1_fg[] = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/fg/tile_rot.coll"); @@ -24,7 +24,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_1_fg0 = .tilesSize = sizeof(Tileset_zone_1_act_1_fg), .palette = Palette_zone_1_act_1_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_1_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_1_fg), .map = Metatiles_zone_1_act_1_fg, }, .metatileMap = Map_zone_1_act_1_fg0, @@ -44,7 +44,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_1_fg1 = .tilesSize = sizeof(Tileset_zone_1_act_1_fg), .palette = Palette_zone_1_act_1_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_1_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_1_fg), .map = Metatiles_zone_1_act_1_fg, }, .metatileMap = Map_zone_1_act_1_fg1, diff --git a/data/maps/zone_1/act_2/tilemaps/bg/header.c b/data/maps/zone_1/act_2/tilemaps/bg/header.c index 01e7aff655..d6d75d12ce 100644 --- a/data/maps/zone_1/act_2/tilemaps/bg/header.c +++ b/data/maps/zone_1/act_2/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_1_act_2_bg[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_1_act_2_bg[] = INCPAL("data/maps/zone_1/act_2/tilemaps/bg/palette.pal"); const u8 Tiles_zone_1_act_2_bg[] = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_1_act_2_bg[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_1_act_2_bg = { .tilesSize = sizeof(Tiles_zone_1_act_2_bg), .palette = Palette_zone_1_act_2_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_2_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_2_bg), .map = Tilemap_zone_1_act_2_bg, }; diff --git a/data/maps/zone_1/act_2/tilemaps/fg/header.c b/data/maps/zone_1/act_2/tilemaps/fg/header.c index e8aea65cfa..7377f2fad2 100644 --- a/data/maps/zone_1/act_2/tilemaps/fg/header.c +++ b/data/maps/zone_1/act_2/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_1_act_2_fg[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_1_act_2_fg[] = INCPAL("data/maps/zone_1/act_2/tilemaps/fg/palette.pal"); const u8 Tileset_zone_1_act_2_fg[] = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_1_act_2_fg[] = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_1_act_2_fg[] = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_1_act_2_fg[] = INCBIN_U16("data/maps/zone_1/act_2/tilem const u16 Metatiles_zone_1_act_2_fg[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_1_act_2_fg0[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/map_front.bin"); - const u16 Map_zone_1_act_2_fg1[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_2_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_2_fg0 = .tilesSize = sizeof(Tileset_zone_1_act_2_fg), .palette = Palette_zone_1_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_2_fg), .map = Metatiles_zone_1_act_2_fg, }, .metatileMap = Map_zone_1_act_2_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_2_fg1 = .tilesSize = sizeof(Tileset_zone_1_act_2_fg), .palette = Palette_zone_1_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_2_fg), .map = Metatiles_zone_1_act_2_fg, }, .metatileMap = Map_zone_1_act_2_fg1, diff --git a/data/maps/zone_1/act_boss/tilemaps/bg/header.c b/data/maps/zone_1/act_boss/tilemaps/bg/header.c index af2c255cc7..7c635bce07 100644 --- a/data/maps/zone_1/act_boss/tilemaps/bg/header.c +++ b/data/maps/zone_1/act_boss/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_1_act_boss_bg[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_1_act_boss_bg[] = INCPAL("data/maps/zone_1/act_boss/tilemaps/bg/palette.pal"); const u8 Tiles_zone_1_act_boss_bg[] = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_1_act_boss_bg[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_1_act_boss_bg = { .tilesSize = sizeof(Tiles_zone_1_act_boss_bg), .palette = Palette_zone_1_act_boss_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_boss_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_boss_bg), .map = Tilemap_zone_1_act_boss_bg, }; diff --git a/data/maps/zone_1/act_boss/tilemaps/fg/header.c b/data/maps/zone_1/act_boss/tilemaps/fg/header.c index c566ef09b3..e9c0d4032a 100644 --- a/data/maps/zone_1/act_boss/tilemaps/fg/header.c +++ b/data/maps/zone_1/act_boss/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_1_act_boss_fg[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_1_act_boss_fg[] = INCPAL("data/maps/zone_1/act_boss/tilemaps/fg/palette.pal"); const u8 Tileset_zone_1_act_boss_fg[] = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_1_act_boss_fg[] = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_1_act_boss_fg[] = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_1_act_boss_fg[] = INCBIN_U16("data/maps/zone_1/act_boss const u16 Metatiles_zone_1_act_boss_fg[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_1_act_boss_fg0[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/map_front.bin"); - const u16 Map_zone_1_act_boss_fg1[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_boss_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_boss_fg0 = .tilesSize = sizeof(Tileset_zone_1_act_boss_fg), .palette = Palette_zone_1_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_boss_fg), .map = Metatiles_zone_1_act_boss_fg, }, .metatileMap = Map_zone_1_act_boss_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_boss_fg1 = .tilesSize = sizeof(Tileset_zone_1_act_boss_fg), .palette = Palette_zone_1_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_boss_fg), .map = Metatiles_zone_1_act_boss_fg, }, .metatileMap = Map_zone_1_act_boss_fg1, diff --git a/data/maps/zone_1/act_dummy/tilemaps/bg/header.c b/data/maps/zone_1/act_dummy/tilemaps/bg/header.c index e23010813f..c3face63f2 100644 --- a/data/maps/zone_1/act_dummy/tilemaps/bg/header.c +++ b/data/maps/zone_1/act_dummy/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_1_act_dummy_bg[] = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_1_act_dummy_bg[] = INCPAL("data/maps/zone_1/act_dummy/tilemaps/bg/palette.pal"); const u8 Tiles_zone_1_act_dummy_bg[] = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_1_act_dummy_bg[] = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_1_act_dummy_bg = { .tilesSize = sizeof(Tiles_zone_1_act_dummy_bg), .palette = Palette_zone_1_act_dummy_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_dummy_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_dummy_bg), .map = Tilemap_zone_1_act_dummy_bg, }; diff --git a/data/maps/zone_1/act_dummy/tilemaps/fg/header.c b/data/maps/zone_1/act_dummy/tilemaps/fg/header.c index 4df43d1c6c..699355784f 100644 --- a/data/maps/zone_1/act_dummy/tilemaps/fg/header.c +++ b/data/maps/zone_1/act_dummy/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_1_act_dummy_fg[] = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_1_act_dummy_fg[] = INCPAL("data/maps/zone_1/act_dummy/tilemaps/fg/palette.pal"); const u8 Tileset_zone_1_act_dummy_fg[] = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_1_act_dummy_fg[] = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_1_act_dummy_fg[] = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/fg/tile_rot.coll"); @@ -24,7 +24,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_dummy_fg0 = .tilesSize = sizeof(Tileset_zone_1_act_dummy_fg), .palette = Palette_zone_1_act_dummy_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_dummy_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_dummy_fg), .map = Metatiles_zone_1_act_dummy_fg, }, .metatileMap = Map_zone_1_act_dummy_fg0, @@ -44,7 +44,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_dummy_fg1 = .tilesSize = sizeof(Tileset_zone_1_act_dummy_fg), .palette = Palette_zone_1_act_dummy_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_1_act_dummy_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_1_act_dummy_fg), .map = Metatiles_zone_1_act_dummy_fg, }, .metatileMap = Map_zone_1_act_dummy_fg1, diff --git a/data/maps/zone_2/act_1/tilemaps/bg/header.c b/data/maps/zone_2/act_1/tilemaps/bg/header.c index 08b3ee20be..2e56cdc14d 100644 --- a/data/maps/zone_2/act_1/tilemaps/bg/header.c +++ b/data/maps/zone_2/act_1/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_2_act_1_bg[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_2_act_1_bg[] = INCPAL("data/maps/zone_2/act_1/tilemaps/bg/palette.pal"); const u8 Tiles_zone_2_act_1_bg[] = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_2_act_1_bg[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_2_act_1_bg = { .tilesSize = sizeof(Tiles_zone_2_act_1_bg), .palette = Palette_zone_2_act_1_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_2_act_1_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_2_act_1_bg), .map = Tilemap_zone_2_act_1_bg, }; diff --git a/data/maps/zone_2/act_1/tilemaps/fg/header.c b/data/maps/zone_2/act_1/tilemaps/fg/header.c index 07f27826bd..6a326587c8 100644 --- a/data/maps/zone_2/act_1/tilemaps/fg/header.c +++ b/data/maps/zone_2/act_1/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_2_act_1_fg[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_2_act_1_fg[] = INCPAL("data/maps/zone_2/act_1/tilemaps/fg/palette.pal"); const u8 Tileset_zone_2_act_1_fg[] = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_2_act_1_fg[] = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_2_act_1_fg[] = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_2_act_1_fg[] = INCBIN_U16("data/maps/zone_2/act_1/tilem const u16 Metatiles_zone_2_act_1_fg[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_2_act_1_fg0[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/map_front.bin"); - const u16 Map_zone_2_act_1_fg1[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_1_fg0 = diff --git a/data/maps/zone_2/act_2/tilemaps/bg/header.c b/data/maps/zone_2/act_2/tilemaps/bg/header.c index 026a11e577..7a5e609cc6 100644 --- a/data/maps/zone_2/act_2/tilemaps/bg/header.c +++ b/data/maps/zone_2/act_2/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_2_act_2_bg[] = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_2_act_2_bg[] = INCPAL("data/maps/zone_2/act_2/tilemaps/bg/palette.pal"); const u8 Tiles_zone_2_act_2_bg[] = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_2_act_2_bg[] = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_2_act_2_bg = { .tilesSize = sizeof(Tiles_zone_2_act_2_bg), .palette = Palette_zone_2_act_2_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_2_act_2_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_2_act_2_bg), .map = Tilemap_zone_2_act_2_bg, }; diff --git a/data/maps/zone_2/act_2/tilemaps/fg/header.c b/data/maps/zone_2/act_2/tilemaps/fg/header.c index d4e09ea3e0..e0d68aeeae 100644 --- a/data/maps/zone_2/act_2/tilemaps/fg/header.c +++ b/data/maps/zone_2/act_2/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_2_act_2_fg[] = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_2_act_2_fg[] = INCPAL("data/maps/zone_2/act_2/tilemaps/fg/palette.pal"); const u8 Tileset_zone_2_act_2_fg[] = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_2_act_2_fg[] = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_2_act_2_fg[] = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/fg/tile_rot.coll"); diff --git a/data/maps/zone_2/act_boss/tilemaps/bg/header.c b/data/maps/zone_2/act_boss/tilemaps/bg/header.c index efa579d1e8..bb0924b833 100644 --- a/data/maps/zone_2/act_boss/tilemaps/bg/header.c +++ b/data/maps/zone_2/act_boss/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_2_act_boss_bg[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_2_act_boss_bg[] = INCPAL("data/maps/zone_2/act_boss/tilemaps/bg/palette.pal"); const u8 Tiles_zone_2_act_boss_bg[] = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_2_act_boss_bg[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_2_act_boss_bg = { .tilesSize = sizeof(Tiles_zone_2_act_boss_bg), .palette = Palette_zone_2_act_boss_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_2_act_boss_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_2_act_boss_bg), .map = Tilemap_zone_2_act_boss_bg, }; diff --git a/data/maps/zone_2/act_boss/tilemaps/fg/header.c b/data/maps/zone_2/act_boss/tilemaps/fg/header.c index 1fe49e5b4a..910d7916dc 100644 --- a/data/maps/zone_2/act_boss/tilemaps/fg/header.c +++ b/data/maps/zone_2/act_boss/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_2_act_boss_fg[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_2_act_boss_fg[] = INCPAL("data/maps/zone_2/act_boss/tilemaps/fg/palette.pal"); const u8 Tileset_zone_2_act_boss_fg[] = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_2_act_boss_fg[] = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_2_act_boss_fg[] = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_2_act_boss_fg[] = INCBIN_U16("data/maps/zone_2/act_boss const u16 Metatiles_zone_2_act_boss_fg[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_2_act_boss_fg0[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/map_front.bin"); - const u16 Map_zone_2_act_boss_fg1[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_boss_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_boss_fg0 = .tilesSize = sizeof(Tileset_zone_2_act_boss_fg), .palette = Palette_zone_2_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_2_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_2_act_boss_fg), .map = Metatiles_zone_2_act_boss_fg, }, .metatileMap = Map_zone_2_act_boss_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_boss_fg1 = .tilesSize = sizeof(Tileset_zone_2_act_boss_fg), .palette = Palette_zone_2_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_2_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_2_act_boss_fg), .map = Metatiles_zone_2_act_boss_fg, }, .metatileMap = Map_zone_2_act_boss_fg1, diff --git a/data/maps/zone_3/act_1/tilemaps/bg/header.c b/data/maps/zone_3/act_1/tilemaps/bg/header.c index 186c56a07b..fb1a00a4f4 100644 --- a/data/maps/zone_3/act_1/tilemaps/bg/header.c +++ b/data/maps/zone_3/act_1/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_3_act_1_bg[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_3_act_1_bg[] = INCPAL("data/maps/zone_3/act_1/tilemaps/bg/palette.pal"); const u8 Tiles_zone_3_act_1_bg[] = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_3_act_1_bg[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_3_act_1_bg = { .tilesSize = sizeof(Tiles_zone_3_act_1_bg), .palette = Palette_zone_3_act_1_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_3_act_1_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_3_act_1_bg), .map = Tilemap_zone_3_act_1_bg, }; diff --git a/data/maps/zone_3/act_1/tilemaps/fg/header.c b/data/maps/zone_3/act_1/tilemaps/fg/header.c index aa217896be..c8af2ec079 100644 --- a/data/maps/zone_3/act_1/tilemaps/fg/header.c +++ b/data/maps/zone_3/act_1/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_3_act_1_fg[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_3_act_1_fg[] = INCPAL("data/maps/zone_3/act_1/tilemaps/fg/palette.pal"); const u8 Tileset_zone_3_act_1_fg[] = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/fg/tileset.4bpp"); const u8 Tileset_AnimTiles_zone_3_act_1_fg[] = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/fg/tileset_anim.4bpp"); const s8 CollHeightMap_zone_3_act_1_fg[] = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/fg/height_map.coll"); @@ -10,7 +10,6 @@ const u16 CollFlags_zone_3_act_1_fg[] = INCBIN_U16("data/maps/zone_3/act_1/tilem const u16 Metatiles_zone_3_act_1_fg[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_3_act_1_fg0[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/map_front.bin"); - const u16 Map_zone_3_act_1_fg1[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_1_fg0 = @@ -25,7 +24,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_1_fg0 = .tilesSize = sizeof(Tileset_zone_3_act_1_fg), .palette = Palette_zone_3_act_1_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_3_act_1_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_3_act_1_fg), .map = Metatiles_zone_3_act_1_fg, }, .metatileMap = Map_zone_3_act_1_fg0, @@ -45,7 +44,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_1_fg1 = .tilesSize = sizeof(Tileset_zone_3_act_1_fg), .palette = Palette_zone_3_act_1_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_3_act_1_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_3_act_1_fg), .map = Metatiles_zone_3_act_1_fg, }, .metatileMap = Map_zone_3_act_1_fg1, diff --git a/data/maps/zone_3/act_2/tilemaps/bg/header.c b/data/maps/zone_3/act_2/tilemaps/bg/header.c index 0c920dea04..32e6e24b06 100644 --- a/data/maps/zone_3/act_2/tilemaps/bg/header.c +++ b/data/maps/zone_3/act_2/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_3_act_2_bg[] = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_3_act_2_bg[] = INCPAL("data/maps/zone_3/act_2/tilemaps/bg/palette.pal"); const u8 Tiles_zone_3_act_2_bg[] = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_3_act_2_bg[] = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_3_act_2_bg = { .tilesSize = sizeof(Tiles_zone_3_act_2_bg), .palette = Palette_zone_3_act_2_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_3_act_2_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_3_act_2_bg), .map = Tilemap_zone_3_act_2_bg, }; diff --git a/data/maps/zone_3/act_2/tilemaps/fg/header.c b/data/maps/zone_3/act_2/tilemaps/fg/header.c index 2ff9c40c1d..15d9df50ce 100644 --- a/data/maps/zone_3/act_2/tilemaps/fg/header.c +++ b/data/maps/zone_3/act_2/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_3_act_2_fg[] = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_3_act_2_fg[] = INCPAL("data/maps/zone_3/act_2/tilemaps/fg/palette.pal"); const u8 Tileset_zone_3_act_2_fg[] = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/fg/tileset.4bpp"); const u8 Tileset_AnimTiles_zone_3_act_2_fg[] = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/fg/tileset_anim.4bpp"); const s8 CollHeightMap_zone_3_act_2_fg[] = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/fg/height_map.coll"); @@ -25,7 +25,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_2_fg0 = .tilesSize = sizeof(Tileset_zone_3_act_2_fg), .palette = Palette_zone_3_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_3_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_3_act_2_fg), .map = Metatiles_zone_3_act_2_fg, }, .metatileMap = Map_zone_3_act_2_fg0, @@ -45,7 +45,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_2_fg1 = .tilesSize = sizeof(Tileset_zone_3_act_2_fg), .palette = Palette_zone_3_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_3_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_3_act_2_fg), .map = Metatiles_zone_3_act_2_fg, }, .metatileMap = Map_zone_3_act_2_fg1, diff --git a/data/maps/zone_3/act_boss/tilemaps/bg/header.c b/data/maps/zone_3/act_boss/tilemaps/bg/header.c index 253b93cd80..4be5f8765d 100644 --- a/data/maps/zone_3/act_boss/tilemaps/bg/header.c +++ b/data/maps/zone_3/act_boss/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_3_act_boss_bg[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_3_act_boss_bg[] = INCPAL("data/maps/zone_3/act_boss/tilemaps/bg/palette.pal"); const u8 Tiles_zone_3_act_boss_bg[] = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_3_act_boss_bg[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_3_act_boss_bg = { .tilesSize = sizeof(Tiles_zone_3_act_boss_bg), .palette = Palette_zone_3_act_boss_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_3_act_boss_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_3_act_boss_bg), .map = Tilemap_zone_3_act_boss_bg, }; diff --git a/data/maps/zone_3/act_boss/tilemaps/fg/header.c b/data/maps/zone_3/act_boss/tilemaps/fg/header.c index 0721364746..f8070e18a2 100644 --- a/data/maps/zone_3/act_boss/tilemaps/fg/header.c +++ b/data/maps/zone_3/act_boss/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_3_act_boss_fg[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_3_act_boss_fg[] = INCPAL("data/maps/zone_3/act_boss/tilemaps/fg/palette.pal"); const u8 Tileset_zone_3_act_boss_fg[] = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_3_act_boss_fg[] = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_3_act_boss_fg[] = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_3_act_boss_fg[] = INCBIN_U16("data/maps/zone_3/act_boss const u16 Metatiles_zone_3_act_boss_fg[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_3_act_boss_fg0[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/map_front.bin"); - const u16 Map_zone_3_act_boss_fg1[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_boss_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_boss_fg0 = .tilesSize = sizeof(Tileset_zone_3_act_boss_fg), .palette = Palette_zone_3_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_3_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_3_act_boss_fg), .map = Metatiles_zone_3_act_boss_fg, }, .metatileMap = Map_zone_3_act_boss_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_boss_fg1 = .tilesSize = sizeof(Tileset_zone_3_act_boss_fg), .palette = Palette_zone_3_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_3_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_3_act_boss_fg), .map = Metatiles_zone_3_act_boss_fg, }, .metatileMap = Map_zone_3_act_boss_fg1, diff --git a/data/maps/zone_4/act_1/tilemaps/bg/header.c b/data/maps/zone_4/act_1/tilemaps/bg/header.c index 35bc825093..09c5800572 100644 --- a/data/maps/zone_4/act_1/tilemaps/bg/header.c +++ b/data/maps/zone_4/act_1/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_4_act_1_bg[] = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_4_act_1_bg[] = INCPAL("data/maps/zone_4/act_1/tilemaps/bg/palette.pal"); const u8 Tiles_zone_4_act_1_bg[] = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_4_act_1_bg[] = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_4_act_1_bg = { .tilesSize = sizeof(Tiles_zone_4_act_1_bg), .palette = Palette_zone_4_act_1_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_4_act_1_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_4_act_1_bg), .map = Tilemap_zone_4_act_1_bg, }; diff --git a/data/maps/zone_4/act_1/tilemaps/fg/header.c b/data/maps/zone_4/act_1/tilemaps/fg/header.c index 855dde870b..216bcd0ac1 100644 --- a/data/maps/zone_4/act_1/tilemaps/fg/header.c +++ b/data/maps/zone_4/act_1/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_4_act_1_fg[] = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_4_act_1_fg[] = INCPAL("data/maps/zone_4/act_1/tilemaps/fg/palette.pal"); const u8 Tileset_zone_4_act_1_fg[] = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_4_act_1_fg[] = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_4_act_1_fg[] = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/fg/tile_rot.coll"); diff --git a/data/maps/zone_4/act_2/tilemaps/bg/header.c b/data/maps/zone_4/act_2/tilemaps/bg/header.c index 90e322e114..671306794b 100644 --- a/data/maps/zone_4/act_2/tilemaps/bg/header.c +++ b/data/maps/zone_4/act_2/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_4_act_2_bg[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_4_act_2_bg[] = INCPAL("data/maps/zone_4/act_2/tilemaps/bg/palette.pal"); const u8 Tiles_zone_4_act_2_bg[] = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_4_act_2_bg[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_4_act_2_bg = { .tilesSize = sizeof(Tiles_zone_4_act_2_bg), .palette = Palette_zone_4_act_2_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_4_act_2_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_4_act_2_bg), .map = Tilemap_zone_4_act_2_bg, }; diff --git a/data/maps/zone_4/act_2/tilemaps/fg/header.c b/data/maps/zone_4/act_2/tilemaps/fg/header.c index e6c51dff5f..e44e16e51e 100644 --- a/data/maps/zone_4/act_2/tilemaps/fg/header.c +++ b/data/maps/zone_4/act_2/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_4_act_2_fg[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_4_act_2_fg[] = INCPAL("data/maps/zone_4/act_2/tilemaps/fg/palette.pal"); const u8 Tileset_zone_4_act_2_fg[] = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_4_act_2_fg[] = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_4_act_2_fg[] = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_4_act_2_fg[] = INCBIN_U16("data/maps/zone_4/act_2/tilem const u16 Metatiles_zone_4_act_2_fg[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_4_act_2_fg0[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/map_front.bin"); - const u16 Map_zone_4_act_2_fg1[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_2_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_2_fg0 = .tilesSize = sizeof(Tileset_zone_4_act_2_fg), .palette = Palette_zone_4_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_4_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_4_act_2_fg), .map = Metatiles_zone_4_act_2_fg, }, .metatileMap = Map_zone_4_act_2_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_2_fg1 = .tilesSize = sizeof(Tileset_zone_4_act_2_fg), .palette = Palette_zone_4_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_4_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_4_act_2_fg), .map = Metatiles_zone_4_act_2_fg, }, .metatileMap = Map_zone_4_act_2_fg1, diff --git a/data/maps/zone_4/act_boss/tilemaps/bg/header.c b/data/maps/zone_4/act_boss/tilemaps/bg/header.c index 4c10942e7f..7aa7f3c591 100644 --- a/data/maps/zone_4/act_boss/tilemaps/bg/header.c +++ b/data/maps/zone_4/act_boss/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_4_act_boss_bg[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_4_act_boss_bg[] = INCPAL("data/maps/zone_4/act_boss/tilemaps/bg/palette.pal"); const u8 Tiles_zone_4_act_boss_bg[] = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_4_act_boss_bg[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_4_act_boss_bg = { .tilesSize = sizeof(Tiles_zone_4_act_boss_bg), .palette = Palette_zone_4_act_boss_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_4_act_boss_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_4_act_boss_bg), .map = Tilemap_zone_4_act_boss_bg, }; diff --git a/data/maps/zone_4/act_boss/tilemaps/fg/header.c b/data/maps/zone_4/act_boss/tilemaps/fg/header.c index 0e89c57bae..be2349390e 100644 --- a/data/maps/zone_4/act_boss/tilemaps/fg/header.c +++ b/data/maps/zone_4/act_boss/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_4_act_boss_fg[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_4_act_boss_fg[] = INCPAL("data/maps/zone_4/act_boss/tilemaps/fg/palette.pal"); const u8 Tileset_zone_4_act_boss_fg[] = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_4_act_boss_fg[] = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_4_act_boss_fg[] = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_4_act_boss_fg[] = INCBIN_U16("data/maps/zone_4/act_boss const u16 Metatiles_zone_4_act_boss_fg[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_4_act_boss_fg0[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/map_front.bin"); - const u16 Map_zone_4_act_boss_fg1[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_boss_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_boss_fg0 = .tilesSize = sizeof(Tileset_zone_4_act_boss_fg), .palette = Palette_zone_4_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_4_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_4_act_boss_fg), .map = Metatiles_zone_4_act_boss_fg, }, .metatileMap = Map_zone_4_act_boss_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_boss_fg1 = .tilesSize = sizeof(Tileset_zone_4_act_boss_fg), .palette = Palette_zone_4_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_4_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_4_act_boss_fg), .map = Metatiles_zone_4_act_boss_fg, }, .metatileMap = Map_zone_4_act_boss_fg1, diff --git a/data/maps/zone_5/act_1/tilemaps/bg/header.c b/data/maps/zone_5/act_1/tilemaps/bg/header.c index 07c6ba564a..a27393d725 100644 --- a/data/maps/zone_5/act_1/tilemaps/bg/header.c +++ b/data/maps/zone_5/act_1/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_5_act_1_bg[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_5_act_1_bg[] = INCPAL("data/maps/zone_5/act_1/tilemaps/bg/palette.pal"); const u8 Tiles_zone_5_act_1_bg[] = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_5_act_1_bg[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_5_act_1_bg = { .tilesSize = sizeof(Tiles_zone_5_act_1_bg), .palette = Palette_zone_5_act_1_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_5_act_1_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_5_act_1_bg), .map = Tilemap_zone_5_act_1_bg, }; diff --git a/data/maps/zone_5/act_1/tilemaps/fg/header.c b/data/maps/zone_5/act_1/tilemaps/fg/header.c index ec6041d91b..2e12657a7a 100644 --- a/data/maps/zone_5/act_1/tilemaps/fg/header.c +++ b/data/maps/zone_5/act_1/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_5_act_1_fg[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_5_act_1_fg[] = INCPAL("data/maps/zone_5/act_1/tilemaps/fg/palette.pal"); const u8 Tileset_zone_5_act_1_fg[] = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_5_act_1_fg[] = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_5_act_1_fg[] = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_5_act_1_fg[] = INCBIN_U16("data/maps/zone_5/act_1/tilem const u16 Metatiles_zone_5_act_1_fg[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_5_act_1_fg0[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/map_front.bin"); - const u16 Map_zone_5_act_1_fg1[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_1_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_1_fg0 = .tilesSize = sizeof(Tileset_zone_5_act_1_fg), .palette = Palette_zone_5_act_1_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_5_act_1_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_5_act_1_fg), .map = Metatiles_zone_5_act_1_fg, }, .metatileMap = Map_zone_5_act_1_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_1_fg1 = .tilesSize = sizeof(Tileset_zone_5_act_1_fg), .palette = Palette_zone_5_act_1_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_5_act_1_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_5_act_1_fg), .map = Metatiles_zone_5_act_1_fg, }, .metatileMap = Map_zone_5_act_1_fg1, diff --git a/data/maps/zone_5/act_2/tilemaps/bg/header.c b/data/maps/zone_5/act_2/tilemaps/bg/header.c index 9ee9fd30e3..84f6f8d72d 100644 --- a/data/maps/zone_5/act_2/tilemaps/bg/header.c +++ b/data/maps/zone_5/act_2/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_5_act_2_bg[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_5_act_2_bg[] = INCPAL("data/maps/zone_5/act_2/tilemaps/bg/palette.pal"); const u8 Tiles_zone_5_act_2_bg[] = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_5_act_2_bg[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_5_act_2_bg = { .tilesSize = sizeof(Tiles_zone_5_act_2_bg), .palette = Palette_zone_5_act_2_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_5_act_2_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_5_act_2_bg), .map = Tilemap_zone_5_act_2_bg, }; diff --git a/data/maps/zone_5/act_2/tilemaps/fg/header.c b/data/maps/zone_5/act_2/tilemaps/fg/header.c index 5ed88db4c4..a50e60239a 100644 --- a/data/maps/zone_5/act_2/tilemaps/fg/header.c +++ b/data/maps/zone_5/act_2/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_5_act_2_fg[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_5_act_2_fg[] = INCPAL("data/maps/zone_5/act_2/tilemaps/fg/palette.pal"); const u8 Tileset_zone_5_act_2_fg[] = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_5_act_2_fg[] = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_5_act_2_fg[] = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_5_act_2_fg[] = INCBIN_U16("data/maps/zone_5/act_2/tilem const u16 Metatiles_zone_5_act_2_fg[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_5_act_2_fg0[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/map_front.bin"); - const u16 Map_zone_5_act_2_fg1[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_2_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_2_fg0 = .tilesSize = sizeof(Tileset_zone_5_act_2_fg), .palette = Palette_zone_5_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_5_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_5_act_2_fg), .map = Metatiles_zone_5_act_2_fg, }, .metatileMap = Map_zone_5_act_2_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_2_fg1 = .tilesSize = sizeof(Tileset_zone_5_act_2_fg), .palette = Palette_zone_5_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_5_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_5_act_2_fg), .map = Metatiles_zone_5_act_2_fg, }, .metatileMap = Map_zone_5_act_2_fg1, diff --git a/data/maps/zone_5/act_boss/tilemaps/bg/header.c b/data/maps/zone_5/act_boss/tilemaps/bg/header.c index 44776b162d..e430d445e7 100644 --- a/data/maps/zone_5/act_boss/tilemaps/bg/header.c +++ b/data/maps/zone_5/act_boss/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_5_act_boss_bg[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_5_act_boss_bg[] = INCPAL("data/maps/zone_5/act_boss/tilemaps/bg/palette.gbapal"); const u8 Tiles_zone_5_act_boss_bg[] = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_5_act_boss_bg[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_5_act_boss_bg = { .tilesSize = sizeof(Tiles_zone_5_act_boss_bg), .palette = Palette_zone_5_act_boss_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_5_act_boss_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_5_act_boss_bg), .map = Tilemap_zone_5_act_boss_bg, }; diff --git a/data/maps/zone_5/act_boss/tilemaps/fg/header.c b/data/maps/zone_5/act_boss/tilemaps/fg/header.c index 53c93cbd79..685d0ba530 100644 --- a/data/maps/zone_5/act_boss/tilemaps/fg/header.c +++ b/data/maps/zone_5/act_boss/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_5_act_boss_fg[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_5_act_boss_fg[] = INCPAL("data/maps/zone_5/act_boss/tilemaps/fg/palette.pal"); const u8 Tileset_zone_5_act_boss_fg[] = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_5_act_boss_fg[] = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_5_act_boss_fg[] = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_5_act_boss_fg[] = INCBIN_U16("data/maps/zone_5/act_boss const u16 Metatiles_zone_5_act_boss_fg[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_5_act_boss_fg0[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/map_front.bin"); - const u16 Map_zone_5_act_boss_fg1[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_boss_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_boss_fg0 = .tilesSize = sizeof(Tileset_zone_5_act_boss_fg), .palette = Palette_zone_5_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_5_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_5_act_boss_fg), .map = Metatiles_zone_5_act_boss_fg, }, .metatileMap = Map_zone_5_act_boss_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_boss_fg1 = .tilesSize = sizeof(Tileset_zone_5_act_boss_fg), .palette = Palette_zone_5_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_5_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_5_act_boss_fg), .map = Metatiles_zone_5_act_boss_fg, }, .metatileMap = Map_zone_5_act_boss_fg1, diff --git a/data/maps/zone_6/act_1/tilemaps/bg/header.c b/data/maps/zone_6/act_1/tilemaps/bg/header.c index 103341bbbf..c5a08c6647 100644 --- a/data/maps/zone_6/act_1/tilemaps/bg/header.c +++ b/data/maps/zone_6/act_1/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_6_act_1_bg[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_6_act_1_bg[] = INCPAL("data/maps/zone_6/act_1/tilemaps/bg/palette.pal"); const u8 Tiles_zone_6_act_1_bg[] = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_6_act_1_bg[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_6_act_1_bg = { .tilesSize = sizeof(Tiles_zone_6_act_1_bg), .palette = Palette_zone_6_act_1_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_6_act_1_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_6_act_1_bg), .map = Tilemap_zone_6_act_1_bg, }; diff --git a/data/maps/zone_6/act_1/tilemaps/fg/header.c b/data/maps/zone_6/act_1/tilemaps/fg/header.c index b2510a5c2d..fabefad855 100644 --- a/data/maps/zone_6/act_1/tilemaps/fg/header.c +++ b/data/maps/zone_6/act_1/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_6_act_1_fg[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_6_act_1_fg[] = INCPAL("data/maps/zone_6/act_1/tilemaps/fg/palette.pal"); const u8 Tileset_zone_6_act_1_fg[] = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/fg/tileset.4bpp"); const u8 Tileset_AnimTiles_zone_6_act_1_fg[] = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/fg/tileset_anim.4bpp"); const s8 CollHeightMap_zone_6_act_1_fg[] = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/fg/height_map.coll"); @@ -10,7 +10,6 @@ const u16 CollFlags_zone_6_act_1_fg[] = INCBIN_U16("data/maps/zone_6/act_1/tilem const u16 Metatiles_zone_6_act_1_fg[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_6_act_1_fg0[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/map_front.bin"); - const u16 Map_zone_6_act_1_fg1[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_1_fg0 = @@ -25,7 +24,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_1_fg0 = .tilesSize = sizeof(Tileset_zone_6_act_1_fg), .palette = Palette_zone_6_act_1_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_6_act_1_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_6_act_1_fg), .map = Metatiles_zone_6_act_1_fg, }, .metatileMap = Map_zone_6_act_1_fg0, @@ -45,7 +44,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_1_fg1 = .tilesSize = sizeof(Tileset_zone_6_act_1_fg), .palette = Palette_zone_6_act_1_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_6_act_1_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_6_act_1_fg), .map = Metatiles_zone_6_act_1_fg, }, .metatileMap = Map_zone_6_act_1_fg1, diff --git a/data/maps/zone_6/act_2/tilemaps/bg/header.c b/data/maps/zone_6/act_2/tilemaps/bg/header.c index a9287cba45..eb45ba0004 100644 --- a/data/maps/zone_6/act_2/tilemaps/bg/header.c +++ b/data/maps/zone_6/act_2/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_6_act_2_bg[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_6_act_2_bg[] = INCPAL("data/maps/zone_6/act_2/tilemaps/bg/palette.pal"); const u8 Tiles_zone_6_act_2_bg[] = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_6_act_2_bg[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_6_act_2_bg = { .tilesSize = sizeof(Tiles_zone_6_act_2_bg), .palette = Palette_zone_6_act_2_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_6_act_2_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_6_act_2_bg), .map = Tilemap_zone_6_act_2_bg, }; diff --git a/data/maps/zone_6/act_2/tilemaps/fg/header.c b/data/maps/zone_6/act_2/tilemaps/fg/header.c index 39a29bbacd..7fd45ef449 100644 --- a/data/maps/zone_6/act_2/tilemaps/fg/header.c +++ b/data/maps/zone_6/act_2/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_6_act_2_fg[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_6_act_2_fg[] = INCPAL("data/maps/zone_6/act_2/tilemaps/fg/palette.pal"); const u8 Tileset_zone_6_act_2_fg[] = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/fg/tileset.4bpp"); const u8 Tileset_AnimTiles_zone_6_act_2_fg[] = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/fg/tileset_anim.4bpp"); const s8 CollHeightMap_zone_6_act_2_fg[] = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/fg/height_map.coll"); @@ -10,7 +10,6 @@ const u16 CollFlags_zone_6_act_2_fg[] = INCBIN_U16("data/maps/zone_6/act_2/tilem const u16 Metatiles_zone_6_act_2_fg[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_6_act_2_fg0[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/map_front.bin"); - const u16 Map_zone_6_act_2_fg1[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_2_fg0 = @@ -25,7 +24,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_2_fg0 = .tilesSize = sizeof(Tileset_zone_6_act_2_fg), .palette = Palette_zone_6_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_6_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_6_act_2_fg), .map = Metatiles_zone_6_act_2_fg, }, .metatileMap = Map_zone_6_act_2_fg0, @@ -45,7 +44,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_2_fg1 = .tilesSize = sizeof(Tileset_zone_6_act_2_fg), .palette = Palette_zone_6_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_6_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_6_act_2_fg), .map = Metatiles_zone_6_act_2_fg, }, .metatileMap = Map_zone_6_act_2_fg1, diff --git a/data/maps/zone_6/act_boss/tilemaps/bg/header.c b/data/maps/zone_6/act_boss/tilemaps/bg/header.c index 01f1d3ad6d..a563cbfb0a 100644 --- a/data/maps/zone_6/act_boss/tilemaps/bg/header.c +++ b/data/maps/zone_6/act_boss/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_6_act_boss_bg[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_6_act_boss_bg[] = INCPAL("data/maps/zone_6/act_boss/tilemaps/bg/palette.pal"); const u8 Tiles_zone_6_act_boss_bg[] = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_6_act_boss_bg[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_6_act_boss_bg = { .tilesSize = sizeof(Tiles_zone_6_act_boss_bg), .palette = Palette_zone_6_act_boss_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_6_act_boss_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_6_act_boss_bg), .map = Tilemap_zone_6_act_boss_bg, }; diff --git a/data/maps/zone_6/act_boss/tilemaps/fg/header.c b/data/maps/zone_6/act_boss/tilemaps/fg/header.c index d16cd6126c..55593fb0b7 100644 --- a/data/maps/zone_6/act_boss/tilemaps/fg/header.c +++ b/data/maps/zone_6/act_boss/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_6_act_boss_fg[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_6_act_boss_fg[] = INCPAL("data/maps/zone_6/act_boss/tilemaps/fg/palette.pal"); const u8 Tileset_zone_6_act_boss_fg[] = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/fg/tileset.4bpp"); const u8 Tileset_AnimTiles_zone_6_act_boss_fg[] = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/fg/tileset_anim.4bpp"); const s8 CollHeightMap_zone_6_act_boss_fg[] = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/fg/height_map.coll"); @@ -10,7 +10,6 @@ const u16 CollFlags_zone_6_act_boss_fg[] = INCBIN_U16("data/maps/zone_6/act_boss const u16 Metatiles_zone_6_act_boss_fg[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_6_act_boss_fg0[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/map_front.bin"); - const u16 Map_zone_6_act_boss_fg1[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_boss_fg0 = @@ -25,7 +24,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_boss_fg0 = .tilesSize = sizeof(Tileset_zone_6_act_boss_fg), .palette = Palette_zone_6_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_6_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_6_act_boss_fg), .map = Metatiles_zone_6_act_boss_fg, }, .metatileMap = Map_zone_6_act_boss_fg0, @@ -45,7 +44,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_boss_fg1 = .tilesSize = sizeof(Tileset_zone_6_act_boss_fg), .palette = Palette_zone_6_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_6_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_6_act_boss_fg), .map = Metatiles_zone_6_act_boss_fg, }, .metatileMap = Map_zone_6_act_boss_fg1, diff --git a/data/maps/zone_7/act_1/tilemaps/bg/header.c b/data/maps/zone_7/act_1/tilemaps/bg/header.c index ab634e207f..a19ecd400a 100644 --- a/data/maps/zone_7/act_1/tilemaps/bg/header.c +++ b/data/maps/zone_7/act_1/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_7_act_1_bg[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_7_act_1_bg[] = INCPAL("data/maps/zone_7/act_1/tilemaps/bg/palette.pal"); const u8 Tiles_zone_7_act_1_bg[] = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_7_act_1_bg[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_7_act_1_bg = { .tilesSize = sizeof(Tiles_zone_7_act_1_bg), .palette = Palette_zone_7_act_1_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_7_act_1_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_7_act_1_bg), .map = Tilemap_zone_7_act_1_bg, }; diff --git a/data/maps/zone_7/act_1/tilemaps/fg/header.c b/data/maps/zone_7/act_1/tilemaps/fg/header.c index 86e056ac08..c2d0cc1292 100644 --- a/data/maps/zone_7/act_1/tilemaps/fg/header.c +++ b/data/maps/zone_7/act_1/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_7_act_1_fg[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_7_act_1_fg[] = INCPAL("data/maps/zone_7/act_1/tilemaps/fg/palette.pal"); const u8 Tileset_zone_7_act_1_fg[] = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_7_act_1_fg[] = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_7_act_1_fg[] = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_7_act_1_fg[] = INCBIN_U16("data/maps/zone_7/act_1/tilem const u16 Metatiles_zone_7_act_1_fg[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_7_act_1_fg0[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/map_front.bin"); - const u16 Map_zone_7_act_1_fg1[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_1_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_1_fg0 = .tilesSize = sizeof(Tileset_zone_7_act_1_fg), .palette = Palette_zone_7_act_1_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_7_act_1_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_7_act_1_fg), .map = Metatiles_zone_7_act_1_fg, }, .metatileMap = Map_zone_7_act_1_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_1_fg1 = .tilesSize = sizeof(Tileset_zone_7_act_1_fg), .palette = Palette_zone_7_act_1_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_7_act_1_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_7_act_1_fg), .map = Metatiles_zone_7_act_1_fg, }, .metatileMap = Map_zone_7_act_1_fg1, diff --git a/data/maps/zone_7/act_2/tilemaps/bg/header.c b/data/maps/zone_7/act_2/tilemaps/bg/header.c index f228acbc80..4a573db695 100644 --- a/data/maps/zone_7/act_2/tilemaps/bg/header.c +++ b/data/maps/zone_7/act_2/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_7_act_2_bg[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_7_act_2_bg[] = INCPAL("data/maps/zone_7/act_2/tilemaps/bg/palette.pal"); const u8 Tiles_zone_7_act_2_bg[] = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_7_act_2_bg[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_7_act_2_bg = { .tilesSize = sizeof(Tiles_zone_7_act_2_bg), .palette = Palette_zone_7_act_2_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_7_act_2_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_7_act_2_bg), .map = Tilemap_zone_7_act_2_bg, }; diff --git a/data/maps/zone_7/act_2/tilemaps/fg/header.c b/data/maps/zone_7/act_2/tilemaps/fg/header.c index 5d4e0cea98..abf5211000 100644 --- a/data/maps/zone_7/act_2/tilemaps/fg/header.c +++ b/data/maps/zone_7/act_2/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_7_act_2_fg[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_7_act_2_fg[] = INCPAL("data/maps/zone_7/act_2/tilemaps/fg/palette.pal"); const u8 Tileset_zone_7_act_2_fg[] = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_7_act_2_fg[] = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_7_act_2_fg[] = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_7_act_2_fg[] = INCBIN_U16("data/maps/zone_7/act_2/tilem const u16 Metatiles_zone_7_act_2_fg[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_7_act_2_fg0[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/map_front.bin"); - const u16 Map_zone_7_act_2_fg1[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_2_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_2_fg0 = .tilesSize = sizeof(Tileset_zone_7_act_2_fg), .palette = Palette_zone_7_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_7_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_7_act_2_fg), .map = Metatiles_zone_7_act_2_fg, }, .metatileMap = Map_zone_7_act_2_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_2_fg1 = .tilesSize = sizeof(Tileset_zone_7_act_2_fg), .palette = Palette_zone_7_act_2_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_7_act_2_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_7_act_2_fg), .map = Metatiles_zone_7_act_2_fg, }, .metatileMap = Map_zone_7_act_2_fg1, diff --git a/data/maps/zone_7/act_boss/tilemaps/bg/header.c b/data/maps/zone_7/act_boss/tilemaps/bg/header.c index d318699ec5..323a8d0836 100644 --- a/data/maps/zone_7/act_boss/tilemaps/bg/header.c +++ b/data/maps/zone_7/act_boss/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_7_act_boss_bg[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_7_act_boss_bg[] = INCPAL("data/maps/zone_7/act_boss/tilemaps/bg/palette.pal"); const u8 Tiles_zone_7_act_boss_bg[] = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_7_act_boss_bg[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_7_act_boss_bg = { .tilesSize = sizeof(Tiles_zone_7_act_boss_bg), .palette = Palette_zone_7_act_boss_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_7_act_boss_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_7_act_boss_bg), .map = Tilemap_zone_7_act_boss_bg, }; diff --git a/data/maps/zone_7/act_boss/tilemaps/fg/header.c b/data/maps/zone_7/act_boss/tilemaps/fg/header.c index 2ddb2b95d8..ad92946ce4 100644 --- a/data/maps/zone_7/act_boss/tilemaps/fg/header.c +++ b/data/maps/zone_7/act_boss/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_7_act_boss_fg[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_7_act_boss_fg[] = INCPAL("data/maps/zone_7/act_boss/tilemaps/fg/palette.pal"); const u8 Tileset_zone_7_act_boss_fg[] = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_7_act_boss_fg[] = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_7_act_boss_fg[] = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_7_act_boss_fg[] = INCBIN_U16("data/maps/zone_7/act_boss const u16 Metatiles_zone_7_act_boss_fg[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_7_act_boss_fg0[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/map_front.bin"); - const u16 Map_zone_7_act_boss_fg1[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_boss_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_boss_fg0 = .tilesSize = sizeof(Tileset_zone_7_act_boss_fg), .palette = Palette_zone_7_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_7_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_7_act_boss_fg), .map = Metatiles_zone_7_act_boss_fg, }, .metatileMap = Map_zone_7_act_boss_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_boss_fg1 = .tilesSize = sizeof(Tileset_zone_7_act_boss_fg), .palette = Palette_zone_7_act_boss_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_7_act_boss_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_7_act_boss_fg), .map = Metatiles_zone_7_act_boss_fg, }, .metatileMap = Map_zone_7_act_boss_fg1, diff --git a/data/maps/zone_final/act_ta53/tilemaps/bg/header.c b/data/maps/zone_final/act_ta53/tilemaps/bg/header.c index db339e3ec1..c90e062fea 100644 --- a/data/maps/zone_final/act_ta53/tilemaps/bg/header.c +++ b/data/maps/zone_final/act_ta53/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_final_act_ta53_bg[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_final_act_ta53_bg[] = INCPAL("data/maps/zone_final/act_ta53/tilemaps/bg/palette.pal"); const u8 Tiles_zone_final_act_ta53_bg[] = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_final_act_ta53_bg[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_final_act_ta53_bg = { .tilesSize = sizeof(Tiles_zone_final_act_ta53_bg), .palette = Palette_zone_final_act_ta53_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_final_act_ta53_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_final_act_ta53_bg), .map = Tilemap_zone_final_act_ta53_bg, }; diff --git a/data/maps/zone_final/act_ta53/tilemaps/fg/header.c b/data/maps/zone_final/act_ta53/tilemaps/fg/header.c index 4c927d8206..d5710abb2a 100644 --- a/data/maps/zone_final/act_ta53/tilemaps/fg/header.c +++ b/data/maps/zone_final/act_ta53/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_final_act_ta53_fg[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_final_act_ta53_fg[] = INCPAL("data/maps/zone_final/act_ta53/tilemaps/fg/palette.pal"); const u8 Tileset_zone_final_act_ta53_fg[] = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_final_act_ta53_fg[] = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_final_act_ta53_fg[] = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_final_act_ta53_fg[] = INCBIN_U16("data/maps/zone_final/ const u16 Metatiles_zone_final_act_ta53_fg[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_final_act_ta53_fg0[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/map_front.bin"); - const u16 Map_zone_final_act_ta53_fg1[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_ta53_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_ta53_fg0 = .tilesSize = sizeof(Tileset_zone_final_act_ta53_fg), .palette = Palette_zone_final_act_ta53_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_final_act_ta53_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_final_act_ta53_fg), .map = Metatiles_zone_final_act_ta53_fg, }, .metatileMap = Map_zone_final_act_ta53_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_ta53_fg1 = .tilesSize = sizeof(Tileset_zone_final_act_ta53_fg), .palette = Palette_zone_final_act_ta53_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_final_act_ta53_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_final_act_ta53_fg), .map = Metatiles_zone_final_act_ta53_fg, }, .metatileMap = Map_zone_final_act_ta53_fg1, diff --git a/data/maps/zone_final/act_unused/tilemaps/bg/header.c b/data/maps/zone_final/act_unused/tilemaps/bg/header.c index 9ccc51a265..ddee912d76 100644 --- a/data/maps/zone_final/act_unused/tilemaps/bg/header.c +++ b/data/maps/zone_final/act_unused/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_final_act_unused_bg[] = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_final_act_unused_bg[] = INCPAL("data/maps/zone_final/act_unused/tilemaps/bg/palette.pal"); const u8 Tiles_zone_final_act_unused_bg[] = INCBIN_U8("data/maps/zone_final/act_unused/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_final_act_unused_bg[] = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_final_act_unused_bg = { .tilesSize = sizeof(Tiles_zone_final_act_unused_bg), .palette = Palette_zone_final_act_unused_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_final_act_unused_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_final_act_unused_bg), .map = Tilemap_zone_final_act_unused_bg, }; diff --git a/data/maps/zone_final/act_unused/tilemaps/fg/header.c b/data/maps/zone_final/act_unused/tilemaps/fg/header.c index 28ac54264f..9877741cfb 100644 --- a/data/maps/zone_final/act_unused/tilemaps/fg/header.c +++ b/data/maps/zone_final/act_unused/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_final_act_unused_fg[] = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_final_act_unused_fg[] = INCPAL("data/maps/zone_final/act_unused/tilemaps/fg/palette.pal"); const u8 Tileset_zone_final_act_unused_fg[] = { 0xFF, 0xFF, 0xFF, 0xFF }; const s8 CollHeightMap_zone_final_act_unused_fg[] = INCBIN_U8("data/maps/zone_final/act_unused/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_final_act_unused_fg[] = INCBIN_U8("data/maps/zone_final/act_unused/tilemaps/fg/tile_rot.coll"); @@ -25,7 +25,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_unused_fg0 = .tilesSize = 0x2200, // GAME: HARDCODED // should be: sizeof(Tileset_zone_final_act_unused_fg) .palette = Palette_zone_final_act_unused_fg,// -> 0x0892F540 .palOffset = 0, - .palLength = sizeof(Palette_zone_final_act_unused_fg) / sizeof(u16), // 0x100 + .palLength = ARRAY_COUNT(Palette_zone_final_act_unused_fg), // 0x100 .map = Metatiles_zone_final_act_unused_fg, // -> 0x08930118 }, .metatileMap = Map_zone_final_act_unused_fg0, // -> 0x08933178 @@ -46,7 +46,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_unused_fg1 = .tilesSize = 0x2200, // GAME: HARDCODED // should be: sizeof(Tileset_zone_final_act_unused_fg) .palette = Palette_zone_final_act_unused_fg,// -> 0x0892F540 .palOffset = 0, - .palLength = sizeof(Palette_zone_final_act_unused_fg) / sizeof(u16), // 0x100 + .palLength = ARRAY_COUNT(Palette_zone_final_act_unused_fg), // 0x100 .map = Metatiles_zone_final_act_unused_fg, // -> 0x08930118 }, .metatileMap = Map_zone_final_act_unused_fg1, // -> 0x08933358 diff --git a/data/maps/zone_final/act_xx/tilemaps/bg/header.c b/data/maps/zone_final/act_xx/tilemaps/bg/header.c index 8f07c3b758..849408408a 100644 --- a/data/maps/zone_final/act_xx/tilemaps/bg/header.c +++ b/data/maps/zone_final/act_xx/tilemaps/bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_final_act_xx_bg[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/bg/palette.gbapal"); +const ColorRaw Palette_zone_final_act_xx_bg[] = INCPAL("data/maps/zone_final/act_xx/tilemaps/bg/palette.pal"); const u8 Tiles_zone_final_act_xx_bg[] = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/bg/tiles.4bpp"); const u16 Tilemap_zone_final_act_xx_bg[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap zone_final_act_xx_bg = { .tilesSize = sizeof(Tiles_zone_final_act_xx_bg), .palette = Palette_zone_final_act_xx_bg, .palOffset = 0, - .palLength = sizeof(Palette_zone_final_act_xx_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_final_act_xx_bg), .map = Tilemap_zone_final_act_xx_bg, }; diff --git a/data/maps/zone_final/act_xx/tilemaps/fg/header.c b/data/maps/zone_final/act_xx/tilemaps/fg/header.c index 1f2acee870..bb0df333bd 100644 --- a/data/maps/zone_final/act_xx/tilemaps/fg/header.c +++ b/data/maps/zone_final/act_xx/tilemaps/fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_zone_final_act_xx_fg[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/palette.gbapal"); +const ColorRaw Palette_zone_final_act_xx_fg[] = INCPAL("data/maps/zone_final/act_xx/tilemaps/fg/palette.pal"); const u8 Tileset_zone_final_act_xx_fg[] = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/fg/tileset.4bpp"); const s8 CollHeightMap_zone_final_act_xx_fg[] = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/fg/height_map.coll"); const u8 CollTileRot_zone_final_act_xx_fg[] = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/fg/tile_rot.coll"); @@ -9,7 +9,6 @@ const u16 CollFlags_zone_final_act_xx_fg[] = INCBIN_U16("data/maps/zone_final/ac const u16 Metatiles_zone_final_act_xx_fg[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/metatiles.tilemap2"); const u16 Map_zone_final_act_xx_fg0[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/map_front.bin"); - const u16 Map_zone_final_act_xx_fg1[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/map_back.bin"); ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_xx_fg0 = @@ -24,7 +23,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_xx_fg0 = .tilesSize = sizeof(Tileset_zone_final_act_xx_fg), .palette = Palette_zone_final_act_xx_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_final_act_xx_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_final_act_xx_fg), .map = Metatiles_zone_final_act_xx_fg, }, .metatileMap = Map_zone_final_act_xx_fg0, @@ -44,7 +43,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_xx_fg1 = .tilesSize = sizeof(Tileset_zone_final_act_xx_fg), .palette = Palette_zone_final_act_xx_fg, .palOffset = 0, - .palLength = sizeof(Palette_zone_final_act_xx_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_zone_final_act_xx_fg), .map = Metatiles_zone_final_act_xx_fg, }, .metatileMap = Map_zone_final_act_xx_fg1, diff --git a/data/sprite_animation_data.s b/data/sprite_animation_data.s index 2a6e5b8871..4b64e8a768 100644 --- a/data/sprite_animation_data.s +++ b/data/sprite_animation_data.s @@ -3,11 +3,6 @@ mSectionRodata -@ TODO: move these into C files in src/data? - .global C_DECL(gSpritePalettes) @ 0x0816ADC8 -C_DECL(gSpritePalettes): - .include "graphics/obj_palettes.inc" - .global C_DECL(gObjTiles_4bpp) @ 0x081709A8 C_DECL(gObjTiles_4bpp): .include "graphics/obj_tiles_4bpp.inc" diff --git a/data/tilemaps/character_select_background/header.c b/data/tilemaps/character_select_background/header.c index 719e878817..83f573e780 100644 --- a/data/tilemaps/character_select_background/header.c +++ b/data/tilemaps/character_select_background/header.c @@ -1,13 +1,13 @@ #include "global.h" #include "core.h" -const u16 Palette_character_select_background[] = INCBIN_U16("data/tilemaps/character_select_background/palette.gbapal"); +const ColorRaw Palette_character_select_background[] = INCPAL("data/tilemaps/character_select_background/palette.pal"); const u8 Tiles_character_select_background[] = INCBIN_U8("data/tilemaps/character_select_background/tiles.4bpp"); const u16 Tilemap_character_select_background[] = INCBIN_U16("data/tilemaps/character_select_background/tilemap.tilemap2"); const Tilemap character_select_background = { - .xTiles = 30, - .yTiles = 20, + .xTiles = (DISPLAY_WIDTH / 8), + .yTiles = (DISPLAY_HEIGHT / 8), .animTileSize = 0, .animFrameCount = 0, .animDelay = 0, @@ -15,6 +15,6 @@ const Tilemap character_select_background = { .tilesSize = sizeof(Tiles_character_select_background), .palette = Palette_character_select_background, .palOffset = 0, - .palLength = sizeof(Palette_character_select_background) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_character_select_background), .map = Tilemap_character_select_background, }; diff --git a/data/tilemaps/character_select_background_0/header.c b/data/tilemaps/character_select_background_0/header.c index d274f36b1d..96889a3639 100644 --- a/data/tilemaps/character_select_background_0/header.c +++ b/data/tilemaps/character_select_background_0/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_character_select_background_0[] = INCBIN_U16("data/tilemaps/character_select_background_0/palette.gbapal"); +const ColorRaw Palette_character_select_background_0[] = INCPAL("data/tilemaps/character_select_background_0/palette.pal"); const u8 Tiles_character_select_background_0[] = INCBIN_U8("data/tilemaps/character_select_background_0/tiles.4bpp"); const u16 Tilemap_character_select_background_0[] = INCBIN_U16("data/tilemaps/character_select_background_0/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap character_select_background_0 = { .tilesSize = sizeof(Tiles_character_select_background_0), .palette = Palette_character_select_background_0, .palOffset = 0, - .palLength = sizeof(Palette_character_select_background_0) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_character_select_background_0), .map = Tilemap_character_select_background_0, }; diff --git a/data/tilemaps/character_select_background_1/header.c b/data/tilemaps/character_select_background_1/header.c index ac632f53fd..149df2dfaa 100644 --- a/data/tilemaps/character_select_background_1/header.c +++ b/data/tilemaps/character_select_background_1/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_character_select_background_1[] = INCBIN_U16("data/tilemaps/character_select_background_1/palette.gbapal"); +const ColorRaw Palette_character_select_background_1[] = INCPAL("data/tilemaps/character_select_background_1/palette.pal"); const u8 Tiles_character_select_background_1[] = INCBIN_U8("data/tilemaps/character_select_background_1/tiles.4bpp"); const u16 Tilemap_character_select_background_1[] = INCBIN_U16("data/tilemaps/character_select_background_1/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap character_select_background_1 = { .tilesSize = sizeof(Tiles_character_select_background_1), .palette = Palette_character_select_background_1, .palOffset = 0, - .palLength = sizeof(Palette_character_select_background_1) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_character_select_background_1), .map = Tilemap_character_select_background_1, }; diff --git a/data/tilemaps/character_select_wheel/header.c b/data/tilemaps/character_select_wheel/header.c index 98575eb9b0..14bf7279f6 100644 --- a/data/tilemaps/character_select_wheel/header.c +++ b/data/tilemaps/character_select_wheel/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_character_select_wheel[] = INCBIN_U16("data/tilemaps/character_select_wheel/palette.gbapal"); +const ColorRaw Palette_character_select_wheel[] = INCPAL("data/tilemaps/character_select_wheel/palette.pal"); const u8 Tiles_character_select_wheel[] = INCBIN_U8("data/tilemaps/character_select_wheel/tiles.4bpp"); const u16 Tilemap_character_select_wheel[] = INCBIN_U16("data/tilemaps/character_select_wheel/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap character_select_wheel = { .tilesSize = sizeof(Tiles_character_select_wheel), .palette = Palette_character_select_wheel, .palOffset = 0, - .palLength = sizeof(Palette_character_select_wheel) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_character_select_wheel), .map = Tilemap_character_select_wheel, }; diff --git a/data/tilemaps/collect_all_chaos_emeralds_de/header.c b/data/tilemaps/collect_all_chaos_emeralds_de/header.c index efe51aa5ad..6c07d2d370 100644 --- a/data/tilemaps/collect_all_chaos_emeralds_de/header.c +++ b/data/tilemaps/collect_all_chaos_emeralds_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_collect_all_chaos_emeralds_de[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_de/palette.gbapal"); +const ColorRaw Palette_collect_all_chaos_emeralds_de[] = INCPAL("data/tilemaps/collect_all_chaos_emeralds_de/palette.pal"); const u8 Tiles_collect_all_chaos_emeralds_de[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_de/tiles.4bpp"); const u16 Tilemap_collect_all_chaos_emeralds_de[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap collect_all_chaos_emeralds_de = { .tilesSize = sizeof(Tiles_collect_all_chaos_emeralds_de), .palette = Palette_collect_all_chaos_emeralds_de, .palOffset = 0, - .palLength = sizeof(Palette_collect_all_chaos_emeralds_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_collect_all_chaos_emeralds_de), .map = Tilemap_collect_all_chaos_emeralds_de, }; diff --git a/data/tilemaps/collect_all_chaos_emeralds_en/header.c b/data/tilemaps/collect_all_chaos_emeralds_en/header.c index ff3e762b47..963e11daaf 100644 --- a/data/tilemaps/collect_all_chaos_emeralds_en/header.c +++ b/data/tilemaps/collect_all_chaos_emeralds_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_collect_all_chaos_emeralds_en[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_en/palette.gbapal"); +const ColorRaw Palette_collect_all_chaos_emeralds_en[] = INCPAL("data/tilemaps/collect_all_chaos_emeralds_en/palette.pal"); const u8 Tiles_collect_all_chaos_emeralds_en[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_en/tiles.4bpp"); const u16 Tilemap_collect_all_chaos_emeralds_en[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap collect_all_chaos_emeralds_en = { .tilesSize = sizeof(Tiles_collect_all_chaos_emeralds_en), .palette = Palette_collect_all_chaos_emeralds_en, .palOffset = 0, - .palLength = sizeof(Palette_collect_all_chaos_emeralds_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_collect_all_chaos_emeralds_en), .map = Tilemap_collect_all_chaos_emeralds_en, }; diff --git a/data/tilemaps/collect_all_chaos_emeralds_es/header.c b/data/tilemaps/collect_all_chaos_emeralds_es/header.c index 4c59df2df9..a1ba1a8709 100644 --- a/data/tilemaps/collect_all_chaos_emeralds_es/header.c +++ b/data/tilemaps/collect_all_chaos_emeralds_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_collect_all_chaos_emeralds_es[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_es/palette.gbapal"); +const ColorRaw Palette_collect_all_chaos_emeralds_es[] = INCPAL("data/tilemaps/collect_all_chaos_emeralds_es/palette.pal"); const u8 Tiles_collect_all_chaos_emeralds_es[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_es/tiles.4bpp"); const u16 Tilemap_collect_all_chaos_emeralds_es[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap collect_all_chaos_emeralds_es = { .tilesSize = sizeof(Tiles_collect_all_chaos_emeralds_es), .palette = Palette_collect_all_chaos_emeralds_es, .palOffset = 0, - .palLength = sizeof(Palette_collect_all_chaos_emeralds_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_collect_all_chaos_emeralds_es), .map = Tilemap_collect_all_chaos_emeralds_es, }; diff --git a/data/tilemaps/collect_all_chaos_emeralds_fr/header.c b/data/tilemaps/collect_all_chaos_emeralds_fr/header.c index f62852efe9..925f7cafb8 100644 --- a/data/tilemaps/collect_all_chaos_emeralds_fr/header.c +++ b/data/tilemaps/collect_all_chaos_emeralds_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_collect_all_chaos_emeralds_fr[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_fr/palette.gbapal"); +const ColorRaw Palette_collect_all_chaos_emeralds_fr[] = INCPAL("data/tilemaps/collect_all_chaos_emeralds_fr/palette.pal"); const u8 Tiles_collect_all_chaos_emeralds_fr[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_fr/tiles.4bpp"); const u16 Tilemap_collect_all_chaos_emeralds_fr[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap collect_all_chaos_emeralds_fr = { .tilesSize = sizeof(Tiles_collect_all_chaos_emeralds_fr), .palette = Palette_collect_all_chaos_emeralds_fr, .palOffset = 0, - .palLength = sizeof(Palette_collect_all_chaos_emeralds_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_collect_all_chaos_emeralds_fr), .map = Tilemap_collect_all_chaos_emeralds_fr, }; diff --git a/data/tilemaps/collect_all_chaos_emeralds_it/header.c b/data/tilemaps/collect_all_chaos_emeralds_it/header.c index 67f86a0282..06cc15a692 100644 --- a/data/tilemaps/collect_all_chaos_emeralds_it/header.c +++ b/data/tilemaps/collect_all_chaos_emeralds_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_collect_all_chaos_emeralds_it[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_it/palette.gbapal"); +const ColorRaw Palette_collect_all_chaos_emeralds_it[] = INCPAL("data/tilemaps/collect_all_chaos_emeralds_it/palette.pal"); const u8 Tiles_collect_all_chaos_emeralds_it[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_it/tiles.4bpp"); const u16 Tilemap_collect_all_chaos_emeralds_it[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap collect_all_chaos_emeralds_it = { .tilesSize = sizeof(Tiles_collect_all_chaos_emeralds_it), .palette = Palette_collect_all_chaos_emeralds_it, .palOffset = 0, - .palLength = sizeof(Palette_collect_all_chaos_emeralds_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_collect_all_chaos_emeralds_it), .map = Tilemap_collect_all_chaos_emeralds_it, }; diff --git a/data/tilemaps/collect_all_chaos_emeralds_jp/header.c b/data/tilemaps/collect_all_chaos_emeralds_jp/header.c index e167fca07c..fe87eceaf2 100644 --- a/data/tilemaps/collect_all_chaos_emeralds_jp/header.c +++ b/data/tilemaps/collect_all_chaos_emeralds_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_collect_all_chaos_emeralds_jp[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_jp/palette.gbapal"); +const ColorRaw Palette_collect_all_chaos_emeralds_jp[] = INCPAL("data/tilemaps/collect_all_chaos_emeralds_jp/palette.pal"); const u8 Tiles_collect_all_chaos_emeralds_jp[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_jp/tiles.4bpp"); const u16 Tilemap_collect_all_chaos_emeralds_jp[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap collect_all_chaos_emeralds_jp = { .tilesSize = sizeof(Tiles_collect_all_chaos_emeralds_jp), .palette = Palette_collect_all_chaos_emeralds_jp, .palOffset = 0, - .palLength = sizeof(Palette_collect_all_chaos_emeralds_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_collect_all_chaos_emeralds_jp), .map = Tilemap_collect_all_chaos_emeralds_jp, }; diff --git a/data/tilemaps/credits_0/header.c b/data/tilemaps/credits_0/header.c index 3e0f3950ba..3058f5e7ac 100644 --- a/data/tilemaps/credits_0/header.c +++ b/data/tilemaps/credits_0/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_0[] = INCBIN_U16("data/tilemaps/credits_0/palette.gbapal"); +const ColorRaw Palette_credits_0[] = INCPAL("data/tilemaps/credits_0/palette.pal"); const u8 Tiles_credits_0[] = INCBIN_U8("data/tilemaps/credits_0/tiles.4bpp"); const u16 Tilemap_credits_0[] = INCBIN_U16("data/tilemaps/credits_0/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_0 = { .tilesSize = sizeof(Tiles_credits_0), .palette = Palette_credits_0, .palOffset = 0, - .palLength = sizeof(Palette_credits_0) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_0), .map = Tilemap_credits_0, }; diff --git a/data/tilemaps/credits_1/header.c b/data/tilemaps/credits_1/header.c index cd69cee637..d5dca6f0d7 100644 --- a/data/tilemaps/credits_1/header.c +++ b/data/tilemaps/credits_1/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_1[] = INCBIN_U16("data/tilemaps/credits_1/palette.gbapal"); +const ColorRaw Palette_credits_1[] = INCPAL("data/tilemaps/credits_1/palette.pal"); const u8 Tiles_credits_1[] = INCBIN_U8("data/tilemaps/credits_1/tiles.4bpp"); const u16 Tilemap_credits_1[] = INCBIN_U16("data/tilemaps/credits_1/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_1 = { .tilesSize = sizeof(Tiles_credits_1), .palette = Palette_credits_1, .palOffset = 0, - .palLength = sizeof(Palette_credits_1) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_1), .map = Tilemap_credits_1, }; diff --git a/data/tilemaps/credits_10/header.c b/data/tilemaps/credits_10/header.c index 67c078009d..ae2b3fa554 100644 --- a/data/tilemaps/credits_10/header.c +++ b/data/tilemaps/credits_10/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_10[] = INCBIN_U16("data/tilemaps/credits_10/palette.gbapal"); +const ColorRaw Palette_credits_10[] = INCPAL("data/tilemaps/credits_10/palette.pal"); const u8 Tiles_credits_10[] = INCBIN_U8("data/tilemaps/credits_10/tiles.4bpp"); const u16 Tilemap_credits_10[] = INCBIN_U16("data/tilemaps/credits_10/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_10 = { .tilesSize = sizeof(Tiles_credits_10), .palette = Palette_credits_10, .palOffset = 0, - .palLength = sizeof(Palette_credits_10) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_10), .map = Tilemap_credits_10, }; diff --git a/data/tilemaps/credits_11/header.c b/data/tilemaps/credits_11/header.c index 829b18116d..7e3f7b3695 100644 --- a/data/tilemaps/credits_11/header.c +++ b/data/tilemaps/credits_11/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_11[] = INCBIN_U16("data/tilemaps/credits_11/palette.gbapal"); +const ColorRaw Palette_credits_11[] = INCPAL("data/tilemaps/credits_11/palette.pal"); const u8 Tiles_credits_11[] = INCBIN_U8("data/tilemaps/credits_11/tiles.4bpp"); const u16 Tilemap_credits_11[] = INCBIN_U16("data/tilemaps/credits_11/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_11 = { .tilesSize = sizeof(Tiles_credits_11), .palette = Palette_credits_11, .palOffset = 0, - .palLength = sizeof(Palette_credits_11) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_11), .map = Tilemap_credits_11, }; diff --git a/data/tilemaps/credits_12/header.c b/data/tilemaps/credits_12/header.c index c88b54eb18..fd45afe51d 100644 --- a/data/tilemaps/credits_12/header.c +++ b/data/tilemaps/credits_12/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_12[] = INCBIN_U16("data/tilemaps/credits_12/palette.gbapal"); +const ColorRaw Palette_credits_12[] = INCPAL("data/tilemaps/credits_12/palette.pal"); const u8 Tiles_credits_12[] = INCBIN_U8("data/tilemaps/credits_12/tiles.4bpp"); const u16 Tilemap_credits_12[] = INCBIN_U16("data/tilemaps/credits_12/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_12 = { .tilesSize = sizeof(Tiles_credits_12), .palette = Palette_credits_12, .palOffset = 0, - .palLength = sizeof(Palette_credits_12) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_12), .map = Tilemap_credits_12, }; diff --git a/data/tilemaps/credits_13/header.c b/data/tilemaps/credits_13/header.c index 3d469fc177..03fa6e28a5 100644 --- a/data/tilemaps/credits_13/header.c +++ b/data/tilemaps/credits_13/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_13[] = INCBIN_U16("data/tilemaps/credits_13/palette.gbapal"); +const ColorRaw Palette_credits_13[] = INCPAL("data/tilemaps/credits_13/palette.pal"); const u8 Tiles_credits_13[] = INCBIN_U8("data/tilemaps/credits_13/tiles.4bpp"); const u16 Tilemap_credits_13[] = INCBIN_U16("data/tilemaps/credits_13/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_13 = { .tilesSize = sizeof(Tiles_credits_13), .palette = Palette_credits_13, .palOffset = 0, - .palLength = sizeof(Palette_credits_13) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_13), .map = Tilemap_credits_13, }; diff --git a/data/tilemaps/credits_14/header.c b/data/tilemaps/credits_14/header.c index f9ddb5e11a..6ce4adc4b3 100644 --- a/data/tilemaps/credits_14/header.c +++ b/data/tilemaps/credits_14/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_14[] = INCBIN_U16("data/tilemaps/credits_14/palette.gbapal"); +const ColorRaw Palette_credits_14[] = INCPAL("data/tilemaps/credits_14/palette.pal"); const u8 Tiles_credits_14[] = INCBIN_U8("data/tilemaps/credits_14/tiles.4bpp"); const u16 Tilemap_credits_14[] = INCBIN_U16("data/tilemaps/credits_14/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_14 = { .tilesSize = sizeof(Tiles_credits_14), .palette = Palette_credits_14, .palOffset = 0, - .palLength = sizeof(Palette_credits_14) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_14), .map = Tilemap_credits_14, }; diff --git a/data/tilemaps/credits_15/header.c b/data/tilemaps/credits_15/header.c index e5514b7acc..895b1b2eae 100644 --- a/data/tilemaps/credits_15/header.c +++ b/data/tilemaps/credits_15/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_15[] = INCBIN_U16("data/tilemaps/credits_15/palette.gbapal"); +const ColorRaw Palette_credits_15[] = INCPAL("data/tilemaps/credits_15/palette.pal"); const u8 Tiles_credits_15[] = INCBIN_U8("data/tilemaps/credits_15/tiles.4bpp"); const u16 Tilemap_credits_15[] = INCBIN_U16("data/tilemaps/credits_15/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_15 = { .tilesSize = sizeof(Tiles_credits_15), .palette = Palette_credits_15, .palOffset = 0, - .palLength = sizeof(Palette_credits_15) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_15), .map = Tilemap_credits_15, }; diff --git a/data/tilemaps/credits_16/header.c b/data/tilemaps/credits_16/header.c index 7afd932964..36c0d3dcac 100644 --- a/data/tilemaps/credits_16/header.c +++ b/data/tilemaps/credits_16/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_16[] = INCBIN_U16("data/tilemaps/credits_16/palette.gbapal"); +const ColorRaw Palette_credits_16[] = INCPAL("data/tilemaps/credits_16/palette.pal"); const u8 Tiles_credits_16[] = INCBIN_U8("data/tilemaps/credits_16/tiles.4bpp"); const u16 Tilemap_credits_16[] = INCBIN_U16("data/tilemaps/credits_16/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_16 = { .tilesSize = sizeof(Tiles_credits_16), .palette = Palette_credits_16, .palOffset = 0, - .palLength = sizeof(Palette_credits_16) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_16), .map = Tilemap_credits_16, }; diff --git a/data/tilemaps/credits_17/header.c b/data/tilemaps/credits_17/header.c index 688064ef9b..97453299d3 100644 --- a/data/tilemaps/credits_17/header.c +++ b/data/tilemaps/credits_17/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_17[] = INCBIN_U16("data/tilemaps/credits_17/palette.gbapal"); +const ColorRaw Palette_credits_17[] = INCPAL("data/tilemaps/credits_17/palette.pal"); const u8 Tiles_credits_17[] = INCBIN_U8("data/tilemaps/credits_17/tiles.4bpp"); const u16 Tilemap_credits_17[] = INCBIN_U16("data/tilemaps/credits_17/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_17 = { .tilesSize = sizeof(Tiles_credits_17), .palette = Palette_credits_17, .palOffset = 0, - .palLength = sizeof(Palette_credits_17) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_17), .map = Tilemap_credits_17, }; diff --git a/data/tilemaps/credits_18/header.c b/data/tilemaps/credits_18/header.c index 1e77edf1c7..89db57c858 100644 --- a/data/tilemaps/credits_18/header.c +++ b/data/tilemaps/credits_18/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_18[] = INCBIN_U16("data/tilemaps/credits_18/palette.gbapal"); +const ColorRaw Palette_credits_18[] = INCPAL("data/tilemaps/credits_18/palette.pal"); const u8 Tiles_credits_18[] = INCBIN_U8("data/tilemaps/credits_18/tiles.4bpp"); const u16 Tilemap_credits_18[] = INCBIN_U16("data/tilemaps/credits_18/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_18 = { .tilesSize = sizeof(Tiles_credits_18), .palette = Palette_credits_18, .palOffset = 0, - .palLength = sizeof(Palette_credits_18) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_18), .map = Tilemap_credits_18, }; diff --git a/data/tilemaps/credits_19/header.c b/data/tilemaps/credits_19/header.c index e4c2dfab90..850ba18b84 100644 --- a/data/tilemaps/credits_19/header.c +++ b/data/tilemaps/credits_19/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_19[] = INCBIN_U16("data/tilemaps/credits_19/palette.gbapal"); +const ColorRaw Palette_credits_19[] = INCPAL("data/tilemaps/credits_19/palette.pal"); const u8 Tiles_credits_19[] = INCBIN_U8("data/tilemaps/credits_19/tiles.4bpp"); const u16 Tilemap_credits_19[] = INCBIN_U16("data/tilemaps/credits_19/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_19 = { .tilesSize = sizeof(Tiles_credits_19), .palette = Palette_credits_19, .palOffset = 0, - .palLength = sizeof(Palette_credits_19) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_19), .map = Tilemap_credits_19, }; diff --git a/data/tilemaps/credits_2/header.c b/data/tilemaps/credits_2/header.c index 2ec70ae3f3..66c16156d3 100644 --- a/data/tilemaps/credits_2/header.c +++ b/data/tilemaps/credits_2/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_2[] = INCBIN_U16("data/tilemaps/credits_2/palette.gbapal"); +const ColorRaw Palette_credits_2[] = INCPAL("data/tilemaps/credits_2/palette.pal"); const u8 Tiles_credits_2[] = INCBIN_U8("data/tilemaps/credits_2/tiles.4bpp"); const u16 Tilemap_credits_2[] = INCBIN_U16("data/tilemaps/credits_2/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_2 = { .tilesSize = sizeof(Tiles_credits_2), .palette = Palette_credits_2, .palOffset = 0, - .palLength = sizeof(Palette_credits_2) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_2), .map = Tilemap_credits_2, }; diff --git a/data/tilemaps/credits_20/header.c b/data/tilemaps/credits_20/header.c index ed78ff5e62..5d1826452d 100644 --- a/data/tilemaps/credits_20/header.c +++ b/data/tilemaps/credits_20/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_20[] = INCBIN_U16("data/tilemaps/credits_20/palette.gbapal"); +const ColorRaw Palette_credits_20[] = INCPAL("data/tilemaps/credits_20/palette.pal"); const u8 Tiles_credits_20[] = INCBIN_U8("data/tilemaps/credits_20/tiles.4bpp"); const u16 Tilemap_credits_20[] = INCBIN_U16("data/tilemaps/credits_20/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_20 = { .tilesSize = sizeof(Tiles_credits_20), .palette = Palette_credits_20, .palOffset = 0, - .palLength = sizeof(Palette_credits_20) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_20), .map = Tilemap_credits_20, }; diff --git a/data/tilemaps/credits_21/header.c b/data/tilemaps/credits_21/header.c index a5b4066178..ea564172b0 100644 --- a/data/tilemaps/credits_21/header.c +++ b/data/tilemaps/credits_21/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_21[] = INCBIN_U16("data/tilemaps/credits_21/palette.gbapal"); +const ColorRaw Palette_credits_21[] = INCPAL("data/tilemaps/credits_21/palette.pal"); const u8 Tiles_credits_21[] = INCBIN_U8("data/tilemaps/credits_21/tiles.4bpp"); const u16 Tilemap_credits_21[] = INCBIN_U16("data/tilemaps/credits_21/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_21 = { .tilesSize = sizeof(Tiles_credits_21), .palette = Palette_credits_21, .palOffset = 0, - .palLength = sizeof(Palette_credits_21) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_21), .map = Tilemap_credits_21, }; diff --git a/data/tilemaps/credits_22/header.c b/data/tilemaps/credits_22/header.c index 7a7820efec..5ec8438dee 100644 --- a/data/tilemaps/credits_22/header.c +++ b/data/tilemaps/credits_22/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_22[] = INCBIN_U16("data/tilemaps/credits_22/palette.gbapal"); +const ColorRaw Palette_credits_22[] = INCPAL("data/tilemaps/credits_22/palette.pal"); const u8 Tiles_credits_22[] = INCBIN_U8("data/tilemaps/credits_22/tiles.4bpp"); const u16 Tilemap_credits_22[] = INCBIN_U16("data/tilemaps/credits_22/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_22 = { .tilesSize = sizeof(Tiles_credits_22), .palette = Palette_credits_22, .palOffset = 0, - .palLength = sizeof(Palette_credits_22) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_22), .map = Tilemap_credits_22, }; diff --git a/data/tilemaps/credits_23/header.c b/data/tilemaps/credits_23/header.c index daf07acfea..053eb0784e 100644 --- a/data/tilemaps/credits_23/header.c +++ b/data/tilemaps/credits_23/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_23[] = INCBIN_U16("data/tilemaps/credits_23/palette.gbapal"); +const ColorRaw Palette_credits_23[] = INCPAL("data/tilemaps/credits_23/palette.pal"); const u8 Tiles_credits_23[] = INCBIN_U8("data/tilemaps/credits_23/tiles.4bpp"); const u16 Tilemap_credits_23[] = INCBIN_U16("data/tilemaps/credits_23/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_23 = { .tilesSize = sizeof(Tiles_credits_23), .palette = Palette_credits_23, .palOffset = 0, - .palLength = sizeof(Palette_credits_23) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_23), .map = Tilemap_credits_23, }; diff --git a/data/tilemaps/credits_24/header.c b/data/tilemaps/credits_24/header.c index 8d0580df7d..f7aa2d0a76 100644 --- a/data/tilemaps/credits_24/header.c +++ b/data/tilemaps/credits_24/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_24[] = INCBIN_U16("data/tilemaps/credits_24/palette.gbapal"); +const ColorRaw Palette_credits_24[] = INCPAL("data/tilemaps/credits_24/palette.pal"); const u8 Tiles_credits_24[] = INCBIN_U8("data/tilemaps/credits_24/tiles.4bpp"); const u16 Tilemap_credits_24[] = INCBIN_U16("data/tilemaps/credits_24/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_24 = { .tilesSize = sizeof(Tiles_credits_24), .palette = Palette_credits_24, .palOffset = 0, - .palLength = sizeof(Palette_credits_24) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_24), .map = Tilemap_credits_24, }; diff --git a/data/tilemaps/credits_3/header.c b/data/tilemaps/credits_3/header.c index 52fdb92adc..8154fc3b06 100644 --- a/data/tilemaps/credits_3/header.c +++ b/data/tilemaps/credits_3/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_3[] = INCBIN_U16("data/tilemaps/credits_3/palette.gbapal"); +const ColorRaw Palette_credits_3[] = INCPAL("data/tilemaps/credits_3/palette.pal"); const u8 Tiles_credits_3[] = INCBIN_U8("data/tilemaps/credits_3/tiles.4bpp"); const u16 Tilemap_credits_3[] = INCBIN_U16("data/tilemaps/credits_3/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_3 = { .tilesSize = sizeof(Tiles_credits_3), .palette = Palette_credits_3, .palOffset = 0, - .palLength = sizeof(Palette_credits_3) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_3), .map = Tilemap_credits_3, }; diff --git a/data/tilemaps/credits_4/header.c b/data/tilemaps/credits_4/header.c index 4cd4225e7e..f8d8b2328a 100644 --- a/data/tilemaps/credits_4/header.c +++ b/data/tilemaps/credits_4/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_4[] = INCBIN_U16("data/tilemaps/credits_4/palette.gbapal"); +const ColorRaw Palette_credits_4[] = INCPAL("data/tilemaps/credits_4/palette.pal"); const u8 Tiles_credits_4[] = INCBIN_U8("data/tilemaps/credits_4/tiles.4bpp"); const u16 Tilemap_credits_4[] = INCBIN_U16("data/tilemaps/credits_4/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_4 = { .tilesSize = sizeof(Tiles_credits_4), .palette = Palette_credits_4, .palOffset = 0, - .palLength = sizeof(Palette_credits_4) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_4), .map = Tilemap_credits_4, }; diff --git a/data/tilemaps/credits_5/header.c b/data/tilemaps/credits_5/header.c index 5dcc78b675..dad267427e 100644 --- a/data/tilemaps/credits_5/header.c +++ b/data/tilemaps/credits_5/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_5[] = INCBIN_U16("data/tilemaps/credits_5/palette.gbapal"); +const ColorRaw Palette_credits_5[] = INCPAL("data/tilemaps/credits_5/palette.pal"); const u8 Tiles_credits_5[] = INCBIN_U8("data/tilemaps/credits_5/tiles.4bpp"); const u16 Tilemap_credits_5[] = INCBIN_U16("data/tilemaps/credits_5/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_5 = { .tilesSize = sizeof(Tiles_credits_5), .palette = Palette_credits_5, .palOffset = 0, - .palLength = sizeof(Palette_credits_5) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_5), .map = Tilemap_credits_5, }; diff --git a/data/tilemaps/credits_6/header.c b/data/tilemaps/credits_6/header.c index f77ecabddf..b0505f772e 100644 --- a/data/tilemaps/credits_6/header.c +++ b/data/tilemaps/credits_6/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_6[] = INCBIN_U16("data/tilemaps/credits_6/palette.gbapal"); +const ColorRaw Palette_credits_6[] = INCPAL("data/tilemaps/credits_6/palette.pal"); const u8 Tiles_credits_6[] = INCBIN_U8("data/tilemaps/credits_6/tiles.4bpp"); const u16 Tilemap_credits_6[] = INCBIN_U16("data/tilemaps/credits_6/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_6 = { .tilesSize = sizeof(Tiles_credits_6), .palette = Palette_credits_6, .palOffset = 0, - .palLength = sizeof(Palette_credits_6) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_6), .map = Tilemap_credits_6, }; diff --git a/data/tilemaps/credits_7/header.c b/data/tilemaps/credits_7/header.c index 63f9f3017f..f1a331a481 100644 --- a/data/tilemaps/credits_7/header.c +++ b/data/tilemaps/credits_7/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_7[] = INCBIN_U16("data/tilemaps/credits_7/palette.gbapal"); +const ColorRaw Palette_credits_7[] = INCPAL("data/tilemaps/credits_7/palette.pal"); const u8 Tiles_credits_7[] = INCBIN_U8("data/tilemaps/credits_7/tiles.4bpp"); const u16 Tilemap_credits_7[] = INCBIN_U16("data/tilemaps/credits_7/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_7 = { .tilesSize = sizeof(Tiles_credits_7), .palette = Palette_credits_7, .palOffset = 0, - .palLength = sizeof(Palette_credits_7) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_7), .map = Tilemap_credits_7, }; diff --git a/data/tilemaps/credits_8/header.c b/data/tilemaps/credits_8/header.c index 226748d56b..b0c967f168 100644 --- a/data/tilemaps/credits_8/header.c +++ b/data/tilemaps/credits_8/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_8[] = INCBIN_U16("data/tilemaps/credits_8/palette.gbapal"); +const ColorRaw Palette_credits_8[] = INCPAL("data/tilemaps/credits_8/palette.pal"); const u8 Tiles_credits_8[] = INCBIN_U8("data/tilemaps/credits_8/tiles.4bpp"); const u16 Tilemap_credits_8[] = INCBIN_U16("data/tilemaps/credits_8/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_8 = { .tilesSize = sizeof(Tiles_credits_8), .palette = Palette_credits_8, .palOffset = 0, - .palLength = sizeof(Palette_credits_8) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_8), .map = Tilemap_credits_8, }; diff --git a/data/tilemaps/credits_9/header.c b/data/tilemaps/credits_9/header.c index 338ba784d9..91b7ea29f3 100644 --- a/data/tilemaps/credits_9/header.c +++ b/data/tilemaps/credits_9/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_9[] = INCBIN_U16("data/tilemaps/credits_9/palette.gbapal"); +const ColorRaw Palette_credits_9[] = INCPAL("data/tilemaps/credits_9/palette.pal"); const u8 Tiles_credits_9[] = INCBIN_U8("data/tilemaps/credits_9/tiles.4bpp"); const u16 Tilemap_credits_9[] = INCBIN_U16("data/tilemaps/credits_9/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_9 = { .tilesSize = sizeof(Tiles_credits_9), .palette = Palette_credits_9, .palOffset = 0, - .palLength = sizeof(Palette_credits_9) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_9), .map = Tilemap_credits_9, }; diff --git a/data/tilemaps/credits_copyright/header.c b/data/tilemaps/credits_copyright/header.c index c3f7545380..00cb8d4864 100644 --- a/data/tilemaps/credits_copyright/header.c +++ b/data/tilemaps/credits_copyright/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_copyright[] = INCBIN_U16("data/tilemaps/credits_copyright/palette.gbapal"); +const ColorRaw Palette_credits_copyright[] = INCPAL("data/tilemaps/credits_copyright/palette.pal"); const u8 Tiles_credits_copyright[] = INCBIN_U8("data/tilemaps/credits_copyright/tiles.4bpp"); const u16 Tilemap_credits_copyright[] = INCBIN_U16("data/tilemaps/credits_copyright/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_copyright = { .tilesSize = sizeof(Tiles_credits_copyright), .palette = Palette_credits_copyright, .palOffset = 0, - .palLength = sizeof(Palette_credits_copyright) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_copyright), .map = Tilemap_credits_copyright, }; diff --git a/data/tilemaps/credits_presented_by_sega/header.c b/data/tilemaps/credits_presented_by_sega/header.c index 600468a595..9c60959657 100644 --- a/data/tilemaps/credits_presented_by_sega/header.c +++ b/data/tilemaps/credits_presented_by_sega/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_presented_by_sega[] = INCBIN_U16("data/tilemaps/credits_presented_by_sega/palette.gbapal"); +const ColorRaw Palette_credits_presented_by_sega[] = INCPAL("data/tilemaps/credits_presented_by_sega/palette.pal"); const u8 Tiles_credits_presented_by_sega[] = INCBIN_U8("data/tilemaps/credits_presented_by_sega/tiles.4bpp"); const u16 Tilemap_credits_presented_by_sega[] = INCBIN_U16("data/tilemaps/credits_presented_by_sega/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_presented_by_sega = { .tilesSize = sizeof(Tiles_credits_presented_by_sega), .palette = Palette_credits_presented_by_sega, .palOffset = 0, - .palLength = sizeof(Palette_credits_presented_by_sega) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_presented_by_sega), .map = Tilemap_credits_presented_by_sega, }; diff --git a/data/tilemaps/credits_sa2_logo_en/header.c b/data/tilemaps/credits_sa2_logo_en/header.c index 798ae783e2..c1b65e58e9 100644 --- a/data/tilemaps/credits_sa2_logo_en/header.c +++ b/data/tilemaps/credits_sa2_logo_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_sa2_logo_en[] = INCBIN_U16("data/tilemaps/credits_sa2_logo_en/palette.gbapal"); +const ColorRaw Palette_credits_sa2_logo_en[] = INCPAL("data/tilemaps/credits_sa2_logo_en/palette.pal"); const u8 Tiles_credits_sa2_logo_en[] = INCBIN_U8("data/tilemaps/credits_sa2_logo_en/tiles.4bpp"); const u16 Tilemap_credits_sa2_logo_en[] = INCBIN_U16("data/tilemaps/credits_sa2_logo_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_sa2_logo_en = { .tilesSize = sizeof(Tiles_credits_sa2_logo_en), .palette = Palette_credits_sa2_logo_en, .palOffset = 0, - .palLength = sizeof(Palette_credits_sa2_logo_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_sa2_logo_en), .map = Tilemap_credits_sa2_logo_en, }; diff --git a/data/tilemaps/credits_sa2_logo_jp/header.c b/data/tilemaps/credits_sa2_logo_jp/header.c index c1b10eda1a..4defd533d0 100644 --- a/data/tilemaps/credits_sa2_logo_jp/header.c +++ b/data/tilemaps/credits_sa2_logo_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_credits_sa2_logo_jp[] = INCBIN_U16("data/tilemaps/credits_sa2_logo_jp/palette.gbapal"); +const ColorRaw Palette_credits_sa2_logo_jp[] = INCPAL("data/tilemaps/credits_sa2_logo_jp/palette.pal"); const u8 Tiles_credits_sa2_logo_jp[] = INCBIN_U8("data/tilemaps/credits_sa2_logo_jp/tiles.4bpp"); const u16 Tilemap_credits_sa2_logo_jp[] = INCBIN_U16("data/tilemaps/credits_sa2_logo_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap credits_sa2_logo_jp = { .tilesSize = sizeof(Tiles_credits_sa2_logo_jp), .palette = Palette_credits_sa2_logo_jp, .palOffset = 0, - .palLength = sizeof(Palette_credits_sa2_logo_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_credits_sa2_logo_jp), .map = Tilemap_credits_sa2_logo_jp, }; diff --git a/data/tilemaps/cutscene_final_ending_fall_bg/header.c b/data/tilemaps/cutscene_final_ending_fall_bg/header.c index 66edc3767e..cc039aa1b0 100644 --- a/data/tilemaps/cutscene_final_ending_fall_bg/header.c +++ b/data/tilemaps/cutscene_final_ending_fall_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_final_ending_fall_bg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg/palette.gbapal"); +const ColorRaw Palette_cutscene_final_ending_fall_bg[] = INCPAL("data/tilemaps/cutscene_final_ending_fall_bg/palette.pal"); const u8 Tiles_cutscene_final_ending_fall_bg[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_bg/tiles.4bpp"); const u16 Tilemap_cutscene_final_ending_fall_bg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap cutscene_final_ending_fall_bg = { .tilesSize = sizeof(Tiles_cutscene_final_ending_fall_bg), .palette = Palette_cutscene_final_ending_fall_bg, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_final_ending_fall_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_final_ending_fall_bg), .map = Tilemap_cutscene_final_ending_fall_bg, }; diff --git a/data/tilemaps/cutscene_final_ending_fall_bg_dark/header.c b/data/tilemaps/cutscene_final_ending_fall_bg_dark/header.c index 492fda145f..cf1e4f4876 100644 --- a/data/tilemaps/cutscene_final_ending_fall_bg_dark/header.c +++ b/data/tilemaps/cutscene_final_ending_fall_bg_dark/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_final_ending_fall_bg_dark[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg_dark/palette.gbapal"); +const ColorRaw Palette_cutscene_final_ending_fall_bg_dark[] = INCPAL("data/tilemaps/cutscene_final_ending_fall_bg_dark/palette.pal"); const u8 Tiles_cutscene_final_ending_fall_bg_dark[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_bg_dark/tiles.4bpp"); const u16 Tilemap_cutscene_final_ending_fall_bg_dark[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg_dark/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap cutscene_final_ending_fall_bg_dark = { .tilesSize = sizeof(Tiles_cutscene_final_ending_fall_bg_dark), .palette = Palette_cutscene_final_ending_fall_bg_dark, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_final_ending_fall_bg_dark) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_final_ending_fall_bg_dark), .map = Tilemap_cutscene_final_ending_fall_bg_dark, }; diff --git a/data/tilemaps/cutscene_final_ending_fall_bg_dark_2/header.c b/data/tilemaps/cutscene_final_ending_fall_bg_dark_2/header.c index e0e90484c2..ef965a9051 100644 --- a/data/tilemaps/cutscene_final_ending_fall_bg_dark_2/header.c +++ b/data/tilemaps/cutscene_final_ending_fall_bg_dark_2/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_final_ending_fall_bg_dark_2[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg_dark_2/palette.gbapal"); +const ColorRaw Palette_cutscene_final_ending_fall_bg_dark_2[] = INCPAL("data/tilemaps/cutscene_final_ending_fall_bg_dark_2/palette.pal"); const u8 Tiles_cutscene_final_ending_fall_bg_dark_2[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_bg_dark_2/tiles.4bpp"); const u16 Tilemap_cutscene_final_ending_fall_bg_dark_2[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg_dark_2/tilemap.tilemap2"); @@ -16,6 +16,6 @@ const Tilemap cutscene_final_ending_fall_bg_dark_2 = { .tilesSize = sizeof(Tiles_cutscene_final_ending_fall_bg_dark_2), .palette = Palette_cutscene_final_ending_fall_bg_dark_2, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_final_ending_fall_bg_dark_2) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_final_ending_fall_bg_dark_2), .map = Tilemap_cutscene_final_ending_fall_bg_dark_2, }; diff --git a/data/tilemaps/cutscene_final_ending_fall_clouds/header.c b/data/tilemaps/cutscene_final_ending_fall_clouds/header.c index 396e6da9d4..69dfb45746 100644 --- a/data/tilemaps/cutscene_final_ending_fall_clouds/header.c +++ b/data/tilemaps/cutscene_final_ending_fall_clouds/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_final_ending_fall_clouds[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_clouds/palette.gbapal"); +const ColorRaw Palette_cutscene_final_ending_fall_clouds[] = INCPAL("data/tilemaps/cutscene_final_ending_fall_clouds/palette.pal"); const u8 Tiles_cutscene_final_ending_fall_clouds[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_clouds/tiles.4bpp"); const u16 Tilemap_cutscene_final_ending_fall_clouds[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_clouds/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap cutscene_final_ending_fall_clouds = { .tilesSize = sizeof(Tiles_cutscene_final_ending_fall_clouds), .palette = Palette_cutscene_final_ending_fall_clouds, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_final_ending_fall_clouds) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_final_ending_fall_clouds), .map = Tilemap_cutscene_final_ending_fall_clouds, }; diff --git a/data/tilemaps/cutscene_final_ending_land_bg/header.c b/data/tilemaps/cutscene_final_ending_land_bg/header.c index 64f34eb4db..0881ec48b9 100644 --- a/data/tilemaps/cutscene_final_ending_land_bg/header.c +++ b/data/tilemaps/cutscene_final_ending_land_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_final_ending_land_bg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg/palette.gbapal"); +const ColorRaw Palette_cutscene_final_ending_land_bg[] = INCPAL("data/tilemaps/cutscene_final_ending_land_bg/palette.pal"); const u8 Tiles_cutscene_final_ending_land_bg[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_bg/tiles.4bpp"); const u16 Tilemap_cutscene_final_ending_land_bg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap cutscene_final_ending_land_bg = { .tilesSize = sizeof(Tiles_cutscene_final_ending_land_bg), .palette = Palette_cutscene_final_ending_land_bg, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_final_ending_land_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_final_ending_land_bg), .map = Tilemap_cutscene_final_ending_land_bg, }; diff --git a/data/tilemaps/cutscene_final_ending_land_bg_alt/header.c b/data/tilemaps/cutscene_final_ending_land_bg_alt/header.c index 4617023209..09213b47cd 100644 --- a/data/tilemaps/cutscene_final_ending_land_bg_alt/header.c +++ b/data/tilemaps/cutscene_final_ending_land_bg_alt/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_final_ending_land_bg_alt[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg_alt/palette.gbapal"); +const ColorRaw Palette_cutscene_final_ending_land_bg_alt[] = INCPAL("data/tilemaps/cutscene_final_ending_land_bg_alt/palette.pal"); const u8 Tiles_cutscene_final_ending_land_bg_alt[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_bg_alt/tiles.4bpp"); const u16 Tilemap_cutscene_final_ending_land_bg_alt[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg_alt/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap cutscene_final_ending_land_bg_alt = { .tilesSize = sizeof(Tiles_cutscene_final_ending_land_bg_alt), .palette = Palette_cutscene_final_ending_land_bg_alt, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_final_ending_land_bg_alt) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_final_ending_land_bg_alt), .map = Tilemap_cutscene_final_ending_land_bg_alt, }; diff --git a/data/tilemaps/cutscene_final_ending_land_fg/header.c b/data/tilemaps/cutscene_final_ending_land_fg/header.c index f4ff271508..e499385eb9 100644 --- a/data/tilemaps/cutscene_final_ending_land_fg/header.c +++ b/data/tilemaps/cutscene_final_ending_land_fg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_final_ending_land_fg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_fg/palette.gbapal"); +const ColorRaw Palette_cutscene_final_ending_land_fg[] = INCPAL("data/tilemaps/cutscene_final_ending_land_fg/palette.pal"); const u8 Tiles_cutscene_final_ending_land_fg[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_fg/tiles.4bpp"); const u16 Tilemap_cutscene_final_ending_land_fg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_fg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap cutscene_final_ending_land_fg = { .tilesSize = sizeof(Tiles_cutscene_final_ending_land_fg), .palette = Palette_cutscene_final_ending_land_fg, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_final_ending_land_fg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_final_ending_land_fg), .map = Tilemap_cutscene_final_ending_land_fg, }; diff --git a/data/tilemaps/cutscene_final_ending_land_flower_field/header.c b/data/tilemaps/cutscene_final_ending_land_flower_field/header.c index 37284d0635..47ca7bdbd3 100644 --- a/data/tilemaps/cutscene_final_ending_land_flower_field/header.c +++ b/data/tilemaps/cutscene_final_ending_land_flower_field/header.c @@ -1,8 +1,8 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_final_ending_land_flower_field[] - = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_flower_field/palette.gbapal"); +const ColorRaw Palette_cutscene_final_ending_land_flower_field[] + = INCPAL("data/tilemaps/cutscene_final_ending_land_flower_field/palette.pal"); const u8 Tiles_cutscene_final_ending_land_flower_field[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_flower_field/tiles.4bpp"); const u16 Tilemap_cutscene_final_ending_land_flower_field[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_flower_field/tilemap.tilemap2"); @@ -17,6 +17,6 @@ const Tilemap cutscene_final_ending_land_flower_field = { .tilesSize = sizeof(Tiles_cutscene_final_ending_land_flower_field), .palette = Palette_cutscene_final_ending_land_flower_field, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_final_ending_land_flower_field) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_final_ending_land_flower_field), .map = Tilemap_cutscene_final_ending_land_flower_field, }; diff --git a/data/tilemaps/cutscene_post_extra_boss_bg/header.c b/data/tilemaps/cutscene_post_extra_boss_bg/header.c index 71b0b8e4b8..5461df135a 100644 --- a/data/tilemaps/cutscene_post_extra_boss_bg/header.c +++ b/data/tilemaps/cutscene_post_extra_boss_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_post_extra_boss_bg[] = INCBIN_U16("data/tilemaps/cutscene_post_extra_boss_bg/palette.gbapal"); +const ColorRaw Palette_cutscene_post_extra_boss_bg[] = INCPAL("data/tilemaps/cutscene_post_extra_boss_bg/palette.pal"); const u8 Tiles_cutscene_post_extra_boss_bg[] = INCBIN_U8("data/tilemaps/cutscene_post_extra_boss_bg/tiles.4bpp"); const u16 Tilemap_cutscene_post_extra_boss_bg[] = INCBIN_U16("data/tilemaps/cutscene_post_extra_boss_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap cutscene_post_extra_boss_bg = { .tilesSize = sizeof(Tiles_cutscene_post_extra_boss_bg), .palette = Palette_cutscene_post_extra_boss_bg, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_post_extra_boss_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_post_extra_boss_bg), .map = Tilemap_cutscene_post_extra_boss_bg, }; diff --git a/data/tilemaps/cutscene_vanilla_kidnapped_full_map/header.c b/data/tilemaps/cutscene_vanilla_kidnapped_full_map/header.c index 70b65f42e9..e2e45e3f7f 100644 --- a/data/tilemaps/cutscene_vanilla_kidnapped_full_map/header.c +++ b/data/tilemaps/cutscene_vanilla_kidnapped_full_map/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_vanilla_kidnapped_full_map[] = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_full_map/palette.gbapal"); +const ColorRaw Palette_cutscene_vanilla_kidnapped_full_map[] = INCPAL("data/tilemaps/cutscene_vanilla_kidnapped_full_map/palette.pal"); const u8 Tiles_cutscene_vanilla_kidnapped_full_map[] = INCBIN_U8("data/tilemaps/cutscene_vanilla_kidnapped_full_map/tiles.4bpp"); const u16 Tilemap_cutscene_vanilla_kidnapped_full_map[] = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_full_map/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap cutscene_vanilla_kidnapped_full_map = { .tilesSize = sizeof(Tiles_cutscene_vanilla_kidnapped_full_map), .palette = Palette_cutscene_vanilla_kidnapped_full_map, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_vanilla_kidnapped_full_map) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_vanilla_kidnapped_full_map), .map = Tilemap_cutscene_vanilla_kidnapped_full_map, }; diff --git a/data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/header.c b/data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/header.c index fc4af93d34..2bbeaf2f67 100644 --- a/data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/header.c +++ b/data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/header.c @@ -1,8 +1,8 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_vanilla_kidnapped_full_map_copy[] - = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/palette.gbapal"); +const ColorRaw Palette_cutscene_vanilla_kidnapped_full_map_copy[] + = INCPAL("data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/palette.pal"); const u8 Tiles_cutscene_vanilla_kidnapped_full_map_copy[] = INCBIN_U8("data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/tiles.4bpp"); const u16 Tilemap_cutscene_vanilla_kidnapped_full_map_copy[] = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/tilemap.tilemap2"); @@ -17,6 +17,6 @@ const Tilemap cutscene_vanilla_kidnapped_full_map_copy = { .tilesSize = sizeof(Tiles_cutscene_vanilla_kidnapped_full_map_copy), .palette = Palette_cutscene_vanilla_kidnapped_full_map_copy, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_vanilla_kidnapped_full_map_copy) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_vanilla_kidnapped_full_map_copy), .map = Tilemap_cutscene_vanilla_kidnapped_full_map_copy, }; diff --git a/data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/header.c b/data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/header.c index 97d195b89b..c71339bee4 100644 --- a/data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/header.c +++ b/data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/header.c @@ -1,8 +1,8 @@ #include "global.h" #include "core.h" -const u16 Palette_cutscene_vanilla_kidnapped_super_sonic_art[] - = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/palette.gbapal"); +const ColorRaw Palette_cutscene_vanilla_kidnapped_super_sonic_art[] + = INCPAL("data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/palette.pal"); const u8 Tiles_cutscene_vanilla_kidnapped_super_sonic_art[] = INCBIN_U8("data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/tiles.4bpp"); const u16 Tilemap_cutscene_vanilla_kidnapped_super_sonic_art[] @@ -18,6 +18,6 @@ const Tilemap cutscene_vanilla_kidnapped_super_sonic_art = { .tilesSize = sizeof(Tiles_cutscene_vanilla_kidnapped_super_sonic_art), .palette = Palette_cutscene_vanilla_kidnapped_super_sonic_art, .palOffset = 0, - .palLength = sizeof(Palette_cutscene_vanilla_kidnapped_super_sonic_art) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_cutscene_vanilla_kidnapped_super_sonic_art), .map = Tilemap_cutscene_vanilla_kidnapped_super_sonic_art, }; diff --git a/data/tilemaps/egg_saucer_wheel_copy/header.c b/data/tilemaps/egg_saucer_wheel_copy/header.c index 83a3763fed..a827366f79 100644 --- a/data/tilemaps/egg_saucer_wheel_copy/header.c +++ b/data/tilemaps/egg_saucer_wheel_copy/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_egg_saucer_wheel_copy[] = INCBIN_U16("data/tilemaps/egg_saucer_wheel_copy/palette.gbapal"); +const ColorRaw Palette_egg_saucer_wheel_copy[] = INCPAL("data/tilemaps/egg_saucer_wheel_copy/palette.pal"); const u8 Tiles_egg_saucer_wheel_copy[] = INCBIN_U8("data/tilemaps/egg_saucer_wheel_copy/tiles.4bpp"); const u16 Tilemap_egg_saucer_wheel_copy[] = INCBIN_U16("data/tilemaps/egg_saucer_wheel_copy/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap egg_saucer_wheel_copy = { .tilesSize = sizeof(Tiles_egg_saucer_wheel_copy), .palette = Palette_egg_saucer_wheel_copy, .palOffset = 0, - .palLength = sizeof(Palette_egg_saucer_wheel_copy) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_egg_saucer_wheel_copy), .map = Tilemap_egg_saucer_wheel_copy, }; diff --git a/data/tilemaps/extra_boss_background/header.c b/data/tilemaps/extra_boss_background/header.c index d3a7a0fb5f..6808c7134e 100644 --- a/data/tilemaps/extra_boss_background/header.c +++ b/data/tilemaps/extra_boss_background/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_extra_boss_background[] = INCBIN_U16("data/tilemaps/extra_boss_background/palette.gbapal"); +const ColorRaw Palette_extra_boss_background[] = INCPAL("data/tilemaps/extra_boss_background/palette.pal"); const u8 Tiles_extra_boss_background[] = INCBIN_U8("data/tilemaps/extra_boss_background/tiles.4bpp"); const u16 Tilemap_extra_boss_background[] = INCBIN_U16("data/tilemaps/extra_boss_background/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap extra_boss_background = { .tilesSize = sizeof(Tiles_extra_boss_background), .palette = Palette_extra_boss_background, .palOffset = 0, - .palLength = sizeof(Palette_extra_boss_background) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_extra_boss_background), .map = Tilemap_extra_boss_background, }; diff --git a/data/tilemaps/extra_boss_background_copy/header.c b/data/tilemaps/extra_boss_background_copy/header.c index 6249b11398..32c7b8de95 100644 --- a/data/tilemaps/extra_boss_background_copy/header.c +++ b/data/tilemaps/extra_boss_background_copy/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_extra_boss_background_copy[] = INCBIN_U16("data/tilemaps/extra_boss_background_copy/palette.gbapal"); +const ColorRaw Palette_extra_boss_background_copy[] = INCPAL("data/tilemaps/extra_boss_background_copy/palette.pal"); const u8 Tiles_extra_boss_background_copy[] = INCBIN_U8("data/tilemaps/extra_boss_background_copy/tiles.4bpp"); const u16 Tilemap_extra_boss_background_copy[] = INCBIN_U16("data/tilemaps/extra_boss_background_copy/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap extra_boss_background_copy = { .tilesSize = sizeof(Tiles_extra_boss_background_copy), .palette = Palette_extra_boss_background_copy, .palOffset = 0, - .palLength = sizeof(Palette_extra_boss_background_copy) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_extra_boss_background_copy), .map = Tilemap_extra_boss_background_copy, }; diff --git a/data/tilemaps/extra_boss_cockpit/header.c b/data/tilemaps/extra_boss_cockpit/header.c index d84156915c..1876e08f9a 100644 --- a/data/tilemaps/extra_boss_cockpit/header.c +++ b/data/tilemaps/extra_boss_cockpit/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_extra_boss_cockpit[] = INCBIN_U16("data/tilemaps/extra_boss_cockpit/palette.gbapal"); +const ColorRaw Palette_extra_boss_cockpit[] = INCPAL("data/tilemaps/extra_boss_cockpit/palette.pal"); const u8 Tiles_extra_boss_cockpit[] = INCBIN_U8("data/tilemaps/extra_boss_cockpit/tiles.4bpp"); const u8 Tilemap_extra_boss_cockpit[] = INCBIN_U8("data/tilemaps/extra_boss_cockpit/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap extra_boss_cockpit = { .tilesSize = sizeof(Tiles_extra_boss_cockpit), .palette = Palette_extra_boss_cockpit, .palOffset = 0, - .palLength = sizeof(Palette_extra_boss_cockpit) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_extra_boss_cockpit), .map = (const u16 *)Tilemap_extra_boss_cockpit, }; diff --git a/data/tilemaps/green_caret/header.c b/data/tilemaps/green_caret/header.c index be1885add7..b2cbfbdf75 100644 --- a/data/tilemaps/green_caret/header.c +++ b/data/tilemaps/green_caret/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_green_caret[] = INCBIN_U16("data/tilemaps/green_caret/palette.gbapal"); +const ColorRaw Palette_green_caret[] = INCPAL("data/tilemaps/green_caret/palette.pal"); const u8 Tiles_green_caret[] = INCBIN_U8("data/tilemaps/green_caret/tiles.4bpp"); const u16 Tilemap_green_caret[] = INCBIN_U16("data/tilemaps/green_caret/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap green_caret = { .tilesSize = sizeof(Tiles_green_caret), .palette = Palette_green_caret, .palOffset = 0, - .palLength = sizeof(Palette_green_caret) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_green_caret), .map = Tilemap_green_caret, }; diff --git a/data/tilemaps/intro_created_by_sonic_team/header.c b/data/tilemaps/intro_created_by_sonic_team/header.c index f7280b519b..da431beb22 100644 --- a/data/tilemaps/intro_created_by_sonic_team/header.c +++ b/data/tilemaps/intro_created_by_sonic_team/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_intro_created_by_sonic_team[] = INCBIN_U16("data/tilemaps/intro_created_by_sonic_team/palette.gbapal"); +const ColorRaw Palette_intro_created_by_sonic_team[] = INCPAL("data/tilemaps/intro_created_by_sonic_team/palette.pal"); const u8 Tiles_intro_created_by_sonic_team[] = INCBIN_U8("data/tilemaps/intro_created_by_sonic_team/tiles.4bpp"); const u16 Tilemap_intro_created_by_sonic_team[] = INCBIN_U16("data/tilemaps/intro_created_by_sonic_team/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap intro_created_by_sonic_team = { .tilesSize = sizeof(Tiles_intro_created_by_sonic_team), .palette = Palette_intro_created_by_sonic_team, .palOffset = 0, - .palLength = sizeof(Palette_intro_created_by_sonic_team) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_intro_created_by_sonic_team), .map = Tilemap_intro_created_by_sonic_team, }; diff --git a/data/tilemaps/intro_presented_by_sega/header.c b/data/tilemaps/intro_presented_by_sega/header.c index 5aa2188de5..bfd4671be8 100644 --- a/data/tilemaps/intro_presented_by_sega/header.c +++ b/data/tilemaps/intro_presented_by_sega/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_intro_presented_by_sega[] = INCBIN_U16("data/tilemaps/intro_presented_by_sega/palette.gbapal"); +const ColorRaw Palette_intro_presented_by_sega[] = INCPAL("data/tilemaps/intro_presented_by_sega/palette.pal"); const u8 Tiles_intro_presented_by_sega[] = INCBIN_U8("data/tilemaps/intro_presented_by_sega/tiles.4bpp"); const u16 Tilemap_intro_presented_by_sega[] = INCBIN_U16("data/tilemaps/intro_presented_by_sega/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap intro_presented_by_sega = { .tilesSize = sizeof(Tiles_intro_presented_by_sega), .palette = Palette_intro_presented_by_sega, .palOffset = 0, - .palLength = sizeof(Palette_intro_presented_by_sega) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_intro_presented_by_sega), .map = Tilemap_intro_presented_by_sega, }; diff --git a/data/tilemaps/intro_water/header.c b/data/tilemaps/intro_water/header.c index 703f1d07a1..b9fce96eaa 100644 --- a/data/tilemaps/intro_water/header.c +++ b/data/tilemaps/intro_water/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_intro_water[] = INCBIN_U16("data/tilemaps/intro_water/palette.gbapal"); +const ColorRaw Palette_intro_water[] = INCPAL("data/tilemaps/intro_water/palette.pal"); const u8 Tiles_intro_water[] = INCBIN_U8("data/tilemaps/intro_water/tiles.4bpp"); const u8 Tilemap_intro_water[] = INCBIN_U8("data/tilemaps/intro_water/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap intro_water = { .tilesSize = sizeof(Tiles_intro_water), .palette = Palette_intro_water, .palOffset = 0, - .palLength = sizeof(Palette_intro_water) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_intro_water), .map = (const u16 *)Tilemap_intro_water, }; diff --git a/data/tilemaps/lens_flare_bg/header.c b/data/tilemaps/lens_flare_bg/header.c index 34f3abc551..5f8a29bda1 100644 --- a/data/tilemaps/lens_flare_bg/header.c +++ b/data/tilemaps/lens_flare_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_lens_flare_bg[] = INCBIN_U16("data/tilemaps/lens_flare_bg/palette.gbapal"); +const ColorRaw Palette_lens_flare_bg[] = INCPAL("data/tilemaps/lens_flare_bg/palette.pal"); const u8 Tiles_lens_flare_bg[] = INCBIN_U8("data/tilemaps/lens_flare_bg/tiles.4bpp"); const u16 Tilemap_lens_flare_bg[] = INCBIN_U16("data/tilemaps/lens_flare_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap lens_flare_bg = { .tilesSize = sizeof(Tiles_lens_flare_bg), .palette = Palette_lens_flare_bg, .palOffset = 0, - .palLength = sizeof(Palette_lens_flare_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_lens_flare_bg), .map = Tilemap_lens_flare_bg, }; diff --git a/data/tilemaps/message_box_black/header.c b/data/tilemaps/message_box_black/header.c index 2c47e95025..4cab66686d 100644 --- a/data/tilemaps/message_box_black/header.c +++ b/data/tilemaps/message_box_black/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_message_box_black[] = INCBIN_U16("data/tilemaps/message_box_black/palette.gbapal"); +const ColorRaw Palette_message_box_black[] = INCPAL("data/tilemaps/message_box_black/palette.pal"); const u8 Tiles_message_box_black[] = INCBIN_U8("data/tilemaps/message_box_black/tiles.4bpp"); const u16 Tilemap_message_box_black[] = INCBIN_U16("data/tilemaps/message_box_black/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap message_box_black = { .tilesSize = sizeof(Tiles_message_box_black), .palette = Palette_message_box_black, .palOffset = 0, - .palLength = sizeof(Palette_message_box_black) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_message_box_black), .map = Tilemap_message_box_black, }; diff --git a/data/tilemaps/mp_character_selected_amy/header.c b/data/tilemaps/mp_character_selected_amy/header.c index 28f9d1c17f..410f7fbbc7 100644 --- a/data/tilemaps/mp_character_selected_amy/header.c +++ b/data/tilemaps/mp_character_selected_amy/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_character_selected_amy[] = INCBIN_U16("data/tilemaps/mp_character_selected_amy/palette.gbapal"); +const ColorRaw Palette_mp_character_selected_amy[] = INCPAL("data/tilemaps/mp_character_selected_amy/palette.pal"); const u8 Tiles_mp_character_selected_amy[] = INCBIN_U8("data/tilemaps/mp_character_selected_amy/tiles.4bpp"); const u16 Tilemap_mp_character_selected_amy[] = INCBIN_U16("data/tilemaps/mp_character_selected_amy/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_character_selected_amy = { .tilesSize = sizeof(Tiles_mp_character_selected_amy), .palette = Palette_mp_character_selected_amy, .palOffset = 0, - .palLength = sizeof(Palette_mp_character_selected_amy) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_character_selected_amy), .map = Tilemap_mp_character_selected_amy, }; diff --git a/data/tilemaps/mp_character_selected_amy_bg/header.c b/data/tilemaps/mp_character_selected_amy_bg/header.c index 07e677b387..6f1511c50b 100644 --- a/data/tilemaps/mp_character_selected_amy_bg/header.c +++ b/data/tilemaps/mp_character_selected_amy_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_character_selected_amy_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_amy_bg/palette.gbapal"); +const ColorRaw Palette_mp_character_selected_amy_bg[] = INCPAL("data/tilemaps/mp_character_selected_amy_bg/palette.pal"); const u8 Tiles_mp_character_selected_amy_bg[] = INCBIN_U8("data/tilemaps/mp_character_selected_amy_bg/tiles.4bpp"); const u16 Tilemap_mp_character_selected_amy_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_amy_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_character_selected_amy_bg = { .tilesSize = sizeof(Tiles_mp_character_selected_amy_bg), .palette = Palette_mp_character_selected_amy_bg, .palOffset = 0, - .palLength = sizeof(Palette_mp_character_selected_amy_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_character_selected_amy_bg), .map = Tilemap_mp_character_selected_amy_bg, }; diff --git a/data/tilemaps/mp_character_selected_cream/header.c b/data/tilemaps/mp_character_selected_cream/header.c index f9bb5165e4..c59f7d3fd0 100644 --- a/data/tilemaps/mp_character_selected_cream/header.c +++ b/data/tilemaps/mp_character_selected_cream/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_character_selected_cream[] = INCBIN_U16("data/tilemaps/mp_character_selected_cream/palette.gbapal"); +const ColorRaw Palette_mp_character_selected_cream[] = INCPAL("data/tilemaps/mp_character_selected_cream/palette.pal"); const u8 Tiles_mp_character_selected_cream[] = INCBIN_U8("data/tilemaps/mp_character_selected_cream/tiles.4bpp"); const u16 Tilemap_mp_character_selected_cream[] = INCBIN_U16("data/tilemaps/mp_character_selected_cream/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_character_selected_cream = { .tilesSize = sizeof(Tiles_mp_character_selected_cream), .palette = Palette_mp_character_selected_cream, .palOffset = 0, - .palLength = sizeof(Palette_mp_character_selected_cream) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_character_selected_cream), .map = Tilemap_mp_character_selected_cream, }; diff --git a/data/tilemaps/mp_character_selected_cream_bg/header.c b/data/tilemaps/mp_character_selected_cream_bg/header.c index 6aa7fc972d..f80a5f6dc7 100644 --- a/data/tilemaps/mp_character_selected_cream_bg/header.c +++ b/data/tilemaps/mp_character_selected_cream_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_character_selected_cream_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_cream_bg/palette.gbapal"); +const ColorRaw Palette_mp_character_selected_cream_bg[] = INCPAL("data/tilemaps/mp_character_selected_cream_bg/palette.pal"); const u8 Tiles_mp_character_selected_cream_bg[] = INCBIN_U8("data/tilemaps/mp_character_selected_cream_bg/tiles.4bpp"); const u16 Tilemap_mp_character_selected_cream_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_cream_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_character_selected_cream_bg = { .tilesSize = sizeof(Tiles_mp_character_selected_cream_bg), .palette = Palette_mp_character_selected_cream_bg, .palOffset = 0, - .palLength = sizeof(Palette_mp_character_selected_cream_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_character_selected_cream_bg), .map = Tilemap_mp_character_selected_cream_bg, }; diff --git a/data/tilemaps/mp_character_selected_knuckles/header.c b/data/tilemaps/mp_character_selected_knuckles/header.c index 0764e01d5e..1e467f06ce 100644 --- a/data/tilemaps/mp_character_selected_knuckles/header.c +++ b/data/tilemaps/mp_character_selected_knuckles/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_character_selected_knuckles[] = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles/palette.gbapal"); +const ColorRaw Palette_mp_character_selected_knuckles[] = INCPAL("data/tilemaps/mp_character_selected_knuckles/palette.pal"); const u8 Tiles_mp_character_selected_knuckles[] = INCBIN_U8("data/tilemaps/mp_character_selected_knuckles/tiles.4bpp"); const u16 Tilemap_mp_character_selected_knuckles[] = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_character_selected_knuckles = { .tilesSize = sizeof(Tiles_mp_character_selected_knuckles), .palette = Palette_mp_character_selected_knuckles, .palOffset = 0, - .palLength = sizeof(Palette_mp_character_selected_knuckles) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_character_selected_knuckles), .map = Tilemap_mp_character_selected_knuckles, }; diff --git a/data/tilemaps/mp_character_selected_knuckles_bg/header.c b/data/tilemaps/mp_character_selected_knuckles_bg/header.c index 2c6694268f..68e3decce8 100644 --- a/data/tilemaps/mp_character_selected_knuckles_bg/header.c +++ b/data/tilemaps/mp_character_selected_knuckles_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_character_selected_knuckles_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles_bg/palette.gbapal"); +const ColorRaw Palette_mp_character_selected_knuckles_bg[] = INCPAL("data/tilemaps/mp_character_selected_knuckles_bg/palette.pal"); const u8 Tiles_mp_character_selected_knuckles_bg[] = INCBIN_U8("data/tilemaps/mp_character_selected_knuckles_bg/tiles.4bpp"); const u16 Tilemap_mp_character_selected_knuckles_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_character_selected_knuckles_bg = { .tilesSize = sizeof(Tiles_mp_character_selected_knuckles_bg), .palette = Palette_mp_character_selected_knuckles_bg, .palOffset = 0, - .palLength = sizeof(Palette_mp_character_selected_knuckles_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_character_selected_knuckles_bg), .map = Tilemap_mp_character_selected_knuckles_bg, }; diff --git a/data/tilemaps/mp_character_selected_sonic/header.c b/data/tilemaps/mp_character_selected_sonic/header.c index aa320a9f64..618b45e9fa 100644 --- a/data/tilemaps/mp_character_selected_sonic/header.c +++ b/data/tilemaps/mp_character_selected_sonic/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_character_selected_sonic[] = INCBIN_U16("data/tilemaps/mp_character_selected_sonic/palette.gbapal"); +const ColorRaw Palette_mp_character_selected_sonic[] = INCPAL("data/tilemaps/mp_character_selected_sonic/palette.pal"); const u8 Tiles_mp_character_selected_sonic[] = INCBIN_U8("data/tilemaps/mp_character_selected_sonic/tiles.4bpp"); const u16 Tilemap_mp_character_selected_sonic[] = INCBIN_U16("data/tilemaps/mp_character_selected_sonic/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_character_selected_sonic = { .tilesSize = sizeof(Tiles_mp_character_selected_sonic), .palette = Palette_mp_character_selected_sonic, .palOffset = 0, - .palLength = sizeof(Palette_mp_character_selected_sonic) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_character_selected_sonic), .map = Tilemap_mp_character_selected_sonic, }; diff --git a/data/tilemaps/mp_character_selected_sonic_bg/header.c b/data/tilemaps/mp_character_selected_sonic_bg/header.c index f620adde31..79e4c79a1a 100644 --- a/data/tilemaps/mp_character_selected_sonic_bg/header.c +++ b/data/tilemaps/mp_character_selected_sonic_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_character_selected_sonic_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_sonic_bg/palette.gbapal"); +const ColorRaw Palette_mp_character_selected_sonic_bg[] = INCPAL("data/tilemaps/mp_character_selected_sonic_bg/palette.pal"); const u8 Tiles_mp_character_selected_sonic_bg[] = INCBIN_U8("data/tilemaps/mp_character_selected_sonic_bg/tiles.4bpp"); const u16 Tilemap_mp_character_selected_sonic_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_sonic_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_character_selected_sonic_bg = { .tilesSize = sizeof(Tiles_mp_character_selected_sonic_bg), .palette = Palette_mp_character_selected_sonic_bg, .palOffset = 0, - .palLength = sizeof(Palette_mp_character_selected_sonic_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_character_selected_sonic_bg), .map = Tilemap_mp_character_selected_sonic_bg, }; diff --git a/data/tilemaps/mp_character_selected_tails/header.c b/data/tilemaps/mp_character_selected_tails/header.c index 54b606a90e..81c20ba126 100644 --- a/data/tilemaps/mp_character_selected_tails/header.c +++ b/data/tilemaps/mp_character_selected_tails/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_character_selected_tails[] = INCBIN_U16("data/tilemaps/mp_character_selected_tails/palette.gbapal"); +const ColorRaw Palette_mp_character_selected_tails[] = INCPAL("data/tilemaps/mp_character_selected_tails/palette.pal"); const u8 Tiles_mp_character_selected_tails[] = INCBIN_U8("data/tilemaps/mp_character_selected_tails/tiles.4bpp"); const u16 Tilemap_mp_character_selected_tails[] = INCBIN_U16("data/tilemaps/mp_character_selected_tails/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_character_selected_tails = { .tilesSize = sizeof(Tiles_mp_character_selected_tails), .palette = Palette_mp_character_selected_tails, .palOffset = 0, - .palLength = sizeof(Palette_mp_character_selected_tails) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_character_selected_tails), .map = Tilemap_mp_character_selected_tails, }; diff --git a/data/tilemaps/mp_character_selected_tails_bg/header.c b/data/tilemaps/mp_character_selected_tails_bg/header.c index 5659d50a2e..643efa7305 100644 --- a/data/tilemaps/mp_character_selected_tails_bg/header.c +++ b/data/tilemaps/mp_character_selected_tails_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_character_selected_tails_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_tails_bg/palette.gbapal"); +const ColorRaw Palette_mp_character_selected_tails_bg[] = INCPAL("data/tilemaps/mp_character_selected_tails_bg/palette.pal"); const u8 Tiles_mp_character_selected_tails_bg[] = INCBIN_U8("data/tilemaps/mp_character_selected_tails_bg/tiles.4bpp"); const u16 Tilemap_mp_character_selected_tails_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_tails_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_character_selected_tails_bg = { .tilesSize = sizeof(Tiles_mp_character_selected_tails_bg), .palette = Palette_mp_character_selected_tails_bg, .palOffset = 0, - .palLength = sizeof(Palette_mp_character_selected_tails_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_character_selected_tails_bg), .map = Tilemap_mp_character_selected_tails_bg, }; diff --git a/data/tilemaps/mp_characters_selected_de/header.c b/data/tilemaps/mp_characters_selected_de/header.c index 93037060ee..85c1c5599a 100644 --- a/data/tilemaps/mp_characters_selected_de/header.c +++ b/data/tilemaps/mp_characters_selected_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_characters_selected_de[] = INCBIN_U16("data/tilemaps/mp_characters_selected_de/palette.gbapal"); +const ColorRaw Palette_mp_characters_selected_de[] = INCPAL("data/tilemaps/mp_characters_selected_de/palette.pal"); const u8 Tiles_mp_characters_selected_de[] = INCBIN_U8("data/tilemaps/mp_characters_selected_de/tiles.4bpp"); const u16 Tilemap_mp_characters_selected_de[] = INCBIN_U16("data/tilemaps/mp_characters_selected_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_characters_selected_de = { .tilesSize = sizeof(Tiles_mp_characters_selected_de), .palette = Palette_mp_characters_selected_de, .palOffset = 0, - .palLength = sizeof(Palette_mp_characters_selected_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_characters_selected_de), .map = Tilemap_mp_characters_selected_de, }; diff --git a/data/tilemaps/mp_characters_selected_en/header.c b/data/tilemaps/mp_characters_selected_en/header.c index d4ff11477b..5000753764 100644 --- a/data/tilemaps/mp_characters_selected_en/header.c +++ b/data/tilemaps/mp_characters_selected_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_characters_selected_en[] = INCBIN_U16("data/tilemaps/mp_characters_selected_en/palette.gbapal"); +const ColorRaw Palette_mp_characters_selected_en[] = INCPAL("data/tilemaps/mp_characters_selected_en/palette.pal"); const u8 Tiles_mp_characters_selected_en[] = INCBIN_U8("data/tilemaps/mp_characters_selected_en/tiles.4bpp"); const u16 Tilemap_mp_characters_selected_en[] = INCBIN_U16("data/tilemaps/mp_characters_selected_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_characters_selected_en = { .tilesSize = sizeof(Tiles_mp_characters_selected_en), .palette = Palette_mp_characters_selected_en, .palOffset = 0, - .palLength = sizeof(Palette_mp_characters_selected_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_characters_selected_en), .map = Tilemap_mp_characters_selected_en, }; diff --git a/data/tilemaps/mp_characters_selected_es/header.c b/data/tilemaps/mp_characters_selected_es/header.c index 293a22bf28..5758476831 100644 --- a/data/tilemaps/mp_characters_selected_es/header.c +++ b/data/tilemaps/mp_characters_selected_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_characters_selected_es[] = INCBIN_U16("data/tilemaps/mp_characters_selected_es/palette.gbapal"); +const ColorRaw Palette_mp_characters_selected_es[] = INCPAL("data/tilemaps/mp_characters_selected_es/palette.pal"); const u8 Tiles_mp_characters_selected_es[] = INCBIN_U8("data/tilemaps/mp_characters_selected_es/tiles.4bpp"); const u16 Tilemap_mp_characters_selected_es[] = INCBIN_U16("data/tilemaps/mp_characters_selected_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_characters_selected_es = { .tilesSize = sizeof(Tiles_mp_characters_selected_es), .palette = Palette_mp_characters_selected_es, .palOffset = 0, - .palLength = sizeof(Palette_mp_characters_selected_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_characters_selected_es), .map = Tilemap_mp_characters_selected_es, }; diff --git a/data/tilemaps/mp_characters_selected_fr/header.c b/data/tilemaps/mp_characters_selected_fr/header.c index 9ebbf3734b..5eaba5640b 100644 --- a/data/tilemaps/mp_characters_selected_fr/header.c +++ b/data/tilemaps/mp_characters_selected_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_characters_selected_fr[] = INCBIN_U16("data/tilemaps/mp_characters_selected_fr/palette.gbapal"); +const ColorRaw Palette_mp_characters_selected_fr[] = INCPAL("data/tilemaps/mp_characters_selected_fr/palette.pal"); const u8 Tiles_mp_characters_selected_fr[] = INCBIN_U8("data/tilemaps/mp_characters_selected_fr/tiles.4bpp"); const u16 Tilemap_mp_characters_selected_fr[] = INCBIN_U16("data/tilemaps/mp_characters_selected_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_characters_selected_fr = { .tilesSize = sizeof(Tiles_mp_characters_selected_fr), .palette = Palette_mp_characters_selected_fr, .palOffset = 0, - .palLength = sizeof(Palette_mp_characters_selected_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_characters_selected_fr), .map = Tilemap_mp_characters_selected_fr, }; diff --git a/data/tilemaps/mp_characters_selected_it/header.c b/data/tilemaps/mp_characters_selected_it/header.c index 23a881d561..27dec242ca 100644 --- a/data/tilemaps/mp_characters_selected_it/header.c +++ b/data/tilemaps/mp_characters_selected_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_characters_selected_it[] = INCBIN_U16("data/tilemaps/mp_characters_selected_it/palette.gbapal"); +const ColorRaw Palette_mp_characters_selected_it[] = INCPAL("data/tilemaps/mp_characters_selected_it/palette.pal"); const u8 Tiles_mp_characters_selected_it[] = INCBIN_U8("data/tilemaps/mp_characters_selected_it/tiles.4bpp"); const u16 Tilemap_mp_characters_selected_it[] = INCBIN_U16("data/tilemaps/mp_characters_selected_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_characters_selected_it = { .tilesSize = sizeof(Tiles_mp_characters_selected_it), .palette = Palette_mp_characters_selected_it, .palOffset = 0, - .palLength = sizeof(Palette_mp_characters_selected_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_characters_selected_it), .map = Tilemap_mp_characters_selected_it, }; diff --git a/data/tilemaps/mp_characters_selected_jp/header.c b/data/tilemaps/mp_characters_selected_jp/header.c index 4ce91f7127..64ca3ef02a 100644 --- a/data/tilemaps/mp_characters_selected_jp/header.c +++ b/data/tilemaps/mp_characters_selected_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_characters_selected_jp[] = INCBIN_U16("data/tilemaps/mp_characters_selected_jp/palette.gbapal"); +const ColorRaw Palette_mp_characters_selected_jp[] = INCPAL("data/tilemaps/mp_characters_selected_jp/palette.pal"); const u8 Tiles_mp_characters_selected_jp[] = INCBIN_U8("data/tilemaps/mp_characters_selected_jp/tiles.4bpp"); const u16 Tilemap_mp_characters_selected_jp[] = INCBIN_U16("data/tilemaps/mp_characters_selected_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_characters_selected_jp = { .tilesSize = sizeof(Tiles_mp_characters_selected_jp), .palette = Palette_mp_characters_selected_jp, .palOffset = 0, - .palLength = sizeof(Palette_mp_characters_selected_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_characters_selected_jp), .map = Tilemap_mp_characters_selected_jp, }; diff --git a/data/tilemaps/mp_cheese_please_wait_de/header.c b/data/tilemaps/mp_cheese_please_wait_de/header.c index 4ac0d38aa7..9f62515465 100644 --- a/data/tilemaps/mp_cheese_please_wait_de/header.c +++ b/data/tilemaps/mp_cheese_please_wait_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_cheese_please_wait_de[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_de/palette.gbapal"); +const ColorRaw Palette_mp_cheese_please_wait_de[] = INCPAL("data/tilemaps/mp_cheese_please_wait_de/palette.pal"); const u8 Tiles_mp_cheese_please_wait_de[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_de/tiles.4bpp"); const u16 Tilemap_mp_cheese_please_wait_de[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_cheese_please_wait_de = { .tilesSize = sizeof(Tiles_mp_cheese_please_wait_de), .palette = Palette_mp_cheese_please_wait_de, .palOffset = 0, - .palLength = sizeof(Palette_mp_cheese_please_wait_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_cheese_please_wait_de), .map = Tilemap_mp_cheese_please_wait_de, }; diff --git a/data/tilemaps/mp_cheese_please_wait_en/header.c b/data/tilemaps/mp_cheese_please_wait_en/header.c index fb2dde9fb6..d60cfecffe 100644 --- a/data/tilemaps/mp_cheese_please_wait_en/header.c +++ b/data/tilemaps/mp_cheese_please_wait_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_cheese_please_wait_en[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_en/palette.gbapal"); +const ColorRaw Palette_mp_cheese_please_wait_en[] = INCPAL("data/tilemaps/mp_cheese_please_wait_en/palette.pal"); const u8 Tiles_mp_cheese_please_wait_en[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_en/tiles.4bpp"); const u16 Tilemap_mp_cheese_please_wait_en[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_cheese_please_wait_en = { .tilesSize = sizeof(Tiles_mp_cheese_please_wait_en), .palette = Palette_mp_cheese_please_wait_en, .palOffset = 0, - .palLength = sizeof(Palette_mp_cheese_please_wait_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_cheese_please_wait_en), .map = Tilemap_mp_cheese_please_wait_en, }; diff --git a/data/tilemaps/mp_cheese_please_wait_es/header.c b/data/tilemaps/mp_cheese_please_wait_es/header.c index a2b2ebe473..1415412d91 100644 --- a/data/tilemaps/mp_cheese_please_wait_es/header.c +++ b/data/tilemaps/mp_cheese_please_wait_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_cheese_please_wait_es[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_es/palette.gbapal"); +const ColorRaw Palette_mp_cheese_please_wait_es[] = INCPAL("data/tilemaps/mp_cheese_please_wait_es/palette.pal"); const u8 Tiles_mp_cheese_please_wait_es[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_es/tiles.4bpp"); const u16 Tilemap_mp_cheese_please_wait_es[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_cheese_please_wait_es = { .tilesSize = sizeof(Tiles_mp_cheese_please_wait_es), .palette = Palette_mp_cheese_please_wait_es, .palOffset = 0, - .palLength = sizeof(Palette_mp_cheese_please_wait_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_cheese_please_wait_es), .map = Tilemap_mp_cheese_please_wait_es, }; diff --git a/data/tilemaps/mp_cheese_please_wait_fr/header.c b/data/tilemaps/mp_cheese_please_wait_fr/header.c index 2e9c0676ec..2716fb607c 100644 --- a/data/tilemaps/mp_cheese_please_wait_fr/header.c +++ b/data/tilemaps/mp_cheese_please_wait_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_cheese_please_wait_fr[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_fr/palette.gbapal"); +const ColorRaw Palette_mp_cheese_please_wait_fr[] = INCPAL("data/tilemaps/mp_cheese_please_wait_fr/palette.pal"); const u8 Tiles_mp_cheese_please_wait_fr[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_fr/tiles.4bpp"); const u16 Tilemap_mp_cheese_please_wait_fr[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_cheese_please_wait_fr = { .tilesSize = sizeof(Tiles_mp_cheese_please_wait_fr), .palette = Palette_mp_cheese_please_wait_fr, .palOffset = 0, - .palLength = sizeof(Palette_mp_cheese_please_wait_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_cheese_please_wait_fr), .map = Tilemap_mp_cheese_please_wait_fr, }; diff --git a/data/tilemaps/mp_cheese_please_wait_it/header.c b/data/tilemaps/mp_cheese_please_wait_it/header.c index 408f681a92..70d890a31b 100644 --- a/data/tilemaps/mp_cheese_please_wait_it/header.c +++ b/data/tilemaps/mp_cheese_please_wait_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_cheese_please_wait_it[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_it/palette.gbapal"); +const ColorRaw Palette_mp_cheese_please_wait_it[] = INCPAL("data/tilemaps/mp_cheese_please_wait_it/palette.pal"); const u8 Tiles_mp_cheese_please_wait_it[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_it/tiles.4bpp"); const u16 Tilemap_mp_cheese_please_wait_it[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_cheese_please_wait_it = { .tilesSize = sizeof(Tiles_mp_cheese_please_wait_it), .palette = Palette_mp_cheese_please_wait_it, .palOffset = 0, - .palLength = sizeof(Palette_mp_cheese_please_wait_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_cheese_please_wait_it), .map = Tilemap_mp_cheese_please_wait_it, }; diff --git a/data/tilemaps/mp_cheese_please_wait_jp/header.c b/data/tilemaps/mp_cheese_please_wait_jp/header.c index a332b366e3..b5170998eb 100644 --- a/data/tilemaps/mp_cheese_please_wait_jp/header.c +++ b/data/tilemaps/mp_cheese_please_wait_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_cheese_please_wait_jp[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_jp/palette.gbapal"); +const ColorRaw Palette_mp_cheese_please_wait_jp[] = INCPAL("data/tilemaps/mp_cheese_please_wait_jp/palette.pal"); const u8 Tiles_mp_cheese_please_wait_jp[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_jp/tiles.4bpp"); const u16 Tilemap_mp_cheese_please_wait_jp[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_cheese_please_wait_jp = { .tilesSize = sizeof(Tiles_mp_cheese_please_wait_jp), .palette = Palette_mp_cheese_please_wait_jp, .palOffset = 0, - .palLength = sizeof(Palette_mp_cheese_please_wait_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_cheese_please_wait_jp), .map = Tilemap_mp_cheese_please_wait_jp, }; diff --git a/data/tilemaps/mp_message_box_unknown/header.c b/data/tilemaps/mp_message_box_unknown/header.c index 72d948a78b..2d725d7663 100644 --- a/data/tilemaps/mp_message_box_unknown/header.c +++ b/data/tilemaps/mp_message_box_unknown/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_message_box_unknown[] = INCBIN_U16("data/tilemaps/mp_message_box_unknown/palette.gbapal"); +const ColorRaw Palette_mp_message_box_unknown[] = INCPAL("data/tilemaps/mp_message_box_unknown/palette.pal"); const u8 Tiles_mp_message_box_unknown[] = INCBIN_U8("data/tilemaps/mp_message_box_unknown/tiles.4bpp"); const u16 Tilemap_mp_message_box_unknown[] = INCBIN_U16("data/tilemaps/mp_message_box_unknown/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_message_box_unknown = { .tilesSize = sizeof(Tiles_mp_message_box_unknown), .palette = Palette_mp_message_box_unknown, .palOffset = 0, - .palLength = sizeof(Palette_mp_message_box_unknown) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_message_box_unknown), .map = Tilemap_mp_message_box_unknown, }; diff --git a/data/tilemaps/mp_orange_bg/header.c b/data/tilemaps/mp_orange_bg/header.c index 84138f32c2..c1de4c59d9 100644 --- a/data/tilemaps/mp_orange_bg/header.c +++ b/data/tilemaps/mp_orange_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_orange_bg[] = INCBIN_U16("data/tilemaps/mp_orange_bg/palette.gbapal"); +const ColorRaw Palette_mp_orange_bg[] = INCPAL("data/tilemaps/mp_orange_bg/palette.pal"); const u8 Tiles_mp_orange_bg[] = INCBIN_U8("data/tilemaps/mp_orange_bg/tiles.4bpp"); const u16 Tilemap_mp_orange_bg[] = INCBIN_U16("data/tilemaps/mp_orange_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_orange_bg = { .tilesSize = sizeof(Tiles_mp_orange_bg), .palette = Palette_mp_orange_bg, .palOffset = 0, - .palLength = sizeof(Palette_mp_orange_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_orange_bg), .map = Tilemap_mp_orange_bg, }; diff --git a/data/tilemaps/mp_unknown_green/header.c b/data/tilemaps/mp_unknown_green/header.c index 863e86de1b..b76a07e6c0 100644 --- a/data/tilemaps/mp_unknown_green/header.c +++ b/data/tilemaps/mp_unknown_green/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_unknown_green[] = INCBIN_U16("data/tilemaps/mp_unknown_green/palette.gbapal"); +const ColorRaw Palette_mp_unknown_green[] = INCPAL("data/tilemaps/mp_unknown_green/palette.pal"); const u8 Tiles_mp_unknown_green[] = INCBIN_U8("data/tilemaps/mp_unknown_green/tiles.4bpp"); const u16 Tilemap_mp_unknown_green[] = INCBIN_U16("data/tilemaps/mp_unknown_green/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_unknown_green = { .tilesSize = sizeof(Tiles_mp_unknown_green), .palette = Palette_mp_unknown_green, .palOffset = 0, - .palLength = sizeof(Palette_mp_unknown_green) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_unknown_green), .map = Tilemap_mp_unknown_green, }; diff --git a/data/tilemaps/mp_unknown_orange_zigzag/header.c b/data/tilemaps/mp_unknown_orange_zigzag/header.c index 22c7565b42..ccfc863037 100644 --- a/data/tilemaps/mp_unknown_orange_zigzag/header.c +++ b/data/tilemaps/mp_unknown_orange_zigzag/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_unknown_orange_zigzag[] = INCBIN_U16("data/tilemaps/mp_unknown_orange_zigzag/palette.gbapal"); +const ColorRaw Palette_mp_unknown_orange_zigzag[] = INCPAL("data/tilemaps/mp_unknown_orange_zigzag/palette.pal"); const u8 Tiles_mp_unknown_orange_zigzag[] = INCBIN_U8("data/tilemaps/mp_unknown_orange_zigzag/tiles.4bpp"); const u16 Tilemap_mp_unknown_orange_zigzag[] = INCBIN_U16("data/tilemaps/mp_unknown_orange_zigzag/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_unknown_orange_zigzag = { .tilesSize = sizeof(Tiles_mp_unknown_orange_zigzag), .palette = Palette_mp_unknown_orange_zigzag, .palOffset = 0, - .palLength = sizeof(Palette_mp_unknown_orange_zigzag) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_unknown_orange_zigzag), .map = Tilemap_mp_unknown_orange_zigzag, }; diff --git a/data/tilemaps/mp_vs_background_text/header.c b/data/tilemaps/mp_vs_background_text/header.c index 486aaddd4d..3246d8e5dd 100644 --- a/data/tilemaps/mp_vs_background_text/header.c +++ b/data/tilemaps/mp_vs_background_text/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_vs_background_text[] = INCBIN_U16("data/tilemaps/mp_vs_background_text/palette.gbapal"); +const ColorRaw Palette_mp_vs_background_text[] = INCPAL("data/tilemaps/mp_vs_background_text/palette.pal"); const u8 Tiles_mp_vs_background_text[] = INCBIN_U8("data/tilemaps/mp_vs_background_text/tiles.4bpp"); const u16 Tilemap_mp_vs_background_text[] = INCBIN_U16("data/tilemaps/mp_vs_background_text/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_vs_background_text = { .tilesSize = sizeof(Tiles_mp_vs_background_text), .palette = Palette_mp_vs_background_text, .palOffset = 0, - .palLength = sizeof(Palette_mp_vs_background_text) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_vs_background_text), .map = Tilemap_mp_vs_background_text, }; diff --git a/data/tilemaps/mp_wait_connection/header.c b/data/tilemaps/mp_wait_connection/header.c index b221507ff7..a0d12adfee 100644 --- a/data/tilemaps/mp_wait_connection/header.c +++ b/data/tilemaps/mp_wait_connection/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_mp_wait_connection[] = INCBIN_U16("data/tilemaps/mp_wait_connection/palette.gbapal"); +const ColorRaw Palette_mp_wait_connection[] = INCPAL("data/tilemaps/mp_wait_connection/palette.pal"); const u8 Tiles_mp_wait_connection[] = INCBIN_U8("data/tilemaps/mp_wait_connection/tiles.4bpp"); const u16 Tilemap_mp_wait_connection[] = INCBIN_U16("data/tilemaps/mp_wait_connection/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap mp_wait_connection = { .tilesSize = sizeof(Tiles_mp_wait_connection), .palette = Palette_mp_wait_connection, .palOffset = 0, - .palLength = sizeof(Palette_mp_wait_connection) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_mp_wait_connection), .map = Tilemap_mp_wait_connection, }; diff --git a/data/tilemaps/music_plant_moving_stars/header.c b/data/tilemaps/music_plant_moving_stars/header.c index a98530d941..f6ef0a12aa 100644 --- a/data/tilemaps/music_plant_moving_stars/header.c +++ b/data/tilemaps/music_plant_moving_stars/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_music_plant_moving_stars[] = INCBIN_U16("data/tilemaps/music_plant_moving_stars/palette.gbapal"); +const ColorRaw Palette_music_plant_moving_stars[] = INCPAL("data/tilemaps/music_plant_moving_stars/palette.pal"); const u8 Tiles_music_plant_moving_stars[] = INCBIN_U8("data/tilemaps/music_plant_moving_stars/tiles.4bpp"); const u16 Tilemap_music_plant_moving_stars[] = INCBIN_U16("data/tilemaps/music_plant_moving_stars/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap music_plant_moving_stars = { .tilesSize = sizeof(Tiles_music_plant_moving_stars), .palette = Palette_music_plant_moving_stars, .palOffset = 0, - .palLength = sizeof(Palette_music_plant_moving_stars) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_music_plant_moving_stars), .map = Tilemap_music_plant_moving_stars, }; diff --git a/data/tilemaps/options_bg0/header.c b/data/tilemaps/options_bg0/header.c index 5273cf8fd0..39eec3a28e 100644 --- a/data/tilemaps/options_bg0/header.c +++ b/data/tilemaps/options_bg0/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_options_bg0[] = INCBIN_U16("data/tilemaps/options_bg0/palette.gbapal"); +const ColorRaw Palette_options_bg0[] = INCPAL("data/tilemaps/options_bg0/palette.pal"); const u8 Tiles_options_bg0[] = INCBIN_U8("data/tilemaps/options_bg0/tiles.4bpp"); const u16 Tilemap_options_bg0[] = INCBIN_U16("data/tilemaps/options_bg0/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap options_bg0 = { .tilesSize = sizeof(Tiles_options_bg0), .palette = Palette_options_bg0, .palOffset = 0, - .palLength = sizeof(Palette_options_bg0) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_options_bg0), .map = Tilemap_options_bg0, }; diff --git a/data/tilemaps/options_enter_name/header.c b/data/tilemaps/options_enter_name/header.c index a6b0da0c05..98e4817f18 100644 --- a/data/tilemaps/options_enter_name/header.c +++ b/data/tilemaps/options_enter_name/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_options_enter_name[] = INCBIN_U16("data/tilemaps/options_enter_name/palette.gbapal"); +const ColorRaw Palette_options_enter_name[] = INCPAL("data/tilemaps/options_enter_name/palette.pal"); const u8 Tiles_options_enter_name[] = INCBIN_U8("data/tilemaps/options_enter_name/tiles.4bpp"); const u16 Tilemap_options_enter_name[] = INCBIN_U16("data/tilemaps/options_enter_name/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap options_enter_name = { .tilesSize = sizeof(Tiles_options_enter_name), .palette = Palette_options_enter_name, .palOffset = 0, - .palLength = sizeof(Palette_options_enter_name) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_options_enter_name), .map = Tilemap_options_enter_name, }; diff --git a/data/tilemaps/options_enter_name_characters/header.c b/data/tilemaps/options_enter_name_characters/header.c index 982d1a4c46..e35f490586 100644 --- a/data/tilemaps/options_enter_name_characters/header.c +++ b/data/tilemaps/options_enter_name_characters/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_options_enter_name_characters[] = INCBIN_U16("data/tilemaps/options_enter_name_characters/palette.gbapal"); +const ColorRaw Palette_options_enter_name_characters[] = INCPAL("data/tilemaps/options_enter_name_characters/palette.pal"); const u8 Tiles_options_enter_name_characters[] = INCBIN_U8("data/tilemaps/options_enter_name_characters/tiles.4bpp"); const u16 Tilemap_options_enter_name_characters[] = INCBIN_U16("data/tilemaps/options_enter_name_characters/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap options_enter_name_characters = { .tilesSize = sizeof(Tiles_options_enter_name_characters), .palette = Palette_options_enter_name_characters, .palOffset = 0, - .palLength = sizeof(Palette_options_enter_name_characters) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_options_enter_name_characters), .map = Tilemap_options_enter_name_characters, }; diff --git a/data/tilemaps/options_language_select/header.c b/data/tilemaps/options_language_select/header.c index fbb3d561fe..c889ba4130 100644 --- a/data/tilemaps/options_language_select/header.c +++ b/data/tilemaps/options_language_select/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_options_language_select[] = INCBIN_U16("data/tilemaps/options_language_select/palette.gbapal"); +const ColorRaw Palette_options_language_select[] = INCPAL("data/tilemaps/options_language_select/palette.pal"); const u8 Tiles_options_language_select[] = INCBIN_U8("data/tilemaps/options_language_select/tiles.4bpp"); const u16 Tilemap_options_language_select[] = INCBIN_U16("data/tilemaps/options_language_select/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap options_language_select = { .tilesSize = sizeof(Tiles_options_language_select), .palette = Palette_options_language_select, .palOffset = 0, - .palLength = sizeof(Palette_options_language_select) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_options_language_select), .map = Tilemap_options_language_select, }; diff --git a/data/tilemaps/options_time_record_bg0/header.c b/data/tilemaps/options_time_record_bg0/header.c index da66027bf5..c0c1ef709b 100644 --- a/data/tilemaps/options_time_record_bg0/header.c +++ b/data/tilemaps/options_time_record_bg0/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_options_time_record_bg0[] = INCBIN_U16("data/tilemaps/options_time_record_bg0/palette.gbapal"); +const ColorRaw Palette_options_time_record_bg0[] = INCPAL("data/tilemaps/options_time_record_bg0/palette.pal"); const u8 Tiles_options_time_record_bg0[] = INCBIN_U8("data/tilemaps/options_time_record_bg0/tiles.4bpp"); const u16 Tilemap_options_time_record_bg0[] = INCBIN_U16("data/tilemaps/options_time_record_bg0/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap options_time_record_bg0 = { .tilesSize = sizeof(Tiles_options_time_record_bg0), .palette = Palette_options_time_record_bg0, .palOffset = 0, - .palLength = sizeof(Palette_options_time_record_bg0) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_options_time_record_bg0), .map = Tilemap_options_time_record_bg0, }; diff --git a/data/tilemaps/options_time_record_bg1/header.c b/data/tilemaps/options_time_record_bg1/header.c index 31199989f8..a803d4da01 100644 --- a/data/tilemaps/options_time_record_bg1/header.c +++ b/data/tilemaps/options_time_record_bg1/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_options_time_record_bg1[] = INCBIN_U16("data/tilemaps/options_time_record_bg1/palette.gbapal"); +const ColorRaw Palette_options_time_record_bg1[] = INCPAL("data/tilemaps/options_time_record_bg1/palette.pal"); const u8 Tiles_options_time_record_bg1[] = INCBIN_U8("data/tilemaps/options_time_record_bg1/tiles.4bpp"); const u16 Tilemap_options_time_record_bg1[] = INCBIN_U16("data/tilemaps/options_time_record_bg1/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap options_time_record_bg1 = { .tilesSize = sizeof(Tiles_options_time_record_bg1), .palette = Palette_options_time_record_bg1, .palOffset = 0, - .palLength = sizeof(Palette_options_time_record_bg1) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_options_time_record_bg1), .map = Tilemap_options_time_record_bg1, }; diff --git a/data/tilemaps/options_vs_record_bg1/header.c b/data/tilemaps/options_vs_record_bg1/header.c index e36f1cb22b..d7c240646f 100644 --- a/data/tilemaps/options_vs_record_bg1/header.c +++ b/data/tilemaps/options_vs_record_bg1/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_options_vs_record_bg1[] = INCBIN_U16("data/tilemaps/options_vs_record_bg1/palette.gbapal"); +const ColorRaw Palette_options_vs_record_bg1[] = INCPAL("data/tilemaps/options_vs_record_bg1/palette.pal"); const u8 Tiles_options_vs_record_bg1[] = INCBIN_U8("data/tilemaps/options_vs_record_bg1/tiles.4bpp"); const u16 Tilemap_options_vs_record_bg1[] = INCBIN_U16("data/tilemaps/options_vs_record_bg1/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap options_vs_record_bg1 = { .tilesSize = sizeof(Tiles_options_vs_record_bg1), .palette = Palette_options_vs_record_bg1, .palOffset = 0, - .palLength = sizeof(Palette_options_vs_record_bg1) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_options_vs_record_bg1), .map = Tilemap_options_vs_record_bg1, }; diff --git a/data/tilemaps/regular_final_boss/header.c b/data/tilemaps/regular_final_boss/header.c index c0453b40a0..78919cce45 100644 --- a/data/tilemaps/regular_final_boss/header.c +++ b/data/tilemaps/regular_final_boss/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_regular_final_boss[] = INCBIN_U16("data/tilemaps/regular_final_boss/palette.gbapal"); +const ColorRaw Palette_regular_final_boss[] = INCPAL("data/tilemaps/regular_final_boss/palette.pal"); const u8 Tiles_regular_final_boss[] = INCBIN_U8("data/tilemaps/regular_final_boss/tiles.4bpp"); const u16 Tilemap_regular_final_boss[] = INCBIN_U16("data/tilemaps/regular_final_boss/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap regular_final_boss = { .tilesSize = sizeof(Tiles_regular_final_boss), .palette = Palette_regular_final_boss, .palOffset = 0, - .palLength = sizeof(Palette_regular_final_boss) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_regular_final_boss), .map = Tilemap_regular_final_boss, }; diff --git a/data/tilemaps/regular_final_boss_building_bg/header.c b/data/tilemaps/regular_final_boss_building_bg/header.c index b170c3bac1..3490246408 100644 --- a/data/tilemaps/regular_final_boss_building_bg/header.c +++ b/data/tilemaps/regular_final_boss_building_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_regular_final_boss_building_bg[] = INCBIN_U16("data/tilemaps/regular_final_boss_building_bg/palette.gbapal"); +const ColorRaw Palette_regular_final_boss_building_bg[] = INCPAL("data/tilemaps/regular_final_boss_building_bg/palette.pal"); const u8 Tiles_regular_final_boss_building_bg[] = INCBIN_U8("data/tilemaps/regular_final_boss_building_bg/tiles.4bpp"); const u16 Tilemap_regular_final_boss_building_bg[] = INCBIN_U16("data/tilemaps/regular_final_boss_building_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap regular_final_boss_building_bg = { .tilesSize = sizeof(Tiles_regular_final_boss_building_bg), .palette = Palette_regular_final_boss_building_bg, .palOffset = 0, - .palLength = sizeof(Palette_regular_final_boss_building_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_regular_final_boss_building_bg), .map = Tilemap_regular_final_boss_building_bg, }; diff --git a/data/tilemaps/sa1_title_bg/header.c b/data/tilemaps/sa1_title_bg/header.c index 642e5ae602..9c29412b18 100644 --- a/data/tilemaps/sa1_title_bg/header.c +++ b/data/tilemaps/sa1_title_bg/header.c @@ -1,7 +1,9 @@ #include "global.h" #include "core.h" -const u16 Palette_sa1_title_bg[] = { +#ifndef NON_MATCHING +// This uses transparency, which gbagfx doesn't (yet) support +const ColorRaw Palette_sa1_title_bg[] = { 0x8340, 0, 0x9000, 0x2000, 0x421, 0x8c20, 0x2800, 0x1c20, 0x3000, 0xb000, 0xac20, 0x9c40, 0x8842, 0x3802, 0x3022, 0xac40, 0xb820, 0xb802, 0xb440, 0x65, 0x3423, 0x3860, 0x2082, 0xb061, 0x1084, 0x3c60, 0x3844, 0xe1, 0x4460, 0x3046, 0xaca0, 0x4860, 0xca6, 0xac83, 0x9ca3, 0xd060, 0x94a5, 0xbc81, 0xd460, 0xb865, 0x14, 0xd860, 0x2c88, 0xc0c0, 0xc8a1, 0x98c6, 0x5c80, 0x15, @@ -19,6 +21,9 @@ const u16 Palette_sa1_title_bg[] = { 0x435f, 0x13bf, 0xff96, 0x3df, 0x6f7b, 0x477f, 0x83df, 0x7fb7, 0x579c, 0x3ff, 0x6f5f, 0x479f, 0x97df, 0x83ff, 0xffb8, 0x739c, 0xcf9f, 0xffb9, 0x77bd, 0x7fda, 0x779f, 0x63df, 0xffdc, 0x7bde, 0xfbbf, 0x7ffd, 0xfbde, 0x7ffd, 0xebff, 0x7fff, 0xfffe, 0xffff, }; +#else +const ColorRaw Palette_sa1_title_bg[] = INCPAL("data/tilemaps/sa1_title_bg/palette.pal"); +#endif const u8 Tiles_sa1_title_bg[] = INCBIN_U8("data/tilemaps/sa1_title_bg/tiles.4bpp"); const u16 Tilemap_sa1_title_bg[] = INCBIN_U16("data/tilemaps/sa1_title_bg/tilemap.tilemap2"); @@ -33,6 +38,6 @@ const Tilemap sa1_title_bg = { .tilesSize = sizeof(Tiles_sa1_title_bg), .palette = Palette_sa1_title_bg, .palOffset = 0, - .palLength = sizeof(Palette_sa1_title_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_sa1_title_bg), .map = Tilemap_sa1_title_bg, }; diff --git a/data/tilemaps/sa1_title_bg/palette.pal b/data/tilemaps/sa1_title_bg/palette.pal new file mode 100644 index 0000000000..2f2362881d --- /dev/null +++ b/data/tilemaps/sa1_title_bg/palette.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 213 0 +0 0 0 +0 0 32 +0 0 65 +8 8 8 +0 8 24 +0 0 82 +0 8 57 +0 0 98 +0 0 98 +0 8 90 +0 16 57 +16 16 16 +16 0 115 +16 8 98 +0 16 90 +0 8 115 +16 0 115 +0 16 106 +41 24 0 +24 8 106 +0 24 115 +16 32 65 +8 24 98 +32 32 32 +0 24 123 +32 16 115 +8 57 0 +0 24 139 +49 16 98 +0 41 90 +0 24 148 +49 41 24 +24 32 90 +24 41 57 +0 24 164 +41 41 41 +8 32 123 +0 24 172 +41 24 115 +164 0 0 +0 24 180 +65 32 90 +0 49 131 +8 41 148 +49 49 49 +0 32 189 +172 0 0 +0 24 197 +32 57 82 +32 49 115 +189 0 0 +98 41 0 +197 0 0 +0 41 197 +0 65 148 +16 41 172 +205 0 0 +24 57 148 +8 41 197 +16 98 0 +82 49 82 +213 0 0 +65 65 57 +65 57 115 +16 49 189 +49 74 90 +0 82 164 +8 57 205 +41 74 123 +106 49 65 +16 65 205 +230 0 41 +41 74 156 +74 74 74 +0 98 180 +16 65 205 +115 65 32 +213 16 41 +8 131 0 +32 65 197 +0 106 189 +65 82 106 +74 74 148 +98 82 57 +90 90 90 +65 82 156 +131 74 32 +0 115 197 +41 98 164 +49 131 24 +41 82 213 +90 90 131 +98 98 98 +0 115 230 +0 123 205 +172 82 0 +230 41 65 +74 98 164 +156 90 32 +90 123 49 +123 98 65 +0 139 213 +57 98 205 +0 115 255 +74 106 164 +106 106 106 +0 131 255 +0 148 222 +49 123 180 +172 98 16 +57 106 222 +139 106 65 +8 131 255 +32 139 205 +115 115 115 +0 156 230 +49 172 0 +205 74 90 +74 115 197 +106 115 148 +57 139 197 +16 148 255 +180 115 8 +205 90 98 +123 123 131 +148 123 74 +74 123 230 +32 156 222 +90 131 197 +32 156 255 +65 148 213 +197 123 8 +115 131 180 +180 131 41 +139 139 131 +32 172 230 +41 164 255 +90 139 230 +164 139 90 +65 164 222 +131 139 164 +238 98 123 +24 189 246 +205 139 8 +49 172 255 +148 148 148 +106 156 205 +49 180 255 +57 180 255 +106 156 230 +139 156 164 +74 172 230 +180 148 90 +222 115 131 +156 156 156 +57 180 255 +106 197 57 +106 164 230 +65 189 255 +148 156 172 +238 139 57 +65 189 255 +74 189 255 +189 164 98 +131 164 222 +197 164 57 +74 189 255 +164 164 172 +115 172 238 +82 189 255 +230 172 0 +82 197 255 +238 156 74 +172 172 172 +197 172 98 +238 148 156 +213 180 49 +131 180 238 +255 172 0 +246 164 82 +172 180 189 +106 205 255 +213 189 98 +255 180 0 +180 180 180 +246 172 90 +148 197 246 +255 189 0 +189 189 197 +123 213 255 +255 197 0 +246 172 180 +246 180 98 +156 205 246 +255 197 0 +222 197 123 +189 197 197 +230 205 74 +246 205 32 +255 189 106 +255 205 0 +197 197 205 +148 213 255 +205 205 197 +255 213 0 +148 222 255 +148 222 255 +255 197 115 +255 222 0 +238 205 131 +172 213 255 +205 205 205 +213 213 164 +156 222 255 +255 205 123 +255 222 0 +255 230 0 +238 222 74 +255 205 131 +246 197 205 +172 230 255 +213 213 213 +255 238 0 +255 213 131 +255 238 32 +180 230 255 +255 246 0 +222 222 222 +255 222 139 +255 246 0 +189 238 255 +230 230 172 +255 255 0 +255 213 222 +255 230 139 +255 246 41 +255 255 0 +197 238 255 +230 230 230 +255 230 156 +205 238 255 +238 238 238 +213 246 255 +255 230 238 +255 246 197 +230 246 255 +246 246 246 +255 238 246 +238 255 255 +246 246 246 +238 255 255 +255 255 213 +255 255 255 +246 255 255 +255 255 255 diff --git a/data/tilemaps/sa1_title_logo/header.c b/data/tilemaps/sa1_title_logo/header.c index 5b624b470b..48a1593ecc 100644 --- a/data/tilemaps/sa1_title_logo/header.c +++ b/data/tilemaps/sa1_title_logo/header.c @@ -1,8 +1,9 @@ #include "global.h" #include "core.h" +#ifndef NON_MATCHING // This uses transparency, which gbagfx doesn't (yet) support -const u16 Palette_sa1_title_logo[] = { +const ColorRaw Palette_sa1_title_logo[] = { 0x8340, 0, 0x9000, 0x2000, 0x421, 0x8c20, 0x2800, 0x1c20, 0x3000, 0xb000, 0xac20, 0x9c40, 0x8842, 0x3802, 0x3022, 0xac40, 0xb820, 0xb802, 0xb440, 0x65, 0x3423, 0x3860, 0x2082, 0xb061, 0x1084, 0x3c60, 0x3844, 0xe1, 0x4460, 0x3046, 0xaca0, 0x4860, 0xca6, 0xac83, 0x9ca3, 0xd060, 0x94a5, 0xbc81, 0xd460, 0xb865, 0x14, 0xd860, 0x2c88, 0xc0c0, 0xc8a1, 0x98c6, 0x5c80, 0x15, @@ -20,6 +21,9 @@ const u16 Palette_sa1_title_logo[] = { 0x435f, 0x13bf, 0xff96, 0x3df, 0x6f7b, 0x477f, 0x83df, 0x7fb7, 0x579c, 0x3ff, 0x6f5f, 0x479f, 0x97df, 0x83ff, 0xffb8, 0x739c, 0xcf9f, 0xffb9, 0x77bd, 0x7fda, 0x779f, 0x63df, 0xffdc, 0x7bde, 0xfbbf, 0x7ffd, 0xfbde, 0x7ffd, 0xebff, 0x7fff, 0xfffe, 0xffff, }; +#else +const ColorRaw Palette_sa1_title_logo[] = INCPAL("data/tilemaps/sa1_title_logo/palette.pal"); +#endif const u8 Tiles_sa1_title_logo[] = INCBIN_U8("data/tilemaps/sa1_title_logo/tiles.4bpp"); const u8 Tilemap_sa1_title_logo[] = INCBIN_U8("data/tilemaps/sa1_title_logo/tilemap.tilemap2"); @@ -34,6 +38,6 @@ const Tilemap sa1_title_logo = { .tilesSize = sizeof(Tiles_sa1_title_logo), .palette = Palette_sa1_title_logo, .palOffset = 0, - .palLength = sizeof(Palette_sa1_title_logo) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_sa1_title_logo), .map = (const u16 *)Tilemap_sa1_title_logo, }; diff --git a/data/tilemaps/sa1_title_logo/palette.pal b/data/tilemaps/sa1_title_logo/palette.pal new file mode 100644 index 0000000000..2f2362881d --- /dev/null +++ b/data/tilemaps/sa1_title_logo/palette.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 213 0 +0 0 0 +0 0 32 +0 0 65 +8 8 8 +0 8 24 +0 0 82 +0 8 57 +0 0 98 +0 0 98 +0 8 90 +0 16 57 +16 16 16 +16 0 115 +16 8 98 +0 16 90 +0 8 115 +16 0 115 +0 16 106 +41 24 0 +24 8 106 +0 24 115 +16 32 65 +8 24 98 +32 32 32 +0 24 123 +32 16 115 +8 57 0 +0 24 139 +49 16 98 +0 41 90 +0 24 148 +49 41 24 +24 32 90 +24 41 57 +0 24 164 +41 41 41 +8 32 123 +0 24 172 +41 24 115 +164 0 0 +0 24 180 +65 32 90 +0 49 131 +8 41 148 +49 49 49 +0 32 189 +172 0 0 +0 24 197 +32 57 82 +32 49 115 +189 0 0 +98 41 0 +197 0 0 +0 41 197 +0 65 148 +16 41 172 +205 0 0 +24 57 148 +8 41 197 +16 98 0 +82 49 82 +213 0 0 +65 65 57 +65 57 115 +16 49 189 +49 74 90 +0 82 164 +8 57 205 +41 74 123 +106 49 65 +16 65 205 +230 0 41 +41 74 156 +74 74 74 +0 98 180 +16 65 205 +115 65 32 +213 16 41 +8 131 0 +32 65 197 +0 106 189 +65 82 106 +74 74 148 +98 82 57 +90 90 90 +65 82 156 +131 74 32 +0 115 197 +41 98 164 +49 131 24 +41 82 213 +90 90 131 +98 98 98 +0 115 230 +0 123 205 +172 82 0 +230 41 65 +74 98 164 +156 90 32 +90 123 49 +123 98 65 +0 139 213 +57 98 205 +0 115 255 +74 106 164 +106 106 106 +0 131 255 +0 148 222 +49 123 180 +172 98 16 +57 106 222 +139 106 65 +8 131 255 +32 139 205 +115 115 115 +0 156 230 +49 172 0 +205 74 90 +74 115 197 +106 115 148 +57 139 197 +16 148 255 +180 115 8 +205 90 98 +123 123 131 +148 123 74 +74 123 230 +32 156 222 +90 131 197 +32 156 255 +65 148 213 +197 123 8 +115 131 180 +180 131 41 +139 139 131 +32 172 230 +41 164 255 +90 139 230 +164 139 90 +65 164 222 +131 139 164 +238 98 123 +24 189 246 +205 139 8 +49 172 255 +148 148 148 +106 156 205 +49 180 255 +57 180 255 +106 156 230 +139 156 164 +74 172 230 +180 148 90 +222 115 131 +156 156 156 +57 180 255 +106 197 57 +106 164 230 +65 189 255 +148 156 172 +238 139 57 +65 189 255 +74 189 255 +189 164 98 +131 164 222 +197 164 57 +74 189 255 +164 164 172 +115 172 238 +82 189 255 +230 172 0 +82 197 255 +238 156 74 +172 172 172 +197 172 98 +238 148 156 +213 180 49 +131 180 238 +255 172 0 +246 164 82 +172 180 189 +106 205 255 +213 189 98 +255 180 0 +180 180 180 +246 172 90 +148 197 246 +255 189 0 +189 189 197 +123 213 255 +255 197 0 +246 172 180 +246 180 98 +156 205 246 +255 197 0 +222 197 123 +189 197 197 +230 205 74 +246 205 32 +255 189 106 +255 205 0 +197 197 205 +148 213 255 +205 205 197 +255 213 0 +148 222 255 +148 222 255 +255 197 115 +255 222 0 +238 205 131 +172 213 255 +205 205 205 +213 213 164 +156 222 255 +255 205 123 +255 222 0 +255 230 0 +238 222 74 +255 205 131 +246 197 205 +172 230 255 +213 213 213 +255 238 0 +255 213 131 +255 238 32 +180 230 255 +255 246 0 +222 222 222 +255 222 139 +255 246 0 +189 238 255 +230 230 172 +255 255 0 +255 213 222 +255 230 139 +255 246 41 +255 255 0 +197 238 255 +230 230 230 +255 230 156 +205 238 255 +238 238 238 +213 246 255 +255 230 238 +255 246 197 +230 246 255 +246 246 246 +255 238 246 +238 255 255 +246 246 246 +238 255 255 +255 255 213 +255 255 255 +246 255 255 +255 255 255 diff --git a/data/tilemaps/sa1_title_logo_jp/header.c b/data/tilemaps/sa1_title_logo_jp/header.c index 28f3f1ddf4..fd5c43d26e 100644 --- a/data/tilemaps/sa1_title_logo_jp/header.c +++ b/data/tilemaps/sa1_title_logo_jp/header.c @@ -1,7 +1,9 @@ #include "global.h" #include "core.h" -const u16 Palette_sa1_title_logo_jp[] = { +#ifndef NON_MATCHING +// This uses transparency, which gbagfx doesn't (yet) support +const ColorRaw Palette_sa1_title_logo_jp[] = { 0x8340u, 0u, 0x9000u, 0x2000u, 0x421u, 0x8c20u, 0x2800u, 0x1c20u, 0x3000u, 0xb000u, 0xac20u, 0x9c40u, 0x8842u, 0x3802u, 0x3022u, 0xac40u, 0xb820u, 0xb802u, 0xb440u, 0x65u, 0x3423u, 0x3860u, 0x2082u, 0xb061u, 0x1084u, 0x3c60u, 0x3844u, 0xe1u, 0x4460u, 0x3046u, 0xaca0u, 0x4860u, 0xca6u, 0xac83u, 0x9ca3u, 0xd060u, 0x94a5u, 0xbc81u, 0xd460u, 0xb865u, 0x14u, 0xd860u, 0x2c88u, 0xc0c0u, 0xc8a1u, @@ -21,6 +23,9 @@ const u16 Palette_sa1_title_logo_jp[] = { 0xcf9fu, 0xffb9u, 0x77bdu, 0x7fdau, 0x779fu, 0x63dfu, 0xffdcu, 0x7bdeu, 0xfbbfu, 0x7ffdu, 0xfbdeu, 0x7ffdu, 0xebffu, 0x7fffu, 0xfffeu, 0xffffu, }; +#else +const ColorRaw Palette_sa1_title_logo_jp[] = INCPAL("data/tilemaps/sa1_title_logo_jp/palette.pal"); +#endif const u8 Tiles_sa1_title_logo_jp[] = INCBIN_U8("data/tilemaps/sa1_title_logo_jp/tiles.8bpp"); const u16 Tilemap_sa1_title_logo_jp[] = INCBIN_U16("data/tilemaps/sa1_title_logo_jp/tilemap.tilemap1"); @@ -35,6 +40,6 @@ const Tilemap sa1_title_logo_jp = { .tilesSize = sizeof(Tiles_sa1_title_logo_jp), .palette = Palette_sa1_title_logo_jp, .palOffset = 0, - .palLength = sizeof(Palette_sa1_title_logo_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_sa1_title_logo_jp), .map = Tilemap_sa1_title_logo_jp, }; diff --git a/data/tilemaps/sa1_title_logo_jp/palette.pal b/data/tilemaps/sa1_title_logo_jp/palette.pal new file mode 100644 index 0000000000..2f2362881d --- /dev/null +++ b/data/tilemaps/sa1_title_logo_jp/palette.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 213 0 +0 0 0 +0 0 32 +0 0 65 +8 8 8 +0 8 24 +0 0 82 +0 8 57 +0 0 98 +0 0 98 +0 8 90 +0 16 57 +16 16 16 +16 0 115 +16 8 98 +0 16 90 +0 8 115 +16 0 115 +0 16 106 +41 24 0 +24 8 106 +0 24 115 +16 32 65 +8 24 98 +32 32 32 +0 24 123 +32 16 115 +8 57 0 +0 24 139 +49 16 98 +0 41 90 +0 24 148 +49 41 24 +24 32 90 +24 41 57 +0 24 164 +41 41 41 +8 32 123 +0 24 172 +41 24 115 +164 0 0 +0 24 180 +65 32 90 +0 49 131 +8 41 148 +49 49 49 +0 32 189 +172 0 0 +0 24 197 +32 57 82 +32 49 115 +189 0 0 +98 41 0 +197 0 0 +0 41 197 +0 65 148 +16 41 172 +205 0 0 +24 57 148 +8 41 197 +16 98 0 +82 49 82 +213 0 0 +65 65 57 +65 57 115 +16 49 189 +49 74 90 +0 82 164 +8 57 205 +41 74 123 +106 49 65 +16 65 205 +230 0 41 +41 74 156 +74 74 74 +0 98 180 +16 65 205 +115 65 32 +213 16 41 +8 131 0 +32 65 197 +0 106 189 +65 82 106 +74 74 148 +98 82 57 +90 90 90 +65 82 156 +131 74 32 +0 115 197 +41 98 164 +49 131 24 +41 82 213 +90 90 131 +98 98 98 +0 115 230 +0 123 205 +172 82 0 +230 41 65 +74 98 164 +156 90 32 +90 123 49 +123 98 65 +0 139 213 +57 98 205 +0 115 255 +74 106 164 +106 106 106 +0 131 255 +0 148 222 +49 123 180 +172 98 16 +57 106 222 +139 106 65 +8 131 255 +32 139 205 +115 115 115 +0 156 230 +49 172 0 +205 74 90 +74 115 197 +106 115 148 +57 139 197 +16 148 255 +180 115 8 +205 90 98 +123 123 131 +148 123 74 +74 123 230 +32 156 222 +90 131 197 +32 156 255 +65 148 213 +197 123 8 +115 131 180 +180 131 41 +139 139 131 +32 172 230 +41 164 255 +90 139 230 +164 139 90 +65 164 222 +131 139 164 +238 98 123 +24 189 246 +205 139 8 +49 172 255 +148 148 148 +106 156 205 +49 180 255 +57 180 255 +106 156 230 +139 156 164 +74 172 230 +180 148 90 +222 115 131 +156 156 156 +57 180 255 +106 197 57 +106 164 230 +65 189 255 +148 156 172 +238 139 57 +65 189 255 +74 189 255 +189 164 98 +131 164 222 +197 164 57 +74 189 255 +164 164 172 +115 172 238 +82 189 255 +230 172 0 +82 197 255 +238 156 74 +172 172 172 +197 172 98 +238 148 156 +213 180 49 +131 180 238 +255 172 0 +246 164 82 +172 180 189 +106 205 255 +213 189 98 +255 180 0 +180 180 180 +246 172 90 +148 197 246 +255 189 0 +189 189 197 +123 213 255 +255 197 0 +246 172 180 +246 180 98 +156 205 246 +255 197 0 +222 197 123 +189 197 197 +230 205 74 +246 205 32 +255 189 106 +255 205 0 +197 197 205 +148 213 255 +205 205 197 +255 213 0 +148 222 255 +148 222 255 +255 197 115 +255 222 0 +238 205 131 +172 213 255 +205 205 205 +213 213 164 +156 222 255 +255 205 123 +255 222 0 +255 230 0 +238 222 74 +255 205 131 +246 197 205 +172 230 255 +213 213 213 +255 238 0 +255 213 131 +255 238 32 +180 230 255 +255 246 0 +222 222 222 +255 222 139 +255 246 0 +189 238 255 +230 230 172 +255 255 0 +255 213 222 +255 230 139 +255 246 41 +255 255 0 +197 238 255 +230 230 230 +255 230 156 +205 238 255 +238 238 238 +213 246 255 +255 230 238 +255 246 197 +230 246 255 +246 246 246 +255 238 246 +238 255 255 +246 246 246 +238 255 255 +255 255 213 +255 255 255 +246 255 255 +255 255 255 diff --git a/data/tilemaps/sa2_logo_en/header.c b/data/tilemaps/sa2_logo_en/header.c index 9b570c1dcf..10edb10a6f 100644 --- a/data/tilemaps/sa2_logo_en/header.c +++ b/data/tilemaps/sa2_logo_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_sa2_logo_en[] = INCBIN_U16("data/tilemaps/sa2_logo_en/palette.gbapal"); +const ColorRaw Palette_sa2_logo_en[] = INCPAL("data/tilemaps/sa2_logo_en/palette.pal"); const u8 Tiles_sa2_logo_en[] = INCBIN_U8("data/tilemaps/sa2_logo_en/tiles.4bpp"); const u8 Tilemap_sa2_logo_en[] = INCBIN_U8("data/tilemaps/sa2_logo_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap sa2_logo_en = { .tilesSize = sizeof(Tiles_sa2_logo_en), .palette = Palette_sa2_logo_en, .palOffset = 0, - .palLength = sizeof(Palette_sa2_logo_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_sa2_logo_en), .map = (const u16 *)Tilemap_sa2_logo_en, }; diff --git a/data/tilemaps/sa2_logo_jp/header.c b/data/tilemaps/sa2_logo_jp/header.c index 1ddf14e588..b4ece88920 100644 --- a/data/tilemaps/sa2_logo_jp/header.c +++ b/data/tilemaps/sa2_logo_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_sa2_logo_jp[] = INCBIN_U16("data/tilemaps/sa2_logo_jp/palette.gbapal"); +const ColorRaw Palette_sa2_logo_jp[] = INCPAL("data/tilemaps/sa2_logo_jp/palette.pal"); const u8 Tiles_sa2_logo_jp[] = INCBIN_U8("data/tilemaps/sa2_logo_jp/tiles.4bpp"); const u8 Tilemap_sa2_logo_jp[] = INCBIN_U8("data/tilemaps/sa2_logo_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap sa2_logo_jp = { .tilesSize = sizeof(Tiles_sa2_logo_jp), .palette = Palette_sa2_logo_jp, .palOffset = 0, - .palLength = sizeof(Palette_sa2_logo_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_sa2_logo_jp), .map = (const u16 *)Tilemap_sa2_logo_jp, }; diff --git a/data/tilemaps/sa2_title_logo_jp/header.c b/data/tilemaps/sa2_title_logo_jp/header.c index 105505be1b..f91ef38bdc 100644 --- a/data/tilemaps/sa2_title_logo_jp/header.c +++ b/data/tilemaps/sa2_title_logo_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_sa2_title_logo_jp[] = INCBIN_U16("data/tilemaps/sa2_title_logo_jp/palette.gbapal"); +const ColorRaw Palette_sa2_title_logo_jp[] = INCPAL("data/tilemaps/sa2_title_logo_jp/palette.pal"); const u8 Tiles_sa2_title_logo_jp[] = INCBIN_U8("data/tilemaps/sa2_title_logo_jp/tiles.4bpp"); const u8 Tilemap_sa2_title_logo_jp[] = INCBIN_U8("data/tilemaps/sa2_title_logo_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap sa2_title_logo_jp = { .tilesSize = sizeof(Tiles_sa2_title_logo_jp), .palette = Palette_sa2_title_logo_jp, .palOffset = 0, - .palLength = sizeof(Palette_sa2_title_logo_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_sa2_title_logo_jp), .map = (const u16 *)Tilemap_sa2_title_logo_jp, }; diff --git a/data/tilemaps/sky_canyon_clouds_foreground/header.c b/data/tilemaps/sky_canyon_clouds_foreground/header.c index e8779bd2d3..a8d4eb0b5c 100644 --- a/data/tilemaps/sky_canyon_clouds_foreground/header.c +++ b/data/tilemaps/sky_canyon_clouds_foreground/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_sky_canyon_clouds_foreground[] = INCBIN_U16("data/tilemaps/sky_canyon_clouds_foreground/palette.gbapal"); +const ColorRaw Palette_sky_canyon_clouds_foreground[] = INCPAL("data/tilemaps/sky_canyon_clouds_foreground/palette.pal"); const u8 Tiles_sky_canyon_clouds_foreground[] = INCBIN_U8("data/tilemaps/sky_canyon_clouds_foreground/tiles.4bpp"); const u16 Tilemap_sky_canyon_clouds_foreground[] = INCBIN_U16("data/tilemaps/sky_canyon_clouds_foreground/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap sky_canyon_clouds_foreground = { .tilesSize = sizeof(Tiles_sky_canyon_clouds_foreground), .palette = Palette_sky_canyon_clouds_foreground, .palOffset = 0, - .palLength = sizeof(Palette_sky_canyon_clouds_foreground) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_sky_canyon_clouds_foreground), .map = Tilemap_sky_canyon_clouds_foreground, }; diff --git a/data/tilemaps/sound_test_bg/header.c b/data/tilemaps/sound_test_bg/header.c index 3aea7ea918..c8f242aefd 100644 --- a/data/tilemaps/sound_test_bg/header.c +++ b/data/tilemaps/sound_test_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_sound_test_bg[] = INCBIN_U16("data/tilemaps/sound_test_bg/palette.gbapal"); +const ColorRaw Palette_sound_test_bg[] = INCPAL("data/tilemaps/sound_test_bg/palette.pal"); const u8 Tiles_sound_test_bg[] = INCBIN_U8("data/tilemaps/sound_test_bg/tiles.4bpp"); const u16 Tilemap_sound_test_bg[] = INCBIN_U16("data/tilemaps/sound_test_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap sound_test_bg = { .tilesSize = sizeof(Tiles_sound_test_bg), .palette = Palette_sound_test_bg, .palOffset = 0, - .palLength = sizeof(Palette_sound_test_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_sound_test_bg), .map = Tilemap_sound_test_bg, }; diff --git a/data/tilemaps/special_stage_1/header.c b/data/tilemaps/special_stage_1/header.c index b04bb54ba8..46465103fb 100644 --- a/data/tilemaps/special_stage_1/header.c +++ b/data/tilemaps/special_stage_1/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_1[] = INCBIN_U16("data/tilemaps/special_stage_1/palette.gbapal"); +const ColorRaw Palette_special_stage_1[] = INCPAL("data/tilemaps/special_stage_1/palette.pal"); const u8 Tiles_special_stage_1[] = INCBIN_U8("data/tilemaps/special_stage_1/tiles.4bpp"); const u8 Tilemap_special_stage_1[] = INCBIN_U8("data/tilemaps/special_stage_1/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_1 = { .tilesSize = sizeof(Tiles_special_stage_1), .palette = Palette_special_stage_1, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_1) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_1), .map = (const u16 *)Tilemap_special_stage_1, }; diff --git a/data/tilemaps/special_stage_1_bg/header.c b/data/tilemaps/special_stage_1_bg/header.c index 6c4ce24b82..3bba01cfb8 100644 --- a/data/tilemaps/special_stage_1_bg/header.c +++ b/data/tilemaps/special_stage_1_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_1_bg[] = INCBIN_U16("data/tilemaps/special_stage_1_bg/palette.gbapal"); +const ColorRaw Palette_special_stage_1_bg[] = INCPAL("data/tilemaps/special_stage_1_bg/palette.pal"); const u8 Tiles_special_stage_1_bg[] = INCBIN_U8("data/tilemaps/special_stage_1_bg/tiles.4bpp"); const u16 Tilemap_special_stage_1_bg[] = INCBIN_U16("data/tilemaps/special_stage_1_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_1_bg = { .tilesSize = sizeof(Tiles_special_stage_1_bg), .palette = Palette_special_stage_1_bg, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_1_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_1_bg), .map = Tilemap_special_stage_1_bg, }; diff --git a/data/tilemaps/special_stage_2/header.c b/data/tilemaps/special_stage_2/header.c index e1a49ff06d..2140c09303 100644 --- a/data/tilemaps/special_stage_2/header.c +++ b/data/tilemaps/special_stage_2/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_2[] = INCBIN_U16("data/tilemaps/special_stage_2/palette.gbapal"); +const ColorRaw Palette_special_stage_2[] = INCPAL("data/tilemaps/special_stage_2/palette.pal"); const u8 Tiles_special_stage_2[] = INCBIN_U8("data/tilemaps/special_stage_2/tiles.4bpp"); const u8 Tilemap_special_stage_2[] = INCBIN_U8("data/tilemaps/special_stage_2/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_2 = { .tilesSize = sizeof(Tiles_special_stage_2), .palette = Palette_special_stage_2, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_2) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_2), .map = (const u16 *)Tilemap_special_stage_2, }; diff --git a/data/tilemaps/special_stage_2_bg/header.c b/data/tilemaps/special_stage_2_bg/header.c index 2738b9bec4..893231d5cb 100644 --- a/data/tilemaps/special_stage_2_bg/header.c +++ b/data/tilemaps/special_stage_2_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_2_bg[] = INCBIN_U16("data/tilemaps/special_stage_2_bg/palette.gbapal"); +const ColorRaw Palette_special_stage_2_bg[] = INCPAL("data/tilemaps/special_stage_2_bg/palette.pal"); const u8 Tiles_special_stage_2_bg[] = INCBIN_U8("data/tilemaps/special_stage_2_bg/tiles.4bpp"); const u16 Tilemap_special_stage_2_bg[] = INCBIN_U16("data/tilemaps/special_stage_2_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_2_bg = { .tilesSize = sizeof(Tiles_special_stage_2_bg), .palette = Palette_special_stage_2_bg, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_2_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_2_bg), .map = Tilemap_special_stage_2_bg, }; diff --git a/data/tilemaps/special_stage_3/header.c b/data/tilemaps/special_stage_3/header.c index 2b001635de..9932c6a22e 100644 --- a/data/tilemaps/special_stage_3/header.c +++ b/data/tilemaps/special_stage_3/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_3[] = INCBIN_U16("data/tilemaps/special_stage_3/palette.gbapal"); +const ColorRaw Palette_special_stage_3[] = INCPAL("data/tilemaps/special_stage_3/palette.pal"); const u8 Tiles_special_stage_3[] = INCBIN_U8("data/tilemaps/special_stage_3/tiles.4bpp"); const u8 Tilemap_special_stage_3[] = INCBIN_U8("data/tilemaps/special_stage_3/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_3 = { .tilesSize = sizeof(Tiles_special_stage_3), .palette = Palette_special_stage_3, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_3) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_3), .map = (const u16 *)Tilemap_special_stage_3, }; diff --git a/data/tilemaps/special_stage_3_bg/header.c b/data/tilemaps/special_stage_3_bg/header.c index 304f17bd2e..42af2f9c64 100644 --- a/data/tilemaps/special_stage_3_bg/header.c +++ b/data/tilemaps/special_stage_3_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_3_bg[] = INCBIN_U16("data/tilemaps/special_stage_3_bg/palette.gbapal"); +const ColorRaw Palette_special_stage_3_bg[] = INCPAL("data/tilemaps/special_stage_3_bg/palette.pal"); const u8 Tiles_special_stage_3_bg[] = INCBIN_U8("data/tilemaps/special_stage_3_bg/tiles.4bpp"); const u16 Tilemap_special_stage_3_bg[] = INCBIN_U16("data/tilemaps/special_stage_3_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_3_bg = { .tilesSize = sizeof(Tiles_special_stage_3_bg), .palette = Palette_special_stage_3_bg, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_3_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_3_bg), .map = Tilemap_special_stage_3_bg, }; diff --git a/data/tilemaps/special_stage_4/header.c b/data/tilemaps/special_stage_4/header.c index 869c3d7f78..1411c33010 100644 --- a/data/tilemaps/special_stage_4/header.c +++ b/data/tilemaps/special_stage_4/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_4[] = INCBIN_U16("data/tilemaps/special_stage_4/palette.gbapal"); +const ColorRaw Palette_special_stage_4[] = INCPAL("data/tilemaps/special_stage_4/palette.pal"); const u8 Tiles_special_stage_4[] = INCBIN_U8("data/tilemaps/special_stage_4/tiles.4bpp"); const u8 Tilemap_special_stage_4[] = INCBIN_U8("data/tilemaps/special_stage_4/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_4 = { .tilesSize = sizeof(Tiles_special_stage_4), .palette = Palette_special_stage_4, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_4) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_4), .map = (const u16 *)Tilemap_special_stage_4, }; diff --git a/data/tilemaps/special_stage_4_bg/header.c b/data/tilemaps/special_stage_4_bg/header.c index 83107bb29b..ee31c05e95 100644 --- a/data/tilemaps/special_stage_4_bg/header.c +++ b/data/tilemaps/special_stage_4_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_4_bg[] = INCBIN_U16("data/tilemaps/special_stage_4_bg/palette.gbapal"); +const ColorRaw Palette_special_stage_4_bg[] = INCPAL("data/tilemaps/special_stage_4_bg/palette.pal"); const u8 Tiles_special_stage_4_bg[] = INCBIN_U8("data/tilemaps/special_stage_4_bg/tiles.4bpp"); const u16 Tilemap_special_stage_4_bg[] = INCBIN_U16("data/tilemaps/special_stage_4_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_4_bg = { .tilesSize = sizeof(Tiles_special_stage_4_bg), .palette = Palette_special_stage_4_bg, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_4_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_4_bg), .map = Tilemap_special_stage_4_bg, }; diff --git a/data/tilemaps/special_stage_5/header.c b/data/tilemaps/special_stage_5/header.c index fdcdeafa3a..dc11696bc3 100644 --- a/data/tilemaps/special_stage_5/header.c +++ b/data/tilemaps/special_stage_5/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_5[] = INCBIN_U16("data/tilemaps/special_stage_5/palette.gbapal"); +const ColorRaw Palette_special_stage_5[] = INCPAL("data/tilemaps/special_stage_5/palette.pal"); const u8 Tiles_special_stage_5[] = INCBIN_U8("data/tilemaps/special_stage_5/tiles.4bpp"); const u8 Tilemap_special_stage_5[] = INCBIN_U8("data/tilemaps/special_stage_5/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_5 = { .tilesSize = sizeof(Tiles_special_stage_5), .palette = Palette_special_stage_5, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_5) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_5), .map = (const u16 *)Tilemap_special_stage_5, }; diff --git a/data/tilemaps/special_stage_5_bg/header.c b/data/tilemaps/special_stage_5_bg/header.c index 0212262cc7..013e923e99 100644 --- a/data/tilemaps/special_stage_5_bg/header.c +++ b/data/tilemaps/special_stage_5_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_5_bg[] = INCBIN_U16("data/tilemaps/special_stage_5_bg/palette.gbapal"); +const ColorRaw Palette_special_stage_5_bg[] = INCPAL("data/tilemaps/special_stage_5_bg/palette.pal"); const u8 Tiles_special_stage_5_bg[] = INCBIN_U8("data/tilemaps/special_stage_5_bg/tiles.4bpp"); const u16 Tilemap_special_stage_5_bg[] = INCBIN_U16("data/tilemaps/special_stage_5_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_5_bg = { .tilesSize = sizeof(Tiles_special_stage_5_bg), .palette = Palette_special_stage_5_bg, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_5_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_5_bg), .map = Tilemap_special_stage_5_bg, }; diff --git a/data/tilemaps/special_stage_6/header.c b/data/tilemaps/special_stage_6/header.c index 20da90a4b3..d66a5a1fb5 100644 --- a/data/tilemaps/special_stage_6/header.c +++ b/data/tilemaps/special_stage_6/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_6[] = INCBIN_U16("data/tilemaps/special_stage_6/palette.gbapal"); +const ColorRaw Palette_special_stage_6[] = INCPAL("data/tilemaps/special_stage_6/palette.pal"); const u8 Tiles_special_stage_6[] = INCBIN_U8("data/tilemaps/special_stage_6/tiles.4bpp"); const u8 Tilemap_special_stage_6[] = INCBIN_U8("data/tilemaps/special_stage_6/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_6 = { .tilesSize = sizeof(Tiles_special_stage_6), .palette = Palette_special_stage_6, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_6) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_6), .map = (const u16 *)Tilemap_special_stage_6, }; diff --git a/data/tilemaps/special_stage_6_bg/header.c b/data/tilemaps/special_stage_6_bg/header.c index b3412849d0..274866f1fc 100644 --- a/data/tilemaps/special_stage_6_bg/header.c +++ b/data/tilemaps/special_stage_6_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_6_bg[] = INCBIN_U16("data/tilemaps/special_stage_6_bg/palette.gbapal"); +const ColorRaw Palette_special_stage_6_bg[] = INCPAL("data/tilemaps/special_stage_6_bg/palette.pal"); const u8 Tiles_special_stage_6_bg[] = INCBIN_U8("data/tilemaps/special_stage_6_bg/tiles.4bpp"); const u16 Tilemap_special_stage_6_bg[] = INCBIN_U16("data/tilemaps/special_stage_6_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_6_bg = { .tilesSize = sizeof(Tiles_special_stage_6_bg), .palette = Palette_special_stage_6_bg, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_6_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_6_bg), .map = Tilemap_special_stage_6_bg, }; diff --git a/data/tilemaps/special_stage_7/header.c b/data/tilemaps/special_stage_7/header.c index 3b79093b03..6f1aa067c3 100644 --- a/data/tilemaps/special_stage_7/header.c +++ b/data/tilemaps/special_stage_7/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_7[] = INCBIN_U16("data/tilemaps/special_stage_7/palette.gbapal"); +const ColorRaw Palette_special_stage_7[] = INCPAL("data/tilemaps/special_stage_7/palette.pal"); const u8 Tiles_special_stage_7[] = INCBIN_U8("data/tilemaps/special_stage_7/tiles.4bpp"); const u8 Tilemap_special_stage_7[] = INCBIN_U8("data/tilemaps/special_stage_7/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_7 = { .tilesSize = sizeof(Tiles_special_stage_7), .palette = Palette_special_stage_7, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_7) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_7), .map = (const u16 *)Tilemap_special_stage_7, }; diff --git a/data/tilemaps/special_stage_7_bg/header.c b/data/tilemaps/special_stage_7_bg/header.c index f64a0540c9..de7fcf4474 100644 --- a/data/tilemaps/special_stage_7_bg/header.c +++ b/data/tilemaps/special_stage_7_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_special_stage_7_bg[] = INCBIN_U16("data/tilemaps/special_stage_7_bg/palette.gbapal"); +const ColorRaw Palette_special_stage_7_bg[] = INCPAL("data/tilemaps/special_stage_7_bg/palette.pal"); const u8 Tiles_special_stage_7_bg[] = INCBIN_U8("data/tilemaps/special_stage_7_bg/tiles.4bpp"); const u16 Tilemap_special_stage_7_bg[] = INCBIN_U16("data/tilemaps/special_stage_7_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap special_stage_7_bg = { .tilesSize = sizeof(Tiles_special_stage_7_bg), .palette = Palette_special_stage_7_bg, .palOffset = 0, - .palLength = sizeof(Palette_special_stage_7_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_special_stage_7_bg), .map = Tilemap_special_stage_7_bg, }; diff --git a/data/tilemaps/spotlight_snow/header.c b/data/tilemaps/spotlight_snow/header.c index efdcd3e63b..7d2a8e78bc 100644 --- a/data/tilemaps/spotlight_snow/header.c +++ b/data/tilemaps/spotlight_snow/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_spotlight_snow[] = INCBIN_U16("data/tilemaps/spotlight_snow/palette.gbapal"); +const ColorRaw Palette_spotlight_snow[] = INCPAL("data/tilemaps/spotlight_snow/palette.pal"); const u8 Tiles_spotlight_snow[] = INCBIN_U8("data/tilemaps/spotlight_snow/tiles.4bpp"); const u8 Tiles_AnimTiles_spotlight_snow[] = INCBIN_U8("data/tilemaps/spotlight_snow/tiles_anim.4bpp"); const u16 Tilemap_spotlight_snow[] = INCBIN_U16("data/tilemaps/spotlight_snow/tilemap.tilemap2"); @@ -18,6 +18,6 @@ const Tilemap spotlight_snow = { .tilesSize = sizeof(Tiles_spotlight_snow), .palette = Palette_spotlight_snow, .palOffset = 0, - .palLength = sizeof(Palette_spotlight_snow) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_spotlight_snow), .map = Tilemap_spotlight_snow, }; diff --git a/data/tilemaps/stage_1_bg_0_copy/header.c b/data/tilemaps/stage_1_bg_0_copy/header.c index 1e9ccd98d1..03ab32acbe 100644 --- a/data/tilemaps/stage_1_bg_0_copy/header.c +++ b/data/tilemaps/stage_1_bg_0_copy/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_stage_1_bg_0_copy[] = INCBIN_U16("data/tilemaps/stage_1_bg_0_copy/palette.gbapal"); +const ColorRaw Palette_stage_1_bg_0_copy[] = INCPAL("data/tilemaps/stage_1_bg_0_copy/palette.pal"); const u8 Tiles_stage_1_bg_0_copy[] = INCBIN_U8("data/tilemaps/stage_1_bg_0_copy/tiles.4bpp"); const u16 Tilemap_stage_1_bg_0_copy[] = INCBIN_U16("data/tilemaps/stage_1_bg_0_copy/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap stage_1_bg_0_copy = { .tilesSize = sizeof(Tiles_stage_1_bg_0_copy), .palette = Palette_stage_1_bg_0_copy, .palOffset = 0, - .palLength = sizeof(Palette_stage_1_bg_0_copy) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_stage_1_bg_0_copy), .map = Tilemap_stage_1_bg_0_copy, }; diff --git a/data/tilemaps/stage_select_bg_amy/header.c b/data/tilemaps/stage_select_bg_amy/header.c index b5715177ac..9a2d55242c 100644 --- a/data/tilemaps/stage_select_bg_amy/header.c +++ b/data/tilemaps/stage_select_bg_amy/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_stage_select_bg_amy[] = INCBIN_U16("data/tilemaps/stage_select_bg_amy/palette.gbapal"); +const ColorRaw Palette_stage_select_bg_amy[] = INCPAL("data/tilemaps/stage_select_bg_amy/palette.pal"); const u8 Tiles_stage_select_bg_amy[] = INCBIN_U8("data/tilemaps/stage_select_bg_amy/tiles.4bpp"); const u16 Tilemap_stage_select_bg_amy[] = INCBIN_U16("data/tilemaps/stage_select_bg_amy/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap stage_select_bg_amy = { .tilesSize = sizeof(Tiles_stage_select_bg_amy), .palette = Palette_stage_select_bg_amy, .palOffset = 0, - .palLength = sizeof(Palette_stage_select_bg_amy) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_stage_select_bg_amy), .map = Tilemap_stage_select_bg_amy, }; diff --git a/data/tilemaps/stage_select_bg_cream/header.c b/data/tilemaps/stage_select_bg_cream/header.c index 6454cb542f..fd8c6fc198 100644 --- a/data/tilemaps/stage_select_bg_cream/header.c +++ b/data/tilemaps/stage_select_bg_cream/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_stage_select_bg_cream[] = INCBIN_U16("data/tilemaps/stage_select_bg_cream/palette.gbapal"); +const ColorRaw Palette_stage_select_bg_cream[] = INCPAL("data/tilemaps/stage_select_bg_cream/palette.pal"); const u8 Tiles_stage_select_bg_cream[] = INCBIN_U8("data/tilemaps/stage_select_bg_cream/tiles.4bpp"); const u16 Tilemap_stage_select_bg_cream[] = INCBIN_U16("data/tilemaps/stage_select_bg_cream/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap stage_select_bg_cream = { .tilesSize = sizeof(Tiles_stage_select_bg_cream), .palette = Palette_stage_select_bg_cream, .palOffset = 0, - .palLength = sizeof(Palette_stage_select_bg_cream) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_stage_select_bg_cream), .map = Tilemap_stage_select_bg_cream, }; diff --git a/data/tilemaps/stage_select_bg_knuckles/header.c b/data/tilemaps/stage_select_bg_knuckles/header.c index c9903933f6..19745477a9 100644 --- a/data/tilemaps/stage_select_bg_knuckles/header.c +++ b/data/tilemaps/stage_select_bg_knuckles/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_stage_select_bg_knuckles[] = INCBIN_U16("data/tilemaps/stage_select_bg_knuckles/palette.gbapal"); +const ColorRaw Palette_stage_select_bg_knuckles[] = INCPAL("data/tilemaps/stage_select_bg_knuckles/palette.pal"); const u8 Tiles_stage_select_bg_knuckles[] = INCBIN_U8("data/tilemaps/stage_select_bg_knuckles/tiles.4bpp"); const u16 Tilemap_stage_select_bg_knuckles[] = INCBIN_U16("data/tilemaps/stage_select_bg_knuckles/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap stage_select_bg_knuckles = { .tilesSize = sizeof(Tiles_stage_select_bg_knuckles), .palette = Palette_stage_select_bg_knuckles, .palOffset = 0, - .palLength = sizeof(Palette_stage_select_bg_knuckles) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_stage_select_bg_knuckles), .map = Tilemap_stage_select_bg_knuckles, }; diff --git a/data/tilemaps/stage_select_bg_sonic/header.c b/data/tilemaps/stage_select_bg_sonic/header.c index a6971863e6..45836eb631 100644 --- a/data/tilemaps/stage_select_bg_sonic/header.c +++ b/data/tilemaps/stage_select_bg_sonic/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_stage_select_bg_sonic[] = INCBIN_U16("data/tilemaps/stage_select_bg_sonic/palette.gbapal"); +const ColorRaw Palette_stage_select_bg_sonic[] = INCPAL("data/tilemaps/stage_select_bg_sonic/palette.pal"); const u8 Tiles_stage_select_bg_sonic[] = INCBIN_U8("data/tilemaps/stage_select_bg_sonic/tiles.4bpp"); const u16 Tilemap_stage_select_bg_sonic[] = INCBIN_U16("data/tilemaps/stage_select_bg_sonic/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap stage_select_bg_sonic = { .tilesSize = sizeof(Tiles_stage_select_bg_sonic), .palette = Palette_stage_select_bg_sonic, .palOffset = 0, - .palLength = sizeof(Palette_stage_select_bg_sonic) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_stage_select_bg_sonic), .map = Tilemap_stage_select_bg_sonic, }; diff --git a/data/tilemaps/stage_select_bg_tails/header.c b/data/tilemaps/stage_select_bg_tails/header.c index e1d9527242..ca6376c8d3 100644 --- a/data/tilemaps/stage_select_bg_tails/header.c +++ b/data/tilemaps/stage_select_bg_tails/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_stage_select_bg_tails[] = INCBIN_U16("data/tilemaps/stage_select_bg_tails/palette.gbapal"); +const ColorRaw Palette_stage_select_bg_tails[] = INCPAL("data/tilemaps/stage_select_bg_tails/palette.pal"); const u8 Tiles_stage_select_bg_tails[] = INCBIN_U8("data/tilemaps/stage_select_bg_tails/tiles.4bpp"); const u16 Tilemap_stage_select_bg_tails[] = INCBIN_U16("data/tilemaps/stage_select_bg_tails/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap stage_select_bg_tails = { .tilesSize = sizeof(Tiles_stage_select_bg_tails), .palette = Palette_stage_select_bg_tails, .palOffset = 0, - .palLength = sizeof(Palette_stage_select_bg_tails) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_stage_select_bg_tails), .map = Tilemap_stage_select_bg_tails, }; diff --git a/data/tilemaps/stage_select_map/header.c b/data/tilemaps/stage_select_map/header.c index 56c9bedc03..1cef4c03ef 100644 --- a/data/tilemaps/stage_select_map/header.c +++ b/data/tilemaps/stage_select_map/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_stage_select_map[] = INCBIN_U16("data/tilemaps/stage_select_map/palette.gbapal"); +const ColorRaw Palette_stage_select_map[] = INCPAL("data/tilemaps/stage_select_map/palette.pal"); const u8 Tiles_stage_select_map[] = INCBIN_U8("data/tilemaps/stage_select_map/tiles.4bpp"); const u16 Tilemap_stage_select_map[] = INCBIN_U16("data/tilemaps/stage_select_map/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap stage_select_map = { .tilesSize = sizeof(Tiles_stage_select_map), .palette = Palette_stage_select_map, .palOffset = 0, - .palLength = sizeof(Palette_stage_select_map) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_stage_select_map), .map = Tilemap_stage_select_map, }; diff --git a/data/tilemaps/storyframe_cream_cheese_vanilla_happy/header.c b/data/tilemaps/storyframe_cream_cheese_vanilla_happy/header.c index 2b487e0930..5818692c19 100644 --- a/data/tilemaps/storyframe_cream_cheese_vanilla_happy/header.c +++ b/data/tilemaps/storyframe_cream_cheese_vanilla_happy/header.c @@ -1,8 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_cheese_vanilla_happy[] - = INCBIN_U16("data/tilemaps/storyframe_cream_cheese_vanilla_happy/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_cheese_vanilla_happy[] = INCPAL("data/tilemaps/storyframe_cream_cheese_vanilla_happy/palette.pal"); const u8 Tiles_storyframe_cream_cheese_vanilla_happy[] = INCBIN_U8("data/tilemaps/storyframe_cream_cheese_vanilla_happy/tiles.4bpp"); const u16 Tilemap_storyframe_cream_cheese_vanilla_happy[] = INCBIN_U16("data/tilemaps/storyframe_cream_cheese_vanilla_happy/tilemap.tilemap2"); @@ -17,6 +16,6 @@ const Tilemap storyframe_cream_cheese_vanilla_happy = { .tilesSize = sizeof(Tiles_storyframe_cream_cheese_vanilla_happy), .palette = Palette_storyframe_cream_cheese_vanilla_happy, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_cheese_vanilla_happy) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_cheese_vanilla_happy), .map = Tilemap_storyframe_cream_cheese_vanilla_happy, }; diff --git a/data/tilemaps/storyframe_cream_hugs_vanilla/header.c b/data/tilemaps/storyframe_cream_hugs_vanilla/header.c index 37b17166b2..ad104195ac 100644 --- a/data/tilemaps/storyframe_cream_hugs_vanilla/header.c +++ b/data/tilemaps/storyframe_cream_hugs_vanilla/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_hugs_vanilla[] = INCBIN_U16("data/tilemaps/storyframe_cream_hugs_vanilla/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_hugs_vanilla[] = INCPAL("data/tilemaps/storyframe_cream_hugs_vanilla/palette.pal"); const u8 Tiles_storyframe_cream_hugs_vanilla[] = INCBIN_U8("data/tilemaps/storyframe_cream_hugs_vanilla/tiles.4bpp"); const u16 Tilemap_storyframe_cream_hugs_vanilla[] = INCBIN_U16("data/tilemaps/storyframe_cream_hugs_vanilla/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_hugs_vanilla = { .tilesSize = sizeof(Tiles_storyframe_cream_hugs_vanilla), .palette = Palette_storyframe_cream_hugs_vanilla, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_hugs_vanilla) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_hugs_vanilla), .map = Tilemap_storyframe_cream_hugs_vanilla, }; diff --git a/data/tilemaps/storyframe_cream_tails_vanilla_look_around/header.c b/data/tilemaps/storyframe_cream_tails_vanilla_look_around/header.c index be46c191d3..19053211fb 100644 --- a/data/tilemaps/storyframe_cream_tails_vanilla_look_around/header.c +++ b/data/tilemaps/storyframe_cream_tails_vanilla_look_around/header.c @@ -1,8 +1,8 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_tails_vanilla_look_around[] - = INCBIN_U16("data/tilemaps/storyframe_cream_tails_vanilla_look_around/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_tails_vanilla_look_around[] + = INCPAL("data/tilemaps/storyframe_cream_tails_vanilla_look_around/palette.pal"); const u8 Tiles_storyframe_cream_tails_vanilla_look_around[] = INCBIN_U8("data/tilemaps/storyframe_cream_tails_vanilla_look_around/tiles.4bpp"); const u16 Tilemap_storyframe_cream_tails_vanilla_look_around[] @@ -18,6 +18,6 @@ const Tilemap storyframe_cream_tails_vanilla_look_around = { .tilesSize = sizeof(Tiles_storyframe_cream_tails_vanilla_look_around), .palette = Palette_storyframe_cream_tails_vanilla_look_around, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_tails_vanilla_look_around) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_tails_vanilla_look_around), .map = Tilemap_storyframe_cream_tails_vanilla_look_around, }; diff --git a/data/tilemaps/storyframe_cream_unlock_0/header.c b/data/tilemaps/storyframe_cream_unlock_0/header.c index d3687e1d48..81a65ef62b 100644 --- a/data/tilemaps/storyframe_cream_unlock_0/header.c +++ b/data/tilemaps/storyframe_cream_unlock_0/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_0[] = INCPAL("data/tilemaps/storyframe_cream_unlock_0/palette.pal"); const u8 Tiles_storyframe_cream_unlock_0[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_0 = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_0), .palette = Palette_storyframe_cream_unlock_0, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_0) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_0), .map = Tilemap_storyframe_cream_unlock_0, }; diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_de/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_de/header.c index 5d336d0d4e..7a5cb365ad 100644 --- a/data/tilemaps/storyframe_cream_unlock_0_dlg_de/header.c +++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_0_dlg_de[] = INCPAL("data/tilemaps/storyframe_cream_unlock_0_dlg_de/palette.pal"); const u8 Tiles_storyframe_cream_unlock_0_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_0_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_0_dlg_de), .palette = Palette_storyframe_cream_unlock_0_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_0_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_0_dlg_de), .map = Tilemap_storyframe_cream_unlock_0_dlg_de, }; diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_en/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_en/header.c index ada12fb002..3ddc9b99a7 100644 --- a/data/tilemaps/storyframe_cream_unlock_0_dlg_en/header.c +++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_0_dlg_en[] = INCPAL("data/tilemaps/storyframe_cream_unlock_0_dlg_en/palette.pal"); const u8 Tiles_storyframe_cream_unlock_0_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_0_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_0_dlg_en), .palette = Palette_storyframe_cream_unlock_0_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_0_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_0_dlg_en), .map = Tilemap_storyframe_cream_unlock_0_dlg_en, }; diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_es/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_es/header.c index 9a3efd886f..a2d5957258 100644 --- a/data/tilemaps/storyframe_cream_unlock_0_dlg_es/header.c +++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_0_dlg_es[] = INCPAL("data/tilemaps/storyframe_cream_unlock_0_dlg_es/palette.pal"); const u8 Tiles_storyframe_cream_unlock_0_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_0_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_0_dlg_es), .palette = Palette_storyframe_cream_unlock_0_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_0_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_0_dlg_es), .map = Tilemap_storyframe_cream_unlock_0_dlg_es, }; diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_fr/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_fr/header.c index 1aa5f0e407..4955e244b7 100644 --- a/data/tilemaps/storyframe_cream_unlock_0_dlg_fr/header.c +++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_0_dlg_fr[] = INCPAL("data/tilemaps/storyframe_cream_unlock_0_dlg_fr/palette.pal"); const u8 Tiles_storyframe_cream_unlock_0_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_0_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_0_dlg_fr), .palette = Palette_storyframe_cream_unlock_0_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_0_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_0_dlg_fr), .map = Tilemap_storyframe_cream_unlock_0_dlg_fr, }; diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_it/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_it/header.c index f2e3a4aa97..da2945d761 100644 --- a/data/tilemaps/storyframe_cream_unlock_0_dlg_it/header.c +++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_0_dlg_it[] = INCPAL("data/tilemaps/storyframe_cream_unlock_0_dlg_it/palette.pal"); const u8 Tiles_storyframe_cream_unlock_0_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_0_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_0_dlg_it), .palette = Palette_storyframe_cream_unlock_0_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_0_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_0_dlg_it), .map = Tilemap_storyframe_cream_unlock_0_dlg_it, }; diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_jp/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_jp/header.c index ddfad4f670..b0258f3afe 100644 --- a/data/tilemaps/storyframe_cream_unlock_0_dlg_jp/header.c +++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_0_dlg_jp[] = INCPAL("data/tilemaps/storyframe_cream_unlock_0_dlg_jp/palette.pal"); const u8 Tiles_storyframe_cream_unlock_0_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_0_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_0_dlg_jp), .palette = Palette_storyframe_cream_unlock_0_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_0_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_0_dlg_jp), .map = Tilemap_storyframe_cream_unlock_0_dlg_jp, }; diff --git a/data/tilemaps/storyframe_cream_unlock_0_sepia/header.c b/data/tilemaps/storyframe_cream_unlock_0_sepia/header.c index 5350dd1362..99e4728c18 100644 --- a/data/tilemaps/storyframe_cream_unlock_0_sepia/header.c +++ b/data/tilemaps/storyframe_cream_unlock_0_sepia/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_0_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_sepia/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_0_sepia[] = INCPAL("data/tilemaps/storyframe_cream_unlock_0_sepia/palette.pal"); const u8 Tiles_storyframe_cream_unlock_0_sepia[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_sepia/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_0_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_sepia/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_0_sepia = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_0_sepia), .palette = Palette_storyframe_cream_unlock_0_sepia, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_0_sepia) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_0_sepia), .map = Tilemap_storyframe_cream_unlock_0_sepia, }; diff --git a/data/tilemaps/storyframe_cream_unlock_1/header.c b/data/tilemaps/storyframe_cream_unlock_1/header.c index 4ec8832300..ff447fa321 100644 --- a/data/tilemaps/storyframe_cream_unlock_1/header.c +++ b/data/tilemaps/storyframe_cream_unlock_1/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_1[] = INCPAL("data/tilemaps/storyframe_cream_unlock_1/palette.pal"); const u8 Tiles_storyframe_cream_unlock_1[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_1 = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_1), .palette = Palette_storyframe_cream_unlock_1, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_1) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_1), .map = Tilemap_storyframe_cream_unlock_1, }; diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_de/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_de/header.c index db87bb504c..b85c5aec26 100644 --- a/data/tilemaps/storyframe_cream_unlock_1_dlg_de/header.c +++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_1_dlg_de[] = INCPAL("data/tilemaps/storyframe_cream_unlock_1_dlg_de/palette.pal"); const u8 Tiles_storyframe_cream_unlock_1_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_1_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_1_dlg_de), .palette = Palette_storyframe_cream_unlock_1_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_1_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_1_dlg_de), .map = Tilemap_storyframe_cream_unlock_1_dlg_de, }; diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_en/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_en/header.c index ae9ef14d2c..4b08d9ec70 100644 --- a/data/tilemaps/storyframe_cream_unlock_1_dlg_en/header.c +++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_1_dlg_en[] = INCPAL("data/tilemaps/storyframe_cream_unlock_1_dlg_en/palette.pal"); const u8 Tiles_storyframe_cream_unlock_1_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_1_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_1_dlg_en), .palette = Palette_storyframe_cream_unlock_1_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_1_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_1_dlg_en), .map = Tilemap_storyframe_cream_unlock_1_dlg_en, }; diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_es/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_es/header.c index a864ec0c1c..bd90f0094e 100644 --- a/data/tilemaps/storyframe_cream_unlock_1_dlg_es/header.c +++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_1_dlg_es[] = INCPAL("data/tilemaps/storyframe_cream_unlock_1_dlg_es/palette.pal"); const u8 Tiles_storyframe_cream_unlock_1_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_1_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_1_dlg_es), .palette = Palette_storyframe_cream_unlock_1_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_1_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_1_dlg_es), .map = Tilemap_storyframe_cream_unlock_1_dlg_es, }; diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_fr/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_fr/header.c index 03494c9619..d5a3598084 100644 --- a/data/tilemaps/storyframe_cream_unlock_1_dlg_fr/header.c +++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_1_dlg_fr[] = INCPAL("data/tilemaps/storyframe_cream_unlock_1_dlg_fr/palette.pal"); const u8 Tiles_storyframe_cream_unlock_1_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_1_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_1_dlg_fr), .palette = Palette_storyframe_cream_unlock_1_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_1_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_1_dlg_fr), .map = Tilemap_storyframe_cream_unlock_1_dlg_fr, }; diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_it/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_it/header.c index c35ab5c9aa..a1e0a56411 100644 --- a/data/tilemaps/storyframe_cream_unlock_1_dlg_it/header.c +++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_1_dlg_it[] = INCPAL("data/tilemaps/storyframe_cream_unlock_1_dlg_it/palette.pal"); const u8 Tiles_storyframe_cream_unlock_1_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_1_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_1_dlg_it), .palette = Palette_storyframe_cream_unlock_1_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_1_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_1_dlg_it), .map = Tilemap_storyframe_cream_unlock_1_dlg_it, }; diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_jp/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_jp/header.c index a49b95ffd3..c70ca8876e 100644 --- a/data/tilemaps/storyframe_cream_unlock_1_dlg_jp/header.c +++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_1_dlg_jp[] = INCPAL("data/tilemaps/storyframe_cream_unlock_1_dlg_jp/palette.pal"); const u8 Tiles_storyframe_cream_unlock_1_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_1_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_1_dlg_jp), .palette = Palette_storyframe_cream_unlock_1_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_1_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_1_dlg_jp), .map = Tilemap_storyframe_cream_unlock_1_dlg_jp, }; diff --git a/data/tilemaps/storyframe_cream_unlock_1_sepia/header.c b/data/tilemaps/storyframe_cream_unlock_1_sepia/header.c index af1cbd0255..ad3d479a5e 100644 --- a/data/tilemaps/storyframe_cream_unlock_1_sepia/header.c +++ b/data/tilemaps/storyframe_cream_unlock_1_sepia/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_sepia/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_1_sepia[] = INCPAL("data/tilemaps/storyframe_cream_unlock_1_sepia/palette.pal"); const u8 Tiles_storyframe_cream_unlock_1_sepia[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_sepia/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_sepia/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_1_sepia = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_1_sepia), .palette = Palette_storyframe_cream_unlock_1_sepia, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_1_sepia) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_1_sepia), .map = Tilemap_storyframe_cream_unlock_1_sepia, }; diff --git a/data/tilemaps/storyframe_cream_unlock_2/header.c b/data/tilemaps/storyframe_cream_unlock_2/header.c index d482a4a7b0..844f489b8a 100644 --- a/data/tilemaps/storyframe_cream_unlock_2/header.c +++ b/data/tilemaps/storyframe_cream_unlock_2/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_2[] = INCPAL("data/tilemaps/storyframe_cream_unlock_2/palette.pal"); const u8 Tiles_storyframe_cream_unlock_2[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_2 = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_2), .palette = Palette_storyframe_cream_unlock_2, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_2) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_2), .map = Tilemap_storyframe_cream_unlock_2, }; diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_de/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_de/header.c index b2db8f8d2a..d78fa06f20 100644 --- a/data/tilemaps/storyframe_cream_unlock_2_dlg_de/header.c +++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_2_dlg_de[] = INCPAL("data/tilemaps/storyframe_cream_unlock_2_dlg_de/palette.pal"); const u8 Tiles_storyframe_cream_unlock_2_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_2_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_2_dlg_de), .palette = Palette_storyframe_cream_unlock_2_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_2_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_2_dlg_de), .map = Tilemap_storyframe_cream_unlock_2_dlg_de, }; diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_en/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_en/header.c index 9a0ed8d587..bd970ad7a3 100644 --- a/data/tilemaps/storyframe_cream_unlock_2_dlg_en/header.c +++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_2_dlg_en[] = INCPAL("data/tilemaps/storyframe_cream_unlock_2_dlg_en/palette.pal"); const u8 Tiles_storyframe_cream_unlock_2_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_2_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_2_dlg_en), .palette = Palette_storyframe_cream_unlock_2_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_2_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_2_dlg_en), .map = Tilemap_storyframe_cream_unlock_2_dlg_en, }; diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_es/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_es/header.c index 741095c565..caeb3ca1aa 100644 --- a/data/tilemaps/storyframe_cream_unlock_2_dlg_es/header.c +++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_2_dlg_es[] = INCPAL("data/tilemaps/storyframe_cream_unlock_2_dlg_es/palette.pal"); const u8 Tiles_storyframe_cream_unlock_2_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_2_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_2_dlg_es), .palette = Palette_storyframe_cream_unlock_2_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_2_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_2_dlg_es), .map = Tilemap_storyframe_cream_unlock_2_dlg_es, }; diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_fr/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_fr/header.c index a2fadb224f..a3e51998e9 100644 --- a/data/tilemaps/storyframe_cream_unlock_2_dlg_fr/header.c +++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_2_dlg_fr[] = INCPAL("data/tilemaps/storyframe_cream_unlock_2_dlg_fr/palette.pal"); const u8 Tiles_storyframe_cream_unlock_2_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_2_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_2_dlg_fr), .palette = Palette_storyframe_cream_unlock_2_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_2_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_2_dlg_fr), .map = Tilemap_storyframe_cream_unlock_2_dlg_fr, }; diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_it/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_it/header.c index 3bd6e23436..2cc89a0036 100644 --- a/data/tilemaps/storyframe_cream_unlock_2_dlg_it/header.c +++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_2_dlg_it[] = INCPAL("data/tilemaps/storyframe_cream_unlock_2_dlg_it/palette.pal"); const u8 Tiles_storyframe_cream_unlock_2_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_2_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_2_dlg_it), .palette = Palette_storyframe_cream_unlock_2_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_2_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_2_dlg_it), .map = Tilemap_storyframe_cream_unlock_2_dlg_it, }; diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_jp/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_jp/header.c index 258d1e90fb..0e14e7a012 100644 --- a/data/tilemaps/storyframe_cream_unlock_2_dlg_jp/header.c +++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_2_dlg_jp[] = INCPAL("data/tilemaps/storyframe_cream_unlock_2_dlg_jp/palette.pal"); const u8 Tiles_storyframe_cream_unlock_2_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_2_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_2_dlg_jp), .palette = Palette_storyframe_cream_unlock_2_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_2_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_2_dlg_jp), .map = Tilemap_storyframe_cream_unlock_2_dlg_jp, }; diff --git a/data/tilemaps/storyframe_cream_unlock_3/header.c b/data/tilemaps/storyframe_cream_unlock_3/header.c index f73ebc5840..14a9f2bffc 100644 --- a/data/tilemaps/storyframe_cream_unlock_3/header.c +++ b/data/tilemaps/storyframe_cream_unlock_3/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_3[] = INCPAL("data/tilemaps/storyframe_cream_unlock_3/palette.pal"); const u8 Tiles_storyframe_cream_unlock_3[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_3 = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_3), .palette = Palette_storyframe_cream_unlock_3, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_3) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_3), .map = Tilemap_storyframe_cream_unlock_3, }; diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_de/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_de/header.c index c404088e2a..c1ae1b9f86 100644 --- a/data/tilemaps/storyframe_cream_unlock_3_dlg_de/header.c +++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_3_dlg_de[] = INCPAL("data/tilemaps/storyframe_cream_unlock_3_dlg_de/palette.pal"); const u8 Tiles_storyframe_cream_unlock_3_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_3_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_3_dlg_de), .palette = Palette_storyframe_cream_unlock_3_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_3_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_3_dlg_de), .map = Tilemap_storyframe_cream_unlock_3_dlg_de, }; diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_en/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_en/header.c index 8c33746ee8..1922cfa427 100644 --- a/data/tilemaps/storyframe_cream_unlock_3_dlg_en/header.c +++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_3_dlg_en[] = INCPAL("data/tilemaps/storyframe_cream_unlock_3_dlg_en/palette.pal"); const u8 Tiles_storyframe_cream_unlock_3_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_3_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_3_dlg_en), .palette = Palette_storyframe_cream_unlock_3_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_3_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_3_dlg_en), .map = Tilemap_storyframe_cream_unlock_3_dlg_en, }; diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_es/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_es/header.c index c7ea298920..c4dd9b87b4 100644 --- a/data/tilemaps/storyframe_cream_unlock_3_dlg_es/header.c +++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_3_dlg_es[] = INCPAL("data/tilemaps/storyframe_cream_unlock_3_dlg_es/palette.pal"); const u8 Tiles_storyframe_cream_unlock_3_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_3_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_3_dlg_es), .palette = Palette_storyframe_cream_unlock_3_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_3_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_3_dlg_es), .map = Tilemap_storyframe_cream_unlock_3_dlg_es, }; diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_fr/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_fr/header.c index 48cc5807fd..b30d3cd270 100644 --- a/data/tilemaps/storyframe_cream_unlock_3_dlg_fr/header.c +++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_3_dlg_fr[] = INCPAL("data/tilemaps/storyframe_cream_unlock_3_dlg_fr/palette.pal"); const u8 Tiles_storyframe_cream_unlock_3_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_3_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_3_dlg_fr), .palette = Palette_storyframe_cream_unlock_3_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_3_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_3_dlg_fr), .map = Tilemap_storyframe_cream_unlock_3_dlg_fr, }; diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_it/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_it/header.c index fd037959de..8511074a03 100644 --- a/data/tilemaps/storyframe_cream_unlock_3_dlg_it/header.c +++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_3_dlg_it[] = INCPAL("data/tilemaps/storyframe_cream_unlock_3_dlg_it/palette.pal"); const u8 Tiles_storyframe_cream_unlock_3_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_3_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_3_dlg_it), .palette = Palette_storyframe_cream_unlock_3_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_3_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_3_dlg_it), .map = Tilemap_storyframe_cream_unlock_3_dlg_it, }; diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_jp/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_jp/header.c index ed2b14c5be..579a94fbb9 100644 --- a/data/tilemaps/storyframe_cream_unlock_3_dlg_jp/header.c +++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_3_dlg_jp[] = INCPAL("data/tilemaps/storyframe_cream_unlock_3_dlg_jp/palette.pal"); const u8 Tiles_storyframe_cream_unlock_3_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_3_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_3_dlg_jp), .palette = Palette_storyframe_cream_unlock_3_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_3_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_3_dlg_jp), .map = Tilemap_storyframe_cream_unlock_3_dlg_jp, }; diff --git a/data/tilemaps/storyframe_cream_unlock_3_sepia/header.c b/data/tilemaps/storyframe_cream_unlock_3_sepia/header.c index c7172ea5ae..5e927b3273 100644 --- a/data/tilemaps/storyframe_cream_unlock_3_sepia/header.c +++ b/data/tilemaps/storyframe_cream_unlock_3_sepia/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlock_3_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_sepia/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlock_3_sepia[] = INCPAL("data/tilemaps/storyframe_cream_unlock_3_sepia/palette.pal"); const u8 Tiles_storyframe_cream_unlock_3_sepia[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_sepia/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlock_3_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_sepia/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlock_3_sepia = { .tilesSize = sizeof(Tiles_storyframe_cream_unlock_3_sepia), .palette = Palette_storyframe_cream_unlock_3_sepia, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlock_3_sepia) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlock_3_sepia), .map = Tilemap_storyframe_cream_unlock_3_sepia, }; diff --git a/data/tilemaps/storyframe_cream_unlocked_de/header.c b/data/tilemaps/storyframe_cream_unlocked_de/header.c index ee1977c6f3..d0a6ce9642 100644 --- a/data/tilemaps/storyframe_cream_unlocked_de/header.c +++ b/data/tilemaps/storyframe_cream_unlocked_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_de/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlocked_de[] = INCPAL("data/tilemaps/storyframe_cream_unlocked_de/palette.pal"); const u8 Tiles_storyframe_cream_unlocked_de[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_de/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlocked_de = { .tilesSize = sizeof(Tiles_storyframe_cream_unlocked_de), .palette = Palette_storyframe_cream_unlocked_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlocked_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlocked_de), .map = Tilemap_storyframe_cream_unlocked_de, }; diff --git a/data/tilemaps/storyframe_cream_unlocked_en/header.c b/data/tilemaps/storyframe_cream_unlocked_en/header.c index cbb0616205..8bfe85ae6e 100644 --- a/data/tilemaps/storyframe_cream_unlocked_en/header.c +++ b/data/tilemaps/storyframe_cream_unlocked_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_en/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlocked_en[] = INCPAL("data/tilemaps/storyframe_cream_unlocked_en/palette.pal"); const u8 Tiles_storyframe_cream_unlocked_en[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_en/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlocked_en = { .tilesSize = sizeof(Tiles_storyframe_cream_unlocked_en), .palette = Palette_storyframe_cream_unlocked_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlocked_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlocked_en), .map = Tilemap_storyframe_cream_unlocked_en, }; diff --git a/data/tilemaps/storyframe_cream_unlocked_es/header.c b/data/tilemaps/storyframe_cream_unlocked_es/header.c index a86ad2f740..c0c3c849f8 100644 --- a/data/tilemaps/storyframe_cream_unlocked_es/header.c +++ b/data/tilemaps/storyframe_cream_unlocked_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_es/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlocked_es[] = INCPAL("data/tilemaps/storyframe_cream_unlocked_es/palette.pal"); const u8 Tiles_storyframe_cream_unlocked_es[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_es/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlocked_es = { .tilesSize = sizeof(Tiles_storyframe_cream_unlocked_es), .palette = Palette_storyframe_cream_unlocked_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlocked_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlocked_es), .map = Tilemap_storyframe_cream_unlocked_es, }; diff --git a/data/tilemaps/storyframe_cream_unlocked_fr/header.c b/data/tilemaps/storyframe_cream_unlocked_fr/header.c index 5a25ddb7be..c1ad3ccc45 100644 --- a/data/tilemaps/storyframe_cream_unlocked_fr/header.c +++ b/data/tilemaps/storyframe_cream_unlocked_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlocked_fr[] = INCPAL("data/tilemaps/storyframe_cream_unlocked_fr/palette.pal"); const u8 Tiles_storyframe_cream_unlocked_fr[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_fr/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlocked_fr = { .tilesSize = sizeof(Tiles_storyframe_cream_unlocked_fr), .palette = Palette_storyframe_cream_unlocked_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlocked_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlocked_fr), .map = Tilemap_storyframe_cream_unlocked_fr, }; diff --git a/data/tilemaps/storyframe_cream_unlocked_it/header.c b/data/tilemaps/storyframe_cream_unlocked_it/header.c index 43e47e758f..fd41fadf8a 100644 --- a/data/tilemaps/storyframe_cream_unlocked_it/header.c +++ b/data/tilemaps/storyframe_cream_unlocked_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_it/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlocked_it[] = INCPAL("data/tilemaps/storyframe_cream_unlocked_it/palette.pal"); const u8 Tiles_storyframe_cream_unlocked_it[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_it/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlocked_it = { .tilesSize = sizeof(Tiles_storyframe_cream_unlocked_it), .palette = Palette_storyframe_cream_unlocked_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlocked_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlocked_it), .map = Tilemap_storyframe_cream_unlocked_it, }; diff --git a/data/tilemaps/storyframe_cream_unlocked_jp/header.c b/data/tilemaps/storyframe_cream_unlocked_jp/header.c index b048e0d8bf..152cf4845a 100644 --- a/data/tilemaps/storyframe_cream_unlocked_jp/header.c +++ b/data/tilemaps/storyframe_cream_unlocked_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_cream_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_cream_unlocked_jp[] = INCPAL("data/tilemaps/storyframe_cream_unlocked_jp/palette.pal"); const u8 Tiles_storyframe_cream_unlocked_jp[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_jp/tiles.4bpp"); const u16 Tilemap_storyframe_cream_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_cream_unlocked_jp = { .tilesSize = sizeof(Tiles_storyframe_cream_unlocked_jp), .palette = Palette_storyframe_cream_unlocked_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_cream_unlocked_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_cream_unlocked_jp), .map = Tilemap_storyframe_cream_unlocked_jp, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_0/header.c b/data/tilemaps/storyframe_knuckles_unlock_0/header.c index 252ced1b9d..adfb16d58c 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_0/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_0/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_0[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_0/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_0[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_0 = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_0), .palette = Palette_storyframe_knuckles_unlock_0, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_0) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_0), .map = Tilemap_storyframe_knuckles_unlock_0, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/header.c index 5b5192c4a0..ad198f9e06 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_0_dlg_de[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_0_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_0_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_0_dlg_de), .palette = Palette_storyframe_knuckles_unlock_0_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_0_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_0_dlg_de), .map = Tilemap_storyframe_knuckles_unlock_0_dlg_de, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/header.c index d789b589d2..b1590bff53 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_0_dlg_en[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_0_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_0_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_0_dlg_en), .palette = Palette_storyframe_knuckles_unlock_0_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_0_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_0_dlg_en), .map = Tilemap_storyframe_knuckles_unlock_0_dlg_en, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/header.c index 5f89e31915..275e81dce8 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_0_dlg_es[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_0_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_0_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_0_dlg_es), .palette = Palette_storyframe_knuckles_unlock_0_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_0_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_0_dlg_es), .map = Tilemap_storyframe_knuckles_unlock_0_dlg_es, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/header.c index 847da09ea2..4e8dc6b86d 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_0_dlg_fr[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_0_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_0_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_0_dlg_fr), .palette = Palette_storyframe_knuckles_unlock_0_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_0_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_0_dlg_fr), .map = Tilemap_storyframe_knuckles_unlock_0_dlg_fr, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/header.c index 4a59648279..41d8b867b0 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_0_dlg_it[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_0_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_0_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_0_dlg_it), .palette = Palette_storyframe_knuckles_unlock_0_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_0_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_0_dlg_it), .map = Tilemap_storyframe_knuckles_unlock_0_dlg_it, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/header.c index 35ede24aed..d8131f5929 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_0_dlg_jp[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_0_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_0_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_0_dlg_jp), .palette = Palette_storyframe_knuckles_unlock_0_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_0_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_0_dlg_jp), .map = Tilemap_storyframe_knuckles_unlock_0_dlg_jp, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_1/header.c b/data/tilemaps/storyframe_knuckles_unlock_1/header.c index df36e86899..9584dbfc0c 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_1/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_1/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_1[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_1/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_1[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_1 = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_1), .palette = Palette_storyframe_knuckles_unlock_1, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_1) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_1), .map = Tilemap_storyframe_knuckles_unlock_1, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/header.c index 0a1f1f3371..0e1e0ecd3f 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_1_dlg_de[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_1_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_1_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_1_dlg_de), .palette = Palette_storyframe_knuckles_unlock_1_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_1_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_1_dlg_de), .map = Tilemap_storyframe_knuckles_unlock_1_dlg_de, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/header.c index 4390aa4a8b..a07be59894 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_1_dlg_en[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_1_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_1_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_1_dlg_en), .palette = Palette_storyframe_knuckles_unlock_1_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_1_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_1_dlg_en), .map = Tilemap_storyframe_knuckles_unlock_1_dlg_en, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/header.c index 9a5c8f881e..d1bfc290f8 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_1_dlg_es[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_1_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_1_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_1_dlg_es), .palette = Palette_storyframe_knuckles_unlock_1_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_1_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_1_dlg_es), .map = Tilemap_storyframe_knuckles_unlock_1_dlg_es, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/header.c index 7c1a8c77e4..0cf8570e3f 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_1_dlg_fr[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_1_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_1_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_1_dlg_fr), .palette = Palette_storyframe_knuckles_unlock_1_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_1_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_1_dlg_fr), .map = Tilemap_storyframe_knuckles_unlock_1_dlg_fr, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/header.c index aebbc4c411..26134c25ad 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_1_dlg_it[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_1_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_1_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_1_dlg_it), .palette = Palette_storyframe_knuckles_unlock_1_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_1_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_1_dlg_it), .map = Tilemap_storyframe_knuckles_unlock_1_dlg_it, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/header.c index c97f5efe26..cc081e14b0 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_1_dlg_jp[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_1_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_1_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_1_dlg_jp), .palette = Palette_storyframe_knuckles_unlock_1_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_1_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_1_dlg_jp), .map = Tilemap_storyframe_knuckles_unlock_1_dlg_jp, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_sepia/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_sepia/header.c index 0dd8f68277..74cd88a03a 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_1_sepia/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_1_sepia/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_sepia/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_1_sepia[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_1_sepia/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_1_sepia[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_sepia/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_sepia/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_1_sepia = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_1_sepia), .palette = Palette_storyframe_knuckles_unlock_1_sepia, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_1_sepia) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_1_sepia), .map = Tilemap_storyframe_knuckles_unlock_1_sepia, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_2/header.c b/data/tilemaps/storyframe_knuckles_unlock_2/header.c index ff1c3f1aa8..51439c5b50 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_2/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_2/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_2[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_2/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_2[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_2 = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_2), .palette = Palette_storyframe_knuckles_unlock_2, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_2) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_2), .map = Tilemap_storyframe_knuckles_unlock_2, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/header.c index a79f14fe69..333eac1919 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_2_dlg_de[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_2_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_2_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_2_dlg_de), .palette = Palette_storyframe_knuckles_unlock_2_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_2_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_2_dlg_de), .map = Tilemap_storyframe_knuckles_unlock_2_dlg_de, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/header.c index a96359d667..f440c65237 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_2_dlg_en[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_2_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_2_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_2_dlg_en), .palette = Palette_storyframe_knuckles_unlock_2_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_2_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_2_dlg_en), .map = Tilemap_storyframe_knuckles_unlock_2_dlg_en, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/header.c index 41fa22cff1..f977811005 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_2_dlg_es[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_2_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_2_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_2_dlg_es), .palette = Palette_storyframe_knuckles_unlock_2_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_2_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_2_dlg_es), .map = Tilemap_storyframe_knuckles_unlock_2_dlg_es, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/header.c index 3bc3fddefd..ec919bcc54 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_2_dlg_fr[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_2_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_2_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_2_dlg_fr), .palette = Palette_storyframe_knuckles_unlock_2_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_2_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_2_dlg_fr), .map = Tilemap_storyframe_knuckles_unlock_2_dlg_fr, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/header.c index e93f17701f..00ac910326 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_2_dlg_it[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_2_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_2_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_2_dlg_it), .palette = Palette_storyframe_knuckles_unlock_2_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_2_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_2_dlg_it), .map = Tilemap_storyframe_knuckles_unlock_2_dlg_it, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/header.c index cf3653f12e..adec4b45f5 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_2_dlg_jp[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_2_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_2_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_2_dlg_jp), .palette = Palette_storyframe_knuckles_unlock_2_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_2_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_2_dlg_jp), .map = Tilemap_storyframe_knuckles_unlock_2_dlg_jp, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_3/header.c b/data/tilemaps/storyframe_knuckles_unlock_3/header.c index 1bd5df963e..8489dae32b 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_3/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_3/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_3[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_3/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_3[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_3 = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_3), .palette = Palette_storyframe_knuckles_unlock_3, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_3) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_3), .map = Tilemap_storyframe_knuckles_unlock_3, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/header.c index 4604abfef1..5aee3a86dd 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_3_dlg_de[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_3_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_3_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_3_dlg_de), .palette = Palette_storyframe_knuckles_unlock_3_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_3_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_3_dlg_de), .map = Tilemap_storyframe_knuckles_unlock_3_dlg_de, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/header.c index 1031c7c0f4..cb522fe618 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_3_dlg_en[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_3_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_3_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_3_dlg_en), .palette = Palette_storyframe_knuckles_unlock_3_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_3_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_3_dlg_en), .map = Tilemap_storyframe_knuckles_unlock_3_dlg_en, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/header.c index b52b478fc4..3b2f50e5cd 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_3_dlg_es[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_3_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_3_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_3_dlg_es), .palette = Palette_storyframe_knuckles_unlock_3_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_3_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_3_dlg_es), .map = Tilemap_storyframe_knuckles_unlock_3_dlg_es, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/header.c index 933205ca67..81fa9dcf9e 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_3_dlg_fr[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_3_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_3_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_3_dlg_fr), .palette = Palette_storyframe_knuckles_unlock_3_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_3_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_3_dlg_fr), .map = Tilemap_storyframe_knuckles_unlock_3_dlg_fr, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/header.c index 7b20afdc86..a082b5819a 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_3_dlg_it[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_3_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_3_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_3_dlg_it), .palette = Palette_storyframe_knuckles_unlock_3_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_3_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_3_dlg_it), .map = Tilemap_storyframe_knuckles_unlock_3_dlg_it, }; diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/header.c index 1127ab298c..8709d8d021 100644 --- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/header.c +++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlock_3_dlg_jp[] = INCPAL("data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/palette.pal"); const u8 Tiles_storyframe_knuckles_unlock_3_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlock_3_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlock_3_dlg_jp), .palette = Palette_storyframe_knuckles_unlock_3_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlock_3_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlock_3_dlg_jp), .map = Tilemap_storyframe_knuckles_unlock_3_dlg_jp, }; diff --git a/data/tilemaps/storyframe_knuckles_unlocked_de/header.c b/data/tilemaps/storyframe_knuckles_unlocked_de/header.c index 5688061697..0b0b7aa389 100644 --- a/data/tilemaps/storyframe_knuckles_unlocked_de/header.c +++ b/data/tilemaps/storyframe_knuckles_unlocked_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_de/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlocked_de[] = INCPAL("data/tilemaps/storyframe_knuckles_unlocked_de/palette.pal"); const u8 Tiles_storyframe_knuckles_unlocked_de[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_de/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlocked_de = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlocked_de), .palette = Palette_storyframe_knuckles_unlocked_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlocked_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlocked_de), .map = Tilemap_storyframe_knuckles_unlocked_de, }; diff --git a/data/tilemaps/storyframe_knuckles_unlocked_en/header.c b/data/tilemaps/storyframe_knuckles_unlocked_en/header.c index b21bcfcb64..19cf759884 100644 --- a/data/tilemaps/storyframe_knuckles_unlocked_en/header.c +++ b/data/tilemaps/storyframe_knuckles_unlocked_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_en/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlocked_en[] = INCPAL("data/tilemaps/storyframe_knuckles_unlocked_en/palette.pal"); const u8 Tiles_storyframe_knuckles_unlocked_en[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_en/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlocked_en = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlocked_en), .palette = Palette_storyframe_knuckles_unlocked_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlocked_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlocked_en), .map = Tilemap_storyframe_knuckles_unlocked_en, }; diff --git a/data/tilemaps/storyframe_knuckles_unlocked_es/header.c b/data/tilemaps/storyframe_knuckles_unlocked_es/header.c index da9fd8ca4d..c27f267404 100644 --- a/data/tilemaps/storyframe_knuckles_unlocked_es/header.c +++ b/data/tilemaps/storyframe_knuckles_unlocked_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_es/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlocked_es[] = INCPAL("data/tilemaps/storyframe_knuckles_unlocked_es/palette.pal"); const u8 Tiles_storyframe_knuckles_unlocked_es[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_es/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlocked_es = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlocked_es), .palette = Palette_storyframe_knuckles_unlocked_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlocked_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlocked_es), .map = Tilemap_storyframe_knuckles_unlocked_es, }; diff --git a/data/tilemaps/storyframe_knuckles_unlocked_fr/header.c b/data/tilemaps/storyframe_knuckles_unlocked_fr/header.c index 6ad7d43f40..d5b3016369 100644 --- a/data/tilemaps/storyframe_knuckles_unlocked_fr/header.c +++ b/data/tilemaps/storyframe_knuckles_unlocked_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlocked_fr[] = INCPAL("data/tilemaps/storyframe_knuckles_unlocked_fr/palette.pal"); const u8 Tiles_storyframe_knuckles_unlocked_fr[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_fr/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlocked_fr = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlocked_fr), .palette = Palette_storyframe_knuckles_unlocked_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlocked_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlocked_fr), .map = Tilemap_storyframe_knuckles_unlocked_fr, }; diff --git a/data/tilemaps/storyframe_knuckles_unlocked_it/header.c b/data/tilemaps/storyframe_knuckles_unlocked_it/header.c index 1de3881dbb..2950f7cceb 100644 --- a/data/tilemaps/storyframe_knuckles_unlocked_it/header.c +++ b/data/tilemaps/storyframe_knuckles_unlocked_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_it/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlocked_it[] = INCPAL("data/tilemaps/storyframe_knuckles_unlocked_it/palette.pal"); const u8 Tiles_storyframe_knuckles_unlocked_it[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_it/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlocked_it = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlocked_it), .palette = Palette_storyframe_knuckles_unlocked_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlocked_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlocked_it), .map = Tilemap_storyframe_knuckles_unlocked_it, }; diff --git a/data/tilemaps/storyframe_knuckles_unlocked_jp/header.c b/data/tilemaps/storyframe_knuckles_unlocked_jp/header.c index 05bf24e095..dbb87e1cca 100644 --- a/data/tilemaps/storyframe_knuckles_unlocked_jp/header.c +++ b/data/tilemaps/storyframe_knuckles_unlocked_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_knuckles_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_knuckles_unlocked_jp[] = INCPAL("data/tilemaps/storyframe_knuckles_unlocked_jp/palette.pal"); const u8 Tiles_storyframe_knuckles_unlocked_jp[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_jp/tiles.4bpp"); const u16 Tilemap_storyframe_knuckles_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_knuckles_unlocked_jp = { .tilesSize = sizeof(Tiles_storyframe_knuckles_unlocked_jp), .palette = Palette_storyframe_knuckles_unlocked_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_knuckles_unlocked_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_knuckles_unlocked_jp), .map = Tilemap_storyframe_knuckles_unlocked_jp, }; diff --git a/data/tilemaps/storyframe_sonic_catches_vanilla/header.c b/data/tilemaps/storyframe_sonic_catches_vanilla/header.c index 27f9fc1254..3aeb48d606 100644 --- a/data/tilemaps/storyframe_sonic_catches_vanilla/header.c +++ b/data/tilemaps/storyframe_sonic_catches_vanilla/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_catches_vanilla[] = INCBIN_U16("data/tilemaps/storyframe_sonic_catches_vanilla/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_catches_vanilla[] = INCPAL("data/tilemaps/storyframe_sonic_catches_vanilla/palette.pal"); const u8 Tiles_storyframe_sonic_catches_vanilla[] = INCBIN_U8("data/tilemaps/storyframe_sonic_catches_vanilla/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_catches_vanilla[] = INCBIN_U16("data/tilemaps/storyframe_sonic_catches_vanilla/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_catches_vanilla = { .tilesSize = sizeof(Tiles_storyframe_sonic_catches_vanilla), .palette = Palette_storyframe_sonic_catches_vanilla, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_catches_vanilla) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_catches_vanilla), .map = Tilemap_storyframe_sonic_catches_vanilla, }; diff --git a/data/tilemaps/storyframe_sonic_finds_friends/header.c b/data/tilemaps/storyframe_sonic_finds_friends/header.c index 56c519013a..6e776d9b85 100644 --- a/data/tilemaps/storyframe_sonic_finds_friends/header.c +++ b/data/tilemaps/storyframe_sonic_finds_friends/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_finds_friends[] = INCBIN_U16("data/tilemaps/storyframe_sonic_finds_friends/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_finds_friends[] = INCPAL("data/tilemaps/storyframe_sonic_finds_friends/palette.pal"); const u8 Tiles_storyframe_sonic_finds_friends[] = INCBIN_U8("data/tilemaps/storyframe_sonic_finds_friends/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_finds_friends[] = INCBIN_U16("data/tilemaps/storyframe_sonic_finds_friends/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_finds_friends = { .tilesSize = sizeof(Tiles_storyframe_sonic_finds_friends), .palette = Palette_storyframe_sonic_finds_friends, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_finds_friends) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_finds_friends), .map = Tilemap_storyframe_sonic_finds_friends, }; diff --git a/data/tilemaps/storyframe_sonic_leaves_0/header.c b/data/tilemaps/storyframe_sonic_leaves_0/header.c index db21c85b76..32709d306d 100644 --- a/data/tilemaps/storyframe_sonic_leaves_0/header.c +++ b/data/tilemaps/storyframe_sonic_leaves_0/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_leaves_0[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_0/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_leaves_0[] = INCPAL("data/tilemaps/storyframe_sonic_leaves_0/palette.pal"); const u8 Tiles_storyframe_sonic_leaves_0[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_0/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_leaves_0[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_0/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_leaves_0 = { .tilesSize = sizeof(Tiles_storyframe_sonic_leaves_0), .palette = Palette_storyframe_sonic_leaves_0, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_leaves_0) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_leaves_0), .map = Tilemap_storyframe_sonic_leaves_0, }; diff --git a/data/tilemaps/storyframe_sonic_leaves_1/header.c b/data/tilemaps/storyframe_sonic_leaves_1/header.c index 7af4ba7817..94ba4d2e40 100644 --- a/data/tilemaps/storyframe_sonic_leaves_1/header.c +++ b/data/tilemaps/storyframe_sonic_leaves_1/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_leaves_1[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_1/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_leaves_1[] = INCPAL("data/tilemaps/storyframe_sonic_leaves_1/palette.pal"); const u8 Tiles_storyframe_sonic_leaves_1[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_1/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_leaves_1[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_1/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_leaves_1 = { .tilesSize = sizeof(Tiles_storyframe_sonic_leaves_1), .palette = Palette_storyframe_sonic_leaves_1, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_leaves_1) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_leaves_1), .map = Tilemap_storyframe_sonic_leaves_1, }; diff --git a/data/tilemaps/storyframe_sonic_leaves_10/header.c b/data/tilemaps/storyframe_sonic_leaves_10/header.c index abcbc9890f..392fe55d2b 100644 --- a/data/tilemaps/storyframe_sonic_leaves_10/header.c +++ b/data/tilemaps/storyframe_sonic_leaves_10/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_leaves_10[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_10/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_leaves_10[] = INCPAL("data/tilemaps/storyframe_sonic_leaves_10/palette.pal"); const u8 Tiles_storyframe_sonic_leaves_10[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_10/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_leaves_10[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_10/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_leaves_10 = { .tilesSize = sizeof(Tiles_storyframe_sonic_leaves_10), .palette = Palette_storyframe_sonic_leaves_10, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_leaves_10) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_leaves_10), .map = Tilemap_storyframe_sonic_leaves_10, }; diff --git a/data/tilemaps/storyframe_sonic_leaves_2/header.c b/data/tilemaps/storyframe_sonic_leaves_2/header.c index 00d3ca2e90..48d8d22db2 100644 --- a/data/tilemaps/storyframe_sonic_leaves_2/header.c +++ b/data/tilemaps/storyframe_sonic_leaves_2/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_leaves_2[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_2/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_leaves_2[] = INCPAL("data/tilemaps/storyframe_sonic_leaves_2/palette.pal"); const u8 Tiles_storyframe_sonic_leaves_2[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_2/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_leaves_2[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_2/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_leaves_2 = { .tilesSize = sizeof(Tiles_storyframe_sonic_leaves_2), .palette = Palette_storyframe_sonic_leaves_2, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_leaves_2) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_leaves_2), .map = Tilemap_storyframe_sonic_leaves_2, }; diff --git a/data/tilemaps/storyframe_sonic_leaves_3/header.c b/data/tilemaps/storyframe_sonic_leaves_3/header.c index f27a373d0a..e27bf9317e 100644 --- a/data/tilemaps/storyframe_sonic_leaves_3/header.c +++ b/data/tilemaps/storyframe_sonic_leaves_3/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_leaves_3[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_3/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_leaves_3[] = INCPAL("data/tilemaps/storyframe_sonic_leaves_3/palette.pal"); const u8 Tiles_storyframe_sonic_leaves_3[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_3/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_leaves_3[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_3/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_leaves_3 = { .tilesSize = sizeof(Tiles_storyframe_sonic_leaves_3), .palette = Palette_storyframe_sonic_leaves_3, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_leaves_3) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_leaves_3), .map = Tilemap_storyframe_sonic_leaves_3, }; diff --git a/data/tilemaps/storyframe_sonic_leaves_4/header.c b/data/tilemaps/storyframe_sonic_leaves_4/header.c index 3a7a988acf..91e55dcd9f 100644 --- a/data/tilemaps/storyframe_sonic_leaves_4/header.c +++ b/data/tilemaps/storyframe_sonic_leaves_4/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_leaves_4[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_4/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_leaves_4[] = INCPAL("data/tilemaps/storyframe_sonic_leaves_4/palette.pal"); const u8 Tiles_storyframe_sonic_leaves_4[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_4/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_leaves_4[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_4/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_leaves_4 = { .tilesSize = sizeof(Tiles_storyframe_sonic_leaves_4), .palette = Palette_storyframe_sonic_leaves_4, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_leaves_4) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_leaves_4), .map = Tilemap_storyframe_sonic_leaves_4, }; diff --git a/data/tilemaps/storyframe_sonic_leaves_5/header.c b/data/tilemaps/storyframe_sonic_leaves_5/header.c index 9b8ab1b89b..69d9b3326c 100644 --- a/data/tilemaps/storyframe_sonic_leaves_5/header.c +++ b/data/tilemaps/storyframe_sonic_leaves_5/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_leaves_5[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_5/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_leaves_5[] = INCPAL("data/tilemaps/storyframe_sonic_leaves_5/palette.pal"); const u8 Tiles_storyframe_sonic_leaves_5[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_5/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_leaves_5[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_5/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_leaves_5 = { .tilesSize = sizeof(Tiles_storyframe_sonic_leaves_5), .palette = Palette_storyframe_sonic_leaves_5, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_leaves_5) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_leaves_5), .map = Tilemap_storyframe_sonic_leaves_5, }; diff --git a/data/tilemaps/storyframe_sonic_leaves_6/header.c b/data/tilemaps/storyframe_sonic_leaves_6/header.c index 7cb9c0cace..e85894b6af 100644 --- a/data/tilemaps/storyframe_sonic_leaves_6/header.c +++ b/data/tilemaps/storyframe_sonic_leaves_6/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_leaves_6[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_6/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_leaves_6[] = INCPAL("data/tilemaps/storyframe_sonic_leaves_6/palette.pal"); const u8 Tiles_storyframe_sonic_leaves_6[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_6/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_leaves_6[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_6/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_leaves_6 = { .tilesSize = sizeof(Tiles_storyframe_sonic_leaves_6), .palette = Palette_storyframe_sonic_leaves_6, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_leaves_6) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_leaves_6), .map = Tilemap_storyframe_sonic_leaves_6, }; diff --git a/data/tilemaps/storyframe_sonic_leaves_7/header.c b/data/tilemaps/storyframe_sonic_leaves_7/header.c index 9461e10002..bfe542b99d 100644 --- a/data/tilemaps/storyframe_sonic_leaves_7/header.c +++ b/data/tilemaps/storyframe_sonic_leaves_7/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_leaves_7[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_7/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_leaves_7[] = INCPAL("data/tilemaps/storyframe_sonic_leaves_7/palette.pal"); const u8 Tiles_storyframe_sonic_leaves_7[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_7/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_leaves_7[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_7/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_leaves_7 = { .tilesSize = sizeof(Tiles_storyframe_sonic_leaves_7), .palette = Palette_storyframe_sonic_leaves_7, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_leaves_7) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_leaves_7), .map = Tilemap_storyframe_sonic_leaves_7, }; diff --git a/data/tilemaps/storyframe_sonic_leaves_8/header.c b/data/tilemaps/storyframe_sonic_leaves_8/header.c index ca17ba472a..35e87c7708 100644 --- a/data/tilemaps/storyframe_sonic_leaves_8/header.c +++ b/data/tilemaps/storyframe_sonic_leaves_8/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_leaves_8[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_8/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_leaves_8[] = INCPAL("data/tilemaps/storyframe_sonic_leaves_8/palette.pal"); const u8 Tiles_storyframe_sonic_leaves_8[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_8/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_leaves_8[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_8/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_leaves_8 = { .tilesSize = sizeof(Tiles_storyframe_sonic_leaves_8), .palette = Palette_storyframe_sonic_leaves_8, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_leaves_8) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_leaves_8), .map = Tilemap_storyframe_sonic_leaves_8, }; diff --git a/data/tilemaps/storyframe_sonic_leaves_9/header.c b/data/tilemaps/storyframe_sonic_leaves_9/header.c index ba93e5b18a..895e589243 100644 --- a/data/tilemaps/storyframe_sonic_leaves_9/header.c +++ b/data/tilemaps/storyframe_sonic_leaves_9/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_leaves_9[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_9/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_leaves_9[] = INCPAL("data/tilemaps/storyframe_sonic_leaves_9/palette.pal"); const u8 Tiles_storyframe_sonic_leaves_9[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_9/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_leaves_9[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_9/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_leaves_9 = { .tilesSize = sizeof(Tiles_storyframe_sonic_leaves_9), .palette = Palette_storyframe_sonic_leaves_9, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_leaves_9) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_leaves_9), .map = Tilemap_storyframe_sonic_leaves_9, }; diff --git a/data/tilemaps/storyframe_sonic_pats_tails/header.c b/data/tilemaps/storyframe_sonic_pats_tails/header.c index 28c0e7b821..008f99cfdb 100644 --- a/data/tilemaps/storyframe_sonic_pats_tails/header.c +++ b/data/tilemaps/storyframe_sonic_pats_tails/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_sonic_pats_tails[] = INCBIN_U16("data/tilemaps/storyframe_sonic_pats_tails/palette.gbapal"); +const ColorRaw Palette_storyframe_sonic_pats_tails[] = INCPAL("data/tilemaps/storyframe_sonic_pats_tails/palette.pal"); const u8 Tiles_storyframe_sonic_pats_tails[] = INCBIN_U8("data/tilemaps/storyframe_sonic_pats_tails/tiles.4bpp"); const u16 Tilemap_storyframe_sonic_pats_tails[] = INCBIN_U16("data/tilemaps/storyframe_sonic_pats_tails/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_sonic_pats_tails = { .tilesSize = sizeof(Tiles_storyframe_sonic_pats_tails), .palette = Palette_storyframe_sonic_pats_tails, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_sonic_pats_tails) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_sonic_pats_tails), .map = Tilemap_storyframe_sonic_pats_tails, }; diff --git a/data/tilemaps/storyframe_tails_unlock_0/header.c b/data/tilemaps/storyframe_tails_unlock_0/header.c index c20d4f7f9f..c194910a0d 100644 --- a/data/tilemaps/storyframe_tails_unlock_0/header.c +++ b/data/tilemaps/storyframe_tails_unlock_0/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_0[] = INCPAL("data/tilemaps/storyframe_tails_unlock_0/palette.pal"); const u8 Tiles_storyframe_tails_unlock_0[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_0 = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_0), .palette = Palette_storyframe_tails_unlock_0, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_0) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_0), .map = Tilemap_storyframe_tails_unlock_0, }; diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_de/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_de/header.c index 50b65dfd6e..d06ecde015 100644 --- a/data/tilemaps/storyframe_tails_unlock_0_dlg_de/header.c +++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_0_dlg_de[] = INCPAL("data/tilemaps/storyframe_tails_unlock_0_dlg_de/palette.pal"); const u8 Tiles_storyframe_tails_unlock_0_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_0_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_0_dlg_de), .palette = Palette_storyframe_tails_unlock_0_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_0_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_0_dlg_de), .map = Tilemap_storyframe_tails_unlock_0_dlg_de, }; diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_en/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_en/header.c index bfefab0e2c..8fb36014ef 100644 --- a/data/tilemaps/storyframe_tails_unlock_0_dlg_en/header.c +++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_0_dlg_en[] = INCPAL("data/tilemaps/storyframe_tails_unlock_0_dlg_en/palette.pal"); const u8 Tiles_storyframe_tails_unlock_0_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_0_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_0_dlg_en), .palette = Palette_storyframe_tails_unlock_0_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_0_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_0_dlg_en), .map = Tilemap_storyframe_tails_unlock_0_dlg_en, }; diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_es/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_es/header.c index dcd142b170..e70a2bfcd0 100644 --- a/data/tilemaps/storyframe_tails_unlock_0_dlg_es/header.c +++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_0_dlg_es[] = INCPAL("data/tilemaps/storyframe_tails_unlock_0_dlg_es/palette.pal"); const u8 Tiles_storyframe_tails_unlock_0_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_0_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_0_dlg_es), .palette = Palette_storyframe_tails_unlock_0_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_0_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_0_dlg_es), .map = Tilemap_storyframe_tails_unlock_0_dlg_es, }; diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_fr/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_fr/header.c index aa0167a56f..3e38f32fab 100644 --- a/data/tilemaps/storyframe_tails_unlock_0_dlg_fr/header.c +++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_0_dlg_fr[] = INCPAL("data/tilemaps/storyframe_tails_unlock_0_dlg_fr/palette.pal"); const u8 Tiles_storyframe_tails_unlock_0_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_0_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_0_dlg_fr), .palette = Palette_storyframe_tails_unlock_0_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_0_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_0_dlg_fr), .map = Tilemap_storyframe_tails_unlock_0_dlg_fr, }; diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_it/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_it/header.c index de88b9ef0e..7e6e8dc12f 100644 --- a/data/tilemaps/storyframe_tails_unlock_0_dlg_it/header.c +++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_0_dlg_it[] = INCPAL("data/tilemaps/storyframe_tails_unlock_0_dlg_it/palette.pal"); const u8 Tiles_storyframe_tails_unlock_0_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_0_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_0_dlg_it), .palette = Palette_storyframe_tails_unlock_0_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_0_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_0_dlg_it), .map = Tilemap_storyframe_tails_unlock_0_dlg_it, }; diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_jp/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_jp/header.c index 71ad84fe0a..11cce1861b 100644 --- a/data/tilemaps/storyframe_tails_unlock_0_dlg_jp/header.c +++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_0_dlg_jp[] = INCPAL("data/tilemaps/storyframe_tails_unlock_0_dlg_jp/palette.pal"); const u8 Tiles_storyframe_tails_unlock_0_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_0_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_0_dlg_jp), .palette = Palette_storyframe_tails_unlock_0_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_0_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_0_dlg_jp), .map = Tilemap_storyframe_tails_unlock_0_dlg_jp, }; diff --git a/data/tilemaps/storyframe_tails_unlock_1/header.c b/data/tilemaps/storyframe_tails_unlock_1/header.c index a5b0410604..5c423782a7 100644 --- a/data/tilemaps/storyframe_tails_unlock_1/header.c +++ b/data/tilemaps/storyframe_tails_unlock_1/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_1[] = INCPAL("data/tilemaps/storyframe_tails_unlock_1/palette.pal"); const u8 Tiles_storyframe_tails_unlock_1[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_1 = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_1), .palette = Palette_storyframe_tails_unlock_1, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_1) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_1), .map = Tilemap_storyframe_tails_unlock_1, }; diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_de/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_de/header.c index 10c05f3148..cc98639b22 100644 --- a/data/tilemaps/storyframe_tails_unlock_1_dlg_de/header.c +++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_1_dlg_de[] = INCPAL("data/tilemaps/storyframe_tails_unlock_1_dlg_de/palette.pal"); const u8 Tiles_storyframe_tails_unlock_1_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_1_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_1_dlg_de), .palette = Palette_storyframe_tails_unlock_1_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_1_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_1_dlg_de), .map = Tilemap_storyframe_tails_unlock_1_dlg_de, }; diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_en/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_en/header.c index 5709f11ee1..4e6956f312 100644 --- a/data/tilemaps/storyframe_tails_unlock_1_dlg_en/header.c +++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_1_dlg_en[] = INCPAL("data/tilemaps/storyframe_tails_unlock_1_dlg_en/palette.pal"); const u8 Tiles_storyframe_tails_unlock_1_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_1_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_1_dlg_en), .palette = Palette_storyframe_tails_unlock_1_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_1_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_1_dlg_en), .map = Tilemap_storyframe_tails_unlock_1_dlg_en, }; diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_es/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_es/header.c index 90bea69fa1..2dab654639 100644 --- a/data/tilemaps/storyframe_tails_unlock_1_dlg_es/header.c +++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_1_dlg_es[] = INCPAL("data/tilemaps/storyframe_tails_unlock_1_dlg_es/palette.pal"); const u8 Tiles_storyframe_tails_unlock_1_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_1_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_1_dlg_es), .palette = Palette_storyframe_tails_unlock_1_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_1_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_1_dlg_es), .map = Tilemap_storyframe_tails_unlock_1_dlg_es, }; diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_fr/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_fr/header.c index e9da4a2563..61c9ac1528 100644 --- a/data/tilemaps/storyframe_tails_unlock_1_dlg_fr/header.c +++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_1_dlg_fr[] = INCPAL("data/tilemaps/storyframe_tails_unlock_1_dlg_fr/palette.pal"); const u8 Tiles_storyframe_tails_unlock_1_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_1_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_1_dlg_fr), .palette = Palette_storyframe_tails_unlock_1_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_1_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_1_dlg_fr), .map = Tilemap_storyframe_tails_unlock_1_dlg_fr, }; diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_it/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_it/header.c index 1d3e858a01..01fd34d599 100644 --- a/data/tilemaps/storyframe_tails_unlock_1_dlg_it/header.c +++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_1_dlg_it[] = INCPAL("data/tilemaps/storyframe_tails_unlock_1_dlg_it/palette.pal"); const u8 Tiles_storyframe_tails_unlock_1_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_1_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_1_dlg_it), .palette = Palette_storyframe_tails_unlock_1_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_1_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_1_dlg_it), .map = Tilemap_storyframe_tails_unlock_1_dlg_it, }; diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_jp/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_jp/header.c index 3ae3fed932..de731ec355 100644 --- a/data/tilemaps/storyframe_tails_unlock_1_dlg_jp/header.c +++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_1_dlg_jp[] = INCPAL("data/tilemaps/storyframe_tails_unlock_1_dlg_jp/palette.pal"); const u8 Tiles_storyframe_tails_unlock_1_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_1_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_1_dlg_jp), .palette = Palette_storyframe_tails_unlock_1_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_1_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_1_dlg_jp), .map = Tilemap_storyframe_tails_unlock_1_dlg_jp, }; diff --git a/data/tilemaps/storyframe_tails_unlock_1_sepia/header.c b/data/tilemaps/storyframe_tails_unlock_1_sepia/header.c index e3c96eddff..f1d415bf68 100644 --- a/data/tilemaps/storyframe_tails_unlock_1_sepia/header.c +++ b/data/tilemaps/storyframe_tails_unlock_1_sepia/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_sepia/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_1_sepia[] = INCPAL("data/tilemaps/storyframe_tails_unlock_1_sepia/palette.pal"); const u8 Tiles_storyframe_tails_unlock_1_sepia[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_sepia/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_sepia/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_1_sepia = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_1_sepia), .palette = Palette_storyframe_tails_unlock_1_sepia, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_1_sepia) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_1_sepia), .map = Tilemap_storyframe_tails_unlock_1_sepia, }; diff --git a/data/tilemaps/storyframe_tails_unlock_2/header.c b/data/tilemaps/storyframe_tails_unlock_2/header.c index 646a53ae47..6ac3d1c907 100644 --- a/data/tilemaps/storyframe_tails_unlock_2/header.c +++ b/data/tilemaps/storyframe_tails_unlock_2/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_2[] = INCPAL("data/tilemaps/storyframe_tails_unlock_2/palette.pal"); const u8 Tiles_storyframe_tails_unlock_2[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_2 = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_2), .palette = Palette_storyframe_tails_unlock_2, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_2) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_2), .map = Tilemap_storyframe_tails_unlock_2, }; diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_de/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_de/header.c index 1153dc97d3..bce20bfab1 100644 --- a/data/tilemaps/storyframe_tails_unlock_2_dlg_de/header.c +++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_2_dlg_de[] = INCPAL("data/tilemaps/storyframe_tails_unlock_2_dlg_de/palette.pal"); const u8 Tiles_storyframe_tails_unlock_2_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_2_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_2_dlg_de), .palette = Palette_storyframe_tails_unlock_2_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_2_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_2_dlg_de), .map = Tilemap_storyframe_tails_unlock_2_dlg_de, }; diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_en/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_en/header.c index f0670c63f7..b16f967518 100644 --- a/data/tilemaps/storyframe_tails_unlock_2_dlg_en/header.c +++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_2_dlg_en[] = INCPAL("data/tilemaps/storyframe_tails_unlock_2_dlg_en/palette.pal"); const u8 Tiles_storyframe_tails_unlock_2_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_2_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_2_dlg_en), .palette = Palette_storyframe_tails_unlock_2_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_2_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_2_dlg_en), .map = Tilemap_storyframe_tails_unlock_2_dlg_en, }; diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_es/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_es/header.c index 00ef628c0a..7e0f70a358 100644 --- a/data/tilemaps/storyframe_tails_unlock_2_dlg_es/header.c +++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_2_dlg_es[] = INCPAL("data/tilemaps/storyframe_tails_unlock_2_dlg_es/palette.pal"); const u8 Tiles_storyframe_tails_unlock_2_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_2_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_2_dlg_es), .palette = Palette_storyframe_tails_unlock_2_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_2_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_2_dlg_es), .map = Tilemap_storyframe_tails_unlock_2_dlg_es, }; diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_fr/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_fr/header.c index 39b2f58210..e79f155f1c 100644 --- a/data/tilemaps/storyframe_tails_unlock_2_dlg_fr/header.c +++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_2_dlg_fr[] = INCPAL("data/tilemaps/storyframe_tails_unlock_2_dlg_fr/palette.pal"); const u8 Tiles_storyframe_tails_unlock_2_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_2_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_2_dlg_fr), .palette = Palette_storyframe_tails_unlock_2_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_2_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_2_dlg_fr), .map = Tilemap_storyframe_tails_unlock_2_dlg_fr, }; diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_it/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_it/header.c index 7bfd9f5ba2..e5eb1fe1af 100644 --- a/data/tilemaps/storyframe_tails_unlock_2_dlg_it/header.c +++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_2_dlg_it[] = INCPAL("data/tilemaps/storyframe_tails_unlock_2_dlg_it/palette.pal"); const u8 Tiles_storyframe_tails_unlock_2_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_2_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_2_dlg_it), .palette = Palette_storyframe_tails_unlock_2_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_2_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_2_dlg_it), .map = Tilemap_storyframe_tails_unlock_2_dlg_it, }; diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_jp/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_jp/header.c index d238617172..68cd657071 100644 --- a/data/tilemaps/storyframe_tails_unlock_2_dlg_jp/header.c +++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_2_dlg_jp[] = INCPAL("data/tilemaps/storyframe_tails_unlock_2_dlg_jp/palette.pal"); const u8 Tiles_storyframe_tails_unlock_2_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_2_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_2_dlg_jp), .palette = Palette_storyframe_tails_unlock_2_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_2_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_2_dlg_jp), .map = Tilemap_storyframe_tails_unlock_2_dlg_jp, }; diff --git a/data/tilemaps/storyframe_tails_unlock_3/header.c b/data/tilemaps/storyframe_tails_unlock_3/header.c index 89ceca4d58..0af84a3dbf 100644 --- a/data/tilemaps/storyframe_tails_unlock_3/header.c +++ b/data/tilemaps/storyframe_tails_unlock_3/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_3[] = INCPAL("data/tilemaps/storyframe_tails_unlock_3/palette.pal"); const u8 Tiles_storyframe_tails_unlock_3[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_3 = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_3), .palette = Palette_storyframe_tails_unlock_3, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_3) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_3), .map = Tilemap_storyframe_tails_unlock_3, }; diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_de/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_de/header.c index 79eddab11d..52ff9a5d30 100644 --- a/data/tilemaps/storyframe_tails_unlock_3_dlg_de/header.c +++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_de/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_3_dlg_de[] = INCPAL("data/tilemaps/storyframe_tails_unlock_3_dlg_de/palette.pal"); const u8 Tiles_storyframe_tails_unlock_3_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_de/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_3_dlg_de = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_3_dlg_de), .palette = Palette_storyframe_tails_unlock_3_dlg_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_3_dlg_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_3_dlg_de), .map = Tilemap_storyframe_tails_unlock_3_dlg_de, }; diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_en/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_en/header.c index c449177a2a..39df297115 100644 --- a/data/tilemaps/storyframe_tails_unlock_3_dlg_en/header.c +++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_en/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_3_dlg_en[] = INCPAL("data/tilemaps/storyframe_tails_unlock_3_dlg_en/palette.pal"); const u8 Tiles_storyframe_tails_unlock_3_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_en/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_3_dlg_en = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_3_dlg_en), .palette = Palette_storyframe_tails_unlock_3_dlg_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_3_dlg_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_3_dlg_en), .map = Tilemap_storyframe_tails_unlock_3_dlg_en, }; diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_es/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_es/header.c index d1f31a429f..cb312bf5a6 100644 --- a/data/tilemaps/storyframe_tails_unlock_3_dlg_es/header.c +++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_es/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_3_dlg_es[] = INCPAL("data/tilemaps/storyframe_tails_unlock_3_dlg_es/palette.pal"); const u8 Tiles_storyframe_tails_unlock_3_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_es/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_3_dlg_es = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_3_dlg_es), .palette = Palette_storyframe_tails_unlock_3_dlg_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_3_dlg_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_3_dlg_es), .map = Tilemap_storyframe_tails_unlock_3_dlg_es, }; diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_fr/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_fr/header.c index 01cb1fbe04..9c21d7fa5d 100644 --- a/data/tilemaps/storyframe_tails_unlock_3_dlg_fr/header.c +++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_3_dlg_fr[] = INCPAL("data/tilemaps/storyframe_tails_unlock_3_dlg_fr/palette.pal"); const u8 Tiles_storyframe_tails_unlock_3_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_fr/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_3_dlg_fr = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_3_dlg_fr), .palette = Palette_storyframe_tails_unlock_3_dlg_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_3_dlg_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_3_dlg_fr), .map = Tilemap_storyframe_tails_unlock_3_dlg_fr, }; diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_it/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_it/header.c index a30a3821e8..98384b04fe 100644 --- a/data/tilemaps/storyframe_tails_unlock_3_dlg_it/header.c +++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_it/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_3_dlg_it[] = INCPAL("data/tilemaps/storyframe_tails_unlock_3_dlg_it/palette.pal"); const u8 Tiles_storyframe_tails_unlock_3_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_it/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_3_dlg_it = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_3_dlg_it), .palette = Palette_storyframe_tails_unlock_3_dlg_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_3_dlg_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_3_dlg_it), .map = Tilemap_storyframe_tails_unlock_3_dlg_it, }; diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_jp/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_jp/header.c index a7717f6920..336c3c6d89 100644 --- a/data/tilemaps/storyframe_tails_unlock_3_dlg_jp/header.c +++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlock_3_dlg_jp[] = INCPAL("data/tilemaps/storyframe_tails_unlock_3_dlg_jp/palette.pal"); const u8 Tiles_storyframe_tails_unlock_3_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_jp/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlock_3_dlg_jp = { .tilesSize = sizeof(Tiles_storyframe_tails_unlock_3_dlg_jp), .palette = Palette_storyframe_tails_unlock_3_dlg_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlock_3_dlg_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlock_3_dlg_jp), .map = Tilemap_storyframe_tails_unlock_3_dlg_jp, }; diff --git a/data/tilemaps/storyframe_tails_unlocked_de/header.c b/data/tilemaps/storyframe_tails_unlocked_de/header.c index 79ba8486ee..df7b9da2bc 100644 --- a/data/tilemaps/storyframe_tails_unlocked_de/header.c +++ b/data/tilemaps/storyframe_tails_unlocked_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_de/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlocked_de[] = INCPAL("data/tilemaps/storyframe_tails_unlocked_de/palette.pal"); const u8 Tiles_storyframe_tails_unlocked_de[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_de/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlocked_de = { .tilesSize = sizeof(Tiles_storyframe_tails_unlocked_de), .palette = Palette_storyframe_tails_unlocked_de, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlocked_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlocked_de), .map = Tilemap_storyframe_tails_unlocked_de, }; diff --git a/data/tilemaps/storyframe_tails_unlocked_en/header.c b/data/tilemaps/storyframe_tails_unlocked_en/header.c index d04bbddd48..26c19f40b3 100644 --- a/data/tilemaps/storyframe_tails_unlocked_en/header.c +++ b/data/tilemaps/storyframe_tails_unlocked_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_en/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlocked_en[] = INCPAL("data/tilemaps/storyframe_tails_unlocked_en/palette.pal"); const u8 Tiles_storyframe_tails_unlocked_en[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_en/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlocked_en = { .tilesSize = sizeof(Tiles_storyframe_tails_unlocked_en), .palette = Palette_storyframe_tails_unlocked_en, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlocked_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlocked_en), .map = Tilemap_storyframe_tails_unlocked_en, }; diff --git a/data/tilemaps/storyframe_tails_unlocked_es/header.c b/data/tilemaps/storyframe_tails_unlocked_es/header.c index 0d79774cd9..d36fb3e863 100644 --- a/data/tilemaps/storyframe_tails_unlocked_es/header.c +++ b/data/tilemaps/storyframe_tails_unlocked_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_es/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlocked_es[] = INCPAL("data/tilemaps/storyframe_tails_unlocked_es/palette.pal"); const u8 Tiles_storyframe_tails_unlocked_es[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_es/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlocked_es = { .tilesSize = sizeof(Tiles_storyframe_tails_unlocked_es), .palette = Palette_storyframe_tails_unlocked_es, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlocked_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlocked_es), .map = Tilemap_storyframe_tails_unlocked_es, }; diff --git a/data/tilemaps/storyframe_tails_unlocked_fr/header.c b/data/tilemaps/storyframe_tails_unlocked_fr/header.c index 08e57eed1f..c2e696026e 100644 --- a/data/tilemaps/storyframe_tails_unlocked_fr/header.c +++ b/data/tilemaps/storyframe_tails_unlocked_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_fr/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlocked_fr[] = INCPAL("data/tilemaps/storyframe_tails_unlocked_fr/palette.pal"); const u8 Tiles_storyframe_tails_unlocked_fr[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_fr/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlocked_fr = { .tilesSize = sizeof(Tiles_storyframe_tails_unlocked_fr), .palette = Palette_storyframe_tails_unlocked_fr, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlocked_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlocked_fr), .map = Tilemap_storyframe_tails_unlocked_fr, }; diff --git a/data/tilemaps/storyframe_tails_unlocked_it/header.c b/data/tilemaps/storyframe_tails_unlocked_it/header.c index f8c06e9017..058bf9624e 100644 --- a/data/tilemaps/storyframe_tails_unlocked_it/header.c +++ b/data/tilemaps/storyframe_tails_unlocked_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_it/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlocked_it[] = INCPAL("data/tilemaps/storyframe_tails_unlocked_it/palette.pal"); const u8 Tiles_storyframe_tails_unlocked_it[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_it/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlocked_it = { .tilesSize = sizeof(Tiles_storyframe_tails_unlocked_it), .palette = Palette_storyframe_tails_unlocked_it, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlocked_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlocked_it), .map = Tilemap_storyframe_tails_unlocked_it, }; diff --git a/data/tilemaps/storyframe_tails_unlocked_jp/header.c b/data/tilemaps/storyframe_tails_unlocked_jp/header.c index 5d937a9607..43c8252dd6 100644 --- a/data/tilemaps/storyframe_tails_unlocked_jp/header.c +++ b/data/tilemaps/storyframe_tails_unlocked_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_storyframe_tails_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_jp/palette.gbapal"); +const ColorRaw Palette_storyframe_tails_unlocked_jp[] = INCPAL("data/tilemaps/storyframe_tails_unlocked_jp/palette.pal"); const u8 Tiles_storyframe_tails_unlocked_jp[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_jp/tiles.4bpp"); const u16 Tilemap_storyframe_tails_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap storyframe_tails_unlocked_jp = { .tilesSize = sizeof(Tiles_storyframe_tails_unlocked_jp), .palette = Palette_storyframe_tails_unlocked_jp, .palOffset = 0, - .palLength = sizeof(Palette_storyframe_tails_unlocked_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_storyframe_tails_unlocked_jp), .map = Tilemap_storyframe_tails_unlocked_jp, }; diff --git a/data/tilemaps/ta_and_mp_white_bg/header.c b/data/tilemaps/ta_and_mp_white_bg/header.c index 389844e28f..f86f9f93f4 100644 --- a/data/tilemaps/ta_and_mp_white_bg/header.c +++ b/data/tilemaps/ta_and_mp_white_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_ta_and_mp_white_bg[] = INCBIN_U16("data/tilemaps/ta_and_mp_white_bg/palette.gbapal"); +const ColorRaw Palette_ta_and_mp_white_bg[] = INCPAL("data/tilemaps/ta_and_mp_white_bg/palette.pal"); const u8 Tiles_ta_and_mp_white_bg[] = INCBIN_U8("data/tilemaps/ta_and_mp_white_bg/tiles.4bpp"); const u16 Tilemap_ta_and_mp_white_bg[] = INCBIN_U16("data/tilemaps/ta_and_mp_white_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap ta_and_mp_white_bg = { .tilesSize = sizeof(Tiles_ta_and_mp_white_bg), .palette = Palette_ta_and_mp_white_bg, .palOffset = 0, - .palLength = sizeof(Palette_ta_and_mp_white_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_ta_and_mp_white_bg), .map = Tilemap_ta_and_mp_white_bg, }; diff --git a/data/tilemaps/ta_orange_bg/header.c b/data/tilemaps/ta_orange_bg/header.c index d73b9710e1..cdee0f7f13 100644 --- a/data/tilemaps/ta_orange_bg/header.c +++ b/data/tilemaps/ta_orange_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_ta_orange_bg[] = INCBIN_U16("data/tilemaps/ta_orange_bg/palette.gbapal"); +const ColorRaw Palette_ta_orange_bg[] = INCPAL("data/tilemaps/ta_orange_bg/palette.pal"); const u8 Tiles_ta_orange_bg[] = INCBIN_U8("data/tilemaps/ta_orange_bg/tiles.4bpp"); const u16 Tilemap_ta_orange_bg[] = INCBIN_U16("data/tilemaps/ta_orange_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap ta_orange_bg = { .tilesSize = sizeof(Tiles_ta_orange_bg), .palette = Palette_ta_orange_bg, .palOffset = 0, - .palLength = sizeof(Palette_ta_orange_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_ta_orange_bg), .map = Tilemap_ta_orange_bg, }; diff --git a/data/tilemaps/techno_base_bg_circuit_mask/header.c b/data/tilemaps/techno_base_bg_circuit_mask/header.c index 2da122ccd8..67692d2e7e 100644 --- a/data/tilemaps/techno_base_bg_circuit_mask/header.c +++ b/data/tilemaps/techno_base_bg_circuit_mask/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_techno_base_bg_circuit_mask[] = INCBIN_U16("data/tilemaps/techno_base_bg_circuit_mask/palette.gbapal"); +const ColorRaw Palette_techno_base_bg_circuit_mask[] = INCPAL("data/tilemaps/techno_base_bg_circuit_mask/palette.pal"); const u8 Tiles_techno_base_bg_circuit_mask[] = INCBIN_U8("data/tilemaps/techno_base_bg_circuit_mask/tiles.4bpp"); const u16 Tilemap_techno_base_bg_circuit_mask[] = INCBIN_U16("data/tilemaps/techno_base_bg_circuit_mask/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap techno_base_bg_circuit_mask = { .tilesSize = sizeof(Tiles_techno_base_bg_circuit_mask), .palette = Palette_techno_base_bg_circuit_mask, .palOffset = 0, - .palLength = sizeof(Palette_techno_base_bg_circuit_mask) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_techno_base_bg_circuit_mask), .map = Tilemap_techno_base_bg_circuit_mask, }; diff --git a/data/tilemaps/techno_base_bg_purple_grid/header.c b/data/tilemaps/techno_base_bg_purple_grid/header.c index 1eb7474e58..f53fc592a1 100644 --- a/data/tilemaps/techno_base_bg_purple_grid/header.c +++ b/data/tilemaps/techno_base_bg_purple_grid/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_techno_base_bg_purple_grid[] = INCBIN_U16("data/tilemaps/techno_base_bg_purple_grid/palette.gbapal"); +const ColorRaw Palette_techno_base_bg_purple_grid[] = INCPAL("data/tilemaps/techno_base_bg_purple_grid/palette.pal"); const u8 Tiles_techno_base_bg_purple_grid[] = INCBIN_U8("data/tilemaps/techno_base_bg_purple_grid/tiles.4bpp"); const u16 Tilemap_techno_base_bg_purple_grid[] = INCBIN_U16("data/tilemaps/techno_base_bg_purple_grid/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap techno_base_bg_purple_grid = { .tilesSize = sizeof(Tiles_techno_base_bg_purple_grid), .palette = Palette_techno_base_bg_purple_grid, .palOffset = 0, - .palLength = sizeof(Palette_techno_base_bg_purple_grid) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_techno_base_bg_purple_grid), .map = Tilemap_techno_base_bg_purple_grid, }; diff --git a/data/tilemaps/tilemap_108/header.c b/data/tilemaps/tilemap_108/header.c index a73933e77f..a6fe77ea76 100644 --- a/data/tilemaps/tilemap_108/header.c +++ b/data/tilemaps/tilemap_108/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_tilemap_108[] = INCBIN_U16("data/tilemaps/tilemap_108/palette.gbapal"); +const ColorRaw Palette_tilemap_108[] = INCPAL("data/tilemaps/tilemap_108/palette.pal"); const u8 Tiles_tilemap_108[] = INCBIN_U8("data/tilemaps/tilemap_108/tiles.4bpp"); const u16 Tilemap_tilemap_108[] = INCBIN_U16("data/tilemaps/tilemap_108/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap tilemap_108 = { .tilesSize = sizeof(Tiles_tilemap_108), .palette = Palette_tilemap_108, .palOffset = 0, - .palLength = sizeof(Palette_tilemap_108) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_tilemap_108), .map = Tilemap_tilemap_108, }; diff --git a/data/tilemaps/tilemap_139/header.c b/data/tilemaps/tilemap_139/header.c index 024d06431e..6860e0df9b 100644 --- a/data/tilemaps/tilemap_139/header.c +++ b/data/tilemaps/tilemap_139/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_tilemap_139[] = INCBIN_U16("data/tilemaps/tilemap_139/palette.gbapal"); +const ColorRaw Palette_tilemap_139[] = INCPAL("data/tilemaps/tilemap_139/palette.pal"); const u8 Tiles_tilemap_139[] = INCBIN_U8("data/tilemaps/tilemap_139/tiles.4bpp"); const u16 Tilemap_tilemap_139[] = INCBIN_U16("data/tilemaps/tilemap_139/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap tilemap_139 = { .tilesSize = sizeof(Tiles_tilemap_139), .palette = Palette_tilemap_139, .palOffset = 0, - .palLength = sizeof(Palette_tilemap_139) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_tilemap_139), .map = Tilemap_tilemap_139, }; diff --git a/data/tilemaps/title_screen_bg/header.c b/data/tilemaps/title_screen_bg/header.c index 86393d5a24..c80bee94be 100644 --- a/data/tilemaps/title_screen_bg/header.c +++ b/data/tilemaps/title_screen_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_title_screen_bg[] = INCBIN_U16("data/tilemaps/title_screen_bg/palette.gbapal"); +const ColorRaw Palette_title_screen_bg[] = INCPAL("data/tilemaps/title_screen_bg/palette.pal"); const u8 Tiles_title_screen_bg[] = INCBIN_U8("data/tilemaps/title_screen_bg/tiles.4bpp"); const u16 Tilemap_title_screen_bg[] = INCBIN_U16("data/tilemaps/title_screen_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap title_screen_bg = { .tilesSize = sizeof(Tiles_title_screen_bg), .palette = Palette_title_screen_bg, .palOffset = 0, - .palLength = sizeof(Palette_title_screen_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_title_screen_bg), .map = Tilemap_title_screen_bg, }; diff --git a/data/tilemaps/unk_space_bg/header.c b/data/tilemaps/unk_space_bg/header.c index ee440e1b8f..3c32159f71 100644 --- a/data/tilemaps/unk_space_bg/header.c +++ b/data/tilemaps/unk_space_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unk_space_bg[] = INCBIN_U16("data/tilemaps/unk_space_bg/palette.gbapal"); +const ColorRaw Palette_unk_space_bg[] = INCPAL("data/tilemaps/unk_space_bg/palette.pal"); const u8 Tiles_unk_space_bg[] = INCBIN_U8("data/tilemaps/unk_space_bg/tiles.4bpp"); const u16 Tilemap_unk_space_bg[] = INCBIN_U16("data/tilemaps/unk_space_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unk_space_bg = { .tilesSize = sizeof(Tiles_unk_space_bg), .palette = Palette_unk_space_bg, .palOffset = 0, - .palLength = sizeof(Palette_unk_space_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unk_space_bg), .map = Tilemap_unk_space_bg, }; diff --git a/data/tilemaps/unknown_message_box_white/header.c b/data/tilemaps/unknown_message_box_white/header.c index f5d16dac9d..7beff7be0a 100644 --- a/data/tilemaps/unknown_message_box_white/header.c +++ b/data/tilemaps/unknown_message_box_white/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unknown_message_box_white[] = INCBIN_U16("data/tilemaps/unknown_message_box_white/palette.gbapal"); +const ColorRaw Palette_unknown_message_box_white[] = INCPAL("data/tilemaps/unknown_message_box_white/palette.pal"); const u8 Tiles_unknown_message_box_white[] = INCBIN_U8("data/tilemaps/unknown_message_box_white/tiles.4bpp"); const u16 Tilemap_unknown_message_box_white[] = INCBIN_U16("data/tilemaps/unknown_message_box_white/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unknown_message_box_white = { .tilesSize = sizeof(Tiles_unknown_message_box_white), .palette = Palette_unknown_message_box_white, .palOffset = 0, - .palLength = sizeof(Palette_unknown_message_box_white) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unknown_message_box_white), .map = Tilemap_unknown_message_box_white, }; diff --git a/data/tilemaps/unknown_message_box_white_small/header.c b/data/tilemaps/unknown_message_box_white_small/header.c index 85cb2cd17f..e455bc7c78 100644 --- a/data/tilemaps/unknown_message_box_white_small/header.c +++ b/data/tilemaps/unknown_message_box_white_small/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unknown_message_box_white_small[] = INCBIN_U16("data/tilemaps/unknown_message_box_white_small/palette.gbapal"); +const ColorRaw Palette_unknown_message_box_white_small[] = INCPAL("data/tilemaps/unknown_message_box_white_small/palette.pal"); const u8 Tiles_unknown_message_box_white_small[] = INCBIN_U8("data/tilemaps/unknown_message_box_white_small/tiles.4bpp"); const u16 Tilemap_unknown_message_box_white_small[] = INCBIN_U16("data/tilemaps/unknown_message_box_white_small/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unknown_message_box_white_small = { .tilesSize = sizeof(Tiles_unknown_message_box_white_small), .palette = Palette_unknown_message_box_white_small, .palOffset = 0, - .palLength = sizeof(Palette_unknown_message_box_white_small) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unknown_message_box_white_small), .map = Tilemap_unknown_message_box_white_small, }; diff --git a/data/tilemaps/unknown_options_bg/header.c b/data/tilemaps/unknown_options_bg/header.c index 301e3fcf38..aa8ab52217 100644 --- a/data/tilemaps/unknown_options_bg/header.c +++ b/data/tilemaps/unknown_options_bg/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unknown_options_bg[] = INCBIN_U16("data/tilemaps/unknown_options_bg/palette.gbapal"); +const ColorRaw Palette_unknown_options_bg[] = INCPAL("data/tilemaps/unknown_options_bg/palette.pal"); const u8 Tiles_unknown_options_bg[] = INCBIN_U8("data/tilemaps/unknown_options_bg/tiles.4bpp"); const u16 Tilemap_unknown_options_bg[] = INCBIN_U16("data/tilemaps/unknown_options_bg/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unknown_options_bg = { .tilesSize = sizeof(Tiles_unknown_options_bg), .palette = Palette_unknown_options_bg, .palOffset = 0, - .palLength = sizeof(Palette_unknown_options_bg) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unknown_options_bg), .map = Tilemap_unknown_options_bg, }; diff --git a/data/tilemaps/unlocked_amy_de/header.c b/data/tilemaps/unlocked_amy_de/header.c index 583b9c29a7..f28f4c2449 100644 --- a/data/tilemaps/unlocked_amy_de/header.c +++ b/data/tilemaps/unlocked_amy_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_amy_de[] = INCBIN_U16("data/tilemaps/unlocked_amy_de/palette.gbapal"); +const ColorRaw Palette_unlocked_amy_de[] = INCPAL("data/tilemaps/unlocked_amy_de/palette.pal"); const u8 Tiles_unlocked_amy_de[] = INCBIN_U8("data/tilemaps/unlocked_amy_de/tiles.4bpp"); const u16 Tilemap_unlocked_amy_de[] = INCBIN_U16("data/tilemaps/unlocked_amy_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_amy_de = { .tilesSize = sizeof(Tiles_unlocked_amy_de), .palette = Palette_unlocked_amy_de, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_amy_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_amy_de), .map = Tilemap_unlocked_amy_de, }; diff --git a/data/tilemaps/unlocked_amy_en/header.c b/data/tilemaps/unlocked_amy_en/header.c index 3cec467233..1c4dd81424 100644 --- a/data/tilemaps/unlocked_amy_en/header.c +++ b/data/tilemaps/unlocked_amy_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_amy_en[] = INCBIN_U16("data/tilemaps/unlocked_amy_en/palette.gbapal"); +const ColorRaw Palette_unlocked_amy_en[] = INCPAL("data/tilemaps/unlocked_amy_en/palette.pal"); const u8 Tiles_unlocked_amy_en[] = INCBIN_U8("data/tilemaps/unlocked_amy_en/tiles.4bpp"); const u16 Tilemap_unlocked_amy_en[] = INCBIN_U16("data/tilemaps/unlocked_amy_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_amy_en = { .tilesSize = sizeof(Tiles_unlocked_amy_en), .palette = Palette_unlocked_amy_en, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_amy_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_amy_en), .map = Tilemap_unlocked_amy_en, }; diff --git a/data/tilemaps/unlocked_amy_es/header.c b/data/tilemaps/unlocked_amy_es/header.c index 6209c2748a..c86c13c6e0 100644 --- a/data/tilemaps/unlocked_amy_es/header.c +++ b/data/tilemaps/unlocked_amy_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_amy_es[] = INCBIN_U16("data/tilemaps/unlocked_amy_es/palette.gbapal"); +const ColorRaw Palette_unlocked_amy_es[] = INCPAL("data/tilemaps/unlocked_amy_es/palette.pal"); const u8 Tiles_unlocked_amy_es[] = INCBIN_U8("data/tilemaps/unlocked_amy_es/tiles.4bpp"); const u16 Tilemap_unlocked_amy_es[] = INCBIN_U16("data/tilemaps/unlocked_amy_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_amy_es = { .tilesSize = sizeof(Tiles_unlocked_amy_es), .palette = Palette_unlocked_amy_es, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_amy_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_amy_es), .map = Tilemap_unlocked_amy_es, }; diff --git a/data/tilemaps/unlocked_amy_fr/header.c b/data/tilemaps/unlocked_amy_fr/header.c index 4a985dd77c..79644604b7 100644 --- a/data/tilemaps/unlocked_amy_fr/header.c +++ b/data/tilemaps/unlocked_amy_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_amy_fr[] = INCBIN_U16("data/tilemaps/unlocked_amy_fr/palette.gbapal"); +const ColorRaw Palette_unlocked_amy_fr[] = INCPAL("data/tilemaps/unlocked_amy_fr/palette.pal"); const u8 Tiles_unlocked_amy_fr[] = INCBIN_U8("data/tilemaps/unlocked_amy_fr/tiles.4bpp"); const u16 Tilemap_unlocked_amy_fr[] = INCBIN_U16("data/tilemaps/unlocked_amy_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_amy_fr = { .tilesSize = sizeof(Tiles_unlocked_amy_fr), .palette = Palette_unlocked_amy_fr, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_amy_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_amy_fr), .map = Tilemap_unlocked_amy_fr, }; diff --git a/data/tilemaps/unlocked_amy_it/header.c b/data/tilemaps/unlocked_amy_it/header.c index 283afad74b..1a8a21fe60 100644 --- a/data/tilemaps/unlocked_amy_it/header.c +++ b/data/tilemaps/unlocked_amy_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_amy_it[] = INCBIN_U16("data/tilemaps/unlocked_amy_it/palette.gbapal"); +const ColorRaw Palette_unlocked_amy_it[] = INCPAL("data/tilemaps/unlocked_amy_it/palette.pal"); const u8 Tiles_unlocked_amy_it[] = INCBIN_U8("data/tilemaps/unlocked_amy_it/tiles.4bpp"); const u16 Tilemap_unlocked_amy_it[] = INCBIN_U16("data/tilemaps/unlocked_amy_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_amy_it = { .tilesSize = sizeof(Tiles_unlocked_amy_it), .palette = Palette_unlocked_amy_it, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_amy_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_amy_it), .map = Tilemap_unlocked_amy_it, }; diff --git a/data/tilemaps/unlocked_amy_jp/header.c b/data/tilemaps/unlocked_amy_jp/header.c index c6ced39493..ffaea51f5e 100644 --- a/data/tilemaps/unlocked_amy_jp/header.c +++ b/data/tilemaps/unlocked_amy_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_amy_jp[] = INCBIN_U16("data/tilemaps/unlocked_amy_jp/palette.gbapal"); +const ColorRaw Palette_unlocked_amy_jp[] = INCPAL("data/tilemaps/unlocked_amy_jp/palette.pal"); const u8 Tiles_unlocked_amy_jp[] = INCBIN_U8("data/tilemaps/unlocked_amy_jp/tiles.4bpp"); const u16 Tilemap_unlocked_amy_jp[] = INCBIN_U16("data/tilemaps/unlocked_amy_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_amy_jp = { .tilesSize = sizeof(Tiles_unlocked_amy_jp), .palette = Palette_unlocked_amy_jp, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_amy_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_amy_jp), .map = Tilemap_unlocked_amy_jp, }; diff --git a/data/tilemaps/unlocked_bosses_time_attack_de/header.c b/data/tilemaps/unlocked_bosses_time_attack_de/header.c index 338dfa24d8..fc521aa0c7 100644 --- a/data/tilemaps/unlocked_bosses_time_attack_de/header.c +++ b/data/tilemaps/unlocked_bosses_time_attack_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_bosses_time_attack_de[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_de/palette.gbapal"); +const ColorRaw Palette_unlocked_bosses_time_attack_de[] = INCPAL("data/tilemaps/unlocked_bosses_time_attack_de/palette.pal"); const u8 Tiles_unlocked_bosses_time_attack_de[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_de/tiles.4bpp"); const u16 Tilemap_unlocked_bosses_time_attack_de[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_bosses_time_attack_de = { .tilesSize = sizeof(Tiles_unlocked_bosses_time_attack_de), .palette = Palette_unlocked_bosses_time_attack_de, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_bosses_time_attack_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_bosses_time_attack_de), .map = Tilemap_unlocked_bosses_time_attack_de, }; diff --git a/data/tilemaps/unlocked_bosses_time_attack_en/header.c b/data/tilemaps/unlocked_bosses_time_attack_en/header.c index aa407ffb58..55eaad4817 100644 --- a/data/tilemaps/unlocked_bosses_time_attack_en/header.c +++ b/data/tilemaps/unlocked_bosses_time_attack_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_bosses_time_attack_en[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_en/palette.gbapal"); +const ColorRaw Palette_unlocked_bosses_time_attack_en[] = INCPAL("data/tilemaps/unlocked_bosses_time_attack_en/palette.pal"); const u8 Tiles_unlocked_bosses_time_attack_en[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_en/tiles.4bpp"); const u16 Tilemap_unlocked_bosses_time_attack_en[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_bosses_time_attack_en = { .tilesSize = sizeof(Tiles_unlocked_bosses_time_attack_en), .palette = Palette_unlocked_bosses_time_attack_en, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_bosses_time_attack_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_bosses_time_attack_en), .map = Tilemap_unlocked_bosses_time_attack_en, }; diff --git a/data/tilemaps/unlocked_bosses_time_attack_es/header.c b/data/tilemaps/unlocked_bosses_time_attack_es/header.c index 9a9d7947e5..f15317f8b5 100644 --- a/data/tilemaps/unlocked_bosses_time_attack_es/header.c +++ b/data/tilemaps/unlocked_bosses_time_attack_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_bosses_time_attack_es[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_es/palette.gbapal"); +const ColorRaw Palette_unlocked_bosses_time_attack_es[] = INCPAL("data/tilemaps/unlocked_bosses_time_attack_es/palette.pal"); const u8 Tiles_unlocked_bosses_time_attack_es[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_es/tiles.4bpp"); const u16 Tilemap_unlocked_bosses_time_attack_es[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_bosses_time_attack_es = { .tilesSize = sizeof(Tiles_unlocked_bosses_time_attack_es), .palette = Palette_unlocked_bosses_time_attack_es, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_bosses_time_attack_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_bosses_time_attack_es), .map = Tilemap_unlocked_bosses_time_attack_es, }; diff --git a/data/tilemaps/unlocked_bosses_time_attack_fr/header.c b/data/tilemaps/unlocked_bosses_time_attack_fr/header.c index d66797cf0f..8f2c31f060 100644 --- a/data/tilemaps/unlocked_bosses_time_attack_fr/header.c +++ b/data/tilemaps/unlocked_bosses_time_attack_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_bosses_time_attack_fr[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_fr/palette.gbapal"); +const ColorRaw Palette_unlocked_bosses_time_attack_fr[] = INCPAL("data/tilemaps/unlocked_bosses_time_attack_fr/palette.pal"); const u8 Tiles_unlocked_bosses_time_attack_fr[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_fr/tiles.4bpp"); const u16 Tilemap_unlocked_bosses_time_attack_fr[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_bosses_time_attack_fr = { .tilesSize = sizeof(Tiles_unlocked_bosses_time_attack_fr), .palette = Palette_unlocked_bosses_time_attack_fr, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_bosses_time_attack_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_bosses_time_attack_fr), .map = Tilemap_unlocked_bosses_time_attack_fr, }; diff --git a/data/tilemaps/unlocked_bosses_time_attack_it/header.c b/data/tilemaps/unlocked_bosses_time_attack_it/header.c index d6facf4887..064c169a47 100644 --- a/data/tilemaps/unlocked_bosses_time_attack_it/header.c +++ b/data/tilemaps/unlocked_bosses_time_attack_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_bosses_time_attack_it[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_it/palette.gbapal"); +const ColorRaw Palette_unlocked_bosses_time_attack_it[] = INCPAL("data/tilemaps/unlocked_bosses_time_attack_it/palette.pal"); const u8 Tiles_unlocked_bosses_time_attack_it[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_it/tiles.4bpp"); const u16 Tilemap_unlocked_bosses_time_attack_it[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_bosses_time_attack_it = { .tilesSize = sizeof(Tiles_unlocked_bosses_time_attack_it), .palette = Palette_unlocked_bosses_time_attack_it, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_bosses_time_attack_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_bosses_time_attack_it), .map = Tilemap_unlocked_bosses_time_attack_it, }; diff --git a/data/tilemaps/unlocked_bosses_time_attack_jp/header.c b/data/tilemaps/unlocked_bosses_time_attack_jp/header.c index b02c64be6f..618bb43ffc 100644 --- a/data/tilemaps/unlocked_bosses_time_attack_jp/header.c +++ b/data/tilemaps/unlocked_bosses_time_attack_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_bosses_time_attack_jp[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_jp/palette.gbapal"); +const ColorRaw Palette_unlocked_bosses_time_attack_jp[] = INCPAL("data/tilemaps/unlocked_bosses_time_attack_jp/palette.pal"); const u8 Tiles_unlocked_bosses_time_attack_jp[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_jp/tiles.4bpp"); const u16 Tilemap_unlocked_bosses_time_attack_jp[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_bosses_time_attack_jp = { .tilesSize = sizeof(Tiles_unlocked_bosses_time_attack_jp), .palette = Palette_unlocked_bosses_time_attack_jp, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_bosses_time_attack_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_bosses_time_attack_jp), .map = Tilemap_unlocked_bosses_time_attack_jp, }; diff --git a/data/tilemaps/unlocked_sound_test_de/header.c b/data/tilemaps/unlocked_sound_test_de/header.c index 7f60896adf..56f4215772 100644 --- a/data/tilemaps/unlocked_sound_test_de/header.c +++ b/data/tilemaps/unlocked_sound_test_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_sound_test_de[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_de/palette.gbapal"); +const ColorRaw Palette_unlocked_sound_test_de[] = INCPAL("data/tilemaps/unlocked_sound_test_de/palette.pal"); const u8 Tiles_unlocked_sound_test_de[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_de/tiles.4bpp"); const u16 Tilemap_unlocked_sound_test_de[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_sound_test_de = { .tilesSize = sizeof(Tiles_unlocked_sound_test_de), .palette = Palette_unlocked_sound_test_de, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_sound_test_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_sound_test_de), .map = Tilemap_unlocked_sound_test_de, }; diff --git a/data/tilemaps/unlocked_sound_test_en/header.c b/data/tilemaps/unlocked_sound_test_en/header.c index cd042763bd..8a65d89927 100644 --- a/data/tilemaps/unlocked_sound_test_en/header.c +++ b/data/tilemaps/unlocked_sound_test_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_sound_test_en[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_en/palette.gbapal"); +const ColorRaw Palette_unlocked_sound_test_en[] = INCPAL("data/tilemaps/unlocked_sound_test_en/palette.pal"); const u8 Tiles_unlocked_sound_test_en[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_en/tiles.4bpp"); const u16 Tilemap_unlocked_sound_test_en[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_sound_test_en = { .tilesSize = sizeof(Tiles_unlocked_sound_test_en), .palette = Palette_unlocked_sound_test_en, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_sound_test_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_sound_test_en), .map = Tilemap_unlocked_sound_test_en, }; diff --git a/data/tilemaps/unlocked_sound_test_es/header.c b/data/tilemaps/unlocked_sound_test_es/header.c index c0379d5b0f..f1130e1b2e 100644 --- a/data/tilemaps/unlocked_sound_test_es/header.c +++ b/data/tilemaps/unlocked_sound_test_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_sound_test_es[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_es/palette.gbapal"); +const ColorRaw Palette_unlocked_sound_test_es[] = INCPAL("data/tilemaps/unlocked_sound_test_es/palette.pal"); const u8 Tiles_unlocked_sound_test_es[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_es/tiles.4bpp"); const u16 Tilemap_unlocked_sound_test_es[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_sound_test_es = { .tilesSize = sizeof(Tiles_unlocked_sound_test_es), .palette = Palette_unlocked_sound_test_es, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_sound_test_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_sound_test_es), .map = Tilemap_unlocked_sound_test_es, }; diff --git a/data/tilemaps/unlocked_sound_test_fr/header.c b/data/tilemaps/unlocked_sound_test_fr/header.c index 7fdfad9435..651c77b662 100644 --- a/data/tilemaps/unlocked_sound_test_fr/header.c +++ b/data/tilemaps/unlocked_sound_test_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_sound_test_fr[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_fr/palette.gbapal"); +const ColorRaw Palette_unlocked_sound_test_fr[] = INCPAL("data/tilemaps/unlocked_sound_test_fr/palette.pal"); const u8 Tiles_unlocked_sound_test_fr[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_fr/tiles.4bpp"); const u16 Tilemap_unlocked_sound_test_fr[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_sound_test_fr = { .tilesSize = sizeof(Tiles_unlocked_sound_test_fr), .palette = Palette_unlocked_sound_test_fr, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_sound_test_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_sound_test_fr), .map = Tilemap_unlocked_sound_test_fr, }; diff --git a/data/tilemaps/unlocked_sound_test_it/header.c b/data/tilemaps/unlocked_sound_test_it/header.c index 62025328bd..ee5a987dc9 100644 --- a/data/tilemaps/unlocked_sound_test_it/header.c +++ b/data/tilemaps/unlocked_sound_test_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_sound_test_it[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_it/palette.gbapal"); +const ColorRaw Palette_unlocked_sound_test_it[] = INCPAL("data/tilemaps/unlocked_sound_test_it/palette.pal"); const u8 Tiles_unlocked_sound_test_it[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_it/tiles.4bpp"); const u16 Tilemap_unlocked_sound_test_it[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_sound_test_it = { .tilesSize = sizeof(Tiles_unlocked_sound_test_it), .palette = Palette_unlocked_sound_test_it, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_sound_test_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_sound_test_it), .map = Tilemap_unlocked_sound_test_it, }; diff --git a/data/tilemaps/unlocked_sound_test_jp/header.c b/data/tilemaps/unlocked_sound_test_jp/header.c index dd277416dd..e9339b8617 100644 --- a/data/tilemaps/unlocked_sound_test_jp/header.c +++ b/data/tilemaps/unlocked_sound_test_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_sound_test_jp[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_jp/palette.gbapal"); +const ColorRaw Palette_unlocked_sound_test_jp[] = INCPAL("data/tilemaps/unlocked_sound_test_jp/palette.pal"); const u8 Tiles_unlocked_sound_test_jp[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_jp/tiles.4bpp"); const u16 Tilemap_unlocked_sound_test_jp[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_sound_test_jp = { .tilesSize = sizeof(Tiles_unlocked_sound_test_jp), .palette = Palette_unlocked_sound_test_jp, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_sound_test_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_sound_test_jp), .map = Tilemap_unlocked_sound_test_jp, }; diff --git a/data/tilemaps/unlocked_tiny_chao_garden_de/header.c b/data/tilemaps/unlocked_tiny_chao_garden_de/header.c index 7714c78fc3..4f5495f13d 100644 --- a/data/tilemaps/unlocked_tiny_chao_garden_de/header.c +++ b/data/tilemaps/unlocked_tiny_chao_garden_de/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_tiny_chao_garden_de[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_de/palette.gbapal"); +const ColorRaw Palette_unlocked_tiny_chao_garden_de[] = INCPAL("data/tilemaps/unlocked_tiny_chao_garden_de/palette.pal"); const u8 Tiles_unlocked_tiny_chao_garden_de[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_de/tiles.4bpp"); const u16 Tilemap_unlocked_tiny_chao_garden_de[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_de/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_tiny_chao_garden_de = { .tilesSize = sizeof(Tiles_unlocked_tiny_chao_garden_de), .palette = Palette_unlocked_tiny_chao_garden_de, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_tiny_chao_garden_de) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_tiny_chao_garden_de), .map = Tilemap_unlocked_tiny_chao_garden_de, }; diff --git a/data/tilemaps/unlocked_tiny_chao_garden_en/header.c b/data/tilemaps/unlocked_tiny_chao_garden_en/header.c index 462682d9ce..a3592e0702 100644 --- a/data/tilemaps/unlocked_tiny_chao_garden_en/header.c +++ b/data/tilemaps/unlocked_tiny_chao_garden_en/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_tiny_chao_garden_en[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_en/palette.gbapal"); +const ColorRaw Palette_unlocked_tiny_chao_garden_en[] = INCPAL("data/tilemaps/unlocked_tiny_chao_garden_en/palette.pal"); const u8 Tiles_unlocked_tiny_chao_garden_en[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_en/tiles.4bpp"); const u16 Tilemap_unlocked_tiny_chao_garden_en[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_en/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_tiny_chao_garden_en = { .tilesSize = sizeof(Tiles_unlocked_tiny_chao_garden_en), .palette = Palette_unlocked_tiny_chao_garden_en, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_tiny_chao_garden_en) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_tiny_chao_garden_en), .map = Tilemap_unlocked_tiny_chao_garden_en, }; diff --git a/data/tilemaps/unlocked_tiny_chao_garden_es/header.c b/data/tilemaps/unlocked_tiny_chao_garden_es/header.c index bac15e10f4..818ad8fe62 100644 --- a/data/tilemaps/unlocked_tiny_chao_garden_es/header.c +++ b/data/tilemaps/unlocked_tiny_chao_garden_es/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_tiny_chao_garden_es[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_es/palette.gbapal"); +const ColorRaw Palette_unlocked_tiny_chao_garden_es[] = INCPAL("data/tilemaps/unlocked_tiny_chao_garden_es/palette.pal"); const u8 Tiles_unlocked_tiny_chao_garden_es[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_es/tiles.4bpp"); const u16 Tilemap_unlocked_tiny_chao_garden_es[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_es/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_tiny_chao_garden_es = { .tilesSize = sizeof(Tiles_unlocked_tiny_chao_garden_es), .palette = Palette_unlocked_tiny_chao_garden_es, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_tiny_chao_garden_es) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_tiny_chao_garden_es), .map = Tilemap_unlocked_tiny_chao_garden_es, }; diff --git a/data/tilemaps/unlocked_tiny_chao_garden_fr/header.c b/data/tilemaps/unlocked_tiny_chao_garden_fr/header.c index 67ba5beeea..edb061d6fb 100644 --- a/data/tilemaps/unlocked_tiny_chao_garden_fr/header.c +++ b/data/tilemaps/unlocked_tiny_chao_garden_fr/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_tiny_chao_garden_fr[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_fr/palette.gbapal"); +const ColorRaw Palette_unlocked_tiny_chao_garden_fr[] = INCPAL("data/tilemaps/unlocked_tiny_chao_garden_fr/palette.pal"); const u8 Tiles_unlocked_tiny_chao_garden_fr[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_fr/tiles.4bpp"); const u16 Tilemap_unlocked_tiny_chao_garden_fr[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_fr/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_tiny_chao_garden_fr = { .tilesSize = sizeof(Tiles_unlocked_tiny_chao_garden_fr), .palette = Palette_unlocked_tiny_chao_garden_fr, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_tiny_chao_garden_fr) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_tiny_chao_garden_fr), .map = Tilemap_unlocked_tiny_chao_garden_fr, }; diff --git a/data/tilemaps/unlocked_tiny_chao_garden_it/header.c b/data/tilemaps/unlocked_tiny_chao_garden_it/header.c index edffa16ee9..26ba566478 100644 --- a/data/tilemaps/unlocked_tiny_chao_garden_it/header.c +++ b/data/tilemaps/unlocked_tiny_chao_garden_it/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_tiny_chao_garden_it[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_it/palette.gbapal"); +const ColorRaw Palette_unlocked_tiny_chao_garden_it[] = INCPAL("data/tilemaps/unlocked_tiny_chao_garden_it/palette.pal"); const u8 Tiles_unlocked_tiny_chao_garden_it[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_it/tiles.4bpp"); const u16 Tilemap_unlocked_tiny_chao_garden_it[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_it/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_tiny_chao_garden_it = { .tilesSize = sizeof(Tiles_unlocked_tiny_chao_garden_it), .palette = Palette_unlocked_tiny_chao_garden_it, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_tiny_chao_garden_it) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_tiny_chao_garden_it), .map = Tilemap_unlocked_tiny_chao_garden_it, }; diff --git a/data/tilemaps/unlocked_tiny_chao_garden_jp/header.c b/data/tilemaps/unlocked_tiny_chao_garden_jp/header.c index 617854dca2..21d31e33a1 100644 --- a/data/tilemaps/unlocked_tiny_chao_garden_jp/header.c +++ b/data/tilemaps/unlocked_tiny_chao_garden_jp/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unlocked_tiny_chao_garden_jp[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_jp/palette.gbapal"); +const ColorRaw Palette_unlocked_tiny_chao_garden_jp[] = INCPAL("data/tilemaps/unlocked_tiny_chao_garden_jp/palette.pal"); const u8 Tiles_unlocked_tiny_chao_garden_jp[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_jp/tiles.4bpp"); const u16 Tilemap_unlocked_tiny_chao_garden_jp[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_jp/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unlocked_tiny_chao_garden_jp = { .tilesSize = sizeof(Tiles_unlocked_tiny_chao_garden_jp), .palette = Palette_unlocked_tiny_chao_garden_jp, .palOffset = 0, - .palLength = sizeof(Palette_unlocked_tiny_chao_garden_jp) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unlocked_tiny_chao_garden_jp), .map = Tilemap_unlocked_tiny_chao_garden_jp, }; diff --git a/data/tilemaps/unused_credits_frame_manual_production_copy/header.c b/data/tilemaps/unused_credits_frame_manual_production_copy/header.c index 4313cefdaa..17363cb486 100644 --- a/data/tilemaps/unused_credits_frame_manual_production_copy/header.c +++ b/data/tilemaps/unused_credits_frame_manual_production_copy/header.c @@ -1,8 +1,8 @@ #include "global.h" #include "core.h" -const u16 Palette_unused_credits_frame_manual_production_copy[] - = INCBIN_U16("data/tilemaps/unused_credits_frame_manual_production_copy/palette.gbapal"); +const ColorRaw Palette_unused_credits_frame_manual_production_copy[] + = INCPAL("data/tilemaps/unused_credits_frame_manual_production_copy/palette.pal"); const u8 Tiles_unused_credits_frame_manual_production_copy[] = INCBIN_U8("data/tilemaps/unused_credits_frame_manual_production_copy/tiles.4bpp"); const u16 Tilemap_unused_credits_frame_manual_production_copy[] @@ -18,6 +18,6 @@ const Tilemap unused_credits_frame_manual_production_copy = { .tilesSize = sizeof(Tiles_unused_credits_frame_manual_production_copy), .palette = Palette_unused_credits_frame_manual_production_copy, .palOffset = 0, - .palLength = sizeof(Palette_unused_credits_frame_manual_production_copy) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unused_credits_frame_manual_production_copy), .map = Tilemap_unused_credits_frame_manual_production_copy, }; diff --git a/data/tilemaps/unused_credits_frame_sonic_leaves/header.c b/data/tilemaps/unused_credits_frame_sonic_leaves/header.c index dc5fedd2c9..14ce3f66e9 100644 --- a/data/tilemaps/unused_credits_frame_sonic_leaves/header.c +++ b/data/tilemaps/unused_credits_frame_sonic_leaves/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unused_credits_frame_sonic_leaves[] = INCBIN_U16("data/tilemaps/unused_credits_frame_sonic_leaves/palette.gbapal"); +const ColorRaw Palette_unused_credits_frame_sonic_leaves[] = INCPAL("data/tilemaps/unused_credits_frame_sonic_leaves/palette.pal"); const u8 Tiles_unused_credits_frame_sonic_leaves[] = INCBIN_U8("data/tilemaps/unused_credits_frame_sonic_leaves/tiles.4bpp"); const u16 Tilemap_unused_credits_frame_sonic_leaves[] = INCBIN_U16("data/tilemaps/unused_credits_frame_sonic_leaves/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unused_credits_frame_sonic_leaves = { .tilesSize = sizeof(Tiles_unused_credits_frame_sonic_leaves), .palette = Palette_unused_credits_frame_sonic_leaves, .palOffset = 0, - .palLength = sizeof(Palette_unused_credits_frame_sonic_leaves) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unused_credits_frame_sonic_leaves), .map = Tilemap_unused_credits_frame_sonic_leaves, }; diff --git a/data/tilemaps/unused_options_window/header.c b/data/tilemaps/unused_options_window/header.c index 20f7106e4a..37f500b7b3 100644 --- a/data/tilemaps/unused_options_window/header.c +++ b/data/tilemaps/unused_options_window/header.c @@ -1,7 +1,7 @@ #include "global.h" #include "core.h" -const u16 Palette_unused_options_window[] = INCBIN_U16("data/tilemaps/unused_options_window/palette.gbapal"); +const ColorRaw Palette_unused_options_window[] = INCPAL("data/tilemaps/unused_options_window/palette.pal"); const u8 Tiles_unused_options_window[] = INCBIN_U8("data/tilemaps/unused_options_window/tiles.4bpp"); const u16 Tilemap_unused_options_window[] = INCBIN_U16("data/tilemaps/unused_options_window/tilemap.tilemap2"); @@ -15,6 +15,6 @@ const Tilemap unused_options_window = { .tilesSize = sizeof(Tiles_unused_options_window), .palette = Palette_unused_options_window, .palOffset = 0, - .palLength = sizeof(Palette_unused_options_window) / sizeof(u16), + .palLength = ARRAY_COUNT(Palette_unused_options_window), .map = Tilemap_unused_options_window, }; diff --git a/graphics/80D7AD0.pal b/graphics/boss_1_hit.pal similarity index 100% rename from graphics/80D7AD0.pal rename to graphics/boss_1_hit.pal diff --git a/graphics/80D7AF0.pal b/graphics/boss_1_normal.pal similarity index 100% rename from graphics/80D7AF0.pal rename to graphics/boss_1_normal.pal diff --git a/graphics/80D7B70.pal b/graphics/boss_2_hit.pal similarity index 100% rename from graphics/80D7B70.pal rename to graphics/boss_2_hit.pal diff --git a/graphics/80D7B90.pal b/graphics/boss_2_normal.pal similarity index 100% rename from graphics/80D7B90.pal rename to graphics/boss_2_normal.pal diff --git a/graphics/boss_3_a.pal b/graphics/boss_3_hit.pal similarity index 100% rename from graphics/boss_3_a.pal rename to graphics/boss_3_hit.pal diff --git a/graphics/boss_3_b.pal b/graphics/boss_3_normal.pal similarity index 100% rename from graphics/boss_3_b.pal rename to graphics/boss_3_normal.pal diff --git a/graphics/boss_4_a.pal b/graphics/boss_4_hit.pal similarity index 100% rename from graphics/boss_4_a.pal rename to graphics/boss_4_hit.pal diff --git a/graphics/boss_4_b.pal b/graphics/boss_4_normal.pal similarity index 100% rename from graphics/boss_4_b.pal rename to graphics/boss_4_normal.pal diff --git a/graphics/80D7FF0.pal b/graphics/boss_5_hit.pal similarity index 100% rename from graphics/80D7FF0.pal rename to graphics/boss_5_hit.pal diff --git a/graphics/80D8010.pal b/graphics/boss_5_normal.pal similarity index 100% rename from graphics/80D8010.pal rename to graphics/boss_5_normal.pal diff --git a/graphics/80D80C6.pal b/graphics/boss_6_hit.pal similarity index 100% rename from graphics/80D80C6.pal rename to graphics/boss_6_hit.pal diff --git a/graphics/80D80E6.pal b/graphics/boss_6_normal.pal similarity index 100% rename from graphics/80D80E6.pal rename to graphics/boss_6_normal.pal diff --git a/graphics/80D87B6.pal b/graphics/boss_7_hit.pal similarity index 100% rename from graphics/80D87B6.pal rename to graphics/boss_7_hit.pal diff --git a/graphics/80D8796.pal b/graphics/boss_7_normal.pal similarity index 100% rename from graphics/80D8796.pal rename to graphics/boss_7_normal.pal diff --git a/graphics/boss_8_b.pal b/graphics/boss_8_hit.pal similarity index 100% rename from graphics/boss_8_b.pal rename to graphics/boss_8_hit.pal diff --git a/graphics/boss_8_a.pal b/graphics/boss_8_normal.pal similarity index 100% rename from graphics/boss_8_a.pal rename to graphics/boss_8_normal.pal diff --git a/graphics/boss_9_b.pal b/graphics/boss_9_b.pal deleted file mode 100644 index 66883e6b77..0000000000 --- a/graphics/boss_9_b.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 98 115 -255 255 255 -255 180 57 -123 57 255 -90 16 180 -32 16 16 -205 238 255 -164 189 205 -98 115 156 -49 74 98 -65 0 123 -255 115 32 -222 65 0 -189 32 0 -131 32 0 -82 32 0 diff --git a/graphics/boss_9_a.pal b/graphics/boss_9_hit.pal similarity index 100% rename from graphics/boss_9_a.pal rename to graphics/boss_9_hit.pal diff --git a/graphics/080D5CC2.pal b/graphics/boss_9_normal.pal similarity index 100% rename from graphics/080D5CC2.pal rename to graphics/boss_9_normal.pal diff --git a/graphics/obj_palettes.inc b/graphics/obj_palettes.inc deleted file mode 100644 index 4973a09284..0000000000 --- a/graphics/obj_palettes.inc +++ /dev/null @@ -1,758 +0,0 @@ - mSectionRodata - -.incbin "graphics/obj_palettes/pal_000.gbapal" -.incbin "graphics/obj_palettes/pal_001.gbapal" -.incbin "graphics/obj_palettes/pal_002.gbapal" -.incbin "graphics/obj_palettes/pal_003.gbapal" -.incbin "graphics/obj_palettes/pal_004.gbapal" -.incbin "graphics/obj_palettes/pal_005.gbapal" -.incbin "graphics/obj_palettes/pal_006.gbapal" -.incbin "graphics/obj_palettes/pal_007.gbapal" -.incbin "graphics/obj_palettes/pal_008.gbapal" -.incbin "graphics/obj_palettes/pal_009.gbapal" -.incbin "graphics/obj_palettes/pal_010.gbapal" -.incbin "graphics/obj_palettes/pal_011.gbapal" -.incbin "graphics/obj_palettes/pal_012.gbapal" -.incbin "graphics/obj_palettes/pal_013.gbapal" -.incbin "graphics/obj_palettes/pal_014.gbapal" -.incbin "graphics/obj_palettes/pal_015.gbapal" -.incbin "graphics/obj_palettes/pal_016.gbapal" -.incbin "graphics/obj_palettes/pal_017.gbapal" -.incbin "graphics/obj_palettes/pal_018.gbapal" -.incbin "graphics/obj_palettes/pal_019.gbapal" -.incbin "graphics/obj_palettes/pal_020.gbapal" -.incbin "graphics/obj_palettes/pal_021.gbapal" -.incbin "graphics/obj_palettes/pal_022.gbapal" -.incbin "graphics/obj_palettes/pal_023.gbapal" -.incbin "graphics/obj_palettes/pal_024.gbapal" -.incbin "graphics/obj_palettes/pal_025.gbapal" -.incbin "graphics/obj_palettes/pal_026.gbapal" -.incbin "graphics/obj_palettes/pal_027.gbapal" -.incbin "graphics/obj_palettes/pal_028.gbapal" -.incbin "graphics/obj_palettes/pal_029.gbapal" -.incbin "graphics/obj_palettes/pal_030.gbapal" -.incbin "graphics/obj_palettes/pal_031.gbapal" -.incbin "graphics/obj_palettes/pal_032.gbapal" -.incbin "graphics/obj_palettes/pal_033.gbapal" -.incbin "graphics/obj_palettes/pal_034.gbapal" -.incbin "graphics/obj_palettes/pal_035.gbapal" -.incbin "graphics/obj_palettes/pal_036.gbapal" -.incbin "graphics/obj_palettes/pal_037.gbapal" -.incbin "graphics/obj_palettes/pal_038.gbapal" -.incbin "graphics/obj_palettes/pal_039.gbapal" -.incbin "graphics/obj_palettes/pal_040.gbapal" -.incbin "graphics/obj_palettes/pal_041.gbapal" -.incbin "graphics/obj_palettes/pal_042.gbapal" -.incbin "graphics/obj_palettes/pal_043.gbapal" -.incbin "graphics/obj_palettes/pal_044.gbapal" -.incbin "graphics/obj_palettes/pal_045.gbapal" -.incbin "graphics/obj_palettes/pal_046.gbapal" -.incbin "graphics/obj_palettes/pal_047.gbapal" -.incbin "graphics/obj_palettes/pal_048.gbapal" -.incbin "graphics/obj_palettes/pal_049.gbapal" -.incbin "graphics/obj_palettes/pal_050.gbapal" -.incbin "graphics/obj_palettes/pal_051.gbapal" -.incbin "graphics/obj_palettes/pal_052.gbapal" -.incbin "graphics/obj_palettes/pal_053.gbapal" -.incbin "graphics/obj_palettes/pal_054.gbapal" -.incbin "graphics/obj_palettes/pal_055.gbapal" -.incbin "graphics/obj_palettes/pal_056.gbapal" -.incbin "graphics/obj_palettes/pal_057.gbapal" -.incbin "graphics/obj_palettes/pal_058.gbapal" -.incbin "graphics/obj_palettes/pal_059.gbapal" -.incbin "graphics/obj_palettes/pal_060.gbapal" -.incbin "graphics/obj_palettes/pal_061.gbapal" -.incbin "graphics/obj_palettes/pal_062.gbapal" -.incbin "graphics/obj_palettes/pal_063.gbapal" -.incbin "graphics/obj_palettes/pal_064.gbapal" -.incbin "graphics/obj_palettes/pal_065.gbapal" -.incbin "graphics/obj_palettes/pal_066.gbapal" -.incbin "graphics/obj_palettes/pal_067.gbapal" -.incbin "graphics/obj_palettes/pal_068.gbapal" -.incbin "graphics/obj_palettes/pal_069.gbapal" -.incbin "graphics/obj_palettes/pal_070.gbapal" -.incbin "graphics/obj_palettes/pal_071.gbapal" -.incbin "graphics/obj_palettes/pal_072.gbapal" -.incbin "graphics/obj_palettes/pal_073.gbapal" -.incbin "graphics/obj_palettes/pal_074.gbapal" -.incbin "graphics/obj_palettes/pal_075.gbapal" -.incbin "graphics/obj_palettes/pal_076.gbapal" -.incbin "graphics/obj_palettes/pal_077.gbapal" -.incbin "graphics/obj_palettes/pal_078.gbapal" -.incbin "graphics/obj_palettes/pal_079.gbapal" -.incbin "graphics/obj_palettes/pal_080.gbapal" -.incbin "graphics/obj_palettes/pal_081.gbapal" -.incbin "graphics/obj_palettes/pal_082.gbapal" -.incbin "graphics/obj_palettes/pal_083.gbapal" -.incbin "graphics/obj_palettes/pal_084.gbapal" -.incbin "graphics/obj_palettes/pal_085.gbapal" -.incbin "graphics/obj_palettes/pal_086.gbapal" -.incbin "graphics/obj_palettes/pal_087.gbapal" -.incbin "graphics/obj_palettes/pal_088.gbapal" -.incbin "graphics/obj_palettes/pal_089.gbapal" -.incbin "graphics/obj_palettes/pal_090.gbapal" -.incbin "graphics/obj_palettes/pal_091.gbapal" -.incbin "graphics/obj_palettes/pal_092.gbapal" -.incbin "graphics/obj_palettes/pal_093.gbapal" -.incbin "graphics/obj_palettes/pal_094.gbapal" -.incbin "graphics/obj_palettes/pal_095.gbapal" -.incbin "graphics/obj_palettes/pal_096.gbapal" -.incbin "graphics/obj_palettes/pal_097.gbapal" -.incbin "graphics/obj_palettes/pal_098.gbapal" -.incbin "graphics/obj_palettes/pal_099.gbapal" -.incbin "graphics/obj_palettes/pal_100.gbapal" -.incbin "graphics/obj_palettes/pal_101.gbapal" -.incbin "graphics/obj_palettes/pal_102.gbapal" -.incbin "graphics/obj_palettes/pal_103.gbapal" -.incbin "graphics/obj_palettes/pal_104.gbapal" -.incbin "graphics/obj_palettes/pal_105.gbapal" -.incbin "graphics/obj_palettes/pal_106.gbapal" -.incbin "graphics/obj_palettes/pal_107.gbapal" -.incbin "graphics/obj_palettes/pal_108.gbapal" -.incbin "graphics/obj_palettes/pal_109.gbapal" -.incbin "graphics/obj_palettes/pal_110.gbapal" -.incbin "graphics/obj_palettes/pal_111.gbapal" -.incbin "graphics/obj_palettes/pal_112.gbapal" -.incbin "graphics/obj_palettes/pal_113.gbapal" -.incbin "graphics/obj_palettes/pal_114.gbapal" -.incbin "graphics/obj_palettes/pal_115.gbapal" -.incbin "graphics/obj_palettes/pal_116.gbapal" -.incbin "graphics/obj_palettes/pal_117.gbapal" -.incbin "graphics/obj_palettes/pal_118.gbapal" -.incbin "graphics/obj_palettes/pal_119.gbapal" -.incbin "graphics/obj_palettes/pal_120.gbapal" -.incbin "graphics/obj_palettes/pal_121.gbapal" -.incbin "graphics/obj_palettes/pal_122.gbapal" -.incbin "graphics/obj_palettes/pal_123.gbapal" -.incbin "graphics/obj_palettes/pal_124.gbapal" -.incbin "graphics/obj_palettes/pal_125.gbapal" -.incbin "graphics/obj_palettes/pal_126.gbapal" -.incbin "graphics/obj_palettes/pal_127.gbapal" -.incbin "graphics/obj_palettes/pal_128.gbapal" -.incbin "graphics/obj_palettes/pal_129.gbapal" -.incbin "graphics/obj_palettes/pal_130.gbapal" -.incbin "graphics/obj_palettes/pal_131.gbapal" -.incbin "graphics/obj_palettes/pal_132.gbapal" -.incbin "graphics/obj_palettes/pal_133.gbapal" -.incbin "graphics/obj_palettes/pal_134.gbapal" -.incbin "graphics/obj_palettes/pal_135.gbapal" -.incbin "graphics/obj_palettes/pal_136.gbapal" -.incbin "graphics/obj_palettes/pal_137.gbapal" -.incbin "graphics/obj_palettes/pal_138.gbapal" -.incbin "graphics/obj_palettes/pal_139.gbapal" -.incbin "graphics/obj_palettes/pal_140.gbapal" -.incbin "graphics/obj_palettes/pal_141.gbapal" -.incbin "graphics/obj_palettes/pal_142.gbapal" -.incbin "graphics/obj_palettes/pal_143.gbapal" -.incbin "graphics/obj_palettes/pal_144.gbapal" -.incbin "graphics/obj_palettes/pal_145.gbapal" -.incbin "graphics/obj_palettes/pal_146.gbapal" -.incbin "graphics/obj_palettes/pal_147.gbapal" -.incbin "graphics/obj_palettes/pal_148.gbapal" -.incbin "graphics/obj_palettes/pal_149.gbapal" -.incbin "graphics/obj_palettes/pal_150.gbapal" -.incbin "graphics/obj_palettes/pal_151.gbapal" -.incbin "graphics/obj_palettes/pal_152.gbapal" -.incbin "graphics/obj_palettes/pal_153.gbapal" -.incbin "graphics/obj_palettes/pal_154.gbapal" -.incbin "graphics/obj_palettes/pal_155.gbapal" -.incbin "graphics/obj_palettes/pal_156.gbapal" -.incbin "graphics/obj_palettes/pal_157.gbapal" -.incbin "graphics/obj_palettes/pal_158.gbapal" -.incbin "graphics/obj_palettes/pal_159.gbapal" -.incbin "graphics/obj_palettes/pal_160.gbapal" -.incbin "graphics/obj_palettes/pal_161.gbapal" -.incbin "graphics/obj_palettes/pal_162.gbapal" -.incbin "graphics/obj_palettes/pal_163.gbapal" -.incbin "graphics/obj_palettes/pal_164.gbapal" -.incbin "graphics/obj_palettes/pal_165.gbapal" -.incbin "graphics/obj_palettes/pal_166.gbapal" -.incbin "graphics/obj_palettes/pal_167.gbapal" -.incbin "graphics/obj_palettes/pal_168.gbapal" -.incbin "graphics/obj_palettes/pal_169.gbapal" -.incbin "graphics/obj_palettes/pal_170.gbapal" -.incbin "graphics/obj_palettes/pal_171.gbapal" -.incbin "graphics/obj_palettes/pal_172.gbapal" -.incbin "graphics/obj_palettes/pal_173.gbapal" -.incbin "graphics/obj_palettes/pal_174.gbapal" -.incbin "graphics/obj_palettes/pal_175.gbapal" -.incbin "graphics/obj_palettes/pal_176.gbapal" -.incbin "graphics/obj_palettes/pal_177.gbapal" -.incbin "graphics/obj_palettes/pal_178.gbapal" -.incbin "graphics/obj_palettes/pal_179.gbapal" -.incbin "graphics/obj_palettes/pal_180.gbapal" -.incbin "graphics/obj_palettes/pal_181.gbapal" -.incbin "graphics/obj_palettes/pal_182.gbapal" -.incbin "graphics/obj_palettes/pal_183.gbapal" -.incbin "graphics/obj_palettes/pal_184.gbapal" -.incbin "graphics/obj_palettes/pal_185.gbapal" -.incbin "graphics/obj_palettes/pal_186.gbapal" -.incbin "graphics/obj_palettes/pal_187.gbapal" -.incbin "graphics/obj_palettes/pal_188.gbapal" -.incbin "graphics/obj_palettes/pal_189.gbapal" -.incbin "graphics/obj_palettes/pal_190.gbapal" -.incbin "graphics/obj_palettes/pal_191.gbapal" -.incbin "graphics/obj_palettes/pal_192.gbapal" -.incbin "graphics/obj_palettes/pal_193.gbapal" -.incbin "graphics/obj_palettes/pal_194.gbapal" -.incbin "graphics/obj_palettes/pal_195.gbapal" -.incbin "graphics/obj_palettes/pal_196.gbapal" -.incbin "graphics/obj_palettes/pal_197.gbapal" -.incbin "graphics/obj_palettes/pal_198.gbapal" -.incbin "graphics/obj_palettes/pal_199.gbapal" -.incbin "graphics/obj_palettes/pal_200.gbapal" -.incbin "graphics/obj_palettes/pal_201.gbapal" -.incbin "graphics/obj_palettes/pal_202.gbapal" -.incbin "graphics/obj_palettes/pal_203.gbapal" -.incbin "graphics/obj_palettes/pal_204.gbapal" -.incbin "graphics/obj_palettes/pal_205.gbapal" -.incbin "graphics/obj_palettes/pal_206.gbapal" -.incbin "graphics/obj_palettes/pal_207.gbapal" -.incbin "graphics/obj_palettes/pal_208.gbapal" -.incbin "graphics/obj_palettes/pal_209.gbapal" -.incbin "graphics/obj_palettes/pal_210.gbapal" -.incbin "graphics/obj_palettes/pal_211.gbapal" -.incbin "graphics/obj_palettes/pal_212.gbapal" -.incbin "graphics/obj_palettes/pal_213.gbapal" -.incbin "graphics/obj_palettes/pal_214.gbapal" -.incbin "graphics/obj_palettes/pal_215.gbapal" -.incbin "graphics/obj_palettes/pal_216.gbapal" -.incbin "graphics/obj_palettes/pal_217.gbapal" -.incbin "graphics/obj_palettes/pal_218.gbapal" -.incbin "graphics/obj_palettes/pal_219.gbapal" -.incbin "graphics/obj_palettes/pal_220.gbapal" -.incbin "graphics/obj_palettes/pal_221.gbapal" -.incbin "graphics/obj_palettes/pal_222.gbapal" -.incbin "graphics/obj_palettes/pal_223.gbapal" -.incbin "graphics/obj_palettes/pal_224.gbapal" -.incbin "graphics/obj_palettes/pal_225.gbapal" -.incbin "graphics/obj_palettes/pal_226.gbapal" -.incbin "graphics/obj_palettes/pal_227.gbapal" -.incbin "graphics/obj_palettes/pal_228.gbapal" -.incbin "graphics/obj_palettes/pal_229.gbapal" -.incbin "graphics/obj_palettes/pal_230.gbapal" -.incbin "graphics/obj_palettes/pal_231.gbapal" -.incbin "graphics/obj_palettes/pal_232.gbapal" -.incbin "graphics/obj_palettes/pal_233.gbapal" -.incbin "graphics/obj_palettes/pal_234.gbapal" -.incbin "graphics/obj_palettes/pal_235.gbapal" -.incbin "graphics/obj_palettes/pal_236.gbapal" -.incbin "graphics/obj_palettes/pal_237.gbapal" -.incbin "graphics/obj_palettes/pal_238.gbapal" -.incbin "graphics/obj_palettes/pal_239.gbapal" -.incbin "graphics/obj_palettes/pal_240.gbapal" -.incbin "graphics/obj_palettes/pal_241.gbapal" -.incbin "graphics/obj_palettes/pal_242.gbapal" -.incbin "graphics/obj_palettes/pal_243.gbapal" -.incbin "graphics/obj_palettes/pal_244.gbapal" -.incbin "graphics/obj_palettes/pal_245.gbapal" -.incbin "graphics/obj_palettes/pal_246.gbapal" -.incbin "graphics/obj_palettes/pal_247.gbapal" -.incbin "graphics/obj_palettes/pal_248.gbapal" -.incbin "graphics/obj_palettes/pal_249.gbapal" -.incbin "graphics/obj_palettes/pal_250.gbapal" -.incbin "graphics/obj_palettes/pal_251.gbapal" -.incbin "graphics/obj_palettes/pal_252.gbapal" -.incbin "graphics/obj_palettes/pal_253.gbapal" -.incbin "graphics/obj_palettes/pal_254.gbapal" -.incbin "graphics/obj_palettes/pal_255.gbapal" -.incbin "graphics/obj_palettes/pal_256.gbapal" -.incbin "graphics/obj_palettes/pal_257.gbapal" -.incbin "graphics/obj_palettes/pal_258.gbapal" -.incbin "graphics/obj_palettes/pal_259.gbapal" -.incbin "graphics/obj_palettes/pal_260.gbapal" -.incbin "graphics/obj_palettes/pal_261.gbapal" -.incbin "graphics/obj_palettes/pal_262.gbapal" -.incbin "graphics/obj_palettes/pal_263.gbapal" -.incbin "graphics/obj_palettes/pal_264.gbapal" -.incbin "graphics/obj_palettes/pal_265.gbapal" -.incbin "graphics/obj_palettes/pal_266.gbapal" -.incbin "graphics/obj_palettes/pal_267.gbapal" -.incbin "graphics/obj_palettes/pal_268.gbapal" -.incbin "graphics/obj_palettes/pal_269.gbapal" -.incbin "graphics/obj_palettes/pal_270.gbapal" -.incbin "graphics/obj_palettes/pal_271.gbapal" -.incbin "graphics/obj_palettes/pal_272.gbapal" -.incbin "graphics/obj_palettes/pal_273.gbapal" -.incbin "graphics/obj_palettes/pal_274.gbapal" -.incbin "graphics/obj_palettes/pal_275.gbapal" -.incbin "graphics/obj_palettes/pal_276.gbapal" -.incbin "graphics/obj_palettes/pal_277.gbapal" -.incbin "graphics/obj_palettes/pal_278.gbapal" -.incbin "graphics/obj_palettes/pal_279.gbapal" -.incbin "graphics/obj_palettes/pal_280.gbapal" -.incbin "graphics/obj_palettes/pal_281.gbapal" -.incbin "graphics/obj_palettes/pal_282.gbapal" -.incbin "graphics/obj_palettes/pal_283.gbapal" -.incbin "graphics/obj_palettes/pal_284.gbapal" -.incbin "graphics/obj_palettes/pal_285.gbapal" -#ifdef VIRTUAL_CONSOLE -.incbin "graphics/obj_palettes/pal_286_vc.gbapal" -.incbin "graphics/obj_palettes/pal_287_vc.gbapal" -.incbin "graphics/obj_palettes/pal_288_vc.gbapal" -.incbin "graphics/obj_palettes/pal_289_vc.gbapal" -.incbin "graphics/obj_palettes/pal_290_vc.gbapal" -.incbin "graphics/obj_palettes/pal_291_vc.gbapal" -.incbin "graphics/obj_palettes/pal_292_vc.gbapal" -.incbin "graphics/obj_palettes/pal_293_vc.gbapal" -.incbin "graphics/obj_palettes/pal_294_vc.gbapal" -#else -.incbin "graphics/obj_palettes/pal_286.gbapal" -.incbin "graphics/obj_palettes/pal_287.gbapal" -.incbin "graphics/obj_palettes/pal_288.gbapal" -.incbin "graphics/obj_palettes/pal_289.gbapal" -.incbin "graphics/obj_palettes/pal_290.gbapal" -.incbin "graphics/obj_palettes/pal_291.gbapal" -.incbin "graphics/obj_palettes/pal_292.gbapal" -.incbin "graphics/obj_palettes/pal_293.gbapal" -.incbin "graphics/obj_palettes/pal_294.gbapal" -#endif -.incbin "graphics/obj_palettes/pal_295.gbapal" -.incbin "graphics/obj_palettes/pal_296.gbapal" -.incbin "graphics/obj_palettes/pal_297.gbapal" -.incbin "graphics/obj_palettes/pal_298.gbapal" -.incbin "graphics/obj_palettes/pal_299.gbapal" -.incbin "graphics/obj_palettes/pal_300.gbapal" -.incbin "graphics/obj_palettes/pal_301.gbapal" -.incbin "graphics/obj_palettes/pal_302.gbapal" -.incbin "graphics/obj_palettes/pal_303.gbapal" -.incbin "graphics/obj_palettes/pal_304.gbapal" -.incbin "graphics/obj_palettes/pal_305.gbapal" -.incbin "graphics/obj_palettes/pal_306.gbapal" -.incbin "graphics/obj_palettes/pal_307.gbapal" -.incbin "graphics/obj_palettes/pal_308.gbapal" -.incbin "graphics/obj_palettes/pal_309.gbapal" -.incbin "graphics/obj_palettes/pal_310.gbapal" -.incbin "graphics/obj_palettes/pal_311.gbapal" -.incbin "graphics/obj_palettes/pal_312.gbapal" -.incbin "graphics/obj_palettes/pal_313.gbapal" -.incbin "graphics/obj_palettes/pal_314.gbapal" -.incbin "graphics/obj_palettes/pal_315.gbapal" -.incbin "graphics/obj_palettes/pal_316.gbapal" -.incbin "graphics/obj_palettes/pal_317.gbapal" -.incbin "graphics/obj_palettes/pal_318.gbapal" -.incbin "graphics/obj_palettes/pal_319.gbapal" -.incbin "graphics/obj_palettes/pal_320.gbapal" -.incbin "graphics/obj_palettes/pal_321.gbapal" -.incbin "graphics/obj_palettes/pal_322.gbapal" -.incbin "graphics/obj_palettes/pal_323.gbapal" -.incbin "graphics/obj_palettes/pal_324.gbapal" -.incbin "graphics/obj_palettes/pal_325.gbapal" -.incbin "graphics/obj_palettes/pal_326.gbapal" -.incbin "graphics/obj_palettes/pal_327.gbapal" -.incbin "graphics/obj_palettes/pal_328.gbapal" -.incbin "graphics/obj_palettes/pal_329.gbapal" -.incbin "graphics/obj_palettes/pal_330.gbapal" -.incbin "graphics/obj_palettes/pal_331.gbapal" -.incbin "graphics/obj_palettes/pal_332.gbapal" -.incbin "graphics/obj_palettes/pal_333.gbapal" -.incbin "graphics/obj_palettes/pal_334.gbapal" -.incbin "graphics/obj_palettes/pal_335.gbapal" -.incbin "graphics/obj_palettes/pal_336.gbapal" -.incbin "graphics/obj_palettes/pal_337.gbapal" -.incbin "graphics/obj_palettes/pal_338.gbapal" -.incbin "graphics/obj_palettes/pal_339.gbapal" -.incbin "graphics/obj_palettes/pal_340.gbapal" -.incbin "graphics/obj_palettes/pal_341.gbapal" -.incbin "graphics/obj_palettes/pal_342.gbapal" -.incbin "graphics/obj_palettes/pal_343.gbapal" -.incbin "graphics/obj_palettes/pal_344.gbapal" -.incbin "graphics/obj_palettes/pal_345.gbapal" -.incbin "graphics/obj_palettes/pal_346.gbapal" -.incbin "graphics/obj_palettes/pal_347.gbapal" -.incbin "graphics/obj_palettes/pal_348.gbapal" -.incbin "graphics/obj_palettes/pal_349.gbapal" -.incbin "graphics/obj_palettes/pal_350.gbapal" -.incbin "graphics/obj_palettes/pal_351.gbapal" -.incbin "graphics/obj_palettes/pal_352.gbapal" -.incbin "graphics/obj_palettes/pal_353.gbapal" -.incbin "graphics/obj_palettes/pal_354.gbapal" -.incbin "graphics/obj_palettes/pal_355.gbapal" -.incbin "graphics/obj_palettes/pal_356.gbapal" -.incbin "graphics/obj_palettes/pal_357.gbapal" -.incbin "graphics/obj_palettes/pal_358.gbapal" -.incbin "graphics/obj_palettes/pal_359.gbapal" -.incbin "graphics/obj_palettes/pal_360.gbapal" -.incbin "graphics/obj_palettes/pal_361.gbapal" -.incbin "graphics/obj_palettes/pal_362.gbapal" -.incbin "graphics/obj_palettes/pal_363.gbapal" -.incbin "graphics/obj_palettes/pal_364.gbapal" -.incbin "graphics/obj_palettes/pal_365.gbapal" -.incbin "graphics/obj_palettes/pal_366.gbapal" -.incbin "graphics/obj_palettes/pal_367.gbapal" -.incbin "graphics/obj_palettes/pal_368.gbapal" -.incbin "graphics/obj_palettes/pal_369.gbapal" -.incbin "graphics/obj_palettes/pal_370.gbapal" -.incbin "graphics/obj_palettes/pal_371.gbapal" -.incbin "graphics/obj_palettes/pal_372.gbapal" -.incbin "graphics/obj_palettes/pal_373.gbapal" -.incbin "graphics/obj_palettes/pal_374.gbapal" -.incbin "graphics/obj_palettes/pal_375.gbapal" -.incbin "graphics/obj_palettes/pal_376.gbapal" -.incbin "graphics/obj_palettes/pal_377.gbapal" -.incbin "graphics/obj_palettes/pal_378.gbapal" -.incbin "graphics/obj_palettes/pal_379.gbapal" -.incbin "graphics/obj_palettes/pal_380.gbapal" -.incbin "graphics/obj_palettes/pal_381.gbapal" -.incbin "graphics/obj_palettes/pal_382.gbapal" -.incbin "graphics/obj_palettes/pal_383.gbapal" -.incbin "graphics/obj_palettes/pal_384.gbapal" -.incbin "graphics/obj_palettes/pal_385.gbapal" -.incbin "graphics/obj_palettes/pal_386.gbapal" -.incbin "graphics/obj_palettes/pal_387.gbapal" -.incbin "graphics/obj_palettes/pal_388.gbapal" -.incbin "graphics/obj_palettes/pal_389.gbapal" -.incbin "graphics/obj_palettes/pal_390.gbapal" -.incbin "graphics/obj_palettes/pal_391.gbapal" -.incbin "graphics/obj_palettes/pal_392.gbapal" -.incbin "graphics/obj_palettes/pal_393.gbapal" -.incbin "graphics/obj_palettes/pal_394.gbapal" -.incbin "graphics/obj_palettes/pal_395.gbapal" -.incbin "graphics/obj_palettes/pal_396.gbapal" -.incbin "graphics/obj_palettes/pal_397.gbapal" -.incbin "graphics/obj_palettes/pal_398.gbapal" -.incbin "graphics/obj_palettes/pal_399.gbapal" -.incbin "graphics/obj_palettes/pal_400.gbapal" -.incbin "graphics/obj_palettes/pal_401.gbapal" -.incbin "graphics/obj_palettes/pal_402.gbapal" -.incbin "graphics/obj_palettes/pal_403.gbapal" -.incbin "graphics/obj_palettes/pal_404.gbapal" -.incbin "graphics/obj_palettes/pal_405.gbapal" -.incbin "graphics/obj_palettes/pal_406.gbapal" -.incbin "graphics/obj_palettes/pal_407.gbapal" -.incbin "graphics/obj_palettes/pal_408.gbapal" -.incbin "graphics/obj_palettes/pal_409.gbapal" -.incbin "graphics/obj_palettes/pal_410.gbapal" -.incbin "graphics/obj_palettes/pal_411.gbapal" -.incbin "graphics/obj_palettes/pal_412.gbapal" -.incbin "graphics/obj_palettes/pal_413.gbapal" -.incbin "graphics/obj_palettes/pal_414.gbapal" -.incbin "graphics/obj_palettes/pal_415.gbapal" -.incbin "graphics/obj_palettes/pal_416.gbapal" -.incbin "graphics/obj_palettes/pal_417.gbapal" -.incbin "graphics/obj_palettes/pal_418.gbapal" -.incbin "graphics/obj_palettes/pal_419.gbapal" -.incbin "graphics/obj_palettes/pal_420.gbapal" -.incbin "graphics/obj_palettes/pal_421.gbapal" -.incbin "graphics/obj_palettes/pal_422.gbapal" -.incbin "graphics/obj_palettes/pal_423.gbapal" -.incbin "graphics/obj_palettes/pal_424.gbapal" -.incbin "graphics/obj_palettes/pal_425.gbapal" -.incbin "graphics/obj_palettes/pal_426.gbapal" -.incbin "graphics/obj_palettes/pal_427.gbapal" -.incbin "graphics/obj_palettes/pal_428.gbapal" -.incbin "graphics/obj_palettes/pal_429.gbapal" -.incbin "graphics/obj_palettes/pal_430.gbapal" -.incbin "graphics/obj_palettes/pal_431.gbapal" -.incbin "graphics/obj_palettes/pal_432.gbapal" -.incbin "graphics/obj_palettes/pal_433.gbapal" -.incbin "graphics/obj_palettes/pal_434.gbapal" -.incbin "graphics/obj_palettes/pal_435.gbapal" -.incbin "graphics/obj_palettes/pal_436.gbapal" -.incbin "graphics/obj_palettes/pal_437.gbapal" -.incbin "graphics/obj_palettes/pal_438.gbapal" -.incbin "graphics/obj_palettes/pal_439.gbapal" -.incbin "graphics/obj_palettes/pal_440.gbapal" -.incbin "graphics/obj_palettes/pal_441.gbapal" -.incbin "graphics/obj_palettes/pal_442.gbapal" -.incbin "graphics/obj_palettes/pal_443.gbapal" -.incbin "graphics/obj_palettes/pal_444.gbapal" -.incbin "graphics/obj_palettes/pal_445.gbapal" -.incbin "graphics/obj_palettes/pal_446.gbapal" -.incbin "graphics/obj_palettes/pal_447.gbapal" -.incbin "graphics/obj_palettes/pal_448.gbapal" -.incbin "graphics/obj_palettes/pal_449.gbapal" -.incbin "graphics/obj_palettes/pal_450.gbapal" -.incbin "graphics/obj_palettes/pal_451.gbapal" -.incbin "graphics/obj_palettes/pal_452.gbapal" -.incbin "graphics/obj_palettes/pal_453.gbapal" -.incbin "graphics/obj_palettes/pal_454.gbapal" -.incbin "graphics/obj_palettes/pal_455.gbapal" -.incbin "graphics/obj_palettes/pal_456.gbapal" -.incbin "graphics/obj_palettes/pal_457.gbapal" -.incbin "graphics/obj_palettes/pal_458.gbapal" -.incbin "graphics/obj_palettes/pal_459.gbapal" -.incbin "graphics/obj_palettes/pal_460.gbapal" -.incbin "graphics/obj_palettes/pal_461.gbapal" -.incbin "graphics/obj_palettes/pal_462.gbapal" -.incbin "graphics/obj_palettes/pal_463.gbapal" -.incbin "graphics/obj_palettes/pal_464.gbapal" -.incbin "graphics/obj_palettes/pal_465.gbapal" -.incbin "graphics/obj_palettes/pal_466.gbapal" -.incbin "graphics/obj_palettes/pal_467.gbapal" -.incbin "graphics/obj_palettes/pal_468.gbapal" -.incbin "graphics/obj_palettes/pal_469.gbapal" -.incbin "graphics/obj_palettes/pal_470.gbapal" -.incbin "graphics/obj_palettes/pal_471.gbapal" -.incbin "graphics/obj_palettes/pal_472.gbapal" -.incbin "graphics/obj_palettes/pal_473.gbapal" -.incbin "graphics/obj_palettes/pal_474.gbapal" -.incbin "graphics/obj_palettes/pal_475.gbapal" -.incbin "graphics/obj_palettes/pal_476.gbapal" -.incbin "graphics/obj_palettes/pal_477.gbapal" -.incbin "graphics/obj_palettes/pal_478.gbapal" -.incbin "graphics/obj_palettes/pal_479.gbapal" -.incbin "graphics/obj_palettes/pal_480.gbapal" -.incbin "graphics/obj_palettes/pal_481.gbapal" -.incbin "graphics/obj_palettes/pal_482.gbapal" -.incbin "graphics/obj_palettes/pal_483.gbapal" -.incbin "graphics/obj_palettes/pal_484.gbapal" -.incbin "graphics/obj_palettes/pal_485.gbapal" -.incbin "graphics/obj_palettes/pal_486.gbapal" -.incbin "graphics/obj_palettes/pal_487.gbapal" -.incbin "graphics/obj_palettes/pal_488.gbapal" -.incbin "graphics/obj_palettes/pal_489.gbapal" -.incbin "graphics/obj_palettes/pal_490.gbapal" -.incbin "graphics/obj_palettes/pal_491.gbapal" -.incbin "graphics/obj_palettes/pal_492.gbapal" -.incbin "graphics/obj_palettes/pal_493.gbapal" -.incbin "graphics/obj_palettes/pal_494.gbapal" -.incbin "graphics/obj_palettes/pal_495.gbapal" -.incbin "graphics/obj_palettes/pal_496.gbapal" -.incbin "graphics/obj_palettes/pal_497.gbapal" -.incbin "graphics/obj_palettes/pal_498.gbapal" -.incbin "graphics/obj_palettes/pal_499.gbapal" -.incbin "graphics/obj_palettes/pal_500.gbapal" -.incbin "graphics/obj_palettes/pal_501.gbapal" -.incbin "graphics/obj_palettes/pal_502.gbapal" -.incbin "graphics/obj_palettes/pal_503.gbapal" -.incbin "graphics/obj_palettes/pal_504.gbapal" -.incbin "graphics/obj_palettes/pal_505.gbapal" -.incbin "graphics/obj_palettes/pal_506.gbapal" -.incbin "graphics/obj_palettes/pal_507.gbapal" -.incbin "graphics/obj_palettes/pal_508.gbapal" -.incbin "graphics/obj_palettes/pal_509.gbapal" -.incbin "graphics/obj_palettes/pal_510.gbapal" -.incbin "graphics/obj_palettes/pal_511.gbapal" -.incbin "graphics/obj_palettes/pal_512.gbapal" -.incbin "graphics/obj_palettes/pal_513.gbapal" -.incbin "graphics/obj_palettes/pal_514.gbapal" -.incbin "graphics/obj_palettes/pal_515.gbapal" -.incbin "graphics/obj_palettes/pal_516.gbapal" -.incbin "graphics/obj_palettes/pal_517.gbapal" -.incbin "graphics/obj_palettes/pal_518.gbapal" -.incbin "graphics/obj_palettes/pal_519.gbapal" -.incbin "graphics/obj_palettes/pal_520.gbapal" -.incbin "graphics/obj_palettes/pal_521.gbapal" -.incbin "graphics/obj_palettes/pal_522.gbapal" -.incbin "graphics/obj_palettes/pal_523.gbapal" -.incbin "graphics/obj_palettes/pal_524.gbapal" -.incbin "graphics/obj_palettes/pal_525.gbapal" -.incbin "graphics/obj_palettes/pal_526.gbapal" -.incbin "graphics/obj_palettes/pal_527.gbapal" -.incbin "graphics/obj_palettes/pal_528.gbapal" -.incbin "graphics/obj_palettes/pal_529.gbapal" -.incbin "graphics/obj_palettes/pal_530.gbapal" -.incbin "graphics/obj_palettes/pal_531.gbapal" -.incbin "graphics/obj_palettes/pal_532.gbapal" -.incbin "graphics/obj_palettes/pal_533.gbapal" -.incbin "graphics/obj_palettes/pal_534.gbapal" -.incbin "graphics/obj_palettes/pal_535.gbapal" -.incbin "graphics/obj_palettes/pal_536.gbapal" -.incbin "graphics/obj_palettes/pal_537.gbapal" -.incbin "graphics/obj_palettes/pal_538.gbapal" -.incbin "graphics/obj_palettes/pal_539.gbapal" -.incbin "graphics/obj_palettes/pal_540.gbapal" -.incbin "graphics/obj_palettes/pal_541.gbapal" -.incbin "graphics/obj_palettes/pal_542.gbapal" -.incbin "graphics/obj_palettes/pal_543.gbapal" -.incbin "graphics/obj_palettes/pal_544.gbapal" -.incbin "graphics/obj_palettes/pal_545.gbapal" -.incbin "graphics/obj_palettes/pal_546.gbapal" -.incbin "graphics/obj_palettes/pal_547.gbapal" -.incbin "graphics/obj_palettes/pal_548.gbapal" -.incbin "graphics/obj_palettes/pal_549.gbapal" -.incbin "graphics/obj_palettes/pal_550.gbapal" -.incbin "graphics/obj_palettes/pal_551.gbapal" -.incbin "graphics/obj_palettes/pal_552.gbapal" -.incbin "graphics/obj_palettes/pal_553.gbapal" -.incbin "graphics/obj_palettes/pal_554.gbapal" -.incbin "graphics/obj_palettes/pal_555.gbapal" -.incbin "graphics/obj_palettes/pal_556.gbapal" -.incbin "graphics/obj_palettes/pal_557.gbapal" -.incbin "graphics/obj_palettes/pal_558.gbapal" -.incbin "graphics/obj_palettes/pal_559.gbapal" -.incbin "graphics/obj_palettes/pal_560.gbapal" -.incbin "graphics/obj_palettes/pal_561.gbapal" -.incbin "graphics/obj_palettes/pal_562.gbapal" -.incbin "graphics/obj_palettes/pal_563.gbapal" -.incbin "graphics/obj_palettes/pal_564.gbapal" -.incbin "graphics/obj_palettes/pal_565.gbapal" -.incbin "graphics/obj_palettes/pal_566.gbapal" -.incbin "graphics/obj_palettes/pal_567.gbapal" -.incbin "graphics/obj_palettes/pal_568.gbapal" -.incbin "graphics/obj_palettes/pal_569.gbapal" -.incbin "graphics/obj_palettes/pal_570.gbapal" -.incbin "graphics/obj_palettes/pal_571.gbapal" -.incbin "graphics/obj_palettes/pal_572.gbapal" -.incbin "graphics/obj_palettes/pal_573.gbapal" -.incbin "graphics/obj_palettes/pal_574.gbapal" -.incbin "graphics/obj_palettes/pal_575.gbapal" -.incbin "graphics/obj_palettes/pal_576.gbapal" -.incbin "graphics/obj_palettes/pal_577.gbapal" -.incbin "graphics/obj_palettes/pal_578.gbapal" -.incbin "graphics/obj_palettes/pal_579.gbapal" -.incbin "graphics/obj_palettes/pal_580.gbapal" -.incbin "graphics/obj_palettes/pal_581.gbapal" -.incbin "graphics/obj_palettes/pal_582.gbapal" -.incbin "graphics/obj_palettes/pal_583.gbapal" -.incbin "graphics/obj_palettes/pal_584.gbapal" -.incbin "graphics/obj_palettes/pal_585.gbapal" -.incbin "graphics/obj_palettes/pal_586.gbapal" -.incbin "graphics/obj_palettes/pal_587.gbapal" -.incbin "graphics/obj_palettes/pal_588.gbapal" -.incbin "graphics/obj_palettes/pal_589.gbapal" -.incbin "graphics/obj_palettes/pal_590.gbapal" -.incbin "graphics/obj_palettes/pal_591.gbapal" -.incbin "graphics/obj_palettes/pal_592.gbapal" -.incbin "graphics/obj_palettes/pal_593.gbapal" -.incbin "graphics/obj_palettes/pal_594.gbapal" -.incbin "graphics/obj_palettes/pal_595.gbapal" -.incbin "graphics/obj_palettes/pal_596.gbapal" -.incbin "graphics/obj_palettes/pal_597.gbapal" -.incbin "graphics/obj_palettes/pal_598.gbapal" -.incbin "graphics/obj_palettes/pal_599.gbapal" -.incbin "graphics/obj_palettes/pal_600.gbapal" -.incbin "graphics/obj_palettes/pal_601.gbapal" -.incbin "graphics/obj_palettes/pal_602.gbapal" -.incbin "graphics/obj_palettes/pal_603.gbapal" -.incbin "graphics/obj_palettes/pal_604.gbapal" -.incbin "graphics/obj_palettes/pal_605.gbapal" -.incbin "graphics/obj_palettes/pal_606.gbapal" -.incbin "graphics/obj_palettes/pal_607.gbapal" -.incbin "graphics/obj_palettes/pal_608.gbapal" -.incbin "graphics/obj_palettes/pal_609.gbapal" -.incbin "graphics/obj_palettes/pal_610.gbapal" -.incbin "graphics/obj_palettes/pal_611.gbapal" -.incbin "graphics/obj_palettes/pal_612.gbapal" -.incbin "graphics/obj_palettes/pal_613.gbapal" -.incbin "graphics/obj_palettes/pal_614.gbapal" -.incbin "graphics/obj_palettes/pal_615.gbapal" -.incbin "graphics/obj_palettes/pal_616.gbapal" -.incbin "graphics/obj_palettes/pal_617.gbapal" -.incbin "graphics/obj_palettes/pal_618.gbapal" -.incbin "graphics/obj_palettes/pal_619.gbapal" -.incbin "graphics/obj_palettes/pal_620.gbapal" -.incbin "graphics/obj_palettes/pal_621.gbapal" -.incbin "graphics/obj_palettes/pal_622.gbapal" -.incbin "graphics/obj_palettes/pal_623.gbapal" -.incbin "graphics/obj_palettes/pal_624.gbapal" -.incbin "graphics/obj_palettes/pal_625.gbapal" -.incbin "graphics/obj_palettes/pal_626.gbapal" -.incbin "graphics/obj_palettes/pal_627.gbapal" -.incbin "graphics/obj_palettes/pal_628.gbapal" -.incbin "graphics/obj_palettes/pal_629.gbapal" -.incbin "graphics/obj_palettes/pal_630.gbapal" -.incbin "graphics/obj_palettes/pal_631.gbapal" -.incbin "graphics/obj_palettes/pal_632.gbapal" -.incbin "graphics/obj_palettes/pal_633.gbapal" -.incbin "graphics/obj_palettes/pal_634.gbapal" -.incbin "graphics/obj_palettes/pal_635.gbapal" -.incbin "graphics/obj_palettes/pal_636.gbapal" -.incbin "graphics/obj_palettes/pal_637.gbapal" -.incbin "graphics/obj_palettes/pal_638.gbapal" -.incbin "graphics/obj_palettes/pal_639.gbapal" -.incbin "graphics/obj_palettes/pal_640.gbapal" -.incbin "graphics/obj_palettes/pal_641.gbapal" -.incbin "graphics/obj_palettes/pal_642.gbapal" -.incbin "graphics/obj_palettes/pal_643.gbapal" -.incbin "graphics/obj_palettes/pal_644.gbapal" -.incbin "graphics/obj_palettes/pal_645.gbapal" -.incbin "graphics/obj_palettes/pal_646.gbapal" -.incbin "graphics/obj_palettes/pal_647.gbapal" -.incbin "graphics/obj_palettes/pal_648.gbapal" -.incbin "graphics/obj_palettes/pal_649.gbapal" -.incbin "graphics/obj_palettes/pal_650.gbapal" -.incbin "graphics/obj_palettes/pal_651.gbapal" -.incbin "graphics/obj_palettes/pal_652.gbapal" -.incbin "graphics/obj_palettes/pal_653.gbapal" -.incbin "graphics/obj_palettes/pal_654.gbapal" -.incbin "graphics/obj_palettes/pal_655.gbapal" -.incbin "graphics/obj_palettes/pal_656.gbapal" -.incbin "graphics/obj_palettes/pal_657.gbapal" -.incbin "graphics/obj_palettes/pal_658.gbapal" -.incbin "graphics/obj_palettes/pal_659.gbapal" -.incbin "graphics/obj_palettes/pal_660.gbapal" -.incbin "graphics/obj_palettes/pal_661.gbapal" -.incbin "graphics/obj_palettes/pal_662.gbapal" -.incbin "graphics/obj_palettes/pal_663.gbapal" -.incbin "graphics/obj_palettes/pal_664.gbapal" -.incbin "graphics/obj_palettes/pal_665.gbapal" -.incbin "graphics/obj_palettes/pal_666.gbapal" -.incbin "graphics/obj_palettes/pal_667.gbapal" -.incbin "graphics/obj_palettes/pal_668.gbapal" -.incbin "graphics/obj_palettes/pal_669.gbapal" -.incbin "graphics/obj_palettes/pal_670.gbapal" -.incbin "graphics/obj_palettes/pal_671.gbapal" -.incbin "graphics/obj_palettes/pal_672.gbapal" -.incbin "graphics/obj_palettes/pal_673.gbapal" -.incbin "graphics/obj_palettes/pal_674.gbapal" -.incbin "graphics/obj_palettes/pal_675.gbapal" -.incbin "graphics/obj_palettes/pal_676.gbapal" -.incbin "graphics/obj_palettes/pal_677.gbapal" -.incbin "graphics/obj_palettes/pal_678.gbapal" -.incbin "graphics/obj_palettes/pal_679.gbapal" -.incbin "graphics/obj_palettes/pal_680.gbapal" -.incbin "graphics/obj_palettes/pal_681.gbapal" -.incbin "graphics/obj_palettes/pal_682.gbapal" -.incbin "graphics/obj_palettes/pal_683.gbapal" -.incbin "graphics/obj_palettes/pal_684.gbapal" -.incbin "graphics/obj_palettes/pal_685.gbapal" -.incbin "graphics/obj_palettes/pal_686.gbapal" -.incbin "graphics/obj_palettes/pal_687.gbapal" -.incbin "graphics/obj_palettes/pal_688.gbapal" -.incbin "graphics/obj_palettes/pal_689.gbapal" -#ifdef JAPAN -.incbin "graphics/obj_palettes/pal_690_japan.gbapal" -#else -.incbin "graphics/obj_palettes/pal_690.gbapal" -#endif -.incbin "graphics/obj_palettes/pal_691.gbapal" -.incbin "graphics/obj_palettes/pal_692.gbapal" -.incbin "graphics/obj_palettes/pal_693.gbapal" -.incbin "graphics/obj_palettes/pal_694.gbapal" -.incbin "graphics/obj_palettes/pal_695.gbapal" -.incbin "graphics/obj_palettes/pal_696.gbapal" -.incbin "graphics/obj_palettes/pal_697.gbapal" -.incbin "graphics/obj_palettes/pal_698.gbapal" -.incbin "graphics/obj_palettes/pal_699.gbapal" -.incbin "graphics/obj_palettes/pal_700.gbapal" -.incbin "graphics/obj_palettes/pal_701.gbapal" -.incbin "graphics/obj_palettes/pal_702.gbapal" -.incbin "graphics/obj_palettes/pal_703.gbapal" -.incbin "graphics/obj_palettes/pal_704.gbapal" -.incbin "graphics/obj_palettes/pal_705.gbapal" -.incbin "graphics/obj_palettes/pal_706.gbapal" -.incbin "graphics/obj_palettes/pal_707.gbapal" -.incbin "graphics/obj_palettes/pal_708.gbapal" -.incbin "graphics/obj_palettes/pal_709.gbapal" -.incbin "graphics/obj_palettes/pal_710.gbapal" -.incbin "graphics/obj_palettes/pal_711.gbapal" -.incbin "graphics/obj_palettes/pal_712.gbapal" -.incbin "graphics/obj_palettes/pal_713.gbapal" -.incbin "graphics/obj_palettes/pal_714.gbapal" -.incbin "graphics/obj_palettes/pal_715.gbapal" -.incbin "graphics/obj_palettes/pal_716.gbapal" -.incbin "graphics/obj_palettes/pal_717.gbapal" -.incbin "graphics/obj_palettes/pal_718.gbapal" -.incbin "graphics/obj_palettes/pal_719.gbapal" -.incbin "graphics/obj_palettes/pal_720.gbapal" -.incbin "graphics/obj_palettes/pal_721.gbapal" -.incbin "graphics/obj_palettes/pal_722.gbapal" -.incbin "graphics/obj_palettes/pal_723.gbapal" -.incbin "graphics/obj_palettes/pal_724.gbapal" -.incbin "graphics/obj_palettes/pal_725.gbapal" -.incbin "graphics/obj_palettes/pal_726.gbapal" -.incbin "graphics/obj_palettes/pal_727.gbapal" -.incbin "graphics/obj_palettes/pal_728.gbapal" -.incbin "graphics/obj_palettes/pal_729.gbapal" -.incbin "graphics/obj_palettes/pal_730.gbapal" -.incbin "graphics/obj_palettes/pal_731.gbapal" -.incbin "graphics/obj_palettes/pal_732.gbapal" -.incbin "graphics/obj_palettes/pal_733.gbapal" -.incbin "graphics/obj_palettes/pal_734.gbapal" - -.if ENABLE_DECOMP_CREDITS -.incbin "graphics/obj_palettes/pal_logos_jace.gbapal" -.incbin "graphics/obj_palettes/pal_logos_ollie.gbapal" -.endif diff --git a/graphics/8C8796C.pal b/graphics/sound_test_bg.pal similarity index 100% rename from graphics/8C8796C.pal rename to graphics/sound_test_bg.pal diff --git a/graphics/80E0270.pal b/graphics/time_display_timeout.pal similarity index 100% rename from graphics/80E0270.pal rename to graphics/time_display_timeout.pal diff --git a/graphics/80E0EF4.pal b/graphics/title_screen__waves_brightness.pal similarity index 100% rename from graphics/80E0EF4.pal rename to graphics/title_screen__waves_brightness.pal diff --git a/graphics/080D5C82.pal b/graphics/zone_7_bg_ceiling.pal similarity index 100% rename from graphics/080D5C82.pal rename to graphics/zone_7_bg_ceiling.pal diff --git a/include/bg_triangles.h b/include/bg_triangles.h index d66538d943..f0a1ad4b52 100644 --- a/include/bg_triangles.h +++ b/include/bg_triangles.h @@ -24,7 +24,7 @@ typedef struct { } TriParam1; extern void sub_800724C(u8 bg, TriParam1 *param1); -extern void sub_80075D0(u8 bg, u8 param1, u8 param2, s16 param3, s16 param4, u16 param5); +extern void sub_80075D0(u8 bg, int_vcount param1, int_vcount param2, s16 param3, s16 param4, u16 param5); extern void sub_8007858(u8 param0, int_vcount minY, int_vcount maxY, u16 param3, u16 param4); extern void sub_80078D4(u8 bg, int_vcount minY, int_vcount maxY, u16 offsetEven, u16 offsetOdd); diff --git a/include/color.h b/include/color.h new file mode 100644 index 0000000000..6071117a8b --- /dev/null +++ b/include/color.h @@ -0,0 +1,33 @@ +#ifndef GUARD_COLOR_H +#define GUARD_COLOR_H + +#if PLATFORM_GBA || (RENDERER == RENDERER_SOFTWARE) +// ABGR_1555 +typedef uint16_t ColorRaw; +typedef union Color { + struct { + uint16_t r : 5; + uint16_t g : 5; + uint16_t b : 5; + uint16_t a : 1; + } split; + + ColorRaw raw; +} Color; + +#else +// RGBA_8888 +typedef uint32_t ColorRaw; +typedef union Color { + struct { + uint8_t r; + uint8_t g; + uint8_t b; + uint8_t a; + } split; + + ColorRaw raw; +} Color; +#endif + +#endif // GUARD_COLOR_H \ No newline at end of file diff --git a/include/core.h b/include/core.h index 5a7c57ede7..ef0f2803fb 100644 --- a/include/core.h +++ b/include/core.h @@ -173,7 +173,7 @@ struct SpriteTables { /* 0x00 */ const ACmd **const *animations; /* 0x04 */ const SpriteOffset *const *dimensions; /* 0x08 */ const u16 **const oamData; - /* 0x0C */ const u16 *const palettes; + /* 0x0C */ const ColorRaw *const palettes; /* 0x10 */ const u8 *const tiles_4bpp; /* 0x14 */ const u8 *const tiles_8bpp; }; @@ -273,8 +273,8 @@ extern u16 gDispCnt; extern winreg_t gWinRegs[6]; extern struct BlendRegs gBldRegs; extern BgAffineReg gBgAffineRegs[NUM_AFFINE_BACKGROUNDS]; -extern u16 gObjPalette[16 * PALETTE_LEN_4BPP]; -extern u16 gBgPalette[16 * PALETTE_LEN_4BPP]; +extern ColorRaw gObjPalette[16 * PALETTE_LEN_4BPP]; +extern ColorRaw gBgPalette[16 * PALETTE_LEN_4BPP]; extern u16 gBgCntRegs[4]; diff --git a/include/data/palettes.h b/include/data/palettes.h index 0d12f9b54f..b788b6634c 100644 --- a/include/data/palettes.h +++ b/include/data/palettes.h @@ -2,6 +2,6 @@ #define GUARD_PALETTES_H #include "global.h" -extern const u16 gBgGradientPalette[]; +extern const ColorRaw gBgGradientPalette[]; #endif // GUARD_PALETTES_H diff --git a/include/game/bg_palette_effects.h b/include/game/bg_palette_effects.h index 8bdd58746e..2bfb6b008a 100644 --- a/include/game/bg_palette_effects.h +++ b/include/game/bg_palette_effects.h @@ -2,6 +2,7 @@ #define GUARD_BACKGROUNDS_H #include "global.h" +#include "core.h" // PALETTE_LEN_4BPP #include "sprite.h" typedef struct { @@ -11,7 +12,7 @@ typedef struct { const u8 *pattern; - const u16 *palette; + const ColorRaw *palette; u8 unkC; u8 unkD; @@ -24,7 +25,7 @@ typedef struct { u8 unk13; - u16 palBuffer[16]; + ColorRaw palBuffer[PALETTE_LEN_4BPP]; s16 offset; u8 unk36; diff --git a/include/gba/defines.h b/include/gba/defines.h index 9f31a2dab0..35127c3d5e 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -13,6 +13,7 @@ #define IWRAM_DATA __attribute__((section("iwram_data"))) #define EWRAM_DATA __attribute__((section("ewram_data"))) #else +#include "color.h" #define IWRAM_DATA #define EWRAM_DATA #endif @@ -78,9 +79,9 @@ extern void (*INTR_VECTOR)(void); extern uint8_t EWRAM_START[EWRAM_SIZE]; extern uint8_t IWRAM_START[IWRAM_SIZE]; -extern uint16_t PLTT[PLTT_SIZE/sizeof(uint16_t)]; -#define BG_PLTT ((u16*)&PLTT[0]) -#define OBJ_PLTT ((u16*)&PLTT[BG_PLTT_SIZE/sizeof(uint16_t)]) +extern ColorRaw PLTT[PLTT_SIZE/sizeof(uint16_t)]; +#define BG_PLTT ((ColorRaw*)&PLTT[0]) +#define OBJ_PLTT ((ColorRaw*)&PLTT[BG_PLTT_SIZE/sizeof(uint16_t)]) extern uint8_t OAM[OAM_SIZE]; #define BG_VRAM &VRAM[0] diff --git a/include/global.h b/include/global.h index 8f186cacb6..0408ab7878 100644 --- a/include/global.h +++ b/include/global.h @@ -2,7 +2,8 @@ #define GUARD_GLOBAL_H #include "config.h" -#include "gba/gba.h" +#include "gba/gba.h" // TODO: Only actually include when compiling for GBA +#include "color.h" #if PLATFORM_GBA #define ENABLE_AUDIO TRUE @@ -163,10 +164,6 @@ typedef void (*VoidFn)(void); // Converts a Q24.8 fixed-point format number to a regular integer #define I(n) Q_24_8_TO_INT(n) -#define RED_VALUE(color) (((color) >> 0) & 0x1F) -#define GREEN_VALUE(color) (((color) >> 5) & 0x1F) -#define BLUE_VALUE(color) (((color) >> 10) & 0x1F) - #define MIN(a, b) (((a) < (b)) ? (a) : (b)) #define MAX(a, b) (((a) > (b)) ? (a) : (b)) diff --git a/include/tilemap.h b/include/tilemap.h index 3cc43d9081..4ac0cc8f02 100644 --- a/include/tilemap.h +++ b/include/tilemap.h @@ -22,7 +22,7 @@ typedef struct { /* 0x07 */ u8 animDelay; /* 0x08 */ const u8 *tiles; /* 0x0C */ u32 tilesSize; - /* 0x10 */ const u16 *palette; + /* 0x10 */ const ColorRaw *palette; /* 0x14 */ u16 palOffset; /* 0x16 */ u16 palLength; diff --git a/include/types.h b/include/types.h new file mode 100644 index 0000000000..121115486c --- /dev/null +++ b/include/types.h @@ -0,0 +1,7 @@ +#ifndef GUARD_TYPES_H +#define GUARD_TYPES_H + +// TODO: Replace with platform-specific types.h files! +#include "gba/types.h" + +#endif // GUARD_TYPES_H \ No newline at end of file diff --git a/ldscript.txt b/ldscript.txt index e0bb92b852..0432c7ea5d 100644 --- a/ldscript.txt +++ b/ldscript.txt @@ -498,6 +498,7 @@ SECTIONS src/data/animations/animation_table.o(.rodata); src/data/sprite_dimensions.o(.rodata); src/data/sprite_oam_data.o(.rodata); + src/data/sprite_palettes.o(.rodata); data/sprite_animation_data.o(.rodata); src/data/tileset_debug_ascii.o(.rodata); @@ -780,7 +781,7 @@ SECTIONS src/game/sa1_sa2_shared/input_buffer.o(.data); data/special_stage_levels.o(.rodata); src/data/handlers_ia_pipe_horn_sequences.o(.rodata); - src/data/palettes.o(.rodata); + src/game/sound_test.o(.data); src/data/recordings.o(.rodata); data/multiboot_collect_rings.o(.rodata); data/multiboot_subgame_loader.o(.rodata); diff --git a/multi_boot/collect_rings/Makefile b/multi_boot/collect_rings/Makefile index f0ca63159f..df17e69f34 100644 --- a/multi_boot/collect_rings/Makefile +++ b/multi_boot/collect_rings/Makefile @@ -126,7 +126,7 @@ endif $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) @echo "$(AS) -o $@ $<" - @$(PREPROC) $< | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ ../roms/collect_rings/collect_rings.gba: $(MAKE) -C ../roms/collect_rings diff --git a/multi_boot/collect_rings/config.mk b/multi_boot/collect_rings/config.mk index 52f6935fd7..df4911e2c1 100644 --- a/multi_boot/collect_rings/config.mk +++ b/multi_boot/collect_rings/config.mk @@ -1,6 +1,7 @@ ### Build Configuration ### # Default variables +PLATFORM ?= gba GAME_REVISION ?= 0 GAME_REGION ?= USA DEBUG ?= 0 diff --git a/multi_boot/programs/subgame_loader/Makefile b/multi_boot/programs/subgame_loader/Makefile index 730f978dc6..ab4144017e 100644 --- a/multi_boot/programs/subgame_loader/Makefile +++ b/multi_boot/programs/subgame_loader/Makefile @@ -170,7 +170,7 @@ endif $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep) @echo "$(CC1) -o $@ $<" @$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i - @$(PREPROC) $(C_BUILDDIR)/$*.i | $(CC1) $(CC1FLAGS) -o $(C_BUILDDIR)/$*.s + @$(PREPROC) $(C_BUILDDIR)/$*.i $(PLATFORM) "" | $(CC1) $(CC1FLAGS) -o $(C_BUILDDIR)/$*.s @printf ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s @$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s @@ -193,7 +193,7 @@ endif $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) @echo "$(AS) -o $@ $<" - @$(PREPROC) $< | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s @echo "$(AS) -I sound -o $@ $<" diff --git a/multi_boot/programs/subgame_loader/config.mk b/multi_boot/programs/subgame_loader/config.mk index 046768e129..0b70920663 100644 --- a/multi_boot/programs/subgame_loader/config.mk +++ b/multi_boot/programs/subgame_loader/config.mk @@ -1,6 +1,7 @@ ### Build Configuration ### # Default variables +PLATFORM ?= gba GAME_REVISION ?= 0 GAME_REGION ?= USA DEBUG ?= 0 diff --git a/multi_boot/programs/subgame_loader/include/global.h b/multi_boot/programs/subgame_loader/include/global.h index 27d19b4bfa..d12ed21508 100644 --- a/multi_boot/programs/subgame_loader/include/global.h +++ b/multi_boot/programs/subgame_loader/include/global.h @@ -72,10 +72,6 @@ // Converts a Q24.8 fixed-point format number to a regular integer #define Q_24_8_TO_INT(n) ((int)((n) >> 8)) -#define RED_VALUE(color) ((color)&0x1F) -#define GREEN_VALUE(color) (((color) >> 5) & 0x1F) -#define BLUE_VALUE(color) (((color) >> 10) & 0x1F) - #define ABS(aValue) ((aValue) >= 0 ? (aValue) : -(aValue)) #define RECT_DISTANCE(aXA, aYA, aXB, aYB) (ABS((aXA) - (aXB)) + ABS((aYA) - (aYB))) diff --git a/multi_boot/roms/collect_rings/Makefile b/multi_boot/roms/collect_rings/Makefile index bf524be4a3..92eafe04ef 100644 --- a/multi_boot/roms/collect_rings/Makefile +++ b/multi_boot/roms/collect_rings/Makefile @@ -308,7 +308,7 @@ $(C_BUILDDIR)/sa2/%.o: $(C_BUILDDIR)/sa2/%.c @echo "$(CC1) -o $@ $<" @$(shell mkdir -p $(shell dirname '$(C_BUILDDIR)/sa2/$*.i')) @$(CPP) $(CPPFLAGS) $(SA2_INCLUDE_CPP_ARGS) $< -o $(C_BUILDDIR)/sa2/$*.i - @$(PREPROC) $(C_BUILDDIR)/sa2/$*.i | $(CC1) $(PROLOGUE_FIX) $(CC1FLAGS) -o $(C_BUILDDIR)/sa2/$*.s - + @$(PREPROC) $(C_BUILDDIR)/sa2/$*.i $(PLATFORM) "" | $(CC1) $(PROLOGUE_FIX) $(CC1FLAGS) -o $(C_BUILDDIR)/sa2/$*.s - @printf ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/sa2/$*.s @$(AS) $(ASFLAGS) -I ../../../ $(C_BUILDDIR)/sa2/$*.s -o $@ @@ -326,7 +326,7 @@ $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s @echo "$(AS) -o $@ $<" - @$(PREPROC) $< "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - # Scan the ASM data dependencies to determine if any .inc files have changed $(DATA_ASM_BUILDDIR)/%.d: $(DATA_ASM_SUBDIR)/%.s @@ -340,7 +340,7 @@ endif $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s @echo "$(AS) -o $@ $<" - @$(PREPROC) $< "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - libagbsyscall: @$(MAKE) -C ../../../libagbsyscall MODERN=0 PLATFORM=gba CPU_ARCH=arm diff --git a/multi_boot/roms/collect_rings/config.mk b/multi_boot/roms/collect_rings/config.mk index 6a89525d62..cec6fc6397 100644 --- a/multi_boot/roms/collect_rings/config.mk +++ b/multi_boot/roms/collect_rings/config.mk @@ -3,6 +3,7 @@ # Default variables MIDI_COMMENTS := "arm" +PLATFORM ?= gba GAME_REVISION ?= 0 GAME_REGION ?= USA DEBUG ?= 0 diff --git a/multi_boot/roms/collect_rings/songs.mk b/multi_boot/roms/collect_rings/songs.mk index f736ac3a2b..2d09003d2a 100644 --- a/multi_boot/roms/collect_rings/songs.mk +++ b/multi_boot/roms/collect_rings/songs.mk @@ -2,7 +2,7 @@ STD_REVERB = 0 $(MID_BUILDDIR)/%.o: $(MID_SUBDIR)/%.s @echo "$(AS) -I sound -o $@ $<" - @$(PREPROC) $< "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - $(MID_SUBDIR)/mus_vs_2.s: %.s: %.mid $(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -V105 diff --git a/multi_boot/roms/subgame_loader/Makefile b/multi_boot/roms/subgame_loader/Makefile index efe7b00554..3ebaf8d28e 100644 --- a/multi_boot/roms/subgame_loader/Makefile +++ b/multi_boot/roms/subgame_loader/Makefile @@ -127,7 +127,7 @@ endif $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) @echo "$(AS) -o $@ $<" - @$(PREPROC) $< | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ ../../programs/subgame_loader/subgame_loader.bin: $(MAKE) -C ../../programs/subgame_loader diff --git a/multi_boot/roms/subgame_loader/config.mk b/multi_boot/roms/subgame_loader/config.mk index 046768e129..0b70920663 100644 --- a/multi_boot/roms/subgame_loader/config.mk +++ b/multi_boot/roms/subgame_loader/config.mk @@ -1,6 +1,7 @@ ### Build Configuration ### # Default variables +PLATFORM ?= gba GAME_REVISION ?= 0 GAME_REGION ?= USA DEBUG ?= 0 diff --git a/multi_boot/subgame_bootstrap/Makefile b/multi_boot/subgame_bootstrap/Makefile index d13cbee5cf..25fb5cd665 100644 --- a/multi_boot/subgame_bootstrap/Makefile +++ b/multi_boot/subgame_bootstrap/Makefile @@ -126,7 +126,7 @@ endif $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) @echo "$(AS) -o $@ $<" - @$(PREPROC) $< | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ ../roms/subgame_loader/subgame_loader.gba: $(MAKE) -C ../roms/subgame_loader diff --git a/multi_boot/subgame_bootstrap/config.mk b/multi_boot/subgame_bootstrap/config.mk index f224e2646b..d7d91eb2a0 100644 --- a/multi_boot/subgame_bootstrap/config.mk +++ b/multi_boot/subgame_bootstrap/config.mk @@ -1,6 +1,7 @@ ### Build Configuration ### # Default variables +PLATFORM ?= gba GAME_REVISION ?= 0 GAME_REGION ?= USA DEBUG ?= 0 diff --git a/songs.mk b/songs.mk index b85ad53740..e9be140966 100644 --- a/songs.mk +++ b/songs.mk @@ -2,7 +2,7 @@ STD_REVERB = 0 $(MID_BUILDDIR)/%.o: $(MID_SUBDIR)/%.s @echo "$(AS) -I sound -o $@ $<" - @$(PREPROC) $< "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - $(MID_SUBDIR)/mus_intro.s: %.s: %.mid $(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G21 -V120 diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 7cf13da059..35254e6c66 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -136,8 +136,8 @@ DirectSoundWaveData_30: .incbin "sound/direct_sound_samples/unknown_8B0C95C.bin" mAlignWord -DirectSoundWaveData_31: - .incbin "sound/direct_sound_samples/unknown_8B0F724_sa1_final_boss_choir.bin" +spectrasonics__symphony_of_voices__partition_d__big_chord__big_min__c4_r: + .incbin "sound/direct_sound_samples/spectrasonics__symphony_of_voices__partition_d__big_chord__big_min__c4_r.bin" mAlignWord DirectSoundWaveData_32: @ 0x8B109B8 diff --git a/sound/direct_sound_samples/unknown_8B0F724_sa1_final_boss_choir.aif b/sound/direct_sound_samples/spectrasonics__symphony_of_voices__partition_d__big_chord__big_min__c4_r.aif similarity index 100% rename from sound/direct_sound_samples/unknown_8B0F724_sa1_final_boss_choir.aif rename to sound/direct_sound_samples/spectrasonics__symphony_of_voices__partition_d__big_chord__big_min__c4_r.aif diff --git a/sound/voicegroups/voicegroup001.inc b/sound/voicegroups/voicegroup001.inc index e8d3790da6..010fb3fa95 100644 --- a/sound/voicegroups/voicegroup001.inc +++ b/sound/voicegroups/voicegroup001.inc @@ -56,7 +56,7 @@ mAlignWord mAlignWord voice_directsound 60, 0, DirectSoundWaveData_30, 255, 216, 25, 0 @08ACE4D8 mAlignWord - voice_directsound 60, 0, DirectSoundWaveData_31, 37, 0, 255, 149 @08ACE4E4 + voice_directsound 60, 0, spectrasonics__symphony_of_voices__partition_d__big_chord__big_min__c4_r, 37, 0, 255, 149 @08ACE4E4 mAlignWord voice_directsound 60, 0, DirectSoundWaveData_32, 255, 0, 255, 0 @08ACE4F0 mAlignWord diff --git a/sound/voicegroups/voicegroup007.inc b/sound/voicegroups/voicegroup007.inc index abb082f518..480a191854 100644 --- a/sound/voicegroups/voicegroup007.inc +++ b/sound/voicegroups/voicegroup007.inc @@ -240,7 +240,7 @@ mAlignWord mAlignWord voice_directsound 60, 0, DirectSoundWaveData_30, 255, 216, 25, 0 @08ACFA98 mAlignWord - voice_directsound 60, 0, DirectSoundWaveData_31, 37, 0, 255, 149 @08ACFAA4 + voice_directsound 60, 0, spectrasonics__symphony_of_voices__partition_d__big_chord__big_min__c4_r, 37, 0, 255, 149 @08ACFAA4 mAlignWord voice_directsound 60, 0, DirectSoundWaveData_32, 255, 0, 255, 0 @08ACFAB0 mAlignWord diff --git a/sound/voicegroups/voicegroup020.inc b/sound/voicegroups/voicegroup020.inc index a8a36e8944..cf7ce950e2 100644 --- a/sound/voicegroups/voicegroup020.inc +++ b/sound/voicegroups/voicegroup020.inc @@ -240,7 +240,7 @@ mAlignWord mAlignWord voice_directsound 60, 0, DirectSoundWaveData_30, 255, 216, 25, 0 @08AD3644 mAlignWord - voice_directsound 60, 0, DirectSoundWaveData_31, 37, 0, 255, 149 @08AD3650 + voice_directsound 60, 0, spectrasonics__symphony_of_voices__partition_d__big_chord__big_min__c4_r, 37, 0, 255, 149 @08AD3650 mAlignWord voice_directsound 60, 0, DirectSoundWaveData_32, 255, 0, 255, 0 @08AD365C mAlignWord diff --git a/src/background.c b/src/background.c index aad7732c58..19346ee390 100644 --- a/src/background.c +++ b/src/background.c @@ -34,7 +34,7 @@ const AnimationCommandFunc animCmdTable_BG[12] = { void DrawBackground(Background *background) { struct MapHeader *mapHeader = (struct MapHeader *)gTilemapsRef[background->tilemapId]; - const u16 *pal; + const ColorRaw *pal; u32 palSize; u16 gfxSize; diff --git a/src/bg_triangles.c b/src/bg_triangles.c index da911be69f..a6596401e4 100644 --- a/src/bg_triangles.c +++ b/src/bg_triangles.c @@ -664,18 +664,18 @@ void SA2_LABEL(sub_800724C)(u8 bg, TriParam1 *arg1) } } -void SA2_LABEL(sub_80075D0)(u8 bg, u8 param1, u8 param2, s16 param3, s16 param4, u16 param5) +void SA2_LABEL(sub_80075D0)(u8 bg, int_vcount param1, int_vcount param2, s16 param3, s16 param4, u16 param5) { int_vcount *cursor; s16 r1; - u16 sb = (param5 * param5); + u16 sb = SQUARE(param5); gFlags |= FLAGS_EXECUTE_HBLANK_COPY; if (bg >= 2) { gHBlankCopySize = sizeof(REG_WIN0H) * 2; - if (bg & 1) { + if (bg % 2u) { cursor = &((int_vcount *)gBgOffsetsHBlankPrimary)[2]; gHBlankCopyTarget = (void *)®_WIN0H; } else { @@ -709,7 +709,7 @@ void SA2_LABEL(sub_80075D0)(u8 bg, u8 param1, u8 param2, s16 param3, s16 param4, s16 num = param1 - param4; s16 sqrtRes; - num = num * num; + num = SQUARE(num); sqrtRes = Sqrt(sb - num); r1 = param3 + sqrtRes; diff --git a/src/core.c b/src/core.c index fcbe848506..af8406eca5 100644 --- a/src/core.c +++ b/src/core.c @@ -57,7 +57,7 @@ bool8 gMultiSioEnabled = FALSE; struct Task *gTaskPtrs[] ALIGNED(16) = {}; int_vcount gBgOffsetsBuffer[2][DISPLAY_HEIGHT][4] = {}; /* TODO: Find out how this is different from gBgOffsetsHBlankPrimary */ -u16 gObjPalette[] = {}; +ColorRaw gObjPalette[] = {}; Tilemap **gTilemapsRef = NULL; u32 gFrameCount = 0; winreg_t gWinRegs[6] ALIGNED(16) = {}; @@ -129,7 +129,7 @@ u16 gRgbMap[3][2 * 16] __attribute__((aligned(4))) = {}; #endif // (ENGINE == ENGINE_3) u8 gBackgroundsCopyQueueIndex = 0; -u16 gBgPalette[] ALIGNED(16) = {}; +ColorRaw gBgPalette[] ALIGNED(16) = {}; u8 gHBlankCopySize ALIGNED(4) = 0; diff --git a/src/data/palettes.c b/src/data/palettes.c deleted file mode 100644 index ad69d4ff8a..0000000000 --- a/src/data/palettes.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "global.h" -#include "data/palettes.h" - -// TODO: move to data and include as asm -const u16 gBgGradientPalette[] = INCBIN_U16("graphics/8C8796C.gbapal"); diff --git a/src/data/sprite_animation.c b/src/data/sprite_animation.c deleted file mode 100644 index 1556182c90..0000000000 --- a/src/data/sprite_animation.c +++ /dev/null @@ -1,741 +0,0 @@ -#include "global.h" - -#if 0 -u16 gSpritePalettes[][16] = { - INCBIN_U16("graphics/obj_palettes/pal_000.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_001.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_002.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_003.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_004.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_005.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_006.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_007.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_008.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_009.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_010.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_011.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_012.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_013.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_014.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_015.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_016.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_017.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_018.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_019.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_020.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_021.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_022.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_023.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_024.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_025.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_026.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_027.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_028.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_029.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_030.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_031.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_032.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_033.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_034.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_035.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_036.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_037.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_038.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_039.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_040.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_041.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_042.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_043.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_044.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_045.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_046.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_047.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_048.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_049.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_050.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_051.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_052.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_053.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_054.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_055.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_056.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_057.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_058.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_059.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_060.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_061.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_062.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_063.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_064.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_065.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_066.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_067.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_068.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_069.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_070.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_071.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_072.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_073.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_074.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_075.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_076.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_077.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_078.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_079.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_080.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_081.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_082.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_083.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_084.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_085.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_086.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_087.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_088.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_089.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_090.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_091.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_092.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_093.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_094.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_095.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_096.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_097.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_098.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_099.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_100.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_101.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_102.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_103.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_104.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_105.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_106.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_107.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_108.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_109.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_110.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_111.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_112.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_113.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_114.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_115.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_116.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_117.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_118.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_119.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_120.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_121.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_122.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_123.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_124.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_125.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_126.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_127.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_128.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_129.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_130.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_131.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_132.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_133.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_134.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_135.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_136.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_137.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_138.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_139.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_140.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_141.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_142.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_143.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_144.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_145.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_146.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_147.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_148.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_149.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_150.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_151.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_152.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_153.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_154.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_155.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_156.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_157.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_158.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_159.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_160.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_161.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_162.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_163.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_164.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_165.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_166.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_167.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_168.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_169.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_170.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_171.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_172.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_173.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_174.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_175.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_176.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_177.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_178.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_179.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_180.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_181.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_182.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_183.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_184.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_185.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_186.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_187.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_188.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_189.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_190.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_191.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_192.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_193.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_194.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_195.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_196.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_197.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_198.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_199.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_200.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_201.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_202.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_203.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_204.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_205.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_206.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_207.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_208.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_209.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_210.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_211.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_212.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_213.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_214.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_215.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_216.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_217.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_218.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_219.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_220.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_221.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_222.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_223.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_224.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_225.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_226.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_227.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_228.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_229.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_230.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_231.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_232.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_233.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_234.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_235.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_236.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_237.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_238.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_239.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_240.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_241.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_242.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_243.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_244.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_245.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_246.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_247.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_248.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_249.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_250.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_251.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_252.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_253.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_254.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_255.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_256.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_257.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_258.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_259.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_260.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_261.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_262.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_263.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_264.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_265.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_266.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_267.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_268.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_269.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_270.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_271.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_272.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_273.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_274.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_275.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_276.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_277.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_278.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_279.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_280.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_281.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_282.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_283.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_284.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_285.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_286.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_287.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_288.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_289.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_290.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_291.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_292.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_293.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_294.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_295.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_296.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_297.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_298.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_299.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_300.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_301.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_302.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_303.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_304.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_305.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_306.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_307.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_308.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_309.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_310.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_311.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_312.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_313.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_314.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_315.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_316.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_317.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_318.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_319.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_320.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_321.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_322.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_323.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_324.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_325.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_326.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_327.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_328.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_329.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_330.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_331.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_332.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_333.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_334.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_335.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_336.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_337.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_338.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_339.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_340.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_341.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_342.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_343.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_344.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_345.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_346.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_347.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_348.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_349.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_350.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_351.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_352.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_353.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_354.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_355.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_356.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_357.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_358.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_359.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_360.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_361.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_362.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_363.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_364.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_365.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_366.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_367.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_368.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_369.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_370.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_371.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_372.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_373.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_374.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_375.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_376.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_377.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_378.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_379.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_380.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_381.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_382.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_383.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_384.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_385.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_386.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_387.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_388.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_389.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_390.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_391.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_392.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_393.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_394.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_395.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_396.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_397.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_398.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_399.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_400.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_401.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_402.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_403.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_404.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_405.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_406.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_407.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_408.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_409.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_410.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_411.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_412.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_413.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_414.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_415.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_416.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_417.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_418.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_419.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_420.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_421.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_422.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_423.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_424.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_425.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_426.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_427.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_428.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_429.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_430.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_431.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_432.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_433.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_434.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_435.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_436.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_437.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_438.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_439.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_440.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_441.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_442.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_443.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_444.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_445.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_446.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_447.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_448.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_449.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_450.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_451.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_452.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_453.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_454.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_455.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_456.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_457.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_458.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_459.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_460.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_461.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_462.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_463.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_464.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_465.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_466.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_467.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_468.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_469.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_470.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_471.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_472.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_473.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_474.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_475.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_476.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_477.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_478.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_479.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_480.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_481.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_482.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_483.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_484.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_485.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_486.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_487.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_488.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_489.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_490.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_491.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_492.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_493.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_494.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_495.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_496.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_497.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_498.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_499.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_500.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_501.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_502.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_503.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_504.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_505.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_506.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_507.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_508.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_509.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_510.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_511.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_512.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_513.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_514.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_515.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_516.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_517.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_518.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_519.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_520.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_521.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_522.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_523.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_524.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_525.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_526.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_527.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_528.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_529.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_530.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_531.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_532.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_533.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_534.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_535.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_536.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_537.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_538.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_539.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_540.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_541.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_542.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_543.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_544.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_545.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_546.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_547.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_548.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_549.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_550.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_551.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_552.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_553.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_554.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_555.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_556.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_557.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_558.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_559.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_560.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_561.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_562.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_563.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_564.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_565.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_566.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_567.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_568.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_569.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_570.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_571.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_572.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_573.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_574.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_575.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_576.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_577.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_578.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_579.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_580.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_581.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_582.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_583.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_584.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_585.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_586.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_587.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_588.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_589.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_590.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_591.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_592.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_593.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_594.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_595.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_596.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_597.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_598.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_599.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_600.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_601.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_602.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_603.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_604.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_605.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_606.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_607.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_608.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_609.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_610.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_611.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_612.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_613.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_614.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_615.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_616.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_617.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_618.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_619.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_620.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_621.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_622.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_623.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_624.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_625.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_626.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_627.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_628.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_629.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_630.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_631.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_632.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_633.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_634.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_635.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_636.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_637.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_638.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_639.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_640.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_641.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_642.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_643.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_644.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_645.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_646.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_647.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_648.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_649.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_650.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_651.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_652.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_653.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_654.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_655.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_656.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_657.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_658.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_659.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_660.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_661.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_662.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_663.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_664.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_665.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_666.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_667.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_668.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_669.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_670.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_671.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_672.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_673.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_674.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_675.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_676.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_677.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_678.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_679.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_680.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_681.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_682.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_683.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_684.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_685.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_686.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_687.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_688.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_689.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_690.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_691.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_692.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_693.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_694.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_695.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_696.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_697.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_698.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_699.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_700.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_701.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_702.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_703.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_704.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_705.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_706.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_707.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_708.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_709.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_710.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_711.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_712.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_713.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_714.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_715.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_716.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_717.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_718.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_719.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_720.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_721.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_722.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_723.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_724.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_725.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_726.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_727.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_728.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_729.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_730.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_731.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_732.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_733.gbapal"), - INCBIN_U16("graphics/obj_palettes/pal_734.gbapal"), -}; -#endif diff --git a/src/data/sprite_palettes.c b/src/data/sprite_palettes.c new file mode 100644 index 0000000000..b01ec66d43 --- /dev/null +++ b/src/data/sprite_palettes.c @@ -0,0 +1,761 @@ +#include "global.h" +#include "core.h" // PALETTE_LEN_4BPP + +const ColorRaw gSpritePalettes[][PALETTE_LEN_4BPP] = { + INCPAL("graphics/obj_palettes/pal_000.pal"), + INCPAL("graphics/obj_palettes/pal_001.pal"), + INCPAL("graphics/obj_palettes/pal_002.pal"), + INCPAL("graphics/obj_palettes/pal_003.pal"), + INCPAL("graphics/obj_palettes/pal_004.pal"), + INCPAL("graphics/obj_palettes/pal_005.pal"), + INCPAL("graphics/obj_palettes/pal_006.pal"), + INCPAL("graphics/obj_palettes/pal_007.pal"), + INCPAL("graphics/obj_palettes/pal_008.pal"), + INCPAL("graphics/obj_palettes/pal_009.pal"), + INCPAL("graphics/obj_palettes/pal_010.pal"), + INCPAL("graphics/obj_palettes/pal_011.pal"), + INCPAL("graphics/obj_palettes/pal_012.pal"), + INCPAL("graphics/obj_palettes/pal_013.pal"), + INCPAL("graphics/obj_palettes/pal_014.pal"), + INCPAL("graphics/obj_palettes/pal_015.pal"), + INCPAL("graphics/obj_palettes/pal_016.pal"), + INCPAL("graphics/obj_palettes/pal_017.pal"), + INCPAL("graphics/obj_palettes/pal_018.pal"), + INCPAL("graphics/obj_palettes/pal_019.pal"), + INCPAL("graphics/obj_palettes/pal_020.pal"), + INCPAL("graphics/obj_palettes/pal_021.pal"), + INCPAL("graphics/obj_palettes/pal_022.pal"), + INCPAL("graphics/obj_palettes/pal_023.pal"), + INCPAL("graphics/obj_palettes/pal_024.pal"), + INCPAL("graphics/obj_palettes/pal_025.pal"), + INCPAL("graphics/obj_palettes/pal_026.pal"), + INCPAL("graphics/obj_palettes/pal_027.pal"), + INCPAL("graphics/obj_palettes/pal_028.pal"), + INCPAL("graphics/obj_palettes/pal_029.pal"), + INCPAL("graphics/obj_palettes/pal_030.pal"), + INCPAL("graphics/obj_palettes/pal_031.pal"), + INCPAL("graphics/obj_palettes/pal_032.pal"), + INCPAL("graphics/obj_palettes/pal_033.pal"), + INCPAL("graphics/obj_palettes/pal_034.pal"), + INCPAL("graphics/obj_palettes/pal_035.pal"), + INCPAL("graphics/obj_palettes/pal_036.pal"), + INCPAL("graphics/obj_palettes/pal_037.pal"), + INCPAL("graphics/obj_palettes/pal_038.pal"), + INCPAL("graphics/obj_palettes/pal_039.pal"), + INCPAL("graphics/obj_palettes/pal_040.pal"), + INCPAL("graphics/obj_palettes/pal_041.pal"), + INCPAL("graphics/obj_palettes/pal_042.pal"), + INCPAL("graphics/obj_palettes/pal_043.pal"), + INCPAL("graphics/obj_palettes/pal_044.pal"), + INCPAL("graphics/obj_palettes/pal_045.pal"), + INCPAL("graphics/obj_palettes/pal_046.pal"), + INCPAL("graphics/obj_palettes/pal_047.pal"), + INCPAL("graphics/obj_palettes/pal_048.pal"), + INCPAL("graphics/obj_palettes/pal_049.pal"), + INCPAL("graphics/obj_palettes/pal_050.pal"), + INCPAL("graphics/obj_palettes/pal_051.pal"), + INCPAL("graphics/obj_palettes/pal_052.pal"), + INCPAL("graphics/obj_palettes/pal_053.pal"), + INCPAL("graphics/obj_palettes/pal_054.pal"), + INCPAL("graphics/obj_palettes/pal_055.pal"), + INCPAL("graphics/obj_palettes/pal_056.pal"), + INCPAL("graphics/obj_palettes/pal_057.pal"), + INCPAL("graphics/obj_palettes/pal_058.pal"), + INCPAL("graphics/obj_palettes/pal_059.pal"), + INCPAL("graphics/obj_palettes/pal_060.pal"), + INCPAL("graphics/obj_palettes/pal_061.pal"), + INCPAL("graphics/obj_palettes/pal_062.pal"), + INCPAL("graphics/obj_palettes/pal_063.pal"), + INCPAL("graphics/obj_palettes/pal_064.pal"), + INCPAL("graphics/obj_palettes/pal_065.pal"), + INCPAL("graphics/obj_palettes/pal_066.pal"), + INCPAL("graphics/obj_palettes/pal_067.pal"), + INCPAL("graphics/obj_palettes/pal_068.pal"), + INCPAL("graphics/obj_palettes/pal_069.pal"), + INCPAL("graphics/obj_palettes/pal_070.pal"), + INCPAL("graphics/obj_palettes/pal_071.pal"), + INCPAL("graphics/obj_palettes/pal_072.pal"), + INCPAL("graphics/obj_palettes/pal_073.pal"), + INCPAL("graphics/obj_palettes/pal_074.pal"), + INCPAL("graphics/obj_palettes/pal_075.pal"), + INCPAL("graphics/obj_palettes/pal_076.pal"), + INCPAL("graphics/obj_palettes/pal_077.pal"), + INCPAL("graphics/obj_palettes/pal_078.pal"), + INCPAL("graphics/obj_palettes/pal_079.pal"), + INCPAL("graphics/obj_palettes/pal_080.pal"), + INCPAL("graphics/obj_palettes/pal_081.pal"), + INCPAL("graphics/obj_palettes/pal_082.pal"), + INCPAL("graphics/obj_palettes/pal_083.pal"), + INCPAL("graphics/obj_palettes/pal_084.pal"), + INCPAL("graphics/obj_palettes/pal_085.pal"), + INCPAL("graphics/obj_palettes/pal_086.pal"), + INCPAL("graphics/obj_palettes/pal_087.pal"), + INCPAL("graphics/obj_palettes/pal_088.pal"), + INCPAL("graphics/obj_palettes/pal_089.pal"), + INCPAL("graphics/obj_palettes/pal_090.pal"), + INCPAL("graphics/obj_palettes/pal_091.pal"), + INCPAL("graphics/obj_palettes/pal_092.pal"), + INCPAL("graphics/obj_palettes/pal_093.pal"), + INCPAL("graphics/obj_palettes/pal_094.pal"), + INCPAL("graphics/obj_palettes/pal_095.pal"), + INCPAL("graphics/obj_palettes/pal_096.pal"), + INCPAL("graphics/obj_palettes/pal_097.pal"), + INCPAL("graphics/obj_palettes/pal_098.pal"), + INCPAL("graphics/obj_palettes/pal_099.pal"), + INCPAL("graphics/obj_palettes/pal_100.pal"), + INCPAL("graphics/obj_palettes/pal_101.pal"), + INCPAL("graphics/obj_palettes/pal_102.pal"), + INCPAL("graphics/obj_palettes/pal_103.pal"), + INCPAL("graphics/obj_palettes/pal_104.pal"), + INCPAL("graphics/obj_palettes/pal_105.pal"), + INCPAL("graphics/obj_palettes/pal_106.pal"), + INCPAL("graphics/obj_palettes/pal_107.pal"), + INCPAL("graphics/obj_palettes/pal_108.pal"), + INCPAL("graphics/obj_palettes/pal_109.pal"), + INCPAL("graphics/obj_palettes/pal_110.pal"), + INCPAL("graphics/obj_palettes/pal_111.pal"), + INCPAL("graphics/obj_palettes/pal_112.pal"), + INCPAL("graphics/obj_palettes/pal_113.pal"), + INCPAL("graphics/obj_palettes/pal_114.pal"), + INCPAL("graphics/obj_palettes/pal_115.pal"), + INCPAL("graphics/obj_palettes/pal_116.pal"), + INCPAL("graphics/obj_palettes/pal_117.pal"), + INCPAL("graphics/obj_palettes/pal_118.pal"), + INCPAL("graphics/obj_palettes/pal_119.pal"), + INCPAL("graphics/obj_palettes/pal_120.pal"), + INCPAL("graphics/obj_palettes/pal_121.pal"), + INCPAL("graphics/obj_palettes/pal_122.pal"), + INCPAL("graphics/obj_palettes/pal_123.pal"), + INCPAL("graphics/obj_palettes/pal_124.pal"), + INCPAL("graphics/obj_palettes/pal_125.pal"), + INCPAL("graphics/obj_palettes/pal_126.pal"), + INCPAL("graphics/obj_palettes/pal_127.pal"), + INCPAL("graphics/obj_palettes/pal_128.pal"), + INCPAL("graphics/obj_palettes/pal_129.pal"), + INCPAL("graphics/obj_palettes/pal_130.pal"), + INCPAL("graphics/obj_palettes/pal_131.pal"), + INCPAL("graphics/obj_palettes/pal_132.pal"), + INCPAL("graphics/obj_palettes/pal_133.pal"), + INCPAL("graphics/obj_palettes/pal_134.pal"), + INCPAL("graphics/obj_palettes/pal_135.pal"), + INCPAL("graphics/obj_palettes/pal_136.pal"), + INCPAL("graphics/obj_palettes/pal_137.pal"), + INCPAL("graphics/obj_palettes/pal_138.pal"), + INCPAL("graphics/obj_palettes/pal_139.pal"), + INCPAL("graphics/obj_palettes/pal_140.pal"), + INCPAL("graphics/obj_palettes/pal_141.pal"), + INCPAL("graphics/obj_palettes/pal_142.pal"), + INCPAL("graphics/obj_palettes/pal_143.pal"), + INCPAL("graphics/obj_palettes/pal_144.pal"), + INCPAL("graphics/obj_palettes/pal_145.pal"), + INCPAL("graphics/obj_palettes/pal_146.pal"), + INCPAL("graphics/obj_palettes/pal_147.pal"), + INCPAL("graphics/obj_palettes/pal_148.pal"), + INCPAL("graphics/obj_palettes/pal_149.pal"), + INCPAL("graphics/obj_palettes/pal_150.pal"), + INCPAL("graphics/obj_palettes/pal_151.pal"), + INCPAL("graphics/obj_palettes/pal_152.pal"), + INCPAL("graphics/obj_palettes/pal_153.pal"), + INCPAL("graphics/obj_palettes/pal_154.pal"), + INCPAL("graphics/obj_palettes/pal_155.pal"), + INCPAL("graphics/obj_palettes/pal_156.pal"), + INCPAL("graphics/obj_palettes/pal_157.pal"), + INCPAL("graphics/obj_palettes/pal_158.pal"), + INCPAL("graphics/obj_palettes/pal_159.pal"), + INCPAL("graphics/obj_palettes/pal_160.pal"), + INCPAL("graphics/obj_palettes/pal_161.pal"), + INCPAL("graphics/obj_palettes/pal_162.pal"), + INCPAL("graphics/obj_palettes/pal_163.pal"), + INCPAL("graphics/obj_palettes/pal_164.pal"), + INCPAL("graphics/obj_palettes/pal_165.pal"), + INCPAL("graphics/obj_palettes/pal_166.pal"), + INCPAL("graphics/obj_palettes/pal_167.pal"), + INCPAL("graphics/obj_palettes/pal_168.pal"), + INCPAL("graphics/obj_palettes/pal_169.pal"), + INCPAL("graphics/obj_palettes/pal_170.pal"), + INCPAL("graphics/obj_palettes/pal_171.pal"), + INCPAL("graphics/obj_palettes/pal_172.pal"), + INCPAL("graphics/obj_palettes/pal_173.pal"), + INCPAL("graphics/obj_palettes/pal_174.pal"), + INCPAL("graphics/obj_palettes/pal_175.pal"), + INCPAL("graphics/obj_palettes/pal_176.pal"), + INCPAL("graphics/obj_palettes/pal_177.pal"), + INCPAL("graphics/obj_palettes/pal_178.pal"), + INCPAL("graphics/obj_palettes/pal_179.pal"), + INCPAL("graphics/obj_palettes/pal_180.pal"), + INCPAL("graphics/obj_palettes/pal_181.pal"), + INCPAL("graphics/obj_palettes/pal_182.pal"), + INCPAL("graphics/obj_palettes/pal_183.pal"), + INCPAL("graphics/obj_palettes/pal_184.pal"), + INCPAL("graphics/obj_palettes/pal_185.pal"), + INCPAL("graphics/obj_palettes/pal_186.pal"), + INCPAL("graphics/obj_palettes/pal_187.pal"), + INCPAL("graphics/obj_palettes/pal_188.pal"), + INCPAL("graphics/obj_palettes/pal_189.pal"), + INCPAL("graphics/obj_palettes/pal_190.pal"), + INCPAL("graphics/obj_palettes/pal_191.pal"), + INCPAL("graphics/obj_palettes/pal_192.pal"), + INCPAL("graphics/obj_palettes/pal_193.pal"), + INCPAL("graphics/obj_palettes/pal_194.pal"), + INCPAL("graphics/obj_palettes/pal_195.pal"), + INCPAL("graphics/obj_palettes/pal_196.pal"), + INCPAL("graphics/obj_palettes/pal_197.pal"), + INCPAL("graphics/obj_palettes/pal_198.pal"), + INCPAL("graphics/obj_palettes/pal_199.pal"), + INCPAL("graphics/obj_palettes/pal_200.pal"), + INCPAL("graphics/obj_palettes/pal_201.pal"), + INCPAL("graphics/obj_palettes/pal_202.pal"), + INCPAL("graphics/obj_palettes/pal_203.pal"), + INCPAL("graphics/obj_palettes/pal_204.pal"), + INCPAL("graphics/obj_palettes/pal_205.pal"), + INCPAL("graphics/obj_palettes/pal_206.pal"), + INCPAL("graphics/obj_palettes/pal_207.pal"), + INCPAL("graphics/obj_palettes/pal_208.pal"), + INCPAL("graphics/obj_palettes/pal_209.pal"), + INCPAL("graphics/obj_palettes/pal_210.pal"), + INCPAL("graphics/obj_palettes/pal_211.pal"), + INCPAL("graphics/obj_palettes/pal_212.pal"), + INCPAL("graphics/obj_palettes/pal_213.pal"), + INCPAL("graphics/obj_palettes/pal_214.pal"), + INCPAL("graphics/obj_palettes/pal_215.pal"), + INCPAL("graphics/obj_palettes/pal_216.pal"), + INCPAL("graphics/obj_palettes/pal_217.pal"), + INCPAL("graphics/obj_palettes/pal_218.pal"), + INCPAL("graphics/obj_palettes/pal_219.pal"), + INCPAL("graphics/obj_palettes/pal_220.pal"), + INCPAL("graphics/obj_palettes/pal_221.pal"), + INCPAL("graphics/obj_palettes/pal_222.pal"), + INCPAL("graphics/obj_palettes/pal_223.pal"), + INCPAL("graphics/obj_palettes/pal_224.pal"), + INCPAL("graphics/obj_palettes/pal_225.pal"), + INCPAL("graphics/obj_palettes/pal_226.pal"), + INCPAL("graphics/obj_palettes/pal_227.pal"), + INCPAL("graphics/obj_palettes/pal_228.pal"), + INCPAL("graphics/obj_palettes/pal_229.pal"), + INCPAL("graphics/obj_palettes/pal_230.pal"), + INCPAL("graphics/obj_palettes/pal_231.pal"), + INCPAL("graphics/obj_palettes/pal_232.pal"), + INCPAL("graphics/obj_palettes/pal_233.pal"), + INCPAL("graphics/obj_palettes/pal_234.pal"), + INCPAL("graphics/obj_palettes/pal_235.pal"), + INCPAL("graphics/obj_palettes/pal_236.pal"), + INCPAL("graphics/obj_palettes/pal_237.pal"), + INCPAL("graphics/obj_palettes/pal_238.pal"), + INCPAL("graphics/obj_palettes/pal_239.pal"), + INCPAL("graphics/obj_palettes/pal_240.pal"), + INCPAL("graphics/obj_palettes/pal_241.pal"), + INCPAL("graphics/obj_palettes/pal_242.pal"), + INCPAL("graphics/obj_palettes/pal_243.pal"), + INCPAL("graphics/obj_palettes/pal_244.pal"), + INCPAL("graphics/obj_palettes/pal_245.pal"), + INCPAL("graphics/obj_palettes/pal_246.pal"), + INCPAL("graphics/obj_palettes/pal_247.pal"), + INCPAL("graphics/obj_palettes/pal_248.pal"), + INCPAL("graphics/obj_palettes/pal_249.pal"), + INCPAL("graphics/obj_palettes/pal_250.pal"), + INCPAL("graphics/obj_palettes/pal_251.pal"), + INCPAL("graphics/obj_palettes/pal_252.pal"), + INCPAL("graphics/obj_palettes/pal_253.pal"), + INCPAL("graphics/obj_palettes/pal_254.pal"), + INCPAL("graphics/obj_palettes/pal_255.pal"), + INCPAL("graphics/obj_palettes/pal_256.pal"), + INCPAL("graphics/obj_palettes/pal_257.pal"), + INCPAL("graphics/obj_palettes/pal_258.pal"), + INCPAL("graphics/obj_palettes/pal_259.pal"), + INCPAL("graphics/obj_palettes/pal_260.pal"), + INCPAL("graphics/obj_palettes/pal_261.pal"), + INCPAL("graphics/obj_palettes/pal_262.pal"), + INCPAL("graphics/obj_palettes/pal_263.pal"), + INCPAL("graphics/obj_palettes/pal_264.pal"), + INCPAL("graphics/obj_palettes/pal_265.pal"), + INCPAL("graphics/obj_palettes/pal_266.pal"), + INCPAL("graphics/obj_palettes/pal_267.pal"), + INCPAL("graphics/obj_palettes/pal_268.pal"), + INCPAL("graphics/obj_palettes/pal_269.pal"), + INCPAL("graphics/obj_palettes/pal_270.pal"), + INCPAL("graphics/obj_palettes/pal_271.pal"), + INCPAL("graphics/obj_palettes/pal_272.pal"), + INCPAL("graphics/obj_palettes/pal_273.pal"), + INCPAL("graphics/obj_palettes/pal_274.pal"), + INCPAL("graphics/obj_palettes/pal_275.pal"), + INCPAL("graphics/obj_palettes/pal_276.pal"), + INCPAL("graphics/obj_palettes/pal_277.pal"), + INCPAL("graphics/obj_palettes/pal_278.pal"), + INCPAL("graphics/obj_palettes/pal_279.pal"), + INCPAL("graphics/obj_palettes/pal_280.pal"), + INCPAL("graphics/obj_palettes/pal_281.pal"), + INCPAL("graphics/obj_palettes/pal_282.pal"), + INCPAL("graphics/obj_palettes/pal_283.pal"), + INCPAL("graphics/obj_palettes/pal_284.pal"), + INCPAL("graphics/obj_palettes/pal_285.pal"), +#ifdef VIRTUAL_CONSOLE + INCPAL("graphics/obj_palettes/pal_286_vc.pal"), + INCPAL("graphics/obj_palettes/pal_287_vc.pal"), + INCPAL("graphics/obj_palettes/pal_288_vc.pal"), + INCPAL("graphics/obj_palettes/pal_289_vc.pal"), + INCPAL("graphics/obj_palettes/pal_290_vc.pal"), + INCPAL("graphics/obj_palettes/pal_291_vc.pal"), + INCPAL("graphics/obj_palettes/pal_292_vc.pal"), + INCPAL("graphics/obj_palettes/pal_293_vc.pal"), + INCPAL("graphics/obj_palettes/pal_294_vc.pal"), +#else + INCPAL("graphics/obj_palettes/pal_286.pal"), + INCPAL("graphics/obj_palettes/pal_287.pal"), + INCPAL("graphics/obj_palettes/pal_288.pal"), + INCPAL("graphics/obj_palettes/pal_289.pal"), + INCPAL("graphics/obj_palettes/pal_290.pal"), + INCPAL("graphics/obj_palettes/pal_291.pal"), + INCPAL("graphics/obj_palettes/pal_292.pal"), + INCPAL("graphics/obj_palettes/pal_293.pal"), + INCPAL("graphics/obj_palettes/pal_294.pal"), +#endif + INCPAL("graphics/obj_palettes/pal_295.pal"), + INCPAL("graphics/obj_palettes/pal_296.pal"), + INCPAL("graphics/obj_palettes/pal_297.pal"), + INCPAL("graphics/obj_palettes/pal_298.pal"), + INCPAL("graphics/obj_palettes/pal_299.pal"), + INCPAL("graphics/obj_palettes/pal_300.pal"), + INCPAL("graphics/obj_palettes/pal_301.pal"), + INCPAL("graphics/obj_palettes/pal_302.pal"), + INCPAL("graphics/obj_palettes/pal_303.pal"), + INCPAL("graphics/obj_palettes/pal_304.pal"), + INCPAL("graphics/obj_palettes/pal_305.pal"), + INCPAL("graphics/obj_palettes/pal_306.pal"), + INCPAL("graphics/obj_palettes/pal_307.pal"), + INCPAL("graphics/obj_palettes/pal_308.pal"), + INCPAL("graphics/obj_palettes/pal_309.pal"), + INCPAL("graphics/obj_palettes/pal_310.pal"), + INCPAL("graphics/obj_palettes/pal_311.pal"), + INCPAL("graphics/obj_palettes/pal_312.pal"), + INCPAL("graphics/obj_palettes/pal_313.pal"), + INCPAL("graphics/obj_palettes/pal_314.pal"), + INCPAL("graphics/obj_palettes/pal_315.pal"), + INCPAL("graphics/obj_palettes/pal_316.pal"), + INCPAL("graphics/obj_palettes/pal_317.pal"), + INCPAL("graphics/obj_palettes/pal_318.pal"), + INCPAL("graphics/obj_palettes/pal_319.pal"), + INCPAL("graphics/obj_palettes/pal_320.pal"), + INCPAL("graphics/obj_palettes/pal_321.pal"), + INCPAL("graphics/obj_palettes/pal_322.pal"), + INCPAL("graphics/obj_palettes/pal_323.pal"), + INCPAL("graphics/obj_palettes/pal_324.pal"), + INCPAL("graphics/obj_palettes/pal_325.pal"), + INCPAL("graphics/obj_palettes/pal_326.pal"), + INCPAL("graphics/obj_palettes/pal_327.pal"), + INCPAL("graphics/obj_palettes/pal_328.pal"), + INCPAL("graphics/obj_palettes/pal_329.pal"), + INCPAL("graphics/obj_palettes/pal_330.pal"), + INCPAL("graphics/obj_palettes/pal_331.pal"), + INCPAL("graphics/obj_palettes/pal_332.pal"), + INCPAL("graphics/obj_palettes/pal_333.pal"), + INCPAL("graphics/obj_palettes/pal_334.pal"), + INCPAL("graphics/obj_palettes/pal_335.pal"), + INCPAL("graphics/obj_palettes/pal_336.pal"), + INCPAL("graphics/obj_palettes/pal_337.pal"), + INCPAL("graphics/obj_palettes/pal_338.pal"), + INCPAL("graphics/obj_palettes/pal_339.pal"), + INCPAL("graphics/obj_palettes/pal_340.pal"), + INCPAL("graphics/obj_palettes/pal_341.pal"), + INCPAL("graphics/obj_palettes/pal_342.pal"), + INCPAL("graphics/obj_palettes/pal_343.pal"), + INCPAL("graphics/obj_palettes/pal_344.pal"), + INCPAL("graphics/obj_palettes/pal_345.pal"), + INCPAL("graphics/obj_palettes/pal_346.pal"), + INCPAL("graphics/obj_palettes/pal_347.pal"), + INCPAL("graphics/obj_palettes/pal_348.pal"), + INCPAL("graphics/obj_palettes/pal_349.pal"), + INCPAL("graphics/obj_palettes/pal_350.pal"), + INCPAL("graphics/obj_palettes/pal_351.pal"), + INCPAL("graphics/obj_palettes/pal_352.pal"), + INCPAL("graphics/obj_palettes/pal_353.pal"), + INCPAL("graphics/obj_palettes/pal_354.pal"), + INCPAL("graphics/obj_palettes/pal_355.pal"), + INCPAL("graphics/obj_palettes/pal_356.pal"), + INCPAL("graphics/obj_palettes/pal_357.pal"), + INCPAL("graphics/obj_palettes/pal_358.pal"), + INCPAL("graphics/obj_palettes/pal_359.pal"), + INCPAL("graphics/obj_palettes/pal_360.pal"), + INCPAL("graphics/obj_palettes/pal_361.pal"), + INCPAL("graphics/obj_palettes/pal_362.pal"), + INCPAL("graphics/obj_palettes/pal_363.pal"), + INCPAL("graphics/obj_palettes/pal_364.pal"), + INCPAL("graphics/obj_palettes/pal_365.pal"), + INCPAL("graphics/obj_palettes/pal_366.pal"), + INCPAL("graphics/obj_palettes/pal_367.pal"), + INCPAL("graphics/obj_palettes/pal_368.pal"), + INCPAL("graphics/obj_palettes/pal_369.pal"), + INCPAL("graphics/obj_palettes/pal_370.pal"), + INCPAL("graphics/obj_palettes/pal_371.pal"), + INCPAL("graphics/obj_palettes/pal_372.pal"), + INCPAL("graphics/obj_palettes/pal_373.pal"), + INCPAL("graphics/obj_palettes/pal_374.pal"), + INCPAL("graphics/obj_palettes/pal_375.pal"), + INCPAL("graphics/obj_palettes/pal_376.pal"), + INCPAL("graphics/obj_palettes/pal_377.pal"), + INCPAL("graphics/obj_palettes/pal_378.pal"), + INCPAL("graphics/obj_palettes/pal_379.pal"), + INCPAL("graphics/obj_palettes/pal_380.pal"), + INCPAL("graphics/obj_palettes/pal_381.pal"), + INCPAL("graphics/obj_palettes/pal_382.pal"), + INCPAL("graphics/obj_palettes/pal_383.pal"), + INCPAL("graphics/obj_palettes/pal_384.pal"), + INCPAL("graphics/obj_palettes/pal_385.pal"), + INCPAL("graphics/obj_palettes/pal_386.pal"), + INCPAL("graphics/obj_palettes/pal_387.pal"), + INCPAL("graphics/obj_palettes/pal_388.pal"), + INCPAL("graphics/obj_palettes/pal_389.pal"), + INCPAL("graphics/obj_palettes/pal_390.pal"), + INCPAL("graphics/obj_palettes/pal_391.pal"), + INCPAL("graphics/obj_palettes/pal_392.pal"), + INCPAL("graphics/obj_palettes/pal_393.pal"), + INCPAL("graphics/obj_palettes/pal_394.pal"), + INCPAL("graphics/obj_palettes/pal_395.pal"), + INCPAL("graphics/obj_palettes/pal_396.pal"), + INCPAL("graphics/obj_palettes/pal_397.pal"), + INCPAL("graphics/obj_palettes/pal_398.pal"), + INCPAL("graphics/obj_palettes/pal_399.pal"), + INCPAL("graphics/obj_palettes/pal_400.pal"), + INCPAL("graphics/obj_palettes/pal_401.pal"), + INCPAL("graphics/obj_palettes/pal_402.pal"), + INCPAL("graphics/obj_palettes/pal_403.pal"), + INCPAL("graphics/obj_palettes/pal_404.pal"), + INCPAL("graphics/obj_palettes/pal_405.pal"), + INCPAL("graphics/obj_palettes/pal_406.pal"), + INCPAL("graphics/obj_palettes/pal_407.pal"), + INCPAL("graphics/obj_palettes/pal_408.pal"), + INCPAL("graphics/obj_palettes/pal_409.pal"), + INCPAL("graphics/obj_palettes/pal_410.pal"), + INCPAL("graphics/obj_palettes/pal_411.pal"), + INCPAL("graphics/obj_palettes/pal_412.pal"), + INCPAL("graphics/obj_palettes/pal_413.pal"), + INCPAL("graphics/obj_palettes/pal_414.pal"), + INCPAL("graphics/obj_palettes/pal_415.pal"), + INCPAL("graphics/obj_palettes/pal_416.pal"), + INCPAL("graphics/obj_palettes/pal_417.pal"), + INCPAL("graphics/obj_palettes/pal_418.pal"), + INCPAL("graphics/obj_palettes/pal_419.pal"), + INCPAL("graphics/obj_palettes/pal_420.pal"), + INCPAL("graphics/obj_palettes/pal_421.pal"), + INCPAL("graphics/obj_palettes/pal_422.pal"), + INCPAL("graphics/obj_palettes/pal_423.pal"), + INCPAL("graphics/obj_palettes/pal_424.pal"), + INCPAL("graphics/obj_palettes/pal_425.pal"), + INCPAL("graphics/obj_palettes/pal_426.pal"), + INCPAL("graphics/obj_palettes/pal_427.pal"), + INCPAL("graphics/obj_palettes/pal_428.pal"), + INCPAL("graphics/obj_palettes/pal_429.pal"), + INCPAL("graphics/obj_palettes/pal_430.pal"), + INCPAL("graphics/obj_palettes/pal_431.pal"), + INCPAL("graphics/obj_palettes/pal_432.pal"), + INCPAL("graphics/obj_palettes/pal_433.pal"), + INCPAL("graphics/obj_palettes/pal_434.pal"), + INCPAL("graphics/obj_palettes/pal_435.pal"), + INCPAL("graphics/obj_palettes/pal_436.pal"), + INCPAL("graphics/obj_palettes/pal_437.pal"), + INCPAL("graphics/obj_palettes/pal_438.pal"), + INCPAL("graphics/obj_palettes/pal_439.pal"), + INCPAL("graphics/obj_palettes/pal_440.pal"), + INCPAL("graphics/obj_palettes/pal_441.pal"), + INCPAL("graphics/obj_palettes/pal_442.pal"), + INCPAL("graphics/obj_palettes/pal_443.pal"), + INCPAL("graphics/obj_palettes/pal_444.pal"), + INCPAL("graphics/obj_palettes/pal_445.pal"), + INCPAL("graphics/obj_palettes/pal_446.pal"), + INCPAL("graphics/obj_palettes/pal_447.pal"), + INCPAL("graphics/obj_palettes/pal_448.pal"), + INCPAL("graphics/obj_palettes/pal_449.pal"), + INCPAL("graphics/obj_palettes/pal_450.pal"), + INCPAL("graphics/obj_palettes/pal_451.pal"), + INCPAL("graphics/obj_palettes/pal_452.pal"), + INCPAL("graphics/obj_palettes/pal_453.pal"), + INCPAL("graphics/obj_palettes/pal_454.pal"), + INCPAL("graphics/obj_palettes/pal_455.pal"), + INCPAL("graphics/obj_palettes/pal_456.pal"), + INCPAL("graphics/obj_palettes/pal_457.pal"), + INCPAL("graphics/obj_palettes/pal_458.pal"), + INCPAL("graphics/obj_palettes/pal_459.pal"), + INCPAL("graphics/obj_palettes/pal_460.pal"), + INCPAL("graphics/obj_palettes/pal_461.pal"), + INCPAL("graphics/obj_palettes/pal_462.pal"), + INCPAL("graphics/obj_palettes/pal_463.pal"), + INCPAL("graphics/obj_palettes/pal_464.pal"), + INCPAL("graphics/obj_palettes/pal_465.pal"), + INCPAL("graphics/obj_palettes/pal_466.pal"), + INCPAL("graphics/obj_palettes/pal_467.pal"), + INCPAL("graphics/obj_palettes/pal_468.pal"), + INCPAL("graphics/obj_palettes/pal_469.pal"), + INCPAL("graphics/obj_palettes/pal_470.pal"), + INCPAL("graphics/obj_palettes/pal_471.pal"), + INCPAL("graphics/obj_palettes/pal_472.pal"), + INCPAL("graphics/obj_palettes/pal_473.pal"), + INCPAL("graphics/obj_palettes/pal_474.pal"), + INCPAL("graphics/obj_palettes/pal_475.pal"), + INCPAL("graphics/obj_palettes/pal_476.pal"), + INCPAL("graphics/obj_palettes/pal_477.pal"), + INCPAL("graphics/obj_palettes/pal_478.pal"), + INCPAL("graphics/obj_palettes/pal_479.pal"), + INCPAL("graphics/obj_palettes/pal_480.pal"), + INCPAL("graphics/obj_palettes/pal_481.pal"), + INCPAL("graphics/obj_palettes/pal_482.pal"), + INCPAL("graphics/obj_palettes/pal_483.pal"), + INCPAL("graphics/obj_palettes/pal_484.pal"), + INCPAL("graphics/obj_palettes/pal_485.pal"), + INCPAL("graphics/obj_palettes/pal_486.pal"), + INCPAL("graphics/obj_palettes/pal_487.pal"), + INCPAL("graphics/obj_palettes/pal_488.pal"), + INCPAL("graphics/obj_palettes/pal_489.pal"), + INCPAL("graphics/obj_palettes/pal_490.pal"), + INCPAL("graphics/obj_palettes/pal_491.pal"), + INCPAL("graphics/obj_palettes/pal_492.pal"), + INCPAL("graphics/obj_palettes/pal_493.pal"), + INCPAL("graphics/obj_palettes/pal_494.pal"), + INCPAL("graphics/obj_palettes/pal_495.pal"), + INCPAL("graphics/obj_palettes/pal_496.pal"), + INCPAL("graphics/obj_palettes/pal_497.pal"), + INCPAL("graphics/obj_palettes/pal_498.pal"), + INCPAL("graphics/obj_palettes/pal_499.pal"), + INCPAL("graphics/obj_palettes/pal_500.pal"), + INCPAL("graphics/obj_palettes/pal_501.pal"), + INCPAL("graphics/obj_palettes/pal_502.pal"), + INCPAL("graphics/obj_palettes/pal_503.pal"), + INCPAL("graphics/obj_palettes/pal_504.pal"), + INCPAL("graphics/obj_palettes/pal_505.pal"), + INCPAL("graphics/obj_palettes/pal_506.pal"), + INCPAL("graphics/obj_palettes/pal_507.pal"), + INCPAL("graphics/obj_palettes/pal_508.pal"), + INCPAL("graphics/obj_palettes/pal_509.pal"), + INCPAL("graphics/obj_palettes/pal_510.pal"), + INCPAL("graphics/obj_palettes/pal_511.pal"), + INCPAL("graphics/obj_palettes/pal_512.pal"), + INCPAL("graphics/obj_palettes/pal_513.pal"), + INCPAL("graphics/obj_palettes/pal_514.pal"), + INCPAL("graphics/obj_palettes/pal_515.pal"), + INCPAL("graphics/obj_palettes/pal_516.pal"), + INCPAL("graphics/obj_palettes/pal_517.pal"), + INCPAL("graphics/obj_palettes/pal_518.pal"), + INCPAL("graphics/obj_palettes/pal_519.pal"), + INCPAL("graphics/obj_palettes/pal_520.pal"), + INCPAL("graphics/obj_palettes/pal_521.pal"), + INCPAL("graphics/obj_palettes/pal_522.pal"), + INCPAL("graphics/obj_palettes/pal_523.pal"), + INCPAL("graphics/obj_palettes/pal_524.pal"), + INCPAL("graphics/obj_palettes/pal_525.pal"), + INCPAL("graphics/obj_palettes/pal_526.pal"), + INCPAL("graphics/obj_palettes/pal_527.pal"), + INCPAL("graphics/obj_palettes/pal_528.pal"), + INCPAL("graphics/obj_palettes/pal_529.pal"), + INCPAL("graphics/obj_palettes/pal_530.pal"), + INCPAL("graphics/obj_palettes/pal_531.pal"), + INCPAL("graphics/obj_palettes/pal_532.pal"), + INCPAL("graphics/obj_palettes/pal_533.pal"), + INCPAL("graphics/obj_palettes/pal_534.pal"), + INCPAL("graphics/obj_palettes/pal_535.pal"), + INCPAL("graphics/obj_palettes/pal_536.pal"), + INCPAL("graphics/obj_palettes/pal_537.pal"), + INCPAL("graphics/obj_palettes/pal_538.pal"), + INCPAL("graphics/obj_palettes/pal_539.pal"), + INCPAL("graphics/obj_palettes/pal_540.pal"), + INCPAL("graphics/obj_palettes/pal_541.pal"), + INCPAL("graphics/obj_palettes/pal_542.pal"), + INCPAL("graphics/obj_palettes/pal_543.pal"), + INCPAL("graphics/obj_palettes/pal_544.pal"), + INCPAL("graphics/obj_palettes/pal_545.pal"), + INCPAL("graphics/obj_palettes/pal_546.pal"), + INCPAL("graphics/obj_palettes/pal_547.pal"), + INCPAL("graphics/obj_palettes/pal_548.pal"), + INCPAL("graphics/obj_palettes/pal_549.pal"), + INCPAL("graphics/obj_palettes/pal_550.pal"), + INCPAL("graphics/obj_palettes/pal_551.pal"), + INCPAL("graphics/obj_palettes/pal_552.pal"), + INCPAL("graphics/obj_palettes/pal_553.pal"), + INCPAL("graphics/obj_palettes/pal_554.pal"), + INCPAL("graphics/obj_palettes/pal_555.pal"), + INCPAL("graphics/obj_palettes/pal_556.pal"), + INCPAL("graphics/obj_palettes/pal_557.pal"), + INCPAL("graphics/obj_palettes/pal_558.pal"), + INCPAL("graphics/obj_palettes/pal_559.pal"), + INCPAL("graphics/obj_palettes/pal_560.pal"), + INCPAL("graphics/obj_palettes/pal_561.pal"), + INCPAL("graphics/obj_palettes/pal_562.pal"), + INCPAL("graphics/obj_palettes/pal_563.pal"), + INCPAL("graphics/obj_palettes/pal_564.pal"), + INCPAL("graphics/obj_palettes/pal_565.pal"), + INCPAL("graphics/obj_palettes/pal_566.pal"), + INCPAL("graphics/obj_palettes/pal_567.pal"), + INCPAL("graphics/obj_palettes/pal_568.pal"), + INCPAL("graphics/obj_palettes/pal_569.pal"), + INCPAL("graphics/obj_palettes/pal_570.pal"), + INCPAL("graphics/obj_palettes/pal_571.pal"), + INCPAL("graphics/obj_palettes/pal_572.pal"), + INCPAL("graphics/obj_palettes/pal_573.pal"), + INCPAL("graphics/obj_palettes/pal_574.pal"), + INCPAL("graphics/obj_palettes/pal_575.pal"), + INCPAL("graphics/obj_palettes/pal_576.pal"), + INCPAL("graphics/obj_palettes/pal_577.pal"), + INCPAL("graphics/obj_palettes/pal_578.pal"), + INCPAL("graphics/obj_palettes/pal_579.pal"), + INCPAL("graphics/obj_palettes/pal_580.pal"), + INCPAL("graphics/obj_palettes/pal_581.pal"), + INCPAL("graphics/obj_palettes/pal_582.pal"), + INCPAL("graphics/obj_palettes/pal_583.pal"), + INCPAL("graphics/obj_palettes/pal_584.pal"), + INCPAL("graphics/obj_palettes/pal_585.pal"), + INCPAL("graphics/obj_palettes/pal_586.pal"), + INCPAL("graphics/obj_palettes/pal_587.pal"), + INCPAL("graphics/obj_palettes/pal_588.pal"), + INCPAL("graphics/obj_palettes/pal_589.pal"), + INCPAL("graphics/obj_palettes/pal_590.pal"), + INCPAL("graphics/obj_palettes/pal_591.pal"), + INCPAL("graphics/obj_palettes/pal_592.pal"), + INCPAL("graphics/obj_palettes/pal_593.pal"), + INCPAL("graphics/obj_palettes/pal_594.pal"), + INCPAL("graphics/obj_palettes/pal_595.pal"), + INCPAL("graphics/obj_palettes/pal_596.pal"), + INCPAL("graphics/obj_palettes/pal_597.pal"), + INCPAL("graphics/obj_palettes/pal_598.pal"), + INCPAL("graphics/obj_palettes/pal_599.pal"), + INCPAL("graphics/obj_palettes/pal_600.pal"), + INCPAL("graphics/obj_palettes/pal_601.pal"), + INCPAL("graphics/obj_palettes/pal_602.pal"), + INCPAL("graphics/obj_palettes/pal_603.pal"), + INCPAL("graphics/obj_palettes/pal_604.pal"), + INCPAL("graphics/obj_palettes/pal_605.pal"), + INCPAL("graphics/obj_palettes/pal_606.pal"), + INCPAL("graphics/obj_palettes/pal_607.pal"), + INCPAL("graphics/obj_palettes/pal_608.pal"), + INCPAL("graphics/obj_palettes/pal_609.pal"), + INCPAL("graphics/obj_palettes/pal_610.pal"), + INCPAL("graphics/obj_palettes/pal_611.pal"), + INCPAL("graphics/obj_palettes/pal_612.pal"), + INCPAL("graphics/obj_palettes/pal_613.pal"), + INCPAL("graphics/obj_palettes/pal_614.pal"), + INCPAL("graphics/obj_palettes/pal_615.pal"), + INCPAL("graphics/obj_palettes/pal_616.pal"), + INCPAL("graphics/obj_palettes/pal_617.pal"), + INCPAL("graphics/obj_palettes/pal_618.pal"), + INCPAL("graphics/obj_palettes/pal_619.pal"), + INCPAL("graphics/obj_palettes/pal_620.pal"), + INCPAL("graphics/obj_palettes/pal_621.pal"), + INCPAL("graphics/obj_palettes/pal_622.pal"), + INCPAL("graphics/obj_palettes/pal_623.pal"), + INCPAL("graphics/obj_palettes/pal_624.pal"), + INCPAL("graphics/obj_palettes/pal_625.pal"), + INCPAL("graphics/obj_palettes/pal_626.pal"), + INCPAL("graphics/obj_palettes/pal_627.pal"), + INCPAL("graphics/obj_palettes/pal_628.pal"), + INCPAL("graphics/obj_palettes/pal_629.pal"), + INCPAL("graphics/obj_palettes/pal_630.pal"), + INCPAL("graphics/obj_palettes/pal_631.pal"), + INCPAL("graphics/obj_palettes/pal_632.pal"), + INCPAL("graphics/obj_palettes/pal_633.pal"), + INCPAL("graphics/obj_palettes/pal_634.pal"), + INCPAL("graphics/obj_palettes/pal_635.pal"), + INCPAL("graphics/obj_palettes/pal_636.pal"), + INCPAL("graphics/obj_palettes/pal_637.pal"), + INCPAL("graphics/obj_palettes/pal_638.pal"), + INCPAL("graphics/obj_palettes/pal_639.pal"), + INCPAL("graphics/obj_palettes/pal_640.pal"), + INCPAL("graphics/obj_palettes/pal_641.pal"), + INCPAL("graphics/obj_palettes/pal_642.pal"), + INCPAL("graphics/obj_palettes/pal_643.pal"), + INCPAL("graphics/obj_palettes/pal_644.pal"), + INCPAL("graphics/obj_palettes/pal_645.pal"), + INCPAL("graphics/obj_palettes/pal_646.pal"), + INCPAL("graphics/obj_palettes/pal_647.pal"), + INCPAL("graphics/obj_palettes/pal_648.pal"), + INCPAL("graphics/obj_palettes/pal_649.pal"), + INCPAL("graphics/obj_palettes/pal_650.pal"), + INCPAL("graphics/obj_palettes/pal_651.pal"), + INCPAL("graphics/obj_palettes/pal_652.pal"), + INCPAL("graphics/obj_palettes/pal_653.pal"), + INCPAL("graphics/obj_palettes/pal_654.pal"), + INCPAL("graphics/obj_palettes/pal_655.pal"), + INCPAL("graphics/obj_palettes/pal_656.pal"), + INCPAL("graphics/obj_palettes/pal_657.pal"), + INCPAL("graphics/obj_palettes/pal_658.pal"), + INCPAL("graphics/obj_palettes/pal_659.pal"), + INCPAL("graphics/obj_palettes/pal_660.pal"), + INCPAL("graphics/obj_palettes/pal_661.pal"), + INCPAL("graphics/obj_palettes/pal_662.pal"), + INCPAL("graphics/obj_palettes/pal_663.pal"), + INCPAL("graphics/obj_palettes/pal_664.pal"), + INCPAL("graphics/obj_palettes/pal_665.pal"), + INCPAL("graphics/obj_palettes/pal_666.pal"), + INCPAL("graphics/obj_palettes/pal_667.pal"), + INCPAL("graphics/obj_palettes/pal_668.pal"), + INCPAL("graphics/obj_palettes/pal_669.pal"), + INCPAL("graphics/obj_palettes/pal_670.pal"), + INCPAL("graphics/obj_palettes/pal_671.pal"), + INCPAL("graphics/obj_palettes/pal_672.pal"), + INCPAL("graphics/obj_palettes/pal_673.pal"), + INCPAL("graphics/obj_palettes/pal_674.pal"), + INCPAL("graphics/obj_palettes/pal_675.pal"), + INCPAL("graphics/obj_palettes/pal_676.pal"), + INCPAL("graphics/obj_palettes/pal_677.pal"), + INCPAL("graphics/obj_palettes/pal_678.pal"), + INCPAL("graphics/obj_palettes/pal_679.pal"), + INCPAL("graphics/obj_palettes/pal_680.pal"), + INCPAL("graphics/obj_palettes/pal_681.pal"), + INCPAL("graphics/obj_palettes/pal_682.pal"), + INCPAL("graphics/obj_palettes/pal_683.pal"), + INCPAL("graphics/obj_palettes/pal_684.pal"), + INCPAL("graphics/obj_palettes/pal_685.pal"), + INCPAL("graphics/obj_palettes/pal_686.pal"), + INCPAL("graphics/obj_palettes/pal_687.pal"), + INCPAL("graphics/obj_palettes/pal_688.pal"), + INCPAL("graphics/obj_palettes/pal_689.pal"), +#ifdef JAPAN + INCPAL("graphics/obj_palettes/pal_690_japan.pal"), +#else + INCPAL("graphics/obj_palettes/pal_690.pal"), +#endif + INCPAL("graphics/obj_palettes/pal_691.pal"), + INCPAL("graphics/obj_palettes/pal_692.pal"), + INCPAL("graphics/obj_palettes/pal_693.pal"), + INCPAL("graphics/obj_palettes/pal_694.pal"), + INCPAL("graphics/obj_palettes/pal_695.pal"), + INCPAL("graphics/obj_palettes/pal_696.pal"), + INCPAL("graphics/obj_palettes/pal_697.pal"), + INCPAL("graphics/obj_palettes/pal_698.pal"), + INCPAL("graphics/obj_palettes/pal_699.pal"), + INCPAL("graphics/obj_palettes/pal_700.pal"), + INCPAL("graphics/obj_palettes/pal_701.pal"), + INCPAL("graphics/obj_palettes/pal_702.pal"), + INCPAL("graphics/obj_palettes/pal_703.pal"), + INCPAL("graphics/obj_palettes/pal_704.pal"), + INCPAL("graphics/obj_palettes/pal_705.pal"), + INCPAL("graphics/obj_palettes/pal_706.pal"), + INCPAL("graphics/obj_palettes/pal_707.pal"), + INCPAL("graphics/obj_palettes/pal_708.pal"), + INCPAL("graphics/obj_palettes/pal_709.pal"), + INCPAL("graphics/obj_palettes/pal_710.pal"), + INCPAL("graphics/obj_palettes/pal_711.pal"), + INCPAL("graphics/obj_palettes/pal_712.pal"), + INCPAL("graphics/obj_palettes/pal_713.pal"), + INCPAL("graphics/obj_palettes/pal_714.pal"), + INCPAL("graphics/obj_palettes/pal_715.pal"), + INCPAL("graphics/obj_palettes/pal_716.pal"), + INCPAL("graphics/obj_palettes/pal_717.pal"), + INCPAL("graphics/obj_palettes/pal_718.pal"), + INCPAL("graphics/obj_palettes/pal_719.pal"), + INCPAL("graphics/obj_palettes/pal_720.pal"), + INCPAL("graphics/obj_palettes/pal_721.pal"), + INCPAL("graphics/obj_palettes/pal_722.pal"), + INCPAL("graphics/obj_palettes/pal_723.pal"), + INCPAL("graphics/obj_palettes/pal_724.pal"), + INCPAL("graphics/obj_palettes/pal_725.pal"), + INCPAL("graphics/obj_palettes/pal_726.pal"), + INCPAL("graphics/obj_palettes/pal_727.pal"), + INCPAL("graphics/obj_palettes/pal_728.pal"), + INCPAL("graphics/obj_palettes/pal_729.pal"), + INCPAL("graphics/obj_palettes/pal_730.pal"), + INCPAL("graphics/obj_palettes/pal_731.pal"), + INCPAL("graphics/obj_palettes/pal_732.pal"), + INCPAL("graphics/obj_palettes/pal_733.pal"), + INCPAL("graphics/obj_palettes/pal_734.pal"), +#if ENABLE_DECOMP_CREDITS + INCPAL("graphics/obj_palettes/pal_logos_jace.pal"), + INCPAL("graphics/obj_palettes/pal_logos_ollie.pal"), +#endif + +}; diff --git a/src/data/sprite_tables.c b/src/data/sprite_tables.c index 170dcbe108..e54cc3d9f1 100644 --- a/src/data/sprite_tables.c +++ b/src/data/sprite_tables.c @@ -7,7 +7,7 @@ const struct SpriteTables gSpriteTables = { gAnimations, gSpriteDimensions, (const u16**const)gSpriteOamData, - (const u16*)gSpritePalettes, + (const ColorRaw*)gSpritePalettes, gObjTiles_4bpp, gObjTiles_8bpp }; diff --git a/src/game/bosses/boss_1.c b/src/game/bosses/boss_1.c index d4c97977cc..31269dc8f0 100644 --- a/src/game/bosses/boss_1.c +++ b/src/game/bosses/boss_1.c @@ -184,9 +184,12 @@ static const HammertankFunc sBossStateHandlers[] = { [EGG_HAMMER_TANK_II_STATE_DRAG] = StateHandler_HammerDrag, [EGG_HAMMER_TANK_II_STATE_RETRACT] = StateHandler_HammerRetract, }; -static const u16 gUnknown_080D7AD0[][PALETTE_LEN_4BPP] = { - INCBIN_U16("graphics/80D7AD0.gbapal"), - INCBIN_U16("graphics/80D7AF0.gbapal"), +#define PAL_BOSS_1_HIT 0 +#define PAL_BOSS_1_DEF 1 + +static const ColorRaw sBoss1Palettes[][PALETTE_LEN_4BPP] = { + [PAL_BOSS_1_HIT] = INCPAL("graphics/boss_1_hit.pal"), + [PAL_BOSS_1_DEF] = INCPAL("graphics/boss_1_normal.pal"), }; void CreateEggHammerTankII(void) @@ -1614,7 +1617,7 @@ static void HandleBossHitPalette(EggHammerTankII *boss) u8 i; for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(8, i, gUnknown_080D7AD0[(boss->timerInvulnerability & 4) >> 2][i]); + SET_PALETTE_COLOR_OBJ(8, i, sBoss1Palettes[(boss->timerInvulnerability & 4) >> 2][i]); } gFlags |= FLAGS_UPDATE_SPRITE_PALETTES; diff --git a/src/game/bosses/boss_2.c b/src/game/bosses/boss_2.c index 628e5de5f1..fdbcfb3462 100644 --- a/src/game/bosses/boss_2.c +++ b/src/game/bosses/boss_2.c @@ -152,9 +152,12 @@ static const u16 gUnknown_080D7B4E[][2] = { static const BossFunction sBossModeTasks[] = { HandleCannonBombTrigger, HandleCannonlessBombTrigger }; -static const u16 gUnknown_080D7B70[][PALETTE_LEN_4BPP] = { - INCBIN_U16("graphics/80D7B70.gbapal"), - INCBIN_U16("graphics/80D7B90.gbapal"), +#define PAL_BOSS_2_HIT 0 +#define PAL_BOSS_2_DEF 1 + +static const ColorRaw sBoss2Palettes[][PALETTE_LEN_4BPP] = { + [PAL_BOSS_2_HIT] = INCPAL("graphics/boss_2_hit.pal"), + [PAL_BOSS_2_DEF] = INCPAL("graphics/boss_2_normal.pal"), }; void CreateEggBomberTank(void) @@ -576,22 +579,22 @@ static void UpdateBomberTankPalette(EggBomberTank *boss) u8 i; if (boss->bossHitTimer != 0) { for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(8, i, gUnknown_080D7B70[(gStageTime & 2) >> 1][i]); + SET_PALETTE_COLOR_OBJ(8, i, sBoss2Palettes[(gStageTime & 2) >> 1][i]); } } else { for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(8, i, gUnknown_080D7B70[1][i]); + SET_PALETTE_COLOR_OBJ(8, i, sBoss2Palettes[1][i]); } } if (boss->cannonHitTimer != 0) { boss->cannonHitTimer--; for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(13, i, gUnknown_080D7B70[(gStageTime & 2) >> 1][i]); + SET_PALETTE_COLOR_OBJ(13, i, sBoss2Palettes[(gStageTime & 2) >> 1][i]); } } else { for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(13, i, gUnknown_080D7B70[1][i]); + SET_PALETTE_COLOR_OBJ(13, i, sBoss2Palettes[1][i]); } } diff --git a/src/game/bosses/boss_3.c b/src/game/bosses/boss_3.c index fd82fe68d4..dc22e06cfe 100644 --- a/src/game/bosses/boss_3.c +++ b/src/game/bosses/boss_3.c @@ -185,9 +185,12 @@ const u8 *const gUnknown_080D7ED4[] = { const s8 gUnknown_080D7F10[EGGTOTEM_NUM_PLATFORMS] = { 14, 14, 8 }; -const s16 gUnknown_080D7F14[2][PALETTE_LEN_4BPP] = { - INCBIN_U16("graphics/boss_3_a.gbapal"), - INCBIN_U16("graphics/boss_3_b.gbapal"), +#define PAL_BOSS_3_HIT 0 +#define PAL_BOSS_3_DEF 1 + +const ColorRaw sBoss3Palettes[2][PALETTE_LEN_4BPP] = { + [PAL_BOSS_3_HIT] = INCPAL("graphics/boss_3_hit.pal"), + [PAL_BOSS_3_DEF] = INCPAL("graphics/boss_3_normal.pal"), }; void CreateEggTotem(void) @@ -1505,11 +1508,11 @@ void sub_8040F14(EggTotem *totem) if (totem->unk35 != 0) { for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(8, i, gUnknown_080D7F14[((gStageTime & 0x2) / 2u)][i]); + SET_PALETTE_COLOR_OBJ(8, i, sBoss3Palettes[((gStageTime & 0x2) / 2u)][i]); } } else { for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(8, i, gUnknown_080D7F14[1][i]); + SET_PALETTE_COLOR_OBJ(8, i, sBoss3Palettes[1][i]); } } @@ -1517,11 +1520,11 @@ void sub_8040F14(EggTotem *totem) totem->unk36--; for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(11, i, gUnknown_080D7F14[((gStageTime & 0x2) / 2u)][i]); + SET_PALETTE_COLOR_OBJ(11, i, sBoss3Palettes[((gStageTime & 0x2) / 2u)][i]); } } else { for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(11, i, gUnknown_080D7F14[1][i]); + SET_PALETTE_COLOR_OBJ(11, i, sBoss3Palettes[1][i]); } } diff --git a/src/game/bosses/boss_4.c b/src/game/bosses/boss_4.c index 68b81366c3..7dd7c3de1a 100644 --- a/src/game/bosses/boss_4.c +++ b/src/game/bosses/boss_4.c @@ -28,9 +28,6 @@ #define NUM_TAIL_SEGMENTS 3 -#define PAL_BOSS_4_DEFAULT 0 -#define PAL_BOSS_4_HIT 1 - // TODO: Probably these will be globally automated in the long run? #define AEROEGG_PILOT_OFFSET_X (0) #define AEROEGG_PILOT_OFFSET_Y (-14) @@ -42,9 +39,12 @@ #define RESERVED_EXPLOSION_TILES_VRAM (void *)(OBJ_VRAM0 + 0x2980) -static const u16 sPalAeroEggHit[2][PALETTE_LEN_4BPP] = { - [PAL_BOSS_4_DEFAULT] = INCBIN_U16("graphics/boss_4_a.gbapal"), - [PAL_BOSS_4_HIT] = INCBIN_U16("graphics/boss_4_b.gbapal"), +#define PAL_BOSS_4_HIT 0 +#define PAL_BOSS_4_DEF 1 + +static const ColorRaw sBoss4Palettes[2][PALETTE_LEN_4BPP] = { + [PAL_BOSS_4_HIT] = INCPAL("graphics/boss_4_hit.pal"), + [PAL_BOSS_4_DEF] = INCPAL("graphics/boss_4_normal.pal"), }; typedef struct { @@ -762,11 +762,11 @@ static void sub_8042560(AeroEgg *boss) if (boss->main.unk16 != 0) { for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(8, i, sPalAeroEggHit[((gStageTime & 0x2) >> 1)][i]); + SET_PALETTE_COLOR_OBJ(8, i, sBoss4Palettes[((gStageTime & 0x2) >> 1)][i]); } } else { for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(8, i, sPalAeroEggHit[PAL_BOSS_4_HIT][i]); + SET_PALETTE_COLOR_OBJ(8, i, sBoss4Palettes[PAL_BOSS_4_DEF][i]); } } diff --git a/src/game/bosses/boss_5.c b/src/game/bosses/boss_5.c index 0179f5cb8f..c61a095882 100644 --- a/src/game/bosses/boss_5.c +++ b/src/game/bosses/boss_5.c @@ -149,9 +149,12 @@ static const TileInfo gUnknown_080D7FB0[] = { { 2, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_UP, 0 }, { 4, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_UP_RIGHT, 0 }, }; -static const u16 gUnknown_080D7FF0[][PALETTE_LEN_4BPP] = { - INCBIN_U16("graphics/80D7FF0.gbapal"), - INCBIN_U16("graphics/80D8010.gbapal"), +#define PAL_BOSS_5_HIT 0 +#define PAL_BOSS_5_DEF 1 + +static const ColorRaw sBoss5Palettes[][PALETTE_LEN_4BPP] = { + [PAL_BOSS_5_HIT] = INCPAL("graphics/boss_5_hit.pal"), + [PAL_BOSS_5_DEF] = INCPAL("graphics/boss_5_normal.pal"), }; void Task_EggSaucerIntro(void); @@ -1758,22 +1761,22 @@ void sub_8045898(EggSaucer *boss) val = (gStageTime & 2) >> 1; if (boss->unk13 != 0) { for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(8, i, gUnknown_080D7FF0[val][i]); + SET_PALETTE_COLOR_OBJ(8, i, sBoss5Palettes[val][i]); } } else { for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(8, i, gUnknown_080D7FF0[1][i]); + SET_PALETTE_COLOR_OBJ(8, i, sBoss5Palettes[1][i]); } } if (boss->unk1F != 0) { boss->unk1F--; for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(9, i, gUnknown_080D7FF0[val][i]); + SET_PALETTE_COLOR_OBJ(9, i, sBoss5Palettes[val][i]); } } else { for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(9, i, gUnknown_080D7FF0[1][i]); + SET_PALETTE_COLOR_OBJ(9, i, sBoss5Palettes[1][i]); } } diff --git a/src/game/bosses/boss_6.c b/src/game/bosses/boss_6.c index e34dafafc5..851e29c73c 100644 --- a/src/game/bosses/boss_6.c +++ b/src/game/bosses/boss_6.c @@ -168,9 +168,12 @@ static const u16 gUnknown_080D809E[][10] = { { 257, 257, 257, 257, 257, 256, 256, 256, 222, 222 }, }; -static const u16 sPalettes[][PALETTE_LEN_4BPP] = { - INCBIN_U16("graphics/80D80C6.gbapal"), // hit palette - INCBIN_U16("graphics/80D80E6.gbapal"), // normal palette +#define PAL_BOSS_6_HIT 0 +#define PAL_BOSS_6_DEF 1 + +static const ColorRaw sPalettes[][PALETTE_LEN_4BPP] = { + [PAL_BOSS_6_HIT] = INCPAL("graphics/boss_6_hit.pal"), + [PAL_BOSS_6_DEF] = INCPAL("graphics/boss_6_normal.pal"), }; void CreateEggGoRound(void) diff --git a/src/game/bosses/boss_7.c b/src/game/bosses/boss_7.c index 3450261f40..d2a1b1bd83 100644 --- a/src/game/bosses/boss_7.c +++ b/src/game/bosses/boss_7.c @@ -27,8 +27,8 @@ typedef struct { u32 unk0; /* 0x004 */ s32 x; /* 0x008 */ s32 y; - /* 0x00C */ s16 speedX; - /* 0x00E */ s16 speedY; + /* 0x00C */ s16 qSpeedX; + /* 0x00E */ s16 qSpeedY; /* 0x010 */ s32 unk10; u8 unk14; u8 unk15; @@ -55,8 +55,8 @@ typedef struct { typedef struct { s32 x; s32 y; - s16 speedX; - s16 speedY; + s16 qSpeedX; + s16 qSpeedY; u8 gravityInverted; u8 unkD; EggFrog *boss; @@ -120,7 +120,7 @@ static const TileInfo gUnknown_080D8108[] = { static const s8 gUnknown_080D8148[] = { 13, 243 }; -const s8 gUnknown_080D814A[] = { 32, -32 }; +const s8 sBossSpeedDelta[] = { +Q(0.125), -Q(0.125) }; const u16 gUnknown_080D814C[][12] = { { 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 1029, 0 }, @@ -230,11 +230,18 @@ const u8 gUnknown_080D8788[][7] = { { 4, 3, 2, 1, 1, 0, 0 }, }; -const u16 gUnknown_080D8796[][16] = { - INCBIN_U16("graphics/80D8796.gbapal"), - INCBIN_U16("graphics/80D87B6.gbapal"), +// NOTE: Bosses 7 and 8 have these positions swapped compared to the others for some reason. +#define PAL_BOSS_7_DEF 0 +#define PAL_BOSS_7_HIT 1 + +const ColorRaw sBoss7Palettes[][PALETTE_LEN_4BPP] = { + [PAL_BOSS_7_DEF] = INCPAL("graphics/boss_7_normal.pal"), + [PAL_BOSS_7_HIT] = INCPAL("graphics/boss_7_hit.pal"), }; +#define COCKPIT_OFFSET_X 32 +#define COCKPIT_OFFSET_Y 40 + void CreateEggFrog(void) { Sprite *s; @@ -243,8 +250,8 @@ void CreateEggFrog(void) EggFrog *boss; void *vram; s16 *unk28; - gDispCnt |= 0x100; - gBgCntRegs[0] = 0x5A0D; + gDispCnt |= DISPCNT_BG0_ON; + gBgCntRegs[0] = BGCNT_TXT512x256 | BGCNT_SCREENBASE(26) | BGCNT_CHARBASE(3) | BGCNT_PRIORITY(1); gBgScrollRegs[0][0] = 0; gBgScrollRegs[0][1] = 0; INIT_BG_SPRITES_LAYER_64(0); @@ -277,8 +284,8 @@ void CreateEggFrog(void) boss->unk10 = Q(830); } - boss->speedX = Q(5); - boss->speedY = 0; + boss->qSpeedX = Q(5); + boss->qSpeedY = 0; boss->unk15 = 0; boss->unk16 = 0; boss->unk1C[0][0] = 0; @@ -317,9 +324,9 @@ void CreateEggFrog(void) boss->unk1E8 = VramMalloc(39); s = &boss->unk68; - s->x = 32; - s->y = 40; - s->graphics.dest = (void *)VRAM + 0xC000; + s->x = COCKPIT_OFFSET_X; + s->y = COCKPIT_OFFSET_Y; + s->graphics.dest = (void *)BG_CHAR_ADDR(3); SPRITE_INIT_WITHOUT_VRAM(s, SA2_ANIM_EGG_FROG_CABIN, 0, 31, 3, SPRITE_FLAG(18, 1)); for (i = 0; i < ARRAY_COUNT(boss->unk98); i++) { @@ -368,7 +375,7 @@ static void sub_8047E28(void) } Player_DisableInputAndBossTimer(); - boss->speedX = Q(5); + boss->qSpeedX = Q(5); boss->unk18 = 0; boss->unk64 = 0; gStageFlags &= ~STAGE_FLAG__GRAVITY_INVERTED; @@ -440,12 +447,12 @@ static void Render(EggFrog *boss) u8 i, j; u8 temp; - s->x = 32; - s->y = 40; + s->x = COCKPIT_OFFSET_X; + s->y = COCKPIT_OFFSET_Y; UpdateSpriteAnimation(s); DisplaySprite_BG(s); - gBgScrollRegs[0][0] = 32 - (I(boss->x) - gCamera.x); - gBgScrollRegs[0][1] = 40 - (I(boss->y) - gCamera.y); + gBgScrollRegs[0][0] = COCKPIT_OFFSET_X - (I(boss->x) - gCamera.x); + gBgScrollRegs[0][1] = COCKPIT_OFFSET_Y - (I(boss->y) - gCamera.y); pos.x = I(boss->x) - gCamera.x; if (pos.x < -50 || pos.x > (DISPLAY_WIDTH + 60)) { @@ -602,19 +609,19 @@ static void sub_8048654(EggFrog *boss) s32 x, y; s16 temp2; u8 i; - boss->speedY += gUnknown_080D814A[0]; - if (boss->speedY > 0x2C0) { - boss->speedY = 0x2C0; + boss->qSpeedY += sBossSpeedDelta[0]; + if (boss->qSpeedY > Q(2.75)) { + boss->qSpeedY = Q(2.75); } - boss->x += boss->speedX; - boss->y += boss->speedY; + boss->x += boss->qSpeedX; + boss->y += boss->qSpeedY; result = sub_801E4E4(I(boss->y) + 0x1E, I(boss->x), 1, 8, 0, sub_801EE64); if (result < 0) { boss->y += Q(result); - boss->speedY = Div(-(boss->speedY * 9), 10); - boss->speedX = Div((boss->speedX * 9), 10); + boss->qSpeedY = Div(-(boss->qSpeedY * 9), 10); + boss->qSpeedX = Div((boss->qSpeedX * 9), 10); } x = I(boss->x); @@ -710,7 +717,7 @@ static void sub_804893C(EggFrog *boss) sub_80493F8(boss, boss->x, boss->y, 0); boss->unk17 = 0; } - boss->speedY = -Q(3.5); + boss->qSpeedY = -Q(3.5); } } @@ -757,10 +764,10 @@ static void sub_8048A4C(EggFrog *boss) boss->unk18 = gUnknown_080D8710[12].unk2; boss->unk19 = gUnknown_080D8710[12].unk3; } - boss->speedX = 0x500; + boss->qSpeedX = 0x500; } else { - boss->speedX -= 0xC; + boss->qSpeedX -= 0xC; } } @@ -782,7 +789,7 @@ static void sub_8048AD8(EggFrog *boss) sub_80493F8(boss, boss->x, boss->y, 1); boss->unk17 = 0; } - boss->speedY = 0x380; + boss->qSpeedY = 0x380; } } @@ -829,10 +836,10 @@ static void sub_8048BF0(EggFrog *boss) boss->unk18 = gUnknown_080D8710[5].unk2; boss->unk19 = gUnknown_080D8710[5].unk3; } - boss->speedX = 0x500; + boss->qSpeedX = 0x500; } else { - boss->speedX -= 0xC; + boss->qSpeedX -= 0xC; } } @@ -1024,10 +1031,10 @@ static void sub_8048FF4(EggFrog *boss) boss->unk60 = gUnknown_080D86D4[7]; boss->unk18 = gUnknown_080D8710[7].unk2; boss->unk19 = gUnknown_080D8710[7].unk3; - boss->speedX = 0x500; + boss->qSpeedX = 0x500; boss->x = boss->unk10; } else { - boss->speedX += 0xF; + boss->qSpeedX += 0xF; } } @@ -1077,10 +1084,10 @@ static void sub_804911C(EggFrog *boss) boss->unk60 = gUnknown_080D86D4[0]; boss->unk18 = gUnknown_080D8710[0].unk2; boss->unk19 = gUnknown_080D8710[0].unk3; - boss->speedX = 0x500; + boss->qSpeedX = 0x500; boss->x = boss->unk10; } else { - boss->speedX += 0xF; + boss->qSpeedX += 0xF; } } @@ -1143,15 +1150,15 @@ static void sub_804928C(EggFrog *boss) static void sub_80492B8(EggFrog *boss) { - boss->speedY += gUnknown_080D814A[boss->unk18]; + boss->qSpeedY += sBossSpeedDelta[boss->unk18]; - if (boss->unk18 == 0 && boss->speedY > 704) { - boss->speedY = 704; - } else if (boss->unk18 != 0 && boss->speedY < -704) { - boss->speedY = -704; + if (boss->unk18 == 0 && boss->qSpeedY > Q(2.75)) { + boss->qSpeedY = Q(2.75); + } else if (boss->unk18 != 0 && boss->qSpeedY < -Q(2.75)) { + boss->qSpeedY = -Q(2.75); } - boss->x += boss->speedX; - boss->y += boss->speedY; + boss->x += boss->qSpeedX; + boss->y += boss->qSpeedY; boss->unk10 += 0x500; } @@ -1161,7 +1168,7 @@ static void sub_804931C(EggFrog *boss) u8 i; for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_BG(11, i, gUnknown_080D8796[(boss->unk16 & 2) >> 1][i]); + SET_PALETTE_COLOR_BG(11, i, sBoss7Palettes[(boss->unk16 & 2) >> 1][i]); } } @@ -1189,8 +1196,8 @@ static void sub_80493F8(EggFrog *boss, s32 x, s32 y, u8 gravityInverted) bomb->x = x - Q(gCamera.x) + 0x500; bomb->y = y - Q(gCamera.y); - bomb->speedX = 0x500; - bomb->speedY = 0; + bomb->qSpeedX = 0x500; + bomb->qSpeedY = 0; bomb->gravityInverted = gravityInverted; bomb->boss = boss; @@ -1215,17 +1222,17 @@ static void sub_80494EC(void) u8 gravityInverted = bomb->gravityInverted; if (!gravityInverted) { - bomb->speedY += Q(0.125); + bomb->qSpeedY += Q(0.125); } else { - bomb->speedY -= Q(0.125); + bomb->qSpeedY -= Q(0.125); } if (!PLAYER_IS_ALIVE) { - bomb->x += bomb->speedX; - bomb->y += bomb->speedY; + bomb->x += bomb->qSpeedX; + bomb->y += bomb->qSpeedY; } else { - bomb->x += bomb->speedX + Q(gCamera.dx); - bomb->y += bomb->speedY + Q(gCamera.dy); + bomb->x += bomb->qSpeedX + Q(gCamera.dx); + bomb->y += bomb->qSpeedY + Q(gCamera.dy); } temp = -8; @@ -1239,8 +1246,8 @@ static void sub_80494EC(void) // hit floor if (result < 0) { - bomb->x += bomb->speedX * 2; - bomb->speedY = 0; + bomb->x += bomb->qSpeedX * 2; + bomb->qSpeedY = 0; bomb->y += !gravityInverted ? Q(result) : -Q(result); bomb->unkD = 61; gCurTask->main = sub_8049658; @@ -1269,11 +1276,11 @@ static void sub_8049658(void) u32 val; if (!PLAYER_IS_ALIVE) { - bomb->x += bomb->speedX; - bomb->y += bomb->speedY; + bomb->x += bomb->qSpeedX; + bomb->y += bomb->qSpeedY; } else { - bomb->x += bomb->speedX + Q(gCamera.dx); - bomb->y += bomb->speedY + Q(gCamera.dy); + bomb->x += bomb->qSpeedX + Q(gCamera.dx); + bomb->y += bomb->qSpeedY + Q(gCamera.dy); } val = bomb->unkD; @@ -1299,8 +1306,8 @@ static void sub_80496FC(EggFrog *boss, s32 x, s32 y, u8 gravityInverted) EggFrogBomb *bombFlame = TASK_DATA(t); bombFlame->x = x - Q(gCamera.x); bombFlame->y = y - Q(gCamera.y); - bombFlame->speedX = 0; - bombFlame->speedY = 0; + bombFlame->qSpeedX = 0; + bombFlame->qSpeedY = 0; bombFlame->unkD = 46; bombFlame->boss = boss; @@ -1324,11 +1331,11 @@ static void Task_80497E0(void) #endif if (!PLAYER_IS_ALIVE) { - bombFlame->x += bombFlame->speedX; - bombFlame->y += bombFlame->speedY; + bombFlame->x += bombFlame->qSpeedX; + bombFlame->y += bombFlame->qSpeedY; } else { - bombFlame->x += bombFlame->speedX + Q(gCamera.dx); - bombFlame->y += bombFlame->speedY + Q(gCamera.dy); + bombFlame->x += bombFlame->qSpeedX + Q(gCamera.dx); + bombFlame->y += bombFlame->qSpeedY + Q(gCamera.dy); } bombFlame->unkD--; diff --git a/src/game/bosses/boss_8.c b/src/game/bosses/boss_8.c index d714ec63e0..102d33a8ed 100644 --- a/src/game/bosses/boss_8.c +++ b/src/game/bosses/boss_8.c @@ -173,9 +173,13 @@ const u16 gUnknown_080D8888[2][2] = { { Q(188), Q(110) }, { Q(162), Q(110) } }; static const EggRoboFn sArmFuncs[8] = { sub_804B43C, sub_804B594, sub_804B734, sub_804B984, sub_804BC44, sub_804BE6C, sub_804BAC0, sub_804C240 }; -const u16 sArmPalettes[2][PALETTE_LEN_4BPP] = { - INCBIN_U16("graphics/boss_8_a.gbapal"), - INCBIN_U16("graphics/boss_8_b.gbapal"), +// NOTE: Bosses 7 and 8 have these positions swapped compared to the others for some reason. +#define PAL_BOSS_8_DEF 0 +#define PAL_BOSS_8_HIT 1 + +const ColorRaw sArmPalettes[2][PALETTE_LEN_4BPP] = { + [PAL_BOSS_8_DEF] = INCPAL("graphics/boss_8_normal.pal"), + [PAL_BOSS_8_HIT] = INCPAL("graphics/boss_8_hit.pal"), }; #define SWITCH_ARM_VARIANT(boss, arm, vNum) \ @@ -1119,7 +1123,7 @@ void sub_804AE40(SuperEggRoboZ *boss) s32 rand; InitHBlankBgOffsets(0); - sub_80075D0(0, 0, 160, r8, r6, ({ + sub_80075D0(0, 0, DISPLAY_HEIGHT, r8, r6, ({ rand = PseudoRandom32(); I(SIN(((boss->unk12 - 90) * 8) % 256u)) +(rand % 8u); diff --git a/src/game/bosses/boss_9.c b/src/game/bosses/boss_9.c index c8baeff917..8ee6370948 100644 --- a/src/game/bosses/boss_9.c +++ b/src/game/bosses/boss_9.c @@ -398,9 +398,12 @@ const u8 sRGB_080D8E20[4][PALETTE_LEN_4BPP][3] = { const u8 gUnknown_080D8EE0[16] = { 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3 }; -const u16 gUnknown_080D8EF0[2][16] = { - INCBIN_U16("graphics/boss_9_a.gbapal"), - INCBIN_U16("graphics/boss_9_b.gbapal"), +#define PAL_BOSS_9_HIT 0 +#define PAL_BOSS_9_DEF 1 + +const ColorRaw gUnknown_080D8EF0[2][PALETTE_LEN_4BPP] = { + [PAL_BOSS_9_HIT] = INCPAL("graphics/boss_9_hit.pal"), + [PAL_BOSS_9_DEF] = INCPAL("graphics/boss_9_normal.pal"), }; // Used when Vanilla gets captured diff --git a/src/game/multiboot/collect_rings/time_display.c b/src/game/multiboot/collect_rings/time_display.c index 518073d96a..116e6671c2 100644 --- a/src/game/multiboot/collect_rings/time_display.c +++ b/src/game/multiboot/collect_rings/time_display.c @@ -6,6 +6,7 @@ #include "game/multiboot/collect_rings/time_display.h" #include "constants/animations.h" +#include "constants/zones.h" typedef struct { Sprite unk0; @@ -23,7 +24,11 @@ const u8 gUnknown_080E0234[] = { 103, 104, 112, 114, 115, 117, 119, 120, 128, 130, 131, 133, 135, 136, 144, 146, 147, 149, 151, 152, }; -const u16 gUnknown_080E0270[PALETTE_LEN_4BPP] = INCBIN_U16("graphics/80E0270.gbapal"); +#ifndef COLLECT_RINGS_ROM +const ColorRaw sTimeoutPalette[PALETTE_LEN_4BPP] = INCPAL("graphics/time_display_timeout.pal"); +#else +const ColorRaw sTimeoutPalette[PALETTE_LEN_4BPP] = INCPAL("../../../graphics/time_display_timeout.pal"); +#endif #ifndef COLLECT_RINGS_ROM #define NUM_TILES 9 @@ -86,7 +91,7 @@ void CreateCollectRingsTimeDisplay(void) } for (i = 0; i < PALETTE_LEN_4BPP; i++) { - SET_PALETTE_COLOR_OBJ(7, i, gUnknown_080E0270[i]); + SET_PALETTE_COLOR_OBJ(7, i, sTimeoutPalette[i]); } gFlags |= FLAGS_UPDATE_SPRITE_PALETTES; @@ -126,8 +131,13 @@ void sub_8082E9C(TimeDisplay *timeDisplay) temp4 = Base10DigitsToHexNibbles(index); palId = 0; - if (gCourseTime < 3600) { + if (gCourseTime < ZONE_TIME_TO_INT(1, 0)) { +#ifndef NON_MATCHING palId = (-(gStageTime & 0x10)) >> 0x1F; +#else + // In decomp.me this line actually matches, but not here for some reason :( + palId = (gStageTime & 0x10) ? 1 : 0; +#endif } x = 8; diff --git a/src/game/sound_test.c b/src/game/sound_test.c index 66006c134f..e1978b6a2d 100644 --- a/src/game/sound_test.c +++ b/src/game/sound_test.c @@ -253,6 +253,9 @@ static const u32 sBackButtonText[NUM_LANGUAGES * 3 * 2] = { Text(LANG_SPANISH, 10, 1037, 1, 2), Text(LANG_ITALIAN, 8, 1038, 0, 2), Text(LANG_ITALIAN, 12, 1038, 1, 2), }; +// NOTE: Not const, so it gets put into .data, not .rodata +static ColorRaw sSoundTestBGPalette[] = INCPAL("graphics/sound_test_bg.pal"); + void CreateSoundTestScreen(struct OptionsScreen *optionsScreen) { struct Task *t @@ -305,7 +308,7 @@ void CreateSoundTestScreen(struct OptionsScreen *optionsScreen) bgPaletteEffect->bgPalId = 0; bgPaletteEffect->pattern = sBgGradient; - bgPaletteEffect->palette = gBgGradientPalette; + bgPaletteEffect->palette = sSoundTestBGPalette; bgPaletteEffect->offset = 0; diff --git a/src/game/stage/camera.c b/src/game/stage/camera.c index 66f974ce92..a4af99cb79 100644 --- a/src/game/stage/camera.c +++ b/src/game/stage/camera.c @@ -1838,7 +1838,7 @@ const s16 gUnknown_080D5C62[8][2] = { { -Q_8_8(0.75), -Q_8_8(0.125) }, // }; -static const u16 sPalette_Zone7BgCeiling[16] = INCBIN_U16("graphics/080D5C82.gbapal"); +static const ColorRaw sPalette_Zone7BgCeiling[] = INCPAL("graphics/zone_7_bg_ceiling.pal"); void CreateStageBg_Zone7(void) { @@ -2024,7 +2024,8 @@ NONMATCH("asm/non_matching/game/stage/background/Zone7BgUpdate_Inside.inc", void #if 001 { // Draw the "ceiling" movement u32 new_r1 = (x >> 4) << 16; - const u16 *src; + const ColorRaw *src; + ColorRaw *dst; s32 r6 = 0x7; src = sPalette_Zone7BgCeiling; dst = gBgPalette; @@ -2139,7 +2140,7 @@ const u16 sZone7BgTransitionRegions[2][NUM_ZONE7_BG_TRANSITION_POSITIONS] = { { 1344, 2616, 9432, 15192, 18552, 19892, 23158, 25848 }, // ACT 2 }; -const u16 gUnknown_080D5CC2[PALETTE_LEN_4BPP] = INCBIN_U16("graphics/080D5CC2.gbapal"); +const ColorRaw sExtraBossPalette[PALETTE_LEN_4BPP] = INCPAL("graphics/boss_9_normal.pal"); void CreateStageBg_ZoneFinal_0(void) { @@ -2189,8 +2190,8 @@ void CreateStageBg_ZoneFinal_0(void) gBgScrollRegs[3][0] = 0; gBgScrollRegs[3][1] = 0; - for (i = 0; i < ARRAY_COUNT(gUnknown_080D5CC2); i++) { - SET_PALETTE_COLOR_BG(0, i, gUnknown_080D5CC2[i]); + for (i = 0; i < ARRAY_COUNT(sExtraBossPalette); i++) { + SET_PALETTE_COLOR_BG(0, i, sExtraBossPalette[i]); } gFlags |= FLAGS_UPDATE_BACKGROUND_PALETTES; diff --git a/src/game/stage/player.c b/src/game/stage/player.c index cc06ecfc5e..d2960174ec 100644 --- a/src/game/stage/player.c +++ b/src/game/stage/player.c @@ -3145,6 +3145,9 @@ void sub_80236C8(Player *p) s16 airX; s16 airX2; + // TODO: This doesn't seem right... + // TODO: Once fixed here, it should be fixed in sub_8023708() as well + // https://decomp.me/scratch/UjBCm if ((u16)p->qSpeedAirY < (u16)Q(189)) return; diff --git a/src/game/stage/ui.c b/src/game/stage/ui.c index a2b3f8b7c3..73b3ee0811 100644 --- a/src/game/stage/ui.c +++ b/src/game/stage/ui.c @@ -43,7 +43,7 @@ const u16 sAnims1UpIcons[][3] [CHARACTER_KNUCKLES] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER, SA2_ANIM_VARIANT_LIFE_COUNTER_KNUCKLES }, [CHARACTER_AMY] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER, SA2_ANIM_VARIANT_LIFE_COUNTER_AMY } }; -const u16 sPalette1UpIcons[PALETTE_LEN_4BPP] = INCBIN_U16("graphics/ui_icon_1_up.gbapal"); +const ColorRaw sPalette1UpIcons[PALETTE_LEN_4BPP] = INCPAL("graphics/ui_icon_1_up.pal"); const u32 sOrdersOfMagnitude[6] = { 100000, 10000, 1000, 100, 10, 1, diff --git a/src/game/title_screen.c b/src/game/title_screen.c index 7a601ed957..430d2fa59c 100644 --- a/src/game/title_screen.c +++ b/src/game/title_screen.c @@ -246,7 +246,7 @@ static const TileInfo sMenuTiles[] = { { 0x28, SA2_ANIM_SOME_JAPANESE_TXT, SA2_ANIM_VARIANT_SOME_JAPANESE_TXT_7 }, }; -static const u16 sWavesBrightnessPalette[] = INCBIN_U16("graphics/80E0EF4.gbapal"); +static const ColorRaw sWavesBrightnessPalette[] = INCPAL("graphics/title_screen__waves_brightness.pal"); // Each value is scan line which the brightness should be increased // 0 being top 160 being bottom diff --git a/src/platform/shared/common.c b/src/platform/shared/common.c index 5be710fd6b..86d41b1630 100644 --- a/src/platform/shared/common.c +++ b/src/platform/shared/common.c @@ -1,3 +1,4 @@ +#include "global.h" #include "core.h" #include "lib/agb_flash/flash_internal.h" @@ -5,7 +6,7 @@ ALIGNED(256) uint8_t EWRAM_START[EWRAM_SIZE] = { 0 }; ALIGNED(256) uint8_t IWRAM_START[IWRAM_SIZE] = { 0 }; // TODO: REG_BASE needs to be u8, because of the address macro definitions ALIGNED(256) uint8_t REG_BASE[IO_SIZE] = { 0 }; -ALIGNED(256) uint16_t PLTT[PLTT_SIZE / sizeof(uint16_t)] = { 0 }; +ALIGNED(256) ColorRaw PLTT[32 * PALETTE_LEN_4BPP] = { 0 }; ALIGNED(256) uint8_t VRAM[VRAM_SIZE] = { 0 }; ALIGNED(256) uint8_t OAM[OAM_SIZE] = { 0 }; ALIGNED(256) uint8_t FLASH_BASE[FLASH_ROM_SIZE_1M * SECTORS_PER_BANK] = { 0 }; diff --git a/src/platform/win32/opengl.c b/src/platform/win32/opengl.c index b03815a14f..526a3656fd 100644 --- a/src/platform/win32/opengl.c +++ b/src/platform/win32/opengl.c @@ -26,19 +26,13 @@ static GLuint sTempTextureHandles[3] = { 0 }; #define NUM_RGB_CHANNELS 4 // u8 tempRgbaFrame[DISPLAY_WIDTH * DISPLAY_HEIGHT][NUM_RGB_CHANNELS] = {}; -typedef struct ColorRGBA { - u8 r; - u8 g; - u8 b; - u8 a; -} ColorRGBA; typedef struct { - u8 *data; + Color *data; int width, height; } TextureBuffer; static TextureBuffer sDynTextureBuffer = { 0 }; -ColorRGBA tempRgbaPalette[16 * 32] = {}; +// TODO: This can be removed once full 32bit RGBA works static Background *sActiveBackgrounds[4] = { 0 }; void Debug_PrintMatrix(float *mtx) @@ -51,62 +45,25 @@ void Debug_PrintMatrix(float *mtx) mtx[15]); } -static void TempConvertPLTTToRGBA8(void) -{ - // Convert PLTT from ABGR1555 -> RGBA8 - for (int i = 0; i < ARRAY_COUNT(tempRgbaPalette); i++) { - u16 color = PLTT[i]; - float r = (float)(color & 0x01F) / 31.0; - float g = (float)((color & 0x3E0) >> 5) / 31.0; - float b = (float)((color & 0x7C00) >> 10) / 31.0; - - tempRgbaPalette[i].r = r * 255.0; - tempRgbaPalette[i].g = g * 255.0; - tempRgbaPalette[i].b = b * 255.0; - tempRgbaPalette[i].a = 1 * 255.0; - } -} - -static ColorRGBA *TempConvertPLTTEntryToRGBA8(u8 paletteId) -{ - // Convert PLTT from ABGR1555 -> RGBA8 - u16 *pal4BPP = &PLTT[(paletteId + 16) * 16]; - - for (int i = 0; i < 16; i++) { - u16 color = pal4BPP[i]; - - float r = (float)(color & 0x01F) / 31.0; - float g = (float)((color & 0x3E0) >> 5) / 31.0; - float b = (float)((color & 0x7C00) >> 10) / 31.0; - - tempRgbaPalette[paletteId * 16 + i].r = r * 255.0; - tempRgbaPalette[paletteId * 16 + i].g = g * 255.0; - tempRgbaPalette[paletteId * 16 + i].b = b * 255.0; - tempRgbaPalette[paletteId * 16 + i].a = 1 * 255.0; - } - - return &tempRgbaPalette[paletteId * 16]; -} - // TODO: This should be done offline. // Just load all assets in RGB8 or RGBA8 on boot. static void TempConvert4bppToRGBA8_DynTextureBuffer(const u8 *bitmap4bpp, int width, int height, u8 paletteId) { if (sDynTextureBuffer.width * sDynTextureBuffer.height < width * height) { - sDynTextureBuffer.data = realloc(sDynTextureBuffer.data, width * height * sizeof(u32)); + sDynTextureBuffer.data = realloc(sDynTextureBuffer.data, width * height * sizeof(*sDynTextureBuffer.data)); if (!sDynTextureBuffer.data) { printf("WARNING: realloc in %s failed!\n", __FUNCTION__); return; } else { - printf("realloc: w 0x%X, h 0x%X, full: 0x%X\n", width, height, (u32)(width * height * sizeof(u32))); + printf("realloc: w 0x%X, h 0x%X, full: 0x%X\n", width, height, (u32)(width * height * sizeof(*sDynTextureBuffer.data))); } sDynTextureBuffer.width = width; sDynTextureBuffer.height = height; } - ColorRGBA *texturePalette = TempConvertPLTTEntryToRGBA8(paletteId); + Color *texturePalette = (Color *)&PLTT[(16 + paletteId) * PALETTE_LEN_4BPP]; u16 widthInTiles = width >> 3; @@ -121,10 +78,10 @@ static void TempConvert4bppToRGBA8_DynTextureBuffer(const u8 *bitmap4bpp, int wi int textureColorId = bitmap4bpp[tileColorIndex >> 1] & (0xF << (doShift * 4)); textureColorId >>= doShift * 4; - sDynTextureBuffer.data[targetColorIndex * 4 + 0] = texturePalette[textureColorId].r; - sDynTextureBuffer.data[targetColorIndex * 4 + 1] = texturePalette[textureColorId].g; - sDynTextureBuffer.data[targetColorIndex * 4 + 2] = texturePalette[textureColorId].b; - sDynTextureBuffer.data[targetColorIndex * 4 + 3] = (textureColorId == 0) ? 0x00 : 0xFF; + sDynTextureBuffer.data[targetColorIndex].split.r = texturePalette[textureColorId].split.r; + sDynTextureBuffer.data[targetColorIndex].split.g = texturePalette[textureColorId].split.g; + sDynTextureBuffer.data[targetColorIndex].split.b = texturePalette[textureColorId].split.b; + sDynTextureBuffer.data[targetColorIndex].split.a = (textureColorId == 0) ? 0x00 : 0xFF; } } } @@ -153,10 +110,10 @@ typedef struct ChunkSet { static ChunkSet sChunkSet = { 0 }; // TODO: minY should be from upper-left corner, not bottom-left! -void OpenGL_RenderRGBABuffer(u8 *buffer, u16 bufferWidth, u16 bufferHeight, float minX, float minY, float maxX, float maxY) +void OpenGL_RenderRGBABuffer(Color *buffer, u16 bufferWidth, u16 bufferHeight, float minX, float minY, float maxX, float maxY) { glBindTexture(GL_TEXTURE_2D, sTempTextureHandles[2]); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, bufferWidth, bufferHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, buffer); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, bufferWidth, bufferHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, (u8 *)buffer); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); // downscale filtering glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); // upscale filtering glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); @@ -223,7 +180,7 @@ void FindUniqueChunks(ChunkSet *set, Background *bg, u16 mapChunkX, u16 mapChunk } } -void RenderTilemap(ColorRGBA *dstBuffer, Background *bg, int chunkIndex) +void RenderTilemap(Color *dstBuffer, Background *bg, int chunkIndex) { const u8 *tileset = bg->graphics.src; int chunkTileCount = bg->xTiles * bg->yTiles; @@ -239,7 +196,7 @@ void RenderTilemap(ColorRGBA *dstBuffer, Background *bg, int chunkIndex) for (int tileIdY = 0; tileIdY < bg->yTiles; tileIdY++) { for (int tileIdX = 0; tileIdX < bg->xTiles; tileIdX++) { // int tileId = tileIdY * bg->xTiles + tileIdX; - ColorRGBA *dstTileRGBA = &dstBuffer[tileIdY * 8 * (bg->xTiles * 8) + tileIdX * 8]; + Color *dstTileRGBA = &dstBuffer[tileIdY * 8 * (bg->xTiles * 8) + tileIdX * 8]; if (mapIs4BPP) { int tileInChunkIndex = (chunkIndex * chunkTileCount) + tileIdY * bg->xTiles + tileIdX; @@ -256,12 +213,12 @@ void RenderTilemap(ColorRGBA *dstBuffer, Background *bg, int chunkIndex) int colorId = srcTile4BPP[targetColorIndex >> 1] & (0xF << (doShift * 4)); colorId >>= doShift * 4; - ColorRGBA *tilePalette = (ColorRGBA *)(&tempRgbaPalette[tile.pal * 16 + colorId]); + Color *tilePalette = (Color *)&PLTT[tile.pal * PALETTE_LEN_4BPP + colorId]; int dstTileIndex = tileLoopY * (bg->xTiles * 8) + tileLoopX; - dstTileRGBA[dstTileIndex].r = tilePalette->r; - dstTileRGBA[dstTileIndex].g = tilePalette->g; - dstTileRGBA[dstTileIndex].b = tilePalette->b; - dstTileRGBA[dstTileIndex].a = (colorId == 0) ? 0x00 : 0xFF; + dstTileRGBA[dstTileIndex].split.r = tilePalette->split.r; + dstTileRGBA[dstTileIndex].split.g = tilePalette->split.g; + dstTileRGBA[dstTileIndex].split.b = tilePalette->split.b; + dstTileRGBA[dstTileIndex].split.a = (colorId == 0) ? 0x00 : 0xFF; } } } else { @@ -277,12 +234,12 @@ void RenderTilemap(ColorRGBA *dstBuffer, Background *bg, int chunkIndex) int targetColorIndex = ((tileY * 8) + tileX); int colorId = srcTile8BPP[targetColorIndex]; - ColorRGBA *tilePalette = (ColorRGBA *)(&tempRgbaPalette[colorId]); + Color *tilePalette = (Color *)&BG_PLTT[colorId]; int dstTileIndex = tileLoopY * (bg->xTiles * 8) + tileLoopX; - dstTileRGBA[dstTileIndex].r = tilePalette->r; - dstTileRGBA[dstTileIndex].g = tilePalette->g; - dstTileRGBA[dstTileIndex].b = tilePalette->b; - dstTileRGBA[dstTileIndex].a = (colorId == 0) ? 0x00 : 0xFF; + dstTileRGBA[dstTileIndex].split.r = tilePalette->split.r; + dstTileRGBA[dstTileIndex].split.g = tilePalette->split.g; + dstTileRGBA[dstTileIndex].split.b = tilePalette->split.b; + dstTileRGBA[dstTileIndex].split.a = (colorId == 0) ? 0x00 : 0xFF; } } } @@ -299,7 +256,7 @@ void CacheUncachedUniqueChunks(Background *bg, ChunkSet *set, ChunkGfx *gfx) if (chunkIndex == 0) continue; - ColorRGBA *chunkRGBA = (ColorRGBA *)(&gfx->rgbaChunks[chunkSetItemIndex * CHUNK_SIZE_RGBA]); + Color *chunkRGBA = (Color *)&gfx->rgbaChunks[chunkSetItemIndex * CHUNK_SIZE_RGBA]; const u8 *tileset4BPP = &((const u8 *)bg->graphics.src)[0]; RenderTilemap(chunkRGBA, bg, chunkIndex); } @@ -336,7 +293,7 @@ void RenderScreenChunks(ChunkSet *set, ChunkGfx *gfx, Background *bg, s16 mapChu int chunkStartIndex = chunkSetIndex * CHUNK_SIZE_RGBA; int chunkScreenX = (screenX + (chunkX * 96)); int chunkScreenY = DISPLAY_HEIGHT - (screenY + (chunkY * 96)); - OpenGL_RenderRGBABuffer(&gfx->rgbaChunks[chunkStartIndex], 96, 96, chunkScreenX, chunkScreenY, chunkScreenX + 96, + OpenGL_RenderRGBABuffer((Color *)&gfx->rgbaChunks[chunkStartIndex], 96, 96, chunkScreenX, chunkScreenY, chunkScreenX + 96, chunkScreenY + 96); } } @@ -370,7 +327,6 @@ void UpdateChunkGfx(ChunkGfx *gfx, Background *bg) sChunkSet.count = 1; // initialize to 1, to skip zero-filled chunk (which always exists) FindUniqueChunks(&sChunkSet, bg, mapChunkX, mapChunkY, screenChunkWidth, screenChunkHeight); - TempConvertPLTTToRGBA8(); CacheUncachedUniqueChunks(bg, &sChunkSet, &sChunkGfx); // Draw metatile RGBA graphics @@ -452,9 +408,9 @@ void OpenGL_ProcessBackgroundsCopyQueue(void) } bg->graphics.dest = malloc((bg->xTiles * 8) * (bg->yTiles * 8) * TILE_SIZE_RGBA); } - TempConvertPLTTToRGBA8(); + RenderTilemap(bg->graphics.dest, bg, 0); - OpenGL_RenderRGBABuffer(bg->graphics.dest, bg->xTiles * 8, bg->yTiles * 8, bgScrollX, bgScrollY, + OpenGL_RenderRGBABuffer((Color *)bg->graphics.dest, bg->xTiles * 8, bg->yTiles * 8, bgScrollX, bgScrollY, bgScrollX + bg->targetTilesX * 8, bgScrollY + bg->targetTilesY * 8); } } @@ -623,30 +579,4 @@ void OpenGL_Render(void *tempBufferPixels, int viewportWidth, int viewportHeight }; glLoadMatrixf(projMtx); #endif - - // TempConvertPLTTToRGBA8(); - -#if 0 - // Convert the "software-rendered" image from ABGR1555 -> RGBA8 - for (int i = 0; i < ARRAY_COUNT(tempRgbaFrame); i++) { - u16 color = ((u16 *)tempBufferPixels)[i]; - float r = (float)(color & 0x01F) / 31.0; - float g = (float)((color & 0x3E0) >> 5) / 31.0; - float b = (float)((color & 0x7C00) >> 10) / 31.0; - - tempRgbaFrame[i][0] = b * 255.0; - tempRgbaFrame[i][1] = g * 255.0; - tempRgbaFrame[i][2] = r * 255.0; - tempRgbaFrame[i][3] = 1 * 255.0; - } - - // Update palette - glBindTexture(GL_TEXTURE_2D, sTempTextureHandles[0]); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 32, 0, GL_RGBA, GL_UNSIGNED_BYTE, tempRgbaPalette); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); // downscale filtering - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); // upscale filtering - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); -#endif } \ No newline at end of file diff --git a/src/platform/win32/win32.c b/src/platform/win32/win32.c index 6df7d1a4ef..edf116f63f 100644 --- a/src/platform/win32/win32.c +++ b/src/platform/win32/win32.c @@ -23,10 +23,7 @@ static RECT Win32_GetWindowDimension(HWND Window); static void Win32_InitOpenGL(HWND window); #endif -static u16 ALIGNED(8) sImageBuffer[DISPLAY_WIDTH * DISPLAY_HEIGHT] = { - RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, - RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, RGB_GREEN, -}; +static u16 ALIGNED(8) sImageBuffer[DISPLAY_WIDTH * DISPLAY_HEIGHT] = {}; static BITMAPINFO sBMInfo = { 0 }; static bool32 sRunning = TRUE; static HWND sWindowHandle = 0; @@ -37,6 +34,11 @@ static u16 sInputKeys = 0; enum { DMA_NOW, DMA_VBLANK, DMA_HBLANK, DMA_SPECIAL }; +// Stuff like allocating a console shell and initializing OpenGL allocates tens of MB of RAM. +// This should free it all... +// via: https://twitter.com/vkrajacic/status/2028919788362441206 +static inline void ShredWindowsGarbage(void) { SetProcessWorkingSetSize(GetCurrentProcess(), (SIZE_T)-1, (SIZE_T)-1); } + typedef union { struct { u16 unused : 5; @@ -112,6 +114,8 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR lpCmdLine, Win32_ProcessPendingMessages(sWindowHandle); + ShredWindowsGarbage(); + // If this isn't set, gFlags gets set to FLAGS_200, leading to the MP menu being // loaded instead of the main loop REG_RCNT = 0x8000; @@ -385,53 +389,6 @@ void Platform_DisplaySprite(Sprite *sprite, u8 oamPaletteNum) } } } - - s32 tempX = x; - s32 tempY = y; - - u16 widthInTiles = dims->width >> 3; - - for (int frameY = 0; frameY < dims->height; frameY++) { - s32 finalY = (sprite->frameFlags & SPRITE_FLAG_MASK_Y_FLIP) ? (tempY + dims->height - 1 - frameY) : (tempY + frameY); - - if (finalY < 0) - continue; - - if (finalY >= DISPLAY_HEIGHT) - break; - - for (int frameX = 0; frameX < dims->width; frameX++) { - - s32 finalX = (sprite->frameFlags & SPRITE_FLAG_MASK_X_FLIP) ? (tempX + dims->width - 1 - frameX) : (tempX + frameX); - - if (finalX < 0) - continue; - - if (finalX >= DISPLAY_WIDTH) - break; - - int bufferPixelIndex = finalY * DISPLAY_WIDTH + finalX; - int imagePixelIndex = frameY * dims->width + frameX; - - if (bufferPixelIndex >= 0 && bufferPixelIndex < DISPLAY_WIDTH * DISPLAY_HEIGHT) { - u16 *pal = &PLTT[oamPaletteNum * 16 + (BG_PLTT_SIZE / 2)]; - u16 tileNumX = (frameX >> 3); - u16 tileNumY = (frameY >> 3); - u16 tileNum = tileNumY * widthInTiles + tileNumX; - u32 offset = tileNum * TILE_SIZE_4BPP; - - u8 *tile = &((u8 *)sprite->graphics.src)[offset]; - - u8 colorIndex = ((frameY & 0x7) * 8 + (frameX & 0x7)); - - bool8 doShift = (colorIndex & 1); - u8 colorId = tile[colorIndex >> 1] & (0xF << (doShift * 4)); - colorId >>= doShift * 4; - if (colorId != 0) - sImageBuffer[bufferPixelIndex] = RGB_SHIFT(pal[colorId]); - } - } - } } void VBlankIntrWait() diff --git a/src/sprite.c b/src/sprite.c index 5246417024..01d14c9ed5 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -9,7 +9,7 @@ #include "animation_commands.h" #include "platform/platform.h" -#if !PLATFORM_GBA && RENDERER != RENDERER_SOFTWARE +#if !PLATFORM_GBA && (RENDERER != RENDERER_SOFTWARE) extern void Platform_DisplaySprite(Sprite *sprite, u8 oamPaletteNum); extern void Platform_TransformSprite(Sprite *sprite, SpriteTransform *transform); #endif @@ -149,7 +149,7 @@ AnimCmdResult UpdateSpriteAnimation(Sprite *s) return 0; if (s->qAnimDelay > 0) - s->qAnimDelay -= s->animSpeed * 16; + s->qAnimDelay -= s->animSpeed * SPRITE_ANIM_SPEED(1.0); else { /* Call all commands for the new frame */ s32 ret; @@ -330,7 +330,7 @@ static AnimCmdResult animCmd_GetPalette(void *cursor, Sprite *s) cmd->numColors); } else { DmaCopy16(3, &gRefSpriteTables->palettes[paletteIndex * PALETTE_LEN_4BPP], &GET_PALETTE_COLOR_OBJ(s->palId, cmd->insertOffset), - cmd->numColors * sizeof(u16)); + cmd->numColors * sizeof(ColorRaw)); gFlags |= FLAGS_UPDATE_SPRITE_PALETTES; } @@ -395,7 +395,7 @@ NONMATCH("asm/non_matching/engine/TransformSprite.inc", void TransformSprite(Spr // sp24 = s UnkSpriteStruct big; const SpriteOffset *dimensions = s->dimensions; -#if PORTABLE && RENDERER != RENDERER_SOFTWARE +#if PORTABLE && (RENDERER != RENDERER_SOFTWARE) Platform_TransformSprite(s, transform); return; #endif @@ -727,7 +727,7 @@ void DisplaySprite(Sprite *sprite) oam->split.paletteNum += sprite->palId; #endif -#if !PLATFORM_GBA && RENDERER != RENDERER_SOFTWARE +#if !PLATFORM_GBA && (RENDERER != RENDERER_SOFTWARE) // TEMP // Quick hack for getting output in OpenGL test // The whole function call should be replaced by this! @@ -1063,9 +1063,11 @@ static AnimCmdResult animCmd_GetPalette(void *cursor, Sprite *s) if (!(s->frameFlags & SPRITE_FLAG_MASK_18)) { s32 paletteIndex = cmd->palId; + // NOTE: This has to be split off to match using a sizeof() + const s32 colorSize = sizeof(ColorRaw); DmaCopy32(3, &gRefSpriteTables->palettes[paletteIndex * PALETTE_LEN_4BPP], &GET_PALETTE_COLOR_OBJ(s->palId, cmd->insertOffset), - cmd->numColors * 2); + cmd->numColors * colorSize); gFlags |= FLAGS_UPDATE_SPRITE_PALETTES; } diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile index 2942acea7b..c76c8fadc9 100644 --- a/tools/preproc/Makefile +++ b/tools/preproc/Makefile @@ -1,9 +1,9 @@ CXX := g++ -CXXFLAGS := -std=c++11 -O3 -Wall -Wno-switch -Werror +CXXFLAGS := -I ext/gbagfx -std=c++11 -O3 -Wall -Wno-switch -Werror SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \ - utf8.cpp + utf8.cpp ext/gbagfx/jasc_pal.cpp HEADERS := asm_file.h c_file.h char_util.h charmap.h preproc.h string_parser.h \ utf8.h diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp index 50c2dab711..6278f6b34c 100644 --- a/tools/preproc/c_file.cpp +++ b/tools/preproc/c_file.cpp @@ -18,6 +18,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +// NOTE(Jace): Added support for "INCPAL("some_jasc_palette.pal") + #include #include #include @@ -31,6 +33,14 @@ #include "char_util.h" #include "utf8.h" #include "string_parser.h" +#include "ext/gbagfx/gfx.h" +#include "ext/gbagfx/jasc_pal.h" + +#define RGB888_TO_ABGR1555(r, g, b) ( \ + (((r) / 8) << 0) | \ + (((g) / 8) << 5) | \ + (((b) / 8) << 10) \ +) CFile::CFile(std::string filename) : m_filename(filename) { @@ -89,7 +99,7 @@ CFile::~CFile() delete[] m_buffer; } -void CFile::Preproc() +void CFile::Preproc(bool fullRGBA) { char stringChar = 0; @@ -121,6 +131,7 @@ void CFile::Preproc() { TryConvertString(); TryConvertIncbin(); + TryConvertPalette(fullRGBA); if (m_pos >= m_size) break; @@ -306,6 +317,119 @@ int ExtractData(const std::unique_ptr& buffer, int offset, int } } +void CFile::TryConvertPalette(bool fullRGBA) +{ + std::string ident = "INCPAL"; + if(!CheckIdentifier(ident)) + { + return; + } + + long oldPos = m_pos; + long oldLineNum = m_lineNum; + + m_pos += ident.length(); + + SkipWhitespace(); + + if (m_buffer[m_pos] != '(') + { + m_pos = oldPos; + m_lineNum = oldLineNum; + return; + } + + m_pos++; + + std::printf("{"); + + while (true) + { + SkipWhitespace(); + + if (m_buffer[m_pos] != '"') + RaiseError("expected double quote"); + + m_pos++; + + int startPos = m_pos; + + while (m_buffer[m_pos] != '"') + { + if (m_buffer[m_pos] == 0) + { + if (m_pos >= m_size) + RaiseError("unexpected EOF in path string"); + else + RaiseError("unexpected null character in path string"); + } + + if (m_buffer[m_pos] == '\r' || m_buffer[m_pos] == '\n') + RaiseError("unexpected end of line character in path string"); + + if (m_buffer[m_pos] == '\\') + RaiseError("unexpected escape in path string"); + + m_pos++; + } + + std::string path(&m_buffer[startPos], m_pos - startPos); + + m_pos++; + + struct Palette palette = {{}, 0}; + ReadJascPalette((char*)path.c_str(), &palette); + + if(fullRGBA) { + // output RGBA_8888 palette + for(int colorIndex = 0; colorIndex < palette.numColors; colorIndex++) + { + uint32_t color = ( + (palette.colors[colorIndex].red << 0) | + (palette.colors[colorIndex].green << 8) | + (palette.colors[colorIndex].blue << 16) | + (0xFF << 24) + ); + + std::printf("0x%08X", color); + + if(colorIndex + 1 < palette.numColors) { + std::printf(", "); + } + } + } else { + // output ABGR_1555 palette + for(int colorIndex = 0; colorIndex < palette.numColors; colorIndex++) + { + uint16_t color = RGB888_TO_ABGR1555( + palette.colors[colorIndex].red, + palette.colors[colorIndex].green, + palette.colors[colorIndex].blue + ); + std::printf("0x%04X", color); + + if(colorIndex + 1 < palette.numColors) { + std::printf(", "); + } + } + } + + SkipWhitespace(); + + if (m_buffer[m_pos] != ',') + break; + + m_pos++; + } + + if (m_buffer[m_pos] != ')') + RaiseError("expected ')'"); + + m_pos++; + + std::printf("}"); +} + void CFile::TryConvertIncbin() { std::string idents[6] = { "INCBIN_S8", "INCBIN_U8", "INCBIN_S16", "INCBIN_U16", "INCBIN_S32", "INCBIN_U32" }; diff --git a/tools/preproc/c_file.h b/tools/preproc/c_file.h index 7369aba852..6e6f7de254 100644 --- a/tools/preproc/c_file.h +++ b/tools/preproc/c_file.h @@ -34,7 +34,7 @@ class CFile CFile(CFile&& other); CFile(const CFile&) = delete; ~CFile(); - void Preproc(); + void Preproc(bool fullRGBA); private: char* m_buffer; @@ -49,6 +49,7 @@ class CFile void TryConvertString(); std::unique_ptr ReadWholeFile(const std::string& path, int& size); bool CheckIdentifier(const std::string& ident); + void TryConvertPalette(bool fullRGBA); void TryConvertIncbin(); void ReportDiagnostic(const char* type, const char* format, std::va_list args); void RaiseError(const char* format, ...); diff --git a/tools/preproc/ext/gbagfx/LICENSE b/tools/preproc/ext/gbagfx/LICENSE new file mode 100644 index 0000000000..b66bf81c0f --- /dev/null +++ b/tools/preproc/ext/gbagfx/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2015 YamaArashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/tools/preproc/ext/gbagfx/gfx.h b/tools/preproc/ext/gbagfx/gfx.h new file mode 100644 index 0000000000..d69161eedd --- /dev/null +++ b/tools/preproc/ext/gbagfx/gfx.h @@ -0,0 +1,20 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef GFX_H +#define GFX_H + +#include +#include + +struct Color { + unsigned char red; + unsigned char green; + unsigned char blue; +}; + +struct Palette { + struct Color colors[256]; + int numColors; +}; + +#endif // GFX_H diff --git a/tools/preproc/ext/gbagfx/global.h b/tools/preproc/ext/gbagfx/global.h new file mode 100644 index 0000000000..53ad7d4656 --- /dev/null +++ b/tools/preproc/ext/gbagfx/global.h @@ -0,0 +1,36 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef GLOBAL_H +#define GLOBAL_H + +#include +#include +#include // getcwd + +#define ARRAY_COUNT(arr) (sizeof(arr) / sizeof((arr)[0])) + +#ifdef _MSC_VER + +#define FATAL_ERROR(format, ...) \ +do { \ + fprintf(stderr, "CWD %s:\n", getcwd(NULL, 0)); \ + fprintf(stderr, format, __VA_ARGS__); \ + exit(1); \ +} while (0) + +#define UNUSED + +#else + +#define FATAL_ERROR(format, ...) \ +do { \ + fprintf(stderr, "CWD %s:\n", getcwd(NULL, 0)); \ + fprintf(stderr, format, ##__VA_ARGS__); \ + exit(1); \ +} while (0) + +#define UNUSED __attribute__((__unused__)) + +#endif // _MSC_VER + +#endif // GLOBAL_H diff --git a/tools/preproc/ext/gbagfx/jasc_pal.cpp b/tools/preproc/ext/gbagfx/jasc_pal.cpp new file mode 100644 index 0000000000..b1dfcc1723 --- /dev/null +++ b/tools/preproc/ext/gbagfx/jasc_pal.cpp @@ -0,0 +1,204 @@ +// Copyright (c) 2015 YamaArashi +// +// NOTE(Jace): This file did originally not include ParseNumber(). + +#include +#include +#include +#include +#include "global.h" +#include "gfx.h" + +// Read/write Paint Shop Pro palette files. + +// Format of a Paint Shop Pro palette file, line by line: +// "JASC-PAL\r\n" (signature) +// "0100\r\n" (version; seems to always be "0100") +// "\r\n" (number of colors in decimal) +// +// times: +// " \r\n" (color entry) +// +// Each color component is a decimal number from 0 to 255. +// Examples: +// Black - "0 0 0\r\n" +// Blue - "0 0 255\r\n" +// Brown - "150 75 0\r\n" + +#define MAX_LINE_LENGTH 11 + +// NOTE: From util.c from gbagfx (also by YamaArashi) +bool ParseNumber(char *s, char **end, int radix, int *intValue) +{ + char *localEnd; + + if (end == NULL) + end = &localEnd; + + errno = 0; + + const long longValue = strtol(s, end, radix); + + if (*end == s) + return false; // not a number + + if ((longValue == LONG_MIN || longValue == LONG_MAX) && errno == ERANGE) + return false; + + if (longValue > INT_MAX) + return false; + + if (longValue < INT_MIN) + return false; + + *intValue = (int)longValue; + + return true; +} + +void ReadJascPaletteLine(FILE *fp, char *line) +{ + int c; + int length = 0; + + for (;;) + { + c = fgetc(fp); + + if (c == '\r') + { + c = fgetc(fp); + + if (c != '\n') + FATAL_ERROR("CR line endings aren't supported.\n"); + + line[length] = 0; + + return; + } + + if (c == '\n') + FATAL_ERROR("LF line endings aren't supported.\n"); + + if (c == EOF) + FATAL_ERROR("Unexpected EOF. No CRLF at end of file.\n"); + + if (c == 0) + FATAL_ERROR("NUL character in file.\n"); + + if (length == MAX_LINE_LENGTH) + { + line[length] = 0; + FATAL_ERROR("The line \"%s\" is too long.\n", line); + } + + line[length++] = c; + } +} + +void ReadJascPalette(char *path, struct Palette *palette) +{ + char line[MAX_LINE_LENGTH + 1]; + + FILE *fp = fopen(path, "rb"); + + if (fp == NULL) + FATAL_ERROR("Failed to open JASC-PAL file \"%s\" for reading.\n", path); + + ReadJascPaletteLine(fp, line); + + if (strcmp(line, "JASC-PAL") != 0) + FATAL_ERROR("Invalid JASC-PAL signature.\n"); + + ReadJascPaletteLine(fp, line); + + if (strcmp(line, "0100") != 0) + FATAL_ERROR("Unsuported JASC-PAL version.\n"); + + ReadJascPaletteLine(fp, line); + + if (!ParseNumber(line, NULL, 10, &palette->numColors)) + FATAL_ERROR("Failed to parse number of colors.\n"); + + if (palette->numColors < 1 || palette->numColors > 256) + FATAL_ERROR("%d is an invalid number of colors. The number of colors must be in the range [1, 256].\n", palette->numColors); + + for (int i = 0; i < palette->numColors; i++) + { + ReadJascPaletteLine(fp, line); + + char *s = line; + char *end; + + int red; + int green; + int blue; + + if (!ParseNumber(s, &end, 10, &red)) + FATAL_ERROR("Failed to parse red color component.\n"); + + s = end; + + if (*s != ' ') + FATAL_ERROR("Expected a space after red color component.\n"); + + s++; + + if (*s < '0' || *s > '9') + FATAL_ERROR("Expected only a space between red and green color components.\n"); + + if (!ParseNumber(s, &end, 10, &green)) + FATAL_ERROR("Failed to parse green color component.\n"); + + s = end; + + if (*s != ' ') + FATAL_ERROR("Expected a space after green color component.\n"); + + s++; + + if (*s < '0' || *s > '9') + FATAL_ERROR("Expected only a space between green and blue color components.\n"); + + if (!ParseNumber(s, &end, 10, &blue)) + FATAL_ERROR("Failed to parse blue color component.\n"); + + if (*end != 0) + FATAL_ERROR("Garbage after blue color component.\n"); + + if (red < 0 || red > 255) + FATAL_ERROR("Red color component (%d) is outside the range [0, 255].\n", red); + + if (green < 0 || green > 255) + FATAL_ERROR("Green color component (%d) is outside the range [0, 255].\n", green); + + if (blue < 0 || blue > 255) + FATAL_ERROR("Blue color component (%d) is outside the range [0, 255].\n", blue); + + palette->colors[i].red = red; + palette->colors[i].green = green; + palette->colors[i].blue = blue; + } + + if (fgetc(fp) != EOF) + FATAL_ERROR("Garbage after color data.\n"); + + fclose(fp); +} + +void WriteJascPalette(char *path, struct Palette *palette) +{ + FILE *fp = fopen(path, "wb"); + + fputs("JASC-PAL\r\n", fp); + fputs("0100\r\n", fp); + fprintf(fp, "%d\r\n", palette->numColors); + + for (int i = 0; i < palette->numColors; i++) + { + struct Color *color = &palette->colors[i]; + fprintf(fp, "%d %d %d\r\n", color->red, color->green, color->blue); + } + + fclose(fp); +} diff --git a/tools/preproc/ext/gbagfx/jasc_pal.h b/tools/preproc/ext/gbagfx/jasc_pal.h new file mode 100644 index 0000000000..b60b31fc8d --- /dev/null +++ b/tools/preproc/ext/gbagfx/jasc_pal.h @@ -0,0 +1,9 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef JASC_PAL_H +#define JASC_PAL_H + +void ReadJascPalette(char *path, struct Palette *palette); +void WriteJascPalette(char *path, struct Palette *palette); + +#endif // JASC_PAL_H diff --git a/tools/preproc/jasc_pal.h b/tools/preproc/jasc_pal.h new file mode 100644 index 0000000000..b60b31fc8d --- /dev/null +++ b/tools/preproc/jasc_pal.h @@ -0,0 +1,9 @@ +// Copyright (c) 2015 YamaArashi + +#ifndef JASC_PAL_H +#define JASC_PAL_H + +void ReadJascPalette(char *path, struct Palette *palette); +void WriteJascPalette(char *path, struct Palette *palette); + +#endif // JASC_PAL_H diff --git a/tools/preproc/preproc.cpp b/tools/preproc/preproc.cpp index a0fca64cbc..86b71a0c23 100644 --- a/tools/preproc/preproc.cpp +++ b/tools/preproc/preproc.cpp @@ -43,7 +43,7 @@ void PrintAsmBytes(unsigned char *s, int length) } } -void PreprocAsmFile(std::string filename) +void PreprocAsmFile(std::string filename, bool fullRGBA) { std::stack stack; @@ -103,10 +103,10 @@ void PreprocAsmFile(std::string filename) } } -void PreprocCFile(std::string filename) +void PreprocCFile(std::string filename, bool fullRGBA) { CFile cFile(filename); - cFile.Preproc(); + cFile.Preproc(fullRGBA); } char* GetFileExtension(char* filename) @@ -132,13 +132,31 @@ char* GetFileExtension(char* filename) int main(int argc, char **argv) { - if (argc != 3 && argc != 2) + const int MIN_ARGC = 3; + const int MAX_ARGC = 4; + if (argc < MIN_ARGC || argc > MAX_ARGC) { - std::fprintf(stderr, "Usage: %s SRC_FILE CHARMAP_FILE", argv[0]); + std::fprintf(stderr, "Usage: %s SRC_FILE PLATFORM CHARMAP_FILE", argv[0]); return 1; } - g_charmap = new (std::nothrow) Charmap(argc == 3 ? argv[2] : ""); + std::string platform = std::string(argv[2]); + + bool fullRGBA = false; + if((!platform.compare("gba")) + || (!platform.compare("sdl")) + || (!platform.compare("sdl_win32")) + || (!platform.compare("sdl_psp")) + || (!platform.compare("ps2"))) + { + fullRGBA = false; + } else if(!platform.compare("win32")) { + fullRGBA = true; + } else { + FATAL_ERROR("Unknown platform '%s'", platform.c_str()); + } + + g_charmap = new (std::nothrow) Charmap(argc == MAX_ARGC ? argv[MAX_ARGC-1] : ""); if (!g_charmap) FATAL_ERROR("Failed to allocate space for Charmap.\n"); @@ -148,9 +166,9 @@ int main(int argc, char **argv) FATAL_ERROR("\"%s\" has no file extension.\n", argv[1]); if ((extension[0] == 's') && extension[1] == 0) - PreprocAsmFile(argv[1]); + PreprocAsmFile(argv[1], fullRGBA); else if ((extension[0] == 'c' || extension[0] == 'i') && extension[1] == 0) - PreprocCFile(argv[1]); + PreprocCFile(argv[1], fullRGBA); else FATAL_ERROR("\"%s\" has an unknown file extension of \"%s\".\n", argv[1], extension);