51 changed files with 118 additions and 80 deletions
--- a/scripts/_00E_BrawlControl.pex
+++ b/scripts/_00E_BrawlControl.pex
--- a/scripts/_00E_EngineBugfixAlias.pex
+++ b/scripts/_00E_EngineBugfixAlias.pex
--- a/scripts/_00E_HelpMessage.pex
+++ b/scripts/_00E_HelpMessage.pex
--- a/scripts/_00e_epupdatefunctions.pex
+++ b/scripts/_00e_epupdatefunctions.pex
--- a/scripts/_00e_fs_nq01_functions.pex
+++ b/scripts/_00e_fs_nq01_functions.pex
--- a/scripts/_00e_fs_nq07_functions.pex
+++ b/scripts/_00e_fs_nq07_functions.pex
--- a/scripts/_00e_mq01_functions.pex
+++ b/scripts/_00e_mq01_functions.pex
--- a/scripts/_00e_mq08triggerhouse.pex
+++ b/scripts/_00e_mq08triggerhouse.pex
--- a/scripts/_00e_mq10b_lisharitriggerbox.pex
+++ b/scripts/_00e_mq10b_lisharitriggerbox.pex
--- a/scripts/_00e_mq11a_functions.pex
+++ b/scripts/_00e_mq11a_functions.pex
--- a/scripts/_00e_mqp02_functions.pex
+++ b/scripts/_00e_mqp02_functions.pex
--- a/scripts/_00e_mqp03_functions.pex
+++ b/scripts/_00e_mqp03_functions.pex
--- a/scripts/_00e_nq12functions.pex
+++ b/scripts/_00e_nq12functions.pex
--- a/scripts/_00e_nq16note.pex
+++ b/scripts/_00e_nq16note.pex
--- a/scripts/_00e_nq26_questfunctions.pex
+++ b/scripts/_00e_nq26_questfunctions.pex
--- a/scripts/_00e_nq_g_03_functions.pex
+++ b/scripts/_00e_nq_g_03_functions.pex
--- a/scripts/_00e_nq_g_07_functions.pex
+++ b/scripts/_00e_nq_g_07_functions.pex
--- a/scripts/_00e_peaceweedplayeraliasscript.pex
+++ b/scripts/_00e_peaceweedplayeraliasscript.pex
--- a/scripts/_00e_phasmalist_apparationtoplayer.pex
+++ b/scripts/_00e_phasmalist_apparationtoplayer.pex
--- a/scripts/_00e_phasmalist_playeraliasscript.pex
+++ b/scripts/_00e_phasmalist_playeraliasscript.pex
--- a/scripts/_00e_showsneakhelpmessage.pex
+++ b/scripts/_00e_showsneakhelpmessage.pex
--- a/scripts/_00e_showthoughtmessageonactivate.pex
+++ b/scripts/_00e_showthoughtmessageonactivate.pex
--- a/scripts/_00e_showtutorialmessage.pex
+++ b/scripts/_00e_showtutorialmessage.pex
--- a/scripts/_sag_activ_diceblackjackmainsscript.pex
+++ b/scripts/_sag_activ_diceblackjackmainsscript.pex
--- a/scripts/_sag_playcards_mainscript.pex
+++ b/scripts/_sag_playcards_mainscript.pex
--- a/scripts/scriptarchiveorder.txt
+++ b/scripts/scriptarchiveorder.txt
@ -4798,4 +4798,3 @@ scripts\_00E_UpdateSpeedmult.pex
 scripts\_00E_AutolearnEffectsAlias.pex
 scripts\_00E_ArcaneArrowEffect.pex
 scripts\_00E_AlchArcaneFever.pex
-scripts\_00E_HelpMessage.pex
--- a/source/scripts/_00E_BrawlControl.psc
+++ b/source/scripts/_00E_BrawlControl.psc
@ -9,7 +9,8 @@ EndFunction
 Function ShowBrawlTutorial()

 	If _00E_DisableSkillTutorials.GetValueInt() == 0
-		_00E_HelpMessage.Show(_00E_Tutorial_Brawl, 3)
+		Message.ResetHelpMessage("Brawl")
+		_00E_Tutorial_Brawl.ShowAsHelpMessage("Brawl", 3, 3, 1)
 	EndIf

 EndFunction
--- a/source/scripts/_00E_EngineBugfixAlias.psc
+++ b/source/scripts/_00E_EngineBugfixAlias.psc
@ -1,7 +1,7 @@
 Scriptname _00E_EngineBugfixAlias extends ReferenceAlias Hidden 

 int function _GetScriptVersion() Global
-	return 2
+	return 1
 endFunction

 Event OnInit()
@ -21,7 +21,7 @@ Event OnPlayerLoadGame()
 		_ResetPerk(PlayerREF, _00E_Class_Vagrant_P05_B_Lightweight)
 	EndIf
 	
