Merge branch 'master' into link

5 files changed, 1144 insertions, 105 deletions

diff --git a/asm/macros/battle_ai_script.inc b/asm/macros/battle_ai_script.inc
new file mode 100644
index 000000000..5e81686bf
--- /dev/null
+++ b/asm/macros/battle_ai_script.inc
@@ -0,0 +1,619 @@
+	.macro if_random_less_than param0, param1
+	.byte 0x0
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_random_greater_than param0, param1
+	.byte 0x1
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_random_equal param0, param1
+	.byte 0x2
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_random_not_equal param0, param1
+	.byte 0x3
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro score param0
+	.byte 0x4
+	.byte \param0
+	.endm
+
+	.macro if_hp_less_than bank, param1, param2
+	.byte 0x5
+	.byte \bank
+	.byte \param1
+	.4byte \param2
+	.endm
+
+	.macro if_hp_more_than bank, param1, param2
+	.byte 0x6
+	.byte \bank
+	.byte \param1
+	.4byte \param2
+	.endm
+
+	.macro if_hp_equal bank, param1, param2
+	.byte 0x7
+	.byte \bank
+	.byte \param1
+	.4byte \param2
+	.endm
+
+	.macro if_hp_not_equal bank, param1, param2
+	.byte 0x8
+	.byte \bank
+	.byte \param1
+	.4byte \param2
+	.endm
+
+	.macro if_status bank, status1, param2
+	.byte 0x9
+	.byte \bank
+	.4byte \status1
+	.4byte \param2
+	.endm
+
+	.macro if_not_status bank, status1, param2
+	.byte 0xa
+	.byte \bank
+	.4byte \status1
+	.4byte \param2
+	.endm
+
+	.macro if_status2 bank, status2, param2
+	.byte 0xb
+	.byte \bank
+	.4byte \status2
+	.4byte \param2
+	.endm
+
+	.macro if_not_status2 bank, status2, param2
+	.byte 0xc
+	.byte \bank
+	.4byte \status2
+	.4byte \param2
+	.endm
+
+	.macro if_status3 bank, status3, param2
+	.byte 0xd
+	.byte \bank
+	.4byte \status3
+	.4byte \param2
+	.endm
+
+	.macro if_not_status3 bank, status3, param2
+	.byte 0xe
+	.byte \bank
+	.4byte \status3
+	.4byte \param2
+	.endm
+
+	.macro if_side_affecting bank, sidestatus, param2
+	.byte 0xf
+	.byte \bank
+	.4byte \sidestatus
+	.4byte \param2
+	.endm
+
+	.macro if_not_side_affecting bank, sidestatus, param2
+	.byte 0x10
+	.byte \bank
+	.4byte \sidestatus
+	.4byte \param2
+	.endm
+
+	.macro if_less_than param0, param1
+	.byte 0x11
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_more_than param0, param1
+	.byte 0x12
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_equal param0, param1
+	.byte 0x13
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_not_equal param0, param1
+	.byte 0x14
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_less_than_ptr param0, param1
+	.byte 0x15
+	.4byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_more_than_ptr param0, param1
+	.byte 0x16
+	.4byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_equal_ptr param0, param1
+	.byte 0x17
+	.4byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_not_equal_ptr param0, param1
+	.byte 0x18
+	.4byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_move param0, param1
+	.byte 0x19
+	.2byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_not_move param0, param1
+	.byte 0x1a
+	.2byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_in_bytes param0, param1
+	.byte 0x1b
+	.4byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_not_in_bytes param0, param1
+	.byte 0x1c
+	.4byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_in_hwords param0, param1
+	.byte 0x1d
+	.4byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_not_in_hwords param0, param1
+	.byte 0x1e
+	.4byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_user_has_attacking_move param0
+	.byte 0x1f
+	.4byte \param0
+	.endm
+
+	.macro if_user_has_no_attacking_moves param0
+	.byte 0x20
+	.4byte \param0
+	.endm
+
+	.macro get_turn_count
+	.byte 0x21
+	.endm
+
+	.macro get_type param0
+	.byte 0x22
+	.byte \param0
+	.endm
+
+	.macro get_considered_move_power
+	.byte 0x23
+	.endm
+
+	.macro get_how_powerful_move_is
+	.byte 0x24
+	.endm
+
+	.macro get_last_used_bank_move bank
+	.byte 0x25
+	.byte \bank
+	.endm
+
+	.macro if_equal_ param0, param1
+	.byte 0x26
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_not_equal_ param0, param1
+	.byte 0x27
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_user_goes param0, param1
+	.byte 0x28
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_user_doesnt_go param0, param1
+	.byte 0x29
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro nullsub_2A
+	.byte 0x2a
+	.endm
+
+	.macro nullsub_2B
+	.byte 0x2b
+	.endm
+
+	.macro count_usable_party_mons bank
+	.byte 0x2c
+	.byte \bank
+	.endm
+
+	.macro get_considered_move
+	.byte 0x2d
+	.endm
+
+	.macro get_considered_move_effect
+	.byte 0x2e
+	.endm
+
+	.macro get_ability bank
+	.byte 0x2f
+	.byte \bank
+	.endm
+
+	.macro get_highest_type_effectiveness
+	.byte 0x30
+	.endm
+
+	.macro if_type_effectiveness param0, param1
+	.byte 0x31
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro nullsub_32
+	.byte 0x32
+	.endm
+
+	.macro nullsub_33
+	.byte 0x33
+	.endm
+
+	.macro if_status_in_party bank, status1, param2
+	.byte 0x34
+	.byte \bank
+	.4byte \status1
+	.4byte \param2
+	.endm
+
+	.macro if_status_not_in_party bank, status1, param2
+	.byte 0x35
+	.byte \bank
+	.4byte \status1
+	.4byte \param2
+	.endm
+
+	.macro get_weather
+	.byte 0x36
+	.endm
+
+	.macro if_effect param0, param1
+	.byte 0x37
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_not_effect param0, param1
+	.byte 0x38
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_stat_level_less_than bank, stat, param2, param3
+	.byte 0x39
+	.byte \bank
+	.byte \stat
+	.byte \param2
+	.4byte \param3
+	.endm
+
+	.macro if_stat_level_more_than bank, stat, param2, param3
+	.byte 0x3a
+	.byte \bank
+	.byte \stat
+	.byte \param2
+	.4byte \param3
+	.endm
+
+	.macro if_stat_level_equal bank, stat, param2, param3
+	.byte 0x3b
+	.byte \bank
+	.byte \stat
+	.byte \param2
+	.4byte \param3
+	.endm
+
+	.macro if_stat_level_not_equal bank, stat, param2, param3
+	.byte 0x3c
+	.byte \bank
+	.byte \stat
+	.byte \param2
+	.4byte \param3
+	.endm
+
+	.macro if_can_faint param0
+	.byte 0x3d
+	.4byte \param0
+	.endm
+
+	.macro if_cant_faint param0
+	.byte 0x3e
+	.4byte \param0
+	.endm
+
+	.macro if_has_move bank, param1, param2
+	.byte 0x3f
+	.byte \bank
+	.2byte \param1
+	.4byte \param2
+	.endm
+
+	.macro if_doesnt_have_move bank, param1, param2
+	.byte 0x40
+	.byte \bank
+	.2byte \param1
+	.4byte \param2
+	.endm
+
+	.macro if_has_move_with_effect bank, param1, param2
+	.byte 0x41
+	.byte \bank
+	.byte \param1
+	.4byte \param2
+	.endm
+
+	.macro if_doesnt_have_move_with_effect bank, param1, param2
+	.byte 0x42
+	.byte \bank
+	.byte \param1
+	.4byte \param2
+	.endm
+
+	.macro if_any_move_disabled_or_encored bank, param1, param2
+	.byte 0x43
+	.byte \bank
+	.byte \param1
+	.4byte \param2
+	.endm
+
+	.macro if_curr_move_disabled_or_encored param0, param1
+	.byte 0x44
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro flee
+	.byte 0x45
+	.endm
+
+	.macro if_random_safari_flee param0
+	.byte 0x46
+	.4byte \param0
+	.endm
+
+	.macro watch
+	.byte 0x47
+	.endm
+
+	.macro get_hold_effect bank
+	.byte 0x48
+	.byte \bank
+	.endm
+
+	.macro get_gender bank
+	.byte 0x49
+	.byte \bank
+	.endm
+
+	.macro is_first_turn_for bank
+	.byte 0x4a
+	.byte \bank
+	.endm
+
+	.macro get_stockpile_count bank
+	.byte 0x4b
+	.byte \bank
+	.endm
+
+	.macro is_double_battle
+	.byte 0x4c
+	.endm
+
+	.macro get_used_held_item bank
+	.byte 0x4d
+	.byte \bank
+	.endm
+
+	.macro get_move_type_from_result
+	.byte 0x4e
+	.endm
+
+	.macro get_move_power_from_result
+	.byte 0x4f
+	.endm
+
+	.macro get_move_effect_from_result
+	.byte 0x50
+	.endm
+
+	.macro get_protect_count bank
+	.byte 0x51
+	.byte \bank
+	.endm
+
+	.macro nullsub_52
+	.byte 0x52
+	.endm
+
+	.macro nullsub_53
+	.byte 0x53
+	.endm
+
+	.macro nullsub_54
+	.byte 0x54
+	.endm
+
+	.macro nullsub_55
+	.byte 0x55
+	.endm
+
+	.macro nullsub_56
+	.byte 0x56
+	.endm
+
+	.macro nullsub_57
+	.byte 0x57
+	.endm
+
+	.macro call param0
+	.byte 0x58
+	.4byte \param0
+	.endm
+
+	.macro goto param0
+	.byte 0x59
+	.4byte \param0
+	.endm
+
+	.macro end
+	.byte 0x5a
+	.endm
+
+	.macro if_level_cond param0, param1
+	.byte 0x5b
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro if_target_taunted param0
+	.byte 0x5c
+	.4byte \param0
+	.endm
+
+	.macro if_target_not_taunted param0
+	.byte 0x5d
+	.4byte \param0
+	.endm
+
+	.macro if_target_is_ally param0
+	.byte 0x5e
+	.4byte \param0
+	.endm
+
+	.macro is_of_type bank, type
+	.byte 0x5f
+	.byte \bank
+	.byte \type
+	.endm
+
+	.macro check_ability bank, ability
+	.byte 0x60
+	.byte \bank
+	.byte \ability
+	.endm
+
+	.macro if_flash_fired bank, param1
+	.byte 0x61
+	.byte \bank
+	.4byte \param1
+	.endm
+
+	.macro if_holds_item bank, param1, param2
+	.byte 0x62
+	.byte \bank
+	.2byte \param1
+	.4byte \param2
+	.endm
+	
+@ useful script macros
+	.macro get_curr_move_type
+	get_type AI_TYPE_MOVE
+	.endm
+	
+	.macro get_user_type1
+	get_type AI_TYPE1_USER
+	.endm
+	
+	.macro get_user_type2
+	get_type AI_TYPE2_USER
+	.endm
+	
+	.macro get_target_type1
+	get_type AI_TYPE1_TARGET
+	.endm
+	
+	.macro get_target_type2
+	get_type AI_TYPE2_TARGET
+	.endm
+	
+	.macro if_ability bank, ability, ptr
+	check_ability \bank, \ability
+	if_equal 1, \ptr
+	.endm
+	
+	.macro if_no_ability bank, ability, ptr
+	check_ability \bank, \ability
+	if_equal 0, \ptr
+	.endm
+	
+	.macro if_type bank, type, ptr
+	is_of_type \bank, \type
+	if_equal 1, \ptr
+	.endm
+
+	.macro if_no_type bank, type, ptr
+	is_of_type \bank, \type
+	if_equal 0, \ptr
+	.endm
+	
+	.macro if_target_faster ptr
+	if_user_goes 1, \ptr
+	.endm
+	
+	.macro if_user_faster ptr
+	if_user_goes 0, \ptr
+	.endm
+	
+	.macro if_double_battle ptr
+	is_double_battle
+	if_equal 1, \ptr
+	.endm
+	
+	.macro if_not_double_battle ptr
+	is_double_battle
+	if_equal 0, \ptr
+	.endm
+
+	.macro if_any_move_disabled bank, ptr
+	if_any_move_disabled_or_encored \bank, 0, \ptr
+	.endm
+	
+	.macro if_any_move_encored bank, ptr
+	if_any_move_disabled_or_encored \bank, 1, \ptr
+	.endm
diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc
new file mode 100644
index 000000000..b26d1218d
--- /dev/null
+++ b/asm/macros/battle_anim_script.inc
@@ -0,0 +1,268 @@
+@ commands
+
+	.macro loadspritegfx param0
+	.byte 0x0
+	.2byte \param0
+	.endm
+
+	.macro unloadspritegfx param0
+	.byte 0x1
+	.2byte \param0
+	.endm
+
+	.macro createsprite template, priority, argv:vararg
+	.byte 0x02
+	.4byte \template
+	.byte \priority
+	.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
+.Lsprite_\@_1:
+	.2byte \argv
+.Lsprite_\@_2:
+	.endm
+
+	.macro createvisualtask addr, priority, argv:vararg
+	.byte 0x03
+	.4byte \addr
+	.byte \priority
+	.byte (.Lcreatetask_\@_2 - .Lcreatetask_\@_1) / 2
+.Lcreatetask_\@_1:
+	.2byte \argv
+.Lcreatetask_\@_2:
+	.endm
+
+	.macro delay param0
+	.byte 0x4
+	.byte \param0
+	.endm
+
+	.macro waitforvisualfinish
+	.byte 0x5
+	.endm
+
+	.macro hang1
+	.byte 0x6
+	.endm
+
+	.macro hang2
+	.byte 0x7
+	.endm
+
+	.macro end
+	.byte 0x8
+	.endm
+
+	.macro playse param0
+	.byte 0x9
+	.2byte \param0
+	.endm
+
+	.macro monbg bank
+	.byte 0xa
+	.byte \bank
+	.endm
+
+	.macro clearmonbg bank
+	.byte 0xb
+	.byte \bank
+	.endm
+
+	.macro setalpha param0
+	.byte 0xc
+	.2byte \param0
+	.endm
+
+	.macro blendoff
+	.byte 0xd
+	.endm
+
+	.macro call param0
+	.byte 0xe
+	.4byte \param0
+	.endm
+
+	.macro return
+	.byte 0xf
+	.endm
+
+	.macro setarg param0, param1
+	.byte 0x10
+	.byte \param0
+	.2byte \param1
+	.endm
+
+	.macro choosetwoturnanim param0, param1
+	.byte 0x11
+	.4byte \param0
+	.4byte \param1
+	.endm
+
+	.macro jumpifmoveturn param0, param1
+	.byte 0x12
+	.byte \param0
+	.4byte \param1
+	.endm
+
+	.macro goto param0
+	.byte 0x13
+	.4byte \param0
+	.endm
+
+	.macro fadetobg param0
+	.byte 0x14
+	.byte \param0
+	.endm
+
+	.macro restorebg
+	.byte 0x15
+	.endm
+
+	.macro waitbgfadeout
+	.byte 0x16
+	.endm
+
+	.macro waitbgfadein
+	.byte 0x17
+	.endm
+
+	.macro changebg param0
+	.byte 0x18
+	.byte \param0
+	.endm
+
+	.macro playsewithpan param0, param1
+	.byte 0x19
+	.2byte \param0
+	.byte \param1
+	.endm
+
+	.macro setpan param0
+	.byte 0x1a
+	.byte \param0
+	.endm
+
+	.macro panse_1B param0, param1, param2, param3, param4
+	.byte 0x1b
+	.2byte \param0
+	.byte \param1
+	.byte \param2
+	.byte \param3
+	.byte \param4
+	.endm
+
+	.macro loopsewithpan param0, param1, param2, param3
+	.byte 0x1c
+	.2byte \param0
+	.byte \param1
+	.byte \param2
+	.byte \param3
+	.endm
+
+	.macro waitplaysewithpan param0, param1, param2
+	.byte 0x1d
+	.2byte \param0
+	.byte \param1
+	.byte \param2
+	.endm
+
+	.macro setbldcnt param0
+	.byte 0x1e
+	.2byte \param0
+	.endm
+
+	.macro createsoundtask addr, argv:vararg
+	.byte 0x1F
+	.4byte \addr
+	.byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2
+.Lcreatetask_1F_\@_1:
+	.2byte \argv
+.Lcreatetask_1F_\@_2:
+	.endm
+
+	.macro waitsound
+	.byte 0x20
+	.endm
+
+	.macro jumpargeq param0, param1, param2
+	.byte 0x21
+	.byte \param0
+	.2byte \param1
+	.4byte \param2
+	.endm
+
+	.macro monbg_22 bank
+	.byte 0x22
+	.byte \bank
+	.endm
+
+	.macro clearmonbg_23 bank
+	.byte 0x23
+	.byte \bank
+	.endm
+
+	.macro jumpifcontest param0
+	.byte 0x24
+	.4byte \param0
+	.endm
+
+	.macro fadetobgfromset param0, param1, param2
+	.byte 0x25
+	.byte \param0
+	.byte \param1
+	.byte \param2
+	.endm
+
+	.macro panse_26 param0, param1, param2, param3, param4
+	.byte 0x26
+	.2byte \param0
+	.byte \param1
+	.byte \param2
+	.byte \param3
+	.byte \param4
+	.endm
+
+	.macro panse_27 param0, param1, param2, param3, param4
+	.byte 0x27
+	.2byte \param0
+	.byte \param1
+	.byte \param2
+	.byte \param3
+	.byte \param4
+	.endm
+
+	.macro monbgprio_28 bank
+	.byte 0x28
+	.byte \bank
+	.endm
+
+	.macro monbgprio_29
+	.byte 0x29
+	.endm
+
+	.macro monbgprio_2A bank
+	.byte 0x2a
+	.byte \bank
+	.endm
+
+	.macro invisible bank
+	.byte 0x2b
+	.byte \bank
+	.endm
+
+	.macro visible bank
+	.byte 0x2c
+	.byte \bank
+	.endm
+
+	.macro doublebattle_2D bank
+	.byte 0x2d
+	.byte \bank
+	.endm
+
+	.macro doublebattle_2E bank
+	.byte 0x2e
+	.byte \bank
+	.endm
+
+	.macro stopsound
+	.byte 0x2f
+	.endm
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 69cdb38e5..041d3964d 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1,20 +1,20 @@
 	@ Does nothing.
