diff --git a/src/res/sources/tiles.gbr b/src/res/sources/tiles.gbr index a3940d2..b75f3ed 100644 Binary files a/src/res/sources/tiles.gbr and b/src/res/sources/tiles.gbr differ diff --git a/src/res/sources/title_map.gbm b/src/res/sources/title_map.gbm index 3fe46e2..97f5d59 100644 Binary files a/src/res/sources/title_map.gbm and b/src/res/sources/title_map.gbm differ diff --git a/src/res/tiles.inc b/src/res/tiles.inc index 2465ade..8c8767b 100644 --- a/src/res/tiles.inc +++ b/src/res/tiles.inc @@ -255,10 +255,16 @@ Tiles:: DB $00,$FF,$55,$FF,$FF,$FF,$00,$00 DB $DB,$E7,$A5,$C3,$42,$81,$81,$00 DB $42,$81,$A5,$C3,$DB,$E7,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $10,$10,$38,$38,$7C,$7C,$10,$10 + DB $7C,$7C,$38,$38,$10,$10,$00,$00 + DB $00,$00,$28,$28,$6C,$6C,$FE,$FE + DB $6C,$6C,$28,$28,$00,$00,$00,$00 + DB $00,$00,$18,$18,$18,$18,$30,$30 + DB $30,$30,$60,$60,$60,$60,$00,$00 + DB $F0,$F0,$C0,$C0,$C0,$C0,$C0,$C0 + DB $C0,$C0,$C0,$C0,$F0,$F0,$00,$00 + DB $0F,$0F,$03,$03,$03,$03,$03,$03 + DB $03,$03,$03,$03,$0F,$0F,$00,$00 TilesEnd:: diff --git a/src/res/title_map.inc b/src/res/title_map.inc index 6e893ca..f7e598d 100644 --- a/src/res/title_map.inc +++ b/src/res/title_map.inc @@ -42,6 +42,18 @@ DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 +DB $01,$01,$01,$01,$01,$01,$7E,$01,$57,$50 +DB $61,$50,$57,$01,$01,$81,$42,$42,$42,$42 +DB $82,$01,$01,$01,$01,$01,$01,$01,$01,$01 +DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 +DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 +DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 +DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 +DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 +DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 +DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 +DB $01,$01,$7F,$01,$4D,$60,$5F,$5F,$5A,$59 +DB $5E,$01,$81,$4C,$80,$4D,$82,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 @@ -59,17 +71,7 @@ DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 -DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 +DB $01,$01 TitleScreenTilemapEnd:: diff --git a/tools/Emulicious.ini b/tools/Emulicious.ini index 556a7b0..dce7865 100644 --- a/tools/Emulicious.ini +++ b/tools/Emulicious.ini @@ -1,5 +1,5 @@ #Emulicious settings file -#Fri Oct 20 18:08:57 CEST 2023 +#Sat Oct 21 13:58:43 CEST 2023 WindowProfilerWindowOpen=false WindowEventViewerWindowHeight=1416 WindowEventViewerWindowDivider=876 @@ -7,7 +7,7 @@ WindowMemoryTracerWindowY=631 WindowMemoryTracerWindowX=383 Update=2 AudioSync=false -DebuggerMemoryTabVisibleRect=0,0,583,128 +DebuggerMemoryTabVisibleRect=0,0,0,0 WindowProfilerWindowWidth=1073 UninitializedMemoryBreakpointSuspend=true GameBoyErrorBreakpointEnabled32=false @@ -92,7 +92,7 @@ GameBoyErrorBreakpointSuspend2=true GameBoyErrorBreakpointSuspend1=true GameBoyErrorBreakpointSuspend0=true DebuggerConsoleLogBreakpoints=true -WindowDebuggerOpen=true +WindowDebuggerOpen=false Gamepad1Key37=-1 Gamepad1Key36=-1 Gamepad1Key35=-1 @@ -203,10 +203,11 @@ WindowEmuliciousHeight=781 WindowSpriteViewerHeight=527 GameBoyErrorBreakpointMessage32= InterruptBreakpointCondition= -Recent0=C\:\\workspace\\dmgtris\\bin\\out.gb +Recent1=C\:\\workspace\\dmgtris\\bin\\out.gb +Recent0=K\:\\TGM\\dmgtris\\bin\\out.gb GameBoyErrorBreakpointMessage20= -WindowEmuliciousY=445 -WindowEmuliciousX=1412 +WindowEmuliciousY=509 +WindowEmuliciousX=-1010 GameBoyErrorBreakpointEnabled9=false GameBoyErrorBreakpointEnabled8=false GameBoyErrorBreakpointEnabled7=false diff --git a/tools/GBMB/gbmb.ini b/tools/GBMB/gbmb.ini index a88cd49..38d3763 100644 --- a/tools/GBMB/gbmb.ini +++ b/tools/GBMB/gbmb.ini @@ -1,5 +1,5 @@ [General] -GBMPath=C:\workspace\dmgtris\src\res\sources\ +GBMPath=K:\TGM\dmgtris\src\res\sources\ GBRPath=C:\workspace\dmgtris\src\res\ ViewInfoPanel=1 @@ -10,7 +10,8 @@ rem ViewDoubleMarkers=1 rem ViewPropertyColors=1 [Recently used files] -F0=c:\workspace\dmgtris\src\res\sources\title_map.gbm -F1=c:\workspace\dmgtris\src\res\sources\gameplay_map.gbm -F2=c:\workspace\dmgtris\src\res\gameplay.gbm -F3=c:\workspace\dmgtris\gameplay.gbm +F0=k:\tgm\dmgtris\src\res\sources\title_map.gbm +F1=c:\workspace\dmgtris\src\res\sources\title_map.gbm +F2=c:\workspace\dmgtris\src\res\sources\gameplay_map.gbm +F3=c:\workspace\dmgtris\src\res\gameplay.gbm +F4=c:\workspace\dmgtris\gameplay.gbm diff --git a/tools/projects/out.bps b/tools/projects/out.bps deleted file mode 100644 index 278a719..0000000 --- a/tools/projects/out.bps +++ /dev/null @@ -1 +0,0 @@ -type=instruction address=gameOverMode%20+%2079 end=gameOverMode%20+%2081 enabled=true suspend=true condition= message=