small art fixes

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]  

CardHelpers.inc

@@ -91,7 +91,6 @@ 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
@@ -113,20 +112,13 @@ CardPreload: ; maybe we should do a non-async preload task that empties the hand
 
 LoadCardData:
 LoadCardDataAsync: 
-  ld a, [vSelectedCardIndex]
+  ld a, [vCurrentCardReversed]
-  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 
   
   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
@@ -390,11 +382,6 @@ LoadReversed: ; same as LoadRightSideUp but loads in the reversed data
   
   ret
 
-ReverseString:
-  db 10, "(reversed)"
-EmptyString:
-  db 10, "          "
-
 CardInit:
   ldh a, [rLCDC]
   and a, %1111_1011

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
+vPreviousCardIndex: db
-vPrintJobState: db ; start, wait til ready, top row, row a, wait, printing, bottom row
-vPrintingRow: db
-vExposureSetting: db
 POPS
 
 ScreenCardBrowse:
@@ -92,14 +88,9 @@ CardBrowseUpdate:
   ld hl, rMYBTNP
   bit 4, [hl]
   jp z, .doneWithA
-    ld a, [vSelectedCardIndex]
+    ld a, [vCurrentCardReversed]
-    ld b, 0 
-    ld c, a 
-    ld hl, DECK_FLIPS+1
-    add hl, bc 
-    ld a, [hl]
     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, :+
@@ -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,$00,$80,$00,$be,$00,$9c,$00,$88,$00,$88,$00,$9c,$00,$00
-	db $00,$00,$10,$90,$10,$90,$10,$90,$10,$90,$38,$b8,$10,$90,$00,$00
+	db $00,$00,$00,$88,$00,$88,$00,$88,$00,$88,$00,$9c,$00,$88,$00,$00
-	db $00,$00,$1c,$9c,$3e,$be,$3e,$be,$3e,$be,$1c,$9c,$00,$80,$00,$00
+	db $00,$00,$00,$9c,$00,$be,$00,$be,$00,$be,$00,$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,$8c,$00,$8c,$00,$8c,$00,$88,$00,$88,$00,$88,$00,$00
 CardBrowse.PrinterTilesEnd: ; $22
 
 

ScreenCardRead.inc

@@ -1,7 +1,4 @@
-PUSHS UNION "Screen Variables", WRAM0[SCREEN_VARS_START]
+; also uses variables from ScreenSpreadSelect which always comes before this
-ds 16 ; why are we putting this so far in? i don't remember but whatever
-vPreviousCardIndex: db
-POPS
 
 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

ScreenMainMenu.inc

@@ -1,12 +1,16 @@
 PUSHS UNION "Global Variables", WRAM0[GLOBAL_VARS_START]
-vCurrentSpread: dw
+vSelectedSpreadIndex: db ; the index of the spread we have selected?
-vSelectedSpreadIndex: db
+vCurrentSpread: dw ; the address of the currently selected spread
-vSelectedSpreadCard: db
+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
+vCurrentCardReversed: db ; whether the currently displayed card should be displayed reversed
-vFrameCountSquares: db
+
+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, [Coords]
-  ld a, [hl]
   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, [Coords]
-  ld a, [hl]
   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 [vSelectedCardIndex], a 
-    ld hl, ScreenSpreadSelect
+    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
+  ld hl, Coords + 1
-  inc hl
   ld b, 0 
   ld a, [vFrameCount1]
   ld c, a 
@@ -304,8 +306,7 @@ MainMenuUpdate:
   ld hl, MY_OAM
   call DrawWholeCard
   
-  ld hl, Coords
+  ld hl, Coords + 1
-  inc hl
   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
+  ld hl, Coords + 1
-  inc hl
   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
