From e51c64e167699530dc9c50168040a36943585e9d Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 17 Feb 2019 13:31:28 -0500 Subject: [PATCH] Don't use legacy macros --- macros/legacy.asm | 4 +++- macros/scripts/battle_anims.asm | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/macros/legacy.asm b/macros/legacy.asm index dad18ebb3..ea8d99a4b 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -177,4 +177,6 @@ current_day EQUS "text_today" text_jump EQUS "text_far" ; macros/scripts/battle_anims.asm -anim_clearsprites EQUS "anim_keepsprites" +anim_enemyfeetobj EQUS "anim_battlergfx_2row" +anim_playerheadobj EQUS "anim_battlergfx_1row" +anim_clearsprites EQUS "anim_keepsprites" diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index af447f1af..417e9ac28 100644 --- a/macros/scripts/battle_anims.asm +++ b/macros/scripts/battle_anims.asm @@ -84,14 +84,14 @@ anim_incbgeffect: MACRO db \1 ; effect ENDM - enum anim_enemyfeetobj_command ; $d9 + enum anim_battlergfx_2row_command ; $d9 anim_battlergfx_2row: MACRO - db anim_enemyfeetobj_command + db anim_battlergfx_2row_command ENDM - enum anim_playerheadobj_command ; $da + enum anim_battlergfx_1row_command ; $da anim_battlergfx_1row: MACRO - db anim_playerheadobj_command + db anim_battlergfx_1row_command ENDM enum anim_checkpokeball_command ; $db @@ -232,9 +232,9 @@ anim_obp1: MACRO db \1 ; colors ENDM - enum anim_clearsprites_command ; $f4 + enum anim_keepsprites_command ; $f4 anim_keepsprites: MACRO - db anim_clearsprites_command + db anim_keepsprites_command ENDM enum anim_0xf5_command ; $f5