From 25d999968e15223c379435f3a0da3e4c5c0f4e8d Mon Sep 17 00:00:00 2001
From: Daniel Borges <msk@lywenn.eu.org>
Date: Tue, 8 Jan 2019 21:41:14 +0100
Subject: [PATCH] skip nintendo shake if running from gbc/gba

---
 Code/main.asm |  22 ++++++++++++++++------
 rom.gb        | Bin 32768 -> 32768 bytes
 todo.txt      |   1 -
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Code/main.asm b/Code/main.asm
index d04a075..bace1f7 100644
--- a/Code/main.asm
+++ b/Code/main.asm
@@ -14,6 +14,9 @@ ENDR
 
 SECTION "Main", ROM0[$150]
 Start:	
+	; save gameboy type in B
+	ld b, a
+
 	; enable v-blank interrupt
 	ld a, IEF_VBLANK
 	ld [rIE], a
@@ -22,18 +25,25 @@ Start:
 	ldh [rIF], a
 
 IF !DEF(DIRECT_TO_GAME)
+	; skip if running on GBC or GBA
+	ld a, b
+	cp a, $11
+	jr z, .skip
+
 	call ScrollNintendoOut
+
+.skip
 ENDC
 	
 	; disable screen
 	halt
 	xor a
-	ld [rLCDC], a
+	ldh [rLCDC], a
 
 	; load bg and obj palette [0=black, 1=dark gray, 2=light gray, 3=white]
 	ld a, %11100100
-	ld [rBGP], a
-	ld [rOBP0], a
+	ldh [rBGP], a
+	ldh [rOBP0], a
 	
 	; load 18 tiles
 	; 0..15: 2x2 cell combinations
@@ -57,8 +67,8 @@ ENDC
 	
 	; set scrolling to (0, 0)
 	xor a
-	ld [rSCX], a
-	ld [rSCY], a
+	ldh [rSCX], a
+	ldh [rSCY], a
 	
 	; clear screen (both buffers)
 	ld hl, _SCRN0
@@ -82,7 +92,7 @@ ENDC
 
 	; enable screen but don't display anything yet
 	ld a, LCDCF_ON
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	
 	ClearAndEnableInterrupts
 .mainloop
diff --git a/rom.gb b/rom.gb
index 737e3bbe46274f2d6bedf9005c281f4a69e9b994..15dcb65e5f50a1081ee0ef3a66c9b193dba2066c 100644
GIT binary patch
delta 43
zcmZo@U}|V!n&8ZMWuprhBfryncRR)h|JOg@ulOgZ!8|#fv6OND<g<*ri<s&FV80MD

delta 44
xcmZo@U}|V!n&8ZMZlenqBd5bEJH`k9*FWH&9LreBxO4JlMqM@rFj&M?2LNH_4l)1$

diff --git a/todo.txt b/todo.txt
index febfa71..9b9e9fa 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,6 +1,5 @@
 - skip nintendo intro on gbc/gba
 - step by step on B button (rewrite main loop to remove second main loop in edit)
-- shake screen on clear
 - music
 - intro screen
 - better selection sprite