Split duel graphics and document duel gfx loading functions

77 files changed, 120 insertions, 105 deletions

diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index 8852914..cb9f3a9 100644
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -15,7 +15,7 @@ GameLoop: ; 4000 (1:4000)
 	ld a, $1
 	ld [wUppercaseFlag], a
 	ei
-	farcall Func_1a6cc
+	farcall CommentedOut_1a6cc
 	ldh a, [hButtonsHeld]
 	cp A_BUTTON | B_BUTTON
 	jr z, .ask_erase_backup_ram
@@ -45,7 +45,7 @@ Func_405a: ; 405a (1:405a)
 	xor a
 	ld [wTileMapFill], a
 	call DisableLCD
-	call Func_2119
+	call LoadDuelHUDTiles
 	call Func_5aeb
 	ld de, $387f
 	call Func_2275
@@ -280,7 +280,7 @@ Func_420b: ; 420b (1:420b)
 	ld [wTileMapFill], a
 	call $5990
 	call EmptyScreen
-	call Func_2119
+	call LoadDuelHUDTiles
 	call Func_5aeb
 	ld de, $389f
 	call Func_2275
@@ -1503,7 +1503,7 @@ _TossCoin: ; 71ad (1:71ad)
 	xor a
 	ld [wcd9f], a
 	call EmptyScreen
-	call Func_210f
+	call LoadDuelCoinTossResultTiles
 
 .asm_71c1
 	ld a, [wcd9f]
diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm
index 22435ee..9f7ecef 100644
--- a/src/engine/bank2.asm
+++ b/src/engine/bank2.asm
@@ -46,8 +46,8 @@ Func_8d56: ; 8d56 (2:4d56)
 	call InitSpritePositions
 	ld a, $1
 	ld [wVBlankOAMCopyToggle], a
-	call Func_2119
-	call Func_20b0
+	call LoadDuelHUDTiles
+	call LoadDuelCardSymbolTiles
 	call Func_8d0b
 	bank1call Func_5aeb
 	ld de, $3cbf
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index 1fc8f11..79b2a1b 100644
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -14,7 +14,7 @@ LoadMap: ; c000 (3:4000)
 	call InitSpritePositions
 	xor a
 	ld [wTileMapFill], a
-	call Func_2119
+	call LoadDuelHUDTiles
 	call Set_OBJ_8x8
 	xor a
 	ld [wcd08], a
diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm
index 883065a..4aff798 100644
--- a/src/engine/bank4.asm
+++ b/src/engine/bank4.asm
@@ -2,7 +2,7 @@ Func_10000: ; 10000 (4:4000)
 	ld a, $0
 	ld [wTileMapFill], a
 	call EmptyScreen
-	call Func_2119
+	call LoadDuelHUDTiles
 	ld de, $307f
 	call Func_2275
 	call Set_OBJ_8x8
diff --git a/src/engine/bank6.asm b/src/engine/bank6.asm
index 18e8b98..0abc3ac 100644
--- a/src/engine/bank6.asm
+++ b/src/engine/bank6.asm
@@ -169,7 +169,7 @@ Func_1a61f: ; 1a61f (6:661f)
 
 	INCROM $1a68d, $1a6cc
 
-Func_1a6cc: ; 1a6cc (6:66cc)
+CommentedOut_1a6cc: ; 1a6cc (6:66cc)
 	ret
 ; 0x1a6cd
 
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 4c5ecfa..427864c 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -5570,69 +5570,78 @@ FillRectangle: ; 1f5f (0:1f5f)
 
 	INCROM $1f96, $20b0
 
-Func_20b0: ; 20b0 (0:20b0)
-	ld hl, DuelGraphics + $680 - $4000
+; loads the symbols that are displayed near the names of a list of cards in the hand or discard pile
+LoadDuelCardSymbolTiles: ; 20b0 (0:20b0)
+	ld hl, DuelGraphics - $4000
 	ld a, [wConsole]
 	cp CONSOLE_CGB
-	jr nz, .asm_20bd
-	ld hl, DuelGraphics + $e90 - $4000
-.asm_20bd
+	jr nz, .copy
+	ld hl, DuelGraphics + $810 - $4000
+.copy
 	ld de, v0Tiles1 + $500
 	ld b, $30
 	jr CopyFontsOrDuelGraphicsTiles
 
-Func_20c4: ; 20c4 (0:20c4)
-	ld hl, DuelGraphics + $6c0 - $4000
+; similar to LoadDuelCardSymbolTiles, but instead of loading the
+; basic Pokemon card symbol, it loads the face down stage 0 card
+LoadDuelCardSymbolTiles2: ; 20c4 (0:20c4)
+	ld hl, DuelGraphics + $40 - $4000
 	ld a, [wConsole]
 	cp CONSOLE_CGB
 	jr nz, .copy
-	ld hl, DuelGraphics + $ed0 - $4000
+	ld hl, DuelGraphics + $850 - $4000
 .copy
 	ld de, v0Tiles1 + $540
 	ld b, $c
 	jr CopyFontsOrDuelGraphicsTiles
 
-Func_20d8: ; 20d8 (0:20d8)
+; load the face down stage0 / stage1 / stage2 card images shown in the ckeck Pokemon screens
+LoadDuelFaceDownCardTiles: ; 20d8 (0:20d8)
 	ld b, $10
-	jr Func_20dc.asm_20de
+	jr LoadDuelCheckPokemonScreenTiles.asm_20de
 
-Func_20dc: ; 20dc (0:20dc)
+; same as LoadDuelFaceDownCardTiles, plus also load the ACT / BP text tiles
+LoadDuelCheckPokemonScreenTiles: ; 20dc (0:20dc)
 	ld b, $24
 .asm_20de
-	ld hl, DuelGraphics + $980 - $4000
+	ld hl, DuelGraphics + $300 - $4000
 	ld a, [wConsole]
 	cp CONSOLE_CGB
 	jr nz, .copy
-	ld hl, DuelGraphics + $1190 - $4000
+	ld hl, DuelGraphics + $b10 - $4000
 .copy
 	ld de, v0Tiles1 + $500
 	jr CopyFontsOrDuelGraphicsTiles
 
-Func_20f0: ; 20f0 (0:20f0)
-	ld hl, Fonts + $8
+; load the tiles for the "Placing the prizes..." screen
+LoadPlacingThePrizesScreenTiles: ; 20f0 (0:20f0)
+	; load the Pokeball field tiles
+	ld hl, DuelGraphics + $1020 - $4000
 	ld de, v0Tiles1 + $200
 	ld b, $d
 	call CopyFontsOrDuelGraphicsTiles
-	ld hl, DuelGraphics + $bc0 - $4000
+	; load the Deck image and the Discard Pile image
+	ld hl, DuelGraphics + $540 - $4000
 	ld a, [wConsole]
 	cp CONSOLE_CGB
 	jr nz, .copy
-	ld hl, DuelGraphics + $13d0 - $4000
+	ld hl, DuelGraphics + $d50 - $4000
 .copy
 	ld de, v0Tiles1 + $500
 	ld b, $30
 	jr CopyFontsOrDuelGraphicsTiles
 
-Func_210f: ; 210f (0:210f)
-	ld hl, DuelGraphics + $1770 - $4000
+; load the tiles for the [O] and [X] symbols used to display the results of a coin toss
+LoadDuelCoinTossResultTiles: ; 210f (0:210f)
+	ld hl, DuelGraphics + $10f0 - $4000
 	ld de, v0Tiles2 + $300
 	ld b, $8
 	jr CopyFontsOrDuelGraphicsTiles
 
-Func_2119: ; 2119 (0:2119)
-	ld hl, DuelGraphics - $4000
+LoadDuelHUDTiles: ; 2119 (0:2119)
+	ld hl, DuelHUDGraphics - $4000
 	ld de, v0Tiles2 ; destination
-	ld b, $38 ; number of tiles
+	ld b, (DuelCardTypeGraphics - DuelHUDGraphics) / TILE_SIZE ; number of tiles
 ;	fallthrough
 
 ; if hl ≤ $3fff
@@ -5650,11 +5659,11 @@ CopyFontsOrDuelGraphicsTiles:
 
 ; this function appears to copy duel gfx data into sram
 Func_212f: ; 212f (0:212f)
-	ld hl, DuelGraphics - $4000
+	ld hl, DuelHUDGraphics - $4000
 	ld de, $a400
 	ld b, $30
 	call CopyFontsOrDuelGraphicsTiles
-	ld hl, DuelGraphics + $17f0 - $4000
+	ld hl, DuelGraphics + $1170 - $4000
 	ld de, $a700
 	ld b, $08
 	call CopyFontsOrDuelGraphicsTiles
@@ -5666,12 +5675,12 @@ Func_212f: ; 212f (0:212f)
 	add hl, hl
 	add hl, hl
 	add hl, hl
-	ld de, DuelGraphics + $680 - $4000
+	ld de, DuelGraphics - $4000
 	add hl, de
 	ld de, $a780
 	ld b, $04
 	call CopyFontsOrDuelGraphicsTiles
-	ld hl, DuelGraphics + $680 - $4000
+	ld hl, DuelGraphics - $4000
 	ld de, $b100
 	ld b, $30
 	jr CopyFontsOrDuelGraphicsTiles
diff --git a/src/gfx.asm b/src/gfx.asm
index 91c072a..719d64b 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -8,12 +8,18 @@ INCBIN "gfx/fonts.t3.1bpp"
 VWF:: ; 76668 (1d:6668)
 INCBIN "gfx/vwf.1bpp"
 
-DuelGraphics:: ; 76968 (1d:6968)
-INCBIN "gfx/duel/duel_graphics.t5.2bpp", $0, $1698
+DuelHUDGraphics:: ; 76968 (1d:6968)
+INCBIN "gfx/duel/hud.2bpp"
+
+DuelCardTypeGraphics:: ; 76ce8 (1d:6ce8)
+INCBIN "gfx/duel/card_types.2bpp"
+
+DuelGraphics:: ; 76fe8 (1d:6fe8)
+INCBIN "gfx/duel/duel_graphics.t5.2bpp", $0, $1018
 
 SECTION "Gfx 2", ROMX
 
