Rename some tilemap/tileset constants

8 files changed, 236 insertions, 236 deletions

diff --git a/src/constants/tilemap_constants.asm b/src/constants/tilemap_constants.asm
index cb12931..19761fa 100644
--- a/src/constants/tilemap_constants.asm
+++ b/src/constants/tilemap_constants.asm
@@ -1,107 +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

+	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_CGB                ; $3c
+	const TILEMAP_CARD_POP                    ; $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_GAMEBOY_LINK_CGB            ; $46
+	const TILEMAP_GAMEBOY_LINK                ; $47
+	const TILEMAP_GAMEBOY_LINK_CONNECTING_CGB ; $48
+	const TILEMAP_GAMEBOY_LINK_CONNECTING     ; $49
+	const TILEMAP_GAMEBOY_PRINTER_CGB         ; $4a
+	const TILEMAP_GAMEBOY_PRINTER             ; $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_JAPANESE_TITLE_SCREEN       ; $5a
+	const TILEMAP_JAPANESE_TITLE_SCREEN_CGB   ; $5b
+	const TILEMAP_SOLID_TILES_1               ; $5c
+	const TILEMAP_SOLID_TILES_2               ; $5d
+	const TILEMAP_SOLID_TILES_3               ; $5e
+	const TILEMAP_JAPANESE_TITLE_SCREEN_2     ; $5f
+	const TILEMAP_JAPANESE_TITLE_SCREEN_2_CGB ; $60
+	const TILEMAP_SOLID_TILES_4               ; $61
+	const TILEMAP_PLAYER                      ; $62
+	const TILEMAP_OPPONENT                    ; $63
+	const TILEMAP_TITLE_SCREEN                ; $64
+	const TILEMAP_TITLE_SCREEN_CGB            ; $65
+	const TILEMAP_COPYRIGHT                   ; $66
+	const TILEMAP_COPYRIGHT_CGB               ; $67
+	const TILEMAP_NINTENDO                    ; $68
+	const TILEMAP_COMPANIES                   ; $69
diff --git a/src/constants/tileset_constants.asm b/src/constants/tileset_constants.asm
index 6e3f8f3..6319263 100644
--- a/src/constants/tileset_constants.asm
+++ b/src/constants/tileset_constants.asm
@@ -1,88 +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

+	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              ; $11
+	const TILESET_MEDAL                 ; $12
+	const TILESET_GAMEBOY_LINK          ; $13
+	const TILESET_GAMEBOY_PRINTER       ; $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/bank04.asm b/src/engine/bank04.asm
index fc17af0..19c81b0 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -2232,14 +2232,14 @@ Scene_TitleScreen: ; 12da7 (4:6da7)
 	dw SGBData_TitleScreen
 	dw NULL
 	db PALETTE_25, PALETTE_25, $00
-	db TILEMAP_TITLE_SCREEN_5, TILEMAP_TITLE_SCREEN_6, $00, $00
+	db TILEMAP_TITLE_SCREEN, TILEMAP_TITLE_SCREEN_CGB, $00, $00
 	db $00
 
 Scene_JapaneseTitleScreen: ; 12db3 (4:6db3)
 	dw SGBData_TitleScreen
 	dw NULL
 	db PALETTE_25, PALETTE_25, $00
-	db TILEMAP_TITLE_SCREEN_1, TILEMAP_TITLE_SCREEN_2, $80, $00
+	db TILEMAP_JAPANESE_TITLE_SCREEN, TILEMAP_JAPANESE_TITLE_SCREEN_CGB, $80, $00
 	db $00
 
 Scene_ColosseumBooster: ; 12dbf (4:6dbf)
@@ -2356,14 +2356,14 @@ Scene_GameBoyLinkConnecting: ; 12e8b (4:6e8b)
 	dw SGBData_GameBoyLink
 	dw NULL
 	db PALETTE_111, PALETTE_111, $00
-	db TILEMAP_CARD_POP_2_UNKNOWN_2, TILEMAP_CARD_POP_2_UNKNOWN_1, $90, $00
+	db TILEMAP_GAMEBOY_LINK_CONNECTING, TILEMAP_GAMEBOY_LINK_CONNECTING_CGB, $90, $00
 	db $00
 
 Scene_GameBoyLinkTransmitting: ; 12e97 (4:6e97)
 	dw SGBData_GameBoyLink
 	dw NULL
 	db PALETTE_111, PALETTE_111, $00
-	db TILEMAP_CARD_POP_2_CGB, TILEMAP_CARD_POP_2, $90, $00
+	db TILEMAP_GAMEBOY_LINK, TILEMAP_GAMEBOY_LINK_CGB, $90, $00
 	db SPRITE_DUEL_52
 	db PALETTE_114, PALETTE_114, $00
 	db $b3, $b0, $50, $50