-	; Wait for game mode
+	; ResetHelpMessage crashes the game when called in menu mode, for instance, when loading a savegame fails due to missing mods
 	Utility.Wait(0.05)

 	; If a help message is visible during game reload, it gets stuck on screen
@ -44,7 +44,8 @@ EndFunction

 Event _ClearStuckHelpMessages()
 	if EnderalFunctions.GetNewGameCount() > 1
-		_00E_HelpMessage.Show(_00E_EmptyMessage, 0.1)
+		Message.ResetHelpMessage("Empty")
+		_00E_EmptyMessage.ShowAsHelpMessage("Empty", 0.1, 10, 1)
 	endif
 EndEvent

--- a/source/scripts/_00E_HelpMessage.psc
+++ b/source/scripts/_00E_HelpMessage.psc
@ -1,7 +0,0 @@
-Scriptname _00E_HelpMessage
-
-Function Show(Message aMsg, float afDuration, float afInterval = 1.0, int aiMaxTimes = 1) global
-
-	aMsg.ShowAsHelpMessage("MessageId" + Utility.GetCurrentGameTime(), afDuration, afInterval, aiMaxTimes)
-	
-endfunction
--- a/source/scripts/_00e_epupdatefunctions.psc
+++ b/source/scripts/_00e_epupdatefunctions.psc
@ -16,7 +16,7 @@ int IntimidationsCounter = 0
 int QuestsCompletedCounter = 0

 int function _GetScriptVersion() Global
-    return 2
+    return 1
 endFunction

 ;=====================================================================================
@ -115,7 +115,8 @@ State RealPlayer

 		if ShowEXPMessage == False && PlayerEXP.GetValue() >= 120 && (_00E_DisableQuestTutorials.GetValueInt() == 0)
 			ShowEXPMessage = true
-			_00E_HelpMessage.Show(_00E_Tutorial_EPSystem, 4)
+			Message.ResetHelpMessage("Empty")
+			_00E_Tutorial_EPSystem.ShowAsHelpMessage("Empty", 4.0, 3.0, 1)
 		EndIf
 		
 		If _00E_OreVeinsMined.GetValueInt() >= 50 && !bOreAchievementUnlocked
@ -156,7 +157,8 @@ State RealPlayer
 				iArcaneFeverWarnCounter -= 1
 				If iArcaneFeverWarnCounter <= 0
 					iArcaneFeverWarnCounter = 20
-					_00E_HelpMessage.Show(_00E_Player_sArcaneFever_Critical, 5)
+					Message.ResetHelpMessage("Empty")
+					_00E_Player_sArcaneFever_Critical.ShowAsHelpMessage("Empty", 5, 1, 1)
 				EndIf
 			Else ; iArcaneFever < 90
 				iArcaneFeverWarnCounter = 0 ; Reset
@ -165,7 +167,8 @@ State RealPlayer
 			If iArcaneFever >= 40
 				If Player.HasSpell(_00E_Arkanistenfieber40) == False
 					Player.AddSpell(_00E_Arkanistenfieber40,0)
-					_00E_HelpMessage.Show(_00E_Player_sArcaneFever_Worsen, 3)
+					Message.ResetHelpMessage("Empty")
+					_00E_Player_sArcaneFever_Worsen.ShowAsHelpMessage("Empty", 3, 1, 1)
 				EndIf
 			Else ; iArcaneFever < 40
 				If Player.HasSpell(_00E_Arkanistenfieber40)
@ -177,7 +180,8 @@ State RealPlayer
 			If iArcaneFever >= 70
 				If Player.HasSpell(_00E_Arkanistenfieber70) == False
 					Player.AddSpell(_00E_Arkanistenfieber70,0)
-					_00E_HelpMessage.Show(_00E_Player_sArcaneFever_Worsen, 4)
+					Message.ResetHelpMessage("Empty")
+					_00E_Player_sArcaneFever_Worsen.ShowAsHelpMessage("Empty", 4, 1, 1)
 				EndIf
 			Else ; iArcaneFever < 70
 				If Player.HasSpell(_00E_Arkanistenfieber70)
--- a/source/scripts/_00e_fs_nq01_functions.psc
+++ b/source/scripts/_00e_fs_nq01_functions.psc
@ -1,7 +1,7 @@
 Scriptname _00E_FS_NQ01_Functions extends Quest Conditional

 int function _GetScriptVersion() Global
-    return 2
+    return 1
 endFunction

 ;=====================================================================================
@ -557,7 +557,7 @@ Function UpdateObjectives02()
 		IncreaseArcaneFever(10, 90)
 		
 		_00E_FS_NQ01_RespectedYuslansWish.SetValueInt(1)
-		_00E_FS_NQ01_YuslanThought.ShowAsHelpMessage("_00E_FS_NQ01_YuslanThought", 5, 1, 1)
+		_00E_FS_NQ01_YuslanThought.ShowAsHelpMessage("Jump", 5, 1, 1)
 		SetObjectiveCompleted(50)
 		SetObjectiveDisplayed(55, False)
 		SetObjectiveDisplayed(60)
--- a/source/scripts/_00e_fs_nq07_functions.psc
+++ b/source/scripts/_00e_fs_nq07_functions.psc
@ -505,6 +505,7 @@ EndFunction

 Function ShowThoughts()

+	; Message.ResetHelpMessage("Empty")
 	; _00E_FS_NQ07_Thoughts.ShowAsHelpMessage("Empty", 5, 1, 1)
 	
 EndFunction
--- a/source/scripts/_00e_mq01_functions.psc
+++ b/source/scripts/_00e_mq01_functions.psc
@ -3,7 +3,7 @@ scriptName _00E_MQ01_Functions extends Quest Conditional
 Import Utility

 int function _GetScriptVersion() Global
-    return 2
+    return 1
 endFunction

 ;=====================================================================================
@ -24,7 +24,8 @@ EndFunction

 Function ShowDialogueTutorial()

-	_00E_MQP03_Tutorial_Dialogues.ShowAsHelpMessage("_00E_MQP03_Tutorial_Dialogues", 5 as Float, 1 as Float, 1)
+	Message.ResetHelpMessage("Empty")
+	_00E_MQP03_Tutorial_Dialogues.ShowAsHelpMessage("Empty", 5 as Float, 1 as Float, 1)

 EndFunction

@ -40,7 +41,8 @@ Function BeginHeadache()
 	_00E_BlitzheilungArkanistenfieber_sFeverIncreased.Show(15.0, -1*PlayerREF.GetActorValue("LastFlattered"))
 	debug.SendAnimationEvent(PlayerREF as objectreference, "StaggerPlayer")
 	MagVampireSunlight.Play(PlayerREF as objectreference)
-	_00E_MQ01_ThoughtsHeadache.ShowAsHelpMessage("_00E_MQ01_ThoughtsHeadache", 3 as Float, 1 as Float, 1)
+	Message.ResetHelpMessage("Empty")
+	_00E_MQ01_ThoughtsHeadache.ShowAsHelpMessage("Empty", 3 as Float, 1 as Float, 1)
 	_00E_MQ01_HeadacheShort.apply(1.00000)
 	Wait(1)
 	SoundID01 = UIHealthHeartbeatALP.Play(PlayerREF as objectreference)
--- a/source/scripts/_00e_mq08triggerhouse.psc
+++ b/source/scripts/_00e_mq08triggerhouse.psc
@ -3,10 +3,12 @@ Scriptname _00E_MQ08TriggerHouse extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)

 	if MQ08_IntoTheDeep.GetCurrentStageID() == 180 && akActionRef == Game.GetPlayer() && DoOnce == False
+		Message.ResetHelpMessage("Jump")
+		_00E_MQ08_HouseMessage01.ShowAsHelpMessage("Jump", 2, 1, 1)
 		DoOnce = True
-		_00E_MQ08_HouseMessage01.ShowAsHelpMessage("_00E_MQ08_HouseMessage01", 2, 1, 1)
 		Utility.Wait(2.0)
-		_00E_MQ08_HouseMessage02.ShowAsHelpMessage("_00E_MQ08_HouseMessage02", 2, 1, 1)
+		Message.ResetHelpMessage("Jump")
+		_00E_MQ08_HouseMessage02.ShowAsHelpMessage("Jump", 2, 1, 1)
 		Utility.Wait(3.0)
 		MQ08_IntoTheDeep.SetCurrentStageID(185)
 	EndIf
--- a/source/scripts/_00e_mq10b_lisharitriggerbox.psc
+++ b/source/scripts/_00e_mq10b_lisharitriggerbox.psc
@ -4,7 +4,8 @@ Scriptname _00E_MQ10b_LishariTriggerbox extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)

 	if akActionRef == Game.GetPlayer() && MQ10b.GetCurrentStageID() == 70 && DoOnce == 0
-		_00E_HelpMessage.Show(_00E_MQ10b_ThiningMessage01, 3)
+		Message.ResetHelpMessage("Empty")
+		_00E_MQ10b_ThiningMessage01.ShowAsHelpMessage("Empty", 3, 2, 1)
 		_00E_MC_YuslanRef.EnableNoWait()
 		_00E_MC_YuslanRef.MoveTo(mq10bYuslanPortDeathscene)
 		Game.DisablePlayerControls()
--- a/source/scripts/_00e_mq11a_functions.psc
+++ b/source/scripts/_00e_mq11a_functions.psc
@ -6,7 +6,7 @@ Import Debug
 Import _00E_PlayerFunctions

 int function _GetScriptVersion() Global
-    return 2
+    return 1
 endFunction

 ;=====================================================================================
