merge

18 files changed, 528 insertions, 0 deletions

diff --git a/data/scripts/npc/script_08012C48.inc b/data/scripts/npc/script_08012C48.inc
new file mode 100644
index 00000000..18d2a03d
--- /dev/null
+++ b/data/scripts/npc/script_08012C48.inc
@@ -0,0 +1,11 @@
+@ OBJECT_6A in sub_08095954 ?
+SCRIPT_START script_08012C48
+	BeginBlock
+	DoPostScriptAction 0x0007
+	SetEntitySpeed 0x0280
+	EndBlock
+	_0807EDD4 0x0388, 0x0168
+	SetSyncFlag 0x00000100
+	DoPostScriptAction 0x0006
+SCRIPT_END
+	.2byte 0x0000
diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc
new file mode 100644
index 00000000..8fec6673
--- /dev/null
+++ b/data/scripts/npc/script_BladeBrothers.inc
@@ -0,0 +1,102 @@
+@ Blade Brothers
+SCRIPT_START script_BladeBrothers
+	BeginBlock
+	Call sub_0807F348
+	DoPostScriptAction 0x000a
+	_0807EB44 0x0004
+	DoPostScriptAction 0x0000
+	EndBlock
+script_080161FE:
+	Call sub_08068C28
+script_08016204:
+	CheckEntityInteractType
+	JumpIfNot script_08016204
+	_0807E864
+	Call sub_0807DF28
+	_0807EB74
+	Call sub_08068CA0
+	JumpIf script_0801633E
+	Call sub_08068CFC
+	JumpIfNot script_08016332
+	Call sub_08068DB8
+	WaitUntilTextboxCloses
+	Call sub_08068DD0
+	WaitUntilTextboxCloses
+	CheckTextboxResult
+	JumpIfNot script_08016346
+	StartPlayerScript script_PlayerAtBladeBrothers
+	WaitForSyncFlagAndClear 0x00000001
+	_0807EB74
+	Call sub_08068C8C
+	JumpIf script_08016262
+	Call sub_08068DE8
+	WaitUntilTextboxCloses
+	Wait 0x001e
+script_08016262:
+	Call sub_08068E00
+	WaitUntilTextboxCloses
+	DoPostScriptAction 0x0001
+	Call sub_0807F2D4
+	Call sub_08068E90
+	Call sub_08068C8C
+	JumpIf script_0801631C
+	Call sub_08068F00
+	Call sub_08068F14
+	Call sub_08068BB4
+	CallWithArg sub_0807F244, 0x00010001
+	Call sub_08068B84
+	Call sub_0807F2A8
+	Call sub_08068BD0
+	Wait 0x001e
+	Call sub_08068E18
+	WaitUntilTextboxCloses
+	Call sub_08068EB4
+	Call sub_0807DF50
+	_0807E878
+script_080162CC:
+	EndBlock
+	BeginBlock
+	Call sub_08068EC4
+	JumpIf script_080162F6
+	CheckEntityInteractType
+	JumpIf script_080162E4
+	Jump script_080162CC
+script_080162E4:
+	EndBlock
+	_0807E864
+	Call sub_08068E78
+	WaitUntilTextboxCloses
+	_0807E878
+	Jump script_080162CC
+script_080162F6:
+	EndBlock
+	_0807E888
+	Call sub_0807F594
+	Call sub_0807DF28
+	_0807E864
+	StopBgm
+	PlaySound SFX_TASK_COMPLETE
+	Wait 0x003c
+	PlayBgm BGM_LEARN_SCROLL
+	Call sub_08068F3C
+script_0801631C:
+	Call sub_08068E30
+	WaitUntilTextboxCloses
+	Call sub_08068C6C
+	WaitPlayerGetItem
+	WaitUntilTextboxCloses
+	Jump script_08016346
+script_08016332:
+	Call sub_08068E60
+	WaitUntilTextboxCloses
+	Jump script_08016346
+script_0801633E:
+	Call sub_08068E48
+	WaitUntilTextboxCloses
+script_08016346:
+	Call sub_0807DF50
+	_0807E878
+	_0807EB44 0x0004
+	DoPostScriptAction 0x0000
+	Jump script_080161FE
+	.2byte 0x0000
diff --git a/data/scripts/npc/script_Farmer.inc b/data/scripts/npc/script_Farmer.inc
new file mode 100644
index 00000000..7316606b
--- /dev/null
+++ b/data/scripts/npc/script_Farmer.inc
@@ -0,0 +1,41 @@
+@ Farmer
+SCRIPT_START script_Farmer
+	BeginBlock
+	Call sub_0806BCD4
+	DoPostScriptAction 0x000a
+	CallWithArg sub_0806BC94, 0x00000000
+	EndBlock
+script_0800B0E8:
+	Call sub_0807F434
+	JumpTable script_0800B0E8, script_0800B0F6, script_0800B134
+script_0800B0F6:
+	_0807E864
+	Call sub_0807DF28
+	Call sub_0807F2D4
+	_0807EB74
+	CallWithArg sub_0806BC94, 0x00000004
+	Call sub_0806BCE8
+	WaitUntilTextboxCloses
+	Call sub_0807DF50
+	_0807E878
+	Call sub_0806BCB8
+	CallWithArg sub_0806BC94, 0x00000000
+	Jump script_0800B0E8
+script_0800B134:
+	_0807E864
+	Call sub_0807DF28
+	Call sub_0807F2D4
+	_0807EB74
+	CallWithArg sub_0806BC94, 0x00000004
+	Call sub_0807F650
+	_0807E9F0
+.ifndef EU
+	JumpIfNot script_0800B160
+.endif
+	Call sub_0806BCC0
+script_0800B160:
+	Call sub_0807DF50
+	_0807E878
+	Call sub_0806BCB8
+	CallWithArg sub_0806BC94, 0x00000000
+	Jump script_0800B0E8
diff --git a/data/scripts/npc/script_ForestMinish12.inc b/data/scripts/npc/script_ForestMinish12.inc
new file mode 100644
index 00000000..0ba2e7ea
--- /dev/null
+++ b/data/scripts/npc/script_ForestMinish12.inc
@@ -0,0 +1,10 @@
+@ Some Forest Minish ?
+SCRIPT_START script_ForestMinish12
+	BeginBlock
+	_0807E9D4
+	EndBlock
+script_080165FE:
+	_0807E30C
+	JumpIfNot script_080165FE
+	MessageFromTarget 0x0601
+	Jump script_080165FE
diff --git a/data/scripts/npc/script_ForestMinish13.inc b/data/scripts/npc/script_ForestMinish13.inc
new file mode 100644
index 00000000..c277126a
--- /dev/null
+++ b/data/scripts/npc/script_ForestMinish13.inc
@@ -0,0 +1,14 @@
+@ Some Forest Minish?
+SCRIPT_START script_ForestMinish13
+	BeginBlock
+	_0807E9D4
+	EndBlock
+script_08016612:
+	_0807E944 
+	_0807E864 
+	MessageFromTarget 0x0602
+	WaitUntilTextboxCloses
+	Wait 0x000f
+	_0807E878
+	Jump script_08016612
+	.2byte 0x0000
diff --git a/data/scripts/npc/script_ForestMinish14.inc b/data/scripts/npc/script_ForestMinish14.inc
new file mode 100644
index 00000000..7eb3fa47
--- /dev/null
+++ b/data/scripts/npc/script_ForestMinish14.inc
@@ -0,0 +1,14 @@
+@ Some Forest Minish ?
+SCRIPT_START script_ForestMinish14
+	BeginBlock
+	_0807E9D4
+	EndBlock
+script_0801662E:
+	_0807E944
+	_0807E864
+	_0807EB28 0x0603
+	WaitUntilTextboxCloses
+	Wait 0x000f
+	_0807E878
+	Jump script_0801662E
+	.2byte 0x0000
diff --git a/data/scripts/npc/script_ForestMinish15.inc b/data/scripts/npc/script_ForestMinish15.inc
new file mode 100644
index 00000000..c9b227b0
--- /dev/null
+++ b/data/scripts/npc/script_ForestMinish15.inc
@@ -0,0 +1,13 @@
+@ Some Forest Minish?
+SCRIPT_START script_ForestMinish15
+	SetEntitySpeed 0x0100
+script_08016648:
+	_0807ECF4 0x0030
+	Wait 0x0008
+	_0807ECC4 0x0030
+	Wait 0x0008
+	_0807EC94 0x0030
+	Wait 0x0008
+	_0807EC64 0x0030
+	Wait 0x0008
+	Jump script_08016648
diff --git a/data/scripts/npc/script_ForestMinish16.inc b/data/scripts/npc/script_ForestMinish16.inc
new file mode 100644
index 00000000..6978bbde
--- /dev/null
+++ b/data/scripts/npc/script_ForestMinish16.inc
@@ -0,0 +1,15 @@
+@ Some Forest Minish ?
+SCRIPT_START script_ForestMinish16
+	_0807ED24 0x0055, 0x0039, 0x00b4
+	Wait 0x0008
+	_0807ED24 0x0075, 0x0076, 0x003c
+	Wait 0x0008
+	_0807ED24 0x0105, 0x006c, 0x0078
+	Wait 0x0008
+	_0807ED24 0x018e, 0x007a, 0x0078
+	Wait 0x0008
+	_0807ED24 0x0173, 0x0023, 0x003c
+	Wait 0x0008
+	_0807ED24 0x00d8, 0x003f, 0x003c
+	Wait 0x0008
+	Jump script_ForestMinish16
diff --git a/data/scripts/npc/script_ForestMinish17.inc b/data/scripts/npc/script_ForestMinish17.inc
new file mode 100644
index 00000000..376c28db
--- /dev/null
+++ b/data/scripts/npc/script_ForestMinish17.inc
@@ -0,0 +1,17 @@
+@ Some Forest Minish ?
+SCRIPT_START script_ForestMinish17
+	SetEntitySpeed 0x0100
+script_080166BC:
+	_0807EDD4 0x0055, 0x0039
+	Wait 0x0008
+	_0807EDD4 0x0075, 0x0076
+	Wait 0x0008
+	_0807EDD4 0x0105, 0x006c
+	Wait 0x0008
+	_0807EDD4 0x018e, 0x007a
+	Wait 0x0008
+	_0807EDD4 0x0173, 0x0023
+	Wait 0x0008
+	_0807EDD4 0x00d8, 0x003f
+	Wait 0x0008
+	Jump script_080166BC
diff --git a/data/scripts/npc/script_ForestMinish18.inc b/data/scripts/npc/script_ForestMinish18.inc
new file mode 100644
index 00000000..4198e7da
--- /dev/null
+++ b/data/scripts/npc/script_ForestMinish18.inc
@@ -0,0 +1,39 @@
+@ Some Forest Minish ?
+SCRIPT_START script_ForestMinish18
+	SetEntitySpeed 0x0100
+script_08016700:
+	_0807EC94 0x0030
+	SetSyncFlag 0x00000002
+	Wait 0x000f
+	DoPostScriptAction 0x0000
+	_0807EB44 0x0004
+	WaitForSyncFlag 0x00000001
+	ClearSyncFlag 0x00000001
+	DoPostScriptAction 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	WaitForSyncFlag 0x00000001
+	ClearSyncFlag 0x00000001
+	_0807ECF4 0x0030
+	Wait 0x000f
+	DoPostScriptAction 0x0000
+	_0807EB44 0x0004
+	Wait 0x001e
+	SetSyncFlag 0x00000006
+	DoPostScriptAction 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	Wait 0x003c
+	Jump script_08016700
diff --git a/data/scripts/npc/script_ForestMinish19.inc b/data/scripts/npc/script_ForestMinish19.inc
new file mode 100644
index 00000000..1e5e8056
--- /dev/null
+++ b/data/scripts/npc/script_ForestMinish19.inc
@@ -0,0 +1,41 @@
+@ Some Forest Minish?
+SCRIPT_START script_ForestMinish19
+	SetEntitySpeed 0x0100
+script_0801679C:
+	WaitForSyncFlag 0x00000002
+	ClearSyncFlag 0x00000002
+	_0807EC94 0x0030
+	SetSyncFlag 0x00000004
+	Wait 0x000f
+	DoPostScriptAction 0x0000
+	_0807EB44 0x0004
+	WaitForSyncFlag 0x00000002
+	ClearSyncFlag 0x00000002
+	DoPostScriptAction 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	WaitForSyncFlag 0x00000002
+	ClearSyncFlag 0x00000002
+	_0807ECF4 0x0030
+	SetSyncFlag 0x00000001
+	Wait 0x000f
+	DoPostScriptAction 0x0000
+	_0807EB44 0x0004
+	WaitForSyncFlag 0x00000002
+	ClearSyncFlag 0x00000002
+	DoPostScriptAction 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	Jump script_0801679C
diff --git a/data/scripts/npc/script_ForestMinish20.inc b/data/scripts/npc/script_ForestMinish20.inc
new file mode 100644
index 00000000..e9aa1833
--- /dev/null
+++ b/data/scripts/npc/script_ForestMinish20.inc
@@ -0,0 +1,39 @@
+@ Some Forest Minish ?
+SCRIPT_START script_ForestMinish20
+	SetEntitySpeed 0x0100
+script_08016848:
+	WaitForSyncFlag 0x00000004
+	ClearSyncFlag 0x00000004
+	_0807EC94 0x0030
+	Wait 0x000f
+	DoPostScriptAction 0x0000
+	_0807EB44 0x0004
+	Wait 0x001e
+	SetSyncFlag 0x00000003
+	DoPostScriptAction 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	Wait 0x003c
+	_0807ECF4 0x0030
+	SetSyncFlag 0x00000002
+	Wait 0x000f
+	DoPostScriptAction 0x0000
+	_0807EB44 0x0004
+	WaitForSyncFlag 0x00000004
+	ClearSyncFlag 0x00000004
+	DoPostScriptAction 0x0003
+	Wait 0x0002
+	_0807EB44 0x0006
+	Wait 0x0002
+	_0807EB44 0x0000
+	Wait 0x0002
+	_0807EB44 0x0002
+	Wait 0x0002
+	_0807EB44 0x0004
+	Jump script_08016848
diff --git a/data/scripts/npc/script_ForestMinish21.inc b/data/scripts/npc/script_ForestMinish21.inc
new file mode 100644
index 00000000..4708f47d
--- /dev/null
+++ b/data/scripts/npc/script_ForestMinish21.inc
@@ -0,0 +1,11 @@
+@ Some Forest Minish ?
+SCRIPT_START script_ForestMinish21
+	BeginBlock
+	_0807E9D4
+	EndBlock
+script_080168E6:
+	_0807E944
+	_0807E864
+	Wait 0x000f
+	_0807E878
+	Jump script_080168E6
diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc
new file mode 100644
index 00000000..a55a6817
--- /dev/null
+++ b/data/scripts/npc/script_MysteriousWall.inc
@@ -0,0 +1,25 @@
+@ Cave NPC4E Fusion thingy Mysterious Wall
+SCRIPT_START script_MysteriousWall
+	BeginBlock
+	DoPostScriptAction 0x000b
+	DoPostScriptAction 0x0008
+	Call sub_0806DAAC
+	JumpIf script_0800B9AC
+	Call sub_0806DAD0
+	CallWithArg sub_0806DA04, 0x00000005
+	EndBlock
+script_0800B98A:
+	_0807EA4C
+	_0807E9F0
+	JumpIf script_0800B99E
+	Call sub_0807DF50
+	_0807E878
+	Jump script_0800B98A
+script_0800B99E:
+	Call sub_0806F188
+	Call sub_0807DF50
+	_0807E878
+script_0800B9AC:
+	DoPostScriptAction 0x0006
+SCRIPT_END
+	.2byte 0x0000
diff --git a/data/scripts/npc/script_PlayerAtBladeBrothers.inc b/data/scripts/npc/script_PlayerAtBladeBrothers.inc
new file mode 100644
index 00000000..7db4fb9c
--- /dev/null
+++ b/data/scripts/npc/script_PlayerAtBladeBrothers.inc
@@ -0,0 +1,9 @@
+@ Player at Blade Brothers
+SCRIPT_START script_PlayerAtBladeBrothers
+	SetEntitySpeed 0x0100
+	_0807EDD4 0x0078, 0x0050
+	_0807EB44 0x0000
+	DoPostScriptAction 0x0000
+	SetSyncFlag 0x00000001
+	Call sub_080791BC
+SCRIPT_END
diff --git a/data/scripts/npc/script_PlayerAtGreatFairy.inc b/data/scripts/npc/script_PlayerAtGreatFairy.inc
new file mode 100644
index 00000000..8839a3cb
--- /dev/null
+++ b/data/scripts/npc/script_PlayerAtGreatFairy.inc
@@ -0,0 +1,25 @@
+@ Player at Great Fairy
+SCRIPT_START script_PlayerAtGreatFairy
+	BeginBlock
+	SetEntitySpeed 0x0100
+	EndBlock
+	CallWithArg sub_0807F6B4, 0x00000090
+	JumpIfNot script_0800B7FC
+	CallWithArg sub_0807F464, 0x00000078
+	CallWithArg sub_0807F4F8, 0x00000090
+script_0800B7EE:
+	_0807E8E4_0
+	DoPostScriptAction 0x0000
+	SetSyncFlag 0x00000004
+SCRIPT_END
+script_0800B7FC:
+	CallWithArg sub_0807F4F8, 0x00000090
+	CallWithArg sub_0807F464, 0x00000078
+	Jump script_0800B7EE
+	BeginBlock
+	DoPostScriptAction 0x0007
+	_0807EB44 0x0004
+	_0807E930 0x0000
+	EndBlock
+SCRIPT_END
+	.2byte 0x0000
diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc
new file mode 100644
index 00000000..8393ee87
--- /dev/null
+++ b/data/scripts/npc/script_TingleSiblings.inc
@@ -0,0 +1,53 @@
+@ Tingle Siblings
+SCRIPT_START script_TingleSiblings
+	BeginBlock
+	Call sub_08064EA4
+	_0807EB44 0x0004
+	DoPostScriptAction 0x0000
+	DoPostScriptAction 0x000a
+	EndBlock
+script_0801690A:
+	_0807E30C
+	JumpIfNot script_0801690A
+	_0807E864
+	_0807EB74
+	Call sub_08064F28
+	WaitUntilTextboxCloses
+	JumpIfNot script_08016926
+	GivePlayerItem 0x003d
+	WaitPlayerGetItem
+script_08016926:
+	_0807E878
+	SetGlobalFlag 0x005c
+	Jump script_0801690A
+	BeginBlock
+	_0807E9D4
+	_0807EB44 0x0000
+	DoPostScriptAction 0x000a
+	EndBlock
+script_0801693E:
+	_0807E944
+	_0807E864
+	Wait 0x0018
+	MessageFromTarget 0x0a01
+	WaitUntilTextboxCloses
+	Wait 0x000f
+	_0807E878
+	Jump script_0801693E
+	.2byte 0x0000
+	BeginBlock
+	_0807E9D4
+	_0807EB44 0x0000
+	DoPostScriptAction 0x000a
+	_0807E930 0x0000
+	EndBlock
+script_0801696A:
+	_0807E944
+	_0807E864
+	Wait 0x0018
+	MessageFromTarget 0x0a01
+	WaitUntilTextboxCloses
+	Wait 0x000f
+	_0807E878
+	Jump script_0801696A
+	.2byte 0x0000
diff --git a/data/scripts/npc/script_Windcrest.inc b/data/scripts/npc/script_Windcrest.inc
new file mode 100644
index 00000000..ef4d0c4d
--- /dev/null
+++ b/data/scripts/npc/script_Windcrest.inc
@@ -0,0 +1,49 @@
+@ All Windcrests
+SCRIPT_START script_Windcrest
+	BeginBlock
+	Call sub_0807F934
+	Call sub_080A2124
+	DoPostScriptAction 0x000a
+	DoPostScriptAction 0x0007
+	EndBlock
+script_0800B024:
+	CheckEntityInteractType
+	JumpIfNot script_0800B024
+	_0807E864
+	Call sub_0807DF28
+	CheckGlobalFlag 0x0052
+	JumpIf script_0800B082
+	CheckGlobalFlag 0x0053
+	JumpIf script_0800B064
+	MessageNoOverlap 0x3f32
+	WaitUntilTextboxCloses
+	DoPostScriptAction 0x0008
+	Call Windcrest_Unlock
+	Wait 0x003c
+	_0807EB28 0x0b5c
+	WaitUntilTextboxCloses
+	SetGlobalFlag 0x0053
+	Jump script_0800B09C
+script_0800B064:
+	MessageNoOverlap 0x3f32
+	WaitUntilTextboxCloses
+	DoPostScriptAction 0x0008
+	Call Windcrest_Unlock
+	Wait 0x003c
+	_0807EB28 0x0b5d
+	WaitUntilTextboxCloses
+	Jump script_0800B09C
+script_0800B082:
+	MessageNoOverlap 0x3f32
+	WaitUntilTextboxCloses
+	DoPostScriptAction 0x0008
+	Call Windcrest_Unlock
+	Wait 0x003c
+	_0807EB28 0x0b5e
+	WaitUntilTextboxCloses
+script_0800B09C:
+	Call sub_0807DF50
+	_0807E878
+	DoPostScriptAction 0x0006
+SCRIPT_END
+	.2byte 0x0000