diff options
| author | Ibot02 <jtp.jtp@gmx.de> | 2022-01-09 20:46:03 +0100 |
|---|---|---|
| committer | Ibot02 <jtp.jtp@gmx.de> | 2022-01-09 20:46:03 +0100 |
| commit | 4fc5a7c3e4dd240db3bc190439d07fcecba7b0e1 (patch) | |
| tree | fc7aa8be7f80de6c1a2c5a760e4862e86b863f07 /data/scripts/windRuins | |
| parent | 85fa74cc57166378e150086abb407ca0f3b756db (diff) | |
| parent | 7b87141d9b708b5baa0458303bf7d68c4d11a99a (diff) | |
Merge branch 'master' into gyorg
Diffstat (limited to 'data/scripts/windRuins')
4 files changed, 10 insertions, 10 deletions
diff --git a/data/scripts/windRuins/script_EzloTalkFoW.inc b/data/scripts/windRuins/script_EzloTalkFoW.inc index 8ac839e1..8370f5ef 100644 --- a/data/scripts/windRuins/script_EzloTalkFoW.inc +++ b/data/scripts/windRuins/script_EzloTalkFoW.inc @@ -1,12 +1,12 @@ @ Ezlo talk after Wind Ruins SCRIPT_START script_EzloTalkFoW - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x1c03 + EzloMessage 0x1c03 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0003 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc index b3a0d2f2..b4e78dbb 100644 --- a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc +++ b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc @@ -9,14 +9,14 @@ script_0800D8F4: CheckInventory1 0x0017 JumpIfNot script_0800D8F4 Call sub_0807DF28 - _0807E864 + SetPlayerIdle WaitPlayerGetItem - _0807EB28 0x1325 + EzloMessage 0x1325 WaitUntilTextboxCloses PlaySound SFX_113 SetIntVariable 0x00000000 Call sub_0806DA1C - _0807E878 + EnablePlayerControl Call sub_0807DF50 script_0800D924: DoPostScriptAction 0x0006 diff --git a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc index 3c0338b0..7d205905 100644 --- a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc +++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc @@ -9,7 +9,7 @@ SCRIPT_START script_Npc4EWindRuinsTextBoard script_0800D88E: CheckEntityInteractType JumpIfNot script_0800D88E - _0807E864 + SetPlayerIdle Call sub_0807DF28 CheckLocalFlag 0x0045 JumpIf script_0800D8B0 @@ -29,6 +29,6 @@ script_0800D8CE: JumpIfNot script_0800D8CE script_0800D8D6: Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800D88E .2byte 0x0000 diff --git a/data/scripts/windRuins/script_PlayerAtTextboard.inc b/data/scripts/windRuins/script_PlayerAtTextboard.inc index a3c2a068..c85f6145 100644 --- a/data/scripts/windRuins/script_PlayerAtTextboard.inc +++ b/data/scripts/windRuins/script_PlayerAtTextboard.inc @@ -5,8 +5,8 @@ SCRIPT_START script_PlayerAtTextboard EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x00a0, 0x0078 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END |