+  jp c, .skipThisTile ; left edge < 54 => dont draw
-  cp a, 8-8+109 ; right edge < 120 => do draw
+  cp a, 8-8+109 
-  jp c, .dontSkip
+  jp c, .dontSkip ; right edge < 109 => do draw
-  jp .skipThisTile
+  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 
+  cp a, 8+42
-  jp c, .dontSkip
+  jp c, .dontSkip ; x > 42 => draw middle tile
-  cp a, 8+80 ; left edge < 80 => skip
+  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 
+  cp a, 8+48
-  jp c, .dontSkip
+  jp c, .dontSkip ; x > 47 => draw right tile
-  cp a, 8+80 ; left edge < 80 => skip
+  cp a, 8+80 
-  jp c, .skipThisTile
+  jp c, .skipThisTile ; x > 80 => dont draw right tile
-  ;cp a, 8-17 + 100 ; right edge < 100 => draw
+  cp a, 8-8 + 121 
-  ;jp c, .dontSkip ; we can comment this one out because wee dont atm need to 
+  jp c, .skipThisTile ; x > 121 => dont draw right tile
-  ; worry about drawing 17-wides in the middle
-  cp a, 8-8 + 121 ; right edge < 120 => skip
-  jp c, .skipThisTile
   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:
 

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
+vState: db 
-vCurrentAnimation: dw ;def vCurrentAnimation EQU vState+1 ; 2 bytes
+vShuffleIndex: db 
-vShuffleIndex: db ;def vShuffleIndex equ vCurrentAnimation+2
+vShuffleTime: dw 
-vShuffleTime: dw ;def vShuffleTime equ vShuffleIndex+1 ; 2 bytes
 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]
