diff options
| -rw-r--r-- | data/seagallop/eb_tilemap.bin (renamed from data/seagallop/unk_84699D8.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | data/seagallop/ferry_and_wake.pal (renamed from data/seagallop/unk_846A6D8.pal) | 0 | ||||
| -rw-r--r-- | data/seagallop/ferry_sprite.png (renamed from data/seagallop/unk_846A1D8.png) | bin | 595 -> 595 bytes | |||
| -rw-r--r-- | data/seagallop/unk_84691B8.pal | 19 | ||||
| -rw-r--r-- | data/seagallop/wake.png (renamed from data/seagallop/unk_846A6F8.png) | bin | 574 -> 574 bytes | |||
| -rw-r--r-- | data/seagallop/water.png (renamed from data/seagallop/unk_8468C98.png) | bin | 283 -> 283 bytes | |||
| -rw-r--r-- | data/seagallop/wb_tilemap.bin (renamed from data/seagallop/unk_84691D8.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics_file_rules.mk | 2 | ||||
| -rw-r--r-- | src/seagallop.c | 14 |
9 files changed, 8 insertions, 27 deletions
diff --git a/data/seagallop/unk_84699D8.bin b/data/seagallop/eb_tilemap.bin Binary files differindex 2f912fb18..2f912fb18 100644 --- a/data/seagallop/unk_84699D8.bin +++ b/data/seagallop/eb_tilemap.bin diff --git a/data/seagallop/unk_846A6D8.pal b/data/seagallop/ferry_and_wake.pal index c25501332..c25501332 100644 --- a/data/seagallop/unk_846A6D8.pal +++ b/data/seagallop/ferry_and_wake.pal diff --git a/data/seagallop/unk_846A1D8.png b/data/seagallop/ferry_sprite.png Binary files differindex cc06fbffa..cc06fbffa 100644 --- a/data/seagallop/unk_846A1D8.png +++ b/data/seagallop/ferry_sprite.png 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_846A6F8.png b/data/seagallop/wake.png Binary files differindex a5ff28c6e..a5ff28c6e 100644 --- a/data/seagallop/unk_846A6F8.png +++ b/data/seagallop/wake.png diff --git a/data/seagallop/unk_8468C98.png b/data/seagallop/water.png Binary files differindex ccf64591a..ccf64591a 100644 --- a/data/seagallop/unk_8468C98.png +++ b/data/seagallop/water.png diff --git a/data/seagallop/unk_84691D8.bin b/data/seagallop/wb_tilemap.bin Binary files differindex a3c27d319..a3c27d319 100644 --- a/data/seagallop/unk_84691D8.bin +++ b/data/seagallop/wb_tilemap.bin 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[] = { { |