-	.macro nop 
+	.macro nop
 	.byte 0x00
 	.endm
 
 	@ Does nothing.
-	.macro nop1 
+	.macro nop1
 	.byte 0x01
 	.endm
 
 	@ Terminates script execution.
-	.macro end 
+	.macro end
 	.byte 0x02
 	.endm
 
 	@ Jumps back to after the last-executed call statement, and continues script execution from there.
-	.macro return 
+	.macro return
 	.byte 0x03
 	.endm
 
@@ -71,12 +71,12 @@
 	.endm
 
 	@ Executes a script stored in a default RAM location.
-	.macro gotoram 
+	.macro gotoram
 	.byte 0x0c
 	.endm
 
 	@ Terminates script execution and "resets the script RAM".
-	.macro killscript 
+	.macro killscript
 	.byte 0x0d
 	.endm
 
@@ -226,6 +226,18 @@
 	.2byte \var2
 	.endm
 
+	@ Generic compare macro which attempts to deduce argument types based on their values
+	@ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers
+	.macro compare arg1, arg2
+		.if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8)
+			compare_var_to_var \arg1, \arg2
+		.elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= 0 && \arg2 <= 0xFFFF)
+			compare_var_to_value \arg1, \arg2
+		.else
+			.error "Invalid arguments for 'compare'"
+		.endif
+	.endm
+
 	@ Calls the native C function stored at `func`.
 	.macro callnative func
 	.byte 0x23
