Finish home cleanup, identify tileset data, other misc cleanups.

14 files changed, 205 insertions, 207 deletions

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index b3f97ecc..af102990 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -8036,7 +8036,7 @@ ShowLinkBattleParticipantsAfterEnd:
 	ld a, BANK(sLinkBattleStats)
 	call OpenSRAM
 
-	call AddLastMobileBattleToLinkRecord
+	call AddLastBattleToLinkRecord
 	call ReadAndPrintLinkBattleRecord
 
 	call CloseSRAM
@@ -8300,7 +8300,7 @@ GetRoamMonSpecies:
 	ld hl, wRoamMon3Species
 	ret
 
-AddLastMobileBattleToLinkRecord:
+AddLastBattleToLinkRecord:
 	ld hl, wOTPlayerID
 	ld de, wStringBuffer1
 	ld bc, 2
diff --git a/engine/events/mom.asm b/engine/events/mom.asm
index c795bfff..f97bd852 100644
--- a/engine/events/mom.asm
+++ b/engine/events/mom.asm
@@ -450,7 +450,7 @@ Mom_ContinueMenuSetup:
 	lb bc, PRINTNUM_MONEY | PRINTNUM_LEADINGZEROS | 3, 6
 	call PrintNum
 	call UpdateSprites
-	call CGBOnly_CopyTilemapAtOnce
+	call OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
 	ret
 
 Mom_Wait10Frames:
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index a0633db2..c169b7aa 100755
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -219,7 +219,7 @@ CutDownTreeOrGrass:
 
 CheckOverworldTileArrays: ; c87c (3:487c)
 	push bc
-	ld a, [wd082]
+	ld a, [wMapTileset]
 	ld de, $3
 	call IsInArray
 	pop bc
@@ -762,7 +762,7 @@ TryEscapeFromDungeon:
 
 EscapeFromDungeon:
 	ld hl, wDigWarpNumber
-	ld de, wNextWarpNumber
+	ld de, wNextWarp
 	ld bc, $3
 	call CopyBytes
 	call FieldMoveGetPartyNick
@@ -859,9 +859,9 @@ TryTeleport:
 	jr .asm_cc9c
 
 .asm_cc85
-	ld a, [wd9fb]
+	ld a, [wLastSpawnMapGroup]
 	ld d, a
-	ld a, [wd9fc]
+	ld a, [wLastSpawnMapNumber]
 	ld e, a
 	ld a, $5
 	ld hl, $5465
diff --git a/engine/events/pokemon_pc.asm b/engine/events/pokemon_pc.asm
index 7d3cc42e..e22a2ffc 100644
--- a/engine/events/pokemon_pc.asm
+++ b/engine/events/pokemon_pc.asm
@@ -1,5 +1,3 @@
-INCLUDE "data/events/unused_pokemonpc_menudata.asm"
-
 PokemonCenterPC:
 	call PC_CheckPartyForPokemon
 	ret c
diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm
index fd273b51..f8bfce12 100755
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -57,9 +57,9 @@ HalveMoney:
 	ret
 
 GetWhiteoutSpawn:
-	ld a, [wd9fb]
+	ld a, [wLastSpawnMapGroup]
 	ld d, a
-	ld a, [wd9fc]
+	ld a, [wLastSpawnMapNumber]
 	ld e, a
 
 	ld a, $05
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index 4392fed1..b1ea7644 100755
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -63,7 +63,7 @@ Predef_LoadSGBLayoutCGB:
 
 Function9376: ; 9376 (2:5376)
 	ld hl, PalPacket_a0d5 + 1
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld c, $4
 	call Function9ab7
 	ld hl, PalPacket_a0d5 + 1
@@ -71,7 +71,7 @@ Function9376: ; 9376 (2:5376)
 	ld c, $4
 	call Function9ab7
 	ld hl, PalPacket_a0d5 + 1
-	ld de, wTempOBPals
+	ld de, wOBPals1
 	ld c, $2
 	call Function9ab7
 	jr asm_93e1
@@ -102,7 +102,7 @@ Function9399: ; 9399 (2:5399)
 	call Function9adb
 	ld hl, Palettes_ad39
 	call Function9adb
-	ld de, wTempOBPals
+	ld de, wOBPals1
 	pop hl
 	call Function9adb
 	pop hl
@@ -122,23 +122,23 @@ asm_93e1:
 	hlcoord 0, 4, wAttrmap
 	lb bc, $8, $a
 	ld a, $0
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 10, 0, wAttrmap
 	lb bc, $7, $a
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 0, 0, wAttrmap
 	lb bc, $4, $a
 	ld a, $2
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 10, 7, wAttrmap
 	lb bc, $5, $a
 	ld a, $3
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 10, 11, wAttrmap
 	lb bc, $1, $9
 	ld a, $4
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 0, 12, wAttrmap
 	ld bc, $78
 	ld a, $7
