From 43286f43737fbaf9032182b85638da59634e67e7 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi@gmail.com>
Date: Tue, 8 Dec 2020 14:33:46 -0500
Subject: Match pokegold's battle transition code more closely

---
 ram/wram.asm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'ram')

diff --git a/ram/wram.asm b/ram/wram.asm
index 4405a16..da6d364 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -154,10 +154,11 @@ wOverworldMapBlocksEnd::
 
 NEXTU
 
-wLYOverrides::
-	ds SCREEN_HEIGHT_PX
-	ds $10
-wLYOverrides2::
+wLYOverrides:: ds SCREEN_HEIGHT_PX
+wLYOverridesEnd:: db
+	ds 15
+wLYOverrides2:: ds SCREEN_HEIGHT_PX
+wLYOverrides2End::
 
 NEXTU
 ; Battle-related
@@ -329,13 +330,13 @@ wNamedObjectTypeBuffer:: db
 SECTION "CB5E", WRAM0[$CB5E]
 wJumptableIndex:: db
 
-UNION
-wcb5f::	db
-NEXTU
-wFlyDestination:: db
-ENDU
+wFlyDestination::
+wBattleTransitionCounter:: db
 
+wBattleTransitionSineWaveOffset::
+wBattleTransitionSpinQuadrant::
 wcb60:: ds 1
+
 wcb61:: ds 1
 
 wVBCopySize:: ds 1
-- 
cgit v1.2.3