Split graphics data from bank 20

11 files changed, 1671 insertions, 1672 deletions

diff --git a/src/data/maps/tilemaps.asm b/src/data/maps/tilemaps.asm
new file mode 100644
index 0000000..bf66636
--- /dev/null
+++ b/src/data/maps/tilemaps.asm
@@ -0,0 +1,371 @@
+OverworldMapTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw NULL
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/overworld_map.bin"
+
+OverworldMapCGBTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw NULL
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/overworld_map_cgb.bin"
+
+MasonLaboratoryTilemap::
+	db $1c ; width
+	db $1e ; height
+	dw MasonLaboratoryPermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/mason_laboratory.bin"
+MasonLaboratoryPermissions:
+	INCBIN "data/maps/permissions/mason_laboratory.bin"
+
+MasonLaboratoryCGBTilemap::
+	db $1c ; width
+	db $1e ; height
+	dw MasonLaboratoryCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/mason_laboratory_cgb.bin"
+MasonLaboratoryCGBPermissions:
+	INCBIN "data/maps/permissions/mason_laboratory_cgb.bin"
+
+ChallengeMachineMapEventTilemap::
+	db $04 ; width
+	db $06 ; height
+	dw ChallengeMachineMapEventPermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/challenge_machine_map_event.bin"
+ChallengeMachineMapEventPermissions:
+	INCBIN "data/maps/permissions/challenge_machine_map_event.bin"
+
+ChallengeMachineMapEventCGBTilemap::
+	db $04 ; width
+	db $06 ; height
+	dw ChallengeMachineMapEventCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/challenge_machine_map_event_cgb.bin"
+ChallengeMachineMapEventCGBPermissions:
+	INCBIN "data/maps/permissions/challenge_machine_map_event_cgb.bin"
+
+DeckMachineRoomTilemap::
+	db $18 ; width
+	db $1e ; height
+	dw DeckMachineRoomPermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/deck_machine_room.bin"
+DeckMachineRoomPermissions:
+	INCBIN "data/maps/permissions/deck_machine_room.bin"
+
+DeckMachineRoomCGBTilemap::
+	db $18 ; width
+	db $1e ; height
+	dw DeckMachineRoomCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/deck_machine_room_cgb.bin"
+DeckMachineRoomCGBPermissions:
+	INCBIN "data/maps/permissions/deck_machine_room_cgb.bin"
+
+DeckMachineMapEventTilemap::
+	db $04 ; width
+	db $01 ; height
+	dw DeckMachineMapEventPermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/deck_machine_map_event.bin"
+DeckMachineMapEventPermissions:
+	INCBIN "data/maps/permissions/deck_machine_map_event.bin"
+
+DeckMachineMapEventCGBTilemap::
+	db $04 ; width
+	db $01 ; height
+	dw DeckMachineMapEventCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/deck_machine_map_event_cgb.bin"
+DeckMachineMapEventCGBPermissions:
+	INCBIN "data/maps/permissions/deck_machine_map_event_cgb.bin"
+
+IshiharaTilemap::
+	db $14 ; width
+	db $18 ; height
+	dw IshiharaPermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/ishihara.bin"
+IshiharaPermissions:
+	INCBIN "data/maps/permissions/ishihara.bin"
+
+IshiharaCGBTilemap::
+	db $14 ; width
+	db $18 ; height
+	dw IshiharaCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/ishihara_cgb.bin"
+IshiharaCGBPermissions:
+	INCBIN "data/maps/permissions/ishihara_cgb.bin"
+
+FightingClubEntranceTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw FightingClubEntrancePermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/fighting_club_entrance.bin"
+FightingClubEntrancePermissions:
+	INCBIN "data/maps/permissions/fighting_club_entrance.bin"
+
+FightingClubEntranceCGBTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw FightingClubEntranceCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/fighting_club_entrance_cgb.bin"
+FightingClubEntranceCGBPermissions:
+	INCBIN "data/maps/permissions/fighting_club_entrance_cgb.bin"
+
+RockClubEntranceTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw RockClubEntrancePermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/rock_club_entrance.bin"
+RockClubEntrancePermissions:
+	INCBIN "data/maps/permissions/rock_club_entrance.bin"
+
+RockClubEntranceCGBTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw RockClubEntranceCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/rock_club_entrance_cgb.bin"
+RockClubEntranceCGBPermissions:
+	INCBIN "data/maps/permissions/rock_club_entrance_cgb.bin"
+
+WaterClubEntranceTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw WaterClubEntrancePermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/water_club_entrance.bin"
+WaterClubEntrancePermissions:
+	INCBIN "data/maps/permissions/water_club_entrance.bin"
+
+WaterClubEntranceCGBTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw WaterClubEntranceCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/water_club_entrance_cgb.bin"
+WaterClubEntranceCGBPermissions:
+	INCBIN "data/maps/permissions/water_club_entrance_cgb.bin"
+
+LightningClubEntranceTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw LightningClubEntrancePermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/lightning_club_entrance.bin"
+LightningClubEntrancePermissions:
+	INCBIN "data/maps/permissions/lightning_club_entrance.bin"
+
+LightningClubEntranceCGBTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw LightningClubEntranceCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/lightning_club_entrance_cgb.bin"
+LightningClubEntranceCGBPermissions:
+	INCBIN "data/maps/permissions/lightning_club_entrance_cgb.bin"
+
+GrassClubEntranceTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw GrassClubEntrancePermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/grass_club_entrance.bin"
+GrassClubEntrancePermissions:
+	INCBIN "data/maps/permissions/grass_club_entrance.bin"
+
+GrassClubEntranceCGBTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw GrassClubEntranceCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/grass_club_entrance_cgb.bin"
+GrassClubEntranceCGBPermissions:
+	INCBIN "data/maps/permissions/grass_club_entrance_cgb.bin"
+
+PsychicClubEntranceTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw PsychicClubEntrancePermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/psychic_club_entrance.bin"
+PsychicClubEntrancePermissions:
+	INCBIN "data/maps/permissions/psychic_club_entrance.bin"
+
+PsychicClubEntranceCGBTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw PsychicClubEntranceCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/psychic_club_entrance_cgb.bin"
+PsychicClubEntranceCGBPermissions:
+	INCBIN "data/maps/permissions/psychic_club_entrance_cgb.bin"
+
+ScienceClubEntranceTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw ScienceClubEntrancePermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/science_club_entrance.bin"
+ScienceClubEntrancePermissions:
+	INCBIN "data/maps/permissions/science_club_entrance.bin"
+
+ScienceClubEntranceCGBTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw ScienceClubEntranceCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/science_club_entrance_cgb.bin"
+ScienceClubEntranceCGBPermissions:
+	INCBIN "data/maps/permissions/science_club_entrance_cgb.bin"
+
+FireClubEntranceTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw FireClubEntrancePermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/fire_club_entrance.bin"
+FireClubEntrancePermissions:
+	INCBIN "data/maps/permissions/fire_club_entrance.bin"
+
+FireClubEntranceCGBTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw FireClubEntranceCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/fire_club_entrance_cgb.bin"
+FireClubEntranceCGBPermissions:
+	INCBIN "data/maps/permissions/fire_club_entrance_cgb.bin"
+
+ChallengeHallEntranceTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw ChallengeHallEntrancePermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/challenge_hall_entrance.bin"
+ChallengeHallEntrancePermissions:
+	INCBIN "data/maps/permissions/challenge_hall_entrance.bin"
+
+ChallengeHallEntranceCGBTilemap::
+	db $14 ; width
+	db $12 ; height
+	dw ChallengeHallEntranceCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/challenge_hall_entrance_cgb.bin"
+ChallengeHallEntranceCGBPermissions:
+	INCBIN "data/maps/permissions/challenge_hall_entrance_cgb.bin"
+
+ClubLobbyTilemap::
+	db $1c ; width
+	db $1a ; height
+	dw ClubLobbyPermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/club_lobby.bin"
+ClubLobbyPermissions:
+	INCBIN "data/maps/permissions/club_lobby.bin"
+
+ClubLobbyCGBTilemap::
+	db $1c ; width
+	db $1a ; height
+	dw ClubLobbyCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/club_lobby_cgb.bin"
+ClubLobbyCGBPermissions:
+	INCBIN "data/maps/permissions/club_lobby_cgb.bin"
+
+FightingClubTilemap::
+	db $18 ; width
+	db $12 ; height
+	dw FightingClubPermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/fighting_club.bin"
+FightingClubPermissions:
+	INCBIN "data/maps/permissions/fighting_club.bin"
+
+FightingClubCGBTilemap::
+	db $18 ; width
+	db $12 ; height
+	dw FightingClubCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/fighting_club_cgb.bin"
+FightingClubCGBPermissions:
+	INCBIN "data/maps/permissions/fighting_club_cgb.bin"
+
+RockClubTilemap::
+	db $1c ; width
+	db $1e ; height
+	dw RockClubPermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/rock_club.bin"
+RockClubPermissions:
+	INCBIN "data/maps/permissions/rock_club.bin"
+
+RockClubCGBTilemap::
+	db $1c ; width
+	db $1e ; height
+	dw RockClubCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/rock_club_cgb.bin"
+RockClubCGBPermissions:
+	INCBIN "data/maps/permissions/rock_club_cgb.bin"
+
+PokemonDomeDoorMapEventTilemap::
+	db $04 ; width
+	db $03 ; height
+	dw PokemonDomeDoorMapEventPermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/pokemon_dome_door_map_event.bin"
+PokemonDomeDoorMapEventPermissions:
+	INCBIN "data/maps/permissions/pokemon_dome_door_map_event.bin"
+
+PokemonDomeDoorMapEventCGBTilemap::
+	db $04 ; width
+	db $03 ; height
+	dw PokemonDomeDoorMapEventCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/pokemon_dome_door_map_event_cgb.bin"
+PokemonDomeDoorMapEventCGBPermissions:
+	INCBIN "data/maps/permissions/pokemon_dome_door_map_event_cgb.bin"
+
+HallOfHonorDoorMapEventTilemap::
+	db $04 ; width
+	db $03 ; height
+	dw HallOfHonorDoorMapEventPermissions
+	db FALSE ; cgb mode
+	INCBIN "data/maps/tiles/hall_of_honor_door_map_event.bin"
+HallOfHonorDoorMapEventPermissions:
+	INCBIN "data/maps/permissions/hall_of_honor_door_map_event.bin"
+
+HallOfHonorDoorMapEventCGBTilemap::
+	db $04 ; width
+	db $03 ; height
+	dw HallOfHonorDoorMapEventCGBPermissions
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/hall_of_honor_door_map_event_cgb.bin"
+HallOfHonorDoorMapEventCGBPermissions:
+	INCBIN "data/maps/permissions/hall_of_honor_door_map_event_cgb.bin"
+
+GrassMedalTilemap::
+	db $03 ; width
+	db $03 ; height
+	dw NULL
+	db TRUE ; cgb mode
+	INCBIN "data/maps/tiles/grass_medal.bin"
+
+AnimData1::
+	frame_table AnimFrameTable0
+	frame_data 3, 16, 0, 0
+	frame_data 4, 16, 0, 0
+	frame_data 0, 0, 0, 0
+
+Palette110::
+	db $00, $00
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index a8c03cc..bc71842 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -2,7 +2,7 @@
 ; according to its Map Header configurations
 ; if it's the Overworld Map, also prints the map name
 ; and sets up the volcano animation
-LoadMapGfxAndPermissions: ; 80000 (20:4000)
+LoadMapGfxAndPermissions:
 	call ClearSRAMBGMaps
 	xor a
 	ld [wTextBoxFrameType], a
@@ -20,7 +20,7 @@ LoadMapGfxAndPermissions: ; 80000 (20:4000)
 
 ; reloads the map tiles and permissions
 ; after a textbox has been closed
-ReloadMapAfterTextClose: ; 80028 (20:4028)
+ReloadMapAfterTextClose:
 	call ClearSRAMBGMaps
 	lb bc, 0, 0
 	call LoadTilemap_ToSRAM
@@ -29,7 +29,7 @@ ReloadMapAfterTextClose: ; 80028 (20:4028)
 	farcall Func_c3ee
 	ret
 
-LoadMapTilesAndPals: ; 8003d (20:403d)
+LoadMapTilesAndPals:
 	farcall LoadMapHeader
 	farcall SetSGB2AndSGB3MapPalette
 	lb bc, 0, 0
@@ -58,14 +58,14 @@ LoadMapTilesAndPals: ; 8003d (20:403d)
 
 ; loads the BG map corresponding to wCurTilemap to SRAM
 ; bc = starting coordinates
-LoadTilemap_ToSRAM: ; 80077 (20:4077)
+LoadTilemap_ToSRAM:
 	ld a, TRUE
 	ld [wWriteBGMapToSRAM], a
 	jr LoadTilemap
 
 ; loads the BG map corresponding to wCurTilemap to VRAM
 ; bc = starting coordinates
-LoadTilemap_ToVRAM: ; 8007e (20:407e)
+LoadTilemap_ToVRAM:
 	xor a ; FALSE
 	ld [wWriteBGMapToSRAM], a
 ;	fallthrough
@@ -74,7 +74,7 @@ LoadTilemap_ToVRAM: ; 8007e (20:407e)
 ; either loads them in VRAM or SRAM,
 ; depending on wWriteBGMapToSRAM
 ; bc = starting coordinates
-LoadTilemap: ; 80082 (20:4082)
+LoadTilemap:
 	push hl
 	push bc
 	push de
@@ -213,7 +213,7 @@ LoadTilemap: ; 80082 (20:4082)
 	pop hl
 	ret
 
-Func_80148: ; 80148 (20:4148)
+Func_80148:
 	ld a, [wd291]
 	or a
 	ret z
@@ -255,7 +255,7 @@ Func_80148: ; 80148 (20:4148)
 ; if SRAM is the target address to copy,
 ; copies data to sGfxBuffer0 or sGfxBuffer1
 ; for VRAM0 or VRAM1 respectively
-CopyBGDataToVRAMOrSRAM: ; 8016e (20:416e)
+CopyBGDataToVRAMOrSRAM:
 	ld a, [wWriteBGMapToSRAM]
 	or a
 	jp z, SafeCopyDataHLtoDE
@@ -296,7 +296,7 @@ CopyBGDataToVRAMOrSRAM: ; 8016e (20:416e)
 ; safely copies $20 bytes at a time
 ; sGfxBuffer0 -> v0BGMap0
 ; sGfxBuffer1 -> v0BGMap1 (if in CGB)
-SafelyCopyBGMapFromSRAMToVRAM: ; 801a1 (20:41a1)
+SafelyCopyBGMapFromSRAMToVRAM:
 	push hl
 	push bc
 	push de
@@ -348,7 +348,7 @@ SafelyCopyBGMapFromSRAMToVRAM: ; 801a1 (20:41a1)
 	ret
 
 ; clears sGfxBuffer0 and sGfxBuffer1
-ClearSRAMBGMaps: ; 801f1 (20:41f1)
+ClearSRAMBGMaps:
 	push hl
 	push bc
 	ldh a, [hBankSRAM]
@@ -368,10 +368,10 @@ ClearSRAMBGMaps: ; 801f1 (20:41f1)
 
 ; l - map data offset (0,2,4,6,8 for banks 0,1,2,3,4)
 ; a - map index (inside of the given bank)
-GetMapDataPointer: ; 8020f (20:420f)
+GetMapDataPointer:
 	push bc
 	push af
-	ld bc, MapDataPointers
+	ld bc, GfxTablePointers
 	ld h, $0
 	add hl, bc
 	ld c, [hl]
@@ -389,18 +389,17 @@ GetMapDataPointer: ; 8020f (20:420f)
 	ret
 
 ; Loads a pointer from [hl] to wTempPointer. Adds the graphics bank offset ($20)
-LoadGraphicsPointerFromHL: ; 80229 (20:4229)
+LoadGraphicsPointerFromHL:
 	ld a, [hli]
 	ld [wTempPointer], a
 	ld a, [hli]
 	ld [wTempPointer + 1], a
 	ld a, [hli]
-	add BANK(MapDataPointers)
+	add BANK(GfxTablePointers)
 	ld [wTempPointerBank], a
 	ret
 
-; unreferenced?
-Func_80238: ; 80238 (20:4238)
+Func_80238: ; unreferenced
 	push hl
 	ld l, $2 ; Tilesets
 	ld a, [wCurTileset]
@@ -423,7 +422,7 @@ Func_80238: ; 80238 (20:4238)
 ; a = sprite index within the data map
 ; output:
 ; a = number of tiles in sprite
-Func_8025b: ; 8025b (20:425b)
+Func_8025b:
 	push hl
 	ld l, $4 ; Sprites
 	call GetMapDataPointer
@@ -440,17 +439,17 @@ Func_8025b: ; 8025b (20:425b)
 
 ; loads graphics data pointed by wTempPointer in wTempPointerBank
 ; to the VRAM bank according to wd4cb, in address pointed by wVRAMPointer
-LoadGfxDataFromTempPointerToVRAMBank: ; 80274 (20:4274)
+LoadGfxDataFromTempPointerToVRAMBank:
 	call GetTileOffsetPointerAndSwitchVRAM
 	jr LoadGfxDataFromTempPointer
 
-LoadGfxDataFromTempPointerToVRAMBank_Tiles0ToTiles2: ; 80279 (20:4279)
+LoadGfxDataFromTempPointerToVRAMBank_Tiles0ToTiles2:
 	call GetTileOffsetPointerAndSwitchVRAM_Tiles0ToTiles2
 ;	fallthrough
 
 ; loads graphics data pointed by wTempPointer in wTempPointerBank
 ; to wVRAMPointer
-LoadGfxDataFromTempPointer: ; 8027c (20:427c)
+LoadGfxDataFromTempPointer:
 	push hl
 	push bc
 	push de
@@ -478,7 +477,7 @@ LoadGfxDataFromTempPointer: ; 8027c (20:427c)
 ; convert wVRAMTileOffset to address in VRAM
 ; and stores it in wVRAMPointer
 ; switches VRAM according to wd4cb
-GetTileOffsetPointerAndSwitchVRAM: ; 8029f (20:429f)
+GetTileOffsetPointerAndSwitchVRAM:
 ; address of the tile offset is wVRAMTileOffset * $10 + $8000
 	ld a, [wVRAMTileOffset]
 	swap a
@@ -502,7 +501,7 @@ GetTileOffsetPointerAndSwitchVRAM: ; 8029f (20:429f)
 ; switches VRAM according to wd4cb
 ; then changes wVRAMPointer such that
 ; addresses to Tiles0 is changed to Tiles2
-GetTileOffsetPointerAndSwitchVRAM_Tiles0ToTiles2: ; 802bb (20:42bb)
+GetTileOffsetPointerAndSwitchVRAM_Tiles0ToTiles2:
 	ld a, [wVRAMTileOffset]
 	push af
 	xor $80 ; toggle top bit
@@ -516,7 +515,7 @@ GetTileOffsetPointerAndSwitchVRAM_Tiles0ToTiles2: ; 802bb (20:42bb)
 	ret
 
 ; loads tileset gfx to VRAM corresponding to wCurTileset
-LoadTilesetGfx: ; 802d4 (20:42d4)
+LoadTilesetGfx:
 	push hl
 	ld l, $02 ; Tilesets
 	ld a, [wCurTileset]
@@ -679,7 +678,7 @@ LoadTilesetGfx: ; 802d4 (20:42d4)
 	ret
 
 ; gets pointer to BG map with ID from wCurTilemap
-Func_803b9: ; 803b9 (20:43b9)
+Func_803b9:
 	ld l, $00 ; Tilemaps
 	ld a, [wCurTilemap]
 	call GetMapDataPointer
@@ -691,7 +690,7 @@ Func_803b9: ; 803b9 (20:43b9)
 ; sets BGP in wLoadedPalData (if any)
 ; then loads the rest of the palette data
 ; a = palette index to load
-SetBGPAndLoadedPal: ; 803c9 (20:43c9)
+SetBGPAndLoadedPal:
 	push hl
 	push bc
 	push de
@@ -724,7 +723,7 @@ SetBGPAndLoadedPal: ; 803c9 (20:43c9)
 ; b = palette index
 ; c = palette size
 ; hl = palette data to copy
-LoadPaletteDataFromHL: ; 803ec (20:43ec)
+LoadPaletteDataFromHL:
 	push hl
 	push bc
 	push de
@@ -768,7 +767,7 @@ LoadPaletteDataFromHL: ; 803ec (20:43ec)
 	ret
 
 ; loads palette index a
-LoadPaletteData: ; 80418 (20:4418)
+LoadPaletteData:
 	push hl
 	push bc
 	push de
@@ -824,7 +823,7 @@ LoadPaletteData: ; 80418 (20:4418)
 	ret
 
 ; copies palette data of index in a to wLoadedPalData
-LoadPaletteDataToBuffer: ; 80456 (20:4456)
+LoadPaletteDataToBuffer:
 	push hl
 	push bc
 	push de
@@ -853,14 +852,14 @@ LoadPaletteDataToBuffer: ; 80456 (20:4456)
 	pop hl
 	ret
 
-ClearNumLoadedFramesetSubgroups: ; 8047b (20:447b)
+ClearNumLoadedFramesetSubgroups:
 	xor a
 	ld [wNumLoadedFramesetSubgroups], a
 	ret
 
 ; for the current map, process the animation
 ; data of its corresponding OW tiles
-DoMapOWFrame: ; 80480 (20:4480)
+DoMapOWFrame:
 	push hl
 	push bc
 	ld a, [wCurMap]
@@ -887,7 +886,7 @@ DoMapOWFrame: ; 80480 (20:4480)
 	ret
 
 ; processes the OW frameset pointed by hl
-ProcessOWFrameset: ; 804a2 (20:44a2)
+ProcessOWFrameset:
 	push hl
 	push bc
 	ld a, l
@@ -920,7 +919,7 @@ ProcessOWFrameset: ; 804a2 (20:44a2)
 
 ; for each of the loaded frameset subgroups
 ; load their tiles and advance their durations
-DoLoadedFramesetSubgroupsFrame: ; 804d8 (20:44d8)
+DoLoadedFramesetSubgroupsFrame:
 	ld a, [wNumLoadedFramesetSubgroups]
 	or a
 	ret z
@@ -941,7 +940,7 @@ DoLoadedFramesetSubgroupsFrame: ; 804d8 (20:44d8)
 ; from subgroup in register c, get
 ; from OW frameset in hl its corresponding
 ; data offset and duration
-GetOWFramesetSubgroupData: ; 804f3 (20:44f3)
+GetOWFramesetSubgroupData:
 	push hl
 	push bc
 	push hl
@@ -965,7 +964,7 @@ GetOWFramesetSubgroupData: ; 804f3 (20:44f3)
 ; if wCurOWFrameDuration == 0, processes next frame for OW map
 ; by loading the tiles corresponding to current frame
 ; if wCurOWFrameDuration != 0, then simply decrements it and returns
-LoadOWFrameTiles: ; 8050c (20:450c)
+LoadOWFrameTiles:
 	ld a, [wCurOWFrameDuration]
 	or a
 	jr z, .next_frame
@@ -1083,7 +1082,7 @@ LoadOWFrameTiles: ; 8050c (20:450c)
 	ret
 
 ; fills wOWFramesetSubgroups with $ff
-ClearOWFramesetSubgroups: ; 8059a (20:459a)
+ClearOWFramesetSubgroups:
 	push hl
 	push bc
 	ld hl, wOWFramesetSubgroups
@@ -1100,7 +1099,7 @@ ClearOWFramesetSubgroups: ; 8059a (20:459a)
 ; copies wOWFramesetSubgroups + 2*c
 ; to wCurOWFrameDataOffset and wCurOWFrameDuration
 ; also returns its current duration
-LoadOWFramesetSubgroup: ; 805aa (20:45aa)
+LoadOWFramesetSubgroup:
 	push hl
 	push bc
 	ld hl, wOWFramesetSubgroups
@@ -1119,7 +1118,7 @@ LoadOWFramesetSubgroup: ; 805aa (20:45aa)
 
 ; copies wCurOWFrameDataOffset and wCurOWFrameDuration
 ; to wOWFramesetSubgroups + 2*c
-StoreOWFramesetSubgroup: ; 805c1 (20:45c1)
+StoreOWFramesetSubgroup:
 	push hl
 	push bc
 	ld hl, wOWFramesetSubgroups
@@ -1137,7 +1136,7 @@ StoreOWFramesetSubgroup: ; 805c1 (20:45c1)
 INCLUDE "data/map_ow_framesets.asm"
 
 ; clears wOWMapEvents
-Func_80b7a: ; 80b7a (20:4b7a)
+Func_80b7a:
 	push hl
 	push bc
 	ld c, $b
@@ -1152,7 +1151,7 @@ Func_80b7a: ; 80b7a (20:4b7a)
 	ret
 
 ; a = MAP_EVENT_* constant
-Func_80b89: ; 80b89 (20:4b89)
+Func_80b89:
 	push hl
 	push bc
 	push af
@@ -1173,14 +1172,14 @@ Func_80b89: ; 80b89 (20:4b89)
 	pop hl
 	ret
 
-Func_80ba4: ; 80ba4 (20:4ba4)
+Func_80ba4:
 	push af
 	xor a
 	ld [wWriteBGMapToSRAM], a
 	pop af
 ;	fallthrough
 
-Func_80baa: ; 80baa (20:4baa)
+Func_80baa:
 	push hl
 	push bc
 	push de
@@ -1294,10 +1293,9 @@ Func_80baa: ; 80baa (20:4baa)
 .ChallengeMachine
 	db $0a, $00, TILEMAP_CHALLENGE_MACHINE_MAP_EVENT, TILEMAP_CHALLENGE_MACHINE_MAP_EVENT_CGB
 
-	ret ; unreferenced stray ret?
+	ret ; stray ret
 
-; unreferenced?
-Func_80c64: ; 80c64 (20:4c64)
+Func_80c64: ; unreferenced
 	ld a, [wLineSeparation]
 	push af
 	ld a, $01 ; no line separator
@@ -1346,9 +1344,8 @@ Func_80c64: ; 80c64 (20:4c64)
 	db SYM_SPACE ; tile behind cursor
 	dw NULL ; function pointer if non-0
 
-; unreferenced?
 ; fills Tiles0 with random bytes
-Func_80cc3: ; 80cc3 (20:4cc3)
+Func_80cc3: ; unreferenced
 	call DisableLCD
 	ld hl, v0Tiles0
 	ld bc, $800
@@ -1361,12 +1358,12 @@ Func_80cc3: ; 80cc3 (20:4cc3)
 	jr nz, .loop
 	ret
 
-Func_80cd6: ; 80cd6 (20:4cd6)
+Func_80cd6:
 	ret
 
 ; seems to be used to look at each OW NPC sprites
 ; with functions to rotate NPC and animate them
-Func_80cd7: ; 80cd7 (20:4cd7)
+Func_80cd7:
 	call DisableLCD
 	call EmptyScreen
 	call Func_3ca4
@@ -1557,1118 +1554,8 @@ Func_80cd7: ; 80cd7 (20:4cd7)
 	db SPRITE_OW_GRANNY,   SPRITE_ANIM_LIGHT_NPC_UP,     SPRITE_ANIM_YELLOW_NPC_UP    ; $2b
 	db SPRITE_OW_AMY,      SPRITE_ANIM_SGB_AMY_LAYING,   SPRITE_ANIM_CGB_AMY_LAYING   ; $2c
 
-SpriteNullAnimationPointer: ; 80e5a (20:4e5a)
+SpriteNullAnimationPointer:
 	dw SpriteNullAnimationFrame
 
 SpriteNullAnimationFrame:
 	db 0
-
-; might be closer to "screen specific data" than map data
-MapDataPointers: ; 80e5d (20:4e5d)
-	dw Tilemaps
-	dw Tilesets
-	dw Sprites
-	dw SpriteAnimations
-	dw Palettes
-
-; \1 = pointer
-; \2 = tileset
-tilemap: MACRO
-	dwb \1, BANK(\1) - BANK(Tilemaps)
-	db \2
-ENDM
-
-Tilemaps: ; 80e67 (20:4e67)
-	tilemap OverworldMapTilemap,               TILESET_OVERWORLD_MAP               ; TILEMAP_OVERWORLD_MAP
-	tilemap OverworldMapCGBTilemap,            TILESET_OVERWORLD_MAP               ; TILEMAP_OVERWORLD_MAP_CGB
-	tilemap MasonLaboratoryTilemap,            TILESET_MASON_LABORATORY            ; TILEMAP_MASON_LABORATORY
-	tilemap MasonLaboratoryCGBTilemap,         TILESET_MASON_LABORATORY            ; TILEMAP_MASON_LABORATORY_CGB
-	tilemap ChallengeMachineMapEventTilemap,   TILESET_MASON_LABORATORY            ; TILEMAP_CHALLENGE_MACHINE_MAP_EVENT
-	tilemap ChallengeMachineMapEventCGBTilemap,TILESET_MASON_LABORATORY            ; TILEMAP_CHALLENGE_MACHINE_MAP_EVENT_CGB
-	tilemap DeckMachineRoomTilemap,            TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_ROOM
-	tilemap DeckMachineRoomCGBTilemap,         TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_ROOM_CGB
-	tilemap DeckMachineMapEventTilemap,        TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_MAP_EVENT
-	tilemap DeckMachineMapEventCGBTilemap,     TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_MAP_EVENT_CGB
-	tilemap IshiharaTilemap,                   TILESET_ISHIHARA                    ; TILEMAP_ISHIHARA
-	tilemap IshiharaCGBTilemap,                TILESET_ISHIHARA                    ; TILEMAP_ISHIHARA_CGB
-	tilemap FightingClubEntranceTilemap,       TILESET_CLUB_ENTRANCE               ; TILEMAP_FIGHTING_CLUB_ENTRANCE
-	tilemap FightingClubEntranceCGBTilemap,    TILESET_CLUB_ENTRANCE               ; TILEMAP_FIGHTING_CLUB_ENTRANCE_CGB
-	tilemap RockClubEntranceTilemap,           TILESET_CLUB_ENTRANCE               ; TILEMAP_ROCK_CLUB_ENTRANCE
-	tilemap RockClubEntranceCGBTilemap,        TILESET_CLUB_ENTRANCE               ; TILEMAP_ROCK_CLUB_ENTRANCE_CGB
-	tilemap WaterClubEntranceTilemap,          TILESET_CLUB_ENTRANCE               ; TILEMAP_WATER_CLUB_ENTRANCE
-	tilemap WaterClubEntranceCGBTilemap,       TILESET_CLUB_ENTRANCE               ; TILEMAP_WATER_CLUB_ENTRANCE_CGB
-	tilemap LightningClubEntranceTilemap,      TILESET_CLUB_ENTRANCE               ; TILEMAP_LIGHTNING_CLUB_ENTRANCE
-	tilemap LightningClubEntranceCGBTilemap,   TILESET_CLUB_ENTRANCE               ; TILEMAP_LIGHTNING_CLUB_ENTRANCE_CGB
-	tilemap GrassClubEntranceTilemap,          TILESET_CLUB_ENTRANCE               ; TILEMAP_GRASS_CLUB_ENTRANCE
-	tilemap GrassClubEntranceCGBTilemap,       TILESET_CLUB_ENTRANCE               ; TILEMAP_GRASS_CLUB_ENTRANCE_CGB
-	tilemap PsychicClubEntranceTilemap,        TILESET_CLUB_ENTRANCE               ; TILEMAP_PSYCHIC_CLUB_ENTRANCE
-	tilemap PsychicClubEntranceCGBTilemap,     TILESET_CLUB_ENTRANCE               ; TILEMAP_PSYCHIC_CLUB_ENTRANCE_CGB
-	tilemap ScienceClubEntranceTilemap,        TILESET_CLUB_ENTRANCE               ; TILEMAP_SCIENCE_CLUB_ENTRANCE
-	tilemap ScienceClubEntranceCGBTilemap,     TILESET_CLUB_ENTRANCE               ; TILEMAP_SCIENCE_CLUB_ENTRANCE_CGB
-	tilemap FireClubEntranceTilemap,           TILESET_CLUB_ENTRANCE               ; TILEMAP_FIRE_CLUB_ENTRANCE
-	tilemap FireClubEntranceCGBTilemap,        TILESET_CLUB_ENTRANCE               ; TILEMAP_FIRE_CLUB_ENTRANCE_CGB
-	tilemap ChallengeHallEntranceTilemap,      TILESET_CLUB_ENTRANCE               ; TILEMAP_CHALLENGE_HALL_ENTRANCE
-	tilemap ChallengeHallEntranceCGBTilemap,   TILESET_CLUB_ENTRANCE               ; TILEMAP_CHALLENGE_HALL_ENTRANCE_CGB
-	tilemap ClubLobbyTilemap,                  TILESET_CLUB_LOBBY                  ; TILEMAP_CLUB_LOBBY
-	tilemap ClubLobbyCGBTilemap,               TILESET_CLUB_LOBBY                  ; TILEMAP_CLUB_LOBBY_CGB
-	tilemap FightingClubTilemap,               TILESET_FIGHTING_CLUB               ; TILEMAP_FIGHTING_CLUB
-	tilemap FightingClubCGBTilemap,            TILESET_FIGHTING_CLUB               ; TILEMAP_FIGHTING_CLUB_CGB
-	tilemap RockClubTilemap,                   TILESET_ROCK_CLUB                   ; TILEMAP_ROCK_CLUB
-	tilemap RockClubCGBTilemap,                TILESET_ROCK_CLUB                   ; TILEMAP_ROCK_CLUB_CGB
-	tilemap WaterClubTilemap,                  TILESET_WATER_CLUB                  ; TILEMAP_WATER_CLUB
-	tilemap WaterClubCGBTilemap,               TILESET_WATER_CLUB                  ; TILEMAP_WATER_CLUB_CGB
-	tilemap LightningClubTilemap,              TILESET_LIGHTNING_CLUB              ; TILEMAP_LIGHTNING_CLUB
-	tilemap LightningClubCGBTilemap,           TILESET_LIGHTNING_CLUB              ; TILEMAP_LIGHTNING_CLUB_CGB
-	tilemap GrassClubTilemap,                  TILESET_GRASS_CLUB                  ; TILEMAP_GRASS_CLUB
-	tilemap GrassClubCGBTilemap,               TILESET_GRASS_CLUB                  ; TILEMAP_GRASS_CLUB_CGB
-	tilemap PsychicClubTilemap,                TILESET_PSYCHIC_CLUB                ; TILEMAP_PSYCHIC_CLUB
-	tilemap PsychicClubCGBTilemap,             TILESET_PSYCHIC_CLUB                ; TILEMAP_PSYCHIC_CLUB_CGB
-	tilemap ScienceClubTilemap,                TILESET_SCIENCE_CLUB                ; TILEMAP_SCIENCE_CLUB
-	tilemap ScienceClubCGBTilemap,             TILESET_SCIENCE_CLUB                ; TILEMAP_SCIENCE_CLUB_CGB
-	tilemap FireClubTilemap,                   TILESET_FIRE_CLUB                   ; TILEMAP_FIRE_CLUB
-	tilemap FireClubCGBTilemap,                TILESET_FIRE_CLUB                   ; TILEMAP_FIRE_CLUB_CGB
-	tilemap ChallengeHallTilemap,              TILESET_CHALLENGE_HALL              ; TILEMAP_CHALLENGE_HALL
-	tilemap ChallengeHallCGBTilemap,           TILESET_CHALLENGE_HALL              ; TILEMAP_CHALLENGE_HALL_CGB
-	tilemap PokemonDomeEntranceTilemap,        TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_ENTRANCE
-	tilemap PokemonDomeEntranceCGBTilemap,     TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_ENTRANCE_CGB
-	tilemap PokemonDomeDoorMapEventTilemap,    TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_DOOR_MAP_EVENT
-	tilemap PokemonDomeDoorMapEventCGBTilemap, TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_DOOR_MAP_EVENT_CGB
-	tilemap PokemonDomeTilemap,                TILESET_POKEMON_DOME                ; TILEMAP_POKEMON_DOME
-	tilemap PokemonDomeCGBTilemap,             TILESET_POKEMON_DOME                ; TILEMAP_POKEMON_DOME_CGB
-	tilemap HallOfHonorDoorMapEventTilemap,    TILESET_POKEMON_DOME                ; TILEMAP_HALL_OF_HONOR_DOOR_MAP_EVENT
-	tilemap HallOfHonorDoorMapEventCGBTilemap, TILESET_POKEMON_DOME                ; TILEMAP_HALL_OF_HONOR_DOOR_MAP_EVENT_CGB
-	tilemap HallOfHonorTilemap,                TILESET_HALL_OF_HONOR               ; TILEMAP_HALL_OF_HONOR
-	tilemap HallOfHonorCGBTilemap,             TILESET_HALL_OF_HONOR               ; TILEMAP_HALL_OF_HONOR_CGB
-	tilemap CardPopCGBTilemap,                 TILESET_CARD_POP                    ; TILEMAP_CARD_POP_CGB
-	tilemap CardPopTilemap,                    TILESET_CARD_POP                    ; TILEMAP_CARD_POP
-	tilemap GrassMedalTilemap,                 TILESET_MEDAL                       ; TILEMAP_GRASS_MEDAL
-	tilemap ScienceMedalTilemap,               TILESET_MEDAL                       ; TILEMAP_SCIENCE_MEDAL
-	tilemap FireMedalTilemap,                  TILESET_MEDAL                       ; TILEMAP_FIRE_MEDAL
-	tilemap WaterMedalTilemap,                 TILESET_MEDAL                       ; TILEMAP_WATER_MEDAL
-	tilemap LightningMedalTilemap,             TILESET_MEDAL                       ; TILEMAP_LIGHTNING_MEDAL
-	tilemap FightingMedalTilemap,              TILESET_MEDAL                       ; TILEMAP_FIGHTING_MEDAL
-	tilemap RockMedalTilemap,                  TILESET_MEDAL                       ; TILEMAP_ROCK_MEDAL
-	tilemap PsychicMedalTilemap,               TILESET_MEDAL                       ; TILEMAP_PSYCHIC_MEDAL
-	tilemap GameBoyLinkCGBTilemap,             TILESET_GAMEBOY_LINK                ; TILEMAP_GAMEBOY_LINK_CGB
-	tilemap GameBoyLinkTilemap,                TILESET_GAMEBOY_LINK                ; TILEMAP_GAMEBOY_LINK
-	tilemap GameBoyLinkConnectingCGBTilemap,   TILESET_GAMEBOY_LINK                ; TILEMAP_GAMEBOY_LINK_CONNECTING_CGB
-	tilemap GameBoyLinkConnectingTilemap,      TILESET_GAMEBOY_LINK                ; TILEMAP_GAMEBOY_LINK_CONNECTING
-	tilemap GameBoyPrinterCGBTilemap,          TILESET_GAMEBOY_PRINTER             ; TILEMAP_GAMEBOY_PRINTER_CGB
-	tilemap GameBoyPrinterTilemap,             TILESET_GAMEBOY_PRINTER             ; TILEMAP_GAMEBOY_PRINTER
-	tilemap ColosseumTilemap,                  TILESET_COLOSSEUM_1                 ; TILEMAP_COLOSSEUM
-	tilemap ColosseumCGBTilemap,               TILESET_COLOSSEUM_2                 ; TILEMAP_COLOSSEUM_CGB
-	tilemap EvolutionTilemap,                  TILESET_EVOLUTION_1                 ; TILEMAP_EVOLUTION
-	tilemap EvolutionCGBTilemap,               TILESET_EVOLUTION_2                 ; TILEMAP_EVOLUTION_CGB
-	tilemap MysteryTilemap,                    TILESET_MYSTERY_1                   ; TILEMAP_MYSTERY
-	tilemap MysteryCGBTilemap,                 TILESET_MYSTERY_2                   ; TILEMAP_MYSTERY_CGB
-	tilemap LaboratoryTilemap,                 TILESET_LABORATORY_1                ; TILEMAP_LABORATORY
-	tilemap LaboratoryCGBTilemap,              TILESET_LABORATORY_2                ; TILEMAP_LABORATORY_CGB
-	tilemap CharizardIntroTilemap,             TILESET_CHARIZARD_INTRO_1           ; TILEMAP_CHARIZARD_INTRO
-	tilemap CharizardIntroCGBTilemap,          TILESET_CHARIZARD_INTRO_2           ; TILEMAP_CHARIZARD_INTRO_CGB
-	tilemap ScytherIntroTilemap,               TILESET_SCYTHER_INTRO_1             ; TILEMAP_SCYTHER_INTRO
-	tilemap ScytherIntroCGBTilemap,            TILESET_SCYTHER_INTRO_2             ; TILEMAP_SCYTHER_INTRO_CGB
-	tilemap AerodactylIntroTilemap,            TILESET_AERODACTYL_INTRO_1          ; TILEMAP_AERODACTYL_INTRO
-	tilemap AerodactylIntroCGBTilemap,         TILESET_AERODACTYL_INTRO_2          ; TILEMAP_AERODACTYL_INTRO_CGB
-	tilemap JapaneseTitleScreenTilemap,        TILESET_JAPANESE_TITLE_SCREEN       ; TILEMAP_JAPANESE_TITLE_SCREEN
-	tilemap JapaneseTitleScreenCGBTilemap,     TILESET_JAPANESE_TITLE_SCREEN_CGB   ; TILEMAP_JAPANESE_TITLE_SCREEN_CGB
-	tilemap SolidTiles1Tilemap,                TILESET_SOLID_TILES_1               ; TILEMAP_SOLID_TILES_1
-	tilemap SolidTiles2Tilemap,                TILESET_SOLID_TILES_1               ; TILEMAP_SOLID_TILES_2
-	tilemap SolidTiles3Tilemap,                TILESET_SOLID_TILES_1               ; TILEMAP_SOLID_TILES_3
-	tilemap JapaneseTitleScreen2Tilemap,       TILESET_JAPANESE_TITLE_SCREEN_2     ; TILEMAP_JAPANESE_TITLE_SCREEN_2
-	tilemap JapaneseTitleScreen2CGBTilemap,    TILESET_JAPANESE_TITLE_SCREEN_2_CGB ; TILEMAP_JAPANESE_TITLE_SCREEN_2_CGB
-	tilemap SolidTiles4Tilemap,                TILESET_SOLID_TILES_2               ; TILEMAP_SOLID_TILES_4
-	tilemap PlayerTilemap,                     TILESET_PLAYER                      ; TILEMAP_PLAYER
-	tilemap OpponentTilemap,                   TILESET_RONALD                      ; TILEMAP_OPPONENT
-	tilemap TitleScreenTilemap,                TILESET_TITLE_SCREEN                ; TILEMAP_TITLE_SCREEN
-	tilemap TitleScreenCGBTilemap,             TILESET_TITLE_SCREEN_CGB            ; TILEMAP_TITLE_SCREEN_CGB
-	tilemap CopyrightTilemap,                  TILESET_COPYRIGHT                   ; TILEMAP_COPYRIGHT
-	tilemap CopyrightCGBTilemap,               TILESET_COPYRIGHT                   ; TILEMAP_COPYRIGHT_CGB
-	tilemap NintendoTilemap,                   TILESET_NINTENDO                    ; TILEMAP_NINTENDO
-	tilemap CompaniesTilemap,                  TILESET_COMPANIES                   ; TILEMAP_COMPANIES
-
-; \1 = pointer
-; \2 = number of tiles
-tileset: MACRO
-	dwb \1, BANK(\1) - BANK(Tilesets)
-	db \2
-ENDM
-
-Tilesets: ; 8100f (20:500f)
-	tileset OverworldMapTiles,             193 ; TILESET_OVERWORLD_MAP
-	tileset MasonLaboratoryTilesetGfx,     151 ; TILESET_MASON_LABORATORY
-	tileset IshiharaTilesetGfx,             77 ; TILESET_ISHIHARA
-	tileset ClubEntranceTilesetGfx,        129 ; TILESET_CLUB_ENTRANCE
-	tileset ClubLobbyTilesetGfx,           120 ; TILESET_CLUB_LOBBY
-	tileset FightingClubTilesetGfx,         99 ; TILESET_FIGHTING_CLUB
-	tileset RockClubTilesetGfx,             60 ; TILESET_ROCK_CLUB
-	tileset WaterClubTilesetGfx,           161 ; TILESET_WATER_CLUB
-	tileset LightningClubTilesetGfx,       131 ; TILESET_LIGHTNING_CLUB
-	tileset GrassClubTilesetGfx,            87 ; TILESET_GRASS_CLUB
-	tileset PsychicClubTilesetGfx,          58 ; TILESET_PSYCHIC_CLUB
-	tileset ScienceClubTilesetGfx,          82 ; TILESET_SCIENCE_CLUB
-	tileset FireClubTilesetGfx,             87 ; TILESET_FIRE_CLUB
-	tileset ChallengeHallTilesetGfx,       157 ; TILESET_CHALLENGE_HALL
-	tileset PokemonDomeEntranceTilesetGfx,  78 ; TILESET_POKEMON_DOME_ENTRANCE
-	tileset PokemonDomeTilesetGfx,         207 ; TILESET_POKEMON_DOME
-	tileset HallOfHonorTilesetGfx,         121 ; TILESET_HALL_OF_HONOR
-	tileset CardPopGfx,                    189 ; TILESET_CARD_POP
-	tileset MedalGfx,                       72 ; TILESET_MEDAL
-	tileset GameBoyLinkGfx,                109 ; TILESET_GAMEBOY_LINK
-	tileset GameBoyPrinterGfx,              93 ; TILESET_GAMEBOY_PRINTER
-	tileset Colosseum1Gfx,                  96 ; TILESET_COLOSSEUM_1
-	tileset Colosseum2Gfx,                  86 ; TILESET_COLOSSEUM_2
-	tileset Evolution1Gfx,                  96 ; TILESET_EVOLUTION_1
-	tileset Evolution2Gfx,                  86 ; TILESET_EVOLUTION_2
-	tileset Mystery1Gfx,                    96 ; TILESET_MYSTERY_1
-	tileset Mystery2Gfx,                    86 ; TILESET_MYSTERY_2
-	tileset Laboratory1Gfx,                 96 ; TILESET_LABORATORY_1
-	tileset Laboratory2Gfx,                 86 ; TILESET_LABORATORY_2
-	tileset CharizardIntro1Gfx,             96 ; TILESET_CHARIZARD_INTRO_1
-	tileset CharizardIntro2Gfx,             96 ; TILESET_CHARIZARD_INTRO_2
-	tileset ScytherIntro1Gfx,               96 ; TILESET_SCYTHER_INTRO_1
-	tileset ScytherIntro2Gfx,               96 ; TILESET_SCYTHER_INTRO_2
-	tileset AerodactylIntro1Gfx,            96 ; TILESET_AERODACTYL_INTRO_1
-	tileset AerodactylIntro2Gfx,            96 ; TILESET_AERODACTYL_INTRO_2
-	tileset JapaneseTitleScreenGfx,         97 ; TILESET_JAPANESE_TITLE_SCREEN
-	tileset JapaneseTitleScreenCGBGfx,      97 ; TILESET_JAPANESE_TITLE_SCREEN_CGB
-	tileset SolidTiles1,                     4 ; TILESET_SOLID_TILES_1
-	tileset JapaneseTitleScreen2Gfx,       244 ; TILESET_JAPANESE_TITLE_SCREEN_2
-	tileset JapaneseTitleScreen2CGBGfx,     59 ; TILESET_JAPANESE_TITLE_SCREEN_2_CGB
-	tileset SolidTiles2,                     4 ; TILESET_SOLID_TILES_2
-	tileset PlayerGfx,                      36 ; TILESET_PLAYER
-	tileset RonaldGfx,                      36 ; TILESET_RONALD
-	tileset TitleScreenGfx,                220 ; TILESET_TITLE_SCREEN
-	tileset TitleScreenCGBGfx,             212 ; TILESET_TITLE_SCREEN_CGB
-	tileset CopyrightGfx,                   36 ; TILESET_COPYRIGHT
-	tileset NintendoGfx,                    24 ; TILESET_NINTENDO
-	tileset CompaniesGfx,                   49 ; TILESET_COMPANIES
-	tileset SamGfx,                         36 ; TILESET_SAM
-	tileset ImakuniGfx,                     36 ; TILESET_IMAKUNI
-	tileset NikkiGfx,                       36 ; TILESET_NIKKI
-	tileset RickGfx,                        36 ; TILESET_RICK
-	tileset KenGfx,                         36 ; TILESET_KEN
-	tileset AmyGfx,                         36 ; TILESET_AMY
-	tileset IsaacGfx,                       36 ; TILESET_ISAAC
-	tileset MitchGfx,                       36 ; TILESET_MITCH
-	tileset GeneGfx,                        36 ; TILESET_GENE
-	tileset MurrayGfx,                      36 ; TILESET_MURRAY
-	tileset CourtneyGfx,                    36 ; TILESET_COURTNEY
-	tileset SteveGfx,                       36 ; TILESET_STEVE
-	tileset JackGfx,                        36 ; TILESET_JACK
-	tileset RodGfx,                         36 ; TILESET_ROD
-	tileset JosephGfx,                      36 ; TILESET_JOSEPH
-	tileset DavidGfx,                       36 ; TILESET_DAVID
-	tileset ErikGfx,                        36 ; TILESET_ERIK
-	tileset JohnGfx,                        36 ; TILESET_JOHN
-	tileset AdamGfx,                        36 ; TILESET_ADAM
-	tileset JonathanGfx,                    36 ; TILESET_JONATHAN
-	tileset JoshuaGfx,                      36 ; TILESET_JOSHUA
-	tileset NicholasGfx,                    36 ; TILESET_NICHOLAS
-	tileset BrandonGfx,                     36 ; TILESET_BRANDON
-	tileset MatthewGfx,                     36 ; TILESET_MATTHEW
-	tileset RyanGfx,                        36 ; TILESET_RYAN
-	tileset AndrewGfx,                      36 ; TILESET_ANDREW
-	tileset ChrisGfx,                       36 ; TILESET_CHRIS
-	tileset MichaelGfx,                     36 ; TILESET_MICHAEL
-	tileset DanielGfx,                      36 ; TILESET_DANIEL
-	tileset RobertGfx,                      36 ; TILESET_ROBERT
-	tileset BrittanyGfx,                    36 ; TILESET_BRITTANY
-	tileset KristinGfx,                     36 ; TILESET_KRISTIN
-	tileset HeatherGfx,                     36 ; TILESET_HEATHER
-	tileset SaraGfx,                        36 ; TILESET_SARA
-	tileset AmandaGfx,                      36 ; TILESET_AMANDA
-	tileset JenniferGfx,                    36 ; TILESET_JENNIFER
-	tileset JessicaGfx,                     36 ; TILESET_JESSICA
-	tileset StephanieGfx,                   36 ; TILESET_STEPHANIE
-	tileset AaronGfx,                       36 ; TILESET_AARON
-
-; \1 = gfx pointer
-; \2 = number of tiles
-gfx_pointer: MACRO
-	dwb \1, BANK(\1) - BANK(Sprites)
-	db \2
-ENDM
-
-Sprites: ; 8116b (20:516b)
-	gfx_pointer OWPlayerGfx,        $14 ; SPRITE_OW_PLAYER
-	gfx_pointer OWRonaldGfx,        $14 ; SPRITE_OW_RONALD
-	gfx_pointer OWDrMasonGfx,       $14 ; SPRITE_OW_DRMASON
-	gfx_pointer OWIshiharaGfx,      $14 ; SPRITE_OW_ISHIHARA
-	gfx_pointer OWImakuniGfx,       $14 ; SPRITE_OW_IMAKUNI
-	gfx_pointer OWNikkiGfx,         $14 ; SPRITE_OW_NIKKI
-	gfx_pointer OWRickGfx,          $14 ; SPRITE_OW_RICK
-	gfx_pointer OWKenGfx,           $14 ; SPRITE_OW_KEN
-	gfx_pointer OWAmyGfx,           $1b ; SPRITE_OW_AMY
-	gfx_pointer OWIsaacGfx,         $14 ; SPRITE_OW_ISAAC
-	gfx_pointer OWMitchGfx,         $14 ; SPRITE_OW_MITCH
-	gfx_pointer OWGeneGfx,          $14 ; SPRITE_OW_GENE
-	gfx_pointer OWMurrayGfx,        $14 ; SPRITE_OW_MURRAY
-	gfx_pointer OWCourtneyGfx,      $14 ; SPRITE_OW_COURTNEY
-	gfx_pointer OWSteveGfx,         $14 ; SPRITE_OW_STEVE
-	gfx_pointer OWJackGfx,          $14 ; SPRITE_OW_JACK
-	gfx_pointer OWRodGfx,           $14 ; SPRITE_OW_ROD
-	gfx_pointer OWBoyGfx,           $14 ; SPRITE_OW_BOY
-	gfx_pointer OWLadGfx,           $14 ; SPRITE_OW_LAD
-	gfx_pointer OWSpecsGfx,         $14 ; SPRITE_OW_SPECS
-	gfx_pointer OWButchGfx,         $14 ; SPRITE_OW_BUTCH
-	gfx_pointer OWManiaGfx,         $14 ; SPRITE_OW_MANIA
-	gfx_pointer OWJoshuaGfx,        $14 ; SPRITE_OW_JOSHUA
-	gfx_pointer OWHoodGfx,          $14 ; SPRITE_OW_HOOD
-	gfx_pointer OWTechGfx,          $14 ; SPRITE_OW_TECH
-	gfx_pointer OWChapGfx,          $14 ; SPRITE_OW_CHAP
-	gfx_pointer OWManGfx,           $14 ; SPRITE_OW_MAN
-	gfx_pointer OWPappyGfx,         $14 ; SPRITE_OW_PAPPY
-	gfx_pointer OWGirlGfx,          $14 ; SPRITE_OW_GIRL
-	gfx_pointer OWLass1Gfx,         $14 ; SPRITE_OW_LASS1
-	gfx_pointer OWLass2Gfx,         $14 ; SPRITE_OW_LASS2
-	gfx_pointer OWLass3Gfx,         $14 ; SPRITE_OW_LASS3
-	gfx_pointer OWSwimmerGfx,       $14 ; SPRITE_OW_SWIMMER
-	gfx_pointer OWClerkGfx,         $08 ; SPRITE_OW_CLERK
-	gfx_pointer OWGalGfx,           $14 ; SPRITE_OW_GAL
-	gfx_pointer OWWomanGfx,         $14 ; SPRITE_OW_WOMAN
-	gfx_pointer OWGrannyGfx,        $14 ; SPRITE_OW_GRANNY
-	gfx_pointer OverworldMapOAMGfx, $08 ; SPRITE_OW_MAP_OAM
-	gfx_pointer Duel0Gfx,           $16 ; SPRITE_DUEL_0
-	gfx_pointer Duel63Gfx,          $0a ; SPRITE_DUEL_63
-	gfx_pointer DuelGlowGfx,        $0b ; SPRITE_DUEL_GLOW
-	gfx_pointer Duel1Gfx,           $06 ; SPRITE_DUEL_1
-	gfx_pointer Duel2Gfx,           $08 ; SPRITE_DUEL_2
-	gfx_pointer Duel55Gfx,          $02 ; SPRITE_DUEL_55
-	gfx_pointer Duel58Gfx,          $04 ; SPRITE_DUEL_58
-	gfx_pointer Duel3Gfx,           $09 ; SPRITE_DUEL_3
-	gfx_pointer Duel4Gfx,           $12 ; SPRITE_DUEL_4
-	gfx_pointer Duel5Gfx,           $09 ; SPRITE_DUEL_5
-	gfx_pointer Duel6Gfx,           $11 ; SPRITE_DUEL_6
-	gfx_pointer Duel59Gfx,          $03 ; SPRITE_DUEL_59
-	gfx_pointer Duel7Gfx,           $2d ; SPRITE_DUEL_7
-	gfx_pointer Duel8Gfx,           $0d ; SPRITE_DUEL_8
-	gfx_pointer Duel9Gfx,           $1c ; SPRITE_DUEL_9
-	gfx_pointer Duel10Gfx,          $4c ; SPRITE_DUEL_10
-	gfx_pointer Duel61Gfx,          $03 ; SPRITE_DUEL_61
-	gfx_pointer Duel11Gfx,          $1b ; SPRITE_DUEL_11
-	gfx_pointer Duel12Gfx,          $07 ; SPRITE_DUEL_12
-	gfx_pointer Duel13Gfx,          $0c ; SPRITE_DUEL_13
-	gfx_pointer Duel62Gfx,          $01 ; SPRITE_DUEL_62
-	gfx_pointer Duel14Gfx,          $22 ; SPRITE_DUEL_14
-	gfx_pointer Duel15Gfx,          $20 ; SPRITE_DUEL_15
-	gfx_pointer Duel16Gfx,          $0a ; SPRITE_DUEL_16
-	gfx_pointer Duel17Gfx,          $25 ; SPRITE_DUEL_17
-	gfx_pointer Duel18Gfx,          $18 ; SPRITE_DUEL_18
-	gfx_pointer Duel19Gfx,          $1b ; SPRITE_DUEL_19
-	gfx_pointer Duel20Gfx,          $08 ; SPRITE_DUEL_20
-	gfx_pointer Duel21Gfx,          $0d ; SPRITE_DUEL_21
-	gfx_pointer Duel22Gfx,          $22 ; SPRITE_DUEL_22
-	gfx_pointer Duel23Gfx,          $0c ; SPRITE_DUEL_23
-	gfx_pointer Duel24Gfx,          $25 ; SPRITE_DUEL_24
-	gfx_pointer Duel25Gfx,          $22 ; SPRITE_DUEL_25
-	gfx_pointer Duel26Gfx,          $0c ; SPRITE_DUEL_26
-	gfx_pointer Duel27Gfx,          $4c ; SPRITE_DUEL_27
-	gfx_pointer Duel28Gfx,          $08 ; SPRITE_DUEL_28
-	gfx_pointer Duel29Gfx,          $07 ; SPRITE_DUEL_29
-	gfx_pointer Duel56Gfx,          $01 ; SPRITE_DUEL_56
-	gfx_pointer Duel30Gfx,          $1a ; SPRITE_DUEL_30
-	gfx_pointer Duel31Gfx,          $0a ; SPRITE_DUEL_31
-	gfx_pointer Duel32Gfx,          $2e ; SPRITE_DUEL_32
-	gfx_pointer Duel33Gfx,          $08 ; SPRITE_DUEL_33
-	gfx_pointer Duel34Gfx,          $07 ; SPRITE_DUEL_34
-	gfx_pointer Duel35Gfx,          $1c ; SPRITE_DUEL_35
-	gfx_pointer Duel66Gfx,          $04 ; SPRITE_DUEL_66
-	gfx_pointer Duel36Gfx,          $08 ; SPRITE_DUEL_36
-	gfx_pointer Duel37Gfx,          $0b ; SPRITE_DUEL_37
-	gfx_pointer Duel57Gfx,          $01 ; SPRITE_DUEL_57
-	gfx_pointer Duel38Gfx,          $1c ; SPRITE_DUEL_38
-	gfx_pointer Duel39Gfx,          $16 ; SPRITE_DUEL_39
-	gfx_pointer Duel40Gfx,          $10 ; SPRITE_DUEL_40
-	gfx_pointer Duel41Gfx,          $0f ; SPRITE_DUEL_41
-	gfx_pointer Duel42Gfx,          $07 ; SPRITE_DUEL_42
-	gfx_pointer Duel43Gfx,          $0a ; SPRITE_DUEL_43
-	gfx_pointer Duel44Gfx,          $09 ; SPRITE_DUEL_44
-	gfx_pointer Duel60Gfx,          $02 ; SPRITE_DUEL_60
-	gfx_pointer Duel64Gfx,          $02 ; SPRITE_DUEL_64
-	gfx_pointer Duel45Gfx,          $03 ; SPRITE_DUEL_45
-	gfx_pointer Duel46Gfx,          $08 ; SPRITE_DUEL_46
-	gfx_pointer Duel47Gfx,          $0f ; SPRITE_DUEL_47
-	gfx_pointer Duel48Gfx,          $03 ; SPRITE_DUEL_48
-	gfx_pointer Duel49Gfx,          $05 ; SPRITE_DUEL_49
-	gfx_pointer Duel50Gfx,          $17 ; SPRITE_DUEL_50
-	gfx_pointer Duel51Gfx,          $36 ; SPRITE_DUEL_WON_LOST_DRAW
-	gfx_pointer Duel52Gfx,          $0b ; SPRITE_DUEL_52
-	gfx_pointer Duel53Gfx,          $06 ; SPRITE_DUEL_53
-	gfx_pointer Duel54Gfx,          $16 ; SPRITE_DUEL_54
-	gfx_pointer BoosterPackOAMGfx,  $20 ; SPRITE_BOOSTER_PACK_OAM
-	gfx_pointer PressStartGfx,      $14 ; SPRITE_PRESS_START
-	gfx_pointer GrassGfx,           $04 ; SPRITE_GRASS
-	gfx_pointer FireGfx,            $04 ; SPRITE_FIRE
-	gfx_pointer WaterGfx,           $04 ; SPRITE_WATER
-	gfx_pointer ColorlessGfx,       $04 ; SPRITE_COLORLESS
-	gfx_pointer LightningGfx,       $04 ; SPRITE_LIGHTNING
-	gfx_pointer PsychicGfx,         $04 ; SPRITE_PSYCHIC
-	gfx_pointer FightingGfx,        $04 ; SPRITE_FIGHTING
-
-; \1 = anim data pointer
-anim_data_pointer: MACRO
-	dwb \1, BANK(\1) - BANK(SpriteAnimations)
-	db $00 ; unused (padding?)
-ENDM
-
-SpriteAnimations: ; 81333 (20:5333)
-	anim_data_pointer AnimData0   ; SPRITE_ANIM_LIGHT_NPC_UP
-	anim_data_pointer AnimData1   ; SPRITE_ANIM_LIGHT_NPC_RIGHT
-	anim_data_pointer AnimData2   ; SPRITE_ANIM_LIGHT_NPC_DOWN
-	anim_data_pointer AnimData3   ; SPRITE_ANIM_LIGHT_NPC_LEFT
-	anim_data_pointer AnimData4   ; SPRITE_ANIM_DARK_NPC_UP
-	anim_data_pointer AnimData5   ; SPRITE_ANIM_DARK_NPC_RIGHT
-	anim_data_pointer AnimData6   ; SPRITE_ANIM_DARK_NPC_DOWN
-	anim_data_pointer AnimData7   ; SPRITE_ANIM_DARK_NPC_LEFT
-	anim_data_pointer AnimData8   ; SPRITE_ANIM_SGB_AMY_LAYING
-	anim_data_pointer AnimData9   ; SPRITE_ANIM_SGB_AMY_STAND
-	anim_data_pointer AnimData10  ; SPRITE_ANIM_SGB_CLERK_NPC_UP
-	anim_data_pointer AnimData11  ; SPRITE_ANIM_SGB_CLERK_NPC_RIGHT
-	anim_data_pointer AnimData12  ; SPRITE_ANIM_SGB_CLERK_NPC_DOWN
-	anim_data_pointer AnimData13  ; SPRITE_ANIM_SGB_CLERK_NPC_LEFT
-	anim_data_pointer AnimData14  ; SPRITE_ANIM_BLUE_NPC_UP
-	anim_data_pointer AnimData15  ; SPRITE_ANIM_BLUE_NPC_RIGHT
-	anim_data_pointer AnimData16  ; SPRITE_ANIM_BLUE_NPC_DOWN
-	anim_data_pointer AnimData17  ; SPRITE_ANIM_BLUE_NPC_LEFT
-	anim_data_pointer AnimData18  ; SPRITE_ANIM_PINK_NPC_UP
-	anim_data_pointer AnimData19  ; SPRITE_ANIM_PINK_NPC_RIGHT
-	anim_data_pointer AnimData20  ; SPRITE_ANIM_PINK_NPC_DOWN
-	anim_data_pointer AnimData21  ; SPRITE_ANIM_PINK_NPC_LEFT
-	anim_data_pointer AnimData22  ; SPRITE_ANIM_YELLOW_NPC_UP
-	anim_data_pointer AnimData23  ; SPRITE_ANIM_YELLOW_NPC_RIGHT
-	anim_data_pointer AnimData24  ; SPRITE_ANIM_YELLOW_NPC_DOWN
-	anim_data_pointer AnimData25  ; SPRITE_ANIM_YELLOW_NPC_LEFT
-	anim_data_pointer AnimData26  ; SPRITE_ANIM_GREEN_NPC_UP
-	anim_data_pointer AnimData27  ; SPRITE_ANIM_GREEN_NPC_RIGHT
-	anim_data_pointer AnimData28  ; SPRITE_ANIM_GREEN_NPC_DOWN
-	anim_data_pointer AnimData29  ; SPRITE_ANIM_GREEN_NPC_LEFT
-	anim_data_pointer AnimData30  ; SPRITE_ANIM_RED_NPC_UP
-	anim_data_pointer AnimData31  ; SPRITE_ANIM_RED_NPC_RIGHT
-	anim_data_pointer AnimData32  ; SPRITE_ANIM_RED_NPC_DOWN
-	anim_data_pointer AnimData33  ; SPRITE_ANIM_RED_NPC_LEFT
-	anim_data_pointer AnimData34  ; SPRITE_ANIM_PURPLE_NPC_UP
-	anim_data_pointer AnimData35  ; SPRITE_ANIM_PURPLE_NPC_RIGHT
-	anim_data_pointer AnimData36  ; SPRITE_ANIM_PURPLE_NPC_DOWN
-	anim_data_pointer AnimData37  ; SPRITE_ANIM_PURPLE_NPC_LEFT
-	anim_data_pointer AnimData38  ; SPRITE_ANIM_WHITE_NPC_UP
-	anim_data_pointer AnimData39  ; SPRITE_ANIM_WHITE_NPC_RIGHT
-	anim_data_pointer AnimData40  ; SPRITE_ANIM_WHITE_NPC_DOWN
-	anim_data_pointer AnimData41  ; SPRITE_ANIM_WHITE_NPC_LEFT
-	anim_data_pointer AnimData42  ; SPRITE_ANIM_INDIGO_NPC_UP
-	anim_data_pointer AnimData43  ; SPRITE_ANIM_INDIGO_NPC_RIGHT
-	anim_data_pointer AnimData44  ; SPRITE_ANIM_INDIGO_NPC_DOWN
-	anim_data_pointer AnimData45  ; SPRITE_ANIM_INDIGO_NPC_LEFT
-	anim_data_pointer AnimData46  ; SPRITE_ANIM_CGB_AMY_LAYING
-	anim_data_pointer AnimData47  ; SPRITE_ANIM_CGB_AMY_STAND
-	anim_data_pointer AnimData48  ; SPRITE_ANIM_CGB_CLERK_NPC_UP
-	anim_data_pointer AnimData49  ; SPRITE_ANIM_CGB_CLERK_NPC_RIGHT
-	anim_data_pointer AnimData50  ; SPRITE_ANIM_CGB_CLERK_NPC_DOWN
-	anim_data_pointer AnimData51  ; SPRITE_ANIM_CGB_CLERK_NPC_LEFT
-	anim_data_pointer AnimData52  ; SPRITE_ANIM_SGB_VOLCANO_SMOKE
-	anim_data_pointer AnimData53  ; SPRITE_ANIM_SGB_OWMAP_CURSOR
-	anim_data_pointer AnimData54  ; SPRITE_ANIM_SGB_OWMAP_CURSOR_FAST
-	anim_data_pointer AnimData55  ; SPRITE_ANIM_CGB_VOLCANO_SMOKE
-	anim_data_pointer AnimData56  ; SPRITE_ANIM_CGB_OWMAP_CURSOR
-	anim_data_pointer AnimData57  ; SPRITE_ANIM_CGB_OWMAP_CURSOR_FAST
-	anim_data_pointer AnimData58  ; SPRITE_ANIM_TORCH
-	anim_data_pointer AnimData59  ; SPRITE_ANIM_SGB_CARD_TOP_LEFT
-	anim_data_pointer AnimData60  ; SPRITE_ANIM_SGB_CARD_TOP_RIGHT
-	anim_data_pointer AnimData61  ; SPRITE_ANIM_SGB_CARD_LEFT_SPARK
-	anim_data_pointer AnimData62  ; SPRITE_ANIM_SGB_CARD_BOTTOM_LEFT
-	anim_data_pointer AnimData63  ; SPRITE_ANIM_SGB_CARD_BOTTOM_RIGHT
-	anim_data_pointer AnimData64  ; SPRITE_ANIM_SGB_CARD_RIGHT_SPARK
-	anim_data_pointer AnimData65  ; SPRITE_ANIM_CGB_CARD_TOP_LEFT
-	anim_data_pointer AnimData66  ; SPRITE_ANIM_CGB_CARD_TOP_RIGHT
-	anim_data_pointer AnimData67  ; SPRITE_ANIM_CGB_CARD_LEFT_SPARK
-	anim_data_pointer AnimData68  ; SPRITE_ANIM_CGB_CARD_BOTTOM_LEFT
-	anim_data_pointer AnimData69  ; SPRITE_ANIM_CGB_CARD_BOTTOM_RIGHT
-	anim_data_pointer AnimData70  ; SPRITE_ANIM_CGB_CARD_RIGHT_SPARK
-	anim_data_pointer AnimData71  ; SPRITE_ANIM_71
-	anim_data_pointer AnimData72  ; SPRITE_ANIM_72
-	anim_data_pointer AnimData73  ; SPRITE_ANIM_73
-	anim_data_pointer AnimData74  ; SPRITE_ANIM_74
-	anim_data_pointer AnimData75  ; SPRITE_ANIM_75
-	anim_data_pointer AnimData76  ; SPRITE_ANIM_76
-	anim_data_pointer AnimData77  ; SPRITE_ANIM_77
-	anim_data_pointer AnimData78  ; SPRITE_ANIM_78
-	anim_data_pointer AnimData79  ; SPRITE_ANIM_79
-	anim_data_pointer AnimData80  ; SPRITE_ANIM_80
-	anim_data_pointer AnimData81  ; SPRITE_ANIM_81
-	anim_data_pointer AnimData82  ; SPRITE_ANIM_82
-	anim_data_pointer AnimData83  ; SPRITE_ANIM_83
-	anim_data_pointer AnimData84  ; SPRITE_ANIM_84
-	anim_data_pointer AnimData85  ; SPRITE_ANIM_85
-	anim_data_pointer AnimData86  ; SPRITE_ANIM_86
-	anim_data_pointer AnimData87  ; SPRITE_ANIM_87
-	anim_data_pointer AnimData88  ; SPRITE_ANIM_88
-	anim_data_pointer AnimData89  ; SPRITE_ANIM_89
-	anim_data_pointer AnimData90  ; SPRITE_ANIM_90
-	anim_data_pointer AnimData91  ; SPRITE_ANIM_91
-	anim_data_pointer AnimData92  ; SPRITE_ANIM_92
-	anim_data_pointer AnimData93  ; SPRITE_ANIM_93
-	anim_data_pointer AnimData94  ; SPRITE_ANIM_94
-	anim_data_pointer AnimData95  ; SPRITE_ANIM_95
-	anim_data_pointer AnimData96  ; SPRITE_ANIM_96
-	anim_data_pointer AnimData97  ; SPRITE_ANIM_97
-	anim_data_pointer AnimData98  ; SPRITE_ANIM_98
-	anim_data_pointer AnimData99  ; SPRITE_ANIM_99
-	anim_data_pointer AnimData100 ; SPRITE_ANIM_100
-	anim_data_pointer AnimData101 ; SPRITE_ANIM_101
-	anim_data_pointer AnimData102 ; SPRITE_ANIM_102
-	anim_data_pointer AnimData103 ; SPRITE_ANIM_103
-	anim_data_pointer AnimData104 ; SPRITE_ANIM_104
-	anim_data_pointer AnimData105 ; SPRITE_ANIM_105
-	anim_data_pointer AnimData106 ; SPRITE_ANIM_106
-	anim_data_pointer AnimData107 ; SPRITE_ANIM_107
-	anim_data_pointer AnimData108 ; SPRITE_ANIM_108
-	anim_data_pointer AnimData109 ; SPRITE_ANIM_109
-	anim_data_pointer AnimData110 ; SPRITE_ANIM_110
-	anim_data_pointer AnimData111 ; SPRITE_ANIM_111
-	anim_data_pointer AnimData112 ; SPRITE_ANIM_112
-	anim_data_pointer AnimData113 ; SPRITE_ANIM_113
-	anim_data_pointer AnimData114 ; SPRITE_ANIM_114
-	anim_data_pointer AnimData115 ; SPRITE_ANIM_115
-	anim_data_pointer AnimData116 ; SPRITE_ANIM_116
-	anim_data_pointer AnimData117 ; SPRITE_ANIM_117
-	anim_data_pointer AnimData118 ; SPRITE_ANIM_118
-	anim_data_pointer AnimData119 ; SPRITE_ANIM_119
-	anim_data_pointer AnimData120 ; SPRITE_ANIM_120
-	anim_data_pointer AnimData121 ; SPRITE_ANIM_121
-	anim_data_pointer AnimData122 ; SPRITE_ANIM_122
-	anim_data_pointer AnimData123 ; SPRITE_ANIM_123
-	anim_data_pointer AnimData124 ; SPRITE_ANIM_124
-	anim_data_pointer AnimData125 ; SPRITE_ANIM_125
-	anim_data_pointer AnimData126 ; SPRITE_ANIM_126
-	anim_data_pointer AnimData127 ; SPRITE_ANIM_127
-	anim_data_pointer AnimData128 ; SPRITE_ANIM_128
-	anim_data_pointer AnimData129 ; SPRITE_ANIM_129
-	anim_data_pointer AnimData130 ; SPRITE_ANIM_130
-	anim_data_pointer AnimData131 ; SPRITE_ANIM_131
-	anim_data_pointer AnimData132 ; SPRITE_ANIM_132
-	anim_data_pointer AnimData133 ; SPRITE_ANIM_133
-	anim_data_pointer AnimData134 ; SPRITE_ANIM_134
-	anim_data_pointer AnimData135 ; SPRITE_ANIM_135
-	anim_data_pointer AnimData136 ; SPRITE_ANIM_136
-	anim_data_pointer AnimData137 ; SPRITE_ANIM_137
-	anim_data_pointer AnimData138 ; SPRITE_ANIM_138
-	anim_data_pointer AnimData139 ; SPRITE_ANIM_139
-	anim_data_pointer AnimData140 ; SPRITE_ANIM_140
-	anim_data_pointer AnimData141 ; SPRITE_ANIM_141
-	anim_data_pointer AnimData142 ; SPRITE_ANIM_142
-	anim_data_pointer AnimData143 ; SPRITE_ANIM_143
-	anim_data_pointer AnimData144 ; SPRITE_ANIM_144
-	anim_data_pointer AnimData145 ; SPRITE_ANIM_145
-	anim_data_pointer AnimData146 ; SPRITE_ANIM_146
-	anim_data_pointer AnimData147 ; SPRITE_ANIM_147
-	anim_data_pointer AnimData148 ; SPRITE_ANIM_148
-	anim_data_pointer AnimData149 ; SPRITE_ANIM_149
-	anim_data_pointer AnimData150 ; SPRITE_ANIM_150
-	anim_data_pointer AnimData151 ; SPRITE_ANIM_151
-	anim_data_pointer AnimData152 ; SPRITE_ANIM_152
-	anim_data_pointer AnimData153 ; SPRITE_ANIM_153
-	anim_data_pointer AnimData154 ; SPRITE_ANIM_154
-	anim_data_pointer AnimData155 ; SPRITE_ANIM_155
-	anim_data_pointer AnimData156 ; SPRITE_ANIM_156
-	anim_data_pointer AnimData157 ; SPRITE_ANIM_157
-	anim_data_pointer AnimData158 ; SPRITE_ANIM_158
-	anim_data_pointer AnimData159 ; SPRITE_ANIM_159
-	anim_data_pointer AnimData160 ; SPRITE_ANIM_160
-	anim_data_pointer AnimData161 ; SPRITE_ANIM_161
-	anim_data_pointer AnimData162 ; SPRITE_ANIM_162
-	anim_data_pointer AnimData163 ; SPRITE_ANIM_163
-	anim_data_pointer AnimData164 ; SPRITE_ANIM_164
-	anim_data_pointer AnimData165 ; SPRITE_ANIM_165
-	anim_data_pointer AnimData166 ; SPRITE_ANIM_166
-	anim_data_pointer AnimData167 ; SPRITE_ANIM_167
-	anim_data_pointer AnimData168 ; SPRITE_ANIM_168
-	anim_data_pointer AnimData169 ; SPRITE_ANIM_169
-	anim_data_pointer AnimData170 ; SPRITE_ANIM_170
-	anim_data_pointer AnimData171 ; SPRITE_ANIM_171
-	anim_data_pointer AnimData172 ; SPRITE_ANIM_172
-	anim_data_pointer AnimData173 ; SPRITE_ANIM_173
-	anim_data_pointer AnimData174 ; SPRITE_ANIM_174
-	anim_data_pointer AnimData175 ; SPRITE_ANIM_175
-	anim_data_pointer AnimData176 ; SPRITE_ANIM_176
-	anim_data_pointer AnimData177 ; SPRITE_ANIM_177
-	anim_data_pointer AnimData178 ; SPRITE_ANIM_178
-	anim_data_pointer AnimData179 ; SPRITE_ANIM_179
-	anim_data_pointer AnimData180 ; SPRITE_ANIM_180
-	anim_data_pointer AnimData181 ; SPRITE_ANIM_181
-	anim_data_pointer AnimData182 ; SPRITE_ANIM_182
-	anim_data_pointer AnimData183 ; SPRITE_ANIM_183
-	anim_data_pointer AnimData184 ; SPRITE_ANIM_184
-	anim_data_pointer AnimData185 ; SPRITE_ANIM_185
-	anim_data_pointer AnimData186 ; SPRITE_ANIM_186
-	anim_data_pointer AnimData187 ; SPRITE_ANIM_187
-	anim_data_pointer AnimData188 ; SPRITE_ANIM_188
-	anim_data_pointer AnimData189 ; SPRITE_ANIM_189
-	anim_data_pointer AnimData190 ; SPRITE_ANIM_190
-	anim_data_pointer AnimData191 ; SPRITE_ANIM_191
-	anim_data_pointer AnimData192 ; SPRITE_ANIM_192
-	anim_data_pointer AnimData193 ; SPRITE_ANIM_193
-	anim_data_pointer AnimData194 ; SPRITE_ANIM_194
-	anim_data_pointer AnimData195 ; SPRITE_ANIM_195
-	anim_data_pointer AnimData196 ; SPRITE_ANIM_196
-	anim_data_pointer AnimData197 ; SPRITE_ANIM_197
-	anim_data_pointer AnimData198 ; SPRITE_ANIM_198
-	anim_data_pointer AnimData199 ; SPRITE_ANIM_199
-	anim_data_pointer AnimData200 ; SPRITE_ANIM_200
-	anim_data_pointer AnimData201 ; SPRITE_ANIM_201
-	anim_data_pointer AnimData202 ; SPRITE_ANIM_202
-	anim_data_pointer AnimData203 ; SPRITE_ANIM_203
-	anim_data_pointer AnimData204 ; SPRITE_ANIM_204
-	anim_data_pointer AnimData205 ; SPRITE_ANIM_205
-	anim_data_pointer AnimData206 ; SPRITE_ANIM_206
-	anim_data_pointer AnimData207 ; SPRITE_ANIM_207
-	anim_data_pointer AnimData208 ; SPRITE_ANIM_208
-	anim_data_pointer AnimData209 ; SPRITE_ANIM_209
-	anim_data_pointer AnimData210 ; SPRITE_ANIM_210
-	anim_data_pointer AnimData211 ; SPRITE_ANIM_211
-	anim_data_pointer AnimData212 ; SPRITE_ANIM_212
-	anim_data_pointer AnimData213 ; SPRITE_ANIM_213
-	anim_data_pointer AnimData214 ; SPRITE_ANIM_214
-	anim_data_pointer AnimData215 ; SPRITE_ANIM_215
-	anim_data_pointer AnimData216 ; SPRITE_ANIM_216
-
-; \1 = palette pointer
-; \2 = number of palettes
-; \3 = number of OBJ colors
-palette_pointer: MACRO
-	dwb \1, BANK(\1) - BANK(Palettes)
-	db (\2 << 4) + \3
-ENDM
-
-Palettes: ; 81697 (20:5697)
-	palette_pointer Palette0,   8, 1 ; PALETTE_0
-	palette_pointer Palette1,   8, 0 ; PALETTE_1
-	palette_pointer Palette2,   8, 0 ; PALETTE_2
-	palette_pointer Palette3,   8, 0 ; PALETTE_3
-	palette_pointer Palette4,   8, 0 ; PALETTE_4
-	palette_pointer Palette5,   8, 0 ; PALETTE_5
-	palette_pointer Palette6,   8, 0 ; PALETTE_6
-	palette_pointer Palette7,   8, 0 ; PALETTE_7
-	palette_pointer Palette8,   8, 0 ; PALETTE_8
-	palette_pointer Palette9,   8, 0 ; PALETTE_9
-	palette_pointer Palette10,  8, 0 ; PALETTE_10
-	palette_pointer Palette11,  8, 0 ; PALETTE_11
-	palette_pointer Palette12,  8, 0 ; PALETTE_12
-	palette_pointer Palette13,  8, 0 ; PALETTE_13
-	palette_pointer Palette14,  8, 0 ; PALETTE_14
-	palette_pointer Palette15,  8, 0 ; PALETTE_15
-	palette_pointer Palette16,  8, 0 ; PALETTE_16
-	palette_pointer Palette17,  8, 0 ; PALETTE_17
-	palette_pointer Palette18,  8, 0 ; PALETTE_18
-	palette_pointer Palette19,  8, 0 ; PALETTE_19
-	palette_pointer Palette20,  8, 0 ; PALETTE_20
-	palette_pointer Palette21,  8, 0 ; PALETTE_21
-	palette_pointer Palette22,  8, 0 ; PALETTE_22
-	palette_pointer Palette23,  8, 0 ; PALETTE_23
-	palette_pointer Palette24,  8, 0 ; PALETTE_24
-	palette_pointer Palette25,  8, 0 ; PALETTE_25
-	palette_pointer Palette26,  8, 0 ; PALETTE_26
-	palette_pointer Palette27,  8, 0 ; PALETTE_27
-	palette_pointer Palette28,  8, 0 ; PALETTE_28
-	palette_pointer Palette29,  8, 2 ; PALETTE_29
-	palette_pointer Palette30,  8, 2 ; PALETTE_30
-	palette_pointer Palette31,  1, 1 ; PALETTE_31
-	palette_pointer Palette32,  1, 1 ; PALETTE_32
-	palette_pointer Palette33,  1, 1 ; PALETTE_33
-	palette_pointer Palette34,  1, 1 ; PALETTE_34
-	palette_pointer Palette35,  1, 1 ; PALETTE_35
-	palette_pointer Palette36,  1, 1 ; PALETTE_36
-	palette_pointer Palette37,  1, 1 ; PALETTE_37
-	palette_pointer Palette38,  1, 1 ; PALETTE_38
-	palette_pointer Palette39,  1, 1 ; PALETTE_39
-	palette_pointer Palette40,  1, 1 ; PALETTE_40
-	palette_pointer Palette41,  1, 1 ; PALETTE_41
-	palette_pointer Palette42,  1, 1 ; PALETTE_42
-	palette_pointer Palette43,  1, 1 ; PALETTE_43
-	palette_pointer Palette44,  1, 1 ; PALETTE_44
-	palette_pointer Palette45,  1, 1 ; PALETTE_45
-	palette_pointer Palette46,  1, 1 ; PALETTE_46
-	palette_pointer Palette47,  1, 1 ; PALETTE_47
-	palette_pointer Palette48,  1, 1 ; PALETTE_48
-	palette_pointer Palette49,  1, 1 ; PALETTE_49
-	palette_pointer Palette50,  1, 1 ; PALETTE_50
-	palette_pointer Palette51,  1, 1 ; PALETTE_51
-	palette_pointer Palette52,  1, 1 ; PALETTE_52
-	palette_pointer Palette53,  1, 1 ; PALETTE_53
-	palette_pointer Palette54,  1, 1 ; PALETTE_54
-	palette_pointer Palette55,  1, 1 ; PALETTE_55
-	palette_pointer Palette56,  1, 1 ; PALETTE_56
-	palette_pointer Palette57,  1, 1 ; PALETTE_57
-	palette_pointer Palette58,  1, 1 ; PALETTE_58
-	palette_pointer Palette59,  1, 1 ; PALETTE_59
-	palette_pointer Palette60,  1, 1 ; PALETTE_60
-	palette_pointer Palette61,  1, 1 ; PALETTE_61
-	palette_pointer Palette62,  1, 1 ; PALETTE_62
-	palette_pointer Palette63,  1, 1 ; PALETTE_63
-	palette_pointer Palette64,  1, 1 ; PALETTE_64
-	palette_pointer Palette65,  1, 1 ; PALETTE_65
-	palette_pointer Palette66,  1, 1 ; PALETTE_66
-	palette_pointer Palette67,  1, 1 ; PALETTE_67
-	palette_pointer Palette68,  1, 1 ; PALETTE_68
-	palette_pointer Palette69,  1, 1 ; PALETTE_69
-	palette_pointer Palette70,  1, 1 ; PALETTE_70
-	palette_pointer Palette71,  1, 1 ; PALETTE_71
-	palette_pointer Palette72,  1, 1 ; PALETTE_72
-	palette_pointer Palette73,  1, 1 ; PALETTE_73
-	palette_pointer Palette74,  1, 1 ; PALETTE_74
-	palette_pointer Palette75,  1, 1 ; PALETTE_75
-	palette_pointer Palette76,  1, 1 ; PALETTE_76
-	palette_pointer Palette77,  1, 1 ; PALETTE_77
-	palette_pointer Palette78,  1, 1 ; PALETTE_78
-	palette_pointer Palette79,  1, 1 ; PALETTE_79
-	palette_pointer Palette80,  1, 1 ; PALETTE_80
-	palette_pointer Palette81,  1, 1 ; PALETTE_81
-	palette_pointer Palette82,  1, 1 ; PALETTE_82
-	palette_pointer Palette83,  1, 1 ; PALETTE_83
-	palette_pointer Palette84,  1, 1 ; PALETTE_84
-	palette_pointer Palette85,  1, 1 ; PALETTE_85
-	palette_pointer Palette86,  1, 1 ; PALETTE_86
-	palette_pointer Palette87,  1, 1 ; PALETTE_87
-	palette_pointer Palette88,  1, 1 ; PALETTE_88
-	palette_pointer Palette89,  1, 1 ; PALETTE_89
-	palette_pointer Palette90,  1, 1 ; PALETTE_90
-	palette_pointer Palette91,  1, 1 ; PALETTE_91
-	palette_pointer Palette92,  1, 1 ; PALETTE_92
-	palette_pointer Palette93,  1, 1 ; PALETTE_93
-	palette_pointer Palette94,  8, 0 ; PALETTE_94
-	palette_pointer Palette95,  8, 0 ; PALETTE_95
-	palette_pointer Palette96,  8, 0 ; PALETTE_96
-	palette_pointer Palette97,  8, 0 ; PALETTE_97
-	palette_pointer Palette98,  8, 0 ; PALETTE_98
-	palette_pointer Palette99,  8, 0 ; PALETTE_99
-	palette_pointer Palette100, 8, 0 ; PALETTE_100
-	palette_pointer Palette101, 7, 0 ; PALETTE_101
-	palette_pointer Palette102, 7, 0 ; PALETTE_102
-	palette_pointer Palette103, 7, 0 ; PALETTE_103
-	palette_pointer Palette104, 7, 0 ; PALETTE_104
-	palette_pointer Palette105, 7, 0 ; PALETTE_105
-	palette_pointer Palette106, 7, 0 ; PALETTE_106
-	palette_pointer Palette107, 7, 0 ; PALETTE_107
-	palette_pointer Palette108, 0, 1 ; PALETTE_108
-	palette_pointer Palette109, 0, 1 ; PALETTE_109
-	palette_pointer Palette110, 0, 0 ; PALETTE_110
-	palette_pointer Palette111, 8, 1 ; PALETTE_111
-	palette_pointer Palette112, 8, 1 ; PALETTE_112
-	palette_pointer Palette113, 8, 1 ; PALETTE_113
-	palette_pointer Palette114, 4, 2 ; PALETTE_114
-	palette_pointer Palette115, 4, 2 ; PALETTE_115
-	palette_pointer Palette116, 4, 2 ; PALETTE_116
-	palette_pointer Palette117, 1, 0 ; PALETTE_117
-	palette_pointer Palette118, 6, 0 ; PALETTE_118
-	palette_pointer Palette119, 1, 0 ; PALETTE_119
-	palette_pointer Palette120, 1, 0 ; PALETTE_120
-	palette_pointer Palette121, 1, 0 ; PALETTE_121
-	palette_pointer Palette122, 1, 0 ; PALETTE_122
-	palette_pointer Palette123, 1, 0 ; PALETTE_123
-	palette_pointer Palette124, 1, 0 ; PALETTE_124
-	palette_pointer Palette125, 1, 0 ; PALETTE_125
-	palette_pointer Palette126, 1, 0 ; PALETTE_126
-	palette_pointer Palette127, 1, 0 ; PALETTE_127
-	palette_pointer Palette128, 1, 0 ; PALETTE_128
-	palette_pointer Palette129, 1, 0 ; PALETTE_129
-	palette_pointer Palette130, 1, 0 ; PALETTE_130
-	palette_pointer Palette131, 1, 0 ; PALETTE_131
-	palette_pointer Palette132, 1, 0 ; PALETTE_132
-	palette_pointer Palette133, 1, 0 ; PALETTE_133
-	palette_pointer Palette134, 1, 0 ; PALETTE_134
-	palette_pointer Palette135, 1, 0 ; PALETTE_135
-	palette_pointer Palette136, 1, 0 ; PALETTE_136
-	palette_pointer Palette137, 1, 0 ; PALETTE_137
-	palette_pointer Palette138, 1, 0 ; PALETTE_138
-	palette_pointer Palette139, 1, 0 ; PALETTE_139
-	palette_pointer Palette140, 1, 0 ; PALETTE_140
-	palette_pointer Palette141, 1, 0 ; PALETTE_141
-	palette_pointer Palette142, 1, 0 ; PALETTE_142
-	palette_pointer Palette143, 1, 0 ; PALETTE_143
-	palette_pointer Palette144, 1, 0 ; PALETTE_144
-	palette_pointer Palette145, 1, 0 ; PALETTE_145
-	palette_pointer Palette146, 1, 0 ; PALETTE_146
-	palette_pointer Palette147, 1, 0 ; PALETTE_147
-	palette_pointer Palette148, 1, 0 ; PALETTE_148
-	palette_pointer Palette149, 1, 0 ; PALETTE_149
-	palette_pointer Palette150, 1, 0 ; PALETTE_150
-	palette_pointer Palette151, 1, 0 ; PALETTE_151
-	palette_pointer Palette152, 1, 0 ; PALETTE_152
-	palette_pointer Palette153, 1, 0 ; PALETTE_153
-	palette_pointer Palette154, 1, 0 ; PALETTE_154
-	palette_pointer Palette155, 1, 0 ; PALETTE_155
-	palette_pointer Palette156, 1, 0 ; PALETTE_156
-	palette_pointer Palette157, 1, 0 ; PALETTE_157
-	palette_pointer Palette158, 1, 0 ; PALETTE_158
-	palette_pointer Palette159, 1, 0 ; PALETTE_159
-	palette_pointer Palette160, 1, 0 ; PALETTE_160
-
-OverworldMapTilemap:: ; 8191b (20:591b)
-	db $14 ; width
-	db $12 ; height
-	dw NULL
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/overworld_map.bin"
-
-OverworldMapCGBTilemap:: ; 81a22 (20:5a22)
-	db $14 ; width
-	db $12 ; height
-	dw NULL
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/overworld_map_cgb.bin"
-
-MasonLaboratoryTilemap:: ; 81c13 (20:5c13)
-	db $1c ; width
-	db $1e ; height
-	dw MasonLaboratoryPermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/mason_laboratory.bin"
-MasonLaboratoryPermissions:
-	INCBIN "data/maps/permissions/mason_laboratory.bin"
-
-MasonLaboratoryCGBTilemap:: ; 81d2e (20:5d2e)
-	db $1c ; width
-	db $1e ; height
-	dw MasonLaboratoryCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/mason_laboratory_cgb.bin"
-MasonLaboratoryCGBPermissions:
-	INCBIN "data/maps/permissions/mason_laboratory_cgb.bin"
-
-ChallengeMachineMapEventTilemap:: ; 81ed1 (20:5ed1)
-	db $04 ; width
-	db $06 ; height
-	dw ChallengeMachineMapEventPermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/challenge_machine_map_event.bin"
-ChallengeMachineMapEventPermissions:
-	INCBIN "data/maps/permissions/challenge_machine_map_event.bin"
-
-ChallengeMachineMapEventCGBTilemap:: ; 81ef5 (20:5ef5)
-	db $04 ; width
-	db $06 ; height
-	dw ChallengeMachineMapEventCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/challenge_machine_map_event_cgb.bin"
-ChallengeMachineMapEventCGBPermissions:
-	INCBIN "data/maps/permissions/challenge_machine_map_event_cgb.bin"
-
-DeckMachineRoomTilemap:: ; 81f26 (20:5f26)
-	db $18 ; width
-	db $1e ; height
-	dw DeckMachineRoomPermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/deck_machine_room.bin"
-DeckMachineRoomPermissions:
-	INCBIN "data/maps/permissions/deck_machine_room.bin"
-
-DeckMachineRoomCGBTilemap:: ; 81feb (20:5feb)
-	db $18 ; width
-	db $1e ; height
-	dw DeckMachineRoomCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/deck_machine_room_cgb.bin"
-DeckMachineRoomCGBPermissions:
-	INCBIN "data/maps/permissions/deck_machine_room_cgb.bin"
-
-DeckMachineMapEventTilemap:: ; 82143 (20:6143)
-	db $04 ; width
-	db $01 ; height
-	dw DeckMachineMapEventPermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/deck_machine_map_event.bin"
-DeckMachineMapEventPermissions:
-	INCBIN "data/maps/permissions/deck_machine_map_event.bin"
-
-DeckMachineMapEventCGBTilemap:: ; 82150 (20:6150)
-	db $04 ; width
-	db $01 ; height
-	dw DeckMachineMapEventCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/deck_machine_map_event_cgb.bin"
-DeckMachineMapEventCGBPermissions:
-	INCBIN "data/maps/permissions/deck_machine_map_event_cgb.bin"
-
-IshiharaTilemap:: ; 82160 (20:6160)
-	db $14 ; width
-	db $18 ; height
-	dw IshiharaPermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/ishihara.bin"
-IshiharaPermissions:
-	INCBIN "data/maps/permissions/ishihara.bin"
-
-IshiharaCGBTilemap:: ; 82222 (20:6222)
-	db $14 ; width
-	db $18 ; height
-	dw IshiharaCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/ishihara_cgb.bin"
-IshiharaCGBPermissions:
-	INCBIN "data/maps/permissions/ishihara_cgb.bin"
-
-FightingClubEntranceTilemap:: ; 82336 (20:6336)
-	db $14 ; width
-	db $12 ; height
-	dw FightingClubEntrancePermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/fighting_club_entrance.bin"
-FightingClubEntrancePermissions:
-	INCBIN "data/maps/permissions/fighting_club_entrance.bin"
-
-FightingClubEntranceCGBTilemap:: ; 82400 (20:6400)
-	db $14 ; width
-	db $12 ; height
-	dw FightingClubEntranceCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/fighting_club_entrance_cgb.bin"
-FightingClubEntranceCGBPermissions:
-	INCBIN "data/maps/permissions/fighting_club_entrance_cgb.bin"
-
-RockClubEntranceTilemap:: ; 8251d (20:651d)
-	db $14 ; width
-	db $12 ; height
-	dw RockClubEntrancePermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/rock_club_entrance.bin"
-RockClubEntrancePermissions:
-	INCBIN "data/maps/permissions/rock_club_entrance.bin"
-
-RockClubEntranceCGBTilemap:: ; 825e7 (20:65e7)
-	db $14 ; width
-	db $12 ; height
-	dw RockClubEntranceCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/rock_club_entrance_cgb.bin"
-RockClubEntranceCGBPermissions:
-	INCBIN "data/maps/permissions/rock_club_entrance_cgb.bin"
-
-WaterClubEntranceTilemap:: ; 82704 (20:6704)
-	db $14 ; width
-	db $12 ; height
-	dw WaterClubEntrancePermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/water_club_entrance.bin"
-WaterClubEntrancePermissions:
-	INCBIN "data/maps/permissions/water_club_entrance.bin"
-
-WaterClubEntranceCGBTilemap:: ; 827ce (20:67ce)
-	db $14 ; width
-	db $12 ; height
-	dw WaterClubEntranceCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/water_club_entrance_cgb.bin"
-WaterClubEntranceCGBPermissions:
-	INCBIN "data/maps/permissions/water_club_entrance_cgb.bin"
-
-LightningClubEntranceTilemap:: ; 828eb (20:68eb)
-	db $14 ; width
-	db $12 ; height
-	dw LightningClubEntrancePermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/lightning_club_entrance.bin"
-LightningClubEntrancePermissions:
-	INCBIN "data/maps/permissions/lightning_club_entrance.bin"
-
-LightningClubEntranceCGBTilemap:: ; 829b5 (20:69b5)
-	db $14 ; width
-	db $12 ; height
-	dw LightningClubEntranceCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/lightning_club_entrance_cgb.bin"
-LightningClubEntranceCGBPermissions:
-	INCBIN "data/maps/permissions/lightning_club_entrance_cgb.bin"
-
-GrassClubEntranceTilemap:: ; 82ad2 (20:6ad2)
-	db $14 ; width
-	db $12 ; height
-	dw GrassClubEntrancePermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/grass_club_entrance.bin"
-GrassClubEntrancePermissions:
-	INCBIN "data/maps/permissions/grass_club_entrance.bin"
-
-GrassClubEntranceCGBTilemap:: ; 82b9c (20:6b9c)
-	db $14 ; width
-	db $12 ; height
-	dw GrassClubEntranceCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/grass_club_entrance_cgb.bin"
-GrassClubEntranceCGBPermissions:
-	INCBIN "data/maps/permissions/grass_club_entrance_cgb.bin"
-
-PsychicClubEntranceTilemap:: ; 82cb9 (20:6cb9)
-	db $14 ; width
-	db $12 ; height
-	dw PsychicClubEntrancePermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/psychic_club_entrance.bin"
-PsychicClubEntrancePermissions:
-	INCBIN "data/maps/permissions/psychic_club_entrance.bin"
-
-PsychicClubEntranceCGBTilemap:: ; 82d83 (20:6d83)
-	db $14 ; width
-	db $12 ; height
-	dw PsychicClubEntranceCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/psychic_club_entrance_cgb.bin"
-PsychicClubEntranceCGBPermissions:
-	INCBIN "data/maps/permissions/psychic_club_entrance_cgb.bin"
-
-ScienceClubEntranceTilemap:: ; 82ea0 (20:6ea0)
-	db $14 ; width
-	db $12 ; height
-	dw ScienceClubEntrancePermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/science_club_entrance.bin"
-ScienceClubEntrancePermissions:
-	INCBIN "data/maps/permissions/science_club_entrance.bin"
-
-ScienceClubEntranceCGBTilemap:: ; 82f6a (20:6f6a)
-	db $14 ; width
-	db $12 ; height
-	dw ScienceClubEntranceCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/science_club_entrance_cgb.bin"
-ScienceClubEntranceCGBPermissions:
-	INCBIN "data/maps/permissions/science_club_entrance_cgb.bin"
-
-FireClubEntranceTilemap:: ; 83087 (20:7087)
-	db $14 ; width
-	db $12 ; height
-	dw FireClubEntrancePermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/fire_club_entrance.bin"
-FireClubEntrancePermissions:
-	INCBIN "data/maps/permissions/fire_club_entrance.bin"
-
-FireClubEntranceCGBTilemap:: ; 83151 (20:7151)
-	db $14 ; width
-	db $12 ; height
-	dw FireClubEntranceCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/fire_club_entrance_cgb.bin"
-FireClubEntranceCGBPermissions:
-	INCBIN "data/maps/permissions/fire_club_entrance_cgb.bin"
-
-ChallengeHallEntranceTilemap:: ; 8326e (20:726e)
-	db $14 ; width
-	db $12 ; height
-	dw ChallengeHallEntrancePermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/challenge_hall_entrance.bin"
-ChallengeHallEntrancePermissions:
-	INCBIN "data/maps/permissions/challenge_hall_entrance.bin"
-
-ChallengeHallEntranceCGBTilemap:: ; 83321 (20:7321)
-	db $14 ; width
-	db $12 ; height
-	dw ChallengeHallEntranceCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/challenge_hall_entrance_cgb.bin"
-ChallengeHallEntranceCGBPermissions:
-	INCBIN "data/maps/permissions/challenge_hall_entrance_cgb.bin"
-
-ClubLobbyTilemap:: ; 83424 (20:7424)
-	db $1c ; width
-	db $1a ; height
-	dw ClubLobbyPermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/club_lobby.bin"
-ClubLobbyPermissions:
-	INCBIN "data/maps/permissions/club_lobby.bin"
-
-ClubLobbyCGBTilemap:: ; 83545 (20:7545)
-	db $1c ; width
-	db $1a ; height
-	dw ClubLobbyCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/club_lobby_cgb.bin"
-ClubLobbyCGBPermissions:
-	INCBIN "data/maps/permissions/club_lobby_cgb.bin"
-
-FightingClubTilemap:: ; 836db (20:76db)
-	db $18 ; width
-	db $12 ; height
-	dw FightingClubPermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/fighting_club.bin"
-FightingClubPermissions:
-	INCBIN "data/maps/permissions/fighting_club.bin"
-
-FightingClubCGBTilemap:: ; 8378c (20:778c)
-	db $18 ; width
-	db $12 ; height
-	dw FightingClubCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/fighting_club_cgb.bin"
-FightingClubCGBPermissions:
-	INCBIN "data/maps/permissions/fighting_club_cgb.bin"
-
-RockClubTilemap:: ; 8388d (20:788d)
-	db $1c ; width
-	db $1e ; height
-	dw RockClubPermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/rock_club.bin"
-RockClubPermissions:
-	INCBIN "data/maps/permissions/rock_club.bin"
-
-RockClubCGBTilemap:: ; 839d6 (20:79d6)
-	db $1c ; width
-	db $1e ; height
-	dw RockClubCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/rock_club_cgb.bin"
-RockClubCGBPermissions:
-	INCBIN "data/maps/permissions/rock_club_cgb.bin"
-
-PokemonDomeDoorMapEventTilemap:: ; 83bf1 (20:7bf1)
-	db $04 ; width
-	db $03 ; height
-	dw PokemonDomeDoorMapEventPermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/pokemon_dome_door_map_event.bin"
-PokemonDomeDoorMapEventPermissions:
-	INCBIN "data/maps/permissions/pokemon_dome_door_map_event.bin"
-
-PokemonDomeDoorMapEventCGBTilemap:: ; 83c03 (20:7c03)
-	db $04 ; width
-	db $03 ; height
-	dw PokemonDomeDoorMapEventCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/pokemon_dome_door_map_event_cgb.bin"
-PokemonDomeDoorMapEventCGBPermissions:
-	INCBIN "data/maps/permissions/pokemon_dome_door_map_event_cgb.bin"
-
-HallOfHonorDoorMapEventTilemap:: ; 83c1a (20:7c1a)
-	db $04 ; width
-	db $03 ; height
-	dw HallOfHonorDoorMapEventPermissions
-	db FALSE ; cgb mode
-	INCBIN "data/maps/tiles/hall_of_honor_door_map_event.bin"
-HallOfHonorDoorMapEventPermissions:
-	INCBIN "data/maps/permissions/hall_of_honor_door_map_event.bin"
-
-HallOfHonorDoorMapEventCGBTilemap:: ; 83c26 (20:7c26)
-	db $04 ; width
-	db $03 ; height
-	dw HallOfHonorDoorMapEventCGBPermissions
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/hall_of_honor_door_map_event_cgb.bin"
-HallOfHonorDoorMapEventCGBPermissions:
-	INCBIN "data/maps/permissions/hall_of_honor_door_map_event_cgb.bin"
-
-GrassMedalTilemap:: ; 83c36 (20:7c36)
-	db $03 ; width
-	db $03 ; height
-	dw NULL
-	db TRUE ; cgb mode
-	INCBIN "data/maps/tiles/grass_medal.bin"
-
-AnimData1:: ; 83c4c (20:7c4c)
-	frame_table AnimFrameTable0
-	frame_data 3, 16, 0, 0
-	frame_data 4, 16, 0, 0
-	frame_data 0, 0, 0, 0
-
-Palette110:: ; 83c5b (20:7c5b)
-	db $00, $00
diff --git a/src/engine/gfx/gfx_table_pointers.asm b/src/engine/gfx/gfx_table_pointers.asm
new file mode 100644
index 0000000..370ed15
--- /dev/null
+++ b/src/engine/gfx/gfx_table_pointers.asm
@@ -0,0 +1,6 @@
+GfxTablePointers:
+	dw Tilemaps
+	dw Tilesets
+	dw Sprites
+	dw SpriteAnimations
+	dw Palettes
diff --git a/src/engine/gfx/palettes.asm b/src/engine/gfx/palettes.asm
new file mode 100644
index 0000000..8a0d71a
--- /dev/null
+++ b/src/engine/gfx/palettes.asm
@@ -0,0 +1,170 @@
+; \1 = palette pointer
+; \2 = number of palettes
+; \3 = number of OBJ colors
+palette_pointer: MACRO
+	dwb \1, BANK(\1) - BANK(Palettes)
+	db (\2 << 4) + \3
+ENDM
+
+Palettes:
+	palette_pointer Palette0,   8, 1 ; PALETTE_0
+	palette_pointer Palette1,   8, 0 ; PALETTE_1
+	palette_pointer Palette2,   8, 0 ; PALETTE_2
+	palette_pointer Palette3,   8, 0 ; PALETTE_3
+	palette_pointer Palette4,   8, 0 ; PALETTE_4
+	palette_pointer Palette5,   8, 0 ; PALETTE_5
+	palette_pointer Palette6,   8, 0 ; PALETTE_6
+	palette_pointer Palette7,   8, 0 ; PALETTE_7
+	palette_pointer Palette8,   8, 0 ; PALETTE_8
+	palette_pointer Palette9,   8, 0 ; PALETTE_9
+	palette_pointer Palette10,  8, 0 ; PALETTE_10
+	palette_pointer Palette11,  8, 0 ; PALETTE_11
+	palette_pointer Palette12,  8, 0 ; PALETTE_12
+	palette_pointer Palette13,  8, 0 ; PALETTE_13
+	palette_pointer Palette14,  8, 0 ; PALETTE_14
+	palette_pointer Palette15,  8, 0 ; PALETTE_15
+	palette_pointer Palette16,  8, 0 ; PALETTE_16
+	palette_pointer Palette17,  8, 0 ; PALETTE_17
+	palette_pointer Palette18,  8, 0 ; PALETTE_18
+	palette_pointer Palette19,  8, 0 ; PALETTE_19
+	palette_pointer Palette20,  8, 0 ; PALETTE_20
+	palette_pointer Palette21,  8, 0 ; PALETTE_21
+	palette_pointer Palette22,  8, 0 ; PALETTE_22
+	palette_pointer Palette23,  8, 0 ; PALETTE_23
+	palette_pointer Palette24,  8, 0 ; PALETTE_24
+	palette_pointer Palette25,  8, 0 ; PALETTE_25
+	palette_pointer Palette26,  8, 0 ; PALETTE_26
+	palette_pointer Palette27,  8, 0 ; PALETTE_27
+	palette_pointer Palette28,  8, 0 ; PALETTE_28
+	palette_pointer Palette29,  8, 2 ; PALETTE_29
+	palette_pointer Palette30,  8, 2 ; PALETTE_30
+	palette_pointer Palette31,  1, 1 ; PALETTE_31
+	palette_pointer Palette32,  1, 1 ; PALETTE_32
+	palette_pointer Palette33,  1, 1 ; PALETTE_33
+	palette_pointer Palette34,  1, 1 ; PALETTE_34
+	palette_pointer Palette35,  1, 1 ; PALETTE_35
+	palette_pointer Palette36,  1, 1 ; PALETTE_36
+	palette_pointer Palette37,  1, 1 ; PALETTE_37
+	palette_pointer Palette38,  1, 1 ; PALETTE_38
+	palette_pointer Palette39,  1, 1 ; PALETTE_39
+	palette_pointer Palette40,  1, 1 ; PALETTE_40
+	palette_pointer Palette41,  1, 1 ; PALETTE_41
+	palette_pointer Palette42,  1, 1 ; PALETTE_42
+	palette_pointer Palette43,  1, 1 ; PALETTE_43
+	palette_pointer Palette44,  1, 1 ; PALETTE_44
+	palette_pointer Palette45,  1, 1 ; PALETTE_45
+	palette_pointer Palette46,  1, 1 ; PALETTE_46
+	palette_pointer Palette47,  1, 1 ; PALETTE_47
+	palette_pointer Palette48,  1, 1 ; PALETTE_48
+	palette_pointer Palette49,  1, 1 ; PALETTE_49
+	palette_pointer Palette50,  1, 1 ; PALETTE_50
+	palette_pointer Palette51,  1, 1 ; PALETTE_51
+	palette_pointer Palette52,  1, 1 ; PALETTE_52
+	palette_pointer Palette53,  1, 1 ; PALETTE_53
+	palette_pointer Palette54,  1, 1 ; PALETTE_54
+	palette_pointer Palette55,  1, 1 ; PALETTE_55
+	palette_pointer Palette56,  1, 1 ; PALETTE_56
+	palette_pointer Palette57,  1, 1 ; PALETTE_57
+	palette_pointer Palette58,  1, 1 ; PALETTE_58
+	palette_pointer Palette59,  1, 1 ; PALETTE_59
+	palette_pointer Palette60,  1, 1 ; PALETTE_60
+	palette_pointer Palette61,  1, 1 ; PALETTE_61
+	palette_pointer Palette62,  1, 1 ; PALETTE_62
+	palette_pointer Palette63,  1, 1 ; PALETTE_63
+	palette_pointer Palette64,  1, 1 ; PALETTE_64
+	palette_pointer Palette65,  1, 1 ; PALETTE_65
+	palette_pointer Palette66,  1, 1 ; PALETTE_66
+	palette_pointer Palette67,  1, 1 ; PALETTE_67
+	palette_pointer Palette68,  1, 1 ; PALETTE_68
+	palette_pointer Palette69,  1, 1 ; PALETTE_69
+	palette_pointer Palette70,  1, 1 ; PALETTE_70
+	palette_pointer Palette71,  1, 1 ; PALETTE_71
+	palette_pointer Palette72,  1, 1 ; PALETTE_72
+	palette_pointer Palette73,  1, 1 ; PALETTE_73
+	palette_pointer Palette74,  1, 1 ; PALETTE_74
+	palette_pointer Palette75,  1, 1 ; PALETTE_75
+	palette_pointer Palette76,  1, 1 ; PALETTE_76
+	palette_pointer Palette77,  1, 1 ; PALETTE_77
+	palette_pointer Palette78,  1, 1 ; PALETTE_78
+	palette_pointer Palette79,  1, 1 ; PALETTE_79
+	palette_pointer Palette80,  1, 1 ; PALETTE_80
+	palette_pointer Palette81,  1, 1 ; PALETTE_81
+	palette_pointer Palette82,  1, 1 ; PALETTE_82
+	palette_pointer Palette83,  1, 1 ; PALETTE_83
+	palette_pointer Palette84,  1, 1 ; PALETTE_84
+	palette_pointer Palette85,  1, 1 ; PALETTE_85
+	palette_pointer Palette86,  1, 1 ; PALETTE_86
+	palette_pointer Palette87,  1, 1 ; PALETTE_87
+	palette_pointer Palette88,  1, 1 ; PALETTE_88
+	palette_pointer Palette89,  1, 1 ; PALETTE_89
+	palette_pointer Palette90,  1, 1 ; PALETTE_90
+	palette_pointer Palette91,  1, 1 ; PALETTE_91
+	palette_pointer Palette92,  1, 1 ; PALETTE_92
+	palette_pointer Palette93,  1, 1 ; PALETTE_93
+	palette_pointer Palette94,  8, 0 ; PALETTE_94
+	palette_pointer Palette95,  8, 0 ; PALETTE_95
+	palette_pointer Palette96,  8, 0 ; PALETTE_96
+	palette_pointer Palette97,  8, 0 ; PALETTE_97
+	palette_pointer Palette98,  8, 0 ; PALETTE_98
+	palette_pointer Palette99,  8, 0 ; PALETTE_99
+	palette_pointer Palette100, 8, 0 ; PALETTE_100
+	palette_pointer Palette101, 7, 0 ; PALETTE_101
+	palette_pointer Palette102, 7, 0 ; PALETTE_102
+	palette_pointer Palette103, 7, 0 ; PALETTE_103
+	palette_pointer Palette104, 7, 0 ; PALETTE_104
+	palette_pointer Palette105, 7, 0 ; PALETTE_105
+	palette_pointer Palette106, 7, 0 ; PALETTE_106
+	palette_pointer Palette107, 7, 0 ; PALETTE_107
+	palette_pointer Palette108, 0, 1 ; PALETTE_108
+	palette_pointer Palette109, 0, 1 ; PALETTE_109
+	palette_pointer Palette110, 0, 0 ; PALETTE_110
+	palette_pointer Palette111, 8, 1 ; PALETTE_111
+	palette_pointer Palette112, 8, 1 ; PALETTE_112
+	palette_pointer Palette113, 8, 1 ; PALETTE_113
+	palette_pointer Palette114, 4, 2 ; PALETTE_114
+	palette_pointer Palette115, 4, 2 ; PALETTE_115
+	palette_pointer Palette116, 4, 2 ; PALETTE_116
+	palette_pointer Palette117, 1, 0 ; PALETTE_117
+	palette_pointer Palette118, 6, 0 ; PALETTE_118
+	palette_pointer Palette119, 1, 0 ; PALETTE_119
+	palette_pointer Palette120, 1, 0 ; PALETTE_120
+	palette_pointer Palette121, 1, 0 ; PALETTE_121
+	palette_pointer Palette122, 1, 0 ; PALETTE_122
+	palette_pointer Palette123, 1, 0 ; PALETTE_123
+	palette_pointer Palette124, 1, 0 ; PALETTE_124
+	palette_pointer Palette125, 1, 0 ; PALETTE_125
+	palette_pointer Palette126, 1, 0 ; PALETTE_126
+	palette_pointer Palette127, 1, 0 ; PALETTE_127
+	palette_pointer Palette128, 1, 0 ; PALETTE_128
+	palette_pointer Palette129, 1, 0 ; PALETTE_129
+	palette_pointer Palette130, 1, 0 ; PALETTE_130
+	palette_pointer Palette131, 1, 0 ; PALETTE_131
+	palette_pointer Palette132, 1, 0 ; PALETTE_132
+	palette_pointer Palette133, 1, 0 ; PALETTE_133
+	palette_pointer Palette134, 1, 0 ; PALETTE_134
+	palette_pointer Palette135, 1, 0 ; PALETTE_135
+	palette_pointer Palette136, 1, 0 ; PALETTE_136
+	palette_pointer Palette137, 1, 0 ; PALETTE_137
+	palette_pointer Palette138, 1, 0 ; PALETTE_138
+	palette_pointer Palette139, 1, 0 ; PALETTE_139
+	palette_pointer Palette140, 1, 0 ; PALETTE_140
+	palette_pointer Palette141, 1, 0 ; PALETTE_141
+	palette_pointer Palette142, 1, 0 ; PALETTE_142
+	palette_pointer Palette143, 1, 0 ; PALETTE_143
+	palette_pointer Palette144, 1, 0 ; PALETTE_144
+	palette_pointer Palette145, 1, 0 ; PALETTE_145
+	palette_pointer Palette146, 1, 0 ; PALETTE_146
+	palette_pointer Palette147, 1, 0 ; PALETTE_147
+	palette_pointer Palette148, 1, 0 ; PALETTE_148
+	palette_pointer Palette149, 1, 0 ; PALETTE_149
+	palette_pointer Palette150, 1, 0 ; PALETTE_150
+	palette_pointer Palette151, 1, 0 ; PALETTE_151
+	palette_pointer Palette152, 1, 0 ; PALETTE_152
+	palette_pointer Palette153, 1, 0 ; PALETTE_153
+	palette_pointer Palette154, 1, 0 ; PALETTE_154
+	palette_pointer Palette155, 1, 0 ; PALETTE_155
+	palette_pointer Palette156, 1, 0 ; PALETTE_156
+	palette_pointer Palette157, 1, 0 ; PALETTE_157
+	palette_pointer Palette158, 1, 0 ; PALETTE_158
+	palette_pointer Palette159, 1, 0 ; PALETTE_159
+	palette_pointer Palette160, 1, 0 ; PALETTE_160
diff --git a/src/engine/gfx/sprite_animations.asm b/src/engine/gfx/sprite_animations.asm
new file mode 100644
index 0000000..7c432c6
--- /dev/null
+++ b/src/engine/gfx/sprite_animations.asm
@@ -0,0 +1,224 @@
+; \1 = anim data pointer
+anim_data_pointer: MACRO
+	dwb \1, BANK(\1) - BANK(SpriteAnimations)
+	db $00 ; unused (padding?)
+ENDM
+
+SpriteAnimations:
+	anim_data_pointer AnimData0   ; SPRITE_ANIM_LIGHT_NPC_UP
+	anim_data_pointer AnimData1   ; SPRITE_ANIM_LIGHT_NPC_RIGHT
+	anim_data_pointer AnimData2   ; SPRITE_ANIM_LIGHT_NPC_DOWN
+	anim_data_pointer AnimData3   ; SPRITE_ANIM_LIGHT_NPC_LEFT
+	anim_data_pointer AnimData4   ; SPRITE_ANIM_DARK_NPC_UP
+	anim_data_pointer AnimData5   ; SPRITE_ANIM_DARK_NPC_RIGHT
+	anim_data_pointer AnimData6   ; SPRITE_ANIM_DARK_NPC_DOWN
+	anim_data_pointer AnimData7   ; SPRITE_ANIM_DARK_NPC_LEFT
+	anim_data_pointer AnimData8   ; SPRITE_ANIM_SGB_AMY_LAYING
+	anim_data_pointer AnimData9   ; SPRITE_ANIM_SGB_AMY_STAND
+	anim_data_pointer AnimData10  ; SPRITE_ANIM_SGB_CLERK_NPC_UP
+	anim_data_pointer AnimData11  ; SPRITE_ANIM_SGB_CLERK_NPC_RIGHT
+	anim_data_pointer AnimData12  ; SPRITE_ANIM_SGB_CLERK_NPC_DOWN
+	anim_data_pointer AnimData13  ; SPRITE_ANIM_SGB_CLERK_NPC_LEFT
+	anim_data_pointer AnimData14  ; SPRITE_ANIM_BLUE_NPC_UP
+	anim_data_pointer AnimData15  ; SPRITE_ANIM_BLUE_NPC_RIGHT
+	anim_data_pointer AnimData16  ; SPRITE_ANIM_BLUE_NPC_DOWN
+	anim_data_pointer AnimData17  ; SPRITE_ANIM_BLUE_NPC_LEFT
+	anim_data_pointer AnimData18  ; SPRITE_ANIM_PINK_NPC_UP
+	anim_data_pointer AnimData19  ; SPRITE_ANIM_PINK_NPC_RIGHT
+	anim_data_pointer AnimData20  ; SPRITE_ANIM_PINK_NPC_DOWN
+	anim_data_pointer AnimData21  ; SPRITE_ANIM_PINK_NPC_LEFT
+	anim_data_pointer AnimData22  ; SPRITE_ANIM_YELLOW_NPC_UP
+	anim_data_pointer AnimData23  ; SPRITE_ANIM_YELLOW_NPC_RIGHT
+	anim_data_pointer AnimData24  ; SPRITE_ANIM_YELLOW_NPC_DOWN
+	anim_data_pointer AnimData25  ; SPRITE_ANIM_YELLOW_NPC_LEFT
+	anim_data_pointer AnimData26  ; SPRITE_ANIM_GREEN_NPC_UP
+	anim_data_pointer AnimData27  ; SPRITE_ANIM_GREEN_NPC_RIGHT
+	anim_data_pointer AnimData28  ; SPRITE_ANIM_GREEN_NPC_DOWN
+	anim_data_pointer AnimData29  ; SPRITE_ANIM_GREEN_NPC_LEFT
+	anim_data_pointer AnimData30  ; SPRITE_ANIM_RED_NPC_UP
+	anim_data_pointer AnimData31  ; SPRITE_ANIM_RED_NPC_RIGHT
+	anim_data_pointer AnimData32  ; SPRITE_ANIM_RED_NPC_DOWN
+	anim_data_pointer AnimData33  ; SPRITE_ANIM_RED_NPC_LEFT
+	anim_data_pointer AnimData34  ; SPRITE_ANIM_PURPLE_NPC_UP
+	anim_data_pointer AnimData35  ; SPRITE_ANIM_PURPLE_NPC_RIGHT
+	anim_data_pointer AnimData36  ; SPRITE_ANIM_PURPLE_NPC_DOWN
+	anim_data_pointer AnimData37  ; SPRITE_ANIM_PURPLE_NPC_LEFT
+	anim_data_pointer AnimData38  ; SPRITE_ANIM_WHITE_NPC_UP
+	anim_data_pointer AnimData39  ; SPRITE_ANIM_WHITE_NPC_RIGHT
+	anim_data_pointer AnimData40  ; SPRITE_ANIM_WHITE_NPC_DOWN
+	anim_data_pointer AnimData41  ; SPRITE_ANIM_WHITE_NPC_LEFT
+	anim_data_pointer AnimData42  ; SPRITE_ANIM_INDIGO_NPC_UP
+	anim_data_pointer AnimData43  ; SPRITE_ANIM_INDIGO_NPC_RIGHT
+	anim_data_pointer AnimData44  ; SPRITE_ANIM_INDIGO_NPC_DOWN
+	anim_data_pointer AnimData45  ; SPRITE_ANIM_INDIGO_NPC_LEFT
+	anim_data_pointer AnimData46  ; SPRITE_ANIM_CGB_AMY_LAYING
+	anim_data_pointer AnimData47  ; SPRITE_ANIM_CGB_AMY_STAND
+	anim_data_pointer AnimData48  ; SPRITE_ANIM_CGB_CLERK_NPC_UP
+	anim_data_pointer AnimData49  ; SPRITE_ANIM_CGB_CLERK_NPC_RIGHT
+	anim_data_pointer AnimData50  ; SPRITE_ANIM_CGB_CLERK_NPC_DOWN
+	anim_data_pointer AnimData51  ; SPRITE_ANIM_CGB_CLERK_NPC_LEFT
+	anim_data_pointer AnimData52  ; SPRITE_ANIM_SGB_VOLCANO_SMOKE
+	anim_data_pointer AnimData53  ; SPRITE_ANIM_SGB_OWMAP_CURSOR
+	anim_data_pointer AnimData54  ; SPRITE_ANIM_SGB_OWMAP_CURSOR_FAST
+	anim_data_pointer AnimData55  ; SPRITE_ANIM_CGB_VOLCANO_SMOKE
+	anim_data_pointer AnimData56  ; SPRITE_ANIM_CGB_OWMAP_CURSOR
+	anim_data_pointer AnimData57  ; SPRITE_ANIM_CGB_OWMAP_CURSOR_FAST
+	anim_data_pointer AnimData58  ; SPRITE_ANIM_TORCH
+	anim_data_pointer AnimData59  ; SPRITE_ANIM_SGB_CARD_TOP_LEFT
+	anim_data_pointer AnimData60  ; SPRITE_ANIM_SGB_CARD_TOP_RIGHT
+	anim_data_pointer AnimData61  ; SPRITE_ANIM_SGB_CARD_LEFT_SPARK
+	anim_data_pointer AnimData62  ; SPRITE_ANIM_SGB_CARD_BOTTOM_LEFT
+	anim_data_pointer AnimData63  ; SPRITE_ANIM_SGB_CARD_BOTTOM_RIGHT
+	anim_data_pointer AnimData64  ; SPRITE_ANIM_SGB_CARD_RIGHT_SPARK
+	anim_data_pointer AnimData65  ; SPRITE_ANIM_CGB_CARD_TOP_LEFT
+	anim_data_pointer AnimData66  ; SPRITE_ANIM_CGB_CARD_TOP_RIGHT
+	anim_data_pointer AnimData67  ; SPRITE_ANIM_CGB_CARD_LEFT_SPARK
+	anim_data_pointer AnimData68  ; SPRITE_ANIM_CGB_CARD_BOTTOM_LEFT
+	anim_data_pointer AnimData69  ; SPRITE_ANIM_CGB_CARD_BOTTOM_RIGHT
+	anim_data_pointer AnimData70  ; SPRITE_ANIM_CGB_CARD_RIGHT_SPARK
+	anim_data_pointer AnimData71  ; SPRITE_ANIM_71
+	anim_data_pointer AnimData72  ; SPRITE_ANIM_72
+	anim_data_pointer AnimData73  ; SPRITE_ANIM_73
+	anim_data_pointer AnimData74  ; SPRITE_ANIM_74
+	anim_data_pointer AnimData75  ; SPRITE_ANIM_75
+	anim_data_pointer AnimData76  ; SPRITE_ANIM_76
+	anim_data_pointer AnimData77  ; SPRITE_ANIM_77
+	anim_data_pointer AnimData78  ; SPRITE_ANIM_78
+	anim_data_pointer AnimData79  ; SPRITE_ANIM_79
+	anim_data_pointer AnimData80  ; SPRITE_ANIM_80
+	anim_data_pointer AnimData81  ; SPRITE_ANIM_81
+	anim_data_pointer AnimData82  ; SPRITE_ANIM_82
+	anim_data_pointer AnimData83  ; SPRITE_ANIM_83
+	anim_data_pointer AnimData84  ; SPRITE_ANIM_84
+	anim_data_pointer AnimData85  ; SPRITE_ANIM_85
+	anim_data_pointer AnimData86  ; SPRITE_ANIM_86
+	anim_data_pointer AnimData87  ; SPRITE_ANIM_87
+	anim_data_pointer AnimData88  ; SPRITE_ANIM_88
+	anim_data_pointer AnimData89  ; SPRITE_ANIM_89
+	anim_data_pointer AnimData90  ; SPRITE_ANIM_90
+	anim_data_pointer AnimData91  ; SPRITE_ANIM_91
+	anim_data_pointer AnimData92  ; SPRITE_ANIM_92
+	anim_data_pointer AnimData93  ; SPRITE_ANIM_93
+	anim_data_pointer AnimData94  ; SPRITE_ANIM_94
+	anim_data_pointer AnimData95  ; SPRITE_ANIM_95
+	anim_data_pointer AnimData96  ; SPRITE_ANIM_96
+	anim_data_pointer AnimData97  ; SPRITE_ANIM_97
+	anim_data_pointer AnimData98  ; SPRITE_ANIM_98
+	anim_data_pointer AnimData99  ; SPRITE_ANIM_99
+	anim_data_pointer AnimData100 ; SPRITE_ANIM_100
+	anim_data_pointer AnimData101 ; SPRITE_ANIM_101
+	anim_data_pointer AnimData102 ; SPRITE_ANIM_102
+	anim_data_pointer AnimData103 ; SPRITE_ANIM_103
+	anim_data_pointer AnimData104 ; SPRITE_ANIM_104
+	anim_data_pointer AnimData105 ; SPRITE_ANIM_105
+	anim_data_pointer AnimData106 ; SPRITE_ANIM_106
+	anim_data_pointer AnimData107 ; SPRITE_ANIM_107
+	anim_data_pointer AnimData108 ; SPRITE_ANIM_108
+	anim_data_pointer AnimData109 ; SPRITE_ANIM_109
+	anim_data_pointer AnimData110 ; SPRITE_ANIM_110
+	anim_data_pointer AnimData111 ; SPRITE_ANIM_111
+	anim_data_pointer AnimData112 ; SPRITE_ANIM_112
+	anim_data_pointer AnimData113 ; SPRITE_ANIM_113
+	anim_data_pointer AnimData114 ; SPRITE_ANIM_114
+	anim_data_pointer AnimData115 ; SPRITE_ANIM_115
+	anim_data_pointer AnimData116 ; SPRITE_ANIM_116
+	anim_data_pointer AnimData117 ; SPRITE_ANIM_117
+	anim_data_pointer AnimData118 ; SPRITE_ANIM_118
+	anim_data_pointer AnimData119 ; SPRITE_ANIM_119
+	anim_data_pointer AnimData120 ; SPRITE_ANIM_120
+	anim_data_pointer AnimData121 ; SPRITE_ANIM_121
+	anim_data_pointer AnimData122 ; SPRITE_ANIM_122
+	anim_data_pointer AnimData123 ; SPRITE_ANIM_123
+	anim_data_pointer AnimData124 ; SPRITE_ANIM_124
+	anim_data_pointer AnimData125 ; SPRITE_ANIM_125
+	anim_data_pointer AnimData126 ; SPRITE_ANIM_126
+	anim_data_pointer AnimData127 ; SPRITE_ANIM_127
+	anim_data_pointer AnimData128 ; SPRITE_ANIM_128
+	anim_data_pointer AnimData129 ; SPRITE_ANIM_129
+	anim_data_pointer AnimData130 ; SPRITE_ANIM_130
+	anim_data_pointer AnimData131 ; SPRITE_ANIM_131
+	anim_data_pointer AnimData132 ; SPRITE_ANIM_132
+	anim_data_pointer AnimData133 ; SPRITE_ANIM_133
+	anim_data_pointer AnimData134 ; SPRITE_ANIM_134
+	anim_data_pointer AnimData135 ; SPRITE_ANIM_135
+	anim_data_pointer AnimData136 ; SPRITE_ANIM_136
+	anim_data_pointer AnimData137 ; SPRITE_ANIM_137
+	anim_data_pointer AnimData138 ; SPRITE_ANIM_138
+	anim_data_pointer AnimData139 ; SPRITE_ANIM_139
+	anim_data_pointer AnimData140 ; SPRITE_ANIM_140
+	anim_data_pointer AnimData141 ; SPRITE_ANIM_141
+	anim_data_pointer AnimData142 ; SPRITE_ANIM_142
+	anim_data_pointer AnimData143 ; SPRITE_ANIM_143
+	anim_data_pointer AnimData144 ; SPRITE_ANIM_144
+	anim_data_pointer AnimData145 ; SPRITE_ANIM_145
+	anim_data_pointer AnimData146 ; SPRITE_ANIM_146
+	anim_data_pointer AnimData147 ; SPRITE_ANIM_147
+	anim_data_pointer AnimData148 ; SPRITE_ANIM_148
+	anim_data_pointer AnimData149 ; SPRITE_ANIM_149
+	anim_data_pointer AnimData150 ; SPRITE_ANIM_150
+	anim_data_pointer AnimData151 ; SPRITE_ANIM_151
+	anim_data_pointer AnimData152 ; SPRITE_ANIM_152
+	anim_data_pointer AnimData153 ; SPRITE_ANIM_153
+	anim_data_pointer AnimData154 ; SPRITE_ANIM_154
+	anim_data_pointer AnimData155 ; SPRITE_ANIM_155
+	anim_data_pointer AnimData156 ; SPRITE_ANIM_156
+	anim_data_pointer AnimData157 ; SPRITE_ANIM_157
+	anim_data_pointer AnimData158 ; SPRITE_ANIM_158
+	anim_data_pointer AnimData159 ; SPRITE_ANIM_159
+	anim_data_pointer AnimData160 ; SPRITE_ANIM_160
+	anim_data_pointer AnimData161 ; SPRITE_ANIM_161
+	anim_data_pointer AnimData162 ; SPRITE_ANIM_162
+	anim_data_pointer AnimData163 ; SPRITE_ANIM_163
+	anim_data_pointer AnimData164 ; SPRITE_ANIM_164
+	anim_data_pointer AnimData165 ; SPRITE_ANIM_165
+	anim_data_pointer AnimData166 ; SPRITE_ANIM_166
+	anim_data_pointer AnimData167 ; SPRITE_ANIM_167
+	anim_data_pointer AnimData168 ; SPRITE_ANIM_168
+	anim_data_pointer AnimData169 ; SPRITE_ANIM_169
+	anim_data_pointer AnimData170 ; SPRITE_ANIM_170
+	anim_data_pointer AnimData171 ; SPRITE_ANIM_171
+	anim_data_pointer AnimData172 ; SPRITE_ANIM_172
+	anim_data_pointer AnimData173 ; SPRITE_ANIM_173
+	anim_data_pointer AnimData174 ; SPRITE_ANIM_174
+	anim_data_pointer AnimData175 ; SPRITE_ANIM_175
+	anim_data_pointer AnimData176 ; SPRITE_ANIM_176
+	anim_data_pointer AnimData177 ; SPRITE_ANIM_177
+	anim_data_pointer AnimData178 ; SPRITE_ANIM_178
+	anim_data_pointer AnimData179 ; SPRITE_ANIM_179
+	anim_data_pointer AnimData180 ; SPRITE_ANIM_180
+	anim_data_pointer AnimData181 ; SPRITE_ANIM_181
+	anim_data_pointer AnimData182 ; SPRITE_ANIM_182
+	anim_data_pointer AnimData183 ; SPRITE_ANIM_183
+	anim_data_pointer AnimData184 ; SPRITE_ANIM_184
+	anim_data_pointer AnimData185 ; SPRITE_ANIM_185
+	anim_data_pointer AnimData186 ; SPRITE_ANIM_186
+	anim_data_pointer AnimData187 ; SPRITE_ANIM_187
+	anim_data_pointer AnimData188 ; SPRITE_ANIM_188
+	anim_data_pointer AnimData189 ; SPRITE_ANIM_189
+	anim_data_pointer AnimData190 ; SPRITE_ANIM_190
+	anim_data_pointer AnimData191 ; SPRITE_ANIM_191
+	anim_data_pointer AnimData192 ; SPRITE_ANIM_192
+	anim_data_pointer AnimData193 ; SPRITE_ANIM_193
+	anim_data_pointer AnimData194 ; SPRITE_ANIM_194
+	anim_data_pointer AnimData195 ; SPRITE_ANIM_195
+	anim_data_pointer AnimData196 ; SPRITE_ANIM_196
+	anim_data_pointer AnimData197 ; SPRITE_ANIM_197
+	anim_data_pointer AnimData198 ; SPRITE_ANIM_198
+	anim_data_pointer AnimData199 ; SPRITE_ANIM_199
+	anim_data_pointer AnimData200 ; SPRITE_ANIM_200
+	anim_data_pointer AnimData201 ; SPRITE_ANIM_201
+	anim_data_pointer AnimData202 ; SPRITE_ANIM_202
+	anim_data_pointer AnimData203 ; SPRITE_ANIM_203
+	anim_data_pointer AnimData204 ; SPRITE_ANIM_204
+	anim_data_pointer AnimData205 ; SPRITE_ANIM_205
+	anim_data_pointer AnimData206 ; SPRITE_ANIM_206
+	anim_data_pointer AnimData207 ; SPRITE_ANIM_207
+	anim_data_pointer AnimData208 ; SPRITE_ANIM_208
+	anim_data_pointer AnimData209 ; SPRITE_ANIM_209
+	anim_data_pointer AnimData210 ; SPRITE_ANIM_210
+	anim_data_pointer AnimData211 ; SPRITE_ANIM_211
+	anim_data_pointer AnimData212 ; SPRITE_ANIM_212
+	anim_data_pointer AnimData213 ; SPRITE_ANIM_213
+	anim_data_pointer AnimData214 ; SPRITE_ANIM_214
+	anim_data_pointer AnimData215 ; SPRITE_ANIM_215
+	anim_data_pointer AnimData216 ; SPRITE_ANIM_216
diff --git a/src/engine/gfx/sprites.asm b/src/engine/gfx/sprites.asm
new file mode 100644
index 0000000..c2aa277
--- /dev/null
+++ b/src/engine/gfx/sprites.asm
@@ -0,0 +1,122 @@
+; \1 = gfx pointer
+; \2 = number of tiles
+gfx_pointer: MACRO
+	dwb \1, BANK(\1) - BANK(Sprites)
+	db \2
+ENDM
+
+Sprites:
+	gfx_pointer OWPlayerGfx,        $14 ; SPRITE_OW_PLAYER
+	gfx_pointer OWRonaldGfx,        $14 ; SPRITE_OW_RONALD
+	gfx_pointer OWDrMasonGfx,       $14 ; SPRITE_OW_DRMASON
+	gfx_pointer OWIshiharaGfx,      $14 ; SPRITE_OW_ISHIHARA
+	gfx_pointer OWImakuniGfx,       $14 ; SPRITE_OW_IMAKUNI
+	gfx_pointer OWNikkiGfx,         $14 ; SPRITE_OW_NIKKI
+	gfx_pointer OWRickGfx,          $14 ; SPRITE_OW_RICK
+	gfx_pointer OWKenGfx,           $14 ; SPRITE_OW_KEN
+	gfx_pointer OWAmyGfx,           $1b ; SPRITE_OW_AMY
+	gfx_pointer OWIsaacGfx,         $14 ; SPRITE_OW_ISAAC
+	gfx_pointer OWMitchGfx,         $14 ; SPRITE_OW_MITCH
+	gfx_pointer OWGeneGfx,          $14 ; SPRITE_OW_GENE
+	gfx_pointer OWMurrayGfx,        $14 ; SPRITE_OW_MURRAY
+	gfx_pointer OWCourtneyGfx,      $14 ; SPRITE_OW_COURTNEY
+	gfx_pointer OWSteveGfx,         $14 ; SPRITE_OW_STEVE
+	gfx_pointer OWJackGfx,          $14 ; SPRITE_OW_JACK
+	gfx_pointer OWRodGfx,           $14 ; SPRITE_OW_ROD
+	gfx_pointer OWBoyGfx,           $14 ; SPRITE_OW_BOY
+	gfx_pointer OWLadGfx,           $14 ; SPRITE_OW_LAD
+	gfx_pointer OWSpecsGfx,         $14 ; SPRITE_OW_SPECS
+	gfx_pointer OWButchGfx,         $14 ; SPRITE_OW_BUTCH
+	gfx_pointer OWManiaGfx,         $14 ; SPRITE_OW_MANIA
+	gfx_pointer OWJoshuaGfx,        $14 ; SPRITE_OW_JOSHUA
+	gfx_pointer OWHoodGfx,          $14 ; SPRITE_OW_HOOD
+	gfx_pointer OWTechGfx,          $14 ; SPRITE_OW_TECH
+	gfx_pointer OWChapGfx,          $14 ; SPRITE_OW_CHAP
+	gfx_pointer OWManGfx,           $14 ; SPRITE_OW_MAN
+	gfx_pointer OWPappyGfx,         $14 ; SPRITE_OW_PAPPY
+	gfx_pointer OWGirlGfx,          $14 ; SPRITE_OW_GIRL
+	gfx_pointer OWLass1Gfx,         $14 ; SPRITE_OW_LASS1
+	gfx_pointer OWLass2Gfx,         $14 ; SPRITE_OW_LASS2
+	gfx_pointer OWLass3Gfx,         $14 ; SPRITE_OW_LASS3
+	gfx_pointer OWSwimmerGfx,       $14 ; SPRITE_OW_SWIMMER
+	gfx_pointer OWClerkGfx,         $08 ; SPRITE_OW_CLERK
+	gfx_pointer OWGalGfx,           $14 ; SPRITE_OW_GAL
+	gfx_pointer OWWomanGfx,         $14 ; SPRITE_OW_WOMAN
+	gfx_pointer OWGrannyGfx,        $14 ; SPRITE_OW_GRANNY
+	gfx_pointer OverworldMapOAMGfx, $08 ; SPRITE_OW_MAP_OAM
+	gfx_pointer Duel0Gfx,           $16 ; SPRITE_DUEL_0
+	gfx_pointer Duel63Gfx,          $0a ; SPRITE_DUEL_63
+	gfx_pointer DuelGlowGfx,        $0b ; SPRITE_DUEL_GLOW
+	gfx_pointer Duel1Gfx,           $06 ; SPRITE_DUEL_1
+	gfx_pointer Duel2Gfx,           $08 ; SPRITE_DUEL_2
+	gfx_pointer Duel55Gfx,          $02 ; SPRITE_DUEL_55
+	gfx_pointer Duel58Gfx,          $04 ; SPRITE_DUEL_58
+	gfx_pointer Duel3Gfx,           $09 ; SPRITE_DUEL_3
+	gfx_pointer Duel4Gfx,           $12 ; SPRITE_DUEL_4
+	gfx_pointer Duel5Gfx,           $09 ; SPRITE_DUEL_5
+	gfx_pointer Duel6Gfx,           $11 ; SPRITE_DUEL_6
+	gfx_pointer Duel59Gfx,          $03 ; SPRITE_DUEL_59
+	gfx_pointer Duel7Gfx,           $2d ; SPRITE_DUEL_7
+	gfx_pointer Duel8Gfx,           $0d ; SPRITE_DUEL_8
+	gfx_pointer Duel9Gfx,           $1c ; SPRITE_DUEL_9
+	gfx_pointer Duel10Gfx,          $4c ; SPRITE_DUEL_10
+	gfx_pointer Duel61Gfx,          $03 ; SPRITE_DUEL_61
+	gfx_pointer Duel11Gfx,          $1b ; SPRITE_DUEL_11
+	gfx_pointer Duel12Gfx,          $07 ; SPRITE_DUEL_12
+	gfx_pointer Duel13Gfx,          $0c ; SPRITE_DUEL_13
+	gfx_pointer Duel62Gfx,          $01 ; SPRITE_DUEL_62
+	gfx_pointer Duel14Gfx,          $22 ; SPRITE_DUEL_14
+	gfx_pointer Duel15Gfx,          $20 ; SPRITE_DUEL_15
+	gfx_pointer Duel16Gfx,          $0a ; SPRITE_DUEL_16
+	gfx_pointer Duel17Gfx,          $25 ; SPRITE_DUEL_17
+	gfx_pointer Duel18Gfx,          $18 ; SPRITE_DUEL_18
+	gfx_pointer Duel19Gfx,          $1b ; SPRITE_DUEL_19
+	gfx_pointer Duel20Gfx,          $08 ; SPRITE_DUEL_20
+	gfx_pointer Duel21Gfx,          $0d ; SPRITE_DUEL_21
+	gfx_pointer Duel22Gfx,          $22 ; SPRITE_DUEL_22
+	gfx_pointer Duel23Gfx,          $0c ; SPRITE_DUEL_23
+	gfx_pointer Duel24Gfx,          $25 ; SPRITE_DUEL_24
+	gfx_pointer Duel25Gfx,          $22 ; SPRITE_DUEL_25
+	gfx_pointer Duel26Gfx,          $0c ; SPRITE_DUEL_26
+	gfx_pointer Duel27Gfx,          $4c ; SPRITE_DUEL_27
+	gfx_pointer Duel28Gfx,          $08 ; SPRITE_DUEL_28
+	gfx_pointer Duel29Gfx,          $07 ; SPRITE_DUEL_29
+	gfx_pointer Duel56Gfx,          $01 ; SPRITE_DUEL_56
+	gfx_pointer Duel30Gfx,          $1a ; SPRITE_DUEL_30
+	gfx_pointer Duel31Gfx,          $0a ; SPRITE_DUEL_31
+	gfx_pointer Duel32Gfx,          $2e ; SPRITE_DUEL_32
+	gfx_pointer Duel33Gfx,          $08 ; SPRITE_DUEL_33
+	gfx_pointer Duel34Gfx,          $07 ; SPRITE_DUEL_34
+	gfx_pointer Duel35Gfx,          $1c ; SPRITE_DUEL_35
+	gfx_pointer Duel66Gfx,          $04 ; SPRITE_DUEL_66
+	gfx_pointer Duel36Gfx,          $08 ; SPRITE_DUEL_36
+	gfx_pointer Duel37Gfx,          $0b ; SPRITE_DUEL_37
+	gfx_pointer Duel57Gfx,          $01 ; SPRITE_DUEL_57
+	gfx_pointer Duel38Gfx,          $1c ; SPRITE_DUEL_38
+	gfx_pointer Duel39Gfx,          $16 ; SPRITE_DUEL_39
+	gfx_pointer Duel40Gfx,          $10 ; SPRITE_DUEL_40
+	gfx_pointer Duel41Gfx,          $0f ; SPRITE_DUEL_41
+	gfx_pointer Duel42Gfx,          $07 ; SPRITE_DUEL_42
+	gfx_pointer Duel43Gfx,          $0a ; SPRITE_DUEL_43
+	gfx_pointer Duel44Gfx,          $09 ; SPRITE_DUEL_44
+	gfx_pointer Duel60Gfx,          $02 ; SPRITE_DUEL_60
+	gfx_pointer Duel64Gfx,          $02 ; SPRITE_DUEL_64
+	gfx_pointer Duel45Gfx,          $03 ; SPRITE_DUEL_45
+	gfx_pointer Duel46Gfx,          $08 ; SPRITE_DUEL_46
+	gfx_pointer Duel47Gfx,          $0f ; SPRITE_DUEL_47
+	gfx_pointer Duel48Gfx,          $03 ; SPRITE_DUEL_48
+	gfx_pointer Duel49Gfx,          $05 ; SPRITE_DUEL_49
+	gfx_pointer Duel50Gfx,          $17 ; SPRITE_DUEL_50
+	gfx_pointer Duel51Gfx,          $36 ; SPRITE_DUEL_WON_LOST_DRAW
+	gfx_pointer Duel52Gfx,          $0b ; SPRITE_DUEL_52
+	gfx_pointer Duel53Gfx,          $06 ; SPRITE_DUEL_53
+	gfx_pointer Duel54Gfx,          $16 ; SPRITE_DUEL_54
+	gfx_pointer BoosterPackOAMGfx,  $20 ; SPRITE_BOOSTER_PACK_OAM
+	gfx_pointer PressStartGfx,      $14 ; SPRITE_PRESS_START
+	gfx_pointer GrassGfx,           $04 ; SPRITE_GRASS
+	gfx_pointer FireGfx,            $04 ; SPRITE_FIRE
+	gfx_pointer WaterGfx,           $04 ; SPRITE_WATER
+	gfx_pointer ColorlessGfx,       $04 ; SPRITE_COLORLESS
+	gfx_pointer LightningGfx,       $04 ; SPRITE_LIGHTNING
+	gfx_pointer PsychicGfx,         $04 ; SPRITE_PSYCHIC
+	gfx_pointer FightingGfx,        $04 ; SPRITE_FIGHTING
diff --git a/src/engine/gfx/tilemaps.asm b/src/engine/gfx/tilemaps.asm
new file mode 100644
index 0000000..216cca1
--- /dev/null
+++ b/src/engine/gfx/tilemaps.asm
@@ -0,0 +1,114 @@
+; \1 = pointer
+; \2 = tileset
+tilemap: MACRO
+	dwb \1, BANK(\1) - BANK(Tilemaps)
+	db \2
+ENDM
+
+Tilemaps:
+	tilemap OverworldMapTilemap,               TILESET_OVERWORLD_MAP               ; TILEMAP_OVERWORLD_MAP
+	tilemap OverworldMapCGBTilemap,            TILESET_OVERWORLD_MAP               ; TILEMAP_OVERWORLD_MAP_CGB
+	tilemap MasonLaboratoryTilemap,            TILESET_MASON_LABORATORY            ; TILEMAP_MASON_LABORATORY
+	tilemap MasonLaboratoryCGBTilemap,         TILESET_MASON_LABORATORY            ; TILEMAP_MASON_LABORATORY_CGB
+	tilemap ChallengeMachineMapEventTilemap,   TILESET_MASON_LABORATORY            ; TILEMAP_CHALLENGE_MACHINE_MAP_EVENT
+	tilemap ChallengeMachineMapEventCGBTilemap,TILESET_MASON_LABORATORY            ; TILEMAP_CHALLENGE_MACHINE_MAP_EVENT_CGB
+	tilemap DeckMachineRoomTilemap,            TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_ROOM
+	tilemap DeckMachineRoomCGBTilemap,         TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_ROOM_CGB
+	tilemap DeckMachineMapEventTilemap,        TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_MAP_EVENT
+	tilemap DeckMachineMapEventCGBTilemap,     TILESET_MASON_LABORATORY            ; TILEMAP_DECK_MACHINE_MAP_EVENT_CGB
+	tilemap IshiharaTilemap,                   TILESET_ISHIHARA                    ; TILEMAP_ISHIHARA
+	tilemap IshiharaCGBTilemap,                TILESET_ISHIHARA                    ; TILEMAP_ISHIHARA_CGB
+	tilemap FightingClubEntranceTilemap,       TILESET_CLUB_ENTRANCE               ; TILEMAP_FIGHTING_CLUB_ENTRANCE
+	tilemap FightingClubEntranceCGBTilemap,    TILESET_CLUB_ENTRANCE               ; TILEMAP_FIGHTING_CLUB_ENTRANCE_CGB
+	tilemap RockClubEntranceTilemap,           TILESET_CLUB_ENTRANCE               ; TILEMAP_ROCK_CLUB_ENTRANCE
+	tilemap RockClubEntranceCGBTilemap,        TILESET_CLUB_ENTRANCE               ; TILEMAP_ROCK_CLUB_ENTRANCE_CGB
+	tilemap WaterClubEntranceTilemap,          TILESET_CLUB_ENTRANCE               ; TILEMAP_WATER_CLUB_ENTRANCE
+	tilemap WaterClubEntranceCGBTilemap,       TILESET_CLUB_ENTRANCE               ; TILEMAP_WATER_CLUB_ENTRANCE_CGB
+	tilemap LightningClubEntranceTilemap,      TILESET_CLUB_ENTRANCE               ; TILEMAP_LIGHTNING_CLUB_ENTRANCE
+	tilemap LightningClubEntranceCGBTilemap,   TILESET_CLUB_ENTRANCE               ; TILEMAP_LIGHTNING_CLUB_ENTRANCE_CGB
+	tilemap GrassClubEntranceTilemap,          TILESET_CLUB_ENTRANCE               ; TILEMAP_GRASS_CLUB_ENTRANCE
+	tilemap GrassClubEntranceCGBTilemap,       TILESET_CLUB_ENTRANCE               ; TILEMAP_GRASS_CLUB_ENTRANCE_CGB
+	tilemap PsychicClubEntranceTilemap,        TILESET_CLUB_ENTRANCE               ; TILEMAP_PSYCHIC_CLUB_ENTRANCE
+	tilemap PsychicClubEntranceCGBTilemap,     TILESET_CLUB_ENTRANCE               ; TILEMAP_PSYCHIC_CLUB_ENTRANCE_CGB
+	tilemap ScienceClubEntranceTilemap,        TILESET_CLUB_ENTRANCE               ; TILEMAP_SCIENCE_CLUB_ENTRANCE
+	tilemap ScienceClubEntranceCGBTilemap,     TILESET_CLUB_ENTRANCE               ; TILEMAP_SCIENCE_CLUB_ENTRANCE_CGB
+	tilemap FireClubEntranceTilemap,           TILESET_CLUB_ENTRANCE               ; TILEMAP_FIRE_CLUB_ENTRANCE
+	tilemap FireClubEntranceCGBTilemap,        TILESET_CLUB_ENTRANCE               ; TILEMAP_FIRE_CLUB_ENTRANCE_CGB
+	tilemap ChallengeHallEntranceTilemap,      TILESET_CLUB_ENTRANCE               ; TILEMAP_CHALLENGE_HALL_ENTRANCE
+	tilemap ChallengeHallEntranceCGBTilemap,   TILESET_CLUB_ENTRANCE               ; TILEMAP_CHALLENGE_HALL_ENTRANCE_CGB
+	tilemap ClubLobbyTilemap,                  TILESET_CLUB_LOBBY                  ; TILEMAP_CLUB_LOBBY
+	tilemap ClubLobbyCGBTilemap,               TILESET_CLUB_LOBBY                  ; TILEMAP_CLUB_LOBBY_CGB
+	tilemap FightingClubTilemap,               TILESET_FIGHTING_CLUB               ; TILEMAP_FIGHTING_CLUB
+	tilemap FightingClubCGBTilemap,            TILESET_FIGHTING_CLUB               ; TILEMAP_FIGHTING_CLUB_CGB
+	tilemap RockClubTilemap,                   TILESET_ROCK_CLUB                   ; TILEMAP_ROCK_CLUB
+	tilemap RockClubCGBTilemap,                TILESET_ROCK_CLUB                   ; TILEMAP_ROCK_CLUB_CGB
+	tilemap WaterClubTilemap,                  TILESET_WATER_CLUB                  ; TILEMAP_WATER_CLUB
+	tilemap WaterClubCGBTilemap,               TILESET_WATER_CLUB                  ; TILEMAP_WATER_CLUB_CGB
+	tilemap LightningClubTilemap,              TILESET_LIGHTNING_CLUB              ; TILEMAP_LIGHTNING_CLUB
+	tilemap LightningClubCGBTilemap,           TILESET_LIGHTNING_CLUB              ; TILEMAP_LIGHTNING_CLUB_CGB
+	tilemap GrassClubTilemap,                  TILESET_GRASS_CLUB                  ; TILEMAP_GRASS_CLUB
+	tilemap GrassClubCGBTilemap,               TILESET_GRASS_CLUB                  ; TILEMAP_GRASS_CLUB_CGB
+	tilemap PsychicClubTilemap,                TILESET_PSYCHIC_CLUB                ; TILEMAP_PSYCHIC_CLUB
+	tilemap PsychicClubCGBTilemap,             TILESET_PSYCHIC_CLUB                ; TILEMAP_PSYCHIC_CLUB_CGB
+	tilemap ScienceClubTilemap,                TILESET_SCIENCE_CLUB                ; TILEMAP_SCIENCE_CLUB
+	tilemap ScienceClubCGBTilemap,             TILESET_SCIENCE_CLUB                ; TILEMAP_SCIENCE_CLUB_CGB
+	tilemap FireClubTilemap,                   TILESET_FIRE_CLUB                   ; TILEMAP_FIRE_CLUB
+	tilemap FireClubCGBTilemap,                TILESET_FIRE_CLUB                   ; TILEMAP_FIRE_CLUB_CGB
+	tilemap ChallengeHallTilemap,              TILESET_CHALLENGE_HALL              ; TILEMAP_CHALLENGE_HALL
+	tilemap ChallengeHallCGBTilemap,           TILESET_CHALLENGE_HALL              ; TILEMAP_CHALLENGE_HALL_CGB
+	tilemap PokemonDomeEntranceTilemap,        TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_ENTRANCE
+	tilemap PokemonDomeEntranceCGBTilemap,     TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_ENTRANCE_CGB
+	tilemap PokemonDomeDoorMapEventTilemap,    TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_DOOR_MAP_EVENT
+	tilemap PokemonDomeDoorMapEventCGBTilemap, TILESET_POKEMON_DOME_ENTRANCE       ; TILEMAP_POKEMON_DOME_DOOR_MAP_EVENT_CGB
+	tilemap PokemonDomeTilemap,                TILESET_POKEMON_DOME                ; TILEMAP_POKEMON_DOME
+	tilemap PokemonDomeCGBTilemap,             TILESET_POKEMON_DOME                ; TILEMAP_POKEMON_DOME_CGB
+	tilemap HallOfHonorDoorMapEventTilemap,    TILESET_POKEMON_DOME                ; TILEMAP_HALL_OF_HONOR_DOOR_MAP_EVENT
+	tilemap HallOfHonorDoorMapEventCGBTilemap, TILESET_POKEMON_DOME                ; TILEMAP_HALL_OF_HONOR_DOOR_MAP_EVENT_CGB
+	tilemap HallOfHonorTilemap,                TILESET_HALL_OF_HONOR               ; TILEMAP_HALL_OF_HONOR
+	tilemap HallOfHonorCGBTilemap,             TILESET_HALL_OF_HONOR               ; TILEMAP_HALL_OF_HONOR_CGB
+	tilemap CardPopCGBTilemap,                 TILESET_CARD_POP                    ; TILEMAP_CARD_POP_CGB
+	tilemap CardPopTilemap,                    TILESET_CARD_POP                    ; TILEMAP_CARD_POP
+	tilemap GrassMedalTilemap,                 TILESET_MEDAL                       ; TILEMAP_GRASS_MEDAL
+	tilemap ScienceMedalTilemap,               TILESET_MEDAL                       ; TILEMAP_SCIENCE_MEDAL
+	tilemap FireMedalTilemap,                  TILESET_MEDAL                       ; TILEMAP_FIRE_MEDAL
+	tilemap WaterMedalTilemap,                 TILESET_MEDAL                       ; TILEMAP_WATER_MEDAL
+	tilemap LightningMedalTilemap,             TILESET_MEDAL                       ; TILEMAP_LIGHTNING_MEDAL
+	tilemap FightingMedalTilemap,              TILESET_MEDAL                       ; TILEMAP_FIGHTING_MEDAL
+	tilemap RockMedalTilemap,                  TILESET_MEDAL                       ; TILEMAP_ROCK_MEDAL
+	tilemap PsychicMedalTilemap,               TILESET_MEDAL                       ; TILEMAP_PSYCHIC_MEDAL
+	tilemap GameBoyLinkCGBTilemap,             TILESET_GAMEBOY_LINK                ; TILEMAP_GAMEBOY_LINK_CGB
+	tilemap GameBoyLinkTilemap,                TILESET_GAMEBOY_LINK                ; TILEMAP_GAMEBOY_LINK
+	tilemap GameBoyLinkConnectingCGBTilemap,   TILESET_GAMEBOY_LINK                ; TILEMAP_GAMEBOY_LINK_CONNECTING_CGB
+	tilemap GameBoyLinkConnectingTilemap,      TILESET_GAMEBOY_LINK                ; TILEMAP_GAMEBOY_LINK_CONNECTING
+	tilemap GameBoyPrinterCGBTilemap,          TILESET_GAMEBOY_PRINTER             ; TILEMAP_GAMEBOY_PRINTER_CGB
+	tilemap GameBoyPrinterTilemap,             TILESET_GAMEBOY_PRINTER             ; TILEMAP_GAMEBOY_PRINTER
+	tilemap ColosseumTilemap,                  TILESET_COLOSSEUM_1                 ; TILEMAP_COLOSSEUM
+	tilemap ColosseumCGBTilemap,               TILESET_COLOSSEUM_2                 ; TILEMAP_COLOSSEUM_CGB
+	tilemap EvolutionTilemap,                  TILESET_EVOLUTION_1                 ; TILEMAP_EVOLUTION
+	tilemap EvolutionCGBTilemap,               TILESET_EVOLUTION_2                 ; TILEMAP_EVOLUTION_CGB
+	tilemap MysteryTilemap,                    TILESET_MYSTERY_1                   ; TILEMAP_MYSTERY
+	tilemap MysteryCGBTilemap,                 TILESET_MYSTERY_2                   ; TILEMAP_MYSTERY_CGB
+	tilemap LaboratoryTilemap,                 TILESET_LABORATORY_1                ; TILEMAP_LABORATORY
+	tilemap LaboratoryCGBTilemap,              TILESET_LABORATORY_2                ; TILEMAP_LABORATORY_CGB
+	tilemap CharizardIntroTilemap,             TILESET_CHARIZARD_INTRO_1           ; TILEMAP_CHARIZARD_INTRO
+	tilemap CharizardIntroCGBTilemap,          TILESET_CHARIZARD_INTRO_2           ; TILEMAP_CHARIZARD_INTRO_CGB
+	tilemap ScytherIntroTilemap,               TILESET_SCYTHER_INTRO_1             ; TILEMAP_SCYTHER_INTRO
+	tilemap ScytherIntroCGBTilemap,            TILESET_SCYTHER_INTRO_2             ; TILEMAP_SCYTHER_INTRO_CGB
+	tilemap AerodactylIntroTilemap,            TILESET_AERODACTYL_INTRO_1          ; TILEMAP_AERODACTYL_INTRO
+	tilemap AerodactylIntroCGBTilemap,         TILESET_AERODACTYL_INTRO_2          ; TILEMAP_AERODACTYL_INTRO_CGB
+	tilemap JapaneseTitleScreenTilemap,        TILESET_JAPANESE_TITLE_SCREEN       ; TILEMAP_JAPANESE_TITLE_SCREEN
+	tilemap JapaneseTitleScreenCGBTilemap,     TILESET_JAPANESE_TITLE_SCREEN_CGB   ; TILEMAP_JAPANESE_TITLE_SCREEN_CGB
+	tilemap SolidTiles1Tilemap,                TILESET_SOLID_TILES_1               ; TILEMAP_SOLID_TILES_1
+	tilemap SolidTiles2Tilemap,                TILESET_SOLID_TILES_1               ; TILEMAP_SOLID_TILES_2
+	tilemap SolidTiles3Tilemap,                TILESET_SOLID_TILES_1               ; TILEMAP_SOLID_TILES_3
+	tilemap JapaneseTitleScreen2Tilemap,       TILESET_JAPANESE_TITLE_SCREEN_2     ; TILEMAP_JAPANESE_TITLE_SCREEN_2
+	tilemap JapaneseTitleScreen2CGBTilemap,    TILESET_JAPANESE_TITLE_SCREEN_2_CGB ; TILEMAP_JAPANESE_TITLE_SCREEN_2_CGB
+	tilemap SolidTiles4Tilemap,                TILESET_SOLID_TILES_2               ; TILEMAP_SOLID_TILES_4
+	tilemap PlayerTilemap,                     TILESET_PLAYER                      ; TILEMAP_PLAYER
+	tilemap OpponentTilemap,                   TILESET_RONALD                      ; TILEMAP_OPPONENT
+	tilemap TitleScreenTilemap,                TILESET_TITLE_SCREEN                ; TILEMAP_TITLE_SCREEN
+	tilemap TitleScreenCGBTilemap,             TILESET_TITLE_SCREEN_CGB            ; TILEMAP_TITLE_SCREEN_CGB
+	tilemap CopyrightTilemap,                  TILESET_COPYRIGHT                   ; TILEMAP_COPYRIGHT
+	tilemap CopyrightCGBTilemap,               TILESET_COPYRIGHT                   ; TILEMAP_COPYRIGHT_CGB
+	tilemap NintendoTilemap,                   TILESET_NINTENDO                    ; TILEMAP_NINTENDO
+	tilemap CompaniesTilemap,                  TILESET_COMPANIES                   ; TILEMAP_COMPANIES
diff --git a/src/engine/gfx/tilesets.asm b/src/engine/gfx/tilesets.asm
new file mode 100644
index 0000000..0b4f0af
--- /dev/null
+++ b/src/engine/gfx/tilesets.asm
@@ -0,0 +1,95 @@
+; \1 = pointer
+; \2 = number of tiles
+tileset: MACRO
+	dwb \1, BANK(\1) - BANK(Tilesets)
+	db \2
+ENDM
+
+Tilesets:
+	tileset OverworldMapTiles,             193 ; TILESET_OVERWORLD_MAP
+	tileset MasonLaboratoryTilesetGfx,     151 ; TILESET_MASON_LABORATORY
+	tileset IshiharaTilesetGfx,             77 ; TILESET_ISHIHARA
+	tileset ClubEntranceTilesetGfx,        129 ; TILESET_CLUB_ENTRANCE
+	tileset ClubLobbyTilesetGfx,           120 ; TILESET_CLUB_LOBBY
+	tileset FightingClubTilesetGfx,         99 ; TILESET_FIGHTING_CLUB
+	tileset RockClubTilesetGfx,             60 ; TILESET_ROCK_CLUB
+	tileset WaterClubTilesetGfx,           161 ; TILESET_WATER_CLUB
+	tileset LightningClubTilesetGfx,       131 ; TILESET_LIGHTNING_CLUB
+	tileset GrassClubTilesetGfx,            87 ; TILESET_GRASS_CLUB
+	tileset PsychicClubTilesetGfx,          58 ; TILESET_PSYCHIC_CLUB
+	tileset ScienceClubTilesetGfx,          82 ; TILESET_SCIENCE_CLUB
+	tileset FireClubTilesetGfx,             87 ; TILESET_FIRE_CLUB
+	tileset ChallengeHallTilesetGfx,       157 ; TILESET_CHALLENGE_HALL
+	tileset PokemonDomeEntranceTilesetGfx,  78 ; TILESET_POKEMON_DOME_ENTRANCE
+	tileset PokemonDomeTilesetGfx,         207 ; TILESET_POKEMON_DOME
+	tileset HallOfHonorTilesetGfx,         121 ; TILESET_HALL_OF_HONOR
+	tileset CardPopGfx,                    189 ; TILESET_CARD_POP
+	tileset MedalGfx,                       72 ; TILESET_MEDAL
+	tileset GameBoyLinkGfx,                109 ; TILESET_GAMEBOY_LINK
+	tileset GameBoyPrinterGfx,              93 ; TILESET_GAMEBOY_PRINTER
+	tileset Colosseum1Gfx,                  96 ; TILESET_COLOSSEUM_1
+	tileset Colosseum2Gfx,                  86 ; TILESET_COLOSSEUM_2
+	tileset Evolution1Gfx,                  96 ; TILESET_EVOLUTION_1
+	tileset Evolution2Gfx,                  86 ; TILESET_EVOLUTION_2
+	tileset Mystery1Gfx,                    96 ; TILESET_MYSTERY_1
+	tileset Mystery2Gfx,                    86 ; TILESET_MYSTERY_2
+	tileset Laboratory1Gfx,                 96 ; TILESET_LABORATORY_1
+	tileset Laboratory2Gfx,                 86 ; TILESET_LABORATORY_2
+	tileset CharizardIntro1Gfx,             96 ; TILESET_CHARIZARD_INTRO_1
+	tileset CharizardIntro2Gfx,             96 ; TILESET_CHARIZARD_INTRO_2
+	tileset ScytherIntro1Gfx,               96 ; TILESET_SCYTHER_INTRO_1
+	tileset ScytherIntro2Gfx,               96 ; TILESET_SCYTHER_INTRO_2
+	tileset AerodactylIntro1Gfx,            96 ; TILESET_AERODACTYL_INTRO_1
+	tileset AerodactylIntro2Gfx,            96 ; TILESET_AERODACTYL_INTRO_2
+	tileset JapaneseTitleScreenGfx,         97 ; TILESET_JAPANESE_TITLE_SCREEN
+	tileset JapaneseTitleScreenCGBGfx,      97 ; TILESET_JAPANESE_TITLE_SCREEN_CGB
+	tileset SolidTiles1,                     4 ; TILESET_SOLID_TILES_1
+	tileset JapaneseTitleScreen2Gfx,       244 ; TILESET_JAPANESE_TITLE_SCREEN_2
+	tileset JapaneseTitleScreen2CGBGfx,     59 ; TILESET_JAPANESE_TITLE_SCREEN_2_CGB
+	tileset SolidTiles2,                     4 ; TILESET_SOLID_TILES_2
+	tileset PlayerGfx,                      36 ; TILESET_PLAYER
+	tileset RonaldGfx,                      36 ; TILESET_RONALD
+	tileset TitleScreenGfx,                220 ; TILESET_TITLE_SCREEN
+	tileset TitleScreenCGBGfx,             212 ; TILESET_TITLE_SCREEN_CGB
+	tileset CopyrightGfx,                   36 ; TILESET_COPYRIGHT
+	tileset NintendoGfx,                    24 ; TILESET_NINTENDO
+	tileset CompaniesGfx,                   49 ; TILESET_COMPANIES
+	tileset SamGfx,                         36 ; TILESET_SAM
+	tileset ImakuniGfx,                     36 ; TILESET_IMAKUNI
+	tileset NikkiGfx,                       36 ; TILESET_NIKKI
+	tileset RickGfx,                        36 ; TILESET_RICK
+	tileset KenGfx,                         36 ; TILESET_KEN
+	tileset AmyGfx,                         36 ; TILESET_AMY
+	tileset IsaacGfx,                       36 ; TILESET_ISAAC
+	tileset MitchGfx,                       36 ; TILESET_MITCH
+	tileset GeneGfx,                        36 ; TILESET_GENE
+	tileset MurrayGfx,                      36 ; TILESET_MURRAY
+	tileset CourtneyGfx,                    36 ; TILESET_COURTNEY
+	tileset SteveGfx,                       36 ; TILESET_STEVE
+	tileset JackGfx,                        36 ; TILESET_JACK
+	tileset RodGfx,                         36 ; TILESET_ROD
+	tileset JosephGfx,                      36 ; TILESET_JOSEPH
+	tileset DavidGfx,                       36 ; TILESET_DAVID
+	tileset ErikGfx,                        36 ; TILESET_ERIK
+	tileset JohnGfx,                        36 ; TILESET_JOHN
+	tileset AdamGfx,                        36 ; TILESET_ADAM
+	tileset JonathanGfx,                    36 ; TILESET_JONATHAN
+	tileset JoshuaGfx,                      36 ; TILESET_JOSHUA
+	tileset NicholasGfx,                    36 ; TILESET_NICHOLAS
+	tileset BrandonGfx,                     36 ; TILESET_BRANDON
+	tileset MatthewGfx,                     36 ; TILESET_MATTHEW
+	tileset RyanGfx,                        36 ; TILESET_RYAN
+	tileset AndrewGfx,                      36 ; TILESET_ANDREW
+	tileset ChrisGfx,                       36 ; TILESET_CHRIS
+	tileset MichaelGfx,                     36 ; TILESET_MICHAEL
+	tileset DanielGfx,                      36 ; TILESET_DANIEL
+	tileset RobertGfx,                      36 ; TILESET_ROBERT
+	tileset BrittanyGfx,                    36 ; TILESET_BRITTANY
+	tileset KristinGfx,                     36 ; TILESET_KRISTIN
+	tileset HeatherGfx,                     36 ; TILESET_HEATHER
+	tileset SaraGfx,                        36 ; TILESET_SARA
+	tileset AmandaGfx,                      36 ; TILESET_AMANDA
+	tileset JenniferGfx,                    36 ; TILESET_JENNIFER
+	tileset JessicaGfx,                     36 ; TILESET_JESSICA
+	tileset StephanieGfx,                   36 ; TILESET_STEPHANIE
+	tileset AaronGfx,                       36 ; TILESET_AARON
diff --git a/src/gfx.asm b/src/gfx.asm
index 6df6203..1b96723 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -5,7 +5,7 @@ SECTION "Gfx 1", ROMX
 
 Fonts::
 
-FullWidthFonts:: ; 74000 (1d:4000)
+FullWidthFonts::
 INCBIN "gfx/fonts/full_width/0_0_katakana.1bpp"
 INCBIN "gfx/fonts/full_width/0_1_hiragana.1bpp"
 INCBIN "gfx/fonts/full_width/0_2_digits_kanji1.1bpp"
@@ -14,36 +14,36 @@ INCBIN "gfx/fonts/full_width/2_kanji3.1bpp"
 INCBIN "gfx/fonts/full_width/3.1bpp"
 INCBIN "gfx/fonts/full_width/4.1bpp"
 
-HalfWidthFont:: ; 76668 (1d:6668)
+HalfWidthFont::
 INCBIN "gfx/fonts/half_width.1bpp"
 
-SymbolsFont:: ; 76968 (1d:6968)
+SymbolsFont::
 INCBIN "gfx/fonts/symbols.2bpp"
 
 DuelGraphics::
 
-DuelCardHeaderGraphics:: ; 76ce8 (1d:6ce8)
+DuelCardHeaderGraphics::
 INCBIN "gfx/duel/card_headers.2bpp"
 
-DuelDmgSgbSymbolGraphics:: ; 76fe8 (1d:6fe8)
+DuelDmgSgbSymbolGraphics::
 INCBIN "gfx/duel/dmg_sgb_symbols.2bpp"
 
-DuelCgbSymbolGraphics:: ; 777f8 (1d:77f8)
+DuelCgbSymbolGraphics::
 INCBIN "gfx/duel/cgb_symbols.2bpp", $0, $808
 
 SECTION "Gfx 2", ROMX
 
 INCBIN "gfx/duel/cgb_symbols.2bpp", $808, $8
 
-DuelOtherGraphics:: ; 78008 (1e:4008)
+DuelOtherGraphics::
 INCBIN "gfx/duel/other.2bpp"
 
-DuelBoxMessages:: ; 78318 (1e:4318)
+DuelBoxMessages::
 INCBIN "gfx/duel/box_messages.2bpp"
 
 SECTION "Gfx 3", ROMX
 
-WaterClubTilemap:: ; 84000 (21:4000)
+WaterClubTilemap::
 	db $1c ; width
 	db $20 ; height
 	dw WaterClubPermissions
@@ -52,7 +52,7 @@ WaterClubTilemap:: ; 84000 (21:4000)
 WaterClubPermissions:
 	INCBIN "data/maps/permissions/water_club.bin"
 
-WaterClubCGBTilemap:: ; 84188 (21:4188)
+WaterClubCGBTilemap::
 	db $1c ; width
 	db $20 ; height
 	dw WaterClubCGBPermissions
@@ -61,7 +61,7 @@ WaterClubCGBTilemap:: ; 84188 (21:4188)
 WaterClubCGBPermissions:
 	INCBIN "data/maps/permissions/water_club_cgb.bin"
 
-LightningClubTilemap:: ; 843bb (21:43bb)
+LightningClubTilemap::
 	db $1c ; width
 	db $20 ; height
 	dw LightningClubPermissions
@@ -70,7 +70,7 @@ LightningClubTilemap:: ; 843bb (21:43bb)
 LightningClubPermissions:
 	INCBIN "data/maps/permissions/lightning_club.bin"
 
-LightningClubCGBTilemap:: ; 84533 (21:4533)
+LightningClubCGBTilemap::
 	db $1c ; width
 	db $20 ; height
 	dw LightningClubCGBPermissions
@@ -79,7 +79,7 @@ LightningClubCGBTilemap:: ; 84533 (21:4533)
 LightningClubCGBPermissions:
 	INCBIN "data/maps/permissions/lightning_club_cgb.bin"
 
-GrassClubTilemap:: ; 8472e (21:472e)
+GrassClubTilemap::
 	db $1c ; width
 	db $20 ; height
 	dw GrassClubPermissions
@@ -88,7 +88,7 @@ GrassClubTilemap:: ; 8472e (21:472e)
 GrassClubPermissions:
 	INCBIN "data/maps/permissions/grass_club.bin"
 
-GrassClubCGBTilemap:: ; 848d8 (21:48d8)
+GrassClubCGBTilemap::
 	db $1c ; width
 	db $20 ; height
 	dw GrassClubCGBPermissions
@@ -97,7 +97,7 @@ GrassClubCGBTilemap:: ; 848d8 (21:48d8)
 GrassClubCGBPermissions:
 	INCBIN "data/maps/permissions/grass_club_cgb.bin"
 
-PsychicClubTilemap:: ; 84b73 (21:4b73)
+PsychicClubTilemap::
 	db $1c ; width
 	db $1c ; height
 	dw PsychicClubPermissions
@@ -106,7 +106,7 @@ PsychicClubTilemap:: ; 84b73 (21:4b73)
 PsychicClubPermissions:
 	INCBIN "data/maps/permissions/psychic_club.bin"
 
-PsychicClubCGBTilemap:: ; 84c6f (21:4c6f)
+PsychicClubCGBTilemap::
 	db $1c ; width
 	db $1c ; height
 	dw PsychicClubCGBPermissions
@@ -115,7 +115,7 @@ PsychicClubCGBTilemap:: ; 84c6f (21:4c6f)
 PsychicClubCGBPermissions:
 	INCBIN "data/maps/permissions/psychic_club_cgb.bin"
 
-ScienceClubTilemap:: ; 84dfe (21:4dfe)
+ScienceClubTilemap::
 	db $1c ; width
 	db $20 ; height
 	dw ScienceClubPermissions
@@ -124,7 +124,7 @@ ScienceClubTilemap:: ; 84dfe (21:4dfe)
 ScienceClubPermissions:
 	INCBIN "data/maps/permissions/science_club.bin"
 
-ScienceClubCGBTilemap:: ; 84f1d (21:4f1d)
+ScienceClubCGBTilemap::
 	db $1c ; width
 	db $20 ; height
 	dw ScienceClubCGBPermissions
@@ -133,7 +133,7 @@ ScienceClubCGBTilemap:: ; 84f1d (21:4f1d)
 ScienceClubCGBPermissions:
 	INCBIN "data/maps/permissions/science_club_cgb.bin"
 
-FireClubTilemap:: ; 850b6 (21:50b6)
+FireClubTilemap::
 	db $1c ; width
 	db $20 ; height
 	dw FireClubPermissions
@@ -142,7 +142,7 @@ FireClubTilemap:: ; 850b6 (21:50b6)
 FireClubPermissions:
 	INCBIN "data/maps/permissions/fire_club.bin"
 
-FireClubCGBTilemap:: ; 85191 (21:5191)
+FireClubCGBTilemap::
 	db $1c ; width
 	db $20 ; height
 	dw FireClubCGBPermissions
@@ -151,7 +151,7 @@ FireClubCGBTilemap:: ; 85191 (21:5191)
 FireClubCGBPermissions:
 	INCBIN "data/maps/permissions/fire_club_cgb.bin"
 
-ChallengeHallTilemap:: ; 85315 (21:5315)
+ChallengeHallTilemap::
 	db $20 ; width
 	db $20 ; height
 	dw ChallengeHallPermissions
@@ -160,7 +160,7 @@ ChallengeHallTilemap:: ; 85315 (21:5315)
 ChallengeHallPermissions:
 	INCBIN "data/maps/permissions/challenge_hall.bin"
 
-ChallengeHallCGBTilemap:: ; 854b3 (21:54b3)
+ChallengeHallCGBTilemap::
 	db $20 ; width
 	db $20 ; height
 	dw ChallengeHallCGBPermissions
@@ -169,7 +169,7 @@ ChallengeHallCGBTilemap:: ; 854b3 (21:54b3)
 ChallengeHallCGBPermissions:
 	INCBIN "data/maps/permissions/challenge_hall_cgb.bin"
 
-PokemonDomeEntranceTilemap:: ; 8570a (21:570a)
+PokemonDomeEntranceTilemap::
 	db $20 ; width
 	db $12 ; height
 	dw PokemonDomeEntrancePermissions
@@ -178,7 +178,7 @@ PokemonDomeEntranceTilemap:: ; 8570a (21:570a)
 PokemonDomeEntrancePermissions:
 	INCBIN "data/maps/permissions/pokemon_dome_entrance.bin"
 
-PokemonDomeEntranceCGBTilemap:: ; 857ce (21:57ce)
+PokemonDomeEntranceCGBTilemap::
 	db $20 ; width
 	db $12 ; height
 	dw PokemonDomeEntranceCGBPermissions
@@ -187,7 +187,7 @@ PokemonDomeEntranceCGBTilemap:: ; 857ce (21:57ce)
 PokemonDomeEntranceCGBPermissions:
 	INCBIN "data/maps/permissions/pokemon_dome_entrance_cgb.bin"
 
-PokemonDomeTilemap:: ; 858ef (21:58ef)
+PokemonDomeTilemap::
 	db $20 ; width
 	db $20 ; height
 	dw PokemonDomePermissions
@@ -196,7 +196,7 @@ PokemonDomeTilemap:: ; 858ef (21:58ef)
 PokemonDomePermissions:
 	INCBIN "data/maps/permissions/pokemon_dome.bin"
 
-PokemonDomeCGBTilemap:: ; 85a79 (21:5a79)
+PokemonDomeCGBTilemap::
 	db $20 ; width
 	db $20 ; height
 	dw PokemonDomeCGBPermissions
@@ -205,7 +205,7 @@ PokemonDomeCGBTilemap:: ; 85a79 (21:5a79)
 PokemonDomeCGBPermissions:
 	INCBIN "data/maps/permissions/pokemon_dome_cgb.bin"
 
-HallOfHonorTilemap:: ; 85ce2 (21:5ce2)
+HallOfHonorTilemap::
 	db $18 ; width
 	db $1a ; height
 	dw HallOfHonorPermissions
@@ -214,7 +214,7 @@ HallOfHonorTilemap:: ; 85ce2 (21:5ce2)
 HallOfHonorPermissions:
 	INCBIN "data/maps/permissions/hall_of_honor.bin"
 
-HallOfHonorCGBTilemap:: ; 85df4 (21:5df4)
+HallOfHonorCGBTilemap::
 	db $18 ; width
 	db $1a ; height
 	dw HallOfHonorCGBPermissions
@@ -223,393 +223,393 @@ HallOfHonorCGBTilemap:: ; 85df4 (21:5df4)
 HallOfHonorCGBPermissions:
 	INCBIN "data/maps/permissions/hall_of_honor_cgb.bin"
 
-CardPopCGBTilemap:: ; 85f7c (21:5f7c)
+CardPopCGBTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/card_pop_cgb.bin"
 
-CardPopTilemap:: ; 8607f (21:607f)
+CardPopTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/card_pop.bin"
 
-ScienceMedalTilemap:: ; 8617d (21:617d)
+ScienceMedalTilemap::
 	db $03 ; width
 	db $03 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/science_medal.bin"
 
-FireMedalTilemap:: ; 86193 (21:6193)
+FireMedalTilemap::
 	db $03 ; width
 	db $03 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/fire_medal.bin"
 
-WaterMedalTilemap:: ; 861a9 (21:61a9)
+WaterMedalTilemap::
 	db $03 ; width
 	db $03 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/water_medal.bin"
 
-LightningMedalTilemap:: ; 861bf (21:61bf)
+LightningMedalTilemap::
 	db $03 ; width
 	db $03 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/lightning_medal.bin"
 
-FightingMedalTilemap:: ; 861d5 (21:61d5)
+FightingMedalTilemap::
 	db $03 ; width
 	db $03 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/fighting_medal.bin"
 
-RockMedalTilemap:: ; 861eb (21:61eb)
+RockMedalTilemap::
 	db $03 ; width
 	db $03 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/rock_medal.bin"
 
-PsychicMedalTilemap:: ; 86201 (21:6201)
+PsychicMedalTilemap::
 	db $03 ; width
 	db $03 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/psychic_medal.bin"
 
-GameBoyLinkCGBTilemap:: ; 86217 (21:6217)
+GameBoyLinkCGBTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/gameboy_link_cgb.bin"
 
-GameBoyLinkTilemap:: ; 862da (21:62da)
+GameBoyLinkTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/gameboy_link.bin"
 
-GameBoyLinkConnectingCGBTilemap:: ; 86364 (21:6364)
+GameBoyLinkConnectingCGBTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/gameboy_link_connecting_cgb.bin"
 
-GameBoyLinkConnectingTilemap:: ; 86443 (21:6443)
+GameBoyLinkConnectingTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/gameboy_link_connecting.bin"
 
-GameBoyPrinterCGBTilemap:: ; 864df (21:64df)
+GameBoyPrinterCGBTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/gameboy_printer_cgb.bin"
 
-GameBoyPrinterTilemap:: ; 865b5 (21:65b5)
+GameBoyPrinterTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/gameboy_printer.bin"
 
-ColosseumTilemap:: ; 86647 (21:6647)
+ColosseumTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/colosseum.bin"
 
-ColosseumCGBTilemap:: ; 866b8 (21:66b8)
+ColosseumCGBTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/colosseum_cgb.bin"
 
-EvolutionTilemap:: ; 8673e (21:673e)
+EvolutionTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/evolution.bin"
 
-EvolutionCGBTilemap:: ; 867af (21:67af)
+EvolutionCGBTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/evolution_cgb.bin"
 
-MysteryTilemap:: ; 86833 (21:6833)
+MysteryTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/mystery.bin"
 
-MysteryCGBTilemap:: ; 868a4 (21:68a4)
+MysteryCGBTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/mystery_cgb.bin"
 
-LaboratoryTilemap:: ; 86925 (21:6925)
+LaboratoryTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/laboratory.bin"
 
-LaboratoryCGBTilemap:: ; 86996 (21:6996)
+LaboratoryCGBTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/laboratory_cgb.bin"
 
-CharizardIntroTilemap:: ; 86a14 (21:6a14)
+CharizardIntroTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/charizard_intro.bin"
 
-CharizardIntroCGBTilemap:: ; 86a85 (21:6a85)
+CharizardIntroCGBTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/charizard_intro_cgb.bin"
 
-ScytherIntroTilemap:: ; 86b28 (21:6b28)
+ScytherIntroTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/scyther_intro.bin"
 
-ScytherIntroCGBTilemap:: ; 86b99 (21:6b99)
+ScytherIntroCGBTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/scyther_intro_cgb.bin"
 
-AerodactylIntroTilemap:: ; 86c34 (21:6c34)
+AerodactylIntroTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/aerodactyl_intro.bin"
 
-AerodactylIntroCGBTilemap:: ; 86ca5 (21:6ca5)
+AerodactylIntroCGBTilemap::
 	db $08 ; width
 	db $0c ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/aerodactyl_intro_cgb.bin"
 
-JapaneseTitleScreenTilemap:: ; 86d37 (21:6d37)
+JapaneseTitleScreenTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/japanese_title_screen.bin"
 
-JapaneseTitleScreenCGBTilemap:: ; 86dcc (21:6dcc)
+JapaneseTitleScreenCGBTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/japanese_title_screen_cgb.bin"
 
-SolidTiles1Tilemap:: ; 86e8a (21:6e8a)
+SolidTiles1Tilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/solid_tiles_1.bin"
 
-SolidTiles2Tilemap:: ; 86f18 (21:6f18)
+SolidTiles2Tilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/solid_tiles_2.bin"
 
-SolidTiles3Tilemap:: ; 86fc0 (21:6fc0)
+SolidTiles3Tilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/solid_tiles_3.bin"
 
-JapaneseTitleScreen2Tilemap:: ; 8704f (21:704f)
+JapaneseTitleScreen2Tilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/japanese_title_screen_2.bin"
 
-JapaneseTitleScreen2CGBTilemap:: ; 871a5 (21:71a5)
+JapaneseTitleScreen2CGBTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/japanese_title_screen_2_cgb.bin"
 
-SolidTiles4Tilemap:: ; 87397 (21:7397)
+SolidTiles4Tilemap::
 	db $08 ; width
 	db $04 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/solid_tiles_4.bin"
 
-PlayerTilemap:: ; 873b7 (21:73b7)
+PlayerTilemap::
 	db $06 ; width
 	db $06 ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/player.bin"
 
-OpponentTilemap:: ; 873e5 (21:73e5)
+OpponentTilemap::
 	db $06 ; width
 	db $06 ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/opponent.bin"
 
-TitleScreenTilemap:: ; 87413 (21:7413)
+TitleScreenTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/title_screen.bin"
 
-TitleScreenCGBTilemap:: ; 87538 (21:7538)
+TitleScreenCGBTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/title_screen_cgb.bin"
 
-CopyrightTilemap:: ; 8769f (21:769f)
+CopyrightTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/copyright.bin"
 
-CopyrightCGBTilemap:: ; 876f6 (21:76f6)
+CopyrightCGBTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db TRUE ; cgb mode
 	INCBIN "data/maps/tiles/copyright_cgb.bin"
 
-NintendoTilemap:: ; 8777c (21:777c)
+NintendoTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/nintendo.bin"
 
-CompaniesTilemap:: ; 877c4 (21:77c4)
+CompaniesTilemap::
 	db $14 ; width
 	db $12 ; height
 	dw NULL
 	db FALSE ; cgb mode
 	INCBIN "data/maps/tiles/companies.bin"
 
-IshiharaTilesetGfx:: ; 87828 (21:7828)
+IshiharaTilesetGfx::
 	dw 77
 	INCBIN "gfx/tilesets/ishihara.2bpp"
 
-SolidTiles1:: ; 87cfa (21:7cfa)
+SolidTiles1::
 	dw 4
 	INCBIN "gfx/solid_tiles.2bpp"
 
-SolidTiles2:: ; 87d3c (21:7d3c)
+SolidTiles2::
 	dw 4
 	INCBIN "gfx/solid_tiles.2bpp"
 
-PlayerGfx:: ; 87d7e (21:7d7e)
+PlayerGfx::
 	dw 36
 	INCBIN "gfx/duelists/player.2bpp"
 
-Duel55Gfx:: ; 87fc0 (21:7fc0)
+Duel55Gfx::
 	dw $2
 	INCBIN "gfx/duel/anims/55.2bpp"
 
-Duel56Gfx:: ; 87fe2 (21:7fe2)
+Duel56Gfx::
 	dw $1
 	INCBIN "gfx/duel/anims/56.2bpp"
 
-AnimData12:: ; 87ff4 (21:7ff4)
+AnimData12::
 	frame_table AnimFrameTable3
 	frame_data 2, 8, 0, 0
 	frame_data 0, 0, 0, 0
 
 SECTION "Gfx 4", ROMX
 
-OverworldMapTiles:: ; 88000 (22:4000)
+OverworldMapTiles::
 	dw 193
 	INCBIN "gfx/overworld_map.2bpp"
 
-MasonLaboratoryTilesetGfx:: ; 88c12 (22:4c12)
+MasonLaboratoryTilesetGfx::
 	dw 151
 	INCBIN "gfx/tilesets/masonlaboratory.2bpp"
 
-ClubEntranceTilesetGfx:: ; 89584 (22:5584)
+ClubEntranceTilesetGfx::
 	dw 129
 	INCBIN "gfx/tilesets/clubentrance.2bpp"
 
-ClubLobbyTilesetGfx:: ; 89d96 (22:5d96)
+ClubLobbyTilesetGfx::
 	dw 120
 	INCBIN "gfx/tilesets/clublobby.2bpp"
 
-FightingClubTilesetGfx:: ; 8a518 (22:6518)
+FightingClubTilesetGfx::
 	dw 99
 	INCBIN "gfx/tilesets/fightingclub.2bpp"
 
-RockClubTilesetGfx:: ; 8ab4a (22:6b4a)
+RockClubTilesetGfx::
 	dw 60
 	INCBIN "gfx/tilesets/rockclub.2bpp"
 
-WaterClubTilesetGfx:: ; 8af0c (22:6f0c)
+WaterClubTilesetGfx::
 	dw 161
 	INCBIN "gfx/tilesets/waterclub.2bpp"
 
-GrassClubTilesetGfx:: ; 8b91e (22:791e)
+GrassClubTilesetGfx::
 	dw 87
 	INCBIN "gfx/tilesets/grassclub.2bpp"
 
-OWPlayerGfx:: ; 8be90 (22:7e90)
+OWPlayerGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/player.2bpp"
 
-Duel57Gfx:: ; 8bfd2 (22:7fd2)
+Duel57Gfx::
 	dw $1
 	INCBIN "gfx/duel/anims/57.2bpp"
 
-AnimData2:: ; 8bfe4 (22:7fe4)
+AnimData2::
 	frame_table AnimFrameTable0
 	frame_data 5, 16, 0, 0
 	frame_data 6, 16, 0, 0
@@ -617,45 +617,45 @@ AnimData2:: ; 8bfe4 (22:7fe4)
 	frame_data 6, 16, 0, 0
 	frame_data 0, 0, 0, 0
 
-Palette109:: ; 8bffb (22:7ffb)
+Palette109::
 	db 1, %11100100
 	db 0
 
 SECTION "Gfx 5", ROMX
 
-LightningClubTilesetGfx:: ; 8c000 (23:4000)
+LightningClubTilesetGfx::
 	dw 131
 	INCBIN "gfx/tilesets/lightningclub.2bpp"
 
-PsychicClubTilesetGfx:: ; 8c832 (23:4832)
+PsychicClubTilesetGfx::
 	dw 58
 	INCBIN "gfx/tilesets/psychicclub.2bpp"
 
-ScienceClubTilesetGfx:: ; 8cbd4 (23:4bd4)
+ScienceClubTilesetGfx::
 	dw 82
 	INCBIN "gfx/tilesets/scienceclub.2bpp"
 
-FireClubTilesetGfx:: ; 8d0f6 (23:50f6)
+FireClubTilesetGfx::
 	dw 87
 	INCBIN "gfx/tilesets/fireclub.2bpp"
 
-ChallengeHallTilesetGfx:: ; 8d668 (23:5668)
+ChallengeHallTilesetGfx::
 	dw 157
 	INCBIN "gfx/tilesets/challengehall.2bpp"
 
-PokemonDomeEntranceTilesetGfx:: ; 8e03a (23:603a)
+PokemonDomeEntranceTilesetGfx::
 	dw 78
 	INCBIN "gfx/tilesets/pokemondomeentrance.2bpp"
 
-PokemonDomeTilesetGfx:: ; 8e51c (23:651c)
+PokemonDomeTilesetGfx::
 	dw 207
 	INCBIN "gfx/tilesets/pokemondome.2bpp"
 
-HallOfHonorTilesetGfx:: ; 8f20e (23:720e)
+HallOfHonorTilesetGfx::
 	dw 121
 	INCBIN "gfx/tilesets/hallofhonor.2bpp"
 
-MedalGfx:: ; 8f9a0 (23:79a0)
+MedalGfx::
 	dw 72
 	INCBIN "gfx/medals.2bpp", $0, $c0
 	INCBIN "gfx/medals.2bpp", $240, $30
@@ -676,134 +676,134 @@ MedalGfx:: ; 8f9a0 (23:79a0)
 	INCBIN "gfx/medals.2bpp", $420, $30
 	INCBIN "gfx/medals.2bpp", $3f0, $20
 
-NintendoGfx:: ; 8fe22 (23:7e22)
+NintendoGfx::
 	dw 24
 	INCBIN "gfx/nintendo.2bpp"
 
-Duel58Gfx:: ; 8ffa4 (23:7fa4)
+Duel58Gfx::
 	dw $4
 	INCBIN "gfx/duel/anims/58.2bpp"
 
-AnimData3:: ; 8ffe6 (23:7fe6)
+AnimData3::
 	frame_table AnimFrameTable0
 	frame_data 8, 16, 0, 0
 	frame_data 9, 16, 0, 0
 	frame_data 0, 0, 0, 0
 
-AnimData11:: ; 8fff5 (23:7ff5)
+AnimData11::
 	frame_table AnimFrameTable3
 	frame_data 1, 8, 0, 0
 	frame_data 0, 0, 0, 0
 
 SECTION "Gfx 6", ROMX
 
-CardPopGfx:: ; 90000 (24:4000)
+CardPopGfx::
 	dw 189
 	INCBIN "gfx/link/cardpop.2bpp"
 
-GameBoyLinkGfx:: ; 90bd2 (24:4bd2)
+GameBoyLinkGfx::
 	dw 109
 	INCBIN "gfx/link/gameboylink.2bpp"
 
-GameBoyPrinterGfx:: ; 912a4 (24:52a4)
+GameBoyPrinterGfx::
 	dw 93
 	INCBIN "gfx/link/gameboyprinter.2bpp"
 
-Colosseum1Gfx:: ; 91876 (24:5876)
+Colosseum1Gfx::
 	dw 96
 	INCBIN "gfx/booster_packs/colosseum1.2bpp"
 
-Colosseum2Gfx:: ; 91e78 (24:5e78)
+Colosseum2Gfx::
 	dw 86
 	INCBIN "gfx/booster_packs/colosseum2.2bpp"
 
-Evolution1Gfx:: ; 923da (24:63da)
+Evolution1Gfx::
 	dw 96
 	INCBIN "gfx/booster_packs/evolution1.2bpp"
 
-Evolution2Gfx:: ; 929dc (24:69dc)
+Evolution2Gfx::
 	dw 86
 	INCBIN "gfx/booster_packs/evolution2.2bpp"
 
-Mystery1Gfx:: ; 92f3e (24:6f3e)
+Mystery1Gfx::
 	dw 96
 	INCBIN "gfx/booster_packs/mystery1.2bpp"
 
-Mystery2Gfx:: ; 93540 (24:7540)
+Mystery2Gfx::
 	dw 86
 	INCBIN "gfx/booster_packs/mystery2.2bpp"
 
-RonaldGfx:: ; 93aa2 (24:7aa2)
+RonaldGfx::
 	dw 36
 	INCBIN "gfx/duelists/ronald.2bpp"
 
-CopyrightGfx:: ; 93ce4 (24:7ce4)
+CopyrightGfx::
 	dw 36
 	INCBIN "gfx/copyright.2bpp"
 
-OWClerkGfx:: ; 93f26 (24:7f26)
+OWClerkGfx::
 	dw $8
 	INCBIN "gfx/overworld_sprites/clerk.2bpp"
 
-Duel59Gfx:: ; 93fa8 (24:7fa8)
+Duel59Gfx::
 	dw $3
 	INCBIN "gfx/duel/anims/59.2bpp"
 
-Duel60Gfx:: ; 93fda (24:7fda)
+Duel60Gfx::
 	dw $2
 	INCBIN "gfx/duel/anims/60.2bpp"
 
 SECTION "Gfx 7", ROMX
 
-Laboratory1Gfx:: ; 94000 (25:4000)
+Laboratory1Gfx::
 	dw 96
 	INCBIN "gfx/booster_packs/laboratory1.2bpp"
 
-Laboratory2Gfx:: ; 94602 (25:4602)
+Laboratory2Gfx::
 	dw 86
 	INCBIN "gfx/booster_packs/laboratory2.2bpp"
 
-CharizardIntro1Gfx:: ; 94b64 (25:4b64)
+CharizardIntro1Gfx::
 	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/charizardintro1.2bpp"
 
-CharizardIntro2Gfx:: ; 95166 (25:5166)
+CharizardIntro2Gfx::
 	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/charizardintro2.2bpp"
 
-ScytherIntro1Gfx:: ; 95768 (25:5768)
+ScytherIntro1Gfx::
 	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/scytherintro1.2bpp"
 
-ScytherIntro2Gfx:: ; 95d6a (25:5d6a)
+ScytherIntro2Gfx::
 	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/scytherintro2.2bpp"
 
-AerodactylIntro1Gfx:: ; 9636c (25:636c)
+AerodactylIntro1Gfx::
 	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/aerodactylintro1.2bpp"
 
-AerodactylIntro2Gfx:: ; 9696e (25:696e)
+AerodactylIntro2Gfx::
 	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/aerodactylintro2.2bpp"
 
-JapaneseTitleScreenGfx:: ; 96f70 (25:6f70)
+JapaneseTitleScreenGfx::
 	dw 97
 	INCBIN "gfx/titlescreen/japanese_title_screen.2bpp"
 
-JapaneseTitleScreenCGBGfx:: ; 97582 (25:7582)
+JapaneseTitleScreenCGBGfx::
 	dw 97
 	INCBIN "gfx/titlescreen/japanese_title_screen_cgb.2bpp"
 
-CompaniesGfx:: ; 97b94 (25:7b94)
+CompaniesGfx::
 	dw 49
 	INCBIN "gfx/companies.2bpp"
 
-OWRonaldGfx:: ; 97ea6 (25:7ea6)
+OWRonaldGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/ronald.2bpp"
 
-AnimData5:: ; 97fe8 (25:7fe8)
+AnimData5::
 	frame_table AnimFrameTable1
 	frame_data 3, 16, 0, 0
 	frame_data 4, 16, 0, 0
@@ -811,335 +811,335 @@ AnimData5:: ; 97fe8 (25:7fe8)
 
 SECTION "Gfx 8", ROMX
 
-JapaneseTitleScreen2Gfx:: ; 98000 (26:4000)
+JapaneseTitleScreen2Gfx::
 	dw 244
 	INCBIN "gfx/titlescreen/japanese_title_screen_2.2bpp"
 
-JapaneseTitleScreen2CGBGfx:: ; 98f42 (26:4f42)
+JapaneseTitleScreen2CGBGfx::
 	dw 315
 	INCBIN "gfx/titlescreen/japanese_title_screen_2_cgb.2bpp"
 
-TitleScreenGfx:: ; 9a2f4 (26:62f4)
+TitleScreenGfx::
 	dw 220
 	INCBIN "gfx/titlescreen/title_screen.2bpp"
 
-TitleScreenCGBGfx:: ; 9b0b6 (26:70b6)
+TitleScreenCGBGfx::
 	dw 212
 	INCBIN "gfx/titlescreen/title_screen_cgb.2bpp"
 
-OWDrMasonGfx:: ; 9bdf8 (26:7df8)
+OWDrMasonGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/doctormason.2bpp"
 
-OverworldMapOAMGfx:: ; 9bf3a (26:7f3a)
+OverworldMapOAMGfx::
 	dw $8
 	INCBIN "gfx/overworld_map_oam.2bpp"
 
-Duel61Gfx:: ; 9bfbc (26:7fbc)
+Duel61Gfx::
 	dw $3
 	INCBIN "gfx/duel/anims/61.2bpp"
 
-Duel62Gfx:: ; 9bfee (26:7fee)
+Duel62Gfx::
 	dw $1
 	INCBIN "gfx/duel/anims/62.2bpp"
 
 SECTION "Gfx 9", ROMX
 
-SamGfx:: ; 9c000 (27:4000)
+SamGfx::
 	dw 36
 	INCBIN "gfx/duelists/sam.2bpp"
 
-ImakuniGfx:: ; 9c242 (27:4242)
+ImakuniGfx::
 	dw 36
 	INCBIN "gfx/duelists/imakuni.2bpp"
 
-NikkiGfx:: ; 9c484 (27:4484)
+NikkiGfx::
 	dw 36
 	INCBIN "gfx/duelists/nikki.2bpp"
 
-RickGfx:: ; 9c6c6 (27:46c6)
+RickGfx::
 	dw 36
 	INCBIN "gfx/duelists/rick.2bpp"
 
-KenGfx:: ; 9c908 (27:4908)
+KenGfx::
 	dw 36
 	INCBIN "gfx/duelists/ken.2bpp"
 
-AmyGfx:: ; 9cb4a (27:4b4a)
+AmyGfx::
 	dw 36
 	INCBIN "gfx/duelists/amy.2bpp"
 
-IsaacGfx:: ; 9cd8c (27:4d8c)
+IsaacGfx::
 	dw 36
 	INCBIN "gfx/duelists/isaac.2bpp"
 
-MitchGfx:: ; 9cfce (27:4fce)
+MitchGfx::
 	dw 36
 	INCBIN "gfx/duelists/mitch.2bpp"
 
-GeneGfx:: ; 9d210 (27:5210)
+GeneGfx::
 	dw 36
 	INCBIN "gfx/duelists/gene.2bpp"
 
-MurrayGfx:: ; 9d452 (27:5452)
+MurrayGfx::
 	dw 36
 	INCBIN "gfx/duelists/murray.2bpp"
 
-CourtneyGfx:: ; 9d694 (27:5694)
+CourtneyGfx::
 	dw 36
 	INCBIN "gfx/duelists/courtney.2bpp"
 
-SteveGfx:: ; 9d8d6 (27:58d6)
+SteveGfx::
 	dw 36
 	INCBIN "gfx/duelists/steve.2bpp"
 
-JackGfx:: ; 9db18 (27:5b18)
+JackGfx::
 	dw 36
 	INCBIN "gfx/duelists/jack.2bpp"
 
-RodGfx:: ; 9dd5a (27:5d5a)
+RodGfx::
 	dw 36
 	INCBIN "gfx/duelists/rod.2bpp"
 
-JosephGfx:: ; 9df9c (27:5f9c)
+JosephGfx::
 	dw 36
 	INCBIN "gfx/duelists/joseph.2bpp"
 
-DavidGfx:: ; 9e1de (27:61de)
+DavidGfx::
 	dw 36
 	INCBIN "gfx/duelists/david.2bpp"
 
-ErikGfx:: ; 9e420 (27:6420)
+ErikGfx::
 	dw 36
 	INCBIN "gfx/duelists/erik.2bpp"
 
-JohnGfx:: ; 9e662 (27:6662)
+JohnGfx::
 	dw 36
 	INCBIN "gfx/duelists/john.2bpp"
 
-AdamGfx:: ; 9e8a4 (27:68a4)
+AdamGfx::
 	dw 36
 	INCBIN "gfx/duelists/adam.2bpp"
 
-JonathanGfx:: ; 9eae6 (27:6ae6)
+JonathanGfx::
 	dw 36
 	INCBIN "gfx/duelists/jonathan.2bpp"
 
-JoshuaGfx:: ; 9ed28 (27:6d28)
+JoshuaGfx::
 	dw 36
 	INCBIN "gfx/duelists/joshua.2bpp"
 
-NicholasGfx:: ; 9ef6a (27:6f6a)
+NicholasGfx::
 	dw 36
 	INCBIN "gfx/duelists/nicholas.2bpp"
 
-BrandonGfx:: ; 9f1ac (27:71ac)
+BrandonGfx::
 	dw 36
 	INCBIN "gfx/duelists/brandon.2bpp"
 
-MatthewGfx:: ; 9f3ee (27:73ee)
+MatthewGfx::
 	dw 36
 	INCBIN "gfx/duelists/matthew.2bpp"
 
-RyanGfx:: ; 9f630 (27:7630)
+RyanGfx::
 	dw 36
 	INCBIN "gfx/duelists/ryan.2bpp"
 
-AndrewGfx:: ; 9f872 (27:7872)
+AndrewGfx::
 	dw 36
 	INCBIN "gfx/duelists/andrew.2bpp"
 
-ChrisGfx:: ; 9fab4 (27:7ab4)
+ChrisGfx::
 	dw 36
 	INCBIN "gfx/duelists/chris.2bpp"
 
-MichaelGfx:: ; 9fcf6 (27:7cf6)
+MichaelGfx::
 	dw 36
 	INCBIN "gfx/duelists/michael.2bpp"
 
-Duel63Gfx:: ; 9ff38 (27:7f38)
+Duel63Gfx::
 	dw $a
 	INCBIN "gfx/duel/anims/63.2bpp"
 
-Duel64Gfx:: ; 9ffda (27:7fda)
+Duel64Gfx::
 	dw $2
 	INCBIN "gfx/duel/anims/64.2bpp"
 
 SECTION "Gfx 10", ROMX
 
-DanielGfx:: ; a0000 (28:4000)
+DanielGfx::
 	dw 36
 	INCBIN "gfx/duelists/daniel.2bpp"
 
-RobertGfx:: ; a0242 (28:4242)
+RobertGfx::
 	dw 36
 	INCBIN "gfx/duelists/robert.2bpp"
 
-BrittanyGfx:: ; a0484 (28:4484)
+BrittanyGfx::
 	dw 36
 	INCBIN "gfx/duelists/brittany.2bpp"
 
-KristinGfx:: ; a06c6 (28:46c6)
+KristinGfx::
 	dw 36
 	INCBIN "gfx/duelists/kristin.2bpp"
 
-HeatherGfx:: ; a0908 (28:4908)
+HeatherGfx::
 	dw 36
 	INCBIN "gfx/duelists/heather.2bpp"
 
-SaraGfx:: ; a0b4a (28:4b4a)
+SaraGfx::
 	dw 36
 	INCBIN "gfx/duelists/sara.2bpp"
 
-AmandaGfx:: ; a0d8c (28:4d8c)
+AmandaGfx::
 	dw 36
 	INCBIN "gfx/duelists/amanda.2bpp"
 
-JenniferGfx:: ; a0fce (28:4fce)
+JenniferGfx::
 	dw 36
 	INCBIN "gfx/duelists/jennifer.2bpp"
 
-JessicaGfx:: ; a1210 (28:5210)
+JessicaGfx::
 	dw 36
 	INCBIN "gfx/duelists/jessica.2bpp"
 
-StephanieGfx:: ; a1452 (28:5452)
+StephanieGfx::
 	dw 36
 	INCBIN "gfx/duelists/stephanie.2bpp"
 
-AaronGfx:: ; a1694 (28:5694)
+AaronGfx::
 	dw 36
 	INCBIN "gfx/duelists/aaron.2bpp"
 
-OWIshiharaGfx:: ; a18d6 (28:58d6)
+OWIshiharaGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/ishihara.2bpp"
 
-OWImakuniGfx:: ; a1a18 (28:5a18)
+OWImakuniGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/imakuni.2bpp"
 
-OWNikkiGfx:: ; a1b5a (28:5b5a)
+OWNikkiGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/nikki.2bpp"
 
-OWRickGfx:: ; a1c9c (28:5c9c)
+OWRickGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/rick.2bpp"
 
-OWKenGfx:: ; a1dde (28:5dde)
+OWKenGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/ken.2bpp"
 
-OWAmyGfx:: ; a1f20 (28:5f20)
+OWAmyGfx::
 	dw $1b
 	INCBIN "gfx/overworld_sprites/amy.2bpp"
 
-OWIsaacGfx:: ; a20d2 (28:60d2)
+OWIsaacGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/isaac.2bpp"
 
-OWMitchGfx:: ; a2214 (28:6214)
+OWMitchGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/mitch.2bpp"
 
-OWGeneGfx:: ; a2356 (28:6356)
+OWGeneGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/gene.2bpp"
 
-OWMurrayGfx:: ; a2498 (28:6498)
+OWMurrayGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/murray.2bpp"
 
-OWCourtneyGfx:: ; a25da (28:65da)
+OWCourtneyGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/courtney.2bpp"
 
-OWSteveGfx:: ; a271c (28:671c)
+OWSteveGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/steve.2bpp"
 
-OWJackGfx:: ; a285e (28:685e)
+OWJackGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/jack.2bpp"
 
-OWRodGfx:: ; a29a0 (28:69a0)
+OWRodGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/rod.2bpp"
 
-OWBoyGfx:: ; a2ae2 (28:6ae2)
+OWBoyGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/youngster.2bpp"
 
-OWLadGfx:: ; a2c24 (28:6c24)
+OWLadGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/lad.2bpp"
 
-OWSpecsGfx:: ; a2d66 (28:6d66)
+OWSpecsGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/specs.2bpp"
 
-OWButchGfx:: ; a2ea8 (28:6ea8)
+OWButchGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/butch.2bpp"
 
-OWManiaGfx:: ; a2fea (28:6fea)
+OWManiaGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/mania.2bpp"
 
-OWJoshuaGfx:: ; a312c (28:712c)
+OWJoshuaGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/joshua.2bpp"
 
-OWHoodGfx:: ; a326e (28:726e)
+OWHoodGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/hood.2bpp"
 
-OWTechGfx:: ; a33b0 (28:73b0)
+OWTechGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/tech.2bpp"
 
-OWChapGfx:: ; a34f2 (28:74f2)
+OWChapGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/chap.2bpp"
 
-OWManGfx:: ; a3634 (28:7634)
+OWManGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/man.2bpp"
 
-OWPappyGfx:: ; a3776 (28:7776)
+OWPappyGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/pappy.2bpp"
 
-OWGirlGfx:: ; a38b8 (28:78b8)
+OWGirlGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/girl.2bpp"
 
-OWLass1Gfx:: ; a39fa (28:79fa)
+OWLass1Gfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/lass1.2bpp"
 
-OWLass2Gfx:: ; a3b3c (28:7b3c)
+OWLass2Gfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/lass2.2bpp"
 
-OWLass3Gfx:: ; a3c7e (28:7c7e)
+OWLass3Gfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/lass3.2bpp"
 
-OWSwimmerGfx:: ; a3dc0 (28:7dc0)
+OWSwimmerGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/swimmer.2bpp"
 
-DuelGlowGfx:: ; a3f02 (28:7f02)
+DuelGlowGfx::
 	dw $b
 	INCBIN "gfx/duel/anims/glow.2bpp"
 
-Duel66Gfx:: ; a3fb4 (28:7fb4)
+Duel66Gfx::
 	dw $4
 	INCBIN "gfx/duel/anims/66.2bpp"
 
-Palette117:: ; a3ff6 (28:7ff6)
+Palette117::
 	db 0
 	db 1
 
@@ -1150,203 +1150,203 @@ Palette117:: ; a3ff6 (28:7ff6)
 
 SECTION "Gfx 11", ROMX
 
-OWGalGfx:: ; a4000 (29:4000)
+OWGalGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/gal.2bpp"
 
-OWWomanGfx:: ; a4142 (29:4142)
+OWWomanGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/woman.2bpp"
 
-OWGrannyGfx:: ; a4284 (29:4284)
+OWGrannyGfx::
 	dw $14
 	INCBIN "gfx/overworld_sprites/granny.2bpp"
 
-Duel0Gfx:: ; a43c6 (29:43c6)
+Duel0Gfx::
 	dw $16
 	INCBIN "gfx/duel/anims/0.2bpp"
 
-Duel1Gfx:: ; a4528 (29:4528)
+Duel1Gfx::
 	dw $06
 	INCBIN "gfx/duel/anims/1.2bpp"
 
-Duel2Gfx:: ; a458a (29:458a)
+Duel2Gfx::
 	dw $08
 	INCBIN "gfx/duel/anims/2.2bpp"
 
-Duel3Gfx:: ; a460c (29:460c)
+Duel3Gfx::
 	dw $09
 	INCBIN "gfx/duel/anims/3.2bpp"
 
-Duel4Gfx:: ; a469e (29:469e)
+Duel4Gfx::
 	dw $12
 	INCBIN "gfx/duel/anims/4.2bpp"
 
-Duel5Gfx:: ; a47c0 (29:47c0)
+Duel5Gfx::
 	dw $09
 	INCBIN "gfx/duel/anims/5.2bpp"
 
-Duel6Gfx:: ; a4852 (29:4852)
+Duel6Gfx::
 	dw $11
 	INCBIN "gfx/duel/anims/6.2bpp"
 
-Duel7Gfx:: ; a4964 (29:4964)
+Duel7Gfx::
 	dw $2d
 	INCBIN "gfx/duel/anims/7.2bpp"
 
-Duel8Gfx:: ; a4c36 (29:4c36)
+Duel8Gfx::
 	dw $0d
 	INCBIN "gfx/duel/anims/8.2bpp"
 
-Duel9Gfx:: ; a4d08 (29:4d08)
+Duel9Gfx::
 	dw $1c
 	INCBIN "gfx/duel/anims/9.2bpp"
 
-Duel10Gfx:: ; a4eca (29:4eca)
+Duel10Gfx::
 	dw $4c
 	INCBIN "gfx/duel/anims/10.2bpp"
 
-Duel11Gfx:: ; a538c (29:538c)
+Duel11Gfx::
 	dw $1b
 	INCBIN "gfx/duel/anims/11.2bpp"
 
-Duel12Gfx:: ; a553e (29:553e)
+Duel12Gfx::
 	dw $07
 	INCBIN "gfx/duel/anims/12.2bpp"
 
-Duel13Gfx:: ; a55b0 (29:55b0)
+Duel13Gfx::
 	dw $0c
 	INCBIN "gfx/duel/anims/13.2bpp"
 
-Duel14Gfx:: ; a5672 (29:5672)
+Duel14Gfx::
 	dw $22
 	INCBIN "gfx/duel/anims/14.2bpp"
 
-Duel15Gfx:: ; a5894 (29:5894)
+Duel15Gfx::
 	dw $20
 	INCBIN "gfx/duel/anims/15.2bpp"
 
-Duel16Gfx:: ; a5a96 (29:5a96)
+Duel16Gfx::
 	dw $0a
 	INCBIN "gfx/duel/anims/16.2bpp"
 
-Duel17Gfx:: ; a5b38 (29:5b38)
+Duel17Gfx::
 	dw $25
 	INCBIN "gfx/duel/anims/17.2bpp"
 
-Duel18Gfx:: ; a5d8a (29:5d8a)
+Duel18Gfx::
 	dw $18
 	INCBIN "gfx/duel/anims/18.2bpp"
 
-Duel19Gfx:: ; a5f0c (29:5f0c)
+Duel19Gfx::
 	dw $1b
 	INCBIN "gfx/duel/anims/19.2bpp"
 
-Duel20Gfx:: ; a60be (29:60be)
+Duel20Gfx::
 	dw $08
 	INCBIN "gfx/duel/anims/20.2bpp"
 
-Duel21Gfx:: ; a6140 (29:6140)
+Duel21Gfx::
 	dw $0d
 	INCBIN "gfx/duel/anims/21.2bpp"
 
-Duel22Gfx:: ; a6212 (29:6212)
+Duel22Gfx::
 	dw $22
 	INCBIN "gfx/duel/anims/22.2bpp"
 
-Duel23Gfx:: ; a6434 (29:6434)
+Duel23Gfx::
 	dw $0c
 	INCBIN "gfx/duel/anims/23.2bpp"
 
-Duel24Gfx:: ; a64f6 (29:64f6)
+Duel24Gfx::
 	dw $25
 	INCBIN "gfx/duel/anims/24.2bpp"
 
-Duel25Gfx:: ; a6748 (29:6748)
+Duel25Gfx::
 	dw $22
 	INCBIN "gfx/duel/anims/25.2bpp"
 
-Duel26Gfx:: ; a696a (29:696a)
+Duel26Gfx::
 	dw $0c
 	INCBIN "gfx/duel/anims/26.2bpp"
 
-Duel27Gfx:: ; a6a2c (29:6a2c)
+Duel27Gfx::
 	dw $4c
 	INCBIN "gfx/duel/anims/27.2bpp"
 
-Duel28Gfx:: ; a6eee (29:6eee)
+Duel28Gfx::
 	dw $08
 	INCBIN "gfx/duel/anims/28.2bpp"
 
-Duel29Gfx:: ; a6f70 (29:6f70)
+Duel29Gfx::
 	dw $07
 	INCBIN "gfx/duel/anims/29.2bpp"
 
-Duel30Gfx:: ; a6fe2 (29:6fe2)
+Duel30Gfx::
 	dw $1a
 	INCBIN "gfx/duel/anims/30.2bpp"
 
-Duel31Gfx:: ; a7184 (29:7184)
+Duel31Gfx::
 	dw $0a
 	INCBIN "gfx/duel/anims/31.2bpp"
 
-Duel32Gfx:: ; a7226 (29:7226)
+Duel32Gfx::
 	dw $2e
 	INCBIN "gfx/duel/anims/32.2bpp"
 
-Duel33Gfx:: ; a7508 (29:7508)
+Duel33Gfx::
 	dw $08
 	INCBIN "gfx/duel/anims/33.2bpp"
 
-Duel34Gfx:: ; a758a (29:758a)
+Duel34Gfx::
 	dw $07
 	INCBIN "gfx/duel/anims/34.2bpp"
 
-Duel35Gfx:: ; a75fc (29:75fc)
+Duel35Gfx::
 	dw $1c
 	INCBIN "gfx/duel/anims/35.2bpp"
 
-Duel36Gfx:: ; a77be (29:77be)
+Duel36Gfx::
 	dw $08
 	INCBIN "gfx/duel/anims/36.2bpp"
 
-Duel37Gfx:: ; a7840 (29:7840)
+Duel37Gfx::
 	dw $0b
 	INCBIN "gfx/duel/anims/37.2bpp"
 
-Duel38Gfx:: ; a78f2 (29:78f2)
+Duel38Gfx::
 	dw $1c
 	INCBIN "gfx/duel/anims/38.2bpp"
 
-Duel39Gfx:: ; a7ab4 (29:7ab4)
+Duel39Gfx::
 	dw $16
 	INCBIN "gfx/duel/anims/39.2bpp"
 
-Duel40Gfx:: ; a7c16 (29:7c16)
+Duel40Gfx::
 	dw $10
 	INCBIN "gfx/duel/anims/40.2bpp"
 
-Duel41Gfx:: ; a7d18 (29:7d18)
+Duel41Gfx::
 	dw $0f
 	INCBIN "gfx/duel/anims/41.2bpp"
 
-Duel42Gfx:: ; a7e0a (29:7e0a)
+Duel42Gfx::
 	dw $07
 	INCBIN "gfx/duel/anims/42.2bpp"
 
-Duel43Gfx:: ; a7e7c (29:7e7c)
+Duel43Gfx::
 	dw $0a
 	INCBIN "gfx/duel/anims/43.2bpp"
 
-Duel44Gfx:: ; a7f1e (29:7f1e)
+Duel44Gfx::
 	dw $09
 	INCBIN "gfx/duel/anims/44.2bpp"
 
-Duel45Gfx:: ; a7fb0 (29:7fb0)
+Duel45Gfx::
 	dw $03
 	INCBIN "gfx/duel/anims/45.2bpp"
 
-AnimData6:: ; a7fe2 (29:7fe2)
+AnimData6::
 	frame_table AnimFrameTable1
 	frame_data 5, 16, 0, 0
 	frame_data 6, 16, 0, 0
@@ -1356,75 +1356,75 @@ AnimData6:: ; a7fe2 (29:7fe2)
 
 SECTION "Gfx 12", ROMX
 
-Duel46Gfx:: ; a8000 (2a:4000)
+Duel46Gfx::
 	dw $08
 	INCBIN "gfx/duel/anims/46.2bpp"
 
-Duel47Gfx:: ; a8082 (2a:4082)
+Duel47Gfx::
 	dw $0f
 	INCBIN "gfx/duel/anims/47.2bpp"
 
-Duel48Gfx:: ; a8174 (2a:4174)
+Duel48Gfx::
 	dw $03
 	INCBIN "gfx/duel/anims/48.2bpp"
 
-Duel49Gfx:: ; a81a6 (2a:41a6)
+Duel49Gfx::
 	dw $05
 	INCBIN "gfx/duel/anims/49.2bpp"
 
-Duel50Gfx:: ; a81f8 (2a:41f8)
+Duel50Gfx::
 	dw $17
 	INCBIN "gfx/duel/anims/50.2bpp"
 
-Duel51Gfx:: ; a836a (2a:436a)
+Duel51Gfx::
 	dw $36
 	INCBIN "gfx/duel/anims/51.2bpp"
 
-Duel52Gfx:: ; a86cc (2a:46cc)
+Duel52Gfx::
 	dw $0b
 	INCBIN "gfx/duel/anims/52.2bpp"
 
-Duel53Gfx:: ; a877e (2a:477e)
+Duel53Gfx::
 	dw $06
 	INCBIN "gfx/duel/anims/53.2bpp"
 
-Duel54Gfx:: ; a87e0 (2a:47e0)
+Duel54Gfx::
 	dw $16
 	INCBIN "gfx/duel/anims/54.2bpp"
 
-BoosterPackOAMGfx:: ; a8942 (2a:4942)
+BoosterPackOAMGfx::
 	dw $20
 	INCBIN "gfx/booster_packs/oam.2bpp"
 
-PressStartGfx:: ; a8b44 (2a:4b44)
+PressStartGfx::
 	dw $14
 	INCBIN "gfx/titlescreen/press_start.2bpp"
 
-GrassGfx:: ; a8c86 (2a:4c86)
+GrassGfx::
 	dw $04
 	INCBIN "gfx/titlescreen/energies/grass.2bpp"
 
-FireGfx:: ; a8cc8 (2a:4cc8)
+FireGfx::
 	dw $04
 	INCBIN "gfx/titlescreen/energies/fire.2bpp"
 
-WaterGfx:: ; a8d0a (2a:4d0a)
+WaterGfx::
 	dw $04
 	INCBIN "gfx/titlescreen/energies/water.2bpp"
 
-ColorlessGfx:: ; a8d4c (2a:4d4c)
+ColorlessGfx::
 	dw $04
 	INCBIN "gfx/titlescreen/energies/colorless.2bpp"
 
-LightningGfx:: ; a8d8e (2a:4d8e)
+LightningGfx::
 	dw $04
 	INCBIN "gfx/titlescreen/energies/lightning.2bpp"
 
-PsychicGfx:: ; a8dd0 (2a:4dd0)
+PsychicGfx::
 	dw $04
 	INCBIN "gfx/titlescreen/energies/psychic.2bpp"
 
-FightingGfx:: ; a8e12 (2a:4e12)
+FightingGfx::
 	dw $04
 	INCBIN "gfx/titlescreen/energies/fighting.2bpp"
 
@@ -1437,7 +1437,7 @@ SECTION "Anims 2", ROMX
 SECTION "Anims 3", ROMX
 	INCLUDE "data/duel/animations/anims3.asm"
 
-Palette31:: ; b3feb (2c:7feb)
+Palette31::
 	db 1, %11010010
 	db 1
 
@@ -1446,7 +1446,7 @@ Palette31:: ; b3feb (2c:7feb)
 	rgb 31, 24,  6
 	rgb 11,  3,  0
 
-Palette119:: ; b3ff6 (2c:7ff6)
+Palette119::
 	db 0
 	db 1
 
@@ -1466,89 +1466,89 @@ SECTION "Palettes2", ROMX
 
 SECTION "Card Gfx 1", ROMX
 
-CardGraphics:: ; c4000 (31:4000)
+CardGraphics::
 
-GrassEnergyCardGfx:: ; c4000 (31:4000)
+GrassEnergyCardGfx::
 	INCBIN "gfx/cards/grassenergy.2bpp"
 	INCBIN "gfx/cards/grassenergy.pal"
 
-FireEnergyCardGfx:: ; c4308 (31:4308)
+FireEnergyCardGfx::
 	INCBIN "gfx/cards/fireenergy.2bpp"
 	INCBIN "gfx/cards/fireenergy.pal"
 
-WaterEnergyCardGfx:: ; c4610 (31:4610)
+WaterEnergyCardGfx::
 	INCBIN "gfx/cards/waterenergy.2bpp"
 	INCBIN "gfx/cards/waterenergy.pal"
 
-LightningEnergyCardGfx:: ; c4918 (31:4918)
+LightningEnergyCardGfx::
 	INCBIN "gfx/cards/lightningenergy.2bpp"
 	INCBIN "gfx/cards/lightningenergy.pal"
 
-FightingEnergyCardGfx:: ; c4c20 (31:4c20)
+FightingEnergyCardGfx::
 	INCBIN "gfx/cards/fightingenergy.2bpp"
 	INCBIN "gfx/cards/fightingenergy.pal"
 
-PsychicEnergyCardGfx:: ; c4f28 (31:4f28)
+PsychicEnergyCardGfx::
 	INCBIN "gfx/cards/psychicenergy.2bpp"
 	INCBIN "gfx/cards/psychicenergy.pal"
 
-DoubleColorlessEnergyCardGfx:: ; c5230 (31:5230)
+DoubleColorlessEnergyCardGfx::
 	INCBIN "gfx/cards/doublecolorlessenergy.2bpp"
 	INCBIN "gfx/cards/doublecolorlessenergy.pal"
 
-BulbasaurCardGfx:: ; c5538 (31:5538)
+BulbasaurCardGfx::
 	INCBIN "gfx/cards/bulbasaur.2bpp"
 	INCBIN "gfx/cards/bulbasaur.pal"
 
-IvysaurCardGfx:: ; c5840 (31:5840)
+IvysaurCardGfx::
 	INCBIN "gfx/cards/ivysaur.2bpp"
 	INCBIN "gfx/cards/ivysaur.pal"
 
-Venusaur1CardGfx:: ; c5b48 (31:5b48)
+Venusaur1CardGfx::
 	INCBIN "gfx/cards/venusaur1.2bpp"
 	INCBIN "gfx/cards/venusaur1.pal"
 
-Venusaur2CardGfx:: ; c5e50 (31:5e50)
+Venusaur2CardGfx::
 	INCBIN "gfx/cards/venusaur2.2bpp"
 	INCBIN "gfx/cards/venusaur2.pal"
 
-CaterpieCardGfx:: ; c6158 (31:6158)
+CaterpieCardGfx::
 	INCBIN "gfx/cards/caterpie.2bpp"
 	INCBIN "gfx/cards/caterpie.pal"
 
-MetapodCardGfx:: ; c6460 (31:6460)
+MetapodCardGfx::
 	INCBIN "gfx/cards/metapod.2bpp"
 	INCBIN "gfx/cards/metapod.pal"
 
-ButterfreeCardGfx:: ; c6768 (31:6768)
+ButterfreeCardGfx::
 	INCBIN "gfx/cards/butterfree.2bpp"
 	INCBIN "gfx/cards/butterfree.pal"
 
-WeedleCardGfx:: ; c6a70 (31:6a70)
+WeedleCardGfx::
 	INCBIN "gfx/cards/weedle.2bpp"
 	INCBIN "gfx/cards/weedle.pal"
 
-KakunaCardGfx:: ; c6d78 (31:6d78)
+KakunaCardGfx::
 	INCBIN "gfx/cards/kakuna.2bpp"
 	INCBIN "gfx/cards/kakuna.pal"
 
-BeedrillCardGfx:: ; c7080 (31:7080)
+BeedrillCardGfx::
 	INCBIN "gfx/cards/beedrill.2bpp"
 	INCBIN "gfx/cards/beedrill.pal"
 
-EkansCardGfx:: ; c7388 (31:7388)
+EkansCardGfx::
 	INCBIN "gfx/cards/ekans.2bpp"
 	INCBIN "gfx/cards/ekans.pal"
 
-ArbokCardGfx:: ; c7690 (31:7690)
+ArbokCardGfx::
 	INCBIN "gfx/cards/arbok.2bpp"
 	INCBIN "gfx/cards/arbok.pal"
 
-NidoranFCardGfx:: ; c7998 (31:7998)
+NidoranFCardGfx::
 	INCBIN "gfx/cards/nidoranf.2bpp"
 	INCBIN "gfx/cards/nidoranf.pal"
 
-NidorinaCardGfx:: ; c7ca0 (31:7ca0)
+NidorinaCardGfx::
 	INCBIN "gfx/cards/nidorina.2bpp"
 	INCBIN "gfx/cards/nidorina.pal"
 
@@ -1556,87 +1556,87 @@ NidorinaCardGfx:: ; c7ca0 (31:7ca0)
 
 SECTION "Card Gfx 2", ROMX
 
-NidoqueenCardGfx:: ; c8000 (32:4000)
+NidoqueenCardGfx::
 	INCBIN "gfx/cards/nidoqueen.2bpp"
 	INCBIN "gfx/cards/nidoqueen.pal"
 
-NidoranMCardGfx:: ; c8308 (32:4308)
+NidoranMCardGfx::
 	INCBIN "gfx/cards/nidoranm.2bpp"
 	INCBIN "gfx/cards/nidoranm.pal"
 
-NidorinoCardGfx:: ; c8610 (32:4610)
+NidorinoCardGfx::
 	INCBIN "gfx/cards/nidorino.2bpp"
 	INCBIN "gfx/cards/nidorino.pal"
 
-NidokingCardGfx:: ; c8918 (32:4918)
+NidokingCardGfx::
 	INCBIN "gfx/cards/nidoking.2bpp"
 	INCBIN "gfx/cards/nidoking.pal"
 
-ZubatCardGfx:: ; c8c20 (32:4c20)
+ZubatCardGfx::
 	INCBIN "gfx/cards/zubat.2bpp"
 	INCBIN "gfx/cards/zubat.pal"
 
-GolbatCardGfx:: ; c8f28 (32:4f28)
+GolbatCardGfx::
 	INCBIN "gfx/cards/golbat.2bpp"
 	INCBIN "gfx/cards/golbat.pal"
 
-OddishCardGfx:: ; c9230 (32:5230)
+OddishCardGfx::
 	INCBIN "gfx/cards/oddish.2bpp"
 	INCBIN "gfx/cards/oddish.pal"
 
-GloomCardGfx:: ; c9538 (32:5538)
+GloomCardGfx::
 	INCBIN "gfx/cards/gloom.2bpp"
 	INCBIN "gfx/cards/gloom.pal"
 
-VileplumeCardGfx:: ; c9840 (32:5840)
+VileplumeCardGfx::
 	INCBIN "gfx/cards/vileplume.2bpp"
 	INCBIN "gfx/cards/vileplume.pal"
 
-ParasCardGfx:: ; c9b48 (32:5b48)
+ParasCardGfx::
 	INCBIN "gfx/cards/paras.2bpp"
 	INCBIN "gfx/cards/paras.pal"
 
-ParasectCardGfx:: ; c9e50 (32:5e50)
+ParasectCardGfx::
 	INCBIN "gfx/cards/parasect.2bpp"
 	INCBIN "gfx/cards/parasect.pal"
 
-VenonatCardGfx:: ; ca158 (32:6158)
+VenonatCardGfx::
 	INCBIN "gfx/cards/venonat.2bpp"
 	INCBIN "gfx/cards/venonat.pal"
 
-VenomothCardGfx:: ; ca460 (32:6460)
+VenomothCardGfx::
 	INCBIN "gfx/cards/venomoth.2bpp"
 	INCBIN "gfx/cards/venomoth.pal"
 
-BellsproutCardGfx:: ; ca768 (32:6768)
+BellsproutCardGfx::
 	INCBIN "gfx/cards/bellsprout.2bpp"
 	INCBIN "gfx/cards/bellsprout.pal"
 
-WeepinbellCardGfx:: ; caa70 (32:6a70)
+WeepinbellCardGfx::
 	INCBIN "gfx/cards/weepinbell.2bpp"
 	INCBIN "gfx/cards/weepinbell.pal"
 
-VictreebelCardGfx:: ; cad78 (32:6d78)
+VictreebelCardGfx::
 	INCBIN "gfx/cards/victreebel.2bpp"
 	INCBIN "gfx/cards/victreebel.pal"
 
-GrimerCardGfx:: ; cb080 (32:7080)
+GrimerCardGfx::
 	INCBIN "gfx/cards/grimer.2bpp"
 	INCBIN "gfx/cards/grimer.pal"
 
-MukCardGfx:: ; cb388 (32:7388)
+MukCardGfx::
 	INCBIN "gfx/cards/muk.2bpp"
 	INCBIN "gfx/cards/muk.pal"
 
-ExeggcuteCardGfx:: ; cb690 (32:7690)
+ExeggcuteCardGfx::
 	INCBIN "gfx/cards/exeggcute.2bpp"
 	INCBIN "gfx/cards/exeggcute.pal"
 
-ExeggutorCardGfx:: ; cb998 (32:7998)
+ExeggutorCardGfx::
 	INCBIN "gfx/cards/exeggutor.2bpp"
 	INCBIN "gfx/cards/exeggutor.pal"
 
-KoffingCardGfx:: ; cbca0 (32:7ca0)
+KoffingCardGfx::
 	INCBIN "gfx/cards/koffing.2bpp"
 	INCBIN "gfx/cards/koffing.pal"
 
@@ -1644,87 +1644,87 @@ KoffingCardGfx:: ; cbca0 (32:7ca0)
 
 SECTION "Card Gfx 3", ROMX
 
-WeezingCardGfx:: ; cc000 (33:4000)
+WeezingCardGfx::
 	INCBIN "gfx/cards/weezing.2bpp"
 	INCBIN "gfx/cards/weezing.pal"
 
-Tangela1CardGfx:: ; cc308 (33:4308)
+Tangela1CardGfx::
 	INCBIN "gfx/cards/tangela1.2bpp"
 	INCBIN "gfx/cards/tangela1.pal"
 
-Tangela2CardGfx:: ; cc610 (33:4610)
+Tangela2CardGfx::
 	INCBIN "gfx/cards/tangela2.2bpp"
 	INCBIN "gfx/cards/tangela2.pal"
 
-ScytherCardGfx:: ; cc918 (33:4918)
+ScytherCardGfx::
 	INCBIN "gfx/cards/scyther.2bpp"
 	INCBIN "gfx/cards/scyther.pal"
 
-PinsirCardGfx:: ; ccc20 (33:4c20)
+PinsirCardGfx::
 	INCBIN "gfx/cards/pinsir.2bpp"
 	INCBIN "gfx/cards/pinsir.pal"
 
-CharmanderCardGfx:: ; ccf28 (33:4f28)
+CharmanderCardGfx::
 	INCBIN "gfx/cards/charmander.2bpp"
 	INCBIN "gfx/cards/charmander.pal"
 
-CharmeleonCardGfx:: ; cd230 (33:5230)
+CharmeleonCardGfx::
 	INCBIN "gfx/cards/charmeleon.2bpp"
 	INCBIN "gfx/cards/charmeleon.pal"
 
-CharizardCardGfx:: ; cd538 (33:5538)
+CharizardCardGfx::
 	INCBIN "gfx/cards/charizard.2bpp"
 	INCBIN "gfx/cards/charizard.pal"
 
-VulpixCardGfx:: ; cd840 (33:5840)
+VulpixCardGfx::
 	INCBIN "gfx/cards/vulpix.2bpp"
 	INCBIN "gfx/cards/vulpix.pal"
 
-Ninetales1CardGfx:: ; cdb48 (33:5b48)
+Ninetales1CardGfx::
 	INCBIN "gfx/cards/ninetales1.2bpp"
 	INCBIN "gfx/cards/ninetales1.pal"
 
-Ninetales2CardGfx:: ; cde50 (33:5e50)
+Ninetales2CardGfx::
 	INCBIN "gfx/cards/ninetales2.2bpp"
 	INCBIN "gfx/cards/ninetales2.pal"
 
-GrowlitheCardGfx:: ; ce158 (33:6158)
+GrowlitheCardGfx::
 	INCBIN "gfx/cards/growlithe.2bpp"
 	INCBIN "gfx/cards/growlithe.pal"
 
-Arcanine1CardGfx:: ; ce460 (33:6460)
+Arcanine1CardGfx::
 	INCBIN "gfx/cards/arcanine1.2bpp"
 	INCBIN "gfx/cards/arcanine1.pal"
 
-Arcanine2CardGfx:: ; ce768 (33:6768)
+Arcanine2CardGfx::
 	INCBIN "gfx/cards/arcanine2.2bpp"
 	INCBIN "gfx/cards/arcanine2.pal"
 
-PonytaCardGfx:: ; cea70 (33:6a70)
+PonytaCardGfx::
 	INCBIN "gfx/cards/ponyta.2bpp"
 	INCBIN "gfx/cards/ponyta.pal"
 
-RapidashCardGfx:: ; ced78 (33:6d78)
+RapidashCardGfx::
 	INCBIN "gfx/cards/rapidash.2bpp"
 	INCBIN "gfx/cards/rapidash.pal"
 
-Magmar1CardGfx:: ; cf080 (33:7080)
+Magmar1CardGfx::
 	INCBIN "gfx/cards/magmar1.2bpp"
 	INCBIN "gfx/cards/magmar1.pal"
 
-Magmar2CardGfx:: ; cf388 (33:7388)
+Magmar2CardGfx::
 	INCBIN "gfx/cards/magmar2.2bpp"
 	INCBIN "gfx/cards/magmar2.pal"
 
-Flareon1CardGfx:: ; cf690 (33:7690)
+Flareon1CardGfx::
 	INCBIN "gfx/cards/flareon1.2bpp"
 	INCBIN "gfx/cards/flareon1.pal"
 
-Flareon2CardGfx:: ; cf998 (33:7998)
+Flareon2CardGfx::
 	INCBIN "gfx/cards/flareon2.2bpp"
 	INCBIN "gfx/cards/flareon2.pal"
 
-Moltres1CardGfx:: ; cfca0 (33:7ca0)
+Moltres1CardGfx::
 	INCBIN "gfx/cards/moltres1.2bpp"
 	INCBIN "gfx/cards/moltres1.pal"
 
@@ -1732,87 +1732,87 @@ Moltres1CardGfx:: ; cfca0 (33:7ca0)
 
 SECTION "Card Gfx 4", ROMX
 
-Moltres2CardGfx:: ; d0000 (34:4000)
+Moltres2CardGfx::
 	INCBIN "gfx/cards/moltres2.2bpp"
 	INCBIN "gfx/cards/moltres2.pal"
 
-SquirtleCardGfx:: ; d0308 (34:4308)
+SquirtleCardGfx::
 	INCBIN "gfx/cards/squirtle.2bpp"
 	INCBIN "gfx/cards/squirtle.pal"
 
-WartortleCardGfx:: ; d0610 (34:4610)
+WartortleCardGfx::
 	INCBIN "gfx/cards/wartortle.2bpp"
 	INCBIN "gfx/cards/wartortle.pal"
 
-BlastoiseCardGfx:: ; d0918 (34:4918)
+BlastoiseCardGfx::
 	INCBIN "gfx/cards/blastoise.2bpp"
 	INCBIN "gfx/cards/blastoise.pal"
 
-PsyduckCardGfx:: ; d0c20 (34:4c20)
+PsyduckCardGfx::
 	INCBIN "gfx/cards/psyduck.2bpp"
 	INCBIN "gfx/cards/psyduck.pal"
 
-GolduckCardGfx:: ; d0f28 (34:4f28)
+GolduckCardGfx::
 	INCBIN "gfx/cards/golduck.2bpp"
 	INCBIN "gfx/cards/golduck.pal"
 
-PoliwagCardGfx:: ; d1230 (34:5230)
+PoliwagCardGfx::
 	INCBIN "gfx/cards/poliwag.2bpp"
 	INCBIN "gfx/cards/poliwag.pal"
 
-PoliwhirlCardGfx:: ; d1538 (34:5538)
+PoliwhirlCardGfx::
 	INCBIN "gfx/cards/poliwhirl.2bpp"
 	INCBIN "gfx/cards/poliwhirl.pal"
 
-PoliwrathCardGfx:: ; d1840 (34:5840)
+PoliwrathCardGfx::
 	INCBIN "gfx/cards/poliwrath.2bpp"
 	INCBIN "gfx/cards/poliwrath.pal"
 
-TentacoolCardGfx:: ; d1b48 (34:5b48)
+TentacoolCardGfx::
 	INCBIN "gfx/cards/tentacool.2bpp"
 	INCBIN "gfx/cards/tentacool.pal"
 
-TentacruelCardGfx:: ; d1e50 (34:5e50)
+TentacruelCardGfx::
 	INCBIN "gfx/cards/tentacruel.2bpp"
 	INCBIN "gfx/cards/tentacruel.pal"
 
-SeelCardGfx:: ; d2158 (34:6158)
+SeelCardGfx::
 	INCBIN "gfx/cards/seel.2bpp"
 	INCBIN "gfx/cards/seel.pal"
 
-DewgongCardGfx:: ; d2460 (34:6460)
+DewgongCardGfx::
 	INCBIN "gfx/cards/dewgong.2bpp"
 	INCBIN "gfx/cards/dewgong.pal"
 
-ShellderCardGfx:: ; d2768 (34:6768)
+ShellderCardGfx::
 	INCBIN "gfx/cards/shellder.2bpp"
 	INCBIN "gfx/cards/shellder.pal"
 
-CloysterCardGfx:: ; d2a70 (34:6a70)
+CloysterCardGfx::
 	INCBIN "gfx/cards/cloyster.2bpp"
 	INCBIN "gfx/cards/cloyster.pal"
 
-KrabbyCardGfx:: ; d2d78 (34:6d78)
+KrabbyCardGfx::
 	INCBIN "gfx/cards/krabby.2bpp"
 	INCBIN "gfx/cards/krabby.pal"
 
-KinglerCardGfx:: ; d3080 (34:7080)
+KinglerCardGfx::
 	INCBIN "gfx/cards/kingler.2bpp"
 	INCBIN "gfx/cards/kingler.pal"
 
-HorseaCardGfx:: ; d3388 (34:7388)
+HorseaCardGfx::
 	INCBIN "gfx/cards/horsea.2bpp"
 	INCBIN "gfx/cards/horsea.pal"
 
-SeadraCardGfx:: ; d3690 (34:7690)
+SeadraCardGfx::
 	INCBIN "gfx/cards/seadra.2bpp"
 	INCBIN "gfx/cards/seadra.pal"
 
-GoldeenCardGfx:: ; d3998 (34:7998)
+GoldeenCardGfx::
 	INCBIN "gfx/cards/goldeen.2bpp"
 	INCBIN "gfx/cards/goldeen.pal"
 
-SeakingCardGfx:: ; d3ca0 (34:7ca0)
+SeakingCardGfx::
 	INCBIN "gfx/cards/seaking.2bpp"
 	INCBIN "gfx/cards/seaking.pal"
 
@@ -1820,87 +1820,87 @@ SeakingCardGfx:: ; d3ca0 (34:7ca0)
 
 SECTION "Card Gfx 5", ROMX
 
-StaryuCardGfx:: ; d4000 (35:4000)
+StaryuCardGfx::
 	INCBIN "gfx/cards/staryu.2bpp"
 	INCBIN "gfx/cards/staryu.pal"
 
-StarmieCardGfx:: ; d4308 (35:4308)
+StarmieCardGfx::
 	INCBIN "gfx/cards/starmie.2bpp"
 	INCBIN "gfx/cards/starmie.pal"
 
-MagikarpCardGfx:: ; d4610 (35:4610)
+MagikarpCardGfx::
 	INCBIN "gfx/cards/magikarp.2bpp"
 	INCBIN "gfx/cards/magikarp.pal"
 
-GyaradosCardGfx:: ; d4918 (35:4918)
+GyaradosCardGfx::
 	INCBIN "gfx/cards/gyarados.2bpp"
 	INCBIN "gfx/cards/gyarados.pal"
 
-LaprasCardGfx:: ; d4c20 (35:4c20)
+LaprasCardGfx::
 	INCBIN "gfx/cards/lapras.2bpp"
 	INCBIN "gfx/cards/lapras.pal"
 
-Vaporeon1CardGfx:: ; d4f28 (35:4f28)
+Vaporeon1CardGfx::
 	INCBIN "gfx/cards/vaporeon1.2bpp"
 	INCBIN "gfx/cards/vaporeon1.pal"
 
-Vaporeon2CardGfx:: ; d5230 (35:5230)
+Vaporeon2CardGfx::
 	INCBIN "gfx/cards/vaporeon2.2bpp"
 	INCBIN "gfx/cards/vaporeon2.pal"
 
-OmanyteCardGfx:: ; d5538 (35:5538)
+OmanyteCardGfx::
 	INCBIN "gfx/cards/omanyte.2bpp"
 	INCBIN "gfx/cards/omanyte.pal"
 
-OmastarCardGfx:: ; d5840 (35:5840)
+OmastarCardGfx::
 	INCBIN "gfx/cards/omastar.2bpp"
 	INCBIN "gfx/cards/omastar.pal"
 
-Articuno1CardGfx:: ; d5b48 (35:5b48)
+Articuno1CardGfx::
 	INCBIN "gfx/cards/articuno1.2bpp"
 	INCBIN "gfx/cards/articuno1.pal"
 
-Articuno2CardGfx:: ; d5e50 (35:5e50)
+Articuno2CardGfx::
 	INCBIN "gfx/cards/articuno2.2bpp"
 	INCBIN "gfx/cards/articuno2.pal"
 
-Pikachu1CardGfx:: ; d6158 (35:6158)
+Pikachu1CardGfx::
 	INCBIN "gfx/cards/pikachu1.2bpp"
 	INCBIN "gfx/cards/pikachu1.pal"
 
-Pikachu2CardGfx:: ; d6460 (35:6460)
+Pikachu2CardGfx::
 	INCBIN "gfx/cards/pikachu2.2bpp"
 	INCBIN "gfx/cards/pikachu2.pal"
 
-Pikachu3CardGfx:: ; d6768 (35:6768)
+Pikachu3CardGfx::
 	INCBIN "gfx/cards/pikachu3.2bpp"
 	INCBIN "gfx/cards/pikachu3.pal"
 
-Pikachu4CardGfx:: ; d6a70 (35:6a70)
+Pikachu4CardGfx::
 	INCBIN "gfx/cards/pikachu4.2bpp"
 	INCBIN "gfx/cards/pikachu4.pal"
 
-FlyingPikachuCardGfx:: ; d6d78 (35:6d78)
+FlyingPikachuCardGfx::
 	INCBIN "gfx/cards/flyingpikachu.2bpp"
 	INCBIN "gfx/cards/flyingpikachu.pal"
 
-SurfingPikachu1CardGfx:: ; d7080 (35:7080)
+SurfingPikachu1CardGfx::
 	INCBIN "gfx/cards/surfingpikachu1.2bpp"
 	INCBIN "gfx/cards/surfingpikachu1.pal"
 
-SurfingPikachu2CardGfx:: ; d7388 (35:7388)
+SurfingPikachu2CardGfx::
 	INCBIN "gfx/cards/surfingpikachu2.2bpp"
 	INCBIN "gfx/cards/surfingpikachu2.pal"
 
-Raichu1CardGfx:: ; d7690 (35:7690)
+Raichu1CardGfx::
 	INCBIN "gfx/cards/raichu1.2bpp"
 	INCBIN "gfx/cards/raichu1.pal"
 
-Raichu2CardGfx:: ; d7998 (35:7998)
+Raichu2CardGfx::
 	INCBIN "gfx/cards/raichu2.2bpp"
 	INCBIN "gfx/cards/raichu2.pal"
 
-Magnemite1CardGfx:: ; d7ca0 (35:7ca0)
+Magnemite1CardGfx::
 	INCBIN "gfx/cards/magnemite1.2bpp"
 	INCBIN "gfx/cards/magnemite1.pal"
 
@@ -1908,87 +1908,87 @@ Magnemite1CardGfx:: ; d7ca0 (35:7ca0)
 
 SECTION "Card Gfx 6", ROMX
 
-Magnemite2CardGfx:: ; d8000 (36:4000)
+Magnemite2CardGfx::
 	INCBIN "gfx/cards/magnemite2.2bpp"
 	INCBIN "gfx/cards/magnemite2.pal"
 
-Magneton1CardGfx:: ; d8308 (36:4308)
+Magneton1CardGfx::
 	INCBIN "gfx/cards/magneton1.2bpp"
 	INCBIN "gfx/cards/magneton1.pal"
 
-Magneton2CardGfx:: ; d8610 (36:4610)
+Magneton2CardGfx::
 	INCBIN "gfx/cards/magneton2.2bpp"
 	INCBIN "gfx/cards/magneton2.pal"
 
-VoltorbCardGfx:: ; d8918 (36:4918)
+VoltorbCardGfx::
 	INCBIN "gfx/cards/voltorb.2bpp"
 	INCBIN "gfx/cards/voltorb.pal"
 
-Electrode1CardGfx:: ; d8c20 (36:4c20)
+Electrode1CardGfx::
 	INCBIN "gfx/cards/electrode1.2bpp"
 	INCBIN "gfx/cards/electrode1.pal"
 
-Electrode2CardGfx:: ; d8f28 (36:4f28)
+Electrode2CardGfx::
 	INCBIN "gfx/cards/electrode2.2bpp"
 	INCBIN "gfx/cards/electrode2.pal"
 
-Electabuzz1CardGfx:: ; d9230 (36:5230)
+Electabuzz1CardGfx::
 	INCBIN "gfx/cards/electabuzz1.2bpp"
 	INCBIN "gfx/cards/electabuzz1.pal"
 
-Electabuzz2CardGfx:: ; d9538 (36:5538)
+Electabuzz2CardGfx::
 	INCBIN "gfx/cards/electabuzz2.2bpp"
 	INCBIN "gfx/cards/electabuzz2.pal"
 
-Jolteon1CardGfx:: ; d9840 (36:5840)
+Jolteon1CardGfx::
 	INCBIN "gfx/cards/jolteon1.2bpp"
 	INCBIN "gfx/cards/jolteon1.pal"
 
-Jolteon2CardGfx:: ; d9b48 (36:5b48)
+Jolteon2CardGfx::
 	INCBIN "gfx/cards/jolteon2.2bpp"
 	INCBIN "gfx/cards/jolteon2.pal"
 
-Zapdos1CardGfx:: ; d9e50 (36:5e50)
+Zapdos1CardGfx::
 	INCBIN "gfx/cards/zapdos1.2bpp"
 	INCBIN "gfx/cards/zapdos1.pal"
 
-Zapdos2CardGfx:: ; da158 (36:6158)
+Zapdos2CardGfx::
 	INCBIN "gfx/cards/zapdos2.2bpp"
 	INCBIN "gfx/cards/zapdos2.pal"
 
-Zapdos3CardGfx:: ; da460 (36:6460)
+Zapdos3CardGfx::
 	INCBIN "gfx/cards/zapdos3.2bpp"
 	INCBIN "gfx/cards/zapdos3.pal"
 
-SandshrewCardGfx:: ; da768 (36:6768)
+SandshrewCardGfx::
 	INCBIN "gfx/cards/sandshrew.2bpp"
 	INCBIN "gfx/cards/sandshrew.pal"
 
-SandslashCardGfx:: ; daa70 (36:6a70)
+SandslashCardGfx::
 	INCBIN "gfx/cards/sandslash.2bpp"
 	INCBIN "gfx/cards/sandslash.pal"
 
-DiglettCardGfx:: ; dad78 (36:6d78)
+DiglettCardGfx::
 	INCBIN "gfx/cards/diglett.2bpp"
 	INCBIN "gfx/cards/diglett.pal"
 
-DugtrioCardGfx:: ; db080 (36:7080)
+DugtrioCardGfx::
 	INCBIN "gfx/cards/dugtrio.2bpp"
 	INCBIN "gfx/cards/dugtrio.pal"
 
-MankeyCardGfx:: ; db388 (36:7388)
+MankeyCardGfx::
 	INCBIN "gfx/cards/mankey.2bpp"
 	INCBIN "gfx/cards/mankey.pal"
 
-PrimeapeCardGfx:: ; db690 (36:7690)
+PrimeapeCardGfx::
 	INCBIN "gfx/cards/primeape.2bpp"
 	INCBIN "gfx/cards/primeape.pal"
 
-MachopCardGfx:: ; db998 (36:7998)
+MachopCardGfx::
 	INCBIN "gfx/cards/machop.2bpp"
 	INCBIN "gfx/cards/machop.pal"
 
-MachokeCardGfx:: ; dbca0 (36:7ca0)
+MachokeCardGfx::
 	INCBIN "gfx/cards/machoke.2bpp"
 	INCBIN "gfx/cards/machoke.pal"
 
@@ -1996,87 +1996,87 @@ MachokeCardGfx:: ; dbca0 (36:7ca0)
 
 SECTION "Card Gfx 7", ROMX
 
-MachampCardGfx:: ; dc000 (37:4000)
+MachampCardGfx::
 	INCBIN "gfx/cards/machamp.2bpp"
 	INCBIN "gfx/cards/machamp.pal"
 
-GeodudeCardGfx:: ; dc308 (37:4308)
+GeodudeCardGfx::
 	INCBIN "gfx/cards/geodude.2bpp"
 	INCBIN "gfx/cards/geodude.pal"
 
-GravelerCardGfx:: ; dc610 (37:4610)
+GravelerCardGfx::
 	INCBIN "gfx/cards/graveler.2bpp"
 	INCBIN "gfx/cards/graveler.pal"
 
-GolemCardGfx:: ; dc918 (37:4918)
+GolemCardGfx::
 	INCBIN "gfx/cards/golem.2bpp"
 	INCBIN "gfx/cards/golem.pal"
 
-OnixCardGfx:: ; dcc20 (37:4c20)
+OnixCardGfx::
 	INCBIN "gfx/cards/onix.2bpp"
 	INCBIN "gfx/cards/onix.pal"
 
-CuboneCardGfx:: ; dcf28 (37:4f28)
+CuboneCardGfx::
 	INCBIN "gfx/cards/cubone.2bpp"
 	INCBIN "gfx/cards/cubone.pal"
 
-Marowak1CardGfx:: ; dd230 (37:5230)
+Marowak1CardGfx::
 	INCBIN "gfx/cards/marowak1.2bpp"
 	INCBIN "gfx/cards/marowak1.pal"
 
-Marowak2CardGfx:: ; dd538 (37:5538)
+Marowak2CardGfx::
 	INCBIN "gfx/cards/marowak2.2bpp"
 	INCBIN "gfx/cards/marowak2.pal"
 
-HitmonleeCardGfx:: ; dd840 (37:5840)
+HitmonleeCardGfx::
 	INCBIN "gfx/cards/hitmonlee.2bpp"
 	INCBIN "gfx/cards/hitmonlee.pal"
 
-HitmonchanCardGfx:: ; ddb48 (37:5b48)
+HitmonchanCardGfx::
 	INCBIN "gfx/cards/hitmonchan.2bpp"
 	INCBIN "gfx/cards/hitmonchan.pal"
 
-RhyhornCardGfx:: ; dde50 (37:5e50)
+RhyhornCardGfx::
 	INCBIN "gfx/cards/rhyhorn.2bpp"
 	INCBIN "gfx/cards/rhyhorn.pal"
 
-RhydonCardGfx:: ; de158 (37:6158)
+RhydonCardGfx::
 	INCBIN "gfx/cards/rhydon.2bpp"
 	INCBIN "gfx/cards/rhydon.pal"
 
-KabutoCardGfx:: ; de460 (37:6460)
+KabutoCardGfx::
 	INCBIN "gfx/cards/kabuto.2bpp"
 	INCBIN "gfx/cards/kabuto.pal"
 
-KabutopsCardGfx:: ; de768 (37:6768)
+KabutopsCardGfx::
 	INCBIN "gfx/cards/kabutops.2bpp"
 	INCBIN "gfx/cards/kabutops.pal"
 
-AerodactylCardGfx:: ; dea70 (37:6a70)
+AerodactylCardGfx::
 	INCBIN "gfx/cards/aerodactyl.2bpp"
 	INCBIN "gfx/cards/aerodactyl.pal"
 
-AbraCardGfx:: ; ded78 (37:6d78)
+AbraCardGfx::
 	INCBIN "gfx/cards/abra.2bpp"
 	INCBIN "gfx/cards/abra.pal"
 
-KadabraCardGfx:: ; df080 (37:7080)
+KadabraCardGfx::
 	INCBIN "gfx/cards/kadabra.2bpp"
 	INCBIN "gfx/cards/kadabra.pal"
 
-AlakazamCardGfx:: ; df388 (37:7388)
+AlakazamCardGfx::
 	INCBIN "gfx/cards/alakazam.2bpp"
 	INCBIN "gfx/cards/alakazam.pal"
 
-Slowpoke1CardGfx:: ; df690 (37:7690)
+Slowpoke1CardGfx::
 	INCBIN "gfx/cards/slowpoke1.2bpp"
 	INCBIN "gfx/cards/slowpoke1.pal"
 
-Slowpoke2CardGfx:: ; df998 (37:7998)
+Slowpoke2CardGfx::
 	INCBIN "gfx/cards/slowpoke2.2bpp"
 	INCBIN "gfx/cards/slowpoke2.pal"
 
-SlowbroCardGfx:: ; dfca0 (37:7ca0)
+SlowbroCardGfx::
 	INCBIN "gfx/cards/slowbro.2bpp"
 	INCBIN "gfx/cards/slowbro.pal"
 
@@ -2084,87 +2084,87 @@ SlowbroCardGfx:: ; dfca0 (37:7ca0)
 
 SECTION "Card Gfx 8", ROMX
 
-Gastly1CardGfx:: ; e0000 (38:4000)
+Gastly1CardGfx::
 	INCBIN "gfx/cards/gastly1.2bpp"
 	INCBIN "gfx/cards/gastly1.pal"
 
-Gastly2CardGfx:: ; e0308 (38:4308)
+Gastly2CardGfx::
 	INCBIN "gfx/cards/gastly2.2bpp"
 	INCBIN "gfx/cards/gastly2.pal"
 
-Haunter1CardGfx:: ; e0610 (38:4610)
+Haunter1CardGfx::
 	INCBIN "gfx/cards/haunter1.2bpp"
 	INCBIN "gfx/cards/haunter1.pal"
 
-Haunter2CardGfx:: ; e0918 (38:4918)
+Haunter2CardGfx::
 	INCBIN "gfx/cards/haunter2.2bpp"
 	INCBIN "gfx/cards/haunter2.pal"
 
-GengarCardGfx:: ; e0c20 (38:4c20)
+GengarCardGfx::
 	INCBIN "gfx/cards/gengar.2bpp"
 	INCBIN "gfx/cards/gengar.pal"
 
-DrowzeeCardGfx:: ; e0f28 (38:4f28)
+DrowzeeCardGfx::
 	INCBIN "gfx/cards/drowzee.2bpp"
 	INCBIN "gfx/cards/drowzee.pal"
 
-HypnoCardGfx:: ; e1230 (38:5230)
+HypnoCardGfx::
 	INCBIN "gfx/cards/hypno.2bpp"
 	INCBIN "gfx/cards/hypno.pal"
 
-MrMimeCardGfx:: ; e1538 (38:5538)
+MrMimeCardGfx::
 	INCBIN "gfx/cards/mrmime.2bpp"
 	INCBIN "gfx/cards/mrmime.pal"
 
-JynxCardGfx:: ; e1840 (38:5840)
+JynxCardGfx::
 	INCBIN "gfx/cards/jynx.2bpp"
 	INCBIN "gfx/cards/jynx.pal"
 
-Mewtwo1CardGfx:: ; e1b48 (38:5b48)
+Mewtwo1CardGfx::
 	INCBIN "gfx/cards/mewtwo1.2bpp"
 	INCBIN "gfx/cards/mewtwo1.pal"
 
-Mewtwo2CardGfx:: ; e1e50 (38:5e50)
+Mewtwo2CardGfx::
 	INCBIN "gfx/cards/mewtwo2.2bpp"
 	INCBIN "gfx/cards/mewtwo2.pal"
 
-Mewtwo3CardGfx:: ; e2158 (38:6158)
+Mewtwo3CardGfx::
 	INCBIN "gfx/cards/mewtwo3.2bpp"
 	INCBIN "gfx/cards/mewtwo3.pal"
 
-Mew1CardGfx:: ; e2460 (38:6460)
+Mew1CardGfx::
 	INCBIN "gfx/cards/mew1.2bpp"
 	INCBIN "gfx/cards/mew1.pal"
 
-Mew2CardGfx:: ; e2768 (38:6768)
+Mew2CardGfx::
 	INCBIN "gfx/cards/mew2.2bpp"
 	INCBIN "gfx/cards/mew2.pal"
 
-Mew3CardGfx:: ; e2a70 (38:6a70)
+Mew3CardGfx::
 	INCBIN "gfx/cards/mew3.2bpp"
 	INCBIN "gfx/cards/mew3.pal"
 
-PidgeyCardGfx:: ; e2d78 (38:6d78)
+PidgeyCardGfx::
 	INCBIN "gfx/cards/pidgey.2bpp"
 	INCBIN "gfx/cards/pidgey.pal"
 
-PidgeottoCardGfx:: ; e3080 (38:7080)
+PidgeottoCardGfx::
 	INCBIN "gfx/cards/pidgeotto.2bpp"
 	INCBIN "gfx/cards/pidgeotto.pal"
 
-Pidgeot1CardGfx:: ; e3388 (38:7388)
+Pidgeot1CardGfx::
 	INCBIN "gfx/cards/pidgeot1.2bpp"
 	INCBIN "gfx/cards/pidgeot1.pal"
 
-Pidgeot2CardGfx:: ; e3690 (38:7690)
+Pidgeot2CardGfx::
 	INCBIN "gfx/cards/pidgeot2.2bpp"
 	INCBIN "gfx/cards/pidgeot2.pal"
 
-RattataCardGfx:: ; e3998 (38:7998)
+RattataCardGfx::
 	INCBIN "gfx/cards/rattata.2bpp"
 	INCBIN "gfx/cards/rattata.pal"
 
-RaticateCardGfx:: ; e3ca0 (38:7ca0)
+RaticateCardGfx::
 	INCBIN "gfx/cards/raticate.2bpp"
 	INCBIN "gfx/cards/raticate.pal"
 
@@ -2172,87 +2172,87 @@ RaticateCardGfx:: ; e3ca0 (38:7ca0)
 
 SECTION "Card Gfx 9", ROMX
 
-SpearowCardGfx:: ; e4000 (39:4000)
+SpearowCardGfx::
 	INCBIN "gfx/cards/spearow.2bpp"
 	INCBIN "gfx/cards/spearow.pal"
 
-FearowCardGfx:: ; e4308 (39:4308)
+FearowCardGfx::
 	INCBIN "gfx/cards/fearow.2bpp"
 	INCBIN "gfx/cards/fearow.pal"
 
-ClefairyCardGfx:: ; e4610 (39:4610)
+ClefairyCardGfx::
 	INCBIN "gfx/cards/clefairy.2bpp"
 	INCBIN "gfx/cards/clefairy.pal"
 
-ClefableCardGfx:: ; e4918 (39:4918)
+ClefableCardGfx::
 	INCBIN "gfx/cards/clefable.2bpp"
 	INCBIN "gfx/cards/clefable.pal"
 
-Jigglypuff1CardGfx:: ; e4c20 (39:4c20)
+Jigglypuff1CardGfx::
 	INCBIN "gfx/cards/jigglypuff1.2bpp"
 	INCBIN "gfx/cards/jigglypuff1.pal"
 
-Jigglypuff2CardGfx:: ; e4f28 (39:4f28)
+Jigglypuff2CardGfx::
 	INCBIN "gfx/cards/jigglypuff2.2bpp"
 	INCBIN "gfx/cards/jigglypuff2.pal"
 
-Jigglypuff3CardGfx:: ; e5230 (39:5230)
+Jigglypuff3CardGfx::
 	INCBIN "gfx/cards/jigglypuff3.2bpp"
 	INCBIN "gfx/cards/jigglypuff3.pal"
 
-WigglytuffCardGfx:: ; e5538 (39:5538)
+WigglytuffCardGfx::
 	INCBIN "gfx/cards/wigglytuff.2bpp"
 	INCBIN "gfx/cards/wigglytuff.pal"
 
-Meowth1CardGfx:: ; e5840 (39:5840)
+Meowth1CardGfx::
 	INCBIN "gfx/cards/meowth1.2bpp"
 	INCBIN "gfx/cards/meowth1.pal"
 
-Meowth2CardGfx:: ; e5b48 (39:5b48)
+Meowth2CardGfx::
 	INCBIN "gfx/cards/meowth2.2bpp"
 	INCBIN "gfx/cards/meowth2.pal"
 
-PersianCardGfx:: ; e5e50 (39:5e50)
+PersianCardGfx::
 	INCBIN "gfx/cards/persian.2bpp"
 	INCBIN "gfx/cards/persian.pal"
 
-FarfetchdCardGfx:: ; e6158 (39:6158)
+FarfetchdCardGfx::
 	INCBIN "gfx/cards/farfetchd.2bpp"
 	INCBIN "gfx/cards/farfetchd.pal"
 
-DoduoCardGfx:: ; e6460 (39:6460)
+DoduoCardGfx::
 	INCBIN "gfx/cards/doduo.2bpp"
 	INCBIN "gfx/cards/doduo.pal"
 
-DodrioCardGfx:: ; e6768 (39:6768)
+DodrioCardGfx::
 	INCBIN "gfx/cards/dodrio.2bpp"
 	INCBIN "gfx/cards/dodrio.pal"
 
-LickitungCardGfx:: ; e6a70 (39:6a70)
+LickitungCardGfx::
 	INCBIN "gfx/cards/lickitung.2bpp"
 	INCBIN "gfx/cards/lickitung.pal"
 
-ChanseyCardGfx:: ; e6d78 (39:6d78)
+ChanseyCardGfx::
 	INCBIN "gfx/cards/chansey.2bpp"
 	INCBIN "gfx/cards/chansey.pal"
 
-KangaskhanCardGfx:: ; e7080 (39:7080)
+KangaskhanCardGfx::
 	INCBIN "gfx/cards/kangaskhan.2bpp"
 	INCBIN "gfx/cards/kangaskhan.pal"
 
-TaurosCardGfx:: ; e7388 (39:7388)
+TaurosCardGfx::
 	INCBIN "gfx/cards/tauros.2bpp"
 	INCBIN "gfx/cards/tauros.pal"
 
-DittoCardGfx:: ; e7690 (39:7690)
+DittoCardGfx::
 	INCBIN "gfx/cards/ditto.2bpp"
 	INCBIN "gfx/cards/ditto.pal"
 
-EeveeCardGfx:: ; e7998 (39:7998)
+EeveeCardGfx::
 	INCBIN "gfx/cards/eevee.2bpp"
 	INCBIN "gfx/cards/eevee.pal"
 
-PorygonCardGfx:: ; e7ca0 (39:7ca0)
+PorygonCardGfx::
 	INCBIN "gfx/cards/porygon.2bpp"
 	INCBIN "gfx/cards/porygon.pal"
 
@@ -2260,87 +2260,87 @@ PorygonCardGfx:: ; e7ca0 (39:7ca0)
 
 SECTION "Card Gfx 10", ROMX
 
-SnorlaxCardGfx:: ; e8000 (3a:4000)
+SnorlaxCardGfx::
 	INCBIN "gfx/cards/snorlax.2bpp"
 	INCBIN "gfx/cards/snorlax.pal"
 
-DratiniCardGfx:: ; e8308 (3a:4308)
+DratiniCardGfx::
 	INCBIN "gfx/cards/dratini.2bpp"
 	INCBIN "gfx/cards/dratini.pal"
 
-DragonairCardGfx:: ; e8610 (3a:4610)
+DragonairCardGfx::
 	INCBIN "gfx/cards/dragonair.2bpp"
 	INCBIN "gfx/cards/dragonair.pal"
 
-Dragonite1CardGfx:: ; e8918 (3a:4918)
+Dragonite1CardGfx::
 	INCBIN "gfx/cards/dragonite1.2bpp"
 	INCBIN "gfx/cards/dragonite1.pal"
 
-Dragonite2CardGfx:: ; e8c20 (3a:4c20)
+Dragonite2CardGfx::
 	INCBIN "gfx/cards/dragonite2.2bpp"
 	INCBIN "gfx/cards/dragonite2.pal"
 
-ProfessorOakCardGfx:: ; e8f28 (3a:4f28)
+ProfessorOakCardGfx::
 	INCBIN "gfx/cards/professoroak.2bpp"
 	INCBIN "gfx/cards/professoroak.pal"
 
-ImposterProfessorOakCardGfx:: ; e9230 (3a:5230)
+ImposterProfessorOakCardGfx::
 	INCBIN "gfx/cards/imposterprofessoroak.2bpp"
 	INCBIN "gfx/cards/imposterprofessoroak.pal"
 
-BillCardGfx:: ; e9538 (3a:5538)
+BillCardGfx::
 	INCBIN "gfx/cards/bill.2bpp"
 	INCBIN "gfx/cards/bill.pal"
 
-MrFujiCardGfx:: ; e9840 (3a:5840)
+MrFujiCardGfx::
 	INCBIN "gfx/cards/mrfuji.2bpp"
 	INCBIN "gfx/cards/mrfuji.pal"
 
-LassCardGfx:: ; e9b48 (3a:5b48)
+LassCardGfx::
 	INCBIN "gfx/cards/lass.2bpp"
 	INCBIN "gfx/cards/lass.pal"
 
-ImakuniCardGfx:: ; e9e50 (3a:5e50)
+ImakuniCardGfx::
 	INCBIN "gfx/cards/imakuni.2bpp"
 	INCBIN "gfx/cards/imakuni.pal"
 
-PokemonTraderCardGfx:: ; ea158 (3a:6158)
+PokemonTraderCardGfx::
 	INCBIN "gfx/cards/pokemontrader.2bpp"
 	INCBIN "gfx/cards/pokemontrader.pal"
 
-PokemonBreederCardGfx:: ; ea460 (3a:6460)
+PokemonBreederCardGfx::
 	INCBIN "gfx/cards/pokemonbreeder.2bpp"
 	INCBIN "gfx/cards/pokemonbreeder.pal"
 
-ClefairyDollCardGfx:: ; ea768 (3a:6768)
+ClefairyDollCardGfx::
 	INCBIN "gfx/cards/clefairydoll.2bpp"
 	INCBIN "gfx/cards/clefairydoll.pal"
 
-MysteriousFossilCardGfx:: ; eaa70 (3a:6a70)
+MysteriousFossilCardGfx::
 	INCBIN "gfx/cards/mysteriousfossil.2bpp"
 	INCBIN "gfx/cards/mysteriousfossil.pal"
 
-EnergyRetrievalCardGfx:: ; ead78 (3a:6d78)
+EnergyRetrievalCardGfx::
 	INCBIN "gfx/cards/energyretrieval.2bpp"
 	INCBIN "gfx/cards/energyretrieval.pal"
 
-SuperEnergyRetrievalCardGfx:: ; eb080 (3a:7080)
+SuperEnergyRetrievalCardGfx::
 	INCBIN "gfx/cards/superenergyretrieval.2bpp"
 	INCBIN "gfx/cards/superenergyretrieval.pal"
 
-EnergySearchCardGfx:: ; eb388 (3a:7388)
+EnergySearchCardGfx::
 	INCBIN "gfx/cards/energysearch.2bpp"
 	INCBIN "gfx/cards/energysearch.pal"
 
-EnergyRemovalCardGfx:: ; eb690 (3a:7690)
+EnergyRemovalCardGfx::
 	INCBIN "gfx/cards/energyremoval.2bpp"
 	INCBIN "gfx/cards/energyremoval.pal"
 
-SuperEnergyRemovalCardGfx:: ; eb998 (3a:7998)
+SuperEnergyRemovalCardGfx::
 	INCBIN "gfx/cards/superenergyremoval.2bpp"
 	INCBIN "gfx/cards/superenergyremoval.pal"
 
-SwitchCardGfx:: ; ebca0 (3a:7ca0)
+SwitchCardGfx::
 	INCBIN "gfx/cards/switch.2bpp"
 	INCBIN "gfx/cards/switch.pal"
 
@@ -2348,74 +2348,74 @@ SwitchCardGfx:: ; ebca0 (3a:7ca0)
 
 SECTION "Card Gfx 11", ROMX
 
-PokemonCenterCardGfx:: ; ec000 (3b:4000)
+PokemonCenterCardGfx::
 	INCBIN "gfx/cards/pokemoncenter.2bpp"
 	INCBIN "gfx/cards/pokemoncenter.pal"
 
-PokeBallCardGfx:: ; ec308 (3b:4308)
+PokeBallCardGfx::
 	INCBIN "gfx/cards/pokeball.2bpp"
 	INCBIN "gfx/cards/pokeball.pal"
 
-ScoopUpCardGfx:: ; ec610 (3b:4610)
+ScoopUpCardGfx::
 	INCBIN "gfx/cards/scoopup.2bpp"
 	INCBIN "gfx/cards/scoopup.pal"
 
-ComputerSearchCardGfx:: ; ec918 (3b:4918)
+ComputerSearchCardGfx::
 	INCBIN "gfx/cards/computersearch.2bpp"
 	INCBIN "gfx/cards/computersearch.pal"
 
-PokedexCardGfx:: ; ecc20 (3b:4c20)
+PokedexCardGfx::
 	INCBIN "gfx/cards/pokedex.2bpp"
 	INCBIN "gfx/cards/pokedex.pal"
 
-PlusPowerCardGfx:: ; ecf28 (3b:4f28)
+PlusPowerCardGfx::
 	INCBIN "gfx/cards/pluspower.2bpp"
 	INCBIN "gfx/cards/pluspower.pal"
 
-DefenderCardGfx:: ; ed230 (3b:5230)
+DefenderCardGfx::
 	INCBIN "gfx/cards/defender.2bpp"
 	INCBIN "gfx/cards/defender.pal"
 
-ItemFinderCardGfx:: ; ed538 (3b:5538)
+ItemFinderCardGfx::
 	INCBIN "gfx/cards/itemfinder.2bpp"
 	INCBIN "gfx/cards/itemfinder.pal"
 
-GustOfWindCardGfx:: ; ed840 (3b:5840)
+GustOfWindCardGfx::
 	INCBIN "gfx/cards/gustofwind.2bpp"
 	INCBIN "gfx/cards/gustofwind.pal"
 
-DevolutionSprayCardGfx:: ; edb48 (3b:5b48)
+DevolutionSprayCardGfx::
 	INCBIN "gfx/cards/devolutionspray.2bpp"
 	INCBIN "gfx/cards/devolutionspray.pal"
 
-PotionCardGfx:: ; ede50 (3b:5e50)
+PotionCardGfx::
 	INCBIN "gfx/cards/potion.2bpp"
 	INCBIN "gfx/cards/potion.pal"
 
-SuperPotionCardGfx:: ; ee158 (3b:6158)
+SuperPotionCardGfx::
 	INCBIN "gfx/cards/superpotion.2bpp"
 	INCBIN "gfx/cards/superpotion.pal"
 
-FullHealCardGfx:: ; ee460 (3b:6460)
+FullHealCardGfx::
 	INCBIN "gfx/cards/fullheal.2bpp"
 	INCBIN "gfx/cards/fullheal.pal"
 
-ReviveCardGfx:: ; ee768 (3b:6768)
+ReviveCardGfx::
 	INCBIN "gfx/cards/revive.2bpp"
 	INCBIN "gfx/cards/revive.pal"
 
-MaintenanceCardGfx:: ; eea70 (3b:6a70)
+MaintenanceCardGfx::
 	INCBIN "gfx/cards/maintenance.2bpp"
 	INCBIN "gfx/cards/maintenance.pal"
 
-PokemonFluteCardGfx:: ; eed78 (3b:6d78)
+PokemonFluteCardGfx::
 	INCBIN "gfx/cards/pokemonflute.2bpp"
 	INCBIN "gfx/cards/pokemonflute.pal"
 
-GamblerCardGfx:: ; ef080 (3b:7080)
+GamblerCardGfx::
 	INCBIN "gfx/cards/gambler.2bpp"
 	INCBIN "gfx/cards/gambler.pal"
 
-RecycleCardGfx:: ; ef388 (3b:7388)
+RecycleCardGfx::
 	INCBIN "gfx/cards/recycle.2bpp"
 	INCBIN "gfx/cards/recycle.pal"
diff --git a/src/layout.link b/src/layout.link
index 40cf56c..46ef66d 100644
--- a/src/layout.link
+++ b/src/layout.link
@@ -105,6 +105,7 @@ ROMX $1e
 	"Gfx 2"
 ROMX $20
 	"Bank 20"
+	"Gfx"
 ROMX $21
 	"Gfx 3"
 ROMX $22
diff --git a/src/main.asm b/src/main.asm
index f759ba1..b08bb10 100644
--- a/src/main.asm
+++ b/src/main.asm
@@ -118,3 +118,12 @@ INCLUDE "engine/bank1c.asm"
 
 SECTION "Bank 20", ROMX
 INCLUDE "engine/bank20.asm"
+
+SECTION "Gfx", ROMX
+INCLUDE "engine/gfx/gfx_table_pointers.asm"
+INCLUDE "engine/gfx/tilemaps.asm"
+INCLUDE "engine/gfx/tilesets.asm"
+INCLUDE "engine/gfx/sprites.asm"
+INCLUDE "engine/gfx/sprite_animations.asm"
+INCLUDE "engine/gfx/palettes.asm"
+INCLUDE "data/maps/tilemaps.asm"