Merge pull request #443 from xCrystal/master

Misc style cleanup and documentation

1 files changed, 94 insertions, 94 deletions

diff --git a/macros/scripts/trade_anims.asm b/macros/scripts/trade_anims.asm
index 4b0291eea..94c9070aa 100644
--- a/macros/scripts/trade_anims.asm
+++ b/macros/scripts/trade_anims.asm
@@ -2,254 +2,254 @@
 	enum_start
 
 	enum tradeanim_next_command ; $00
-tradeanim_next: macro
+tradeanim_next: MACRO
 	db tradeanim_next_command
-endm
+ENDM
 
 	enum tradeanim_show_givemon_data_command ; $01
-tradeanim_show_givemon_data: macro
+tradeanim_show_givemon_data: MACRO
 	db tradeanim_show_givemon_data_command
-endm
+ENDM
 
 	enum tradeanim_show_getmon_data_command ; $02
-tradeanim_show_getmon_data: macro
+tradeanim_show_getmon_data: MACRO
 	db tradeanim_show_getmon_data_command
-endm
+ENDM
 
 	enum tradeanim_enter_link_tube_command ; $03
-tradeanim_enter_link_tube: macro
+tradeanim_enter_link_tube: MACRO
 	db tradeanim_enter_link_tube_command
-endm
+ENDM
 
 __enum__ set $5
 
 	enum tradeanim_exit_link_tube_command ; $05
-tradeanim_exit_link_tube: macro
+tradeanim_exit_link_tube: MACRO
 	db tradeanim_exit_link_tube_command
-endm
+ENDM
 
 	enum tradeanim_tube_to_ot_command ; $06
-tradeanim_tube_to_ot: macro
+tradeanim_tube_to_ot: MACRO
 	db tradeanim_tube_to_ot_command
-endm
+ENDM
 
 __enum__ set $0e
 
 	enum tradeanim_tube_to_player_command ; $0e
-tradeanim_tube_to_player: macro
+tradeanim_tube_to_player: MACRO
 	db tradeanim_tube_to_player_command
-endm
+ENDM
 
 __enum__ set $16
 
 	enum tradeanim_sent_to_ot_text_command ; $16
-tradeanim_sent_to_ot_text: macro
+tradeanim_sent_to_ot_text: MACRO
 	db tradeanim_sent_to_ot_text_command
-endm
+ENDM
 
 	enum tradeanim_ot_bids_farewell_command ; $17
-tradeanim_ot_bids_farewell: macro
+tradeanim_ot_bids_farewell: MACRO
 	db tradeanim_ot_bids_farewell_command
-endm
+ENDM
 
 	enum tradeanim_take_care_of_text_command ; $18
-tradeanim_take_care_of_text: macro
+tradeanim_take_care_of_text: MACRO
 	db tradeanim_take_care_of_text_command
-endm
+ENDM
 
 	enum tradeanim_ot_sends_text_1_command ; $19
-tradeanim_ot_sends_text_1: macro
+tradeanim_ot_sends_text_1: MACRO
 	db tradeanim_ot_sends_text_1_command
-endm
+ENDM
 
 	enum tradeanim_ot_sends_text_2_command ; $1a
-tradeanim_ot_sends_text_2: macro
+tradeanim_ot_sends_text_2: MACRO
 	db tradeanim_ot_sends_text_2_command
-endm
+ENDM
 
 	enum tradeanim_setup_givemon_scroll_command ; $1b
-tradeanim_setup_givemon_scroll: macro
+tradeanim_setup_givemon_scroll: MACRO
 	db tradeanim_setup_givemon_scroll_command
-endm
+ENDM
 
 	enum tradeanim_do_givemon_scroll_command ; $1c
-tradeanim_do_givemon_scroll: macro
+tradeanim_do_givemon_scroll: MACRO
 	db tradeanim_do_givemon_scroll_command
-endm
+ENDM
 
 	enum tradeanim_frontpic_scroll_command ; $1d
-tradeanim_frontpic_scroll: macro
+tradeanim_frontpic_scroll: MACRO
 	db tradeanim_frontpic_scroll_command
-endm
+ENDM
 
 	enum tradeanim_textbox_scroll_command ; $1e
-tradeanim_textbox_scroll: macro
+tradeanim_textbox_scroll: MACRO
 	db tradeanim_textbox_scroll_command
-endm
+ENDM
 
 	enum tradeanim_scroll_out_right_command ; $1f
-tradeanim_scroll_out_right: macro
+tradeanim_scroll_out_right: MACRO
 	db tradeanim_scroll_out_right_command
-endm
+ENDM
 
 __enum__ set $21
 
 	enum tradeanim_wait_80_command ; $21
-tradeanim_wait_80: macro
+tradeanim_wait_80: MACRO
 	db tradeanim_wait_80_command
-endm
+ENDM
 
 	enum tradeanim_wait_40_command ; $22
-tradeanim_wait_40: macro
+tradeanim_wait_40: MACRO
 	db tradeanim_wait_40_command
-endm
+ENDM
 
 	enum tradeanim_rocking_ball_command ; $23
-tradeanim_rocking_ball: macro
+tradeanim_rocking_ball: MACRO
 	db tradeanim_rocking_ball_command
-endm
+ENDM
 
 	enum tradeanim_drop_ball_command ; $24
-tradeanim_drop_ball: macro
+tradeanim_drop_ball: MACRO
 	db tradeanim_drop_ball_command
-endm
+ENDM
 
 	enum tradeanim_wait_anim_command ; $25
-tradeanim_wait_anim: macro
+tradeanim_wait_anim: MACRO
 	db tradeanim_wait_anim_command
-endm
+ENDM
 
 __enum__ set $27
 
 	enum tradeanim_poof_command ; $27
