Apply most of pokecrystal PR 1105

home/map.asm

@@ -84,12 +84,12 @@ GetMapSceneID::
 	pop bc
 	ret
 
-LoadScreenTilemapAndAttrmapPals::
-	call LoadScreenTilemap
-	call LoadScreenAttrmapPals
+LoadOverworldTilemapAndAttrmapPals::
+	call LoadOverworldTilemap
+	call LoadOverworldAttrmapPals
 	ret
 
-LoadScreenTilemap::
+LoadOverworldTilemap::
 	ldh a, [hROMBank]
 	push af
 
@@ -102,9 +102,9 @@ LoadScreenTilemap::
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 
-	ld a, BANK(_LoadScreenTilemap)
+	ld a, BANK(_LoadOverworldTilemap)
 	rst Bankswitch
-	call _LoadScreenTilemap
+	call _LoadOverworldTilemap
 
 	pop af
 	rst Bankswitch
@@ -2170,7 +2170,7 @@ FadeToMenu::
 	xor a
 	ldh [hBGMapMode], a
 	call LoadStandardMenuHeader
-	farcall FadeOutPalettesToWhite
+	farcall FadeOutToWhite
 	call ClearSprites
 	call DisableSpriteUpdates
 	ret
@@ -2191,7 +2191,7 @@ FinishExitMenu::
 	ld b, CGB_MAPPALS
 	call GetCGBLayout
 	call WaitBGMap2
-	farcall FadeInPalettesFromWhite
+	farcall FadeInFromWhite
 	call EnableSpriteUpdates
 	ret
 
@@ -2237,7 +2237,7 @@ ReloadTilesetAndPalettes::
 	ld c, a
 	call SwitchToAnyMapAttributesBank
 	farcall UpdateTimeOfDayPal
-	call LoadScreenTilemapAndAttrmapPals
+	call LoadOverworldTilemapAndAttrmapPals
 	call LoadTilesetGFX
 	ld a, 9
 	call SkipMusic

home/palettes.asm

@@ -288,8 +288,8 @@ ReloadSpritesNoPalettes::
 	call DelayFrame
 	ret
 
-LoadScreenAttrmapPals::
-	homecall _LoadScreenAttrmapPals
+LoadOverworldAttrmapPals::
+	homecall _LoadOverworldAttrmapPals
 	ret
 
 ScrollBGMapPalettes::

home/scrolling_menu.asm

@@ -20,7 +20,7 @@ ScrollingMenu::
 	ld hl, wVramState
 	bit 0, [hl]
 	jp nz, UpdateTimePals
-	jp SetPalettes
+	jp SetDefaultBGPAndOBP
 
 InitScrollingMenu::
 	ld a, [wMenuBorderTopCoord]

home/serial.asm

@@ -270,7 +270,7 @@ Serial_ExchangeSyncBytes::
 	jr nz, .exchange
 	ret
 
-Serial_PrintWaitingTextAndSyncAndExchangeNybble::
+Serial_PlaceWaitingTextAndSyncAndExchangeNybble::
 	call LoadTilemapToTempTilemap
 	callfar PlaceWaitingText
 	call WaitLinkTransfer

home/text.asm

@@ -208,7 +208,7 @@ BuenaPrintText::
 
 PrintTextboxText::
 	bccoord TEXTBOX_INNERX, TEXTBOX_INNERY
-	call PrintHLTextAtBC
+	call PrintTextboxTextAt
 	ret
 
 PlaceString::
@@ -624,7 +624,7 @@ PokeFluteTerminator::
 .stop:
 	text_end
 
-PrintHLTextAtBC::
+PrintTextboxTextAt::
 	ld a, [wTextboxFlags]
 	push af
 	set TEXT_DELAY_F, a

home/tilemap.asm

@@ -129,12 +129,12 @@ endr
 	ld sp, hl
 	ret
 
-SetPalettes::
+SetDefaultBGPAndOBP::
 ; Inits the Palettes
 ; depending on the system the monochromes palettes or color palettes
 	ldh a, [hCGB]
 	and a
-	jr nz, .SetPalettesForGameBoyColor
+	jr nz, .SetDefaultBGPAndOBPForGameBoyColor
 	ld a, %11100100
 	ldh [rBGP], a
 	ld a, %11010000
@@ -142,7 +142,7 @@ SetPalettes::
 	ldh [rOBP1], a
 	ret
 
-.SetPalettesForGameBoyColor:
+.SetDefaultBGPAndOBPForGameBoyColor:
 	push de
 	ld a, %11100100
 	call DmgToCgbBGPals

home/window.asm

@@ -6,7 +6,7 @@ RefreshScreen::
 	rst Bankswitch
 
 	call ReanchorBGMap_NoOAMUpdate
-	call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
+	call HDMATransferTilemapAndAttrmap_Menu
 	call HideWindow_EnableLCDInt
 
 	pop af
@@ -22,8 +22,8 @@ CloseText::
 	call ClearMenuAndWindowData
 	xor a
 	ldh [hBGMapMode], a
-	call LoadScreenTilemapAndAttrmapPals
-	call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
+	call LoadOverworldTilemapAndAttrmapPals
+	call HDMATransferTilemapAndAttrmap_Menu
 	xor a
 	ldh [hBGMapMode], a
 	call SafeUpdateSprites
@@ -52,7 +52,7 @@ OpenText2bpp::
 	; assumes that the overworld 2bpp font and frame are loaded when calling this
 	call ReanchorBGMap_NoOAMUpdate ; anchor bgmap
 	call SpeechTextbox2bpp
-	call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu ; transfer bgmap
+	call HDMATransferTilemapAndAttrmap_Menu ; transfer bgmap
 	call HideWindow_EnableLCDInt
 
 	pop af
@@ -73,7 +73,7 @@ OpenText1bpp::
 
 	call ReanchorBGMap_NoOAMUpdate ; anchor bgmap
 	call SpeechTextbox1bpp
-	call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu ; transfer bgmap
+	call HDMATransferTilemapAndAttrmap_Menu ; transfer bgmap
 	call LoadFont_NoOAMUpdate ; load 1bpp font and frame, hide window
 
 	pop af
@@ -81,13 +81,13 @@ OpenText1bpp::
 
 	ret
 
-HDMATransferTilemapAndAttrmap_OpenAndCloseMenu::
+HDMATransferTilemapAndAttrmap_Menu::
 	ldh a, [hOAMUpdate]
 	push af
 	ld a, $1
 	ldh [hOAMUpdate], a
 
-	farcall _HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
+	farcall _HDMATransferTilemapAndAttrmap_Menu
 
 	pop af
 	ldh [hOAMUpdate], a