summaryrefslogtreecommitdiff
path: root/engine/battle/battle_transition.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-09-09 18:25:43 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-09-09 18:25:43 -0400
commitf9cf53ecba1e6d186d6e7a31d557c4b45d9a02ae (patch)
treee40a46968af45a5c9b5d0593816024e5c93d5b75 /engine/battle/battle_transition.asm
parent3241c9cfaa3c234f15c5c8d468c71556f9f00e2c (diff)
Use existing bigdw macro
Diffstat (limited to 'engine/battle/battle_transition.asm')
-rw-r--r--engine/battle/battle_transition.asm36
1 files changed, 17 insertions, 19 deletions
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: