home/movement.asm

1 files changed, 77 insertions, 279 deletions

diff --git a/macros/movement.asm b/macros/movement.asm
index fd4852e8..49d95f82 100644
--- a/macros/movement.asm
+++ b/macros/movement.asm
@@ -1,288 +1,115 @@
 
 	enum_start
 
-	enum movement_turn_head_down
-turn_head_down: macro
-	db movement_turn_head_down ; $00
+	enum movement_turn_head
+turn_head: macro
+	db movement_turn_head | \1 ; $00
 	endm
 
-	enum movement_turn_head_up
-turn_head_up: macro
-	db movement_turn_head_up ; $01
-	endm
-
-	enum movement_turn_head_left
-turn_head_left: macro
-	db movement_turn_head_left ; $02
-	endm
-
-	enum movement_turn_head_right
-turn_head_right: macro
-	db movement_turn_head_right ; $03
-	endm
-
-	enum movement_turn_step_down
-turn_step_down: macro
-	db movement_turn_step_down ; $04
-	endm
-
-	enum movement_turn_step_up
-turn_step_up: macro
-	db movement_turn_step_up ; $05
-	endm
-
-	enum movement_turn_step_left
-turn_step_left: macro
-	db movement_turn_step_left ; $06
-	endm
-
-	enum movement_turn_step_right
-turn_step_right: macro
-	db movement_turn_step_right ; $07
-	endm
-
-	enum movement_slow_step_down
-slow_step_down: macro
-	db movement_slow_step_down ; $08
-	endm
-
-	enum movement_slow_step_up
-slow_step_up: macro
-	db movement_slow_step_up ; $09
-	endm
-
-	enum movement_slow_step_left
-slow_step_left: macro
-	db movement_slow_step_left ; $0a
-	endm
-
-	enum movement_slow_step_right
-slow_step_right: macro
-	db movement_slow_step_right ; $0b
-	endm
-
-	enum movement_step_down
-step_down: macro
-	db movement_step_down ; $0c
-	endm
-
-	enum movement_step_up
-step_up: macro
-	db movement_step_up ; $0d
-	endm
-
-	enum movement_step_left
-step_left: macro
-	db movement_step_left ; $0e
-	endm
-
-	enum movement_step_right
-step_right: macro
-	db movement_step_right ; $0f
-	endm
-
-	enum movement_big_step_down
-big_step_down: macro
-	db movement_big_step_down ; $10
-	endm
-
-	enum movement_big_step_up
-big_step_up: macro
-	db movement_big_step_up ; $11
-	endm
-
-	enum movement_big_step_left
-big_step_left: macro
-	db movement_big_step_left ; $12
-	endm
-
-	enum movement_big_step_right
-big_step_right: macro
-	db movement_big_step_right ; $13
-	endm
-
-	enum movement_slow_slide_step_down
-slow_slide_step_down: macro
-	db movement_slow_slide_step_down ; $14
-	endm
-
-	enum movement_slow_slide_step_up
-slow_slide_step_up: macro
-	db movement_slow_slide_step_up ; $15
-	endm
-
-	enum movement_slow_slide_step_left
-slow_slide_step_left: macro
-	db movement_slow_slide_step_left ; $16
-	endm
+__enum__ SET $4
 
-	enum movement_slow_slide_step_right
-slow_slide_step_right: macro
-	db movement_slow_slide_step_right ; $17
+	enum movement_turn_step
+turn_step: macro
+	db movement_turn_step | \1 ; $04
 	endm
 
-	enum movement_slide_step_down
-slide_step_down: macro
-	db movement_slide_step_down ; $18
-	endm
-
-	enum movement_slide_step_up
-slide_step_up: macro
-	db movement_slide_step_up ; $19
-	endm
+__enum__ SET $8
 
-	enum movement_slide_step_left
-slide_step_left: macro
-	db movement_slide_step_left ; $1a
+	enum movement_slow_step
+slow_step: macro
+	db movement_slow_step | \1; $08
 	endm
 
