From 5af2f6fcb01fbd5c5ce8cf639c9cf964188227f9 Mon Sep 17 00:00:00 2001 From: Pokeglitch Date: Fri, 15 Jun 2018 11:44:47 -0400 Subject: Updated script constants --- constants/script_constants.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'constants') diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 1736d36..3aa19b5 100755 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -1,15 +1,15 @@ -; Teleport Scripts +; Script IDs const_def - const SCRIPT_TRY_TELEPORT ; 00 - const SCRIPT_DO_TELEPORT ; 01 - const SCRIPT_FAIL_TELEPORT ; 02 - const SCRIPT_CHECK_SPAWN_TELEPORT ; 03 + const SCRIPT_ID_00 ; 00 + const SCRIPT_ID_01 ; 01 + const SCRIPT_ID_02 ; 02 + const SCRIPT_ID_03 ; 03 ; Flags -SCRIPT_FINISHED_FLAG EQU 7 +SCRIPT_FINISHED EQU 7 ; Masks/Return Values -SCRIPT_SUCCESS EQU $f -SCRIPT_FAIL EQU 0 -SCRIPT_FINISHED EQU 1 << SCRIPT_FINISHED_FLAG \ No newline at end of file +SCRIPT_FINISHED_MASK = 1 << SCRIPT_FINISHED +SCRIPT_SUCCESS EQU SCRIPT_FINISHED_MASK | $f +SCRIPT_FAIL EQU SCRIPT_FINISHED_MASK | 0 \ No newline at end of file -- cgit v1.2.3