From 229972274f92e005c62e5819398a908d02fddeee Mon Sep 17 00:00:00 2001
From: tangstad <tangstad@pvv.ntnu.no>
Date: Wed, 9 Nov 2005 21:30:34 +0000
Subject: [PATCH] Changed shading of s-piece. Added small animation of brick
 moving into place.

---
 gba/logosplash/data/s_piece.bin      | Bin 64 -> 64 bytes
 gba/logosplash/data/s_piece_orig.pcx | Bin 931 -> 931 bytes
 gba/logosplash/src/logosplash.c      |  22 ++++++++++++++++++----
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/gba/logosplash/data/s_piece.bin b/gba/logosplash/data/s_piece.bin
index 6d1d5f4ab2a5650c995deb8b6b26771d80493ae0..787ab67151461e2504771c0a3b465ae29a4fa15e 100644
GIT binary patch
literal 64
ecmZQ)WB>zp7|jl0u|sJF2AB*ZR0Tvmj06A-cmPKL

literal 64
bcmZQ%X8;36IL!`bF)|`Vpeh(4G%5)I3UmNF

diff --git a/gba/logosplash/data/s_piece_orig.pcx b/gba/logosplash/data/s_piece_orig.pcx
index 0cec504362dc1f0729c9a85d140d1947efbba61e..1bec3b41a2126fdce62778891cb2a1ce52540d7b 100644
GIT binary patch
delta 33
hcmZ3?zL<SNgBUyGF$NGm%+7cOLL36}H%{Ya1^}f*3043A

delta 33
jcmZ3?zL<SNgBT<GF$OR`%zlL7Fe8vS1mtg=#>)%<q+|(J

diff --git a/gba/logosplash/src/logosplash.c b/gba/logosplash/src/logosplash.c
index cf357c6..8a9ff94 100644
--- a/gba/logosplash/src/logosplash.c
+++ b/gba/logosplash/src/logosplash.c
@@ -36,6 +36,15 @@ void VblankInterrupt()
 	ScanKeys();
 }
 
+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);
+  u16 i;
+  for (i=0; i<wait_ticks; i++) VBlankIntrWait();
+}
+
 //---------------------------------------------------------------------------------
 // Program entry point
 //---------------------------------------------------------------------------------
@@ -64,15 +73,20 @@ int main(void)
 	CpuFastSet(PaletteBuffer, OBJ_COLORS, COPY32 | sizeof(PaletteBuffer)/4);
 
 	memset(&sprite, 0, sizeof(sprite));
-	sprite.attr0 = OBJ_256_COLOR | OBJ_Y(74);
-	sprite.attr1 = OBJ_X(147);
 	sprite.attr2 = OBJ_CHAR(512);
 
 	while (1)
 	{
 		VBlankIntrWait();
-		sprite.attr0 = OBJ_256_COLOR | OBJ_Y(frame);
-		CpuFastSet(&sprite, OAM, COPY32 | sizeof(sprite)/4);
+		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);
 	}
 }