14 files changed, 24 insertions, 22 deletions
diff --git a/engine/events/mom.asm b/engine/events/mom.asm
index c1374fa6..18572296 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 OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
+	call CGBOnly_CopyTilemapAtOnce
 	ret
 
 Mom_Wait10Frames:
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 441f38b0..4f2ba801 100755
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -608,7 +608,7 @@ FlyFunction:
 	callasm FlyToAnim
 	special WaitSFX
 	special ReplaceChrisSprite
-	callasm _RefreshSprites
+	callasm _ClearSprites
 	end
 
 WaterfallFunction:
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index 34cb2350..a9a2038a 100755
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -59,7 +59,7 @@ LoadSGBLayoutCGB:
 	dw _CGB_PlayerOrMonFrontpicPals
 	dw _CGB_TradeTube
 	dw _CGB_TrainerOrMonFrontpicPals
-	dw Function9a94
+	dw _CGB_MysteryGift
 	dw _CGB1e
 	dw _CGB_Pokedex_5_5
 
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index 2bc553f2..b60acac8 100755
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -409,7 +409,7 @@ INCLUDE "gfx/mail/mail.pal"
 
 INCLUDE "engine/gfx/cgb_layouts.asm"
 
-Function9a94:
+_CGB_MysteryGift:
 	ld hl, .Palette
 	ld de, wBGPals1
 	ld bc, 1 palettes
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
index a4d88111..c9ee98b7 100644
--- a/engine/gfx/load_pics.asm
+++ b/engine/gfx/load_pics.asm
@@ -146,7 +146,6 @@ GetMonBackpic:
 	jr nz, .ok
 	ld a, [wUnownLetter]
 	ld d, BANK(UnownPicPointers)
-
 .ok
 	dec a
 	ld bc, 6
diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index f50835fa..db4e929f 100755
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -53,7 +53,7 @@ LoadSGBLayout:
 	dw .SGB_TrainerOrMonFrontpicPals
 	dw .SGB_MysteryGift
 	dw .SGB1e
-	dw .SGB1f
+	dw .SGB_Pokedex_5_5
 
 .SGB_BattleGrayscale:
 	ld hl, PalPacket_BattleGrayscale
@@ -224,7 +224,7 @@ LoadSGBLayout:
 	ld de, BlkPacket_Pokedex_PC
 	ret
 
-.SGB1f:
+.SGB_Pokedex_5_5:
 	call .SGB_Pokedex
 	ld de, BlkPacket_9f65
 	ret
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 414c733f..6be015cb 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -1,4 +1,5 @@
 MainMenu_NewGame:
+NewGame:
 	xor a
 	ld [wDebugFlags], a
 	call ResetWRAM
@@ -242,6 +243,7 @@ LoadOrRegenerateLuckyIDNumber:
 	jp CloseSRAM
 
 MainMenu_Continue:
+Continue:
 	farcall TryLoadSaveFile
 	jr c, .FailToLoad
 	call LoadStandardMenuHeader
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 97ac8ed6..4e9113a8 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -171,7 +171,7 @@ MainMenu_PrintCurrentTimeAndDay:
 	jp nz, .PrintTimeNotSet
 	call UpdateTime
 	hlcoord 1, 13
-	ld bc, IncGradGBPalTable_11 + 1
+	lb bc, 4, 13
 	call ClearBox
 	call GetWeekday
 	ld b, a
@@ -241,11 +241,13 @@ ClearTilemapEtc:
 	ret
 
 MainMenu_MysteryGift:
+MysteryGift:
 	call UpdateTime
 	farcall DoMysteryGiftIfDayHasPassed
 	farcall DoMysteryGift
 	ret
 
 MainMenu_Options:
-	farcall OptionsMenu
+OptionsMenu:
+	farcall _OptionsMenu
 	ret
diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm
index 2073e5ca..b678d714 100644
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@@ -559,8 +559,7 @@ _ExitMenu::
 	ld a, [wSpriteUpdatesEnabled]
 	cp 0
 	ret z
-
-	call Functiond2a
+	call ReloadPalettes
 	ret
 
 Function2434b:
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index 1eafbe46..f8207204 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -19,7 +19,7 @@ SaveMenu:
 
 .refused
 	call ExitMenu
-	call Functiond2a
+	call ReloadPalettes
 	farcall SaveMenu_CopyTilemapAtOnce
 	scf
 	ret
@@ -204,7 +204,7 @@ SaveTheGame_yesorno:
 	dec a
 	call CloseWindow
 	push af
-	call Functiond2a
+	call ReloadPalettes
 	pop af
 	and a
 	ret
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
index fa574d07..dbadf637 100644
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -151,7 +151,7 @@ StartMenu::
 	call DrawVariableLengthMenuBox
 	call .DrawBugContestStatus
 	call UpdateSprites
-	call Functiond2a
+	call ReloadPalettes
 	call FinishExitMenu
 	ret
 
@@ -444,7 +444,7 @@ StartMenu_Option:
 ; Game options.
 
 	call FadeToMenu
-	farcall MainMenu_Options
+	farcall OptionsMenu
 	ld a, 6
 	ret
 
diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm
index ea1f6c28..05b15ea9 100644
--- a/engine/overworld/overworld.asm
+++ b/engine/overworld/overworld.asm
@@ -7,7 +7,7 @@ _ReplaceChrisSprite::
 	call GetUsedSprite
 	ret
 
-_ClearSprites::
+_RefreshSprites::
 	ld hl, wSpriteFlags
 	ld a, [hl]
 	push af
@@ -18,7 +18,7 @@ _ClearSprites::
 	ld [wSpriteFlags], a
 	ret
 
-_RefreshSprites::
+_ClearSprites::
 	ld hl, wSpriteFlags
 	ld a, [hl]
 	push af
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm
index 339f7ee0..cd886bc3 100755
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -510,7 +510,7 @@ CopyTempObjectToObjectStruct:
 	ld [hl], a
 	ret
 
-TrainerWalkToPlayer:
+TrainerWalkToPlayer::
 	ldh a, [hLastTalked]
 	call InitMovementBuffer
 	ld a, movement_step_sleep
diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm
index fd5d9a82..ee1afd25 100644
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -428,7 +428,7 @@ GetEggMove:
 	ld a, BANK(EggMovePointers)
 	call GetFarHalfword
 .loop
-	ld a, BANK(EggMovePointers)
+	ld a, BANK("Egg Moves")
 	call GetFarByte
 	cp -1
 	jr z, .reached_end
@@ -617,7 +617,7 @@ GetBreedmonMovePointer:
 	ld hl, wBreedMon2Moves
 	ret
 
-GetHatchlingFrontpic:
+GetEggFrontpic:
 	push de
 	ld [wCurPartySpecies], a
 	ld [wCurSpecies], a
@@ -677,10 +677,10 @@ EggHatch_AnimationSequence:
 	farcall ClearSpriteAnims
 	ld de, vTiles2 tile $00
 	ld a, [wJumptableIndex]
-	call GetHatchlingFrontpic
+	call GetEggFrontpic
 	ld de, vTiles2 tile $31
 	ld a, EGG
-	call GetHatchlingFrontpic
+	call GetEggFrontpic
 	ld de, MUSIC_EVOLUTION
 	call PlayMusic
 	call EnableLCD