diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_setup_constants.asm | 4 | ||||
| -rw-r--r-- | constants/script_constants.asm | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm index e3088496f..89d99ba90 100644 --- a/constants/map_setup_constants.asm +++ b/constants/map_setup_constants.asm @@ -1,5 +1,4 @@ -const_value SET $f0 - const MAPSETUP_00 +const_value SET $f1 const MAPSETUP_WARP const MAPSETUP_02 const MAPSETUP_RELOADMAP @@ -11,6 +10,7 @@ const_value SET $f0 const MAPSETUP_09 const MAPSETUP_10 const MAPSETUP_BADWARP + const MAPSETUP_12 ; Command descriptions from Condensation water's scripting compendium. const_def const_def diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 191a9c024..5cda66d02 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -35,3 +35,17 @@ NUM_VARS EQU const_value RETVAR_STRBUF2 EQU (0 << 6) RETVAR_ADDR_DE EQU (1 << 6) RETVAR_EXECUTE EQU (2 << 6) + +const_value SET -1 + const PLAYEREVENT_MAPSCRIPT + const PLAYEREVENT_NONE + const PLAYEREVENT_SEENBYTRAINER + const PLAYEREVENT_TALKTOTRAINER + const PLAYEREVENT_ITEMBALL + const PLAYEREVENT_4 + const PLAYEREVENT_WARP + const PLAYEREVENT_FALL + const PLAYEREVENT_7 + const PLAYEREVENT_HATCH + const PLAYEREVENT_9 +NUM_PLAYER_EVENTS EQU const_value |