vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

few minor fixes/tweaks

This commit is contained in:
Colton Rushton 2021-02-23 08:25:32 -04:00
parent 1fc7f7f7f4
commit 2c57011219
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/types.h
View File

@ -291,7 +291,7 @@ struct MarioState
/*0x0C*/ u32 action;
/*0x10*/ u32 prevAction;
/*0x14*/ u32 terrainSoundAddend;
#ifdef QOL_FIXES
#ifndef QOL_FIXES
/*0x18*/ u16 actionState;
#else
/*0x18*/ u32 actionState;

1
src/game/mario_actions_moving.c
View File

@ -814,6 +814,7 @@ void tilt_body_walking(struct MarioState *m, s16 startYaw) {
if (val00 < 0) {
val00 = 0;
}
val0C->torsoAngle[2] = approach_s32(val0C->torsoAngle[2], val02, 0x400, 0x400);
val0C->torsoAngle[0] = approach_s32(val0C->torsoAngle[0], val00, 0x400, 0x400);
#ifndef QOL_FIXES

2
src/game/obj_behaviors.c
View File

@ -288,7 +288,7 @@ void calc_new_obj_vel_and_pos_y(struct Surface *objFloor, f32 objFloorY, f32 obj
#ifndef QOL_FIXES
if ((s32) o->oPosY >= (s32) objFloorY && (s32) o->oPosY < (s32) objFloorY + 37) {
#else
if ((u64) o->oPosY >= (u64) objFloorY && (u64) o->oPosY < (u64) objFloorY + 37) {
if ((s64) o->oPosY >= (s64) objFloorY && (s64) o->oPosY < (s64) objFloorY + 37) {
#endif
obj_orient_graph(o, floor_nX, floor_nY, floor_nZ);

1
src/game/object_helpers.c
View File

@ -1764,6 +1764,7 @@ static void cur_obj_update_floor(void) {
o->oMoveFlags |= OBJ_MOVE_ABOVE_DEATH_BARRIER;
}
#endif
o->oFloorType = floor->type;
o->oFloorRoom = floor->room;
} else {