Various cleaning

projectPiki · Dec 27, 2024 · 30de477 · 30de477
1 parent a403b4e
commit 30de477
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 36 deletions.
diff --git a/src/plugPikiNishimura/BossCnd.cpp b/src/plugPikiNishimura/BossCnd.cpp
@@ -3,27 +3,21 @@
 #include "Collision.h"
 #include "Dolphin/os.h"
 #include "sysNew.h"
+#include "DebugLog.h"
 
 /*
  * --INFO--
  * Address:	........
  * Size:	00009C
  */
-static void _Error(char* fmt, ...)
-{
-	OSPanic(__FILE__, __LINE__, fmt);
-	// UNUSED FUNCTION
-}
+DEFINE_ERROR();
 
 /*
  * --INFO--
  * Address:	........
  * Size:	0000F0
  */
-static void _Print(char*, ...)
-{
-	// UNUSED FUNCTION
-}
+DEFINE_PRINT("");
 
 /*
  * --INFO--

diff --git a/src/plugPikiNishimura/KingBack.cpp b/src/plugPikiNishimura/KingBack.cpp
@@ -3,27 +3,21 @@
 #include "MapMgr.h"
 #include "Graphics.h"
 #include "Dolphin/os.h"
+#include "DebugLog.h"
 
 /*
  * --INFO--
  * Address:	........
  * Size:	00009C
  */
-static void _Error(char* fmt, ...)
-{
-	OSPanic(__FILE__, __LINE__, "KingBack", fmt);
-	// UNUSED FUNCTION
-}
+DEFINE_ERROR();
 
 /*
  * --INFO--
  * Address:	........
  * Size:	0000F4
  */
-static void _Print(char*, ...)
-{
-	// UNUSED FUNCTION
-}
+DEFINE_PRINT("KingBack");
 
 /*
  * --INFO--

diff --git a/src/plugPikiNishimura/Pom.cpp b/src/plugPikiNishimura/Pom.cpp
@@ -11,10 +11,7 @@
  * Address:	........
  * Size:	000098
  */
-static void _Error(char*, ...)
-{
-	// UNUSED FUNCTION
-}
+DEFINE_ERROR();
 
 /*
  * --INFO--

diff --git a/src/plugPikiNishimura/SlimeCreature.cpp b/src/plugPikiNishimura/SlimeCreature.cpp
@@ -1,27 +1,21 @@
 #include "Slime.h"
 #include "Dolphin/os.h"
 #include "system.h"
+#include "DebugLog.h"
 
 /*
  * --INFO--
  * Address:	........
  * Size:	00009C
  */
-static void _Error(char* fmt, ...)
-{
-	OSPanic(__FILE__, __LINE__, "SlimeCreature", fmt);
-	// UNUSED FUNCTION
-}
+DEFINE_ERROR();
 
 /*
  * --INFO--
  * Address:	........
  * Size:	0000F4
  */
-static void _Print(char*, ...)
-{
-	// UNUSED FUNCTION
-}
+DEFINE_PRINT("SlimeCreature");
 
 /*
  * --INFO--

diff --git a/src/plugPikiNishimura/genBoss.cpp b/src/plugPikiNishimura/genBoss.cpp
@@ -15,10 +15,7 @@ DEFINE_ERROR();
  * Address:	........
  * Size:	0000F0
  */
-static void _Print(char*, ...)
-{
-	// UNUSED FUNCTION
-}
+DEFINE_PRINT("");
 
 /*
  * --INFO--
@@ -122,7 +119,7 @@ void GenObjectBoss::readParameters(RandomAccessStream& input)
 void GenObjectBoss::writeParameters(RandomAccessStream& output)
 {
 	// this is too much compression, just write them as words goddamn it!
-	volatile union GenFlags {
+	union GenFlags {
 		u32 w;
 		u8 b[4];
 	} flags;