diff --git a/10WheelOfFortune.inc b/10WheelOfFortune.inc index 3d787a3..a8dc88a 100644 --- a/10WheelOfFortune.inc +++ b/10WheelOfFortune.inc @@ -14,12 +14,167 @@ WheelOfFortune: dw .fUpdate dw .fDraw -.fInit: ret -.fUpdate: ret -.fDraw: ret +.fInit: + ld hl, CVS + ld a, 0 + ld [hl+], a ; CVS timer for smoke + ld [hl+], a + ; drawing 12 characters total + ; top sprites + ld [hl+], a ; CVS+2 first character tile id + ld [hl+], a ; CVS+3 second character + ; second row + ld [hl+], a ; CVS+4 third char + ld [hl+], a ; CVS+5 4th char + ld [hl+], a ; CVS+6 + ld [hl+], a ; CVS+7 + ; third row + ld [hl+], a ; CVS+8 + ld [hl+], a ; CVS+9 + ld [hl+], a ; CVS+10 + ld [hl+], a ; CVS+11 + ; final row + ld [hl+], a ; CVS+12 + ld [hl+], a ; CVS+13 + ret + +.fUpdate: + ld hl, CVS + call IncrementTimer + + ld a, [CVS+1] ; checking the high byte of the timer + cp a, $04 ; $10 = 1 second, $02 = 1/8 of a second + jp c, :+ ; if the timer is less than $0600, skip + + ; if the timer is greater or equal to $0600, reset it + ld a, 0 + ld [CVS], a + ld [CVS+1], a + call .updateNumbers +: + ret + +.updateNumbers: + call OneRandomByte + ld hl, rLFSR + ld de, CVS+2 + call .WriteByte + + call OneRandomByte + ld hl, rLFSR + ld de, CVS+4 + call .WriteByte + call OneRandomByte + ld hl, rLFSR + ld de, CVS+6 + call .WriteByte + + call OneRandomByte + ld hl, rLFSR + ld de, CVS+8 + call .WriteByte + call OneRandomByte + ld hl, rLFSR + ld de, CVS+10 + call .WriteByte + + call OneRandomByte + ld hl, rLFSR + ld de, CVS+12 + call .WriteByte + + ret +.fDraw: + ld hl, CVS+2 + ld de, _SCRN0 + 3+1 + 7*32 + ld a, [hl+] + ld [de], a + inc de + ld a, [hl+] + ld [de], a ; first two tiles + + ld de, _SCRN0 + 3+0 + 8*32 + ld a, [hl+] + ld [de], a + inc de + ld a, [hl+] + ld [de], a + inc de + ld a, [hl+] + ld [de], a + inc de + ld a, [hl+] + ld [de], a ; second row, four tles + + ld de, _SCRN0 + 3+0 + 9*32 + ld a, [hl+] + ld [de], a + inc de + ld a, [hl+] + ld [de], a + inc de + ld a, [hl+] + ld [de], a + inc de + ld a, [hl+] + ld [de], a ; third row, four tiles + + ld de, _SCRN0 + 3+1 + 10*32 + ld a, [hl+] + ld [de], a + inc de + ld a, [hl+] + ld [de], a ; final two tiles + + ret + +.WriteByte: ; accepts [hl] as the number to write, de as location to write tile IDs to +; writes tile IDs for one byte (two nibbles) from [hl] into [de] + ld b, 0 + + push hl + ld a, [hl] + swap a + and a, $0F + ld c, a + ld hl, .lowerHex + add hl, bc + ld a, [hl] + ld [de], a + inc de + + pop hl + ld a, [hl] + and a, $0F + ld c, a + ld hl, .lowerHex + add hl, bc + ld a, [hl] + ld [de], a + + ret + +.hex ; tile IDs for hex values. this can live elsewhere alongside WriteByte + ; 0, 1, 2, 3, + db $a0, $a1, $a2, $a3 + ; 4, 5, 6, 7, + db $a4, $a5, $a6, $a7 + ; 8, 9 + db $a8, $a9 + ; a, b, c, d, e, f + db $b1, $b2, $b3, $b4, $b5, $b6 +.lowerHex ; tile IDs for hex values. this can live elsewhere alongside WriteByte + ; 0, 1, 2, 3, + db $a0, $a1, $a2, $a3 + ; 4, 5, 6, 7, + db $a4, $a5, $a6, $a7 + ; 8, 9 + db $a8, $a9 + ; a, b, c, d, e, f + db $d1, $d2, $d3, $d4, $d5, $d6 + .SpriteTiles: .SpriteTilesEnd: - ; original export script by gabriel reis, modified by shoofle diff --git a/11Justice.inc b/11Justice.inc index e935728..e35db94 100644 --- a/11Justice.inc +++ b/11Justice.inc @@ -14,114 +14,223 @@ Justice: dw .fUpdate dw .fDraw -.fInit: ret -.fUpdate: ret +.fInit: + ld hl, CVS + ld a, 0 + ld [hl+], a ; CVS timer for swing + ld [hl+], a + ; drawing 12 characters total + ; top sprites + ld [hl+], a ; CVS+2 frame of animation for left + ld a, 2 + ld [hl+], a ; CVS+3 frame of animation for right + + ld a, %11000100 + ld [rOBP0], a + ret +.fUpdate: + ld hl, CVS + call IncrementTimer + + ld a, [CVS+1] ; checking the high byte of the timer + cp a, $08 ; $10 = 1 second, $02 = 1/8 of a second + jp c, :+ ; if the timer is less than $0600, skip + + ; if the timer is greater or equal to $0600, reset it + ld a, 0 + ld [CVS], a + ld [CVS+1], a + + call .swing +: + ret .fDraw: ret + +.swing: + ld b, 6 + ld a, [CVS+2] + inc a + call ArrayClampLoopingB + ld [CVS+2], a + + ld b, a + add a, b + add a, b + sla a ; multiply a by 6 + ld c, a + ld b, 0 + ld hl, .scale + add hl, bc + + ld de, MY_OAM + ld b, 6*8 + 2 + ld c, 5*8 + 4 + ld a, $23 + call BuildMetaSprite + + ld b, 6 + ld a, [CVS+3] + inc a + call ArrayClampLoopingB + ld [CVS+3], a + + ld b, a + add a, b + add a, b + sla a ; multiply a by 6 + ld c, a + ld b, 0 + ld hl, .scale + add hl, bc + + ld de, MY_OAM + 6*4 + ld b, 5*8 + 7 + ld c, 8*8 + 0 + ld a, $23 + call BuildMetaSprite + + ret + + +.scale ; six tiles per sprite + db $00, $08, $00 + db $03, $04, $00; + db $00, $08, $00 + db $03, $04, $00; + db $00, $01, $00 + db $00, $02, $00; + db $00, $07, $00 + db $00, $05, $06; + db $00, $07, $00 + db $00, $05, $06; + db $00, $01, $00 + db $00, $02, $00; + .SpriteTiles: + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $18,$18,$18,$18,$18,$18,$18,$18,$24,$24,$24,$24,$24,$24,$24,$24 + db $42,$42,$42,$42,$42,$42,$42,$42,$81,$81,$ff,$ff,$81,$ff,$7e,$7e + db $00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$00,$00 + db $44,$44,$84,$84,$84,$84,$84,$84,$02,$02,$fe,$fe,$02,$fe,$fc,$fc + db $22,$22,$21,$21,$21,$21,$21,$21,$40,$40,$7f,$7f,$40,$7f,$3f,$3f + db $00,$00,$00,$00,$00,$00,$00,$00,$80,$80,$80,$80,$80,$80,$00,$00 + db $18,$18,$18,$18,$18,$18,$18,$18,$24,$24,$24,$24,$24,$24,$22,$22 + db $18,$18,$18,$18,$18,$18,$18,$18,$24,$24,$24,$24,$24,$24,$44,$44 .SpriteTilesEnd: ; original export script by gabriel reis, modified by shoofle .KeyArtTiles: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$60,$20,$5c,$3c,$43,$3c,$43,$20,$5c,$00,$60,$00,$00 - db $3f,$40,$3f,$40,$3f,$40,$3f,$40,$3f,$40,$3f,$40,$3f,$40,$3f,$40 db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00 - db $fc,$02,$fc,$02,$fc,$02,$fc,$02,$fc,$02,$fc,$02,$fc,$02,$fc,$02 - db $00,$00,$00,$06,$04,$3a,$3c,$c2,$3c,$c2,$04,$3a,$00,$06,$00,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$03 - db $1f,$20,$0f,$30,$07,$18,$03,$0c,$01,$06,$00,$03,$00,$01,$00,$00 - db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7f,$80,$00,$ff - db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fc,$03,$00,$ff - db $f8,$04,$f0,$0c,$e0,$18,$c0,$30,$80,$60,$00,$c0,$00,$80,$00,$00 - db $04,$04,$04,$04,$04,$04,$04,$04,$04,$04,$04,$04,$04,$04,$04,$04 - db $80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80 - db $00,$04,$00,$1c,$08,$74,$78,$84,$38,$44,$08,$34,$00,$0c,$00,$04 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$0f,$0f - db $00,$00,$00,$18,$08,$14,$0c,$12,$1c,$22,$18,$27,$00,$38,$c1,$c1 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$0f,$3f,$f8,$ff + db $84,$84,$44,$c4,$64,$e4,$24,$e4,$34,$f4,$1c,$fc,$1c,$fc,$0c,$fc + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$0f,$0f,$f8,$ff db $00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$fe,$ff,$03,$ff,$1c,$fc - db $00,$00,$00,$00,$00,$00,$00,$00,$f8,$f8,$18,$f8,$f8,$f8,$08,$08 - db $18,$1f,$33,$3c,$67,$78,$43,$7c,$4f,$71,$7f,$7f,$7f,$7f,$78,$7f - db $67,$ef,$f3,$33,$f3,$13,$f3,$13,$f3,$f3,$f3,$f3,$f4,$f4,$f4,$34 - db $1f,$ff,$fa,$fb,$82,$83,$02,$03,$01,$01,$01,$01,$81,$81,$81,$81 - db $f0,$f0,$10,$f0,$10,$f0,$10,$f0,$10,$f0,$10,$f0,$10,$f0,$10,$f0 - db $14,$14,$14,$14,$14,$14,$14,$14,$14,$14,$22,$22,$22,$22,$22,$22 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01 - db $7f,$60,$5f,$60,$38,$27,$2f,$30,$17,$18,$08,$0f,$00,$0f,$00,$ff - db $f4,$14,$f4,$14,$78,$98,$d8,$38,$a8,$68,$48,$c8,$10,$d0,$1f,$ff - db $81,$81,$80,$80,$40,$40,$40,$40,$40,$40,$40,$40,$20,$20,$e0,$e0 - db $10,$f0,$90,$f0,$90,$f0,$90,$f0,$50,$70,$50,$70,$48,$78,$48,$78 - db $22,$22,$21,$21,$41,$41,$41,$41,$7f,$7f,$41,$7f,$3e,$3e,$00,$00 - db $04,$04,$04,$04,$3c,$3c,$3f,$3f,$07,$07,$02,$1d,$0f,$30,$18,$27 - db $80,$80,$80,$80,$f0,$f0,$f0,$f0,$80,$80,$00,$c0,$00,$c0,$80,$40 - db $00,$07,$00,$04,$00,$08,$00,$08,$00,$18,$00,$10,$00,$10,$00,$30 - db $10,$1f,$0f,$0f,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $20,$f0,$c0,$dc,$00,$04,$00,$06,$00,$02,$00,$02,$00,$03,$00,$03 - db $48,$78,$28,$38,$28,$38,$28,$38,$28,$38,$24,$3c,$14,$1c,$14,$1c - db $1f,$20,$18,$27,$1f,$20,$18,$27,$0f,$10,$00,$0f,$07,$07,$07,$07 - db $80,$40,$80,$40,$00,$e3,$00,$ff,$70,$8f,$fc,$83,$ff,$80,$ff,$80 - db $00,$20,$00,$40,$00,$c1,$00,$81,$00,$e1,$c0,$21,$c0,$21,$c0,$31 - db $00,$01,$00,$21,$00,$21,$00,$21,$00,$21,$00,$23,$01,$22,$01,$22 - db $14,$1c,$14,$9c,$14,$9c,$12,$9e,$0a,$de,$00,$ff,$8f,$70,$c1,$3e - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$00,$c0 - db $7f,$80,$3f,$c0,$3f,$c0,$3f,$c0,$0f,$70,$00,$7f,$00,$7f,$00,$3f - db $e0,$11,$e0,$11,$e0,$11,$e0,$11,$c0,$31,$00,$f1,$00,$f1,$00,$f2 - db $01,$22,$01,$22,$01,$22,$01,$22,$01,$22,$00,$23,$00,$23,$00,$23 - db $9f,$60,$83,$7c,$bf,$40,$c3,$3d,$df,$23,$0d,$ff,$04,$ff,$04,$ff - db $80,$40,$80,$40,$00,$c0,$00,$80,$00,$00,$00,$00,$80,$80,$80,$80 - db $00,$3f,$00,$3f,$00,$1f,$00,$0f,$00,$0f,$00,$07,$00,$03,$00,$00 - db $00,$f2,$00,$e2,$00,$e6,$00,$ec,$00,$dc,$00,$f4,$00,$c4,$00,$04 - db $00,$33,$00,$33,$00,$39,$00,$2d,$00,$25,$00,$27,$00,$23,$00,$23 - db $04,$ff,$02,$fb,$02,$fb,$02,$fb,$02,$fb,$02,$f3,$02,$f3,$02,$e3 - db $00,$04,$00,$04,$00,$04,$00,$04,$00,$04,$00,$0c,$00,$08,$00,$08 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$60,$00,$30 - db $00,$21,$00,$20,$00,$30,$00,$10,$00,$10,$00,$10,$00,$10,$00,$10 - db $02,$c3,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$08,$00,$08,$00,$08,$00,$08,$00,$18,$00,$10,$00,$10,$00,$10 - db $00,$1c,$00,$06,$00,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$80,$00,$c0,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$08,$00,$08,$00,$08,$00,$0c,$00,$04,$00,$06,$00,$0e,$00,$1a - db $00,$10,$00,$10,$00,$30,$00,$38,$00,$24,$00,$22,$00,$21,$00,$21 - db $00,$00,$00,$00,$00,$01,$00,$07,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$32,$00,$c2,$00,$82,$00,$03,$00,$01,$00,$01,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$00,$80,$00,$c0 - db $00,$21,$00,$20,$00,$20,$00,$20,$00,$20,$00,$20,$00,$40,$00,$40 - db $00,$80,$00,$80,$00,$40,$00,$60,$00,$30,$00,$18,$00,$07,$00,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$c0,$00,$00 - db $00,$80,$00,$80,$00,$80,$00,$40,$00,$40,$00,$40,$00,$60,$00,$20 - db $00,$40,$00,$40,$00,$40,$00,$40,$00,$60,$00,$3c,$00,$3f,$00,$01 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$c0,$00,$ff - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$ff,$00,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$07,$00,$fc,$00,$00 - db $00,$20,$00,$10,$00,$10,$00,$10,$00,$f0,$00,$80,$00,$00,$00,$00 - db $00,$00,$00,$7f,$00,$30,$00,$18,$00,$0c,$00,$06,$00,$03,$00,$03 - db $00,$00,$00,$ff,$00,$1a,$00,$32,$00,$62,$00,$c2,$00,$82,$00,$82 - db $00,$03,$00,$06,$00,$0c,$00,$18,$00,$30,$00,$20,$00,$7f,$00,$00 - db $00,$82,$00,$c2,$00,$62,$00,$32,$00,$1a,$00,$0a,$00,$ff,$00,$00 - db $40,$c0,$20,$e0,$20,$e0,$20,$e0,$a0,$e0,$60,$60,$00,$00,$00,$00 - db $80,$80,$80,$80,$80,$80,$80,$80,$40,$c0,$40,$c0,$40,$c0,$40,$c0 - db $0f,$0f,$0f,$08,$07,$04,$07,$04,$03,$02,$03,$02,$01,$01,$01,$01 - db $f0,$f0,$f0,$10,$e0,$20,$e0,$20,$c0,$40,$c0,$40,$80,$80,$80,$80 - db $01,$01,$01,$01,$03,$02,$03,$02,$07,$04,$07,$04,$0f,$08,$0f,$0f - db $80,$80,$80,$80,$c0,$40,$c0,$40,$e0,$20,$e0,$20,$f0,$10,$f0,$f0 + db $01,$01,$03,$03,$03,$03,$06,$07,$fe,$ff,$1c,$ff,$fc,$ff,$18,$1f + db $04,$fc,$04,$fc,$04,$fc,$84,$7c,$c4,$3c,$e4,$1c,$f4,$0c,$f4,$0c + db $80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$c0,$c0,$c0,$c0 + db $03,$03,$04,$07,$09,$0e,$10,$1f,$13,$1c,$1f,$1f,$1f,$1f,$1e,$1f + db $f3,$f3,$0a,$fb,$ff,$07,$fc,$04,$fc,$7c,$fc,$fc,$fc,$fc,$3c,$cc + db $9f,$ff,$fa,$fb,$82,$83,$02,$03,$01,$01,$01,$01,$01,$01,$01,$01 + db $f0,$f0,$10,$f0,$10,$f0,$10,$f0,$10,$f0,$11,$f1,$13,$f3,$13,$f3 + db $30,$3f,$30,$3f,$60,$7f,$c1,$fe,$81,$fe,$83,$fc,$87,$f8,$07,$f8 + db $fc,$04,$fc,$04,$fc,$04,$fc,$04,$fc,$04,$fc,$04,$fc,$04,$fc,$04 + db $e0,$e0,$b0,$f0,$b0,$f0,$98,$f8,$8c,$fc,$8c,$fc,$86,$fe,$c7,$bf + db $1f,$18,$17,$18,$0e,$09,$0b,$0c,$05,$06,$02,$03,$00,$03,$ff,$ff + db $fc,$04,$fc,$04,$1c,$e4,$f4,$0c,$e8,$18,$10,$f0,$00,$f0,$ff,$ff + db $01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80 + db $17,$f7,$96,$f7,$9e,$ff,$9c,$ff,$58,$7f,$58,$7f,$48,$7f,$49,$7e + db $0f,$f0,$1f,$e0,$1f,$e0,$3f,$c0,$7f,$80,$7f,$80,$ff,$00,$ff,$00 + db $fc,$04,$fc,$04,$fc,$3c,$ff,$3f,$ff,$07,$ff,$1d,$ff,$30,$ff,$27 + db $c3,$bf,$e1,$9f,$f9,$ff,$f8,$f7,$f8,$87,$fc,$c3,$fe,$c1,$ff,$40 + db $03,$07,$84,$87,$88,$8f,$c8,$cf,$f0,$ff,$60,$ff,$20,$ff,$60,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $60,$f8,$18,$fc,$0d,$fd,$03,$ff,$01,$ff,$01,$ff,$01,$ff,$01,$ff + db $c9,$fe,$eb,$fc,$ef,$f8,$af,$f8,$af,$f8,$27,$fc,$37,$dc,$77,$9c + db $ff,$20,$ff,$27,$ff,$20,$ff,$27,$9f,$70,$9f,$7f,$6f,$ff,$57,$ff + db $ff,$40,$ff,$41,$fe,$e3,$fe,$ff,$ff,$8f,$ff,$83,$ff,$80,$ff,$80 + db $c0,$7f,$80,$ff,$01,$ff,$01,$ff,$e1,$ff,$e1,$3f,$e1,$3f,$f1,$3f + db $01,$ff,$20,$ff,$20,$ff,$20,$ff,$20,$ff,$23,$ff,$23,$fe,$23,$fe + db $f7,$1c,$f7,$9c,$f7,$9c,$f3,$9e,$7b,$de,$fb,$ff,$ff,$70,$ff,$3e + db $ff,$00,$ff,$00,$ff,$00,$fd,$02,$f0,$0f,$e4,$1f,$eb,$9f,$c5,$ff + db $e9,$fe,$d1,$fe,$f9,$fe,$d1,$fe,$e9,$fe,$d1,$fe,$e9,$fe,$d1,$fe + db $ff,$80,$ff,$c0,$ff,$c0,$ff,$c0,$7f,$f0,$7f,$ff,$7f,$ff,$7f,$ff + db $f1,$1f,$f1,$1f,$f1,$1f,$f1,$1f,$f1,$3f,$f1,$ff,$f1,$ff,$f2,$ff + db $23,$fe,$23,$fe,$23,$fe,$23,$fe,$23,$fe,$23,$ff,$23,$ff,$23,$ff + db $ff,$60,$ff,$7c,$ff,$40,$ff,$3d,$ff,$23,$fd,$ff,$fc,$ff,$fc,$ff + db $cb,$7f,$c5,$7f,$cf,$ff,$c5,$bf,$4b,$bf,$45,$bf,$cb,$bf,$c5,$bf + db $7f,$ff,$7f,$ff,$7f,$ff,$7f,$ff,$6f,$ff,$77,$ff,$67,$fb,$74,$fb + db $f2,$ff,$e2,$ff,$e6,$ff,$ec,$ff,$fc,$ff,$fc,$ff,$dc,$ff,$dc,$ff + db $33,$ff,$33,$ff,$39,$ff,$3d,$ff,$3d,$ff,$3f,$ff,$3f,$ff,$3f,$ff + db $fc,$ff,$fe,$ff,$fa,$ff,$fe,$ff,$fa,$ff,$f6,$ff,$f2,$ff,$f6,$ef + db $cb,$bf,$c5,$bf,$cf,$bf,$c5,$bf,$4b,$ff,$45,$ff,$4b,$ff,$45,$ff + db $66,$fb,$74,$fb,$66,$fb,$74,$fb,$66,$fb,$74,$fb,$66,$fb,$74,$fb + db $9c,$ff,$dc,$ff,$9c,$ff,$dc,$ff,$9c,$ff,$dc,$ff,$98,$ff,$d8,$ff + db $3d,$ff,$3d,$ff,$3c,$ff,$1d,$ff,$1c,$ff,$1d,$ff,$1c,$ff,$1d,$ff + db $f2,$ef,$97,$ef,$b3,$ef,$97,$ef,$b3,$ef,$97,$ef,$b3,$ef,$97,$ef + db $4b,$ff,$25,$ff,$2f,$ff,$25,$ff,$ab,$ff,$65,$ff,$4b,$bf,$45,$bf + db $66,$fb,$74,$fb,$66,$fb,$74,$fb,$64,$fb,$70,$ff,$60,$ff,$40,$ff + db $88,$ff,$c8,$ff,$88,$ff,$08,$ff,$18,$ff,$10,$df,$10,$9f,$10,$df + db $1c,$e3,$06,$f9,$01,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$ff,$00,$ff,$80,$7f,$c0,$3f,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $0c,$ff,$09,$ff,$04,$ff,$04,$ff,$02,$ff,$02,$ff,$0e,$f2,$1a,$e7 + db $b3,$ef,$97,$ef,$b3,$ef,$17,$ef,$13,$ef,$07,$ff,$03,$ff,$01,$ff + db $4b,$bf,$45,$bf,$4f,$bf,$45,$bf,$4b,$bf,$45,$bf,$4b,$bf,$45,$bf + db $e9,$fe,$d1,$fe,$f8,$ff,$d0,$ff,$e0,$ff,$80,$ff,$00,$ff,$00,$fc + db $00,$fc,$00,$fe,$00,$e0,$00,$c0,$00,$f0,$00,$00,$00,$f0,$00,$00 + db $10,$1f,$10,$1f,$30,$3f,$38,$37,$24,$3b,$22,$3d,$21,$3e,$21,$3e + db $00,$ff,$00,$ff,$01,$fe,$07,$f8,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $32,$ce,$c1,$3f,$81,$7f,$01,$ff,$01,$ff,$01,$ff,$00,$ff,$00,$ff + db $00,$3f,$00,$07,$00,$9f,$00,$81,$00,$03,$00,$80,$80,$81,$80,$80 + db $4b,$bf,$45,$bf,$0f,$ff,$05,$ff,$03,$ff,$00,$7f,$00,$ff,$00,$1f + db $00,$f0,$00,$fe,$00,$c0,$00,$00,$00,$00,$00,$00,$00,$01,$01,$02 + db $00,$00,$00,$00,$00,$00,$00,$01,$00,$7e,$78,$86,$f0,$0c,$e0,$18 + db $21,$3e,$20,$3f,$20,$3f,$20,$ff,$00,$3f,$00,$3f,$00,$7f,$00,$7f + db $80,$7f,$80,$7f,$40,$bf,$60,$9f,$30,$cf,$18,$e7,$07,$f8,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$c0,$3f,$00,$ff + db $80,$80,$80,$80,$80,$80,$80,$e0,$80,$ff,$47,$d8,$23,$ec,$21,$e6 + db $00,$07,$00,$0f,$00,$01,$00,$01,$00,$00,$00,$80,$80,$40,$c0,$20 + db $03,$0c,$0f,$10,$1f,$20,$3e,$41,$7c,$83,$f8,$07,$f0,$0e,$e0,$1f + db $c0,$30,$80,$60,$00,$c0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$ff + db $00,$7f,$00,$7f,$00,$3f,$00,$0f,$00,$00,$00,$00,$00,$00,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$03,$00,$00,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$00,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fc,$00,$80,$00,$00,$00,$ff + db $20,$e3,$00,$f1,$00,$f0,$00,$c0,$00,$00,$00,$00,$00,$00,$00,$ff + db $e0,$10,$70,$88,$38,$c4,$1c,$62,$0e,$31,$07,$18,$07,$08,$03,$fc + db $e0,$1f,$e0,$1f,$e0,$1f,$e0,$1f,$e0,$1f,$e0,$1f,$e0,$1f,$ff,$00 + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$ff,$00 + db $03,$fc,$03,$fc,$03,$fc,$03,$fc,$03,$fc,$03,$fc,$03,$fc,$ff,$00 + db $00,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $00,$00,$7f,$7f,$20,$31,$31,$31,$11,$1b,$1b,$1b,$0a,$0e,$0c,$0e + db $00,$00,$fe,$fe,$88,$98,$88,$98,$08,$18,$08,$18,$08,$18,$08,$18 + db $06,$0e,$0a,$0e,$1b,$1b,$11,$1b,$31,$31,$20,$31,$7f,$7f,$00,$00 + db $08,$18,$08,$18,$08,$18,$08,$18,$88,$98,$88,$98,$fe,$fe,$00,$00 + db $3f,$40,$3f,$40,$3f,$40,$3f,$40,$1f,$20,$1f,$20,$1f,$20,$0f,$10 + db $fc,$02,$fc,$02,$fc,$02,$fc,$02,$f8,$04,$f8,$04,$f8,$04,$f0,$08 + db $0f,$10,$07,$08,$03,$04,$01,$02,$00,$01,$00,$00,$00,$00,$00,$00 + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$3f,$c0,$07,$38,$00,$07 + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fc,$03,$e0,$1c,$00,$e0 + db $f0,$08,$e0,$10,$c0,$20,$80,$40,$00,$80,$00,$00,$00,$00,$00,$00 + db $80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$03 .KeyArtTilesEnd: .BackgroundCopy: ; tiles start at 26 - db $1a, $1b, $1c, $1d, $1d, $1e, $1f, $1a - db $20, $1a, $21, $22, $23, $24, $1a, $1a - db $25, $26, $27, $28, $29, $2a, $2b, $2c - db $25, $26, $1a, $2d, $2e, $2f, $30, $31 - db $25, $26, $32, $33, $34, $35, $36, $37 - db $38, $39, $3a, $1a, $3b, $3c, $3d, $1a - db $3e, $3f, $40, $1a, $1a, $41, $42, $43 - db $1a, $44, $45, $1a, $1a, $46, $47, $48 - db $1a, $49, $4a, $1a, $1a, $4b, $4c, $67 - db $1a, $1a, $4d, $4e, $1a, $4f, $50, $66 - db $68, $69, $51, $52, $53, $54, $6a, $6b - db $1a, $1a, $55, $1a, $56, $57, $58, $1a - db $1a, $1a, $59, $5a, $5b, $1a, $5c, $1a - db $1a, $1a, $5d, $5e, $5f, $60, $61, $1a - db $1a, $1a, $1a, $62, $63, $1a, $1a, $1a - db $1a, $1a, $1a, $64, $65, $1a, $1a, $1a + db $1a, $1a, $6f, $1b, $1b, $70, $1a, $1a + db $76, $1a, $71, $72, $73, $74, $1a, $1a + db $1c, $75, $1a, $1a, $1a, $1d, $1e, $1f + db $20, $21, $1a, $22, $23, $24, $25, $26 + db $27, $28, $1a, $29, $2a, $2b, $2c, $2d + db $2e, $2f, $30, $31, $31, $32, $33, $1b + db $34, $35, $36, $31, $31, $37, $38, $39 + db $3a, $3b, $3c, $31, $31, $3d, $3e, $3f + db $3a, $40, $41, $31, $31, $42, $43, $44 + db $3a, $45, $46, $31, $31, $47, $48, $49 + db $3a, $4a, $4b, $4c, $4d, $4e, $4f, $50 + db $51, $52, $53, $31, $54, $55, $56, $57 + db $58, $59, $5a, $5b, $5c, $31, $5d, $5e + db $5f, $60, $61, $62, $63, $64, $65, $66 + db $67, $68, $68, $6b, $6c, $68, $68, $69 + db $6a, $6a, $6a, $6d, $6e, $6a, $6a, $6a .BackgroundCopyEnd: diff --git a/11justice.aseprite b/11justice.aseprite index 34cea1e..b33d91d 100644 Binary files a/11justice.aseprite and b/11justice.aseprite differ diff --git a/KeyArtTiles.asm b/KeyArtTiles.asm index a0c2fca..8d654be 100644 --- a/KeyArtTiles.asm +++ b/KeyArtTiles.asm @@ -4,120 +4,115 @@ KeyArtTiles: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $06,$06,$02,$02,$02,$02,$03,$03,$01,$01,$0f,$0f,$00,$00,$00,$00 - db $00,$00,$18,$19,$3c,$3f,$26,$27,$42,$43,$43,$43,$41,$41,$40,$40 - db $00,$00,$00,$80,$00,$80,$00,$c0,$00,$c0,$00,$e0,$80,$e0,$80,$f0 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01 - db $00,$00,$00,$00,$00,$00,$0f,$0f,$0f,$09,$0f,$09,$0f,$09,$ff,$f9 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$f8,$f8 - db $00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$01,$01 - db $80,$80,$80,$80,$80,$80,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00 - db $c0,$f0,$40,$78,$60,$78,$20,$38,$30,$38,$10,$18,$18,$18,$08,$08 - db $01,$01,$00,$00,$00,$00,$00,$00,$0f,$0f,$0f,$0f,$00,$00,$00,$00 - db $ff,$f9,$0f,$09,$0f,$09,$0f,$09,$ff,$f9,$ff,$f9,$0f,$09,$0f,$09 - db $f8,$f8,$00,$00,$00,$00,$00,$00,$ff,$ff,$ff,$ff,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$07,$07 - db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00 - db $00,$00,$00,$3f,$1e,$61,$3f,$c0,$7f,$80,$76,$89,$7f,$99,$7f,$80 - db $08,$08,$08,$08,$08,$c8,$88,$68,$c8,$38,$e8,$18,$f0,$88,$e0,$18 - db $00,$00,$3f,$3f,$3f,$3f,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $0f,$09,$ff,$f9,$ff,$f9,$0f,$09,$0f,$09,$0f,$09,$0f,$09,$0f,$09 - db $00,$00,$ff,$ff,$ff,$ff,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $0d,$0b,$0d,$0a,$0d,$0a,$0d,$0a,$0d,$0a,$1d,$1a,$3f,$38,$7e,$41 - db $80,$80,$80,$80,$80,$80,$80,$80,$b0,$b0,$d0,$f0,$90,$d0,$e0,$a3 - db $39,$c6,$3f,$40,$18,$67,$1f,$20,$0f,$30,$0f,$1f,$00,$18,$00,$f1 - db $e0,$10,$e0,$10,$c0,$30,$e0,$20,$c0,$40,$80,$80,$00,$80,$00,$ff - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$c0 - db $0f,$09,$0f,$09,$0f,$09,$0f,$09,$0f,$09,$0f,$09,$0f,$09,$0f,$19 - db $f7,$88,$d7,$a8,$d7,$a8,$7f,$70,$3f,$60,$3f,$30,$1f,$18,$0b,$0c - db $ec,$2e,$f4,$7a,$f4,$7a,$e4,$7b,$54,$eb,$54,$eb,$d5,$6a,$95,$6a - db $00,$30,$00,$10,$00,$10,$00,$10,$00,$1f,$04,$8b,$04,$8b,$04,$8b - db $01,$86,$01,$86,$01,$86,$01,$8e,$05,$8a,$05,$1a,$05,$1a,$07,$1a - db $00,$e0,$40,$b0,$50,$a8,$50,$a8,$54,$ac,$54,$ae,$56,$aa,$56,$aa - db $0e,$1f,$1b,$1f,$3f,$37,$1f,$3c,$30,$5f,$3f,$50,$71,$9e,$7f,$90 - db $00,$00,$80,$80,$c0,$c0,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40 - db $0b,$0c,$1f,$18,$17,$18,$1f,$10,$1f,$10,$3f,$30,$3f,$20,$3f,$20 - db $95,$6a,$95,$6a,$95,$6a,$95,$7a,$95,$7a,$55,$ba,$55,$ba,$55,$ba - db $04,$8b,$04,$8b,$04,$8b,$04,$8b,$04,$8b,$04,$8b,$04,$8b,$04,$8b - db $07,$1a,$07,$1a,$07,$1a,$07,$1a,$07,$1a,$07,$1a,$07,$1a,$07,$1a - db $56,$aa,$54,$af,$59,$ae,$53,$bc,$63,$bc,$67,$f8,$4f,$f0,$5f,$e0 - db $71,$9e,$ff,$1f,$ef,$19,$ef,$19,$df,$39,$df,$39,$bf,$79,$af,$69 - db $c0,$40,$c0,$c0,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $3f,$20,$7e,$61,$7e,$41,$fe,$c1,$be,$c1,$be,$c1,$be,$c1,$bc,$c3 - db $55,$ba,$55,$ba,$55,$ba,$55,$ba,$b4,$fb,$b4,$eb,$b4,$eb,$f4,$eb - db $04,$8b,$04,$8b,$04,$8b,$04,$8b,$04,$0b,$04,$0b,$04,$0b,$04,$0b - db $07,$1a,$07,$1a,$07,$1a,$07,$1a,$05,$0b,$05,$0b,$05,$0b,$05,$0b - db $7f,$c0,$7f,$c0,$7e,$c1,$7e,$c1,$7d,$c3,$5b,$e7,$47,$ff,$ff,$ff - db $4f,$c9,$4f,$c9,$cf,$c9,$cf,$c9,$cf,$c9,$cf,$c9,$cf,$c9,$cf,$c9 - db $91,$ef,$c7,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$7f,$7f,$7f,$7f - db $f4,$eb,$f4,$eb,$d4,$eb,$94,$ab,$94,$ab,$14,$2b,$14,$2b,$14,$2b - db $04,$0b,$04,$0b,$04,$0b,$04,$0b,$04,$0b,$04,$0b,$04,$0b,$04,$0b - db $05,$0a,$05,$0a,$05,$0a,$05,$0a,$05,$0a,$05,$0a,$05,$0a,$05,$0a - db $ff,$ff,$ff,$ff,$ff,$ff,$7f,$ff,$7f,$ff,$7f,$ff,$7f,$bf,$7f,$bf - db $8f,$89,$8f,$89,$8f,$89,$8f,$89,$8f,$89,$8f,$89,$0f,$09,$0f,$09 - db $3e,$3e,$1e,$1e,$0c,$0c,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $14,$2b,$14,$6a,$14,$6a,$14,$6a,$14,$6b,$14,$6b,$14,$6b,$15,$6a - db $04,$0b,$04,$0b,$04,$0b,$04,$0b,$04,$0b,$04,$1b,$05,$9a,$05,$fa - db $01,$0e,$01,$06,$01,$06,$01,$06,$01,$0e,$05,$8a,$05,$9a,$05,$fa - db $5e,$be,$5c,$bc,$40,$b0,$40,$b0,$40,$b0,$40,$b0,$50,$a8,$50,$a8 - db $0f,$09,$0f,$09,$0f,$09,$0f,$09,$0f,$09,$0f,$09,$0f,$09,$0f,$09 - db $15,$6a,$15,$6a,$15,$6a,$15,$6a,$15,$6a,$15,$6a,$15,$6a,$15,$6a - db $50,$a8,$50,$a8,$50,$a8,$50,$a8,$50,$a8,$50,$a8,$50,$ac,$50,$ac - db $15,$6a,$15,$6a,$15,$6a,$55,$aa,$55,$aa,$55,$aa,$55,$aa,$55,$aa - db $50,$ac,$50,$ac,$50,$ac,$50,$ac,$50,$ac,$50,$ac,$50,$ac,$50,$ac - db $55,$aa,$55,$aa,$55,$aa,$55,$aa,$55,$aa,$55,$aa,$15,$ea,$15,$ea - db $55,$aa,$55,$aa,$41,$80,$08,$88,$1c,$1c,$3e,$36,$1f,$0f,$1b,$19 - db $55,$aa,$55,$aa,$05,$02,$11,$12,$38,$38,$7c,$6c,$f8,$f0,$d8,$98 - db $03,$03,$07,$06,$7e,$7e,$4c,$7c,$44,$4c,$64,$6c,$7c,$3c,$00,$00 - db $c0,$c0,$e0,$60,$7e,$7e,$32,$3e,$22,$32,$26,$36,$3e,$3c,$00,$00 - db $00,$02,$00,$02,$00,$02,$00,$02,$00,$02,$00,$02,$00,$02,$00,$02 - db $80,$7f,$00,$ff,$00,$ff,$03,$fc,$7f,$80,$fe,$01,$fc,$03,$fc,$02 - db $00,$c0,$00,$c0,$80,$40,$80,$40,$00,$80,$00,$00,$00,$00,$00,$00 - db $00,$01,$00,$1e,$04,$3b,$14,$6b,$30,$4e,$30,$4c,$20,$5e,$20,$57 - db $00,$61,$00,$40,$00,$c0,$00,$c0,$00,$c0,$00,$c0,$00,$c0,$00,$c0 - db $00,$81,$00,$81,$00,$83,$00,$82,$00,$86,$00,$fe,$00,$02,$00,$02 - db $50,$ac,$50,$ac,$50,$ac,$50,$ac,$50,$ad,$50,$ad,$51,$ae,$51,$ae - db $0f,$09,$0f,$09,$00,$3f,$0e,$f1,$7f,$80,$ff,$00,$ff,$00,$80,$7f - db $00,$00,$00,$00,$00,$00,$00,$80,$80,$40,$80,$40,$00,$c0,$00,$c0 - db $3c,$c3,$3c,$c2,$7c,$82,$18,$e6,$00,$3c,$00,$00,$00,$00,$00,$00 - db $00,$fc,$00,$3e,$00,$16,$00,$12,$00,$12,$00,$33,$00,$23,$00,$61 - db $00,$e1,$00,$3f,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$c3,$00,$01,$00,$01,$00,$01,$00,$01,$00,$01,$00,$03,$00,$02 - db $00,$00,$00,$00,$00,$00,$00,$01,$01,$02,$01,$02,$00,$03,$00,$03 - db $00,$00,$00,$00,$00,$fc,$70,$8f,$fe,$01,$ff,$00,$ff,$00,$01,$fe - db $00,$03,$00,$03,$01,$02,$01,$02,$00,$01,$00,$00,$00,$00,$00,$00 - db $01,$fe,$00,$ff,$00,$ff,$c0,$3f,$fe,$01,$7f,$80,$3f,$c0,$3f,$c0 - db $00,$40,$00,$40,$00,$40,$00,$40,$00,$40,$00,$40,$00,$40,$00,$40 - db $00,$3f,$00,$7c,$00,$68,$00,$48,$00,$48,$00,$cc,$00,$c4,$00,$86 - db $3c,$c3,$3c,$43,$3e,$41,$18,$67,$00,$3c,$00,$00,$00,$00,$00,$00 - db $00,$80,$00,$78,$20,$dc,$28,$d6,$0c,$72,$0c,$32,$04,$7a,$04,$ea - db $00,$c3,$00,$80,$00,$80,$00,$80,$00,$80,$00,$80,$00,$c0,$00,$40 - db $00,$87,$00,$fc,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$86,$00,$02,$00,$03,$00,$03,$00,$03,$00,$03,$00,$03,$00,$03 - db $00,$81,$00,$81,$00,$c1,$00,$41,$00,$61,$00,$7f,$00,$40,$00,$40 - db $01,$02,$01,$02,$01,$02,$01,$02,$01,$02,$01,$02,$01,$02,$01,$02 - db $80,$40,$80,$40,$80,$40,$80,$40,$80,$40,$80,$40,$80,$40,$80,$40 - db $60,$60,$40,$40,$40,$40,$c0,$c0,$80,$80,$f0,$f0,$00,$00,$00,$00 - db $00,$00,$00,$00,$1f,$1f,$08,$08,$08,$08,$0c,$0c,$04,$04,$04,$04 - db $00,$00,$00,$00,$f8,$f8,$10,$10,$10,$10,$30,$30,$20,$20,$20,$20 - db $55,$aa,$55,$aa,$55,$aa,$55,$aa,$55,$aa,$55,$aa,$55,$aa,$55,$aa + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00 + db $84,$84,$44,$c4,$64,$e4,$24,$e4,$34,$f4,$1c,$fc,$1c,$fc,$0c,$fc + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$0f,$0f,$f8,$ff + db $00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$fe,$ff,$03,$ff,$1c,$fc + db $01,$01,$03,$03,$03,$03,$06,$07,$fe,$ff,$1c,$ff,$fc,$ff,$18,$1f + db $04,$fc,$04,$fc,$04,$fc,$84,$7c,$c4,$3c,$e4,$1c,$f4,$0c,$f4,$0c + db $80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$c0,$c0,$c0,$c0 + db $03,$03,$04,$07,$09,$0e,$10,$1f,$13,$1c,$1f,$1f,$1f,$1f,$1e,$1f + db $f3,$f3,$0a,$fb,$ff,$07,$fc,$04,$fc,$7c,$fc,$fc,$fc,$fc,$3c,$cc + db $9f,$ff,$fa,$fb,$82,$83,$02,$03,$01,$01,$01,$01,$01,$01,$01,$01 + db $f0,$f0,$10,$f0,$10,$f0,$10,$f0,$10,$f0,$11,$f1,$13,$f3,$13,$f3 + db $30,$3f,$30,$3f,$60,$7f,$c1,$fe,$81,$fe,$83,$fc,$87,$f8,$07,$f8 + db $fc,$04,$fc,$04,$fc,$04,$fc,$04,$fc,$04,$fc,$04,$fc,$04,$fc,$04 + db $e0,$e0,$b0,$f0,$b0,$f0,$98,$f8,$8c,$fc,$8c,$fc,$86,$fe,$c7,$bf + db $1f,$18,$17,$18,$0e,$09,$0b,$0c,$05,$06,$02,$03,$00,$03,$ff,$ff + db $fc,$04,$fc,$04,$1c,$e4,$f4,$0c,$e8,$18,$10,$f0,$00,$f0,$ff,$ff + db $01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80 + db $17,$f7,$96,$f7,$9e,$ff,$9c,$ff,$58,$7f,$58,$7f,$48,$7f,$49,$7e + db $0f,$f0,$1f,$e0,$1f,$e0,$3f,$c0,$7f,$80,$7f,$80,$ff,$00,$ff,$00 + db $fc,$04,$fc,$04,$fc,$3c,$ff,$3f,$ff,$07,$ff,$1d,$ff,$30,$ff,$27 + db $c3,$bf,$e1,$9f,$f9,$ff,$f8,$f7,$f8,$87,$fc,$c3,$fe,$c1,$ff,$40 + db $03,$07,$84,$87,$88,$8f,$c8,$cf,$f0,$ff,$60,$ff,$20,$ff,$60,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $60,$f8,$18,$fc,$0d,$fd,$03,$ff,$01,$ff,$01,$ff,$01,$ff,$01,$ff + db $c9,$fe,$eb,$fc,$ef,$f8,$af,$f8,$af,$f8,$27,$fc,$37,$dc,$77,$9c + db $ff,$20,$ff,$27,$ff,$20,$ff,$27,$9f,$70,$9f,$7f,$6f,$ff,$57,$ff + db $ff,$40,$ff,$41,$fe,$e3,$fe,$ff,$ff,$8f,$ff,$83,$ff,$80,$ff,$80 + db $c0,$7f,$80,$ff,$01,$ff,$01,$ff,$e1,$ff,$e1,$3f,$e1,$3f,$f1,$3f + db $01,$ff,$20,$ff,$20,$ff,$20,$ff,$20,$ff,$23,$ff,$23,$fe,$23,$fe + db $f7,$1c,$f7,$9c,$f7,$9c,$f3,$9e,$7b,$de,$fb,$ff,$ff,$70,$ff,$3e + db $ff,$00,$ff,$00,$ff,$00,$fd,$02,$f0,$0f,$e4,$1f,$eb,$9f,$c5,$ff + db $e9,$fe,$d1,$fe,$f9,$fe,$d1,$fe,$e9,$fe,$d1,$fe,$e9,$fe,$d1,$fe + db $ff,$80,$ff,$c0,$ff,$c0,$ff,$c0,$7f,$f0,$7f,$ff,$7f,$ff,$7f,$ff + db $f1,$1f,$f1,$1f,$f1,$1f,$f1,$1f,$f1,$3f,$f1,$ff,$f1,$ff,$f2,$ff + db $23,$fe,$23,$fe,$23,$fe,$23,$fe,$23,$fe,$23,$ff,$23,$ff,$23,$ff + db $ff,$60,$ff,$7c,$ff,$40,$ff,$3d,$ff,$23,$fd,$ff,$fc,$ff,$fc,$ff + db $cb,$7f,$c5,$7f,$cf,$ff,$c5,$bf,$4b,$bf,$45,$bf,$cb,$bf,$c5,$bf + db $7f,$ff,$7f,$ff,$7f,$ff,$7f,$ff,$6f,$ff,$77,$ff,$67,$fb,$74,$fb + db $f2,$ff,$e2,$ff,$e6,$ff,$ec,$ff,$fc,$ff,$fc,$ff,$dc,$ff,$dc,$ff + db $33,$ff,$33,$ff,$39,$ff,$3d,$ff,$3d,$ff,$3f,$ff,$3f,$ff,$3f,$ff + db $fc,$ff,$fe,$ff,$fa,$ff,$fe,$ff,$fa,$ff,$f6,$ff,$f2,$ff,$f6,$ef + db $cb,$bf,$c5,$bf,$cf,$bf,$c5,$bf,$4b,$ff,$45,$ff,$4b,$ff,$45,$ff + db $66,$fb,$74,$fb,$66,$fb,$74,$fb,$66,$fb,$74,$fb,$66,$fb,$74,$fb + db $9c,$ff,$dc,$ff,$9c,$ff,$dc,$ff,$9c,$ff,$dc,$ff,$98,$ff,$d8,$ff + db $3d,$ff,$3d,$ff,$3c,$ff,$1d,$ff,$1c,$ff,$1d,$ff,$1c,$ff,$1d,$ff + db $f2,$ef,$97,$ef,$b3,$ef,$97,$ef,$b3,$ef,$97,$ef,$b3,$ef,$97,$ef + db $4b,$ff,$25,$ff,$2f,$ff,$25,$ff,$ab,$ff,$65,$ff,$4b,$bf,$45,$bf + db $66,$fb,$74,$fb,$66,$fb,$74,$fb,$64,$fb,$70,$ff,$60,$ff,$40,$ff + db $88,$ff,$c8,$ff,$88,$ff,$08,$ff,$18,$ff,$10,$df,$10,$9f,$10,$df + db $1c,$e3,$06,$f9,$01,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$ff,$00,$ff,$80,$7f,$c0,$3f,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $0c,$ff,$09,$ff,$04,$ff,$04,$ff,$02,$ff,$02,$ff,$0e,$f2,$1a,$e7 + db $b3,$ef,$97,$ef,$b3,$ef,$17,$ef,$13,$ef,$07,$ff,$03,$ff,$01,$ff + db $4b,$bf,$45,$bf,$4f,$bf,$45,$bf,$4b,$bf,$45,$bf,$4b,$bf,$45,$bf + db $e9,$fe,$d1,$fe,$f8,$ff,$d0,$ff,$e0,$ff,$80,$ff,$00,$ff,$00,$fc + db $00,$fc,$00,$fe,$00,$e0,$00,$c0,$00,$f0,$00,$00,$00,$f0,$00,$00 + db $10,$1f,$10,$1f,$30,$3f,$38,$37,$24,$3b,$22,$3d,$21,$3e,$21,$3e + db $00,$ff,$00,$ff,$01,$fe,$07,$f8,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $32,$ce,$c1,$3f,$81,$7f,$01,$ff,$01,$ff,$01,$ff,$00,$ff,$00,$ff + db $00,$3f,$00,$07,$00,$9f,$00,$81,$00,$03,$00,$80,$80,$81,$80,$80 + db $4b,$bf,$45,$bf,$0f,$ff,$05,$ff,$03,$ff,$00,$7f,$00,$ff,$00,$1f + db $00,$f0,$00,$fe,$00,$c0,$00,$00,$00,$00,$00,$00,$00,$01,$01,$02 + db $00,$00,$00,$00,$00,$00,$00,$01,$00,$7e,$78,$86,$f0,$0c,$e0,$18 + db $21,$3e,$20,$3f,$20,$3f,$20,$ff,$00,$3f,$00,$3f,$00,$7f,$00,$7f + db $80,$7f,$80,$7f,$40,$bf,$60,$9f,$30,$cf,$18,$e7,$07,$f8,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$c0,$3f,$00,$ff + db $80,$80,$80,$80,$80,$80,$80,$e0,$80,$ff,$47,$d8,$23,$ec,$21,$e6 + db $00,$07,$00,$0f,$00,$01,$00,$01,$00,$00,$00,$80,$80,$40,$c0,$20 + db $03,$0c,$0f,$10,$1f,$20,$3e,$41,$7c,$83,$f8,$07,$f0,$0e,$e0,$1f + db $c0,$30,$80,$60,$00,$c0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$ff + db $00,$7f,$00,$7f,$00,$3f,$00,$0f,$00,$00,$00,$00,$00,$00,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$03,$00,$00,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$00,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fc,$00,$80,$00,$00,$00,$ff + db $20,$e3,$00,$f1,$00,$f0,$00,$c0,$00,$00,$00,$00,$00,$00,$00,$ff + db $e0,$10,$70,$88,$38,$c4,$1c,$62,$0e,$31,$07,$18,$07,$08,$03,$fc + db $e0,$1f,$e0,$1f,$e0,$1f,$e0,$1f,$e0,$1f,$e0,$1f,$e0,$1f,$ff,$00 + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$ff,$00 + db $03,$fc,$03,$fc,$03,$fc,$03,$fc,$03,$fc,$03,$fc,$03,$fc,$ff,$00 + db $00,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $00,$00,$7f,$7f,$20,$31,$31,$31,$11,$1b,$1b,$1b,$0a,$0e,$0c,$0e + db $00,$00,$fe,$fe,$88,$98,$88,$98,$08,$18,$08,$18,$08,$18,$08,$18 + db $06,$0e,$0a,$0e,$1b,$1b,$11,$1b,$31,$31,$20,$31,$7f,$7f,$00,$00 + db $08,$18,$08,$18,$08,$18,$08,$18,$88,$98,$88,$98,$fe,$fe,$00,$00 + db $3f,$40,$3f,$40,$3f,$40,$3f,$40,$1f,$20,$1f,$20,$1f,$20,$0f,$10 + db $fc,$02,$fc,$02,$fc,$02,$fc,$02,$f8,$04,$f8,$04,$f8,$04,$f0,$08 + db $0f,$10,$07,$08,$03,$04,$01,$02,$00,$01,$00,$00,$00,$00,$00,$00 + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$3f,$c0,$07,$38,$00,$07 + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fc,$03,$e0,$1c,$00,$e0 + db $f0,$08,$e0,$10,$c0,$20,$80,$40,$00,$80,$00,$00,$00,$00,$00,$00 + db $80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$03 BackgroundCopy: - db $1a, $1a, $1a, $1c, $1d, $1e, $1f, $20 - db $1a, $1a, $21, $22, $23, $24, $25, $26 - db $1a, $27, $28, $29, $2a, $2b, $2c, $2d - db $1a, $2e, $2f, $30, $31, $32, $33, $1a - db $1a, $34, $35, $36, $37, $38, $39, $3a - db $1a, $3b, $3c, $3d, $3e, $3f, $40, $41 - db $1a, $42, $43, $44, $45, $46, $47, $1a - db $1a, $48, $49, $4a, $4b, $4c, $4d, $1a - db $1a, $4e, $4f, $50, $51, $52, $53, $1a - db $1a, $1a, $54, $7b, $7b, $55, $53, $1a - db $1a, $1a, $56, $7b, $7b, $57, $53, $1a - db $6a, $6b, $58, $59, $5a, $63, $64, $65 - db $6c, $6d, $77, $5b, $5c, $76, $5e, $5f - db $6f, $70, $71, $1a, $1a, $60, $66, $67 - db $72, $73, $74, $79, $7a, $61, $68, $69 - db $6e, $1a, $75, $1b, $78, $62, $1a, $5d + db $1a, $1a, $6f, $1b, $1b, $70, $1a, $1a + db $76, $1a, $71, $72, $73, $74, $1a, $1a + db $1c, $75, $1a, $1a, $1a, $1d, $1e, $1f + db $20, $21, $1a, $22, $23, $24, $25, $26 + db $27, $28, $1a, $29, $2a, $2b, $2c, $2d + db $2e, $2f, $30, $31, $31, $32, $33, $1b + db $34, $35, $36, $31, $31, $37, $38, $39 + db $3a, $3b, $3c, $31, $31, $3d, $3e, $3f + db $3a, $40, $41, $31, $31, $42, $43, $44 + db $3a, $45, $46, $31, $31, $47, $48, $49 + db $3a, $4a, $4b, $4c, $4d, $4e, $4f, $50 + db $51, $52, $53, $31, $54, $55, $56, $57 + db $58, $59, $5a, $5b, $5c, $31, $5d, $5e + db $5f, $60, $61, $62, $63, $64, $65, $66 + db $67, $68, $68, $6b, $6c, $68, $68, $69 + db $6a, $6a, $6a, $6d, $6e, $6a, $6a, $6a diff --git a/ScreenCardBrowse.inc b/ScreenCardBrowse.inc index 564386c..d69495b 100644 --- a/ScreenCardBrowse.inc +++ b/ScreenCardBrowse.inc @@ -119,6 +119,8 @@ CardBrowseDraw: ld bc, (SquaresTileset8 - SquaresTileset7) / 8 call CopyRangeUnsafeBy8s + call CardDraw + ld de, SAFE_DMA_LOCATION ld a, HIGH(MY_OAM) call RunDMA diff --git a/ScreenCardRead.inc b/ScreenCardRead.inc index 3a91f62..1f374c1 100644 --- a/ScreenCardRead.inc +++ b/ScreenCardRead.inc @@ -114,6 +114,8 @@ CardReadDraw: ld bc, (SquaresTileset8 - SquaresTileset7) / 8 call CopyRangeUnsafeBy8s + call CardDraw + ld de, SAFE_DMA_LOCATION ld a, HIGH(MY_OAM) call RunDMA diff --git a/SpriteTiles.asm b/SpriteTiles.asm index dc6b64b..eb25c93 100644 --- a/SpriteTiles.asm +++ b/SpriteTiles.asm @@ -4,71 +4,21 @@ SpriteTiles: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$00,$01,$01,$03,$02,$07,$04,$0f,$08,$1f,$10 - db $07,$07,$1f,$18,$7f,$60,$ff,$80,$ff,$00,$ff,$03,$fc,$0c,$f0,$30 - db $1c,$1c,$1f,$03,$1f,$00,$1f,$00,$0f,$00,$0f,$08,$07,$06,$01,$01 - db $00,$00,$00,$00,$c0,$c0,$f0,$30,$f8,$08,$fc,$04,$fc,$00,$fc,$80 - db $00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$03,$02,$03,$02 - db $3f,$20,$7f,$40,$ff,$81,$fe,$82,$fc,$05,$f8,$08,$f8,$08,$f0,$10 - db $07,$04,$07,$04,$07,$04,$07,$04,$0f,$08,$0f,$08,$0f,$08,$0f,$08 - db $00,$00,$00,$00,$00,$00,$00,$00,$60,$40,$60,$40,$60,$40,$60,$40 - db $0f,$08,$0f,$08,$0f,$08,$0f,$08,$0f,$08,$07,$04,$07,$04,$06,$04 - db $60,$c0,$60,$40,$60,$40,$60,$40,$60,$40,$e0,$80,$e0,$80,$e0,$80 - db $06,$04,$02,$02,$02,$02,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $c0,$00,$c0,$00,$c0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $80,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $c0,$40,$80,$80,$00,$00,$00,$00,$00,$e0,$60,$98,$38,$c4,$3c,$40 - db $7c,$40,$3c,$20,$1c,$10,$00,$00,$00,$00,$00,$60,$60,$80,$c0,$20 - db $f0,$10,$e0,$20,$e0,$20,$e0,$20,$c0,$40,$c0,$40,$c0,$70,$c0,$40 - db $80,$00,$80,$00,$00,$80,$00,$80,$00,$00,$00,$c0,$c0,$30,$f0,$0c - db $c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$80,$00,$00,$00,$00,$00 - db $01,$01,$01,$01,$03,$02,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $1c,$20,$0c,$30,$0c,$10,$04,$18,$04,$78,$7c,$80,$7c,$00,$3c,$00 - db $3e,$00,$3e,$00,$0f,$30,$03,$0c,$00,$03,$00,$00,$00,$00,$00,$00 - db $03,$00,$03,$00,$03,$00,$03,$00,$02,$01,$02,$01,$03,$00,$03,$00 - db $03,$00,$07,$00,$07,$00,$00,$07,$00,$0c,$00,$00,$00,$00,$00,$00 - db $fc,$03,$e0,$1c,$00,$e0,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$00 - db $3c,$40,$1c,$60,$1c,$20,$0c,$70,$7c,$80,$fc,$00,$7c,$00,$3c,$00 - db $c0,$40,$80,$80,$00,$00,$00,$00,$00,$f8,$f0,$0c,$fc,$00,$7c,$80 - db $3f,$20,$7f,$40,$ff,$81,$fe,$82,$fc,$05,$f8,$09,$f8,$09,$f0,$10 - db $f0,$10,$e0,$20,$e0,$20,$e0,$20,$c0,$43,$c3,$4c,$c0,$70,$c0,$40 - db $3e,$00,$3e,$00,$3f,$00,$07,$00,$03,$04,$00,$03,$00,$00,$00,$00 - db $03,$00,$07,$00,$07,$00,$06,$01,$0c,$02,$00,$0c,$00,$00,$00,$00 - db $fe,$01,$f8,$06,$c0,$38,$00,$c0,$00,$00,$00,$00,$00,$00,$00,$00 - db $80,$00,$80,$00,$80,$00,$80,$00,$00,$80,$80,$60,$e0,$18,$f8,$06 - db $03,$00,$03,$00,$03,$00,$03,$00,$03,$00,$03,$00,$03,$00,$03,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$00,$03,$00 - db $7c,$40,$3c,$20,$1c,$10,$00,$00,$00,$60,$60,$80,$e0,$00,$e0,$10 - db $f0,$10,$e0,$20,$e0,$20,$e0,$21,$c1,$4e,$cf,$70,$f0,$40,$e0,$40 - db $7c,$80,$7c,$80,$3c,$40,$7c,$80,$fc,$00,$fc,$00,$7c,$00,$3c,$00 - db $3f,$20,$7f,$40,$ff,$81,$fe,$83,$fd,$06,$f9,$0a,$f8,$09,$f0,$11 - db $c0,$40,$80,$80,$00,$00,$00,$f0,$f0,$0c,$fc,$00,$fc,$00,$fc,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$00,$03,$00,$03,$00 - db $3e,$00,$3e,$00,$3f,$00,$07,$00,$07,$00,$03,$04,$00,$00,$00,$00 - db $03,$00,$07,$00,$07,$00,$07,$00,$0e,$01,$0c,$02,$00,$00,$00,$00 - db $ff,$00,$fe,$01,$f8,$06,$c0,$38,$00,$c0,$00,$00,$00,$00,$00,$00 - db $e0,$40,$60,$c0,$60,$40,$60,$40,$60,$40,$e0,$80,$e0,$80,$e0,$80 - db $80,$00,$80,$00,$80,$00,$80,$00,$80,$60,$e0,$18,$f8,$06,$fe,$01 - db $7c,$40,$3c,$20,$1c,$10,$00,$60,$60,$80,$e0,$00,$e0,$00,$f0,$08 - db $c0,$60,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$80,$00,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$60,$40,$60,$40,$60,$40,$60,$c0 + db $18,$18,$18,$18,$18,$18,$18,$18,$24,$24,$24,$24,$24,$24,$24,$24 + db $42,$42,$42,$42,$42,$42,$42,$42,$81,$81,$ff,$ff,$81,$ff,$7e,$7e + db $00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$00,$00 + db $44,$44,$84,$84,$84,$84,$84,$84,$02,$02,$fe,$fe,$02,$fe,$fc,$fc + db $22,$22,$21,$21,$21,$21,$21,$21,$40,$40,$7f,$7f,$40,$7f,$3f,$3f + db $00,$00,$00,$00,$00,$00,$00,$00,$80,$80,$80,$80,$80,$80,$00,$00 + db $18,$18,$18,$18,$18,$18,$18,$18,$24,$24,$24,$24,$24,$24,$22,$22 + db $18,$18,$18,$18,$18,$18,$18,$18,$24,$24,$24,$24,$24,$24,$44,$44 Sprites: - db $00, $01, $02, $0d, $03, $04, $00 - db $05, $06, $0e, $00, $19, $0f, $00 - db $07, $10, $14, $00, $16, $11, $08 - db $09, $12, $15, $00, $17, $18, $0a - db $0b, $00, $00, $00, $00, $13, $0c - db $00, $01, $02, $0d, $03, $04, $00 - db $05, $1c, $1b, $00, $23, $24, $00 - db $07, $1d, $1a, $00, $22, $21, $08 - db $09, $12, $1e, $00, $1f, $20, $0a - db $0b, $00, $00, $00, $00, $13, $0c - db $00, $01, $02, $0d, $03, $04, $00 - db $05, $27, $28, $00, $29, $2f, $00 - db $07, $25, $26, $00, $22, $2e, $31 - db $09, $30, $2a, $00, $2b, $2c, $2d - db $0b, $00, $00, $00, $00, $13, $0c + db $00, $01, $00 + db $00, $02, $00 + db $00, $08, $00 + db $03, $04, $00 + db $00, $07, $00 + db $00, $05, $06 diff --git a/source.zip b/source.zip index 04554c1..3c33025 100644 Binary files a/source.zip and b/source.zip differ