Skip to content

Extend INCPAL use in SA1. #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
freshollie merged 5 commits into from
May 7, 2026
Merged

Extend INCPAL use in SA1. #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1034843
Align water_effects.h with SA3
JaceCear May 5, 2026
eab87d8
Fix SA1 build
JaceCear May 5, 2026
4e50592
Use INCPAL in SA1. Fix some compiler errors
JaceCear May 5, 2026
7652a6e
Use INCPAL in SA1
JaceCear May 6, 2026
eeaff78
Merge branch 'main' into incpal
JaceCear May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_chao_hunt_act_vs_zone_a_fg[];
extern const ColorRaw Palette_zone_chao_hunt_act_vs_zone_a_fg[];
const u8 Tiles_zone_chao_hunt_act_vs_zone_a_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_chao_hunt_act_vs_zone_a_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_chao_hunt_act_vs_zone_a_fg[] = INCBIN_U16("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_chao_hunt_act_vs_zone_a_fg[] = INCPAL("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/palette.pal");
const u8 Tileset_zone_chao_hunt_act_vs_zone_a_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_chao_hunt_act_vs_zone_a_fg[] = INCBIN_S8("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_chao_hunt_act_vs_zone_a_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_chao_hunt_act_vs_zone_b_fg[];
extern const ColorRaw Palette_zone_chao_hunt_act_vs_zone_b_fg[];
const u8 Tiles_zone_chao_hunt_act_vs_zone_b_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_chao_hunt_act_vs_zone_b_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_chao_hunt_act_vs_zone_b_fg[] = INCBIN_U16("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_chao_hunt_act_vs_zone_b_fg[] = INCPAL("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/palette.pal");
const u8 Tileset_zone_chao_hunt_act_vs_zone_b_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_chao_hunt_act_vs_zone_b_fg[] = INCBIN_S8("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_chao_hunt_act_vs_zone_b_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_chao_hunt_act_vs_zone_c_fg[];
extern const ColorRaw Palette_zone_chao_hunt_act_vs_zone_c_fg[];
const u8 Tiles_zone_chao_hunt_act_vs_zone_c_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_chao_hunt_act_vs_zone_c_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_chao_hunt_act_vs_zone_c_fg[] = INCBIN_U16("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_chao_hunt_act_vs_zone_c_fg[] = INCPAL("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/palette.pal");
const u8 Tileset_zone_chao_hunt_act_vs_zone_c_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_chao_hunt_act_vs_zone_c_fg[] = INCBIN_S8("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_chao_hunt_act_vs_zone_c_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_chao_hunt_act_vs_zone_d_fg[];
extern const ColorRaw Palette_zone_chao_hunt_act_vs_zone_d_fg[];
const u8 Tiles_zone_chao_hunt_act_vs_zone_d_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_chao_hunt_act_vs_zone_d_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_chao_hunt_act_vs_zone_d_fg[] = INCBIN_U16("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_chao_hunt_act_vs_zone_d_fg[] = INCPAL("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/palette.pal");
const u8 Tileset_zone_chao_hunt_act_vs_zone_d_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_chao_hunt_act_vs_zone_d_fg[] = INCBIN_S8("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_chao_hunt_act_vs_zone_d_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_1/act_1/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_1_act_1_fg[];
extern const ColorRaw Palette_zone_1_act_1_fg[];
const u8 Tiles_zone_1_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_1/act_1/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_1_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_1/act_1/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_1/act_1/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_1_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_1/act_1/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_1_act_1_fg[] = INCPAL("data/sa1/maps/zone_1/act_1/tilemaps/fg/palette.pal");
const u8 Tileset_zone_1_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_1/act_1/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_1_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_1/act_1/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_1_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_1/act_1/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_1/act_2/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_1_act_2_fg[];
extern const ColorRaw Palette_zone_1_act_2_fg[];
const u8 Tiles_zone_1_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_1/act_2/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_1_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_1/act_2/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_1/act_2/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_1_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_1/act_2/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_1_act_2_fg[] = INCPAL("data/sa1/maps/zone_1/act_2/tilemaps/fg/palette.pal");
const u8 Tileset_zone_1_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_1/act_2/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_1_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_1/act_2/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_1_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_1/act_2/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_2/act_1/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_2_act_1_fg[];
extern const ColorRaw Palette_zone_2_act_1_fg[];
const u8 Tiles_zone_2_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_2/act_1/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_2_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_2/act_1/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_2/act_1/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_2_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_2/act_1/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_2_act_1_fg[] = INCPAL("data/sa1/maps/zone_2/act_1/tilemaps/fg/palette.pal");
const u8 Tileset_zone_2_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_2/act_1/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_2_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_2/act_1/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_2_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_2/act_1/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_2/act_2/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_2_act_2_fg[];
extern const ColorRaw Palette_zone_2_act_2_fg[];
const u8 Tiles_zone_2_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_2/act_2/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_2_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_2/act_2/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_2/act_2/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_2_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_2/act_2/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_2_act_2_fg[] = INCPAL("data/sa1/maps/zone_2/act_2/tilemaps/fg/palette.pal");
const u8 Tileset_zone_2_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_2/act_2/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_2_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_2/act_2/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_2_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_2/act_2/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_3/act_1/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_3_act_1_fg[];
extern const ColorRaw Palette_zone_3_act_1_fg[];
const u8 Tiles_zone_3_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_3/act_1/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_3_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_3/act_1/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_3/act_1/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_3_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_3/act_1/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_3_act_1_fg[] = INCPAL("data/sa1/maps/zone_3/act_1/tilemaps/fg/palette.pal");
const u8 Tileset_zone_3_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_3/act_1/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_3_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_3/act_1/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_3_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_3/act_1/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_3/act_2/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_3_act_2_fg[];
extern const ColorRaw Palette_zone_3_act_2_fg[];
const u8 Tiles_zone_3_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_3/act_2/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_3_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_3/act_2/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_3/act_2/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_3_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_3/act_2/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_3_act_2_fg[] = INCPAL("data/sa1/maps/zone_3/act_2/tilemaps/fg/palette.pal");
const u8 Tileset_zone_3_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_3/act_2/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_3_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_3/act_2/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_3_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_3/act_2/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_4/act_1/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_4_act_1_fg[];
extern const ColorRaw Palette_zone_4_act_1_fg[];
const u8 Tiles_zone_4_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_4/act_1/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_4_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_4/act_1/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_4/act_1/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_4_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_4/act_1/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_4_act_1_fg[] = INCPAL("data/sa1/maps/zone_4/act_1/tilemaps/fg/palette.pal");
const u8 Tileset_zone_4_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_4/act_1/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_4_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_4/act_1/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_4_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_4/act_1/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_4/act_2/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_4_act_2_fg[];
extern const ColorRaw Palette_zone_4_act_2_fg[];
const u8 Tiles_zone_4_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_4/act_2/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_4_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_4/act_2/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_4/act_2/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_4_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_4/act_2/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_4_act_2_fg[] = INCPAL("data/sa1/maps/zone_4/act_2/tilemaps/fg/palette.pal");
const u8 Tileset_zone_4_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_4/act_2/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_4_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_4/act_2/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_4_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_4/act_2/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_5/act_1/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_5_act_1_fg[];
extern const ColorRaw Palette_zone_5_act_1_fg[];
const u8 Tiles_zone_5_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_5/act_1/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_5_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_5/act_1/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_5/act_1/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_5_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_5/act_1/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_5_act_1_fg[] = INCPAL("data/sa1/maps/zone_5/act_1/tilemaps/fg/palette.pal");
const u8 Tileset_zone_5_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_5/act_1/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_5_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_5/act_1/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_5_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_5/act_1/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_5/act_2/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_5_act_2_fg[];
extern const ColorRaw Palette_zone_5_act_2_fg[];
const u8 Tiles_zone_5_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_5/act_2/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_5_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_5/act_2/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_5/act_2/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_5_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_5/act_2/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_5_act_2_fg[] = INCPAL("data/sa1/maps/zone_5/act_2/tilemaps/fg/palette.pal");
const u8 Tileset_zone_5_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_5/act_2/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_5_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_5/act_2/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_5_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_5/act_2/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_6/act_1/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_6_act_1_fg[];
extern const ColorRaw Palette_zone_6_act_1_fg[];
const u8 Tiles_zone_6_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_6/act_1/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_6_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_6/act_1/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_6/act_1/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_6_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_6/act_1/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_6_act_1_fg[] = INCPAL("data/sa1/maps/zone_6/act_1/tilemaps/fg/palette.pal");
const u8 Tileset_zone_6_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_6/act_1/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_6_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_6/act_1/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_6_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_6/act_1/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_6/act_2/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_6_act_2_fg[];
extern const ColorRaw Palette_zone_6_act_2_fg[];
const u8 Tiles_zone_6_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_6/act_2/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_6_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_6/act_2/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_6/act_2/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_6_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_6/act_2/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_6_act_2_fg[] = INCPAL("data/sa1/maps/zone_6/act_2/tilemaps/fg/palette.pal");
const u8 Tileset_zone_6_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_6/act_2/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_6_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_6/act_2/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_6_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_6/act_2/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_7/act_1/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_7_act_1_fg[];
extern const ColorRaw Palette_zone_7_act_1_fg[];
const u8 Tiles_zone_7_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_7/act_1/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_7_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_7/act_1/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_7/act_1/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_7_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_7/act_1/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_7_act_1_fg[] = INCPAL("data/sa1/maps/zone_7/act_1/tilemaps/fg/palette.pal");
const u8 Tileset_zone_7_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_7/act_1/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_7_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_7/act_1/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_7_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_7/act_1/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_7/act_2/tilemaps/bg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

extern const u16 Palette_zone_7_act_2_fg[];
extern const ColorRaw Palette_zone_7_act_2_fg[];
const u8 Tiles_zone_7_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_7/act_2/tilemaps/bg/tiles.4bpp");
const u8 Tilemap_zone_7_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_7/act_2/tilemaps/bg/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion data/sa1/maps/zone_7/act_2/tilemaps/fg/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_zone_7_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_7/act_2/tilemaps/fg/palette.gbapal");
const ColorRaw Palette_zone_7_act_2_fg[] = INCPAL("data/sa1/maps/zone_7/act_2/tilemaps/fg/palette.pal");
const u8 Tileset_zone_7_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_7/act_2/tilemaps/fg/tileset.4bpp");
const s8 CollHeightMap_zone_7_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_7/act_2/tilemaps/fg/height_map.coll");
const u8 CollTileRot_zone_7_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_7/act_2/tilemaps/fg/tile_rot.coll");
Expand Down
2 changes: 1 addition & 1 deletion graphics/sa1/tilemaps/egg_rocket_clouds/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_egg_rocket_clouds[] = INCBIN_U16("graphics/sa1/tilemaps/egg_rocket_clouds/palette.gbapal");
const ColorRaw Palette_egg_rocket_clouds[] = INCPAL("graphics/sa1/tilemaps/egg_rocket_clouds/palette.pal");
const u8 Tiles_egg_rocket_clouds[] = INCBIN_U8("graphics/sa1/tilemaps/egg_rocket_clouds/tiles.4bpp");
const u8 Tilemap_egg_rocket_clouds[] = INCBIN_U8("graphics/sa1/tilemaps/egg_rocket_clouds/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion graphics/sa1/tilemaps/ice_paradise_snow/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_ice_paradise_snow[] = INCBIN_U16("graphics/sa1/tilemaps/ice_paradise_snow/palette.gbapal");
const ColorRaw Palette_ice_paradise_snow[] = INCPAL("graphics/sa1/tilemaps/ice_paradise_snow/palette.pal");
const u8 Tiles_ice_paradise_snow[] = INCBIN_U8("graphics/sa1/tilemaps/ice_paradise_snow/tiles.4bpp");
const u8 Tilemap_ice_paradise_snow[] = INCBIN_U8("graphics/sa1/tilemaps/ice_paradise_snow/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion graphics/sa1/tilemaps/intro_created_by_sonic_team/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_intro_created_by_sonic_team[] = INCBIN_U16("graphics/sa1/tilemaps/intro_created_by_sonic_team/palette.gbapal");
const ColorRaw Palette_intro_created_by_sonic_team[] = INCPAL("graphics/sa1/tilemaps/intro_created_by_sonic_team/palette.pal");
const u8 Tiles_intro_created_by_sonic_team[] = INCBIN_U8("graphics/sa1/tilemaps/intro_created_by_sonic_team/tiles.4bpp");
const u8 Tilemap_intro_created_by_sonic_team[] = INCBIN_U8("graphics/sa1/tilemaps/intro_created_by_sonic_team/tilemap.tilemap2");

Expand Down
2 changes: 1 addition & 1 deletion graphics/sa1/tilemaps/intro_presented_by_sega/header.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "global.h"
#include "core.h"

const u16 Palette_intro_presented_by_sega[] = INCBIN_U16("graphics/sa1/tilemaps/intro_presented_by_sega/palette.gbapal");
const ColorRaw Palette_intro_presented_by_sega[] = INCPAL("graphics/sa1/tilemaps/intro_presented_by_sega/palette.pal");
const u8 Tiles_intro_presented_by_sega[] = INCBIN_U8("graphics/sa1/tilemaps/intro_presented_by_sega/tiles.4bpp");
const u8 Tilemap_intro_presented_by_sega[] = INCBIN_U8("graphics/sa1/tilemaps/intro_presented_by_sega/tilemap.tilemap2");

Expand Down
Loading
Loading