From abd3ed414f88207c637d41ff3fcecdca2302330d Mon Sep 17 00:00:00 2001
From: tangstad <tangstad@pvv.ntnu.no>
Date: Sun, 13 Nov 2005 18:15:07 +0000
Subject: [PATCH] Added animated turret sprite.

---
 gba/logosplash/data/helds_logo.bin      |  12 ++---
 gba/logosplash/data/helds_logo_orig.pcx | Bin 3889 -> 3743 bytes
 gba/logosplash/data/turret.bin          | Bin 0 -> 1280 bytes
 gba/logosplash/data/turret_orig.xcf     | Bin 0 -> 2812 bytes
 gba/logosplash/src/logosplash.c         |  57 +++++++++++++++++++-----
 5 files changed, 52 insertions(+), 17 deletions(-)
 create mode 100644 gba/logosplash/data/turret.bin
 create mode 100644 gba/logosplash/data/turret_orig.xcf

diff --git a/gba/logosplash/data/helds_logo.bin b/gba/logosplash/data/helds_logo.bin
index 3aa3af8..636c738 100644
--- a/gba/logosplash/data/helds_logo.bin
+++ b/gba/logosplash/data/helds_logo.bin
@@ -1,8 +1,8 @@
-




-
-
-

-



+
+
+
+

+



 
 
-





\ No newline at end of file
+





\ No newline at end of file
diff --git a/gba/logosplash/data/helds_logo_orig.pcx b/gba/logosplash/data/helds_logo_orig.pcx
index bb4342c05baf4119bd60cd51a6dd2743748be011..09cabcc2e74448f996742b11cc4290a072d6141a 100644
GIT binary patch
delta 249
zcmdleH(z$c3ueX(lm9b|Pv&Fgn9Rc>0OT!TQN%&YvvMC};D)Ie<^L}Lf}aJR2tdRg
zST%t<3s_}wkkU~74y>v|Af2}bcsTwGT!ZSL9Koi|cw+KKHdQ22WU>M~>*Vij0$?!^
uPn7ut!-dJ#?Aky}ve@-89I>9=cCt2y6cU!0oWQ{XRK1>EesdScay9_Ct5fO#

