Merge pull request #330 from PikalaxALT/scriptmacrorenaming

Scriptmacrorenaming

6 files changed, 325 insertions, 187 deletions

diff --git a/macros/event.asm b/macros/event.asm
index 18483abc3..23fa9c034 100644
--- a/macros/event.asm
+++ b/macros/event.asm
@@ -9,8 +9,7 @@ scall: macro
 	enum farscall_command
 farscall: macro
 	db farscall_command
-	db BANK(\1)
-	dw \1
+	dba \1
 	endm
 
 	enum ptcall_command
@@ -28,8 +27,7 @@ jump: macro
 	enum farjump_command
 farjump: macro
 	db farjump_command
-	db BANK(\1)
-	dw \1
+	dba \1
 	endm
 
 	enum ptjump_command
@@ -93,8 +91,7 @@ callstd: macro
 	enum callasm_command
 callasm: macro
 	db callasm_command
-	db BANK(\1)
-	dw \1
+	dba \1
 	endm
 
 
@@ -106,8 +103,7 @@ special: macro
 
 add_special: MACRO
 \1Special::
-	db BANK(\1)
-	dw \1
+	dba \1
 ENDM
 
 
@@ -480,9 +476,9 @@ pocketisfull: macro
 	db pocketisfull_command
 	endm
 
-	enum loadfont_command
-loadfont: macro
-	db loadfont_command
+	enum opentext_command
+opentext: macro
+	db opentext_command
 	endm
 
 	enum refreshscreen_command
@@ -491,9 +487,9 @@ refreshscreen: macro
 	db \1 ; dummy
 	endm
 
-	enum loadmovesprites_command
-loadmovesprites: macro
-	db loadmovesprites_command
+	enum closetext_command
+closetext: macro
+	db closetext_command
 	endm
 
 	enum loadbytec2cf_command
@@ -505,8 +501,7 @@ loadbytec2cf: macro
 	enum farwritetext_command
 farwritetext: macro
 	db farwritetext_command
-	db BANK(\1)
-	dw \1
+	dba \1
 	endm
 
 	enum writetext_command
@@ -533,9 +528,9 @@ loadmenudata: macro
 	dw \1 ; data
 	endm
 
-	enum writebackup_command
-writebackup: macro
-	db writebackup_command
+	enum closewindow_command
+closewindow: macro
+	db closewindow_command
 	endm
 
 	enum jumptextfaceplayer_command
@@ -548,8 +543,7 @@ jumptextfaceplayer: macro
 	enum farjumptext_command
 farjumptext: macro
 	db farjumptext_command
-	db BANK(\1)
-	dw \1
+	dba \1
 	endm
 ; ENDC
 
@@ -559,14 +553,14 @@ jumptext: macro
 	dw \1 ; text_pointer
 	endm
 
-	enum closetext_command
-closetext: macro
-	db closetext_command
+	enum waitbutton_command
+waitbutton: macro
+	db waitbutton_command
 	endm
 
-	enum keeptextopen_command
-keeptextopen: macro
-	db keeptextopen_command
+	enum buttonsound_command
+buttonsound: macro
+	db buttonsound_command
 	endm
 
 	enum pokepic_command
@@ -575,19 +569,19 @@ pokepic: macro
 	db \1 ; pokemon
 	endm
 
-	enum pokepicyesorno_command
-pokepicyesorno: macro
-	db pokepicyesorno_command
+	enum closepokepic_command
+closepokepic: macro
+	db closepokepic_command
 	endm
 
-	enum interpretmenu_command
-interpretmenu: macro
-	db interpretmenu_command
+	enum _2dmenu_command
+_2dmenu: macro
+	db _2dmenu_command
 	endm
 
-	enum interpretmenu2_command
-interpretmenu2: macro
-	db interpretmenu2_command
+	enum verticalmenu_command
+verticalmenu: macro
+	db verticalmenu_command
 	endm
 
 	enum loadpikachudata_command
@@ -595,19 +589,19 @@ loadpikachudata: macro
 	db loadpikachudata_command
 	endm
 
-	enum battlecheck_command
-battlecheck: macro
-	db battlecheck_command
+	enum randomwildmon_command
+randomwildmon: macro
+	db randomwildmon_command
 	endm
 
-	enum loadtrainerdata_command
-loadtrainerdata: macro
-	db loadtrainerdata_command
+	enum loadmemtrainer_command
+loadmemtrainer: macro
+	db loadmemtrainer_command
 	endm
 
-	enum loadpokedata_command
-loadpokedata: macro
-	db loadpokedata_command
+	enum loadwildmon_command
+loadwildmon: macro
+	db loadwildmon_command
 	db \1 ; pokemon
 	db \2 ; level
 	endm
@@ -624,9 +618,9 @@ startbattle: macro
 	db startbattle_command
 	endm
 
-	enum returnafterbattle_command
-returnafterbattle: macro
-	db returnafterbattle_command
+	enum reloadmapafterbattle_command
+reloadmapafterbattle: macro
+	db reloadmapafterbattle_command
 	endm
 
 	enum catchtutorial_command
@@ -641,9 +635,9 @@ trainertext: macro
 	db \1 ; which_text
 	endm
 
-	enum trainerstatus_command
-trainerstatus: macro
-	db trainerstatus_command
+	enum trainerflagaction_command
+trainerflagaction: macro
+	db trainerflagaction_command
 	db \1 ; action
 	endm
 
@@ -659,14 +653,14 @@ scripttalkafter: macro
 	db scripttalkafter_command
 	endm
 
-	enum talkaftercancel_command
-talkaftercancel: macro
-	db talkaftercancel_command
+	enum end_if_just_battled_command
+end_if_just_battled: macro
+	db end_if_just_battled_command
 	endm
 
-	enum talkaftercheck_command
-talkaftercheck: macro
-	db talkaftercheck_command
+	enum check_just_battled_command
+check_just_battled: macro
+	db check_just_battled_command
 	endm
 
 	enum setlasttalked_command
@@ -822,9 +816,9 @@ playmusic: macro
 	dw \1 ; music_pointer
 	endm
 
-	enum playrammusic_command
-playrammusic: macro
-	db playrammusic_command
+	enum encountermusic_command
+encountermusic: macro
+	db encountermusic_command
 	endm
 
 	enum musicfadeout_command
@@ -839,9 +833,9 @@ playmapmusic: macro
 	db playmapmusic_command
 	endm
 
-	enum reloadmapmusic_command
-reloadmapmusic: macro
-	db reloadmapmusic_command
+	enum dontrestartmapmusic_command
+dontrestartmapmusic: macro
+	db dontrestartmapmusic_command
 	endm
 
 	enum cry_command
@@ -856,9 +850,9 @@ playsound: macro
 	dw \1 ; sound_pointer
 	endm
 
-	enum waitbutton_command
-waitbutton: macro
-	db waitbutton_command
+	enum waitsfx_command
+waitsfx: macro
+	db waitsfx_command
 	endm
 
 	enum warpsound_command
@@ -928,9 +922,9 @@ reloadandreturn: macro
 	db \1 ; which_method
 	endm
 
-	enum resetfuncs_command
-resetfuncs: macro
-	db resetfuncs_command
+	enum end_all_command
+end_all: macro
+	db end_all_command
 	endm
 
 	enum pokemart_command
@@ -1010,9 +1004,9 @@ verbosegiveitem2: macro
 	db \2 ; var
 	endm
 
-	enum loadwilddata_command
-loadwilddata: macro
-	db loadwilddata_command
+	enum swarm_command
+swarm: macro
+	db swarm_command
 	db \1 ; flag
 	map \2 ; map
 	endm
@@ -1042,9 +1036,9 @@ battletowertext: macro
 	db \1 ; memory
 	endm
 
-	enum displaylocation_command
-displaylocation: macro
-	db displaylocation_command
+	enum landmarktotext_command
+landmarktotext: macro
+	db landmarktotext_command
 	db \1 ; id
 	db \2 ; memory
 	endm
diff --git a/macros/map.asm b/macros/map.asm
index 113b05898..519e2eb76 100644
--- a/macros/map.asm
+++ b/macros/map.asm
@@ -170,3 +170,16 @@ elevfloor: MACRO
 	db \1, \2
 	map \3
 ENDM