+    bit 4, [hl] ; check for A press
-    jp z, .doneWithB
+    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

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

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,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$03,$83
-	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,$00,$ff,$ff,$e0,$e0,$c0,$df
-	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,$e0,$e0,$30,$30,$18,$d8
-	db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$18,$00,$1d
+	db $07,$87,$0f,$8f,$0f,$cf,$0f,$cf,$0f,$cf,$0f,$ef,$0f,$ef,$0f,$ef
-	db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$40,$00,$e0,$00,$f0
+	db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff
-	db $00,$00,$00,$00,$00,$0e,$00,$1e,$00,$3e,$00,$6a,$00,$7e,$00,$f8
+	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,$07,$00,$01,$00,$01
+	db $00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$20,$2f,$20,$2f
-	db $00,$fb,$00,$fb,$00,$fb,$00,$fb,$00,$fb,$00,$fb,$00,$f9,$00,$f4
+	db $0f,$ef,$0f,$ef,$0f,$ef,$0f,$ef,$0f,$ef,$07,$e7,$03,$fb,$01,$fd
-	db $00,$e0,$00,$e0,$00,$e0,$00,$e0,$00,$c0,$00,$c0,$00,$d0,$00,$dc
+	db $c0,$df,$e0,$ef,$f0,$f7,$f8,$f8,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff
-	db $00,$1f,$00,$1f,$00,$1f,$00,$0f,$00,$0f,$00,$0f,$00,$0f,$00,$0f
+	db $00,$fe,$00,$fe,$01,$fd,$03,$7b,$87,$87,$fe,$fe,$fc,$fd,$f8,$f9
-	db $00,$e0,$00,$e0,$00,$c0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00
+	db $80,$80,$80,$80,$80,$80,$80,$80,$00,$00,$01,$e1,$07,$f7,$04,$f4
-	db $00,$00,$00,$00,$3f,$3f,$3f,$3f,$1f,$1f,$0f,$0f,$07,$07,$03,$03
+	db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$fe,$fe,$07,$07,$07,$77
-	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,$00,$00,$00,$00,$00,$00,$00,$80,$80
-	db $00,$00,$00,$00,$00,$00,$00,$01,$00,$01,$00,$01,$00,$03,$00,$03
+	db $30,$37,$38,$3b,$3c,$3d,$1e,$1e,$1f,$1f,$0f,$0f,$03,$03,$00,$00
-	db $00,$02,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff
+	db $00,$fe,$00,$fe,$00,$f8,$00,$f0,$08,$28,$d8,$d8,$f0,$f0,$00,$00
-	db $00,$06,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff
+	db $1f,$1f,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$3c,$3c,$7f,$7f
-	db $00,$df,$00,$3f,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff
+	db $f0,$f1,$00,$01,$00,$01,$00,$01,$00,$01,$02,$02,$03,$03,$83,$83
-	db $00,$0f,$00,$8f,$00,$cf,$00,$e1,$00,$fe,$00,$ff,$00,$ff,$00,$ff
+	db $00,$f0,$00,$f3,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7e,$81,$81
-	db $00,$00,$00,$80,$00,$80,$00,$80,$00,$00,$00,$80,$00,$c0,$00,$c0
+	db $c0,$c0,$c0,$c0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$f0,$f0,$f0,$f0
-	db $01,$01,$00,$00,$00,$00,$00,$01,$00,$01,$00,$01,$00,$01,$00,$01
+	db $c3,$c3,$e1,$e1,$f0,$f0,$f8,$f8,$fc,$fc,$fc,$fc,$fe,$fe,$fe,$fe
-	db $e0,$e0,$c0,$c0,$00,$00,$00,$e0,$00,$f0,$00,$ff,$00,$ff,$00,$ff
+	db $ff,$ff,$ff,$ff,$ff,$ff,$7f,$7f,$3f,$3f,$1f,$1f,$0f,$0f,$07,$07
-	db $00,$07,$00,$1f,$00,$3f,$00,$3f,$00,$7f,$00,$7f,$00,$bf,$00,$bf
+	db $07,$07,$07,$07,$07,$07,$03,$03,$01,$01,$00,$00,$00,$07,$00,$3f
-	db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff
+	db $01,$01,$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,$fe,$00,$fc,$00,$fc
+	db $ff,$ff,$00,$00,$00,$0f,$00,$0f,$00,$07,$00,$07,$00,$03,$00,$03
-	db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$1f,$00,$00,$00,$00,$00,$00
+	db $03,$fb,$03,$fb,$03,$fb,$07,$e7,$1f,$df,$3f,$bf,$7f,$7f,$ff,$ff
-	db $00,$c0,$00,$c0,$00,$c0,$00,$c0,$00,$80,$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,$01,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$03,$03,$01,$01
+	db $00,$f8,$00,$f0,$00,$f0,$00,$e0,$00,$e0,$00,$f0,$00,$f0,$00,$f0
-	db $00,$ff,$00,$07,$00,$00,$00,$00,$c0,$c0,$e0,$e0,$f0,$f0,$e0,$e0
+	db $00,$f8,$00,$f8,$00,$fc,$00,$fc,$00,$fc,$00,$fc,$00,$fc,$00,$fe
-	db $00,$bf,$00,$df,$00,$df,$00,$0f,$00,$0f,$00,$07,$00,$00,$00,$00
+	db $00,$fe,$00,$fe,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7f
-	db $00,$ff,$00,$f7,$00,$f7,$00,$f7,$00,$e7,$00,$c7,$00,$07,$00,$00
+	db $00,$7f,$00,$3f,$00,$3f,$00,$1f,$00,$0f,$00,$0f,$00,$0f,$00,$0f
-	db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$00
+	db $80,$bf,$00,$7f,$00,$7f,$00,$7f,$00,$7f,$00,$7f,$80,$bf,$80,$bf
-	db $00,$fc,$00,$fc,$00,$fc,$00,$fc,$00,$f8,$00,$f8,$00,$f8,$00,$00
+	db $0c,$ec,$06,$f6,$03,$fb,$01,$fd,$01,$fd,$00,$fe,$00,$fe,$00,$fe
-	db $00,$03,$00,$03,$00,$07,$00,$0f,$00,$1f,$00,$3f,$00,$7f,$00,$ff
+	db $00,$18,$00,$00,$00,$00,$00,$00,$00,$1c,$00,$1e,$00,$1f,$00,$1f
-	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,$00,$00,$00,$80
-	db $00,$1f,$00,$ff,$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,$c0,$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,$18,$00,$3c,$00,$3c
-	db $00,$f0,$00,$fe,$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,$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

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

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 $00,$20,$80,$90,$c0,$d0,$60,$60,$b0,$b0,$b0,$b0,$b8,$b8,$78,$78
-	db $f8,$f8,$f8,$f8,$f0,$f0,$f0,$f0,$e0,$e8,$c0,$c4,$80,$84,$00,$04
+	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 $3e,$3e,$ff,$ff,$e0,$e0,$df,$df,$bf,$bf,$bf,$bf,$8f,$8f,$3f,$3f
-	db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$3e,$3e
+	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 $07,$07,$0f,$0f,$0f,$0f,$1f,$1f,$18,$18,$1e,$1e,$1f,$1f,$0f,$0f
-	db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff
+	db $cf,$cf,$cf,$cf,$c4,$c4,$00,$00,$11,$11,$3b,$3b,$93,$93,$81,$81
-	db $c0,$c0,$e0,$e0,$e0,$e0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$e0,$e0
+	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

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 $00,$f8,$07,$c7,$3f,$bf,$7c,$7c,$f9,$f9,$f2,$f2,$f0,$f0,$e0,$e0
-	db $3f,$3f,$bf,$bf,$bf,$bf,$bf,$bf,$bf,$bf,$df,$df,$ef,$ef,$f7,$f7
+	db $38,$38,$bc,$bc,$bf,$bf,$bf,$bf,$bf,$bf,$5e,$5e,$2f,$2f,$16,$16
-	db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff
+	db $63,$63,$09,$09,$20,$20,$8a,$8a,$00,$00,$1c,$1c,$ff,$ff,$3f,$3f
-	db $e0,$ef,$f0,$f7,$f8,$fb,$f8,$fb,$f8,$fb,$f8,$fb,$f8,$fb,$f0,$f7
+	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 $c0,$c0,$c0,$c0,$e3,$e3,$7f,$7f,$38,$b8,$07,$c7,$00,$f8,$00,$ff
-	db $f9,$f9,$fe,$fe,$ff,$ff,$ff,$ff,$fe,$fe,$f0,$f1,$00,$0f,$00,$ff
+	db $09,$09,$7e,$7e,$ff,$ff,$ff,$ff,$0e,$0e,$f0,$f1,$00,$0f,$00,$ff
-	db $ff,$ff,$3f,$3f,$80,$80,$00,$7f,$00,$ff,$00,$ff,$00,$ff,$00,$ff
+	db $c0,$c0,$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 $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

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,$06,$06,$0f,$0f,$1f,$1f,$3f,$3f,$7d,$7d,$7d,$7d,$fb,$fb
-	db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01
+	db $00,$00,$00,$00,$01,$01,$01,$01,$01,$01,$02,$02,$02,$02,$03,$03
-	db $6b,$6b,$6b,$6b,$e2,$e2,$e2,$e2,$e6,$e6,$e4,$e4,$cc,$cc,$dc,$dc
+	db $ab,$ab,$ab,$ab,$62,$62,$62,$62,$66,$66,$e4,$e4,$cc,$cc,$dc,$dc
-	db $01,$01,$01,$01,$01,$01,$01,$01,$01,$01,$00,$00,$00,$00,$00,$00
+	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:

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 $3b,$3b,$31,$31,$38,$38,$1c,$1c,$1e,$1e,$0f,$0f,$07,$07,$01,$01
-	db $c0,$c0,$e0,$e0,$e0,$e0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$f0,$e0,$e0
+	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 $03,$c3,$3d,$3d,$fe,$fe,$e1,$e1,$ff,$ff,$e0,$e0,$3f,$3f,$00,$c0
-	db $fc,$fc,$ff,$ff,$ff,$ff,$3f,$3f,$df,$df,$e7,$e7,$80,$98,$00,$7f
+	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 $6a,$6a,$e0,$e0,$c0,$c0,$e0,$e0,$6a,$6a,$1f,$9f,$00,$e0,$00,$e0
-	db $e0,$ef,$f0,$f7,$f0,$f7,$f0,$f7,$e0,$eb,$80,$97,$00,$0f,$00,$7f
+	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

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 $3e,$3e,$6b,$6b,$77,$77,$6b,$6b,$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 $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 $03,$cb,$07,$f7,$0f,$ef,$1d,$dd,$1e,$de,$18,$d8,$1e,$de,$1d,$dd
-	db $e0,$ef,$f0,$f7,$f8,$fb,$fc,$fd,$fc,$fd,$fc,$fd,$fc,$fd,$fc,$fd
+	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,$f7,$00,$ec,$03,$eb,$07,$e7,$0f,$ef,$0e,$ee,$1f,$df
-	db $00,$ff,$00,$07,$f8,$f9,$fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff
+	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 $1f,$df,$1c,$5c,$1f,$5f,$1f,$5f,$0e,$6e,$0f,$6f,$07,$57,$03,$5b
-	db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$fe,$fe
+	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

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,$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,$f0,$f0,$f0,$f0
+	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 $1e,$5e,$1b,$db,$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 $3b,$3b,$bf,$bf,$d7,$d7,$ef,$ef,$ff,$ff,$df,$df,$ff,$ff,$00,$00
-	db $f0,$f0,$f0,$f4,$f0,$f6,$f0,$f7,$e0,$ef,$c0,$df,$00,$3f,$00,$ff
+	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 $03,$03,$07,$07,$0f,$0f,$1c,$1c,$3e,$3e,$79,$79,$7f,$7f,$ff,$ff
-	db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$fe,$fe,$fc,$fc,$f8,$f8
+	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 $03,$03,$07,$07,$06,$06,$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 $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 $1e,$1e,$0c,$0c,$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 $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

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 $00,$ff,$00,$fc,$00,$f8,$00,$f0,$0e,$ee,$17,$d7,$17,$d7,$17,$d7
-	db $3f,$3f,$7f,$7f,$7f,$7f,$7f,$7f,$7f,$7f,$7f,$7f,$3f,$3f,$9f,$9f
+	db $3e,$3e,$7d,$7d,$7d,$7d,$7e,$7e,$7f,$7f,$5f,$5f,$2f,$2f,$93,$93
-	db $fb,$fb,$fb,$fb,$f9,$f9,$fc,$fc,$fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff
+	db $1a,$1a,$fb,$fb,$f9,$f9,$f4,$f4,$0e,$0e,$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,$fc,$7f,$7f,$bf,$bf,$cf,$cf,$70,$70,$8f,$8f,$e0,$e0,$c7,$c7
-	db $fc,$fd,$fc,$fd,$f8,$fb,$f8,$fb,$f8,$fb,$f0,$f3,$00,$03,$fc,$fd
+	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 $17,$d7,$17,$d7,$17,$d7,$17,$d7,$1b,$db,$0d,$ed,$06,$e6,$03,$f3
-	db $cf,$cf,$e3,$e3,$f8,$f8,$fc,$fc,$f9,$f9,$fb,$fb,$f3,$f3,$f7,$f7
+	db $cc,$cc,$e3,$e3,$f8,$f8,$fc,$fc,$f9,$f9,$fb,$fb,$f3,$f3,$77,$77
-	db $ff,$ff,$ff,$ff,$0e,$0e,$e0,$e0,$fc,$fc,$fe,$fe,$fe,$fe,$fe,$fe
+	db $ff,$ff,$03,$03,$fe,$fe,$00,$00,$fc,$fc,$fe,$fe,$fe,$fe,$f6,$f6
-	db $9f,$9f,$7f,$7f,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff
+	db $9f,$9f,$7d,$7d,$fe,$fe,$fc,$fc,$fe,$fe,$fd,$fd,$bf,$bf,$df,$df
-	db $fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff
+	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,$3f,$3f
+	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 $01,$f1,$00,$f0,$00,$38,$03,$03,$1f,$1f,$3f,$3f,$7e,$7e,$7d,$7d
-	db $f7,$f7,$f7,$f7,$07,$07,$f7,$f7,$f7,$f7,$f3,$f3,$fb,$fb,$fc,$fc
+	db $f7,$f7,$f7,$f7,$05,$05,$f5,$f5,$f6,$f6,$f3,$f3,$39,$39,$dc,$dc
-	db $7f,$7f,$3f,$3f,$9f,$9f,$cf,$cf,$e1,$e1,$c0,$c0,$c0,$c0,$00,$00
+	db $6f,$6f,$37,$37,$99,$99,$ce,$ce,$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 $ff,$ff,$fe,$fe,$f2,$f2,$0c,$0c,$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 $7d,$7d,$7a,$7a,$fd,$fd,$ff,$ff,$ff,$ff,$bf,$bf,$41,$41,$3e,$3e
-	db $fe,$fe,$fc,$fc,$fc,$fc,$f8,$f8,$f0,$f0,$e0,$e0,$80,$80,$00,$00
+	db $7e,$7e,$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 $7d,$7d,$7d,$7d,$7e,$7e,$7f,$7f,$5f,$5f,$27,$27,$18,$18,$07,$07
-	db $fe,$fe,$ff,$ff,$ff,$ff,$fe,$fe,$fc,$fc,$f8,$f8,$e0,$e0,$9f,$9f
+	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,$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,$ff,$ff,$ff,$ff
+	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 $fe,$fe,$ff,$ff,$ff,$ff,$ff,$ff,$40,$40,$3f,$3f,$00,$00,$00,$00
-	db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$fe,$fe,$f0,$f0,$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 $0f,$0f,$07,$07,$0b,$0b,$05,$05,$02,$02,$01,$01,$00,$00,$00,$00
-	db $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$fe,$fe,$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

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

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 $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,$07,$27,$cf,$cf,$cf,$cf,$0f,$0f
+	db $00,$fe,$00,$fe,$00,$f8,$00,$f0,$08,$28,$d8,$d8,$f0,$f0,$00,$00
-	db $0f,$0f,$00,$00,$00,$00,$00,$00,$f8,$f8,$ff,$ff,$ff,$ff,$ff,$ff
+	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,$83,$83,$c3,$c3
+	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 $c3,$c3,$e1,$e1,$f0,$f0,$f8,$f8,$fc,$fc,$fc,$fc,$fe,$fe,$fe,$fe
-	db $e3,$e3,$f1,$f1,$f0,$f0,$f8,$f8,$f8,$f8,$fc,$fc,$fc,$fc,$fc,$fc
 	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 $07,$07,$07,$07,$07,$07,$03,$03,$01,$01,$00,$00,$00,$07,$00,$3f
