diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-09 16:41:09 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-09 16:41:09 -0500 |
| commit | 93ab6985d283857c54fe096294ba5296179963bf (patch) | |
| tree | c6b5faee97b1ba0229e45201789cd4b0b7a57dfb /items | |
| parent | 59d67a44be4f76131b432b94b1cb6361b58a9a26 (diff) | |
Some work on battle animations
Diffstat (limited to 'items')
| -rw-r--r-- | items/item_effects.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/items/item_effects.asm b/items/item_effects.asm index b2258b6d5..22877e26e 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -225,7 +225,7 @@ ParkBall: ; e8a2 .room_in_party xor a - ld [wCaughtMon], a + ld [wWildMon], a ld a, [CurItem] cp PARK_BALL call nz, Functionedfa @@ -394,7 +394,7 @@ endr ld a, [EnemyMonSpecies] .fail_to_catch - ld [wCaughtMon], a + ld [wWildMon], a ld c, 20 call DelayFrames @@ -416,7 +416,7 @@ endr ld [wcfca], a predef PlayBattleAnim - ld a, [wCaughtMon] + ld a, [wWildMon] and a jr nz, .caught ld a, [Buffer2] @@ -493,19 +493,19 @@ endr ld hl, EnemySubStatus5 bit SUBSTATUS_TRANSFORMED, [hl] jr nz, .Transformed - ld hl, wCaughtMonMoves + ld hl, wWildMonMoves ld de, EnemyMonMoves ld bc, NUM_MOVES call CopyBytes - ld hl, wCaughtMonPP + ld hl, wWildMonPP ld de, EnemyMonPP ld bc, NUM_MOVES call CopyBytes .Transformed ld a, [EnemyMonSpecies] - ld [wCaughtMon], a + ld [wWildMon], a ld [CurPartySpecies], a ld [wd265], a ld a, [BattleType] @@ -710,7 +710,7 @@ endr cp BATTLETYPE_CONTEST jr z, .used_park_ball - ld a, [wCaughtMon] + ld a, [wWildMon] and a jr z, .toss |