summaryrefslogtreecommitdiff
path: root/battle/effect_commands.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-07-12 19:16:49 -0700
committerBryan Bishop <kanzure@gmail.com>2013-07-12 19:16:49 -0700
commitbb8990dc3cb19787e08c29409cfc674e2478fbc9 (patch)
tree28592a2c2c32b7b16f4e63fc22390a36789fea8a /battle/effect_commands.asm
parent226729d1750bc6ee0c45d96e3f6b7dcf0844a609 (diff)
parent90c18c5cf320be70b0507deda0dd7611052f2bec (diff)
Merge pull request #157 from yenatch/overworld
overworld loop and movement
Diffstat (limited to 'battle/effect_commands.asm')
-rw-r--r--battle/effect_commands.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index a25e5eede..4372dacba 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -6796,7 +6796,7 @@ BattleCommandac: ; 3658f
; jump
dec a
ld hl, .ptrs
- rst $28
+ rst JumpTable
ret
.ptrs
dw BattleCommand19 ; paralyze
@@ -9953,7 +9953,7 @@ Function0x377f5: ; 377f5
ld [$d123], a
ld a, [hl]
ld [$d124], a
- ld a, $3
+ ld a, 3
ld [MonType], a
ld a, $14
ld hl, $4bdd