@@ -252,7 +264,7 @@
 	.endm
 
 	@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang).
-	.macro waitstate 
+	.macro waitstate
 	.byte 0x27
 	.endm
 
@@ -288,12 +300,12 @@
 	.endm
 
 	@ Runs time based events. In FireRed, this command is a nop.
-	.macro dodailyevents 
+	.macro dodailyevents
 	.byte 0x2d
 	.endm
 
 	@ Sets the values of variables 0x8000, 0x8001, and 0x8002 to the current hour, minute, and second. In FRLG, this command sets those variables to zero.
-	.macro gettime 
+	.macro gettime
 	.byte 0x2e
 	.endm
 
@@ -304,7 +316,7 @@
 	.endm
 
 	@ Blocks script execution until the currently-playing sound (triggered by playse) finishes playing.
-	.macro waitse 
+	.macro waitse
 	.byte 0x30
 	.endm
 
@@ -315,7 +327,7 @@
 	.endm
 
 	@ Blocks script execution until all currently-playing fanfares finish.
-	.macro waitfanfare 
+	.macro waitfanfare
 	.byte 0x32
 	.endm
 
@@ -333,7 +345,7 @@
 	.endm
 
 	@ Crossfades the currently-playing song into the map's default song.
-	.macro fadedefaultbgm 
+	.macro fadedefaultbgm
 	.byte 0x35
 	.endm
 
