Thunderstorm fix (#562)

FireEmblemUniverse · Nov 10, 2023 · 3ed2e49 · 3ed2e49
1 parent ed26bfe
commit 3ed2e49
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/EngineHacks/SkillSystem/Skills/PreBattleSkills/Thunderstorm/AssembleARM.bat b/EngineHacks/SkillSystem/Skills/PreBattleSkills/Thunderstorm/AssembleARM.bat
@@ -0,0 +1,20 @@
+@echo off
+
+SET startDir=C:\devkitPro\devkitARM\bin\
+
+@rem Assemble into an elf
+SET as="%startDir%arm-none-eabi-as"
+%as% -g -mcpu=arm7tdmi -mthumb-interwork %1 -o "%~n1.elf"
+
+@rem Print symbol table
+SET readelf="%startDir%arm-none-eabi-readelf"
+%readelf% -s "%~n1.elf" > "%~n1.symbols.log"
+
+@rem Extract raw assembly binary (text section) from elf
+SET objcopy="%startDir%arm-none-eabi-objcopy"
+%objcopy% -S "%~n1.elf" -O binary "%~n1.dmp"
+
+echo y | del "%~n1.elf"
+
+echo y | del "%~n1.symbols.log"
+pause
diff --git a/EngineHacks/SkillSystem/Skills/PreBattleSkills/Thunderstorm/Thunderstorm.dmp b/EngineHacks/SkillSystem/Skills/PreBattleSkills/Thunderstorm/Thunderstorm.dmp
diff --git a/EngineHacks/SkillSystem/Skills/PreBattleSkills/Thunderstorm/Thunderstorm.s b/EngineHacks/SkillSystem/Skills/PreBattleSkills/Thunderstorm/Thunderstorm.s
@@ -18,9 +18,10 @@ cmp r0, #0
 beq End
 
 @make sure we're in combat (or combat prep)
-ldrb r3, =gBattleData
+ldr r3, =gBattleData
 ldrb r3, [r3]
-cmp r3, #4
+mov r0, #0x4
+tst r3, r0
 beq End
 
 @store attacker weight in r6