diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-09 23:55:39 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-09 23:55:39 -0500 |
| commit | d8cd991b35d45ef75b06a89b0626381132b34806 (patch) | |
| tree | 77a631c6c6f92833a86bbc5e424e9c83e2fe51c1 /battle/core.asm | |
| parent | f1b2466cc3672fa72f5b43e96a634dd83796f047 (diff) | |
engine/link.asm
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/battle/core.asm b/battle/core.asm index 291d6162c..25025feb7 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -3642,15 +3642,15 @@ LoadEnemyPkmnToSwitchTo: ; 3d6ca ld a, [CurPartySpecies] cp UNOWN - jr nz, .asm_3d708 + jr nz, .skip_unown ld a, [wdef4] and a - jr nz, .asm_3d708 + jr nz, .skip_unown ld hl, EnemyMonDVs predef GetUnownLetter ld a, [UnownLetter] ld [wdef4], a -.asm_3d708 +.skip_unown ld hl, EnemyMonHP ld a, [hli] @@ -8630,13 +8630,13 @@ InitEnemyWildmon: ; 3f607 predef GetUnownLetter ld a, [CurPartySpecies] cp UNOWN - jr nz, .asm_3f648 + jr nz, .skip_unown ld a, [wdef4] and a - jr nz, .asm_3f648 + jr nz, .skip_unown ld a, [UnownLetter] ld [wdef4], a -.asm_3f648 +.skip_unown ld de, VTiles2 predef Function5108b xor a |