Merge branch 'master' into cleanup_declarations

1 files changed, 138 insertions, 0 deletions

diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc
new file mode 100644
index 00000000..34745b7b
--- /dev/null
+++ b/data/scripts/script_08010BB4.inc
@@ -0,0 +1,138 @@
+SCRIPT_START script_08010BB4
+	BeginBlock 
+	DoPostScriptAction 0x000a
+	_0807EB44 0x0004
+	_0807E930 0x0008
+	Call sub_0806E440
+	EndBlock 
+script_08010BCA:
+	CheckEntityInteractType 
+	JumpIfNot script_08010BCA
+	_0807E864 
+	_0807EB74 
+	DoPostScriptAction 0x0000
+	Call sub_0806E418
+	_0807EA94 
+	_0807E878 
+	_0807E930 0x0008
+	Jump script_08010BCA
+	.2byte 0x0000
+	_0807E864 
+	Call sub_0807F9A4
+	Call sub_0807DF28
+	StartPlayerScript script_08011074
+	WaitForSomething2 0x00000400
+	_0807F078 0x0034, 0x0002
+	TextboxNoOverlapFollowPos 0x1036, 0x000c
+	_0807EA94 
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	TextboxNoOverlapFollowPos 0x1037, 0x0002
+	_0807EA94 
+	_0807E5F8 0x00000010
+	WaitForSomething2 0x00000020
+	TextboxNoOverlapFollowPos 0x1038, 0x000c
+	_0807EA94 
+	SoundReq0x80100000 
+	_0807E778 0x0004
+	DoFade5 
+	WaitFor_2 
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	Call sub_08064180
+	LoadRoomEntityList gUnk_080F06E0
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	StartPlayerScript script_08011098
+	WaitForSomething2 0x00000400
+	SetEntityPositionRelative 0x01f8, 0x0050
+	_0807F0B4 0x0007
+	CameraTargetEntity 
+	Wait 0x000a
+	_0807F0B4 0x0001
+	_0807E778 0x0001
+	DoFade4 
+	_0807E5F8 0x0002a800
+	WaitForSomething2 0x00055000
+	SetEntityPositionRelative 0x01f8, 0x0078
+	Wait 0x003c
+	_0807E5F8 0x00800000
+	WaitForSomething2 0x01000000
+	_0807E5F8 0x0002a800
+	WaitForSomething2 0x00055000
+	_0807E8E4_1 
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	TextboxNoOverlapFollowPos 0x1039, 0x000c
+	_0807EA94 
+	SoundReq2 0x0001
+	_0807E8E4_2 
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	_0807E5F8 0x00000010
+	_0807E5F8 0x00000040
+	WaitForSomething2 0x00000020
+	WaitForSomething2 0x00000080
+	Wait 0x012c
+	_0807E5F8 0x00000004
+	WaitForSomething2 0x00000008
+	TextboxNoOverlapFollowPos 0x103a, 0x000c
+	_0807EA94 
+	SetEntityPositionRelative 0x01f8, 0x01c0
+	_0807F0B4 0x0004
+	Wait 0x0078
+	_0807E5F8 0x00280000
+	WaitForSomething2 0x00500000
+	_0807E5F8 0x00000100
+	SetEntityPositionRelative 0x01f8, 0x0220
+	SetEntitySpeed 0x0100
+	_0807EDD4 0x01f8, 0x0098
+	Wait 0x003c
+	WaitForSomething2 0x00000200
+	_0807E5F8 0x00280000
+	SoundReq0x80100000 
+	SoundReq 0x009b
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000200
+	TextboxNoOverlapFollowPos 0x1043, 0x0000
+	_0807EA94 
+	SoundReq2 0x000d
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000200
+	_0807E5F8 0x0002a800
+	WaitForSomething2 0x00055000
+	SoundReq 0x01c7
+	SoundReq 0x00e5
+	_0807E5F8 0x00000100
+	_0807E5F8 0x00002800
+	CallWithArg sub_0807FB28, 0x00000003
+	WaitForSomething2 0x00000200
+	WaitForSomething2 0x00005000
+	_0807E5F8 0x00028000
+	WaitForSomething2 0x00050000
+	TextboxNoOverlapFollowPos 0x1044, 0x0000
+	_0807EA94 
+	SetEntityPositionRelative 0x01f8, 0x0098
+	SoundReq0x80100000 
+	Wait 0x003c
+	SoundReq2 0x002f
+	_0807E5F8 0x00028000
+	_0807E5F8 0x00000100
+	WaitForSomething2 0x00000200
+	WaitForSomething2 0x00050000
+	CallWithArg sub_0807FB28, 0x00000003
+	SoundReq 0x00e5
+	_0807E5F8 0x00028000
+	WaitForSomething2 0x00050000
+	SoundReq 0x0125
+	CallWithArg sub_0807FB28, 0x00000003
+	_0807E5F8 0x08000000
+	_0807E5F8 0x00800000
+	WaitForSomething2 0x01000000
+	CallWithArg sub_0805DDEC, 0x00000002
+	_0807F0C8 0xffff, 0x0000