Harmonize some more symbols with pokegold

constants/map_constants.asm

@@ -491,3 +491,5 @@ ENDM
 	map_const ROUTE_30_BERRY_HOUSE,                         4,  4 ;  9
 	map_const MR_POKEMONS_HOUSE,                            4,  4 ; 10
 	map_const ROUTE_31_VIOLET_GATE,                         5,  4 ; 11
+
+NUM_MAP_GROUPS EQU const_value ; 26

constants/sprite_constants.asm

@@ -43,7 +43,7 @@
 	const SPRITE_YOUNGSTER ; 27
 	const SPRITE_LASS ; 28
 	const SPRITE_TEACHER ; 29
-	const SPRITE_BUENA ; 2a
+	const SPRITE_BEAUTY ; 2a
 	const SPRITE_SUPER_NERD ; 2b
 	const SPRITE_ROCKER ; 2c
 	const SPRITE_POKEFAN_M ; 2d

data/maps/outdoor_sprites.asm

@@ -294,7 +294,7 @@ IndigoGroupSprites:
 	db SPRITE_SUDOWOODO
 	db SPRITE_BIG_SNORLAX
 	db SPRITE_POKEFAN_M
-	db SPRITE_BUENA
+	db SPRITE_BEAUTY
 	db SPRITE_GRAMPS
 	db SPRITE_YOUNGSTER
 	db SPRITE_FISHER
@@ -496,7 +496,7 @@ CianwoodGroupSprites:
 	db SPRITE_OLIVINE_RIVAL
 	db SPRITE_POKEFAN_M
 	db SPRITE_LASS
-	db SPRITE_BUENA
+	db SPRITE_BEAUTY
 	db SPRITE_SWIMMER_GIRL
 	db SPRITE_SAILOR
 	db SPRITE_POKEFAN_F
@@ -521,7 +521,7 @@ OlivineGroupSprites:
 	db SPRITE_OLIVINE_RIVAL
 	db SPRITE_POKEFAN_M
 	db SPRITE_LASS
-	db SPRITE_BUENA
+	db SPRITE_BEAUTY
 	db SPRITE_SWIMMER_GIRL
 	db SPRITE_SAILOR
 	db SPRITE_POKEFAN_F

data/sprites/sprites.asm

@@ -47,7 +47,7 @@ OverworldSprites:
 	overworld_sprite YoungsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
 	overworld_sprite LassSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
 	overworld_sprite TeacherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BuenaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BeautySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
 	overworld_sprite SuperNerdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
 	overworld_sprite RockerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
 	overworld_sprite PokefanMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

data/trainers/sprites.asm

@@ -28,11 +28,11 @@ BTTrainerClassSprites:
 	db SPRITE_JANINE
 	db SPRITE_COOLTRAINER_M
 	db SPRITE_COOLTRAINER_F
-	db SPRITE_BUENA
+	db SPRITE_BEAUTY
 	db SPRITE_SUPER_NERD
 	db SPRITE_ROCKET
 	db SPRITE_GENTLEMAN
-	db SPRITE_BUENA
+	db SPRITE_BEAUTY
 	db SPRITE_TEACHER
 	db SPRITE_SABRINA
 	db SPRITE_BUG_CATCHER

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]

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

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)

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)

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

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

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

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

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]

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

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

gfx/sprites.asm

@@ -41,7 +41,7 @@ TwinSpriteGFX::                INCBIN "gfx/sprites/twin.2bpp"
 YoungsterSpriteGFX::           INCBIN "gfx/sprites/youngster.2bpp"
 LassSpriteGFX::                INCBIN "gfx/sprites/lass.2bpp"
 TeacherSpriteGFX::             INCBIN "gfx/sprites/teacher.2bpp"
-BuenaSpriteGFX::               INCBIN "gfx/sprites/buena.2bpp"
+BeautySpriteGFX::              INCBIN "gfx/sprites/beauty.2bpp"
 SuperNerdSpriteGFX::           INCBIN "gfx/sprites/super_nerd.2bpp"
 RockerSpriteGFX::              INCBIN "gfx/sprites/rocker.2bpp"
 

gfx/tileset_palette_maps.asm

@@ -108,4 +108,5 @@ INCLUDE "gfx/tilesets/battle_tower_inside_palette_map.asm"
 TilesetBattleTowerOutsidePalMap:
 INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
 
-	ds 26, $06 ; unused
+Unreferenced_MapGroupPalettes:
+	ds NUM_MAP_GROUPS, PAL_BG_ROOF