@@ -2373,7 +2373,7 @@ Scene_GameBoyLinkNotConnected: ; 12eac (4:6eac)
 	dw SGBData_GameBoyLink
 	dw NULL
 	db PALETTE_111, PALETTE_111, $00
-	db TILEMAP_CARD_POP_2_CGB, TILEMAP_CARD_POP_2, $90, $00
+	db TILEMAP_GAMEBOY_LINK, TILEMAP_GAMEBOY_LINK_CGB, $90, $00
 	db SPRITE_DUEL_52
 	db PALETTE_114, PALETTE_114, $00
 	db $b4, $b1, $50, $50
@@ -2383,7 +2383,7 @@ Scene_GameBoyPrinterTransmitting: ; 12ec1 (4:6ec1)
 	dw SGBData_GameBoyPrinter
 	dw LoadScene_SetGameBoyPrinterAttrBlk
 	db PALETTE_112, PALETTE_112, $00
-	db TILEMAP_CARD_POP_3_CGB, TILEMAP_CARD_POP_3, $90, $00
+	db TILEMAP_GAMEBOY_PRINTER, TILEMAP_GAMEBOY_PRINTER_CGB, $90, $00
 	db SPRITE_DUEL_53
 	db PALETTE_115, PALETTE_115, $00
 	db $b7, $b5, $50, $30
@@ -2393,7 +2393,7 @@ Scene_GameBoyPrinterNotConnected: ; 12ed6 (4:6ed6)
 	dw SGBData_GameBoyPrinter
 	dw LoadScene_SetGameBoyPrinterAttrBlk
 	db PALETTE_112, PALETTE_112, $00
-	db TILEMAP_CARD_POP_3_CGB, TILEMAP_CARD_POP_3, $90, $00
+	db TILEMAP_GAMEBOY_PRINTER, TILEMAP_GAMEBOY_PRINTER_CGB, $90, $00
 	db SPRITE_DUEL_53
 	db PALETTE_115, PALETTE_115, $00
 	db $b8, $b6, $50, $30
@@ -2403,7 +2403,7 @@ Scene_CardPop: ; 12eeb (4:6eeb)
 	dw SGBData_CardPop
 	dw LoadScene_SetCardPopAttrBlk
 	db PALETTE_113, PALETTE_113, $00
-	db TILEMAP_CARD_POP_1_CGB, TILEMAP_CARD_POP_1, $80, $00
+	db TILEMAP_CARD_POP, TILEMAP_CARD_POP_CGB, $80, $00
 	db SPRITE_DUEL_54
 	db PALETTE_116, PALETTE_116, $00
 	db $bb, $b9, $50, $40
@@ -2413,7 +2413,7 @@ Scene_CardPopError: ; 12f00 (4:6f00)
 	dw SGBData_CardPop
 	dw LoadScene_SetCardPopAttrBlk
 	db PALETTE_113, PALETTE_113, $00
-	db TILEMAP_CARD_POP_1_CGB, TILEMAP_CARD_POP_1, $80, $00
+	db TILEMAP_CARD_POP, TILEMAP_CARD_POP_CGB, $80, $00
 	db SPRITE_DUEL_54
 	db PALETTE_116, PALETTE_116, $00
 	db $bc, $ba, $50, $40
@@ -2444,7 +2444,7 @@ Scene_JapaneseTitleScreen2: ; 12f39 (4:6f39)
 	dw NULL
 	dw NULL
 	db PALETTE_109, PALETTE_100, $00
-	db TILEMAP_TITLE_SCREEN_3, TILEMAP_TITLE_SCREEN_4, $01, $00
+	db TILEMAP_JAPANESE_TITLE_SCREEN_2, TILEMAP_JAPANESE_TITLE_SCREEN_2_CGB, $01, $00
 	db $00
 
 LoadScene_LoadCompressedSGBPacket: ; 12f45 (4:6f45)
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 12bdd54..8026829 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -1000,8 +1000,8 @@ Tilemaps: ; 80e67 (20:4e67)
 	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 CardPopCGBTilemap,               TILESET_CARD_POP              ; TILEMAP_CARD_POP_CGB
+	tilemap CardPopTilemap,                  TILESET_CARD_POP              ; TILEMAP_CARD_POP
 	tilemap GrassMedalTilemap,               TILESET_MEDAL                 ; TILEMAP_GRASS_MEDAL
 	tilemap ScienceMedalTilemap,             TILESET_MEDAL                 ; TILEMAP_SCIENCE_MEDAL
 	tilemap FireMedalTilemap,                TILESET_MEDAL                 ; TILEMAP_FIRE_MEDAL
@@ -1010,12 +1010,12 @@ Tilemaps: ; 80e67 (20:4e67)
 	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 GameBoyLinkCGBTilemap,           TILESET_GAMEBOY_LINK          ; TILEMAP_GAMEBOY_LINK_CGB