@@ -184,7 +184,7 @@ Function945e: ; 945e (2:545e)
 	hlcoord 0, 0, wAttrmap
 	lb bc, $8, $14
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 10, 16, wAttrmap
 	ld bc, $a
 	ld a, $2
@@ -192,15 +192,15 @@ Function945e: ; 945e (2:545e)
 	hlcoord 13, 5, wAttrmap
 	lb bc, $2, $2
 	ld a, $3
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 15, 5, wAttrmap
 	lb bc, $2, $2
 	ld a, $4
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 17, 5, wAttrmap
 	lb bc, $2, $2
 	ld a, $5
-	call Function9af1
+	call FillBoxCGB
 	call Function9b35
 	call Function9b28
 	ld a, $1
@@ -235,7 +235,7 @@ Function94f1: ; 94f1 (2:54f1)
 	hlcoord 1, 1, wAttrmap
 	lb bc, 7, 7
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	jp Function9537
 
 Function9502: ; 9502 (2:5502)
@@ -243,7 +243,7 @@ Function9502: ; 9502 (2:5502)
 	hlcoord 1, 1, wAttrmap
 	lb bc, 5, 5
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	jp Function9537
 
 Function9513: ; 9513 (2:5513)
@@ -310,7 +310,7 @@ Function9561: ; 9561 (2:5561)
 	hlcoord 1, 4, wAttrmap
 	lb bc, 7, 7
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	call Function9b9c
 	call Function9b35
 	call Function9b28
@@ -332,7 +332,7 @@ asm_95b1:
 	hlcoord 1, 1, wAttrmap
 	lb bc, 7, 7
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	call Function9b9c
 	call Function9b35
 	call Function9b28
@@ -347,7 +347,7 @@ Palettes_95cd:
 	RGB  0,  0,  0
 
 Function95d5: ; 95d5 (2:55d5)
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld a, $1d
 	call Function9ac7
 	call Function9ad2
@@ -358,7 +358,7 @@ Function95d5: ; 95d5 (2:55d5)
 	hlcoord 7, 5, wAttrmap
 	lb bc, 7, 7
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	call Function9b9c
 	call Function9b35
 	call Function9b28
@@ -368,46 +368,46 @@ Function95d5: ; 95d5 (2:55d5)
 
 Function9605: ; 9605 (2:5605)
 	ld hl, Palettes_bbbe
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld bc, $80
 	call CopyBytes
 	call Function9b1d
 	hlcoord 0, 2, wAttrmap
 	lb bc, $a, $3
 	ld a, $2
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 17, 2, wAttrmap
 	lb bc, $a, $3
 	ld a, $2
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 0, 4, wAttrmap
 	lb bc, $6, $3
 	ld a, $3
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 17, 4, wAttrmap
 	lb bc, $6, $3
 	ld a, $3
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 0, 6, wAttrmap
 	lb bc, $2, $3
 	ld a, $4
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 17, 6, wAttrmap
 	lb bc, $2, $3
 	ld a, $4
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 4, 2, wAttrmap
 	lb bc, $2, $c
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 3, 2, wAttrmap
 	lb bc, $a, $1
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 16, 2, wAttrmap
 	lb bc, $a, $1
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 0, 12, wAttrmap
 	ld bc, $78
 	ld a, $7
@@ -422,14 +422,14 @@ Function968d: ; 968d (2:568d)
 	ld hl, PalPacket_a115 + 1
 	call Function9ab2
 	call Function9b1d
-	ld de, wTempOBPals
+	ld de, wOBPals1
 	ld a, $3c
 	call Function9ac7
 	call Function9ad2
 	hlcoord 0, 6, wAttrmap
 	lb bc, $c, $14
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	call Function9b35
 	call Function9b28
 	ld a, $1
@@ -484,7 +484,7 @@ Function96f9:
 	ld a, $38
 	call Function9ac7
 	call Function9ad2
-	ld de, wTempOBPals
+	ld de, wOBPals1
 	ld a, $39
 	call Function9ac7
 .asm_970b
@@ -495,7 +495,7 @@ Function96f9:
 Function9713:
 	ld hl, PalPacket_a0a5 + 1
 	call Function9ab2
-	ld de, wTempOBPals
+	ld de, wOBPals1
 	ld a, $3a
 	call Function9ac7
 	call Function9ad2
@@ -504,7 +504,7 @@ Function9713:
 
 Function9728: ; 9728 (2:5728)
 	ld hl, Palettes_bb9e
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld bc, $28
 	call CopyBytes
 	call Function9b28