@@ -441,7 +453,7 @@
 	.endm
 
 	@ Retrieves the number of Pokemon in the player's party, and stores that number in variable 0x800D (LASTRESULT).
-	.macro getpartysize 
+	.macro getpartysize
 	.byte 0x43
 	.endm
 
@@ -518,57 +530,58 @@
 	.endm
 
 	@ Applies the movement data at movements to the specified (index) Object. Also closes any standard message boxes that are still open.
-	.macro applymovement index, movements
-	.byte 0x4f
-	.2byte \index
-	.4byte \movements
-	.endm
-
-	@ Applies the movement data at movements to the specified (index) Object on the specified (map_group, map_num) map. Really only useful if the object has followed from one map to another (e.g. Wally during the catching event).
-	.macro applymovementat variable, movements, map
-	.byte 0x50
-	.2byte \variable
-	.4byte \movements
-	map \map
+	@ If no map is specified, then the current map is used.
+	.macro applymovement index, movements, map
+		.ifb \map
+			.byte 0x4f
+			.2byte \index
+			.4byte \movements
+		.else
+			@ Really only useful if the object has followed from one map to another (e.g. Wally during the catching event).
+			.byte 0x50
+			.2byte \index
+			.4byte \movements
+			map \map
+		.endif
 	.endm
 
 	@ Blocks script execution until the movements being applied to the specified (index) Object finish. If the specified Object is 0x0000, then the command will block script execution until all Objects affected by applymovement finish their movements. If the specified Object is not currently being manipulated with applymovement, then this command does nothing.
