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

Remove weather

This commit is contained in:
Ryan Dwyer 2022-11-04 22:28:13 +10:00
parent 19f71787fc
commit 65493b785f
6 changed files with 0 additions and 5278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ld/gamefiles.ntsc-final.inc
View File

@ -41,7 +41,6 @@
build/ROMID/game/explosionsreset.o (section); \
build/ROMID/game/smokereset.o (section); \
build/ROMID/game/sparksreset.o (section); \
build/ROMID/game/weatherreset.o (section); \
build/ROMID/game/stubs/game_013540.o (section); \
build/ROMID/game/wallhitreset.o (section); \
build/ROMID/game/shardsreset.o (section); \
@ -74,7 +73,6 @@
build/ROMID/game/activemenutick.o (section); \
build/ROMID/game/menustop.o (section); \
build/ROMID/game/menutick.o (section); \
build/ROMID/game/weathertick.o (section); \
build/ROMID/game/langtick.o (section); \
build/ROMID/game/roomtick.o (section); \
build/ROMID/game/skytick.o (section); \
@ -162,7 +160,6 @@
build/ROMID/game/explosions.o (section); \
build/ROMID/game/smoke.o (section); \
build/ROMID/game/sparks.o (section); \
build/ROMID/game/weather.o (section); \
build/ROMID/game/stars.o (section); \
build/ROMID/game/dyntex.o (section); \
build/ROMID/game/game_13c510.o (section); \

8
src/game/lv.c
View File

