Harmonize some more symbols with pokegold

11 files changed, 20 insertions, 20 deletions

diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index 277da60b1..0051d4162 100644
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -76,7 +76,7 @@ Unused_CheckShininess:
 	and a
 	ret
 
-Unreferenced_Function8aa4:
+Unreferenced_SGB_ApplyCreditsPals:
 	push de
 	push bc
 	ld hl, PalPacket_9ce6
@@ -205,7 +205,7 @@ Unreferenced_Function8b67:
 	call GetPredefPal
 	jp LoadHLPaletteIntoDE
 
-Unreferenced_Function8b81:
+Unreferenced_GSIntro_LoadMonPalette:
 	call CheckCGB
 	jr nz, .cgb
 	ldh a, [hSGB]
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm
index 6367bffe6..a784d20e9 100644
--- a/engine/gfx/load_pics.asm
+++ b/engine/gfx/load_pics.asm
@@ -287,7 +287,7 @@ EXPORT PICS_FIX
 	db BANK("Pics 23") ; BANK("Pics 1") + 22
 	db BANK("Pics 24") ; BANK("Pics 1") + 23
 
-Function511ec:
+Unreferenced_GSIntro_GetMonFrontpic:
 	ld a, c
 	push de
 	ld hl, PokemonPicPointers
diff --git a/engine/link/link.asm b/engine/link/link.asm
index 521cfdd8b..18d6a44de 100644
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -2503,8 +2503,8 @@ CableClubCheckWhichChris:
 	ld [wScriptVar], a
 	ret
 
-Unreferenced_Gen1LinkCommsBorderGFX:
-INCBIN "gfx/trade/unused_gen_1_border_tiles.2bpp"
+Unreferenced_GSLinkCommsBorderGFX:
+INCBIN "gfx/trade/unused_gs_border_tiles.2bpp"
 
 Unreferenced_Function29fe4:
 	ld a, BANK(sPartyMail)
diff --git a/engine/link/mystery_gift_2.asm b/engine/link/mystery_gift_2.asm
index 9712c665d..404350396 100644
--- a/engine/link/mystery_gift_2.asm
+++ b/engine/link/mystery_gift_2.asm
@@ -1,6 +1,6 @@
 PrepMysteryGiftDataToSend:
 	ld de, wMysteryGiftStaging
-	ld a, $1
+	ld a, $1 + GS_VERSION
 	ld [de], a
 	inc de ; wc801
 	ld a, BANK(sGameData)
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index c2b9f9f09..63f8e565a 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -363,8 +363,8 @@ Continue:
 	ld c, 20
 	call DelayFrames
 	farcall JumpRoamMons
-	farcall MysteryGift_CopyReceivedDecosToPC ; Mystery Gift
-	farcall Function140ae ; time-related
+	farcall MysteryGift_CopyReceivedDecosToPC
+	farcall ClockContinue
 	ld a, [wSpawnAfterChampion]
 	cp SPAWN_LANCE
 	jr z, .SpawnAfterE4
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 214028bce..1e4210cd3 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -4,7 +4,7 @@ INCBIN "gfx/mobile/mobile_menu.2bpp"
 MainMenu:
 	xor a
 	ld [wDisableTextAcceleration], a
-	call Function49ed0
+	call ClearTilemapEtc
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call SetPalettes
@@ -310,7 +310,7 @@ MainMenu_PrintCurrentTimeAndDay:
 .Day:
 	db "DAY@"
 
-Function49ed0:
+ClearTilemapEtc:
 	xor a
 	ldh [hMapAnims], a
 	call ClearTilemap
diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm
index 814f608f7..885dd379a 100644
--- a/engine/overworld/overworld.asm
+++ b/engine/overworld/overworld.asm
@@ -15,7 +15,7 @@ _ReplaceKrisSprite::
 	call GetUsedSprite
 	ret
 
-Function14146: ; mobile
+_RefreshSprites: ; mobile
 	ld hl, wSpriteFlags
 	ld a, [hl]
 	push af
@@ -26,7 +26,7 @@ Function14146: ; mobile
 	ld [wSpriteFlags], a
 	ret
 
-Function14157: ; mobile
+_ClearSprites: ; mobile
 	ld hl, wSpriteFlags
 	ld a, [hl]
 	push af
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 8e35b3b45..9291192d7 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -2817,9 +2817,9 @@ Script_checksave:
 	ret
 
 ; unused
-	ld a, [.byte]
+	ld a, [.gs_version]
 	ld [wScriptVar], a
 	ret
 
-.byte
-	db 0
+.gs_version
+	db GS_VERSION
diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm
index e26130098..607efcca2 100644
--- a/engine/printer/printer.asm
+++ b/engine/printer/printer.asm
@@ -448,7 +448,7 @@ CheckCancelPrint:
 
 .pressed_b
 	ld a, [wca80]
-	cp $c
+	cp $0c
 	jr nz, .cancel
 .loop
 	ld a, [wPrinterOpcode]
diff --git a/engine/rtc/rtc.asm b/engine/rtc/rtc.asm
index e3007ee4e..c7c4fae9e 100644
--- a/engine/rtc/rtc.asm
+++ b/engine/rtc/rtc.asm
@@ -90,7 +90,7 @@ SaveRTC:
 
 StartClock::
 	call GetClock
-	call Function1409b
+	call _FixDays
 	call FixDays
 	jr nc, .skip_set
 	; bit 5: Day count exceeds 139
@@ -101,7 +101,7 @@ StartClock::
 	call StartRTC
 	ret
 
-Function1409b:
+_FixDays:
 	ld hl, hRTCDayHi
 	bit 7, [hl]
 	jr nz, .set_bit_7
@@ -116,7 +116,7 @@ Function1409b:
 	call RecordRTCStatus ; set bit 7 on sRTCStatusFlags
 	ret
 
-Function140ae:
+ClockContinue:
 	call CheckRTCStatus
 	ld c, a
 	and %11000000 ; Day count exceeded 255 or 16383
diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm
index cdb2c9a12..5b12aec1f 100644
--- a/engine/rtc/timeset.asm
+++ b/engine/rtc/timeset.asm
@@ -593,7 +593,7 @@ InitialClearDSTFlag:
 	text_far _TimeAskOkayText
 	text_end
 
-DebugDisplayTime:
+Unreferenced_MrChrono:
 	hlcoord 1, 14
 	lb bc, 3, SCREEN_WIDTH - 2
 	call ClearBox