falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename weather files

This commit is contained in:
Ryan Dwyer 2021-01-02 12:00:34 +10:00
parent 37160d0cff
commit 69a3b2883c
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ld/gamefiles.inc
View File

@ -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); \

2
src/game/chr/chraicommands.c
View File

@ -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"

8
src/game/core.c
View File

@ -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) {

4
src/game/weatherallocate.c → src/game/weather/init.c
View File

@ -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;

2
src/game/weathertick.c → src/game/weather/tick.c
View File

@ -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"

2
src/game/weather.c → src/game/weather/weather.c
View File

@ -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"

8
src/include/game/weather/init.h Normal file
View File

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

4
src/include/game/weathertick.h → src/include/game/weather/tick.h
View File

@ -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 <ultra64.h>
#include "types.h"

4
src/include/game/weather.h → src/include/game/weather/weather.h
View File

@ -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 <ultra64.h>
#include "types.h"

8
src/include/game/weatherallocate.h
View File

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