@ -510,8 +510,9 @@ EndFunction

 Function ShowTutorialMessage02()

+    Message.ResetHelpMessage("MQ11a_TutorialCrosshair")
 	If _00E_DisableQuestTutorials.GetValueInt() == 0
-		_00E_MQ11a_TutorialArrows.ShowAsHelpMessage("MQ11a_TutorialArrows", 5, 1, 1)
+		_00E_MQ11a_TutorialArrows.ShowAsHelpMessage("MQ11a_TutorialArrows", 5, 5, 1)
 	EndIf

 EndFunction
@ -543,6 +544,10 @@ Function ExplodeGears()

    UnregisterForUpdate()
 	
+    Message.ResetHelpMessage("MQ11a_TutorialArrows")
+    Message.ResetHelpMessage("MQ11a_TutorialCrosshair")
+    Message.ResetHelpMessage("Telekinesis")
+
    Wait(1)
    MQ11a_SC12_ExplosionMarker.PlaceAtMe(_00E_HarmlessFireExplosion, 1)
    Game.ShakeCamera()
@ -1279,7 +1284,8 @@ Function StopVision()
    (PlayerREF as _00E_PlayerFunctions).ResumeRandomHeadTracking()
    MQ11a_SC25_MayasREF.SetAlpha(0.0) ; Some kind of failsave inherited from old _00E_MQ11a_SC25_FailsaveSC
    Wait(3)
-	_00E_HelpMessage.Show(_00E_MQ11a_SC23_MayaMessage, 5)
+    Message.ResetHelpMessage("MQ11a_TutorialArrows")
+    _00E_MQ11a_SC23_MayaMessage.ShowAsHelpMessage("MQ11a_TutorialMaya", 5, 1, 1)
    
 EndFunction

@ -1287,6 +1293,7 @@ EndFunction

 Function StartLastFight()

+    Message.ResetHelpMessage("MQ11a_TutorialMaya")
    SwitchAllTeleportation(False)
    
    Game.RequestAutoSave()
@ -1406,7 +1413,7 @@ Function CaliaAndVeiledWomanDisappear()
    (PlayerREF as _00E_PlayerFunctions).ResumeRandomHeadTracking()
    Self.SetCurrentStageID(210)
    MQ11a_SC26_DoorREF.BlockActivation(False)
-	_00E_HelpMessage.Show(_00E_MQ11a_SC23_Calia, 5)
+    _00E_MQ11a_SC23_Calia.ShowAsHelpMessage("MQ11aFinalCalia", 5, 1, 1)

 EndFunction

@ -1572,8 +1579,9 @@ Event OnUpdate()
    If MQ11a_LeftTowerLocal == 3

    	If PlayerREF.GetItemCount(_00E_MQ11a_SC9_GunpowderSatchel) == 0
+	        Message.ResetHelpMessage("MQ11a_TutorialCrosshair")
 	        If _00E_DisableQuestTutorials.GetValueInt() == 0
-				_00E_HelpMessage.Show(_00E_MQ11a_Tutorial_Telekinesis, 5)
+				_00E_MQ11a_Tutorial_Telekinesis.ShowAsHelpMessage("Telekinesis", 5, 1, 1)
 			EndIf

 			Return
--- a/source/scripts/_00e_mqp02_functions.psc
+++ b/source/scripts/_00e_mqp02_functions.psc
@ -3,7 +3,7 @@ Scriptname _00E_MQP02_Functions extends Quest Conditional
 Import Utility

 int function _GetScriptVersion() Global
-    return 2
+    return 1
 endFunction

 ;=====================================================================================
@ -128,6 +128,7 @@ EndFunction

 Function ShowLanternMessage()
 		
+	Message.ResetHelpMessage("Activate")
 	_00E_MQP02_Tutorial_Activate.ShowAsHelpMessage("Activate", 5, 1, 1)

 EndFunction
@ -158,6 +159,7 @@ EndFunction

 Function StartCombatMusic()

+	Message.ResetHelpMessage("Attack")
 	Game.RequestAutoSave()
 	_00E_MQP02_CombatMusic.Add()
 	MQP02_SC4_JailDoor.Lock(True)
--- a/source/scripts/_00e_mqp03_functions.psc
+++ b/source/scripts/_00e_mqp03_functions.psc
@ -4,7 +4,7 @@ Import Utility
 Import Game

 int function _GetScriptVersion() Global
-    return 2
+    return 1
 endFunction

 ;=====================================================================================
@ -15,9 +15,11 @@ Event OnUpdate()

 	If (Self.GetCurrentStageID() < 20) && _00E_DisableMenuTutorials.GetValueInt() == 0
 		If Game.UsingGamepad()