-INCBIN "gfx/duel/duel_graphics.t5.2bpp", $1698, $318
+INCBIN "gfx/duel/duel_graphics.t5.2bpp", $1018, $318
 
 DuelBoxMessages:: ; 78318 (1e:4318)
 INCBIN "gfx/duel/box_messages.2bpp"
@@ -47,11 +53,11 @@ PlayerGfx: ; 87d7e (21:7d7e)
 
 Duel55Gfx: ; 87fc0 (21:7fc0)
 	dw $2
-	INCBIN "gfx/duel/55.2bpp"
+	INCBIN "gfx/duel/anims/55.2bpp"
 
 Duel56Gfx: ; 87fe2 (21:7fe2)
 	dw $1
-	INCBIN "gfx/duel/56.2bpp"
+	INCBIN "gfx/duel/anims/56.2bpp"
 
 	INCROM $87ff4, $88000
 
@@ -95,7 +101,7 @@ OWSpritePlayer: ; 8be90 (22:7e90)
 
 Duel57Gfx: ; 8bfd2 (22:7fd2)
 	dw $1
-	INCBIN "gfx/duel/57.2bpp"
+	INCBIN "gfx/duel/anims/57.2bpp"
 
 	INCROM $8bfe4, $8c000
 
@@ -160,7 +166,7 @@ NintendoGfx: ; 8fe22 (23:7e22)
 
 Duel58Gfx: ; 8ffa4 (23:7fa4)
 	dw $4
-	INCBIN "gfx/duel/58.2bpp"
+	INCBIN "gfx/duel/anims/58.2bpp"
 
 	INCROM $8ffe6, $90000
 
@@ -216,11 +222,11 @@ HelpDeskLadyGfx: ; 93f26 (24:7f26)
 
 Duel59Gfx: ; 93fa8 (24:7fa8)
 	dw $3
-	INCBIN "gfx/duel/59.2bpp"
+	INCBIN "gfx/duel/anims/59.2bpp"
 
 Duel60Gfx: ; 93fda (24:7fda)
 	dw $2
-	INCBIN "gfx/duel/60.2bpp"
+	INCBIN "gfx/duel/anims/60.2bpp"
 
 rept $4
 	db $ff
@@ -306,11 +312,11 @@ OverworldMapOAMGfx: ; 9bf3a (26:7f3a)
 
 Duel61Gfx: ; 9bfbc (26:7fbc)
 	dw $3
-	INCBIN "gfx/duel/61.2bpp"
+	INCBIN "gfx/duel/anims/61.2bpp"
 
 Duel62Gfx: ; 9bfee (26:7fee)
 	dw $1
-	INCBIN "gfx/duel/62.2bpp"
+	INCBIN "gfx/duel/anims/62.2bpp"
 
 SECTION "Gfx 9", ROMX
 
@@ -428,11 +434,11 @@ MichaelGfx: ; 9fcf6 (27:7cf6)
 
 Duel63Gfx: ; 9ff38 (27:7f38)
 	dw $a
-	INCBIN "gfx/duel/63.2bpp"
+	INCBIN "gfx/duel/anims/63.2bpp"
 
 Duel64Gfx: ; 9ffda (27:7fda)
 	dw $2
-	INCBIN "gfx/duel/64.2bpp"
+	INCBIN "gfx/duel/anims/64.2bpp"
 
 rept $4
 	db $ff
@@ -606,11 +612,11 @@ OWSprite29: ; a3dc0 (28:7dc0)
 
 Duel65Gfx: ; a3f02 (28:7f02)
 	dw $b
-	INCBIN "gfx/duel/65.2bpp"
+	INCBIN "gfx/duel/anims/65.2bpp"
 
 Duel66Gfx: ; a3fb4 (28:7fb4)
 	dw $4
-	INCBIN "gfx/duel/66.2bpp"
+	INCBIN "gfx/duel/anims/66.2bpp"
 
 	INCROM $a3ff6, $a4000
 
@@ -630,187 +636,187 @@ OWSprite32: ; a4284 (29:4284)
 
 Duel0Gfx: ; a43c6 (29:43c6)
 	dw $16
-	INCBIN "gfx/duel/0.2bpp"
+	INCBIN "gfx/duel/anims/0.2bpp"
 
 Duel1Gfx: ; a4528 (29:4528)
 	dw $06
-	INCBIN "gfx/duel/1.2bpp"
+	INCBIN "gfx/duel/anims/1.2bpp"
 
 Duel2Gfx: ; a458a (29:458a)
 	dw $08
-	INCBIN "gfx/duel/2.2bpp"
+	INCBIN "gfx/duel/anims/2.2bpp"
 
 Duel3Gfx: ; a460c (29:460c)
 	dw $09
-	INCBIN "gfx/duel/3.2bpp"
+	INCBIN "gfx/duel/anims/3.2bpp"
 
 Duel4Gfx: ; a469e (29:469e)
 	dw $12
-	INCBIN "gfx/duel/4.2bpp"
+	INCBIN "gfx/duel/anims/4.2bpp"
 
 Duel5Gfx: ; a47c0 (29:47c0)
 	dw $09
-	INCBIN "gfx/duel/5.2bpp"
+	INCBIN "gfx/duel/anims/5.2bpp"
 
 Duel6Gfx: ; a4852 (29:4852)
 	dw $11