@@ -514,7 +514,7 @@ Function9728: ; 9728 (2:5728)
 
 Function973e: ; 973e (2:573e)
 	ld hl, Palettes_ba86
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld bc, $80
 	call CopyBytes
 	ld hl, PalPacket_a125 + 1
@@ -574,7 +574,7 @@ Function97af: ; 97af (2:57af)
 	ld bc, $28
 	call CopyBytes
 	ld hl, Palettes_bb5e
-	ld de, wTempOBPals
+	ld de, wOBPals1
 	ld bc, $10
 	call CopyBytes
 	ld a, $8
@@ -594,7 +594,7 @@ Function97d4: ; 97d4 (2:57d4)
 Function97e1: ; 97e1 (2:57e1)
 	ld hl, PalPacket_a035 + 1
 	call Function9ab2
-	ld de, wTempOBPals
+	ld de, wOBPals1
 	ld a, $4c
 	call Function9ac7
 	call Function9ad2
@@ -643,37 +643,37 @@ Function9802: ; 9802 (2:5802)
 	hlcoord 14, 1, wAttrmap
 	lb bc, $7, $5
 	xor a
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 18, 1, wAttrmap
 	ld [hl], $1
 	hlcoord 2, 11, wAttrmap
 	lb bc, $2, $4
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 6, 11, wAttrmap
 	lb bc, $2, $4
 	ld a, $2
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 10, 11, wAttrmap
 	lb bc, $2, $4
 	ld a, $3
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 14, 11, wAttrmap
 	lb bc, $2, $4
 	ld a, $4
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 2, 14, wAttrmap
 	lb bc, $2, $4
 	ld a, $5
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 6, 14, wAttrmap
 	lb bc, $2, $4
 	ld a, $6
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 10, 14, wAttrmap
 	lb bc, $2, $4
 	ld a, $7
-	call Function9af1
+	call FillBoxCGB
 	call Function9b35
 	call Function9b28
 	ld a, $1
@@ -681,7 +681,7 @@ Function9802: ; 9802 (2:5802)
 	ret
 
 Function98be: ; 98be (2:58be)
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld a, $10
 	call Function9ac7
 	call Function9ad2
@@ -697,7 +697,7 @@ Function98be: ; 98be (2:58be)
 	hlcoord 11, 1, wAttrmap
 	lb bc, $2, $9
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	call Function9b35
 	call Function9b28
 	ld a, $1
@@ -715,7 +715,7 @@ Function98f1: ; 98f1 (2:58f1)
 	ret
 
 Function9905: ; 9905 (2:5905)
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld a, $1d
 	call Function9ac7
 	call Function9ad2
@@ -727,7 +727,7 @@ Function9905: ; 9905 (2:5905)
 	ret
 
 Function991e: ; 991e (2:591e)
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld hl, Palettes_996f
 	ld bc, $40
 	call CopyBytes
@@ -735,23 +735,23 @@ Function991e: ; 991e (2:591e)
 	hlcoord 0, 0, wAttrmap
 	lb bc, $1, $a
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 10, 0, wAttrmap
 	lb bc, $1, $a
 	ld a, $2
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 7, 2, wAttrmap
 	lb bc, $9, $1
 	ld a, $3
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 0, 7, wAttrmap
 	lb bc, $3, $5
 	ld a, $4
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 0, 3, wAttrmap
 	lb bc, $3, $5
 	ld a, $5
-	call Function9af1
+	call FillBoxCGB
 	call Function9b35
 	call Function9b28
 	ld a, $1
@@ -820,7 +820,7 @@ Function999f: ; 999f (2:599f)
 	inc a
 	ld c, a
 	ld a, $0
-	call Function9af1
+	call FillBoxCGB
 	call Function9b35
 	ret
 
@@ -831,11 +831,11 @@ Function99d9: ; 99d9 (2:59d9)
 	hlcoord 0, 4, wAttrmap
 	lb bc, $a, $14
 	ld a, $2
-	call Function9af1
+	call FillBoxCGB
 	hlcoord 0, 6, wAttrmap
 	lb bc, $6, $14
 	ld a, $1
-	call Function9af1
+	call FillBoxCGB
 	call Function9b35
 	call Function9b28
 	ld a, $1
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index a807ff09..dd39d6de 100755
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -121,11 +121,11 @@ Function9102:
 	call CheckCGB
 	ret z
 	ld hl, .BGPal
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld bc, $8
 	call CopyBytes
 	ld hl, .OBPal
-	ld de, wTempOBPals
+	ld de, wOBPals1
 	ld bc, $8
 	call CopyBytes
 	call Function9b28
@@ -164,7 +164,7 @@ Function9144:
 	jp PushSGBPals_
 
 .asm_9153