-	enum movement_slide_step_right
-slide_step_right: macro
-	db movement_slide_step_right ; $1b
-	endm
-
-	enum movement_fast_slide_step_down
-fast_slide_step_down: macro
-	db movement_fast_slide_step_down ; $1c
-	endm
+__enum__ SET $c
 
-	enum movement_fast_slide_step_up
-fast_slide_step_up: macro
-	db movement_fast_slide_step_up ; $1d
+	enum movement_step
+step: macro
+	db movement_step | \1 ; $0c
 	endm
 
-	enum movement_fast_slide_step_left
-fast_slide_step_left: macro
-	db movement_fast_slide_step_left ; $1e
-	endm
-
-	enum movement_fast_slide_step_right
-fast_slide_step_right: macro
-	db movement_fast_slide_step_right ; $1f
-	endm
-
-	enum movement_turn_away_down
-turn_away_down: macro
-	db movement_turn_away_down ; $20
-	endm
+__enum__ SET $10
 
-	enum movement_turn_away_up
-turn_away_up: macro
-	db movement_turn_away_up ; $21
+	enum movement_big_step
+big_step: macro
+	db movement_big_step | \1 ; $10
 	endm
 
-	enum movement_turn_away_left
-turn_away_left: macro
-	db movement_turn_away_left ; $22
-	endm
+__enum__ SET $14
 
-	enum movement_turn_away_right
-turn_away_right: macro
-	db movement_turn_away_right ; $23
+	enum movement_slow_slide_step
+slow_slide_step: macro
+	db movement_slow_slide_step | \1 ; $14
 	endm
 
-	enum movement_turn_in_down
-turn_in_down: macro
-	db movement_turn_in_down ; $24
-	endm
+__enum__ SET $18
 
-	enum movement_turn_in_up
-turn_in_up: macro
-	db movement_turn_in_up ; $25
+	enum movement_slide_step
+slide_step: macro
+	db movement_slide_step | \1 ; $18
 	endm
 
-	enum movement_turn_in_left
-turn_in_left: macro
-	db movement_turn_in_left ; $26
-	endm
+__enum__ SET $1c
 
-	enum movement_turn_in_right
-turn_in_right: macro
-	db movement_turn_in_right ; $27
+	enum movement_fast_slide_step
+fast_slide_step: macro
+	db movement_fast_slide_step | \1 ; $1c
 	endm
 
-	enum movement_turn_waterfall_down
-turn_waterfall_down: macro
-	db movement_turn_waterfall_down ; $28
-	endm
+__enum__ SET $20
 
-	enum movement_turn_waterfall_up
-turn_waterfall_up: macro
-	db movement_turn_waterfall_up ; $29
+	enum movement_turn_away
+turn_away: macro
+	db movement_turn_away | \1 ; $20
 	endm
 
-	enum movement_turn_waterfall_left
-turn_waterfall_left: macro
-	db movement_turn_waterfall_left ; $2a
-	endm
+__enum__ SET $24
 
-	enum movement_turn_waterfall_right
-turn_waterfall_right: macro
-	db movement_turn_waterfall_right ; $2b
+	enum movement_turn_in
+turn_in: macro
+	db movement_turn_in | \1 ; $24
 	endm
 
-	enum movement_slow_jump_step_down
-slow_jump_step_down: macro
-	db movement_slow_jump_step_down ; $2c
-	endm
+__enum__ SET $28
 
-	enum movement_slow_jump_step_up
-slow_jump_step_up: macro
-	db movement_slow_jump_step_up ; $2d
+	enum movement_turn_waterfall
+turn_waterfall: macro
+	db movement_turn_waterfall | \1 ; $28
 	endm
 
-	enum movement_slow_jump_step_left
-slow_jump_step_left: macro
-	db movement_slow_jump_step_left ; $2e
-	endm
+__enum__ SET $2c
 
