summaryrefslogtreecommitdiff
path: root/battle/core.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-25 14:25:37 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-25 19:02:36 -0400
commit6c3000efd2818f8d5cb0a01770d1b92991b80340 (patch)
tree38d458d3ff19039cd865998bb122666b943e91d6 /battle/core.asm
parent432df825d4039a44a49fff01ef843395ab5abb3d (diff)
Macro update, roam mon annotations
Updated map and mapgroup macros to get around an rgbds bug. Legendary beast locale handling annotated and relabeled. Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function. This will make it easier for modders to add or remove engine flags.
Diffstat (limited to 'battle/core.asm')
-rw-r--r--battle/core.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/battle/core.asm b/battle/core.asm
index 5bb6929d7..471f21dc5 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -2365,7 +2365,7 @@ Function3cf14: ; 3cf14
ld de, SFX_KINESIS
call PlaySFX
call Function3d432
- ld de, SFX_UNKNOWN_2A
+ ld de, SFX_FAINT
call PlaySFX
hlcoord 1, 0
lb bc, 4, 10
@@ -4388,7 +4388,7 @@ Function3dc5b: ; 3dc5b
ld de, SFX_KINESIS
call PlaySFX
call WaitSFX
- ld de, SFX_UNKNOWN_2A
+ ld de, SFX_FAINT
call PlaySFX
call WaitSFX
call Function3d432