From 8639fcd29b0e929ec6cc236a209d0e07a495db14 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 16 Jun 2014 11:20:01 -0700 Subject: 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. --- battle/anim_commands.asm | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'battle/anim_commands.asm') 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 -- cgit v1.2.3 From bc3a21193dd522284818c724fb52b887973c281e Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 18 Jun 2014 00:55:44 -0700 Subject: Residual damage, battle text labels, pic predefs. --- battle/anim_commands.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'battle/anim_commands.asm') diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 7c43ed38f..f8f4a26ce 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -956,7 +956,7 @@ BattleAnimCmd_DC: ; cc5dc (33:45dc) ld hl, BattleMonDVs ; $c632 predef GetUnownLetter ld de, $8000 - predef Function51077 + predef GetFrontpic jr .done .player @@ -965,7 +965,7 @@ BattleAnimCmd_DC: ; cc5dc (33:45dc) ld hl, EnemyMonDVs ; $d20c predef GetUnownLetter ld de, $8000 - predef Function5116c + predef GetBackpic .done pop af @@ -1192,14 +1192,14 @@ BattleAnimCmd_E6: ; cc776 (33:4776) ld hl, BattleMonDVs ; $c632 predef GetUnownLetter ld de, $9000 - predef Function51077 + predef GetFrontpic jr .done .player ld hl, EnemyMonDVs ; $d20c predef GetUnownLetter ld de, $9310 - predef Function5116c + predef GetBackpic .done pop af -- cgit v1.2.3