+
+itemball: MACRO
+if _NARG == 2
+	db \1, \2
+else
+	db \1, 1
+endc
+endm
+
+stonetable: MACRO
+	db \1, \2
+	dw \3
+endm
diff --git a/macros/move_anim.asm b/macros/move_anim.asm
index e8f918a29..05faf253d 100644
--- a/macros/move_anim.asm
+++ b/macros/move_anim.asm
@@ -11,9 +11,9 @@ endc
 anim_obj: macro
 	db anim_obj_command
 	db \1 ; obj
-	db \2 ; x
-	db \3 ; y
-	db \4 ; param
+	db (\2 << 3) + \3 ; x
+	db (\4 << 3) + \5 ; y
+	db \6 ; param
 	endm
 
 	enum anim_1gfx_command ; d1
@@ -113,8 +113,8 @@ anim_resetobp0: macro
 	enum anim_sound_command ; e0
 anim_sound: macro
 	db anim_sound_command
-	db \1 ; tracks
-	db \2 ; id
+	db (\1 << 2) | \2 ; duration, tracks
+	db \3 ; id
 	endm
 
 	enum anim_cry_command ; e1
diff --git a/macros/movement.asm b/macros/movement.asm
index c354b0d5c..fd4852e8a 100644
--- a/macros/movement.asm
+++ b/macros/movement.asm
@@ -1,3 +1,4 @@
+
 	enum_start
 
 	enum movement_turn_head_down
@@ -20,24 +21,24 @@ turn_head_right: macro
 	db movement_turn_head_right ; $03
 	endm
 
-	enum movement_half_step_down
-half_step_down: macro
-	db movement_half_step_down ; $04
+	enum movement_turn_step_down
+turn_step_down: macro
+	db movement_turn_step_down ; $04
 	endm
 
-	enum movement_half_step_up
-half_step_up: macro
-	db movement_half_step_up ; $05
+	enum movement_turn_step_up
+turn_step_up: macro
+	db movement_turn_step_up ; $05
 	endm
 
-	enum movement_half_step_left
-half_step_left: macro
-	db movement_half_step_left ; $06
+	enum movement_turn_step_left
+turn_step_left: macro
+	db movement_turn_step_left ; $06
 	endm
 
-	enum movement_half_step_right
-half_step_right: macro
-	db movement_half_step_right ; $07
+	enum movement_turn_step_right
+turn_step_right: macro
+	db movement_turn_step_right ; $07
 	endm
 
 	enum movement_slow_step_down
@@ -367,7 +368,10 @@ step_loop: macro
 	db movement_step_loop ; $4a
 	endm
 
-__enum__ = $4c
+	enum movement_step_4b
+step_4b: macro
+	db movement_step_4b ; $4b
+	endm
 
 	enum movement_teleport_from
 teleport_from: macro
@@ -433,3 +437,8 @@ return_dig: macro
 	db movement_return_dig ; $58
 	db \1
 	endm
+
+	enum movement_skyfall_top
+skyfall_top: macro
+	db movement_skyfall_top ; $59
+	endm
diff --git a/macros/sound.asm b/macros/sound.asm
index ae1c192fb..b5a33994b 100644
--- a/macros/sound.asm
+++ b/macros/sound.asm
@@ -3,227 +3,262 @@ note: MACRO
 	ENDM
 
 sound: macro
-	db \1 ; duration
-	db \2 ; intensity
-	dw \3 ; frequency
+	note \1, \2
+	db \3 ; intensity
+	dw \4 ; frequency
 	endm
 
 noise: macro
-	db \1 ; duration
-	db \2 ; intensity
-	db \3 ; frequency
+	note \1, \2 ; duration
+	db \3 ; intensity
+	db \4 ; frequency
 	endm
 
-; pitch
-__ EQU 0
-C_ EQU 1
-C# EQU 2
-D_ EQU 3
-D# EQU 4
-E_ EQU 5
-F_ EQU 6
-F# EQU 7
-G_ EQU 8
-G# EQU 9
-A_ EQU 10
-A# EQU 11
-B_ EQU 12
+musicheader: macro
+	; number of tracks, ??, address
+	dbw ((\1 - 1) << 6) + (\2 - 1), \3
+	endm
 
