diff --git a/gba/logosplash/data/frog.bin b/gba/logosplash/data/frog.bin new file mode 100644 index 0000000..d11a265 Binary files /dev/null and b/gba/logosplash/data/frog.bin differ diff --git a/gba/logosplash/data/frog_orig.pcx b/gba/logosplash/data/frog_orig.pcx new file mode 100644 index 0000000..858663c Binary files /dev/null and b/gba/logosplash/data/frog_orig.pcx differ diff --git a/gba/logosplash/data/helds_logo.bin b/gba/logosplash/data/helds_logo.bin index 8a58eb5..3aa3af8 100644 --- a/gba/logosplash/data/helds_logo.bin +++ b/gba/logosplash/data/helds_logo.bin @@ -1,4 +1,4 @@ -                                                                               +                                                                           diff --git a/gba/logosplash/data/helds_logo_orig.pcx b/gba/logosplash/data/helds_logo_orig.pcx index 5179c4a..bb4342c 100644 Binary files a/gba/logosplash/data/helds_logo_orig.pcx and b/gba/logosplash/data/helds_logo_orig.pcx differ diff --git a/gba/logosplash/src/logosplash.c b/gba/logosplash/src/logosplash.c index 8a9ff94..86a5522 100644 --- a/gba/logosplash/src/logosplash.c +++ b/gba/logosplash/src/logosplash.c @@ -19,12 +19,13 @@ #include "s_piece_bin.h" #include "helds_logo_bin.h" #include "helds_pal_bin.h" +#include "frog_bin.h" //--------------------------------------------------------------------------------- // storage space for palette data //--------------------------------------------------------------------------------- u16 PaletteBuffer[256]; -OBJATTR sprite; +OBJATTR s_sprite, frog_sprite; unsigned int frame; @@ -38,9 +39,9 @@ void VblankInterrupt() void move_show_and_wait(u16 x, u16 y, u16 wait_ticks) { // assume we are in vblank - sprite.attr1 = OBJ_X(x); - sprite.attr0 = OBJ_256_COLOR | OBJ_Y(y); - CpuFastSet(&sprite, OAM, COPY32 | sizeof(sprite)/4); + s_sprite.attr1 = OBJ_X(x); + s_sprite.attr0 = OBJ_256_COLOR | OBJ_Y(y); + CpuFastSet(&s_sprite, OAM, COPY32 | sizeof(s_sprite)/4); u16 i; for (i=0; i