2 files changed, 34 insertions, 28 deletions
diff --git a/include/game.h b/include/game.h
index 41b925f..32b3a1d 100755
--- a/include/game.h
+++ b/include/game.h
@@ -560,7 +560,13 @@ namespace ut {
 		LinkListNode initialNode;
 	};
 
-	class Color : public GXColor { };
+	class Color : public GXColor {
+		public:
+			GXColor& operator=(const GXColor &other) {
+				*((u32*)this) = *((u32*)&other);
+				return *this;
+			}
+	};
 
 	class Rect {
 	public:
@@ -651,9 +657,35 @@ namespace lyt {
 	};
 
 
+	class TexMap {
+		public:
+			void *image, *palette;
+			u16 width, height;
+			f32 minLOD, magLOD;
+			u16 lodBias, palEntryNum;
+			struct
+			{
+				u32                 textureFormat:      4;
+				u32                 mipmap:             1;
+				u32                 wrapS:              2;
+				u32                 wrapT:              2;
+				u32                 minFilter:          3;
+				u32                 magFilter:          1;
+				u32                 biasClampEnable:    1;
+				u32                 edgeLODEnable:      1;
+				u32                 anisotropy:         2;
+				u32                 paletteFormat:      2;
+			}   mBits;
+	};
+
 	class Material {
 	public:
-		// ...
+		virtual ~Material();
+
+		// cheating a bit here
+		u8 _[0x3C];
+		// this is actually a pointer to more stuff, not just texmaps
+		TexMap *texMaps;
 	};
 
 	class Pane {
diff --git a/include/newer.h b/include/newer.h
index d98f290..cf21cbb 100644
--- a/include/newer.h
+++ b/include/newer.h
@@ -1,32 +1,6 @@
 #ifndef NEWER_H
 #define NEWER_H 
 
-enum NWRWorld {
-	ISLAND = 0, YOSHI_ISLAND = 0,
-	DESERT = 1, RUBBLE_RUINS = 1,
-	SEWER = 2, SOGGY_SEWERS = 2,
-	MOUNTAIN = 3, MUSHROOM_PEAKS = 3,
-	SAKURA = 4, SAKURA_VILLAGE = 4,
-	FREEZEFLAME = 5, FREEZEFLAME_GLACIER = 5,
-	VOLCANO = 6, FREEZEFLAME_VOLCANO = 6,
-	PUMPKIN = 7, PUMPKIN_BONEYARD = 7,
-	SKY_MOUNTAIN = 8,
-	SKY = 9, STARRY_SKIES = 9,
-	PLANET = 10, KOOPA_PLANET = 10,
-	CORE = 11, KOOPA_CORE = 11,
-	BONUS_LAND = 12,
-	GOLDWOOD = 13, GOLDWOOD_FOREST = 13,
-	MINIMEGA = 14, MINIMEGA_ISLAND = 14,
-	CRYSTAL = 15, CRYSTAL_CAVES = 15,
-	BOMBARD = 16, BOMBARD_CLIFFS = 16,
-	SKY_CITY = 17,
-	WORLD_COUNT = 18,
-	UNKNOWN_WORLD = 255
-};
-
-NWRWorld NewerWorldForLevelID(int world, int level);
-
-const wchar_t *NewerWorldName(NWRWorld world);
 int getStarCoinCount();
 
 #endif /* NEWER_H */