Add BattleForcastFix

FireEmblemUniverse · Dec 15, 2024 · f9a4a70 · f9a4a70
1 parent f21a8c3
commit f9a4a70
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/Wizardry/Essentials/BattleForcastFix/BattleForcastFix.event b/Wizardry/Essentials/BattleForcastFix/BattleForcastFix.event
@@ -0,0 +1,11 @@
+#ifndef BATTLE_FORCAST_FIX_INSTALLED
+#define BATTLE_FORCAST_FIX_INSTALLED
+
+/**
+ * https://feuniverse.us/t/contros-code-collection/13514/15
+ */
+
+#include "Source/LynJump.event"
+#include "Source/BattleForcastFix.lyn.event"
+
+#endif // BATTLE_FORCAST_FIX_INSTALLED
diff --git a/Wizardry/Essentials/BattleForcastFix/Source/BattleForcastFix.c b/Wizardry/Essentials/BattleForcastFix/Source/BattleForcastFix.c
@@ -0,0 +1,15 @@
+#include <common-chax.h>
+
+/**
+ * Called in target-selection on cancel,
+ * Quite a dangrous bug on vanilla.
+ */
+LYN_REPLACE_CHECK(sub_8022E38);
+void sub_8022E38(void)
+{
+#if CHAX
+	ResetText();
+#endif
+
+	EnsureCameraOntoPosition(NULL, gActiveUnit->xPos, gActiveUnit->yPos);
+}
diff --git a/Wizardry/Essentials/BattleForcastFix/Source/LynJump.event b/Wizardry/Essentials/BattleForcastFix/Source/LynJump.event
@@ -0,0 +1,6 @@
+PUSH
+ORG $22e38
+ALIGN 4
+WORD $46C04778 $E59FC000 $E12FFF1C
+POIN sub_8022E38
+POP
diff --git a/Wizardry/Wizardry.event b/Wizardry/Wizardry.event
@@ -11,6 +11,7 @@ ALIGN 4
 #include "Essentials/RemoveMovePath/RemoveMovePath.event"
 #include "Essentials/UnitLimitation/UnitLimitation.event"
 #include "Essentials/BanimHpDrainFix/BanimHpDrainFix.event"
+#include "Essentials/BattleForcastFix/BattleForcastFix.event"
 
 #include "Common/OverflowDetection/OverflowDetection.lyn.event"
 #include "Common/AntiHuffman/AntiHuffman.event"