Sync more with pokeyellow

1 files changed, 40 insertions, 18 deletions

diff --git a/wram.asm b/wram.asm
index b2332f61..9444084e 100755
--- a/wram.asm
+++ b/wram.asm
@@ -239,32 +239,40 @@ SECTION "OAM Buffer", WRAM0
 wOAMBuffer::
 ; buffer for OAM data. Copied to OAM by DMA
 	ds 4 * 40
+wOAMBufferEnd::
 
 wTileMap::
 ; buffer for tiles that are visible on screen (20 columns by 18 rows)
-	ds 20 * 18
-
-wSerialPartyMonsPatchList::
-; list of indexes to patch with SERIAL_NO_DATA_BYTE after transfer
+	ds SCREEN_WIDTH * SCREEN_HEIGHT
 
+UNION
 wTileMapBackup::
 ; buffer for temporarily saving and restoring current screen's tiles
 ; (e.g. if menus are drawn on top)
-;	ds 20 * 18
+	ds SCREEN_WIDTH * SCREEN_HEIGHT
 
+NEXTU
+wSerialPartyMonsPatchList::
+; list of indexes to patch with SERIAL_NO_DATA_BYTE after transfer
 	ds 200
 
 wSerialEnemyMonsPatchList::
 ; list of indexes to patch with SERIAL_NO_DATA_BYTE after transfer
 	ds 200
+ENDU
 
 	ds 80
 
-wTempPic::
+UNION
 wOverworldMap::
 	ds 1300
 wOverworldMapEnd::
 
+NEXTU
+wTempPic::
+	ds 7 * 7 tiles
+ENDU
+
 wRedrawRowOrColumnSrcTiles::
 ; the tiles of the row or column to be redrawn by RedrawRowOrColumn
 	ds SCREEN_WIDTH * 2
@@ -399,9 +407,8 @@ wUnknownSerialCounter::
 ; 2 bytes
 
 wEnteringCableClub::
-	ds 1
-
-	ds 1
+; 1 byte
+	ds 2
 
 wWhichTradeMonSelectionMenu::
 ; $00 = player mons
@@ -509,15 +516,24 @@ wAnimPalette::
 
 	ds 29
 
+UNION
 wNPCMovementDirections2::
+	ds 10
 
+NEXTU
 wSwitchPartyMonTempBuffer::
 ; temporary buffer when swapping party mon data
+	ds 49
+
+NEXTU
 	ds 10
 
 wNumStepsToTake::
 ; used in Pallet Town scripted movement
-	ds 49
+	ds 1
+ENDU
+
+	ds 10
 
 wRLEByteCount::
 	ds 1
@@ -595,7 +611,7 @@ wTotalPayDayMoney::
 wSafariEscapeFactor::
 	ds 1
 wSafariBaitFactor::
-	ds 1;
+	ds 1
 
 	ds 1
 
@@ -823,8 +839,6 @@ wCoordIndex::
 
 wOptionsTextSpeedCursorX::
 
-wBoxNumString::
-
 wTrainerInfoTextBoxWidthPlus1::
 
 wSwappedMenuItem::
@@ -861,6 +875,8 @@ wPlayerSpinInPlaceAnimFrameDelay::
 
 wPlayerSpinWhileMovingUpOrDownAnimDeltaY::
 
+wBoxNumString::
+
 wHiddenObjectFunctionArgument::
 
 wWhichTrade::
@@ -1350,7 +1366,9 @@ wExpAmountGained::
 ; 2-byte big-endian number
 ; the total amount of exp a mon gained
 
-wcf4b:: ds 2 ; storage buffer for various strings
+wcf4b::
+; storage buffer for various strings
+	ds 2
 
 wGainBoostedExp::
 	ds 1
@@ -1987,7 +2005,6 @@ wSavedTilesetType::
 
 	ds 2
 
-
 wDamage::
 	ds 2
 
@@ -2725,7 +2742,8 @@ wPokemonMansionB1FCurScript::
 wVictoryRoad2FCurScript::
 	ds 1
 wVictoryRoad3FCurScript::
-	ds 2
+	ds 1
+	ds 1
 wFightingDojoCurScript::
 	ds 1
 wSilphCo2FCurScript::
@@ -2972,7 +2990,9 @@ wFlags_D733::
 wBeatLorelei::
 ; bit 1: set when you beat Lorelei and reset in Indigo Plateau lobby
 ; the game uses this to tell when Elite 4 events need to be reset
-	ds 2
+	ds 1
+
+	ds 1
 
 wd736::
 ; bit 0: check if the player is standing on a door and make him walk down a step if so
@@ -3010,6 +3030,7 @@ wSecondLockTrashCanIndex::
 	ds 1
 
 	ds 2
+
 wEventFlags::
 	flag_array NUM_EVENTS
 
@@ -3020,7 +3041,7 @@ wGrassRate::
 	ds 1
 
 wGrassMons::
-	;ds 20
+;	ds 20
 
 	ds 11
 ; Overload wGrassMons
@@ -3119,6 +3140,7 @@ wBoxDataEnd::
 
 
 SECTION "Stack", WRAM0
+
 wStack::