diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
| commit | 1ecfe6bd23bb9b4e1886342c082bd5c3a108abbb (patch) | |
| tree | 8190d5b11ebec4505c5494baf74b339ae9c82078 /battle/anim_commands.asm | |
| parent | 1fbe471b74908be6e89777857bf7407ef427225b (diff) | |
| parent | d6fbdfb8decf6231d6b43fbfcba63f9ce60308dc (diff) | |
Merge pull request #256 from yenatch/master
Fix predefs and battle code.
Diffstat (limited to 'battle/anim_commands.asm')
| -rw-r--r-- | battle/anim_commands.asm | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 9f26e8f94..f8f4a26ce 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -954,22 +954,18 @@ BattleAnimCmd_DC: ; cc5dc (33:45dc) ld a, [TempBattleMonSpecies] ; $d205 ld [CurPartySpecies], a ; $d108 ld hl, BattleMonDVs ; $c632 - ld a, PREDEF_GET_UNOWN_LETTER - call Predef + predef GetUnownLetter ld de, $8000 - ld a, $3c - call Predef + predef GetFrontpic jr .done .player ld a, [TempEnemyMonSpecies] ; $d204 ld [CurPartySpecies], a ; $d108 ld hl, EnemyMonDVs ; $d20c - ld a, PREDEF_GET_UNOWN_LETTER - call Predef + predef GetUnownLetter ld de, $8000 - ld a, $3d - call Predef + predef GetBackpic .done pop af @@ -1194,20 +1190,16 @@ BattleAnimCmd_E6: ; cc776 (33:4776) jr z, .player ld hl, BattleMonDVs ; $c632 - ld a, PREDEF_GET_UNOWN_LETTER - call Predef + predef GetUnownLetter ld de, $9000 - ld a, $3c - call Predef + predef GetFrontpic jr .done .player ld hl, EnemyMonDVs ; $d20c - ld a, PREDEF_GET_UNOWN_LETTER - call Predef + predef GetUnownLetter ld de, $9310 - ld a, $3d - call Predef + predef GetBackpic .done pop af |