+cry_header: macro
+	dw \1, \2, \3
+	endm
 
+	enum_start $d8
+	enum notetype_cmd
 octave: macro
-	db $d8 - (\1)
+	db notetype_cmd - (\1)
 	endm
 
 notetype: macro
-	db $d8
+	db notetype_cmd
 	db \1 ; note_length
 	if _NARG >= 2
 	db \2 ; intensity
 	endc
 	endm
 
+	enum forceoctave_cmd
 forceoctave: macro
-	db $d9
+	db forceoctave_cmd
 	db \1 ; octave
 	endm
 
+	enum tempo_cmd
 tempo: macro
-	db $da
+	db tempo_cmd
 	bigdw \1 ; tempo
 	endm
 
+	enum dutycycle_cmd
 dutycycle: macro
-	db $db
+	db dutycycle_cmd
 	db \1 ; duty_cycle
 	endm
 
+	enum intensity_cmd
 intensity: macro
-	db $dc
+	db intensity_cmd
 	db \1 ; intensity
 	endm
 
+	enum soundinput_cmd
 soundinput: macro
-	db $dd
+	db soundinput_cmd
 	db \1 ; input
 	endm
 
+	enum unknownmusic0xde_cmd
 unknownmusic0xde: macro
-	db $de
+	db unknownmusic0xde_cmd
 	db \1 ; unknown
 	endm
 
+	enum togglesfx_cmd
 togglesfx: macro
-	db $df
+	db togglesfx_cmd
 	endm
 
+	enum unknownmusic0xe0_cmd
 unknownmusic0xe0: macro
-	db $e0
+	db unknownmusic0xe0_cmd
 	db \1 ; unknown
-	db \2 ; unknown
+	; db \2 ; unknown
+	dn \2, \3 ; octave, pitch
 	endm
 
+	enum vibrato_cmd
 vibrato: macro
-	db $e1
+	db vibrato_cmd
 	db \1 ; delay
 	db \2 ; extent
 	endm
 
+	enum unknownmusic0xe2_cmd
 unknownmusic0xe2: macro
-	db $e2
+	db unknownmusic0xe2_cmd
 	db \1 ; unknown
 	endm
 
+	enum togglenoise_cmd
 togglenoise: macro
-	db $e3
+	db togglenoise_cmd
 	db \1 ; id
 	endm
 
+	enum panning_cmd
 panning: macro
-	db $e4
+	db panning_cmd
 	db \1 ; tracks
 	endm
 
+	enum volume_cmd
 volume: macro
-	db $e5
+	db volume_cmd
 	db \1 ; volume
 	endm
 
+	enum tone_cmd
 tone: macro
-	db $e6
+	db tone_cmd
 	bigdw \1 ; tone
 	endm
 
+	enum unknownmusic0xe7_cmd
 unknownmusic0xe7: macro
-	db $e7
+	db unknownmusic0xe7_cmd
 	db \1 ; unknown
 	endm
 
+	enum unknownmusic0xe8_cmd
 unknownmusic0xe8: macro
-	db $e8
+	db unknownmusic0xe8_cmd
 	db \1 ; unknown
 	endm
 
-globaltempo: macro
-	db $e9
+	enum tempo_relative_cmd
+tempo_relative: macro
+	db tempo_relative_cmd
 	bigdw \1 ; value
 	endm
 
+	enum restartchannel_cmd
 restartchannel: macro
-	db $ea
+	db restartchannel_cmd
 	dw \1 ; address
 	endm
 
+	enum newsong_cmd
 newsong: macro
-	db $eb
+	db newsong_cmd
 	bigdw \1 ; id
 	endm
 
+	enum sfxpriorityon_cmd
 sfxpriorityon: macro
-	db $ec
+	db sfxpriorityon_cmd
 	endm
 
+	enum sfxpriorityoff_cmd
 sfxpriorityoff: macro
-	db $ed
+	db sfxpriorityoff_cmd
 	endm
 
