From 37160d0cffd64e7406bc4a75819628480f14c0b3 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 2 Jan 2021 11:57:10 +1000 Subject: [PATCH] Rename sparks files --- ld/gamefiles.inc | 6 +++--- src/game/chr/chr.c | 2 +- src/game/chr/chraction.c | 2 +- src/game/core.c | 8 ++++---- src/game/dlights.c | 2 +- src/game/game_0601b0.c | 2 +- src/game/propobj.c | 2 +- src/game/{sparksreset.c => sparks/init.c} | 2 +- src/game/{game_12f6c0.c => sparks/sparks.c} | 2 +- src/game/{sparkstick.c => sparks/tick.c} | 0 src/game/weather.c | 2 +- src/include/game/sparks/init.h | 8 ++++++++ src/include/game/{game_12f6c0.h => sparks/sparks.h} | 4 ++-- src/include/game/{sparkstick.h => sparks/tick.h} | 4 ++-- src/include/game/sparksreset.h | 8 -------- 15 files changed, 27 insertions(+), 27 deletions(-) rename src/game/{sparksreset.c => sparks/init.c} (95%) rename src/game/{game_12f6c0.c => sparks/sparks.c} (99%) rename src/game/{sparkstick.c => sparks/tick.c} (100%) create mode 100644 src/include/game/sparks/init.h rename src/include/game/{game_12f6c0.h => sparks/sparks.h} (80%) rename src/include/game/{sparkstick.h => sparks/tick.h} (54%) delete mode 100644 src/include/game/sparksreset.h diff --git a/ld/gamefiles.inc b/ld/gamefiles.inc index 3c6fdf25d..4dde27714 100644 --- a/ld/gamefiles.inc +++ b/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); \ diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index b648d5618..68a64637a 100644 --- a/src/game/chr/chr.c +++ b/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" diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 7ea215990..3cb1ea68d 100644 --- a/src/game/chr/chraction.c +++ b/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" diff --git a/src/game/core.c b/src/game/core.c index e1d3be3a1..9ed785c23 100644 --- a/src/game/core.c +++ b/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(); diff --git a/src/game/dlights.c b/src/game/dlights.c index dcade22a6..1276545eb 100644 --- a/src/game/dlights.c +++ b/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" diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 959698bdc..d9f9638a1 100644 --- a/src/game/game_0601b0.c +++ b/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" diff --git a/src/game/propobj.c b/src/game/propobj.c index 98a528007..ea4f9fe12 100644 --- a/src/game/propobj.c +++ b/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" diff --git a/src/game/sparksreset.c b/src/game/sparks/init.c similarity index 95% rename from src/game/sparksreset.c rename to src/game/sparks/init.c index 3b2fff477..1c510e978 100644 --- a/src/game/sparksreset.c +++ b/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; diff --git a/src/game/game_12f6c0.c b/src/game/sparks/sparks.c similarity index 99% rename from src/game/game_12f6c0.c rename to src/game/sparks/sparks.c index 8b4bdfb39..fc8a0acd8 100644 --- a/src/game/game_12f6c0.c +++ b/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" diff --git a/src/game/sparkstick.c b/src/game/sparks/tick.c similarity index 100% rename from src/game/sparkstick.c rename to src/game/sparks/tick.c diff --git a/src/game/weather.c b/src/game/weather.c index 6b4f542f5..dbf3b3f21 100644 --- a/src/game/weather.c +++ b/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" diff --git a/src/include/game/sparks/init.h b/src/include/game/sparks/init.h new file mode 100644 index 000000000..724d91b5d --- /dev/null +++ b/src/include/game/sparks/init.h @@ -0,0 +1,8 @@ +#ifndef IN_GAME_SPARKS_INIT_H +#define IN_GAME_SPARKS_INIT_H +#include +#include "types.h" + +void sparksInit(void); + +#endif diff --git a/src/include/game/game_12f6c0.h b/src/include/game/sparks/sparks.h similarity index 80% rename from src/include/game/game_12f6c0.h rename to src/include/game/sparks/sparks.h index 8cbbfc997..d4558a5d5 100644 --- a/src/include/game/game_12f6c0.h +++ b/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 #include "types.h" diff --git a/src/include/game/sparkstick.h b/src/include/game/sparks/tick.h similarity index 54% rename from src/include/game/sparkstick.h rename to src/include/game/sparks/tick.h index 201ce8a77..e425f73a1 100644 --- a/src/include/game/sparkstick.h +++ b/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 #include "types.h" diff --git a/src/include/game/sparksreset.h b/src/include/game/sparksreset.h deleted file mode 100644 index 6cc169342..000000000 --- a/src/include/game/sparksreset.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef IN_GAME_SPARKSRESET_H -#define IN_GAME_SPARKSRESET_H -#include -#include "types.h" - -void sparksReset(void); - -#endif