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 da4470a..3288ae0 100644 Binary files a/main.o and b/main.o differ diff --git a/test.gb b/test.gb index 7df8b6f..15e5156 100644 Binary files a/test.gb and b/test.gb differ 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 ""