-			_00E_MQP03_Tutorial_LeaveMenuHintConsole.ShowAsHelpMessage("_00E_MQP03_Tutorial_LeaveMenuHintConsole", 5, 1, 1)
+			Message.ResetHelpMessage("Empty")
+			_00E_MQP03_Tutorial_LeaveMenuHintConsole.ShowAsHelpMessage("Empty", 5, 1, 1)
 		Else
-			_00E_MQP03_Tutorial_LeaveMenuHint.ShowAsHelpMessage("_00E_MQP03_Tutorial_LeaveMenuHint", 5, 1, 1)
+			Message.ResetHelpMessage("Empty")
+			_00E_MQP03_Tutorial_LeaveMenuHint.ShowAsHelpMessage("Empty", 5, 1, 1)
 		EndIf
 		RegisterForSingleUpdate(15)
 	Else
@ -57,7 +59,8 @@ Function ShowVisionBinkMovie()
 EndFunction

 function SetupPlayer()
-	_00E_MQP03_Thoughts01.ShowAsHelpMessage("_00E_MQP03_Thoughts01", 5, 1, 1)
+	Message.ResetHelpMessage("Empty")
+	_00E_MQP03_Thoughts01.ShowAsHelpMessage("Empty", 5, 1, 1)
 	Game.SetInCharGen(false, true, false)
 	PlayerREF.AddShout(_00E_Class_Meditate)
 	PlayerREF.EquipShout(_00E_Class_Meditate)
@ -99,7 +102,8 @@ Function ShowThoughtBox()
 	AudioCategoryAMB.Unmute() 
 	AudioCategoryAMB2x.Unmute() 
 	AudioCategoryAMBr.Unmute() 
-	_00E_MQP03_Thoughts03.ShowAsHelpMessage("_00E_MQP03_Thoughts03", 5, 1, 1)
+	Message.ResetHelpMessage("Empty")
+	_00E_MQP03_Thoughts03.ShowAsHelpMessage("Empty", 5, 1, 1)

 EndFunction

@ -111,32 +115,37 @@ EndFunction

 Function ShowSkillbookTutorial()
 	If _00E_DisableMenuTutorials.GetValueInt() == 0
-		_00E_MQP03_Tutorial_Skillbooks.ShowAsHelpMessage("_00E_MQP03_Tutorial_Skillbooks", 4, 1, 1)
+		Message.ResetHelpMessage("Empty")
+		_00E_MQP03_Tutorial_Skillbooks.ShowAsHelpMessage("Empty", 4, 1, 1)
 	EndIf
 	Lernpunkte.SetValueInt(1)
 	_00E_MQP03_sLearningPointGained.Show(1)
 	Wait(6)
 	If _00E_DisableMenuTutorials.GetValueInt() == 0
-		_00E_MQP03_Tutorial_Skillbooks2.ShowAsHelpMessage("_00E_MQP03_Tutorial_Skillbooks2", 4, 1, 1)
+		Message.ResetHelpMessage("Empty")
+		_00E_MQP03_Tutorial_Skillbooks2.ShowAsHelpMessage("Empty", 4, 1, 1)
 	EndIf
 EndFunction

 Function ShowSleepTutorial()
 	If _00E_DisableOtherTutorials.GetValueInt() == 0
-		_00E_MQP03_Tutorial_Rest.ShowAsHelpMessage("_00E_MQP03_Tutorial_Rest", 5, 1, 1)
+		Message.ResetHelpMessage("Empty")
+		_00E_MQP03_Tutorial_Rest.ShowAsHelpMessage("Empty", 5, 1, 1)
 	EndIf
 EndFunction


 Function ShowThoughtBox05()

-	_00E_MQP03_Thoughts05.ShowAsHelpMessage("_00E_MQP03_Thoughts05", 5, 1, 1)
+	Message.ResetHelpMessage("Empty")
+	_00E_MQP03_Thoughts05.ShowAsHelpMessage("Empty", 5, 1, 1)

 EndFunction

 Function ShowThoughtBox06()

-	_00E_MQP03_Thoughts06.ShowAsHelpMessage("_00E_MQP03_Thoughts06", 5, 1, 1)
+	Message.ResetHelpMessage("Empty")
+	_00E_MQP03_Thoughts06.ShowAsHelpMessage("Empty", 5, 1, 1)

 EndFunction

@ -159,7 +168,7 @@ Function FinishQuestAndStartMQ01()
 	MQ01.SetCurrentStageID(5)
 	Wait(1)
 	If _00E_DisableOtherTutorials.GetValueInt() == 0
-		_00E_MQ01_Tutorial_FoodAndMushrooms.ShowAsHelpMessage("_00E_MQ01_Tutorial_FoodAndMushrooms", 5, 1, 1)
+		_00E_MQ01_Tutorial_FoodAndMushrooms.ShowAsHelpMessage("Empty", 5, 1, 1)
 	EndIf
 	
 EndFunction
