Replace hardcoded gfx pointers to respective gfx

3 files changed, 496 insertions, 489 deletions

diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index 7e1b16a..f29e0e2 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -1467,103 +1467,104 @@ macro_1ce32: MACRO
 ENDM
 
 Data_1ce32: ; 1ce32 (7:4e32)
-	macro_1ce32 $00, $00, $00, $00,                               $00, $00
-	macro_1ce32 $28, $1f, $47, %10000000,                         $11, $00
-	macro_1ce32 $29, $20, $48, %10000000,                         $12, $00
-	macro_1ce32 $2a, $21, $49, %10000000,                         $13, $00
-	macro_1ce32 $2b, $22, $4a, %10000000,                         $14, $00
-	macro_1ce32 $2c, $23, $4b, %10000000,                         $15, $00
-	macro_1ce32 $2d, $24, $4c, %10000000,                         $16, $00
-	macro_1ce32 $2d, $24, $4d, %10000000,                         $16, $00
-	macro_1ce32 $2d, $24, $4e, %10000000,                         $17, $00
-	macro_1ce32 $2e, $25, $00, $00,                               $00, $00
-	macro_1ce32 $2f, $26, $5c, $00,                               $18, $00
-	macro_1ce32 $30, $27, $5e, $00,                               $19, $00
-	macro_1ce32 $31, $28, $5f, $00,                               $1a, $00
-	macro_1ce32 $32, $29, $60, %00000100,                         $1b, $00
-	macro_1ce32 $33, $2a, $61, $00,                               $1c, $00
-	macro_1ce32 $33, $2a, $62, $00,                               $1d, $00
-	macro_1ce32 $34, $2b, $63, %00000100,                         $1e, $00
-	macro_1ce32 $35, $2c, $64, $00,                               $1f, $00
-	macro_1ce32 $36, $2d, $69, %00000100,                         $20, $00
-	macro_1ce32 $37, $2e, $6a, $00,                               $21, $00
-	macro_1ce32 $38, $2f, $6b, %00000100,                         $22, $00
-	macro_1ce32 $39, $30, $6c, $00,                               $23, $00
-	macro_1ce32 $3a, $31, $6d, %00000100,                         $24, $00
-	macro_1ce32 $3b, $32, $6e, $00,                               $25, $00
-	macro_1ce32 $3c, $33, $6f, $00,                               $26, $00
-	macro_1ce32 $3d, $34, $70, %01000000 | %00000010,             $27, $00
-	macro_1ce32 $3e, $35, $71, %01000000 | %00000010,             $28, $00
-	macro_1ce32 $3f, $36, $72, $00,                               $29, $00
-	macro_1ce32 $3f, $36, $73, $00,                               $2a, $00
-	macro_1ce32 $40, $37, $74, $00,                               $2b, $00
-	macro_1ce32 $40, $37, $75, $00,                               $52, $00
-	macro_1ce32 $40, $37, $76, $00,                               $53, $00
-	macro_1ce32 $41, $38, $77, %00100000 | %00000001,             $2c, $00
-	macro_1ce32 $42, $39, $78, $00,                               $2d, $00
-	macro_1ce32 $43, $3a, $7a, $00,                               $2d, $00
-	macro_1ce32 $44, $3b, $7b, $00,                               $2e, $00
-	macro_1ce32 $42, $39, $79, $00,                               $2f, $00
-	macro_1ce32 $45, $3c, $7c, %00100000 | %00000001,             $30, $00
-	macro_1ce32 $46, $3d, $7d, $00,                               $31, $00
-	macro_1ce32 $47, $3e, $7e, $00,                               $32, $00
-	macro_1ce32 $48, $3f, $7f, $00,                               $33, $00
-	macro_1ce32 $49, $40, $80, $00,                               $34, $00
-	macro_1ce32 $4a, $41, $81, $00,                               $35, $00
-	macro_1ce32 $4b, $42, $82, $00,                               $36, $00
-	macro_1ce32 $4c, $43, $83, $00,                               $37, $00
-	macro_1ce32 $4d, $44, $84, $00,                               $38, $00
-	macro_1ce32 $4e, $45, $85, $00,                               $39, $00
-	macro_1ce32 $4f, $46, $86, $00,                               $3a, $00
-	macro_1ce32 $50, $47, $87, %00100000 | %00000001,             $3b, $00
-	macro_1ce32 $51, $48, $88, $00,                               $3c, $00
-	macro_1ce32 $52, $49, $89, $00,                               $3d, $00
-	macro_1ce32 $53, $4a, $8a, $00,                               $3e, $00
-	macro_1ce32 $54, $4b, $8b, $00,                               $3f, $00
-	macro_1ce32 $55, $4c, $8c, %00000100,                         $40, $00
-	macro_1ce32 $56, $4d, $8d, $00,                               $41, $00
-	macro_1ce32 $57, $4e, $8e, $00,                               $42, $00
-	macro_1ce32 $58, $4f, $8f, %00000100,                         $43, $00
-	macro_1ce32 $59, $50, $90, $00,                               $44, $00
-	macro_1ce32 $5a, $51, $92, $00,                               $45, $00
-	macro_1ce32 $5b, $52, $93, $00,                               $46, $00
-	macro_1ce32 $5c, $53, $94, $00,                               $47, $00
-	macro_1ce32 $5c, $53, $95, $00,                               $48, $00
-	macro_1ce32 $5d, $54, $97, $00,                               $49, $00
-	macro_1ce32 $5e, $55, $99, $00,                               $4a, $00
-	macro_1ce32 $4a, $56, $81, $00,                               $4b, $00
-	macro_1ce32 $5c, $53, $96, $00,                               $47, $00
-	macro_1ce32 $2d, $24, $4d, %10000000,                         $16, $00
-	macro_1ce32 $2d, $24, $4e, %10000000,                         $17, $00
-	macro_1ce32 $2f, $26, $5c, $00,                               $18, $00
-	macro_1ce32 $3a, $31, $6d, %00000100,                         $24, $00
-	macro_1ce32 $5f, $57, $9a, %10000000,                         $11, $00
-	macro_1ce32 $35, $2c, $65, %00000100,                         $5c, $00
-	macro_1ce32 $35, $2c, $66, %00000100,                         $00, $00
-	macro_1ce32 $5d, $54, $98, %00000100,                         $4c, $00
-	macro_1ce32 $59, $50, $91, %00000100,                         $4d, $00
-	macro_1ce32 $60, $58, $9b, $00,                               $4e, $00
-	macro_1ce32 $61, $59, $9c, $00,                               $4f, $00
-	macro_1ce32 $62, $5a, $9d, $00,                               $50, $00
-	macro_1ce32 $35, $2c, $67, %0000100,                          $51, $00
-	macro_1ce32 $35, $2c, $68, %0000100,                          $51, $00
-	macro_1ce32 $63, $5b, $9e, %10000000 | %00001000 | %00000100, $00, $00
-	macro_1ce32 $63, $5b, $9f, %10000000 | %00001000 | %00000100, $07, $00
-	macro_1ce32 $63, $5b, $a0, %10000000 | %00001000 | %00000100, $07, $00
-	macro_1ce32 $63, $5b, $a1, %10000000 | %00001000 | %00000100, $07, $00
-	macro_1ce32 $63, $5b, $a2, %10000000 | %00000100,             $00, $00
-	macro_1ce32 $63, $5b, $a3, %10000000 | %00001000 | %00000100, $00, $00
-	macro_1ce32 $63, $5b, $a4, %10000000 | %00001000 | %00000100, $00, $00
-	macro_1ce32 $63, $5b, $a5, %10000000 | %00001000 | %00000100, $00, $00
-	macro_1ce32 $64, $5c, $a7, %10000000 | %00001000 | %00000100, $00, $00
-	macro_1ce32 $64, $5c, $a8, %10000000 | %00001000 | %00000100, $0b, $00
-	macro_1ce32 $64, $5c, $a9, %10000000 | %00001000 | %00000100, $0b, $00
-	macro_1ce32 $64, $5c, $aa, %10000000 | %00000100,             $00, $00
-	macro_1ce32 $64, $5c, $ab, %10000000 | %00000100,             $00, $00
-	macro_1ce32 $65, $5d, $ac, %10000000 | %00000100,             $00, $00
-	macro_1ce32 $65, $5d, $ad, %10000000 | %00000100,             $00, $00
-	macro_1ce32 $65, $5d, $ae, %10000000 | %00000100,             $00, $00
-	macro_1ce32 $63, $5b, $a6, %10000000 | %00000100,             $00, $00
+; sprite id, ?, ?, anim flags, ?, ?
+	macro_1ce32 $00, $00, $00, $00,                               $00, $00 ; $00
+	macro_1ce32 $28, $1f, $47, %10000000,                         $11, $00 ; $01
+	macro_1ce32 $29, $20, $48, %10000000,                         $12, $00 ; $02
+	macro_1ce32 $2a, $21, $49, %10000000,                         $13, $00 ; $03
+	macro_1ce32 $2b, $22, $4a, %10000000,                         $14, $00 ; $04
+	macro_1ce32 $2c, $23, $4b, %10000000,                         $15, $00 ; $05
+	macro_1ce32 $2d, $24, $4c, %10000000,                         $16, $00 ; $06
+	macro_1ce32 $2d, $24, $4d, %10000000,                         $16, $00 ; $07
+	macro_1ce32 $2d, $24, $4e, %10000000,                         $17, $00 ; $08
+	macro_1ce32 $2e, $25, $00, $00,                               $00, $00 ; $09
+	macro_1ce32 $2f, $26, $5c, $00,                               $18, $00 ; $0a
+	macro_1ce32 $30, $27, $5e, $00,                               $19, $00 ; $0b
+	macro_1ce32 $31, $28, $5f, $00,                               $1a, $00 ; $0c
+	macro_1ce32 $32, $29, $60, %00000100,                         $1b, $00 ; $0d
+	macro_1ce32 $33, $2a, $61, $00,                               $1c, $00 ; $0e
+	macro_1ce32 $33, $2a, $62, $00,                               $1d, $00 ; $0f
+	macro_1ce32 $34, $2b, $63, %00000100,                         $1e, $00 ; $10
+	macro_1ce32 $35, $2c, $64, $00,                               $1f, $00 ; $11
+	macro_1ce32 $36, $2d, $69, %00000100,                         $20, $00 ; $12
+	macro_1ce32 $37, $2e, $6a, $00,                               $21, $00 ; $13
+	macro_1ce32 $38, $2f, $6b, %00000100,                         $22, $00 ; $14
+	macro_1ce32 $39, $30, $6c, $00,                               $23, $00 ; $15
+	macro_1ce32 $3a, $31, $6d, %00000100,                         $24, $00 ; $16
+	macro_1ce32 $3b, $32, $6e, $00,                               $25, $00 ; $17
+	macro_1ce32 $3c, $33, $6f, $00,                               $26, $00 ; $18
+	macro_1ce32 $3d, $34, $70, %01000000 | %00000010,             $27, $00 ; $19
+	macro_1ce32 $3e, $35, $71, %01000000 | %00000010,             $28, $00 ; $1a
+	macro_1ce32 $3f, $36, $72, $00,                               $29, $00 ; $1b
+	macro_1ce32 $3f, $36, $73, $00,                               $2a, $00 ; $1c
+	macro_1ce32 $40, $37, $74, $00,                               $2b, $00 ; $1d
+	macro_1ce32 $40, $37, $75, $00,                               $52, $00 ; $1e
+	macro_1ce32 $40, $37, $76, $00,                               $53, $00 ; $1f
+	macro_1ce32 $41, $38, $77, %00100000 | %00000001,             $2c, $00 ; $20
+	macro_1ce32 $42, $39, $78, $00,                               $2d, $00 ; $21
+	macro_1ce32 $43, $3a, $7a, $00,                               $2d, $00 ; $22
+	macro_1ce32 $44, $3b, $7b, $00,                               $2e, $00 ; $23
+	macro_1ce32 $42, $39, $79, $00,                               $2f, $00 ; $24
+	macro_1ce32 $45, $3c, $7c, %00100000 | %00000001,             $30, $00 ; $25
+	macro_1ce32 $46, $3d, $7d, $00,                               $31, $00 ; $26
+	macro_1ce32 $47, $3e, $7e, $00,                               $32, $00 ; $27
+	macro_1ce32 $48, $3f, $7f, $00,                               $33, $00 ; $28
+	macro_1ce32 $49, $40, $80, $00,                               $34, $00 ; $29
+	macro_1ce32 $4a, $41, $81, $00,                               $35, $00 ; $2a
+	macro_1ce32 $4b, $42, $82, $00,                               $36, $00 ; $2b
+	macro_1ce32 $4c, $43, $83, $00,                               $37, $00 ; $2c
+	macro_1ce32 $4d, $44, $84, $00,                               $38, $00 ; $2d
+	macro_1ce32 $4e, $45, $85, $00,                               $39, $00 ; $2e
+	macro_1ce32 $4f, $46, $86, $00,                               $3a, $00 ; $2f
+	macro_1ce32 $50, $47, $87, %00100000 | %00000001,             $3b, $00 ; $30
+	macro_1ce32 $51, $48, $88, $00,                               $3c, $00 ; $31
+	macro_1ce32 $52, $49, $89, $00,                               $3d, $00 ; $32
+	macro_1ce32 $53, $4a, $8a, $00,                               $3e, $00 ; $33
+	macro_1ce32 $54, $4b, $8b, $00,                               $3f, $00 ; $34
+	macro_1ce32 $55, $4c, $8c, %00000100,                         $40, $00 ; $35
+	macro_1ce32 $56, $4d, $8d, $00,                               $41, $00 ; $36
+	macro_1ce32 $57, $4e, $8e, $00,                               $42, $00 ; $37
+	macro_1ce32 $58, $4f, $8f, %00000100,                         $43, $00 ; $38
+	macro_1ce32 $59, $50, $90, $00,                               $44, $00 ; $39
+	macro_1ce32 $5a, $51, $92, $00,                               $45, $00 ; $3a
+	macro_1ce32 $5b, $52, $93, $00,                               $46, $00 ; $3b
+	macro_1ce32 $5c, $53, $94, $00,                               $47, $00 ; $3c
+	macro_1ce32 $5c, $53, $95, $00,                               $48, $00 ; $3d
+	macro_1ce32 $5d, $54, $97, $00,                               $49, $00 ; $3e
+	macro_1ce32 $5e, $55, $99, $00,                               $4a, $00 ; $3f
+	macro_1ce32 $4a, $56, $81, $00,                               $4b, $00 ; $40
+	macro_1ce32 $5c, $53, $96, $00,                               $47, $00 ; $41
+	macro_1ce32 $2d, $24, $4d, %10000000,                         $16, $00 ; $42
+	macro_1ce32 $2d, $24, $4e, %10000000,                         $17, $00 ; $43
+	macro_1ce32 $2f, $26, $5c, $00,                               $18, $00 ; $44
+	macro_1ce32 $3a, $31, $6d, %00000100,                         $24, $00 ; $45
+	macro_1ce32 $5f, $57, $9a, %10000000,                         $11, $00 ; $46
+	macro_1ce32 $35, $2c, $65, %00000100,                         $5c, $00 ; $47
+	macro_1ce32 $35, $2c, $66, %00000100,                         $00, $00 ; $48
+	macro_1ce32 $5d, $54, $98, %00000100,                         $4c, $00 ; $49
+	macro_1ce32 $59, $50, $91, %00000100,                         $4d, $00 ; $4a
+	macro_1ce32 $60, $58, $9b, $00,                               $4e, $00 ; $4b
+	macro_1ce32 $61, $59, $9c, $00,                               $4f, $00 ; $4c
+	macro_1ce32 $62, $5a, $9d, $00,                               $50, $00 ; $4d
+	macro_1ce32 $35, $2c, $67, %0000100,                          $51, $00 ; $4e
+	macro_1ce32 $35, $2c, $68, %0000100,                          $51, $00 ; $4f
+	macro_1ce32 $63, $5b, $9e, %10000000 | %00001000 | %00000100, $00, $00 ; $50
+	macro_1ce32 $63, $5b, $9f, %10000000 | %00001000 | %00000100, $07, $00 ; $51
+	macro_1ce32 $63, $5b, $a0, %10000000 | %00001000 | %00000100, $07, $00 ; $52
+	macro_1ce32 $63, $5b, $a1, %10000000 | %00001000 | %00000100, $07, $00 ; $53
+	macro_1ce32 $63, $5b, $a2, %10000000 | %00000100,             $00, $00 ; $54
+	macro_1ce32 $63, $5b, $a3, %10000000 | %00001000 | %00000100, $00, $00 ; $55
+	macro_1ce32 $63, $5b, $a4, %10000000 | %00001000 | %00000100, $00, $00 ; $56
+	macro_1ce32 $63, $5b, $a5, %10000000 | %00001000 | %00000100, $00, $00 ; $57
+	macro_1ce32 $64, $5c, $a7, %10000000 | %00001000 | %00000100, $00, $00 ; $58
+	macro_1ce32 $64, $5c, $a8, %10000000 | %00001000 | %00000100, $0b, $00 ; $59
+	macro_1ce32 $64, $5c, $a9, %10000000 | %00001000 | %00000100, $0b, $00 ; $5a
+	macro_1ce32 $64, $5c, $aa, %10000000 | %00000100,             $00, $00 ; $5b
+	macro_1ce32 $64, $5c, $ab, %10000000 | %00000100,             $00, $00 ; $5c
+	macro_1ce32 $65, $5d, $ac, %10000000 | %00000100,             $00, $00 ; $5d
+	macro_1ce32 $65, $5d, $ad, %10000000 | %00000100,             $00, $00 ; $5e
+	macro_1ce32 $65, $5d, $ae, %10000000 | %00000100,             $00, $00 ; $5f
+	macro_1ce32 $63, $5b, $a6, %10000000 | %00000100,             $00, $00 ; $60
 ; 0x1d078
 
 Func_1d078: ; 1d078 (7:5078)
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index bcb1e26..469b5f2 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -321,7 +321,7 @@ Func_8025b: ; 8025b (20:425b)
 	ld l, $4
 	call GetMapDataPointer
 	call LoadGraphicsPointerFromHL
