summaryrefslogtreecommitdiff
path: root/battle/effects
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-04-10 14:42:14 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-04-10 14:42:14 -0400
commitbf73772a560ddfdf0b404ba3f85eb26542031b7b (patch)
treeee3cbc2fb2be1b2353ebd4c9887de2d69a91d2f2 /battle/effects
parent46ead9b8498fe7191735bd99f667dd1f9147f969 (diff)
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
Diffstat (limited to 'battle/effects')
-rw-r--r--battle/effects/metronome.asm2
-rwxr-xr-xbattle/effects/present.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/battle/effects/metronome.asm b/battle/effects/metronome.asm
index ddc1bf62e..1908df84d 100644
--- a/battle/effects/metronome.asm
+++ b/battle/effects/metronome.asm
@@ -14,7 +14,7 @@ BattleCommand_Metronome: ; 37418
.asm_3742b
call LoadMoveAnim
-.GetMove
+.GetMove:
call BattleRandom
; No invalid moves.
diff --git a/battle/effects/present.asm b/battle/effects/present.asm
index a1594e379..819294f8c 100755
--- a/battle/effects/present.asm
+++ b/battle/effects/present.asm
@@ -85,7 +85,7 @@ BattleCommand_Present: ; 37874
.do_animation
jp EndMoveEffect
-.PresentPower
+.PresentPower:
db 40 percent, 40
db 70 percent + 1, 80
db 80 percent, 120