-	enum movement_slow_jump_step_right
-slow_jump_step_right: macro
-	db movement_slow_jump_step_right ; $2f
+	enum movement_slow_jump_step
+slow_jump_step: macro
+	db movement_slow_jump_step | \1 ; $2c
 	endm
 
-	enum movement_jump_step_down
-jump_step_down: macro
-	db movement_jump_step_down ; $30
-	endm
+__enum__ SET $30
 
-	enum movement_jump_step_up
-jump_step_up: macro
-	db movement_jump_step_up ; $31
+	enum movement_jump_step
+jump_step: macro
+	db movement_jump_step | \1 ; $30
 	endm
 
-	enum movement_jump_step_left
-jump_step_left: macro
-	db movement_jump_step_left ; $32
-	endm
+__enum__ SET $34
 
-	enum movement_jump_step_right
-jump_step_right: macro
-	db movement_jump_step_right ; $33
+	enum movement_fast_jump_step
+fast_jump_step: macro
+	db movement_fast_jump_step | \1 ; $34
 	endm
 
-	enum movement_fast_jump_step_down
-fast_jump_step_down: macro
-	db movement_fast_jump_step_down ; $34
-	endm
+; Control
+__enum__ SET $38
 
-	enum movement_fast_jump_step_up
-fast_jump_step_up: macro
-	db movement_fast_jump_step_up ; $35
+	enum movement_remove_sliding
+remove_sliding: macro
+	db movement_remove_sliding ; $38
 	endm
 
-	enum movement_fast_jump_step_left
-fast_jump_step_left: macro
-	db movement_fast_jump_step_left ; $36
+	enum movement_set_sliding
+set_sliding: macro
+	db movement_set_sliding ; $39
 	endm
 
-	enum movement_fast_jump_step_right
-fast_jump_step_right: macro
-	db movement_fast_jump_step_right ; $37
-	endm
-
-__enum__ = $3a
-
 	enum movement_remove_fixed_facing
 remove_fixed_facing: macro
 	db movement_remove_fixed_facing ; $3a
@@ -303,51 +130,18 @@ hide_person: macro
 	db movement_hide_person ; $3d
 	endm
 
-	enum movement_step_sleep_1
-step_sleep_1: macro
-	db movement_step_sleep_1 ; $3e
-	endm
-
-	enum movement_step_sleep_2
-step_sleep_2: macro
-	db movement_step_sleep_2 ; $3f
-	endm
-
-	enum movement_step_sleep_3
-step_sleep_3: macro
-	db movement_step_sleep_3 ; $40
-	endm
-
-	enum movement_step_sleep_4
-step_sleep_4: macro
-	db movement_step_sleep_4 ; $41
-	endm
-
-	enum movement_step_sleep_5
-step_sleep_5: macro
-	db movement_step_sleep_5 ; $42
-	endm
-
-	enum movement_step_sleep_6
-step_sleep_6: macro
-	db movement_step_sleep_6 ; $43
-	endm
-
-	enum movement_step_sleep_7
-step_sleep_7: macro
-	db movement_step_sleep_7 ; $44
-	endm
-
-	enum movement_step_sleep_8
-step_sleep_8: macro
-	db movement_step_sleep_8 ; $45
-	endm
+; Sleep
 
 	enum movement_step_sleep
 step_sleep: macro
-	db movement_step_sleep ; $46
-	db \1 ; duration
-	endm
+if \1 <= 8
+	db movement_step_sleep + \1 - 1
+else
+	db movement_step_sleep + 8, \1
+endc
+endm
+
+__enum__ SET $47
 
 	enum movement_step_end
 step_end: macro
@@ -425,7 +219,11 @@ step_shake: macro
 	db \1 ; displacement
 	endm
 
-__enum__ = $57
+	enum movement_tree_shake
+tree_shake: macro
+	db movement_tree_shake
+	endm
+
 	enum movement_rock_smash
 rock_smash: macro
 	db movement_rock_smash ; $57