+	enum unknownmusic0xee_cmd
 unknownmusic0xee: macro
-	db $ee
+	db unknownmusic0xee_cmd
 	dw \1 ; address
 	endm
 
+	enum stereopanning_cmd
 stereopanning: macro
-	db $ef
+	db stereopanning_cmd
 	db \1 ; tracks
 	endm
 
+	enum sfxtogglenoise_cmd
 sfxtogglenoise: macro
-	db $f0
+	db sfxtogglenoise_cmd
 	db \1 ; id
 	endm
 
+	enum music0xf1_cmd
 music0xf1: macro
-	db $f1
+	db music0xf1_cmd
 	endm
 
+	enum music0xf2_cmd
 music0xf2: macro
-	db $f2
+	db music0xf2_cmd
 	endm
 
+	enum music0xf3_cmd
 music0xf3: macro
-	db $f3
+	db music0xf3_cmd
 	endm
 
+	enum music0xf4_cmd
 music0xf4: macro
-	db $f4
+	db music0xf4_cmd
 	endm
 
+	enum music0xf5_cmd
 music0xf5: macro
-	db $f5
+	db music0xf5_cmd
 	endm
 
+	enum music0xf6_cmd
 music0xf6: macro
-	db $f6
+	db music0xf6_cmd
 	endm
 
+	enum music0xf7_cmd
 music0xf7: macro
-	db $f7
+	db music0xf7_cmd
 	endm
 
+	enum music0xf8_cmd
 music0xf8: macro
-	db $f8
+	db music0xf8_cmd
 	endm
 
+	enum unknownmusic0xf9_cmd
 unknownmusic0xf9: macro
-	db $f9
+	db unknownmusic0xf9_cmd
 	endm
 
+	enum setcondition_cmd
 setcondition: macro
-	db $fa
+	db setcondition_cmd
 	db \1 ; condition
 	endm
 
+	enum jumpif_cmd
 jumpif: macro
-	db $fb
+	db jumpif_cmd
 	db \1 ; condition
 	dw \2 ; address
 	endm
 
+	enum jumpchannel_cmd
 jumpchannel: macro
-	db $fc
+	db jumpchannel_cmd
 	dw \1 ; address
 	endm
 
+	enum loopchannel_cmd
 loopchannel: macro
-	db $fd
+	db loopchannel_cmd
 	db \1 ; count
 	dw \2 ; address
 	endm
 
+	enum callchannel_cmd
 callchannel: macro
-	db $fe
+	db callchannel_cmd
 	dw \1 ; address
 	endm
 
+	enum endchannel_cmd
 endchannel: macro
-	db $ff
+	db endchannel_cmd
 	endm
diff --git a/macros/trade_anim.asm b/macros/trade_anim.asm
index 3b2aeaf09..eeaf1589f 100755
--- a/macros/trade_anim.asm
+++ b/macros/trade_anim.asm
@@ -1,166 +1,253 @@
 	enum_start
 	enum tradeanim_next_command
 tradeanim_next: macro
-	db tradeanim_next_command
+	db tradeanim_next_command ; 00
 endm
 
 	enum tradeanim_show_givemon_data_command
 tradeanim_show_givemon_data: macro
-	db tradeanim_show_givemon_data_command
+	db tradeanim_show_givemon_data_command ; 01
 endm
 
 	enum tradeanim_show_getmon_data_command
 tradeanim_show_getmon_data: macro
-	db tradeanim_show_getmon_data_command
+	db tradeanim_show_getmon_data_command ; 02
 endm
 
 	enum tradeanim_enter_link_tube_command
 tradeanim_enter_link_tube: macro
-	db tradeanim_enter_link_tube_command
+	db tradeanim_enter_link_tube_command ; 03
 endm
 
 __enum__ set $5
 
 	enum tradeanim_exit_link_tube_command
 tradeanim_exit_link_tube: macro
-	db tradeanim_exit_link_tube_command
+	db tradeanim_exit_link_tube_command ; 05
 endm
 
 	enum tradeanim_tube_to_ot_command
 tradeanim_tube_to_ot: macro
