diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-07-23 12:43:43 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2022-07-25 22:45:55 +0200 |
| commit | 852effa474c159398014da736ade6f0fea454de7 (patch) | |
| tree | 97da22c4758ca4156dc9fb7ac123c7a3b0a9e9f5 /data/scripts/mtCrenel | |
| parent | ccba86d292a0e4c8a0e07325ac4fb25e5a58dc89 (diff) | |
Rename objects
Diffstat (limited to 'data/scripts/mtCrenel')
| -rw-r--r-- | data/scripts/mtCrenel/script_CutsceneMiscObjectBrokenSword.inc (renamed from data/scripts/mtCrenel/script_Object6ABrokenSword.inc) | 4 | ||||
| -rw-r--r-- | data/scripts/mtCrenel/script_CutsceneMiscObjectRepairedSword.inc (renamed from data/scripts/mtCrenel/script_Object6ARepairedSword.inc) | 4 | ||||
| -rw-r--r-- | data/scripts/mtCrenel/script_EzloTalkCoF.inc | 4 | ||||
| -rw-r--r-- | data/scripts/mtCrenel/script_GreatFairyBombs.inc | 6 | ||||
| -rw-r--r-- | data/scripts/mtCrenel/script_Melari.inc | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc b/data/scripts/mtCrenel/script_CutsceneMiscObjectBrokenSword.inc index 86a041b4..89efa304 100644 --- a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc +++ b/data/scripts/mtCrenel/script_CutsceneMiscObjectBrokenSword.inc @@ -1,5 +1,5 @@ -@ Mines OBJECT_6A Broken Sword on Table? -SCRIPT_START script_Object6ABrokenSword +@ Mines CUTSCENE_MISC_OBJECT Broken Sword on Table? +SCRIPT_START script_CutsceneMiscObjectBrokenSword BeginBlock CheckInventory1 ITEM_FIRE_ELEMENT JumpIf script_0800D24C diff --git a/data/scripts/mtCrenel/script_Object6ARepairedSword.inc b/data/scripts/mtCrenel/script_CutsceneMiscObjectRepairedSword.inc index d857059e..6b673eca 100644 --- a/data/scripts/mtCrenel/script_Object6ARepairedSword.inc +++ b/data/scripts/mtCrenel/script_CutsceneMiscObjectRepairedSword.inc @@ -1,5 +1,5 @@ -@ Mines OBJECT_6A Repaired Sword on Table? -SCRIPT_START script_Object6ARepairedSword +@ Mines CUTSCENE_MISC_OBJECT Repaired Sword on Table? +SCRIPT_START script_CutsceneMiscObjectRepairedSword BeginBlock DoPostScriptAction 0x0008 EndBlock diff --git a/data/scripts/mtCrenel/script_EzloTalkCoF.inc b/data/scripts/mtCrenel/script_EzloTalkCoF.inc index fe3c5a82..72fc02c3 100644 --- a/data/scripts/mtCrenel/script_EzloTalkCoF.inc +++ b/data/scripts/mtCrenel/script_EzloTalkCoF.inc @@ -1,11 +1,11 @@ @ Mountain Ezlo text after beating CoF SCRIPT_START script_EzloTalkCoF SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x02 WaitUntilTextboxCloses SetLocalFlagByBank FLAG_BANK_1, 0x0002 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc index 8cc43395..311d82d7 100644 --- a/data/scripts/mtCrenel/script_GreatFairyBombs.inc +++ b/data/scripts/mtCrenel/script_GreatFairyBombs.inc @@ -1,4 +1,4 @@ -@ Mountain Great Fairy OBJECT_69 +@ Mountain Great Fairy CUTSCENE_ORCHESTRATOR SCRIPT_START script_GreatFairyBombs BeginBlock EndBlock @@ -34,8 +34,8 @@ script_0800B7A2: SetFade7 WaitForFadeFinish ModHealth 0x00a0 - SetFade6 - WaitForFadeFinish + SetFade6 + WaitForFadeFinish MessageNoOverlap TEXT_ITEM_GET, 0x7f WaitUntilTextboxCloses Jump script_0800B6A6 diff --git a/data/scripts/mtCrenel/script_Melari.inc b/data/scripts/mtCrenel/script_Melari.inc index 59c02f84..74632ed9 100644 --- a/data/scripts/mtCrenel/script_Melari.inc +++ b/data/scripts/mtCrenel/script_Melari.inc @@ -30,7 +30,7 @@ script_0800CFFA: JumpIfNot script_0800CFFA EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems CheckInventory1 ITEM_GREEN_SWORD JumpIfNot script_0800D032 FacePlayer @@ -112,6 +112,6 @@ script_0800D17C: WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu Jump script_0800CFFA .2byte 0x0000 |