Unlink vsGameSection.cpp

projectPiki · Sep 20, 2023 · a827cbb · a827cbb
1 parent fb539fc
commit a827cbb
Show file tree

Hide file tree

Showing 9 changed files with 8,754 additions and 8 deletions.
diff --git a/asm/plugProjectKandoU/vsGameSection.s b/asm/plugProjectKandoU/vsGameSection.s
diff --git a/configure.py b/configure.py
@@ -933,7 +933,7 @@
             "plugProjectKandoU/gameSystem",
             ["plugProjectKandoU/aiConstants", True],
             "plugProjectKandoU/gameMapParts",
-            ["plugProjectKandoU/vsGameSection", True],
+            "plugProjectKandoU/vsGameSection",
             "plugProjectKandoU/gamePlatMgr",
             "plugProjectKandoU/itemGate",
             "plugProjectKandoU/itemMgr",

diff --git a/include/Game/BaseItem.h b/include/Game/BaseItem.h
@@ -150,7 +150,8 @@ struct CItemFSM : public StateMachine<CFSMItem> {
 };
 
 template <typename T>
-struct ItemFSM : public StateMachine<T> { };
+struct ItemFSM : public StateMachine<T> {
+};
 
 struct CItemState : public FSMState<CFSMItem> {
 	inline CItemState(int id)

diff --git a/include/Game/StateMachine.h b/include/Game/StateMachine.h
@@ -8,7 +8,8 @@ template <typename T>
 struct StateMachine;
 
 // if it gets used, it's a derived struct.
-struct StateArg { };
+struct StateArg {
+};
 
 template <typename T>
 struct FSMState {

diff --git a/include/Game/itemMgr.h b/include/Game/itemMgr.h
@@ -26,7 +26,8 @@ namespace Game {
 struct BaseItem;
 struct WayPoint;
 
-struct _BaseItemMgrParent2 { };
+struct _BaseItemMgrParent2 {
+};
 
 struct BaseItemMgr : public GenericObjectMgr, virtual public _BaseItemMgrParent2 {
 	BaseItemMgr(int);

diff --git a/include/efx/TPk.h b/include/efx/TPk.h
@@ -147,7 +147,8 @@ struct TPkNageBlur : public TChaseMtx {
 };
 
 // Needed for dtor
-struct PtrlistContext : public JSUPtrList { };
+struct PtrlistContext : public JSUPtrList {
+};
 
 struct TPkOneEmitterSimple : public TBase, public JPAEmitterCallBack {
 	// vtable 1 (TBase)

diff --git a/src/plugProjectKandoU/Makefile b/src/plugProjectKandoU/Makefile
@@ -47,7 +47,7 @@ KANDO_FILES:=\
 	$(BUILD_DIR)/asm/plugProjectKandoU/gameSystem.o\
 	$(BUILD_DIR)/src/plugProjectKandoU/aiConstants.o\
 	$(BUILD_DIR)/asm/plugProjectKandoU/gameMapParts.o\
-	$(BUILD_DIR)/src/plugProjectKandoU/vsGameSection.o\
+	$(BUILD_DIR)/asm/plugProjectKandoU/vsGameSection.o\
 	$(BUILD_DIR)/asm/plugProjectKandoU/gamePlatMgr.o\
 	$(BUILD_DIR)/asm/plugProjectKandoU/itemGate.o\
 	$(BUILD_DIR)/asm/plugProjectKandoU/itemMgr.o\

diff --git a/src/plugProjectKandoU/itemBarrel.cpp b/src/plugProjectKandoU/itemBarrel.cpp
@@ -400,7 +400,7 @@ Mgr::Mgr()
 	mObjectPathComponent = "user/Kando/objects/barrel";
 	mParms               = new BarrelParms();
 	void* resource       = JKRDvdRipper::loadToMainRAM("user/Abe/item/barrelParms.txt", nullptr, Switch_0, 0, nullptr,
-	                                                   JKRDvdRipper::ALLOC_DIR_BOTTOM, 0, nullptr, nullptr);
+                                                 JKRDvdRipper::ALLOC_DIR_BOTTOM, 0, nullptr, nullptr);
 	if (resource) {
 		RamStream stream(resource, -1);
 		stream.resetPosition(true, true);

diff --git a/src/plugProjectKandoU/itemBigFountain.cpp b/src/plugProjectKandoU/itemBigFountain.cpp
@@ -2580,7 +2580,7 @@ ItemBigFountain::Mgr::Mgr()
 	mName                = "AÒÔò";
 	mParms               = new FountainParms();
 	void* data           = JKRDvdRipper::loadToMainRAM("user/Abe/item/fountainParms.txt", nullptr, Switch_0, 0, nullptr,
-	                                                   JKRDvdRipper::ALLOC_DIR_BOTTOM, 0, nullptr, nullptr);
+                                             JKRDvdRipper::ALLOC_DIR_BOTTOM, 0, nullptr, nullptr);
 	if (data != nullptr) {
 		RamStream input(data, -1);
 		input.resetPosition(true, 1);