summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-08-09 17:42:04 -0400
committeryenatch <yenatch@gmail.com>2013-08-09 17:50:34 -0400
commit14160a180f8a898d2c282155e32a3c907083cba0 (patch)
tree05d8623ba46daf59f310688c84dbd70e939ce2e0 /main.asm
parent94e9a3f7649b95eff276d8a42b820b74bad5c199 (diff)
hidden power type/power calculation
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm6
1 files changed, 5 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 786b9f19b..9ce03109a 100644
--- a/main.asm
+++ b/main.asm
@@ -66168,7 +66168,11 @@ INCBIN "baserom.gbc", $fba2e, $fbbfc - $fba2e
INCLUDE "battle/magikarp_length.asm"
-INCBIN "baserom.gbc", $fbccf, $fbda4 - $fbccf
+INCBIN "baserom.gbc", $fbccf, $fbced - $fbccf
+
+INCLUDE "battle/hidden_power.asm"
+
+INCBIN "baserom.gbc", $fbd54, $fbda4 - $fbd54
DoWeatherModifiers: ; fbda4