From 301bae5a91ed73d3db19e79051b9b28075f50355 Mon Sep 17 00:00:00 2001 From: tangstad Date: Wed, 9 Nov 2005 20:24:50 +0000 Subject: [PATCH] Removed unused pcx from being included. Renamed files. --- .../data/{helds_logo_new.bin => helds_logo.bin} | 0 .../data/{helds_logo.pcx => helds_logo_orig.pcx} | Bin gba/logosplash/src/logosplash.c | 5 ++--- 3 files changed, 2 insertions(+), 3 deletions(-) rename gba/logosplash/data/{helds_logo_new.bin => helds_logo.bin} (100%) rename gba/logosplash/data/{helds_logo.pcx => helds_logo_orig.pcx} (100%) diff --git a/gba/logosplash/data/helds_logo_new.bin b/gba/logosplash/data/helds_logo.bin similarity index 100% rename from gba/logosplash/data/helds_logo_new.bin rename to gba/logosplash/data/helds_logo.bin diff --git a/gba/logosplash/data/helds_logo.pcx b/gba/logosplash/data/helds_logo_orig.pcx similarity index 100% rename from gba/logosplash/data/helds_logo.pcx rename to gba/logosplash/data/helds_logo_orig.pcx diff --git a/gba/logosplash/src/logosplash.c b/gba/logosplash/src/logosplash.c index a976145..ac08f37 100644 --- a/gba/logosplash/src/logosplash.c +++ b/gba/logosplash/src/logosplash.c @@ -16,9 +16,8 @@ //--------------------------------------------------------------------------------- // header for binary data generated by bin2o macro in makefile //--------------------------------------------------------------------------------- -#include "helds_logo_pcx.h" #include "s_piece_bin.h" -#include "helds_logo_new_bin.h" +#include "helds_logo_bin.h" #include "helds_pal_bin.h" //--------------------------------------------------------------------------------- @@ -57,7 +56,7 @@ int main(void) // screen mode, background and objects to display SetMode( MODE_4 | BG2_ON | OBJ_ON ); - CpuFastSet(helds_logo_new_bin, (u16*)VRAM, COPY32 | helds_logo_new_bin_size/4); + CpuFastSet(helds_logo_bin, (u16*)VRAM, COPY32 | helds_logo_bin_size/4); CpuFastSet(helds_pal_bin, PaletteBuffer, COPY32 | helds_pal_bin_size / 4); FadeToPalette( PaletteBuffer, 60);