--- a/source/scripts/_00e_nq12functions.psc
+++ b/source/scripts/_00e_nq12functions.psc
@ -1,9 +1,5 @@
 Scriptname _00E_NQ12Functions extends Quest  

-int function _GetScriptVersion() Global
-    return 1
-endFunction
-
 ;=====================================================================================
 ;              							EVENTS                  					 
 ;=====================================================================================
@ -43,7 +39,8 @@ EndFunction
 Function ShowThoughtMessage()

 	SetObjectiveCompleted(20)
-	_00E_NQ12_Message01.ShowAsHelpMessage("_00E_NQ12_Message01", 4, 1, 1)
+	Message.ResetHelpMessage("Empty")
+	_00E_NQ12_Message01.ShowAsHelpMessage("Empty", 4, 0, 1)

 EndFunction

--- a/source/scripts/_00e_nq16note.psc
+++ b/source/scripts/_00e_nq16note.psc
@ -6,7 +6,8 @@ Event OnRead()
 		NQ16.SetObjectiveCompleted(10)
 		Bandit.EnableNoWait()
 		Utility.Wait(2)
-		_00E_HelpMessage.Show(_00E_NQ16Falle, 4)
+		Message.ResetHelpMessage("Empty")
+		_00E_NQ16Falle.ShowAsHelpMessage("Empty", 4, 1, 1)
 		Utility.Wait(8)
 		NQ16.SetCurrentStageID(10)
 		DoOnce = true
--- a/source/scripts/_00e_nq26_questfunctions.psc
+++ b/source/scripts/_00e_nq26_questfunctions.psc
@ -2,10 +2,6 @@ Scriptname _00E_NQ26_Questfunctions  extends Quest

 Import Utility

-int function _GetScriptVersion() Global
-    return 1
-endFunction
-
 Function PortPhatira()

 	Phatira.Enable()
@ -106,7 +102,8 @@ Function PortPahtira()
 	Game.SetPlayerAIDriven(False)
 	Game.ShowFirstPersonGeometry(true)
 	Wait(2)
-	_00E_NQ26_DisplayTextGenerator.ShowAsHelpMessage("_00E_NQ26_DisplayTextGenerator", 7, 1, 1)
+	Message.ResetHelpMessage("Empty")
+	_00E_NQ26_DisplayTextGenerator.ShowAsHelpMessage("Empty", 7, 1, 1)
 	NQ26Zenturio.Enable()
 	NQ26_SC4.ForceStart()
 	YeraiRef.MoveTo(NQ26YeraiPortMarker)
--- a/source/scripts/_00e_nq_g_03_functions.psc
+++ b/source/scripts/_00e_nq_g_03_functions.psc
@ -3,7 +3,7 @@ Scriptname _00E_NQ_G_03_Functions extends Quest Conditional
 Import Utility

 int function _GetScriptVersion() Global
-    return 2
+    return 1
 endFunction

 ;=====================================================================================
@ -71,8 +71,14 @@ EndFunction
 Function ShowInnerVoice()

 	if !Done
-		Done = true
-		_00E_HelpMessage.Show(TutorialMessage, 3)
+		if !(__Config_MessageBox)
+			Message.ResetHelpMessage(InputEventName)
+			TutorialMessage.ShowAsHelpMessage(InputEventName, Duration, IntervalTime, HowManyTimesDisplayed)
+			Done = True
+		Else
+			TutorialMessage.Show()
+			Done = True
+		EndIf
 	EndIf

 EndFunction
--- a/source/scripts/_00e_nq_g_07_functions.psc
+++ b/source/scripts/_00e_nq_g_07_functions.psc
@ -3,7 +3,7 @@ Scriptname _00E_NQ_G_07_Functions extends Quest Conditional
 Import Utility

 int function _GetScriptVersion() Global
-    return 2
+    return 1
 endFunction

 ;=====================================================================================
@ -1338,7 +1338,7 @@ EndFunction

 Function ShowLetterThoughtMessage()
 	
-	_00E_NQG07_Mael_LetterThoughtMessage.ShowAsHelpMessage("_00E_NQG07_Mael_LetterThoughtMessage", 5, 1, 1)
+	_00E_NQG07_Mael_LetterThoughtMessage.ShowAsHelpMessage(_00E_NQG07_Mael_LetterThoughtMessage, 5, 1, 1)

 EndFunction

--- a/source/scripts/_00e_peaceweedplayeraliasscript.psc
+++ b/source/scripts/_00e_peaceweedplayeraliasscript.psc
@ -26,7 +26,7 @@ Actor Property PlayerRef Auto
 bool bSKSE = true

 int function _GetScriptVersion() Global
-    return 2
+    return 1
 endFunction

 ;=====================================================================================
@ -49,7 +49,8 @@ State PipeTutorial
 		If akBaseItem == _00E_SmokingPipe
 			GoToState("")
 			If (_00E_DisableOtherTutorials.GetValueInt() == 0)
