diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-04-26 20:45:59 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-04-26 22:15:31 -0400 |
| commit | d53f3afe500ad9e92f18a7e6de77982928a6061f (patch) | |
| tree | 9fd2697a741c82a98104b1c23437907f061be034 /constants | |
| parent | 0b33dabae2d43591a964774154f8bec5bf7194b1 (diff) | |
Clean up some overworld code.
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_object_constants.asm | 5 | ||||
| -rw-r--r-- | constants/map_setup_constants.asm | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 6a6cec59..51480453 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -70,6 +70,9 @@ EMOTE_OBJECT EQU 1 << EMOTE_OBJECT_F const OBJ_FLAGS2_2 ; 2 const OVERHEAD_F ; 3 const USE_OBP1_F ; 4 + const OBJ_FLAGS2_5 ; 5 + const OBJ_FLAGS2_6 ; 6 + const OBJ_FLAGS2_7 ; 7 LOW_PRIORITY EQU 1 << LOW_PRIORITY_F HIGH_PRIORITY EQU 1 << HIGH_PRIORITY_F @@ -225,7 +228,6 @@ NUM_SPRITEMOVEDATA EQU const_value const STEP_TYPE_16 ; 16 const STEP_TYPE_17 ; 17 const STEP_TYPE_18 ; 18 - const STEP_TYPE_SKYFALL_TOP ; 19 ; ObjectActionPairPointers indexes (see engine/overworld/map_object_action.asm) const_def @@ -245,7 +247,6 @@ NUM_SPRITEMOVEDATA EQU const_value const OBJECT_ACTION_BIG_DOLL ; 0d const OBJECT_ACTION_BOULDER_DUST ; 0e const OBJECT_ACTION_GRASS_SHAKE ; 0f - const OBJECT_ACTION_SKYFALL ; 10 ; Facings indexes (see data/sprites/facings.asm) const_def diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm index fb88997b..b38a3c52 100644 --- a/constants/map_setup_constants.asm +++ b/constants/map_setup_constants.asm @@ -12,7 +12,6 @@ const MAPSETUP_TRAIN ; f9 const MAPSETUP_SUBMENU ; fa const MAPSETUP_BADWARP ; fb - const MAPSETUP_FLY ; fc ; MapSetupCommands indexes (see engine/overworld/map_setup.asm) const_def |