More splits; map setup labels

5 files changed, 35 insertions, 29 deletions

diff --git a/home/audio.asm b/home/audio.asm
index a41fdbf00..9756d0460 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -1,6 +1,6 @@
 ; Audio interfaces.
 
-SoundRestart:: ; 3b4e
+MapSetup_Sound_Off:: ; 3b4e
 
 	push hl
 	push de
@@ -9,11 +9,11 @@ SoundRestart:: ; 3b4e
 
 	ld a, [hROMBank]
 	push af
-	ld a, BANK(_SoundRestart)
+	ld a, BANK(_MapSetup_Sound_Off)
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 
-	call _SoundRestart
+	call _MapSetup_Sound_Off
 
 	pop af
 	ld [hROMBank], a
@@ -81,7 +81,7 @@ PlayMusic:: ; 3b97
 
 	ld a, [hROMBank]
 	push af
-	ld a, BANK(_PlayMusic) ; and BANK(_SoundRestart)
+	ld a, BANK(_PlayMusic) ; and BANK(_MapSetup_Sound_Off)
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 
@@ -93,7 +93,7 @@ PlayMusic:: ; 3b97
 	jr .end
 
 .nomusic
-	call _SoundRestart
+	call _MapSetup_Sound_Off
 
 .end
 	pop af
diff --git a/home/init.asm b/home/init.asm
index ee3e8e4c1..753138748 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -1,6 +1,6 @@
 Reset:: ; 150
 	di
-	call SoundRestart
+	call MapSetup_Sound_Off
 	xor a
 	ld [hMapAnims], a
 	call ClearPalettes
@@ -168,7 +168,7 @@ Init:: ; 17d
 
 	predef Function9853
 
-	call SoundRestart
+	call MapSetup_Sound_Off
 	xor a
 	ld [wMapMusic], a
 	jp GameInit
diff --git a/home/map.asm b/home/map.asm
index bb73f4e03..2e80fb3f6 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -209,8 +209,8 @@ endr
 	ret
 ; 222a
 
-Function222a:: ; 222a
-	ld a, MAPSETUP_10
+ReturnToMapFromSubmenu:: ; 222a
+	ld a, MAPSETUP_SUBMENU
 	ld [hMapEntryMethod], a
 	callba RunMapSetupScript
 	xor a
@@ -1099,13 +1099,14 @@ Call_a_de:: ; 26b7
 ; 26c7
 
 GetMovementData:: ; 26c7
+; Initialize the movement data for person c at b:hl
 	ld a, [hROMBank]
 	push af
 	ld a, b
 	rst Bankswitch
 
 	ld a, c
-	call Function19e9
+	call LoadMovementDataPointer
 
 	pop hl
 	ld a, h
@@ -1964,7 +1965,7 @@ FadeToMenu:: ; 2b29
 	xor a
 	ld [hBGMapMode], a
 	call LoadStandardMenuDataHeader
-	callba FadeBlackBGMap
+	callba FadeOutPalettes
 	call ClearSprites
 	call DisableSpriteUpdates
 	ret
@@ -1972,7 +1973,7 @@ FadeToMenu:: ; 2b29
 
 
 Function2b3c:: ; 2b3c
-	call WhiteBGMap
+	call ClearBGPalettes
 	call Function2bae
 	call UpdateSprites
 	call Call_ExitMenu
@@ -1981,7 +1982,7 @@ Function2b3c:: ; 2b3c
 ; 2b4d
 
 Function2b4d:: ; 2b4d
-	call WhiteBGMap
+	call ClearBGPalettes
 	call Call_ExitMenu
 	call Function2bae
 	call UpdateSprites
@@ -1993,7 +1994,7 @@ Function2b5c:: ; 2b5c
 	call GetSGBLayout
 	callba Function49409
 	call Function3200
-	callba FadeInBGMap
+	callba FadeInPalettes
 	call EnableSpriteUpdates
 	ret
 ; 2b74
@@ -2003,7 +2004,7 @@ Function2b74:: ; 0x2b74
 	push af
 	ld a, $1
 	ld [wc2ce], a
-	call WhiteBGMap
+	call ClearBGPalettes
 	call ClearSprites
 	call Function2bae
 	hlcoord 0, 12
