Cleanup macros before continuing.

1 files changed, 207 insertions, 229 deletions

diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm
index 49d95f82..eeda6bd8 100644
--- a/macros/scripts/movement.asm
+++ b/macros/scripts/movement.asm
@@ -1,242 +1,220 @@
-
-	enum_start
-
-	enum movement_turn_head
-turn_head: macro
-	db movement_turn_head | \1 ; $00
-	endm
-
-__enum__ SET $4
-
-	enum movement_turn_step
-turn_step: macro
-	db movement_turn_step | \1 ; $04
-	endm
-
-__enum__ SET $8
-
-	enum movement_slow_step
-slow_step: macro
-	db movement_slow_step | \1; $08
-	endm
-
-__enum__ SET $c
-
-	enum movement_step
-step: macro
-	db movement_step | \1 ; $0c
-	endm
-
-__enum__ SET $10
-
-	enum movement_big_step
-big_step: macro
-	db movement_big_step | \1 ; $10
-	endm
-
-__enum__ SET $14
-
-	enum movement_slow_slide_step
-slow_slide_step: macro
-	db movement_slow_slide_step | \1 ; $14
-	endm
-
-__enum__ SET $18
-
-	enum movement_slide_step
-slide_step: macro
-	db movement_slide_step | \1 ; $18
-	endm
-
-__enum__ SET $1c
-
-	enum movement_fast_slide_step
-fast_slide_step: macro
-	db movement_fast_slide_step | \1 ; $1c
-	endm
-
-__enum__ SET $20
-
-	enum movement_turn_away
-turn_away: macro
-	db movement_turn_away | \1 ; $20
-	endm
-
-__enum__ SET $24
-
-	enum movement_turn_in
-turn_in: macro
-	db movement_turn_in | \1 ; $24
-	endm
-
-__enum__ SET $28
-
-	enum movement_turn_waterfall
-turn_waterfall: macro
-	db movement_turn_waterfall | \1 ; $28
-	endm
-
-__enum__ SET $2c
-
-	enum movement_slow_jump_step
-slow_jump_step: macro
-	db movement_slow_jump_step | \1 ; $2c
-	endm
-
-__enum__ SET $30
-
-	enum movement_jump_step
-jump_step: macro
-	db movement_jump_step | \1 ; $30
-	endm
-
-__enum__ SET $34
-
-	enum movement_fast_jump_step
-fast_jump_step: macro
-	db movement_fast_jump_step | \1 ; $34
-	endm
+; MovementPointers indexes (see engine/overworld/movement.asm)
+	enum_start 0, +4
+
+; Directional movements
+
+	enum movement_turn_head ; $00
+turn_head: MACRO
+	db movement_turn_head | \1
+ENDM
+
+	enum movement_turn_step ; $04
+turn_step: MACRO
+	db movement_turn_step | \1
+ENDM
+
+	enum movement_slow_step ; $08
+slow_step: MACRO
+	db movement_slow_step | \1
+ENDM
+
+	enum movement_step ; $0c
+step: MACRO
+	db movement_step | \1
+ENDM
+
+	enum movement_big_step ; $10
+big_step: MACRO
+	db movement_big_step | \1
+ENDM
+
+	enum movement_slow_slide_step ; $14
+slow_slide_step: MACRO
+	db movement_slow_slide_step | \1
+ENDM
+
+	enum movement_slide_step ; $18
+slide_step: MACRO
+	db movement_slide_step | \1
+ENDM
+
+	enum movement_fast_slide_step ; $1c
+fast_slide_step: MACRO
+	db movement_fast_slide_step | \1
+ENDM
+
+	enum movement_turn_away ; $20
+turn_away: MACRO
+	db movement_turn_away | \1
+ENDM
+
+	enum movement_turn_in ; $24
+turn_in: MACRO
+	db movement_turn_in | \1
+ENDM
+
+	enum movement_turn_waterfall ; $28
+turn_waterfall: MACRO
+	db movement_turn_waterfall | \1
+ENDM
+
+	enum movement_slow_jump_step ; $2c
+slow_jump_step: MACRO
+	db movement_slow_jump_step | \1
+ENDM
+
+	enum movement_jump_step ; $30
+jump_step: MACRO
+	db movement_jump_step | \1
+ENDM
+
+	enum movement_fast_jump_step ; $34
+fast_jump_step: MACRO
+	db movement_fast_jump_step | \1
+ENDM
+
+__enumdir__ = +1
 
 ; Control
-__enum__ SET $38
-
-	enum movement_remove_sliding
-remove_sliding: macro
-	db movement_remove_sliding ; $38
-	endm
-
-	enum movement_set_sliding
-set_sliding: macro
-	db movement_set_sliding ; $39
-	endm
-
-	enum movement_remove_fixed_facing
-remove_fixed_facing: macro
-	db movement_remove_fixed_facing ; $3a
-	endm
-
-	enum movement_fix_facing
-fix_facing: macro
-	db movement_fix_facing ; $3b
-	endm
-
-	enum movement_show_person
-show_person: macro
-	db movement_show_person ; $3c
-	endm
-
-	enum movement_hide_person
-hide_person: macro
-	db movement_hide_person ; $3d
-	endm
+	enum movement_remove_sliding ; $38
+remove_sliding: MACRO
+	db movement_remove_sliding
+ENDM
+
+	enum movement_set_sliding ; $39
+set_sliding: MACRO
+	db movement_set_sliding
+ENDM
+
+	enum movement_remove_fixed_facing ; $3a
+remove_fixed_facing: MACRO
+	db movement_remove_fixed_facing
+ENDM
+
+	enum movement_fix_facing ; $3b
+fix_facing: MACRO
+	db movement_fix_facing
+ENDM
+
+	enum movement_show_object ; $3c
+show_object: MACRO
+	db movement_show_object
+ENDM
+
+	enum movement_hide_object ; $3d
+hide_object: MACRO
+	db movement_hide_object
+ENDM
 
 ; Sleep
 