-				_00E_HelpMessage.Show(_00E_PeaceweedSmoking_PipeTutorial, 7)
+				Message.ResetHelpMessage("Empty")
+				_00E_PeaceweedSmoking_PipeTutorial.ShowAsHelpMessage("Empty", 7, 30, 1)
 			EndIf
 		EndIf
 	EndEvent
@ -206,13 +207,14 @@ Function _TryStartSmoking()
 		
 		If (bQuitTutorialShown == False) && (_00E_DisableOtherTutorials.GetValueInt() == 0)
 			bQuitTutorialShown = True
+			Message.ResetHelpMessage("Empty")
 			If Game.UsingGamepad()
 				If _00E_PeaceweedSmoking_ExitTutorial_Console == None
 					_00E_PeaceweedSmoking_ExitTutorial_Console = Game.GetFormFromFile(0x000482F8, "Skyrim.esm") as Message
 				EndIf
-				_00E_HelpMessage.Show(_00E_PeaceweedSmoking_ExitTutorial_Console, 7)
+				_00E_PeaceweedSmoking_ExitTutorial_Console.ShowAsHelpMessage("Empty", 7, 30, 1)
 			Else
-				_00E_HelpMessage.Show(_00E_PeaceweedSmoking_ExitTutorial, 7)
+				_00E_PeaceweedSmoking_ExitTutorial.ShowAsHelpMessage("Empty", 7, 30, 1)
 			EndIf
 		EndIf
 		RegisterForSingleUpdate(2.9)
--- a/source/scripts/_00e_phasmalist_apparationtoplayer.psc
+++ b/source/scripts/_00e_phasmalist_apparationtoplayer.psc
@ -10,7 +10,7 @@ GlobalVariable Property _00E_Phasmalist_TankMode Auto
 Event OnEffectStart(Actor akTarget, Actor akCaster)
 	If _00E_Phasmalist_TeleportTutorialShown.GetValueInt() == 0 && _00E_DisableSkillTutorials.GetValueInt() == 0
 		_00E_Phasmalist_TeleportTutorialShown.SetValueInt(1)
-		_00E_Phasmalist_Tutorial_Teleport.ShowAsHelpMessage("_00E_Phasmalist_Tutorial_Teleport", 5, 1, 1)
+		_00E_Phasmalist_Tutorial_Teleport.ShowAsHelpMessage("Jump", 5, 1, 1)
 	EndIf

 	If controlQuest.IsApparitionSpawned() == False || _00E_Phasmalist_TankMode.GetValue() != 0
--- a/source/scripts/_00e_phasmalist_playeraliasscript.psc
+++ b/source/scripts/_00e_phasmalist_playeraliasscript.psc
@ -9,10 +9,11 @@ Message Property _00E_Phasmalist_ForceDesummonMessage Auto
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
 	If ControlQuest.IsBadApparitionLocation(akNewLoc)
 		If ControlQuest.IsBadApparitionLocation(akOldLoc) == False && ControlQuest.IsApparitionSpawned()
+			Message.ResetHelpMessage("Empty")
 			If akNewLoc && akNewLoc.HasKeyword(_00E_Phasmalist_NoSummonLocationTown)
-				_00E_HelpMessage.Show(_00E_Phasmalist_ForceDesummonMessageTown, 3)
+				_00E_Phasmalist_ForceDesummonMessageTown.ShowAsHelpMessage("Empty", 3.0, 1.0, 1)
 			Else
-				_00E_HelpMessage.Show(_00E_Phasmalist_ForceDesummonMessage, 3)
+				_00E_Phasmalist_ForceDesummonMessage.ShowAsHelpMessage("Empty", 3.0, 1.0, 1)
 			EndIf
 			RegisterForSingleUpdate(6.0)
 		EndIf
--- a/source/scripts/_00e_showsneakhelpmessage.psc
+++ b/source/scripts/_00e_showsneakhelpmessage.psc
@ -3,7 +3,8 @@ Scriptname _00E_ShowSneakHelpMessage extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 	if _00E_DisableTutorial.GetValueInt() == 0 && akActionRef == Game.GetForm(0x14) && ! DoOnce
 		DoOnce = True
-		_00E_HelpMessage.Show(Helpmessage, 4)
+		Message.ResetHelpMessage("Empty")
+		Helpmessage.ShowAsHelpMessage("Empty", 4, 30, 1)
 	EndIf
 EndEvent

--- a/source/scripts/_00e_showthoughtmessageonactivate.psc
+++ b/source/scripts/_00e_showthoughtmessageonactivate.psc
@ -3,8 +3,8 @@ Scriptname _00E_ShowThoughtMessageOnActivate extends ObjectReference
 Event OnActivate(ObjectReference akActionRef)

 	if akActionRef == PlayerREF && !Done