-	db tradeanim_tube_to_ot_command
+	db tradeanim_tube_to_ot_command ; 06
 endm
 
 __enum__ set $e
 
 	enum tradeanim_tube_to_player_command
 tradeanim_tube_to_player: macro
-	db tradeanim_tube_to_player_command
+	db tradeanim_tube_to_player_command ; 0e
 endm
 
 __enum__ set $16
 
 	enum tradeanim_sent_to_ot_text_command
 tradeanim_sent_to_ot_text: macro
-	db tradeanim_sent_to_ot_text_command
+	db tradeanim_sent_to_ot_text_command ; 16
 endm
 
 	enum tradeanim_ot_bids_farewell_command
 tradeanim_ot_bids_farewell: macro
-	db tradeanim_ot_bids_farewell_command
+	db tradeanim_ot_bids_farewell_command ; 17
 endm
 
 	enum tradeanim_take_care_of_text_command
 tradeanim_take_care_of_text: macro
-	db tradeanim_take_care_of_text_command
+	db tradeanim_take_care_of_text_command ; 18
 endm
 
 	enum tradeanim_ot_sends_text_1_command
 tradeanim_ot_sends_text_1: macro
-	db tradeanim_ot_sends_text_1_command
+	db tradeanim_ot_sends_text_1_command ; 19
 endm
 
 	enum tradeanim_ot_sends_text_2_command
 tradeanim_ot_sends_text_2: macro
-	db tradeanim_ot_sends_text_2_command
+	db tradeanim_ot_sends_text_2_command ; 1a
 endm
 
 	enum tradeanim_setup_givemon_scroll_command
 tradeanim_setup_givemon_scroll: macro
-	db tradeanim_setup_givemon_scroll_command
+	db tradeanim_setup_givemon_scroll_command ; 1b
 endm
 
 	enum tradeanim_do_givemon_scroll_command
 tradeanim_do_givemon_scroll: macro
-	db tradeanim_do_givemon_scroll_command
+	db tradeanim_do_givemon_scroll_command ; 1c
 endm
 
 	enum tradeanim_1d_command
 tradeanim_1d: macro
-	db tradeanim_1d_command
+	db tradeanim_1d_command ; 1d
 endm
 
 	enum tradeanim_1e_command
 tradeanim_1e: macro
-	db tradeanim_1e_command
+	db tradeanim_1e_command ; 1e
 endm
 
 	enum tradeanim_scroll_out_right_command
 tradeanim_scroll_out_right: macro
-	db tradeanim_scroll_out_right_command
+	db tradeanim_scroll_out_right_command ; 1f
 endm
 
 __enum__ set $21
 
 	enum tradeanim_wait_80_command
 tradeanim_wait_80: macro
-	db tradeanim_wait_80_command
+	db tradeanim_wait_80_command ; 21
 endm
 
 	enum tradeanim_wait_40_command
 tradeanim_wait_40: macro
-	db tradeanim_wait_40_command
+	db tradeanim_wait_40_command ; 22
 endm
 
 	enum tradeanim_rocking_ball_command
 tradeanim_rocking_ball: macro
-	db tradeanim_rocking_ball_command
+	db tradeanim_rocking_ball_command ; 23
 endm
 
 	enum tradeanim_drop_ball_command
 tradeanim_drop_ball: macro
-	db tradeanim_drop_ball_command
+	db tradeanim_drop_ball_command ; 24
 endm
 
 	enum tradeanim_wait_anim_command
 tradeanim_wait_anim: macro
-	db tradeanim_wait_anim_command
+	db tradeanim_wait_anim_command ; 25
 endm
 
 __enum__ set $27
 
 	enum tradeanim_poof_command
 tradeanim_poof: macro
-	db tradeanim_poof_command
+	db tradeanim_poof_command ; 27
 endm
 
 	enum tradeanim_bulge_through_tube_command
 tradeanim_bulge_through_tube: macro
-	db tradeanim_bulge_through_tube_command
+	db tradeanim_bulge_through_tube_command ; 28
 endm
 
 	enum tradeanim_give_trademon_sfx_command
 tradeanim_give_trademon_sfx: macro
-	db tradeanim_give_trademon_sfx_command
+	db tradeanim_give_trademon_sfx_command ; 29
 endm
 
 	enum tradeanim_get_trademon_sfx_command
 tradeanim_get_trademon_sfx: macro
-	db tradeanim_get_trademon_sfx_command
+	db tradeanim_get_trademon_sfx_command ; 2a
 endm
 
 	enum tradeanim_end_command
 tradeanim_end: macro
-	db tradeanim_end_command
+	db tradeanim_end_command ; 2b
 endm
 
 	enum tradeanim_animate_frontpic_command
 tradeanim_animate_frontpic: macro
-	db tradeanim_animate_frontpic_command
+	db tradeanim_animate_frontpic_command ; 2c
 endm
 
 	enum tradeanim_wait_96_command
 tradeanim_wait_96: macro
-	db tradeanim_wait_96_command
+	db tradeanim_wait_96_command ; 2d
 endm
 
 	enum tradeanim_wait_80_if_ot_egg_command
 tradeanim_wait_80_if_ot_egg: macro
-	db tradeanim_wait_80_if_ot_egg_command
+	db tradeanim_wait_80_if_ot_egg_command ; 2e
 endm
 
 	enum tradeanim_wait_180_if_ot_egg_command
 tradeanim_wait_180_if_ot_egg: macro
-	db tradeanim_wait_180_if_ot_egg_command
+	db tradeanim_wait_180_if_ot_egg_command ; 2f
 endm
 
+
+; Mobile
+	enum_start 1
+	
+	enum mobiletradeanim_showgivemon_command
+mobiletradeanim_showgivemon: macro
+	db mobiletradeanim_showgivemon_command ; 01
+endm
+
+	enum mobiletradeanim_02_command
+mobiletradeanim_02: macro
+	db mobiletradeanim_02_command ; 02
+endm
+
+	enum mobiletradeanim_sendmon_command
+mobiletradeanim_sendmon: macro
+	db mobiletradeanim_sendmon_command ; 03
+endm
+
+__enum__ set $05
+
+	enum mobiletradeanim_05_command
+mobiletradeanim_05: macro
+	db mobiletradeanim_05_command ; 05
+endm
+
+	enum mobiletradeanim_06_command
+mobiletradeanim_06: macro
+	db mobiletradeanim_06_command ; 06
+endm
+
+	enum mobiletradeanim_07_command
+mobiletradeanim_07: macro
+	db mobiletradeanim_07_command ; 07
+endm
+
+	enum mobiletradeanim_receivemon_command
+mobiletradeanim_receivemon: macro
+	db mobiletradeanim_receivemon_command ; 08
+endm
+
+__enum__ set $0b
+
+	enum mobiletradeanim_showgetmon_command
+mobiletradeanim_showgetmon: macro
+	db mobiletradeanim_showgetmon_command ; 0b
+endm
+
+	enum mobiletradeanim_end_command
+mobiletradeanim_end: macro
+	db mobiletradeanim_end_command ; 0c
+endm
+
+	enum mobiletradeanim_showgtsgivemon_command
+mobiletradeanim_showgtsgivemon: macro
+	db mobiletradeanim_showgtsgivemon_command ; 0d
+endm
+
+	enum mobiletradeanim_showgtsgetmon_command
+mobiletradeanim_showgtsgetmon: macro
+	db mobiletradeanim_showgtsgetmon_command ; 0e
+endm
+
+	enum mobiletradeanim_0f_command
+mobiletradeanim_0f: macro
+	db mobiletradeanim_0f_command ; 0f
+endm
+
+	enum mobiletradeanim_10_command
+mobiletradeanim_10: macro
+	db mobiletradeanim_10_command ; 10
+endm
+
+	enum mobiletradeanim_11_command
+mobiletradeanim_11: macro
+	db mobiletradeanim_11_command ; 11
+endm
+
+	enum mobiletradeanim_12_command
+mobiletradeanim_12: macro
+	db mobiletradeanim_12_command ; 12
+endm
+
+	enum mobiletradeanim_showoddegg_command
+mobiletradeanim_showoddegg: macro
+	db mobiletradeanim_showoddegg_command ; 13
+endm