diff --git a/ScreenShuffle.inc b/ScreenShuffle.inc index c930da3..5ae9d50 100644 --- a/ScreenShuffle.inc +++ b/ScreenShuffle.inc @@ -4,7 +4,7 @@ vState: db vShuffleIndex: db vShuffleTime: dw vShuffleCount: db -def cShuffleMax equ 9 ; the number of times you have to shuffle before you've "fully shuffled" +def cShuffleMax equ 8 ; the number of times you have to shuffle before you've "fully shuffled" POPS def S_Center = 0 @@ -74,45 +74,45 @@ ShuffleSetup: call CopyTilesToMap ld hl, Shuffle.BigCard - ld de, _SCRN0 + 32*4 + 7 + ld de, _SCRN0 + 32*6 + 7 ld b, 10 ld c, 6 call CopyTilesToMap ld hl, Shuffle.ShuffledEdges - ld de, _SCRN0 + 32*5 + 7 + ld de, _SCRN0 + 32*7 + 7 ld b, 8 ld c, 1 call CopyTilesToMap ld hl, Shuffle.ShuffledEdges + 8 - ld de, _SCRN0 + 32*5 + 12 + ld de, _SCRN0 + 32*7 + 12 ld b, 8 ld c, 1 call CopyTilesToMap ; draw left arrow ld a, VARIABLE_TILES_START + 18 - ld [_SCRN0 + 32*8 + 3], a + ld [_SCRN0 + 32*10 + 6], a ld a, VARIABLE_TILES_START + 20 - ld [_SCRN0 + 32*9 + 3], a + ld [_SCRN0 + 32*11 + 6], a ; right arrow ld a, VARIABLE_TILES_START + 19 - ld [_SCRN0 + 32*8 + 16], a + ld [_SCRN0 + 32*10 + 13], a ld a, VARIABLE_TILES_START + 21 - ld [_SCRN0 + 32*9 + 16], a + ld [_SCRN0 + 32*11 + 13], a ; up arrow ld a, VARIABLE_TILES_START + 22 - ld [_SCRN0 + 32*2 + 9], a + ld [_SCRN0 + 32*5 + 9], a ld a, VARIABLE_TILES_START + 23 - ld [_SCRN0 + 32*2 + 10], a + ld [_SCRN0 + 32*5 + 10], a ; down arrow ld a, VARIABLE_TILES_START + 24 - ld [_SCRN0 + 32*15 + 9], a + ld [_SCRN0 + 32*16 + 9], a ld a, VARIABLE_TILES_START + 25 - ld [_SCRN0 + 32*15 + 10], a + ld [_SCRN0 + 32*16 + 10], a ld hl, Shuffle.UITileData ld de, _VRAM + $1000 + VARIABLE_TILES_START*16 @@ -120,6 +120,16 @@ ShuffleSetup: call CopyRange + ld hl, Shuffle.ShuffledPopup + ld de, _SCRN0 + 32*1 + 5 + ld b, 3 + ld c, 10 + call CopyTilesToMap + + ld hl, Shuffle.ShuffleText + ld de, _SCRN0 + 32*2 + 6 + call PrintString + ret ShuffleUpdate: @@ -317,8 +327,10 @@ ShuffleAnimate: add hl, bc add hl, bc ; two bytes per entry - ; hl points to xy offsets - ld b, [hl] + ; hl points to yx offsets + ld a, [hl] + add a, 16 ; lower the big animated card by two tiles because i moved things afterwards + ld b, a inc hl ld c, [hl] ld a, 32 @@ -343,9 +355,9 @@ HideSprites: ld hl, MY_OAM .testTile ld a, [hl] - cp a, (2+4)*8 ; y < 5*8 => skip + cp a, (2+6)*8 ; y < 5*8 => skip jp c, .goToNextTile - cp a, (2+5+8)*8 ; y > (5+8)*8 => skip + cp a, (2+7+8)*8 ; y > (5+8)*8 => skip jp nc, .goToNextTile inc hl @@ -407,16 +419,9 @@ ShuffleTeardown: ret DoSomeShuffling: - call OneSwap - call OneSwap - call OneSwap - call OneSwap - call OneSwap - call OneSwap - call OneSwap - call OneSwap - call OneSwap - call OneSwap; 10 shuffles + rept 20 ; every time we shuffle do 20 swaps + call OneSwap + endr ld hl, vShuffleCount inc [hl] @@ -445,7 +450,7 @@ DoSomeShuffling: dec a jr nz, :- ; hl now points to the appropriate starting Shuffle Edge - ld de, _SCRN0 + 32*5 + 7 + ld de, _SCRN0 + 32*7 + 7 ld b, 8 ld c, 1 call CopyTilesToMap @@ -459,7 +464,7 @@ DoSomeShuffling: dec a jr nz, :- ; hl now points to the appropriate starting Shuffle Edge - ld de, _SCRN0 + 32*5 + 12 + ld de, _SCRN0 + 32*7 + 12 ld b, 8 ld c, 1 call CopyTilesToMap @@ -469,15 +474,6 @@ DoSomeShuffling: cp a, [hl] ret nz - ld hl, Shuffle.ShuffledPopup - ld de, _SCRN0 + 32*15 + 5 - ld b, 3 - ld c, 11 - call CopyTilesToMap - - ld hl, Shuffle.ShuffledText - ld de, _SCRN0 + 32*16 + 6 - call PrintString ret OneSwap: ; shuffles once and decrements vshuffleindex @@ -604,7 +600,7 @@ CardBackSprites24Copy: db $b6,$5f,$56,$bf,$b6,$5f,$f6,$ff,$06,$ff,$fe,$ff,$fe,$ff,$00,$ff ; bottom-right CardBackSprites24CopyEnd: Shuffle.UITileData: -db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$ff,$3f,$ff,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0 db $00,$ff,$ff,$ff,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$ff,$fc,$ff,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03 @@ -631,10 +627,8 @@ db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$ff,$7f,$ff,$40,$c0,$43,$c3,$31,$f1,$8c,$7c,$e3,$1f,$78,$07 db $00,$ff,$fe,$ff,$02,$03,$c2,$c3,$8c,$8f,$31,$3e,$c7,$f8,$1e,$e0 db $40,$c7,$47,$ff,$5f,$ff,$1c,$ff,$5b,$ff,$5b,$fe,$6a,$ff,$6b,$fe - db $02,$ff,$ec,$ff,$ee,$ff,$e6,$ff,$66,$ff,$6c,$ff,$6c,$ff,$6c,$ff db $40,$c0,$40,$c0,$40,$c7,$07,$ff,$7f,$ff,$7c,$ff,$63,$ff,$6f,$fe - db $02,$ff,$fc,$ff,$fe,$ff,$06,$ff,$f6,$ff,$ac,$7f,$6c,$bf,$ac,$7f - db $02,$ff,$fc,$ff,$fe,$ff,$06,$ff,$f6,$ff,$ac,$7f,$6c,$bf,$ec,$7f + db $00,$ff,$fe,$ff,$fe,$ff,$06,$ff,$f6,$ff,$ac,$7f,$6c,$bf,$ec,$7f db $40,$c0,$40,$c0,$40,$c3,$41,$c3,$41,$c3,$41,$c3,$41,$c3,$41,$c3 db $2d,$ff,$2d,$ff,$2d,$ff,$2d,$ff,$2d,$ff,$2d,$ff,$26,$ff,$36,$ff db $6a,$ff,$60,$ff,$6c,$ff,$6e,$ff,$66,$ff,$6c,$ff,$ec,$ff,$ec,$ff @@ -666,21 +660,19 @@ db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $40,$cf,$40,$cf,$44,$cf,$44,$cf,$44,$cf,$45,$cf,$45,$cf,$4d,$df db $c2,$f3,$c2,$f3,$c2,$f3,$c2,$f3,$d2,$fb,$d2,$fb,$b2,$fb,$ba,$ff db $62,$f3,$62,$f3,$62,$f3,$62,$f3,$b2,$fb,$b2,$fb,$b2,$fb,$ba,$ff - db $46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$45,$cf,$45,$cf,$45,$cf db $46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf - db $4d,$df,$4d,$df,$4d,$df,$4b,$df,$5b,$ff,$5b,$ff,$5b,$ff,$5b,$ff db $9a,$ff,$9a,$ff,$9a,$ff,$9c,$ff,$ac,$ff,$8c,$ff,$be,$ff,$be,$ff db $da,$ff,$da,$7f,$5a,$ff,$dc,$7f,$ec,$ff,$8c,$ff,$7c,$ff,$fe,$ff - db $41,$cf,$41,$cf,$41,$cf,$43,$cf,$43,$cf,$4b,$df,$4b,$df,$4b,$df db $43,$cf,$43,$cf,$43,$cf,$43,$cf,$43,$cf,$4b,$df,$4b,$df,$4d,$df db $46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$4d,$df,$4d,$df,$4d,$df - db $5b,$ff,$5b,$ff,$33,$ff,$3b,$ff,$1b,$ff,$43,$df,$4b,$df,$40,$df - db $80,$ff,$ac,$ff,$8c,$ff,$bc,$ff,$bc,$ff,$80,$ff,$82,$c3,$02,$c3 - db $80,$ff,$6c,$ff,$8c,$ff,$7c,$ff,$fc,$ff,$80,$ff,$02,$83,$02,$03 - db $4b,$df,$4b,$df,$4b,$df,$4b,$df,$4b,$df,$4b,$df,$4b,$df,$40,$df db $4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$40,$df db $80,$ff,$02,$83,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03 db $4d,$df,$4d,$df,$4d,$df,$4d,$df,$4c,$df,$4f,$df,$4f,$df,$40,$df + db $80,$ff,$82,$c3,$82,$c3,$82,$c3,$82,$c3,$82,$c3,$82,$c3,$02,$c3 + db $4d,$df,$4d,$df,$4b,$df,$4b,$df,$5b,$ff,$5b,$ff,$5b,$ff,$5b,$ff + db $00,$ff,$fe,$ff,$fe,$ff,$06,$ff,$f6,$ff,$ac,$7f,$6c,$bf,$ac,$7f + db $00,$ff,$ee,$ff,$ee,$ff,$e6,$ff,$66,$ff,$6c,$ff,$6c,$ff,$6c,$ff + db $57,$ff,$57,$ff,$33,$ff,$3c,$ff,$1f,$ff,$47,$df,$49,$df,$40,$df Shuffle.UITileDataEnd: Shuffle.BigCard: ; 6 wide by 10 tall @@ -696,29 +688,28 @@ Shuffle.BigCard: ; 6 wide by 10 tall db $29, $2a, $2a, $2a, $2a, $2b Shuffle.ShuffledEdges: ; this is a list of 10 pairs of 1x8 tall sprites, edges for the messy pile of cards - db $34, $3a, $40, $47, $4e, $55, $5a, $60 - db $35, $3b, $41, $48, $4f, $56, $5b, $61 - db $36, $3c, $42, $49, $4e, $55, $5a, $60 - db $35, $3b, $41, $48, $4f, $56, $5b, $61 - db $36, $3c, $42, $49, $4e, $55, $5a, $60 - db $37, $3d, $43, $4a, $50, $57, $5c, $62 - db $36, $3c, $44, $4b, $51, $58, $5d, $63 - db $37, $3d, $43, $4a, $50, $57, $5c, $62 - db $36, $3c, $44, $4b, $51, $58, $5d, $63 - db $38, $3e, $45, $4c, $52, $57, $5c, $62 - db $36, $3c, $44, $4b, $53, $59, $5e, $64 - db $22, $22, $22, $4d, $52, $57, $5c, $62 - db $36, $3c, $44, $4b, $53, $59, $5e, $64 - db $22, $22, $22, $4d, $52, $57, $5c, $65 - db $39, $3f, $46, $46, $54, $59, $5f, $66 - db $22, $22, $22, $4d, $52, $57, $5c, $65 - db $39, $3f, $46, $46, $54, $59, $5f, $66 - db $22, $22, $22, $22, $22, $22, $22, $22 - db $1e, $1e, $1e, $1e, $1e, $1e, $1e, $1e - db $22, $22, $22, $22, $22, $22, $22, $22 + db $34, $38, $3e, $45, $4c, $53, $5f, $62 +db $61, $39, $3f, $46, $4d, $54, $57, $5e +db $35, $3a, $40, $47, $4c, $53, $5f, $62 +db $61, $39, $3f, $46, $4d, $54, $57, $5e +db $35, $3a, $40, $47, $4c, $53, $5f, $62 +db $60, $3b, $41, $48, $4e, $55, $58, $5c +db $35, $3a, $42, $49, $4f, $56, $59, $5b +db $60, $3b, $41, $48, $4e, $55, $58, $5c +db $35, $3a, $42, $49, $51, $56, $59, $5b +db $36, $3c, $43, $4a, $50, $55, $58, $5c +db $35, $3a, $42, $49, $51, $56, $59, $5b +db $22, $22, $22, $4b, $50, $55, $58, $5c +db $37, $3d, $44, $44, $52, $56, $5a, $5d +db $22, $22, $22, $4b, $50, $55, $58, $5c +db $37, $3d, $44, $44, $52, $56, $5a, $5d +db $22, $22, $22, $22, $22, $22, $22, $22 +db $1e, $1e, $1e, $1e, $1e, $1e, $1e, $1e +db $22, $22, $22, $22, $22, $22, $22, $22 + -Shuffle.ShuffledText: - db 9, "Shuffled!" +Shuffle.ShuffleText: + db 8, "Shuffle!" Shuffle.ShuffledPopup1: db 9, 8 @@ -729,6 +720,6 @@ Shuffle.ShuffledPopup2: db 3, 0, 4 db 6, 5, 7 Shuffle.ShuffledPopup: - db 9, 2, 2, 2, 2, 2, 2, 2, 2, 2, 8 - db 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4 - db 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 7 \ No newline at end of file + db 9, 2, 2, 2, 2, 2, 2, 2, 2, 8 + db 3, 0, 0, 0, 0, 0, 0, 0, 0, 4 + db 6, 5, 5, 5, 5, 5, 5, 5, 5, 7 \ No newline at end of file diff --git a/card_art/screendesigns.aseprite b/card_art/screendesigns.aseprite index b5b0034..b9d6294 100644 Binary files a/card_art/screendesigns.aseprite and b/card_art/screendesigns.aseprite differ diff --git a/card_art/tileset.asm b/card_art/tileset.asm index d1e251f..4e63eea 100644 --- a/card_art/tileset.asm +++ b/card_art/tileset.asm @@ -30,10 +30,8 @@ tileset: db $00,$ff,$7f,$ff,$40,$c0,$43,$c3,$31,$f1,$8c,$7c,$e3,$1f,$78,$07 db $00,$ff,$fe,$ff,$02,$03,$c2,$c3,$8c,$8f,$31,$3e,$c7,$f8,$1e,$e0 db $40,$c7,$47,$ff,$5f,$ff,$1c,$ff,$5b,$ff,$5b,$fe,$6a,$ff,$6b,$fe - db $02,$ff,$ec,$ff,$ee,$ff,$e6,$ff,$66,$ff,$6c,$ff,$6c,$ff,$6c,$ff db $40,$c0,$40,$c0,$40,$c7,$07,$ff,$7f,$ff,$7c,$ff,$63,$ff,$6f,$fe - db $02,$ff,$fc,$ff,$fe,$ff,$06,$ff,$f6,$ff,$ac,$7f,$6c,$bf,$ac,$7f - db $02,$ff,$fc,$ff,$fe,$ff,$06,$ff,$f6,$ff,$ac,$7f,$6c,$bf,$ec,$7f + db $00,$ff,$fe,$ff,$fe,$ff,$06,$ff,$f6,$ff,$ac,$7f,$6c,$bf,$ec,$7f db $40,$c0,$40,$c0,$40,$c3,$41,$c3,$41,$c3,$41,$c3,$41,$c3,$41,$c3 db $2d,$ff,$2d,$ff,$2d,$ff,$2d,$ff,$2d,$ff,$2d,$ff,$26,$ff,$36,$ff db $6a,$ff,$60,$ff,$6c,$ff,$6e,$ff,$66,$ff,$6c,$ff,$ec,$ff,$ec,$ff @@ -65,30 +63,28 @@ tileset: db $40,$cf,$40,$cf,$44,$cf,$44,$cf,$44,$cf,$45,$cf,$45,$cf,$4d,$df db $c2,$f3,$c2,$f3,$c2,$f3,$c2,$f3,$d2,$fb,$d2,$fb,$b2,$fb,$ba,$ff db $62,$f3,$62,$f3,$62,$f3,$62,$f3,$b2,$fb,$b2,$fb,$b2,$fb,$ba,$ff - db $46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$45,$cf,$45,$cf,$45,$cf db $46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf - db $4d,$df,$4d,$df,$4d,$df,$4b,$df,$5b,$ff,$5b,$ff,$5b,$ff,$5b,$ff db $9a,$ff,$9a,$ff,$9a,$ff,$9c,$ff,$ac,$ff,$8c,$ff,$be,$ff,$be,$ff db $da,$ff,$da,$7f,$5a,$ff,$dc,$7f,$ec,$ff,$8c,$ff,$7c,$ff,$fe,$ff - db $41,$cf,$41,$cf,$41,$cf,$43,$cf,$43,$cf,$4b,$df,$4b,$df,$4b,$df db $43,$cf,$43,$cf,$43,$cf,$43,$cf,$43,$cf,$4b,$df,$4b,$df,$4d,$df db $46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$4d,$df,$4d,$df,$4d,$df - db $5b,$ff,$5b,$ff,$33,$ff,$3b,$ff,$1b,$ff,$43,$df,$4b,$df,$40,$df - db $80,$ff,$ac,$ff,$8c,$ff,$bc,$ff,$bc,$ff,$80,$ff,$82,$c3,$02,$c3 - db $80,$ff,$6c,$ff,$8c,$ff,$7c,$ff,$fc,$ff,$80,$ff,$02,$83,$02,$03 - db $4b,$df,$4b,$df,$4b,$df,$4b,$df,$4b,$df,$4b,$df,$4b,$df,$40,$df db $4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$40,$df db $80,$ff,$02,$83,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03 db $4d,$df,$4d,$df,$4d,$df,$4d,$df,$4c,$df,$4f,$df,$4f,$df,$40,$df + db $80,$ff,$82,$c3,$82,$c3,$82,$c3,$82,$c3,$82,$c3,$82,$c3,$02,$c3 + db $4d,$df,$4d,$df,$4b,$df,$4b,$df,$5b,$ff,$5b,$ff,$5b,$ff,$5b,$ff + db $00,$ff,$fe,$ff,$fe,$ff,$06,$ff,$f6,$ff,$ac,$7f,$6c,$bf,$ac,$7f + db $00,$ff,$ee,$ff,$ee,$ff,$e6,$ff,$66,$ff,$6c,$ff,$6c,$ff,$6c,$ff + db $57,$ff,$57,$ff,$33,$ff,$3c,$ff,$1f,$ff,$47,$df,$49,$df,$40,$df ShuffleUI: - db $34, $35, $36, $35, $36, $37, $36, $37, $36, $38, $36, $22, $36, $22, $39, $22, $39, $22, $1e, $22 - db $3a, $3b, $3c, $3b, $3c, $3d, $3c, $3d, $3c, $3e, $3c, $22, $3c, $22, $3f, $22, $3f, $22, $1e, $22 - db $40, $41, $42, $41, $42, $43, $44, $43, $44, $45, $44, $22, $44, $22, $46, $22, $46, $22, $1e, $22 - db $47, $48, $49, $48, $49, $4a, $4b, $4a, $4b, $4c, $4b, $4d, $4b, $4d, $46, $4d, $46, $22, $1e, $22 - db $4e, $4f, $4e, $4f, $4e, $50, $51, $50, $51, $52, $53, $52, $53, $52, $54, $52, $54, $22, $1e, $22 - db $55, $56, $55, $56, $55, $57, $58, $57, $58, $57, $59, $57, $59, $57, $59, $57, $59, $22, $1e, $22 - db $5a, $5b, $5a, $5b, $5a, $5c, $5d, $5c, $5d, $5c, $5e, $5c, $5e, $5c, $5f, $5c, $5f, $22, $1e, $22 - db $60, $61, $60, $61, $60, $62, $63, $62, $63, $62, $64, $62, $64, $65, $66, $65, $66, $22, $1e, $22 + db $34, $61, $35, $61, $35, $60, $35, $60, $35, $36, $35, $22, $37, $22, $37, $22, $1e, $22 + db $38, $39, $3a, $39, $3a, $3b, $3a, $3b, $3a, $3c, $3a, $22, $3d, $22, $3d, $22, $1e, $22 + db $3e, $3f, $40, $3f, $40, $41, $42, $41, $42, $43, $42, $22, $44, $22, $44, $22, $1e, $22 + db $45, $46, $47, $46, $47, $48, $49, $48, $49, $4a, $49, $4b, $44, $4b, $44, $22, $1e, $22 + db $4c, $4d, $4c, $4d, $4c, $4e, $4f, $4e, $51, $50, $51, $50, $52, $50, $52, $22, $1e, $22 + db $53, $54, $53, $54, $53, $55, $56, $55, $56, $55, $56, $55, $56, $55, $56, $22, $1e, $22 + db $5f, $57, $5f, $57, $5f, $58, $59, $58, $59, $58, $59, $58, $5a, $58, $5a, $22, $1e, $22 + db $62, $5e, $62, $5e, $62, $5c, $5b, $5c, $5b, $5c, $5b, $5c, $5d, $5c, $5d, $22, $1e, $22 diff --git a/source.zip b/source.zip index 4e577ae..5bc97c5 100644 Binary files a/source.zip and b/source.zip differ