diff --git a/Code/main.asm b/Code/main.asm index 4f38de2..e16a0c2 100644 --- a/Code/main.asm +++ b/Code/main.asm @@ -23,11 +23,11 @@ Start: xor a ldh [rIF], a - - ; wait for v-blank - halt + + call ScrollNintendoOut ; disable screen + halt xor a ld [rLCDC], a diff --git a/Code/nintendo-out.asm b/Code/nintendo-out.asm new file mode 100644 index 0000000..b2303bb --- /dev/null +++ b/Code/nintendo-out.asm @@ -0,0 +1,26 @@ +INCLUDE "hardware.inc" + +SECTION "NintendoLogo", ROM0 + +EXPORT ScrollNintendoOut +SECTION "Scroll Nintendo Out", ROM0 +ScrollNintendoOut: + ld b, 30 +.wait + halt + xor a + ld [rIF], a + dec b + jr nz, .wait + +.scrollup + halt + xor a + ld [rIF], a + ldh a, [rSCY] + inc a + ldh [rSCY], a + cp a, 88 + jp nz, .scrollup + + ret \ No newline at end of file diff --git a/build.bat b/build.bat index f965f40..325b424 100644 --- a/build.bat +++ b/build.bat @@ -1,7 +1,8 @@ -..\..\Assembler\rgbasm -i ..\..\Include\ -i Graphics\ -i Code\ -o Build\main.o Code\main.asm -..\..\Assembler\rgbasm -i ..\..\Include\ -i Graphics\ -i Code\ -o Build\data.o Code\data.asm -..\..\Assembler\rgbasm -i ..\..\Include\ -i Graphics\ -i Code\ -o Build\automata.o Code\automata.asm -..\..\Assembler\rgbasm -i ..\..\Include\ -i Graphics\ -i Code\ -o Build\render.o Code\render.asm -..\..\Assembler\rgbasm -i ..\..\Include\ -i Graphics\ -i Code\ -o Build\utils.o Code\utils.asm -..\..\Assembler\rgblink -n rom.sym -w -t -o rom.gb -d Build/main.o Build/data.o Build/automata.o Build/render.o Build/utils.o +..\..\Assembler\rgbasm -i ..\..\Include\ -i Graphics\ -i Code\ -o Build\main.o Code\main.asm +..\..\Assembler\rgbasm -i ..\..\Include\ -i Graphics\ -i Code\ -o Build\data.o Code\data.asm +..\..\Assembler\rgbasm -i ..\..\Include\ -i Graphics\ -i Code\ -o Build\automata.o Code\automata.asm +..\..\Assembler\rgbasm -i ..\..\Include\ -i Graphics\ -i Code\ -o Build\render.o Code\render.asm +..\..\Assembler\rgbasm -i ..\..\Include\ -i Graphics\ -i Code\ -o Build\utils.o Code\utils.asm +..\..\Assembler\rgbasm -i ..\..\Include\ -i Graphics\ -i Code\ -o Build\nintendo-out.o Code\nintendo-out.asm +..\..\Assembler\rgblink -n rom.sym -w -t -o rom.gb -d Build/main.o Build/data.o Build/automata.o Build/render.o Build/utils.o Build/nintendo-out.o ..\..\Assembler\rgbfix -t "Game of Life" -v -p 0 rom.gb \ No newline at end of file diff --git a/rom.gb b/rom.gb index 40b908d..cea432a 100644 Binary files a/rom.gb and b/rom.gb differ