-		Done = true
-		_00E_HelpMessage.Show(MessageToDisplay, 4)
+		Message.ResetHelpMessage("Empty")
+		MessageToDisplay.ShowAsHelpMessage("Empty", 2, 2, 1)
 	EndIf

 EndEvent
--- a/source/scripts/_00e_showtutorialmessage.psc
+++ b/source/scripts/_00e_showtutorialmessage.psc
@ -9,6 +9,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 	If Done == False && ((_00E_DisableTutorials == None) || (_00E_DisableTutorials.GetValueInt() == 0))
 		if !(__Config_MessageBox)
 			Done = True
+			Message.ResetHelpMessage(InputEventName)
 			TutorialMessage.ShowAsHelpMessage(InputEventName, Duration, IntervalTime, HowManyTimesDisplayed)
 		Else
 			If __Config_ShowOnlyOnce
--- a/source/scripts/_sag_activ_diceblackjackmainsscript.psc
+++ b/source/scripts/_sag_activ_diceblackjackmainsscript.psc
@ -44,6 +44,8 @@ Function Step01()
 		Opponent.GetReference().AddItem(Gold001, iStartGold*3)
 	EndIf

+	Message.ResetHelpMessage("TossCoinTailsEvent")
+	Message.ResetHelpMessage("TossCoinHeadEvent")
 	PlayerThrowing = 0
 	OpponentTHrowing = 0
 	PlayerScore = 0
@ -114,11 +116,11 @@ Function CoinToss()
 	Coin[CoinTossResult].Enable(true)
 	
 	if CoinTossResult == 0
-		_00E_HelpMessage.Show(Head, 5)
+		Head.ShowAsHelpMessage("TossCoinHeadEvent", 5.0, 1.0,1)
 		Utility.Wait(3.0)
 		PlayerTurn()
 	else
-		_00E_HelpMessage.Show(Tails, 5)
+		Tails.ShowAsHelpMessage("TossCoinTailsEvent", 5.0, 1.0,1)
 		Utility.Wait(3.0)
 		OpponentTurn()
 	endif
--- a/source/scripts/_sag_playcards_mainscript.psc
+++ b/source/scripts/_sag_playcards_mainscript.psc
@ -87,7 +87,7 @@ int Function Step01() ; place your bet
    EnemyPurse.EnableNoWait(true)
    RegisterForKey(14)
    RegisterForKey(271) 
-	_00E_HelpMessage.Show(Helps, 4)
+    Helps.ShowAsHelpMessage("ShowCurrentStatsPC", 4.0, 3.0, 1)
    Step02()
    Return PlayerBet
 	endif
@ -111,7 +111,7 @@ Function Step02() ; take player's cards
    Utility.Wait(2)
    RegisterForKey(46)
    RegisterForKey(280)
-	_00E_HelpMessage.Show(PressToCheatNow, 4)
+    PressToCheatNow.ShowAsHelpMessage("PCCheatNow", 4.0, 3.0, 1)
    Utility.Wait(4.0)
    UnregisterforKey(46)
    UnregisterforKey(280)
@ -135,7 +135,7 @@ Function Step02() ; take player's cards
        PlayerRef.RemoveItem(Gold001, BoostPrice, false, Opponent.GetReference())
        DicesResult.Show(Dices, totalplayer)
    endif
-	_00E_HelpMessage.Show(Helps, 4)
+    Helps.ShowAsHelpMessage("ShowCurrentStatsPC", 4.0, 3.0, 1)
    Step03()
 EndFunction

@ -172,7 +172,7 @@ Function Step03() ; take opponent's cards
    else
        EnemyResult.Show(totalEnemy)
    endif
-	_00E_HelpMessage.Show(Helps, 3)
+    Helps.ShowAsHelpMessage("ShowCurrentStatsPC", 2.0, 3.0, 1)
    Step04()
 EndFunction

@ -256,6 +256,8 @@ Function FinishGameNoGold()
    totalplayer = 0
    totalenemy = 0
    
+    Message.ResetHelpMessage("ShowCurrentStatsPC")  
+    Message.ResetHelpMessage("PCCheatNow")
    Utility.Wait(2.0)
        if initialFurn != none
            PlayerRef.MoveTo(initialFurn)
@ -294,6 +296,8 @@ Function ResetGame()
    globalbet = 0
    totalplayer = 0
    totalenemy = 0
+    Message.ResetHelpMessage("ShowCurrentStatsPC")  
+    Message.ResetHelpMessage("PCCheatNow")
    PlayCards()

 EndFunction
@ -330,6 +334,9 @@ Function FinishGameAndClearUp()
    totalplayer = 0
    totalenemy = 0
    
+    Message.ResetHelpMessage("ShowCurrentStatsPC")  
+    Message.ResetHelpMessage("PCCheatNow")
+    
    ; Utility.Wait(2.0)
        if initialFurn != none
            PlayerRef.MoveTo(initialFurn)