+	tilemap GameBoyLinkTilemap,              TILESET_GAMEBOY_LINK          ; TILEMAP_GAMEBOY_LINK
+	tilemap GameBoyLinkConnectingCGBTilemap, TILESET_GAMEBOY_LINK          ; TILEMAP_GAMEBOY_LINK_CONNECTING_CGB
+	tilemap GameBoyLinkConnectingTilemap,    TILESET_GAMEBOY_LINK          ; TILEMAP_GAMEBOY_LINK_CONNECTING
+	tilemap GameBoyPrinterCGBTilemap,        TILESET_GAMEBOY_PRINTER       ; TILEMAP_GAMEBOY_PRINTER_CGB
+	tilemap GameBoyPrinterTilemap,           TILESET_GAMEBOY_PRINTER       ; TILEMAP_GAMEBOY_PRINTER
 	tilemap ColosseumTilemap,                TILESET_COLOSSEUM_1           ; TILEMAP_COLOSSEUM
 	tilemap ColosseumCGBTilemap,             TILESET_COLOSSEUM_2           ; TILEMAP_COLOSSEUM_CGB
 	tilemap EvolutionTilemap,                TILESET_EVOLUTION_1           ; TILEMAP_EVOLUTION
@@ -1030,18 +1030,18 @@ Tilemaps: ; 80e67 (20:4e67)
 	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 TitleScreen1Tilemap,             TILESET_TITLE_SCREEN_1        ; TILEMAP_JAPANESE_TITLE_SCREEN
+	tilemap TitleScreen2Tilemap,             TILESET_TITLE_SCREEN_2        ; TILEMAP_JAPANESE_TITLE_SCREEN_CGB
 	tilemap SolidTiles1Tilemap,              TILESET_SOLID_TILES_1         ; TILEMAP_SOLID_TILES_1
 	tilemap SolidTiles2Tilemap,              TILESET_SOLID_TILES_1         ; TILEMAP_SOLID_TILES_2
 	tilemap SolidTiles3Tilemap,              TILESET_SOLID_TILES_1         ; TILEMAP_SOLID_TILES_3
-	tilemap TitleScreen3Tilemap,             TILESET_TITLE_SCREEN_3        ; TILEMAP_TITLE_SCREEN_3
-	tilemap TitleScreen4Tilemap,             TILESET_TITLE_SCREEN_4        ; TILEMAP_TITLE_SCREEN_4
+	tilemap TitleScreen3Tilemap,             TILESET_TITLE_SCREEN_3        ; TILEMAP_JAPANESE_TITLE_SCREEN_2
+	tilemap TitleScreen4Tilemap,             TILESET_TITLE_SCREEN_4        ; TILEMAP_JAPANESE_TITLE_SCREEN_2_CGB
 	tilemap SolidTiles4Tilemap,              TILESET_SOLID_TILES_2         ; TILEMAP_SOLID_TILES_4
 	tilemap PlayerTilemap,                   TILESET_PLAYER                ; TILEMAP_PLAYER
 	tilemap OpponentTilemap,                 TILESET_RONALD                ; TILEMAP_OPPONENT
-	tilemap TitleScreen5Tilemap,             TILESET_TITLE_SCREEN_5        ; TILEMAP_TITLE_SCREEN_5
-	tilemap TitleScreen6Tilemap,             TILESET_TITLE_SCREEN_6        ; TILEMAP_TITLE_SCREEN_6
+	tilemap TitleScreen5Tilemap,             TILESET_TITLE_SCREEN_5        ; TILEMAP_TITLE_SCREEN
+	tilemap TitleScreen6Tilemap,             TILESET_TITLE_SCREEN_6        ; TILEMAP_TITLE_SCREEN_CGB
 	tilemap CopyrightTilemap,                TILESET_COPYRIGHT             ; TILEMAP_COPYRIGHT
 	tilemap CopyrightCGBTilemap,             TILESET_COPYRIGHT             ; TILEMAP_COPYRIGHT_CGB
 	tilemap NintendoTilemap,                 TILESET_NINTENDO              ; TILEMAP_NINTENDO
@@ -1072,10 +1072,10 @@ Tilesets: ; 8100f (20:500f)
 	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 CardPopGfx,                    189 ; TILESET_CARD_POP
 	tileset MedalGfx,                       72 ; TILESET_MEDAL
-	tileset CardPop2Gfx,                   109 ; TILESET_CARD_POP_2
-	tileset CardPop3Gfx,                    93 ; TILESET_CARD_POP_3
+	tileset GameBoyLinkGfx,                109 ; TILESET_GAMEBOY_LINK
+	tileset GameBoyPrinterGfx,              93 ; TILESET_GAMEBOY_PRINTER
 	tileset Colosseum1Gfx,                  96 ; TILESET_COLOSSEUM_1
 	tileset Colosseum2Gfx,                  86 ; TILESET_COLOSSEUM_2
 	tileset Evolution1Gfx,                  96 ; TILESET_EVOLUTION_1
