diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm
index ada9a98..f182ab0 100644
--- a/constants/map_object_constants.asm
+++ b/constants/map_object_constants.asm
@@ -116,7 +116,7 @@ DEF MAPOBJECT_SCRIPT_POINTER   rw ; a
 DEF MAPOBJECT_EVENT_FLAG       rw ; c
                                rb_skip 2
 DEF MAPOBJECT_LENGTH EQU _RS
-DEF NUM_OBJECTS EQU 16
+DEF NUM_OBJECTS EQU 18
 DEF PLAYER_OBJECT EQU 0
 
 DEF MAPOBJECT_PALETTE_MASK EQU %11110000
diff --git a/ram/wram.asm b/ram/wram.asm
index 686d1fc..57e7f35 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -2939,11 +2939,11 @@ endr
 
 wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE
 
-	ds 40
+	ds 6
 
 wMapObjects::
 wPlayerObject:: map_object wPlayer ; player is map object 0
-; wMap1Object - wMap15Object
+; wMap1Object - wMap17Object
 for n, 1, NUM_OBJECTS
 wMap{d:n}Object:: map_object wMap{d:n}
 endr