Rename sparks files

ld/gamefiles.inc

@@ -31,7 +31,7 @@
 	build/ROMID/game/game_0125a0.o (section); \
 	build/ROMID/game/game_012d50.o (section); \
 	build/ROMID/game/game_013010.o (section); \
-	build/ROMID/game/sparksreset.o (section); \
+	build/ROMID/game/sparks/init.o (section); \
 	build/ROMID/game/weatherallocate.o (section); \
 	build/ROMID/game/game_013540.o (section); \
 	build/ROMID/game/game_013550.o (section); \
@@ -62,7 +62,7 @@
 	build/ROMID/game/game_01d990.o (section); \
 	build/ROMID/game/game_01d9f0.o (section); \
 	build/ROMID/game/game_01de30.o (section); \
-	build/ROMID/game/sparkstick.o (section); \
+	build/ROMID/game/sparks/tick.o (section); \
 	build/ROMID/game/chr/chr.o (section); \
 	build/ROMID/game/game_02cde0.o (section); \
 	build/ROMID/game/data/data_0083d0.o (section); \
@@ -133,7 +133,7 @@
 	build/ROMID/game/game_129210.o (section); \
 	build/ROMID/game/explosion.o (section); \
 	build/ROMID/game/smoke.o (section); \
-	build/ROMID/game/game_12f6c0.o (section); \
+	build/ROMID/game/sparks/sparks.o (section); \
 	build/ROMID/game/weather.o (section); \
 	build/ROMID/game/game_135c70.o (section); \
 	build/ROMID/game/game_1371b0.o (section); \

src/game/chr/chr.c

@@ -29,7 +29,7 @@
 #include "game/game_129210.h"
 #include "game/explosion.h"
 #include "game/smoke.h"
-#include "game/game_12f6c0.h"
+#include "game/sparks/sparks.h"
 #include "game/game_157db0.h"
 #include "game/game_165670.h"
 #include "game/game_166e40.h"

src/game/chr/chraction.c

@@ -29,7 +29,7 @@
 #include "game/game_111600.h"
 #include "game/game_127910.h"
 #include "game/explosion.h"
-#include "game/game_12f6c0.h"
+#include "game/sparks/sparks.h"
 #include "game/game_157db0.h"
 #include "game/game_1655c0.h"
 #include "game/game_165670.h"

src/game/core.c

@@ -29,7 +29,7 @@
 #include "game/game_012450.h"
 #include "game/game_0125a0.h"
 #include "game/game_013010.h"
-#include "game/sparksreset.h"
+#include "game/sparks/init.h"
 #include "game/weatherallocate.h"
 #include "game/game_013540.h"
 #include "game/game_013550.h"
@@ -74,7 +74,7 @@
 #include "game/game_127910.h"
 #include "game/game_129210.h"
 #include "game/explosion.h"
-#include "game/game_12f6c0.h"
+#include "game/sparks/sparks.h"
 #include "game/weather.h"
 #include "game/game_135c70.h"
 #include "game/game_1371b0.h"
@@ -96,7 +96,7 @@
 #include "game/mplayer.h"
 #include "game/pak/pak.h"
 #include "game/propobj.h"
-#include "game/sparkstick.h"
+#include "game/sparks/tick.h"
 #include "game/splat.h"
 #include "game/utils.h"
 #include "game/wallhit.h"
@@ -368,7 +368,7 @@ void coreLoadStage(s32 stagenum)
 	tagsAllocatePtrs();
 	func0f013010();
 	func0f013130();
-	sparksReset();
+	sparksInit();
 	weatherAllocate();
 	coreStopAllMiscSfx();
 

src/game/dlights.c

@@ -13,7 +13,7 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/smoke.h"
-#include "game/game_12f6c0.h"
+#include "game/sparks/sparks.h"
 #include "game/game_157db0.h"
 #include "game/game_166e40.h"
 #include "game/core.h"

src/game/game_0601b0.c

@@ -24,7 +24,7 @@
 #include "game/game_127910.h"
 #include "game/explosion.h"
 #include "game/smoke.h"
-#include "game/game_12f6c0.h"
+#include "game/sparks/sparks.h"
 #include "game/game_157db0.h"
 #include "game/game_190260.h"
 #include "game/training.h"

src/game/propobj.c

@@ -44,7 +44,7 @@
 #include "game/game_129210.h"
 #include "game/explosion.h"
 #include "game/smoke.h"
-#include "game/game_12f6c0.h"
+#include "game/sparks/sparks.h"
 #include "game/game_150820.h"
 #include "game/game_1531a0.h"
 #include "game/game_157db0.h"

src/game/sparks/init.c

@@ -10,7 +10,7 @@
 #include "gvars/gvars.h"
 #include "types.h"
 
-void sparksReset(void)
+void sparksInit(void)
 {
 	s32 i;
 	g_NextSparkIndex = 0;

src/game/sparks/sparks.c

@@ -10,7 +10,7 @@
 #include "game/dlights.h"
 #include "game/chr/chr.h"
 #include "game/game_0b3350.h"
-#include "game/game_12f6c0.h"
+#include "game/sparks/sparks.h"
 #include "game/game_166e40.h"
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"

src/game/weather.c

@@ -9,7 +9,7 @@
 #include "game/data/data_02da90.h"
 #include "game/dlights.h"
 #include "game/game_0b3350.h"
-#include "game/game_12f6c0.h"
+#include "game/sparks/sparks.h"
 #include "game/weather.h"
 #include "game/game_157db0.h"
 #include "game/game_166e40.h"

src/include/game/sparks/init.h

@@ -0,0 +1,8 @@
+#ifndef IN_GAME_SPARKS_INIT_H
+#define IN_GAME_SPARKS_INIT_H
+#include <ultra64.h>
+#include "types.h"
+
+void sparksInit(void);
+
+#endif

src/include/game/sparks/sparks.h

@@ -1,5 +1,5 @@
-#ifndef _IN_GAME_GAME_12F6C0_H
-#define _IN_GAME_GAME_12F6C0_H
+#ifndef _IN_GAME_SPARKS_SPARKS_H
+#define _IN_GAME_SPARKS_SPARKS_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/sparks/tick.h

@@ -1,5 +1,5 @@
-#ifndef IN_GAME_SPARKSTICK_H
-#define IN_GAME_SPARKSTICK_H
+#ifndef IN_GAME_SPARKS_TICK_H
+#define IN_GAME_SPARKS_TICK_H
 #include <ultra64.h>
 #include "types.h"
 

src/include/game/sparksreset.h

@@ -1,8 +0,0 @@
-#ifndef IN_GAME_SPARKSRESET_H
-#define IN_GAME_SPARKSRESET_H
-#include <ultra64.h>
-#include "types.h"
-
-void sparksReset(void);
-
-#endif