summaryrefslogtreecommitdiff
path: root/src/macros/scripts.asm
diff options
context:
space:
mode:
Diffstat (limited to 'src/macros/scripts.asm')
-rw-r--r--[-rwxr-xr-x]src/macros/scripts.asm22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm
index 6836b4d..5884ffc 100755..100644
--- a/src/macros/scripts.asm
+++ b/src/macros/scripts.asm
@@ -77,7 +77,7 @@ ENDM
const Func_d3e0_index ; $45
const Func_d3fe_index ; $46
const Func_d408_index ; $47
- const Func_d40f_index ; $48
+ const ScriptCommand_PlaySong_index ; $48
const ScriptCommand_PlaySFX_index ; $49
const ScriptCommand_PauseSong_index ; $4a
const ScriptCommand_ResumeSong_index ; $4b
@@ -346,6 +346,12 @@ script_nop: MACRO
run_command ScriptCommand_nop
ENDM
+; Plays a song
+play_song: MACRO
+ run_command ScriptCommand_PlaySong
+ db \1 ; Song ID (ex MUSIC_BOOSTER_PACK)
+ENDM
+
; Plays a sound effect
play_sfx: MACRO
run_command ScriptCommand_PlaySFX
@@ -471,22 +477,22 @@ zero_out_flag_value: MACRO
db \1 ; flag (ex EVENT_FLAG_11)
ENDM
-; Jumps to a script position if a flag is zero
-jump_if_flag_zero_2: MACRO
- run_command ScriptCommand_JumpIfFlagZero2
+; Jumps to a script position if a flag is nonzero
+jump_if_flag_nonzero_2: MACRO
+ run_command ScriptCommand_JumpIfFlagNonzero2
db \1 ; flag (ex EVENT_FLAG_11)
dw \2 ; Script Label
ENDM
-; Jumps to a script position if a flag is nonzero
-jump_if_flag_nonzero_2: MACRO
- run_command ScriptCommand_JumpIfFlagNonzero2
+; Jumps to a script position if a flag is zero
+jump_if_flag_zero_2: MACRO
+ run_command ScriptCommand_JumpIfFlagZero2
db \1 ; flag (ex EVENT_FLAG_11)
dw \2 ; Script Label
ENDM
; Increments given flags value (truncates the new value)
-script_increment_flag_value: MACRO
+increment_flag_value: MACRO
run_command ScriptCommand_IncrementFlagValue
db \1 ; flag (ex EVENT_FLAG_11)
ENDM