diff --git a/CREDITS.md b/CREDITS.md index dba7f83239..8dac121dd4 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -744,6 +744,7 @@ This page lists all the individual contributions to the project by their author. - Technos with Walk locomotor spawn wake like ship - Updateable firing anim - Fix the issue where the sidebar would not refresh when an unit dies in limbo + - Enable playing ingame movie in non-campaign modes (i.e. trigger action 100 and 117) - **solar-III (凤九歌)** - Target scanning delay customization (documentation) - Skip target scanning function calling for unarmed technos (documentation) diff --git a/YRpp b/YRpp index e8aa3af8ac..da6355e337 160000 --- a/YRpp +++ b/YRpp @@ -1 +1 @@ -Subproject commit e8aa3af8ac5743b79225f5b912f911b89ea5dbf6 +Subproject commit da6355e33754d9606ca2ba62e8915dcf403481d4 diff --git a/docs/Fixed-or-Improved-Logics.md b/docs/Fixed-or-Improved-Logics.md index a7f870a0d6..0bd04633bf 100644 --- a/docs/Fixed-or-Improved-Logics.md +++ b/docs/Fixed-or-Improved-Logics.md @@ -321,6 +321,7 @@ This page describes all ingame logics that are fixed or improved in Phobos witho - Fixed the incorrect mission switching in infantry EnterIdleMode. - Fixed the bug where technos with `BalloonHover=yes` incorrectly considered ground factors when setting the destination and distributing moving commands. Use `[General] -> BalloonHoverPathingFix=true` to enable this. - Fixed the issue where the sidebar would not refresh when an unit dies in limbo. +- Enable playing ingame movie in non-campaign modes (i.e. trigger action 100 and 117). ## Fixes / interactions with other extensions diff --git a/docs/Whats-New.md b/docs/Whats-New.md index ae4255d075..b590d7a11a 100644 --- a/docs/Whats-New.md +++ b/docs/Whats-New.md @@ -644,6 +644,7 @@ Vanilla fixes: - Fixed the incorrect mission switching in infantry EnterIdleMode (by TaranDahl) - Fix BalloonHover incorrectly considering ground factors when pathfinding (by TaranDahl) - Fixed the issue where the sidebar would not refresh when an unit dies in limbo (by TaranDahl) +- Enabled playing ingame movie in non-campaign modes (i.e. trigger action 100 and 117) (by TaranDahl) Phobos fixes: - Fixed the bug that `AllowAirstrike=no` cannot completely prevent air strikes from being launched against it (by NetsuNegi) diff --git a/src/Ext/TAction/Hooks.cpp b/src/Ext/TAction/Hooks.cpp index 5e4580f160..a1176555d7 100644 --- a/src/Ext/TAction/Hooks.cpp +++ b/src/Ext/TAction/Hooks.cpp @@ -119,3 +119,6 @@ DEFINE_HOOK(0x6E2368, TActionClass_PlayAnimAt, 0x7) return SkipGameCode; } + +// Enable InGameMovie TAction in non-campaign mode. +DEFINE_JUMP(LJMP, 0x5BF3B0, 0x5BF3BD);