summaryrefslogtreecommitdiff
path: root/macros/wram.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-05-31 11:46:10 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-05-31 11:46:10 -0400
commit8701ef4d61a6a55ee71aa1a964d4f7d10eded87e (patch)
treedc30f73b79b1bffaaf0e98c9f4ee4a92a8cd1833 /macros/wram.asm
parentce62dca69be6c316f0cd549a498ff04aaeef8d4d (diff)
Improve some RAM formatting
Diffstat (limited to 'macros/wram.asm')
-rw-r--r--macros/wram.asm51
1 files changed, 29 insertions, 22 deletions
diff --git a/macros/wram.asm b/macros/wram.asm
index 41fd1dad..9d412f2d 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,24 @@ 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