From dc0f14cce8de7987cfa13923154f4c8cc644f45f Mon Sep 17 00:00:00 2001
From: tangstad <tangstad@pvv.ntnu.no>
Date: Wed, 9 Nov 2005 22:50:12 +0000
Subject: [PATCH] Added frog as 16x16 sprite instead of being part of
 background.

---
 gba/logosplash/data/frog.bin            | Bin 0 -> 256 bytes
 gba/logosplash/data/frog_orig.pcx       | Bin 0 -> 1059 bytes
 gba/logosplash/data/helds_logo.bin      |   2 +-
 gba/logosplash/data/helds_logo_orig.pcx | Bin 4012 -> 3889 bytes
 gba/logosplash/src/logosplash.c         |  25 ++++++++++++++++--------
 5 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 gba/logosplash/data/frog.bin
 create mode 100644 gba/logosplash/data/frog_orig.pcx

diff --git a/gba/logosplash/data/frog.bin b/gba/logosplash/data/frog.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d11a2651aa30e340e875a5357b2409170ccb640f
GIT binary patch
literal 256
zcmY+7F&4lu2tplPoRs@twtz`r%V1FRF(Lp2<s$RyE_#|v^kACra6an!YQDIrZ^Rjs
v5*&tU3@^n1LqJvrOI6BCi7Hza-#HsyaW9l2>PrV_fAP)G-;HznA140*>u?A+

literal 0
HcmV?d00001

diff --git a/gba/logosplash/data/frog_orig.pcx b/gba/logosplash/data/frog_orig.pcx
new file mode 100644
index 0000000000000000000000000000000000000000..858663cc4dfdebfb1fbde0c44fd3f5021b87793e
GIT binary patch
literal 1059
zcmeHD!41MN47^GP5d=!SM@Q+K5jscNfC;(-8Ns2b;zK)8xX=gheo-Cya_5|5$;VxF
z0K@atRb3UnDyo3>O}_~VNgvDvgTA1K2}Rpdhx*{Hz~b;hgB9>}up`jP42$xkF7>41
zOq`T|ppu-}7nNe*%iu)SoXV4gw~D!uL=-fR#g2p*XHGa}WFSYNX&PLMXxkRI+;wNX
Zak=mNzK;>qF~)hGbEajBZ3BO@fe$OjMJ)gT

literal 0
HcmV?d00001

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 5179c4a04e180e4efe7e07e292dc4769ff3fffd1..bb4342c05baf4119bd60cd51a6dd2743748be011 100644
GIT binary patch
delta 80
tcmZ1@zfo?33={KzfwPmXnG`2`F$uviSZpDaD471wC`(Aq=6TF~JOD#^8s7i_

delta 373
zcmZut!3}~y5S-wBE*NhMFcM=0_F!KWVH-X)cEAPo0%8k1EI`3O&VexkX0x-o%+Aj4
z9TvN2KM$fpEK+7Ice$VuM=Y6FK_;lS>tGq*$Xn)X&{GJE7<Bk&fDw@Hu%b3RA@mNu
zmMzldGn-!0FltV7FnoRc<DS4m={9WJ^Sg5{P*y82e0dJm<vl9(S^^$pGSN_HQmj38
e!|(9gL_2b0X)Xzr(<*5l$43^Dp+2rAv*{a-NPQas

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<wait_ticks; i++) VBlankIntrWait();
 }
@@ -63,21 +64,29 @@ int main(void)
 	REG_IME = 1;
 
 	// screen mode, background and objects to display
-	SetMode( MODE_4 | BG2_ON | OBJ_ON );
+	SetMode( MODE_4 | BG2_ON | OBJ_ON | OBJ_1D_MAP );
 	
 	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);
 
 	CpuFastSet(s_piece_bin, BITMAP_OBJ_BASE_ADR, COPY32 | s_piece_bin_size/4);
+	CpuFastSet(frog_bin, BITMAP_OBJ_BASE_ADR + s_piece_bin_size, 
+		   COPY32 | frog_bin_size/4);
 	CpuFastSet(PaletteBuffer, OBJ_COLORS, COPY32 | sizeof(PaletteBuffer)/4);
 
-	memset(&sprite, 0, sizeof(sprite));
-	sprite.attr2 = OBJ_CHAR(512);
+	memset(&s_sprite, 0, sizeof(s_sprite));
+	memset(&frog_sprite, 0, sizeof(frog_sprite));
+	s_sprite.attr2 = OBJ_CHAR(512);
+
+	VBlankIntrWait();
+	frog_sprite.attr2 = OBJ_CHAR(514);
+	frog_sprite.attr1 = OBJ_SIZE(1) | OBJ_X(175);
+	frog_sprite.attr0 = OBJ_256_COLOR | OBJ_Y(49);
+	CpuFastSet(&frog_sprite, OAM + sizeof(s_sprite), COPY32 | sizeof(frog_sprite)/4);
 
 	while (1)
 	{
-		VBlankIntrWait();
 		move_show_and_wait(147, 74, 60);
 		move_show_and_wait(147, 76, 60);
 		move_show_and_wait(147, 78, 30);