diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index 1dbb481..f5c583b 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -29,11 +29,6 @@ DEF MAX_UNNAMED_DECK_NUM        EQU 999
 DEF MAX_NUM_AUTO_DECK_LIST_DIFFERENT_CARDS EQU 43
 DEF AUTO_DECK_LIST_BUFFER_SIZE             EQU 3 * MAX_NUM_AUTO_DECK_LIST_DIFFERENT_CARDS + 1
 
-; card gfx: a 72-byte header (3 palettes + a CARD_TILE_COUNT-entry attribute
-; map, one byte per tile) followed by CARD_TILE_COUNT uncompressed tiles.
-; see LoadCardGfx / CardGraphics.
-DEF CARD_TILE_COUNT EQU $30 ; 48
-
 ; card data offsets (data/cards.asm and card_data_struct)
 
 RSRESET
diff --git a/src/constants/charmaps.asm b/src/constants/charmaps.asm
index 5b5665c..ac2dfe2 100644
--- a/src/constants/charmaps.asm
+++ b/src/constants/charmaps.asm
@@ -5,6 +5,7 @@
 
 ; ascii half-width font
 	charmap "\n", $0a
+DEF HALFWIDTH_CHAR_START EQU $20
 	charmap " ", $20
 	charmap "!", $21
 	charmap "”", $22
@@ -293,6 +294,7 @@ ENDM
 	fwcharmap TX_HIRAGANA, "っ", $5f
 
 ; TX_KATAKANA, TX_HIRAGANA, and TX_FULLWIDTH0
+DEF FULLWIDTH0_CHAR_START EQU $60
 	fwcharmap TX_FULLWIDTH0, "0", $60
 	fwcharmap TX_FULLWIDTH0, "1", $61
 	fwcharmap TX_FULLWIDTH0, "2", $62
diff --git a/src/constants/gfx_constants.asm b/src/constants/gfx_constants.asm
index 0d98459..2c3c653 100644
--- a/src/constants/gfx_constants.asm
+++ b/src/constants/gfx_constants.asm
@@ -26,3 +26,26 @@ DEF ICON_TILE_FIGHTING        EQU $f0
 DEF ICON_TILE_PSYCHIC         EQU $f4
 DEF ICON_TILE_COLORLESS       EQU $f8
 DEF ICON_TILE_ENERGY          EQU $fc
+
+; card gfx
+; see LoadCardGfx, CardGraphics
+DEF CARD_GFX_WIDTH     EQU 8 ; in tiles
+DEF CARD_GFX_HEIGHT    EQU 6 ; in tiles
+DEF NUM_CARD_GFX_TILES EQU CARD_GFX_WIDTH * CARD_GFX_HEIGHT ; 48
+
+RSRESET
+DEF CARDGFXSTRUCT_PALS              RB 3 palettes ; $000
+DEF CARDGFXSTRUCT_PALS_SIZE         EQU _RS ; 24
+
+DEF CARDGFXSTRUCT_TILE_ATTRMAP      RB NUM_CARD_GFX_TILES ; $018
+DEF CARDGFXSTRUCT_TILE_ATTRMAP_SIZE EQU _RS - CARDGFXSTRUCT_TILE_ATTRMAP ; 48
+	DEF CARD_GFX_TILE_ATTRMAP_PAL_INDEX  EQU %11_000000
+	; offset = 48 + (cur alt tile idx) - (cur tile idx)
+	; 0 if no alt
+	DEF CARD_GFX_TILE_ATTRMAP_ALT_OFFSET EQU %00_111111
+
+DEF CARDGFXSTRUCT_TILES             RB NUM_CARD_GFX_TILES tiles ; $048
+DEF CARDGFXSTRUCT_TILES_SIZE        EQU _RS - CARDGFXSTRUCT_TILES ; 768
+
+; printer-only (grayscale) alt tiles, of variable length from 0 to 48
+DEF CARDGFXSTRUCT_ALT_TILES_START   EQU _RS ; $348
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm
index 61536bb..47a7ddc 100644
--- a/src/engine/bank01.asm
+++ b/src/engine/bank01.asm
@@ -3414,55 +3414,57 @@ LoadLoadedCard1Gfx:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	lb bc, CARD_TILE_COUNT, TILE_SIZE
+	lb bc, NUM_CARD_GFX_TILES, TILE_SIZE
 	call LoadCardGfx
 	ret
 
 ; applies the tilemap of the loaded card gfx
-; to coordinates in de, and loads its palette
+; to coordinates in de, and loads its palettes
 ; starting from BG pal 2
 DrawCardGfxToDE_BGPalIndex2:
 	ld a, [wConsole]
 	or a
 	ret z
-	ld a, $02
-	call LoadCardPalettesAndAttributes
+	ld a, 2
+	call LoadCardPalettesAndBGPAttributes
 	ret
 
 ; applies the tilemap of the loaded card gfx
-; to coordinates in de, and loads its palette
+; to coordinates in de, and loads its palettes
 ; starting from BG pal 5
 DrawCardGfxToDE_BGPalIndex5:
 	ld a, [wConsole]
 	or a
 	ret z
-	ld a, $5
-	call LoadCardPalettesAndAttributes
+	ld a, 5
+	call LoadCardPalettesAndBGPAttributes
 	ret
 
-SetOBPToCardPalette:
+; unreferenced
+SetOBP5ToCardPalette:
 	ldgbpal a, SHADE_WHITE, SHADE_LIGHT, SHADE_DARK, SHADE_BLACK
 	ld [wOBP0], a
 	ld a, [wConsole]
 	or a
 	ret z
-	ld a, $0d
-	jr CopyCGBCardPalette
+	ld a, 8 + 5 ; CGB Object Palette 5 (to 7)
+	jr CopyCGBCardPalettes_UpdatePalIndex
 
 ; de = coordinates
-LoadCardPalettesAndAttributes:
+LoadCardPalettesAndBGPAttributes:
 	push de
-	call CopyCGBCardPalette
+	call CopyCGBCardPalettes_UpdatePalIndex
 	pop bc
 
-	; copy attributes
+; hl = wCardAttrMap holding bg pal index
+; copy attributes
 	push hl
 	call BCCoordToBGMap0Address
 	pop hl
 	call BankswitchVRAM1
-	ld c, $06
+	ld c, CARD_GFX_HEIGHT
 .loop_copy_attr
-	ld b, $08
+	ld b, CARD_GFX_WIDTH
 	push de
 	call SafeCopyDataHLtoDE
 	pop de
@@ -3477,18 +3479,21 @@ LoadCardPalettesAndAttributes:
 	call BankswitchVRAM0
 	ret
 
-; a = starting BG palette index to copy to
-CopyCGBCardPalette:
+; for a = starting BG palette index,
+; copy wCardPalettes to bgpal[a, a+1, a+2], and
+; update wCardAttrMap with a + (each tile's pal index)
+; also return hl = wCardAttrMap
+CopyCGBCardPalettes_UpdatePalIndex:
 	ld c, a
+REPT 3 ; *= PAL_SIZE
 	add a
-	add a
-	add a ; *8
+ENDR
 	ld e, a
 	ld d, $00
 	ld hl, wBackgroundPalettesCGB
 	add hl, de
 	ld de, wCardPalettes
-	ld b, 3 palettes
+	ld b, CARDGFXSTRUCT_PALS_SIZE
 .loop_copy_pal
 	ld a, [de]
 	inc de
@@ -3496,10 +3501,12 @@ CopyCGBCardPalette:
 	dec b
 	jr nz, .loop_copy_pal
 
-	; de = wCardAttrMap
+; de = wCardAttrMap
+; overwrite each tile's value with
+; (starting BG palette index) + its CARD_GFX_TILE_ATTRMAP_PAL_INDEX (0, 1, 2)
 	push de
-	ld b, $30
-.asm_56e4
+	ld b, CARDGFXSTRUCT_TILE_ATTRMAP_SIZE
+.loop_load_pal_index
 	ld a, [de]
 	rlca
 	rlca
@@ -3508,7 +3515,7 @@ CopyCGBCardPalette:
 	ld [de], a
 	inc de
 	dec b
-	jr nz, .asm_56e4
+	jr nz, .loop_load_pal_index
 	pop hl
 	ret
 
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm
index dc34501..333d679 100644
--- a/src/engine/bank02.asm
+++ b/src/engine/bank02.asm
@@ -750,7 +750,7 @@ DrawYourOrOppPlayArea_ActiveCardGfx:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	lb bc, CARD_TILE_COUNT, TILE_SIZE
+	lb bc, NUM_CARD_GFX_TILES, TILE_SIZE
 	call LoadCardGfx
 	pop de
 	push de
@@ -796,7 +796,7 @@ DrawInPlayArea_ActiveCardGfx:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	lb bc, CARD_TILE_COUNT, TILE_SIZE
+	lb bc, NUM_CARD_GFX_TILES, TILE_SIZE
 	call LoadCardGfx
 	lb de, 6, 9
 	bank1call DrawCardGfxToDE_BGPalIndex5
@@ -820,7 +820,7 @@ DrawInPlayArea_ActiveCardGfx:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	lb bc, CARD_TILE_COUNT, TILE_SIZE
+	lb bc, NUM_CARD_GFX_TILES, TILE_SIZE
 	call LoadCardGfx
 	lb de, 6, 2
 	bank1call DrawCardGfxToDE_BGPalIndex2
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index af0dd92..bd1a004 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -5853,14 +5853,10 @@ LoadCardGfx_FromCardID:
 	add c
 	ld c, a
 	ld b, $00
+REPT 4 ; *TILE_SIZE
 	sla c
 	rl b
-	sla c
-	rl b
-	sla c
-	rl b
-	sla c
-	rl b ; *TILE_SIZE
+ENDR
 	ld hl, v0Tiles1
 	add hl, bc
 	ld d, h
@@ -5868,7 +5864,7 @@ LoadCardGfx_FromCardID:
 	pop hl
 	xor a
 	call BankswitchVRAM
-	lb bc, CARD_TILE_COUNT, TILE_SIZE
+	lb bc, NUM_CARD_GFX_TILES, TILE_SIZE
 	call LoadCardGfx
 	pop hl
 	pop de
@@ -5883,9 +5879,9 @@ CopyCardPalettesToBGPals:
 	push de
 	push hl
 	ld b, $00
+REPT 3 ; *PAL_SIZE
 	sla c
-	sla c
-	sla c ; *PAL_SIZE
+ENDR
 	ld hl, wBackgroundPalettesCGB
 	add hl, bc
 	ld d, h
@@ -5930,7 +5926,7 @@ DrawLoadedCard:
 	ld de, wCardTilemap
 	ld a, [wCardTilemapOffset]
 	ld c, a
-	ld b, $30 ; card size in tiles
+	ld b, NUM_CARD_GFX_TILES
 .loop_copy
 	ld a, [hli]
 	add c
@@ -5954,7 +5950,7 @@ DrawLoadedCard:
 	ld de, wddc4
 	ld a, [wddf5]
 	ld c, a
-	ld b, $30 ; card size in tiles
+	ld b, NUM_CARD_GFX_TILES
 .asm_134f8
 	ld a, [hli]
 	rlca
@@ -6002,7 +5998,7 @@ DebugCardViewer:
 	push bc
 	push de
 	push hl
-	call .asm_1358a
+	call .DrawBox
 	ld hl, $0
 REPT 2
 	ld a, (NUM_CARDS - 1) / 2
@@ -6014,47 +6010,51 @@ ENDR
 	ld d, h
 	ld e, l
 	call .Draw
-.asm_1354b
+
+.wait_input
 	call DoFrame
 	ldh a, [hKeysPressed]
 	and PAD_A | PAD_B
-	jr nz, .asm_13559
-	call .asm_13561
-	jr .asm_1354b
-.asm_13559
-	call .asm_135ac
+	jr nz, .exit
+	call .Scroll
+	jr .wait_input
+
+.exit
+	call .ResumeSprites
 	pop hl
 	pop de
 	pop bc
 	pop af
 	ret
 
-.asm_13561:
+.Scroll:
 	ldh a, [hDPadHeld]
-	and $10
-	jr nz, .asm_1357c
+	and PAD_RIGHT
+	jr nz, .handle_forward
 	ldh a, [hDPadHeld]
-	and $20
-	jr nz, .asm_1356e
+	and PAD_LEFT
+	jr nz, .handle_backward
 	ret
-.asm_1356e
+
+.handle_backward
 	ld bc, GRASS_ENERGY
 	call CompareBCAndDE
-	jr c, .asm_13579
+	jr c, .scroll_backward
 	ld de, NUM_CARDS + 1
-.asm_13579
+.scroll_backward
 	dec de
 	jr .Draw
-.asm_1357c
+
+.handle_forward
 	ld bc, NUM_CARDS - 1
 	call CompareBCAndDE
-	jr nc, .asm_13587
+	jr nc, .scroll_forward
 	ld de, 0
-.asm_13587
+.scroll_forward
 	inc de
 	jr .Draw
 
-.asm_1358a:
+.DrawBox:
 	lb de, 5, 4
 	lb bc, 10, 8
 	call AdjustDECoordByhSC
@@ -6068,7 +6068,7 @@ ENDR
 	call FillBoxInBGMap
 	ret
 
-.asm_135ac:
+.ResumeSprites:
 	call CopyBGMapFromWRAMToVRAM
 	call SetActiveSpriteAnimFlag6WithinArea
 	ret
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 61a8060..f75385b 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -4238,18 +4238,18 @@ PrintCardInfoFooterStripAndFeed:
 	call SendPrinterInstructionPacket_1Sheet_3LineFeeds
 	ret
 
-; calls setup text and sets wTilePatternSelector
+; calls setup text and sets wTextTileBaseAddressHi to SRAM
 SetupPrinterText:
 	lb de, $40, $bf
 	call SetupText
-	ld a, $a4
-	ld [wTilePatternSelector], a
+	ld a, HIGH(sGfxBuffer1)
+	ld [wTextTileBaseAddressHi], a
 	xor a
-	ld [wTilePatternSelectorCorrection], a
+	ld [wTextTileIndexSignednessAdjust], a
 	ret
 
 ; switches to CGB normal speed, resets serial
-; enables SRAM and switches to SRAM1
+; enables SRAM and switches to SRAM3
 ; and clears sGfxBuffer0
 PrepareForPrinterCommunications:
 	call SwitchToCGBNormalSpeed
@@ -4385,10 +4385,9 @@ SendTilesToPrinter:
 	push bc
 	ld l, a
 	ld h, $00
+REPT 4 ; *TILE_SIZE
 	add hl, hl
-	add hl, hl
-	add hl, hl
-	add hl, hl ; *TILE_SIZE
+ENDR
 	ld bc, sGfxBuffer1
 	add hl, bc
 	ld c, TILE_SIZE
@@ -5468,74 +5467,80 @@ DisplayBoosterContent:
 	bank1call DisplayCardList
 	ret
 
-; builds the card's picture for the Game Boy Printer into the buffer at de.
-; loads the card's tiles (LoadCardGfxRemapped) into wc000, then walks the
-; 8x6-tile portrait in column-major order and repacks each tile's pixel rows
-; (through the rr/rra/sra bit sequence) into the print-buffer layout. The
-; per-tile palette is dropped, so the printout is a flat grayscale of the card.
+; builds at de the 2x scaled card gfx for the Game Boy Printer,
+; using printer-only alt tiles where appropriate
+; input:
+;   hl = card gfx index
+;   de = destination
 BuildPrintableCardPic:
 	push de
-	ld de, wc000
-	lb bc, CARD_TILE_COUNT, TILE_SIZE
-	call LoadCardGfxRemapped ; load the 48 (remapped) card tiles into wc000
-	pop de ; de = output buffer
-	ld hl, wc000 ; hl = loaded tiles
-	ld c, $08 ; 8 tile columns
-.col
-	ld b, $06 ; 6 tile rows (8x6 = 48 tiles)
-.row
+	ld de, wTempPrintableCardPic
+	lb bc, NUM_CARD_GFX_TILES, TILE_SIZE
+	call LoadCardGfx_PrinterAlt
+	pop de
+	ld hl, wTempPrintableCardPic
+
+	ld c, CARD_GFX_WIDTH
+.loop_columns
+	ld b, CARD_GFX_HEIGHT
+.loop_rows
 	push bc
-	ld c, $08 ; 8 pixel rows per tile
-.pixel_row
-	ld b, $02 ; 2 bytes (bitplanes) per pixel row
-.plane
+	ld c, 8 ; lines per tile
+.loop_pixel_rows
+	; abcdefgh ijklmnop
+	; -> aabbccdd iijjkkll aabbccdd iijjkkll at (offset)
+	;    eeffgghh mmnnoopp eeffgghh mmnnoopp at (offset + 2*6 tiles)
+	ld b, 2 ; bytes per line
+.loop_bitplanes
 	push bc
 	push hl
-	ld c, [hl] ; c = one bitplane byte (8 pixels)
-	ld b, $04
-.repack_lo
-	rr c ; pull a source pixel bit...
-	rra
-	sra a ; ...and pack it into a
-	dec b
-	jr nz, .repack_lo ; the low 4 bits of the byte
-	ld hl, $c0
-	add hl, de
-	ld [hli], a
-	inc hl
-	ld [hl], a ; write the packed value to de+$c0 and de+$c0+2
-	ld b, $04
-.repack_hi
+	ld c, [hl]
+	; efgh -> eeffgghh
+	ld b, 4
+.loop_right_half
 	rr c
 	rra
 	sra a
 	dec b
-	jr nz, .repack_hi ; the high 4 bits of the byte
-	ld [de], a
-	ld hl, $2
+	jr nz, .loop_right_half
+	ld hl, 2 * CARD_GFX_HEIGHT tiles
 	add hl, de
-	ld [hl], a ; write the packed value to de and de+2
+	ld [hli], a
+	inc hl
+	ld [hl], a
+	; abcd -> aabbccdd
+	ld b, 4
+.loop_left_half
+	rr c
+	rra
+	sra a
+	dec b
+	jr nz, .loop_left_half
+	ld [de], a
+	ld hl, 2
+	add hl, de
+	ld [hl], a
 	pop hl
 	pop bc
 	inc de
 	inc hl
 	dec b
-	jr nz, .plane
+	jr nz, .loop_bitplanes
 	inc de
 	inc de
 	dec c
-	jr nz, .pixel_row
+	jr nz, .loop_pixel_rows
 	pop bc
 	dec b
-	jr nz, .row
-	ld a, $c0
+	jr nz, .loop_rows
+	ld a, 2 * CARD_GFX_HEIGHT tiles
 	add e
 	ld e, a
-	ld a, $00
+	ld a, 0
 	adc d
-	ld d, a ; advance de by $c0 to the next tile-column block
+	ld d, a
 	dec c
-	jr nz, .col
+	jr nz, .loop_columns
 	ret
 
 LoadHandCardsIcon:
diff --git a/src/engine/bank09.asm b/src/engine/bank09.asm
index d419cdf..bed6fed 100644
--- a/src/engine/bank09.asm
+++ b/src/engine/bank09.asm
@@ -2022,7 +2022,7 @@ DrawColorChangeScreen:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	lb bc, CARD_TILE_COUNT, TILE_SIZE
+	lb bc, NUM_CARD_GFX_TILES, TILE_SIZE
 	call LoadCardGfx
 	lb de, 9, 2
 	bank1call DrawCardGfxToDE_BGPalIndex5
diff --git a/src/engine/bills_pc.asm b/src/engine/bills_pc.asm
index c4d0564..216168e 100644
--- a/src/engine/bills_pc.asm
+++ b/src/engine/bills_pc.asm
@@ -90,7 +90,7 @@ _BillsPC:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	lb bc, CARD_TILE_COUNT, TILE_SIZE
+	lb bc, NUM_CARD_GFX_TILES, TILE_SIZE
 	ld de, v0Tiles1 + $20 tiles
 	call LoadCardGfx
 	ld a, $a0 ; v0Tiles1 + $20 tiles
@@ -112,7 +112,7 @@ _BillsPC:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	lb bc, CARD_TILE_COUNT, TILE_SIZE
+	lb bc, NUM_CARD_GFX_TILES, TILE_SIZE
 	ld de, v0Tiles1 + $50 tiles
 	call LoadCardGfx
 	ld a, $d0 ; v0Tiles1 + $50 tiles
@@ -122,7 +122,7 @@ _BillsPC:
 	call FillRectangle
 	bank1call DrawCardGfxToDE_BGPalIndex2
 	ld de, v0Tiles1 + $10 tiles
-	ld hl, $36d0
+	ld hl, DuelCardHeaderGraphics + $20 tiles - $4000
 	ld b, $10
 	call CopyFontsOrDuelGraphicsTiles
 	ld a, $90 ; v0Tiles1 + $10 tiles
diff --git a/src/gfx.asm b/src/gfx.asm
index f85fcb5..500d0e8 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -76,7 +76,6 @@ Pals_6f0f0::
 	rgb  0,  0,  0
 	rgb 28, 12,  0
 	rgb 13,  9,  0
-; 0x6f108
 
 Pals_6f108::
 	rgb 31, 31, 31
@@ -84,6 +83,7 @@ Pals_6f108::
 	rgb  0,  0,  0
 	rgb  0, 10, 28
 
+Pals_6f110::
 	rgb 31, 31, 31
 	rgb 31, 22,  9
 	rgb 27,  9,  4
@@ -119,17 +119,44 @@ Pals_6f108::
 	rgb  8, 20, 27
 	rgb  0,  7, 14
 
+Pals_6f148::
 	rgb 31, 31, 31
 	rgb  0,  0, 31
 	rgb 31,  0,  0
 	rgb  0,  0,  0
-; 0x6f150
-
-SECTION "Gfx 1@7150", ROMX[$7150], BANK[$1b]
 
 SymbolsFont::
 INCBIN "gfx/fonts/symbols.2bpp"
 
+DuelGraphics::
+
+DuelCardHeaderGraphics::
+	INCBIN "gfx/duel/card_type_headers.2bpp"
+DuelCgbSymbolGraphics::
+	INCBIN "gfx/duel/cgb_card_symbols.2bpp"
+DuelDmgSgbSymbolGraphics::
+	INCBIN "gfx/duel/dmg_sgb_card_symbols.2bpp"
+DuelOtherGraphics::
+	INCBIN "gfx/duel/duel_other_gfx.2bpp"
+
+SECTION "Gfx 2", ROMX
+DuelCheckPokemonScreenGfx::
+	INCBIN "gfx/duel/check_pokemon_screen.2bpp"
+DuelPlayAreaScreenGfx::
+	INCBIN "gfx/duel/play_area_screen.2bpp"
+DuelPlayAreaScreenGfxDMG::
+	INCBIN "gfx/duel/play_area_screen_dmg.2bpp"
+DuelDeckAndDiscardPileIcons::
+	INCBIN "gfx/duel/deck_discard_icons.2bpp"
+DuelCoinTossResultTiles::
+	INCBIN "gfx/duel/coin_toss_result_symbols.2bpp"
+DuelMenuAndCardPicBorderTiles::
+	INCBIN "gfx/duel/menu_card_pic_border.2bpp"
+DuelDrawCardsScreenIcons::
+	INCBIN "gfx/duel/draw_cards_icons.2bpp"
+DuelBoxMessages::
+	INCBIN "gfx/duel/box_messages.2bpp"
+
 INCLUDE "gfx/card_graphics.asm"
 
 SECTION "Bank 4b", ROMX
diff --git a/src/gfx/card_graphics.asm b/src/gfx/card_graphics.asm
index 09dcd70..9c960aa 100644
--- a/src/gfx/card_graphics.asm
+++ b/src/gfx/card_graphics.asm
@@ -1,59 +1,35 @@
-; Card graphics. Each "<Name>CardGfx": 3 GBC palettes (rgb) + a 48-entry
-; attribute map (db; high 2 bits = each tile's palette, low 6 = a tile index
-; for the alternate LoadCardGfxRemapped renderer), then INCBIN of the 48
-; portrait tiles (built from gfx/cards/<name>.png, 4-shade grayscale, column-
-; major). A "<Name>CardGfxExtra" + INCBIN follows for cards whose printer
-; rendering pulls in extra tiles past the portrait; `ds` runs are inter-card
-; alignment padding. gfx/cards/misc/*.bin are the still-unlabeled gfx that
-; share these banks ahead of CardGraphics. Generated by
-; tools/extract_card_gfx.py.
+SECTION "Card Gfx 1", ROMX
 
-SECTION "Gfx 1b Tail", ROMX[$74d0], BANK[$1b]
-DuelCardHeaderGraphics::
-	INCBIN "gfx/duel/card_type_headers.2bpp"
-DuelCgbSymbolGraphics::
-	INCBIN "gfx/duel/cgb_card_symbols.2bpp"
-DuelDmgSgbSymbolGraphics::
-	INCBIN "gfx/duel/dmg_sgb_card_symbols.2bpp"
-DuelOtherGraphics::
-	INCBIN "gfx/duel/duel_other_gfx.2bpp"
-
-SECTION "Gfx 1c", ROMX[$4000], BANK[$1c]
-DuelCheckPokemonScreenGfx::
-	INCBIN "gfx/duel/check_pokemon_screen.2bpp"
-DuelPlayAreaScreenGfx::
-	INCBIN "gfx/duel/play_area_screen.2bpp"
-DuelPlayAreaScreenGfxDMG::
-	INCBIN "gfx/duel/play_area_screen_dmg.2bpp"
-DuelDeckAndDiscardPileIcons::
-	INCBIN "gfx/duel/deck_discard_icons.2bpp"
-DuelCoinTossResultTiles::
-	INCBIN "gfx/duel/coin_toss_result_symbols.2bpp"
-DuelMenuAndCardPicBorderTiles::
-	INCBIN "gfx/duel/menu_card_pic_border.2bpp"
-DuelDrawCardsScreenIcons::
-	INCBIN "gfx/duel/draw_cards_icons.2bpp"
-DuelBoxMessages::
-	INCBIN "gfx/duel/box_messages.2bpp"
-	ds $2450, $ff
-
-SECTION "Card Gfx 1", ROMX[$4000], BANK[$1d]
+; structure:
+; - <Name>CardGfx:
+;   - 3 GBC palettes (rgb)
+;   - per-tile attribute map for 48 tiles
+;     - bits 6-7: palette index (0, 1, 2)
+;     - bits 0-5: printer-only alt-tile offset for LoadCardGfx_PrinterAlt,
+;                 offset = 48 + (cur alt tile index) - (cur tile index),
+;                 0 if no alt
+;   - <name>.2bpp portrait, of 48 tiles, built from gfx/cards/<name>.png,
+;     in 4-shade grayscale, column-major
+; - <Name>CardGfxExtra: printer-only alt tiles in <name>_extra.2bpp
+; banks padded with $0 instead of $ff
+; TODO: replace the tools/derive_*_tiles.py workflow to allow the use of attribute macros
 CardGraphics::
+
 GrassEnergyCardGfx::
-	rgb 22,31,13
-	rgb 0,27,0
-	rgb 0,13,0
-	rgb 0,4,0
+	rgb 22, 31, 13
+	rgb  0, 27,  0
+	rgb  0, 13,  0
+	rgb  0,  4,  0
 
-	rgb 0,17,0
-	rgb 0,27,0
-	rgb 0,13,0
-	rgb 4,4,0
+	rgb  0, 17,  0
+	rgb  0, 27,  0
+	rgb  0, 13,  0
+	rgb  4,  4,  0
 
-	rgb 22,31,13
-	rgb 0,27,0
-	rgb 0,13,0
-	rgb 0,17,0
+	rgb 22, 31, 13
+	rgb  0, 27,  0
+	rgb  0, 13,  0
+	rgb  0, 17,  0
 
 	db $00, $6f, $6f, $2f, $2f, $6f, $6f, $2f, $6f, $af, $2f, $00, $2e, $00, $40, $40
 	db $40, $80, $00, $00, $00, $00, $80, $40, $40, $80, $21, $00, $00, $00, $9e, $40
@@ -61,21 +37,22 @@ GrassEnergyCardGfx::
 	INCBIN "gfx/cards/grass_energy.2bpp"
 GrassEnergyCardGfxExtra::
 	INCBIN "gfx/cards/grass_energy_extra.2bpp"
+
 FireEnergyCardGfx::
-	rgb 31,27,31
-	rgb 31,9,15
-	rgb 27,0,0
-	rgb 4,0,0
+	rgb 31, 27, 31
+	rgb 31,  9, 15
+	rgb 27,  0,  0
+	rgb  4,  0,  0
 
-	rgb 31,4,11
-	rgb 31,9,15
-	rgb 27,0,0
-	rgb 4,0,0
+	rgb 31,  4, 11
+	rgb 31,  9, 15
+	rgb 27,  0,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,31
-	rgb 31,9,15
-	rgb 27,0,0
-	rgb 31,4,11
+	rgb 31, 27, 31
+	rgb 31,  9, 15
+	rgb 27,  0,  0
+	rgb 31,  4, 11
 
 	db $40, $6f, $6f, $2f, $2f, $40, $6e, $6e, $6e, $6e, $ae, $00, $2d, $2d, $40, $40
 	db $40, $80, $00, $00, $00, $00, $80, $40, $40, $80, $00, $00, $00, $00, $9d, $40
@@ -83,21 +60,22 @@ FireEnergyCardGfx::
 	INCBIN "gfx/cards/fire_energy.2bpp"
 FireEnergyCardGfxExtra::
 	INCBIN "gfx/cards/fire_energy_extra.2bpp"
+
 WaterEnergyCardGfx::
-	rgb 27,31,31
-	rgb 0,22,31
-	rgb 0,11,20
-	rgb 0,0,9
+	rgb 27, 31, 31
+	rgb  0, 22, 31
+	rgb  0, 11, 20
+	rgb  0,  0,  9
 
-	rgb 0,22,31
-	rgb 0,16,25
-	rgb 0,11,20
-	rgb 0,0,9
+	rgb  0, 22, 31
+	rgb  0, 16, 25
+	rgb  0, 11, 20
+	rgb  0,  0,  9
 
-	rgb 27,31,31
-	rgb 0,22,31
-	rgb 0,11,20
-	rgb 0,16,25
+	rgb 27, 31, 31
+	rgb  0, 22, 31
+	rgb  0, 11, 20
+	rgb  0, 16, 25
 
 	db $70, $70, $70, $30, $30, $70, $70, $70, $70, $80, $2f, $00, $2e, $00, $80, $40
 	db $40, $80, $29, $00, $00, $00, $80, $40, $64, $00, $00, $00, $00, $00, $1f, $40
@@ -105,21 +83,22 @@ WaterEnergyCardGfx::
 	INCBIN "gfx/cards/water_energy.2bpp"
 WaterEnergyCardGfxExtra::
 	INCBIN "gfx/cards/water_energy_extra.2bpp"
+
 LightningEnergyCardGfx::
-	rgb 31,31,27
-	rgb 31,27,0
-	rgb 22,18,0
-	rgb 4,4,0
+	rgb 31, 31, 27
+	rgb 31, 27,  0
+	rgb 22, 18,  0
+	rgb  4,  4,  0
 
-	rgb 28,22,0
-	rgb 31,27,0
-	rgb 22,18,0
-	rgb 0,0,0
+	rgb 28, 22,  0
+	rgb 31, 27,  0
+	rgb 22, 18,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 31,27,0
-	rgb 28,22,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31, 27,  0
+	rgb 28, 22,  0
+	rgb  0,  0,  0
 
 	db $40, $6f, $6f, $2f, $2f, $6f, $6f, $6f, $40, $40, $00, $00, $2b, $00, $40, $40
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $1a, $40
@@ -127,21 +106,22 @@ LightningEnergyCardGfx::
 	INCBIN "gfx/cards/lightning_energy.2bpp"
 LightningEnergyCardGfxExtra::
 	INCBIN "gfx/cards/lightning_energy_extra.2bpp"
+
 FightingEnergyCardGfx::
-	rgb 31,31,27
-	rgb 31,9,0
-	rgb 22,0,0
-	rgb 4,0,0
+	rgb 31, 31, 27
+	rgb 31,  9,  0
+	rgb 22,  0,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,27
-	rgb 31,9,0
-	rgb 16,16,16
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31,  9,  0
+	rgb 16, 16, 16
+	rgb  0,  0,  0
 
-	rgb 29,4,0
-	rgb 31,9,0
-	rgb 22,0,0
-	rgb 0,0,0
+	rgb 29,  4,  0
+	rgb 31,  9,  0
+	rgb 22,  0,  0
+	rgb  0,  0,  0
 
 	db $00, $af, $af, $2f, $2f, $af, $af, $2f, $af, $af, $2f, $00, $2e, $2e, $80, $80
 	db $80, $00, $2a, $00, $00, $40, $00, $80, $80, $00, $00, $00, $00, $00, $1f, $9f
@@ -149,21 +129,22 @@ FightingEnergyCardGfx::
 	INCBIN "gfx/cards/fighting_energy.2bpp"
 FightingEnergyCardGfxExtra::
 	INCBIN "gfx/cards/fighting_energy_extra.2bpp"
+
 PsychicEnergyCardGfx::
-	rgb 31,27,31
-	rgb 27,13,27
-	rgb 18,4,18
-	rgb 4,0,9
+	rgb 31, 27, 31
+	rgb 27, 13, 27
+	rgb 18,  4, 18
+	rgb  4,  0,  9
 
-	rgb 22,7,22
-	rgb 27,13,27
-	rgb 18,4,18
-	rgb 4,0,9
+	rgb 22,  7, 22
+	rgb 27, 13, 27
+	rgb 18,  4, 18
+	rgb  4,  0,  9
 
-	rgb 31,27,31
-	rgb 27,13,27
-	rgb 18,4,18
-	rgb 22,7,22
+	rgb 31, 27, 31
+	rgb 27, 13, 27
+	rgb 18,  4, 18
+	rgb 22,  7, 22
 
 	db $40, $6f, $6f, $2f, $2f, $40, $6e, $2e, $6e, $6e, $ae, $00, $2d, $2d, $40, $40
 	db $40, $80, $00, $00, $00, $00, $80, $40, $40, $80, $00, $00, $00, $00, $9d, $40
@@ -171,21 +152,22 @@ PsychicEnergyCardGfx::
 	INCBIN "gfx/cards/psychic_energy.2bpp"
 PsychicEnergyCardGfxExtra::
 	INCBIN "gfx/cards/psychic_energy_extra.2bpp"
+
 DoubleColorlessEnergyCardGfx::
-	rgb 31,31,31
-	rgb 21,21,17
-	rgb 15,15,11
-	rgb 4,4,0
+	rgb 31, 31, 31
+	rgb 21, 21, 17
+	rgb 15, 15, 11
+	rgb  4,  4,  0
 
-	rgb 17,17,14
-	rgb 21,21,17
-	rgb 15,15,11
-	rgb 4,4,0
+	rgb 17, 17, 14
+	rgb 21, 21, 17
+	rgb 15, 15, 11
+	rgb  4,  4,  0
 
-	rgb 31,31,31
-	rgb 21,21,17
-	rgb 15,15,11
-	rgb 17,17,14
+	rgb 31, 31, 31
+	rgb 21, 21, 17
+	rgb 15, 15, 11
+	rgb 17, 17, 14
 
 	db $00, $6f, $6f, $2f, $2f, $6f, $6f, $2f, $6f, $af, $af, $00, $2e, $ae, $40, $40
 	db $40, $80, $00, $00, $00, $00, $80, $40, $40, $a3, $00, $00, $00, $00, $9f, $5f
@@ -193,21 +175,22 @@ DoubleColorlessEnergyCardGfx::
 	INCBIN "gfx/cards/double_colorless_energy.2bpp"
 DoubleColorlessEnergyCardGfxExtra::
 	INCBIN "gfx/cards/double_colorless_energy_extra.2bpp"
+
 PotionEnergyCardGfx::
-	rgb 31,31,31
-	rgb 15,27,19
-	rgb 4,17,6
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 27, 19
+	rgb  4, 17,  6
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 18,18,18
-	rgb 7,7,7
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 18, 18, 18
+	rgb  7,  7,  7
+	rgb  0,  0,  0
 
-	rgb 7,7,7
-	rgb 23,27,25
-	rgb 4,17,6
-	rgb 0,0,0
+	rgb  7,  7,  7
+	rgb 23, 27, 25
+	rgb  4, 17,  6
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $19, $00, $40, $40, $40, $00, $00, $00, $00
@@ -215,81 +198,85 @@ PotionEnergyCardGfx::
 	INCBIN "gfx/cards/potion_energy.2bpp"
 PotionEnergyCardGfxExtra::
 	INCBIN "gfx/cards/potion_energy_extra.2bpp"
+
 FullHealEnergyCardGfx::
-	rgb 31,31,31
-	rgb 16,12,28
-	rgb 10,1,17
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 16, 12, 28
+	rgb 10,  1, 17
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 6,18,28
-	rgb 10,1,17
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  6, 18, 28
+	rgb 10,  1, 17
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 28,1,0
-	rgb 10,1,17
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 28,  1,  0
+	rgb 10,  1, 17
+	rgb  0,  0,  0
 
 	db $00, $40, $40, $40, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $00
 	db $00, $00, $80, $00, $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/full_heal_energy.2bpp"
+
 RainbowEnergyCardGfx::
-	rgb 31,31,25
-	rgb 16,19,27
-	rgb 19,9,21
-	rgb 0,0,4
+	rgb 31, 31, 25
+	rgb 16, 19, 27
+	rgb 19,  9, 21
+	rgb  0,  0,  4
 
-	rgb 27,27,23
-	rgb 28,22,0
-	rgb 3,6,24
-	rgb 0,0,4
+	rgb 27, 27, 23
+	rgb 28, 22,  0
+	rgb  3,  6, 24
+	rgb  0,  0,  4
 
-	rgb 31,25,10
-	rgb 17,19,31
-	rgb 18,2,6
-	rgb 0,0,4
+	rgb 31, 25, 10
+	rgb 17, 19, 31
+	rgb 18,  2,  6
+	rgb  0,  0,  4
 
 	db $40, $40, $80, $40, $40, $40, $40, $40, $40, $40, $40, $80, $40, $80, $40, $40
 	db $40, $80, $40, $00, $00, $40, $80, $40, $40, $40, $40, $00, $00, $40, $40, $80
 	db $80, $40, $80, $40, $80, $40, $40, $80, $40, $40, $40, $40, $40, $80, $40, $40
 	INCBIN "gfx/cards/rainbow_energy.2bpp"
+
 BulbasaurLv13CardGfx::
-	rgb 27,31,27
-	rgb 13,27,22
-	rgb 0,18,4
-	rgb 0,4,4
+	rgb 27, 31, 27
+	rgb 13, 27, 22
+	rgb  0, 18,  4
+	rgb  0,  4,  4
 
-	rgb 27,17,29
-	rgb 21,11,20
-	rgb 0,18,4
-	rgb 0,4,4
+	rgb 27, 17, 29
+	rgb 21, 11, 20
+	rgb  0, 18,  4
+	rgb  0,  4,  4
 
-	rgb 27,17,27
-	rgb 23,3,12
-	rgb 0,18,4
-	rgb 0,4,4
+	rgb 27, 17, 27
+	rgb 23,  3, 12
+	rgb  0, 18,  4
+	rgb  0,  4,  4
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $80
 	db $40, $40, $00, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/bulbasaur_lv13.2bpp"
+
 IvysaurLv20CardGfx::
-	rgb 27,31,27
-	rgb 18,27,18
-	rgb 0,18,4
-	rgb 0,4,4
+	rgb 27, 31, 27
+	rgb 18, 27, 18
+	rgb  0, 18,  4
+	rgb  0,  4,  4
 
-	rgb 18,27,18
-	rgb 31,23,10
-	rgb 27,7,3
-	rgb 0,4,4
+	rgb 18, 27, 18
+	rgb 31, 23, 10
+	rgb 27,  7,  3
+	rgb  0,  4,  4
 
-	rgb 27,31,27
-	rgb 13,24,31
-	rgb 0,18,4
-	rgb 0,4,4
+	rgb 27, 31, 27
+	rgb 13, 24, 31
+	rgb  0, 18,  4
+	rgb  0,  4,  4
 
 	db $00, $00, $00, $00, $40, $40, $00, $00, $00, $27, $27, $40, $40, $40, $00, $00
 	db $00, $00, $00, $00, $40, $40, $1c, $00, $00, $80, $99, $80, $80, $80, $16, $16
@@ -297,21 +284,22 @@ IvysaurLv20CardGfx::
 	INCBIN "gfx/cards/ivysaur_lv20.2bpp"
 IvysaurLv20CardGfxExtra::
 	INCBIN "gfx/cards/ivysaur_lv20_extra.2bpp"
+
 VenusaurLv64CardGfx::
-	rgb 31,27,27
-	rgb 27,6,11
-	rgb 6,15,8
-	rgb 0,0,9
+	rgb 31, 27, 27
+	rgb 27,  6, 11
+	rgb  6, 15,  8
+	rgb  0,  0,  9
 
-	rgb 31,27,27
-	rgb 3,9,23
-	rgb 6,15,8
-	rgb 0,0,9
+	rgb 31, 27, 27
+	rgb  3,  9, 23
+	rgb  6, 15,  8
+	rgb  0,  0,  9
 
-	rgb 31,27,27
-	rgb 27,6,11
-	rgb 30,15,24
-	rgb 0,0,9
+	rgb 31, 27, 27
+	rgb 27,  6, 11
+	rgb 30, 15, 24
+	rgb  0,  0,  9
 
 	db $70, $70, $b0, $b0, $b0, $b0, $30, $00, $40, $00, $ad, $ad, $ad, $2d, $80, $00
 	db $40, $00, $29, $29, $00, $00, $00, $00, $65, $25, $00, $00, $00, $00, $21, $40
@@ -319,84 +307,89 @@ VenusaurLv64CardGfx::
 	INCBIN "gfx/cards/venusaur_lv64.2bpp"
 VenusaurLv64CardGfxExtra::
 	INCBIN "gfx/cards/venusaur_lv64_extra.2bpp"
+
 VenusaurLv67CardGfx::
-	rgb 22,31,22
-	rgb 9,22,13
-	rgb 0,9,9
-	rgb 0,0,9
+	rgb 22, 31, 22
+	rgb  9, 22, 13
+	rgb  0,  9,  9
+	rgb  0,  0,  9
 
-	rgb 22,31,22
-	rgb 30,22,0
-	rgb 30,10,0
-	rgb 0,0,9
+	rgb 22, 31, 22
+	rgb 30, 22,  0
+	rgb 30, 10,  0
+	rgb  0,  0,  9
 
-	rgb 22,31,22
-	rgb 30,10,0
-	rgb 0,9,9
-	rgb 0,0,9
+	rgb 22, 31, 22
+	rgb 30, 10,  0
+	rgb  0,  9,  9
+	rgb  0,  0,  9
 
 	db $00, $00, $40, $40, $40, $40, $40, $00, $00, $40, $80, $80, $80, $40, $40, $00
 	db $00, $80, $80, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/venusaur_lv67.2bpp"
+
 CaterpieCardGfx::
-	rgb 31,31,18
-	rgb 9,27,4
-	rgb 0,18,0
-	rgb 0,4,0
+	rgb 31, 31, 18
+	rgb  9, 27,  4
+	rgb  0, 18,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,18
-	rgb 31,3,2
-	rgb 0,18,0
-	rgb 0,4,0
+	rgb 31, 31, 18
+	rgb 31,  3,  2
+	rgb  0, 18,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,18
-	rgb 9,27,4
-	rgb 31,3,2
-	rgb 0,4,0
+	rgb 31, 31, 18
+	rgb  9, 27,  4
+	rgb 31,  3,  2
+	rgb  0,  4,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $80, $40, $40, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/caterpie.2bpp"
+
 MetapodLv21CardGfx::
-	rgb 31,31,22
-	rgb 9,27,0
-	rgb 4,18,0
-	rgb 0,4,0
+	rgb 31, 31, 22
+	rgb  9, 27,  0
+	rgb  4, 18,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,22
-	rgb 0,19,0
-	rgb 6,10,0
-	rgb 0,4,0
+	rgb 31, 31, 22
+	rgb  0, 19,  0
+	rgb  6, 10,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,22
-	rgb 20,13,10
-	rgb 6,10,0
-	rgb 0,4,0
+	rgb 31, 31, 22
+	rgb 20, 13, 10
+	rgb  6, 10,  0
+	rgb  0,  4,  0
 
 	db $00, $00, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $40, $40, $40, $40
 	db $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40
 	db $40, $80, $40, $00, $00, $00, $40, $40, $40, $80, $80, $40, $00, $00, $40, $40
 	INCBIN "gfx/cards/metapod_lv21.2bpp"
-	ds $90, $00
 
-SECTION "Card Gfx 1e", ROMX[$4000], BANK[$1e]
+	ds $90
+
+SECTION "Card Gfx 2", ROMX
+
 ButterfreeCardGfx::
-	rgb 31,31,31
-	rgb 26,0,7
-	rgb 0,20,5
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 26,  0,  7
+	rgb  0, 20,  5
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,15,31
-	rgb 9,9,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 15, 31
+	rgb  9,  9,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 26,0,7
-	rgb 9,9,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 26,  0,  7
+	rgb  9,  9,  9
+	rgb  0,  0,  0
 
 	db $70, $70, $70, $40, $40, $40, $6d, $2d, $6d, $40, $40, $40, $6a, $2a, $6a, $00
 	db $00, $00, $00, $a6, $66, $66, $a6, $00, $00, $24, $24, $a4, $64, $40, $a3, $23
@@ -404,61 +397,64 @@ ButterfreeCardGfx::
 	INCBIN "gfx/cards/butterfree.2bpp"
 ButterfreeCardGfxExtra::
 	INCBIN "gfx/cards/butterfree_extra.2bpp"
+
 WeedleLv12CardGfx::
-	rgb 31,31,27
-	rgb 31,27,0
-	rgb 31,5,20
-	rgb 4,0,4
+	rgb 31, 31, 27
+	rgb 31, 27,  0
+	rgb 31,  5, 20
+	rgb  4,  0,  4
 
-	rgb 31,31,27
-	rgb 10,24,13
-	rgb 0,11,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 10, 24, 13
+	rgb  0, 11,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 10,24,13
-	rgb 31,5,20
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 10, 24, 13
+	rgb 31,  5, 20
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40, $40
 	db $40, $80, $80, $80, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/weedle_lv12.2bpp"
+
 KakunaLv23CardGfx::
-	rgb 31,31,27
-	rgb 31,22,0
-	rgb 13,13,0
-	rgb 0,4,0
+	rgb 31, 31, 27
+	rgb 31, 22,  0
+	rgb 13, 13,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,27
-	rgb 23,31,0
-	rgb 3,18,0
-	rgb 0,4,0
+	rgb 31, 31, 27
+	rgb 23, 31,  0
+	rgb  3, 18,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,27
-	rgb 3,18,0
-	rgb 13,13,0
-	rgb 0,4,0
+	rgb 31, 31, 27
+	rgb  3, 18,  0
+	rgb 13, 13,  0
+	rgb  0,  4,  0
 
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $80, $00, $00, $80, $40, $40
 	db $40, $40, $40, $00, $00, $80, $40, $40, $40, $40, $40, $00, $00, $80, $40, $40
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $40, $80, $40, $40, $40, $40
 	INCBIN "gfx/cards/kakuna_lv23.2bpp"
+
 BeedrillCardGfx::
-	rgb 31,31,23
-	rgb 24,26,10
-	rgb 9,18,0
-	rgb 0,4,0
+	rgb 31, 31, 23
+	rgb 24, 26, 10
+	rgb  9, 18,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,23
-	rgb 31,27,4
-	rgb 31,0,0
-	rgb 0,4,0
+	rgb 31, 31, 23
+	rgb 31, 27,  4
+	rgb 31,  0,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,18
-	rgb 31,19,0
-	rgb 16,10,0
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb 31, 19,  0
+	rgb 16, 10,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00
 	db $00, $1f, $00, $40, $80, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00
@@ -466,21 +462,22 @@ BeedrillCardGfx::
 	INCBIN "gfx/cards/beedrill.2bpp"
 BeedrillCardGfxExtra::
 	INCBIN "gfx/cards/beedrill_extra.2bpp"
+
 EkansLv10CardGfx::
-	rgb 31,31,27
-	rgb 31,18,9
-	rgb 18,0,22
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31, 18,  9
+	rgb 18,  0, 22
+	rgb  0,  0,  0
 
-	rgb 11,25,5
-	rgb 31,18,9
-	rgb 4,16,7
-	rgb 0,0,0
+	rgb 11, 25,  5
+	rgb 31, 18,  9
+	rgb  4, 16,  7
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 11,25,5
-	rgb 18,0,22
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 11, 25,  5
+	rgb 18,  0, 22
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $2c, $6c, $40, $40, $00, $00, $00, $27, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $15, $00
@@ -488,21 +485,22 @@ EkansLv10CardGfx::
 	INCBIN "gfx/cards/ekans_lv10.2bpp"
 EkansLv10CardGfxExtra::
 	INCBIN "gfx/cards/ekans_lv10_extra.2bpp"
+
 ArbokLv27CardGfx::
-	rgb 31,27,31
-	rgb 31,9,9
-	rgb 18,0,22
-	rgb 0,0,0
+	rgb 31, 27, 31
+	rgb 31,  9,  9
+	rgb 18,  0, 22
+	rgb  0,  0,  0
 
-	rgb 31,27,31
-	rgb 0,23,0
-	rgb 0,14,0
-	rgb 0,0,0
+	rgb 31, 27, 31
+	rgb  0, 23,  0
+	rgb  0, 14,  0
+	rgb  0,  0,  0
 
-	rgb 31,27,31
-	rgb 0,14,0
-	rgb 18,0,22
-	rgb 0,0,0
+	rgb 31, 27, 31
+	rgb  0, 14,  0
+	rgb 18,  0, 22
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $69, $40, $80, $80, $a6, $80, $65, $40, $40
 	db $63, $00, $00, $21, $00, $80, $9f, $80, $40, $5d, $00, $00, $00, $80, $80, $00
@@ -510,21 +508,22 @@ ArbokLv27CardGfx::
 	INCBIN "gfx/cards/arbok_lv27.2bpp"
 ArbokLv27CardGfxExtra::
 	INCBIN "gfx/cards/arbok_lv27_extra.2bpp"
+
 NidoranFLv13CardGfx::
-	rgb 31,31,31
-	rgb 13,27,18
-	rgb 0,13,9
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 13, 27, 18
+	rgb  0, 13,  9
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 10,24,0
-	rgb 4,12,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 10, 24,  0
+	rgb  4, 12,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 13,27,18
-	rgb 31,5,4
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 13, 27, 18
+	rgb 31,  5,  4
+	rgb  0,  0,  4
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00, $22, $40
 	db $40, $00, $80, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40
@@ -532,21 +531,22 @@ NidoranFLv13CardGfx::
 	INCBIN "gfx/cards/nidoran_f_lv13.2bpp"
 NidoranFLv13CardGfxExtra::
 	INCBIN "gfx/cards/nidoran_f_lv13_extra.2bpp"
+
 NidorinaLv24CardGfx::
-	rgb 31,31,31
-	rgb 18,27,18
-	rgb 0,13,9
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 18, 27, 18
+	rgb  0, 13,  9
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 30,21,12
-	rgb 24,13,4
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 30, 21, 12
+	rgb 24, 13,  4
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 30,21,12
-	rgb 0,13,9
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 30, 21, 12
+	rgb  0, 13,  9
+	rgb  0,  0,  4
 
 	db $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $00, $00, $00, $80, $80
 	db $40, $40, $00, $00, $00, $1b, $5b, $40, $40, $00, $00, $17, $17, $00, $00, $40
@@ -554,41 +554,43 @@ NidorinaLv24CardGfx::
 	INCBIN "gfx/cards/nidorina_lv24.2bpp"
 NidorinaLv24CardGfxExtra::
 	INCBIN "gfx/cards/nidorina_lv24_extra.2bpp"
+
 NidoqueenCardGfx::
-	rgb 31,31,31
-	rgb 13,22,18
-	rgb 0,13,9
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 13, 22, 18
+	rgb  0, 13,  9
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 13,22,18
-	rgb 0,5,13
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 13, 22, 18
+	rgb  0,  5, 13
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 13,22,18
-	rgb 14,3,7
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 13, 22, 18
+	rgb 14,  3,  7
+	rgb  0,  0,  4
 
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40
 	db $80, $80, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $00, $00, $80, $80
 	db $80, $80, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $00, $00, $00, $80
 	INCBIN "gfx/cards/nidoqueen.2bpp"
+
 NidoranMLv20CardGfx::
-	rgb 31,27,27
-	rgb 27,13,22
-	rgb 18,4,13
-	rgb 4,0,9
+	rgb 31, 27, 27
+	rgb 27, 13, 22
+	rgb 18,  4, 13
+	rgb  4,  0,  9
 
-	rgb 31,27,27
-	rgb 11,15,31
-	rgb 0,8,27
-	rgb 4,0,9
+	rgb 31, 27, 27
+	rgb 11, 15, 31
+	rgb  0,  8, 27
+	rgb  4,  0,  9
 
-	rgb 31,27,27
-	rgb 27,13,22
-	rgb 11,15,31
-	rgb 4,0,9
+	rgb 31, 27, 27
+	rgb 27, 13, 22
+	rgb 11, 15, 31
+	rgb  4,  0,  9
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $80, $80, $40, $40
 	db $40, $40, $40, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $00, $00
@@ -596,161 +598,169 @@ NidoranMLv20CardGfx::
 	INCBIN "gfx/cards/nidoran_m_lv20.2bpp"
 NidoranMLv20CardGfxExtra::
 	INCBIN "gfx/cards/nidoran_m_lv20_extra.2bpp"
+
 NidorinoLv25CardGfx::
-	rgb 31,27,27
-	rgb 31,18,22
-	rgb 27,9,18
-	rgb 4,0,9
+	rgb 31, 27, 27
+	rgb 31, 18, 22
+	rgb 27,  9, 18
+	rgb  4,  0,  9
 
-	rgb 31,27,27
-	rgb 22,25,0
-	rgb 10,20,5
-	rgb 0,0,0
+	rgb 31, 27, 27
+	rgb 22, 25,  0
+	rgb 10, 20,  5
+	rgb  0,  0,  0
 
-	rgb 19,28,31
-	rgb 0,21,31
-	rgb 27,9,18
-	rgb 0,0,0
+	rgb 19, 28, 31
+	rgb  0, 21, 31
+	rgb 27,  9, 18
+	rgb  0,  0,  0
 
 	db $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $40, $00, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/nidorino_lv25.2bpp"
+
 NidokingCardGfx::
-	rgb 31,27,31
-	rgb 31,11,27
-	rgb 15,7,22
-	rgb 4,0,9
+	rgb 31, 27, 31
+	rgb 31, 11, 27
+	rgb 15,  7, 22
+	rgb  4,  0,  9
 
-	rgb 31,31,24
-	rgb 9,23,8
-	rgb 0,10,0
-	rgb 4,0,9
+	rgb 31, 31, 24
+	rgb  9, 23,  8
+	rgb  0, 10,  0
+	rgb  4,  0,  9
 
-	rgb 31,31,24
-	rgb 22,7,8
-	rgb 10,0,0
-	rgb 4,0,9
+	rgb 31, 31, 24
+	rgb 22,  7,  8
+	rgb 10,  0,  0
+	rgb  4,  0,  9
 
 	db $40, $40, $00, $00, $00, $80, $40, $40, $80, $40, $00, $00, $00, $00, $40, $40
 	db $40, $80, $00, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $40
 	db $80, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $80
 	INCBIN "gfx/cards/nidoking.2bpp"
+
 ZubatLv10CardGfx::
-	rgb 31,31,18
-	rgb 18,21,31
-	rgb 15,0,24
-	rgb 0,0,4
+	rgb 31, 31, 18
+	rgb 18, 21, 31
+	rgb 15,  0, 24
+	rgb  0,  0,  4
 
-	rgb 31,31,18
-	rgb 31,14,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb 31, 14,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,18
-	rgb 31,14,0
-	rgb 15,0,24
-	rgb 0,0,4
+	rgb 31, 31, 18
+	rgb 31, 14,  0
+	rgb 15,  0, 24
+	rgb  0,  0,  4
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $00, $00, $00, $80, $40, $40
 	db $40, $80, $00, $00, $00, $00, $80, $40, $40, $40, $40, $00, $00, $00, $00, $40
 	db $40, $40, $40, $00, $40, $40, $00, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/zubat_lv10.2bpp"
+
 GolbatLv29CardGfx::
-	rgb 27,27,31
-	rgb 13,18,27
-	rgb 0,10,22
-	rgb 0,2,7
+	rgb 27, 27, 31
+	rgb 13, 18, 27
+	rgb  0, 10, 22
+	rgb  0,  2,  7
 
-	rgb 27,27,31
-	rgb 13,18,27
-	rgb 8,4,20
-	rgb 0,2,7
+	rgb 27, 27, 31
+	rgb 13, 18, 27
+	rgb  8,  4, 20
+	rgb  0,  2,  7
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/golbat_lv29.2bpp"
+
 OddishLv8CardGfx::
-	rgb 31,31,31
-	rgb 13,27,4
-	rgb 4,6,15
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 13, 27,  4
+	rgb  4,  6, 15
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 0,12,20
-	rgb 4,6,15
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb  0, 12, 20
+	rgb  4,  6, 15
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 13,27,4
-	rgb 12,9,0
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 13, 27,  4
+	rgb 12,  9,  0
+	rgb  0,  0,  4
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $40, $40, $40
 	db $40, $40, $40, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $80, $80, $80, $80, $80, $80, $80, $80
 	INCBIN "gfx/cards/oddish_lv8.2bpp"
+
 GloomCardGfx::
-	rgb 31,31,27
-	rgb 31,9,0
-	rgb 19,1,27
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31,  9,  0
+	rgb 19,  1, 27
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 31,9,0
-	rgb 0,12,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31,  9,  0
+	rgb  0, 12,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 6,26,0
-	rgb 0,12,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb  6, 26,  0
+	rgb  0, 12,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $40, $80, $80, $40, $80
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $40, $00, $00, $00, $00, $40
 	db $40, $40, $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/gloom.2bpp"
+
 VileplumeCardGfx::
-	rgb 31,31,31
-	rgb 31,0,4
-	rgb 4,13,27
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 31,  0,  4
+	rgb  4, 13, 27
+	rgb  0,  0,  4
 
-	rgb 21,31,26
-	rgb 18,31,4
-	rgb 4,18,0
-	rgb 0,0,4
+	rgb 21, 31, 26
+	rgb 18, 31,  4
+	rgb  4, 18,  0
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 31,0,4
-	rgb 4,18,0
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 31,  0,  4
+	rgb  4, 18,  0
+	rgb  0,  0,  4
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $00, $00, $00, $00, $80, $40
 	db $40, $80, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/vileplume.2bpp"
+
 ParasLv8CardGfx::
-	rgb 31,31,31
-	rgb 31,13,4
-	rgb 31,0,4
-	rgb 4,0,4
+	rgb 31, 31, 31
+	rgb 31, 13,  4
+	rgb 31,  0,  4
+	rgb  4,  0,  4
 
-	rgb 31,31,31
-	rgb 19,16,31
-	rgb 10,0,29
-	rgb 4,0,4
+	rgb 31, 31, 31
+	rgb 19, 16, 31
+	rgb 10,  0, 29
+	rgb  4,  0,  4
 
-	rgb 31,31,31
-	rgb 8,0,24
-	rgb 31,0,4
-	rgb 4,0,4
+	rgb 31, 31, 31
+	rgb  8,  0, 24
+	rgb 31,  0,  4
+	rgb  4,  0,  4
 
 	db $40, $40, $00, $00, $40, $80, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
 	db $40, $5f, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00
@@ -758,24 +768,26 @@ ParasLv8CardGfx::
 	INCBIN "gfx/cards/paras_lv8.2bpp"
 ParasLv8CardGfxExtra::
 	INCBIN "gfx/cards/paras_lv8_extra.2bpp"
-	ds $120, $00
 
-SECTION "Card Gfx 1f", ROMX[$4000], BANK[$1f]
+	ds $120
+
+SECTION "Card Gfx 3", ROMX
+
 ParasectLv28CardGfx::
-	rgb 31,27,27
-	rgb 31,13,9
-	rgb 31,0,4
-	rgb 9,0,0
+	rgb 31, 27, 27
+	rgb 31, 13,  9
+	rgb 31,  0,  4
+	rgb  9,  0,  0
 
-	rgb 31,27,27
-	rgb 19,27,5
-	rgb 11,17,0
-	rgb 9,0,0
+	rgb 31, 27, 27
+	rgb 19, 27,  5
+	rgb 11, 17,  0
+	rgb  9,  0,  0
 
-	rgb 31,27,27
-	rgb 19,27,5
-	rgb 31,0,4
-	rgb 9,0,0
+	rgb 31, 27, 27
+	rgb 19, 27,  5
+	rgb 31,  0,  4
+	rgb  9,  0,  0
 
 	db $40, $40, $40, $40, $80, $40, $40, $40, $40, $40, $40, $40, $00, $80, $40, $40
 	db $40, $40, $80, $00, $00, $00, $40, $40, $40, $80, $00, $00, $00, $00, $80, $40
@@ -783,161 +795,169 @@ ParasectLv28CardGfx::
 	INCBIN "gfx/cards/parasect_lv28.2bpp"
 ParasectLv28CardGfxExtra::
 	INCBIN "gfx/cards/parasect_lv28_extra.2bpp"
+
 VenonatLv12CardGfx::
-	rgb 25,29,26
-	rgb 31,0,4
-	rgb 18,0,22
-	rgb 8,4,8
+	rgb 25, 29, 26
+	rgb 31,  0,  4
+	rgb 18,  0, 22
+	rgb  8,  4,  8
 
-	rgb 25,29,26
-	rgb 29,19,0
-	rgb 18,0,22
-	rgb 8,4,8
+	rgb 25, 29, 26
+	rgb 29, 19,  0
+	rgb 18,  0, 22
+	rgb  8,  4,  8
 
-	rgb 25,29,26
-	rgb 29,19,0
-	rgb 13,14,0
-	rgb 8,4,8
+	rgb 25, 29, 26
+	rgb 29, 19,  0
+	rgb 13, 14,  0
+	rgb  8,  4,  8
 
 	db $80, $40, $00, $00, $00, $80, $80, $80, $80, $80, $40, $00, $00, $40, $80, $80
 	db $80, $80, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $40, $00, $80, $80
 	db $80, $80, $40, $00, $40, $00, $80, $80, $80, $40, $40, $00, $00, $00, $40, $80
 	INCBIN "gfx/cards/venonat_lv12.2bpp"
+
 VenomothLv28CardGfx::
-	rgb 31,27,31
-	rgb 27,9,22
-	rgb 22,0,13
-	rgb 0,4,4
+	rgb 31, 27, 31
+	rgb 27,  9, 22
+	rgb 22,  0, 13
+	rgb  0,  4,  4
 
-	rgb 31,31,27
-	rgb 0,17,0
-	rgb 0,10,0
-	rgb 0,4,4
+	rgb 31, 31, 27
+	rgb  0, 17,  0
+	rgb  0, 10,  0
+	rgb  0,  4,  4
 
-	rgb 31,31,27
-	rgb 0,17,18
-	rgb 0,6,14
-	rgb 0,4,4
+	rgb 31, 31, 27
+	rgb  0, 17, 18
+	rgb  0,  6, 14
+	rgb  0,  4,  4
 
 	db $80, $00, $00, $00, $80, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $80
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/venomoth_lv28.2bpp"
+
 BellsproutLv11CardGfx::
-	rgb 27,31,22
-	rgb 31,27,0
-	rgb 9,22,0
-	rgb 0,0,0
+	rgb 27, 31, 22
+	rgb 31, 27,  0
+	rgb  9, 22,  0
+	rgb  0,  0,  0
 
-	rgb 27,31,22
-	rgb 29,11,21
-	rgb 11,5,22
-	rgb 0,0,0
+	rgb 27, 31, 22
+	rgb 29, 11, 21
+	rgb 11,  5, 22
+	rgb  0,  0,  0
 
-	rgb 27,31,22
-	rgb 31,27,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 27, 31, 22
+	rgb 31, 27,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00
 	db $40, $40, $40, $40, $80, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00
 	db $40, $40, $00, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00
 	INCBIN "gfx/cards/bellsprout_lv11.2bpp"
+
 WeepinbellLv28CardGfx::
-	rgb 31,31,20
-	rgb 31,22,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 20
+	rgb 31, 22,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 28,31,31
-	rgb 11,23,0
-	rgb 16,0,31
-	rgb 0,0,0
+	rgb 28, 31, 31
+	rgb 11, 23,  0
+	rgb 16,  0, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,20
-	rgb 11,23,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 20
+	rgb 11, 23,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $80, $40, $40, $40, $40, $40
 	db $00, $40, $40, $00, $00, $40, $40, $40, $80, $40, $40, $00, $00, $00, $80, $40
 	db $40, $40, $40, $80, $00, $80, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/weepinbell_lv28.2bpp"
+
 VictreebelCardGfx::
-	rgb 31,31,17
-	rgb 31,4,0
-	rgb 0,22,0
-	rgb 0,0,0
+	rgb 31, 31, 17
+	rgb 31,  4,  0
+	rgb  0, 22,  0
+	rgb  0,  0,  0
 
-	rgb 20,31,31
-	rgb 9,18,31
-	rgb 0,0,31
-	rgb 0,0,0
+	rgb 20, 31, 31
+	rgb  9, 18, 31
+	rgb  0,  0, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,17
-	rgb 16,27,0
-	rgb 0,22,0
-	rgb 0,0,0
+	rgb 31, 31, 17
+	rgb 16, 27,  0
+	rgb  0, 22,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $00, $80, $80, $40, $40, $40, $40, $40, $00, $80, $00, $80, $40, $40
 	db $40, $40, $00, $00, $00, $80, $40, $40, $40, $40, $80, $00, $80, $80, $00, $40
 	db $40, $80, $80, $00, $80, $80, $00, $40, $40, $40, $00, $00, $40, $00, $00, $40
 	INCBIN "gfx/cards/victreebel.2bpp"
+
 GrimerLv17CardGfx::
-	rgb 31,22,31
-	rgb 21,4,30
-	rgb 16,3,18
-	rgb 0,0,0
+	rgb 31, 22, 31
+	rgb 21,  4, 30
+	rgb 16,  3, 18
+	rgb  0,  0,  0
 
-	rgb 31,22,31
-	rgb 21,4,30
-	rgb 0,14,0
-	rgb 0,0,0
+	rgb 31, 22, 31
+	rgb 21,  4, 30
+	rgb  0, 14,  0
+	rgb  0,  0,  0
 
-	rgb 31,22,31
-	rgb 9,3,16
-	rgb 16,3,18
-	rgb 0,0,0
+	rgb 31, 22, 31
+	rgb  9,  3, 16
+	rgb 16,  3, 18
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80
 	db $80, $80, $80, $80, $80, $80, $80, $80, $40, $40, $00, $00, $80, $80, $80, $80
 	db $40, $40, $00, $00, $80, $80, $80, $80, $40, $40, $00, $00, $00, $80, $80, $80
 	INCBIN "gfx/cards/grimer_lv17.2bpp"
+
 MukCardGfx::
-	rgb 31,25,21
-	rgb 18,13,27
-	rgb 12,6,13
-	rgb 0,0,6
+	rgb 31, 25, 21
+	rgb 18, 13, 27
+	rgb 12,  6, 13
+	rgb  0,  0,  6
 
-	rgb 31,25,21
-	rgb 18,9,2
-	rgb 8,0,4
-	rgb 0,0,6
+	rgb 31, 25, 21
+	rgb 18,  9,  2
+	rgb  8,  0,  4
+	rgb  0,  0,  6
 
-	rgb 31,25,21
-	rgb 6,15,2
-	rgb 0,6,2
-	rgb 0,0,6
+	rgb 31, 25, 21
+	rgb  6, 15,  2
+	rgb  0,  6,  2
+	rgb  0,  0,  6
 
 	db $40, $40, $80, $80, $00, $00, $00, $80, $40, $80, $00, $00, $00, $00, $00, $00
 	db $40, $00, $00, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $40
 	db $80, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/muk.2bpp"
+
 ExeggcuteCardGfx::
-	rgb 31,27,31
-	rgb 28,15,25
-	rgb 21,8,18
-	rgb 9,0,9
+	rgb 31, 27, 31
+	rgb 28, 15, 25
+	rgb 21,  8, 18
+	rgb  9,  0,  9
 
-	rgb 25,28,19
-	rgb 12,22,0
-	rgb 1,15,0
-	rgb 9,0,9
+	rgb 25, 28, 19
+	rgb 12, 22,  0
+	rgb  1, 15,  0
+	rgb  9,  0,  9
 
-	rgb 25,28,19
-	rgb 28,15,25
-	rgb 12,22,0
-	rgb 9,0,9
+	rgb 25, 28, 19
+	rgb 28, 15, 25
+	rgb 12, 22,  0
+	rgb  9,  0,  9
 
 	db $40, $40, $40, $40, $80, $80, $40, $69, $69, $a9, $29, $80, $00, $00, $40, $40
 	db $40, $a3, $00, $22, $00, $80, $00, $9f, $40, $80, $00, $00, $00, $00, $00, $80
@@ -945,21 +965,22 @@ ExeggcuteCardGfx::
 	INCBIN "gfx/cards/exeggcute.2bpp"
 ExeggcuteCardGfxExtra::
 	INCBIN "gfx/cards/exeggcute_extra.2bpp"
+
 ExeggutorCardGfx::
-	rgb 31,31,18
-	rgb 31,18,0
-	rgb 22,9,4
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb 31, 18,  0
+	rgb 22,  9,  4
+	rgb  4,  0,  0
 
-	rgb 31,31,18
-	rgb 19,26,0
-	rgb 3,19,0
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb 19, 26,  0
+	rgb  3, 19,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,18
-	rgb 22,9,4
-	rgb 3,19,0
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb 22,  9,  4
+	rgb  3, 19,  0
+	rgb  4,  0,  0
 
 	db $00, $40, $80, $6d, $00, $00, $00, $00, $29, $40, $40, $40, $66, $00, $00, $00
 	db $00, $80, $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $40, $40, $40
@@ -967,41 +988,43 @@ ExeggutorCardGfx::
 	INCBIN "gfx/cards/exeggutor.2bpp"
 ExeggutorCardGfxExtra::
 	INCBIN "gfx/cards/exeggutor_extra.2bpp"
+
 KoffingLv13CardGfx::
-	rgb 31,31,13
-	rgb 27,13,22
-	rgb 18,0,18
-	rgb 4,0,4
+	rgb 31, 31, 13
+	rgb 27, 13, 22
+	rgb 18,  0, 18
+	rgb  4,  0,  4
 
-	rgb 31,31,13
-	rgb 0,24,0
-	rgb 0,15,0
-	rgb 4,0,4
+	rgb 31, 31, 13
+	rgb  0, 24,  0
+	rgb  0, 15,  0
+	rgb  4,  0,  4
 
-	rgb 31,31,13
-	rgb 0,24,0
-	rgb 18,0,18
-	rgb 4,0,4
+	rgb 31, 31, 13
+	rgb  0, 24,  0
+	rgb 18,  0, 18
+	rgb  4,  0,  4
 
 	db $40, $40, $80, $80, $00, $00, $00, $00, $40, $80, $00, $00, $00, $00, $80, $40
 	db $80, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $80, $40
 	db $00, $00, $00, $00, $00, $00, $80, $40, $40, $00, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/koffing_lv13.2bpp"
+
 WeezingLv27CardGfx::
-	rgb 31,31,8
-	rgb 15,19,1
-	rgb 22,6,18
-	rgb 7,6,1
+	rgb 31, 31,  8
+	rgb 15, 19,  1
+	rgb 22,  6, 18
+	rgb  7,  6,  1
 
-	rgb 31,31,8
-	rgb 15,19,1
-	rgb 9,12,0
-	rgb 7,6,1
+	rgb 31, 31,  8
+	rgb 15, 19,  1
+	rgb  9, 12,  0
+	rgb  7,  6,  1
 
-	rgb 9,8,4
-	rgb 15,19,1
-	rgb 9,12,0
-	rgb 7,6,1
+	rgb  9,  8,  4
+	rgb 15, 19,  1
+	rgb  9, 12,  0
+	rgb  7,  6,  1
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $25, $00, $00, $00, $00
 	db $00, $20, $00, $00, $00, $00, $00, $1b, $00, $00, $00, $00, $00, $16, $00, $00
@@ -1009,21 +1032,22 @@ WeezingLv27CardGfx::
 	INCBIN "gfx/cards/weezing_lv27.2bpp"
 WeezingLv27CardGfxExtra::
 	INCBIN "gfx/cards/weezing_lv27_extra.2bpp"
+
 TangelaLv8CardGfx::
-	rgb 31,31,25
-	rgb 9,27,13
-	rgb 9,9,22
-	rgb 4,0,0
+	rgb 31, 31, 25
+	rgb  9, 27, 13
+	rgb  9,  9, 22
+	rgb  4,  0,  0
 
-	rgb 31,31,25
-	rgb 24,0,0
-	rgb 9,9,22
-	rgb 4,0,0
+	rgb 31, 31, 25
+	rgb 24,  0,  0
+	rgb  9,  9, 22
+	rgb  4,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $27, $27, $00, $00, $00, $00, $00
 	db $22, $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $16, $00, $00
@@ -1031,81 +1055,85 @@ TangelaLv8CardGfx::
 	INCBIN "gfx/cards/tangela_lv8.2bpp"
 TangelaLv8CardGfxExtra::
 	INCBIN "gfx/cards/tangela_lv8_extra.2bpp"
+
 TangelaLv12CardGfx::
-	rgb 27,27,27
-	rgb 9,18,4
-	rgb 0,9,22
-	rgb 0,0,9
+	rgb 27, 27, 27
+	rgb  9, 18,  4
+	rgb  0,  9, 22
+	rgb  0,  0,  9
 
-	rgb 27,27,27
-	rgb 9,18,4
-	rgb 27,4,0
-	rgb 0,0,9
+	rgb 27, 27, 27
+	rgb  9, 18,  4
+	rgb 27,  4,  0
+	rgb  0,  0,  9
 
-	rgb 27,27,27
-	rgb 27,4,0
-	rgb 0,9,22
-	rgb 0,0,9
+	rgb 27, 27, 27
+	rgb 27,  4,  0
+	rgb  0,  9, 22
+	rgb  0,  0,  9
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $00, $00
 	INCBIN "gfx/cards/tangela_lv12.2bpp"
+
 ScytherLv25CardGfx::
-	rgb 31,31,27
-	rgb 4,31,9
-	rgb 0,18,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb  4, 31,  9
+	rgb  0, 18,  0
+	rgb  0,  0,  0
 
-	rgb 27,31,31
-	rgb 14,24,31
-	rgb 0,16,31
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb 14, 24, 31
+	rgb  0, 16, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 0,0,31
-	rgb 0,18,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb  0,  0, 31
+	rgb  0, 18,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $00, $40, $40, $40, $40, $40, $80, $80, $00, $00, $00, $40
 	db $40, $80, $00, $00, $00, $00, $40, $40, $40, $00, $80, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $40, $40, $00, $00, $40, $40
 	INCBIN "gfx/cards/scyther_lv25.2bpp"
+
 PinsirLv24CardGfx::
-	rgb 27,25,19
-	rgb 17,15,9
-	rgb 8,7,0
-	rgb 0,0,0
+	rgb 27, 25, 19
+	rgb 17, 15,  9
+	rgb  8,  7,  0
+	rgb  0,  0,  0
 
-	rgb 10,25,0
-	rgb 3,16,0
-	rgb 0,9,8
-	rgb 0,0,0
+	rgb 10, 25,  0
+	rgb  3, 16,  0
+	rgb  0,  9,  8
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 17,15,9
-	rgb 3,16,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 17, 15,  9
+	rgb  3, 16,  0
+	rgb  0,  0,  0
 
 	db $40, $80, $80, $80, $00, $00, $00, $00, $40, $80, $00, $00, $00, $00, $00, $40
 	db $40, $80, $00, $00, $00, $00, $00, $80, $40, $80, $00, $00, $00, $00, $80, $40
 	db $40, $80, $00, $00, $00, $00, $80, $00, $40, $80, $00, $80, $40, $80, $80, $40
 	INCBIN "gfx/cards/pinsir_lv24.2bpp"
+
 CharmanderLv10CardGfx::
-	rgb 31,31,16
-	rgb 31,18,5
-	rgb 27,9,0
-	rgb 0,10,0
+	rgb 31, 31, 16
+	rgb 31, 18,  5
+	rgb 27,  9,  0
+	rgb  0, 10,  0
 
-	rgb 31,31,16
-	rgb 31,18,5
-	rgb 9,21,0
-	rgb 0,10,0
+	rgb 31, 31, 16
+	rgb 31, 18,  5
+	rgb  9, 21,  0
+	rgb  0, 10,  0
 
-	rgb 9,21,0
-	rgb 31,18,5
-	rgb 27,9,0
-	rgb 0,10,0
+	rgb  9, 21,  0
+	rgb 31, 18,  5
+	rgb 27,  9,  0
+	rgb  0, 10,  0
 
 	db $40, $40, $40, $00, $40, $40, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $40, $80, $80, $80
@@ -1113,21 +1141,22 @@ CharmanderLv10CardGfx::
 	INCBIN "gfx/cards/charmander_lv10.2bpp"
 CharmanderLv10CardGfxExtra::
 	INCBIN "gfx/cards/charmander_lv10_extra.2bpp"
+
 CharmeleonCardGfx::
-	rgb 27,31,22
-	rgb 31,22,4
-	rgb 31,0,4
-	rgb 4,0,0
+	rgb 27, 31, 22
+	rgb 31, 22,  4
+	rgb 31,  0,  4
+	rgb  4,  0,  0
 
-	rgb 27,31,22
-	rgb 15,22,31
-	rgb 15,0,25
-	rgb 4,0,0
+	rgb 27, 31, 22
+	rgb 15, 22, 31
+	rgb 15,  0, 25
+	rgb  4,  0,  0
 
-	rgb 27,31,22
-	rgb 31,0,4
-	rgb 15,0,25
-	rgb 4,0,0
+	rgb 27, 31, 22
+	rgb 31,  0,  4
+	rgb 15,  0, 25
+	rgb  4,  0,  0
 
 	db $40, $40, $00, $2d, $2d, $40, $40, $40, $6a, $40, $00, $00, $00, $40, $40, $40
 	db $40, $80, $00, $00, $00, $80, $40, $5c, $80, $00, $00, $00, $00, $00, $80, $80
@@ -1135,84 +1164,89 @@ CharmeleonCardGfx::
 	INCBIN "gfx/cards/charmeleon.2bpp"
 CharmeleonCardGfxExtra::
 	INCBIN "gfx/cards/charmeleon_extra.2bpp"
-	ds $250, $00
 
-SECTION "Card Gfx 20", ROMX[$4000], BANK[$20]
+	ds $250
+
+SECTION "Card Gfx 4", ROMX
+
 CharizardLv76CardGfx::
-	rgb 31,27,22
-	rgb 31,18,9
-	rgb 27,4,0
-	rgb 4,0,0
+	rgb 31, 27, 22
+	rgb 31, 18,  9
+	rgb 27,  4,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,22
-	rgb 17,24,0
-	rgb 27,4,0
-	rgb 4,0,0
+	rgb 31, 27, 22
+	rgb 17, 24,  0
+	rgb 27,  4,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,22
-	rgb 31,18,9
-	rgb 1,11,15
-	rgb 4,0,0
+	rgb 31, 27, 22
+	rgb 31, 18,  9
+	rgb  1, 11, 15
+	rgb  4,  0,  0
 
 	db $00, $00, $00, $40, $40, $00, $00, $80, $00, $40, $40, $80, $80, $00, $80, $80
 	db $40, $40, $40, $80, $00, $00, $80, $80, $40, $40, $00, $00, $00, $00, $00, $40
 	db $00, $00, $00, $00, $00, $40, $00, $40, $40, $80, $00, $00, $00, $40, $00, $40
 	INCBIN "gfx/cards/charizard_lv76.2bpp"
+
 VulpixLv11CardGfx::
-	rgb 31,31,18
-	rgb 31,13,4
-	rgb 27,4,0
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb 31, 13,  4
+	rgb 27,  4,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,18
-	rgb 31,13,4
-	rgb 11,0,20
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb 31, 13,  4
+	rgb 11,  0, 20
+	rgb  4,  0,  0
 
-	rgb 31,31,18
-	rgb 5,28,24
-	rgb 11,0,20
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb  5, 28, 24
+	rgb 11,  0, 20
+	rgb  4,  0,  0
 
 	db $80, $80, $80, $80, $80, $80, $00, $00, $80, $40, $00, $00, $40, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $00, $00, $00
 	db $00, $80, $40, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/vulpix_lv11.2bpp"
+
 NinetalesLv32CardGfx::
-	rgb 31,31,18
-	rgb 31,27,0
-	rgb 22,18,4
-	rgb 0,4,0
+	rgb 31, 31, 18
+	rgb 31, 27,  0
+	rgb 22, 18,  4
+	rgb  0,  4,  0
 
-	rgb 31,31,18
-	rgb 5,23,20
-	rgb 0,7,18
-	rgb 0,4,0
+	rgb 31, 31, 18
+	rgb  5, 23, 20
+	rgb  0,  7, 18
+	rgb  0,  4,  0
 
-	rgb 31,31,18
-	rgb 31,27,0
-	rgb 0,7,18
-	rgb 0,4,0
+	rgb 31, 31, 18
+	rgb 31, 27,  0
+	rgb  0,  7, 18
+	rgb  0,  4,  0
 
 	db $40, $40, $40, $40, $80, $80, $80, $40, $40, $40, $00, $00, $00, $00, $80, $40
 	db $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $00, $80, $40, $40, $80, $00, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/ninetales_lv32.2bpp"
+
 NinetalesLv35CardGfx::
-	rgb 31,27,27
-	rgb 31,18,0
-	rgb 27,0,4
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 31, 18,  0
+	rgb 27,  0,  4
+	rgb  4,  0,  0
 
-	rgb 31,27,27
-	rgb 31,18,0
-	rgb 31,12,0
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 31, 18,  0
+	rgb 31, 12,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,27
-	rgb 31,12,0
-	rgb 27,0,4
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 31, 12,  0
+	rgb 27,  0,  4
+	rgb  4,  0,  0
 
 	db $b0, $b0, $80, $80, $80, $80, $2c, $2c, $40, $40, $40, $40, $40, $40, $00, $80
 	db $40, $00, $40, $40, $40, $40, $40, $80, $00, $00, $40, $40, $40, $40, $40, $80
@@ -1220,41 +1254,43 @@ NinetalesLv35CardGfx::
 	INCBIN "gfx/cards/ninetales_lv35.2bpp"
 NinetalesLv35CardGfxExtra::
 	INCBIN "gfx/cards/ninetales_lv35_extra.2bpp"
+
 GrowlitheLv18CardGfx::
-	rgb 31,31,18
-	rgb 31,13,4
-	rgb 22,9,4
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb 31, 13,  4
+	rgb 22,  9,  4
+	rgb  4,  0,  0
 
-	rgb 31,31,18
-	rgb 7,31,31
-	rgb 0,16,0
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb  7, 31, 31
+	rgb  0, 16,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,18
-	rgb 31,13,4
-	rgb 0,16,0
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb 31, 13,  4
+	rgb  0, 16,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $00, $40, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40
 	db $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $00, $00, $80
 	db $40, $40, $40, $00, $00, $00, $80, $40, $40, $40, $00, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/growlithe_lv18.2bpp"
+
 ArcanineLv34CardGfx::
-	rgb 31,31,18
-	rgb 31,18,0
-	rgb 27,0,0
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb 31, 18,  0
+	rgb 27,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 21,21,21
-	rgb 8,8,8
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21, 21, 21
+	rgb  8,  8,  8
+	rgb  0,  0,  0
 
-	rgb 31,31,18
-	rgb 0,12,31
-	rgb 0,0,26
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb  0, 12, 31
+	rgb  0,  0, 26
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00
@@ -1262,41 +1298,43 @@ ArcanineLv34CardGfx::
 	INCBIN "gfx/cards/arcanine_lv34.2bpp"
 ArcanineLv34CardGfxExtra::
 	INCBIN "gfx/cards/arcanine_lv34_extra.2bpp"
+
 ArcanineLv45CardGfx::
-	rgb 31,31,18
-	rgb 31,13,0
-	rgb 22,9,0
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb 31, 13,  0
+	rgb 22,  9,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,18
-	rgb 9,27,31
-	rgb 0,16,0
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb  9, 27, 31
+	rgb  0, 16,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,18
-	rgb 9,27,31
-	rgb 22,9,0
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb  9, 27, 31
+	rgb 22,  9,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $80, $80, $40, $40, $40, $40, $40, $00, $00, $00, $00, $00, $00, $40
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $80, $00, $00, $00, $00, $00, $40
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/arcanine_lv45.2bpp"
+
 PonytaLv10CardGfx::
-	rgb 31,31,31
-	rgb 31,27,13
-	rgb 31,4,0
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb 31, 27, 13
+	rgb 31,  4,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,31
-	rgb 31,27,13
-	rgb 5,10,26
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb 31, 27, 13
+	rgb  5, 10, 26
+	rgb  4,  0,  0
 
-	rgb 31,31,31
-	rgb 5,10,26
-	rgb 31,4,0
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb  5, 10, 26
+	rgb 31,  4,  0
+	rgb  4,  0,  0
 
 	db $40, $40, $40, $40, $80, $40, $40, $40, $40, $40, $40, $00, $80, $40, $80, $40
 	db $40, $40, $40, $00, $80, $00, $80, $59, $59, $59, $40, $00, $17, $00, $00, $55
@@ -1304,21 +1342,22 @@ PonytaLv10CardGfx::
 	INCBIN "gfx/cards/ponyta_lv10.2bpp"
 PonytaLv10CardGfxExtra::
 	INCBIN "gfx/cards/ponyta_lv10_extra.2bpp"
+
 RapidashLv33CardGfx::
-	rgb 31,31,18
-	rgb 31,18,0
-	rgb 27,4,0
-	rgb 9,0,0
+	rgb 31, 31, 18
+	rgb 31, 18,  0
+	rgb 27,  4,  0
+	rgb  9,  0,  0
 
-	rgb 31,31,18
-	rgb 23,18,31
-	rgb 13,11,24
-	rgb 9,0,0
+	rgb 31, 31, 18
+	rgb 23, 18, 31
+	rgb 13, 11, 24
+	rgb  9,  0,  0
 
-	rgb 31,31,18
-	rgb 27,4,0
-	rgb 23,18,31
-	rgb 9,0,0
+	rgb 31, 31, 18
+	rgb 27,  4,  0
+	rgb 23, 18, 31
+	rgb  9,  0,  0
 
 	db $40, $40, $40, $80, $40, $40, $40, $40, $40, $67, $a7, $27, $80, $66, $40, $65
 	db $65, $40, $00, $00, $80, $80, $40, $40, $40, $5d, $9d, $00, $00, $80, $40, $59
@@ -1326,141 +1365,148 @@ RapidashLv33CardGfx::
 	INCBIN "gfx/cards/rapidash_lv33.2bpp"
 RapidashLv33CardGfxExtra::
 	INCBIN "gfx/cards/rapidash_lv33_extra.2bpp"
+
 MagmarLv24CardGfx::
-	rgb 31,31,22
-	rgb 31,22,0
-	rgb 31,4,4
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 31, 22,  0
+	rgb 31,  4,  4
+	rgb  0,  0,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/magmar_lv24.2bpp"
+
 MagmarLv31CardGfx::
-	rgb 31,22,0
-	rgb 31,4,0
-	rgb 9,4,0
-	rgb 0,0,0
+	rgb 31, 22,  0
+	rgb 31,  4,  0
+	rgb  9,  4,  0
+	rgb  0,  0,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/magmar_lv31.2bpp"
+
 FlareonLv22CardGfx::
-	rgb 31,31,27
-	rgb 31,22,0
-	rgb 31,4,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31, 22,  0
+	rgb 31,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 29,11,31
-	rgb 31,4,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 29, 11, 31
+	rgb 31,  4,  0
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $40, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/flareon_lv22.2bpp"
+
 FlareonLv28CardGfx::
-	rgb 31,27,4
-	rgb 31,13,4
-	rgb 27,0,4
-	rgb 0,0,9
+	rgb 31, 27,  4
+	rgb 31, 13,  4
+	rgb 27,  0,  4
+	rgb  0,  0,  9
 
-	rgb 31,27,4
-	rgb 13,31,4
-	rgb 0,27,4
-	rgb 0,0,9
+	rgb 31, 27,  4
+	rgb 13, 31,  4
+	rgb  0, 27,  4
+	rgb  0,  0,  9
 
-	rgb 31,27,4
-	rgb 31,13,4
-	rgb 4,13,31
-	rgb 0,0,9
+	rgb 31, 27,  4
+	rgb 31, 13,  4
+	rgb  4, 13, 31
+	rgb  0,  0,  9
 
 	db $40, $40, $40, $00, $00, $00, $80, $80, $40, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $40, $00, $00, $80, $80, $00, $00, $80, $40, $00, $80, $80, $80, $00, $80, $80
 	INCBIN "gfx/cards/flareon_lv28.2bpp"
+
 MoltresLv35CardGfx::
-	rgb 31,29,9
-	rgb 31,13,0
-	rgb 18,0,0
-	rgb 0,0,0
+	rgb 31, 29,  9
+	rgb 31, 13,  0
+	rgb 18,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,29,9
-	rgb 28,18,0
-	rgb 12,5,0
-	rgb 0,0,0
+	rgb 31, 29,  9
+	rgb 28, 18,  0
+	rgb 12,  5,  0
+	rgb  0,  0,  0
 
-	rgb 19,29,9
-	rgb 6,18,0
-	rgb 12,5,0
-	rgb 0,0,0
+	rgb 19, 29,  9
+	rgb  6, 18,  0
+	rgb 12,  5,  0
+	rgb  0,  0,  0
 
 	db $40, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $40
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $40, $40
 	db $80, $80, $00, $00, $00, $00, $80, $40, $80, $80, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/moltres_lv35.2bpp"
+
 MoltresLv40CardGfx::
-	rgb 31,31,31
-	rgb 31,22,0
-	rgb 31,4,4
-	rgb 0,0,9
+	rgb 31, 31, 31
+	rgb 31, 22,  0
+	rgb 31,  4,  4
+	rgb  0,  0,  9
 
-	rgb 21,31,31
-	rgb 2,15,31
-	rgb 0,0,31
-	rgb 0,0,9
+	rgb 21, 31, 31
+	rgb  2, 15, 31
+	rgb  0,  0, 31
+	rgb  0,  0,  9
 
-	rgb 31,31,31
-	rgb 31,13,31
-	rgb 31,0,12
-	rgb 0,0,9
+	rgb 31, 31, 31
+	rgb 31, 13, 31
+	rgb 31,  0, 12
+	rgb  0,  0,  9
 
 	db $40, $40, $00, $40, $40, $00, $00, $40, $80, $00, $00, $00, $00, $00, $00, $40
 	db $80, $00, $00, $00, $00, $00, $00, $40, $80, $00, $00, $00, $00, $00, $00, $80
 	db $80, $00, $00, $00, $00, $00, $00, $80, $40, $40, $00, $00, $00, $00, $80, $80
 	INCBIN "gfx/cards/moltres_lv40.2bpp"
+
 SquirtleLv8CardGfx::
-	rgb 31,26,27
-	rgb 13,26,18
-	rgb 26,17,0
-	rgb 0,4,4
+	rgb 31, 26, 27
+	rgb 13, 26, 18
+	rgb 26, 17,  0
+	rgb  0,  4,  4
 
-	rgb 31,26,27
-	rgb 13,26,18
-	rgb 0,19,13
-	rgb 0,4,4
+	rgb 31, 26, 27
+	rgb 13, 26, 18
+	rgb  0, 19, 13
+	rgb  0,  4,  4
 
-	rgb 31,26,27
-	rgb 13,26,18
-	rgb 19,6,23
-	rgb 0,4,4
+	rgb 31, 26, 27
+	rgb 13, 26, 18
+	rgb 19,  6, 23
+	rgb  0,  4,  4
 
 	db $70, $70, $70, $70, $70, $70, $70, $70, $70, $70, $70, $70, $30, $30, $70, $70
 	db $70, $70, $70, $30, $30, $30, $70, $70, $70, $70, $70, $30, $30, $30, $70, $70
@@ -1468,44 +1514,47 @@ SquirtleLv8CardGfx::
 	INCBIN "gfx/cards/squirtle_lv8.2bpp"
 SquirtleLv8CardGfxExtra::
 	INCBIN "gfx/cards/squirtle_lv8_extra.2bpp"
+
 WartortleLv22CardGfx::
-	rgb 31,31,31
-	rgb 18,18,27
-	rgb 9,9,18
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 18, 18, 27
+	rgb  9,  9, 18
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 19,25,3
-	rgb 9,9,18
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 19, 25,  3
+	rgb  9,  9, 18
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 19,25,3
-	rgb 1,13,0
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 19, 25,  3
+	rgb  1, 13,  0
+	rgb  0,  0,  4
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $80, $80, $80
 	db $80, $80, $00, $00, $00, $00, $40, $40, $80, $40, $40, $40, $40, $00, $40, $40
 	db $40, $40, $40, $40, $40, $00, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40
 	INCBIN "gfx/cards/wartortle_lv22.2bpp"
+
 	ds $378, $00
 
-SECTION "Card Gfx 21", ROMX[$4000], BANK[$21]
+SECTION "Card Gfx 5", ROMX
+
 BlastoiseLv52CardGfx::
-	rgb 27,31,31
-	rgb 6,22,3
-	rgb 0,18,31
-	rgb 0,4,4
+	rgb 27, 31, 31
+	rgb  6, 22,  3
+	rgb  0, 18, 31
+	rgb  0,  4,  4
 
-	rgb 27,31,31
-	rgb 0,18,31
-	rgb 0,6,15
-	rgb 0,4,4
+	rgb 27, 31, 31
+	rgb  0, 18, 31
+	rgb  0,  6, 15
+	rgb  0,  4,  4
 
-	rgb 27,31,31
-	rgb 2,18,9
-	rgb 0,10,0
-	rgb 0,4,4
+	rgb 27, 31, 31
+	rgb  2, 18,  9
+	rgb  0, 10,  0
+	rgb  0,  4,  4
 
 	db $40, $40, $00, $00, $40, $40, $40, $69, $a9, $69, $00, $00, $00, $00, $40, $40
 	db $80, $40, $21, $00, $00, $00, $40, $80, $80, $40, $00, $00, $00, $00, $16, $80
@@ -1513,21 +1562,22 @@ BlastoiseLv52CardGfx::
 	INCBIN "gfx/cards/blastoise_lv52.2bpp"
 BlastoiseLv52CardGfxExtra::
 	INCBIN "gfx/cards/blastoise_lv52_extra.2bpp"
+
 PsyduckLv15CardGfx::
-	rgb 31,31,9
-	rgb 27,18,0
-	rgb 13,9,4
-	rgb 0,0,4
+	rgb 31, 31,  9
+	rgb 27, 18,  0
+	rgb 13,  9,  4
+	rgb  0,  0,  4
 
-	rgb 31,31,9
-	rgb 14,25,4
-	rgb 0,14,13
-	rgb 6,7,4
+	rgb 31, 31,  9
+	rgb 14, 25,  4
+	rgb  0, 14, 13
+	rgb  6,  7,  4
 
-	rgb 31,31,9
-	rgb 27,18,0
-	rgb 14,25,4
-	rgb 6,7,4
+	rgb 31, 31,  9
+	rgb 27, 18,  0
+	rgb 14, 25,  4
+	rgb  6,  7,  4
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $66, $66, $00, $80, $40, $40
 	db $62, $62, $40, $80, $00, $1f, $80, $9e, $40, $40, $40, $80, $00, $00, $80, $80
@@ -1535,21 +1585,22 @@ PsyduckLv15CardGfx::
 	INCBIN "gfx/cards/psyduck_lv15.2bpp"
 PsyduckLv15CardGfxExtra::
 	INCBIN "gfx/cards/psyduck_lv15_extra.2bpp"
+
 GolduckLv27CardGfx::
-	rgb 31,31,31
-	rgb 13,22,27
-	rgb 4,9,22
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 13, 22, 27
+	rgb  4,  9, 22
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 9,23,0
-	rgb 0,15,0
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb  9, 23,  0
+	rgb  0, 15,  0
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 4,9,22
-	rgb 0,15,0
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb  4,  9, 22
+	rgb  0, 15,  0
+	rgb  0,  0,  4
 
 	db $00, $00, $40, $6d, $40, $40, $80, $2a, $00, $80, $00, $00, $00, $00, $00, $00
 	db $00, $80, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00
@@ -1557,21 +1608,22 @@ GolduckLv27CardGfx::
 	INCBIN "gfx/cards/golduck_lv27.2bpp"
 GolduckLv27CardGfxExtra::
 	INCBIN "gfx/cards/golduck_lv27_extra.2bpp"
+
 PoliwagLv13CardGfx::
-	rgb 27,31,31
-	rgb 12,26,31
-	rgb 0,18,27
-	rgb 0,0,4
+	rgb 27, 31, 31
+	rgb 12, 26, 31
+	rgb  0, 18, 27
+	rgb  0,  0,  4
 
-	rgb 27,31,31
-	rgb 14,23,24
-	rgb 7,15,17
-	rgb 0,0,4
+	rgb 27, 31, 31
+	rgb 14, 23, 24
+	rgb  7, 15, 17
+	rgb  0,  0,  4
 
-	rgb 27,31,31
-	rgb 7,15,17
-	rgb 0,18,27
-	rgb 0,0,4
+	rgb 27, 31, 31
+	rgb  7, 15, 17
+	rgb  0, 18, 27
+	rgb  0,  0,  4
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $67, $40, $40, $80, $00, $80, $40
 	db $40, $00, $40, $40, $00, $1c, $1c, $40, $40, $9a, $80, $80, $18, $00, $00, $40
@@ -1579,81 +1631,85 @@ PoliwagLv13CardGfx::
 	INCBIN "gfx/cards/poliwag_lv13.2bpp"
 PoliwagLv13CardGfxExtra::
 	INCBIN "gfx/cards/poliwag_lv13_extra.2bpp"
+
 PoliwhirlLv28CardGfx::
-	rgb 31,31,31
-	rgb 18,18,31
-	rgb 18,4,31
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 18, 18, 31
+	rgb 18,  4, 31
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 11,18,23
-	rgb 2,9,18
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 11, 18, 23
+	rgb  2,  9, 18
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 11,18,23
-	rgb 18,4,31
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 11, 18, 23
+	rgb 18,  4, 31
+	rgb  0,  0,  4
 
 	db $40, $40, $80, $80, $80, $80, $40, $40, $40, $00, $00, $00, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $00, $80, $40, $40, $00, $00, $00, $00, $00, $00, $40
 	db $40, $00, $00, $80, $80, $00, $40, $40, $40, $40, $80, $40, $40, $00, $80, $40
 	INCBIN "gfx/cards/poliwhirl_lv28.2bpp"
+
 PoliwrathLv48CardGfx::
-	rgb 31,31,31
-	rgb 0,18,31
-	rgb 0,9,27
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 18, 31
+	rgb  0,  9, 27
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 5,12,23
-	rgb 3,1,13
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  5, 12, 23
+	rgb  3,  1, 13
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 12,18,0
-	rgb 0,9,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 12, 18,  0
+	rgb  0,  9,  0
+	rgb  0,  0,  0
 
 	db $80, $40, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $40
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $00, $00, $40, $40, $00, $00, $80
 	INCBIN "gfx/cards/poliwrath_lv48.2bpp"
+
 TentacoolCardGfx::
-	rgb 31,31,22
-	rgb 9,13,27
-	rgb 31,0,4
-	rgb 0,0,4
+	rgb 31, 31, 22
+	rgb  9, 13, 27
+	rgb 31,  0,  4
+	rgb  0,  0,  4
 
-	rgb 31,31,22
-	rgb 9,13,27
-	rgb 0,11,2
-	rgb 0,0,4
+	rgb 31, 31, 22
+	rgb  9, 13, 27
+	rgb  0, 11,  2
+	rgb  0,  0,  4
 
-	rgb 31,31,22
-	rgb 31,12,27
-	rgb 31,0,4
-	rgb 0,0,4
+	rgb 31, 31, 22
+	rgb 31, 12, 27
+	rgb 31,  0,  4
+	rgb  0,  0,  4
 
 	db $00, $40, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40, $00, $00, $00
 	db $40, $40, $00, $00, $00, $80, $00, $40, $40, $00, $40, $00, $00, $00, $40, $40
 	db $40, $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/tentacool.2bpp"
+
 TentacruelCardGfx::
-	rgb 31,31,13
-	rgb 9,13,27
-	rgb 31,4,0
-	rgb 4,0,4
+	rgb 31, 31, 13
+	rgb  9, 13, 27
+	rgb 31,  4,  0
+	rgb  4,  0,  4
 
-	rgb 31,31,13
-	rgb 15,0,25
-	rgb 31,4,0
-	rgb 4,0,4
+	rgb 31, 31, 13
+	rgb 15,  0, 25
+	rgb 31,  4,  0
+	rgb  4,  0,  4
 
-	rgb 31,31,13
-	rgb 15,0,25
-	rgb 26,11,31
-	rgb 4,0,4
+	rgb 31, 31, 13
+	rgb 15,  0, 25
+	rgb 26, 11, 31
+	rgb  4,  0,  4
 
 	db $70, $70, $70, $40, $6f, $6f, $6f, $af, $40, $40, $2d, $2d, $6d, $40, $80, $40
 	db $6a, $2a, $2a, $00, $00, $40, $a7, $a7, $27, $27, $00, $66, $66, $a6, $a6, $a6
@@ -1661,61 +1717,64 @@ TentacruelCardGfx::
 	INCBIN "gfx/cards/tentacruel.2bpp"
 TentacruelCardGfxExtra::
 	INCBIN "gfx/cards/tentacruel_extra.2bpp"
+
 SeelLv12CardGfx::
-	rgb 31,31,31
-	rgb 15,20,31
-	rgb 8,15,24
-	rgb 0,0,8
+	rgb 31, 31, 31
+	rgb 15, 20, 31
+	rgb  8, 15, 24
+	rgb  0,  0,  8
 
-	rgb 31,31,31
-	rgb 25,6,14
-	rgb 4,11,18
-	rgb 0,0,8
+	rgb 31, 31, 31
+	rgb 25,  6, 14
+	rgb  4, 11, 18
+	rgb  0,  0,  8
 
-	rgb 31,31,31
-	rgb 15,20,31
-	rgb 4,11,18
-	rgb 0,0,8
+	rgb 31, 31, 31
+	rgb 15, 20, 31
+	rgb  4, 11, 18
+	rgb  0,  0,  8
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $00, $00, $00
 	db $80, $80, $00, $00, $00, $00, $00, $00, $80, $80, $80, $40, $80, $80, $80, $80
 	INCBIN "gfx/cards/seel_lv12.2bpp"
+
 DewgongLv42CardGfx::
-	rgb 27,31,31
-	rgb 13,27,18
-	rgb 4,9,18
-	rgb 0,0,4
+	rgb 27, 31, 31
+	rgb 13, 27, 18
+	rgb  4,  9, 18
+	rgb  0,  0,  4
 
-	rgb 23,31,31
-	rgb 0,23,31
-	rgb 0,0,18
-	rgb 0,0,0
+	rgb 23, 31, 31
+	rgb  0, 23, 31
+	rgb  0,  0, 18
+	rgb  0,  0,  0
 
-	rgb 27,31,31
-	rgb 13,27,18
-	rgb 0,0,18
-	rgb 0,0,4
+	rgb 27, 31, 31
+	rgb 13, 27, 18
+	rgb  0,  0, 18
+	rgb  0,  0,  4
 
 	db $40, $40, $40, $40, $00, $40, $40, $40, $40, $40, $40, $80, $00, $80, $40, $40
 	db $40, $40, $00, $00, $00, $80, $40, $40, $40, $40, $00, $00, $00, $00, $80, $40
 	db $40, $00, $00, $00, $00, $00, $80, $40, $40, $40, $80, $80, $00, $80, $40, $40
 	INCBIN "gfx/cards/dewgong_lv42.2bpp"
+
 ShellderLv8CardGfx::
-	rgb 31,27,27
-	rgb 18,13,18
-	rgb 27,0,0
-	rgb 4,0,4
+	rgb 31, 27, 27
+	rgb 18, 13, 18
+	rgb 27,  0,  0
+	rgb  4,  0,  4
 
-	rgb 21,31,22
-	rgb 14,22,18
-	rgb 6,17,12
-	rgb 4,0,4
+	rgb 21, 31, 22
+	rgb 14, 22, 18
+	rgb  6, 17, 12
+	rgb  4,  0,  4
 
-	rgb 31,27,27
-	rgb 18,13,18
-	rgb 14,22,18
-	rgb 4,0,4
+	rgb 31, 27, 27
+	rgb 18, 13, 18
+	rgb 14, 22, 18
+	rgb  4,  0,  4
 
 	db $40, $40, $40, $80, $80, $80, $80, $69, $69, $a9, $80, $00, $00, $a6, $80, $40
 	db $40, $a3, $23, $00, $80, $00, $80, $5f, $5f, $80, $00, $00, $00, $00, $9a, $5a
@@ -1723,41 +1782,43 @@ ShellderLv8CardGfx::
 	INCBIN "gfx/cards/shellder_lv8.2bpp"
 ShellderLv8CardGfxExtra::
 	INCBIN "gfx/cards/shellder_lv8_extra.2bpp"
+
 CloysterCardGfx::
-	rgb 31,27,27
-	rgb 27,18,27
-	rgb 22,9,22
-	rgb 9,0,4
+	rgb 31, 27, 27
+	rgb 27, 18, 27
+	rgb 22,  9, 22
+	rgb  9,  0,  4
 
-	rgb 31,27,27
-	rgb 31,16,0
-	rgb 27,4,0
-	rgb 9,0,4
+	rgb 31, 27, 27
+	rgb 31, 16,  0
+	rgb 27,  4,  0
+	rgb  9,  0,  4
 
-	rgb 31,27,27
-	rgb 29,17,14
-	rgb 24,7,11
-	rgb 9,0,4
+	rgb 31, 27, 27
+	rgb 29, 17, 14
+	rgb 24,  7, 11
+	rgb  9,  0,  4
 
 	db $40, $80, $40, $80, $80, $40, $80, $40, $40, $80, $00, $00, $00, $00, $80, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $80, $00, $00, $00, $00, $80, $40
 	db $40, $40, $00, $00, $00, $80, $40, $40, $40, $40, $80, $00, $00, $80, $40, $40
 	INCBIN "gfx/cards/cloyster.2bpp"
+
 KrabbyLv20CardGfx::
-	rgb 31,31,27
-	rgb 31,22,0
-	rgb 31,4,0
-	rgb 9,0,0
+	rgb 31, 31, 27
+	rgb 31, 22,  0
+	rgb 31,  4,  0
+	rgb  9,  0,  0
 
-	rgb 31,31,27
-	rgb 11,23,26
-	rgb 3,12,31
-	rgb 9,0,0
+	rgb 31, 31, 27
+	rgb 11, 23, 26
+	rgb  3, 12, 31
+	rgb  9,  0,  0
 
-	rgb 31,31,27
-	rgb 31,4,0
-	rgb 3,12,31
-	rgb 9,0,0
+	rgb 31, 31, 27
+	rgb 31,  4,  0
+	rgb  3, 12, 31
+	rgb  9,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $69, $40, $80, $80, $40, $40, $64, $40, $40
 	db $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00
@@ -1765,21 +1826,22 @@ KrabbyLv20CardGfx::
 	INCBIN "gfx/cards/krabby_lv20.2bpp"
 KrabbyLv20CardGfxExtra::
 	INCBIN "gfx/cards/krabby_lv20_extra.2bpp"
+
 KinglerLv27CardGfx::
-	rgb 31,31,9
-	rgb 31,18,0
-	rgb 31,4,0
-	rgb 9,0,0
+	rgb 31, 31,  9
+	rgb 31, 18,  0
+	rgb 31,  4,  0
+	rgb  9,  0,  0
 
-	rgb 31,31,9
-	rgb 31,18,0
-	rgb 17,0,22
-	rgb 9,0,0
+	rgb 31, 31,  9
+	rgb 31, 18,  0
+	rgb 17,  0, 22
+	rgb  9,  0,  0
 
-	rgb 31,31,9
-	rgb 31,4,0
-	rgb 17,0,22
-	rgb 9,0,0
+	rgb 31, 31,  9
+	rgb 31,  4,  0
+	rgb 17,  0, 22
+	rgb  9,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $26, $00, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $54, $40, $40
@@ -1787,61 +1849,64 @@ KinglerLv27CardGfx::
 	INCBIN "gfx/cards/kingler_lv27.2bpp"
 KinglerLv27CardGfxExtra::
 	INCBIN "gfx/cards/kingler_lv27_extra.2bpp"
+
 HorseaLv19CardGfx::
-	rgb 27,31,31
-	rgb 9,27,22
-	rgb 0,18,4
-	rgb 4,4,0
+	rgb 27, 31, 31
+	rgb  9, 27, 22
+	rgb  0, 18,  4
+	rgb  4,  4,  0
 
-	rgb 27,31,31
-	rgb 9,27,22
-	rgb 22,0,0
-	rgb 4,4,0
+	rgb 27, 31, 31
+	rgb  9, 27, 22
+	rgb 22,  0,  0
+	rgb  4,  4,  0
 
-	rgb 27,31,31
-	rgb 15,31,24
-	rgb 9,27,22
-	rgb 4,4,0
+	rgb 27, 31, 31
+	rgb 15, 31, 24
+	rgb  9, 27, 22
+	rgb  4,  4,  0
 
 	db $00, $00, $00, $80, $80, $80, $80, $80, $00, $00, $00, $00, $40, $00, $80, $80
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/horsea_lv19.2bpp"
+
 SeadraLv23CardGfx::
-	rgb 31,31,31
-	rgb 13,27,19
-	rgb 4,15,6
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 13, 27, 19
+	rgb  4, 15,  6
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,31,7
-	rgb 10,23,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 31,  7
+	rgb 10, 23, 22
+	rgb  0,  0,  0
 
-	rgb 22,31,31
-	rgb 0,19,31
-	rgb 0,8,31
-	rgb 0,0,0
+	rgb 22, 31, 31
+	rgb  0, 19, 31
+	rgb  0,  8, 31
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $00, $00, $80, $80, $80
 	db $80, $80, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $40, $00, $80, $80
 	db $80, $80, $00, $00, $00, $00, $80, $80, $80, $80, $80, $80, $00, $80, $80, $80
 	INCBIN "gfx/cards/seadra_lv23.2bpp"
+
 GoldeenCardGfx::
-	rgb 31,31,18
-	rgb 4,22,0
-	rgb 22,0,0
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb  4, 22,  0
+	rgb 22,  0,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,31
-	rgb 15,16,28
-	rgb 22,0,0
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb 15, 16, 28
+	rgb 22,  0,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,31
-	rgb 4,22,0
-	rgb 3,11,19
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb  4, 22,  0
+	rgb  3, 11, 19
+	rgb  4,  0,  0
 
 	db $00, $00, $00, $00, $80, $00, $80, $80, $00, $00, $40, $40, $40, $00, $00, $a1
 	db $80, $80, $40, $40, $40, $00, $80, $80, $80, $80, $40, $40, $40, $40, $80, $80
@@ -1849,44 +1914,47 @@ GoldeenCardGfx::
 	INCBIN "gfx/cards/goldeen.2bpp"
 GoldeenCardGfxExtra::
 	INCBIN "gfx/cards/goldeen_extra.2bpp"
-	ds $2e8, $00
 
-SECTION "Card Gfx 22", ROMX[$4000], BANK[$22]
+	ds $2e8
+
+SECTION "Card Gfx 6", ROMX
+
 SeakingCardGfx::
-	rgb 31,31,31
-	rgb 0,18,0
-	rgb 22,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 18,  0
+	rgb 22,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 0,12,0
-	rgb 31,14,0
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb  0, 12,  0
+	rgb 31, 14,  0
+	rgb  0,  0,  0
 
-	rgb 29,29,31
-	rgb 8,18,26
-	rgb 22,0,0
-	rgb 0,0,0
+	rgb 29, 29, 31
+	rgb  8, 18, 26
+	rgb 22,  0,  0
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $40, $40
 	db $80, $80, $80, $80, $00, $80, $40, $40, $80, $80, $80, $80, $00, $00, $40, $40
 	db $00, $00, $80, $80, $80, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/seaking.2bpp"
+
 StaryuLv15CardGfx::
-	rgb 31,31,22
-	rgb 31,25,0
-	rgb 16,16,0
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 31, 25,  0
+	rgb 16, 16,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,22
-	rgb 31,25,0
-	rgb 30,0,0
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 31, 25,  0
+	rgb 30,  0,  0
+	rgb  4,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $16, $16, $00, $00, $00, $00
@@ -1894,61 +1962,64 @@ StaryuLv15CardGfx::
 	INCBIN "gfx/cards/staryu_lv15.2bpp"
 StaryuLv15CardGfxExtra::
 	INCBIN "gfx/cards/staryu_lv15_extra.2bpp"
+
 StarmieCardGfx::
-	rgb 31,31,1
-	rgb 27,0,0
-	rgb 22,9,22
-	rgb 0,0,4
+	rgb 31, 31,  1
+	rgb 27,  0,  0
+	rgb 22,  9, 22
+	rgb  0,  0,  4
 
-	rgb 23,31,31
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 0,0,0
+	rgb 23, 31, 31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb  0,  0,  0
 
-	rgb 23,31,31
-	rgb 0,16,31
-	rgb 22,9,22
-	rgb 0,0,0
+	rgb 23, 31, 31
+	rgb  0, 16, 31
+	rgb 22,  9, 22
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $80, $80, $80, $40, $40
 	db $40, $40, $80, $00, $00, $80, $40, $40, $40, $40, $80, $00, $00, $80, $40, $40
 	db $40, $40, $40, $80, $80, $80, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/starmie.2bpp"
+
 MagikarpLv8CardGfx::
-	rgb 31,31,31
-	rgb 31,27,9
-	rgb 31,9,0
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb 31, 27,  9
+	rgb 31,  9,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,31
-	rgb 16,28,9
-	rgb 5,19,0
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb 16, 28,  9
+	rgb  5, 19,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,31
-	rgb 18,25,31
-	rgb 0,4,15
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb 18, 25, 31
+	rgb  0,  4, 15
+	rgb  4,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $80, $80, $40, $40, $40, $40, $40, $40, $40, $40
 	db $40, $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $00, $40
 	db $80, $80, $80, $00, $00, $00, $00, $80, $80, $80, $80, $80, $00, $00, $80, $80
 	INCBIN "gfx/cards/magikarp_lv8.2bpp"
+
 GyaradosCardGfx::
-	rgb 31,31,27
-	rgb 9,27,4
-	rgb 0,13,18
-	rgb 0,4,4
+	rgb 31, 31, 27
+	rgb  9, 27,  4
+	rgb  0, 13, 18
+	rgb  0,  4,  4
 
-	rgb 31,31,27
-	rgb 5,14,22
-	rgb 0,5,18
-	rgb 0,4,4
+	rgb 31, 31, 27
+	rgb  5, 14, 22
+	rgb  0,  5, 18
+	rgb  0,  4,  4
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $40, $00, $00, $00, $2a, $40, $40, $00, $00, $26, $00, $00, $00, $40
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40
@@ -1956,101 +2027,106 @@ GyaradosCardGfx::
 	INCBIN "gfx/cards/gyarados.2bpp"
 GyaradosCardGfxExtra::
 	INCBIN "gfx/cards/gyarados_extra.2bpp"
+
 LaprasLv31CardGfx::
-	rgb 31,31,27
-	rgb 31,22,0
-	rgb 4,19,24
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31, 22,  0
+	rgb  4, 19, 24
+	rgb  0,  0,  0
 
-	rgb 27,31,31
-	rgb 4,22,27
-	rgb 3,16,21
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb  4, 22, 27
+	rgb  3, 16, 21
+	rgb  0,  0,  0
 
-	rgb 27,31,31
-	rgb 10,18,19
-	rgb 16,13,11
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb 10, 18, 19
+	rgb 16, 13, 11
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $40, $40, $80, $80, $80, $80, $80, $80, $00, $00, $40, $80, $80
 	db $80, $80, $80, $80, $00, $80, $80, $80, $80, $80, $80, $80, $00, $00, $40, $80
 	db $80, $40, $40, $00, $00, $00, $00, $80, $80, $80, $00, $00, $80, $80, $80, $80
 	INCBIN "gfx/cards/lapras_lv31.2bpp"
+
 VaporeonLv29CardGfx::
-	rgb 27,31,31
-	rgb 4,22,31
-	rgb 4,9,22
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb  4, 22, 31
+	rgb  4,  9, 22
+	rgb  0,  0,  0
 
-	rgb 27,31,31
-	rgb 4,16,27
-	rgb 22,14,10
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb  4, 16, 27
+	rgb 22, 14, 10
+	rgb  0,  0,  0
 
-	rgb 27,31,31
-	rgb 22,14,10
-	rgb 4,9,22
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb 22, 14, 10
+	rgb  4,  9, 22
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00
 	db $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $80, $80, $80, $80, $80, $80, $00, $00, $80, $80
 	INCBIN "gfx/cards/vaporeon_lv29.2bpp"
+
 VaporeonLv42CardGfx::
-	rgb 27,31,31
-	rgb 7,31,24
-	rgb 0,20,16
-	rgb 0,0,4
+	rgb 27, 31, 31
+	rgb  7, 31, 24
+	rgb  0, 20, 16
+	rgb  0,  0,  4
 
-	rgb 31,31,27
-	rgb 31,22,0
-	rgb 8,24,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31, 22,  0
+	rgb  8, 24,  0
+	rgb  0,  0,  0
 
-	rgb 27,31,31
-	rgb 31,22,0
-	rgb 4,26,20
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb 31, 22,  0
+	rgb  4, 26, 20
+	rgb  0,  0,  0
 
 	db $40, $80, $40, $40, $80, $40, $00, $40, $40, $40, $80, $00, $40, $40, $00, $40
 	db $40, $40, $80, $00, $00, $00, $00, $40, $80, $00, $00, $00, $00, $40, $00, $00
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $40, $00, $40, $00, $40, $40, $80
 	INCBIN "gfx/cards/vaporeon_lv42.2bpp"
+
 OmanyteLv19CardGfx::
-	rgb 31,31,22
-	rgb 27,22,4
-	rgb 4,22,13
-	rgb 0,4,0
+	rgb 31, 31, 22
+	rgb 27, 22,  4
+	rgb  4, 22, 13
+	rgb  0,  4,  0
 
-	rgb 31,31,22
-	rgb 27,22,4
-	rgb 28,7,0
-	rgb 0,4,0
+	rgb 31, 31, 22
+	rgb 27, 22,  4
+	rgb 28,  7,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,22
-	rgb 27,22,4
-	rgb 18,8,25
-	rgb 0,4,0
+	rgb 31, 31, 22
+	rgb 27, 22,  4
+	rgb 18,  8, 25
+	rgb  0,  4,  0
 
 	db $80, $80, $80, $80, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $40
 	db $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/omanyte_lv19.2bpp"
+
 OmastarLv32CardGfx::
-	rgb 31,31,22
-	rgb 27,22,9
-	rgb 4,18,22
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 27, 22,  9
+	rgb  4, 18, 22
+	rgb  4,  0,  0
 
-	rgb 31,31,22
-	rgb 27,22,9
-	rgb 7,13,15
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 27, 22,  9
+	rgb  7, 13, 15
+	rgb  4,  0,  0
 
-	rgb 4,10,6
-	rgb 27,22,9
-	rgb 4,18,22
-	rgb 4,0,0
+	rgb  4, 10,  6
+	rgb 27, 22,  9
+	rgb  4, 18, 22
+	rgb  4,  0,  0
 
 	db $00, $00, $2e, $2e, $2e, $2e, $00, $00, $00, $00, $00, $40, $40, $00, $00, $80
 	db $80, $00, $00, $40, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $80
@@ -2058,101 +2134,106 @@ OmastarLv32CardGfx::
 	INCBIN "gfx/cards/omastar_lv32.2bpp"
 OmastarLv32CardGfxExtra::
 	INCBIN "gfx/cards/omastar_lv32_extra.2bpp"
+
 ArticunoLv35CardGfx::
-	rgb 27,31,31
-	rgb 13,22,31
-	rgb 4,13,22
-	rgb 0,4,4
+	rgb 27, 31, 31
+	rgb 13, 22, 31
+	rgb  4, 13, 22
+	rgb  0,  4,  4
 
-	rgb 27,31,31
-	rgb 31,0,0
-	rgb 4,13,22
-	rgb 0,4,4
+	rgb 27, 31, 31
+	rgb 31,  0,  0
+	rgb  4, 13, 22
+	rgb  0,  4,  4
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/articuno_lv35.2bpp"
+
 ArticunoLv37CardGfx::
-	rgb 31,31,31
-	rgb 0,18,27
-	rgb 0,9,13
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 18, 27
+	rgb  0,  9, 13
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,18,27
-	rgb 14,10,2
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 18, 27
+	rgb 14, 10,  2
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00
 	INCBIN "gfx/cards/articuno_lv37.2bpp"
+
 PikachuLv12CardGfx::
-	rgb 31,22,0
-	rgb 22,13,22
-	rgb 18,4,18
-	rgb 7,4,0
+	rgb 31, 22,  0
+	rgb 22, 13, 22
+	rgb 18,  4, 18
+	rgb  7,  4,  0
 
-	rgb 31,22,0
-	rgb 10,16,0
-	rgb 18,4,18
-	rgb 7,4,0
+	rgb 31, 22,  0
+	rgb 10, 16,  0
+	rgb 18,  4, 18
+	rgb  7,  4,  0
 
-	rgb 31,22,0
-	rgb 10,16,0
-	rgb 0,10,0
-	rgb 7,4,0
+	rgb 31, 22,  0
+	rgb 10, 16,  0
+	rgb  0, 10,  0
+	rgb  7,  4,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $80, $80, $80, $00, $00, $00, $00, $00, $80
 	INCBIN "gfx/cards/pikachu_lv12.2bpp"
+
 PikachuLv14CardGfx::
-	rgb 31,22,0
-	rgb 22,13,0
-	rgb 4,18,0
-	rgb 0,0,4
+	rgb 31, 22,  0
+	rgb 22, 13,  0
+	rgb  4, 18,  0
+	rgb  0,  0,  4
 
-	rgb 31,22,0
-	rgb 12,23,0
-	rgb 4,18,0
-	rgb 0,0,4
+	rgb 31, 22,  0
+	rgb 12, 23,  0
+	rgb  4, 18,  0
+	rgb  0,  0,  4
 
-	rgb 31,31,18
-	rgb 12,23,0
-	rgb 4,18,0
-	rgb 0,0,4
+	rgb 31, 31, 18
+	rgb 12, 23,  0
+	rgb  4, 18,  0
+	rgb  0,  0,  4
 
 	db $80, $40, $40, $40, $40, $40, $80, $80, $40, $00, $00, $00, $00, $40, $40, $80
 	db $40, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
 	db $80, $40, $00, $00, $00, $00, $40, $80, $40, $40, $00, $00, $00, $80, $80, $40
 	INCBIN "gfx/cards/pikachu_lv14.2bpp"
+
 PikachuLv16CardGfx::
-	rgb 31,22,0
-	rgb 31,27,19
-	rgb 18,9,4
-	rgb 0,0,0
+	rgb 31, 22,  0
+	rgb 31, 27, 19
+	rgb 18,  9,  4
+	rgb  0,  0,  0
 
-	rgb 31,27,19
-	rgb 4,21,4
-	rgb 22,31,0
-	rgb 0,0,0
+	rgb 31, 27, 19
+	rgb  4, 21,  4
+	rgb 22, 31,  0
+	rgb  0,  0,  0
 
-	rgb 31,27,19
-	rgb 4,21,4
-	rgb 18,9,4
-	rgb 0,0,0
+	rgb 31, 27, 19
+	rgb  4, 21,  4
+	rgb 18,  9,  4
+	rgb  0,  0,  0
 
 	db $70, $70, $70, $70, $70, $70, $70, $70, $70, $70, $30, $30, $30, $30, $30, $70
 	db $70, $30, $30, $30, $30, $30, $b0, $70, $70, $70, $30, $30, $30, $b0, $70, $70
@@ -2160,21 +2241,22 @@ PikachuLv16CardGfx::
 	INCBIN "gfx/cards/pikachu_lv16.2bpp"
 PikachuLv16CardGfxExtra::
 	INCBIN "gfx/cards/pikachu_lv16_extra.2bpp"
+
 PikachuAltLv16CardGfx::
-	rgb 31,31,31
-	rgb 31,22,0
-	rgb 0,18,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 22,  0
+	rgb  0, 18,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,22,0
-	rgb 27,6,6
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 22,  0
+	rgb 27,  6,  6
+	rgb  0,  0,  0
 
-	rgb 31,0,16
-	rgb 16,16,16
-	rgb 24,24,24
-	rgb 31,31,31
+	rgb 31,  0, 16
+	rgb 16, 16, 16
+	rgb 24, 24, 24
+	rgb 31, 31, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $28, $00, $40, $00, $00, $00, $23, $00
 	db $00, $40, $40, $40, $1e, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
@@ -2182,21 +2264,22 @@ PikachuAltLv16CardGfx::
 	INCBIN "gfx/cards/pikachu_alt_lv16.2bpp"
 PikachuAltLv16CardGfxExtra::
 	INCBIN "gfx/cards/pikachu_alt_lv16_extra.2bpp"
+
 FlyingPikachuLv12CardGfx::
-	rgb 31,22,0
-	rgb 28,8,16
-	rgb 0,16,31
-	rgb 6,6,6
+	rgb 31, 22,  0
+	rgb 28,  8, 16
+	rgb  0, 16, 31
+	rgb  6,  6,  6
 
-	rgb 31,31,31
-	rgb 31,22,0
-	rgb 0,16,31
-	rgb 6,6,6
+	rgb 31, 31, 31
+	rgb 31, 22,  0
+	rgb  0, 16, 31
+	rgb  6,  6,  6
 
-	rgb 15,31,4
-	rgb 28,8,16
-	rgb 0,16,31
-	rgb 6,6,6
+	rgb 15, 31,  4
+	rgb 28,  8, 16
+	rgb  0, 16, 31
+	rgb  6,  6,  6
 
 	db $00, $2f, $00, $80, $80, $00, $00, $00, $40, $00, $00, $80, $80, $00, $40, $40
 	db $00, $00, $00, $00, $80, $00, $40, $40, $80, $00, $00, $00, $00, $00, $00, $00
@@ -2204,24 +2287,26 @@ FlyingPikachuLv12CardGfx::
 	INCBIN "gfx/cards/flying_pikachu_lv12.2bpp"
 FlyingPikachuLv12CardGfxExtra::
 	INCBIN "gfx/cards/flying_pikachu_lv12_extra.2bpp"
-	ds $3e8, $00
 
-SECTION "Card Gfx 23", ROMX[$4000], BANK[$23]
+	ds $3e8
+
+SECTION "Card Gfx 7", ROMX
+
 SurfingPikachuLv13CardGfx::
-	rgb 31,22,0
-	rgb 3,14,31
-	rgb 22,9,13
-	rgb 4,0,0
+	rgb 31, 22,  0
+	rgb  3, 14, 31
+	rgb 22,  9, 13
+	rgb  4,  0,  0
 
-	rgb 31,22,0
-	rgb 3,14,31
-	rgb 31,31,31
-	rgb 4,0,0
+	rgb 31, 22,  0
+	rgb  3, 14, 31
+	rgb 31, 31, 31
+	rgb  4,  0,  0
 
-	rgb 31,22,0
-	rgb 31,31,31
-	rgb 22,9,13
-	rgb 4,0,0
+	rgb 31, 22,  0
+	rgb 31, 31, 31
+	rgb 22,  9, 13
+	rgb  4,  0,  0
 
 	db $70, $30, $70, $70, $70, $70, $00, $2f, $6f, $6f, $6f, $af, $af, $2f, $2f, $00
 	db $6e, $6e, $6e, $ae, $80, $00, $2c, $6c, $6c, $ac, $00, $2b, $ab, $2b, $2b, $00
@@ -2229,21 +2314,22 @@ SurfingPikachuLv13CardGfx::
 	INCBIN "gfx/cards/surfing_pikachu_lv13.2bpp"
 SurfingPikachuLv13CardGfxExtra::
 	INCBIN "gfx/cards/surfing_pikachu_lv13_extra.2bpp"
+
 SurfingPikachuAltLv13CardGfx::
-	rgb 31,22,0
-	rgb 0,13,28
-	rgb 22,9,13
-	rgb 4,0,0
+	rgb 31, 22,  0
+	rgb  0, 13, 28
+	rgb 22,  9, 13
+	rgb  4,  0,  0
 
-	rgb 31,22,0
-	rgb 0,13,28
-	rgb 20,27,31
-	rgb 4,0,0
+	rgb 31, 22,  0
+	rgb  0, 13, 28
+	rgb 20, 27, 31
+	rgb  4,  0,  0
 
-	rgb 31,22,0
-	rgb 19,25,31
-	rgb 22,9,13
-	rgb 4,0,0
+	rgb 31, 22,  0
+	rgb 19, 25, 31
+	rgb 22,  9, 13
+	rgb  4,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00
@@ -2251,61 +2337,64 @@ SurfingPikachuAltLv13CardGfx::
 	INCBIN "gfx/cards/surfing_pikachu_alt_lv13.2bpp"
 SurfingPikachuAltLv13CardGfxExtra::
 	INCBIN "gfx/cards/surfing_pikachu_alt_lv13_extra.2bpp"
+
 RaichuLv40CardGfx::
-	rgb 31,31,18
-	rgb 31,27,0
-	rgb 13,13,0
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb 31, 27,  0
+	rgb 13, 13,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,18
-	rgb 5,30,0
-	rgb 0,10,0
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb  5, 30,  0
+	rgb  0, 10,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,18
-	rgb 31,27,0
-	rgb 0,10,0
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb 31, 27,  0
+	rgb  0, 10,  0
+	rgb  4,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40
 	db $40, $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $40, $00
 	db $40, $80, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $40, $00, $40, $40
 	INCBIN "gfx/cards/raichu_lv40.2bpp"
+
 RaichuLv45CardGfx::
-	rgb 31,31,0
-	rgb 31,22,4
-	rgb 18,13,4
-	rgb 0,0,4
+	rgb 31, 31,  0
+	rgb 31, 22,  4
+	rgb 18, 13,  4
+	rgb  0,  0,  4
 
-	rgb 31,31,0
-	rgb 5,25,5
-	rgb 1,14,1
-	rgb 0,0,4
+	rgb 31, 31,  0
+	rgb  5, 25,  5
+	rgb  1, 14,  1
+	rgb  0,  0,  4
 
-	rgb 31,31,0
-	rgb 31,22,4
-	rgb 1,14,1
-	rgb 0,0,4
+	rgb 31, 31,  0
+	rgb 31, 22,  4
+	rgb  1, 14,  1
+	rgb  0,  0,  4
 
 	db $40, $40, $40, $40, $40, $00, $40, $40, $40, $40, $40, $00, $00, $00, $80, $40
 	db $80, $40, $40, $00, $00, $00, $80, $40, $80, $80, $00, $00, $00, $00, $00, $00
 	db $40, $80, $80, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $80, $40, $40
 	INCBIN "gfx/cards/raichu_lv45.2bpp"
+
 MagnemiteLv13CardGfx::
-	rgb 31,31,27
-	rgb 4,13,22
-	rgb 4,4,13
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb  4, 13, 22
+	rgb  4,  4, 13
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 4,13,0
-	rgb 24,0,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb  4, 13,  0
+	rgb 24,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 24,0,0
-	rgb 4,4,13
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 24,  0,  0
+	rgb  4,  4, 13
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $2c, $2c, $00, $00, $00, $00, $00, $27, $00, $00, $80, $80
 	db $00, $22, $00, $00, $00, $00, $80, $9d, $00, $00, $00, $00, $00, $18, $00, $00
@@ -2313,21 +2402,22 @@ MagnemiteLv13CardGfx::
 	INCBIN "gfx/cards/magnemite_lv13.2bpp"
 MagnemiteLv13CardGfxExtra::
 	INCBIN "gfx/cards/magnemite_lv13_extra.2bpp"
+
 MagnemiteLv14CardGfx::
-	rgb 31,27,31
-	rgb 18,10,26
-	rgb 27,4,0
-	rgb 0,0,0
+	rgb 31, 27, 31
+	rgb 18, 10, 26
+	rgb 27,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,27,31
-	rgb 18,10,26
-	rgb 8,0,16
-	rgb 0,0,0
+	rgb 31, 27, 31
+	rgb 18, 10, 26
+	rgb  8,  0, 16
+	rgb  0,  0,  0
 
-	rgb 31,27,31
-	rgb 0,18,27
-	rgb 18,10,26
-	rgb 0,0,0
+	rgb 31, 27, 31
+	rgb  0, 18, 27
+	rgb 18, 10, 26
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $40, $40, $40, $40, $40, $00, $80, $00, $40, $40, $40, $40, $40
 	db $40, $40, $40, $40, $40, $40, $40, $40, $00, $40, $40, $40, $40, $40, $80, $40
@@ -2335,21 +2425,22 @@ MagnemiteLv14CardGfx::
 	INCBIN "gfx/cards/magnemite_lv14.2bpp"
 MagnemiteLv14CardGfxExtra::
 	INCBIN "gfx/cards/magnemite_lv14_extra.2bpp"
+
 MagnetonLv28CardGfx::
-	rgb 31,31,27
-	rgb 12,18,22
-	rgb 4,4,9
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 12, 18, 22
+	rgb  4,  4,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 12,18,22
-	rgb 0,7,27
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 12, 18, 22
+	rgb  0,  7, 27
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 12,18,22
-	rgb 28,0,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 12, 18, 22
+	rgb 28,  0,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $2e, $ae, $80, $ad, $2d, $2d, $2d, $2d, $6d, $2d, $2d, $6d, $2d, $00
 	db $00, $ab, $2b, $00, $00, $00, $80, $27, $27, $00, $00, $00, $00, $23, $23, $23
@@ -2357,41 +2448,43 @@ MagnetonLv28CardGfx::
 	INCBIN "gfx/cards/magneton_lv28.2bpp"
 MagnetonLv28CardGfxExtra::
 	INCBIN "gfx/cards/magneton_lv28_extra.2bpp"
+
 MagnetonLv35CardGfx::
-	rgb 27,31,31
-	rgb 31,4,4
-	rgb 9,18,18
-	rgb 0,4,4
+	rgb 27, 31, 31
+	rgb 31,  4,  4
+	rgb  9, 18, 18
+	rgb  0,  4,  4
 
-	rgb 27,31,31
-	rgb 11,27,2
-	rgb 0,12,3
-	rgb 0,4,4
+	rgb 27, 31, 31
+	rgb 11, 27,  2
+	rgb  0, 12,  3
+	rgb  0,  4,  4
 
-	rgb 27,31,31
-	rgb 0,12,3
-	rgb 9,18,18
-	rgb 0,4,4
+	rgb 27, 31, 31
+	rgb  0, 12,  3
+	rgb  9, 18, 18
+	rgb  0,  4,  4
 
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $80, $80, $80
 	db $00, $00, $00, $00, $00, $00, $00, $00, $80, $40, $80, $00, $00, $80, $40, $40
 	db $40, $40, $80, $00, $00, $00, $40, $40, $40, $40, $80, $00, $40, $80, $40, $40
 	INCBIN "gfx/cards/magneton_lv35.2bpp"
+
 VoltorbLv10CardGfx::
-	rgb 31,31,22
-	rgb 31,0,0
-	rgb 13,4,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 31,  0,  0
+	rgb 13,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 31,0,31
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 31,  0, 31
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 0,17,19
-	rgb 3,7,15
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb  0, 17, 19
+	rgb  3,  7, 15
+	rgb  0,  0,  0
 
 	db $00, $00, $6e, $6e, $6e, $6e, $00, $2d, $2d, $6d, $6d, $2d, $2d, $6d, $40, $40
 	db $6b, $6b, $2b, $00, $00, $00, $40, $67, $67, $40, $00, $00, $00, $23, $a3, $a3
@@ -2399,81 +2492,85 @@ VoltorbLv10CardGfx::
 	INCBIN "gfx/cards/voltorb_lv10.2bpp"
 VoltorbLv10CardGfxExtra::
 	INCBIN "gfx/cards/voltorb_lv10_extra.2bpp"
+
 ElectrodeLv35CardGfx::
-	rgb 31,31,31
-	rgb 31,18,0
-	rgb 27,0,0
-	rgb 7,0,0
+	rgb 31, 31, 31
+	rgb 31, 18,  0
+	rgb 27,  0,  0
+	rgb  7,  0,  0
 
-	rgb 31,31,31
-	rgb 20,11,0
-	rgb 14,0,0
-	rgb 7,0,0
+	rgb 31, 31, 31
+	rgb 20, 11,  0
+	rgb 14,  0,  0
+	rgb  7,  0,  0
 
-	rgb 31,31,31
-	rgb 20,11,0
-	rgb 27,0,0
-	rgb 7,0,0
+	rgb 31, 31, 31
+	rgb 20, 11,  0
+	rgb 27,  0,  0
+	rgb  7,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40
 	db $40, $40, $00, $00, $00, $00, $80, $40, $40, $40, $40, $80, $80, $40, $40, $40
 	INCBIN "gfx/cards/electrode_lv35.2bpp"
+
 ElectrodeLv42CardGfx::
-	rgb 31,31,27
-	rgb 19,22,19
-	rgb 25,4,0
-	rgb 0,0,5
+	rgb 31, 31, 27
+	rgb 19, 22, 19
+	rgb 25,  4,  0
+	rgb  0,  0,  5
 
-	rgb 31,31,27
-	rgb 27,15,0
-	rgb 13,4,0
-	rgb 0,0,5
+	rgb 31, 31, 27
+	rgb 27, 15,  0
+	rgb 13,  4,  0
+	rgb  0,  0,  5
 
-	rgb 31,31,27
-	rgb 16,24,4
-	rgb 8,10,0
-	rgb 0,0,5
+	rgb 31, 31, 27
+	rgb 16, 24,  4
+	rgb  8, 10,  0
+	rgb  0,  0,  5
 
 	db $40, $80, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $80
 	db $80, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40
 	db $40, $00, $00, $00, $00, $00, $00, $80, $80, $40, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/electrode_lv42.2bpp"
+
 ElectabuzzLv20CardGfx::
-	rgb 31,31,31
-	rgb 31,28,0
-	rgb 24,19,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 28,  0
+	rgb 24, 19,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,16,0
-	rgb 27,4,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 16,  0
+	rgb 27,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,22,0
-	rgb 28,9,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 22,  0
+	rgb 28,  9,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $80, $80, $80, $40, $40
 	db $40, $80, $00, $00, $00, $00, $80, $40, $40, $80, $80, $00, $00, $80, $80, $80
 	db $40, $40, $80, $00, $00, $80, $80, $40, $40, $40, $80, $80, $80, $80, $80, $40
 	INCBIN "gfx/cards/electabuzz_lv20.2bpp"
+
 ElectabuzzLv35CardGfx::
-	rgb 31,31,22
-	rgb 31,27,0
-	rgb 18,9,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 31, 27,  0
+	rgb 18,  9,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 22,31,6
-	rgb 18,19,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 22, 31,  6
+	rgb 18, 19,  0
+	rgb  0,  0,  0
 
-	rgb 11,9,0
-	rgb 22,31,6
-	rgb 18,19,0
-	rgb 0,0,0
+	rgb 11,  9,  0
+	rgb 22, 31,  6
+	rgb 18, 19,  0
+	rgb  0,  0,  0
 
 	db $00, $2f, $00, $00, $2d, $2d, $00, $00, $80, $6a, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $00, $40, $80, $00, $00, $00, $00, $00, $00
@@ -2481,81 +2578,85 @@ ElectabuzzLv35CardGfx::
 	INCBIN "gfx/cards/electabuzz_lv35.2bpp"
 ElectabuzzLv35CardGfxExtra::
 	INCBIN "gfx/cards/electabuzz_lv35_extra.2bpp"
+
 JolteonLv24CardGfx::
-	rgb 31,31,31
-	rgb 31,22,0
-	rgb 0,4,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 22,  0
+	rgb  0,  4, 31
+	rgb  0,  0,  0
 
-	rgb 27,31,31
-	rgb 0,19,31
-	rgb 0,4,31
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb  0, 19, 31
+	rgb  0,  4, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,22,0
-	rgb 16,16,16
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 22,  0
+	rgb 16, 16, 16
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $00, $40, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40
 	db $40, $40, $00, $80, $80, $00, $40, $40, $40, $40, $00, $00, $80, $00, $40, $40
 	db $40, $40, $00, $80, $80, $00, $00, $40, $40, $40, $00, $40, $40, $00, $40, $40
 	INCBIN "gfx/cards/jolteon_lv24.2bpp"
+
 JolteonLv29CardGfx::
-	rgb 31,31,31
-	rgb 31,27,4
-	rgb 27,9,4
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 27,  4
+	rgb 27,  9,  4
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,7,31
-	rgb 0,24,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0,  7, 31
+	rgb  0, 24,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,27,4
-	rgb 0,24,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 27,  4
+	rgb  0, 24,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $80, $80, $80, $80, $40, $40, $40, $80, $00, $00, $00, $00, $80, $40
 	db $40, $00, $00, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $00
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/jolteon_lv29.2bpp"
+
 ZapdosLv40CardGfx::
-	rgb 31,27,7
-	rgb 31,18,4
-	rgb 18,13,4
-	rgb 0,0,4
+	rgb 31, 27,  7
+	rgb 31, 18,  4
+	rgb 18, 13,  4
+	rgb  0,  0,  4
 
-	rgb 31,27,9
-	rgb 19,10,31
-	rgb 18,13,4
-	rgb 0,0,4
+	rgb 31, 27,  9
+	rgb 19, 10, 31
+	rgb 18, 13,  4
+	rgb  0,  0,  4
 
-	rgb 31,27,9
-	rgb 17,19,31
-	rgb 0,8,21
-	rgb 0,0,4
+	rgb 31, 27,  9
+	rgb 17, 19, 31
+	rgb  0,  8, 21
+	rgb  0,  0,  4
 
 	db $80, $00, $80, $00, $80, $40, $40, $40, $00, $00, $00, $40, $40, $00, $00, $00
 	db $40, $00, $00, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $80
 	db $80, $80, $00, $00, $00, $00, $80, $40, $80, $80, $40, $40, $40, $40, $80, $80
 	INCBIN "gfx/cards/zapdos_lv40.2bpp"
+
 ZapdosLv64CardGfx::
-	rgb 31,31,22
-	rgb 27,27,0
-	rgb 31,9,4
-	rgb 0,0,4
+	rgb 31, 31, 22
+	rgb 27, 27,  0
+	rgb 31,  9,  4
+	rgb  0,  0,  4
 
-	rgb 31,31,22
-	rgb 27,27,0
-	rgb 0,19,6
-	rgb 0,0,4
+	rgb 31, 31, 22
+	rgb 27, 27,  0
+	rgb  0, 19,  6
+	rgb  0,  0,  4
 
-	rgb 0,7,12
-	rgb 27,27,0
-	rgb 3,21,31
-	rgb 0,0,4
+	rgb  0,  7, 12
+	rgb 27, 27,  0
+	rgb  3, 21, 31
+	rgb  0,  0,  4
 
 	db $70, $00, $2f, $2f, $00, $00, $40, $40, $40, $40, $00, $28, $00, $00, $40, $40
 	db $80, $40, $00, $00, $00, $00, $40, $00, $80, $00, $00, $00, $00, $00, $80, $80
@@ -2563,44 +2664,47 @@ ZapdosLv64CardGfx::
 	INCBIN "gfx/cards/zapdos_lv64.2bpp"
 ZapdosLv64CardGfxExtra::
 	INCBIN "gfx/cards/zapdos_lv64_extra.2bpp"
-	ds $d8, $00
 
-SECTION "Card Gfx 24", ROMX[$4000], BANK[$24]
+	ds $d8
+
+SECTION "Card Gfx 8", ROMX
+
 ZapdosLv68CardGfx::
-	rgb 31,31,31
-	rgb 31,22,0
-	rgb 31,4,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 22,  0
+	rgb 31,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,22,0
-	rgb 17,9,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 22,  0
+	rgb 17,  9,  0
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00
 	db $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/zapdos_lv68.2bpp"
+
 SandshrewLv12CardGfx::
-	rgb 31,31,18
-	rgb 27,27,4
-	rgb 18,13,0
-	rgb 4,2,2
+	rgb 31, 31, 18
+	rgb 27, 27,  4
+	rgb 18, 13,  0
+	rgb  4,  2,  2
 
-	rgb 31,31,18
-	rgb 21,17,12
-	rgb 18,13,0
-	rgb 4,2,2
+	rgb 31, 31, 18
+	rgb 21, 17, 12
+	rgb 18, 13,  0
+	rgb  4,  2,  2
 
-	rgb 19,15,10
-	rgb 21,17,12
-	rgb 18,13,0
-	rgb 4,2,2
+	rgb 19, 15, 10
+	rgb 21, 17, 12
+	rgb 18, 13,  0
+	rgb  4,  2,  2
 
 	db $b0, $70, $70, $70, $70, $70, $40, $80, $80, $40, $00, $00, $00, $80, $80, $80
 	db $80, $40, $00, $00, $00, $40, $40, $80, $80, $40, $00, $00, $00, $00, $00, $97
@@ -2608,21 +2712,22 @@ SandshrewLv12CardGfx::
 	INCBIN "gfx/cards/sandshrew_lv12.2bpp"
 SandshrewLv12CardGfxExtra::
 	INCBIN "gfx/cards/sandshrew_lv12_extra.2bpp"
+
 SandslashLv33CardGfx::
-	rgb 31,31,31
-	rgb 31,27,0
-	rgb 27,13,4
-	rgb 7,8,5
+	rgb 31, 31, 31
+	rgb 31, 27,  0
+	rgb 27, 13,  4
+	rgb  7,  8,  5
 
-	rgb 31,31,31
-	rgb 27,13,4
-	rgb 15,13,8
-	rgb 7,8,5
+	rgb 31, 31, 31
+	rgb 27, 13,  4
+	rgb 15, 13,  8
+	rgb  7,  8,  5
 
-	rgb 31,31,31
-	rgb 31,27,0
-	rgb 15,13,8
-	rgb 7,8,5
+	rgb 31, 31, 31
+	rgb 31, 27,  0
+	rgb 15, 13,  8
+	rgb  7,  8,  5
 
 	db $40, $40, $40, $40, $40, $2b, $2b, $00, $40, $40, $a8, $a8, $a8, $00, $00, $00
 	db $40, $40, $a3, $80, $80, $00, $00, $00, $5e, $80, $80, $80, $80, $00, $00, $00
@@ -2630,41 +2735,43 @@ SandslashLv33CardGfx::
 	INCBIN "gfx/cards/sandslash_lv33.2bpp"
 SandslashLv33CardGfxExtra::
 	INCBIN "gfx/cards/sandslash_lv33_extra.2bpp"
+
 DiglettLv8CardGfx::
-	rgb 31,31,21
-	rgb 31,22,4
-	rgb 27,13,4
-	rgb 4,0,0
+	rgb 31, 31, 21
+	rgb 31, 22,  4
+	rgb 27, 13,  4
+	rgb  4,  0,  0
 
-	rgb 31,31,21
-	rgb 17,21,31
-	rgb 10,15,25
-	rgb 4,0,0
+	rgb 31, 31, 21
+	rgb 17, 21, 31
+	rgb 10, 15, 25
+	rgb  4,  0,  0
 
-	rgb 31,31,21
-	rgb 17,21,31
-	rgb 2,19,0
-	rgb 4,0,0
+	rgb 31, 31, 21
+	rgb 17, 21, 31
+	rgb  2, 19,  0
+	rgb  4,  0,  0
 
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $40, $00, $00, $40, $40, $40
 	db $80, $80, $80, $00, $00, $80, $80, $80, $40, $80, $80, $80, $80, $80, $80, $80
 	db $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80
 	INCBIN "gfx/cards/diglett_lv8.2bpp"
+
 DugtrioLv36CardGfx::
-	rgb 31,31,31
-	rgb 31,13,4
-	rgb 22,9,4
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb 31, 13,  4
+	rgb 22,  9,  4
+	rgb  4,  0,  0
 
-	rgb 31,31,31
-	rgb 15,24,31
-	rgb 31,13,4
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb 15, 24, 31
+	rgb 31, 13,  4
+	rgb  4,  0,  0
 
-	rgb 31,31,31
-	rgb 15,24,31
-	rgb 22,9,4
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb 15, 24, 31
+	rgb 22,  9,  4
+	rgb  4,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $40, $00, $00, $63, $40, $40
 	db $40, $80, $1f, $00, $00, $00, $40, $80, $1a, $00, $00, $00, $00, $00, $80, $80
@@ -2672,21 +2779,22 @@ DugtrioLv36CardGfx::
 	INCBIN "gfx/cards/dugtrio_lv36.2bpp"
 DugtrioLv36CardGfxExtra::
 	INCBIN "gfx/cards/dugtrio_lv36_extra.2bpp"
+
 MankeyLv7CardGfx::
-	rgb 31,31,22
-	rgb 31,22,4
-	rgb 22,9,0
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 31, 22,  4
+	rgb 22,  9,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,22
-	rgb 19,20,0
-	rgb 1,17,0
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 19, 20,  0
+	rgb  1, 17,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,22
-	rgb 1,17,0
-	rgb 22,9,0
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb  1, 17,  0
+	rgb 22,  9,  0
+	rgb  4,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $6a, $40, $40, $00, $40, $00, $00, $00, $00, $80
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40
@@ -2694,364 +2802,383 @@ MankeyLv7CardGfx::
 	INCBIN "gfx/cards/mankey_lv7.2bpp"
 MankeyLv7CardGfxExtra::
 	INCBIN "gfx/cards/mankey_lv7_extra.2bpp"
+
 PrimeapeCardGfx::
-	rgb 31,31,22
-	rgb 31,22,0
-	rgb 22,9,0
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 31, 22,  0
+	rgb 22,  9,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,22
-	rgb 14,25,1
-	rgb 3,18,0
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 14, 25,  1
+	rgb  3, 18,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,22
-	rgb 14,25,1
-	rgb 22,9,0
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 14, 25,  1
+	rgb 22,  9,  0
+	rgb  4,  0,  0
 
 	db $40, $40, $80, $40, $80, $40, $40, $40, $40, $80, $80, $00, $00, $00, $40, $40
 	db $40, $40, $80, $00, $00, $00, $80, $40, $40, $80, $80, $00, $00, $00, $80, $40
 	db $40, $80, $80, $80, $80, $80, $80, $80, $40, $40, $40, $40, $40, $40, $80, $80
 	INCBIN "gfx/cards/primeape.2bpp"
+
 MachopLv20CardGfx::
-	rgb 27,31,27
-	rgb 13,27,18
-	rgb 9,18,9
-	rgb 0,4,0
+	rgb 27, 31, 27
+	rgb 13, 27, 18
+	rgb  9, 18,  9
+	rgb  0,  4,  0
 
-	rgb 27,31,27
-	rgb 0,16,31
-	rgb 9,9,18
-	rgb 0,4,0
+	rgb 27, 31, 27
+	rgb  0, 16, 31
+	rgb  9,  9, 18
+	rgb  0,  4,  0
 
-	rgb 27,31,27
-	rgb 5,21,25
-	rgb 9,18,9
-	rgb 0,0,0
+	rgb 27, 31, 27
+	rgb  5, 21, 25
+	rgb  9, 18,  9
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $00, $00, $40, $40, $40, $40, $80, $80, $80, $80, $40
 	db $40, $40, $40, $00, $00, $80, $80, $40, $40, $40, $00, $00, $00, $80, $80, $40
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $40, $00, $00, $40, $40, $40
 	INCBIN "gfx/cards/machop_lv20.2bpp"
+
 MachokeLv40CardGfx::
-	rgb 24,31,24
-	rgb 0,24,31
-	rgb 0,8,31
-	rgb 0,0,4
+	rgb 24, 31, 24
+	rgb  0, 24, 31
+	rgb  0,  8, 31
+	rgb  0,  0,  4
 
-	rgb 24,31,24
-	rgb 14,24,14
-	rgb 4,16,4
-	rgb 0,0,0
+	rgb 24, 31, 24
+	rgb 14, 24, 14
+	rgb  4, 16,  4
+	rgb  0,  0,  0
 
-	rgb 24,31,24
-	rgb 31,24,0
-	rgb 0,8,31
-	rgb 0,0,0
+	rgb 24, 31, 24
+	rgb 31, 24,  0
+	rgb  0,  8, 31
+	rgb  0,  0,  0
 
 	db $40, $00, $00, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $00, $00, $00, $40, $00, $80, $00, $80, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/machoke_lv40.2bpp"
+
 MachampLv67CardGfx::
-	rgb 31,31,31
-	rgb 13,22,22
-	rgb 4,13,22
-	rgb 0,4,4
+	rgb 31, 31, 31
+	rgb 13, 22, 22
+	rgb  4, 13, 22
+	rgb  0,  4,  4
 
-	rgb 31,31,31
-	rgb 9,18,22
-	rgb 31,0,0
-	rgb 0,4,4
+	rgb 31, 31, 31
+	rgb  9, 18, 22
+	rgb 31,  0,  0
+	rgb  0,  4,  4
 
-	rgb 31,31,31
-	rgb 16,25,18
-	rgb 0,18,4
-	rgb 1,0,0
+	rgb 31, 31, 31
+	rgb 16, 25, 18
+	rgb  0, 18,  4
+	rgb  1,  0,  0
 
 	db $80, $80, $80, $80, $00, $00, $80, $80, $80, $00, $00, $00, $00, $00, $80, $80
 	db $80, $00, $00, $40, $40, $00, $80, $80, $80, $80, $00, $40, $40, $00, $80, $80
 	db $80, $80, $80, $00, $00, $00, $80, $80, $80, $80, $80, $00, $00, $00, $80, $80
 	INCBIN "gfx/cards/machamp_lv67.2bpp"
+
 GeodudeLv16CardGfx::
-	rgb 31,27,27
-	rgb 31,7,5
-	rgb 10,7,7
-	rgb 0,0,4
+	rgb 31, 27, 27
+	rgb 31,  7,  5
+	rgb 10,  7,  7
+	rgb  0,  0,  4
 
-	rgb 31,27,27
-	rgb 17,13,13
-	rgb 10,7,7
-	rgb 0,0,4
+	rgb 31, 27, 27
+	rgb 17, 13, 13
+	rgb 10,  7,  7
+	rgb  0,  0,  4
 
-	rgb 31,21,5
-	rgb 31,7,5
-	rgb 10,7,7
-	rgb 0,0,4
+	rgb 31, 21,  5
+	rgb 31,  7,  5
+	rgb 10,  7,  7
+	rgb  0,  0,  4
 
 	db $80, $80, $80, $80, $00, $80, $00, $80, $80, $00, $00, $40, $40, $40, $40, $80
 	db $80, $40, $00, $40, $40, $40, $40, $00, $00, $80, $40, $40, $40, $40, $80, $80
 	db $80, $00, $40, $40, $40, $00, $80, $80, $80, $80, $00, $00, $00, $40, $80, $80
 	INCBIN "gfx/cards/geodude_lv16.2bpp"
+
 GravelerLv29CardGfx::
-	rgb 31,31,22
-	rgb 22,13,9
-	rgb 13,4,4
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 22, 13,  9
+	rgb 13,  4,  4
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 12,18,0
-	rgb 0,10,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 12, 18,  0
+	rgb  0, 10,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 31,0,0
-	rgb 13,4,4
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 31,  0,  0
+	rgb 13,  4,  4
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $00, $00, $00, $00, $80, $80
 	db $80, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $40
 	db $40, $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/graveler_lv29.2bpp"
+
 GolemLv36CardGfx::
-	rgb 31,31,13
-	rgb 22,13,9
-	rgb 23,0,8
-	rgb 0,0,0
+	rgb 31, 31, 13
+	rgb 22, 13,  9
+	rgb 23,  0,  8
+	rgb  0,  0,  0
 
-	rgb 22,31,11
-	rgb 21,13,3
-	rgb 10,4,0
-	rgb 0,0,0
+	rgb 22, 31, 11
+	rgb 21, 13,  3
+	rgb 10,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,13
-	rgb 31,17,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 13
+	rgb 31, 17,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $80
 	db $00, $00, $40, $40, $40, $40, $80, $80, $00, $00, $40, $40, $40, $40, $00, $80
 	db $80, $80, $40, $40, $40, $40, $00, $80, $80, $80, $80, $80, $80, $80, $80, $80
 	INCBIN "gfx/cards/golem_lv36.2bpp"
+
 OnixLv12CardGfx::
-	rgb 20,31,31
-	rgb 13,18,22
-	rgb 0,9,18
-	rgb 0,0,6
+	rgb 20, 31, 31
+	rgb 13, 18, 22
+	rgb  0,  9, 18
+	rgb  0,  0,  6
 
-	rgb 20,31,31
-	rgb 12,22,1
-	rgb 2,15,3
-	rgb 0,0,6
+	rgb 20, 31, 31
+	rgb 12, 22,  1
+	rgb  2, 15,  3
+	rgb  0,  0,  6
 
-	rgb 20,31,31
-	rgb 13,18,22
-	rgb 2,15,3
-	rgb 0,0,6
+	rgb 20, 31, 31
+	rgb 13, 18, 22
+	rgb  2, 15,  3
+	rgb  0,  0,  6
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $40, $40
 	db $40, $40, $00, $80, $40, $00, $40, $40, $40, $40, $00, $40, $40, $00, $40, $40
 	db $40, $40, $00, $40, $40, $00, $80, $40, $40, $40, $80, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/onix_lv12.2bpp"
+
 CuboneLv13CardGfx::
-	rgb 27,31,31
-	rgb 18,18,31
-	rgb 9,4,22
-	rgb 0,0,9
+	rgb 27, 31, 31
+	rgb 18, 18, 31
+	rgb  9,  4, 22
+	rgb  0,  0,  9
 
-	rgb 27,31,31
-	rgb 22,22,18
-	rgb 16,12,4
-	rgb 0,0,9
+	rgb 27, 31, 31
+	rgb 22, 22, 18
+	rgb 16, 12,  4
+	rgb  0,  0,  9
 
-	rgb 27,31,31
-	rgb 22,22,18
-	rgb 9,4,22
-	rgb 0,0,9
+	rgb 27, 31, 31
+	rgb 22, 22, 18
+	rgb  9,  4, 22
+	rgb  0,  0,  9
 
 	db $00, $00, $00, $80, $00, $00, $00, $00, $00, $00, $80, $40, $40, $80, $00, $00
 	db $00, $00, $00, $80, $40, $80, $00, $00, $00, $00, $00, $80, $40, $80, $00, $00
 	db $00, $00, $80, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/cubone_lv13.2bpp"
+
 MarowakLv26CardGfx::
-	rgb 27,27,27
-	rgb 27,18,9
-	rgb 22,9,0
-	rgb 9,0,0
+	rgb 27, 27, 27
+	rgb 27, 18,  9
+	rgb 22,  9,  0
+	rgb  9,  0,  0
 
-	rgb 27,27,27
-	rgb 11,22,18
-	rgb 22,9,0
-	rgb 9,0,0
+	rgb 27, 27, 27
+	rgb 11, 22, 18
+	rgb 22,  9,  0
+	rgb  9,  0,  0
 
-	rgb 27,27,27
-	rgb 11,22,18
-	rgb 0,16,4
-	rgb 9,0,0
+	rgb 27, 27, 27
+	rgb 11, 22, 18
+	rgb  0, 16,  4
+	rgb  9,  0,  0
 
 	db $80, $80, $80, $80, $80, $00, $00, $80, $80, $80, $80, $00, $00, $00, $40, $80
 	db $80, $80, $80, $40, $00, $00, $40, $80, $80, $80, $80, $80, $00, $00, $40, $80
 	db $80, $80, $80, $80, $40, $40, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80
 	INCBIN "gfx/cards/marowak_lv26.2bpp"
+
 MarowakLv32CardGfx::
-	rgb 31,31,22
-	rgb 27,13,9
-	rgb 18,4,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 27, 13,  9
+	rgb 18,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 0,21,31
-	rgb 0,11,20
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb  0, 21, 31
+	rgb  0, 11, 20
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 18,4,0
-	rgb 0,11,20
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 18,  4,  0
+	rgb  0, 11, 20
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $80, $80, $40, $80, $40, $40, $40, $80, $00, $00, $40, $80, $40
 	db $40, $40, $80, $00, $00, $80, $00, $40, $00, $00, $00, $00, $00, $00, $00, $80
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/marowak_lv32.2bpp"
+
 HitmonleeLv30CardGfx::
-	rgb 31,27,22
-	rgb 31,22,0
-	rgb 22,9,0
-	rgb 4,0,0
+	rgb 31, 27, 22
+	rgb 31, 22,  0
+	rgb 22,  9,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,22
-	rgb 0,22,9
-	rgb 22,9,0
-	rgb 0,0,0
+	rgb 31, 27, 22
+	rgb  0, 22,  9
+	rgb 22,  9,  0
+	rgb  0,  0,  0
 
-	rgb 31,27,22
-	rgb 31,22,0
-	rgb 0,22,9
-	rgb 0,0,0
+	rgb 31, 27, 22
+	rgb 31, 22,  0
+	rgb  0, 22,  9
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $00, $00, $00, $00, $40, $80
 	db $80, $80, $00, $00, $00, $00, $80, $80, $80, $80, $00, $40, $00, $40, $80, $80
 	db $80, $80, $80, $80, $80, $00, $80, $80, $80, $80, $80, $80, $80, $40, $80, $80
 	INCBIN "gfx/cards/hitmonlee_lv30.2bpp"
+
 HitmonchanLv33CardGfx::
-	rgb 31,31,22
-	rgb 27,18,4
-	rgb 13,4,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 27, 18,  4
+	rgb 13,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 0,24,0
-	rgb 0,9,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb  0, 24,  0
+	rgb  0,  9,  0
+	rgb  0,  0,  0
 
-	rgb 31,26,24
-	rgb 27,1,0
-	rgb 25,0,31
-	rgb 0,0,0
+	rgb 31, 26, 24
+	rgb 27,  1,  0
+	rgb 25,  0, 31
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $80, $00, $80, $00, $00, $40, $40, $40, $00, $80, $80, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $80, $40, $80, $80, $40, $40
 	INCBIN "gfx/cards/hitmonchan_lv33.2bpp"
-	ds $18, $00
 
-SECTION "Card Gfx 25", ROMX[$4000], BANK[$25]
+	ds $18
+
+SECTION "Card Gfx 9", ROMX
+
 RhyhornCardGfx::
-	rgb 31,27,23
-	rgb 18,20,22
-	rgb 11,12,13
-	rgb 0,0,0
+	rgb 31, 27, 23
+	rgb 18, 20, 22
+	rgb 11, 12, 13
+	rgb  0,  0,  0
 
-	rgb 31,27,23
-	rgb 31,9,0
-	rgb 16,5,0
-	rgb 0,0,0
+	rgb 31, 27, 23
+	rgb 31,  9,  0
+	rgb 16,  5,  0
+	rgb  0,  0,  0
 
-	rgb 31,27,23
-	rgb 31,9,0
-	rgb 11,12,13
-	rgb 0,0,0
+	rgb 31, 27, 23
+	rgb 31,  9,  0
+	rgb 11, 12, 13
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $80, $80, $40, $40, $40, $40, $40, $80, $00, $00, $80, $80, $40
 	db $40, $40, $00, $00, $00, $00, $80, $40, $40, $40, $00, $00, $00, $00, $80, $40
 	db $40, $40, $80, $00, $00, $00, $80, $40, $40, $40, $80, $80, $80, $80, $40, $40
 	INCBIN "gfx/cards/rhyhorn.2bpp"
+
 RhydonLv48CardGfx::
-	rgb 31,31,27
-	rgb 22,17,9
-	rgb 13,8,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 22, 17,  9
+	rgb 13,  8,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 9,17,22
-	rgb 8,13,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb  9, 17, 22
+	rgb  8, 13,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 9,15,11
-	rgb 13,8,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb  9, 15, 11
+	rgb 13,  8,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $80, $00, $00, $00, $00, $80, $40
 	db $40, $40, $00, $00, $00, $00, $80, $40, $40, $00, $00, $00, $00, $00, $00, $40
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/rhydon_lv48.2bpp"
+
 KabutoLv9CardGfx::
-	rgb 31,31,27
-	rgb 31,22,0
-	rgb 18,9,4
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31, 22,  0
+	rgb 18,  9,  4
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 13,22,20
-	rgb 6,17,18
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 13, 22, 20
+	rgb  6, 17, 18
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 13,22,20
-	rgb 18,9,4
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 13, 22, 20
+	rgb 18,  9,  4
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $80, $80, $80, $40
 	db $40, $40, $00, $00, $00, $00, $80, $40, $40, $80, $00, $00, $00, $00, $80, $40
 	db $40, $40, $00, $00, $80, $80, $80, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/kabuto_lv9.2bpp"
+
 KabutopsCardGfx::
-	rgb 31,27,27
-	rgb 13,22,18
-	rgb 18,13,9
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 13, 22, 18
+	rgb 18, 13,  9
+	rgb  4,  0,  0
 
-	rgb 31,27,27
-	rgb 27,4,0
-	rgb 16,2,0
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 27,  4,  0
+	rgb 16,  2,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,27
-	rgb 27,4,0
-	rgb 18,13,9
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 27,  4,  0
+	rgb 18, 13,  9
+	rgb  4,  0,  0
 
 	db $40, $40, $40, $80, $80, $40, $40, $40, $40, $40, $00, $00, $00, $80, $40, $40
 	db $40, $40, $00, $00, $00, $80, $40, $40, $40, $00, $00, $00, $00, $00, $80, $40
 	db $40, $00, $00, $00, $00, $80, $00, $40, $40, $40, $40, $40, $40, $40, $00, $40
 	INCBIN "gfx/cards/kabutops.2bpp"
+
 AerodactylLv28CardGfx::
-	rgb 27,22,27
-	rgb 9,9,6
-	rgb 13,4,13
-	rgb 0,0,4
+	rgb 27, 22, 27
+	rgb  9,  9,  6
+	rgb 13,  4, 13
+	rgb  0,  0,  4
 
-	rgb 27,22,27
-	rgb 16,16,13
-	rgb 9,9,6
-	rgb 0,0,4
+	rgb 27, 22, 27
+	rgb 16, 16, 13
+	rgb  9,  9,  6
+	rgb  0,  0,  4
 
-	rgb 27,22,27
-	rgb 24,12,0
-	rgb 9,9,6
-	rgb 0,0,4
+	rgb 27, 22, 27
+	rgb 24, 12,  0
+	rgb  9,  9,  6
+	rgb  0,  0,  4
 
 	db $30, $40, $00, $00, $40, $40, $40, $00, $00, $00, $00, $40, $65, $25, $00, $00
 	db $00, $00, $00, $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $40, $40, $14
@@ -3059,21 +3186,22 @@ AerodactylLv28CardGfx::
 	INCBIN "gfx/cards/aerodactyl_lv28.2bpp"
 AerodactylLv28CardGfxExtra::
 	INCBIN "gfx/cards/aerodactyl_lv28_extra.2bpp"
+
 AbraLv10CardGfx::
-	rgb 31,31,18
-	rgb 31,18,4
-	rgb 27,9,4
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb 31, 18,  4
+	rgb 27,  9,  4
+	rgb  4,  0,  0
 
-	rgb 31,31,18
-	rgb 0,15,31
-	rgb 5,2,24
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb  0, 15, 31
+	rgb  5,  2, 24
+	rgb  4,  0,  0
 
-	rgb 31,31,18
-	rgb 27,9,4
-	rgb 5,2,24
-	rgb 4,0,0
+	rgb 31, 31, 18
+	rgb 27,  9,  4
+	rgb  5,  2, 24
+	rgb  4,  0,  0
 
 	db $40, $40, $40, $40, $80, $00, $00, $00, $40, $40, $40, $65, $80, $00, $00, $80
 	db $40, $40, $40, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00
@@ -3081,21 +3209,22 @@ AbraLv10CardGfx::
 	INCBIN "gfx/cards/abra_lv10.2bpp"
 AbraLv10CardGfxExtra::
 	INCBIN "gfx/cards/abra_lv10_extra.2bpp"
+
 KadabraLv38CardGfx::
-	rgb 31,31,18
-	rgb 31,27,0
-	rgb 25,15,4
-	rgb 4,0,5
+	rgb 31, 31, 18
+	rgb 31, 27,  0
+	rgb 25, 15,  4
+	rgb  4,  0,  5
 
-	rgb 31,31,18
-	rgb 17,0,0
-	rgb 25,15,4
-	rgb 4,0,5
+	rgb 31, 31, 18
+	rgb 17,  0,  0
+	rgb 25, 15,  4
+	rgb  4,  0,  5
 
-	rgb 31,31,18
-	rgb 31,27,0
-	rgb 17,0,0
-	rgb 4,0,5
+	rgb 31, 31, 18
+	rgb 31, 27,  0
+	rgb 17,  0,  0
+	rgb  4,  0,  5
 
 	db $70, $40, $40, $00, $00, $00, $2b, $00, $00, $29, $40, $00, $27, $27, $00, $26
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $80, $80
@@ -3103,41 +3232,43 @@ KadabraLv38CardGfx::
 	INCBIN "gfx/cards/kadabra_lv38.2bpp"
 KadabraLv38CardGfxExtra::
 	INCBIN "gfx/cards/kadabra_lv38_extra.2bpp"
+
 AlakazamLv42CardGfx::
-	rgb 31,31,18
-	rgb 31,27,0
-	rgb 22,13,4
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb 31, 27,  0
+	rgb 22, 13,  4
+	rgb  0,  0,  0
 
-	rgb 31,31,18
-	rgb 0,15,27
-	rgb 0,0,31
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb  0, 15, 27
+	rgb  0,  0, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,18
-	rgb 0,15,27
-	rgb 22,13,4
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb  0, 15, 27
+	rgb 22, 13,  4
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $80, $40, $00, $40, $40, $40, $40, $80, $00, $00, $80, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $80, $40
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $00, $00, $80, $00, $00, $00, $40
 	INCBIN "gfx/cards/alakazam_lv42.2bpp"
+
 SlowpokeLv9CardGfx::
-	rgb 31,31,31
-	rgb 31,12,0
-	rgb 31,28,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 12,  0
+	rgb 31, 28,  0
+	rgb  0,  0,  0
 
-	rgb 31,28,0
-	rgb 31,12,0
-	rgb 31,0,13
-	rgb 0,0,0
+	rgb 31, 28,  0
+	rgb 31, 12,  0
+	rgb 31,  0, 13
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,12,0
-	rgb 31,0,13
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 12,  0
+	rgb 31,  0, 13
+	rgb  0,  0,  0
 
 	db $40, $40, $6e, $40, $6d, $40, $40, $40, $6a, $40, $29, $00, $00, $27, $40, $40
 	db $25, $00, $80, $a3, $80, $80, $80, $00, $80, $9e, $80, $9d, $00, $00, $80, $9a
@@ -3145,21 +3276,22 @@ SlowpokeLv9CardGfx::
 	INCBIN "gfx/cards/slowpoke_lv9.2bpp"
 SlowpokeLv9CardGfxExtra::
 	INCBIN "gfx/cards/slowpoke_lv9_extra.2bpp"
+
 SlowpokeLv18CardGfx::
-	rgb 31,27,27
-	rgb 27,22,0
-	rgb 27,4,13
-	rgb 18,4,4
+	rgb 31, 27, 27
+	rgb 27, 22,  0
+	rgb 27,  4, 13
+	rgb 18,  4,  4
 
-	rgb 31,27,27
-	rgb 0,24,31
-	rgb 27,4,13
-	rgb 18,4,4
+	rgb 31, 27, 27
+	rgb  0, 24, 31
+	rgb 27,  4, 13
+	rgb 18,  4,  4
 
-	rgb 31,27,27
-	rgb 10,29,0
-	rgb 27,4,13
-	rgb 18,4,4
+	rgb 31, 27, 27
+	rgb 10, 29,  0
+	rgb 27,  4, 13
+	rgb 18,  4,  4
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $61
 	db $40, $40, $40, $40, $40, $40, $5b, $40, $80, $80, $80, $00, $00, $80, $80, $80
@@ -3167,21 +3299,22 @@ SlowpokeLv18CardGfx::
 	INCBIN "gfx/cards/slowpoke_lv18.2bpp"
 SlowpokeLv18CardGfxExtra::
 	INCBIN "gfx/cards/slowpoke_lv18_extra.2bpp"
+
 SlowbroLv26CardGfx::
-	rgb 31,27,13
-	rgb 31,13,0
-	rgb 27,4,9
-	rgb 9,0,4
+	rgb 31, 27, 13
+	rgb 31, 13,  0
+	rgb 27,  4,  9
+	rgb  9,  0,  4
 
-	rgb 31,27,13
-	rgb 19,21,0
-	rgb 0,15,1
-	rgb 9,0,4
+	rgb 31, 27, 13
+	rgb 19, 21,  0
+	rgb  0, 15,  1
+	rgb  9,  0,  4
 
-	rgb 19,21,0
-	rgb 7,6,18
-	rgb 27,4,9
-	rgb 9,0,4
+	rgb 19, 21,  0
+	rgb  7,  6, 18
+	rgb 27,  4,  9
+	rgb  9,  0,  4
 
 	db $00, $00, $00, $00, $00, $2b, $00, $00, $00, $00, $00, $26, $00, $00, $00, $00
 	db $40, $61, $00, $00, $00, $00, $40, $5c, $40, $40, $00, $00, $00, $17, $80, $40
@@ -3189,101 +3322,106 @@ SlowbroLv26CardGfx::
 	INCBIN "gfx/cards/slowbro_lv26.2bpp"
 SlowbroLv26CardGfxExtra::
 	INCBIN "gfx/cards/slowbro_lv26_extra.2bpp"
+
 GastlyLv8CardGfx::
-	rgb 31,31,31
-	rgb 27,0,0
-	rgb 9,9,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 27,  0,  0
+	rgb  9,  9,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 19,0,22
-	rgb 9,9,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19,  0, 22
+	rgb  9,  9,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,29,31
-	rgb 9,9,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 29, 31
+	rgb  9,  9,  9
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $80, $80
 	db $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/gastly_lv8.2bpp"
+
 GastlyLv17CardGfx::
-	rgb 31,31,31
-	rgb 31,18,0
-	rgb 18,4,13
-	rgb 4,0,4
+	rgb 31, 31, 31
+	rgb 31, 18,  0
+	rgb 18,  4, 13
+	rgb  4,  0,  4
 
-	rgb 31,31,0
-	rgb 31,18,0
-	rgb 18,4,13
-	rgb 4,0,4
+	rgb 31, 31,  0
+	rgb 31, 18,  0
+	rgb 18,  4, 13
+	rgb  4,  0,  4
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $40, $40, $00, $00, $40, $00, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $00, $40, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	db $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/gastly_lv17.2bpp"
+
 HaunterLv17CardGfx::
-	rgb 31,29,31
-	rgb 31,0,4
-	rgb 16,7,20
-	rgb 0,0,0
+	rgb 31, 29, 31
+	rgb 31,  0,  4
+	rgb 16,  7, 20
+	rgb  0,  0,  0
 
-	rgb 31,29,31
-	rgb 25,16,29
-	rgb 16,7,20
-	rgb 0,0,0
+	rgb 31, 29, 31
+	rgb 25, 16, 29
+	rgb 16,  7, 20
+	rgb  0,  0,  0
 
-	rgb 19,31,31
-	rgb 0,19,31
-	rgb 0,6,30
-	rgb 0,0,0
+	rgb 19, 31, 31
+	rgb  0, 19, 31
+	rgb  0,  6, 30
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $80, $40, $80, $80, $80, $80, $80, $40, $40, $40, $40, $80, $80
 	db $80, $80, $40, $40, $40, $40, $40, $80, $80, $80, $40, $00, $00, $80, $80, $80
 	db $80, $80, $40, $40, $40, $80, $80, $80, $80, $80, $40, $80, $40, $80, $80, $80
 	INCBIN "gfx/cards/haunter_lv17.2bpp"
+
 HaunterLv22CardGfx::
-	rgb 31,31,31
-	rgb 22,9,22
-	rgb 13,0,13
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 22,  9, 22
+	rgb 13,  0, 13
+	rgb  0,  0,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/haunter_lv22.2bpp"
+
 GengarLv38CardGfx::
-	rgb 31,27,31
-	rgb 31,0,9
-	rgb 13,4,22
-	rgb 4,0,4
+	rgb 31, 27, 31
+	rgb 31,  0,  9
+	rgb 13,  4, 22
+	rgb  4,  0,  4
 
-	rgb 31,27,31
-	rgb 3,19,31
-	rgb 2,7,21
-	rgb 4,0,4
+	rgb 31, 27, 31
+	rgb  3, 19, 31
+	rgb  2,  7, 21
+	rgb  4,  0,  4
 
-	rgb 31,0,9
-	rgb 3,19,31
-	rgb 2,7,21
-	rgb 4,0,4
+	rgb 31,  0,  9
+	rgb  3, 19, 31
+	rgb  2,  7, 21
+	rgb  4,  0,  4
 
 	db $40, $40, $2e, $40, $40, $00, $00, $80, $40, $40, $00, $26, $00, $00, $40, $40
 	db $80, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $80
@@ -3291,144 +3429,152 @@ GengarLv38CardGfx::
 	INCBIN "gfx/cards/gengar_lv38.2bpp"
 GengarLv38CardGfxExtra::
 	INCBIN "gfx/cards/gengar_lv38_extra.2bpp"
+
 DrowzeeLv12CardGfx::
-	rgb 31,31,22
-	rgb 27,27,0
-	rgb 13,9,4
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 27, 27,  0
+	rgb 13,  9,  4
+	rgb  0,  0,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/drowzee_lv12.2bpp"
+
 HypnoLv36CardGfx::
-	rgb 31,31,27
-	rgb 31,22,0
-	rgb 22,13,0
-	rgb 4,4,0
+	rgb 31, 31, 27
+	rgb 31, 22,  0
+	rgb 22, 13,  0
+	rgb  4,  4,  0
 
-	rgb 31,31,27
-	rgb 31,22,0
-	rgb 16,8,31
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31, 22,  0
+	rgb 16,  8, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 16,8,31
-	rgb 22,13,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 16,  8, 31
+	rgb 22, 13,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40
 	db $40, $40, $40, $00, $00, $00, $80, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $40, $00, $80, $40, $40, $40
 	INCBIN "gfx/cards/hypno_lv36.2bpp"
-	ds $240, $00
 
-SECTION "Card Gfx 26", ROMX[$4000], BANK[$26]
+	ds $240
+
+SECTION "Card Gfx 10", ROMX
+
 MrMimeLv28CardGfx::
-	rgb 31,27,27
-	rgb 13,22,9
-	rgb 27,0,4
-	rgb 0,0,0
+	rgb 31, 27, 27
+	rgb 13, 22,  9
+	rgb 27,  0,  4
+	rgb  0,  0,  0
 
-	rgb 31,27,27
-	rgb 13,22,9
-	rgb 29,21,9
-	rgb 0,0,0
+	rgb 31, 27, 27
+	rgb 13, 22,  9
+	rgb 29, 21,  9
+	rgb  0,  0,  0
 
-	rgb 31,27,27
-	rgb 29,21,0
-	rgb 27,0,4
-	rgb 0,0,0
+	rgb 31, 27, 27
+	rgb 29, 21,  0
+	rgb 27,  0,  4
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $00, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $80, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/mr_mime_lv28.2bpp"
+
 JynxLv23CardGfx::
-	rgb 31,31,22
-	rgb 31,27,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 31, 27,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 31,27,0
-	rgb 23,0,18
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 31, 27,  0
+	rgb 23,  0, 18
+	rgb  0,  0,  0
 
-	rgb 23,0,18
-	rgb 31,27,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 23,  0, 18
+	rgb 31, 27,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $40, $40, $40, $40, $00, $00, $00, $40, $80, $00, $00, $40, $40, $00
 	db $00, $40, $00, $00, $00, $00, $40, $00, $00, $80, $40, $00, $00, $00, $80, $00
 	db $00, $40, $80, $00, $00, $00, $80, $80, $00, $40, $80, $80, $00, $80, $40, $80
 	INCBIN "gfx/cards/jynx_lv23.2bpp"
+
 MewtwoLv53CardGfx::
-	rgb 31,31,31
-	rgb 27,18,27
-	rgb 22,4,27
-	rgb 4,0,9
+	rgb 31, 31, 31
+	rgb 27, 18, 27
+	rgb 22,  4, 27
+	rgb  4,  0,  9
 
-	rgb 22,28,31
-	rgb 9,19,31
-	rgb 0,9,25
-	rgb 4,0,9
+	rgb 22, 28, 31
+	rgb  9, 19, 31
+	rgb  0,  9, 25
+	rgb  4,  0,  9
 
-	rgb 31,31,31
-	rgb 27,18,27
-	rgb 0,9,25
-	rgb 4,0,9
+	rgb 31, 31, 31
+	rgb 27, 18, 27
+	rgb  0,  9, 25
+	rgb  4,  0,  9
 
 	db $40, $40, $80, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $80, $00, $40
 	db $00, $00, $00, $00, $00, $80, $00, $40, $40, $40, $80, $00, $00, $00, $80, $00
 	db $40, $40, $40, $00, $00, $00, $00, $40, $00, $40, $80, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/mewtwo_lv53.2bpp"
+
 MewtwoLv60CardGfx::
-	rgb 31,27,18
-	rgb 31,13,9
-	rgb 22,0,9
-	rgb 0,0,0
+	rgb 31, 27, 18
+	rgb 31, 13,  9
+	rgb 22,  0,  9
+	rgb  0,  0,  0
 
-	rgb 31,27,18
-	rgb 4,22,5
-	rgb 4,14,5
-	rgb 0,0,0
+	rgb 31, 27, 18
+	rgb  4, 22,  5
+	rgb  4, 14,  5
+	rgb  0,  0,  0
 
-	rgb 31,27,18
-	rgb 31,13,9
-	rgb 4,14,5
-	rgb 0,0,0
+	rgb 31, 27, 18
+	rgb 31, 13,  9
+	rgb  4, 14,  5
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $80, $40, $40
 	db $80, $00, $00, $00, $00, $00, $80, $40, $80, $00, $00, $00, $00, $00, $00, $80
 	db $40, $80, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/mewtwo_lv60.2bpp"
+
 MewtwoAltLv60CardGfx::
-	rgb 31,31,31
-	rgb 24,9,22
-	rgb 10,1,16
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 24,  9, 22
+	rgb 10,  1, 16
+	rgb  0,  0,  4
 
-	rgb 6,1,10
-	rgb 24,9,22
-	rgb 10,1,16
-	rgb 0,0,4
+	rgb  6,  1, 10
+	rgb 24,  9, 22
+	rgb 10,  1, 16
+	rgb  0,  0,  4
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $40, $00, $2d, $2d, $40, $6c, $40, $00, $00, $00, $00, $00, $00, $00, $40
 	db $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $15, $40
@@ -3436,161 +3582,169 @@ MewtwoAltLv60CardGfx::
 	INCBIN "gfx/cards/mewtwo_alt_lv60.2bpp"
 MewtwoAltLv60CardGfxExtra::
 	INCBIN "gfx/cards/mewtwo_alt_lv60_extra.2bpp"
+
 MewLv8CardGfx::
-	rgb 31,31,31
-	rgb 31,13,27
-	rgb 4,18,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 13, 27
+	rgb  4, 18,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 25,20,7
-	rgb 4,18,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 25, 20,  7
+	rgb  4, 18,  9
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $40, $40, $40, $40
 	db $40, $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $40, $40, $00, $40, $40
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/mew_lv8.2bpp"
+
 MewLv15CardGfx::
-	rgb 31,31,27
-	rgb 27,13,22
-	rgb 31,4,9
-	rgb 4,0,0
+	rgb 31, 31, 27
+	rgb 27, 13, 22
+	rgb 31,  4,  9
+	rgb  4,  0,  0
 
-	rgb 31,31,27
-	rgb 27,13,22
-	rgb 31,19,0
-	rgb 4,0,0
+	rgb 31, 31, 27
+	rgb 27, 13, 22
+	rgb 31, 19,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,27
-	rgb 31,19,0
-	rgb 25,0,0
-	rgb 4,0,0
+	rgb 31, 31, 27
+	rgb 31, 19,  0
+	rgb 25,  0,  0
+	rgb  4,  0,  0
 
 	db $00, $40, $40, $40, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $40
 	db $80, $80, $00, $00, $00, $80, $80, $80, $80, $80, $00, $00, $40, $40, $80, $80
 	db $80, $80, $80, $00, $00, $80, $80, $80, $80, $80, $80, $00, $80, $80, $80, $80
 	INCBIN "gfx/cards/mew_lv15.2bpp"
+
 MewLv23CardGfx::
-	rgb 31,31,31
-	rgb 27,13,22
-	rgb 7,18,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 27, 13, 22
+	rgb  7, 18,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 11,18,28
-	rgb 0,9,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 11, 18, 28
+	rgb  0,  9, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 27,13,28
-	rgb 22,0,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 27, 13, 28
+	rgb 22,  0, 22
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $80, $80, $40, $80, $80, $80, $00, $80, $80, $80
 	INCBIN "gfx/cards/mew_lv23.2bpp"
+
 PidgeyLv8CardGfx::
-	rgb 31,31,27
-	rgb 31,27,0
-	rgb 27,13,4
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31, 27,  0
+	rgb 27, 13,  4
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 0,15,31
-	rgb 0,12,0
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb  0, 15, 31
+	rgb  0, 12,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 0,15,31
-	rgb 27,13,4
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb  0, 15, 31
+	rgb 27, 13,  4
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $00, $80, $40, $40, $40
 	db $40, $40, $80, $00, $80, $40, $40, $40, $40, $40, $80, $00, $00, $00, $00, $40
 	db $40, $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/pidgey_lv8.2bpp"
+
 PidgeottoLv36CardGfx::
-	rgb 31,31,22
-	rgb 23,6,4
-	rgb 20,15,7
-	rgb 0,6,0
+	rgb 31, 31, 22
+	rgb 23,  6,  4
+	rgb 20, 15,  7
+	rgb  0,  6,  0
 
-	rgb 31,31,22
-	rgb 23,6,4
-	rgb 19,15,27
-	rgb 0,6,0
+	rgb 31, 31, 22
+	rgb 23,  6,  4
+	rgb 19, 15, 27
+	rgb  0,  6,  0
 
-	rgb 31,31,22
-	rgb 23,6,4
-	rgb 6,19,2
-	rgb 0,6,0
+	rgb 31, 31, 22
+	rgb 23,  6,  4
+	rgb  6, 19,  2
+	rgb  0,  6,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $80, $80
 	db $80, $80, $80, $00, $00, $80, $80, $80, $80, $80, $80, $00, $00, $80, $80, $80
 	INCBIN "gfx/cards/pidgeotto_lv36.2bpp"
+
 PidgeotLv38CardGfx::
-	rgb 31,27,27
-	rgb 31,18,4
-	rgb 27,4,0
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 31, 18,  4
+	rgb 27,  4,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,27
-	rgb 31,18,4
-	rgb 0,9,0
-	rgb 0,0,0
+	rgb 31, 27, 27
+	rgb 31, 18,  4
+	rgb  0,  9,  0
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $40, $40, $00, $40, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/pidgeot_lv38.2bpp"
+
 PidgeotLv40CardGfx::
-	rgb 29,31,23
-	rgb 31,27,4
-	rgb 22,9,4
-	rgb 0,0,6
+	rgb 29, 31, 23
+	rgb 31, 27,  4
+	rgb 22,  9,  4
+	rgb  0,  0,  6
 
-	rgb 29,31,23
-	rgb 5,19,2
-	rgb 2,9,0
-	rgb 0,0,6
+	rgb 29, 31, 23
+	rgb  5, 19,  2
+	rgb  2,  9,  0
+	rgb  0,  0,  6
 
-	rgb 29,31,23
-	rgb 5,14,24
-	rgb 2,1,18
-	rgb 0,0,6
+	rgb 29, 31, 23
+	rgb  5, 14, 24
+	rgb  2,  1, 18
+	rgb  0,  0,  6
 
 	db $40, $40, $40, $40, $00, $00, $00, $80, $40, $40, $40, $40, $00, $00, $00, $00
 	db $80, $00, $00, $00, $00, $00, $00, $40, $80, $00, $00, $00, $00, $00, $00, $40
 	db $80, $80, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $00, $80, $80, $80
 	INCBIN "gfx/cards/pidgeot_lv40.2bpp"
+
 RattataLv9CardGfx::
-	rgb 31,31,27
-	rgb 9,18,0
-	rgb 22,4,18
-	rgb 0,0,4
+	rgb 31, 31, 27
+	rgb  9, 18,  0
+	rgb 22,  4, 18
+	rgb  0,  0,  4
 
-	rgb 31,31,27
-	rgb 9,18,0
-	rgb 21,23,0
-	rgb 0,0,4
+	rgb 31, 31, 27
+	rgb  9, 18,  0
+	rgb 21, 23,  0
+	rgb  0,  0,  4
 
-	rgb 21,23,0
-	rgb 9,18,0
-	rgb 31,7,0
-	rgb 0,0,4
+	rgb 21, 23,  0
+	rgb  9, 18,  0
+	rgb 31,  7,  0
+	rgb  0,  0,  4
 
 	db $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $40
 	db $00, $1f, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $40
@@ -3598,41 +3752,43 @@ RattataLv9CardGfx::
 	INCBIN "gfx/cards/rattata_lv9.2bpp"
 RattataLv9CardGfxExtra::
 	INCBIN "gfx/cards/rattata_lv9_extra.2bpp"
+
 RaticateCardGfx::
-	rgb 31,31,17
-	rgb 13,27,18
-	rgb 31,15,3
-	rgb 0,0,0
+	rgb 31, 31, 17
+	rgb 13, 27, 18
+	rgb 31, 15,  3
+	rgb  0,  0,  0
 
-	rgb 29,31,17
-	rgb 0,24,15
-	rgb 0,15,6
-	rgb 0,0,0
+	rgb 29, 31, 17
+	rgb  0, 24, 15
+	rgb  0, 15,  6
+	rgb  0,  0,  0
 
-	rgb 31,31,17
-	rgb 31,25,14
-	rgb 31,15,3
-	rgb 0,0,0
+	rgb 31, 31, 17
+	rgb 31, 25, 14
+	rgb 31, 15,  3
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $80, $80, $00, $40, $40
 	db $40, $40, $80, $80, $80, $00, $40, $40, $40, $40, $40, $80, $80, $80, $40, $40
 	db $40, $40, $40, $00, $80, $80, $40, $40, $40, $40, $40, $00, $40, $00, $40, $40
 	INCBIN "gfx/cards/raticate.2bpp"
+
 SpearowLv13CardGfx::
-	rgb 31,31,31
-	rgb 31,18,4
-	rgb 27,0,4
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 18,  4
+	rgb 27,  0,  4
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,18,4
-	rgb 14,31,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 18,  4
+	rgb 14, 31, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,19,0
-	rgb 27,0,4
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 19,  0
+	rgb 27,  0,  4
+	rgb  0,  0,  0
 
 	db $70, $70, $70, $70, $70, $70, $70, $70, $70, $70, $30, $30, $30, $30, $30, $70
 	db $70, $00, $2f, $00, $2e, $00, $2d, $00, $ac, $ac, $00, $00, $00, $00, $a8, $a8
@@ -3640,21 +3796,22 @@ SpearowLv13CardGfx::
 	INCBIN "gfx/cards/spearow_lv13.2bpp"
 SpearowLv13CardGfxExtra::
 	INCBIN "gfx/cards/spearow_lv13_extra.2bpp"
+
 FearowLv27CardGfx::
-	rgb 31,31,31
-	rgb 27,22,4
-	rgb 24,15,0
-	rgb 4,0,0
+	rgb 31, 31, 31
+	rgb 27, 22,  4
+	rgb 24, 15,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,31
-	rgb 0,27,31
-	rgb 24,15,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 27, 31
+	rgb 24, 15,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 27,22,4
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 27, 22,  4
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $80, $40, $63, $63, $40
 	db $40, $00, $40, $1f, $1f, $1f, $00, $40, $40, $40, $40, $5a, $1a, $1a, $00, $00
@@ -3662,144 +3819,152 @@ FearowLv27CardGfx::
 	INCBIN "gfx/cards/fearow_lv27.2bpp"
 FearowLv27CardGfxExtra::
 	INCBIN "gfx/cards/fearow_lv27_extra.2bpp"
+
 ClefairyLv14CardGfx::
-	rgb 31,27,27
-	rgb 31,18,18
-	rgb 27,9,13
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 31, 18, 18
+	rgb 27,  9, 13
+	rgb  4,  0,  0
 
-	rgb 31,27,27
-	rgb 13,12,26
-	rgb 7,5,13
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 13, 12, 26
+	rgb  7,  5, 13
+	rgb  4,  0,  0
 
-	rgb 31,27,27
-	rgb 25,2,11
-	rgb 12,0,6
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 25,  2, 11
+	rgb 12,  0,  6
+	rgb  4,  0,  0
 
 	db $40, $40, $80, $00, $00, $00, $40, $40, $80, $00, $00, $00, $00, $00, $80, $80
 	db $40, $80, $00, $00, $00, $00, $00, $40, $80, $00, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $80, $40, $40, $00, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/clefairy_lv14.2bpp"
+
 ClefableCardGfx::
-	rgb 31,31,31
-	rgb 31,18,22
-	rgb 31,4,4
-	rgb 4,0,4
+	rgb 31, 31, 31
+	rgb 31, 18, 22
+	rgb 31,  4,  4
+	rgb  4,  0,  4
 
-	rgb 31,31,31
-	rgb 31,18,22
-	rgb 3,0,25
-	rgb 4,0,4
+	rgb 31, 31, 31
+	rgb 31, 18, 22
+	rgb  3,  0, 25
+	rgb  4,  0,  4
 
-	rgb 31,31,31
-	rgb 0,16,31
-	rgb 3,0,25
-	rgb 4,0,4
+	rgb 31, 31, 31
+	rgb  0, 16, 31
+	rgb  3,  0, 25
+	rgb  4,  0,  4
 
 	db $80, $80, $80, $80, $80, $40, $80, $80, $80, $80, $40, $00, $00, $40, $80, $80
 	db $80, $80, $40, $00, $00, $00, $00, $80, $00, $40, $00, $00, $00, $00, $00, $80
 	db $80, $40, $80, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $80, $40
 	INCBIN "gfx/cards/clefable.2bpp"
-	ds $f0, $00
 
-SECTION "Card Gfx 27", ROMX[$4000], BANK[$27]
+	ds $f0
+
+SECTION "Card Gfx 11", ROMX
+
 JigglypuffLv12CardGfx::
-	rgb 31,31,31
-	rgb 31,13,27
-	rgb 8,18,3
-	rgb 8,4,8
+	rgb 31, 31, 31
+	rgb 31, 13, 27
+	rgb  8, 18,  3
+	rgb  8,  4,  8
 
-	rgb 31,31,31
-	rgb 1,24,31
-	rgb 8,18,3
-	rgb 8,4,8
+	rgb 31, 31, 31
+	rgb  1, 24, 31
+	rgb  8, 18,  3
+	rgb  8,  4,  8
 
-	rgb 31,31,31
-	rgb 27,18,0
-	rgb 8,18,3
-	rgb 8,4,8
+	rgb 31, 31, 31
+	rgb 27, 18,  0
+	rgb  8, 18,  3
+	rgb  8,  4,  8
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $80, $80, $80, $00, $00, $00, $00, $80
 	db $80, $80, $80, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $00, $00, $80
 	db $80, $80, $80, $00, $00, $00, $00, $80, $80, $00, $80, $80, $00, $00, $00, $00
 	INCBIN "gfx/cards/jigglypuff_lv12.2bpp"
+
 JigglypuffLv13CardGfx::
-	rgb 31,27,27
-	rgb 31,13,18
-	rgb 0,9,22
-	rgb 0,0,0
+	rgb 31, 27, 27
+	rgb 31, 13, 18
+	rgb  0,  9, 22
+	rgb  0,  0,  0
 
-	rgb 31,27,27
-	rgb 25,18,2
-	rgb 8,13,4
-	rgb 0,0,0
+	rgb 31, 27, 27
+	rgb 25, 18,  2
+	rgb  8, 13,  4
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $40, $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/jigglypuff_lv13.2bpp"
+
 JigglypuffLv14CardGfx::
-	rgb 31,29,31
-	rgb 31,8,13
-	rgb 2,21,7
-	rgb 10,2,6
+	rgb 31, 29, 31
+	rgb 31,  8, 13
+	rgb  2, 21,  7
+	rgb 10,  2,  6
 
-	rgb 31,29,5
-	rgb 31,8,13
-	rgb 2,21,7
-	rgb 10,2,6
+	rgb 31, 29,  5
+	rgb 31,  8, 13
+	rgb  2, 21,  7
+	rgb 10,  2,  6
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00, $40
 	db $40, $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $40
 	db $40, $40, $40, $40, $00, $00, $40, $40, $00, $00, $00, $40, $00, $40, $40, $40
 	INCBIN "gfx/cards/jigglypuff_lv14.2bpp"
+
 WigglytuffLv36CardGfx::
-	rgb 31,27,31
-	rgb 31,14,25
-	rgb 0,10,5
-	rgb 3,4,2
+	rgb 31, 27, 31
+	rgb 31, 14, 25
+	rgb  0, 10,  5
+	rgb  3,  4,  2
 
-	rgb 31,29,31
-	rgb 5,21,0
-	rgb 0,10,0
-	rgb 3,4,2
+	rgb 31, 29, 31
+	rgb  5, 21,  0
+	rgb  0, 10,  0
+	rgb  3,  4,  2
 
-	rgb 31,29,31
-	rgb 31,21,0
-	rgb 6,12,0
-	rgb 3,4,2
+	rgb 31, 29, 31
+	rgb 31, 21,  0
+	rgb  6, 12,  0
+	rgb  3,  4,  2
 
 	db $80, $40, $40, $00, $40, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $80
 	db $80, $40, $00, $00, $00, $00, $40, $80, $80, $00, $00, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $80, $80, $40, $80, $80, $40, $40, $00, $40, $80
 	INCBIN "gfx/cards/wigglytuff_lv36.2bpp"
+
 MeowthLv13CardGfx::
-	rgb 31,31,27
-	rgb 31,22,0
-	rgb 22,9,4
-	rgb 0,4,0
+	rgb 31, 31, 27
+	rgb 31, 22,  0
+	rgb 22,  9,  4
+	rgb  0,  4,  0
 
-	rgb 31,31,27
-	rgb 15,24,0
-	rgb 6,15,4
-	rgb 0,4,0
+	rgb 31, 31, 27
+	rgb 15, 24,  0
+	rgb  6, 15,  4
+	rgb  0,  4,  0
 
-	rgb 31,31,27
-	rgb 6,15,4
-	rgb 22,9,4
-	rgb 0,4,0
+	rgb 31, 31, 27
+	rgb  6, 15,  4
+	rgb 22,  9,  4
+	rgb  0,  4,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $40
@@ -3807,21 +3972,22 @@ MeowthLv13CardGfx::
 	INCBIN "gfx/cards/meowth_lv13.2bpp"
 MeowthLv13CardGfxExtra::
 	INCBIN "gfx/cards/meowth_lv13_extra.2bpp"
+
 MeowthLv15CardGfx::
-	rgb 31,26,31
-	rgb 31,23,0
-	rgb 18,14,0
-	rgb 8,1,8
+	rgb 31, 26, 31
+	rgb 31, 23,  0
+	rgb 18, 14,  0
+	rgb  8,  1,  8
 
-	rgb 31,26,31
-	rgb 29,13,23
-	rgb 18,8,18
-	rgb 8,1,8
+	rgb 31, 26, 31
+	rgb 29, 13, 23
+	rgb 18,  8, 18
+	rgb  8,  1,  8
 
-	rgb 31,26,31
-	rgb 31,23,0
-	rgb 29,13,23
-	rgb 8,1,8
+	rgb 31, 26, 31
+	rgb 31, 23,  0
+	rgb 29, 13, 23
+	rgb  8,  1,  8
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $40, $62, $40
 	db $40, $40, $80, $00, $00, $00, $80, $40, $40, $40, $40, $00, $00, $00, $80, $40
@@ -3829,21 +3995,22 @@ MeowthLv15CardGfx::
 	INCBIN "gfx/cards/meowth_lv15.2bpp"
 MeowthLv15CardGfxExtra::
 	INCBIN "gfx/cards/meowth_lv15_extra.2bpp"
+
 PersianCardGfx::
-	rgb 31,31,22
-	rgb 31,27,4
-	rgb 27,13,0
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 31, 27,  4
+	rgb 27, 13,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,4
-	rgb 29,16,0
-	rgb 27,0,0
-	rgb 4,0,0
+	rgb 31, 27,  4
+	rgb 29, 16,  0
+	rgb 27,  0,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,22
-	rgb 23,10,8
-	rgb 14,0,24
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 23, 10,  8
+	rgb 14,  0, 24
+	rgb  4,  0,  0
 
 	db $70, $40, $40, $6e, $6e, $40, $40, $40, $00, $00, $69, $40, $40, $67, $40, $40
 	db $00, $00, $00, $22, $00, $40, $40, $40, $00, $1d, $00, $00, $00, $00, $40, $40
@@ -3851,21 +4018,22 @@ PersianCardGfx::
 	INCBIN "gfx/cards/persian.2bpp"
 PersianCardGfxExtra::
 	INCBIN "gfx/cards/persian_extra.2bpp"
+
 FarfetchdLv20CardGfx::
-	rgb 25,31,8
-	rgb 27,18,4
-	rgb 22,9,4
-	rgb 0,0,0
+	rgb 25, 31,  8
+	rgb 27, 18,  4
+	rgb 22,  9,  4
+	rgb  0,  0,  0
 
-	rgb 25,31,8
-	rgb 6,24,0
-	rgb 1,12,17
-	rgb 0,0,0
+	rgb 25, 31,  8
+	rgb  6, 24,  0
+	rgb  1, 12, 17
+	rgb  0,  0,  0
 
-	rgb 25,31,8
-	rgb 27,18,4
-	rgb 6,24,0
-	rgb 0,0,0
+	rgb 25, 31,  8
+	rgb 27, 18,  4
+	rgb  6, 24,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $80, $40, $62, $62
 	db $40, $40, $80, $00, $00, $00, $40, $5b, $40, $5a, $80, $00, $00, $17, $40, $40
@@ -3873,141 +4041,148 @@ FarfetchdLv20CardGfx::
 	INCBIN "gfx/cards/farfetchd_lv20.2bpp"
 FarfetchdLv20CardGfxExtra::
 	INCBIN "gfx/cards/farfetchd_lv20_extra.2bpp"
+
 DoduoLv10CardGfx::
-	rgb 31,31,27
-	rgb 31,27,4
-	rgb 22,13,4
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31, 27,  4
+	rgb 22, 13,  4
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 11,27,30
-	rgb 22,13,4
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 11, 27, 30
+	rgb 22, 13,  4
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 18,31,0
-	rgb 22,13,4
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 18, 31,  0
+	rgb 22, 13,  4
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $00, $40, $40, $00, $00, $40, $40, $40, $40
 	db $40, $40, $00, $40, $40, $00, $80, $80, $40, $40, $40, $40, $40, $00, $00, $80
 	db $80, $80, $00, $00, $00, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80
 	INCBIN "gfx/cards/doduo_lv10.2bpp"
+
 DodrioLv28CardGfx::
-	rgb 31,31,18
-	rgb 31,22,0
-	rgb 27,9,0
-	rgb 9,0,0
+	rgb 31, 31, 18
+	rgb 31, 22,  0
+	rgb 27,  9,  0
+	rgb  9,  0,  0
 
-	rgb 31,31,18
-	rgb 16,24,0
-	rgb 27,9,0
-	rgb 9,0,0
+	rgb 31, 31, 18
+	rgb 16, 24,  0
+	rgb 27,  9,  0
+	rgb  9,  0,  0
 
-	rgb 31,31,18
-	rgb 16,24,0
-	rgb 9,16,0
-	rgb 9,0,0
+	rgb 31, 31, 18
+	rgb 16, 24,  0
+	rgb  9, 16,  0
+	rgb  9,  0,  0
 
 	db $80, $80, $80, $80, $80, $80, $80, $80, $40, $40, $40, $40, $40, $40, $40, $40
 	db $40, $40, $00, $40, $00, $40, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/dodrio_lv28.2bpp"
+
 LickitungLv26CardGfx::
-	rgb 31,31,22
-	rgb 31,18,9
-	rgb 27,4,4
-	rgb 0,4,0
+	rgb 31, 31, 22
+	rgb 31, 18,  9
+	rgb 27,  4,  4
+	rgb  0,  4,  0
 
-	rgb 24,31,0
-	rgb 8,27,0
-	rgb 0,14,0
-	rgb 0,4,0
+	rgb 24, 31,  0
+	rgb  8, 27,  0
+	rgb  0, 14,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,22
-	rgb 8,27,0
-	rgb 27,4,4
-	rgb 0,4,0
+	rgb 31, 31, 22
+	rgb  8, 27,  0
+	rgb 27,  4,  4
+	rgb  0,  4,  0
 
 	db $40, $80, $00, $80, $40, $40, $40, $40, $40, $80, $00, $80, $80, $80, $40, $40
 	db $40, $40, $80, $00, $00, $00, $80, $40, $40, $40, $40, $80, $00, $00, $00, $40
 	db $40, $40, $40, $80, $00, $00, $00, $40, $40, $40, $40, $40, $80, $80, $80, $40
 	INCBIN "gfx/cards/lickitung_lv26.2bpp"
+
 ChanseyLv55CardGfx::
-	rgb 31,27,27
-	rgb 31,18,18
-	rgb 31,9,13
-	rgb 4,4,4
+	rgb 31, 27, 27
+	rgb 31, 18, 18
+	rgb 31,  9, 13
+	rgb  4,  4,  4
 
-	rgb 31,27,27
-	rgb 0,18,18
-	rgb 0,9,13
-	rgb 4,4,4
+	rgb 31, 27, 27
+	rgb  0, 18, 18
+	rgb  0,  9, 13
+	rgb  4,  4,  4
 
-	rgb 31,27,27
-	rgb 21,10,24
-	rgb 13,1,13
-	rgb 4,4,4
+	rgb 31, 27, 27
+	rgb 21, 10, 24
+	rgb 13,  1, 13
+	rgb  4,  4,  4
 
 	db $40, $40, $40, $00, $00, $00, $40, $80, $80, $00, $00, $00, $00, $00, $00, $40
 	db $80, $00, $00, $00, $00, $00, $00, $40, $80, $00, $00, $00, $00, $00, $00, $40
 	db $40, $00, $00, $00, $00, $00, $00, $80, $40, $40, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/chansey_lv55.2bpp"
+
 KangaskhanLv40CardGfx::
-	rgb 31,31,27
-	rgb 22,22,13
-	rgb 13,13,0
-	rgb 4,0,0
+	rgb 31, 31, 27
+	rgb 22, 22, 13
+	rgb 13, 13,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,27
-	rgb 22,13,22
-	rgb 16,8,16
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 22, 13, 22
+	rgb 16,  8, 16
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 13,22,22
-	rgb 5,16,5
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 13, 22, 22
+	rgb  5, 16,  5
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $00, $00, $80, $80, $80, $80, $80, $00, $00, $00, $00, $80, $80
 	db $80, $00, $00, $00, $00, $00, $80, $80, $80, $80, $00, $40, $00, $00, $00, $80
 	db $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $00, $00, $00, $00, $00, $80
 	INCBIN "gfx/cards/kangaskhan_lv40.2bpp"
+
 TaurosLv32CardGfx::
-	rgb 31,27,22
-	rgb 24,18,12
-	rgb 16,9,2
-	rgb 0,0,0
+	rgb 31, 27, 22
+	rgb 24, 18, 12
+	rgb 16,  9,  2
+	rgb  0,  0,  0
 
-	rgb 31,27,22
-	rgb 4,22,13
-	rgb 16,9,2
-	rgb 0,0,0
+	rgb 31, 27, 22
+	rgb  4, 22, 13
+	rgb 16,  9,  2
+	rgb  0,  0,  0
 
-	rgb 31,27,22
-	rgb 4,13,22
-	rgb 16,9,2
-	rgb 0,0,0
+	rgb 31, 27, 22
+	rgb  4, 13, 22
+	rgb 16,  9,  2
+	rgb  0,  0,  0
 
 	db $40, $40, $80, $80, $80, $80, $80, $40, $40, $40, $40, $40, $00, $40, $40, $40
 	db $00, $00, $40, $40, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $40, $00, $40, $40, $00, $00, $00, $40, $40, $40
 	INCBIN "gfx/cards/tauros_lv32.2bpp"
+
 DittoCardGfx::
-	rgb 31,31,31
-	rgb 18,13,22
-	rgb 31,4,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 18, 13, 22
+	rgb 31,  4,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 18,13,22
-	rgb 31,20,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 18, 13, 22
+	rgb 31, 20,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,4,9
-	rgb 31,20,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31,  4,  9
+	rgb 31, 20,  0
+	rgb  0,  0,  0
 
 	db $00, $2f, $2f, $2f, $00, $00, $00, $2c, $6c, $6c, $40, $00, $00, $29, $29, $69
 	db $40, $40, $40, $00, $00, $00, $00, $40, $80, $80, $80, $00, $00, $00, $00, $80
@@ -4015,124 +4190,131 @@ DittoCardGfx::
 	INCBIN "gfx/cards/ditto.2bpp"
 DittoCardGfxExtra::
 	INCBIN "gfx/cards/ditto_extra.2bpp"
+
 EeveeLv12CardGfx::
-	rgb 31,31,11
-	rgb 27,13,9
-	rgb 13,4,0
-	rgb 0,0,0
+	rgb 31, 31, 11
+	rgb 27, 13,  9
+	rgb 13,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 0,20,0
-	rgb 21,0,6
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb  0, 20,  0
+	rgb 21,  0,  6
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 31,9,31
-	rgb 21,0,6
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 31,  9, 31
+	rgb 21,  0,  6
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $80, $80, $00, $80, $80, $80, $00, $00, $00, $00, $00, $80, $80
 	db $80, $00, $00, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $80, $40
 	db $40, $00, $00, $00, $00, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/eevee_lv12.2bpp"
+
 PorygonLv12CardGfx::
-	rgb 31,31,31
-	rgb 31,18,27
-	rgb 31,4,9
-	rgb 4,0,9
+	rgb 31, 31, 31
+	rgb 31, 18, 27
+	rgb 31,  4,  9
+	rgb  4,  0,  9
 
-	rgb 31,31,31
-	rgb 13,28,15
-	rgb 3,15,19
-	rgb 4,0,9
+	rgb 31, 31, 31
+	rgb 13, 28, 15
+	rgb  3, 15, 19
+	rgb  4,  0,  9
 
-	rgb 31,31,31
-	rgb 13,28,15
-	rgb 31,4,9
-	rgb 4,0,9
+	rgb 31, 31, 31
+	rgb 13, 28, 15
+	rgb 31,  4,  9
+	rgb  4,  0,  9
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $40, $40, $40
 	db $40, $40, $80, $00, $80, $40, $40, $40, $40, $40, $40, $80, $00, $80, $40, $40
 	db $40, $40, $40, $40, $80, $80, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/porygon_lv12.2bpp"
+
 SnorlaxLv20CardGfx::
-	rgb 31,31,22
-	rgb 31,22,0
-	rgb 31,13,0
-	rgb 0,0,9
+	rgb 31, 31, 22
+	rgb 31, 22,  0
+	rgb 31, 13,  0
+	rgb  0,  0,  9
 
-	rgb 31,31,22
-	rgb 16,22,26
-	rgb 0,13,31
-	rgb 0,0,9
+	rgb 31, 31, 22
+	rgb 16, 22, 26
+	rgb  0, 13, 31
+	rgb  0,  0,  9
 
-	rgb 31,31,22
-	rgb 31,18,0
-	rgb 0,13,31
-	rgb 0,0,9
+	rgb 31, 31, 22
+	rgb 31, 18,  0
+	rgb  0, 13, 31
+	rgb  0,  0,  9
 
 	db $40, $40, $80, $80, $80, $80, $40, $40, $40, $80, $80, $00, $00, $00, $40, $40
 	db $40, $80, $00, $00, $00, $00, $80, $40, $40, $80, $00, $00, $00, $00, $00, $80
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $80, $80, $40, $40, $80, $80, $40
 	INCBIN "gfx/cards/snorlax_lv20.2bpp"
-	ds $2c0, $00
 
-SECTION "Card Gfx 28", ROMX[$4000], BANK[$28]
+	ds $2c0
+
+SECTION "Card Gfx 12", ROMX
+
 DratiniLv10CardGfx::
-	rgb 31,31,27
-	rgb 13,22,31
-	rgb 9,9,18
-	rgb 0,0,4
+	rgb 31, 31, 27
+	rgb 13, 22, 31
+	rgb  9,  9, 18
+	rgb  0,  0,  4
 
-	rgb 31,31,27
-	rgb 31,25,0
-	rgb 13,22,31
-	rgb 0,0,4
+	rgb 31, 31, 27
+	rgb 31, 25,  0
+	rgb 13, 22, 31
+	rgb  0,  0,  4
 
-	rgb 31,31,27
-	rgb 20,25,19
-	rgb 12,12,21
-	rgb 0,0,4
+	rgb 31, 31, 27
+	rgb 20, 25, 19
+	rgb 12, 12, 21
+	rgb  0,  0,  4
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $80, $80
 	db $00, $80, $80, $00, $00, $40, $40, $80, $00, $00, $00, $00, $00, $40, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dratini_lv10.2bpp"
+
 DragonairCardGfx::
-	rgb 31,31,31
-	rgb 9,22,31
-	rgb 4,9,18
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb  9, 22, 31
+	rgb  4,  9, 18
+	rgb  0,  0,  4
 
-	rgb 31,23,16
-	rgb 21,6,15
-	rgb 4,9,18
-	rgb 0,0,0
+	rgb 31, 23, 16
+	rgb 21,  6, 15
+	rgb  4,  9, 18
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $00, $40, $40, $00, $00, $00, $40, $40, $00, $40, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $40, $00, $00, $00, $00
 	INCBIN "gfx/cards/dragonair.2bpp"
+
 DragoniteLv41CardGfx::
-	rgb 31,31,27
-	rgb 31,13,4
-	rgb 4,18,9
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31, 13,  4
+	rgb  4, 18,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 31,13,4
-	rgb 0,14,31
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb 31, 13,  4
+	rgb  0, 14, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,27
-	rgb 4,18,9
-	rgb 0,14,31
-	rgb 0,0,0
+	rgb 31, 31, 27
+	rgb  4, 18,  9
+	rgb  0, 14, 31
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $6c, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $40, $80, $80
@@ -4140,161 +4322,169 @@ DragoniteLv41CardGfx::
 	INCBIN "gfx/cards/dragonite_lv41.2bpp"
 DragoniteLv41CardGfxExtra::
 	INCBIN "gfx/cards/dragonite_lv41_extra.2bpp"
+
 DragoniteLv45CardGfx::
-	rgb 31,27,13
-	rgb 31,13,0
-	rgb 22,9,0
-	rgb 4,0,0
+	rgb 31, 27, 13
+	rgb 31, 13,  0
+	rgb 22,  9,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,13
-	rgb 0,24,0
-	rgb 0,16,0
-	rgb 0,0,0
+	rgb 31, 27, 13
+	rgb  0, 24,  0
+	rgb  0, 16,  0
+	rgb  0,  0,  0
 
-	rgb 31,27,13
-	rgb 0,24,0
-	rgb 22,9,0
-	rgb 0,0,0
+	rgb 31, 27, 13
+	rgb  0, 24,  0
+	rgb 22,  9,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $00, $00, $40, $40, $40
 	db $40, $80, $80, $00, $00, $40, $40, $40, $40, $80, $80, $00, $00, $80, $40, $40
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/dragonite_lv45.2bpp"
+
 CharmanderLv9CardGfx::
-	rgb 31,25,0
-	rgb 31,0,0
-	rgb 12,0,11
-	rgb 0,0,0
+	rgb 31, 25,  0
+	rgb 31,  0,  0
+	rgb 12,  0, 11
+	rgb  0,  0,  0
 
-	rgb 31,24,0
-	rgb 10,10,10
-	rgb 5,5,5
-	rgb 0,0,0
+	rgb 31, 24,  0
+	rgb 10, 10, 10
+	rgb  5,  5,  5
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $40
 	db $40, $40, $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $00, $00, $40, $40
 	INCBIN "gfx/cards/charmander_lv9.2bpp"
+
 DarkCharmeleonCardGfx::
-	rgb 31,31,14
-	rgb 0,15,6
-	rgb 31,4,0
-	rgb 5,0,5
+	rgb 31, 31, 14
+	rgb  0, 15,  6
+	rgb 31,  4,  0
+	rgb  5,  0,  5
 
-	rgb 31,31,31
-	rgb 31,19,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 19,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00
 	db $00, $40, $00, $00, $40, $40, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_charmeleon.2bpp"
+
 DarkCharizardCardGfx::
-	rgb 31,31,15
-	rgb 31,19,0
-	rgb 31,8,0
-	rgb 0,0,0
+	rgb 31, 31, 15
+	rgb 31, 19,  0
+	rgb 31,  8,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 24,20,0
-	rgb 17,13,0
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 24, 20,  0
+	rgb 17, 13,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,15
-	rgb 0,24,31
-	rgb 0,0,31
-	rgb 0,0,0
+	rgb 31, 31, 15
+	rgb  0, 24, 31
+	rgb  0,  0, 31
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $40, $40, $00, $00, $80, $80, $40, $40, $40, $00, $00, $00, $80
 	db $00, $40, $40, $00, $00, $00, $00, $80, $00, $80, $80, $00, $00, $00, $00, $00
 	db $00, $80, $80, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_charizard.2bpp"
+
 PonytaLv15CardGfx::
-	rgb 31,31,25
-	rgb 28,22,0
-	rgb 30,0,0
-	rgb 0,0,0
+	rgb 31, 31, 25
+	rgb 28, 22,  0
+	rgb 30,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,25
-	rgb 0,15,0
-	rgb 0,22,0
-	rgb 0,0,0
+	rgb 31, 31, 25
+	rgb  0, 15,  0
+	rgb  0, 22,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,25
-	rgb 28,22,0
-	rgb 0,22,0
-	rgb 0,0,0
+	rgb 31, 31, 25
+	rgb 28, 22,  0
+	rgb  0, 22,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $80, $80, $80, $80, $40, $00, $80, $80, $00, $00, $00, $40
 	db $80, $00, $00, $80, $00, $00, $00, $80, $80, $00, $00, $80, $00, $00, $00, $80
 	db $40, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $80, $40
 	INCBIN "gfx/cards/ponyta_lv15.2bpp"
+
 DarkRapidashCardGfx::
-	rgb 31,31,0
-	rgb 31,16,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 31, 16,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_rapidash.2bpp"
+
 DarkFlareonCardGfx::
-	rgb 31,31,19
-	rgb 25,20,0
-	rgb 28,10,0
-	rgb 14,0,10
+	rgb 31, 31, 19
+	rgb 25, 20,  0
+	rgb 28, 10,  0
+	rgb 14,  0, 10
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_flareon.2bpp"
+
 SquirtleLv16CardGfx::
-	rgb 31,31,31
-	rgb 13,24,31
-	rgb 2,13,24
-	rgb 0,0,7
+	rgb 31, 31, 31
+	rgb 13, 24, 31
+	rgb  2, 13, 24
+	rgb  0,  0,  7
 
-	rgb 31,31,18
-	rgb 25,15,0
-	rgb 2,13,24
-	rgb 0,0,0
+	rgb 31, 31, 18
+	rgb 25, 15,  0
+	rgb  2, 13, 24
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $21
 	db $00, $00, $00, $40, $40, $40, $1b, $00, $00, $00, $00, $00, $56, $40, $15, $00
@@ -4302,21 +4492,22 @@ SquirtleLv16CardGfx::
 	INCBIN "gfx/cards/squirtle_lv16.2bpp"
 SquirtleLv16CardGfxExtra::
 	INCBIN "gfx/cards/squirtle_lv16_extra.2bpp"
+
 DarkWartortleCardGfx::
-	rgb 31,31,31
-	rgb 15,25,31
-	rgb 6,9,25
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 25, 31
+	rgb  6,  9, 25
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 27,11,0
-	rgb 6,9,25
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 27, 11,  0
+	rgb  6,  9, 25
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 13,31,9
-	rgb 0,15,6
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 13, 31,  9
+	rgb  0, 15,  6
+	rgb  0,  0,  0
 
 	db $b0, $b0, $b0, $80, $80, $80, $80, $ac, $ac, $80, $80, $80, $a9, $29, $80, $80
 	db $a7, $a7, $80, $a6, $26, $26, $26, $a6, $80, $80, $a4, $a4, $24, $64, $00, $a3
@@ -4324,144 +4515,152 @@ DarkWartortleCardGfx::
 	INCBIN "gfx/cards/dark_wartortle.2bpp"
 DarkWartortleCardGfxExtra::
 	INCBIN "gfx/cards/dark_wartortle_extra.2bpp"
+
 DarkBlastoiseCardGfx::
-	rgb 27,31,31
-	rgb 14,24,31
-	rgb 0,12,31
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb 14, 24, 31
+	rgb  0, 12, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,31,0
-	rgb 20,18,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 31,  0
+	rgb 20, 18,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,31,0
-	rgb 0,12,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 31,  0
+	rgb  0, 12, 31
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $40, $00, $00, $00, $40, $40, $00, $00, $40, $00, $00, $00, $40
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $40, $00, $00, $80, $00, $00
 	db $00, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_blastoise.2bpp"
+
 PsyduckLv16CardGfx::
-	rgb 31,31,31
-	rgb 27,27,0
-	rgb 21,15,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 27, 27,  0
+	rgb 21, 15,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 27,27,0
-	rgb 9,19,1
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 27, 27,  0
+	rgb  9, 19,  1
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 21,15,0
-	rgb 9,19,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21, 15,  0
+	rgb  9, 19,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $80, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $80, $00, $00, $80, $40, $40
 	INCBIN "gfx/cards/psyduck_lv16.2bpp"
+
 DarkGolduckCardGfx::
-	rgb 31,31,31
-	rgb 11,24,28
-	rgb 7,4,20
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 11, 24, 28
+	rgb  7,  4, 20
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 15,13,26
-	rgb 26,3,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 13, 26
+	rgb 26,  3,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 15,13,26
-	rgb 7,4,20
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 13, 26
+	rgb  7,  4, 20
+	rgb  0,  0,  0
 
 	db $40, $80, $40, $80, $80, $80, $80, $80, $40, $40, $40, $80, $80, $80, $80, $40
 	db $40, $40, $40, $40, $40, $80, $80, $80, $80, $80, $80, $40, $00, $00, $00, $80
 	db $80, $80, $80, $40, $00, $00, $80, $80, $80, $40, $40, $40, $40, $40, $80, $80
 	INCBIN "gfx/cards/dark_golduck.2bpp"
+
 MagikarpLv6CardGfx::
-	rgb 31,31,26
-	rgb 31,22,0
-	rgb 27,4,0
-	rgb 4,4,4
+	rgb 31, 31, 26
+	rgb 31, 22,  0
+	rgb 27,  4,  0
+	rgb  4,  4,  4
 
-	rgb 31,31,26
-	rgb 31,22,0
-	rgb 9,14,0
-	rgb 0,0,0
+	rgb 31, 31, 26
+	rgb 31, 22,  0
+	rgb  9, 14,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,26
-	rgb 9,14,0
-	rgb 27,4,0
-	rgb 0,0,0
+	rgb 31, 31, 26
+	rgb  9, 14,  0
+	rgb 27,  4,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	db $00, $00, $00, $00, $00, $40, $00, $40, $00, $00, $00, $00, $00, $00, $80, $40
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/magikarp_lv6.2bpp"
+
 DarkGyaradosCardGfx::
-	rgb 31,31,31
-	rgb 19,19,31
-	rgb 7,7,19
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 19, 31
+	rgb  7,  7, 19
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 27,31,0
-	rgb 19,0,14
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 27, 31,  0
+	rgb 19,  0, 14
+	rgb  0,  0,  0
 
-	rgb 27,31,0
-	rgb 19,19,31
-	rgb 7,7,19
-	rgb 0,0,0
+	rgb 27, 31,  0
+	rgb 19, 19, 31
+	rgb  7,  7, 19
+	rgb  0,  0,  0
 
 	db $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $80, $80, $80, $00, $00, $40, $00, $00, $80, $00, $80, $00, $00, $40, $00
 	db $00, $00, $00, $80, $80, $80, $00, $40, $00, $00, $00, $80, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_gyarados.2bpp"
+
 DarkVaporeonCardGfx::
-	rgb 23,27,31
-	rgb 23,15,23
-	rgb 18,7,18
-	rgb 12,2,12
+	rgb 23, 27, 31
+	rgb 23, 15, 23
+	rgb 18,  7, 18
+	rgb 12,  2, 12
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_vaporeon.2bpp"
-	ds $270, $00
 
-SECTION "Card Gfx 29", ROMX[$4000], BANK[$29]
+	ds $270
+
+SECTION "Card Gfx 13", ROMX
+
 EkansLv15CardGfx::
-	rgb 28,31,12
-	rgb 25,9,25
-	rgb 17,4,14
-	rgb 0,0,0
+	rgb 28, 31, 12
+	rgb 25,  9, 25
+	rgb 17,  4, 14
+	rgb  0,  0,  0
 
-	rgb 28,31,12
-	rgb 25,15,0
-	rgb 17,4,14
-	rgb 0,0,0
+	rgb 28, 31, 12
+	rgb 25, 15,  0
+	rgb 17,  4, 14
+	rgb  0,  0,  0
 
-	rgb 28,31,12
-	rgb 25,9,25
-	rgb 25,15,0
-	rgb 0,0,0
+	rgb 28, 31, 12
+	rgb 25,  9, 25
+	rgb 25, 15,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $80, $69, $69, $80, $40, $80, $80, $00, $24, $40
 	db $40, $80, $80, $20, $00, $00, $00, $40, $40, $1b, $00, $00, $00, $00, $40, $40
@@ -4469,21 +4668,22 @@ EkansLv15CardGfx::
 	INCBIN "gfx/cards/ekans_lv15.2bpp"
 EkansLv15CardGfxExtra::
 	INCBIN "gfx/cards/ekans_lv15_extra.2bpp"
+
 DarkArbokCardGfx::
-	rgb 25,30,31
-	rgb 12,24,26
-	rgb 0,13,28
-	rgb 0,0,0
+	rgb 25, 30, 31
+	rgb 12, 24, 26
+	rgb  0, 13, 28
+	rgb  0,  0,  0
 
-	rgb 31,24,0
-	rgb 0,26,0
-	rgb 0,15,0
-	rgb 0,0,0
+	rgb 31, 24,  0
+	rgb  0, 26,  0
+	rgb  0, 15,  0
+	rgb  0,  0,  0
 
-	rgb 31,26,0
-	rgb 12,24,31
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 26,  0
+	rgb 12, 24, 31
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00
 	db $00, $00, $00, $80, $80, $00, $00, $00, $40, $17, $17, $80, $80, $00, $00, $40
@@ -4491,41 +4691,43 @@ DarkArbokCardGfx::
 	INCBIN "gfx/cards/dark_arbok.2bpp"
 DarkArbokCardGfxExtra::
 	INCBIN "gfx/cards/dark_arbok_extra.2bpp"
+
 ZubatLv9CardGfx::
-	rgb 31,31,31
-	rgb 20,24,31
-	rgb 9,0,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 20, 24, 31
+	rgb  9,  0, 22
+	rgb  0,  0,  0
 
-	rgb 31,22,4
-	rgb 20,24,31
-	rgb 9,0,22
-	rgb 0,0,0
+	rgb 31, 22,  4
+	rgb 20, 24, 31
+	rgb  9,  0, 22
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $40, $00, $00, $40, $40, $00, $00, $40, $40, $00, $00, $40, $40, $00, $00
 	INCBIN "gfx/cards/zubat_lv9.2bpp"
+
 DarkGolbatCardGfx::
-	rgb 31,31,31
-	rgb 27,10,31
-	rgb 13,0,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 27, 10, 31
+	rgb 13,  0, 22
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 6,25,31
-	rgb 0,18,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  6, 25, 31
+	rgb  0, 18, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 22,31,0
-	rgb 0,18,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 22, 31,  0
+	rgb  0, 18,  0
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $00, $80, $80, $80, $80, $80, $80, $00, $00, $80, $80, $80, $a1
 	db $80, $80, $00, $40, $00, $80, $80, $80, $80, $40, $00, $40, $55, $00, $00, $80
@@ -4533,201 +4735,211 @@ DarkGolbatCardGfx::
 	INCBIN "gfx/cards/dark_golbat.2bpp"
 DarkGolbatCardGfxExtra::
 	INCBIN "gfx/cards/dark_golbat_extra.2bpp"
+
 OddishLv21CardGfx::
-	rgb 26,31,20
-	rgb 18,30,12
-	rgb 0,21,0
-	rgb 0,7,0
+	rgb 26, 31, 20
+	rgb 18, 30, 12
+	rgb  0, 21,  0
+	rgb  0,  7,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/oddish_lv21.2bpp"
+
 DarkGloomCardGfx::
-	rgb 31,18,0
-	rgb 2,14,0
-	rgb 31,1,0
-	rgb 0,0,0
+	rgb 31, 18,  0
+	rgb  2, 14,  0
+	rgb 31,  1,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,15
-	rgb 2,14,0
-	rgb 9,24,4
-	rgb 0,0,0
+	rgb 31, 31, 15
+	rgb  2, 14,  0
+	rgb  9, 24,  4
+	rgb  0,  0,  0
 
-	rgb 31,18,0
-	rgb 31,16,0
-	rgb 31,1,0
-	rgb 0,0,0
+	rgb 31, 18,  0
+	rgb 31, 16,  0
+	rgb 31,  1,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $00, $00, $00, $00, $00, $00, $40, $00, $40, $00, $00, $00
 	db $00, $00, $40, $00, $00, $80, $00, $40, $40, $40, $80, $00, $00, $40, $40, $40
 	db $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $40, $00, $00, $00, $80, $80
 	INCBIN "gfx/cards/dark_gloom.2bpp"
+
 DarkVileplumeCardGfx::
-	rgb 31,31,12
-	rgb 0,18,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 12
+	rgb  0, 18,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,12
-	rgb 30,14,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 12
+	rgb 30, 14,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 21,31,12
-	rgb 0,18,0
-	rgb 16,25,9
-	rgb 0,0,0
+	rgb 21, 31, 12
+	rgb  0, 18,  0
+	rgb 16, 25,  9
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00
 	db $00, $40, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $80, $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00
 	INCBIN "gfx/cards/dark_vileplume.2bpp"
+
 GrimerLv10CardGfx::
-	rgb 31,31,31
-	rgb 24,15,31
-	rgb 16,0,21
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 24, 15, 31
+	rgb 16,  0, 21
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 21,21,21
-	rgb 10,10,10
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21, 21, 21
+	rgb 10, 10, 10
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 21,21,21
-	rgb 16,0,21
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21, 21, 21
+	rgb 16,  0, 21
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $40, $00, $00, $00, $00, $80, $80, $40, $40, $80, $00, $00
 	db $00, $40, $40, $80, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/grimer_lv10.2bpp"
+
 DarkMukCardGfx::
-	rgb 31,27,31
-	rgb 23,10,0
-	rgb 18,0,8
-	rgb 0,0,0
+	rgb 31, 27, 31
+	rgb 23, 10,  0
+	rgb 18,  0,  8
+	rgb  0,  0,  0
 
-	rgb 31,27,31
-	rgb 31,18,0
-	rgb 18,0,8
-	rgb 0,0,0
+	rgb 31, 27, 31
+	rgb 31, 18,  0
+	rgb 18,  0,  8
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 0,0,0
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_muk.2bpp"
+
 KoffingLv12CardGfx::
-	rgb 31,31,31
-	rgb 25,22,15
-	rgb 19,0,19
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 25, 22, 15
+	rgb 19,  0, 19
+	rgb  0,  0,  0
 
-	rgb 31,31,23
-	rgb 25,22,15
-	rgb 0,19,2
-	rgb 0,0,0
+	rgb 31, 31, 23
+	rgb 25, 22, 15
+	rgb  0, 19,  2
+	rgb  0,  0,  0
 
-	rgb 31,30,1
-	rgb 18,0,18
-	rgb 0,19,2
-	rgb 0,0,0
+	rgb 31, 30,  1
+	rgb 18,  0, 18
+	rgb  0, 19,  2
+	rgb  0,  0,  0
 
 	db $80, $00, $40, $40, $40, $40, $00, $00, $80, $00, $40, $40, $00, $00, $00, $00
 	db $80, $40, $40, $80, $00, $00, $00, $00, $80, $40, $40, $80, $00, $00, $00, $00
 	db $80, $80, $80, $80, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $00, $00
 	INCBIN "gfx/cards/koffing_lv12.2bpp"
+
 DarkWeezingCardGfx::
-	rgb 31,23,31
-	rgb 27,14,29
-	rgb 18,8,14
-	rgb 0,0,0
+	rgb 31, 23, 31
+	rgb 27, 14, 29
+	rgb 18,  8, 14
+	rgb  0,  0,  0
 
-	rgb 31,23,31
-	rgb 7,14,29
-	rgb 1,5,10
-	rgb 0,0,0
+	rgb 31, 23, 31
+	rgb  7, 14, 29
+	rgb  1,  5, 10
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/dark_weezing.2bpp"
+
 AbraLv14CardGfx::
-	rgb 31,31,7
-	rgb 31,22,9
-	rgb 27,14,0
-	rgb 0,0,0
+	rgb 31, 31,  7
+	rgb 31, 22,  9
+	rgb 27, 14,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,7
-	rgb 31,22,9
-	rgb 28,0,0
-	rgb 0,0,0
+	rgb 31, 31,  7
+	rgb 31, 22,  9
+	rgb 28,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,22,9
-	rgb 6,22,0
-	rgb 28,0,0
-	rgb 0,0,0
+	rgb 31, 22,  9
+	rgb  6, 22,  0
+	rgb 28,  0,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $80
 	db $00, $00, $40, $40, $40, $80, $80, $40, $00, $00, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/abra_lv14.2bpp"
+
 DarkKadabraCardGfx::
-	rgb 31,31,0
-	rgb 31,18,0
-	rgb 23,4,0
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 31, 18,  0
+	rgb 23,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 19,28,2
-	rgb 10,20,3
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 19, 28,  2
+	rgb 10, 20,  3
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 19,28,2
-	rgb 23,4,0
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 19, 28,  2
+	rgb 23,  4,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $00, $00, $00, $80, $40, $40
 	db $80, $00, $00, $00, $00, $00, $80, $40, $40, $80, $00, $00, $00, $00, $00, $40
 	db $40, $80, $00, $00, $00, $00, $40, $40, $40, $40, $80, $80, $40, $00, $40, $40
 	INCBIN "gfx/cards/dark_kadabra.2bpp"
+
 DarkAlakazamCardGfx::
-	rgb 31,31,31
-	rgb 31,31,1
-	rgb 17,15,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 31,  1
+	rgb 17, 15,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,31,31
-	rgb 0,14,4
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 31, 31
+	rgb  0, 14,  4
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 8,24,31
-	rgb 17,15,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  8, 24, 31
+	rgb 17, 15,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $13, $80, $40
@@ -4735,21 +4947,22 @@ DarkAlakazamCardGfx::
 	INCBIN "gfx/cards/dark_alakazam.2bpp"
 DarkAlakazamCardGfxExtra::
 	INCBIN "gfx/cards/dark_alakazam_extra.2bpp"
+
 SlowpokeLv16CardGfx::
-	rgb 22,31,31
-	rgb 27,31,0
-	rgb 21,5,6
-	rgb 0,0,0
+	rgb 22, 31, 31
+	rgb 27, 31,  0
+	rgb 21,  5,  6
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 22,31,31
-	rgb 0,16,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 22, 31, 31
+	rgb  0, 16,  0
+	rgb  0,  0,  0
 
-	rgb 27,31,0
-	rgb 7,17,23
-	rgb 20,5,6
-	rgb 0,0,0
+	rgb 27, 31,  0
+	rgb  7, 17, 23
+	rgb 20,  5,  6
+	rgb  0,  0,  0
 
 	db $40, $2f, $2f, $6f, $40, $40, $6d, $6d, $6d, $6d, $00, $40, $6b, $6b, $6b, $40
 	db $00, $00, $00, $00, $a6, $80, $80, $80, $00, $00, $21, $00, $00, $00, $80, $80
@@ -4757,21 +4970,22 @@ SlowpokeLv16CardGfx::
 	INCBIN "gfx/cards/slowpoke_lv16.2bpp"
 SlowpokeLv16CardGfxExtra::
 	INCBIN "gfx/cards/slowpoke_lv16_extra.2bpp"
+
 DarkSlowbroCardGfx::
-	rgb 19,30,13
-	rgb 20,10,29
-	rgb 15,0,18
-	rgb 0,0,0
+	rgb 19, 30, 13
+	rgb 20, 10, 29
+	rgb 15,  0, 18
+	rgb  0,  0,  0
 
-	rgb 19,30,13
-	rgb 12,15,31
-	rgb 0,12,8
-	rgb 0,0,0
+	rgb 19, 30, 13
+	rgb 12, 15, 31
+	rgb  0, 12,  8
+	rgb  0,  0,  0
 
-	rgb 19,30,13
-	rgb 12,15,31
-	rgb 20,10,29
-	rgb 0,0,0
+	rgb 19, 30, 13
+	rgb 12, 15, 31
+	rgb 20, 10, 29
+	rgb  0,  0,  0
 
 	db $40, $80, $00, $40, $40, $40, $40, $40, $00, $00, $00, $80, $40, $40, $40, $40
 	db $40, $00, $00, $1d, $80, $40, $40, $40, $40, $00, $17, $17, $97, $40, $40, $40
@@ -4779,21 +4993,22 @@ DarkSlowbroCardGfx::
 	INCBIN "gfx/cards/dark_slowbro.2bpp"
 DarkSlowbroCardGfxExtra::
 	INCBIN "gfx/cards/dark_slowbro_extra.2bpp"
+
 DrowzeeLv10CardGfx::
-	rgb 31,31,7
-	rgb 29,16,0
-	rgb 31,7,9
-	rgb 0,0,0
+	rgb 31, 31,  7
+	rgb 29, 16,  0
+	rgb 31,  7,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,7
-	rgb 31,7,9
-	rgb 16,0,31
-	rgb 0,0,0
+	rgb 31, 31,  7
+	rgb 31,  7,  9
+	rgb 16,  0, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,7
-	rgb 29,16,0
-	rgb 16,0,31
-	rgb 0,0,0
+	rgb 31, 31,  7
+	rgb 29, 16,  0
+	rgb 16,  0, 31
+	rgb  0,  0,  0
 
 	db $40, $6f, $6f, $6f, $40, $40, $40, $6c, $6c, $ac, $6c, $ac, $80, $6b, $00, $80
 	db $00, $00, $00, $26, $00, $00, $00, $00, $40, $21, $00, $00, $00, $00, $00, $5c
@@ -4801,44 +5016,47 @@ DrowzeeLv10CardGfx::
 	INCBIN "gfx/cards/drowzee_lv10.2bpp"
 DrowzeeLv10CardGfxExtra::
 	INCBIN "gfx/cards/drowzee_lv10_extra.2bpp"
+
 DarkHypnoCardGfx::
-	rgb 31,31,0
-	rgb 31,21,0
-	rgb 31,12,0
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 31, 21,  0
+	rgb 31, 12,  0
+	rgb  0,  0,  0
 
-	rgb 31,24,0
-	rgb 10,17,31
-	rgb 12,0,26
-	rgb 0,0,0
+	rgb 31, 24,  0
+	rgb 10, 17, 31
+	rgb 12,  0, 26
+	rgb  0,  0,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/dark_hypno.2bpp"
-	ds $1e0, $00
 
-SECTION "Card Gfx 2a", ROMX[$4000], BANK[$2a]
+	ds $1e0
+
+SECTION "Card Gfx 14", ROMX
+
 DiglettLv15CardGfx::
-	rgb 31,31,31
-	rgb 31,0,0
-	rgb 16,9,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31,  0,  0
+	rgb 16,  9,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 25,29,0
-	rgb 16,9,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 25, 29,  0
+	rgb 16,  9,  0
+	rgb  0,  0,  0
 
-	rgb 25,29,0
-	rgb 22,17,29
-	rgb 16,9,0
-	rgb 0,0,0
+	rgb 25, 29,  0
+	rgb 22, 17, 29
+	rgb 16,  9,  0
+	rgb  0,  0,  0
 
 	db $80, $80, $00, $00, $00, $2b, $00, $00, $80, $80, $80, $a6, $40, $00, $00, $00
 	db $00, $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $00, $00, $40, $40, $40
@@ -4846,41 +5064,43 @@ DiglettLv15CardGfx::
 	INCBIN "gfx/cards/diglett_lv15.2bpp"
 DiglettLv15CardGfxExtra::
 	INCBIN "gfx/cards/diglett_lv15_extra.2bpp"
+
 DarkDugtrioCardGfx::
-	rgb 31,31,31
-	rgb 21,0,9
-	rgb 14,5,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21,  0,  9
+	rgb 14,  5,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 9,18,0
-	rgb 14,5,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  9, 18,  0
+	rgb 14,  5,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,26,0
-	rgb 0,10,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 26,  0
+	rgb  0, 10, 31
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $80, $40, $40, $80, $80, $80, $80, $80, $40, $40, $40, $80, $80
 	db $80, $40, $40, $00, $00, $00, $00, $80, $80, $40, $00, $00, $00, $00, $00, $80
 	db $80, $40, $00, $00, $00, $00, $00, $80, $80, $80, $40, $40, $40, $40, $80, $80
 	INCBIN "gfx/cards/dark_dugtrio.2bpp"
+
 MankeyLv14CardGfx::
-	rgb 31,31,31
-	rgb 16,31,7
-	rgb 17,10,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 16, 31,  7
+	rgb 17, 10,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,9,18
-	rgb 17,10,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31,  9, 18
+	rgb 17, 10,  0
+	rgb  0,  0,  0
 
-	rgb 23,31,31
-	rgb 16,31,7
-	rgb 17,10,0
-	rgb 0,0,0
+	rgb 23, 31, 31
+	rgb 16, 31,  7
+	rgb 17, 10,  0
+	rgb  0,  0,  0
 
 	db $b0, $b0, $80, $80, $80, $80, $ac, $2c, $ac, $ac, $80, $80, $aa, $aa, $2a, $00
 	db $00, $80, $a7, $27, $00, $80, $80, $00, $23, $a3, $00, $00, $00, $00, $5f, $5f
@@ -4888,21 +5108,22 @@ MankeyLv14CardGfx::
 	INCBIN "gfx/cards/mankey_lv14.2bpp"
 MankeyLv14CardGfxExtra::
 	INCBIN "gfx/cards/mankey_lv14_extra.2bpp"
+
 DarkPrimeapeCardGfx::
-	rgb 31,31,31
-	rgb 19,26,8
-	rgb 4,24,4
-	rgb 12,0,12
+	rgb 31, 31, 31
+	rgb 19, 26,  8
+	rgb  4, 24,  4
+	rgb 12,  0, 12
 
-	rgb 31,31,31
-	rgb 19,26,8
-	rgb 4,24,4
-	rgb 0,8,0
+	rgb 31, 31, 31
+	rgb 19, 26,  8
+	rgb  4, 24,  4
+	rgb  0,  8,  0
 
-	rgb 0,8,0
-	rgb 19,26,8
-	rgb 4,24,4
-	rgb 12,0,12
+	rgb  0,  8,  0
+	rgb 19, 26,  8
+	rgb  4, 24,  4
+	rgb 12,  0, 12
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00
 	db $00, $1f, $40, $40, $40, $40, $00, $1a, $00, $00, $40, $40, $40, $40, $00, $00
@@ -4910,21 +5131,22 @@ DarkPrimeapeCardGfx::
 	INCBIN "gfx/cards/dark_primeape.2bpp"
 DarkPrimeapeCardGfxExtra::
 	INCBIN "gfx/cards/dark_primeape_extra.2bpp"
+
 MachopLv24CardGfx::
-	rgb 31,31,31
-	rgb 20,20,26
-	rgb 9,6,27
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 20, 20, 26
+	rgb  9,  6, 27
+	rgb  0,  0,  0
 
-	rgb 31,26,0
-	rgb 20,20,26
-	rgb 9,6,27
-	rgb 0,0,0
+	rgb 31, 26,  0
+	rgb 20, 20, 26
+	rgb  9,  6, 27
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 20,20,26
-	rgb 31,26,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 20, 20, 26
+	rgb 31, 26,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $40, $40, $80, $00, $00, $00, $00, $00, $80, $80, $80, $00, $00
 	db $00, $00, $00, $9d, $9d, $5d, $1d, $00, $00, $1b, $1b, $80, $5a, $40, $59, $19
@@ -4932,21 +5154,22 @@ MachopLv24CardGfx::
 	INCBIN "gfx/cards/machop_lv24.2bpp"
 MachopLv24CardGfxExtra::
 	INCBIN "gfx/cards/machop_lv24_extra.2bpp"
+
 DarkMachokeCardGfx::
-	rgb 31,31,31
-	rgb 19,19,31
-	rgb 10,10,19
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 19, 31
+	rgb 10, 10, 19
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 19,19,31
-	rgb 17,18,7
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 19, 31
+	rgb 17, 18,  7
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 19,19,31
-	rgb 17,1,1
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 19, 31
+	rgb 17,  1,  1
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $2c, $2c, $00, $00, $00, $00, $00, $27, $00, $00, $00, $00
 	db $00, $22, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $80, $00, $00, $00
@@ -4954,61 +5177,64 @@ DarkMachokeCardGfx::
 	INCBIN "gfx/cards/dark_machoke.2bpp"
 DarkMachokeCardGfxExtra::
 	INCBIN "gfx/cards/dark_machoke_extra.2bpp"
+
 DarkMachampCardGfx::
-	rgb 31,31,31
-	rgb 10,20,31
-	rgb 0,9,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 10, 20, 31
+	rgb  0,  9, 22
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 10,20,31
-	rgb 0,9,22
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 10, 20, 31
+	rgb  0,  9, 22
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 31,0,0
-	rgb 0,9,22
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 31,  0,  0
+	rgb  0,  9, 22
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $80, $40, $00, $00, $00
 	db $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_machamp.2bpp"
+
 RattataLv12CardGfx::
-	rgb 27,27,27
-	rgb 21,13,21
-	rgb 20,6,16
-	rgb 6,2,2
+	rgb 27, 27, 27
+	rgb 21, 13, 21
+	rgb 20,  6, 16
+	rgb  6,  2,  2
 
-	rgb 27,27,27
-	rgb 21,13,21
-	rgb 23,8,4
-	rgb 6,2,2
+	rgb 27, 27, 27
+	rgb 21, 13, 21
+	rgb 23,  8,  4
+	rgb  6,  2,  2
 
-	rgb 27,27,27
-	rgb 17,14,4
-	rgb 20,6,16
-	rgb 6,2,2
+	rgb 27, 27, 27
+	rgb 17, 14,  4
+	rgb 20,  6, 16
+	rgb  6,  2,  2
 
 	db $80, $40, $00, $80, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40, $40, $40
 	db $40, $00, $00, $00, $80, $80, $00, $00, $40, $40, $00, $00, $80, $40, $00, $40
 	db $40, $40, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/rattata_lv12.2bpp"
+
 DarkRaticateCardGfx::
-	rgb 31,31,0
-	rgb 20,19,5
-	rgb 18,14,0
-	rgb 6,8,0
+	rgb 31, 31,  0
+	rgb 20, 19,  5
+	rgb 18, 14,  0
+	rgb  6,  8,  0
 
-	rgb 31,31,0
-	rgb 0,19,0
-	rgb 18,14,0
-	rgb 6,8,0
+	rgb 31, 31,  0
+	rgb  0, 19,  0
+	rgb 18, 14,  0
+	rgb  6,  8,  0
 
-	rgb 31,31,0
-	rgb 24,20,15
-	rgb 18,14,0
-	rgb 6,8,0
+	rgb 31, 31,  0
+	rgb 24, 20, 15
+	rgb 18, 14,  0
+	rgb  6,  8,  0
 
 	db $00, $2f, $2f, $2f, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00
@@ -5016,61 +5242,64 @@ DarkRaticateCardGfx::
 	INCBIN "gfx/cards/dark_raticate.2bpp"
 DarkRaticateCardGfxExtra::
 	INCBIN "gfx/cards/dark_raticate_extra.2bpp"
+
 MeowthLv10CardGfx::
-	rgb 31,31,31
-	rgb 31,25,0
-	rgb 26,9,12
-	rgb 6,6,6
+	rgb 31, 31, 31
+	rgb 31, 25,  0
+	rgb 26,  9, 12
+	rgb  6,  6,  6
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/meowth_lv10.2bpp"
+
 DarkPersianLv28CardGfx::
-	rgb 31,31,20
-	rgb 31,22,0
-	rgb 20,14,0
-	rgb 0,0,0
+	rgb 31, 31, 20
+	rgb 31, 22,  0
+	rgb 20, 14,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,25
-	rgb 13,26,31
-	rgb 20,16,0
-	rgb 0,0,0
+	rgb 31, 31, 25
+	rgb 13, 26, 31
+	rgb 20, 16,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,20
-	rgb 31,0,0
-	rgb 20,16,0
-	rgb 0,0,0
+	rgb 31, 31, 20
+	rgb 31,  0,  0
+	rgb 20, 16,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $80, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_persian_lv28.2bpp"
+
 EeveeLv9CardGfx::
-	rgb 31,31,10
-	rgb 18,15,5
-	rgb 12,7,0
-	rgb 0,0,0
+	rgb 31, 31, 10
+	rgb 18, 15,  5
+	rgb 12,  7,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,10
-	rgb 18,15,5
-	rgb 0,11,0
-	rgb 0,0,0
+	rgb 31, 31, 10
+	rgb 18, 15,  5
+	rgb  0, 11,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,10
-	rgb 0,11,0
-	rgb 12,7,0
-	rgb 0,0,0
+	rgb 31, 31, 10
+	rgb  0, 11,  0
+	rgb 12,  7,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $2e, $6e, $40, $40, $40, $6b, $6b, $ab, $80, $40, $69, $69, $40, $40
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $40, $40, $40
@@ -5078,21 +5307,22 @@ EeveeLv9CardGfx::
 	INCBIN "gfx/cards/eevee_lv9.2bpp"
 EeveeLv9CardGfxExtra::
 	INCBIN "gfx/cards/eevee_lv9_extra.2bpp"
+
 PorygonLv20CardGfx::
-	rgb 31,31,31
-	rgb 14,20,30
-	rgb 25,0,24
-	rgb 5,0,5
+	rgb 31, 31, 31
+	rgb 14, 20, 30
+	rgb 25,  0, 24
+	rgb  5,  0,  5
 
-	rgb 31,31,15
-	rgb 28,20,0
-	rgb 25,0,24
-	rgb 5,0,5
+	rgb 31, 31, 15
+	rgb 28, 20,  0
+	rgb 25,  0, 24
+	rgb  5,  0,  5
 
-	rgb 31,31,31
-	rgb 15,0,12
-	rgb 25,0,24
-	rgb 5,0,5
+	rgb 31, 31, 31
+	rgb 15,  0, 12
+	rgb 25,  0, 24
+	rgb  5,  0,  5
 
 	db $40, $40, $40, $40, $00, $40, $40, $40, $40, $40, $40, $80, $00, $00, $00, $40
 	db $40, $00, $00, $1d, $1d, $00, $00, $40, $40, $19, $00, $00, $00, $00, $40, $40
@@ -5100,101 +5330,106 @@ PorygonLv20CardGfx::
 	INCBIN "gfx/cards/porygon_lv20.2bpp"
 PorygonLv20CardGfxExtra::
 	INCBIN "gfx/cards/porygon_lv20_extra.2bpp"
+
 DratiniLv12CardGfx::
-	rgb 31,31,17
-	rgb 18,21,31
-	rgb 11,14,20
-	rgb 0,9,2
+	rgb 31, 31, 17
+	rgb 18, 21, 31
+	rgb 11, 14, 20
+	rgb  0,  9,  2
 
-	rgb 31,31,17
-	rgb 27,19,0
-	rgb 26,8,2
-	rgb 0,9,2
+	rgb 31, 31, 17
+	rgb 27, 19,  0
+	rgb 26,  8,  2
+	rgb  0,  9,  2
 
-	rgb 31,31,17
-	rgb 18,21,31
-	rgb 26,8,2
-	rgb 0,9,2
+	rgb 31, 31, 17
+	rgb 18, 21, 31
+	rgb 26,  8,  2
+	rgb  0,  9,  2
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $40, $80, $00, $00, $00, $00, $00, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/dratini_lv12.2bpp"
+
 DarkDragonairCardGfx::
-	rgb 31,26,31
-	rgb 22,16,31
-	rgb 16,2,24
-	rgb 0,0,0
+	rgb 31, 26, 31
+	rgb 22, 16, 31
+	rgb 16,  2, 24
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 16,6,26
-	rgb 17,1,13
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 16,  6, 26
+	rgb 17,  1, 13
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 27,21,31
-	rgb 11,17,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 27, 21, 31
+	rgb 11, 17, 31
+	rgb  0,  0,  0
 
 	db $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $00
 	db $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $80
 	db $80, $00, $00, $00, $00, $00, $00, $00, $80, $80, $80, $00, $00, $00, $00, $80
 	INCBIN "gfx/cards/dark_dragonair.2bpp"
+
 DarkDragoniteCardGfx::
-	rgb 31,26,0
-	rgb 0,19,31
-	rgb 11,16,0
-	rgb 0,0,8
+	rgb 31, 26,  0
+	rgb  0, 19, 31
+	rgb 11, 16,  0
+	rgb  0,  0,  8
 
-	rgb 21,26,31
-	rgb 0,19,31
-	rgb 1,7,22
-	rgb 0,0,8
+	rgb 21, 26, 31
+	rgb  0, 19, 31
+	rgb  1,  7, 22
+	rgb  0,  0,  8
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/dark_dragonite.2bpp"
+
 MagnemiteLv12CardGfx::
-	rgb 31,31,27
-	rgb 31,27,0
-	rgb 11,11,11
-	rgb 4,0,12
+	rgb 31, 31, 27
+	rgb 31, 27,  0
+	rgb 11, 11, 11
+	rgb  4,  0, 12
 
-	rgb 31,31,27
-	rgb 18,18,18
-	rgb 11,11,11
-	rgb 4,0,12
+	rgb 31, 31, 27
+	rgb 18, 18, 18
+	rgb 11, 11, 11
+	rgb  4,  0, 12
 
-	rgb 31,31,27
-	rgb 11,11,11
-	rgb 25,0,0
-	rgb 4,0,12
+	rgb 31, 31, 27
+	rgb 11, 11, 11
+	rgb 25,  0,  0
+	rgb  4,  0, 12
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $40, $40, $80, $00, $00
 	db $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/magnemite_lv12.2bpp"
+
 DarkMagnetonCardGfx::
-	rgb 31,31,31
-	rgb 19,18,22
-	rgb 7,7,7
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 18, 22
+	rgb  7,  7,  7
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,26,28
-	rgb 0,6,14
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 26, 28
+	rgb  0,  6, 14
+	rgb  0,  0,  0
 
-	rgb 19,18,22
-	rgb 7,7,7
-	rgb 20,0,0
-	rgb 0,0,0
+	rgb 19, 18, 22
+	rgb  7,  7,  7
+	rgb 20,  0,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $67, $80, $00, $80, $64, $64, $40
 	db $63, $00, $00, $21, $00, $80, $5f, $40, $40, $9d, $1d, $00, $1c, $00, $40, $40
@@ -5202,84 +5437,89 @@ DarkMagnetonCardGfx::
 	INCBIN "gfx/cards/dark_magneton.2bpp"
 DarkMagnetonCardGfxExtra::
 	INCBIN "gfx/cards/dark_magneton_extra.2bpp"
-	ds $90, $00
 
-SECTION "Card Gfx 2b", ROMX[$4000], BANK[$2b]
+	ds $90
+
+SECTION "Card Gfx 15", ROMX
+
 VoltorbLv13CardGfx::
-	rgb 31,31,31
-	rgb 17,22,20
-	rgb 27,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 17, 22, 20
+	rgb 27,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 20,31,14
-	rgb 0,18,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 20, 31, 14
+	rgb  0, 18,  0
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $40, $40, $40, $40, $00, $00, $40, $40, $40, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40
 	db $40, $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/voltorb_lv13.2bpp"
+
 DarkElectrodeCardGfx::
-	rgb 31,31,21
-	rgb 19,26,13
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 21
+	rgb 19, 26, 13
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 20,20,31
-	rgb 13,3,16
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 20, 20, 31
+	rgb 13,  3, 16
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/dark_electrode.2bpp"
+
 DarkJolteonCardGfx::
-	rgb 31,31,31
-	rgb 28,26,0
-	rgb 26,14,1
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 28, 26,  0
+	rgb 26, 14,  1
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 17,14,31
-	rgb 9,2,16
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 17, 14, 31
+	rgb  9,  2, 16
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 28,26,0
-	rgb 9,2,16
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 28, 26,  0
+	rgb  9,  2, 16
+	rgb  0,  0,  0
 
 	db $40, $40, $80, $80, $80, $40, $40, $40, $40, $40, $80, $00, $00, $00, $80, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $40, $00, $00, $40, $40, $40
 	INCBIN "gfx/cards/dark_jolteon.2bpp"
+
 BulbasaurLv15CardGfx::
-	rgb 18,25,31
-	rgb 0,15,31
-	rgb 0,11,0
-	rgb 0,4,8
+	rgb 18, 25, 31
+	rgb  0, 15, 31
+	rgb  0, 11,  0
+	rgb  0,  4,  8
 
-	rgb 18,25,31
-	rgb 0,15,31
-	rgb 24,0,6
-	rgb 0,4,8
+	rgb 18, 25, 31
+	rgb  0, 15, 31
+	rgb 24,  0,  6
+	rgb  0,  4,  8
 
-	rgb 0,11,0
-	rgb 0,15,31
-	rgb 24,0,6
-	rgb 0,4,8
+	rgb  0, 11,  0
+	rgb  0, 15, 31
+	rgb 24,  0,  6
+	rgb  0,  4,  8
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $1b, $00, $00, $40, $00, $00, $80, $00, $40, $00, $00
@@ -5287,61 +5527,64 @@ BulbasaurLv15CardGfx::
 	INCBIN "gfx/cards/bulbasaur_lv15.2bpp"
 BulbasaurLv15CardGfxExtra::
 	INCBIN "gfx/cards/bulbasaur_lv15_extra.2bpp"
+
 CharmanderLv12CardGfx::
-	rgb 31,31,22
-	rgb 31,14,0
-	rgb 22,0,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 31, 14,  0
+	rgb 22,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,25,0
-	rgb 0,13,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 25,  0
+	rgb  0, 13,  0
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/charmander_lv12.2bpp"
+
 SquirtleLv15CardGfx::
-	rgb 29,31,13
-	rgb 7,31,0
-	rgb 0,19,0
-	rgb 0,9,0
+	rgb 29, 31, 13
+	rgb  7, 31,  0
+	rgb  0, 19,  0
+	rgb  0,  9,  0
 
-	rgb 29,31,13
-	rgb 11,25,24
-	rgb 0,19,0
-	rgb 0,9,0
+	rgb 29, 31, 13
+	rgb 11, 25, 24
+	rgb  0, 19,  0
+	rgb  0,  9,  0
 
-	rgb 29,31,13
-	rgb 29,12,23
-	rgb 0,19,0
-	rgb 0,9,0
+	rgb 29, 31, 13
+	rgb 29, 12, 23
+	rgb  0, 19,  0
+	rgb  0,  9,  0
 
 	db $00, $00, $40, $40, $40, $40, $40, $40, $00, $80, $80, $40, $40, $40, $40, $40
 	db $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/squirtle_lv15.2bpp"
+
 MetapodLv20CardGfx::
-	rgb 31,31,31
-	rgb 16,31,15
-	rgb 0,22,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 16, 31, 15
+	rgb  0, 22,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 21,23,31
-	rgb 0,22,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21, 23, 31
+	rgb  0, 22,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,16,0
-	rgb 0,22,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 16,  0
+	rgb  0, 22,  0
+	rgb  0,  0,  0
 
 	db $40, $6f, $2f, $00, $00, $80, $ac, $ac, $2c, $ac, $80, $00, $00, $a9, $80, $40
 	db $a7, $a7, $00, $00, $a5, $00, $00, $00, $40, $61, $21, $00, $20, $00, $1f, $1f
@@ -5349,21 +5592,22 @@ MetapodLv20CardGfx::
 	INCBIN "gfx/cards/metapod_lv20.2bpp"
 MetapodLv20CardGfxExtra::
 	INCBIN "gfx/cards/metapod_lv20_extra.2bpp"
+
 WeedleLv15CardGfx::
-	rgb 31,31,29
-	rgb 31,14,0
-	rgb 31,0,0
-	rgb 0,10,0
+	rgb 31, 31, 29
+	rgb 31, 14,  0
+	rgb 31,  0,  0
+	rgb  0, 10,  0
 
-	rgb 31,31,29
-	rgb 0,23,0
-	rgb 0,26,31
-	rgb 0,10,0
+	rgb 31, 31, 29
+	rgb  0, 23,  0
+	rgb  0, 26, 31
+	rgb  0, 10,  0
 
-	rgb 31,31,29
-	rgb 31,14,0
-	rgb 0,26,31
-	rgb 0,10,0
+	rgb 31, 31, 29
+	rgb 31, 14,  0
+	rgb  0, 26, 31
+	rgb  0, 10,  0
 
 	db $70, $70, $70, $70, $70, $b0, $b0, $b0, $70, $70, $70, $70, $70, $70, $b0, $30
 	db $70, $70, $b0, $b0, $b0, $80, $2f, $af, $6f, $2f, $2f, $2f, $2f, $2f, $af, $6f
@@ -5371,21 +5615,22 @@ WeedleLv15CardGfx::
 	INCBIN "gfx/cards/weedle_lv15.2bpp"
 WeedleLv15CardGfxExtra::
 	INCBIN "gfx/cards/weedle_lv15_extra.2bpp"
+
 KakunaLv20CardGfx::
-	rgb 31,31,31
-	rgb 21,28,10
-	rgb 10,10,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21, 28, 10
+	rgb 10, 10,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 16,16,27
-	rgb 10,4,18
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 16, 16, 27
+	rgb 10,  4, 18
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 10,4,18
-	rgb 10,10,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 10,  4, 18
+	rgb 10, 10,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $80, $40, $40
 	db $00, $00, $00, $00, $00, $80, $40, $40, $00, $00, $00, $00, $14, $40, $40, $52
@@ -5393,21 +5638,22 @@ KakunaLv20CardGfx::
 	INCBIN "gfx/cards/kakuna_lv20.2bpp"
 KakunaLv20CardGfxExtra::
 	INCBIN "gfx/cards/kakuna_lv20_extra.2bpp"
+
 PidgeyLv10CardGfx::
-	rgb 29,31,31
-	rgb 11,27,12
-	rgb 21,9,0
-	rgb 0,0,0
+	rgb 29, 31, 31
+	rgb 11, 27, 12
+	rgb 21,  9,  0
+	rgb  0,  0,  0
 
-	rgb 29,31,31
-	rgb 11,27,12
-	rgb 4,12,13
-	rgb 0,0,0
+	rgb 29, 31, 31
+	rgb 11, 27, 12
+	rgb  4, 12, 13
+	rgb  0,  0,  0
 
-	rgb 4,12,13
-	rgb 19,29,0
-	rgb 15,11,4
-	rgb 0,0,0
+	rgb  4, 12, 13
+	rgb 19, 29,  0
+	rgb 15, 11,  4
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $6d, $40, $40, $00, $00, $40, $68, $68, $40, $00, $00, $00, $00
 	db $63, $40, $40, $40, $40, $00, $1e, $40, $80, $80, $40, $5a, $9a, $80, $80, $80
@@ -5415,21 +5661,22 @@ PidgeyLv10CardGfx::
 	INCBIN "gfx/cards/pidgey_lv10.2bpp"
 PidgeyLv10CardGfxExtra::
 	INCBIN "gfx/cards/pidgey_lv10_extra.2bpp"
+
 RattataLv15CardGfx::
-	rgb 25,25,31
-	rgb 0,27,0
-	rgb 0,16,0
-	rgb 0,8,0
+	rgb 25, 25, 31
+	rgb  0, 27,  0
+	rgb  0, 16,  0
+	rgb  0,  8,  0
 
-	rgb 27,27,19
-	rgb 0,16,0
-	rgb 16,6,14
-	rgb 0,8,0
+	rgb 27, 27, 19
+	rgb  0, 16,  0
+	rgb 16,  6, 14
+	rgb  0,  8,  0
 
-	rgb 25,25,31
-	rgb 12,27,12
-	rgb 8,20,0
-	rgb 6,11,2
+	rgb 25, 25, 31
+	rgb 12, 27, 12
+	rgb  8, 20,  0
+	rgb  6, 11,  2
 
 	db $80, $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $00, $21
 	db $a1, $80, $80, $80, $00, $5d, $5d, $1d, $80, $9c, $5c, $00, $00, $5a, $40, $00
@@ -5437,41 +5684,43 @@ RattataLv15CardGfx::
 	INCBIN "gfx/cards/rattata_lv15.2bpp"
 RattataLv15CardGfxExtra::
 	INCBIN "gfx/cards/rattata_lv15_extra.2bpp"
+
 PikachuLv5CardGfx::
-	rgb 31,22,0
-	rgb 9,26,0
-	rgb 3,13,0
-	rgb 0,7,0
+	rgb 31, 22,  0
+	rgb  9, 26,  0
+	rgb  3, 13,  0
+	rgb  0,  7,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/pikachu_lv5.2bpp"
+
 NidoranFLv12CardGfx::
-	rgb 31,31,31
-	rgb 31,31,5
-	rgb 31,9,0
-	rgb 0,11,0
+	rgb 31, 31, 31
+	rgb 31, 31,  5
+	rgb 31,  9,  0
+	rgb  0, 11,  0
 
-	rgb 31,31,31
-	rgb 31,31,5
-	rgb 0,21,0
-	rgb 0,11,0
+	rgb 31, 31, 31
+	rgb 31, 31,  5
+	rgb  0, 21,  0
+	rgb  0, 11,  0
 
-	rgb 31,9,0
-	rgb 31,31,5
-	rgb 0,21,0
-	rgb 0,11,0
+	rgb 31,  9,  0
+	rgb 31, 31,  5
+	rgb  0, 21,  0
+	rgb  0, 11,  0
 
 	db $70, $70, $30, $30, $30, $30, $30, $30, $70, $b0, $30, $30, $70, $70, $70, $70
 	db $70, $70, $70, $70, $70, $70, $70, $70, $70, $70, $70, $30, $70, $70, $70, $70
@@ -5479,104 +5728,110 @@ NidoranFLv12CardGfx::
 	INCBIN "gfx/cards/nidoran_f_lv12.2bpp"
 NidoranFLv12CardGfxExtra::
 	INCBIN "gfx/cards/nidoran_f_lv12_extra.2bpp"
+
 NidoranMLv22CardGfx::
-	rgb 20,20,31
-	rgb 15,14,31
-	rgb 22,4,18
-	rgb 6,4,13
+	rgb 20, 20, 31
+	rgb 15, 14, 31
+	rgb 22,  4, 18
+	rgb  6,  4, 13
 
-	rgb 31,31,31
-	rgb 15,14,31
-	rgb 20,16,6
-	rgb 6,4,13
+	rgb 31, 31, 31
+	rgb 15, 14, 31
+	rgb 20, 16,  6
+	rgb  6,  4, 13
 
-	rgb 31,31,31
-	rgb 15,14,31
-	rgb 22,4,18
-	rgb 6,4,13
+	rgb 31, 31, 31
+	rgb 15, 14, 31
+	rgb 22,  4, 18
+	rgb  6,  4, 13
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $00, $80, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $40, $40, $40
 	INCBIN "gfx/cards/nidoran_m_lv22.2bpp"
+
 ClefairyLv15CardGfx::
-	rgb 31,25,29
-	rgb 31,9,19
-	rgb 13,6,16
-	rgb 6,4,2
+	rgb 31, 25, 29
+	rgb 31,  9, 19
+	rgb 13,  6, 16
+	rgb  6,  4,  2
 
-	rgb 31,31,0
-	rgb 23,21,5
-	rgb 13,6,16
-	rgb 6,4,2
+	rgb 31, 31,  0
+	rgb 23, 21,  5
+	rgb 13,  6, 16
+	rgb  6,  4,  2
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00
 	db $00, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/clefairy_lv15.2bpp"
+
 WigglytuffLv40CardGfx::
-	rgb 31,31,21
-	rgb 31,21,21
-	rgb 31,6,10
-	rgb 9,6,1
+	rgb 31, 31, 21
+	rgb 31, 21, 21
+	rgb 31,  6, 10
+	rgb  9,  6,  1
 
-	rgb 31,31,21
-	rgb 31,17,3
-	rgb 22,7,2
-	rgb 9,6,1
+	rgb 31, 31, 21
+	rgb 31, 17,  3
+	rgb 22,  7,  2
+	rgb  9,  6,  1
 
-	rgb 31,31,21
-	rgb 31,21,21
-	rgb 22,7,2
-	rgb 9,6,1
+	rgb 31, 31, 21
+	rgb 31, 21, 21
+	rgb 22,  7,  2
+	rgb  9,  6,  1
 
 	db $40, $40, $80, $40, $40, $00, $00, $00, $40, $40, $80, $00, $00, $00, $40, $40
 	db $80, $00, $00, $00, $00, $80, $40, $40, $80, $00, $00, $00, $00, $40, $40, $40
 	db $40, $80, $00, $00, $00, $40, $40, $40, $40, $40, $40, $80, $80, $80, $00, $00
 	INCBIN "gfx/cards/wigglytuff_lv40.2bpp"
-	ds $280, $00
 
-SECTION "Card Gfx 2c", ROMX[$4000], BANK[$2c]
+	ds $280
+
+SECTION "Card Gfx 16", ROMX
+
 ZubatLv12CardGfx::
-	rgb 31,31,30
-	rgb 15,28,0
-	rgb 0,15,0
-	rgb 0,0,0
+	rgb 31, 31, 30
+	rgb 15, 28,  0
+	rgb  0, 15,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,30
-	rgb 15,28,0
-	rgb 0,9,16
-	rgb 0,0,0
+	rgb 31, 31, 30
+	rgb 15, 28,  0
+	rgb  0,  9, 16
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $40, $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/zubat_lv12.2bpp"
+
 GolbatLv25CardGfx::
-	rgb 31,31,31
-	rgb 14,17,27
-	rgb 10,5,17
-	rgb 0,0,6
+	rgb 31, 31, 31
+	rgb 14, 17, 27
+	rgb 10,  5, 17
+	rgb  0,  0,  6
 
-	rgb 31,31,31
-	rgb 14,17,27
-	rgb 6,9,17
-	rgb 0,0,6
+	rgb 31, 31, 31
+	rgb 14, 17, 27
+	rgb  6,  9, 17
+	rgb  0,  0,  6
 
-	rgb 10,5,17
-	rgb 14,17,27
-	rgb 6,9,17
-	rgb 0,0,6
+	rgb 10,  5, 17
+	rgb 14, 17, 27
+	rgb  6,  9, 17
+	rgb  0,  0,  6
 
 	db $00, $40, $40, $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $61
 	db $00, $00, $40, $40, $40, $80, $40, $40, $00, $00, $80, $00, $00, $40, $40, $40
@@ -5584,41 +5839,43 @@ GolbatLv25CardGfx::
 	INCBIN "gfx/cards/golbat_lv25.2bpp"
 GolbatLv25CardGfxExtra::
 	INCBIN "gfx/cards/golbat_lv25_extra.2bpp"
+
 ParasLv15CardGfx::
-	rgb 31,31,31
-	rgb 26,22,5
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 26, 22,  5
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 18,31,25
-	rgb 7,19,7
-	rgb 4,13,0
-	rgb 0,0,0
+	rgb 18, 31, 25
+	rgb  7, 19,  7
+	rgb  4, 13,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 7,19,7
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  7, 19,  7
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $40, $40
 	db $40, $80, $00, $80, $80, $00, $80, $40, $40, $80, $00, $00, $00, $00, $00, $40
 	db $40, $80, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/paras_lv15.2bpp"
+
 ParasectLv29CardGfx::
-	rgb 31,31,0
-	rgb 31,9,4
-	rgb 22,0,4
-	rgb 2,7,0
+	rgb 31, 31,  0
+	rgb 31,  9,  4
+	rgb 22,  0,  4
+	rgb  2,  7,  0
 
-	rgb 31,31,0
-	rgb 31,9,4
-	rgb 3,7,8
-	rgb 2,7,0
+	rgb 31, 31,  0
+	rgb 31,  9,  4
+	rgb  3,  7,  8
+	rgb  2,  7,  0
 
-	rgb 31,31,0
-	rgb 3,7,8
-	rgb 22,0,4
-	rgb 2,7,0
+	rgb 31, 31,  0
+	rgb  3,  7,  8
+	rgb 22,  0,  4
+	rgb  2,  7,  0
 
 	db $40, $40, $40, $6d, $40, $40, $40, $40, $40, $68, $40, $40, $00, $40, $00, $63
 	db $40, $40, $40, $00, $00, $00, $00, $00, $80, $80, $40, $00, $00, $00, $00, $40
@@ -5626,41 +5883,43 @@ ParasectLv29CardGfx::
 	INCBIN "gfx/cards/parasect_lv29.2bpp"
 ParasectLv29CardGfxExtra::
 	INCBIN "gfx/cards/parasect_lv29_extra.2bpp"
+
 PoliwagLv15CardGfx::
-	rgb 31,31,31
-	rgb 20,23,29
-	rgb 9,0,27
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 20, 23, 29
+	rgb  9,  0, 27
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 19,2,0
-	rgb 9,0,27
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19,  2,  0
+	rgb  9,  0, 27
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,31,31
-	rgb 31,31,31
-	rgb 31,31,31
+	rgb 31, 31, 31
+	rgb 31, 31, 31
+	rgb 31, 31, 31
+	rgb 31, 31, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/poliwag_lv15.2bpp"
+
 PoliwhirlLv30CardGfx::
-	rgb 29,31,16
-	rgb 10,25,0
-	rgb 5,5,22
-	rgb 0,0,0
+	rgb 29, 31, 16
+	rgb 10, 25,  0
+	rgb  5,  5, 22
+	rgb  0,  0,  0
 
-	rgb 29,31,16
-	rgb 10,25,0
-	rgb 0,16,0
-	rgb 0,0,0
+	rgb 29, 31, 16
+	rgb 10, 25,  0
+	rgb  0, 16,  0
+	rgb  0,  0,  0
 
-	rgb 29,31,16
-	rgb 5,5,22
-	rgb 0,16,0
-	rgb 0,0,0
+	rgb 29, 31, 16
+	rgb  5,  5, 22
+	rgb  0, 16,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $80, $00, $14, $00, $40, $40
@@ -5668,21 +5927,22 @@ PoliwhirlLv30CardGfx::
 	INCBIN "gfx/cards/poliwhirl_lv30.2bpp"
 PoliwhirlLv30CardGfxExtra::
 	INCBIN "gfx/cards/poliwhirl_lv30_extra.2bpp"
+
 PoliwrathLv40CardGfx::
-	rgb 31,31,31
-	rgb 11,15,31
-	rgb 10,0,27
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 11, 15, 31
+	rgb 10,  0, 27
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 11,15,31
-	rgb 10,31,10
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 11, 15, 31
+	rgb 10, 31, 10
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 26,0,0
-	rgb 10,31,10
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 26,  0,  0
+	rgb 10, 31, 10
+	rgb  0,  0,  0
 
 	db $b0, $b0, $80, $40, $6e, $6e, $6e, $40, $40, $00, $2b, $2b, $2b, $00, $00, $40
 	db $28, $00, $27, $00, $00, $00, $00, $63, $23, $00, $00, $00, $20, $20, $20, $40
@@ -5690,41 +5950,43 @@ PoliwrathLv40CardGfx::
 	INCBIN "gfx/cards/poliwrath_lv40.2bpp"
 PoliwrathLv40CardGfxExtra::
 	INCBIN "gfx/cards/poliwrath_lv40_extra.2bpp"
+
 AbraLv8CardGfx::
-	rgb 31,31,31
-	rgb 31,24,0
-	rgb 20,14,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 24,  0
+	rgb 20, 14,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 10,24,17
-	rgb 0,14,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 10, 24, 17
+	rgb  0, 14,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,27,31
-	rgb 20,14,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 27, 31
+	rgb 20, 14,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $40, $40, $40, $40
 	db $80, $80, $80, $00, $00, $80, $40, $40, $80, $80, $80, $80, $80, $80, $80, $80
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/abra_lv8.2bpp"
+
 GeodudeLv15CardGfx::
-	rgb 31,31,11
-	rgb 29,17,0
-	rgb 10,10,10
-	rgb 0,0,0
+	rgb 31, 31, 11
+	rgb 29, 17,  0
+	rgb 10, 10, 10
+	rgb  0,  0,  0
 
-	rgb 31,31,11
-	rgb 29,17,0
-	rgb 27,0,0
-	rgb 0,0,0
+	rgb 31, 31, 11
+	rgb 29, 17,  0
+	rgb 27,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,11
-	rgb 27,0,0
-	rgb 10,10,10
-	rgb 0,0,0
+	rgb 31, 31, 11
+	rgb 27,  0,  0
+	rgb 10, 10, 10
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $6d, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $80, $00, $00, $40, $00, $00, $00, $00
@@ -5732,81 +5994,85 @@ GeodudeLv15CardGfx::
 	INCBIN "gfx/cards/geodude_lv15.2bpp"
 GeodudeLv15CardGfxExtra::
 	INCBIN "gfx/cards/geodude_lv15_extra.2bpp"
+
 RapidashLv30CardGfx::
-	rgb 31,31,25
-	rgb 31,24,0
-	rgb 23,0,0
-	rgb 0,0,0
+	rgb 31, 31, 25
+	rgb 31, 24,  0
+	rgb 23,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,24,0
-	rgb 17,15,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 24,  0
+	rgb 17, 15,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,24,0
-	rgb 0,16,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 24,  0
+	rgb  0, 16,  0
+	rgb  0,  0,  0
 
 	db $80, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $80
 	db $80, $40, $40, $40, $40, $40, $00, $00, $80, $80, $80, $40, $00, $00, $00, $80
 	db $80, $80, $80, $80, $80, $80, $00, $80, $80, $80, $00, $80, $80, $80, $80, $80
 	INCBIN "gfx/cards/rapidash_lv30.2bpp"
+
 DoduoLv8CardGfx::
-	rgb 22,31,23
-	rgb 17,23,1
-	rgb 17,6,0
-	rgb 0,0,0
+	rgb 22, 31, 23
+	rgb 17, 23,  1
+	rgb 17,  6,  0
+	rgb  0,  0,  0
 
-	rgb 22,31,23
-	rgb 14,23,22
-	rgb 0,12,0
-	rgb 0,0,0
+	rgb 22, 31, 23
+	rgb 14, 23, 22
+	rgb  0, 12,  0
+	rgb  0,  0,  0
 
-	rgb 22,31,23
-	rgb 14,23,22
-	rgb 17,6,0
-	rgb 0,12,0
+	rgb 22, 31, 23
+	rgb 14, 23, 22
+	rgb 17,  6,  0
+	rgb  0, 12,  0
 
 	db $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $80, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/doduo_lv8.2bpp"
+
 DodrioLv25CardGfx::
-	rgb 22,31,31
-	rgb 31,26,0
-	rgb 19,6,0
-	rgb 0,0,0
+	rgb 22, 31, 31
+	rgb 31, 26,  0
+	rgb 19,  6,  0
+	rgb  0,  0,  0
 
-	rgb 22,31,31
-	rgb 20,0,25
-	rgb 19,6,0
-	rgb 0,0,0
+	rgb 22, 31, 31
+	rgb 20,  0, 25
+	rgb 19,  6,  0
+	rgb  0,  0,  0
 
-	rgb 22,31,31
-	rgb 20,20,9
-	rgb 19,11,8
-	rgb 0,0,0
+	rgb 22, 31, 31
+	rgb 20, 20,  9
+	rgb 19, 11,  8
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $00, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $00, $80, $80
 	db $80, $80, $80, $00, $80, $80, $80, $80, $80, $80, $40, $00, $00, $80, $80, $40
 	INCBIN "gfx/cards/dodrio_lv25.2bpp"
+
 LickitungLv20CardGfx::
-	rgb 31,31,18
-	rgb 31,21,31
-	rgb 31,2,12
-	rgb 6,0,0
+	rgb 31, 31, 18
+	rgb 31, 21, 31
+	rgb 31,  2, 12
+	rgb  6,  0,  0
 
-	rgb 31,31,18
-	rgb 31,21,8
-	rgb 26,10,0
-	rgb 6,0,0
+	rgb 31, 31, 18
+	rgb 31, 21,  8
+	rgb 26, 10,  0
+	rgb  6,  0,  0
 
-	rgb 31,31,18
-	rgb 5,31,0
-	rgb 31,2,12
-	rgb 6,0,0
+	rgb 31, 31, 18
+	rgb  5, 31,  0
+	rgb 31,  2, 12
+	rgb  6,  0,  0
 
 	db $b0, $b0, $b0, $b0, $b0, $30, $30, $b0, $b0, $b0, $b0, $b0, $b0, $30, $00, $80
 	db $ae, $ae, $2e, $2e, $00, $00, $00, $6b, $ab, $ab, $00, $00, $29, $29, $40, $40
@@ -5814,21 +6080,22 @@ LickitungLv20CardGfx::
 	INCBIN "gfx/cards/lickitung_lv20.2bpp"
 LickitungLv20CardGfxExtra::
 	INCBIN "gfx/cards/lickitung_lv20_extra.2bpp"
+
 ChanseyLv40CardGfx::
-	rgb 31,31,31
-	rgb 31,15,25
-	rgb 22,4,8
-	rgb 10,0,0
+	rgb 31, 31, 31
+	rgb 31, 15, 25
+	rgb 22,  4,  8
+	rgb 10,  0,  0
 
-	rgb 31,31,31
-	rgb 31,15,25
-	rgb 5,13,0
-	rgb 10,0,0
+	rgb 31, 31, 31
+	rgb 31, 15, 25
+	rgb  5, 13,  0
+	rgb 10,  0,  0
 
-	rgb 5,13,0
-	rgb 31,15,25
-	rgb 22,4,8
-	rgb 10,0,0
+	rgb  5, 13,  0
+	rgb 31, 15, 25
+	rgb 22,  4,  8
+	rgb 10,  0,  0
 
 	db $b0, $b0, $40, $40, $40, $40, $6c, $40, $80, $00, $00, $00, $00, $80, $40, $40
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $54
@@ -5836,21 +6103,22 @@ ChanseyLv40CardGfx::
 	INCBIN "gfx/cards/chansey_lv40.2bpp"
 ChanseyLv40CardGfxExtra::
 	INCBIN "gfx/cards/chansey_lv40_extra.2bpp"
+
 MrMimeLv20CardGfx::
-	rgb 3,21,0
-	rgb 31,26,7
-	rgb 23,0,29
-	rgb 0,0,0
+	rgb  3, 21,  0
+	rgb 31, 26,  7
+	rgb 23,  0, 29
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,26,7
-	rgb 27,2,10
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 26,  7
+	rgb 27,  2, 10
+	rgb  0,  0,  0
 
-	rgb 23,2,27
-	rgb 31,26,7
-	rgb 27,2,10
-	rgb 0,0,0
+	rgb 23,  2, 27
+	rgb 31, 26,  7
+	rgb 27,  2, 10
+	rgb  0,  0,  0
 
 	db $00, $00, $80, $00, $80, $80, $00, $29, $00, $80, $67, $40, $66, $40, $80, $00
 	db $00, $00, $40, $40, $40, $40, $40, $1c, $1c, $40, $40, $40, $40, $40, $57, $00
@@ -5858,21 +6126,22 @@ MrMimeLv20CardGfx::
 	INCBIN "gfx/cards/mr_mime_lv20.2bpp"
 MrMimeLv20CardGfxExtra::
 	INCBIN "gfx/cards/mr_mime_lv20_extra.2bpp"
+
 PinsirLv15CardGfx::
-	rgb 31,31,31
-	rgb 19,23,6
-	rgb 14,9,2
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 23,  6
+	rgb 14,  9,  2
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 19,23,6
-	rgb 7,11,4
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 23,  6
+	rgb  7, 11,  4
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 7,11,4
-	rgb 14,9,2
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  7, 11,  4
+	rgb 14,  9,  2
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $00, $40, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40
 	db $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $40, $15, $00, $00, $80, $40
@@ -5880,21 +6149,22 @@ PinsirLv15CardGfx::
 	INCBIN "gfx/cards/pinsir_lv15.2bpp"
 PinsirLv15CardGfxExtra::
 	INCBIN "gfx/cards/pinsir_lv15_extra.2bpp"
+
 EeveeLv5CardGfx::
-	rgb 20,29,10
-	rgb 26,23,14
-	rgb 14,11,2
-	rgb 0,0,0
+	rgb 20, 29, 10
+	rgb 26, 23, 14
+	rgb 14, 11,  2
+	rgb  0,  0,  0
 
-	rgb 14,11,2
-	rgb 20,29,10
-	rgb 8,19,8
-	rgb 0,0,0
+	rgb 14, 11,  2
+	rgb 20, 29, 10
+	rgb  8, 19,  8
+	rgb  0,  0,  0
 
-	rgb 14,11,2
-	rgb 20,29,10
-	rgb 8,19,8
-	rgb 0,0,0
+	rgb 14, 11,  2
+	rgb 20, 29, 10
+	rgb  8, 19,  8
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $00, $40, $69, $69, $69, $40, $40, $67, $27, $40, $40
 	db $40, $40, $23, $63, $63, $00, $40, $40, $20, $60, $20, $00, $00, $00, $40, $40
@@ -5902,24 +6172,26 @@ EeveeLv5CardGfx::
 	INCBIN "gfx/cards/eevee_lv5.2bpp"
 EeveeLv5CardGfxExtra::
 	INCBIN "gfx/cards/eevee_lv5_extra.2bpp"
-	ds $1b8, $00
 
-SECTION "Card Gfx 2d", ROMX[$4000], BANK[$2d]
+	ds $1b8
+
+SECTION "Card Gfx 17", ROMX
+
 PorygonLv18CardGfx::
-	rgb 31,25,0
-	rgb 16,22,25
-	rgb 26,4,16
-	rgb 0,0,0
+	rgb 31, 25,  0
+	rgb 16, 22, 25
+	rgb 26,  4, 16
+	rgb  0,  0,  0
 
-	rgb 31,25,0
-	rgb 26,4,16
-	rgb 16,22,25
-	rgb 0,0,0
+	rgb 31, 25,  0
+	rgb 26,  4, 16
+	rgb 16, 22, 25
+	rgb  0,  0,  0
 
-	rgb 31,25,0
-	rgb 16,22,25
-	rgb 4,8,17
-	rgb 0,0,0
+	rgb 31, 25,  0
+	rgb 16, 22, 25
+	rgb  4,  8, 17
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $40, $80, $80, $80, $80
 	db $00, $00, $00, $5d, $5d, $80, $80, $80, $00, $00, $18, $00, $00, $80, $80, $80
@@ -5927,21 +6199,22 @@ PorygonLv18CardGfx::
 	INCBIN "gfx/cards/porygon_lv18.2bpp"
 PorygonLv18CardGfxExtra::
 	INCBIN "gfx/cards/porygon_lv18_extra.2bpp"
+
 SnorlaxLv35CardGfx::
-	rgb 31,31,31
-	rgb 31,16,8
-	rgb 1,20,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 16,  8
+	rgb  1, 20,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 9,10,31
-	rgb 0,0,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  9, 10, 31
+	rgb  0,  0, 22
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 9,10,31
-	rgb 1,20,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  9, 10, 31
+	rgb  1, 20,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $6e, $6e, $2e, $2e, $40, $6d, $6d, $6d, $6d, $2d, $00, $2c, $6c, $6c
 	db $ac, $ac, $ac, $2c, $2c, $2c, $6c, $6c, $2c, $2c, $00, $2b, $00, $2a, $2a, $6a
@@ -5949,21 +6222,22 @@ SnorlaxLv35CardGfx::
 	INCBIN "gfx/cards/snorlax_lv35.2bpp"
 SnorlaxLv35CardGfxExtra::
 	INCBIN "gfx/cards/snorlax_lv35_extra.2bpp"
+
 MewtwoLv54CardGfx::
-	rgb 31,31,31
-	rgb 31,15,31
-	rgb 20,0,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 15, 31
+	rgb 20,  0, 22
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 22,18,0
-	rgb 13,12,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 22, 18,  0
+	rgb 13, 12,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 22,18,0
-	rgb 20,0,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 22, 18,  0
+	rgb 20,  0, 22
+	rgb  0,  0,  0
 
 	db $00, $00, $40, $00, $80, $40, $40, $00, $40, $40, $80, $00, $00, $40, $40, $40
 	db $40, $40, $00, $00, $00, $40, $40, $40, $40, $57, $00, $00, $00, $40, $40, $00
@@ -5971,41 +6245,43 @@ MewtwoLv54CardGfx::
 	INCBIN "gfx/cards/mewtwo_lv54.2bpp"
 MewtwoLv54CardGfxExtra::
 	INCBIN "gfx/cards/mewtwo_lv54_extra.2bpp"
+
 SpearowLv12CardGfx::
-	rgb 29,31,25
-	rgb 20,24,2
-	rgb 0,17,0
-	rgb 0,0,0
+	rgb 29, 31, 25
+	rgb 20, 24,  2
+	rgb  0, 17,  0
+	rgb  0,  0,  0
 
-	rgb 29,31,25
-	rgb 20,24,2
-	rgb 28,5,0
-	rgb 0,0,0
+	rgb 29, 31, 25
+	rgb 20, 24,  2
+	rgb 28,  5,  0
+	rgb  0,  0,  0
 
-	rgb 29,31,25
-	rgb 23,21,0
-	rgb 28,5,0
-	rgb 0,0,0
+	rgb 29, 31, 25
+	rgb 23, 21,  0
+	rgb 28,  5,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $00, $40, $00, $00, $00, $00, $40, $40, $80, $80, $00, $00, $00, $00
 	db $40, $40, $80, $80, $80, $00, $00, $00, $00, $40, $80, $80, $00, $00, $00, $00
 	db $00, $00, $00, $80, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/spearow_lv12.2bpp"
+
 FearowLv24CardGfx::
-	rgb 31,29,21
-	rgb 29,21,4
-	rgb 16,14,6
-	rgb 8,3,0
+	rgb 31, 29, 21
+	rgb 29, 21,  4
+	rgb 16, 14,  6
+	rgb  8,  3,  0
 
-	rgb 31,29,21
-	rgb 29,21,4
-	rgb 21,14,6
-	rgb 8,3,0
+	rgb 31, 29, 21
+	rgb 29, 21,  4
+	rgb 21, 14,  6
+	rgb  8,  3,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00
@@ -6013,41 +6289,43 @@ FearowLv24CardGfx::
 	INCBIN "gfx/cards/fearow_lv24.2bpp"
 FearowLv24CardGfxExtra::
 	INCBIN "gfx/cards/fearow_lv24_extra.2bpp"
+
 RaichuLv32CardGfx::
-	rgb 27,31,31
-	rgb 27,18,3
-	rgb 12,12,6
-	rgb 2,6,8
+	rgb 27, 31, 31
+	rgb 27, 18,  3
+	rgb 12, 12,  6
+	rgb  2,  6,  8
 
-	rgb 27,31,31
-	rgb 15,20,9
-	rgb 12,12,6
-	rgb 2,6,8
+	rgb 27, 31, 31
+	rgb 15, 20,  9
+	rgb 12, 12,  6
+	rgb  2,  6,  8
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $40, $00, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $40, $00, $00, $40, $40, $00, $00, $00, $40, $40, $40
 	db $40, $00, $00, $00, $00, $40, $40, $40, $40, $40, $00, $00, $40, $40, $40, $40
 	INCBIN "gfx/cards/raichu_lv32.2bpp"
+
 SandshrewLv15CardGfx::
-	rgb 28,31,16
-	rgb 27,20,0
-	rgb 5,15,16
-	rgb 0,0,0
+	rgb 28, 31, 16
+	rgb 27, 20,  0
+	rgb  5, 15, 16
+	rgb  0,  0,  0
 
-	rgb 28,31,16
-	rgb 5,15,16
-	rgb 13,7,0
-	rgb 0,0,0
+	rgb 28, 31, 16
+	rgb  5, 15, 16
+	rgb 13,  7,  0
+	rgb  0,  0,  0
 
-	rgb 28,31,16
-	rgb 27,20,0
-	rgb 13,7,0
-	rgb 0,0,0
+	rgb 28, 31, 16
+	rgb 27, 20,  0
+	rgb 13,  7,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $29, $00, $40, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $40, $00, $40, $80, $80, $00, $00, $00, $00, $00, $00
@@ -6055,41 +6333,43 @@ SandshrewLv15CardGfx::
 	INCBIN "gfx/cards/sandshrew_lv15.2bpp"
 SandshrewLv15CardGfxExtra::
 	INCBIN "gfx/cards/sandshrew_lv15_extra.2bpp"
+
 VenomothLv22CardGfx::
-	rgb 29,31,13
-	rgb 25,12,29
-	rgb 24,4,24
-	rgb 0,0,0
+	rgb 29, 31, 13
+	rgb 25, 12, 29
+	rgb 24,  4, 24
+	rgb  0,  0,  0
 
-	rgb 29,31,13
-	rgb 25,12,29
-	rgb 14,9,11
-	rgb 0,0,0
+	rgb 29, 31, 13
+	rgb 25, 12, 29
+	rgb 14,  9, 11
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,31,31
-	rgb 31,31,31
-	rgb 31,31,31
+	rgb 31, 31, 31
+	rgb 31, 31, 31
+	rgb 31, 31, 31
+	rgb 31, 31, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/venomoth_lv22.2bpp"
+
 MachopLv18CardGfx::
-	rgb 31,31,31
-	rgb 12,17,29
-	rgb 2,7,18
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 12, 17, 29
+	rgb  2,  7, 18
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 15,17,0
-	rgb 10,4,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 17,  0
+	rgb 10,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 15,17,0
-	rgb 12,17,29
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 17,  0
+	rgb 12, 17, 29
+	rgb  0,  0,  0
 
 	db $40, $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $80, $40, $00
 	db $40, $40, $00, $00, $00, $00, $80, $80, $40, $00, $16, $00, $00, $80, $93, $40
@@ -6097,21 +6377,22 @@ MachopLv18CardGfx::
 	INCBIN "gfx/cards/machop_lv18.2bpp"
 MachopLv18CardGfxExtra::
 	INCBIN "gfx/cards/machop_lv18_extra.2bpp"
+
 MachokeLv28CardGfx::
-	rgb 12,18,11
-	rgb 15,26,8
-	rgb 21,28,31
-	rgb 0,0,0
+	rgb 12, 18, 11
+	rgb 15, 26,  8
+	rgb 21, 28, 31
+	rgb  0,  0,  0
 
-	rgb 28,31,30
-	rgb 15,26,8
-	rgb 21,28,31
-	rgb 0,0,0
+	rgb 28, 31, 30
+	rgb 15, 26,  8
+	rgb 21, 28, 31
+	rgb  0,  0,  0
 
-	rgb 31,23,0
-	rgb 28,9,0
-	rgb 21,28,31
-	rgb 0,0,0
+	rgb 31, 23,  0
+	rgb 28,  9,  0
+	rgb 21, 28, 31
+	rgb  0,  0,  0
 
 	db $b0, $b0, $b0, $b0, $70, $70, $70, $70, $b0, $b0, $b0, $b0, $70, $70, $70, $30
 	db $b0, $70, $70, $70, $b0, $b0, $70, $30, $b0, $b0, $70, $70, $70, $70, $30, $30
@@ -6119,21 +6400,22 @@ MachokeLv28CardGfx::
 	INCBIN "gfx/cards/machoke_lv28.2bpp"
 MachokeLv28CardGfxExtra::
 	INCBIN "gfx/cards/machoke_lv28_extra.2bpp"
+
 GravelerLv28CardGfx::
-	rgb 31,31,31
-	rgb 24,12,31
-	rgb 9,0,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 24, 12, 31
+	rgb  9,  0, 22
+	rgb  0,  0,  0
 
-	rgb 9,0,22
-	rgb 31,25,5
-	rgb 26,5,0
-	rgb 0,0,0
+	rgb  9,  0, 22
+	rgb 31, 25,  5
+	rgb 26,  5,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 24,12,31
-	rgb 26,5,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 24, 12, 31
+	rgb 26,  5,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $80, $40, $40, $00, $00, $00, $00, $00, $80, $40, $40, $00, $00
 	db $00, $00, $00, $00, $80, $40, $80, $80, $00, $00, $16, $16, $80, $40, $54, $54
@@ -6141,61 +6423,64 @@ GravelerLv28CardGfx::
 	INCBIN "gfx/cards/graveler_lv28.2bpp"
 GravelerLv28CardGfxExtra::
 	INCBIN "gfx/cards/graveler_lv28_extra.2bpp"
+
 MagnemiteLv15CardGfx::
-	rgb 31,31,31
-	rgb 19,13,29
-	rgb 10,2,18
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 13, 29
+	rgb 10,  2, 18
+	rgb  0,  0,  0
 
-	rgb 15,31,31
-	rgb 5,26,0
-	rgb 10,2,18
-	rgb 0,0,0
+	rgb 15, 31, 31
+	rgb  5, 26,  0
+	rgb 10,  2, 18
+	rgb  0,  0,  0
 
-	rgb 23,0,0
-	rgb 5,26,0
-	rgb 10,2,18
-	rgb 0,0,0
+	rgb 23,  0,  0
+	rgb  5, 26,  0
+	rgb 10,  2, 18
+	rgb  0,  0,  0
 
 	db $00, $80, $00, $40, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $00
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40
 	db $40, $40, $40, $40, $40, $40, $00, $80, $40, $40, $40, $40, $40, $40, $40, $80
 	INCBIN "gfx/cards/magnemite_lv15.2bpp"
+
 MagnetonLv30CardGfx::
-	rgb 31,31,31
-	rgb 21,21,30
-	rgb 10,10,15
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21, 21, 30
+	rgb 10, 10, 15
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 13,28,5
-	rgb 0,11,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 13, 28,  5
+	rgb  0, 11,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 13,28,5
-	rgb 10,10,15
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 13, 28,  5
+	rgb 10, 10, 15
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $80, $40, $40, $40, $40, $40, $40, $00, $00, $80, $40, $40
 	db $40, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/magneton_lv30.2bpp"
+
 SeelLv10CardGfx::
-	rgb 31,31,31
-	rgb 14,17,31
-	rgb 0,7,19
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 17, 31
+	rgb  0,  7, 19
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 23,16,0
-	rgb 16,6,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 23, 16,  0
+	rgb 16,  6,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 23,16,0
-	rgb 14,17,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 23, 16,  0
+	rgb 14, 17, 31
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $26, $26, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $1d, $00, $00, $00, $00, $00, $98, $80, $00, $00, $00
@@ -6203,41 +6488,43 @@ SeelLv10CardGfx::
 	INCBIN "gfx/cards/seel_lv10.2bpp"
 SeelLv10CardGfxExtra::
 	INCBIN "gfx/cards/seel_lv10_extra.2bpp"
+
 DewgongLv24CardGfx::
-	rgb 31,25,10
-	rgb 31,15,0
-	rgb 16,8,6
-	rgb 8,4,4
+	rgb 31, 25, 10
+	rgb 31, 15,  0
+	rgb 16,  8,  6
+	rgb  8,  4,  4
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dewgong_lv24.2bpp"
+
 ShellderLv16CardGfx::
-	rgb 31,31,31
-	rgb 26,20,0
-	rgb 2,16,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 26, 20,  0
+	rgb  2, 16,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 24,19,29
-	rgb 11,10,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 24, 19, 29
+	rgb 11, 10, 22
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,8,0
-	rgb 11,10,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31,  8,  0
+	rgb 11, 10, 22
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $40, $40, $00
 	db $00, $00, $5e, $40, $40, $40, $40, $40, $00, $98, $80, $40, $40, $40, $40, $40
@@ -6245,124 +6532,131 @@ ShellderLv16CardGfx::
 	INCBIN "gfx/cards/shellder_lv16.2bpp"
 ShellderLv16CardGfxExtra::
 	INCBIN "gfx/cards/shellder_lv16_extra.2bpp"
+
 OnixLv25CardGfx::
-	rgb 31,31,31
-	rgb 21,15,25
-	rgb 11,12,10
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21, 15, 25
+	rgb 11, 12, 10
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 11,21,5
-	rgb 12,8,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 11, 21,  5
+	rgb 12,  8,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 21,15,25
-	rgb 12,8,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21, 15, 25
+	rgb 12,  8,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $80, $40, $40, $40
 	db $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	db $80, $00, $00, $00, $00, $00, $80, $40, $80, $00, $00, $80, $40, $40, $40, $40
 	INCBIN "gfx/cards/onix_lv25.2bpp"
-	ds $128, $00
 
-SECTION "Card Gfx 2e", ROMX[$4000], BANK[$2e]
+	ds $128
+
+SECTION "Card Gfx 18", ROMX
+
 KrabbyLv17CardGfx::
-	rgb 31,29,29
-	rgb 17,31,0
-	rgb 2,24,2
-	rgb 14,0,0
+	rgb 31, 29, 29
+	rgb 17, 31,  0
+	rgb  2, 24,  2
+	rgb 14,  0,  0
 
-	rgb 31,29,29
-	rgb 1,25,31
-	rgb 2,24,2
-	rgb 14,0,0
+	rgb 31, 29, 29
+	rgb  1, 25, 31
+	rgb  2, 24,  2
+	rgb 14,  0,  0
 
-	rgb 31,29,29
-	rgb 24,20,10
-	rgb 2,24,2
-	rgb 14,0,0
+	rgb 31, 29, 29
+	rgb 24, 20, 10
+	rgb  2, 24,  2
+	rgb 14,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $80, $80, $80, $80, $80
 	db $40, $40, $80, $80, $80, $80, $80, $80, $40, $40, $80, $80, $80, $80, $80, $80
 	INCBIN "gfx/cards/krabby_lv17.2bpp"
+
 VoltorbLv8CardGfx::
-	rgb 31,31,31
-	rgb 31,19,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 19,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,21
-	rgb 19,14,15
-	rgb 21,0,16
-	rgb 0,0,0
+	rgb 31, 31, 21
+	rgb 19, 14, 15
+	rgb 21,  0, 16
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 19,14,15
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 14, 15
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $80, $80, $40, $40, $40, $40, $00, $00, $00, $00, $00
 	db $40, $40, $80, $00, $00, $00, $00, $00, $40, $40, $80, $00, $00, $00, $00, $00
 	db $40, $40, $80, $00, $00, $00, $00, $00, $40, $40, $40, $40, $40, $40, $00, $00
 	INCBIN "gfx/cards/voltorb_lv8.2bpp"
+
 HitmonleeLv23CardGfx::
-	rgb 22,27,29
-	rgb 12,12,12
-	rgb 24,0,0
-	rgb 10,0,0
+	rgb 22, 27, 29
+	rgb 12, 12, 12
+	rgb 24,  0,  0
+	rgb 10,  0,  0
 
-	rgb 22,27,29
-	rgb 31,12,12
-	rgb 24,0,0
-	rgb 10,0,0
+	rgb 22, 27, 29
+	rgb 31, 12, 12
+	rgb 24,  0,  0
+	rgb 10,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $40, $00, $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/hitmonlee_lv23.2bpp"
+
 HitmonchanLv23CardGfx::
-	rgb 27,31,29
-	rgb 13,23,13
-	rgb 28,6,5
-	rgb 0,0,0
+	rgb 27, 31, 29
+	rgb 13, 23, 13
+	rgb 28,  6,  5
+	rgb  0,  0,  0
 
-	rgb 27,31,29
-	rgb 13,23,13
-	rgb 20,6,15
-	rgb 0,0,0
+	rgb 27, 31, 29
+	rgb 13, 23, 13
+	rgb 20,  6, 15
+	rgb  0,  0,  0
 
-	rgb 27,31,29
-	rgb 13,23,13
-	rgb 2,10,30
-	rgb 0,0,0
+	rgb 27, 31, 29
+	rgb 13, 23, 13
+	rgb  2, 10, 30
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $40, $00, $80, $00, $00, $00, $00, $40, $40, $40
 	db $80, $00, $00, $00, $00, $00, $40, $40, $80, $00, $00, $00, $00, $00, $40, $40
 	db $80, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/hitmonchan_lv23.2bpp"
+
 JynxLv18CardGfx::
-	rgb 28,25,21
-	rgb 31,14,1
-	rgb 22,0,0
-	rgb 0,0,0
+	rgb 28, 25, 21
+	rgb 31, 14,  1
+	rgb 22,  0,  0
+	rgb  0,  0,  0
 
-	rgb 28,25,21
-	rgb 17,12,0
-	rgb 22,0,0
-	rgb 0,0,0
+	rgb 28, 25, 21
+	rgb 17, 12,  0
+	rgb 22,  0,  0
+	rgb  0,  0,  0
 
-	rgb 28,25,21
-	rgb 31,14,1
-	rgb 17,12,0
-	rgb 0,0,0
+	rgb 28, 25, 21
+	rgb 31, 14,  1
+	rgb 17, 12,  0
+	rgb  0,  0,  0
 
 	db $70, $70, $70, $30, $30, $30, $30, $30, $70, $40, $40, $6e, $6e, $2e, $00, $00
 	db $40, $40, $00, $29, $40, $80, $00, $00, $40, $24, $24, $00, $00, $80, $80, $80
@@ -6370,21 +6664,22 @@ JynxLv18CardGfx::
 	INCBIN "gfx/cards/jynx_lv18.2bpp"
 JynxLv18CardGfxExtra::
 	INCBIN "gfx/cards/jynx_lv18_extra.2bpp"
+
 LaprasLv24CardGfx::
-	rgb 29,31,31
-	rgb 8,20,31
-	rgb 4,10,31
-	rgb 0,5,20
+	rgb 29, 31, 31
+	rgb  8, 20, 31
+	rgb  4, 10, 31
+	rgb  0,  5, 20
 
-	rgb 26,27,11
-	rgb 8,20,31
-	rgb 4,10,31
-	rgb 0,5,20
+	rgb 26, 27, 11
+	rgb  8, 20, 31
+	rgb  4, 10, 31
+	rgb  0,  5, 20
 
-	rgb 29,31,31
-	rgb 8,20,31
-	rgb 23,0,0
-	rgb 0,5,20
+	rgb 29, 31, 31
+	rgb  8, 20, 31
+	rgb 23,  0,  0
+	rgb  0,  5, 20
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $00
 	db $00, $00, $00, $5d, $00, $00, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00
@@ -6392,21 +6687,22 @@ LaprasLv24CardGfx::
 	INCBIN "gfx/cards/lapras_lv24.2bpp"
 LaprasLv24CardGfxExtra::
 	INCBIN "gfx/cards/lapras_lv24_extra.2bpp"
+
 OmanyteLv20CardGfx::
-	rgb 26,31,2
-	rgb 11,16,20
-	rgb 18,7,2
-	rgb 0,0,0
+	rgb 26, 31,  2
+	rgb 11, 16, 20
+	rgb 18,  7,  2
+	rgb  0,  0,  0
 
-	rgb 26,31,2
-	rgb 9,21,0
-	rgb 15,8,25
-	rgb 0,0,0
+	rgb 26, 31,  2
+	rgb  9, 21,  0
+	rgb 15,  8, 25
+	rgb  0,  0,  0
 
-	rgb 26,31,2
-	rgb 15,8,25
-	rgb 25,1,0
-	rgb 0,0,0
+	rgb 26, 31,  2
+	rgb 15,  8, 25
+	rgb 25,  1,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $40, $80, $00, $00, $00, $00, $00, $00, $40, $80
@@ -6414,41 +6710,43 @@ OmanyteLv20CardGfx::
 	INCBIN "gfx/cards/omanyte_lv20.2bpp"
 OmanyteLv20CardGfxExtra::
 	INCBIN "gfx/cards/omanyte_lv20_extra.2bpp"
+
 KabutoLv22CardGfx::
-	rgb 31,31,31
-	rgb 12,31,0
-	rgb 0,16,0
-	rgb 0,5,0
+	rgb 31, 31, 31
+	rgb 12, 31,  0
+	rgb  0, 16,  0
+	rgb  0,  5,  0
 
-	rgb 31,31,31
-	rgb 12,31,0
-	rgb 18,11,5
-	rgb 0,5,0
+	rgb 31, 31, 31
+	rgb 12, 31,  0
+	rgb 18, 11,  5
+	rgb  0,  5,  0
 
-	rgb 31,26,0
-	rgb 12,31,0
-	rgb 18,11,5
-	rgb 0,5,0
+	rgb 31, 26,  0
+	rgb 12, 31,  0
+	rgb 18, 11,  5
+	rgb  0,  5,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $40, $80, $80, $40, $00, $00, $00, $00, $80, $80, $80, $40, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/kabuto_lv22.2bpp"
+
 AerodactylLv30CardGfx::
-	rgb 31,31,31
-	rgb 18,16,11
-	rgb 12,6,21
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 18, 16, 11
+	rgb 12,  6, 21
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 21,9,11
-	rgb 12,6,21
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21,  9, 11
+	rgb 12,  6, 21
+	rgb  0,  0,  0
 
-	rgb 21,9,11
-	rgb 26,24,19
-	rgb 15,14,2
-	rgb 0,0,0
+	rgb 21,  9, 11
+	rgb 26, 24, 19
+	rgb 15, 14,  2
+	rgb  0,  0,  0
 
 	db $b0, $80, $2f, $00, $00, $40, $ac, $80, $6b, $6b, $00, $00, $00, $40, $80, $a6
 	db $a6, $80, $40, $40, $40, $40, $00, $80, $80, $80, $80, $00, $00, $00, $80, $80
@@ -6456,21 +6754,22 @@ AerodactylLv30CardGfx::
 	INCBIN "gfx/cards/aerodactyl_lv30.2bpp"
 AerodactylLv30CardGfxExtra::
 	INCBIN "gfx/cards/aerodactyl_lv30_extra.2bpp"
+
 ArticunoLv34CardGfx::
-	rgb 31,31,31
-	rgb 16,20,31
-	rgb 6,10,21
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 16, 20, 31
+	rgb  6, 10, 21
+	rgb  0,  0,  0
 
-	rgb 6,10,21
-	rgb 19,26,17
-	rgb 7,17,2
-	rgb 0,0,0
+	rgb  6, 10, 21
+	rgb 19, 26, 17
+	rgb  7, 17,  2
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 19,26,17
-	rgb 7,17,2
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 26, 17
+	rgb  7, 17,  2
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $19, $00, $00, $80, $80, $95, $95, $00, $00
@@ -6478,41 +6777,43 @@ ArticunoLv34CardGfx::
 	INCBIN "gfx/cards/articuno_lv34.2bpp"
 ArticunoLv34CardGfxExtra::
 	INCBIN "gfx/cards/articuno_lv34_extra.2bpp"
+
 ZapdosLv28CardGfx::
-	rgb 31,18,0
-	rgb 12,19,31
-	rgb 0,10,26
-	rgb 0,0,0
+	rgb 31, 18,  0
+	rgb 12, 19, 31
+	rgb  0, 10, 26
+	rgb  0,  0,  0
 
-	rgb 31,18,0
-	rgb 23,10,0
-	rgb 30,0,0
-	rgb 0,0,0
+	rgb 31, 18,  0
+	rgb 23, 10,  0
+	rgb 30,  0,  0
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $40, $00, $00, $00, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00
 	db $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/zapdos_lv28.2bpp"
+
 MoltresLv37CardGfx::
-	rgb 31,31,28
-	rgb 21,21,0
-	rgb 20,8,0
-	rgb 0,0,8
+	rgb 31, 31, 28
+	rgb 21, 21,  0
+	rgb 20,  8,  0
+	rgb  0,  0,  8
 
-	rgb 20,8,0
-	rgb 21,21,0
-	rgb 10,10,10
-	rgb 0,0,8
+	rgb 20,  8,  0
+	rgb 21, 21,  0
+	rgb 10, 10, 10
+	rgb  0,  0,  8
 
-	rgb 31,31,28
-	rgb 21,21,0
-	rgb 10,10,10
-	rgb 0,0,8
+	rgb 31, 31, 28
+	rgb 21, 21,  0
+	rgb 10, 10, 10
+	rgb  0,  0,  8
 
 	db $00, $2f, $00, $00, $00, $00, $00, $2a, $40, $40, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $40, $80, $00, $00, $40, $00, $00, $00, $40, $40
@@ -6520,61 +6821,64 @@ MoltresLv37CardGfx::
 	INCBIN "gfx/cards/moltres_lv37.2bpp"
 MoltresLv37CardGfxExtra::
 	INCBIN "gfx/cards/moltres_lv37_extra.2bpp"
+
 PidgeottoLv38CardGfx::
-	rgb 31,31,22
-	rgb 18,22,0
-	rgb 23,13,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 18, 22,  0
+	rgb 23, 13,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 18,22,0
-	rgb 6,19,16
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 18, 22,  0
+	rgb  6, 19, 16
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 18,22,0
-	rgb 19,1,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 18, 22,  0
+	rgb 19,  1,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $00, $00, $80, $40, $40
 	db $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40
 	INCBIN "gfx/cards/pidgeotto_lv38.2bpp"
+
 ArbokLv30CardGfx::
-	rgb 27,25,5
-	rgb 21,7,1
-	rgb 10,0,12
-	rgb 4,0,4
+	rgb 27, 25,  5
+	rgb 21,  7,  1
+	rgb 10,  0, 12
+	rgb  4,  0,  4
 
-	rgb 27,25,5
-	rgb 15,4,15
-	rgb 10,0,12
-	rgb 4,0,4
+	rgb 27, 25,  5
+	rgb 15,  4, 15
+	rgb 10,  0, 12
+	rgb  4,  0,  4
 
-	rgb 25,18,7
-	rgb 17,12,3
-	rgb 14,6,2
-	rgb 4,0,4
+	rgb 25, 18,  7
+	rgb 17, 12,  3
+	rgb 14,  6,  2
+	rgb  4,  0,  4
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $80, $00, $40, $40, $00, $00, $00, $00
 	db $80, $80, $40, $00, $00, $00, $00, $00, $80, $80, $80, $00, $00, $40, $40, $00
 	db $80, $80, $80, $40, $40, $40, $40, $40, $80, $80, $80, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/arbok_lv30.2bpp"
+
 SandslashLv35CardGfx::
-	rgb 31,31,31
-	rgb 29,23,5
-	rgb 17,12,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 29, 23,  5
+	rgb 17, 12,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 22,6,0
-	rgb 12,3,1
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 22,  6,  0
+	rgb 12,  3,  1
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 12,3,1
-	rgb 17,12,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 12,  3,  1
+	rgb 17, 12,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $80, $40, $40, $40, $00, $00, $00, $25, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $80, $80
@@ -6582,61 +6886,64 @@ SandslashLv35CardGfx::
 	INCBIN "gfx/cards/sandslash_lv35.2bpp"
 SandslashLv35CardGfxExtra::
 	INCBIN "gfx/cards/sandslash_lv35_extra.2bpp"
+
 NidorinaLv22CardGfx::
-	rgb 31,31,31
-	rgb 14,19,21
-	rgb 3,14,27
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 19, 21
+	rgb  3, 14, 27
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 14,19,21
-	rgb 8,7,2
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 19, 21
+	rgb  8,  7,  2
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 17,19,9
-	rgb 10,10,3
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 17, 19,  9
+	rgb 10, 10,  3
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $80
 	db $00, $00, $00, $00, $00, $00, $00, $80, $40, $40, $00, $00, $00, $40, $40, $80
 	db $80, $80, $00, $00, $00, $80, $80, $80, $80, $80, $00, $00, $00, $80, $80, $80
 	INCBIN "gfx/cards/nidorina_lv22.2bpp"
+
 NidorinoLv23CardGfx::
-	rgb 27,31,31
-	rgb 25,15,31
-	rgb 22,8,16
-	rgb 10,6,0
+	rgb 27, 31, 31
+	rgb 25, 15, 31
+	rgb 22,  8, 16
+	rgb 10,  6,  0
 
-	rgb 27,31,31
-	rgb 7,19,31
-	rgb 22,8,16
-	rgb 10,6,0
+	rgb 27, 31, 31
+	rgb  7, 19, 31
+	rgb 22,  8, 16
+	rgb 10,  6,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/nidorino_lv23.2bpp"
+
 VulpixLv13CardGfx::
-	rgb 31,27,7
-	rgb 21,22,0
-	rgb 19,12,6
-	rgb 14,8,4
+	rgb 31, 27,  7
+	rgb 21, 22,  0
+	rgb 19, 12,  6
+	rgb 14,  8,  4
 
-	rgb 21,22,0
-	rgb 29,11,0
-	rgb 19,12,6
-	rgb 14,8,4
+	rgb 21, 22,  0
+	rgb 29, 11,  0
+	rgb 19, 12,  6
+	rgb 14,  8,  4
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $28, $00, $27, $40, $00, $00, $24, $24
 	db $24, $40, $40, $40, $40, $40, $1f, $00, $00, $40, $40, $40, $5a, $1a, $00, $00
@@ -6644,24 +6951,26 @@ VulpixLv13CardGfx::
 	INCBIN "gfx/cards/vulpix_lv13.2bpp"
 VulpixLv13CardGfxExtra::
 	INCBIN "gfx/cards/vulpix_lv13_extra.2bpp"
-	ds $160, $00
 
-SECTION "Card Gfx 2f", ROMX[$4000], BANK[$2f]
+	ds $160
+
+SECTION "Card Gfx 19", ROMX
+
 VenonatLv15CardGfx::
-	rgb 31,31,31
-	rgb 13,15,31
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 13, 15, 31
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,29,3
-	rgb 10,22,4
-	rgb 19,4,0
-	rgb 0,0,0
+	rgb 31, 29,  3
+	rgb 10, 22,  4
+	rgb 19,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,29,3
-	rgb 13,15,31
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 29,  3
+	rgb 13, 15, 31
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $30, $30, $00, $2f, $2f, $00, $00, $00, $2c, $2c, $2c, $00, $00, $00, $29, $29
 	db $29, $29, $00, $00, $00, $00, $25, $25, $25, $00, $00, $00, $00, $00, $40, $5f
@@ -6669,21 +6978,22 @@ VenonatLv15CardGfx::
 	INCBIN "gfx/cards/venonat_lv15.2bpp"
 VenonatLv15CardGfxExtra::
 	INCBIN "gfx/cards/venonat_lv15_extra.2bpp"
+
 GolduckLv28CardGfx::
-	rgb 31,31,31
-	rgb 12,19,31
-	rgb 9,0,23
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 12, 19, 31
+	rgb  9,  0, 23
+	rgb  0,  0,  0
 
-	rgb 9,0,23
-	rgb 12,19,31
-	rgb 16,7,0
-	rgb 0,0,0
+	rgb  9,  0, 23
+	rgb 12, 19, 31
+	rgb 16,  7,  0
+	rgb  0,  0,  0
 
-	rgb 12,19,31
-	rgb 31,25,8
-	rgb 9,0,23
-	rgb 0,0,0
+	rgb 12, 19, 31
+	rgb 31, 25,  8
+	rgb  9,  0, 23
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40, $40, $40
 	db $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00
@@ -6691,41 +7001,43 @@ GolduckLv28CardGfx::
 	INCBIN "gfx/cards/golduck_lv28.2bpp"
 GolduckLv28CardGfxExtra::
 	INCBIN "gfx/cards/golduck_lv28_extra.2bpp"
+
 GrowlitheLv16CardGfx::
-	rgb 31,31,31
-	rgb 17,31,0
-	rgb 31,10,0
-	rgb 8,6,0
+	rgb 31, 31, 31
+	rgb 17, 31,  0
+	rgb 31, 10,  0
+	rgb  8,  6,  0
 
-	rgb 31,31,31
-	rgb 17,31,0
-	rgb 19,16,6
-	rgb 8,6,0
+	rgb 31, 31, 31
+	rgb 17, 31,  0
+	rgb 19, 16,  6
+	rgb  8,  6,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	db $40, $40, $40, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $00, $40
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/growlithe_lv16.2bpp"
+
 KadabraLv39CardGfx::
-	rgb 31,31,31
-	rgb 26,14,7
-	rgb 22,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 26, 14,  7
+	rgb 22,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 11,19,26
-	rgb 7,5,15
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 11, 19, 26
+	rgb  7,  5, 15
+	rgb  0,  0,  0
 
-	rgb 31,31,16
-	rgb 26,14,7
-	rgb 7,5,15
-	rgb 0,0,0
+	rgb 31, 31, 16
+	rgb 26, 14,  7
+	rgb  7,  5, 15
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $2d, $00, $00, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00
 	db $00, $00, $80, $80, $80, $80, $00, $00, $00, $80, $80, $80, $80, $80, $80, $00
@@ -6733,181 +7045,190 @@ KadabraLv39CardGfx::
 	INCBIN "gfx/cards/kadabra_lv39.2bpp"
 KadabraLv39CardGfxExtra::
 	INCBIN "gfx/cards/kadabra_lv39_extra.2bpp"
+
 AlakazamLv45CardGfx::
-	rgb 31,31,8
-	rgb 27,15,0
-	rgb 30,0,0
-	rgb 0,0,0
+	rgb 31, 31,  8
+	rgb 27, 15,  0
+	rgb 30,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,31,31
-	rgb 0,10,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 31, 31
+	rgb  0, 10, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,21
-	rgb 0,31,31
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 21
+	rgb  0, 31, 31
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $80, $00, $00, $40, $40, $40, $40, $00, $80, $80, $00, $00, $40
 	db $40, $40, $00, $80, $80, $00, $00, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/alakazam_lv45.2bpp"
+
 MachokeLv24CardGfx::
-	rgb 31,31,31
-	rgb 14,19,31
-	rgb 0,8,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 19, 31
+	rgb  0,  8, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 14,19,31
-	rgb 31,10,21
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 19, 31
+	rgb 31, 10, 21
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 14,19,31
-	rgb 31,18,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 19, 31
+	rgb 31, 18,  0
+	rgb  0,  0,  0
 
 	db $00, $40, $40, $80, $40, $40, $40, $40, $00, $40, $40, $80, $00, $40, $40, $40
 	db $00, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/machoke_lv24.2bpp"
+
 MachampLv54CardGfx::
-	rgb 31,31,10
-	rgb 9,24,31
-	rgb 0,9,27
-	rgb 0,0,0
+	rgb 31, 31, 10
+	rgb  9, 24, 31
+	rgb  0,  9, 27
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,16,0
-	rgb 18,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 16,  0
+	rgb 18,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,25,0
-	rgb 31,0,0
-	rgb 0,9,27
-	rgb 0,0,0
+	rgb 31, 25,  0
+	rgb 31,  0,  0
+	rgb  0,  9, 27
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $80, $80, $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, $40, $40, $40
 	INCBIN "gfx/cards/machamp_lv54.2bpp"
+
 BellsproutLv10CardGfx::
-	rgb 31,31,9
-	rgb 0,18,0
-	rgb 31,6,9
-	rgb 0,0,0
+	rgb 31, 31,  9
+	rgb  0, 18,  0
+	rgb 31,  6,  9
+	rgb  0,  0,  0
 
-	rgb 26,26,26
-	rgb 0,16,31
-	rgb 0,8,27
-	rgb 0,0,8
+	rgb 26, 26, 26
+	rgb  0, 16, 31
+	rgb  0,  8, 27
+	rgb  0,  0,  8
 
-	rgb 26,26,26
-	rgb 0,16,31
-	rgb 31,6,9
-	rgb 0,0,0
+	rgb 26, 26, 26
+	rgb  0, 16, 31
+	rgb 31,  6,  9
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $80, $40, $40
 	db $40, $40, $80, $00, $00, $80, $80, $40, $40, $40, $00, $00, $00, $00, $80, $40
 	db $40, $40, $80, $00, $00, $80, $80, $40, $40, $40, $80, $00, $00, $80, $40, $40
 	INCBIN "gfx/cards/bellsprout_lv10.2bpp"
+
 WeepinbellLv23CardGfx::
-	rgb 31,31,0
-	rgb 6,27,0
-	rgb 14,10,0
-	rgb 10,4,2
+	rgb 31, 31,  0
+	rgb  6, 27,  0
+	rgb 14, 10,  0
+	rgb 10,  4,  2
 
-	rgb 31,31,0
-	rgb 6,27,0
-	rgb 28,0,0
-	rgb 10,4,2
+	rgb 31, 31,  0
+	rgb  6, 27,  0
+	rgb 28,  0,  0
+	rgb 10,  4,  2
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00
 	db $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/weepinbell_lv23.2bpp"
+
 GravelerLv27CardGfx::
-	rgb 31,31,31
-	rgb 18,24,25
-	rgb 11,10,24
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 18, 24, 25
+	rgb 11, 10, 24
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 22,14,19
-	rgb 11,8,12
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 22, 14, 19
+	rgb 11,  8, 12
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 29,21,13
-	rgb 11,10,24
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 29, 21, 13
+	rgb 11, 10, 24
+	rgb  0,  0,  0
 
 	db $00, $00, $80, $00, $00, $80, $00, $00, $00, $00, $80, $00, $80, $80, $80, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/graveler_lv27.2bpp"
+
 GolemLv37CardGfx::
-	rgb 31,31,31
-	rgb 14,25,31
-	rgb 4,13,26
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 25, 31
+	rgb  4, 13, 26
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 14,25,31
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 25, 31
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,21,0
-	rgb 20,9,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 21,  0
+	rgb 20,  9,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $80, $00, $80, $80, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/golem_lv37.2bpp"
+
 PonytaLv8CardGfx::
-	rgb 31,31,29
-	rgb 31,23,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 29
+	rgb 31, 23,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 15,22,31
-	rgb 9,9,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 22, 31
+	rgb  9,  9,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,23,0
-	rgb 9,9,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 23,  0
+	rgb  9,  9,  9
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $00, $00, $00, $80, $40, $40, $40, $40, $00, $00, $00, $00, $40
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $40, $40
 	db $40, $40, $40, $80, $00, $80, $40, $40, $40, $40, $40, $40, $80, $80, $40, $40
 	INCBIN "gfx/cards/ponyta_lv8.2bpp"
+
 SlowbroLv35CardGfx::
-	rgb 31,25,8
-	rgb 27,4,13
-	rgb 0,12,0
-	rgb 0,0,8
+	rgb 31, 25,  8
+	rgb 27,  4, 13
+	rgb  0, 12,  0
+	rgb  0,  0,  8
 
-	rgb 31,25,31
-	rgb 5,22,29
-	rgb 0,10,30
-	rgb 0,0,8
+	rgb 31, 25, 31
+	rgb  5, 22, 29
+	rgb  0, 10, 30
+	rgb  0,  0,  8
 
-	rgb 31,31,8
-	rgb 27,4,13
-	rgb 14,4,8
-	rgb 0,0,10
+	rgb 31, 31,  8
+	rgb 27,  4, 13
+	rgb 14,  4,  8
+	rgb  0,  0, 10
 
 	db $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $00, $00, $00
 	db $00, $00, $80, $80, $80, $00, $1a, $00, $00, $00, $80, $80, $95, $40, $40, $40
@@ -6915,61 +7236,64 @@ SlowbroLv35CardGfx::
 	INCBIN "gfx/cards/slowbro_lv35.2bpp"
 SlowbroLv35CardGfxExtra::
 	INCBIN "gfx/cards/slowbro_lv35_extra.2bpp"
+
 GastlyLv13CardGfx::
-	rgb 31,31,31
-	rgb 25,10,29
-	rgb 12,7,16
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 25, 10, 29
+	rgb 12,  7, 16
+	rgb  0,  0,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/gastly_lv13.2bpp"
+
 HaunterLv26CardGfx::
-	rgb 31,31,31
-	rgb 14,11,17
-	rgb 12,0,12
-	rgb 2,2,4
+	rgb 31, 31, 31
+	rgb 14, 11, 17
+	rgb 12,  0, 12
+	rgb  2,  2,  4
 
-	rgb 31,31,31
-	rgb 14,11,17
-	rgb 20,0,0
-	rgb 2,2,4
+	rgb 31, 31, 31
+	rgb 14, 11, 17
+	rgb 20,  0,  0
+	rgb  2,  2,  4
 
-	rgb 27,23,9
-	rgb 14,11,17
-	rgb 12,0,12
-	rgb 2,2,4
+	rgb 27, 23,  9
+	rgb 14, 11, 17
+	rgb 12,  0, 12
+	rgb  2,  2,  4
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00
 	db $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00
 	db $00, $00, $80, $80, $00, $00, $80, $80, $00, $80, $80, $80, $00, $00, $80, $80
 	INCBIN "gfx/cards/haunter_lv26.2bpp"
+
 HaunterLv25CardGfx::
-	rgb 31,31,31
-	rgb 18,16,23
-	rgb 10,1,27
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 18, 16, 23
+	rgb 10,  1, 27
+	rgb  0,  0,  0
 
-	rgb 29,21,1
-	rgb 18,16,23
-	rgb 10,1,27
-	rgb 0,0,0
+	rgb 29, 21,  1
+	rgb 18, 16, 23
+	rgb 10,  1, 27
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 15,22,0
-	rgb 10,1,27
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 22,  0
+	rgb 10,  1, 27
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $80
@@ -6977,41 +7301,43 @@ HaunterLv25CardGfx::
 	INCBIN "gfx/cards/haunter_lv25.2bpp"
 HaunterLv25CardGfxExtra::
 	INCBIN "gfx/cards/haunter_lv25_extra.2bpp"
+
 GengarLv40CardGfx::
-	rgb 31,31,0
-	rgb 0,11,23
-	rgb 11,0,12
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb  0, 11, 23
+	rgb 11,  0, 12
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,0,0
-	rgb 11,0,12
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31,  0,  0
+	rgb 11,  0, 12
+	rgb  0,  0,  0
 
-	rgb 31,23,0
-	rgb 0,11,27
-	rgb 1,0,12
-	rgb 0,0,0
+	rgb 31, 23,  0
+	rgb  0, 11, 27
+	rgb  1,  0, 12
+	rgb  0,  0,  0
 
 	db $80, $80, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $00, $00, $00, $80
 	db $80, $00, $40, $00, $00, $00, $00, $80, $80, $00, $40, $40, $40, $00, $00, $80
 	db $80, $00, $40, $40, $40, $00, $00, $80, $80, $80, $00, $00, $00, $00, $80, $80
 	INCBIN "gfx/cards/gengar_lv40.2bpp"
+
 HypnoLv30CardGfx::
-	rgb 31,31,25
-	rgb 26,20,4
-	rgb 23,10,7
-	rgb 0,0,0
+	rgb 31, 31, 25
+	rgb 26, 20,  4
+	rgb 23, 10,  7
+	rgb  0,  0,  0
 
-	rgb 15,0,31
-	rgb 16,13,22
-	rgb 23,10,7
-	rgb 0,0,0
+	rgb 15,  0, 31
+	rgb 16, 13, 22
+	rgb 23, 10,  7
+	rgb  0,  0,  0
 
-	rgb 15,0,31
-	rgb 26,20,4
-	rgb 23,10,7
-	rgb 0,0,0
+	rgb 15,  0, 31
+	rgb 26, 20,  4
+	rgb 23, 10,  7
+	rgb  0,  0,  0
 
 	db $70, $b0, $b0, $b0, $b0, $00, $2f, $af, $40, $6e, $ae, $80, $ad, $2d, $2d, $00
 	db $80, $00, $2a, $2a, $00, $00, $00, $00, $66, $a6, $00, $00, $00, $00, $22, $00
@@ -7019,84 +7345,89 @@ HypnoLv30CardGfx::
 	INCBIN "gfx/cards/hypno_lv30.2bpp"
 HypnoLv30CardGfxExtra::
 	INCBIN "gfx/cards/hypno_lv30_extra.2bpp"
-	ds $210, $00
 
-SECTION "Card Gfx 30", ROMX[$4000], BANK[$30]
+	ds $210
+
+SECTION "Card Gfx 20", ROMX
+
 KinglerLv33CardGfx::
-	rgb 31,31,15
-	rgb 0,24,31
-	rgb 27,0,0
-	rgb 0,0,0
+	rgb 31, 31, 15
+	rgb  0, 24, 31
+	rgb 27,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,15
-	rgb 0,24,31
-	rgb 0,13,28
-	rgb 0,0,0
+	rgb 31, 31, 15
+	rgb  0, 24, 31
+	rgb  0, 13, 28
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $40, $00, $40, $00, $00, $40, $40, $00, $40, $00, $00, $00, $00, $00, $40
 	db $40, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00
 	db $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00
 	INCBIN "gfx/cards/kingler_lv33.2bpp"
+
 CuboneLv14CardGfx::
-	rgb 31,23,24
-	rgb 31,16,5
-	rgb 23,2,6
-	rgb 10,4,0
+	rgb 31, 23, 24
+	rgb 31, 16,  5
+	rgb 23,  2,  6
+	rgb 10,  4,  0
 
-	rgb 31,23,24
-	rgb 31,16,5
-	rgb 20,6,0
-	rgb 10,4,0
+	rgb 31, 23, 24
+	rgb 31, 16,  5
+	rgb 20,  6,  0
+	rgb 10,  4,  0
 
-	rgb 31,23,0
-	rgb 29,10,5
-	rgb 27,3,0
-	rgb 10,4,0
+	rgb 31, 23,  0
+	rgb 29, 10,  5
+	rgb 27,  3,  0
+	rgb 10,  4,  0
 
 	db $80, $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $00, $00, $00, $00, $00
 	db $80, $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $00, $00, $00, $00, $00
 	db $80, $80, $80, $40, $40, $40, $40, $40, $80, $80, $80, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/cubone_lv14.2bpp"
+
 WeezingLv26CardGfx::
-	rgb 27,22,31
-	rgb 21,13,31
-	rgb 12,5,13
-	rgb 0,0,0
+	rgb 27, 22, 31
+	rgb 21, 13, 31
+	rgb 12,  5, 13
+	rgb  0,  0,  0
 
-	rgb 27,22,31
-	rgb 20,3,0
-	rgb 10,3,0
-	rgb 0,0,0
+	rgb 27, 22, 31
+	rgb 20,  3,  0
+	rgb 10,  3,  0
+	rgb  0,  0,  0
 
-	rgb 27,22,31
-	rgb 21,13,31
-	rgb 10,3,0
-	rgb 0,0,0
+	rgb 27, 22, 31
+	rgb 21, 13, 31
+	rgb 10,  3,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $00, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $80
 	db $40, $00, $00, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $40
 	db $40, $00, $00, $00, $00, $00, $40, $40, $40, $40, $80, $80, $80, $40, $40, $40
 	INCBIN "gfx/cards/weezing_lv26.2bpp"
+
 RhydonLv37CardGfx::
-	rgb 25,31,31
-	rgb 10,17,27
-	rgb 12,4,31
-	rgb 0,0,0
+	rgb 25, 31, 31
+	rgb 10, 17, 27
+	rgb 12,  4, 31
+	rgb  0,  0,  0
 
-	rgb 25,31,31
-	rgb 10,17,27
-	rgb 7,7,0
-	rgb 0,0,0
+	rgb 25, 31, 31
+	rgb 10, 17, 27
+	rgb  7,  7,  0
+	rgb  0,  0,  0
 
-	rgb 7,7,0
-	rgb 10,17,27
-	rgb 12,4,31
-	rgb 0,0,0
+	rgb  7,  7,  0
+	rgb 10, 17, 27
+	rgb 12,  4, 31
+	rgb  0,  0,  0
 
 	db $40, $40, $ae, $2e, $ae, $ae, $40, $40, $40, $00, $00, $00, $28, $80, $40, $40
 	db $80, $00, $00, $00, $80, $40, $40, $40, $9d, $00, $1c, $1c, $80, $5b, $5b, $5b
@@ -7104,21 +7435,22 @@ RhydonLv37CardGfx::
 	INCBIN "gfx/cards/rhydon_lv37.2bpp"
 RhydonLv37CardGfxExtra::
 	INCBIN "gfx/cards/rhydon_lv37_extra.2bpp"
+
 KangaskhanLv36CardGfx::
-	rgb 31,31,31
-	rgb 13,31,1
-	rgb 3,21,0
-	rgb 10,6,5
+	rgb 31, 31, 31
+	rgb 13, 31,  1
+	rgb  3, 21,  0
+	rgb 10,  6,  5
 
-	rgb 31,31,31
-	rgb 13,31,1
-	rgb 17,13,8
-	rgb 10,6,5
+	rgb 31, 31, 31
+	rgb 13, 31,  1
+	rgb 17, 13,  8
+	rgb 10,  6,  5
 
-	rgb 3,21,0
-	rgb 13,31,1
-	rgb 17,13,8
-	rgb 10,6,5
+	rgb  3, 21,  0
+	rgb 13, 31,  1
+	rgb 17, 13,  8
+	rgb 10,  6,  5
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $22, $22
 	db $22, $22, $40, $80, $a0, $60, $00, $00, $00, $00, $9c, $9c, $9c, $9c, $00, $00
@@ -7126,61 +7458,64 @@ KangaskhanLv36CardGfx::
 	INCBIN "gfx/cards/kangaskhan_lv36.2bpp"
 KangaskhanLv36CardGfxExtra::
 	INCBIN "gfx/cards/kangaskhan_lv36_extra.2bpp"
+
 HorseaLv20CardGfx::
-	rgb 31,31,31
-	rgb 19,22,0
-	rgb 10,14,28
-	rgb 6,7,14
+	rgb 31, 31, 31
+	rgb 19, 22,  0
+	rgb 10, 14, 28
+	rgb  6,  7, 14
 
-	rgb 31,31,31
-	rgb 17,14,0
-	rgb 30,4,8
-	rgb 6,7,14
+	rgb 31, 31, 31
+	rgb 17, 14,  0
+	rgb 30,  4,  8
+	rgb  6,  7, 14
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $40, $40, $40, $40, $00, $40
 	INCBIN "gfx/cards/horsea_lv20.2bpp"
+
 SeadraLv26CardGfx::
-	rgb 31,31,31
-	rgb 10,18,31
-	rgb 0,18,0
-	rgb 7,3,12
+	rgb 31, 31, 31
+	rgb 10, 18, 31
+	rgb  0, 18,  0
+	rgb  7,  3, 12
 
-	rgb 31,31,31
-	rgb 10,18,31
-	rgb 6,9,18
-	rgb 7,3,12
+	rgb 31, 31, 31
+	rgb 10, 18, 31
+	rgb  6,  9, 18
+	rgb  7,  3, 12
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $40, $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00
 	db $40, $40, $00, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $40, $40
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/seadra_lv26.2bpp"
+
 StaryuLv17CardGfx::
-	rgb 31,31,31
-	rgb 14,14,31
-	rgb 6,4,21
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 14, 31
+	rgb  6,  4, 21
+	rgb  0,  0,  0
 
-	rgb 25,2,0
-	rgb 23,23,31
-	rgb 6,4,21
-	rgb 0,0,0
+	rgb 25,  2,  0
+	rgb 23, 23, 31
+	rgb  6,  4, 21
+	rgb  0,  0,  0
 
-	rgb 25,2,0
-	rgb 28,31,19
-	rgb 16,18,0
-	rgb 0,0,0
+	rgb 25,  2,  0
+	rgb 28, 31, 19
+	rgb 16, 18,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $2c, $00, $00, $00, $00, $00, $00, $66, $40, $00, $24, $24
 	db $00, $00, $40, $a1, $a1, $61, $21, $00, $00, $1f, $1f, $9f, $9f, $40, $00, $00
@@ -7188,21 +7523,22 @@ StaryuLv17CardGfx::
 	INCBIN "gfx/cards/staryu_lv17.2bpp"
 StaryuLv17CardGfxExtra::
 	INCBIN "gfx/cards/staryu_lv17_extra.2bpp"
+
 ScytherLv23CardGfx::
-	rgb 7,31,31
-	rgb 11,31,0
-	rgb 2,18,0
-	rgb 0,8,0
+	rgb  7, 31, 31
+	rgb 11, 31,  0
+	rgb  2, 18,  0
+	rgb  0,  8,  0
 
-	rgb 31,31,31
-	rgb 7,31,31
-	rgb 2,18,0
-	rgb 0,8,0
+	rgb 31, 31, 31
+	rgb  7, 31, 31
+	rgb  2, 18,  0
+	rgb  0,  8,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $70, $70, $70, $70, $40, $40, $6e, $40, $40, $00, $00, $40, $69, $69, $69, $69
 	db $40, $00, $00, $26, $26, $00, $00, $40, $23, $23, $00, $00, $21, $00, $20, $20
@@ -7210,41 +7546,43 @@ ScytherLv23CardGfx::
 	INCBIN "gfx/cards/scyther_lv23.2bpp"
 ScytherLv23CardGfxExtra::
 	INCBIN "gfx/cards/scyther_lv23_extra.2bpp"
+
 MagmarLv27CardGfx::
-	rgb 31,31,10
-	rgb 31,19,0
-	rgb 27,0,0
-	rgb 0,0,0
+	rgb 31, 31, 10
+	rgb 31, 19,  0
+	rgb 27,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,10
-	rgb 31,2,9
-	rgb 13,5,0
-	rgb 0,0,0
+	rgb 31, 31, 10
+	rgb 31,  2,  9
+	rgb 13,  5,  0
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $40, $40, $40, $40
 	db $40, $00, $00, $00, $40, $40, $40, $40, $40, $00, $00, $40, $40, $40, $40, $40
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/magmar_lv27.2bpp"
+
 TaurosLv35CardGfx::
-	rgb 31,31,31
-	rgb 21,18,0
-	rgb 15,14,12
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 21, 18,  0
+	rgb 15, 14, 12
+	rgb  0,  0,  0
 
-	rgb 11,20,9
-	rgb 21,18,0
-	rgb 7,10,6
-	rgb 0,0,0
+	rgb 11, 20,  9
+	rgb 21, 18,  0
+	rgb  7, 10,  6
+	rgb  0,  0,  0
 
-	rgb 11,20,9
-	rgb 15,14,12
-	rgb 7,10,6
-	rgb 0,0,0
+	rgb 11, 20,  9
+	rgb 15, 14, 12
+	rgb  7, 10,  6
+	rgb  0,  0,  0
 
 	db $00, $2f, $2f, $2f, $2f, $2f, $2f, $2f, $6f, $6f, $6f, $2f, $2f, $2f, $40, $6e
 	db $6e, $6e, $00, $00, $00, $2b, $2b, $6b, $80, $80, $40, $68, $68, $28, $40, $67
@@ -7252,121 +7590,127 @@ TaurosLv35CardGfx::
 	INCBIN "gfx/cards/tauros_lv35.2bpp"
 TaurosLv35CardGfxExtra::
 	INCBIN "gfx/cards/tauros_lv35_extra.2bpp"
+
 OmanyteLv22CardGfx::
-	rgb 18,27,0
-	rgb 10,21,0
-	rgb 5,13,0
-	rgb 2,5,0
+	rgb 18, 27,  0
+	rgb 10, 21,  0
+	rgb  5, 13,  0
+	rgb  2,  5,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/omanyte_lv22.2bpp"
+
 OmastarLv36CardGfx::
-	rgb 31,31,31
-	rgb 14,28,15
-	rgb 6,10,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 28, 15
+	rgb  6, 10, 22
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 15,30,0
-	rgb 6,10,22
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 30,  0
+	rgb  6, 10, 22
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 20,25,0
-	rgb 9,15,1
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 20, 25,  0
+	rgb  9, 15,  1
+	rgb  0,  0,  0
 
 	db $00, $00, $80, $00, $00, $80, $00, $00, $80, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $40, $40, $40, $00, $00
 	db $40, $40, $00, $40, $40, $40, $00, $40, $40, $40, $00, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/omastar_lv36.2bpp"
+
 MewtwoLv67CardGfx::
-	rgb 31,31,31
-	rgb 11,19,23
-	rgb 17,0,5
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 11, 19, 23
+	rgb 17,  0,  5
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 11,19,23
-	rgb 8,0,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 11, 19, 23
+	rgb  8,  0,  9
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $40, $00
 	db $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/mewtwo_lv67.2bpp"
+
 DarkPersianAltLv28CardGfx::
-	rgb 31,31,31
-	rgb 31,25,0
-	rgb 11,13,5
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 25,  0
+	rgb 11, 13,  5
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 6,16,31
-	rgb 6,4,18
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  6, 16, 31
+	rgb  6,  4, 18
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,25,0
-	rgb 6,4,18
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 25,  0
+	rgb  6,  4, 18
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $80, $40, $40, $80, $00, $00, $00, $00, $40, $40, $40
 	db $80, $80, $00, $00, $00, $40, $40, $40, $80, $00, $00, $00, $40, $40, $40, $40
 	db $80, $00, $00, $00, $40, $40, $40, $00, $80, $00, $00, $00, $40, $40, $00, $00
 	INCBIN "gfx/cards/dark_persian_alt_lv28.2bpp"
+
 MeowthLv14CardGfx::
-	rgb 31,31,21
-	rgb 19,23,3
-	rgb 16,8,0
-	rgb 4,2,0
+	rgb 31, 31, 21
+	rgb 19, 23,  3
+	rgb 16,  8,  0
+	rgb  4,  2,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/meowth_lv14.2bpp"
+
 CoolPorygonCardGfx::
-	rgb 31,31,31
-	rgb 14,18,24
-	rgb 4,8,15
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 18, 24
+	rgb  4,  8, 15
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 14,18,24
-	rgb 19,4,5
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 14, 18, 24
+	rgb 19,  4,  5
+	rgb  0,  0,  0
 
-	rgb 4,8,15
-	rgb 14,18,24
-	rgb 19,4,5
-	rgb 0,0,0
+	rgb  4,  8, 15
+	rgb 14, 18, 24
+	rgb 19,  4,  5
+	rgb  0,  0,  0
 
 	db $40, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40, $40, $80, $00
 	db $00, $00, $00, $80, $9c, $40, $00, $00, $00, $00, $17, $00, $00, $40, $40, $40
@@ -7374,64 +7718,68 @@ CoolPorygonCardGfx::
 	INCBIN "gfx/cards/cool_porygon.2bpp"
 CoolPorygonCardGfxExtra::
 	INCBIN "gfx/cards/cool_porygon_extra.2bpp"
-	ds $178, $00
 
-SECTION "Card Gfx 31", ROMX[$4000], BANK[$31]
+	ds $178
+
+SECTION "Card Gfx 21", ROMX
+
 HungrySnorlaxCardGfx::
-	rgb 18,31,1
-	rgb 5,18,0
-	rgb 0,0,10
-	rgb 0,0,0
+	rgb 18, 31,  1
+	rgb  5, 18,  0
+	rgb  0,  0, 10
+	rgb  0,  0,  0
 
-	rgb 31,2,1
-	rgb 5,18,0
-	rgb 0,0,10
-	rgb 0,0,0
+	rgb 31,  2,  1
+	rgb  5, 18,  0
+	rgb  0,  0, 10
+	rgb  0,  0,  0
 
-	rgb 18,31,1
-	rgb 5,18,0
-	rgb 6,4,0
-	rgb 0,0,0
+	rgb 18, 31,  1
+	rgb  5, 18,  0
+	rgb  6,  4,  0
+	rgb  0,  0,  0
 
 	db $00, $40, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $00
 	db $40, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $80, $00, $00, $80, $00, $00, $00, $00, $80, $00, $00, $80, $00, $00
 	INCBIN "gfx/cards/hungry_snorlax.2bpp"
+
 MewtwoLv30CardGfx::
-	rgb 31,31,31
-	rgb 23,13,31
-	rgb 16,0,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 23, 13, 31
+	rgb 16,  0, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 29,8,27
-	rgb 18,1,12
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 29,  8, 27
+	rgb 18,  1, 12
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 23,13,31
-	rgb 18,1,12
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 23, 13, 31
+	rgb 18,  1, 12
+	rgb  0,  0,  0
 
 	db $00, $40, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40, $40, $40
 	db $00, $00, $00, $00, $80, $40, $40, $40, $00, $00, $00, $00, $00, $40, $40, $00
 	db $00, $40, $00, $00, $00, $40, $40, $00, $00, $00, $00, $40, $00, $40, $40, $40
 	INCBIN "gfx/cards/mewtwo_lv30.2bpp"
+
 PikachuLv13CardGfx::
-	rgb 31,31,21
-	rgb 31,23,0
-	rgb 0,16,31
-	rgb 0,0,10
+	rgb 31, 31, 21
+	rgb 31, 23,  0
+	rgb  0, 16, 31
+	rgb  0,  0, 10
 
-	rgb 31,31,21
-	rgb 31,23,0
-	rgb 27,0,0
-	rgb 0,0,10
+	rgb 31, 31, 21
+	rgb 31, 23,  0
+	rgb 27,  0,  0
+	rgb  0,  0, 10
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $16, $00, $00, $00, $00, $00
@@ -7439,21 +7787,22 @@ PikachuLv13CardGfx::
 	INCBIN "gfx/cards/pikachu_lv13.2bpp"
 PikachuLv13CardGfxExtra::
 	INCBIN "gfx/cards/pikachu_lv13_extra.2bpp"
+
 FarfetchdAltLv20CardGfx::
-	rgb 31,31,31
-	rgb 21,25,31
-	rgb 19,13,2
-	rgb 7,0,0
+	rgb 31, 31, 31
+	rgb 21, 25, 31
+	rgb 19, 13,  2
+	rgb  7,  0,  0
 
-	rgb 31,31,31
-	rgb 8,30,4
-	rgb 19,13,2
-	rgb 7,0,0
+	rgb 31, 31, 31
+	rgb  8, 30,  4
+	rgb 19, 13,  2
+	rgb  7,  0,  0
 
-	rgb 31,31,31
-	rgb 28,20,2
-	rgb 19,13,2
-	rgb 7,0,0
+	rgb 31, 31, 31
+	rgb 28, 20,  2
+	rgb 19, 13,  2
+	rgb  7,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $27, $00, $00, $00, $00, $00, $22
 	db $00, $21, $40, $80, $80, $00, $5d, $1d, $40, $40, $80, $80, $99, $40, $40, $40
@@ -7461,21 +7810,22 @@ FarfetchdAltLv20CardGfx::
 	INCBIN "gfx/cards/farfetchd_alt_lv20.2bpp"
 FarfetchdAltLv20CardGfxExtra::
 	INCBIN "gfx/cards/farfetchd_alt_lv20_extra.2bpp"
+
 KangaskhanLv38CardGfx::
-	rgb 31,31,5
-	rgb 31,18,0
-	rgb 17,11,0
-	rgb 0,0,0
+	rgb 31, 31,  5
+	rgb 31, 18,  0
+	rgb 17, 11,  0
+	rgb  0,  0,  0
 
-	rgb 27,31,16
-	rgb 31,17,0
-	rgb 0,17,0
-	rgb 0,0,0
+	rgb 27, 31, 16
+	rgb 31, 17,  0
+	rgb  0, 17,  0
+	rgb  0,  0,  0
 
-	rgb 22,28,31
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 0,0,0
+	rgb 22, 28, 31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $00, $00, $80, $80, $80, $80, $80, $80, $00, $40, $40, $00, $80
 	db $00, $00, $00, $00, $00, $00, $00, $80, $18, $00, $00, $40, $00, $00, $00, $00
@@ -7483,21 +7833,22 @@ KangaskhanLv38CardGfx::
 	INCBIN "gfx/cards/kangaskhan_lv38.2bpp"
 KangaskhanLv38CardGfxExtra::
 	INCBIN "gfx/cards/kangaskhan_lv38_extra.2bpp"
+
 DiglettLv16CardGfx::
-	rgb 31,31,31
-	rgb 30,0,21
-	rgb 20,10,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 30,  0, 21
+	rgb 20, 10,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 25,21,0
-	rgb 20,10,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 25, 21,  0
+	rgb 20, 10,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 13,21,31
-	rgb 30,0,21
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 13, 21, 31
+	rgb 30,  0, 21
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $ad, $80, $80, $80, $80, $80, $a8, $80, $80, $80, $80, $80, $a3
 	db $80, $80, $80, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $00, $00
@@ -7505,21 +7856,22 @@ DiglettLv16CardGfx::
 	INCBIN "gfx/cards/diglett_lv16.2bpp"
 DiglettLv16CardGfxExtra::
 	INCBIN "gfx/cards/diglett_lv16_extra.2bpp"
+
 DugtrioLv40CardGfx::
-	rgb 28,26,2
-	rgb 28,11,0
-	rgb 19,7,0
-	rgb 0,0,0
+	rgb 28, 26,  2
+	rgb 28, 11,  0
+	rgb 19,  7,  0
+	rgb  0,  0,  0
 
-	rgb 28,26,2
-	rgb 20,22,0
-	rgb 28,11,0
-	rgb 0,0,0
+	rgb 28, 26,  2
+	rgb 20, 22,  0
+	rgb 28, 11,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,20
-	rgb 26,18,0
-	rgb 19,7,0
-	rgb 0,0,0
+	rgb 31, 31, 20
+	rgb 26, 18,  0
+	rgb 19,  7,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $40, $62, $62
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
@@ -7527,41 +7879,43 @@ DugtrioLv40CardGfx::
 	INCBIN "gfx/cards/dugtrio_lv40.2bpp"
 DugtrioLv40CardGfxExtra::
 	INCBIN "gfx/cards/dugtrio_lv40_extra.2bpp"
+
 DragoniteLv43CardGfx::
-	rgb 31,31,31
-	rgb 7,17,31
-	rgb 27,12,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  7, 17, 31
+	rgb 27, 12,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 19,19,19
-	rgb 12,12,12
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 19, 19
+	rgb 12, 12, 12
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 19,19,19
-	rgb 27,12,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 19, 19
+	rgb 27, 12,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $80, $80, $80, $80, $00, $80, $00, $00
 	db $40, $40, $80, $80, $80, $80, $80, $40, $40, $40, $40, $40, $40, $40, $40, $40
 	INCBIN "gfx/cards/dragonite_lv43.2bpp"
+
 MagikarpLv10CardGfx::
-	rgb 31,31,31
-	rgb 18,18,31
-	rgb 8,8,26
-	rgb 0,0,13
+	rgb 31, 31, 31
+	rgb 18, 18, 31
+	rgb  8,  8, 26
+	rgb  0,  0, 13
 
-	rgb 31,31,31
-	rgb 23,6,12
-	rgb 18,22,6
-	rgb 0,0,13
+	rgb 31, 31, 31
+	rgb 23,  6, 12
+	rgb 18, 22,  6
+	rgb  0,  0, 13
 
-	rgb 31,31,31
-	rgb 18,18,31
-	rgb 23,6,12
-	rgb 0,0,13
+	rgb 31, 31, 31
+	rgb 18, 18, 31
+	rgb 23,  6, 12
+	rgb  0,  0, 13
 
 	db $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40, $40
 	db $00, $00, $00, $00, $00, $80, $40, $40, $18, $00, $00, $00, $80, $80, $53, $13
@@ -7569,21 +7923,22 @@ MagikarpLv10CardGfx::
 	INCBIN "gfx/cards/magikarp_lv10.2bpp"
 MagikarpLv10CardGfxExtra::
 	INCBIN "gfx/cards/magikarp_lv10_extra.2bpp"
+
 VenusaurAltLv67CardGfx::
-	rgb 31,19,27
-	rgb 4,27,4
-	rgb 0,16,0
-	rgb 0,6,0
+	rgb 31, 19, 27
+	rgb  4, 27,  4
+	rgb  0, 16,  0
+	rgb  0,  6,  0
 
-	rgb 31,19,27
-	rgb 26,8,20
-	rgb 20,1,12
-	rgb 0,6,0
+	rgb 31, 19, 27
+	rgb 26,  8, 20
+	rgb 20,  1, 12
+	rgb  0,  6,  0
 
-	rgb 31,19,27
-	rgb 20,1,12
-	rgb 0,16,0
-	rgb 0,6,0
+	rgb 31, 19, 27
+	rgb 20,  1, 12
+	rgb  0, 16,  0
+	rgb  0,  6,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $40, $40
 	db $20, $00, $00, $00, $00, $00, $1b, $40, $00, $00, $00, $17, $17, $00, $00, $00
@@ -7591,61 +7946,64 @@ VenusaurAltLv67CardGfx::
 	INCBIN "gfx/cards/venusaur_alt_lv67.2bpp"
 VenusaurAltLv67CardGfxExtra::
 	INCBIN "gfx/cards/venusaur_alt_lv67_extra.2bpp"
+
 CharizardAltLv76CardGfx::
-	rgb 31,31,29
-	rgb 31,22,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 29
+	rgb 31, 22,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 15,27,31
-	rgb 0,12,31
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 15, 27, 31
+	rgb  0, 12, 31
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,22,12
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 22, 12
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $80, $40, $40, $40, $00
 	db $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $00, $00, $40
 	db $40, $40, $00, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/charizard_alt_lv76.2bpp"
+
 BlastoiseAltLv52CardGfx::
-	rgb 31,31,31
-	rgb 10,23,22
-	rgb 0,13,21
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 10, 23, 22
+	rgb  0, 13, 21
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 18,19,11
-	rgb 20,0,5
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 18, 19, 11
+	rgb 20,  0,  5
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 18,19,11
-	rgb 10,13,4
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 18, 19, 11
+	rgb 10, 13,  4
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $80, $80, $40
 	db $00, $00, $00, $00, $80, $40, $80, $80, $00, $00, $00, $00, $00, $80, $80, $00
 	db $00, $00, $00, $80, $00, $00, $00, $80, $00, $40, $80, $80, $00, $00, $00, $00
 	INCBIN "gfx/cards/blastoise_alt_lv52.2bpp"
+
 FlyingPikachuAltLv12CardGfx::
-	rgb 31,24,0
-	rgb 28,8,16
-	rgb 0,16,31
-	rgb 6,6,6
+	rgb 31, 24,  0
+	rgb 28,  8, 16
+	rgb  0, 16, 31
+	rgb  6,  6,  6
 
-	rgb 31,31,31
-	rgb 31,24,0
-	rgb 0,16,31
-	rgb 6,6,6
+	rgb 31, 31, 31
+	rgb 31, 24,  0
+	rgb  0, 16, 31
+	rgb  6,  6,  6
 
-	rgb 15,31,4
-	rgb 28,8,16
-	rgb 0,16,31
-	rgb 6,6,6
+	rgb 15, 31,  4
+	rgb 28,  8, 16
+	rgb  0, 16, 31
+	rgb  6,  6,  6
 
 	db $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $80, $80, $00, $40, $40, $40
 	db $00, $00, $00, $80, $1c, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00
@@ -7653,41 +8011,43 @@ FlyingPikachuAltLv12CardGfx::
 	INCBIN "gfx/cards/flying_pikachu_alt_lv12.2bpp"
 FlyingPikachuAltLv12CardGfxExtra::
 	INCBIN "gfx/cards/flying_pikachu_alt_lv12_extra.2bpp"
+
 TogepiCardGfx::
-	rgb 31,29,23
-	rgb 25,19,9
-	rgb 14,13,4
-	rgb 2,4,2
+	rgb 31, 29, 23
+	rgb 25, 19,  9
+	rgb 14, 13,  4
+	rgb  2,  4,  2
 
-	rgb 31,29,23
-	rgb 25,19,9
-	rgb 12,13,17
-	rgb 2,4,2
+	rgb 31, 29, 23
+	rgb 25, 19,  9
+	rgb 12, 13, 17
+	rgb  2,  4,  2
 
-	rgb 31,29,23
-	rgb 25,19,9
-	rgb 23,9,6
-	rgb 2,4,2
+	rgb 31, 29, 23
+	rgb 25, 19,  9
+	rgb 23,  9,  6
+	rgb  2,  4,  2
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $80, $00, $00, $00, $00, $00, $00, $00, $40, $40, $80, $80, $00, $00
 	db $00, $00, $00, $80, $80, $80, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/togepi.2bpp"
+
 MarillCardGfx::
-	rgb 28,28,31
-	rgb 12,27,31
-	rgb 4,14,26
-	rgb 0,0,6
+	rgb 28, 28, 31
+	rgb 12, 27, 31
+	rgb  4, 14, 26
+	rgb  0,  0,  6
 
-	rgb 28,28,31
-	rgb 12,27,31
-	rgb 24,18,30
-	rgb 0,0,6
+	rgb 28, 28, 31
+	rgb 12, 27, 31
+	rgb 24, 18, 30
+	rgb  0,  0,  6
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $70, $70, $00, $00, $00, $40, $6c, $40, $40, $00, $00, $00, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $15, $00
@@ -7695,61 +8055,64 @@ MarillCardGfx::
 	INCBIN "gfx/cards/marill.2bpp"
 MarillCardGfxExtra::
 	INCBIN "gfx/cards/marill_extra.2bpp"
+
 MankeyAltLv7CardGfx::
-	rgb 31,31,9
-	rgb 31,22,0
-	rgb 20,15,1
-	rgb 9,7,2
+	rgb 31, 31,  9
+	rgb 31, 22,  0
+	rgb 20, 15,  1
+	rgb  9,  7,  2
 
-	rgb 31,31,9
-	rgb 31,22,0
-	rgb 20,5,1
-	rgb 9,7,2
+	rgb 31, 31,  9
+	rgb 31, 22,  0
+	rgb 20,  5,  1
+	rgb  9,  7,  2
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/mankey_alt_lv7.2bpp"
+
 ProfessorOakCardGfx::
-	rgb 31,31,31
-	rgb 31,22,13
-	rgb 18,9,4
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 31, 22, 13
+	rgb 18,  9,  4
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 21,22,13
-	rgb 12,17,8
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 21, 22, 13
+	rgb 12, 17,  8
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 31,22,13
-	rgb 12,0,20
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 31, 22, 13
+	rgb 12,  0, 20
+	rgb  0,  0,  4
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40
 	db $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $40, $00, $00, $40, $40, $40
 	db $40, $40, $00, $80, $80, $40, $40, $40, $40, $40, $80, $80, $80, $00, $40, $40
 	INCBIN "gfx/cards/professor_oak.2bpp"
+
 ImposterProfessorOakCardGfx::
-	rgb 31,27,27
-	rgb 27,17,13
-	rgb 18,0,22
-	rgb 0,0,9
+	rgb 31, 27, 27
+	rgb 27, 17, 13
+	rgb 18,  0, 22
+	rgb  0,  0,  9
 
-	rgb 31,27,27
-	rgb 24,24,16
-	rgb 18,0,22
-	rgb 0,0,9
+	rgb 31, 27, 27
+	rgb 24, 24, 16
+	rgb 18,  0, 22
+	rgb  0,  0,  9
 
-	rgb 31,27,27
-	rgb 24,24,16
-	rgb 21,13,28
-	rgb 0,0,9
+	rgb 31, 27, 27
+	rgb 24, 24, 16
+	rgb 21, 13, 28
+	rgb  0,  0,  9
 
 	db $80, $40, $40, $40, $40, $40, $80, $80, $40, $40, $40, $00, $00, $40, $80, $80
 	db $40, $40, $40, $00, $00, $40, $80, $80, $80, $40, $40, $00, $00, $80, $80, $80
@@ -7757,84 +8120,89 @@ ImposterProfessorOakCardGfx::
 	INCBIN "gfx/cards/imposter_professor_oak.2bpp"
 ImposterProfessorOakCardGfxExtra::
 	INCBIN "gfx/cards/imposter_professor_oak_extra.2bpp"
-	ds $1d0, $00
 
-SECTION "Card Gfx 32", ROMX[$4000], BANK[$32]
+	ds $1d0
+
+SECTION "Card Gfx 22", ROMX
+
 BillCardGfx::
-	rgb 31,31,22
-	rgb 27,4,0
-	rgb 18,9,27
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 27,  4,  0
+	rgb 18,  9, 27
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 27,4,0
-	rgb 14,2,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 27,  4,  0
+	rgb 14,  2,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 27,4,0
-	rgb 16,16,11
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 27,  4,  0
+	rgb 16, 16, 11
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
 	db $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40, $80, $80, $00, $40, $40
 	db $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/bill.2bpp"
+
 MrFujiCardGfx::
-	rgb 31,27,22
-	rgb 31,18,9
-	rgb 27,0,9
-	rgb 4,0,4
+	rgb 31, 27, 22
+	rgb 31, 18,  9
+	rgb 27,  0,  9
+	rgb  4,  0,  4
 
-	rgb 31,27,22
-	rgb 24,20,14
-	rgb 21,0,29
-	rgb 4,0,4
+	rgb 31, 27, 22
+	rgb 24, 20, 14
+	rgb 21,  0, 29
+	rgb  4,  0,  4
 
-	rgb 31,27,22
-	rgb 31,18,9
-	rgb 21,0,29
-	rgb 4,0,4
+	rgb 31, 27, 22
+	rgb 31, 18,  9
+	rgb 21,  0, 29
+	rgb  4,  0,  4
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $40, $40, $80, $80, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/mr_fuji.2bpp"
+
 LassCardGfx::
-	rgb 31,31,22
-	rgb 30,18,2
-	rgb 28,4,0
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 30, 18,  2
+	rgb 28,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,22
-	rgb 31,18,2
-	rgb 6,11,24
-	rgb 0,0,0
+	rgb 31, 31, 22
+	rgb 31, 18,  2
+	rgb  6, 11, 24
+	rgb  0,  0,  0
 
-	rgb 31,18,2
-	rgb 28,4,0
-	rgb 16,0,31
-	rgb 0,0,0
+	rgb 31, 18,  2
+	rgb 28,  4,  0
+	rgb 16,  0, 31
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $80, $80
 	db $00, $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $40, $40, $80, $80, $80
 	db $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/lass.2bpp"
+
 ImakuniCardCardGfx::
-	rgb 31,27,22
-	rgb 27,13,4
-	rgb 13,4,0
-	rgb 0,0,0
+	rgb 31, 27, 22
+	rgb 27, 13,  4
+	rgb 13,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,27,22
-	rgb 26,0,10
-	rgb 8,17,22
-	rgb 0,0,0
+	rgb 31, 27, 22
+	rgb 26,  0, 10
+	rgb  8, 17, 22
+	rgb  0,  0,  0
 
-	rgb 31,27,22
-	rgb 27,13,4
-	rgb 26,0,10
-	rgb 0,0,0
+	rgb 31, 27, 22
+	rgb 27, 13,  4
+	rgb 26,  0, 10
+	rgb  0,  0,  0
 
 	db $70, $70, $40, $40, $40, $6d, $6d, $6d, $40, $40, $40, $00, $29, $69, $69, $40
 	db $00, $80, $66, $00, $00, $80, $00, $00, $a1, $80, $80, $00, $00, $80, $1c, $9c
@@ -7842,61 +8210,64 @@ ImakuniCardCardGfx::
 	INCBIN "gfx/cards/imakuni_card.2bpp"
 ImakuniCardCardGfxExtra::
 	INCBIN "gfx/cards/imakuni_card_extra.2bpp"
+
 PokemonTraderCardGfx::
-	rgb 31,31,25
-	rgb 18,27,4
-	rgb 27,9,0
-	rgb 0,0,0
+	rgb 31, 31, 25
+	rgb 18, 27,  4
+	rgb 27,  9,  0
+	rgb  0,  0,  0
 
-	rgb 31,27,18
-	rgb 12,13,2
-	rgb 31,17,3
-	rgb 0,0,0
+	rgb 31, 27, 18
+	rgb 12, 13,  2
+	rgb 31, 17,  3
+	rgb  0,  0,  0
 
-	rgb 31,31,25
-	rgb 18,27,4
-	rgb 8,23,0
-	rgb 0,0,0
+	rgb 31, 31, 25
+	rgb 18, 27,  4
+	rgb  8, 23,  0
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $80, $40, $80, $80, $80, $80
 	db $80, $80, $80, $00, $00, $80, $80, $80, $80, $80, $80, $80, $00, $80, $80, $80
 	db $80, $80, $80, $00, $00, $00, $80, $80, $80, $80, $80, $00, $00, $80, $80, $80
 	INCBIN "gfx/cards/pokemon_trader.2bpp"
+
 PokemonBreederCardGfx::
-	rgb 27,31,18
-	rgb 13,22,27
-	rgb 0,18,0
-	rgb 0,9,0
+	rgb 27, 31, 18
+	rgb 13, 22, 27
+	rgb  0, 18,  0
+	rgb  0,  9,  0
 
-	rgb 27,31,18
-	rgb 28,21,5
-	rgb 0,18,0
-	rgb 0,9,0
+	rgb 27, 31, 18
+	rgb 28, 21,  5
+	rgb  0, 18,  0
+	rgb  0,  9,  0
 
-	rgb 27,31,18
-	rgb 13,22,27
-	rgb 26,8,0
-	rgb 0,9,0
+	rgb 27, 31, 18
+	rgb 13, 22, 27
+	rgb 26,  8,  0
+	rgb  0,  9,  0
 
 	db $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00
 	db $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/pokemon_breeder.2bpp"
+
 ClefairyDollCardGfx::
-	rgb 31,25,0
-	rgb 31,9,18
-	rgb 22,4,9
-	rgb 9,0,0
+	rgb 31, 25,  0
+	rgb 31,  9, 18
+	rgb 22,  4,  9
+	rgb  9,  0,  0
 
-	rgb 31,25,0
-	rgb 11,20,0
-	rgb 22,4,9
-	rgb 9,0,0
+	rgb 31, 25,  0
+	rgb 11, 20,  0
+	rgb 22,  4,  9
+	rgb  9,  0,  0
 
-	rgb 31,25,0
-	rgb 22,4,9
-	rgb 13,4,29
-	rgb 9,0,0
+	rgb 31, 25,  0
+	rgb 22,  4,  9
+	rgb 13,  4, 29
+	rgb  9,  0,  0
 
 	db $00, $00, $00, $2d, $00, $00, $00, $00, $00, $28, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $80, $80, $40, $40, $00, $00, $00, $00, $00, $00
@@ -7904,41 +8275,43 @@ ClefairyDollCardGfx::
 	INCBIN "gfx/cards/clefairy_doll.2bpp"
 ClefairyDollCardGfxExtra::
 	INCBIN "gfx/cards/clefairy_doll_extra.2bpp"
+
 MysteriousFossilCardGfx::
-	rgb 31,27,22
-	rgb 27,13,9
-	rgb 13,4,0
-	rgb 4,0,0
+	rgb 31, 27, 22
+	rgb 27, 13,  9
+	rgb 13,  4,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,22
-	rgb 19,13,21
-	rgb 10,2,9
-	rgb 4,0,0
+	rgb 31, 27, 22
+	rgb 19, 13, 21
+	rgb 10,  2,  9
+	rgb  4,  0,  0
 
-	rgb 31,27,22
-	rgb 15,22,9
-	rgb 12,7,0
-	rgb 4,0,0
+	rgb 31, 27, 22
+	rgb 15, 22,  9
+	rgb 12,  7,  0
+	rgb  4,  0,  0
 
 	db $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $00, $00, $80, $80, $80, $80
 	db $00, $00, $00, $00, $80, $80, $00, $80, $00, $00, $00, $00, $00, $40, $40, $40
 	db $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40, $40, $00
 	INCBIN "gfx/cards/mysterious_fossil.2bpp"
+
 EnergyRetrievalCardGfx::
-	rgb 31,31,31
-	rgb 13,22,18
-	rgb 13,0,19
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 13, 22, 18
+	rgb 13,  0, 19
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 31,2,8
-	rgb 14,0,19
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 31,  2,  8
+	rgb 14,  0, 19
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 13,22,18
-	rgb 13,0,19
-	rgb 31,2,8
+	rgb 31, 31, 31
+	rgb 13, 22, 18
+	rgb 13,  0, 19
+	rgb 31,  2,  8
 
 	db $40, $00, $2e, $2e, $2e, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00
 	db $40, $80, $00, $00, $00, $00, $00, $00, $40, $80, $80, $00, $00, $00, $00, $00
@@ -7946,41 +8319,43 @@ EnergyRetrievalCardGfx::
 	INCBIN "gfx/cards/energy_retrieval.2bpp"
 EnergyRetrievalCardGfxExtra::
 	INCBIN "gfx/cards/energy_retrieval_extra.2bpp"
+
 SuperEnergyRetrievalCardGfx::
-	rgb 31,27,31
-	rgb 21,12,29
-	rgb 22,0,13
-	rgb 0,0,4
+	rgb 31, 27, 31
+	rgb 21, 12, 29
+	rgb 22,  0, 13
+	rgb  0,  0,  4
 
-	rgb 31,27,31
-	rgb 21,21,29
-	rgb 22,0,13
-	rgb 0,0,4
+	rgb 31, 27, 31
+	rgb 21, 21, 29
+	rgb 22,  0, 13
+	rgb  0,  0,  4
 
-	rgb 31,27,31
-	rgb 21,12,29
-	rgb 13,13,13
-	rgb 0,0,4
+	rgb 31, 27, 31
+	rgb 21, 12, 29
+	rgb 13, 13, 13
+	rgb  0,  0,  4
 
 	db $80, $80, $40, $40, $80, $00, $40, $40, $80, $80, $40, $40, $00, $00, $80, $80
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/super_energy_retrieval.2bpp"
+
 EnergySearchCardGfx::
-	rgb 27,31,31
-	rgb 0,22,31
-	rgb 4,13,13
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb  0, 22, 31
+	rgb  4, 13, 13
+	rgb  0,  0,  0
 
-	rgb 27,31,31
-	rgb 0,22,31
-	rgb 27,29,0
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb  0, 22, 31
+	rgb 27, 29,  0
+	rgb  0,  0,  0
 
-	rgb 27,31,31
-	rgb 0,22,31
-	rgb 21,1,0
-	rgb 0,0,0
+	rgb 27, 31, 31
+	rgb  0, 22, 31
+	rgb 21,  1,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $80, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $00
 	db $00, $40, $40, $00, $40, $00, $00, $00, $00, $00, $16, $16, $40, $40, $00, $00
@@ -7988,21 +8363,22 @@ EnergySearchCardGfx::
 	INCBIN "gfx/cards/energy_search.2bpp"
 EnergySearchCardGfxExtra::
 	INCBIN "gfx/cards/energy_search_extra.2bpp"
+
 EnergyRemovalCardGfx::
-	rgb 27,31,31
-	rgb 9,22,22
-	rgb 9,14,14
-	rgb 0,0,4
+	rgb 27, 31, 31
+	rgb  9, 22, 22
+	rgb  9, 14, 14
+	rgb  0,  0,  4
 
-	rgb 9,14,14
-	rgb 9,22,22
-	rgb 4,9,9
-	rgb 0,0,4
+	rgb  9, 14, 14
+	rgb  9, 22, 22
+	rgb  4,  9,  9
+	rgb  0,  0,  4
 
-	rgb 27,31,31
-	rgb 9,22,22
-	rgb 4,9,9
-	rgb 0,0,4
+	rgb 27, 31, 31
+	rgb  9, 22, 22
+	rgb  4,  9,  9
+	rgb  0,  0,  4
 
 	db $80, $af, $80, $80, $ad, $ad, $80, $ac, $40, $40, $6a, $6a, $80, $a9, $40, $40
 	db $00, $26, $00, $25, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
@@ -8010,21 +8386,22 @@ EnergyRemovalCardGfx::
 	INCBIN "gfx/cards/energy_removal.2bpp"
 EnergyRemovalCardGfxExtra::
 	INCBIN "gfx/cards/energy_removal_extra.2bpp"
+
 SuperEnergyRemovalCardGfx::
-	rgb 31,27,0
-	rgb 31,4,0
-	rgb 13,4,18
-	rgb 4,0,4
+	rgb 31, 27,  0
+	rgb 31,  4,  0
+	rgb 13,  4, 18
+	rgb  4,  0,  4
 
-	rgb 22,31,0
-	rgb 0,21,12
-	rgb 13,4,18
-	rgb 4,0,4
+	rgb 22, 31,  0
+	rgb  0, 21, 12
+	rgb 13,  4, 18
+	rgb  4,  0,  4
 
-	rgb 31,27,0
-	rgb 31,4,0
-	rgb 13,4,18
-	rgb 0,21,12
+	rgb 31, 27,  0
+	rgb 31,  4,  0
+	rgb 13,  4, 18
+	rgb  0, 21, 12
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $80, $80, $80, $a3, $00, $00
 	db $00, $00, $00, $1e, $00, $40, $00, $00, $00, $19, $00, $18, $80, $40, $00, $00
@@ -8032,21 +8409,22 @@ SuperEnergyRemovalCardGfx::
 	INCBIN "gfx/cards/super_energy_removal.2bpp"
 SuperEnergyRemovalCardGfxExtra::
 	INCBIN "gfx/cards/super_energy_removal_extra.2bpp"
+
 SwitchCardGfx::
-	rgb 31,27,27
-	rgb 31,18,4
-	rgb 27,4,9
-	rgb 9,0,9
+	rgb 31, 27, 27
+	rgb 31, 18,  4
+	rgb 27,  4,  9
+	rgb  9,  0,  9
 
-	rgb 31,27,27
-	rgb 31,18,4
-	rgb 0,19,0
-	rgb 9,0,9
+	rgb 31, 27, 27
+	rgb 31, 18,  4
+	rgb  0, 19,  0
+	rgb  9,  0,  9
 
-	rgb 31,27,27
-	rgb 19,0,31
-	rgb 27,4,9
-	rgb 9,0,9
+	rgb 31, 27, 27
+	rgb 19,  0, 31
+	rgb 27,  4,  9
+	rgb  9,  0,  9
 
 	db $00, $2f, $2f, $00, $00, $00, $00, $2b, $6b, $40, $40, $40, $40, $27, $27, $00
 	db $40, $40, $40, $63, $a3, $00, $00, $00, $00, $9f, $9f, $80, $80, $80, $80, $80
@@ -8054,21 +8432,22 @@ SwitchCardGfx::
 	INCBIN "gfx/cards/switch.2bpp"
 SwitchCardGfxExtra::
 	INCBIN "gfx/cards/switch_extra.2bpp"
+
 PokemonCenterCardGfx::
-	rgb 22,31,22
-	rgb 31,0,0
-	rgb 4,22,9
-	rgb 0,4,0
+	rgb 22, 31, 22
+	rgb 31,  0,  0
+	rgb  4, 22,  9
+	rgb  0,  4,  0
 
-	rgb 22,31,22
-	rgb 31,19,0
-	rgb 4,22,9
-	rgb 0,4,0
+	rgb 22, 31, 22
+	rgb 31, 19,  0
+	rgb  4, 22,  9
+	rgb  0,  4,  0
 
-	rgb 22,31,22
-	rgb 31,0,0
-	rgb 31,19,0
-	rgb 0,4,0
+	rgb 22, 31, 22
+	rgb 31,  0,  0
+	rgb 31, 19,  0
+	rgb  0,  4,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $29, $80, $00, $00, $00, $80, $a4, $00, $00
 	db $22, $00, $00, $00, $40, $40, $00, $00, $00, $00, $99, $00, $00, $00, $00, $40
@@ -8076,21 +8455,22 @@ PokemonCenterCardGfx::
 	INCBIN "gfx/cards/pokemon_center.2bpp"
 PokemonCenterCardGfxExtra::
 	INCBIN "gfx/cards/pokemon_center_extra.2bpp"
+
 PokeballCardGfx::
-	rgb 31,31,27
-	rgb 27,0,0
-	rgb 9,0,18
-	rgb 0,0,4
+	rgb 31, 31, 27
+	rgb 27,  0,  0
+	rgb  9,  0, 18
+	rgb  0,  0,  4
 
-	rgb 31,31,27
-	rgb 19,14,31
-	rgb 9,0,18
-	rgb 0,0,4
+	rgb 31, 31, 27
+	rgb 19, 14, 31
+	rgb  9,  0, 18
+	rgb  0,  0,  4
 
-	rgb 31,31,27
-	rgb 14,11,31
-	rgb 9,0,18
-	rgb 0,0,4
+	rgb 31, 31, 27
+	rgb 14, 11, 31
+	rgb  9,  0, 18
+	rgb  0,  0,  4
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $80, $80, $00, $80, $80, $40, $00, $00, $80, $80
@@ -8098,21 +8478,22 @@ PokeballCardGfx::
 	INCBIN "gfx/cards/pokeball.2bpp"
 PokeballCardGfxExtra::
 	INCBIN "gfx/cards/pokeball_extra.2bpp"
+
 ScoopUpCardGfx::
-	rgb 31,31,31
-	rgb 18,17,9
-	rgb 8,3,18
-	rgb 4,0,4
+	rgb 31, 31, 31
+	rgb 18, 17,  9
+	rgb  8,  3, 18
+	rgb  4,  0,  4
 
-	rgb 31,31,31
-	rgb 17,13,27
-	rgb 8,3,18
-	rgb 4,0,4
+	rgb 31, 31, 31
+	rgb 17, 13, 27
+	rgb  8,  3, 18
+	rgb  4,  0,  4
 
-	rgb 31,31,31
-	rgb 8,3,18
-	rgb 25,10,5
-	rgb 4,0,4
+	rgb 31, 31, 31
+	rgb  8,  3, 18
+	rgb 25, 10,  5
+	rgb  4,  0,  4
 
 	db $40, $40, $40, $40, $40, $40, $40, $69, $69, $80, $00, $00, $40, $40, $64, $40
 	db $40, $80, $00, $00, $40, $40, $40, $80, $00, $00, $00, $00, $40, $40, $40, $40
@@ -8120,64 +8501,68 @@ ScoopUpCardGfx::
 	INCBIN "gfx/cards/scoop_up.2bpp"
 ScoopUpCardGfxExtra::
 	INCBIN "gfx/cards/scoop_up_extra.2bpp"
+
 ComputerSearchCardGfx::
-	rgb 22,27,31
-	rgb 9,27,18
-	rgb 0,18,4
-	rgb 0,0,4
+	rgb 22, 27, 31
+	rgb  9, 27, 18
+	rgb  0, 18,  4
+	rgb  0,  0,  4
 
-	rgb 22,27,31
-	rgb 31,0,0
-	rgb 0,18,4
-	rgb 0,0,4
+	rgb 22, 27, 31
+	rgb 31,  0,  0
+	rgb  0, 18,  4
+	rgb  0,  0,  4
 
-	rgb 22,27,31
-	rgb 9,24,27
-	rgb 0,14,20
-	rgb 0,0,4
+	rgb 22, 27, 31
+	rgb  9, 24, 27
+	rgb  0, 14, 20
+	rgb  0,  0,  4
 
 	db $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00
 	db $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $80, $80, $80, $80, $80, $80
 	db $00, $80, $80, $80, $80, $40, $00, $00, $00, $00, $00, $00, $00, $40, $00, $00
 	INCBIN "gfx/cards/computer_search.2bpp"
-	ds $f0, $00
 
-SECTION "Card Gfx 33", ROMX[$4000], BANK[$33]
+	ds $f0
+
+SECTION "Card Gfx 23", ROMX
+
 PokedexCardGfx::
-	rgb 27,31,31
-	rgb 31,0,0
-	rgb 9,13,18
-	rgb 0,0,4
+	rgb 27, 31, 31
+	rgb 31,  0,  0
+	rgb  9, 13, 18
+	rgb  0,  0,  4
 
-	rgb 27,31,31
-	rgb 31,0,0
-	rgb 3,19,0
-	rgb 0,0,4
+	rgb 27, 31, 31
+	rgb 31,  0,  0
+	rgb  3, 19,  0
+	rgb  0,  0,  4
 
-	rgb 31,31,0
-	rgb 31,0,0
-	rgb 9,13,18
-	rgb 0,0,4
+	rgb 31, 31,  0
+	rgb 31,  0,  0
+	rgb  9, 13, 18
+	rgb  0,  0,  4
 
 	db $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $40, $40, $40, $00, $00, $80, $00, $00, $40, $40, $40, $00, $00, $40, $00
 	db $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/pokedex.2bpp"
+
 PlusPowerCardGfx::
-	rgb 31,27,27
-	rgb 31,0,4
-	rgb 18,0,0
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 31,  0,  4
+	rgb 18,  0,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,0
-	rgb 31,0,4
-	rgb 31,13,0
-	rgb 4,0,0
+	rgb 31, 27,  0
+	rgb 31,  0,  4
+	rgb 31, 13,  0
+	rgb  4,  0,  0
 
-	rgb 31,27,27
-	rgb 31,6,22
-	rgb 18,0,10
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 31,  6, 22
+	rgb 18,  0, 10
+	rgb  4,  0,  0
 
 	db $70, $70, $00, $00, $00, $00, $2c, $2c, $40, $80, $80, $00, $28, $28, $00, $00
 	db $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $00, $00, $80, $80, $80, $80
@@ -8185,21 +8570,22 @@ PlusPowerCardGfx::
 	INCBIN "gfx/cards/plus_power.2bpp"
 PlusPowerCardGfxExtra::
 	INCBIN "gfx/cards/plus_power_extra.2bpp"
+
 DefenderCardGfx::
-	rgb 27,27,31
-	rgb 18,0,27
-	rgb 9,0,18
-	rgb 0,0,4
+	rgb 27, 27, 31
+	rgb 18,  0, 27
+	rgb  9,  0, 18
+	rgb  0,  0,  4
 
-	rgb 31,31,5
-	rgb 0,20,31
-	rgb 0,4,31
-	rgb 0,0,4
+	rgb 31, 31,  5
+	rgb  0, 20, 31
+	rgb  0,  4, 31
+	rgb  0,  0,  4
 
-	rgb 27,27,31
-	rgb 31,31,5
-	rgb 0,20,31
-	rgb 0,0,4
+	rgb 27, 27, 31
+	rgb 31, 31,  5
+	rgb  0, 20, 31
+	rgb  0,  0,  4
 
 	db $70, $80, $80, $00, $00, $00, $00, $2a, $40, $80, $80, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $40, $40, $40, $40
@@ -8207,61 +8593,64 @@ DefenderCardGfx::
 	INCBIN "gfx/cards/defender.2bpp"
 DefenderCardGfxExtra::
 	INCBIN "gfx/cards/defender_extra.2bpp"
+
 ItemFinderCardGfx::
-	rgb 31,31,7
-	rgb 22,18,9
-	rgb 9,0,22
-	rgb 0,0,4
+	rgb 31, 31,  7
+	rgb 22, 18,  9
+	rgb  9,  0, 22
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 3,19,31
-	rgb 9,0,22
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb  3, 19, 31
+	rgb  9,  0, 22
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 31,3,0
-	rgb 9,0,22
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 31,  3,  0
+	rgb  9,  0, 22
+	rgb  0,  0,  4
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $40, $40, $40, $80
 	db $00, $00, $00, $00, $40, $40, $40, $80, $00, $00, $00, $00, $80, $40, $40, $80
 	db $00, $00, $00, $00, $00, $40, $40, $80, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/item_finder.2bpp"
+
 GustOfWindCardGfx::
-	rgb 31,27,27
-	rgb 22,13,9
-	rgb 13,4,18
-	rgb 4,0,4
+	rgb 31, 27, 27
+	rgb 22, 13,  9
+	rgb 13,  4, 18
+	rgb  4,  0,  4
 
-	rgb 31,27,27
-	rgb 18,16,31
-	rgb 9,0,31
-	rgb 4,0,4
+	rgb 31, 27, 27
+	rgb 18, 16, 31
+	rgb  9,  0, 31
+	rgb  4,  0,  4
 
-	rgb 31,27,27
-	rgb 22,13,9
-	rgb 9,0,31
-	rgb 4,0,4
+	rgb 31, 27, 27
+	rgb 22, 13,  9
+	rgb  9,  0, 31
+	rgb  4,  0,  4
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $00, $00, $40, $40, $40
 	db $40, $40, $40, $00, $00, $40, $40, $40, $40, $40, $40, $40, $00, $40, $40, $40
 	db $40, $40, $00, $00, $00, $40, $40, $40, $40, $40, $40, $80, $80, $40, $40, $40
 	INCBIN "gfx/cards/gust_of_wind.2bpp"
+
 DevolutionSprayCardGfx::
-	rgb 31,27,0
-	rgb 31,13,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 27,  0
+	rgb 31, 13,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,27,0
-	rgb 31,13,0
-	rgb 16,4,0
-	rgb 0,0,0
+	rgb 31, 27,  0
+	rgb 31, 13,  0
+	rgb 16,  4,  0
+	rgb  0,  0,  0
 
-	rgb 27,27,25
-	rgb 18,18,17
-	rgb 16,4,0
-	rgb 0,0,0
+	rgb 27, 27, 25
+	rgb 18, 18, 17
+	rgb 16,  4,  0
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $80, $80, $6b, $40, $40, $00, $00, $00, $a6, $80, $00, $00, $00
 	db $00, $21, $00, $00, $00, $00, $00, $1c, $40, $40, $40, $00, $00, $17, $40, $40
@@ -8269,21 +8658,22 @@ DevolutionSprayCardGfx::
 	INCBIN "gfx/cards/devolution_spray.2bpp"
 DevolutionSprayCardGfxExtra::
 	INCBIN "gfx/cards/devolution_spray_extra.2bpp"
+
 PotionCardGfx::
-	rgb 31,31,31
-	rgb 22,27,27
-	rgb 18,9,27
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 22, 27, 27
+	rgb 18,  9, 27
+	rgb  0,  0,  4
 
-	rgb 11,9,23
-	rgb 22,27,27
-	rgb 0,20,0
-	rgb 0,0,4
+	rgb 11,  9, 23
+	rgb 22, 27, 27
+	rgb  0, 20,  0
+	rgb  0,  0,  4
 
-	rgb 31,31,31
-	rgb 22,27,27
-	rgb 0,20,0
-	rgb 0,0,4
+	rgb 31, 31, 31
+	rgb 22, 27, 27
+	rgb  0, 20,  0
+	rgb  0,  0,  4
 
 	db $70, $70, $70, $00, $40, $40, $6d, $6d, $6d, $40, $40, $00, $2a, $6a, $40, $40
 	db $40, $40, $a6, $00, $00, $40, $40, $40, $61, $40, $00, $00, $00, $40, $5c, $5c
@@ -8291,21 +8681,22 @@ PotionCardGfx::
 	INCBIN "gfx/cards/potion.2bpp"
 PotionCardGfxExtra::
 	INCBIN "gfx/cards/potion_extra.2bpp"
+
 SuperPotionCardGfx::
-	rgb 31,31,27
-	rgb 31,22,4
-	rgb 31,4,0
-	rgb 4,0,0
+	rgb 31, 31, 27
+	rgb 31, 22,  4
+	rgb 31,  4,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,27
-	rgb 16,0,0
-	rgb 31,4,0
-	rgb 4,0,0
+	rgb 31, 31, 27
+	rgb 16,  0,  0
+	rgb 31,  4,  0
+	rgb  4,  0,  0
 
-	rgb 31,15,0
-	rgb 31,22,4
-	rgb 31,4,0
-	rgb 4,0,0
+	rgb 31, 15,  0
+	rgb 31, 22,  4
+	rgb 31,  4,  0
+	rgb  4,  0,  0
 
 	db $70, $70, $30, $30, $70, $40, $40, $6e, $6e, $6e, $6e, $00, $00, $6c, $6c, $40
 	db $6b, $6b, $00, $00, $80, $40, $67, $67, $67, $67, $00, $80, $00, $40, $63, $63
@@ -8313,21 +8704,22 @@ SuperPotionCardGfx::
 	INCBIN "gfx/cards/super_potion.2bpp"
 SuperPotionCardGfxExtra::
 	INCBIN "gfx/cards/super_potion_extra.2bpp"
+
 FullHealCardGfx::
-	rgb 31,27,27
-	rgb 31,0,0
-	rgb 0,18,0
-	rgb 9,0,0
+	rgb 31, 27, 27
+	rgb 31,  0,  0
+	rgb  0, 18,  0
+	rgb  9,  0,  0
 
-	rgb 31,27,27
-	rgb 31,11,11
-	rgb 0,18,0
-	rgb 9,0,0
+	rgb 31, 27, 27
+	rgb 31, 11, 11
+	rgb  0, 18,  0
+	rgb  9,  0,  0
 
-	rgb 31,27,27
-	rgb 31,11,11
-	rgb 31,0,0
-	rgb 9,0,0
+	rgb 31, 27, 27
+	rgb 31, 11, 11
+	rgb 31,  0,  0
+	rgb  9,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $80, $40, $21
 	db $21, $00, $00, $00, $1e, $5e, $40, $00, $00, $00, $1a, $1a, $00, $00, $00, $00
@@ -8335,21 +8727,22 @@ FullHealCardGfx::
 	INCBIN "gfx/cards/full_heal.2bpp"
 FullHealCardGfxExtra::
 	INCBIN "gfx/cards/full_heal_extra.2bpp"
+
 ReviveCardGfx::
-	rgb 31,31,20
-	rgb 31,4,13
-	rgb 31,23,0
-	rgb 4,0,0
+	rgb 31, 31, 20
+	rgb 31,  4, 13
+	rgb 31, 23,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,20
-	rgb 31,23,0
-	rgb 31,9,0
-	rgb 4,0,0
+	rgb 31, 31, 20
+	rgb 31, 23,  0
+	rgb 31,  9,  0
+	rgb  4,  0,  0
 
-	rgb 31,23,0
-	rgb 31,4,13
-	rgb 31,9,0
-	rgb 4,0,0
+	rgb 31, 23,  0
+	rgb 31,  4, 13
+	rgb 31,  9,  0
+	rgb  4,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $67, $00, $26, $80, $65, $65, $65
 	db $40, $64, $00, $a3, $00, $62, $62, $40, $40, $00, $1f, $1f, $1f, $00, $80, $40
@@ -8357,41 +8750,43 @@ ReviveCardGfx::
 	INCBIN "gfx/cards/revive.2bpp"
 ReviveCardGfxExtra::
 	INCBIN "gfx/cards/revive_extra.2bpp"
+
 MaintenanceCardGfx::
-	rgb 27,31,27
-	rgb 31,0,0
-	rgb 0,18,4
-	rgb 0,0,0
+	rgb 27, 31, 27
+	rgb 31,  0,  0
+	rgb  0, 18,  4
+	rgb  0,  0,  0
 
-	rgb 27,31,27
-	rgb 7,21,21
-	rgb 0,18,4
-	rgb 0,0,0
+	rgb 27, 31, 27
+	rgb  7, 21, 21
+	rgb  0, 18,  4
+	rgb  0,  0,  0
 
-	rgb 27,31,27
-	rgb 1,0,31
-	rgb 0,18,4
-	rgb 0,0,0
+	rgb 27, 31, 27
+	rgb  1,  0, 31
+	rgb  0, 18,  4
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $80, $40, $40, $00, $00
 	db $00, $00, $80, $80, $80, $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00
 	db $00, $00, $00, $80, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/maintenance.2bpp"
+
 PokemonFluteCardGfx::
-	rgb 31,31,22
-	rgb 31,22,0
-	rgb 31,0,0
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 31, 22,  0
+	rgb 31,  0,  0
+	rgb  4,  0,  0
 
-	rgb 31,31,22
-	rgb 21,21,20
-	rgb 16,16,15
-	rgb 4,0,0
+	rgb 31, 31, 22
+	rgb 21, 21, 20
+	rgb 16, 16, 15
+	rgb  4,  0,  0
 
-	rgb 21,21,20
-	rgb 31,22,0
-	rgb 31,0,0
-	rgb 4,0,0
+	rgb 21, 21, 20
+	rgb 31, 22,  0
+	rgb 31,  0,  0
+	rgb  4,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $67, $67, $40, $40, $80, $a4, $64
 	db $40, $40, $80, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $40, $55
@@ -8399,41 +8794,43 @@ PokemonFluteCardGfx::
 	INCBIN "gfx/cards/pokemon_flute.2bpp"
 PokemonFluteCardGfxExtra::
 	INCBIN "gfx/cards/pokemon_flute_extra.2bpp"
+
 GamblerCardGfx::
-	rgb 29,29,26
-	rgb 24,23,14
-	rgb 0,9,0
-	rgb 0,0,0
+	rgb 29, 29, 26
+	rgb 24, 23, 14
+	rgb  0,  9,  0
+	rgb  0,  0,  0
 
-	rgb 29,29,26
-	rgb 24,23,14
-	rgb 31,5,0
-	rgb 0,0,0
+	rgb 29, 29, 26
+	rgb 24, 23, 14
+	rgb 31,  5,  0
+	rgb  0,  0,  0
 
-	rgb 29,29,26
-	rgb 24,23,14
-	rgb 11,11,9
-	rgb 0,0,0
+	rgb 29, 29, 26
+	rgb 24, 23, 14
+	rgb 11, 11,  9
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $80, $00, $00, $00, $00, $00
 	db $00, $00, $80, $80, $80, $40, $80, $00, $00, $00, $00, $00, $00, $80, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/gambler.2bpp"
+
 RecycleCardGfx::
-	rgb 31,27,27
-	rgb 31,13,22
-	rgb 4,18,4
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 31, 13, 22
+	rgb  4, 18,  4
+	rgb  4,  0,  0
 
-	rgb 31,27,27
-	rgb 31,13,22
-	rgb 8,22,8
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 31, 13, 22
+	rgb  8, 22,  8
+	rgb  4,  0,  0
 
-	rgb 31,27,27
-	rgb 31,13,22
-	rgb 1,15,1
-	rgb 4,0,0
+	rgb 31, 27, 27
+	rgb 31, 13, 22
+	rgb  1, 15,  1
+	rgb  4,  0,  0
 
 	db $70, $70, $40, $40, $40, $40, $6c, $6c, $40, $40, $40, $40, $68, $68, $40, $40
 	db $00, $00, $24, $24, $00, $00, $00, $00, $a0, $a0, $80, $00, $00, $80, $9c, $9c
@@ -8441,21 +8838,22 @@ RecycleCardGfx::
 	INCBIN "gfx/cards/recycle.2bpp"
 RecycleCardGfxExtra::
 	INCBIN "gfx/cards/recycle_extra.2bpp"
+
 ChallengeCardGfx::
-	rgb 31,31,10
-	rgb 5,23,0
-	rgb 10,10,10
-	rgb 0,0,0
+	rgb 31, 31, 10
+	rgb  5, 23,  0
+	rgb 10, 10, 10
+	rgb  0,  0,  0
 
-	rgb 31,31,10
-	rgb 31,16,0
-	rgb 10,10,10
-	rgb 5,23,0
+	rgb 31, 31, 10
+	rgb 31, 16,  0
+	rgb 10, 10, 10
+	rgb  5, 23,  0
 
-	rgb 31,31,10
-	rgb 31,16,0
-	rgb 10,10,10
-	rgb 0,0,0
+	rgb 31, 31, 10
+	rgb 31, 16,  0
+	rgb 10, 10, 10
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $23, $00, $00
 	db $00, $80, $9f, $9f, $80, $80, $80, $00, $00, $80, $80, $80, $80, $80, $80, $80
@@ -8463,21 +8861,22 @@ ChallengeCardGfx::
 	INCBIN "gfx/cards/challenge.2bpp"
 ChallengeCardGfxExtra::
 	INCBIN "gfx/cards/challenge_extra.2bpp"
+
 ImposterOaksRevengeCardGfx::
-	rgb 30,24,17
-	rgb 20,16,21
-	rgb 14,6,14
-	rgb 6,0,6
+	rgb 30, 24, 17
+	rgb 20, 16, 21
+	rgb 14,  6, 14
+	rgb  6,  0,  6
 
-	rgb 30,1,0
-	rgb 20,16,21
-	rgb 14,6,14
-	rgb 6,0,6
+	rgb 30,  1,  0
+	rgb 20, 16, 21
+	rgb 14,  6, 14
+	rgb  6,  0,  6
 
-	rgb 30,16,1
-	rgb 20,16,21
-	rgb 14,6,14
-	rgb 6,0,6
+	rgb 30, 16,  1
+	rgb 20, 16, 21
+	rgb 14,  6, 14
+	rgb  6,  0,  6
 
 	db $00, $00, $00, $2d, $2d, $00, $00, $00, $00, $29, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
@@ -8485,44 +8884,47 @@ ImposterOaksRevengeCardGfx::
 	INCBIN "gfx/cards/imposter_oaks_revenge.2bpp"
 ImposterOaksRevengeCardGfxExtra::
 	INCBIN "gfx/cards/imposter_oaks_revenge_extra.2bpp"
+
 SleepCardGfx::
-	rgb 21,31,6
-	rgb 7,21,22
-	rgb 18,0,0
-	rgb 0,0,0
+	rgb 21, 31,  6
+	rgb  7, 21, 22
+	rgb 18,  0,  0
+	rgb  0,  0,  0
 
-	rgb 21,31,6
-	rgb 25,12,2
-	rgb 0,0,12
-	rgb 0,0,0
+	rgb 21, 31,  6
+	rgb 25, 12,  2
+	rgb  0,  0, 12
+	rgb  0,  0,  0
 
-	rgb 21,31,6
-	rgb 25,12,2
-	rgb 18,0,0
-	rgb 0,0,0
+	rgb 21, 31,  6
+	rgb 25, 12,  2
+	rgb 18,  0,  0
+	rgb  0,  0,  0
 
 	db $00, $80, $80, $80, $80, $00, $00, $80, $80, $00, $00, $80, $80, $80, $00, $00
 	db $00, $80, $80, $00, $00, $00, $80, $00, $00, $00, $00, $40, $40, $00, $00, $00
 	db $00, $00, $40, $40, $40, $40, $40, $00, $40, $40, $40, $40, $40, $40, $40, $00
 	INCBIN "gfx/cards/sleep.2bpp"
-	ds $b8, $00
 
-SECTION "Card Gfx 34", ROMX[$4000], BANK[$34]
+	ds $b8
+
+SECTION "Card Gfx 24", ROMX
+
 DiggerCardGfx::
-	rgb 31,29,19
-	rgb 11,23,19
-	rgb 10,10,10
-	rgb 0,0,0
+	rgb 31, 29, 19
+	rgb 11, 23, 19
+	rgb 10, 10, 10
+	rgb  0,  0,  0
 
-	rgb 25,30,9
-	rgb 11,23,19
-	rgb 22,4,2
-	rgb 0,0,0
+	rgb 25, 30,  9
+	rgb 11, 23, 19
+	rgb 22,  4,  2
+	rgb  0,  0,  0
 
-	rgb 15,26,11
-	rgb 3,19,0
-	rgb 11,23,19
-	rgb 0,0,0
+	rgb 15, 26, 11
+	rgb  3, 19,  0
+	rgb 11, 23, 19
+	rgb  0,  0,  0
 
 	db $30, $40, $2f, $00, $2e, $2e, $2e, $00, $2d, $40, $6c, $6c, $00, $00, $00, $29
 	db $69, $69, $40, $28, $28, $28, $28, $68, $40, $40, $40, $25, $25, $25, $00, $40
@@ -8530,21 +8932,22 @@ DiggerCardGfx::
 	INCBIN "gfx/cards/digger.2bpp"
 DiggerCardGfxExtra::
 	INCBIN "gfx/cards/digger_extra.2bpp"
+
 TheBosssWayCardGfx::
-	rgb 31,31,31
-	rgb 23,20,3
-	rgb 12,8,2
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 23, 20,  3
+	rgb 12,  8,  2
+	rgb  0,  0,  0
 
-	rgb 16,31,0
-	rgb 0,31,0
-	rgb 0,31,16
-	rgb 0,31,31
+	rgb 16, 31,  0
+	rgb  0, 31,  0
+	rgb  0, 31, 16
+	rgb  0, 31, 31
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
@@ -8552,21 +8955,22 @@ TheBosssWayCardGfx::
 	INCBIN "gfx/cards/the_bosss_way.2bpp"
 TheBosssWayCardGfxExtra::
 	INCBIN "gfx/cards/the_bosss_way_extra.2bpp"
+
 GoopGasAttackCardGfx::
-	rgb 31,31,24
-	rgb 21,9,31
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 24
+	rgb 21,  9, 31
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,24
-	rgb 21,9,31
-	rgb 4,17,0
-	rgb 0,0,0
+	rgb 31, 31, 24
+	rgb 21,  9, 31
+	rgb  4, 17,  0
+	rgb  0,  0,  0
 
-	rgb 4,17,0
-	rgb 21,9,31
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb  4, 17,  0
+	rgb 21,  9, 31
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $00, $80, $80, $80, $40, $67, $40, $00, $00, $00, $80, $a2
 	db $40, $40, $40, $00, $00, $00, $80, $80, $40, $80, $80, $00, $00, $00, $80, $80
@@ -8574,21 +8978,22 @@ GoopGasAttackCardGfx::
 	INCBIN "gfx/cards/goop_gas_attack.2bpp"
 GoopGasAttackCardGfxExtra::
 	INCBIN "gfx/cards/goop_gas_attack_extra.2bpp"
+
 RocketsSneakAttackCardGfx::
-	rgb 31,31,31
-	rgb 30,21,21
-	rgb 26,6,2
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 30, 21, 21
+	rgb 26,  6,  2
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 8,17,20
-	rgb 2,8,11
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  8, 17, 20
+	rgb  2,  8, 11
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 26,6,2
-	rgb 2,8,11
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 26,  6,  2
+	rgb  2,  8, 11
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $00, $00, $00, $00, $40, $40, $66, $80, $00, $00, $00, $00
 	db $61, $40, $40, $9f, $1f, $00, $1e, $1e, $40, $40, $00, $00, $00, $00, $00, $00
@@ -8596,21 +9001,22 @@ RocketsSneakAttackCardGfx::
 	INCBIN "gfx/cards/rockets_sneak_attack.2bpp"
 RocketsSneakAttackCardGfxExtra::
 	INCBIN "gfx/cards/rockets_sneak_attack_extra.2bpp"
+
 HereComesTeamRocketCardGfx::
-	rgb 31,31,31
-	rgb 29,22,4
-	rgb 8,8,31
-	rgb 0,0,8
+	rgb 31, 31, 31
+	rgb 29, 22,  4
+	rgb  8,  8, 31
+	rgb  0,  0,  8
 
-	rgb 31,31,31
-	rgb 29,22,4
-	rgb 25,5,1
-	rgb 0,0,8
+	rgb 31, 31, 31
+	rgb 29, 22,  4
+	rgb 25,  5,  1
+	rgb  0,  0,  8
 
-	rgb 8,8,31
-	rgb 29,22,4
-	rgb 25,5,1
-	rgb 0,0,8
+	rgb  8,  8, 31
+	rgb 29, 22,  4
+	rgb 25,  5,  1
+	rgb  0,  0,  8
 
 	db $40, $40, $00, $00, $80, $40, $40, $40, $40, $40, $00, $00, $00, $80, $00, $21
 	db $40, $40, $00, $00, $00, $00, $00, $5a, $5a, $40, $80, $00, $00, $16, $00, $15
@@ -8618,21 +9024,22 @@ HereComesTeamRocketCardGfx::
 	INCBIN "gfx/cards/here_comes_team_rocket.2bpp"
 HereComesTeamRocketCardGfxExtra::
 	INCBIN "gfx/cards/here_comes_team_rocket_extra.2bpp"
+
 NightlyGarbageRunCardGfx::
-	rgb 31,25,0
-	rgb 13,19,19
-	rgb 14,4,14
-	rgb 6,0,6
+	rgb 31, 25,  0
+	rgb 13, 19, 19
+	rgb 14,  4, 14
+	rgb  6,  0,  6
 
-	rgb 25,5,0
-	rgb 13,19,19
-	rgb 14,4,14
-	rgb 6,0,6
+	rgb 25,  5,  0
+	rgb 13, 19, 19
+	rgb 14,  4, 14
+	rgb  6,  0,  6
 
-	rgb 31,25,0
-	rgb 25,5,0
-	rgb 14,4,14
-	rgb 6,0,6
+	rgb 31, 25,  0
+	rgb 25,  5,  0
+	rgb 14,  4, 14
+	rgb  6,  0,  6
 
 	db $00, $00, $40, $2d, $00, $00, $00, $00, $00, $00, $00, $40, $25, $00, $00, $23
 	db $00, $00, $00, $60, $20, $20, $00, $00, $40, $00, $40, $40, $00, $00, $00, $00
@@ -8640,21 +9047,22 @@ NightlyGarbageRunCardGfx::
 	INCBIN "gfx/cards/nightly_garbage_run.2bpp"
 NightlyGarbageRunCardGfxExtra::
 	INCBIN "gfx/cards/nightly_garbage_run_extra.2bpp"
+
 TheRocketsTrapCardGfx::
-	rgb 27,27,31
-	rgb 26,13,15
-	rgb 20,0,0
-	rgb 0,0,6
+	rgb 27, 27, 31
+	rgb 26, 13, 15
+	rgb 20,  0,  0
+	rgb  0,  0,  6
 
-	rgb 27,27,31
-	rgb 25,11,11
-	rgb 4,4,10
-	rgb 0,0,6
+	rgb 27, 27, 31
+	rgb 25, 11, 11
+	rgb  4,  4, 10
+	rgb  0,  0,  6
 
-	rgb 27,27,31
-	rgb 20,0,0
-	rgb 4,4,10
-	rgb 0,0,6
+	rgb 27, 27, 31
+	rgb 20,  0,  0
+	rgb  4,  4, 10
+	rgb  0,  0,  6
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
@@ -8662,21 +9070,22 @@ TheRocketsTrapCardGfx::
 	INCBIN "gfx/cards/the_rockets_trap.2bpp"
 TheRocketsTrapCardGfxExtra::
 	INCBIN "gfx/cards/the_rockets_trap_extra.2bpp"
+
 FossilExcavationCardGfx::
-	rgb 31,27,0
-	rgb 15,22,0
-	rgb 12,12,1
-	rgb 4,0,0
+	rgb 31, 27,  0
+	rgb 15, 22,  0
+	rgb 12, 12,  1
+	rgb  4,  0,  0
 
-	rgb 23,3,0
-	rgb 15,22,0
-	rgb 12,12,1
-	rgb 4,0,0
+	rgb 23,  3,  0
+	rgb 15, 22,  0
+	rgb 12, 12,  1
+	rgb  4,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $15, $55, $00, $00, $00
@@ -8684,21 +9093,22 @@ FossilExcavationCardGfx::
 	INCBIN "gfx/cards/fossil_excavation.2bpp"
 FossilExcavationCardGfxExtra::
 	INCBIN "gfx/cards/fossil_excavation_extra.2bpp"
+
 MoonStoneCardGfx::
-	rgb 29,31,31
-	rgb 15,22,27
-	rgb 11,3,24
-	rgb 0,0,0
+	rgb 29, 31, 31
+	rgb 15, 22, 27
+	rgb 11,  3, 24
+	rgb  0,  0,  0
 
-	rgb 29,31,31
-	rgb 5,4,12
-	rgb 11,3,24
-	rgb 0,0,0
+	rgb 29, 31, 31
+	rgb  5,  4, 12
+	rgb 11,  3, 24
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,31,31
-	rgb 31,31,31
-	rgb 31,31,31
+	rgb 31, 31, 31
+	rgb 31, 31, 31
+	rgb 31, 31, 31
+	rgb 31, 31, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40
@@ -8706,21 +9116,22 @@ MoonStoneCardGfx::
 	INCBIN "gfx/cards/moon_stone.2bpp"
 MoonStoneCardGfxExtra::
 	INCBIN "gfx/cards/moon_stone_extra.2bpp"
+
 MaxReviveCardGfx::
-	rgb 31,31,31
-	rgb 28,15,31
-	rgb 14,0,15
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 28, 15, 31
+	rgb 14,  0, 15
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 25,6,4
-	rgb 14,0,15
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 25,  6,  4
+	rgb 14,  0, 15
+	rgb  0,  0,  0
 
-	rgb 21,3,9
-	rgb 28,15,31
-	rgb 14,0,15
-	rgb 0,0,0
+	rgb 21,  3,  9
+	rgb 28, 15, 31
+	rgb 14,  0, 15
+	rgb  0,  0,  0
 
 	db $00, $af, $2f, $00, $00, $00, $ac, $00, $80, $00, $00, $00, $00, $00, $80, $00
 	db $80, $00, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $00, $00, $40, $40
@@ -8728,21 +9139,22 @@ MaxReviveCardGfx::
 	INCBIN "gfx/cards/max_revive.2bpp"
 MaxReviveCardGfxExtra::
 	INCBIN "gfx/cards/max_revive_extra.2bpp"
+
 MasterBallCardGfx::
-	rgb 24,26,31
-	rgb 17,15,17
-	rgb 11,5,19
-	rgb 0,0,12
+	rgb 24, 26, 31
+	rgb 17, 15, 17
+	rgb 11,  5, 19
+	rgb  0,  0, 12
 
-	rgb 24,26,31
-	rgb 22,6,11
-	rgb 11,5,19
-	rgb 0,0,12
+	rgb 24, 26, 31
+	rgb 22,  6, 11
+	rgb 11,  5, 19
+	rgb  0,  0, 12
 
-	rgb 22,6,11
-	rgb 17,15,17
-	rgb 11,5,19
-	rgb 0,0,12
+	rgb 22,  6, 11
+	rgb 17, 15, 17
+	rgb 11,  5, 19
+	rgb  0,  0, 12
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $80, $40, $40, $63, $40, $00
 	db $00, $00, $40, $40, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00
@@ -8750,41 +9162,43 @@ MasterBallCardGfx::
 	INCBIN "gfx/cards/master_ball.2bpp"
 MasterBallCardGfxExtra::
 	INCBIN "gfx/cards/master_ball_extra.2bpp"
+
 PokemonRecallCardGfx::
-	rgb 31,31,31
-	rgb 29,8,17
-	rgb 14,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 29,  8, 17
+	rgb 14,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 19,22,27
-	rgb 14,12,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 22, 27
+	rgb 14, 12,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 19,22,27
-	rgb 14,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 22, 27
+	rgb 14,  0,  0
+	rgb  0,  0,  0
 
 	db $00, $80, $40, $40, $80, $00, $80, $80, $80, $40, $40, $40, $40, $00, $80, $80
 	db $40, $40, $40, $40, $40, $00, $80, $80, $40, $40, $40, $40, $40, $00, $00, $00
 	db $80, $40, $40, $40, $40, $00, $00, $00, $80, $40, $40, $40, $80, $00, $00, $00
 	INCBIN "gfx/cards/pokemon_recall.2bpp"
+
 BillsComputerCardGfx::
-	rgb 31,31,31
-	rgb 12,31,0
-	rgb 0,15,16
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 12, 31,  0
+	rgb  0, 15, 16
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 20,23,9
-	rgb 7,11,3
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 20, 23,  9
+	rgb  7, 11,  3
+	rgb  0,  0,  0
 
-	rgb 0,15,16
-	rgb 20,23,9
-	rgb 7,11,3
-	rgb 0,0,0
+	rgb  0, 15, 16
+	rgb 20, 23,  9
+	rgb  7, 11,  3
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $80, $40, $00, $00, $26, $00, $00, $00, $80, $80
 	db $00, $00, $00, $00, $00, $00, $80, $40, $00, $00, $00, $00, $15, $80, $80, $80
@@ -8792,41 +9206,43 @@ BillsComputerCardGfx::
 	INCBIN "gfx/cards/bills_computer.2bpp"
 BillsComputerCardGfxExtra::
 	INCBIN "gfx/cards/bills_computer_extra.2bpp"
+
 ComputerErrorCardGfx::
-	rgb 25,25,24
-	rgb 7,27,2
-	rgb 13,5,6
-	rgb 0,5,0
+	rgb 25, 25, 24
+	rgb  7, 27,  2
+	rgb 13,  5,  6
+	rgb  0,  5,  0
 
-	rgb 25,25,24
-	rgb 7,27,2
-	rgb 28,3,4
-	rgb 0,5,0
+	rgb 25, 25, 24
+	rgb  7, 27,  2
+	rgb 28,  3,  4
+	rgb  0,  5,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	db $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/computer_error.2bpp"
+
 SquirtleLv14CardGfx::
-	rgb 31,31,10
-	rgb 11,21,31
-	rgb 27,6,0
-	rgb 2,2,12
+	rgb 31, 31, 10
+	rgb 11, 21, 31
+	rgb 27,  6,  0
+	rgb  2,  2, 12
 
-	rgb 0,17,0
-	rgb 11,21,31
-	rgb 27,6,0
-	rgb 2,2,12
+	rgb  0, 17,  0
+	rgb 11, 21, 31
+	rgb 27,  6,  0
+	rgb  2,  2, 12
 
-	rgb 31,31,10
-	rgb 0,17,0
-	rgb 27,6,0
-	rgb 2,2,12
+	rgb 31, 31, 10
+	rgb  0, 17,  0
+	rgb 27,  6,  0
+	rgb  2,  2, 12
 
 	db $70, $70, $70, $40, $40, $6e, $ae, $2e, $6e, $40, $6d, $ad, $6d, $6d, $2d, $00
 	db $80, $6b, $2b, $2b, $2b, $00, $00, $00, $28, $28, $00, $00, $00, $00, $24, $24
@@ -8834,41 +9250,43 @@ SquirtleLv14CardGfx::
 	INCBIN "gfx/cards/squirtle_lv14.2bpp"
 SquirtleLv14CardGfxExtra::
 	INCBIN "gfx/cards/squirtle_lv14_extra.2bpp"
+
 SuperScoopUpCardGfx::
-	rgb 31,31,31
-	rgb 5,27,15
-	rgb 3,14,14
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  5, 27, 15
+	rgb  3, 14, 14
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,22,0
-	rgb 3,14,14
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 22,  0
+	rgb  3, 14, 14
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 17,17,14
-	rgb 9,9,7
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 17, 17, 14
+	rgb  9,  9,  7
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $40, $00, $00, $00, $40, $00, $00, $40, $40, $00, $00
 	db $00, $40, $40, $80, $00, $00, $00, $00, $80, $80, $80, $80, $80, $00, $00, $80
 	db $00, $80, $80, $80, $80, $00, $80, $80, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/super_scoop_up.2bpp"
+
 RaichuLv33CardGfx::
-	rgb 31,31,14
-	rgb 31,24,7
-	rgb 14,12,4
-	rgb 4,0,0
+	rgb 31, 31, 14
+	rgb 31, 24,  7
+	rgb 14, 12,  4
+	rgb  4,  0,  0
 
-	rgb 31,27,31
-	rgb 31,14,19
-	rgb 28,0,1
-	rgb 4,0,0
+	rgb 31, 27, 31
+	rgb 31, 14, 19
+	rgb 28,  0,  1
+	rgb  4,  0,  0
 
-	rgb 31,24,7
-	rgb 14,12,4
-	rgb 28,0,1
-	rgb 4,0,0
+	rgb 31, 24,  7
+	rgb 14, 12,  4
+	rgb 28,  0,  1
+	rgb  4,  0,  0
 
 	db $40, $6f, $6f, $40, $40, $80, $40, $6b, $ab, $80, $80, $80, $80, $a7, $67, $40
 	db $80, $80, $80, $23, $80, $80, $40, $40, $40, $9e, $1e, $00, $00, $80, $40, $5a
@@ -8876,144 +9294,152 @@ RaichuLv33CardGfx::
 	INCBIN "gfx/cards/raichu_lv33.2bpp"
 RaichuLv33CardGfxExtra::
 	INCBIN "gfx/cards/raichu_lv33_extra.2bpp"
-	ds $118, $00
 
-SECTION "Card Gfx 35", ROMX[$4000], BANK[$35]
+	ds $118
+
+SECTION "Card Gfx 25", ROMX
+
 IvysaurLv26CardGfx::
-	rgb 31,31,31
-	rgb 13,25,19
-	rgb 4,16,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 13, 25, 19
+	rgb  4, 16,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 13,25,19
-	rgb 23,4,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 13, 25, 19
+	rgb 23,  4,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,2,22
-	rgb 14,2,14
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31,  2, 22
+	rgb 14,  2, 14
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $40, $00
 	db $00, $00, $00, $00, $00, $40, $40, $00, $80, $80, $00, $00, $00, $00, $00, $00
 	db $80, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/ivysaur_lv26.2bpp"
+
 KoffingLv14CardGfx::
-	rgb 31,31,31
-	rgb 25,17,21
-	rgb 13,9,11
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 25, 17, 21
+	rgb 13,  9, 11
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,27,31
-	rgb 0,10,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 27, 31
+	rgb  0, 10, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,27,31
-	rgb 25,17,21
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 27, 31
+	rgb 25, 17, 21
+	rgb  0,  0,  0
 
 	db $00, $00, $80, $40, $80, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $40
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $40, $80, $80, $80, $00
 	INCBIN "gfx/cards/koffing_lv14.2bpp"
+
 GrowlitheLv12CardGfx::
-	rgb 31,31,14
-	rgb 31,19,0
-	rgb 21,10,0
-	rgb 0,0,0
+	rgb 31, 31, 14
+	rgb 31, 19,  0
+	rgb 21, 10,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,28,0
-	rgb 11,26,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 28,  0
+	rgb 11, 26,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,14
-	rgb 11,26,0
-	rgb 21,10,0
-	rgb 0,0,0
+	rgb 31, 31, 14
+	rgb 11, 26,  0
+	rgb 21, 10,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $80, $80, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40, $40
 	db $40, $00, $00, $00, $00, $00, $00, $40, $40, $80, $80, $80, $80, $80, $80, $40
 	INCBIN "gfx/cards/growlithe_lv12.2bpp"
+
 JynxLv27CardGfx::
-	rgb 31,31,0
-	rgb 0,15,31
-	rgb 0,9,31
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb  0, 15, 31
+	rgb  0,  9, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 31,7,31
-	rgb 20,7,21
-	rgb 6,0,5
+	rgb 31, 31,  0
+	rgb 31,  7, 31
+	rgb 20,  7, 21
+	rgb  6,  0,  5
 
-	rgb 31,31,0
-	rgb 0,15,31
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb  0, 15, 31
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $40, $80, $80, $40, $40, $40
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $80, $80, $80, $80, $80, $00, $00, $00, $80, $80, $80, $80, $80, $00
 	INCBIN "gfx/cards/jynx_lv27.2bpp"
+
 ArcanineLv35CardGfx::
-	rgb 31,31,0
-	rgb 31,16,0
-	rgb 24,6,0
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 31, 16,  0
+	rgb 24,  6,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,16,0
-	rgb 24,6,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 16,  0
+	rgb 24,  6,  0
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00
 	db $40, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00, $40
 	db $00, $00, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $40, $40, $00, $40
 	INCBIN "gfx/cards/arcanine_lv35.2bpp"
+
 ElectabuzzLv30CardGfx::
-	rgb 31,31,31
-	rgb 31,29,9
-	rgb 16,16,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 29,  9
+	rgb 16, 16,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,29,9
-	rgb 10,19,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 29,  9
+	rgb 10, 19, 31
+	rgb  0,  0,  0
 
-	rgb 31,0,16
-	rgb 16,16,16
-	rgb 24,24,24
-	rgb 31,31,31
+	rgb 31,  0, 16
+	rgb 16, 16, 16
+	rgb 24, 24, 24
+	rgb 31, 31, 31
 
 	db $40, $40, $00, $00, $40, $40, $40, $40, $40, $40, $00, $00, $00, $40, $40, $40
 	db $40, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/electabuzz_lv30.2bpp"
+
 WartortleLv24CardGfx::
-	rgb 31,31,31
-	rgb 29,27,1
-	rgb 24,3,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 29, 27,  1
+	rgb 24,  3,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 1,13,31
-	rgb 24,3,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  1, 13, 31
+	rgb 24,  3,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 29,27,1
-	rgb 1,13,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 29, 27,  1
+	rgb  1, 13, 31
+	rgb  0,  0,  0
 
 	db $00, $00, $40, $80, $00, $00, $40, $00, $00, $00, $40, $00, $00, $80, $40, $40
 	db $00, $40, $5e, $00, $00, $80, $5b, $40, $00, $40, $40, $40, $40, $00, $00, $13
@@ -9021,21 +9447,22 @@ WartortleLv24CardGfx::
 	INCBIN "gfx/cards/wartortle_lv24.2bpp"
 WartortleLv24CardGfxExtra::
 	INCBIN "gfx/cards/wartortle_lv24_extra.2bpp"
+
 SpearowLv9CardGfx::
-	rgb 31,31,24
-	rgb 31,22,0
-	rgb 19,17,11
-	rgb 0,0,0
+	rgb 31, 31, 24
+	rgb 31, 22,  0
+	rgb 19, 17, 11
+	rgb  0,  0,  0
 
-	rgb 31,28,28
-	rgb 31,8,8
-	rgb 17,13,11
-	rgb 0,0,0
+	rgb 31, 28, 28
+	rgb 31,  8,  8
+	rgb 17, 13, 11
+	rgb  0,  0,  0
 
-	rgb 28,28,31
-	rgb 8,20,31
-	rgb 11,13,17
-	rgb 0,0,0
+	rgb 28, 28, 31
+	rgb  8, 20, 31
+	rgb 11, 13, 17
+	rgb  0,  0,  0
 
 	db $80, $80, $80, $00, $80, $80, $80, $80, $80, $80, $00, $00, $40, $40, $80, $80
 	db $80, $80, $00, $00, $5c, $5c, $40, $80, $80, $80, $80, $17, $00, $40, $80, $80
@@ -9043,41 +9470,43 @@ SpearowLv9CardGfx::
 	INCBIN "gfx/cards/spearow_lv9.2bpp"
 SpearowLv9CardGfxExtra::
 	INCBIN "gfx/cards/spearow_lv9_extra.2bpp"
+
 MeowthLv17CardGfx::
-	rgb 31,31,5
-	rgb 17,23,1
-	rgb 4,17,0
-	rgb 0,0,0
+	rgb 31, 31,  5
+	rgb 17, 23,  1
+	rgb  4, 17,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,5
-	rgb 17,23,1
-	rgb 24,8,4
-	rgb 0,0,0
+	rgb 31, 31,  5
+	rgb 17, 23,  1
+	rgb 24,  8,  4
+	rgb  0,  0,  0
 
-	rgb 31,31,5
-	rgb 17,17,14
-	rgb 24,8,4
-	rgb 0,0,0
+	rgb 31, 31,  5
+	rgb 17, 17, 14
+	rgb 24,  8,  4
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00
 	db $80, $80, $40, $40, $00, $00, $00, $00, $80, $80, $00, $40, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/meowth_lv17.2bpp"
+
 BillsTeleporterCardGfx::
-	rgb 31,31,31
-	rgb 19,27,23
-	rgb 6,14,14
-	rgb 0,4,4
+	rgb 31, 31, 31
+	rgb 19, 27, 23
+	rgb  6, 14, 14
+	rgb  0,  4,  4
 
-	rgb 31,31,31
-	rgb 19,27,23
-	rgb 16,14,2
-	rgb 0,4,4
+	rgb 31, 31, 31
+	rgb 19, 27, 23
+	rgb 16, 14,  2
+	rgb  0,  4,  4
 
-	rgb 31,31,31
-	rgb 19,27,23
-	rgb 22,3,0
-	rgb 0,4,4
+	rgb 31, 31, 31
+	rgb 19, 27, 23
+	rgb 22,  3,  0
+	rgb  0,  4,  4
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $80, $80, $80, $40, $40, $40
@@ -9085,21 +9514,22 @@ BillsTeleporterCardGfx::
 	INCBIN "gfx/cards/bills_teleporter.2bpp"
 BillsTeleporterCardGfxExtra::
 	INCBIN "gfx/cards/bills_teleporter_extra.2bpp"
+
 BulbasaurLv12CardGfx::
-	rgb 31,31,31
-	rgb 6,27,11
-	rgb 0,15,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  6, 27, 11
+	rgb  0, 15,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 18,31,31
-	rgb 0,19,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 18, 31, 31
+	rgb  0, 19, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 30,24,0
-	rgb 0,15,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 30, 24,  0
+	rgb  0, 15,  0
+	rgb  0,  0,  0
 
 	db $40, $00, $40, $00, $40, $40, $40, $00, $00, $40, $40, $00, $00, $40, $40, $21
 	db $21, $40, $00, $00, $00, $40, $40, $00, $00, $40, $40, $17, $00, $40, $40, $00
@@ -9107,21 +9537,22 @@ BulbasaurLv12CardGfx::
 	INCBIN "gfx/cards/bulbasaur_lv12.2bpp"
 BulbasaurLv12CardGfxExtra::
 	INCBIN "gfx/cards/bulbasaur_lv12_extra.2bpp"
+
 MagmarLv18CardGfx::
-	rgb 31,22,0
-	rgb 18,18,0
-	rgb 16,0,0
-	rgb 0,0,0
+	rgb 31, 22,  0
+	rgb 18, 18,  0
+	rgb 16,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,22,0
-	rgb 18,18,0
-	rgb 9,11,0
-	rgb 0,0,0
+	rgb 31, 22,  0
+	rgb 18, 18,  0
+	rgb  9, 11,  0
+	rgb  0,  0,  0
 
-	rgb 31,16,16
-	rgb 31,0,0
-	rgb 16,0,0
-	rgb 0,0,0
+	rgb 31, 16, 16
+	rgb 31,  0,  0
+	rgb 16,  0,  0
+	rgb  0,  0,  0
 
 	db $70, $70, $30, $30, $70, $70, $70, $70, $b0, $b0, $b0, $30, $30, $70, $70, $70
 	db $70, $30, $b0, $30, $30, $30, $70, $70, $30, $30, $30, $30, $30, $30, $70, $70
@@ -9129,61 +9560,64 @@ MagmarLv18CardGfx::
 	INCBIN "gfx/cards/magmar_lv18.2bpp"
 MagmarLv18CardGfxExtra::
 	INCBIN "gfx/cards/magmar_lv18_extra.2bpp"
+
 GRsMewtwoCardGfx::
-	rgb 31,31,31
-	rgb 26,17,31
-	rgb 19,7,23
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 26, 17, 31
+	rgb 19,  7, 23
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 24,19,0
-	rgb 14,7,13
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 24, 19,  0
+	rgb 14,  7, 13
+	rgb  0,  0,  0
 
-	rgb 0,16,31
-	rgb 0,0,31
-	rgb 16,0,31
-	rgb 31,0,31
+	rgb  0, 16, 31
+	rgb  0,  0, 31
+	rgb 16,  0, 31
+	rgb 31,  0, 31
 
 	db $40, $40, $00, $00, $00, $00, $40, $00, $40, $40, $00, $00, $00, $00, $40, $00
 	db $40, $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/g_rs_mewtwo.2bpp"
+
 DarkIvysaurCardGfx::
-	rgb 31,31,31
-	rgb 15,15,31
-	rgb 9,2,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 15, 31
+	rgb  9,  2, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 24,15,0
-	rgb 14,9,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 24, 15,  0
+	rgb 14,  9,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 0,25,10
-	rgb 0,17,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb  0, 25, 10
+	rgb  0, 17,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $00, $00, $80, $40, $40, $80, $40, $00, $00, $00, $00, $40, $40, $80
 	db $40, $00, $00, $00, $00, $00, $80, $00, $40, $00, $00, $00, $00, $00, $80, $80
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/dark_ivysaur.2bpp"
+
 DarkHaunterCardGfx::
-	rgb 31,31,31
-	rgb 31,6,21
-	rgb 14,0,29
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31,  6, 21
+	rgb 14,  0, 29
+	rgb  0,  0,  0
 
-	rgb 17,23,29
-	rgb 31,2,0
-	rgb 13,0,25
-	rgb 0,0,0
+	rgb 17, 23, 29
+	rgb 31,  2,  0
+	rgb 13,  0, 25
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,12,0
-	rgb 30,25,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 12,  0
+	rgb 30, 25,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $27, $27, $27, $00, $00, $00, $24
 	db $24, $24, $00, $00, $00, $00, $20, $20, $00, $40, $40, $00, $00, $1b, $00, $00
@@ -9191,144 +9625,152 @@ DarkHaunterCardGfx::
 	INCBIN "gfx/cards/dark_haunter.2bpp"
 DarkHaunterCardGfxExtra::
 	INCBIN "gfx/cards/dark_haunter_extra.2bpp"
+
 DarkVenusaurCardGfx::
-	rgb 31,31,31
-	rgb 20,14,31
-	rgb 13,0,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 20, 14, 31
+	rgb 13,  0, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 28,21,9
-	rgb 23,12,9
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 28, 21,  9
+	rgb 23, 12,  9
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 16,22,3
-	rgb 8,10,6
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 16, 22,  3
+	rgb  8, 10,  6
+	rgb  0,  0,  0
 
 	db $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00
 	db $80, $80, $80, $80, $80, $80, $80, $80, $00, $00, $00, $80, $80, $00, $80, $80
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_venusaur.2bpp"
+
 DarkClefableCardGfx::
-	rgb 31,26,31
-	rgb 27,12,24
-	rgb 19,7,13
-	rgb 0,0,0
+	rgb 31, 26, 31
+	rgb 27, 12, 24
+	rgb 19,  7, 13
+	rgb  0,  0,  0
 
-	rgb 31,26,31
-	rgb 20,20,31
-	rgb 12,12,23
-	rgb 0,0,0
+	rgb 31, 26, 31
+	rgb 20, 20, 31
+	rgb 12, 12, 23
+	rgb  0,  0,  0
 
-	rgb 31,26,31
-	rgb 27,12,24
-	rgb 12,12,23
-	rgb 0,0,0
+	rgb 31, 26, 31
+	rgb 27, 12, 24
+	rgb 12, 12, 23
+	rgb  0,  0,  0
 
 	db $40, $40, $80, $40, $40, $40, $40, $40, $40, $40, $80, $80, $00, $40, $80, $40
 	db $80, $80, $00, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $40
 	INCBIN "gfx/cards/dark_clefable.2bpp"
+
 DarkRaichuCardGfx::
-	rgb 31,31,19
-	rgb 23,19,0
-	rgb 12,7,0
-	rgb 0,0,0
+	rgb 31, 31, 19
+	rgb 23, 19,  0
+	rgb 12,  7,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 31,14,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 31, 14,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,19
-	rgb 11,25,7
-	rgb 0,21,0
-	rgb 0,0,0
+	rgb 31, 31, 19
+	rgb 11, 25,  7
+	rgb  0, 21,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $00, $40, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00
 	db $40, $00, $00, $00, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
 	db $40, $40, $40, $00, $00, $00, $80, $80, $40, $40, $80, $00, $80, $80, $80, $80
 	INCBIN "gfx/cards/dark_raichu.2bpp"
-	ds $50, $00
 
-SECTION "Card Gfx 36", ROMX[$4000], BANK[$36]
+	ds $50
+
+SECTION "Card Gfx 26", ROMX
+
 DarkMarowakCardGfx::
-	rgb 31,31,31
-	rgb 17,17,20
-	rgb 21,9,0
-	rgb 0,4,0
+	rgb 31, 31, 31
+	rgb 17, 17, 20
+	rgb 21,  9,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,31
-	rgb 17,17,20
-	rgb 0,13,0
-	rgb 0,4,0
+	rgb 31, 31, 31
+	rgb 17, 17, 20
+	rgb  0, 13,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,0
-	rgb 18,19,0
-	rgb 13,11,0
-	rgb 0,6,0
+	rgb 31, 31,  0
+	rgb 18, 19,  0
+	rgb 13, 11,  0
+	rgb  0,  6,  0
 
 	db $80, $80, $80, $00, $00, $00, $80, $00, $00, $00, $00, $00, $00, $00, $00, $80
 	db $40, $00, $80, $00, $00, $00, $00, $80, $40, $40, $00, $00, $00, $00, $40, $80
 	db $40, $40, $00, $00, $00, $00, $40, $40, $40, $40, $00, $00, $00, $00, $40, $40
 	INCBIN "gfx/cards/dark_marowak.2bpp"
+
 DarkStarmieCardGfx::
-	rgb 31,31,31
-	rgb 29,13,29
-	rgb 18,5,21
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 29, 13, 29
+	rgb 18,  5, 21
+	rgb  0,  0,  0
 
-	rgb 31,31,0
-	rgb 30,19,0
-	rgb 18,5,21
-	rgb 0,0,0
+	rgb 31, 31,  0
+	rgb 30, 19,  0
+	rgb 18,  5, 21
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 30,19,0
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 30, 19,  0
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $40, $80, $80, $00, $00, $00, $00, $00, $40, $80, $80, $40, $00
 	db $00, $00, $00, $00, $40, $40, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 	INCBIN "gfx/cards/dark_starmie.2bpp"
+
 DarkNinetalesCardGfx::
-	rgb 29,31,24
-	rgb 16,24,3
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 29, 31, 24
+	rgb 16, 24,  3
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 29,31,24
-	rgb 0,19,28
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 29, 31, 24
+	rgb  0, 19, 28
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 29,31,24
-	rgb 0,19,28
-	rgb 14,8,0
-	rgb 0,0,0
+	rgb 29, 31, 24
+	rgb  0, 19, 28
+	rgb 14,  8,  0
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $00, $40, $40, $40, $40, $40, $40, $40, $00, $00, $00, $00
 	db $00, $00, $00, $40, $00, $00, $00, $00, $40, $00, $00, $00, $00, $00, $00, $00
 	db $40, $00, $00, $40, $00, $00, $40, $40, $80, $00, $80, $80, $80, $80, $80, $80
 	INCBIN "gfx/cards/dark_ninetales.2bpp"
+
 DarkFearowCardGfx::
-	rgb 31,31,31
-	rgb 12,24,30
-	rgb 18,10,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 12, 24, 30
+	rgb 18, 10,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 12,24,30
-	rgb 26,25,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 12, 24, 30
+	rgb 26, 25,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 12,24,30
-	rgb 31,16,20
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 12, 24, 30
+	rgb 31, 16, 20
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $2b, $00, $00, $00, $00, $27, $27, $00, $00, $00, $80
 	db $23, $23, $00, $00, $00, $00, $1f, $9f, $00, $00, $00, $00, $00, $1a, $80, $80
@@ -9336,61 +9778,64 @@ DarkFearowCardGfx::
 	INCBIN "gfx/cards/dark_fearow.2bpp"
 DarkFearowCardGfxExtra::
 	INCBIN "gfx/cards/dark_fearow_extra.2bpp"
+
 RecycleEnergyCardGfx::
-	rgb 31,31,31
-	rgb 10,31,17
-	rgb 9,14,8
-	rgb 0,8,3
+	rgb 31, 31, 31
+	rgb 10, 31, 17
+	rgb  9, 14,  8
+	rgb  0,  8,  3
 
-	rgb 27,31,19
-	rgb 14,21,4
-	rgb 10,15,0
-	rgb 0,4,0
+	rgb 27, 31, 19
+	rgb 14, 21,  4
+	rgb 10, 15,  0
+	rgb  0,  4,  0
 
-	rgb 31,31,31
-	rgb 19,29,17
-	rgb 11,18,10
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 19, 29, 17
+	rgb 11, 18, 10
+	rgb  0,  0,  0
 
 	db $40, $40, $40, $40, $00, $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00
 	db $40, $40, $00, $80, $80, $00, $00, $00, $40, $00, $00, $80, $80, $00, $00, $00
 	db $40, $00, $00, $80, $80, $00, $00, $00, $40, $00, $00, $80, $80, $00, $00, $00
 	INCBIN "gfx/cards/recycle_energy.2bpp"
+
 DarkGengarCardGfx::
-	rgb 31,31,31
-	rgb 31,15,31
-	rgb 17,4,23
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 15, 31
+	rgb 17,  4, 23
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 31,15,31
-	rgb 31,0,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 31, 15, 31
+	rgb 31,  0,  0
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 15,23,0
-	rgb 0,20,0
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 23,  0
+	rgb  0, 20,  0
+	rgb  0,  0,  0
 
 	db $00, $00, $00, $00, $00, $00, $80, $80, $00, $00, $00, $40, $40, $00, $00, $80
 	db $00, $00, $00, $40, $40, $00, $00, $80, $80, $00, $00, $00, $00, $00, $00, $80
 	db $80, $00, $00, $00, $00, $00, $00, $80, $80, $80, $80, $00, $00, $00, $00, $80
 	INCBIN "gfx/cards/dark_gengar.2bpp"
+
 LugiaCardGfx::
-	rgb 31,31,31
-	rgb 18,18,19
-	rgb 8,0,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 18, 18, 19
+	rgb  8,  0, 31
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 15,18,19
-	rgb 6,14,12
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 15, 18, 19
+	rgb  6, 14, 12
+	rgb  0,  0,  0
 
-	rgb 31,31,31
-	rgb 12,17,31
-	rgb 8,0,31
-	rgb 0,0,0
+	rgb 31, 31, 31
+	rgb 12, 17, 31
+	rgb  8,  0, 31
+	rgb  0,  0,  0
 
 	db $80, $00, $00, $80, $80, $80, $80, $80, $80, $00, $00, $40, $40, $00, $00, $80
 	db $00, $00, $00, $40, $40, $00, $00, $00, $00, $00, $00, $40, $40, $00, $80, $80
diff --git a/src/home/card_data.asm b/src/home/card_data.asm
index 2aec142..8f260ce 100644
--- a/src/home/card_data.asm
+++ b/src/home/card_data.asm
@@ -193,87 +193,95 @@ GetCardPointer:
 	ret
 
 ; input:
-; hl = card_gfx_index
-; de = where to load the card gfx to
-; bc are supposed to be CARD_TILE_COUNT (number of tiles of a card gfx) and TILE_SIZE respectively
-; card_gfx_index = (<Name>CardGfx - CardGraphics) / 8  (using absolute ROM addresses)
-; also copies the card's palette to wCardPalette
+;   hl = card gfx index
+;   de = destination
+;   b = NUM_CARD_GFX_TILES
+;   c = TILE_SIZE
+; also update wCardPalette and wCardAttrMap
 LoadCardGfx::
 	ldh a, [hBankROM]
 	push af
-	call LoadCardPalettes
+	call LoadCardPalettesAndAttrMap
 	call CopyGfxData
 	pop af
 	call BankswitchROM
 	ret
 
-; like LoadCardGfx, but reconstructs the 48 card tiles through the card's
-; attribute map instead of copying them 1:1. The low 6 bits of each attribute-
-; map byte are a tile index relative to that tile's position, so output tile i
-; comes from source tile ((wCardAttrMap[i] & $3f) + i) -- identity (= the plain
-; portrait) for most cards, but some (e.g. Energy cards) point at extra tiles
-; stored right after their portrait. The palette bits (high 2 of each map byte)
-; are stripped, leaving just the indices in wCardAttrMap. Used to build the card
-; picture for the Game Boy Printer (see BuildPrintableCardPic /
-; DrawCardPicInSRAMGfxBuffer2).
-; input: hl = card_gfx_index, de = destination, bc = CARD_TILE_COUNT (tiles), TILE_SIZE
-LoadCardGfxRemapped::
+; LoadCardGfx but with printer-only alt tiles where appropriate
+; based on CARD_GFX_TILE_ATTRMAP_ALT_OFFSET
+; see BuildPrintableCardPic
+; input:
+;   hl = card gfx index
+;   de = destination
+;   b = NUM_CARD_GFX_TILES
+;   c = TILE_SIZE
+LoadCardGfx_PrinterAlt::
 	ldh a, [hBankROM]
 	push af
-	call LoadCardPalettes ; loads palettes + attr map; returns hl = card's tile base
+	call LoadCardPalettesAndAttrMap
 	ld a, l
 	ld [wCardGfxTileBase + 0], a
 	ld a, h
-	ld [wCardGfxTileBase + 1], a ; wCardGfxTileBase = base address of the card's tiles
+	ld [wCardGfxTileBase + 1], a
 	ld hl, wCardAttrMap
-	lb bc, CARD_TILE_COUNT, 0 ; b = tiles to emit, c = output position (0..47)
+	lb bc, NUM_CARD_GFX_TILES, 0
 .loop_copy
+	; mask offset
+	; offset = 48 + (cur alt tile idx) - (cur tile idx) if has alt,
+	; 0 otherwise
 	ld a, [hl]
-	and $3f ; keep the relative tile index, drop the palette bits
-	ld [hli], a ; store the stripped index back into wCardAttrMap
+	and CARD_GFX_TILE_ATTRMAP_ALT_OFFSET
+	ld [hli], a
 	push hl
 	push bc
-	add c ; relative index + position = absolute source tile number
+	add c ; += (cur tile idx)
+	; a = 48 + (cur alt tile idx) if has alt,
+	; (cur tile idx) otherwise
+	; get source tile addr
 	ld l, a
 	ld h, $00
+REPT 4 ; *= TILE_SIZE
 	add hl, hl
-	add hl, hl
-	add hl, hl
-	add hl, hl ; *TILE_SIZE
+ENDR
 	ld a, [wCardGfxTileBase + 0]
 	add l
 	ld l, a
 	ld a, [wCardGfxTileBase + 1]
 	adc h
-	ld h, a ; hl = tile base + tile number * TILE_SIZE = source tile address
+	ld h, a
+	; copy tile
 	ld b, TILE_SIZE
-	call SafeCopyDataHLtoDE ; copy this tile to de, advancing de
+	call SafeCopyDataHLtoDE
 	pop bc
 	pop hl
-	inc c ; advance output position
+	inc c
 	dec b
 	jr nz, .loop_copy
+
 	pop af
 	call BankswitchROM
 	ret
 
-LoadCardPalettes:
+; hl = card gfx index
+; store into wCardPalettes and wCardAttrMap
+; also return hl = card tile address
+LoadCardPalettesAndAttrMap:
 	push bc
 	push de
 	push hl
 	ld a, h
+REPT 3 ; /= 8
 	srl a
-	srl a
-	srl a ; /8
+ENDR
 	add BANK(CardGraphics)
 	call BankswitchROM
 	pop hl
+REPT 3 ; *= 8
 	add hl, hl
-	add hl, hl
-	add hl, hl ; *8
+ENDR
 	res 7, h
 	set 6, h ; $4000 ≤ hl ≤ $7fff
-	ld b, 3 palettes + CARD_TILE_COUNT ; palettes + 1 attribute byte per tile
+	ld b, CARDGFXSTRUCT_PALS_SIZE + CARDGFXSTRUCT_TILE_ATTRMAP_SIZE
 	ld de, wCardPalettes
 .loop_copy
 	ld a, [hli]
diff --git a/src/home/empty_screen.asm b/src/home/empty_screen.asm
index 569151e..5fcdab5 100644
--- a/src/home/empty_screen.asm
+++ b/src/home/empty_screen.asm
@@ -11,11 +11,9 @@ EmptyScreen::
 BCCoordToBGMap0Address::
 	ld l, c
 	ld h, $0
+REPT 5 ; *TILEMAP_WIDTH
 	add hl, hl
-	add hl, hl
-	add hl, hl
-	add hl, hl
-	add hl, hl
+ENDR
 	ld c, b
 	ld b, HIGH(v0BGMap0)
 	add hl, bc
diff --git a/src/home/process_text.asm b/src/home/process_text.asm
index 26a992d..1ee1158 100644
--- a/src/home/process_text.asm
+++ b/src/home/process_text.asm
@@ -148,10 +148,10 @@ SetupText::
 	xor a
 	ldh [hffbb], a
 	ldh [hTextTileCacheHead], a
-	ld a, $88
-	ld [wTilePatternSelector], a
+	ld a, HIGH(v0Tiles1)
+	ld [wTextTileBaseAddressHi], a
 	ld a, $80
-	ld [wTilePatternSelectorCorrection], a
+	ld [wTextTileIndexSignednessAdjust], a
 	ld hl, wc600
 .clear_loop
 	xor a
@@ -207,9 +207,9 @@ InitTextPrinting::
 
 ; requests a text tile to be generated and prints it in the screen
 ; different modes depending on hffbb:
-   ; hffbb == $0: generate and place text tile
-   ; hffbb == $2 (bit 1 set): only generate text tile?
-   ; hffbb == $1 (bit 0 set): not even generate it, but just update text buffers?
+;   hffbb == $0: generate and place text tile
+;   hffbb == $2 (bit 1 set): only generate text tile?
+;   hffbb == $1 (bit 0 set): not even generate it, but just update text buffers?
 GenerateAndPlaceTextTile::
 	push hl
 	push de
@@ -594,12 +594,12 @@ CreateHalfWidthFontTile::
 ; the ascii value of the character to copy is provided in a.
 ; assumes BANK(HalfWidthFont) is already loaded.
 CopyHalfWidthCharacterToDE::
-	sub $20 ; HalfWidthFont begins at ascii $20
+	sub HALFWIDTH_CHAR_START
 	ld l, a
 	ld h, $0
+REPT 3 ; *TILE_SIZE_1BPP
 	add hl, hl
-	add hl, hl
-	add hl, hl
+ENDR
 	ld bc, HalfWidthFont
 	add hl, bc
 	ld b, TILE_SIZE_1BPP
@@ -622,21 +622,19 @@ CreateFullWidthFontTile_ConvertToTileDataAddress::
 	pop bc
 ;	fallthrough
 
-; given a tile number in b, return its v*Tiles address in hl, and return c = TILE_SIZE
-; wTilePatternSelector and wTilePatternSelectorCorrection are used to select the source:
-; - if wTilePatternSelector == $80 and wTilePatternSelectorCorrection == $00 -> $8000-$8FFF
-; - if wTilePatternSelector == $88 and wTilePatternSelectorCorrection == $80 -> $8800-$97FF
+; given a tile number in b, return its tile address in hl, and return c = TILE_SIZE
+; default: VRAM, LCDC_BLOCK21
+; printer: SRAM, as if LCDC_BLOCK01
 ConvertTileNumberToTileDataAddress::
-	ld hl, wTilePatternSelectorCorrection
+	ld hl, wTextTileIndexSignednessAdjust
 	ld a, b
 	xor [hl]
 	ld h, $0
 	ld l, a
+REPT 4 ; *TILE_SIZE
 	add hl, hl
-	add hl, hl
-	add hl, hl
-	add hl, hl
-	ld a, [wTilePatternSelector]
+ENDR
+	ld a, [wTextTileBaseAddressHi]
 	ld b, a
 	ld c, $0
 	add hl, bc
@@ -673,7 +671,7 @@ ClassifyTextCharacterPair::
 	ld a, e
 	cp TX_CTRL_END
 	jr c, .continue_check
-	cp $60
+	cp FULLWIDTH0_CHAR_START
 	jr nc, .not_katakana
 	ldh a, [hJapaneseSyllabary]
 	cp TX_KATAKANA
@@ -754,18 +752,18 @@ PromoteTextTileCacheEntry::
 	ldh a, [hTextTileCacheHead]
 	ld l, a              ; l ← [hTextTileCacheHead]; index to to linked-list head
 .asm_237d
-	ld h, $c6                                     ;
+	ld h, HIGH(wc600)    ;
 	ld a, [hl]           ; a ← key1[l]            ;
 	or a                                          ;
 	ret z                ; if NULL, return a = 0  ;
 	cp e                                          ; loop for e/d key in
 	jr nz, .asm_238a     ;                        ; linked list
-	inc h ; $c7          ;                        ;
+	inc h ; HIGH(wc700)  ;                        ;
 	ld a, [hl]           ; if key1[l] == e and    ;
 	cp d                 ;   key2[l] == d:        ;
 	jr z, .asm_238f      ;   break                ;
 .asm_238a
-	ld h, $c8            ;                        ;
+	ld h, HIGH(wc800)    ;                        ;
 	ld l, [hl]           ; l ← next[l]            ;
 	jr .asm_237d
 .asm_238f
@@ -773,20 +771,20 @@ PromoteTextTileCacheEntry::
 	cp l
 	jr z, .asm_23af      ; assert at least one iteration
 	ld c, a
-	ld b, $c9
+	ld b, HIGH(wc900)
 	ld a, l
 	ld [bc], a           ; prev[i0] ← i
 	ldh [hTextTileCacheHead], a       ; [hTextTileCacheHead] ← i  (update linked-list head)
-	ld h, $c9
+	ld h, HIGH(wc900)
 	ld b, [hl]
 	ld [hl], $0          ; prev[i] ← 0
-	ld h, $c8
+	ld h, HIGH(wc800)
 	ld a, c
 	ld c, [hl]
 	ld [hl], a           ; next[i] ← i0
 	ld l, b
 	ld [hl], c           ; next[prev[i]] ← next[i]
-	ld h, $c9
+	ld h, HIGH(wc900)
 	inc c
 	dec c
 	jr z, .asm_23af      ; if next[i] != NULL:
@@ -802,9 +800,9 @@ CaseHalfWidthLetter::
 	or a
 	ret z
 	ld a, e
-	cp $60
+	cp 'a' - 1
 	ret c
-	cp $7b
+	cp 'z' + 1
 	ret nc
 	sub 'a' - 'A'
 	ld e, a
diff --git a/src/home/start.asm b/src/home/start.asm
index b79b402..4c3bd2c 100644
--- a/src/home/start.asm
+++ b/src/home/start.asm
@@ -28,5 +28,5 @@ Start:
 	call ValidateSRAM
 	ld a, BANK(GameLoop)
 	call BankswitchROM
-	ld sp, $d000
+	ld sp, wStackTop
 	jp GameLoop
diff --git a/src/home/text_box.asm b/src/home/text_box.asm
index 92410f9..16e94ed 100644
--- a/src/home/text_box.asm
+++ b/src/home/text_box.asm
@@ -20,11 +20,9 @@ SafeCopyDataDEtoHL:
 DECoordToBGMap0Address:
 	ld l, e
 	ld h, $0
+REPT 5 ; *TILEMAP_WIDTH
 	add hl, hl
-	add hl, hl
-	add hl, hl
-	add hl, hl
-	add hl, hl
+ENDR
 	ld a, l
 	add d
 	ld l, a
diff --git a/src/home/tiles.asm b/src/home/tiles.asm
index 2f4c635..200f75c 100644
--- a/src/home/tiles.asm
+++ b/src/home/tiles.asm
@@ -60,10 +60,9 @@ LoadCardSet2Tiles::
 	ret z
 	ld l, a
 	ld h, 0
+REPT 4 ; *TILE_SIZE
 	add hl, hl
-	add hl, hl
-	add hl, hl
-	add hl, hl
+ENDR
 	ld de, DuelOtherGraphics + $1d tiles - $4000 ; card set 2 icons
 	add hl, de
 	ld de, v0Tiles1 + $7c tiles
@@ -146,14 +145,16 @@ LoadDuelCardSymbolTiles2::
 
 ; load the Deck and the Discard Pile icons
 LoadDeckAndDiscardPileIcons::
-	ld hl, $3148
-	ld de, $cb16
-	ld c, $08
+	ld hl, Pals_6f148 - $4000
+	ld de, wBackgroundPalettesCGB + 5 palettes
+	ld c, PAL_SIZE
 	call CopyFontsOrDuelGraphicsBytes
 	ld hl, DuelDeckAndDiscardPileIcons
-	ld de, $8a00
+	ld de, v0Tiles1 + $20 tiles
 	ld b, $0d
 	call CopyFontsOrDuelGraphicsTiles
+; fallthrough
+
 ; load the tiles for the player's / opponent's Play Area screen
 ; (uses a separate set of tiles on CGB vs DMG/SGB)
 LoadDuelPlayAreaScreenTiles::
@@ -169,9 +170,9 @@ LoadDuelPlayAreaScreenTiles::
 
 ; load the tiles for the [O] and [X] symbols used to display the results of a coin toss
 LoadDuelCoinTossResultTiles::
-	ld hl, $3108
-	ld de, $cafe
-	ld c, $08
+	ld hl, Pals_6f108 - $4000
+	ld de, wBackgroundPalettesCGB + 2 palettes
+	ld c, PAL_SIZE
 	call CopyFontsOrDuelGraphicsBytes
 	ld hl, DuelCoinTossResultTiles
 	ld de, v0Tiles2 + $30 tiles
@@ -215,10 +216,9 @@ LoadCardSymbolFontTilesToSRAM::
 	sub $d0
 	ld l, a
 	ld h, $00
+REPT 4 ; *TILE_SIZE
 	add hl, hl
-	add hl, hl
-	add hl, hl
-	add hl, hl ; *16
+ENDR
 	ld de, DuelDmgSgbSymbolGraphics - $4000
 	add hl, de
 	ld de, sGfxBuffer1 + $38 tiles
@@ -237,10 +237,10 @@ DrawDuelBoxMessage::
 	add a
 	ld e, a
 	ld d, 0
-	ld hl, $3110
+	ld hl, Pals_6f110 - $4000
 	add hl, de
-	ld de, $cafe
-	ld c, 8
+	ld de, wBackgroundPalettesCGB + 2 palettes
+	ld c, PAL_SIZE
 	call CopyFontsOrDuelGraphicsBytes
 	call BankswitchVRAM1
 	ld a, 2
@@ -259,7 +259,7 @@ DrawDuelBoxMessage::
 	ld de, v0Tiles1 + $20 tiles
 	ld b, 40
 	call CopyFontsOrDuelGraphicsTiles
-	ld a, $a0
+	ld a, $a0 ; v0Tiles1 + $20 tiles
 	lb hl, 1, 10
 ;	fallthrough
 
@@ -305,6 +305,7 @@ Copy1bppTiles::
 	jr nz, .tile_loop
 	ret
 
+; copy c bytes from BANK(Fonts):hl to de
 CopyFontsOrDuelGraphicsBytes::
 	ld a, BANK(Fonts) ; BANK(DuelGraphics)
 	call BankpushROM
diff --git a/src/layout.link b/src/layout.link
index 8fe1096..bb0652f 100644
--- a/src/layout.link
+++ b/src/layout.link
@@ -84,8 +84,60 @@ ROMX $1a
 	"Effect Functions 1"
 ROMX $1b
 	"Gfx 1"
-; Card graphics ($1b:74d0-$36) are pinned via BANK[]/ROMX[] in
-; gfx/card_graphics.asm, so they are not assigned here.
+ROMX $1c
+	"Gfx 2"
+ROMX $1d
+	"Card Gfx 1"
+ROMX $1e
+	"Card Gfx 2"
+ROMX $1f
+	"Card Gfx 3"
+ROMX $20
+	"Card Gfx 4"
+ROMX $21
+	"Card Gfx 5"
+ROMX $22
+	"Card Gfx 6"
+ROMX $23
+	"Card Gfx 7"
+ROMX $24
+	"Card Gfx 8"
+ROMX $25
+	"Card Gfx 9"
+ROMX $26
+	"Card Gfx 10"
+ROMX $27
+	"Card Gfx 11"
+ROMX $28
+	"Card Gfx 12"
+ROMX $29
+	"Card Gfx 13"
+ROMX $2a
+	"Card Gfx 14"
+ROMX $2b
+	"Card Gfx 15"
+ROMX $2c
+	"Card Gfx 16"
+ROMX $2d
+	"Card Gfx 17"
+ROMX $2e
+	"Card Gfx 18"
+ROMX $2f
+	"Card Gfx 19"
+ROMX $30
+	"Card Gfx 20"
+ROMX $31
+	"Card Gfx 21"
+ROMX $32
+	"Card Gfx 22"
+ROMX $33
+	"Card Gfx 23"
+ROMX $34
+	"Card Gfx 24"
+ROMX $35
+	"Card Gfx 25"
+ROMX $36
+	"Card Gfx 26"
 ROMX $37
 	"Text Offsets"
 ROMX $38
diff --git a/src/macros/data.asm b/src/macros/data.asm
index 1ab639f..6656487 100644
--- a/src/macros/data.asm
+++ b/src/macros/data.asm
@@ -103,6 +103,23 @@ MACRO? gfx
 	dw ($4000 * (BANK(\1) - BANK(CardGraphics)) + ((\1) - $4000)) / 8
 ENDM
 
+; card gfx tile attrmap
+MACRO? gfx_attrmap_start
+	DEF _current_card_tile_idx = 0
+	DEF _current_alt_card_tile_idx = 0
+ENDM
+; \1 = palette index
+; \2 = has-alt flag (TRUE/FALSE)
+MACRO? gfx_attrmap
+	IF \2 > 0 ; TRUE
+		db \1 << 6 | (48 + _current_alt_card_tile_idx - _current_card_tile_idx)
+		DEF _current_alt_card_tile_idx += 1
+	ELSE ; FALSE
+		db \1 << 6
+	ENDC
+	DEF _current_card_tile_idx += 1
+ENDM
+
 ; \1 = y offset
 ; \2 = x offset
 ; \3 = vtile
diff --git a/src/wram.asm b/src/wram.asm
index 350dcfb..37f4db1 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -17,6 +17,12 @@ wc000:: ; c000
 
 NEXTU
 
+; actually $300 bytes, extending into WRAM0 Duels 1
+wTempPrintableCardPic:: ; c000
+	; ds CARDGFXSTRUCT_TILES_SIZE
+
+NEXTU
+
 ; aside from wDecompressionBuffer, which stores the
 ; de facto final decompressed data after decompression,
 ; this buffer stores a secondary buffer that is used
@@ -1073,15 +1079,18 @@ wcd04:: ; cd6d
 wCurTextTile:: ; cd6e
 	ds $1
 
-; VRAM tile patterns selector for text tiles
-; if wTilePatternSelector == $80 and wTilePatternSelectorCorrection == $00 -> select tiles at $8000-$8FFF
-; if wTilePatternSelector == $88 and wTilePatternSelectorCorrection == $80 -> select tiles at $8800-$97FF
-wTilePatternSelector:: ; cd6f
+; text tile location
+; must use the same mode as wTextTileIndexSignednessAdjust
+; HIGH(v*Tiles1)    = default (LCDC_BLOCK21)
+; HIGH(sGfxBuffer1) = printer
+wTextTileBaseAddressHi:: ; cd6f
 	ds $1
 
-; complements wTilePatternSelector by correcting the VRAM tile order when $8800-$97FF is selected
-; a value of $80 in wTilePatternSelectorCorrection reflects tiles $00-$7f being located after tiles $80-$ff
-wTilePatternSelectorCorrection:: ; cd70
+; VRAM tile index converter (xor) for LCDC_BLOCK21 signed addressing
+; must use the same mode as wTextTileBaseAddressHi
+; $80 (signed)   = default (LCDC_BLOCK21)
+; $00 (unsigned) = printer, as if LCDC_BLOCK01
+wTextTileIndexSignednessAdjust:: ; cd70
 	ds $1
 
 ; if 0, text lines are separated by a blank line
@@ -1127,10 +1136,10 @@ wEffectFunctionsBank:: ; cd79
 	ds $1
 
 wCardPalettes:: ; cd7a
-	ds 3 palettes
+	ds CARDGFXSTRUCT_PALS_SIZE
 
 wCardAttrMap:: ; cd92
-	ds $30
+	ds CARDGFXSTRUCT_TILE_ATTRMAP_SIZE
 
 ; information about the text being currently processed, including font width,
 ; the rom bank, and the memory address of the next character to be printed.
@@ -1187,7 +1196,7 @@ wIsTextBoxLabeled:: ; cde2
 wTextBoxLabel:: ; cde3
 	ds $2
 
-; base address of the card's tiles, set up by LoadCardGfxRemapped
+; base address of the card's tiles, set up by LoadCardGfx_PrinterAlt
 wCardGfxTileBase:: ; cde5
 	ds $2
 
@@ -1395,6 +1404,13 @@ wBGColorFadeConfigList:: ; cece
 wOBColorFadeConfigList:: ; ceee
 	ds (NUM_OBJECT_PALETTES palettes) / 2
 
+; stack occupies the remainder of WRAM0
+SECTION "Stack", WRAM0
+
+wStackBottom::
+	ds $f2
+wStackTop:: ; d000
+
 SECTION "WRAM1", WRAMX
 
 ; stores a pointer to a temporary list of elements (e.g. pointer to wDuelTempList)
diff --git a/tools/extract_card_gfx.py b/tools/extract_card_gfx.py
index a108173..22d994f 100644
--- a/tools/extract_card_gfx.py
+++ b/tools/extract_card_gfx.py
@@ -5,7 +5,7 @@ baserom overlay into per-card sources + an asm layout.
 Card format (uncompressed, fixed 840 B), starting at CardGraphics + index*8:
   72-byte header = 3 GBC palettes (24 B) + a 48-entry attribute map.
                    Each map byte's high 2 bits pick that tile's palette; the
-                   low 6 bits are a tile index used by the alternate (LoadCardGfxRemapped)
+                   low 6 bits are a tile index used by the alternate (LoadCardGfx_PrinterAlt)
                    renderer. The portrait loader copies the 48 tiles 1:1, so for
                    the portrait each tile uses exactly one palette.
   768-byte tiles = 48 stored tiles x TILE_SIZE (column-major).
@@ -98,7 +98,7 @@ def header_asm(hdr):
 
 def extra_tile_bytes(rom, a):
     """bytes of printer tiles a card references past its 48-tile portrait.
-       LoadCardGfxRemapped reads source tile (attr[i]&$3f)+i; anything above 47
+       LoadCardGfx_PrinterAlt reads source tile (attr[i]&$3f)+i; anything above 47
        lives in the card's extra tiles right after the portrait."""
     attr = rom[a+24:a+72]
     return max(0, max((b & 0x3f) + j for j, b in enumerate(attr)) - 47) * 16
@@ -121,7 +121,7 @@ def build_segments(rom, byaddr):
     """Walk the region into typed segments:
          pre   - un-indexed gfx before CardGraphics ($1b tail, $1c)
          card  - the 840-byte portrait blob
-         extra - the card's printer tiles (read by LoadCardGfxRemapped)
+         extra - the card's printer tiles (read by LoadCardGfx_PrinterAlt)
          pad   - 0x00/0xff alignment between cards
        Misc/pad are split at 0x4000 bank boundaries."""
     starts = sorted(byaddr)
@@ -251,7 +251,7 @@ def main():
         header = (
             "; Card graphics. Each \"<Name>CardGfx\": 3 GBC palettes (rgb) + a 48-entry\n"
             "; attribute map (db; high 2 bits = each tile's palette, low 6 = a tile index\n"
-            "; for the alternate LoadCardGfxRemapped renderer), then INCBIN of the 48\n"
+            "; for the alternate LoadCardGfx_PrinterAlt renderer), then INCBIN of the 48\n"
             "; portrait tiles (built from gfx/cards/<name>.png, 4-shade grayscale, column-\n"
             "; major). A \"<Name>CardGfxExtra\" + INCBIN follows for cards whose printer\n"
             "; rendering pulls in extra tiles past the portrait; `ds` runs are inter-card\n"