@ -74,7 +74,6 @@
#include "game/utils.h"
#include "game/vtxstore.h"
#include "game/wallhit.h"
#include "game/weather.h"
#include "lib/anim.h"
#include "lib/args.h"
#include "lib/collision.h"
@ -369,7 +368,6 @@ void lvReset(s32 stagenum)
explosionsReset();
smokeReset();
sparksReset();
weatherReset();
lvResetMiscSfx();
switch (g_Vars.stagenum) {
@ -1295,7 +1293,6 @@ Gfx *lvRender(Gfx *gdl)
gdl = propsRenderBeams(gdl);
gdl = shardsRender(gdl);
gdl = sparksRender(gdl);
gdl = weatherRender(gdl);
if (g_NbombsActive) {
gdl = nbombsRender(gdl);
@ -2110,10 +2107,6 @@ void lvTick(void)
wallhitsTick();
splatsTick();
if (g_WeatherActive) {
weatherTick();
}
if (g_NbombsActive) {
nbombsTick();
}
@ -2179,7 +2172,6 @@ void lvStop(void)
stub0f0153f0();
propsStop();
objsStop();
weatherStop();
stub0f015260();
bgunStop();
propsndStop();

5132
src/game/weather.c
View File

File diff suppressed because it is too large Load Diff

76
src/game/weatherreset.c
View File

@ -1,76 +0,0 @@
#include <ultra64.h>
#include "constants.h"
#include "game/weather.h"
#include "bss.h"
#include "lib/memp.h"
#include "data.h"
#include "types.h"
s32 g_WeatherActive = false;
u32 var800623f4 = 0x00000000;
u32 var800623f8 = 0x00000000;
u32 var800623fc = 0x00000000;
void weatherReset(void)
{
g_WeatherActive = false;
g_WeatherData = NULL;
if ((g_StageIndex == STAGEINDEX_CHICAGO
|| g_StageIndex == STAGEINDEX_AIRBASE
|| g_StageIndex == STAGEINDEX_G5BUILDING
|| g_StageIndex == STAGEINDEX_CRASHSITE)
&& PLAYERCOUNT() < 2) {
g_WeatherData = mempAlloc(sizeof(struct weatherdata), MEMPOOL_STAGE);
g_WeatherData->particledata[0] = weatherAllocateParticles();
g_WeatherData->type = -1;
g_WeatherData->windanglerad = 0;
g_WeatherData->unk0c = 0;
g_WeatherData->unk10 = 1;
if (g_StageIndex == STAGEINDEX_CHICAGO || g_StageIndex == STAGEINDEX_G5BUILDING) {
g_WeatherData->windspeed = 20;
} else if (g_StageIndex == STAGEINDEX_CRASHSITE) {
g_WeatherData->windspeed = 10;
} else {
g_WeatherData->windspeed = 5;
}
g_WeatherData->audiohandles[0] = 0;
g_WeatherData->audiohandles[1] = 0;
g_WeatherData->audiohandles[2] = 0;
g_WeatherData->audiohandles[3] = 0;
g_WeatherData->unk44 = 0;
g_WeatherData->unk94 = -1;
g_WeatherData->unk48 = 1;
g_WeatherData->unk4c = 0;
g_WeatherData->unk50 = 0;
g_WeatherData->unk54 = 0;
g_WeatherData->unk58[0].unk00 = 0;
g_WeatherData->unk58[1].unk00 = 0;
g_WeatherData->unk58[2].unk00 = 0;
g_WeatherData->unk58[3].unk00 = 1;
g_WeatherData->unk58[0].unk04 = 1;
g_WeatherData->unk58[0].unk08 = 10;
if (g_WeatherData->unk58[0].unk08 < 0) {
g_WeatherData->unk58[0].unk08 = -g_WeatherData->unk58[0].unk08;
}
g_WeatherData->unk58[0].unk08 = 0;
g_WeatherData->unk58[1].unk08 = 0;
g_WeatherData->unk58[2].unk08 = 0;
g_WeatherData->unk58[3].unk08 = 0;
g_WeatherData->unkb8 = 150;
g_WeatherData->unkc0 = 0;
g_WeatherData->unkc4 = 0;
g_WeatherData->unkc8 = 15;
g_WeatherData->unk88 = 1;
g_WeatherData->unk90 = 0;
g_WeatherData->intensity = 0;
g_WeatherData->unkd0 = 0;
g_WeatherData->unkd4 = 0;
g_WeatherActive = true;
}
}

33
src/game/weathertick.c
View File

@ -1,33 +0,0 @@
#include <ultra64.h>
#include "constants.h"
#include "game/weather.h"
#include "bss.h"
#include "lib/main.h"
#include "data.h"
#include "types.h"
u32 var80062950 = 100;
bool g_WeatherTickEnabled = true;
void weatherTick(void)
{
if (!g_WeatherData
|| (g_StageIndex == STAGEINDEX_AIRBASE && g_Vars.currentplayer->cam_pos.z < -2000.0f)
|| (g_StageIndex == STAGEINDEX_G5BUILDING && g_Vars.tickmode != TICKMODE_CUTSCENE)) {
return;
}
mainOverrideVariable("wettick", (u32 *)&g_WeatherTickEnabled);
mainOverrideVariable("windspeed", &var80062950);
if (g_WeatherTickEnabled) {
switch (g_WeatherData->type) {
case WEATHERTYPE_RAIN:
weatherTickRain(g_WeatherData);
break;
case WEATHERTYPE_SNOW:
weatherTickSnow(g_WeatherData);
break;
}
}
}

26
src/include/game/weather.h
View File

@ -1,26 +0,0 @@
#ifndef _IN_GAME_WEATHER_H
#define _IN_GAME_WEATHER_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
void weatherReset(void);
void weatherTick(void);
Gfx *weatherRender(Gfx *gdl);
void weatherSetBoundaries(struct weatherparticledata *data, s32 index, f32 min, f32 max);
struct weatherparticledata *weatherAllocateParticles(void);
void func0f131610(struct weatherdata *weather);
void func0f131678(s32 arg0);
void weatherSetIntensity(s32 intensity);
void weatherTickRain(struct weatherdata *weather);
void weatherTickSnow(struct weatherdata *weather);
void weatherConfigureRain(u32 intensity);
void weatherConfigureSnow(u32 intensity);
bool weatherIsRoomWeatherProof(s32 room);
Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2);
Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2);
void weatherStop(void);
#endif