SPRITEMOVEDATA

3 files changed, 50 insertions, 18 deletions

diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm
index c5f8517ac..5e7583f8e 100644
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -38,3 +38,5 @@ const_value SET 1
 	const ANIM_GFX_ANGELS
 	const ANIM_GFX_WAVE
 	const ANIM_GFX_AEROBLAST
+
+TILESIZE EQU $10
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 7a40a6fca..8a7c1ebb2 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -572,10 +572,10 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
 OBJECT_STRUCT_3_DATA_WIDTH EQU 6
 OBJECT_STRUCT_3_DATA_HEIGHT EQU 37
 
-OW_DOWN  EQU $0
-OW_UP    EQU $4
-OW_LEFT  EQU $8
-OW_RIGHT EQU $c
+OW_DOWN  EQU DOWN  << 2
+OW_UP    EQU UP    << 2
+OW_LEFT  EQU LEFT  << 2
+OW_RIGHT EQU RIGHT << 2
 
 	const_def
 	const EMOTE_SHOCK ; 0
@@ -586,10 +586,8 @@ OW_RIGHT EQU $c
 	const EMOTE_BOLT ; 5
 	const EMOTE_SLEEP ; 6
 	const EMOTE_FISH ; 7
-	const EMOTE_ROD_DOWN ; 8
-	const EMOTE_ROD_UP ; 9
-	const EMOTE_ROD_LEFT ; a
-	const EMOTE_ROD_RIGHT ; b
+	const EMOTE_ROD ; 8 - add directional constant
+EMOTE_MEM EQU -1
 
 	const_def
 	const SIGNPOST_READ
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index ecbe7ad23..a355877f2 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -181,7 +181,48 @@ const_value SET 1
 	const PAL_OW_TREE
 	const PAL_OW_ROCK
 
-; sprite movements
+; sprite movement data table indices
+	const_def
+	const SPRITEMOVEDATA_00
+	const SPRITEMOVEDATA_01
+	const SPRITEMOVEDATA_02
+	const SPRITEMOVEDATA_03
+	const SPRITEMOVEDATA_WALK_UP_DOWN
+	const SPRITEMOVEDATA_WALK_LEFT_RIGHT
+	const SPRITEMOVEDATA_STANDING_DOWN
+	const SPRITEMOVEDATA_STANDING_UP
+	const SPRITEMOVEDATA_STANDING_LEFT
+	const SPRITEMOVEDATA_STANDING_RIGHT
+	const SPRITEMOVEDATA_0A
+	const SPRITEMOVEDATA_0B
+	const SPRITEMOVEDATA_0C
+	const SPRITEMOVEDATA_0D
+	const SPRITEMOVEDATA_0E
+	const SPRITEMOVEDATA_0F
+	const SPRITEMOVEDATA_10
+	const SPRITEMOVEDATA_11
+	const SPRITEMOVEDATA_12
+	const SPRITEMOVEDATA_13
+	const SPRITEMOVEDATA_14
+	const SPRITEMOVEDATA_15
+	const SPRITEMOVEDATA_16
+	const SPRITEMOVEDATA_17
+	const SPRITEMOVEDATA_18
+	const SPRITEMOVEDATA_19
+	const SPRITEMOVEDATA_1A
+	const SPRITEMOVEDATA_1B
+	const SPRITEMOVEDATA_1C
+	const SPRITEMOVEDATA_1D
+	const SPRITEMOVEDATA_1E
+	const SPRITEMOVEDATA_1F
+	const SPRITEMOVEDATA_20
+	const SPRITEMOVEDATA_21
+	const SPRITEMOVEDATA_22
+	const SPRITEMOVEDATA_23
+	const SPRITEMOVEDATA_24
+	const SPRITEMOVEDATA_25
+
+; sprite movement functions
 	const_def
 	const SPRITEMOVEFN_00
 	const SPRITEMOVEFN_01
@@ -211,12 +252,3 @@ const_value SET 1
 	const SPRITEMOVEFN_19
 	const SPRITEMOVEFN_1A
 	const SPRITEMOVEFN_1B
-	const SPRITEMOVEFN_1C
-	const SPRITEMOVEFN_1D
-	const SPRITEMOVEFN_1E
-	const SPRITEMOVEFN_1F
-	const SPRITEMOVEFN_20
-	const SPRITEMOVEFN_21
-	const SPRITEMOVEFN_22
-	const SPRITEMOVEFN_23
-	const SPRITEMOVEFN_24