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

5 files changed, 80 insertions, 80 deletions

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