From 29d3438c1c7ebce55459d925f3f117c3c4787306 Mon Sep 17 00:00:00 2001
From: Jonatan Nilsson <jonatan@nilsson.is>
Date: Fri, 21 Jun 2019 13:34:11 +0000
Subject: [PATCH] Prepare to create the intro scene

---
 compile.bat      |   2 +-
 game/game.asm    |   3 +++
 main.asm         |  32 ++++++++++++++++++++++++++------
 main.o           | Bin 11027 -> 11059 bytes
 test.gb          | Bin 32768 -> 32768 bytes
 test.map         |   4 ++++
 worlds/intro.asm |   3 +++
 7 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 worlds/intro.asm

diff --git a/compile.bat b/compile.bat
index 951c71a..2f4a341 100644
--- a/compile.bat
+++ b/compile.bat
@@ -16,7 +16,7 @@ IF %ERRORLEVEL% NEQ 0 (
 
 ECHO.
 ECHO Linking main.o
-ECHO rgblink -o test.gb -m test.map -n test.sym main.o
+ECHO rgblink -d -o test.gb -m test.map -n test.sym main.o
 
 C:\Users\jonatan.SAMSYN\Documents\gb\tools\compiler\rgblink -o test.gb -m test.map -n test.sym main.o
 
diff --git a/game/game.asm b/game/game.asm
index 3ac7762..c697e30 100644
--- a/game/game.asm
+++ b/game/game.asm
@@ -1,3 +1,6 @@
+; Include our worlds
+INCLUDE "worlds/intro.asm"
+
 INCLUDE "game/text.asm"
 INCLUDE "game/controller.asm"
 
diff --git a/main.asm b/main.asm
index 4750d79..a21798a 100644
--- a/main.asm
+++ b/main.asm
@@ -14,14 +14,34 @@ SECTION "Interruptp1thru4", ROM0[$0060]
     reti
 
 SECTION "Header", ROM0[$100]
-
-EntryPoint: ;
+    ; Game code starts here
+    ; $0100
     ei ; Simple nop ; di ; Disable interrupts for now
     jp Start ; Leave this tiny space
-
-REPT $150 - $104
-    db 0
-ENDR
+    ; $0104 - Nintendo logo
+    db $CE,$ED,$66,$66,$CC,$0D,$00,$0B,$03,$73,$00,$83,$00,$0C,$00,$0D
+    db $00,$08,$11,$1F,$88,$89,$00,$0E,$DC,$CC,$6E,$E6,$DD,$DD,$D9,$99
+    db $BB,$BB,$67,$63,$6E,$0E,$EC,$CC,$DD,$DC,$99,$9F,$BB,$B9,$33,$3E
+    ; $0134 - Game Title
+    db "GAMEBOYGAME", $00, $00, $00, $00, $00
+    ; $0144 - New Licensee code
+    db $00, $00
+    ; $0146 - SGB Flag
+    db $00
+    ; $0147 - Cartridge Type (http://gbdev.gg8.se/wiki/articles/The_Cartridge_Header#0147_-_Cartridge_Type)
+    db $00
+    ; $0148 - ROM Size (http://gbdev.gg8.se/wiki/articles/The_Cartridge_Header#0148_-_ROM_Size)
+    db $00 ; 32 KByte
+    ; $0149 - RAM Size
+    db $00
+    ; $014A - Destination Code
+    db $01
+    ; $014B - Old Licensee code
+    db $33
+    ; $014C - Mask ROM Version number
+    db $00
+    ; $014D - $014F - Checksums
+    db $00, $00, $00
 
 SECTION "Intro code", ROM0
 
diff --git a/main.o b/main.o
index da4470aa47dcda42d5d146e6bdd768e72e7ef6ff..3288ae0efb14a55bcd3bc259224a3ca62d0c3c88 100644
GIT binary patch
delta 775
zcmYk2OK1~O6o&7enL88XwDe&UGL4-SliJuMO-M<RO6bGVLakL7B~?&EY)do`n-syN
zxKKfna8&53xN_5t1O*8Qf}o4gz1XglB2qz@qKN;DA!guwbI$*tbMDNg#p+`8+{|QR
zm@(Fkm|xDXWOF&j){DhlIg&2tnIEzf;X+L1meVErp}E9qRB~nR80VE67M_NH?J)2g
z83lO+Oxe7{A=3+<;4<yoJR*$<84KRhckZUL<bm@*igShDNGFj0kw(FUY$;de5#*b4
zP)L|y_QYqo&z_Ian$k^%(rZ^KRBk$}^rAnn90#8%V_eWD#V-OFb&xLnP-7wnH6xA+
z9jZzXML&1aa}k91Q5@z6=%*MIhu~>6pbo-YPzOxw3c?87Q0Ds0)(bMAI_Z%bMCWUD
z2>hz{3#(tH4lRs2skz6as5=qXb0)pI9Ahk>&KB$|E<)?ForX7ExYA;;SvEb^d|35T
z8^*`)X#sq!?l1$^O06+kD&}LCvW4}MwU050jWfoP@M_fYOXvL*>M^;GPJt%nz&^SU
zdT0ymp*q-2`(Rg9cfFTpx4*5d)Z5rWxy)`eowYGXr+N1tYu~9C_I7taY}9J2nL_)1
zeRpSLv-T>UoSB%Po?KY6Ue@`IhsVk5dE&i>au&e_a4P~de?Lpx9%D2EDcNi=TN~0S
z#+nwA|Ff6LG<^IbjT;6(PZtcsy9C=>|L>qsYjcV!Xgf(;;1s>X;6(L{G1T!FtzN1;

delta 668
zcmYk2&1(};6vf|rGjAq=plPKOGD)4*q_wg6XlO~1N-b(tY-+1uTM)reqf{oX8WF^m
zD>sVNqib>H#!ZR3EEHV0DE<R3TnGwMM3<rz&x{Z=aDUu;&Uqj6S_@bhIe+R{r6h#t
zX3f?cS66&rh}&yxezRC>Hbj<kl;yCF`}Nu_{Inf?mXlhaIV8pUod7TL#D@a$haGaV
zNG^qZASvUGtVo5OkQp_m6*qW?A2NZaO450xMx}u*b%gz{8Ye48pj<b`*grRNc+Ko5
zBNMJH;-<L|u9*s_B~A&PGgC}9%){hMb3&T<Y-aTVo?|1XvsBBvOm$fw)WHvFJl6d(
ziVdBk_fhxC2!81y-9^vBpfyBq&KmTBY=OnMS-x?%^J!eFQ9QMBOm14k<TtBd+f+5;
zc7gMxotR2<j<bSqzILr%7NSvGSq&feBDLVW;0wL!)hiwLCCXiRX7_Qcw|0q_|6&jD
zvayJ#_t3Li^O4^%xgXUYPxitm(|Aax@QQS>O?G34j3efFa&If|yjK{_R56u&l3wH<
zr&&@H_lrdPW*6{1>5k7)nrsKW&cG~(iMGY&|Jo{!x_$BtF1xNgiF>Y_o~9ja|L>rD
WXZQp*7#qPhS;AK?EVLr2;rL&2IgFqH

diff --git a/test.gb b/test.gb
index 7df8b6f2119ef3304b59f15cdd3960648371aee4..15e5156f1b7a60881691052055c42686c616b367 100644
GIT binary patch
delta 42
mcmZo@U}|V!+F-&c?e6I7>f|2@q8Jc>(U@Us+h%{pjdcLm^a-Q@

delta 21
ccmZo@U}|V!+F-&sc_E`D)AQ!d{)`*z08(2A)&Kwi

diff --git a/test.map b/test.map
index a149bb1..ca16c68 100644
--- a/test.map
+++ b/test.map
@@ -49,6 +49,10 @@ ROM Bank #0 (HOME):
            $1280 = Page1End
     SLACK: $2CB5 bytes
 
+ROM Bank #1:
+  SECTION: $4000 ($0 bytes) ["rom1_intro"]
+  EMPTY
+
 WRAM Bank #0:
   SECTION: $C0A1-$C0A9 ($0009 bytes) ["ram_textwriter"]
            $C0A3 = textwriter_posx
diff --git a/worlds/intro.asm b/worlds/intro.asm
new file mode 100644
index 0000000..394cb31
--- /dev/null
+++ b/worlds/intro.asm
@@ -0,0 +1,3 @@
+SECTION "rom1_intro", ROMX[$4000],BANK[1]
+; Intro cutscene
+db ""