summaryrefslogtreecommitdiff
path: root/src/macros/wram.asm
diff options
context:
space:
mode:
Diffstat (limited to 'src/macros/wram.asm')
-rw-r--r--src/macros/wram.asm17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/macros/wram.asm b/src/macros/wram.asm
index 8b3f306..55d32ad 100644
--- a/src/macros/wram.asm
+++ b/src/macros/wram.asm
@@ -28,9 +28,9 @@ card_data_struct: MACRO
ENDM
move_data_struct: MACRO
-\1Energy:: ds $4
+\1Energy:: ds NUM_TYPES / 2
\1Name:: dw
-\1Description:: ds $4
+\1Description:: ds 4
\1Damage:: db
\1Category:: db
\1EffectCommands:: dw
@@ -41,12 +41,13 @@ move_data_struct: MACRO
\1Animation:: db
ENDM
-sprite_buffer_struct: MACRO
+; TODO: Figure out what the rest are for
+sprite_anim_struct: MACRO
\1Property1:: ds 1
-\1Property2:: ds 1
-\1Property3:: ds 1
-\1Property4:: ds 1
-\1Property5:: ds 1
+\1Property2:: ds 1 ; movement handling / palette
+\1CoordX:: db
+\1CoordY:: db
+\1TileID:: db
\1Property6:: ds 1
\1Property7:: ds 1
\1Property8:: ds 1
@@ -56,6 +57,6 @@ sprite_buffer_struct: MACRO
\1Property12:: ds 1
\1Property13:: ds 1
\1Property14:: ds 1
-\1Property15:: ds 1
+\1MovementCounter:: ds 1
\1Property16:: ds 1
ENDM \ No newline at end of file