summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-10-30 23:01:39 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-10-30 23:02:34 -0400
commitb8fc67848e1d5911204fa42bbd9b954fdec6228a (patch)
tree3699fe555e5b6dff907d07e0df49061b36bd918b
parent860585b0af688dc0b6e9655f44b31316dcbabf97 (diff)
Relocate the beta poker WRAM labels to avoid a UNION
-rw-r--r--wram.asm18
1 files changed, 7 insertions, 11 deletions
diff --git a/wram.asm b/wram.asm
index 144588d5e..84471696d 100644
--- a/wram.asm
+++ b/wram.asm
@@ -537,7 +537,6 @@ wEnemyScreens::
; see wPlayerScreens
db
-UNION
wPlayerSafeguardCount:: db
wPlayerLightScreenCount:: db
wPlayerReflectCount:: db
@@ -548,16 +547,6 @@ wEnemyLightScreenCount:: db
wEnemyReflectCount:: db
ds 1
-NEXTU
- ds 1
-wBetaPokerSGBPals:: dw
- ds 1
-wBetaPokerSGBAttr:: db
-wBetaPokerSGBCol:: db
-wBetaPokerSGBRow:: db
- ds 1
-ENDU
-
ds 1
wBattleWeather::
@@ -802,6 +791,13 @@ wCardFlipFaceUpCard:: db
wDiscardPile:: ds 4 * 6
wDiscardPileEnd::
+; beta poker game
+wBetaPokerSGBPals:: dw
+ ds 1
+wBetaPokerSGBAttr:: db
+wBetaPokerSGBCol:: db
+wBetaPokerSGBRow:: db
+
NEXTU
; unused memory game
wMemoryGameCards:: ds 9 * 5