-	ld de, wTempOBPals
+	ld de, wOBPals1
 	ld a, $3b
 	call Function9ac7
 	jp Function9ad2
@@ -179,7 +179,7 @@ Function915e:
 	jp PushSGBPals_
 
 .asm_916d
-	ld de, wTempOBPals
+	ld de, wOBPals1
 	ld a, $3c
 	call Function9ac7
 	jp Function9ad2
@@ -210,7 +210,7 @@ Function9178:
 	jp PushSGBPals_
 
 .asm_91a9
-	ld de, wTempOBPals
+	ld de, wOBPals1
 	ld a, c
 	call Function9be4
 	call Function9adb
@@ -242,7 +242,7 @@ Function91b4:
 	lb bc, 6, 4
 	ld a, [wc605]
 	and $3
-	call Function9af1
+	call FillBoxCGB
 	call CopyTilemapAtOnce
 	ret
 
@@ -260,7 +260,7 @@ ApplyMonOrTrainerPals: ; 91e5 (2:51e5)
 	ld a, [wTrainerClass]
 	call Function9bda
 .asm_91fb
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	call Function9adb
 	call Function9b1d
 	call Function9b35
@@ -312,7 +312,7 @@ ApplyHPBarPals:
 .asm_9248
 	lb bc, 2, 8
 	ld a, e
-	call Function9af1
+	call FillBoxCGB
 	ret
 
 LoadStatsScreenPals:
@@ -324,11 +324,11 @@ LoadStatsScreenPals:
 	add hl, bc
 	add hl, bc
 	ld a, [hli]
-	ld [wTempBGPals], a
-	ld [wTempBGPals + $10], a
+	ld [wBGPals1], a
+	ld [wBGPals1 + $10], a
 	ld a, [hl]
-	ld [wTempBGPals + 1], a
-	ld [wTempBGPals + $11], a
+	ld [wBGPals1 + 1], a
+	ld [wBGPals1 + $11], a
 	call Function9b28
 	ld a, $1
 	ldh [hCGBPalUpdate], a
@@ -367,7 +367,7 @@ LoadMailPalettes:
 	ret
 
 .asm_92ae
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld bc, $8
 	call CopyBytes
 	call Function9b28
@@ -382,7 +382,7 @@ INCLUDE "engine/gfx/cgb_layouts.asm"
 
 Function9a94: ; 9a94 (2:5a94)
 	ld hl, Palettes_9aaa
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld bc, $8
 	call CopyBytes
 	call Function9b28
@@ -397,7 +397,7 @@ Palettes_9aaa:
 	RGB  0,  3, 19
 
 Function9ab2: ; 9ab2 (2:5ab2)
-	ld de, wTempBGPals
+	ld de, wBGPals1
 	ld c, $4
 Function9ab7: ; 9ab7 (2:5ab7)
 	push bc
@@ -453,7 +453,7 @@ Function9adb: ; 9adb (2:5adb)
 	inc de
 	ret
 
-Function9af1: ; 9af1 (2:5af1)
+FillBoxCGB: ; 9af1 (2:5af1)
 	push bc
 	push hl
 .asm_9af3
@@ -465,7 +465,7 @@ Function9af1: ; 9af1 (2:5af1)
 	add hl, bc
 	pop bc
 	dec b
-	jr nz, Function9af1
+	jr nz, FillBoxCGB
 	ret
 
 Function9b01: ; 9b01 (2:5b01)
@@ -473,7 +473,7 @@ Function9b01: ; 9b01 (2:5b01)
 	push bc
 	push de
 	push hl
-	ld hl, wTempBGPals
+	ld hl, wBGPals1
 	ld c, $8
 .asm_9b0a
 	ld a, $ff
@@ -502,8 +502,8 @@ Function9b1d: ; 9b1d (2:5b1d)
 	ret
 
 Function9b28: ; 9b28 (2:5b28)
-	ld hl, wTempBGPals
-	ld de, wBGPals
+	ld hl, wBGPals1
+	ld de, wBGPals2
 	ld bc, $80
 	call CopyBytes
 	ret
@@ -574,7 +574,7 @@ Function9b75: ; 9b75 (2:5b75)
 .asm_9b94
 	lb bc, 2, 8
 	ld a, e
-	call Function9af1
+	call FillBoxCGB
 	ret
 
 Function9b9c: ; 9b9c (2:5b9c)
@@ -836,9 +836,9 @@ InitCGBPals:: ; 9cfd (2:5cfd)
 	ldh [rOBPD], a
 	dec c
 	jr nz, .asm_9d2a
-	ld hl, wTempBGPals
+	ld hl, wBGPals1
 	call Function9d3e
