Fix includes and removed libs folder

configure.py

@@ -282,43 +282,43 @@ config.libs = [
     EGGLib(
         "core",
         [
-            Object(NonMatching, "lib/egg/core/eggArchive.cpp"),
-            Object(NonMatching, "lib/egg/core/eggDvdFile.cpp"),
-            Object(NonMatching, "lib/egg/core/eggDvdRipper.cpp"),
-            Object(NonMatching, "lib/egg/core/eggStream.cpp"),
-            Object(NonMatching, "lib/egg/core/eggAllocator.cpp"),
-            Object(NonMatching, "lib/egg/core/eggHeap.cpp"),
-            Object(NonMatching, "lib/egg/core/eggExpHeap.cpp"),
-            Object(NonMatching, "lib/egg/core/eggFrmHeap.cpp"),
-            Object(NonMatching, "lib/egg/core/eggAssertHeap.cpp"),
-            Object(NonMatching, "lib/egg/core/eggDisposer.cpp"),
-            Object(NonMatching, "lib/egg/core/eggThread.cpp"),
-            Object(NonMatching, "lib/egg/core/eggUnk.cpp"),
-            Object(NonMatching, "lib/egg/core/eggSystem.cpp"),
-            Object(   Matching, "lib/egg/core/eggDisplay.cpp"),
-            Object(NonMatching, "lib/egg/core/eggColorFader.cpp"),
-            Object(NonMatching, "lib/egg/core/eggAsyncDisplay.cpp"), 
-            Object(NonMatching, "lib/egg/core/eggVideo.cpp"),
-            Object(NonMatching, "lib/egg/core/eggXfb.cpp"),
-            Object(NonMatching, "lib/egg/core/eggXfbManager.cpp"),
-            Object(NonMatching, "lib/egg/core/eggGraphicsFifo.cpp"), 
-            Object(NonMatching, "lib/egg/core/eggController.cpp"),
+            Object(NonMatching, "egg/core/eggArchive.cpp"),
+            Object(NonMatching, "egg/core/eggDvdFile.cpp"),
+            Object(NonMatching, "egg/core/eggDvdRipper.cpp"),
+            Object(NonMatching, "egg/core/eggStream.cpp"),
+            Object(NonMatching, "egg/core/eggAllocator.cpp"),
+            Object(NonMatching, "egg/core/eggHeap.cpp"),
+            Object(NonMatching, "egg/core/eggExpHeap.cpp"),
+            Object(NonMatching, "egg/core/eggFrmHeap.cpp"),
+            Object(NonMatching, "egg/core/eggAssertHeap.cpp"),
+            Object(NonMatching, "egg/core/eggDisposer.cpp"),
+            Object(NonMatching, "egg/core/eggThread.cpp"),
+            Object(NonMatching, "egg/core/eggUnk.cpp"),
+            Object(NonMatching, "egg/core/eggSystem.cpp"),
+            Object(   Matching, "egg/core/eggDisplay.cpp"),
+            Object(NonMatching, "egg/core/eggColorFader.cpp"),
+            Object(NonMatching, "egg/core/eggAsyncDisplay.cpp"), 
+            Object(NonMatching, "egg/core/eggVideo.cpp"),
+            Object(NonMatching, "egg/core/eggXfb.cpp"),
+            Object(NonMatching, "egg/core/eggXfbManager.cpp"),
+            Object(NonMatching, "egg/core/eggGraphicsFifo.cpp"), 
+            Object(NonMatching, "egg/core/eggController.cpp"),
         ]
     ),
     EGGLib(
         "math",
         [
-            Object(NonMatching, "lib/egg/math/eggMath.cpp"),
-            Object(NonMatching, "lib/egg/math/eggMatrix.cpp"),
-            Object(NonMatching, "lib/egg/math/eggQuat.cpp"),
-            Object(NonMatching, "lib/egg/math/eggVector.cpp"),
-            Object(NonMatching, "lib/egg/prim/eggAssert.cpp"),
+            Object(NonMatching, "egg/math/eggMath.cpp"),
+            Object(NonMatching, "egg/math/eggMatrix.cpp"),
+            Object(NonMatching, "egg/math/eggQuat.cpp"),
+            Object(NonMatching, "egg/math/eggVector.cpp"),
+            Object(NonMatching, "egg/prim/eggAssert.cpp"),
         ]
     ),
     EGGLib(
         "prim",
         [
-            Object(NonMatching, "lib/egg/prim/eggAssert.cpp"),
+            Object(NonMatching, "egg/prim/eggAssert.cpp"),
         ]
     ),
     # {

include/UnknownTypeBelongings.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 
 // MOST LIKELY mVEC

include/c/c_list.h

@@ -2,7 +2,7 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/cLib/c_list.hpp
 
-#include <types.h>
+#include "types.h"
 
 /// @brief A doubly-linked list node. See cListMg_c.
 /// @note Unofficial name.

include/c/c_owner_set.h

@@ -2,7 +2,7 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/cLib/c_owner_set.hpp
 
-#include <types.h>
+#include "types.h"
 /// @file
 
 /// @brief A set node with a pointer to the owning container. See cOwnerSetMg_c.

include/c/c_tree.h

@@ -2,7 +2,7 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/cLib/c_tree.hpp
 
-#include <types.h>
+#include "types.h"
 
 /// @brief A tree node. See cTreeMg_c.
 /// @details The tree is represented as a doubly-linked LCRS tree.

include/d/a/d_a_base.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <d/d_base.h>
-#include <d/d_heap.h>
-#include <m/m_allocator.h>
-#include <UnknownTypeBelongings.h>
-// #include <m/types_m.h>
-#include <m/m_angle.h>
-#include <m/m_vec.h>
-#include <toBeSorted/room_manager.h>
+#include "d/d_base.h"
+#include "d/d_heap.h"
+#include "m/m_allocator.h"
+#include "UnknownTypeBelongings.h"
+// #include "m/types_m.h"
+#include "m/m_angle.h"
+#include "m/m_vec.h"
+#include "toBeSorted/room_manager.h"
 
 
 class dAcBase_c;

include/d/a/en/d_a_en_base.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <d/a/obj/d_a_obj_base.h>
+#include "d/a/obj/d_a_obj_base.h"
 
 // Ghidra: ActorEnemyBase
 //   size: 

include/d/a/npc/d_a_npc.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <d/a/obj/d_a_obj_base.h>
+#include "d/a/obj/d_a_obj_base.h"
 
 // This is the NPC base. Most npcs actually use dAcOrdinaryNpc, but this just is a simpler one?
 

include/d/a/npc/d_a_npc_ordinary.h

@@ -1,7 +1,7 @@
 #pragma once
 
 
-#include <d/a/npc/d_a_npc.h>
+#include "d/a/npc/d_a_npc.h"
 
 // Ghidra: AcOrdinaryNpc
 //   size:

include/d/a/obj/d_a_obj_base.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <d/a/d_a_base.h>
-#include <m/types_m.h>
+#include "d/a/d_a_base.h"
+#include "m/types_m.h"
 
 // Ghidra: ActorObjectBase
 //   size: 0x330

include/d/a/obj/d_a_obj_item.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <d/a/obj/d_a_obj_base.h>
+#include "d/a/obj/d_a_obj_base.h"
 
 // Ghidra: AcItem
 //   Size: 0xd68

include/d/d_base.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <f/f_base.h>
-// #include <c/c_owner_set.h>
+#include "f/f_base.h"
+// #include "c/c_owner_set.h"
 
 // Ghidra: dBase_c
 //   size: 0x68

include/d/d_heap.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <egg/core/eggHeap.h>
+#include "egg/core/eggHeap.h"
 
 class dHeap {
     public:

include/egg/audio/eggAudioMgr.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <egg/egg_types.h>
-#include <egg/core/eggHeap.h>
+#include "egg/egg_types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG {
     class IAudioMgr {

include/egg/core/eggAllocator.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/MEM.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "rvl/MEM.h"
+#include "egg/core/eggHeap.h"
 
 // /* 80495310 */ MEMInitAllocatorFor_Heap(MEMAllocator* alloc, s32 align, void* heap);
 // /* 804952f0 */ MEM_AllocFor_Heap(MEMAllocator* alloc, void* block);

include/egg/core/eggArchive.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/ARC.h>
-#include <rvl/NAND.h>
-#include <egg/core/eggDisposer.h>
+#include "types.h"
+#include "rvl/ARC.h"
+#include "rvl/NAND.h"
+#include "egg/core/eggDisposer.h"
 
 typedef void (*FileCallbackFunc)(void*, void*, const ARCDirEntry*, const char*);
 

include/egg/core/eggAssertHeap.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG {
 

include/egg/core/eggAsyncDisplay.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggDisplay.h>
+#include "types.h"
+#include "egg/core/eggDisplay.h"
 
 namespace EGG
 {

include/egg/core/eggColorFader.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <types.h>
-#include <nw4r/ut/Color.h>
-#include <egg/core/eggFader.h>
-#include <egg/prim/eggBitFlag.h>
+#include "types.h"
+#include "nw4r/ut/Color.h"
+#include "egg/core/eggFader.h"
+#include "egg/prim/eggBitFlag.h"
 
 namespace EGG
 {

include/egg/core/eggController.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
-#include <egg/math/eggMatrix.h>
-#include <egg/math/eggVector.h>
-#include <egg/prim/eggBitFlag.h>
-#include <egg/prim/eggBuffer.h>
-#include <rvl/PAD.h>
+#include "egg/math/eggMatrix.h"
+#include "egg/math/eggVector.h"
+#include "egg/prim/eggBitFlag.h"
+#include "egg/prim/eggBuffer.h"
+#include "rvl/PAD.h"
 
 namespace EGG
 {

include/egg/core/eggDecomp.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/CX/cx.h>
+#include "types.h"
+#include "rvl/CX/cx.h"
 
 // NOTE: I put StreamDecomp stuff here. im unsure of the correct place
 

include/egg/core/eggDisplay.h

@@ -1,12 +1,12 @@
 #pragma once
 
 
-#include <types.h>
-#include <rvl/VI.h>
-#include <nw4r/ut/Color.h>
-#include <egg/prim/eggBitFlag.h>
-#include <egg/core/eggSystem.h> // for BaseSystem config
-#include <egg/core/eggVideo.h>
+#include "types.h"
+#include "rvl/VI.h"
+#include "nw4r/ut/Color.h"
+#include "egg/prim/eggBitFlag.h"
+#include "egg/core/eggSystem.h" // for BaseSystem config
+#include "egg/core/eggVideo.h"
 
 
 /* 80497530 */ // void PreRetraceCallback(void);

include/egg/core/eggDisposer.h

@@ -2,8 +2,8 @@
 
 // This file was adapted from https://github.com/riidefi/mkw/blob/master/source/egg/core/eggDisposer.hpp 
 
-#include <nw4r/ut/List.h>
-#include <types.h>
+#include "nw4r/ut/List.h"
+#include "types.h"
 
 namespace EGG {
 

include/egg/core/eggDvdFile.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/OS.h>
-#include <rvl/DVD.h>
-#include <nw4r/ut/List.h>
-#include <egg/core/eggFile.h>
+#include "types.h"
+#include "rvl/OS.h"
+#include "rvl/DVD.h"
+#include "nw4r/ut/List.h"
+#include "egg/core/eggFile.h"
 
 namespace EGG
 {

include/egg/core/eggDvdRipper.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
-#include <egg/core/eggDvdFile.h>
-#include <egg/core/eggDecomp.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
+#include "egg/core/eggDvdFile.h"
+#include "egg/core/eggDecomp.h"
 
 namespace EGG
 {

include/egg/core/eggExpHeap.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG
 {

include/egg/core/eggFader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace EGG
 {

include/egg/core/eggFile.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace EGG
 {

include/egg/core/eggFrmHeap.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG {
 

include/egg/core/eggGraphicsFifo.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG
 {

include/egg/core/eggHeap.h

@@ -2,14 +2,14 @@
 
 // This file is ported from https://github.com/riidefi/mkw/blob/master/source/egg/core/eggHeap.hpp
 
-#include <types.h>
-#include <rvl/MEM.h>
-#include <rvl/OS.h>
-#include <egg/core/eggAllocator.h>
-#include <egg/core/eggDisposer.h>
-#include <egg/core/eggThread.h>
-#include <nw4r/ut/List.h>
-#include <egg/prim/eggBitFlag.h>
+#include "types.h"
+#include "rvl/MEM.h"
+#include "rvl/OS.h"
+#include "egg/core/eggAllocator.h"
+#include "egg/core/eggDisposer.h"
+#include "egg/core/eggThread.h"
+#include "nw4r/ut/List.h"
+#include "egg/prim/eggBitFlag.h"
 
 namespace EGG {
 

include/egg/core/eggSystem.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG
 {

include/egg/core/eggThread.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/OS.h>
-#include <nw4r/ut/List.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "rvl/OS.h"
+#include "nw4r/ut/List.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG {
 

include/egg/core/eggUnk.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/OS.h>
+#include "types.h"
+#include "rvl/OS.h"
 
 // This is seen in Animal Crossing: City Folk also. Idk where it belongs
 

include/egg/core/eggVideo.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/GX.h>
-#include <rvl/VI.h>
-#include <egg/prim/eggBitFlag.h>
+#include "types.h"
+#include "rvl/GX.h"
+#include "rvl/VI.h"
+#include "egg/prim/eggBitFlag.h"
 
 namespace EGG
 {

include/egg/core/eggXfb.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG
 {

include/egg/core/eggXfbManager.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggXfb.h>
+#include "types.h"
+#include "egg/core/eggXfb.h"
 
 namespace EGG
 {

include/egg/egg_types.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 // Types pulled from ogws
 // May need to remove/add later

include/egg/math/eggMath.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace EGG
 {

include/egg/math/eggMatrix.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <types.h>
-#include <egg/math/eggVector.h>
-#include <egg/math/eggQuat.h>
+#include "types.h"
+#include "egg/math/eggVector.h"
+#include "egg/math/eggQuat.h"
 
 namespace EGG
 {

include/egg/math/eggQuat.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/math/eggVector.h>
+#include "types.h"
+#include "egg/math/eggVector.h"
 
 namespace EGG
 {

include/egg/math/eggVector.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/math/eggMath.h>
+#include "types.h"
+#include "egg/math/eggMath.h"
 namespace EGG
 {
 

include/egg/prim/eggAssert.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace EGG
 {

include/egg/prim/eggBitFlag.h

@@ -2,7 +2,7 @@
 
 // Pulled from ogws
 
-#include <types.h>
+#include "types.h"
 
 namespace EGG
 {

include/egg/prim/eggBuffer.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <egg/core/eggHeap.h>
+#include "types.h"
+#include "egg/core/eggHeap.h"
 
 namespace EGG
 {

include/f/f_base.h

@@ -3,13 +3,13 @@
 // This file is adapted from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_base.hpp 
 // and the Skyward Sword Ghidra database. Comments and docs can be seen above. stripped in this file for easier looking
 
-#include <types.h>
-#include <egg/core/eggFrmHeap.h>
-#include <f/f_profile.h>
-#include <f/f_base_id.h>
-#include <f/f_helper_unk.h>
-#include <f/f_manager.h>
-#include <f/f_list_mg.h>
+#include "types.h"
+#include "egg/core/eggFrmHeap.h"
+#include "f/f_profile.h"
+#include "f/f_base_id.h"
+#include "f/f_helper_unk.h"
+#include "f/f_manager.h"
+#include "f/f_list_mg.h"
 
 // Ghidra: fBase
 //   size: 0x64

include/f/f_helper_unk.h

@@ -2,7 +2,7 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_helper_unk.hpp
 
-#include <types.h>
+#include "types.h"
 
 /// @brief [A helper class for fBase_c with unknown purpose].
 /// @note Unofficial name.

include/f/f_list_mg.h

@@ -2,11 +2,11 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_mg.hpp 
 
-#include <types.h>
-#include <f/f_profile.h>
-#include <c/c_list.h>
-#include <f/f_base_id.h>
-#include <f/f_list_nd.h>
+#include "types.h"
+#include "f/f_profile.h"
+#include "c/c_list.h"
+#include "f/f_base_id.h"
+#include "f/f_list_nd.h"
 
 class fBase_c;
 

include/f/f_list_mg_ptmf.h

@@ -2,10 +2,10 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_mg_ptmf.hpp
 
-#include <types.h>
+#include "types.h"
 
-#include <f/f_list_mg.h>
-#include <f/f_list_nd_prio.h>
+#include "f/f_list_mg.h"
+#include "f/f_list_nd_prio.h"
 
 class fBase_c;
 

include/f/f_list_nd.h

@@ -2,8 +2,8 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_nd.hpp
 
-#include <types.h>
-#include <c/c_list.h>
+#include "types.h"
+#include "c/c_list.h"
 
 class fBase_c;
 

include/f/f_list_nd_prio.h

@@ -2,9 +2,9 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_nd_prio.hpp
 
-#include <types.h>
-#include <f/f_profile.h>
-#include <f/f_list_nd.h>
+#include "types.h"
+#include "f/f_profile.h"
+#include "f/f_list_nd.h"
 
 /// @brief A list node with priority fields for an order in a list.
 /// @note Unofficial name.

include/f/f_manager.h

@@ -2,14 +2,14 @@
 
 // this file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_manager.hpp
 
-#include <f/f_base_id.h>
-#include <f/f_list_mg_ptmf.h>
-#include <f/f_list_mg.h>
-#include <f/f_list_nd.h>
-#include <f/f_list_nd_prio.h>
-#include <f/f_tree_mg_ptmf.h>
-#include <f/f_tree_nd.h>
-#include <f/f_profile.h>
+#include "f/f_base_id.h"
+#include "f/f_list_mg_ptmf.h"
+#include "f/f_list_mg.h"
+#include "f/f_list_nd.h"
+#include "f/f_list_nd_prio.h"
+#include "f/f_tree_mg_ptmf.h"
+#include "f/f_tree_nd.h"
+#include "f/f_profile.h"
 
 #define GET_PROC_FLAG(proc) (1 << (proc - 1))
 

include/f/f_profile.h

@@ -2,7 +2,7 @@
 
 // Ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_profile.hpp
 
-#include <f/f_profile_name.h>
+#include "f/f_profile_name.h"
 
 
 /// @brief Creates a profile of a base with given values for execute and draw order.

include/f/f_profile_name.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace fProfile {
     

include/f/f_tree_mg.h

@@ -2,9 +2,9 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_tree_mg.hpp 
 
-#include <types.h>
-#include <c/c_tree.h>
-#include <f/f_profile.h>
+#include "types.h"
+#include "c/c_tree.h"
+#include "f/f_profile.h"
 
 class fTrNdBa_c;
 

include/f/f_tree_mg_ptmf.h

@@ -2,9 +2,9 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_tree_mg_ptmf.hpp
 
-#include <types.h>
-#include <c/c_tree.h>
-#include <f/f_tree_mg.h>
+#include "types.h"
+#include "c/c_tree.h"
+#include "f/f_tree_mg.h"
 
 class fBase_c;
 

include/f/f_tree_nd.h

@@ -2,9 +2,9 @@
 
 // This file was ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_tree_nd.hpp
 
-#include <types.h>
-#include <c/c_tree.h>
-#include <f/f_profile.h>
+#include "types.h"
+#include "c/c_tree.h"
+#include "f/f_profile.h"
 
 class fBase_c;
 

include/lib/rvl/DVD.h

@@ -1,16 +0,0 @@
-#ifndef RVL_SDK_PUBLIC_DVD_H
-#define RVL_SDK_PUBLIC_DVD_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rvl/DVD/dvd.h>
-#include <rvl/DVD/dvd_broadway.h>
-#include <rvl/DVD/dvdfatal.h>
-#include <rvl/DVD/dvdfs.h>
-#include <rvl/DVD/dvdidutils.h>
-
-#ifdef __cplusplus
-}
-#endif
-#endif

include/lib/rvl/GX.h

@@ -1,32 +0,0 @@
-#ifndef RVL_SDK_PUBLIC_GX_H
-#define RVL_SDK_PUBLIC_GX_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rvl/GX/GXAttr.h>
-#include <rvl/GX/GXBump.h>
-#include <rvl/GX/GXDisplayList.h>
-#include <rvl/GX/GXDraw.h>
-#include <rvl/GX/GXFifo.h>
-#include <rvl/GX/GXFrameBuf.h>
-#include <rvl/GX/GXGeometry.h>
-#include <rvl/GX/GXHardware.h>
-#include <rvl/GX/GXHardwareBP.h>
-#include <rvl/GX/GXHardwareCP.h>
-#include <rvl/GX/GXHardwareXF.h>
-#include <rvl/GX/GXInit.h>
-#include <rvl/GX/GXInternal.h>
-#include <rvl/GX/GXLight.h>
-#include <rvl/GX/GXMisc.h>
-#include <rvl/GX/GXPixel.h>
-#include <rvl/GX/GXTev.h>
-#include <rvl/GX/GXTexture.h>
-#include <rvl/GX/GXTransform.h>
-#include <rvl/GX/GXTypes.h>
-#include <rvl/GX/GXVert.h>
-
-#ifdef __cplusplus
-}
-#endif
-#endif

include/lib/rvl/MEM.h

@@ -1,16 +0,0 @@
-#ifndef RVL_SDK_PUBLIC_MEM_H
-#define RVL_SDK_PUBLIC_MEM_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rvl/MEM/mem_heapCommon.h>
-#include <rvl/MEM/mem_allocator.h>
-#include <rvl/MEM/mem_expHeap.h>
-#include <rvl/MEM/mem_frameHeap.h>
-#include <rvl/MEM/mem_list.h>
-
-#ifdef __cplusplus
-}
-#endif
-#endif

include/lib/rvl/OS.h

@@ -1,42 +0,0 @@
-#ifndef RVL_SDK_PUBLIC_OS_H
-#define RVL_SDK_PUBLIC_OS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rvl/OS/OS.h>
-#include <rvl/OS/OSAddress.h>
-#include <rvl/OS/OSAlarm.h>
-#include <rvl/OS/OSAlloc.h>
-#include <rvl/OS/OSArena.h>
-#include <rvl/OS/OSAudioSystem.h>
-#include <rvl/OS/OSCache.h>
-#include <rvl/OS/OSContext.h>
-#include <rvl/OS/OSError.h>
-#include <rvl/OS/OSExec.h>
-#include <rvl/OS/OSFastCast.h>
-#include <rvl/OS/OSFatal.h>
-#include <rvl/OS/OSFont.h>
-#include <rvl/OS/OSHardware.h>
-#include <rvl/OS/OSInterrupt.h>
-#include <rvl/OS/OSIpc.h>
-#include <rvl/OS/OSLink.h>
-#include <rvl/OS/OSMemory.h>
-#include <rvl/OS/OSMessage.h>
-#include <rvl/OS/OSMutex.h>
-#include <rvl/OS/OSNet.h>
-#include <rvl/OS/OSPlayRecord.h>
-#include <rvl/OS/OSReset.h>
-#include <rvl/OS/OSRtc.h>
-#include <rvl/OS/OSStateFlags.h>
-#include <rvl/OS/OSStateTM.h>
-#include <rvl/OS/OSSync.h>
-#include <rvl/OS/OSThread.h>
-#include <rvl/OS/OSTime.h>
-#include <rvl/OS/OSUtf.h>
-#include <rvl/OS/__ppc_eabi_init.h>
-
-#ifdef __cplusplus
-}
-#endif
-#endif

include/lib/rvl/VF.h

@@ -1,18 +0,0 @@
-#ifndef RVL_SDK_PUBLIC_VF_H
-#define RVL_SDK_PUBLIC_VF_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rvl/VF/pf.h>
-#include <rvl/VF/pf_clib.h>
-#include <rvl/VF/pf_code.h>
-#include <rvl/VF/pf_service.h>
-#include <rvl/VF/pf_str.h>
-#include <rvl/VF/pf_volume.h>
-#include <rvl/VF/pf_w_clib.h>
-
-#ifdef __cplusplus
-}
-#endif
-#endif

include/libc.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 extern "C" {
 

include/m/m_allocator.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <egg/core/eggAllocator.h>
+#include "egg/core/eggAllocator.h"
 
 class mAllocator_c : public EGG::Allocator {
 public:

include/m/m_angle.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 struct mAng {
     public:

include/m/m_frustum.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 class mFrustum_c {
 

include/m/m_heap.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <egg/core/eggHeap.h>
-#include <egg/core/eggFrmHeap.h>
-// #include <egg/core/eggExpHeap.h>
-// #include <egg/core/eggAssertHeap.h>
+#include "egg/core/eggHeap.h"
+#include "egg/core/eggFrmHeap.h"
+// #include "egg/core/eggExpHeap.h"
+// #include "egg/core/eggAssertHeap.h"
 
 namespace EGG {
     class ExpHeap;

include/m/m_mtx.h

@@ -2,9 +2,9 @@
 
 // NOTE:: Comments about functions pulled from NSMBW
 
-#include <types.h>
-#include <m/m_angle.h>
-#include <nw4r/nw4r_types.h>
+#include "types.h"
+#include "m/m_angle.h"
+#include "nw4r/nw4r_types.h"
 
 class mMtx_c
 {

include/m/m_vec.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/MTX.h>
-#include <nw4r/math/vec.h>
+#include "types.h"
+#include "rvl/MTX.h"
+#include "nw4r/math/vec.h"
 
 class mVec3_c {
     public:

include/m/types_m.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 
 class mFaderBase_c;

include/nw4r/db/db_directPrint.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace nw4r
 {

include/nw4r/g3d/g3d_resfile.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace nw4r {
     namespace g3d {

include/nw4r/math/vec.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nw4r/nw4r_types.h>
+#include "nw4r/nw4r_types.h"
 
 namespace nw4r
 {

include/nw4r/nw4r_types.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 namespace nw4r
 {

include/nw4r/snd/snd_SoundSystem.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nw4r/nw4r_types.h>
+#include "nw4r/nw4r_types.h"
 
 namespace nw4r
 {

include/nw4r/ut/Color.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <types.h>
-#include <rvl/GX.h>
+#include "types.h"
+#include "rvl/GX.h"
 
 namespace nw4r
 {

include/nw4r/ut/List.h

@@ -2,7 +2,7 @@
 
 // This file was ported from https://github.com/riidefi/mkw/blob/master/source/nw4r/ut/utList.hpp
 
-#include <types.h>
+#include "types.h"
 
 // TODO: Doc file boundaries
 

include/rvl/AI.h

@@ -4,8 +4,8 @@
 extern "C" {
 #endif
 
-#include <rvl/AI/ai.h>
-#include <rvl/AI/ai_hardware.h>
+#include "rvl/AI/ai.h"
+#include "rvl/AI/ai_hardware.h"
 
 #ifdef __cplusplus
 }

include/rvl/AI/ai.h

@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_AI_H
 #define RVL_SDK_AI_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/AI/ai_hardware.h

@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_AI_HARDWARE_H
 #define RVL_SDK_AI_HARDWARE_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/ARC.h

@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/ARC/arc.h>
+#include "rvl/ARC/arc.h"
 
 #ifdef __cplusplus
 }

include/rvl/ARC/arc.h

@@ -1,7 +1,7 @@
 #pragma once
 #ifndef RVL_SDK_ARC_H
 #define RVL_SDK_ARC_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/BASE.h

@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/BASE/PPCArch.h>
+#include "rvl/BASE/PPCArch.h"
 
 #ifdef __cplusplus
 }

include/rvl/BASE/PPCArch.h

@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_PPC_ARCH_H
 #define RVL_SDK_PPC_ARCH_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/CARD.h

@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/CARD/CARD.h>
+#include "rvl/CARD/CARD.h"
 
 #ifdef __cplusplus
 }

include/rvl/CARD/CARD.h

@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_CARD_H
 #define RVL_SDK_CARD_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/CNT.h

@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/CNT/cnt.h>
+#include "rvl/CNT/cnt.h"
 
 #ifdef __cplusplus
 }

include/rvl/CNT/cnt.h

@@ -1,7 +1,7 @@
 #ifndef RVL_SDK_CNT_H
 #define RVL_SDK_CNT_H
-#include <rvl/ARC.h>
-#include <rvl/types.h>
+#include "rvl/ARC.h"
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/CX/cx.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "types.h"
 
 // .text: [0x803cee90, 0x803d0b20]
 

include/rvl/DB.h

@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <rvl/DB/db.h>
+#include "rvl/DB/db.h"
 
 #ifdef __cplusplus
 }

include/rvl/DB/db.h

@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DB_H
 #define RVL_SDK_DB_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/DSP.h

@@ -4,10 +4,10 @@
 extern "C" {
 #endif
 
-#include <rvl/DSP/dsp.h>
-#include <rvl/DSP/dsp_debug.h>
-#include <rvl/DSP/dsp_hardware.h>
-#include <rvl/DSP/dsp_task.h>
+#include "rvl/DSP/dsp.h"
+#include "rvl/DSP/dsp_debug.h"
+#include "rvl/DSP/dsp_hardware.h"
+#include "rvl/DSP/dsp_task.h"
 
 #ifdef __cplusplus
 }

include/rvl/DSP/dsp.h

@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DSP_H
 #define RVL_SDK_DSP_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/DSP/dsp_debug.h

@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DSP_DEBUG_H
 #define RVL_SDK_DSP_DEBUG_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/DSP/dsp_hardware.h

@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DSP_HARDWARE_H
 #define RVL_SDK_DSP_HARDWARE_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/DSP/dsp_task.h

@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_DSP_TASK_H
 #define RVL_SDK_DSP_TASK_H
-#include <rvl/types.h>
+#include "rvl/types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/rvl/DVD.h

@@ -0,0 +1,16 @@
+#ifndef RVL_SDK_PUBLIC_DVD_H
+#define RVL_SDK_PUBLIC_DVD_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "rvl/DVD/dvd.h"
+#include "rvl/DVD/dvd_broadway.h"
+#include "rvl/DVD/dvdfatal.h"
+#include "rvl/DVD/dvdfs.h"
+#include "rvl/DVD/dvdidutils.h"
+
+#ifdef __cplusplus
+}
+#endif
+#endif