-	.macro waitmovement index
-	.byte 0x51
-	.2byte \index
-	.endm
-
-	@ Blocks script execution until the movements being applied to the specified (index) Object on the specified (map) map finish.
-	.macro waitmovementat index, map
-	.byte 0x52
-	.2byte \index
-	map \map
-	.endm
-
-	@ Attempts to hide the specified (index) Object on the current map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
-	.macro removeobject index
-	.byte 0x53
-	.2byte \index
+	@ If no map is specified, then the current map is used.
+	.macro waitmovement index, map
+		.ifb \map
+			.byte 0x51
+			.2byte \index
+		.else
+			.byte 0x52
+			.2byte \index
+			map \map
+		.endif
 	.endm
 
 	@ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
-	.macro removeobjectat index, map
-	.byte 0x54
-	.2byte \index
-	map \map
-	.endm
-
-	@ Unsets the specified (index) Object's visibility flag on the current map if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
-	.macro addobject index
-	.byte 0x55
-	.2byte \index
+	@ If no map is specified, then the current map is used.
+	.macro removeobject index, map
+		.ifb \map
+			.byte 0x53
+			.2byte \index
+		.else
+			.byte 0x54
+			.2byte \index
+			map \map
+		.endif
 	.endm
 
 	@ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
-	.macro addobjectat index, map
-	.byte 0x56
-	.2byte \index
-	map \map
+	@ If no map is specified, then the current map is used.
+	.macro addobject index, map
+		.ifb \map
+			.byte 0x55
+			.2byte \index
+		.else
+			.byte 0x56
+			.2byte \index
+			map \map
+		.endif
 	.endm
 
 	@ Sets the specified (index) Object's position on the current map.
