1 files changed, 40 insertions, 22 deletions

diff --git a/macros/wram.asm b/macros/wram.asm
index 41fd1dad..872e7f57 100644
--- a/macros/wram.asm
+++ b/macros/wram.asm
@@ -61,19 +61,19 @@ battle_struct: MACRO
 ENDM
 
 spritestatedata1: MACRO
-\1PictureID:: db
-\1MovementStatus:: db
-\1ImageIndex:: db
-\1YStepVector:: db
-\1YPixels:: db
-\1XStepVector:: db
-\1XPixels:: db
+\1PictureID::             db
+\1MovementStatus::        db
+\1ImageIndex::            db
+\1YStepVector::           db
+\1YPixels::               db
+\1XStepVector::           db
+\1XPixels::               db
 \1IntraAnimFrameCounter:: db
-\1AnimFrameCounter:: db
-\1FacingDirection:: db
-\1YAdjusted:: db
-\1XAdjusted:: db
-\1CollisionData:: db
+\1AnimFrameCounter::      db
+\1FacingDirection::       db
+\1YAdjusted::             db
+\1XAdjusted::             db
+\1CollisionData::         db
 	ds 3
 \1End::
 ENDM
@@ -81,17 +81,35 @@ ENDM
 spritestatedata2: MACRO
 \1WalkAnimationCounter:: db
 	ds 1
-\1YDisplacement:: db
-\1XDisplacement:: db
-\1MapY:: db
-\1MapX:: db
-\1MovementByte1:: db
-\1GrassPriority:: db
-\1MovementDelay:: db
-\1OrigFacingDirection:: db
+\1YDisplacement::        db
+\1XDisplacement::        db
+\1MapY::                 db
+\1MapX::                 db
+\1MovementByte1::        db
+\1GrassPriority::        db
+\1MovementDelay::        db
+\1OrigFacingDirection::  db
 	ds 3
-\1PictureID:: db
-\1ImageBaseOffset:: db
+\1PictureID::            db
+\1ImageBaseOffset::      db
 	ds 1
 \1End::
 ENDM
+
+sprite_oam_struct: MACRO
+\1YCoord::     db
+\1XCoord::     db
+\1TileID::     db
+\1Attributes:: db
+ENDM
+
+map_connection_struct: MACRO
+\1ConnectedMap::            db
+\1ConnectionStripSrc::      dw
+\1ConnectionStripDest::     dw
+\1ConnectionStripLength::   db
+\1ConnectedMapWidth::       db
+\1ConnectedMapYAlignment::  db
+\1ConnectedMapXAlignment::  db
+\1ConnectedMapViewPointer:: dw
+ENDM