Events and some WRAM cleanup

home/map.asm

@@ -1988,7 +1988,7 @@ FadeToMenu:: ; 2b29
 
 CloseSubmenu:: ; 2b3c
 	call ClearBGPalettes
-	call Function2bae
+	call ReloadTilesetAndPalettes
 	call UpdateSprites
 	call Call_ExitMenu
 	call ret_d90
@@ -1998,7 +1998,7 @@ CloseSubmenu:: ; 2b3c
 ExitAllMenus:: ; 2b4d
 	call ClearBGPalettes
 	call Call_ExitMenu
-	call Function2bae
+	call ReloadTilesetAndPalettes
 	call UpdateSprites
 	call ret_d90
 Function2b5c:: ; 2b5c
@@ -2011,13 +2011,13 @@ Function2b5c:: ; 2b5c
 	ret
 ; 2b74
 
-Function2b74:: ; 0x2b74
+ReturnToMapWithSpeechTextbox:: ; 0x2b74
 	push af
 	ld a, $1
 	ld [wSpriteUpdatesEnabled], a
 	call ClearBGPalettes
 	call ClearSprites
-	call Function2bae
+	call ReloadTilesetAndPalettes
 	hlcoord 0, 12
 	lb bc, 4, 18
 	call TextBox
@@ -2036,7 +2036,7 @@ Function2b74:: ; 0x2b74
 	ret
 ; 0x2bae
 
-Function2bae:: ; 2bae
+ReloadTilesetAndPalettes:: ; 2bae
 	call DisableLCD
 	call ClearSprites
 	callba RefreshSprites

home/menu.asm

@@ -249,7 +249,7 @@ SetUpMenu:: ; 1e70
 
 MenuFunc_1e7f::
 	call CopyMenuData2
-	call Function1ebd
+	call GetMenuIndexSet
 	call Function1ea6
 	call MenuBox
 	ret
@@ -257,7 +257,7 @@ MenuFunc_1e7f::
 MenuWriteText::
 	xor a
 	ld [hBGMapMode], a
-	call Function1ebd ; sort out the text
+	call GetMenuIndexSet ; sort out the text
 	call Function1eda ; actually write it
 	call Function2e31
 	ld a, [hOAMUpdate]
@@ -286,12 +286,12 @@ Function1ea6:: ; 1ea6
 	ret
 ; 1ebd
 
-Function1ebd:: ; 1ebd
+GetMenuIndexSet:: ; 1ebd
 	ld hl, wMenuData2IndicesPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wcf76]
+	ld a, [wWhichIndexSet]
 	and a
 	jr z, .skip
 	ld b, a
@@ -404,7 +404,7 @@ Function1f2a:: ; 1f2a
 	ld [wMenuJoypad], a
 
 .asm_1f57
-	call Function1ebd
+	call GetMenuIndexSet
 	ld a, [wMenuCursorY]
 	ld l, a
 	ld h, $0

home/time.asm

@@ -187,14 +187,14 @@ FixTime:: ; 61d
 	ret
 ; 658
 
-Function658:: ; 658
+SetTimeOfDay:: ; 658
 	xor a
 	ld [StringBuffer2], a
 	ld a, $0 ; useless
 	ld [StringBuffer2 + 3], a
-	jr Function677
+	jr InitTime
 
-Function663:: ; 663
+SetDayOfWeek:: ; 663
 	call UpdateTime
 	ld a, [hHours]
 	ld [StringBuffer2 + 1], a
@@ -202,10 +202,10 @@ Function663:: ; 663
 	ld [StringBuffer2 + 2], a
 	ld a, [hSeconds]
 	ld [StringBuffer2 + 3], a
-	jr Function677 ; useless
+	jr InitTime ; useless
 
-Function677:: ; 677
-	callba Function140ed
+InitTime:: ; 677
+	callba _InitTime
 	ret
 ; 67e