-	enum movement_step_sleep
-step_sleep: macro
+	enum movement_step_sleep ; $3e
+step_sleep: MACRO
 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
-	db movement_step_end ; $47
-	endm
-
-; Whatever Movement_48 is, it takes a one-byte parameter
-
-__enum__ = $49
-
-	enum movement_remove_person
-remove_person: macro
-	db movement_remove_person ; $49
-	endm
-
-	enum movement_step_loop
-step_loop: macro
-	db movement_step_loop ; $4a
-	endm
-
-	enum movement_step_4b
-step_4b: macro
-	db movement_step_4b ; $4b
-	endm
-
-	enum movement_teleport_from
-teleport_from: macro
-	db movement_teleport_from ; $4c
-	endm
-
-	enum movement_teleport_to
-teleport_to: macro
-	db movement_teleport_to ; $4d
-	endm
-
-	enum movement_skyfall
-skyfall: macro
-	db movement_skyfall ; $4e
-	endm
-
-	enum movement_step_dig
-step_dig: macro
-	db movement_step_dig ; $4f
-	db \1
-	endm
-
-	enum movement_step_bump
-step_bump: macro
-	db movement_step_bump ; $50
-	endm
-
-	enum movement_fish_got_bite
-fish_got_bite: macro
-	db movement_fish_got_bite ; $51
-	endm
-
-	enum movement_fish_cast_rod
-fish_cast_rod: macro
-	db movement_fish_cast_rod ; $52
-	endm
-
-	enum movement_hide_emote
-hide_emote: macro
-	db movement_hide_emote ; $53
-	endm
-
-	enum movement_show_emote
-show_emote: macro
-	db movement_show_emote ; $54
-	endm
-
-	enum movement_step_shake
-step_shake: macro
-	db movement_step_shake ; $55
+ENDM
+
+__enum__ = __enum__ + 8
+
+	enum movement_step_end ; $47
+step_end: MACRO
+	db movement_step_end
+ENDM
+
+	enum movement_step_48 ; $48
+step_48: MACRO
+	db movement_step_48
+	db \1 ; ???
+ENDM
+
+	enum movement_remove_object ; $49
+remove_object: MACRO
+	db movement_remove_object
+ENDM
+
+	enum movement_step_loop ; $4a
+step_loop: MACRO
+	db movement_step_loop
+ENDM
+
+	enum movement_step_4b ; $4b
+step_4b: MACRO
+	db movement_step_4b
+ENDM
+
+	enum movement_teleport_from ; $4c
+teleport_from: MACRO
+	db movement_teleport_from
+ENDM
+
+	enum movement_teleport_to ; $4d
+teleport_to: MACRO
+	db movement_teleport_to
+ENDM
+
+	enum movement_skyfall ; $4e
+skyfall: MACRO
+	db movement_skyfall
+ENDM
+
+	enum movement_step_dig ; $4f
+step_dig: MACRO
+	db movement_step_dig
+	db \1 ; length
+ENDM
+
+	enum movement_step_bump ; $50
+step_bump: MACRO
+	db movement_step_bump
+ENDM
+
+	enum movement_fish_got_bite ; $51
+fish_got_bite: MACRO
+	db movement_fish_got_bite
+ENDM
+
+	enum movement_fish_cast_rod ; $52
+fish_cast_rod: MACRO
+	db movement_fish_cast_rod
+ENDM
+
+	enum movement_hide_emote ; $53
+hide_emote: MACRO
+	db movement_hide_emote
+ENDM
+
+	enum movement_show_emote ; $54
+show_emote: MACRO
+	db movement_show_emote
+ENDM
+
+	enum movement_step_shake ; $55
+step_shake: MACRO
+	db movement_step_shake
 	db \1 ; displacement
-	endm
+ENDM
 
-	enum movement_tree_shake
-tree_shake: macro
+	enum movement_tree_shake ; $56
+tree_shake: MACRO
 	db movement_tree_shake
-	endm
-
-	enum movement_rock_smash
-rock_smash: macro
-	db movement_rock_smash ; $57
-	db \1
-	endm
-
-	enum movement_return_dig
-return_dig: macro
-	db movement_return_dig ; $58
-	db \1
-	endm
-
-	enum movement_skyfall_top
-skyfall_top: macro
-	db movement_skyfall_top ; $59
-	endm
+ENDM
+
+	enum movement_rock_smash ; $57
+rock_smash: MACRO
+	db movement_rock_smash
+	db \1 ; length
+ENDM
+
+	enum movement_return_dig ; $58
+return_dig: MACRO
+	db movement_return_dig
+	db \1 ; length
+ENDM
+
+	enum movement_skyfall_top ; $59
+skyfall_top: MACRO
+	db movement_skyfall_top
+ENDM