diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-05-17 14:35:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-17 14:35:16 -0700 |
| commit | 3afbd0e9012be95e687ccb36eb62f6df08cded19 (patch) | |
| tree | 00b83f84cdefeaa6d4e334d3154278589bdb76b5 /data/scripts/cutscene | |
| parent | 393db92f245c93927fd402738db8a04f61e0d56d (diff) | |
| parent | aceb014a82c89fd1783dc13e7eb3cffc26ac4ca4 (diff) | |
Merge pull request #516 from hatal175/enumasm
Initial version of enum extractor script
Diffstat (limited to 'data/scripts/cutscene')
47 files changed, 184 insertions, 340 deletions
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 |