@@ -592,7 +605,7 @@
 	.endm
 
 	@ If the script was called by an Object, then that Object will turn to face toward the metatile that the player is standing on.
-	.macro faceplayer 
+	.macro faceplayer
 	.byte 0x5a
 	.endm
 
@@ -659,15 +672,17 @@
 
 
 	@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes.
-	.macro trainerbattlebegin 
+	.macro trainerbattlebegin
 	.byte 0x5d
 	.endm
 
-	.macro ontrainerbattleend 
+	@ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c)
+	.macro gotopostbattlescript
 	.byte 0x5e
 	.endm
 
-	.macro ontrainerbattleendgoto 
+	@ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c)
+	.macro gotobeatenscript
 	.byte 0x5f
 	.endm
 
@@ -708,7 +723,7 @@
 	.endm
 
 	@ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the box and its text have been fully drawn.
-	.macro waitmessage 
+	.macro waitmessage
 	.byte 0x66
 	.endm
 
@@ -719,32 +734,32 @@
 	.endm
 
 	@ Closes the current message box.
-	.macro closemessage 
+	.macro closemessage
 	.byte 0x68
 	.endm
 
 	@ Ceases movement for all Objects on-screen.
-	.macro lockall 
+	.macro lockall
 	.byte 0x69
 	.endm
 
 	@ If the script was called by an Object, then that Object's movement will cease.
-	.macro lock 
+	.macro lock
 	.byte 0x6a
 	.endm
 
 	@ Resumes normal movement for all Objects on-screen, and closes any standard message boxes that are still open.
-	.macro releaseall 
+	.macro releaseall
 	.byte 0x6b
 	.endm
 
 	@ If the script was called by an Object, then that Object's movement will resume. This command also closes any standard message boxes that are still open.
-	.macro release 
+	.macro release
 	.byte 0x6c
 	.endm
 
 	@ Blocks script execution until the player presses any key.
-	.macro waitbuttonpress 
+	.macro waitbuttonpress
 	.byte 0x6d
 	.endm
 
@@ -785,7 +800,7 @@
 	.endm
 
 	@ Nopped in Emerald.
-	.macro drawbox 
+	.macro drawbox
 	.byte 0x72
 	.endm
 
@@ -816,7 +831,7 @@
 	.endm
 
 	@ Hides all boxes displayed with drawmonpic.
-	.macro erasemonpic 
+	.macro erasemonpic
 	.byte 0x76
 	.endm
 
@@ -848,11 +863,11 @@
 	.2byte \species
 	.endm
 
-	.macro setmonmove byte1, byte2, word
+	.macro setmonmove index, slot, move
 	.byte 0x7b
-	.byte \byte1
-	.byte \byte2
-	.2byte \word
+	.byte \index
+	.byte \slot
+	.2byte \move
 	.endm
 
 	@ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species.
@@ -956,22 +971,22 @@
 	.endm
 
 	@ This allows you to choose a Pokemon to use in a contest. In FireRed, this command sets the byte at 0x03000EA8 to 0x01.
-	.macro choosecontestpkmn 
+	.macro choosecontestmon
 	.byte 0x8b
 	.endm
 
 	@ Starts a contest. In FireRed, this command is a nop.
-	.macro startcontest 
+	.macro startcontest
 	.byte 0x8c
 	.endm
 
 	@ Shows the results of a contest. In FireRed, this command is a nop.
-	.macro showcontestresults 
+	.macro showcontestresults
 	.byte 0x8d
 	.endm
 
 	@ Starts a contest over a link connection. In FireRed, this command is a nop.
-	.macro contestlinktransfer 
+	.macro contestlinktransfer
 	.byte 0x8e
 	.endm
 
@@ -1011,7 +1026,7 @@
 	.endm
 
 	@ Hides the secondary box spawned by showmoney.
-	.macro hidemoneybox 
+	.macro hidemoneybox
 	.byte 0x94
 	.endm
 
