Label Tilemap data

author: ElectroDeoxys <ElectroDeoxys@gmail.com> 2021-02-13 09:04:22 +0000
committer: ElectroDeoxys <ElectroDeoxys@gmail.com> 2021-02-13 09:05:27 +0000
commit: 68fbfa0d8e891794037852595b1ca47464905f90 (patch)
tree: cb66e5ef7bc759ec092a4540866022d991d0a0b4 /src
parent: ae378aa629caa6f7281a177ab86bed36787503dc (diff)
8 files changed, 376 insertions, 263 deletions
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
author	ElectroDeoxys <ElectroDeoxys@gmail.com>	2021-02-13 09:04:22 +0000
committer	ElectroDeoxys <ElectroDeoxys@gmail.com>	2021-02-13 09:05:27 +0000
commit	68fbfa0d8e891794037852595b1ca47464905f90 (patch)
tree	cb66e5ef7bc759ec092a4540866022d991d0a0b4 /src
parent	ae378aa629caa6f7281a177ab86bed36787503dc (diff)