Merge branch 'master' into asset-extraction

data/scripts/script_08008B5C.inc

@@ -28,7 +28,7 @@ script_08008BA2:
 	_0807E864
 	_0807E930 0x0004
 	Call sub_0807F2D4
-	TextboxNoOverlapFollow 0x4912
+	MessageFromTarget 0x4912
 	WaitUntilTextboxCloses
 	_0807E930 0x0008
 	_0807E878
@@ -60,7 +60,7 @@ script_08008BD2:
 	CallWithArg sub_0806BB1C, 0x00000001
 	Call sub_0806BB7C
 	JumpIfNot script_08008C5C
-	TextboxNoOverlap 0x490c
+	MessageNoOverlap 0x490c
 	WaitUntilTextboxCloses
 	LoadRoomEntityList gUnk_080D6784
 	WaitForSomething 0x00000001
@@ -69,7 +69,7 @@ script_08008BD2:
 	PlaySound SFX_SECRET
 	_0807E930 0x0004
 	Call sub_0807F2D4
-	TextboxNoOverlap 0x4913
+	MessageNoOverlap 0x4913
 	WaitUntilTextboxCloses
 	_0807E930 0x0008
 	Call sub_0807F2D4
@@ -91,7 +91,7 @@ SCRIPT_START script_08008C64
 	PlaySound SFX_STAIRS
 	EndBlock
 	WaitForSomething 0x00000002
-	TextboxNoOverlap 0x490d
+	MessageNoOverlap 0x490d
 	WaitUntilTextboxCloses
 	DoPostScriptAction 0x0007
 	Call sub_08064D08