Document some player item stuff

6 files changed, 28 insertions, 30 deletions

diff --git a/data/data_0811BE38.s b/data/data_0811BE38.s
index 175dc403..726c4935 100644
--- a/data/data_0811BE38.s
+++ b/data/data_0811BE38.s
@@ -4,27 +4,13 @@
 	.section .rodata
     .align 2
 
-gUnk_0811BE38:: @ 0811BE38
-	.incbin "data_0811BE38/gUnk_0811BE38.bin"
-
-gUnk_0811BE40:: @ 0811BE40
-	.incbin "data_0811BE38/gUnk_0811BE40.bin"
-
-gUnk_0811BE48:: @ 0811BE48
-.ifdef EU
-    @ TODO only small differences
-	.incbin "data_0811BE38/gUnk_0811BE48_EU.bin"
-.else
-	.incbin "data_0811BE38/gUnk_0811BE48_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_0811BFC8:: @ 0811BFC8
-	.4byte sub_080779E8
-	.4byte sub_080779EC
-	.4byte sub_08077A18
-	.4byte sub_08077A48
-	.4byte sub_08077A98
-	.4byte sub_08077AC8
+gCreateItemsFuncs:: @ 0811BFC8
+	.4byte CreateItemNone
+	.4byte CreateItem1
+	.4byte CreateItem2
+	.4byte CreateItem3
+	.4byte CreateItem4
+	.4byte CreateItem5
 
 gUnk_0811BFE0:: @ 0811BFE0
 	.incbin "data_0811BE38/gUnk_0811BFE0.bin"
diff --git a/data/item.s b/data/item.s
new file mode 100644
index 00000000..f52c59d6
--- /dev/null
+++ b/data/item.s
@@ -0,0 +1,11 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gUnk_0811BE38:: @ 0811BE38
+	.incbin "data_0811BE38/gUnk_0811BE38.bin"
+
+gUnk_0811BE40:: @ 0811BE40
+	.incbin "data_0811BE38/gUnk_0811BE40.bin"
diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc
index 36916c9c..663e740c 100644
--- a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc
+++ b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc
@@ -12,7 +12,8 @@ script_08011A7C:
 	SetPlayerIdle
 	FacePlayer
 	CallWithArg sub_0807F3D8, 0x00000000
-	CallWithArg sub_080644B4, 0x00000006
+	@ Check if player has performed great spin.
+	CallWithArg CheckLastSwordMove, 0x00000006
 	JumpIf script_08011AFA
 	MessageFromTarget TEXT_VAATI, 0x20
 	WaitUntilTextboxCloses
diff --git a/data/scripts/hyruleTown/script_GuardWest.inc b/data/scripts/hyruleTown/script_GuardWest.inc
index ced896a7..26ad9095 100644
--- a/data/scripts/hyruleTown/script_GuardWest.inc
+++ b/data/scripts/hyruleTown/script_GuardWest.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_GuardWest
 	SetAnimationState 0x0002
 	_0807E9D4
 	CallWithArg sub_0807F3D8, 0x00000008
-	Call sub_080644A4
+	Call GuardWithSpear_ResetLastSwordMove
 .ifndef EU
 	ClearLocalFlag MACHI_02_HEISHI_TALK
 .endif
@@ -19,10 +19,10 @@ script_0800FF92:
 	Call sub_08064198
 	CheckLocalFlag MACHI_02_HEISHI_TALK
 	JumpIfNot script_0800FFCC
-	Call sub_08064488
+	Call GuardWithSpear_ResetLastSwordMoveIfNotInSwordState
 	CheckPlayerInRegion2 0x4040
 	JumpIfNot script_0800FFCC
-	Call sub_08064470
+	Call GuardWithSpear_CheckSwordMoveSpin
 	JumpIf script_08010014
 script_0800FFCC:
 	CheckEntityInteractType
@@ -65,7 +65,7 @@ script_08010014:
 	CallWithArg sub_0807F3D8, 0x00000008
 	SetLocalFlag MACHI_02_HEISHI
 script_08010060:
-	Call sub_080644A4
+	Call GuardWithSpear_ResetLastSwordMove
 	CallWithArg sub_0807F5B0, 0x0000000a
 	EnablePlayerControl
 	Jump script_0800FF92
diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc
index 1a0c3f0b..6f888cb4 100644
--- a/data/scripts/npc/script_BladeBrothers.inc
+++ b/data/scripts/npc/script_BladeBrothers.inc
@@ -37,7 +37,7 @@ script_08016262:
 	WaitUntilTextboxCloses
 	DoPostScriptAction 0x0001
 	Call WaitForAnimDone
-	Call sub_08068E90
+	Call BladeBrothers_LearnSkill
 	Call sub_08068C8C
 	JumpIf script_0801631C
 	Call sub_08068F00
@@ -50,13 +50,13 @@ script_08016262:
 	Wait 0x001e
 	Call sub_08068E18
 	WaitUntilTextboxCloses
-	Call sub_08068EB4
+	Call BladeBrothers_ResetLastSwordMove
 	Call EnablePauseMenu
 	EnablePlayerControl
 script_080162CC:
 	EndBlock
 	BeginBlock
-	Call sub_08068EC4
+	Call BladeBrothers_CheckLastSwordMove
 	JumpIf script_080162F6
 	CheckEntityInteractType
 	JumpIf script_080162E4
diff --git a/data/sound/sounds.s b/data/sound/sounds.s
index 840cb9fe..a1913004 100644
--- a/data/sound/sounds.s
+++ b/data/sound/sounds.s
@@ -319,7 +319,7 @@
     .include "sounds/sfx160.s"
     .include "sounds/sfx161.s"
     .include "sounds/sfx162.s"
-    .include "sounds/sfx163.s"
+    .include "sounds/sfxToggleDiving.s"
     .include "sounds/sfx164.s"
     .include "sounds/sfx165.s"
     .include "sounds/sfx166.s"