diff --git a/src/constants.asm b/src/constants.asm index 8b2523c..6768b76 100644 --- a/src/constants.asm +++ b/src/constants.asm @@ -51,9 +51,6 @@ CHARMAP "#", 125 SECTION "Static Data", ROM0 sLeady:: db " READY? " sGo:: db " GO " -sGameOver:: db "GAME OVER!" -sGameOver2:: db " RETRY[A] " -sGameOver3:: db " QUIT [B] " sPieceXOffsets:: ; How to draw each piece. X-offsets of the sprites. db 0, 8, 16, 24 ; I db 0, 8, 8, 16 ; Z diff --git a/src/include/globals.asm b/src/include/globals.asm index a22db4c..4df3d23 100644 --- a/src/include/globals.asm +++ b/src/include/globals.asm @@ -130,6 +130,10 @@ DEF SFX_RANK_UP EQU 12 DEF SFX_LEVEL_UP EQU 13 DEF SFX_IHS EQU 14 DEF STACK_SIZE EQU 64 +DEF GAME_OVER_R10 EQU 133 +DEF GAME_OVER_R12 EQU 153 +DEF GAME_OVER_R14 EQU 173 +DEF GAME_OVER_OTHER EQU 131 ENDC diff --git a/src/res/sources/tiles.gbr b/src/res/sources/tiles.gbr index b75f3ed..32a1650 100644 Binary files a/src/res/sources/tiles.gbr and b/src/res/sources/tiles.gbr differ diff --git a/src/res/tiles.inc b/src/res/tiles.inc index 8c8767b..16b073d 100644 --- a/src/res/tiles.inc +++ b/src/res/tiles.inc @@ -265,6 +265,256 @@ Tiles:: 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 + DB $FF,$00,$FF,$00,$FF,$00,$FF,$00 + DB $FF,$00,$FF,$00,$FF,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $FF,$7C,$FF,$C6,$FF,$C0,$FF,$CE + DB $FF,$C6,$FF,$C6,$FF,$7C,$00,$00 + DB $FF,$38,$FF,$6C,$FF,$C6,$FF,$FE + DB $FF,$C6,$FF,$C6,$FF,$C6,$00,$00 + DB $FF,$C6,$FF,$EE,$FF,$FE,$FF,$D6 + DB $FF,$C6,$FF,$C6,$FF,$C6,$00,$00 + DB $FF,$FE,$FF,$C0,$FF,$C0,$FF,$F8 + DB $FF,$C0,$FF,$C0,$FF,$FE,$00,$00 + DB $FF,$00,$FF,$00,$FF,$00,$FF,$00 + DB $FF,$00,$FF,$00,$FF,$00,$00,$00 + DB $FF,$7C,$FF,$C6,$FF,$C6,$FF,$C6 + DB $FF,$C6,$FF,$C6,$FF,$7C,$00,$00 + DB $FF,$C6,$FF,$C6,$FF,$6C,$FF,$6C + DB $FF,$6C,$FF,$38,$FF,$38,$00,$00 + DB $FF,$FE,$FF,$C0,$FF,$C0,$FF,$F8 + DB $FF,$C0,$FF,$C0,$FF,$FE,$00,$00 + DB $FF,$FC,$FF,$C6,$FF,$C6,$FF,$FC + DB $FF,$F8,$FF,$DC,$FF,$CE,$00,$00 + DB $FF,$18,$FF,$3C,$FF,$3C,$FF,$18 + DB $FF,$18,$FF,$00,$FF,$18,$00,$00 + DB $7C,$7C,$C6,$C6,$C0,$C0,$CE,$CE + DB $C6,$C6,$C6,$C6,$7C,$7C,$00,$00 + DB $38,$38,$6C,$6C,$C6,$C6,$FE,$FE + DB $C6,$C6,$C6,$C6,$C6,$C6,$00,$00 + DB $C6,$C6,$EE,$EE,$FE,$FE,$D6,$D6 + DB $C6,$C6,$C6,$C6,$C6,$C6,$00,$00 + DB $FE,$FE,$C0,$C0,$C0,$C0,$F8,$F8 + DB $C0,$C0,$C0,$C0,$FE,$FE,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $7C,$7C,$C6,$C6,$C6,$C6,$C6,$C6 + DB $C6,$C6,$C6,$C6,$7C,$7C,$00,$00 + DB $C6,$C6,$C6,$C6,$6C,$6C,$6C,$6C + DB $6C,$6C,$38,$38,$38,$38,$00,$00 + DB $FE,$FE,$C0,$C0,$C0,$C0,$F8,$F8 + DB $C0,$C0,$C0,$C0,$FE,$FE,$00,$00 + DB $FC,$FC,$C6,$C6,$C6,$C6,$FC,$FC + DB $F8,$F8,$DC,$DC,$CE,$CE,$00,$00 + DB $18,$18,$3C,$3C,$3C,$3C,$18,$18 + DB $18,$18,$00,$00,$18,$18,$00,$00 + DB $FF,$00,$FF,$00,$FF,$00,$FF,$00 + DB $FF,$00,$FF,$00,$FF,$00,$00,$00 + DB $FF,$FC,$FF,$C6,$FF,$C6,$FF,$FC + DB $FF,$F8,$FF,$DC,$FF,$CE,$00,$00 + DB $FF,$FE,$FF,$C0,$FF,$C0,$FF,$F8 + DB $FF,$C0,$FF,$C0,$FF,$FE,$00,$00 + DB $FF,$FC,$FF,$30,$FF,$30,$FF,$30 + DB $FF,$30,$FF,$30,$FF,$30,$00,$00 + DB $FF,$FC,$FF,$C6,$FF,$C6,$FF,$FC + DB $FF,$F8,$FF,$DC,$FF,$CE,$00,$00 + DB $FF,$C6,$FF,$EE,$FF,$7C,$FF,$38 + DB $FF,$70,$FF,$E0,$FF,$C0,$00,$00 + DB $FF,$F0,$FF,$C0,$FF,$C0,$FF,$C0 + DB $FF,$C0,$FF,$C0,$FF,$F0,$00,$00 + DB $FF,$38,$FF,$6C,$FF,$C6,$FF,$FE + DB $FF,$C6,$FF,$C6,$FF,$C6,$00,$00 + DB $FF,$0F,$FF,$03,$FF,$03,$FF,$03 + DB $FF,$03,$FF,$03,$FF,$0F,$00,$00 + DB $FF,$00,$FF,$00,$FF,$00,$FF,$00 + DB $FF,$00,$FF,$00,$FF,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $FC,$FC,$C6,$C6,$C6,$C6,$FC,$FC + DB $F8,$F8,$DC,$DC,$CE,$CE,$00,$00 + DB $FE,$FE,$C0,$C0,$C0,$C0,$F8,$F8 + DB $C0,$C0,$C0,$C0,$FE,$FE,$00,$00 + DB $FC,$FC,$30,$30,$30,$30,$30,$30 + DB $30,$30,$30,$30,$30,$30,$00,$00 + DB $FC,$FC,$C6,$C6,$C6,$C6,$FC,$FC + DB $F8,$F8,$DC,$DC,$CE,$CE,$00,$00 + DB $C6,$C6,$EE,$EE,$7C,$7C,$38,$38 + DB $70,$70,$E0,$E0,$C0,$C0,$00,$00 + DB $F0,$F0,$C0,$C0,$C0,$C0,$C0,$C0 + DB $C0,$C0,$C0,$C0,$F0,$F0,$00,$00 + DB $38,$38,$6C,$6C,$C6,$C6,$FE,$FE + DB $C6,$C6,$C6,$C6,$C6,$C6,$00,$00 + DB $0F,$0F,$03,$03,$03,$03,$03,$03 + DB $03,$03,$03,$03,$0F,$0F,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $FF,$00,$FF,$00,$FF,$00,$FF,$00 + DB $FF,$00,$FF,$00,$FF,$00,$00,$00 + DB $FF,$7C,$FF,$C6,$FF,$C6,$FF,$C6 + DB $FF,$D6,$FF,$DE,$FF,$7C,$00,$00 + DB $FF,$C6,$FF,$C6,$FF,$C6,$FF,$C6 + DB $FF,$C6,$FF,$C6,$FF,$7C,$00,$00 + DB $FF,$18,$FF,$18,$FF,$18,$FF,$18 + DB $FF,$18,$FF,$18,$FF,$18,$00,$00 + DB $FF,$FC,$FF,$30,$FF,$30,$FF,$30 + DB $FF,$30,$FF,$30,$FF,$30,$00,$00 + DB $FF,$00,$FF,$00,$FF,$00,$FF,$00 + DB $FF,$00,$FF,$00,$FF,$00,$00,$00 + DB $FF,$F0,$FF,$C0,$FF,$C0,$FF,$C0 + DB $FF,$C0,$FF,$C0,$FF,$F0,$00,$00 + DB $FF,$FC,$FF,$C6,$FF,$C6,$FF,$FC + DB $FF,$C6,$FF,$C6,$FF,$FC,$00,$00 + DB $FF,$0F,$FF,$03,$FF,$03,$FF,$03 + DB $FF,$03,$FF,$03,$FF,$0F,$00,$00 + DB $FF,$00,$FF,$00,$FF,$00,$FF,$00 + DB $FF,$00,$FF,$00,$FF,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $7C,$7C,$C6,$C6,$C6,$C6,$C6,$C6 + DB $D6,$D6,$DE,$DE,$7C,$7C,$00,$00 + DB $C6,$C6,$C6,$C6,$C6,$C6,$C6,$C6 + DB $C6,$C6,$C6,$C6,$7C,$7C,$00,$00 + DB $18,$18,$18,$18,$18,$18,$18,$18 + DB $18,$18,$18,$18,$18,$18,$00,$00 + DB $FC,$FC,$30,$30,$30,$30,$30,$30 + DB $30,$30,$30,$30,$30,$30,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $F0,$F0,$C0,$C0,$C0,$C0,$C0,$C0 + DB $C0,$C0,$C0,$C0,$F0,$F0,$00,$00 + DB $FC,$FC,$C6,$C6,$C6,$C6,$FC,$FC + DB $C6,$C6,$C6,$C6,$FC,$FC,$00,$00 + DB $0F,$0F,$03,$03,$03,$03,$03,$03 + DB $03,$03,$03,$03,$0F,$0F,$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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 $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 TilesEnd:: diff --git a/src/state_gameplay.asm b/src/state_gameplay.asm index e74d3e7..e9be30d 100644 --- a/src/state_gameplay.asm +++ b/src/state_gameplay.asm @@ -13,6 +13,7 @@ DEF MODE_SPAWN_PIECE EQU 4 DEF MODE_PIECE_IN_MOTION EQU 5 DEF MODE_DELAY EQU 6 DEF MODE_GAME_OVER EQU 7 +DEF MODE_PRE_GAME_OVER EQU 8 SECTION "Gameplay Variables", WRAM0 @@ -107,6 +108,8 @@ GamePlayEventLoopHandler:: jp z, pieceInMotionMode cp MODE_DELAY jp z, delayMode + cp MODE_PRE_GAME_OVER + jp z, preGameOverMode cp MODE_GAME_OVER jp z, gameOverMode @@ -231,10 +234,15 @@ spawnPieceMode: call TrySpawnPiece cp a, $FF jr z, :+ - ld a, MODE_GAME_OVER + ld a, MODE_PRE_GAME_OVER ld [wMode], a jp drawStaticInfo -: ld a, MODE_PIECE_IN_MOTION + + ; If you IRS at the exact time the piece spawns, you can get double IRS, we fix this by always saying A and B were held for a long time. +: ld a, $FF + ldh [hAState], a + ldh [hBState], a + ld a, MODE_PIECE_IN_MOTION ld [wMode], a @@ -271,7 +279,7 @@ pieceInMotionMode: call ToShadowField ; No fall through this time. -: jr drawStaticInfo +: jp drawStaticInfo delayMode: @@ -283,23 +291,107 @@ delayMode: ld a, MODE_FETCH_PIECE ld [wMode], a -: jr drawStaticInfo +: jp drawStaticInfo + +preGameOverMode: + ; Draw the field in grey. + ; Yes. This really unrolls the loop that many times. + ld hl, wField+(4*10) + REPT 60 + ld a, [hl] + cp a, TILE_FIELD_EMPTY + jr nz, .notempty1\@ + ld a, GAME_OVER_OTHER+1 + ld [hl+], a + jr .skip1\@ +.notempty1\@ + ld a, GAME_OVER_OTHER + ld [hl+], a +.skip1\@ + ENDR + DEF off = 0 + REPT 10 + ld a, [hl] + cp a, TILE_FIELD_EMPTY + jr nz, .notempty2\@ + ld a, GAME_OVER_R10+10+off + ld [hl+], a + jr .skip2\@ +.notempty2\@ + ld a, GAME_OVER_R10+off + ld [hl+], a +.skip2\@ + DEF off += 1 + ENDR + REPT 10 + ld a, [hl] + cp a, TILE_FIELD_EMPTY + jr nz, .notempty3\@ + ld a, GAME_OVER_OTHER+1 + ld [hl+], a + jr .skip3\@ +.notempty3\@ + ld a, GAME_OVER_OTHER + ld [hl+], a +.skip3\@ + ENDR + DEF off = 0 + REPT 10 + ld a, [hl] + cp a, TILE_FIELD_EMPTY + jr nz, .notempty4\@ + ld a, GAME_OVER_R12+10+off + ld [hl+], a + jr .skip4\@ +.notempty4\@ + ld a, GAME_OVER_R12+off + ld [hl+], a +.skip4\@ + DEF off += 1 + ENDR + REPT 10 + ld a, [hl] + cp a, TILE_FIELD_EMPTY + jr nz, .notempty5\@ + ld a, GAME_OVER_OTHER+1 + ld [hl+], a + jr .skip5\@ +.notempty5\@ + ld a, GAME_OVER_OTHER + ld [hl+], a +.skip5\@ + ENDR + DEF off = 0 + REPT 10 + ld a, [hl] + cp a, TILE_FIELD_EMPTY + jr nz, .notempty6\@ + ld a, GAME_OVER_R14+10+off + ld [hl+], a + jr .skip6\@ +.notempty6\@ + ld a, GAME_OVER_R14+off + ld [hl+], a +.skip6\@ + DEF off += 1 + ENDR + REPT 90 + ld a, [hl] + cp a, TILE_FIELD_EMPTY + jr nz, .notempty7\@ + ld a, GAME_OVER_OTHER+1 + ld [hl+], a + jr .skip7\@ +.notempty7\@ + ld a, GAME_OVER_OTHER + ld [hl+], a +.skip7\@ + ENDR + ld a, MODE_GAME_OVER + ld [wMode], a gameOverMode: - ld de, sGameOver - ld hl, wField+(10*10) - ld bc, 10 - call UnsafeMemCopy - ld de, sGameOver2 - ld hl, wField+(12*10) - ld bc, 10 - call UnsafeMemCopy - ld de, sGameOver3 - ld hl, wField+(14*10) - ld bc, 10 - call UnsafeMemCopy - ; Retry? ldh a, [hAState] cp a, 1 diff --git a/tools/Emulicious.ini b/tools/Emulicious.ini index 622878d..5d1e116 100644 --- a/tools/Emulicious.ini +++ b/tools/Emulicious.ini @@ -1,5 +1,5 @@ #Emulicious settings file -#Sat Oct 21 16:30:35 CEST 2023 +#Sat Oct 21 17:13:10 CEST 2023 WindowProfilerWindowOpen=false WindowEventViewerWindowHeight=1416 WindowEventViewerWindowDivider=876 @@ -182,7 +182,7 @@ Gamepad0Key21=-1 WindowDebuggerWidth=2576 Gamepad0Key20=-1 DebuggerSouthPanelSelectedTab=1 -WindowEmuliciousWidth=1096 +WindowEmuliciousWidth=816 WindowVideoViewerWidth=980 WindowMemoryEditorY=1374 WindowMemoryEditorX=799 @@ -199,15 +199,15 @@ Gamepad0Key11=-1 Gamepad0Key10=-1 StackWidth=2165 BankSwapAtPCBreakpointSuspend=true -WindowEmuliciousHeight=1896 +WindowEmuliciousHeight=781 WindowSpriteViewerHeight=527 GameBoyErrorBreakpointMessage32= InterruptBreakpointCondition= Recent1=C\:\\workspace\\dmgtris\\bin\\out.gb Recent0=K\:\\TGM\\dmgtris\\bin\\out.gb GameBoyErrorBreakpointMessage20= -WindowEmuliciousY=-8 -WindowEmuliciousX=-1088 +WindowEmuliciousY=696 +WindowEmuliciousX=1306 GameBoyErrorBreakpointEnabled9=false GameBoyErrorBreakpointEnabled8=false GameBoyErrorBreakpointEnabled7=false @@ -299,6 +299,6 @@ GameBoyErrorBreakpointSuspend10=true WindowSpriteViewerOpen=false WindowProfilerWindowY=639 WindowProfilerWindowX=461 -Scale=6.75 +Scale=5.0 KeyboardRequireWindowFocus=true WindowProfilerWindowProcedureProfiler=true diff --git a/tools/GBTD/gbtd.ini b/tools/GBTD/gbtd.ini index 721cc7d..85a8980 100644 --- a/tools/GBTD/gbtd.ini +++ b/tools/GBTD/gbtd.ini @@ -1,5 +1,5 @@ [General] -GBRPath=K:\TGM\dmgtris\src\res\sources\ +GBRPath=k:\tgm\dmgtris\src\res\sources\ [Recently used files] F0=k:\tgm\dmgtris\src\res\sources\tiles.gbr F1=c:\workspace\dmgtris\src\res\sources\tiles.gbr