summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-06-16 13:25:46 -0700
committeryenatch <yenatch@gmail.com>2014-06-16 13:25:46 -0700
commitd10108a066c102bf2d167ac656d79308e41f304e (patch)
tree8e23833f9b0b2cbffe7114212da8af13e0ef85d1 /engine/battle
parent94dc6955431171d4dba5833e5784e102dd045b49 (diff)
Use macros to define predefs.
Diffstat (limited to 'engine/battle')
-rwxr-xr-xengine/battle/4.asm2
-rwxr-xr-xengine/battle/core.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/4.asm b/engine/battle/4.asm
index 6e2bad34..11772a15 100755
--- a/engine/battle/4.asm
+++ b/engine/battle/4.asm
@@ -15,7 +15,7 @@ Func_128ea: ; 128ea (4:68ea)
inc b
ret
-Func_128ef: ; 128ef (4:68ef)
+DrawHP: ; 128ef (4:68ef)
call GetPredefRegisters
ld a, $1
jr asm_128fb
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 21ee9d0d..a1a69a4f 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -6661,7 +6661,7 @@ Func_3eed3: ; 3eed3 (f:6ed3)
PlayMoveAnimation: ; 3ef07 (f:6f07)
ld [W_ANIMATIONID],a
call Delay3
- PREDEF_JUMP MoveAnimationPredef ; predef 8
+ predef_jump MoveAnimation
InitBattle: ; 3ef12 (f:6f12)
ld a, [W_CUROPPONENT] ; wd059