diff --git a/src/gfx.asm b/src/gfx.asm
index e27c140..32548ce 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -207,7 +207,7 @@ HallOfHonorCGBTilemap:: ; 85df4 (21:5df4)
 
 	INCBIN "data/maps/map59.bin"
 
-CardPop1Tilemap:: ; 85f7c (21:5f7c)
+CardPopCGBTilemap:: ; 85f7c (21:5f7c)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -215,7 +215,7 @@ CardPop1Tilemap:: ; 85f7c (21:5f7c)
 
 	INCBIN "data/maps/map60.bin"
 
-CardPop1CGBTilemap:: ; 8607f (21:607f)
+CardPopTilemap:: ; 8607f (21:607f)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -279,7 +279,7 @@ PsychicMedalTilemap:: ; 86201 (21:6201)
 
 	INCBIN "data/maps/map69.bin"
 
-CardPop2Tilemap:: ; 86217 (21:6217)
+GameBoyLinkCGBTilemap:: ; 86217 (21:6217)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -287,7 +287,7 @@ CardPop2Tilemap:: ; 86217 (21:6217)
 
 	INCBIN "data/maps/map70.bin"
 
-CardPop2CGBTilemap:: ; 862da (21:62da)
+GameBoyLinkTilemap:: ; 862da (21:62da)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -295,7 +295,7 @@ CardPop2CGBTilemap:: ; 862da (21:62da)
 
 	INCBIN "data/maps/map71.bin"
 
-CardPop2Unknown1Tilemap:: ; 86364 (21:6364)
+GameBoyLinkConnectingCGBTilemap:: ; 86364 (21:6364)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -303,7 +303,7 @@ CardPop2Unknown1Tilemap:: ; 86364 (21:6364)
 
 	INCBIN "data/maps/map72.bin"
 
-CardPop2Unknown2Tilemap:: ; 86443 (21:6443)
+GameBoyLinkConnectingTilemap:: ; 86443 (21:6443)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -311,7 +311,7 @@ CardPop2Unknown2Tilemap:: ; 86443 (21:6443)
 
 	INCBIN "data/maps/map73.bin"
 
-CardPop3Tilemap:: ; 864df (21:64df)
+GameBoyPrinterCGBTilemap:: ; 864df (21:64df)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -319,7 +319,7 @@ CardPop3Tilemap:: ; 864df (21:64df)
 
 	INCBIN "data/maps/map74.bin"
 
-CardPop3CGBTilemap:: ; 865b5 (21:65b5)
+GameBoyPrinterTilemap:: ; 865b5 (21:65b5)
 	db $14 ; width
 	db $12 ; height
 	dw $0000
@@ -733,17 +733,17 @@ AnimData11:: ; 8fff5 (23:7ff5)
 
 SECTION "Gfx 6", ROMX
 
-CardPop1Gfx:: ; 90000 (24:4000)
+CardPopGfx:: ; 90000 (24:4000)
 	dw 189
-	INCBIN "gfx/cardpop/cardpop1.2bpp"
+	INCBIN "gfx/link/cardpop.2bpp"
 
-CardPop2Gfx:: ; 90bd2 (24:4bd2)
+GameBoyLinkGfx:: ; 90bd2 (24:4bd2)
 	dw 109
-	INCBIN "gfx/cardpop/cardpop2.2bpp"
+	INCBIN "gfx/link/gameboylink.2bpp"
 
-CardPop3Gfx:: ; 912a4 (24:52a4)
+GameBoyPrinterGfx:: ; 912a4 (24:52a4)
 	dw 93
-	INCBIN "gfx/cardpop/cardpop3.2bpp"
+	INCBIN "gfx/link/gameboyprinter.2bpp"
 
 Colosseum1Gfx:: ; 91876 (24:5876)
 	dw 96
diff --git a/src/gfx/cardpop/cardpop1.png b/src/gfx/link/cardpop.png
index c607d8d..c607d8d 100644
--- a/src/gfx/cardpop/cardpop1.png
+++ b/src/gfx/link/cardpop.png
diff --git a/src/gfx/cardpop/cardpop2.png b/src/gfx/link/gameboylink.png
index 75e5149..75e5149 100644
--- a/src/gfx/cardpop/cardpop2.png
+++ b/src/gfx/link/gameboylink.png
diff --git a/src/gfx/cardpop/cardpop3.png b/src/gfx/link/gameboyprinter.png
index 48bd233..48bd233 100644
--- a/src/gfx/cardpop/cardpop3.png
+++ b/src/gfx/link/gameboyprinter.png