summaryrefslogtreecommitdiff
path: root/ram
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2020-12-08 14:33:46 -0500
committerRangi <remy.oukaour+rangi@gmail.com>2020-12-08 14:33:46 -0500
commit43286f43737fbaf9032182b85638da59634e67e7 (patch)
treef0e2075bb1b6a1e67ec6250a40dfcd3980aa8267 /ram
parent2831f2e3fea69de9b19b4f7e9ecebac454614576 (diff)
Match pokegold's battle transition code more closely
Diffstat (limited to 'ram')
-rw-r--r--ram/wram.asm19
1 files changed, 10 insertions, 9 deletions
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