diff --git a/home/map_objects.asm b/home/map_objects.asm
index d52530af1..e5d6dab01 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -428,7 +428,8 @@ Function19b8:: ; 19b8
 
 
 
-Function19e9:: ; 19e9
+LoadMovementDataPointer:: ; 19e9
+; Load the movement data pointer for person a.
 	ld [wMovementPerson], a
 	ld a, [hROMBank]
 	ld [wMovementDataPointer], a
@@ -439,12 +440,15 @@ Function19e9:: ; 19e9
 	ld a, [wMovementPerson]
 	call CheckObjectVisibility
 	ret c
+
 	ld hl, OBJECT_MOVEMENTTYPE
 	add hl, bc
 	ld [hl], SPRITEMOVEDATA_SCRIPTED
+
 	ld hl, OBJECT_09
 	add hl, bc
 	ld [hl], 0
+
 	ld hl, VramState
 	set 7, [hl]
 	and a
@@ -589,14 +593,15 @@ endr
 ; 1aae
 
 Function1aae:: ; 1aae
+; Switch to the movement data bank
 	ld a, [hROMBank]
 	push af
 	ld a, [hli]
 	rst Bankswitch
-
+; Load the current script byte as given by OBJECT_MOVEMENT_BYTE_INDEX, and increment OBJECT_MOVEMENT_BYTE_INDEX
 	ld a, [hli]
 	ld d, [hl]
-	ld hl, OBJECT_27
+	ld hl, OBJECT_MOVEMENT_BYTE_INDEX
 	add hl, bc
 	add [hl]
 	ld e, a
diff --git a/home/serial.asm b/home/serial.asm
index 8b9656262..fdaba6cc5 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -6,7 +6,7 @@ Serial:: ; 6ef
 	push de
 	push hl
 
-	ld a, [$ffc9]
+	ld a, [hFFC9]
 	and a
 	jr nz, .asm_71c
 
@@ -77,7 +77,7 @@ Serial:: ; 6ef
 
 .asm_752
 	ld a, $1
-	ld [$ffca], a
+	ld [hFFCA], a
 	ld a, $fe
 	ld [hSerialSend], a
 
@@ -91,7 +91,7 @@ Serial:: ; 6ef
 
 Function75f:: ; 75f
 	ld a, $1
-	ld [$ffcc], a
+	ld [hFFCC], a
 .asm_763
 	ld a, [hl]
 	ld [hSerialSend], a
@@ -103,7 +103,7 @@ Function75f:: ; 75f
 .asm_76e
 	dec a
 	jr nz, .asm_76e
-	ld a, [$ffcc]
+	ld a, [hFFCC]
 	and a
 	ld a, b
 	pop bc
@@ -112,7 +112,7 @@ Function75f:: ; 75f
 	cp $fd
 	jr nz, .asm_763
 	xor a
-	ld [$ffcc], a
+	ld [hFFCC], a
 	jr .asm_763
 
 .asm_782
@@ -127,7 +127,7 @@ Function75f:: ; 75f
 
 Function78a:: ; 78a
 	xor a
-	ld [$ffca], a
+	ld [hFFCA], a
 	ld a, [hLinkPlayerNumber]
 	cp $2
 	jr nz, .asm_79b
@@ -137,7 +137,7 @@ Function78a:: ; 78a
 	ld [rSC], a
 
 .asm_79b
-	ld a, [$ffca]
+	ld a, [hFFCA]
 	and a
 	jr nz, .asm_7e5
 	ld a, [hLinkPlayerNumber]
@@ -182,7 +182,7 @@ Function78a:: ; 78a
 
 .asm_7e5
 	xor a
-	ld [$ffca], a
+	ld [hFFCA], a
 	ld a, [rIE]
 	and $f
 	sub $8
@@ -251,7 +251,7 @@ Function83b:: ; 83b
 	ld de, wcf51
 	ld c, $2
 	ld a, $1
-	ld [$ffcc], a
+	ld [hFFCC], a
 .asm_847
 	call DelayFrame
 	ld a, [hl]
@@ -259,10 +259,10 @@ Function83b:: ; 83b
 	call Function78a
 	ld b, a
 	inc hl
-	ld a, [$ffcc]
+	ld a, [hFFCC]
 	and a
 	ld a, $0
-	ld [$ffcc], a
+	ld [hFFCC], a
 	jr nz, .asm_847
 	ld a, b
 	ld [de], a