diff --git a/ScreenShuffle.inc b/ScreenShuffle.inc index 143eae3..fa1b7c4 100644 --- a/ScreenShuffle.inc +++ b/ScreenShuffle.inc @@ -5,7 +5,7 @@ vCurrentAnimation: dw ;def vCurrentAnimation EQU vState+1 ; 2 bytes vShuffleIndex: db ;def vShuffleIndex equ vCurrentAnimation+2 vShuffleTime: dw ;def vShuffleTime equ vShuffleIndex+1 ; 2 bytes vShuffleCount: db -def cShuffleMax equ 8 ; the number of times you have to shuffle before you've "fully shuffled" +def cShuffleMax equ 9 ; the number of times you have to shuffle before you've "fully shuffled" POPS def S_Center = 0 @@ -58,34 +58,45 @@ ShuffleSetup: call CopyTilesToMap ld hl, Shuffle.BigCard - ld de, _SCRN0 + 32*5 + 8 - ld b, 8 - ld c, 4 + ld de, _SCRN0 + 32*4 + 7 + ld b, 10 + ld c, 6 + call CopyTilesToMap + + ld hl, Shuffle.ShuffledEdges + ld de, _SCRN0 + 32*5 + 7 + ld b, 8 + ld c, 1 + call CopyTilesToMap + ld hl, Shuffle.ShuffledEdges + 8 + ld de, _SCRN0 + 32*5 + 12 + ld b, 8 + ld c, 1 call CopyTilesToMap - ld a, VARIABLE_TILES_START + 9 ; draw left arrow + ld a, VARIABLE_TILES_START + 18 ld [_SCRN0 + 32*8 + 3], a - inc a + ld a, VARIABLE_TILES_START + 20 ld [_SCRN0 + 32*9 + 3], a ; right arrow - inc a + ld a, VARIABLE_TILES_START + 19 ld [_SCRN0 + 32*8 + 16], a - inc a + ld a, VARIABLE_TILES_START + 21 ld [_SCRN0 + 32*9 + 16], a ; up arrow - inc a + ld a, VARIABLE_TILES_START + 22 ld [_SCRN0 + 32*2 + 9], a - inc a + ld a, VARIABLE_TILES_START + 23 ld [_SCRN0 + 32*2 + 10], a ; down arrow - inc a + ld a, VARIABLE_TILES_START + 24 ld [_SCRN0 + 32*15 + 9], a - inc a + ld a, VARIABLE_TILES_START + 25 ld [_SCRN0 + 32*15 + 10], a ld hl, Shuffle.UITileData @@ -385,6 +396,8 @@ DoSomeShuffling: call OneSwap call OneSwap call OneSwap; 10 shuffles + ld hl, vShuffleCount + inc [hl] ld hl, vAsyncIsBusy xor a, a @@ -399,52 +412,51 @@ DoSomeShuffling: ld hl, vShuffleCount ld a, cShuffleMax cp a, [hl] - jr z, .lastCharge - jr nc, .addCharge - jr c, .done - .addCharge - inc [hl] - ld b, [hl] - - ld hl, _SCRN0 + 32*13 - ld de, _SCRN0 + 32*13 + 19 - - : ; loop - ld a, l - sub a, 32 - ld l, a - ld a, h - sbc a, 0 - ld h, a - ld [hl], VARIABLE_TILES_START + 17 - - ld a, e - sub a, 32 - ld e, a - ld a, d - sbc a, 0 - ld d, a - ld a, VARIABLE_TILES_START + 17 - ld [de], a - - - dec b - jr nz, :- - jr .done - .lastCharge - ; copy tiles from where they are linearly packed at an origin (hl) - ; to a rectangle in the tilemap in vram (de) - ; assuming it has height in b and width in c. - ld hl, Shuffle.ShuffledPopup - ld de, _SCRN0 + 32*14 + 5 - ld b, 3 - ld c, 11 - call CopyTilesToMap - - ld hl, Shuffle.ShuffledText - ld de, _SCRN0 + 32*15 + 6 - call PrintString - .done + jr nc, .drawFrame ; if shufflemax-shufflecount doesn't carry, then draw a frame of animation + ret c ; if shufflemax - shufflecount does carry, then we don't have to draw anything + +.drawFrame + ld a, [vShuffleCount] + ld hl, Shuffle.ShuffledEdges + ld bc, 16 + : ; step forward by 16, vShuffleCount times + add hl, bc + dec a + jr nz, :- + ; hl now points to the appropriate starting Shuffle Edge + ld de, _SCRN0 + 32*5 + 7 + ld b, 8 + ld c, 1 + call CopyTilesToMap + + ; now do the same thing but stepped forward 8 tiles to draw the right sides of the things + ld a, [vShuffleCount] + ld hl, Shuffle.ShuffledEdges + 8 + ld bc, 16 + : ; step forward by 16, vShuffleCount times + add hl, bc + dec a + jr nz, :- + ; hl now points to the appropriate starting Shuffle Edge + ld de, _SCRN0 + 32*5 + 12 + ld b, 8 + ld c, 1 + call CopyTilesToMap + + ld hl, vShuffleCount + ld a, cShuffleMax + 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 @@ -519,15 +531,15 @@ ShuffleAnimations: ShuffleAnimationNone: db 1, 56, 72 ShuffleAnimationRight: - db 1, 56, 115 + db 1, 56, 117 ShuffleAnimationRightOut: - db 9, 56, 72, 56, 80, 56, 88, 56, 96, 56, 103, 56, 108, 56, 112, 56, 114, 56, 115, + db 9, 56, 72, 56, 80, 56, 88, 56, 96, 56, 103, 56, 108, 56, 112, 56, 116, 56, 117, ShuffleAnimationRightIn: db 8, 56, 115, 56, 104, 56, 96, 56, 88, 56, 80, 56, 76, 56, 73, 56, 72, ShuffleAnimationLeft: - db 1, 56, 32 + db 1, 56, 27 ShuffleAnimationLeftOut: - db 9, 56, 72, 56, 64, 56, 56, 56, 49, 56, 42, 56, 36, 56, 35, 56, 33, 56, 32, + db 9, 56, 72, 56, 64, 56, 56, 56, 49, 56, 42, 56, 36, 56, 33, 56, 29, 56, 28, ShuffleAnimationLeftIn: db 8, 56, 32, 56, 40, 56, 49, 56, 57, 56, 62, 56, 67, 56, 71, 56, 72, ShuffleAnimationUp: @@ -543,38 +555,118 @@ db 13, 56, 72, 64, 72, 72, 72, 80, 72, 88, 72, 96, 72, 105, 72, 112, 72, 119, 72 ShuffleAnimationDownIn: db 12, 136, 72, 128, 72, 120, 72, 112, 72, 104, 72, 96, 72, 88, 72, 80, 72, 68, 72, 61, 72, 58, 72, 56, 72, Shuffle.UITileData: - db $00,$ff,$7f,$ff,$7f,$ff,$60,$ff,$6f,$ff,$6d,$fa,$6a,$fd,$6d,$fa ; top-left - db $00,$ff,$ff,$ff,$ff,$ff,$00,$ff,$ff,$ff,$55,$aa,$aa,$55,$55,$aa ; top-middle - db $00,$ff,$fe,$ff,$fe,$ff,$06,$ff,$f6,$ff,$56,$bf,$b6,$5f,$56,$bf ; top-right - db $6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa ; middle-left - db $aa,$55,$55,$aa,$aa,$55,$55,$aa,$aa,$55,$55,$aa,$aa,$55,$55,$aa ; middle-middle - db $b6,$5f,$56,$bf,$b6,$5f,$56,$bf,$b6,$5f,$56,$bf,$b6,$5f,$56,$bf ; middle-right - db $6a,$fd,$6d,$fa,$6a,$fd,$6f,$ff,$60,$ff,$7f,$ff,$7f,$ff,$00,$ff ; bottom-left - db $aa,$55,$55,$aa,$aa,$55,$ff,$ff,$00,$ff,$ff,$ff,$ff,$ff,$00,$ff ; bottom-middle - db $b6,$5f,$56,$bf,$b6,$5f,$f6,$ff,$06,$ff,$fe,$ff,$fe,$ff,$00,$ff ; bottom-right - - db $60,$1f,$ce,$3f,$d2,$33,$92,$73,$a2,$63,$22,$e3,$4a,$cb,$5a,$db ; arrows, starting at VTS+9 - db $5a,$db,$4a,$cb,$22,$e3,$a2,$63,$92,$73,$d2,$33,$ce,$3f,$60,$1f - db $06,$f8,$73,$fc,$4b,$cc,$49,$ce,$45,$c6,$44,$c7,$52,$d3,$5a,$db ; right arrow +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 + db $40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0 + db $00,$ff,$7f,$ff,$7f,$ff,$60,$ff,$6f,$ff,$6d,$fa,$6a,$fd,$6d,$fa + db $00,$ff,$ff,$ff,$ff,$ff,$00,$ff,$ff,$ff,$55,$aa,$aa,$55,$55,$aa + db $00,$ff,$fe,$ff,$fe,$ff,$06,$ff,$f6,$ff,$56,$bf,$b6,$5f,$56,$bf + db $02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03 + db $6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa + db $aa,$55,$55,$aa,$aa,$55,$55,$aa,$aa,$55,$55,$aa,$aa,$55,$55,$aa + db $b6,$5f,$56,$bf,$b6,$5f,$56,$bf,$b6,$5f,$56,$bf,$b6,$5f,$56,$bf + db $6a,$fd,$6d,$fa,$6a,$fd,$6f,$ff,$60,$ff,$7f,$ff,$7f,$ff,$00,$ff + db $aa,$55,$55,$aa,$aa,$55,$ff,$ff,$00,$ff,$ff,$ff,$ff,$ff,$00,$ff + db $b6,$5f,$56,$bf,$b6,$5f,$f6,$ff,$06,$ff,$fe,$ff,$fe,$ff,$00,$ff + db $40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$3f,$ff,$00,$ff + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$ff,$ff,$00,$ff + db $02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$fc,$ff,$00,$ff + db $60,$1f,$ce,$3f,$d2,$33,$92,$73,$a2,$63,$22,$e3,$4a,$cb,$5a,$db + db $06,$f8,$73,$fc,$4b,$cc,$49,$ce,$45,$c6,$44,$c7,$52,$d3,$5a,$db + db $5a,$db,$4a,$cb,$22,$e3,$a2,$63,$92,$73,$d2,$33,$ce,$3f,$60,$1f db $5a,$db,$52,$d3,$44,$c7,$45,$c6,$49,$ce,$4b,$cc,$73,$fc,$06,$f8 - db $78,$07,$e3,$1f,$8c,$7c,$31,$f1,$43,$c3,$40,$c0,$7f,$ff,$00,$ff ; up arrow + db $78,$07,$e3,$1f,$8c,$7c,$31,$f1,$43,$c3,$40,$c0,$7f,$ff,$00,$ff db $1e,$e0,$c7,$f8,$31,$3e,$8c,$8f,$c2,$c3,$02,$03,$fe,$ff,$00,$ff - db $00,$ff,$7f,$ff,$40,$c0,$43,$c3,$31,$f1,$8c,$7c,$e3,$1f,$78,$07 ; down arrow + 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 $00,$00,$7e,$7e,$00,$7e,$7e,$00,$7e,$00,$00,$7e,$7e,$7e,$00,$00 ; fill marker + 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 $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 + db $2a,$fd,$2d,$fe,$36,$fd,$35,$fe,$36,$fd,$35,$fe,$36,$fd,$35,$fe + db $0a,$ff,$f0,$ff,$fc,$ff,$0e,$ff,$e6,$ff,$ac,$7f,$6c,$bf,$ac,$7f + db $5a,$ff,$da,$7f,$5a,$ff,$da,$7f,$da,$ff,$b2,$fb,$b2,$fb,$b2,$fb + db $41,$c3,$41,$c3,$41,$c3,$41,$c3,$43,$c7,$43,$c7,$43,$c7,$43,$c7 + db $36,$ff,$36,$ff,$57,$ff,$57,$ff,$57,$ff,$57,$ff,$57,$ff,$52,$ff + db $cc,$ff,$dc,$ff,$da,$ff,$da,$ff,$da,$ff,$da,$ff,$da,$ff,$d2,$fb + db $36,$fd,$37,$fe,$5a,$ff,$5b,$fe,$5a,$ff,$5b,$fe,$5a,$ff,$5a,$ff + db $6c,$ff,$dc,$7f,$5a,$ff,$da,$7f,$5a,$ff,$da,$ff,$ba,$ff,$b2,$fb + db $36,$fd,$37,$fe,$5a,$ff,$5b,$fe,$5a,$ff,$5b,$fe,$5a,$ff,$5b,$fe + db $b2,$fb,$b2,$fb,$b2,$fb,$62,$f3,$62,$f3,$62,$f3,$62,$f3,$62,$f3 + db $43,$c7,$43,$c7,$43,$c7,$43,$c7,$43,$c7,$43,$c7,$43,$c7,$43,$c7 + db $5a,$ff,$5a,$ff,$5a,$ff,$49,$df,$49,$df,$49,$df,$49,$df,$49,$df + db $d2,$fb,$d2,$fb,$d2,$fb,$d2,$fb,$c2,$f3,$c2,$f3,$c2,$f3,$c2,$f3 + db $5a,$ff,$5a,$ff,$5a,$ff,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df + db $b2,$fb,$b2,$fb,$b2,$fb,$72,$fb,$62,$f3,$62,$f3,$62,$f3,$62,$f3 + db $5a,$ff,$5b,$fe,$5b,$ff,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df + db $62,$f3,$c2,$e3,$c2,$e3,$c2,$e3,$42,$e3,$42,$e3,$42,$e3,$02,$c3 + db $02,$03,$02,$03,$02,$03,$02,$03,$02,$83,$02,$83,$02,$83,$02,$83 + db $4d,$df,$4b,$df,$4b,$df,$4a,$df,$4a,$df,$42,$cf,$40,$cf,$40,$cf + db $c2,$f3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3 + db $a2,$f3,$82,$e3,$82,$e3,$82,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3 + db $4d,$df,$4d,$df,$4d,$df,$4c,$df,$4c,$df,$46,$cf,$46,$cf,$46,$cf + db $82,$c3,$82,$c3,$82,$c3,$82,$c3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3 + db $4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$46,$cf,$46,$cf,$46,$cf + db $43,$c7,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf + 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 Shuffle.UITileDataEnd: -Shuffle.BigCard: -def VTS = VARIABLE_TILES_START - db VTS, VTS+1, VTS+1, VTS+2 - db VTS+3, VTS+4, VTS+4, VTS+5 - db VTS+3, VTS+4, VTS+4, VTS+5 - db VTS+3, VTS+4, VTS+4, VTS+5 - db VTS+3, VTS+4, VTS+4, VTS+5 - db VTS+3, VTS+4, VTS+4, VTS+5 - db VTS+3, VTS+4, VTS+4, VTS+5 - db VTS+6, VTS+7, VTS+7, VTS+8 +Shuffle.BigCard: ; 6 wide by 10 tall + db $1b, $1c, $1c, $1c, $1c, $1d + db $1e, $1f, $20, $20, $21, $22 + db $1e, $23, $24, $24, $25, $22 + db $1e, $23, $24, $24, $25, $22 + db $1e, $23, $24, $24, $25, $22 + db $1e, $23, $24, $24, $25, $22 + db $1e, $23, $24, $24, $25, $22 + db $1e, $23, $24, $24, $25, $22 + db $1e, $26, $27, $27, $28, $22 + 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 Shuffle.ShuffledText: db 9, "Shuffled!" diff --git a/card_art/screendesigns.aseprite b/card_art/screendesigns.aseprite index 45b82bb..28666f8 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 21463d9..d1e251f 100644 --- a/card_art/tileset.asm +++ b/card_art/tileset.asm @@ -4,54 +4,91 @@ tileset: 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 + db $40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0 db $00,$ff,$7f,$ff,$7f,$ff,$60,$ff,$6f,$ff,$6d,$fa,$6a,$fd,$6d,$fa db $00,$ff,$ff,$ff,$ff,$ff,$00,$ff,$ff,$ff,$55,$aa,$aa,$55,$55,$aa db $00,$ff,$fe,$ff,$fe,$ff,$06,$ff,$f6,$ff,$56,$bf,$b6,$5f,$56,$bf + db $02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03 db $6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa db $aa,$55,$55,$aa,$aa,$55,$55,$aa,$aa,$55,$55,$aa,$aa,$55,$55,$aa db $b6,$5f,$56,$bf,$b6,$5f,$56,$bf,$b6,$5f,$56,$bf,$b6,$5f,$56,$bf db $6a,$fd,$6d,$fa,$6a,$fd,$6f,$ff,$60,$ff,$7f,$ff,$7f,$ff,$00,$ff db $aa,$55,$55,$aa,$aa,$55,$ff,$ff,$00,$ff,$ff,$ff,$ff,$ff,$00,$ff db $b6,$5f,$56,$bf,$b6,$5f,$f6,$ff,$06,$ff,$fe,$ff,$fe,$ff,$00,$ff + db $40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$3f,$ff,$00,$ff + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$ff,$ff,$00,$ff + db $02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$fc,$ff,$00,$ff db $60,$1f,$ce,$3f,$d2,$33,$92,$73,$a2,$63,$22,$e3,$4a,$cb,$5a,$db - db $5a,$db,$4a,$cb,$22,$e3,$a2,$63,$92,$73,$d2,$33,$ce,$3f,$60,$1f db $06,$f8,$73,$fc,$4b,$cc,$49,$ce,$45,$c6,$44,$c7,$52,$d3,$5a,$db + db $5a,$db,$4a,$cb,$22,$e3,$a2,$63,$92,$73,$d2,$33,$ce,$3f,$60,$1f db $5a,$db,$52,$d3,$44,$c7,$45,$c6,$49,$ce,$4b,$cc,$73,$fc,$06,$f8 db $78,$07,$e3,$1f,$8c,$7c,$31,$f1,$43,$c3,$40,$c0,$7f,$ff,$00,$ff db $1e,$e0,$c7,$f8,$31,$3e,$8c,$8f,$c2,$c3,$02,$03,$fe,$ff,$00,$ff 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 $00,$00,$7c,$7c,$44,$7c,$54,$6c,$54,$6c,$44,$7c,$7c,$7c,$00,$00 - db $00,$00,$00,$00,$00,$75,$00,$45,$00,$77,$00,$15,$00,$75,$00,$00 - db $00,$00,$00,$00,$00,$57,$00,$54,$00,$56,$00,$54,$00,$24,$00,$00 - db $c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3 - db $9a,$ff,$9a,$ff,$9a,$ff,$9c,$ff,$ac,$ff,$8c,$ff,$be,$ff,$be,$ff - db $80,$ff,$ac,$ff,$8c,$ff,$bc,$ff,$bc,$ff,$80,$ff,$82,$c3,$02,$c3 - db $c2,$f3,$c2,$f3,$c2,$f3,$c2,$f3,$d2,$fb,$d2,$fb,$b2,$fb,$ba,$ff - db $02,$ff,$ec,$ff,$ee,$ff,$ee,$ff,$66,$ff,$66,$ff,$6c,$ff,$6c,$ff - db $6c,$ff,$60,$ff,$6c,$ff,$6e,$ff,$66,$ff,$6c,$ff,$ec,$ff,$ec,$ff - db $d2,$fb,$d2,$fb,$d2,$fb,$d2,$fb,$c2,$f3,$c2,$f3,$c2,$f3,$c2,$e3 - db $cc,$ff,$dc,$ff,$da,$ff,$da,$ff,$da,$ff,$da,$ff,$da,$ff,$d2,$fb - db $40,$cf,$40,$cf,$44,$cf,$44,$cf,$44,$cf,$45,$cf,$45,$cf,$4d,$df 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 $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 + db $2a,$fd,$2d,$fe,$36,$fd,$35,$fe,$36,$fd,$35,$fe,$36,$fd,$35,$fe + db $0a,$ff,$f0,$ff,$fc,$ff,$0e,$ff,$e6,$ff,$ac,$7f,$6c,$bf,$ac,$7f + db $5a,$ff,$da,$7f,$5a,$ff,$da,$7f,$da,$ff,$b2,$fb,$b2,$fb,$b2,$fb + db $41,$c3,$41,$c3,$41,$c3,$41,$c3,$43,$c7,$43,$c7,$43,$c7,$43,$c7 db $36,$ff,$36,$ff,$57,$ff,$57,$ff,$57,$ff,$57,$ff,$57,$ff,$52,$ff + db $cc,$ff,$dc,$ff,$da,$ff,$da,$ff,$da,$ff,$da,$ff,$da,$ff,$d2,$fb + db $36,$fd,$37,$fe,$5a,$ff,$5b,$fe,$5a,$ff,$5b,$fe,$5a,$ff,$5a,$ff + db $6c,$ff,$dc,$7f,$5a,$ff,$da,$7f,$5a,$ff,$da,$ff,$ba,$ff,$b2,$fb + db $36,$fd,$37,$fe,$5a,$ff,$5b,$fe,$5a,$ff,$5b,$fe,$5a,$ff,$5b,$fe + db $b2,$fb,$b2,$fb,$b2,$fb,$62,$f3,$62,$f3,$62,$f3,$62,$f3,$62,$f3 + db $43,$c7,$43,$c7,$43,$c7,$43,$c7,$43,$c7,$43,$c7,$43,$c7,$43,$c7 db $5a,$ff,$5a,$ff,$5a,$ff,$49,$df,$49,$df,$49,$df,$49,$df,$49,$df + db $d2,$fb,$d2,$fb,$d2,$fb,$d2,$fb,$c2,$f3,$c2,$f3,$c2,$f3,$c2,$f3 + db $5a,$ff,$5a,$ff,$5a,$ff,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df + db $b2,$fb,$b2,$fb,$b2,$fb,$72,$fb,$62,$f3,$62,$f3,$62,$f3,$62,$f3 + db $5a,$ff,$5b,$fe,$5b,$ff,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df + db $62,$f3,$c2,$e3,$c2,$e3,$c2,$e3,$42,$e3,$42,$e3,$42,$e3,$02,$c3 + db $02,$03,$02,$03,$02,$03,$02,$03,$02,$83,$02,$83,$02,$83,$02,$83 db $4d,$df,$4b,$df,$4b,$df,$4a,$df,$4a,$df,$42,$cf,$40,$cf,$40,$cf + db $c2,$f3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3 + db $a2,$f3,$82,$e3,$82,$e3,$82,$e3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3 + db $4d,$df,$4d,$df,$4d,$df,$4c,$df,$4c,$df,$46,$cf,$46,$cf,$46,$cf + db $82,$c3,$82,$c3,$82,$c3,$82,$c3,$c2,$e3,$c2,$e3,$c2,$e3,$c2,$e3 + db $4d,$df,$4d,$df,$4d,$df,$4d,$df,$4d,$df,$46,$cf,$46,$cf,$46,$cf + db $43,$c7,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf,$46,$cf + 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 $40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$3f,$ff,$00,$ff - db $02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$fc,$ff,$00,$ff - db $00,$ff,$fc,$ff,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03,$02,$03 - 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,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$ff,$ff,$00,$ff - db $00,$00,$18,$98,$18,$98,$18,$98,$10,$90,$10,$90,$10,$90,$00,$00 - db $00,$00,$00,$80,$3e,$be,$1c,$9c,$08,$88,$08,$88,$1c,$9c,$00,$00 - db $00,$00,$1c,$9c,$3e,$be,$3e,$be,$3e,$be,$1c,$9c,$00,$80,$00,$00 - db $00,$00,$10,$90,$10,$90,$10,$90,$10,$90,$38,$b8,$10,$90,$00,$00 + 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 ShuffleUI: - db $2b, $2e, $2c, $2d + 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 diff --git a/source.zip b/source.zip index 6203cd6..69c0ca7 100644 Binary files a/source.zip and b/source.zip differ