diff options
Diffstat (limited to 'data/scripts')
38 files changed, 57 insertions, 57 deletions
diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index 1dd05221..1b34fcb9 100644 --- a/data/scripts/script_08008D8C.inc +++ b/data/scripts/script_08008D8C.inc @@ -81,7 +81,7 @@ script_08008E12: _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807F034 0x0035 - WaitPlayerAction8 + WaitPlayerGetItem StartPlayerScript script_08008FC0 WaitForSomething2 0x00000020 _0807E8E4_0 @@ -95,7 +95,7 @@ script_08008E12: _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807F034 0x0047 - WaitPlayerAction8 + WaitPlayerGetItem SetIntVariable 0x00000003 Call sub_0807F420 _0807E8E4_0 diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index 26dafb65..05f2b9d0 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -20,7 +20,7 @@ SCRIPT_START script_08009464 .endif Call sub_0806D620 Wait 0x003c - WaitPlayerAction8 + WaitPlayerGetItem _0807EB8C MessageNoOverlap 0x1d0c WaitUntilTextboxCloses diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index 4b5abf8d..a0b52a09 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -10,7 +10,7 @@ SCRIPT_START script_080095F2 PlaySound SFX_109 _0807F088 0x003c MessageFromTarget 0x053c - WaitPlayerAction8 + WaitPlayerGetItem WaitUntilTextboxCloses _0807F078 0x003c, 0x0001 script_08009622: diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index 04b88f0d..10bffa01 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -42,7 +42,7 @@ SCRIPT_START script_08009B78 WaitForSomething2 0x00000008 Call sub_08053250 _0807F034 0x0034 - WaitPlayerAction8 + WaitPlayerGetItem _0807E8E4_1 DoPostScriptAction 0x0001 MessageFromTargetPos 0x100c, 0x0000 diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index 48c49a06..16130637 100644 --- a/data/scripts/script_08009F14.inc +++ b/data/scripts/script_08009F14.inc @@ -25,7 +25,7 @@ script_08009F36: WaitUntilTextboxCloses Wait 0x001e _0807F034 0x0065 - WaitPlayerAction8 + WaitPlayerGetItem DoPostScriptAction 0x000a Call sub_0807DF50 _0807E878 @@ -74,7 +74,7 @@ script_0800A002: Wait 0x0008 _0807F034 0x0008 Call sub_08060318 - WaitPlayerAction8 + WaitPlayerGetItem Wait 0x0008 _0807EB8C MessageFromTarget 0x1f13 @@ -108,7 +108,7 @@ script_0800A064: Wait 0x0008 _0807F034 0x0007 Call sub_08060318 - WaitPlayerAction8 + WaitPlayerGetItem Wait 0x0008 _0807EB8C MessageFromTarget 0x1f10 diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc index da617bfc..6b859b90 100644 --- a/data/scripts/script_0800AB6E.inc +++ b/data/scripts/script_0800AB6E.inc @@ -5,7 +5,7 @@ SCRIPT_START script_0800AB6E _0807E8E4_0 _0807E5F8 0x00000040 WaitForSomething2 0x00000080 - SetEntityPosition 0x0000, 0xffe0 + OffsetEntityPosition 0x0000, 0xffe0 Call sub_0807F5C0 Wait 0x003c CallWithArg DeleteManager36, 0x00000001 @@ -26,7 +26,7 @@ SCRIPT_START script_0800AB6E _0807E5F8 0x00000008 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - SetEntityPosition 0x0000, 0x0020 + OffsetEntityPosition 0x0000, 0x0020 Call sub_0807F5C0 WaitForSomething2 0x00000010 StartPlayerScript script_0800ACE0 @@ -36,7 +36,7 @@ SCRIPT_START script_0800AB6E WaitUntilTextboxCloses MessageFromTargetPos 0x1663, 0x000e WaitUntilTextboxCloses - SetEntityPosition 0x0000, 0xffe0 + OffsetEntityPosition 0x0000, 0xffe0 Call sub_0807F5C0 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index 4eebd83c..edc7331b 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -17,7 +17,7 @@ SCRIPT_START script_0800B41C Wait 0x003c PlaySound SFX_TASK_COMPLETE _0807F088 0x0037 - WaitPlayerAction8 + WaitPlayerGetItem _0807EB8C MessageFromTarget 0x200c WaitUntilTextboxCloses diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc index b00d322d..2ec4bf11 100644 --- a/data/scripts/script_0800B5EC.inc +++ b/data/scripts/script_0800B5EC.inc @@ -49,7 +49,7 @@ script_0800B68E: SetLocalFlag 0x009e _0807F034 0x0066 script_0800B698: - WaitPlayerAction8 + WaitPlayerGetItem _0807EB8C Wait 0x001e MessageNoOverlap 0x057f diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index 313ff8ec..14f85748 100644 --- a/data/scripts/script_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -89,7 +89,7 @@ SCRIPT_START script_0800C634 _0807EB44 0x0004 CheckLocalFlag 0x0082 JumpIfNot script_0800C650 - SetEntityPosition 0x0010, 0x0000 + OffsetEntityPosition 0x0010, 0x0000 script_0800C650: EndBlock script_0800C652: diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index 69d3a300..5a3bef29 100644 --- a/data/scripts/script_0800CD7C.inc +++ b/data/scripts/script_0800CD7C.inc @@ -43,7 +43,7 @@ script_0800CDEC: JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0023 - WaitPlayerAction8 + WaitPlayerGetItem Jump script_0800CE32 script_0800CE14: _0807E48C 0x0022 @@ -54,7 +54,7 @@ script_0800CE14: JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0022 - WaitPlayerAction8 + WaitPlayerGetItem script_0800CE32: _0807EB8C SetGlobalFlag 0x0054 @@ -83,7 +83,7 @@ script_0800CE6E: JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0027 - WaitPlayerAction8 + WaitPlayerGetItem _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 @@ -111,7 +111,7 @@ script_0800CECE: JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0024 - WaitPlayerAction8 + WaitPlayerGetItem _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index 9b20129e..6e7a1185 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -42,7 +42,7 @@ script_0800D8F4: JumpIfNot script_0800D8F4 Call sub_0807DF28 _0807E864 - WaitPlayerAction8 + WaitPlayerGetItem _0807EB28 0x1325 WaitUntilTextboxCloses PlaySound SFX_113 diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index 8ca3a5dd..3ddd4c9d 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -27,7 +27,7 @@ script_0800D962: _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807F050 0x006d - WaitPlayerAction8 + WaitPlayerGetItem _0807EB28 0x1703 WaitUntilTextboxCloses Wait 0x003c diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index dadd18a9..3b30dd5e 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -227,7 +227,7 @@ script_0800E3C8: WaitUntilTextboxCloses Wait 0x000f _0807F034 0x0053 - WaitPlayerAction8 + WaitPlayerGetItem SetLocalFlag 0x0071 _0807E878 script_0800E3E8: diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index 6e3a7acd..3ecd0d05 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -41,7 +41,7 @@ script_0800E708: script_0800E722: WaitUntilTextboxCloses _0807F034 0x0057 - WaitPlayerAction8 + WaitPlayerGetItem WaitUntilTextboxCloses _0807E878 Jump script_0800E6F4 diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index ab672332..be000e41 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -220,7 +220,7 @@ script_0800ED20: WaitUntilTextboxCloses JumpIfNot script_0800ED46 _0807F050 0x0070 - WaitPlayerAction8 + WaitPlayerGetItem script_0800ED46: _0807E878 Call sub_08063874 diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index d8d298e3..58456975 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -66,7 +66,7 @@ script_0800F09A: MessageFromTargetPos 0x1202, 0x000c WaitUntilTextboxCloses _0807F034 0x0067 - WaitPlayerAction8 + WaitPlayerGetItem _0807E8E4_0 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index bf480cfd..acc3e12f 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -175,7 +175,7 @@ SCRIPT_START script_0800F73C MessageFromTargetPos 0x102b, 0x0000 WaitUntilTextboxCloses _0807F034 0x000d - WaitPlayerAction8 + WaitPlayerGetItem Call sub_0806DC3C Call sub_080791BC CallWithArg sub_0807F244, 0x0000000d diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index 5181354d..360411e1 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -107,7 +107,7 @@ script_080101AC: WaitUntilTextboxCloses JumpIfNot script_08010240 Call sub_080A13E8 - WaitPlayerAction8 + WaitPlayerGetItem Call sub_080A1460 WaitUntilTextboxCloses Call sub_080A14A8 diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index 6ca8b25e..d088e35d 100644 --- a/data/scripts/script_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -246,7 +246,7 @@ script_08010570: MessageNoOverlap 0x2b07 WaitUntilTextboxCloses CallWithArg sub_0807F800, 0x00000000 - WaitPlayerAction8 + WaitPlayerGetItem WaitUntilTextboxCloses MessageNoOverlap 0x2b0c Jump script_080105E0 @@ -366,14 +366,14 @@ script_080106E0: MessageNoOverlap 0x3c04 Jump script_08010726 script_0801070C: - WaitPlayerAction8 + WaitPlayerGetItem ModHealth 0x0008 Call sub_08062EDC JumpIf script_08010724 MessageNoOverlap 0x3c06 Jump script_08010726 script_08010724: - WaitPlayerAction8 + WaitPlayerGetItem script_08010726: WaitUntilTextboxCloses _0807E878 @@ -489,7 +489,7 @@ script_08010860: JumpIfNot script_080108B2 Call GoronMerchant_TryToBuyKinstone JumpIfNot script_080108B2 - WaitPlayerAction8 + WaitPlayerGetItem WaitUntilTextboxCloses _0807EB8C CheckGlobalFlag 0x0042 diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index 3054956e..461cbf23 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -74,7 +74,7 @@ script_08011C28: CheckLocalFlag 0x0001 JumpIfNot script_08011C28 _0807E888 - WaitPlayerAction8 + WaitPlayerGetItem Wait 0x001e CallWithArg sub_0806C2A0, 0x00000000 WaitFor_2 diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index 519811d2..bc4f9a5e 100644 --- a/data/scripts/script_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -362,7 +362,7 @@ script_08012070: MessageNoOverlap 0x3125 WaitUntilTextboxCloses _0807F034 0x0031 - WaitPlayerAction8 + WaitPlayerGetItem .ifdef USA Call sub_0807FC24 .else @@ -420,7 +420,7 @@ script_080120FC: MessageNoOverlap 0x3119 WaitUntilTextboxCloses _0807F034 0x002f - WaitPlayerAction8 + WaitPlayerGetItem .ifdef USA Call sub_0807FC24 .else @@ -478,7 +478,7 @@ script_08012188: MessageNoOverlap 0x311f WaitUntilTextboxCloses _0807F034 0x0030 - WaitPlayerAction8 + WaitPlayerGetItem .ifdef USA Call sub_0807FC24 .else diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index 326bc40e..82ed1d1a 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -15,7 +15,7 @@ script_08012338: JumpIf script_0801235A SetLocalFlag 0x0042 _0807F034 0x0057 - WaitPlayerAction8 + WaitPlayerGetItem script_0801235A: _0807E878 Jump script_08012338 diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index 0a87a50e..5390ddeb 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -17,7 +17,7 @@ script_08012440: JumpIf script_08012474 SetLocalFlag 0x00b3 _0807F034 0x0062 - WaitPlayerAction8 + WaitPlayerGetItem .ifdef USA SetLocalFlag 0x00d0 .else diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index fdd495d6..13ddc6bf 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -39,7 +39,7 @@ script_08013006: EndBlock PlaySound SFX_TASK_COMPLETE _0807F088 0x0038 - WaitPlayerAction8 + WaitPlayerGetItem Wait 0x001e _0807E8E4_0 Call sub_0806AB9C @@ -62,7 +62,7 @@ script_08013006: WaitUntilTextboxCloses _0807E5F8 0x00000200 _0807F034 0x0015 - WaitPlayerAction8 + WaitPlayerGetItem _0807EB8C MessageNoOverlap 0x4406 WaitUntilTextboxCloses diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index c32c850d..0f1b052e 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -24,7 +24,7 @@ SCRIPT_START script_080131AC StartPlayerScript script_08013330 WaitForSomething2 0x00000002 MoveEntityToPlayer - SetEntityPosition 0x0000, 0xfff0 + OffsetEntityPosition 0x0000, 0xfff0 Call sub_0807F844 CameraTargetEntity Call sub_080536B8 diff --git a/data/scripts/script_08014094.inc b/data/scripts/script_08014094.inc index 804c7748..ba91ee5c 100644 --- a/data/scripts/script_08014094.inc +++ b/data/scripts/script_08014094.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08014094 DoPostScriptAction 0x0007 _0807E930 0x0002 Call sub_0807F738 - SetEntityPosition 0x0000, 0xfff0 + OffsetEntityPosition 0x0000, 0xfff0 EndBlock WaitForSomething 0x00000040 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_080140B8.inc b/data/scripts/script_080140B8.inc index 94996896..200930ac 100644 --- a/data/scripts/script_080140B8.inc +++ b/data/scripts/script_080140B8.inc @@ -3,7 +3,7 @@ SCRIPT_START script_080140B8 DoPostScriptAction 0x0007 _0807E930 0x0003 Call sub_0807F738 - SetEntityPosition 0x0000, 0xfff0 + OffsetEntityPosition 0x0000, 0xfff0 EndBlock WaitForSomething 0x00000040 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08014154.inc b/data/scripts/script_08014154.inc index 5f7ddbf6..175080d4 100644 --- a/data/scripts/script_08014154.inc +++ b/data/scripts/script_08014154.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08014154 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0006 - SetEntityPosition 0x0000, 0xfff0 + OffsetEntityPosition 0x0000, 0xfff0 EndBlock WaitForSomething2 0x00000800 _0807E930 0x000a diff --git a/data/scripts/script_08014198.inc b/data/scripts/script_08014198.inc index c3506e6f..23954b49 100644 --- a/data/scripts/script_08014198.inc +++ b/data/scripts/script_08014198.inc @@ -2,7 +2,7 @@ SCRIPT_START script_08014198 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0007 - SetEntityPosition 0x0000, 0xfff0 + OffsetEntityPosition 0x0000, 0xfff0 EndBlock WaitForSomething2 0x00001000 _0807E930 0x000b diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc index dc3c8b0f..a47c473e 100644 --- a/data/scripts/script_080143C0.inc +++ b/data/scripts/script_080143C0.inc @@ -22,7 +22,7 @@ script_080143FA: SetIntVariable 0x00000000 Call sub_08065528 _0807F034 0x0036 - WaitPlayerAction8 + WaitPlayerGetItem MessageNoOverlap 0x2c19 WaitUntilTextboxCloses SetIntVariable 0x00000303 diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index cd83bffc..43290291 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -233,7 +233,7 @@ script_0801478A: Call sub_08088478 WaitUntilTextboxCloses Call sub_080885B0 - WaitPlayerAction8 + WaitPlayerGetItem _0807E5F8 0x00000008 Jump script_080147CE script_080147A4: diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index a53d3c1f..fd880ee7 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -60,7 +60,7 @@ script_08014BF2: WaitUntilTextboxCloses SetIntVariable 0x00000064 _0807F034 0x003f - WaitPlayerAction8 + WaitPlayerGetItem Jump script_08014C22 script_08014C1C: MessageNoOverlap 0x2f08 @@ -93,7 +93,7 @@ script_08014C56: MessageNoOverlap 0x2f0d WaitUntilTextboxCloses _0807F034 0x000a - WaitPlayerAction8 + WaitPlayerGetItem Jump script_08014C82 script_08014C7C: MessageNoOverlap 0x2f09 diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index a42da868..86972a81 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -38,7 +38,7 @@ script_08014E64: _0807E48C 0x0020 JumpIfNot script_08014EB8 CallWithArg sub_0807F800, 0x00000022 - WaitPlayerAction8 + WaitPlayerGetItem MessageNoOverlap 0x0a04 Jump script_08014EBC script_08014EB0: @@ -117,7 +117,7 @@ script_08014F4A: JumpIfNot script_08014FA2 ModRupees 0xff9c _0807F034 0x0022 - WaitPlayerAction8 + WaitPlayerGetItem MessageNoOverlap 0x3b11 Jump script_08014FA6 script_08014F9A: diff --git a/data/scripts/script_08016062.inc b/data/scripts/script_08016062.inc index d3b89b6b..fb0d6300 100644 --- a/data/scripts/script_08016062.inc +++ b/data/scripts/script_08016062.inc @@ -1,4 +1,4 @@ SCRIPT_START script_08016062 - SetEntityPosition 0xfff0, 0x0000 + OffsetEntityPosition 0xfff0, 0x0000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0801609E.inc b/data/scripts/script_0801609E.inc index 22853136..e11bf37f 100644 --- a/data/scripts/script_0801609E.inc +++ b/data/scripts/script_0801609E.inc @@ -1,4 +1,4 @@ SCRIPT_START script_0801609E - SetEntityPosition 0x0010, 0x0000 + OffsetEntityPosition 0x0010, 0x0000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index 576ed2c3..eba0a74e 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -33,7 +33,7 @@ script_080160E0: WaitUntilTextboxCloses Jump script_08016132 script_0801610C: - WaitPlayerAction8 + WaitPlayerGetItem .ifndef EU _0807EB8C MessageFromTarget 0x2d0d @@ -79,7 +79,7 @@ script_08016172: MessageFromTarget 0x2d0b Jump script_0801618A script_08016184: - WaitPlayerAction8 + WaitPlayerGetItem MessageFromTarget 0x2d06 script_0801618A: _0807E878 @@ -109,7 +109,7 @@ script_080161C6: Jump script_080161E2 script_080161D8: .ifndef EU - WaitPlayerAction8 + WaitPlayerGetItem WaitUntilTextboxCloses _0807EB8C MessageNoOverlap 0x2d06 @@ -205,7 +205,7 @@ script_0801631C: Call sub_08068E30 WaitUntilTextboxCloses Call sub_08068C6C - WaitPlayerAction8 + WaitPlayerGetItem WaitUntilTextboxCloses Jump script_08016346 script_08016332: diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc index 34c36c59..ff750c90 100644 --- a/data/scripts/script_08016384.inc +++ b/data/scripts/script_08016384.inc @@ -61,7 +61,7 @@ SCRIPT_START script_08016384 Wait 0x001e WaitForSomething 0x00000001 WaitForSomething2 0x00000002 - WaitPlayerAction8 + WaitPlayerGetItem WaitForPlayerAction0x17 WaitFor_1 WaitFor_2 diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc index 47de49ed..e9ef17f2 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -225,7 +225,7 @@ script_0801690A: WaitUntilTextboxCloses JumpIfNot script_08016926 _0807F034 0x003d - WaitPlayerAction8 + WaitPlayerGetItem script_08016926: _0807E878 SetGlobalFlag 0x005c |