diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
| commit | e25a7148d0a78549de4f33fa72d519dcaf660e97 (patch) | |
| tree | 5fcc95934c26b1fc86345b10f2a5c80fa740d083 /engine/battle/moveEffects/transform_effect.asm | |
| parent | b509b48a7f5a9a80225b9c030d7334b26b521c62 (diff) | |
| parent | 5d3b958763d48e6049e13b068d2f2d5382cdcad2 (diff) | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/town_map.asm
Diffstat (limited to 'engine/battle/moveEffects/transform_effect.asm')
| -rw-r--r-- | engine/battle/moveEffects/transform_effect.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm index 1b992df6..185d47af 100644 --- a/engine/battle/moveEffects/transform_effect.asm +++ b/engine/battle/moveEffects/transform_effect.asm @@ -26,8 +26,8 @@ TransformEffect_: ; 3bab1 (e:7ab1) ; animation(s) played are different if target has Substitute up bit HasSubstituteUp, [hl] push af - ld hl, Func_79747 - ld b, BANK(Func_79747) + ld hl, HideSubstituteShowMonAnim + ld b, BANK(HideSubstituteShowMonAnim) call nz, Bankswitch ld a, [W_OPTIONS] add a @@ -38,8 +38,8 @@ TransformEffect_: ; 3bab1 (e:7ab1) ld b, BANK(AnimationTransformMon) .gotAnimToPlay call Bankswitch - ld hl, Func_79771 - ld b, BANK(Func_79771) + ld hl, ReshowSubstituteAnim + ld b, BANK(ReshowSubstituteAnim) pop af call nz, Bankswitch pop bc |