-	INCBIN "gfx/duel/6.2bpp"
+	INCBIN "gfx/duel/anims/6.2bpp"
 
 Duel7Gfx: ; a4964 (29:4964)
 	dw $2d
-	INCBIN "gfx/duel/7.2bpp"
+	INCBIN "gfx/duel/anims/7.2bpp"
 
 Duel8Gfx: ; a4c36 (29:4c36)
 	dw $0d
-	INCBIN "gfx/duel/8.2bpp"
+	INCBIN "gfx/duel/anims/8.2bpp"
 
 Duel9Gfx: ; a4d08 (29:4d08)
 	dw $1c
-	INCBIN "gfx/duel/9.2bpp"
+	INCBIN "gfx/duel/anims/9.2bpp"
 
 Duel10Gfx: ; a4eca (29:4eca)
 	dw $4c
-	INCBIN "gfx/duel/10.2bpp"
+	INCBIN "gfx/duel/anims/10.2bpp"
 
 Duel11Gfx: ; a538c (29:538c)
 	dw $1b
-	INCBIN "gfx/duel/11.2bpp"
+	INCBIN "gfx/duel/anims/11.2bpp"
 
 Duel12Gfx: ; a553e (29:553e)
 	dw $07
-	INCBIN "gfx/duel/12.2bpp"
+	INCBIN "gfx/duel/anims/12.2bpp"
 
 Duel13Gfx: ; a55b0 (29:55b0)
 	dw $0c
-	INCBIN "gfx/duel/13.2bpp"
+	INCBIN "gfx/duel/anims/13.2bpp"
 
 Duel14Gfx: ; a5672 (29:5672)
 	dw $22
-	INCBIN "gfx/duel/14.2bpp"
+	INCBIN "gfx/duel/anims/14.2bpp"
 
 Duel15Gfx: ; a5894 (29:5894)
 	dw $20
-	INCBIN "gfx/duel/15.2bpp"
+	INCBIN "gfx/duel/anims/15.2bpp"
 
 Duel16Gfx: ; a5a96 (29:5a96)
 	dw $0a
-	INCBIN "gfx/duel/16.2bpp"
+	INCBIN "gfx/duel/anims/16.2bpp"
 
 Duel17Gfx: ; a5b38 (29:5b38)
 	dw $25
-	INCBIN "gfx/duel/17.2bpp"
+	INCBIN "gfx/duel/anims/17.2bpp"
 
 Duel18Gfx: ; a5d8a (29:5d8a)
 	dw $18
-	INCBIN "gfx/duel/18.2bpp"
+	INCBIN "gfx/duel/anims/18.2bpp"
 
 Duel19Gfx: ; a5f0c (29:5f0c)
 	dw $1b
-	INCBIN "gfx/duel/19.2bpp"
+	INCBIN "gfx/duel/anims/19.2bpp"
 
 Duel20Gfx: ; a60be (29:60be)
 	dw $08
-	INCBIN "gfx/duel/20.2bpp"
+	INCBIN "gfx/duel/anims/20.2bpp"
 
 Duel21Gfx: ; a6140 (29:6140)
 	dw $0d
-	INCBIN "gfx/duel/21.2bpp"
+	INCBIN "gfx/duel/anims/21.2bpp"
 
 Duel22Gfx: ; a6212 (29:6212)
 	dw $22
-	INCBIN "gfx/duel/22.2bpp"
+	INCBIN "gfx/duel/anims/22.2bpp"
 
 Duel23Gfx: ; a6434 (29:6434)
 	dw $0c
-	INCBIN "gfx/duel/23.2bpp"
+	INCBIN "gfx/duel/anims/23.2bpp"
 
 Duel24Gfx: ; a64f6 (29:64f6)
 	dw $25
-	INCBIN "gfx/duel/24.2bpp"
+	INCBIN "gfx/duel/anims/24.2bpp"
 
 Duel25Gfx: ; a6748 (29:6748)
 	dw $22
-	INCBIN "gfx/duel/25.2bpp"
+	INCBIN "gfx/duel/anims/25.2bpp"
 
 Duel26Gfx: ; a696a (29:696a)
 	dw $0c
-	INCBIN "gfx/duel/26.2bpp"
+	INCBIN "gfx/duel/anims/26.2bpp"
 
 Duel27Gfx: ; a6a2c (29:6a2c)
 	dw $4c
-	INCBIN "gfx/duel/27.2bpp"
+	INCBIN "gfx/duel/anims/27.2bpp"
 
 Duel28Gfx: ; a6eee (29:6eee)
 	dw $08
-	INCBIN "gfx/duel/28.2bpp"
+	INCBIN "gfx/duel/anims/28.2bpp"
 
 Duel29Gfx: ; a6f70 (29:6f70)
 	dw $07
-	INCBIN "gfx/duel/29.2bpp"
+	INCBIN "gfx/duel/anims/29.2bpp"
 
 Duel30Gfx: ; a6fe2 (29:6fe2)
 	dw $1a
-	INCBIN "gfx/duel/30.2bpp"
+	INCBIN "gfx/duel/anims/30.2bpp"
 
 Duel31Gfx: ; a7184 (29:7184)
 	dw $0a
