shithub: pokecrystal

Download patch

ref: f9cf53ecba1e6d186d6e7a31d557c4b45d9a02ae
parent: 3241c9cfaa3c234f15c5c8d468c71556f9f00e2c
author: Rangi <[email protected]>
date: Sun Sep 9 14:25:43 EDT 2018

Use existing bigdw macro

--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -713,27 +713,25 @@
 	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:
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -64,7 +64,7 @@
 ENDM
 
 bigdw: MACRO ; big-endian word
-	dx 2, \1
+	dx 2, \1 ; db HIGH(\1), LOW(\1)
 ENDM
 
 dba: MACRO ; dbw bank, address