diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_object_constants.asm | 2 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index e387c647..4499b854 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -112,6 +112,8 @@ MAPOBJECT_SCRIPT_POINTER rw ; a MAPOBJECT_EVENT_FLAG rw ; c rb_skip 2 MAPOBJECT_LENGTH EQU _RS +NUM_OBJECTS EQU 16 +PLAYER_OBJECT EQU 0 ; SpriteMovementData struct members (see data/sprites/map_objects.asm) rsreset diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 131621d3..9a44b493 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -180,10 +180,6 @@ SPAWN_RED EQU 2 const FRIDAY ; 5 const SATURDAY ; 6 -; wMapObjects:: -PLAYER_OBJECT EQU 0 -NUM_OBJECTS EQU 16 - ; wStatusFlags:: const_def const STATUSFLAGS_POKEDEX_F ; 0 |