From 69a3b2883c6c8ae201ec6c262f5fc532b831a54e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 2 Jan 2021 12:00:34 +1000 Subject: [PATCH] Rename weather files --- ld/gamefiles.inc | 6 +++--- src/game/chr/chraicommands.c | 2 +- src/game/core.c | 8 ++++---- src/game/{weatherallocate.c => weather/init.c} | 4 ++-- src/game/{weathertick.c => weather/tick.c} | 2 +- src/game/{ => weather}/weather.c | 2 +- src/include/game/weather/init.h | 8 ++++++++ src/include/game/{weathertick.h => weather/tick.h} | 4 ++-- src/include/game/{ => weather}/weather.h | 4 ++-- src/include/game/weatherallocate.h | 8 -------- 10 files changed, 24 insertions(+), 24 deletions(-) rename src/game/{weatherallocate.c => weather/init.c} (98%) rename src/game/{weathertick.c => weather/tick.c} (96%) rename src/game/{ => weather}/weather.c (99%) create mode 100644 src/include/game/weather/init.h rename src/include/game/{weathertick.h => weather/tick.h} (53%) rename src/include/game/{ => weather}/weather.h (90%) delete mode 100644 src/include/game/weatherallocate.h diff --git a/ld/gamefiles.inc b/ld/gamefiles.inc index 4dde27714..cee5304c3 100644 --- a/ld/gamefiles.inc +++ b/ld/gamefiles.inc @@ -32,7 +32,7 @@ build/ROMID/game/game_012d50.o (section); \ build/ROMID/game/game_013010.o (section); \ build/ROMID/game/sparks/init.o (section); \ - build/ROMID/game/weatherallocate.o (section); \ + build/ROMID/game/weather/init.o (section); \ build/ROMID/game/game_013540.o (section); \ build/ROMID/game/game_013550.o (section); \ build/ROMID/game/game_013cf0.o (section); \ @@ -57,7 +57,7 @@ build/ROMID/game/game_01b0a0.o (section); \ build/ROMID/game/activemenu/tick.o (section); \ build/ROMID/game/game_01bea0.o (section); \ - build/ROMID/game/weathertick.o (section); \ + build/ROMID/game/weather/tick.o (section); \ build/ROMID/game/game_01d860.o (section); \ build/ROMID/game/game_01d990.o (section); \ build/ROMID/game/game_01d9f0.o (section); \ @@ -134,7 +134,7 @@ build/ROMID/game/explosion.o (section); \ build/ROMID/game/smoke.o (section); \ build/ROMID/game/sparks/sparks.o (section); \ - build/ROMID/game/weather.o (section); \ + build/ROMID/game/weather/weather.o (section); \ build/ROMID/game/game_135c70.o (section); \ build/ROMID/game/game_1371b0.o (section); \ build/ROMID/game/game_13b670.o (section); \ diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 3a68e1272..a0a29dd38 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -33,7 +33,7 @@ #include "game/game_127910.h" #include "game/explosion.h" #include "game/smoke.h" -#include "game/weather.h" +#include "game/weather/weather.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 9ed785c23..f9ee12e33 100644 --- a/src/game/core.c +++ b/src/game/core.c @@ -30,7 +30,7 @@ #include "game/game_0125a0.h" #include "game/game_013010.h" #include "game/sparks/init.h" -#include "game/weatherallocate.h" +#include "game/weather/init.h" #include "game/game_013540.h" #include "game/game_013550.h" #include "game/game_013cf0.h" @@ -52,7 +52,7 @@ #include "game/title.h" #include "game/game_01b0a0.h" #include "game/game_01bea0.h" -#include "game/weathertick.h" +#include "game/weather/tick.h" #include "game/game_01d860.h" #include "game/game_01d990.h" #include "game/game_01d9f0.h" @@ -75,7 +75,7 @@ #include "game/game_129210.h" #include "game/explosion.h" #include "game/sparks/sparks.h" -#include "game/weather.h" +#include "game/weather/weather.h" #include "game/game_135c70.h" #include "game/game_1371b0.h" #include "game/game_13c510.h" @@ -369,7 +369,7 @@ void coreLoadStage(s32 stagenum) func0f013010(); func0f013130(); sparksInit(); - weatherAllocate(); + weatherInit(); coreStopAllMiscSfx(); switch (g_Vars.stagenum) { diff --git a/src/game/weatherallocate.c b/src/game/weather/init.c similarity index 98% rename from src/game/weatherallocate.c rename to src/game/weather/init.c index f1a8541e8..a90c01ad0 100644 --- a/src/game/weatherallocate.c +++ b/src/game/weather/init.c @@ -7,7 +7,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/data/data_02da90.h" -#include "game/weather.h" +#include "game/weather/weather.h" #include "gvars/gvars.h" #include "lib/lib_121e0.h" #include "types.h" @@ -73,7 +73,7 @@ u32 var80062494 = 0x00000001; u32 var80062498 = 0x00000000; u32 var8006249c = 0x00000000; -void weatherAllocate(void) +void weatherInit(void) { g_WeatherEnabled = false; g_WeatherData = NULL; diff --git a/src/game/weathertick.c b/src/game/weather/tick.c similarity index 96% rename from src/game/weathertick.c rename to src/game/weather/tick.c index 565fed02c..172f06474 100644 --- a/src/game/weathertick.c +++ b/src/game/weather/tick.c @@ -7,7 +7,7 @@ #include "game/data/data_01a3a0.h" #include "game/data/data_020df0.h" #include "game/data/data_02da90.h" -#include "game/weather.h" +#include "game/weather/weather.h" #include "gvars/gvars.h" #include "lib/main.h" #include "types.h" diff --git a/src/game/weather.c b/src/game/weather/weather.c similarity index 99% rename from src/game/weather.c rename to src/game/weather/weather.c index dbf3b3f21..1f5360317 100644 --- a/src/game/weather.c +++ b/src/game/weather/weather.c @@ -10,7 +10,7 @@ #include "game/dlights.h" #include "game/game_0b3350.h" #include "game/sparks/sparks.h" -#include "game/weather.h" +#include "game/weather/weather.h" #include "game/game_157db0.h" #include "game/game_166e40.h" #include "game/core.h" diff --git a/src/include/game/weather/init.h b/src/include/game/weather/init.h new file mode 100644 index 000000000..35860b573 --- /dev/null +++ b/src/include/game/weather/init.h @@ -0,0 +1,8 @@ +#ifndef _IN_GAME_WEATHER_INIT_H +#define _IN_GAME_WEATHER_INIT_H +#include +#include "types.h" + +void weatherInit(void); + +#endif diff --git a/src/include/game/weathertick.h b/src/include/game/weather/tick.h similarity index 53% rename from src/include/game/weathertick.h rename to src/include/game/weather/tick.h index ce2842c66..32f6e6f9c 100644 --- a/src/include/game/weathertick.h +++ b/src/include/game/weather/tick.h @@ -1,5 +1,5 @@ -#ifndef _IN_GAME_WEATHERTICK_H -#define _IN_GAME_WEATHERTICK_H +#ifndef _IN_GAME_WEATHER_TICK_H +#define _IN_GAME_WEATHER_TICK_H #include #include "types.h" diff --git a/src/include/game/weather.h b/src/include/game/weather/weather.h similarity index 90% rename from src/include/game/weather.h rename to src/include/game/weather/weather.h index 160f6cba7..697a264c8 100644 --- a/src/include/game/weather.h +++ b/src/include/game/weather/weather.h @@ -1,5 +1,5 @@ -#ifndef _IN_GAME_WEATHER_H -#define _IN_GAME_WEATHER_H +#ifndef _IN_GAME_WEATHER_WEATHER_H +#define _IN_GAME_WEATHER_WEATHER_H #include #include "types.h" diff --git a/src/include/game/weatherallocate.h b/src/include/game/weatherallocate.h deleted file mode 100644 index 811f51966..000000000 --- a/src/include/game/weatherallocate.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IN_GAME_WEATHERALLOCATE_H -#define _IN_GAME_WEATHERALLOCATE_H -#include -#include "types.h" - -void weatherAllocate(void); - -#endif