@@ -1022,10 +1037,10 @@
 	.byte \y
 	.endm
 
-	@ Gets the price reduction for the index (word) given. In FireRed, this command is a nop.
-	.macro getpricereduction word
+	@ Gets the price reduction for the index given. In FireRed, this command is a nop.
+	.macro getpricereduction index
 	.byte 0x96
-	.2byte \word
+	.2byte \index
 	.endm
 
 	@ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white.
@@ -1076,13 +1091,13 @@
 	.endm
 
 	@ Sets which healing place the player will return to if all of the Pokemon in their party faint.
-	.macro setrespawn flightspot
+	.macro setrespawn heallocation
 	.byte 0x9f
-	.2byte \flightspot
+	.2byte \heallocation
 	.endm
 
 	@ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT.
-	.macro checkplayergender 
+	.macro checkplayergender
 	.byte 0xa0
 	.endm
 
@@ -1103,7 +1118,7 @@
 	.endm
 
 	@ Queues a weather change to the default weather for the map.
-	.macro resetweather 
+	.macro resetweather
 	.byte 0xa3
 	.endm
 
@@ -1114,7 +1129,7 @@
 	.endm
 
 	@ Executes the weather change queued with resetweather or setweather. The current weather will smoothly fade into the queued weather.
-	.macro doweather 
+	.macro doweather
 	.byte 0xa5
 	.endm
 
@@ -1173,7 +1188,7 @@
 	.endm
 
 	@ Waits for the door animation started with opendoor or closedoor to finish.
-	.macro waitdooranim 
+	.macro waitdooranim
 	.byte 0xae
 	.endm
 
@@ -1185,7 +1200,7 @@
 	.endm
 
 	@ Sets the door tile at (x, y) to be closed without an animation.
-	.macro setdoorclosed2 x, y
+	.macro setdoorclosed x, y
 	.byte 0xb0
 	.2byte \x
 	.2byte \y
@@ -1201,7 +1216,7 @@
 	.endm
 
 	@ In FireRed and Emerald, this command is a nop.
-	.macro showelevmenu 
+	.macro showelevmenu
 	.byte 0xb2
 	.endm
 
@@ -1215,9 +1230,9 @@
 	.2byte \count
 	.endm
 
-	.macro takecoins word
+	.macro takecoins count
 	.byte 0xb5
-	.2byte \word
+	.2byte \count
 	.endm
 
 	@ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle.
@@ -1229,14 +1244,13 @@
 	.endm
 
 	@ Starts a wild battle against the Pokemon generated by setwildbattle. Blocks script execution until the battle finishes.
-	.macro dowildbattle 
+	.macro dowildbattle
 	.byte 0xb7
 	.endm
 
-	.macro setvaddress long, word
+	.macro setvaddress pointer
 	.byte 0xb8
-	.4byte \long
-	.2byte \word
+	.4byte \pointer
 	.endm
 
 	.macro vgoto pointer
@@ -1314,7 +1328,7 @@
 	.endm
 
 	@ Blocks script execution until cry finishes.
-	.macro waitmoncry 
+	.macro waitmoncry
 	.byte 0xc5
 	.endm
 
@@ -1338,17 +1352,17 @@
 	.endm
 
 	@ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened.
-	.macro unloadhelp 
+	.macro unloadhelp
 	.byte 0xc9
 	.endm
 
 	@ After using this command, all standard message boxes will use the signpost frame.
-	.macro signmsg 
+	.macro signmsg
 	.byte 0xca
 	.endm
 
 	@ Ends the effects of signmsg, returning message box frames to normal.
-	.macro normalmsg 
+	.macro normalmsg
 	.byte 0xcb
 	.endm
 
@@ -1372,7 +1386,7 @@
 	.endm
 
 	@ Depending on factors I haven't managed to understand yet, this command may cause script execution to jump to the offset specified by the pointer at 0x020375C0.
-	.macro execram 
+	.macro execram
 	.byte 0xcf
 	.endm
 
@@ -1403,7 +1417,7 @@
 	.2byte \unknown
 	.endm
 
-	.macro mossdeepgym2 
+	.macro mossdeepgym2
 	.byte 0xd4
 	.endm
 
@@ -1413,7 +1427,7 @@
 	.2byte \var
 	.endm
 
-	.macro mossdeepgym4 
+	.macro mossdeepgym4
 	.byte 0xd6
 	.endm
 
@@ -1425,15 +1439,15 @@
 	.2byte \word2
 	.endm
 
-	.macro cmdD8 
+	.macro cmdD8
 	.byte 0xd8
 	.endm
 
-	.macro cmdD9 
+	.macro cmdD9
 	.byte 0xd9
 	.endm
 
-	.macro hidebox2 
+	.macro hidebox2
 	.byte 0xda
 	.endm
 
@@ -1498,7 +1512,7 @@
 	.endm
 
 	.macro case condition, dest
