From 782bd5c2c8f2c3c814ab425e229d090c3a243cab Mon Sep 17 00:00:00 2001 From: Randy Thiemann Date: Sat, 21 Oct 2023 11:15:38 +0200 Subject: [PATCH] Cleanup and bug fixes. --- src/field.asm | 2 +- src/include/globals.asm | 3 ++- src/res/sources/tiles.gbr | Bin 10069 -> 10069 bytes src/res/tiles.inc | 8 ++++---- tools/GBTD/gbtd.ini | 9 +++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/field.asm b/src/field.asm index 858b4f4..1a26525 100644 --- a/src/field.asm +++ b/src/field.asm @@ -991,7 +991,7 @@ FieldProcess:: ld d, h ld e, l call GetPieceData - ld a, 0 + ld a, TILE_GHOST ld b, a push hl push de diff --git a/src/include/globals.asm b/src/include/globals.asm index 4344f07..9c6904c 100644 --- a/src/include/globals.asm +++ b/src/include/globals.asm @@ -95,7 +95,8 @@ DEF FIELD_TOP_LEFT EQU $9800+1 DEF TILE_FIELD_EMPTY EQU 4 DEF TILE_PIECE_0 EQU 10 DEF TILE_0 EQU 66 -DEF TILE_CLEARING EQU 0 +DEF TILE_CLEARING EQU 124 +DEF TILE_GHOST EQU 125 DEF NEXT_BASE_X EQU 120 DEF NEXT_BASE_Y EQU 40 DEF HOLD_BASE_X EQU 120 diff --git a/src/res/sources/tiles.gbr b/src/res/sources/tiles.gbr index 262eea180257fc26a439e46a25f3e4c3977dd0f4..360911170f8fef96b7dc7d4969503211ce77641c 100644 GIT binary patch delta 161 zcmccWchzsh7WsN+7+_)sLnbI-WP(5#A1Vz~&CCD=aCs6LQ0Bt?06|X)fB*mh delta 33 pcmccWchzsh7Wu_7%8b0s3``8d3=9m642+D7n-3~XVq?0)2>_#92q^#n diff --git a/src/res/tiles.inc b/src/res/tiles.inc index 71ce888..a576c62 100644 --- a/src/res/tiles.inc +++ b/src/res/tiles.inc @@ -251,10 +251,10 @@ Tiles:: DB $6A,$42,$34,$24,$3C,$24,$00,$00 DB $2C,$34,$18,$18,$00,$00,$18,$18 DB $24,$3C,$24,$3C,$18,$18,$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 $FF,$FF,$AA,$FF,$00,$FF,$AA,$55 + DB $00,$FF,$55,$FF,$FF,$FF,$00,$00 + DB $00,$FF,$00,$FF,$00,$FF,$00,$FF + DB $00,$FF,$00,$FF,$00,$FF,$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 diff --git a/tools/GBTD/gbtd.ini b/tools/GBTD/gbtd.ini index cd26ee0..721cc7d 100644 --- a/tools/GBTD/gbtd.ini +++ b/tools/GBTD/gbtd.ini @@ -1,6 +1,7 @@ [General] -GBRPath=C:\workspace\dmgtris\src\res\sources\ +GBRPath=K:\TGM\dmgtris\src\res\sources\ [Recently used files] -F0=c:\workspace\dmgtris\src\res\sources\tiles.gbr -F1=c:\workspace\dmgtris\src\res\tiles.gbr -F2=c:\workspace\dmgtris\tiles.gbr +F0=k:\tgm\dmgtris\src\res\sources\tiles.gbr +F1=c:\workspace\dmgtris\src\res\sources\tiles.gbr +F2=c:\workspace\dmgtris\src\res\tiles.gbr +F3=c:\workspace\dmgtris\tiles.gbr