-	ld hl, wBGPals
+	ld hl, wBGPals2
 Function9d3e: ; 9d3e (2:5d3e)
 	ld c, $40
 .asm_9d40
@@ -1332,7 +1332,7 @@ INCLUDE "data/pokemon/palettes.asm"
 INCLUDE "data/trainers/palettes.asm"
 
 Functionb649: ; b649 (2:7649)
-	ld a, [wPermission]
+	ld a, [wEnvironment]
 	and $7
 	ld e, a
 	ld d, $0
@@ -1352,7 +1352,7 @@ Functionb649: ; b649 (2:7649)
 	add hl, de
 	ld e, l
 	ld d, h
-	ld hl, wTempBGPals
+	ld hl, wBGPals1
 	ld b, $8
 .asm_b66c
 	ld a, [de]
@@ -1387,7 +1387,7 @@ Functionb649: ; b649 (2:7649)
 	ld de, wTempOBPal0
 	ld bc, $40
 	call CopyBytes
-	ld a, [wPermission]
+	ld a, [wEnvironment]
 	cp $1
 	jr z, .asm_b6aa
 	cp $2
diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index 623bbbca..b26db675 100755
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -518,7 +518,7 @@ Function8ff6: ; 8ff6 (2:4ff6)
 	ret
 
 .asm_9000
-	ld a, [wPermission]
+	ld a, [wEnvironment]
 	cp $2
 	jr z, .asm_9023
 	cp $4
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 4a86b58d..2f19b989 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -209,11 +209,11 @@ Function11c48: ; 11c48 (4:5c48)
 	jr asm_11c4f
 
 asm_11c4f:
-	ld [wc5d3], a
+	ld [wNamingScreenMaxNameLength], a
 	ld a, l
-	ld [wc5d8], a
+	ld [wNamingScreenStringEntryCoord], a
 	ld a, h
-	ld [wc5d9], a
+	ld [wNamingScreenStringEntryCoord + 1], a
 	ret
 
 Function11c5b: ; 11c5b (4:5c5b)
@@ -319,7 +319,7 @@ Function11cff: ; 11cff (4:5cff)
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
-	ld hl, wc5d8
+	ld hl, wNamingScreenStringEntryCoord
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -353,9 +353,9 @@ Function11d3a:
 	ld a, $14
 	call InitSpriteAnimStruct
 	ld a, c
-	ld [wc5d5], a
+	ld [wNamingScreenCursorObjectPointer], a
 	ld a, b
-	ld [wc5d6], a
+	ld [wNamingScreenCursorObjectPointer + 1], a
 	ld hl, $1
 	add hl, bc
 	ld a, [hl]
@@ -394,7 +394,7 @@ Function11d60:
 	call Function11ed3
 	ret nc
 .asm_11d8e
-	ld hl, wc5d5
+	ld hl, wNamingScreenCursorObjectPointer
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
@@ -435,7 +435,7 @@ Function11d60:
 	ret
 
 Function11dca: ; 11dca (4:5dca)
-	ld hl, wc5d5
+	ld hl, wNamingScreenCursorObjectPointer
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
@@ -634,7 +634,7 @@ Function11e4a: ; 11e4a (4:5e4a)
 	ret
 
 Function11ed3: ; 11ed3 (4:5ed3)
-	ld a, [wc5d7]
+	ld a, [wNamingScreenLastCharacter]
 	ld hl, Dakutens
 	cp $e5
 	jr z, asm_11f06
@@ -642,17 +642,17 @@ Function11ed3: ; 11ed3 (4:5ed3)
 	cp $e4
 	jr z, asm_11f06
 Function11ee4: ; 11ee4 (4:5ee4)
-	ld a, [wc5d3]
+	ld a, [wNamingScreenMaxNameLength]
 	ld c, a
-	ld a, [wc5d2]
+	ld a, [wNamingScreenCurNameLength]
 	cp c
 	ret nc
-	ld a, [wc5d7]
+	ld a, [wNamingScreenLastCharacter]
 asm_11ef0:
 	call Function11f9d
 	ld [hl], a
 asm_11ef4:
-	ld hl, wc5d2
+	ld hl, wNamingScreenCurNameLength
 	inc [hl]
 	call Function11f9d
 	ld a, [hl]
@@ -667,11 +667,11 @@ asm_11ef4:
 	ret
 
 asm_11f06:
-	ld a, [wc5d2]
+	ld a, [wNamingScreenCurNameLength]
 	and a
 	ret z
 	push hl
-	ld hl, wc5d2
+	ld hl, wNamingScreenCurNameLength
 	dec [hl]
 	call Function11f9d
 	ld c, [hl]
@@ -706,7 +706,7 @@ Handakutens: ; Dummied out
 	db $ff
 
 Function11f89: ; 11f89 (4:5f89)
-	ld hl, wc5d2
+	ld hl, wNamingScreenCurNameLength
 	ld a, [hl]
 	and a
 	ret z
@@ -726,7 +726,7 @@ Function11f9d: ; 11f9d (4:5f9d)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wc5d2]
+	ld a, [wNamingScreenCurNameLength]
 	ld e, a
 	ld d, $0
 	add hl, de
@@ -740,7 +740,7 @@ Function11fad: ; 11fad (4:5fad)
 	ld l, a
 	ld [hl], $f2
 	inc hl
-	ld a, [wc5d3]
+	ld a, [wNamingScreenMaxNameLength]
 	dec a
 	ld c, a
 	ld a, $eb
@@ -756,7 +756,7 @@ Function11fc4: ; 11fc4 (4:5fc4)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wc5d3]
+	ld a, [wNamingScreenMaxNameLength]
 	ld c, a
 .asm_11fce
 	ld a, [hl]
@@ -773,7 +773,7 @@ Function11fc4: ; 11fc4 (4:5fc4)
 	ret
 
 Function11fde: ; 11fde (4:5fde)
-	ld hl, wc5d5
+	ld hl, wNamingScreenCursorObjectPointer
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
@@ -812,7 +812,7 @@ Function11fde: ; 11fde (4:5fde)
 .asm_12018
 	add hl, de
 	ld a, [hl]
-	ld [wc5d7], a
+	ld [wNamingScreenLastCharacter], a
 	ret
 
 Function1201e: ; 1201e (4:601e)
@@ -850,7 +850,7 @@ Function1201e: ; 1201e (4:601e)
 	ld [wce63], a
 	ld [wce64], a
 	ldh [hBGMapMode], a
-	ld [wc5d2], a
+	ld [wNamingScreenCurNameLength], a
 	ld a, $7
 	ldh [hWX], a
 	ret
@@ -961,7 +961,7 @@ MailIcon: INCBIN "gfx/icons/mail_big.2bpp"
 
 Function12341: ; 12341 (4:6341)
 	ld a, $21
-	ld [wc5d3], a
+	ld [wNamingScreenMaxNameLength], a
 	ret
 
 	db "メールを かいてね@"
@@ -1057,9 +1057,9 @@ Function123e8:
 	ld a, $1b
 	call InitSpriteAnimStruct
 	ld a, c
-	ld [wc5d5], a
+	ld [wNamingScreenCursorObjectPointer], a
 	ld a, b
-	ld [wc5d6], a
+	ld [wNamingScreenCursorObjectPointer + 1], a
 	ld hl, $1
 	add hl, bc
 	ld a, [hl]
@@ -1097,7 +1097,7 @@ Function12407:
 	call Function11fde
 	call Function12579
 	jr c, .asm_12447
-	ld hl, wc5d2
+	ld hl, wNamingScreenCurNameLength
 	ld a, [hl]
 	cp $10
 	ret nz
@@ -1109,7 +1109,7 @@ Function12407:
 	ret
 
 .asm_12447
-	ld hl, wc5d5
+	ld hl, wNamingScreenCursorObjectPointer
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
@@ -1123,7 +1123,7 @@ Function12407:
 
 .asm_1245a
 	call Function11f89
-	ld hl, wc5d2
+	ld hl, wNamingScreenCurNameLength
 	ld a, [hl]
 	cp $10
 	ret nz
@@ -1301,7 +1301,7 @@ Function124d9: ; 124d9 (4:64d9)
 	ret
 
 Function12552: ; 12552 (4:6552)
-	ld hl, wc5d5
+	ld hl, wNamingScreenCursorObjectPointer
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
@@ -1334,7 +1334,7 @@ Function12558: ; 12558 (4:6558)
 	ret
 
 Function12579: ; 12579 (4:6579)
-	ld a, [wc5d7]
+	ld a, [wNamingScreenLastCharacter]
 	ld hl, $5f23
 	cp $e5
 	jr z, .asm_1258b
@@ -1342,20 +1342,20 @@ Function12579: ; 12579 (4:6579)
 	cp $e4
 	jp nz, Function11ee4
 .asm_1258b
-	ld a, [wc5d2]
+	ld a, [wNamingScreenCurNameLength]
 	and a
 	ret z
 	cp $11
 	jr nz, .asm_1259c
 	push hl
-	ld hl, wc5d2
+	ld hl, wNamingScreenCurNameLength
 	dec [hl]
 	dec [hl]
 	jr .asm_125a1
 
 .asm_1259c
 	push hl
-	ld hl, wc5d2
+	ld hl, wNamingScreenCurNameLength
 	dec [hl]
 .asm_125a1
 	call Function11f9d
diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm
index 37a5207c..5771bd9e 100644
--- a/engine/overworld/init_map.asm
+++ b/engine/overworld/init_map.asm
@@ -19,7 +19,7 @@ Function656b: ; 656b (1:656b)
 	xor a
 	ldh [hLCDCPointer], a
 	ldh [hBGMapMode], a
-	ld hl, wd565
+	ld hl, wEnteredMapFromContinue
 	set 7, [hl]
 	res 2, [hl]
 	ld a, $90
@@ -35,9 +35,9 @@ Function656b: ; 656b (1:656b)
 	call .LoadBGMapAddrIntoHRAM
 	call .WaitTransfer
 	xor a
-	ld [wd05b], a
+	ld [wBGMapAnchor], a
 	ld a, $98
-	ld [wd05c], a
+	ld [wBGMapAnchor + 1], a
 	xor a
 	ldh [hSCX], a
 	ldh [hSCY], a
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index 6909af22..07b53007 100755
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -924,7 +924,7 @@ Function5714: ; 5714 (1:5714)
 	jr nz, .asm_5718
 	ret
 
-Function5730:: ; 5730 (1:5730)
+RefreshPlayerSprite:: ; 5730 (1:5730)
 	ld a, $3e
 	ld [wce87], a
 	ld [wce88], a
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 1ac7fc6a..5fdca29c 100755
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -378,7 +378,7 @@ Function10226: ; 10226 (4:4226)
 	and $3
 	cp e
 	jr nz, .asm_10259
-	call Function22a5
+	call WarpCheck
 	jr nc, .asm_10259
 	call Function102b3
 	scf
diff --git a/engine/overworld/player_step.asm b/engine/overworld/player_step.asm
index a946fca6..8e250295 100755
--- a/engine/overworld/player_step.asm
+++ b/engine/overworld/player_step.asm
@@ -13,7 +13,7 @@ HandlePlayerStep_::
 .asm_d4b6
 	ld a, $4
 	ld [wHandlePlayerStep], a
-	call Functiond53c
+	call UpdateOverworldMap
 	jr .asm_d4c5
 
 .asm_d4c0
@@ -106,98 +106,98 @@ Functiond517: ; d517 (3:5517)
 	inc [hl]
 	ret
 
-Functiond53c: ; d53c (3:553c)
+UpdateOverworldMap:
 	ld a, [wPlayerStepDirection]
 	and a
-	jr z, .asm_d54f
-	cp $1
-	jr z, .asm_d559
-	cp $2
-	jr z, .asm_d563
-	cp $3
-	jr z, .asm_d56d
+	jr z, .step_down
+	cp UP
+	jr z, .step_up
+	cp LEFT
+	jr z, .step_left
+	cp RIGHT
+	jr z, .step_right
 	ret
 
-.asm_d54f
-	call Functiond577
+.step_down
+	call .ScrollOverworldMapDown
 	call LoadMapPart
-	call ScrollMapUp
+	call ScrollMapDown
 	ret
 
-.asm_d559
-	call Functiond5a8
+.step_up
+	call .ScrollOverworldMapUp
 	call LoadMapPart
-	call ScrollMapDown
+	call ScrollMapUp
 	ret
 
-.asm_d563
-	call Functiond5db
+.step_left
+	call .ScrollOverworldMapLeft
 	call LoadMapPart
-	call ScrollMapRight
+	call ScrollMapLeft
 	ret
 
-.asm_d56d
-	call Functiond604
+.step_right
+	call .ScrollOverworldMapRight
 	call LoadMapPart
-	call ScrollMapLeft
+	call ScrollMapRight
 	ret
 
-Functiond577: ; d577 (3:5577)
-	ld a, [wd05b]
-	add $40
-	ld [wd05b], a
-	jr nc, .asm_d58c
-	ld a, [wd05c]
+.ScrollOverworldMapDown:
+	ld a, [wBGMapAnchor]
+	add 2 * BG_MAP_WIDTH
+	ld [wBGMapAnchor], a
+	jr nc, .not_overflowed
+	ld a, [wBGMapAnchor + 1]
 	inc a
-	and $3
-	or $98
-	ld [wd05c], a
-.asm_d58c
+	and %11
+	or HIGH(vBGMap0)
+	ld [wBGMapAnchor + 1], a
+.not_overflowed
 	ld hl, wMetatileStandingY
 	inc [hl]
 	ld a, [hl]
-	cp $2
-	jr nz, .asm_d59a
-	ld [hl], $0
-	call Functiond59b
-.asm_d59a
+	cp 2 ; was 1
+	jr nz, .done_down
+	ld [hl], 0
+	call .ScrollMapDataDown
+.done_down
 	ret
 
-Functiond59b: ; d59b (3:559b)
+.ScrollMapDataDown:
 	ld hl, wOverworldMapAnchor
 	ld a, [wMapWidth]