-	INCBIN "gfx/duel/31.2bpp"
+	INCBIN "gfx/duel/anims/31.2bpp"
 
 Duel32Gfx: ; a7226 (29:7226)
 	dw $2e
-	INCBIN "gfx/duel/32.2bpp"
+	INCBIN "gfx/duel/anims/32.2bpp"
 
 Duel33Gfx: ; a7508 (29:7508)
 	dw $08
-	INCBIN "gfx/duel/33.2bpp"
+	INCBIN "gfx/duel/anims/33.2bpp"
 
 Duel34Gfx: ; a758a (29:758a)
 	dw $07
-	INCBIN "gfx/duel/34.2bpp"
+	INCBIN "gfx/duel/anims/34.2bpp"
 
 Duel35Gfx: ; a75fc (29:75fc)
 	dw $1c
-	INCBIN "gfx/duel/35.2bpp"
+	INCBIN "gfx/duel/anims/35.2bpp"
 
 Duel36Gfx: ; a77be (29:77be)
 	dw $08
-	INCBIN "gfx/duel/36.2bpp"
+	INCBIN "gfx/duel/anims/36.2bpp"
 
 Duel37Gfx: ; a7840 (29:7840)
 	dw $0b
-	INCBIN "gfx/duel/37.2bpp"
+	INCBIN "gfx/duel/anims/37.2bpp"
 
 Duel38Gfx: ; a78f2 (29:78f2)
 	dw $1c
-	INCBIN "gfx/duel/38.2bpp"
+	INCBIN "gfx/duel/anims/38.2bpp"
 
 Duel39Gfx: ; a7ab4 (29:7ab4)
 	dw $16
-	INCBIN "gfx/duel/39.2bpp"
+	INCBIN "gfx/duel/anims/39.2bpp"
 
 Duel40Gfx: ; a7c16 (29:7c16)
 	dw $10
-	INCBIN "gfx/duel/40.2bpp"
+	INCBIN "gfx/duel/anims/40.2bpp"
 
 Duel41Gfx: ; a7d18 (29:7d18)
 	dw $0f
-	INCBIN "gfx/duel/41.2bpp"
+	INCBIN "gfx/duel/anims/41.2bpp"
 
 Duel42Gfx: ; a7e0a (29:7e0a)
 	dw $07
-	INCBIN "gfx/duel/42.2bpp"
+	INCBIN "gfx/duel/anims/42.2bpp"
 
 Duel43Gfx: ; a7e7c (29:7e7c)
 	dw $0a
-	INCBIN "gfx/duel/43.2bpp"
+	INCBIN "gfx/duel/anims/43.2bpp"
 
 Duel44Gfx: ; a7f1e (29:7f1e)
 	dw $09
-	INCBIN "gfx/duel/44.2bpp"
+	INCBIN "gfx/duel/anims/44.2bpp"
 
 Duel45Gfx: ; a7fb0 (29:7fb0)
 	dw $03
-	INCBIN "gfx/duel/45.2bpp"
+	INCBIN "gfx/duel/anims/45.2bpp"
 
 	INCROM $a7fe2, $a8000
 
@@ -818,39 +824,39 @@ SECTION "Gfx 12", ROMX
 
 Duel46Gfx: ; a8000 (2a:4000)
 	dw $08
-	INCBIN "gfx/duel/46.2bpp"
+	INCBIN "gfx/duel/anims/46.2bpp"
 
 Duel47Gfx: ; a8082 (2a:4082)
 	dw $0f
-	INCBIN "gfx/duel/47.2bpp"
+	INCBIN "gfx/duel/anims/47.2bpp"
 
 Duel48Gfx: ; a8174 (2a:4174)
 	dw $03
-	INCBIN "gfx/duel/48.2bpp"
+	INCBIN "gfx/duel/anims/48.2bpp"
 
 Duel49Gfx: ; a81a6 (2a:41a6)
 	dw $05
-	INCBIN "gfx/duel/49.2bpp"
+	INCBIN "gfx/duel/anims/49.2bpp"
 
 Duel50Gfx: ; a81f8 (2a:41f8)
 	dw $17
-	INCBIN "gfx/duel/50.2bpp"
+	INCBIN "gfx/duel/anims/50.2bpp"
 
 Duel51Gfx: ; a836a (2a:436a)
 	dw $36
-	INCBIN "gfx/duel/51.t10.2bpp"
+	INCBIN "gfx/duel/anims/51.t10.2bpp"
 
 Duel52Gfx: ; a86cc (2a:46cc)
 	dw $0b
-	INCBIN "gfx/duel/52.2bpp"
+	INCBIN "gfx/duel/anims/52.2bpp"
 
 Duel53Gfx: ; a877e (2a:477e)
 	dw $06
-	INCBIN "gfx/duel/53.2bpp"
+	INCBIN "gfx/duel/anims/53.2bpp"
 
 Duel54Gfx: ; a87e0 (2a:47e0)
 	dw $16
-	INCBIN "gfx/duel/54.2bpp"
+	INCBIN "gfx/duel/anims/54.2bpp"
 
 BoosterPackOAMGfx: ; a8942 (2a:4942)
 	dw $20
