From 1a981553a932718582495e61ad1bb5ffa61e9f03 Mon Sep 17 00:00:00 2001 From: shoofle Date: Fri, 12 Dec 2025 14:33:03 -0500 Subject: [PATCH] small art fixes --- Audio.inc | 4 +- CardHelpers.inc | 17 +--- ScreenCardBrowse.inc | 38 ++++---- ScreenCardRead.inc | 19 ++-- ScreenMainMenu.inc | 106 +++++++++++----------- ScreenShuffle.inc | 67 ++++++++++++-- ScreenSpreadSelect.inc | 7 +- card_art/KeyArtTiles.asm | 153 ++++++++++++++++---------------- card_art/PrinterTiles.asm | 25 ++++++ card_art/coins02.aseprite | Bin 1503 -> 1542 bytes card_art/coins03.aseprite | Bin 1603 -> 1644 bytes card_art/coins05.aseprite | Bin 1231 -> 1244 bytes card_art/coins06.aseprite | Bin 1516 -> 1550 bytes card_art/coins07.aseprite | Bin 2235 -> 2279 bytes card_art/coins08.aseprite | Bin 1718 -> 1779 bytes card_art/coins09.aseprite | Bin 1683 -> 1763 bytes card_art/coins10.aseprite | Bin 2400 -> 2415 bytes card_art/cups03.aseprite | Bin 1693 -> 1656 bytes card_art/screendesigns.aseprite | Bin 6249 -> 6247 bytes card_art/swords07.aseprite | Bin 2030 -> 2187 bytes coins02.inc | 18 ++-- coins03.inc | 18 ++-- coins05.inc | 17 ++-- coins06.inc | 20 ++--- coins07.inc | 22 ++--- coins08.inc | 39 ++++---- coins09.inc | 57 ++++++------ coins10.inc | 16 ++-- cups03.inc | 83 +++++++++-------- main.asm | 7 +- source.zip | Bin 872268 -> 874422 bytes swords07.inc | 137 ++++++++++++++-------------- 32 files changed, 466 insertions(+), 404 deletions(-) create mode 100644 card_art/PrinterTiles.asm diff --git a/Audio.inc b/Audio.inc index 2ef9b7c..7ca3d27 100644 --- a/Audio.inc +++ b/Audio.inc @@ -12,12 +12,12 @@ SoundSetup: SoundUpdate: ld a, BANK(AudioEngineUpdate) - ld [rROMB0], a + ;ld [rROMB0], a ;call AudioEngineUpdate ld a, [cvCardBank] - ld [rROMB0], a + ;ld [rROMB0], a ret SECTION "Audio Variables", WRAM0[AUDIO_VARS_START] diff --git a/CardHelpers.inc b/CardHelpers.inc index 4a4279a..5bec74a 100644 --- a/CardHelpers.inc +++ b/CardHelpers.inc @@ -91,8 +91,7 @@ CardPreload: ; maybe we should do a non-async preload task that empties the hand ld [hl], b ld a, [vSelectedCardIndex] - ld [vPreviousCardIndex], a - + ld b, 0 ld c, a ; load bc from a, the number of the card in the cards list ld hl, Cards + 1 ; skip the length prefix @@ -113,20 +112,13 @@ CardPreload: ; maybe we should do a non-async preload task that empties the hand LoadCardData: LoadCardDataAsync: - ld a, [vSelectedCardIndex] - ld b, 0 - ld c, a ; bc from a, the number of the card in the cards list - ld hl, DECK_FLIPS + 1 - add hl, bc - ld a, [hl] - ld [vCurrentCardReversed], a + ld a, [vCurrentCardReversed] cp a, 0 jp z, LoadUpright jp nz, LoadReversed ret ; shouldn't ever get here - LoadUpright: ; card struct starts with a sequence of length-prefixed strings in memory ; so when we're done writing one, hl will be correctly placed to read the next @@ -389,11 +381,6 @@ LoadReversed: ; same as LoadRightSideUp but loads in the reversed data call CopyRangeOfTilesButRotated ret - -ReverseString: - db 10, "(reversed)" -EmptyString: - db 10, " " CardInit: ldh a, [rLCDC] diff --git a/ScreenCardBrowse.inc b/ScreenCardBrowse.inc index fa223f0..f7e308f 100644 --- a/ScreenCardBrowse.inc +++ b/ScreenCardBrowse.inc @@ -1,9 +1,5 @@ -; screen variables shared with screencardread PUSHS UNION "Screen Variables", WRAM0[SCREEN_VARS_START] -ds 32 ; why are we putting this so far in? i don't remember but whatever -vPrintJobState: db ; start, wait til ready, top row, row a, wait, printing, bottom row -vPrintingRow: db -vExposureSetting: db +vPreviousCardIndex: db POPS ScreenCardBrowse: @@ -92,14 +88,9 @@ CardBrowseUpdate: ld hl, rMYBTNP bit 4, [hl] jp z, .doneWithA - ld a, [vSelectedCardIndex] - ld b, 0 - ld c, a - ld hl, DECK_FLIPS+1 - add hl, bc - ld a, [hl] + ld a, [vCurrentCardReversed] xor a, %10000000 - ld [hl], a + ld [vCurrentCardReversed], a jr .attemptCardChange .doneWithA @@ -110,15 +101,11 @@ CardBrowseUpdate: jp z, :+ ; skip the following code if left is not pressed inc a : + ld hl, rMYBTNP bit 1, [hl] jp z, :+ ; skip the following code if right is not pressed dec a : - ld [vSelectedCardIndex], a - ld hl, Cards - call ArrayClampLooping - ld [vSelectedCardIndex], a - ld hl, rMYBTNP bit 2, [hl] ; up jp z, :+ @@ -126,7 +113,7 @@ CardBrowseUpdate: ld b, 0 ld c, a add hl, bc - ld a, [hl] + ld a, [hl] : ld hl, rMYBTNP @@ -144,6 +131,13 @@ CardBrowseUpdate: call ArrayClampLooping ld [vSelectedCardIndex], a + ; if we pressed a directional button, zero out the current card reversed register + ld a, [rMYBTNP] + and a, $0F + jp z, .doneWithButtons + ld hl, vCurrentCardReversed + ld [hl], 0 + .doneWithButtons ld a, [vSelectedCardIndex] @@ -361,10 +355,10 @@ CardBrowse.PrinterTiles: db $00,$00,$00,$00,$52,$52,$52,$52,$52,$52,$52,$52,$db,$db,$00,$00 ; deck minimap legend - db $00,$00,$00,$80,$3e,$be,$1c,$9c,$08,$88,$08,$88,$1c,$9c,$00,$00 - db $00,$00,$10,$90,$10,$90,$10,$90,$10,$90,$38,$b8,$10,$90,$00,$00 - db $00,$00,$1c,$9c,$3e,$be,$3e,$be,$3e,$be,$1c,$9c,$00,$80,$00,$00 - db $00,$00,$18,$98,$18,$98,$18,$98,$10,$90,$10,$90,$10,$90,$00,$00 + db $00,$00,$00,$80,$00,$be,$00,$9c,$00,$88,$00,$88,$00,$9c,$00,$00 + db $00,$00,$00,$88,$00,$88,$00,$88,$00,$88,$00,$9c,$00,$88,$00,$00 + db $00,$00,$00,$9c,$00,$be,$00,$be,$00,$be,$00,$9c,$00,$80,$00,$00 + db $00,$00,$00,$8c,$00,$8c,$00,$8c,$00,$88,$00,$88,$00,$88,$00,$00 CardBrowse.PrinterTilesEnd: ; $22 diff --git a/ScreenCardRead.inc b/ScreenCardRead.inc index b9313a2..f3eaa50 100644 --- a/ScreenCardRead.inc +++ b/ScreenCardRead.inc @@ -1,7 +1,4 @@ -PUSHS UNION "Screen Variables", WRAM0[SCREEN_VARS_START] -ds 16 ; why are we putting this so far in? i don't remember but whatever -vPreviousCardIndex: db -POPS +; also uses variables from ScreenSpreadSelect which always comes before this ScreenCardRead: dw CardReadSetup @@ -32,7 +29,6 @@ CardReadSetup: ret .asyncTask: - ld hl, CardRead.UITilemap ; origin ld de, _SCRN0 ; destination ld b, 18 ; height @@ -210,15 +206,24 @@ ChangedCardTask: ld de, _SCRN0 + 32*6 + 11 call PrintString - ld hl, SHUFFLED_DECK+1 + + ; load the spread index into bc ld a, [vSelectedSpreadCard] ld c, a ld b, 0 + ; get the index of the card by finding the vSelectedSpreadCard'th element in the shuffled deck + ld hl, SHUFFLED_DECK+1 add hl, bc ld a, [hl] ld [vSelectedCardIndex], a - ld [vPreviousCardIndex], a + ld c, a + ld b, 0 + ; find out whether that card should be flipped or not by getting the vSelectedSpreadCard'th element in the flips + ld hl, DECK_FLIPS+1 + add hl, bc + ld a, [hl] + ld [vCurrentCardReversed], a call LoadCardData call CardRead.UpdatePrintUIImmediate diff --git a/ScreenMainMenu.inc b/ScreenMainMenu.inc index b80a47b..8a1c3ea 100644 --- a/ScreenMainMenu.inc +++ b/ScreenMainMenu.inc @@ -1,12 +1,16 @@ PUSHS UNION "Global Variables", WRAM0[GLOBAL_VARS_START] -vCurrentSpread: dw -vSelectedSpreadIndex: db -vSelectedSpreadCard: db +vSelectedSpreadIndex: db ; the index of the spread we have selected? +vCurrentSpread: dw ; the address of the currently selected spread +vSelectedSpreadCard: db ; the position we're on inside the spread + vSelectedCardIndex: db ; the number of the card which is currently selected and being displayed -vCurrentCardReversed: db ; whether the card should be displayed reversed -vFrameCountSquares: db +vCurrentCardReversed: db ; whether the currently displayed card should be displayed reversed + +vFrameCountSquares: db ; the number of which square vCurrentBackgroundTile: dw + vTime: dw + vBlocked: db println "vBlocked is ", vBlocked ; POPS @@ -48,8 +52,7 @@ MainMenuSetup: ld [vSelectedSpreadCard], a ; second starts at 1/3 length which is approximately L/2 - L/4 - L/8 + L/16 ? - ld hl, Coords - ld a, [hl] + ld a, [Coords] ld b, a srl b sub a, b ; L - L/2 @@ -69,8 +72,7 @@ MainMenuSetup: ld [vFrameCount2], a ; third starts at 2/3 length which is approximately L/2 - L/4 + L/8 - L/16 ? - ld hl, Coords - ld a, [hl] + ld a, [Coords] ld b, a srl b sub a, b ; L - L/2 @@ -112,14 +114,14 @@ MainMenuSetup: ld c, 20 call CopyTilesToMap + ;ld hl, StringShuffle + ;ld de, _SCRN0 + 32*11 + 4 + call PrintString ld hl, StringRead ld de, _SCRN0 + 32*11 + 4 call PrintString - ld hl, StringShuffle - ld de, _SCRN0 + 32*13 + 4 - call PrintString ld hl, StringBrowse - ld de, _SCRN0 + 32*15 + 4 + ld de, _SCRN0 + 32*13 + 4 call PrintString ld hl, SquaresTileset8 @@ -127,53 +129,53 @@ MainMenuSetup: ld bc, SquaresTilesetEnd - SquaresTileset8 call CopyRange - def spacing equ $12 + def spacing equ $12 ; how many tiles each card back gets allocated in vram ld hl, CardBackSprites24 ; source def TileStartCardBackSprites24 equ 0 - ld de, $8000 + TileStartCardBackSprites24*$10; destination of copy + ld de, _VRAM + TileStartCardBackSprites24*$10; destination of copy ld bc, CardBackSprites24End - CardBackSprites24 ; length to copy call CopyRange ld hl, CardBackSprites23 def TileStartCardBackSprites23 equ TileStartCardBackSprites24 + spacing - ld de, $8000 + TileStartCardBackSprites23*$10; destination of copy + ld de, _VRAM + TileStartCardBackSprites23*$10; destination of copy ld bc, CardBackSprites23End - CardBackSprites23 call CopyRange ld hl, CardBackSprites22 def TileStartCardBackSprites22 equ TileStartCardBackSprites23 + spacing - ld de, $8000 + TileStartCardBackSprites22*$10; destination of copy + ld de, _VRAM + TileStartCardBackSprites22*$10; destination of copy ld bc, CardBackSprites22End - CardBackSprites22 call CopyRange ld hl, CardBackSprites21 def TileStartCardBackSprites21 equ TileStartCardBackSprites22 + spacing - ld de, $8000 + TileStartCardBackSprites21*$10; destination of copy + ld de, _VRAM + TileStartCardBackSprites21*$10; destination of copy ld bc, CardBackSprites21End - CardBackSprites21 call CopyRange ld hl, CardBackSprites20 def TileStartCardBackSprites20 equ TileStartCardBackSprites21 + spacing - ld de, $8000 + TileStartCardBackSprites20*$10 + ld de, _VRAM + TileStartCardBackSprites20*$10 ld bc, CardBackSprites20End - CardBackSprites20 call CopyRange ld hl, CardBackSprites19 def TileStartCardBackSprites19 equ TileStartCardBackSprites20 + spacing - ld de, $8000 + TileStartCardBackSprites19*$10 + ld de, _VRAM + TileStartCardBackSprites19*$10 ld bc, CardBackSprites19End - CardBackSprites19 call CopyRange ld hl, CardBackSprites18 def TileStartCardBackSprites18 equ TileStartCardBackSprites19 + spacing - ld de, $8000 + TileStartCardBackSprites18*$10 + ld de, _VRAM + TileStartCardBackSprites18*$10 ld bc, CardBackSprites18End - CardBackSprites18 call CopyRange ld hl, CardBackSprites17 def TileStartCardBackSprites17 equ TileStartCardBackSprites18 + spacing - ld de, $8000 + TileStartCardBackSprites17*$10 + ld de, _VRAM + TileStartCardBackSprites17*$10 ld bc, CardBackSprites17End - CardBackSprites17 call CopyRange @@ -220,8 +222,9 @@ MainMenuUpdate: ret .option2 ld a, 0 - ld [vSelectedSpreadIndex], a - ld hl, ScreenSpreadSelect + ld [vSelectedCardIndex], a + ld [vCurrentCardReversed], a + ld hl, ScreenCardBrowse call ChangeScene ret .option3 @@ -287,8 +290,7 @@ MainMenuUpdate: ld a, [hl+] ld [vCurrentBackgroundTile+1], a - ld hl, Coords - inc hl + ld hl, Coords + 1 ld b, 0 ld a, [vFrameCount1] ld c, a @@ -304,8 +306,7 @@ MainMenuUpdate: ld hl, MY_OAM call DrawWholeCard - ld hl, Coords - inc hl + ld hl, Coords + 1 ld b, 0 ld a, [vFrameCount2] ld c, a @@ -321,8 +322,7 @@ MainMenuUpdate: ld hl, MY_OAM + 9*4 call DrawWholeCard - ld hl, Coords - inc hl + ld hl, Coords + 1 ld b, 0 ld a, [vFrameCount3] ld c, a @@ -387,6 +387,8 @@ MainMenuDraw: MainMenuTeardown: ret + +;; TODO: touch up all of this. it's a mess DrawWholeCard: ; hl memory location, b y, c x, e width, d wiggle ld a, e cp a, 32 @@ -697,15 +699,13 @@ DrawTile: ; b: y. c: x. a: part id. hl: location of sprite in OAM jp .skipThisTile .rightSideThreshholds16 + ; draw this tile only if it's horizontally between 54 and 109 ld a, c - ;cp a, 8+16 - ;jp c, .dontSkip ; we don't have to worry about activating it when it's far to - ; the left because it'll never be drawn far to the left cp a, 8+54 - jp c, .skipThisTile ; left edge < 48 => dont draw - cp a, 8-8+109 ; right edge < 120 => do draw - jp c, .dontSkip - jp .skipThisTile + jp c, .skipThisTile ; left edge < 54 => dont draw + cp a, 8-8+109 + jp c, .dontSkip ; right edge < 109 => do draw + jp .skipThisTile ; otherwise dont draw .testFor17 @@ -750,9 +750,9 @@ DrawTile: ; b: y. c: x. a: part id. hl: location of sprite in OAM .middleThreshholds17 ld a, c - cp a, 8+42 ; left edge < 10 => draw - jp c, .dontSkip - cp a, 8+80 ; left edge < 80 => skip + cp a, 8+42 + jp c, .dontSkip ; x > 42 => draw middle tile + cp a, 8+80 jp c, .skipThisTile ;cp a, 8-17 + 100 ; right edge < 100 => draw ;jp c, .dontSkip ; we can comment this one out because wee dont atm need to @@ -763,15 +763,12 @@ DrawTile: ; b: y. c: x. a: part id. hl: location of sprite in OAM .rightSideThreshholds17 ld a, c - cp a, 8+80 ; left edge < 10 => draw - jp c, .dontSkip - cp a, 8+80 ; left edge < 80 => skip - jp c, .skipThisTile - ;cp a, 8-17 + 100 ; right edge < 100 => draw - ;jp c, .dontSkip ; we can comment this one out because wee dont atm need to - ; worry about drawing 17-wides in the middle - cp a, 8-8 + 121 ; right edge < 120 => skip - jp c, .skipThisTile + cp a, 8+48 + jp c, .dontSkip ; x > 47 => draw right tile + cp a, 8+80 + jp c, .skipThisTile ; x > 80 => dont draw right tile + cp a, 8-8 + 121 + jp c, .skipThisTile ; x > 121 => dont draw right tile jp .dontSkip ; right edge edge < 168 => draw @@ -801,13 +798,14 @@ DrawTile: ; b: y. c: x. a: part id. hl: location of sprite in OAM PUSHS "Main Menu Data", ROMX MenuCount: - db 3 + db 2 +;StringShuffle: +; db 7, "Shuffle" StringRead: - db 7, "Shuffle" -StringShuffle: db 11, "Read Spread" StringBrowse: db 11, "Browse Deck" + Coords: ; y, x, spread db 255, $24, $12, $14, $24, $12, $14, $24, $12, $14, $24, $12, $14, $24, $12, $14, $24, $12, $14, $23, $12, $15, $23, $13, $15, $23, $13, $15, $23, $13, $15, $23, $13, $15, $23, $14, $15, $23, $14, $15, $23, $14, $15, $23, $15, $15, $23, $15, $15, $22, $16, $16, $22, $16, $16, $22, $17, $16, $22, $18, $16, $22, $18, $16, $22, $19, $16, $22, $1a, $16, $22, $1a, $16, $22, $1b, $16, $22, $1c, $16, $22, $1d, $16, $22, $1e, $16, $21, $1e, $17, $21, $1f, $17, $21, $20, $17, $21, $21, $17, $21, $22, $17, $21, $23, $17, $21, $24, $17, $21, $25, $17, $21, $27, $17, $21, $28, $17, $21, $29, $17, $21, $2a, $17, $21, $2b, $17, $21, $2c, $17, $21, $2e, $17, $21, $2f, $17, $20, $30, $18, $20, $31, $18, $20, $33, $18, $20, $34, $18, $20, $35, $18, $20, $37, $18, $20, $38, $18, $20, $3a, $18, $20, $3b, $18, $20, $3c, $18, $20, $3e, $18, $20, $3f, $18, $20, $41, $18, $20, $42, $18, $20, $44, $18, $20, $45, $18, $20, $46, $18, $20, $48, $18, $20, $49, $18, $20, $4b, $18, $20, $4c, $18, $20, $4e, $18, $20, $4f, $18, $20, $51, $18, $20, $52, $18, $20, $54, $18, $20, $55, $18, $20, $57, $18, $20, $58, $18, $20, $5a, $18, $20, $5b, $18, $20, $5c, $18, $20, $5e, $18, $20, $5f, $18, $20, $61, $18, $20, $62, $18, $20, $64, $18, $20, $65, $18, $20, $66, $18, $20, $68, $18, $20, $69, $18, $21, $6a, $17, $21, $6c, $17, $21, $6d, $17, $21, $6e, $17, $21, $6f, $17, $21, $71, $17, $21, $72, $17, $21, $73, $17, $21, $74, $17, $21, $75, $17, $21, $76, $17, $21, $77, $17, $21, $78, $17, $21, $7a, $17, $21, $7b, $17, $21, $7b, $17, $22, $7c, $16, $22, $7d, $16, $22, $7e, $16, $22, $7f, $16, $22, $80, $16, $22, $81, $16, $22, $82, $16, $22, $82, $16, $22, $83, $16, $22, $84, $16, $22, $84, $16, $23, $85, $15, $23, $86, $15, $23, $86, $15, $23, $87, $15, $23, $87, $15, $23, $87, $15, $23, $88, $15, $23, $88, $15, $23, $89, $15, $23, $89, $15, $23, $89, $15, $24, $89, $14, $24, $8a, $14, $24, $8a, $14, $24, $8a, $14, $24, $8a, $14, $24, $8a, $14, $24, $8a, $14, $24, $8a, $14, $24, $8a, $14, $24, $8a, $14, $25, $8a, $13, $25, $8a, $13, $25, $89, $13, $25, $89, $13, $25, $89, $13, $25, $89, $13, $25, $88, $13, $25, $88, $13, $25, $87, $13, $25, $87, $13, $25, $86, $13, $26, $86, $12, $26, $85, $12, $26, $85, $12, $26, $84, $12, $26, $83, $12, $26, $83, $12, $26, $82, $12, $26, $81, $12, $26, $81, $12, $26, $80, $12, $26, $7f, $12, $27, $7e, $11, $27, $7d, $11, $27, $7c, $11, $27, $7b, $11, $27, $7a, $11, $27, $79, $11, $27, $78, $11, $27, $77, $11, $27, $76, $11, $27, $75, $11, $27, $74, $11, $27, $73, $11, $27, $71, $11, $27, $70, $11, $27, $6f, $11, $27, $6e, $11, $28, $6c, $10, $28, $6b, $10, $28, $6a, $10, $28, $69, $10, $28, $67, $10, $28, $66, $10, $28, $65, $10, $28, $63, $10, $28, $62, $10, $28, $60, $10, $28, $5f, $10, $28, $5e, $10, $28, $5c, $10, $28, $5b, $10, $28, $59, $10, $28, $58, $10, $28, $56, $10, $28, $55, $10, $28, $53, $10, $28, $52, $10, $28, $50, $10, $28, $4f, $10, $28, $4d, $10, $28, $4c, $10, $28, $4a, $10, $28, $49, $10, $28, $48, $10, $28, $46, $10, $28, $45, $10, $28, $43, $10, $28, $42, $10, $28, $40, $10, $28, $3f, $10, $28, $3d, $10, $28, $3c, $10, $28, $3b, $10, $28, $39, $10, $28, $38, $10, $28, $36, $10, $28, $35, $10, $28, $34, $10, $27, $32, $11, $27, $31, $11, $27, $30, $11, $27, $2f, $11, $27, $2d, $11, $27, $2c, $11, $27, $2b, $11, $27, $2a, $11, $27, $28, $11, $27, $27, $11, $27, $26, $11, $27, $25, $11, $27, $24, $11, $27, $23, $11, $27, $22, $11, $27, $21, $11, $26, $20, $12, $26, $1f, $12, $26, $1e, $12, $26, $1d, $12, $26, $1c, $12, $26, $1c, $12, $26, $1b, $12, $26, $1a, $12, $26, $19, $12, $26, $19, $12, $26, $18, $12, $26, $17, $12, $25, $17, $13, $25, $16, $13, $25, $16, $13, $25, $15, $13, $25, $15, $13, $25, $14, $13, $25, $14, $13, $25, $14, $13, $25, $13, $13, $25, $13, $13, $24, $13, $14, $24, $12, $14, $24, $12, $14, $24, $12, $14, $24, $12, $14 @@ -1059,10 +1057,10 @@ MainUITilemap: db $01, $01, $03, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $04, $01, $01 db $01, $01, $03, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $04, $01, $01 db $01, $01, $03, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $04, $01, $01 - db $01, $01, $03, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $04, $01, $01 - db $01, $01, $03, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $04, $01, $01 db $01, $01, $06, $05, $05, $05, $05, $05, $05, $05, $05, $05, $05, $05, $05, $05, $05, $07, $01, $01 db $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01 + db $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01 + db $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01 MainUITilemapEnd: diff --git a/ScreenShuffle.inc b/ScreenShuffle.inc index fa1b7c4..c930da3 100644 --- a/ScreenShuffle.inc +++ b/ScreenShuffle.inc @@ -1,9 +1,8 @@ PUSHS UNION "Screen Variables", WRAM0[SCREEN_VARS_START] vAnimationFrame: db ;def vAnimationFrame EQU SCREEN_VARS_START -vState: db ;def vState EQU vAnimationFrame+1 -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 +vState: db +vShuffleIndex: db +vShuffleTime: dw vShuffleCount: db def cShuffleMax equ 9 ; the number of times you have to shuffle before you've "fully shuffled" POPS @@ -47,10 +46,27 @@ ShuffleSetup: ld de, MY_OAM ld bc, $100 call CopyRange + + ldh a, [rLCDC] + or a, LCDCF_BGON | LCDCF_OBJON | LCDCF_OBJ16 + ldh [rLCDC], a + + ld a, %11100100 + ldh [rBGP], a + ldh [rOBP0], a + call AdjustBGP + call AdjustOBP0 + ret .asyncTask + + ld hl, CardBackSprites24Copy ; source + ld de, _VRAM + TileStartCardBackSprites24*$10; destination of copy + ld bc, CardBackSprites24CopyEnd - CardBackSprites24Copy ; length to copy + call CopyRange + ld hl, ONES ; origin ld de, _SCRN0 ; destination ld b, 18 ; height @@ -74,7 +90,6 @@ ShuffleSetup: ld c, 1 call CopyTilesToMap - ; draw left arrow ld a, VARIABLE_TILES_START + 18 ld [_SCRN0 + 32*8 + 3], a @@ -104,6 +119,7 @@ ShuffleSetup: ld bc, Shuffle.UITileDataEnd - Shuffle.UITileData call CopyRange + ret ShuffleUpdate: @@ -121,14 +137,19 @@ ShuffleUpdate: ld a, [vShuffleTime] ld [rLFSR], a - ; check for A button press and change scene ld hl, rMYBTNP - bit 5, [hl] - jp z, .doneWithB + bit 4, [hl] ; check for A press + jp z, :+ + ld hl, ScreenSpreadSelect + call ChangeScene + ret + : + bit 5, [hl] ; check for B press + jp z, :+ ld hl, ScreenMainMenu call ChangeScene ret - .doneWithB + : call ShuffleButtonHandler .doneWithButtons @@ -554,6 +575,34 @@ ShuffleAnimationDownOut: db 13, 56, 72, 64, 72, 72, 72, 80, 72, 88, 72, 96, 72, 105, 72, 112, 72, 119, 72, 125, 72, 129, 72, 134, 72, 136, 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, +CardBackSprites24Copy: + db $00,$ff,$7f,$ff,$7f,$ff,$60,$ff,$6f,$ff,$6d,$fa,$6a,$fd,$6d,$fa ; top-left + db $6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa ; middle-left + + db $00,$ff,$ff,$ff,$ff,$ff,$00,$ff,$ff,$ff,$55,$aa,$aa,$55,$55,$aa ; top-middle + db $aa,$55,$55,$aa,$aa,$55,$55,$aa,$aa,$55,$55,$aa,$aa,$55,$55,$aa ; middle-middle + + db $00,$ff,$fe,$ff,$fe,$ff,$06,$ff,$f6,$ff,$56,$bf,$b6,$5f,$56,$bf ; top-right + 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,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa ; middle-left + 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 $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 $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,$6d,$fa,$6a,$fd,$6d,$fa,$6a,$fd,$6d,$fa ; middle-left + 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,$55,$aa,$aa,$55,$55,$aa,$aa,$55,$55,$aa ; middle-middle + 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,$56,$bf,$b6,$5f,$56,$bf,$b6,$5f,$56,$bf ; middle-right + db $b6,$5f,$56,$bf,$b6,$5f,$f6,$ff,$06,$ff,$fe,$ff,$fe,$ff,$00,$ff ; bottom-right +CardBackSprites24CopyEnd: Shuffle.UITileData: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$ff,$3f,$ff,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0,$40,$c0 diff --git a/ScreenSpreadSelect.inc b/ScreenSpreadSelect.inc index b818f04..8e7feb4 100644 --- a/ScreenSpreadSelect.inc +++ b/ScreenSpreadSelect.inc @@ -50,15 +50,14 @@ SpreadSelectUpdate: call ScrollBackgroundTile ld hl, rMYBTNP - bit 5, [hl] + bit 5, [hl] ; check for B jp z, .doneB - ld hl, ScreenMainMenu + ld hl, ScreenShuffle call ChangeScene ret .doneB - bit 4, [hl] + bit 4, [hl] ; check for A jp z, .doneA - ld hl, ScreenCardRead call ChangeScene ret diff --git a/card_art/KeyArtTiles.asm b/card_art/KeyArtTiles.asm index 1c0d57d..9b86080 100644 --- a/card_art/KeyArtTiles.asm +++ b/card_art/KeyArtTiles.asm @@ -4,86 +4,85 @@ KeyArtTiles: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$7f,$00,$fe,$00,$fd,$00,$fb,$00,$e7,$00,$df,$00,$40 - db $00,$00,$00,$7e,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$01 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$00,$40,$00,$c0,$00,$c0 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$18,$00,$1d - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$40,$00,$e0,$00,$f0 - db $00,$00,$00,$00,$00,$0e,$00,$1e,$00,$3e,$00,$6a,$00,$7e,$00,$f8 - db $00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$07,$00,$01,$00,$01 - db $00,$fb,$00,$fb,$00,$fb,$00,$fb,$00,$fb,$00,$fb,$00,$f9,$00,$f4 - db $00,$e0,$00,$e0,$00,$e0,$00,$e0,$00,$c0,$00,$c0,$00,$d0,$00,$dc - db $00,$1f,$00,$1f,$00,$1f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f - db $00,$e0,$00,$e0,$00,$c0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$00,$3f,$3f,$3f,$3f,$1f,$1f,$0f,$0f,$07,$07,$03,$03 - db $00,$fe,$00,$00,$ff,$ff,$ff,$ff,$fe,$fe,$fc,$fc,$f8,$f8,$f0,$f0 - db $00,$00,$00,$00,$00,$00,$00,$01,$00,$01,$00,$01,$00,$03,$00,$03 - db $00,$02,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$06,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$df,$00,$3f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$0f,$00,$8f,$00,$cf,$00,$e1,$00,$fe,$00,$ff,$00,$ff,$00,$ff - db $00,$00,$00,$80,$00,$80,$00,$80,$00,$00,$00,$80,$00,$c0,$00,$c0 - db $01,$01,$00,$00,$00,$00,$00,$01,$00,$01,$00,$01,$00,$01,$00,$01 - db $e0,$e0,$c0,$c0,$00,$00,$00,$e0,$00,$f0,$00,$ff,$00,$ff,$00,$ff - db $00,$07,$00,$1f,$00,$3f,$00,$3f,$00,$7f,$00,$7f,$00,$bf,$00,$bf - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$fc,$00,$fc - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$1f,$00,$00,$00,$00,$00,$00 - db $00,$c0,$00,$c0,$00,$c0,$00,$c0,$00,$80,$00,$00,$00,$00,$00,$00 - db $00,$01,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$03,$03,$01,$01 - db $00,$ff,$00,$07,$00,$00,$00,$00,$c0,$c0,$e0,$e0,$f0,$f0,$e0,$e0 - db $00,$bf,$00,$df,$00,$df,$00,$0f,$00,$0f,$00,$07,$00,$00,$00,$00 - db $00,$ff,$00,$f7,$00,$f7,$00,$f7,$00,$e7,$00,$c7,$00,$07,$00,$00 - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$00 - db $00,$fc,$00,$fc,$00,$fc,$00,$fc,$00,$f8,$00,$f8,$00,$f8,$00,$00 - db $00,$03,$00,$03,$00,$07,$00,$0f,$00,$1f,$00,$3f,$00,$7f,$00,$ff - db $00,$f8,$00,$f8,$00,$f8,$00,$fc,$00,$fe,$00,$fe,$00,$ff,$00,$ff - db $00,$01,$00,$03,$00,$03,$00,$07,$00,$07,$00,$0f,$00,$1f,$00,$1f - db $00,$00,$00,$80,$00,$80,$00,$c0,$00,$c0,$00,$e0,$00,$e0,$00,$f0 - db $00,$1f,$00,$0f,$00,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01 - db $00,$ff,$00,$ff,$00,$ff,$00,$1f,$00,$e1,$00,$fe,$00,$ff,$00,$fe - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7f,$00,$00,$00,$1f - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$f0,$00,$00,$00,$f0 - db $00,$f0,$00,$f0,$00,$f0,$00,$e0,$00,$80,$00,$00,$00,$00,$00,$00 - db $00,$01,$00,$01,$00,$03,$00,$03,$00,$03,$00,$07,$00,$07,$00,$0f - db $00,$fe,$00,$fe,$00,$fe,$00,$fc,$00,$fc,$00,$f8,$00,$f0,$00,$f0 - db $00,$1f,$00,$1f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f - db $00,$f0,$00,$f0,$00,$f0,$00,$f0,$00,$f0,$00,$f0,$00,$e0,$00,$e0 - db $00,$0f,$00,$0f,$00,$0f,$00,$1f,$00,$1f,$00,$1f,$00,$3f,$00,$3f - db $00,$0f,$00,$0f,$00,$1f,$00,$1f,$00,$1f,$00,$1f,$00,$1f,$00,$1f - db $00,$e0,$00,$e0,$00,$e0,$00,$e0,$00,$e0,$00,$e0,$00,$e0,$00,$c0 - db $00,$3f,$00,$3f,$00,$3f,$00,$0f,$00,$30,$00,$3e,$00,$7e,$00,$7e - db $00,$e0,$00,$c0,$00,$c0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$1f,$00,$0f,$00,$0f,$00,$0f,$00,$00,$00,$07,$00,$07,$00,$07 - db $00,$c0,$00,$c0,$00,$c0,$00,$c0,$00,$00,$00,$c0,$00,$c0,$00,$c0 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01 - db $00,$00,$00,$01,$00,$1f,$00,$3f,$00,$3f,$00,$00,$00,$ff,$00,$ff - db $00,$7e,$00,$fe,$00,$fe,$00,$fe,$00,$e0,$00,$0f,$00,$ff,$00,$ff - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$7f,$00,$ff,$00,$ff,$00,$ff - db $00,$07,$00,$07,$00,$07,$00,$07,$00,$f3,$00,$f9,$00,$fc,$00,$fe - db $00,$c0,$00,$e0,$00,$f8,$00,$f8,$00,$fc,$00,$fe,$00,$fe,$00,$1e - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$f8,$00,$ff + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$03,$83 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$ff,$ff,$e0,$e0,$c0,$df + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$e0,$e0,$30,$30,$18,$d8 + db $07,$87,$0f,$8f,$0f,$cf,$0f,$cf,$0f,$cf,$0f,$ef,$0f,$ef,$0f,$ef + db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $00,$1f,$00,$1f,$00,$1f,$00,$1f,$80,$9e,$80,$9c,$80,$98,$80,$90 + db $00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$20,$2f,$20,$2f + db $0f,$ef,$0f,$ef,$0f,$ef,$0f,$ef,$0f,$ef,$07,$e7,$03,$fb,$01,$fd + db $c0,$df,$e0,$ef,$f0,$f7,$f8,$f8,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $00,$fe,$00,$fe,$01,$fd,$03,$7b,$87,$87,$fe,$fe,$fc,$fd,$f8,$f9 + db $80,$80,$80,$80,$80,$80,$80,$80,$00,$00,$01,$e1,$07,$f7,$04,$f4 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$fe,$fe,$07,$07,$07,$77 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80 + db $30,$37,$38,$3b,$3c,$3d,$1e,$1e,$1f,$1f,$0f,$0f,$03,$03,$00,$00 + db $00,$fe,$00,$fe,$00,$f8,$00,$f0,$08,$28,$d8,$d8,$f0,$f0,$00,$00 + db $1f,$1f,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$3c,$3c,$7f,$7f + db $f0,$f1,$00,$01,$00,$01,$00,$01,$00,$01,$02,$02,$03,$03,$83,$83 + db $00,$f0,$00,$f3,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7e,$81,$81 + db $c0,$c0,$c0,$c0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$f0,$f0,$f0,$f0 + db $c3,$c3,$e1,$e1,$f0,$f0,$f8,$f8,$fc,$fc,$fc,$fc,$fe,$fe,$fe,$fe + db $ff,$ff,$ff,$ff,$ff,$ff,$7f,$7f,$3f,$3f,$1f,$1f,$0f,$0f,$07,$07 + db $07,$07,$07,$07,$07,$07,$03,$03,$01,$01,$00,$00,$00,$07,$00,$3f + db $01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $ff,$ff,$00,$00,$00,$0f,$00,$0f,$00,$07,$00,$07,$00,$03,$00,$03 + db $03,$fb,$03,$fb,$03,$fb,$07,$e7,$1f,$df,$3f,$bf,$7f,$7f,$ff,$ff + db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$3f,$3f,$1f,$df,$0f,$ef + db $00,$f8,$00,$f0,$00,$f0,$00,$e0,$00,$e0,$00,$f0,$00,$f0,$00,$f0 + db $00,$f8,$00,$f8,$00,$fc,$00,$fc,$00,$fc,$00,$fc,$00,$fc,$00,$fe + db $00,$fe,$00,$fe,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7f + db $00,$7f,$00,$3f,$00,$3f,$00,$1f,$00,$0f,$00,$0f,$00,$0f,$00,$0f + db $80,$bf,$00,$7f,$00,$7f,$00,$7f,$00,$7f,$00,$7f,$80,$bf,$80,$bf + db $0c,$ec,$06,$f6,$03,$fb,$01,$fd,$01,$fd,$00,$fe,$00,$fe,$00,$fe + db $00,$18,$00,$00,$00,$00,$00,$00,$00,$1c,$00,$1e,$00,$1f,$00,$1f db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80 - db $00,$1f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$c0,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$f0,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$80,$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,$18,$00,$3c,$00,$3c + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$fc,$00,$f8 + db $00,$e0,$00,$c0,$00,$80,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00 + db $f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$e0,$e8,$c0,$cd,$c0,$df,$c0,$df + db $00,$1f,$00,$3f,$00,$7f,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $80,$bf,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$01,$fd,$03,$fb + db $00,$fc,$00,$f0,$00,$80,$40,$40,$60,$60,$e0,$e0,$e0,$e0,$e0,$e0 + db $00,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $07,$e7,$1f,$1f,$ff,$ff,$ff,$ff,$7c,$7c,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$01,$00,$03,$00,$03,$00,$07,$00,$0f,$00,$1f + db $e0,$e0,$c0,$c0,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $07,$f7,$00,$f8,$00,$f8,$00,$f8,$00,$f8,$00,$f8,$00,$f8,$00,$f0 + db $00,$00,$01,$01,$01,$01,$03,$03,$03,$03,$07,$07,$07,$07,$07,$07 + db $ff,$ff,$ff,$ff,$fe,$fe,$fe,$fe,$fc,$fc,$f8,$f8,$f0,$f0,$e0,$e0 + db $80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$03,$03,$03,$03,$01,$01 + db $00,$7f,$00,$7f,$00,$7f,$00,$3f,$80,$bf,$80,$bf,$c0,$df,$e0,$ef + db $f0,$ff,$30,$3f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f + db $00,$e0,$00,$f0,$00,$f0,$00,$f0,$00,$f0,$00,$f0,$00,$f0,$00,$f0 + db $00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$7f + db $00,$f8,$00,$f8,$00,$fc,$00,$fc,$00,$fe,$00,$fe,$00,$fe,$00,$ff + db $00,$00,$00,$0f,$00,$1f,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$fc,$00,$f8,$00,$e0 + db $00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$f8,$00,$f0,$00,$c0,$00,$00 + db $00,$c0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$fe,$00,$f8,$00,$e0,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 KeyArt: + db $3f, $40, $1a, $1a, $1a, $1a, $1a, $1a + db $35, $1a, $1a, $1a, $1a, $1a, $1a, $1a + db $36, $1a, $1a, $1a, $3e, $1a, $1a, $1a + db $37, $1b, $1c, $1d, $3b, $3c, $1a, $1a + db $38, $1e, $39, $3a, $20, $3d, $1a, $1a + db $21, $22, $23, $24, $25, $26, $27, $1a + db $28, $29, $2a, $2b, $2c, $33, $2d, $47 + db $1a, $4a, $1f, $2e, $2f, $1f, $41, $42 + db $1a, $30, $34, $4b, $31, $32, $43, $44 + db $4d, $4e, $49, $4c, $1a, $45, $46, $48 + db $1a, $4f, $50, $1a, $1a, $1a, $1a, $1a + db $1a, $51, $52, $1a, $1a, $1a, $1a, $1a + db $53, $54, $55, $1a, $1a, $1a, $1a, $1a + db $54, $56, $57, $1a, $1a, $1a, $1a, $1a + db $58, $1a, $1a, $1a, $1a, $1a, $1a, $1a db $1a, $1a, $1a, $1a, $1a, $1a, $1a, $1a - db $1a, $1a, $1a, $1a, $1a, $1a, $1a, $1a - db $1a, $1a, $1a, $1b, $1c, $1d, $1e, $1f - db $1a, $20, $1a, $21, $22, $23, $24, $25 - db $26, $27, $28, $29, $2a, $2b, $2c, $2d - db $2e, $2f, $30, $31, $31, $32, $33, $34 - db $35, $36, $37, $38, $39, $3a, $1a, $1a - db $1a, $1a, $1a, $3b, $31, $3c, $1a, $1a - db $1a, $1a, $3d, $31, $31, $31, $3e, $1a - db $1a, $1a, $3f, $40, $41, $42, $43, $1a - db $1a, $1a, $44, $45, $46, $47, $1a, $1a - db $1a, $1a, $48, $47, $49, $4a, $1a, $1a - db $1a, $1a, $4b, $4c, $4d, $4e, $1a, $1a - db $4f, $50, $51, $52, $53, $54, $55, $56 - db $57, $31, $31, $31, $31, $58, $31, $59 - db $31, $31, $31, $31, $31, $31, $31, $31 diff --git a/card_art/PrinterTiles.asm b/card_art/PrinterTiles.asm new file mode 100644 index 0000000..74489c0 --- /dev/null +++ b/card_art/PrinterTiles.asm @@ -0,0 +1,25 @@ + ; original export script by gabriel reis, modified by shoofle + + +PrinterTiles: + + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$1c,$00,$0e,$38,$3f,$64,$7f,$7f,$7f,$7f,$40,$7f,$40,$3f,$3f + db $00,$00,$00,$00,$00,$00,$06,$b6,$ff,$ff,$ff,$11,$ff,$11,$fe,$fe + db $00,$00,$00,$80,$0e,$8e,$12,$9e,$24,$bc,$38,$b8,$00,$80,$00,$00 + db $00,$00,$00,$00,$5a,$5a,$92,$92,$5a,$5a,$52,$52,$9b,$9b,$00,$00 + db $00,$00,$18,$98,$18,$98,$18,$98,$18,$98,$00,$80,$18,$98,$00,$00 + db $00,$00,$00,$00,$d8,$d8,$94,$94,$d8,$d8,$94,$94,$d2,$d2,$00,$00 + db $00,$00,$00,$80,$19,$99,$15,$95,$19,$99,$11,$91,$11,$91,$00,$00 + db $00,$00,$00,$00,$92,$92,$5a,$5a,$96,$96,$52,$52,$52,$52,$00,$00 + db $00,$00,$00,$80,$1d,$9d,$11,$91,$19,$99,$11,$91,$11,$91,$00,$00 + db $00,$00,$00,$00,$52,$52,$52,$52,$52,$52,$52,$52,$db,$db,$00,$00 + db $00,$00,$00,$80,$00,$be,$00,$9c,$00,$88,$00,$88,$00,$9c,$00,$00 + db $00,$00,$00,$88,$00,$88,$00,$88,$00,$88,$00,$9c,$00,$88,$00,$00 + db $00,$00,$00,$9c,$00,$be,$00,$be,$00,$be,$00,$9c,$00,$80,$00,$00 + db $00,$00,$00,$8c,$00,$8c,$00,$8c,$00,$88,$00,$88,$00,$88,$00,$00 + + + +PrinterUI(Browse): + db $0b, $0c, $0d, $0e diff --git a/card_art/coins02.aseprite b/card_art/coins02.aseprite index ef4e3a660dc39c674587fcc50c088190a3bf5dc9..0184bbe772a627270c36547da9200c04d990adac 100644 GIT binary patch delta 428 zcmV;d0aO0p3x*5=1_qG=egTG&fja@Yk-aj1f&l;kc$~FW2@=B~2xRd8e{NbAco zl$mx7ku$Oq{Y4nS?(r6rp<1q)u5D&kWW?Y_Q#J0k-#=#YlO^nx-9GkY?=M`4EGgdM zj)a);YsFf#nCd6`=71e!kuXeYEERlXF)4E&1FY;lWC&m}h+RH^=+e<@kRxXjoid8VVc% zEG*i?(k2Ld+13vZPEJdqE%SKZqSv)K)fMxYq5=*rI3_x=KCJl@ROwpzyy)_%j8$SuVl z?wE;bcgxo5O;jKJ?l`{Lx+v-Vib86D3NQP()`_tG44!$*I?D!%K5tR%#uf38C@2Ac z1s7s{KqOFz6SV80^4#nVb+qw-wR4vHEOBm+@S{qum@&@yV(kB&j{lMa(!;gWgnR_t z8Nmsf_4VM;$w3!dDv#E!GHp9=ATW^?T2|Daztm%?zq82AYUTK6dpdq(OCn?T#kY7& z;W#A8S>pT_<-5cm9vWNR(4Tpjk9ikiD>;$Lq`Bcw%4|}7jzwzQa(bRi_mQ#00LrNq zmhLR;wWt8YdmJbDBh6AN4DSttsx{P3x`rC^wPb~wf0<@SIkxGv6aVDP0mIg-+XU1d iRWi4QHP)F;H9Q@Z5Al5pkF&7?90HTi0z9+L1UUir!o!RJ diff --git a/card_art/coins03.aseprite b/card_art/coins03.aseprite index 63eca5c9a548669f6187e2904120e67273fbafb6..b579eba9eb026da9b91788b7fee537a75b0b7c92 100644 GIT binary patch delta 478 zcmV<40U`dw4D1X6Y>@$f0ql{1I|1yGy)u8b0RRAaoV`^EjsqbKv*7=KUd@op0fwW} zMwN_Oa@ipTezWo~*75+gK2Ym}FVwYXEAqVzG$%1^_>U`j;vKavmr;lKme`7uwko9H z1dui$U?=^hqQ(G*?n(zhSa~Dqr=6b*QED%QPK^jXv|yqRly}GYy)&43Dcj^K4UT`( zj}%wr8{^mbRz0O@X3d+Em~t+8=1m3!hl7U!_axERVz%C2IU1AIwt`TKvdTD;SK&W#5_ohxo{ZtRZszXH#{WgU&H_utR+ zzHEt!;q`PY^XLdI#-s_vvmWEd_Uq=oRp>C>FI(dj`0mq(6kQ+b59ChAcEzYPN`17I zVE?-CVPP}u95loe3QJrj-#6LJLSAPI+qZ8v@S~U9_wm1oaaKBq9{Bxmk3U) zc{tmBJx=m$TYi`6L6KhDAwP`cP2b;%t&^^td-tzBn0X67-5}R-z;i4-uEMJjxA+Hv UA`}p_u>wv4lg|P&v;PD{0p|JeX#fBK delta 432 zcmV;h0Z;zy48sfoLy-Z00mG4jI|0Lyy)u7{0RRAaoV`_94uvoXB=r7we$lp+RcL*Y zpE1fhECRd}{6u;jfYvT(?ZO*cZrPK(l>xdDle0`Ne_N#wWoRzmDfZ+>S&DA5f}m)E(g4&N5#mr>TO8xBh^AR@!Hf^Nd0*nxp`538YQ0x_0L4bxL50+!feTD zgb<_7^ZCv?_@5hSuJDFswb6=5#)aEv(b>#5Zs1LFk8j5+*;6~`#KXWjSF*fVq&f8e z3at1gF*IiTZ|Aw*HpPUiuCz3d3t@jIL#<)N%YOKU)$^8j3&n$bUrOV|__pC$2vdjp zft>ZRs}Pk$=^E`x@Oq8%A(5#6VgTa)<|z4J@q)Ovk6uoCPi5RnpON|Y&IK}SzptdR zct#P4H$}`PFr#c9_HLiWAWm8IUaEx>{VKbB5a}=6za7bgX2#b1=?-e%*ryW{lzD9M a%oFFQ@W{m}{s1^>6;89z0$2jF1#AHv4%?3a diff --git a/card_art/coins05.aseprite b/card_art/coins05.aseprite index 9290a3e4e36a190c48a90ced08d70d0f74f6c998..9de58c21b4e712edb3f5fd9ecd9e294775da608b 100644 GIT binary patch delta 350 zcmV-k0ipiS3ET+*+>rr)0bG%RI{|Hxy)u6`0RRAaoW)gJ4#OY}L-PIaJZ;Ux4x~`2 z()gIyQW85a#`x31cg=4Vafoy)eyd!7_}v+#JwFxCU+@-ilEv% z#|_V-r%jMk&jyx&Ql=wbATp-Ls@N^b>{#-uG&VHv_`laCI`dV3$)7`KX^qoso5hJ9 zJ;4~N@hEft;C}1xANS;*Gsi=*3mH81QmL7_h`7Hw0215jH2URr=h=YUOxhCTb&=mW wAdOlQYw3rNG#v)-%dK2SiQMq@rroG$d3*p!qzl)xFamr5lQ04lv#bLn0W*B2!vFvP delta 337 zcmV-X0j~bs3C{@u&yfLt0Z);EI{{#ky)u6(0RRAaoW)hy4#O}AL*oDcdFn#ITsfvn z<6&->#4%@y{$%`E{?{WPA{^8e)@u-T3&Y{e*J0(x;QC&m4}!hvhDpI5k(&mNMfv6F z64H#58d>$3lV7G^wuvIp0jxfLE8E5^#}9mUc*=04r_U?I%<`bQB?~C~NE0TLVG)0# z{<@`_zBuXq+-=AEVv<~i1owUYu*2}`+Tqq3!HbCzTLMaawgXvmO9!9`BHuY~bOwLg z1WoDIz%HP>xe#~Z=2CAXVR~)b&!RhFnD0-%1~QBb_hi-eh{(w`X#iY@rT2x6CTteDt%bcKz@bs)%r1 jhoX7`-w7;+_@({P=mRJH3-Ys30%!q~ZvrT@xdS5s;V7th diff --git a/card_art/coins06.aseprite b/card_art/coins06.aseprite index 6d69f8b92eec9ddb22ca6dab357ceee9111329b7..df8c7c59ae777255aa24d7b713c7910307c9d8f9 100644 GIT binary patch delta 455 zcmV;&0XY8b3yur|4hE3|egTe=fja@zk-aj1odEytN$#2A&()S1azuy#rJ)jRpVCj zG$07{;CG9!Q$E@GrdcuOeL+YL{7Z*tD1TNtAFZR{_lY0vcF(bqeta!agcz~`ImV`c z;w|*#s4a3YT?JW__7#CXcxMF7(Vv}Rbj)o5{P_X-cW7CH0nXdR3wrGmK{4={{wT$b zy@-3FX0H@qRRW(Ze%}@ikp@b26SblfzJDs zdf&3EOK2!YQfr>`Ta5+2TpGZ^`GNC@HzPXlpPjhN#)BO?tUtd88=#;cx6-8~YAQRG x+nucr-W~*9-`q~dh8Oyg`7!7R{b~X#zB2g$I%p0Mv!DVT0+XNuGPAq{Fafqo+;ji{ delta 412 zcmV;N0b~A-4D1U6>;;hmegSNefja@Rk-aj1djS9dc$~FXixL7M2xRd8|G6?mSnw2^ zn3}aaf#qcq{Y6-S1z3OuSb&3KQ4;-&;eROIpt?!6whXaqs=F5AZYo<{WVCg1O6j1*;*4Y`=ZG)~J$i5tZVsUizX!p55851xf_fO+KYm;ozef=h3?JyE- zvtPdG?~yB_;C4Ln>LjD!6H=h5DbXg@zIahHt; zJG6QKyw40kK_5ryP&J>!h05t<4+pmgLDyHeldK*d)kFNU!K4%xGi G0)7MJAI#_g diff --git a/card_art/coins07.aseprite b/card_art/coins07.aseprite index a8b27094b318d77e804247689422e1068ed4c2e7..0f8b69b740c723fc80a647d0dfb78bdafbc0a49c 100644 GIT binary patch delta 810 zcmV+_1J(Sy5$6#B=aB(_0cVkcI{`V7y)u6S0{{ScoW)lMj>IqsMEL)IKCMj|T9Pf& zS-QgwgJ%F|iT#()i!dXiiMRxYC&TZ^~H}`&Ze*Qo|$*0>j6TRp9H3;Q?B<`Wq1n`JcJ9I*X&m0GGB26g=wzENYKnQ!q>r#E&`WjHch2ysH2h4m7& z_CNdEW0v)^5lNINAW zcBtEu{CcOQJLp^IA(C>4$l^D}HwV8qqjH|TC+fQIk{83m$->A2!#eA1(g%N{y-dP$ z1}*N6@}Ad=P-*QpV6{{a{)}xpEBN8%*FVe;J)0M-t3t@qGRyL^hw;+>e*f*&KC9$u zzew}k$GR?j!*dXU8gdUH@(NFlgfPZocrw0eEzkydS8huveqtrlkHK!BP*kJevQZ68B~+j zQ1@@^a7?-;>*9L-{mTA<1YbW;8QCkN%nN~5lGB$JjDfE}Wgzvu;>Ul|snI87L`tMD zia_{(zbE5;GYvH#5X-T?+_j9S;hN>hP&%*pJNhsCg)rWn)`4iwadmP2!Te;O&VIYS zjgQXbwAFVe;+kLX?&G0uGr{UXom%!%-ZNMsR<< zE-`MeukxJQhwWW?siNQmR;FQ5-ULoj&E*6%U z--l#bzVCrZqNspKcr+`@u)71<@q=hdm-47KZ=!J4?kGJ>OrH5UVt5i)P($e;e4uVf zitC-0_Mm5-OC;qGk?A+-n?qa|qvFrb6Aj%*$%)a+X=-!5OnAjts~e{{Cvd z9LlpX1X2T&PXs)(g9l^*V7-G) diff --git a/card_art/coins08.aseprite b/card_art/coins08.aseprite index ac07b1be68d2b442940d9febfd670d4d69166f7f..b0bb6889831c2b0d18ce31cf7d40eb53b39be2ed 100644 GIT binary patch delta 736 zcmV<60w4Xh4f72F^N|664RZzn0Q&Jv0Av6F08EjMFAqKf001K(000001^@s6M3KuR ze+L2p0C=3OR|}TIAP8jP{&(I!BQPNT()xCbNd#sFr76*G2PgYnFt?9pNiC^8ipLNN zeEAoH9G%{oE}cvWC)EB}XV2}9nMoR(j}=LxfEv<=&N$lU-Xd&2eFp+A_c!Mt zemrLTY%*ZqpZG)SSjD)($XF8nQy#Y=YPstUHAf5@y8 z?UIq!PRw$3`5mKQE&d$?g`6a^>QZ&Na2Rxee6D}*4%QBM(q}xR*}t{A+Ywub!HBzZ zXYcZLPv{=55%m95!u5!vP|&^Bf8GBr-W{#os=BVnhp+;AKB||3?fcIV#Dc}pnn4rA zE76-nenr%uXq0Cu!K)4F6yg%Tf1f3MH=>A5#PDADk9wTDzw#RLMg51DRvA?CGCF=M zT9{~w`Wkc6g52Uxw!XZG2gM`9)Pa*fgvH5!W8VS`?sNSU5d*8D!$GnFIMqWg&OAq?wM*J3>LMcvj+r^K2>R589;$fcxn- z{lSobW@`{hv+x3d0+a9pGLvuxeF4go?gcx4L@^9S(T=;jySuyp|3A$hxDTb11{Q^! z(xgMBR0A%!)qge7LLFY=P8%K6;Da9lE$^a-AVLTuqP;UhA5p{*M*>MFA0UM^GRVS% z9P-+n0*WZ1j0&p8t{;ps5&rqBDQ1{k@&%Sy3E2f#tg*q?$Zxn~hdmBP{=g9@%j~BQ SbDk}^S#P2D5_(^#>4YmydwvhpU4K@Y<0Q&Ju0Av6F085dLFAod?001K(000001^@s6Ly^lQ zf7Jm10C=3OSAmv;FbL!5|NrxLDi9E8>+IW(>IzK)Vvp$E!NHyv%*UU@l2{VE6ptYk z`0^Wr44vF5mlhMk2^}An*?IfI%rp)*Upqz+1=JYVkO@<6XZpzsSt>qab9#si)D|Kq z8A;GMiJX9kJt`2*y}xZTvNk#tXJ`6$Ou;$Sf1-lAhK~f6R1s z`i_xTi@jqYk;O)uUCJ&Shno(tpXq;f2W?V&|u27w7)ST#hcj_%Nxlq{y!Yq4RqLu*}LQb zP^>K02ZCP_6|+DCYyy*T1-SvqlPU%~e?u`4MbXsVU2omp-Twchx(oLqq>}@Sz?_gF zBc+rB54`F>Ews^uU%1mj7YzguL`ds<=p&2>qKIklj4?nQ2_%t1+U~4PyoX0Q&Jv0Av6F08EjMFAp&S001K(000001^@s6M3KuR zfBFFc0C=3eR#~zGAqb@4{&!9?3N#2hSt@>{ohMs2Xg#8TF6Qz3Lgs--m&=Ts^>zgb zKXPZ}f#C{%UE#l7rlyLbwP}ftZ}AVj5^oOp4_*a+)W3is(PuoU)VkwSo#{jA_8#ae=f3jr(bsQ*rkFySYojN-@>Bdnxo<|;==NSh{ zz-Ez8jZGWS%byUf@4RxaEb!W(qdwir^8>oH{C{wNkPnfFOc1_)U*9`UA`@OqQ4l*{ z*(`!h)?GXCJiInnUY^xHH`CFu)TO`G#dyZ*K`$G+k(nmnh?A*;L`2QZ&^JS0e{_=+ zO|{(WIiqB8Nk6X`ZsMIabBemE&QmY_MjeCxo9FU?t*(f3POeQD4pN>(L4-WA_UV7k zqNb^Z8-M}A=*#FFwk~%e`_XE$7^adJ3UL(Z)|xZ0#@l#+al>D%4`lZ^{%26tAJQ*D zhg-f)k~{6zc-9(OWXhB!E)8L}e@Bh6Qj*AWiEMXzGnuhFn%||_e2T*cIyChxQ}{?IBg4tHG^aaaao4 zJ%L1`l@5a*G_*;oF?#2Tzd}{AU06~OQ z3nL;es#*+jX@3dTld?}Cjg0D9~X*mC!DQ6F1X@`J05si{e=oQKF0n002T5H5s&#( Ag8%>k delta 647 zcmV;20(kx74U-K4laT>`4HE_c0Q&Ju0Av6F085dLFAwYi001K(000001^@s6Ly^lQ zf3*Ps0C=3eRNEHAAPD2&|NryWR**|j+wP2q#Z81H=!pIq%-83E%oi??oM~LdZ3Y1! z9cQbS**^s z&4|9sB)-+p#o3oT+wY=xR)oIPuNquW&))c@m+tCJov%kV2Y3T9Ew+-j{fwapf5{Y; z$&M`VtN0wy`Y8F)&zo5Kn(7W~CLuA;pgD=}|qKS)26CBCvz~%)QnA zLL-sE#7pnYXwg4VLD%sS9%g6iJP@{RVJa2(CJ}r$jwSQ9K%74Owb%f@4~nhIUQalH z`-A-6Ds#u*J5gx^ul^~2)v?jrbzJHB01V6+F|z>!o&u8}0}7L$1$_a=lN|;BGXJ}>|P diff --git a/card_art/coins10.aseprite b/card_art/coins10.aseprite index ff746fdfbb337e8c2bc37fc510928358d3a80712..4878cc78b59cd3ba17652030d50329324c16579b 100644 GIT binary patch delta 828 zcmV-C1H=5_67LcLZ;=6i0q>E4I{`*C~H9^diRXaW5~>OP5FNLozwOE`H8rD{5*yIS--ua0IX-Pp_w8g7)&!H+1I>g z0nVq))s-h`r_Kcz>I$_b26+$8fk|m;_97*K8^2q3FuLGhnzq>ck?aY`Mgl=f^ND{? z%X|XsmGfENQ>0WvFqMDTboe^S{EHv`UA`KBI)9gbFXZmd?erhT2@;hN0(Xs63F6w{ znNX(;24mDaZ+uVUXFY<(ZNk?dR)4-ahebkNQtft1|G1lVaAp^zOJ*G@19$Msg?6)#WrN?rOWxLO&W~A%7kK*%786=O+k>GIg z#8lxT8eEE=(qpk#`Z&_kj`((J-YBP2AW2t45a$|R!~@+gYC}DxO3{qOw!e)G?=joo z`JqeB;L!XgUP0tTE^9n6w84LTd)0y6UWvknA;ouHUblAb(bdP$0akU2n>Tvu_@b_q zsFDseA-smxJgM8oe^oZBCzMJ;iByO9Evzxvx~K*&i!*0zXU~LfB1C>5gMMc~M&N2eVACDz}6N56-4b|_3s{K*79c8m`hv>XtaM;EE^3bc(Kk9s?(L(nx+LI`&hkLG-8&pun_;9`4_oaGY zIqm{X1gG^*fcu@A7|q8jE!a#e+;t(*zd~r%GoBG?4%k_q4$s@R_I&z8SnG}v z;TcP(y?>a@?!2mjb+j51MS-WMafl`Wi5|u=zdzUi4&RFT1Mf^3WwS5@zyp&o1U$3w G2XF!Zv!D9_ delta 813 zcmV+|1JeBO65tX6V37fT0pO8=I{`S6y)u6R0{{ScoW)n$mZUHU zx#l(taNcE9S4=QYy%t=!E8LbC>^;~AA*H36MJfO{yjwb$UEr54TkLtHcmlGCK#+gZ z^`xg|Jwf%V`E2hgikaa!HW;68>(%h-_%3-b?C$pM{2%2B3YC$_XVCXdogl9H&Vo8s zFa)FQeDFQVpUnswcL-lTtbD#chh;*kDdo&YleOuLn87s3@)-=Pg^7-uWXAYg9>8ee zOCzDKe@=?|DSr%z_Elp9uOF!+)J%UuB!OY5;ifYBUX75nnJJ=c0&@xo=19vw1XjqN zA1AA-@Q!FubAx^(xg`b?IoA(R&xQ&CIzSsDCCfXn?16Zs>bdwz^@jct+5Fx=lsz?w zbv4mgzq4ug9#(?TPxdDgwpKtdYRFsi!XYb`?`!mY)(vk;1F6j)8^TtsjDUZn!)h8V zo?~r39&(}>r^i&uq(jU6PW{#8U)H zdzFtPE#ruHr{RruItNm84FqxS;YB`>e$gAslqyFv65I1_W_XV|{*H$(xq`#+n{)-4 z54EiEAkYTOkJ8;&EIhxCYma~a`!l8vuX3S8Ny0gl!?jeh`DcXTV0#f!8BS$g$SXRF_G5HLeuXmki}{ zkn$zg?|(!J&&_eDVsEV;A^ASg;0bE-$niS2-w!1T`#oi!nGG3kQR9D)zHKX8d^<$) z{(-}8_LqZR?f%i{E031CfAOA7SwGy@+PT36WsC>c%l%xcpNpC-yf)k2fSKU5-WhP- zX^7Fht@47yw8GsK68|fNVLjuSkmiJ))#-4*J=X3|uLv96F(W)0$0C=3uR@rg{Aqb@K|Nl9ek(NVT#Z)EXVcXILIeI{%Kas{A+OdKPH2IN&{#ZS~ z-qs4`BXvY<$io>nhpV_Uq>k^7s*0boXtF?XyZGUQ zM>r`}GwBk5eI8X^pvlp@4YNpUfj<(Fe~`(zcO$AOw!~<^i9pA3HJJ_j-K6;=t@%Tf zUI!ZW$U-Z4J{6XfiyPE$5MQz9CT~Rv;tWx1(ee_TN0)+Wfe1aeh?6K`Mvmq>?ojLO z>tk}2o)^T_(3*FBgCdfm>jxgCU-T=`EpMA9JRSD5FFC#&jIJ+x;?#8c6l33-e{jcR z#pwo}Z=Vod{L~@*zo~~W%do%>jyxuAD;ZY8NeNthHxe7nFG$LythOJ-SD9>b?&69) zB|#Y`?;Wi3I@TdC@J=HC4&#sS2+isUYy^lnQ!J)y62|CVJXNaG(fbqnC0pj`yNSrm zue$%^J+pj7E-*0{=1rJGNfB15x%g`qWChuJq5)BR)kd+!` zT|{@K%SI^h<9yCJ4mnf&ujE7DJ;FH?TX;yRr1;=K9ybukSSdA8`e}tUZ`y%<6xch6 zAPNHmIKJLR3_bLbz|hx|NFj|3Ok|Oho<{)|iYTFhGFEbDi#RH%%Gt$KdJRqNP=}2f u<~ZPp4fb+>fhE?mpK$*Dn(th2)wCP#5_o93*PeK3`a9&^f93<85eMP9c{(%z delta 667 zcmV;M0%ZO844n-Dosj{54IKsm0Q&Jt0Av6F07{XKFAx0z001K(000001^@s6LXpcP zf5rg-0C=3mS6hf5s##pe+GItLgSFhHKnRu&43%sjMMmm<+zoJP^SUa zrxBNa!#RK6nP2y3kKzw9ks5UtHJi1swr(=vxoHH$^6(%vIICHiSi{~sV z>S{$;77;x9V}vb{~r6xDG`Q~g}nbo)FxOZr1PzL@-QWME`WNORESv3t4>FvP$w?`7QRXZ>x?h%# z`RJHe@WGD&cGzqE8bNHZMHmOIk06Q|;z%Hgl=Nw2U?GbfI>_TKcM1rhh?1PIxJh3| z7Zp@d!yOOQ(LhuC(-SXzWNx9Y%sInG&!y{QfFVW_F8vr2Obu_(F!$K~FJIWm2xsPP BI8p!r diff --git a/card_art/screendesigns.aseprite b/card_art/screendesigns.aseprite index 28666f80ce796cd0efb6f702e9c2882df39d2664..b5b0034fc92ca4837c94719181d944e14303ce68 100644 GIT binary patch delta 203 zcmV;+05t#UFy}AgQL6ciAXpA&Tf0<#qq FR0Q+@W8DA% delta 203 zcmV;+05t#SFzGM>X^{bc0qL=Ug9-uClLZSif0_UQ0C=3GQUMafAP8gR|9_rDu%NQt zZnQOEfkY3HzfD!M1Hc?xL8J*@w1xhoZ7Qsda;qvIwsK8q`vXnDK!Q+6%4-c|9nX5< z(OS55=#}W-VaaRhz4=a-V@4-`?hl>$C~?C6`1Rc3r7QW)kIMH8|G~2%(B8k}oD0`6 zALl^|UZ>7=eZVz8SM3j9@bCEOY3m!j=?QxSZ diff --git a/card_art/swords07.aseprite b/card_art/swords07.aseprite index 380b8c28ca3c58ee2100de797ab42fab90d5219e..d7eca667b8434ded4799e8966811b7b32a0765d8 100644 GIT binary patch delta 928 zcmV;R17G~^4~r23iwKbdehmu<008>&VgO_S003f!KOm`g-f#Rpth&=;jM+w+CTv2jHdv}@z-D~Ie{HZI&h-}Ym2n`g zM>y$Ow-=EZuxQEw;w#LQBd`doN{p1@0G8`PRMe&EHh-pG*pZ>@`>vW2aU2RcM}LIN z%M{nOH?H`oyv=G$(`vDbIbg)yZ(sMj9`MF>!2*wn_x9z@APeu&8lgK;- z&iBMw0E26vCe9ec)di9xE6G$x0b%5I)urgj`}%Zo@AoF*cK&&Fz2HwzofAIcL?_~w zJ>Z4jfcL7|=`12NbZ8z7uNa0U`hNku!hv6wPORT|e~Q`4JM0}l#V^PhQArd%xW=yi zg?_+oYcmD}bmO}WRvp{;dJ2qY&r>uuWC3CWD`NLLJ;D0LfZ{vHK?)RApk+(hgG4@n zC>0NisDXFFAxe)S=SWFRUJ_)E5+TBD2^o1veS*J2$_8pa5Ui~>My@h6Fn@cyiigTG zG(T4tAX%&V#Q}8)oPBLZYq$EOmJQ=H53XV8p*%&^R0mZJYIS1l-2~3&U{T z(WhmgS3^)N8_M=U4-U<}NA6)kI5+U8jd`hD8&1AQ{8Q+r z>K~Q-ALg@Q10VyFU;}QGfCha5?vwroIe!IeML`S&(5bt-{<^!nySwavBR!=leLOmF zU~)r3Qc7ux>Gbnvm}M^gy?GW`WQk=~SdIP~>+#=UlP$K{VV6DjWB!0cjyUFoQ_gte zoQv4^$R$@?bHgonJoCam4-`?%TjbwLD5Z>YDyYo#e^pUU4Ykxo{z*NrQ8&;?Q#I7h zxjikk(w58H>7bJ?-gEtKdg!H({>TdqFc`NCG5pW{BaAY}cqX4&TL5GL003K&jV}*;0ssIbAOHXW00sa608^36 zB!5K$004NLy;cj7!ypJ{;Qn{sZR9T)O}fjp^I8K450n7B6QadKL}Wk)WI%y)LGSL^ z0VdhCnk`FvH2rF~P69WPAsj5qhu0aw5h>bA5U4eJ6BurWw;Z^kWzgVRhToL9zoP^_ zriGZE&l_E%CN|5xGu9n5@feW!@9Ojn1%EzZ9loWq{119&r+QbZX59@*?IyPfDKAzJ zkVemVZQJvcJu^bYyL|Jx__B~~9olN{W@*2Oc-uhVkGH~o!%GC4s-&X*0y@0R#6`so zNo&BTZVDHY;d%BZb{U2|wTw~@v;X$2)U&!+ph=J>U;Z;mTEh4Hd%)5m@oVVSsTL`$fotOg4Kg1zfqE*n|X%* zhMOGZ_d}U@?LH~`VL+O@@SqJ!=Fpop@27$9NVs-97?KemoJ01WDHo=clbZs$SBb>1 zM8ZLCN?+ht$kiaL2Z4{(a}+wmh*`%~{HQV`_YHjkTD96<6R?CJ#Mf4|PED&XYQ3;q zhqeHjRo5NdHDu+{Yb2lq?h$Cs0~LWCB|dYwRFusUE^KOpS}UogQ(n1o+ly}Le?o|I z$8VF?-wW#Dq2Ukfz!OxnumeZ~lOP9u0r8Wb2RVO-PC`Kth2asTsz}FzjSfl^ z0Ra(Eii(2r{tv^SFoxxFPx2+Zdv-G`BJzN;Y*IlLHQA<)M>Oz+CR%7~|BQ~VyXfHs zeY|3TAx8TC4euCZf+=SB(Ebx&#{4hxZs8dUZeLZKaOyW z69lwBMbJ37A3_)r-A66+Vu&MQIX}ZWE^sOPN#Y9ExWTQS-ywyx{w0H~&Hr=Aqky8( OmvC=0?>}pUFAd)DxRA#H diff --git a/coins02.inc b/coins02.inc index 38cb7fe..86a397f 100644 --- a/coins02.inc +++ b/coins02.inc @@ -61,13 +61,13 @@ Coins02: db $00,$01,$00,$01,$00,$01,$00,$01,$00,$02,$00,$02,$00,$02,$00,$02 db $00,$80,$00,$80,$00,$80,$00,$80,$00,$80,$00,$80,$00,$40,$00,$40 db $00,$40,$00,$40,$00,$40,$00,$40,$00,$20,$00,$20,$00,$20,$00,$20 - db $00,$20,$80,$90,$c0,$d0,$e0,$e0,$f0,$f0,$f0,$f0,$f8,$f8,$f8,$f8 - db $f8,$f8,$f8,$f8,$f0,$f0,$f0,$f0,$e0,$e8,$c0,$c4,$80,$84,$00,$04 + db $00,$20,$80,$90,$c0,$d0,$60,$60,$b0,$b0,$b0,$b0,$b8,$b8,$78,$78 + db $f8,$f8,$f8,$f8,$f0,$f0,$70,$70,$e0,$e8,$c0,$c4,$80,$84,$00,$04 db $00,$3f,$00,$3f,$00,$0f,$00,$01,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$c1,$00,$1f,$00,$ff,$00,$ff,$00,$3e,$00,$00,$00,$00,$00,$00 db $00,$fe,$00,$fe,$00,$f8,$00,$c0,$00,$00,$00,$00,$00,$00,$00,$00 - db $3e,$3e,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$3e,$3e + db $3e,$3e,$ff,$ff,$e0,$e0,$df,$df,$bf,$bf,$bf,$bf,$8f,$8f,$3f,$3f + db $be,$be,$9e,$9e,$be,$be,$c3,$c3,$fa,$fa,$f9,$f9,$ff,$ff,$3e,$3e db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01 db $00,$07,$00,$07,$00,$07,$00,$07,$00,$0f,$00,$0f,$00,$1f,$00,$ff db $00,$e0,$00,$e0,$00,$e0,$00,$e0,$00,$f0,$00,$f0,$00,$f8,$00,$ff @@ -82,13 +82,13 @@ Coins02: db $00,$01,$00,$01,$00,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$80,$00,$80,$00,$80,$00,$80,$00,$80 db $00,$02,$00,$04,$00,$04,$00,$04,$00,$04,$00,$04,$01,$09,$03,$0b - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$7c,$7c,$ff,$ff,$ff,$ff + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$7c,$7c,$df,$df,$df,$df db $00,$80,$00,$40,$00,$40,$00,$40,$00,$40,$00,$40,$00,$20,$80,$a0 - db $07,$07,$0f,$0f,$0f,$0f,$1f,$1f,$1f,$1f,$1f,$1f,$1f,$1f,$0f,$0f - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff - db $c0,$c0,$e0,$e0,$e0,$e0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$e0,$e0 + db $07,$07,$0f,$0f,$0f,$0f,$1f,$1f,$18,$18,$1e,$1e,$1f,$1f,$0f,$0f + db $cf,$cf,$cf,$cf,$c4,$c4,$00,$00,$11,$11,$3b,$3b,$93,$93,$81,$81 + db $c0,$c0,$e0,$e0,$60,$60,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$e0,$e0 db $0f,$0f,$07,$17,$03,$23,$01,$21,$00,$20,$00,$7f,$00,$7e,$00,$1f - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$7c,$7c,$00,$83,$00,$3f,$00,$ff + db $19,$19,$3d,$3d,$7f,$7f,$ff,$ff,$7c,$7c,$00,$83,$00,$3f,$00,$ff db $e0,$e0,$c0,$d0,$80,$88,$00,$08,$00,$08,$00,$fc,$00,$fc,$00,$f0 db $00,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$ff,$00,$7c,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 diff --git a/coins03.inc b/coins03.inc index e22d826..740137c 100644 --- a/coins03.inc +++ b/coins03.inc @@ -37,18 +37,18 @@ Coins03: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fc,$03,$f3,$0f,$ef,$1f,$df - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$07,$f8,$f8,$ff,$ff,$ff,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$07,$f8,$f8,$ff,$ff,$f7,$f7 db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$3f,$c0,$df db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$01,$fd,$01,$fd,$01,$fd - db $00,$f8,$07,$c7,$3f,$bf,$7f,$7f,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff - db $3f,$3f,$bf,$bf,$bf,$bf,$bf,$bf,$bf,$bf,$df,$df,$ef,$ef,$f7,$f7 - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff - db $e0,$ef,$f0,$f7,$f8,$fb,$f8,$fb,$f8,$fb,$f8,$fb,$f8,$fb,$f0,$f7 + db $00,$f8,$07,$c7,$3f,$bf,$7c,$7c,$f9,$f9,$f2,$f2,$f0,$f0,$e0,$e0 + db $38,$38,$bc,$bc,$bf,$bf,$bf,$bf,$bf,$bf,$5e,$5e,$2f,$2f,$16,$16 + db $63,$63,$09,$09,$20,$20,$8a,$8a,$00,$00,$1c,$1c,$ff,$ff,$3f,$3f + db $e0,$ef,$f0,$f7,$18,$1b,$78,$7b,$f8,$fb,$f8,$fb,$78,$7b,$f0,$f7 db $01,$fd,$01,$fd,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $ff,$ff,$ff,$ff,$ff,$ff,$7f,$7f,$3f,$bf,$07,$c7,$00,$f8,$00,$ff - db $f9,$f9,$fe,$fe,$ff,$ff,$ff,$ff,$fe,$fe,$f0,$f1,$00,$0f,$00,$ff - db $ff,$ff,$3f,$3f,$80,$80,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $e0,$ef,$80,$9f,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $c0,$c0,$c0,$c0,$e3,$e3,$7f,$7f,$38,$b8,$07,$c7,$00,$f8,$00,$ff + db $09,$09,$7e,$7e,$ff,$ff,$ff,$ff,$0e,$0e,$f0,$f1,$00,$0f,$00,$ff + db $c0,$c0,$3f,$3f,$80,$80,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $60,$6f,$80,$9f,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff db $00,$ff,$00,$ff,$00,$00,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$00 db $00,$7e,$00,$7e,$00,$7e,$00,$7e,$00,$7e,$00,$7e,$00,$7e,$00,$7e diff --git a/coins05.inc b/coins05.inc index f8abfbc..91a2b8f 100644 --- a/coins05.inc +++ b/coins05.inc @@ -39,9 +39,9 @@ Coins05: db $00,$00,$01,$01,$01,$01,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03 db $00,$00,$80,$80,$c0,$c0,$e0,$e0,$f0,$f0,$f0,$f0,$18,$18,$58,$58 db $03,$03,$03,$03,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00 - db $e5,$e5,$fa,$fa,$fc,$fc,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$7f,$7f + db $e5,$e5,$fa,$fa,$7c,$7c,$7f,$7f,$7f,$7f,$bf,$bf,$bf,$bf,$5f,$5f db $9c,$9c,$dc,$dc,$dc,$dc,$0e,$0e,$56,$56,$46,$46,$9a,$9a,$9e,$9e - db $7f,$7f,$3f,$3f,$1f,$1f,$0f,$0f,$07,$07,$01,$01,$00,$00,$00,$00 + db $5f,$5f,$2f,$2f,$17,$17,$0b,$0b,$07,$07,$01,$01,$00,$00,$00,$00 db $9e,$9e,$de,$de,$dc,$dc,$fc,$fc,$f8,$f8,$f0,$f0,$00,$00,$00,$00 db $00,$00,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $c0,$c0,$e0,$e0,$e0,$e0,$c0,$c0,$00,$00,$00,$00,$00,$00,$00,$00 @@ -58,13 +58,13 @@ Coins05: db $e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$c0,$c0 db $c0,$c0,$c0,$c0,$c0,$c0,$80,$80,$80,$80,$00,$00,$00,$00,$00,$00 db $e3,$e3,$6f,$6f,$7f,$7f,$7f,$7f,$3f,$3f,$1f,$1f,$0f,$0f,$07,$07 - db $fc,$fc,$fc,$fc,$f8,$f8,$f0,$f0,$e0,$e0,$c0,$c0,$80,$80,$00,$00 + db $f4,$f4,$ec,$ec,$d8,$d8,$b0,$b0,$60,$60,$c0,$c0,$80,$80,$00,$00 db $01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $f8,$f8,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$06,$06,$0f,$0f,$0f,$0f,$1f,$1f,$3d,$3d,$3d,$3d,$7b,$7b - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01 - db $6b,$6b,$6b,$6b,$e2,$e2,$e2,$e2,$e6,$e6,$e4,$e4,$cc,$cc,$dc,$dc - db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00 + db $00,$00,$06,$06,$0f,$0f,$1f,$1f,$3f,$3f,$7d,$7d,$7d,$7d,$fb,$fb + db $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$02,$02,$02,$02,$03,$03 + db $ab,$ab,$ab,$ab,$62,$62,$62,$62,$66,$66,$e4,$e4,$cc,$cc,$dc,$dc + db $03,$03,$03,$03,$03,$03,$03,$03,$01,$01,$00,$00,$00,$00,$00,$00 db $98,$98,$d8,$d8,$f0,$f0,$e0,$e0,$e0,$e0,$c0,$c0,$00,$00,$00,$00 db $ff,$ff,$f7,$f7,$f3,$f3,$fb,$fb,$f9,$f9,$fa,$fa,$fc,$fc,$c1,$c1 db $d7,$d7,$d7,$d7,$cf,$cf,$ef,$ef,$ef,$ef,$ff,$ff,$ff,$ff,$fe,$fe @@ -72,7 +72,7 @@ Coins05: db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$0f,$0f,$f3,$f3,$e7,$e7,$df,$df db $fe,$fe,$fe,$fe,$fd,$fd,$fd,$fd,$fb,$fb,$fb,$fb,$f6,$f6,$f5,$f5 db $db,$db,$fa,$fa,$79,$79,$77,$77,$47,$47,$b7,$b7,$37,$37,$b7,$b7 - db $3f,$3f,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$fe,$fe + db $3f,$3f,$ff,$ff,$ff,$ff,$ff,$ff,$fd,$fd,$fb,$fb,$fb,$fb,$f6,$f6 .KeyArtTilesEnd: .BackgroundCopy: ; tiles start at 26 @@ -92,5 +92,4 @@ Coins05: db $1a, $1a, $1a, $1a, $31, $3b, $32, $1a db $1a, $1a, $1a, $1a, $33, $34, $1a, $1a db $1a, $1a, $1a, $1a, $1a, $1a, $1a, $1a - .BackgroundCopyEnd: \ No newline at end of file diff --git a/coins06.inc b/coins06.inc index df0b10d..32a2f85 100644 --- a/coins06.inc +++ b/coins06.inc @@ -55,16 +55,16 @@ Coins06: db $00,$3e,$00,$8e,$00,$c0,$00,$e0,$00,$e0,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$1e,$1e,$3f,$3f db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80 - db $3f,$3f,$3f,$3f,$3f,$3f,$1f,$1f,$1f,$1f,$0f,$0f,$07,$07,$01,$01 - db $c0,$c0,$e0,$e0,$e0,$e0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$e0,$e0 + db $3b,$3b,$31,$31,$38,$38,$1c,$1c,$1e,$1e,$0f,$0f,$07,$07,$01,$01 + db $c0,$c0,$e0,$e0,$e0,$e0,$70,$70,$30,$30,$70,$70,$f0,$f0,$e0,$e0 db $00,$00,$00,$00,$01,$01,$03,$03,$03,$03,$03,$03,$03,$03,$03,$03 - db $00,$00,$00,$00,$e0,$e0,$e0,$e0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0 + db $00,$00,$00,$00,$e0,$e0,$e0,$e0,$f0,$f0,$d0,$d0,$d0,$d0,$d0,$d0 db $03,$03,$03,$03,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00 - db $f0,$f0,$f0,$f0,$f0,$f0,$e0,$e0,$00,$00,$00,$00,$00,$00,$00,$00 + db $d0,$d0,$f0,$f0,$f0,$f0,$e0,$e0,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$03,$03,$03,$03 - db $00,$00,$3c,$3c,$7e,$7e,$fe,$fe,$fe,$fe,$fc,$fc,$fc,$fc,$f8,$f8 + db $00,$00,$3c,$3c,$7e,$7e,$fe,$fe,$fa,$fa,$f4,$f4,$f4,$f4,$e8,$e8 db $03,$03,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $f0,$f0,$e0,$e0,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $d0,$d0,$e0,$e0,$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,$07,$00,$3f db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$7c,$03,$fb,$07,$f7 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$ff,$00,$7f,$80,$8f,$f0,$f3 @@ -74,11 +74,11 @@ Coins06: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80 db $00,$01,$00,$03,$00,$07,$00,$0f,$00,$0f,$00,$0f,$00,$07,$00,$bb db $00,$ff,$00,$ff,$00,$fe,$01,$fd,$01,$f9,$00,$fc,$00,$fe,$00,$ff - db $03,$c3,$3d,$3d,$fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff,$3f,$3f,$00,$c0 - db $fc,$fc,$ff,$ff,$ff,$ff,$3f,$3f,$df,$df,$e7,$e7,$80,$98,$00,$7f + db $03,$c3,$3d,$3d,$fe,$fe,$e1,$e1,$ff,$ff,$e0,$e0,$3f,$3f,$00,$c0 + db $7c,$7c,$bf,$bf,$cf,$cf,$33,$33,$dc,$dc,$e7,$e7,$80,$98,$00,$7f db $00,$01,$00,$7e,$80,$be,$c0,$de,$e0,$ef,$f0,$f7,$e0,$ef,$00,$1f - db $7f,$7f,$ff,$ff,$ff,$ff,$ff,$ff,$7f,$7f,$1f,$9f,$00,$e0,$00,$e0 - db $e0,$ef,$f0,$f7,$f0,$f7,$f0,$f7,$e0,$eb,$80,$97,$00,$0f,$00,$7f + db $6a,$6a,$e0,$e0,$c0,$c0,$e0,$e0,$6a,$6a,$1f,$9f,$00,$e0,$00,$e0 + db $e0,$ef,$30,$37,$70,$77,$30,$37,$e0,$eb,$80,$97,$00,$0f,$00,$7f db $00,$f0,$00,$f8,$00,$fc,$00,$fe,$00,$fe,$00,$fe,$00,$fc,$00,$f8 db $00,$bd,$00,$be,$00,$bf,$00,$bf,$00,$df,$00,$df,$00,$ef,$00,$ef db $00,$ff,$00,$3f,$00,$c7,$00,$f8,$00,$ff,$00,$ff,$00,$ff,$00,$ff diff --git a/coins07.inc b/coins07.inc index 030b8bd..6b5a453 100644 --- a/coins07.inc +++ b/coins07.inc @@ -52,7 +52,7 @@ Coins07: db $00,$00,$00,$00,$00,$c0,$00,$fe,$00,$07,$00,$f1,$00,$fd,$00,$fe db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$f8,$00,$fe,$00,$82 db $01,$fd,$03,$fb,$03,$fb,$03,$8b,$01,$fd,$00,$fe,$00,$ff,$00,$9f - db $c0,$c3,$e0,$e3,$e0,$e1,$e0,$e5,$c0,$dc,$00,$1e,$00,$fe,$00,$f4 + db $c0,$c3,$e0,$e3,$60,$61,$e0,$e5,$c0,$dc,$00,$1e,$00,$fe,$00,$f4 db $00,$e3,$1c,$dd,$1c,$dd,$1c,$dd,$00,$e3,$00,$ff,$00,$7e,$00,$10 db $00,$e1,$00,$f1,$00,$f9,$00,$f9,$00,$f8,$00,$fc,$00,$fe,$00,$7e db $00,$00,$00,$00,$00,$ff,$00,$ff,$00,$fc,$00,$fe,$00,$9e,$00,$9f @@ -68,8 +68,8 @@ Coins07: db $00,$c3,$00,$e0,$00,$f8,$00,$fc,$00,$fe,$00,$ff,$00,$ff,$00,$7f db $00,$ff,$00,$ff,$00,$7f,$00,$1f,$00,$07,$00,$01,$00,$c0,$00,$e0 db $00,$ef,$00,$ef,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$c0,$00,$ff - db $3e,$3e,$7f,$7f,$7f,$7f,$7f,$7f,$3e,$be,$1c,$9c,$00,$00,$00,$83 - db $0f,$0f,$0f,$0f,$07,$17,$00,$10,$00,$23,$00,$3b,$00,$0f,$00,$e7 + db $3e,$3e,$6b,$6b,$77,$77,$6b,$6b,$3e,$be,$1c,$9c,$00,$00,$00,$83 + db $0d,$0d,$0f,$0f,$07,$17,$00,$10,$00,$23,$00,$3b,$00,$0f,$00,$e7 db $80,$bf,$80,$bf,$00,$7f,$00,$ff,$00,$7f,$00,$7f,$00,$7f,$00,$ff db $00,$f3,$00,$f9,$00,$f9,$00,$f8,$00,$f8,$00,$f8,$00,$f8,$00,$fc db $00,$fe,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7f,$00,$3f @@ -77,14 +77,14 @@ Coins07: db $00,$f0,$00,$f8,$00,$fc,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff db $00,$ff,$00,$ef,$00,$ef,$00,$cd,$00,$dd,$00,$f3,$00,$f7,$00,$e4 db $00,$c1,$00,$f0,$00,$fc,$00,$f0,$01,$e5,$01,$cd,$01,$fd,$00,$1e - db $00,$c3,$38,$b9,$7c,$7c,$fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff,$fe,$fe + db $00,$c3,$38,$b9,$7c,$7c,$ee,$ee,$c7,$c7,$83,$83,$c7,$c7,$ee,$ee db $00,$ff,$00,$ff,$00,$ff,$00,$3f,$00,$0f,$00,$07,$00,$07,$00,$87 db $00,$fc,$00,$fc,$00,$fc,$00,$fe,$00,$fe,$00,$ff,$00,$ff,$00,$ff db $00,$3f,$00,$1f,$00,$1f,$00,$0f,$00,$07,$00,$07,$00,$0f,$00,$87 db $00,$f0,$00,$f0,$00,$f8,$00,$fc,$00,$fc,$00,$ff,$00,$ff,$00,$ff db $00,$ff,$00,$7f,$00,$0f,$00,$0f,$00,$0f,$00,$01,$00,$00,$00,$81 - db $03,$cb,$07,$f7,$0f,$ef,$1f,$df,$1f,$df,$1f,$df,$1f,$df,$1f,$df - db $e0,$ef,$f0,$f7,$f8,$fb,$fc,$fd,$fc,$fd,$fc,$fd,$fc,$fd,$fc,$fd + db $03,$cb,$07,$f7,$0f,$ef,$1d,$dd,$1e,$de,$18,$d8,$1e,$de,$1d,$dd + db $e0,$ef,$f0,$f7,$78,$7b,$5c,$5d,$3c,$3d,$0c,$0d,$3c,$3d,$5c,$5d db $7c,$7c,$38,$b9,$00,$83,$00,$87,$00,$8f,$00,$8f,$00,$8f,$00,$1f db $00,$87,$00,$cb,$00,$cb,$00,$cb,$00,$9b,$00,$b7,$00,$37,$00,$8f db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff @@ -92,21 +92,21 @@ Coins07: db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7f db $00,$80,$00,$80,$00,$e0,$00,$c0,$00,$c0,$00,$f8,$00,$f8,$00,$f8 db $0f,$ef,$07,$f7,$03,$fb,$00,$fc,$00,$80,$00,$fe,$00,$ff,$00,$ff - db $f8,$fb,$f0,$f6,$e0,$ef,$00,$1f,$00,$0f,$00,$03,$00,$e0,$00,$fc + db $78,$7b,$f0,$f6,$e0,$ef,$00,$1f,$00,$0f,$00,$03,$00,$e0,$00,$fc db $00,$3f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7f db $00,$bf,$00,$c7,$00,$c7,$00,$e7,$00,$e7,$00,$f3,$00,$f7,$00,$ff db $00,$e0,$00,$e0,$00,$e0,$00,$e0,$00,$f8,$00,$f0,$00,$f0,$00,$f0 db $00,$7f,$00,$7f,$00,$7f,$00,$3f,$00,$1f,$00,$1f,$00,$1f,$00,$0f db $00,$f8,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$ff,$00,$f7,$00,$ec,$03,$eb,$07,$e7,$0f,$ef,$0f,$ef,$1f,$df - db $00,$ff,$00,$07,$f8,$f9,$fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $00,$ff,$00,$f7,$00,$ec,$03,$eb,$07,$e7,$0f,$ef,$0e,$ee,$1f,$df + db $00,$ff,$00,$07,$f8,$f9,$fe,$fe,$ff,$ff,$df,$df,$db,$db,$07,$07 db $00,$1f,$00,$af,$00,$c3,$00,$fb,$00,$59,$80,$9d,$80,$af,$c0,$d7 db $00,$c7,$00,$e0,$00,$f6,$00,$f5,$00,$f1,$00,$f9,$00,$fb,$00,$fa db $00,$ff,$00,$ff,$00,$7f,$00,$bf,$00,$bf,$00,$3f,$00,$7f,$00,$ff db $00,$fc,$00,$fc,$00,$fe,$00,$fc,$00,$fc,$00,$fc,$00,$ff,$00,$fe db $00,$07,$00,$03,$00,$03,$00,$03,$00,$07,$00,$01,$00,$00,$00,$00 - db $1f,$df,$1f,$5f,$1f,$5f,$1f,$5f,$0f,$6f,$0f,$6f,$07,$57,$03,$5b - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$fe,$fe + db $1f,$df,$1c,$5c,$1f,$5f,$1f,$5f,$0e,$6e,$0f,$6f,$07,$57,$03,$5b + db $07,$07,$00,$00,$07,$07,$07,$07,$db,$db,$df,$df,$ff,$ff,$fe,$fe db $c0,$d3,$c0,$d8,$c0,$dc,$c0,$dc,$80,$bc,$80,$be,$00,$7e,$00,$fb db $00,$c3,$00,$0b,$00,$07,$00,$7f,$00,$7f,$00,$3f,$00,$1f,$00,$0f db $00,$fe,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff diff --git a/coins08.inc b/coins08.inc index 6c79b9f..f7b68ce 100644 --- a/coins08.inc +++ b/coins08.inc @@ -40,12 +40,12 @@ Coins08: db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff db $00,$f8,$00,$fc,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$7f,$00,$bf db $00,$df,$00,$6f,$00,$b2,$00,$5c,$00,$9f,$00,$4f,$10,$53,$1c,$5d - db $00,$f8,$00,$fc,$00,$00,$ff,$ff,$7f,$7f,$3f,$bf,$3f,$bf,$3f,$bf - db $00,$00,$00,$00,$00,$00,$00,$00,$c0,$c0,$e0,$e0,$f0,$f0,$f0,$f0 + db $00,$f8,$00,$fc,$00,$00,$ff,$ff,$3f,$3f,$3f,$bf,$3e,$be,$37,$b7 + db $00,$00,$00,$00,$00,$00,$00,$00,$c0,$c0,$e0,$e0,$70,$70,$f0,$f0 db $00,$ff,$00,$fe,$00,$fd,$00,$f8,$00,$c3,$00,$c7,$00,$a2,$00,$60 - db $1e,$5e,$1f,$df,$1f,$df,$1f,$df,$0f,$6f,$07,$77,$01,$79,$00,$fe - db $7f,$7f,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$00,$00 - db $f0,$f0,$f0,$f4,$f0,$f6,$f0,$f7,$e0,$ef,$c0,$df,$00,$3f,$00,$ff + db $1e,$5e,$1b,$db,$1f,$df,$1f,$df,$0f,$6f,$07,$77,$01,$79,$00,$fe + db $3b,$3b,$bf,$bf,$d7,$d7,$ef,$ef,$ff,$ff,$df,$df,$ff,$ff,$00,$00 + db $f0,$f0,$f0,$f4,$70,$76,$f0,$f7,$e0,$ef,$c0,$df,$00,$3f,$00,$ff db $00,$60,$00,$60,$00,$60,$00,$60,$00,$60,$00,$60,$00,$70,$00,$f8 db $00,$7f,$00,$3f,$00,$1f,$00,$0f,$00,$07,$00,$03,$00,$01,$00,$00 db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$f0,$00,$c0 @@ -76,31 +76,32 @@ Coins08: db $00,$ff,$00,$ff,$00,$fe,$00,$fc,$00,$00,$00,$00,$00,$00,$00,$00 db $00,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$07,$00,$1f,$00,$7f db $00,$f7,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$0f,$0f,$7f,$7f + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$1f,$1f,$7f,$7f,$ff,$ff db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80,$c0,$c0 - db $01,$01,$03,$03,$07,$07,$0f,$0f,$1f,$1f,$3f,$3f,$3f,$3f,$7f,$7f - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$fe,$fe,$fc,$fc,$f8,$f8 + db $03,$03,$07,$07,$0f,$0f,$1c,$1c,$3e,$3e,$79,$79,$7f,$7f,$ff,$ff + db $df,$df,$5e,$5e,$1d,$1d,$2b,$2b,$77,$77,$ae,$ae,$dc,$dc,$38,$38 db $c0,$c0,$c0,$c0,$80,$80,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00 - db $7f,$7f,$7f,$7f,$3e,$3e,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $fc,$fc,$7f,$7f,$3e,$3e,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $f0,$f0,$c0,$c0,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$c0,$c0 - db $03,$03,$07,$07,$07,$07,$07,$07,$07,$07,$03,$03,$03,$03,$01,$01 - db $f0,$f0,$f8,$f8,$fc,$fc,$fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $03,$03,$07,$07,$06,$06,$07,$07,$07,$07,$03,$03,$03,$03,$01,$01 + db $f0,$f0,$d8,$d8,$ec,$ec,$76,$76,$7b,$7b,$8d,$8d,$0f,$0f,$d7,$d7 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80,$80,$80 db $01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $ff,$ff,$ff,$ff,$7f,$7f,$3f,$3f,$1f,$1f,$07,$07,$00,$00,$00,$00 + db $e3,$e3,$f5,$f5,$73,$73,$3b,$3b,$1f,$1f,$07,$07,$00,$00,$00,$00 db $c0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$80,$80,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$00,$01,$01,$03,$03,$03,$03,$03,$03,$01,$01 - db $00,$00,$70,$70,$f8,$f8,$fc,$fc,$fe,$fe,$fe,$fe,$fe,$fe,$fc,$fc + db $00,$00,$70,$70,$f8,$f8,$dc,$dc,$8e,$8e,$06,$06,$8e,$8e,$ac,$ac db $f8,$f8,$70,$70,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$00,$04,$04,$0e,$0e,$1f,$1f,$1f,$1f,$3f,$3f + db $00,$00,$00,$00,$00,$00,$0c,$0c,$1e,$1e,$3f,$3f,$3b,$3b,$7a,$7a db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80 - db $3f,$3f,$3f,$3f,$3f,$3f,$3f,$3f,$3f,$3f,$3f,$3f,$1f,$1f,$1f,$1f + db $6a,$6a,$72,$72,$78,$78,$72,$72,$6a,$6a,$7a,$7a,$3b,$3b,$3f,$3f db $80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$80,$00,$00,$00,$00 - db $0e,$0e,$04,$04,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$60,$60,$f0,$f0,$f0,$f0,$f8,$f8,$78,$78,$78,$78,$30,$30 + db $1e,$1e,$0c,$0c,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$60,$60,$f0,$f0,$d0,$d0,$f8,$f8,$78,$78,$78,$78,$30,$30 db $00,$00,$00,$00,$00,$00,$06,$06,$0f,$0f,$06,$06,$00,$00,$00,$00 - db $00,$00,$30,$30,$78,$78,$78,$78,$f8,$f8,$f0,$f0,$f0,$f0,$60,$60 + db $00,$00,$30,$30,$78,$78,$68,$68,$f8,$f8,$d0,$d0,$f0,$f0,$60,$60 + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01 .KeyArtTilesEnd: .BackgroundCopy: ; tiles start at 26 @@ -111,7 +112,7 @@ Coins08: db $43, $40, $26, $27, $28, $29, $2a, $1a db $41, $2b, $2c, $2d, $2e, $1d, $2f, $30 db $1a, $1a, $31, $32, $33, $34, $35, $36 - db $1a, $1a, $1a, $1a, $44, $45, $1a, $1a + db $1a, $1a, $1a, $5d, $44, $45, $1a, $1a db $1a, $1a, $1a, $46, $47, $48, $1a, $1a db $1a, $1a, $1a, $49, $4a, $4b, $1a, $1a db $1a, $1a, $55, $56, $4c, $4d, $4e, $1a diff --git a/coins09.inc b/coins09.inc index 11d970b..ef901e3 100644 --- a/coins09.inc +++ b/coins09.inc @@ -64,43 +64,44 @@ Coins09: db $00,$23,$00,$27,$00,$3f,$00,$07,$00,$07,$00,$07,$00,$07,$00,$07 db $00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$f8,$07,$e7,$0f,$cf,$3f,$bf db $00,$ff,$00,$ff,$00,$f0,$03,$03,$07,$07,$e7,$e7,$f7,$f7,$f7,$f7 - db $00,$ff,$00,$ff,$00,$00,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $00,$ff,$00,$ff,$00,$00,$ff,$ff,$ff,$ff,$ff,$ff,$f7,$f7,$fb,$fb db $00,$f0,$00,$f8,$00,$3c,$c0,$de,$e0,$e6,$f8,$fb,$fc,$fd,$fc,$fd db $00,$07,$00,$07,$00,$03,$00,$03,$00,$03,$00,$03,$00,$01,$00,$01 - db $00,$ff,$00,$fc,$00,$f8,$00,$f0,$0e,$ee,$1f,$df,$1f,$df,$1f,$df - db $3f,$3f,$7f,$7f,$7f,$7f,$7f,$7f,$7f,$7f,$7f,$7f,$3f,$3f,$9f,$9f - db $fb,$fb,$fb,$fb,$f9,$f9,$fc,$fc,$fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$7f,$7f,$8f,$8f,$e0,$e0,$c7,$c7 - db $fc,$fd,$fc,$fd,$f8,$fb,$f8,$fb,$f8,$fb,$f0,$f3,$00,$03,$fc,$fd + db $00,$ff,$00,$fc,$00,$f8,$00,$f0,$0e,$ee,$17,$d7,$17,$d7,$17,$d7 + db $3e,$3e,$7d,$7d,$7d,$7d,$7e,$7e,$7f,$7f,$5f,$5f,$2f,$2f,$93,$93 + db $1a,$1a,$fb,$fb,$f9,$f9,$f4,$f4,$0e,$0e,$ff,$ff,$ff,$ff,$ff,$ff + db $fc,$fc,$7f,$7f,$bf,$bf,$cf,$cf,$70,$70,$8f,$8f,$e0,$e0,$c7,$c7 + db $7c,$7d,$fc,$fd,$f8,$fb,$f8,$fb,$08,$0b,$f0,$f3,$00,$03,$fc,$fd db $00,$01,$00,$01,$00,$01,$00,$01,$00,$01,$00,$01,$00,$01,$00,$00 - db $1f,$df,$1f,$df,$1f,$df,$1f,$df,$1f,$df,$0f,$ef,$07,$e7,$01,$f1 - db $cf,$cf,$e3,$e3,$f8,$f8,$fc,$fc,$f9,$f9,$fb,$fb,$f3,$f3,$f7,$f7 - db $ff,$ff,$ff,$ff,$0e,$0e,$e0,$e0,$fc,$fc,$fe,$fe,$fe,$fe,$fe,$fe - db $9f,$9f,$7f,$7f,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff - db $fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff - db $00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$0f,$0f,$1f,$1f,$3f,$3f + db $17,$d7,$17,$d7,$17,$d7,$17,$d7,$1b,$db,$0d,$ed,$06,$e6,$03,$f3 + db $cc,$cc,$e3,$e3,$f8,$f8,$fc,$fc,$f9,$f9,$fb,$fb,$f3,$f3,$77,$77 + db $ff,$ff,$03,$03,$fe,$fe,$00,$00,$fc,$fc,$fe,$fe,$fe,$fe,$f6,$f6 + db $9f,$9f,$7d,$7d,$fe,$fe,$fc,$fc,$fe,$fe,$fd,$fd,$bf,$bf,$df,$df + db $fe,$fe,$7f,$7f,$5f,$5f,$3f,$3f,$1f,$1f,$3f,$3f,$5f,$5f,$ff,$ff + db $00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$0f,$0f,$1f,$1f,$3e,$3e db $00,$00,$00,$00,$00,$00,$f8,$f8,$fc,$fc,$fe,$fe,$fe,$fe,$fe,$fe - db $01,$f1,$00,$f0,$00,$38,$03,$03,$1f,$1f,$3f,$3f,$7f,$7f,$7f,$7f - db $f7,$f7,$f7,$f7,$07,$07,$f7,$f7,$f7,$f7,$f3,$f3,$fb,$fb,$fc,$fc - db $7f,$7f,$3f,$3f,$9f,$9f,$cf,$cf,$e1,$e1,$c0,$c0,$c0,$c0,$00,$00 - db $ff,$ff,$fe,$fe,$fe,$fe,$fc,$fc,$f0,$f0,$00,$00,$00,$00,$00,$00 - db $7f,$7f,$7f,$7f,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$7f,$7f,$3e,$3e - db $fe,$fe,$fc,$fc,$fc,$fc,$f8,$f8,$f0,$f0,$e0,$e0,$80,$80,$00,$00 - db $7f,$7f,$7f,$7f,$7f,$7f,$7f,$7f,$7f,$7f,$3f,$3f,$1f,$1f,$07,$07 - db $fe,$fe,$ff,$ff,$ff,$ff,$fe,$fe,$fc,$fc,$f8,$f8,$e0,$e0,$9f,$9f + db $01,$f1,$00,$f0,$00,$38,$03,$03,$1f,$1f,$3f,$3f,$7e,$7e,$7d,$7d + db $f7,$f7,$f7,$f7,$05,$05,$f5,$f5,$f6,$f6,$f3,$f3,$39,$39,$dc,$dc + db $6f,$6f,$37,$37,$99,$99,$ce,$ce,$e1,$e1,$c0,$c0,$c0,$c0,$00,$00 + db $ff,$ff,$fe,$fe,$f2,$f2,$0c,$0c,$f0,$f0,$00,$00,$00,$00,$00,$00 + db $7d,$7d,$7a,$7a,$fd,$fd,$ff,$ff,$ff,$ff,$bf,$bf,$41,$41,$3e,$3e + db $7e,$7e,$fc,$fc,$fc,$fc,$f8,$f8,$f0,$f0,$e0,$e0,$80,$80,$00,$00 + db $7d,$7d,$7d,$7d,$7e,$7e,$7f,$7f,$5f,$5f,$27,$27,$18,$18,$07,$07 + db $de,$de,$df,$df,$3f,$3f,$fe,$fe,$fc,$fc,$f8,$f8,$60,$60,$9f,$9f db $3c,$3c,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80 - db $00,$00,$00,$00,$03,$03,$1f,$1f,$3f,$3f,$7f,$7f,$ff,$ff,$ff,$ff - db $00,$00,$00,$00,$fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $00,$00,$00,$00,$03,$03,$1f,$1f,$3f,$3f,$7f,$7f,$fe,$fe,$fd,$fd + db $00,$00,$00,$00,$fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff,$3f,$3f,$df,$df db $00,$00,$00,$00,$00,$00,$00,$00,$80,$80,$80,$80,$80,$80,$80,$80 db $00,$00,$01,$01,$03,$03,$07,$07,$07,$07,$0f,$0f,$0f,$0f,$0f,$0f - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff + db $7f,$7f,$ff,$ff,$ff,$ff,$e3,$e3,$dd,$dd,$bd,$bd,$bd,$bd,$bb,$bb db $c0,$c0,$e0,$e0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0 - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$7f,$7f,$3f,$3f,$00,$00,$00,$00 - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$fe,$fe,$f0,$f0,$00,$00,$00,$00 + db $fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff,$40,$40,$3f,$3f,$00,$00,$00,$00 + db $3f,$3f,$ff,$ff,$ff,$ff,$ff,$ff,$1e,$1e,$f0,$f0,$00,$00,$00,$00 db $80,$80,$80,$80,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $0f,$0f,$0f,$0f,$0f,$0f,$07,$07,$03,$03,$01,$01,$00,$00,$00,$00 - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$fe,$fe,$00,$00,$00,$00 + db $0f,$0f,$07,$07,$0b,$0b,$05,$05,$02,$02,$01,$01,$00,$00,$00,$00 + db $c7,$c7,$ff,$ff,$ff,$ff,$ff,$ff,$0f,$0f,$fe,$fe,$00,$00,$00,$00 db $f0,$f0,$f0,$f0,$e0,$e0,$c0,$c0,$80,$80,$00,$00,$00,$00,$00,$00 + db $da,$da,$dd,$dd,$ef,$ef,$f3,$f3,$ff,$ff,$7f,$7f,$bf,$bf,$c7,$c7 .KeyArtTilesEnd: .BackgroundCopy: ; tiles start at 26 @@ -115,7 +116,7 @@ Coins09: db $35, $20, $36, $37, $38, $39, $1a, $1a db $3a, $3b, $3c, $3d, $3e, $3f, $1a, $1a db $40, $41, $42, $43, $44, $45, $46, $47 - db $1a, $48, $49, $45, $4a, $4b, $4c, $4d + db $1a, $48, $49, $5d, $4a, $4b, $4c, $4d db $1a, $4e, $4f, $50, $51, $52, $53, $1a db $1a, $54, $55, $56, $57, $58, $59, $1a db $1a, $5a, $5b, $5c, $1a, $1a, $1a, $1a diff --git a/coins10.inc b/coins10.inc index 9bcf6b5..6c5683f 100644 --- a/coins10.inc +++ b/coins10.inc @@ -48,7 +48,7 @@ Coins10: db $00,$80,$00,$80,$00,$80,$00,$83,$00,$87,$00,$86,$00,$87,$00,$87 db $00,$00,$00,$00,$00,$00,$00,$ff,$00,$ff,$00,$f8,$03,$03,$0f,$0f db $00,$87,$00,$87,$00,$87,$00,$87,$00,$87,$00,$87,$00,$87,$00,$87 - db $1f,$1f,$1f,$1f,$3f,$3f,$3f,$3f,$3f,$3f,$3f,$3f,$1f,$1f,$1f,$1f + db $1e,$1e,$1e,$1e,$3c,$3c,$21,$21,$39,$39,$3c,$3c,$19,$19,$1b,$1b db $00,$ff,$00,$ff,$00,$ff,$00,$00,$00,$00,$00,$ff,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$00,$00,$00 db $00,$00,$00,$ff,$00,$ff,$00,$ff,$00,$00,$00,$ff,$00,$00,$00,$00 @@ -60,11 +60,11 @@ Coins10: db $00,$00,$00,$03,$00,$1c,$00,$60,$00,$20,$00,$20,$00,$20,$00,$20 db $00,$00,$00,$c0,$00,$38,$00,$0e,$00,$05,$00,$04,$00,$04,$00,$04 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$9f,$00,$7f,$00,$1f,$00,$08 - db $01,$21,$03,$23,$07,$e7,$07,$e7,$03,$e3,$01,$e1,$00,$a0,$00,$a0 + db $01,$21,$03,$23,$06,$e6,$06,$e6,$03,$e3,$01,$e1,$00,$a0,$00,$a0 db $00,$88,$00,$a8,$00,$ab,$00,$08,$00,$08,$00,$4a,$00,$c8,$00,$cf db $00,$d0,$00,$ee,$01,$dd,$01,$dd,$00,$be,$00,$7f,$00,$fe,$00,$fd db $00,$38,$c0,$d8,$e0,$e8,$e0,$e8,$c0,$d0,$00,$30,$00,$e0,$00,$e0 - db $00,$fd,$00,$f8,$07,$f7,$0f,$ef,$0f,$ef,$0f,$ef,$0f,$ef,$07,$f7 + db $00,$fd,$00,$f8,$07,$f7,$0f,$ef,$0c,$ec,$0c,$ec,$0f,$ef,$07,$f7 db $00,$e0,$00,$40,$80,$80,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$80,$80 db $00,$f8,$00,$f7,$00,$f7,$00,$f7,$00,$f7,$00,$f7,$00,$f7,$00,$07 db $00,$00,$00,$80,$00,$80,$00,$80,$00,$80,$00,$80,$00,$80,$00,$80 @@ -74,11 +74,11 @@ Coins10: db $00,$00,$00,$c0,$00,$38,$00,$06,$00,$04,$00,$04,$00,$04,$00,$04 db $0f,$0f,$0f,$ef,$06,$46,$00,$e0,$00,$a4,$00,$a6,$00,$a6,$00,$ff db $00,$11,$00,$15,$00,$d5,$00,$10,$00,$10,$00,$52,$00,$13,$00,$f3 - db $80,$84,$c0,$c4,$e0,$e7,$e0,$e7,$c0,$c7,$80,$87,$00,$05,$00,$05 + db $80,$84,$c0,$c4,$60,$67,$60,$67,$c0,$c7,$80,$87,$00,$05,$00,$05 db $00,$1c,$03,$1b,$07,$17,$07,$17,$03,$0b,$00,$0c,$00,$07,$00,$07 db $00,$0b,$00,$77,$80,$bb,$80,$bb,$00,$7d,$00,$fe,$00,$7f,$00,$bf db $00,$07,$00,$02,$01,$01,$03,$03,$03,$03,$03,$03,$03,$03,$01,$01 - db $00,$bf,$00,$1f,$e0,$ef,$f0,$f7,$f0,$f7,$f0,$f7,$f0,$f7,$e0,$ef + db $00,$bf,$00,$1f,$e0,$ef,$f0,$f7,$30,$37,$30,$37,$f0,$f7,$e0,$ef db $00,$00,$00,$01,$00,$01,$00,$01,$00,$01,$00,$01,$00,$01,$00,$01 db $00,$1f,$00,$ef,$00,$ef,$00,$ef,$00,$ef,$00,$ef,$00,$ef,$00,$e0 db $00,$ff,$00,$ff,$00,$ff,$00,$e0,$00,$a0,$00,$ff,$00,$00,$00,$00 @@ -91,7 +91,7 @@ Coins10: db $00,$00,$00,$00,$00,$00,$00,$ff,$00,$ff,$00,$1f,$c0,$c0,$f0,$f0 db $00,$01,$00,$01,$00,$01,$00,$c0,$00,$e0,$00,$e1,$00,$e1,$00,$e1 db $00,$e2,$00,$e2,$00,$e2,$00,$e2,$00,$e2,$00,$e2,$00,$e2,$00,$e2 - db $f8,$f8,$f8,$f8,$fc,$fc,$fc,$fc,$fc,$fc,$fc,$fc,$f8,$f8,$f8,$f8 + db $78,$78,$78,$78,$3c,$3c,$84,$84,$9c,$9c,$3c,$3c,$98,$98,$d8,$d8 db $00,$e1,$00,$e1,$00,$e1,$00,$e1,$00,$e1,$00,$e1,$00,$e1,$00,$e1 db $f0,$f0,$c0,$c0,$00,$1f,$00,$1f,$00,$0f,$00,$00,$00,$00,$00,$00 db $00,$e1,$00,$e1,$00,$e1,$00,$e1,$00,$c1,$00,$01,$00,$01,$00,$01 @@ -106,10 +106,10 @@ Coins10: db $00,$e2,$00,$e2,$00,$e3,$00,$e1,$00,$e0,$00,$e0,$00,$e0,$00,$e3 db $00,$e4,$00,$e4,$00,$e4,$00,$e4,$00,$04,$00,$04,$00,$04,$00,$85 db $00,$e4,$00,$e4,$00,$e4,$00,$e4,$00,$e4,$00,$e4,$00,$e4,$00,$e4 - db $80,$84,$c0,$c4,$e0,$e4,$e0,$e4,$c0,$c4,$80,$84,$00,$04,$00,$04 + db $80,$84,$c0,$c4,$60,$64,$60,$64,$c0,$c4,$80,$84,$00,$04,$00,$04 db $00,$a0,$00,$a6,$00,$a6,$00,$a6,$00,$a6,$00,$a6,$00,$a0,$00,$a0 db $00,$04,$00,$64,$00,$64,$00,$64,$00,$64,$00,$65,$00,$06,$00,$06 - db $01,$21,$03,$23,$07,$27,$07,$27,$03,$23,$01,$21,$00,$20,$00,$20 + db $01,$21,$03,$23,$06,$26,$06,$26,$03,$23,$01,$21,$00,$20,$00,$20 db $00,$20,$00,$26,$00,$26,$00,$26,$00,$26,$00,$a6,$00,$60,$00,$60 db $00,$05,$00,$65,$00,$65,$00,$65,$00,$65,$00,$65,$00,$05,$00,$05 db $00,$bf,$00,$c0,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff diff --git a/cups03.inc b/cups03.inc index ea8b41b..3b245e3 100644 --- a/cups03.inc +++ b/cups03.inc @@ -41,44 +41,26 @@ Cups03: db $07,$87,$0f,$8f,$0f,$cf,$0f,$cf,$0f,$cf,$0f,$ef,$0f,$ef,$0f,$ef db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff db $00,$1f,$00,$1f,$00,$1f,$00,$1f,$80,$9e,$80,$9c,$80,$98,$80,$90 - db $00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f + db $00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$20,$2f,$20,$2f db $0f,$ef,$0f,$ef,$0f,$ef,$0f,$ef,$0f,$ef,$07,$e7,$03,$fb,$01,$fd db $c0,$df,$e0,$ef,$f0,$f7,$f8,$f8,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff db $00,$fe,$00,$fe,$01,$fd,$03,$7b,$87,$87,$fe,$fe,$fc,$fd,$f8,$f9 db $80,$80,$80,$80,$80,$80,$80,$80,$00,$00,$01,$e1,$07,$f7,$04,$f4 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$fe,$fe,$07,$07,$07,$77 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80 - db $10,$17,$18,$1b,$1c,$1d,$0e,$0e,$07,$07,$01,$01,$00,$00,$00,$00 - db $00,$fe,$00,$fe,$00,$f8,$00,$f0,$07,$27,$cf,$cf,$cf,$cf,$0f,$0f - db $0f,$0f,$00,$00,$00,$00,$00,$00,$f8,$f8,$ff,$ff,$ff,$ff,$ff,$ff - db $f0,$f1,$00,$01,$00,$01,$00,$01,$00,$01,$02,$02,$83,$83,$c3,$c3 + db $30,$37,$38,$3b,$3c,$3d,$1e,$1e,$1f,$1f,$0f,$0f,$03,$03,$00,$00 + db $00,$fe,$00,$fe,$00,$f8,$00,$f0,$08,$28,$d8,$d8,$f0,$f0,$00,$00 + db $1f,$1f,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$3c,$3c,$7f,$7f + db $f0,$f1,$00,$01,$00,$01,$00,$01,$00,$01,$02,$02,$03,$03,$83,$83 db $00,$f0,$00,$f3,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7e,$81,$81 db $c0,$c0,$c0,$c0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$f0,$f0,$f0,$f0 - db $0f,$0f,$1f,$1f,$1f,$1f,$1f,$1f,$1f,$1f,$1f,$1f,$0f,$0f,$0f,$0f - db $e3,$e3,$f1,$f1,$f0,$f0,$f8,$f8,$f8,$f8,$fc,$fc,$fc,$fc,$fc,$fc + db $c3,$c3,$e1,$e1,$f0,$f0,$f8,$f8,$fc,$fc,$fc,$fc,$fe,$fe,$fe,$fe db $ff,$ff,$ff,$ff,$ff,$ff,$7f,$7f,$3f,$3f,$1f,$1f,$0f,$0f,$07,$07 - db $0f,$0f,$07,$07,$07,$07,$03,$03,$03,$03,$01,$01,$00,$00,$00,$01 - db $fc,$fc,$f8,$f8,$f8,$f8,$f0,$f0,$e0,$e0,$e0,$e0,$c0,$c0,$00,$00 + db $07,$07,$07,$07,$07,$07,$03,$03,$01,$01,$00,$00,$00,$07,$00,$3f db $01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 db $ff,$ff,$00,$00,$00,$0f,$00,$0f,$00,$07,$00,$07,$00,$03,$00,$03 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01 - db $00,$0f,$00,$1f,$00,$1f,$00,$1f,$00,$0f,$00,$0f,$e0,$ef,$f0,$f7 - db $00,$f8,$00,$fc,$00,$fe,$00,$fe,$00,$fe,$00,$fe,$00,$fe,$00,$fe - db $f8,$fb,$3c,$3f,$0c,$0f,$00,$03,$00,$03,$00,$03,$00,$03,$00,$03 - db $00,$fc,$00,$f8,$00,$fc,$00,$fc,$00,$fc,$00,$fc,$00,$fc,$00,$fc db $03,$fb,$03,$fb,$03,$fb,$07,$e7,$1f,$df,$3f,$bf,$7f,$7f,$ff,$ff - db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$0f,$0f,$07,$f7 - db $00,$fc,$00,$fe,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$00,$80,$00,$80 - db $00,$00,$00,$00,$00,$03,$00,$07,$00,$3f,$00,$7f,$00,$ff,$00,$ff - db $00,$1f,$00,$3f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe - db $00,$c0,$00,$c0,$00,$c0,$00,$c0,$00,$c0,$00,$80,$00,$00,$00,$00 - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$fc,$00,$f0 - db $00,$f8,$00,$f0,$00,$e0,$00,$c0,$00,$80,$00,$00,$00,$00,$00,$00 - db $00,$ff,$00,$ff,$00,$fe,$00,$f8,$00,$80,$00,$80,$00,$00,$00,$00 - db $00,$c0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$3f,$3f,$1f,$df,$0f,$ef db $00,$f8,$00,$f0,$00,$f0,$00,$e0,$00,$e0,$00,$f0,$00,$f0,$00,$f0 db $00,$f8,$00,$f8,$00,$fc,$00,$fc,$00,$fc,$00,$fc,$00,$fc,$00,$fe db $00,$fe,$00,$fe,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7f @@ -90,34 +72,49 @@ Cups03: db $00,$80,$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,$18,$00,$3c,$00,$3c db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$fc,$00,$f8 - db $00,$03,$00,$03,$00,$03,$00,$03,$00,$03,$00,$03,$00,$03,$00,$03 db $00,$e0,$00,$c0,$00,$80,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00 db $f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$e0,$e8,$c0,$cd,$c0,$df,$c0,$df db $00,$1f,$00,$3f,$00,$7f,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff db $80,$bf,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$01,$fd,$03,$fb db $00,$fc,$00,$f0,$00,$80,$40,$40,$60,$60,$e0,$e0,$e0,$e0,$e0,$e0 db $00,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $07,$e7,$1f,$1f,$ff,$ff,$ff,$ff,$7f,$7f,$00,$00,$00,$00,$00,$00 + db $07,$e7,$1f,$1f,$ff,$ff,$ff,$ff,$7c,$7c,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$01,$00,$03,$00,$03,$00,$07,$00,$0f,$00,$1f - db $e0,$e0,$e0,$e0,$c0,$c0,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00 + db $e0,$e0,$c0,$c0,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $07,$f7,$00,$f8,$00,$f8,$00,$f8,$00,$f8,$00,$f8,$00,$f8,$00,$f0 + db $00,$00,$01,$01,$01,$01,$03,$03,$03,$03,$07,$07,$07,$07,$07,$07 + db $ff,$ff,$ff,$ff,$fe,$fe,$fe,$fe,$fc,$fc,$f8,$f8,$f0,$f0,$e0,$e0 + db $80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$03,$03,$03,$03,$01,$01 + db $00,$7f,$00,$7f,$00,$7f,$00,$3f,$80,$bf,$80,$bf,$c0,$df,$e0,$ef + db $f0,$ff,$30,$3f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f + db $00,$e0,$00,$f0,$00,$f0,$00,$f0,$00,$f0,$00,$f0,$00,$f0,$00,$f0 + db $00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$7f + db $00,$f8,$00,$f8,$00,$fc,$00,$fc,$00,$fe,$00,$fe,$00,$fe,$00,$ff + db $00,$00,$00,$0f,$00,$1f,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$fc,$00,$f8,$00,$e0 + db $00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$f8,$00,$f0,$00,$c0,$00,$00 + db $00,$c0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$fe,$00,$f8,$00,$e0,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 .KeyArtTilesEnd: .BackgroundCopy: ; tiles start at 26 - db $51, $53, $1a, $1a, $1a, $1a, $1a, $1a - db $47, $1a, $1a, $1a, $1a, $1a, $1a, $1a - db $48, $1a, $1a, $1a, $50, $1a, $1a, $1a - db $49, $1b, $1c, $1d, $4d, $4e, $1a, $1a - db $4a, $1e, $4b, $4c, $20, $4f, $1a, $1a + db $3f, $40, $1a, $1a, $1a, $1a, $1a, $1a + db $35, $1a, $1a, $1a, $1a, $1a, $1a, $1a + db $36, $1a, $1a, $1a, $3e, $1a, $1a, $1a + db $37, $1b, $1c, $1d, $3b, $3c, $1a, $1a + db $38, $1e, $39, $3a, $20, $3d, $1a, $1a db $21, $22, $23, $24, $25, $26, $27, $1a - db $28, $29, $2a, $2b, $2c, $3a, $2d, $5a - db $1a, $2e, $1f, $2f, $30, $1f, $54, $55 - db $1a, $31, $3b, $32, $33, $34, $56, $57 - db $35, $36, $37, $1a, $1a, $58, $59, $5b - db $1a, $38, $39, $1a, $1a, $1a, $1a, $1a - db $1a, $52, $3c, $3d, $1a, $1a, $1a, $1a - db $3e, $3f, $40, $41, $1a, $1a, $1a, $1a - db $42, $43, $44, $1a, $1a, $1a, $1a, $1a - db $45, $46, $1a, $1a, $1a, $1a, $1a, $1a + db $28, $29, $2a, $2b, $2c, $33, $2d, $47 + db $1a, $4a, $1f, $2e, $2f, $1f, $41, $42 + db $1a, $30, $34, $4b, $31, $32, $43, $44 + db $4d, $4e, $49, $4c, $1a, $45, $46, $48 + db $1a, $4f, $50, $1a, $1a, $1a, $1a, $1a + db $1a, $51, $52, $1a, $1a, $1a, $1a, $1a + db $53, $54, $55, $1a, $1a, $1a, $1a, $1a + db $54, $56, $57, $1a, $1a, $1a, $1a, $1a + db $58, $1a, $1a, $1a, $1a, $1a, $1a, $1a db $1a, $1a, $1a, $1a, $1a, $1a, $1a, $1a .BackgroundCopyEnd: \ No newline at end of file diff --git a/main.asm b/main.asm index 78e0474..31d521b 100644 --- a/main.asm +++ b/main.asm @@ -58,6 +58,7 @@ rMYBTNP: db ;EQU rMYBTN + 1 rDELTAT: db ; EQU rMYBTNP + 1 ; delta_t where $1000 = 1 second rLFSR: dw ; equ rDELTAT + 1 ; 16 bit rDeviceType: db ; 0 if we're on dmg, 1 if we're on cgb +rROMBank: db ; mirror of what bank is currently loaded by main stuff POPS @@ -558,13 +559,13 @@ AdjustOBP0: ret AdjustOBP1: - ldh a, [rOBP1] - ld d, a ; take d from a, assuming a is a palette we wanted to use - ld a, [rDeviceType] cp a, 0 ret z ; if we're in DMG mode, we don't need to do anything. else... + ldh a, [rOBP1] + ld d, a ; take d from a, assuming a is a palette we wanted to use + ld a, %1000_1000 ; we want to start at obp palette 0b1000 (byte 8, bc 4 colors and 2 bytes per color?) and autoincrement BGPI_AUTOINC ldh [rOCPS], a ; set that diff --git a/source.zip b/source.zip index 69c0ca7ceba558f3721152b7929f3f66b3432f73..4e577ae820d8dc3401652fcdf91679ff9824d333 100644 GIT binary patch delta 13467 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 delta 11215 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 diff --git a/swords07.inc b/swords07.inc index b57826a..b33c8bc 100644 --- a/swords07.inc +++ b/swords07.inc @@ -34,49 +34,47 @@ Swords07: .KeyArtTiles: db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $c0,$c0,$00,$00,$00,$00,$00,$07,$00,$0f,$00,$1f,$00,$3f,$00,$7e - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$3e,$00,$3f - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$ff,$00,$ff - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$00,$3f,$00,$ff,$00,$ff - db $00,$00,$00,$01,$00,$03,$00,$03,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $c0,$df,$00,$3f,$00,$f8,$00,$f7,$00,$ef,$00,$df,$00,$bf,$00,$7e + db $00,$ff,$00,$ff,$00,$ff,$00,$7f,$00,$7f,$00,$41,$00,$3e,$00,$3f + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$00,$00,$ff,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$fc,$00,$c3,$00,$3f,$00,$ff,$00,$ff + db $00,$fe,$00,$fd,$00,$fb,$00,$03,$00,$ff,$00,$ff,$00,$ff,$00,$ff db $00,$fd,$00,$f3,$00,$ef,$00,$df,$00,$dc,$00,$92,$00,$de,$00,$dd db $00,$bf,$00,$3f,$00,$5f,$00,$0f,$00,$77,$00,$db,$00,$85,$00,$ca - db $00,$00,$00,$80,$00,$80,$00,$c0,$00,$e0,$00,$e0,$00,$e0,$00,$c0 - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$f0,$00,$c0 - db $00,$db,$00,$df,$00,$df,$00,$ef,$00,$ef,$00,$81,$00,$00,$00,$00 - db $00,$93,$00,$86,$00,$fc,$00,$ff,$00,$ff,$00,$ff,$00,$1f,$00,$1f - db $00,$00,$00,$00,$00,$00,$00,$80,$00,$c0,$00,$c0,$01,$c1,$01,$81 - db $00,$00,$00,$00,$00,$00,$00,$00,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0 - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe - db $00,$ff,$00,$fe,$00,$f8,$00,$f0,$00,$e0,$00,$c0,$00,$00,$00,$00 - db $00,$1f,$00,$0e,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$00,$01 - db $03,$03,$03,$03,$01,$81,$00,$86,$00,$ce,$00,$ce,$00,$ce,$00,$de - db $e0,$e0,$e0,$e0,$e0,$e0,$c0,$c0,$c0,$c0,$c0,$c0,$80,$80,$80,$80 - db $00,$f8,$00,$f0,$00,$e0,$00,$c0,$00,$80,$00,$80,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01 - db $00,$1e,$00,$3e,$00,$3f,$00,$7f,$00,$7f,$00,$fe,$00,$7e,$00,$7f - db $80,$80,$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,$01,$01,$01,$01,$01,$01 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80,$fc,$fc,$ff,$ff - db $02,$02,$02,$02,$06,$06,$06,$06,$0c,$0d,$0c,$0d,$1e,$1e,$9f,$9f - db $00,$ff,$00,$e7,$08,$eb,$18,$d8,$30,$b1,$70,$71,$f0,$f1,$e0,$e0 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$00,$07 - db $7f,$7f,$00,$00,$00,$07,$00,$1f,$00,$3f,$00,$7f,$00,$ff,$00,$ff + db $00,$7f,$00,$bf,$00,$bf,$00,$df,$00,$ef,$00,$ef,$00,$ef,$00,$df + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$f0,$00,$cf + db $00,$db,$00,$df,$00,$df,$00,$ef,$00,$ef,$00,$91,$00,$7e,$00,$ff + db $00,$93,$00,$86,$00,$fc,$00,$ff,$00,$ff,$00,$ff,$00,$1f,$00,$df + db $00,$3f,$00,$ff,$00,$7f,$00,$bf,$00,$de,$00,$de,$01,$dd,$01,$bd + db $00,$ff,$00,$ff,$00,$ff,$00,$1f,$e0,$ef,$e0,$ef,$e0,$ef,$e0,$ef + db $00,$ff,$00,$fe,$00,$f9,$00,$f7,$00,$ef,$00,$df,$00,$3f,$00,$ff + db $00,$df,$00,$ee,$00,$f0,$00,$fe,$00,$fe,$00,$fe,$00,$fd,$00,$fd + db $03,$7b,$03,$7b,$01,$b9,$00,$b6,$00,$ce,$00,$ce,$00,$ce,$00,$de + db $e0,$ef,$e0,$ef,$e0,$ef,$c0,$df,$c0,$df,$c0,$df,$80,$bf,$80,$bf + db $00,$f9,$00,$f7,$00,$ef,$00,$df,$00,$bf,$00,$bf,$00,$7f,$00,$ff + db $00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$ff,$01,$fd + db $00,$1e,$00,$be,$00,$bf,$00,$7f,$00,$7f,$00,$fe,$00,$7e,$00,$7f + db $80,$bf,$00,$7f,$00,$7f,$00,$7f,$00,$7f,$00,$ff,$00,$ff,$00,$7f + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$01,$fd,$01,$fd,$01,$fd + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7f,$80,$83,$fc,$fc,$ff,$ff + db $02,$fa,$02,$fa,$06,$f6,$06,$f6,$0c,$ed,$0c,$ed,$1e,$5e,$9f,$9f + db $00,$ff,$00,$e7,$08,$eb,$18,$d8,$30,$b5,$70,$75,$f0,$f5,$e0,$ee + db $00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$f9,$00,$f7 + db $7f,$7f,$00,$80,$00,$e7,$00,$df,$00,$bf,$00,$7f,$00,$ff,$00,$ff db $ff,$ff,$7f,$7f,$00,$80,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $e0,$e0,$fc,$fc,$ff,$ff,$0f,$0f,$00,$f0,$00,$fc,$00,$fe,$00,$fe - db $00,$00,$00,$00,$e2,$e2,$fe,$fe,$fe,$fe,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$00,$ff,$00,$ff,$00,$ff - db $00,$00,$00,$00,$00,$01,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff - db $00,$0f,$00,$3f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $e0,$e3,$fc,$fc,$ff,$ff,$0f,$0f,$00,$f0,$00,$fd,$00,$fe,$00,$fe + db $00,$ff,$00,$1d,$e2,$e2,$fe,$fe,$fe,$fe,$00,$01,$00,$ff,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$fc,$00,$03,$00,$ff,$00,$ff,$00,$ff + db $00,$ff,$00,$fe,$00,$81,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$cf,$00,$3f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$0f,$e0,$ef - db $00,$fe,$00,$fe,$00,$fe,$00,$fc,$00,$fc,$00,$fc,$00,$fc,$00,$f8 - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$f8,$00,$c0 - db $01,$fd,$03,$fb,$03,$f3,$07,$e7,$07,$c7,$0f,$0f,$0f,$0f,$00,$00 - db $f0,$f7,$f0,$f3,$f8,$fb,$f8,$fb,$f0,$f7,$e0,$ef,$c0,$df,$00,$0f - db $00,$f8,$00,$f8,$00,$f8,$00,$f0,$00,$f0,$00,$c0,$00,$80,$00,$00 - db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$f8,$00,$e0,$00,$80 - db $00,$ff,$00,$f8,$00,$e0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00 + db $00,$fe,$00,$fe,$00,$fe,$00,$fd,$00,$fd,$00,$fd,$00,$fd,$00,$fb + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$f9,$00,$c7 + db $01,$fd,$03,$fb,$03,$f3,$07,$e7,$07,$d7,$0f,$2f,$0f,$ef,$00,$f0 + db $f0,$f7,$f0,$f3,$f8,$fb,$f8,$fb,$f0,$f7,$e0,$ef,$c0,$df,$00,$2f + db $00,$fb,$00,$fb,$00,$fb,$00,$f7,$00,$f7,$00,$cf,$00,$bf,$00,$7f + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$f9,$00,$e7,$00,$9f + db $00,$ff,$00,$f8,$00,$e7,$00,$9f,$00,$7f,$00,$ff,$00,$ff,$00,$ff db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$03,$04,$04 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$e0,$e0,$60,$60 db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$00,$00 @@ -104,39 +102,48 @@ Swords07: db $80,$80,$80,$80,$80,$80,$c0,$c0,$60,$60,$30,$30,$00,$00,$00,$00 db $21,$21,$11,$11,$0f,$0f,$06,$06,$1d,$1d,$30,$30,$00,$00,$00,$00 db $bb,$bb,$e0,$e0,$a0,$a0,$e0,$e0,$e0,$e0,$e0,$e0,$70,$70,$70,$70 - db $e1,$e1,$e1,$e1,$70,$70,$30,$30,$38,$38,$18,$18,$1c,$1c,$0c,$0c - db $80,$80,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$60,$60,$60,$60,$60,$60 + db $e1,$e1,$e1,$e1,$70,$70,$30,$30,$38,$38,$18,$18,$1c,$1c,$0c,$0d + db $80,$80,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$60,$60,$60,$67,$60,$6f db $c3,$c3,$c3,$c3,$c7,$c7,$cf,$cf,$de,$de,$dc,$dc,$d8,$d8,$d8,$d8 db $d0,$d0,$b0,$b0,$b0,$b0,$60,$60,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0 - db $30,$30,$38,$38,$18,$18,$1c,$1c,$0c,$0c,$0e,$0e,$06,$06,$07,$07 - db $0e,$0e,$06,$06,$07,$07,$03,$03,$03,$03,$01,$01,$01,$01,$00,$00 - db $60,$60,$70,$70,$30,$30,$00,$00,$80,$80,$80,$80,$c0,$c0,$c0,$c0 - db $01,$01,$01,$01,$05,$05,$0d,$0d,$01,$01,$01,$01,$01,$01,$00,$00 - db $d0,$d0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$80,$80,$00,$00 - db $e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$60,$60,$00,$00,$00,$00 - db $03,$03,$03,$03,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - db $00,$00,$80,$80,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + db $30,$30,$38,$39,$18,$1b,$1c,$5d,$0c,$ed,$0e,$ee,$06,$f6,$07,$f7 + db $0e,$6e,$06,$f6,$07,$f7,$03,$fb,$03,$fb,$01,$fd,$01,$fd,$00,$7e + db $60,$6f,$70,$77,$30,$37,$00,$4f,$80,$bf,$80,$bf,$c0,$df,$c0,$df + db $01,$fd,$01,$f9,$05,$f5,$0d,$ed,$01,$f1,$01,$fd,$01,$fd,$00,$fe + db $d0,$d6,$c0,$ce,$c0,$de,$c0,$de,$c0,$de,$c0,$df,$80,$bf,$00,$7f + db $e0,$e0,$e0,$e0,$e0,$ef,$e0,$ef,$e0,$ef,$60,$6f,$00,$9f,$00,$ff + db $03,$fb,$03,$fb,$01,$fd,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$7e,$80,$bf,$80,$bf,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$00,$07,$00,$3f,$00,$ff + db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$f9,$01,$fd + db $00,$00,$00,$07,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$3f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7f + db $00,$7f,$00,$7f,$00,$7f,$00,$ff,$00,$7f,$00,$7f,$00,$7f,$00,$ff + db $00,$f0,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff + db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe .KeyArtTilesEnd: .BackgroundCopy: - db $1a, $46, $47, $1a, $48, $49, $4a, $1a - db $1a, $4b, $4c, $4d, $4e, $4f, $50, $51 - db $1a, $52, $53, $1a, $54, $55, $56, $57 - db $58, $59, $5a, $5b, $4e, $5c, $5d, $5e - db $5f, $60, $61, $62, $4e, $63, $64, $1a - db $1a, $65, $66, $67, $68, $69, $6a, $1a - db $1a, $6b, $6c, $1b, $1c, $1a, $1a, $1a - db $1d, $1e, $1f, $20, $21, $22, $1a, $1a - db $23, $23, $24, $25, $26, $27, $28, $1a - db $29, $2a, $1a, $1a, $2b, $2c, $2d, $1a - db $2e, $1a, $1a, $1a, $2f, $30, $31, $1a - db $1a, $1a, $32, $33, $34, $35, $1a, $1a - db $1a, $1a, $36, $37, $38, $39, $3a, $1a - db $3b, $3c, $3d, $29, $3e, $3f, $1a, $1a - db $23, $23, $40, $41, $42, $43, $1a, $1a - db $44, $45, $1a, $1a, $1a, $1a, $1a, $1a + db $1a, $44, $45, $1a, $46, $47, $48, $1a + db $1a, $49, $4a, $4b, $4c, $4d, $4e, $4f + db $1a, $50, $51, $1a, $52, $53, $54, $55 + db $56, $57, $58, $59, $4c, $5a, $5b, $5c + db $5d, $5e, $5f, $60, $6c, $61, $62, $1a + db $6b, $63, $64, $65, $66, $67, $68, $6d + db $6e, $69, $6a, $1b, $1c, $70, $6e, $6e + db $1d, $1e, $1f, $20, $21, $22, $6e, $6e + db $6e, $6e, $23, $24, $25, $26, $27, $6e + db $73, $28, $6f, $6e, $29, $2a, $2b, $6e + db $2c, $6e, $6e, $6e, $2d, $2e, $2f, $6e + db $6e, $6e, $30, $31, $32, $33, $71, $6e + db $6e, $6e, $34, $35, $36, $37, $38, $6e + db $39, $3a, $3b, $73, $3c, $3d, $6e, $6e + db $6e, $6e, $3e, $3f, $40, $41, $6e, $6e + db $42, $43, $6f, $6e, $72, $6e, $6e, $6e .BackgroundCopyEnd: \ No newline at end of file