-	compare_var_to_value 0x8000, \condition
+	compare 0x8000, \condition
 	goto_eq \dest
 	.endm
 
diff --git a/asm/macros/m4a.inc b/asm/macros/m4a.inc
new file mode 100644
index 000000000..6c5abc09b
--- /dev/null
+++ b/asm/macros/m4a.inc
@@ -0,0 +1,13 @@
+	.macro song label, music_player, unknown
+	.4byte \label
+	.2byte \music_player
+	.2byte \unknown
+	.endm
+
+	.macro music_player info_struct, track_struct, unknown_1, unknown_2
+	.4byte \info_struct
+	.4byte \track_struct
+	.byte \unknown_1
+	.space 1
+	.2byte \unknown_2
+	.endm
diff --git a/asm/macros/music_voice.inc b/asm/macros/music_voice.inc
new file mode 100644
index 000000000..b7a9e7f8d
--- /dev/null
+++ b/asm/macros/music_voice.inc
@@ -0,0 +1,125 @@
+	.macro voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
+	.byte 0
+	_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_directsound_no_resample base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
+	.byte 8
+	_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_directsound_alt base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
+	.byte 16
+	_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro _voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
+	.byte \base_midi_key
+	.byte 0
+	.if \pan != 0
+	.byte (0x80 | \pan)
+	.else
+	.byte 0
+	.endif
+	.4byte \sample_data_pointer
+	.byte \attack
+	.byte \decay
+	.byte \sustain
+	.byte \release
+	.endm
+
+	.macro voice_square_1 sweep, duty_cycle, attack, decay, sustain, release
+	_voice_square_1 1, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_square_1_alt sweep, duty_cycle, attack, decay, sustain, release
+	_voice_square_1 9, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro _voice_square_1 type, sweep, duty_cycle, attack, decay, sustain, release
+	.byte \type, 60, 0
+	.byte \sweep
+	.byte (\duty_cycle & 0x3)
+	.byte 0, 0, 0
+	.byte (\attack  & 0x7)
+	.byte (\decay   & 0x7)
+	.byte (\sustain & 0xF)
+	.byte (\release & 0x7)
+	.endm
+
+	.macro voice_square_2 duty_cycle, attack, decay, sustain, release
+	_voice_square_2 2, \duty_cycle, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_square_2_alt duty_cycle, attack, decay, sustain, release
+	_voice_square_2 10, \duty_cycle, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro _voice_square_2 type, duty_cycle, attack, decay, sustain, release
+	.byte \type, 60, 0, 0
+	.byte (\duty_cycle & 0x3)
+	.byte 0, 0, 0
+	.byte (\attack  & 0x7)
+	.byte (\decay   & 0x7)
+	.byte (\sustain & 0xF)
+	.byte (\release & 0x7)
+	.endm
+
+	.macro voice_programmable_wave wave_samples_pointer, attack, decay, sustain, release
+	_voice_programmable_wave 3, \wave_samples_pointer, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_programmable_wave_alt wave_samples_pointer, attack, decay, sustain, release
+	_voice_programmable_wave 11, \wave_samples_pointer, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro _voice_programmable_wave type, wave_samples_pointer, attack, decay, sustain, release
+	.byte \type, 60, 0, 0
+	.4byte \wave_samples_pointer
+	.byte (\attack  & 0x7)
+	.byte (\decay   & 0x7)
+	.byte (\sustain & 0xF)
+	.byte (\release & 0x7)
+	.endm
+
+	.macro voice_noise period, attack, decay, sustain, release
+	_voice_noise 4, \period, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_noise_alt period, attack, decay, sustain, release
+	_voice_noise 12, \period, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro _voice_noise type, period, attack, decay, sustain, release
+	.byte \type, 60, 0, 0
+	.byte (\period & 0x1)
+	.byte 0, 0, 0
+	.byte (\attack  & 0x7)
+	.byte (\decay   & 0x7)
+	.byte (\sustain & 0xF)
+	.byte (\release & 0x7)
+	.endm
+
+	.macro voice_keysplit voice_group_pointer, keysplit_table_pointer
+	.byte 0x40, 0, 0, 0
+	.4byte \voice_group_pointer
+	.4byte \keysplit_table_pointer
+	.endm
+
+	.macro voice_keysplit_all voice_group_pointer
+	.byte 0x80, 0, 0, 0
+	.4byte \voice_group_pointer
+	.4byte 0
+	.endm
+
+	.macro cry sample
+	.byte 0x20, 60, 0, 0
+	.4byte \sample
+	.byte 0xff, 0, 0xff, 0
+	.endm
+
+	.macro cry2 sample
+	.byte 0x30, 60, 0, 0
+	.4byte \sample
+	.byte 0xff, 0, 0xff, 0
+	.endm