diff options
Diffstat (limited to 'data/scripts')
239 files changed, 823 insertions, 1302 deletions
diff --git a/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc index ffb45054..0374c53f 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc @@ -1,16 +1,16 @@ @ Castor Wilds Statue left SCRIPT_START script_CastorWildsStatueLeft BeginBlock - CheckKinstoneFused 0x0006 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_LEFT JumpIf script_0800B302 - _0807EA88 0x0006 + _0807EA88 KINSTONE_CASTOR_WILDS_STATUE_LEFT SetAnimationState 0x0002 EndBlock script_0800B268: _0807EA4C _0807E9F0 SetPlayerIdle - CheckKinstoneFused 0x0006 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_LEFT JumpIf script_0800B2E2 Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc index ef5548f6..d6a16ee9 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc @@ -1,16 +1,16 @@ @ Castor Wilds Statue middle SCRIPT_START script_CastorWildsStatueMiddle BeginBlock - CheckKinstoneFused 0x0007 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_MIDDLE JumpIf script_0800B302 - _0807EA88 0x0007 + _0807EA88 KINSTONE_CASTOR_WILDS_STATUE_MIDDLE SetAnimationState 0x0002 EndBlock script_0800B298: _0807EA4C _0807E9F0 SetPlayerIdle - CheckKinstoneFused 0x0007 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_MIDDLE JumpIf script_0800B2E2 Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc index 3c9c3c4f..7c2c12b9 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc @@ -1,16 +1,16 @@ @ Castor Wilds Statue right SCRIPT_START script_CastorWildsStatueRight BeginBlock - CheckKinstoneFused 0x0008 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_RIGHT JumpIf script_0800B302 - _0807EA88 0x0008 + _0807EA88 KINSTONE_CASTOR_WILDS_STATUE_RIGHT SetAnimationState 0x0002 EndBlock script_0800B2C8: _0807EA4C _0807E9F0 SetPlayerIdle - CheckKinstoneFused 0x0008 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_RIGHT JumpIf script_0800B2E2 Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/castorWilds/script_CastorWildsStatueRock.inc b/data/scripts/castorWilds/script_CastorWildsStatueRock.inc index 3cb8cec3..d72ab9c1 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueRock.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueRock.inc @@ -1,32 +1,20 @@ @ Castor Wilds Statue rock SCRIPT_START script_CastorWildsStatueRock BeginBlock -.ifdef JP - CheckLocalFlag 0x001e -.else -.ifdef EU - CheckLocalFlag 0x001e -.else -.ifdef DEMO_JP - CheckLocalFlag 0x001e @ TODO deduplicate -.else - CheckLocalFlag 0x001d -.endif -.endif -.endif + CheckLocalFlag HIKYOU_00_SEKIZOU JumpIf script_0800B39C DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 SetEntityDirection 0x0010 - CheckKinstoneFused 0x0006 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_LEFT JumpIfNot script_0800B32C Call sub_080676D8 script_0800B32C: - CheckKinstoneFused 0x0007 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_MIDDLE JumpIfNot script_0800B33A Call sub_080676D8 script_0800B33A: - CheckKinstoneFused 0x0008 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_RIGHT JumpIfNot script_0800B348 Call sub_080676D8 script_0800B348: @@ -42,26 +30,14 @@ script_0800B350: Wait 0x0014 BeginBlock SetSyncFlag 0x00000001 - CheckKinstoneFused 0x0006 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_LEFT JumpIfNot script_0800B350 - CheckKinstoneFused 0x0007 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_MIDDLE JumpIfNot script_0800B350 - CheckKinstoneFused 0x0008 + CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_RIGHT JumpIfNot script_0800B350 EndBlock -.ifdef JP - SetLocalFlag 0x001e -.else -.ifdef EU - SetLocalFlag 0x001e -.else -.ifdef DEMO_JP - SetLocalFlag 0x001e @ TODO deduplicate -.else - SetLocalFlag 0x001d -.endif -.endif -.endif + SetLocalFlag HIKYOU_00_SEKIZOU PlaySound SFX_SECRET script_0800B39C: DoPostScriptAction 0x0006 diff --git a/data/scripts/castorWilds/script_GreatFairyRupees.inc b/data/scripts/castorWilds/script_GreatFairyRupees.inc index 5dea3e4d..eaaf8aa3 100644 --- a/data/scripts/castorWilds/script_GreatFairyRupees.inc +++ b/data/scripts/castorWilds/script_GreatFairyRupees.inc @@ -3,7 +3,7 @@ SCRIPT_START script_GreatFairyRupees BeginBlock EndBlock script_0800B6CC: - HasRupees 0x0001 + HasRupees 1 JumpIfNot script_0800B6CC script_0800B6D4: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 @@ -17,12 +17,12 @@ script_0800B6D4: WaitForSyncFlagAndClear 0x00000004 CheckLocalFlag 0x009f JumpIf script_0800B7A2 - MessageNoOverlap 0x057b + MessageNoOverlap TEXT_ITEM_GET, 0x7b WaitUntilTextboxCloses - CallWithArg CheckMessageEqual, 0x0000057d + CallWithArg CheckMessageEqual, TEXT_ITEM_GET << 8 | 0x7d JumpIf script_0800B6A6 WaitUntilTextboxCloses SetLocalFlag 0x009f - GivePlayerItem 0x0064 + GivePlayerItem ITEM_WALLET Jump script_0800B698 .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_MalonAtRanch.inc b/data/scripts/castorWilds/script_MalonAtRanch.inc index 91a5b4b2..af08ade6 100644 --- a/data/scripts/castorWilds/script_MalonAtRanch.inc +++ b/data/scripts/castorWilds/script_MalonAtRanch.inc @@ -10,7 +10,7 @@ script_0800B5FA: JumpIfNot script_0800B5FA SetPlayerIdle FacePlayer - MessageNoOverlap 0x2009 + MessageNoOverlap TEXT_LON_LON, 0x09 WaitUntilTextboxCloses EnablePlayerControl SetAnimationState 0x0004 diff --git a/data/scripts/castorWilds/script_Object69.inc b/data/scripts/castorWilds/script_Object69.inc index 399f5c77..d0f00c78 100644 --- a/data/scripts/castorWilds/script_Object69.inc +++ b/data/scripts/castorWilds/script_Object69.inc @@ -2,19 +2,7 @@ SCRIPT_START script_Object69 BeginBlock SetSyncFlag 0x00000000 -.ifdef JP - CheckLocalFlag 0x001e -.else -.ifdef EU - CheckLocalFlag 0x001e -.else -.ifdef DEMO_JP - CheckLocalFlag 0x001e @ TODO deduplicate -.else - CheckLocalFlag 0x001d -.endif -.endif -.endif + CheckLocalFlag HIKYOU_00_SEKIZOU JumpIf script_0800B252 SetEntitySpeed 0x00c0 EndBlock @@ -31,19 +19,7 @@ script_0800B216: CameraTargetPlayer Wait 0x0008 EnablePlayerControl -.ifdef JP - CheckLocalFlag 0x001e -.else -.ifdef EU - CheckLocalFlag 0x001e -.else -.ifdef DEMO_JP - CheckLocalFlag 0x001e @ TODO deduplicate -.else - CheckLocalFlag 0x001d -.endif -.endif -.endif + CheckLocalFlag HIKYOU_00_SEKIZOU JumpIfNot script_0800B216 script_0800B252: SCRIPT_END diff --git a/data/scripts/castorWilds/script_Object69DarknutFight.inc b/data/scripts/castorWilds/script_Object69DarknutFight.inc index cfa00564..3e4bcff0 100644 --- a/data/scripts/castorWilds/script_Object69DarknutFight.inc +++ b/data/scripts/castorWilds/script_Object69DarknutFight.inc @@ -13,7 +13,7 @@ SCRIPT_START script_Object69DarknutFight SetRoomFlag 0x0000 Wait 0x0010 PlayBgm BGM_FIGHT_THEME - EzloMessage 0x2701 + EzloMessage TEXT_TREASURE_GUARDIAN, 0x01 EnablePlayerControl Call sub_0807DF50 SCRIPT_END diff --git a/data/scripts/cloudTops/script_EzloTalkPoW.inc b/data/scripts/cloudTops/script_EzloTalkPoW.inc index a8980ffa..bfbb2d42 100644 --- a/data/scripts/cloudTops/script_EzloTalkPoW.inc +++ b/data/scripts/cloudTops/script_EzloTalkPoW.inc @@ -2,9 +2,9 @@ SCRIPT_START script_EzloTalkPoW SetPlayerIdle Call sub_0807DF28 - EzloMessage 0x1c05 + EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x05 WaitUntilTextboxCloses - SetLocalFlagByBank 0x0100, 0x0005 + SetLocalFlagByBank FLAG_BANK_1, 0x0005 Call sub_0807DF50 EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc index 8f96aa4f..cbd342aa 100644 --- a/data/scripts/cloudTops/script_GregalHealthy.inc +++ b/data/scripts/cloudTops/script_GregalHealthy.inc @@ -20,13 +20,13 @@ script_08014C56: CheckLocalFlag 0x0066 JumpIf script_08014C7C SetLocalFlag 0x0066 - MessageNoOverlap 0x2f0d + MessageNoOverlap TEXT_WIND_TRIBE, 0x0d WaitUntilTextboxCloses - GivePlayerItem 0x000a + GivePlayerItem ITEM_LIGHT_ARROW WaitPlayerGetItem Jump script_08014C82 script_08014C7C: - MessageNoOverlap 0x2f09 + MessageNoOverlap TEXT_WIND_TRIBE, 0x09 WaitUntilTextboxCloses script_08014C82: Wait 0x000f diff --git a/data/scripts/cloudTops/script_GregalSick.inc b/data/scripts/cloudTops/script_GregalSick.inc index 038c7f29..460e3969 100644 --- a/data/scripts/cloudTops/script_GregalSick.inc +++ b/data/scripts/cloudTops/script_GregalSick.inc @@ -16,7 +16,7 @@ script_08014B48: EndBlock SetPlayerIdle FacePlayer - MessageNoOverlap 0x2f01 + MessageNoOverlap TEXT_WIND_TRIBE, 0x01 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl @@ -57,14 +57,14 @@ script_08014BF2: CheckLocalFlag 0x0065 JumpIf script_08014C1C SetLocalFlag 0x0065 - MessageNoOverlap 0x2f07 + MessageNoOverlap TEXT_WIND_TRIBE, 0x07 WaitUntilTextboxCloses - SetIntVariable 0x00000064 - GivePlayerItem 0x003f + SetIntVariable 100 + GivePlayerItem ITEM_SHELLS WaitPlayerGetItem Jump script_08014C22 script_08014C1C: - MessageNoOverlap 0x2f08 + MessageNoOverlap TEXT_WIND_TRIBE, 0x08 WaitUntilTextboxCloses script_08014C22: Wait 0x000f diff --git a/data/scripts/cloudTops/script_HiddenWhirlwind1.inc b/data/scripts/cloudTops/script_HiddenWhirlwind1.inc index 5cfb88b9..70667e79 100644 --- a/data/scripts/cloudTops/script_HiddenWhirlwind1.inc +++ b/data/scripts/cloudTops/script_HiddenWhirlwind1.inc @@ -1,36 +1,12 @@ @ Cloud Tops Whirlwind hidden in clouds SCRIPT_START script_HiddenWhirlwind1 BeginBlock -.ifdef JP - CheckLocalFlag 0x00f0 -.else -.ifdef EU - CheckLocalFlag 0x00f0 -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00f0 @ TODO deduplicate -.else - CheckLocalFlag 0x00f3 -.endif -.endif -.endif + CheckLocalFlag KUMOUE_02_00 JumpIf script_0800D6E8 DoPostScriptAction 0x0008 EndBlock script_0800D6E0: -.ifdef JP - CheckLocalFlag 0x00f0 -.else -.ifdef EU - CheckLocalFlag 0x00f0 -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00f0 @ TODO deduplicate -.else - CheckLocalFlag 0x00f3 -.endif -.endif -.endif + CheckLocalFlag KUMOUE_02_00 JumpIfNot script_0800D6E0 script_0800D6E8: DoPostScriptAction 0x0007 diff --git a/data/scripts/cloudTops/script_HiddenWhirlwind2.inc b/data/scripts/cloudTops/script_HiddenWhirlwind2.inc index efbd3eb3..0817aab7 100644 --- a/data/scripts/cloudTops/script_HiddenWhirlwind2.inc +++ b/data/scripts/cloudTops/script_HiddenWhirlwind2.inc @@ -1,36 +1,12 @@ @ Cloud Tops Whirlwind hidden in clouds SCRIPT_START script_HiddenWhirlwind2 BeginBlock -.ifdef JP - CheckLocalFlag 0x00f2 -.else -.ifdef EU - CheckLocalFlag 0x00f2 -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00f2 @ TODO deduplicate -.else - CheckLocalFlag 0x00f5 -.endif -.endif -.endif + CheckLocalFlag KUMOUE_02_02 JumpIf script_0800D6E8 DoPostScriptAction 0x0008 EndBlock script_0800D700: -.ifdef JP - CheckLocalFlag 0x00f2 -.else -.ifdef EU - CheckLocalFlag 0x00f2 -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00f2 @ TODO deduplicate -.else - CheckLocalFlag 0x00f5 -.endif -.endif -.endif + CheckLocalFlag KUMOUE_02_02 JumpIfNot script_0800D700 DoPostScriptAction 0x0007 SCRIPT_END diff --git a/data/scripts/cloudTops/script_Siroc.inc b/data/scripts/cloudTops/script_Siroc.inc index 94c1d72c..ba0c3e98 100644 --- a/data/scripts/cloudTops/script_Siroc.inc +++ b/data/scripts/cloudTops/script_Siroc.inc @@ -15,10 +15,10 @@ script_08014AD2: CheckLocalFlag 0x0064 JumpIf script_08014AFE SetLocalFlag 0x0064 - MessageNoOverlap 0x2f0b + MessageNoOverlap TEXT_WIND_TRIBE, 0x0b Jump script_08014B02 script_08014AFE: - MessageNoOverlap 0x2f0c + MessageNoOverlap TEXT_WIND_TRIBE, 0x0c script_08014B02: WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/cloudTops/script_WindTribespeople1.inc b/data/scripts/cloudTops/script_WindTribespeople1.inc index 94a6feb5..4b962633 100644 --- a/data/scripts/cloudTops/script_WindTribespeople1.inc +++ b/data/scripts/cloudTops/script_WindTribespeople1.inc @@ -3,7 +3,7 @@ SCRIPT_START script_WindTribespeople1 BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a - CheckGlobalFlag 0x0058 + CheckGlobalFlag WARP_EVENT_END JumpIf script_08014976 SetAnimationState 0x0004 SetEntityPositionRelative 0x0078, 0x0128 diff --git a/data/scripts/cloudTops/script_WindTribespeople2.inc b/data/scripts/cloudTops/script_WindTribespeople2.inc index f8fa2804..37a99ee1 100644 --- a/data/scripts/cloudTops/script_WindTribespeople2.inc +++ b/data/scripts/cloudTops/script_WindTribespeople2.inc @@ -3,7 +3,7 @@ SCRIPT_START script_WindTribespeople2 BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a - CheckGlobalFlag 0x0058 + CheckGlobalFlag WARP_EVENT_END JumpIfNot script_080149C6 EndBlock script_080149AA: diff --git a/data/scripts/cloudTops/script_WindTribespeople6.inc b/data/scripts/cloudTops/script_WindTribespeople6.inc index 0633f743..7e59ddc0 100644 --- a/data/scripts/cloudTops/script_WindTribespeople6.inc +++ b/data/scripts/cloudTops/script_WindTribespeople6.inc @@ -8,7 +8,7 @@ SCRIPT_START script_WindTribespeople6 DoPostScriptAction 0x0004 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - MessageNoOverlap 0x2f0a + MessageNoOverlap TEXT_WIND_TRIBE, 0x0a WaitUntilTextboxCloses SetSyncFlag 0x00000002 script_08014AAC: @@ -16,7 +16,7 @@ script_08014AAC: JumpIfNot script_08014AAC SetPlayerIdle FacePlayer - MessageNoOverlap 0x2f0a + MessageNoOverlap TEXT_WIND_TRIBE, 0x0a WaitUntilTextboxCloses EnablePlayerControl Jump script_08014AAC diff --git a/data/scripts/cloudTops/script_WindTribespeople7.inc b/data/scripts/cloudTops/script_WindTribespeople7.inc index 72962d45..36fc4fed 100644 --- a/data/scripts/cloudTops/script_WindTribespeople7.inc +++ b/data/scripts/cloudTops/script_WindTribespeople7.inc @@ -1,7 +1,7 @@ @ Cloud Tops Windtribespeople SCRIPT_START script_WindTribespeople7 BeginBlock - CheckGlobalFlag 0x0024 + CheckGlobalFlag KUMOTATSUMAKI JumpIf script_08014CD4 Call sub_0806C870 DoPostScriptAction 0x000a @@ -10,7 +10,7 @@ SCRIPT_START script_WindTribespeople7 script_08014CAE: EndBlock BeginBlock - CheckGlobalFlag 0x0024 + CheckGlobalFlag KUMOTATSUMAKI JumpIf script_08014CD4 FacePlayerAndCheckDist JumpIfNot script_08014CAE diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc index 1bdc67f5..9566e4ae 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc @@ -18,7 +18,7 @@ script_0800D80C: SetEntityVelocity 0x00040000 PlaySound SFX_F5 script_0800D82A: - CallWithArg DoGravity, 0xffffe000 + CallWithArg DoGravity, -0x2000 Call CheckEntityOnScreen JumpIf script_0800D82A SetSyncFlag 0x00000004 diff --git a/data/scripts/cutscene/ezlo/script_EzloCap.inc b/data/scripts/cutscene/ezlo/script_EzloCap.inc index 3f2c786c..734aa26c 100644 --- a/data/scripts/cutscene/ezlo/script_EzloCap.inc +++ b/data/scripts/cutscene/ezlo/script_EzloCap.inc @@ -8,14 +8,14 @@ SCRIPT_START script_EzloCap WaitForSyncFlagAndClear 0x00000004 SetAnimation 0x0022 Call sub_0807F3C8 - MessageFromTargetPos 0x1102, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x02, 0x000c WaitUntilTextboxCloses SetAnimation 0x0020 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 SetAnimation 0x0021 Call sub_0807F3C8 - MessageFromTargetPos 0x1103, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x03, 0x000c WaitUntilTextboxCloses SetAnimation 0x0020 SetSyncFlag 0x00000008 @@ -26,29 +26,29 @@ SCRIPT_START script_EzloCap WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0011 SetAnimation 0x001c - MessageFromTargetPos 0x1105, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x05, 0x000c WaitUntilTextboxCloses SetAnimation 0x0020 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 SetAnimation 0x0022 Call sub_0807F3C8 - MessageFromTargetPos 0x1106, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x06, 0x000c WaitUntilTextboxCloses SetAnimation 0x001c Call sub_0806D96C - MessageFromTargetPos 0x1107, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x07, 0x000c WaitUntilTextboxCloses SetAnimation 0x0020 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 SetAnimation 0x0021 Call sub_0807F3C8 - MessageFromTargetPos 0x1108, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x08, 0x000c WaitUntilTextboxCloses SetAnimation 0x001c Call sub_0806D96C - MessageFromTargetPos 0x1109, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x09, 0x000c WaitUntilTextboxCloses SetAnimation 0x0020 DoPostScriptAction 0x000a @@ -65,7 +65,7 @@ script_080127F2: SetPlayerIdle Call sub_0806D944 SetAnimation 0x0010 - MessageFromTargetPos 0x1114, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x14, 0x000c WaitUntilTextboxCloses SetAnimation 0x0020 EnablePlayerControl @@ -83,13 +83,13 @@ script_08012824: WaitForSyncFlagAndClear 0x00000004 Call sub_0806D944 SetAnimation 0x0010 - MessageFromTargetPos 0x110a, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x0a, 0x000c WaitUntilTextboxCloses SetAnimation 0x001f SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 SetAnimation 0x0010 - MessageFromTargetPos 0x110b, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x0b, 0x000c WaitUntilTextboxCloses SetAnimation 0x001f SetSyncFlag 0x00000008 @@ -97,19 +97,19 @@ script_08012824: DoPostScriptAction 0x0004 Wait 0x003c SetAnimation 0x0010 - MessageFromTargetPos 0x110c, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x0c, 0x000c WaitUntilTextboxCloses SetAnimation 0x001f SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 SetAnimation 0x0010 - MessageFromTargetPos 0x110d, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x0d, 0x000c WaitUntilTextboxCloses SetAnimation 0x001f SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 SetAnimation 0x0010 - MessageFromTargetPos 0x110e, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x0e, 0x000c WaitUntilTextboxCloses SetAnimation 0x0018 SetEntitySpeed 0x0080 @@ -132,7 +132,7 @@ script_08012920: SetPlayerIdle SetAnimation 0x0010 EndBlock - MessageFromTargetPos 0x1115, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x15, 0x000c WaitUntilTextboxCloses SetAnimation 0x0018 EnablePlayerControl @@ -145,7 +145,7 @@ script_0801293A: FaceAwayFromPlayer Call sub_0806D944 SetAnimation 0x0010 - MessageFromTargetPos 0x110f, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x0f, 0x000c SetAnimation 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 @@ -168,7 +168,7 @@ script_080129A0: SetPlayerIdle SetAnimation 0x0010 EndBlock - MessageFromTargetPos 0x1115, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x15, 0x000c WaitUntilTextboxCloses SetAnimation 0x0018 EnablePlayerControl @@ -181,7 +181,7 @@ script_080129BA: FaceAwayFromPlayer Call sub_0806D944 SetAnimation 0x0010 - MessageFromTargetPos 0x1110, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x10, 0x000c SetAnimation 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 @@ -205,7 +205,7 @@ script_08012A24: SetPlayerIdle SetAnimation 0x0010 EndBlock - MessageFromTargetPos 0x1115, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x15, 0x000c WaitUntilTextboxCloses SetAnimation 0x0018 EnablePlayerControl @@ -220,7 +220,7 @@ script_08012A3E: FaceAwayFromPlayer Call sub_0806D944 SetAnimation 0x0010 - MessageFromTargetPos 0x1111, 0x000c + MessageFromTargetPos TEXT_FINDING_EZLO, 0x11, 0x000c SetAnimation 0x0018 SetEntitySpeed 0x0080 Call sub_0806D8A0 @@ -236,7 +236,7 @@ script_08012A74: PlayBgm BGM_EZLO_THEME BeginBlock _0807E8E4_2 - EzloMessage 0x1112 + EzloMessage TEXT_FINDING_EZLO, 0x12 EndBlock WaitUntilTextboxCloses SetSyncFlag 0x00000008 diff --git a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc index fa6ae96d..5e685039 100644 --- a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc +++ b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc @@ -11,7 +11,7 @@ script_0801248A: Call WaitForPlayerNormal Call sub_0807DF28 StartPlayerScript script_PlayerAtFirstLookAtEzlo - MessageFromTargetPos 0x1101, 0x0007 + MessageFromTargetPos TEXT_FINDING_EZLO, 0x01, 0x0007 WaitUntilTextboxCloses CameraTargetPlayer SetFadeTime 0x0004 @@ -127,8 +127,8 @@ script_08012566: Wait 0x003c PlayBGM Call sub_08054570 - SetGlobalFlag 0x0014 - CallWithArg ResetPlayerFlag, 0x00000008 + SetGlobalFlag EZERO_1ST + CallWithArg ResetPlayerFlag, PL_NO_CAP Call sub_0807DF50 EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/intro/script_Object69Intro.inc b/data/scripts/cutscene/intro/script_Object69Intro.inc index 9fe815c9..7fb2799d 100644 --- a/data/scripts/cutscene/intro/script_Object69Intro.inc +++ b/data/scripts/cutscene/intro/script_Object69Intro.inc @@ -9,7 +9,7 @@ SCRIPT_START script_Object69Intro Wait 0x0078 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000001 - SetGlobalFlag 0x001c + SetGlobalFlag ZELDA_CHASE Call sub_0807DF50 EnablePlayerControl Call PlayerSetNormalAndCollide diff --git a/data/scripts/cutscene/intro/script_PlayerIntro.inc b/data/scripts/cutscene/intro/script_PlayerIntro.inc index 33520235..37f2071f 100644 --- a/data/scripts/cutscene/intro/script_PlayerIntro.inc +++ b/data/scripts/cutscene/intro/script_PlayerIntro.inc @@ -8,7 +8,7 @@ SCRIPT_START script_PlayerIntro WaitForFadeFinish Wait 0x001e @ Wake up message - MessageFromTarget 0x1005 + MessageFromTarget TEXT_PROLOGUE, 0x05 WaitUntilTextboxCloses Wait 0x003c Call sub_0807529C diff --git a/data/scripts/cutscene/intro/script_SmithIntro.inc b/data/scripts/cutscene/intro/script_SmithIntro.inc index 832e37cb..fe1ac39c 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro.inc @@ -17,7 +17,7 @@ SCRIPT_START script_SmithIntro Wait 0x001e SetAnimation 0x000b Wait 0x001e - MessageFromTarget 0x1002 + MessageFromTarget TEXT_PROLOGUE, 0x02 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 @@ -27,7 +27,7 @@ SCRIPT_START script_SmithIntro _0807EDD4 0x00b8, 0x005c SetAnimationState 0x0006 DoPostScriptAction 0x0001 - MessageFromTarget 0x1004 + MessageFromTarget TEXT_PROLOGUE, 0x04 WaitUntilTextboxCloses DoPostScriptAction 0x0000 Wait 0x001e diff --git a/data/scripts/cutscene/intro/script_SmithIntro2.inc b/data/scripts/cutscene/intro/script_SmithIntro2.inc index b9760692..939099ab 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro2.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro2.inc @@ -6,7 +6,7 @@ SCRIPT_START script_SmithIntro2 _0807E9D4 Call SetPriorityMessage EndBlock - CheckGlobalFlag 0x0013 + CheckGlobalFlag START JumpIf script_08009C4C DisablePlayerControl Wait 0x000a @@ -19,7 +19,7 @@ SCRIPT_START script_SmithIntro2 DoPostScriptAction 0x0000 Wait 0x000f DoPostScriptAction 0x0001 - MessageFromTargetPos 0x1009, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x09, 0x0000 _0807E8E4_1 WaitUntilTextboxCloses DoPostScriptAction 0x0000 @@ -27,7 +27,7 @@ SCRIPT_START script_SmithIntro2 WaitForSyncFlagAndClear 0x00000008 FaceAwayFromPlayer DoPostScriptAction 0x0001 - MessageFromTargetPos 0x100b, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x0b, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 @@ -43,11 +43,11 @@ SCRIPT_START script_SmithIntro2 WaitForSyncFlagAndClear 0x00000008 Call sub_08053250 @ Give player rusty sword - GivePlayerItem 0x0034 + GivePlayerItem ITEM_QST_SWORD WaitPlayerGetItem _0807E8E4_1 DoPostScriptAction 0x0001 - MessageFromTargetPos 0x100c, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x0c, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 @@ -59,7 +59,7 @@ script_08009C50: JumpIfNot script_08009C50 SetPlayerIdle FacePlayer - MessageNoOverlap 0x100e + MessageNoOverlap TEXT_PROLOGUE, 0x0e EnablePlayerControl Jump script_08009C50 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_ZeldaIntro.inc b/data/scripts/cutscene/intro/script_ZeldaIntro.inc index f9dd8999..9d82ffad 100644 --- a/data/scripts/cutscene/intro/script_ZeldaIntro.inc +++ b/data/scripts/cutscene/intro/script_ZeldaIntro.inc @@ -10,13 +10,13 @@ SCRIPT_START script_ZeldaIntro DoPostScriptAction 0x0007 _0807EDD4 0x0068, 0x0060 Wait 0x000f - MessageFromTarget 0x1001 + MessageFromTarget TEXT_PROLOGUE, 0x01 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0001 - MessageFromTarget 0x1003 + MessageFromTarget TEXT_PROLOGUE, 0x03 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 diff --git a/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc index dfd487d0..bb48633d 100644 --- a/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc @@ -12,7 +12,7 @@ SCRIPT_START script_ZeldaOutsideLinksHouse WaitForSyncFlagAndClear 0x00000001 Call sub_08066E08 SetPlayerIdle - MessageFromTargetPos 0x1010, 0x000c + MessageFromTargetPos TEXT_PROLOGUE, 0x10, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00000002 script_08014D1E: @@ -25,7 +25,7 @@ script_08014D1E: SetPlayerIdle Call WaitForPlayerNormal Call sub_0807DF28 - MessageNoOverlap 0x1012 + MessageNoOverlap TEXT_PROLOGUE, 0x12 WaitUntilTextboxCloses WalkNorth 0x0040 SetAnimationState 0x0004 @@ -39,7 +39,7 @@ script_08014D60: JumpIf script_08014D60 SetPlayerIdle Call sub_0807DF28 - MessageNoOverlap 0x1013 + MessageNoOverlap TEXT_PROLOGUE, 0x13 WaitUntilTextboxCloses WalkNorth 0x0040 SetAnimationState 0x0004 @@ -54,22 +54,10 @@ script_08014D96: SetPlayerIdle Call WaitForPlayerNormal Call sub_0807DF28 - MessageNoOverlap 0x1014 + MessageNoOverlap TEXT_PROLOGUE, 0x14 WaitUntilTextboxCloses WalkNorth 0x0018 -.ifdef JP - SetLocalFlag 0x006b -.else -.ifdef EU - SetLocalFlag 0x006b -.else -.ifdef DEMO_JP - SetLocalFlag 0x006b @ TODO deduplicate -.else - SetLocalFlag 0x006d -.endif -.endif -.endif + SetLocalFlag SOUGEN_01_ZELDA Call sub_0807DF50 EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc index 021ce626..f6b42f78 100644 --- a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc +++ b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc @@ -14,7 +14,7 @@ SCRIPT_START script_ZeldaTalkToSmith FacePlayer FaceAwayFromPlayer DoPostScriptAction 0x0001 - MessageFromTargetPos 0x100a, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x0a, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 @@ -23,7 +23,7 @@ SCRIPT_START script_ZeldaTalkToSmith DoPostScriptAction 0x0001 FaceAwayFromPlayer SetAnimationState 0x0002 - MessageFromTargetPos 0x100d, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x0d, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 @ Leave room @@ -32,7 +32,7 @@ SCRIPT_START script_ZeldaTalkToSmith Call sub_080536A8 Wait 0x001e BeginBlock - SetGlobalFlag 0x0013 + SetGlobalFlag START Call sub_0807DF50 Call ResetPlayerAnimationAndAction EnablePlayerControl diff --git a/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc index fe73a920..e9848fda 100644 --- a/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc @@ -12,20 +12,20 @@ SCRIPT_START script_KingDaltusAtAssembly SetAnimationState 0x0004 WalkSouth 0x0008 SetAnimation 0x0004 - MessageFromTargetPos 0x1050, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x50, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 SetAnimation 0x0004 - MessageFromTargetPos 0x1052, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x52, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 SetAnimationState 0x0006 SetAnimation 0x0005 - MessageFromTargetPos 0x1054, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x54, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 @@ -34,25 +34,25 @@ SCRIPT_START script_KingDaltusAtAssembly SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 SetAnimation 0x0004 - MessageFromTargetPos 0x1056, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x56, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 SetAnimation 0x0004 - MessageFromTargetPos 0x1057, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x57, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 SetAnimation 0x0004 - MessageFromTargetPos 0x1058, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x58, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 SetAnimation 0x0004 - MessageFromTargetPos 0x105c, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x5c, 0x000e WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 diff --git a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc index ca9a741d..b2f0d8f3 100644 --- a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc @@ -29,7 +29,7 @@ script_08008E12: WaitForSyncFlagAndClear 0x00000100 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - MessageFromTargetPos 0x1053, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x53, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000100 @@ -45,7 +45,7 @@ script_08008E12: WaitForSyncFlagAndClear 0x00000020 SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 - GivePlayerItem 0x0035 + GivePlayerItem ITEM_QST_BROKEN_SWORD WaitPlayerGetItem StartPlayerScript script_PlayerGetSword WaitForSyncFlagAndClear 0x00000020 @@ -59,7 +59,7 @@ script_08008E12: _0807E8E4_1 SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 - GivePlayerItem 0x0047 + GivePlayerItem ITEM_MAP WaitPlayerGetItem SetIntVariable 0x00000003 Call LoadMenu @@ -68,7 +68,7 @@ script_08008E12: WaitForSyncFlagAndClear 0x00000100 _0807F0B4 0x0004 CameraTargetPlayer - SetGlobalFlag 0x0015 + SetGlobalFlag TABIDACHI Call sub_0806DCC0 Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc index 085e4244..ebabde5d 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc @@ -1,11 +1,11 @@ @ Intro Assembly Player gets Sword SCRIPT_START script_PlayerGetSword - SetInventoryValue 0x0001, 0x0001 - CallWithArg PutItemAnySlot, 0x00000001 + SetInventoryValue ITEM_SMITH_SWORD, 0x0001 + CallWithArg PutItemAnySlot, ITEM_SMITH_SWORD PlaySound SFX_ITEM_GET CallWithArg SetPlayerAnimation2, 0x0000045f Call WaitForPlayerAnim - MessageFromTargetPos 0x0501, 0x000e + MessageFromTargetPos TEXT_ITEM_GET, 0x01, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000020 Call SetPlayerActionNormal diff --git a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc index 97319c8f..56c562d3 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc @@ -3,19 +3,7 @@ SCRIPT_START script_PlayerWakingUpInHyruleCastle BeginBlock Call sub_0807DF28 SetPlayerIdle -.ifdef JP - SetLocalFlag 0x009e -.else -.ifdef EU - SetLocalFlag 0x009e -.else -.ifdef DEMO_JP - SetLocalFlag 0x009e @ TODO deduplicate -.else - SetLocalFlag 0x009f -.endif -.endif -.endif + SetLocalFlag CASTLE_04_MEZAME EndBlock Wait 0x003c SetFadeTime 0x0004 diff --git a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc index 63184c10..e971d99d 100644 --- a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc @@ -8,7 +8,7 @@ SCRIPT_START script_SmithAtAssembly WaitForSyncFlagAndClear 0x00000001 FacePlayer DoPostScriptAction 0x0001 - MessageFromTargetPos 0x105b, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x5b, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 @@ -20,7 +20,7 @@ SCRIPT_START script_SmithAtAssembly DoPostScriptAction 0x0005 Wait 0x003c DoPostScriptAction 0x0001 - MessageFromTargetPos 0x1051, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x51, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 @@ -30,7 +30,7 @@ SCRIPT_START script_SmithAtAssembly FacePlayer FaceAwayFromPlayer DoPostScriptAction 0x0001 - MessageFromTargetPos 0x1055, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x55, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 @@ -44,7 +44,7 @@ SCRIPT_START script_SmithAtAssembly FacePlayer DoPostScriptAction 0x0000 DoPostScriptAction 0x0001 - MessageFromTargetPos 0x1059, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x59, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc index 2a9be68c..558ff346 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc @@ -33,7 +33,7 @@ script_080157DA: WaitForSyncFlagAndClear 0x00000010 SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 - MessageFromTargetPos 0x1066, 0x0002 + MessageFromTargetPos TEXT_PROLOGUE, 0x66, 0x0002 WaitUntilTextboxCloses SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 @@ -46,7 +46,7 @@ script_08015880: JumpIfNot script_08015880 script_08015888: WaitUntilTextboxCloses - ComparePlayerAction 0x001c + ComparePlayerAction PLAYER_SLEEP JumpIf script_08015888 SetPlayerIdle Call sub_0807DF28 @@ -55,28 +55,16 @@ script_08015888: CameraTargetEntity StartPlayerScript script_PlayerIntroBusinessScrub3 WaitForSyncFlagAndClear 0x00000010 - MessageFromTargetPos 0x106a, 0x000c + MessageFromTargetPos TEXT_PROLOGUE, 0x6a, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00000008 Wait 0x0078 _0807E8E4_2 - MessageFromTargetPos 0x1068, 0x0002 + MessageFromTargetPos TEXT_PROLOGUE, 0x68, 0x0002 WaitUntilTextboxCloses SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 -.ifdef JP - SetLocalFlag 0x0089 -.else -.ifdef EU - SetLocalFlag 0x0089 -.else -.ifdef DEMO_JP - SetLocalFlag 0x0089 @ TODO deduplicate -.else - SetLocalFlag 0x008b -.endif -.endif -.endif + SetLocalFlag SOUGEN_06_AKINDO Call sub_08066FB8 Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc index f58c6a2e..96e7d0de 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc @@ -2,19 +2,7 @@ SCRIPT_START script_08015B34 EndBlock BeginBlock -.ifdef JP - CheckLocalFlag 0x0089 -.else -.ifdef EU - CheckLocalFlag 0x0089 -.else -.ifdef DEMO_JP - CheckLocalFlag 0x0089 @ TODO deduplicate -.else - CheckLocalFlag 0x008b -.endif -.endif -.endif + CheckLocalFlag SOUGEN_06_AKINDO JumpIf script_08015B7E @ Prevent player from leaving to Hyrule Town CallWithArg sub_0807F6B4, 0x00000318 @@ -23,7 +11,7 @@ SCRIPT_START script_08015B34 SetPlayerIdle Call WaitForPlayerNormal Call sub_0807DF28 - MessageFromTargetPos 0x2506, 0x0002 + MessageFromTargetPos TEXT_FESTIVAL, 0x06, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerAtIntroBusinessScrub4 WaitForSyncFlagAndClear 0x00000004 diff --git a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc index 24942bab..fd4db7bc 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc @@ -16,7 +16,7 @@ SCRIPT_START script_ZeldaIntroBusinessScrub _0807EDD4 0x01f8, 0x02f8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 - MessageFromTargetPos 0x1011, 0x0002 + MessageFromTargetPos TEXT_PROLOGUE, 0x11, 0x0002 WaitUntilTextboxCloses _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 @@ -58,7 +58,7 @@ script_08015A32: CheckEntityInteractType JumpIfNot script_08015A32 EndBlock - MessageFromTargetPos 0x1067, 0x0002 + MessageFromTargetPos TEXT_PROLOGUE, 0x67, 0x0002 WaitUntilTextboxCloses Jump script_08015A32 script_08015A54: diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index 8427c4de..702005bb 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -29,7 +29,7 @@ SCRIPT_START script_Npc4EMonsters _0807F0C8 0x0000, 0x0000 Call NPC4E_SaveEquippedItems Call SetPlayerActionNormal - CallWithArg EquipItem, 0x0000000d + CallWithArg EquipItem, ITEM_SHIELD CallWithArg SetInputMacro, gUnk_080049F6 _0807F0B4 0x0001 SetEntityPositionRelative 0x01f8, 0x0068 @@ -48,9 +48,9 @@ SCRIPT_START script_Npc4EMonsters SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000020 WaitForSyncFlagAndClear 0x00000200 - MessageFromTargetPos 0x1045, 0x000c + MessageFromTargetPos TEXT_PROLOGUE, 0x45, 0x000c WaitUntilTextboxCloses - MessageFromTargetPos 0x1046, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x46, 0x0000 WaitUntilTextboxCloses CallWithArg CreateManager36, 0x00000002 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc index f807fc41..ab1afa7b 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc @@ -5,11 +5,11 @@ SCRIPT_START script_Npc4EVaatiAttacking WaitForSyncFlagAndClear 0x00000200 StartPlayerScript script_PlayerProtectingZelda WaitForSyncFlagAndClear 0x00000400 - MessageFromTargetPos 0x1047, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x47, 0x0000 WaitUntilTextboxCloses Call NPC4E_SaveEquippedItems Call SetPlayerActionNormal - CallWithArg EquipItem, 0x0000000d + CallWithArg EquipItem, ITEM_SHIELD CallWithArg SetInputMacro, gUnk_080049F6 Wait 0x001e SetSyncFlag 0x00000100 @@ -29,11 +29,11 @@ SCRIPT_START script_Npc4EVaatiAttacking WaitForSyncFlagAndClear 0x00000020 StopBgm Wait 0x003c - MessageFromTargetPos 0x104a, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x4a, 0x0000 WaitUntilTextboxCloses SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000200 - MessageFromTargetPos 0x1049, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x49, 0x0000 WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x0098 Wait 0x0078 diff --git a/data/scripts/cutscene/introTown/script_BeedleIntro.inc b/data/scripts/cutscene/introTown/script_BeedleIntro.inc index 743a6c56..580198c2 100644 --- a/data/scripts/cutscene/introTown/script_BeedleIntro.inc +++ b/data/scripts/cutscene/introTown/script_BeedleIntro.inc @@ -13,7 +13,7 @@ script_0800F604: SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000008 - MessageNoOverlap 0x2511 + MessageNoOverlap TEXT_FESTIVAL, 0x11 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/cutscene/introTown/script_KidIntro2.inc b/data/scripts/cutscene/introTown/script_KidIntro2.inc index dfc9c3ce..f21d41c6 100644 --- a/data/scripts/cutscene/introTown/script_KidIntro2.inc +++ b/data/scripts/cutscene/introTown/script_KidIntro2.inc @@ -7,19 +7,7 @@ SCRIPT_START script_KidIntro2 Call sub_08062788 EndBlock script_0800F6F4: -.ifdef JP - CheckLocalFlag 0x00ca -.else -.ifdef EU - CheckLocalFlag 0x00ca -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00ca @ TODO deduplicate -.else - CheckLocalFlag 0x00cd -.endif -.endif -.endif + CheckLocalFlag MACHI_01_DEMO JumpIf script_0800F718 CheckEntityInteractType JumpIfNot script_0800F6F4 diff --git a/data/scripts/cutscene/introTown/script_KidIntro3.inc b/data/scripts/cutscene/introTown/script_KidIntro3.inc index d9813de7..e7b836c2 100644 --- a/data/scripts/cutscene/introTown/script_KidIntro3.inc +++ b/data/scripts/cutscene/introTown/script_KidIntro3.inc @@ -4,19 +4,7 @@ SCRIPT_START script_KidIntro3 DoPostScriptAction 0x0008 EndBlock script_0800F72C: -.ifdef JP - CheckLocalFlag 0x00ca -.else -.ifdef EU - CheckLocalFlag 0x00ca -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00ca @ TODO deduplicate -.else - CheckLocalFlag 0x00cd -.endif -.endif -.endif + CheckLocalFlag MACHI_01_DEMO JumpIfNot script_0800F72C DoPostScriptAction 0x0007 Jump script_KidIntro1 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc index 44fa21f2..cc1a7213 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc @@ -5,16 +5,16 @@ SCRIPT_START script_Npc4EIntroCastle Call sub_0807DF28 StartPlayerScript script_PlayerIntroCastle WaitForSyncFlagAndClear 0x00000400 - SetInventoryValue 0x0034, 0x0002 - MessageFromTargetPos 0x1036, 0x000c + SetInventoryValue ITEM_QST_SWORD, 0x0002 + MessageFromTargetPos TEXT_PROLOGUE, 0x36, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00000010 WaitForSyncFlagAndClear 0x00000020 - MessageFromTargetPos 0x1037, 0x0002 + MessageFromTargetPos TEXT_PROLOGUE, 0x37, 0x0002 WaitUntilTextboxCloses SetSyncFlag 0x00000010 WaitForSyncFlagAndClear 0x00000020 - MessageFromTargetPos 0x1038, 0x000c + MessageFromTargetPos TEXT_PROLOGUE, 0x38, 0x000c WaitUntilTextboxCloses StopBgm SetFadeTime 0x0004 @@ -51,7 +51,7 @@ SCRIPT_START script_Npc4EIntroCastle _0807E8E4_1 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - MessageFromTargetPos 0x1039, 0x000c + MessageFromTargetPos TEXT_PROLOGUE, 0x39, 0x000c WaitUntilTextboxCloses PlayBgm BGM_CASTLE_TOURNAMENT _0807E8E4_2 @@ -64,7 +64,7 @@ SCRIPT_START script_Npc4EIntroCastle Wait 0x012c SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - MessageFromTargetPos 0x103a, 0x000c + MessageFromTargetPos TEXT_PROLOGUE, 0x3a, 0x000c WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x01c0 _0807F0B4 0x0004 @@ -82,7 +82,7 @@ SCRIPT_START script_Npc4EIntroCastle PlaySound SFX_9B SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000200 - MessageFromTargetPos 0x1043, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x43, 0x0000 WaitUntilTextboxCloses PlayBgm BGM_VAATI_THEME SetSyncFlag 0x00000100 @@ -98,7 +98,7 @@ SCRIPT_START script_Npc4EIntroCastle WaitForSyncFlagAndClear 0x00005000 SetSyncFlag 0x00028000 WaitForSyncFlagAndClear 0x00050000 - MessageFromTargetPos 0x1044, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x44, 0x0000 WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x0098 StopBgm diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index ffd9dc02..88fb3f40 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -1,18 +1,6 @@ @ Intro Hyrule Town NPC4E SCRIPT_START script_Npc4EIntroTown -.ifdef JP - CheckLocalFlag 0x00ca -.else -.ifdef EU - CheckLocalFlag 0x00ca -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00ca @ TODO deduplicate -.else - CheckLocalFlag 0x00cd -.endif -.endif -.endif + CheckLocalFlag MACHI_01_DEMO JumpIf script_0800FA4C SetPlayerIdle Call sub_0807DF28 @@ -34,7 +22,7 @@ SCRIPT_START script_Npc4EIntroTown WaitForSyncFlagAndClear 0x00000001 WaitForSyncFlagAndClear 0x00000004 @ First message from Zelda - MessageFromTargetPos 0x2501, 0x0000 + MessageFromTargetPos TEXT_FESTIVAL, 0x01, 0x0000 WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 @@ -51,7 +39,7 @@ SCRIPT_START script_Npc4EIntroTown WaitForSyncFlagAndClear 0x00000001 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - MessageFromTargetPos 0x2503, 0x000e + MessageFromTargetPos TEXT_FESTIVAL, 0x03, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 @@ -64,7 +52,7 @@ SCRIPT_START script_Npc4EIntroTown WaitForSyncFlagAndClear 0x00000001 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - MessageFromTargetPos 0x2504, 0x000e + MessageFromTargetPos TEXT_FESTIVAL, 0x04, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 @@ -77,7 +65,7 @@ SCRIPT_START script_Npc4EIntroTown WaitForSyncFlagAndClear 0x00000001 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - MessageFromTargetPos 0x2505, 0x000e + MessageFromTargetPos TEXT_FESTIVAL, 0x05, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 @@ -93,7 +81,7 @@ SCRIPT_START script_Npc4EIntroTown _0807E8E4_0 Call CreatePlayerExclamationMark Wait 0x003c - MessageFromTargetPos 0x1021, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x21, 0x000e WaitUntilTextboxCloses StartPlayerScript script_PlayerIntro5 SetEntityPositionRelative 0x00f0, 0x0258 @@ -102,44 +90,44 @@ SCRIPT_START script_Npc4EIntroTown Wait 0x001e Call sub_08063C2C WaitForSyncFlagAndClear 0x00000001 - MessageFromTargetPos 0x1022, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x22, 0x000e WaitUntilTextboxCloses _0807E8E4_0 Call sub_08063C14 Call sub_08094CDC Wait 0x001e - MessageFromTargetPos 0x1023, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x23, 0x000e WaitUntilTextboxCloses Call sub_08063C14 Call sub_08094DD8 Wait 0x001e - MessageFromTargetPos 0x1024, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x24, 0x000e WaitUntilTextboxCloses Call sub_08063C14 Call sub_08094D34 Wait 0x001e - MessageFromTargetPos 0x1025, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x25, 0x000e WaitUntilTextboxCloses Call sub_08063C5C - MessageFromTargetPos 0x1026, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x26, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 _0807E8E4_1 Call sub_08063C2C - MessageFromTargetPos 0x1027, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x27, 0x0000 WaitUntilTextboxCloses Call sub_08063C74 Wait 0x003c Call sub_08063C14 _0807E8E4_0 - MessageFromTargetPos 0x1028, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x28, 0x000e WaitUntilTextboxCloses _0807E8E4_1 - MessageFromTargetPos 0x1029, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x29, 0x0000 WaitUntilTextboxCloses _0807E8E4_0 - MessageFromTargetPos 0x102a, 0x000e + MessageFromTargetPos TEXT_PROLOGUE, 0x2a, 0x000e WaitUntilTextboxCloses Call sub_08063C14 Call sub_08094D70 @@ -154,21 +142,21 @@ SCRIPT_START script_Npc4EIntroTown _0807E8E4_1 Call CreatePlayerExclamationMark Wait 0x003c - MessageFromTargetPos 0x102b, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x2b, 0x0000 WaitUntilTextboxCloses @ Give the shield to the player - GivePlayerItem 0x000d + GivePlayerItem ITEM_SHIELD WaitPlayerGetItem Call NPC4E_SaveEquippedItems Call SetPlayerActionNormal - CallWithArg EquipItem, 0x0000000d + CallWithArg EquipItem, ITEM_SHIELD SetIntVariable 0x000000ff Call sub_0807F5B0 CallWithArg SetInputMacro, gUnk_080049D6 Wait 0x00b7 SetIntVariable 0x00000000 Call sub_0807F5B0 - MessageFromTargetPos 0x102c, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x2c, 0x0000 WaitUntilTextboxCloses @ Give control back to the player CallWithArg SetInputMacro, 0x00000000 @@ -178,19 +166,7 @@ SCRIPT_START script_Npc4EIntroTown Wait 0x000a SetSyncFlag 0x00000002 Call sub_08063C44 -.ifdef JP - SetLocalFlag 0x00ca -.else -.ifdef EU - SetLocalFlag 0x00ca -.else -.ifdef DEMO_JP - SetLocalFlag 0x00ca @ TODO deduplicate -.else - SetLocalFlag 0x00cd -.endif -.endif -.endif + SetLocalFlag MACHI_01_DEMO Call sub_0807DF50 EnablePlayerControl script_0800FA4C: diff --git a/data/scripts/cutscene/introTown/script_Object69IntroTown.inc b/data/scripts/cutscene/introTown/script_Object69IntroTown.inc index a2710b62..126b882c 100644 --- a/data/scripts/cutscene/introTown/script_Object69IntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Object69IntroTown.inc @@ -1,41 +1,17 @@ @ Intro Hyrule Town OBJECT_69 ? SCRIPT_START script_Object69IntroTown -.ifdef JP - CheckLocalFlag 0x00ca -.else -.ifdef EU - CheckLocalFlag 0x00ca -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00ca @ TODO deduplicate -.else - CheckLocalFlag 0x00cd -.endif -.endif -.endif + CheckLocalFlag MACHI_01_DEMO JumpIf script_0800FD50 WaitForSyncFlagAndClear 0x00000010 script_0800FD1A: @ Prevent Link from leaving CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 JumpIfNot script_0800FD1A -.ifdef JP - CheckLocalFlag 0x00ca -.else -.ifdef EU - CheckLocalFlag 0x00ca -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00ca @ TODO deduplicate -.else - CheckLocalFlag 0x00cd -.endif -.endif -.endif + CheckLocalFlag MACHI_01_DEMO JumpIf script_0800FD5C SetPlayerIdle Call WaitForPlayerNormal - MessageFromTargetPos 0x2506, 0x0000 + MessageFromTargetPos TEXT_FESTIVAL, 0x06, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_PlayerIntroTown WaitForSyncFlagAndClear 0x00000008 @@ -47,7 +23,7 @@ script_0800FD50: script_0800FD5C: SetPlayerIdle Call WaitForPlayerNormal - MessageFromTargetPos 0x106c, 0x0000 + MessageFromTargetPos TEXT_PROLOGUE, 0x6c, 0x0000 WaitUntilTextboxCloses StartPlayerScript script_PlayerIntroTown WaitForSyncFlagAndClear 0x00000008 diff --git a/data/scripts/cutscene/introTown/script_PinaIntro.inc b/data/scripts/cutscene/introTown/script_PinaIntro.inc index bc9ec670..947b7eee 100644 --- a/data/scripts/cutscene/introTown/script_PinaIntro.inc +++ b/data/scripts/cutscene/introTown/script_PinaIntro.inc @@ -13,24 +13,12 @@ script_0800F6A0: SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000004 -.ifdef JP - CheckLocalFlag 0x00ca -.else -.ifdef EU - CheckLocalFlag 0x00ca -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00ca @ TODO deduplicate -.else - CheckLocalFlag 0x00cd -.endif -.endif -.endif + CheckLocalFlag MACHI_01_DEMO JumpIf script_0800F6C4 - MessageNoOverlap 0x2512 + MessageNoOverlap TEXT_FESTIVAL, 0x12 Jump script_0800F6C8 script_0800F6C4: - MessageNoOverlap 0x251f + MessageNoOverlap TEXT_FESTIVAL, 0x1f script_0800F6C8: WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc index b09e0dbf..b836eab4 100644 --- a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc @@ -33,7 +33,7 @@ script_0800F1E6: SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - MessageFromTargetPos 0x1206, 0x000c + MessageFromTargetPos TEXT_MINISH2, 0x06, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone1 WaitForSyncFlagAndClear 0x00000400 @@ -49,7 +49,7 @@ script_0800F22A: SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - MessageFromTargetPos 0x1206, 0x000c + MessageFromTargetPos TEXT_MINISH2, 0x06, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone2 WaitForSyncFlagAndClear 0x00000400 @@ -65,7 +65,7 @@ script_0800F26A: SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - MessageFromTargetPos 0x1206, 0x000c + MessageFromTargetPos TEXT_MINISH2, 0x06, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone3 WaitForSyncFlagAndClear 0x00000400 @@ -81,7 +81,7 @@ script_0800F2AA: SetAnimation 0x0008 DoPostScriptAction 0x0004 Wait 0x003c - MessageFromTargetPos 0x1206, 0x000c + MessageFromTargetPos TEXT_MINISH2, 0x06, 0x000c WaitUntilTextboxCloses StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone4 WaitForSyncFlagAndClear 0x00000400 @@ -90,7 +90,7 @@ script_0800F2AA: script_0800F2EA: EndBlock BeginBlock - CheckKinstoneFused 0x0032 + CheckKinstoneFused KINSTONE_32 JumpIf script_0800F314 CheckEntityInteractType JumpIfNot script_0800F2EA @@ -98,7 +98,7 @@ script_0800F2EA: SetPlayerIdle FacePlayer SetAnimation 0x0008 - MessageFromTargetPos 0x1208, 0x000c + MessageFromTargetPos TEXT_MINISH2, 0x08, 0x000c WaitUntilTextboxCloses EnablePlayerControl Jump script_0800F1E6 diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc index c4eae773..8f5da1bd 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc @@ -26,7 +26,7 @@ script_0800F3EA: EndBlock SetPlayerIdle FacePlayer - MessageNoOverlap 0x1237 + MessageNoOverlap TEXT_MINISH2, 0x37 WaitUntilTextboxCloses EnablePlayerControl script_0800F402: diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc index 16f69917..344d2556 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc @@ -25,7 +25,7 @@ script_0800F478: EndBlock SetPlayerIdle FacePlayer - MessageNoOverlap 0x1238 + MessageNoOverlap TEXT_MINISH2, 0x38 WaitUntilTextboxCloses EnablePlayerControl script_0800F490: diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc index 04145775..3714f838 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc @@ -25,7 +25,7 @@ script_0800F50C: EndBlock SetPlayerIdle FacePlayer - MessageNoOverlap 0x1239 + MessageNoOverlap TEXT_MINISH2, 0x39 WaitUntilTextboxCloses EnablePlayerControl script_0800F524: diff --git a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc index b3afd418..b3ba7abc 100644 --- a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc @@ -15,25 +15,25 @@ script_0800F09A: WaitForSyncFlagAndClear 0x00000001 SetSyncFlag 0x0000001e WaitForSyncFlagAndClear 0x00000040 - MessageFromTargetPos 0x1201, 0x000c + MessageFromTargetPos TEXT_MINISH2, 0x01, 0x000c WaitUntilTextboxCloses WaitForSyncFlagAndClear 0x000003c0 _0807E8E4_0 - MessageFromTargetPos 0x1202, 0x000c + MessageFromTargetPos TEXT_MINISH2, 0x02, 0x000c WaitUntilTextboxCloses - GivePlayerItem 0x0067 + GivePlayerItem ITEM_KINSTONE_BAG WaitPlayerGetItem _0807E8E4_0 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000040 - MessageFromTargetPos 0x1203, 0x000c + MessageFromTargetPos TEXT_MINISH2, 0x03, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00000002 Call sub_0807DF50 EnablePlayerControl WaitForSyncFlagAndClear 0x00000040 script_0800F11A: - CheckKinstoneFused 0x0032 + CheckKinstoneFused KINSTONE_32 JumpIfNot script_0800F11A SetPlayerIdle Call sub_0807DF28 diff --git a/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc b/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc index 045da40d..85224902 100644 --- a/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc +++ b/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc @@ -13,7 +13,7 @@ script_0800C928: StartPlayerScript script_PlayerAtVillageIntro WaitForSyncFlagAndClear 0x00000002 Wait 0x003c - EzloMessage 0x1125 + EzloMessage TEXT_FINDING_EZLO, 0x25 WaitUntilTextboxCloses SetSyncFlag 0x00000800 _0807E8E4_3 @@ -40,7 +40,7 @@ script_0800C928: SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000400 _0807E8E4_0 - MessageFromTarget 0x1126 + MessageFromTarget TEXT_FINDING_EZLO, 0x26 Call CreatePlayerQuestionMark WaitUntilTextboxCloses SetSyncFlag 0x00000200 @@ -56,12 +56,12 @@ script_0800C928: SetSyncFlag 0x00008000 WaitForSyncFlagAndClear 0x00010000 _0807E8E4_3 - MessageFromTarget 0x1127 + MessageFromTarget TEXT_FINDING_EZLO, 0x27 WaitUntilTextboxCloses SetSyncFlag 0x00002000 WaitForSyncFlagAndClear 0x00004000 _0807E8E4_1 - MessageFromTarget 0x1128 + MessageFromTarget TEXT_FINDING_EZLO, 0x28 WaitUntilTextboxCloses SetSyncFlag 0x00000200 SetSyncFlag 0x00000800 @@ -74,7 +74,7 @@ script_0800C928: WaitForSyncFlagAndClear 0x00010000 WaitForSyncFlagAndClear 0x00040000 _0807E8E4_0 - EzloMessage 0x1129 + EzloMessage TEXT_FINDING_EZLO, 0x29 WaitUntilTextboxCloses SetLocalFlag 0x008d Call sub_0807DF50 diff --git a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc index d0c52080..cbdf8c8b 100644 --- a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc +++ b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc @@ -8,7 +8,7 @@ SCRIPT_START script_EzloCapExplainingOriginStory Call sub_0806D944 WaitForSyncFlagAndClear 0x00000008 SetAnimation 0x0010 - MessageFromTargetPos 0x1314, 0x000c + MessageFromTargetPos TEXT_VAATI, 0x14, 0x000c WaitUntilTextboxCloses SetAnimation 0x0018 Call sub_0806D8A0 diff --git a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc index 9706a139..0f02d560 100644 --- a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc +++ b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object69CameraTarget CallWithArg sub_0807FB28, 0x00000003 SetSyncFlag 0x00048000 WaitForSyncFlagAndClear 0x00090000 - MessageFromTargetPos 0x1311, 0x0002 + MessageFromTargetPos TEXT_VAATI, 0x11, 0x0002 WaitUntilTextboxCloses SetSyncFlag 0x00008000 WaitForSyncFlagAndClear 0x00010000 @@ -14,7 +14,7 @@ SCRIPT_START script_Object69CameraTarget WaitForSyncFlagAndClear 0x00010000 CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 - MessageFromTargetPos 0x1312, 0x000c + MessageFromTargetPos TEXT_VAATI, 0x12, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00000800 WaitForSyncFlagAndClear 0x00001000 diff --git a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc index cc7d99f5..d856f427 100644 --- a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc +++ b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc @@ -18,20 +18,20 @@ SCRIPT_START script_Object69MinishVaati WaitForSyncFlagAndClear 0x00001100 _0807F0B4 0x0004 SetEntityPositionRelative 0x0078, 0x0090 - MessageFromTargetPos 0x1330, 0x0002 + MessageFromTargetPos TEXT_VAATI, 0x30, 0x0002 WaitUntilTextboxCloses SetSyncFlag 0x00008000 WaitForSyncFlagAndClear 0x00010000 SetSyncFlag 0x00000880 WaitForSyncFlagAndClear 0x00001000 Wait 0x003c - MessageFromTargetPos 0x130d, 0x0002 + MessageFromTargetPos TEXT_VAATI, 0x0d, 0x0002 WaitUntilTextboxCloses - MessageFromTargetPos 0x130e, 0x000c + MessageFromTargetPos TEXT_VAATI, 0x0e, 0x000c WaitUntilTextboxCloses - MessageFromTargetPos 0x130f, 0x0002 + MessageFromTargetPos TEXT_VAATI, 0x0f, 0x0002 WaitUntilTextboxCloses - MessageFromTargetPos 0x1310, 0x000c + MessageFromTargetPos TEXT_VAATI, 0x10, 0x000c WaitUntilTextboxCloses CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc index 79a9e79c..f698efd0 100644 --- a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc +++ b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc @@ -15,7 +15,7 @@ script_08014FCC: CameraTargetEntity StartPlayerScript script_PlayerAtVaatisAppearance WaitForSyncFlagAndClear 0x00000001 - MessageFromTargetPos 0x1301, 0x0002 + MessageFromTargetPos TEXT_VAATI, 0x01, 0x0002 WaitUntilTextboxCloses Call CreatePlayerExclamationMark Wait 0x003c @@ -24,17 +24,17 @@ script_08014FCC: SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 PlayBgm BGM_VAATI_THEME - EzloMessage 0x1302 + EzloMessage TEXT_VAATI, 0x02 WaitUntilTextboxCloses - MessageFromTargetPos 0x1303, 0x0002 + MessageFromTargetPos TEXT_VAATI, 0x03, 0x0002 WaitUntilTextboxCloses - EzloMessage 0x1304 + EzloMessage TEXT_VAATI, 0x04 WaitUntilTextboxCloses - MessageFromTargetPos 0x1305, 0x0002 + MessageFromTargetPos TEXT_VAATI, 0x05, 0x0002 WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - EzloMessage 0x1306 + EzloMessage TEXT_VAATI, 0x06 WaitUntilTextboxCloses StopBgm StartPlayerScript script_PlayerTryToFollowVaati @@ -107,20 +107,8 @@ script_08015104: PlaySound SFX_SECRET _0807F0B4 0x0004 CameraTargetPlayer -.ifdef JP - SetLocalFlag 0x008a -.else -.ifdef EU - SetLocalFlag 0x008a -.else -.ifdef DEMO_JP - SetLocalFlag 0x008a @ TODO deduplicate -.else - SetLocalFlag 0x008c -.endif -.endif -.endif - EzloMessage 0x130c + SetLocalFlag SOUGEN_06_SAIKAI + EzloMessage TEXT_VAATI, 0x0c WaitUntilTextboxCloses @ Ezlo cutscene starts CameraTargetPlayer @@ -130,7 +118,7 @@ script_08015104: Call sub_08053B3C BeginBlock SetPlayerIdle - CallWithArg SetPlayerFlag, 0x00000008 + CallWithArg SetPlayerFlag, PL_NO_CAP MoveEntityToPlayer _0807F0B4 0x0004 CameraTargetEntity @@ -148,7 +136,7 @@ script_08015104: WaitForSyncFlagAndClear 0x00000010 BeginBlock _0807E8E4_2 - EzloMessage 0x1315 + EzloMessage TEXT_VAATI, 0x15 EndBlock WaitUntilTextboxCloses _0807F0B4 0x0004 diff --git a/data/scripts/cutscene/outro/script_EzloCapOutro.inc b/data/scripts/cutscene/outro/script_EzloCapOutro.inc index e2b67e76..3151f9ac 100644 --- a/data/scripts/cutscene/outro/script_EzloCapOutro.inc +++ b/data/scripts/cutscene/outro/script_EzloCapOutro.inc @@ -11,7 +11,7 @@ SCRIPT_START script_EzloCapOutro EndBlock SetAnimation 0x0023 WaitForSyncFlagAndClear 0x00000010 - CallWithArg SetPlayerFlag, 0x00000008 + CallWithArg SetPlayerFlag, PL_NO_CAP DoPostScriptAction 0x0007 PlaySound SFX_SPARKLES ClearSyncFlag 0x00000800 diff --git a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc index e1e7e5fb..539958c6 100644 --- a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc +++ b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Npc4EFixedEverything SetEntityPositionRelative 0x0088, 0x0148 Call sub_0807F844 _0807E8E4_3 - CallWithArg SetPlayerFlag, 0x00000008 + CallWithArg SetPlayerFlag, PL_NO_CAP CallWithArg SetPlayerPos, 0x00a80088 PlaySound SFX_APPARATE EndBlock @@ -14,9 +14,9 @@ SCRIPT_START script_Npc4EFixedEverything _0807F0B4 0x0001 SetEntityPositionRelative 0x0088, 0x0078 Call WaitForCameraTouchRoomBorder - MessageFromTargetPos 0x1664, 0x0000 + MessageFromTargetPos TEXT_VAATI2, 0x64, 0x0000 WaitUntilTextboxCloses - MessageFromTargetPos 0x165e, 0x000e + MessageFromTargetPos TEXT_VAATI2, 0x5e, 0x000e WaitUntilTextboxCloses CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc index 804f04ec..502217ac 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc @@ -14,15 +14,15 @@ SCRIPT_START script_Npc4EMinishPortalClosing Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - MessageFromTargetPos 0x165f, 0x000e + MessageFromTargetPos TEXT_VAATI2, 0x5f, 0x000e WaitUntilTextboxCloses StartPlayerScript script_PlayerAtEzlo WaitForSyncFlagAndClear 0x00000001 - MessageFromTargetPos 0x1660, 0x000e + MessageFromTargetPos TEXT_VAATI2, 0x60, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - MessageFromTargetPos 0x1661, 0x000e + MessageFromTargetPos TEXT_VAATI2, 0x61, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000008 SetSyncFlag 0x00000002 @@ -33,9 +33,9 @@ SCRIPT_START script_Npc4EMinishPortalClosing StartPlayerScript script_PlayerGetGreenCap WaitForSyncFlagAndClear 0x00000001 Wait 0x003c - MessageFromTargetPos 0x1662, 0x000e + MessageFromTargetPos TEXT_VAATI2, 0x62, 0x000e WaitUntilTextboxCloses - MessageFromTargetPos 0x1663, 0x000e + MessageFromTargetPos TEXT_VAATI2, 0x63, 0x000e WaitUntilTextboxCloses OffsetEntityPosition 0x0000, 0xffe0 Call WaitForCameraTouchRoomBorder @@ -46,7 +46,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing StartPlayerScript script_PlayerSayGoodbye WaitForSyncFlagAndClear 0x00000001 Wait 0x003c - MessageFromTargetPos 0x1665, 0x000e + MessageFromTargetPos TEXT_VAATI2, 0x65, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 diff --git a/data/scripts/cutscene/outro/script_Npc4EOutro.inc b/data/scripts/cutscene/outro/script_Npc4EOutro.inc index 9dfe61d8..bb1c0e42 100644 --- a/data/scripts/cutscene/outro/script_Npc4EOutro.inc +++ b/data/scripts/cutscene/outro/script_Npc4EOutro.inc @@ -13,7 +13,7 @@ SCRIPT_START script_Npc4EOutro WaitForSyncFlagAndClear 0x00000001 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000080 - MessageFromTargetPos 0x1659, 0x0000 + MessageFromTargetPos TEXT_VAATI2, 0x59, 0x0000 WaitUntilTextboxCloses Wait 0x003c SetSyncFlag 0x00000010 @@ -28,10 +28,10 @@ SCRIPT_START script_Npc4EOutro SetSyncFlag 0x00000004 Call CreatePlayerExclamationMark WaitForSyncFlagAndClear 0x00000080 - MessageFromTargetPos 0x165a, 0x000e + MessageFromTargetPos TEXT_VAATI2, 0x5a, 0x000e WaitUntilTextboxCloses Wait 0x003c - MessageFromTargetPos 0x165b, 0x000e + MessageFromTargetPos TEXT_VAATI2, 0x5b, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000040 @@ -46,10 +46,10 @@ SCRIPT_START script_Npc4EOutro WaitForSyncFlagAndClear 0x00000100 SetSyncFlag 0x00000006 WaitForSyncFlagAndClear 0x000000c0 - MessageFromTargetPos 0x165c, 0x000e + MessageFromTargetPos TEXT_VAATI2, 0x5c, 0x000e WaitUntilTextboxCloses StopBgm - MessageFromTargetPos 0x165d, 0x000e + MessageFromTargetPos TEXT_VAATI2, 0x5d, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000006 WaitForSyncFlagAndClear 0x000000c0 diff --git a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc index 04e6cd52..85ba5972 100644 --- a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc +++ b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc @@ -9,7 +9,7 @@ SCRIPT_START script_PlayerGetGreenCap Wait 0x005a SetSyncFlag 0x00000008 BeginBlock - CallWithArg ResetPlayerFlag, 0x00000008 + CallWithArg ResetPlayerFlag, PL_NO_CAP CallWithArg SetPlayerAnimation2, 0x000008e4 EndBlock Call WaitForPlayerAnim diff --git a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc index b8dd72eb..0dd4a2c3 100644 --- a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc +++ b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc @@ -7,7 +7,7 @@ SCRIPT_START script_Object3EPictureBackRoom Call sub_0807DF28 StartPlayerScript script_PlayerAtPicture WaitForSyncFlagAndClear 0x00000002 - EzloMessage 0x1601 + EzloMessage TEXT_VAATI2, 0x01 WaitUntilTextboxCloses StartPlayerScript script_PlayerMoveToPicture WaitForSyncFlagAndClear 0x00000002 @@ -25,7 +25,7 @@ SCRIPT_START script_Object3EPictureBackRoom SetPlayerIdle Call sub_0807DF28 WaitForFadeFinish - MessageFromTargetPos 0x1602, 0x000c + MessageFromTargetPos TEXT_VAATI2, 0x02, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000010 @@ -39,7 +39,7 @@ SCRIPT_START script_Object3EPictureBackRoom StartPlayerScript script_PlayerFaintAgain SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000042 - MessageFromTargetPos 0x1603, 0x000c + MessageFromTargetPos TEXT_VAATI2, 0x03, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000040 @@ -52,7 +52,7 @@ SCRIPT_START script_Object3EPictureBackRoom Wait 0x003c CameraTargetPlayer Call WaitForCameraTouchRoomBorder - MessageFromTargetPos 0x1604, 0x0007 + MessageFromTargetPos TEXT_VAATI2, 0x04, 0x0007 WaitUntilTextboxCloses SetFadeMask 0xffffffff SetFadeTime 0x0004 @@ -60,11 +60,11 @@ SCRIPT_START script_Object3EPictureBackRoom WaitForFadeFinish SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - EzloMessage 0x1605 + EzloMessage TEXT_VAATI2, 0x05 WaitUntilTextboxCloses SetLocalFlag 0x0078 PlayBgm BGM_CASTLE_COLLAPSE - SetGlobalFlag 0x005d + SetGlobalFlag SEIIKI_BGM Call sub_0807DF50 EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc b/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc index 3f76d704..3649ea35 100644 --- a/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc +++ b/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc @@ -7,19 +7,19 @@ SCRIPT_START script_KingDaltusTakeover WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x1319 + MessageNoOverlap TEXT_VAATI, 0x19 WaitUntilTextboxCloses SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - MessageNoOverlap 0x131a + MessageNoOverlap TEXT_VAATI, 0x1a WaitUntilTextboxCloses SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - MessageNoOverlap 0x131d + MessageNoOverlap TEXT_VAATI, 0x1d WaitUntilTextboxCloses SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 - MessageNoOverlap 0x131e + MessageNoOverlap TEXT_VAATI, 0x1e WaitUntilTextboxCloses SetSyncFlag 0x00000008 WaitForSyncFlag 0x00000400 diff --git a/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc b/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc index 83d69479..67b71c4f 100644 --- a/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc +++ b/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc @@ -5,7 +5,7 @@ SCRIPT_START script_MinisterPothoTakeover DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000001 - MessageNoOverlap 0x131c + MessageNoOverlap TEXT_VAATI, 0x1c WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlag 0x00000200 diff --git a/data/scripts/cutscene/takeover/script_Object69Takeover.inc b/data/scripts/cutscene/takeover/script_Object69Takeover.inc index 5aba0ef9..6c4419f4 100644 --- a/data/scripts/cutscene/takeover/script_Object69Takeover.inc +++ b/data/scripts/cutscene/takeover/script_Object69Takeover.inc @@ -30,21 +30,9 @@ script_08015BF0: _0807E800 0x00000000 WaitForFadeFinish PlayBGM - EzloMessage 0x131f + EzloMessage TEXT_VAATI, 0x1f WaitUntilTextboxCloses -.ifdef JP - SetLocalFlag 0x009b -.else -.ifdef EU - SetLocalFlag 0x009b -.else -.ifdef DEMO_JP - SetLocalFlag 0x009b @ TODO deduplicate -.else - SetLocalFlag 0x009c -.endif -.endif -.endif + SetLocalFlag SOUGEN_08_TORITSUKI Call sub_0807FBCC Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc index de5db4ee..aea96906 100644 --- a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc +++ b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc @@ -9,7 +9,7 @@ SCRIPT_START script_PlayerAtTakeover DoPostScriptAction 0x0000 CallWithArg SetPlayerAnimation2, 0x000003c5 Call WaitForPlayerAnim - MessageFromTargetPos 0x1318, 0x000c + MessageFromTargetPos TEXT_VAATI, 0x18, 0x000c WaitUntilTextboxCloses CallWithArg SetPlayerAnimation2, 0x000003c9 Call WaitForPlayerAnim diff --git a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc index 1a2520c3..8e730e8f 100644 --- a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc +++ b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc @@ -33,7 +33,7 @@ SCRIPT_START script_VaatiTakeover WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0014 Wait 0x001e - MessageNoOverlap 0x131b + MessageNoOverlap TEXT_VAATI, 0x1b WaitUntilTextboxCloses SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 diff --git a/data/scripts/dhc/script_GuardCellLeft.inc b/data/scripts/dhc/script_GuardCellLeft.inc index 58efe5f0..c0f0c031 100644 --- a/data/scripts/dhc/script_GuardCellLeft.inc +++ b/data/scripts/dhc/script_GuardCellLeft.inc @@ -12,7 +12,7 @@ script_0800E44C: SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000000 - MessageNoOverlap 0x2405 + MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x05 WaitUntilTextboxCloses EnablePlayerControl Jump script_0800E44C diff --git a/data/scripts/dhc/script_GuardCellRight.inc b/data/scripts/dhc/script_GuardCellRight.inc index 83ddbacf..9c23e9ff 100644 --- a/data/scripts/dhc/script_GuardCellRight.inc +++ b/data/scripts/dhc/script_GuardCellRight.inc @@ -12,7 +12,7 @@ script_0800E484: SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000000 - MessageNoOverlap 0x2407 + MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x07 WaitUntilTextboxCloses EnablePlayerControl Jump script_0800E484 diff --git a/data/scripts/dhc/script_GuardStone1.inc b/data/scripts/dhc/script_GuardStone1.inc index ae42371d..06f8aaea 100644 --- a/data/scripts/dhc/script_GuardStone1.inc +++ b/data/scripts/dhc/script_GuardStone1.inc @@ -29,7 +29,7 @@ script_0800E176: FacePlayer CallWithArg sub_0807F3D8, 0x00000000 Wait 0x000a - MessageNoOverlap 0x2401 + MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x01 WaitUntilTextboxCloses SetLocalFlag 0x0094 script_0800E1D0: @@ -43,7 +43,7 @@ script_0800E1E0: SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000000 - MessageNoOverlap 0x2401 + MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x01 WaitUntilTextboxCloses EnablePlayerControl Jump script_0800E1E0 diff --git a/data/scripts/dhc/script_GuardStone2.inc b/data/scripts/dhc/script_GuardStone2.inc index 71483148..254d6cbc 100644 --- a/data/scripts/dhc/script_GuardStone2.inc +++ b/data/scripts/dhc/script_GuardStone2.inc @@ -74,7 +74,7 @@ script_0800E312: FacePlayer CallWithArg sub_0807F3D8, 0x00000000 EndBlock - MessageNoOverlap 0x2404 + MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x04 WaitUntilTextboxCloses EnablePlayerControl Jump script_0800E2AE @@ -84,7 +84,7 @@ script_0800E32E: SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000000 - MessageNoOverlap 0x2403 + MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x03 WaitUntilTextboxCloses EnablePlayerControl Jump script_0800E32E diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc index 23e38f64..58b1f75b 100644 --- a/data/scripts/dhc/script_KingDaltusStone.inc +++ b/data/scripts/dhc/script_KingDaltusStone.inc @@ -39,10 +39,10 @@ script_0800E3C8: JumpIfNot script_0800E3C8 SetPlayerIdle FacePlayer - MessageNoOverlap 0x240c + MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x0c WaitUntilTextboxCloses Wait 0x000f - GivePlayerItem 0x0053 + GivePlayerItem ITEM_SMALL_KEY WaitPlayerGetItem SetLocalFlag 0x0071 EnablePlayerControl @@ -55,7 +55,7 @@ script_0800E3EE: JumpIfNot script_0800E3EE SetPlayerIdle FacePlayer - MessageNoOverlap 0x240d + MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x0d WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/dhc/script_MinishterPothoStone.inc b/data/scripts/dhc/script_MinishterPothoStone.inc index caf8f250..210e28cf 100644 --- a/data/scripts/dhc/script_MinishterPothoStone.inc +++ b/data/scripts/dhc/script_MinishterPothoStone.inc @@ -28,7 +28,7 @@ script_0800E0DE: FaceAwayFromPlayer FacePlayer Wait 0x000a - MessageNoOverlap 0x2402 + MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x02 WaitUntilTextboxCloses SetLocalFlag 0x0093 script_0800E12E: @@ -40,7 +40,7 @@ script_0800E138: JumpIfNot script_0800E138 SetPlayerIdle FacePlayer - MessageNoOverlap 0x2402 + MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x02 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/dhc/script_MinisterPothoCell.inc b/data/scripts/dhc/script_MinisterPothoCell.inc index bbb05921..0016a435 100644 --- a/data/scripts/dhc/script_MinisterPothoCell.inc +++ b/data/scripts/dhc/script_MinisterPothoCell.inc @@ -10,7 +10,7 @@ script_0800E41A: JumpIfNot script_0800E41A SetPlayerIdle FacePlayer - MessageNoOverlap 0x2406 + MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x06 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc index 67c2d035..cdab5391 100644 --- a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc @@ -12,7 +12,7 @@ script_0800DB7C: SetEntityPositionRelative 0x0078, 0x0078 CameraTargetEntity Call WaitForCameraTouchRoomBorder - EzloMessage 0x1648 + EzloMessage TEXT_VAATI2, 0x48 WaitUntilTextboxCloses Call sub_0804D7EC SetSyncFlag 0x00000001 @@ -35,9 +35,9 @@ script_0800DBCA: SetSyncFlag 0x00000001 StartPlayerScript script_PlayerAfterDefeatingV2 WaitForSyncFlagAndClear 0x00000006 - MessageFromTargetPos 0x1643, 0x0002 + MessageFromTargetPos TEXT_VAATI2, 0x43, 0x0002 WaitUntilTextboxCloses - EzloMessage 0x1645 + EzloMessage TEXT_VAATI2, 0x45 WaitUntilTextboxCloses Call CreatePlayerExclamationMark SetSyncFlag 0x00000001 diff --git a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc index 1f2ae59d..018b2feb 100644 --- a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc +++ b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc @@ -4,7 +4,7 @@ SCRIPT_START script_Npc4ECastleCollapsing PlayBgm BGM_CASTLE_COLLAPSE StartPlayerScript script_PlayerStonesFall WaitForSyncFlagAndClear 0x00000006 - EzloMessage 0x1646 + EzloMessage TEXT_VAATI2, 0x46 WaitUntilTextboxCloses SetSyncFlag 0x00000001 StartPlayerScript script_PlayerCastleCollapsing diff --git a/data/scripts/dhc/script_Npc4EV3Defeated.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc index 6788d7e5..e946f42e 100644 --- a/data/scripts/dhc/script_Npc4EV3Defeated.inc +++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4EV3Defeated EndBlock script_0800A0FE: - CheckGlobalFlag 0x0051 + CheckGlobalFlag ENDING JumpIfNot script_0800A0FE BeginBlock SetPlayerIdle diff --git a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc index 4bdf7ea5..51164ea1 100644 --- a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc +++ b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc @@ -30,13 +30,13 @@ script_0800E4B6: EndBlock Call CreatePlayerExclamationMark Wait 0x003c - MessageFromTarget 0x160c + MessageFromTarget TEXT_VAATI2, 0x0c WaitUntilTextboxCloses Wait 0x001e - MessageFromTarget 0x160d + MessageFromTarget TEXT_VAATI2, 0x0d WaitUntilTextboxCloses Wait 0x001e - EzloMessage 0x160e + EzloMessage TEXT_VAATI2, 0x0e Wait 0x003c WaitUntilTextboxCloses BeginBlock diff --git a/data/scripts/dhc/script_Object69CastleEscape.inc b/data/scripts/dhc/script_Object69CastleEscape.inc index f75e5bc4..93348aff 100644 --- a/data/scripts/dhc/script_Object69CastleEscape.inc +++ b/data/scripts/dhc/script_Object69CastleEscape.inc @@ -6,7 +6,7 @@ SCRIPT_START script_Object69CastleEscape StartPlayerScript script_PlayerCastleEscape WaitForSyncFlagAndClear 0x00000001 WaitForSyncFlagAndClear 0x00000002 - EzloMessage 0x1647 + EzloMessage TEXT_VAATI2, 0x47 WaitUntilTextboxCloses SetLocalFlag 0x007a Call sub_0807DF50 diff --git a/data/scripts/dhc/script_Object69DarkNutsRoom.inc b/data/scripts/dhc/script_Object69DarkNutsRoom.inc index 2b05c72c..12fe4aa3 100644 --- a/data/scripts/dhc/script_Object69DarkNutsRoom.inc +++ b/data/scripts/dhc/script_Object69DarkNutsRoom.inc @@ -13,7 +13,7 @@ script_0800E550: Wait 0x003c PlaySound SFX_105 Wait 0x001e - EzloMessage 0x1622 + EzloMessage TEXT_VAATI2, 0x22 Call StartDarkNutTimer SetLocalFlag 0x007e script_0800E582: diff --git a/data/scripts/dhc/script_Object69KeatonsRoom.inc b/data/scripts/dhc/script_Object69KeatonsRoom.inc index 902cf230..7d754cec 100644 --- a/data/scripts/dhc/script_Object69KeatonsRoom.inc +++ b/data/scripts/dhc/script_Object69KeatonsRoom.inc @@ -13,7 +13,7 @@ script_0800E510: Wait 0x003c PlaySound SFX_105 Wait 0x001e - EzloMessage 0x1617 + EzloMessage TEXT_VAATI2, 0x17 SetLocalFlag 0x007d script_0800E53C: EnablePlayerControl diff --git a/data/scripts/dhc/script_Object69V2Defeated.inc b/data/scripts/dhc/script_Object69V2Defeated.inc index ddd5df46..eb9bf0dd 100644 --- a/data/scripts/dhc/script_Object69V2Defeated.inc +++ b/data/scripts/dhc/script_Object69V2Defeated.inc @@ -7,7 +7,7 @@ SCRIPT_START script_Object69V2Defeated StopBgm StopBgm Wait 0x0078 - EzloMessage 0x1638 + EzloMessage TEXT_VAATI2, 0x38 WaitUntilTextboxCloses SetRoomFlag 0x0000 Wait 0x001e diff --git a/data/scripts/dhc/script_Object69V2Intro.inc b/data/scripts/dhc/script_Object69V2Intro.inc index 1e779703..edcff907 100644 --- a/data/scripts/dhc/script_Object69V2Intro.inc +++ b/data/scripts/dhc/script_Object69V2Intro.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Object69V2Intro SetPlayerIdle EndBlock StopBgm - MessageFromTargetPos 0x1632, 0x0002 + MessageFromTargetPos TEXT_VAATI2, 0x32, 0x0002 WaitUntilTextboxCloses SetRoomFlag 0x0003 script_0800DFFE: @@ -21,7 +21,7 @@ script_0800E012: SetPlayerIdle Call sub_0807DF28 SetLocalFlag 0x007b - MessageFromTargetPos 0x1639, 0x000c + MessageFromTargetPos TEXT_VAATI2, 0x39, 0x000c WaitUntilTextboxCloses Wait 0x0096 PlaySound SFX_EVAPORATE diff --git a/data/scripts/dhc/script_Object69VaatiWithZelda.inc b/data/scripts/dhc/script_Object69VaatiWithZelda.inc index 930fbcf2..fe5d2128 100644 --- a/data/scripts/dhc/script_Object69VaatiWithZelda.inc +++ b/data/scripts/dhc/script_Object69VaatiWithZelda.inc @@ -17,11 +17,11 @@ script_0800DA64: Call WaitForCameraTouchRoomBorder SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 - MessageFromTargetPos 0x162d, 0x0002 + MessageFromTargetPos TEXT_VAATI2, 0x2d, 0x0002 WaitUntilTextboxCloses SetSyncFlag 0x00000001 Wait 0x001e - MessageFromTargetPos 0x162e, 0x0002 + MessageFromTargetPos TEXT_VAATI2, 0x2e, 0x0002 WaitUntilTextboxCloses _0807E8E4_0 CallWithArg SetPlayerPos, 0x00780138 diff --git a/data/scripts/dhc/script_Vaati1Intro.inc b/data/scripts/dhc/script_Vaati1Intro.inc index 0308aab2..c5af958a 100644 --- a/data/scripts/dhc/script_Vaati1Intro.inc +++ b/data/scripts/dhc/script_Vaati1Intro.inc @@ -20,7 +20,7 @@ SCRIPT_START script_Vaati1Intro Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 - MessageFromTargetPos 0x162f, 0x0002 + MessageFromTargetPos TEXT_VAATI2, 0x2f, 0x0002 WaitUntilTextboxCloses PlayBgm BGM_VAATI_REBORN DoPostScriptAction 0x0019 diff --git a/data/scripts/dhc/script_ZeldaStoneDHC.inc b/data/scripts/dhc/script_ZeldaStoneDHC.inc index ae2bc504..3c72b52d 100644 --- a/data/scripts/dhc/script_ZeldaStoneDHC.inc +++ b/data/scripts/dhc/script_ZeldaStoneDHC.inc @@ -10,7 +10,7 @@ SCRIPT_START script_ZeldaStoneDHC Wait 0x003c PlaySound SFX_9B Wait 0x001e - MessageNoOverlap 0x1625 + MessageNoOverlap TEXT_VAATI2, 0x25 WaitUntilTextboxCloses Wait 0x003c Call sub_08053C84 diff --git a/data/scripts/graveyard/script_DampeInside.inc b/data/scripts/graveyard/script_DampeInside.inc index 805105df..231e5b8a 100644 --- a/data/scripts/graveyard/script_DampeInside.inc +++ b/data/scripts/graveyard/script_DampeInside.inc @@ -9,11 +9,11 @@ SCRIPT_START script_DampeInside WaitUntilTextboxCloses JumpIfNot script_08009622 PlaySound SFX_ITEM_GET - _0807F088 0x003c - MessageFromTarget 0x053c + InitItemGetSequence ITEM_QST_GRAVEYARD_KEY + MessageFromTarget TEXT_ITEM_GET, 0x3c WaitPlayerGetItem WaitUntilTextboxCloses - SetInventoryValue 0x003c, 0x0001 + SetInventoryValue ITEM_QST_GRAVEYARD_KEY, 0x0001 script_08009622: EnablePlayerControl DoPostScriptAction 0x0000 diff --git a/data/scripts/graveyard/script_DampeOuside.inc b/data/scripts/graveyard/script_DampeOuside.inc index 21ea8e95..b1cede54 100644 --- a/data/scripts/graveyard/script_DampeOuside.inc +++ b/data/scripts/graveyard/script_DampeOuside.inc @@ -7,7 +7,7 @@ SCRIPT_START script_DampeOuside script_08009638: EndBlock BeginBlock - CheckGlobalFlag 0x0020 + CheckGlobalFlag HAKA_KEY_LOST JumpIfNot script_08009638 EndBlock script_08009646: @@ -28,7 +28,7 @@ script_08009660: JumpIfNot script_0800968E PlaySound SFX_111 PlaySound SFX_SECRET - SetInventoryValue 0x003c, 0x0002 + SetInventoryValue ITEM_QST_GRAVEYARD_KEY, 0x0002 Call sub_0806BEFC script_0800968E: EnablePlayerControl diff --git a/data/scripts/graveyard/script_Gina.inc b/data/scripts/graveyard/script_Gina.inc index bb427371..b463e667 100644 --- a/data/scripts/graveyard/script_Gina.inc +++ b/data/scripts/graveyard/script_Gina.inc @@ -12,7 +12,7 @@ script_0800B934: JumpIfNot script_0800B934 SetPlayerIdle FacePlayer - MessageFromTarget 0x3f19 + MessageFromTarget TEXT_TINGLE, 0x19 WaitUntilTextboxCloses SetLocalFlag 0x005f EnablePlayerControl @@ -22,7 +22,7 @@ script_0800B94E: JumpIfNot script_0800B94E SetPlayerIdle FacePlayer - MessageFromTarget 0x3f1a + MessageFromTarget TEXT_TINGLE, 0x1a WaitUntilTextboxCloses EnablePlayerControl Jump script_0800B94E diff --git a/data/scripts/graveyard/script_GraveyardHouseDoor.inc b/data/scripts/graveyard/script_GraveyardHouseDoor.inc index c310b55e..1b69dfe4 100644 --- a/data/scripts/graveyard/script_GraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_GraveyardHouseDoor.inc @@ -3,7 +3,7 @@ SCRIPT_START script_GraveyardHouseDoor BeginBlock DoPostScriptAction 0x0007 Jump script_080096FC - CheckGlobalFlag 0x0020 + CheckGlobalFlag HAKA_KEY_LOST JumpIf script_080096FC EndBlock script_080096AC: @@ -21,7 +21,7 @@ script_080096AC: PlaySound SFX_111 DoPostScriptAction 0x0007 script_080096EC: - CheckGlobalFlag 0x0020 + CheckGlobalFlag HAKA_KEY_LOST JumpIfNot script_080096EC Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc index 24b6ba6f..eec55eb1 100644 --- a/data/scripts/graveyard/script_GreatFairyArrows.inc +++ b/data/scripts/graveyard/script_GreatFairyArrows.inc @@ -14,30 +14,30 @@ script_0800B618: WaitForSyncFlagAndClear 0x00000004 CheckLocalFlag 0x009e JumpIf script_0800B7A2 - MessageNoOverlap 0x0583 + MessageNoOverlap TEXT_ITEM_GET, 0x83 WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_0800B684 Wait 0x000f - MessageNoOverlap 0x0584 + MessageNoOverlap TEXT_ITEM_GET, 0x84 CallWithArg CheckMessageEqual, 0x0000058b JumpIf script_0800B68E CallWithArg sub_08087424, 0x00000000 Wait 0x00b4 Jump script_0800B6A6 script_0800B684: - MessageNoOverlap 0x057d + MessageNoOverlap TEXT_ITEM_GET, 0x7d WaitUntilTextboxCloses Jump script_0800B6A6 script_0800B68E: WaitUntilTextboxCloses SetLocalFlag 0x009e - GivePlayerItem 0x0066 + GivePlayerItem ITEM_LARGE_QUIVER script_0800B698: WaitPlayerGetItem FaceAwayFromPlayer Wait 0x001e - MessageNoOverlap 0x057f + MessageNoOverlap TEXT_ITEM_GET, 0x7f WaitUntilTextboxCloses script_0800B6A6: SetFadeTime 0x0004 diff --git a/data/scripts/graveyard/script_KingGustav.inc b/data/scripts/graveyard/script_KingGustav.inc index fc690dc8..4d921ed4 100644 --- a/data/scripts/graveyard/script_KingGustav.inc +++ b/data/scripts/graveyard/script_KingGustav.inc @@ -18,18 +18,18 @@ script_0800D962: DoPostScriptAction 0x0007 PlaySound SFX_ELEMENT_FLOAT SetEntityVelocity 0xffff8000 - MessageNoOverlap 0x1701 + MessageNoOverlap TEXT_GUSTAF2, 0x01 WaitUntilTextboxCloses SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - MessageNoOverlap 0x1702 + MessageNoOverlap TEXT_GUSTAF2, 0x02 WaitUntilTextboxCloses SetEntityVelocity 0x00010000 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 GiveKinstone 0x006d WaitPlayerGetItem - EzloMessage 0x1703 + EzloMessage TEXT_GUSTAF2, 0x03 WaitUntilTextboxCloses Wait 0x003c SetLocalFlag 0x0032 diff --git a/data/scripts/graveyard/script_Object69CrowStealingKey.inc b/data/scripts/graveyard/script_Object69CrowStealingKey.inc index 420f5f94..0608e6ef 100644 --- a/data/scripts/graveyard/script_Object69CrowStealingKey.inc +++ b/data/scripts/graveyard/script_Object69CrowStealingKey.inc @@ -17,11 +17,11 @@ SCRIPT_START script_Object69CrowStealingKey WaitForSyncFlagAndClear 0x00000010 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000040 - SetInventoryValue 0x003c, 0x0000 - SetGlobalFlag 0x0020 + SetInventoryValue ITEM_QST_GRAVEYARD_KEY, 0x0000 + SetGlobalFlag HAKA_KEY_LOST _0807E8E4_3 Wait 0x001e - EzloMessage 0x2809 + EzloMessage TEXT_DAMPE, 0x09 WaitUntilTextboxCloses Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/graveyard/script_Object69GetKeyBack.inc b/data/scripts/graveyard/script_Object69GetKeyBack.inc index b6e1073b..222c1abf 100644 --- a/data/scripts/graveyard/script_Object69GetKeyBack.inc +++ b/data/scripts/graveyard/script_Object69GetKeyBack.inc @@ -3,42 +3,18 @@ SCRIPT_START script_Object69GetKeyBack BeginBlock EndBlock script_080098D8: - CheckGlobalFlag 0x0020 + CheckGlobalFlag HAKA_KEY_LOST JumpIfNot script_080098D8 script_080098E0: - CheckInventory1 0x003c + CheckInventory1 ITEM_QST_GRAVEYARD_KEY JumpIfNot script_080098E0 -.ifdef JP - CheckLocalFlag 0x5b -.else -.ifdef EU - CheckLocalFlag 0x5b -.else -.ifdef DEMO_JP - CheckLocalFlag 0x5b @ TODO deduplicate -.else - CheckLocalFlag 0x5d -.endif -.endif -.endif + CheckLocalFlag HAKA_KEY_GET JumpIf script_08009910 -.ifdef JP - SetLocalFlag 0x005b -.else -.ifdef EU - SetLocalFlag 0x005b -.else -.ifdef DEMO_JP - SetLocalFlag 0x005b @ TODO deduplicate -.else - SetLocalFlag 0x005d -.endif -.endif -.endif + SetLocalFlag HAKA_KEY_GET SetPlayerIdle Call WaitForPlayerNormal Call sub_0807DF28 - EzloMessage 0x280a + EzloMessage TEXT_DAMPE, 0x0a WaitUntilTextboxCloses Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc b/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc index fa317824..21539ca0 100644 --- a/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc +++ b/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc @@ -7,21 +7,9 @@ SCRIPT_START script_Object69SanctuaryEntrance Call sub_0807DF28 StartPlayerScript script_PlayerAtSanctuaryEntrance WaitForSyncFlagAndClear 0x00000001 - EzloMessage 0x132d + EzloMessage TEXT_VAATI, 0x2d WaitUntilTextboxCloses -.ifdef JP - SetLocalFlag 0x0015 -.else -.ifdef EU - SetLocalFlag 0x0015 -.else -.ifdef DEMO_JP - SetLocalFlag 0x0015 @ TODO deduplicate -.else - SetLocalFlag 0x0014 -.endif -.endif -.endif + SetLocalFlag NAKANIWA_00_EZERO Call sub_0807DF50 EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/hyruleCastle/script_SmithAtCastle.inc b/data/scripts/hyruleCastle/script_SmithAtCastle.inc index 2e354751..8ad1fc7d 100644 --- a/data/scripts/hyruleCastle/script_SmithAtCastle.inc +++ b/data/scripts/hyruleCastle/script_SmithAtCastle.inc @@ -12,7 +12,7 @@ script_080092BA: JumpIfNot script_080092BA SetPlayerIdle FacePlayer - MessageNoOverlap 0x105e + MessageNoOverlap TEXT_PROLOGUE, 0x5e WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/hyruleCastle/script_StoneZelda.inc b/data/scripts/hyruleCastle/script_StoneZelda.inc index d17e0023..b26c8e2b 100644 --- a/data/scripts/hyruleCastle/script_StoneZelda.inc +++ b/data/scripts/hyruleCastle/script_StoneZelda.inc @@ -10,7 +10,7 @@ script_08009300: JumpIfNot script_08009300 SetPlayerIdle FacePlayer - MessageNoOverlap 0x1071 + MessageNoOverlap TEXT_PROLOGUE, 0x71 WaitUntilTextboxCloses EnablePlayerControl Jump script_08009300 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc index 53bfb506..65737141 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc @@ -12,7 +12,7 @@ script_08011A44: SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000000 - MessageFromTarget 0x1320 + MessageFromTarget TEXT_VAATI, 0x20 WaitUntilTextboxCloses EnablePlayerControl Jump script_08011A44 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc index af4c3020..12f0c775 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc @@ -14,7 +14,7 @@ script_08011A7C: CallWithArg sub_0807F3D8, 0x00000000 CallWithArg sub_080644B4, 0x00000006 JumpIf script_08011AFA - MessageFromTarget 0x1320 + MessageFromTarget TEXT_VAATI, 0x20 WaitUntilTextboxCloses EnablePlayerControl Jump script_08011A7C @@ -31,7 +31,7 @@ script_08011AC4: SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000000 - MessageFromTarget 0x1322 + MessageFromTarget TEXT_VAATI, 0x22 WaitUntilTextboxCloses EnablePlayerControl Jump script_08011AC4 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc index 7f7dc3a1..e23e8321 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc @@ -13,12 +13,12 @@ script_0801197C: SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000000 - CheckGlobalFlag 0x0015 + CheckGlobalFlag TABIDACHI JumpIf script_080119A0 - MessageFromTarget 0x103d + MessageFromTarget TEXT_PROLOGUE, 0x3d Jump script_080119A4 script_080119A0: - MessageFromTarget 0x103f + MessageFromTarget TEXT_PROLOGUE, 0x3f script_080119A4: WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc index 66a5123a..6dc11ee1 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc @@ -6,21 +6,9 @@ SCRIPT_START script_GuardGarden7 Call WaitForPlayerNormal Call sub_0807DF28 script_08011AFA: - MessageFromTargetPos 0x1321, 0x0007 + MessageFromTargetPos TEXT_VAATI, 0x21, 0x0007 WaitUntilTextboxCloses -.ifdef JP - SetLocalFlag 0x0011 -.else -.ifdef EU - SetLocalFlag 0x0011 -.else -.ifdef DEMO_JP - SetLocalFlag 0x0011 @ TODO deduplicate -.else - SetLocalFlag 0x0010 -.endif -.endif -.endif + SetLocalFlag MAENIWA_00_WARP CallWithArg sub_0806DA1C, 0x00000003 EnablePlayerControl Call sub_0807DF50 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc index 67ecb871..6ceb9aff 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GuardGarden8 SetPlayerIdle Call sub_0807DF28 - MessageFromTargetPos 0x1320, 0x000c + MessageFromTargetPos TEXT_VAATI, 0x20, 0x000c WaitUntilTextboxCloses EnablePlayerControl Call sub_0807DF50 diff --git a/data/scripts/hyruleTown/script_Anju.inc b/data/scripts/hyruleTown/script_Anju.inc index b6cb6bb4..1fb7f15b 100644 --- a/data/scripts/hyruleTown/script_Anju.inc +++ b/data/scripts/hyruleTown/script_Anju.inc @@ -12,7 +12,7 @@ script_0801015A: FacePlayer CheckRoomFlag 0x0001 JumpIf script_0801019E - MessageFromTargetPos 0x3001, 0x0000 + MessageFromTargetPos TEXT_ANJU, 0x01, 0x0000 WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_080101A6 @@ -38,7 +38,7 @@ script_080101AC: Call sub_080A1270 SetPlayerIdle Call sub_0807DF28 - MessageFromTargetPos 0x3004, 0x0007 + MessageFromTargetPos TEXT_ANJU, 0x04, 0x0007 WaitUntilTextboxCloses StopBgm SetFadeTime 0x0004 diff --git a/data/scripts/hyruleTown/script_AnjuInside.inc b/data/scripts/hyruleTown/script_AnjuInside.inc index 6253c544..f1774b30 100644 --- a/data/scripts/hyruleTown/script_AnjuInside.inc +++ b/data/scripts/hyruleTown/script_AnjuInside.inc @@ -11,7 +11,7 @@ script_08010132: JumpIfNot script_08010132 SetPlayerIdle FacePlayer - MessageFromTarget 0x4f22 + MessageFromTarget TEXT_CAFE, 0x22 WaitUntilTextboxCloses EnablePlayerControl Jump script_08010132 diff --git a/data/scripts/hyruleTown/script_Beedle.inc b/data/scripts/hyruleTown/script_Beedle.inc index e265823a..54013fad 100644 --- a/data/scripts/hyruleTown/script_Beedle.inc +++ b/data/scripts/hyruleTown/script_Beedle.inc @@ -16,24 +16,24 @@ script_08010502: CheckRoomFlag 0x000e JumpIf script_0801052E SetRoomFlag 0x000e - MessageNoOverlap 0x2b10 + MessageNoOverlap TEXT_PICOLYTE, 0x10 WaitUntilTextboxCloses script_0801052E: Call sub_080634E4 JumpTable script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570 script_08010544: - MessageNoOverlap 0x2b0d + MessageNoOverlap TEXT_PICOLYTE, 0x0d Jump script_080105E0 script_0801054C: - CheckGlobalFlag 0x003d + CheckGlobalFlag DRUG_3 JumpIfNot script_080105DC Jump script_08010570 script_08010558: - CheckGlobalFlag 0x003c + CheckGlobalFlag DRUG_2 JumpIfNot script_080105DC Jump script_08010570 script_08010564: - CheckGlobalFlag 0x003b + CheckGlobalFlag DRUG_1 JumpIfNot script_080105DC Jump script_08010570 script_08010570: @@ -44,28 +44,28 @@ script_08010570: JumpIfNot script_080105E0 CallWithArg sub_0807F7C4, 0x00000000 JumpIfNot script_080105C4 - CheckBottleContaining 0x0020 + CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIfNot script_080105CC Call sub_08063504 JumpIf script_080105D4 - MessageNoOverlap 0x2b07 + MessageNoOverlap TEXT_PICOLYTE, 0x07 WaitUntilTextboxCloses CallWithArg sub_0807F800, 0x00000000 WaitPlayerGetItem WaitUntilTextboxCloses - MessageNoOverlap 0x2b0c + MessageNoOverlap TEXT_PICOLYTE, 0x0c Jump script_080105E0 script_080105C4: - MessageNoOverlap 0x2b09 + MessageNoOverlap TEXT_PICOLYTE, 0x09 Jump script_080105E0 script_080105CC: - MessageNoOverlap 0x2b0a + MessageNoOverlap TEXT_PICOLYTE, 0x0a Jump script_080105E0 script_080105D4: - MessageNoOverlap 0x2b0b + MessageNoOverlap TEXT_PICOLYTE, 0x0b Jump script_080105E0 script_080105DC: - MessageNoOverlap 0x2b0e + MessageNoOverlap TEXT_PICOLYTE, 0x0e script_080105E0: WaitUntilTextboxCloses Call sub_0807DF50 @@ -83,7 +83,7 @@ script_08010602: JumpIfNot script_08010602 SetPlayerIdle FacePlayer - MessageFromTarget 0x0a01 + MessageFromTarget TEXT_EMPTY, 0x01 WaitUntilTextboxCloses EnablePlayerControl SetAnimationState 0x0004 diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc index 3248dd3a..d91f44f0 100644 --- a/data/scripts/hyruleTown/script_Carlov.inc +++ b/data/scripts/hyruleTown/script_Carlov.inc @@ -13,22 +13,22 @@ script_08014462: SetAnimation 0x0008 Wait 0x0020 SetAnimation 0x0002 - MessageFromTarget 0x4202 - MessageFromTarget 0x4203 + MessageFromTarget TEXT_BURLOV, 0x02 + MessageFromTarget TEXT_BURLOV, 0x03 WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_080144F0 DoPostScriptAction 0x0001 Wait 0x008c DoPostScriptAction 0x0000 - HasRupees 0x000a + HasRupees 10 JumpIf script_080144A2 - MessageFromTarget 0x4204 + MessageFromTarget TEXT_BURLOV, 0x04 Jump script_080144FC script_080144A2: Call sub_0806E250 JumpIfNot script_080144B8 - MessageFromTarget 0x420b + MessageFromTarget TEXT_BURLOV, 0x0b _0807EB38 JumpTable script_080144B8, script_080144C0 script_080144B8: @@ -44,8 +44,8 @@ script_080144C0: .endif .endif script_080144C8: - ModRupees 0xfff6 - MessageFromTarget 0x420c + ModRupees -10 + MessageFromTarget TEXT_BURLOV, 0x0c PlaySound SFX_BUTTON_PRESS Wait 0x0018 SetRoomFlag 0x0000 diff --git a/data/scripts/hyruleTown/script_Carlov2.inc b/data/scripts/hyruleTown/script_Carlov2.inc index dcb9aa02..ac3178a5 100644 --- a/data/scripts/hyruleTown/script_Carlov2.inc +++ b/data/scripts/hyruleTown/script_Carlov2.inc @@ -21,7 +21,7 @@ script_0801463A: CheckRoomFlag 0x0009 JumpIfNot script_0801463A SetPlayerIdle - EzloMessage 0x431f + EzloMessage TEXT_CARLOV, 0x1f WaitUntilTextboxCloses script_0801469A: StartPlayerScript script_PlayerAtCarlov @@ -35,7 +35,7 @@ script_080146E2: SetAnimation 0x0008 Wait 0x0020 SetAnimation 0x0002 - CheckGlobalFlag 0x0059 + CheckGlobalFlag FIGURE_ALLCOMP JumpIf script_0801472E_2 CheckRoomFlag 0x0009 JumpIf script_080146F4 @@ -51,7 +51,7 @@ script_080146E2: SetRoomFlag 0x000a Jump script_0801473C script_0801472E_2: - MessageFromTargetPos 0x432f, 0x000c + MessageFromTargetPos TEXT_CARLOV, 0x2f, 0x000c Jump script_080147CE .else CheckRoomFlag 0x0004 @@ -62,7 +62,7 @@ script_0801472E_2: JumpIf script_080146A0 SetPlayerIdle FaceAwayFromPlayer - MessageFromTargetPos 0x432b, 0x000c + MessageFromTargetPos TEXT_CARLOV, 0x2b, 0x000c Jump script_080147CE script_08014672: .ifdef DEMO_JP @@ -76,7 +76,7 @@ script_08014672: .endif JumpIfNot script_0801463A SetPlayerIdle - EzloMessage 0x431f + EzloMessage TEXT_CARLOV, 0x1f WaitUntilTextboxCloses StartPlayerScript script_PlayerAtCarlov Wait 0x0010 @@ -91,9 +91,9 @@ script_080146A0: FaceAwayFromPlayer Wait 0x0010 SetAnimation 0x0002 - CheckGlobalFlag 0x0059 + CheckGlobalFlag FIGURE_ALLCOMP JumpIfNot script_080146C6 - MessageFromTargetPos 0x432f, 0x000c + MessageFromTargetPos TEXT_CARLOV, 0x2f, 0x000c Jump script_080147CE script_080146C6: CheckRoomFlag 0x0004 @@ -110,7 +110,7 @@ script_080146C6: .endif script_080146F4: - MessageFromTargetPos 0x431e, 0x000c + MessageFromTargetPos TEXT_CARLOV, 0x1e, 0x000c Jump script_080147CE script_080146FE: .ifdef EU @@ -123,11 +123,11 @@ script_080146FE: script_0801474A: SetRoomFlag 0x000a .endif - MessageFromTargetPos 0x4305, 0x000c + MessageFromTargetPos TEXT_CARLOV, 0x05, 0x000c WaitUntilTextboxCloses HasShells 0x0001 JumpIfNot script_080147C4 - MessageFromTargetPos 0x4306, 0x000c + MessageFromTargetPos TEXT_CARLOV, 0x06, 0x000c Jump script_0801473C script_08014720: .ifdef EU @@ -163,7 +163,7 @@ script_08014754: .else SetRoomFlag 0x0004 .endif - MessageFromTargetPos 0x431e, 0x000c + MessageFromTargetPos TEXT_CARLOV, 0x1e, 0x000c Jump script_080147CE script_08014770: .ifdef EU @@ -201,7 +201,7 @@ script_080147C4: .else SetRoomFlag 0x0009 .endif - MessageFromTargetPos 0x4307, 0x000c + MessageFromTargetPos TEXT_CARLOV, 0x07, 0x000c script_080147CE: WaitUntilTextboxCloses .ifdef EU diff --git a/data/scripts/hyruleTown/script_Din.inc b/data/scripts/hyruleTown/script_Din.inc index 4b0c3e8c..142de31e 100644 --- a/data/scripts/hyruleTown/script_Din.inc +++ b/data/scripts/hyruleTown/script_Din.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Din SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - CheckGlobalFlag 0x0047 + CheckGlobalFlag GOMAN_RENTED_HOUSE JumpIf script_08011CC2 EndBlock script_08011C9A: @@ -17,7 +17,7 @@ script_08011C9A: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - MessageNoOverlap 0x4515 + MessageNoOverlap TEXT_HAPPY_HEARTH, 0x15 WaitUntilTextboxCloses EnablePlayerControl SetAnimationState 0x0004 @@ -26,9 +26,9 @@ script_08011C9A: script_08011CC2: EndBlock BeginBlock - CheckGlobalFlag 0x002c + CheckGlobalFlag RENTED_HOUSE_NAYRU JumpIf script_08011C9A - CheckGlobalFlag 0x002d + CheckGlobalFlag RENTED_HOUSE_FARORE JumpIf script_08011C9A CheckEntityInteractType JumpIfNot script_08011CC2 @@ -36,7 +36,7 @@ script_08011CC2: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - MessageNoOverlap 0x3105 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x5 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011D0E @@ -51,9 +51,9 @@ script_08011D00: FacePlayer DoPostScriptAction 0x0000 script_08011D0E: - MessageNoOverlap 0x3108 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x8 WaitUntilTextboxCloses - SetGlobalFlag 0x002b + SetGlobalFlag RENTED_HOUSE_DIN EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 diff --git a/data/scripts/hyruleTown/script_Din2.inc b/data/scripts/hyruleTown/script_Din2.inc index 95f9d5d8..720aac69 100644 --- a/data/scripts/hyruleTown/script_Din2.inc +++ b/data/scripts/hyruleTown/script_Din2.inc @@ -9,9 +9,9 @@ SCRIPT_START script_Din2 script_08011E96: EndBlock BeginBlock - CheckGlobalFlag 0x002f + CheckGlobalFlag NEW_HOUSE_NAYRU JumpIf script_08011C9A - CheckGlobalFlag 0x0030 + CheckGlobalFlag NEW_HOUSE_FARORE JumpIf script_08011C9A CheckEntityInteractType JumpIfNot script_08011E96 @@ -19,13 +19,13 @@ script_08011E96: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - CheckGlobalFlag 0x0048 + CheckGlobalFlag GOMAN_NEW_HOUSE JumpIf script_08011ECC - MessageNoOverlap 0x4524 + MessageNoOverlap TEXT_HAPPY_HEARTH, 0x24 WaitUntilTextboxCloses Jump script_08011ED8 script_08011ECC: - MessageNoOverlap 0x3111 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x11 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011EF4 @@ -41,9 +41,9 @@ script_08011EE6: FacePlayer DoPostScriptAction 0x0000 script_08011EF4: - MessageNoOverlap 0x3114 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x14 WaitUntilTextboxCloses - SetGlobalFlag 0x002e + SetGlobalFlag NEW_HOUSE_DIN EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 diff --git a/data/scripts/hyruleTown/script_DinAlone.inc b/data/scripts/hyruleTown/script_DinAlone.inc index 60ae00b5..e98d4e73 100644 --- a/data/scripts/hyruleTown/script_DinAlone.inc +++ b/data/scripts/hyruleTown/script_DinAlone.inc @@ -12,7 +12,7 @@ script_080121DE: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - MessageNoOverlap 0x4527 + MessageNoOverlap TEXT_HAPPY_HEARTH, 0x27 WaitUntilTextboxCloses EnablePlayerControl SetAnimationState 0x0004 diff --git a/data/scripts/hyruleTown/script_DinMovedIn.inc b/data/scripts/hyruleTown/script_DinMovedIn.inc index 16ba4b27..79d38921 100644 --- a/data/scripts/hyruleTown/script_DinMovedIn.inc +++ b/data/scripts/hyruleTown/script_DinMovedIn.inc @@ -12,28 +12,28 @@ script_0801203A: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - CheckLocalFlag 0x0094 + CheckLocalFlag MHOUSE_DIN_TALK JumpIf script_0801205E - MessageNoOverlap 0x3122 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x22 WaitUntilTextboxCloses - SetLocalFlag 0x0094 + SetLocalFlag MHOUSE_DIN_TALK Jump script_0801209E script_0801205E: - CheckBottleContaining 0x0031 + CheckBottleContaining BOTTLE_CHARM_DIN JumpIfNot script_08012070 - MessageNoOverlap 0x3123 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x23 WaitUntilTextboxCloses Jump script_0801209E script_08012070: - MessageNoOverlap 0x3124 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x24 WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_0801209E - CheckBottleContaining 0x0020 + CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIfNot script_0801209A - MessageNoOverlap 0x3125 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x25 WaitUntilTextboxCloses - GivePlayerItem 0x0031 + GivePlayerItem BOTTLE_CHARM_DIN WaitPlayerGetItem .ifdef USA Call sub_0807FC24 @@ -48,7 +48,7 @@ script_08012070: .endif Jump script_0801209E script_0801209A: - MessageNoOverlap 0x3127 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x27 script_0801209E: WaitUntilTextboxCloses EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_DrLeftDoor.inc b/data/scripts/hyruleTown/script_DrLeftDoor.inc index 73a86b68..fd854ff9 100644 --- a/data/scripts/hyruleTown/script_DrLeftDoor.inc +++ b/data/scripts/hyruleTown/script_DrLeftDoor.inc @@ -2,16 +2,16 @@ SCRIPT_START script_DrLeftDoor BeginBlock DoPostScriptAction 0x0007 - CheckGlobalFlag 0x001f + CheckGlobalFlag LEFT_DOOR_OPEN JumpIf script_0800EF92 EndBlock script_0800EF50: Call sub_080869A4 JumpIfNot script_0800EF50 SetPlayerIdle - CheckLocalFlagByBank 0x0200, 0x006d + CheckLocalFlagByBank FLAG_BANK_2, 0x006d JumpIf script_0800EF82 - MessageFromTarget 0x4d01 + MessageFromTarget TEXT_DR_LEFT, 0x01 WaitUntilTextboxCloses StartPlayerScript script_PlayerAtDrLeftDoor WaitForSyncFlagAndClear 0x00000001 @@ -19,8 +19,8 @@ script_0800EF50: EnablePlayerControl Jump script_0800EF50 script_0800EF82: - SetGlobalFlag 0x001f - MessageFromTarget 0x4d02 + SetGlobalFlag LEFT_DOOR_OPEN + MessageFromTarget TEXT_DR_LEFT, 0x02 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_Emma.inc b/data/scripts/hyruleTown/script_Emma.inc index 5f058f79..428e4ed2 100644 --- a/data/scripts/hyruleTown/script_Emma.inc +++ b/data/scripts/hyruleTown/script_Emma.inc @@ -11,7 +11,7 @@ script_0800E832: SetPlayerIdle SetAnimationState 0x0004 BeginBlock - MessageFromTarget 0x4501 + MessageFromTarget TEXT_HAPPY_HEARTH, 0x01 CallWithArg sub_0807F854, 0x00010032 CallWithArg sub_0807F854, 0x000200c8 CallWithArg sub_0807F854, 0x00030190 @@ -21,15 +21,15 @@ script_0800E832: JumpTable script_0800E910, script_RentSmallRoom, script_RentRegularRoom, script_0800E872 script_0800E872: @ Rent large room BeginBlock - MessageFromTarget 0x4505 + MessageFromTarget TEXT_HAPPY_HEARTH, 0x05 CallWithArg sub_0807F854, 0x00010190 EndBlock WaitUntilTextboxCloses - HasRupees 0x0190 + HasRupees 400 JumpIfNot script_EmmaNotEnoughRupees - ModRupees 0xfe70 + ModRupees -400 SetLocalFlag 0x0091 - MessageFromTarget 0x4508 + MessageFromTarget TEXT_HAPPY_HEARTH, 0x08 WaitUntilTextboxCloses Call sub_0806C578 SCRIPT_END diff --git a/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc b/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc index 45bece10..32216b19 100644 --- a/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc +++ b/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc @@ -1,9 +1,9 @@ @ Hyrule Town Inn Emma not enough rupees SCRIPT_START script_EmmaNotEnoughRupees - MessageFromTarget 0x4507 + MessageFromTarget TEXT_HAPPY_HEARTH, 0x07 Jump script_0800E914 script_0800E910: @ Rent no room - MessageFromTarget 0x4509 + MessageFromTarget TEXT_HAPPY_HEARTH, 0x09 script_0800E914: WaitUntilTextboxCloses EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_Farore.inc b/data/scripts/hyruleTown/script_Farore.inc index 013522a1..9bba60bb 100644 --- a/data/scripts/hyruleTown/script_Farore.inc +++ b/data/scripts/hyruleTown/script_Farore.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Farore SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - CheckGlobalFlag 0x0047 + CheckGlobalFlag GOMAN_RENTED_HOUSE JumpIf script_08011E1A EndBlock script_08011DF2: @@ -17,7 +17,7 @@ script_08011DF2: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - MessageNoOverlap 0x4514 + MessageNoOverlap TEXT_HAPPY_HEARTH, 0x14 WaitUntilTextboxCloses EnablePlayerControl SetAnimationState 0x0004 @@ -26,9 +26,9 @@ script_08011DF2: script_08011E1A: EndBlock BeginBlock - CheckGlobalFlag 0x002b + CheckGlobalFlag RENTED_HOUSE_DIN JumpIf script_08011DF2 - CheckGlobalFlag 0x002c + CheckGlobalFlag RENTED_HOUSE_NAYRU JumpIf script_08011DF2 CheckEntityInteractType JumpIfNot script_08011E1A @@ -36,7 +36,7 @@ script_08011E1A: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - MessageNoOverlap 0x3104 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x04 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011E66 @@ -51,9 +51,9 @@ script_08011E58: FacePlayer DoPostScriptAction 0x0000 script_08011E66: - MessageNoOverlap 0x3107 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x07 WaitUntilTextboxCloses - SetGlobalFlag 0x002d + SetGlobalFlag RENTED_HOUSE_FARORE EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 diff --git a/data/scripts/hyruleTown/script_Farore2.inc b/data/scripts/hyruleTown/script_Farore2.inc index 568120b7..2f42cdf9 100644 --- a/data/scripts/hyruleTown/script_Farore2.inc +++ b/data/scripts/hyruleTown/script_Farore2.inc @@ -9,9 +9,9 @@ SCRIPT_START script_Farore2 script_08011FAE: EndBlock BeginBlock - CheckGlobalFlag 0x002e + CheckGlobalFlag NEW_HOUSE_DIN JumpIf script_08011DF2 - CheckGlobalFlag 0x002f + CheckGlobalFlag NEW_HOUSE_NAYRU JumpIf script_08011DF2 CheckEntityInteractType JumpIfNot script_08011FAE @@ -19,13 +19,13 @@ script_08011FAE: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - CheckGlobalFlag 0x0048 + CheckGlobalFlag GOMAN_NEW_HOUSE JumpIf script_08011FE4 - MessageNoOverlap 0x4523 + MessageNoOverlap TEXT_HAPPY_HEARTH, 0x23 WaitUntilTextboxCloses Jump script_08011FF0 script_08011FE4: - MessageNoOverlap 0x3110 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x10 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_0801200C @@ -41,9 +41,9 @@ script_08011FFE: FacePlayer DoPostScriptAction 0x0000 script_0801200C: - MessageNoOverlap 0x3113 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x13 WaitUntilTextboxCloses - SetGlobalFlag 0x0030 + SetGlobalFlag NEW_HOUSE_FARORE EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 diff --git a/data/scripts/hyruleTown/script_FaroreAlone.inc b/data/scripts/hyruleTown/script_FaroreAlone.inc index 4bfaf3df..e47fa2cf 100644 --- a/data/scripts/hyruleTown/script_FaroreAlone.inc +++ b/data/scripts/hyruleTown/script_FaroreAlone.inc @@ -12,7 +12,7 @@ script_0801224E: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - MessageNoOverlap 0x4526 + MessageNoOverlap TEXT_HAPPY_HEARTH, 0x26 WaitUntilTextboxCloses EnablePlayerControl SetAnimationState 0x0004 diff --git a/data/scripts/hyruleTown/script_FaroreMovedIn.inc b/data/scripts/hyruleTown/script_FaroreMovedIn.inc index 370126a4..4732a156 100644 --- a/data/scripts/hyruleTown/script_FaroreMovedIn.inc +++ b/data/scripts/hyruleTown/script_FaroreMovedIn.inc @@ -12,28 +12,28 @@ script_08012152: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - CheckLocalFlag 0x0096 + CheckLocalFlag MHOUSE_FARORE_TALK JumpIf script_08012176 - MessageNoOverlap 0x311c + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1c WaitUntilTextboxCloses - SetLocalFlag 0x0096 + SetLocalFlag MHOUSE_FARORE_TALK Jump script_080121B6 script_08012176: - CheckBottleContaining 0x0030 + CheckBottleContaining BOTTLE_CHARM_FARORE JumpIfNot script_08012188 - MessageNoOverlap 0x311d + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1d WaitUntilTextboxCloses Jump script_080121B6 script_08012188: - MessageNoOverlap 0x311e + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1e WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_080121B6 - CheckBottleContaining 0x0020 + CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIfNot script_080121B2 - MessageNoOverlap 0x311f + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1f WaitUntilTextboxCloses - GivePlayerItem 0x0030 + GivePlayerItem BOTTLE_CHARM_FARORE WaitPlayerGetItem .ifdef USA Call sub_0807FC24 @@ -48,7 +48,7 @@ script_08012188: .endif Jump script_080121B6 script_080121B2: - MessageNoOverlap 0x3121 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x21 script_080121B6: WaitUntilTextboxCloses EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_FirstHouseDoor.inc b/data/scripts/hyruleTown/script_FirstHouseDoor.inc index 63b89955..5d96b82a 100644 --- a/data/scripts/hyruleTown/script_FirstHouseDoor.inc +++ b/data/scripts/hyruleTown/script_FirstHouseDoor.inc @@ -2,7 +2,7 @@ SCRIPT_START script_FirstHouseDoor BeginBlock DoPostScriptAction 0x0007 - CheckKinstoneFused 0x001b + CheckKinstoneFused KINSTONE_1B JumpIf script_0800EF92 EndBlock script_0801091C: @@ -13,7 +13,7 @@ script_0801091C: Call sub_0807DF28 CheckRoomFlag 0x0001 JumpIf script_08010942 - EzloMessage 0x0b62 + EzloMessage TEXT_EZLO, 0x62 WaitUntilTextboxCloses script_08010942: StartPlayerScript script_PlayerAtInnDoor diff --git a/data/scripts/hyruleTown/script_GoronMerchant.inc b/data/scripts/hyruleTown/script_GoronMerchant.inc index 8d32cbd0..f7586f60 100644 --- a/data/scripts/hyruleTown/script_GoronMerchant.inc +++ b/data/scripts/hyruleTown/script_GoronMerchant.inc @@ -28,21 +28,21 @@ script_08010804: SetPlayerIdle Call sub_0807DF28 FacePlayer - CheckGlobalFlag 0x0042 + CheckGlobalFlag GORON_KAKERA_L JumpIfNot script_08010858 - CheckGlobalFlag 0x0043 + CheckGlobalFlag GORON_KAKERA_M JumpIfNot script_08010858 - CheckGlobalFlag 0x0044 + CheckGlobalFlag GORON_KAKERA_R JumpIfNot script_08010858 - CheckGlobalFlag 0x0041 + CheckGlobalFlag GORON_KAKERA_LV5 JumpIfNot script_08010850 - MessageNoOverlap 0x3f39 + MessageNoOverlap TEXT_TINGLE, 0x39 Jump script_080108BA script_08010850: - MessageNoOverlap 0x2c1b + MessageNoOverlap TEXT_STOCKWELL, 0x1b Jump script_080108BA script_08010858: - MessageNoOverlap 0x2c1a + MessageNoOverlap TEXT_STOCKWELL, 0x1a Jump script_080108BA script_08010860: EndBlock @@ -58,13 +58,13 @@ script_08010860: WaitPlayerGetItem WaitUntilTextboxCloses FaceAwayFromPlayer - CheckGlobalFlag 0x0042 + CheckGlobalFlag GORON_KAKERA_L JumpIfNot script_080108AA - CheckGlobalFlag 0x0043 + CheckGlobalFlag GORON_KAKERA_M JumpIfNot script_080108AA - CheckGlobalFlag 0x0044 + CheckGlobalFlag GORON_KAKERA_R JumpIfNot script_080108AA - MessageNoOverlap 0x2c21 + MessageNoOverlap TEXT_STOCKWELL, 0x21 Jump script_080108B2 script_080108AA: .ifdef USA @@ -74,7 +74,7 @@ script_080108AA: SetLocalFlag 0x00fa .endif .endif - MessageNoOverlap 0x2c20 + MessageNoOverlap TEXT_STOCKWELL, 0x20 script_080108B2: WaitUntilTextboxCloses Call sub_0807F83C diff --git a/data/scripts/hyruleTown/script_GuardEast.inc b/data/scripts/hyruleTown/script_GuardEast.inc index cf3f5d2e..ef52a863 100644 --- a/data/scripts/hyruleTown/script_GuardEast.inc +++ b/data/scripts/hyruleTown/script_GuardEast.inc @@ -1,7 +1,7 @@ @ Hyrule Town Guard east SCRIPT_START script_GuardEast BeginBlock - CheckInventory1 0x0012 + CheckInventory1 ITEM_PACCI_CANE JumpIf script_0800FF6A SetAnimationState 0x0006 _0807E9D4 diff --git a/data/scripts/hyruleTown/script_GuardNorth.inc b/data/scripts/hyruleTown/script_GuardNorth.inc index 603439eb..7215d9f9 100644 --- a/data/scripts/hyruleTown/script_GuardNorth.inc +++ b/data/scripts/hyruleTown/script_GuardNorth.inc @@ -1,7 +1,7 @@ @ Hyrule Town Guard north SCRIPT_START script_GuardNorth BeginBlock - CheckInventory1 0x0012 + CheckInventory1 ITEM_PACCI_CANE JumpIf script_0800FF0E SetAnimationState 0x0006 _0807E9D4 diff --git a/data/scripts/hyruleTown/script_GuardWest.inc b/data/scripts/hyruleTown/script_GuardWest.inc index a8538ddd..ced896a7 100644 --- a/data/scripts/hyruleTown/script_GuardWest.inc +++ b/data/scripts/hyruleTown/script_GuardWest.inc @@ -5,51 +5,19 @@ SCRIPT_START script_GuardWest _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 Call sub_080644A4 -.ifdef JP - ClearLocalFlag 0x00c4 -.else -.ifdef DEMO_JP - ClearLocalFlag 0x00c4 @ TODO deduplicate -.else .ifndef EU - ClearLocalFlag 0x00c7 -.endif -.endif + ClearLocalFlag MACHI_02_HEISHI_TALK .endif EndBlock script_0800FF92: EndBlock BeginBlock DoPostScriptAction 0x000a -.ifdef JP - CheckLocalFlag 0x00cb -.else -.ifdef EU - CheckLocalFlag 0x00cb -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00cb @ TODO deduplicate -.else - CheckLocalFlag 0x00ce -.endif -.endif -.endif + CheckLocalFlag MACHI_02_HEISHI JumpIf script_0800FFCC DoPostScriptAction 0x000b Call sub_08064198 -.ifdef JP - CheckLocalFlag 0x00c4 -.else -.ifdef EU - CheckLocalFlag 0x00c4 -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00c4 @ TODO deduplicate -.else - CheckLocalFlag 0x00c7 -.endif -.endif -.endif + CheckLocalFlag MACHI_02_HEISHI_TALK JumpIfNot script_0800FFCC Call sub_08064488 CheckPlayerInRegion2 0x4040 @@ -60,47 +28,23 @@ script_0800FFCC: CheckEntityInteractType JumpIfNot script_0800FF92 EndBlock -.ifdef JP - SetLocalFlag 0x00c4 -.else -.ifdef EU - SetLocalFlag 0x00c4 -.else -.ifdef DEMO_JP - SetLocalFlag 0x00c4 @ TODO deduplicate -.else - SetLocalFlag 0x00c7 -.endif -.endif -.endif + SetLocalFlag MACHI_02_HEISHI_TALK SetPlayerIdle FacePlayer CallWithArg sub_0807F3D8, 0x00000008 - CheckInventory1 0x0048 + CheckInventory1 ITEM_SKILL_SPIN_ATTACK JumpIf script_0800FFF8 - MessageNoOverlap 0x3401 + MessageNoOverlap TEXT_TOWN, 0x01 WaitUntilTextboxCloses Jump script_08010060 script_0800FFF8: -.ifdef JP - CheckLocalFlag 0x00cb -.else -.ifdef EU - CheckLocalFlag 0x00cb -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00cb @ TODO deduplicate -.else - CheckLocalFlag 0x00ce -.endif -.endif -.endif + CheckLocalFlag MACHI_02_HEISHI JumpIfNot script_0801000A - MessageNoOverlap 0x340b + MessageNoOverlap TEXT_TOWN, 0x0b WaitUntilTextboxCloses Jump script_08010060 script_0801000A: - MessageNoOverlap 0x3402 + MessageNoOverlap TEXT_TOWN, 0x02 WaitUntilTextboxCloses Jump script_08010060 script_08010014: @@ -111,7 +55,7 @@ script_08010014: FacePlayer CallWithArg sub_0807F3D8, 0x00000008 PlaySound SFX_TASK_COMPLETE - MessageNoOverlap 0x340a + MessageNoOverlap TEXT_TOWN, 0x0a WaitUntilTextboxCloses SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x0000000c @@ -119,19 +63,7 @@ script_08010014: _0807EDD4 0x0018, 0x0108 SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000008 -.ifdef JP - SetLocalFlag 0x00cb -.else -.ifdef EU - SetLocalFlag 0x00cb -.else -.ifdef DEMO_JP - SetLocalFlag 0x00cb @ TODO deduplicate -.else - SetLocalFlag 0x00ce -.endif -.endif -.endif + SetLocalFlag MACHI_02_HEISHI script_08010060: Call sub_080644A4 CallWithArg sub_0807F5B0, 0x0000000a @@ -150,7 +82,7 @@ script_08010090: SetPlayerIdle FacePlayer CallWithArg sub_080672B0, 0x00000004 - MessageFromTarget 0x0a01 + MessageFromTarget TEXT_EMPTY, 0x01 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_InnDoor.inc b/data/scripts/hyruleTown/script_InnDoor.inc index ea001419..7b71f660 100644 --- a/data/scripts/hyruleTown/script_InnDoor.inc +++ b/data/scripts/hyruleTown/script_InnDoor.inc @@ -9,7 +9,7 @@ SCRIPT_START script_InnDoor WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_08010900 - EzloMessage 0x0b63 + EzloMessage TEXT_EZLO, 0x63 WaitUntilTextboxCloses script_08010900: Call sub_0807DF50 diff --git a/data/scripts/hyruleTown/script_Librari.inc b/data/scripts/hyruleTown/script_Librari.inc index 7f456a0e..2dedaf31 100644 --- a/data/scripts/hyruleTown/script_Librari.inc +++ b/data/scripts/hyruleTown/script_Librari.inc @@ -19,11 +19,11 @@ script_0800E974: StartPlayerScript script_PlayerStepOnTrap WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x000a - MessageFromTarget 0x4a24 + MessageFromTarget TEXT_TOWN_MINISH1, 0x24 WaitUntilTextboxCloses SetAnimation 0x000a Wait 0x0014 - MessageFromTarget 0x4a25 + MessageFromTarget TEXT_TOWN_MINISH1, 0x25 WaitUntilTextboxCloses SetAnimation 0x0000 StartPlayerScript script_PlayerActivatedTrapCard @@ -31,7 +31,7 @@ script_0800E974: SetLocalFlag 0x0074 PlaySound SFX_SECRET Wait 0x00f0 - MessageFromTarget 0x4a26 + MessageFromTarget TEXT_TOWN_MINISH1, 0x26 WaitUntilTextboxCloses SetLocalFlag 0x0075 script_0800E9E4: diff --git a/data/scripts/hyruleTown/script_LibrariLater.inc b/data/scripts/hyruleTown/script_LibrariLater.inc index 5b97f721..1363035f 100644 --- a/data/scripts/hyruleTown/script_LibrariLater.inc +++ b/data/scripts/hyruleTown/script_LibrariLater.inc @@ -17,7 +17,7 @@ script_08012440: CheckLocalFlag 0x00b3 JumpIf script_08012474 SetLocalFlag 0x00b3 - GivePlayerItem 0x0062 + GivePlayerItem ITEM_HEART_CONTAINER WaitPlayerGetItem .ifdef USA SetLocalFlag 0x00d0 diff --git a/data/scripts/hyruleTown/script_LibrarianLeft.inc b/data/scripts/hyruleTown/script_LibrarianLeft.inc index bed65448..c39947d3 100644 --- a/data/scripts/hyruleTown/script_LibrarianLeft.inc +++ b/data/scripts/hyruleTown/script_LibrarianLeft.inc @@ -11,7 +11,7 @@ script_08008BA2: SetPlayerIdle SetAnimation 0x0004 Call WaitForAnimDone - MessageFromTarget 0x4912 + MessageFromTarget TEXT_LIBRARY, 0x12 WaitUntilTextboxCloses SetAnimation 0x0008 EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc index a6f0efee..83414cf7 100644 --- a/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc +++ b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc @@ -6,14 +6,14 @@ SCRIPT_START script_LibrarianLeftWithQuest DoPostScriptAction 0x000a SetAnimation 0x0000 .ifdef EU - SetGlobalFlag 0x0061 + SetGlobalFlag MIZUKAKI_NECHAN .endif EndBlock script_08008BD2: TriggerInteract SetPlayerIdle .ifndef EU - SetGlobalFlag 0x0061 + SetGlobalFlag MIZUKAKI_NECHAN .endif SetAnimation 0x0004 Call WaitForAnimDone @@ -26,7 +26,7 @@ script_08008BD2: CallWithArg sub_0806BB1C, 0x00000001 Call sub_0806BB7C JumpIfNot script_08008C5C - MessageNoOverlap 0x490c + MessageNoOverlap TEXT_LIBRARY, 0x0c WaitUntilTextboxCloses LoadRoomEntityList gUnk_080D6784 WaitForSyncFlag 0x00000001 @@ -35,7 +35,7 @@ script_08008BD2: PlaySound SFX_SECRET SetAnimation 0x0004 Call WaitForAnimDone - MessageNoOverlap 0x4913 + MessageNoOverlap TEXT_LIBRARY, 0x13 WaitUntilTextboxCloses SetAnimation 0x0008 Call WaitForAnimDone diff --git a/data/scripts/hyruleTown/script_MalonHyruleTown.inc b/data/scripts/hyruleTown/script_MalonHyruleTown.inc index f9607b9c..1040f382 100644 --- a/data/scripts/hyruleTown/script_MalonHyruleTown.inc +++ b/data/scripts/hyruleTown/script_MalonHyruleTown.inc @@ -15,26 +15,26 @@ script_08014F4A: FacePlayer DoPostScriptAction 0x0000 BeginBlock - MessageNoOverlap 0x3b0b + MessageNoOverlap TEXT_MILK, 0x0b CallWithArg sub_0807F854, 0x00010064 EndBlock WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_08014FA6 - HasRupees 0x0064 + HasRupees 100 JumpIfNot script_08014F9A - CheckBottleContaining 0x0020 + CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIfNot script_08014FA2 - ModRupees 0xff9c - GivePlayerItem 0x0022 + ModRupees -100 + GivePlayerItem ITEM_BOTTLE_MILK WaitPlayerGetItem - MessageNoOverlap 0x3b11 + MessageNoOverlap TEXT_MILK, 0x11 Jump script_08014FA6 script_08014F9A: - MessageNoOverlap 0x3b0e + MessageNoOverlap TEXT_MILK, 0x0e Jump script_08014FA6 script_08014FA2: - MessageNoOverlap 0x3b0f + MessageNoOverlap TEXT_MILK, 0x0f script_08014FA6: WaitUntilTextboxCloses Call sub_0807DF50 diff --git a/data/scripts/hyruleTown/script_Marcy.inc b/data/scripts/hyruleTown/script_Marcy.inc index 24c437a9..4ee17abf 100644 --- a/data/scripts/hyruleTown/script_Marcy.inc +++ b/data/scripts/hyruleTown/script_Marcy.inc @@ -18,14 +18,14 @@ script_08010746: WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_08010786 - HasRupees 0x00c8 + HasRupees 200 JumpIf script_08010778 - MessageNoOverlap 0x4008 + MessageNoOverlap TEXT_POST, 0x08 Jump script_08010786 script_08010778: - ModRupees 0xff38 + ModRupees -200 Call sub_08062E14 - MessageNoOverlap 0x4007 + MessageNoOverlap TEXT_POST, 0x07 script_08010786: EndBlock WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_Nayru.inc b/data/scripts/hyruleTown/script_Nayru.inc index 571e2bef..bb6dc953 100644 --- a/data/scripts/hyruleTown/script_Nayru.inc +++ b/data/scripts/hyruleTown/script_Nayru.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Nayru SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - CheckGlobalFlag 0x0047 + CheckGlobalFlag GOMAN_RENTED_HOUSE JumpIf script_08011D6E EndBlock script_08011D46: @@ -17,7 +17,7 @@ script_08011D46: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - MessageNoOverlap 0x4513 + MessageNoOverlap TEXT_HAPPY_HEARTH, 0x13 WaitUntilTextboxCloses EnablePlayerControl SetAnimationState 0x0004 @@ -26,9 +26,9 @@ script_08011D46: script_08011D6E: EndBlock BeginBlock - CheckGlobalFlag 0x002b + CheckGlobalFlag RENTED_HOUSE_DIN JumpIf script_08011D46 - CheckGlobalFlag 0x002d + CheckGlobalFlag RENTED_HOUSE_FARORE JumpIf script_08011D46 CheckEntityInteractType JumpIfNot script_08011D6E @@ -36,7 +36,7 @@ script_08011D6E: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - MessageNoOverlap 0x3103 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x03 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011DBA @@ -51,9 +51,9 @@ script_08011DAC: FacePlayer DoPostScriptAction 0x0000 script_08011DBA: - MessageNoOverlap 0x3106 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x06 WaitUntilTextboxCloses - SetGlobalFlag 0x002c + SetGlobalFlag RENTED_HOUSE_NAYRU EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 diff --git a/data/scripts/hyruleTown/script_Nayru2.inc b/data/scripts/hyruleTown/script_Nayru2.inc index dadf8cb8..1ae9f73b 100644 --- a/data/scripts/hyruleTown/script_Nayru2.inc +++ b/data/scripts/hyruleTown/script_Nayru2.inc @@ -9,9 +9,9 @@ SCRIPT_START script_Nayru2 script_08011F22: EndBlock BeginBlock - CheckGlobalFlag 0x002e + CheckGlobalFlag NEW_HOUSE_DIN JumpIf script_08011D46 - CheckGlobalFlag 0x0030 + CheckGlobalFlag NEW_HOUSE_FARORE JumpIf script_08011D46 CheckEntityInteractType JumpIfNot script_08011F22 @@ -19,13 +19,13 @@ script_08011F22: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - CheckGlobalFlag 0x0048 + CheckGlobalFlag GOMAN_NEW_HOUSE JumpIf script_08011F58 - MessageNoOverlap 0x4522 + MessageNoOverlap TEXT_HAPPY_HEARTH, 0x22 WaitUntilTextboxCloses Jump script_08011F64 script_08011F58: - MessageNoOverlap 0x310f + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x0f WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011F80 @@ -41,9 +41,9 @@ script_08011F72: FacePlayer DoPostScriptAction 0x0000 script_08011F80: - MessageNoOverlap 0x3112 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x12 WaitUntilTextboxCloses - SetGlobalFlag 0x002f + SetGlobalFlag NEW_HOUSE_NAYRU EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 diff --git a/data/scripts/hyruleTown/script_NayruAlone.inc b/data/scripts/hyruleTown/script_NayruAlone.inc index c1e75c7d..de24f35d 100644 --- a/data/scripts/hyruleTown/script_NayruAlone.inc +++ b/data/scripts/hyruleTown/script_NayruAlone.inc @@ -12,7 +12,7 @@ script_08012216: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - MessageNoOverlap 0x4525 + MessageNoOverlap TEXT_HAPPY_HEARTH, 0x25 WaitUntilTextboxCloses EnablePlayerControl SetAnimationState 0x0004 diff --git a/data/scripts/hyruleTown/script_NayruMovedIn.inc b/data/scripts/hyruleTown/script_NayruMovedIn.inc index ab975772..3b88280c 100644 --- a/data/scripts/hyruleTown/script_NayruMovedIn.inc +++ b/data/scripts/hyruleTown/script_NayruMovedIn.inc @@ -12,28 +12,28 @@ script_080120C6: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - CheckLocalFlag 0x0095 + CheckLocalFlag MHOUSE_NAYRU_TALK JumpIf script_080120EA - MessageNoOverlap 0x3116 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x16 WaitUntilTextboxCloses - SetLocalFlag 0x0095 + SetLocalFlag MHOUSE_NAYRU_TALK Jump script_0801212A script_080120EA: - CheckBottleContaining 0x002f + CheckBottleContaining BOTTLE_CHARM_NAYRU JumpIfNot script_080120FC - MessageNoOverlap 0x3117 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x17 WaitUntilTextboxCloses Jump script_0801212A script_080120FC: - MessageNoOverlap 0x3118 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x18 WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_0801212A - CheckBottleContaining 0x0020 + CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIfNot script_08012126 - MessageNoOverlap 0x3119 + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x19 WaitUntilTextboxCloses - GivePlayerItem 0x002f + GivePlayerItem BOTTLE_CHARM_NAYRU WaitPlayerGetItem .ifdef USA Call sub_0807FC24 @@ -48,7 +48,7 @@ script_080120FC: .endif Jump script_0801212A script_08012126: - MessageNoOverlap 0x311b + MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1b script_0801212A: WaitUntilTextboxCloses EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_Object6ACarlov.inc b/data/scripts/hyruleTown/script_Object6ACarlov.inc index 6ba8d7a9..3b20ad73 100644 --- a/data/scripts/hyruleTown/script_Object6ACarlov.inc +++ b/data/scripts/hyruleTown/script_Object6ACarlov.inc @@ -18,7 +18,7 @@ script_080145C2: Wait 0x000c FaceAwayFromPlayer .endif - MessageFromTargetPos 0x432e, 0x000c + MessageFromTargetPos TEXT_CARLOV, 0x2e, 0x000c WaitUntilTextboxCloses .ifdef EU Wait 0x0018 diff --git a/data/scripts/hyruleTown/script_Object6ACarlov2.inc b/data/scripts/hyruleTown/script_Object6ACarlov2.inc index 37ed8f5f..37f468b2 100644 --- a/data/scripts/hyruleTown/script_Object6ACarlov2.inc +++ b/data/scripts/hyruleTown/script_Object6ACarlov2.inc @@ -17,7 +17,7 @@ script_080145F8: Wait 0x0018 _0807E8E4_3 SetAnimationState 0x0002 - MessageFromTargetPos 0x432b, 0x000c + MessageFromTargetPos TEXT_CARLOV, 0x2b, 0x000c WaitUntilTextboxCloses Wait 0x0018 EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc b/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc index 853106e8..274526e2 100644 --- a/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc +++ b/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc @@ -8,7 +8,7 @@ script_0801454C: CheckRoomFlag 0x0000 JumpIfNot script_0801454C SetPlayerIdle - EzloMessage 0x4217 + EzloMessage TEXT_BURLOV, 0x17 WaitUntilTextboxCloses StartPlayerScript script_PlayerWhenLeavingCarlovAlreadyPaid Wait 0x0010 diff --git a/data/scripts/hyruleTown/script_Phonograph.inc b/data/scripts/hyruleTown/script_Phonograph.inc index 9dae4972..a8f110a7 100644 --- a/data/scripts/hyruleTown/script_Phonograph.inc +++ b/data/scripts/hyruleTown/script_Phonograph.inc @@ -8,7 +8,7 @@ script_0800BA46: JumpIfNot script_0800BA46 SetPlayerIdle Call sub_0807DF28 - MessageFromTarget 0x3301 + MessageFromTarget TEXT_PHONOGRAPH, 0x01 WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_0800BA6C diff --git a/data/scripts/hyruleTown/script_PhonographDoor.inc b/data/scripts/hyruleTown/script_PhonographDoor.inc index 163dfdae..4b22769f 100644 --- a/data/scripts/hyruleTown/script_PhonographDoor.inc +++ b/data/scripts/hyruleTown/script_PhonographDoor.inc @@ -2,19 +2,7 @@ SCRIPT_START script_PhonographDoor BeginBlock EndBlock -.ifdef JP - CheckLocalFlag 0x00ce -.else -.ifdef EU - CheckLocalFlag 0x00ce -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00ce @ TODO deduplicate -.else - CheckLocalFlag 0x00d1 -.endif -.endif -.endif + CheckLocalFlag SHOP05_OPEN JumpIf script_080109EA CheckPlayerInRegion2 0x0808 JumpIfNot script_PhonographDoor @@ -26,7 +14,7 @@ SCRIPT_START script_PhonographDoor WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_080109DE - EzloMessage 0x0b64 + EzloMessage TEXT_EZLO, 0x64 WaitUntilTextboxCloses script_080109DE: Call sub_0807DF50 diff --git a/data/scripts/hyruleTown/script_Pita.inc b/data/scripts/hyruleTown/script_Pita.inc index 90603f57..c026e4cf 100644 --- a/data/scripts/hyruleTown/script_Pita.inc +++ b/data/scripts/hyruleTown/script_Pita.inc @@ -15,7 +15,7 @@ script_080106BE: DoPostScriptAction 0x0000 HasRoomItemForSale JumpIf script_080106E0 - MessageNoOverlap 0x3c07 + MessageNoOverlap TEXT_BAKERY, 0x07 Jump script_08010726 script_080106E0: Call RemoveAllBakedGoods @@ -24,16 +24,16 @@ script_080106E0: CheckTextboxResult JumpIfNot script_08010726 WaitUntilTextboxCloses - BuyItem 0x0000, 0x0000 + BuyItem ITEM_NONE, 0x0000 JumpIf script_0801070C - MessageNoOverlap 0x3c04 + MessageNoOverlap TEXT_BAKERY, 0x04 Jump script_08010726 script_0801070C: WaitPlayerGetItem ModHealth 0x0008 Call sub_08062EDC JumpIf script_08010724 - MessageNoOverlap 0x3c06 + MessageNoOverlap TEXT_BAKERY, 0x06 Jump script_08010726 script_08010724: WaitPlayerGetItem diff --git a/data/scripts/hyruleTown/script_Postman.inc b/data/scripts/hyruleTown/script_Postman.inc index 5f12cb8d..1aff3231 100644 --- a/data/scripts/hyruleTown/script_Postman.inc +++ b/data/scripts/hyruleTown/script_Postman.inc @@ -1,7 +1,7 @@ @ Hyrule Town Postman SCRIPT_START script_Postman BeginBlock - CheckInventory1 0x0067 + CheckInventory1 ITEM_KINSTONE_BAG JumpIfNot script_08010B62 SetAnimationState 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/hyruleTown/script_Rem.inc b/data/scripts/hyruleTown/script_Rem.inc index 7fb0f0c8..df8e054d 100644 --- a/data/scripts/hyruleTown/script_Rem.inc +++ b/data/scripts/hyruleTown/script_Rem.inc @@ -4,11 +4,11 @@ SCRIPT_START script_Rem CallWithArg sub_0806A93C, 0x12345678 SetAnimationState 0x0004 SetAnimation 0x0002 - CheckInventory1 0x0015 + CheckInventory1 ITEM_PEGASUS_BOOTS JumpIf script_080130B6 CheckLocalFlag 0x0060 JumpIf script_08012FD2 - CheckGlobalFlag 0x001e + CheckGlobalFlag DASHBOOTS JumpIf script_RemFallingAsleep EndBlock CheckLocalFlag 0x0062 @@ -21,7 +21,7 @@ script_08012F50: Call sub_0806A96C JumpIfNot script_08012F50 SetPlayerIdle - MessageNoOverlap 0x4401 + MessageNoOverlap TEXT_REM, 0x01 WaitUntilTextboxCloses SetLocalFlag 0x0061 EnablePlayerControl @@ -29,7 +29,7 @@ script_08012F50: script_08012F6C: Call sub_0806A96C JumpIfNot script_08012F6C - MessageNoOverlap 0x4402 + MessageNoOverlap TEXT_REM, 0x02 WaitUntilTextboxCloses SetAction 0x0001 Jump script_08012F6C diff --git a/data/scripts/hyruleTown/script_RemFallingAsleep.inc b/data/scripts/hyruleTown/script_RemFallingAsleep.inc index 996ea20f..a4ca2e30 100644 --- a/data/scripts/hyruleTown/script_RemFallingAsleep.inc +++ b/data/scripts/hyruleTown/script_RemFallingAsleep.inc @@ -25,11 +25,11 @@ script_08012FD2: CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0806AA10 EndBlock - CheckInventory1 0x0038 + CheckInventory1 ITEM_QST_MUSHROOM JumpIf script_08013006 script_08012FFA: TriggerInteract - MessageNoOverlap 0x4403 + MessageNoOverlap TEXT_REM, 0x03 WaitUntilTextboxCloses Jump script_08012FFA script_08013006: @@ -39,7 +39,7 @@ script_08013006: Call sub_0807DF28 EndBlock PlaySound SFX_TASK_COMPLETE - _0807F088 0x0038 + InitItemGetSequence ITEM_QST_MUSHROOM WaitPlayerGetItem Wait 0x001e _0807E8E4_0 @@ -48,24 +48,24 @@ script_08013006: Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x4404 + MessageNoOverlap TEXT_REM, 0x04 WaitUntilTextboxCloses Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x440e + MessageNoOverlap TEXT_REM, 0x0e WaitUntilTextboxCloses Wait 0x001e Call sub_0806A9E8 SetAnimation 0x000f Wait 0x00f0 - MessageNoOverlap 0x4405 + MessageNoOverlap TEXT_REM, 0x05 WaitUntilTextboxCloses SetSyncFlag 0x00000200 - GivePlayerItem 0x0015 + GivePlayerItem ITEM_PEGASUS_BOOTS WaitPlayerGetItem FaceAwayFromPlayer - MessageNoOverlap 0x4406 + MessageNoOverlap TEXT_REM, 0x06 WaitUntilTextboxCloses SetAction 0x0001 Call sub_0807DF50 @@ -73,13 +73,13 @@ script_08013006: script_0801308A: Call sub_0806A96C JumpIfNot script_0801308A - MessageNoOverlap 0x4407 + MessageNoOverlap TEXT_REM, 0x07 WaitUntilTextboxCloses SetAction 0x0001 script_0801309E: Call sub_0806A96C JumpIfNot script_0801309E - MessageNoOverlap 0x440d + MessageNoOverlap TEXT_REM, 0x0d WaitUntilTextboxCloses SetAction 0x0001 Jump script_0801308A diff --git a/data/scripts/hyruleTown/script_RentRegularRoom.inc b/data/scripts/hyruleTown/script_RentRegularRoom.inc index 05284b24..98e52f5b 100644 --- a/data/scripts/hyruleTown/script_RentRegularRoom.inc +++ b/data/scripts/hyruleTown/script_RentRegularRoom.inc @@ -1,15 +1,15 @@ @ Hyrule Town Inn Emma after renting regular room SCRIPT_START script_RentRegularRoom BeginBlock - MessageFromTarget 0x4504 + MessageFromTarget TEXT_HAPPY_HEARTH, 0x04 CallWithArg sub_0807F854, 0x000100c8 EndBlock WaitUntilTextboxCloses - HasRupees 0x00c8 + HasRupees 200 JumpIfNot script_EmmaNotEnoughRupees - ModRupees 0xff38 + ModRupees -200 SetLocalFlag 0x0091 - MessageFromTarget 0x4508 + MessageFromTarget TEXT_HAPPY_HEARTH, 0x08 WaitUntilTextboxCloses Call sub_0806C588 SCRIPT_END diff --git a/data/scripts/hyruleTown/script_RentSmallRoom.inc b/data/scripts/hyruleTown/script_RentSmallRoom.inc index c6794b6d..672d530b 100644 --- a/data/scripts/hyruleTown/script_RentSmallRoom.inc +++ b/data/scripts/hyruleTown/script_RentSmallRoom.inc @@ -1,15 +1,15 @@ @ Hyrule Town Inn Emma after renting small room SCRIPT_START script_RentSmallRoom BeginBlock - MessageFromTarget 0x4503 + MessageFromTarget TEXT_HAPPY_HEARTH, 0x03 CallWithArg sub_0807F854, 0x00010032 EndBlock WaitUntilTextboxCloses - HasRupees 0x0032 + HasRupees 50 JumpIfNot script_EmmaNotEnoughRupees - ModRupees 0xffce + ModRupees -50 SetLocalFlag 0x0091 - MessageFromTarget 0x4508 + MessageFromTarget TEXT_HAPPY_HEARTH, 0x08 WaitUntilTextboxCloses Call sub_0806C598 SCRIPT_END diff --git a/data/scripts/hyruleTown/script_Simon.inc b/data/scripts/hyruleTown/script_Simon.inc index 44bd59b5..a6ac0e6c 100644 --- a/data/scripts/hyruleTown/script_Simon.inc +++ b/data/scripts/hyruleTown/script_Simon.inc @@ -6,17 +6,17 @@ SCRIPT_START script_Simon SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock - CheckGlobalFlag 0x0050 + CheckGlobalFlag MAROYA_WAKEUP JumpIfNot script_08011B84 WaitForSyncFlagAndClear 0x00000004 SetAnimationState 0x0006 DoPostScriptAction 0x0004 Wait 0x003c FaceAwayFromPlayer - MessageNoOverlap 0x3d07 + MessageNoOverlap TEXT_SIMON, 0x07 WaitUntilTextboxCloses SetAnimationState 0x0004 - ClearGlobalFlag 0x0050 + ClearGlobalFlag MAROYA_WAKEUP Call sub_0807DF50 EnablePlayerControl script_08011B84: @@ -24,7 +24,7 @@ script_08011B84: JumpIfNot script_08011B84 SetPlayerIdle FacePlayer - MessageNoOverlap 0x3d01 + MessageNoOverlap TEXT_SIMON, 0x01 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_08011BA4 @@ -33,16 +33,16 @@ script_08011B9A: SetAnimationState 0x0004 Jump script_08011B84 script_08011BA4: - HasRupees 0x000a + HasRupees 10 JumpIf script_08011BBC DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x3d05 + MessageNoOverlap TEXT_SIMON, 0x05 Jump script_08011B9A script_08011BBC: - ModRupees 0xfff6 + ModRupees -10 Wait 0x001e - MessageNoOverlap 0x3d06 + MessageNoOverlap TEXT_SIMON, 0x06 WaitUntilTextboxCloses CallWithArg sub_0806C2A0, 0x00000000 WaitForFadeFinish diff --git a/data/scripts/hyruleTown/script_SimonsDoor.inc b/data/scripts/hyruleTown/script_SimonsDoor.inc index 4e9b8ba0..2d1cf455 100644 --- a/data/scripts/hyruleTown/script_SimonsDoor.inc +++ b/data/scripts/hyruleTown/script_SimonsDoor.inc @@ -9,7 +9,7 @@ SCRIPT_START script_SimonsDoor WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_08010994 - EzloMessage 0x0b63 + EzloMessage TEXT_EZLO, 0x63 WaitUntilTextboxCloses script_08010994: Call sub_0807DF50 diff --git a/data/scripts/hyruleTown/script_Stockwell.inc b/data/scripts/hyruleTown/script_Stockwell.inc index b59499cf..b3890cb3 100644 --- a/data/scripts/hyruleTown/script_Stockwell.inc +++ b/data/scripts/hyruleTown/script_Stockwell.inc @@ -30,7 +30,7 @@ script_080142C4: Wait 0x000a SetAnimation 0x0002 Wait 0x001e - MessageNoOverlap 0x2c12 + MessageNoOverlap TEXT_STOCKWELL, 0x12 WaitUntilTextboxCloses Wait 0x0014 SetAnimation 0x0004 @@ -54,7 +54,7 @@ script_08014330: Wait 0x001e SetAnimation 0x0001 Wait 0x001e - MessageNoOverlap 0x2c13 + MessageNoOverlap TEXT_STOCKWELL, 0x13 WaitUntilTextboxCloses Wait 0x0014 SetAnimation 0x0004 diff --git a/data/scripts/hyruleTown/script_StockwellDogFood.inc b/data/scripts/hyruleTown/script_StockwellDogFood.inc index 90b56fc7..bdfea1ef 100644 --- a/data/scripts/hyruleTown/script_StockwellDogFood.inc +++ b/data/scripts/hyruleTown/script_StockwellDogFood.inc @@ -7,7 +7,7 @@ SCRIPT_START script_StockwellDogFood SetAnimation 0x0001 Call sub_080654EC Wait 0x003c - MessageNoOverlap 0x2c16 + MessageNoOverlap TEXT_STOCKWELL, 0x16 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_080143FA @@ -17,21 +17,21 @@ SCRIPT_START script_StockwellDogFood script_080143FA: Call sub_080654EC Wait 0x001e - MessageNoOverlap 0x2c18 + MessageNoOverlap TEXT_STOCKWELL, 0x18 WaitUntilTextboxCloses Wait 0x000a SetIntVariable 0x00000000 Call sub_08065528 - GivePlayerItem 0x0036 + GivePlayerItem ITEM_QST_DOGFOOD WaitPlayerGetItem - MessageNoOverlap 0x2c19 + MessageNoOverlap TEXT_STOCKWELL, 0x19 WaitUntilTextboxCloses SetIntVariable 0x00000303 Call LoadMenu .ifndef EU Wait 0x001e FaceAwayFromPlayer - MessageNoOverlap 0x2c22 + MessageNoOverlap TEXT_STOCKWELL, 0x22 WaitUntilTextboxCloses .endif script_0801443E: diff --git a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc index ac3c3aab..d3b1b690 100644 --- a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc +++ b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc @@ -9,7 +9,7 @@ SCRIPT_START script_SturgeonAllBooksCollected PlaySound SFX_STAIRS EndBlock WaitForSyncFlag 0x00000002 - MessageNoOverlap 0x490d + MessageNoOverlap TEXT_LIBRARY, 0x0d WaitUntilTextboxCloses DoPostScriptAction 0x0007 Call sub_08064D08 diff --git a/data/scripts/hyruleTown/script_TownMinish1.inc b/data/scripts/hyruleTown/script_TownMinish1.inc index 10db1da0..248f4c2d 100644 --- a/data/scripts/hyruleTown/script_TownMinish1.inc +++ b/data/scripts/hyruleTown/script_TownMinish1.inc @@ -22,7 +22,7 @@ script_0800E708: Jump script_0800E6F4 script_0800E722: WaitUntilTextboxCloses - GivePlayerItem 0x0057 + GivePlayerItem ITEM_RUPEE50 WaitPlayerGetItem WaitUntilTextboxCloses EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_TownMinish3.inc b/data/scripts/hyruleTown/script_TownMinish3.inc index 072ace66..3edddfec 100644 --- a/data/scripts/hyruleTown/script_TownMinish3.inc +++ b/data/scripts/hyruleTown/script_TownMinish3.inc @@ -4,9 +4,9 @@ SCRIPT_START script_TownMinish3 _0807E9D4 DoPostScriptAction 0x000a SetEntitySpeed 0x0200 - CheckGlobalFlag 0x0029 + CheckGlobalFlag MIZUKAKI_START JumpIfNot script_0800E77C - CheckGlobalFlag 0x002a + CheckGlobalFlag MIZUKAKI_HARIFALL JumpIfNot script_0800E786 script_0800E77C: SetEntityPositionRelative 0x0188, 0x0098 @@ -15,7 +15,7 @@ script_0800E786: EndBlock script_0800E788: BeginBlock - CheckGlobalFlag 0x002a + CheckGlobalFlag MIZUKAKI_HARIFALL JumpIf script_0800E7BA CheckEntityInteractType JumpIf script_0800E7A4 diff --git a/data/scripts/hyruleTown/script_TownMinish4.inc b/data/scripts/hyruleTown/script_TownMinish4.inc index 79c063e0..a8a7fe74 100644 --- a/data/scripts/hyruleTown/script_TownMinish4.inc +++ b/data/scripts/hyruleTown/script_TownMinish4.inc @@ -20,13 +20,13 @@ script_0800EDB6: JumpIf script_0800EE3E Wait 0x000a SetSyncFlag 0x00000001 - MessageFromTarget 0x4c07 + MessageFromTarget TEXT_HAGEN, 0x07 WaitUntilTextboxCloses SetSyncFlag 0x00000010 - MessageFromTarget 0x4c08 + MessageFromTarget TEXT_HAGEN, 0x08 WaitUntilTextboxCloses SetSyncFlag 0x00000020 - MessageFromTarget 0x4c09 + MessageFromTarget TEXT_HAGEN, 0x09 WaitUntilTextboxCloses SetIntVariable 0x00000503 Call LoadMenu @@ -45,7 +45,7 @@ script_0800EE12: WaitForSyncFlagAndClear 0x00000008 Jump script_0800ED98 script_0800EE3E: - MessageFromTarget 0x4c16 + MessageFromTarget TEXT_HAGEN, 0x16 WaitUntilTextboxCloses Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_TownMinish5.inc b/data/scripts/hyruleTown/script_TownMinish5.inc index d4ae341c..844ec579 100644 --- a/data/scripts/hyruleTown/script_TownMinish5.inc +++ b/data/scripts/hyruleTown/script_TownMinish5.inc @@ -20,13 +20,13 @@ script_0800EE76: JumpIf script_0800EEFE Wait 0x000a SetSyncFlag 0x00000001 - MessageFromTarget 0x4c07 + MessageFromTarget TEXT_HAGEN, 0x07 WaitUntilTextboxCloses SetSyncFlag 0x00000002 - MessageFromTarget 0x4c08 + MessageFromTarget TEXT_HAGEN, 0x08 WaitUntilTextboxCloses SetSyncFlag 0x00000004 - MessageFromTarget 0x4c09 + MessageFromTarget TEXT_HAGEN, 0x09 WaitUntilTextboxCloses SetIntVariable 0x00000503 Call LoadMenu @@ -45,19 +45,19 @@ script_0800EED2: WaitForSyncFlagAndClear 0x00000040 Jump script_0800EE58 script_0800EEFE: - MessageFromTarget 0x4c15 + MessageFromTarget TEXT_HAGEN, 0x15 WaitUntilTextboxCloses Call sub_0807DF50 EnablePlayerControl Jump script_0800EE58 - MessageFromTarget 0x4c07 + MessageFromTarget TEXT_HAGEN, 0x07 WaitUntilTextboxCloses SetSyncFlag 0x00000012 Wait 0x000a - MessageFromTarget 0x4c08 + MessageFromTarget TEXT_HAGEN, 0x08 WaitUntilTextboxCloses SetSyncFlag 0x00000024 - MessageFromTarget 0x4c09 + MessageFromTarget TEXT_HAGEN, 0x09 WaitUntilTextboxCloses SetSyncFlag 0x00000048 Call SetPlayerActionNormal diff --git a/data/scripts/hyruleTown/script_Wheaton.inc b/data/scripts/hyruleTown/script_Wheaton.inc index 0eb0c98d..981e7588 100644 --- a/data/scripts/hyruleTown/script_Wheaton.inc +++ b/data/scripts/hyruleTown/script_Wheaton.inc @@ -13,7 +13,7 @@ script_08010686: FacePlayer HasRoomItemForSale Call GetConditionSet - MessageFromTargetTable 0x3c08, 0x3c09 + MessageFromTargetTable TEXT_BAKERY << 8 | 0x08, TEXT_BAKERY << 8 | 0x09 WaitUntilTextboxCloses EnablePlayerControl SetAnimationState 0x0004 diff --git a/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc index f4a43257..592035a3 100644 --- a/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc @@ -7,7 +7,7 @@ SCRIPT_START script_BigGoronKinstone4 _0807EEF4 0xfff8, 0x0000 _0807F0C8 0x0000, 0x0000 Wait 0x001e - MessageNoOverlap 0x1d00 + MessageNoOverlap TEXT_GORONS, 0x00 WaitUntilTextboxCloses SetSyncFlag 0x00000006 WaitForSyncFlagAndClear 0x00000001 diff --git a/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc b/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc index 1094d83a..e6ba18a9 100644 --- a/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc +++ b/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc @@ -10,7 +10,7 @@ script_0800BB42: JumpIfNot script_0800BB42 DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e05 + MessageNoOverlap TEXT_KINSTONE, 0x05 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/kinstoneFusion/script_CarlovKinstone.inc b/data/scripts/kinstoneFusion/script_CarlovKinstone.inc index a808530c..554ebfe7 100644 --- a/data/scripts/kinstoneFusion/script_CarlovKinstone.inc +++ b/data/scripts/kinstoneFusion/script_CarlovKinstone.inc @@ -8,7 +8,7 @@ script_0800BBE4: JumpIfNot script_0800BBE4 DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e03 + MessageNoOverlap TEXT_KINSTONE, 0x03 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc b/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc index edff4065..f2fec457 100644 --- a/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc +++ b/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc @@ -10,7 +10,7 @@ script_0800BC18: JumpIfNot script_0800BC18 DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e07 + MessageNoOverlap TEXT_KINSTONE, 0x07 WaitUntilTextboxCloses BeginBlock SetAnimationState 0x0000 diff --git a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc index 091c269b..70417b22 100644 --- a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc +++ b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc @@ -17,7 +17,7 @@ script_0800BA8E: Wait 0x001e _0807EDD4 0x02f0, 0x0350 Wait 0x001e - MessageNoOverlap 0x0e00 + MessageNoOverlap TEXT_KINSTONE, 0x00 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc index 19b4002a..b3c65aab 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc @@ -9,7 +9,7 @@ SCRIPT_START script_Goron1Kinstone2 Wait 0x00f0 SetAnimation 0x0000 Wait 0x003c - MessageNoOverlap 0x0e0a + MessageNoOverlap TEXT_KINSTONE, 0x0a WaitUntilTextboxCloses SetAnimation 0x0008 Wait 0x003c @@ -22,7 +22,7 @@ script_0800BD1C: SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e0c + MessageNoOverlap TEXT_KINSTONE, 0x0c WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc index 743de7f4..bafbff16 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc @@ -10,7 +10,7 @@ SCRIPT_START script_Goron1Kinstone3 SetAnimation 0x0000 SetAnimationState 0x0002 Wait 0x003c - MessageNoOverlap 0x0e0d + MessageNoOverlap TEXT_KINSTONE, 0x0d WaitUntilTextboxCloses SetAnimation 0x0008 Wait 0x003c diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc index 08f4eb7f..63e2314e 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc @@ -10,7 +10,7 @@ SCRIPT_START script_Goron1Kinstone4 SetAnimation 0x0000 SetAnimationState 0x0002 Wait 0x003c - MessageNoOverlap 0x0e10 + MessageNoOverlap TEXT_KINSTONE, 0x10 WaitUntilTextboxCloses SetAnimation 0x0008 Wait 0x003c diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc index 9fbadfcc..765ffddc 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc @@ -10,7 +10,7 @@ SCRIPT_START script_Goron1Kinstone5 SetAnimation 0x0000 SetAnimationState 0x0002 Wait 0x003c - MessageNoOverlap 0x0e13 + MessageNoOverlap TEXT_KINSTONE, 0x13 WaitUntilTextboxCloses SetAnimation 0x0008 Wait 0x003c diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc index ef803f64..5cb291a6 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc @@ -10,7 +10,7 @@ SCRIPT_START script_Goron1Kinstone6 SetAnimation 0x0000 SetAnimationState 0x0002 Wait 0x003c - MessageNoOverlap 0x0e16 + MessageNoOverlap TEXT_KINSTONE, 0x16 WaitUntilTextboxCloses SetAnimation 0x0008 Wait 0x003c diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc index 4d2762d7..588ede36 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc @@ -11,7 +11,7 @@ SCRIPT_START script_Goron2Kinstone2 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000270 Wait 0x001e - MessageNoOverlap 0x0e0b + MessageNoOverlap TEXT_KINSTONE, 0x0b WaitUntilTextboxCloses SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc index c78e43ba..b19792a2 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc @@ -24,7 +24,7 @@ script_0800BE8C: SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e0f + MessageNoOverlap TEXT_KINSTONE, 0x0f WaitUntilTextboxCloses SetSyncFlag 0x00000002 Call sub_08054F64 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc index 6809441e..918a8076 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc @@ -24,7 +24,7 @@ script_0800BFA8: SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e12 + MessageNoOverlap TEXT_KINSTONE, 0x12 WaitUntilTextboxCloses SetSyncFlag 0x00000002 Call sub_08054F64 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc index 829f8f8c..577c5ee8 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc @@ -24,7 +24,7 @@ script_0800C120: SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e15 + MessageNoOverlap TEXT_KINSTONE, 0x15 WaitUntilTextboxCloses SetSyncFlag 0x00000002 Call sub_08054F64 diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc index 88e1cb91..0f84880e 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc @@ -24,7 +24,7 @@ script_0800C248: SetAnimation 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e18 + MessageNoOverlap TEXT_KINSTONE, 0x18 WaitUntilTextboxCloses SetSyncFlag 0x00000002 Call sub_08054F64 diff --git a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc index 14b13031..14f1657f 100644 --- a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc @@ -11,7 +11,7 @@ SCRIPT_START script_Goron3Kinstone3 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e - MessageNoOverlap 0x0e0e + MessageNoOverlap TEXT_KINSTONE, 0x0e WaitUntilTextboxCloses SetSyncFlag 0x0000000c WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc index 940147da..a2a854bc 100644 --- a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc @@ -11,7 +11,7 @@ SCRIPT_START script_Goron4Kinstone4 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e - MessageNoOverlap 0x0e11 + MessageNoOverlap TEXT_KINSTONE, 0x11 WaitUntilTextboxCloses SetSyncFlag 0x0000001c WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc index 2a561509..78e04c52 100644 --- a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc @@ -11,7 +11,7 @@ SCRIPT_START script_Goron5Kinstone5 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e - MessageNoOverlap 0x0e14 + MessageNoOverlap TEXT_KINSTONE, 0x14 WaitUntilTextboxCloses SetSyncFlag 0x0000003c WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc index db5c8677..1726b2c6 100644 --- a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc @@ -11,7 +11,7 @@ SCRIPT_START script_Goron6Kindstone6 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e - MessageNoOverlap 0x0e17 + MessageNoOverlap TEXT_KINSTONE, 0x17 WaitUntilTextboxCloses SetSyncFlag 0x0000007c WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/kinstoneFusion/script_GoronKinstone.inc b/data/scripts/kinstoneFusion/script_GoronKinstone.inc index 88fd97d3..fc3a085e 100644 --- a/data/scripts/kinstoneFusion/script_GoronKinstone.inc +++ b/data/scripts/kinstoneFusion/script_GoronKinstone.inc @@ -12,7 +12,7 @@ script_0800BC62: Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e08 + MessageNoOverlap TEXT_KINSTONE, 0x08 WaitUntilTextboxCloses DoPostScriptAction 0x000f SetAnimation 0x0008 @@ -26,7 +26,7 @@ script_0800BC62: Wait 0x003c DoPostScriptAction 0x000c Wait 0x003c - MessageNoOverlap 0x0e09 + MessageNoOverlap TEXT_KINSTONE, 0x09 WaitUntilTextboxCloses Call SetCollisionLayer1 CallWithArg sub_0807F4F8, 0x0000035c diff --git a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc index 2e4588c5..b5385222 100644 --- a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc +++ b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc @@ -11,7 +11,7 @@ script_0800BB7A: JumpIfNot script_0800BB7A _0807EDD4 0x03a0, 0x00f8 Wait 0x001e - MessageNoOverlap 0x0e06 + MessageNoOverlap TEXT_KINSTONE, 0x06 WaitUntilTextboxCloses Wait 0x000f _0807EDD4 0x0380, 0x00f8 diff --git a/data/scripts/kinstoneFusion/script_MutohKinstone.inc b/data/scripts/kinstoneFusion/script_MutohKinstone.inc index c6a48c7f..878da6e8 100644 --- a/data/scripts/kinstoneFusion/script_MutohKinstone.inc +++ b/data/scripts/kinstoneFusion/script_MutohKinstone.inc @@ -10,7 +10,7 @@ script_0800BADE: JumpIfNot script_0800BADE DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e01 + MessageNoOverlap TEXT_KINSTONE, 0x01 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/kinstoneFusion/script_StampKinstone.inc b/data/scripts/kinstoneFusion/script_StampKinstone.inc index 6940cc83..8f2604da 100644 --- a/data/scripts/kinstoneFusion/script_StampKinstone.inc +++ b/data/scripts/kinstoneFusion/script_StampKinstone.inc @@ -11,7 +11,7 @@ script_0800BBBA: JumpIfNot script_0800BBBA DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e04 + MessageNoOverlap TEXT_KINSTONE, 0x04 WaitUntilTextboxCloses Wait 0x0078 Call sub_08054968 diff --git a/data/scripts/kinstoneFusion/script_SyrupKinstone.inc b/data/scripts/kinstoneFusion/script_SyrupKinstone.inc index c76dd55b..1146c32f 100644 --- a/data/scripts/kinstoneFusion/script_SyrupKinstone.inc +++ b/data/scripts/kinstoneFusion/script_SyrupKinstone.inc @@ -7,7 +7,7 @@ script_0800BB04: JumpIfNot script_0800BB04 DoPostScriptAction 0x0004 Wait 0x003c - MessageNoOverlap 0x0e02 + MessageNoOverlap TEXT_KINSTONE, 0x02 WaitUntilTextboxCloses Wait 0x003c DoPostScriptAction 0x000f diff --git a/data/scripts/lakeHylia/script_EzloTalkOcarina.inc b/data/scripts/lakeHylia/script_EzloTalkOcarina.inc index 0233ac50..3a4dc602 100644 --- a/data/scripts/lakeHylia/script_EzloTalkOcarina.inc +++ b/data/scripts/lakeHylia/script_EzloTalkOcarina.inc @@ -4,7 +4,7 @@ SCRIPT_START script_EzloTalkOcarina SetPlayerIdle Call WaitForPlayerNormalOrTalkEzlo Call sub_0807DF28 - EzloMessage 0x0b5f + EzloMessage TEXT_EZLO, 0x5f WaitUntilTextboxCloses Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/lakeHylia/script_KingGustafHologram.inc b/data/scripts/lakeHylia/script_KingGustafHologram.inc index a79fcdc2..d6b47c30 100644 --- a/data/scripts/lakeHylia/script_KingGustafHologram.inc +++ b/data/scripts/lakeHylia/script_KingGustafHologram.inc @@ -17,7 +17,7 @@ script_08012368: EndBlock WaitForFadeFinish PlayBgm BGM_ELEMENTAL_SANCTUARY - EzloMessage 0x1401 + EzloMessage TEXT_GUSTAF, 0x01 WaitUntilTextboxCloses SetAnimationState 0x0004 DoPostScriptAction 0x0000 @@ -28,7 +28,7 @@ script_08012368: _0807E8E4_0 StartPlayerScript script_PlayerAfterToD WaitForSyncFlagAndClear 0x00000001 - MessageNoOverlap 0x1402 + MessageNoOverlap TEXT_GUSTAF, 0x02 WaitUntilTextboxCloses StopBgm SetEntityVelocity 0x00010000 @@ -41,7 +41,7 @@ script_08012368: EndBlock WaitForFadeFinish PlayBGM - EzloMessage 0x1403 + EzloMessage TEXT_GUSTAF, 0x03 WaitUntilTextboxCloses SetIntVariable 0x00000203 Call LoadMenu diff --git a/data/scripts/lakeHylia/script_Object69AfterToD.inc b/data/scripts/lakeHylia/script_Object69AfterToD.inc index 2a5c6a62..09903bbe 100644 --- a/data/scripts/lakeHylia/script_Object69AfterToD.inc +++ b/data/scripts/lakeHylia/script_Object69AfterToD.inc @@ -5,13 +5,13 @@ script_0800AFB2: EndBlock BeginBlock Call sub_0807FBB4 - ComparePlayerAction 0x0001 + ComparePlayerAction PLAYER_NORMAL JumpIfNot script_0800AFB2 EndBlock Call sub_0807DF28 - EzloMessage 0x1c04 + EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x04 WaitUntilTextboxCloses - SetLocalFlagByBank 0x0100, 0x0004 + SetLocalFlagByBank FLAG_BANK_1, 0x0004 Call sub_0807DF50 EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/lonLonRanch/scriptMalonInside.inc b/data/scripts/lonLonRanch/scriptMalonInside.inc index f573b3f3..14da44c1 100644 --- a/data/scripts/lonLonRanch/scriptMalonInside.inc +++ b/data/scripts/lonLonRanch/scriptMalonInside.inc @@ -12,7 +12,7 @@ script_08014F0C: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - MessageNoOverlap 0x200e + MessageNoOverlap TEXT_LON_LON, 0x0e WaitUntilTextboxCloses EnablePlayerControl SetAnimationState 0x0004 diff --git a/data/scripts/lonLonRanch/script_LonLonRanchDoor.inc b/data/scripts/lonLonRanch/script_LonLonRanchDoor.inc index 6172c951..f9c6985e 100644 --- a/data/scripts/lonLonRanch/script_LonLonRanchDoor.inc +++ b/data/scripts/lonLonRanch/script_LonLonRanchDoor.inc @@ -2,7 +2,7 @@ SCRIPT_START script_LonLonRanchDoor BeginBlock DoPostScriptAction 0x0007 - CheckGlobalFlag 0x001d + CheckGlobalFlag INLOCK JumpIf script_0800B5BC EndBlock WaitForSyncFlagAndClear 0x00000010 diff --git a/data/scripts/lonLonRanch/script_MalonLostKey.inc b/data/scripts/lonLonRanch/script_MalonLostKey.inc index 07d170b8..4495e9d2 100644 --- a/data/scripts/lonLonRanch/script_MalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_MalonLostKey.inc @@ -17,7 +17,7 @@ script_0800B4D4: SetPlayerIdle FacePlayer DoPostScriptAction 0x0000 - MessageFromTarget 0x200b + MessageFromTarget TEXT_LON_LON, 0x0b EndBlock EnablePlayerControl SetAnimationState 0x0004 @@ -29,7 +29,7 @@ script_0800B4F0: _0807EDD4 0x0134, 0x0288 SetAnimationState 0x0004 WaitForSyncFlagAndClear 0x00000008 - MessageFromTarget 0x2016 + MessageFromTarget TEXT_LON_LON, 0x16 WaitUntilTextboxCloses _0807EDD4 0x0158, 0x0288 DoPostScriptAction 0x0000 @@ -39,7 +39,7 @@ script_0800B4F0: DoPostScriptAction 0x0008 Wait 0x001e SetSyncFlag 0x00000010 - SetGlobalFlag 0x001d + SetGlobalFlag INLOCK Call PlayerSetNormalAndCollide EnablePlayerControl Call sub_0807FBCC diff --git a/data/scripts/lonLonRanch/script_TalonGotKey.inc b/data/scripts/lonLonRanch/script_TalonGotKey.inc index ac25fc74..f169300f 100644 --- a/data/scripts/lonLonRanch/script_TalonGotKey.inc +++ b/data/scripts/lonLonRanch/script_TalonGotKey.inc @@ -17,10 +17,10 @@ SCRIPT_START script_TalonGotKey FacePlayer Wait 0x003c PlaySound SFX_TASK_COMPLETE - _0807F088 0x0037 + InitItemGetSequence ITEM_QST_LONLON_KEY WaitPlayerGetItem FaceAwayFromPlayer - MessageFromTarget 0x200c + MessageFromTarget TEXT_LON_LON, 0x0c WaitUntilTextboxCloses Wait 0x0014 _0807EDD4 0x0158, 0x0290 diff --git a/data/scripts/lonLonRanch/script_TalonInside.inc b/data/scripts/lonLonRanch/script_TalonInside.inc index ce0469db..854ab1db 100644 --- a/data/scripts/lonLonRanch/script_TalonInside.inc +++ b/data/scripts/lonLonRanch/script_TalonInside.inc @@ -18,17 +18,17 @@ script_08014E64: JumpIfNot script_08014EBC CallWithArg sub_0807F7C4, 0x00000022 JumpIfNot script_08014EB0 - CheckBottleContaining 0x0020 + CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIfNot script_08014EB8 CallWithArg sub_0807F800, 0x00000022 WaitPlayerGetItem - MessageNoOverlap 0x0a04 + MessageNoOverlap TEXT_EMPTY, 0x04 Jump script_08014EBC script_08014EB0: - MessageNoOverlap 0x0a03 + MessageNoOverlap TEXT_EMPTY, 0x03 Jump script_08014EBC script_08014EB8: - MessageNoOverlap 0x0a02 + MessageNoOverlap TEXT_EMPTY, 0x02 script_08014EBC: WaitUntilTextboxCloses Call sub_0807DF50 diff --git a/data/scripts/lonLonRanch/script_TalonInside2.inc b/data/scripts/lonLonRanch/script_TalonInside2.inc index 27c19f50..1e445f39 100644 --- a/data/scripts/lonLonRanch/script_TalonInside2.inc +++ b/data/scripts/lonLonRanch/script_TalonInside2.inc @@ -11,7 +11,7 @@ script_08014EE0: JumpIfNot script_08014EE0 SetPlayerIdle FacePlayer - MessageNoOverlap 0x200d + MessageNoOverlap TEXT_LON_LON, 0x0d WaitUntilTextboxCloses EnablePlayerControl Jump script_08014EE0 diff --git a/data/scripts/minishWoods/script_08012C98.inc b/data/scripts/minishWoods/script_08012C98.inc index c6ea3050..164d5899 100644 --- a/data/scripts/minishWoods/script_08012C98.inc +++ b/data/scripts/minishWoods/script_08012C98.inc @@ -1,7 +1,7 @@ @ Minish Woods OBJECT_69 ? @ Ezlo Trigger to explain how portals work SCRIPT_START script_08012C98 - CheckGlobalFlag 0x0014 + CheckGlobalFlag EZERO_1ST JumpIfNot script_08012C98 script_08012CA0: EndBlock @@ -13,21 +13,9 @@ script_08012CA0: EndBlock SetPlayerIdle Call sub_0807DF28 - EzloMessage 0x2202 + EzloMessage TEXT_EZLO_PORTAL, 0x02 WaitUntilTextboxCloses -.ifdef JP - SetLocalFlag 0x003a -.else -.ifdef EU - SetLocalFlag 0x003a -.else -.ifdef DEMO_JP - SetLocalFlag 0x003a @ TODO deduplicate -.else - SetLocalFlag 0x003b -.endif -.endif -.endif + SetLocalFlag MORI_00_KOBITO Call sub_0807DF50 EnablePlayerControl script_08012CD2: diff --git a/data/scripts/minishWoods/script_08012D18.inc b/data/scripts/minishWoods/script_08012D18.inc index c8dbcadb..bb9f5fbc 100644 --- a/data/scripts/minishWoods/script_08012D18.inc +++ b/data/scripts/minishWoods/script_08012D18.inc @@ -2,9 +2,9 @@ SCRIPT_START script_08012D18 EndBlock BeginBlock - CheckGlobalFlag 0x0014 + CheckGlobalFlag EZERO_1ST JumpIfNot script_08012D18 - CheckLocalFlagByBank 0x0200, 0x008d + CheckLocalFlagByBank FLAG_BANK_2, 0x008d JumpIf script_08012D68 CheckPlayerInRegion 0x0000, 0x01a8, 0x2010 JumpIfNot script_08012D18 @@ -12,7 +12,7 @@ SCRIPT_START script_08012D18 SetPlayerIdle Call WaitForPlayerNormal Call sub_0807DF28 - EzloMessage 0x111a + EzloMessage TEXT_FINDING_EZLO, 0x1a WaitUntilTextboxCloses StartPlayerScript script_PlayerCannotEnter WaitForSyncFlagAndClear 0x00000001 diff --git a/data/scripts/minishWoods/script_BombMinish.inc b/data/scripts/minishWoods/script_BombMinish.inc index ce58873e..e6f05c05 100644 --- a/data/scripts/minishWoods/script_BombMinish.inc +++ b/data/scripts/minishWoods/script_BombMinish.inc @@ -4,9 +4,9 @@ SCRIPT_START script_BombMinish SetAnimationState 0x0004 Call sub_08060090 DoPostScriptAction 0x000a - CheckKinstoneFused 0x001c + CheckKinstoneFused KINSTONE_1C JumpIf script_08009FD2 - CheckInventory1 0x0007 + CheckInventory1 ITEM_BOMBS JumpIf script_08009F84 EndBlock script_08009F36: @@ -22,10 +22,10 @@ script_08009F36: StartPlayerScript script_PlayerAtBombMinish WaitForSyncFlagAndClear 0x00000002 Call sub_0806014C - MessageFromTargetPos 0x1f01, 0x0000 + MessageFromTargetPos TEXT_BELARI, 0x01, 0x0000 WaitUntilTextboxCloses Wait 0x001e - GivePlayerItem 0x0065 + GivePlayerItem ITEM_BOMBBAG WaitPlayerGetItem DoPostScriptAction 0x000a Call sub_0807DF50 @@ -42,14 +42,14 @@ script_08009F86: SetPlayerIdle Call sub_080602BC WaitUntilTextboxCloses - CallWithArg CheckMessageEqual, 0x00001f03 + CallWithArg CheckMessageEqual, (TEXT_BELARI << 8) | 0x3 JumpIf script_08009FB6 EnablePlayerControl Jump script_08009F86 script_08009FB6: Wait 0x0008 PlaySound SFX_103 - CallWithArg sub_0806030C, 0x00000063 + CallWithArg script_ModBombs, 0x00000063 Wait 0x0008 EnablePlayerControl Jump script_08009F86 @@ -65,7 +65,7 @@ script_08009FDC: JumpIfNot script_08009FDC EndBlock SetPlayerIdle - MessageNoOverlap 0x1f0e + MessageNoOverlap TEXT_BELARI, 0x0e WaitUntilTextboxCloses CheckTextboxResult JumpIf script_0800A002 @@ -73,12 +73,12 @@ script_08009FDC: Jump script_08009FDC script_0800A002: Wait 0x0008 - GivePlayerItem 0x0008 + GivePlayerItem ITEM_REMOTE_BOMBS Call sub_08060318 WaitPlayerGetItem Wait 0x0008 FaceAwayFromPlayer - MessageFromTarget 0x1f13 + MessageFromTarget TEXT_BELARI, 0x13 WaitUntilTextboxCloses SetLocalFlag 0x00b0 EnablePlayerControl @@ -90,16 +90,16 @@ script_0800A024: JumpIfNot script_0800A024 EndBlock SetPlayerIdle - CheckInventory1 0x0008 + CheckInventory1 ITEM_REMOTE_BOMBS JumpIf script_0800A052 - MessageNoOverlap 0x1f14 + MessageNoOverlap TEXT_BELARI, 0x14 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_0800A002 EnablePlayerControl Jump script_0800A024 script_0800A052: - MessageNoOverlap 0x1f11 + MessageNoOverlap TEXT_BELARI, 0x11 WaitUntilTextboxCloses CheckTextboxResult JumpIf script_0800A064 @@ -107,12 +107,12 @@ script_0800A052: Jump script_0800A024 script_0800A064: Wait 0x0008 - GivePlayerItem 0x0007 + GivePlayerItem ITEM_BOMBS Call sub_08060318 WaitPlayerGetItem Wait 0x0008 FaceAwayFromPlayer - MessageFromTarget 0x1f10 + MessageFromTarget TEXT_BELARI, 0x10 WaitUntilTextboxCloses EnablePlayerControl Jump script_0800A024 diff --git a/data/scripts/minishWoods/script_EzloTalkDWS.inc b/data/scripts/minishWoods/script_EzloTalkDWS.inc index 72455e32..63444bca 100644 --- a/data/scripts/minishWoods/script_EzloTalkDWS.inc +++ b/data/scripts/minishWoods/script_EzloTalkDWS.inc @@ -2,9 +2,9 @@ SCRIPT_START script_EzloTalkDWS SetPlayerIdle Call sub_0807DF28 - EzloMessage 0x1c01 + EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x01 WaitUntilTextboxCloses - SetLocalFlagByBank 0x0100, 0x0001 + SetLocalFlagByBank FLAG_BANK_1, 0x0001 Call sub_0807DF50 EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc b/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc index b7f9c3b4..afe8f513 100644 --- a/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc +++ b/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc @@ -6,26 +6,14 @@ SCRIPT_START script_EzloTalkMinishPortal JumpIfNot script_EzloTalkMinishPortal CheckPlayerInRegion 0x0380, 0x03b0, 0x4040 JumpIfNot script_EzloTalkMinishPortal - ComparePlayerAction 0x0015 + ComparePlayerAction PLAYER_USEPORTAL JumpIf script_EzloTalkMinishPortal SetPlayerIdle Call sub_0807DF28 EndBlock - EzloMessage 0x2203 + EzloMessage TEXT_EZLO_PORTAL, 0x03 WaitUntilTextboxCloses -.ifdef JP - SetLocalFlag 0x003d -.else -.ifdef EU - SetLocalFlag 0x003d -.else -.ifdef DEMO_JP - SetLocalFlag 0x003d @ TODO deduplicate -.else - SetLocalFlag 0x003e -.endif -.endif -.endif + SetLocalFlag MORI_ENTRANCE_1ST Call sub_0807DF50 EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/minishWoods/script_Festari.inc b/data/scripts/minishWoods/script_Festari.inc index 0a79dea6..6ba566ec 100644 --- a/data/scripts/minishWoods/script_Festari.inc +++ b/data/scripts/minishWoods/script_Festari.inc @@ -23,12 +23,12 @@ script_0800C674: WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x000a script_0800C684: - CheckInventory1 0x0040 + CheckInventory1 ITEM_EARTH_ELEMENT JumpIf script_0800C730 - CheckInventory1 0x005b + CheckInventory1 ITEM_JABBERNUT JumpIf script_0800C6B6 DoPostScriptAction 0x0002 - MessageFromTarget 0x1f16 + MessageFromTarget TEXT_BELARI, 0x16 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -40,7 +40,7 @@ script_0800C6B6: CheckLocalFlag 0x0081 JumpIf script_0800C6DC DoPostScriptAction 0x0002 - MessageFromTarget 0x1f1b + MessageFromTarget TEXT_BELARI, 0x1b WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -51,7 +51,7 @@ script_0800C6DC: CheckLocalFlag 0x0082 JumpIf script_0800C712 DoPostScriptAction 0x0002 - MessageFromTarget 0x1f17 + MessageFromTarget TEXT_BELARI, 0x17 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -64,7 +64,7 @@ script_0800C6DC: SetLocalFlag 0x0082 script_0800C712: DoPostScriptAction 0x0002 - MessageFromTarget 0x1f18 + MessageFromTarget TEXT_BELARI, 0x18 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -75,7 +75,7 @@ script_0800C730: CheckLocalFlag 0x0083 JumpIf script_0800C756 DoPostScriptAction 0x0002 - MessageFromTarget 0x1f19 + MessageFromTarget TEXT_BELARI, 0x19 WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a @@ -84,7 +84,7 @@ script_0800C730: Jump script_0800C652 script_0800C756: DoPostScriptAction 0x0002 - MessageFromTarget 0x1f1a + MessageFromTarget TEXT_BELARI, 0x1a WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a diff --git a/data/scripts/minishWoods/script_ForestMinish10.inc b/data/scripts/minishWoods/script_ForestMinish10.inc index f7c4ebe6..8e5ac8ef 100644 --- a/data/scripts/minishWoods/script_ForestMinish10.inc +++ b/data/scripts/minishWoods/script_ForestMinish10.inc @@ -1,7 +1,7 @@ @ Minish Village ForestMinish at the back of the pico flowers SCRIPT_START script_ForestMinish10 BeginBlock - CheckInventory1 0x005b + CheckInventory1 ITEM_JABBERNUT JumpIfNot script_0800C5FE Call sub_08060090 DoPostScriptAction 0x000a @@ -20,103 +20,103 @@ script_0800CDA6: CheckLocalFlag 0x009d JumpIf script_0800CDC4 SetLocalFlag 0x009d - MessageNoOverlap 0x213d + MessageNoOverlap TEXT_FOREST_MINISH, 0x3d Jump script_0800CF40 script_0800CDC4: - CheckGlobalFlag 0x003b + CheckGlobalFlag DRUG_1 JumpIf script_0800CE46 - CheckGlobalFlag 0x0054 + CheckGlobalFlag DRUG_COUNT JumpIfNot script_0800CDEC CheckRoomFlag 0x0000 JumpIfNot script_0800CF2A - SetGlobalFlag 0x003b - ClearGlobalFlag 0x0054 - MessageNoOverlap 0x2141 + SetGlobalFlag DRUG_1 + ClearGlobalFlag DRUG_COUNT + MessageNoOverlap TEXT_FOREST_MINISH, 0x41 Jump script_0800CF40 script_0800CDEC: - MessageNoOverlap 0x213e + MessageNoOverlap TEXT_FOREST_MINISH, 0x3e WaitUntilTextboxCloses - CheckBottleContaining 0x0023 + CheckBottleContaining ITEM_BOTTLE_HALF_MILK JumpIfNot script_0800CE14 - MessageNoOverlap 0x214b + MessageNoOverlap TEXT_FOREST_MINISH, 0x4b WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE - _0807F088 0x0023 + InitItemGetSequence ITEM_BOTTLE_HALF_MILK WaitPlayerGetItem Jump script_0800CE32 script_0800CE14: - CheckBottleContaining 0x0022 + CheckBottleContaining ITEM_BOTTLE_MILK JumpIfNot script_0800CF40 - MessageNoOverlap 0x214b + MessageNoOverlap TEXT_FOREST_MINISH, 0x4b WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE - _0807F088 0x0022 + InitItemGetSequence ITEM_BOTTLE_MILK WaitPlayerGetItem script_0800CE32: FaceAwayFromPlayer - SetGlobalFlag 0x0054 + SetGlobalFlag DRUG_COUNT Call sub_08060340 - MessageNoOverlap 0x213f + MessageNoOverlap TEXT_FOREST_MINISH, 0x3f Jump script_0800CF02 script_0800CE46: - CheckGlobalFlag 0x003c + CheckGlobalFlag DRUG_2 JumpIf script_0800CEA6 - CheckGlobalFlag 0x0054 + CheckGlobalFlag DRUG_COUNT JumpIfNot script_0800CE6E CheckRoomFlag 0x0000 JumpIfNot script_0800CF2A - SetGlobalFlag 0x003c - ClearGlobalFlag 0x0054 - MessageNoOverlap 0x2145 + SetGlobalFlag DRUG_2 + ClearGlobalFlag DRUG_COUNT + MessageNoOverlap TEXT_FOREST_MINISH, 0x45 Jump script_0800CF40 script_0800CE6E: - MessageNoOverlap 0x2142 + MessageNoOverlap TEXT_FOREST_MINISH, 0x42 WaitUntilTextboxCloses - CheckBottleContaining 0x0027 + CheckBottleContaining ITEM_BOTTLE_MINERAL_WATER JumpIfNot script_0800CF40 - MessageNoOverlap 0x214c + MessageNoOverlap TEXT_FOREST_MINISH, 0x4c WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE - _0807F088 0x0027 + InitItemGetSequence ITEM_BOTTLE_MINERAL_WATER WaitPlayerGetItem FaceAwayFromPlayer - SetGlobalFlag 0x0054 + SetGlobalFlag DRUG_COUNT Call sub_08060340 - MessageNoOverlap 0x2143 + MessageNoOverlap TEXT_FOREST_MINISH, 0x43 Jump script_0800CF02 script_0800CEA6: - CheckGlobalFlag 0x003d + CheckGlobalFlag DRUG_3 JumpIf script_0800CF3C - CheckGlobalFlag 0x0054 + CheckGlobalFlag DRUG_COUNT JumpIfNot script_0800CECE CheckRoomFlag 0x0000 JumpIfNot script_0800CF2A - SetGlobalFlag 0x003d - ClearGlobalFlag 0x0054 - MessageNoOverlap 0x2149 + SetGlobalFlag DRUG_3 + ClearGlobalFlag DRUG_COUNT + MessageNoOverlap TEXT_FOREST_MINISH, 0x49 Jump script_0800CF40 script_0800CECE: - MessageNoOverlap 0x2146 + MessageNoOverlap TEXT_FOREST_MINISH, 0x46 WaitUntilTextboxCloses - CheckBottleContaining 0x0024 + CheckBottleContaining ITEM_BOTTLE_RED_POTION JumpIfNot script_0800CF40 - MessageNoOverlap 0x214d + MessageNoOverlap TEXT_FOREST_MINISH, 0x4d WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE - _0807F088 0x0024 + InitItemGetSequence ITEM_BOTTLE_RED_POTION WaitPlayerGetItem FaceAwayFromPlayer - SetGlobalFlag 0x0054 + SetGlobalFlag DRUG_COUNT Call sub_08060340 - MessageNoOverlap 0x2147 + MessageNoOverlap TEXT_FOREST_MINISH, 0x47 script_0800CF02: WaitUntilTextboxCloses Call sub_0807DF50 @@ -133,13 +133,13 @@ script_0800CF20: SetPlayerIdle Call sub_0807DF28 script_0800CF2A: - MessageNoOverlap 0x2140 + MessageNoOverlap TEXT_FOREST_MINISH, 0x40 WaitUntilTextboxCloses Call sub_0807DF50 EnablePlayerControl Jump script_0800CF0C script_0800CF3C: - MessageNoOverlap 0x214a + MessageNoOverlap TEXT_FOREST_MINISH, 0x4a script_0800CF40: WaitUntilTextboxCloses Call sub_0807DF50 diff --git a/data/scripts/minishWoods/script_Gentari.inc b/data/scripts/minishWoods/script_Gentari.inc index e032bf03..b9cd8c4e 100644 --- a/data/scripts/minishWoods/script_Gentari.inc +++ b/data/scripts/minishWoods/script_Gentari.inc @@ -10,12 +10,12 @@ script_0800C780: Call sub_0807DF28 StartPlayerScript script_PlayerAtGentari WaitForSyncFlagAndClear 0x00000001 - CheckInventory1 0x0040 + CheckInventory1 ITEM_EARTH_ELEMENT JumpIf script_0800C824 - CheckInventory1 0x005b + CheckInventory1 ITEM_JABBERNUT JumpIf script_0800C7C0 SetAnimation 0x0008 - MessageFromTarget 0x2122 + MessageFromTarget TEXT_FOREST_MINISH, 0x22 WaitUntilTextboxCloses DoPostScriptAction 0x0000 Call sub_0807DF50 @@ -25,16 +25,16 @@ script_0800C7C0: SetAnimation 0x0008 CheckLocalFlag 0x0081 JumpIf script_0800C80A - MessageFromTarget 0x1130 + MessageFromTarget TEXT_FINDING_EZLO, 0x30 WaitUntilTextboxCloses - EzloMessage 0x1131 + EzloMessage TEXT_FINDING_EZLO, 0x31 WaitUntilTextboxCloses FaceAwayFromPlayer - MessageFromTarget 0x1132 + MessageFromTarget TEXT_FINDING_EZLO, 0x32 WaitUntilTextboxCloses SetIntVariable 0x00000103 Call LoadMenu - MessageFromTarget 0x1133 + MessageFromTarget TEXT_FINDING_EZLO, 0x33 WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 @@ -43,7 +43,7 @@ script_0800C7C0: EnablePlayerControl Jump script_0800C780 script_0800C80A: - MessageFromTarget 0x1133 + MessageFromTarget TEXT_FINDING_EZLO, 0x33 WaitUntilTextboxCloses Wait 0x000a SetAnimation 0x0000 @@ -54,7 +54,7 @@ script_0800C824: SetAnimation 0x0008 CheckLocalFlag 0x0083 JumpIf script_0800C8AE - MessageFromTarget 0x1135 + MessageFromTarget TEXT_FINDING_EZLO, 0x35 WaitUntilTextboxCloses SetEntitySpeed 0x0040 _0807EDD4 0x0038, 0x0044 @@ -66,9 +66,9 @@ script_0800C824: Wait 0x003c FacePlayer FaceAwayFromPlayer - MessageFromTarget 0x1136 + MessageFromTarget TEXT_FINDING_EZLO, 0x36 WaitUntilTextboxCloses - EzloMessage 0x1137 + EzloMessage TEXT_FINDING_EZLO, 0x37 WaitUntilTextboxCloses Wait 0x000a SetAnimationState 0x0004 @@ -82,7 +82,7 @@ script_0800C87C: FacePlayer SetIntVariable 0x00000008 Call sub_0807F3D8 - MessageFromTarget 0x1136 + MessageFromTarget TEXT_FINDING_EZLO, 0x36 WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 @@ -90,7 +90,7 @@ script_0800C87C: EnablePlayerControl Jump script_0800C87C script_0800C8AE: - MessageFromTarget 0x1136 + MessageFromTarget TEXT_FINDING_EZLO, 0x36 WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 diff --git a/data/scripts/minishWoods/script_Object69PotionBlue.inc b/data/scripts/minishWoods/script_Object69PotionBlue.inc index 6f865f7f..c61be4e8 100644 --- a/data/scripts/minishWoods/script_Object69PotionBlue.inc +++ b/data/scripts/minishWoods/script_Object69PotionBlue.inc @@ -7,22 +7,22 @@ script_08016146: CheckEntityInteractType JumpIfNot script_08016146 SetPlayerIdle - GetInventoryValue 0x0025 - MessageFromTargetTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 + GetInventoryValue ITEM_BOTTLE_BLUE_POTION + MessageFromTargetTable TEXT_SYRUP << 8 | 0x03, TEXT_SYRUP << 8 | 0x02, TEXT_SYRUP << 8 | 0x02, TEXT_SYRUP << 8 | 0x02 CheckTextboxResult JumpIfNot script_0801618A - CheckBottleContaining 0x0020 + CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIf script_08016172 - MessageFromTarget 0x2d0c + MessageFromTarget TEXT_SYRUP, 0x0c Jump script_0801618A script_08016172: - BuyItem 0x0025, 0x0000 + BuyItem ITEM_BOTTLE_BLUE_POTION, 0x0000 JumpIf script_08016184 - MessageFromTarget 0x2d0b + MessageFromTarget TEXT_SYRUP, 0x0b Jump script_0801618A script_08016184: WaitPlayerGetItem - MessageFromTarget 0x2d06 + MessageFromTarget TEXT_SYRUP, 0x06 script_0801618A: EnablePlayerControl Jump script_08016146 diff --git a/data/scripts/minishWoods/script_Object69PotionRed.inc b/data/scripts/minishWoods/script_Object69PotionRed.inc index 7bd47121..ded6314e 100644 --- a/data/scripts/minishWoods/script_Object69PotionRed.inc +++ b/data/scripts/minishWoods/script_Object69PotionRed.inc @@ -7,27 +7,27 @@ script_0801619A: CheckEntityInteractType JumpIfNot script_0801619A SetPlayerIdle - GetInventoryValue 0x0024 - MessageFromTargetTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 + GetInventoryValue ITEM_BOTTLE_RED_POTION + MessageFromTargetTable TEXT_SYRUP << 8 | 0x05, TEXT_SYRUP << 8 | 0x04, TEXT_SYRUP << 8 | 0x04, TEXT_SYRUP << 8 | 0x04 CheckTextboxResult JumpIfNot script_080161E2 - CheckBottleContaining 0x0020 + CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIf script_080161C6 - MessageFromTarget 0x2d0c + MessageFromTarget TEXT_SYRUP, 0x0c Jump script_080161E2 script_080161C6: - BuyItem 0x0024, 0x0000 + BuyItem ITEM_BOTTLE_RED_POTION, 0x0000 JumpIf script_080161D8 - MessageFromTarget 0x2d0b + MessageFromTarget TEXT_SYRUP, 0x0b Jump script_080161E2 script_080161D8: .ifndef EU WaitPlayerGetItem WaitUntilTextboxCloses FaceAwayFromPlayer - MessageNoOverlap 0x2d06 + MessageNoOverlap TEXT_SYRUP, 0x06 .else - MessageFromTarget 0x2d06 + MessageFromTarget TEXT_SYRUP, 0x06 .endif script_080161E2: EnablePlayerControl diff --git a/data/scripts/minishWoods/script_Syrup.inc b/data/scripts/minishWoods/script_Syrup.inc index 0f6d46a5..57a2af86 100644 --- a/data/scripts/minishWoods/script_Syrup.inc +++ b/data/scripts/minishWoods/script_Syrup.inc @@ -24,33 +24,33 @@ script_080160E0: EndBlock HasRoomItemForSale JumpIfNot script_0801611A - MessageFromTarget 0x2d07 + MessageFromTarget TEXT_SYRUP, 0x07 WaitUntilTextboxCloses CheckTextboxResult JumpIfNot script_08016132 - BuyItem 0x0000, 0x0000 + BuyItem ITEM_NONE, 0x0000 JumpIf script_0801610C - MessageFromTarget 0x2d0b + MessageFromTarget TEXT_SYRUP, 0x0b WaitUntilTextboxCloses Jump script_08016132 script_0801610C: WaitPlayerGetItem .ifndef EU FaceAwayFromPlayer - MessageFromTarget 0x2d0d + MessageFromTarget TEXT_SYRUP, 0x0d .else - MessageFromTarget 0x2d08 + MessageFromTarget TEXT_SYRUP, 0x08 .endif WaitUntilTextboxCloses Jump script_08016132 script_0801611A: - CheckKinstoneFused 0x0014 + CheckKinstoneFused KINSTONE_14 JumpIfNot script_0801612C - MessageFromTarget 0x2d09 + MessageFromTarget TEXT_SYRUP, 0x09 WaitUntilTextboxCloses Jump script_08016132 script_0801612C: - MessageFromTarget 0x2d01 + MessageFromTarget TEXT_SYRUP, 0x01 WaitUntilTextboxCloses script_08016132: EnablePlayerControl diff --git a/data/scripts/mtCrenel/script_EzloTalkCoF.inc b/data/scripts/mtCrenel/script_EzloTalkCoF.inc index 61676e73..fe3c5a82 100644 --- a/data/scripts/mtCrenel/script_EzloTalkCoF.inc +++ b/data/scripts/mtCrenel/script_EzloTalkCoF.inc @@ -2,9 +2,9 @@ SCRIPT_START script_EzloTalkCoF SetPlayerIdle Call sub_0807DF28 - EzloMessage 0x1c02 + EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x02 WaitUntilTextboxCloses - SetLocalFlagByBank 0x0100, 0x0002 + SetLocalFlagByBank FLAG_BANK_1, 0x0002 Call sub_0807DF50 EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc index 828ff5c0..8cc43395 100644 --- a/data/scripts/mtCrenel/script_GreatFairyBombs.inc +++ b/data/scripts/mtCrenel/script_GreatFairyBombs.inc @@ -15,7 +15,7 @@ script_0800B734: WaitForSyncFlagAndClear 0x00000004 CheckLocalFlag 0x00a0 JumpIf script_0800B7A2 - MessageNoOverlap 0x0580 + MessageNoOverlap TEXT_ITEM_GET, 0x80 WaitUntilTextboxCloses CallWithArg CheckMessageEqual, 0x00000582 JumpIf script_0800B794 @@ -25,10 +25,10 @@ script_0800B734: script_0800B794: WaitUntilTextboxCloses SetLocalFlag 0x00a0 - GivePlayerItem 0x0065 + GivePlayerItem ITEM_BOMBBAG Jump script_0800B698 script_0800B7A2: - MessageNoOverlap 0x0590 + MessageNoOverlap TEXT_ITEM_GET, 0x90 WaitUntilTextboxCloses SetFadeTime 0x0010 SetFade7 @@ -36,7 +36,7 @@ script_0800B7A2: ModHealth 0x00a0 SetFade6 WaitForFadeFinish - MessageNoOverlap 0x057f + MessageNoOverlap TEXT_ITEM_GET, 0x7f WaitUntilTextboxCloses Jump script_0800B6A6 .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_Melari.inc b/data/scripts/mtCrenel/script_Melari.inc index cb6458fc..59c02f84 100644 --- a/data/scripts/mtCrenel/script_Melari.inc +++ b/data/scripts/mtCrenel/script_Melari.inc @@ -6,15 +6,15 @@ SCRIPT_START script_Melari SetAnimationState 0x0004 SetAnimation 0x0000 EndBlock - CheckInventory1 0x0041 + CheckInventory1 ITEM_FIRE_ELEMENT JumpIf script_0800CFD2 CheckLocalFlag 0x007e JumpIfNot script_0800CFD2 SetAnimation 0x0008 script_0800CFD2: - CheckInventory1 0x0002 + CheckInventory1 ITEM_GREEN_SWORD JumpIf script_0800CFFA - CheckInventory1 0x0041 + CheckInventory1 ITEM_FIRE_ELEMENT JumpIfNot script_0800CFEC SetSyncFlag 0x00000020 Jump script_0800CFFA @@ -31,22 +31,22 @@ script_0800CFFA: EndBlock SetPlayerIdle Call sub_0807DF28 - CheckInventory1 0x0002 + CheckInventory1 ITEM_GREEN_SWORD JumpIfNot script_0800D032 FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 - MessageNoOverlap 0x1219 + MessageNoOverlap TEXT_MINISH2, 0x19 Jump script_0800D17C script_0800D032: - CheckInventory1 0x0041 + CheckInventory1 ITEM_FIRE_ELEMENT JumpIfNot script_0800D098 StartPlayerScript script_PlayerAtMelari WaitForSyncFlagAndClear 0x00000008 FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 - MessageFromTargetPos 0x125c, 0x0002 + MessageFromTargetPos TEXT_MINISH2, 0x5c, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerPlaceBrokenSword WaitForSyncFlagAndClear 0x00000008 @@ -57,12 +57,12 @@ script_0800D032: SetSyncFlag 0x00000020 StartPlayerScript script_PlayerGetWhiteSword WaitForSyncFlagAndClear 0x00000008 - MessageFromTargetPos 0x125d, 0x0002 + MessageFromTargetPos TEXT_MINISH2, 0x5d, 0x0002 Jump script_0800D17C script_0800D098: CheckLocalFlag 0x007e JumpIfNot script_0800D0A8 - MessageFromTarget 0x123e + MessageFromTarget TEXT_MINISH2, 0x3e Jump script_0800D17C script_0800D0A8: StartPlayerScript script_PlayerAtMelari @@ -74,7 +74,7 @@ script_0800D0A8: FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 - MessageFromTargetPos 0x123d, 0x0002 + MessageFromTargetPos TEXT_MINISH2, 0x3d, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerPlaceBrokenSword WaitForSyncFlagAndClear 0x00000008 @@ -84,12 +84,12 @@ script_0800D0A8: PlaySound SFX_TASK_COMPLETE Call sub_08068964 script_0800D108: - ComparePlayerAction 0x0008 + ComparePlayerAction PLAYER_ITEMGET JumpIf script_0800D108 PlaySound SFX_F8 SetSyncFlag 0x00000010 SetLocalFlag 0x007e - MessageFromTargetPos 0x123e, 0x0002 + MessageFromTargetPos TEXT_MINISH2, 0x3e, 0x0002 WaitUntilTextboxCloses Wait 0x000f SetAnimation 0x0009 @@ -98,7 +98,7 @@ script_0800D108: SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 Wait 0x001e - MessageFromTargetPos 0x123f, 0x0002 + MessageFromTargetPos TEXT_MINISH2, 0x3f, 0x0002 WaitUntilTextboxCloses SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000004 @@ -107,7 +107,7 @@ script_0800D108: SetAnimation 0x0008 Wait 0x003c Call sub_08095164 - EzloMessage 0x1240 + EzloMessage TEXT_MINISH2, 0x40 script_0800D17C: WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/mtCrenel/script_MelariInRoom.inc b/data/scripts/mtCrenel/script_MelariInRoom.inc index a8e7e283..3e5b9e8a 100644 --- a/data/scripts/mtCrenel/script_MelariInRoom.inc +++ b/data/scripts/mtCrenel/script_MelariInRoom.inc @@ -17,7 +17,7 @@ script_0800D31E: FacePlayer SetIntVariable 0x00000000 Call sub_0806C028 - MessageFromTarget 0x1219 + MessageFromTarget TEXT_MINISH2, 0x19 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/mtCrenel/script_MountainMinish3.inc b/data/scripts/mtCrenel/script_MountainMinish3.inc index 59268025..a1d0f57c 100644 --- a/data/scripts/mtCrenel/script_MountainMinish3.inc +++ b/data/scripts/mtCrenel/script_MountainMinish3.inc @@ -5,7 +5,7 @@ SCRIPT_START script_MountainMinish3 DoPostScriptAction 0x000a EndBlock script_0800D282: - CheckInventory1 0x0041 + CheckInventory1 ITEM_FIRE_ELEMENT JumpIf script_0800D292 CheckLocalFlag 0x007e JumpIf script_0800D2EA diff --git a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc b/data/scripts/mtCrenel/script_Object6ABrokenSword.inc index 8a738321..86a041b4 100644 --- a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc +++ b/data/scripts/mtCrenel/script_Object6ABrokenSword.inc @@ -1,7 +1,7 @@ @ Mines OBJECT_6A Broken Sword on Table? SCRIPT_START script_Object6ABrokenSword BeginBlock - CheckInventory1 0x0041 + CheckInventory1 ITEM_FIRE_ELEMENT JumpIf script_0800D24C CheckLocalFlag 0x007e JumpIf script_0800D242 diff --git a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc index 0dde5b0a..2989fde6 100644 --- a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc +++ b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc @@ -1,11 +1,11 @@ @ Mines Player get white sword SCRIPT_START script_PlayerGetWhiteSword - SetInventoryValue 0x0002, 0x0001 - CallWithArg PutItemAnySlot, 0x00000002 + SetInventoryValue ITEM_GREEN_SWORD, 0x0001 + CallWithArg PutItemAnySlot, ITEM_GREEN_SWORD PlaySound SFX_ITEM_GET CallWithArg SetPlayerAnimation2, 0x000001e2 Call WaitForPlayerAnim - MessageNoOverlap 0x0502 + MessageNoOverlap TEXT_ITEM_GET, 0x02 WaitUntilTextboxCloses SetSyncFlag 0x00000008 Call SetPlayerActionNormal diff --git a/data/scripts/northHyruleField/script_Object69FixBridge.inc b/data/scripts/northHyruleField/script_Object69FixBridge.inc index e7fca431..5f3afa2b 100644 --- a/data/scripts/northHyruleField/script_Object69FixBridge.inc +++ b/data/scripts/northHyruleField/script_Object69FixBridge.inc @@ -1,19 +1,7 @@ @ Outside Caste OBJECT_69 Fix bridge SCRIPT_START script_Object69FixBridge BeginBlock -.ifdef JP - SetLocalFlag 0x008c -.else -.ifdef EU - SetLocalFlag 0x008c -.else -.ifdef DEMO_JP - SetLocalFlag 0x008c @ TODO deduplicate -.else - SetLocalFlag 0x008e -.endif -.endif -.endif + SetLocalFlag SOUGEN_06_SLIDE SetPlayerIdle MoveEntityToPlayer CameraTargetEntity diff --git a/data/scripts/npc/script_ForestMinish12.inc b/data/scripts/npc/script_ForestMinish12.inc index 944ee213..f407e417 100644 --- a/data/scripts/npc/script_ForestMinish12.inc +++ b/data/scripts/npc/script_ForestMinish12.inc @@ -6,5 +6,5 @@ SCRIPT_START script_ForestMinish12 script_080165FE: FacePlayerAndCheckDist JumpIfNot script_080165FE - MessageFromTarget 0x0601 + MessageFromTarget TEXT_LOCATIONS, 0x01 Jump script_080165FE diff --git a/data/scripts/npc/script_ForestMinish13.inc b/data/scripts/npc/script_ForestMinish13.inc index 448f7c85..00460f2c 100644 --- a/data/scripts/npc/script_ForestMinish13.inc +++ b/data/scripts/npc/script_ForestMinish13.inc @@ -6,7 +6,7 @@ SCRIPT_START script_ForestMinish13 script_08016612: TriggerInteract SetPlayerIdle - MessageFromTarget 0x0602 + MessageFromTarget TEXT_LOCATIONS, 0x02 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/npc/script_ForestMinish14.inc b/data/scripts/npc/script_ForestMinish14.inc index 6fb1a794..b810cb1f 100644 --- a/data/scripts/npc/script_ForestMinish14.inc +++ b/data/scripts/npc/script_ForestMinish14.inc @@ -6,7 +6,7 @@ SCRIPT_START script_ForestMinish14 script_0801662E: TriggerInteract SetPlayerIdle - EzloMessage 0x0603 + EzloMessage TEXT_LOCATIONS, 0x03 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc index f877881f..d5ea4160 100644 --- a/data/scripts/npc/script_TingleSiblings.inc +++ b/data/scripts/npc/script_TingleSiblings.inc @@ -14,11 +14,11 @@ script_0801690A: Call sub_08064F28 WaitUntilTextboxCloses JumpIfNot script_08016926 - GivePlayerItem 0x003d + GivePlayerItem ITEM_QST_TINGLE_TROPHY WaitPlayerGetItem script_08016926: EnablePlayerControl - SetGlobalFlag 0x005c + SetGlobalFlag TINGLE_TALK1ST Jump script_0801690A BeginBlock _0807E9D4 @@ -29,7 +29,7 @@ script_0801693E: TriggerInteract SetPlayerIdle Wait 0x0018 - MessageFromTarget 0x0a01 + MessageFromTarget TEXT_EMPTY, 0x01 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl @@ -45,7 +45,7 @@ script_0801696A: TriggerInteract SetPlayerIdle Wait 0x0018 - MessageFromTarget 0x0a01 + MessageFromTarget TEXT_EMPTY, 0x01 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/npc/script_Windcrest.inc b/data/scripts/npc/script_Windcrest.inc index bc49eddd..09d94fef 100644 --- a/data/scripts/npc/script_Windcrest.inc +++ b/data/scripts/npc/script_Windcrest.inc @@ -11,35 +11,35 @@ script_0800B024: JumpIfNot script_0800B024 SetPlayerIdle Call sub_0807DF28 - CheckGlobalFlag 0x0052 + CheckGlobalFlag WARP_1ST JumpIf script_0800B082 - CheckGlobalFlag 0x0053 + CheckGlobalFlag WARP_MONUMENT JumpIf script_0800B064 - MessageNoOverlap 0x3f32 + MessageNoOverlap TEXT_TINGLE, 0x32 WaitUntilTextboxCloses DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c - EzloMessage 0x0b5c + EzloMessage TEXT_EZLO, 0x5c WaitUntilTextboxCloses - SetGlobalFlag 0x0053 + SetGlobalFlag WARP_MONUMENT Jump script_0800B09C script_0800B064: - MessageNoOverlap 0x3f32 + MessageNoOverlap TEXT_TINGLE, 0x32 WaitUntilTextboxCloses DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c - EzloMessage 0x0b5d + EzloMessage TEXT_EZLO, 0x5d WaitUntilTextboxCloses Jump script_0800B09C script_0800B082: - MessageNoOverlap 0x3f32 + MessageNoOverlap TEXT_TINGLE, 0x32 WaitUntilTextboxCloses DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c - EzloMessage 0x0b5e + EzloMessage TEXT_EZLO, 0x5e WaitUntilTextboxCloses script_0800B09C: Call sub_0807DF50 diff --git a/data/scripts/sanctuary/script_08013F94.inc b/data/scripts/sanctuary/script_08013F94.inc index 4dc3b9e0..473b9fa3 100644 --- a/data/scripts/sanctuary/script_08013F94.inc +++ b/data/scripts/sanctuary/script_08013F94.inc @@ -8,16 +8,16 @@ SCRIPT_START script_08013F94 script_08013FA4: EndBlock BeginBlock - CheckInventory1 0x0003 + CheckInventory1 ITEM_RED_SWORD JumpIfNot script_08013FA4 - CheckPlayerFlags 0x00400000 + CheckPlayerFlags PL_CLONING JumpIfNot script_08013FA4 EndBlock Call WaitForPlayerNormalOrTalkEzlo DisablePlayerControl Call sub_0807DF38 Wait 0x0078 - EzloMessage 0x1505 + EzloMessage TEXT_PANEL_TUTORIAL, 0x05 WaitUntilTextboxCloses SetLocalFlag 0x007d Call sub_0807DF50 diff --git a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc index 8dca707e..2cfbd8b8 100644 --- a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc +++ b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc @@ -10,7 +10,7 @@ script_08013FF0: JumpIf script_0801404C CheckLocalFlag 0x007a JumpIfNot script_08013FF0 - CheckInventory1 0x0003 + CheckInventory1 ITEM_RED_SWORD JumpIfNot script_08013FF0 CallWithArg sub_0807F6B4, 0x000000d0 JumpIfNot script_08013FF0 @@ -20,7 +20,7 @@ script_08013FF0: SetPlayerIdle Call sub_0807DF28 EndBlock - EzloMessage 0x1508 + EzloMessage TEXT_PANEL_TUTORIAL, 0x08 WaitUntilTextboxCloses StartPlayerScript script_PlayerSanctuary WaitForSyncFlagAndClear 0x00000001 diff --git a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc index d5c22881..46d7f708 100644 --- a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc +++ b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc @@ -23,7 +23,7 @@ SCRIPT_START script_Npc4EFinalSwordRumble MoveEntityToPlayer CameraTargetEntity Wait 0x003c - EzloMessage 0x1502 + EzloMessage TEXT_PANEL_TUTORIAL, 0x02 WaitUntilTextboxCloses _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc index b4c53e85..ee42d5ef 100644 --- a/data/scripts/sanctuary/script_Npc4EPedestal.inc +++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc @@ -52,7 +52,7 @@ script_080134F8: Wait 0x003c StartPlayerScript script_PlayerPickUpSword SetSyncFlag 0x00000080 - SetInventoryValue 0x0003, 0x0001 + SetInventoryValue ITEM_RED_SWORD, 0x0001 Call NPC4E_SaveEquippedItems Call NPC4E_RestoreEquippedItems Call WaitForPlayerAnim @@ -67,7 +67,7 @@ script_080134F8: SetFade6 WaitForFadeFinish PlaySound SFX_ITEM_GET - MessageFromTargetPos 0x0503, 0x000c + MessageFromTargetPos TEXT_ITEM_GET, 0x03, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00040000 CallWithArg CreateManager36, 0x00000001 diff --git a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc index 11af2ca2..5a51a5df 100644 --- a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc +++ b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc @@ -7,7 +7,7 @@ script_08013B1E: BeginBlock CallWithArg sub_0807F6B4, 0x000001c8 JumpIfNot script_08013B1E - CheckInventory1 0x0006 + CheckInventory1 ITEM_FOURSWORD JumpIfNot script_08013B1E CheckLocalFlag 0x0078 JumpIf script_08013B1E @@ -15,7 +15,7 @@ script_08013B1E: SetPlayerIdle Call WaitForPlayerNormal Call sub_0807DF28 - EzloMessage 0x1507 + EzloMessage TEXT_PANEL_TUTORIAL, 0x07 WaitUntilTextboxCloses StartPlayerScript script_PlayerSanctuary WaitForSyncFlagAndClear 0x00000001 diff --git a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc index df1b5847..c6d2b619 100644 --- a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc +++ b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc @@ -17,7 +17,7 @@ script_08013CA6: _0807F0B4 0x0004 CameraTargetPlayer Call WaitForCameraTouchRoomBorder - EzloMessage 0x1504 + EzloMessage TEXT_PANEL_TUTORIAL, 0x04 WaitUntilTextboxCloses SetLocalFlag 0x0079 Call sub_0807DF50 diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc index 5953b17b..46453d34 100644 --- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc @@ -55,7 +55,7 @@ script_0801373C: Wait 0x003c StartPlayerScript script_PlayerPickUpSword SetSyncFlag 0x00000080 - SetInventoryValue 0x0004, 0x0001 + SetInventoryValue ITEM_BLUE_SWORD, 0x0001 Call NPC4E_SaveEquippedItems Call NPC4E_RestoreEquippedItems Call WaitForPlayerAnim @@ -70,7 +70,7 @@ script_0801373C: SetFade6 WaitForFadeFinish PlaySound SFX_ITEM_GET - MessageFromTargetPos 0x0504, 0x000c + MessageFromTargetPos TEXT_ITEM_GET, 0x04, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00040000 SetLocalFlag 0x007b diff --git a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc index 4c913d06..4ba0ef71 100644 --- a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc +++ b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc @@ -12,7 +12,7 @@ SCRIPT_START script_Npc4ESpawnTextBoard _0807F0C8 0x0000, 0x0000 StartPlayerScript script_PlayerTextBoardAppears WaitForSyncFlagAndClear 0x00000002 - EzloMessage 0x1501 + EzloMessage TEXT_PANEL_TUTORIAL, 0x01 WaitUntilTextboxCloses _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index ecbbcb7b..02c82868 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -59,7 +59,7 @@ script_080138D0: Wait 0x003c StartPlayerScript script_PlayerPickUpFinalSword SetSyncFlag 0x00000080 - SetInventoryValue 0x0006, 0x0001 + SetInventoryValue ITEM_FOURSWORD, 0x0001 Call UpdatePlayerSkills Call NPC4E_SaveEquippedItems Call NPC4E_RestoreEquippedItems @@ -75,7 +75,7 @@ script_080138D0: SetFade6 WaitForFadeFinish PlaySound SFX_ITEM_GET - MessageFromTargetPos 0x0505, 0x000c + MessageFromTargetPos TEXT_ITEM_GET, 0x05, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00040000 .ifndef EU diff --git a/data/scripts/sanctuary/script_Object6ATextBoard.inc b/data/scripts/sanctuary/script_Object6ATextBoard.inc index 63469b76..43b5a709 100644 --- a/data/scripts/sanctuary/script_Object6ATextBoard.inc +++ b/data/scripts/sanctuary/script_Object6ATextBoard.inc @@ -3,13 +3,13 @@ SCRIPT_START script_Object6ATextBoard BeginBlock CheckLocalFlag 0x007a JumpIf script_08013C2A - CheckInventory1 0x0003 + CheckInventory1 ITEM_RED_SWORD JumpIf script_08013C2A - CheckInventory1 0x0002 + CheckInventory1 ITEM_GREEN_SWORD JumpIfNot script_08013C98 - CheckInventory1 0x0040 + CheckInventory1 ITEM_EARTH_ELEMENT JumpIfNot script_08013C98 - CheckInventory1 0x0041 + CheckInventory1 ITEM_FIRE_ELEMENT JumpIfNot script_08013C98 EndBlock DoPostScriptAction 0x0008 @@ -42,10 +42,10 @@ script_08013C58: FacePlayer CheckLocalFlag 0x007d JumpIf script_08013C82 - EzloMessage 0x1501 + EzloMessage TEXT_PANEL_TUTORIAL, 0x01 Jump script_08013C86 script_08013C82: - EzloMessage 0x1506 + EzloMessage TEXT_PANEL_TUTORIAL, 0x06 script_08013C86: WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/southHyruleField/script_ForestMinish2.inc b/data/scripts/southHyruleField/script_ForestMinish2.inc index aa4f65ab..5fa3a178 100644 --- a/data/scripts/southHyruleField/script_ForestMinish2.inc +++ b/data/scripts/southHyruleField/script_ForestMinish2.inc @@ -14,7 +14,7 @@ script_0800C592: script_0800C5A6: EndBlock SetPlayerIdle - CheckInventory1 0x0067 + CheckInventory1 ITEM_KINSTONE_BAG JumpIfNot script_0800C5BC Call sub_08060208 Jump script_0800C5C0 diff --git a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc index 95402c27..67767627 100644 --- a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc +++ b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc @@ -8,7 +8,7 @@ script_08009DF0: SetPlayerIdle Call WaitForPlayerNormal Wait 0x0008 - EzloMessage 0x3207 + EzloMessage TEXT_SMITH, 0x07 CheckTextboxResult JumpIfNot script_08009E4E Call sub_0807DF28 @@ -19,7 +19,7 @@ script_08009DF0: Wait 0x001e SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - EzloMessage 0x3209 + EzloMessage TEXT_SMITH, 0x09 Wait 0x000f WaitUntilTextboxCloses EnablePlayerControl diff --git a/data/scripts/unused/script_0800B828.inc b/data/scripts/unused/script_0800B828.inc index 944d257b..89a36e66 100644 --- a/data/scripts/unused/script_0800B828.inc +++ b/data/scripts/unused/script_0800B828.inc @@ -8,7 +8,7 @@ SCRIPT_START script_0800B828 script_0800B836: TriggerInteract SetPlayerIdle - MessageFromTarget 0x0a01 + MessageFromTarget TEXT_EMPTY, 0x01 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl @@ -45,7 +45,7 @@ script_0800B89E: JumpIfNot script_0800B89E SetPlayerIdle FacePlayer - MessageFromTarget 0x0a01 + MessageFromTarget TEXT_EMPTY, 0x01 WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl diff --git a/data/scripts/unused/script_08012C68.inc b/data/scripts/unused/script_08012C68.inc index ee6b94d7..a0701123 100644 --- a/data/scripts/unused/script_08012C68.inc +++ b/data/scripts/unused/script_08012C68.inc @@ -11,9 +11,9 @@ script_08012C7E: JumpIfNot script_08012C7E SetPlayerIdle _0807E8E4_0 - MessageFromTarget 0x111d + MessageFromTarget TEXT_FINDING_EZLO, 0x1d WaitUntilTextboxCloses - SetGlobalFlag 0x0022 + SetGlobalFlag ENTRANCE_OK EnablePlayerControl Jump script_08012C7E diff --git a/data/scripts/unused/script_08016384.inc b/data/scripts/unused/script_08016384.inc index c76c83cd..b1975a48 100644 --- a/data/scripts/unused/script_08016384.inc +++ b/data/scripts/unused/script_08016384.inc @@ -14,49 +14,37 @@ SCRIPT_START script_08016384 CallWithArg script_08016384, 0x12345678 LoadRoomEntityList script_08016384 CheckSyncFlagAndClear 0x00000001 - CheckInventory1 0x0001 - CheckInventory2 0x0001 + CheckInventory1 ITEM_SMITH_SWORD + CheckInventory2 ITEM_SMITH_SWORD HasRoomItemForSale CheckLocalFlag 0x0067 -.ifdef JP - CheckLocalFlagByBank 0x0100, 0x0069 -.else -.ifdef EU - CheckLocalFlagByBank 0x0100, 0x0069 -.else -.ifdef DEMO_JP - CheckLocalFlagByBank 0x0100, 0x0069 @ TODO deduplicate -.else - CheckLocalFlagByBank 0x0100, 0x006b -.endif -.endif -.endif - CheckGlobalFlag 0x0013 + CheckLocalFlagByBank FLAG_BANK_1, SOUGEN_01_00 + CheckGlobalFlag START CheckRoomFlag 0x0000 CheckPlayerInRegion 0x0000, 0x0000, 0x0000 CheckPlayerInRegion2 0x0000 CheckEntityInteractType FacePlayerAndCheckDist - HasRupees 0x00c8 + HasRupees 200 CheckTextboxResult - CheckKinstoneFused 0x0001 - BuyItem 0x006c, 0x0000 - CheckBottleContaining 0x0020 + CheckKinstoneFused KINSTONE_1 + BuyItem ITEM_BOMBS10, 0x0000 + CheckBottleContaining ITEM_BOTTLE_EMPTY VariableBitSet 0x00000000 VariableOnlyBitSet 0x00000000 VariableEqual 0x00000000 - CheckPlayerFlags 0x00000080 + CheckPlayerFlags PL_MINISH CheckPlayerMinish EntityHasHeight - ComparePlayerAction 0x0001 + ComparePlayerAction PLAYER_NORMAL ComparePlayerAnimationState 0x0004 SetSyncFlag 0x00000001 ClearSyncFlag 0x00000002 SetLocalFlag 0x0067 - SetLocalFlagByBank 0x0100, 0x0001 + SetLocalFlagByBank FLAG_BANK_1, 0x0001 ClearLocalFlag 0x0067 - SetGlobalFlag 0x0013 - ClearGlobalFlag 0x0013 + SetGlobalFlag START + ClearGlobalFlag START SetRoomFlag 0x0000 ClearRoomFlag 0x0000 Wait 0x001e diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc index 9ceb5e3a..e25f9903 100644 --- a/data/scripts/unused/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -30,12 +30,12 @@ SCRIPT_START script_08016482 _0807E9E4 0x0000 _0807EA88 0x0001 WaitUntilTextboxCloses - MessageFromTarget 0x0601 + MessageFromTarget TEXT_LOCATIONS, 0x01 MessageNoOverlap 0x0601 - MessageFromTargetPos_1 0x0601 - MessageFromTargetTable 0x0601, 0x0602, 0x0603 + MessageFromTargetPos_1 TEXT_LOCATIONS, 0x01 + MessageFromTargetTable TEXT_LOCATIONS << 8 | 0x01, TEXT_LOCATIONS << 8 | 0x02, TEXT_LOCATIONS << 8 | 0x03 MessageNoOverlapVar - EzloMessage 0x0602 + EzloMessage TEXT_LOCATIONS, 0x02 _0807EB38 SetAnimationState 0x0000 _0807EB4C 0x0000, 0x0000 @@ -63,16 +63,16 @@ SCRIPT_START script_08016482 DoPostScriptAction2 0x0001 PlaySound SFX_METAL_CLINK PlayBgm BGM_MINISH_WOODS - SoundReq 0x00000074 + SoundReq SFX_METAL_CLINK StopBgm - ModRupees 0xff38 + ModRupees -200 ModHealth 0x0010 IncreaseMaxHealth GiveKinstone 0x0001 - GivePlayerItem 0x0001 - GetInventoryValue 0x0001 - SetInventoryValue 0x0001, 0x0002 - _0807F088 0x0001 + GivePlayerItem ITEM_SMITH_SWORD + GetInventoryValue ITEM_SMITH_SWORD + SetInventoryValue ITEM_SMITH_SWORD, 0x0002 + InitItemGetSequence ITEM_SMITH_SWORD CameraTargetEntity CameraTargetPlayer _0807F0B4 0x0007 diff --git a/data/scripts/veilFalls/script_BigGoron3.inc b/data/scripts/veilFalls/script_BigGoron3.inc index 1718deb5..e06e322b 100644 --- a/data/scripts/veilFalls/script_BigGoron3.inc +++ b/data/scripts/veilFalls/script_BigGoron3.inc @@ -11,9 +11,9 @@ script_0800934E: Call sub_0806D638 _0807F0B4 0x0001 CameraTargetEntity - CheckGlobalFlag 0x0055 + CheckGlobalFlag GAMECLEAR JumpIf script_BigGoronTalk - MessageNoOverlap 0x1d01 + MessageNoOverlap TEXT_GORONS, 0x01 WaitUntilTextboxCloses script_08009376: WaitUntilTextboxCloses diff --git a/data/scripts/veilFalls/script_BigGoronMirrorShield.inc b/data/scripts/veilFalls/script_BigGoronMirrorShield.inc index 77923ffd..833adc03 100644 --- a/data/scripts/veilFalls/script_BigGoronMirrorShield.inc +++ b/data/scripts/veilFalls/script_BigGoronMirrorShield.inc @@ -6,24 +6,12 @@ SCRIPT_START script_BigGoronMirrorShield Wait 0x003c Call sub_0806D70C Wait 0x003c -.ifdef JP - ClearLocalFlag 0x00ac -.else -.ifdef EU - ClearLocalFlag 0x00ac -.else -.ifdef DEMO_JP - ClearLocalFlag 0x00ac @ TODO deduplicate -.else - ClearLocalFlag 0x00ae -.endif -.endif -.endif + ClearLocalFlag DAIGORON_EXCHG Call sub_0806D620 Wait 0x003c WaitPlayerGetItem FaceAwayFromPlayer - MessageNoOverlap 0x1d0c + MessageNoOverlap TEXT_GORONS, 0x0c WaitUntilTextboxCloses Wait 0x000a Jump script_08009376 diff --git a/data/scripts/veilFalls/script_BigGoronTalk.inc b/data/scripts/veilFalls/script_BigGoronTalk.inc index df44f817..c77e34ca 100644 --- a/data/scripts/veilFalls/script_BigGoronTalk.inc +++ b/data/scripts/veilFalls/script_BigGoronTalk.inc @@ -1,49 +1,25 @@ @ Veil Falls Talk to BigGoron SCRIPT_START script_BigGoronTalk -.ifdef JP - CheckLocalFlag 0x00ac -.else -.ifdef EU - CheckLocalFlag 0x00ac -.else -.ifdef DEMO_JP @ TODO deduplicate - CheckLocalFlag 0x00ac -.else - CheckLocalFlag 0x00ae -.endif -.endif -.endif + CheckLocalFlag DAIGORON_EXCHG JumpIf script_0800943E - CheckInventory1 0x000d + CheckInventory1 ITEM_SHIELD JumpIf script_080093BC - CheckInventory1 0x000e + CheckInventory1 ITEM_MIRROR_SHIELD JumpIf script_080093BC - MessageNoOverlap 0x1d02 + MessageNoOverlap TEXT_GORONS, 0x02 WaitUntilTextboxCloses Jump script_08009376 script_080093BC: - CheckInventory1 0x000e + CheckInventory1 ITEM_MIRROR_SHIELD JumpIfNot script_080093DA Call sub_0806D788 - MessageNoOverlap 0x1d03 + MessageNoOverlap TEXT_GORONS, 0x03 WaitUntilTextboxCloses Call sub_0806D70C Jump script_08009376 script_080093DA: SetIntVariable 0x00001d05 -.ifdef JP - CheckLocalFlag 0x00ab -.else -.ifdef EU - CheckLocalFlag 0x00ab -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00ab @ TODO deduplicate -.else - CheckLocalFlag 0x00ad -.endif -.endif -.endif + CheckLocalFlag DAIGORON_SHIELD JumpIf script_080093EE SetIntVariable 0x00001d04 script_080093EE: @@ -52,7 +28,7 @@ script_080093EE: CheckTextboxResult JumpIfNot script_08009376 Wait 0x001e - MessageNoOverlap 0x1d08 + MessageNoOverlap TEXT_GORONS, 0x08 WaitUntilTextboxCloses LoadRoomEntityList gUnk_080F9C38 Wait 0x0078 @@ -60,37 +36,22 @@ script_080093EE: Wait 0x00b4 Call sub_0806D70C Wait 0x0078 -.ifdef JP - SetLocalFlag 0x00ac - SetLocalFlag 0x00ab -.else -.ifdef EU - SetLocalFlag 0x00ac - SetLocalFlag 0x00ab -.else -.ifdef DEMO_JP - SetLocalFlag 0x00ac @ TODO deduplicate - SetLocalFlag 0x00ab -.else - SetLocalFlag 0x00ae - SetLocalFlag 0x00ad -.endif -.endif -.endif + SetLocalFlag DAIGORON_EXCHG + SetLocalFlag DAIGORON_SHIELD Call sub_0806D5D4 FaceAwayFromPlayer - MessageNoOverlap 0x1d09 + MessageNoOverlap TEXT_GORONS, 0x09 WaitUntilTextboxCloses Wait 0x000a Jump script_08009376 script_0800943E: Call sub_0806D600 JumpIf script_08009452 - MessageNoOverlap 0x1d0a + MessageNoOverlap TEXT_GORONS, 0x0a WaitUntilTextboxCloses JumpIfNot script_08009376 script_08009452: - MessageNoOverlap 0x1d0b + MessageNoOverlap TEXT_GORONS, 0x0b WaitUntilTextboxCloses Call sub_0806D74C _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc index 08f77eee..736af241 100644 --- a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc +++ b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc @@ -2,7 +2,7 @@ SCRIPT_START script_NPC4ESourceOfTheFlow BeginBlock Call sub_0806DB84 - CheckKinstoneFused 0x0009 + CheckKinstoneFused KINSTONE_9 JumpIf script_08016028 _0807EA88 0x0009 CallWithArg sub_0806DA04, 0x00000007 @@ -12,7 +12,7 @@ script_08015FE4: _0807EA4C _0807E9F0 SetPlayerIdle - CheckKinstoneFused 0x0009 + CheckKinstoneFused KINSTONE_9 JumpIf script_08015FFE Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc index 93cd157c..ce541b3c 100644 --- a/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc +++ b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc @@ -4,7 +4,7 @@ SCRIPT_START script_NPC4ESouurceOfTheFlowOpening WaitForSyncFlagAndClear 0x0000000c _0807F0C8 0x0000, 0x0000 PlaySound SFX_SECRET - EzloMessage 0x0b1f + EzloMessage TEXT_EZLO, 0x1f WaitUntilTextboxCloses Call sub_0807DF50 EnablePlayerControl diff --git a/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc b/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc index a8e0f613..05eff443 100644 --- a/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc +++ b/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc @@ -1,7 +1,7 @@ @ Waterfalls OBJECT_3E during kinstone cutscene? SCRIPT_START script_Object3ELeftStoneOpening BeginBlock - CheckKinstoneFused 0x0009 + CheckKinstoneFused KINSTONE_9 JumpIf script_Object3ELeftStone EndBlock WaitForSyncFlagAndClear 0x00000001 diff --git a/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc b/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc index 53d2fb10..a320d555 100644 --- a/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc +++ b/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc @@ -1,7 +1,7 @@ @ Waterfalls OBJECT_3E during kinstone cutscene? SCRIPT_START script_Object3ERightStoneOpening BeginBlock - CheckKinstoneFused 0x0009 + CheckKinstoneFused KINSTONE_9 JumpIf script_Object3ERightStone EndBlock WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/westernWood/script_MoblinLady.inc b/data/scripts/westernWood/script_MoblinLady.inc index 7c1fb498..df8e7fcf 100644 --- a/data/scripts/westernWood/script_MoblinLady.inc +++ b/data/scripts/westernWood/script_MoblinLady.inc @@ -10,12 +10,12 @@ script_08012338: JumpIfNot script_08012338 FacePlayer SetPlayerIdle - MessageFromTarget 0x2304 + MessageFromTarget TEXT_PERCY, 0x04 WaitUntilTextboxCloses CheckLocalFlag 0x0042 JumpIf script_0801235A SetLocalFlag 0x0042 - GivePlayerItem 0x0057 + GivePlayerItem ITEM_RUPEE50 WaitPlayerGetItem script_0801235A: EnablePlayerControl diff --git a/data/scripts/westernWood/script_MoblinLadyDisguised.inc b/data/scripts/westernWood/script_MoblinLadyDisguised.inc index 576f873d..4f0809c8 100644 --- a/data/scripts/westernWood/script_MoblinLadyDisguised.inc +++ b/data/scripts/westernWood/script_MoblinLadyDisguised.inc @@ -9,9 +9,9 @@ SCRIPT_START script_MoblinLadyDisguised script_08012284: EndBlock BeginBlock - CheckGlobalFlag 0x001e + CheckGlobalFlag DASHBOOTS JumpIfNot script_08012298 - CheckInventory1 0x0015 + CheckInventory1 ITEM_PEGASUS_BOOTS JumpIf script_080122BA script_08012298: CheckEntityInteractType @@ -20,10 +20,10 @@ script_08012298: FacePlayer SetPlayerIdle Call sub_08061FD8 - MessageFromTarget 0x2302 + MessageFromTarget TEXT_PERCY, 0x02 WaitUntilTextboxCloses EnablePlayerControl - SetGlobalFlag 0x001e + SetGlobalFlag DASHBOOTS Jump script_08012284 script_080122BA: EndBlock @@ -39,7 +39,7 @@ script_080122CE: FacePlayer SetPlayerIdle Call sub_08061FD8 - MessageFromTarget 0x2303 + MessageFromTarget TEXT_PERCY, 0x03 WaitUntilTextboxCloses EnablePlayerControl Jump script_080122BA diff --git a/data/scripts/windRuins/script_EzloTalkFoW.inc b/data/scripts/windRuins/script_EzloTalkFoW.inc index 8370f5ef..6c2cb205 100644 --- a/data/scripts/windRuins/script_EzloTalkFoW.inc +++ b/data/scripts/windRuins/script_EzloTalkFoW.inc @@ -2,9 +2,9 @@ SCRIPT_START script_EzloTalkFoW SetPlayerIdle Call sub_0807DF28 - EzloMessage 0x1c03 + EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x03 WaitUntilTextboxCloses - SetLocalFlagByBank 0x0100, 0x0003 + SetLocalFlagByBank FLAG_BANK_1, 0x0003 Call sub_0807DF50 EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc index b4e78dbb..4b05dec7 100644 --- a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc +++ b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc @@ -2,16 +2,16 @@ SCRIPT_START script_Npc4EReceiveOcarina BeginBlock DoPostScriptAction 0x0008 - CheckInventory1 0x0017 + CheckInventory1 ITEM_OCARINA JumpIf script_0800D924 EndBlock script_0800D8F4: - CheckInventory1 0x0017 + CheckInventory1 ITEM_OCARINA JumpIfNot script_0800D8F4 Call sub_0807DF28 SetPlayerIdle WaitPlayerGetItem - EzloMessage 0x1325 + EzloMessage TEXT_VAATI, 0x25 WaitUntilTextboxCloses PlaySound SFX_113 SetIntVariable 0x00000000 diff --git a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc index 7d205905..79244332 100644 --- a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc +++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc @@ -17,9 +17,9 @@ script_0800D88E: WaitForSyncFlagAndClear 0x00000001 script_0800D8B0: _0807E8E4_0 - MessageNoOverlap 0x1324 + MessageNoOverlap TEXT_VAATI, 0x24 WaitUntilTextboxCloses - CheckInventory1 0x0017 + CheckInventory1 ITEM_OCARINA JumpIf script_0800D8D6 CheckLocalFlag 0x0045 JumpIf script_0800D8D6 |