-	ld a, [hl] ; tile size
+	ld a, [hl] ; sprite number of tiles
 	push af
 	ld [wCurSpriteNumTiles], a
 	ld a, TILE_SIZE
@@ -880,121 +880,128 @@ MapDataPointers_8100f: ; 8100f (20:500f)
 	db $52, $54, $08, $24
 	db $94, $56, $08, $24
 
+; \1 = gfx pointer
+; \2 = number of tiles
+gfx_pointer: MACRO
+	dwb \1, BANK(\1) - BANK(MapDataPointers_8116b)
+	db \2
+ENDM
+
 MapDataPointers_8116b: ; 8116b (20:516b)
-	db $90, $7e, $02, $14
-	db $a6, $7e, $05, $14
-	db $f8, $7d, $06, $14
-	db $d6, $58, $08, $14
-	db $18, $5a, $08, $14
-	db $5a, $5b, $08, $14
-	db $9c, $5c, $08, $14
-	db $de, $5d, $08, $14
-	db $20, $5f, $08, $1b
-	db $d2, $60, $08, $14
-	db $14, $62, $08, $14
-	db $56, $63, $08, $14
-	db $98, $64, $08, $14
-	db $da, $65, $08, $14
-	db $1c, $67, $08, $14
-	db $5e, $68, $08, $14
-	db $a0, $69, $08, $14
-	db $e2, $6a, $08, $14
-	db $24, $6c, $08, $14
-	db $66, $6d, $08, $14
-	db $a8, $6e, $08, $14
-	db $ea, $6f, $08, $14
-	db $2c, $71, $08, $14
-	db $6e, $72, $08, $14
-	db $b0, $73, $08, $14
-	db $f2, $74, $08, $14
-	db $34, $76, $08, $14
-	db $76, $77, $08, $14
-	db $b8, $78, $08, $14
-	db $fa, $79, $08, $14
-	db $3c, $7b, $08, $14
-	db $7e, $7c, $08, $14
-	db $c0, $7d, $08, $14
-	db $26, $7f, $04, $08
-	db $00, $40, $09, $14
-	db $42, $41, $09, $14
-	db $84, $42, $09, $14
-	db $3a, $7f, $06, $08
-	db $c6, $43, $09, $16
-	db $38, $7f, $07, $0a
-	db $02, $7f, $08, $0b
-	db $28, $45, $09, $06
-	db $8a, $45, $09, $08
-	db $c0, $7f, $01, $02
-	db $a4, $7f, $03, $04
-	db $0c, $46, $09, $09
-	db $9e, $46, $09, $12
-	db $c0, $47, $09, $09
-	db $52, $48, $09, $11
-	db $a8, $7f, $04, $03
-	db $64, $49, $09, $2d
-	db $36, $4c, $09, $0d
-	db $08, $4d, $09, $1c
-	db $ca, $4e, $09, $4c
-	db $bc, $7f, $06, $03
-	db $8c, $53, $09, $1b
-	db $3e, $55, $09, $07
-	db $b0, $55, $09, $0c
-	db $ee, $7f, $06, $01
-	db $72, $56, $09, $22
-	db $94, $58, $09, $20
-	db $96, $5a, $09, $0a
-	db $38, $5b, $09, $25
-	db $8a, $5d, $09, $18
-	db $0c, $5f, $09, $1b
-	db $be, $60, $09, $08
-	db $40, $61, $09, $0d
-	db $12, $62, $09, $22
-	db $34, $64, $09, $0c
-	db $f6, $64, $09, $25
-	db $48, $67, $09, $22
-	db $6a, $69, $09, $0c
-	db $2c, $6a, $09, $4c
-	db $ee, $6e, $09, $08
-	db $70, $6f, $09, $07
-	db $e2, $7f, $01, $01
-	db $e2, $6f, $09, $1a
-	db $84, $71, $09, $0a
-	db $26, $72, $09, $2e
-	db $08, $75, $09, $08
-	db $8a, $75, $09, $07
-	db $fc, $75, $09, $1c
-	db $b4, $7f, $08, $04
-	db $be, $77, $09, $08
-	db $40, $78, $09, $0b
-	db $d2, $7f, $02, $01
-	db $f2, $78, $09, $1c
-	db $b4, $7a, $09, $16
-	db $16, $7c, $09, $10
-	db $18, $7d, $09, $0f
-	db $0a, $7e, $09, $07
-	db $7c, $7e, $09, $0a
-	db $1e, $7f, $09, $09
-	db $da, $7f, $04, $02
-	db $da, $7f, $07, $02
-	db $b0, $7f, $09, $03
-	db $00, $40, $0a, $08
-	db $82, $40, $0a, $0f
-	db $74, $41, $0a, $03
-	db $a6, $41, $0a, $05
-	db $f8, $41, $0a, $17
-	db $6a, $43, $0a, $36
-	db $cc, $46, $0a, $0b
-	db $7e, $47, $0a, $06
-	db $e0, $47, $0a, $16
-	db $42, $49, $0a, $20
-	db $44, $4b, $0a, $14
-	db $86, $4c, $0a, $04
-	db $c8, $4c, $0a, $04
-	db $0a, $4d, $0a, $04
-	db $4c, $4d, $0a, $04
-	db $8e, $4d, $0a, $04
-	db $d0, $4d, $0a, $04
-	db $12, $4e, $0a, $04
+	gfx_pointer OWSpritePlayer,     $14 ; $00
+	gfx_pointer RonaldOWGfx,        $14 ; $01
+	gfx_pointer DoctorMasonOWGfx,   $14 ; $02
+	gfx_pointer OWSprite0,          $14 ; $03
+	gfx_pointer OWSprite1,          $14 ; $04
+	gfx_pointer OWSprite2,          $14 ; $05
+	gfx_pointer OWSprite3,          $14 ; $06
+	gfx_pointer OWSprite4,          $14 ; $07
+	gfx_pointer OWSprite5,          $1b ; $08
+	gfx_pointer OWSprite6,          $14 ; $09
+	gfx_pointer OWSprite7,          $14 ; $0a
+	gfx_pointer OWSprite8,          $14 ; $0b
+	gfx_pointer OWSprite9,          $14 ; $0c
+	gfx_pointer OWSprite10,         $14 ; $0d
+	gfx_pointer OWSprite11,         $14 ; $0e
+	gfx_pointer OWSprite12,         $14 ; $0f
+	gfx_pointer OWSprite13,         $14 ; $10
+	gfx_pointer OWSprite14,         $14 ; $11
+	gfx_pointer OWSprite15,         $14 ; $12
+	gfx_pointer OWSprite16,         $14 ; $13
+	gfx_pointer OWSprite17,         $14 ; $14
+	gfx_pointer OWSprite18,         $14 ; $15
+	gfx_pointer OWSprite19,         $14 ; $16
+	gfx_pointer OWSprite20,         $14 ; $17
+	gfx_pointer OWSprite21,         $14 ; $18
+	gfx_pointer OWSprite22,         $14 ; $19
+	gfx_pointer OWSprite23,         $14 ; $1a
+	gfx_pointer OWSprite24,         $14 ; $1b
+	gfx_pointer OWSprite25,         $14 ; $1c
+	gfx_pointer OWSprite26,         $14 ; $1d
+	gfx_pointer OWSprite27,         $14 ; $1e
+	gfx_pointer OWSprite28,         $14 ; $1f
+	gfx_pointer OWSprite29,         $14 ; $20
+	gfx_pointer HelpDeskLadyGfx,    $08 ; $21
+	gfx_pointer OWSprite30,         $14 ; $22
+	gfx_pointer OWSprite31,         $14 ; $23
+	gfx_pointer OWSprite32,         $14 ; $24
+	gfx_pointer OverworldMapOAMGfx, $08 ; $25
+	gfx_pointer Duel0Gfx,           $16 ; $26
+	gfx_pointer Duel63Gfx,          $0a ; $27
+	gfx_pointer Duel65Gfx,          $0b ; $28
+	gfx_pointer Duel1Gfx,           $06 ; $29
+	gfx_pointer Duel2Gfx,           $08 ; $2a
+	gfx_pointer Duel55Gfx,          $02 ; $2b
+	gfx_pointer Duel58Gfx,          $04 ; $2c
+	gfx_pointer Duel3Gfx,           $09 ; $2d
+	gfx_pointer Duel4Gfx,           $12 ; $2e
+	gfx_pointer Duel5Gfx,           $09 ; $2f
+	gfx_pointer Duel6Gfx,           $11 ; $30
+	gfx_pointer Duel59Gfx,          $03 ; $31
+	gfx_pointer Duel7Gfx,           $2d ; $32
+	gfx_pointer Duel8Gfx,           $0d ; $33
+	gfx_pointer Duel9Gfx,           $1c ; $34
+	gfx_pointer Duel10Gfx,          $4c ; $35
+	gfx_pointer Duel61Gfx,          $03 ; $36
+	gfx_pointer Duel11Gfx,          $1b ; $37
+	gfx_pointer Duel12Gfx,          $07 ; $38
+	gfx_pointer Duel13Gfx,          $0c ; $39
+	gfx_pointer Duel62Gfx,          $01 ; $3a
+	gfx_pointer Duel14Gfx,          $22 ; $3b
+	gfx_pointer Duel15Gfx,          $20 ; $3c
+	gfx_pointer Duel16Gfx,          $0a ; $3d
+	gfx_pointer Duel17Gfx,          $25 ; $3e
+	gfx_pointer Duel18Gfx,          $18 ; $3f
+	gfx_pointer Duel19Gfx,          $1b ; $40
+	gfx_pointer Duel20Gfx,          $08 ; $41
+	gfx_pointer Duel21Gfx,          $0d ; $42
+	gfx_pointer Duel22Gfx,          $22 ; $43
+	gfx_pointer Duel23Gfx,          $0c ; $44
+	gfx_pointer Duel24Gfx,          $25 ; $45
+	gfx_pointer Duel25Gfx,          $22 ; $46
+	gfx_pointer Duel26Gfx,          $0c ; $47
+	gfx_pointer Duel27Gfx,          $4c ; $48
+	gfx_pointer Duel28Gfx,          $08 ; $49
+	gfx_pointer Duel29Gfx,          $07 ; $4a
+	gfx_pointer Duel56Gfx,          $01 ; $4b
+	gfx_pointer Duel30Gfx,          $1a ; $4c
+	gfx_pointer Duel31Gfx,          $0a ; $4d
+	gfx_pointer Duel32Gfx,          $2e ; $4e
+	gfx_pointer Duel33Gfx,          $08 ; $4f
+	gfx_pointer Duel34Gfx,          $07 ; $50
+	gfx_pointer Duel35Gfx,          $1c ; $51
+	gfx_pointer Duel66Gfx,          $04 ; $52
+	gfx_pointer Duel36Gfx,          $08 ; $53
+	gfx_pointer Duel37Gfx,          $0b ; $54
+	gfx_pointer Duel57Gfx,          $01 ; $55
+	gfx_pointer Duel38Gfx,          $1c ; $56
+	gfx_pointer Duel39Gfx,          $16 ; $57
+	gfx_pointer Duel40Gfx,          $10 ; $58
+	gfx_pointer Duel41Gfx,          $0f ; $59
+	gfx_pointer Duel42Gfx,          $07 ; $5a
+	gfx_pointer Duel43Gfx,          $0a ; $5b
+	gfx_pointer Duel44Gfx,          $09 ; $5c
+	gfx_pointer Duel60Gfx,          $02 ; $5d
+	gfx_pointer Duel64Gfx,          $02 ; $5e
+	gfx_pointer Duel45Gfx,          $03 ; $5f
+	gfx_pointer Duel46Gfx,          $08 ; $60
+	gfx_pointer Duel47Gfx,          $0f ; $61
+	gfx_pointer Duel48Gfx,          $03 ; $62
+	gfx_pointer Duel49Gfx,          $05 ; $63
+	gfx_pointer Duel50Gfx,          $17 ; $64
+	gfx_pointer Duel51Gfx,          $36 ; $65
+	gfx_pointer Duel52Gfx,          $0b ; $66
+	gfx_pointer Duel53Gfx,          $06 ; $67
+	gfx_pointer Duel54Gfx,          $16 ; $68
+	gfx_pointer BoosterPackOAMGfx,  $20 ; $69
+	gfx_pointer PressStartGfx,      $14 ; $6a
+	gfx_pointer GrassGfx,           $04 ; $6b
+	gfx_pointer FireGfx,            $04 ; $6c
+	gfx_pointer WaterGfx,           $04 ; $6d
+	gfx_pointer ColorlessGfx,       $04 ; $6e
+	gfx_pointer LightningGfx,       $04 ; $6f
+	gfx_pointer PsychicGfx,         $04 ; $70
+	gfx_pointer FightingGfx,        $04 ; $71
 
 ; pointer low, pointer high, bank (minus $20), unknown
 SpriteAnimationPointers: ; 81333 (20:5333)
@@ -1220,173 +1227,172 @@ SpriteAnimationPointers: ; 81333 (20:5333)
 ; \2 = number of palettes
 ; \3 = number of OBJ colors
 palette_pointer: MACRO
-	dw \1
-	db BANK(\1) - BANK(MapDataPointers_81697)
+	dwb \1, BANK(\1) - BANK(MapDataPointers_81697)
 	db (\2 << 4) + \3
 ENDM
 
 MapDataPointers_81697: ; 81697 (20:5697)
-	palette_pointer Palette0,   8, 1
-	palette_pointer Palette1,   8, 0
-	palette_pointer Palette2,   8, 0
-	palette_pointer Palette3,   8, 0
-	palette_pointer Palette4,   8, 0
-	palette_pointer Palette5,   8, 0
-	palette_pointer Palette6,   8, 0
-	palette_pointer Palette7,   8, 0
-	palette_pointer Palette8,   8, 0
-	palette_pointer Palette9,   8, 0
-	palette_pointer Palette10,  8, 0
-	palette_pointer Palette11,  8, 0
-	palette_pointer Palette12,  8, 0
-	palette_pointer Palette13,  8, 0
-	palette_pointer Palette14,  8, 0
-	palette_pointer Palette15,  8, 0
-	palette_pointer Palette16,  8, 0
-	palette_pointer Palette17,  8, 0
-	palette_pointer Palette18,  8, 0
-	palette_pointer Palette19,  8, 0
-	palette_pointer Palette20,  8, 0
-	palette_pointer Palette21,  8, 0
-	palette_pointer Palette22,  8, 0
-	palette_pointer Palette23,  8, 0
-	palette_pointer Palette24,  8, 0
-	palette_pointer Palette25,  8, 0
-	palette_pointer Palette26,  8, 0
-	palette_pointer Palette27,  8, 0
-	palette_pointer Palette28,  8, 0
-	palette_pointer Palette29,  8, 2
-	palette_pointer Palette30,  8, 2
-	palette_pointer Palette31,  1, 1
-	palette_pointer Palette32,  1, 1
-	palette_pointer Palette33,  1, 1
-	palette_pointer Palette34,  1, 1
-	palette_pointer Palette35,  1, 1
-	palette_pointer Palette36,  1, 1
-	palette_pointer Palette37,  1, 1
-	palette_pointer Palette38,  1, 1
-	palette_pointer Palette39,  1, 1
-	palette_pointer Palette40,  1, 1
-	palette_pointer Palette41,  1, 1
-	palette_pointer Palette42,  1, 1
-	palette_pointer Palette43,  1, 1
-	palette_pointer Palette44,  1, 1
-	palette_pointer Palette45,  1, 1
-	palette_pointer Palette46,  1, 1
-	palette_pointer Palette47,  1, 1
-	palette_pointer Palette48,  1, 1
-	palette_pointer Palette49,  1, 1
-	palette_pointer Palette50,  1, 1
-	palette_pointer Palette51,  1, 1
-	palette_pointer Palette52,  1, 1
-	palette_pointer Palette53,  1, 1
-	palette_pointer Palette54,  1, 1
-	palette_pointer Palette55,  1, 1
-	palette_pointer Palette56,  1, 1
-	palette_pointer Palette57,  1, 1
-	palette_pointer Palette58,  1, 1
-	palette_pointer Palette59,  1, 1
-	palette_pointer Palette60,  1, 1
-	palette_pointer Palette61,  1, 1
-	palette_pointer Palette62,  1, 1
-	palette_pointer Palette63,  1, 1
-	palette_pointer Palette64,  1, 1
-	palette_pointer Palette65,  1, 1
-	palette_pointer Palette66,  1, 1
-	palette_pointer Palette67,  1, 1
-	palette_pointer Palette68,  1, 1
-	palette_pointer Palette69,  1, 1
-	palette_pointer Palette70,  1, 1
-	palette_pointer Palette71,  1, 1
-	palette_pointer Palette72,  1, 1
-	palette_pointer Palette73,  1, 1
-	palette_pointer Palette74,  1, 1
-	palette_pointer Palette75,  1, 1
-	palette_pointer Palette76,  1, 1
-	palette_pointer Palette77,  1, 1
-	palette_pointer Palette78,  1, 1
-	palette_pointer Palette79,  1, 1
-	palette_pointer Palette80,  1, 1
-	palette_pointer Palette81,  1, 1
-	palette_pointer Palette82,  1, 1
-	palette_pointer Palette83,  1, 1
-	palette_pointer Palette84,  1, 1
-	palette_pointer Palette85,  1, 1
-	palette_pointer Palette86,  1, 1
-	palette_pointer Palette87,  1, 1
-	palette_pointer Palette88,  1, 1
-	palette_pointer Palette89,  1, 1
-	palette_pointer Palette90,  1, 1
-	palette_pointer Palette91,  1, 1
-	palette_pointer Palette92,  1, 1
-	palette_pointer Palette93,  1, 1
-	palette_pointer Palette94,  8, 0
-	palette_pointer Palette95,  8, 0
-	palette_pointer Palette96,  8, 0
-	palette_pointer Palette97,  8, 0
-	palette_pointer Palette98,  8, 0
-	palette_pointer Palette99,  8, 0
-	palette_pointer Palette100, 8, 0
-	palette_pointer Palette101, 7, 0
-	palette_pointer Palette102, 7, 0
-	palette_pointer Palette103, 7, 0
-	palette_pointer Palette104, 7, 0
-	palette_pointer Palette105, 7, 0
-	palette_pointer Palette106, 7, 0
-	palette_pointer Palette107, 7, 0
-	palette_pointer Palette108, 0, 1
-	palette_pointer Palette109, 0, 1
-	palette_pointer Palette110, 0, 0
-	palette_pointer Palette111, 8, 1
-	palette_pointer Palette112, 8, 1
-	palette_pointer Palette113, 8, 1
-	palette_pointer Palette114, 4, 2
-	palette_pointer Palette115, 4, 2
-	palette_pointer Palette116, 4, 2
-	palette_pointer Palette117, 1, 0
-	palette_pointer Palette118, 6, 0
-	palette_pointer Palette119, 1, 0
-	palette_pointer Palette120, 1, 0
-	palette_pointer Palette121, 1, 0
-	palette_pointer Palette122, 1, 0
-	palette_pointer Palette123, 1, 0
-	palette_pointer Palette124, 1, 0
-	palette_pointer Palette125, 1, 0
-	palette_pointer Palette126, 1, 0
-	palette_pointer Palette127, 1, 0
-	palette_pointer Palette128, 1, 0
-	palette_pointer Palette129, 1, 0
-	palette_pointer Palette130, 1, 0
-	palette_pointer Palette131, 1, 0
-	palette_pointer Palette132, 1, 0
-	palette_pointer Palette133, 1, 0
-	palette_pointer Palette134, 1, 0
-	palette_pointer Palette135, 1, 0
-	palette_pointer Palette136, 1, 0
-	palette_pointer Palette137, 1, 0
-	palette_pointer Palette138, 1, 0
-	palette_pointer Palette139, 1, 0
-	palette_pointer Palette140, 1, 0
-	palette_pointer Palette141, 1, 0
-	palette_pointer Palette142, 1, 0
-	palette_pointer Palette143, 1, 0
-	palette_pointer Palette144, 1, 0
-	palette_pointer Palette145, 1, 0
-	palette_pointer Palette146, 1, 0
-	palette_pointer Palette147, 1, 0
-	palette_pointer Palette148, 1, 0
-	palette_pointer Palette149, 1, 0
-	palette_pointer Palette150, 1, 0
-	palette_pointer Palette151, 1, 0
-	palette_pointer Palette152, 1, 0
-	palette_pointer Palette153, 1, 0
-	palette_pointer Palette154, 1, 0
-	palette_pointer Palette155, 1, 0
-	palette_pointer Palette156, 1, 0
-	palette_pointer Palette157, 1, 0
-	palette_pointer Palette158, 1, 0
-	palette_pointer Palette159, 1, 0
-	palette_pointer Palette160, 1, 0
+	palette_pointer Palette0,   8, 1 ; $00
+	palette_pointer Palette1,   8, 0 ; $01
+	palette_pointer Palette2,   8, 0 ; $02
+	palette_pointer Palette3,   8, 0 ; $03
+	palette_pointer Palette4,   8, 0 ; $04
+	palette_pointer Palette5,   8, 0 ; $05
+	palette_pointer Palette6,   8, 0 ; $06
+	palette_pointer Palette7,   8, 0 ; $07
+	palette_pointer Palette8,   8, 0 ; $08
+	palette_pointer Palette9,   8, 0 ; $09
+	palette_pointer Palette10,  8, 0 ; $0a
+	palette_pointer Palette11,  8, 0 ; $0b
+	palette_pointer Palette12,  8, 0 ; $0c
+	palette_pointer Palette13,  8, 0 ; $0d
+	palette_pointer Palette14,  8, 0 ; $0e
+	palette_pointer Palette15,  8, 0 ; $0f
+	palette_pointer Palette16,  8, 0 ; $10
+	palette_pointer Palette17,  8, 0 ; $11
+	palette_pointer Palette18,  8, 0 ; $12
+	palette_pointer Palette19,  8, 0 ; $13
+	palette_pointer Palette20,  8, 0 ; $14
+	palette_pointer Palette21,  8, 0 ; $15
+	palette_pointer Palette22,  8, 0 ; $16
+	palette_pointer Palette23,  8, 0 ; $17
+	palette_pointer Palette24,  8, 0 ; $18
+	palette_pointer Palette25,  8, 0 ; $19
+	palette_pointer Palette26,  8, 0 ; $1a
+	palette_pointer Palette27,  8, 0 ; $1b
+	palette_pointer Palette28,  8, 0 ; $1c
+	palette_pointer Palette29,  8, 2 ; $1d
+	palette_pointer Palette30,  8, 2 ; $1e
+	palette_pointer Palette31,  1, 1 ; $1f
+	palette_pointer Palette32,  1, 1 ; $20
+	palette_pointer Palette33,  1, 1 ; $21
+	palette_pointer Palette34,  1, 1 ; $22
+	palette_pointer Palette35,  1, 1 ; $23
+	palette_pointer Palette36,  1, 1 ; $24
+	palette_pointer Palette37,  1, 1 ; $25
+	palette_pointer Palette38,  1, 1 ; $26
+	palette_pointer Palette39,  1, 1 ; $27
+	palette_pointer Palette40,  1, 1 ; $28
+	palette_pointer Palette41,  1, 1 ; $29
+	palette_pointer Palette42,  1, 1 ; $2a
+	palette_pointer Palette43,  1, 1 ; $2b
+	palette_pointer Palette44,  1, 1 ; $2c
+	palette_pointer Palette45,  1, 1 ; $2d
+	palette_pointer Palette46,  1, 1 ; $2e
+	palette_pointer Palette47,  1, 1 ; $2f
+	palette_pointer Palette48,  1, 1 ; $30
+	palette_pointer Palette49,  1, 1 ; $31
+	palette_pointer Palette50,  1, 1 ; $32
+	palette_pointer Palette51,  1, 1 ; $33
+	palette_pointer Palette52,  1, 1 ; $34
+	palette_pointer Palette53,  1, 1 ; $35
+	palette_pointer Palette54,  1, 1 ; $36
+	palette_pointer Palette55,  1, 1 ; $37
+	palette_pointer Palette56,  1, 1 ; $38
+	palette_pointer Palette57,  1, 1 ; $39
+	palette_pointer Palette58,  1, 1 ; $3a
+	palette_pointer Palette59,  1, 1 ; $3b
+	palette_pointer Palette60,  1, 1 ; $3c
+	palette_pointer Palette61,  1, 1 ; $3d
+	palette_pointer Palette62,  1, 1 ; $3e
+	palette_pointer Palette63,  1, 1 ; $3f
+	palette_pointer Palette64,  1, 1 ; $40
+	palette_pointer Palette65,  1, 1 ; $41
+	palette_pointer Palette66,  1, 1 ; $42
+	palette_pointer Palette67,  1, 1 ; $43
+	palette_pointer Palette68,  1, 1 ; $44
+	palette_pointer Palette69,  1, 1 ; $45
+	palette_pointer Palette70,  1, 1 ; $46
+	palette_pointer Palette71,  1, 1 ; $47
+	palette_pointer Palette72,  1, 1 ; $48
+	palette_pointer Palette73,  1, 1 ; $49
+	palette_pointer Palette74,  1, 1 ; $4a
+	palette_pointer Palette75,  1, 1 ; $4b
+	palette_pointer Palette76,  1, 1 ; $4c
+	palette_pointer Palette77,  1, 1 ; $4d
+	palette_pointer Palette78,  1, 1 ; $4e
+	palette_pointer Palette79,  1, 1 ; $4f
+	palette_pointer Palette80,  1, 1 ; $50
+	palette_pointer Palette81,  1, 1 ; $51
+	palette_pointer Palette82,  1, 1 ; $52
+	palette_pointer Palette83,  1, 1 ; $53
+	palette_pointer Palette84,  1, 1 ; $54
+	palette_pointer Palette85,  1, 1 ; $55
+	palette_pointer Palette86,  1, 1 ; $56
+	palette_pointer Palette87,  1, 1 ; $57
+	palette_pointer Palette88,  1, 1 ; $58
+	palette_pointer Palette89,  1, 1 ; $59
+	palette_pointer Palette90,  1, 1 ; $a5
+	palette_pointer Palette91,  1, 1 ; $5b
+	palette_pointer Palette92,  1, 1 ; $5c
+	palette_pointer Palette93,  1, 1 ; $5d
+	palette_pointer Palette94,  8, 0 ; $5e
+	palette_pointer Palette95,  8, 0 ; $5f
+	palette_pointer Palette96,  8, 0 ; $60
+	palette_pointer Palette97,  8, 0 ; $61
+	palette_pointer Palette98,  8, 0 ; $62
+	palette_pointer Palette99,  8, 0 ; $63
+	palette_pointer Palette100, 8, 0 ; $64
+	palette_pointer Palette101, 7, 0 ; $65
+	palette_pointer Palette102, 7, 0 ; $66
+	palette_pointer Palette103, 7, 0 ; $67
+	palette_pointer Palette104, 7, 0 ; $68
+	palette_pointer Palette105, 7, 0 ; $69
+	palette_pointer Palette106, 7, 0 ; $6a
+	palette_pointer Palette107, 7, 0 ; $6b
+	palette_pointer Palette108, 0, 1 ; $6c
+	palette_pointer Palette109, 0, 1 ; $6d
+	palette_pointer Palette110, 0, 0 ; $6e
+	palette_pointer Palette111, 8, 1 ; $6f
+	palette_pointer Palette112, 8, 1 ; $70
+	palette_pointer Palette113, 8, 1 ; $71
+	palette_pointer Palette114, 4, 2 ; $72
+	palette_pointer Palette115, 4, 2 ; $73
+	palette_pointer Palette116, 4, 2 ; $74
+	palette_pointer Palette117, 1, 0 ; $75
+	palette_pointer Palette118, 6, 0 ; $76
+	palette_pointer Palette119, 1, 0 ; $77
+	palette_pointer Palette120, 1, 0 ; $78
+	palette_pointer Palette121, 1, 0 ; $79
+	palette_pointer Palette122, 1, 0 ; $7a
+	palette_pointer Palette123, 1, 0 ; $7b
+	palette_pointer Palette124, 1, 0 ; $7c
+	palette_pointer Palette125, 1, 0 ; $7d
+	palette_pointer Palette126, 1, 0 ; $7e
+	palette_pointer Palette127, 1, 0 ; $7f
+	palette_pointer Palette128, 1, 0 ; $80
+	palette_pointer Palette129, 1, 0 ; $81
+	palette_pointer Palette130, 1, 0 ; $82
+	palette_pointer Palette131, 1, 0 ; $83
+	palette_pointer Palette132, 1, 0 ; $84
+	palette_pointer Palette133, 1, 0 ; $85
+	palette_pointer Palette134, 1, 0 ; $86
+	palette_pointer Palette135, 1, 0 ; $87
+	palette_pointer Palette136, 1, 0 ; $88
+	palette_pointer Palette137, 1, 0 ; $89
+	palette_pointer Palette138, 1, 0 ; $8a
+	palette_pointer Palette139, 1, 0 ; $8b
+	palette_pointer Palette140, 1, 0 ; $8c
+	palette_pointer Palette141, 1, 0 ; $8d
+	palette_pointer Palette142, 1, 0 ; $8e
+	palette_pointer Palette143, 1, 0 ; $8f
+	palette_pointer Palette144, 1, 0 ; $90
+	palette_pointer Palette145, 1, 0 ; $91
+	palette_pointer Palette146, 1, 0 ; $92
+	palette_pointer Palette147, 1, 0 ; $93
+	palette_pointer Palette148, 1, 0 ; $94
+	palette_pointer Palette149, 1, 0 ; $95
+	palette_pointer Palette150, 1, 0 ; $96
+	palette_pointer Palette151, 1, 0 ; $97
+	palette_pointer Palette152, 1, 0 ; $98
+	palette_pointer Palette153, 1, 0 ; $99
+	palette_pointer Palette154, 1, 0 ; $9a
+	palette_pointer Palette155, 1, 0 ; $9b
+	palette_pointer Palette156, 1, 0 ; $9c
+	palette_pointer Palette157, 1, 0 ; $9d
+	palette_pointer Palette158, 1, 0 ; $9e
+	palette_pointer Palette159, 1, 0 ; $9f
+	palette_pointer Palette160, 1, 0 ; $a0
 
 	INCROM $8191b, $83c5b
 
diff --git a/src/gfx.asm b/src/gfx.asm
index 4f62bf8..7802389 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -64,11 +64,11 @@ PlayerGfx: ; 87d7e (21:7d7e)
 	dw $24
 	INCBIN "gfx/duelists/player.2bpp"
 
-Duel55Gfx: ; 87fc0 (21:7fc0)
+Duel55Gfx:: ; 87fc0 (21:7fc0)
 	dw $2
 	INCBIN "gfx/duel/anims/55.2bpp"
 
-Duel56Gfx: ; 87fe2 (21:7fe2)
+Duel56Gfx:: ; 87fe2 (21:7fe2)
 	dw $1
 	INCBIN "gfx/duel/anims/56.2bpp"
 
@@ -108,11 +108,11 @@ GrassClubTilesetGfx: ; 8b91e (22:791e)
 	dw $57
 	INCBIN "gfx/tilesets/grassclub.2bpp"
 
-OWSpritePlayer: ; 8be90 (22:7e90)
+OWSpritePlayer:: ; 8be90 (22:7e90)
 	dw $14
 	INCBIN "gfx/overworld_sprites/player.2bpp"
 
-Duel57Gfx: ; 8bfd2 (22:7fd2)
+Duel57Gfx:: ; 8bfd2 (22:7fd2)
 	dw $1
 	INCBIN "gfx/duel/anims/57.2bpp"
 
@@ -184,7 +184,7 @@ NintendoGfx: ; 8fe22 (23:7e22)
 	dw $18
 	INCBIN "gfx/nintendo.2bpp"
 
-Duel58Gfx: ; 8ffa4 (23:7fa4)
+Duel58Gfx:: ; 8ffa4 (23:7fa4)
 	dw $4
 	INCBIN "gfx/duel/anims/58.2bpp"
 
@@ -236,15 +236,15 @@ CopyrightGfx: ; 93ce4 (24:7ce4)
 	dw $24
 	INCBIN "gfx/copyright.2bpp"
 
-HelpDeskLadyGfx: ; 93f26 (24:7f26)
+HelpDeskLadyGfx:: ; 93f26 (24:7f26)
 	dw $8
 	INCBIN "gfx/overworld_sprites/help_desk_lady.2bpp"
 
-Duel59Gfx: ; 93fa8 (24:7fa8)
+Duel59Gfx:: ; 93fa8 (24:7fa8)
 	dw $3
 	INCBIN "gfx/duel/anims/59.2bpp"
 
-Duel60Gfx: ; 93fda (24:7fda)
+Duel60Gfx:: ; 93fda (24:7fda)
 	dw $2
 	INCBIN "gfx/duel/anims/60.2bpp"
 
@@ -298,7 +298,7 @@ CompaniesGfx: ; 97b94 (25:7b94)
 	dw $31
 	INCBIN "gfx/companies.2bpp"
 
-RonaldOWGfx: ; 97ea6 (25:7ea6)
+RonaldOWGfx:: ; 97ea6 (25:7ea6)
 	dw $14
 	INCBIN "gfx/overworld_sprites/ronald.2bpp"
 
@@ -322,19 +322,19 @@ Titlescreen6Gfx: ; 9b0b6 (26:70b6)
 	dw $d4
 	INCBIN "gfx/titlescreen/titlescreen6.2bpp"
 
-DoctorMasonOWGfx: ; 9bdf8 (26:7df8)
+DoctorMasonOWGfx:: ; 9bdf8 (26:7df8)
 	dw $14
 	INCBIN "gfx/overworld_sprites/doctormason.2bpp"
 
-OverworldMapOAMGfx: ; 9bf3a (26:7f3a)
+OverworldMapOAMGfx:: ; 9bf3a (26:7f3a)
 	dw $8
 	INCBIN "gfx/overworld_map_oam.2bpp"
 
-Duel61Gfx: ; 9bfbc (26:7fbc)
+Duel61Gfx:: ; 9bfbc (26:7fbc)
 	dw $3
 	INCBIN "gfx/duel/anims/61.2bpp"
 
-Duel62Gfx: ; 9bfee (26:7fee)
+Duel62Gfx:: ; 9bfee (26:7fee)
 	dw $1
 	INCBIN "gfx/duel/anims/62.2bpp"
 
@@ -452,11 +452,11 @@ MichaelGfx: ; 9fcf6 (27:7cf6)
 	dw $24
 	INCBIN "gfx/duelists/michael.2bpp"
 
-Duel63Gfx: ; 9ff38 (27:7f38)
+Duel63Gfx:: ; 9ff38 (27:7f38)
 	dw $a
 	INCBIN "gfx/duel/anims/63.2bpp"
 
-Duel64Gfx: ; 9ffda (27:7fda)
+Duel64Gfx:: ; 9ffda (27:7fda)
 	dw $2
 	INCBIN "gfx/duel/anims/64.2bpp"
 
@@ -510,131 +510,131 @@ AaronGfx: ; a1694 (28:5694)
 	dw $24
 	INCBIN "gfx/duelists/aaron.2bpp"
 
-OWSprite0: ; a18d6 (28:58d6)
+OWSprite0:: ; a18d6 (28:58d6)
 	dw $14
 	INCBIN "gfx/overworld_sprites/0.2bpp"
 
-OWSprite1: ; a1a18 (28:5a18)
+OWSprite1:: ; a1a18 (28:5a18)
 	dw $14
 	INCBIN "gfx/overworld_sprites/1.2bpp"
 
-OWSprite2: ; a1b5a (28:5b5a)
+OWSprite2:: ; a1b5a (28:5b5a)
 	dw $14
 	INCBIN "gfx/overworld_sprites/2.2bpp"
 
-OWSprite3: ; a1c9c (28:5c9c)
+OWSprite3:: ; a1c9c (28:5c9c)
 	dw $14
 	INCBIN "gfx/overworld_sprites/3.2bpp"
 
-OWSprite4: ; a1dde (28:5dde)
+OWSprite4:: ; a1dde (28:5dde)
 	dw $14
 	INCBIN "gfx/overworld_sprites/4.2bpp"
 
-OWSprite5: ; a1f20 (28:5f20)
+OWSprite5:: ; a1f20 (28:5f20)
 	dw $1b
 	INCBIN "gfx/overworld_sprites/5.2bpp"
 
-OWSprite6: ; a20d2 (28:60d2)
+OWSprite6:: ; a20d2 (28:60d2)
 	dw $14
 	INCBIN "gfx/overworld_sprites/6.2bpp"
 
-OWSprite7: ; a2214 (28:6214)
+OWSprite7:: ; a2214 (28:6214)
 	dw $14
 	INCBIN "gfx/overworld_sprites/7.2bpp"
 
-OWSprite8: ; a2356 (28:6356)
+OWSprite8:: ; a2356 (28:6356)
 	dw $14
 	INCBIN "gfx/overworld_sprites/8.2bpp"
 
-OWSprite9: ; a2498 (28:6498)
+OWSprite9:: ; a2498 (28:6498)
 	dw $14
 	INCBIN "gfx/overworld_sprites/9.2bpp"
 
-OWSprite10: ; a25da (28:65da)
+OWSprite10:: ; a25da (28:65da)
 	dw $14
 	INCBIN "gfx/overworld_sprites/10.2bpp"
 
-OWSprite11: ; a271c (28:671c)
+OWSprite11:: ; a271c (28:671c)
 	dw $14
 	INCBIN "gfx/overworld_sprites/11.2bpp"
 
-OWSprite12: ; a285e (28:685e)
+OWSprite12:: ; a285e (28:685e)
 	dw $14
 	INCBIN "gfx/overworld_sprites/12.2bpp"
 
-OWSprite13: ; a29a0 (28:69a0)
+OWSprite13:: ; a29a0 (28:69a0)
 	dw $14
 	INCBIN "gfx/overworld_sprites/13.2bpp"
 
-OWSprite14: ; a2ae2 (28:6ae2)
+OWSprite14:: ; a2ae2 (28:6ae2)
 	dw $14
 	INCBIN "gfx/overworld_sprites/14.2bpp"
 
-OWSprite15: ; a2c24 (28:6c24)
+OWSprite15:: ; a2c24 (28:6c24)
 	dw $14
 	INCBIN "gfx/overworld_sprites/15.2bpp"
 
-OWSprite16: ; a2d66 (28:6d66)
+OWSprite16:: ; a2d66 (28:6d66)
 	dw $14
 	INCBIN "gfx/overworld_sprites/16.2bpp"
 
-OWSprite17: ; a2ea8 (28:6ea8)
+OWSprite17:: ; a2ea8 (28:6ea8)
 	dw $14
 	INCBIN "gfx/overworld_sprites/17.2bpp"
 
-OWSprite18: ; a2fea (28:6fea)
+OWSprite18:: ; a2fea (28:6fea)
 	dw $14
 	INCBIN "gfx/overworld_sprites/18.2bpp"
 
-OWSprite19: ; a312c (28:712c)
+OWSprite19:: ; a312c (28:712c)
 	dw $14
 	INCBIN "gfx/overworld_sprites/19.2bpp"
 
-OWSprite20: ; a326e (28:726e)
+OWSprite20:: ; a326e (28:726e)
 	dw $14
 	INCBIN "gfx/overworld_sprites/20.2bpp"
 
-OWSprite21: ; a33b0 (28:73b0)
+OWSprite21:: ; a33b0 (28:73b0)
 	dw $14
 	INCBIN "gfx/overworld_sprites/21.2bpp"
 
-OWSprite22: ; a34f2 (28:74f2)
+OWSprite22:: ; a34f2 (28:74f2)
 	dw $14
 	INCBIN "gfx/overworld_sprites/22.2bpp"
 
-OWSprite23: ; a3634 (28:7634)
+OWSprite23:: ; a3634 (28:7634)
 	dw $14
 	INCBIN "gfx/overworld_sprites/23.2bpp"
 
-OWSprite24: ; a3776 (28:7776)
+OWSprite24:: ; a3776 (28:7776)
 	dw $14
 	INCBIN "gfx/overworld_sprites/24.2bpp"
 
-OWSprite25: ; a38b8 (28:78b8)
+OWSprite25:: ; a38b8 (28:78b8)
 	dw $14
 	INCBIN "gfx/overworld_sprites/25.2bpp"
 
-OWSprite26: ; a39fa (28:79fa)
+OWSprite26:: ; a39fa (28:79fa)
 	dw $14
 	INCBIN "gfx/overworld_sprites/26.2bpp"
 
-OWSprite27: ; a3b3c (28:7b3c)
+OWSprite27:: ; a3b3c (28:7b3c)
 	dw $14
 	INCBIN "gfx/overworld_sprites/27.2bpp"
 
-OWSprite28: ; a3c7e (28:7c7e)
+OWSprite28:: ; a3c7e (28:7c7e)
 	dw $14
 	INCBIN "gfx/overworld_sprites/28.2bpp"
 
-OWSprite29: ; a3dc0 (28:7dc0)
+OWSprite29:: ; a3dc0 (28:7dc0)
 	dw $14
 	INCBIN "gfx/overworld_sprites/29.2bpp"
 
-Duel65Gfx: ; a3f02 (28:7f02)
+Duel65Gfx:: ; a3f02 (28:7f02)
 	dw $b
 	INCBIN "gfx/duel/anims/65.2bpp"
 
-Duel66Gfx: ; a3fb4 (28:7fb4)
+Duel66Gfx:: ; a3fb4 (28:7fb4)
 	dw $4
 	INCBIN "gfx/duel/anims/66.2bpp"
 
@@ -644,199 +644,199 @@ Palette117:: ; a3ff6 (28:7ff6)
 
 SECTION "Gfx 11", ROMX
 
-OWSprite30: ; a4000 (29:4000)
+OWSprite30:: ; a4000 (29:4000)
 	dw $14
 	INCBIN "gfx/overworld_sprites/30.2bpp"
 
-OWSprite31: ; a4142 (29:4142)
+OWSprite31:: ; a4142 (29:4142)
 	dw $14
 	INCBIN "gfx/overworld_sprites/31.2bpp"
 
-OWSprite32: ; a4284 (29:4284)
+OWSprite32:: ; a4284 (29:4284)
 	dw $14
 	INCBIN "gfx/overworld_sprites/32.2bpp"
 
-Duel0Gfx: ; a43c6 (29:43c6)
+Duel0Gfx:: ; a43c6 (29:43c6)
 	dw $16
 	INCBIN "gfx/duel/anims/0.2bpp"
 
-Duel1Gfx: ; a4528 (29:4528)
+Duel1Gfx:: ; a4528 (29:4528)
 	dw $06
 	INCBIN "gfx/duel/anims/1.2bpp"
 
-Duel2Gfx: ; a458a (29:458a)
+Duel2Gfx:: ; a458a (29:458a)
 	dw $08
 	INCBIN "gfx/duel/anims/2.2bpp"
 
-Duel3Gfx: ; a460c (29:460c)
+Duel3Gfx:: ; a460c (29:460c)
 	dw $09
 	INCBIN "gfx/duel/anims/3.2bpp"
 
-Duel4Gfx: ; a469e (29:469e)
+Duel4Gfx:: ; a469e (29:469e)
 	dw $12
 	INCBIN "gfx/duel/anims/4.2bpp"
 
-Duel5Gfx: ; a47c0 (29:47c0)
+Duel5Gfx:: ; a47c0 (29:47c0)
 	dw $09
 	INCBIN "gfx/duel/anims/5.2bpp"
 
-Duel6Gfx: ; a4852 (29:4852)
+Duel6Gfx:: ; a4852 (29:4852)
 	dw $11
 	INCBIN "gfx/duel/anims/6.2bpp"
 
-Duel7Gfx: ; a4964 (29:4964)
+Duel7Gfx:: ; a4964 (29:4964)
 	dw $2d
 	INCBIN "gfx/duel/anims/7.2bpp"
 
-Duel8Gfx: ; a4c36 (29:4c36)
+Duel8Gfx:: ; a4c36 (29:4c36)
 	dw $0d
 	INCBIN "gfx/duel/anims/8.2bpp"
 
-Duel9Gfx: ; a4d08 (29:4d08)
+Duel9Gfx:: ; a4d08 (29:4d08)
 	dw $1c
 	INCBIN "gfx/duel/anims/9.2bpp"
 
-Duel10Gfx: ; a4eca (29:4eca)
+Duel10Gfx:: ; a4eca (29:4eca)
 	dw $4c
 	INCBIN "gfx/duel/anims/10.2bpp"
 
-Duel11Gfx: ; a538c (29:538c)
+Duel11Gfx:: ; a538c (29:538c)
 	dw $1b
 	INCBIN "gfx/duel/anims/11.2bpp"
 
-Duel12Gfx: ; a553e (29:553e)
+Duel12Gfx:: ; a553e (29:553e)
 	dw $07
 	INCBIN "gfx/duel/anims/12.2bpp"
 
-Duel13Gfx: ; a55b0 (29:55b0)
+Duel13Gfx:: ; a55b0 (29:55b0)
 	dw $0c
 	INCBIN "gfx/duel/anims/13.2bpp"
 
-Duel14Gfx: ; a5672 (29:5672)
+Duel14Gfx:: ; a5672 (29:5672)
 	dw $22
 	INCBIN "gfx/duel/anims/14.2bpp"
 
-Duel15Gfx: ; a5894 (29:5894)
+Duel15Gfx:: ; a5894 (29:5894)
 	dw $20
 	INCBIN "gfx/duel/anims/15.2bpp"
 
-Duel16Gfx: ; a5a96 (29:5a96)
+Duel16Gfx:: ; a5a96 (29:5a96)
 	dw $0a
 	INCBIN "gfx/duel/anims/16.2bpp"
 
-Duel17Gfx: ; a5b38 (29:5b38)
+Duel17Gfx:: ; a5b38 (29:5b38)
 	dw $25
 	INCBIN "gfx/duel/anims/17.2bpp"
 
-Duel18Gfx: ; a5d8a (29:5d8a)
+Duel18Gfx:: ; a5d8a (29:5d8a)
 	dw $18
 	INCBIN "gfx/duel/anims/18.2bpp"
 
-Duel19Gfx: ; a5f0c (29:5f0c)
+Duel19Gfx:: ; a5f0c (29:5f0c)
 	dw $1b
 	INCBIN "gfx/duel/anims/19.2bpp"
 
-Duel20Gfx: ; a60be (29:60be)
+Duel20Gfx:: ; a60be (29:60be)
 	dw $08
 	INCBIN "gfx/duel/anims/20.2bpp"
 
