From dd138a0b70af639caab39b3612886b770281d143 Mon Sep 17 00:00:00 2001
From: Daniel Borges <msk@lywenn.eu.org>
Date: Tue, 8 Jan 2019 21:24:43 +0100
Subject: [PATCH] less shake in intro, shake while clearing

---
 Code/edit.asm         |  40 ++++++++++++++++++++++++++++++++++++++++
 Code/nintendo-out.asm |   3 ++-
 rom.gb                | Bin 32768 -> 32768 bytes
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/Code/edit.asm b/Code/edit.asm
index ff32daf..0d0746e 100644
--- a/Code/edit.asm
+++ b/Code/edit.asm
@@ -410,8 +410,48 @@ Clear:
 	
 	; render cleared buffer
 	call StartRender
+
+	; disable sprites
+	HaltAndClearInterrupts
+	ldh a, [rLCDC]
+	and a, ~LCDCF_OBJON
+	ldh [rLCDC], a
+
+	; shake background
+	ld d, HIGH(Random)
+	ld e, LOW(Random)
+	ld b, 16
+.shake
+	HaltAndClearInterrupts
+	ld a, [de]
+	ldh [rSCX], a
+
+	inc e
+	ld a, e
+	and a, $7
+	ld e, a
+	
+	ld a, [de]
+	ldh [rSCY], a
+
+	inc e
+	ld a, e
+	and a, $7
+	ld e, a	
+	
+	dec b
+	jr nz, .shake
+	
 	call WaitRender	
 	
+	; reset scrolling and enable sprites again
+	xor a
+	ldh [rSCX], a
+	ldh [rSCY], a
+	ldh a, [rLCDC]
+	or a, LCDCF_OBJON
+	ldh [rLCDC], a
+	
 	; reset video pointer
 	ld hl, Video
 	ld a, [hl+]
diff --git a/Code/nintendo-out.asm b/Code/nintendo-out.asm
index f7e0de9..13cba10 100644
--- a/Code/nintendo-out.asm
+++ b/Code/nintendo-out.asm
@@ -1,9 +1,10 @@
 INCLUDE "hardware.inc"
 INCLUDE "utils.inc"
 
+EXPORT Random, RandomEnd
 SECTION "Random", ROM0, ALIGN[4]
 Random:
-	db -1, 1, 2, -1, 4, 3, -2, -1, -4, 3, -1, 5, 2
+	db -1, 1, 2, -1, 2, 0, -2, -1, -2, 3, -1, -2, 2
 RandomEnd:
 
 EXPORT ScrollNintendoOut
diff --git a/rom.gb b/rom.gb
index 51762ff20aa76b6aa7f97743da99020bf62202c7..737e3bbe46274f2d6bedf9005c281f4a69e9b994 100644
GIT binary patch
delta 293
zcmXAju}i~17{$Lk+q4#A?m!$$stsseS_GY3!r3A^2_iV^UmysDE=4%$Aav^G{tFQT
zI;o>lP`IwH-=M)sGD%TP4Dl`R@#FD*Pf98!9W9h8Bxy2}Cdyr-6QXwZ^*7tp6SASE
zN9*FsCzyuln1uBpMB%^TF7A0S;`cUT#0<FylE2Io0a@1PWVJcuMssrwrUrf)w|$8s
z{K+nKxhYU1xe36uz*L;aJEB{>X+f?VTC?dG^s;j}d&y!Q6`pLS`%cdtLoA|S6!GA*
zfCH<N&FMk0J`J()tb&!TF3-t-X%Uu~#d1)^j@yq)Csl0cUaWs)??dchI~HFQg?gxI
an?=Rr3^vrOR|-+1!ayI)UEH4W_tQVc5_fO_

delta 264
zcmWlTy-UMD7>D1xCbd@6+}RGIhNg-iNQ)rOM;t^aK?K2n!ND;IB3!9BH@QC~ehi|k
zB1E{%j_*+GX0sXbBgXB42Y$~_N-8DoH!4QyH~%i>W-zx*J3QFhRW-I?zJPuOb;KN3
zG_WhCPzr*1oXXo3!-wgQcxJvnadPEmagZIXt>*tWLR+6RA0qU`0Jm|c1$};R5k~X~
zS|Iszjd)P7IwOni5$Hp%>s&h^D!3^mdeK+0P?QZ?#PuiB9ne+#;f@4P>(|t=XhKxe
z-XFJEs)oj62<p`KXA_co!yok0-n)Ula<#bOgXv}wE~yLlRvxf|;vn2m32Bc-s4&1#
M?M-%XE_w6#51Dap00000