delta 402
zcmX|+y-EW?6ooJB&YiGhmLrHkC2kQ!Oo||>eFUGuM-X4bGE<9K*($!l>~CTcu<;2j
zOreD~D#ChaiRsRF&zW=YTzBvH?_L8{q2RzSgJG)zr?C^b2@_M1V2po`8eZFi69nF*
zb=sqAxEGZOT+D$ZC(TLUnVd`oQ;_+^hxZ&)jT%3AX{PyVmXFnuE(Dkg+gDwkLxHLE
zI?T|1Y(xq*YlK64E@DsnW~jwj9qcYaGOqE4jaH3kzrc}kAZ5SRfHUtt*;DSRjHKLN
z@RmK}%_x%wi5Z&PEAH4!hAt)R8b0KLQqaPdJO~TW#D4N{`yIxAqDHp*hL6weu|83y
j6qWW|@3dsIk*AfwD9k}q5gp?XmSu9;RPxEgm%imcICXr+

diff --git a/gba/logosplash/data/turret.bin b/gba/logosplash/data/turret.bin
new file mode 100644
index 0000000000000000000000000000000000000000..44926a70fdbcec23b95b217d542964be05d62f49
GIT binary patch
literal 1280
zcmcgr+YUl82qS62<Kq7RXQf<r)EA~xc_H1UYk`RzhI&ABjG@YW%N$rhIOQoDbj*Aj
z<bUK_7_olJ-`xMyf0d=7Z?~7-s|>8R$Y0#^8OCP+=Ui<s-L1jqfbrCH<rIW{_)s*L
zzp%aQAO0P}zbSNhjXzS!Yi<RSl{ERu1YQkWP^<Ot!}{*g_uuColfGfnN_R-aNU7z2
MTY1`F)BbMP??sjisQ>@~

literal 0
HcmV?d00001

diff --git a/gba/logosplash/data/turret_orig.xcf b/gba/logosplash/data/turret_orig.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..d85f23408722278278afdc7b410abc55c7849265
GIT binary patch
literal 2812
zcmeH}&2G~`5XZ;3UVns!M0|;x4;)fNs)UaV7eu*6oGR`~u#KfQshqS*Pn1h9z4Qsf
z1&JfVya6wOB3=QBN1#Ax_>Z%j*l7w<L5hSr(R%+oJDZ*S?439WH@Dng(|30&l`6ps
zvRy#05$Q|ZjqssSOjN7Y=p_$)->1XT-rh2Oq^Ivhzu%8z!Z?oO!C){NA>`c73H(0<
ziufrS4g_6Bv(^rYxWTTV;gHZ{v};mx+*QQiL|+JS#LD4jJ@Cpw6h4EC50++?I^Eq3
z&kb8$FY0*BZrE;hR-BR_G}{~P$SoyZISLwex3XGEY>uePsTC}3%vq}D-O~jx?RB>5
z&9D`?RkatKyYrmVSKe-gT_oRp?s3+=w(obm?j%88ebP1dWS24zX-jX2jL$^oZ6IzF
z+3(d1dR3SV=-m2t6k)dyukUk&K;v7$MaPnwZ-Ff}I&xAvm(mwgdO4*pLGyPhGa+~n
zHg(HyjE8(Ro=C0IMEx`xS)UQ{*djw5>txcg$ZL6RtdB&#kQXBBw&<JA&LV=35(Oz(
z=HX<Cc?9shQa1h2*^{H6xUSO+F5aiXyT|z~3f^_zd~D)CiWEHYD(e$(d3<JgisO{1
zA~t0=<!zCs4;g%ph61G5e$VkPr?x1Ls58pUPg12gnqRU$^DB?f!cpP@4wJs~<5<K2
z%Lo9oPIw#|>InS<!aJPRq7ZUPmu7PbXG<ZpZ;f5bXFuTaUm#3#N<VZNm=nB+b_jK%
zNRMV8LoP_uT9~}Q@p~KFqFAc^k%BW*|M+ju*-5gS@OAci{Et}9JdP8BS)u6(%!l*~
D{<QDV

literal 0
HcmV?d00001

diff --git a/gba/logosplash/src/logosplash.c b/gba/logosplash/src/logosplash.c
index 86a5522..3daf250 100644
--- a/gba/logosplash/src/logosplash.c
+++ b/gba/logosplash/src/logosplash.c
@@ -20,12 +20,13 @@
 #include "helds_logo_bin.h"
 #include "helds_pal_bin.h"
 #include "frog_bin.h"
+#include "turret_bin.h"
 
 //---------------------------------------------------------------------------------
 // storage space for palette data
 //---------------------------------------------------------------------------------
 u16 PaletteBuffer[256];
-OBJATTR s_sprite, frog_sprite;
+OBJATTR s_sprite, frog_sprite, turret_sprite;
 
 unsigned int frame;
 
@@ -46,6 +47,27 @@ void move_show_and_wait(u16 x, u16 y, u16 wait_ticks) {
   for (i=0; i<wait_ticks; i++) VBlankIntrWait();
 }
 
+void move_turret(u16 frame_delay) {
+  // assume we are in vblank
+  s8 pos;
+  u16 i;
+
+  for (pos=0; pos<5; pos++) {
+    turret_sprite.attr2 = OBJ_CHAR(522 + pos*8);
+    CpuFastSet(&turret_sprite, OAM + sizeof(s_sprite) + sizeof(frog_sprite), 
+	       COPY32 | sizeof(turret_sprite)/4);
+    for (i=0; i<frame_delay; i++) VBlankIntrWait();
+  }
+
+  for (pos=4; pos>=0; pos--) {
+    turret_sprite.attr2 = OBJ_CHAR(522 + pos*8);
+    CpuFastSet(&turret_sprite, OAM + sizeof(s_sprite) + sizeof(frog_sprite), 
+	       COPY32 | sizeof(turret_sprite)/4);
+    for (i=0; i<frame_delay; i++) VBlankIntrWait();
+  }
+  
+}
+
 //---------------------------------------------------------------------------------
 // Program entry point
 //---------------------------------------------------------------------------------
@@ -73,29 +95,42 @@ int main(void)
 	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(turret_bin, BITMAP_OBJ_BASE_ADR + s_piece_bin_size + frog_bin_size, 
+		   COPY32 | turret_bin_size/4);
 	CpuFastSet(PaletteBuffer, OBJ_COLORS, COPY32 | sizeof(PaletteBuffer)/4);
 
 	memset(&s_sprite, 0, sizeof(s_sprite));
 	memset(&frog_sprite, 0, sizeof(frog_sprite));
+	memset(&turret_sprite, 0, sizeof(turret_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);
+
+	turret_sprite.attr2 = OBJ_CHAR(516);
+	turret_sprite.attr1 = OBJ_SIZE(1) | OBJ_X(43);
+	turret_sprite.attr0 = OBJ_256_COLOR | OBJ_Y(73);
+
+	VBlankIntrWait();
 	CpuFastSet(&frog_sprite, OAM + sizeof(s_sprite), COPY32 | sizeof(frog_sprite)/4);
 
 	while (1)
 	{
-		move_show_and_wait(147, 74, 60);
-		move_show_and_wait(147, 76, 60);
-		move_show_and_wait(147, 78, 30);
-		move_show_and_wait(145, 78, 30);
-		move_show_and_wait(145, 80, 60);
-		move_show_and_wait(145, 82, 60);
-		move_show_and_wait(145, 84, 60);
-		move_show_and_wait(145, 86, 60);
-		move_show_and_wait(145, 88, 180);
+		move_turret(3);
+		move_turret(3);
+		move_turret(3);
+		move_turret(3);
+
+		move_show_and_wait(147, 74, 30);
+		move_show_and_wait(147, 76, 30);
+		move_show_and_wait(147, 78, 15);
+		move_show_and_wait(145, 78, 15);
+		move_show_and_wait(145, 80, 30);
+		move_show_and_wait(145, 82, 30);
+		move_show_and_wait(145, 84, 30);
+		move_show_and_wait(145, 86, 30);
+		move_show_and_wait(145, 88, 30);
 	}
 }