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/interaction.c
+5 -2
View File
@@ -52,8 +52,11 @@
#define INT_ATTACK_NOT_WEAK_FROM_ABOVE \
(INT_GROUND_POUND_OR_TWIRL | INT_PUNCH | INT_KICK | INT_TRIP | INT_HIT_FROM_BELOW)
u8 sDelayInvincTimer;
s16 sInvulnerable;
#define sDelayInvincTimer (g_state->msDelayInvincTimer)
#define sInvulnerable (g_state->msInvulnerable)
// u8 sDelayInvincTimer;
// s16 sInvulnerable;
struct InteractionHandler {
u32 interactType;
src/decomp/game/mario_actions_moving.c
+2 -4
View File
@@ -65,8 +65,6 @@ struct LandingAction sBackflipLandAction = {
4, 0, ACT_FREEFALL, ACT_BACKFLIP_LAND_STOP, ACT_BACKFLIP, ACT_FREEFALL, ACT_BEGIN_SLIDING,
};
Mat4 sFloorAlignMatrix[2];
s16 tilt_body_running(struct MarioState *m) {
s16 pitch = find_floor_slope(m, 0);
pitch = pitch * m->forwardVel / 40.0f;
@@ -93,8 +91,8 @@ void play_step_sound(struct MarioState *m, s16 frame1, s16 frame2) {
void align_with_floor(struct MarioState *m) {
m->pos[1] = m->floorHeight;
mtxf_align_terrain_triangle(sFloorAlignMatrix[m->unk00], m->pos, m->faceAngle[1], 40.0f);
m->marioObj->header.gfx.throwMatrix = &sFloorAlignMatrix[m->unk00];
mtxf_align_terrain_triangle(g_state->msFloorAlignMatrix, m->pos, m->faceAngle[1], 40.0f);
m->marioObj->header.gfx.throwMatrix = g_state->msFloorAlignMatrix;
}
s32 begin_walking_action(struct MarioState *m, f32 forwardVel, u32 action, u32 actionArg) {
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;