diff --git a/src/constants.asm b/src/constants.asm index 090ecfe..ac03e61 100644 --- a/src/constants.asm +++ b/src/constants.asm @@ -1,49 +1,51 @@ IF !DEF(CONSTANTS_ASM) DEF CONSTANTS_ASM EQU 1 - CHARMAP " ", 1 -CHARMAP "A", 74 -CHARMAP "B", 75 -CHARMAP "C", 76 -CHARMAP "D", 77 -CHARMAP "E", 78 -CHARMAP "F", 79 -CHARMAP "G", 80 -CHARMAP "H", 81 -CHARMAP "I", 82 -CHARMAP "J", 83 -CHARMAP "K", 84 -CHARMAP "L", 85 -CHARMAP "M", 86 -CHARMAP "N", 87 -CHARMAP "O", 88 -CHARMAP "P", 89 -CHARMAP "Q", 90 -CHARMAP "R", 91 -CHARMAP "S", 92 -CHARMAP "T", 93 -CHARMAP "U", 94 -CHARMAP "V", 95 -CHARMAP "W", 96 -CHARMAP "X", 97 -CHARMAP "Y", 98 -CHARMAP "Z", 99 -CHARMAP "0", 100 -CHARMAP "1", 101 -CHARMAP "2", 102 -CHARMAP "3", 103 -CHARMAP "4", 104 -CHARMAP "5", 105 -CHARMAP "6", 106 -CHARMAP "7", 107 -CHARMAP "8", 108 -CHARMAP "9", 109 +CHARMAP "0", 66 +CHARMAP "1", 67 +CHARMAP "2", 68 +CHARMAP "3", 69 +CHARMAP "4", 70 +CHARMAP "5", 71 +CHARMAP "6", 72 +CHARMAP "7", 73 +CHARMAP "8", 74 +CHARMAP "9", 75 +CHARMAP "A", 76 +CHARMAP "B", 77 +CHARMAP "C", 78 +CHARMAP "D", 79 +CHARMAP "E", 80 +CHARMAP "F", 81 +CHARMAP "G", 82 +CHARMAP "H", 83 +CHARMAP "I", 84 +CHARMAP "J", 85 +CHARMAP "K", 86 +CHARMAP "L", 87 +CHARMAP "M", 88 +CHARMAP "N", 89 +CHARMAP "O", 90 +CHARMAP "P", 91 +CHARMAP "Q", 92 +CHARMAP "R", 93 +CHARMAP "S", 94 +CHARMAP "T", 95 +CHARMAP "U", 96 +CHARMAP "V", 97 +CHARMAP "W", 98 +CHARMAP "X", 99 +CHARMAP "Y", 100 +CHARMAP "Z", 101 +CHARMAP "!", 102 +CHARMAP "?", 103 SECTION "Static Data", ROM0 -sLeady:: db " READY " -sGo:: db " GO " +sLeady:: db " READY? " +sGo:: db " GO " +sGameOver:: db "GAME OVER!" 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 56276a3..360e68a 100644 --- a/src/include/globals.asm +++ b/src/include/globals.asm @@ -92,9 +92,9 @@ DEF PALETTE_LIGHTER_1 EQU %10010000 DEF PALETTE_LIGHTER_2 EQU %01000000 DEF PALETTE_LIGHTER_3 EQU %00000000 DEF FIELD_TOP_LEFT EQU $9800+1 -DEF TILE_FIELD_EMPTY EQU 7 +DEF TILE_FIELD_EMPTY EQU 4 DEF TILE_PIECE_0 EQU 10 -DEF TILE_0 EQU 100 +DEF TILE_0 EQU 66 DEF NEXT_BASE_X EQU 120 DEF NEXT_BASE_Y EQU 40 DEF HOLD_BASE_X EQU 120 diff --git a/src/res/gameplay_map.inc b/src/res/gameplay_map.inc index f95c4c4..6a20b29 100644 --- a/src/res/gameplay_map.inc +++ b/src/res/gameplay_map.inc @@ -4,27 +4,73 @@ DEF GAMEPLAY_MAP_INC EQU 1 SECTION "Gameplay Tilemap", ROM0 GameplayTilemap:: - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$44,$42,$42,$42,$42,$42,$42,$43, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$57,$4E,$61,$5D,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$01,$01,$01,$01,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$01,$01,$01,$01,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$01,$01,$01,$01,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$01,$01,$01,$01,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$48,$42,$42,$42,$42,$42,$42,$47, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$51,$58,$55,$4D,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$01,$01,$01,$01,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$01,$01,$01,$01,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$01,$01,$01,$01,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$01,$01,$01,$01,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$48,$42,$42,$42,$42,$42,$42,$47, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$5C,$4C,$58,$5B,$4E,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$01,$01,$01,$01,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$48,$42,$42,$42,$42,$42,$42,$47, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$55,$4E,$5F,$4E,$55,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$01,$01,$01,$01,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$08,$08,$08,$08,$08,$08,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $02,$07,$07,$07,$07,$07,$07,$07,$07,$07,$07,$03,$49,$01,$01,$01,$01,$01,$01,$49, 0,0,0,0,0,0,0,0,0,0,0,0 - DB $05,$04,$04,$04,$04,$04,$04,$04,$04,$04,$04,$06,$46,$42,$42,$42,$42,$42,$42,$45, 0,0,0,0,0,0,0,0,0,0,0,0 + + DB $02,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $01,$03,$09,$01,$01,$01,$01,$01,$01,$09 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$02,$01,$01,$01,$01,$01,$01,$01 + DB $01,$01,$01,$03,$09,$59,$50,$63,$5F,$01 + DB $01,$09,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$02,$01,$01,$01,$01,$01 + DB $01,$01,$01,$01,$01,$03,$09,$01,$01,$01 + DB $01,$01,$01,$09,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$02,$01,$01,$01 + DB $01,$01,$01,$01,$01,$01,$01,$03,$09,$01 + DB $01,$01,$01,$01,$01,$09,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$02,$01 + DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$03 + DB $09,$01,$01,$01,$01,$01,$01,$09,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $02,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $01,$03,$09,$01,$01,$01,$01,$01,$01,$09 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$02,$01,$01,$01,$01,$01,$01,$01 + DB $01,$01,$01,$03,$08,$06,$06,$06,$06,$06 + DB $06,$07,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$02,$01,$01,$01,$01,$01 + DB $01,$01,$01,$01,$01,$03,$09,$53,$5A,$57 + DB $4F,$01,$01,$09,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$02,$01,$01,$01 + DB $01,$01,$01,$01,$01,$01,$01,$03,$09,$01 + DB $01,$01,$01,$01,$01,$09,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$02,$01 + DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$03 + DB $09,$01,$01,$01,$01,$01,$01,$09,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $02,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $01,$03,$09,$01,$01,$01,$01,$01,$01,$09 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$02,$01,$01,$01,$01,$01,$01,$01 + DB $01,$01,$01,$03,$09,$01,$01,$01,$01,$01 + DB $01,$09,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$02,$01,$01,$01,$01,$01 + DB $01,$01,$01,$01,$01,$03,$08,$06,$06,$06 + DB $06,$06,$06,$07,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$02,$01,$01,$01 + DB $01,$01,$01,$01,$01,$01,$01,$03,$09,$5E + DB $4E,$5A,$5D,$50,$01,$09,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$02,$01 + DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$03 + DB $09,$01,$01,$01,$01,$01,$01,$09,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $02,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $01,$03,$08,$06,$06,$06,$06,$06,$06,$07 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$02,$01,$01,$01,$01,$01,$01,$01 + DB $01,$01,$01,$03,$09,$57,$50,$61,$50,$57 + DB $01,$09,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$02,$01,$01,$01,$01,$01 + DB $01,$01,$01,$01,$01,$03,$09,$01,$01,$01 + DB $01,$01,$01,$09,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$02,$01,$01,$01 + DB $01,$01,$01,$01,$01,$01,$01,$03,$09,$01 + DB $05,$05,$05,$05,$01,$09,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$02,$01 + DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$03 + DB $09,$01,$01,$01,$01,$01,$01,$09,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $02,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$03,$09,$01,$01,$01,$01,$01,$01,$09 GameplayTilemapEnd:: diff --git a/src/res/sources/gameplay_map.gbm b/src/res/sources/gameplay_map.gbm index f22b730..c7913e7 100644 Binary files a/src/res/sources/gameplay_map.gbm and b/src/res/sources/gameplay_map.gbm differ diff --git a/src/res/sources/tiles.gbr b/src/res/sources/tiles.gbr index 0ce76d2..262eea1 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 16fc863..71ce888 100644 --- a/src/res/tiles.inc +++ b/src/res/tiles.inc @@ -11,18 +11,18 @@ Tiles:: DB $67,$1F,$67,$1F,$67,$1F,$00,$00 DB $E6,$F8,$E6,$F8,$E6,$F8,$E6,$F8 DB $E6,$F8,$E6,$F8,$E6,$F8,$00,$00 - DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$FF - DB $00,$FF,$FF,$00,$FF,$00,$00,$00 - DB $67,$1F,$67,$1F,$67,$1F,$60,$1F - DB $60,$1F,$7F,$00,$7F,$00,$00,$00 - DB $E6,$F8,$E6,$F8,$E6,$F8,$06,$F8 - DB $06,$F8,$FE,$00,$FE,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$01,$00,$00,$00 DB $00,$00,$00,$00,$00,$FF,$FF,$FF DB $00,$FF,$00,$00,$00,$00,$00,$00 - DB $80,$80,$E0,$E0,$F8,$F8,$FE,$FE - DB $F8,$F8,$E0,$E0,$80,$80,$00,$00 + DB $00,$00,$00,$00,$FF,$FF,$FF,$00 + DB $FF,$FF,$00,$00,$00,$00,$00,$00 + DB $1C,$14,$1C,$14,$FC,$E4,$F8,$08 + DB $FC,$E4,$1C,$14,$1C,$14,$00,$00 + DB $1C,$14,$1C,$14,$1F,$13,$0F,$08 + DB $1F,$13,$1C,$14,$1C,$14,$00,$00 + DB $1C,$14,$1C,$14,$1C,$14,$1C,$14 + DB $1C,$14,$1C,$14,$1C,$14,$00,$00 DB $00,$FF,$7E,$99,$66,$BD,$66,$BD DB $66,$BD,$7E,$99,$00,$FF,$00,$00 DB $00,$FF,$36,$C9,$6C,$93,$5A,$A5 @@ -135,22 +135,26 @@ Tiles:: DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00 DB $AA,$FF,$FF,$FF,$FF,$FF,$FF,$FF DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00 - DB $00,$00,$00,$00,$FF,$FF,$FF,$00 - DB $FF,$FF,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$F0,$F0,$F8,$08 - DB $FC,$E4,$1C,$14,$1C,$14,$00,$00 - DB $00,$00,$00,$00,$07,$07,$0F,$08 - DB $1F,$13,$1C,$14,$1C,$14,$00,$00 - DB $1C,$14,$1C,$14,$FC,$E4,$F8,$08 - DB $F0,$F0,$00,$00,$00,$00,$00,$00 - DB $1C,$14,$1C,$14,$1F,$13,$0F,$08 - DB $07,$07,$00,$00,$00,$00,$00,$00 - DB $1C,$14,$1C,$14,$FC,$E4,$F8,$08 - DB $FC,$E4,$1C,$14,$1C,$14,$00,$00 - DB $1C,$14,$1C,$14,$1F,$13,$0F,$08 - DB $1F,$13,$1C,$14,$1C,$14,$00,$00 - DB $1C,$14,$1C,$14,$1C,$14,$1C,$14 - DB $1C,$14,$1C,$14,$1C,$14,$00,$00 + DB $7C,$7C,$CE,$CE,$D6,$D6,$D6,$D6 + DB $D6,$D6,$E6,$E6,$7C,$7C,$00,$00 + DB $38,$38,$78,$78,$D8,$D8,$18,$18 + DB $18,$18,$18,$18,$18,$18,$00,$00 + DB $7C,$7C,$C6,$C6,$C6,$C6,$0C,$0C + DB $38,$38,$E0,$E0,$FE,$FE,$00,$00 + DB $7C,$7C,$C6,$C6,$06,$06,$0C,$0C + DB $06,$06,$C6,$C6,$7C,$7C,$00,$00 + DB $1C,$1C,$3C,$3C,$6C,$6C,$CC,$CC + DB $FE,$FE,$0C,$0C,$0C,$0C,$00,$00 + DB $FE,$FE,$C0,$C0,$C0,$C0,$FC,$FC + DB $06,$06,$06,$06,$FC,$FC,$00,$00 + DB $7C,$7C,$C6,$C6,$C0,$C0,$FC,$FC + DB $C6,$C6,$C6,$C6,$7C,$7C,$00,$00 + DB $FE,$FE,$0C,$0C,$18,$18,$18,$18 + DB $30,$30,$30,$30,$30,$30,$00,$00 + DB $7C,$7C,$C6,$C6,$C6,$C6,$7C,$7C + DB $C6,$C6,$C6,$C6,$7C,$7C,$00,$00 + DB $7C,$7C,$C6,$C6,$C6,$C6,$7E,$7E + DB $06,$06,$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 $FC,$FC,$C6,$C6,$C6,$C6,$FC,$FC @@ -167,10 +171,10 @@ Tiles:: DB $C6,$C6,$C6,$C6,$7C,$7C,$00,$00 DB $C6,$C6,$C6,$C6,$C6,$C6,$FE,$FE DB $C6,$C6,$C6,$C6,$C6,$C6,$00,$00 - DB $60,$60,$60,$60,$60,$60,$60,$60 - DB $60,$60,$60,$60,$60,$60,$00,$00 - DB $0C,$0C,$0C,$0C,$0C,$0C,$0C,$0C - DB $CC,$CC,$CC,$CC,$78,$78,$00,$00 + DB $18,$18,$18,$18,$18,$18,$18,$18 + DB $18,$18,$18,$18,$18,$18,$00,$00 + DB $06,$06,$06,$06,$06,$06,$06,$06 + DB $66,$66,$66,$66,$3C,$3C,$00,$00 DB $C6,$C6,$C6,$C6,$CC,$CC,$F8,$F8 DB $CC,$CC,$C6,$C6,$C6,$C6,$00,$00 DB $60,$60,$60,$60,$60,$60,$60,$60 @@ -203,58 +207,54 @@ Tiles:: DB $70,$70,$E0,$E0,$C0,$C0,$00,$00 DB $FE,$FE,$0C,$0C,$18,$18,$30,$30 DB $60,$60,$C0,$C0,$FE,$FE,$00,$00 - DB $7C,$7C,$CE,$CE,$D6,$D6,$D6,$D6 - DB $D6,$D6,$E6,$E6,$7C,$7C,$00,$00 - DB $38,$38,$78,$78,$D8,$D8,$18,$18 - DB $18,$18,$18,$18,$18,$18,$00,$00 - DB $7C,$7C,$C6,$C6,$C6,$C6,$0C,$0C - DB $38,$38,$E0,$E0,$FE,$FE,$00,$00 - DB $7C,$7C,$C6,$C6,$06,$06,$0C,$0C - DB $06,$06,$C6,$C6,$7C,$7C,$00,$00 - DB $1C,$1C,$3C,$3C,$6C,$6C,$CC,$CC - DB $FE,$FE,$0C,$0C,$0C,$0C,$00,$00 - DB $FE,$FE,$C0,$C0,$C0,$C0,$FC,$FC - DB $06,$06,$06,$06,$FC,$FC,$00,$00 - DB $7C,$7C,$C6,$C6,$C0,$C0,$FC,$FC - DB $C6,$C6,$C6,$C6,$7C,$7C,$00,$00 - DB $FE,$FE,$0C,$0C,$18,$18,$18,$18 - DB $30,$30,$30,$30,$30,$30,$00,$00 - DB $7C,$7C,$C6,$C6,$C6,$C6,$7C,$7C - DB $C6,$C6,$C6,$C6,$7C,$7C,$00,$00 - DB $7C,$7C,$C6,$C6,$C6,$C6,$7E,$7E - DB $06,$06,$C6,$C6,$7C,$7C,$00,$00 - DB $00,$7C,$00,$CE,$00,$D6,$00,$D6 - DB $00,$D6,$00,$E6,$00,$7C,$00,$00 - DB $00,$38,$00,$78,$00,$D8,$00,$18 - DB $00,$18,$00,$18,$00,$18,$00,$00 - DB $00,$7C,$00,$C6,$00,$C6,$00,$0C - DB $00,$38,$00,$E0,$00,$FE,$00,$00 - DB $00,$7C,$00,$C6,$00,$06,$00,$0C - DB $00,$06,$00,$C6,$00,$7C,$00,$00 - DB $00,$1C,$00,$3C,$00,$6C,$00,$CC - DB $00,$FE,$00,$0C,$00,$0C,$00,$00 - DB $00,$FE,$00,$C0,$00,$C0,$00,$FC - DB $00,$06,$00,$06,$00,$FC,$00,$00 - DB $00,$7C,$00,$C6,$00,$C0,$00,$FC - DB $00,$C6,$00,$C6,$00,$7C,$00,$00 - DB $00,$FE,$00,$0C,$00,$18,$00,$18 - DB $00,$30,$00,$30,$00,$30,$00,$00 - DB $00,$7C,$00,$C6,$00,$C6,$00,$7C - DB $00,$C6,$00,$C6,$00,$7C,$00,$00 - DB $00,$7C,$00,$C6,$00,$C6,$00,$7E - DB $00,$06,$00,$C6,$00,$7C,$00,$00 - DB $3C,$FF,$3C,$FF,$3C,$FF,$3C,$FF - DB $3C,$FF,$3C,$FF,$3C,$FF,$00,$00 - DB $99,$7E,$99,$7E,$99,$7E,$99,$7E - DB $99,$7E,$99,$7E,$99,$7E,$00,$00 - DB $C3,$3C,$C3,$3C,$C3,$3C,$C3,$3C - DB $C3,$3C,$C3,$3C,$C3,$3C,$00,$00 - DB $66,$18,$66,$18,$66,$18,$66,$18 - DB $66,$18,$66,$18,$66,$18,$00,$00 - DB $3C,$00,$3C,$00,$3C,$00,$3C,$00 - DB $3C,$00,$3C,$00,$3C,$00,$00,$00 - DB $18,$00,$18,$00,$18,$00,$18,$00 - DB $18,$00,$18,$00,$18,$00,$00,$00 + DB $18,$18,$3C,$3C,$3C,$3C,$18,$18 + DB $18,$18,$00,$00,$18,$18,$00,$00 + DB $3C,$3C,$66,$66,$0C,$0C,$18,$18 + DB $18,$18,$00,$00,$18,$18,$00,$00 + DB $7C,$7C,$42,$42,$41,$41,$6A,$48 + DB $5D,$4C,$6E,$4C,$7F,$4C,$00,$00 + DB $5D,$6E,$6E,$5D,$5D,$6E,$48,$7F + DB $41,$7F,$42,$7E,$7C,$7C,$00,$00 + DB $3E,$3E,$21,$21,$21,$20,$AE,$A4 + DB $B7,$A6,$AD,$A5,$BC,$A4,$00,$00 + DB $B4,$AC,$AC,$B4,$B4,$AC,$A4,$BC + DB $24,$3C,$24,$3C,$3C,$3C,$00,$00 + DB $3E,$3E,$42,$42,$82,$82,$56,$12 + DB $BA,$32,$56,$52,$9E,$92,$00,$00 + DB $1A,$16,$16,$1A,$1A,$16,$12,$1E + DB $12,$1E,$12,$1E,$1E,$1E,$00,$00 + DB $1E,$1E,$21,$21,$40,$40,$DD,$8C + DB $B3,$93,$D0,$90,$F7,$97,$00,$00 + DB $B6,$D5,$D3,$B2,$B2,$D3,$8C,$FF + DB $40,$7F,$21,$3F,$1E,$1E,$00,$00 + DB $1F,$1F,$10,$10,$90,$90,$5F,$5E + DB $C2,$C2,$03,$02,$C3,$C2,$00,$00 + DB $C2,$43,$43,$C2,$C2,$43,$42,$C3 + DB $82,$83,$02,$03,$03,$03,$00,$00 + DB $FB,$FB,$0A,$0A,$0A,$0A,$7B,$7A + DB $C2,$42,$43,$42,$C3,$42,$00,$00 + DB $C2,$43,$43,$C2,$C2,$43,$42,$C3 + DB $42,$C3,$42,$C3,$C3,$C3,$00,$00 + DB $FC,$FC,$02,$02,$01,$01,$7D,$79 + DB $AB,$01,$56,$02,$FC,$4C,$00,$00 + DB $E8,$58,$74,$EC,$EC,$74,$52,$DE + DB $52,$DE,$49,$CF,$CF,$CF,$00,$00 + DB $78,$78,$49,$49,$4A,$4A,$5B,$4A + DB $6A,$4A,$5B,$4A,$7B,$4A,$00,$00 + DB $69,$59,$58,$68,$68,$58,$4B,$7B + DB $4A,$7B,$4A,$7B,$7B,$7B,$00,$00 + DB $FF,$FF,$01,$01,$01,$01,$7F,$3F + DB $C0,$40,$7C,$3C,$FE,$02,$00,$00 + DB $AB,$55,$F5,$FB,$0B,$0D,$F1,$FF + DB $01,$FF,$02,$FE,$FC,$FC,$00,$00 + DB $7E,$7E,$42,$42,$42,$42,$56,$42 + 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 $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/Emulicious.ini b/tools/Emulicious.ini index 3681f19..382ba6b 100644 --- a/tools/Emulicious.ini +++ b/tools/Emulicious.ini @@ -1,5 +1,5 @@ #Emulicious settings file -#Wed Oct 18 05:24:23 CEST 2023 +#Wed Oct 18 06:05:54 CEST 2023 WindowEventViewerWindowHeight=1416 WindowEventViewerWindowDivider=876 WindowMemoryTracerWindowY=631 diff --git a/tools/GBMB/gbmb.ini b/tools/GBMB/gbmb.ini index 34e4855..6d3b306 100644 --- a/tools/GBMB/gbmb.ini +++ b/tools/GBMB/gbmb.ini @@ -1,5 +1,5 @@ [General] -GBMPath=C:\workspace\dmgtris\src\res\ +GBMPath=C:\workspace\dmgtris\src\res\sources\ GBRPath=C:\workspace\dmgtris\src\res\ ViewInfoPanel=1 @@ -10,5 +10,6 @@ rem ViewDoubleMarkers=1 rem ViewPropertyColors=1 [Recently used files] -F0=c:\workspace\dmgtris\src\res\gameplay.gbm -F1=c:\workspace\dmgtris\gameplay.gbm +F0=c:\workspace\dmgtris\src\res\sources\gameplay_map.gbm +F1=c:\workspace\dmgtris\src\res\gameplay.gbm +F2=c:\workspace\dmgtris\gameplay.gbm diff --git a/tools/GBTD/gbtd.ini b/tools/GBTD/gbtd.ini index 4a3d899..e64c41a 100644 --- a/tools/GBTD/gbtd.ini +++ b/tools/GBTD/gbtd.ini @@ -1,5 +1,6 @@ [General] -GBRPath=c:\workspace\dmgtris\src\res\ +GBRPath=c:\workspace\dmgtris\src\res\sources\ [Recently used files] -F0=c:\workspace\dmgtris\src\res\tiles.gbr -F1=c:\workspace\dmgtris\tiles.gbr +F0=c:\workspace\dmgtris\src\res\sources\tiles.gbr +F1=c:\workspace\dmgtris\src\res\tiles.gbr +F2=c:\workspace\dmgtris\tiles.gbr