stop putting things in the LUS namespace from SoH

soh/soh/resource/type/Animation.cpp

@@ -1,6 +1,5 @@
 #include "Animation.h"
 
-namespace LUS {
 AnimationData* Animation::GetPointer() {
     return &animationData;
 }
@@ -18,4 +17,3 @@ size_t Animation::GetPointerSize() {
             return 0;
     }
 }
-} // namespace LUS

soh/soh/resource/type/AudioSample.cpp

@@ -1,6 +1,5 @@
 #include "AudioSample.h"
 
-namespace LUS {
 Sample* AudioSample::GetPointer() {
     return &sample;
 }
@@ -8,4 +7,3 @@ Sample* AudioSample::GetPointer() {
 size_t AudioSample::GetPointerSize() {
     return sizeof(Sample);
 }
-} // namespace LUS

soh/soh/resource/type/AudioSample.h

@@ -5,57 +5,55 @@
 #include "Resource.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
+typedef struct {
-    typedef struct {
+    /* 0x00 */ uintptr_t start;
-        /* 0x00 */ uintptr_t start;
+    /* 0x04 */ uintptr_t end;
-        /* 0x04 */ uintptr_t end;
+    /* 0x08 */ u32 count;
-        /* 0x08 */ u32 count;
+    /* 0x0C */ char unk_0C[0x4];
-        /* 0x0C */ char unk_0C[0x4];
+    /* 0x10 */ s16 state[16]; // only exists if count != 0. 8-byte aligned
-        /* 0x10 */ s16 state[16]; // only exists if count != 0. 8-byte aligned
+} AdpcmLoop; // size = 0x30 (or 0x10)
-    } AdpcmLoop; // size = 0x30 (or 0x10)
 
-    typedef struct {
+typedef struct {
-        /* 0x00 */ s32 order;
+    /* 0x00 */ s32 order;
-        /* 0x04 */ s32 npredictors;
+    /* 0x04 */ s32 npredictors;
-        /* 0x08 */ s16* book; // size 8 * order * npredictors. 8-byte aligned
+    /* 0x08 */ s16* book; // size 8 * order * npredictors. 8-byte aligned
-    } AdpcmBook; // s
+} AdpcmBook; // s
 
-    typedef struct {
+typedef struct {
-        union {
+    union {
-            struct {
+        struct {
-                /* 0x00 */ u32 codec : 4;
+            /* 0x00 */ u32 codec : 4;
-                /* 0x00 */ u32 medium : 2;
+            /* 0x00 */ u32 medium : 2;
-                /* 0x00 */ u32 unk_bit26 : 1;
+            /* 0x00 */ u32 unk_bit26 : 1;
-                /* 0x00 */ u32 unk_bit25 : 1; // this has been named isRelocated in zret
+            /* 0x00 */ u32 unk_bit25 : 1; // this has been named isRelocated in zret
-                /* 0x01 */ u32 size : 24;
+            /* 0x01 */ u32 size : 24;
-            };
-            u32 asU32;
         };
-
+        u32 asU32;
-        /* 0x04 */ u8* sampleAddr;
-        /* 0x08 */ AdpcmLoop* loop;
-        /* 0x0C */ AdpcmBook* book;
-        u32 sampleRateMagicValue; // For wav samples only...
-        s32 sampleRate;           // For wav samples only...
-    } Sample; // size = 0x10
-
-    class AudioSample : public Resource<Sample> {
-        public:
-            using Resource::Resource;
-
-        AudioSample() : Resource(std::shared_ptr<ResourceInitData>()) {}
-
-            Sample* GetPointer();
-            size_t GetPointerSize();
-
-            Sample sample;
-            std::vector<uint8_t> audioSampleData;
-
-            AdpcmLoop loop;
-            uint32_t loopStateCount;
-
-            AdpcmBook book;
-            uint32_t bookDataCount;
-            std::vector<int16_t> bookData;
     };
-}; // namespace LUS
+
+    /* 0x04 */ u8* sampleAddr;
+    /* 0x08 */ AdpcmLoop* loop;
+    /* 0x0C */ AdpcmBook* book;
+    u32 sampleRateMagicValue; // For wav samples only...
+    s32 sampleRate;           // For wav samples only...
+} Sample; // size = 0x10
+
+class AudioSample : public LUS::Resource<Sample> {
+    public:
+        using Resource::Resource;
+
+    AudioSample() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {}
+
+        Sample* GetPointer();
+        size_t GetPointerSize();
+
+        Sample sample;
+        std::vector<uint8_t> audioSampleData;
+
+        AdpcmLoop loop;
+        uint32_t loopStateCount;
+
+        AdpcmBook book;
+        uint32_t bookDataCount;
+        std::vector<int16_t> bookData;
+};

soh/soh/resource/type/AudioSequence.cpp

@@ -1,7 +1,5 @@
 #include "AudioSequence.h"
 
-namespace LUS {
-
 Sequence* AudioSequence::GetPointer() {
     return &sequence;
 }
@@ -9,4 +7,3 @@ Sequence* AudioSequence::GetPointer() {
 size_t AudioSequence::GetPointerSize() {
     return sizeof(Sequence);
 }
-} // namespace LUS

soh/soh/resource/type/AudioSequence.h

@@ -5,8 +5,6 @@
 #include "Resource.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
-
 typedef struct {
     char* seqData;
     int32_t seqDataSize;
@@ -17,11 +15,11 @@ typedef struct {
     uint8_t fonts[16];
 } Sequence;
 
-class AudioSequence : public Resource<Sequence> {
+class AudioSequence : public LUS::Resource<Sequence> {
 public:
     using Resource::Resource;
 
-    AudioSequence() : Resource(std::shared_ptr<ResourceInitData>()) {}
+    AudioSequence() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {}
 
     Sequence* GetPointer();
     size_t GetPointerSize();
@@ -29,4 +27,3 @@ public:
     Sequence sequence;
     std::vector<char> sequenceData;
 };
-}; // namespace LUS

soh/soh/resource/type/AudioSoundFont.cpp

@@ -1,6 +1,5 @@
 #include "AudioSoundFont.h"
 
-namespace LUS {
 SoundFont* AudioSoundFont::GetPointer() {
     return &soundFont;
 }
@@ -8,4 +7,3 @@ SoundFont* AudioSoundFont::GetPointer() {
 size_t AudioSoundFont::GetPointerSize() {
     return sizeof(SoundFont);
 }
-} // namespace LUS

soh/soh/resource/type/AudioSoundFont.h

@@ -6,8 +6,6 @@
 #include "soh/resource/type/AudioSample.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
-
 typedef struct {
     /* 0x0 */ s16 delay;
     /* 0x2 */ s16 arg;
@@ -52,11 +50,11 @@ typedef struct {
     s32 fntIndex;
 } SoundFont; // size = 0x14
 
-class AudioSoundFont : public Resource<SoundFont> {
+class AudioSoundFont : public LUS::Resource<SoundFont> {
 public:
     using Resource::Resource;
 
-    AudioSoundFont() : Resource(std::shared_ptr<ResourceInitData>()) {}
+    AudioSoundFont() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {}
 
     SoundFont* GetPointer();
     size_t GetPointerSize();
@@ -81,4 +79,3 @@ public:
 
     SoundFont soundFont;
 };
-}; // namespace LUS

soh/soh/resource/type/Background.cpp

@@ -1,6 +1,5 @@
 #include "Background.h"
 
-namespace LUS {
 uint8_t* Background::GetPointer() {
     return Data.data();
 }
@@ -8,4 +7,3 @@ uint8_t* Background::GetPointer() {
 size_t Background::GetPointerSize() {
     return Data.size() * sizeof(uint8_t);
 }
-} // namespace LUS

soh/soh/resource/type/Background.h

@@ -2,16 +2,14 @@
 
 #include "resource/Resource.h"
 
-namespace LUS {
+class Background : public LUS::Resource<uint8_t> {
-class Background : public Resource<uint8_t> {
   public:
     using Resource::Resource;
 
-    Background() : Resource(std::shared_ptr<ResourceInitData>()) {}
+    Background() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {}
 
     uint8_t* GetPointer();
     size_t GetPointerSize();
 
     std::vector<uint8_t> Data;
 };
-}; // namespace LUS

soh/soh/resource/type/CollisionHeader.cpp

@@ -1,6 +1,5 @@
 #include "CollisionHeader.h"
 
-namespace LUS {
 CollisionHeaderData* CollisionHeader::GetPointer() {
     return &collisionHeaderData;
 }
@@ -8,4 +7,3 @@ CollisionHeaderData* CollisionHeader::GetPointer() {
 size_t CollisionHeader::GetPointerSize() {
     return sizeof(collisionHeaderData);
 }
-} // namespace LUS

soh/soh/resource/type/CollisionHeader.h

@@ -6,8 +6,6 @@
 #include <libultraship/libultra.h>
 #include "z64math.h"
 
-namespace LUS {
-
 typedef struct {
     /* 0x00 */ u16 type;
     union {
@@ -67,11 +65,11 @@ typedef struct {
     size_t cameraDataListLen; // OTRTODO: Added to allow for bounds checking the cameraDataList.
 } CollisionHeaderData; // original name: BGDataInfo
 
-class CollisionHeader : public Resource<CollisionHeaderData> {
+class CollisionHeader : public LUS::Resource<CollisionHeaderData> {
 public:
     using Resource::Resource;
 
-    CollisionHeader() : Resource(std::shared_ptr<ResourceInitData>()) {}
+    CollisionHeader() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {}
 
     CollisionHeaderData* GetPointer();
     size_t GetPointerSize();
@@ -95,4 +93,3 @@ public:
 
     std::vector<WaterBox> waterBoxes;
 };
-}; // namespace LUS

soh/soh/resource/type/Cutscene.cpp

@@ -1,7 +1,6 @@
 #include "Cutscene.h"
 #include <libultraship/libultra/gbi.h>
 
-namespace LUS {
 uint32_t* Cutscene::GetPointer() {
     return commands.data();
 }
@@ -9,4 +8,3 @@ uint32_t* Cutscene::GetPointer() {
 size_t Cutscene::GetPointerSize() {
 	return commands.size() * sizeof(uint32_t);
 }
-} // namespace LUS

soh/soh/resource/type/Cutscene.h

@@ -7,8 +7,6 @@
 #include "Vec3f.h"
 #include "Color3b.h"
 
-namespace LUS {
-
 enum class CutsceneCommands {
     Cmd00 = 0x0000,
     SetCameraPos = 0x0001,
@@ -44,11 +42,11 @@ enum class CutsceneCommands {
     Error = 0xFEAF,
 };
 
-class Cutscene : public Resource<uint32_t> {
+class Cutscene : public LUS::Resource<uint32_t> {
   public:
     using Resource::Resource;
 
-    Cutscene() : Resource(std::shared_ptr<ResourceInitData>()) {}
+    Cutscene() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {}
 
     uint32_t* GetPointer();
     size_t GetPointerSize();
@@ -57,15 +55,3 @@ class Cutscene : public Resource<uint32_t> {
     uint32_t endFrame;
     std::vector<uint32_t> commands;
 };
-} // namespace LUS
-
-
-/////////////
-
-// class CutsceneCommand {
-//   public:
-//     uint32_t commandID;
-//     uint32_t commandIndex;
-
-//     CutsceneCommand(){};
-// };

soh/soh/resource/type/Path.cpp

@@ -1,6 +1,5 @@
 #include "Path.h"
 
-namespace LUS {
 PathData* Path::GetPointer() {
     return pathData.data();
 }
@@ -8,4 +7,3 @@ PathData* Path::GetPointer() {
 size_t Path::GetPointerSize() {
     return pathData.size() * sizeof(PathData);
 }
-} // namespace LUS

soh/soh/resource/type/Path.h

@@ -6,18 +6,16 @@
 #include <libultraship/libultra/types.h>
 #include "z64math.h"
 
-namespace LUS {
-
 typedef struct {
     /* 0x00 */ u8 count; // number of points in the path
     /* 0x04 */ Vec3s* points; // Segment Address to the array of points
 } PathData; // size = 0x8
 
-class Path : public Resource<PathData> {
+class Path : public LUS::Resource<PathData> {
 public:
   using Resource::Resource;
 
-    Path() : Resource(std::shared_ptr<ResourceInitData>()) {}
+    Path() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {}
 
     PathData* GetPointer();
     size_t GetPointerSize();
@@ -26,4 +24,3 @@ public:
     std::vector<PathData> pathData;
     std::vector<std::vector<Vec3s>> paths;
 };
-}; // namespace LUS

soh/soh/resource/type/Scene.cpp

@@ -1,6 +1,5 @@
 #include "Scene.h"
 
-namespace LUS {
 void* Scene::GetPointer() {
     // Scene is a special type that requries C++ processing. As such, we return nothing.
     return nullptr;
@@ -9,4 +8,3 @@ void* Scene::GetPointer() {
 size_t Scene::GetPointerSize() {
 	return 0;
 }
-} // namespace LUS

soh/soh/resource/type/Scene.h

@@ -7,17 +7,14 @@
 #include "scenecommand/SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
+class Scene : public LUS::Resource<void> {
-
-class Scene : public Resource<void> {
 public:
   using Resource::Resource;
 
-    Scene() : Resource(std::shared_ptr<ResourceInitData>()) {}
+    Scene() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {}
 
     void* GetPointer();
   size_t GetPointerSize();
 
   std::vector<std::shared_ptr<ISceneCommand>> commands;
 };
-}; // namespace LUS

soh/soh/resource/type/Skeleton.cpp

@@ -3,7 +3,6 @@
 #include "soh/OTRGlobals.h"
 #include "libultraship/libultraship.h"
 
-namespace LUS {
 SkeletonData* Skeleton::GetPointer() {
     return &skeletonData;
 }
@@ -79,4 +78,3 @@ void SkeletonPatcher::UpdateSkeletons() {
         }
     }
 }
-} // namespace LUS

soh/soh/resource/type/Skeleton.h

@@ -5,8 +5,6 @@
 #include "SkeletonLimb.h"
 #include <z64animation.h>
 
-namespace LUS {
-
 enum class SkeletonType {
     Normal,
     Flex,
@@ -50,11 +48,11 @@ union SkeletonData {
     SkelCurveLimbList skelCurveLimbList;
 };
 
-class Skeleton : public Resource<SkeletonData> {
+class Skeleton : public LUS::Resource<SkeletonData> {
   public:
     using Resource::Resource;
 
-    Skeleton() : Resource(std::shared_ptr<ResourceInitData>()) {}
+    Skeleton() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {}
 
     SkeletonData* GetPointer();
     size_t GetPointerSize();
@@ -89,6 +87,3 @@ class SkeletonPatcher {
 
     static std::vector<SkeletonPatchInfo> skeletons;
 };
-
-
-} // namespace LUS

soh/soh/resource/type/SkeletonLimb.cpp

@@ -1,6 +1,5 @@
 #include "SkeletonLimb.h"
 
-namespace LUS {
 SkeletonLimbData* SkeletonLimb::GetPointer() {
     return &limbData;
 }
@@ -21,4 +20,3 @@ size_t SkeletonLimb::GetPointerSize() {
             return 0;
     }
 }
-} // namespace LUS

soh/soh/resource/type/SkeletonLimb.h

@@ -4,7 +4,6 @@
 #include "libultraship/libultra.h"
 #include "z64math.h"
 
-namespace LUS {
 enum class LimbType {
     Invalid,
     Standard,
@@ -97,11 +96,11 @@ union SkeletonLimbData {
   SkinLimb skinLimb;
 };
 
-class SkeletonLimb : public Resource<SkeletonLimbData> {
+class SkeletonLimb : public LUS::Resource<SkeletonLimbData> {
 public:
   using Resource::Resource;
 
-    SkeletonLimb() : Resource(std::shared_ptr<ResourceInitData>()) {}
+    SkeletonLimb() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {}
 
     SkeletonLimbData* GetPointer();
     size_t GetPointerSize();
@@ -131,4 +130,3 @@ public:
     std::vector<std::vector<SkinVertex>> skinLimbModifVertexArrays;
     std::vector<std::vector<SkinTransformation>> skinLimbModifTransformationArrays;
 };
-} // namespace LUS

soh/soh/resource/type/Text.cpp

@@ -1,6 +1,5 @@
 #include "Text.h"
 
-namespace LUS {
 MessageEntry* Text::GetPointer() {
     return messages.data();
 }
@@ -8,4 +7,3 @@ MessageEntry* Text::GetPointer() {
 size_t Text::GetPointerSize() {
 	return messages.size() * sizeof(MessageEntry);
 }
-} // namespace LUS

soh/soh/resource/type/Text.h

@@ -5,7 +5,6 @@
 #include "Resource.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 // TODO: we've moved away from using classes for this stuff
 class MessageEntry
 {
@@ -16,15 +15,14 @@ public:
 	std::string msg;
 };
 
-class Text : public Resource<MessageEntry> {
+class Text : public LUS::Resource<MessageEntry> {
 public:
   using Resource::Resource;
 
-    Text() : Resource(std::shared_ptr<ResourceInitData>()) {}
+    Text() : Resource(std::shared_ptr<LUS::ResourceInitData>()) {}
 
     MessageEntry* GetPointer();
     size_t GetPointerSize();
 
     std::vector<MessageEntry> messages;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/EndMarker.cpp

@@ -1,6 +1,5 @@
 #include "EndMarker.h"
 
-namespace LUS {
 Marker* EndMarker::GetPointer() {
     return &endMarker;
 }
@@ -8,4 +7,3 @@ Marker* EndMarker::GetPointer() {
 size_t EndMarker::GetPointerSize() {
 	return sizeof(Marker);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/EndMarker.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
 
 } Marker;
@@ -21,4 +20,3 @@ class EndMarker : public SceneCommand<Marker> {
 
     Marker endMarker;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/RomFile.h

@@ -2,10 +2,8 @@
 
 #include <cstdint>
 
-namespace LUS {
+typedef struct {
-    typedef struct {
+    /* 0x00 */ uintptr_t vromStart;
-        /* 0x00 */ uintptr_t vromStart;
+    /* 0x04 */ uintptr_t vromEnd;
-        /* 0x04 */ uintptr_t vromEnd;
+    char* fileName;
-        char* fileName;
+} RomFile; // size = 0x8
-    } RomFile; // size = 0x8
-}

soh/soh/resource/type/scenecommand/SceneCommand.h

@@ -6,8 +6,6 @@
 #include "Resource.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
-
 enum class SceneCommandID : uint8_t {
     SetStartPositionList = 0x00,
     SetActorList = 0x01,
@@ -47,10 +45,10 @@ enum class SceneCommandID : uint8_t {
     Error = 0xFF
 };
 
-class ISceneCommand : public IResource {
+class ISceneCommand : public LUS::IResource {
 public:
     using IResource::IResource;
-    ISceneCommand() : IResource(std::shared_ptr<ResourceInitData>()) {}
+    ISceneCommand() : IResource(std::shared_ptr<LUS::ResourceInitData>()) {}
     SceneCommandID cmdId;
 };
 
@@ -62,5 +60,3 @@ template <class T> class SceneCommand : public ISceneCommand {
         return static_cast<void*>(GetPointer());
     }
 };
-
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetActorList.cpp

@@ -1,6 +1,5 @@
 #include "SetActorList.h"
 
-namespace LUS {
 ActorEntry* SetActorList::GetPointer() {
     return actorList.data();
 }
@@ -8,4 +7,3 @@ ActorEntry* SetActorList::GetPointer() {
 size_t SetActorList::GetPointerSize() {
 	return actorList.size() * sizeof(ActorEntry);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetActorList.h

@@ -9,7 +9,6 @@
 // #include <libultraship/libultra/types.h>
 #include "z64math.h"
 
-namespace LUS {
 typedef struct {
     /* 0x00 */ s16   id;
     /* 0x02 */ Vec3s pos;
@@ -27,4 +26,3 @@ class SetActorList : public SceneCommand<ActorEntry> {
     uint32_t numActors;
     std::vector<ActorEntry> actorList;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetAlternateHeaders.cpp

@@ -1,6 +1,5 @@
 #include "SetAlternateHeaders.h"
 
-namespace LUS {
 void* SetAlternateHeaders::GetPointer() {
     // Like Scene, SetAlternateHeader is a special type that is only acted upon in C++.
     return nullptr;
@@ -9,4 +8,3 @@ void* SetAlternateHeaders::GetPointer() {
 size_t SetAlternateHeaders::GetPointerSize() {
     return 0;
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetAlternateHeaders.h

@@ -10,9 +10,6 @@
 #include "RomFile.h"
 #include <libultraship/libultra/types.h>
 
-
-namespace LUS {
-
 class SetAlternateHeaders : public SceneCommand<void> {
   public:
     using SceneCommand::SceneCommand;
@@ -23,4 +20,3 @@ class SetAlternateHeaders : public SceneCommand<void> {
     uint32_t numHeaders;
     std::vector<std::shared_ptr<Scene>> headers;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetCameraSettings.cpp

@@ -1,6 +1,5 @@
 #include "SetCameraSettings.h"
 
-namespace LUS {
 CameraSettings* SetCameraSettings::GetPointer() {
     return &settings;
 }
@@ -8,4 +7,3 @@ CameraSettings* SetCameraSettings::GetPointer() {
 size_t SetCameraSettings::GetPointerSize() {
 	return sizeof(CameraSettings);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetCameraSettings.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
   int8_t cameraMovement;
   int32_t worldMapArea;
@@ -22,4 +21,3 @@ class SetCameraSettings : public SceneCommand<CameraSettings> {
 
     CameraSettings settings;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetCollisionHeader.cpp

@@ -1,6 +1,5 @@
 #include "SetCollisionHeader.h"
 
-namespace LUS {
 CollisionHeaderData* SetCollisionHeader::GetPointer() {
     if (collisionHeader == nullptr) {
         return nullptr;
@@ -14,4 +13,3 @@ size_t SetCollisionHeader::GetPointerSize() {
     }
 	return collisionHeader->GetPointerSize();
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetCollisionHeader.h

@@ -9,7 +9,6 @@
 #include "soh/resource/type/CollisionHeader.h"
 // #include <libultraship/libultra/types.h>
 
-namespace LUS {
 class SetCollisionHeader : public SceneCommand<CollisionHeaderData> {
   public:
     using SceneCommand::SceneCommand;
@@ -21,4 +20,3 @@ class SetCollisionHeader : public SceneCommand<CollisionHeaderData> {
 
     std::shared_ptr<CollisionHeader> collisionHeader;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetCsCamera.cpp

@@ -1,6 +1,5 @@
 #include "SetCsCamera.h"
 
-namespace LUS {
 CsCamera* SetCsCamera::GetPointer() {
     return &csCamera;
 }
@@ -8,4 +7,3 @@ CsCamera* SetCsCamera::GetPointer() {
 size_t SetCsCamera::GetPointerSize() {
 	return sizeof(CsCamera);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetCsCamera.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
 
 } CsCamera;
@@ -21,4 +20,3 @@ class SetCsCamera : public SceneCommand<CsCamera> {
 
     CsCamera csCamera;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetCutscenes.cpp

@@ -1,6 +1,5 @@
 #include "SetCutscenes.h"
 
-namespace LUS {
 uint32_t* SetCutscenes::GetPointer() {
     if (cutscene == nullptr) {
         return nullptr;
@@ -14,4 +13,3 @@ size_t SetCutscenes::GetPointerSize() {
     }
 	return cutscene->GetPointerSize();
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetCutscenes.h

@@ -9,7 +9,6 @@
 #include "soh/resource/type/Cutscene.h"
 // #include <libultraship/libultra.h>
 
-namespace LUS {
 class SetCutscenes : public SceneCommand<uint32_t> {
   public:
     using SceneCommand::SceneCommand;
@@ -20,4 +19,3 @@ class SetCutscenes : public SceneCommand<uint32_t> {
     std::string fileName;
     std::shared_ptr<Cutscene> cutscene;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetEchoSettings.cpp

@@ -1,6 +1,5 @@
 #include "SetEchoSettings.h"
 
-namespace LUS {
 EchoSettings* SetEchoSettings::GetPointer() {
     return &settings;
 }
@@ -8,4 +7,3 @@ EchoSettings* SetEchoSettings::GetPointer() {
 size_t SetEchoSettings::GetPointerSize() {
 	return sizeof(EchoSettings);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetEchoSettings.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
   int8_t echo;
 } EchoSettings;
@@ -21,4 +20,3 @@ class SetEchoSettings : public SceneCommand<EchoSettings> {
 
     EchoSettings settings;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetEntranceList.cpp

@@ -1,6 +1,5 @@
 #include "SetEntranceList.h"
 
-namespace LUS {
 EntranceEntry* SetEntranceList::GetPointer() {
     return entrances.data();
 }
@@ -8,4 +7,3 @@ EntranceEntry* SetEntranceList::GetPointer() {
 size_t SetEntranceList::GetPointerSize() {
 	return entrances.size() * sizeof(EntranceEntry);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetEntranceList.h

@@ -8,7 +8,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
     /* 0x00 */ u8 spawn;
     /* 0x01 */ u8 room;
@@ -25,4 +24,3 @@ class SetEntranceList : public SceneCommand<EntranceEntry> {
 
     std::vector<EntranceEntry> entrances;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetExitList.cpp

@@ -1,6 +1,5 @@
 #include "SetExitList.h"
 
-namespace LUS {
 uint16_t* SetExitList::GetPointer() {
     return exits.data();
 }
@@ -8,4 +7,3 @@ uint16_t* SetExitList::GetPointer() {
 size_t SetExitList::GetPointerSize() {
 	return exits.size() * sizeof(int16_t);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetExitList.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 class SetExitList : public SceneCommand<uint16_t> {
   public:
     using SceneCommand::SceneCommand;
@@ -19,4 +18,3 @@ class SetExitList : public SceneCommand<uint16_t> {
 
     std::vector<uint16_t> exits;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetLightList.cpp

@@ -1,6 +1,5 @@
 #include "SetLightList.h"
 
-namespace LUS {
 LightInfo* SetLightList::GetPointer() {
     return lightList.data();
 }
@@ -8,4 +7,3 @@ LightInfo* SetLightList::GetPointer() {
 size_t SetLightList::GetPointerSize() {
 	return lightList.size() * sizeof(LightInfo);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetLightList.h

@@ -8,7 +8,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
     /* 0x0 */ s16 x;
     /* 0x2 */ s16 y;
@@ -45,4 +44,3 @@ class SetLightList : public SceneCommand<LightInfo> {
     uint32_t numLights;
     std::vector<LightInfo> lightList;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetLightingSettings.cpp

@@ -1,6 +1,5 @@
 #include "SetLightingSettings.h"
 
-namespace LUS {
 EnvLightSettings* SetLightingSettings::GetPointer() {
     return settings.data();
 }
@@ -8,4 +7,3 @@ EnvLightSettings* SetLightingSettings::GetPointer() {
 size_t SetLightingSettings::GetPointerSize() {
 	return settings.size() * sizeof(EnvLightSettings);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetLightingSettings.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
     /* 0x00 */ u8 ambientColor[3];
     /* 0x03 */ s8 light1Dir[3];
@@ -28,4 +27,3 @@ class SetLightingSettings : public SceneCommand<EnvLightSettings> {
 
     std::vector<EnvLightSettings> settings;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetMesh.cpp

@@ -1,6 +1,5 @@
 #include "SetMesh.h"
 
-namespace LUS {
 MeshHeader* SetMesh::GetPointer() {
     return &meshHeader;
 }
@@ -8,4 +7,3 @@ MeshHeader* SetMesh::GetPointer() {
 size_t SetMesh::GetPointerSize() {
 	return sizeof(MeshHeader);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetMesh.h

@@ -8,7 +8,6 @@
 #include "libultraship/libultra.h"
 #include "z64math.h"
 
-namespace LUS {
 typedef struct {
     /* 0x00 */ u8    type;
 } PolygonBase;
@@ -100,4 +99,3 @@ class SetMesh : public SceneCommand<MeshHeader> {
     std::vector<BgImage> images;
     MeshHeader meshHeader;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetObjectList.cpp

@@ -1,6 +1,5 @@
 #include "SetObjectList.h"
 
-namespace LUS {
 int16_t* SetObjectList::GetPointer() {
     return objects.data();
 }
@@ -8,4 +7,3 @@ int16_t* SetObjectList::GetPointer() {
 size_t SetObjectList::GetPointerSize() {
 	return objects.size() * sizeof(int16_t);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetObjectList.h

@@ -8,7 +8,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 class SetObjectList : public SceneCommand<int16_t> {
   public:
     using SceneCommand::SceneCommand;
@@ -19,4 +18,3 @@ class SetObjectList : public SceneCommand<int16_t> {
     uint32_t numObjects;
     std::vector<int16_t> objects;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetPathways.cpp

@@ -1,6 +1,5 @@
 #include "SetPathways.h"
 
-namespace LUS {
 PathData** SetPathways::GetPointer() {
     return paths.data();
 }
@@ -8,4 +7,3 @@ PathData** SetPathways::GetPointer() {
 size_t SetPathways::GetPointerSize() {
     return paths.size() * sizeof(PathData*);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetPathways.h

@@ -8,8 +8,6 @@
 // #include <libultraship/libultra/types.h>
 #include "soh/resource/type/Path.h"
 
-namespace LUS {
-
 class SetPathways : public SceneCommand<PathData*> {
   public:
     using SceneCommand::SceneCommand;
@@ -20,4 +18,3 @@ class SetPathways : public SceneCommand<PathData*> {
     uint32_t numPaths;
     std::vector<PathData*> paths;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetRoomBehavior.cpp

@@ -1,6 +1,5 @@
 #include "SetRoomBehavior.h"
 
-namespace LUS {
 RoomBehavior* SetRoomBehavior::GetPointer() {
     return &roomBehavior;
 }
@@ -8,4 +7,3 @@ RoomBehavior* SetRoomBehavior::GetPointer() {
 size_t SetRoomBehavior::GetPointerSize() {
 	return sizeof(RoomBehavior);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetRoomBehavior.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
   int8_t gameplayFlags;
   int32_t gameplayFlags2;
@@ -22,4 +21,3 @@ class SetRoomBehavior : public SceneCommand<RoomBehavior> {
 
     RoomBehavior roomBehavior;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetRoomList.cpp

@@ -1,6 +1,5 @@
 #include "SetRoomList.h"
 
-namespace LUS {
 RomFile* SetRoomList::GetPointer() {
     return rooms.data();
 }
@@ -8,4 +7,3 @@ RomFile* SetRoomList::GetPointer() {
 size_t SetRoomList::GetPointerSize() {
 	return rooms.size() * sizeof(RomFile);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetRoomList.h

@@ -9,14 +9,6 @@
 #include "RomFile.h"
 #include <libultraship/libultra/types.h>
 
-
-namespace LUS {
-// typedef struct {
-//     /* 0x00 */ uintptr_t vromStart;
-//     /* 0x04 */ uintptr_t vromEnd;
-//     char* fileName;
-// } RomFile; // size = 0x8
-
 class SetRoomList : public SceneCommand<RomFile> {
   public:
     using SceneCommand::SceneCommand;
@@ -29,4 +21,3 @@ class SetRoomList : public SceneCommand<RomFile> {
     std::vector<std::string> fileNames;
     std::vector<RomFile> rooms;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetSkyboxModifier.cpp

@@ -1,6 +1,5 @@
 #include "SetSkyboxModifier.h"
 
-namespace LUS {
 SkyboxModifier* SetSkyboxModifier::GetPointer() {
     return &modifier;
 }
@@ -8,4 +7,3 @@ SkyboxModifier* SetSkyboxModifier::GetPointer() {
 size_t SetSkyboxModifier::GetPointerSize() {
 	return sizeof(SkyboxModifier);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetSkyboxModifier.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
   uint8_t skyboxDisabled;
   uint8_t sunMoonDisabled;
@@ -22,4 +21,3 @@ class SetSkyboxModifier : public SceneCommand<SkyboxModifier> {
 
     SkyboxModifier modifier;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetSkyboxSettings.cpp

@@ -1,6 +1,5 @@
 #include "SetSkyboxSettings.h"
 
-namespace LUS {
 SkyboxSettings* SetSkyboxSettings::GetPointer() {
     return &settings;
 }
@@ -8,4 +7,3 @@ SkyboxSettings* SetSkyboxSettings::GetPointer() {
 size_t SetSkyboxSettings::GetPointerSize() {
 	return sizeof(SetSkyboxSettings);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetSkyboxSettings.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
   uint8_t unk;
   uint8_t skyboxId;
@@ -24,4 +23,3 @@ class SetSkyboxSettings : public SceneCommand<SkyboxSettings> {
 
     SkyboxSettings settings;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetSoundSettings.cpp

@@ -1,6 +1,5 @@
 #include "SetSoundSettings.h"
 
-namespace LUS {
 SoundSettings* SetSoundSettings::GetPointer() {
     return &settings;
 }
@@ -8,4 +7,3 @@ SoundSettings* SetSoundSettings::GetPointer() {
 size_t SetSoundSettings::GetPointerSize() {
 	return sizeof(SoundSettings);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetSoundSettings.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
   uint8_t seqId;
   uint8_t natureAmbienceId;
@@ -23,4 +22,3 @@ class SetSoundSettings : public SceneCommand<SoundSettings> {
 
     SoundSettings settings;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetSpecialObjects.cpp

@@ -1,6 +1,5 @@
 #include "SetSpecialObjects.h"
 
-namespace LUS {
 SpecialObjects* SetSpecialObjects::GetPointer() {
     return &specialObjects;
 }
@@ -8,4 +7,3 @@ SpecialObjects* SetSpecialObjects::GetPointer() {
 size_t SetSpecialObjects::GetPointerSize() {
 	return sizeof(SpecialObjects);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetSpecialObjects.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
   int8_t elfMessage;
   int16_t globalObject;
@@ -22,4 +21,3 @@ class SetSpecialObjects : public SceneCommand<SpecialObjects> {
 
     SpecialObjects specialObjects;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetStartPositionList.cpp

@@ -1,6 +1,5 @@
 #include "SetStartPositionList.h"
 
-namespace LUS {
 ActorEntry* SetStartPositionList::GetPointer() {
     return startPositions.data();
 }
@@ -8,4 +7,3 @@ ActorEntry* SetStartPositionList::GetPointer() {
 size_t SetStartPositionList::GetPointerSize() {
 	return startPositions.size() * sizeof(ActorEntry);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetStartPositionList.h

@@ -9,14 +9,6 @@
 #include "soh/resource/type/scenecommand/SetActorList.h"
 // #include <libultraship/libultra/types.h>
 
-namespace LUS {
-// typedef struct {
-//     /* 0x00 */ s16   id;
-//     /* 0x02 */ Vec3s pos;
-//     /* 0x08 */ Vec3s rot;
-//     /* 0x0E */ s16   params;
-// } ActorEntry; // size = 0x10
-
 class SetStartPositionList : public SceneCommand<ActorEntry> {
   public:
     using SceneCommand::SceneCommand;
@@ -27,4 +19,3 @@ class SetStartPositionList : public SceneCommand<ActorEntry> {
     uint32_t numStartPositions;
     std::vector<ActorEntry> startPositions;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetTimeSettings.cpp

@@ -1,6 +1,5 @@
 #include "SetTimeSettings.h"
 
-namespace LUS {
 TimeSettings* SetTimeSettings::GetPointer() {
     return &settings;
 }
@@ -8,4 +7,3 @@ TimeSettings* SetTimeSettings::GetPointer() {
 size_t SetTimeSettings::GetPointerSize() {
 	return sizeof(TimeSettings);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetTimeSettings.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
   uint8_t hour;
   uint8_t minute;
@@ -23,4 +22,3 @@ class SetTimeSettings : public SceneCommand<TimeSettings> {
 
     TimeSettings settings;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetTransitionActorList.cpp

@@ -1,6 +1,5 @@
 #include "SetTransitionActorList.h"
 
-namespace LUS {
 TransitionActorEntry* SetTransitionActorList::GetPointer() {
     return transitionActorList.data();
 }
@@ -8,4 +7,3 @@ TransitionActorEntry* SetTransitionActorList::GetPointer() {
 size_t SetTransitionActorList::GetPointerSize() {
 	return transitionActorList.size() * sizeof(TransitionActorEntry);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetTransitionActorList.h

@@ -9,7 +9,6 @@
 // #include <libultraship/libultra/types.h>
 #include "z64math.h"
 
-namespace LUS {
 typedef struct {
     struct {
         s8 room;    // Room to switch to
@@ -31,4 +30,3 @@ class SetTransitionActorList : public SceneCommand<TransitionActorEntry> {
     uint32_t numTransitionActors;
     std::vector<TransitionActorEntry> transitionActorList;
 };
-}; // namespace LUS

soh/soh/resource/type/scenecommand/SetWindSettings.cpp

@@ -1,6 +1,5 @@
 #include "SetWindSettings.h"
 
-namespace LUS {
 WindSettings* SetWindSettings::GetPointer() {
     return &settings;
 }
@@ -8,4 +7,3 @@ WindSettings* SetWindSettings::GetPointer() {
 size_t SetWindSettings::GetPointerSize() {
 	return sizeof(WindSettings);
 }
-} // namespace LUS

soh/soh/resource/type/scenecommand/SetWindSettings.h

@@ -7,7 +7,6 @@
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
-namespace LUS {
 typedef struct {
   int8_t windWest;
   int8_t windVertical;
@@ -24,4 +23,3 @@ class SetWindSettings : public SceneCommand<WindSettings> {
 
     WindSettings settings;
 };
-}; // namespace LUS