Eliminate enum: use const instead, with case-by-case parallel const implementations

macros/scripts/movement.asm

@@ -1,114 +1,114 @@
 ; MovementPointers indexes (see engine/overworld/movement.asm)
-	enum_start 0, 4
+	const_def 0, 4
 
 ; Directional movements
 
-	enum movement_turn_head ; $00
+	const movement_turn_head ; $00
 turn_head: MACRO
 	db movement_turn_head | \1
 ENDM
 
-	enum movement_turn_step ; $04
+	const movement_turn_step ; $04
 turn_step: MACRO
 	db movement_turn_step | \1
 ENDM
 
-	enum movement_slow_step ; $08
+	const movement_slow_step ; $08
 slow_step: MACRO
 	db movement_slow_step | \1
 ENDM
 
-	enum movement_step ; $0c
+	const movement_step ; $0c
 step: MACRO
 	db movement_step | \1
 ENDM
 
-	enum movement_big_step ; $10
+	const movement_big_step ; $10
 big_step: MACRO
 	db movement_big_step | \1
 ENDM
 
-	enum movement_slow_slide_step ; $14
+	const movement_slow_slide_step ; $14
 slow_slide_step: MACRO
 	db movement_slow_slide_step | \1
 ENDM
 
-	enum movement_slide_step ; $18
+	const movement_slide_step ; $18
 slide_step: MACRO
 	db movement_slide_step | \1
 ENDM
 
-	enum movement_fast_slide_step ; $1c
+	const movement_fast_slide_step ; $1c
 fast_slide_step: MACRO
 	db movement_fast_slide_step | \1
 ENDM
 
-	enum movement_turn_away ; $20
+	const movement_turn_away ; $20
 turn_away: MACRO
 	db movement_turn_away | \1
 ENDM
 
-	enum movement_turn_in ; $24
+	const movement_turn_in ; $24
 turn_in: MACRO
 	db movement_turn_in | \1
 ENDM
 
-	enum movement_turn_waterfall ; $28
+	const movement_turn_waterfall ; $28
 turn_waterfall: MACRO
 	db movement_turn_waterfall | \1
 ENDM
 
-	enum movement_slow_jump_step ; $2c
+	const movement_slow_jump_step ; $2c
 slow_jump_step: MACRO
 	db movement_slow_jump_step | \1
 ENDM
 
-	enum movement_jump_step ; $30
+	const movement_jump_step ; $30
 jump_step: MACRO
 	db movement_jump_step | \1
 ENDM
 
-	enum movement_fast_jump_step ; $34
+	const movement_fast_jump_step ; $34
 fast_jump_step: MACRO
 	db movement_fast_jump_step | \1
 ENDM
 
-__enumdir__ = 1
+const_inc = 1
 
 ; Control
-	enum movement_remove_sliding ; $38
+	const movement_remove_sliding ; $38
 remove_sliding: MACRO
 	db movement_remove_sliding
 ENDM
 
-	enum movement_set_sliding ; $39
+	const movement_set_sliding ; $39
 set_sliding: MACRO
 	db movement_set_sliding
 ENDM
 
-	enum movement_remove_fixed_facing ; $3a
+	const movement_remove_fixed_facing ; $3a
 remove_fixed_facing: MACRO
 	db movement_remove_fixed_facing
 ENDM
 
-	enum movement_fix_facing ; $3b
+	const movement_fix_facing ; $3b
 fix_facing: MACRO
 	db movement_fix_facing
 ENDM
 
-	enum movement_show_object ; $3c
+	const movement_show_object ; $3c
 show_object: MACRO
 	db movement_show_object
 ENDM
 
-	enum movement_hide_object ; $3d
+	const movement_hide_object ; $3d
 hide_object: MACRO
 	db movement_hide_object
 ENDM
 
 ; Sleep
 
-	enum movement_step_sleep ; $3e
+	const movement_step_sleep ; $3e
 step_sleep: MACRO
 if \1 <= 8
 	db movement_step_sleep + \1 - 1
@@ -117,104 +117,104 @@ else
 endc
 ENDM
 
-__enum__ = __enum__ + 8
+const_value = const_value + 8
 
-	enum movement_step_end ; $47
+	const movement_step_end ; $47
 step_end: MACRO
 	db movement_step_end
 ENDM
 
-	enum movement_step_48 ; $48
+	const movement_step_48 ; $48
 step_48: MACRO
 	db movement_step_48
 	db \1 ; ???
 ENDM
 
-	enum movement_remove_object ; $49
+	const movement_remove_object ; $49
 remove_object: MACRO
 	db movement_remove_object
 ENDM
 
-	enum movement_step_loop ; $4a
+	const movement_step_loop ; $4a
 step_loop: MACRO
 	db movement_step_loop
 ENDM
 
-	enum movement_step_4b ; $4b
+	const movement_step_4b ; $4b
 step_4b: MACRO
 	db movement_step_4b
 ENDM
 
-	enum movement_teleport_from ; $4c
+	const movement_teleport_from ; $4c
 teleport_from: MACRO
 	db movement_teleport_from
 ENDM
 
-	enum movement_teleport_to ; $4d
+	const movement_teleport_to ; $4d
 teleport_to: MACRO
 	db movement_teleport_to
 ENDM
 
-	enum movement_skyfall ; $4e
+	const movement_skyfall ; $4e
 skyfall: MACRO
 	db movement_skyfall
 ENDM
 
-	enum movement_step_dig ; $4f
+	const movement_step_dig ; $4f
 step_dig: MACRO
 	db movement_step_dig
 	db \1 ; length
 ENDM
 
-	enum movement_step_bump ; $50
+	const movement_step_bump ; $50
 step_bump: MACRO
 	db movement_step_bump
 ENDM
 
-	enum movement_fish_got_bite ; $51
+	const movement_fish_got_bite ; $51
 fish_got_bite: MACRO
 	db movement_fish_got_bite
 ENDM
 
-	enum movement_fish_cast_rod ; $52
+	const movement_fish_cast_rod ; $52
 fish_cast_rod: MACRO
 	db movement_fish_cast_rod
 ENDM
 
-	enum movement_hide_emote ; $53
+	const movement_hide_emote ; $53
 hide_emote: MACRO
 	db movement_hide_emote
 ENDM
 
-	enum movement_show_emote ; $54
+	const movement_show_emote ; $54
 show_emote: MACRO
 	db movement_show_emote
 ENDM
 
-	enum movement_step_shake ; $55
+	const movement_step_shake ; $55
 step_shake: MACRO
 	db movement_step_shake
 	db \1 ; displacement
 ENDM
 
-	enum movement_tree_shake ; $56
+	const movement_tree_shake ; $56
 tree_shake: MACRO
 	db movement_tree_shake
 ENDM
 
-	enum movement_rock_smash ; $57
+	const movement_rock_smash ; $57
 rock_smash: MACRO
 	db movement_rock_smash
 	db \1 ; length
 ENDM
 
-	enum movement_return_dig ; $58
+	const movement_return_dig ; $58
 return_dig: MACRO
 	db movement_return_dig
 	db \1 ; length
 ENDM
 
-	enum movement_skyfall_top ; $59
+	const movement_skyfall_top ; $59
 skyfall_top: MACRO
 	db movement_skyfall_top
 ENDM