NepuShiro/libsm64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

All global state coming from g_state now

Browse Source
This commit is contained in:
jaburns
2020-10-27 21:35:18 -06:00
parent d12a3e2568
commit c3c004ce94
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/decomp/game/mario_actions_submerged.c
+13 -7
View File
@@ -23,17 +23,23 @@
#include "../include/object_fields.h"
#include "../include/mario_geo_switch_case_ids.h"
#define MIN_SWIM_STRENGTH 160
#define MIN_SWIM_SPEED 16.0f
static s16 sWasAtSurface = FALSE;
static s16 sSwimStrength = MIN_SWIM_STRENGTH;
#define sWasAtSurface (g_state->msWasAtSurface)
#define sSwimStrength (g_state->msSwimStrength)
#define D_80339FD0 (g_state->mD_80339FD0)
#define D_80339FD2 (g_state->mD_80339FD2)
#define D_80339FD4 (g_state->mD_80339FD4)
//static s16 sWasAtSurface = FALSE;
//static s16 sSwimStrength = MIN_SWIM_STRENGTH;
static s16 sWaterCurrentSpeeds[] = { 28, 12, 8, 4 };
//static s16 D_80339FD0;
//static s16 D_80339FD2;
//static f32 D_80339FD4;
static s16 D_80339FD0;
static s16 D_80339FD2;
static f32 D_80339FD4;
static void set_swimming_at_surface_particles(struct MarioState *m, u32 particleFlag) {
s16 atSurface = m->pos[1] >= m->waterLevel - 130;