diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-16 11:20:01 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-16 11:20:01 -0700 |
| commit | 8639fcd29b0e929ec6cc236a209d0e07a495db14 (patch) | |
| tree | c5021a1842b931ff41b63a884739342fa31f0a9e /battle/anim_commands.asm | |
| parent | 0b7dfeb9b208a16682e92de9cf15e19fb8cf8a94 (diff) | |
Use a predef macro that takes labels instead of juggling constants.
Besides making predefs convenient, naming a predef no longer requires
adding or renaming a predef constant. This also lets predefs be rearranged at will.
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..7c43ed38f 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 Function51077 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 Function5116c .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 Function51077 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 Function5116c .done pop af |