Enable battle animation for unit slot 40 (Merlinus -> Daros_pirate01). …

…#9.
laqieer · Aug 20, 2022 · 9db5708 · 9db5708
1 parent bc755ca
commit 9db5708
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/linkerscript/battle_animation.lds b/linkerscript/battle_animation.lds
@@ -2,7 +2,10 @@
 .rodata.fireDragonDetection1 : {*(.rodata.fireDragonDetection1)}
 . = 0x8052f6e;
 .rodata.fireDragonDetection2 : {*(.rodata.fireDragonDetection2)}
-
+. = 0x8052f54;
+.rodata.merlinusDetection1 : {*(.rodata.merlinusDetection1)}
+. = 0x8052f5e;
+.rodata.merlinusDetection2 : {*(.rodata.merlinusDetection2)}
 . = 0x8054850;
 .rodata.battleAnimationCompressionType1 : {*(.rodata.battleAnimationCompressionType1)}
 . = 0x80548ec;

diff --git a/source/battle_animation.c b/source/battle_animation.c
@@ -7,6 +7,11 @@
 cu16 fireDragonDetection1 = 0;
 cu16 fireDragonDetection2 = 0;
 
+// Remove force real animation off for Merlinus.
+
+cu16 merlinusDetection1 = 0;
+cu16 merlinusDetection2 = 0;
+
 // Support more data compression types.
 
 cu32 battleAnimationCompressionType1 = 0xFF1AF7BE;