diff --git a/11Justice.inc b/11Justice.inc index e35db94..ac18df7 100644 --- a/11Justice.inc +++ b/11Justice.inc @@ -122,37 +122,36 @@ Justice: .KeyArtTiles: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - 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 $fc,$84,$fc,$c4,$7c,$e4,$3c,$e4,$3c,$f4,$1c,$fc,$1c,$fc,$0c,$fc + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$0f,$f8,$ff + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$03,$fe,$ff,$03,$ff,$1f,$fc + db $ff,$01,$ff,$03,$ff,$03,$fe,$07,$fe,$ff,$1c,$ff,$fc,$ff,$f8,$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 $ff,$80,$ff,$80,$ff,$80,$ff,$80,$ff,$80,$ff,$80,$ff,$c0,$ff,$c0 + db $ff,$03,$fc,$07,$f9,$0e,$f0,$1f,$f3,$1c,$ff,$1f,$ff,$1f,$fe,$1f + db $ff,$f3,$0e,$fb,$ff,$07,$ff,$04,$ff,$7c,$ff,$fc,$ff,$fc,$3f,$cc + db $9f,$ff,$fe,$fb,$fe,$83,$fe,$03,$ff,$01,$ff,$01,$ff,$01,$ff,$01 + db $ff,$f0,$1f,$f0,$1f,$f0,$1f,$f0,$1f,$f0,$1f,$f1,$1f,$f3,$1f,$f3 + db $f0,$3f,$f0,$3f,$e0,$7f,$c0,$ff,$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 $ff,$e0,$bf,$f0,$bf,$f0,$9f,$f8,$8f,$fc,$8f,$fc,$87,$fe,$c7,$bf + db $ff,$18,$f7,$18,$fe,$09,$fb,$0c,$fd,$06,$fe,$03,$fc,$03,$ff,$ff + db $ff,$04,$ff,$04,$1f,$e4,$f7,$0c,$ef,$18,$1f,$f0,$0f,$f0,$ff,$ff + db $ff,$01,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$80 + db $1f,$f7,$9e,$f7,$9e,$ff,$9c,$ff,$d8,$7f,$d8,$7f,$c8,$7f,$c9,$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 $fb,$07,$fc,$87,$f8,$8f,$f8,$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 $67,$f8,$1b,$fc,$0f,$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,$20,$ff,$27,$ff,$20,$ff,$27,$1f,$f0,$1f,$ff,$6f,$ff,$d7,$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 $ff,$00,$ff,$00,$ff,$00,$fc,$03,$f0,$0f,$e5,$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 @@ -182,14 +181,14 @@ Justice: 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 $4b,$bf,$45,$bf,$0f,$ff,$05,$ff,$03,$ff,$01,$7f,$00,$ff,$00,$1f + db $00,$f0,$00,$fe,$00,$c0,$00,$80,$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 $00,$07,$00,$0f,$00,$03,$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 @@ -206,31 +205,32 @@ Justice: 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 + db $80,$00,$80,$00,$80,$00,$80,$00,$c0,$00,$c0,$00,$c0,$00,$e0,$00 + db $01,$00,$01,$00,$01,$00,$01,$00,$03,$00,$03,$00,$03,$00,$07,$00 + db $e0,$00,$f0,$00,$f8,$00,$fc,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$c0,$00,$f8,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$00,$1f,$00 + db $07,$00,$0f,$00,$1f,$00,$3f,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00 + db $ff,$80,$ff,$80,$ff,$80,$ff,$80,$ff,$80,$ff,$80,$ff,$80,$ff,$80 + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$03 + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00 .KeyArtTilesEnd: .BackgroundCopy: ; tiles start at 26 - 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 + db $76, $76, $6e, $1a, $1a, $6f, $76, $76 + db $75, $76, $70, $71, $72, $73, $76, $76 + db $1b, $74, $76, $76, $76, $1c, $1d, $1e + db $1f, $20, $76, $21, $22, $23, $24, $25 + db $26, $27, $76, $28, $29, $2a, $2b, $2c + db $2d, $2e, $2f, $30, $30, $31, $32, $76 + db $33, $34, $35, $30, $30, $36, $37, $38 + db $39, $3a, $3b, $30, $30, $3c, $3d, $3e + db $39, $3f, $40, $30, $30, $41, $42, $43 + db $39, $44, $45, $30, $30, $46, $47, $48 + db $39, $49, $4a, $4b, $4c, $4d, $4e, $4f + db $50, $51, $52, $30, $53, $54, $55, $56 + db $57, $58, $59, $5a, $5b, $30, $5c, $5d + db $5e, $5f, $60, $61, $62, $63, $64, $65 + db $66, $67, $67, $6a, $6b, $67, $67, $68 + db $69, $69, $69, $6c, $6d, $69, $69, $69 .BackgroundCopyEnd: diff --git a/12TheHangedMan.inc b/12TheHangedMan.inc index e242308..40e4dfe 100644 --- a/12TheHangedMan.inc +++ b/12TheHangedMan.inc @@ -14,10 +14,245 @@ TheHangedMan: 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 + + 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 + + ld b, 6 + ld a, [CVS+2] + inc a + call ArrayClampLoopingB + ld [CVS+2], a + + call .swing +: + ret .fDraw: ret + +.swing: + ld a, [CVS+2] + cp a, 0 + jp nz, :+ + + ld hl, .hang1 + ld b, (2+2)*8 + ld c, (4)*8 + +: cp a, 1 + jp nz, :+ + + ld hl, .hang1 + ld b, (2+2)*8 + ld c, (4)*8 + +: cp a, 2 + jp nz, :+ + + ld hl, .hang2 + ld b, (2+2)*8 + ld c, (4)*8+2 + +: cp a, 3 + jp nz, :+ + + ld hl, .hang3 + ld b, (2+2)*8+1 + ld c, (4)*8+4 + +: cp a, 4 + jp nz, :+ + + ld hl, .hang3 + ld b, (2+2)*8+1 + ld c, (4)*8+4 + +: cp a, 5 + jp nz, :+ + + ld hl, .hang2 + ld b, (2+2)*8 + ld c, (4)*8+2 + +: + + ld de, MY_OAM + ld a, $d5 + call BuildMetaSpritePacked + ret + +.hang1 + db $00, $00, $01, $00, $00 + db $00, $29, $02, $03, $00 + db $00, $04, $05, $00, $00 + db $00, $00, $06, $07, $08 + db $09, $0a, $0b, $0c, $0d + db $0e, $0f, $10, $11, $00 + db $12, $13, $14, $00, $00 + db $15, $16, $17, $00, $00 + db $18, $19, $1a, $1b, $00 + db $1c, $1d, $1e, $1f, $00 + db $20, $21, $22, $23, $00 + db $00, $24, $25, $00, $00 + db $00, $28, $26, $00, $00 +.hang2 + db $00, $00, $4f, $00, $00 + db $00, $50, $51, $00, $00 + db $00, $52, $53, $00, $00 + db $00, $54, $55, $56, $57 + db $58, $59, $5a, $5b, $00 + db $5c, $5d, $5e, $00, $00 + db $5f, $60, $61, $00, $00 + db $62, $63, $64, $00, $00 + db $65, $19, $66, $67, $00 + db $1c, $1d, $1e, $68, $00 + db $20, $21, $22, $23, $00 + db $00, $69, $6a, $00, $00 + db $00, $6b, $6c, $6d, $00 +.hang3 + db $00, $01, $2b, $00, $00 + db $00, $2c, $2d, $00, $00 + db $00, $2e, $2f, $00, $00 + db $00, $30, $31, $32, $00 + db $33, $34, $35, $36, $00 + db $37, $38, $39, $00, $00 + db $3a, $3b, $3c, $00, $00 + db $3d, $3e, $3f, $00, $00 + db $40, $41, $42, $43, $00 + db $44, $45, $46, $47, $00 + db $27, $48, $49, $00, $00 + db $00, $4a, $4b, $2a, $00 + db $00, $4c, $4d, $4e, $00 + .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,$00,$00,$00,$00,$00,$00,$00,$00,$07,$07 + db $78,$7f,$40,$7f,$81,$ff,$02,$ff,$05,$ff,$0a,$fe,$00,$f4,$e0,$fc + db $80,$80,$40,$c0,$00,$c0,$80,$c0,$00,$80,$00,$00,$00,$00,$00,$00 + db $0f,$0f,$07,$07,$04,$07,$04,$07,$06,$07,$00,$01,$01,$01,$01,$01 + db $fc,$fc,$fc,$fc,$1c,$fc,$00,$fc,$00,$fe,$00,$fe,$00,$ff,$00,$ff + db $80,$ff,$80,$ff,$80,$ff,$80,$ff,$80,$ff,$00,$7f,$40,$7f,$40,$7f + db $00,$00,$00,$80,$00,$80,$00,$81,$40,$c3,$42,$c7,$45,$c7,$4a,$cf + db $00,$00,$00,$00,$00,$00,$c0,$c0,$20,$e0,$20,$e0,$20,$e0,$40,$c0 + db $00,$00,$03,$03,$06,$07,$04,$07,$00,$07,$00,$07,$00,$07,$00,$07 + db $00,$00,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$1f,$ff,$0f,$ff + db $40,$7f,$c0,$ff,$40,$ff,$40,$ff,$40,$ff,$c0,$ff,$c0,$ff,$c0,$ff + db $54,$df,$68,$ef,$60,$ff,$61,$ff,$61,$ff,$62,$fe,$5e,$fe,$40,$c0 + db $40,$c0,$80,$80,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$07,$00,$07,$00,$07,$00,$07,$00,$07,$00,$07,$00,$07,$00,$03 + db $0c,$fc,$0c,$fc,$04,$fc,$04,$fc,$06,$fe,$03,$ff,$03,$ff,$03,$ff + db $c0,$ff,$c0,$ff,$c0,$ff,$c0,$ff,$c0,$ff,$80,$ff,$80,$ff,$81,$ff + db $40,$c0,$40,$c0,$40,$c0,$40,$c0,$c0,$c0,$80,$80,$80,$80,$80,$80 + db $00,$03,$00,$03,$00,$03,$00,$03,$02,$03,$01,$03,$00,$03,$03,$03 + db $01,$ff,$01,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$ff,$ff,$ff,$ff + db $81,$ff,$81,$ff,$01,$ff,$01,$ff,$03,$ff,$05,$ff,$c9,$ff,$fe,$fe + db $01,$01,$00,$00,$00,$01,$00,$01,$00,$01,$00,$01,$00,$01,$00,$01 + db $c0,$c0,$80,$80,$00,$ff,$00,$ff,$3f,$c0,$ff,$00,$ff,$00,$ff,$00 + db $00,$0e,$04,$3a,$1c,$e2,$7c,$82,$fc,$02,$fc,$02,$fc,$02,$fc,$02 + db $00,$01,$00,$01,$00,$01,$02,$01,$06,$01,$1e,$01,$3f,$00,$7f,$00 + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$fc,$03,$41,$be,$7f,$80,$7f,$80 + db $fc,$02,$fc,$02,$fc,$02,$7d,$82,$7d,$82,$fd,$02,$fd,$02,$fd,$02 + db $00,$00,$00,$00,$00,$00,$00,$00,$c0,$00,$e0,$00,$f8,$00,$fc,$00 + db $fe,$01,$f8,$06,$f7,$08,$ff,$00,$ff,$00,$7f,$00,$1f,$60,$03,$3c + db $7f,$80,$7f,$80,$7f,$80,$3f,$c0,$bf,$40,$ff,$00,$ff,$00,$ff,$00 + db $fc,$03,$fc,$02,$fd,$02,$fd,$02,$fb,$04,$ff,$00,$ff,$00,$ff,$00 + db $fc,$00,$3e,$c0,$de,$20,$fe,$00,$fe,$00,$f8,$04,$e0,$18,$c0,$30 + db $00,$07,$00,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $fc,$03,$00,$ff,$00,$03,$00,$02,$00,$02,$01,$02,$03,$04,$00,$0c + db $04,$fb,$00,$fe,$00,$18,$00,$08,$00,$c8,$f0,$08,$18,$04,$00,$06 + db $00,$e0,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$08,$00,$08,$00,$08,$00,$18,$00,$18,$08,$19,$0d,$0c,$1e,$1e + db $00,$02,$00,$02,$10,$e2,$00,$13,$00,$03,$02,$9b,$9a,$02,$06,$06 + db $0a,$0e,$f3,$ff,$8f,$ff,$eb,$ff,$ba,$fe,$ba,$fe,$20,$20,$00,$00 + db $00,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $1f,$1f,$1a,$1f,$0a,$0f,$0a,$0f,$0a,$0f,$00,$03,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$03,$03,$04,$07,$04,$07,$04,$07,$0f,$0f + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$f0,$f0,$08,$f8 + db $08,$0f,$10,$1f,$60,$7f,$40,$7f,$41,$7f,$40,$7f,$fe,$ff,$ff,$ff + db $00,$f8,$20,$f8,$50,$f0,$a0,$f0,$40,$c0,$00,$40,$00,$c0,$c0,$c0 + db $7f,$7f,$41,$7f,$40,$7f,$60,$7f,$00,$1f,$10,$1f,$10,$1f,$18,$1f + db $c0,$c0,$c0,$c0,$00,$c0,$00,$e0,$00,$e0,$00,$f0,$00,$f0,$00,$f8 + db $08,$0f,$08,$0f,$08,$0f,$08,$0f,$00,$03,$02,$03,$02,$03,$02,$03 + db $00,$f8,$00,$f8,$04,$fc,$04,$fc,$04,$fc,$04,$fc,$02,$fe,$02,$fe + db $00,$00,$0e,$0e,$01,$1f,$11,$3f,$21,$3f,$51,$7f,$a2,$fe,$82,$fe + db $00,$01,$18,$1f,$30,$3f,$20,$3f,$00,$3f,$00,$3f,$00,$3f,$00,$3f + db $06,$ff,$02,$ff,$02,$ff,$02,$ff,$06,$ff,$fe,$ff,$7e,$ff,$66,$e7 + db $03,$ff,$03,$ff,$03,$ff,$03,$ff,$03,$ff,$02,$ff,$02,$fe,$02,$fe + db $44,$7c,$04,$fc,$08,$f8,$08,$f8,$10,$f0,$f0,$f0,$00,$00,$00,$00 + db $00,$3f,$00,$3f,$00,$1f,$00,$1f,$00,$1f,$00,$1f,$00,$1f,$00,$0f + db $66,$e7,$26,$e7,$26,$e7,$16,$f7,$0e,$ff,$0e,$ff,$0e,$ff,$06,$ff + db $02,$fe,$02,$fe,$06,$fe,$04,$fc,$04,$fc,$04,$fc,$04,$fc,$04,$fc + db $00,$0f,$00,$0f,$00,$0f,$00,$0f,$08,$0f,$07,$0f,$03,$0f,$0f,$0f + db $06,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$ff,$ff,$ff,$ff,$00,$00 + db $04,$fc,$04,$fc,$0c,$fc,$14,$fc,$24,$fc,$38,$f8,$c0,$f8,$10,$28 + db $06,$06,$00,$03,$00,$03,$00,$03,$01,$02,$01,$02,$01,$02,$01,$02 + db $00,$00,$00,$ff,$01,$fe,$7f,$80,$ff,$00,$ff,$00,$ff,$00,$ff,$00 + db $30,$c8,$70,$88,$f0,$08,$f0,$08,$f0,$08,$f8,$04,$f8,$04,$f8,$04 + db $01,$02,$01,$02,$01,$02,$05,$02,$0c,$03,$3e,$01,$7e,$01,$fc,$03 + db $ff,$00,$ff,$00,$fe,$01,$f8,$07,$83,$7c,$ff,$00,$ff,$00,$ff,$00 + db $f8,$04,$fa,$04,$fb,$04,$fb,$04,$fb,$04,$fb,$04,$f9,$06,$f8,$05 + db $00,$00,$00,$00,$80,$00,$c0,$00,$f0,$00,$f8,$00,$f8,$00,$7c,$80 + db $fc,$01,$fa,$05,$f7,$08,$ff,$00,$ff,$00,$7f,$00,$1f,$60,$00,$3f + db $ff,$00,$ff,$00,$3f,$c0,$bf,$40,$ff,$00,$ff,$00,$ff,$00,$fc,$03 + db $fb,$04,$fb,$04,$f7,$08,$ff,$00,$ff,$00,$ff,$00,$84,$7b,$00,$fe + db $bc,$40,$fc,$00,$f8,$00,$f0,$08,$c0,$30,$c0,$30,$00,$e0,$00,$00 + db $00,$ff,$00,$03,$00,$02,$00,$02,$01,$02,$03,$04,$00,$0c,$00,$08 + db $00,$98,$00,$08,$00,$48,$70,$88,$98,$04,$00,$06,$00,$02,$00,$02 + db $00,$08,$00,$08,$00,$08,$00,$0c,$04,$0c,$06,$06,$0f,$0f,$0f,$0f + db $10,$e2,$00,$13,$00,$03,$02,$db,$d9,$01,$03,$03,$05,$07,$79,$ff + db $0d,$0f,$05,$07,$05,$07,$05,$07,$01,$01,$00,$00,$00,$00,$00,$00 + db $47,$ff,$75,$ff,$5d,$ff,$5d,$ff,$50,$f0,$00,$00,$00,$00,$00,$00 + db $80,$80,$80,$80,$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,$3c,$3c + db $01,$01,$02,$03,$04,$07,$0c,$0f,$10,$1f,$10,$1f,$10,$1f,$3f,$3f + db $c2,$fe,$02,$fe,$08,$ff,$0a,$ff,$14,$fe,$28,$f8,$00,$d0,$80,$f0 + db $3f,$3f,$1f,$1f,$10,$1f,$10,$1f,$18,$1f,$00,$07,$04,$07,$04,$07 + db $f0,$f0,$f0,$f0,$70,$f0,$00,$f0,$00,$f8,$00,$f8,$00,$fc,$00,$fc + db $06,$07,$02,$03,$02,$03,$02,$03,$02,$03,$00,$01,$01,$01,$01,$01 + db $00,$fc,$00,$fe,$00,$fe,$00,$fe,$01,$ff,$01,$ff,$01,$ff,$01,$ff + db $00,$00,$00,$00,$03,$07,$00,$0f,$08,$1f,$14,$1f,$29,$3f,$11,$7f + db $00,$00,$00,$00,$00,$00,$80,$80,$80,$80,$80,$80,$00,$00,$00,$00 + db $00,$00,$0c,$0f,$18,$1f,$10,$1f,$00,$1f,$00,$1f,$00,$1f,$00,$0f + db $01,$01,$03,$ff,$01,$ff,$01,$ff,$01,$ff,$03,$ff,$7f,$ff,$1f,$ff + db $01,$ff,$01,$ff,$01,$ff,$01,$ff,$01,$ff,$01,$ff,$80,$ff,$81,$ff + db $42,$7e,$a2,$be,$82,$fe,$84,$fc,$84,$fc,$88,$f8,$b8,$f8,$00,$00 + db $00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$07 + db $19,$f9,$19,$f9,$09,$f9,$09,$f9,$0d,$fd,$07,$ff,$07,$ff,$07,$ff + db $81,$ff,$81,$ff,$81,$ff,$81,$ff,$81,$ff,$01,$ff,$01,$ff,$03,$ff + db $00,$07,$00,$07,$00,$07,$00,$07,$04,$07,$02,$07,$01,$07,$07,$07 + db $03,$ff,$03,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$ff,$ff,$ff,$ff + db $02,$fe,$02,$fe,$02,$fe,$02,$fe,$06,$fe,$0a,$fe,$92,$fe,$fc,$fc + db $03,$03,$01,$01,$00,$03,$00,$03,$00,$03,$01,$02,$01,$02,$01,$02 + db $80,$80,$00,$00,$00,$ff,$00,$ff,$7f,$80,$ff,$00,$ff,$00,$ff,$00 + db $00,$1c,$08,$74,$38,$c4,$f8,$04,$f8,$04,$f8,$04,$f8,$04,$f8,$04 + db $01,$02,$01,$02,$01,$02,$02,$01,$06,$01,$1e,$01,$3f,$00,$7f,$00 + db $f8,$04,$f8,$04,$fc,$02,$7d,$82,$7d,$82,$fd,$02,$fd,$02,$fd,$02 + db $00,$00,$00,$00,$00,$00,$00,$00,$c0,$00,$e8,$00,$fc,$00,$fc,$00 + db $fe,$00,$3e,$c0,$de,$20,$fe,$00,$f8,$04,$f0,$08,$e0,$10,$c0,$30 + db $00,$08,$00,$08,$00,$08,$00,$18,$00,$18,$08,$19,$05,$0c,$0e,$0e + db $00,$02,$00,$02,$10,$e2,$00,$13,$00,$03,$02,$9b,$99,$01,$03,$03 + db $0f,$0f,$0d,$0f,$05,$07,$05,$07,$05,$07,$00,$01,$00,$00,$00,$00 + db $85,$87,$79,$ff,$47,$ff,$75,$ff,$5d,$ff,$5c,$fe,$00,$00,$00,$00 + db $00,$00,$80,$80,$80,$80,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00 .SpriteTilesEnd: ; original export script by gabriel reis, modified by shoofle @@ -25,103 +260,82 @@ TheHangedMan: .KeyArtTiles: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$ff,$00,$ff,$ff,$ff,$21,$33,$33,$ff,$12,$1e,$1e,$ff,$0c - db $0c,$0c,$ff,$0c,$1e,$1e,$ff,$12,$33,$33,$ff,$21,$ff,$ff,$ff,$00 - db $6c,$6c,$ff,$6c,$6c,$6c,$ff,$6c,$6c,$6c,$ff,$6c,$ff,$ff,$ff,$00 - db $00,$00,$ff,$00,$ff,$ff,$ff,$6c,$6c,$6c,$ff,$6c,$6c,$6c,$ff,$6c - db $00,$00,$00,$00,$00,$00,$03,$03,$06,$07,$04,$07,$04,$07,$0d,$0f - db $00,$00,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$1f,$ff,$0f,$ff,$0f,$ff - db $c7,$cf,$dc,$fc,$78,$f8,$70,$70,$60,$60,$60,$60,$60,$60,$67,$67 - db $00,$00,$00,$00,$00,$00,$00,$80,$01,$81,$02,$83,$04,$87,$0a,$cf - db $00,$00,$00,$00,$00,$00,$c0,$c0,$20,$e0,$20,$e0,$20,$e0,$40,$c0 - db $60,$7f,$c0,$ff,$40,$ff,$c0,$ff,$c0,$ff,$c0,$ff,$c0,$ff,$c0,$ff - db $14,$df,$28,$ef,$20,$ff,$21,$ff,$23,$ff,$62,$fe,$7e,$fe,$40,$c0 - db $40,$c0,$80,$80,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$ff,$00,$00,$07,$c7,$3f,$1e,$fe,$78,$f8,$e0,$e0,$00,$00 - db $7c,$7f,$70,$7f,$e1,$ff,$82,$ff,$05,$ff,$0a,$fe,$04,$f4,$fc,$fc - db $00,$01,$00,$1f,$00,$f8,$1f,$e0,$00,$80,$fe,$01,$01,$0f,$ff,$ff - db $00,$80,$7f,$80,$00,$07,$e0,$1c,$1c,$7c,$70,$f0,$c0,$c0,$00,$00 - db $00,$0f,$07,$38,$00,$c0,$ff,$00,$00,$00,$fc,$03,$07,$07,$ff,$1f - db $00,$00,$ff,$00,$00,$01,$fc,$03,$00,$0f,$ec,$1e,$08,$1c,$d8,$38 - db $3c,$3c,$78,$f8,$f0,$f0,$c0,$c0,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$ff,$00,$00,$00,$ff,$00,$00,$01,$fe,$01,$00,$01,$fd,$03 - db $30,$70,$a0,$60,$00,$e0,$00,$c0,$00,$80,$00,$83,$00,$9f,$00,$ff - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$00,$03,$00,$0f,$0f,$f0 - db $00,$00,$00,$00,$00,$00,$00,$01,$e0,$ff,$cf,$f0,$c0,$c0,$fc,$c3 - db $00,$00,$00,$00,$00,$00,$00,$07,$00,$38,$0f,$f0,$00,$00,$ff,$00 - db $10,$18,$c7,$38,$00,$20,$ff,$00,$00,$00,$ff,$00,$00,$00,$ff,$00 - db $03,$03,$ff,$03,$03,$07,$f8,$07,$00,$06,$f8,$06,$00,$06,$f8,$06 - db $00,$06,$f0,$0c,$04,$0c,$f4,$0c,$04,$0c,$f4,$0c,$04,$0c,$f0,$0c - db $00,$0c,$f0,$08,$00,$08,$e0,$18,$00,$18,$e0,$18,$00,$18,$c0,$38 - db $00,$38,$e0,$38,$20,$38,$e0,$38,$20,$30,$a0,$70,$20,$70,$a0,$70 - db $20,$30,$a0,$70,$40,$70,$c0,$70,$40,$70,$c0,$70,$70,$f0,$50,$f0 - db $00,$00,$00,$03,$00,$07,$00,$07,$00,$07,$00,$07,$00,$07,$00,$07 - db $00,$07,$00,$07,$00,$07,$00,$07,$00,$03,$00,$03,$00,$03,$00,$03 - db $00,$03,$00,$03,$00,$03,$00,$03,$02,$03,$02,$03,$03,$03,$01,$01 - db $06,$0e,$04,$3a,$1c,$62,$7c,$82,$fc,$02,$fc,$02,$fc,$02,$fc,$02 - db $fc,$03,$00,$fc,$02,$02,$02,$02,$02,$02,$03,$03,$06,$06,$0c,$0c - db $06,$f9,$08,$0e,$08,$08,$08,$08,$48,$c8,$f8,$f8,$0c,$0c,$06,$06 - db $08,$08,$08,$08,$08,$08,$18,$18,$18,$18,$18,$19,$08,$08,$1e,$1e - db $02,$02,$02,$02,$02,$e2,$03,$13,$03,$03,$93,$9b,$02,$02,$06,$06 - db $1f,$1f,$1f,$1f,$0a,$0f,$0a,$0f,$0c,$0f,$07,$f7,$03,$7f,$ff,$01 - db $0e,$0e,$ff,$ff,$d7,$ff,$57,$ff,$51,$ff,$83,$ff,$81,$ff,$ff,$ff - db $00,$01,$00,$01,$00,$01,$00,$01,$00,$01,$00,$01,$0f,$00,$1f,$00 - db $3f,$00,$7f,$00,$ff,$00,$f0,$0f,$ff,$00,$7f,$00,$1f,$60,$03,$3c - db $00,$07,$00,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$fc,$03,$41,$be,$7f,$80,$7f,$80 - db $7f,$80,$7f,$80,$7f,$80,$3f,$c0,$bf,$40,$ff,$00,$ff,$00,$ff,$00 - db $fc,$02,$fc,$02,$fc,$02,$7d,$82,$7d,$82,$fd,$02,$fd,$02,$fd,$02 - db $fd,$02,$fd,$02,$fd,$02,$fc,$03,$fb,$04,$ff,$00,$ff,$00,$ff,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$e0,$00,$e0,$00,$f8,$00,$fc,$00 - db $fc,$00,$fe,$00,$fe,$00,$1e,$e0,$fe,$00,$f8,$00,$f8,$00,$e0,$10 - db $00,$e0,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$00,$00,$ff,$3f,$c0,$ff,$00,$ff,$00,$ff,$00 - db $01,$ff,$01,$ff,$01,$ff,$01,$ff,$01,$ff,$01,$ff,$f1,$ff,$3e,$3e - db $40,$c0,$40,$c0,$40,$c0,$80,$80,$00,$00,$00,$00,$00,$00,$00,$07 - db $0f,$0f,$07,$07,$07,$07,$06,$07,$06,$07,$01,$01,$01,$01,$01,$01 - db $fc,$fc,$fc,$fc,$e0,$fc,$00,$fc,$00,$fe,$80,$fe,$80,$fe,$80,$fe - db $80,$ff,$c0,$ff,$c0,$ff,$c0,$ff,$c0,$ff,$40,$7f,$40,$7f,$60,$7f - db $c0,$ff,$c0,$ff,$80,$ff,$80,$ff,$80,$ff,$80,$ff,$80,$ff,$00,$ff - db $40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$80,$80,$80,$80,$80,$80 - db $0c,$fc,$04,$fc,$04,$fc,$0c,$fc,$0e,$fe,$07,$ff,$07,$ff,$07,$ff - db $00,$03,$fa,$06,$02,$06,$fc,$06,$04,$0c,$f0,$0c,$00,$0c,$f0,$0c - db $00,$0c,$e0,$1c,$0c,$1c,$e8,$1c,$08,$1c,$e8,$1d,$08,$1f,$ff,$18 - db $70,$70,$b0,$70,$30,$70,$a0,$70,$20,$70,$a0,$70,$20,$70,$a0,$70 - db $20,$70,$a0,$70,$20,$70,$80,$70,$00,$70,$80,$70,$10,$30,$d0,$30 - db $18,$38,$c8,$38,$08,$38,$e8,$18,$08,$18,$e8,$18,$08,$08,$f8,$0c - db $00,$0c,$f0,$0c,$00,$04,$f8,$06,$00,$02,$fc,$02,$00,$03,$fe,$01 - db $01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$80,$00,$c0,$00,$30,$e0,$1c,$00,$06,$fc,$03,$00,$00,$ff,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$ff,$00,$cf,$ff,$00 - db $00,$00,$00,$00,$00,$00,$00,$03,$00,$1e,$0f,$70,$00,$c0,$ff,$00 - db $00,$00,$00,$00,$00,$00,$00,$fc,$00,$1e,$fc,$03,$00,$01,$fe,$01 - db $80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80 - db $00,$80,$00,$c0,$00,$60,$c0,$3e,$00,$07,$fc,$03,$00,$00,$ff,$00 - db $07,$ff,$07,$ff,$01,$ff,$00,$ff,$00,$ff,$7f,$ff,$ff,$ff,$e0,$e0 - db $01,$01,$01,$01,$01,$01,$01,$00,$00,$01,$00,$01,$00,$01,$00,$01 - db $00,$30,$00,$e0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$01,$ff,$00,$00,$00,$ff,$00,$00,$00,$ff,$00,$00,$00,$ff,$00 - db $00,$00,$ff,$00,$00,$00,$ff,$00,$00,$00,$ff,$00,$00,$00,$ff,$00 + db $00,$ff,$00,$00,$22,$9c,$00,$9c,$14,$c9,$00,$c9,$00,$eb,$04,$e3 + db $10,$e3,$00,$eb,$00,$c9,$14,$c9,$00,$9c,$22,$9c,$00,$00,$00,$ff + db $48,$93,$48,$93,$48,$93,$48,$93,$48,$93,$48,$93,$00,$00,$00,$ff + db $00,$ff,$00,$00,$48,$93,$48,$93,$48,$93,$48,$93,$48,$93,$48,$93 + db $c7,$ff,$dc,$fc,$78,$f8,$70,$70,$60,$60,$60,$60,$60,$60,$60,$60 + db $00,$ff,$00,$ff,$00,$ff,$07,$ff,$1e,$fe,$78,$f8,$e0,$e0,$00,$00 + db $00,$01,$00,$1f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$ff,$ff,$ff,$ff + db $00,$ff,$00,$ff,$00,$ff,$3b,$ff,$de,$fe,$70,$f0,$c0,$c0,$00,$00 + db $00,$0f,$00,$3f,$00,$ff,$00,$ff,$00,$ff,$40,$ff,$87,$ff,$1f,$ff + db $0c,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$0c,$fe,$08,$fc,$18,$f8 + db $3c,$fc,$78,$f8,$f0,$f0,$c0,$c0,$00,$00,$00,$00,$00,$00,$00,$00 + db $04,$ff,$04,$ff,$04,$ff,$24,$ff,$24,$ff,$20,$ff,$20,$ff,$21,$ff + db $30,$f0,$20,$e0,$00,$e0,$00,$c0,$00,$80,$00,$80,$00,$80,$00,$80 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$00,$03,$00,$0f,$00,$ff + db $00,$00,$00,$00,$00,$00,$00,$01,$e0,$ff,$c0,$ff,$c0,$ff,$c0,$ff + db $00,$00,$00,$00,$00,$00,$00,$07,$20,$3f,$c0,$ff,$01,$ff,$02,$ff + db $1c,$ff,$14,$ff,$10,$ff,$00,$ff,$00,$ff,$02,$ff,$02,$ff,$04,$ff + db $23,$ff,$23,$ff,$23,$ff,$20,$ff,$20,$fe,$60,$fe,$60,$fe,$60,$fe + db $60,$fe,$60,$fc,$64,$fc,$64,$fc,$64,$fc,$64,$fc,$64,$fc,$60,$fc + db $60,$fc,$60,$f8,$60,$f8,$60,$f8,$40,$f8,$40,$f8,$40,$f8,$40,$f8 + db $00,$f8,$20,$f8,$20,$f8,$20,$f8,$20,$f0,$20,$f0,$20,$f0,$20,$f0 + db $20,$f0,$20,$f0,$40,$f0,$40,$f0,$40,$f0,$40,$f0,$70,$f0,$50,$f0 + db $fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$e3,$fc,$00,$ff,$00,$ff + db $00,$00,$1c,$00,$fc,$00,$ff,$00,$ff,$00,$fe,$01,$00,$ff,$00,$ff + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$07 + db $00,$ff,$02,$fe,$06,$fe,$04,$fe,$04,$fc,$08,$fc,$08,$fc,$04,$fc + db $0c,$fc,$04,$fc,$0c,$fc,$0c,$fc,$0c,$fc,$0b,$ff,$0f,$ff,$1c,$ff + db $70,$f0,$30,$f0,$30,$f0,$20,$f0,$20,$f0,$20,$f0,$20,$f0,$20,$f0 + db $20,$f0,$20,$f0,$20,$f0,$00,$f0,$00,$f0,$00,$f0,$10,$f0,$10,$f0 + db $18,$f8,$08,$f8,$08,$f8,$08,$f8,$08,$f8,$08,$f8,$08,$f8,$08,$fc + db $00,$fc,$02,$fc,$03,$fc,$01,$fe,$01,$fe,$21,$fe,$10,$ff,$10,$ff + db $7f,$80,$3f,$c0,$0f,$f0,$03,$fc,$81,$fe,$80,$ff,$f8,$ff,$60,$ff + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$01,$fe,$ff,$00,$ff,$00,$ff + db $3f,$00,$7f,$00,$ff,$00,$fd,$03,$fe,$1f,$70,$ff,$20,$ff,$00,$ff + db $ff,$00,$ff,$00,$ff,$00,$ff,$fc,$0f,$fe,$03,$ff,$03,$ff,$01,$ff + db $80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $ff,$80,$7f,$c0,$3f,$f0,$0f,$fe,$c1,$ff,$00,$ff,$00,$ff,$00,$ff + db $30,$f0,$60,$e0,$c0,$c0,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$ff,$fc,$ff,$02,$ff,$01,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$00,$3f,$00,$ff + db $ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$80 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$c0,$00,$f0,$00,$fc - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80 + db $08,$ff,$0c,$ff,$0e,$ff,$07,$ff,$03,$ff,$01,$ff,$03,$ff,$00,$ff + db $00,$00,$00,$00,$80,$00,$e0,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00 + db $00,$00,$0f,$00,$3f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00 + db $00,$00,$80,$00,$c0,$00,$e0,$00,$e0,$00,$f0,$00,$f8,$00,$fc,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$07,$00,$1f,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$00,$ff,$00,$ff,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$fe,$00,$ff,$00,$ff,$00 + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$f8,$ff,$fe,$ff,$ff,$ff,$ff,$ff + db $00,$ff,$38,$ff,$06,$ff,$01,$ff,$00,$ff,$00,$ff,$80,$ff,$e0,$ff + db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $fc,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $00,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $00,$ff,$01,$ff,$1e,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$ff,$ff + db $f8,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $00,$ff,$00,$ff,$e0,$ff,$fc,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $00,$ff,$00,$ff,$00,$ff,$e0,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $20,$20,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 .KeyArtTilesEnd: .BackgroundCopy: ; tiles start at 26 - db $56, $1a, $1a, $30, $31, $29, $2a, $65 - db $57, $32, $2b, $27, $21, $61, $1a, $1a - db $33, $2c, $2d, $1f, $28, $4f, $68, $69 - db $2e, $2f, $69, $50, $51, $1a, $1a, $1a - db $34, $1a, $1a, $5c, $52, $22, $23, $1a - db $35, $1a, $39, $20, $24, $25, $26, $1a - db $36, $1a, $3a, $55, $53, $54, $1a, $1a - db $37, $1a, $3b, $63, $4e, $1a, $1a, $1a - db $38, $1a, $64, $4d, $3c, $1a, $1a, $1a - db $58, $1a, $43, $46, $48, $4a, $1a, $1a - db $59, $1a, $44, $47, $49, $4b, $1a, $1a - db $5a, $1a, $45, $3d, $3e, $4c, $1a, $1a - db $5b, $1a, $1a, $3f, $40, $1a, $1a, $1a - db $66, $5d, $5e, $41, $42, $5f, $60, $6a - db $67, $67, $67, $1b, $1e, $67, $67, $62 - db $67, $67, $67, $1c, $1d, $67, $67, $67 + db $34, $1a, $1a, $28, $29, $21, $22, $40 + db $35, $2a, $23, $20, $1f, $3e, $1a, $1a + db $2b, $24, $25, $1a, $55, $33, $42, $44 + db $26, $27, $1a, $1a, $1a, $1a, $1a, $1a + db $2c, $1a, $1a, $1a, $1a, $1a, $1a, $1a + db $2d, $1a, $1a, $1a, $1a, $1a, $1a, $1a + db $2e, $1a, $1a, $1a, $1a, $1a, $1a, $1a + db $2f, $1a, $1a, $1a, $1a, $1a, $1a, $1a + db $30, $1a, $1a, $1a, $1a, $1a, $1a, $1a + db $36, $1a, $1a, $1a, $1a, $1a, $1a, $1a + db $37, $1a, $1a, $1a, $1a, $1a, $1a, $1a + db $38, $1a, $1a, $1a, $1a, $1a, $1a, $1a + db $39, $46, $47, $48, $1a, $49, $4a, $4b + db $45, $3a, $3b, $31, $32, $3c, $3d, $43 + db $4c, $4d, $54, $1b, $1e, $51, $41, $3f + db $4e, $4f, $50, $1c, $1d, $4e, $52, $53 .BackgroundCopyEnd: diff --git a/12thehangedman.aseprite b/12thehangedman.aseprite index bf9d9a5..e8dd955 100644 Binary files a/12thehangedman.aseprite and b/12thehangedman.aseprite differ diff --git a/Async.inc b/Async.inc index 96426d6..d030781 100644 --- a/Async.inc +++ b/Async.inc @@ -18,7 +18,7 @@ def ASYNC_STACK_TOP equ $ffc0 ; second value is the destination of the async call, at ffbc = ffbe-2 = ffc0-2-2 def ASYNC_THREAD_CALL equ ASYNC_STACK_TOP - 2 - 2 -def SAFE_ASYNC_START EQU 148 +def SAFE_ASYNC_START EQU 147 def SAFE_ASYNC_END EQU 153 Async_Spawn_HL: @@ -158,8 +158,7 @@ Async_Spawn: pop af - ei - ret + reti Async_Kill: ld hl, EndOfInstructions diff --git a/CardHelpers.inc b/CardHelpers.inc index 9b2a19f..f568202 100644 --- a/CardHelpers.inc +++ b/CardHelpers.inc @@ -6,6 +6,7 @@ LoadCardData: LoadCardDataAsync: ; first and foremost, clear the card init, update, and draw handles, so there's ; no chance of trying to jump into code from a previous card. + di ld bc, Instructions ld hl, CARD_INIT ld [hl], c @@ -19,6 +20,7 @@ LoadCardDataAsync: ld [hl], c inc hl ld [hl], b + ei ld a, [vSelectedCardIndex] ld [vPreviousCardIndex], a @@ -79,6 +81,34 @@ LoadCardDataAsync: ld c, 8 ; width call CopyTilesToMap + + ld a, [CARD_HELPER_VARS_START + cvCardAddress] + ld l, a + ld a, [CARD_HELPER_VARS_START + cvCardAddress + 1] + ld h, a ; hl now contains the address of the card data. + + ld b, 0 + ld c, Card_Offset_functions ; jump straight to function handles + add hl, bc ; hl now points to the card functions + + di ; make sure we never call card_update and card_draw without them being fully set + nop + ld a, [hl+] + ld [CARD_INIT], a + ld a, [hl+] + ld [CARD_INIT+1], a + ld a, [hl+] + ld [CARD_UPDATE], a + ld a, [hl+] + ld [CARD_UPDATE+1], a + ld a, [hl+] + ld [CARD_DRAW], a + ld a, [hl+] + ld [CARD_DRAW+1], a + ei + + call CardInit + ld a, [CARD_HELPER_VARS_START + cvCardAddress] ld l, a @@ -129,30 +159,6 @@ LoadCardDataAsync: ld de, $8000 ; sprite tiles get loaded into the bottom of vram call CopyRange - ld a, [CARD_HELPER_VARS_START + cvCardAddress] - ld l, a - ld a, [CARD_HELPER_VARS_START + cvCardAddress + 1] - ld h, a ; hl now contains the address of the card data. - - ld b, 0 - ld c, Card_Offset_functions ; jump straight to function handles - add hl, bc ; hl now points to the card functions - - ld a, [hl+] - ld [CARD_INIT], a - ld a, [hl+] - ld [CARD_INIT+1], a - ld a, [hl+] - ld [CARD_UPDATE], a - ld a, [hl+] - ld [CARD_UPDATE+1], a - ld a, [hl+] - ld [CARD_DRAW], a - ld a, [hl+] - ld [CARD_DRAW+1], a - - call CardInit - ret CardInit: @@ -169,15 +175,22 @@ CardInit: ld [rOBP0], a ld [rOBP1], a + call CARD_INIT - 1 ret CardUpdate: + di + nop call CARD_UPDATE - 1 + ei ret CardDraw: + di + nop call CARD_DRAW - 1 + ei ret diff --git a/CopyTilesSafe.inc b/CopyTilesSafe.inc index 6c4f1e2..37bbfb6 100644 --- a/CopyTilesSafe.inc +++ b/CopyTilesSafe.inc @@ -3,6 +3,9 @@ CopyTilesToMapUnsafe: ; 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 a, b + or a, c + ret z push bc .copyTile ld a, [hl] ; load from the tile map into a diff --git a/ScreenCardBrowse.inc b/ScreenCardBrowse.inc index d69495b..9302d76 100644 --- a/ScreenCardBrowse.inc +++ b/ScreenCardBrowse.inc @@ -132,6 +132,8 @@ RefreshCardTask: call DrawDeckMinimap call LoadCardData + di + nop ret DrawDeckMinimap: diff --git a/SpriteTiles.asm b/SpriteTiles.asm index f00267a..284be15 100644 --- a/SpriteTiles.asm +++ b/SpriteTiles.asm @@ -46,7 +46,6 @@ SpriteTiles: db $1f,$1f,$1a,$1f,$0a,$0f,$0a,$0f,$0a,$0f,$00,$03,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$03,$03,$04,$07,$04,$07,$04,$07,$0f,$0f db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80 - db $00,$00,$00,$00,$00,$00,$00,$00,$08,$08,$08,$08,$00,$00,$07,$07 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$f0,$f0,$08,$f8 db $08,$0f,$10,$1f,$60,$7f,$40,$7f,$41,$7f,$40,$7f,$fe,$ff,$ff,$ff db $00,$f8,$20,$f8,$50,$f0,$a0,$f0,$40,$c0,$00,$40,$00,$c0,$c0,$c0 @@ -118,16 +117,16 @@ SpriteTiles: Sprites: - db $00, $2b, $2c, $00, $00 - db $00, $2d, $2e, $00, $00 - db $00, $2f, $30, $00, $00 - db $00, $31, $32, $33, $00 - db $34, $35, $36, $37, $00 - db $38, $39, $3a, $00, $00 - db $3b, $3c, $3d, $00, $00 - db $3e, $3f, $40, $00, $00 - db $41, $42, $43, $44, $00 - db $45, $46, $47, $48, $00 - db $27, $49, $4a, $00, $00 - db $00, $4b, $4c, $2a, $00 - db $00, $4d, $4e, $4f, $00 + db $00, $00, $4f, $00, $00 + db $00, $50, $51, $00, $00 + db $00, $52, $53, $00, $00 + db $00, $54, $55, $56, $57 + db $58, $59, $5a, $5b, $00 + db $5c, $5d, $5e, $00, $00 + db $5f, $60, $61, $00, $00 + db $62, $63, $64, $00, $00 + db $65, $19, $66, $67, $00 + db $1c, $1d, $1e, $68, $00 + db $20, $21, $22, $23, $00 + db $00, $69, $6a, $00, $00 + db $00, $6b, $6c, $6d, $00 diff --git a/source.zip b/source.zip new file mode 100644 index 0000000..a95e156 Binary files /dev/null and b/source.zip differ