From f9cf53ecba1e6d186d6e7a31d557c4b45d9a02ae Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 9 Sep 2018 18:25:43 -0400 Subject: Use existing bigdw macro --- engine/battle/battle_transition.asm | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) (limited to 'engine') diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index d96d1be81..499c21adb 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -713,27 +713,25 @@ INCLUDE "gfx/overworld/trainer_battle_nite.pal" ret PokeBallTransition: -transition_row: MACRO - db HIGH(\1), LOW(\1) -ENDM +; 16x16 overlay of a Poke Ball pusho opt b.X ; . = 0, X = 1 - transition_row %......XXXX...... - transition_row %....XXXXXXXX.... - transition_row %..XXXX....XXXX.. - transition_row %..XX........XX.. - transition_row %.XX..........XX. - transition_row %.XX...XXXX...XX. - transition_row %XX...XX..XX...XX - transition_row %XXXXXX....XXXXXX - transition_row %XXXXXX....XXXXXX - transition_row %XX...XX..XX...XX - transition_row %.XX...XXXX...XX. - transition_row %.XX..........XX. - transition_row %..XX........XX.. - transition_row %..XXXX....XXXX.. - transition_row %....XXXXXXXX.... - transition_row %......XXXX...... + bigdw %......XXXX...... + bigdw %....XXXXXXXX.... + bigdw %..XXXX....XXXX.. + bigdw %..XX........XX.. + bigdw %.XX..........XX. + bigdw %.XX...XXXX...XX. + bigdw %XX...XX..XX...XX + bigdw %XXXXXX....XXXXXX + bigdw %XXXXXX....XXXXXX + bigdw %XX...XX..XX...XX + bigdw %.XX...XXXX...XX. + bigdw %.XX..........XX. + bigdw %..XX........XX.. + bigdw %..XXXX....XXXX.. + bigdw %....XXXXXXXX.... + bigdw %......XXXX...... popo WipeLYOverrides: -- cgit v1.2.3