-tradeanim_poof: macro
+tradeanim_poof: MACRO
 	db tradeanim_poof_command
-endm
+ENDM
 
 	enum tradeanim_bulge_through_tube_command ; $28
-tradeanim_bulge_through_tube: macro
+tradeanim_bulge_through_tube: MACRO
 	db tradeanim_bulge_through_tube_command
-endm
+ENDM
 
 	enum tradeanim_give_trademon_sfx_command ; $29
-tradeanim_give_trademon_sfx: macro
+tradeanim_give_trademon_sfx: MACRO
 	db tradeanim_give_trademon_sfx_command
-endm
+ENDM
 
 	enum tradeanim_get_trademon_sfx_command ; $2a
-tradeanim_get_trademon_sfx: macro
+tradeanim_get_trademon_sfx: MACRO
 	db tradeanim_get_trademon_sfx_command
-endm
+ENDM
 
 	enum tradeanim_end_command ; $2b
-tradeanim_end: macro
+tradeanim_end: MACRO
 	db tradeanim_end_command
-endm
+ENDM
 
 	enum tradeanim_animate_frontpic_command ; $2c
-tradeanim_animate_frontpic: macro
+tradeanim_animate_frontpic: MACRO
 	db tradeanim_animate_frontpic_command
-endm
+ENDM
 
 	enum tradeanim_wait_96_command ; $2d
-tradeanim_wait_96: macro
+tradeanim_wait_96: MACRO
 	db tradeanim_wait_96_command
-endm
+ENDM
 
 	enum tradeanim_wait_80_if_ot_egg_command ; $2e
-tradeanim_wait_80_if_ot_egg: macro
+tradeanim_wait_80_if_ot_egg: MACRO
 	db tradeanim_wait_80_if_ot_egg_command
-endm
+ENDM
 
 	enum tradeanim_wait_180_if_ot_egg_command ; $2f
-tradeanim_wait_180_if_ot_egg: macro
+tradeanim_wait_180_if_ot_egg: MACRO
 	db tradeanim_wait_180_if_ot_egg_command
-endm
+ENDM
 
 
 ; Mobile
 	enum_start $01
 
 	enum mobiletradeanim_showgivemon_command ; $01
-mobiletradeanim_showgivemon: macro
+mobiletradeanim_showgivemon: MACRO
 	db mobiletradeanim_showgivemon_command
-endm
+ENDM
 
 	enum mobiletradeanim_02_command ; $02
-mobiletradeanim_02: macro
+mobiletradeanim_02: MACRO
 	db mobiletradeanim_02_command
-endm
+ENDM
 
 	enum mobiletradeanim_sendmon_command ; $03
-mobiletradeanim_sendmon: macro
+mobiletradeanim_sendmon: MACRO
 	db mobiletradeanim_sendmon_command
-endm
+ENDM
 
 __enum__ set $05
 
 	enum mobiletradeanim_05_command ; $05
-mobiletradeanim_05: macro
+mobiletradeanim_05: MACRO
 	db mobiletradeanim_05_command
-endm
+ENDM
 
 	enum mobiletradeanim_06_command ; $06
-mobiletradeanim_06: macro
+mobiletradeanim_06: MACRO
 	db mobiletradeanim_06_command
-endm
+ENDM
 
 	enum mobiletradeanim_07_command ; $07
-mobiletradeanim_07: macro
+mobiletradeanim_07: MACRO
 	db mobiletradeanim_07_command
-endm
+ENDM
 
 	enum mobiletradeanim_receivemon_command ; $08
-mobiletradeanim_receivemon: macro
+mobiletradeanim_receivemon: MACRO
 	db mobiletradeanim_receivemon_command
-endm
+ENDM
 
 __enum__ set $0b
 
 	enum mobiletradeanim_showgetmon_command ; $0b
-mobiletradeanim_showgetmon: macro
+mobiletradeanim_showgetmon: MACRO
 	db mobiletradeanim_showgetmon_command
-endm
+ENDM
 
 	enum mobiletradeanim_end_command ; $0c
-mobiletradeanim_end: macro
+mobiletradeanim_end: MACRO
 	db mobiletradeanim_end_command
-endm
+ENDM
 
 	enum mobiletradeanim_showgtsgivemon_command ; $0d
-mobiletradeanim_showgtsgivemon: macro
+mobiletradeanim_showgtsgivemon: MACRO
 	db mobiletradeanim_showgtsgivemon_command
-endm
+ENDM
 
 	enum mobiletradeanim_showgtsgetmon_command ; $0e
-mobiletradeanim_showgtsgetmon: macro
+mobiletradeanim_showgtsgetmon: MACRO
 	db mobiletradeanim_showgtsgetmon_command
-endm
+ENDM
 
 	enum mobiletradeanim_0f_command ; $0f
-mobiletradeanim_0f: macro
+mobiletradeanim_0f: MACRO
 	db mobiletradeanim_0f_command
-endm
+ENDM
 
 	enum mobiletradeanim_10_command ; $10
-mobiletradeanim_10: macro
+mobiletradeanim_10: MACRO
 	db mobiletradeanim_10_command
-endm
+ENDM
 
 	enum mobiletradeanim_11_command ; $11
-mobiletradeanim_11: macro
+mobiletradeanim_11: MACRO
 	db mobiletradeanim_11_command
-endm
+ENDM
 
 	enum mobiletradeanim_12_command ; $12
-mobiletradeanim_12: macro
+mobiletradeanim_12: MACRO
 	db mobiletradeanim_12_command
-endm
+ENDM
 
 	enum mobiletradeanim_showoddegg_command ; $13
-mobiletradeanim_showoddegg: macro
+mobiletradeanim_showoddegg: MACRO
 	db mobiletradeanim_showoddegg_command
-endm
+ENDM