-	db $fc,$fc,$f8,$f8,$f8,$f8,$f0,$f0,$e0,$e0,$e0,$e0,$c0,$c0,$00,$00
 	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 $ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$ff,$3f,$3f,$1f,$df,$0f,$ef
-	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 $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 $3f, $40, $1a, $1a, $1a, $1a, $1a, $1a
-	db $47, $1a, $1a, $1a, $1a, $1a, $1a, $1a
+	db $35, $1a, $1a, $1a, $1a, $1a, $1a, $1a
-	db $48, $1a, $1a, $1a, $50, $1a, $1a, $1a
+	db $36, $1a, $1a, $1a, $3e, $1a, $1a, $1a
-	db $49, $1b, $1c, $1d, $4d, $4e, $1a, $1a
+	db $37, $1b, $1c, $1d, $3b, $3c, $1a, $1a
-	db $4a, $1e, $4b, $4c, $20, $4f, $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 $28, $29, $2a, $2b, $2c, $33, $2d, $47
-	db $1a, $2e, $1f, $2f, $30, $1f, $54, $55
+	db $1a, $4a, $1f, $2e, $2f, $1f, $41, $42
-	db $1a, $31, $3b, $32, $33, $34, $56, $57
+	db $1a, $30, $34, $4b, $31, $32, $43, $44
-	db $35, $36, $37, $1a, $1a, $58, $59, $5b
+	db $4d, $4e, $49, $4c, $1a, $45, $46, $48
-	db $1a, $38, $39, $1a, $1a, $1a, $1a, $1a
+	db $1a, $4f, $50, $1a, $1a, $1a, $1a, $1a
-	db $1a, $52, $3c, $3d, $1a, $1a, $1a, $1a
+	db $1a, $51, $52, $1a, $1a, $1a, $1a, $1a
-	db $3e, $3f, $40, $41, $1a, $1a, $1a, $1a
+	db $53, $54, $55, $1a, $1a, $1a, $1a, $1a
-	db $42, $43, $44, $1a, $1a, $1a, $1a, $1a
+	db $54, $56, $57, $1a, $1a, $1a, $1a, $1a
-	db $45, $46, $1a, $1a, $1a, $1a, $1a, $1a
+	db $58, $1a, $1a, $1a, $1a, $1a, $1a, $1a
 	db $1a, $1a, $1a, $1a, $1a, $1a, $1a, $1a
 
 .BackgroundCopyEnd:

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
   

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 $c0,$df,$00,$3f,$00,$f8,$00,$f7,$00,$ef,$00,$df,$00,$bf,$00,$7e
-	db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$3e,$00,$3f
+	db $00,$ff,$00,$ff,$00,$ff,$00,$7f,$00,$7f,$00,$41,$00,$3e,$00,$3f
-	db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$ff,$00,$ff
+	db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$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,$ff,$00,$ff,$00,$ff,$00,$fc,$00,$c3,$00,$3f,$00,$ff,$00,$ff
-	db $00,$00,$00,$01,$00,$03,$00,$03,$00,$ff,$00,$ff,$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,$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,$ff,$00,$ff
+	db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$f0,$00,$cf
-	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,$91,$00,$7e,$00,$ff
-	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,$df
-	db $00,$93,$00,$86,$00,$fc,$00,$ff,$00,$ff,$00,$ff,$00,$1f,$00,$1f
+	db $00,$3f,$00,$ff,$00,$7f,$00,$bf,$00,$de,$00,$de,$01,$dd,$01,$bd
-	db $00,$00,$00,$00,$00,$00,$00,$80,$00,$c0,$00,$c0,$01,$c1,$01,$81
+	db $00,$ff,$00,$ff,$00,$ff,$00,$1f,$e0,$ef,$e0,$ef,$e0,$ef,$e0,$ef
-	db $00,$00,$00,$00,$00,$00,$00,$00,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0
+	db $00,$ff,$00,$fe,$00,$f9,$00,$f7,$00,$ef,$00,$df,$00,$3f,$00,$ff
-	db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe
+	db $00,$df,$00,$ee,$00,$f0,$00,$fe,$00,$fe,$00,$fe,$00,$fd,$00,$fd
-	db $00,$ff,$00,$fe,$00,$f8,$00,$f0,$00,$e0,$00,$c0,$00,$00,$00,$00
+	db $03,$7b,$03,$7b,$01,$b9,$00,$b6,$00,$ce,$00,$ce,$00,$ce,$00,$de
-	db $00,$1f,$00,$0e,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$00,$01
+	db $e0,$ef,$e0,$ef,$e0,$ef,$c0,$df,$c0,$df,$c0,$df,$80,$bf,$80,$bf
-	db $03,$03,$03,$03,$01,$81,$00,$86,$00,$ce,$00,$ce,$00,$ce,$00,$de
+	db $00,$f9,$00,$f7,$00,$ef,$00,$df,$00,$bf,$00,$bf,$00,$7f,$00,$ff
-	db $e0,$e0,$e0,$e0,$e0,$e0,$c0,$c0,$c0,$c0,$c0,$c0,$80,$80,$80,$80
+	db $00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$ff,$01,$fd
-	db $00,$f8,$00,$f0,$00,$e0,$00,$c0,$00,$80,$00,$80,$00,$00,$00,$00
+	db $00,$1e,$00,$be,$00,$bf,$00,$7f,$00,$7f,$00,$fe,$00,$7e,$00,$7f
-	db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01
+	db $80,$bf,$00,$7f,$00,$7f,$00,$7f,$00,$7f,$00,$ff,$00,$ff,$00,$7f
-	db $00,$1e,$00,$3e,$00,$3f,$00,$7f,$00,$7f,$00,$fe,$00,$7e,$00,$7f
+	db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$01,$fd,$01,$fd,$01,$fd
-	db $80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+	db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$7f,$80,$83,$fc,$fc,$ff,$ff
-	db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$01,$01,$01,$01,$01,$01
+	db $02,$fa,$02,$fa,$06,$f6,$06,$f6,$0c,$ed,$0c,$ed,$1e,$5e,$9f,$9f
-	db $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$80,$fc,$fc,$ff,$ff
+	db $00,$ff,$00,$e7,$08,$eb,$18,$d8,$30,$b5,$70,$75,$f0,$f5,$e0,$ee
-	db $02,$02,$02,$02,$06,$06,$06,$06,$0c,$0d,$0c,$0d,$1e,$1e,$9f,$9f
+	db $00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$f9,$00,$f7
-	db $00,$ff,$00,$e7,$08,$eb,$18,$d8,$30,$b1,$70,$71,$f0,$f1,$e0,$e0
+	db $7f,$7f,$00,$80,$00,$e7,$00,$df,$00,$bf,$00,$7f,$00,$ff,$00,$ff
-	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 $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 $e0,$e3,$fc,$fc,$ff,$ff,$0f,$0f,$00,$f0,$00,$fd,$00,$fe,$00,$fe
-	db $00,$00,$00,$00,$e2,$e2,$fe,$fe,$fe,$fe,$00,$00,$00,$00,$00,$00
+	db $00,$ff,$00,$1d,$e2,$e2,$fe,$fe,$fe,$fe,$00,$01,$00,$ff,$00,$ff
-	db $00,$00,$00,$00,$00,$00,$00,$00,$00,$03,$00,$ff,$00,$ff,$00,$ff
+	db $00,$ff,$00,$ff,$00,$ff,$00,$fc,$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,$ff,$00,$fe,$00,$81,$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 $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,$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,$f8,$00,$c0
+	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,$c7,$0f,$0f,$0f,$0f,$00,$00
+	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,$0f
+	db $f0,$f7,$f0,$f3,$f8,$fb,$f8,$fb,$f0,$f7,$e0,$ef,$c0,$df,$00,$2f
-	db $00,$f8,$00,$f8,$00,$f8,$00,$f0,$00,$f0,$00,$c0,$00,$80,$00,$00
+	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,$f8,$00,$e0,$00,$80
+	db $00,$ff,$00,$ff,$00,$ff,$00,$ff,$00,$fe,$00,$f9,$00,$e7,$00,$9f
-	db $00,$ff,$00,$f8,$00,$e0,$00,$80,$00,$00,$00,$00,$00,$00,$00,$00
+	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 $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,$60,$60,$60
+	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 $30,$30,$38,$39,$18,$1b,$1c,$5d,$0c,$ed,$0e,$ee,$06,$f6,$07,$f7
-	db $0e,$0e,$06,$06,$07,$07,$03,$03,$03,$03,$01,$01,$01,$01,$00,$00
+	db $0e,$6e,$06,$f6,$07,$f7,$03,$fb,$03,$fb,$01,$fd,$01,$fd,$00,$7e
-	db $60,$60,$70,$70,$30,$30,$00,$00,$80,$80,$80,$80,$c0,$c0,$c0,$c0
+	db $60,$6f,$70,$77,$30,$37,$00,$4f,$80,$bf,$80,$bf,$c0,$df,$c0,$df
-	db $01,$01,$01,$01,$05,$05,$0d,$0d,$01,$01,$01,$01,$01,$01,$00,$00
+	db $01,$fd,$01,$f9,$05,$f5,$0d,$ed,$01,$f1,$01,$fd,$01,$fd,$00,$fe
-	db $d0,$d0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$c0,$80,$80,$00,$00
+	db $d0,$d6,$c0,$ce,$c0,$de,$c0,$de,$c0,$de,$c0,$df,$80,$bf,$00,$7f
-	db $e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$e0,$60,$60,$00,$00,$00,$00
+	db $e0,$e0,$e0,$e0,$e0,$ef,$e0,$ef,$e0,$ef,$60,$6f,$00,$9f,$00,$ff
-	db $03,$03,$03,$03,$01,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+	db $03,$fb,$03,$fb,$01,$fd,$00,$fe,$00,$ff,$00,$ff,$00,$ff,$00,$ff
-	db $00,$00,$80,$80,$80,$80,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+	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, $44, $45, $1a, $46, $47, $48, $1a
-	db $1a, $4b, $4c, $4d, $4e, $4f, $50, $51
+	db $1a, $49, $4a, $4b, $4c, $4d, $4e, $4f
-	db $1a, $52, $53, $1a, $54, $55, $56, $57
+	db $1a, $50, $51, $1a, $52, $53, $54, $55
-	db $58, $59, $5a, $5b, $4e, $5c, $5d, $5e
+	db $56, $57, $58, $59, $4c, $5a, $5b, $5c
-	db $5f, $60, $61, $62, $4e, $63, $64, $1a
+	db $5d, $5e, $5f, $60, $6c, $61, $62, $1a
-	db $1a, $65, $66, $67, $68, $69, $6a, $1a
+	db $6b, $63, $64, $65, $66, $67, $68, $6d
-	db $1a, $6b, $6c, $1b, $1c, $1a, $1a, $1a
+	db $6e, $69, $6a, $1b, $1c, $70, $6e, $6e
-	db $1d, $1e, $1f, $20, $21, $22, $1a, $1a
+	db $1d, $1e, $1f, $20, $21, $22, $6e, $6e
-	db $23, $23, $24, $25, $26, $27, $28, $1a
+	db $6e, $6e, $23, $24, $25, $26, $27, $6e
-	db $29, $2a, $1a, $1a, $2b, $2c, $2d, $1a
+	db $73, $28, $6f, $6e, $29, $2a, $2b, $6e
-	db $2e, $1a, $1a, $1a, $2f, $30, $31, $1a
+	db $2c, $6e, $6e, $6e, $2d, $2e, $2f, $6e
-	db $1a, $1a, $32, $33, $34, $35, $1a, $1a
+	db $6e, $6e, $30, $31, $32, $33, $71, $6e
-	db $1a, $1a, $36, $37, $38, $39, $3a, $1a
+	db $6e, $6e, $34, $35, $36, $37, $38, $6e
-	db $3b, $3c, $3d, $29, $3e, $3f, $1a, $1a
+	db $39, $3a, $3b, $73, $3c, $3d, $6e, $6e
-	db $23, $23, $40, $41, $42, $43, $1a, $1a
+	db $6e, $6e, $3e, $3f, $40, $41, $6e, $6e
-	db $44, $45, $1a, $1a, $1a, $1a, $1a, $1a
+	db $42, $43, $6f, $6e, $72, $6e, $6e, $6e
 
 
 .BackgroundCopyEnd: