From 2d9d4e536f7354bf2b584e11003cdaf46f4d0ad6 Mon Sep 17 00:00:00 2001
From: ElectroDeoxys <ElectroDeoxys@gmail.com>
Date: Wed, 3 Feb 2021 14:58:11 +0000
Subject: Create palette constants and separate animations into own file

---
 src/constants.asm                   |   1 +
 src/constants/palette_constants.asm | 162 ++++++++
 src/data/duel_animations.asm        | 778 +++++++++++++++++++++++++++++++++++
 src/engine/bank07.asm               | 779 +-----------------------------------
 src/engine/bank20.asm               | 322 +++++++--------
 5 files changed, 1103 insertions(+), 939 deletions(-)
 create mode 100644 src/constants/palette_constants.asm
 create mode 100644 src/data/duel_animations.asm

diff --git a/src/constants.asm b/src/constants.asm
index cd56fe2..c63175b 100644
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -12,6 +12,7 @@ INCLUDE "constants/misc_constants.asm"
 INCLUDE "constants/music_constants.asm"
 INCLUDE "constants/name_constants.asm"
 INCLUDE "constants/npc_constants.asm"
+INCLUDE "constants/palette_constants.asm"
 INCLUDE "constants/script_constants.asm"
 INCLUDE "constants/sgb_constants.asm"
 INCLUDE "constants/sfx_constants.asm"
diff --git a/src/constants/palette_constants.asm b/src/constants/palette_constants.asm
new file mode 100644
index 0000000..552885e
--- /dev/null
+++ b/src/constants/palette_constants.asm
@@ -0,0 +1,162 @@
+	const_def
+	const PALETTE_0                 ; $00
+	const PALETTE_1                 ; $01
+	const PALETTE_2                 ; $02
+	const PALETTE_3                 ; $03
+	const PALETTE_4                 ; $04
+	const PALETTE_5                 ; $05
+	const PALETTE_6                 ; $06
+	const PALETTE_7                 ; $07
+	const PALETTE_8                 ; $08
+	const PALETTE_9                 ; $09
+	const PALETTE_10                ; $0a
+	const PALETTE_11                ; $0b
+	const PALETTE_12                ; $0c
+	const PALETTE_13                ; $0d
+	const PALETTE_14                ; $0e
+	const PALETTE_15                ; $0f
+	const PALETTE_16                ; $10
+	const PALETTE_17                ; $11
+	const PALETTE_18                ; $12
+	const PALETTE_19                ; $13
+	const PALETTE_20                ; $14
+	const PALETTE_21                ; $15
+	const PALETTE_22                ; $16
+	const PALETTE_23                ; $17
+	const PALETTE_24                ; $18
+	const PALETTE_25                ; $19
+	const PALETTE_26                ; $1a
+	const PALETTE_27                ; $1b
+	const PALETTE_28                ; $1c
+	const PALETTE_29                ; $1d
+	const PALETTE_30                ; $1e
+	const PALETTE_31                ; $1f
+	const PALETTE_32                ; $20
+	const PALETTE_33                ; $21
+	const PALETTE_34                ; $22
+	const PALETTE_35                ; $23
+	const PALETTE_36                ; $24
+	const PALETTE_37                ; $25
+	const PALETTE_38                ; $26
+	const PALETTE_39                ; $27
+	const PALETTE_40                ; $28
+	const PALETTE_41                ; $29
+	const PALETTE_42                ; $2a
+	const PALETTE_43                ; $2b
+	const PALETTE_44                ; $2c
+	const PALETTE_45                ; $2d
+	const PALETTE_46                ; $2e
+	const PALETTE_47                ; $2f
+	const PALETTE_48                ; $30
+	const PALETTE_49                ; $31
+	const PALETTE_50                ; $32
+	const PALETTE_51                ; $33
+	const PALETTE_52                ; $34
+	const PALETTE_53                ; $35
+	const PALETTE_54                ; $36
+	const PALETTE_55                ; $37
+	const PALETTE_56                ; $38
+	const PALETTE_57                ; $39
+	const PALETTE_58                ; $3a
+	const PALETTE_59                ; $3b
+	const PALETTE_60                ; $3c
+	const PALETTE_61                ; $3d
+	const PALETTE_62                ; $3e
+	const PALETTE_63                ; $3f
+	const PALETTE_64                ; $40
+	const PALETTE_65                ; $41
+	const PALETTE_66                ; $42
+	const PALETTE_67                ; $43
+	const PALETTE_68                ; $44
+	const PALETTE_69                ; $45
+	const PALETTE_70                ; $46
+	const PALETTE_71                ; $47
+	const PALETTE_72                ; $48
+	const PALETTE_73                ; $49
+	const PALETTE_74                ; $4a
+	const PALETTE_75                ; $4b
+	const PALETTE_76                ; $4c
+	const PALETTE_77                ; $4d
+	const PALETTE_78                ; $4e
+	const PALETTE_79                ; $4f
+	const PALETTE_80                ; $50
+	const PALETTE_81                ; $51
+	const PALETTE_82                ; $52
+	const PALETTE_83                ; $53
+	const PALETTE_84                ; $54
+	const PALETTE_85                ; $55
+	const PALETTE_86                ; $56
+	const PALETTE_87                ; $57
+	const PALETTE_88                ; $58
+	const PALETTE_89                ; $59
+	const PALETTE_90                ; $a5
+	const PALETTE_91                ; $5b
+	const PALETTE_92                ; $5c
+	const PALETTE_93                ; $5d
+	const PALETTE_94                ; $5e
+	const PALETTE_95                ; $5f
+	const PALETTE_96                ; $60
+	const PALETTE_97                ; $61
+	const PALETTE_98                ; $62
+	const PALETTE_99                ; $63
+	const PALETTE_100               ; $64
+	const PALETTE_101               ; $65
+	const PALETTE_102               ; $66
+	const PALETTE_103               ; $67
+	const PALETTE_104               ; $68
+	const PALETTE_105               ; $69
+	const PALETTE_106               ; $6a
+	const PALETTE_107               ; $6b
+	const PALETTE_108               ; $6c
+	const PALETTE_109               ; $6d
+	const PALETTE_110               ; $6e
+	const PALETTE_111               ; $6f
+	const PALETTE_112               ; $70
+	const PALETTE_113               ; $71
+	const PALETTE_114               ; $72
+	const PALETTE_115               ; $73
+	const PALETTE_116               ; $74
+	const PALETTE_117               ; $75
+	const PALETTE_118               ; $76
+	const PALETTE_119               ; $77
+	const PALETTE_120               ; $78
+	const PALETTE_121               ; $79
+	const PALETTE_122               ; $7a
+	const PALETTE_123               ; $7b
+	const PALETTE_124               ; $7c
+	const PALETTE_125               ; $7d
+	const PALETTE_126               ; $7e
+	const PALETTE_127               ; $7f
+	const PALETTE_128               ; $80
+	const PALETTE_129               ; $81
+	const PALETTE_130               ; $82
+	const PALETTE_131               ; $83
+	const PALETTE_132               ; $84
+	const PALETTE_133               ; $85
+	const PALETTE_134               ; $86
+	const PALETTE_135               ; $87
+	const PALETTE_136               ; $88
+	const PALETTE_137               ; $89
+	const PALETTE_138               ; $8a
+	const PALETTE_139               ; $8b
+	const PALETTE_140               ; $8c
+	const PALETTE_141               ; $8d
+	const PALETTE_142               ; $8e
+	const PALETTE_143               ; $8f
+	const PALETTE_144               ; $90
+	const PALETTE_145               ; $91
+	const PALETTE_146               ; $92
+	const PALETTE_147               ; $93
+	const PALETTE_148               ; $94
+	const PALETTE_149               ; $95
+	const PALETTE_150               ; $96
+	const PALETTE_151               ; $97
+	const PALETTE_152               ; $98
+	const PALETTE_153               ; $99
+	const PALETTE_154               ; $9a
+	const PALETTE_155               ; $9b
+	const PALETTE_156               ; $9c
+	const PALETTE_157               ; $9d
+	const PALETTE_158               ; $9e
+	const PALETTE_159               ; $9f
+	const PALETTE_160               ; $a0
diff --git a/src/data/duel_animations.asm b/src/data/duel_animations.asm
new file mode 100644
index 0000000..49ed364
--- /dev/null
+++ b/src/data/duel_animations.asm
@@ -0,0 +1,778 @@
+; data for each animation ID (see src/constants/sprite_constants.asm)
+Animations: ; 1ce32 (7:4e32)
+	; DUEL_ANIM_NONE
+	db $00 ; sprite ID
+	db $00 ; palette ID
+	db $00 ; anim ID
+	db $00 ; anim flags
+	db $00 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_GLOW
+	db SPRITE_DUEL_GLOW ; sprite ID
+	db PALETTE_31 ; palette ID
+	db $47 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db SFX_11 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_PARALYSIS
+	db SPRITE_DUEL_1 ; sprite ID
+	db PALETTE_32 ; palette ID
+	db $48 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db SFX_12 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_SLEEP
+	db SPRITE_DUEL_2 ; sprite ID
+	db PALETTE_33 ; palette ID
+	db $49 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db SFX_13 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_CONFUSION
+	db SPRITE_DUEL_55 ; sprite ID
+	db PALETTE_34 ; palette ID
+	db $4a ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db SFX_14 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_POISON
+	db SPRITE_DUEL_58 ; sprite ID
+	db PALETTE_35 ; palette ID
+	db $4b ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db SFX_15 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_6
+	db SPRITE_DUEL_3 ; sprite ID
+	db PALETTE_36 ; palette ID
+	db $4c ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db SFX_16 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_HIT
+	db SPRITE_DUEL_3 ; sprite ID
+	db PALETTE_36 ; palette ID
+	db $4d ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db SFX_16 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BIG_HIT
+	db SPRITE_DUEL_3 ; sprite ID
+	db PALETTE_36 ; palette ID
+	db $4e ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db SFX_17 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_SHOW_DAMAGE
+	db SPRITE_DUEL_4 ; sprite ID
+	db PALETTE_37 ; palette ID
+	db $00 ; anim ID
+	db $00 ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_THUNDER_SHOCK
+	db SPRITE_DUEL_5 ; sprite ID
+	db PALETTE_38 ; palette ID
+	db $5c ; anim ID
+	db $00 ; anim flags
+	db SFX_18 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_LIGHTNING
+	db SPRITE_DUEL_6 ; sprite ID
+	db PALETTE_39 ; palette ID
+	db $5e ; anim ID
+	db $00 ; anim flags
+	db SFX_19 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BORDER_SPARK
+	db SPRITE_DUEL_59 ; sprite ID
+	db PALETTE_40 ; palette ID
+	db $5f ; anim ID
+	db $00 ; anim flags
+	db SFX_1A ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BIG_LIGHTNING
+	db SPRITE_DUEL_7 ; sprite ID
+	db PALETTE_41 ; palette ID
+	db $60 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_1B ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_SMALL_FLAME
+	db SPRITE_DUEL_8 ; sprite ID
+	db PALETTE_42 ; palette ID
+	db $61 ; anim ID
+	db $00 ; anim flags
+	db SFX_1C ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BIG_FLAME
+	db SPRITE_DUEL_8 ; sprite ID
+	db PALETTE_42 ; palette ID
+	db $62 ; anim ID
+	db $00 ; anim flags
+	db SFX_1D ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_FIRE_SPIN
+	db SPRITE_DUEL_9 ; sprite ID
+	db PALETTE_43 ; palette ID
+	db $63 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_1E ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_DIVE_BOMB
+	db SPRITE_DUEL_10 ; sprite ID
+	db PALETTE_44 ; palette ID
+	db $64 ; anim ID
+	db $00 ; anim flags
+	db SFX_1F ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_WATER_JETS
+	db SPRITE_DUEL_61 ; sprite ID
+	db PALETTE_45 ; palette ID
+	db $69 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_20 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_WATER_GUN
+	db SPRITE_DUEL_11 ; sprite ID
+	db PALETTE_46 ; palette ID
+	db $6a ; anim ID
+	db $00 ; anim flags
+	db SFX_21 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_WHIRLPOOL
+	db SPRITE_DUEL_12 ; sprite ID
+	db PALETTE_47 ; palette ID
+	db $6b ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_22 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_HYDRO_PUMP
+	db SPRITE_DUEL_13 ; sprite ID
+	db PALETTE_48 ; palette ID
+	db $6c ; anim ID
+	db $00 ; anim flags
+	db SFX_23 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BLIZZARD
+	db SPRITE_DUEL_62 ; sprite ID
+	db PALETTE_49 ; palette ID
+	db $6d ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_24 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_PSYCHIC
+	db SPRITE_DUEL_14 ; sprite ID
+	db PALETTE_50 ; palette ID
+	db $6e ; anim ID
+	db $00 ; anim flags
+	db SFX_25 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_GLARE
+	db SPRITE_DUEL_15 ; sprite ID
+	db PALETTE_51 ; palette ID
+	db $6f ; anim ID
+	db $00 ; anim flags
+	db SFX_26 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BEAM
+	db SPRITE_DUEL_16 ; sprite ID
+	db PALETTE_52 ; palette ID
+	db $70 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) ; anim flags
+	db SFX_27 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_HYPER_BEAM
+	db SPRITE_DUEL_17 ; sprite ID
+	db PALETTE_53 ; palette ID
+	db $71 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) ; anim flags
+	db SFX_28 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_ROCK_THROW
+	db SPRITE_DUEL_18 ; sprite ID
+	db PALETTE_54 ; palette ID
+	db $72 ; anim ID
+	db $00 ; anim flags
+	db SFX_29 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_STONE_BARRAGE
+	db SPRITE_DUEL_18 ; sprite ID
+	db PALETTE_54 ; palette ID
+	db $73 ; anim ID
+	db $00 ; anim flags
+	db SFX_2A ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_PUNCH
+	db SPRITE_DUEL_19 ; sprite ID
+	db PALETTE_55 ; palette ID
+	db $74 ; anim ID
+	db $00 ; anim flags
+	db SFX_2B ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_THUNDERPUNCH
+	db SPRITE_DUEL_19 ; sprite ID
+	db PALETTE_55 ; palette ID
+	db $75 ; anim ID
+	db $00 ; anim flags
+	db SFX_52 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_FIRE_PUNCH
+	db SPRITE_DUEL_19 ; sprite ID
+	db PALETTE_55 ; palette ID
+	db $76 ; anim ID
+	db $00 ; anim flags
+	db SFX_53 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_STRETCH_KICK
+	db SPRITE_DUEL_20 ; sprite ID
+	db PALETTE_56 ; palette ID
+	db $77 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
+	db SFX_2C ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_SLASH
+	db SPRITE_DUEL_21 ; sprite ID
+	db PALETTE_57 ; palette ID
+	db $78 ; anim ID
+	db $00 ; anim flags
+	db SFX_2D ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_WHIP
+	db SPRITE_DUEL_22 ; sprite ID
+	db PALETTE_58 ; palette ID
+	db $7a ; anim ID
+	db $00 ; anim flags
+	db SFX_2D ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_TEAR
+	db SPRITE_DUEL_23 ; sprite ID
+	db PALETTE_59 ; palette ID
+	db $7b ; anim ID
+	db $00 ; anim flags
+	db SFX_2E ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_FURY_SWIPES
+	db SPRITE_DUEL_21 ; sprite ID
+	db PALETTE_57 ; palette ID
+	db $79 ; anim ID
+	db $00 ; anim flags
+	db SFX_2F ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_DRILL
+	db SPRITE_DUEL_24 ; sprite ID
+	db PALETTE_60 ; palette ID
+	db $7c ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
+	db SFX_30 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_POT_SMASH
+	db SPRITE_DUEL_25 ; sprite ID
+	db PALETTE_61 ; palette ID
+	db $7d ; anim ID
+	db $00 ; anim flags
+	db SFX_31 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BONEMERANG
+	db SPRITE_DUEL_26 ; sprite ID
+	db PALETTE_62 ; palette ID
+	db $7e ; anim ID
+	db $00 ; anim flags
+	db SFX_32 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_SEISMIC_TOSS
+	db SPRITE_DUEL_27 ; sprite ID
+	db PALETTE_63 ; palette ID
+	db $7f ; anim ID
+	db $00 ; anim flags
+	db SFX_33 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_NEEDLES
+	db SPRITE_DUEL_28 ; sprite ID
+	db PALETTE_64 ; palette ID
+	db $80 ; anim ID
+	db $00 ; anim flags
+	db SFX_34 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_WHITE_GAS
+	db SPRITE_DUEL_29 ; sprite ID
+	db PALETTE_65 ; palette ID
+	db $81 ; anim ID
+	db $00 ; anim flags
+	db SFX_35 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_POWDER
+	db SPRITE_DUEL_56 ; sprite ID
+	db PALETTE_66 ; palette ID
+	db $82 ; anim ID
+	db $00 ; anim flags
+	db SFX_36 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_GOO
+	db SPRITE_DUEL_30 ; sprite ID
+	db PALETTE_67 ; palette ID
+	db $83 ; anim ID
+	db $00 ; anim flags
+	db SFX_37 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BUBBLES
+	db SPRITE_DUEL_31 ; sprite ID
+	db PALETTE_68 ; palette ID
+	db $84 ; anim ID
+	db $00 ; anim flags
+	db SFX_38 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_STRING_SHOT
+	db SPRITE_DUEL_32 ; sprite ID
+	db PALETTE_69 ; palette ID
+	db $85 ; anim ID
+	db $00 ; anim flags
+	db SFX_39 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BOYFRIENDS
+	db SPRITE_DUEL_33 ; sprite ID
+	db PALETTE_70 ; palette ID
+	db $86 ; anim ID
+	db $00 ; anim flags
+	db SFX_3A ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_LURE
+	db SPRITE_DUEL_34 ; sprite ID
+	db PALETTE_71 ; palette ID
+	db $87 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
+	db SFX_3B ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_TOXIC
+	db SPRITE_DUEL_35 ; sprite ID
+	db PALETTE_72 ; palette ID
+	db $88 ; anim ID
+	db $00 ; anim flags
+	db SFX_3C ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_CONFUSE_RAY
+	db SPRITE_DUEL_66 ; sprite ID
+	db PALETTE_73 ; palette ID
+	db $89 ; anim ID
+	db $00 ; anim flags
+	db SFX_3D ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_SING
+	db SPRITE_DUEL_36 ; sprite ID
+	db PALETTE_74 ; palette ID
+	db $8a ; anim ID
+	db $00 ; anim flags
+	db SFX_3E ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_SUPERSONIC
+	db SPRITE_DUEL_37 ; sprite ID
+	db PALETTE_75 ; palette ID
+	db $8b ; anim ID
+	db $00 ; anim flags
+	db SFX_3F ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_PETAL_DANCE
+	db SPRITE_DUEL_57 ; sprite ID
+	db PALETTE_76 ; palette ID
+	db $8c ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_40 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_PROTECT
+	db SPRITE_DUEL_38 ; sprite ID
+	db PALETTE_77 ; palette ID
+	db $8d ; anim ID
+	db $00 ; anim flags
+	db SFX_41 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BARRIER
+	db SPRITE_DUEL_39 ; sprite ID
+	db PALETTE_78 ; palette ID
+	db $8e ; anim ID
+	db $00 ; anim flags
+	db SFX_42 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_QUICK_ATTACK
+	db SPRITE_DUEL_40 ; sprite ID
+	db PALETTE_79 ; palette ID
+	db $8f ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_43 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_WHIRLWIND
+	db SPRITE_DUEL_41 ; sprite ID
+	db PALETTE_80 ; palette ID
+	db $90 ; anim ID
+	db $00 ; anim flags
+	db SFX_44 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_CRY
+	db SPRITE_DUEL_42 ; sprite ID
+	db PALETTE_81 ; palette ID
+	db $92 ; anim ID
+	db $00 ; anim flags
+	db SFX_45 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_QUESTION_MARK
+	db SPRITE_DUEL_43 ; sprite ID
+	db PALETTE_82 ; palette ID
+	db $93 ; anim ID
+	db $00 ; anim flags
+	db SFX_46 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_SELFDESTRUCT
+	db SPRITE_DUEL_44 ; sprite ID
+	db PALETTE_83 ; palette ID
+	db $94 ; anim ID
+	db $00 ; anim flags
+	db SFX_47 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BIG_SELFDESTRUCT_1
+	db SPRITE_DUEL_44 ; sprite ID
+	db PALETTE_83 ; palette ID
+	db $95 ; anim ID
+	db $00 ; anim flags
+	db SFX_48 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_HEAL
+	db SPRITE_DUEL_60 ; sprite ID
+	db PALETTE_84 ; palette ID
+	db $97 ; anim ID
+	db $00 ; anim flags
+	db SFX_49 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_DRAIN
+	db SPRITE_DUEL_64 ; sprite ID
+	db PALETTE_85 ; palette ID
+	db $99 ; anim ID
+	db $00 ; anim flags
+	db SFX_4A ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_DARK_GAS
+	db SPRITE_DUEL_29 ; sprite ID
+	db PALETTE_86 ; palette ID
+	db $81 ; anim ID
+	db $00 ; anim flags
+	db SFX_4B ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BIG_SELFDESTRUCT_2
+	db SPRITE_DUEL_44 ; sprite ID
+	db PALETTE_83 ; palette ID
+	db $96 ; anim ID
+	db $00 ; anim flags
+	db SFX_47 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_66
+	db SPRITE_DUEL_3 ; sprite ID
+	db PALETTE_36 ; palette ID
+	db $4d ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db SFX_16 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_67
+	db SPRITE_DUEL_3 ; sprite ID
+	db PALETTE_36 ; palette ID
+	db $4e ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db SFX_17 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_68
+	db SPRITE_DUEL_5 ; sprite ID
+	db PALETTE_38 ; palette ID
+	db $5c ; anim ID
+	db $00 ; anim flags
+	db SFX_18 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_69
+	db SPRITE_DUEL_62 ; sprite ID
+	db PALETTE_49 ; palette ID
+	db $6d ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_24 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_70
+	db SPRITE_DUEL_45 ; sprite ID
+	db PALETTE_87 ; palette ID
+	db $9a ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
+	db SFX_11 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_71
+	db SPRITE_DUEL_10 ; sprite ID
+	db PALETTE_44 ; palette ID
+	db $65 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_5C ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_72
+	db SPRITE_DUEL_10 ; sprite ID
+	db PALETTE_44 ; palette ID
+	db $66 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_73
+	db SPRITE_DUEL_60 ; sprite ID
+	db PALETTE_84 ; palette ID
+	db $98 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_4C ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_74
+	db SPRITE_DUEL_41 ; sprite ID
+	db PALETTE_80 ; palette ID
+	db $91 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_4D ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_EXPAND
+	db SPRITE_DUEL_46 ; sprite ID
+	db PALETTE_88 ; palette ID
+	db $9b ; anim ID
+	db $00 ; anim flags
+	db SFX_4E ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_76
+	db SPRITE_DUEL_47 ; sprite ID
+	db PALETTE_89 ; palette ID
+	db $9c ; anim ID
+	db $00 ; anim flags
+	db SFX_4F ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_THUNDER_WAVE
+	db SPRITE_DUEL_48 ; sprite ID
+	db PALETTE_90 ; palette ID
+	db $9d ; anim ID
+	db $00 ; anim flags
+	db SFX_50 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_78
+	db SPRITE_DUEL_10 ; sprite ID
+	db PALETTE_44 ; palette ID
+	db $67 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_51 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_79
+	db SPRITE_DUEL_10 ; sprite ID
+	db PALETTE_44 ; palette ID
+	db $68 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_51 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_80
+	db SPRITE_DUEL_49 ; sprite ID
+	db PALETTE_91 ; palette ID
+	db $9e ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_PLAYER_SHUFFLE
+	db SPRITE_DUEL_49 ; sprite ID
+	db PALETTE_91 ; palette ID
+	db $9f ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_07 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_OPP_SHUFFLE
+	db SPRITE_DUEL_49 ; sprite ID
+	db PALETTE_91 ; palette ID
+	db $a0 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_07 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BOTH_SHUFFLE
+	db SPRITE_DUEL_49 ; sprite ID
+	db PALETTE_91 ; palette ID
+	db $a1 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_07 ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_84
+	db SPRITE_DUEL_49 ; sprite ID
+	db PALETTE_91 ; palette ID
+	db $a2 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_BOTH_DRAW
+	db SPRITE_DUEL_49 ; sprite ID
+	db PALETTE_91 ; palette ID
+	db $a3 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_PLAYER_DRAW
+	db SPRITE_DUEL_49 ; sprite ID
+	db PALETTE_91 ; palette ID
+	db $a4 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_OPP_DRAW
+	db SPRITE_DUEL_49 ; sprite ID
+	db PALETTE_91 ; palette ID
+	db $a5 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_COIN_SPIN
+	db SPRITE_DUEL_50 ; sprite ID
+	db PALETTE_92 ; palette ID
+	db $a7 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_COIN_TOSS1
+	db SPRITE_DUEL_50 ; sprite ID
+	db PALETTE_92 ; palette ID
+	db $a8 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_0B ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_COIN_TOSS2
+	db SPRITE_DUEL_50 ; sprite ID
+	db PALETTE_92 ; palette ID
+	db $a9 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_0B ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_COIN_TAILS
+	db SPRITE_DUEL_50 ; sprite ID
+	db PALETTE_92 ; palette ID
+	db $aa ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_COIN_HEADS
+	db SPRITE_DUEL_50 ; sprite ID
+	db PALETTE_92 ; palette ID
+	db $ab ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_DUEL_WIN
+	db SPRITE_DUEL_WON_LOST_DRAW ; sprite ID
+	db PALETTE_93 ; palette ID
+	db $ac ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_DUEL_LOSS
+	db SPRITE_DUEL_WON_LOST_DRAW ; sprite ID
+	db PALETTE_93 ; palette ID
+	db $ad ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_DUEL_DRAW
+	db SPRITE_DUEL_WON_LOST_DRAW ; sprite ID
+	db PALETTE_93 ; palette ID
+	db $ae ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+
+	; DUEL_ANIM_96
+	db SPRITE_DUEL_49 ; sprite ID
+	db PALETTE_91 ; palette ID
+	db $a6 ; anim ID
+	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
+	db SFX_STOP ; sound FX ID
+	db $00 ; handler function
+; 0x1d078
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index 953defc..dc4a8c8 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -1516,784 +1516,7 @@ Func_1ce03: ; 1ce03 (7:4e03)
 	dw Func_191a3         ; DUEL_ANIM_156
 	dw Func_191a3         ; DUEL_ANIM_157
 
-; data for each animation ID (see src/constants/sprite_constants.asm)
-Animations: ; 1ce32 (7:4e32)
-	; DUEL_ANIM_NONE
-	db $00 ; sprite ID
-	db $00 ; palette ID
-	db $00 ; anim ID
-	db $00 ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_GLOW
-	db SPRITE_DUEL_GLOW ; sprite ID
-	db $1f ; palette ID
-	db $47 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
-	db SFX_11 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_PARALYSIS
-	db SPRITE_DUEL_1 ; sprite ID
-	db $20 ; palette ID
-	db $48 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
-	db SFX_12 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_SLEEP
-	db SPRITE_DUEL_2 ; sprite ID
-	db $21 ; palette ID
-	db $49 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
-	db SFX_13 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_CONFUSION
-	db SPRITE_DUEL_55 ; sprite ID
-	db $22 ; palette ID
-	db $4a ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
-	db SFX_14 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_POISON
-	db SPRITE_DUEL_58 ; sprite ID
-	db $23 ; palette ID
-	db $4b ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
-	db SFX_15 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_6
-	db SPRITE_DUEL_3 ; sprite ID
-	db $24 ; palette ID
-	db $4c ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
-	db SFX_16 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_HIT
-	db SPRITE_DUEL_3 ; sprite ID
-	db $24 ; palette ID
-	db $4d ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
-	db SFX_16 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BIG_HIT
-	db SPRITE_DUEL_3 ; sprite ID
-	db $24 ; palette ID
-	db $4e ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
-	db SFX_17 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_SHOW_DAMAGE
-	db SPRITE_DUEL_4 ; sprite ID
-	db $25 ; palette ID
-	db $00 ; anim ID
-	db $00 ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_THUNDER_SHOCK
-	db SPRITE_DUEL_5 ; sprite ID
-	db $26 ; palette ID
-	db $5c ; anim ID
-	db $00 ; anim flags
-	db SFX_18 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_LIGHTNING
-	db SPRITE_DUEL_6 ; sprite ID
-	db $27 ; palette ID
-	db $5e ; anim ID
-	db $00 ; anim flags
-	db SFX_19 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BORDER_SPARK
-	db SPRITE_DUEL_59 ; sprite ID
-	db $28 ; palette ID
-	db $5f ; anim ID
-	db $00 ; anim flags
-	db SFX_1A ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BIG_LIGHTNING
-	db SPRITE_DUEL_7 ; sprite ID
-	db $29 ; palette ID
-	db $60 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_1B ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_SMALL_FLAME
-	db SPRITE_DUEL_8 ; sprite ID
-	db $2a ; palette ID
-	db $61 ; anim ID
-	db $00 ; anim flags
-	db SFX_1C ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BIG_FLAME
-	db SPRITE_DUEL_8 ; sprite ID
-	db $2a ; palette ID
-	db $62 ; anim ID
-	db $00 ; anim flags
-	db SFX_1D ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_FIRE_SPIN
-	db SPRITE_DUEL_9 ; sprite ID
-	db $2b ; palette ID
-	db $63 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_1E ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_DIVE_BOMB
-	db SPRITE_DUEL_10 ; sprite ID
-	db $2c ; palette ID
-	db $64 ; anim ID
-	db $00 ; anim flags
-	db SFX_1F ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_WATER_JETS
-	db SPRITE_DUEL_61 ; sprite ID
-	db $2d ; palette ID
-	db $69 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_20 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_WATER_GUN
-	db SPRITE_DUEL_11 ; sprite ID
-	db $2e ; palette ID
-	db $6a ; anim ID
-	db $00 ; anim flags
-	db SFX_21 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_WHIRLPOOL
-	db SPRITE_DUEL_12 ; sprite ID
-	db $2f ; palette ID
-	db $6b ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_22 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_HYDRO_PUMP
-	db SPRITE_DUEL_13 ; sprite ID
-	db $30 ; palette ID
-	db $6c ; anim ID
-	db $00 ; anim flags
-	db SFX_23 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BLIZZARD
-	db SPRITE_DUEL_62 ; sprite ID
-	db $31 ; palette ID
-	db $6d ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_24 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_PSYCHIC
-	db SPRITE_DUEL_14 ; sprite ID
-	db $32 ; palette ID
-	db $6e ; anim ID
-	db $00 ; anim flags
-	db SFX_25 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_GLARE
-	db SPRITE_DUEL_15 ; sprite ID
-	db $33 ; palette ID
-	db $6f ; anim ID
-	db $00 ; anim flags
-	db SFX_26 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BEAM
-	db SPRITE_DUEL_16 ; sprite ID
-	db $34 ; palette ID
-	db $70 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) ; anim flags
-	db SFX_27 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_HYPER_BEAM
-	db SPRITE_DUEL_17 ; sprite ID
-	db $35 ; palette ID
-	db $71 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_6) | (1 << SPRITE_ANIM_FLAG_Y_SUBTRACT) ; anim flags
-	db SFX_28 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_ROCK_THROW
-	db SPRITE_DUEL_18 ; sprite ID
-	db $36 ; palette ID
-	db $72 ; anim ID
-	db $00 ; anim flags
-	db SFX_29 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_STONE_BARRAGE
-	db SPRITE_DUEL_18 ; sprite ID
-	db $36 ; palette ID
-	db $73 ; anim ID
-	db $00 ; anim flags
-	db SFX_2A ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_PUNCH
-	db SPRITE_DUEL_19 ; sprite ID
-	db $37 ; palette ID
-	db $74 ; anim ID
-	db $00 ; anim flags
-	db SFX_2B ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_THUNDERPUNCH
-	db SPRITE_DUEL_19 ; sprite ID
-	db $37 ; palette ID
-	db $75 ; anim ID
-	db $00 ; anim flags
-	db SFX_52 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_FIRE_PUNCH
-	db SPRITE_DUEL_19 ; sprite ID
-	db $37 ; palette ID
-	db $76 ; anim ID
-	db $00 ; anim flags
-	db SFX_53 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_STRETCH_KICK
-	db SPRITE_DUEL_20 ; sprite ID
-	db $38 ; palette ID
-	db $77 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
-	db SFX_2C ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_SLASH
-	db SPRITE_DUEL_21 ; sprite ID
-	db $39 ; palette ID
-	db $78 ; anim ID
-	db $00 ; anim flags
-	db SFX_2D ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_WHIP
-	db SPRITE_DUEL_22 ; sprite ID
-	db $3a ; palette ID
-	db $7a ; anim ID
-	db $00 ; anim flags
-	db SFX_2D ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_TEAR
-	db SPRITE_DUEL_23 ; sprite ID
-	db $3b ; palette ID
-	db $7b ; anim ID
-	db $00 ; anim flags
-	db SFX_2E ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_FURY_SWIPES
-	db SPRITE_DUEL_21 ; sprite ID
-	db $39 ; palette ID
-	db $79 ; anim ID
-	db $00 ; anim flags
-	db SFX_2F ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_DRILL
-	db SPRITE_DUEL_24 ; sprite ID
-	db $3c ; palette ID
-	db $7c ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
-	db SFX_30 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_POT_SMASH
-	db SPRITE_DUEL_25 ; sprite ID
-	db $3d ; palette ID
-	db $7d ; anim ID
-	db $00 ; anim flags
-	db SFX_31 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BONEMERANG
-	db SPRITE_DUEL_26 ; sprite ID
-	db $3e ; palette ID
-	db $7e ; anim ID
-	db $00 ; anim flags
-	db SFX_32 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_SEISMIC_TOSS
-	db SPRITE_DUEL_27 ; sprite ID
-	db $3f ; palette ID
-	db $7f ; anim ID
-	db $00 ; anim flags
-	db SFX_33 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_NEEDLES
-	db SPRITE_DUEL_28 ; sprite ID
-	db $40 ; palette ID
-	db $80 ; anim ID
-	db $00 ; anim flags
-	db SFX_34 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_WHITE_GAS
-	db SPRITE_DUEL_29 ; sprite ID
-	db $41 ; palette ID
-	db $81 ; anim ID
-	db $00 ; anim flags
-	db SFX_35 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_POWDER
-	db SPRITE_DUEL_56 ; sprite ID
-	db $42 ; palette ID
-	db $82 ; anim ID
-	db $00 ; anim flags
-	db SFX_36 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_GOO
-	db SPRITE_DUEL_30 ; sprite ID
-	db $43 ; palette ID
-	db $83 ; anim ID
-	db $00 ; anim flags
-	db SFX_37 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BUBBLES
-	db SPRITE_DUEL_31 ; sprite ID
-	db $44 ; palette ID
-	db $84 ; anim ID
-	db $00 ; anim flags
-	db SFX_38 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_STRING_SHOT
-	db SPRITE_DUEL_32 ; sprite ID
-	db $45 ; palette ID
-	db $85 ; anim ID
-	db $00 ; anim flags
-	db SFX_39 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BOYFRIENDS
-	db SPRITE_DUEL_33 ; sprite ID
-	db $46 ; palette ID
-	db $86 ; anim ID
-	db $00 ; anim flags
-	db SFX_3A ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_LURE
-	db SPRITE_DUEL_34 ; sprite ID
-	db $47 ; palette ID
-	db $87 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_5) | (1 << SPRITE_ANIM_FLAG_X_SUBTRACT) ; anim flags
-	db SFX_3B ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_TOXIC
-	db SPRITE_DUEL_35 ; sprite ID
-	db $48 ; palette ID
-	db $88 ; anim ID
-	db $00 ; anim flags
-	db SFX_3C ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_CONFUSE_RAY
-	db SPRITE_DUEL_66 ; sprite ID
-	db $49 ; palette ID
-	db $89 ; anim ID
-	db $00 ; anim flags
-	db SFX_3D ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_SING
-	db SPRITE_DUEL_36 ; sprite ID
-	db $4a ; palette ID
-	db $8a ; anim ID
-	db $00 ; anim flags
-	db SFX_3E ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_SUPERSONIC
-	db SPRITE_DUEL_37 ; sprite ID
-	db $4b ; palette ID
-	db $8b ; anim ID
-	db $00 ; anim flags
-	db SFX_3F ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_PETAL_DANCE
-	db SPRITE_DUEL_57 ; sprite ID
-	db $4c ; palette ID
-	db $8c ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_40 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_PROTECT
-	db SPRITE_DUEL_38 ; sprite ID
-	db $4d ; palette ID
-	db $8d ; anim ID
-	db $00 ; anim flags
-	db SFX_41 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BARRIER
-	db SPRITE_DUEL_39 ; sprite ID
-	db $4e ; palette ID
-	db $8e ; anim ID
-	db $00 ; anim flags
-	db SFX_42 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_QUICK_ATTACK
-	db SPRITE_DUEL_40 ; sprite ID
-	db $4f ; palette ID
-	db $8f ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_43 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_WHIRLWIND
-	db SPRITE_DUEL_41 ; sprite ID
-	db $50 ; palette ID
-	db $90 ; anim ID
-	db $00 ; anim flags
-	db SFX_44 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_CRY
-	db SPRITE_DUEL_42 ; sprite ID
-	db $51 ; palette ID
-	db $92 ; anim ID
-	db $00 ; anim flags
-	db SFX_45 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_QUESTION_MARK
-	db SPRITE_DUEL_43 ; sprite ID
-	db $52 ; palette ID
-	db $93 ; anim ID
-	db $00 ; anim flags
-	db SFX_46 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_SELFDESTRUCT
-	db SPRITE_DUEL_44 ; sprite ID
-	db $53 ; palette ID
-	db $94 ; anim ID
-	db $00 ; anim flags
-	db SFX_47 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BIG_SELFDESTRUCT_1
-	db SPRITE_DUEL_44 ; sprite ID
-	db $53 ; palette ID
-	db $95 ; anim ID
-	db $00 ; anim flags
-	db SFX_48 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_HEAL
-	db SPRITE_DUEL_60 ; sprite ID
-	db $54 ; palette ID
-	db $97 ; anim ID
-	db $00 ; anim flags
-	db SFX_49 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_DRAIN
-	db SPRITE_DUEL_64 ; sprite ID
-	db $55 ; palette ID
-	db $99 ; anim ID
-	db $00 ; anim flags
-	db SFX_4A ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_DARK_GAS
-	db SPRITE_DUEL_29 ; sprite ID
-	db $56 ; palette ID
-	db $81 ; anim ID
-	db $00 ; anim flags
-	db SFX_4B ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BIG_SELFDESTRUCT_2
-	db SPRITE_DUEL_44 ; sprite ID
-	db $53 ; palette ID
-	db $96 ; anim ID
-	db $00 ; anim flags
-	db SFX_47 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_66
-	db SPRITE_DUEL_3 ; sprite ID
-	db $24 ; palette ID
-	db $4d ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
-	db SFX_16 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_67
-	db SPRITE_DUEL_3 ; sprite ID
-	db $24 ; palette ID
-	db $4e ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
-	db SFX_17 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_68
-	db SPRITE_DUEL_5 ; sprite ID
-	db $26 ; palette ID
-	db $5c ; anim ID
-	db $00 ; anim flags
-	db SFX_18 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_69
-	db SPRITE_DUEL_62 ; sprite ID
-	db $31 ; palette ID
-	db $6d ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_24 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_70
-	db SPRITE_DUEL_45 ; sprite ID
-	db $57 ; palette ID
-	db $9a ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) ; anim flags
-	db SFX_11 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_71
-	db SPRITE_DUEL_10 ; sprite ID
-	db $2c ; palette ID
-	db $65 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_5C ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_72
-	db SPRITE_DUEL_10 ; sprite ID
-	db $2c ; palette ID
-	db $66 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_73
-	db SPRITE_DUEL_60 ; sprite ID
-	db $54 ; palette ID
-	db $98 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_4C ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_74
-	db SPRITE_DUEL_41 ; sprite ID
-	db $50 ; palette ID
-	db $91 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_4D ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_EXPAND
-	db SPRITE_DUEL_46 ; sprite ID
-	db $58 ; palette ID
-	db $9b ; anim ID
-	db $00 ; anim flags
-	db SFX_4E ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_76
-	db SPRITE_DUEL_47 ; sprite ID
-	db $59 ; palette ID
-	db $9c ; anim ID
-	db $00 ; anim flags
-	db SFX_4F ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_THUNDER_WAVE
-	db SPRITE_DUEL_48 ; sprite ID
-	db $5a ; palette ID
-	db $9d ; anim ID
-	db $00 ; anim flags
-	db SFX_50 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_78
-	db SPRITE_DUEL_10 ; sprite ID
-	db $2c ; palette ID
-	db $67 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_51 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_79
-	db SPRITE_DUEL_10 ; sprite ID
-	db $2c ; palette ID
-	db $68 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_51 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_80
-	db SPRITE_DUEL_49 ; sprite ID
-	db $5b ; palette ID
-	db $9e ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_PLAYER_SHUFFLE
-	db SPRITE_DUEL_49 ; sprite ID
-	db $5b ; palette ID
-	db $9f ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_07 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_OPP_SHUFFLE
-	db SPRITE_DUEL_49 ; sprite ID
-	db $5b ; palette ID
-	db $a0 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_07 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BOTH_SHUFFLE
-	db SPRITE_DUEL_49 ; sprite ID
-	db $5b ; palette ID
-	db $a1 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_07 ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_84
-	db SPRITE_DUEL_49 ; sprite ID
-	db $5b ; palette ID
-	db $a2 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_BOTH_DRAW
-	db SPRITE_DUEL_49 ; sprite ID
-	db $5b ; palette ID
-	db $a3 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_PLAYER_DRAW
-	db SPRITE_DUEL_49 ; sprite ID
-	db $5b ; palette ID
-	db $a4 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_OPP_DRAW
-	db SPRITE_DUEL_49 ; sprite ID
-	db $5b ; palette ID
-	db $a5 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_COIN_SPIN
-	db SPRITE_DUEL_50 ; sprite ID
-	db $5c ; palette ID
-	db $a7 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_COIN_TOSS1
-	db SPRITE_DUEL_50 ; sprite ID
-	db $5c ; palette ID
-	db $a8 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_0B ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_COIN_TOSS2
-	db SPRITE_DUEL_50 ; sprite ID
-	db $5c ; palette ID
-	db $a9 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_3) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_0B ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_COIN_TAILS
-	db SPRITE_DUEL_50 ; sprite ID
-	db $5c ; palette ID
-	db $aa ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_COIN_HEADS
-	db SPRITE_DUEL_50 ; sprite ID
-	db $5c ; palette ID
-	db $ab ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_DUEL_WIN
-	db SPRITE_DUEL_WON_LOST_DRAW ; sprite ID
-	db $5d ; palette ID
-	db $ac ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_DUEL_LOSS
-	db SPRITE_DUEL_WON_LOST_DRAW ; sprite ID
-	db $5d ; palette ID
-	db $ad ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_DUEL_DRAW
-	db SPRITE_DUEL_WON_LOST_DRAW ; sprite ID
-	db $5d ; palette ID
-	db $ae ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-
-	; DUEL_ANIM_96
-	db SPRITE_DUEL_49 ; sprite ID
-	db $5b ; palette ID
-	db $a6 ; anim ID
-	db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
-	db SFX_STOP ; sound FX ID
-	db $00 ; handler function
-; 0x1d078
+INCLUDE "data/duel_animations.asm"
 
 Func_1d078: ; 1d078 (7:5078)
 	ld a, [wd627]
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 9e5aa31..1420bc9 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -1238,167 +1238,167 @@ palette_pointer: MACRO
 ENDM
 
 MapDataPointers_81697: ; 81697 (20:5697)
-	palette_pointer Palette0,   8, 1 ; $00
-	palette_pointer Palette1,   8, 0 ; $01
-	palette_pointer Palette2,   8, 0 ; $02
-	palette_pointer Palette3,   8, 0 ; $03
-	palette_pointer Palette4,   8, 0 ; $04
-	palette_pointer Palette5,   8, 0 ; $05
-	palette_pointer Palette6,   8, 0 ; $06
-	palette_pointer Palette7,   8, 0 ; $07
-	palette_pointer Palette8,   8, 0 ; $08
-	palette_pointer Palette9,   8, 0 ; $09
-	palette_pointer Palette10,  8, 0 ; $0a
-	palette_pointer Palette11,  8, 0 ; $0b
-	palette_pointer Palette12,  8, 0 ; $0c
-	palette_pointer Palette13,  8, 0 ; $0d
-	palette_pointer Palette14,  8, 0 ; $0e
-	palette_pointer Palette15,  8, 0 ; $0f
-	palette_pointer Palette16,  8, 0 ; $10
-	palette_pointer Palette17,  8, 0 ; $11
-	palette_pointer Palette18,  8, 0 ; $12
-	palette_pointer Palette19,  8, 0 ; $13
-	palette_pointer Palette20,  8, 0 ; $14
-	palette_pointer Palette21,  8, 0 ; $15
-	palette_pointer Palette22,  8, 0 ; $16
-	palette_pointer Palette23,  8, 0 ; $17
-	palette_pointer Palette24,  8, 0 ; $18
-	palette_pointer Palette25,  8, 0 ; $19
-	palette_pointer Palette26,  8, 0 ; $1a
-	palette_pointer Palette27,  8, 0 ; $1b
-	palette_pointer Palette28,  8, 0 ; $1c
-	palette_pointer Palette29,  8, 2 ; $1d
-	palette_pointer Palette30,  8, 2 ; $1e
-	palette_pointer Palette31,  1, 1 ; $1f
-	palette_pointer Palette32,  1, 1 ; $20
-	palette_pointer Palette33,  1, 1 ; $21
-	palette_pointer Palette34,  1, 1 ; $22
-	palette_pointer Palette35,  1, 1 ; $23
-	palette_pointer Palette36,  1, 1 ; $24
-	palette_pointer Palette37,  1, 1 ; $25
-	palette_pointer Palette38,  1, 1 ; $26
-	palette_pointer Palette39,  1, 1 ; $27
-	palette_pointer Palette40,  1, 1 ; $28
-	palette_pointer Palette41,  1, 1 ; $29
-	palette_pointer Palette42,  1, 1 ; $2a
-	palette_pointer Palette43,  1, 1 ; $2b
-	palette_pointer Palette44,  1, 1 ; $2c
-	palette_pointer Palette45,  1, 1 ; $2d
-	palette_pointer Palette46,  1, 1 ; $2e
-	palette_pointer Palette47,  1, 1 ; $2f
-	palette_pointer Palette48,  1, 1 ; $30
-	palette_pointer Palette49,  1, 1 ; $31
-	palette_pointer Palette50,  1, 1 ; $32
-	palette_pointer Palette51,  1, 1 ; $33
-	palette_pointer Palette52,  1, 1 ; $34
-	palette_pointer Palette53,  1, 1 ; $35
-	palette_pointer Palette54,  1, 1 ; $36
-	palette_pointer Palette55,  1, 1 ; $37
-	palette_pointer Palette56,  1, 1 ; $38
-	palette_pointer Palette57,  1, 1 ; $39
-	palette_pointer Palette58,  1, 1 ; $3a
-	palette_pointer Palette59,  1, 1 ; $3b
-	palette_pointer Palette60,  1, 1 ; $3c
-	palette_pointer Palette61,  1, 1 ; $3d
-	palette_pointer Palette62,  1, 1 ; $3e
-	palette_pointer Palette63,  1, 1 ; $3f
-	palette_pointer Palette64,  1, 1 ; $40
-	palette_pointer Palette65,  1, 1 ; $41
-	palette_pointer Palette66,  1, 1 ; $42
-	palette_pointer Palette67,  1, 1 ; $43
-	palette_pointer Palette68,  1, 1 ; $44
-	palette_pointer Palette69,  1, 1 ; $45
-	palette_pointer Palette70,  1, 1 ; $46
-	palette_pointer Palette71,  1, 1 ; $47
-	palette_pointer Palette72,  1, 1 ; $48
-	palette_pointer Palette73,  1, 1 ; $49
-	palette_pointer Palette74,  1, 1 ; $4a
-	palette_pointer Palette75,  1, 1 ; $4b
-	palette_pointer Palette76,  1, 1 ; $4c
-	palette_pointer Palette77,  1, 1 ; $4d
-	palette_pointer Palette78,  1, 1 ; $4e
-	palette_pointer Palette79,  1, 1 ; $4f
-	palette_pointer Palette80,  1, 1 ; $50
-	palette_pointer Palette81,  1, 1 ; $51
-	palette_pointer Palette82,  1, 1 ; $52
-	palette_pointer Palette83,  1, 1 ; $53
-	palette_pointer Palette84,  1, 1 ; $54
-	palette_pointer Palette85,  1, 1 ; $55
-	palette_pointer Palette86,  1, 1 ; $56
-	palette_pointer Palette87,  1, 1 ; $57
-	palette_pointer Palette88,  1, 1 ; $58
-	palette_pointer Palette89,  1, 1 ; $59
-	palette_pointer Palette90,  1, 1 ; $a5
-	palette_pointer Palette91,  1, 1 ; $5b
-	palette_pointer Palette92,  1, 1 ; $5c
-	palette_pointer Palette93,  1, 1 ; $5d
-	palette_pointer Palette94,  8, 0 ; $5e
-	palette_pointer Palette95,  8, 0 ; $5f
-	palette_pointer Palette96,  8, 0 ; $60
-	palette_pointer Palette97,  8, 0 ; $61
-	palette_pointer Palette98,  8, 0 ; $62
-	palette_pointer Palette99,  8, 0 ; $63
-	palette_pointer Palette100, 8, 0 ; $64
-	palette_pointer Palette101, 7, 0 ; $65
-	palette_pointer Palette102, 7, 0 ; $66
-	palette_pointer Palette103, 7, 0 ; $67
-	palette_pointer Palette104, 7, 0 ; $68
-	palette_pointer Palette105, 7, 0 ; $69
-	palette_pointer Palette106, 7, 0 ; $6a
-	palette_pointer Palette107, 7, 0 ; $6b
-	palette_pointer Palette108, 0, 1 ; $6c
-	palette_pointer Palette109, 0, 1 ; $6d
-	palette_pointer Palette110, 0, 0 ; $6e
-	palette_pointer Palette111, 8, 1 ; $6f
-	palette_pointer Palette112, 8, 1 ; $70
-	palette_pointer Palette113, 8, 1 ; $71
-	palette_pointer Palette114, 4, 2 ; $72
-	palette_pointer Palette115, 4, 2 ; $73
-	palette_pointer Palette116, 4, 2 ; $74
-	palette_pointer Palette117, 1, 0 ; $75
-	palette_pointer Palette118, 6, 0 ; $76
-	palette_pointer Palette119, 1, 0 ; $77
-	palette_pointer Palette120, 1, 0 ; $78
-	palette_pointer Palette121, 1, 0 ; $79
-	palette_pointer Palette122, 1, 0 ; $7a
-	palette_pointer Palette123, 1, 0 ; $7b
-	palette_pointer Palette124, 1, 0 ; $7c
-	palette_pointer Palette125, 1, 0 ; $7d
-	palette_pointer Palette126, 1, 0 ; $7e
-	palette_pointer Palette127, 1, 0 ; $7f
-	palette_pointer Palette128, 1, 0 ; $80
-	palette_pointer Palette129, 1, 0 ; $81
-	palette_pointer Palette130, 1, 0 ; $82
-	palette_pointer Palette131, 1, 0 ; $83
-	palette_pointer Palette132, 1, 0 ; $84
-	palette_pointer Palette133, 1, 0 ; $85
-	palette_pointer Palette134, 1, 0 ; $86
-	palette_pointer Palette135, 1, 0 ; $87
-	palette_pointer Palette136, 1, 0 ; $88
-	palette_pointer Palette137, 1, 0 ; $89
-	palette_pointer Palette138, 1, 0 ; $8a
-	palette_pointer Palette139, 1, 0 ; $8b
-	palette_pointer Palette140, 1, 0 ; $8c
-	palette_pointer Palette141, 1, 0 ; $8d
-	palette_pointer Palette142, 1, 0 ; $8e
-	palette_pointer Palette143, 1, 0 ; $8f
-	palette_pointer Palette144, 1, 0 ; $90
-	palette_pointer Palette145, 1, 0 ; $91
-	palette_pointer Palette146, 1, 0 ; $92
-	palette_pointer Palette147, 1, 0 ; $93
-	palette_pointer Palette148, 1, 0 ; $94
-	palette_pointer Palette149, 1, 0 ; $95
-	palette_pointer Palette150, 1, 0 ; $96
-	palette_pointer Palette151, 1, 0 ; $97
-	palette_pointer Palette152, 1, 0 ; $98
-	palette_pointer Palette153, 1, 0 ; $99
-	palette_pointer Palette154, 1, 0 ; $9a
-	palette_pointer Palette155, 1, 0 ; $9b
-	palette_pointer Palette156, 1, 0 ; $9c
-	palette_pointer Palette157, 1, 0 ; $9d
-	palette_pointer Palette158, 1, 0 ; $9e
-	palette_pointer Palette159, 1, 0 ; $9f
-	palette_pointer Palette160, 1, 0 ; $a0
+	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
 
 	INCROM $8191b, $83c4c
 
-- 
cgit v1.2.3


From 31bd695adca1b34048febd72efcbb951361404aa Mon Sep 17 00:00:00 2001
From: ElectroDeoxys <ElectroDeoxys@gmail.com>
Date: Wed, 3 Feb 2021 19:47:04 +0000
Subject: Extract remaining gfx data

---
 src/engine/bank20.asm | 613 ++++++++++++++++++++++++++++++++++++++++----------
 src/engine/home.asm   |  10 +-
 src/gfx.asm           | 586 ++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 1089 insertions(+), 120 deletions(-)

diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 1420bc9..e11b4d5 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -64,7 +64,7 @@ Func_800bd: ; 800bd (20:40bd)
 	ld a, [wTempPointer + 1]
 	adc $00
 	ld d, a
-	ld b, $c0
+	ld b, HIGH(wc000)
 	call Func_08bf
 	ld a, [wVRAMPointer]
 	ld e, a
@@ -86,16 +86,18 @@ Func_800e0: ; 800e0 (20:40e0)
 	jr z, .asm_800f0
 	sla [hl]
 .asm_800f0
+
 	ld c, $40
 	ld hl, wLoadedPalData
 	xor a
-.asm_800f6
+.loop_clear
 	ld [hli], a
 	dec c
-	jr nz, .asm_800f6
+	jr nz, .loop_clear
+
 	ld a, [wd130]
 	ld c, a
-.asm_800fe
+.loop
 	push bc
 	push de
 	ld b, $00
@@ -110,8 +112,10 @@ Func_800e0: ; 800e0 (20:40e0)
 	ld hl, wLoadedPalData
 	call Func_8016e
 	ld a, [wConsole]
-	cp $02
+	cp CONSOLE_CGB
 	jr nz, .asm_8013b
+
+	; cgb only
 	call BankswitchVRAM1
 	ld a, [wd12f]
 	ld c, a
@@ -125,6 +129,7 @@ Func_800e0: ; 800e0 (20:40e0)
 	call Func_80148
 	call Func_8016e
 	call BankswitchVRAM0
+
 .asm_8013b
 	pop de
 	ld hl, $20
@@ -133,7 +138,8 @@ Func_800e0: ; 800e0 (20:40e0)
 	ld d, h
 	pop bc
 	dec c
-	jr nz, .asm_800fe
+	jr nz, .loop
+
 	pop hl
 	ret
 
@@ -173,12 +179,13 @@ Func_8016e: ; 8016e (20:416e)
 	ld a, [wd292]
 	or a
 	jp z, SafeCopyDataHLtoDE
+
 	push hl
 	push bc
 	push de
 	ldh a, [hBankSRAM]
 	push af
-	ld a, $01
+	ld a, BANK("SRAM1")
 	call BankswitchSRAM
 	push hl
 	ld hl, $800
@@ -191,12 +198,12 @@ Func_8016e: ; 8016e (20:416e)
 	ld e, l
 	ld d, h
 	pop hl
-.asm_80190
+.loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	dec b
-	jr nz, .asm_80190
+	jr nz, .loop
 	pop af
 	call BankswitchSRAM
 	call DisableSRAM
@@ -684,113 +691,120 @@ MapDataPointers: ; 80e5d (20:4e5d)
 	dw SpriteAnimationPointers
 	dw MapDataPointers_81697
 
+; \1 = pointer
+; \2 = unknown
+macro_80e67: MACRO
+	dwb \1, BANK(\1) - BANK(MapDataPointers_80e67)
+	db \2
+ENDM
+
 MapDataPointers_80e67: ; 80e67 (20:4e67)
-	db $1b, $59, $00, $00
-	db $22, $5a, $00, $00
-	db $13, $5c, $00, $01
-	db $2e, $5d, $00, $01
-	db $d1, $5e, $00, $01
-	db $f5, $5e, $00, $01
-	db $26, $5f, $00, $01
-	db $eb, $5f, $00, $01
-	db $43, $61, $00, $01
-	db $50, $61, $00, $01
-	db $60, $61, $00, $02
-	db $22, $62, $00, $02
-	db $36, $63, $00, $03
-	db $00, $64, $00, $03
-	db $1d, $65, $00, $03
-	db $e7, $65, $00, $03
-	db $04, $67, $00, $03
-	db $ce, $67, $00, $03
-	db $eb, $68, $00, $03
-	db $b5, $69, $00, $03
-	db $d2, $6a, $00, $03
-	db $9c, $6b, $00, $03
-	db $b9, $6c, $00, $03
-	db $83, $6d, $00, $03
-	db $a0, $6e, $00, $03
-	db $6a, $6f, $00, $03
-	db $87, $70, $00, $03
-	db $51, $71, $00, $03
-	db $6e, $72, $00, $03
-	db $21, $73, $00, $03
-	db $24, $74, $00, $04
-	db $45, $75, $00, $04
-	db $db, $76, $00, $05
-	db $8c, $77, $00, $05
-	db $8d, $78, $00, $06
-	db $d6, $79, $00, $06
-	db $00, $40, $01, $07
-	db $88, $41, $01, $07
-	db $bb, $43, $01, $08
-	db $33, $45, $01, $08
-	db $2e, $47, $01, $09
-	db $d8, $48, $01, $09
-	db $73, $4b, $01, $0a
-	db $6f, $4c, $01, $0a
-	db $fe, $4d, $01, $0b
-	db $1d, $4f, $01, $0b
-	db $b6, $50, $01, $0c
-	db $91, $51, $01, $0c
-	db $15, $53, $01, $0d
-	db $b3, $54, $01, $0d
-	db $0a, $57, $01, $0e
-	db $ce, $57, $01, $0e
-	db $f1, $7b, $00, $0e
-	db $03, $7c, $00, $0e
-	db $ef, $58, $01, $0f
-	db $79, $5a, $01, $0f
-	db $1a, $7c, $00, $0f
-	db $26, $7c, $00, $0f
-	db $e2, $5c, $01, $10
-	db $f4, $5d, $01, $10
-	db $7c, $5f, $01, $11
-	db $7f, $60, $01, $11
-	db $36, $7c, $00, $12
-	db $7d, $61, $01, $12
-	db $93, $61, $01, $12
-	db $a9, $61, $01, $12
-	db $bf, $61, $01, $12
-	db $d5, $61, $01, $12
-	db $eb, $61, $01, $12
-	db $01, $62, $01, $12
-	db $17, $62, $01, $13
-	db $da, $62, $01, $13
-	db $64, $63, $01, $13
-	db $43, $64, $01, $13
-	db $df, $64, $01, $14
-	db $b5, $65, $01, $14
-	db $47, $66, $01, $15
-	db $b8, $66, $01, $16
-	db $3e, $67, $01, $17
-	db $af, $67, $01, $18
-	db $33, $68, $01, $19
-	db $a4, $68, $01, $1a
-	db $25, $69, $01, $1b
-	db $96, $69, $01, $1c
-	db $14, $6a, $01, $1d
-	db $85, $6a, $01, $1e
-	db $28, $6b, $01, $1f
-	db $99, $6b, $01, $20
-	db $34, $6c, $01, $21
-	db $a5, $6c, $01, $22
-	db $37, $6d, $01, $23
-	db $cc, $6d, $01, $24
-	db $8a, $6e, $01, $25
-	db $18, $6f, $01, $25
-	db $c0, $6f, $01, $25
-	db $4f, $70, $01, $26
-	db $a5, $71, $01, $27
-	db $97, $73, $01, $28
-	db $b7, $73, $01, $29
-	db $e5, $73, $01, $2a
-	db $13, $74, $01, $2b
-	db $38, $75, $01, $2c
-	db $9f, $76, $01, $2d
-	db $f6, $76, $01, $2d
-	db $7c, $77, $01, $2e
-	db $c4, $77, $01, $2f
+	macro_80e67 Data_8191b, $00
+	macro_80e67 Data_81a22, $00
+	macro_80e67 Data_81c13, $01
+	macro_80e67 Data_81d2e, $01
+	macro_80e67 Data_81ed1, $01
+	macro_80e67 Data_81ef5, $01
+	macro_80e67 Data_81f26, $01
+	macro_80e67 Data_81feb, $01
+	macro_80e67 Data_82143, $01
+	macro_80e67 Data_82150, $01
+	macro_80e67 Data_82160, $02
+	macro_80e67 Data_82222, $02
+	macro_80e67 Data_82336, $03
+	macro_80e67 Data_82400, $03
+	macro_80e67 Data_8251d, $03
+	macro_80e67 Data_825e7, $03
+	macro_80e67 Data_82704, $03
+	macro_80e67 Data_827ce, $03
+	macro_80e67 Data_828eb, $03
+	macro_80e67 Data_829b5, $03
+	macro_80e67 Data_82ad2, $03
+	macro_80e67 Data_82b9c, $03
+	macro_80e67 Data_82cb9, $03
+	macro_80e67 Data_82d83, $03
+	macro_80e67 Data_82ea0, $03
+	macro_80e67 Data_82f6a, $03
+	macro_80e67 Data_83087, $03
+	macro_80e67 Data_83151, $03
+	macro_80e67 Data_8326e, $03
+	macro_80e67 Data_83321, $03
+	macro_80e67 Data_83424, $04
+	macro_80e67 Data_83545, $04
+	macro_80e67 Data_836db, $05
+	macro_80e67 Data_8378c, $05
+	macro_80e67 Data_8388d, $06
+	macro_80e67 Data_839d6, $06
+	macro_80e67 Data_84000, $07
+	macro_80e67 Data_84188, $07
+	macro_80e67 Data_843bb, $08
+	macro_80e67 Data_84533, $08
+	macro_80e67 Data_8472e, $09
+	macro_80e67 Data_848d8, $09
+	macro_80e67 Data_84b73, $0a
+	macro_80e67 Data_84c6f, $0a
+	macro_80e67 Data_84dfe, $0b
+	macro_80e67 Data_84f1d, $0b
+	macro_80e67 Data_850b6, $0c
+	macro_80e67 Data_85191, $0c
+	macro_80e67 Data_85315, $0d
+	macro_80e67 Data_854b3, $0d
+	macro_80e67 Data_8570a, $0e
+	macro_80e67 Data_857ce, $0e
+	macro_80e67 Data_83bf1, $0e
+	macro_80e67 Data_83c03, $0e
+	macro_80e67 Data_858ef, $0f
+	macro_80e67 Data_85a79, $0f
+	macro_80e67 Data_83c1a, $0f
+	macro_80e67 Data_83c26, $0f
+	macro_80e67 Data_85ce2, $10
+	macro_80e67 Data_85df4, $10
+	macro_80e67 Data_85f7c, $11
+	macro_80e67 Data_8607f, $11
+	macro_80e67 Data_83c36, $12
+	macro_80e67 Data_8617d, $12
+	macro_80e67 Data_86193, $12
+	macro_80e67 Data_861a9, $12
+	macro_80e67 Data_861bf, $12
+	macro_80e67 Data_861d5, $12
+	macro_80e67 Data_861eb, $12
+	macro_80e67 Data_86201, $12
+	macro_80e67 Data_86217, $13
+	macro_80e67 Data_862da, $13
+	macro_80e67 Data_86364, $13
+	macro_80e67 Data_86443, $13
+	macro_80e67 Data_864df, $14
+	macro_80e67 Data_865b5, $14
+	macro_80e67 Data_86647, $15
+	macro_80e67 Data_866b8, $16
+	macro_80e67 Data_8673e, $17
+	macro_80e67 Data_867af, $18
+	macro_80e67 Data_86833, $19
+	macro_80e67 Data_868a4, $1a
+	macro_80e67 Data_86925, $1b
+	macro_80e67 Data_86996, $1c
+	macro_80e67 Data_86a14, $1d
+	macro_80e67 Data_86a85, $1e
+	macro_80e67 Data_86b28, $1f
+	macro_80e67 Data_86b99, $20
+	macro_80e67 Data_86c34, $21
+	macro_80e67 Data_86ca5, $22
+	macro_80e67 Data_86d37, $23
+	macro_80e67 Data_86dcc, $24
+	macro_80e67 Data_86e8a, $25
+	macro_80e67 Data_86f18, $25
+	macro_80e67 Data_86fc0, $25
+	macro_80e67 Data_8704f, $26
+	macro_80e67 Data_871a5, $27
+	macro_80e67 Data_87397, $28
+	macro_80e67 Data_873b7, $29
+	macro_80e67 Data_873e5, $2a
+	macro_80e67 Data_87413, $2b
+	macro_80e67 Data_87538, $2c
+	macro_80e67 Data_8769f, $2d
+	macro_80e67 Data_876f6, $2d
+	macro_80e67 Data_8777c, $2e
+	macro_80e67 Data_877c4, $2f
 
 MapDataPointers_8100f: ; 8100f (20:500f)
 	db $00, $40, $02, $c1
@@ -1400,7 +1414,374 @@ MapDataPointers_81697: ; 81697 (20:5697)
 	palette_pointer Palette159, 1, 0 ; PALETTE_159
 	palette_pointer Palette160, 1, 0 ; PALETTE_160
 
-	INCROM $8191b, $83c4c
+Data_8191b:: ; 8191b (20:591b)
+	db $14
+	db $12
+	dw $0000
+	db $00
+	db $dd
+
+	INCROM $81921, $81a22
+
+Data_81a22:: ; 81a22 (20:5a22)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $dd
+
+	INCROM $81a28, $81c13
+
+Data_81c13:: ; 81c13 (20:5c13)
+	db $1c
+	db $1e
+	dw $5d11
+	db $00
+	db $e7
+
+	INCROM $81c19, $81d2e
+
+Data_81d2e:: ; 81d2e (20:5d2e)
+	db $1c
+	db $1e
+	dw $5eb4
+	db $01
+	db $e7
+
+	INCROM $81d34, $81ed1
+
+Data_81ed1:: ; 81ed1 (20:5ed1)
+	db $04
+	db $06
+	dw $5ef0
+	db $00
+	db $ff
+
+	INCROM $81ed7, $81ef5
+
+Data_81ef5:: ; 81ef5 (20:5ef5)
+	db $04
+	db $06
+	dw $5f21
+	db $01
+	db $fb
+
+	INCROM $81efb, $81f26
+
+Data_81f26:: ; 81f26 (20:5f26)
+	db $18
+	db $1e
+	dw $5fd3
+	db $00
+	db $fd
+
+	INCROM $81f2c, $81feb
+
+Data_81feb:: ; 81feb (20:5feb)
+	db $18
+	db $1e
+	dw $612b
+	db $01
+	db $fd
+
+	INCROM $81ff1, $82143
+
+Data_82143:: ; 82143 (20:6143)
+	db $04
+	db $01
+	dw $614d
+	db $00
+	db $f0
+
+	INCROM $82149, $82150
+
+Data_82150:: ; 82150 (20:6150)
+	db $04
+	db $01
+	dw $615d
+	db $01
+	db $f8
+
+	INCROM $82156, $82160
+
+Data_82160:: ; 82160 (20:6160)
+	db $14
+	db $18
+	dw $620e
+	db $00
+	db $ef
+
+	INCROM $82166, $82222
+
+Data_82222:: ; 82222 (20:6222)
+	db $14
+	db $18
+	dw $6322
+	db $01
+	db $ee
+
+	INCROM $82228, $82336
+
+Data_82336:: ; 82336 (20:6336)
+	db $14
+	db $12
+	dw $63ec
+	db $00
+	db $ef
+
+	INCROM $8233c, $82400
+
+Data_82400:: ; 82400 (20:6400)
+	db $14
+	db $12
+	dw $6509
+	db $01
+	db $ef
+
+	INCROM $82406, $8251d
+
+Data_8251d:: ; 8251d (20:651d)
+	db $14
+	db $12
+	dw $65d3
+	db $00
+	db $ef
+
+	INCROM $82523, $825e7
+
+Data_825e7:: ; 825e7 (20:65e7)
+	db $14
+	db $12
+	dw $66f0
+	db $01
+	db $ef
+
+	INCROM $825ed, $82704
+
+Data_82704:: ; 82704 (20:6704)
+	db $14
+	db $12
+	dw $67ba
+	db $00
+	db $ef
+
+	INCROM $8270a, $827ce
+
+Data_827ce:: ; 827ce (20:67ce)
+	db $14
+	db $12
+	dw $68d7
+	db $01
+	db $ef
+
+	INCROM $827d4, $828eb
+
+Data_828eb:: ; 828eb (20:68eb)
+	db $14
+	db $12
+	dw $69a1
+	db $00
+	db $ef
+
+	INCROM $828f1, $829b5
+
+Data_829b5:: ; 829b5 (20:69b5)
+	db $14
+	db $12
+	dw $6abe
+	db $01
+	db $ef
+
+	INCROM $829bb, $82ad2
+
+Data_82ad2:: ; 82ad2 (20:6ad2)
+	db $14
+	db $12
+	dw $6b88
+	db $00
+	db $ef
+
+	INCROM $82ad8, $82b9c
+
+Data_82b9c:: ; 82b9c (20:6b9c)
+	db $14
+	db $12
+	dw $6ca5
+	db $01
+	db $ef
+
+	INCROM $82ba2, $82cb9
+
+Data_82cb9:: ; 82cb9 (20:6cb9)
+	db $14
+	db $12
+	dw $6d6f
+	db $00
+	db $ef
+
+	INCROM $82cbf, $82d83
+
+Data_82d83:: ; 82d83 (20:6d83)
+	db $14
+	db $12
+	dw $6e8c
+	db $01
+	db $ef
+
+	INCROM $82d89, $82ea0
+
+Data_82ea0:: ; 82ea0 (20:6ea0)
+	db $14
+	db $12
+	dw $6f56
+	db $00
+	db $ef
+
+	INCROM $82ea6, $82f6a
+
+Data_82f6a:: ; 82f6a (20:6f6a)
+	db $14
+	db $12
+	dw $7073
+	db $01
+	db $ef
+
+	INCROM $82f70, $83087
+
+Data_83087:: ; 83087 (20:7087)
+	db $14
+	db $12
+	dw $713d
+	db $00
+	db $ef
+
+	INCROM $8308d, $83151
+
+Data_83151:: ; 83151 (20:7151)
+	db $14
+	db $12
+	dw $725a
+	db $01
+	db $ef
+
+	INCROM $83157, $8326e
+
+Data_8326e:: ; 8326e (20:726e)
+	db $14
+	db $12
+	dw $730d
+	db $00
+	db $ef
+
+	INCROM $83274, $83321
+
+Data_83321:: ; 83321 (20:7321)
+	db $14
+	db $12
+	dw $7410
+	db $01
+	db $ef
+
+	INCROM $83327, $83424
+
+Data_83424:: ; 83424 (20:7424)
+	db $1c
+	db $1a
+	dw $7529
+	db $00
+	db $e7
+
+	INCROM $8342a, $83545
+
+Data_83545:: ; 83545 (20:7545)
+	db $1c
+	db $1a
+	dw $76bf
+	db $01
+	db $e7
+
+	INCROM $8354b, $836db
+
+Data_836db:: ; 836db (20:76db)
+	db $18
+	db $12
+	dw $777b
+	db $00
+	db $e7
+
+	INCROM $836e1, $8378c
+
+Data_8378c:: ; 8378c (20:778c)
+	db $18
+	db $12
+	dw $787c
+	db $01
+	db $e7
+
+	INCROM $83792, $8388d
+
+Data_8388d:: ; 8388d (20:788d)
+	db $1c
+	db $1e
+	dw $79b5
+	db $00
+	db $e7
+
+	INCROM $83893, $839d6
+
+Data_839d6:: ; 839d6 (20:79d6)
+	db $1c
+	db $1e
+	dw $7bd0
+	db $01
+	db $e7
+
+	INCROM $839dc, $83bf1
+
+Data_83bf1:: ; 83bf1 (20:7bf1)
+	db $04
+	db $03
+	dw $7c00
+	db $00
+	db $d8
+
+	INCROM $83bf7, $83c03
+
+Data_83c03:: ; 83c03 (20:7c03)
+	db $04
+	db $03
+	dw $7c17
+	db $01
+	db $d6
+
+	INCROM $83c09, $83c1a
+
+Data_83c1a:: ; 83c1a (20:7c1a)
+	db $04
+	db $03
+	dw $7c23
+	db $00
+	db $80
+
+	INCROM $83c20, $83c26
+
+Data_83c26:: ; 83c26 (20:7c26)
+	db $04
+	db $03
+	dw $7c33
+	db $01
+	db $a0
+
+	INCROM $83c2c, $83c36
+
+Data_83c36:: ; 83c36 (20:7c36)
+	db $03
+	db $03
+	dw $0000
+	db $01
+	db $f7
+
+	INCROM $83c3c, $83c4c
 
 AnimData1:: ; 83c4c (20:7c4c)
 	frame_table AnimFrameTable0
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 7a63b7e..bb800df 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -1536,8 +1536,10 @@ Func_08bf: ; 08bf (0:08bf)
 	inc hl
 	ld [hli], a ; 0
 	ld [hl], $ef
+
+; clear wc000
 	ld h, b
-	ld l, $0
+	ld l, LOW(wc000)
 	xor a
 .asm_8d9
 	ld [hl], a
@@ -1545,10 +1547,11 @@ Func_08bf: ; 08bf (0:08bf)
 	jr nz, .asm_8d9
 	ret
 
+; loops bc times
 Func_08de: ; 08de (0:08de)
 	push hl
 	push de
-.asm_8e0
+.loop
 	push bc
 	call Func_08ef
 	ld [de], a
@@ -1557,7 +1560,7 @@ Func_08de: ; 08de (0:08de)
 	dec bc
 	ld a, c
 	or b
-	jr nz, .asm_8e0
+	jr nz, .loop
 	pop de
 	pop hl
 	ret
@@ -11203,6 +11206,7 @@ ResetDoFrameFunction: ; 3bdb (0:3bdb)
 	pop hl
 	ret
 
+; runs function bc times
 Func_3be4: ; 3be4 (0:3be4)
 	ldh a, [hBankROM]
 	push af
diff --git a/src/gfx.asm b/src/gfx.asm
index 37b92d4..0e5a4cc 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -47,7 +47,591 @@ endr
 
 SECTION "Gfx 3", ROMX
 
-	INCROM $84000, $87828
+Data_84000:: ; 84000 (21:4000)
+	db $1c
+	db $20
+	dw $4164
+	db $00
+	db $e7
+
+	INCROM $84006, $84188
+
+Data_84188:: ; 84188 (21:4188)
+	db $1c
+	db $20
+	dw $4397
+	db $01
+	db $e7
+
+	INCROM $8418e, $843bb
+
+Data_843bb:: ; 843bb (21:43bb)
+	db $1c
+	db $20
+	dw $4511
+	db $00
+	db $e7
+
+	INCROM $843c1, $84533
+
+Data_84533:: ; 84533 (21:4533)
+	db $1c
+	db $20
+	dw $470c
+	db $01
+	db $e7
+
+	INCROM $84539, $8472e
+
+Data_8472e:: ; 8472e (21:472e)
+	db $1c
+	db $20
+	dw $48b4
+	db $00
+	db $e7
+
+	INCROM $84734, $848d8
+
+Data_848d8:: ; 848d8 (21:48d8)
+	db $1c
+	db $20
+	dw $4b4f
+	db $01
+	db $e7
+
+	INCROM $848de, $84b73
+
+Data_84b73:: ; 84b73 (21:4b73)
+	db $1c
+	db $1c
+	dw $4c50
+	db $00
+	db $e7
+
+	INCROM $84b79, $84c6f
+
+Data_84c6f:: ; 84c6f (21:4c6f)
+	db $1c
+	db $1c
+	dw $4ddf
+	db $01
+	db $e7
+
+	INCROM $84c75, $84dfe
+
+Data_84dfe:: ; 84dfe (21:4dfe)
+	db $1c
+	db $20
+	dw $4efe
+	db $00
+	db $eb
+
+	INCROM $84e04, $84f1d
+
+Data_84f1d:: ; 84f1d (21:4f1d)
+	db $1c
+	db $20
+	dw $5097
+	db $01
+	db $eb
+
+	INCROM $84f23, $850b6
+
+Data_850b6:: ; 850b6 (21:50b6)
+	db $1c
+	db $20
+	dw $5175
+	db $00
+	db $e7
+
+	INCROM $850bc, $85191
+
+Data_85191:: ; 85191 (21:5191)
+	db $1c
+	db $20
+	dw $52f9
+	db $01
+	db $e7
+
+	INCROM $85197, $85315
+
+Data_85315:: ; 85315 (21:5315)
+	db $20
+	db $20
+	dw $5484
+	db $00
+	db $e7
+
+	INCROM $8531b, $854b3
+
+Data_854b3:: ; 854b3 (21:54b3)
+	db $20
+	db $20
+	dw $56db
+	db $01
+	db $e7
+
+	INCROM $854b9, $8570a
+
+Data_8570a:: ; 8570a (21:570a)
+	db $20
+	db $12
+	dw $57ba
+	db $00
+	db $ee
+
+	INCROM $85710, $857ce
+
+Data_857ce:: ; 857ce (21:57ce)
+	db $20
+	db $12
+	dw $58db
+	db $01
+	db $ee
+
+	INCROM $857d4, $858ef
+
+Data_858ef:: ; 858ef (21:58ef)
+	db $20
+	db $20
+	dw $5a58
+	db $00
+	db $ec
+
+	INCROM $858f5, $85a79
+
+Data_85a79:: ; 85a79 (21:5a79)
+	db $20
+	db $20
+	dw $5cc1
+	db $01
+	db $ec
+
+	INCROM $85a7f, $85ce2
+
+Data_85ce2:: ; 85ce2 (21:5ce2)
+	db $18
+	db $1a
+	dw $5ddc
+	db $00
+	db $e7
+
+	INCROM $85ce8, $85df4
+
+Data_85df4:: ; 85df4 (21:5df4)
+	db $18
+	db $1a
+	dw $5f64
+	db $01
+	db $e7
+
+	INCROM $85dfa, $85f7c
+
+Data_85f7c:: ; 85f7c (21:5f7c)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $90
+
+	INCROM $85f82, $8607f
+
+Data_8607f:: ; 8607f (21:607f)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $81
+
+	INCROM $86085, $8617d
+
+Data_8617d:: ; 8617d (21:617d)
+	db $03
+	db $03
+	dw $0000
+	db $01
+	db $f7
+
+	INCROM $86183, $86193
+
+Data_86193:: ; 86193 (21:6193)
+	db $03
+	db $03
+	dw $0000
+	db $01
+	db $f7
+
+	INCROM $86199, $861a9
+
+Data_861a9:: ; 861a9 (21:61a9)
+	db $03
+	db $03
+	dw $0000
+	db $01
+	db $f7
+
+	INCROM $861af, $861bf
+
+Data_861bf:: ; 861bf (21:61bf)
+	db $03
+	db $03
+	dw $0000
+	db $01
+	db $f7
+
+	INCROM $861c5, $861d5
+
+Data_861d5:: ; 861d5 (21:61d5)
+	db $03
+	db $03
+	dw $0000
+	db $01
+	db $f7
+
+	INCROM $861db, $861eb
+
+Data_861eb:: ; 861eb (21:61eb)
+	db $03
+	db $03
+	dw $0000
+	db $01
+	db $f7
+
+	INCROM $861f1, $86201
+
+Data_86201:: ; 86201 (21:6201)
+	db $03
+	db $03
+	dw $0000
+	db $01
+	db $f7
+
+	INCROM $86207, $86217
+
+Data_86217:: ; 86217 (21:6217)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $80
+
+	INCROM $8621d, $862da
+
+Data_862da:: ; 862da (21:62da)
+	db $14
+	db $12
+	dw $0000
+	db $00
+	db $83
+
+	INCROM $862e0, $86364
+
+Data_86364:: ; 86364 (21:6364)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $80
+
+	INCROM $8636a, $86443
+
+Data_86443:: ; 86443 (21:6443)
+	db $14
+	db $12
+	dw $0000
+	db $00
+	db $83
+
+	INCROM $86449, $864df
+
+Data_864df:: ; 864df (21:64df)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $80
+
+	INCROM $864e5, $865b5
+
+Data_865b5:: ; 865b5 (21:65b5)
+	db $14
+	db $12
+	dw $0000
+	db $00
+	db $8f
+
+	INCROM $865bb, $86647
+
+Data_86647:: ; 86647 (21:6647)
+	db $08
+	db $0c
+	dw $0000
+	db $00
+	db $ff
+
+	INCROM $8664d, $866b8
+
+Data_866b8:: ; 866b8 (21:66b8)
+	db $08
+	db $0c
+	dw $0000
+	db $01
+	db $d6
+
+	INCROM $866be, $8673e
+
+Data_8673e:: ; 8673e (21:673e)
+	db $08
+	db $0c
+	dw $0000
+	db $00
+	db $ff
+
+	INCROM $86744, $867af
+
+Data_867af:: ; 867af (21:67af)
+	db $08
+	db $0c
+	dw $0000
+	db $01
+	db $d6
+
+	INCROM $867b5, $86833
+
+Data_86833:: ; 86833 (21:6833)
+	db $08
+	db $0c
+	dw $0000
+	db $00
+	db $ff
+
+	INCROM $86839, $868a4
+
+Data_868a4:: ; 868a4 (21:68a4)
+	db $08
+	db $0c
+	dw $0000
+	db $01
+	db $d6
+
+	INCROM $868aa, $86925
+
+Data_86925:: ; 86925 (21:6925)
+	db $08
+	db $0c
+	dw $0000
+	db $00
+	db $ff
+
+	INCROM $8692b, $86996
+
+Data_86996:: ; 86996 (21:6996)
+	db $08
+	db $0c
+	dw $0000
+	db $01
+	db $d6
+
+	INCROM $8699c, $86a14
+
+Data_86a14:: ; 86a14 (21:6a14)
+	db $08
+	db $0c
+	dw $0000
+	db $00
+	db $ff
+
+	INCROM $86a1a, $86a85
+
+Data_86a85:: ; 86a85 (21:6a85)
+	db $08
+	db $0c
+	dw $0000
+	db $01
+	db $ff
+
+	INCROM $86a8b, $86b28
+
+Data_86b28:: ; 86b28 (21:6b28)
+	db $08
+	db $0c
+	dw $0000
+	db $00
+	db $ff
+
+	INCROM $86b2e, $86b99
+
+Data_86b99:: ; 86b99 (21:6b99)
+	db $08
+	db $0c
+	dw $0000
+	db $01
+	db $ff
+
+	INCROM $86b9f, $86c34
+
+Data_86c34:: ; 86c34 (21:6c34)
+	db $08
+	db $0c
+	dw $0000
+	db $00
+	db $ff
+
+	INCROM $86c3a, $86ca5
+
+Data_86ca5:: ; 86ca5 (21:6ca5)
+	db $08
+	db $0c
+	dw $0000
+	db $01
+	db $ff
+
+	INCROM $86cab, $86d37
+
+Data_86d37:: ; 86d37 (21:6d37)
+	db $14
+	db $12
+	dw $0000
+	db $00
+	db $9e
+
+	INCROM $86d3d, $86dcc
+
+Data_86dcc:: ; 86dcc (21:6dcc)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $91
+
+	INCROM $86dd2, $86e8a
+
+Data_86e8a:: ; 86e8a (21:6e8a)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $bf
+
+	INCROM $86e90, $86f18
+
+Data_86f18:: ; 86f18 (21:6f18)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $b0
+
+	INCROM $86f1e, $86fc0
+
+Data_86fc0:: ; 86fc0 (21:6fc0)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $a3
+
+	INCROM $86fc6, $8704f
+
+Data_8704f:: ; 8704f (21:704f)
+	db $14
+	db $12
+	dw $0000
+	db $00
+	db $ff
+
+	INCROM $87055, $871a5
+
+Data_871a5:: ; 871a5 (21:71a5)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $ff
+
+	INCROM $871ab, $87397
+
+Data_87397:: ; 87397 (21:7397)
+	db $08
+	db $04
+	dw $0000
+	db $01
+	db $bf
+
+	INCROM $8739d, $873b7
+
+Data_873b7:: ; 873b7 (21:73b7)
+	db $06
+	db $06
+	dw $0000
+	db $00
+	db $ff
+
+	INCROM $873bd, $873e5
+
+Data_873e5:: ; 873e5 (21:73e5)
+	db $06
+	db $06
+	dw $0000
+	db $00
+	db $ff
+
+	INCROM $873eb, $87413
+
+Data_87413:: ; 87413 (21:7413)
+	db $14
+	db $12
+	dw $0000
+	db $00
+	db $7e
+
+	INCROM $87419, $87538
+
+Data_87538:: ; 87538 (21:7538)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $7e
+
+	INCROM $8753e, $8769f
+
+Data_8769f:: ; 8769f (21:769f)
+	db $14
+	db $12
+	dw $0000
+	db $00
+	db $03
+
+	INCROM $876a5, $876f6
+
+Data_876f6:: ; 876f6 (21:76f6)
+	db $14
+	db $12
+	dw $0000
+	db $01
+	db $00
+
+	INCROM $876fc, $8777c
+
+Data_8777c:: ; 8777c (21:777c)
+	db $14
+	db $12
+	dw $0000
+	db $00
+	db $01
+
+	INCROM $87782, $877c4
+
+Data_877c4:: ; 877c4 (21:77c4)
+	db $14
+	db $12
+	dw $0000
+	db $00
+	db $07
+
+	INCROM $877ca, $87828
+
 
 IshiharaTilesetGfx: ; 87828 (21:7828)
 	dw $4d
-- 
cgit v1.2.3


From c34919a16b9e4e758beb1ef07fb7b84092d6418c Mon Sep 17 00:00:00 2001
From: ElectroDeoxys <ElectroDeoxys@gmail.com>
Date: Mon, 8 Feb 2021 12:07:52 +0000
Subject: Document BG Map decompression stuff

---
 src/engine/bank03.asm |  22 +--
 src/engine/bank1c.asm |   6 +-
 src/engine/bank20.asm | 394 +++++++++++++++++++++----------------------
 src/engine/home.asm   | 101 +++++++----
 src/gfx.asm           | 455 ++++++++++++++++++++++----------------------------
 src/sram.asm          |   5 +
 src/wram.asm          |  24 ++-
 7 files changed, 486 insertions(+), 521 deletions(-)

diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index 87c9401..932de23 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -490,20 +490,21 @@ Func_c38f: ; c38f (3:438f)
 	push bc
 	ld a, [wd23a]
 	ld e, a
-	ld a, [wd23b]
+	ld a, [wd23a + 1]
 	ld d, a
 	or e
-	jr z, .asm_c3c7
+	jr z, .skip
+
 	push hl
-	ld b, $c0
-	call Func_08bf
+	ld b, HIGH(wc000)
+	call InitBGMapDecompression
 	ld a, [wd23d]
 	ld [wTempPointerBank], a
-	ld a, [wd130]
+	ld a, [wBGMapHeight]
 	inc a
 	srl a
 	ld b, a
-	ld a, [wd12f]
+	ld a, [wBGMapWidth]
 	inc a
 	srl a
 	ld c, a
@@ -511,7 +512,7 @@ Func_c38f: ; c38f (3:438f)
 .asm_c3b7
 	push bc
 	ld b, $00
-	call Func_3be4
+	call DecompressBGMapFromBank
 	ld hl, $10
 	add hl, de
 	ld d, h
@@ -519,7 +520,8 @@ Func_c38f: ; c38f (3:438f)
 	pop bc
 	dec b
 	jr nz, .asm_c3b7
-.asm_c3c7
+
+.skip
 	pop bc
 	pop hl
 	ret
@@ -571,10 +573,10 @@ Func_c3ee: ; c3ee (3:43ee)
 	ret
 
 Func_c3ff: ; c3ff (3:43ff)
-	ld a, [wd12f]
+	ld a, [wBGMapWidth]
 	sub $14
 	ld [wd237], a
-	ld a, [wd130]
+	ld a, [wBGMapHeight]
 	sub $12
 	ld [wd238], a
 	call Func_c41c
diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm
index b8ac4fb..10bd58d 100644
--- a/src/engine/bank1c.asm
+++ b/src/engine/bank1c.asm
@@ -260,11 +260,11 @@ Func_701e9: ; 701e9 (1c:41e9)
 	push bc
 	ld e, l
 	ld d, h
-	ld b, $c0
-	call Func_08bf
+	ld b, HIGH(wc000)
+	call InitBGMapDecompression
 	pop bc
 	pop de
-	call Func_08de
+	call DecompressBGMap
 	ret
 
 Func_701fe: ; 701fe (1c:41fe)
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index e11b4d5..c47f37b 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -15,11 +15,12 @@ Func_80028: ; 80028 (20:4028)
 
 Func_80077: ; 80077 (20:4077)
 	ld a, $1
-	ld [wd292], a
+	ld [wBGMapCopyMode], a
 	jr Func_80082
 
 	xor a
-	ld [wd292], a
+	ld [wBGMapCopyMode], a
+;	fallthrough
 
 Func_80082: ; 80082 (20:4082)
 	push hl
@@ -30,24 +31,29 @@ Func_80082: ; 80082 (20:4082)
 	ld [hl], e
 	inc hl
 	ld [hl], d
+
+; get pointer and bank for BG Map
 	call Func_803b9
 	ld a, [wTempPointerBank]
 	ld [wd23d], a
-	ld de, wLoadedPalData
-	ld bc, $0006
+
+; store header data
+	ld de, wBGMapBuffer
+	ld bc, $0006 ; header + 1st instruction
 	call CopyBankedDataToDE
 	ld l, e
 	ld h, d
 	ld a, [hli]
-	ld [wd12f], a
+	ld [wBGMapWidth], a
 	ld a, [hli]
-	ld [wd130], a
+	ld [wBGMapHeight], a
 	ld a, [hli]
 	ld [wd23a], a
 	ld a, [hli]
-	ld [wd23b], a
+	ld [wd23a + 1], a
 	ld a, [hli]
 	ld [wd23c], a
+
 	call Func_800bd
 	pop de
 	pop bc
@@ -65,7 +71,7 @@ Func_800bd: ; 800bd (20:40bd)
 	adc $00
 	ld d, a
 	ld b, HIGH(wc000)
-	call Func_08bf
+	call InitBGMapDecompression
 	ld a, [wVRAMPointer]
 	ld e, a
 	ld a, [wVRAMPointer + 1]
@@ -77,9 +83,10 @@ Func_800bd: ; 800bd (20:40bd)
 	ret
 
 Func_800e0: ; 800e0 (20:40e0)
+; if wd23c != 0, then use double wBGMapWidth
 	push hl
 	ld hl, wd28e
-	ld a, [wd12f]
+	ld a, [wBGMapWidth]
 	ld [hl], a
 	ld a, [wd23c]
 	or a
@@ -88,14 +95,15 @@ Func_800e0: ; 800e0 (20:40e0)
 .asm_800f0
 
 	ld c, $40
-	ld hl, wLoadedPalData
+	ld hl, wBGMapBuffer
 	xor a
 .loop_clear
 	ld [hli], a
 	dec c
 	jr nz, .loop_clear
 
-	ld a, [wd130]
+; loop each row, up to the number of tiles in height
+	ld a, [wBGMapHeight]
 	ld c, a
 .loop
 	push bc
@@ -103,36 +111,37 @@ Func_800e0: ; 800e0 (20:40e0)
 	ld b, $00
 	ld a, [wd28e]
 	ld c, a
-	ld de, wLoadedPalData
-	call Func_3be4
-	ld a, [wd12f]
+	ld de, wBGMapBuffer
+	call DecompressBGMapFromBank
+
+	ld a, [wBGMapWidth]
 	ld b, a
 	pop de
 	push de
-	ld hl, wLoadedPalData
-	call Func_8016e
+	ld hl, wBGMapBuffer
+	call CopyBGDataToVRAMOrSRAM
 	ld a, [wConsole]
 	cp CONSOLE_CGB
-	jr nz, .asm_8013b
+	jr nz, .next_row
 
 	; cgb only
 	call BankswitchVRAM1
-	ld a, [wd12f]
+	ld a, [wBGMapWidth]
 	ld c, a
 	ld b, $00
-	ld hl, wLoadedPalData
+	ld hl, wBGMapBuffer
 	add hl, bc
 	pop de
 	push de
-	ld a, [wd12f]
+	ld a, [wBGMapWidth]
 	ld b, a
 	call Func_80148
-	call Func_8016e
+	call CopyBGDataToVRAMOrSRAM
 	call BankswitchVRAM0
 
-.asm_8013b
+.next_row
 	pop de
-	ld hl, $20
+	ld hl, BG_MAP_WIDTH
 	add hl, de
 	ld e, l
 	ld d, h
@@ -150,36 +159,47 @@ Func_80148: ; 80148 (20:4148)
 	ld a, [wd23c]
 	or a
 	jr z, .asm_80162
+
+; add wd291 to b bytes in hl
 	push hl
 	push bc
-.asm_80155
+.loop_1
 	push bc
 	ld a, [wd291]
 	add [hl]
 	ld [hli], a
 	pop bc
 	dec b
-	jr nz, .asm_80155
+	jr nz, .loop_1
 	pop bc
 	pop hl
 	ret
+
+; store wd291 to b bytes in hl
 .asm_80162
 	push hl
 	push bc
 	ld a, [wd291]
-.asm_80167
+.loop_2
 	ld [hli], a
 	dec b
-	jr nz, .asm_80167
+	jr nz, .loop_2
 	pop bc
 	pop hl
 	ret
 
-Func_8016e: ; 8016e (20:416e)
-	ld a, [wd292]
+; copies BG Map data pointed by hl
+; to either VRAM or SRAM, depending on wBGMapCopyMode
+; de is the target address in VRAM,
+; if SRAM is the target address to copy,
+; copies data to s0BGMap or s1BGMap
+; for VRAM0 or VRAM1 respectively
+CopyBGDataToVRAMOrSRAM: ; 8016e (20:416e)
+	ld a, [wBGMapCopyMode]
 	or a
 	jp z, SafeCopyDataHLtoDE
 
+; copies b bytes from hl to SRAM1
 	push hl
 	push bc
 	push de
@@ -188,12 +208,12 @@ Func_8016e: ; 8016e (20:416e)
 	ld a, BANK("SRAM1")
 	call BankswitchSRAM
 	push hl
-	ld hl, $800
+	ld hl, s0BGMap - v0BGMap0
 	ldh a, [hBankVRAM]
 	or a
-	jr z, .asm_8018c
-	ld hl, $c00
-.asm_8018c
+	jr z, .got_pointer
+	ld hl, s1BGMap - v1BGMap0
+.got_pointer
 	add hl, de
 	ld e, l
 	ld d, h
@@ -412,6 +432,7 @@ Func_802bb: ; 802bb (20:42bb)
 
 	INCROM $802d4, $803b9
 
+; gets pointer to BG map with ID from wd131
 Func_803b9: ; 803b9 (20:43b9)
 	ld l, $00
 	ld a, [wd131]
@@ -578,7 +599,7 @@ Func_80b89: ; 80b89 (20:4b89)
 	push af
 	ld c, a
 	ld a, $01
-	ld [wd292], a
+	ld [wBGMapCopyMode], a
 	ld b, $00
 	ld hl, wd323
 	add hl, bc
@@ -596,7 +617,7 @@ Func_80b89: ; 80b89 (20:4b89)
 Func_80ba4: ; 80ba4 (20:4ba4)
 	push af
 	xor a
-	ld [wd292], a
+	ld [wBGMapCopyMode], a
 	pop af
 ;	Fallthrough
 
@@ -609,13 +630,13 @@ Func_80baa: ; 80baa (20:4baa)
 	push af
 	ld a, [wd23d]
 	push af
-	ld a, [wd12f]
+	ld a, [wBGMapWidth]
 	push af
-	ld a, [wd130]
+	ld a, [wBGMapHeight]
 	push af
 	ld a, [wd23a]
 	push af
-	ld a, [wd23b]
+	ld a, [wd23a + 1]
 	push af
 	ld b, $0
 	ld hl, wd323
@@ -658,13 +679,13 @@ Func_80baa: ; 80baa (20:4baa)
 	add hl, bc
 	farcall Func_c38f
 	pop af
-	ld [wd23b], a
+	ld [wd23a + 1], a
 	pop af
 	ld [wd23a], a
 	pop af
-	ld [wd130], a
+	ld [wBGMapHeight], a
 	pop af
-	ld [wd12f], a
+	ld [wBGMapWidth], a
 	pop af
 	ld [wd23d], a
 	pop af
@@ -1415,373 +1436,332 @@ MapDataPointers_81697: ; 81697 (20:5697)
 	palette_pointer Palette160, 1, 0 ; PALETTE_160
 
 Data_8191b:: ; 8191b (20:591b)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $00
-	db $dd
 
-	INCROM $81921, $81a22
+	INCROM $81920, $81a22
 
 Data_81a22:: ; 81a22 (20:5a22)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $dd
 
-	INCROM $81a28, $81c13
+	INCROM $81a27, $81c13
 
 Data_81c13:: ; 81c13 (20:5c13)
-	db $1c
-	db $1e
+	db $1c ; width
+	db $1e ; height
 	dw $5d11
 	db $00
-	db $e7
 
-	INCROM $81c19, $81d2e
+	INCROM $81c18, $81d2e
 
 Data_81d2e:: ; 81d2e (20:5d2e)
-	db $1c
-	db $1e
+	db $1c ; width
+	db $1e ; height
 	dw $5eb4
 	db $01
-	db $e7
 
-	INCROM $81d34, $81ed1
+	INCROM $81d33, $81ed1
 
 Data_81ed1:: ; 81ed1 (20:5ed1)
-	db $04
-	db $06
+	db $04 ; width
+	db $06 ; height
 	dw $5ef0
 	db $00
-	db $ff
 
-	INCROM $81ed7, $81ef5
+	INCROM $81ed6, $81ef5
 
 Data_81ef5:: ; 81ef5 (20:5ef5)
-	db $04
-	db $06
+	db $04 ; width
+	db $06 ; height
 	dw $5f21
 	db $01
-	db $fb
 
-	INCROM $81efb, $81f26
+	INCROM $81efa, $81f26
 
 Data_81f26:: ; 81f26 (20:5f26)
-	db $18
-	db $1e
+	db $18 ; width
+	db $1e ; height
 	dw $5fd3
 	db $00
-	db $fd
 
-	INCROM $81f2c, $81feb
+	INCROM $81f2b, $81feb
 
 Data_81feb:: ; 81feb (20:5feb)
-	db $18
-	db $1e
+	db $18 ; width
+	db $1e ; height
 	dw $612b
 	db $01
-	db $fd
 
-	INCROM $81ff1, $82143
+	INCROM $81ff0, $82143
 
 Data_82143:: ; 82143 (20:6143)
-	db $04
-	db $01
+	db $04 ; width
+	db $01 ; height
 	dw $614d
 	db $00
-	db $f0
 
-	INCROM $82149, $82150
+	INCROM $82148, $82150
 
 Data_82150:: ; 82150 (20:6150)
-	db $04
-	db $01
+	db $04 ; width
+	db $01 ; height
 	dw $615d
 	db $01
-	db $f8
 
-	INCROM $82156, $82160
+	INCROM $82155, $82160
 
 Data_82160:: ; 82160 (20:6160)
-	db $14
-	db $18
+	db $14 ; width
+	db $18 ; height
 	dw $620e
 	db $00
-	db $ef
 
-	INCROM $82166, $82222
+	INCROM $82165, $82222
 
 Data_82222:: ; 82222 (20:6222)
-	db $14
-	db $18
+	db $14 ; width
+	db $18 ; height
 	dw $6322
 	db $01
-	db $ee
 
-	INCROM $82228, $82336
+	INCROM $82227, $82336
 
 Data_82336:: ; 82336 (20:6336)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $63ec
 	db $00
-	db $ef
 
-	INCROM $8233c, $82400
+	INCROM $8233b, $82400
 
 Data_82400:: ; 82400 (20:6400)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $6509
 	db $01
-	db $ef
 
-	INCROM $82406, $8251d
+	INCROM $82405, $8251d
 
 Data_8251d:: ; 8251d (20:651d)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $65d3
 	db $00
-	db $ef
 
-	INCROM $82523, $825e7
+	INCROM $82522, $825e7
 
 Data_825e7:: ; 825e7 (20:65e7)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $66f0
 	db $01
-	db $ef
 
-	INCROM $825ed, $82704
+	INCROM $825ec, $82704
 
 Data_82704:: ; 82704 (20:6704)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $67ba
 	db $00
-	db $ef
 
-	INCROM $8270a, $827ce
+	INCROM $82709, $827ce
 
 Data_827ce:: ; 827ce (20:67ce)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $68d7
 	db $01
-	db $ef
 
-	INCROM $827d4, $828eb
+	INCROM $827d3, $828eb
 
 Data_828eb:: ; 828eb (20:68eb)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $69a1
 	db $00
-	db $ef
 
-	INCROM $828f1, $829b5
+	INCROM $828f0, $829b5
 
 Data_829b5:: ; 829b5 (20:69b5)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $6abe
 	db $01
-	db $ef
 
-	INCROM $829bb, $82ad2
+	INCROM $829ba, $82ad2
 
 Data_82ad2:: ; 82ad2 (20:6ad2)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $6b88
 	db $00
-	db $ef
 
-	INCROM $82ad8, $82b9c
+	INCROM $82ad7, $82b9c
 
 Data_82b9c:: ; 82b9c (20:6b9c)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $6ca5
 	db $01
-	db $ef
 
-	INCROM $82ba2, $82cb9
+	INCROM $82ba1, $82cb9
 
 Data_82cb9:: ; 82cb9 (20:6cb9)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $6d6f
 	db $00
-	db $ef
 
-	INCROM $82cbf, $82d83
+	INCROM $82cbe, $82d83
 
 Data_82d83:: ; 82d83 (20:6d83)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $6e8c
 	db $01
-	db $ef
 
-	INCROM $82d89, $82ea0
+	INCROM $82d88, $82ea0
 
 Data_82ea0:: ; 82ea0 (20:6ea0)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $6f56
 	db $00
-	db $ef
 
-	INCROM $82ea6, $82f6a
+	INCROM $82ea5, $82f6a
 
 Data_82f6a:: ; 82f6a (20:6f6a)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $7073
 	db $01
-	db $ef
 
-	INCROM $82f70, $83087
+	INCROM $82f6f, $83087
 
 Data_83087:: ; 83087 (20:7087)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $713d
 	db $00
-	db $ef
 
-	INCROM $8308d, $83151
+	INCROM $8308c, $83151
 
 Data_83151:: ; 83151 (20:7151)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $725a
 	db $01
-	db $ef
 
-	INCROM $83157, $8326e
+	INCROM $83156, $8326e
 
 Data_8326e:: ; 8326e (20:726e)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $730d
 	db $00
-	db $ef
 
-	INCROM $83274, $83321
+	INCROM $83273, $83321
 
 Data_83321:: ; 83321 (20:7321)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $7410
 	db $01
-	db $ef
 
-	INCROM $83327, $83424
+	INCROM $83326, $83424
 
 Data_83424:: ; 83424 (20:7424)
-	db $1c
-	db $1a
+	db $1c ; width
+	db $1a ; height
 	dw $7529
 	db $00
-	db $e7
 
-	INCROM $8342a, $83545
+	INCROM $83429, $83545
 
 Data_83545:: ; 83545 (20:7545)
-	db $1c
-	db $1a
+	db $1c ; width
+	db $1a ; height
 	dw $76bf
 	db $01
-	db $e7
 
-	INCROM $8354b, $836db
+	INCROM $8354a, $836db
 
 Data_836db:: ; 836db (20:76db)
-	db $18
-	db $12
+	db $18 ; width
+	db $12 ; height
 	dw $777b
 	db $00
-	db $e7
 
-	INCROM $836e1, $8378c
+	INCROM $836e0, $8378c
 
 Data_8378c:: ; 8378c (20:778c)
-	db $18
-	db $12
+	db $18 ; width
+	db $12 ; height
 	dw $787c
 	db $01
-	db $e7
 
-	INCROM $83792, $8388d
+	INCROM $83791, $8388d
 
 Data_8388d:: ; 8388d (20:788d)
-	db $1c
-	db $1e
+	db $1c ; width
+	db $1e ; height
 	dw $79b5
 	db $00
-	db $e7
 
-	INCROM $83893, $839d6
+	INCROM $83892, $839d6
 
 Data_839d6:: ; 839d6 (20:79d6)
-	db $1c
-	db $1e
+	db $1c ; width
+	db $1e ; height
 	dw $7bd0
 	db $01
-	db $e7
 
-	INCROM $839dc, $83bf1
+	INCROM $839db, $83bf1
 
 Data_83bf1:: ; 83bf1 (20:7bf1)
-	db $04
-	db $03
+	db $04 ; width
+	db $03 ; height
 	dw $7c00
 	db $00
-	db $d8
 
-	INCROM $83bf7, $83c03
+	INCROM $83bf6, $83c03
 
 Data_83c03:: ; 83c03 (20:7c03)
-	db $04
-	db $03
+	db $04 ; width
+	db $03 ; height
 	dw $7c17
 	db $01
-	db $d6
 
-	INCROM $83c09, $83c1a
+	INCROM $83c08, $83c1a
 
 Data_83c1a:: ; 83c1a (20:7c1a)
-	db $04
-	db $03
+	db $04 ; width
+	db $03 ; height
 	dw $7c23
 	db $00
-	db $80
 
-	INCROM $83c20, $83c26
+	INCROM $83c1f, $83c26
 
 Data_83c26:: ; 83c26 (20:7c26)
-	db $04
-	db $03
+	db $04 ; width
+	db $03 ; height
 	dw $7c33
 	db $01
-	db $a0
 
-	INCROM $83c2c, $83c36
+	INCROM $83c2b, $83c36
 
 Data_83c36:: ; 83c36 (20:7c36)
-	db $03
-	db $03
+	db $03 ; width
+	db $03 ; height
 	dw $0000
 	db $01
-	db $f7
 
-	INCROM $83c3c, $83c4c
+	INCROM $83c3b, $83c4c
 
 AnimData1:: ; 83c4c (20:7c4c)
 	frame_table AnimFrameTable0
@@ -1792,4 +1772,6 @@ AnimData1:: ; 83c4c (20:7c4c)
 Palette110:: ; 83c5b (20:7c5b)
 	db $00, $00
 
-	INCROM $83c5d, $84000
+rept $3a3
+	db $ff
+endr
diff --git a/src/engine/home.asm b/src/engine/home.asm
index bb800df..47e48ff 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -1519,7 +1519,13 @@ UpdateRNGSources: ; 089b (0:089b)
 	pop hl
 	ret
 
-Func_08bf: ; 08bf (0:08bf)
+; initilizes variables used to decompress
+; BG Map data in DecompressBGMap
+; de points to the source of compressed data
+; b is used as the HIGH byte of the
+; WRAM address to write to ($100 bytes of buffer space)
+; also clears this $100 byte space
+InitBGMapDecompression: ; 08bf (0:08bf)
 	ld hl, wcad6
 	ld [hl], e
 	inc hl
@@ -1528,32 +1534,37 @@ Func_08bf: ; 08bf (0:08bf)
 	ld [hl], $1
 	inc hl
 	xor a
-	ld [hli], a
-	ld [hli], a
-	ld [hli], a
-	ld [hli], a
-	ld [hl], b
+	ld [hli], a ; wcad9
+	ld [hli], a ; wcada
+	ld [hli], a ; wcadb
+	ld [hli], a ; wcadc
+	ld [hl], b  ; wcadd
 	inc hl
-	ld [hli], a ; 0
-	ld [hl], $ef
+	ld [hli], a ; wcade
+	ld [hl], $ef ; wcadf
 
-; clear wc000
+; clear buffer
 	ld h, b
 	ld l, LOW(wc000)
 	xor a
-.asm_8d9
+.loop
 	ld [hl], a
 	inc l
-	jr nz, .asm_8d9
+	jr nz, .loop
 	ret
 
-; loops bc times
-Func_08de: ; 08de (0:08de)
+; decompresses BG Map data
+; uses values initialized by InitBGMapDecompression
+; wcad6 holds the pointer for compressed source
+; input:
+; bc = map width
+; de = buffer to place decompressed data
+DecompressBGMap: ; 08de (0:08de)
 	push hl
 	push de
 .loop
 	push bc
-	call Func_08ef
+	call .Decompress
 	ld [de], a
 	inc de
 	pop bc
@@ -1565,36 +1576,48 @@ Func_08de: ; 08de (0:08de)
 	pop hl
 	ret
 
-Func_08ef: ; 08ef (0:08ef)
+; instructions start with a byte stored in wcad9
+; its bits are read from higher to lower bit
+; wcad8 stores the current bit being read
+; bit set:
+; - 1 byte read and copied literally
+; bit not set:
+; - 2 bytes read WW XY ZZ, byte in pos WW
+; copied (X + 1) times, then in pos ZZ
+; copied (Y + 1) times
+.Decompress: ; 08ef (0:08ef)
 	ld hl, wcadc
 	ld a, [hl]
 	or a
-	jr z, .asm_902
+	jr z, .read_instruction
+
+; still repeating byte
 	dec [hl]
 	inc hl
-.asm_8f8
-	ld b, [hl]
+.repeat_byte
+	ld b, [hl] ; wcadd
 	inc hl
-	ld c, [hl]
+	ld c, [hl] ; wcade
 	inc [hl]
 	inc hl
 	ld a, [bc]
-	ld c, [hl]
+	ld c, [hl] ; wcadf
 	inc [hl]
 	ld [bc], a
 	ret
-.asm_902
+
+.read_instruction
 	ld hl, wcad6
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
-	inc hl
+	inc hl ; wcad8
 	dec [hl]
-	inc hl
+	inc hl ; wcad9
 	jr nz, .asm_914
-	dec hl
-	ld [hl], $8
-	inc hl
+	dec hl ; wcad8
+	ld [hl], $8 ; number of bits
+	inc hl ; wcad9
 	ld a, [bc]
 	inc bc
 	ld [hl], a
@@ -1603,6 +1626,8 @@ Func_08ef: ; 08ef (0:08ef)
 	ld a, [bc]
 	inc bc
 	jr nc, .asm_92a
+
+; copy 1 byte literally
 	ld hl, wcad6
 	ld [hl], c
 	inc hl
@@ -1611,10 +1636,11 @@ Func_08ef: ; 08ef (0:08ef)
 	ld b, [hl]
 	inc hl
 	inc hl
-	ld c, [hl]
+	ld c, [hl] ; wcadf
 	inc [hl]
 	ld [bc], a
 	ret
+
 .asm_92a
 	ld [wcade], a
 	ld hl, wcada
@@ -1624,23 +1650,24 @@ Func_08ef: ; 08ef (0:08ef)
 	inc hl
 	ld a, [bc]
 	inc bc
-	ld [hli], a
+	ld [hli], a ; wcadb
 	swap a
 .asm_93c
 	and $f
-	inc a
-	ld [hli], a
+	inc a ; number of times to repeat
+	ld [hli], a ; wcadc
 	push hl
 	ld hl, wcad6
 	ld [hl], c
 	inc hl
 	ld [hl], b
 	pop hl
-	jr .asm_8f8
+	jr .repeat_byte
+
 .asm_94a
 	res 0, [hl]
 	inc hl
-	ld a, [hli]
+	ld a, [hli] ; wcadb
 	jr .asm_93c
 
 ; set attributes for [hl] sprites starting from wOAM + [wOAMOffset] / 4
@@ -11206,13 +11233,17 @@ ResetDoFrameFunction: ; 3bdb (0:3bdb)
 	pop hl
 	ret
 
-; runs function bc times
-Func_3be4: ; 3be4 (0:3be4)
+; decompresses BG Map data from a given bank
+; uses values initialized by InitBGMapDecompression
+; input:
+; bc = map width
+; de = buffer to place decompressed data
+DecompressBGMapFromBank: ; 3be4 (0:3be4)
 	ldh a, [hBankROM]
 	push af
 	ld a, [wTempPointerBank]
 	call BankswitchROM
-	call Func_08de
+	call DecompressBGMap
 	pop af
 	call BankswitchROM
 	ret
diff --git a/src/gfx.asm b/src/gfx.asm
index 0e5a4cc..727c146 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -48,589 +48,524 @@ endr
 SECTION "Gfx 3", ROMX
 
 Data_84000:: ; 84000 (21:4000)
-	db $1c
-	db $20
+	db $1c ; width
+	db $20 ; height
 	dw $4164
 	db $00
-	db $e7
 
-	INCROM $84006, $84188
+	INCROM $84005, $84188
 
 Data_84188:: ; 84188 (21:4188)
-	db $1c
-	db $20
+	db $1c ; width
+	db $20 ; height
 	dw $4397
 	db $01
-	db $e7
 
-	INCROM $8418e, $843bb
+	INCROM $8418d, $843bb
 
 Data_843bb:: ; 843bb (21:43bb)
-	db $1c
-	db $20
+	db $1c ; width
+	db $20 ; height
 	dw $4511
 	db $00
-	db $e7
 
-	INCROM $843c1, $84533
+	INCROM $843c0, $84533
 
 Data_84533:: ; 84533 (21:4533)
-	db $1c
-	db $20
+	db $1c ; width
+	db $20 ; height
 	dw $470c
 	db $01
-	db $e7
 
-	INCROM $84539, $8472e
+	INCROM $84538, $8472e
 
 Data_8472e:: ; 8472e (21:472e)
-	db $1c
-	db $20
+	db $1c ; width
+	db $20 ; height
 	dw $48b4
 	db $00
-	db $e7
 
-	INCROM $84734, $848d8
+	INCROM $84733, $848d8
 
 Data_848d8:: ; 848d8 (21:48d8)
-	db $1c
-	db $20
+	db $1c ; width
+	db $20 ; height
 	dw $4b4f
 	db $01
-	db $e7
 
-	INCROM $848de, $84b73
+	INCROM $848dd, $84b73
 
 Data_84b73:: ; 84b73 (21:4b73)
-	db $1c
-	db $1c
+	db $1c ; width
+	db $1c ; height
 	dw $4c50
 	db $00
-	db $e7
 
-	INCROM $84b79, $84c6f
+	INCROM $84b78, $84c6f
 
 Data_84c6f:: ; 84c6f (21:4c6f)
-	db $1c
-	db $1c
+	db $1c ; width
+	db $1c ; height
 	dw $4ddf
 	db $01
-	db $e7
 
-	INCROM $84c75, $84dfe
+	INCROM $84c74, $84dfe
 
 Data_84dfe:: ; 84dfe (21:4dfe)
-	db $1c
-	db $20
+	db $1c ; width
+	db $20 ; height
 	dw $4efe
 	db $00
-	db $eb
 
-	INCROM $84e04, $84f1d
+	INCROM $84e03, $84f1d
 
 Data_84f1d:: ; 84f1d (21:4f1d)
-	db $1c
-	db $20
+	db $1c ; width
+	db $20 ; height
 	dw $5097
 	db $01
-	db $eb
 
-	INCROM $84f23, $850b6
+	INCROM $84f22, $850b6
 
 Data_850b6:: ; 850b6 (21:50b6)
-	db $1c
-	db $20
+	db $1c ; width
+	db $20 ; height
 	dw $5175
 	db $00
-	db $e7
 
-	INCROM $850bc, $85191
+	INCROM $850bb, $85191
 
 Data_85191:: ; 85191 (21:5191)
-	db $1c
-	db $20
+	db $1c ; width
+	db $20 ; height
 	dw $52f9
 	db $01
-	db $e7
 
-	INCROM $85197, $85315
+	INCROM $85196, $85315
 
 Data_85315:: ; 85315 (21:5315)
-	db $20
-	db $20
+	db $20 ; width
+	db $20 ; height
 	dw $5484
 	db $00
-	db $e7
 
-	INCROM $8531b, $854b3
+	INCROM $8531a, $854b3
 
 Data_854b3:: ; 854b3 (21:54b3)
-	db $20
-	db $20
+	db $20 ; width
+	db $20 ; height
 	dw $56db
 	db $01
-	db $e7
 
-	INCROM $854b9, $8570a
+	INCROM $854b8, $8570a
 
 Data_8570a:: ; 8570a (21:570a)
-	db $20
-	db $12
+	db $20 ; width
+	db $12 ; height
 	dw $57ba
 	db $00
-	db $ee
 
-	INCROM $85710, $857ce
+	INCROM $8570f, $857ce
 
 Data_857ce:: ; 857ce (21:57ce)
-	db $20
-	db $12
+	db $20 ; width
+	db $12 ; height
 	dw $58db
 	db $01
-	db $ee
 
-	INCROM $857d4, $858ef
+	INCROM $857d3, $858ef
 
 Data_858ef:: ; 858ef (21:58ef)
-	db $20
-	db $20
+	db $20 ; width
+	db $20 ; height
 	dw $5a58
 	db $00
-	db $ec
 
-	INCROM $858f5, $85a79
+	INCROM $858f4, $85a79
 
 Data_85a79:: ; 85a79 (21:5a79)
-	db $20
-	db $20
+	db $20 ; width
+	db $20 ; height
 	dw $5cc1
 	db $01
-	db $ec
 
-	INCROM $85a7f, $85ce2
+	INCROM $85a7e, $85ce2
 
 Data_85ce2:: ; 85ce2 (21:5ce2)
-	db $18
-	db $1a
+	db $18 ; width
+	db $1a ; height
 	dw $5ddc
 	db $00
-	db $e7
 
-	INCROM $85ce8, $85df4
+	INCROM $85ce7, $85df4
 
 Data_85df4:: ; 85df4 (21:5df4)
-	db $18
-	db $1a
+	db $18 ; width
+	db $1a ; height
 	dw $5f64
 	db $01
-	db $e7
 
-	INCROM $85dfa, $85f7c
+	INCROM $85df9, $85f7c
 
 Data_85f7c:: ; 85f7c (21:5f7c)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $90
 
-	INCROM $85f82, $8607f
+	INCROM $85f81, $8607f
 
 Data_8607f:: ; 8607f (21:607f)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $81
 
-	INCROM $86085, $8617d
+	INCROM $86084, $8617d
 
 Data_8617d:: ; 8617d (21:617d)
-	db $03
-	db $03
+	db $03 ; width
+	db $03 ; height
 	dw $0000
 	db $01
-	db $f7
 
-	INCROM $86183, $86193
+	INCROM $86182, $86193
 
 Data_86193:: ; 86193 (21:6193)
-	db $03
-	db $03
+	db $03 ; width
+	db $03 ; height
 	dw $0000
 	db $01
-	db $f7
 
-	INCROM $86199, $861a9
+	INCROM $86198, $861a9
 
 Data_861a9:: ; 861a9 (21:61a9)
-	db $03
-	db $03
+	db $03 ; width
+	db $03 ; height
 	dw $0000
 	db $01
-	db $f7
 
-	INCROM $861af, $861bf
+	INCROM $861ae, $861bf
 
 Data_861bf:: ; 861bf (21:61bf)
-	db $03
-	db $03
+	db $03 ; width
+	db $03 ; height
 	dw $0000
 	db $01
-	db $f7
 
-	INCROM $861c5, $861d5
+	INCROM $861c4, $861d5
 
 Data_861d5:: ; 861d5 (21:61d5)
-	db $03
-	db $03
+	db $03 ; width
+	db $03 ; height
 	dw $0000
 	db $01
-	db $f7
 
-	INCROM $861db, $861eb
+	INCROM $861da, $861eb
 
 Data_861eb:: ; 861eb (21:61eb)
-	db $03
-	db $03
+	db $03 ; width
+	db $03 ; height
 	dw $0000
 	db $01
-	db $f7
 
-	INCROM $861f1, $86201
+	INCROM $861f0, $86201
 
 Data_86201:: ; 86201 (21:6201)
-	db $03
-	db $03
+	db $03 ; width
+	db $03 ; height
 	dw $0000
 	db $01
-	db $f7
 
-	INCROM $86207, $86217
+	INCROM $86206, $86217
 
 Data_86217:: ; 86217 (21:6217)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $80
 
-	INCROM $8621d, $862da
+	INCROM $8621c, $862da
 
 Data_862da:: ; 862da (21:62da)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $00
-	db $83
 
-	INCROM $862e0, $86364
+	INCROM $862df, $86364
 
 Data_86364:: ; 86364 (21:6364)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $80
 
-	INCROM $8636a, $86443
+	INCROM $86369, $86443
 
 Data_86443:: ; 86443 (21:6443)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $00
-	db $83
 
-	INCROM $86449, $864df
+	INCROM $86448, $864df
 
 Data_864df:: ; 864df (21:64df)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $80
 
-	INCROM $864e5, $865b5
+	INCROM $864e4, $865b5
 
 Data_865b5:: ; 865b5 (21:65b5)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $00
-	db $8f
 
-	INCROM $865bb, $86647
+	INCROM $865ba, $86647
 
 Data_86647:: ; 86647 (21:6647)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $00
-	db $ff
 
-	INCROM $8664d, $866b8
+	INCROM $8664c, $866b8
 
 Data_866b8:: ; 866b8 (21:66b8)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $01
-	db $d6
 
-	INCROM $866be, $8673e
+	INCROM $866bd, $8673e
 
 Data_8673e:: ; 8673e (21:673e)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $00
-	db $ff
 
-	INCROM $86744, $867af
+	INCROM $86743, $867af
 
 Data_867af:: ; 867af (21:67af)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $01
-	db $d6
 
-	INCROM $867b5, $86833
+	INCROM $867b4, $86833
 
 Data_86833:: ; 86833 (21:6833)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $00
-	db $ff
 
-	INCROM $86839, $868a4
+	INCROM $86838, $868a4
 
 Data_868a4:: ; 868a4 (21:68a4)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $01
-	db $d6
 
-	INCROM $868aa, $86925
+	INCROM $868a9, $86925
 
 Data_86925:: ; 86925 (21:6925)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $00
-	db $ff
 
-	INCROM $8692b, $86996
+	INCROM $8692a, $86996
 
 Data_86996:: ; 86996 (21:6996)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $01
-	db $d6
 
-	INCROM $8699c, $86a14
+	INCROM $8699b, $86a14
 
 Data_86a14:: ; 86a14 (21:6a14)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $00
-	db $ff
 
-	INCROM $86a1a, $86a85
+	INCROM $86a19, $86a85
 
 Data_86a85:: ; 86a85 (21:6a85)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $01
-	db $ff
 
-	INCROM $86a8b, $86b28
+	INCROM $86a8a, $86b28
 
 Data_86b28:: ; 86b28 (21:6b28)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $00
-	db $ff
 
-	INCROM $86b2e, $86b99
+	INCROM $86b2d, $86b99
 
 Data_86b99:: ; 86b99 (21:6b99)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $01
-	db $ff
 
-	INCROM $86b9f, $86c34
+	INCROM $86b9e, $86c34
 
 Data_86c34:: ; 86c34 (21:6c34)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $00
-	db $ff
 
-	INCROM $86c3a, $86ca5
+	INCROM $86c39, $86ca5
 
 Data_86ca5:: ; 86ca5 (21:6ca5)
-	db $08
-	db $0c
+	db $08 ; width
+	db $0c ; height
 	dw $0000
 	db $01
-	db $ff
 
-	INCROM $86cab, $86d37
+	INCROM $86caa, $86d37
 
 Data_86d37:: ; 86d37 (21:6d37)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $00
-	db $9e
 
-	INCROM $86d3d, $86dcc
+	INCROM $86d3c, $86dcc
 
 Data_86dcc:: ; 86dcc (21:6dcc)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $91
 
-	INCROM $86dd2, $86e8a
+	INCROM $86dd1, $86e8a
 
 Data_86e8a:: ; 86e8a (21:6e8a)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $bf
 
-	INCROM $86e90, $86f18
+	INCROM $86e8f, $86f18
 
 Data_86f18:: ; 86f18 (21:6f18)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $b0
 
-	INCROM $86f1e, $86fc0
+	INCROM $86f1d, $86fc0
 
 Data_86fc0:: ; 86fc0 (21:6fc0)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $a3
 
-	INCROM $86fc6, $8704f
+	INCROM $86fc5, $8704f
 
 Data_8704f:: ; 8704f (21:704f)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $00
-	db $ff
 
-	INCROM $87055, $871a5
+	INCROM $87054, $871a5
 
 Data_871a5:: ; 871a5 (21:71a5)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $ff
 
-	INCROM $871ab, $87397
+	INCROM $871aa, $87397
 
 Data_87397:: ; 87397 (21:7397)
-	db $08
-	db $04
+	db $08 ; width
+	db $04 ; height
 	dw $0000
 	db $01
-	db $bf
 
-	INCROM $8739d, $873b7
+	INCROM $8739c, $873b7
 
 Data_873b7:: ; 873b7 (21:73b7)
-	db $06
-	db $06
+	db $06 ; width
+	db $06 ; height
 	dw $0000
 	db $00
-	db $ff
 
-	INCROM $873bd, $873e5
+	INCROM $873bc, $873e5
 
 Data_873e5:: ; 873e5 (21:73e5)
-	db $06
-	db $06
+	db $06 ; width
+	db $06 ; height
 	dw $0000
 	db $00
-	db $ff
 
-	INCROM $873eb, $87413
+	INCROM $873ea, $87413
 
 Data_87413:: ; 87413 (21:7413)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $00
-	db $7e
 
-	INCROM $87419, $87538
+	INCROM $87418, $87538
 
 Data_87538:: ; 87538 (21:7538)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $7e
 
-	INCROM $8753e, $8769f
+	INCROM $8753d, $8769f
 
 Data_8769f:: ; 8769f (21:769f)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $00
-	db $03
 
-	INCROM $876a5, $876f6
+	INCROM $876a4, $876f6
 
 Data_876f6:: ; 876f6 (21:76f6)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $01
-	db $00
 
-	INCROM $876fc, $8777c
+	INCROM $876fb, $8777c
 
 Data_8777c:: ; 8777c (21:777c)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $00
-	db $01
 
-	INCROM $87782, $877c4
+	INCROM $87781, $877c4
 
 Data_877c4:: ; 877c4 (21:77c4)
-	db $14
-	db $12
+	db $14 ; width
+	db $12 ; height
 	dw $0000
 	db $00
-	db $07
 
-	INCROM $877ca, $87828
+	INCROM $877c9, $87828
 
 
 IshiharaTilesetGfx: ; 87828 (21:7828)
diff --git a/src/sram.asm b/src/sram.asm
index 09c4e67..512d96a 100644
--- a/src/sram.asm
+++ b/src/sram.asm
@@ -98,6 +98,11 @@ sba68:: ; ba68
 
 SECTION "SRAM1", SRAM
 
+; from VRAM0
+s0BGMap:: ds $400 ; a000
+; from VRAM1
+s1BGMap:: ds $400 ; a400
+
 SECTION "SRAM2", SRAM
 
 	ds $1c00
diff --git a/src/wram.asm b/src/wram.asm
index 753923a..849b45c 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -2076,10 +2076,10 @@ wPCLastDirectionPressed:: ; d12d
 
 	ds $1
 
-wd12f:: ; d12f
+wBGMapWidth:: ; d12f
 	ds $1
 
-wd130:: ; d130
+wBGMapHeight:: ; d130
 	ds $1
 
 wd131:: ; d131
@@ -2127,10 +2127,7 @@ wd239:: ; d239
 	ds $1
 
 wd23a:: ; d23a
-	ds $1
-
-wd23b:: ; d23b
-	ds $1
+	ds $2
 
 wd23c:: ; d23c
 	ds $1
@@ -2138,10 +2135,20 @@ wd23c:: ; d23c
 wd23d:: ; d23d
 	ds $1
 
+UNION
+
 ; palette loaded from Palette* data
 wLoadedPalData:: ; d23e
 	ds $50
 
+NEXTU
+
+; where BG map data is decompressed
+wBGMapBuffer:: ; d23e
+	ds $40
+
+ENDU
+
 wd28e:: ; d28e
 	ds $1
 
@@ -2154,7 +2161,10 @@ wd290:: ; d290
 wd291:: ; d291
 	ds $1
 
-wd292:: ; d292
+; determines where to copy BG Map data
+; $0 = copies to VRAM
+; $1 = copies to SRAM
+wBGMapCopyMode:: ; d292
 	ds $1
 
 	ds $4
-- 
cgit v1.2.3


From a00fb79d4a5bdaac1ce4d8faef3944cd31b6ac5f Mon Sep 17 00:00:00 2001
From: ElectroDeoxys <ElectroDeoxys@gmail.com>
Date: Mon, 8 Feb 2021 14:48:05 +0000
Subject: Extract BG Map data

---
 src/data/maps/map0.bin   | Bin 0 -> 258 bytes
 src/data/maps/map1.bin   | Bin 0 -> 492 bytes
 src/data/maps/map10.bin  | Bin 0 -> 189 bytes
 src/data/maps/map100.bin | Bin 0 -> 288 bytes
 src/data/maps/map101.bin | Bin 0 -> 354 bytes
 src/data/maps/map102.bin | Bin 0 -> 82 bytes
 src/data/maps/map103.bin | Bin 0 -> 129 bytes
 src/data/maps/map104.bin | Bin 0 -> 67 bytes
 src/data/maps/map105.bin | Bin 0 -> 95 bytes
 src/data/maps/map11.bin  | Bin 0 -> 271 bytes
 src/data/maps/map12.bin  | Bin 0 -> 197 bytes
 src/data/maps/map13.bin  | Bin 0 -> 280 bytes
 src/data/maps/map14.bin  | Bin 0 -> 197 bytes
 src/data/maps/map15.bin  | Bin 0 -> 280 bytes
 src/data/maps/map16.bin  | Bin 0 -> 197 bytes
 src/data/maps/map17.bin  | Bin 0 -> 280 bytes
 src/data/maps/map18.bin  | Bin 0 -> 197 bytes
 src/data/maps/map19.bin  | Bin 0 -> 280 bytes
 src/data/maps/map2.bin   | Bin 0 -> 278 bytes
 src/data/maps/map20.bin  | Bin 0 -> 197 bytes
 src/data/maps/map21.bin  | Bin 0 -> 280 bytes
 src/data/maps/map22.bin  | Bin 0 -> 197 bytes
 src/data/maps/map23.bin  | Bin 0 -> 280 bytes
 src/data/maps/map24.bin  | Bin 0 -> 197 bytes
 src/data/maps/map25.bin  | Bin 0 -> 280 bytes
 src/data/maps/map26.bin  | Bin 0 -> 197 bytes
 src/data/maps/map27.bin  | Bin 0 -> 280 bytes
 src/data/maps/map28.bin  | Bin 0 -> 174 bytes
 src/data/maps/map29.bin  | Bin 0 -> 254 bytes
 src/data/maps/map3.bin   | Bin 0 -> 414 bytes
 src/data/maps/map30.bin  | Bin 0 -> 284 bytes
 src/data/maps/map31.bin  | Bin 0 -> 401 bytes
 src/data/maps/map32.bin  | Bin 0 -> 172 bytes
 src/data/maps/map33.bin  | Bin 0 -> 252 bytes
 src/data/maps/map34.bin  | Bin 0 -> 324 bytes
 src/data/maps/map35.bin  | Bin 0 -> 534 bytes
 src/data/maps/map36.bin  | Bin 0 -> 387 bytes
 src/data/maps/map37.bin  | Bin 0 -> 558 bytes
 src/data/maps/map38.bin  | Bin 0 -> 371 bytes
 src/data/maps/map39.bin  | Bin 0 -> 502 bytes
 src/data/maps/map4.bin   |   1 +
 src/data/maps/map40.bin  | Bin 0 -> 421 bytes
 src/data/maps/map41.bin  | Bin 0 -> 662 bytes
 src/data/maps/map42.bin  | Bin 0 -> 247 bytes
 src/data/maps/map43.bin  | Bin 0 -> 394 bytes
 src/data/maps/map44.bin  | Bin 0 -> 282 bytes
 src/data/maps/map45.bin  | Bin 0 -> 404 bytes
 src/data/maps/map46.bin  | Bin 0 -> 214 bytes
 src/data/maps/map47.bin  | Bin 0 -> 383 bytes
 src/data/maps/map48.bin  | Bin 0 -> 409 bytes
 src/data/maps/map49.bin  | Bin 0 -> 594 bytes
 src/data/maps/map5.bin   |   1 +
 src/data/maps/map50.bin  | Bin 0 -> 191 bytes
 src/data/maps/map51.bin  | Bin 0 -> 284 bytes
 src/data/maps/map52.bin  | Bin 0 -> 13 bytes
 src/data/maps/map53.bin  | Bin 0 -> 18 bytes
 src/data/maps/map54.bin  | Bin 0 -> 389 bytes
 src/data/maps/map55.bin  | Bin 0 -> 612 bytes
 src/data/maps/map56.bin  | Bin 0 -> 7 bytes
 src/data/maps/map57.bin  | Bin 0 -> 11 bytes
 src/data/maps/map58.bin  | Bin 0 -> 269 bytes
 src/data/maps/map59.bin  | Bin 0 -> 387 bytes
 src/data/maps/map6.bin   | Bin 0 -> 192 bytes
 src/data/maps/map60.bin  | Bin 0 -> 254 bytes
 src/data/maps/map61.bin  | Bin 0 -> 249 bytes
 src/data/maps/map62.bin  |   1 +
 src/data/maps/map63.bin  |   1 +
 src/data/maps/map64.bin  |   1 +
 src/data/maps/map65.bin  |   1 +
 src/data/maps/map66.bin  |   1 +
 src/data/maps/map67.bin  |   1 +
 src/data/maps/map68.bin  |   1 +
 src/data/maps/map69.bin  |   1 +
 src/data/maps/map7.bin   | Bin 0 -> 339 bytes
 src/data/maps/map70.bin  | Bin 0 -> 190 bytes
 src/data/maps/map71.bin  | Bin 0 -> 133 bytes
 src/data/maps/map72.bin  | Bin 0 -> 218 bytes
 src/data/maps/map73.bin  | Bin 0 -> 151 bytes
 src/data/maps/map74.bin  | Bin 0 -> 209 bytes
 src/data/maps/map75.bin  | Bin 0 -> 141 bytes
 src/data/maps/map76.bin  |   1 +
 src/data/maps/map77.bin  | Bin 0 -> 129 bytes
 src/data/maps/map78.bin  |   1 +
 src/data/maps/map79.bin  | Bin 0 -> 127 bytes
 src/data/maps/map8.bin   |   1 +
 src/data/maps/map80.bin  |   1 +
 src/data/maps/map81.bin  | Bin 0 -> 124 bytes
 src/data/maps/map82.bin  |   1 +
 src/data/maps/map83.bin  | Bin 0 -> 121 bytes
 src/data/maps/map84.bin  |   1 +
 src/data/maps/map85.bin  | Bin 0 -> 158 bytes
 src/data/maps/map86.bin  |   1 +
 src/data/maps/map87.bin  | Bin 0 -> 150 bytes
 src/data/maps/map88.bin  |   1 +
 src/data/maps/map89.bin  | Bin 0 -> 141 bytes
 src/data/maps/map9.bin   |   1 +
 src/data/maps/map90.bin  | Bin 0 -> 144 bytes
 src/data/maps/map91.bin  | Bin 0 -> 185 bytes
 src/data/maps/map92.bin  | Bin 0 -> 137 bytes
 src/data/maps/map93.bin  | Bin 0 -> 163 bytes
 src/data/maps/map94.bin  | Bin 0 -> 138 bytes
 src/data/maps/map95.bin  | Bin 0 -> 337 bytes
 src/data/maps/map96.bin  | Bin 0 -> 493 bytes
 src/data/maps/map97.bin  |   2 +
 src/data/maps/map98.bin  |   1 +
 src/data/maps/map99.bin  |   1 +
 src/engine/bank20.asm    | 294 +++++++++++++++++++++++------------------------
 src/gfx.asm              | 130 ++++++++++-----------
 108 files changed, 235 insertions(+), 212 deletions(-)
 create mode 100644 src/data/maps/map0.bin
 create mode 100644 src/data/maps/map1.bin
 create mode 100644 src/data/maps/map10.bin
 create mode 100644 src/data/maps/map100.bin
 create mode 100644 src/data/maps/map101.bin
 create mode 100644 src/data/maps/map102.bin
 create mode 100644 src/data/maps/map103.bin
 create mode 100644 src/data/maps/map104.bin
 create mode 100644 src/data/maps/map105.bin
 create mode 100644 src/data/maps/map11.bin
 create mode 100644 src/data/maps/map12.bin
 create mode 100644 src/data/maps/map13.bin
 create mode 100644 src/data/maps/map14.bin
 create mode 100644 src/data/maps/map15.bin
 create mode 100644 src/data/maps/map16.bin
 create mode 100644 src/data/maps/map17.bin
 create mode 100644 src/data/maps/map18.bin
 create mode 100644 src/data/maps/map19.bin
 create mode 100644 src/data/maps/map2.bin
 create mode 100644 src/data/maps/map20.bin
 create mode 100644 src/data/maps/map21.bin
 create mode 100644 src/data/maps/map22.bin
 create mode 100644 src/data/maps/map23.bin
 create mode 100644 src/data/maps/map24.bin
 create mode 100644 src/data/maps/map25.bin
 create mode 100644 src/data/maps/map26.bin
 create mode 100644 src/data/maps/map27.bin
 create mode 100644 src/data/maps/map28.bin
 create mode 100644 src/data/maps/map29.bin
 create mode 100644 src/data/maps/map3.bin
 create mode 100644 src/data/maps/map30.bin
 create mode 100644 src/data/maps/map31.bin
 create mode 100644 src/data/maps/map32.bin
 create mode 100644 src/data/maps/map33.bin
 create mode 100644 src/data/maps/map34.bin
 create mode 100644 src/data/maps/map35.bin
 create mode 100644 src/data/maps/map36.bin
 create mode 100644 src/data/maps/map37.bin
 create mode 100644 src/data/maps/map38.bin
 create mode 100644 src/data/maps/map39.bin
 create mode 100644 src/data/maps/map4.bin
 create mode 100644 src/data/maps/map40.bin
 create mode 100644 src/data/maps/map41.bin
 create mode 100644 src/data/maps/map42.bin
 create mode 100644 src/data/maps/map43.bin
 create mode 100644 src/data/maps/map44.bin
 create mode 100644 src/data/maps/map45.bin
 create mode 100644 src/data/maps/map46.bin
 create mode 100644 src/data/maps/map47.bin
 create mode 100644 src/data/maps/map48.bin
 create mode 100644 src/data/maps/map49.bin
 create mode 100644 src/data/maps/map5.bin
 create mode 100644 src/data/maps/map50.bin
 create mode 100644 src/data/maps/map51.bin
 create mode 100644 src/data/maps/map52.bin
 create mode 100644 src/data/maps/map53.bin
 create mode 100644 src/data/maps/map54.bin
 create mode 100644 src/data/maps/map55.bin
 create mode 100644 src/data/maps/map56.bin
 create mode 100644 src/data/maps/map57.bin
 create mode 100644 src/data/maps/map58.bin
 create mode 100644 src/data/maps/map59.bin
 create mode 100644 src/data/maps/map6.bin
 create mode 100644 src/data/maps/map60.bin
 create mode 100644 src/data/maps/map61.bin
 create mode 100644 src/data/maps/map62.bin
 create mode 100644 src/data/maps/map63.bin
 create mode 100644 src/data/maps/map64.bin
 create mode 100644 src/data/maps/map65.bin
 create mode 100644 src/data/maps/map66.bin
 create mode 100644 src/data/maps/map67.bin
 create mode 100644 src/data/maps/map68.bin
 create mode 100644 src/data/maps/map69.bin
 create mode 100644 src/data/maps/map7.bin
 create mode 100644 src/data/maps/map70.bin
 create mode 100644 src/data/maps/map71.bin
 create mode 100644 src/data/maps/map72.bin
 create mode 100644 src/data/maps/map73.bin
 create mode 100644 src/data/maps/map74.bin
 create mode 100644 src/data/maps/map75.bin
 create mode 100644 src/data/maps/map76.bin
 create mode 100644 src/data/maps/map77.bin
 create mode 100644 src/data/maps/map78.bin
 create mode 100644 src/data/maps/map79.bin
 create mode 100644 src/data/maps/map8.bin
 create mode 100644 src/data/maps/map80.bin
 create mode 100644 src/data/maps/map81.bin
 create mode 100644 src/data/maps/map82.bin
 create mode 100644 src/data/maps/map83.bin
 create mode 100644 src/data/maps/map84.bin
 create mode 100644 src/data/maps/map85.bin
 create mode 100644 src/data/maps/map86.bin
 create mode 100644 src/data/maps/map87.bin
 create mode 100644 src/data/maps/map88.bin
 create mode 100644 src/data/maps/map89.bin
 create mode 100644 src/data/maps/map9.bin
 create mode 100644 src/data/maps/map90.bin
 create mode 100644 src/data/maps/map91.bin
 create mode 100644 src/data/maps/map92.bin
 create mode 100644 src/data/maps/map93.bin
 create mode 100644 src/data/maps/map94.bin
 create mode 100644 src/data/maps/map95.bin
 create mode 100644 src/data/maps/map96.bin
 create mode 100644 src/data/maps/map97.bin
 create mode 100644 src/data/maps/map98.bin
 create mode 100644 src/data/maps/map99.bin

diff --git a/src/data/maps/map0.bin b/src/data/maps/map0.bin
new file mode 100644
index 0000000..cf2a9ed
Binary files /dev/null and b/src/data/maps/map0.bin differ
diff --git a/src/data/maps/map1.bin b/src/data/maps/map1.bin
new file mode 100644
index 0000000..38543ff
Binary files /dev/null and b/src/data/maps/map1.bin differ
diff --git a/src/data/maps/map10.bin b/src/data/maps/map10.bin
new file mode 100644
index 0000000..570de49
Binary files /dev/null and b/src/data/maps/map10.bin differ
diff --git a/src/data/maps/map100.bin b/src/data/maps/map100.bin
new file mode 100644
index 0000000..cc9e675
Binary files /dev/null and b/src/data/maps/map100.bin differ
diff --git a/src/data/maps/map101.bin b/src/data/maps/map101.bin
new file mode 100644
index 0000000..15ff322
Binary files /dev/null and b/src/data/maps/map101.bin differ
diff --git a/src/data/maps/map102.bin b/src/data/maps/map102.bin
new file mode 100644
index 0000000..0a7e308
Binary files /dev/null and b/src/data/maps/map102.bin differ
diff --git a/src/data/maps/map103.bin b/src/data/maps/map103.bin
new file mode 100644
index 0000000..68219ed
Binary files /dev/null and b/src/data/maps/map103.bin differ
diff --git a/src/data/maps/map104.bin b/src/data/maps/map104.bin
new file mode 100644
index 0000000..b931d87
Binary files /dev/null and b/src/data/maps/map104.bin differ
diff --git a/src/data/maps/map105.bin b/src/data/maps/map105.bin
new file mode 100644
index 0000000..057d4e0
Binary files /dev/null and b/src/data/maps/map105.bin differ
diff --git a/src/data/maps/map11.bin b/src/data/maps/map11.bin
new file mode 100644
index 0000000..23e8c35
Binary files /dev/null and b/src/data/maps/map11.bin differ
diff --git a/src/data/maps/map12.bin b/src/data/maps/map12.bin
new file mode 100644
index 0000000..491cb07
Binary files /dev/null and b/src/data/maps/map12.bin differ
diff --git a/src/data/maps/map13.bin b/src/data/maps/map13.bin
new file mode 100644
index 0000000..69479ba
Binary files /dev/null and b/src/data/maps/map13.bin differ
diff --git a/src/data/maps/map14.bin b/src/data/maps/map14.bin
new file mode 100644
index 0000000..aa1c6bc
Binary files /dev/null and b/src/data/maps/map14.bin differ
diff --git a/src/data/maps/map15.bin b/src/data/maps/map15.bin
new file mode 100644
index 0000000..eb8fc6b
Binary files /dev/null and b/src/data/maps/map15.bin differ
diff --git a/src/data/maps/map16.bin b/src/data/maps/map16.bin
new file mode 100644
index 0000000..6725ce2
Binary files /dev/null and b/src/data/maps/map16.bin differ
diff --git a/src/data/maps/map17.bin b/src/data/maps/map17.bin
new file mode 100644
index 0000000..2202009
Binary files /dev/null and b/src/data/maps/map17.bin differ
diff --git a/src/data/maps/map18.bin b/src/data/maps/map18.bin
new file mode 100644
index 0000000..1b5f7e2
Binary files /dev/null and b/src/data/maps/map18.bin differ
diff --git a/src/data/maps/map19.bin b/src/data/maps/map19.bin
new file mode 100644
index 0000000..41fd5e3
Binary files /dev/null and b/src/data/maps/map19.bin differ
diff --git a/src/data/maps/map2.bin b/src/data/maps/map2.bin
new file mode 100644
index 0000000..b575bb2
Binary files /dev/null and b/src/data/maps/map2.bin differ
diff --git a/src/data/maps/map20.bin b/src/data/maps/map20.bin
new file mode 100644
index 0000000..0454487
Binary files /dev/null and b/src/data/maps/map20.bin differ
diff --git a/src/data/maps/map21.bin b/src/data/maps/map21.bin
new file mode 100644
index 0000000..6e9c407
Binary files /dev/null and b/src/data/maps/map21.bin differ
diff --git a/src/data/maps/map22.bin b/src/data/maps/map22.bin
new file mode 100644
index 0000000..c7951e0
Binary files /dev/null and b/src/data/maps/map22.bin differ
diff --git a/src/data/maps/map23.bin b/src/data/maps/map23.bin
new file mode 100644
index 0000000..9bef429
Binary files /dev/null and b/src/data/maps/map23.bin differ
diff --git a/src/data/maps/map24.bin b/src/data/maps/map24.bin
new file mode 100644
index 0000000..c3bbf87
Binary files /dev/null and b/src/data/maps/map24.bin differ
diff --git a/src/data/maps/map25.bin b/src/data/maps/map25.bin
new file mode 100644
index 0000000..9b66ad4
Binary files /dev/null and b/src/data/maps/map25.bin differ
diff --git a/src/data/maps/map26.bin b/src/data/maps/map26.bin
new file mode 100644
index 0000000..5a37965
Binary files /dev/null and b/src/data/maps/map26.bin differ
diff --git a/src/data/maps/map27.bin b/src/data/maps/map27.bin
new file mode 100644
index 0000000..f18ad28
Binary files /dev/null and b/src/data/maps/map27.bin differ
diff --git a/src/data/maps/map28.bin b/src/data/maps/map28.bin
new file mode 100644
index 0000000..557c897
Binary files /dev/null and b/src/data/maps/map28.bin differ
diff --git a/src/data/maps/map29.bin b/src/data/maps/map29.bin
new file mode 100644
index 0000000..b70e041
Binary files /dev/null and b/src/data/maps/map29.bin differ
diff --git a/src/data/maps/map3.bin b/src/data/maps/map3.bin
new file mode 100644
index 0000000..ceaa540
Binary files /dev/null and b/src/data/maps/map3.bin differ
diff --git a/src/data/maps/map30.bin b/src/data/maps/map30.bin
new file mode 100644
index 0000000..ce1d02c
Binary files /dev/null and b/src/data/maps/map30.bin differ
diff --git a/src/data/maps/map31.bin b/src/data/maps/map31.bin
new file mode 100644
index 0000000..d0e5fcd
Binary files /dev/null and b/src/data/maps/map31.bin differ
diff --git a/src/data/maps/map32.bin b/src/data/maps/map32.bin
new file mode 100644
index 0000000..609fa1e
Binary files /dev/null and b/src/data/maps/map32.bin differ
diff --git a/src/data/maps/map33.bin b/src/data/maps/map33.bin
new file mode 100644
index 0000000..025b820
Binary files /dev/null and b/src/data/maps/map33.bin differ
diff --git a/src/data/maps/map34.bin b/src/data/maps/map34.bin
new file mode 100644
index 0000000..de03a48
Binary files /dev/null and b/src/data/maps/map34.bin differ
diff --git a/src/data/maps/map35.bin b/src/data/maps/map35.bin
new file mode 100644
index 0000000..a178ac3
Binary files /dev/null and b/src/data/maps/map35.bin differ
diff --git a/src/data/maps/map36.bin b/src/data/maps/map36.bin
new file mode 100644
index 0000000..759a82e
Binary files /dev/null and b/src/data/maps/map36.bin differ
diff --git a/src/data/maps/map37.bin b/src/data/maps/map37.bin
new file mode 100644
index 0000000..fc1588d
Binary files /dev/null and b/src/data/maps/map37.bin differ
diff --git a/src/data/maps/map38.bin b/src/data/maps/map38.bin
new file mode 100644
index 0000000..779b893
Binary files /dev/null and b/src/data/maps/map38.bin differ
diff --git a/src/data/maps/map39.bin b/src/data/maps/map39.bin
new file mode 100644
index 0000000..104acd7
Binary files /dev/null and b/src/data/maps/map39.bin differ
diff --git a/src/data/maps/map4.bin b/src/data/maps/map4.bin
new file mode 100644
index 0000000..744b347
--- /dev/null
+++ b/src/data/maps/map4.bin
@@ -0,0 +1 @@
+ÿÐÑÒÓÔÕÖ×ÿÜÝÞßðñòóøôõö÷�€€ïí
\ No newline at end of file
diff --git a/src/data/maps/map40.bin b/src/data/maps/map40.bin
new file mode 100644
index 0000000..37db1fa
Binary files /dev/null and b/src/data/maps/map40.bin differ
diff --git a/src/data/maps/map41.bin b/src/data/maps/map41.bin
new file mode 100644
index 0000000..c13065e
Binary files /dev/null and b/src/data/maps/map41.bin differ
diff --git a/src/data/maps/map42.bin b/src/data/maps/map42.bin
new file mode 100644
index 0000000..21b5993
Binary files /dev/null and b/src/data/maps/map42.bin differ
diff --git a/src/data/maps/map43.bin b/src/data/maps/map43.bin
new file mode 100644
index 0000000..50e18a9
Binary files /dev/null and b/src/data/maps/map43.bin differ
diff --git a/src/data/maps/map44.bin b/src/data/maps/map44.bin
new file mode 100644
index 0000000..81c2cd1
Binary files /dev/null and b/src/data/maps/map44.bin differ
diff --git a/src/data/maps/map45.bin b/src/data/maps/map45.bin
new file mode 100644
index 0000000..6e44d7a
Binary files /dev/null and b/src/data/maps/map45.bin differ
diff --git a/src/data/maps/map46.bin b/src/data/maps/map46.bin
new file mode 100644
index 0000000..9bc01f8
Binary files /dev/null and b/src/data/maps/map46.bin differ
diff --git a/src/data/maps/map47.bin b/src/data/maps/map47.bin
new file mode 100644
index 0000000..085c680
Binary files /dev/null and b/src/data/maps/map47.bin differ
diff --git a/src/data/maps/map48.bin b/src/data/maps/map48.bin
new file mode 100644
index 0000000..5085c83
Binary files /dev/null and b/src/data/maps/map48.bin differ
diff --git a/src/data/maps/map49.bin b/src/data/maps/map49.bin
new file mode 100644
index 0000000..c5ae1b9
Binary files /dev/null and b/src/data/maps/map49.bin differ
diff --git a/src/data/maps/map5.bin b/src/data/maps/map5.bin
new file mode 100644
index 0000000..1397e15
--- /dev/null
+++ b/src/data/maps/map5.bin
@@ -0,0 +1 @@
+ûÐÑÒÓóÔÕßÖ×óÜÝÞß}ðñòóôèõö÷!� €€ïí
\ No newline at end of file
diff --git a/src/data/maps/map50.bin b/src/data/maps/map50.bin
new file mode 100644
index 0000000..c34e10e
Binary files /dev/null and b/src/data/maps/map50.bin differ
diff --git a/src/data/maps/map51.bin b/src/data/maps/map51.bin
new file mode 100644
index 0000000..81a2263
Binary files /dev/null and b/src/data/maps/map51.bin differ
diff --git a/src/data/maps/map52.bin b/src/data/maps/map52.bin
new file mode 100644
index 0000000..b8ae26f
Binary files /dev/null and b/src/data/maps/map52.bin differ
diff --git a/src/data/maps/map53.bin b/src/data/maps/map53.bin
new file mode 100644
index 0000000..bfff297
Binary files /dev/null and b/src/data/maps/map53.bin differ
diff --git a/src/data/maps/map54.bin b/src/data/maps/map54.bin
new file mode 100644
index 0000000..7b7fef6
Binary files /dev/null and b/src/data/maps/map54.bin differ
diff --git a/src/data/maps/map55.bin b/src/data/maps/map55.bin
new file mode 100644
index 0000000..ae652ec
Binary files /dev/null and b/src/data/maps/map55.bin differ
diff --git a/src/data/maps/map56.bin b/src/data/maps/map56.bin
new file mode 100644
index 0000000..b4249e2
Binary files /dev/null and b/src/data/maps/map56.bin differ
diff --git a/src/data/maps/map57.bin b/src/data/maps/map57.bin
new file mode 100644
index 0000000..be748b7
Binary files /dev/null and b/src/data/maps/map57.bin differ
diff --git a/src/data/maps/map58.bin b/src/data/maps/map58.bin
new file mode 100644
index 0000000..00625d0
Binary files /dev/null and b/src/data/maps/map58.bin differ
diff --git a/src/data/maps/map59.bin b/src/data/maps/map59.bin
new file mode 100644
index 0000000..3873084
Binary files /dev/null and b/src/data/maps/map59.bin differ
diff --git a/src/data/maps/map6.bin b/src/data/maps/map6.bin
new file mode 100644
index 0000000..e2270c7
Binary files /dev/null and b/src/data/maps/map6.bin differ
diff --git a/src/data/maps/map60.bin b/src/data/maps/map60.bin
new file mode 100644
index 0000000..5dcb25e
Binary files /dev/null and b/src/data/maps/map60.bin differ
diff --git a/src/data/maps/map61.bin b/src/data/maps/map61.bin
new file mode 100644
index 0000000..e29cc7b
Binary files /dev/null and b/src/data/maps/map61.bin differ
diff --git a/src/data/maps/map62.bin b/src/data/maps/map62.bin
new file mode 100644
index 0000000..11d47bd
--- /dev/null
+++ b/src/data/maps/map62.bin
@@ -0,0 +1 @@
+÷€�‚
ò
�‘’pò ¡¢ò
\ No newline at end of file
diff --git a/src/data/maps/map63.bin b/src/data/maps/map63.bin
new file mode 100644
index 0000000..237f5fe
--- /dev/null
+++ b/src/data/maps/map63.bin
@@ -0,0 +1 @@
+÷ƒ„…
ò
“”•pò£¤¥ò
\ No newline at end of file
diff --git a/src/data/maps/map64.bin b/src/data/maps/map64.bin
new file mode 100644
index 0000000..5f97f41
--- /dev/null
+++ b/src/data/maps/map64.bin
@@ -0,0 +1 @@
+÷†‡ˆò
–—˜pò¦§¨ò
\ No newline at end of file
diff --git a/src/data/maps/map65.bin b/src/data/maps/map65.bin
new file mode 100644
index 0000000..598efd3
--- /dev/null
+++ b/src/data/maps/map65.bin
@@ -0,0 +1 @@
+÷‰Š‹ò
™š›pò©ª«ò
\ No newline at end of file
diff --git a/src/data/maps/map66.bin b/src/data/maps/map66.bin
new file mode 100644
index 0000000..b498b94
--- /dev/null
+++ b/src/data/maps/map66.bin
@@ -0,0 +1 @@
+÷Œ�Žò
œ�žpò¬­®ò
\ No newline at end of file
diff --git a/src/data/maps/map67.bin b/src/data/maps/map67.bin
new file mode 100644
index 0000000..e5d5767
--- /dev/null
+++ b/src/data/maps/map67.bin
@@ -0,0 +1 @@
+÷°±²ò
¹º»pòÀÁÂò
\ No newline at end of file
diff --git a/src/data/maps/map68.bin b/src/data/maps/map68.bin
new file mode 100644
index 0000000..8b74ef4
--- /dev/null
+++ b/src/data/maps/map68.bin
@@ -0,0 +1 @@
+÷³´µò
¼½¾pòÃÄÅò
\ No newline at end of file
diff --git a/src/data/maps/map69.bin b/src/data/maps/map69.bin
new file mode 100644
index 0000000..69d45ef
--- /dev/null
+++ b/src/data/maps/map69.bin
@@ -0,0 +1 @@
+÷¶·¸ò
¿�ŸpòÆǯò
\ No newline at end of file
diff --git a/src/data/maps/map7.bin b/src/data/maps/map7.bin
new file mode 100644
index 0000000..7662b6e
Binary files /dev/null and b/src/data/maps/map7.bin differ
diff --git a/src/data/maps/map70.bin b/src/data/maps/map70.bin
new file mode 100644
index 0000000..0ac3803
Binary files /dev/null and b/src/data/maps/map70.bin differ
diff --git a/src/data/maps/map71.bin b/src/data/maps/map71.bin
new file mode 100644
index 0000000..8845640
Binary files /dev/null and b/src/data/maps/map71.bin differ
diff --git a/src/data/maps/map72.bin b/src/data/maps/map72.bin
new file mode 100644
index 0000000..0102181
Binary files /dev/null and b/src/data/maps/map72.bin differ
diff --git a/src/data/maps/map73.bin b/src/data/maps/map73.bin
new file mode 100644
index 0000000..d3bb103
Binary files /dev/null and b/src/data/maps/map73.bin differ
diff --git a/src/data/maps/map74.bin b/src/data/maps/map74.bin
new file mode 100644
index 0000000..52f8e24
Binary files /dev/null and b/src/data/maps/map74.bin differ
diff --git a/src/data/maps/map75.bin b/src/data/maps/map75.bin
new file mode 100644
index 0000000..bbb8abd
Binary files /dev/null and b/src/data/maps/map75.bin differ
diff --git a/src/data/maps/map76.bin b/src/data/maps/map76.bin
new file mode 100644
index 0000000..0380a45
--- /dev/null
+++ b/src/data/maps/map76.bin
@@ -0,0 +1 @@
+ÿ€�‚ƒ„…†‡ÿ�‘’“”•–—ÿ ¡¢£¤¥¦§ÿ°±²³´µ¶·ÿÀÁÂÃÄÅÆÇÿÐÑÒÓÔÕÖ×ÿˆ‰Š‹Œ�Ž�ÿ˜™š›œ�žŸÿ¨©ª«¬­®¯ÿ¸¹º»¼½¾¿ÿÈÉÊËÌÍÎÏÿØÙÚÛÜÝÞß
\ No newline at end of file
diff --git a/src/data/maps/map77.bin b/src/data/maps/map77.bin
new file mode 100644
index 0000000..ac2e677
Binary files /dev/null and b/src/data/maps/map77.bin differ
diff --git a/src/data/maps/map78.bin b/src/data/maps/map78.bin
new file mode 100644
index 0000000..0380a45
--- /dev/null
+++ b/src/data/maps/map78.bin
@@ -0,0 +1 @@
+ÿ€�‚ƒ„…†‡ÿ�‘’“”•–—ÿ ¡¢£¤¥¦§ÿ°±²³´µ¶·ÿÀÁÂÃÄÅÆÇÿÐÑÒÓÔÕÖ×ÿˆ‰Š‹Œ�Ž�ÿ˜™š›œ�žŸÿ¨©ª«¬­®¯ÿ¸¹º»¼½¾¿ÿÈÉÊËÌÍÎÏÿØÙÚÛÜÝÞß
\ No newline at end of file
diff --git a/src/data/maps/map79.bin b/src/data/maps/map79.bin
new file mode 100644
index 0000000..4b03152
Binary files /dev/null and b/src/data/maps/map79.bin differ
diff --git a/src/data/maps/map8.bin b/src/data/maps/map8.bin
new file mode 100644
index 0000000..aa8d5e5
--- /dev/null
+++ b/src/data/maps/map8.bin
@@ -0,0 +1 @@
+ðÜÝÞßÀ€€
\ No newline at end of file
diff --git a/src/data/maps/map80.bin b/src/data/maps/map80.bin
new file mode 100644
index 0000000..0380a45
--- /dev/null
+++ b/src/data/maps/map80.bin
@@ -0,0 +1 @@
+ÿ€�‚ƒ„…†‡ÿ�‘’“”•–—ÿ ¡¢£¤¥¦§ÿ°±²³´µ¶·ÿÀÁÂÃÄÅÆÇÿÐÑÒÓÔÕÖ×ÿˆ‰Š‹Œ�Ž�ÿ˜™š›œ�žŸÿ¨©ª«¬­®¯ÿ¸¹º»¼½¾¿ÿÈÉÊËÌÍÎÏÿØÙÚÛÜÝÞß
\ No newline at end of file
diff --git a/src/data/maps/map81.bin b/src/data/maps/map81.bin
new file mode 100644
index 0000000..9480551
Binary files /dev/null and b/src/data/maps/map81.bin differ
diff --git a/src/data/maps/map82.bin b/src/data/maps/map82.bin
new file mode 100644
index 0000000..0380a45
--- /dev/null
+++ b/src/data/maps/map82.bin
@@ -0,0 +1 @@
+ÿ€�‚ƒ„…†‡ÿ�‘’“”•–—ÿ ¡¢£¤¥¦§ÿ°±²³´µ¶·ÿÀÁÂÃÄÅÆÇÿÐÑÒÓÔÕÖ×ÿˆ‰Š‹Œ�Ž�ÿ˜™š›œ�žŸÿ¨©ª«¬­®¯ÿ¸¹º»¼½¾¿ÿÈÉÊËÌÍÎÏÿØÙÚÛÜÝÞß
\ No newline at end of file
diff --git a/src/data/maps/map83.bin b/src/data/maps/map83.bin
new file mode 100644
index 0000000..cc72903
Binary files /dev/null and b/src/data/maps/map83.bin differ
diff --git a/src/data/maps/map84.bin b/src/data/maps/map84.bin
new file mode 100644
index 0000000..0380a45
--- /dev/null
+++ b/src/data/maps/map84.bin
@@ -0,0 +1 @@
+ÿ€�‚ƒ„…†‡ÿ�‘’“”•–—ÿ ¡¢£¤¥¦§ÿ°±²³´µ¶·ÿÀÁÂÃÄÅÆÇÿÐÑÒÓÔÕÖ×ÿˆ‰Š‹Œ�Ž�ÿ˜™š›œ�žŸÿ¨©ª«¬­®¯ÿ¸¹º»¼½¾¿ÿÈÉÊËÌÍÎÏÿØÙÚÛÜÝÞß
\ No newline at end of file
diff --git a/src/data/maps/map85.bin b/src/data/maps/map85.bin
new file mode 100644
index 0000000..37fa470
Binary files /dev/null and b/src/data/maps/map85.bin differ
diff --git a/src/data/maps/map86.bin b/src/data/maps/map86.bin
new file mode 100644
index 0000000..0380a45
--- /dev/null
+++ b/src/data/maps/map86.bin
@@ -0,0 +1 @@
+ÿ€�‚ƒ„…†‡ÿ�‘’“”•–—ÿ ¡¢£¤¥¦§ÿ°±²³´µ¶·ÿÀÁÂÃÄÅÆÇÿÐÑÒÓÔÕÖ×ÿˆ‰Š‹Œ�Ž�ÿ˜™š›œ�žŸÿ¨©ª«¬­®¯ÿ¸¹º»¼½¾¿ÿÈÉÊËÌÍÎÏÿØÙÚÛÜÝÞß
\ No newline at end of file
diff --git a/src/data/maps/map87.bin b/src/data/maps/map87.bin
new file mode 100644
index 0000000..065a4c5
Binary files /dev/null and b/src/data/maps/map87.bin differ
diff --git a/src/data/maps/map88.bin b/src/data/maps/map88.bin
new file mode 100644
index 0000000..0380a45
--- /dev/null
+++ b/src/data/maps/map88.bin
@@ -0,0 +1 @@
+ÿ€�‚ƒ„…†‡ÿ�‘’“”•–—ÿ ¡¢£¤¥¦§ÿ°±²³´µ¶·ÿÀÁÂÃÄÅÆÇÿÐÑÒÓÔÕÖ×ÿˆ‰Š‹Œ�Ž�ÿ˜™š›œ�žŸÿ¨©ª«¬­®¯ÿ¸¹º»¼½¾¿ÿÈÉÊËÌÍÎÏÿØÙÚÛÜÝÞß
\ No newline at end of file
diff --git a/src/data/maps/map89.bin b/src/data/maps/map89.bin
new file mode 100644
index 0000000..2071453
Binary files /dev/null and b/src/data/maps/map89.bin differ
diff --git a/src/data/maps/map9.bin b/src/data/maps/map9.bin
new file mode 100644
index 0000000..288b905
--- /dev/null
+++ b/src/data/maps/map9.bin
@@ -0,0 +1 @@
+øÜÝÞßóÀ€€
\ No newline at end of file
diff --git a/src/data/maps/map90.bin b/src/data/maps/map90.bin
new file mode 100644
index 0000000..23b8711
Binary files /dev/null and b/src/data/maps/map90.bin differ
diff --git a/src/data/maps/map91.bin b/src/data/maps/map91.bin
new file mode 100644
index 0000000..723a7c6
Binary files /dev/null and b/src/data/maps/map91.bin differ
diff --git a/src/data/maps/map92.bin b/src/data/maps/map92.bin
new file mode 100644
index 0000000..e33651c
Binary files /dev/null and b/src/data/maps/map92.bin differ
diff --git a/src/data/maps/map93.bin b/src/data/maps/map93.bin
new file mode 100644
index 0000000..8bef537
Binary files /dev/null and b/src/data/maps/map93.bin differ
diff --git a/src/data/maps/map94.bin b/src/data/maps/map94.bin
new file mode 100644
index 0000000..d314a97
Binary files /dev/null and b/src/data/maps/map94.bin differ
diff --git a/src/data/maps/map95.bin b/src/data/maps/map95.bin
new file mode 100644
index 0000000..943bedf
Binary files /dev/null and b/src/data/maps/map95.bin differ
diff --git a/src/data/maps/map96.bin b/src/data/maps/map96.bin
new file mode 100644
index 0000000..99debbf
Binary files /dev/null and b/src/data/maps/map96.bin differ
diff --git a/src/data/maps/map97.bin b/src/data/maps/map97.bin
new file mode 100644
index 0000000..7d0c714
--- /dev/null
+++ b/src/data/maps/map97.bin
@@ -0,0 +1,2 @@
+¿üïU	
+
êýÿøUþ@eÿ`
\ No newline at end of file
diff --git a/src/data/maps/map98.bin b/src/data/maps/map98.bin
new file mode 100644
index 0000000..4f89d54
--- /dev/null
+++ b/src/data/maps/map98.bin
@@ -0,0 +1 @@
+ÿÐÑÒÓÔÕÖ×ÿØÙÚÛÜÝÞßÿàáâãäåæçÿèéêëìíîïððñòó
\ No newline at end of file
diff --git a/src/data/maps/map99.bin b/src/data/maps/map99.bin
new file mode 100644
index 0000000..8cc4af6
--- /dev/null
+++ b/src/data/maps/map99.bin
@@ -0,0 +1 @@
+ÿ ¡¢£¤¥¦§ÿ¨©ª«¬­®¯ÿ°±²³´µ¶·ÿ¸¹º»¼½¾¿ðÀÁÂÃ
\ No newline at end of file
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index c47f37b..3c447ac 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -720,112 +720,112 @@ macro_80e67: MACRO
 ENDM
 
 MapDataPointers_80e67: ; 80e67 (20:4e67)
-	macro_80e67 Data_8191b, $00
-	macro_80e67 Data_81a22, $00
-	macro_80e67 Data_81c13, $01
-	macro_80e67 Data_81d2e, $01
-	macro_80e67 Data_81ed1, $01
-	macro_80e67 Data_81ef5, $01
-	macro_80e67 Data_81f26, $01
-	macro_80e67 Data_81feb, $01
-	macro_80e67 Data_82143, $01
-	macro_80e67 Data_82150, $01
-	macro_80e67 Data_82160, $02
-	macro_80e67 Data_82222, $02
-	macro_80e67 Data_82336, $03
-	macro_80e67 Data_82400, $03
-	macro_80e67 Data_8251d, $03
-	macro_80e67 Data_825e7, $03
-	macro_80e67 Data_82704, $03
-	macro_80e67 Data_827ce, $03
-	macro_80e67 Data_828eb, $03
-	macro_80e67 Data_829b5, $03
-	macro_80e67 Data_82ad2, $03
-	macro_80e67 Data_82b9c, $03
-	macro_80e67 Data_82cb9, $03
-	macro_80e67 Data_82d83, $03
-	macro_80e67 Data_82ea0, $03
-	macro_80e67 Data_82f6a, $03
-	macro_80e67 Data_83087, $03
-	macro_80e67 Data_83151, $03
-	macro_80e67 Data_8326e, $03
-	macro_80e67 Data_83321, $03
-	macro_80e67 Data_83424, $04
-	macro_80e67 Data_83545, $04
-	macro_80e67 Data_836db, $05
-	macro_80e67 Data_8378c, $05
-	macro_80e67 Data_8388d, $06
-	macro_80e67 Data_839d6, $06
-	macro_80e67 Data_84000, $07
-	macro_80e67 Data_84188, $07
-	macro_80e67 Data_843bb, $08
-	macro_80e67 Data_84533, $08
-	macro_80e67 Data_8472e, $09
-	macro_80e67 Data_848d8, $09
-	macro_80e67 Data_84b73, $0a
-	macro_80e67 Data_84c6f, $0a
-	macro_80e67 Data_84dfe, $0b
-	macro_80e67 Data_84f1d, $0b
-	macro_80e67 Data_850b6, $0c
-	macro_80e67 Data_85191, $0c
-	macro_80e67 Data_85315, $0d
-	macro_80e67 Data_854b3, $0d
-	macro_80e67 Data_8570a, $0e
-	macro_80e67 Data_857ce, $0e
-	macro_80e67 Data_83bf1, $0e
-	macro_80e67 Data_83c03, $0e
-	macro_80e67 Data_858ef, $0f
-	macro_80e67 Data_85a79, $0f
-	macro_80e67 Data_83c1a, $0f
-	macro_80e67 Data_83c26, $0f
-	macro_80e67 Data_85ce2, $10
-	macro_80e67 Data_85df4, $10
-	macro_80e67 Data_85f7c, $11
-	macro_80e67 Data_8607f, $11
-	macro_80e67 Data_83c36, $12
-	macro_80e67 Data_8617d, $12
-	macro_80e67 Data_86193, $12
-	macro_80e67 Data_861a9, $12
-	macro_80e67 Data_861bf, $12
-	macro_80e67 Data_861d5, $12
-	macro_80e67 Data_861eb, $12
-	macro_80e67 Data_86201, $12
-	macro_80e67 Data_86217, $13
-	macro_80e67 Data_862da, $13
-	macro_80e67 Data_86364, $13
-	macro_80e67 Data_86443, $13
-	macro_80e67 Data_864df, $14
-	macro_80e67 Data_865b5, $14
-	macro_80e67 Data_86647, $15
-	macro_80e67 Data_866b8, $16
-	macro_80e67 Data_8673e, $17
-	macro_80e67 Data_867af, $18
-	macro_80e67 Data_86833, $19
-	macro_80e67 Data_868a4, $1a
-	macro_80e67 Data_86925, $1b
-	macro_80e67 Data_86996, $1c
-	macro_80e67 Data_86a14, $1d
-	macro_80e67 Data_86a85, $1e
-	macro_80e67 Data_86b28, $1f
-	macro_80e67 Data_86b99, $20
-	macro_80e67 Data_86c34, $21
-	macro_80e67 Data_86ca5, $22
-	macro_80e67 Data_86d37, $23
-	macro_80e67 Data_86dcc, $24
-	macro_80e67 Data_86e8a, $25
-	macro_80e67 Data_86f18, $25
-	macro_80e67 Data_86fc0, $25
-	macro_80e67 Data_8704f, $26
-	macro_80e67 Data_871a5, $27
-	macro_80e67 Data_87397, $28
-	macro_80e67 Data_873b7, $29
-	macro_80e67 Data_873e5, $2a
-	macro_80e67 Data_87413, $2b
-	macro_80e67 Data_87538, $2c
-	macro_80e67 Data_8769f, $2d
-	macro_80e67 Data_876f6, $2d
-	macro_80e67 Data_8777c, $2e
-	macro_80e67 Data_877c4, $2f
+	macro_80e67 Data_8191b, $00 ; 0
+	macro_80e67 Data_81a22, $00 ; 1
+	macro_80e67 Data_81c13, $01 ; 2
+	macro_80e67 Data_81d2e, $01 ; 3
+	macro_80e67 Data_81ed1, $01 ; 4
+	macro_80e67 Data_81ef5, $01 ; 5
+	macro_80e67 Data_81f26, $01 ; 6
+	macro_80e67 Data_81feb, $01 ; 7
+	macro_80e67 Data_82143, $01 ; 8
+	macro_80e67 Data_82150, $01 ; 9
+	macro_80e67 Data_82160, $02 ; 10
+	macro_80e67 Data_82222, $02 ; 11
+	macro_80e67 Data_82336, $03 ; 12
+	macro_80e67 Data_82400, $03 ; 13
+	macro_80e67 Data_8251d, $03 ; 14
+	macro_80e67 Data_825e7, $03 ; 15
+	macro_80e67 Data_82704, $03 ; 16
+	macro_80e67 Data_827ce, $03 ; 17
+	macro_80e67 Data_828eb, $03 ; 18
+	macro_80e67 Data_829b5, $03 ; 19
+	macro_80e67 Data_82ad2, $03 ; 20
+	macro_80e67 Data_82b9c, $03 ; 21
+	macro_80e67 Data_82cb9, $03 ; 22
+	macro_80e67 Data_82d83, $03 ; 23
+	macro_80e67 Data_82ea0, $03 ; 24
+	macro_80e67 Data_82f6a, $03 ; 25
+	macro_80e67 Data_83087, $03 ; 26
+	macro_80e67 Data_83151, $03 ; 27
+	macro_80e67 Data_8326e, $03 ; 28
+	macro_80e67 Data_83321, $03 ; 29
+	macro_80e67 Data_83424, $04 ; 30
+	macro_80e67 Data_83545, $04 ; 31
+	macro_80e67 Data_836db, $05 ; 32
+	macro_80e67 Data_8378c, $05 ; 33
+	macro_80e67 Data_8388d, $06 ; 34
+	macro_80e67 Data_839d6, $06 ; 35
+	macro_80e67 Data_84000, $07 ; 36
+	macro_80e67 Data_84188, $07 ; 37
+	macro_80e67 Data_843bb, $08 ; 38
+	macro_80e67 Data_84533, $08 ; 39
+	macro_80e67 Data_8472e, $09 ; 40
+	macro_80e67 Data_848d8, $09 ; 41
+	macro_80e67 Data_84b73, $0a ; 42
+	macro_80e67 Data_84c6f, $0a ; 43
+	macro_80e67 Data_84dfe, $0b ; 44
+	macro_80e67 Data_84f1d, $0b ; 45
+	macro_80e67 Data_850b6, $0c ; 46
+	macro_80e67 Data_85191, $0c ; 47
+	macro_80e67 Data_85315, $0d ; 48
+	macro_80e67 Data_854b3, $0d ; 49
+	macro_80e67 Data_8570a, $0e ; 50
+	macro_80e67 Data_857ce, $0e ; 51
+	macro_80e67 Data_83bf1, $0e ; 52
+	macro_80e67 Data_83c03, $0e ; 53
+	macro_80e67 Data_858ef, $0f ; 54
+	macro_80e67 Data_85a79, $0f ; 55
+	macro_80e67 Data_83c1a, $0f ; 56
+	macro_80e67 Data_83c26, $0f ; 57
+	macro_80e67 Data_85ce2, $10 ; 58
+	macro_80e67 Data_85df4, $10 ; 59
+	macro_80e67 Data_85f7c, $11 ; 60
+	macro_80e67 Data_8607f, $11 ; 61
+	macro_80e67 Data_83c36, $12 ; 62
+	macro_80e67 Data_8617d, $12 ; 63
+	macro_80e67 Data_86193, $12 ; 64
+	macro_80e67 Data_861a9, $12 ; 65
+	macro_80e67 Data_861bf, $12 ; 66
+	macro_80e67 Data_861d5, $12 ; 67
+	macro_80e67 Data_861eb, $12 ; 68
+	macro_80e67 Data_86201, $12 ; 69
+	macro_80e67 Data_86217, $13 ; 70
+	macro_80e67 Data_862da, $13 ; 71
+	macro_80e67 Data_86364, $13 ; 72
+	macro_80e67 Data_86443, $13 ; 73
+	macro_80e67 Data_864df, $14 ; 74
+	macro_80e67 Data_865b5, $14 ; 75
+	macro_80e67 Data_86647, $15 ; 76
+	macro_80e67 Data_866b8, $16 ; 77
+	macro_80e67 Data_8673e, $17 ; 78
+	macro_80e67 Data_867af, $18 ; 79
+	macro_80e67 Data_86833, $19 ; 80
+	macro_80e67 Data_868a4, $1a ; 81
+	macro_80e67 Data_86925, $1b ; 82
+	macro_80e67 Data_86996, $1c ; 83
+	macro_80e67 Data_86a14, $1d ; 84
+	macro_80e67 Data_86a85, $1e ; 85
+	macro_80e67 Data_86b28, $1f ; 86
+	macro_80e67 Data_86b99, $20 ; 87
+	macro_80e67 Data_86c34, $21 ; 88
+	macro_80e67 Data_86ca5, $22 ; 89
+	macro_80e67 Data_86d37, $23 ; 90
+	macro_80e67 Data_86dcc, $24 ; 91
+	macro_80e67 Data_86e8a, $25 ; 92
+	macro_80e67 Data_86f18, $25 ; 93
+	macro_80e67 Data_86fc0, $25 ; 94
+	macro_80e67 Data_8704f, $26 ; 95
+	macro_80e67 Data_871a5, $27 ; 96
+	macro_80e67 Data_87397, $28 ; 97
+	macro_80e67 Data_873b7, $29 ; 98
+	macro_80e67 Data_873e5, $2a ; 99
+	macro_80e67 Data_87413, $2b ; 100
+	macro_80e67 Data_87538, $2c ; 101
+	macro_80e67 Data_8769f, $2d ; 102
+	macro_80e67 Data_876f6, $2d ; 103
+	macro_80e67 Data_8777c, $2e ; 104
+	macro_80e67 Data_877c4, $2f ; 105
 
 MapDataPointers_8100f: ; 8100f (20:500f)
 	db $00, $40, $02, $c1
@@ -1441,7 +1441,7 @@ Data_8191b:: ; 8191b (20:591b)
 	dw $0000
 	db $00
 
-	INCROM $81920, $81a22
+	INCBIN "data/maps/map0.bin"
 
 Data_81a22:: ; 81a22 (20:5a22)
 	db $14 ; width
@@ -1449,7 +1449,7 @@ Data_81a22:: ; 81a22 (20:5a22)
 	dw $0000
 	db $01
 
-	INCROM $81a27, $81c13
+	INCBIN "data/maps/map1.bin"
 
 Data_81c13:: ; 81c13 (20:5c13)
 	db $1c ; width
@@ -1457,7 +1457,7 @@ Data_81c13:: ; 81c13 (20:5c13)
 	dw $5d11
 	db $00
 
-	INCROM $81c18, $81d2e
+	INCBIN "data/maps/map2.bin"
 
 Data_81d2e:: ; 81d2e (20:5d2e)
 	db $1c ; width
@@ -1465,7 +1465,7 @@ Data_81d2e:: ; 81d2e (20:5d2e)
 	dw $5eb4
 	db $01
 
-	INCROM $81d33, $81ed1
+	INCBIN "data/maps/map3.bin"
 
 Data_81ed1:: ; 81ed1 (20:5ed1)
 	db $04 ; width
@@ -1473,7 +1473,7 @@ Data_81ed1:: ; 81ed1 (20:5ed1)
 	dw $5ef0
 	db $00
 
-	INCROM $81ed6, $81ef5
+	INCBIN "data/maps/map4.bin"
 
 Data_81ef5:: ; 81ef5 (20:5ef5)
 	db $04 ; width
@@ -1481,7 +1481,7 @@ Data_81ef5:: ; 81ef5 (20:5ef5)
 	dw $5f21
 	db $01
 
-	INCROM $81efa, $81f26
+	INCBIN "data/maps/map5.bin"
 
 Data_81f26:: ; 81f26 (20:5f26)
 	db $18 ; width
@@ -1489,7 +1489,7 @@ Data_81f26:: ; 81f26 (20:5f26)
 	dw $5fd3
 	db $00
 
-	INCROM $81f2b, $81feb
+	INCBIN "data/maps/map6.bin"
 
 Data_81feb:: ; 81feb (20:5feb)
 	db $18 ; width
@@ -1497,7 +1497,7 @@ Data_81feb:: ; 81feb (20:5feb)
 	dw $612b
 	db $01
 
-	INCROM $81ff0, $82143
+	INCBIN "data/maps/map7.bin"
 
 Data_82143:: ; 82143 (20:6143)
 	db $04 ; width
@@ -1505,7 +1505,7 @@ Data_82143:: ; 82143 (20:6143)
 	dw $614d
 	db $00
 
-	INCROM $82148, $82150
+	INCBIN "data/maps/map8.bin"
 
 Data_82150:: ; 82150 (20:6150)
 	db $04 ; width
@@ -1513,7 +1513,7 @@ Data_82150:: ; 82150 (20:6150)
 	dw $615d
 	db $01
 
-	INCROM $82155, $82160
+	INCBIN "data/maps/map9.bin"
 
 Data_82160:: ; 82160 (20:6160)
 	db $14 ; width
@@ -1521,7 +1521,7 @@ Data_82160:: ; 82160 (20:6160)
 	dw $620e
 	db $00
 
-	INCROM $82165, $82222
+	INCBIN "data/maps/map10.bin"
 
 Data_82222:: ; 82222 (20:6222)
 	db $14 ; width
@@ -1529,7 +1529,7 @@ Data_82222:: ; 82222 (20:6222)
 	dw $6322
 	db $01
 
-	INCROM $82227, $82336
+	INCBIN "data/maps/map11.bin"
 
 Data_82336:: ; 82336 (20:6336)
 	db $14 ; width
@@ -1537,7 +1537,7 @@ Data_82336:: ; 82336 (20:6336)
 	dw $63ec
 	db $00
 
-	INCROM $8233b, $82400
+	INCBIN "data/maps/map12.bin"
 
 Data_82400:: ; 82400 (20:6400)
 	db $14 ; width
@@ -1545,7 +1545,7 @@ Data_82400:: ; 82400 (20:6400)
 	dw $6509
 	db $01
 
-	INCROM $82405, $8251d
+	INCBIN "data/maps/map13.bin"
 
 Data_8251d:: ; 8251d (20:651d)
 	db $14 ; width
@@ -1553,7 +1553,7 @@ Data_8251d:: ; 8251d (20:651d)
 	dw $65d3
 	db $00
 
-	INCROM $82522, $825e7
+	INCBIN "data/maps/map14.bin"
 
 Data_825e7:: ; 825e7 (20:65e7)
 	db $14 ; width
@@ -1561,7 +1561,7 @@ Data_825e7:: ; 825e7 (20:65e7)
 	dw $66f0
 	db $01
 
-	INCROM $825ec, $82704
+	INCBIN "data/maps/map15.bin"
 
 Data_82704:: ; 82704 (20:6704)
 	db $14 ; width
@@ -1569,7 +1569,7 @@ Data_82704:: ; 82704 (20:6704)
 	dw $67ba
 	db $00
 
-	INCROM $82709, $827ce
+	INCBIN "data/maps/map16.bin"
 
 Data_827ce:: ; 827ce (20:67ce)
 	db $14 ; width
@@ -1577,7 +1577,7 @@ Data_827ce:: ; 827ce (20:67ce)
 	dw $68d7
 	db $01
 
-	INCROM $827d3, $828eb
+	INCBIN "data/maps/map17.bin"
 
 Data_828eb:: ; 828eb (20:68eb)
 	db $14 ; width
@@ -1585,7 +1585,7 @@ Data_828eb:: ; 828eb (20:68eb)
 	dw $69a1
 	db $00
 
-	INCROM $828f0, $829b5
+	INCBIN "data/maps/map18.bin"
 
 Data_829b5:: ; 829b5 (20:69b5)
 	db $14 ; width
@@ -1593,7 +1593,7 @@ Data_829b5:: ; 829b5 (20:69b5)
 	dw $6abe
 	db $01
 
-	INCROM $829ba, $82ad2
+	INCBIN "data/maps/map19.bin"
 
 Data_82ad2:: ; 82ad2 (20:6ad2)
 	db $14 ; width
@@ -1601,7 +1601,7 @@ Data_82ad2:: ; 82ad2 (20:6ad2)
 	dw $6b88
 	db $00
 
-	INCROM $82ad7, $82b9c
+	INCBIN "data/maps/map20.bin"
 
 Data_82b9c:: ; 82b9c (20:6b9c)
 	db $14 ; width
@@ -1609,7 +1609,7 @@ Data_82b9c:: ; 82b9c (20:6b9c)
 	dw $6ca5
 	db $01
 
-	INCROM $82ba1, $82cb9
+	INCBIN "data/maps/map21.bin"
 
 Data_82cb9:: ; 82cb9 (20:6cb9)
 	db $14 ; width
@@ -1617,7 +1617,7 @@ Data_82cb9:: ; 82cb9 (20:6cb9)
 	dw $6d6f
 	db $00
 
-	INCROM $82cbe, $82d83
+	INCBIN "data/maps/map22.bin"
 
 Data_82d83:: ; 82d83 (20:6d83)
 	db $14 ; width
@@ -1625,7 +1625,7 @@ Data_82d83:: ; 82d83 (20:6d83)
 	dw $6e8c
 	db $01
 
-	INCROM $82d88, $82ea0
+	INCBIN "data/maps/map23.bin"
 
 Data_82ea0:: ; 82ea0 (20:6ea0)
 	db $14 ; width
@@ -1633,7 +1633,7 @@ Data_82ea0:: ; 82ea0 (20:6ea0)
 	dw $6f56
 	db $00
 
-	INCROM $82ea5, $82f6a
+	INCBIN "data/maps/map24.bin"
 
 Data_82f6a:: ; 82f6a (20:6f6a)
 	db $14 ; width
@@ -1641,7 +1641,7 @@ Data_82f6a:: ; 82f6a (20:6f6a)
 	dw $7073
 	db $01
 
-	INCROM $82f6f, $83087
+	INCBIN "data/maps/map25.bin"
 
 Data_83087:: ; 83087 (20:7087)
 	db $14 ; width
@@ -1649,7 +1649,7 @@ Data_83087:: ; 83087 (20:7087)
 	dw $713d
 	db $00
 
-	INCROM $8308c, $83151
+	INCBIN "data/maps/map26.bin"
 
 Data_83151:: ; 83151 (20:7151)
 	db $14 ; width
@@ -1657,7 +1657,7 @@ Data_83151:: ; 83151 (20:7151)
 	dw $725a
 	db $01
 
-	INCROM $83156, $8326e
+	INCBIN "data/maps/map27.bin"
 
 Data_8326e:: ; 8326e (20:726e)
 	db $14 ; width
@@ -1665,7 +1665,7 @@ Data_8326e:: ; 8326e (20:726e)
 	dw $730d
 	db $00
 
-	INCROM $83273, $83321
+	INCBIN "data/maps/map28.bin"
 
 Data_83321:: ; 83321 (20:7321)
 	db $14 ; width
@@ -1673,7 +1673,7 @@ Data_83321:: ; 83321 (20:7321)
 	dw $7410
 	db $01
 
-	INCROM $83326, $83424
+	INCBIN "data/maps/map29.bin"
 
 Data_83424:: ; 83424 (20:7424)
 	db $1c ; width
@@ -1681,7 +1681,7 @@ Data_83424:: ; 83424 (20:7424)
 	dw $7529
 	db $00
 
-	INCROM $83429, $83545
+	INCBIN "data/maps/map30.bin"
 
 Data_83545:: ; 83545 (20:7545)
 	db $1c ; width
@@ -1689,7 +1689,7 @@ Data_83545:: ; 83545 (20:7545)
 	dw $76bf
 	db $01
 
-	INCROM $8354a, $836db
+	INCBIN "data/maps/map31.bin"
 
 Data_836db:: ; 836db (20:76db)
 	db $18 ; width
@@ -1697,7 +1697,7 @@ Data_836db:: ; 836db (20:76db)
 	dw $777b
 	db $00
 
-	INCROM $836e0, $8378c
+	INCBIN "data/maps/map32.bin"
 
 Data_8378c:: ; 8378c (20:778c)
 	db $18 ; width
@@ -1705,7 +1705,7 @@ Data_8378c:: ; 8378c (20:778c)
 	dw $787c
 	db $01
 
-	INCROM $83791, $8388d
+	INCBIN "data/maps/map33.bin"
 
 Data_8388d:: ; 8388d (20:788d)
 	db $1c ; width
@@ -1713,7 +1713,7 @@ Data_8388d:: ; 8388d (20:788d)
 	dw $79b5
 	db $00
 
-	INCROM $83892, $839d6
+	INCBIN "data/maps/map34.bin"
 
 Data_839d6:: ; 839d6 (20:79d6)
 	db $1c ; width
@@ -1721,7 +1721,7 @@ Data_839d6:: ; 839d6 (20:79d6)
 	dw $7bd0
 	db $01
 
-	INCROM $839db, $83bf1
+	INCBIN "data/maps/map35.bin"
 
 Data_83bf1:: ; 83bf1 (20:7bf1)
 	db $04 ; width
@@ -1729,7 +1729,7 @@ Data_83bf1:: ; 83bf1 (20:7bf1)
 	dw $7c00
 	db $00
 
-	INCROM $83bf6, $83c03
+	INCBIN "data/maps/map52.bin"
 
 Data_83c03:: ; 83c03 (20:7c03)
 	db $04 ; width
@@ -1737,7 +1737,7 @@ Data_83c03:: ; 83c03 (20:7c03)
 	dw $7c17
 	db $01
 
-	INCROM $83c08, $83c1a
+	INCBIN "data/maps/map53.bin"
 
 Data_83c1a:: ; 83c1a (20:7c1a)
 	db $04 ; width
@@ -1745,7 +1745,7 @@ Data_83c1a:: ; 83c1a (20:7c1a)
 	dw $7c23
 	db $00
 
-	INCROM $83c1f, $83c26
+	INCBIN "data/maps/map56.bin"
 
 Data_83c26:: ; 83c26 (20:7c26)
 	db $04 ; width
@@ -1753,7 +1753,7 @@ Data_83c26:: ; 83c26 (20:7c26)
 	dw $7c33
 	db $01
 
-	INCROM $83c2b, $83c36
+	INCBIN "data/maps/map57.bin"
 
 Data_83c36:: ; 83c36 (20:7c36)
 	db $03 ; width
@@ -1761,7 +1761,7 @@ Data_83c36:: ; 83c36 (20:7c36)
 	dw $0000
 	db $01
 
-	INCROM $83c3b, $83c4c
+	INCBIN "data/maps/map62.bin"
 
 AnimData1:: ; 83c4c (20:7c4c)
 	frame_table AnimFrameTable0
diff --git a/src/gfx.asm b/src/gfx.asm
index 727c146..9774877 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -53,7 +53,7 @@ Data_84000:: ; 84000 (21:4000)
 	dw $4164
 	db $00
 
-	INCROM $84005, $84188
+	INCBIN "data/maps/map36.bin"
 
 Data_84188:: ; 84188 (21:4188)
 	db $1c ; width
@@ -61,7 +61,7 @@ Data_84188:: ; 84188 (21:4188)
 	dw $4397
 	db $01
 
-	INCROM $8418d, $843bb
+	INCBIN "data/maps/map37.bin"
 
 Data_843bb:: ; 843bb (21:43bb)
 	db $1c ; width
@@ -69,7 +69,7 @@ Data_843bb:: ; 843bb (21:43bb)
 	dw $4511
 	db $00
 
-	INCROM $843c0, $84533
+	INCBIN "data/maps/map38.bin"
 
 Data_84533:: ; 84533 (21:4533)
 	db $1c ; width
@@ -77,7 +77,7 @@ Data_84533:: ; 84533 (21:4533)
 	dw $470c
 	db $01
 
-	INCROM $84538, $8472e
+	INCBIN "data/maps/map39.bin"
 
 Data_8472e:: ; 8472e (21:472e)
 	db $1c ; width
@@ -85,7 +85,7 @@ Data_8472e:: ; 8472e (21:472e)
 	dw $48b4
 	db $00
 
-	INCROM $84733, $848d8
+	INCBIN "data/maps/map40.bin"
 
 Data_848d8:: ; 848d8 (21:48d8)
 	db $1c ; width
@@ -93,7 +93,7 @@ Data_848d8:: ; 848d8 (21:48d8)
 	dw $4b4f
 	db $01
 
-	INCROM $848dd, $84b73
+	INCBIN "data/maps/map41.bin"
 
 Data_84b73:: ; 84b73 (21:4b73)
 	db $1c ; width
@@ -101,7 +101,7 @@ Data_84b73:: ; 84b73 (21:4b73)
 	dw $4c50
 	db $00
 
-	INCROM $84b78, $84c6f
+	INCBIN "data/maps/map42.bin"
 
 Data_84c6f:: ; 84c6f (21:4c6f)
 	db $1c ; width
@@ -109,7 +109,7 @@ Data_84c6f:: ; 84c6f (21:4c6f)
 	dw $4ddf
 	db $01
 
-	INCROM $84c74, $84dfe
+	INCBIN "data/maps/map43.bin"
 
 Data_84dfe:: ; 84dfe (21:4dfe)
 	db $1c ; width
@@ -117,7 +117,7 @@ Data_84dfe:: ; 84dfe (21:4dfe)
 	dw $4efe
 	db $00
 
-	INCROM $84e03, $84f1d
+	INCBIN "data/maps/map44.bin"
 
 Data_84f1d:: ; 84f1d (21:4f1d)
 	db $1c ; width
@@ -125,7 +125,7 @@ Data_84f1d:: ; 84f1d (21:4f1d)
 	dw $5097
 	db $01
 
-	INCROM $84f22, $850b6
+	INCBIN "data/maps/map45.bin"
 
 Data_850b6:: ; 850b6 (21:50b6)
 	db $1c ; width
@@ -133,7 +133,7 @@ Data_850b6:: ; 850b6 (21:50b6)
 	dw $5175
 	db $00
 
-	INCROM $850bb, $85191
+	INCBIN "data/maps/map46.bin"
 
 Data_85191:: ; 85191 (21:5191)
 	db $1c ; width
@@ -141,7 +141,7 @@ Data_85191:: ; 85191 (21:5191)
 	dw $52f9
 	db $01
 
-	INCROM $85196, $85315
+	INCBIN "data/maps/map47.bin"
 
 Data_85315:: ; 85315 (21:5315)
 	db $20 ; width
@@ -149,7 +149,7 @@ Data_85315:: ; 85315 (21:5315)
 	dw $5484
 	db $00
 
-	INCROM $8531a, $854b3
+	INCBIN "data/maps/map48.bin"
 
 Data_854b3:: ; 854b3 (21:54b3)
 	db $20 ; width
@@ -157,7 +157,7 @@ Data_854b3:: ; 854b3 (21:54b3)
 	dw $56db
 	db $01
 
-	INCROM $854b8, $8570a
+	INCBIN "data/maps/map49.bin"
 
 Data_8570a:: ; 8570a (21:570a)
 	db $20 ; width
@@ -165,7 +165,7 @@ Data_8570a:: ; 8570a (21:570a)
 	dw $57ba
 	db $00
 
-	INCROM $8570f, $857ce
+	INCBIN "data/maps/map50.bin"
 
 Data_857ce:: ; 857ce (21:57ce)
 	db $20 ; width
@@ -173,7 +173,7 @@ Data_857ce:: ; 857ce (21:57ce)
 	dw $58db
 	db $01
 
-	INCROM $857d3, $858ef
+	INCBIN "data/maps/map51.bin"
 
 Data_858ef:: ; 858ef (21:58ef)
 	db $20 ; width
@@ -181,7 +181,7 @@ Data_858ef:: ; 858ef (21:58ef)
 	dw $5a58
 	db $00
 
-	INCROM $858f4, $85a79
+	INCBIN "data/maps/map54.bin"
 
 Data_85a79:: ; 85a79 (21:5a79)
 	db $20 ; width
@@ -189,7 +189,7 @@ Data_85a79:: ; 85a79 (21:5a79)
 	dw $5cc1
 	db $01
 
-	INCROM $85a7e, $85ce2
+	INCBIN "data/maps/map55.bin"
 
 Data_85ce2:: ; 85ce2 (21:5ce2)
 	db $18 ; width
@@ -197,7 +197,7 @@ Data_85ce2:: ; 85ce2 (21:5ce2)
 	dw $5ddc
 	db $00
 
-	INCROM $85ce7, $85df4
+	INCBIN "data/maps/map58.bin"
 
 Data_85df4:: ; 85df4 (21:5df4)
 	db $18 ; width
@@ -205,7 +205,7 @@ Data_85df4:: ; 85df4 (21:5df4)
 	dw $5f64
 	db $01
 
-	INCROM $85df9, $85f7c
+	INCBIN "data/maps/map59.bin"
 
 Data_85f7c:: ; 85f7c (21:5f7c)
 	db $14 ; width
@@ -213,7 +213,7 @@ Data_85f7c:: ; 85f7c (21:5f7c)
 	dw $0000
 	db $01
 
-	INCROM $85f81, $8607f
+	INCBIN "data/maps/map60.bin"
 
 Data_8607f:: ; 8607f (21:607f)
 	db $14 ; width
@@ -221,7 +221,7 @@ Data_8607f:: ; 8607f (21:607f)
 	dw $0000
 	db $01
 
-	INCROM $86084, $8617d
+	INCBIN "data/maps/map61.bin"
 
 Data_8617d:: ; 8617d (21:617d)
 	db $03 ; width
@@ -229,7 +229,7 @@ Data_8617d:: ; 8617d (21:617d)
 	dw $0000
 	db $01
 
-	INCROM $86182, $86193
+	INCBIN "data/maps/map63.bin"
 
 Data_86193:: ; 86193 (21:6193)
 	db $03 ; width
@@ -237,7 +237,7 @@ Data_86193:: ; 86193 (21:6193)
 	dw $0000
 	db $01
 
-	INCROM $86198, $861a9
+	INCBIN "data/maps/map64.bin"
 
 Data_861a9:: ; 861a9 (21:61a9)
 	db $03 ; width
@@ -245,7 +245,7 @@ Data_861a9:: ; 861a9 (21:61a9)
 	dw $0000
 	db $01
 
-	INCROM $861ae, $861bf
+	INCBIN "data/maps/map65.bin"
 
 Data_861bf:: ; 861bf (21:61bf)
 	db $03 ; width
@@ -253,7 +253,7 @@ Data_861bf:: ; 861bf (21:61bf)
 	dw $0000
 	db $01
 
-	INCROM $861c4, $861d5
+	INCBIN "data/maps/map66.bin"
 
 Data_861d5:: ; 861d5 (21:61d5)
 	db $03 ; width
@@ -261,7 +261,7 @@ Data_861d5:: ; 861d5 (21:61d5)
 	dw $0000
 	db $01
 
-	INCROM $861da, $861eb
+	INCBIN "data/maps/map67.bin"
 
 Data_861eb:: ; 861eb (21:61eb)
 	db $03 ; width
@@ -269,7 +269,7 @@ Data_861eb:: ; 861eb (21:61eb)
 	dw $0000
 	db $01
 
-	INCROM $861f0, $86201
+	INCBIN "data/maps/map68.bin"
 
 Data_86201:: ; 86201 (21:6201)
 	db $03 ; width
@@ -277,7 +277,7 @@ Data_86201:: ; 86201 (21:6201)
 	dw $0000
 	db $01
 
-	INCROM $86206, $86217
+	INCBIN "data/maps/map69.bin"
 
 Data_86217:: ; 86217 (21:6217)
 	db $14 ; width
@@ -285,7 +285,7 @@ Data_86217:: ; 86217 (21:6217)
 	dw $0000
 	db $01
 
-	INCROM $8621c, $862da
+	INCBIN "data/maps/map70.bin"
 
 Data_862da:: ; 862da (21:62da)
 	db $14 ; width
@@ -293,7 +293,7 @@ Data_862da:: ; 862da (21:62da)
 	dw $0000
 	db $00
 
-	INCROM $862df, $86364
+	INCBIN "data/maps/map71.bin"
 
 Data_86364:: ; 86364 (21:6364)
 	db $14 ; width
@@ -301,7 +301,7 @@ Data_86364:: ; 86364 (21:6364)
 	dw $0000
 	db $01
 
-	INCROM $86369, $86443
+	INCBIN "data/maps/map72.bin"
 
 Data_86443:: ; 86443 (21:6443)
 	db $14 ; width
@@ -309,7 +309,7 @@ Data_86443:: ; 86443 (21:6443)
 	dw $0000
 	db $00
 
-	INCROM $86448, $864df
+	INCBIN "data/maps/map73.bin"
 
 Data_864df:: ; 864df (21:64df)
 	db $14 ; width
@@ -317,7 +317,7 @@ Data_864df:: ; 864df (21:64df)
 	dw $0000
 	db $01
 
-	INCROM $864e4, $865b5
+	INCBIN "data/maps/map74.bin"
 
 Data_865b5:: ; 865b5 (21:65b5)
 	db $14 ; width
@@ -325,7 +325,7 @@ Data_865b5:: ; 865b5 (21:65b5)
 	dw $0000
 	db $00
 
-	INCROM $865ba, $86647
+	INCBIN "data/maps/map75.bin"
 
 Data_86647:: ; 86647 (21:6647)
 	db $08 ; width
@@ -333,7 +333,7 @@ Data_86647:: ; 86647 (21:6647)
 	dw $0000
 	db $00
 
-	INCROM $8664c, $866b8
+	INCBIN "data/maps/map76.bin"
 
 Data_866b8:: ; 866b8 (21:66b8)
 	db $08 ; width
@@ -341,7 +341,7 @@ Data_866b8:: ; 866b8 (21:66b8)
 	dw $0000
 	db $01
 
-	INCROM $866bd, $8673e
+	INCBIN "data/maps/map77.bin"
 
 Data_8673e:: ; 8673e (21:673e)
 	db $08 ; width
@@ -349,7 +349,7 @@ Data_8673e:: ; 8673e (21:673e)
 	dw $0000
 	db $00
 
-	INCROM $86743, $867af
+	INCBIN "data/maps/map78.bin"
 
 Data_867af:: ; 867af (21:67af)
 	db $08 ; width
@@ -357,7 +357,7 @@ Data_867af:: ; 867af (21:67af)
 	dw $0000
 	db $01
 
-	INCROM $867b4, $86833
+	INCBIN "data/maps/map79.bin"
 
 Data_86833:: ; 86833 (21:6833)
 	db $08 ; width
@@ -365,7 +365,7 @@ Data_86833:: ; 86833 (21:6833)
 	dw $0000
 	db $00
 
-	INCROM $86838, $868a4
+	INCBIN "data/maps/map80.bin"
 
 Data_868a4:: ; 868a4 (21:68a4)
 	db $08 ; width
@@ -373,7 +373,7 @@ Data_868a4:: ; 868a4 (21:68a4)
 	dw $0000
 	db $01
 
-	INCROM $868a9, $86925
+	INCBIN "data/maps/map81.bin"
 
 Data_86925:: ; 86925 (21:6925)
 	db $08 ; width
@@ -381,7 +381,7 @@ Data_86925:: ; 86925 (21:6925)
 	dw $0000
 	db $00
 
-	INCROM $8692a, $86996
+	INCBIN "data/maps/map82.bin"
 
 Data_86996:: ; 86996 (21:6996)
 	db $08 ; width
@@ -389,7 +389,7 @@ Data_86996:: ; 86996 (21:6996)
 	dw $0000
 	db $01
 
-	INCROM $8699b, $86a14
+	INCBIN "data/maps/map83.bin"
 
 Data_86a14:: ; 86a14 (21:6a14)
 	db $08 ; width
@@ -397,7 +397,7 @@ Data_86a14:: ; 86a14 (21:6a14)
 	dw $0000
 	db $00
 
-	INCROM $86a19, $86a85
+	INCBIN "data/maps/map84.bin"
 
 Data_86a85:: ; 86a85 (21:6a85)
 	db $08 ; width
@@ -405,7 +405,7 @@ Data_86a85:: ; 86a85 (21:6a85)
 	dw $0000
 	db $01
 
-	INCROM $86a8a, $86b28
+	INCBIN "data/maps/map85.bin"
 
 Data_86b28:: ; 86b28 (21:6b28)
 	db $08 ; width
@@ -413,7 +413,7 @@ Data_86b28:: ; 86b28 (21:6b28)
 	dw $0000
 	db $00
 
-	INCROM $86b2d, $86b99
+	INCBIN "data/maps/map86.bin"
 
 Data_86b99:: ; 86b99 (21:6b99)
 	db $08 ; width
@@ -421,7 +421,7 @@ Data_86b99:: ; 86b99 (21:6b99)
 	dw $0000
 	db $01
 
-	INCROM $86b9e, $86c34
+	INCBIN "data/maps/map87.bin"
 
 Data_86c34:: ; 86c34 (21:6c34)
 	db $08 ; width
@@ -429,7 +429,7 @@ Data_86c34:: ; 86c34 (21:6c34)
 	dw $0000
 	db $00
 
-	INCROM $86c39, $86ca5
+	INCBIN "data/maps/map88.bin"
 
 Data_86ca5:: ; 86ca5 (21:6ca5)
 	db $08 ; width
@@ -437,7 +437,7 @@ Data_86ca5:: ; 86ca5 (21:6ca5)
 	dw $0000
 	db $01
 
-	INCROM $86caa, $86d37
+	INCBIN "data/maps/map89.bin"
 
 Data_86d37:: ; 86d37 (21:6d37)
 	db $14 ; width
@@ -445,7 +445,7 @@ Data_86d37:: ; 86d37 (21:6d37)
 	dw $0000
 	db $00
 
-	INCROM $86d3c, $86dcc
+	INCBIN "data/maps/map90.bin"
 
 Data_86dcc:: ; 86dcc (21:6dcc)
 	db $14 ; width
@@ -453,7 +453,7 @@ Data_86dcc:: ; 86dcc (21:6dcc)
 	dw $0000
 	db $01
 
-	INCROM $86dd1, $86e8a
+	INCBIN "data/maps/map91.bin"
 
 Data_86e8a:: ; 86e8a (21:6e8a)
 	db $14 ; width
@@ -461,7 +461,7 @@ Data_86e8a:: ; 86e8a (21:6e8a)
 	dw $0000
 	db $01
 
-	INCROM $86e8f, $86f18
+	INCBIN "data/maps/map92.bin"
 
 Data_86f18:: ; 86f18 (21:6f18)
 	db $14 ; width
@@ -469,7 +469,7 @@ Data_86f18:: ; 86f18 (21:6f18)
 	dw $0000
 	db $01
 
-	INCROM $86f1d, $86fc0
+	INCBIN "data/maps/map93.bin"
 
 Data_86fc0:: ; 86fc0 (21:6fc0)
 	db $14 ; width
@@ -477,7 +477,7 @@ Data_86fc0:: ; 86fc0 (21:6fc0)
 	dw $0000
 	db $01
 
-	INCROM $86fc5, $8704f
+	INCBIN "data/maps/map94.bin"
 
 Data_8704f:: ; 8704f (21:704f)
 	db $14 ; width
@@ -485,7 +485,7 @@ Data_8704f:: ; 8704f (21:704f)
 	dw $0000
 	db $00
 
-	INCROM $87054, $871a5
+	INCBIN "data/maps/map95.bin"
 
 Data_871a5:: ; 871a5 (21:71a5)
 	db $14 ; width
@@ -493,7 +493,7 @@ Data_871a5:: ; 871a5 (21:71a5)
 	dw $0000
 	db $01
 
-	INCROM $871aa, $87397
+	INCBIN "data/maps/map96.bin"
 
 Data_87397:: ; 87397 (21:7397)
 	db $08 ; width
@@ -501,7 +501,7 @@ Data_87397:: ; 87397 (21:7397)
 	dw $0000
 	db $01
 
-	INCROM $8739c, $873b7
+	INCBIN "data/maps/map97.bin"
 
 Data_873b7:: ; 873b7 (21:73b7)
 	db $06 ; width
@@ -509,7 +509,7 @@ Data_873b7:: ; 873b7 (21:73b7)
 	dw $0000
 	db $00
 
-	INCROM $873bc, $873e5
+	INCBIN "data/maps/map98.bin"
 
 Data_873e5:: ; 873e5 (21:73e5)
 	db $06 ; width
@@ -517,7 +517,7 @@ Data_873e5:: ; 873e5 (21:73e5)
 	dw $0000
 	db $00
 
-	INCROM $873ea, $87413
+	INCBIN "data/maps/map99.bin"
 
 Data_87413:: ; 87413 (21:7413)
 	db $14 ; width
@@ -525,7 +525,7 @@ Data_87413:: ; 87413 (21:7413)
 	dw $0000
 	db $00
 
-	INCROM $87418, $87538
+	INCBIN "data/maps/map100.bin"
 
 Data_87538:: ; 87538 (21:7538)
 	db $14 ; width
@@ -533,7 +533,7 @@ Data_87538:: ; 87538 (21:7538)
 	dw $0000
 	db $01
 
-	INCROM $8753d, $8769f
+	INCBIN "data/maps/map101.bin"
 
 Data_8769f:: ; 8769f (21:769f)
 	db $14 ; width
@@ -541,7 +541,7 @@ Data_8769f:: ; 8769f (21:769f)
 	dw $0000
 	db $00
 
-	INCROM $876a4, $876f6
+	INCBIN "data/maps/map102.bin"
 
 Data_876f6:: ; 876f6 (21:76f6)
 	db $14 ; width
@@ -549,7 +549,7 @@ Data_876f6:: ; 876f6 (21:76f6)
 	dw $0000
 	db $01
 
-	INCROM $876fb, $8777c
+	INCBIN "data/maps/map103.bin"
 
 Data_8777c:: ; 8777c (21:777c)
 	db $14 ; width
@@ -557,7 +557,7 @@ Data_8777c:: ; 8777c (21:777c)
 	dw $0000
 	db $00
 
-	INCROM $87781, $877c4
+	INCBIN "data/maps/map104.bin"
 
 Data_877c4:: ; 877c4 (21:77c4)
 	db $14 ; width
@@ -565,7 +565,7 @@ Data_877c4:: ; 877c4 (21:77c4)
 	dw $0000
 	db $00
 
-	INCROM $877c9, $87828
+	INCBIN "data/maps/map105.bin"
 
 
 IshiharaTilesetGfx: ; 87828 (21:7828)
-- 
cgit v1.2.3


From ae378aa629caa6f7281a177ab86bed36787503dc Mon Sep 17 00:00:00 2001
From: ElectroDeoxys <ElectroDeoxys@gmail.com>
Date: Fri, 12 Feb 2021 21:11:31 +0000
Subject: Disassemble tileset data

---
 src/constants.asm                   |   1 +
 src/constants/tileset_constants.asm |  88 +++++
 src/engine/bank1c.asm               |   5 +-
 src/engine/bank20.asm               | 646 ++++++++++++++++++++++++------------
 src/engine/home.asm                 |   3 +-
 src/gfx.asm                         | 348 +++++++++----------
 src/wram.asm                        |  14 +-
 7 files changed, 713 insertions(+), 392 deletions(-)
 create mode 100644 src/constants/tileset_constants.asm

diff --git a/src/constants.asm b/src/constants.asm
index c63175b..efa44fb 100644
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -18,6 +18,7 @@ INCLUDE "constants/sgb_constants.asm"
 INCLUDE "constants/sfx_constants.asm"
 INCLUDE "constants/sprite_constants.asm"
 INCLUDE "constants/text_constants.asm"
+INCLUDE "constants/tileset_constants.asm"
 INCLUDE "constants/animation_constants.asm"
 INCLUDE "constants/attack_animation_constants.asm"
 INCLUDE "constants/charmaps.asm"
diff --git a/src/constants/tileset_constants.asm b/src/constants/tileset_constants.asm
new file mode 100644
index 0000000..6e3f8f3
--- /dev/null
+++ b/src/constants/tileset_constants.asm
@@ -0,0 +1,88 @@
+	const_def
+	const TILESET_OVERWORLD_MAP         ; $00
+	const TILESET_MASON_LABORATORY      ; $01
+	const TILESET_ISHIHARA              ; $02
+	const TILESET_CLUB_ENTRANCE         ; $03
+	const TILESET_CLUB_LOBBY            ; $04
+	const TILESET_FIGHTING_CLUB         ; $05
+	const TILESET_ROCK_CLUB             ; $06
+	const TILESET_WATER_CLUB            ; $07
+	const TILESET_LIGHTNING_CLUB        ; $08
+	const TILESET_GRASS_CLUB            ; $09
+	const TILESET_PSYCHIC_CLUB          ; $0a
+	const TILESET_SCIENCE_CLUB          ; $0b
+	const TILESET_FIRE_CLUB             ; $0c
+	const TILESET_CHALLENGE_HALL        ; $0d
+	const TILESET_POKEMON_DOME_ENTRANCE ; $0e
+	const TILESET_POKEMON_DOME          ; $0f
+	const TILESET_HALL_OF_HONOR         ; $10
+	const TILESET_CARD_POP_1            ; $11
+	const TILESET_MEDAL                 ; $12
+	const TILESET_CARD_POP_2            ; $13
+	const TILESET_CARD_POP_3            ; $14
+	const TILESET_COLOSSEUM_1           ; $15
+	const TILESET_COLOSSEUM_2           ; $16
+	const TILESET_EVOLUTION_1           ; $17
+	const TILESET_EVOLUTION_2           ; $18
+	const TILESET_MYSTERY_1             ; $19
+	const TILESET_MYSTERY_2             ; $1a
+	const TILESET_LABORATORY_1          ; $1b
+	const TILESET_LABORATORY_2          ; $1c
+	const TILESET_CHARIZARD_INTRO_1     ; $1d
+	const TILESET_CHARIZARD_INTRO_2     ; $1e
+	const TILESET_SCYTHER_INTRO_1       ; $1f
+	const TILESET_SCYTHER_INTRO_2       ; $20
+	const TILESET_AERODACTYL_INTRO_1    ; $21
+	const TILESET_AERODACTYL_INTRO_2    ; $22
+	const TILESET_TITLE_SCREEN_1        ; $23
+	const TILESET_TITLE_SCREEN_2        ; $24
+	const TILESET_SOLID_TILES_1         ; $25
+	const TILESET_TITLE_SCREEN_3        ; $26
+	const TILESET_TITLE_SCREEN_4        ; $27
+	const TILESET_SOLID_TILES_2         ; $28
+	const TILESET_PLAYER                ; $29
+	const TILESET_RONALD                ; $2a
+	const TILESET_TITLE_SCREEN_5        ; $2b
+	const TILESET_TITLE_SCREEN_6        ; $2c
+	const TILESET_COPYRIGHT             ; $2d
+	const TILESET_NINTENDO              ; $2e
+	const TILESET_COMPANIES             ; $2f
+	const TILESET_SAM                   ; $30
+	const TILESET_IMAKUNI               ; $31
+	const TILESET_NIKKI                 ; $32
+	const TILESET_RICK                  ; $33
+	const TILESET_KEN                   ; $34
+	const TILESET_AMY                   ; $35
+	const TILESET_ISAAC                 ; $36
+	const TILESET_MITCH                 ; $37
+	const TILESET_GENE                  ; $38
+	const TILESET_MURRAY                ; $39
+	const TILESET_COURTNEY              ; $3a
+	const TILESET_STEVE                 ; $3b
+	const TILESET_JACK                  ; $3c
+	const TILESET_ROD                   ; $3d
+	const TILESET_JOSEPH                ; $3e
+	const TILESET_DAVID                 ; $3f
+	const TILESET_ERIK                  ; $40
+	const TILESET_JOHN                  ; $41
+	const TILESET_ADAM                  ; $42
+	const TILESET_JONATHAN              ; $43
+	const TILESET_JOSHUA                ; $44
+	const TILESET_NICHOLAS              ; $45
+	const TILESET_BRANDON               ; $46
+	const TILESET_MATTHEW               ; $47
+	const TILESET_RYAN                  ; $48
+	const TILESET_ANDREW                ; $49
+	const TILESET_CHRIS                 ; $4a
+	const TILESET_MICHAEL               ; $4b
+	const TILESET_DANIEL                ; $4c
+	const TILESET_ROBERT                ; $4d
+	const TILESET_BRITTANY              ; $4e
+	const TILESET_KRISTIN               ; $4f
+	const TILESET_HEATHER               ; $50
+	const TILESET_SARA                  ; $51
+	const TILESET_AMANDA                ; $52
+	const TILESET_JENNIFER              ; $53
+	const TILESET_JESSICA               ; $54
+	const TILESET_STEPHANIE             ; $55
+	const TILESET_AARON                 ; $56
diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm
index 10bd58d..15a4647 100644
--- a/src/engine/bank1c.asm
+++ b/src/engine/bank1c.asm
@@ -328,4 +328,7 @@ Func_70214: ; 70214 (1c:4214)
 	ret
 
 Unknown_7024a: ; 7024a (1c:424a)
-	INCROM $7024a, $74000
+	INCROM $7024a, $7036a
+
+Func_7036a: ; 7036a (1c:436a)
+	INCROM $7036a, $74000
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 3c447ac..8039177 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -11,7 +11,31 @@ Func_80028: ; 80028 (20:4028)
 	ret
 ; 0x8003d
 
-	INCROM $8003d, $80077
+Func_8003d: ; 8003d (20:403d)
+	farcall Func_1c33b
+	farcall Func_7036a
+	ld bc, $0
+	call Func_80077
+	ld a, $80
+	ld [wd4ca], a
+	xor a
+	ld [wd4cb], a
+	call LoadTilesetGfx
+	xor a
+	ld [wd4ca], a
+	ld a, [wd291]
+	ld [wd4cb], a
+	ld a, [wd28f]
+	call Func_803c9
+	ld a, [wd291]
+	ld [wd4cb], a
+	ld a, [wd290]
+	or a
+	jr z, .asm_80076
+	call Func_803c9
+.asm_80076
+	ret
+; 0x80077
 
 Func_80077: ; 80077 (20:4077)
 	ld a, $1
@@ -350,7 +374,7 @@ Func_8025b: ; 8025b (20:425b)
 	call LoadGraphicsPointerFromHL
 	ld a, [hl] ; sprite number of tiles
 	push af
-	ld [wCurSpriteNumTiles], a
+	ld [wTotalNumTiles], a
 	ld a, TILE_SIZE
 	ld [wCurSpriteTileSize], a
 	call LoadGfxDataFromTempPointerToVRAMBank
@@ -365,7 +389,7 @@ LoadGfxDataFromTempPointerToVRAMBank: ; 80274 (20:4274)
 	jr LoadGfxDataFromTempPointer
 
 Func_80279: ; 80279 (20:4279)
-	call Func_802bb
+	call GetTileOffsetPointerAndSwitchVRAM_Tiles0ToTiles2
 
 ; loads graphics data pointed by wTempPointer in wTempPointerBank
 ; to wVRAMPointer
@@ -373,7 +397,7 @@ LoadGfxDataFromTempPointer:
 	push hl
 	push bc
 	push de
-	ld a, [wCurSpriteNumTiles]
+	ld a, [wTotalNumTiles]
 	ld b, a
 	ld a, [wCurSpriteTileSize]
 	ld c, a
@@ -405,7 +429,7 @@ GetTileOffsetPointerAndSwitchVRAM: ; 8029f (20:429f)
 	and $f0
 	ld [wVRAMPointer], a
 	pop af
-	and $f
+	and $0f
 	add HIGH(v0Tiles0) ; $80
 	ld [wVRAMPointer + 1], a
 
@@ -416,21 +440,190 @@ GetTileOffsetPointerAndSwitchVRAM: ; 8029f (20:429f)
 	call BankswitchVRAM
 	ret
 
-Func_802bb: ; 802bb (20:42bb)
-	ld a, [wd4ca]
+; converts wVRAMTileOffset to address in VRAM
+; and stores it in wVRAMPointer
+; switches VRAM according to wd4cb
+; then changes wVRAMPointer such that
+; addresses to Tiles0 is changed to Tiles2
+GetTileOffsetPointerAndSwitchVRAM_Tiles0ToTiles2: ; 802bb (20:42bb)
+	ld a, [wVRAMTileOffset]
 	push af
-	xor $80
-	ld [wd4ca], a
+	xor $80 ; toggle top bit
+	ld [wVRAMTileOffset], a
 	call GetTileOffsetPointerAndSwitchVRAM
 	ld a, [wVRAMPointer + 1]
 	add $8
 	ld [wVRAMPointer + 1], a
 	pop af
-	ld [wd4ca], a
+	ld [wVRAMTileOffset], a
 	ret
 ; 0x802d4
 
-	INCROM $802d4, $803b9
+; loads tileset gfx to VRAM corresponding to wCurTileset
+LoadTilesetGfx: ; 802d4 (20:42d4)
+	push hl
+	ld l, $02
+	ld a, [wCurTileset]
+	call GetMapDataPointer
+	call LoadGraphicsPointerFromHL
+	call .LoadTileGfx
+	call BankswitchVRAM0
+	pop hl
+	ret
+; 0x802e8
+
+; loads gfx data from wTempPointerBank:wTempPointer
+.LoadTileGfx ; 802e8 (20:42e8)
+	push hl
+	push bc
+	push de
+	ld hl, wTempPointer
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ld a, [wTempPointerBank]
+	call GetFarByte ; get number of tiles (low byte)
+	ld [wTotalNumTiles], a
+	inc hl
+	ld a, [wTempPointerBank]
+	call GetFarByte ; get number of tiles (high byte)
+	ld [wTotalNumTiles + 1], a
+	inc hl
+	ld a, l
+	ld [wTempPointer], a
+	ld a, h
+	ld [wTempPointer + 1], a
+
+; used to sequentially copy gfx data in the order
+; v0Tiles1 -> v0Tiles2 -> v1Tiles1 -> v1Tiles2
+
+	lb bc, $0, LOW(v0Tiles2 / TILE_SIZE) ; $00
+	call .CopyGfxData
+	jr z, .done
+	lb bc, $0, LOW(v0Tiles1 / TILE_SIZE) ; $80
+	call .CopyGfxData
+	jr z, .done
+	; VRAM1 only used in CGB console
+	ld a, [wConsole]
+	cp CONSOLE_CGB
+	jr nz, .done
+	lb bc, $1, LOW(v1Tiles2 / TILE_SIZE) ; $00
+	call .CopyGfxData
+	jr z, .done
+	lb bc, $1, LOW(v1Tiles1 / TILE_SIZE) ; $80
+	call .CopyGfxData
+
+.done
+	pop de
+	pop bc
+	pop hl
+	ret
+; 0x80336
+
+; copies gfx data from wTempPointer to VRAM
+; c must match with wVRAMTileOffset
+; if c = $00, copies it to Tiles2
+; if c = $80, copies it to Tiles1
+; b must match with VRAM bank in wd4cb
+; prepares next call to this routine if data wasn't fully copied
+; so that it copies to the right VRAM section
+.CopyGfxData ; 80336 (20:4336)
+	push hl
+	push bc
+	push de
+	ld a, [wd4cb]
+	cp b
+	jr nz, .skip
+	ld a, [wVRAMTileOffset]
+	ld d, a
+	xor c
+	bit 7, a
+	jr nz, .skip
+
+; (wd4cb == b) and
+; bit 7 in c is same as bit 7 in wVRAMTileOffset
+	ld a, c
+	add $80
+	sub d
+	ld d, a ; total number of tiles
+	ld a, [wTotalNumTiles + 1]
+	or a
+	jr nz, .asm_8035a
+	; if d > wTotalNumTiles,
+	; overwrite it with wTotalNumTiles
+	ld a, [wTotalNumTiles]
+	cp d
+	jr nc, .asm_8035a
+	ld d, a
+.asm_8035a
+	ld a, [wTotalNumTiles]
+	sub d
+	ld [wTotalNumTiles], a
+	ld a, [wTotalNumTiles + 1]
+	sbc $00
+	ld [wTotalNumTiles + 1], a
+	call GetTileOffsetPointerAndSwitchVRAM_Tiles0ToTiles2
+
+	ld b, d ; number of tiles
+	ld c, TILE_SIZE
+	ld hl, wVRAMPointer
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	ld hl, wTempPointer
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	push bc
+	push hl
+	ldh a, [hBankVRAM]
+	push af
+	ld a, [wd4cb]
+	and $01
+	call BankswitchVRAM
+	call CopyGfxDataFromTempBank
+	pop af
+	call BankswitchVRAM
+	pop de
+	pop bc
+
+	; add number of tiles * TILE_SIZE
+	; to wVRAMPointer and store it in wTempPointer
+	ld l, b
+	ld h, $00
+	add hl, hl ; *2
+	add hl, hl ; *4
+	add hl, hl ; *8
+	add hl, hl ; *16 (TILE_SIZE)
+	add hl, de
+	ld a, l
+	ld [wTempPointer], a
+	ld a, h
+	ld [wTempPointer + 1], a
+
+	ld hl, wVRAMTileOffset
+	ld a, [hl]
+	add $80
+	push af
+	and $80 ; start of next group of tiles
+	ld [hli], a
+	pop af
+	; if it overflows
+	; (which means a tile group after Tiles2)
+	; then set wd4cb for VRAM1
+	ld a, [hl] ; wd4cb
+	adc $00
+	ld [hl], a
+
+.skip
+	ld hl, wTotalNumTiles
+	ld a, [hli]
+	or [hl] ; wTotalNumTiles + 1
+	pop de
+	pop bc
+	pop hl
+	ret
+; 0x803b9
 
 ; gets pointer to BG map with ID from wd131
 Func_803b9: ; 803b9 (20:43b9)
@@ -439,11 +632,37 @@ Func_803b9: ; 803b9 (20:43b9)
 	call GetMapDataPointer
 	call LoadGraphicsPointerFromHL
 	ld a, [hl]
-	ld [wd239], a
+	ld [wCurTileset], a
 	ret
 ; 0x803c9
 
-	INCROM $803c9, $803ec
+Func_803c9: ; 803c9 (20:43c9)
+	push hl
+	push bc
+	push de
+	call CopyPaletteDataToBuffer
+	ld hl, wLoadedPalData
+	ld a, [hli]
+	or a
+	jr z, .asm_803dc
+	ld a, [hli]
+	push hl
+	call SetBGP
+	pop hl
+.asm_803dc
+	ld a, [hli]
+	or a
+	jr z, .asm_803e8
+	ld c, a
+	ld a, [wd4cb]
+	ld b, a
+	call LoadPaletteDataFromHL
+.asm_803e8
+	pop de
+	pop bc
+	pop hl
+	ret
+; 0x803ec
 
 ; copies from palette data in hl c*8 bytes to palette index b
 ; in WRAM, starting from wBackgroundPalettesCGB
@@ -707,214 +926,221 @@ SpriteNullAnimationFrame:
 ; might be closer to "screen specific data" than map data
 MapDataPointers: ; 80e5d (20:4e5d)
 	dw MapDataPointers_80e67
-	dw MapDataPointers_8100f
+	dw Tilesets
 	dw MapDataPointers_8116b
 	dw SpriteAnimationPointers
 	dw MapDataPointers_81697
 
 ; \1 = pointer
-; \2 = unknown
+; \2 = tileset
 macro_80e67: MACRO
 	dwb \1, BANK(\1) - BANK(MapDataPointers_80e67)
 	db \2
 ENDM
 
 MapDataPointers_80e67: ; 80e67 (20:4e67)
-	macro_80e67 Data_8191b, $00 ; 0
-	macro_80e67 Data_81a22, $00 ; 1
-	macro_80e67 Data_81c13, $01 ; 2
-	macro_80e67 Data_81d2e, $01 ; 3
-	macro_80e67 Data_81ed1, $01 ; 4
-	macro_80e67 Data_81ef5, $01 ; 5
-	macro_80e67 Data_81f26, $01 ; 6
-	macro_80e67 Data_81feb, $01 ; 7
-	macro_80e67 Data_82143, $01 ; 8
-	macro_80e67 Data_82150, $01 ; 9
-	macro_80e67 Data_82160, $02 ; 10
-	macro_80e67 Data_82222, $02 ; 11
-	macro_80e67 Data_82336, $03 ; 12
-	macro_80e67 Data_82400, $03 ; 13
-	macro_80e67 Data_8251d, $03 ; 14
-	macro_80e67 Data_825e7, $03 ; 15
-	macro_80e67 Data_82704, $03 ; 16
-	macro_80e67 Data_827ce, $03 ; 17
-	macro_80e67 Data_828eb, $03 ; 18
-	macro_80e67 Data_829b5, $03 ; 19
-	macro_80e67 Data_82ad2, $03 ; 20
-	macro_80e67 Data_82b9c, $03 ; 21
-	macro_80e67 Data_82cb9, $03 ; 22
-	macro_80e67 Data_82d83, $03 ; 23
-	macro_80e67 Data_82ea0, $03 ; 24
-	macro_80e67 Data_82f6a, $03 ; 25
-	macro_80e67 Data_83087, $03 ; 26
-	macro_80e67 Data_83151, $03 ; 27
-	macro_80e67 Data_8326e, $03 ; 28
-	macro_80e67 Data_83321, $03 ; 29
-	macro_80e67 Data_83424, $04 ; 30
-	macro_80e67 Data_83545, $04 ; 31
-	macro_80e67 Data_836db, $05 ; 32
-	macro_80e67 Data_8378c, $05 ; 33
-	macro_80e67 Data_8388d, $06 ; 34
-	macro_80e67 Data_839d6, $06 ; 35
-	macro_80e67 Data_84000, $07 ; 36
-	macro_80e67 Data_84188, $07 ; 37
-	macro_80e67 Data_843bb, $08 ; 38
-	macro_80e67 Data_84533, $08 ; 39
-	macro_80e67 Data_8472e, $09 ; 40
-	macro_80e67 Data_848d8, $09 ; 41
-	macro_80e67 Data_84b73, $0a ; 42
-	macro_80e67 Data_84c6f, $0a ; 43
-	macro_80e67 Data_84dfe, $0b ; 44
-	macro_80e67 Data_84f1d, $0b ; 45
-	macro_80e67 Data_850b6, $0c ; 46
-	macro_80e67 Data_85191, $0c ; 47
-	macro_80e67 Data_85315, $0d ; 48
-	macro_80e67 Data_854b3, $0d ; 49
-	macro_80e67 Data_8570a, $0e ; 50
-	macro_80e67 Data_857ce, $0e ; 51
-	macro_80e67 Data_83bf1, $0e ; 52
-	macro_80e67 Data_83c03, $0e ; 53
-	macro_80e67 Data_858ef, $0f ; 54
-	macro_80e67 Data_85a79, $0f ; 55
-	macro_80e67 Data_83c1a, $0f ; 56
-	macro_80e67 Data_83c26, $0f ; 57
-	macro_80e67 Data_85ce2, $10 ; 58
-	macro_80e67 Data_85df4, $10 ; 59
-	macro_80e67 Data_85f7c, $11 ; 60
-	macro_80e67 Data_8607f, $11 ; 61
-	macro_80e67 Data_83c36, $12 ; 62
-	macro_80e67 Data_8617d, $12 ; 63
-	macro_80e67 Data_86193, $12 ; 64
-	macro_80e67 Data_861a9, $12 ; 65
-	macro_80e67 Data_861bf, $12 ; 66
-	macro_80e67 Data_861d5, $12 ; 67
-	macro_80e67 Data_861eb, $12 ; 68
-	macro_80e67 Data_86201, $12 ; 69
-	macro_80e67 Data_86217, $13 ; 70
-	macro_80e67 Data_862da, $13 ; 71
-	macro_80e67 Data_86364, $13 ; 72
-	macro_80e67 Data_86443, $13 ; 73
-	macro_80e67 Data_864df, $14 ; 74
-	macro_80e67 Data_865b5, $14 ; 75
-	macro_80e67 Data_86647, $15 ; 76
-	macro_80e67 Data_866b8, $16 ; 77
-	macro_80e67 Data_8673e, $17 ; 78
-	macro_80e67 Data_867af, $18 ; 79
-	macro_80e67 Data_86833, $19 ; 80
-	macro_80e67 Data_868a4, $1a ; 81
-	macro_80e67 Data_86925, $1b ; 82
-	macro_80e67 Data_86996, $1c ; 83
-	macro_80e67 Data_86a14, $1d ; 84
-	macro_80e67 Data_86a85, $1e ; 85
-	macro_80e67 Data_86b28, $1f ; 86
-	macro_80e67 Data_86b99, $20 ; 87
-	macro_80e67 Data_86c34, $21 ; 88
-	macro_80e67 Data_86ca5, $22 ; 89
-	macro_80e67 Data_86d37, $23 ; 90
-	macro_80e67 Data_86dcc, $24 ; 91
-	macro_80e67 Data_86e8a, $25 ; 92
-	macro_80e67 Data_86f18, $25 ; 93
-	macro_80e67 Data_86fc0, $25 ; 94
-	macro_80e67 Data_8704f, $26 ; 95
-	macro_80e67 Data_871a5, $27 ; 96
-	macro_80e67 Data_87397, $28 ; 97
-	macro_80e67 Data_873b7, $29 ; 98
-	macro_80e67 Data_873e5, $2a ; 99
-	macro_80e67 Data_87413, $2b ; 100
-	macro_80e67 Data_87538, $2c ; 101
-	macro_80e67 Data_8769f, $2d ; 102
-	macro_80e67 Data_876f6, $2d ; 103
-	macro_80e67 Data_8777c, $2e ; 104
-	macro_80e67 Data_877c4, $2f ; 105
-
-MapDataPointers_8100f: ; 8100f (20:500f)
-	db $00, $40, $02, $c1
-	db $12, $4c, $02, $97
-	db $28, $78, $01, $4d
-	db $84, $55, $02, $81
-	db $96, $5d, $02, $78
-	db $18, $65, $02, $63
-	db $4a, $6b, $02, $3c
-	db $0c, $6f, $02, $a1
-	db $00, $40, $03, $83
-	db $1e, $79, $02, $57
-	db $32, $48, $03, $3a
-	db $d4, $4b, $03, $52
-	db $f6, $50, $03, $57
-	db $68, $56, $03, $9d
-	db $3a, $60, $03, $4e
-	db $1c, $65, $03, $cf
-	db $0e, $72, $03, $79
-	db $00, $40, $04, $bd
-	db $a0, $79, $03, $48
-	db $d2, $4b, $04, $6d
-	db $a4, $52, $04, $5d
-	db $76, $58, $04, $60
-	db $78, $5e, $04, $56
-	db $da, $63, $04, $60
-	db $dc, $69, $04, $56
-	db $3e, $6f, $04, $60
-	db $40, $75, $04, $56
-	db $00, $40, $05, $60
-	db $02, $46, $05, $56
-	db $64, $4b, $05, $60
-	db $66, $51, $05, $60
-	db $68, $57, $05, $60
-	db $6a, $5d, $05, $60
-	db $6c, $63, $05, $60
-	db $6e, $69, $05, $60
-	db $70, $6f, $05, $61
-	db $82, $75, $05, $61
-	db $fa, $7c, $01, $04
-	db $00, $40, $06, $f4
-	db $42, $4f, $06, $3b
-	db $3c, $7d, $01, $04
-	db $7e, $7d, $01, $24
-	db $a2, $7a, $04, $24
-	db $f4, $62, $06, $dc
-	db $b6, $70, $06, $d4
-	db $e4, $7c, $04, $24
-	db $22, $7e, $03, $18
-	db $94, $7b, $05, $31
-	db $00, $40, $07, $24
-	db $42, $42, $07, $24
-	db $84, $44, $07, $24
-	db $c6, $46, $07, $24
-	db $08, $49, $07, $24
-	db $4a, $4b, $07, $24
-	db $8c, $4d, $07, $24
-	db $ce, $4f, $07, $24
-	db $10, $52, $07, $24
-	db $52, $54, $07, $24
-	db $94, $56, $07, $24
-	db $d6, $58, $07, $24
-	db $18, $5b, $07, $24
-	db $5a, $5d, $07, $24
-	db $9c, $5f, $07, $24
-	db $de, $61, $07, $24
-	db $20, $64, $07, $24
-	db $62, $66, $07, $24
-	db $a4, $68, $07, $24
-	db $e6, $6a, $07, $24
-	db $28, $6d, $07, $24
-	db $6a, $6f, $07, $24
-	db $ac, $71, $07, $24
-	db $ee, $73, $07, $24
-	db $30, $76, $07, $24
-	db $72, $78, $07, $24
-	db $b4, $7a, $07, $24
-	db $f6, $7c, $07, $24
-	db $00, $40, $08, $24
-	db $42, $42, $08, $24
-	db $84, $44, $08, $24
-	db $c6, $46, $08, $24
-	db $08, $49, $08, $24
-	db $4a, $4b, $08, $24
-	db $8c, $4d, $08, $24
-	db $ce, $4f, $08, $24
-	db $10, $52, $08, $24
-	db $52, $54, $08, $24
-	db $94, $56, $08, $24
+	macro_80e67 Data_8191b, TILESET_OVERWORLD_MAP         ; 0
+	macro_80e67 Data_81a22, TILESET_OVERWORLD_MAP         ; 1
+	macro_80e67 Data_81c13, TILESET_MASON_LABORATORY      ; 2
+	macro_80e67 Data_81d2e, TILESET_MASON_LABORATORY      ; 3
+	macro_80e67 Data_81ed1, TILESET_MASON_LABORATORY      ; 4
+	macro_80e67 Data_81ef5, TILESET_MASON_LABORATORY      ; 5
+	macro_80e67 Data_81f26, TILESET_MASON_LABORATORY      ; 6
+	macro_80e67 Data_81feb, TILESET_MASON_LABORATORY      ; 7
+	macro_80e67 Data_82143, TILESET_MASON_LABORATORY      ; 8
+	macro_80e67 Data_82150, TILESET_MASON_LABORATORY      ; 9
+	macro_80e67 Data_82160, TILESET_ISHIHARA              ; 10
+	macro_80e67 Data_82222, TILESET_ISHIHARA              ; 11
+	macro_80e67 Data_82336, TILESET_CLUB_ENTRANCE         ; 12
+	macro_80e67 Data_82400, TILESET_CLUB_ENTRANCE         ; 13
+	macro_80e67 Data_8251d, TILESET_CLUB_ENTRANCE         ; 14
+	macro_80e67 Data_825e7, TILESET_CLUB_ENTRANCE         ; 15
+	macro_80e67 Data_82704, TILESET_CLUB_ENTRANCE         ; 16
+	macro_80e67 Data_827ce, TILESET_CLUB_ENTRANCE         ; 17
+	macro_80e67 Data_828eb, TILESET_CLUB_ENTRANCE         ; 18
+	macro_80e67 Data_829b5, TILESET_CLUB_ENTRANCE         ; 19
+	macro_80e67 Data_82ad2, TILESET_CLUB_ENTRANCE         ; 20
+	macro_80e67 Data_82b9c, TILESET_CLUB_ENTRANCE         ; 21
+	macro_80e67 Data_82cb9, TILESET_CLUB_ENTRANCE         ; 22
+	macro_80e67 Data_82d83, TILESET_CLUB_ENTRANCE         ; 23
+	macro_80e67 Data_82ea0, TILESET_CLUB_ENTRANCE         ; 24
+	macro_80e67 Data_82f6a, TILESET_CLUB_ENTRANCE         ; 25
+	macro_80e67 Data_83087, TILESET_CLUB_ENTRANCE         ; 26
+	macro_80e67 Data_83151, TILESET_CLUB_ENTRANCE         ; 27
+	macro_80e67 Data_8326e, TILESET_CLUB_ENTRANCE         ; 28
+	macro_80e67 Data_83321, TILESET_CLUB_ENTRANCE         ; 29
+	macro_80e67 Data_83424, TILESET_CLUB_LOBBY            ; 30
+	macro_80e67 Data_83545, TILESET_CLUB_LOBBY            ; 31
+	macro_80e67 Data_836db, TILESET_FIGHTING_CLUB         ; 32
+	macro_80e67 Data_8378c, TILESET_FIGHTING_CLUB         ; 33
+	macro_80e67 Data_8388d, TILESET_ROCK_CLUB             ; 34
+	macro_80e67 Data_839d6, TILESET_ROCK_CLUB             ; 35
+	macro_80e67 Data_84000, TILESET_WATER_CLUB            ; 36
+	macro_80e67 Data_84188, TILESET_WATER_CLUB            ; 37
+	macro_80e67 Data_843bb, TILESET_LIGHTNING_CLUB        ; 38
+	macro_80e67 Data_84533, TILESET_LIGHTNING_CLUB        ; 39
+	macro_80e67 Data_8472e, TILESET_GRASS_CLUB            ; 40
+	macro_80e67 Data_848d8, TILESET_GRASS_CLUB            ; 41
+	macro_80e67 Data_84b73, TILESET_PSYCHIC_CLUB          ; 42
+	macro_80e67 Data_84c6f, TILESET_PSYCHIC_CLUB          ; 43
+	macro_80e67 Data_84dfe, TILESET_SCIENCE_CLUB          ; 44
+	macro_80e67 Data_84f1d, TILESET_SCIENCE_CLUB          ; 45
+	macro_80e67 Data_850b6, TILESET_FIRE_CLUB             ; 46
+	macro_80e67 Data_85191, TILESET_FIRE_CLUB             ; 47
+	macro_80e67 Data_85315, TILESET_CHALLENGE_HALL        ; 48
+	macro_80e67 Data_854b3, TILESET_CHALLENGE_HALL        ; 49
+	macro_80e67 Data_8570a, TILESET_POKEMON_DOME_ENTRANCE ; 50
+	macro_80e67 Data_857ce, TILESET_POKEMON_DOME_ENTRANCE ; 51
+	macro_80e67 Data_83bf1, TILESET_POKEMON_DOME_ENTRANCE ; 52
+	macro_80e67 Data_83c03, TILESET_POKEMON_DOME_ENTRANCE ; 53
+	macro_80e67 Data_858ef, TILESET_POKEMON_DOME          ; 54
+	macro_80e67 Data_85a79, TILESET_POKEMON_DOME          ; 55
+	macro_80e67 Data_83c1a, TILESET_POKEMON_DOME          ; 56
+	macro_80e67 Data_83c26, TILESET_POKEMON_DOME          ; 57
+	macro_80e67 Data_85ce2, TILESET_HALL_OF_HONOR         ; 58
+	macro_80e67 Data_85df4, TILESET_HALL_OF_HONOR         ; 59
+	macro_80e67 Data_85f7c, TILESET_CARD_POP_1            ; 60
+	macro_80e67 Data_8607f, TILESET_CARD_POP_1            ; 61
+	macro_80e67 Data_83c36, TILESET_MEDAL                 ; 62
+	macro_80e67 Data_8617d, TILESET_MEDAL                 ; 63
+	macro_80e67 Data_86193, TILESET_MEDAL                 ; 64
+	macro_80e67 Data_861a9, TILESET_MEDAL                 ; 65
+	macro_80e67 Data_861bf, TILESET_MEDAL                 ; 66
+	macro_80e67 Data_861d5, TILESET_MEDAL                 ; 67
+	macro_80e67 Data_861eb, TILESET_MEDAL                 ; 68
+	macro_80e67 Data_86201, TILESET_MEDAL                 ; 69
+	macro_80e67 Data_86217, TILESET_CARD_POP_2            ; 70
+	macro_80e67 Data_862da, TILESET_CARD_POP_2            ; 71
+	macro_80e67 Data_86364, TILESET_CARD_POP_2            ; 72
+	macro_80e67 Data_86443, TILESET_CARD_POP_2            ; 73
+	macro_80e67 Data_864df, TILESET_CARD_POP_3            ; 74
+	macro_80e67 Data_865b5, TILESET_CARD_POP_3            ; 75
+	macro_80e67 Data_86647, TILESET_COLOSSEUM_1           ; 76
+	macro_80e67 Data_866b8, TILESET_COLOSSEUM_2           ; 77
+	macro_80e67 Data_8673e, TILESET_EVOLUTION_1           ; 78
+	macro_80e67 Data_867af, TILESET_EVOLUTION_2           ; 79
+	macro_80e67 Data_86833, TILESET_MYSTERY_1             ; 80
+	macro_80e67 Data_868a4, TILESET_MYSTERY_2             ; 81
+	macro_80e67 Data_86925, TILESET_LABORATORY_1          ; 82
+	macro_80e67 Data_86996, TILESET_LABORATORY_2          ; 83
+	macro_80e67 Data_86a14, TILESET_CHARIZARD_INTRO_1     ; 84
+	macro_80e67 Data_86a85, TILESET_CHARIZARD_INTRO_2     ; 85
+	macro_80e67 Data_86b28, TILESET_SCYTHER_INTRO_1       ; 86
+	macro_80e67 Data_86b99, TILESET_SCYTHER_INTRO_2       ; 87
+	macro_80e67 Data_86c34, TILESET_AERODACTYL_INTRO_1    ; 88
+	macro_80e67 Data_86ca5, TILESET_AERODACTYL_INTRO_2    ; 89
+	macro_80e67 Data_86d37, TILESET_TITLE_SCREEN_1        ; 90
+	macro_80e67 Data_86dcc, TILESET_TITLE_SCREEN_2        ; 91
+	macro_80e67 Data_86e8a, TILESET_SOLID_TILES_1         ; 92
+	macro_80e67 Data_86f18, TILESET_SOLID_TILES_1         ; 93
+	macro_80e67 Data_86fc0, TILESET_SOLID_TILES_1         ; 94
+	macro_80e67 Data_8704f, TILESET_TITLE_SCREEN_3        ; 95
+	macro_80e67 Data_871a5, TILESET_TITLE_SCREEN_4        ; 96
+	macro_80e67 Data_87397, TILESET_SOLID_TILES_2         ; 97
+	macro_80e67 Data_873b7, TILESET_PLAYER                ; 98
+	macro_80e67 Data_873e5, TILESET_RONALD                ; 99
+	macro_80e67 Data_87413, TILESET_TITLE_SCREEN_5        ; 100
+	macro_80e67 Data_87538, TILESET_TITLE_SCREEN_6        ; 101
+	macro_80e67 Data_8769f, TILESET_COPYRIGHT             ; 102
+	macro_80e67 Data_876f6, TILESET_COPYRIGHT             ; 103
+	macro_80e67 Data_8777c, TILESET_NINTENDO              ; 104
+	macro_80e67 Data_877c4, TILESET_COMPANIES             ; 105
+
+; \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 CardPop1Gfx,                   189 ; TILESET_CARD_POP_1
+	tileset MedalGfx,                       72 ; TILESET_MEDAL
+	tileset CardPop2Gfx,                   109 ; TILESET_CARD_POP_2
+	tileset CardPop3Gfx,                    93 ; TILESET_CARD_POP_3
+	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 Titlescreen1Gfx,                97 ; TILESET_TITLE_SCREEN_1
+	tileset Titlescreen2Gfx,                97 ; TILESET_TITLE_SCREEN_2
+	tileset SolidTiles1,                     4 ; TILESET_SOLID_TILES_1
+	tileset Titlescreen3Gfx,               244 ; TILESET_TITLE_SCREEN_3
+	tileset Titlescreen4Gfx,                59 ; TILESET_TITLE_SCREEN_4
+	tileset SolidTiles2,                     4 ; TILESET_SOLID_TILES_2
+	tileset PlayerGfx,                      36 ; TILESET_PLAYER
+	tileset RonaldGfx,                      36 ; TILESET_RONALD
+	tileset Titlescreen5Gfx,               220 ; TILESET_TITLE_SCREEN_5
+	tileset Titlescreen6Gfx,               212 ; TILESET_TITLE_SCREEN_6
+	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
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 47e48ff..326e327 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -11300,7 +11300,8 @@ FillMemoryWithDE: ; 3c1f (0:3c1f)
 	pop hl
 	ret
 
-Func_3c2d: ; 3c2d (0:3c2d)
+; gets far byte a:hl, outputs value in a
+GetFarByte: ; 3c2d (0:3c2d)
 	push hl
 	push af
 	ldh a, [hBankROM]
diff --git a/src/gfx.asm b/src/gfx.asm
index 9774877..c2db3e9 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -568,20 +568,20 @@ Data_877c4:: ; 877c4 (21:77c4)
 	INCBIN "data/maps/map105.bin"
 
 
-IshiharaTilesetGfx: ; 87828 (21:7828)
-	dw $4d
+IshiharaTilesetGfx:: ; 87828 (21:7828)
+	dw 77
 	INCBIN "gfx/tilesets/ishihara.2bpp"
 
-SolidTiles1: ; 87cfa (21:7cfa)
-	dw $4
+SolidTiles1:: ; 87cfa (21:7cfa)
+	dw 4
 	INCBIN "gfx/solid_tiles.2bpp"
 
-SolidTiles2: ; 87d3c (21:7d3c)
-	dw $4
+SolidTiles2:: ; 87d3c (21:7d3c)
+	dw 4
 	INCBIN "gfx/solid_tiles.2bpp"
 
-PlayerGfx: ; 87d7e (21:7d7e)
-	dw $24
+PlayerGfx:: ; 87d7e (21:7d7e)
+	dw 36
 	INCBIN "gfx/duelists/player.2bpp"
 
 Duel55Gfx:: ; 87fc0 (21:7fc0)
@@ -601,36 +601,36 @@ AnimData12:: ; 87ff4 (21:7ff4)
 
 SECTION "Gfx 4", ROMX
 
-OverworldMapTiles: ; 88000 (22:4000)
-	dw $c1
+OverworldMapTiles:: ; 88000 (22:4000)
+	dw 193
 	INCBIN "gfx/overworld_map.2bpp"
 
-MasonLaboratoryTilesetGfx: ; 88c12 (22:4c12)
-	dw $97
+MasonLaboratoryTilesetGfx:: ; 88c12 (22:4c12)
+	dw 151
 	INCBIN "gfx/tilesets/masonlaboratory.2bpp"
 
-ClubEntranceTilesetGfx: ; 89584 (22:5584)
-	dw $81
+ClubEntranceTilesetGfx:: ; 89584 (22:5584)
+	dw 129
 	INCBIN "gfx/tilesets/clubentrance.2bpp"
 
-ClubLobbyTilesetGfx: ; 89d96 (22:5d96)
-	dw $78
+ClubLobbyTilesetGfx:: ; 89d96 (22:5d96)
+	dw 120
 	INCBIN "gfx/tilesets/clublobby.2bpp"
 
-FightingClubTilesetGfx: ; 8a518 (22:6518)
-	dw $63
+FightingClubTilesetGfx:: ; 8a518 (22:6518)
+	dw 99
 	INCBIN "gfx/tilesets/fightingclub.2bpp"
 
-RockClubTilesetGfx: ; 8ab4a (22:6b4a)
-	dw $3c
+RockClubTilesetGfx:: ; 8ab4a (22:6b4a)
+	dw 60
 	INCBIN "gfx/tilesets/rockclub.2bpp"
 
-WaterClubTilesetGfx: ; 8af0c (22:6f0c)
-	dw $a1
+WaterClubTilesetGfx:: ; 8af0c (22:6f0c)
+	dw 161
 	INCBIN "gfx/tilesets/waterclub.2bpp"
 
-GrassClubTilesetGfx: ; 8b91e (22:791e)
-	dw $57
+GrassClubTilesetGfx:: ; 8b91e (22:791e)
+	dw 87
 	INCBIN "gfx/tilesets/grassclub.2bpp"
 
 OWPlayerGfx:: ; 8be90 (22:7e90)
@@ -659,40 +659,40 @@ endr
 
 SECTION "Gfx 5", ROMX
 
-LightningClubTilesetGfx: ; 8c000 (23:4000)
-	dw $83
+LightningClubTilesetGfx:: ; 8c000 (23:4000)
+	dw 131
 	INCBIN "gfx/tilesets/lightningclub.2bpp"
 
-PsychicClubTilesetGfx: ; 8c832 (23:4832)
-	dw $3a
+PsychicClubTilesetGfx:: ; 8c832 (23:4832)
+	dw 58
 	INCBIN "gfx/tilesets/psychicclub.2bpp"
 
-ScienceClubTilesetGfx: ; 8cbd4 (23:4bd4)
-	dw $52
+ScienceClubTilesetGfx:: ; 8cbd4 (23:4bd4)
+	dw 82
 	INCBIN "gfx/tilesets/scienceclub.2bpp"
 
-FireClubTilesetGfx: ; 8d0f6 (23:50f6)
-	dw $57
+FireClubTilesetGfx:: ; 8d0f6 (23:50f6)
+	dw 87
 	INCBIN "gfx/tilesets/fireclub.2bpp"
 
-ChallengeHallTilesetGfx: ; 8d668 (23:5668)
-	dw $9d
+ChallengeHallTilesetGfx:: ; 8d668 (23:5668)
+	dw 157
 	INCBIN "gfx/tilesets/challengehall.2bpp"
 
-PokemonDomeEntranceTilesetGfx: ; 8e03a (23:603a)
-	dw $4e
+PokemonDomeEntranceTilesetGfx:: ; 8e03a (23:603a)
+	dw 78
 	INCBIN "gfx/tilesets/pokemondomeentrance.2bpp"
 
-PokemonDomeTilesetGfx: ; 8e51c (23:651c)
-	dw $cf
+PokemonDomeTilesetGfx:: ; 8e51c (23:651c)
+	dw 207
 	INCBIN "gfx/tilesets/pokemondome.2bpp"
 
-HallOfHonorTilesetGfx: ; 8f20e (23:720e)
-	dw $79
+HallOfHonorTilesetGfx:: ; 8f20e (23:720e)
+	dw 121
 	INCBIN "gfx/tilesets/hallofhonor.2bpp"
 
-MedalGfx: ; 8f9a0 (23:79a0)
-	dw $48
+MedalGfx:: ; 8f9a0 (23:79a0)
+	dw 72
 	INCBIN "gfx/medals.2bpp", $0, $c0
 	INCBIN "gfx/medals.2bpp", $240, $30
 	INCBIN "gfx/medals.2bpp", $340, $10
@@ -712,8 +712,8 @@ MedalGfx: ; 8f9a0 (23:79a0)
 	INCBIN "gfx/medals.2bpp", $420, $30
 	INCBIN "gfx/medals.2bpp", $3f0, $20
 
-NintendoGfx: ; 8fe22 (23:7e22)
-	dw $18
+NintendoGfx:: ; 8fe22 (23:7e22)
+	dw 24
 	INCBIN "gfx/nintendo.2bpp"
 
 Duel58Gfx:: ; 8ffa4 (23:7fa4)
@@ -733,48 +733,48 @@ AnimData11:: ; 8fff5 (23:7ff5)
 
 SECTION "Gfx 6", ROMX
 
-CardPop1Gfx: ; 90000 (24:4000)
-	dw $bd
+CardPop1Gfx:: ; 90000 (24:4000)
+	dw 189
 	INCBIN "gfx/cardpop/cardpop1.2bpp"
 
-CardPop2Gfx: ; 90bd2 (24:4bd2)
-	dw $6d
+CardPop2Gfx:: ; 90bd2 (24:4bd2)
+	dw 109
 	INCBIN "gfx/cardpop/cardpop2.2bpp"
 
-CardPop3Gfx: ; 912a4 (24:52a4)
-	dw $5d
+CardPop3Gfx:: ; 912a4 (24:52a4)
+	dw 93
 	INCBIN "gfx/cardpop/cardpop3.2bpp"
 
-Colosseum1Gfx: ; 91876 (24:5876)
-	dw $60
+Colosseum1Gfx:: ; 91876 (24:5876)
+	dw 96
 	INCBIN "gfx/booster_packs/colosseum1.2bpp"
 
-Colosseum2Gfx: ; 91e78 (24:5e78)
-	dw $56
+Colosseum2Gfx:: ; 91e78 (24:5e78)
+	dw 86
 	INCBIN "gfx/booster_packs/colosseum2.2bpp"
 
-Evolution1Gfx: ; 923da (24:63da)
-	dw $60
+Evolution1Gfx:: ; 923da (24:63da)
+	dw 96
 	INCBIN "gfx/booster_packs/evolution1.2bpp"
 
-Evolution2Gfx: ; 929dc (24:69dc)
-	dw $56
+Evolution2Gfx:: ; 929dc (24:69dc)
+	dw 86
 	INCBIN "gfx/booster_packs/evolution2.2bpp"
 
-Mystery1Gfx: ; 92f3e (24:6f3e)
-	dw $60
+Mystery1Gfx:: ; 92f3e (24:6f3e)
+	dw 96
 	INCBIN "gfx/booster_packs/mystery1.2bpp"
 
-Mystery2Gfx: ; 93540 (24:7540)
-	dw $56
+Mystery2Gfx:: ; 93540 (24:7540)
+	dw 86
 	INCBIN "gfx/booster_packs/mystery2.2bpp"
 
-RonaldGfx: ; 93aa2 (24:7aa2)
-	dw $24
+RonaldGfx:: ; 93aa2 (24:7aa2)
+	dw 36
 	INCBIN "gfx/duelists/ronald.2bpp"
 
-CopyrightGfx: ; 93ce4 (24:7ce4)
-	dw $24
+CopyrightGfx:: ; 93ce4 (24:7ce4)
+	dw 36
 	INCBIN "gfx/copyright.2bpp"
 
 OWClerkGfx:: ; 93f26 (24:7f26)
@@ -795,48 +795,48 @@ endr
 
 SECTION "Gfx 7", ROMX
 
-Laboratory1Gfx: ; 94000 (25:4000)
-	dw $60
+Laboratory1Gfx:: ; 94000 (25:4000)
+	dw 96
 	INCBIN "gfx/booster_packs/laboratory1.2bpp"
 
-Laboratory2Gfx: ; 94602 (25:4602)
-	dw $56
+Laboratory2Gfx:: ; 94602 (25:4602)
+	dw 86
 	INCBIN "gfx/booster_packs/laboratory2.2bpp"
 
-CharizardIntro1Gfx: ; 94b64 (25:4b64)
-	dw $60
+CharizardIntro1Gfx:: ; 94b64 (25:4b64)
+	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/charizardintro1.2bpp"
 
-CharizardIntro2Gfx: ; 95166 (25:5166)
-	dw $60
+CharizardIntro2Gfx:: ; 95166 (25:5166)
+	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/charizardintro2.2bpp"
 
-ScytherIntro1Gfx: ; 95768 (25:5768)
-	dw $60
+ScytherIntro1Gfx:: ; 95768 (25:5768)
+	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/scytherintro1.2bpp"
 
-ScytherIntro2Gfx: ; 95d6a (25:5d6a)
-	dw $60
+ScytherIntro2Gfx:: ; 95d6a (25:5d6a)
+	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/scytherintro2.2bpp"
 
-AerodactylIntro1Gfx: ; 9636c (25:636c)
-	dw $60
+AerodactylIntro1Gfx:: ; 9636c (25:636c)
+	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/aerodactylintro1.2bpp"
 
-AerodactylIntro2Gfx: ; 9696e (25:696e)
-	dw $60
+AerodactylIntro2Gfx:: ; 9696e (25:696e)
+	dw 96
 	INCBIN "gfx/titlescreen/booster_packs/aerodactylintro2.2bpp"
 
-Titlescreen1Gfx: ; 96f70 (25:6f70)
-	dw $61
+Titlescreen1Gfx:: ; 96f70 (25:6f70)
+	dw 97
 	INCBIN "gfx/titlescreen/titlescreen1.2bpp"
 
-Titlescreen2Gfx: ; 97582 (25:7582)
-	dw $61
+Titlescreen2Gfx:: ; 97582 (25:7582)
+	dw 97
 	INCBIN "gfx/titlescreen/titlescreen2.2bpp"
 
-CompaniesGfx: ; 97b94 (25:7b94)
-	dw $31
+CompaniesGfx:: ; 97b94 (25:7b94)
+	dw 49
 	INCBIN "gfx/companies.2bpp"
 
 OWRonaldGfx:: ; 97ea6 (25:7ea6)
@@ -855,20 +855,20 @@ endr
 
 SECTION "Gfx 8", ROMX
 
-Titlescreen3Gfx: ; 98000 (26:4000)
-	dw $f4
+Titlescreen3Gfx:: ; 98000 (26:4000)
+	dw 244
 	INCBIN "gfx/titlescreen/titlescreen3.2bpp"
 
-Titlescreen4Gfx: ; 98f42 (26:4f42)
-	dw $13b
+Titlescreen4Gfx:: ; 98f42 (26:4f42)
+	dw 315
 	INCBIN "gfx/titlescreen/titlescreen4.2bpp"
 
-Titlescreen5Gfx: ; 9a2f4 (26:62f4)
-	dw $dc
+Titlescreen5Gfx:: ; 9a2f4 (26:62f4)
+	dw 220
 	INCBIN "gfx/titlescreen/titlescreen5.2bpp"
 
-Titlescreen6Gfx: ; 9b0b6 (26:70b6)
-	dw $d4
+Titlescreen6Gfx:: ; 9b0b6 (26:70b6)
+	dw 212
 	INCBIN "gfx/titlescreen/titlescreen6.2bpp"
 
 OWDrMasonGfx:: ; 9bdf8 (26:7df8)
@@ -889,116 +889,116 @@ Duel62Gfx:: ; 9bfee (26:7fee)
 
 SECTION "Gfx 9", ROMX
 
-SamGfx: ; 9c000 (27:4000)
-	dw $24
+SamGfx:: ; 9c000 (27:4000)
+	dw 36
 	INCBIN "gfx/duelists/sam.2bpp"
 
-ImakuniGfx: ; 9c242 (27:4242)
-	dw $24
+ImakuniGfx:: ; 9c242 (27:4242)
+	dw 36
 	INCBIN "gfx/duelists/imakuni.2bpp"
 
-NikkiGfx: ; 9c484 (27:4484)
-	dw $24
+NikkiGfx:: ; 9c484 (27:4484)
+	dw 36
 	INCBIN "gfx/duelists/nikki.2bpp"
 
-RickGfx: ; 9c6c6 (27:46c6)
-	dw $24
+RickGfx:: ; 9c6c6 (27:46c6)
+	dw 36
 	INCBIN "gfx/duelists/rick.2bpp"
 
-KenGfx: ; 9c908 (27:4908)
-	dw $24
+KenGfx:: ; 9c908 (27:4908)
+	dw 36
 	INCBIN "gfx/duelists/ken.2bpp"
 
-AmyGfx: ; 9cb4a (27:4b4a)
-	dw $24
+AmyGfx:: ; 9cb4a (27:4b4a)
+	dw 36
 	INCBIN "gfx/duelists/amy.2bpp"
 
-IsaacGfx: ; 9cd8c (27:4d8c)
-	dw $24
+IsaacGfx:: ; 9cd8c (27:4d8c)
+	dw 36
 	INCBIN "gfx/duelists/isaac.2bpp"
 
-MitchGfx: ; 9cfce (27:4fce)
-	dw $24
+MitchGfx:: ; 9cfce (27:4fce)
+	dw 36
 	INCBIN "gfx/duelists/mitch.2bpp"
 
-GeneGfx: ; 9d210 (27:5210)
-	dw $24
+GeneGfx:: ; 9d210 (27:5210)
+	dw 36
 	INCBIN "gfx/duelists/gene.2bpp"
 
-MurrayGfx: ; 9d452 (27:5452)
-	dw $24
+MurrayGfx:: ; 9d452 (27:5452)
+	dw 36
 	INCBIN "gfx/duelists/murray.2bpp"
 
-CourtneyGfx: ; 9d694 (27:5694)
-	dw $24
+CourtneyGfx:: ; 9d694 (27:5694)
+	dw 36
 	INCBIN "gfx/duelists/courtney.2bpp"
 
-SteveGfx: ; 9d8d6 (27:58d6)
-	dw $24
+SteveGfx:: ; 9d8d6 (27:58d6)
+	dw 36
 	INCBIN "gfx/duelists/steve.2bpp"
 
-JackGfx: ; 9db18 (27:5b18)
-	dw $24
+JackGfx:: ; 9db18 (27:5b18)
+	dw 36
 	INCBIN "gfx/duelists/jack.2bpp"
 
-RodGfx: ; 9dd5a (27:5d5a)
-	dw $24
+RodGfx:: ; 9dd5a (27:5d5a)
+	dw 36
 	INCBIN "gfx/duelists/rod.2bpp"
 
-JosephGfx: ; 9df9c (27:5f9c)
-	dw $24
+JosephGfx:: ; 9df9c (27:5f9c)
+	dw 36
 	INCBIN "gfx/duelists/joseph.2bpp"
 
-DavidGfx: ; 9e1de (27:61de)
-	dw $24
+DavidGfx:: ; 9e1de (27:61de)
+	dw 36
 	INCBIN "gfx/duelists/david.2bpp"
 
-ErikGfx: ; 9e420 (27:6420)
-	dw $24
+ErikGfx:: ; 9e420 (27:6420)
+	dw 36
 	INCBIN "gfx/duelists/erik.2bpp"
 
-JohnGfx: ; 9e662 (27:6662)
-	dw $24
+JohnGfx:: ; 9e662 (27:6662)
+	dw 36
 	INCBIN "gfx/duelists/john.2bpp"
 
-AdamGfx: ; 9e8a4 (27:68a4)
-	dw $24
+AdamGfx:: ; 9e8a4 (27:68a4)
+	dw 36
 	INCBIN "gfx/duelists/adam.2bpp"
 
-JonathanGfx: ; 9eae6 (27:6ae6)
-	dw $24
+JonathanGfx:: ; 9eae6 (27:6ae6)
+	dw 36
 	INCBIN "gfx/duelists/jonathan.2bpp"
 
-JoshuaGfx: ; 9ed28 (27:6d28)
-	dw $24
+JoshuaGfx:: ; 9ed28 (27:6d28)
+	dw 36
 	INCBIN "gfx/duelists/joshua.2bpp"
 
-NicholasGfx: ; 9ef6a (27:6f6a)
-	dw $24
+NicholasGfx:: ; 9ef6a (27:6f6a)
+	dw 36
 	INCBIN "gfx/duelists/nicholas.2bpp"
 
-BrandonGfx: ; 9f1ac (27:71ac)
-	dw $24
+BrandonGfx:: ; 9f1ac (27:71ac)
+	dw 36
 	INCBIN "gfx/duelists/brandon.2bpp"
 
-MatthewGfx: ; 9f3ee (27:73ee)
-	dw $24
+MatthewGfx:: ; 9f3ee (27:73ee)
+	dw 36
 	INCBIN "gfx/duelists/matthew.2bpp"
 
-RyanGfx: ; 9f630 (27:7630)
-	dw $24
+RyanGfx:: ; 9f630 (27:7630)
+	dw 36
 	INCBIN "gfx/duelists/ryan.2bpp"
 
-AndrewGfx: ; 9f872 (27:7872)
-	dw $24
+AndrewGfx:: ; 9f872 (27:7872)
+	dw 36
 	INCBIN "gfx/duelists/andrew.2bpp"
 
-ChrisGfx: ; 9fab4 (27:7ab4)
-	dw $24
+ChrisGfx:: ; 9fab4 (27:7ab4)
+	dw 36
 	INCBIN "gfx/duelists/chris.2bpp"
 
-MichaelGfx: ; 9fcf6 (27:7cf6)
-	dw $24
+MichaelGfx:: ; 9fcf6 (27:7cf6)
+	dw 36
 	INCBIN "gfx/duelists/michael.2bpp"
 
 Duel63Gfx:: ; 9ff38 (27:7f38)
@@ -1015,48 +1015,48 @@ endr
 
 SECTION "Gfx 10", ROMX
 
-DanielGfx: ; a0000 (28:4000)
-	dw $24
+DanielGfx:: ; a0000 (28:4000)
+	dw 36
 	INCBIN "gfx/duelists/daniel.2bpp"
 
-RobertGfx: ; a0242 (28:4242)
-	dw $24
+RobertGfx:: ; a0242 (28:4242)
+	dw 36
 	INCBIN "gfx/duelists/robert.2bpp"
 
-BrittanyGfx: ; a0484 (28:4484)
-	dw $24
+BrittanyGfx:: ; a0484 (28:4484)
+	dw 36
 	INCBIN "gfx/duelists/brittany.2bpp"
 
-KristinGfx: ; a06c6 (28:46c6)
-	dw $24
+KristinGfx:: ; a06c6 (28:46c6)
+	dw 36
 	INCBIN "gfx/duelists/kristin.2bpp"
 
-HeatherGfx: ; a0908 (28:4908)
-	dw $24
+HeatherGfx:: ; a0908 (28:4908)
+	dw 36
 	INCBIN "gfx/duelists/heather.2bpp"
 
-SaraGfx: ; a0b4a (28:4b4a)
-	dw $24
+SaraGfx:: ; a0b4a (28:4b4a)
+	dw 36
 	INCBIN "gfx/duelists/sara.2bpp"
 
-AmandaGfx: ; a0d8c (28:4d8c)
-	dw $24
+AmandaGfx:: ; a0d8c (28:4d8c)
+	dw 36
 	INCBIN "gfx/duelists/amanda.2bpp"
 
-JenniferGfx: ; a0fce (28:4fce)
-	dw $24
+JenniferGfx:: ; a0fce (28:4fce)
+	dw 36
 	INCBIN "gfx/duelists/jennifer.2bpp"
 
-JessicaGfx: ; a1210 (28:5210)
-	dw $24
+JessicaGfx:: ; a1210 (28:5210)
+	dw 36
 	INCBIN "gfx/duelists/jessica.2bpp"
 
-StephanieGfx: ; a1452 (28:5452)
-	dw $24
+StephanieGfx:: ; a1452 (28:5452)
+	dw 36
 	INCBIN "gfx/duelists/stephanie.2bpp"
 
-AaronGfx: ; a1694 (28:5694)
-	dw $24
+AaronGfx:: ; a1694 (28:5694)
+	dw 36
 	INCBIN "gfx/duelists/aaron.2bpp"
 
 OWIshiharaGfx:: ; a18d6 (28:58d6)
diff --git a/src/wram.asm b/src/wram.asm
index 849b45c..4b18de1 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -2123,7 +2123,9 @@ wd237:: ; d237
 wd238:: ; d238
 	ds $1
 
-wd239:: ; d239
+; current tileset to load to VRAM
+; TILESET_* constant
+wCurTileset:: ; d239
 	ds $1
 
 wd23a:: ; d23a
@@ -2489,11 +2491,9 @@ wTempPointerBank:: ; d4c6
 wCurSpriteTileSize:: ; d4c7
 	ds $1
 
-; stores number of tiles that current sprite has
-wCurSpriteNumTiles:: ; d4c8
-	ds $1
-
-	ds $1
+; stores number of tiles that current sprite/tileset has
+wTotalNumTiles:: ; d4c8
+	ds $2
 
 ; stores tile offset in VRAM
 wVRAMTileOffset:: ; d4ca
@@ -2501,6 +2501,8 @@ wVRAMTileOffset:: ; d4ca
 wd4ca:: ; d4ca
 	ds $1
 
+; bottom bit stores which VRAM bank to draw certain gfx
+; $0 = VRAM0, $1 = VRAM1
 wd4cb:: ; d4cb
 	ds $1
 
-- 
cgit v1.2.3


From 97cca18ce248efa16c741345a78e83e902d88254 Mon Sep 17 00:00:00 2001
From: ElectroDeoxys <ElectroDeoxys@gmail.com>
Date: Sat, 13 Feb 2021 09:04:22 +0000
Subject: Label Tilemap data

---
 src/constants.asm                   |   1 +
 src/constants/tilemap_constants.asm | 124 ++++++++++++++
 src/data/map_headers.asm            |  68 ++++----
 src/engine/bank07.asm               |  15 +-
 src/engine/bank20.asm               | 312 ++++++++++++++++++------------------
 src/engine/home.asm                 |   2 +-
 src/gfx.asm                         | 130 +++++++--------
 src/wram.asm                        |   4 +-
 8 files changed, 393 insertions(+), 263 deletions(-)
 create mode 100644 src/constants/tilemap_constants.asm

diff --git a/src/constants.asm b/src/constants.asm
index efa44fb..733dd8c 100644
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -18,6 +18,7 @@ INCLUDE "constants/sgb_constants.asm"
 INCLUDE "constants/sfx_constants.asm"
 INCLUDE "constants/sprite_constants.asm"
 INCLUDE "constants/text_constants.asm"
+INCLUDE "constants/tilemap_constants.asm"
 INCLUDE "constants/tileset_constants.asm"
 INCLUDE "constants/animation_constants.asm"
 INCLUDE "constants/attack_animation_constants.asm"
diff --git a/src/constants/tilemap_constants.asm b/src/constants/tilemap_constants.asm
new file mode 100644
index 0000000..9228573
--- /dev/null
+++ b/src/constants/tilemap_constants.asm
@@ -0,0 +1,124 @@
+	const_def
+	const TILEMAP_OVERWORLD_MAP               ; $00
+	const TILEMAP_OVERWORLD_MAP_CGB           ; $01
+	const TILEMAP_MASON_LABORATORY            ; $02
+	const TILEMAP_MASON_LABORATORY_CGB        ; $03
+	const TILEMAP_UNUSED_1                    ; $04
+	const TILEMAP_UNUSED_2                    ; $05
+	const TILEMAP_DECK_MACHINE_ROOM           ; $06
+	const TILEMAP_DECK_MACHINE_ROOM_CGB       ; $07
+	const TILEMAP_UNUSED_3                    ; $08
+	const TILEMAP_UNUSED_4                    ; $09
+	const TILEMAP_ISHIHARA                    ; $0a
+	const TILEMAP_ISHIHARA_CGB                ; $0b
+	const TILEMAP_FIGHTING_CLUB_ENTRANCE      ; $0c
+	const TILEMAP_FIGHTING_CLUB_ENTRANCE_CGB  ; $0d
+	const TILEMAP_ROCK_CLUB_ENTRANCE          ; $0e
+	const TILEMAP_ROCK_CLUB_ENTRANCE_CGB      ; $0f
+	const TILEMAP_WATER_CLUB_ENTRANCE         ; $10
+	const TILEMAP_WATER_CLUB_ENTRANCE_CGB     ; $11
+	const TILEMAP_LIGHTNING_CLUB_ENTRANCE     ; $12
+	const TILEMAP_LIGHTNING_CLUB_ENTRANCE_CGB ; $13
+	const TILEMAP_GRASS_CLUB_ENTRANCE         ; $14
+	const TILEMAP_GRASS_CLUB_ENTRANCE_CGB     ; $15
+	const TILEMAP_PSYCHIC_CLUB_ENTRANCE       ; $16
+	const TILEMAP_PSYCHIC_CLUB_ENTRANCE_CGB   ; $17
+	const TILEMAP_SCIENCE_CLUB_ENTRANCE       ; $18
+	const TILEMAP_SCIENCE_CLUB_ENTRANCE_CGB   ; $19
+	const TILEMAP_FIRE_CLUB_ENTRANCE          ; $1a
+	const TILEMAP_FIRE_CLUB_ENTRANCE_CGB      ; $1b
+	const TILEMAP_CHALLENGE_HALL_ENTRANCE     ; $1c
+	const TILEMAP_CHALLENGE_HALL_ENTRANCE_CGB ; $1d
+	const TILEMAP_CLUB_LOBBY                  ; $1e
+	const TILEMAP_CLUB_LOBBY_CGB              ; $1f
+	const TILEMAP_FIGHTING_CLUB               ; $20
+	const TILEMAP_FIGHTING_CLUB_CGB           ; $21
+	const TILEMAP_ROCK_CLUB                   ; $22
+	const TILEMAP_ROCK_CLUB_CGB               ; $23
+	const TILEMAP_WATER_CLUB                  ; $24
+	const TILEMAP_WATER_CLUB_CGB              ; $25
+	const TILEMAP_LIGHTNING_CLUB              ; $26
+	const TILEMAP_LIGHTNING_CLUB_CGB          ; $27
+	const TILEMAP_GRASS_CLUB                  ; $28
+	const TILEMAP_GRASS_CLUB_CGB              ; $29
+	const TILEMAP_PSYCHIC_CLUB                ; $2a
+	const TILEMAP_PSYCHIC_CLUB_CGB            ; $2b
+	const TILEMAP_SCIENCE_CLUB                ; $2c
+	const TILEMAP_SCIENCE_CLUB_CGB            ; $2d
+	const TILEMAP_FIRE_CLUB                   ; $2e
+	const TILEMAP_FIRE_CLUB_CGB               ; $2f
+	const TILEMAP_CHALLENGE_HALL              ; $30
+	const TILEMAP_CHALLENGE_HALL_CGB          ; $31
+	const TILEMAP_POKEMON_DOME_ENTRANCE       ; $32
+	const TILEMAP_POKEMON_DOME_ENTRANCE_CGB   ; $33
+	const TILEMAP_UNUSED_5                    ; $34
+	const TILEMAP_UNUSED_6                    ; $35
+	const TILEMAP_POKEMON_DOME                ; $36
+	const TILEMAP_POKEMON_DOME_CGB            ; $37
+	const TILEMAP_UNUSED_7                    ; $38
+	const TILEMAP_UNUSED_8                    ; $39
+	const TILEMAP_HALL_OF_HONOR               ; $3a
+	const TILEMAP_HALL_OF_HONOR_CGB           ; $3b
+	const TILEMAP_CARD_POP_1                  ; $3c
+	const TILEMAP_CARD_POP_1_CGB              ; $3d
+	const TILEMAP_GRASS_MEDAL                 ; $3e
+	const TILEMAP_SCIENCE_MEDAL               ; $3f
+	const TILEMAP_FIRE_MEDAL                  ; $40
+	const TILEMAP_WATER_MEDAL                 ; $41
+	const TILEMAP_LIGHTNING_MEDAL             ; $42
+	const TILEMAP_FIGHTING_MEDAL              ; $43
+	const TILEMAP_ROCK_MEDAL                  ; $44
+	const TILEMAP_PSYCHIC_MEDAL               ; $45
+	const TILEMAP_CARD_POP_2                  ; $46
+	const TILEMAP_CARD_POP_2_CGB              ; $47
+	const TILEMAP_CARD_POP_2_UNKNOWN_1        ; $48
+	const TILEMAP_CARD_POP_2_UNKNOWN_2        ; $49
+	const TILEMAP_CARD_POP_3                  ; $4a
+	const TILEMAP_CARD_POP_3_CGB              ; $4b
+	const TILEMAP_COLOSSEUM                   ; $4c
+	const TILEMAP_COLOSSEUM_CGB               ; $4d
+	const TILEMAP_EVOLUTION                   ; $4e
+	const TILEMAP_EVOLUTION_CGB               ; $4f
+	const TILEMAP_MYSTERY                     ; $50
+	const TILEMAP_MYSTERY_CGB                 ; $51
+	const TILEMAP_LABORATORY                  ; $52
+	const TILEMAP_LABORATORY_CGB              ; $53
+	const TILEMAP_CHARIZARD_INTRO             ; $54
+	const TILEMAP_CHARIZARD_INTRO_CGB         ; $55
+	const TILEMAP_SCYTHER_INTRO               ; $56
+	const TILEMAP_SCYTHER_INTRO_CGB           ; $57
+	const TILEMAP_AERODACTYL_INTRO            ; $58
+	const TILEMAP_AERODACTYL_INTRO_CGB        ; $59
+	const TILEMAP_TITLE_SCREEN_1              ; $5a
+	const TILEMAP_TITLE_SCREEN_2              ; $5b
+	const TILEMAP_SOLID_TILES_1               ; $5c
+	const TILEMAP_SOLID_TILES_2               ; $5d
+	const TILEMAP_SOLID_TILES_3               ; $5e
+	const TILEMAP_TITLE_SCREEN_3              ; $5f
+	const TILEMAP_TITLE_SCREEN_4              ; $60
+	const TILEMAP_SOLID_TILES_4               ; $61
+	const TILEMAP_PLAYER                      ; $62
+	const TILEMAP_OPPONENT                    ; $63
+	const TILEMAP_TITLE_SCREEN_5              ; $64
+	const TILEMAP_TITLE_SCREEN_6              ; $65
+	const TILEMAP_COPYRIGHT                   ; $66
+	const TILEMAP_COPYRIGHT_CGB               ; $67
+	const TILEMAP_NINTENDO                    ; $68
+	const TILEMAP_COMPANIES                   ; $69
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/data/map_headers.asm b/src/data/map_headers.asm
index 06a2e20..3204bbf 100644
--- a/src/data/map_headers.asm
+++ b/src/data/map_headers.asm
@@ -1,37 +1,37 @@
 ; TODO: figure out the rest of the data for each map
 ; related to the table at 20:4e5d
 MapHeaders: ; 1c374 (7:4374)
-	db $00,$01,$00,$01,$01,MUSIC_OVERWORLD     ; OVERWORLD_MAP
-	db $02,$03,$00,$02,$02,MUSIC_OVERWORLD     ; MASON_LABORATORY
-	db $06,$07,$00,$02,$02,MUSIC_OVERWORLD     ; DECK_MACHINE_ROOM
-	db $0A,$0B,$00,$03,$03,MUSIC_OVERWORLD     ; ISHIHARAS_HOUSE
-	db $0C,$0D,$00,$03,$04,MUSIC_OVERWORLD     ; FIGHTING_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; FIGHTING_CLUB_LOBBY
-	db $20,$21,$00,$04,$0D,MUSIC_CLUB_3        ; FIGHTING_CLUB
-	db $0E,$0F,$00,$03,$05,MUSIC_OVERWORLD     ; ROCK_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; ROCK_CLUB_LOBBY
-	db $22,$23,$00,$04,$0E,MUSIC_CLUB_2        ; ROCK_CLUB
-	db $10,$11,$00,$03,$06,MUSIC_OVERWORLD     ; WATER_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; WATER_CLUB_LOBBY
-	db $24,$25,$00,$02,$0F,MUSIC_CLUB_2        ; WATER_CLUB
-	db $12,$13,$00,$03,$07,MUSIC_OVERWORLD     ; LIGHTNING_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; LIGHTNING_CLUB_LOBBY
-	db $26,$27,$00,$05,$10,MUSIC_CLUB_1        ; LIGHTNING_CLUB
-	db $14,$15,$00,$03,$08,MUSIC_OVERWORLD     ; GRASS_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; GRASS_CLUB_LOBBY
-	db $28,$29,$00,$06,$11,MUSIC_CLUB_1        ; GRASS_CLUB
-	db $16,$17,$00,$03,$09,MUSIC_OVERWORLD     ; PSYCHIC_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; PSYCHIC_CLUB_LOBBY
-	db $2A,$2B,$00,$07,$12,MUSIC_CLUB_2        ; PSYCHIC_CLUB
-	db $18,$19,$00,$03,$0A,MUSIC_OVERWORLD     ; SCIENCE_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; SCIENCE_CLUB_LOBBY
-	db $2C,$2D,$00,$06,$13,MUSIC_CLUB_3        ; SCIENCE_CLUB
-	db $1A,$1B,$00,$03,$0B,MUSIC_OVERWORLD     ; FIRE_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; FIRE_CLUB_LOBBY
-	db $2E,$2F,$00,$08,$14,MUSIC_CLUB_3        ; FIRE_CLUB
-	db $1C,$1D,$00,$03,$04,MUSIC_OVERWORLD     ; CHALLENGE_HALL_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; CHALLENGE_HALL_LOBBY
-	db $30,$31,$00,$09,$15,MUSIC_OVERWORLD     ; CHALLENGE_HALL
-	db $32,$33,$00,$0A,$16,MUSIC_OVERWORLD     ; POKEMON_DOME_ENTRANCE
-	db $36,$37,$00,$0A,$17,MUSIC_POKEMON_DOME  ; POKEMON_DOME
-	db $3A,$3B,$00,$0A,$18,MUSIC_HALL_OF_HONOR ; HALL_OF_HONOR
+	db TILEMAP_OVERWORLD_MAP,           TILEMAP_OVERWORLD_MAP_CGB,           $00, $01, $01, MUSIC_OVERWORLD     ; OVERWORLD_MAP
+	db TILEMAP_MASON_LABORATORY,        TILEMAP_MASON_LABORATORY_CGB,        $00, $02, $02, MUSIC_OVERWORLD     ; MASON_LABORATORY
+	db TILEMAP_DECK_MACHINE_ROOM,       TILEMAP_DECK_MACHINE_ROOM_CGB,       $00, $02, $02, MUSIC_OVERWORLD     ; DECK_MACHINE_ROOM
+	db TILEMAP_ISHIHARA,                TILEMAP_ISHIHARA_CGB,                $00, $03, $03, MUSIC_OVERWORLD     ; ISHIHARAS_HOUSE
+	db TILEMAP_FIGHTING_CLUB_ENTRANCE,  TILEMAP_FIGHTING_CLUB_ENTRANCE_CGB,  $00, $03, $04, MUSIC_OVERWORLD     ; FIGHTING_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; FIGHTING_CLUB_LOBBY
+	db TILEMAP_FIGHTING_CLUB,           TILEMAP_FIGHTING_CLUB_CGB,           $00, $04, $0d, MUSIC_CLUB_3        ; FIGHTING_CLUB
+	db TILEMAP_ROCK_CLUB_ENTRANCE,      TILEMAP_ROCK_CLUB_ENTRANCE_CGB,      $00, $03, $05, MUSIC_OVERWORLD     ; ROCK_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; ROCK_CLUB_LOBBY
+	db TILEMAP_ROCK_CLUB,               TILEMAP_ROCK_CLUB_CGB,               $00, $04, $0e, MUSIC_CLUB_2        ; ROCK_CLUB
+	db TILEMAP_WATER_CLUB_ENTRANCE,     TILEMAP_WATER_CLUB_ENTRANCE_CGB,     $00, $03, $06, MUSIC_OVERWORLD     ; WATER_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; WATER_CLUB_LOBBY
+	db TILEMAP_WATER_CLUB,              TILEMAP_WATER_CLUB_CGB,              $00, $02, $0f, MUSIC_CLUB_2        ; WATER_CLUB
+	db TILEMAP_LIGHTNING_CLUB_ENTRANCE, TILEMAP_LIGHTNING_CLUB_ENTRANCE_CGB, $00, $03, $07, MUSIC_OVERWORLD     ; LIGHTNING_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; LIGHTNING_CLUB_LOBBY
+	db TILEMAP_LIGHTNING_CLUB,          TILEMAP_LIGHTNING_CLUB_CGB,          $00, $05, $10, MUSIC_CLUB_1        ; LIGHTNING_CLUB
+	db TILEMAP_GRASS_CLUB_ENTRANCE,     TILEMAP_GRASS_CLUB_ENTRANCE_CGB,     $00, $03, $08, MUSIC_OVERWORLD     ; GRASS_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; GRASS_CLUB_LOBBY
+	db TILEMAP_GRASS_CLUB,              TILEMAP_GRASS_CLUB_CGB,              $00, $06, $11, MUSIC_CLUB_1        ; GRASS_CLUB
+	db TILEMAP_PSYCHIC_CLUB_ENTRANCE,   TILEMAP_PSYCHIC_CLUB_ENTRANCE_CGB,   $00, $03, $09, MUSIC_OVERWORLD     ; PSYCHIC_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; PSYCHIC_CLUB_LOBBY
+	db TILEMAP_PSYCHIC_CLUB,            TILEMAP_PSYCHIC_CLUB_CGB,            $00, $07, $12, MUSIC_CLUB_2        ; PSYCHIC_CLUB
+	db TILEMAP_SCIENCE_CLUB_ENTRANCE,   TILEMAP_SCIENCE_CLUB_ENTRANCE_CGB,   $00, $03, $0a, MUSIC_OVERWORLD     ; SCIENCE_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; SCIENCE_CLUB_LOBBY
+	db TILEMAP_SCIENCE_CLUB,            TILEMAP_SCIENCE_CLUB_CGB,            $00, $06, $13, MUSIC_CLUB_3        ; SCIENCE_CLUB
+	db TILEMAP_FIRE_CLUB_ENTRANCE,      TILEMAP_FIRE_CLUB_ENTRANCE_CGB,      $00, $03, $0b, MUSIC_OVERWORLD     ; FIRE_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; FIRE_CLUB_LOBBY
+	db TILEMAP_FIRE_CLUB,               TILEMAP_FIRE_CLUB_CGB,               $00, $08, $14, MUSIC_CLUB_3        ; FIRE_CLUB
+	db TILEMAP_CHALLENGE_HALL_ENTRANCE, TILEMAP_CHALLENGE_HALL_ENTRANCE_CGB, $00, $03, $04, MUSIC_OVERWORLD     ; CHALLENGE_HALL_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; CHALLENGE_HALL_LOBBY
+	db TILEMAP_CHALLENGE_HALL,          TILEMAP_CHALLENGE_HALL_CGB,          $00, $09, $15, MUSIC_OVERWORLD     ; CHALLENGE_HALL
+	db TILEMAP_POKEMON_DOME_ENTRANCE,   TILEMAP_POKEMON_DOME_ENTRANCE_CGB,   $00, $0a, $16, MUSIC_OVERWORLD     ; POKEMON_DOME_ENTRANCE
+	db TILEMAP_POKEMON_DOME,            TILEMAP_POKEMON_DOME_CGB,            $00, $0a, $17, MUSIC_POKEMON_DOME  ; POKEMON_DOME
+	db TILEMAP_HALL_OF_HONOR,           TILEMAP_HALL_OF_HONOR_CGB,           $00, $0a, $18, MUSIC_HALL_OF_HONOR ; HALL_OF_HONOR
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index dc4a8c8..02590a8 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -64,7 +64,7 @@ Func_1c33b: ; 1c33b (7:433b)
 	ld hl, MapHeaders
 	add hl, bc
 	ld a, [hli]
-	ld [wd131], a
+	ld [wCurTilemap], a
 	ld a, [hli]
 	ld c, a
 	ld a, [hli]
@@ -75,14 +75,17 @@ Func_1c33b: ; 1c33b (7:433b)
 	ld [wd290], a
 	ld a, [hli]
 	ld [wd111], a
+
 	ld a, [wConsole]
-	cp $2
-	jr nz, .asm_1c370
+	cp CONSOLE_CGB
+	jr nz, .got_tilemap
+	; use CGB variant, if valid
 	ld a, c
 	or a
-	jr z, .asm_1c370
-	ld [wd131], a
-.asm_1c370
+	jr z, .got_tilemap
+	ld [wCurTilemap], a
+.got_tilemap
+
 	pop de
 	pop bc
 	pop hl
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 8039177..078d4b2 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -625,10 +625,10 @@ LoadTilesetGfx: ; 802d4 (20:42d4)
 	ret
 ; 0x803b9
 
-; gets pointer to BG map with ID from wd131
+; gets pointer to BG map with ID from wCurTilemap
 Func_803b9: ; 803b9 (20:43b9)
 	ld l, $00
-	ld a, [wd131]
+	ld a, [wCurTilemap]
 	call GetMapDataPointer
 	call LoadGraphicsPointerFromHL
 	ld a, [hl]
@@ -845,7 +845,7 @@ Func_80baa: ; 80baa (20:4baa)
 	push bc
 	push de
 	ld c, a
-	ld a, [wd131]
+	ld a, [wCurTilemap]
 	push af
 	ld a, [wd23d]
 	push af
@@ -882,7 +882,7 @@ Func_80baa: ; 80baa (20:4baa)
 
 .asm_80be7
 	ld a, [hl]
-	ld [wd131], a
+	ld [wCurTilemap], a
 	push bc
 	farcall Func_80082
 	pop bc
@@ -908,7 +908,7 @@ Func_80baa: ; 80baa (20:4baa)
 	pop af
 	ld [wd23d], a
 	pop af
-	ld [wd131], a
+	ld [wCurTilemap], a
 	pop de
 	pop bc
 	pop hl
@@ -925,7 +925,7 @@ SpriteNullAnimationFrame:
 
 ; might be closer to "screen specific data" than map data
 MapDataPointers: ; 80e5d (20:4e5d)
-	dw MapDataPointers_80e67
+	dw Tilemaps
 	dw Tilesets
 	dw MapDataPointers_8116b
 	dw SpriteAnimationPointers
@@ -933,118 +933,118 @@ MapDataPointers: ; 80e5d (20:4e5d)
 
 ; \1 = pointer
 ; \2 = tileset
-macro_80e67: MACRO
-	dwb \1, BANK(\1) - BANK(MapDataPointers_80e67)
+tilemap: MACRO
+	dwb \1, BANK(\1) - BANK(Tilemaps)
 	db \2
 ENDM
 
-MapDataPointers_80e67: ; 80e67 (20:4e67)
-	macro_80e67 Data_8191b, TILESET_OVERWORLD_MAP         ; 0
-	macro_80e67 Data_81a22, TILESET_OVERWORLD_MAP         ; 1
-	macro_80e67 Data_81c13, TILESET_MASON_LABORATORY      ; 2
-	macro_80e67 Data_81d2e, TILESET_MASON_LABORATORY      ; 3
-	macro_80e67 Data_81ed1, TILESET_MASON_LABORATORY      ; 4
-	macro_80e67 Data_81ef5, TILESET_MASON_LABORATORY      ; 5
-	macro_80e67 Data_81f26, TILESET_MASON_LABORATORY      ; 6
-	macro_80e67 Data_81feb, TILESET_MASON_LABORATORY      ; 7
-	macro_80e67 Data_82143, TILESET_MASON_LABORATORY      ; 8
-	macro_80e67 Data_82150, TILESET_MASON_LABORATORY      ; 9
-	macro_80e67 Data_82160, TILESET_ISHIHARA              ; 10
-	macro_80e67 Data_82222, TILESET_ISHIHARA              ; 11
-	macro_80e67 Data_82336, TILESET_CLUB_ENTRANCE         ; 12
-	macro_80e67 Data_82400, TILESET_CLUB_ENTRANCE         ; 13
-	macro_80e67 Data_8251d, TILESET_CLUB_ENTRANCE         ; 14
-	macro_80e67 Data_825e7, TILESET_CLUB_ENTRANCE         ; 15
-	macro_80e67 Data_82704, TILESET_CLUB_ENTRANCE         ; 16
-	macro_80e67 Data_827ce, TILESET_CLUB_ENTRANCE         ; 17
-	macro_80e67 Data_828eb, TILESET_CLUB_ENTRANCE         ; 18
-	macro_80e67 Data_829b5, TILESET_CLUB_ENTRANCE         ; 19
-	macro_80e67 Data_82ad2, TILESET_CLUB_ENTRANCE         ; 20
-	macro_80e67 Data_82b9c, TILESET_CLUB_ENTRANCE         ; 21
-	macro_80e67 Data_82cb9, TILESET_CLUB_ENTRANCE         ; 22
-	macro_80e67 Data_82d83, TILESET_CLUB_ENTRANCE         ; 23
-	macro_80e67 Data_82ea0, TILESET_CLUB_ENTRANCE         ; 24
-	macro_80e67 Data_82f6a, TILESET_CLUB_ENTRANCE         ; 25
-	macro_80e67 Data_83087, TILESET_CLUB_ENTRANCE         ; 26
-	macro_80e67 Data_83151, TILESET_CLUB_ENTRANCE         ; 27
-	macro_80e67 Data_8326e, TILESET_CLUB_ENTRANCE         ; 28
-	macro_80e67 Data_83321, TILESET_CLUB_ENTRANCE         ; 29
-	macro_80e67 Data_83424, TILESET_CLUB_LOBBY            ; 30
-	macro_80e67 Data_83545, TILESET_CLUB_LOBBY            ; 31
-	macro_80e67 Data_836db, TILESET_FIGHTING_CLUB         ; 32
-	macro_80e67 Data_8378c, TILESET_FIGHTING_CLUB         ; 33
-	macro_80e67 Data_8388d, TILESET_ROCK_CLUB             ; 34
-	macro_80e67 Data_839d6, TILESET_ROCK_CLUB             ; 35
-	macro_80e67 Data_84000, TILESET_WATER_CLUB            ; 36
-	macro_80e67 Data_84188, TILESET_WATER_CLUB            ; 37
-	macro_80e67 Data_843bb, TILESET_LIGHTNING_CLUB        ; 38
-	macro_80e67 Data_84533, TILESET_LIGHTNING_CLUB        ; 39
-	macro_80e67 Data_8472e, TILESET_GRASS_CLUB            ; 40
-	macro_80e67 Data_848d8, TILESET_GRASS_CLUB            ; 41
-	macro_80e67 Data_84b73, TILESET_PSYCHIC_CLUB          ; 42
-	macro_80e67 Data_84c6f, TILESET_PSYCHIC_CLUB          ; 43
-	macro_80e67 Data_84dfe, TILESET_SCIENCE_CLUB          ; 44
-	macro_80e67 Data_84f1d, TILESET_SCIENCE_CLUB          ; 45
-	macro_80e67 Data_850b6, TILESET_FIRE_CLUB             ; 46
-	macro_80e67 Data_85191, TILESET_FIRE_CLUB             ; 47
-	macro_80e67 Data_85315, TILESET_CHALLENGE_HALL        ; 48
-	macro_80e67 Data_854b3, TILESET_CHALLENGE_HALL        ; 49
-	macro_80e67 Data_8570a, TILESET_POKEMON_DOME_ENTRANCE ; 50
-	macro_80e67 Data_857ce, TILESET_POKEMON_DOME_ENTRANCE ; 51
-	macro_80e67 Data_83bf1, TILESET_POKEMON_DOME_ENTRANCE ; 52
-	macro_80e67 Data_83c03, TILESET_POKEMON_DOME_ENTRANCE ; 53
-	macro_80e67 Data_858ef, TILESET_POKEMON_DOME          ; 54
-	macro_80e67 Data_85a79, TILESET_POKEMON_DOME          ; 55
-	macro_80e67 Data_83c1a, TILESET_POKEMON_DOME          ; 56
-	macro_80e67 Data_83c26, TILESET_POKEMON_DOME          ; 57
-	macro_80e67 Data_85ce2, TILESET_HALL_OF_HONOR         ; 58
-	macro_80e67 Data_85df4, TILESET_HALL_OF_HONOR         ; 59
-	macro_80e67 Data_85f7c, TILESET_CARD_POP_1            ; 60
-	macro_80e67 Data_8607f, TILESET_CARD_POP_1            ; 61
-	macro_80e67 Data_83c36, TILESET_MEDAL                 ; 62
-	macro_80e67 Data_8617d, TILESET_MEDAL                 ; 63
-	macro_80e67 Data_86193, TILESET_MEDAL                 ; 64
-	macro_80e67 Data_861a9, TILESET_MEDAL                 ; 65
-	macro_80e67 Data_861bf, TILESET_MEDAL                 ; 66
-	macro_80e67 Data_861d5, TILESET_MEDAL                 ; 67
-	macro_80e67 Data_861eb, TILESET_MEDAL                 ; 68
-	macro_80e67 Data_86201, TILESET_MEDAL                 ; 69
-	macro_80e67 Data_86217, TILESET_CARD_POP_2            ; 70
-	macro_80e67 Data_862da, TILESET_CARD_POP_2            ; 71
-	macro_80e67 Data_86364, TILESET_CARD_POP_2            ; 72
-	macro_80e67 Data_86443, TILESET_CARD_POP_2            ; 73
-	macro_80e67 Data_864df, TILESET_CARD_POP_3            ; 74
-	macro_80e67 Data_865b5, TILESET_CARD_POP_3            ; 75
-	macro_80e67 Data_86647, TILESET_COLOSSEUM_1           ; 76
-	macro_80e67 Data_866b8, TILESET_COLOSSEUM_2           ; 77
-	macro_80e67 Data_8673e, TILESET_EVOLUTION_1           ; 78
-	macro_80e67 Data_867af, TILESET_EVOLUTION_2           ; 79
-	macro_80e67 Data_86833, TILESET_MYSTERY_1             ; 80
-	macro_80e67 Data_868a4, TILESET_MYSTERY_2             ; 81
-	macro_80e67 Data_86925, TILESET_LABORATORY_1          ; 82
-	macro_80e67 Data_86996, TILESET_LABORATORY_2          ; 83
-	macro_80e67 Data_86a14, TILESET_CHARIZARD_INTRO_1     ; 84
-	macro_80e67 Data_86a85, TILESET_CHARIZARD_INTRO_2     ; 85
-	macro_80e67 Data_86b28, TILESET_SCYTHER_INTRO_1       ; 86
-	macro_80e67 Data_86b99, TILESET_SCYTHER_INTRO_2       ; 87
-	macro_80e67 Data_86c34, TILESET_AERODACTYL_INTRO_1    ; 88
-	macro_80e67 Data_86ca5, TILESET_AERODACTYL_INTRO_2    ; 89
-	macro_80e67 Data_86d37, TILESET_TITLE_SCREEN_1        ; 90
-	macro_80e67 Data_86dcc, TILESET_TITLE_SCREEN_2        ; 91
-	macro_80e67 Data_86e8a, TILESET_SOLID_TILES_1         ; 92
-	macro_80e67 Data_86f18, TILESET_SOLID_TILES_1         ; 93
-	macro_80e67 Data_86fc0, TILESET_SOLID_TILES_1         ; 94
-	macro_80e67 Data_8704f, TILESET_TITLE_SCREEN_3        ; 95
-	macro_80e67 Data_871a5, TILESET_TITLE_SCREEN_4        ; 96
-	macro_80e67 Data_87397, TILESET_SOLID_TILES_2         ; 97
-	macro_80e67 Data_873b7, TILESET_PLAYER                ; 98
-	macro_80e67 Data_873e5, TILESET_RONALD                ; 99
-	macro_80e67 Data_87413, TILESET_TITLE_SCREEN_5        ; 100
-	macro_80e67 Data_87538, TILESET_TITLE_SCREEN_6        ; 101
-	macro_80e67 Data_8769f, TILESET_COPYRIGHT             ; 102
-	macro_80e67 Data_876f6, TILESET_COPYRIGHT             ; 103
-	macro_80e67 Data_8777c, TILESET_NINTENDO              ; 104
-	macro_80e67 Data_877c4, TILESET_COMPANIES             ; 105
+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 Unused1Tilemap,                  TILESET_MASON_LABORATORY      ; TILEMAP_UNUSED_1
+	tilemap Unused2Tilemap,                  TILESET_MASON_LABORATORY      ; TILEMAP_UNUSED_2
+	tilemap DeckMachineRoomTilemap,          TILESET_MASON_LABORATORY      ; TILEMAP_DECK_MACHINE_ROOM
+	tilemap DeckMachineRoomCGBTilemap,       TILESET_MASON_LABORATORY      ; TILEMAP_DECK_MACHINE_ROOM_CGB
+	tilemap Unused3Tilemap,                  TILESET_MASON_LABORATORY      ; TILEMAP_UNUSED_3
+	tilemap Unused4Tilemap,                  TILESET_MASON_LABORATORY      ; TILEMAP_UNUSED_4
+	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 Unused5Tilemap,                  TILESET_POKEMON_DOME_ENTRANCE ; TILEMAP_UNUSED_5
+	tilemap Unused6Tilemap,                  TILESET_POKEMON_DOME_ENTRANCE ; TILEMAP_UNUSED_6
+	tilemap PokemonDomeTilemap,              TILESET_POKEMON_DOME          ; TILEMAP_POKEMON_DOME
+	tilemap PokemonDomeGBTilemap,            TILESET_POKEMON_DOME          ; TILEMAP_POKEMON_DOME_CGB
+	tilemap Unused7Tilemap,                  TILESET_POKEMON_DOME          ; TILEMAP_UNUSED_7
+	tilemap Unused8Tilemap,                  TILESET_POKEMON_DOME          ; TILEMAP_UNUSED_8
+	tilemap HallOfHonorTilemap,              TILESET_HALL_OF_HONOR         ; TILEMAP_HALL_OF_HONOR
+	tilemap HallOfHonorCGBTilemap,           TILESET_HALL_OF_HONOR         ; TILEMAP_HALL_OF_HONOR_CGB
+	tilemap CardPop1Tilemap,                 TILESET_CARD_POP_1            ; TILEMAP_CARD_POP_1
+	tilemap CardPop1CGBTilemap,              TILESET_CARD_POP_1            ; TILEMAP_CARD_POP_1_CGB
+	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 CardPop2Tilemap,                 TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2
+	tilemap CardPop2CGBTilemap,              TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2_CGB
+	tilemap CardPop2Unknown1Tilemap,         TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2_UNKNOWN_1
+	tilemap CardPop2Unknown2Tilemap,         TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2_UNKNOWN_2
+	tilemap CardPop3Tilemap,                 TILESET_CARD_POP_3            ; TILEMAP_CARD_POP_3
+	tilemap CardPop3CGBTilemap,              TILESET_CARD_POP_3            ; TILEMAP_CARD_POP_3_CGB
+	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 TitleScreen1Tilemap,             TILESET_TITLE_SCREEN_1        ; TILEMAP_TITLE_SCREEN_1
+	tilemap TitleScreen2Tilemap,             TILESET_TITLE_SCREEN_2        ; TILEMAP_TITLE_SCREEN_2
+	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 TitleScreen3Tilemap,             TILESET_TITLE_SCREEN_3        ; TILEMAP_TITLE_SCREEN_3
+	tilemap TitleScreen4Tilemap,             TILESET_TITLE_SCREEN_4        ; TILEMAP_TITLE_SCREEN_4
+	tilemap SolidTiles4Tilemap,              TILESET_SOLID_TILES_2         ; TILEMAP_SOLID_TILES_4
+	tilemap PlayerTilemap,                   TILESET_PLAYER                ; TILEMAP_PLAYER
+	tilemap OpponentTilemap,                 TILESET_RONALD                ; TILEMAP_OPPONENT
+	tilemap TitleScreen5Tilemap,             TILESET_TITLE_SCREEN_5        ; TILEMAP_TITLE_SCREEN_5
+	tilemap TitleScreen6Tilemap,             TILESET_TITLE_SCREEN_6        ; TILEMAP_TITLE_SCREEN_6
+	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
@@ -1661,7 +1661,7 @@ MapDataPointers_81697: ; 81697 (20:5697)
 	palette_pointer Palette159, 1, 0 ; PALETTE_159
 	palette_pointer Palette160, 1, 0 ; PALETTE_160
 
-Data_8191b:: ; 8191b (20:591b)
+OverworldMapTilemap:: ; 8191b (20:591b)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -1669,7 +1669,7 @@ Data_8191b:: ; 8191b (20:591b)
 
 	INCBIN "data/maps/map0.bin"
 
-Data_81a22:: ; 81a22 (20:5a22)
+OverworldMapCGBTilemap:: ; 81a22 (20:5a22)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -1677,7 +1677,7 @@ Data_81a22:: ; 81a22 (20:5a22)
 
 	INCBIN "data/maps/map1.bin"
 
-Data_81c13:: ; 81c13 (20:5c13)
+MasonLaboratoryTilemap:: ; 81c13 (20:5c13)
 	db $1c ; width
 	db $1e ; height
 	dw $5d11
@@ -1685,7 +1685,7 @@ Data_81c13:: ; 81c13 (20:5c13)
 
 	INCBIN "data/maps/map2.bin"
 
-Data_81d2e:: ; 81d2e (20:5d2e)
+MasonLaboratoryCGBTilemap:: ; 81d2e (20:5d2e)
 	db $1c ; width
 	db $1e ; height
 	dw $5eb4
@@ -1693,7 +1693,7 @@ Data_81d2e:: ; 81d2e (20:5d2e)
 
 	INCBIN "data/maps/map3.bin"
 
-Data_81ed1:: ; 81ed1 (20:5ed1)
+Unused1Tilemap:: ; 81ed1 (20:5ed1)
 	db $04 ; width
 	db $06 ; height
 	dw $5ef0
@@ -1701,7 +1701,7 @@ Data_81ed1:: ; 81ed1 (20:5ed1)
 
 	INCBIN "data/maps/map4.bin"
 
-Data_81ef5:: ; 81ef5 (20:5ef5)
+Unused2Tilemap:: ; 81ef5 (20:5ef5)
 	db $04 ; width
 	db $06 ; height
 	dw $5f21
@@ -1709,7 +1709,7 @@ Data_81ef5:: ; 81ef5 (20:5ef5)
 
 	INCBIN "data/maps/map5.bin"
 
-Data_81f26:: ; 81f26 (20:5f26)
+DeckMachineRoomTilemap:: ; 81f26 (20:5f26)
 	db $18 ; width
 	db $1e ; height
 	dw $5fd3
@@ -1717,7 +1717,7 @@ Data_81f26:: ; 81f26 (20:5f26)
 
 	INCBIN "data/maps/map6.bin"
 
-Data_81feb:: ; 81feb (20:5feb)
+DeckMachineRoomCGBTilemap:: ; 81feb (20:5feb)
 	db $18 ; width
 	db $1e ; height
 	dw $612b
@@ -1725,7 +1725,7 @@ Data_81feb:: ; 81feb (20:5feb)
 
 	INCBIN "data/maps/map7.bin"
 
-Data_82143:: ; 82143 (20:6143)
+Unused3Tilemap:: ; 82143 (20:6143)
 	db $04 ; width
 	db $01 ; height
 	dw $614d
@@ -1733,7 +1733,7 @@ Data_82143:: ; 82143 (20:6143)
 
 	INCBIN "data/maps/map8.bin"
 
-Data_82150:: ; 82150 (20:6150)
+Unused4Tilemap:: ; 82150 (20:6150)
 	db $04 ; width
 	db $01 ; height
 	dw $615d
@@ -1741,7 +1741,7 @@ Data_82150:: ; 82150 (20:6150)
 
 	INCBIN "data/maps/map9.bin"
 
-Data_82160:: ; 82160 (20:6160)
+IshiharaTilemap:: ; 82160 (20:6160)
 	db $14 ; width
 	db $18 ; height
 	dw $620e
@@ -1749,7 +1749,7 @@ Data_82160:: ; 82160 (20:6160)
 
 	INCBIN "data/maps/map10.bin"
 
-Data_82222:: ; 82222 (20:6222)
+IshiharaCGBTilemap:: ; 82222 (20:6222)
 	db $14 ; width
 	db $18 ; height
 	dw $6322
@@ -1757,7 +1757,7 @@ Data_82222:: ; 82222 (20:6222)
 
 	INCBIN "data/maps/map11.bin"
 
-Data_82336:: ; 82336 (20:6336)
+FightingClubEntranceTilemap:: ; 82336 (20:6336)
 	db $14 ; width
 	db $12 ; height
 	dw $63ec
@@ -1765,7 +1765,7 @@ Data_82336:: ; 82336 (20:6336)
 
 	INCBIN "data/maps/map12.bin"
 
-Data_82400:: ; 82400 (20:6400)
+FightingClubEntranceCGBTilemap:: ; 82400 (20:6400)
 	db $14 ; width
 	db $12 ; height
 	dw $6509
@@ -1773,7 +1773,7 @@ Data_82400:: ; 82400 (20:6400)
 
 	INCBIN "data/maps/map13.bin"
 
-Data_8251d:: ; 8251d (20:651d)
+RockClubEntranceTilemap:: ; 8251d (20:651d)
 	db $14 ; width
 	db $12 ; height
 	dw $65d3
@@ -1781,7 +1781,7 @@ Data_8251d:: ; 8251d (20:651d)
 
 	INCBIN "data/maps/map14.bin"
 
-Data_825e7:: ; 825e7 (20:65e7)
+RockClubEntranceCGBTilemap:: ; 825e7 (20:65e7)
 	db $14 ; width
 	db $12 ; height
 	dw $66f0
@@ -1789,7 +1789,7 @@ Data_825e7:: ; 825e7 (20:65e7)
 
 	INCBIN "data/maps/map15.bin"
 
-Data_82704:: ; 82704 (20:6704)
+WaterClubEntranceTilemap:: ; 82704 (20:6704)
 	db $14 ; width
 	db $12 ; height
 	dw $67ba
@@ -1797,7 +1797,7 @@ Data_82704:: ; 82704 (20:6704)
 
 	INCBIN "data/maps/map16.bin"
 
-Data_827ce:: ; 827ce (20:67ce)
+WaterClubEntranceCGBTilemap:: ; 827ce (20:67ce)
 	db $14 ; width
 	db $12 ; height
 	dw $68d7
@@ -1805,7 +1805,7 @@ Data_827ce:: ; 827ce (20:67ce)
 
 	INCBIN "data/maps/map17.bin"
 
-Data_828eb:: ; 828eb (20:68eb)
+LightningClubEntranceTilemap:: ; 828eb (20:68eb)
 	db $14 ; width
 	db $12 ; height
 	dw $69a1
@@ -1813,7 +1813,7 @@ Data_828eb:: ; 828eb (20:68eb)
 
 	INCBIN "data/maps/map18.bin"
 
-Data_829b5:: ; 829b5 (20:69b5)
+LightningClubEntranceCGBTilemap:: ; 829b5 (20:69b5)
 	db $14 ; width
 	db $12 ; height
 	dw $6abe
@@ -1821,7 +1821,7 @@ Data_829b5:: ; 829b5 (20:69b5)
 
 	INCBIN "data/maps/map19.bin"
 
-Data_82ad2:: ; 82ad2 (20:6ad2)
+GrassClubEntranceTilemap:: ; 82ad2 (20:6ad2)
 	db $14 ; width
 	db $12 ; height
 	dw $6b88
@@ -1829,7 +1829,7 @@ Data_82ad2:: ; 82ad2 (20:6ad2)
 
 	INCBIN "data/maps/map20.bin"
 
-Data_82b9c:: ; 82b9c (20:6b9c)
+GrassClubEntranceCGBTilemap:: ; 82b9c (20:6b9c)
 	db $14 ; width
 	db $12 ; height
 	dw $6ca5
@@ -1837,7 +1837,7 @@ Data_82b9c:: ; 82b9c (20:6b9c)
 
 	INCBIN "data/maps/map21.bin"
 
-Data_82cb9:: ; 82cb9 (20:6cb9)
+PsychicClubEntranceTilemap:: ; 82cb9 (20:6cb9)
 	db $14 ; width
 	db $12 ; height
 	dw $6d6f
@@ -1845,7 +1845,7 @@ Data_82cb9:: ; 82cb9 (20:6cb9)
 
 	INCBIN "data/maps/map22.bin"
 
-Data_82d83:: ; 82d83 (20:6d83)
+PsychicClubEntranceCGBTilemap:: ; 82d83 (20:6d83)
 	db $14 ; width
 	db $12 ; height
 	dw $6e8c
@@ -1853,7 +1853,7 @@ Data_82d83:: ; 82d83 (20:6d83)
 
 	INCBIN "data/maps/map23.bin"
 
-Data_82ea0:: ; 82ea0 (20:6ea0)
+ScienceClubEntranceTilemap:: ; 82ea0 (20:6ea0)
 	db $14 ; width
 	db $12 ; height
 	dw $6f56
@@ -1861,7 +1861,7 @@ Data_82ea0:: ; 82ea0 (20:6ea0)
 
 	INCBIN "data/maps/map24.bin"
 
-Data_82f6a:: ; 82f6a (20:6f6a)
+ScienceClubEntranceCGBTilemap:: ; 82f6a (20:6f6a)
 	db $14 ; width
 	db $12 ; height
 	dw $7073
@@ -1869,7 +1869,7 @@ Data_82f6a:: ; 82f6a (20:6f6a)
 
 	INCBIN "data/maps/map25.bin"
 
-Data_83087:: ; 83087 (20:7087)
+FireClubEntranceTilemap:: ; 83087 (20:7087)
 	db $14 ; width
 	db $12 ; height
 	dw $713d
@@ -1877,7 +1877,7 @@ Data_83087:: ; 83087 (20:7087)
 
 	INCBIN "data/maps/map26.bin"
 
-Data_83151:: ; 83151 (20:7151)
+FireClubEntranceCGBTilemap:: ; 83151 (20:7151)
 	db $14 ; width
 	db $12 ; height
 	dw $725a
@@ -1885,7 +1885,7 @@ Data_83151:: ; 83151 (20:7151)
 
 	INCBIN "data/maps/map27.bin"
 
-Data_8326e:: ; 8326e (20:726e)
+ChallengeHallEntranceTilemap:: ; 8326e (20:726e)
 	db $14 ; width
 	db $12 ; height
 	dw $730d
@@ -1893,7 +1893,7 @@ Data_8326e:: ; 8326e (20:726e)
 
 	INCBIN "data/maps/map28.bin"
 
-Data_83321:: ; 83321 (20:7321)
+ChallengeHallEntranceCGBTilemap:: ; 83321 (20:7321)
 	db $14 ; width
 	db $12 ; height
 	dw $7410
@@ -1901,7 +1901,7 @@ Data_83321:: ; 83321 (20:7321)
 
 	INCBIN "data/maps/map29.bin"
 
-Data_83424:: ; 83424 (20:7424)
+ClubLobbyTilemap:: ; 83424 (20:7424)
 	db $1c ; width
 	db $1a ; height
 	dw $7529
@@ -1909,7 +1909,7 @@ Data_83424:: ; 83424 (20:7424)
 
 	INCBIN "data/maps/map30.bin"
 
-Data_83545:: ; 83545 (20:7545)
+ClubLobbyCGBTilemap:: ; 83545 (20:7545)
 	db $1c ; width
 	db $1a ; height
 	dw $76bf
@@ -1917,7 +1917,7 @@ Data_83545:: ; 83545 (20:7545)
 
 	INCBIN "data/maps/map31.bin"
 
-Data_836db:: ; 836db (20:76db)
+FightingClubTilemap:: ; 836db (20:76db)
 	db $18 ; width
 	db $12 ; height
 	dw $777b
@@ -1925,7 +1925,7 @@ Data_836db:: ; 836db (20:76db)
 
 	INCBIN "data/maps/map32.bin"
 
-Data_8378c:: ; 8378c (20:778c)
+FightingClubCGBTilemap:: ; 8378c (20:778c)
 	db $18 ; width
 	db $12 ; height
 	dw $787c
@@ -1933,7 +1933,7 @@ Data_8378c:: ; 8378c (20:778c)
 
 	INCBIN "data/maps/map33.bin"
 
-Data_8388d:: ; 8388d (20:788d)
+RockClubTilemap:: ; 8388d (20:788d)
 	db $1c ; width
 	db $1e ; height
 	dw $79b5
@@ -1941,7 +1941,7 @@ Data_8388d:: ; 8388d (20:788d)
 
 	INCBIN "data/maps/map34.bin"
 
-Data_839d6:: ; 839d6 (20:79d6)
+RockClubCGBTilemap:: ; 839d6 (20:79d6)
 	db $1c ; width
 	db $1e ; height
 	dw $7bd0
@@ -1949,7 +1949,7 @@ Data_839d6:: ; 839d6 (20:79d6)
 
 	INCBIN "data/maps/map35.bin"
 
-Data_83bf1:: ; 83bf1 (20:7bf1)
+Unused5Tilemap:: ; 83bf1 (20:7bf1)
 	db $04 ; width
 	db $03 ; height
 	dw $7c00
@@ -1957,7 +1957,7 @@ Data_83bf1:: ; 83bf1 (20:7bf1)
 
 	INCBIN "data/maps/map52.bin"
 
-Data_83c03:: ; 83c03 (20:7c03)
+Unused6Tilemap:: ; 83c03 (20:7c03)
 	db $04 ; width
 	db $03 ; height
 	dw $7c17
@@ -1965,7 +1965,7 @@ Data_83c03:: ; 83c03 (20:7c03)
 
 	INCBIN "data/maps/map53.bin"
 
-Data_83c1a:: ; 83c1a (20:7c1a)
+Unused7Tilemap:: ; 83c1a (20:7c1a)
 	db $04 ; width
 	db $03 ; height
 	dw $7c23
@@ -1973,7 +1973,7 @@ Data_83c1a:: ; 83c1a (20:7c1a)
 
 	INCBIN "data/maps/map56.bin"
 
-Data_83c26:: ; 83c26 (20:7c26)
+Unused8Tilemap:: ; 83c26 (20:7c26)
 	db $04 ; width
 	db $03 ; height
 	dw $7c33
@@ -1981,7 +1981,7 @@ Data_83c26:: ; 83c26 (20:7c26)
 
 	INCBIN "data/maps/map57.bin"
 
-Data_83c36:: ; 83c36 (20:7c36)
+GrassMedalTilemap:: ; 83c36 (20:7c36)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 326e327..b24bc9d 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -11669,7 +11669,7 @@ Func_3e10: ; 3e10 (0:3e10)
 ;	fallthrough
 
 Func_3e17: ; 3e17 (0:3e17)
-	ld [wd131], a
+	ld [wCurTilemap], a
 	ldh a, [hBankROM]
 	push af
 	ld a, BANK(Func_12fc6)
diff --git a/src/gfx.asm b/src/gfx.asm
index c2db3e9..e27c140 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -47,7 +47,7 @@ endr
 
 SECTION "Gfx 3", ROMX
 
-Data_84000:: ; 84000 (21:4000)
+WaterClubTilemap:: ; 84000 (21:4000)
 	db $1c ; width
 	db $20 ; height
 	dw $4164
@@ -55,7 +55,7 @@ Data_84000:: ; 84000 (21:4000)
 
 	INCBIN "data/maps/map36.bin"
 
-Data_84188:: ; 84188 (21:4188)
+WaterClubCGBTilemap:: ; 84188 (21:4188)
 	db $1c ; width
 	db $20 ; height
 	dw $4397
@@ -63,7 +63,7 @@ Data_84188:: ; 84188 (21:4188)
 
 	INCBIN "data/maps/map37.bin"
 
-Data_843bb:: ; 843bb (21:43bb)
+LightningClubTilemap:: ; 843bb (21:43bb)
 	db $1c ; width
 	db $20 ; height
 	dw $4511
@@ -71,7 +71,7 @@ Data_843bb:: ; 843bb (21:43bb)
 
 	INCBIN "data/maps/map38.bin"
 
-Data_84533:: ; 84533 (21:4533)
+LightningClubCGBTilemap:: ; 84533 (21:4533)
 	db $1c ; width
 	db $20 ; height
 	dw $470c
@@ -79,7 +79,7 @@ Data_84533:: ; 84533 (21:4533)
 
 	INCBIN "data/maps/map39.bin"
 
-Data_8472e:: ; 8472e (21:472e)
+GrassClubTilemap:: ; 8472e (21:472e)
 	db $1c ; width
 	db $20 ; height
 	dw $48b4
@@ -87,7 +87,7 @@ Data_8472e:: ; 8472e (21:472e)
 
 	INCBIN "data/maps/map40.bin"
 
-Data_848d8:: ; 848d8 (21:48d8)
+GrassClubCGBTilemap:: ; 848d8 (21:48d8)
 	db $1c ; width
 	db $20 ; height
 	dw $4b4f
@@ -95,7 +95,7 @@ Data_848d8:: ; 848d8 (21:48d8)
 
 	INCBIN "data/maps/map41.bin"
 
-Data_84b73:: ; 84b73 (21:4b73)
+PsychicClubTilemap:: ; 84b73 (21:4b73)
 	db $1c ; width
 	db $1c ; height
 	dw $4c50
@@ -103,7 +103,7 @@ Data_84b73:: ; 84b73 (21:4b73)
 
 	INCBIN "data/maps/map42.bin"
 
-Data_84c6f:: ; 84c6f (21:4c6f)
+PsychicClubCGBTilemap:: ; 84c6f (21:4c6f)
 	db $1c ; width
 	db $1c ; height
 	dw $4ddf
@@ -111,7 +111,7 @@ Data_84c6f:: ; 84c6f (21:4c6f)
 
 	INCBIN "data/maps/map43.bin"
 
-Data_84dfe:: ; 84dfe (21:4dfe)
+ScienceClubTilemap:: ; 84dfe (21:4dfe)
 	db $1c ; width
 	db $20 ; height
 	dw $4efe
@@ -119,7 +119,7 @@ Data_84dfe:: ; 84dfe (21:4dfe)
 
 	INCBIN "data/maps/map44.bin"
 
-Data_84f1d:: ; 84f1d (21:4f1d)
+ScienceClubCGBTilemap:: ; 84f1d (21:4f1d)
 	db $1c ; width
 	db $20 ; height
 	dw $5097
@@ -127,7 +127,7 @@ Data_84f1d:: ; 84f1d (21:4f1d)
 
 	INCBIN "data/maps/map45.bin"
 
-Data_850b6:: ; 850b6 (21:50b6)
+FireClubTilemap:: ; 850b6 (21:50b6)
 	db $1c ; width
 	db $20 ; height
 	dw $5175
@@ -135,7 +135,7 @@ Data_850b6:: ; 850b6 (21:50b6)
 
 	INCBIN "data/maps/map46.bin"
 
-Data_85191:: ; 85191 (21:5191)
+FireClubCGBTilemap:: ; 85191 (21:5191)
 	db $1c ; width
 	db $20 ; height
 	dw $52f9
@@ -143,7 +143,7 @@ Data_85191:: ; 85191 (21:5191)
 
 	INCBIN "data/maps/map47.bin"
 
-Data_85315:: ; 85315 (21:5315)
+ChallengeHallTilemap:: ; 85315 (21:5315)
 	db $20 ; width
 	db $20 ; height
 	dw $5484
@@ -151,7 +151,7 @@ Data_85315:: ; 85315 (21:5315)
 
 	INCBIN "data/maps/map48.bin"
 
-Data_854b3:: ; 854b3 (21:54b3)
+ChallengeHallCGBTilemap:: ; 854b3 (21:54b3)
 	db $20 ; width
 	db $20 ; height
 	dw $56db
@@ -159,7 +159,7 @@ Data_854b3:: ; 854b3 (21:54b3)
 
 	INCBIN "data/maps/map49.bin"
 
-Data_8570a:: ; 8570a (21:570a)
+PokemonDomeEntranceTilemap:: ; 8570a (21:570a)
 	db $20 ; width
 	db $12 ; height
 	dw $57ba
@@ -167,7 +167,7 @@ Data_8570a:: ; 8570a (21:570a)
 
 	INCBIN "data/maps/map50.bin"
 
-Data_857ce:: ; 857ce (21:57ce)
+PokemonDomeEntranceCGBTilemap:: ; 857ce (21:57ce)
 	db $20 ; width
 	db $12 ; height
 	dw $58db
@@ -175,7 +175,7 @@ Data_857ce:: ; 857ce (21:57ce)
 
 	INCBIN "data/maps/map51.bin"
 
-Data_858ef:: ; 858ef (21:58ef)
+PokemonDomeTilemap:: ; 858ef (21:58ef)
 	db $20 ; width
 	db $20 ; height
 	dw $5a58
@@ -183,7 +183,7 @@ Data_858ef:: ; 858ef (21:58ef)
 
 	INCBIN "data/maps/map54.bin"
 
-Data_85a79:: ; 85a79 (21:5a79)
+PokemonDomeGBTilemap:: ; 85a79 (21:5a79)
 	db $20 ; width
 	db $20 ; height
 	dw $5cc1
@@ -191,7 +191,7 @@ Data_85a79:: ; 85a79 (21:5a79)
 
 	INCBIN "data/maps/map55.bin"
 
-Data_85ce2:: ; 85ce2 (21:5ce2)
+HallOfHonorTilemap:: ; 85ce2 (21:5ce2)
 	db $18 ; width
 	db $1a ; height
 	dw $5ddc
@@ -199,7 +199,7 @@ Data_85ce2:: ; 85ce2 (21:5ce2)
 
 	INCBIN "data/maps/map58.bin"
 
-Data_85df4:: ; 85df4 (21:5df4)
+HallOfHonorCGBTilemap:: ; 85df4 (21:5df4)
 	db $18 ; width
 	db $1a ; height
 	dw $5f64
@@ -207,7 +207,7 @@ Data_85df4:: ; 85df4 (21:5df4)
 
 	INCBIN "data/maps/map59.bin"
 
-Data_85f7c:: ; 85f7c (21:5f7c)
+CardPop1Tilemap:: ; 85f7c (21:5f7c)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -215,7 +215,7 @@ Data_85f7c:: ; 85f7c (21:5f7c)
 
 	INCBIN "data/maps/map60.bin"
 
-Data_8607f:: ; 8607f (21:607f)
+CardPop1CGBTilemap:: ; 8607f (21:607f)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -223,7 +223,7 @@ Data_8607f:: ; 8607f (21:607f)
 
 	INCBIN "data/maps/map61.bin"
 
-Data_8617d:: ; 8617d (21:617d)
+ScienceMedalTilemap:: ; 8617d (21:617d)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -231,7 +231,7 @@ Data_8617d:: ; 8617d (21:617d)
 
 	INCBIN "data/maps/map63.bin"
 
-Data_86193:: ; 86193 (21:6193)
+FireMedalTilemap:: ; 86193 (21:6193)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -239,7 +239,7 @@ Data_86193:: ; 86193 (21:6193)
 
 	INCBIN "data/maps/map64.bin"
 
-Data_861a9:: ; 861a9 (21:61a9)
+WaterMedalTilemap:: ; 861a9 (21:61a9)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -247,7 +247,7 @@ Data_861a9:: ; 861a9 (21:61a9)
 
 	INCBIN "data/maps/map65.bin"
 
-Data_861bf:: ; 861bf (21:61bf)
+LightningMedalTilemap:: ; 861bf (21:61bf)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -255,7 +255,7 @@ Data_861bf:: ; 861bf (21:61bf)
 
 	INCBIN "data/maps/map66.bin"
 
-Data_861d5:: ; 861d5 (21:61d5)
+FightingMedalTilemap:: ; 861d5 (21:61d5)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -263,7 +263,7 @@ Data_861d5:: ; 861d5 (21:61d5)
 
 	INCBIN "data/maps/map67.bin"
 
-Data_861eb:: ; 861eb (21:61eb)
+RockMedalTilemap:: ; 861eb (21:61eb)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -271,7 +271,7 @@ Data_861eb:: ; 861eb (21:61eb)
 
 	INCBIN "data/maps/map68.bin"
 
-Data_86201:: ; 86201 (21:6201)
+PsychicMedalTilemap:: ; 86201 (21:6201)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -279,7 +279,7 @@ Data_86201:: ; 86201 (21:6201)
 
 	INCBIN "data/maps/map69.bin"
 
-Data_86217:: ; 86217 (21:6217)
+CardPop2Tilemap:: ; 86217 (21:6217)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -287,7 +287,7 @@ Data_86217:: ; 86217 (21:6217)
 
 	INCBIN "data/maps/map70.bin"
 
-Data_862da:: ; 862da (21:62da)
+CardPop2CGBTilemap:: ; 862da (21:62da)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -295,7 +295,7 @@ Data_862da:: ; 862da (21:62da)
 
 	INCBIN "data/maps/map71.bin"
 
-Data_86364:: ; 86364 (21:6364)
+CardPop2Unknown1Tilemap:: ; 86364 (21:6364)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -303,7 +303,7 @@ Data_86364:: ; 86364 (21:6364)
 
 	INCBIN "data/maps/map72.bin"
 
-Data_86443:: ; 86443 (21:6443)
+CardPop2Unknown2Tilemap:: ; 86443 (21:6443)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -311,7 +311,7 @@ Data_86443:: ; 86443 (21:6443)
 
 	INCBIN "data/maps/map73.bin"
 
-Data_864df:: ; 864df (21:64df)
+CardPop3Tilemap:: ; 864df (21:64df)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -319,7 +319,7 @@ Data_864df:: ; 864df (21:64df)
 
 	INCBIN "data/maps/map74.bin"
 
-Data_865b5:: ; 865b5 (21:65b5)
+CardPop3CGBTilemap:: ; 865b5 (21:65b5)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -327,7 +327,7 @@ Data_865b5:: ; 865b5 (21:65b5)
 
 	INCBIN "data/maps/map75.bin"
 
-Data_86647:: ; 86647 (21:6647)
+ColosseumTilemap:: ; 86647 (21:6647)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -335,7 +335,7 @@ Data_86647:: ; 86647 (21:6647)
 
 	INCBIN "data/maps/map76.bin"
 
-Data_866b8:: ; 866b8 (21:66b8)
+ColosseumCGBTilemap:: ; 866b8 (21:66b8)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -343,7 +343,7 @@ Data_866b8:: ; 866b8 (21:66b8)
 
 	INCBIN "data/maps/map77.bin"
 
-Data_8673e:: ; 8673e (21:673e)
+EvolutionTilemap:: ; 8673e (21:673e)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -351,7 +351,7 @@ Data_8673e:: ; 8673e (21:673e)
 
 	INCBIN "data/maps/map78.bin"
 
-Data_867af:: ; 867af (21:67af)
+EvolutionCGBTilemap:: ; 867af (21:67af)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -359,7 +359,7 @@ Data_867af:: ; 867af (21:67af)
 
 	INCBIN "data/maps/map79.bin"
 
-Data_86833:: ; 86833 (21:6833)
+MysteryTilemap:: ; 86833 (21:6833)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -367,7 +367,7 @@ Data_86833:: ; 86833 (21:6833)
 
 	INCBIN "data/maps/map80.bin"
 
-Data_868a4:: ; 868a4 (21:68a4)
+MysteryCGBTilemap:: ; 868a4 (21:68a4)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -375,7 +375,7 @@ Data_868a4:: ; 868a4 (21:68a4)
 
 	INCBIN "data/maps/map81.bin"
 
-Data_86925:: ; 86925 (21:6925)
+LaboratoryTilemap:: ; 86925 (21:6925)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -383,7 +383,7 @@ Data_86925:: ; 86925 (21:6925)
 
 	INCBIN "data/maps/map82.bin"
 
-Data_86996:: ; 86996 (21:6996)
+LaboratoryCGBTilemap:: ; 86996 (21:6996)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -391,7 +391,7 @@ Data_86996:: ; 86996 (21:6996)
 
 	INCBIN "data/maps/map83.bin"
 
-Data_86a14:: ; 86a14 (21:6a14)
+CharizardIntroTilemap:: ; 86a14 (21:6a14)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -399,7 +399,7 @@ Data_86a14:: ; 86a14 (21:6a14)
 
 	INCBIN "data/maps/map84.bin"
 
-Data_86a85:: ; 86a85 (21:6a85)
+CharizardIntroCGBTilemap:: ; 86a85 (21:6a85)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -407,7 +407,7 @@ Data_86a85:: ; 86a85 (21:6a85)
 
 	INCBIN "data/maps/map85.bin"
 
-Data_86b28:: ; 86b28 (21:6b28)
+ScytherIntroTilemap:: ; 86b28 (21:6b28)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -415,7 +415,7 @@ Data_86b28:: ; 86b28 (21:6b28)
 
 	INCBIN "data/maps/map86.bin"
 
-Data_86b99:: ; 86b99 (21:6b99)
+ScytherIntroCGBTilemap:: ; 86b99 (21:6b99)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -423,7 +423,7 @@ Data_86b99:: ; 86b99 (21:6b99)
 
 	INCBIN "data/maps/map87.bin"
 
-Data_86c34:: ; 86c34 (21:6c34)
+AerodactylIntroTilemap:: ; 86c34 (21:6c34)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -431,7 +431,7 @@ Data_86c34:: ; 86c34 (21:6c34)
 
 	INCBIN "data/maps/map88.bin"
 
-Data_86ca5:: ; 86ca5 (21:6ca5)
+AerodactylIntroCGBTilemap:: ; 86ca5 (21:6ca5)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -439,7 +439,7 @@ Data_86ca5:: ; 86ca5 (21:6ca5)
 
 	INCBIN "data/maps/map89.bin"
 
-Data_86d37:: ; 86d37 (21:6d37)
+TitleScreen1Tilemap:: ; 86d37 (21:6d37)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -447,7 +447,7 @@ Data_86d37:: ; 86d37 (21:6d37)
 
 	INCBIN "data/maps/map90.bin"
 
-Data_86dcc:: ; 86dcc (21:6dcc)
+TitleScreen2Tilemap:: ; 86dcc (21:6dcc)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -455,7 +455,7 @@ Data_86dcc:: ; 86dcc (21:6dcc)
 
 	INCBIN "data/maps/map91.bin"
 
-Data_86e8a:: ; 86e8a (21:6e8a)
+SolidTiles1Tilemap:: ; 86e8a (21:6e8a)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -463,7 +463,7 @@ Data_86e8a:: ; 86e8a (21:6e8a)
 
 	INCBIN "data/maps/map92.bin"
 
-Data_86f18:: ; 86f18 (21:6f18)
+SolidTiles2Tilemap:: ; 86f18 (21:6f18)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -471,7 +471,7 @@ Data_86f18:: ; 86f18 (21:6f18)
 
 	INCBIN "data/maps/map93.bin"
 
-Data_86fc0:: ; 86fc0 (21:6fc0)
+SolidTiles3Tilemap:: ; 86fc0 (21:6fc0)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -479,7 +479,7 @@ Data_86fc0:: ; 86fc0 (21:6fc0)
 
 	INCBIN "data/maps/map94.bin"
 
-Data_8704f:: ; 8704f (21:704f)
+TitleScreen3Tilemap:: ; 8704f (21:704f)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -487,7 +487,7 @@ Data_8704f:: ; 8704f (21:704f)
 
 	INCBIN "data/maps/map95.bin"
 
-Data_871a5:: ; 871a5 (21:71a5)
+TitleScreen4Tilemap:: ; 871a5 (21:71a5)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -495,7 +495,7 @@ Data_871a5:: ; 871a5 (21:71a5)
 
 	INCBIN "data/maps/map96.bin"
 
-Data_87397:: ; 87397 (21:7397)
+SolidTiles4Tilemap:: ; 87397 (21:7397)
 	db $08 ; width
 	db $04 ; height
 	dw $0000
@@ -503,7 +503,7 @@ Data_87397:: ; 87397 (21:7397)
 
 	INCBIN "data/maps/map97.bin"
 
-Data_873b7:: ; 873b7 (21:73b7)
+PlayerTilemap:: ; 873b7 (21:73b7)
 	db $06 ; width
 	db $06 ; height
 	dw $0000
@@ -511,7 +511,7 @@ Data_873b7:: ; 873b7 (21:73b7)
 
 	INCBIN "data/maps/map98.bin"
 
-Data_873e5:: ; 873e5 (21:73e5)
+OpponentTilemap:: ; 873e5 (21:73e5)
 	db $06 ; width
 	db $06 ; height
 	dw $0000
@@ -519,7 +519,7 @@ Data_873e5:: ; 873e5 (21:73e5)
 
 	INCBIN "data/maps/map99.bin"
 
-Data_87413:: ; 87413 (21:7413)
+TitleScreen5Tilemap:: ; 87413 (21:7413)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -527,7 +527,7 @@ Data_87413:: ; 87413 (21:7413)
 
 	INCBIN "data/maps/map100.bin"
 
-Data_87538:: ; 87538 (21:7538)
+TitleScreen6Tilemap:: ; 87538 (21:7538)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -535,7 +535,7 @@ Data_87538:: ; 87538 (21:7538)
 
 	INCBIN "data/maps/map101.bin"
 
-Data_8769f:: ; 8769f (21:769f)
+CopyrightTilemap:: ; 8769f (21:769f)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -543,7 +543,7 @@ Data_8769f:: ; 8769f (21:769f)
 
 	INCBIN "data/maps/map102.bin"
 
-Data_876f6:: ; 876f6 (21:76f6)
+CopyrightCGBTilemap:: ; 876f6 (21:76f6)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -551,7 +551,7 @@ Data_876f6:: ; 876f6 (21:76f6)
 
 	INCBIN "data/maps/map103.bin"
 
-Data_8777c:: ; 8777c (21:777c)
+NintendoTilemap:: ; 8777c (21:777c)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -559,7 +559,7 @@ Data_8777c:: ; 8777c (21:777c)
 
 	INCBIN "data/maps/map104.bin"
 
-Data_877c4:: ; 877c4 (21:77c4)
+CompaniesTilemap:: ; 877c4 (21:77c4)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
diff --git a/src/wram.asm b/src/wram.asm
index 4b18de1..2e26262 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -2082,7 +2082,9 @@ wBGMapWidth:: ; d12f
 wBGMapHeight:: ; d130
 	ds $1
 
-wd131:: ; d131
+; current tilemap to load
+; TILEMAP_* constant
+wCurTilemap:: ; d131
 	ds $1
 
 wd132:: ; d132
-- 
cgit v1.2.3


From 68fbfa0d8e891794037852595b1ca47464905f90 Mon Sep 17 00:00:00 2001
From: ElectroDeoxys <ElectroDeoxys@gmail.com>
Date: Sat, 13 Feb 2021 09:04:22 +0000
Subject: Label Tilemap data

---
 src/constants.asm                   |   1 +
 src/constants/tilemap_constants.asm | 107 +++++++++++++
 src/data/map_headers.asm            |  68 ++++----
 src/engine/bank07.asm               |  15 +-
 src/engine/bank20.asm               | 312 ++++++++++++++++++------------------
 src/engine/home.asm                 |   2 +-
 src/gfx.asm                         | 130 +++++++--------
 src/wram.asm                        |   4 +-
 8 files changed, 376 insertions(+), 263 deletions(-)
 create mode 100644 src/constants/tilemap_constants.asm

diff --git a/src/constants.asm b/src/constants.asm
index efa44fb..733dd8c 100644
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -18,6 +18,7 @@ INCLUDE "constants/sgb_constants.asm"
 INCLUDE "constants/sfx_constants.asm"
 INCLUDE "constants/sprite_constants.asm"
 INCLUDE "constants/text_constants.asm"
+INCLUDE "constants/tilemap_constants.asm"
 INCLUDE "constants/tileset_constants.asm"
 INCLUDE "constants/animation_constants.asm"
 INCLUDE "constants/attack_animation_constants.asm"
diff --git a/src/constants/tilemap_constants.asm b/src/constants/tilemap_constants.asm
new file mode 100644
index 0000000..cb12931
--- /dev/null
+++ b/src/constants/tilemap_constants.asm
@@ -0,0 +1,107 @@
+	const_def
+	const TILEMAP_OVERWORLD_MAP               ; $00
+	const TILEMAP_OVERWORLD_MAP_CGB           ; $01
+	const TILEMAP_MASON_LABORATORY            ; $02
+	const TILEMAP_MASON_LABORATORY_CGB        ; $03
+	const TILEMAP_UNUSED_1                    ; $04
+	const TILEMAP_UNUSED_2                    ; $05
+	const TILEMAP_DECK_MACHINE_ROOM           ; $06
+	const TILEMAP_DECK_MACHINE_ROOM_CGB       ; $07
+	const TILEMAP_UNUSED_3                    ; $08
+	const TILEMAP_UNUSED_4                    ; $09
+	const TILEMAP_ISHIHARA                    ; $0a
+	const TILEMAP_ISHIHARA_CGB                ; $0b
+	const TILEMAP_FIGHTING_CLUB_ENTRANCE      ; $0c
+	const TILEMAP_FIGHTING_CLUB_ENTRANCE_CGB  ; $0d
+	const TILEMAP_ROCK_CLUB_ENTRANCE          ; $0e
+	const TILEMAP_ROCK_CLUB_ENTRANCE_CGB      ; $0f
+	const TILEMAP_WATER_CLUB_ENTRANCE         ; $10
+	const TILEMAP_WATER_CLUB_ENTRANCE_CGB     ; $11
+	const TILEMAP_LIGHTNING_CLUB_ENTRANCE     ; $12
+	const TILEMAP_LIGHTNING_CLUB_ENTRANCE_CGB ; $13
+	const TILEMAP_GRASS_CLUB_ENTRANCE         ; $14
+	const TILEMAP_GRASS_CLUB_ENTRANCE_CGB     ; $15
+	const TILEMAP_PSYCHIC_CLUB_ENTRANCE       ; $16
+	const TILEMAP_PSYCHIC_CLUB_ENTRANCE_CGB   ; $17
+	const TILEMAP_SCIENCE_CLUB_ENTRANCE       ; $18
+	const TILEMAP_SCIENCE_CLUB_ENTRANCE_CGB   ; $19
+	const TILEMAP_FIRE_CLUB_ENTRANCE          ; $1a
+	const TILEMAP_FIRE_CLUB_ENTRANCE_CGB      ; $1b
+	const TILEMAP_CHALLENGE_HALL_ENTRANCE     ; $1c
+	const TILEMAP_CHALLENGE_HALL_ENTRANCE_CGB ; $1d
+	const TILEMAP_CLUB_LOBBY                  ; $1e
+	const TILEMAP_CLUB_LOBBY_CGB              ; $1f
+	const TILEMAP_FIGHTING_CLUB               ; $20
+	const TILEMAP_FIGHTING_CLUB_CGB           ; $21
+	const TILEMAP_ROCK_CLUB                   ; $22
+	const TILEMAP_ROCK_CLUB_CGB               ; $23
+	const TILEMAP_WATER_CLUB                  ; $24
+	const TILEMAP_WATER_CLUB_CGB              ; $25
+	const TILEMAP_LIGHTNING_CLUB              ; $26
+	const TILEMAP_LIGHTNING_CLUB_CGB          ; $27
+	const TILEMAP_GRASS_CLUB                  ; $28
+	const TILEMAP_GRASS_CLUB_CGB              ; $29
+	const TILEMAP_PSYCHIC_CLUB                ; $2a
+	const TILEMAP_PSYCHIC_CLUB_CGB            ; $2b
+	const TILEMAP_SCIENCE_CLUB                ; $2c
+	const TILEMAP_SCIENCE_CLUB_CGB            ; $2d
+	const TILEMAP_FIRE_CLUB                   ; $2e
+	const TILEMAP_FIRE_CLUB_CGB               ; $2f
+	const TILEMAP_CHALLENGE_HALL              ; $30
+	const TILEMAP_CHALLENGE_HALL_CGB          ; $31
+	const TILEMAP_POKEMON_DOME_ENTRANCE       ; $32
+	const TILEMAP_POKEMON_DOME_ENTRANCE_CGB   ; $33
+	const TILEMAP_UNUSED_5                    ; $34
+	const TILEMAP_UNUSED_6                    ; $35
+	const TILEMAP_POKEMON_DOME                ; $36
+	const TILEMAP_POKEMON_DOME_CGB            ; $37
+	const TILEMAP_UNUSED_7                    ; $38
+	const TILEMAP_UNUSED_8                    ; $39
+	const TILEMAP_HALL_OF_HONOR               ; $3a
+	const TILEMAP_HALL_OF_HONOR_CGB           ; $3b
+	const TILEMAP_CARD_POP_1                  ; $3c
+	const TILEMAP_CARD_POP_1_CGB              ; $3d
+	const TILEMAP_GRASS_MEDAL                 ; $3e
+	const TILEMAP_SCIENCE_MEDAL               ; $3f
+	const TILEMAP_FIRE_MEDAL                  ; $40
+	const TILEMAP_WATER_MEDAL                 ; $41
+	const TILEMAP_LIGHTNING_MEDAL             ; $42
+	const TILEMAP_FIGHTING_MEDAL              ; $43
+	const TILEMAP_ROCK_MEDAL                  ; $44
+	const TILEMAP_PSYCHIC_MEDAL               ; $45
+	const TILEMAP_CARD_POP_2                  ; $46
+	const TILEMAP_CARD_POP_2_CGB              ; $47
+	const TILEMAP_CARD_POP_2_UNKNOWN_1        ; $48
+	const TILEMAP_CARD_POP_2_UNKNOWN_2        ; $49
+	const TILEMAP_CARD_POP_3                  ; $4a
+	const TILEMAP_CARD_POP_3_CGB              ; $4b
+	const TILEMAP_COLOSSEUM                   ; $4c
+	const TILEMAP_COLOSSEUM_CGB               ; $4d
+	const TILEMAP_EVOLUTION                   ; $4e
+	const TILEMAP_EVOLUTION_CGB               ; $4f
+	const TILEMAP_MYSTERY                     ; $50
+	const TILEMAP_MYSTERY_CGB                 ; $51
+	const TILEMAP_LABORATORY                  ; $52
+	const TILEMAP_LABORATORY_CGB              ; $53
+	const TILEMAP_CHARIZARD_INTRO             ; $54
+	const TILEMAP_CHARIZARD_INTRO_CGB         ; $55
+	const TILEMAP_SCYTHER_INTRO               ; $56
+	const TILEMAP_SCYTHER_INTRO_CGB           ; $57
+	const TILEMAP_AERODACTYL_INTRO            ; $58
+	const TILEMAP_AERODACTYL_INTRO_CGB        ; $59
+	const TILEMAP_TITLE_SCREEN_1              ; $5a
+	const TILEMAP_TITLE_SCREEN_2              ; $5b
+	const TILEMAP_SOLID_TILES_1               ; $5c
+	const TILEMAP_SOLID_TILES_2               ; $5d
+	const TILEMAP_SOLID_TILES_3               ; $5e
+	const TILEMAP_TITLE_SCREEN_3              ; $5f
+	const TILEMAP_TITLE_SCREEN_4              ; $60
+	const TILEMAP_SOLID_TILES_4               ; $61
+	const TILEMAP_PLAYER                      ; $62
+	const TILEMAP_OPPONENT                    ; $63
+	const TILEMAP_TITLE_SCREEN_5              ; $64
+	const TILEMAP_TITLE_SCREEN_6              ; $65
+	const TILEMAP_COPYRIGHT                   ; $66
+	const TILEMAP_COPYRIGHT_CGB               ; $67
+	const TILEMAP_NINTENDO                    ; $68
+	const TILEMAP_COMPANIES                   ; $69
diff --git a/src/data/map_headers.asm b/src/data/map_headers.asm
index 06a2e20..3204bbf 100644
--- a/src/data/map_headers.asm
+++ b/src/data/map_headers.asm
@@ -1,37 +1,37 @@
 ; TODO: figure out the rest of the data for each map
 ; related to the table at 20:4e5d
 MapHeaders: ; 1c374 (7:4374)
-	db $00,$01,$00,$01,$01,MUSIC_OVERWORLD     ; OVERWORLD_MAP
-	db $02,$03,$00,$02,$02,MUSIC_OVERWORLD     ; MASON_LABORATORY
-	db $06,$07,$00,$02,$02,MUSIC_OVERWORLD     ; DECK_MACHINE_ROOM
-	db $0A,$0B,$00,$03,$03,MUSIC_OVERWORLD     ; ISHIHARAS_HOUSE
-	db $0C,$0D,$00,$03,$04,MUSIC_OVERWORLD     ; FIGHTING_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; FIGHTING_CLUB_LOBBY
-	db $20,$21,$00,$04,$0D,MUSIC_CLUB_3        ; FIGHTING_CLUB
-	db $0E,$0F,$00,$03,$05,MUSIC_OVERWORLD     ; ROCK_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; ROCK_CLUB_LOBBY
-	db $22,$23,$00,$04,$0E,MUSIC_CLUB_2        ; ROCK_CLUB
-	db $10,$11,$00,$03,$06,MUSIC_OVERWORLD     ; WATER_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; WATER_CLUB_LOBBY
-	db $24,$25,$00,$02,$0F,MUSIC_CLUB_2        ; WATER_CLUB
-	db $12,$13,$00,$03,$07,MUSIC_OVERWORLD     ; LIGHTNING_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; LIGHTNING_CLUB_LOBBY
-	db $26,$27,$00,$05,$10,MUSIC_CLUB_1        ; LIGHTNING_CLUB
-	db $14,$15,$00,$03,$08,MUSIC_OVERWORLD     ; GRASS_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; GRASS_CLUB_LOBBY
-	db $28,$29,$00,$06,$11,MUSIC_CLUB_1        ; GRASS_CLUB
-	db $16,$17,$00,$03,$09,MUSIC_OVERWORLD     ; PSYCHIC_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; PSYCHIC_CLUB_LOBBY
-	db $2A,$2B,$00,$07,$12,MUSIC_CLUB_2        ; PSYCHIC_CLUB
-	db $18,$19,$00,$03,$0A,MUSIC_OVERWORLD     ; SCIENCE_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; SCIENCE_CLUB_LOBBY
-	db $2C,$2D,$00,$06,$13,MUSIC_CLUB_3        ; SCIENCE_CLUB
-	db $1A,$1B,$00,$03,$0B,MUSIC_OVERWORLD     ; FIRE_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; FIRE_CLUB_LOBBY
-	db $2E,$2F,$00,$08,$14,MUSIC_CLUB_3        ; FIRE_CLUB
-	db $1C,$1D,$00,$03,$04,MUSIC_OVERWORLD     ; CHALLENGE_HALL_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; CHALLENGE_HALL_LOBBY
-	db $30,$31,$00,$09,$15,MUSIC_OVERWORLD     ; CHALLENGE_HALL
-	db $32,$33,$00,$0A,$16,MUSIC_OVERWORLD     ; POKEMON_DOME_ENTRANCE
-	db $36,$37,$00,$0A,$17,MUSIC_POKEMON_DOME  ; POKEMON_DOME
-	db $3A,$3B,$00,$0A,$18,MUSIC_HALL_OF_HONOR ; HALL_OF_HONOR
+	db TILEMAP_OVERWORLD_MAP,           TILEMAP_OVERWORLD_MAP_CGB,           $00, $01, $01, MUSIC_OVERWORLD     ; OVERWORLD_MAP
+	db TILEMAP_MASON_LABORATORY,        TILEMAP_MASON_LABORATORY_CGB,        $00, $02, $02, MUSIC_OVERWORLD     ; MASON_LABORATORY
+	db TILEMAP_DECK_MACHINE_ROOM,       TILEMAP_DECK_MACHINE_ROOM_CGB,       $00, $02, $02, MUSIC_OVERWORLD     ; DECK_MACHINE_ROOM
+	db TILEMAP_ISHIHARA,                TILEMAP_ISHIHARA_CGB,                $00, $03, $03, MUSIC_OVERWORLD     ; ISHIHARAS_HOUSE
+	db TILEMAP_FIGHTING_CLUB_ENTRANCE,  TILEMAP_FIGHTING_CLUB_ENTRANCE_CGB,  $00, $03, $04, MUSIC_OVERWORLD     ; FIGHTING_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; FIGHTING_CLUB_LOBBY
+	db TILEMAP_FIGHTING_CLUB,           TILEMAP_FIGHTING_CLUB_CGB,           $00, $04, $0d, MUSIC_CLUB_3        ; FIGHTING_CLUB
+	db TILEMAP_ROCK_CLUB_ENTRANCE,      TILEMAP_ROCK_CLUB_ENTRANCE_CGB,      $00, $03, $05, MUSIC_OVERWORLD     ; ROCK_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; ROCK_CLUB_LOBBY
+	db TILEMAP_ROCK_CLUB,               TILEMAP_ROCK_CLUB_CGB,               $00, $04, $0e, MUSIC_CLUB_2        ; ROCK_CLUB
+	db TILEMAP_WATER_CLUB_ENTRANCE,     TILEMAP_WATER_CLUB_ENTRANCE_CGB,     $00, $03, $06, MUSIC_OVERWORLD     ; WATER_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; WATER_CLUB_LOBBY
+	db TILEMAP_WATER_CLUB,              TILEMAP_WATER_CLUB_CGB,              $00, $02, $0f, MUSIC_CLUB_2        ; WATER_CLUB
+	db TILEMAP_LIGHTNING_CLUB_ENTRANCE, TILEMAP_LIGHTNING_CLUB_ENTRANCE_CGB, $00, $03, $07, MUSIC_OVERWORLD     ; LIGHTNING_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; LIGHTNING_CLUB_LOBBY
+	db TILEMAP_LIGHTNING_CLUB,          TILEMAP_LIGHTNING_CLUB_CGB,          $00, $05, $10, MUSIC_CLUB_1        ; LIGHTNING_CLUB
+	db TILEMAP_GRASS_CLUB_ENTRANCE,     TILEMAP_GRASS_CLUB_ENTRANCE_CGB,     $00, $03, $08, MUSIC_OVERWORLD     ; GRASS_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; GRASS_CLUB_LOBBY
+	db TILEMAP_GRASS_CLUB,              TILEMAP_GRASS_CLUB_CGB,              $00, $06, $11, MUSIC_CLUB_1        ; GRASS_CLUB
+	db TILEMAP_PSYCHIC_CLUB_ENTRANCE,   TILEMAP_PSYCHIC_CLUB_ENTRANCE_CGB,   $00, $03, $09, MUSIC_OVERWORLD     ; PSYCHIC_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; PSYCHIC_CLUB_LOBBY
+	db TILEMAP_PSYCHIC_CLUB,            TILEMAP_PSYCHIC_CLUB_CGB,            $00, $07, $12, MUSIC_CLUB_2        ; PSYCHIC_CLUB
+	db TILEMAP_SCIENCE_CLUB_ENTRANCE,   TILEMAP_SCIENCE_CLUB_ENTRANCE_CGB,   $00, $03, $0a, MUSIC_OVERWORLD     ; SCIENCE_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; SCIENCE_CLUB_LOBBY
+	db TILEMAP_SCIENCE_CLUB,            TILEMAP_SCIENCE_CLUB_CGB,            $00, $06, $13, MUSIC_CLUB_3        ; SCIENCE_CLUB
+	db TILEMAP_FIRE_CLUB_ENTRANCE,      TILEMAP_FIRE_CLUB_ENTRANCE_CGB,      $00, $03, $0b, MUSIC_OVERWORLD     ; FIRE_CLUB_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; FIRE_CLUB_LOBBY
+	db TILEMAP_FIRE_CLUB,               TILEMAP_FIRE_CLUB_CGB,               $00, $08, $14, MUSIC_CLUB_3        ; FIRE_CLUB
+	db TILEMAP_CHALLENGE_HALL_ENTRANCE, TILEMAP_CHALLENGE_HALL_ENTRANCE_CGB, $00, $03, $04, MUSIC_OVERWORLD     ; CHALLENGE_HALL_ENTRANCE
+	db TILEMAP_CLUB_LOBBY,              TILEMAP_CLUB_LOBBY_CGB,              $00, $03, $0c, MUSIC_OVERWORLD     ; CHALLENGE_HALL_LOBBY
+	db TILEMAP_CHALLENGE_HALL,          TILEMAP_CHALLENGE_HALL_CGB,          $00, $09, $15, MUSIC_OVERWORLD     ; CHALLENGE_HALL
+	db TILEMAP_POKEMON_DOME_ENTRANCE,   TILEMAP_POKEMON_DOME_ENTRANCE_CGB,   $00, $0a, $16, MUSIC_OVERWORLD     ; POKEMON_DOME_ENTRANCE
+	db TILEMAP_POKEMON_DOME,            TILEMAP_POKEMON_DOME_CGB,            $00, $0a, $17, MUSIC_POKEMON_DOME  ; POKEMON_DOME
+	db TILEMAP_HALL_OF_HONOR,           TILEMAP_HALL_OF_HONOR_CGB,           $00, $0a, $18, MUSIC_HALL_OF_HONOR ; HALL_OF_HONOR
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index dc4a8c8..02590a8 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -64,7 +64,7 @@ Func_1c33b: ; 1c33b (7:433b)
 	ld hl, MapHeaders
 	add hl, bc
 	ld a, [hli]
-	ld [wd131], a
+	ld [wCurTilemap], a
 	ld a, [hli]
 	ld c, a
 	ld a, [hli]
@@ -75,14 +75,17 @@ Func_1c33b: ; 1c33b (7:433b)
 	ld [wd290], a
 	ld a, [hli]
 	ld [wd111], a
+
 	ld a, [wConsole]
-	cp $2
-	jr nz, .asm_1c370
+	cp CONSOLE_CGB
+	jr nz, .got_tilemap
+	; use CGB variant, if valid
 	ld a, c
 	or a
-	jr z, .asm_1c370
-	ld [wd131], a
-.asm_1c370
+	jr z, .got_tilemap
+	ld [wCurTilemap], a
+.got_tilemap
+
 	pop de
 	pop bc
 	pop hl
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 8039177..078d4b2 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -625,10 +625,10 @@ LoadTilesetGfx: ; 802d4 (20:42d4)
 	ret
 ; 0x803b9
 
-; gets pointer to BG map with ID from wd131
+; gets pointer to BG map with ID from wCurTilemap
 Func_803b9: ; 803b9 (20:43b9)
 	ld l, $00
-	ld a, [wd131]
+	ld a, [wCurTilemap]
 	call GetMapDataPointer
 	call LoadGraphicsPointerFromHL
 	ld a, [hl]
@@ -845,7 +845,7 @@ Func_80baa: ; 80baa (20:4baa)
 	push bc
 	push de
 	ld c, a
-	ld a, [wd131]
+	ld a, [wCurTilemap]
 	push af
 	ld a, [wd23d]
 	push af
@@ -882,7 +882,7 @@ Func_80baa: ; 80baa (20:4baa)
 
 .asm_80be7
 	ld a, [hl]
-	ld [wd131], a
+	ld [wCurTilemap], a
 	push bc
 	farcall Func_80082
 	pop bc
@@ -908,7 +908,7 @@ Func_80baa: ; 80baa (20:4baa)
 	pop af
 	ld [wd23d], a
 	pop af
-	ld [wd131], a
+	ld [wCurTilemap], a
 	pop de
 	pop bc
 	pop hl
@@ -925,7 +925,7 @@ SpriteNullAnimationFrame:
 
 ; might be closer to "screen specific data" than map data
 MapDataPointers: ; 80e5d (20:4e5d)
-	dw MapDataPointers_80e67
+	dw Tilemaps
 	dw Tilesets
 	dw MapDataPointers_8116b
 	dw SpriteAnimationPointers
@@ -933,118 +933,118 @@ MapDataPointers: ; 80e5d (20:4e5d)
 
 ; \1 = pointer
 ; \2 = tileset
-macro_80e67: MACRO
-	dwb \1, BANK(\1) - BANK(MapDataPointers_80e67)
+tilemap: MACRO
+	dwb \1, BANK(\1) - BANK(Tilemaps)
 	db \2
 ENDM
 
-MapDataPointers_80e67: ; 80e67 (20:4e67)
-	macro_80e67 Data_8191b, TILESET_OVERWORLD_MAP         ; 0
-	macro_80e67 Data_81a22, TILESET_OVERWORLD_MAP         ; 1
-	macro_80e67 Data_81c13, TILESET_MASON_LABORATORY      ; 2
-	macro_80e67 Data_81d2e, TILESET_MASON_LABORATORY      ; 3
-	macro_80e67 Data_81ed1, TILESET_MASON_LABORATORY      ; 4
-	macro_80e67 Data_81ef5, TILESET_MASON_LABORATORY      ; 5
-	macro_80e67 Data_81f26, TILESET_MASON_LABORATORY      ; 6
-	macro_80e67 Data_81feb, TILESET_MASON_LABORATORY      ; 7
-	macro_80e67 Data_82143, TILESET_MASON_LABORATORY      ; 8
-	macro_80e67 Data_82150, TILESET_MASON_LABORATORY      ; 9
-	macro_80e67 Data_82160, TILESET_ISHIHARA              ; 10
-	macro_80e67 Data_82222, TILESET_ISHIHARA              ; 11
-	macro_80e67 Data_82336, TILESET_CLUB_ENTRANCE         ; 12
-	macro_80e67 Data_82400, TILESET_CLUB_ENTRANCE         ; 13
-	macro_80e67 Data_8251d, TILESET_CLUB_ENTRANCE         ; 14
-	macro_80e67 Data_825e7, TILESET_CLUB_ENTRANCE         ; 15
-	macro_80e67 Data_82704, TILESET_CLUB_ENTRANCE         ; 16
-	macro_80e67 Data_827ce, TILESET_CLUB_ENTRANCE         ; 17
-	macro_80e67 Data_828eb, TILESET_CLUB_ENTRANCE         ; 18
-	macro_80e67 Data_829b5, TILESET_CLUB_ENTRANCE         ; 19
-	macro_80e67 Data_82ad2, TILESET_CLUB_ENTRANCE         ; 20
-	macro_80e67 Data_82b9c, TILESET_CLUB_ENTRANCE         ; 21
-	macro_80e67 Data_82cb9, TILESET_CLUB_ENTRANCE         ; 22
-	macro_80e67 Data_82d83, TILESET_CLUB_ENTRANCE         ; 23
-	macro_80e67 Data_82ea0, TILESET_CLUB_ENTRANCE         ; 24
-	macro_80e67 Data_82f6a, TILESET_CLUB_ENTRANCE         ; 25
-	macro_80e67 Data_83087, TILESET_CLUB_ENTRANCE         ; 26
-	macro_80e67 Data_83151, TILESET_CLUB_ENTRANCE         ; 27
-	macro_80e67 Data_8326e, TILESET_CLUB_ENTRANCE         ; 28
-	macro_80e67 Data_83321, TILESET_CLUB_ENTRANCE         ; 29
-	macro_80e67 Data_83424, TILESET_CLUB_LOBBY            ; 30
-	macro_80e67 Data_83545, TILESET_CLUB_LOBBY            ; 31
-	macro_80e67 Data_836db, TILESET_FIGHTING_CLUB         ; 32
-	macro_80e67 Data_8378c, TILESET_FIGHTING_CLUB         ; 33
-	macro_80e67 Data_8388d, TILESET_ROCK_CLUB             ; 34
-	macro_80e67 Data_839d6, TILESET_ROCK_CLUB             ; 35
-	macro_80e67 Data_84000, TILESET_WATER_CLUB            ; 36
-	macro_80e67 Data_84188, TILESET_WATER_CLUB            ; 37
-	macro_80e67 Data_843bb, TILESET_LIGHTNING_CLUB        ; 38
-	macro_80e67 Data_84533, TILESET_LIGHTNING_CLUB        ; 39
-	macro_80e67 Data_8472e, TILESET_GRASS_CLUB            ; 40
-	macro_80e67 Data_848d8, TILESET_GRASS_CLUB            ; 41
-	macro_80e67 Data_84b73, TILESET_PSYCHIC_CLUB          ; 42
-	macro_80e67 Data_84c6f, TILESET_PSYCHIC_CLUB          ; 43
-	macro_80e67 Data_84dfe, TILESET_SCIENCE_CLUB          ; 44
-	macro_80e67 Data_84f1d, TILESET_SCIENCE_CLUB          ; 45
-	macro_80e67 Data_850b6, TILESET_FIRE_CLUB             ; 46
-	macro_80e67 Data_85191, TILESET_FIRE_CLUB             ; 47
-	macro_80e67 Data_85315, TILESET_CHALLENGE_HALL        ; 48
-	macro_80e67 Data_854b3, TILESET_CHALLENGE_HALL        ; 49
-	macro_80e67 Data_8570a, TILESET_POKEMON_DOME_ENTRANCE ; 50
-	macro_80e67 Data_857ce, TILESET_POKEMON_DOME_ENTRANCE ; 51
-	macro_80e67 Data_83bf1, TILESET_POKEMON_DOME_ENTRANCE ; 52
-	macro_80e67 Data_83c03, TILESET_POKEMON_DOME_ENTRANCE ; 53
-	macro_80e67 Data_858ef, TILESET_POKEMON_DOME          ; 54
-	macro_80e67 Data_85a79, TILESET_POKEMON_DOME          ; 55
-	macro_80e67 Data_83c1a, TILESET_POKEMON_DOME          ; 56
-	macro_80e67 Data_83c26, TILESET_POKEMON_DOME          ; 57
-	macro_80e67 Data_85ce2, TILESET_HALL_OF_HONOR         ; 58
-	macro_80e67 Data_85df4, TILESET_HALL_OF_HONOR         ; 59
-	macro_80e67 Data_85f7c, TILESET_CARD_POP_1            ; 60
-	macro_80e67 Data_8607f, TILESET_CARD_POP_1            ; 61
-	macro_80e67 Data_83c36, TILESET_MEDAL                 ; 62
-	macro_80e67 Data_8617d, TILESET_MEDAL                 ; 63
-	macro_80e67 Data_86193, TILESET_MEDAL                 ; 64
-	macro_80e67 Data_861a9, TILESET_MEDAL                 ; 65
-	macro_80e67 Data_861bf, TILESET_MEDAL                 ; 66
-	macro_80e67 Data_861d5, TILESET_MEDAL                 ; 67
-	macro_80e67 Data_861eb, TILESET_MEDAL                 ; 68
-	macro_80e67 Data_86201, TILESET_MEDAL                 ; 69
-	macro_80e67 Data_86217, TILESET_CARD_POP_2            ; 70
-	macro_80e67 Data_862da, TILESET_CARD_POP_2            ; 71
-	macro_80e67 Data_86364, TILESET_CARD_POP_2            ; 72
-	macro_80e67 Data_86443, TILESET_CARD_POP_2            ; 73
-	macro_80e67 Data_864df, TILESET_CARD_POP_3            ; 74
-	macro_80e67 Data_865b5, TILESET_CARD_POP_3            ; 75
-	macro_80e67 Data_86647, TILESET_COLOSSEUM_1           ; 76
-	macro_80e67 Data_866b8, TILESET_COLOSSEUM_2           ; 77
-	macro_80e67 Data_8673e, TILESET_EVOLUTION_1           ; 78
-	macro_80e67 Data_867af, TILESET_EVOLUTION_2           ; 79
-	macro_80e67 Data_86833, TILESET_MYSTERY_1             ; 80
-	macro_80e67 Data_868a4, TILESET_MYSTERY_2             ; 81
-	macro_80e67 Data_86925, TILESET_LABORATORY_1          ; 82
-	macro_80e67 Data_86996, TILESET_LABORATORY_2          ; 83
-	macro_80e67 Data_86a14, TILESET_CHARIZARD_INTRO_1     ; 84
-	macro_80e67 Data_86a85, TILESET_CHARIZARD_INTRO_2     ; 85
-	macro_80e67 Data_86b28, TILESET_SCYTHER_INTRO_1       ; 86
-	macro_80e67 Data_86b99, TILESET_SCYTHER_INTRO_2       ; 87
-	macro_80e67 Data_86c34, TILESET_AERODACTYL_INTRO_1    ; 88
-	macro_80e67 Data_86ca5, TILESET_AERODACTYL_INTRO_2    ; 89
-	macro_80e67 Data_86d37, TILESET_TITLE_SCREEN_1        ; 90
-	macro_80e67 Data_86dcc, TILESET_TITLE_SCREEN_2        ; 91
-	macro_80e67 Data_86e8a, TILESET_SOLID_TILES_1         ; 92
-	macro_80e67 Data_86f18, TILESET_SOLID_TILES_1         ; 93
-	macro_80e67 Data_86fc0, TILESET_SOLID_TILES_1         ; 94
-	macro_80e67 Data_8704f, TILESET_TITLE_SCREEN_3        ; 95
-	macro_80e67 Data_871a5, TILESET_TITLE_SCREEN_4        ; 96
-	macro_80e67 Data_87397, TILESET_SOLID_TILES_2         ; 97
-	macro_80e67 Data_873b7, TILESET_PLAYER                ; 98
-	macro_80e67 Data_873e5, TILESET_RONALD                ; 99
-	macro_80e67 Data_87413, TILESET_TITLE_SCREEN_5        ; 100
-	macro_80e67 Data_87538, TILESET_TITLE_SCREEN_6        ; 101
-	macro_80e67 Data_8769f, TILESET_COPYRIGHT             ; 102
-	macro_80e67 Data_876f6, TILESET_COPYRIGHT             ; 103
-	macro_80e67 Data_8777c, TILESET_NINTENDO              ; 104
-	macro_80e67 Data_877c4, TILESET_COMPANIES             ; 105
+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 Unused1Tilemap,                  TILESET_MASON_LABORATORY      ; TILEMAP_UNUSED_1
+	tilemap Unused2Tilemap,                  TILESET_MASON_LABORATORY      ; TILEMAP_UNUSED_2
+	tilemap DeckMachineRoomTilemap,          TILESET_MASON_LABORATORY      ; TILEMAP_DECK_MACHINE_ROOM
+	tilemap DeckMachineRoomCGBTilemap,       TILESET_MASON_LABORATORY      ; TILEMAP_DECK_MACHINE_ROOM_CGB
+	tilemap Unused3Tilemap,                  TILESET_MASON_LABORATORY      ; TILEMAP_UNUSED_3
+	tilemap Unused4Tilemap,                  TILESET_MASON_LABORATORY      ; TILEMAP_UNUSED_4
+	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 Unused5Tilemap,                  TILESET_POKEMON_DOME_ENTRANCE ; TILEMAP_UNUSED_5
+	tilemap Unused6Tilemap,                  TILESET_POKEMON_DOME_ENTRANCE ; TILEMAP_UNUSED_6
+	tilemap PokemonDomeTilemap,              TILESET_POKEMON_DOME          ; TILEMAP_POKEMON_DOME
+	tilemap PokemonDomeGBTilemap,            TILESET_POKEMON_DOME          ; TILEMAP_POKEMON_DOME_CGB
+	tilemap Unused7Tilemap,                  TILESET_POKEMON_DOME          ; TILEMAP_UNUSED_7
+	tilemap Unused8Tilemap,                  TILESET_POKEMON_DOME          ; TILEMAP_UNUSED_8
+	tilemap HallOfHonorTilemap,              TILESET_HALL_OF_HONOR         ; TILEMAP_HALL_OF_HONOR
+	tilemap HallOfHonorCGBTilemap,           TILESET_HALL_OF_HONOR         ; TILEMAP_HALL_OF_HONOR_CGB
+	tilemap CardPop1Tilemap,                 TILESET_CARD_POP_1            ; TILEMAP_CARD_POP_1
+	tilemap CardPop1CGBTilemap,              TILESET_CARD_POP_1            ; TILEMAP_CARD_POP_1_CGB
+	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 CardPop2Tilemap,                 TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2
+	tilemap CardPop2CGBTilemap,              TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2_CGB
+	tilemap CardPop2Unknown1Tilemap,         TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2_UNKNOWN_1
+	tilemap CardPop2Unknown2Tilemap,         TILESET_CARD_POP_2            ; TILEMAP_CARD_POP_2_UNKNOWN_2
+	tilemap CardPop3Tilemap,                 TILESET_CARD_POP_3            ; TILEMAP_CARD_POP_3
+	tilemap CardPop3CGBTilemap,              TILESET_CARD_POP_3            ; TILEMAP_CARD_POP_3_CGB
+	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 TitleScreen1Tilemap,             TILESET_TITLE_SCREEN_1        ; TILEMAP_TITLE_SCREEN_1
+	tilemap TitleScreen2Tilemap,             TILESET_TITLE_SCREEN_2        ; TILEMAP_TITLE_SCREEN_2
+	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 TitleScreen3Tilemap,             TILESET_TITLE_SCREEN_3        ; TILEMAP_TITLE_SCREEN_3
+	tilemap TitleScreen4Tilemap,             TILESET_TITLE_SCREEN_4        ; TILEMAP_TITLE_SCREEN_4
+	tilemap SolidTiles4Tilemap,              TILESET_SOLID_TILES_2         ; TILEMAP_SOLID_TILES_4
+	tilemap PlayerTilemap,                   TILESET_PLAYER                ; TILEMAP_PLAYER
+	tilemap OpponentTilemap,                 TILESET_RONALD                ; TILEMAP_OPPONENT
+	tilemap TitleScreen5Tilemap,             TILESET_TITLE_SCREEN_5        ; TILEMAP_TITLE_SCREEN_5
+	tilemap TitleScreen6Tilemap,             TILESET_TITLE_SCREEN_6        ; TILEMAP_TITLE_SCREEN_6
+	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
@@ -1661,7 +1661,7 @@ MapDataPointers_81697: ; 81697 (20:5697)
 	palette_pointer Palette159, 1, 0 ; PALETTE_159
 	palette_pointer Palette160, 1, 0 ; PALETTE_160
 
-Data_8191b:: ; 8191b (20:591b)
+OverworldMapTilemap:: ; 8191b (20:591b)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -1669,7 +1669,7 @@ Data_8191b:: ; 8191b (20:591b)
 
 	INCBIN "data/maps/map0.bin"
 
-Data_81a22:: ; 81a22 (20:5a22)
+OverworldMapCGBTilemap:: ; 81a22 (20:5a22)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -1677,7 +1677,7 @@ Data_81a22:: ; 81a22 (20:5a22)
 
 	INCBIN "data/maps/map1.bin"
 
-Data_81c13:: ; 81c13 (20:5c13)
+MasonLaboratoryTilemap:: ; 81c13 (20:5c13)
 	db $1c ; width
 	db $1e ; height
 	dw $5d11
@@ -1685,7 +1685,7 @@ Data_81c13:: ; 81c13 (20:5c13)
 
 	INCBIN "data/maps/map2.bin"
 
-Data_81d2e:: ; 81d2e (20:5d2e)
+MasonLaboratoryCGBTilemap:: ; 81d2e (20:5d2e)
 	db $1c ; width
 	db $1e ; height
 	dw $5eb4
@@ -1693,7 +1693,7 @@ Data_81d2e:: ; 81d2e (20:5d2e)
 
 	INCBIN "data/maps/map3.bin"
 
-Data_81ed1:: ; 81ed1 (20:5ed1)
+Unused1Tilemap:: ; 81ed1 (20:5ed1)
 	db $04 ; width
 	db $06 ; height
 	dw $5ef0
@@ -1701,7 +1701,7 @@ Data_81ed1:: ; 81ed1 (20:5ed1)
 
 	INCBIN "data/maps/map4.bin"
 
-Data_81ef5:: ; 81ef5 (20:5ef5)
+Unused2Tilemap:: ; 81ef5 (20:5ef5)
 	db $04 ; width
 	db $06 ; height
 	dw $5f21
@@ -1709,7 +1709,7 @@ Data_81ef5:: ; 81ef5 (20:5ef5)
 
 	INCBIN "data/maps/map5.bin"
 
-Data_81f26:: ; 81f26 (20:5f26)
+DeckMachineRoomTilemap:: ; 81f26 (20:5f26)
 	db $18 ; width
 	db $1e ; height
 	dw $5fd3
@@ -1717,7 +1717,7 @@ Data_81f26:: ; 81f26 (20:5f26)
 
 	INCBIN "data/maps/map6.bin"
 
-Data_81feb:: ; 81feb (20:5feb)
+DeckMachineRoomCGBTilemap:: ; 81feb (20:5feb)
 	db $18 ; width
 	db $1e ; height
 	dw $612b
@@ -1725,7 +1725,7 @@ Data_81feb:: ; 81feb (20:5feb)
 
 	INCBIN "data/maps/map7.bin"
 
-Data_82143:: ; 82143 (20:6143)
+Unused3Tilemap:: ; 82143 (20:6143)
 	db $04 ; width
 	db $01 ; height
 	dw $614d
@@ -1733,7 +1733,7 @@ Data_82143:: ; 82143 (20:6143)
 
 	INCBIN "data/maps/map8.bin"
 
-Data_82150:: ; 82150 (20:6150)
+Unused4Tilemap:: ; 82150 (20:6150)
 	db $04 ; width
 	db $01 ; height
 	dw $615d
@@ -1741,7 +1741,7 @@ Data_82150:: ; 82150 (20:6150)
 
 	INCBIN "data/maps/map9.bin"
 
-Data_82160:: ; 82160 (20:6160)
+IshiharaTilemap:: ; 82160 (20:6160)
 	db $14 ; width
 	db $18 ; height
 	dw $620e
@@ -1749,7 +1749,7 @@ Data_82160:: ; 82160 (20:6160)
 
 	INCBIN "data/maps/map10.bin"
 
-Data_82222:: ; 82222 (20:6222)
+IshiharaCGBTilemap:: ; 82222 (20:6222)
 	db $14 ; width
 	db $18 ; height
 	dw $6322
@@ -1757,7 +1757,7 @@ Data_82222:: ; 82222 (20:6222)
 
 	INCBIN "data/maps/map11.bin"
 
-Data_82336:: ; 82336 (20:6336)
+FightingClubEntranceTilemap:: ; 82336 (20:6336)
 	db $14 ; width
 	db $12 ; height
 	dw $63ec
@@ -1765,7 +1765,7 @@ Data_82336:: ; 82336 (20:6336)
 
 	INCBIN "data/maps/map12.bin"
 
-Data_82400:: ; 82400 (20:6400)
+FightingClubEntranceCGBTilemap:: ; 82400 (20:6400)
 	db $14 ; width
 	db $12 ; height
 	dw $6509
@@ -1773,7 +1773,7 @@ Data_82400:: ; 82400 (20:6400)
 
 	INCBIN "data/maps/map13.bin"
 
-Data_8251d:: ; 8251d (20:651d)
+RockClubEntranceTilemap:: ; 8251d (20:651d)
 	db $14 ; width
 	db $12 ; height
 	dw $65d3
@@ -1781,7 +1781,7 @@ Data_8251d:: ; 8251d (20:651d)
 
 	INCBIN "data/maps/map14.bin"
 
-Data_825e7:: ; 825e7 (20:65e7)
+RockClubEntranceCGBTilemap:: ; 825e7 (20:65e7)
 	db $14 ; width
 	db $12 ; height
 	dw $66f0
@@ -1789,7 +1789,7 @@ Data_825e7:: ; 825e7 (20:65e7)
 
 	INCBIN "data/maps/map15.bin"
 
-Data_82704:: ; 82704 (20:6704)
+WaterClubEntranceTilemap:: ; 82704 (20:6704)
 	db $14 ; width
 	db $12 ; height
 	dw $67ba
@@ -1797,7 +1797,7 @@ Data_82704:: ; 82704 (20:6704)
 
 	INCBIN "data/maps/map16.bin"
 
-Data_827ce:: ; 827ce (20:67ce)
+WaterClubEntranceCGBTilemap:: ; 827ce (20:67ce)
 	db $14 ; width
 	db $12 ; height
 	dw $68d7
@@ -1805,7 +1805,7 @@ Data_827ce:: ; 827ce (20:67ce)
 
 	INCBIN "data/maps/map17.bin"
 
-Data_828eb:: ; 828eb (20:68eb)
+LightningClubEntranceTilemap:: ; 828eb (20:68eb)
 	db $14 ; width
 	db $12 ; height
 	dw $69a1
@@ -1813,7 +1813,7 @@ Data_828eb:: ; 828eb (20:68eb)
 
 	INCBIN "data/maps/map18.bin"
 
-Data_829b5:: ; 829b5 (20:69b5)
+LightningClubEntranceCGBTilemap:: ; 829b5 (20:69b5)
 	db $14 ; width
 	db $12 ; height
 	dw $6abe
@@ -1821,7 +1821,7 @@ Data_829b5:: ; 829b5 (20:69b5)
 
 	INCBIN "data/maps/map19.bin"
 
-Data_82ad2:: ; 82ad2 (20:6ad2)
+GrassClubEntranceTilemap:: ; 82ad2 (20:6ad2)
 	db $14 ; width
 	db $12 ; height
 	dw $6b88
@@ -1829,7 +1829,7 @@ Data_82ad2:: ; 82ad2 (20:6ad2)
 
 	INCBIN "data/maps/map20.bin"
 
-Data_82b9c:: ; 82b9c (20:6b9c)
+GrassClubEntranceCGBTilemap:: ; 82b9c (20:6b9c)
 	db $14 ; width
 	db $12 ; height
 	dw $6ca5
@@ -1837,7 +1837,7 @@ Data_82b9c:: ; 82b9c (20:6b9c)
 
 	INCBIN "data/maps/map21.bin"
 
-Data_82cb9:: ; 82cb9 (20:6cb9)
+PsychicClubEntranceTilemap:: ; 82cb9 (20:6cb9)
 	db $14 ; width
 	db $12 ; height
 	dw $6d6f
@@ -1845,7 +1845,7 @@ Data_82cb9:: ; 82cb9 (20:6cb9)
 
 	INCBIN "data/maps/map22.bin"
 
-Data_82d83:: ; 82d83 (20:6d83)
+PsychicClubEntranceCGBTilemap:: ; 82d83 (20:6d83)
 	db $14 ; width
 	db $12 ; height
 	dw $6e8c
@@ -1853,7 +1853,7 @@ Data_82d83:: ; 82d83 (20:6d83)
 
 	INCBIN "data/maps/map23.bin"
 
-Data_82ea0:: ; 82ea0 (20:6ea0)
+ScienceClubEntranceTilemap:: ; 82ea0 (20:6ea0)
 	db $14 ; width
 	db $12 ; height
 	dw $6f56
@@ -1861,7 +1861,7 @@ Data_82ea0:: ; 82ea0 (20:6ea0)
 
 	INCBIN "data/maps/map24.bin"
 
-Data_82f6a:: ; 82f6a (20:6f6a)
+ScienceClubEntranceCGBTilemap:: ; 82f6a (20:6f6a)
 	db $14 ; width
 	db $12 ; height
 	dw $7073
@@ -1869,7 +1869,7 @@ Data_82f6a:: ; 82f6a (20:6f6a)
 
 	INCBIN "data/maps/map25.bin"
 
-Data_83087:: ; 83087 (20:7087)
+FireClubEntranceTilemap:: ; 83087 (20:7087)
 	db $14 ; width
 	db $12 ; height
 	dw $713d
@@ -1877,7 +1877,7 @@ Data_83087:: ; 83087 (20:7087)
 
 	INCBIN "data/maps/map26.bin"
 
-Data_83151:: ; 83151 (20:7151)
+FireClubEntranceCGBTilemap:: ; 83151 (20:7151)
 	db $14 ; width
 	db $12 ; height
 	dw $725a
@@ -1885,7 +1885,7 @@ Data_83151:: ; 83151 (20:7151)
 
 	INCBIN "data/maps/map27.bin"
 
-Data_8326e:: ; 8326e (20:726e)
+ChallengeHallEntranceTilemap:: ; 8326e (20:726e)
 	db $14 ; width
 	db $12 ; height
 	dw $730d
@@ -1893,7 +1893,7 @@ Data_8326e:: ; 8326e (20:726e)
 
 	INCBIN "data/maps/map28.bin"
 
-Data_83321:: ; 83321 (20:7321)
+ChallengeHallEntranceCGBTilemap:: ; 83321 (20:7321)
 	db $14 ; width
 	db $12 ; height
 	dw $7410
@@ -1901,7 +1901,7 @@ Data_83321:: ; 83321 (20:7321)
 
 	INCBIN "data/maps/map29.bin"
 
-Data_83424:: ; 83424 (20:7424)
+ClubLobbyTilemap:: ; 83424 (20:7424)
 	db $1c ; width
 	db $1a ; height
 	dw $7529
@@ -1909,7 +1909,7 @@ Data_83424:: ; 83424 (20:7424)
 
 	INCBIN "data/maps/map30.bin"
 
-Data_83545:: ; 83545 (20:7545)
+ClubLobbyCGBTilemap:: ; 83545 (20:7545)
 	db $1c ; width
 	db $1a ; height
 	dw $76bf
@@ -1917,7 +1917,7 @@ Data_83545:: ; 83545 (20:7545)
 
 	INCBIN "data/maps/map31.bin"
 
-Data_836db:: ; 836db (20:76db)
+FightingClubTilemap:: ; 836db (20:76db)
 	db $18 ; width
 	db $12 ; height
 	dw $777b
@@ -1925,7 +1925,7 @@ Data_836db:: ; 836db (20:76db)
 
 	INCBIN "data/maps/map32.bin"
 
-Data_8378c:: ; 8378c (20:778c)
+FightingClubCGBTilemap:: ; 8378c (20:778c)
 	db $18 ; width
 	db $12 ; height
 	dw $787c
@@ -1933,7 +1933,7 @@ Data_8378c:: ; 8378c (20:778c)
 
 	INCBIN "data/maps/map33.bin"
 
-Data_8388d:: ; 8388d (20:788d)
+RockClubTilemap:: ; 8388d (20:788d)
 	db $1c ; width
 	db $1e ; height
 	dw $79b5
@@ -1941,7 +1941,7 @@ Data_8388d:: ; 8388d (20:788d)
 
 	INCBIN "data/maps/map34.bin"
 
-Data_839d6:: ; 839d6 (20:79d6)
+RockClubCGBTilemap:: ; 839d6 (20:79d6)
 	db $1c ; width
 	db $1e ; height
 	dw $7bd0
@@ -1949,7 +1949,7 @@ Data_839d6:: ; 839d6 (20:79d6)
 
 	INCBIN "data/maps/map35.bin"
 
-Data_83bf1:: ; 83bf1 (20:7bf1)
+Unused5Tilemap:: ; 83bf1 (20:7bf1)
 	db $04 ; width
 	db $03 ; height
 	dw $7c00
@@ -1957,7 +1957,7 @@ Data_83bf1:: ; 83bf1 (20:7bf1)
 
 	INCBIN "data/maps/map52.bin"
 
-Data_83c03:: ; 83c03 (20:7c03)
+Unused6Tilemap:: ; 83c03 (20:7c03)
 	db $04 ; width
 	db $03 ; height
 	dw $7c17
@@ -1965,7 +1965,7 @@ Data_83c03:: ; 83c03 (20:7c03)
 
 	INCBIN "data/maps/map53.bin"
 
-Data_83c1a:: ; 83c1a (20:7c1a)
+Unused7Tilemap:: ; 83c1a (20:7c1a)
 	db $04 ; width
 	db $03 ; height
 	dw $7c23
@@ -1973,7 +1973,7 @@ Data_83c1a:: ; 83c1a (20:7c1a)
 
 	INCBIN "data/maps/map56.bin"
 
-Data_83c26:: ; 83c26 (20:7c26)
+Unused8Tilemap:: ; 83c26 (20:7c26)
 	db $04 ; width
 	db $03 ; height
 	dw $7c33
@@ -1981,7 +1981,7 @@ Data_83c26:: ; 83c26 (20:7c26)
 
 	INCBIN "data/maps/map57.bin"
 
-Data_83c36:: ; 83c36 (20:7c36)
+GrassMedalTilemap:: ; 83c36 (20:7c36)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 326e327..b24bc9d 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -11669,7 +11669,7 @@ Func_3e10: ; 3e10 (0:3e10)
 ;	fallthrough
 
 Func_3e17: ; 3e17 (0:3e17)
-	ld [wd131], a
+	ld [wCurTilemap], a
 	ldh a, [hBankROM]
 	push af
 	ld a, BANK(Func_12fc6)
diff --git a/src/gfx.asm b/src/gfx.asm
index c2db3e9..e27c140 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -47,7 +47,7 @@ endr
 
 SECTION "Gfx 3", ROMX
 
-Data_84000:: ; 84000 (21:4000)
+WaterClubTilemap:: ; 84000 (21:4000)
 	db $1c ; width
 	db $20 ; height
 	dw $4164
@@ -55,7 +55,7 @@ Data_84000:: ; 84000 (21:4000)
 
 	INCBIN "data/maps/map36.bin"
 
-Data_84188:: ; 84188 (21:4188)
+WaterClubCGBTilemap:: ; 84188 (21:4188)
 	db $1c ; width
 	db $20 ; height
 	dw $4397
@@ -63,7 +63,7 @@ Data_84188:: ; 84188 (21:4188)
 
 	INCBIN "data/maps/map37.bin"
 
-Data_843bb:: ; 843bb (21:43bb)
+LightningClubTilemap:: ; 843bb (21:43bb)
 	db $1c ; width
 	db $20 ; height
 	dw $4511
@@ -71,7 +71,7 @@ Data_843bb:: ; 843bb (21:43bb)
 
 	INCBIN "data/maps/map38.bin"
 
-Data_84533:: ; 84533 (21:4533)
+LightningClubCGBTilemap:: ; 84533 (21:4533)
 	db $1c ; width
 	db $20 ; height
 	dw $470c
@@ -79,7 +79,7 @@ Data_84533:: ; 84533 (21:4533)
 
 	INCBIN "data/maps/map39.bin"
 
-Data_8472e:: ; 8472e (21:472e)
+GrassClubTilemap:: ; 8472e (21:472e)
 	db $1c ; width
 	db $20 ; height
 	dw $48b4
@@ -87,7 +87,7 @@ Data_8472e:: ; 8472e (21:472e)
 
 	INCBIN "data/maps/map40.bin"
 
-Data_848d8:: ; 848d8 (21:48d8)
+GrassClubCGBTilemap:: ; 848d8 (21:48d8)
 	db $1c ; width
 	db $20 ; height
 	dw $4b4f
@@ -95,7 +95,7 @@ Data_848d8:: ; 848d8 (21:48d8)
 
 	INCBIN "data/maps/map41.bin"
 
-Data_84b73:: ; 84b73 (21:4b73)
+PsychicClubTilemap:: ; 84b73 (21:4b73)
 	db $1c ; width
 	db $1c ; height
 	dw $4c50
@@ -103,7 +103,7 @@ Data_84b73:: ; 84b73 (21:4b73)
 
 	INCBIN "data/maps/map42.bin"
 
-Data_84c6f:: ; 84c6f (21:4c6f)
+PsychicClubCGBTilemap:: ; 84c6f (21:4c6f)
 	db $1c ; width
 	db $1c ; height
 	dw $4ddf
@@ -111,7 +111,7 @@ Data_84c6f:: ; 84c6f (21:4c6f)
 
 	INCBIN "data/maps/map43.bin"
 
-Data_84dfe:: ; 84dfe (21:4dfe)
+ScienceClubTilemap:: ; 84dfe (21:4dfe)
 	db $1c ; width
 	db $20 ; height
 	dw $4efe
@@ -119,7 +119,7 @@ Data_84dfe:: ; 84dfe (21:4dfe)
 
 	INCBIN "data/maps/map44.bin"
 
-Data_84f1d:: ; 84f1d (21:4f1d)
+ScienceClubCGBTilemap:: ; 84f1d (21:4f1d)
 	db $1c ; width
 	db $20 ; height
 	dw $5097
@@ -127,7 +127,7 @@ Data_84f1d:: ; 84f1d (21:4f1d)
 
 	INCBIN "data/maps/map45.bin"
 
-Data_850b6:: ; 850b6 (21:50b6)
+FireClubTilemap:: ; 850b6 (21:50b6)
 	db $1c ; width
 	db $20 ; height
 	dw $5175
@@ -135,7 +135,7 @@ Data_850b6:: ; 850b6 (21:50b6)
 
 	INCBIN "data/maps/map46.bin"
 
-Data_85191:: ; 85191 (21:5191)
+FireClubCGBTilemap:: ; 85191 (21:5191)
 	db $1c ; width
 	db $20 ; height
 	dw $52f9
@@ -143,7 +143,7 @@ Data_85191:: ; 85191 (21:5191)
 
 	INCBIN "data/maps/map47.bin"
 
-Data_85315:: ; 85315 (21:5315)
+ChallengeHallTilemap:: ; 85315 (21:5315)
 	db $20 ; width
 	db $20 ; height
 	dw $5484
@@ -151,7 +151,7 @@ Data_85315:: ; 85315 (21:5315)
 
 	INCBIN "data/maps/map48.bin"
 
-Data_854b3:: ; 854b3 (21:54b3)
+ChallengeHallCGBTilemap:: ; 854b3 (21:54b3)
 	db $20 ; width
 	db $20 ; height
 	dw $56db
@@ -159,7 +159,7 @@ Data_854b3:: ; 854b3 (21:54b3)
 
 	INCBIN "data/maps/map49.bin"
 
-Data_8570a:: ; 8570a (21:570a)
+PokemonDomeEntranceTilemap:: ; 8570a (21:570a)
 	db $20 ; width
 	db $12 ; height
 	dw $57ba
@@ -167,7 +167,7 @@ Data_8570a:: ; 8570a (21:570a)
 
 	INCBIN "data/maps/map50.bin"
 
-Data_857ce:: ; 857ce (21:57ce)
+PokemonDomeEntranceCGBTilemap:: ; 857ce (21:57ce)
 	db $20 ; width
 	db $12 ; height
 	dw $58db
@@ -175,7 +175,7 @@ Data_857ce:: ; 857ce (21:57ce)
 
 	INCBIN "data/maps/map51.bin"
 
-Data_858ef:: ; 858ef (21:58ef)
+PokemonDomeTilemap:: ; 858ef (21:58ef)
 	db $20 ; width
 	db $20 ; height
 	dw $5a58
@@ -183,7 +183,7 @@ Data_858ef:: ; 858ef (21:58ef)
 
 	INCBIN "data/maps/map54.bin"
 
-Data_85a79:: ; 85a79 (21:5a79)
+PokemonDomeGBTilemap:: ; 85a79 (21:5a79)
 	db $20 ; width
 	db $20 ; height
 	dw $5cc1
@@ -191,7 +191,7 @@ Data_85a79:: ; 85a79 (21:5a79)
 
 	INCBIN "data/maps/map55.bin"
 
-Data_85ce2:: ; 85ce2 (21:5ce2)
+HallOfHonorTilemap:: ; 85ce2 (21:5ce2)
 	db $18 ; width
 	db $1a ; height
 	dw $5ddc
@@ -199,7 +199,7 @@ Data_85ce2:: ; 85ce2 (21:5ce2)
 
 	INCBIN "data/maps/map58.bin"
 
-Data_85df4:: ; 85df4 (21:5df4)
+HallOfHonorCGBTilemap:: ; 85df4 (21:5df4)
 	db $18 ; width
 	db $1a ; height
 	dw $5f64
@@ -207,7 +207,7 @@ Data_85df4:: ; 85df4 (21:5df4)
 
 	INCBIN "data/maps/map59.bin"
 
-Data_85f7c:: ; 85f7c (21:5f7c)
+CardPop1Tilemap:: ; 85f7c (21:5f7c)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -215,7 +215,7 @@ Data_85f7c:: ; 85f7c (21:5f7c)
 
 	INCBIN "data/maps/map60.bin"
 
-Data_8607f:: ; 8607f (21:607f)
+CardPop1CGBTilemap:: ; 8607f (21:607f)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -223,7 +223,7 @@ Data_8607f:: ; 8607f (21:607f)
 
 	INCBIN "data/maps/map61.bin"
 
-Data_8617d:: ; 8617d (21:617d)
+ScienceMedalTilemap:: ; 8617d (21:617d)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -231,7 +231,7 @@ Data_8617d:: ; 8617d (21:617d)
 
 	INCBIN "data/maps/map63.bin"
 
-Data_86193:: ; 86193 (21:6193)
+FireMedalTilemap:: ; 86193 (21:6193)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -239,7 +239,7 @@ Data_86193:: ; 86193 (21:6193)
 
 	INCBIN "data/maps/map64.bin"
 
-Data_861a9:: ; 861a9 (21:61a9)
+WaterMedalTilemap:: ; 861a9 (21:61a9)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -247,7 +247,7 @@ Data_861a9:: ; 861a9 (21:61a9)
 
 	INCBIN "data/maps/map65.bin"
 
-Data_861bf:: ; 861bf (21:61bf)
+LightningMedalTilemap:: ; 861bf (21:61bf)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -255,7 +255,7 @@ Data_861bf:: ; 861bf (21:61bf)
 
 	INCBIN "data/maps/map66.bin"
 
-Data_861d5:: ; 861d5 (21:61d5)
+FightingMedalTilemap:: ; 861d5 (21:61d5)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -263,7 +263,7 @@ Data_861d5:: ; 861d5 (21:61d5)
 
 	INCBIN "data/maps/map67.bin"
 
-Data_861eb:: ; 861eb (21:61eb)
+RockMedalTilemap:: ; 861eb (21:61eb)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -271,7 +271,7 @@ Data_861eb:: ; 861eb (21:61eb)
 
 	INCBIN "data/maps/map68.bin"
 
-Data_86201:: ; 86201 (21:6201)
+PsychicMedalTilemap:: ; 86201 (21:6201)
 	db $03 ; width
 	db $03 ; height
 	dw $0000
@@ -279,7 +279,7 @@ Data_86201:: ; 86201 (21:6201)
 
 	INCBIN "data/maps/map69.bin"
 
-Data_86217:: ; 86217 (21:6217)
+CardPop2Tilemap:: ; 86217 (21:6217)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -287,7 +287,7 @@ Data_86217:: ; 86217 (21:6217)
 
 	INCBIN "data/maps/map70.bin"
 
-Data_862da:: ; 862da (21:62da)
+CardPop2CGBTilemap:: ; 862da (21:62da)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -295,7 +295,7 @@ Data_862da:: ; 862da (21:62da)
 
 	INCBIN "data/maps/map71.bin"
 
-Data_86364:: ; 86364 (21:6364)
+CardPop2Unknown1Tilemap:: ; 86364 (21:6364)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -303,7 +303,7 @@ Data_86364:: ; 86364 (21:6364)
 
 	INCBIN "data/maps/map72.bin"
 
-Data_86443:: ; 86443 (21:6443)
+CardPop2Unknown2Tilemap:: ; 86443 (21:6443)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -311,7 +311,7 @@ Data_86443:: ; 86443 (21:6443)
 
 	INCBIN "data/maps/map73.bin"
 
-Data_864df:: ; 864df (21:64df)
+CardPop3Tilemap:: ; 864df (21:64df)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -319,7 +319,7 @@ Data_864df:: ; 864df (21:64df)
 
 	INCBIN "data/maps/map74.bin"
 
-Data_865b5:: ; 865b5 (21:65b5)
+CardPop3CGBTilemap:: ; 865b5 (21:65b5)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -327,7 +327,7 @@ Data_865b5:: ; 865b5 (21:65b5)
 
 	INCBIN "data/maps/map75.bin"
 
-Data_86647:: ; 86647 (21:6647)
+ColosseumTilemap:: ; 86647 (21:6647)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -335,7 +335,7 @@ Data_86647:: ; 86647 (21:6647)
 
 	INCBIN "data/maps/map76.bin"
 
-Data_866b8:: ; 866b8 (21:66b8)
+ColosseumCGBTilemap:: ; 866b8 (21:66b8)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -343,7 +343,7 @@ Data_866b8:: ; 866b8 (21:66b8)
 
 	INCBIN "data/maps/map77.bin"
 
-Data_8673e:: ; 8673e (21:673e)
+EvolutionTilemap:: ; 8673e (21:673e)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -351,7 +351,7 @@ Data_8673e:: ; 8673e (21:673e)
 
 	INCBIN "data/maps/map78.bin"
 
-Data_867af:: ; 867af (21:67af)
+EvolutionCGBTilemap:: ; 867af (21:67af)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -359,7 +359,7 @@ Data_867af:: ; 867af (21:67af)
 
 	INCBIN "data/maps/map79.bin"
 
-Data_86833:: ; 86833 (21:6833)
+MysteryTilemap:: ; 86833 (21:6833)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -367,7 +367,7 @@ Data_86833:: ; 86833 (21:6833)
 
 	INCBIN "data/maps/map80.bin"
 
-Data_868a4:: ; 868a4 (21:68a4)
+MysteryCGBTilemap:: ; 868a4 (21:68a4)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -375,7 +375,7 @@ Data_868a4:: ; 868a4 (21:68a4)
 
 	INCBIN "data/maps/map81.bin"
 
-Data_86925:: ; 86925 (21:6925)
+LaboratoryTilemap:: ; 86925 (21:6925)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -383,7 +383,7 @@ Data_86925:: ; 86925 (21:6925)
 
 	INCBIN "data/maps/map82.bin"
 
-Data_86996:: ; 86996 (21:6996)
+LaboratoryCGBTilemap:: ; 86996 (21:6996)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -391,7 +391,7 @@ Data_86996:: ; 86996 (21:6996)
 
 	INCBIN "data/maps/map83.bin"
 
-Data_86a14:: ; 86a14 (21:6a14)
+CharizardIntroTilemap:: ; 86a14 (21:6a14)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -399,7 +399,7 @@ Data_86a14:: ; 86a14 (21:6a14)
 
 	INCBIN "data/maps/map84.bin"
 
-Data_86a85:: ; 86a85 (21:6a85)
+CharizardIntroCGBTilemap:: ; 86a85 (21:6a85)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -407,7 +407,7 @@ Data_86a85:: ; 86a85 (21:6a85)
 
 	INCBIN "data/maps/map85.bin"
 
-Data_86b28:: ; 86b28 (21:6b28)
+ScytherIntroTilemap:: ; 86b28 (21:6b28)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -415,7 +415,7 @@ Data_86b28:: ; 86b28 (21:6b28)
 
 	INCBIN "data/maps/map86.bin"
 
-Data_86b99:: ; 86b99 (21:6b99)
+ScytherIntroCGBTilemap:: ; 86b99 (21:6b99)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -423,7 +423,7 @@ Data_86b99:: ; 86b99 (21:6b99)
 
 	INCBIN "data/maps/map87.bin"
 
-Data_86c34:: ; 86c34 (21:6c34)
+AerodactylIntroTilemap:: ; 86c34 (21:6c34)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -431,7 +431,7 @@ Data_86c34:: ; 86c34 (21:6c34)
 
 	INCBIN "data/maps/map88.bin"
 
-Data_86ca5:: ; 86ca5 (21:6ca5)
+AerodactylIntroCGBTilemap:: ; 86ca5 (21:6ca5)
 	db $08 ; width
 	db $0c ; height
 	dw $0000
@@ -439,7 +439,7 @@ Data_86ca5:: ; 86ca5 (21:6ca5)
 
 	INCBIN "data/maps/map89.bin"
 
-Data_86d37:: ; 86d37 (21:6d37)
+TitleScreen1Tilemap:: ; 86d37 (21:6d37)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -447,7 +447,7 @@ Data_86d37:: ; 86d37 (21:6d37)
 
 	INCBIN "data/maps/map90.bin"
 
-Data_86dcc:: ; 86dcc (21:6dcc)
+TitleScreen2Tilemap:: ; 86dcc (21:6dcc)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -455,7 +455,7 @@ Data_86dcc:: ; 86dcc (21:6dcc)
 
 	INCBIN "data/maps/map91.bin"
 
-Data_86e8a:: ; 86e8a (21:6e8a)
+SolidTiles1Tilemap:: ; 86e8a (21:6e8a)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -463,7 +463,7 @@ Data_86e8a:: ; 86e8a (21:6e8a)
 
 	INCBIN "data/maps/map92.bin"
 
-Data_86f18:: ; 86f18 (21:6f18)
+SolidTiles2Tilemap:: ; 86f18 (21:6f18)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -471,7 +471,7 @@ Data_86f18:: ; 86f18 (21:6f18)
 
 	INCBIN "data/maps/map93.bin"
 
-Data_86fc0:: ; 86fc0 (21:6fc0)
+SolidTiles3Tilemap:: ; 86fc0 (21:6fc0)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -479,7 +479,7 @@ Data_86fc0:: ; 86fc0 (21:6fc0)
 
 	INCBIN "data/maps/map94.bin"
 
-Data_8704f:: ; 8704f (21:704f)
+TitleScreen3Tilemap:: ; 8704f (21:704f)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -487,7 +487,7 @@ Data_8704f:: ; 8704f (21:704f)
 
 	INCBIN "data/maps/map95.bin"
 
-Data_871a5:: ; 871a5 (21:71a5)
+TitleScreen4Tilemap:: ; 871a5 (21:71a5)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -495,7 +495,7 @@ Data_871a5:: ; 871a5 (21:71a5)
 
 	INCBIN "data/maps/map96.bin"
 
-Data_87397:: ; 87397 (21:7397)
+SolidTiles4Tilemap:: ; 87397 (21:7397)
 	db $08 ; width
 	db $04 ; height
 	dw $0000
@@ -503,7 +503,7 @@ Data_87397:: ; 87397 (21:7397)
 
 	INCBIN "data/maps/map97.bin"
 
-Data_873b7:: ; 873b7 (21:73b7)
+PlayerTilemap:: ; 873b7 (21:73b7)
 	db $06 ; width
 	db $06 ; height
 	dw $0000
@@ -511,7 +511,7 @@ Data_873b7:: ; 873b7 (21:73b7)
 
 	INCBIN "data/maps/map98.bin"
 
-Data_873e5:: ; 873e5 (21:73e5)
+OpponentTilemap:: ; 873e5 (21:73e5)
 	db $06 ; width
 	db $06 ; height
 	dw $0000
@@ -519,7 +519,7 @@ Data_873e5:: ; 873e5 (21:73e5)
 
 	INCBIN "data/maps/map99.bin"
 
-Data_87413:: ; 87413 (21:7413)
+TitleScreen5Tilemap:: ; 87413 (21:7413)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -527,7 +527,7 @@ Data_87413:: ; 87413 (21:7413)
 
 	INCBIN "data/maps/map100.bin"
 
-Data_87538:: ; 87538 (21:7538)
+TitleScreen6Tilemap:: ; 87538 (21:7538)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -535,7 +535,7 @@ Data_87538:: ; 87538 (21:7538)
 
 	INCBIN "data/maps/map101.bin"
 
-Data_8769f:: ; 8769f (21:769f)
+CopyrightTilemap:: ; 8769f (21:769f)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -543,7 +543,7 @@ Data_8769f:: ; 8769f (21:769f)
 
 	INCBIN "data/maps/map102.bin"
 
-Data_876f6:: ; 876f6 (21:76f6)
+CopyrightCGBTilemap:: ; 876f6 (21:76f6)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -551,7 +551,7 @@ Data_876f6:: ; 876f6 (21:76f6)
 
 	INCBIN "data/maps/map103.bin"
 
-Data_8777c:: ; 8777c (21:777c)
+NintendoTilemap:: ; 8777c (21:777c)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -559,7 +559,7 @@ Data_8777c:: ; 8777c (21:777c)
 
 	INCBIN "data/maps/map104.bin"
 
-Data_877c4:: ; 877c4 (21:77c4)
+CompaniesTilemap:: ; 877c4 (21:77c4)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
diff --git a/src/wram.asm b/src/wram.asm
index 4b18de1..2e26262 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -2082,7 +2082,9 @@ wBGMapWidth:: ; d12f
 wBGMapHeight:: ; d130
 	ds $1
 
-wd131:: ; d131
+; current tilemap to load
+; TILEMAP_* constant
+wCurTilemap:: ; d131
 	ds $1
 
 wd132:: ; d132
-- 
cgit v1.2.3