From 276db165b7dddb1ed6ec91261ae49ceab244fd69 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 24 Apr 2019 23:08:23 -0400 Subject: change asset filenames --- data/seagallop/eb_tilemap.bin | Bin 0 -> 2048 bytes data/seagallop/ferry_and_wake.pal | 19 +++++++++++++++++++ data/seagallop/ferry_sprite.png | Bin 0 -> 595 bytes data/seagallop/unk_8468C98.png | Bin 283 -> 0 bytes data/seagallop/unk_84691B8.pal | 19 ------------------- data/seagallop/unk_84691D8.bin | Bin 2048 -> 0 bytes data/seagallop/unk_84699D8.bin | Bin 2048 -> 0 bytes data/seagallop/unk_846A1D8.png | Bin 595 -> 0 bytes data/seagallop/unk_846A6D8.pal | 19 ------------------- data/seagallop/unk_846A6F8.png | Bin 574 -> 0 bytes data/seagallop/wake.png | Bin 0 -> 574 bytes data/seagallop/water.png | Bin 0 -> 283 bytes data/seagallop/wb_tilemap.bin | Bin 0 -> 2048 bytes graphics_file_rules.mk | 2 +- src/seagallop.c | 14 +++++++------- 15 files changed, 27 insertions(+), 46 deletions(-) create mode 100644 data/seagallop/eb_tilemap.bin create mode 100644 data/seagallop/ferry_and_wake.pal create mode 100644 data/seagallop/ferry_sprite.png delete mode 100644 data/seagallop/unk_8468C98.png delete mode 100644 data/seagallop/unk_84691B8.pal delete mode 100644 data/seagallop/unk_84691D8.bin delete mode 100644 data/seagallop/unk_84699D8.bin delete mode 100644 data/seagallop/unk_846A1D8.png delete mode 100644 data/seagallop/unk_846A6D8.pal delete mode 100644 data/seagallop/unk_846A6F8.png create mode 100644 data/seagallop/wake.png create mode 100644 data/seagallop/water.png create mode 100644 data/seagallop/wb_tilemap.bin diff --git a/data/seagallop/eb_tilemap.bin b/data/seagallop/eb_tilemap.bin new file mode 100644 index 000000000..2f912fb18 Binary files /dev/null and b/data/seagallop/eb_tilemap.bin differ diff --git a/data/seagallop/ferry_and_wake.pal b/data/seagallop/ferry_and_wake.pal new file mode 100644 index 000000000..c25501332 --- /dev/null +++ b/data/seagallop/ferry_and_wake.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 123 180 +238 246 255 +222 230 238 +189 205 230 +156 164 189 +139 139 156 +98 98 123 +57 57 106 +197 98 98 +172 65 106 +32 74 156 +197 148 0 +246 213 24 +222 238 255 +255 255 255 +74 106 139 diff --git a/data/seagallop/ferry_sprite.png b/data/seagallop/ferry_sprite.png new file mode 100644 index 000000000..cc06fbffa Binary files /dev/null and b/data/seagallop/ferry_sprite.png differ diff --git a/data/seagallop/unk_8468C98.png b/data/seagallop/unk_8468C98.png deleted file mode 100644 index ccf64591a..000000000 Binary files a/data/seagallop/unk_8468C98.png and /dev/null differ diff --git a/data/seagallop/unk_84691B8.pal b/data/seagallop/unk_84691B8.pal deleted file mode 100644 index 4b2dc6c7d..000000000 --- a/data/seagallop/unk_84691B8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -213 238 255 -172 205 255 -139 180 238 -106 156 230 -49 115 180 -65 123 189 -82 139 205 -205 222 238 -172 189 205 -123 123 131 -90 90 115 -49 115 172 -238 230 139 -230 213 139 -213 197 106 diff --git a/data/seagallop/unk_84691D8.bin b/data/seagallop/unk_84691D8.bin deleted file mode 100644 index a3c27d319..000000000 Binary files a/data/seagallop/unk_84691D8.bin and /dev/null differ diff --git a/data/seagallop/unk_84699D8.bin b/data/seagallop/unk_84699D8.bin deleted file mode 100644 index 2f912fb18..000000000 Binary files a/data/seagallop/unk_84699D8.bin and /dev/null differ diff --git a/data/seagallop/unk_846A1D8.png b/data/seagallop/unk_846A1D8.png deleted file mode 100644 index cc06fbffa..000000000 Binary files a/data/seagallop/unk_846A1D8.png and /dev/null differ diff --git a/data/seagallop/unk_846A6D8.pal b/data/seagallop/unk_846A6D8.pal deleted file mode 100644 index c25501332..000000000 --- a/data/seagallop/unk_846A6D8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -65 123 180 -238 246 255 -222 230 238 -189 205 230 -156 164 189 -139 139 156 -98 98 123 -57 57 106 -197 98 98 -172 65 106 -32 74 156 -197 148 0 -246 213 24 -222 238 255 -255 255 255 -74 106 139 diff --git a/data/seagallop/unk_846A6F8.png b/data/seagallop/unk_846A6F8.png deleted file mode 100644 index a5ff28c6e..000000000 Binary files a/data/seagallop/unk_846A6F8.png and /dev/null differ diff --git a/data/seagallop/wake.png b/data/seagallop/wake.png new file mode 100644 index 000000000..a5ff28c6e Binary files /dev/null and b/data/seagallop/wake.png differ diff --git a/data/seagallop/water.png b/data/seagallop/water.png new file mode 100644 index 000000000..ccf64591a Binary files /dev/null and b/data/seagallop/water.png differ diff --git a/data/seagallop/wb_tilemap.bin b/data/seagallop/wb_tilemap.bin new file mode 100644 index 000000000..a3c27d319 Binary files /dev/null and b/data/seagallop/wb_tilemap.bin differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 6906e8edc..bdb4eda05 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -663,5 +663,5 @@ $(FAMECHECKERGFXDIR)/img_845cf00.4bpp: %.4bpp: %.png $(GLOBALGFXDIR)/fame_checker_bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 165 -data/seagallop/unk_8468C98.4bpp: %.4bpp: %.png +data/seagallop/water.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 41 diff --git a/src/seagallop.c b/src/seagallop.c index e39fbb99b..585838607 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -44,13 +44,13 @@ static void CreateWakeSprite(s16 x); static void SpriteCB_Wake(struct Sprite * sprite); static bool8 GetDirectionOfTravel(void); -static const u16 sWaterTiles[] = INCBIN_U16("data/seagallop/unk_8468C98.4bpp"); -static const u16 sWaterPal[] = INCBIN_U16("data/seagallop/unk_84691B8.gbapal"); -static const u16 sWaterTilemap_WB[] = INCBIN_U16("data/seagallop/unk_84691D8.bin"); -static const u16 sWaterTilemap_EB[] = INCBIN_U16("data/seagallop/unk_84699D8.bin"); -static const u16 sFerrySpriteTiles[] = INCBIN_U16("data/seagallop/unk_846A1D8.4bpp"); -static const u16 sFerryAndWakePal[] = INCBIN_U16("data/seagallop/unk_846A6D8.gbapal"); -static const u16 sWakeSpriteTiles[] = INCBIN_U16("data/seagallop/unk_846A6F8.4bpp"); +static const u16 sWaterTiles[] = INCBIN_U16("data/seagallop/water.4bpp"); +static const u16 sWaterPal[] = INCBIN_U16("data/seagallop/water.gbapal"); +static const u16 sWaterTilemap_WB[] = INCBIN_U16("data/seagallop/wb_tilemap.bin"); +static const u16 sWaterTilemap_EB[] = INCBIN_U16("data/seagallop/eb_tilemap.bin"); +static const u16 sFerrySpriteTiles[] = INCBIN_U16("data/seagallop/ferry_sprite.4bpp"); +static const u16 sFerryAndWakePal[] = INCBIN_U16("data/seagallop/ferry_and_wake.gbapal"); +static const u16 sWakeSpriteTiles[] = INCBIN_U16("data/seagallop/wake.4bpp"); static const struct BgTemplate sBGTemplates[] = { { -- cgit v1.2.3