-Duel21Gfx: ; a6140 (29:6140)
+Duel21Gfx:: ; a6140 (29:6140)
 	dw $0d
 	INCBIN "gfx/duel/anims/21.2bpp"
 
-Duel22Gfx: ; a6212 (29:6212)
+Duel22Gfx:: ; a6212 (29:6212)
 	dw $22
 	INCBIN "gfx/duel/anims/22.2bpp"
 
-Duel23Gfx: ; a6434 (29:6434)
+Duel23Gfx:: ; a6434 (29:6434)
 	dw $0c
 	INCBIN "gfx/duel/anims/23.2bpp"
 
-Duel24Gfx: ; a64f6 (29:64f6)
+Duel24Gfx:: ; a64f6 (29:64f6)
 	dw $25
 	INCBIN "gfx/duel/anims/24.2bpp"
 
-Duel25Gfx: ; a6748 (29:6748)
+Duel25Gfx:: ; a6748 (29:6748)
 	dw $22
 	INCBIN "gfx/duel/anims/25.2bpp"
 
-Duel26Gfx: ; a696a (29:696a)
+Duel26Gfx:: ; a696a (29:696a)
 	dw $0c
 	INCBIN "gfx/duel/anims/26.2bpp"
 
-Duel27Gfx: ; a6a2c (29:6a2c)
+Duel27Gfx:: ; a6a2c (29:6a2c)
 	dw $4c
 	INCBIN "gfx/duel/anims/27.2bpp"
 
-Duel28Gfx: ; a6eee (29:6eee)
+Duel28Gfx:: ; a6eee (29:6eee)
 	dw $08
 	INCBIN "gfx/duel/anims/28.2bpp"
 
-Duel29Gfx: ; a6f70 (29:6f70)
+Duel29Gfx:: ; a6f70 (29:6f70)
 	dw $07
 	INCBIN "gfx/duel/anims/29.2bpp"
 
-Duel30Gfx: ; a6fe2 (29:6fe2)
+Duel30Gfx:: ; a6fe2 (29:6fe2)
 	dw $1a
 	INCBIN "gfx/duel/anims/30.2bpp"
 
-Duel31Gfx: ; a7184 (29:7184)
+Duel31Gfx:: ; a7184 (29:7184)
 	dw $0a
 	INCBIN "gfx/duel/anims/31.2bpp"
 
-Duel32Gfx: ; a7226 (29:7226)
+Duel32Gfx:: ; a7226 (29:7226)
 	dw $2e
 	INCBIN "gfx/duel/anims/32.2bpp"
 
-Duel33Gfx: ; a7508 (29:7508)
+Duel33Gfx:: ; a7508 (29:7508)
 	dw $08
 	INCBIN "gfx/duel/anims/33.2bpp"
 
-Duel34Gfx: ; a758a (29:758a)
+Duel34Gfx:: ; a758a (29:758a)
 	dw $07
 	INCBIN "gfx/duel/anims/34.2bpp"
 
-Duel35Gfx: ; a75fc (29:75fc)
+Duel35Gfx:: ; a75fc (29:75fc)
 	dw $1c
 	INCBIN "gfx/duel/anims/35.2bpp"
 
-Duel36Gfx: ; a77be (29:77be)
+Duel36Gfx:: ; a77be (29:77be)
 	dw $08
 	INCBIN "gfx/duel/anims/36.2bpp"
 
-Duel37Gfx: ; a7840 (29:7840)
+Duel37Gfx:: ; a7840 (29:7840)
 	dw $0b
 	INCBIN "gfx/duel/anims/37.2bpp"
 
-Duel38Gfx: ; a78f2 (29:78f2)
+Duel38Gfx:: ; a78f2 (29:78f2)
 	dw $1c
 	INCBIN "gfx/duel/anims/38.2bpp"
 
-Duel39Gfx: ; a7ab4 (29:7ab4)
+Duel39Gfx:: ; a7ab4 (29:7ab4)
 	dw $16
 	INCBIN "gfx/duel/anims/39.2bpp"
 
-Duel40Gfx: ; a7c16 (29:7c16)
+Duel40Gfx:: ; a7c16 (29:7c16)
 	dw $10
 	INCBIN "gfx/duel/anims/40.2bpp"
 
-Duel41Gfx: ; a7d18 (29:7d18)
+Duel41Gfx:: ; a7d18 (29:7d18)
 	dw $0f
 	INCBIN "gfx/duel/anims/41.2bpp"
 
-Duel42Gfx: ; a7e0a (29:7e0a)
+Duel42Gfx:: ; a7e0a (29:7e0a)
 	dw $07
 	INCBIN "gfx/duel/anims/42.2bpp"
 
-Duel43Gfx: ; a7e7c (29:7e7c)
+Duel43Gfx:: ; a7e7c (29:7e7c)
 	dw $0a
 	INCBIN "gfx/duel/anims/43.2bpp"
 
-Duel44Gfx: ; a7f1e (29:7f1e)
+Duel44Gfx:: ; a7f1e (29:7f1e)
 	dw $09
 	INCBIN "gfx/duel/anims/44.2bpp"
 
-Duel45Gfx: ; a7fb0 (29:7fb0)
+Duel45Gfx:: ; a7fb0 (29:7fb0)
 	dw $03
 	INCBIN "gfx/duel/anims/45.2bpp"
 
@@ -844,75 +844,75 @@ Duel45Gfx: ; a7fb0 (29:7fb0)
 
 SECTION "Gfx 12", ROMX
 
-Duel46Gfx: ; a8000 (2a:4000)
+Duel46Gfx:: ; a8000 (2a:4000)
 	dw $08
 	INCBIN "gfx/duel/anims/46.2bpp"
 
-Duel47Gfx: ; a8082 (2a:4082)
+Duel47Gfx:: ; a8082 (2a:4082)
 	dw $0f
 	INCBIN "gfx/duel/anims/47.2bpp"
 
-Duel48Gfx: ; a8174 (2a:4174)
+Duel48Gfx:: ; a8174 (2a:4174)
 	dw $03
 	INCBIN "gfx/duel/anims/48.2bpp"
 
-Duel49Gfx: ; a81a6 (2a:41a6)
+Duel49Gfx:: ; a81a6 (2a:41a6)
 	dw $05
 	INCBIN "gfx/duel/anims/49.2bpp"
 
-Duel50Gfx: ; a81f8 (2a:41f8)
+Duel50Gfx:: ; a81f8 (2a:41f8)
 	dw $17
 	INCBIN "gfx/duel/anims/50.2bpp"
 
-Duel51Gfx: ; a836a (2a:436a)
+Duel51Gfx:: ; a836a (2a:436a)
 	dw $36
 	INCBIN "gfx/duel/anims/51.2bpp"
 
-Duel52Gfx: ; a86cc (2a:46cc)
+Duel52Gfx:: ; a86cc (2a:46cc)
 	dw $0b
 	INCBIN "gfx/duel/anims/52.2bpp"
 
-Duel53Gfx: ; a877e (2a:477e)
+Duel53Gfx:: ; a877e (2a:477e)
 	dw $06
 	INCBIN "gfx/duel/anims/53.2bpp"
 
-Duel54Gfx: ; a87e0 (2a:47e0)
+Duel54Gfx:: ; a87e0 (2a:47e0)
 	dw $16
 	INCBIN "gfx/duel/anims/54.2bpp"
 
-BoosterPackOAMGfx: ; a8942 (2a:4942)
+BoosterPackOAMGfx:: ; a8942 (2a:4942)
 	dw $20
 	INCBIN "gfx/booster_packs/oam.2bpp"
 
-PressStartGfx: ; a8b44 (2a:4b44)
+PressStartGfx:: ; a8b44 (2a:4b44)
 	dw $14
 	INCBIN "gfx/titlescreen/press_start.2bpp"
 
-GrassGfx: ; a8c86 (2a:4c86)
+GrassGfx:: ; a8c86 (2a:4c86)
 	dw $04
 	INCBIN "gfx/titlescreen/energies/grass.2bpp"
 
-FireGfx: ; a8cc8 (2a:4cc8)
+FireGfx:: ; a8cc8 (2a:4cc8)
 	dw $04
 	INCBIN "gfx/titlescreen/energies/fire.2bpp"
 
-WaterGfx: ; a8d0a (2a:4d0a)
+WaterGfx:: ; a8d0a (2a:4d0a)
 	dw $04
 	INCBIN "gfx/titlescreen/energies/water.2bpp"
 
-ColorlessGfx: ; a8d4c (2a:4d4c)
+ColorlessGfx:: ; a8d4c (2a:4d4c)
 	dw $04
 	INCBIN "gfx/titlescreen/energies/colorless.2bpp"
 
-LightningGfx: ; a8d8e (2a:4d8e)
+LightningGfx:: ; a8d8e (2a:4d8e)
 	dw $04
 	INCBIN "gfx/titlescreen/energies/lightning.2bpp"
 
-PsychicGfx: ; a8dd0 (2a:4dd0)
+PsychicGfx:: ; a8dd0 (2a:4dd0)
 	dw $04
 	INCBIN "gfx/titlescreen/energies/psychic.2bpp"
 
-FightingGfx: ; a8e12 (2a:4e12)
+FightingGfx:: ; a8e12 (2a:4e12)
 	dw $04
 	INCBIN "gfx/titlescreen/energies/fighting.2bpp"