diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_constants.asm | 2 | ||||
| -rw-r--r-- | constants/map_setup_constants.asm | 18 | ||||
| -rw-r--r-- | constants/script_constants.asm | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 09b8fa2fc..9d9ae339b 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -540,7 +540,7 @@ const_value SET 1 const OBJECT_SPRITE_Y const OBJECT_SPRITE_X_OFFSET const OBJECT_SPRITE_Y_OFFSET - const OBJECT_27 + const OBJECT_MOVEMENT_BYTE_INDEX const OBJECT_28 const OBJECT_29 const OBJECT_30 diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm index 89d99ba90..194257996 100644 --- a/constants/map_setup_constants.asm +++ b/constants/map_setup_constants.asm @@ -1,16 +1,16 @@ const_value SET $f1 const MAPSETUP_WARP - const MAPSETUP_02 + const MAPSETUP_CONTINUE const MAPSETUP_RELOADMAP - const MAPSETUP_04 - const MAPSETUP_05 - const MAPSETUP_06 - const MAPSETUP_07 - const MAPSETUP_08 - const MAPSETUP_09 - const MAPSETUP_10 + const MAPSETUP_TELEPORT + const MAPSETUP_DOOR + const MAPSETUP_FALL + const MAPSETUP_CONNECTION + const MAPSETUP_LINKRETURN + const MAPSETUP_TRAIN + const MAPSETUP_SUBMENU const MAPSETUP_BADWARP - const MAPSETUP_12 + const MAPSETUP_FLY ; 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 c734867ea..058f9d92d 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -42,10 +42,10 @@ const_value SET -1 const PLAYEREVENT_SEENBYTRAINER const PLAYEREVENT_TALKTOTRAINER const PLAYEREVENT_ITEMBALL - const PLAYEREVENT_4 + const PLAYEREVENT_CONNECTION const PLAYEREVENT_WARP const PLAYEREVENT_FALL const PLAYEREVENT_WHITEOUT const PLAYEREVENT_HATCH - const PLAYEREVENT_9 + const PLAYEREVENT_JOYCHANGEFACING NUM_PLAYER_EVENTS EQU const_value |