Identify mobile Name Card exchange labels

2 files changed, 42 insertions, 41 deletions

diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index 9988b1935..66aeca079 100644
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -17,19 +17,18 @@ LoadSGBLayoutCGB:
 	ld l, a
 	ld h, 0
 	add hl, hl
-	ld de, .dw
+	ld de, .Jumptable
 	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, .ReturnFromJumpTable
+	ld de, .done
 	push de
 	jp hl
-
-.ReturnFromJumpTable:
+.done:
 	ret
 
-.dw
+.Jumptable:
 	dw _CGB_BattleGrayscale
 	dw _CGB_BattleColors
 	dw _CGB_PokegearPals
diff --git a/engine/gfx/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm
index 7c15d35c1..1d3cca3ed 100644
--- a/engine/gfx/crystal_layouts.asm
+++ b/engine/gfx/crystal_layouts.asm
@@ -1,16 +1,16 @@
-GetMysteryGift_MobileAdapterLayout:
+GetCrystalCGBLayout:
 	ld a, b
 	cp SCGB_DEFAULT
-	jr nz, .not_ram
+	jr nz, .not_default
 	ld a, [wDefaultSGBLayout]
-.not_ram
+.not_default
 	push af
 	farcall ResetBGPals
 	pop af
 	ld l, a
 	ld h, 0
 	add hl, hl
-	ld de, .dw
+	ld de, .Jumptable
 	add hl, de
 	ld a, [hli]
 	ld h, [hl]
@@ -18,15 +18,16 @@ GetMysteryGift_MobileAdapterLayout:
 	ld de, .done
 	push de
 	jp hl
-.done
+.done:
 	ret
 
-.dw
-	dw MG_Mobile_Layout00
-	dw MG_Mobile_Layout01
-	dw MG_Mobile_Layout02
+.Jumptable:
+	dw _CrystalCGB_MobileLayout0
+	dw _CrystalCGB_MobileLayout1
+	dw _CrystalCGB_NameCard
 
-MG_Mobile_Layout_FillBox:
+Crystal_FillBoxCGB:
+; This is a copy of FillBoxCGB.
 .row
 	push bc
 	push hl
@@ -42,7 +43,8 @@ MG_Mobile_Layout_FillBox:
 	jr nz, .row
 	ret
 
-MG_Mobile_Layout_WipeAttrmap:
+Crystal_WipeAttrmap:
+; This is a copy of WipeAttrmap.
 	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	xor a
@@ -62,9 +64,9 @@ MG_Mobile_Layout_LoadPals:
 	call FarCopyWRAM
 	ret
 
-MG_Mobile_Layout00:
+_CrystalCGB_MobileLayout0:
 	call MG_Mobile_Layout_LoadPals
-	call MG_Mobile_Layout_WipeAttrmap
+	call Crystal_WipeAttrmap
 	call MG_Mobile_Layout_CreatePalBoxes
 	farcall ApplyAttrmap
 	farcall ApplyPals
@@ -74,33 +76,33 @@ MG_Mobile_Layout_CreatePalBoxes:
 	hlcoord 0, 0, wAttrmap
 	lb bc, 4, 1
 	ld a, $1
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	lb bc, 2, 1
 	ld a, $2
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	lb bc, 6, 1
 	ld a, $3
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	hlcoord 1, 0, wAttrmap
 	ld a, $1
 	lb bc, 3, 18
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	lb bc, 2, 18
 	ld a, $2
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	lb bc, 12, 18
 	ld a, $3
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	hlcoord 19, 0, wAttrmap
 	lb bc, 4, 1
 	ld a, $1
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	lb bc, 2, 1
 	ld a, $2
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	lb bc, 6, 1
 	ld a, $3
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	hlcoord 0, 12, wAttrmap
 	ld bc, 6 * SCREEN_WIDTH
 	ld a, $7
@@ -129,14 +131,14 @@ Function49420::
 	call FarCopyWRAM
 	ret
 
-MG_Mobile_Layout01:
+_CrystalCGB_MobileLayout1:
 	call MG_Mobile_Layout_LoadPals
 	ld de, wBGPals1 palette PAL_BG_TEXT
 	ld hl, .TextPalette
 	ld bc, 1 palettes
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
-	call MG_Mobile_Layout_WipeAttrmap
+	call Crystal_WipeAttrmap
 	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	xor a
@@ -170,7 +172,7 @@ Function49480:
 	hlcoord 0, 0, wAttrmap
 	lb bc, 4, SCREEN_WIDTH
 	ld a, $7
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	hlcoord 0, 2, wAttrmap
 	ld a, $4
 	ld [hl], a
@@ -182,7 +184,7 @@ Function49496:
 	hlcoord 0, 0, wAttrmap
 	lb bc, 2, SCREEN_WIDTH
 	ld a, $7
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	hlcoord 0, 1, wAttrmap
 	ld a, $4
 	ld [hl], a
@@ -192,14 +194,14 @@ Function49496:
 
 INCLUDE "engine/tilesets/tileset_palettes.asm"
 
-MG_Mobile_Layout02:
+_CrystalCGB_NameCard:
 	ld hl, .BGPalette
 	ld de, wBGPals1
 	ld bc, 1 palettes
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	farcall ApplyPals
-	call MG_Mobile_Layout_WipeAttrmap
+	call Crystal_WipeAttrmap
 	farcall ApplyAttrmap
 	ld hl, .OBPalette
 	ld de, wOBPals1
@@ -236,38 +238,38 @@ _InitMG_Mobile_LinkTradePalMap:
 	hlcoord 0, 0, wAttrmap
 	lb bc, 16, 2
 	ld a, $4
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	ld a, $3
 	ldcoord_a 0, 1, wAttrmap
 	ldcoord_a 0, 14, wAttrmap
 	hlcoord 2, 0, wAttrmap
 	lb bc, 8, 18
 	ld a, $5
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	hlcoord 2, 8, wAttrmap
 	lb bc, 8, 18
 	ld a, $6
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	hlcoord 0, 16, wAttrmap
 	lb bc, 2, SCREEN_WIDTH
 	ld a, $4
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	ld a, $3
 	lb bc, 6, 1
 	hlcoord 6, 1, wAttrmap
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	ld a, $3
 	lb bc, 6, 1
 	hlcoord 17, 1, wAttrmap
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	ld a, $3
 	lb bc, 6, 1
 	hlcoord 6, 9, wAttrmap
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	ld a, $3
 	lb bc, 6, 1
 	hlcoord 17, 9, wAttrmap
-	call MG_Mobile_Layout_FillBox
+	call Crystal_FillBoxCGB
 	ld a, $2
 	hlcoord 2, 16, wAttrmap
 	ld [hli], a