diff --git a/src/gfx/duel/0.png b/src/gfx/duel/anims/0.png
index f74b710..f74b710 100644
--- a/src/gfx/duel/0.png
+++ b/src/gfx/duel/anims/0.png
diff --git a/src/gfx/duel/1.png b/src/gfx/duel/anims/1.png
index fbdd03d..fbdd03d 100644
--- a/src/gfx/duel/1.png
+++ b/src/gfx/duel/anims/1.png
diff --git a/src/gfx/duel/10.png b/src/gfx/duel/anims/10.png
index abf7bf4..abf7bf4 100644
--- a/src/gfx/duel/10.png
+++ b/src/gfx/duel/anims/10.png
diff --git a/src/gfx/duel/11.png b/src/gfx/duel/anims/11.png
index 73a3564..73a3564 100644
--- a/src/gfx/duel/11.png
+++ b/src/gfx/duel/anims/11.png
diff --git a/src/gfx/duel/12.png b/src/gfx/duel/anims/12.png
index 55a7aff..55a7aff 100644
--- a/src/gfx/duel/12.png
+++ b/src/gfx/duel/anims/12.png
diff --git a/src/gfx/duel/13.png b/src/gfx/duel/anims/13.png
index 56cfaae..56cfaae 100644
--- a/src/gfx/duel/13.png
+++ b/src/gfx/duel/anims/13.png
diff --git a/src/gfx/duel/14.png b/src/gfx/duel/anims/14.png
index 4d7d038..4d7d038 100644
--- a/src/gfx/duel/14.png
+++ b/src/gfx/duel/anims/14.png
diff --git a/src/gfx/duel/15.png b/src/gfx/duel/anims/15.png
index 7003067..7003067 100644
--- a/src/gfx/duel/15.png
+++ b/src/gfx/duel/anims/15.png
diff --git a/src/gfx/duel/16.png b/src/gfx/duel/anims/16.png
index 8f15645..8f15645 100644
--- a/src/gfx/duel/16.png
+++ b/src/gfx/duel/anims/16.png
diff --git a/src/gfx/duel/17.png b/src/gfx/duel/anims/17.png
index 87cfac5..87cfac5 100644
--- a/src/gfx/duel/17.png
+++ b/src/gfx/duel/anims/17.png
diff --git a/src/gfx/duel/18.png b/src/gfx/duel/anims/18.png
index e1a10b1..e1a10b1 100644
--- a/src/gfx/duel/18.png
+++ b/src/gfx/duel/anims/18.png
diff --git a/src/gfx/duel/19.png b/src/gfx/duel/anims/19.png
index b2642f4..b2642f4 100644
--- a/src/gfx/duel/19.png
+++ b/src/gfx/duel/anims/19.png
diff --git a/src/gfx/duel/2.png b/src/gfx/duel/anims/2.png
index 6e10c3b..6e10c3b 100644
--- a/src/gfx/duel/2.png
+++ b/src/gfx/duel/anims/2.png
diff --git a/src/gfx/duel/20.png b/src/gfx/duel/anims/20.png
index 0b7fdaa..0b7fdaa 100644
--- a/src/gfx/duel/20.png
+++ b/src/gfx/duel/anims/20.png
diff --git a/src/gfx/duel/21.png b/src/gfx/duel/anims/21.png
index 8a6a885..8a6a885 100644
--- a/src/gfx/duel/21.png
+++ b/src/gfx/duel/anims/21.png
diff --git a/src/gfx/duel/22.png b/src/gfx/duel/anims/22.png
index 79f7a26..79f7a26 100644
--- a/src/gfx/duel/22.png
+++ b/src/gfx/duel/anims/22.png
diff --git a/src/gfx/duel/23.png b/src/gfx/duel/anims/23.png
index f04ef12..f04ef12 100644
--- a/src/gfx/duel/23.png
+++ b/src/gfx/duel/anims/23.png
diff --git a/src/gfx/duel/24.png b/src/gfx/duel/anims/24.png
index bfc7f47..bfc7f47 100644
--- a/src/gfx/duel/24.png
+++ b/src/gfx/duel/anims/24.png
diff --git a/src/gfx/duel/25.png b/src/gfx/duel/anims/25.png
index e71cec1..e71cec1 100644
--- a/src/gfx/duel/25.png
+++ b/src/gfx/duel/anims/25.png
diff --git a/src/gfx/duel/26.png b/src/gfx/duel/anims/26.png
index f8ed483..f8ed483 100644
--- a/src/gfx/duel/26.png
+++ b/src/gfx/duel/anims/26.png
diff --git a/src/gfx/duel/27.png b/src/gfx/duel/anims/27.png
index 4efe481..4efe481 100644
--- a/src/gfx/duel/27.png
+++ b/src/gfx/duel/anims/27.png
diff --git a/src/gfx/duel/28.png b/src/gfx/duel/anims/28.png
index 5962e5b..5962e5b 100644
--- a/src/gfx/duel/28.png
+++ b/src/gfx/duel/anims/28.png
diff --git a/src/gfx/duel/29.png b/src/gfx/duel/anims/29.png
index d73be15..d73be15 100644
--- a/src/gfx/duel/29.png
+++ b/src/gfx/duel/anims/29.png
diff --git a/src/gfx/duel/3.png b/src/gfx/duel/anims/3.png
index a4cd613..a4cd613 100644
--- a/src/gfx/duel/3.png
+++ b/src/gfx/duel/anims/3.png
diff --git a/src/gfx/duel/30.png b/src/gfx/duel/anims/30.png
index eb4f993..eb4f993 100644
--- a/src/gfx/duel/30.png
+++ b/src/gfx/duel/anims/30.png
diff --git a/src/gfx/duel/31.png b/src/gfx/duel/anims/31.png
index 726a9de..726a9de 100644
--- a/src/gfx/duel/31.png
+++ b/src/gfx/duel/anims/31.png
diff --git a/src/gfx/duel/32.png b/src/gfx/duel/anims/32.png
index 5696434..5696434 100644
--- a/src/gfx/duel/32.png
+++ b/src/gfx/duel/anims/32.png
diff --git a/src/gfx/duel/33.png b/src/gfx/duel/anims/33.png
index cec3c5c..cec3c5c 100644
--- a/src/gfx/duel/33.png
+++ b/src/gfx/duel/anims/33.png
diff --git a/src/gfx/duel/34.png b/src/gfx/duel/anims/34.png
index 3a23454..3a23454 100644
--- a/src/gfx/duel/34.png
+++ b/src/gfx/duel/anims/34.png
diff --git a/src/gfx/duel/35.png b/src/gfx/duel/anims/35.png
index 88b9a8a..88b9a8a 100644
--- a/src/gfx/duel/35.png
+++ b/src/gfx/duel/anims/35.png
diff --git a/src/gfx/duel/36.png b/src/gfx/duel/anims/36.png
index 75c6606..75c6606 100644
--- a/src/gfx/duel/36.png
+++ b/src/gfx/duel/anims/36.png
diff --git a/src/gfx/duel/37.png b/src/gfx/duel/anims/37.png
index 124a4aa..124a4aa 100644
--- a/src/gfx/duel/37.png
+++ b/src/gfx/duel/anims/37.png
diff --git a/src/gfx/duel/38.png b/src/gfx/duel/anims/38.png
index d13659f..d13659f 100644
--- a/src/gfx/duel/38.png
+++ b/src/gfx/duel/anims/38.png
diff --git a/src/gfx/duel/39.png b/src/gfx/duel/anims/39.png
index 72a5047..72a5047 100644
--- a/src/gfx/duel/39.png
+++ b/src/gfx/duel/anims/39.png
diff --git a/src/gfx/duel/4.png b/src/gfx/duel/anims/4.png
index bb53fa0..bb53fa0 100644
--- a/src/gfx/duel/4.png
+++ b/src/gfx/duel/anims/4.png
diff --git a/src/gfx/duel/40.png b/src/gfx/duel/anims/40.png
index f5c374a..f5c374a 100644
--- a/src/gfx/duel/40.png
+++ b/src/gfx/duel/anims/40.png
diff --git a/src/gfx/duel/41.png b/src/gfx/duel/anims/41.png
index fdd1218..fdd1218 100644
--- a/src/gfx/duel/41.png
+++ b/src/gfx/duel/anims/41.png
diff --git a/src/gfx/duel/42.png b/src/gfx/duel/anims/42.png
index 099ca70..099ca70 100644
--- a/src/gfx/duel/42.png
+++ b/src/gfx/duel/anims/42.png
diff --git a/src/gfx/duel/43.png b/src/gfx/duel/anims/43.png
index 216de05..216de05 100644
--- a/src/gfx/duel/43.png
+++ b/src/gfx/duel/anims/43.png
diff --git a/src/gfx/duel/44.png b/src/gfx/duel/anims/44.png
index b3a043e..b3a043e 100644
--- a/src/gfx/duel/44.png
+++ b/src/gfx/duel/anims/44.png
diff --git a/src/gfx/duel/45.png b/src/gfx/duel/anims/45.png
index b466614..b466614 100644
--- a/src/gfx/duel/45.png
+++ b/src/gfx/duel/anims/45.png
diff --git a/src/gfx/duel/46.png b/src/gfx/duel/anims/46.png
index 9a01563..9a01563 100644
--- a/src/gfx/duel/46.png
+++ b/src/gfx/duel/anims/46.png
diff --git a/src/gfx/duel/47.png b/src/gfx/duel/anims/47.png
index 9bf5047..9bf5047 100644
--- a/src/gfx/duel/47.png
+++ b/src/gfx/duel/anims/47.png
diff --git a/src/gfx/duel/48.png b/src/gfx/duel/anims/48.png
index 100bb49..100bb49 100644
--- a/src/gfx/duel/48.png
+++ b/src/gfx/duel/anims/48.png
diff --git a/src/gfx/duel/49.png b/src/gfx/duel/anims/49.png
index 07ba688..07ba688 100644
--- a/src/gfx/duel/49.png
+++ b/src/gfx/duel/anims/49.png
diff --git a/src/gfx/duel/5.png b/src/gfx/duel/anims/5.png
index baf7475..baf7475 100644
--- a/src/gfx/duel/5.png
+++ b/src/gfx/duel/anims/5.png
diff --git a/src/gfx/duel/50.png b/src/gfx/duel/anims/50.png
index b82049f..b82049f 100644
--- a/src/gfx/duel/50.png
+++ b/src/gfx/duel/anims/50.png
diff --git a/src/gfx/duel/51.t10.png b/src/gfx/duel/anims/51.t10.png
index 98eb770..98eb770 100644
--- a/src/gfx/duel/51.t10.png
+++ b/src/gfx/duel/anims/51.t10.png
diff --git a/src/gfx/duel/52.png b/src/gfx/duel/anims/52.png
index 420136f..420136f 100644
--- a/src/gfx/duel/52.png
+++ b/src/gfx/duel/anims/52.png
diff --git a/src/gfx/duel/53.png b/src/gfx/duel/anims/53.png
index 10a21f5..10a21f5 100644
--- a/src/gfx/duel/53.png
+++ b/src/gfx/duel/anims/53.png
diff --git a/src/gfx/duel/54.png b/src/gfx/duel/anims/54.png
index 7dbb527..7dbb527 100644
--- a/src/gfx/duel/54.png
+++ b/src/gfx/duel/anims/54.png
diff --git a/src/gfx/duel/55.png b/src/gfx/duel/anims/55.png
index ebab414..ebab414 100644
--- a/src/gfx/duel/55.png
+++ b/src/gfx/duel/anims/55.png
diff --git a/src/gfx/duel/56.png b/src/gfx/duel/anims/56.png
index dd82623..dd82623 100644
--- a/src/gfx/duel/56.png
+++ b/src/gfx/duel/anims/56.png
diff --git a/src/gfx/duel/57.png b/src/gfx/duel/anims/57.png
index 7b97f92..7b97f92 100644
--- a/src/gfx/duel/57.png
+++ b/src/gfx/duel/anims/57.png
diff --git a/src/gfx/duel/58.png b/src/gfx/duel/anims/58.png
index 8f8b22c..8f8b22c 100644
--- a/src/gfx/duel/58.png
+++ b/src/gfx/duel/anims/58.png
diff --git a/src/gfx/duel/59.png b/src/gfx/duel/anims/59.png
index 16b7344..16b7344 100644
--- a/src/gfx/duel/59.png
+++ b/src/gfx/duel/anims/59.png
diff --git a/src/gfx/duel/6.png b/src/gfx/duel/anims/6.png
index 80cc739..80cc739 100644
--- a/src/gfx/duel/6.png
+++ b/src/gfx/duel/anims/6.png
diff --git a/src/gfx/duel/60.png b/src/gfx/duel/anims/60.png
index dc60679..dc60679 100644
--- a/src/gfx/duel/60.png
+++ b/src/gfx/duel/anims/60.png
diff --git a/src/gfx/duel/61.png b/src/gfx/duel/anims/61.png
index de82420..de82420 100644
--- a/src/gfx/duel/61.png
+++ b/src/gfx/duel/anims/61.png
diff --git a/src/gfx/duel/62.png b/src/gfx/duel/anims/62.png
index c40fc22..c40fc22 100644
--- a/src/gfx/duel/62.png
+++ b/src/gfx/duel/anims/62.png
diff --git a/src/gfx/duel/63.png b/src/gfx/duel/anims/63.png
index 5ea882f..5ea882f 100644
--- a/src/gfx/duel/63.png
+++ b/src/gfx/duel/anims/63.png
diff --git a/src/gfx/duel/64.png b/src/gfx/duel/anims/64.png
index 36310a4..36310a4 100644
--- a/src/gfx/duel/64.png
+++ b/src/gfx/duel/anims/64.png
diff --git a/src/gfx/duel/65.png b/src/gfx/duel/anims/65.png
index 212a40d..212a40d 100644
--- a/src/gfx/duel/65.png
+++ b/src/gfx/duel/anims/65.png
diff --git a/src/gfx/duel/66.png b/src/gfx/duel/anims/66.png
index 65bebfb..65bebfb 100644
--- a/src/gfx/duel/66.png
+++ b/src/gfx/duel/anims/66.png
diff --git a/src/gfx/duel/7.png b/src/gfx/duel/anims/7.png
index c309ce9..c309ce9 100644
--- a/src/gfx/duel/7.png
+++ b/src/gfx/duel/anims/7.png
diff --git a/src/gfx/duel/8.png b/src/gfx/duel/anims/8.png
index 479b251..479b251 100644
--- a/src/gfx/duel/8.png
+++ b/src/gfx/duel/anims/8.png
diff --git a/src/gfx/duel/9.png b/src/gfx/duel/anims/9.png
index 3667ca8..3667ca8 100644
--- a/src/gfx/duel/9.png
+++ b/src/gfx/duel/anims/9.png
diff --git a/src/gfx/duel/card_types.png b/src/gfx/duel/card_types.png
new file mode 100644
index 0000000..b788b91
--- /dev/null
+++ b/src/gfx/duel/card_types.png
diff --git a/src/gfx/duel/duel_graphics.t5.png b/src/gfx/duel/duel_graphics.t5.png
index e36c5fb..6b6b8e3 100644
--- a/src/gfx/duel/duel_graphics.t5.png
+++ b/src/gfx/duel/duel_graphics.t5.png
diff --git a/src/gfx/duel/hud.png b/src/gfx/duel/hud.png
new file mode 100644
index 0000000..81afc3b
--- /dev/null
+++ b/src/gfx/duel/hud.png