All functions in main.asm have non-generic names

3 files changed, 16 insertions, 18 deletions

diff --git a/event/halloffame.asm b/event/halloffame.asm
index 2b2844f78..4d318cafe 100755
--- a/event/halloffame.asm
+++ b/event/halloffame.asm
@@ -3,7 +3,7 @@ HallOfFame:: ; 0x8640e
 	ld a, [StatusFlags]
 	push af
 	ld a, 1
-	ld [wc2cd], a
+	ld [wGameLogicPaused], a
 	call DisableSpriteUpdates
 	ld a, SPAWN_LANCE
 	ld [wSpawnAfterChampion], a
@@ -25,7 +25,7 @@ HallOfFame:: ; 0x8640e
 	callba AddHallOfFameEntry
 
 	xor a
-	ld [wc2cd], a
+	ld [wGameLogicPaused], a
 	call AnimateHallOfFame
 	pop af
 	ld b, a
@@ -44,7 +44,7 @@ RedCredits:: ; 86455
 	xor a
 	ld [VramState], a
 	ld [hMapAnims], a
-	callba Function4e8c2
+	callba InitDisplayForRedCredits
 	ld c, 8
 	call DelayFrames
 	call DisableSpriteUpdates
@@ -67,7 +67,7 @@ HallOfFame_FadeOutMusic: ; 8648e
 	xor a
 	ld [VramState], a
 	ld [hMapAnims], a
-	callba Function4e881
+	callba InitDisplayForHallOfFame
 	ld c, 100
 	jp DelayFrames
 ; 864b4
@@ -230,7 +230,7 @@ GetHallOfFameParty: ; 8653f
 AnimateHOFMonEntrance: ; 865b5
 	push hl
 	call ClearBGPalettes
-	callba Function4e906
+	callba ResetDisplayBetweenHallOfFameMons
 	pop hl
 	ld a, [hli]
 	ld [TempMonSpecies], a
diff --git a/event/mom.asm b/event/mom.asm
index b899fd840..0a1e7d1ae 100644
--- a/event/mom.asm
+++ b/event/mom.asm
@@ -321,13 +321,13 @@ DSTChecks: ; 16439
 	call .ClearBox
 	bccoord 1, 14
 	ld hl, .Text_AdjustClock
-	call PlaceWholeStringInBoxAtOnce
+	call PlaceHLTextAtBC
 	call YesNoBox
 	ret c
 	call .ClearBox
 	bccoord 1, 14
 	ld hl, .Text_LostInstructionBooklet
-	call PlaceWholeStringInBoxAtOnce
+	call PlaceHLTextAtBC
 	ret
 
 .loop
@@ -337,7 +337,7 @@ DSTChecks: ; 16439
 	bit 7, a
 	jr z, .SetDST
 	ld hl, .Text_IsDSTOver
-	call PlaceWholeStringInBoxAtOnce
+	call PlaceHLTextAtBC
 	call YesNoBox
 	ret c
 	ld a, [wDST]
@@ -347,12 +347,12 @@ DSTChecks: ; 16439
 	call .ClearBox
 	bccoord 1, 14
 	ld hl, .Text_SetClockBack
-	call PlaceWholeStringInBoxAtOnce
+	call PlaceHLTextAtBC
 	ret
 
 .SetDST:
 	ld hl, .Text_SwitchToDST
-	call PlaceWholeStringInBoxAtOnce
+	call PlaceHLTextAtBC
 	call YesNoBox
 	ret c
 	ld a, [wDST]
@@ -362,7 +362,7 @@ DSTChecks: ; 16439
 	call .ClearBox
 	bccoord 1, 14
 	ld hl, .Text_SetClockForward
-	call PlaceWholeStringInBoxAtOnce
+	call PlaceHLTextAtBC
 	ret
 ; 164b9
 
diff --git a/event/photo.asm b/event/photo.asm
index 7f6ec9e66..52df8f759 100755
--- a/event/photo.asm
+++ b/event/photo.asm
@@ -132,7 +132,7 @@ UnownPrinter: ; 16be4
 .UpdateUnownFrontpic: ; 16cc8
 	ld a, [wJumptableIndex]
 	cp 26
-	jr z, Function16d20
+	jr z, .vacant
 	inc a
 	ld [UnownLetter], a
 	ld a, UNOWN
@@ -141,18 +141,17 @@ UnownPrinter: ; 16be4
 	ld [wBoxAlignment], a
 	ld de, VTiles2
 	predef GetFrontpic
-	call Function16cff
+	call .Load2bppToSRAM
 	hlcoord 1, 6
 	xor a
 	ld [hGraphicStartTile], a
 	lb bc, 7, 7
 	predef PlaceGraphic
 	ld de, VTiles2 tile $31
-	callba Functione0000
+	callba RotateUnownFrontpic
 	ret
-; 16cff
 
-Function16cff: ; 16cff
+.Load2bppToSRAM: ; 16cff
 	ld a, [rSVBK]
 	push af
 	ld a, $6
@@ -171,9 +170,8 @@ Function16cff: ; 16cff
 	pop af
 	ld [rSVBK], a
 	ret
-; 16d20
 
-Function16d20: ; 16d20
+.vacant
 	hlcoord 1, 6
 	lb bc, 7, 7
 	call ClearBox