-	add $6
+	add 3 * 2 ; surrounding tiles
 	add [hl]
 	ld [hli], a
 	ret nc
 	inc [hl]
 	ret
 
-Functiond5a8: ; d5a8 (3:55a8)
-	ld a, [wd05b]
-	sub $40
-	ld [wd05b], a
-	jr nc, .asm_d5bd
-	ld a, [wd05c]
+.ScrollOverworldMapUp:
+	ld a, [wBGMapAnchor]
+	sub 2 * BG_MAP_WIDTH
+	ld [wBGMapAnchor], a
+	jr nc, .not_underflowed
+	ld a, [wBGMapAnchor + 1]
 	dec a
-	and $3
-	or $98
-	ld [wd05c], a
-.asm_d5bd
+	and %11
+	or HIGH(vBGMap0)
+	ld [wBGMapAnchor + 1], a
+.not_underflowed
 	ld hl, wMetatileStandingY
 	dec [hl]
 	ld a, [hl]
-	cp $ff
-	jr nz, .asm_d5cb
+	cp -1 ; was 0
+	jr nz, .done_up
 	ld [hl], $1
-	call Functiond5cc
-.asm_d5cb
+	call .ScrollMapDataUp
+.done_up
 	ret
 
-Functiond5cc: ; d5cc (3:55cc)
+.ScrollMapDataUp:
 	ld hl, wOverworldMapAnchor
 	ld a, [wMapWidth]
-	add $6
+	add 3 * 2 ; surrounding tiles
 	ld b, a
 	ld a, [hl]
 	sub b
@@ -206,8 +206,8 @@ Functiond5cc: ; d5cc (3:55cc)
 	dec [hl]
 	ret
 
-Functiond5db: ; d5db (3:55db)
-	ld a, [wd05b]
+.ScrollOverworldMapLeft:
+	ld a, [wBGMapAnchor]
 	ld e, a
 	and $e0
 	ld d, a
@@ -215,28 +215,28 @@ Functiond5db: ; d5db (3:55db)
 	sub $2
 	and $1f
 	or d
-	ld [wd05b], a
+	ld [wBGMapAnchor], a
 	ld hl, wMetatileStandingX
 	dec [hl]
 	ld a, [hl]
-	cp $ff
-	jr nz, .asm_d5f9
-	ld [hl], $1
-	call Functiond5fa
-.asm_d5f9
+	cp -1
+	jr nz, .done_left
+	ld [hl], 1
+	call .ScrollMapDataLeft
+.done_left
 	ret
 
-Functiond5fa: ; d5fa (3:55fa)
+.ScrollMapDataLeft:
 	ld hl, wOverworldMapAnchor
 	ld a, [hl]
-	sub $1
+	sub 1
 	ld [hli], a
 	ret nc
 	dec [hl]
 	ret
 
-Functiond604: ; d604 (3:5604)
-	ld a, [wd05b]
+.ScrollOverworldMapRight:
+	ld a, [wBGMapAnchor]
 	ld e, a
 	and $e0
 	ld d, a
@@ -244,21 +244,21 @@ Functiond604: ; d604 (3:5604)
 	add $2
 	and $1f
 	or d
-	ld [wd05b], a
+	ld [wBGMapAnchor], a
 	ld hl, wMetatileStandingX
 	inc [hl]
 	ld a, [hl]
-	cp $2
-	jr nz, .asm_d622
-	ld [hl], $0
-	call Functiond623
-.asm_d622
+	cp 2
+	jr nz, .done_right
+	ld [hl], 0
+	call .ScrollMapDataRight
+.done_right
 	ret
 
-Functiond623: ; d623 (3:5623)
+.ScrollMapDataRight:
 	ld hl, wOverworldMapAnchor
 	ld a, [hl]
-	add $1
+	add 1
 	ld [hli], a
 	ret nc
 	inc [hl]
diff --git a/engine/overworld/variables.asm b/engine/overworld/variables.asm
index b40a8a51..445440d2 100755
--- a/engine/overworld/variables.asm
+++ b/engine/overworld/variables.asm
@@ -49,7 +49,7 @@ GetVarAction_::
 	dwb wMapGroup, RETVAR_STRBUF2
 	dwb wMapNumber, RETVAR_STRBUF2
 	dwb .UnownCaught, RETVAR_EXECUTE
-	dwb wPermission, RETVAR_STRBUF2
+	dwb wEnvironment, RETVAR_STRBUF2
 	dwb .BoxFreeSpace, RETVAR_EXECUTE
 	dwb wBugContestMinsRemaining, RETVAR_STRBUF2
 	dwb wXCoord, RETVAR_STRBUF2