Merge pull request #24 from Elagatua/feature/dev-merge-to-fix-biggoron

Dev merge to fix biggoron always hint
fenhl · Sep 22, 2022 · f9d011a · f9d011a
2 parents 5e5b7cc + 166d185
commit f9d011a
Show file tree

Hide file tree

Showing 25 changed files with 1,548 additions and 1,407 deletions.
diff --git a/ASM/build/asm_symbols.txt b/ASM/build/asm_symbols.txt
diff --git a/ASM/src/damage.asm b/ASM/src/damage.asm
@@ -13,14 +13,17 @@ Apply_Damage_Multiplier:
 
     bltz    t7, @@DivDamage
     li      at, 3
-    blt     t7, at, @@MulDamage
+    bge     t7, at, @@ohko
     nop
-    li      t7, 10
 
 @@MulDamage:
     b       @@DoubleDefence
     sllv    s0, s0, t7     ; damage multiplier
 
+@@ohko:
+    b       @@return
+    sh      zero, 0x30(a1)
+
 @@DivDamage:
     sub     t7, zero, t7
     srav    s0, s0, t7     ; damage multiplier