From e48a401290e794854880f06fc230a369f37e6b9b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 14 Dec 2017 00:36:24 -0500 Subject: Reorganize macros --- macros/scripts/movement.asm | 247 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) create mode 100644 macros/scripts/movement.asm (limited to 'macros/scripts/movement.asm') diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm new file mode 100644 index 000000000..a2acf1356 --- /dev/null +++ b/macros/scripts/movement.asm @@ -0,0 +1,247 @@ +; MovementPointers indexes (see engine/movement.asm) + enum_start + +; Directional movements + + enum movement_turn_head +turn_head: macro + db movement_turn_head | \1 ; $00 + endm + +__enum__ = __enum__ + 3 + + enum movement_turn_step +turn_step: macro + db movement_turn_step | \1 ; $04 + endm + +__enum__ = __enum__ + 3 + + enum movement_slow_step +slow_step: macro + db movement_slow_step | \1; $08 + endm + +__enum__ = __enum__ + 3 + + enum movement_step +step: macro + db movement_step | \1 ; $0c + endm + +__enum__ = __enum__ + 3 + + enum movement_big_step +big_step: macro + db movement_big_step | \1 ; $10 + endm + +__enum__ = __enum__ + 3 + + enum movement_slow_slide_step +slow_slide_step: macro + db movement_slow_slide_step | \1 ; $14 + endm + +__enum__ = __enum__ + 3 + + enum movement_slide_step +slide_step: macro + db movement_slide_step | \1 ; $18 + endm + +__enum__ = __enum__ + 3 + + enum movement_fast_slide_step +fast_slide_step: macro + db movement_fast_slide_step | \1 ; $1c + endm + +__enum__ = __enum__ + 3 + + enum movement_turn_away +turn_away: macro + db movement_turn_away | \1 ; $20 + endm + +__enum__ = __enum__ + 3 + + enum movement_turn_in +turn_in: macro + db movement_turn_in | \1 ; $24 + endm + +__enum__ = __enum__ + 3 + + enum movement_turn_waterfall +turn_waterfall: macro + db movement_turn_waterfall | \1 ; $28 + endm + +__enum__ = __enum__ + 3 + + enum movement_slow_jump_step +slow_jump_step: macro + db movement_slow_jump_step | \1 ; $2c + endm + +__enum__ = __enum__ + 3 + + enum movement_jump_step +jump_step: macro + db movement_jump_step | \1 ; $30 + endm + +__enum__ = __enum__ + 3 + + enum movement_fast_jump_step +fast_jump_step: macro + db movement_fast_jump_step | \1 ; $34 + endm + +__enum__ = __enum__ + 3 + +; Control + 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 + +; Sleep + + enum movement_step_sleep +step_sleep: macro +if \1 <= 8 + db movement_step_sleep + \1 - 1 +else + db movement_step_sleep + 8, \1 +endc +endm + +__enum__ = __enum__ + 8 + + enum movement_step_end +step_end: macro + db movement_step_end ; $47 + endm + +; Whatever Movement_48 is, it takes a one-byte parameter + enum movement_step_48 +step_48: macro + db movement_step_48 + db \1 + endm + + 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 + db \1 ; displacement + endm + + enum movement_tree_shake +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 -- cgit v1.2.3 From fecc5c339adf8d4c2939364e49e4ba5c46f207ba Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 15 Dec 2017 00:38:52 -0500 Subject: More comments for macros --- macros/scripts/movement.asm | 163 ++++++++++++++++++++++---------------------- 1 file changed, 81 insertions(+), 82 deletions(-) (limited to 'macros/scripts/movement.asm') diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm index a2acf1356..28be559a3 100644 --- a/macros/scripts/movement.asm +++ b/macros/scripts/movement.asm @@ -3,138 +3,138 @@ ; Directional movements - enum movement_turn_head + enum movement_turn_head ; $00 turn_head: macro - db movement_turn_head | \1 ; $00 + db movement_turn_head | \1 endm __enum__ = __enum__ + 3 - enum movement_turn_step + enum movement_turn_step ; $04 turn_step: macro - db movement_turn_step | \1 ; $04 + db movement_turn_step | \1 endm __enum__ = __enum__ + 3 - enum movement_slow_step + enum movement_slow_step ; $08 slow_step: macro - db movement_slow_step | \1; $08 + db movement_slow_step | \1 endm __enum__ = __enum__ + 3 - enum movement_step + enum movement_step ; $0c step: macro - db movement_step | \1 ; $0c + db movement_step | \1 endm __enum__ = __enum__ + 3 - enum movement_big_step + enum movement_big_step ; $10 big_step: macro - db movement_big_step | \1 ; $10 + db movement_big_step | \1 endm __enum__ = __enum__ + 3 - enum movement_slow_slide_step + enum movement_slow_slide_step ; $14 slow_slide_step: macro - db movement_slow_slide_step | \1 ; $14 + db movement_slow_slide_step | \1 endm __enum__ = __enum__ + 3 - enum movement_slide_step + enum movement_slide_step ; $18 slide_step: macro - db movement_slide_step | \1 ; $18 + db movement_slide_step | \1 endm __enum__ = __enum__ + 3 - enum movement_fast_slide_step + enum movement_fast_slide_step ; $1c fast_slide_step: macro - db movement_fast_slide_step | \1 ; $1c + db movement_fast_slide_step | \1 endm __enum__ = __enum__ + 3 - enum movement_turn_away + enum movement_turn_away ; $20 turn_away: macro - db movement_turn_away | \1 ; $20 + db movement_turn_away | \1 endm __enum__ = __enum__ + 3 - enum movement_turn_in + enum movement_turn_in ; $24 turn_in: macro - db movement_turn_in | \1 ; $24 + db movement_turn_in | \1 endm __enum__ = __enum__ + 3 - enum movement_turn_waterfall + enum movement_turn_waterfall ; $28 turn_waterfall: macro - db movement_turn_waterfall | \1 ; $28 + db movement_turn_waterfall | \1 endm __enum__ = __enum__ + 3 - enum movement_slow_jump_step + enum movement_slow_jump_step ; $2c slow_jump_step: macro - db movement_slow_jump_step | \1 ; $2c + db movement_slow_jump_step | \1 endm __enum__ = __enum__ + 3 - enum movement_jump_step + enum movement_jump_step ; $30 jump_step: macro - db movement_jump_step | \1 ; $30 + db movement_jump_step | \1 endm __enum__ = __enum__ + 3 - enum movement_fast_jump_step + enum movement_fast_jump_step ; $34 fast_jump_step: macro - db movement_fast_jump_step | \1 ; $34 + db movement_fast_jump_step | \1 endm __enum__ = __enum__ + 3 ; Control - enum movement_remove_sliding + enum movement_remove_sliding ; $38 remove_sliding: macro - db movement_remove_sliding ; $38 + db movement_remove_sliding endm - enum movement_set_sliding + enum movement_set_sliding ; $39 set_sliding: macro - db movement_set_sliding ; $39 + db movement_set_sliding endm - enum movement_remove_fixed_facing + enum movement_remove_fixed_facing ; $3a remove_fixed_facing: macro - db movement_remove_fixed_facing ; $3a + db movement_remove_fixed_facing endm - enum movement_fix_facing + enum movement_fix_facing ; $3b fix_facing: macro - db movement_fix_facing ; $3b + db movement_fix_facing endm - enum movement_show_person + enum movement_show_person ; $3c show_person: macro - db movement_show_person ; $3c + db movement_show_person endm - enum movement_hide_person + enum movement_hide_person ; $3d hide_person: macro - db movement_hide_person ; $3d + db movement_hide_person endm ; Sleep - enum movement_step_sleep + enum movement_step_sleep ; $3e step_sleep: macro if \1 <= 8 db movement_step_sleep + \1 - 1 @@ -145,103 +145,102 @@ endm __enum__ = __enum__ + 8 - enum movement_step_end + enum movement_step_end ; $47 step_end: macro - db movement_step_end ; $47 + db movement_step_end endm -; Whatever Movement_48 is, it takes a one-byte parameter - enum movement_step_48 + enum movement_step_48 ; $48 step_48: macro db movement_step_48 - db \1 + db \1 ; ??? endm - enum movement_remove_person + enum movement_remove_person ; $49 remove_person: macro - db movement_remove_person ; $49 + db movement_remove_person endm - enum movement_step_loop + enum movement_step_loop ; $4a step_loop: macro - db movement_step_loop ; $4a + db movement_step_loop endm - enum movement_step_4b + enum movement_step_4b ; $4b step_4b: macro - db movement_step_4b ; $4b + db movement_step_4b endm - enum movement_teleport_from + enum movement_teleport_from ; $4c teleport_from: macro - db movement_teleport_from ; $4c + db movement_teleport_from endm - enum movement_teleport_to + enum movement_teleport_to ; $4d teleport_to: macro - db movement_teleport_to ; $4d + db movement_teleport_to endm - enum movement_skyfall + enum movement_skyfall ; $4e skyfall: macro - db movement_skyfall ; $4e + db movement_skyfall endm - enum movement_step_dig + enum movement_step_dig ; $4f step_dig: macro - db movement_step_dig ; $4f - db \1 + db movement_step_dig + db \1 ; length endm - enum movement_step_bump + enum movement_step_bump ; $50 step_bump: macro - db movement_step_bump ; $50 + db movement_step_bump endm - enum movement_fish_got_bite + enum movement_fish_got_bite ; $51 fish_got_bite: macro - db movement_fish_got_bite ; $51 + db movement_fish_got_bite endm - enum movement_fish_cast_rod + enum movement_fish_cast_rod ; $52 fish_cast_rod: macro - db movement_fish_cast_rod ; $52 + db movement_fish_cast_rod endm - enum movement_hide_emote + enum movement_hide_emote ; $53 hide_emote: macro - db movement_hide_emote ; $53 + db movement_hide_emote endm - enum movement_show_emote + enum movement_show_emote ; $54 show_emote: macro - db movement_show_emote ; $54 + db movement_show_emote endm - enum movement_step_shake + enum movement_step_shake ; $55 step_shake: macro - db movement_step_shake ; $55 + db movement_step_shake db \1 ; displacement endm - enum movement_tree_shake + enum movement_tree_shake ; $56 tree_shake: macro db movement_tree_shake endm - enum movement_rock_smash + enum movement_rock_smash ; $57 rock_smash: macro - db movement_rock_smash ; $57 - db \1 + db movement_rock_smash + db \1 ; length endm - enum movement_return_dig + enum movement_return_dig ; $58 return_dig: macro - db movement_return_dig ; $58 - db \1 + db movement_return_dig + db \1 ; length endm - enum movement_skyfall_top + enum movement_skyfall_top ; $59 skyfall_top: macro - db movement_skyfall_top ; $59 + db movement_skyfall_top endm -- cgit v1.2.3