Further fixes

cstreamwriter.cpp

@@ -143,7 +143,10 @@ void CStreamWriter::writeMapObjects(QList<MapObject*>* mapObjects, quint8 type,
         writeMapObject(o);
     }
 
-    *stream << "\t{ 0xFF, {0xFF, 0xFF, 0xFF}, 0, 0, 0 }" << endl;
+    if (type == 0)
+        *stream << "\t{ 0x00, {0x00, 0x00, 0x00}, 0, 0, 0 }" << endl;
+    else
+        *stream << "\t{ 0xFF, {0xFF, 0xFF, 0xFF}, 0, 0, 0 }" << endl;
     *stream << "};" << endl;
 }
 

goombatlas_data/worldmap.h

@@ -53,7 +53,7 @@ typedef struct mapObject
 	s32 x;
 	s32 y;
 	s32 z;
-} worldmapObject;
+} mapObject;
 
 typedef struct bowserJrNode
 {
@@ -67,9 +67,9 @@ typedef struct world
 	pathBehavior *pathBehaviors;
 	sprites *mapObjs;
 	visibleNode *visibleNode;
-	worldmapObject *starcoinSigns;		// As many as you want. Last one should be zeroed
-	worldmapObject *strongholds;		// ^
-	worldmapObject *mushroomHouses;		// ^
+	mapObject *starcoinSigns;		// As many as you want. Last one should be zeroed
+	mapObject *strongholds;		// ^
+	mapObject *mushroomHouses;		// ^
 	bowserJrNode **bowserJrPaths;
 	u16 nodeCount;
 	u16 pathCount;