diff --git a/VERSION.txt b/VERSION.txt index d8ba80f9..923fd4d2 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -v2.0.7 +v2.0.8 diff --git a/src/boot/rnc1.s b/src/boot/rnc1.s index 0234a7e8..1101c1f7 100755 --- a/src/boot/rnc1.s +++ b/src/boot/rnc1.s @@ -412,4 +412,4 @@ make_huftable8: jr ra nop /*(Delay Slot) */ - .end +.end Propack_UnpackM1 diff --git a/src/boot/rnc2.s b/src/boot/rnc2.s index d3a2ca94..e3397e3c 100755 --- a/src/boot/rnc2.s +++ b/src/boot/rnc2.s @@ -663,11 +663,11 @@ unpack11: jr ra nop - .data +.end Propack_UnpackM2 + +.data .align 4 .word 0,0,0,0,0,0,0,0,0,0,0,0 mystack: .word 0 - - .end diff --git a/src/game/mario_step.c b/src/game/mario_step.c index eb9923fd..028d4962 100644 --- a/src/game/mario_step.c +++ b/src/game/mario_step.c @@ -541,7 +541,7 @@ s32 perform_air_quarter_step(struct MarioState *m, Vec3f intendedPos, u32 stepAr } } - if (stepResult == AIR_STEP_GRABBED_LEDGE && grabbedWall != NULL && ledgeFloor != NULL && ledgePos != NULL) { + if (stepResult == AIR_STEP_GRABBED_LEDGE && grabbedWall != NULL && ledgeFloor != NULL) { vec3f_copy(m->pos, ledgePos); set_mario_floor(m, floor, ledgePos[1]); m->faceAngle[0] = 0x0; diff --git a/src/goddard/dynlist_proc.c b/src/goddard/dynlist_proc.c index 82ddae28..12bd613f 100644 --- a/src/goddard/dynlist_proc.c +++ b/src/goddard/dynlist_proc.c @@ -1895,47 +1895,6 @@ void d_set_att_offset(const struct GdVec3f *off) { } } -/** - * An incorrectly-coded recursive function that was presumably supposed to - * set the offset of an attached object. Now, it will only call itself - * until it encounters a NULL pointer, which will trigger a `fatal_printf()` - * call. - * - * @note Not called - */ -void d_set_att_to_offset(UNUSED u32 a) { - struct GdObj *dynobj; // sp3c - UNUSED u8 filler[24]; - - if (sDynListCurObj == NULL) { - fatal_printf("proc_dynlist(): No current object"); - } - - dynobj = sDynListCurObj; - d_stash_dynobj(); - switch (sDynListCurObj->type) { - case OBJ_TYPE_JOINTS: - set_cur_dynobj(((struct ObjJoint *) dynobj)->attachedToObj); - break; - case OBJ_TYPE_NETS: - set_cur_dynobj(((struct ObjNet *) dynobj)->attachedToObj); - break; - case OBJ_TYPE_PARTICLES: - set_cur_dynobj(((struct ObjParticle *) dynobj)->attachedToObj); - break; - default: - fatal_printf("%s: Object '%s'(%x) does not support this function.", "dSetAttToOffset()", - sDynListCurInfo->name, sDynListCurObj->type); - } - - if (sDynListCurObj == NULL) { - fatal_printf("dSetAttOffset(): Object '%s' isnt attached to anything", - sStashedDynObjInfo->name); - } - d_set_att_to_offset(a); - d_unstash_dynobj(); -} - /** * Store the offset of the attached object into `dst`. *