From 423e42d6971e614d5616ae079fee671fb248aefb Mon Sep 17 00:00:00 2001 From: Arceveti <73617174+Arceveti@users.noreply.github.com> Date: Mon, 13 Sep 2021 19:57:26 -0700 Subject: [PATCH] Name a bunch of stuff --- data/behavior_data.c | 4 +- include/behavior_data.h | 2 +- src/engine/geo_layout.c | 6 +- src/game/area.c | 20 +- src/game/behavior_actions.c | 46 ++-- src/game/behavior_actions.h | 4 +- .../behaviors/animated_floor_switch.inc.c | 12 +- src/game/behaviors/bobomb.inc.c | 19 +- src/game/behaviors/boo.inc.c | 30 +-- src/game/behaviors/boulder.inc.c | 10 +- src/game/behaviors/bouncing_fireball.inc.c | 14 +- src/game/behaviors/bowling_ball.inc.c | 14 +- src/game/behaviors/bowser_key_cutscene.inc.c | 8 +- src/game/behaviors/bowser_puzzle_piece.inc.c | 12 +- src/game/behaviors/breakable_box_small.inc.c | 6 +- src/game/behaviors/bubba.inc.c | 22 +- src/game/behaviors/bullet_bill.inc.c | 4 +- src/game/behaviors/bully.inc.c | 15 +- src/game/behaviors/butterfly.inc.c | 2 - src/game/behaviors/capswitch.inc.c | 6 +- src/game/behaviors/castle_floor_trap.inc.c | 8 +- .../behaviors/checkerboard_platform.inc.c | 46 ++-- src/game/behaviors/chuckya.inc.c | 32 ++- src/game/behaviors/clam.inc.c | 13 +- src/game/behaviors/coin.inc.c | 84 ++++---- src/game/behaviors/collide_particles.inc.c | 20 +- .../behaviors/controllable_platform.inc.c | 122 ++++++----- src/game/behaviors/door.inc.c | 51 +++-- src/game/behaviors/elevator.inc.c | 4 +- src/game/behaviors/end_birds_1.inc.c | 7 +- src/game/behaviors/end_birds_2.inc.c | 18 +- src/game/behaviors/exclamation_box.inc.c | 24 +-- src/game/behaviors/eyerok.inc.c | 21 +- src/game/behaviors/flamethrower.inc.c | 18 +- src/game/behaviors/floating_platform.inc.c | 28 ++- .../behaviors/flying_bookend_switch.inc.c | 52 ++--- src/game/behaviors/grand_star.inc.c | 6 +- src/game/behaviors/haunted_chair.inc.c | 32 +-- src/game/behaviors/heave_ho.inc.c | 14 +- src/game/behaviors/hidden_star.inc.c | 15 +- src/game/behaviors/hoot.inc.c | 55 ++--- src/game/behaviors/intro_lakitu.inc.c | 26 +-- src/game/behaviors/intro_scene.inc.c | 28 +-- src/game/behaviors/jrb_ship.inc.c | 71 +++---- src/game/behaviors/kickable_board.inc.c | 10 +- src/game/behaviors/king_bobomb.inc.c | 19 +- src/game/behaviors/koopa_shell.inc.c | 10 +- .../behaviors/lll_floating_wood_piece.inc.c | 7 +- src/game/behaviors/lll_hexagonal_ring.inc.c | 14 +- .../behaviors/lll_rotating_hex_flame.inc.c | 36 ++-- .../behaviors/lll_sinking_rectangle.inc.c | 12 +- src/game/behaviors/metal_box.inc.c | 17 +- src/game/behaviors/moneybag.inc.c | 10 +- src/game/behaviors/moving_coin.inc.c | 2 - src/game/behaviors/mr_i.inc.c | 81 ++++--- src/game/behaviors/mushroom_1up.inc.c | 34 ++- src/game/behaviors/orange_number.inc.c | 6 +- src/game/behaviors/rolling_log.inc.c | 8 +- src/game/behaviors/rotating_platform.inc.c | 4 +- src/game/behaviors/scuttlebug.inc.c | 8 +- src/game/behaviors/skeeter.inc.c | 16 +- src/game/behaviors/snow_mound.inc.c | 10 +- src/game/behaviors/snowman.inc.c | 35 ++-- src/game/behaviors/sound_spawner.inc.c | 3 +- src/game/behaviors/sparkle_spawn_star.inc.c | 26 +-- src/game/behaviors/spawn_star.inc.c | 65 +++--- src/game/behaviors/spindel.inc.c | 50 ++--- src/game/behaviors/star_door.inc.c | 6 +- src/game/behaviors/sushi.inc.c | 8 +- src/game/behaviors/tower_door.inc.c | 2 +- src/game/behaviors/tower_platform.inc.c | 6 +- src/game/behaviors/treasure_chest.inc.c | 10 +- src/game/behaviors/tumbling_bridge.inc.c | 2 +- src/game/behaviors/tuxie.inc.c | 77 ++++--- src/game/behaviors/unagi.inc.c | 18 +- src/game/behaviors/water_bomb_cannon.inc.c | 10 +- src/game/behaviors/water_mist_particle.inc.c | 6 +- src/game/behaviors/water_objs.inc.c | 12 +- src/game/behaviors/water_ring.inc.c | 3 - src/game/behaviors/white_puff.inc.c | 4 +- src/game/behaviors/white_puff_explode.inc.c | 8 +- src/game/behaviors/wind.inc.c | 10 +- src/game/behaviors/yoshi.inc.c | 13 +- src/game/debug.c | 2 +- src/game/envfx_bubbles.c | 8 +- src/game/level_update.c | 79 +++---- src/game/main.h | 28 +-- src/game/mario_actions_automatic.c | 16 +- src/game/mario_actions_cutscene.c | 16 +- src/game/mario_actions_moving.c | 188 ++++++++--------- src/game/mario_actions_stationary.c | 24 +-- src/game/mario_actions_submerged.c | 16 +- src/game/obj_behaviors.h | 2 +- src/game/obj_behaviors_2.c | 59 +++--- src/game/object_collision.c | 109 +++++----- src/game/object_helpers.c | 198 +++++++++--------- src/game/object_helpers.h | 16 +- src/game/object_list_processor.c | 2 +- src/game/object_list_processor.h | 2 +- src/game/rendering_graph_node.c | 1 - src/game/rumble_init.c | 2 +- 101 files changed, 1165 insertions(+), 1332 deletions(-) diff --git a/data/behavior_data.c b/data/behavior_data.c index 344e8f8f..6ea15514 100644 --- a/data/behavior_data.c +++ b/data/behavior_data.c @@ -1499,7 +1499,7 @@ const BehaviorScript bhvBouncingFireball[] = { OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), DISABLE_RENDERING(), BEGIN_LOOP(), - CALL_NATIVE(bhv_bouncing_fireball_loop), + CALL_NATIVE(bhv_bouncing_fireball_spawner_loop), END_LOOP(), }; @@ -2500,7 +2500,7 @@ const BehaviorScript bhvPenguinBaby[] = { BREAK(), }; -const BehaviorScript bhvUnused20E0[] = { +const BehaviorScript bhvSmallPenguinReturned[] = { BEGIN(OBJ_LIST_GENACTOR), BREAK(), }; diff --git a/include/behavior_data.h b/include/behavior_data.h index 66c410b7..c0a69f6a 100644 --- a/include/behavior_data.h +++ b/include/behavior_data.h @@ -205,7 +205,7 @@ extern const BehaviorScript bhvLllBowserPuzzlePiece[]; extern const BehaviorScript bhvLllBowserPuzzle[]; extern const BehaviorScript bhvTuxiesMother[]; extern const BehaviorScript bhvPenguinBaby[]; -extern const BehaviorScript bhvUnused20E0[]; +extern const BehaviorScript bhvSmallPenguinReturned[]; extern const BehaviorScript bhvSmallPenguin[]; extern const BehaviorScript bhvManyBlueFishSpawner[]; extern const BehaviorScript bhvFewBlueFishSpawner[]; diff --git a/src/engine/geo_layout.c b/src/engine/geo_layout.c index 0e3103b1..4e88fa30 100644 --- a/src/engine/geo_layout.c +++ b/src/engine/geo_layout.c @@ -504,14 +504,14 @@ void geo_layout_cmd_node_translation(void) { void geo_layout_cmd_node_rotation(void) { struct GraphNodeRotation *graphNode; - Vec3s sp2c; + Vec3s angle; s16 drawingLayer = 0; s16 params = cur_geo_cmd_u8(0x01); s16 *cmdPos = (s16 *) gGeoLayoutCommand; void *displayList = NULL; - cmdPos = read_vec3s_angle(sp2c, &cmdPos[1]); + cmdPos = read_vec3s_angle(angle, &cmdPos[1]); if (params & 0x80) { displayList = *(void **) &cmdPos[0]; @@ -519,7 +519,7 @@ void geo_layout_cmd_node_rotation(void) { cmdPos += 2 << CMD_SIZE_SHIFT; } - graphNode = init_graph_node_rotation(gGraphNodePool, NULL, drawingLayer, displayList, sp2c); + graphNode = init_graph_node_rotation(gGraphNodePool, NULL, drawingLayer, displayList, angle); register_scene_graph_node(&graphNode->node); diff --git a/src/game/area.c b/src/game/area.c index 3fc1518b..f2827cfe 100644 --- a/src/game/area.c +++ b/src/game/area.c @@ -154,25 +154,25 @@ struct ObjectWarpNode *area_get_warp_node(u8 id) { } struct ObjectWarpNode *area_get_warp_node_from_params(struct Object *o) { - u8 sp1F = (o->oBehParams & 0x00FF0000) >> 16; + u8 id = (o->oBehParams & 0x00FF0000) >> 16; - return area_get_warp_node(sp1F); + return area_get_warp_node(id); } void load_obj_warp_nodes(void) { - struct ObjectWarpNode *sp24; - struct Object *sp20 = (struct Object *) gObjParentGraphNode.children; + struct ObjectWarpNode *warpNode; + struct Object *children = (struct Object *) gObjParentGraphNode.children; do { - struct Object *sp1C = sp20; + struct Object *obj = children; - if (sp1C->activeFlags != ACTIVE_FLAG_DEACTIVATED && get_mario_spawn_type(sp1C) != 0) { - sp24 = area_get_warp_node_from_params(sp1C); - if (sp24 != NULL) { - sp24->object = sp1C; + if (obj->activeFlags != ACTIVE_FLAG_DEACTIVATED && get_mario_spawn_type(obj) != 0) { + warpNode = area_get_warp_node_from_params(obj); + if (warpNode != NULL) { + warpNode->object = obj; } } - } while ((sp20 = (struct Object *) sp20->header.gfx.node.next) + } while ((children = (struct Object *) children->header.gfx.node.next) != (struct Object *) gObjParentGraphNode.children); } diff --git a/src/game/behavior_actions.c b/src/game/behavior_actions.c index d3566d5f..7ae7ffec 100644 --- a/src/game/behavior_actions.c +++ b/src/game/behavior_actions.c @@ -55,7 +55,7 @@ struct WFRotatingPlatformData { s16 collisionDistance; }; -struct Struct8032F34C { +struct TumblingBridgeParams { s16 numBridgeSections; s16 bridgeRelativeStartingXorZ; s16 platformWidth; @@ -63,18 +63,18 @@ struct Struct8032F34C { const void *segAddr; }; -struct Struct802C0DF0 { - u8 unk0; +struct ExclamationBoxContents { + u8 id; u8 unk1; - u8 unk2; + u8 behParams; ModelID model; const BehaviorScript *behavior; }; -struct Struct8032F754 { - s32 unk0; - Vec3f unk1; - f32 unk2; +struct CheckerBoardPlatformInitPosition { + s32 relPosZ; + Vec3f scale; + f32 radius; }; struct OpenableGrill { @@ -159,15 +159,15 @@ void spawn_mist_particles_variable(s32 count, s32 offsetY, f32 size) { // not sure what this is doing here. not in a behavior file. Gfx *geo_move_mario_part_from_parent(s32 run, UNUSED struct GraphNode *node, Mat4 mtx) { - Mat4 sp20; - struct Object *sp1C; + Mat4 mtx2; + struct Object *obj; if (run == TRUE) { - sp1C = (struct Object *) gCurGraphNodeObject; - if (sp1C == gMarioObject && sp1C->prevObj != NULL) { - create_transformation_from_matrices(sp20, mtx, *gCurGraphNodeCamera->matrixPtr); - obj_update_pos_from_parent_transformation(sp20, sp1C->prevObj); - obj_set_gfx_pos_from_pos(sp1C->prevObj); + obj = (struct Object *) gCurGraphNodeObject; + if (obj == gMarioObject && obj->prevObj != NULL) { + create_transformation_from_matrices(mtx2, mtx, *gCurGraphNodeCamera->matrixPtr); + obj_update_pos_from_parent_transformation(mtx2, obj->prevObj); + obj_set_gfx_pos_from_pos(obj->prevObj); } } return NULL; @@ -232,15 +232,15 @@ void vec3f_copy_2(Vec3f dest, Vec3f src) { #include "behaviors/piranha_plant.inc.c" #include "behaviors/bowser_puzzle_piece.inc.c" -s32 set_obj_anim_with_accel_and_sound(s16 a0, s16 a1, s32 a2) { - f32 sp1C; - if ((sp1C = o->header.gfx.animInfo.animAccel / (f32) 0x10000) == 0) - sp1C = 1.0f; - if (cur_obj_check_anim_frame_in_range(a0, sp1C) || cur_obj_check_anim_frame_in_range(a1, sp1C)) { - cur_obj_play_sound_2(a2); - return 1; +s32 set_obj_anim_with_accel_and_sound(s16 frame1, s16 frame2, s32 sound) { + f32 range; + if ((range = o->header.gfx.animInfo.animAccel / (f32) 0x10000) == 0) + range = 1.0f; + if (cur_obj_check_anim_frame_in_range(frame1, range) || cur_obj_check_anim_frame_in_range(frame2, range)) { + cur_obj_play_sound_2(sound); + return TRUE; } - return 0; + return FALSE; } #include "behaviors/tuxie.inc.c" diff --git a/src/game/behavior_actions.h b/src/game/behavior_actions.h index 97939170..f51ef0b1 100644 --- a/src/game/behavior_actions.h +++ b/src/game/behavior_actions.h @@ -51,7 +51,7 @@ void bhv_fish_group_loop(void); void bhv_cannon_base_loop(void); void bhv_cannon_barrel_loop(void); void bhv_cannon_base_unused_loop(void); -void common_anchor_mario_behavior(f32 sp28, f32 sp2C, s32 sp30); +void common_anchor_mario_behavior(f32 forwardVel, f32 yVel, s32 flag); void bhv_chuckya_loop(void); void bhv_chuckya_anchor_mario_loop(void); void bhv_rotating_platform_loop(void); @@ -104,7 +104,7 @@ void bhv_beta_moving_flames_loop(void); void bhv_rr_rotating_bridge_platform_loop(void); void bhv_flamethrower_loop(void); void bhv_flamethrower_flame_loop(void); -void bhv_bouncing_fireball_loop(void); +void bhv_bouncing_fireball_spawner_loop(void); void bhv_bouncing_fireball_flame_loop(void); void bhv_bowser_shock_wave_loop(void); void bhv_flame_mario_loop(void); diff --git a/src/game/behaviors/animated_floor_switch.inc.c b/src/game/behaviors/animated_floor_switch.inc.c index 8f502310..853bc8fc 100644 --- a/src/game/behaviors/animated_floor_switch.inc.c +++ b/src/game/behaviors/animated_floor_switch.inc.c @@ -1,11 +1,11 @@ // animated_floor_switch.inc.c -struct Struct80331A54 { - const void *unk00; - s16 unk04; +struct FloorSwitchTriggeredAnimationFrame { + const void *collisionDataPtr; + s16 model; }; -struct Struct80331A54 D_80331A54[][5] = { +struct FloorSwitchTriggeredAnimationFrame sFloorSwitchTriggeredAnimationFrames[][5] = { { { bits_seg7_collision_0701B734, MODEL_BITS_STAIRCASE_FRAME4 }, { bits_seg7_collision_0701B59C, MODEL_BITS_STAIRCASE_FRAME3 }, @@ -71,7 +71,7 @@ void bhv_animates_on_floor_switch_press_loop(void) { } o->collisionData = segmented_to_virtual( - D_80331A54[o->oBehParams2ndByte][o->oFloorSwitchPressAnimationUnkF8 / 2].unk00); + sFloorSwitchTriggeredAnimationFrames[o->oBehParams2ndByte][o->oFloorSwitchPressAnimationUnkF8 / 2].collisionDataPtr); - cur_obj_set_model(D_80331A54[o->oBehParams2ndByte][o->oFloorSwitchPressAnimationUnkF8 / 2].unk04); + cur_obj_set_model(sFloorSwitchTriggeredAnimationFrames[o->oBehParams2ndByte][o->oFloorSwitchPressAnimationUnkF8 / 2].model); } diff --git a/src/game/behaviors/bobomb.inc.c b/src/game/behaviors/bobomb.inc.c index 34eef764..acffbafd 100644 --- a/src/game/behaviors/bobomb.inc.c +++ b/src/game/behaviors/bobomb.inc.c @@ -65,11 +65,8 @@ void bobomb_check_interactions(void) { } void bobomb_act_patrol(void) { - UNUSED s8 filler[4]; - UNUSED s16 sp22; s16 collisionFlags; - sp22 = o->header.gfx.animInfo.animFrame; o->oForwardVel = 5.0; collisionFlags = object_step(); @@ -82,15 +79,14 @@ void bobomb_act_patrol(void) { } void bobomb_act_chase_mario(void) { - UNUSED u8 filler[4]; - s16 sp1a, collisionFlags; + s16 animFrame, collisionFlags; - sp1a = ++o->header.gfx.animInfo.animFrame; + animFrame = ++o->header.gfx.animInfo.animFrame; o->oForwardVel = 20.0; collisionFlags = object_step(); - if (sp1a == 5 || sp1a == 16) + if (animFrame == 5 || animFrame == 16) cur_obj_play_sound_2(SOUND_OBJ_BOBOMB_WALK); obj_turn_toward_object(o, gMarioObject, 16, 0x800); @@ -284,8 +280,7 @@ void bhv_bobomb_buddy_init(void) { } void bobomb_buddy_act_idle(void) { - UNUSED u8 filler[4]; - s16 sp1a = o->header.gfx.animInfo.animFrame; + s16 animFrame = o->header.gfx.animInfo.animFrame; UNUSED s16 collisionFlags = 0; o->oBobombBuddyPosXCopy = o->oPosX; @@ -294,7 +289,7 @@ void bobomb_buddy_act_idle(void) { collisionFlags = object_step(); - if ((sp1a == 5) || (sp1a == 16)) + if ((animFrame == 5) || (animFrame == 16)) cur_obj_play_sound_2(SOUND_OBJ_BOBOMB_WALK); if (o->oDistanceToMario < 1000.0f) @@ -382,8 +377,8 @@ void bobomb_buddy_act_talk(void) { } void bobomb_buddy_act_turn_to_talk(void) { - s16 sp1e = o->header.gfx.animInfo.animFrame; - if ((sp1e == 5) || (sp1e == 16)) + s16 animFrame = o->header.gfx.animInfo.animFrame; + if ((animFrame == 5) || (animFrame == 16)) cur_obj_play_sound_2(SOUND_OBJ_BOBOMB_WALK); o->oMoveAngleYaw = approach_s16_symmetric(o->oMoveAngleYaw, o->oAngleToMario, 0x1000); diff --git a/src/game/behaviors/boo.inc.c b/src/game/behaviors/boo.inc.c index 682a2b86..16e81808 100644 --- a/src/game/behaviors/boo.inc.c +++ b/src/game/behaviors/boo.inc.c @@ -335,30 +335,30 @@ static s32 boo_get_attack_status(void) { } // boo idle/chasing movement? -static void boo_chase_mario(f32 a0, s16 a1, f32 a2) { - f32 sp1C; - s16 sp1A; +static void boo_chase_mario(f32 minDY, s16 yawIncrement, f32 mul) { + f32 dy; + s16 targetYaw; if (boo_vanish_or_appear()) { o->oInteractType = 0x8000; if (cur_obj_lateral_dist_from_mario_to_home() > 1500.0f) { - sp1A = cur_obj_angle_to_home(); + targetYaw = cur_obj_angle_to_home(); } else { - sp1A = o->oAngleToMario; + targetYaw = o->oAngleToMario; } - cur_obj_rotate_yaw_toward(sp1A, a1); + cur_obj_rotate_yaw_toward(targetYaw, yawIncrement); o->oVelY = 0.0f; if (mario_is_in_air_action() == 0) { - sp1C = o->oPosY - gMarioObject->oPosY; - if (a0 < sp1C && sp1C < 500.0f) { + dy = o->oPosY - gMarioObject->oPosY; + if (minDY < dy && dy < 500.0f) { o->oVelY = increment_velocity_toward_range(o->oPosY, gMarioObject->oPosY + 50.0f, 10.f, 2.0f); } } - cur_obj_set_vel_from_mario_vel(10.0f - o->oBooNegatedAggressiveness, a2); + cur_obj_set_vel_from_mario_vel(10.0f - o->oBooNegatedAggressiveness, mul); if (o->oForwardVel != 0.0f) { boo_oscillate(FALSE); @@ -539,18 +539,18 @@ static void big_boo_act_0(void) { static void big_boo_act_1(void) { s32 attackStatus; - s16 sp22; - f32 sp1C; + s16 yawIncrement; + f32 mul; if (o->oHealth == 3) { - sp22 = 0x180; sp1C = 0.5f; + yawIncrement = 0x180; mul = 0.5f; } else if (o->oHealth == 2) { - sp22 = 0x240; sp1C = 0.6f; + yawIncrement = 0x240; mul = 0.6f; } else { - sp22 = 0x300; sp1C = 0.8f; + yawIncrement = 0x300; mul = 0.8f; } - boo_chase_mario(-100.0f, sp22, sp1C); + boo_chase_mario(-100.0f, yawIncrement, mul); attackStatus = boo_get_attack_status(); diff --git a/src/game/behaviors/boulder.inc.c b/src/game/behaviors/boulder.inc.c index 42e03cfb..11517816 100644 --- a/src/game/behaviors/boulder.inc.c +++ b/src/game/behaviors/boulder.inc.c @@ -44,7 +44,7 @@ void bhv_big_boulder_loop(void) { } void bhv_big_boulder_generator_loop(void) { - struct Object *sp1C; + struct Object *boulderObj; if (o->oTimer >= 256) { o->oTimer = 0; } @@ -54,13 +54,13 @@ void bhv_big_boulder_generator_loop(void) { if (is_point_within_radius_of_mario(o->oPosX, o->oPosY, o->oPosZ, 6000)) { if ((o->oTimer & 0x3F) == 0) { - sp1C = spawn_object(o, MODEL_HMC_ROLLING_ROCK, bhvBigBoulder); - sp1C->oMoveAngleYaw = random_float() * 4096.0f; + boulderObj = spawn_object(o, MODEL_HMC_ROLLING_ROCK, bhvBigBoulder); + boulderObj->oMoveAngleYaw = random_float() * 4096.0f; } } else { if ((o->oTimer & 0x7F) == 0) { - sp1C = spawn_object(o, MODEL_HMC_ROLLING_ROCK, bhvBigBoulder); - sp1C->oMoveAngleYaw = random_float() * 4096.0f; + boulderObj = spawn_object(o, MODEL_HMC_ROLLING_ROCK, bhvBigBoulder); + boulderObj->oMoveAngleYaw = random_float() * 4096.0f; } } } diff --git a/src/game/behaviors/bouncing_fireball.inc.c b/src/game/behaviors/bouncing_fireball.inc.c index 89dcfd18..9dde41f0 100644 --- a/src/game/behaviors/bouncing_fireball.inc.c +++ b/src/game/behaviors/bouncing_fireball.inc.c @@ -27,20 +27,20 @@ void bhv_bouncing_fireball_flame_loop(void) { o->oInteractStatus = 0; } -void bhv_bouncing_fireball_loop(void) { - struct Object *sp2C; - f32 sp28; +void bhv_bouncing_fireball_spawner_loop(void) { + struct Object *flameObj; + f32 scale; switch (o->oAction) { case 0: if (o->oDistanceToMario < 2000.0f) o->oAction = 1; break; case 1: - sp2C = spawn_object(o, MODEL_RED_FLAME, bhvBouncingFireballFlame); - sp28 = (10 - o->oTimer) * 0.5; - obj_scale_xyz(sp2C, sp28, sp28, sp28); + flameObj = spawn_object(o, MODEL_RED_FLAME, bhvBouncingFireballFlame); + scale = (10 - o->oTimer) * 0.5; + obj_scale_xyz(flameObj, scale, scale, scale); if (o->oTimer == 0) - obj_become_tangible(sp2C); + obj_become_tangible(flameObj); if (o->oTimer > 10) o->oAction++; break; diff --git a/src/game/behaviors/bowling_ball.inc.c b/src/game/behaviors/bowling_ball.inc.c index bac6193b..e0c4dd61 100644 --- a/src/game/behaviors/bowling_ball.inc.c +++ b/src/game/behaviors/bowling_ball.inc.c @@ -78,16 +78,16 @@ void bowling_ball_set_waypoints(void) { void bhv_bowling_ball_roll_loop(void) { s16 collisionFlags; - s32 sp18; + s32 pathResult; #ifdef AVOID_UB - sp18 = 0; + pathResult = 0; #endif bowling_ball_set_waypoints(); collisionFlags = object_step(); //! Uninitialzed parameter, but the parameter is unused in the called function - sp18 = cur_obj_follow_path(sp18); + pathResult = cur_obj_follow_path(pathResult); o->oBowlingBallTargetYaw = o->oPathedTargetYaw; o->oMoveAngleYaw = approach_s16_symmetric(o->oMoveAngleYaw, o->oBowlingBallTargetYaw, 0x400); @@ -97,7 +97,7 @@ void bhv_bowling_ball_roll_loop(void) { bowling_ball_set_hitbox(); - if (sp18 == -1) { + if (pathResult == -1) { if (is_point_within_radius_of_mario(o->oPosX, o->oPosY, o->oPosZ, 7000)) { spawn_mist_particles(); spawn_mist_particles_variable(0, 0, 92.0f); @@ -111,15 +111,15 @@ void bhv_bowling_ball_roll_loop(void) { } void bhv_bowling_ball_initializeLoop(void) { - s32 sp1c; + s32 pathResult; #ifdef AVOID_UB - sp1c = 0; + pathResult = 0; #endif bowling_ball_set_waypoints(); //! Uninitialzed parameter, but the parameter is unused in the called function - sp1c = cur_obj_follow_path(sp1c); + pathResult = cur_obj_follow_path(pathResult); o->oMoveAngleYaw = o->oPathedTargetYaw; diff --git a/src/game/behaviors/bowser_key_cutscene.inc.c b/src/game/behaviors/bowser_key_cutscene.inc.c index e840b893..0b17f9e2 100644 --- a/src/game/behaviors/bowser_key_cutscene.inc.c +++ b/src/game/behaviors/bowser_key_cutscene.inc.c @@ -1,10 +1,10 @@ // bowser_key_cutscene.inc.c -Gfx *geo_scale_bowser_key(s32 run, struct GraphNode *node, UNUSED f32 mtx[4][4]) { - struct Object *sp4; +Gfx *geo_scale_bowser_key(s32 run, struct GraphNode *node, UNUSED Mat4 mtx) { + struct Object *nodeObj; if (run == TRUE) { - sp4 = (struct Object *) gCurGraphNodeObject; - ((struct GraphNodeScale *) node->next)->scale = sp4->oBowserKeyScale; + nodeObj = (struct Object *) gCurGraphNodeObject; + ((struct GraphNodeScale *) node->next)->scale = nodeObj->oBowserKeyScale; } return 0; } diff --git a/src/game/behaviors/bowser_puzzle_piece.inc.c b/src/game/behaviors/bowser_puzzle_piece.inc.c index 14db4de6..b6fcd34c 100644 --- a/src/game/behaviors/bowser_puzzle_piece.inc.c +++ b/src/game/behaviors/bowser_puzzle_piece.inc.c @@ -119,7 +119,7 @@ void bhv_lll_bowser_puzzle_spawn_pieces(f32 pieceWidth) { */ void bhv_lll_bowser_puzzle_loop(void) { s32 i; - UNUSED struct Object *sp28; + UNUSED struct Object *coinObj; switch (o->oAction) { case BOWSER_PUZZLE_ACT_SPAWN_PIECES: bhv_lll_bowser_puzzle_spawn_pieces(480.0f); @@ -129,7 +129,7 @@ void bhv_lll_bowser_puzzle_loop(void) { if (o->oBowserPuzzleCompletionFlags == 3 && o->oDistanceToMario < 1000.0f) { // Spawn 5 coins. for (i = 0; i < 5; i++) - sp28 = spawn_object(o, MODEL_YELLOW_COIN, bhvSingleCoinGetsSpawned); + coinObj = spawn_object(o, MODEL_YELLOW_COIN, bhvSingleCoinGetsSpawned); // Reset completion flags (even though they never get checked again). o->oBowserPuzzleCompletionFlags = 0; @@ -219,13 +219,9 @@ void bhv_lll_bowser_puzzle_piece_move(f32 xOffset, f32 zOffset, s32 duration, UN } void bhv_lll_bowser_puzzle_piece_idle(void) { - UNUSED s32 sp4; - // For the first 24 frames, do nothing. - if (o->oTimer < 24) - sp4 = 0; - else - // Then advance to the next action. + // Then advance to the next action. + if (o->oTimer >= 24) o->oBowserPuzzlePieceContinuePerformingAction = 0; } diff --git a/src/game/behaviors/breakable_box_small.inc.c b/src/game/behaviors/breakable_box_small.inc.c index e2ecc8c6..5c88f86d 100644 --- a/src/game/behaviors/breakable_box_small.inc.c +++ b/src/game/behaviors/breakable_box_small.inc.c @@ -23,9 +23,9 @@ void bhv_breakable_box_small_init(void) { } void small_breakable_box_spawn_dust(void) { - struct Object *sp24 = spawn_object(o, MODEL_SMOKE, bhvSmoke); - sp24->oPosX += (s32)(random_float() * 80.0f) - 40; - sp24->oPosZ += (s32)(random_float() * 80.0f) - 40; + struct Object *smokeObj = spawn_object(o, MODEL_SMOKE, bhvSmoke); + smokeObj->oPosX += (s32)(random_float() * 80.0f) - 40; + smokeObj->oPosZ += (s32)(random_float() * 80.0f) - 40; } void small_breakable_box_act_move(void) { diff --git a/src/game/behaviors/bubba.inc.c b/src/game/behaviors/bubba.inc.c index 9964b0fe..24d1ef6d 100644 --- a/src/game/behaviors/bubba.inc.c +++ b/src/game/behaviors/bubba.inc.c @@ -13,13 +13,11 @@ static struct ObjectHitbox sBubbaHitbox = { }; void bubba_act_0(void) { - f32 sp24; - - sp24 = cur_obj_lateral_dist_to_home(); + f32 lateralDistToHome = cur_obj_lateral_dist_to_home(); treat_far_home_as_mario(2000.0f); o->oAnimState = 0; - o->oBubbaUnk1AC = obj_get_pitch_to_home(sp24); + o->oBubbaUnk1AC = obj_get_pitch_to_home(lateralDistToHome); approach_f32_ptr(&o->oBubbaUnkF4, 5.0f, 0.5f); @@ -57,8 +55,8 @@ void bubba_act_1(void) { } else if (o->oBubbaUnk100 < 15) { o->oAnimState = 1; } else if (o->oBubbaUnk100 == 20) { - s16 val06 = 10000 - (s16)(20.0f * (find_water_level(o->oPosX, o->oPosZ) - o->oPosY)); - o->oBubbaUnk1AC -= val06; + s16 targetPitch = 10000 - (s16)(20.0f * (find_water_level(o->oPosX, o->oPosZ) - o->oPosY)); + o->oBubbaUnk1AC -= targetPitch; o->oMoveAnglePitch = o->oBubbaUnk1AC; o->oBubbaUnkF4 = 40.0f; obj_compute_vel_from_move_pitch(o->oBubbaUnkF4); @@ -72,12 +70,12 @@ void bubba_act_1(void) { } } else { if (abs_angle_diff(gMarioObject->oFaceAngleYaw, o->oAngleToMario) < 0x3000) { - s16 val04 = 0x4000 - atan2s(800.0f, o->oDistanceToMario - 800.0f); + s16 targetDYaw = 0x4000 - atan2s(800.0f, o->oDistanceToMario - 800.0f); if ((s16)(o->oMoveAngleYaw - o->oAngleToMario) < 0) { - val04 = -val04; + targetDYaw = -targetDYaw; } - o->oBubbaUnk1AE = o->oAngleToMario + val04; + o->oBubbaUnk1AE = o->oAngleToMario + targetDYaw; } else { o->oBubbaUnk1AE = o->oAngleToMario; } @@ -96,8 +94,6 @@ void bubba_act_1(void) { } void bhv_bubba_loop(void) { - UNUSED s32 unused; - o->oInteractionSubtype &= ~INT_SUBTYPE_EATS_MARIO; o->oBubbaUnk104 = obj_turn_pitch_toward_mario(120.0f, 0); @@ -135,9 +131,9 @@ void bhv_bubba_loop(void) { } else { approach_f32_ptr(&o->oBubbaUnk108, 0.0f, 4.0f); if ((o->oBubbaUnk10C -= o->oBubbaUnk108) > 1.0f) { - s16 sp36 = random_u16(); + s16 rand = random_u16(); o->oBubbaUnk10C -= 1.0f; - spawn_object_relative(0, 150.0f * coss(sp36), 0x64, 150.0f * sins(sp36), o, + spawn_object_relative(0, 150.0f * coss(rand), 0x64, 150.0f * sins(rand), o, MODEL_WHITE_PARTICLE_SMALL, bhvSmallParticleSnow); } } diff --git a/src/game/behaviors/bullet_bill.inc.c b/src/game/behaviors/bullet_bill.inc.c index 611bc945..4b6dea5a 100644 --- a/src/game/behaviors/bullet_bill.inc.c +++ b/src/game/behaviors/bullet_bill.inc.c @@ -21,8 +21,8 @@ void bullet_bill_act_0(void) { } void bullet_bill_act_1(void) { - s16 sp1E = abs_angle_diff(o->oAngleToMario, o->oMoveAngleYaw); - if (sp1E < 0x2000 && 400.0f < o->oDistanceToMario && o->oDistanceToMario < 1500.0f) + s16 dYaw = abs_angle_diff(o->oAngleToMario, o->oMoveAngleYaw); + if (dYaw < 0x2000 && 400.0f < o->oDistanceToMario && o->oDistanceToMario < 1500.0f) o->oAction = 2; } diff --git a/src/game/behaviors/bully.inc.c b/src/game/behaviors/bully.inc.c index 3695a847..550cdd45 100644 --- a/src/game/behaviors/bully.inc.c +++ b/src/game/behaviors/bully.inc.c @@ -143,10 +143,10 @@ void bully_backup_check(s16 collisionFlags) { } void bully_play_stomping_sound(void) { - s16 sp26 = o->header.gfx.animInfo.animFrame; + s16 animFrame = o->header.gfx.animInfo.animFrame; switch (o->oAction) { case BULLY_ACT_PATROL: - if (sp26 == 0 || sp26 == 12) { + if (animFrame == 0 || animFrame == 12) { if (o->oBehParams2ndByte == BULLY_BP_SIZE_SMALL) cur_obj_play_sound_2(SOUND_OBJ_BULLY_WALK); else @@ -156,7 +156,7 @@ void bully_play_stomping_sound(void) { case BULLY_ACT_CHASE_MARIO: case BULLY_ACT_BACK_UP: - if (sp26 == 0 || sp26 == 5) { + if (animFrame == 0 || animFrame == 5) { if (o->oBehParams2ndByte == BULLY_BP_SIZE_SMALL) cur_obj_play_sound_2(SOUND_OBJ_BULLY_WALK); else @@ -264,14 +264,9 @@ void bhv_bully_loop(void) { set_object_visibility(o, 3000); } -// sp38 = arg0 -// sp3c = arg1 -// sp40 = arg2 -// sp44 = arg3 - -void big_bully_spawn_minion(s32 arg0, s32 arg1, s32 arg2, s16 arg3) { +void big_bully_spawn_minion(s32 x, s32 y, s32 z, s16 ry) { struct Object *bully = - spawn_object_abs_with_rot(o, 0, MODEL_BULLY, bhvSmallBully, arg0, arg1, arg2, 0, arg3, 00); + spawn_object_abs_with_rot(o, 0, MODEL_BULLY, bhvSmallBully, x, y, z, 0, ry, 0); bully->oBullySubtype = BULLY_STYPE_MINION; bully->oBehParams2ndByte = BULLY_BP_SIZE_SMALL; } diff --git a/src/game/behaviors/butterfly.inc.c b/src/game/behaviors/butterfly.inc.c index 2b530d81..fcc278d4 100644 --- a/src/game/behaviors/butterfly.inc.c +++ b/src/game/behaviors/butterfly.inc.c @@ -10,8 +10,6 @@ void bhv_butterfly_init(void) { o->oHomeZ = o->oPosZ; } -// sp28 = speed - void butterfly_step(s32 speed) { struct FloorGeometry *sp24; s16 yaw = o->oMoveAngleYaw; diff --git a/src/game/behaviors/capswitch.inc.c b/src/game/behaviors/capswitch.inc.c index 4aa69dbc..9f2c0fae 100644 --- a/src/game/behaviors/capswitch.inc.c +++ b/src/game/behaviors/capswitch.inc.c @@ -26,7 +26,7 @@ void cap_switch_act_1(void) { } void cap_switch_act_2(void) { - s32 sp1C; + s32 response; if (o->oTimer < 5) { cur_obj_scale_over_time(2, 4, 0.5f, 0.1f); if (o->oTimer == 4) { @@ -41,9 +41,9 @@ void cap_switch_act_2(void) { //! Neither of these flags are defined in this function so they do nothing. // On an extra note, there's a specific check for this cutscene and // there's no dialog defined since the cutscene itself calls the dialog. - sp1C = cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_FRONT, + response = cur_obj_update_dialog_with_cutscene(MARIO_DIALOG_LOOK_FRONT, (DIALOG_FLAG_TEXT_RESPONSE | DIALOG_FLAG_UNK_CAPSWITCH), CUTSCENE_CAP_SWITCH_PRESS, 0); - if (sp1C) + if (response) o->oAction = 3; } } diff --git a/src/game/behaviors/castle_floor_trap.inc.c b/src/game/behaviors/castle_floor_trap.inc.c index 4bceb9e4..5f19bccc 100644 --- a/src/game/behaviors/castle_floor_trap.inc.c +++ b/src/game/behaviors/castle_floor_trap.inc.c @@ -7,10 +7,10 @@ void bhv_floor_trap_in_castle_loop(void) { } void bhv_castle_floor_trap_init(void) { - struct Object *sp2C; - sp2C = spawn_object_relative(0, -358, 0, 0, o, MODEL_CASTLE_BOWSER_TRAP, bhvFloorTrapInCastle); - sp2C = spawn_object_relative(0, 358, 0, 0, o, MODEL_CASTLE_BOWSER_TRAP, bhvFloorTrapInCastle); - sp2C->oMoveAngleYaw += 0x8000; + struct Object *floorTrapObj; + floorTrapObj = spawn_object_relative(0, -358, 0, 0, o, MODEL_CASTLE_BOWSER_TRAP, bhvFloorTrapInCastle); + floorTrapObj = spawn_object_relative(0, 358, 0, 0, o, MODEL_CASTLE_BOWSER_TRAP, bhvFloorTrapInCastle); + floorTrapObj->oMoveAngleYaw += 0x8000; } void bhv_castle_floor_trap_open_detect(void) { diff --git a/src/game/behaviors/checkerboard_platform.inc.c b/src/game/behaviors/checkerboard_platform.inc.c index 30235a03..57d71dd5 100644 --- a/src/game/behaviors/checkerboard_platform.inc.c +++ b/src/game/behaviors/checkerboard_platform.inc.c @@ -1,46 +1,46 @@ // checkerboard_platform.c.inc -struct Struct8032F754 D_8032F754[] = { { 145, { 0.7f, 1.5f, 0.7f }, 7.0f }, - { 235, { 1.2f, 2.0f, 1.2f }, 11.6f } }; +struct CheckerBoardPlatformInitPosition sCheckerBoardPlatformInitPositions[] = { { 145, { 0.7f, 1.5f, 0.7f }, 7.0f }, + { 235, { 1.2f, 2.0f, 1.2f }, 11.6f } }; void bhv_checkerboard_elevator_group_init(void) { - s32 sp3C; - s32 sp38; - s32 sp34; + s32 relativePosY; + s32 relativePosZ; + s32 type; s32 i; - struct Object *sp2C; + struct Object *platformObj; if (o->oBehParams2ndByte == 0) o->oBehParams2ndByte = 65; - sp3C = o->oBehParams2ndByte * 10; - sp34 = (o->oBehParams >> 24) & 0XFF; + relativePosY = o->oBehParams2ndByte * 10; + type = (o->oBehParams >> 24) & 0XFF; for (i = 0; i < 2; i++) { if (i == 0) - sp38 = -D_8032F754[sp34].unk0; + relativePosZ = -sCheckerBoardPlatformInitPositions[type].relPosZ; else - sp38 = D_8032F754[sp34].unk0; + relativePosZ = sCheckerBoardPlatformInitPositions[type].relPosZ; - sp2C = spawn_object_relative(i, 0, i * sp3C, sp38, o, MODEL_CHECKERBOARD_PLATFORM, + platformObj = spawn_object_relative(i, 0, i * relativePosY, relativePosZ, o, MODEL_CHECKERBOARD_PLATFORM, bhvCheckerboardPlatformSub); - sp2C->oCheckerBoardPlatformUnk1AC = D_8032F754[sp34].unk2; - vec3f_copy_2(sp2C->header.gfx.scale, D_8032F754[sp34].unk1); + platformObj->oCheckerBoardPlatformUnk1AC = sCheckerBoardPlatformInitPositions[type].radius; + vec3f_copy_2(platformObj->header.gfx.scale, sCheckerBoardPlatformInitPositions[type].scale); } } -void checkerboard_plat_act_move_y(UNUSED s32 unused, f32 vel, s32 a2) { +void checkerboard_plat_act_move_y(UNUSED s32 unused, f32 vel, s32 time) { o->oMoveAnglePitch = 0; o->oAngleVelPitch = 0; o->oForwardVel = 0.0f; o->oVelY = vel; - if (o->oTimer > a2) + if (o->oTimer > time) o->oAction++; } -void checkerboard_plat_act_rotate(s32 a0, s16 a1) { +void checkerboard_plat_act_rotate(s32 nextAction, s16 pitch) { o->oVelY = 0.0f; - o->oAngleVelPitch = a1; - if (o->oTimer + 1 == 0x8000 / absi(a1)) - o->oAction = a0; - o->oCheckerBoardPlatformUnkF8 = a0; + o->oAngleVelPitch = pitch; + if (o->oTimer + 1 == 0x8000 / absi(pitch)) + o->oAction = nextAction; + o->oCheckerBoardPlatformUnkF8 = nextAction; } void bhv_checkerboard_platform_init(void) { @@ -48,7 +48,7 @@ void bhv_checkerboard_platform_init(void) { } void bhv_checkerboard_platform_loop(void) { - f32 sp24 = o->oCheckerBoardPlatformUnk1AC; + f32 radius = o->oCheckerBoardPlatformUnk1AC; o->oCheckerBoardPlatformUnkF8 = 0; if (o->oDistanceToMario < 1000.0f) cur_obj_play_sound_1(SOUND_ENV_ELEVATOR4); @@ -76,8 +76,8 @@ void bhv_checkerboard_platform_loop(void) { o->oFaceAnglePitch += absi(o->oAngleVelPitch); o->oFaceAngleYaw = o->oMoveAngleYaw; if (o->oMoveAnglePitch != 0) { - o->oForwardVel = signum_positive(o->oAngleVelPitch) * sins(o->oMoveAnglePitch) * sp24; - o->oVelY = signum_positive(o->oAngleVelPitch) * coss(o->oMoveAnglePitch) * sp24; + o->oForwardVel = signum_positive(o->oAngleVelPitch) * sins(o->oMoveAnglePitch) * radius; + o->oVelY = signum_positive(o->oAngleVelPitch) * coss(o->oMoveAnglePitch) * radius; } if (o->oCheckerBoardPlatformUnkF8 == 1) { o->oAngleVelPitch = 0; diff --git a/src/game/behaviors/chuckya.inc.c b/src/game/behaviors/chuckya.inc.c index e74fe9c1..d9f0f4e3 100644 --- a/src/game/behaviors/chuckya.inc.c +++ b/src/game/behaviors/chuckya.inc.c @@ -12,7 +12,7 @@ struct UnusedChuckyaData sUnusedChuckyaData[] = { { 2, 0.f, 1.f }, { 2, 20.f, 1.f }, { 8, 10.f, 1.f }}; -void common_anchor_mario_behavior(f32 sp28, f32 sp2C, s32 sp30) { +void common_anchor_mario_behavior(f32 forwardVel, f32 yVel, s32 flag) { switch (o->parentObj->oChuckyaUnk88) { case 0: break; @@ -20,9 +20,9 @@ void common_anchor_mario_behavior(f32 sp28, f32 sp2C, s32 sp30) { obj_set_gfx_pos_at_obj_pos(gMarioObject, o); break; case 2: - gMarioObject->oInteractStatus |= (sp30 + INT_STATUS_MARIO_UNK2); - gMarioStates[0].forwardVel = sp28; - gMarioStates[0].vel[1] = sp2C; + gMarioObject->oInteractStatus |= (flag + INT_STATUS_MARIO_UNK2); + gMarioStates[0].forwardVel = forwardVel; + gMarioStates[0].vel[1] = yVel; o->parentObj->oChuckyaUnk88 = 0; break; case 3: @@ -68,7 +68,6 @@ s32 unknown_chuckya_function(s32 sp20, f32 sp24, f32 sp28, s32 sp2C) { } s32 approach_forward_vel(f32 *arr, f32 spC, f32 sp10) { - s32 sp4 = 0; if (arr[0] > spC) { arr[0] -= sp10; if (arr[0] < spC) @@ -77,22 +76,18 @@ s32 approach_forward_vel(f32 *arr, f32 spC, f32 sp10) { arr[0] += sp10; if (arr[0] > spC) arr[0] = spC; - } else - sp4 = 1; - return sp4; + } else { + return TRUE; + } + return FALSE; } void chuckya_act_0(void) { - s32 sp3C; -#ifdef AVOID_UB - sp3C = 0; -#endif - UNUSED u8 pad[16]; - s32 sp28; + s32 initialSubAction; if (o->oTimer == 0) o->oChuckyaUnkFC = 0; o->oAngleToMario = obj_angle_to_object(o, gMarioObject); - switch (sp28 = o->oSubAction) { + switch (initialSubAction = o->oSubAction) { case 0: o->oForwardVel = 0; if (cur_obj_lateral_dist_from_mario_to_home() < 2000.0f) { @@ -127,14 +122,13 @@ void chuckya_act_0(void) { o->oSubAction = 0; break; } - if (o->oSubAction != sp28) + if (o->oSubAction != initialSubAction) o->oChuckyaUnkFC = 0; else o->oChuckyaUnkFC++; cur_obj_init_animation_with_sound(4); if (o->oForwardVel > 1.0f) cur_obj_play_sound_1(SOUND_AIR_CHUCKYA_MOVE); - print_debug_bottom_up("fg %d", sp3C); print_debug_bottom_up("sp %d", o->oForwardVel); } @@ -203,8 +197,6 @@ void chuckya_move(void) { } void bhv_chuckya_loop(void) { - f32 sp2C = 20.0f; - f32 sp28 = 50.0f; cur_obj_scale(2.0f); o->oInteractionSubtype |= INT_SUBTYPE_GRABS_MARIO; switch (o->oHeldState) { @@ -216,7 +208,7 @@ void bhv_chuckya_loop(void) { break; case HELD_THROWN: case HELD_DROPPED: - cur_obj_get_thrown_or_placed(sp2C, sp28, 2); + cur_obj_get_thrown_or_placed(20.0f, 50.0f, 2); break; } o->oInteractStatus = 0; diff --git a/src/game/behaviors/clam.inc.c b/src/game/behaviors/clam.inc.c index 36969800..0b997348 100644 --- a/src/game/behaviors/clam.inc.c +++ b/src/game/behaviors/clam.inc.c @@ -30,18 +30,17 @@ void clam_act_0(void) { } void clam_act_1(void) { - s16 val06; - s16 val04; - s16 val02; + s16 i; + s16 bubblesX, bubblesZ; if (o->oTimer > 150) { o->oAction = 0; } else if (obj_is_rendering_enabled() && cur_obj_init_anim_check_frame(1, 8)) { - for (val06 = -0x2000; val06 < 0x2000; val06 += 0x555) { - val04 = (s16)(100.0f * sins(val06)); - val02 = (s16)(100.0f * coss(val06)); + for (i = -0x2000; i < 0x2000; i += 0x555) { + bubblesX = (s16)(100.0f * sins(i)); + bubblesZ = (s16)(100.0f * coss(i)); - spawn_object_relative(0, val04, 30, val02, o, MODEL_BUBBLE, bhvBubbleMaybe); + spawn_object_relative(0, bubblesX, 30, bubblesZ, o, MODEL_BUBBLE, bhvBubbleMaybe); } } else if (cur_obj_check_anim_frame(30)) { cur_obj_become_intangible(); diff --git a/src/game/behaviors/coin.inc.c b/src/game/behaviors/coin.inc.c index ea6b84cd..c36bb451 100644 --- a/src/game/behaviors/coin.inc.c +++ b/src/game/behaviors/coin.inc.c @@ -58,19 +58,19 @@ void bhv_coin_init(void) { } void bhv_coin_loop(void) { - struct Surface *sp1C; - s16 sp1A; + struct Surface *floor; + s16 targetYaw; cur_obj_update_floor_and_walls(); cur_obj_if_hit_wall_bounce_away(); cur_obj_move_standard(-62); - if ((sp1C = o->oFloor) != NULL) { + if ((floor = o->oFloor) != NULL) { if (o->oMoveFlags & OBJ_MOVE_ON_GROUND) o->oSubAction = 1; if (o->oSubAction == 1) { o->oBounciness = 0; - if (sp1C->normal.y < 0.9) { - sp1A = atan2s(sp1C->normal.z, sp1C->normal.x); - cur_obj_rotate_yaw_toward(sp1A, 0x400); + if (floor->normal.y < 0.9) { + targetYaw = atan2s(floor->normal.z, floor->normal.x); + cur_obj_rotate_yaw_toward(targetYaw, 0x400); } } } @@ -133,44 +133,44 @@ void bhv_coin_formation_spawn_loop(void) { obj_mark_for_deletion(o); } -void spawn_coin_in_formation(s32 sp50, s32 sp54) { - struct Object *sp4C; - Vec3i sp40; - s32 sp3C = 1; - s32 sp38 = 1; - sp40[0] = sp40[1] = sp40[2] = 0; - switch (sp54 & 7) { +void spawn_coin_in_formation(s32 index, s32 shape) { + struct Object *newCoin; + Vec3i pos; + s32 spawnCoin = TRUE; + s32 snapToGround = TRUE; + pos[0] = pos[1] = pos[2] = 0; + switch (shape & 7) { case 0: - sp40[2] = 160 * (sp50 - 2); - if (sp50 > 4) - sp3C = 0; + pos[2] = 160 * (index - 2); + if (index > 4) + spawnCoin = FALSE; break; case 1: - sp38 = 0; - sp40[1] = 160 * sp50 * 0.8; // 128 * sp50 - if (sp50 > 4) - sp3C = 0; + snapToGround = FALSE; + pos[1] = 160 * index * 0.8; // 128 * index + if (index > 4) + spawnCoin = FALSE; break; case 2: - sp40[0] = sins(sp50 << 13) * 300.0f; - sp40[2] = coss(sp50 << 13) * 300.0f; + pos[0] = sins(index << 13) * 300.0f; + pos[2] = coss(index << 13) * 300.0f; break; case 3: - sp38 = 0; - sp40[0] = coss(sp50 << 13) * 200.0f; - sp40[1] = sins(sp50 << 13) * 200.0f + 200.0f; + snapToGround = FALSE; + pos[0] = coss(index << 13) * 200.0f; + pos[1] = sins(index << 13) * 200.0f + 200.0f; break; case 4: - sp40[0] = sCoinArrowPositions[sp50][0]; - sp40[2] = sCoinArrowPositions[sp50][1]; + pos[0] = sCoinArrowPositions[index][0]; + pos[2] = sCoinArrowPositions[index][1]; break; } - if (sp54 & 0x10) - sp38 = 0; - if (sp3C) { - sp4C = spawn_object_relative(sp50, sp40[0], sp40[1], sp40[2], o, MODEL_YELLOW_COIN, + if (shape & 0x10) + snapToGround = FALSE; + if (spawnCoin) { + newCoin = spawn_object_relative(index, pos[0], pos[1], pos[2], o, MODEL_YELLOW_COIN, bhvCoinFormationSpawn); - sp4C->oCoinUnkF8 = sp38; + newCoin->oCoinUnkF8 = snapToGround; } } @@ -222,8 +222,7 @@ void coin_inside_boo_act_1(void) { } void coin_inside_boo_act_0(void) { - s16 sp26; - f32 sp20; + s16 marioMoveYaw; struct Object *parent = o->parentObj; cur_obj_become_intangible(); if (o->oTimer == 0 && gCurrLevelNum == LEVEL_BBH) { @@ -233,10 +232,9 @@ void coin_inside_boo_act_0(void) { obj_copy_pos(o, parent); if (parent->oBooDeathStatus == BOO_DEATH_STATUS_DYING) { o->oAction = 1; - sp26 = gMarioObject->oMoveAngleYaw; - sp20 = 3.0f; - o->oVelX = sins(sp26) * sp20; - o->oVelZ = coss(sp26) * sp20; + marioMoveYaw = gMarioObject->oMoveAngleYaw; + o->oVelX = sins(marioMoveYaw) * 3.0f; + o->oVelZ = coss(marioMoveYaw) * 3.0f; o->oVelY = 35.0f; } } @@ -252,10 +250,8 @@ void bhv_coin_sparkles_loop(void) { } void bhv_golden_coin_sparkles_loop(void) { - struct Object *sp2C; - UNUSED s32 unused; - f32 sp24 = 30.0f; - sp2C = spawn_object(o, MODEL_SPARKLES, bhvCoinSparkles); - sp2C->oPosX += random_float() * sp24 - sp24 / 2; - sp2C->oPosZ += random_float() * sp24 - sp24 / 2; + struct Object *sparkleObj; + sparkleObj = spawn_object(o, MODEL_SPARKLES, bhvCoinSparkles); + sparkleObj->oPosX += random_float() * 30.0f - 15.0f; + sparkleObj->oPosZ += random_float() * 30.0f - 15.0f; } diff --git a/src/game/behaviors/collide_particles.inc.c b/src/game/behaviors/collide_particles.inc.c index 9b013699..605e8a92 100644 --- a/src/game/behaviors/collide_particles.inc.c +++ b/src/game/behaviors/collide_particles.inc.c @@ -7,12 +7,12 @@ static s16 sTinyStarMovementParams[] = { 0xE000, 0, 0, 0, 0x2000, 0x1666, 0x1666, 0x1666, 0xE99A, 0xE99A, 0x1666, 0xE99A }; void bhv_punch_tiny_triangle_loop(void) { - s16 sp1E; + s16 yaw; if (o->oTimer == 0) { - sp1E = o->oMoveAngleYaw; + yaw = o->oMoveAngleYaw; o->oCollisionParticleUnkF4 = 1.28f; cur_obj_set_pos_relative(gMarioObject, 0.0f, 60.0f, 100.0f); - o->oMoveAngleYaw = sp1E; + o->oMoveAngleYaw = yaw; } cur_obj_move_using_fvel_and_gravity(); o->oAnimState = 5; @@ -35,12 +35,12 @@ void bhv_punch_tiny_triangle_init(void) { } void bhv_wall_tiny_star_particle_loop(void) { - s16 sp1E; + s16 yaw; if (o->oTimer == 0) { - sp1E = o->oMoveAngleYaw; + yaw = o->oMoveAngleYaw; o->oCollisionParticleUnkF4 = 0.28f; cur_obj_set_pos_relative(gMarioObject, 0.0f, 30.0f, 110.0f); - o->oMoveAngleYaw = sp1E; + o->oMoveAngleYaw = yaw; } cur_obj_move_using_fvel_and_gravity(); o->oAnimState = 4; @@ -74,11 +74,11 @@ void bhv_pound_tiny_star_particle_loop(void) { } void bhv_pound_tiny_star_particle_init(void) { - s32 sp24; - s32 sp20 = 8; + s32 i; + s32 amt = 8; struct Object *particle; - for (sp24 = 0; sp24 < sp20; sp24++) { + for (i = 0; i < amt; i++) { particle = spawn_object(o, MODEL_CARTOON_STAR, bhvPoundTinyStarParticle); - particle->oMoveAngleYaw = (sp24 * 65536) / sp20; + particle->oMoveAngleYaw = (i * 65536) / amt; } } diff --git a/src/game/behaviors/controllable_platform.inc.c b/src/game/behaviors/controllable_platform.inc.c index c22fe64d..09322fbc 100644 --- a/src/game/behaviors/controllable_platform.inc.c +++ b/src/game/behaviors/controllable_platform.inc.c @@ -1,6 +1,6 @@ // controllable_platform.c.inc -static s8 D_80331694 = 0; +static s8 sControllablePlatformDirectionState = 0; void controllable_platform_act_1(void) { o->oParentRelativePosY -= 4.0f; @@ -11,7 +11,7 @@ void controllable_platform_act_1(void) { } void controllable_platform_act_2(void) { - if (o->oBehParams2ndByte == D_80331694) + if (o->oBehParams2ndByte == sControllablePlatformDirectionState) return; o->oParentRelativePosY += 4.0f; @@ -28,7 +28,7 @@ void bhv_controllable_platform_sub_loop(void) { break; if (gMarioObject->platform == o) { - D_80331694 = o->oBehParams2ndByte; + sControllablePlatformDirectionState = o->oBehParams2ndByte; #ifdef VERSION_SH o->parentObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE; #endif @@ -54,29 +54,29 @@ void bhv_controllable_platform_sub_loop(void) { } void bhv_controllable_platform_init(void) { - struct Object *sp34; - sp34 = spawn_object_rel_with_rot(o, MODEL_HMC_METAL_ARROW_PLATFORM, bhvControllablePlatformSub, 0, + struct Object *buttonObj; + buttonObj = spawn_object_rel_with_rot(o, MODEL_HMC_METAL_ARROW_PLATFORM, bhvControllablePlatformSub, 0, 51, 204, 0, 0, 0); - sp34->oBehParams2ndByte = 1; - sp34 = spawn_object_rel_with_rot(o, MODEL_HMC_METAL_ARROW_PLATFORM, bhvControllablePlatformSub, 0, + buttonObj->oBehParams2ndByte = 1; + buttonObj = spawn_object_rel_with_rot(o, MODEL_HMC_METAL_ARROW_PLATFORM, bhvControllablePlatformSub, 0, 51, -204, 0, -0x8000, 0); - sp34->oBehParams2ndByte = 2; - sp34 = spawn_object_rel_with_rot(o, MODEL_HMC_METAL_ARROW_PLATFORM, bhvControllablePlatformSub, 204, + buttonObj->oBehParams2ndByte = 2; + buttonObj = spawn_object_rel_with_rot(o, MODEL_HMC_METAL_ARROW_PLATFORM, bhvControllablePlatformSub, 204, 51, 0, 0, 0x4000, 0); - sp34->oBehParams2ndByte = 3; - sp34 = spawn_object_rel_with_rot(o, MODEL_HMC_METAL_ARROW_PLATFORM, bhvControllablePlatformSub, + buttonObj->oBehParams2ndByte = 3; + buttonObj = spawn_object_rel_with_rot(o, MODEL_HMC_METAL_ARROW_PLATFORM, bhvControllablePlatformSub, -204, 51, 0, 0, -0x4000, 0); - sp34->oBehParams2ndByte = 4; + buttonObj->oBehParams2ndByte = 4; - D_80331694 = 0; + sControllablePlatformDirectionState = 0; o->oControllablePlatformUnkFC = o->oPosY; } -void controllable_platform_hit_wall(s8 sp1B) { - o->oControllablePlatformUnkF8 = sp1B; +void controllable_platform_hit_wall(s8 nextDirection) { + o->oControllablePlatformUnkF8 = nextDirection; o->oTimer = 0; - D_80331694 = 5; + sControllablePlatformDirectionState = 5; cur_obj_play_sound_2(SOUND_GENERAL_QUIET_POUND1); #if ENABLE_RUMBLE @@ -84,33 +84,33 @@ void controllable_platform_hit_wall(s8 sp1B) { #endif } -void controllable_platform_check_walls(s8 sp1B, s8 sp1C[3], Vec3f sp20, UNUSED Vec3f sp24, Vec3f sp28) { - if (sp1C[1] == 1 || (sp1C[0] == 1 && sp1C[2] == 1)) - controllable_platform_hit_wall(sp1B); +void controllable_platform_check_walls(s8 nextDirection, s8 wallDisplacement[3], Vec3f dist1, UNUSED Vec3f dist2, Vec3f dist3) { + if (wallDisplacement[1] == 1 || (wallDisplacement[0] == 1 && wallDisplacement[2] == 1)) + controllable_platform_hit_wall(nextDirection); else { - if (sp1C[0] == 1) { - if (((sp1B == 1 || sp1B == 2) && (s32) sp20[2] != 0) - || ((sp1B == 3 || sp1B == 4) && (s32) sp20[0] != 0)) { - controllable_platform_hit_wall(sp1B); + if (wallDisplacement[0] == 1) { + if (((nextDirection == 1 || nextDirection == 2) && (s32) dist1[2] != 0) + || ((nextDirection == 3 || nextDirection == 4) && (s32) dist1[0] != 0)) { + controllable_platform_hit_wall(nextDirection); } else { - o->oPosX += sp20[0]; - o->oPosZ += sp20[2]; + o->oPosX += dist1[0]; + o->oPosZ += dist1[2]; } } - if (sp1C[2] == 1) { - if (((sp1B == 1 || sp1B == 2) && (s32) sp28[2] != 0) - || ((sp1B == 3 || sp1B == 4) && (s32) sp28[0] != 0)) { - controllable_platform_hit_wall(sp1B); + if (wallDisplacement[2] == 1) { + if (((nextDirection == 1 || nextDirection == 2) && (s32) dist3[2] != 0) + || ((nextDirection == 3 || nextDirection == 4) && (s32) dist3[0] != 0)) { + controllable_platform_hit_wall(nextDirection); } else { - o->oPosX += sp28[0]; - o->oPosZ += sp28[2]; + o->oPosX += dist3[0]; + o->oPosZ += dist3[2]; } } } if (!is_point_within_radius_of_mario(o->oPosX, o->oPosY, o->oPosZ, 400)) { - D_80331694 = 6; + sControllablePlatformDirectionState = 6; o->oControllablePlatformUnk100 = 1; o->oTimer = 0; } @@ -126,7 +126,7 @@ void controllable_platform_shake_on_wall_hit(void) { } if (o->oTimer == 32) { - D_80331694 = o->oControllablePlatformUnkF8; + sControllablePlatformDirectionState = o->oControllablePlatformUnkF8; o->oFaceAnglePitch = 0; o->oFaceAngleRoll = 0; o->oPosY = o->oControllablePlatformUnkFC; @@ -134,15 +134,15 @@ void controllable_platform_shake_on_wall_hit(void) { } void controllable_platform_tilt_from_mario(void) { - s16 sp1E = gMarioObject->header.gfx.pos[0] - o->oPosX; - s16 sp1C = gMarioObject->header.gfx.pos[2] - o->oPosZ; + s16 dx = gMarioObject->header.gfx.pos[0] - o->oPosX; + s16 dz = gMarioObject->header.gfx.pos[2] - o->oPosZ; if (gMarioObject->platform == o || gMarioObject->platform == cur_obj_nearest_object_with_behavior(bhvControllablePlatformSub)) { - o->oFaceAnglePitch = sp1C * 4; - o->oFaceAngleRoll = -sp1E * 4; - if (D_80331694 == 6) { - D_80331694 = 0; + o->oFaceAnglePitch = dz * 4; + o->oFaceAngleRoll = -dx * 4; + if (sControllablePlatformDirectionState == 6) { + sControllablePlatformDirectionState = 0; o->oTimer = 0; o->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE; } @@ -151,56 +151,54 @@ void controllable_platform_tilt_from_mario(void) { } void bhv_controllable_platform_loop(void) { - s8 sp54[3]; - Vec3f sp48; - Vec3f sp3C; - Vec3f sp30; + s8 wallDisplacement[3]; + Vec3f dist1, dist2, dist3; o->oAngleVelRoll = 0; o->oAngleVelPitch = 0; o->oVelX = 0; o->oVelZ = 0; - switch (D_80331694) { + switch (sControllablePlatformDirectionState) { case 0: o->oFaceAnglePitch /= 2; o->oFaceAngleRoll /= 2; if (o->oControllablePlatformUnk100 == 1 && o->oTimer > 30) { - D_80331694 = 6; + sControllablePlatformDirectionState = 6; o->oTimer = 0; } break; case 1: o->oVelZ = 10.0f; - sp54[0] = obj_find_wall_displacement(sp48, o->oPosX + 250.0, o->oPosY, o->oPosZ + 300.0, 50.0f); - sp54[1] = obj_find_wall_displacement(sp3C, o->oPosX, o->oPosY, o->oPosZ + 300.0, 50.0f); - sp54[2] = obj_find_wall_displacement(sp30, o->oPosX - 250.0, o->oPosY, o->oPosZ + 300.0, 50.0f); - controllable_platform_check_walls(2, sp54, sp48, sp3C, sp30); + wallDisplacement[0] = obj_find_wall_displacement(dist1, o->oPosX + 250.0, o->oPosY, o->oPosZ + 300.0, 50.0f); + wallDisplacement[1] = obj_find_wall_displacement(dist2, o->oPosX, o->oPosY, o->oPosZ + 300.0, 50.0f); + wallDisplacement[2] = obj_find_wall_displacement(dist3, o->oPosX - 250.0, o->oPosY, o->oPosZ + 300.0, 50.0f); + controllable_platform_check_walls(2, wallDisplacement, dist1, dist2, dist3); break; case 2: o->oVelZ = -10.0f; - sp54[0] = obj_find_wall_displacement(sp48, o->oPosX + 250.0, o->oPosY, o->oPosZ - 300.0, 50.0f); - sp54[1] = obj_find_wall_displacement(sp3C, o->oPosX, o->oPosY, o->oPosZ - 300.0, 50.0f); - sp54[2] = obj_find_wall_displacement(sp30, o->oPosX - 250.0, o->oPosY, o->oPosZ - 300.0, 50.0f); - controllable_platform_check_walls(1, sp54, sp48, sp3C, sp30); + wallDisplacement[0] = obj_find_wall_displacement(dist1, o->oPosX + 250.0, o->oPosY, o->oPosZ - 300.0, 50.0f); + wallDisplacement[1] = obj_find_wall_displacement(dist2, o->oPosX, o->oPosY, o->oPosZ - 300.0, 50.0f); + wallDisplacement[2] = obj_find_wall_displacement(dist3, o->oPosX - 250.0, o->oPosY, o->oPosZ - 300.0, 50.0f); + controllable_platform_check_walls(1, wallDisplacement, dist1, dist2, dist3); break; case 3: o->oVelX = 10.0f; - sp54[0] = obj_find_wall_displacement(sp48, o->oPosX + 300.0, o->oPosY, o->oPosZ + 250.0, 50.0f); - sp54[1] = obj_find_wall_displacement(sp3C, o->oPosX + 300.0, o->oPosY, o->oPosZ, 50.0f); - sp54[2] = obj_find_wall_displacement(sp30, o->oPosX + 300.0, o->oPosY, o->oPosZ - 250.0, 50.0f); - controllable_platform_check_walls(4, sp54, sp48, sp3C, sp30); + wallDisplacement[0] = obj_find_wall_displacement(dist1, o->oPosX + 300.0, o->oPosY, o->oPosZ + 250.0, 50.0f); + wallDisplacement[1] = obj_find_wall_displacement(dist2, o->oPosX + 300.0, o->oPosY, o->oPosZ, 50.0f); + wallDisplacement[2] = obj_find_wall_displacement(dist3, o->oPosX + 300.0, o->oPosY, o->oPosZ - 250.0, 50.0f); + controllable_platform_check_walls(4, wallDisplacement, dist1, dist2, dist3); break; case 4: o->oVelX = -10.0f; - sp54[0] = obj_find_wall_displacement(sp48, o->oPosX - 300.0, o->oPosY, o->oPosZ + 250.0, 50.0f); - sp54[1] = obj_find_wall_displacement(sp3C, o->oPosX - 300.0, o->oPosY, o->oPosZ, 50.0f); - sp54[2] = obj_find_wall_displacement(sp30, o->oPosX - 300.0, o->oPosY, o->oPosZ - 250.0, 50.0f); - controllable_platform_check_walls(3, sp54, sp48, sp3C, sp30); + wallDisplacement[0] = obj_find_wall_displacement(dist1, o->oPosX - 300.0, o->oPosY, o->oPosZ + 250.0, 50.0f); + wallDisplacement[1] = obj_find_wall_displacement(dist2, o->oPosX - 300.0, o->oPosY, o->oPosZ, 50.0f); + wallDisplacement[2] = obj_find_wall_displacement(dist3, o->oPosX - 300.0, o->oPosY, o->oPosZ - 250.0, 50.0f); + controllable_platform_check_walls(3, wallDisplacement, dist1, dist2, dist3); break; case 5: @@ -218,6 +216,6 @@ void bhv_controllable_platform_loop(void) { controllable_platform_tilt_from_mario(); o->oPosX += o->oVelX; o->oPosZ += o->oVelZ; - if (D_80331694 != 0 && D_80331694 != 6) + if (sControllablePlatformDirectionState != 0 && sControllablePlatformDirectionState != 6) cur_obj_play_sound_1(SOUND_ENV_ELEVATOR2); } diff --git a/src/game/behaviors/door.inc.c b/src/game/behaviors/door.inc.c index a02ee597..5c108784 100644 --- a/src/game/behaviors/door.inc.c +++ b/src/game/behaviors/door.inc.c @@ -12,8 +12,8 @@ static s32 sDoorOpenSounds[] = { SOUND_GENERAL_OPEN_WOOD_DOOR, SOUND_GENERAL_OPE static s32 sDoorCloseSounds[] = { SOUND_GENERAL_CLOSE_WOOD_DOOR, SOUND_GENERAL_CLOSE_IRON_DOOR }; -void door_animation_and_reset(s32 sp18) { - cur_obj_init_animation_with_sound(sp18); +void door_animation_and_reset(s32 animIndex) { + cur_obj_init_animation_with_sound(animIndex); if (cur_obj_check_if_near_animation_end()) o->oAction = 0; } @@ -27,31 +27,31 @@ void set_door_camera_event(void) { } void play_door_open_noise(void) { - s32 sp1C = cur_obj_has_model(MODEL_HMC_METAL_DOOR); + s32 isMetalDoor = cur_obj_has_model(MODEL_HMC_METAL_DOOR); if (o->oTimer == 0) { - cur_obj_play_sound_2(sDoorOpenSounds[sp1C]); + cur_obj_play_sound_2(sDoorOpenSounds[isMetalDoor]); gTimeStopState |= TIME_STOP_MARIO_OPENED_DOOR; } if (o->oTimer == 70) { - cur_obj_play_sound_2(sDoorCloseSounds[sp1C]); + cur_obj_play_sound_2(sDoorCloseSounds[isMetalDoor]); } } void play_warp_door_open_noise(void) { - s32 sp1C = cur_obj_has_model(MODEL_HMC_METAL_DOOR); + s32 isMetalDoor = cur_obj_has_model(MODEL_HMC_METAL_DOOR); if (o->oTimer == 30) - cur_obj_play_sound_2(sDoorCloseSounds[sp1C]); + cur_obj_play_sound_2(sDoorCloseSounds[isMetalDoor]); } void bhv_door_loop(void) { - s32 sp1C = 0; + s32 index = 0; - while (sDoorActions[sp1C].flag != (u32)~0) { - if (cur_obj_clear_interact_status_flag(sDoorActions[sp1C].flag)) { + while (sDoorActions[index].flag != (u32)~0) { + if (cur_obj_clear_interact_status_flag(sDoorActions[index].flag)) { set_door_camera_event(); - cur_obj_change_action(sDoorActions[sp1C].action); + cur_obj_change_action(sDoorActions[index].action); } - sp1C++; + index++; } switch (o->oAction) { @@ -110,30 +110,29 @@ void bhv_door_init(void) { } void bhv_star_door_loop_2(void) { - s32 sp4 = 0; + s32 doorIsRendering = FALSE; if (gMarioCurrentRoom != 0) { if (o->oDoorUnkF8 == gMarioCurrentRoom) - sp4 = 1; + doorIsRendering = TRUE; else if (gMarioCurrentRoom == o->oDoorUnkFC) - sp4 = 1; + doorIsRendering = TRUE; else if (gMarioCurrentRoom == o->oDoorUnk100) - sp4 = 1; + doorIsRendering = TRUE; else if (gDoorAdjacentRooms[gMarioCurrentRoom][0] == o->oDoorUnkFC) - sp4 = 1; + doorIsRendering = TRUE; else if (gDoorAdjacentRooms[gMarioCurrentRoom][0] == o->oDoorUnk100) - sp4 = 1; + doorIsRendering = TRUE; else if (gDoorAdjacentRooms[gMarioCurrentRoom][1] == o->oDoorUnkFC) - sp4 = 1; + doorIsRendering = TRUE; else if (gDoorAdjacentRooms[gMarioCurrentRoom][1] == o->oDoorUnk100) - sp4 = 1; + doorIsRendering = TRUE; } else - sp4 = 1; - if (sp4 == 1) { + doorIsRendering = TRUE; + if (doorIsRendering) { o->header.gfx.node.flags |= GRAPH_RENDER_ACTIVE; - D_8035FEE4++; - } - if (sp4 == 0) { + gDoorRenderingTimer++; + } else { o->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE; } - o->oDoorUnk88 = sp4; + o->oDoorUnk88 = doorIsRendering; } diff --git a/src/game/behaviors/elevator.inc.c b/src/game/behaviors/elevator.inc.c index 34369071..f53a91aa 100644 --- a/src/game/behaviors/elevator.inc.c +++ b/src/game/behaviors/elevator.inc.c @@ -92,8 +92,8 @@ void elevator_act_3(void) // nearly identical to action 2 } void bhv_elevator_init(void) { - s32 sp1C = sElevatorHeights[o->oBehParams2ndByte * 3 + 2]; - if (sp1C == 0) { + s32 index = sElevatorHeights[o->oBehParams2ndByte * 3 + 2]; + if (index == 0) { o->oElevatorUnkF4 = sElevatorHeights[o->oBehParams2ndByte * 3]; o->oElevatorUnkF8 = o->oHomeY; o->oElevatorUnkFC = (o->oElevatorUnkF4 + o->oElevatorUnkF8) / 2; diff --git a/src/game/behaviors/end_birds_1.inc.c b/src/game/behaviors/end_birds_1.inc.c index 532c2728..72cd9a08 100644 --- a/src/game/behaviors/end_birds_1.inc.c +++ b/src/game/behaviors/end_birds_1.inc.c @@ -1,8 +1,7 @@ // end_birds_1.inc.c void bhv_end_birds_1_loop(void) { - Vec3f sp34; - UNUSED f32 sp30 = random_float(); + Vec3f pos; switch (gCurrentObject->oAction) { case 0: @@ -13,11 +12,11 @@ void bhv_end_birds_1_loop(void) { gCurrentObject->oAction += 1; break; case 1: - vec3f_set(sp34, gCurrentObject->oIntroLakituUnk110, gCurrentObject->oIntroLakituUnk10C, + vec3f_set(pos, gCurrentObject->oIntroLakituUnk110, gCurrentObject->oIntroLakituUnk10C, gCurrentObject->oIntroLakituUnk108); if (gCurrentObject->oTimer < 100) - obj_rotate_towards_point(gCurrentObject, sp34, 0, 0, 0x20, 0x20); + obj_rotate_towards_point(gCurrentObject, pos, 0, 0, 0x20, 0x20); if ((gCurrentObject->oEndBirdUnk104 == 0.f) && (gCurrentObject->oTimer == 0)) cur_obj_play_sound_2(SOUND_GENERAL_BIRDS_FLY_AWAY); if (gCutsceneTimer == 0) diff --git a/src/game/behaviors/end_birds_2.inc.c b/src/game/behaviors/end_birds_2.inc.c index 9526448e..b0f84ccf 100644 --- a/src/game/behaviors/end_birds_2.inc.c +++ b/src/game/behaviors/end_birds_2.inc.c @@ -1,12 +1,10 @@ // end_birds_2.inc.c void bhv_end_birds_2_loop(void) { - Vec3f sp3C; - UNUSED f32 sp38; - f32 sp34; - s16 sp32, sp30; + Vec3f pos; + f32 dist; + s16 pitch, yaw; - sp38 = random_float(); gCurrentObject->oForwardVel = (random_float() * 10.f) + 25.f; switch (gCurrentObject->oAction) { @@ -15,12 +13,10 @@ void bhv_end_birds_2_loop(void) { gCurrentObject->oAction += 1; break; case 1: - vec3f_get_dist_and_angle(gCamera->pos, gCamera->focus, &sp34, &sp32, - &sp30); - sp30 += 0x1000; - sp32 += 0; // nice work, Nintendo - vec3f_set_dist_and_angle(gCamera->pos, sp3C, 14000.f, sp32, sp30); - obj_rotate_towards_point(gCurrentObject, sp3C, 0, 0, 8, 8); + vec3f_get_dist_and_angle(gCamera->pos, gCamera->focus, &dist, &pitch, &yaw); + yaw += 0x1000; + vec3f_set_dist_and_angle(gCamera->pos, pos, 14000.f, pitch, yaw); + obj_rotate_towards_point(gCurrentObject, pos, 0, 0, 8, 8); if ((gCurrentObject->oEndBirdUnk104 == 0.f) && (gCurrentObject->oTimer == 0)) cur_obj_play_sound_2(SOUND_GENERAL_BIRDS_FLY_AWAY); diff --git a/src/game/behaviors/exclamation_box.inc.c b/src/game/behaviors/exclamation_box.inc.c index 3d70e032..7c98afbd 100644 --- a/src/game/behaviors/exclamation_box.inc.c +++ b/src/game/behaviors/exclamation_box.inc.c @@ -12,7 +12,7 @@ struct ObjectHitbox sExclamationBoxHitbox = { /* hurtboxHeight: */ 30, }; -struct Struct802C0DF0 sExclamationBoxContents[] = { { 0, 0, 0, MODEL_MARIOS_WING_CAP, bhvWingCap }, +struct ExclamationBoxContents sExclamationBoxContents[] = { { 0, 0, 0, MODEL_MARIOS_WING_CAP, bhvWingCap }, { 1, 0, 0, MODEL_MARIOS_METAL_CAP, bhvMetalCap }, { 2, 0, 0, MODEL_MARIOS_CAP, bhvVanishCap }, { 3, 0, 0, MODEL_KOOPA_SHELL, bhvKoopaShell }, @@ -103,21 +103,21 @@ void exclamation_box_act_3(void) { o->oAction = 4; } -void exclamation_box_spawn_contents(struct Struct802C0DF0 *a0, u8 a1) { - struct Object *sp1C = NULL; +void exclamation_box_spawn_contents(struct ExclamationBoxContents *contentsList, u8 boxType) { + struct Object *contentsObj = NULL; - while (a0->unk0 != 99) { - if (a1 == a0->unk0) { - sp1C = spawn_object(o, a0->model, a0->behavior); - sp1C->oVelY = 20.0f; - sp1C->oForwardVel = 3.0f; - sp1C->oMoveAngleYaw = gMarioObject->oMoveAngleYaw; - o->oBehParams |= a0->unk2 << 24; - if (a0->model == MODEL_STAR) + while (contentsList->id != 99) { + if (boxType == contentsList->id) { + contentsObj = spawn_object(o, contentsList->model, contentsList->behavior); + contentsObj->oVelY = 20.0f; + contentsObj->oForwardVel = 3.0f; + contentsObj->oMoveAngleYaw = gMarioObject->oMoveAngleYaw; + o->oBehParams |= contentsList->behParams << 24; + if (contentsList->model == MODEL_STAR) o->oFlags |= OBJ_FLAG_PERSISTENT_RESPAWN; break; } - a0++; + contentsList++; } } diff --git a/src/game/behaviors/eyerok.inc.c b/src/game/behaviors/eyerok.inc.c index b22cff34..17e77a86 100644 --- a/src/game/behaviors/eyerok.inc.c +++ b/src/game/behaviors/eyerok.inc.c @@ -251,9 +251,9 @@ static void eyerok_hand_act_open(void) { o->collisionData = segmented_to_virtual(ssl_seg7_collision_070282F8); if (o->parentObj->oEyerokBossNumHands != 2) { - s16 sp1E = o->oAngleToMario; - clamp_s16(&sp1E, -0x3000, 0x3000); - o->oMoveAngleYaw = sp1E; + s16 angleToMario = o->oAngleToMario; + clamp_s16(&angleToMario, -0x3000, 0x3000); + o->oMoveAngleYaw = angleToMario; o->oForwardVel = 50.0f; } else { o->oMoveAngleYaw = 0; @@ -262,8 +262,6 @@ static void eyerok_hand_act_open(void) { } static void eyerok_hand_act_show_eye(void) { - UNUSED s16 val06; - cur_obj_init_animation_with_sound(5); cur_obj_play_sound_at_anim_range(0, 0, SOUND_OBJ_EYEROK_SHOW_EYE); @@ -272,7 +270,6 @@ static void eyerok_hand_act_show_eye(void) { if (o->oAnimState < 3) { o->oAnimState += 1; } else if (cur_obj_check_if_near_animation_end()) { - val06 = (s16)(o->oAngleToMario - o->oFaceAngleYaw) * o->oBehParams2ndByte; o->oAction = EYEROK_HAND_ACT_CLOSE; } } else { @@ -388,7 +385,7 @@ static void eyerok_hand_act_target_mario(void) { } static void eyerok_hand_act_smash(void) { - s16 sp1E; + s16 dYawToMario; if (o->oTimer > 20) { if (o->oMoveFlags & OBJ_MOVE_MASK_ON_GROUND) { @@ -396,8 +393,8 @@ static void eyerok_hand_act_smash(void) { eyerok_hand_pound_ground(); o->oGravity = -4.0f; } else { - sp1E = abs_angle_diff(o->oFaceAngleYaw, o->oAngleToMario); - if (o->oDistanceToMario < 300.0f && sp1E > 0x2000 && sp1E < 0x6000) { + dYawToMario = abs_angle_diff(o->oFaceAngleYaw, o->oAngleToMario); + if (o->oDistanceToMario < 300.0f && dYawToMario > 0x2000 && dYawToMario < 0x6000) { o->oAction = EYEROK_HAND_ACT_FIST_SWEEP; if ((s16)(o->oFaceAngleYaw - o->oAngleToMario) < 0) { o->oMoveAngleYaw = 0x4000; @@ -441,17 +438,17 @@ static void eyerok_hand_act_fist_sweep(void) { } static void eyerok_hand_act_begin_double_pound(void) { - f32 sp4; + f32 homeXOffset; if (o->parentObj->oEyerokBossUnk104 < 0 || o->parentObj->oEyerokBossActiveHand == o->oBehParams2ndByte) { o->oAction = EYEROK_HAND_ACT_DOUBLE_POUND; o->oMoveAngleYaw = (s32)(o->oFaceAngleYaw - 0x4000 * o->parentObj->oEyerokBossUnk108); } else { - sp4 = o->parentObj->oPosX + 400.0f * o->parentObj->oEyerokBossUnk108 + homeXOffset = o->parentObj->oPosX + 400.0f * o->parentObj->oEyerokBossUnk108 - 180.0f * o->oBehParams2ndByte; - o->oPosX = o->oHomeX + (sp4 - o->oHomeX) * o->parentObj->oEyerokBossUnk110; + o->oPosX = o->oHomeX + (homeXOffset - o->oHomeX) * o->parentObj->oEyerokBossUnk110; o->oPosY = o->oHomeY + 300.0f * o->parentObj->oEyerokBossUnk110; o->oPosZ = o->oHomeZ + (o->parentObj->oEyerokBossUnk10C - o->oHomeZ) * o->parentObj->oEyerokBossUnk110; diff --git a/src/game/behaviors/flamethrower.inc.c b/src/game/behaviors/flamethrower.inc.c index 8d78349e..798e6f1a 100644 --- a/src/game/behaviors/flamethrower.inc.c +++ b/src/game/behaviors/flamethrower.inc.c @@ -2,7 +2,7 @@ void bhv_flamethrower_flame_loop(void) { f32 size; - s32 sp18; + s32 remainingTime; if (o->oTimer == 0) { o->oAnimState = (s32)(random_float() * 10.0f); obj_translate_xyz_random(o, 10.0f); @@ -20,15 +20,15 @@ void bhv_flamethrower_flame_loop(void) { o->oVelY = 0; o->oPosY = o->oFloorHeight + 25.0f * size; } - sp18 = o->parentObj->oFlameThowerFlameUnk110 / 1.2; + remainingTime = o->parentObj->oFlameThowerFlameUnk110 / 1.2; } else - sp18 = o->parentObj->oFlameThowerFlameUnk110; + remainingTime = o->parentObj->oFlameThowerFlameUnk110; cur_obj_scale(size); if (o->oBehParams2ndByte == 4) o->oPosY += o->oForwardVel; // weird? else cur_obj_move_using_fvel_and_gravity(); - if (o->oTimer > sp18) + if (o->oTimer > remainingTime) obj_mark_for_deletion(o); o->oInteractStatus = 0; } @@ -36,7 +36,7 @@ void bhv_flamethrower_flame_loop(void) { void bhv_flamethrower_loop(void) { struct Object *flame; f32 flameVel; - s32 sp34; + s32 flameTimeRemaining; s32 model; UNUSED u8 pad[8]; if (o->oAction == 0) { @@ -50,14 +50,14 @@ void bhv_flamethrower_loop(void) { model = MODEL_BLUE_FLAME; if (o->oBehParams2ndByte == 2) flameVel = 50.0f; - sp34 = 1; + flameTimeRemaining = 1; if (o->oTimer < 60) - sp34 = 15; + flameTimeRemaining = 15; else if (o->oTimer < 74) - sp34 = 75 - o->oTimer; // Range: [15..2] + flameTimeRemaining = 75 - o->oTimer; // Range: [15..2] else o->oAction++; - o->oFlameThowerUnk110 = sp34; + o->oFlameThowerUnk110 = flameTimeRemaining; flame = spawn_object_relative(o->oBehParams2ndByte, 0, 0, 0, o, model, bhvFlamethrowerFlame); flame->oForwardVel = flameVel; cur_obj_play_sound_1(SOUND_AIR_BLOW_FIRE); diff --git a/src/game/behaviors/floating_platform.inc.c b/src/game/behaviors/floating_platform.inc.c index 79fe0edd..31b73602 100644 --- a/src/game/behaviors/floating_platform.inc.c +++ b/src/game/behaviors/floating_platform.inc.c @@ -1,30 +1,26 @@ // floating_platform.c.inc f32 floating_platform_find_home_y(void) { - struct Surface *sp24; - f32 sp20; - f32 sp1C; - - sp20 = find_water_level(o->oPosX, o->oPosZ); - sp1C = find_floor(o->oPosX, o->oPosY, o->oPosZ, &sp24); - if (sp20 > sp1C + o->oFloatingPlatformUnkFC) { + struct Surface *floor; + f32 waterLevel = find_water_level(o->oPosX, o->oPosZ); + f32 floorHeight = find_floor(o->oPosX, o->oPosY, o->oPosZ, &floor); + if (waterLevel > floorHeight + o->oFloatingPlatformUnkFC) { o->oFloatingPlatformUnkF4 = 0; - return sp20 + o->oFloatingPlatformUnkFC; + return waterLevel + o->oFloatingPlatformUnkFC; } else { o->oFloatingPlatformUnkF4 = 1; - return sp1C + o->oFloatingPlatformUnkFC; + return floorHeight + o->oFloatingPlatformUnkFC; } } void floating_platform_act_0(void) { - s16 sp6 = (gMarioObject->header.gfx.pos[0] - o->oPosX) * coss(-1*o->oMoveAngleYaw) - + (gMarioObject->header.gfx.pos[2] - o->oPosZ) * sins(-1*o->oMoveAngleYaw); - s16 sp4 = (gMarioObject->header.gfx.pos[2] - o->oPosZ) * coss(-1*o->oMoveAngleYaw) - - (gMarioObject->header.gfx.pos[0] - o->oPosX) * sins(-1*o->oMoveAngleYaw); - if (gMarioObject->platform == o) { - o->oFaceAnglePitch = sp4 * 2; - o->oFaceAngleRoll = -sp6 * 2; + f32 dx = gMarioObject->header.gfx.pos[0] - o->oPosX; + f32 dz = gMarioObject->header.gfx.pos[2] - o->oPosZ; + f32 cy = coss(-o->oMoveAngleYaw); + f32 sy = sins(-o->oMoveAngleYaw); + o->oFaceAnglePitch = (dz * cy + dx * sy) * 2; + o->oFaceAngleRoll = -(dx * cy + dz * sy) * 2; o->oVelY -= 1.0f; if (o->oVelY < 0.0f) o->oVelY = 0.0f; diff --git a/src/game/behaviors/flying_bookend_switch.inc.c b/src/game/behaviors/flying_bookend_switch.inc.c index 370265de..8fb2e1bd 100644 --- a/src/game/behaviors/flying_bookend_switch.inc.c +++ b/src/game/behaviors/flying_bookend_switch.inc.c @@ -1,8 +1,8 @@ // flying_bookend_switch.inc.c -struct Struct80331B30 { - s16 unk00; - s16 unk02; +struct BookSwitchPosition { + s16 relPosX; + s16 relPosY; }; struct ObjectHitbox sFlyingBookendHitbox = { @@ -17,7 +17,7 @@ struct ObjectHitbox sFlyingBookendHitbox = { /* hurtboxHeight: */ 30, }; -struct Struct80331B30 D_80331B30[] = { +struct BookSwitchPosition sBookSwitchPositions[] = { { 52, 150 }, { 135, 3 }, { -75, 78 }, @@ -128,13 +128,13 @@ void bhv_flying_bookend_loop(void) { } void bhv_bookend_spawn_loop(void) { - struct Object *sp1C; + struct Object *bookendObj; if (!(o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM)) { if (o->oTimer > 40 && obj_is_near_to_and_facing_mario(600.0f, 0x2000)) { - sp1C = spawn_object(o, MODEL_BOOKEND, bhvFlyingBookend); - if (sp1C != NULL) { - sp1C->oAction = 3; + bookendObj = spawn_object(o, MODEL_BOOKEND, bhvFlyingBookend); + if (bookendObj != NULL) { + bookendObj->oAction = 3; cur_obj_play_sound_2(SOUND_OBJ_DEFAULT_DEATH); } o->oTimer = 0; @@ -143,11 +143,11 @@ void bhv_bookend_spawn_loop(void) { } void bookshelf_manager_act_0(void) { - s32 val04; + s32 i; if (!(o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM)) { - for (val04 = 0; val04 < 3; val04++) { - spawn_object_relative(val04, D_80331B30[val04].unk00, D_80331B30[val04].unk02, 0, o, + for (i = 0; i < 3; i++) { + spawn_object_relative(i, sBookSwitchPositions[i].relPosX, sBookSwitchPositions[i].relPosY, 0, o, MODEL_BOOKEND, bhvBookSwitch); } @@ -231,10 +231,10 @@ void bhv_haunted_bookshelf_manager_loop(void) { } void bhv_book_switch_loop(void) { - s32 sp3C; - struct Object *sp38; - s16 sp36; - s16 sp34; + s32 attackType; + struct Object *bookendObj; + s16 rand01; + s16 z; o->header.gfx.scale[0] = 2.0f; o->header.gfx.scale[1] = 0.9f; @@ -242,7 +242,7 @@ void bhv_book_switch_loop(void) { if (o->parentObj->oAction == 4) { obj_mark_for_deletion(o); } else { - sp3C = obj_check_attacks(&sBookSwitchHitbox, o->oAction); + attackType = obj_check_attacks(&sBookSwitchHitbox, o->oAction); if (o->parentObj->oBookSwitchManagerUnkF8 != 0 || o->oAction == 1) { if (o->oDistanceToMario < 100.0f) { cur_obj_become_tangible(); @@ -257,7 +257,7 @@ void bhv_book_switch_loop(void) { if (approach_f32_ptr(&o->oBookSwitchUnkF4, 50.0f, 20.0f)) { if (o->parentObj->oBookSwitchManagerUnkF4 >= 0 && o->oTimer > 60) { - if (sp3C == 1 || sp3C == 2 || sp3C == 6) { + if (attackType == 1 || attackType == 2 || attackType == 6) { o->oAction = 2; } } @@ -272,20 +272,20 @@ void bhv_book_switch_loop(void) { play_sound(SOUND_GENERAL2_RIGHT_ANSWER, gGlobalSoundSource); o->parentObj->oBookSwitchManagerUnkF4 += 1; } else { - sp36 = random_u16() & 0x1; - sp34 = gMarioObject->oPosZ + 1.5f * gMarioStates[0].vel[2]; + rand01 = random_u16() & 0x1; + z = gMarioObject->oPosZ + 1.5f * gMarioStates[0].vel[2]; play_sound(SOUND_MENU_CAMERA_BUZZ, gGlobalSoundSource); - if (sp34 > 0) { - sp34 = 0; + if (z > 0) { + z = 0; } - sp38 = spawn_object_abs_with_rot(o, 0, MODEL_BOOKEND, bhvFlyingBookend, - 0x1FC * sp36 - 0x8CA, 890, sp34, 0, - 0x8000 * sp36 + 0x4000, 0); + bookendObj = spawn_object_abs_with_rot(o, 0, MODEL_BOOKEND, bhvFlyingBookend, + 0x1FC * rand01 - 0x8CA, 890, z, 0, + 0x8000 * rand01 + 0x4000, 0); - if (sp38 != NULL) { - sp38->oAction = 3; + if (bookendObj != NULL) { + bookendObj->oAction = 3; } o->parentObj->oBookSwitchManagerUnkF4 = -1; diff --git a/src/game/behaviors/grand_star.inc.c b/src/game/behaviors/grand_star.inc.c index 29c71c49..7069ed19 100644 --- a/src/game/behaviors/grand_star.inc.c +++ b/src/game/behaviors/grand_star.inc.c @@ -20,9 +20,7 @@ void grand_star_zero_velocity(void) { } void bhv_grand_star_loop(void) { - UNUSED s32 unused; - Vec3f sp28; - sp28[0] = sp28[1] = sp28[2] = 0.0f; + Vec3f dest = { 0.0f, 0.0f, 0.0f }; if (o->oAction == 0) { if (o->oTimer == 0) { obj_set_angle(o, 0, 0, 0); @@ -36,7 +34,7 @@ void bhv_grand_star_loop(void) { if (o->oTimer == 0) { cur_obj_play_sound_2(SOUND_GENERAL_GRAND_STAR); cutscene_object(CUTSCENE_STAR_SPAWN, o); - o->oGrandStarUnk108 = arc_to_goal_pos(sp28, &o->oPosX, 80.0f, -2.0f); + o->oGrandStarUnk108 = arc_to_goal_pos(dest, &o->oPosX, 80.0f, -2.0f); } cur_obj_move_using_fvel_and_gravity(); if (o->oSubAction == 0) { diff --git a/src/game/behaviors/haunted_chair.inc.c b/src/game/behaviors/haunted_chair.inc.c index 398d2283..509f7319 100644 --- a/src/game/behaviors/haunted_chair.inc.c +++ b/src/game/behaviors/haunted_chair.inc.c @@ -13,34 +13,34 @@ struct ObjectHitbox sHauntedChairHitbox = { }; void bhv_haunted_chair_init(void) { - struct Object *val04; - f32 val00; + struct Object *pianoObj; + f32 dist; - val04 = cur_obj_find_nearest_object_with_behavior(bhvMadPiano, &val00); - if (val04 != NULL && val00 < 300.0f) { - o->parentObj = val04; + pianoObj = cur_obj_find_nearest_object_with_behavior(bhvMadPiano, &dist); + if (pianoObj != NULL && dist < 300.0f) { + o->parentObj = pianoObj; } else { o->oHauntedChairUnkF4 = 1; } } void haunted_chair_act_0(void) { - s16 val0E; + s16 dAngleToPiano; if (o->parentObj != o) { if (o->oHauntedChairUnk104 == 0) { if (lateral_dist_between_objects(o, o->parentObj) < 250.0f) { - val0E = obj_angle_to_object(o, o->parentObj) - o->oFaceAngleYaw + 0x2000; - if (val0E & 0x4000) { + dAngleToPiano = obj_angle_to_object(o, o->parentObj) - o->oFaceAngleYaw + 0x2000; + if (dAngleToPiano & 0x4000) { o->oHauntedChairUnk100 = &o->oFaceAngleRoll; - if (val0E > 0) { + if (dAngleToPiano > 0) { o->oHauntedChairUnk104 = 0x4000; } else { o->oHauntedChairUnk104 = -0x4000; } } else { o->oHauntedChairUnk100 = &o->oFaceAnglePitch; - if (val0E < 0) { + if (dAngleToPiano < 0) { o->oHauntedChairUnk104 = 0x5000; } else { o->oHauntedChairUnk104 = -0x4000; @@ -64,19 +64,19 @@ void haunted_chair_act_0(void) { o->oTimer = 0.0f; } else { if ((o->oTimer & 0x8) != 0) { - f32 val08; + f32 offset; if (o->oFaceAnglePitch < 0) { cur_obj_play_sound_2(SOUND_GENERAL_HAUNTED_CHAIR_MOVE); - val08 = 4.0f; + offset = 4.0f; } else { - val08 = -4.0f; + offset = -4.0f; } - o->oHomeX -= val08; - o->oHomeZ -= val08; + o->oHomeX -= offset; + o->oHomeZ -= offset; - o->oFaceAnglePitch = o->oFaceAngleRoll = (s32)(50.0f * val08); + o->oFaceAnglePitch = o->oFaceAngleRoll = (s32)(50.0f * offset); } else { o->oFaceAnglePitch = o->oFaceAngleRoll = 0; } diff --git a/src/game/behaviors/heave_ho.inc.c b/src/game/behaviors/heave_ho.inc.c index 74daefeb..7dbd5092 100644 --- a/src/game/behaviors/heave_ho.inc.c +++ b/src/game/behaviors/heave_ho.inc.c @@ -1,7 +1,7 @@ // heave_ho.c.inc -s16 D_8032F460[][2] = { { 30, 0 }, { 42, 1 }, { 52, 0 }, { 64, 1 }, { 74, 0 }, - { 86, 1 }, { 96, 0 }, { 108, 1 }, { 118, 0 }, { -1, 0 }, }; +s16 sHeaveHoTimings[][2] = { { 30, 0 }, { 42, 1 }, { 52, 0 }, { 64, 1 }, { 74, 0 }, + { 86, 1 }, { 96, 0 }, { 108, 1 }, { 118, 0 }, { -1, 0 }, }; void bhv_heave_ho_throw_mario_loop(void) { o->oParentRelativePosX = 200.0f; @@ -24,19 +24,19 @@ void bhv_heave_ho_throw_mario_loop(void) { } void heave_ho_act_1(void) { - s32 sp1C = 0; + s32 i = 0; o->oForwardVel = 0.0f; cur_obj_reverse_animation(); while (TRUE) { - if (D_8032F460[sp1C][0] == -1) { + if (sHeaveHoTimings[i][0] == -1) { o->oAction = 2; break; } - if (o->oTimer < D_8032F460[sp1C][0]) { - cur_obj_init_animation_with_accel_and_sound(2, D_8032F460[sp1C][1]); + if (o->oTimer < sHeaveHoTimings[i][0]) { + cur_obj_init_animation_with_accel_and_sound(2, sHeaveHoTimings[i][1]); break; } - sp1C++; + i++; } } diff --git a/src/game/behaviors/hidden_star.inc.c b/src/game/behaviors/hidden_star.inc.c index 344e8962..df0175db 100644 --- a/src/game/behaviors/hidden_star.inc.c +++ b/src/game/behaviors/hidden_star.inc.c @@ -1,18 +1,17 @@ // hidden_star.c.inc void bhv_hidden_star_init(void) { - s16 sp36; - struct Object *sp30; + s16 remainingTriggers; + struct Object *starObj; - sp36 = count_objects_with_behavior(bhvHiddenStarTrigger); - if (sp36 == 0) { - sp30 = - spawn_object_abs_with_rot(o, 0, MODEL_STAR, bhvStar, o->oPosX, o->oPosY, o->oPosZ, 0, 0, 0); - sp30->oBehParams = o->oBehParams; + remainingTriggers = count_objects_with_behavior(bhvHiddenStarTrigger); + if (remainingTriggers == 0) { + starObj = spawn_object_abs_with_rot(o, 0, MODEL_STAR, bhvStar, o->oPosX, o->oPosY, o->oPosZ, 0, 0, 0); + starObj->oBehParams = o->oBehParams; o->activeFlags = ACTIVE_FLAG_DEACTIVATED; } - o->oHiddenStarTriggerCounter = 5 - sp36; + o->oHiddenStarTriggerCounter = 5 - remainingTriggers; } void bhv_hidden_star_loop(void) { diff --git a/src/game/behaviors/hoot.inc.c b/src/game/behaviors/hoot.inc.c index 95692e58..9ed59ff3 100644 --- a/src/game/behaviors/hoot.inc.c +++ b/src/game/behaviors/hoot.inc.c @@ -11,16 +11,10 @@ void bhv_hoot_init(void) { cur_obj_become_intangible(); } -// sp28 = arg0 -// sp2c = arg1 - -f32 hoot_find_next_floor(struct FloorGeometry **arg0, f32 arg1) { - f32 sp24 = arg1 * sins(o->oMoveAngleYaw) + o->oPosX; - UNUSED f32 sp20 = o->oPosY; - f32 sp1c = arg1 * coss(o->oMoveAngleYaw) + o->oPosZ; - f32 floorY = find_floor_height_and_data(sp24, 10000.0f, sp1c, arg0); - - return floorY; +f32 hoot_find_next_floor(struct FloorGeometry **floor, f32 dist) { + f32 nextX = dist * sins(o->oMoveAngleYaw) + o->oPosX; + f32 nextZ = dist * coss(o->oMoveAngleYaw) + o->oPosZ; + return find_floor_height_and_data(nextX, 10000.0f, nextZ, floor); } void hoot_floor_bounce(void) { @@ -42,14 +36,11 @@ void hoot_floor_bounce(void) { o->oMoveAnglePitch = -21845; } -// sp30 = fastOscY -// sp34 = speed - void hoot_free_step(s16 fastOscY, s32 speed) { - struct FloorGeometry *sp2c; + struct FloorGeometry *floor; s16 yaw = o->oMoveAngleYaw; s16 pitch = o->oMoveAnglePitch; - s16 sp26 = o->header.gfx.animInfo.animFrame; + s16 animFrame = o->header.gfx.animInfo.animFrame; f32 xPrev = o->oPosX; f32 zPrev = o->oPosZ; f32 hSpeed; @@ -61,25 +52,24 @@ void hoot_free_step(s16 fastOscY, s32 speed) { o->oPosX += o->oVelX; if (fastOscY == 0) - o->oPosY -= o->oVelY + coss((s32)(sp26 * 3276.8)) * 50.0f / 4; + o->oPosY -= o->oVelY + coss((s32)(animFrame * 3276.8)) * 50.0f / 4; else - o->oPosY -= o->oVelY + coss((s32)(sp26 * 6553.6)) * 50.0f / 4; + o->oPosY -= o->oVelY + coss((s32)(animFrame * 6553.6)) * 50.0f / 4; o->oPosZ += o->oVelZ; - find_floor_height_and_data(o->oPosX, o->oPosY, o->oPosZ, &sp2c); - if (sp2c == NULL) { + find_floor_height_and_data(o->oPosX, o->oPosY, o->oPosZ, &floor); + if (floor == NULL) { o->oPosX = xPrev; o->oPosZ = zPrev; } - if (sp26 == 0) + if (animFrame == 0) cur_obj_play_sound_2(SOUND_GENERAL_SWISH_WATER); } void hoot_player_set_yaw(void) { s16 stickX = gPlayer3Controller->rawStickX; s16 stickY = gPlayer3Controller->rawStickY; - UNUSED s16 pitch = o->oMoveAnglePitch; if (stickX < 10 && stickX >= -9) stickX = 0; if (stickY < 10 && stickY >= -9) @@ -88,14 +78,10 @@ void hoot_player_set_yaw(void) { o->oMoveAngleYaw -= 5 * stickX; } -// sp28 = speed -// sp2c = xPrev -// sp30 = zPrev - void hoot_carry_step(s32 speed, UNUSED f32 xPrev, UNUSED f32 zPrev) { s16 yaw = o->oMoveAngleYaw; s16 pitch = o->oMoveAnglePitch; - s16 sp22 = o->header.gfx.animInfo.animFrame; + s16 animFrame = o->header.gfx.animInfo.animFrame; f32 hSpeed; o->oVelY = sins(pitch) * speed; @@ -104,19 +90,15 @@ void hoot_carry_step(s32 speed, UNUSED f32 xPrev, UNUSED f32 zPrev) { o->oVelZ = coss(yaw) * hSpeed; o->oPosX += o->oVelX; - o->oPosY -= o->oVelY + coss((s32)(sp22 * 6553.6)) * 50.0f / 4; + o->oPosY -= o->oVelY + coss((s32)(animFrame * 6553.6)) * 50.0f / 4; o->oPosZ += o->oVelZ; - if (sp22 == 0) + if (animFrame == 0) cur_obj_play_sound_2(SOUND_GENERAL_SWISH_WATER); } -// sp48 = xPrev -// sp4c = yPrev -// sp50 = zPrev - void hoot_surface_collision(f32 xPrev, UNUSED f32 yPrev, f32 zPrev) { - struct FloorGeometry *sp44; + struct FloorGeometry *floor; struct WallCollisionData hitbox; f32 floorY; @@ -133,8 +115,8 @@ void hoot_surface_collision(f32 xPrev, UNUSED f32 yPrev, f32 zPrev) { gMarioObject->oInteractStatus |= INT_STATUS_MARIO_UNK7; /* bit 7 */ } - floorY = find_floor_height_and_data(o->oPosX, o->oPosY, o->oPosZ, &sp44); - if (sp44 == NULL) { + floorY = find_floor_height_and_data(o->oPosX, o->oPosY, o->oPosZ, &floor); + if (floor == NULL) { o->oPosX = xPrev; o->oPosZ = zPrev; return; @@ -148,9 +130,6 @@ void hoot_surface_collision(f32 xPrev, UNUSED f32 yPrev, f32 zPrev) { o->oPosY = floorY + 125.0f; } -// sp28 = xPrev -// sp2c = zPrev - void hoot_act_ascent(f32 xPrev, f32 zPrev) { f32 negX = 0 - o->oPosX; f32 negZ = 0 - o->oPosZ; diff --git a/src/game/behaviors/intro_lakitu.inc.c b/src/game/behaviors/intro_lakitu.inc.c index 7b12a651..963064f8 100644 --- a/src/game/behaviors/intro_lakitu.inc.c +++ b/src/game/behaviors/intro_lakitu.inc.c @@ -58,7 +58,7 @@ s32 intro_lakitu_set_pos_and_focus(struct Object *o, struct CutsceneSplinePoint } void bhv_intro_lakitu_loop(void) { - Vec3f sp64, sp58, sp4C; + Vec3f offset, fromPoint, toPoint; UNUSED u32 pad[4]; switch (gCurrentObject->oAction) { @@ -137,23 +137,23 @@ void bhv_intro_lakitu_loop(void) { case 3: cur_obj_play_sound_1(SOUND_AIR_LAKITU_FLY_HIGHPRIO); - vec3f_set(sp58, -1128.f, 560.f, 4664.f); + vec3f_set(fromPoint, -1128.f, 560.f, 4664.f); gCurrentObject->oMoveAngleYaw += 0x200; gCurrentObject->oIntroLakituUnk100 = approach_f32_asymptotic(gCurrentObject->oIntroLakituUnk100, 100.f, 0.03f); gCurrentObject->oFaceAnglePitch = atan2s(200.f, gCurrentObject->oPosY - 400.f); gCurrentObject->oFaceAngleYaw = approach_s16_asymptotic( gCurrentObject->oFaceAngleYaw, gCurrentObject->oMoveAngleYaw + 0x8000, 4); - vec3f_set_dist_and_angle(sp58, sp4C, gCurrentObject->oIntroLakituUnk100, 0, + vec3f_set_dist_and_angle(fromPoint, toPoint, gCurrentObject->oIntroLakituUnk100, 0, gCurrentObject->oMoveAngleYaw); - sp4C[1] += 150.f * coss((s16) gCurrentObject->oIntroLakituUnk104); + toPoint[1] += 150.f * coss((s16) gCurrentObject->oIntroLakituUnk104); gCurrentObject->oIntroLakituUnk104 += gCurrentObject->oIntroLakituUnk108; gCurrentObject->oIntroLakituUnk108 = approach_f32_asymptotic(gCurrentObject->oIntroLakituUnk108, 512.f, 0.05f); - sp4C[0] += gCurrentObject->oIntroLakituUnk10C; + toPoint[0] += gCurrentObject->oIntroLakituUnk10C; gCurrentObject->oIntroLakituUnk10C = approach_f32_asymptotic(gCurrentObject->oIntroLakituUnk10C, 0.f, 0.05f); - vec3f_to_object_pos(gCurrentObject, sp4C); + vec3f_to_object_pos(gCurrentObject, toPoint); if (gCurrentObject->oTimer == 31) { gCurrentObject->oPosY -= 158.f; @@ -178,9 +178,9 @@ void bhv_intro_lakitu_loop(void) { break; case 100: cur_obj_enable_rendering(); - vec3f_set(sp64, -100.f, 100.f, 300.f); - offset_rotated(sp4C, gCamera->pos, sp64, sMarioCamState->faceAngle); - vec3f_to_object_pos(gCurrentObject, sp4C); + vec3f_set(offset, -100.f, 100.f, 300.f); + offset_rotated(toPoint, gCamera->pos, offset, sMarioCamState->faceAngle); + vec3f_to_object_pos(gCurrentObject, toPoint); gCurrentObject->oMoveAnglePitch = 0x1000; gCurrentObject->oMoveAngleYaw = 0x9000; gCurrentObject->oFaceAnglePitch = gCurrentObject->oMoveAnglePitch / 2; @@ -189,14 +189,14 @@ void bhv_intro_lakitu_loop(void) { break; case 101: - object_pos_to_vec3f(sp4C, gCurrentObject); + object_pos_to_vec3f(toPoint, gCurrentObject); if (gCurrentObject->oTimer > 60) { gCurrentObject->oForwardVel = approach_f32_asymptotic(gCurrentObject->oForwardVel, -10.f, 0.05f); gCurrentObject->oMoveAngleYaw += 0x78; gCurrentObject->oMoveAnglePitch += 0x40; gCurrentObject->oFaceAngleYaw = camera_approach_s16_symmetric( - gCurrentObject->oFaceAngleYaw, (s16) calculate_yaw(sp4C, gCamera->pos), + gCurrentObject->oFaceAngleYaw, (s16) calculate_yaw(toPoint, gCamera->pos), 0x200); } if (gCurrentObject->oTimer > 105) { @@ -208,11 +208,11 @@ void bhv_intro_lakitu_loop(void) { break; case 102: - object_pos_to_vec3f(sp4C, gCurrentObject); + object_pos_to_vec3f(toPoint, gCurrentObject); gCurrentObject->oForwardVel = approach_f32_asymptotic(gCurrentObject->oForwardVel, 60.f, 0.05f); gCurrentObject->oFaceAngleYaw = camera_approach_s16_symmetric( - gCurrentObject->oFaceAngleYaw, (s16) calculate_yaw(sp4C, gCamera->pos), 0x200); + gCurrentObject->oFaceAngleYaw, (s16) calculate_yaw(toPoint, gCamera->pos), 0x200); if (gCurrentObject->oTimer < 62) gCurrentObject->oMoveAngleYaw = approach_s16_asymptotic(gCurrentObject->oMoveAngleYaw, 0x1800, 0x1E); diff --git a/src/game/behaviors/intro_scene.inc.c b/src/game/behaviors/intro_scene.inc.c index 7b6a2475..6b1136f9 100644 --- a/src/game/behaviors/intro_scene.inc.c +++ b/src/game/behaviors/intro_scene.inc.c @@ -3,24 +3,24 @@ void spawn_child_obj_relative(struct Object *parent, s16 xOffset, s16 yOffset, s16 zOffset, s16 pitchOffset, s16 yawOffset, s16 rollOffset, s16 forwardVel, s32 model, const BehaviorScript *behavior) { - struct Object *sp1C = spawn_object(parent, model, behavior); + struct Object *obj = spawn_object(parent, model, behavior); - sp1C->header.gfx.animInfo.animFrame = random_float() * 6.f; - sp1C->oEndBirdUnk104 = sCutsceneVars[9].point[0]; + obj->header.gfx.animInfo.animFrame = random_float() * 6.f; + obj->oEndBirdUnk104 = sCutsceneVars[9].point[0]; sCutsceneVars[9].point[0] += 1.f; - sp1C->oPosX += xOffset; - sp1C->oPosY += yOffset; + obj->oPosX += xOffset; + obj->oPosY += yOffset; if (gCutsceneTimer > 700) - sp1C->oPosY += -150.f; - sp1C->oPosZ += zOffset; - sp1C->oMoveAnglePitch += pitchOffset; - sp1C->oMoveAngleYaw += yawOffset; - sp1C->oMoveAngleRoll += rollOffset; - sp1C->oForwardVel = forwardVel; + obj->oPosY += -150.f; + obj->oPosZ += zOffset; + obj->oMoveAnglePitch += pitchOffset; + obj->oMoveAngleYaw += yawOffset; + obj->oMoveAngleRoll += rollOffset; + obj->oForwardVel = forwardVel; } void bhv_intro_scene_loop(void) { - UNUSED struct Object *sp34; + UNUSED struct Object *obj; if (gCutsceneObjSpawn != 0) { gCurrentObject->oPosX = gCamera->pos[0]; @@ -31,10 +31,10 @@ void bhv_intro_scene_loop(void) { switch (gCutsceneObjSpawn) { case 6: - sp34 = spawn_object(gCurrentObject, MODEL_LAKITU, bhvBeginningLakitu); + obj = spawn_object(gCurrentObject, MODEL_LAKITU, bhvBeginningLakitu); break; case 5: - sp34 = spawn_object(gCurrentObject, MODEL_PEACH, bhvBeginningPeach); + obj = spawn_object(gCurrentObject, MODEL_PEACH, bhvBeginningPeach); break; case 7: spawn_child_obj_relative(gCurrentObject, 0, 205, 500, 0x1000, 0x6000, -0x1E00, 25, MODEL_BIRDS, diff --git a/src/game/behaviors/jrb_ship.inc.c b/src/game/behaviors/jrb_ship.inc.c index 4f805aec..1d5fc2db 100644 --- a/src/game/behaviors/jrb_ship.inc.c +++ b/src/game/behaviors/jrb_ship.inc.c @@ -21,59 +21,46 @@ void bhv_sunken_ship_part_loop(void) { } void bhv_ship_part_3_loop(void) { - s16 sp1E = o->oFaceAnglePitch; - s16 sp1C = o->oFaceAngleRoll; + s16 initialPitch = o->oFaceAnglePitch; + s16 initialRoll = o->oFaceAngleRoll; cur_obj_set_pos_to_home_with_debug(); o->oShipPart3UnkF4 += 0x100; o->oFaceAnglePitch = sins(o->oShipPart3UnkF4) * 1024.0f; o->oFaceAngleRoll = sins(o->oShipPart3UnkF8) * 1024.0f; - o->oAngleVelPitch = o->oFaceAnglePitch - sp1E; - o->oAngleVelRoll = o->oFaceAngleRoll - sp1C; + o->oAngleVelPitch = o->oFaceAnglePitch - initialPitch; + o->oAngleVelRoll = o->oFaceAngleRoll - initialRoll; if (gMarioObject->oPosY > 1000.0f) cur_obj_play_sound_1(SOUND_ENV_BOAT_ROCKING1); } void bhv_jrb_sliding_box_loop(void) { - Mat4 sp60; - Vec3f sp54; - Vec3f sp48; - Vec3s sp40; - struct Object *sp3C; - struct Surface *sp38; - UNUSED Vec3f sp2C; - Vec3f sp20; - s16 sp1E = 0; + Mat4 mtx; + Vec3f shipToBoxPos1; + Vec3f shipToBoxPos2; + Vec3s shipRotation; + struct Object *shipObj; if (o->oJrbSlidingBoxUnkF4 == NULL) { - sp3C = cur_obj_nearest_object_with_behavior(bhvInSunkenShip3); - if (sp3C != NULL) // NULL check only for assignment, not for dereference? - o->oJrbSlidingBoxUnkF4 = sp3C; - o->oParentRelativePosX = o->oPosX - sp3C->oPosX; - o->oParentRelativePosY = o->oPosY - sp3C->oPosY; - o->oParentRelativePosZ = o->oPosZ - sp3C->oPosZ; + shipObj = cur_obj_nearest_object_with_behavior(bhvInSunkenShip3); + if (shipObj != NULL) { + o->oJrbSlidingBoxUnkF4 = shipObj; + o->oParentRelativePosX = o->oPosX - shipObj->oPosX; + o->oParentRelativePosY = o->oPosY - shipObj->oPosY; + o->oParentRelativePosZ = o->oPosZ - shipObj->oPosZ; + } } else { - sp3C = o->oJrbSlidingBoxUnkF4; - sp40[0] = sp3C->oFaceAnglePitch; - sp40[1] = sp3C->oFaceAngleYaw; - sp40[2] = sp3C->oFaceAngleRoll; - sp54[0] = o->oParentRelativePosX; - sp54[1] = o->oParentRelativePosY; - sp54[2] = o->oParentRelativePosZ; - mtxf_rotate_zxy_and_translate(sp60, sp54, sp40); - linear_mtxf_mul_vec3f(sp60, sp48, sp54); - o->oPosX = sp3C->oPosX + sp48[0]; - o->oPosY = sp3C->oPosY + sp48[1]; - o->oPosZ = sp3C->oPosZ + sp48[2]; - sp1E = sp3C->oFaceAnglePitch; - } - sp20[0] = o->oPosX; - sp20[1] = o->oPosY; - sp20[2] = o->oPosZ; - find_floor(sp20[0], sp20[1], sp20[2], &sp38); - if (sp38 != NULL) { - sp2C[0] = sp38->normal.x; - sp2C[1] = sp38->normal.y; - sp2C[2] = sp38->normal.z; - o->oFaceAnglePitch = sp1E; + shipObj = o->oJrbSlidingBoxUnkF4; + shipRotation[0] = shipObj->oFaceAnglePitch; + shipRotation[1] = shipObj->oFaceAngleYaw; + shipRotation[2] = shipObj->oFaceAngleRoll; + shipToBoxPos1[0] = o->oParentRelativePosX; + shipToBoxPos1[1] = o->oParentRelativePosY; + shipToBoxPos1[2] = o->oParentRelativePosZ; + mtxf_rotate_zxy_and_translate(mtx, shipToBoxPos1, shipRotation); + linear_mtxf_mul_vec3f(mtx, shipToBoxPos2, shipToBoxPos1); + o->oPosX = shipObj->oPosX + shipToBoxPos2[0]; + o->oPosY = shipObj->oPosY + shipToBoxPos2[1]; + o->oPosZ = shipObj->oPosZ + shipToBoxPos2[2]; + o->oFaceAnglePitch = shipObj->oFaceAnglePitch; } o->oJrbSlidingBoxUnkFC = sins(o->oJrbSlidingBoxUnkF8) * 20.0f; o->oJrbSlidingBoxUnkF8 += 0x100; diff --git a/src/game/behaviors/kickable_board.inc.c b/src/game/behaviors/kickable_board.inc.c index 8ba05e54..2821debc 100644 --- a/src/game/behaviors/kickable_board.inc.c +++ b/src/game/behaviors/kickable_board.inc.c @@ -1,6 +1,6 @@ // kickable_board.c.inc -s32 check_mario_attacking(UNUSED s32 sp18) { +s32 check_mario_attacking(void) { if (obj_check_if_collided_with_object(o, gMarioObject)) { if (abs_angle_diff(o->oMoveAngleYaw, gMarioObject->oMoveAngleYaw) > 0x6000) { if (gMarioStates[0].action == ACT_SLIDE_KICK) @@ -26,11 +26,11 @@ void init_kickable_board_rock(void) { } void bhv_kickable_board_loop(void) { - s32 sp24; + s32 attackValue; switch (o->oAction) { case 0: o->oFaceAnglePitch = 0; - if (check_mario_attacking(0)) { + if (check_mario_attacking()) { init_kickable_board_rock(); o->oAction++; } @@ -40,8 +40,8 @@ void bhv_kickable_board_loop(void) { o->oFaceAnglePitch = 0; load_object_collision_model(); o->oFaceAnglePitch = -sins(o->oKickableBoardF4) * o->oKickableBoardF8; - if (o->oTimer > 30 && (sp24 = check_mario_attacking(0))) { - if (gMarioObject->oPosY > o->oPosY + 160.0f && sp24 == 2) { + if (o->oTimer > 30 && (attackValue = check_mario_attacking())) { + if (gMarioObject->oPosY > o->oPosY + 160.0f && attackValue == 2) { o->oAction++; cur_obj_play_sound_2(SOUND_GENERAL_BUTTON_PRESS_2); } else diff --git a/src/game/behaviors/king_bobomb.inc.c b/src/game/behaviors/king_bobomb.inc.c index 7741c64b..4718477e 100644 --- a/src/game/behaviors/king_bobomb.inc.c +++ b/src/game/behaviors/king_bobomb.inc.c @@ -2,15 +2,15 @@ // Copy of geo_update_projectile_pos_from_parent Gfx *geo_update_held_mario_pos(s32 run, UNUSED struct GraphNode *node, Mat4 mtx) { - Mat4 sp20; - struct Object *sp1C; + Mat4 mtx2; + struct Object *obj; if (run == TRUE) { - sp1C = (struct Object *) gCurGraphNodeObject; - if (sp1C->prevObj != NULL) { - create_transformation_from_matrices(sp20, mtx, *gCurGraphNodeCamera->matrixPtr); - obj_update_pos_from_parent_transformation(sp20, sp1C->prevObj); - obj_set_gfx_pos_from_pos(sp1C->prevObj); + obj = (struct Object *) gCurGraphNodeObject; + if (obj->prevObj != NULL) { + create_transformation_from_matrices(mtx2, mtx, *gCurGraphNodeCamera->matrixPtr); + obj_update_pos_from_parent_transformation(mtx2, obj->prevObj); + obj_set_gfx_pos_from_pos(obj->prevObj); } } return NULL; @@ -305,9 +305,6 @@ void king_bobomb_move(void) { } void bhv_king_bobomb_loop(void) { - f32 sp34 = 20.0f; - f32 sp30 = 50.0f; - UNUSED u8 pad[8]; o->oInteractionSubtype |= INT_SUBTYPE_GRABS_MARIO; switch (o->oHeldState) { case HELD_FREE: @@ -318,7 +315,7 @@ void bhv_king_bobomb_loop(void) { break; case HELD_THROWN: case HELD_DROPPED: - cur_obj_get_thrown_or_placed(sp34, sp30, 4); + cur_obj_get_thrown_or_placed(20.0f, 50.0f, 4); cur_obj_become_intangible(); o->oPosY += 20.0f; break; diff --git a/src/game/behaviors/koopa_shell.inc.c b/src/game/behaviors/koopa_shell.inc.c index 1fcbf406..a7c7071e 100644 --- a/src/game/behaviors/koopa_shell.inc.c +++ b/src/game/behaviors/koopa_shell.inc.c @@ -47,12 +47,12 @@ void bhv_koopa_shell_flame_spawn(void) { } void koopa_shell_spawn_sparkles(f32 a) { - struct Object *sp1C = spawn_object(o, MODEL_NONE, bhvSparkleSpawn); - sp1C->oPosY += a; + struct Object *sparkleObj = spawn_object(o, MODEL_NONE, bhvSparkleSpawn); + sparkleObj->oPosY += a; } void bhv_koopa_shell_loop(void) { - struct Surface *sp34; + struct Surface *floor; obj_set_hitbox(o, &sKoopaShellHitbox); cur_obj_scale(1.0f); switch (o->oAction) { @@ -67,11 +67,11 @@ void bhv_koopa_shell_loop(void) { break; case 1: obj_copy_pos(o, gMarioObject); - sp34 = cur_obj_update_floor_height_and_get_floor(); + floor = cur_obj_update_floor_height_and_get_floor(); if (absf(find_water_level(o->oPosX, o->oPosZ) - o->oPosY) < 10.0f) koopa_shell_spawn_water_drop(); else if (5.0f > absf(o->oPosY - o->oFloorHeight)) { - if (sp34 != NULL && sp34->type == 1) + if (floor != NULL && floor->type == 1) bhv_koopa_shell_flame_spawn(); else koopa_shell_spawn_sparkles(10.0f); diff --git a/src/game/behaviors/lll_floating_wood_piece.inc.c b/src/game/behaviors/lll_floating_wood_piece.inc.c index cb4dad48..4743af7e 100644 --- a/src/game/behaviors/lll_floating_wood_piece.inc.c +++ b/src/game/behaviors/lll_floating_wood_piece.inc.c @@ -10,15 +10,14 @@ void bhv_lll_wood_piece_loop(void) { } void bhv_lll_floating_wood_bridge_loop(void) { - struct Object *sp3C; + struct Object *woodPieceObj; s32 i; switch (o->oAction) { case 0: if (o->oDistanceToMario < 2500.0f) { for (i = 1; i < 4; i++) { - sp3C = spawn_object_relative(0, (i - 2) * 300, 0, 0, o, MODEL_LLL_WOOD_BRIDGE, - bhvLllWoodPiece); - sp3C->oLllWoodPieceOscillationTimer = i * 4096; + woodPieceObj = spawn_object_relative(0, (i - 2) * 300, 0, 0, o, MODEL_LLL_WOOD_BRIDGE, bhvLllWoodPiece); + woodPieceObj->oLllWoodPieceOscillationTimer = i * 4096; } o->oAction = 1; } diff --git a/src/game/behaviors/lll_hexagonal_ring.inc.c b/src/game/behaviors/lll_hexagonal_ring.inc.c index a0a4d6b7..25d94c38 100644 --- a/src/game/behaviors/lll_hexagonal_ring.inc.c +++ b/src/game/behaviors/lll_hexagonal_ring.inc.c @@ -1,15 +1,15 @@ // lll_hexagonal_ring.c.inc void hexagonal_ring_spawn_flames(void) { - struct Object *sp1C; + struct Object *flameObj; f32 size; - sp1C = spawn_object(o, MODEL_RED_FLAME, bhvVolcanoFlames); - sp1C->oPosY += 550.0f; - sp1C->oMoveAngleYaw = random_u16() << 0x10 >> 0x10; - sp1C->oForwardVel = random_float() * 40.0f + 20.0f; - sp1C->oVelY = random_float() * 50.0f + 10.0f; + flameObj = spawn_object(o, MODEL_RED_FLAME, bhvVolcanoFlames); + flameObj->oPosY += 550.0f; + flameObj->oMoveAngleYaw = random_u16() << 0x10 >> 0x10; + flameObj->oForwardVel = random_float() * 40.0f + 20.0f; + flameObj->oVelY = random_float() * 50.0f + 10.0f; size = random_float() * 6.0 + 3.0; - obj_scale_xyz(sp1C, size, size, size); + obj_scale_xyz(flameObj, size, size, size); if (random_float() < 0.1) cur_obj_play_sound_2(SOUND_GENERAL_VOLCANO_EXPLOSION); } diff --git a/src/game/behaviors/lll_rotating_hex_flame.inc.c b/src/game/behaviors/lll_rotating_hex_flame.inc.c index efabfca8..0284a538 100644 --- a/src/game/behaviors/lll_rotating_hex_flame.inc.c +++ b/src/game/behaviors/lll_rotating_hex_flame.inc.c @@ -1,31 +1,29 @@ // lll_rotating_hex_flame.c.inc void bhv_lll_rotating_hex_flame_loop(void) { - f32 sp24 = o->oLllRotatingHexFlameUnkF4; - f32 sp20 = o->oLllRotatingHexFlameUnkF8; - f32 sp1C = o->oLllRotatingHexFlameUnkFC; - cur_obj_set_pos_relative(o->parentObj, sp24, sp20, sp1C); + f32 relPosX = o->oLllRotatingHexFlameUnkF4; + f32 relPosY = o->oLllRotatingHexFlameUnkF8; + f32 relPosZ = o->oLllRotatingHexFlameUnkFC; + cur_obj_set_pos_relative(o->parentObj, relPosX, relPosY, relPosZ); o->oPosY = o->parentObj->oPosY + 100.0f; if (o->parentObj->oAction == 3) obj_mark_for_deletion(o); } -void fire_bar_spawn_flames(s16 a0) { - struct Object *sp2C; - UNUSED s32 unused; +void fire_bar_spawn_flames(s16 yaw) { + struct Object *flameObj; s32 i; - s32 sp20; - f32 sp1C = sins(a0) * 200.0f; - f32 sp18 = coss(a0) * 200.0f; - sp20 = (o->oBehParams2ndByte == 0) ? 4 : 3; - for (i = 0; i < sp20; i++) { - sp2C = spawn_object(o, MODEL_RED_FLAME, bhvLllRotatingHexFlame); - sp2C->oLllRotatingHexFlameUnkF4 += sp1C; - sp2C->oLllRotatingHexFlameUnkF8 = o->oPosY - 200.0f; - sp2C->oLllRotatingHexFlameUnkFC += sp18; - obj_scale_xyz(sp2C, 6.0f, 6.0f, 6.0f); - sp1C += sins(a0) * 150.0f; - sp18 += coss(a0) * 150.0f; + f32 xOffset = sins(yaw) * 200.0f; + f32 zOffset = coss(yaw) * 200.0f; + s32 amt = (o->oBehParams2ndByte == 0) ? 4 : 3; + for (i = 0; i < amt; i++) { + flameObj = spawn_object(o, MODEL_RED_FLAME, bhvLllRotatingHexFlame); + flameObj->oLllRotatingHexFlameUnkF4 += xOffset; + flameObj->oLllRotatingHexFlameUnkF8 = o->oPosY - 200.0f; + flameObj->oLllRotatingHexFlameUnkFC += zOffset; + obj_scale_xyz(flameObj, 6.0f, 6.0f, 6.0f); + xOffset += sins(yaw) * 150.0f; + zOffset += coss(yaw) * 150.0f; } } diff --git a/src/game/behaviors/lll_sinking_rectangle.inc.c b/src/game/behaviors/lll_sinking_rectangle.inc.c index bda4a844..cea94bc3 100644 --- a/src/game/behaviors/lll_sinking_rectangle.inc.c +++ b/src/game/behaviors/lll_sinking_rectangle.inc.c @@ -16,18 +16,14 @@ void sinking_rectangular_plat_actions(f32 a0, s32 a1) { } void bhv_lll_sinking_rectangular_platform_loop(void) { - f32 sp1C = 0.4f; - s32 sp18 = 0x100; - if (o->oMoveAngleYaw != 0) - sinking_rectangular_plat_actions(sp1C, sp18); - else { + if (o->oMoveAngleYaw != 0) { + sinking_rectangular_plat_actions(0.4f, 0x100); + } else { o->oFaceAnglePitch = sins(o->oLllWoodPieceOscillationTimer) * 512.0f; o->oLllWoodPieceOscillationTimer += 0x100; } } void bhv_lll_sinking_square_platforms_loop(void) { - f32 sp1C = 0.5f; - s32 sp18 = 0x100; - sinking_rectangular_plat_actions(sp1C, sp18); + sinking_rectangular_plat_actions(0.5f, 0x100); } diff --git a/src/game/behaviors/metal_box.inc.c b/src/game/behaviors/metal_box.inc.c index ce3957bf..b839c708 100644 --- a/src/game/behaviors/metal_box.inc.c +++ b/src/game/behaviors/metal_box.inc.c @@ -12,13 +12,12 @@ struct ObjectHitbox sMetalBoxHitbox = { /* hurtboxHeight: */ 300, }; -s32 check_if_moving_over_floor(f32 a0, f32 a1) { +s32 check_if_moving_over_floor(f32 maxDist, f32 offset) { struct Surface *sp24; - f32 sp20 = o->oPosX + sins(o->oMoveAngleYaw) * a1; - f32 floorHeight; - f32 sp18 = o->oPosZ + coss(o->oMoveAngleYaw) * a1; - floorHeight = find_floor(sp20, o->oPosY, sp18, &sp24); - if (absf(floorHeight - o->oPosY) < a0) // abs + f32 xPos = o->oPosX + sins(o->oMoveAngleYaw) * offset; + f32 zPos = o->oPosZ + coss(o->oMoveAngleYaw) * offset; + f32 floorHeight = find_floor(xPos, o->oPosY, zPos, &sp24); + if (absf(floorHeight - o->oPosY) < maxDist) // abs return 1; else return 0; @@ -26,12 +25,12 @@ s32 check_if_moving_over_floor(f32 a0, f32 a1) { void bhv_pushable_loop(void) { UNUSED s16 unused; - s16 sp1C; + s16 angleToMario; obj_set_hitbox(o, &sMetalBoxHitbox); o->oForwardVel = 0.0f; if (obj_check_if_collided_with_object(o, gMarioObject) && gMarioStates[0].flags & MARIO_UNKNOWN_31) { - sp1C = obj_angle_to_object(o, gMarioObject); - if (abs_angle_diff(sp1C, gMarioObject->oMoveAngleYaw) > 0x4000) { + angleToMario = obj_angle_to_object(o, gMarioObject); + if (abs_angle_diff(angleToMario, gMarioObject->oMoveAngleYaw) > 0x4000) { o->oMoveAngleYaw = (s16)((gMarioObject->oMoveAngleYaw + 0x2000) & 0xc000); if (check_if_moving_over_floor(8.0f, 150.0f)) { o->oForwardVel = 4.0f; diff --git a/src/game/behaviors/moneybag.inc.c b/src/game/behaviors/moneybag.inc.c index b8567bd5..48fc4368 100644 --- a/src/game/behaviors/moneybag.inc.c +++ b/src/game/behaviors/moneybag.inc.c @@ -52,8 +52,6 @@ void moneybag_check_mario_collision(void) { } } -// sp20 = collisionFlags - void moneybag_jump(s8 collisionFlags) { s16 animFrame = o->header.gfx.animInfo.animFrame; @@ -133,10 +131,10 @@ void moneybag_act_move_around(void) { void moneybag_act_return_home(void) { s16 collisionFlags; - f32 sp28 = o->oHomeX - o->oPosX; - f32 sp24 = o->oHomeZ - o->oPosZ; - s16 sp22 = atan2s(sp24, sp28); - o->oMoveAngleYaw = approach_s16_symmetric(o->oMoveAngleYaw, sp22, 0x800); + f32 dx = o->oHomeX - o->oPosX; + f32 dz = o->oHomeZ - o->oPosZ; + s16 yawToHome = atan2s(dz, dx); + o->oMoveAngleYaw = approach_s16_symmetric(o->oMoveAngleYaw, yawToHome, 0x800); collisionFlags = object_step(); if (((collisionFlags & OBJ_COL_FLAGS_LANDED) == OBJ_COL_FLAGS_LANDED) diff --git a/src/game/behaviors/moving_coin.inc.c b/src/game/behaviors/moving_coin.inc.c index b01e32b8..dffe8dcd 100644 --- a/src/game/behaviors/moving_coin.inc.c +++ b/src/game/behaviors/moving_coin.inc.c @@ -1,7 +1,5 @@ // coin.c.inc -// sp18 = collisionFlagsPtr - static struct ObjectHitbox sMovingYellowCoinHitbox = { /* interactType: */ INTERACT_COIN, /* downOffset: */ 0, diff --git a/src/game/behaviors/mr_i.inc.c b/src/game/behaviors/mr_i.inc.c index 4d883ddf..32eaa3be 100644 --- a/src/game/behaviors/mr_i.inc.c +++ b/src/game/behaviors/mr_i.inc.c @@ -38,11 +38,11 @@ void bhv_mr_i_particle_loop(void) { void spawn_mr_i_particle(void) { struct Object *particle; - f32 sp18 = o->header.gfx.scale[1]; + f32 yScale = o->header.gfx.scale[1]; particle = spawn_object(o, MODEL_PURPLE_MARBLE, bhvMrIParticle); - particle->oPosY += 50.0f * sp18; - particle->oPosX += sins(o->oMoveAngleYaw) * 90.0f * sp18; - particle->oPosZ += coss(o->oMoveAngleYaw) * 90.0f * sp18; + particle->oPosY += 50.0f * yScale; + particle->oPosX += sins(o->oMoveAngleYaw) * 90.0f * yScale; + particle->oPosZ += coss(o->oMoveAngleYaw) * 90.0f * yScale; cur_obj_play_sound_2(SOUND_OBJ_MRI_SHOOT); } @@ -68,45 +68,44 @@ void bhv_mr_i_body_loop(void) { } void mr_i_act_3(void) { - s16 sp36; - s16 sp34; - f32 sp30; - f32 sp2C; - UNUSED u8 pad[8]; - f32 sp20; - f32 sp1C; + s16 startYaw; + s16 direction; + f32 shakeY; + f32 spinAmount; + f32 baseScale; + f32 scaleModifier; if (o->oBehParams2ndByte) - sp1C = 2.0f; + scaleModifier = 2.0f; else - sp1C = 1.0f; + scaleModifier = 1.0f; if (o->oMrIUnk100 < 0) - sp34 = 0x1000; + direction = 0x1000; else - sp34 = -0x1000; - sp2C = (o->oTimer + 1) / 96.0f; + direction = -0x1000; + spinAmount = (o->oTimer + 1) / 96.0f; if (o->oTimer < 64) { - sp36 = o->oMoveAngleYaw; - o->oMoveAngleYaw += sp34 * coss(0x4000 * sp2C); - if (sp36 < 0 && o->oMoveAngleYaw >= 0) + startYaw = o->oMoveAngleYaw; + o->oMoveAngleYaw += direction * coss(0x4000 * spinAmount); + if (startYaw < 0 && o->oMoveAngleYaw >= 0) cur_obj_play_sound_2(SOUND_OBJ2_MRI_SPINNING); - o->oMoveAnglePitch = (1.0 - coss(0x4000 * sp2C)) * -0x4000; + o->oMoveAnglePitch = (1.0 - coss(0x4000 * spinAmount)) * -0x4000; cur_obj_shake_y(4.0f); } else if (o->oTimer < 96) { if (o->oTimer == 64) cur_obj_play_sound_2(SOUND_OBJ_MRI_DEATH); - sp30 = (f32)(o->oTimer - 63) / 32; - o->oMoveAngleYaw += sp34 * coss(0x4000 * sp2C); - o->oMoveAnglePitch = (1.0 - coss(0x4000 * sp2C)) * -0x4000; - cur_obj_shake_y((s32)((1.0f - sp30) * 4)); // trucating the f32? - sp20 = coss(0x4000 * sp30) * 0.4 + 0.6; - cur_obj_scale(sp20 * sp1C); + shakeY = (f32)(o->oTimer - 63) / 32; + o->oMoveAngleYaw += direction * coss(0x4000 * spinAmount); + o->oMoveAnglePitch = (1.0 - coss(0x4000 * spinAmount)) * -0x4000; + cur_obj_shake_y((s32)((1.0f - shakeY) * 4)); // trucating the f32? + baseScale = coss(0x4000 * shakeY) * 0.4 + 0.6; + cur_obj_scale(baseScale * scaleModifier); } else if (o->oTimer < 104) { // do nothing } else if (o->oTimer < 168) { if (o->oTimer == 104) { cur_obj_become_intangible(); spawn_mist_particles(); - o->oMrISize = sp1C * 0.6; + o->oMrISize = scaleModifier * 0.6; if (o->oBehParams2ndByte) { o->oPosY += 100.0f; spawn_default_star(1370, 2000.0f, -320.0f); @@ -114,7 +113,7 @@ void mr_i_act_3(void) { } else cur_obj_spawn_loot_blue_coin(); } - o->oMrISize -= 0.2 * sp1C; + o->oMrISize -= 0.2 * scaleModifier; if (o->oMrISize < 0) o->oMrISize = 0; cur_obj_scale(o->oMrISize); @@ -123,9 +122,8 @@ void mr_i_act_3(void) { } void mr_i_act_2(void) { - s16 sp1E; - s16 sp1C; - sp1E = o->oMoveAngleYaw; + s16 dYaw; + s16 startYaw = o->oMoveAngleYaw; if (o->oTimer == 0) { if (o->oBehParams2ndByte) o->oMrIUnkF4 = 200; @@ -137,19 +135,19 @@ void mr_i_act_2(void) { } obj_turn_toward_object(o, gMarioObject, 0x10, 0x800); obj_turn_toward_object(o, gMarioObject, 0x0F, 0x400); - sp1C = sp1E - (s16)(o->oMoveAngleYaw); - if (!sp1C) { + dYaw = startYaw - (s16)(o->oMoveAngleYaw); + if (!dYaw) { o->oMrIUnkFC = 0; o->oMrIUnk100 = 0; - } else if (sp1C > 0) { + } else if (dYaw > 0) { if (o->oMrIUnk100 > 0) - o->oMrIUnkFC += sp1C; + o->oMrIUnkFC += dYaw; else o->oMrIUnkFC = 0; o->oMrIUnk100 = 1; } else { if (o->oMrIUnk100 < 0) - o->oMrIUnkFC -= sp1C; + o->oMrIUnkFC -= dYaw; else o->oMrIUnkFC = 0; o->oMrIUnk100 = -1; @@ -181,12 +179,9 @@ void mr_i_act_2(void) { } void mr_i_act_1(void) { - s16 sp1E; - s16 sp1C; - s16 sp1A; - sp1E = obj_angle_to_object(o, gMarioObject); - sp1C = abs_angle_diff(o->oMoveAngleYaw, sp1E); - sp1A = abs_angle_diff(o->oMoveAngleYaw, gMarioObject->oFaceAngleYaw); + s16 angleToMario = obj_angle_to_object(o, gMarioObject); + s16 angleDiffMoveYawToMario = abs_angle_diff(o->oMoveAngleYaw, angleToMario); + s16 angleDiffMoveYawToMarioFaceYaw = abs_angle_diff(o->oMoveAngleYaw, gMarioObject->oFaceAngleYaw); if (o->oTimer == 0) { cur_obj_become_tangible(); o->oMoveAnglePitch = 0; @@ -197,7 +192,7 @@ void mr_i_act_1(void) { else o->oAngleVelYaw = 256; } - if (sp1C < 1024 && sp1A > 0x4000) { + if (angleDiffMoveYawToMario < 1024 && angleDiffMoveYawToMarioFaceYaw > 0x4000) { if (o->oDistanceToMario < 700.0f) o->oAction = 2; else diff --git a/src/game/behaviors/mushroom_1up.inc.c b/src/game/behaviors/mushroom_1up.inc.c index 5921827c..96781a48 100644 --- a/src/game/behaviors/mushroom_1up.inc.c +++ b/src/game/behaviors/mushroom_1up.inc.c @@ -1,8 +1,6 @@ // mushroom_1up.c.inc void bhv_1up_interact(void) { - UNUSED s32 sp1C; - if (obj_check_if_collided_with_object(o, gMarioObject) == 1) { play_sound(SOUND_GENERAL_COLLECT_1UP, gGlobalSoundSource); gMarioState->numLives++; @@ -45,13 +43,13 @@ void one_up_loop_in_air(void) { } void pole_1up_move_towards_mario(void) { - f32 sp34 = gMarioObject->header.gfx.pos[0] - o->oPosX; - f32 sp30 = gMarioObject->header.gfx.pos[1] + 120.0f - o->oPosY; - f32 sp2C = gMarioObject->header.gfx.pos[2] - o->oPosZ; - s16 sp2A = atan2s(sqrtf(sqr(sp34) + sqr(sp2C)), sp30); + f32 dx = gMarioObject->header.gfx.pos[0] - o->oPosX; + f32 dy = gMarioObject->header.gfx.pos[1] + 120.0f - o->oPosY; + f32 dz = gMarioObject->header.gfx.pos[2] - o->oPosZ; + s16 targetPitch = atan2s(sqrtf(sqr(dx) + sqr(dz)), dy); obj_turn_toward_object(o, gMarioObject, 16, 0x1000); - o->oMoveAnglePitch = approach_s16_symmetric(o->oMoveAnglePitch, sp2A, 0x1000); + o->oMoveAnglePitch = approach_s16_symmetric(o->oMoveAnglePitch, targetPitch, 0x1000); o->oVelY = sins(o->oMoveAnglePitch) * 30.0f; o->oForwardVel = coss(o->oMoveAnglePitch) * 30.0f; bhv_1up_interact(); @@ -249,11 +247,11 @@ void bhv_1up_hidden_loop(void) { } void bhv_1up_hidden_trigger_loop(void) { - struct Object *sp1C; + struct Object *nearestHidden1up; if (obj_check_if_collided_with_object(o, gMarioObject) == 1) { - sp1C = cur_obj_nearest_object_with_behavior(bhvHidden1up); - if (sp1C != NULL) - sp1C->o1UpHiddenUnkF4++; + nearestHidden1up = cur_obj_nearest_object_with_behavior(bhvHidden1up); + if (nearestHidden1up != NULL) + nearestHidden1up->o1UpHiddenUnkF4++; o->activeFlags = ACTIVE_FLAG_DEACTIVATED; } @@ -293,12 +291,12 @@ void bhv_1up_hidden_in_pole_loop(void) { } void bhv_1up_hidden_in_pole_trigger_loop(void) { - struct Object *sp1C; + struct Object *nearestHidden1upInPole; if (obj_check_if_collided_with_object(o, gMarioObject) == 1) { - sp1C = cur_obj_nearest_object_with_behavior(bhvHidden1upInPole); - if (sp1C != NULL) { - sp1C->o1UpHiddenUnkF4++; + nearestHidden1upInPole = cur_obj_nearest_object_with_behavior(bhvHidden1upInPole); + if (nearestHidden1upInPole != NULL) { + nearestHidden1upInPole->o1UpHiddenUnkF4++; } o->activeFlags = ACTIVE_FLAG_DEACTIVATED; @@ -306,12 +304,12 @@ void bhv_1up_hidden_in_pole_trigger_loop(void) { } void bhv_1up_hidden_in_pole_spawner_loop(void) { - s8 sp2F; + s8 i; if (is_point_within_radius_of_mario(o->oPosX, o->oPosY, o->oPosZ, 700)) { spawn_object_relative(2, 0, 50, 0, o, MODEL_1UP, bhvHidden1upInPole); - for (sp2F = 0; sp2F < 2; sp2F++) { - spawn_object_relative(0, 0, sp2F * -200, 0, o, MODEL_NONE, bhvHidden1upInPoleTrigger); + for (i = 0; i < 2; i++) { + spawn_object_relative(0, 0, i * -200, 0, o, MODEL_NONE, bhvHidden1upInPoleTrigger); } o->activeFlags = ACTIVE_FLAG_DEACTIVATED; diff --git a/src/game/behaviors/orange_number.inc.c b/src/game/behaviors/orange_number.inc.c index 84bf01e9..91766edc 100644 --- a/src/game/behaviors/orange_number.inc.c +++ b/src/game/behaviors/orange_number.inc.c @@ -6,15 +6,15 @@ void bhv_orange_number_init(void) { } void bhv_orange_number_loop(void) { - struct Object *sp1C; + struct Object *sparkleObj; o->oPosY += o->oVelY; o->oVelY -= 2.0f; if (o->oVelY < -21.0f) o->oVelY = 14.0; if (o->oTimer == 35) { - sp1C = spawn_object(o, MODEL_SPARKLES, bhvGoldenCoinSparkles); - sp1C->oPosY -= 30.f; + sparkleObj = spawn_object(o, MODEL_SPARKLES, bhvGoldenCoinSparkles); + sparkleObj->oPosY -= 30.f; o->activeFlags = ACTIVE_FLAG_DEACTIVATED; } } diff --git a/src/game/behaviors/rolling_log.inc.c b/src/game/behaviors/rolling_log.inc.c index dd88e552..e3af4dc5 100644 --- a/src/game/behaviors/rolling_log.inc.c +++ b/src/game/behaviors/rolling_log.inc.c @@ -19,12 +19,12 @@ void bhv_ttm_rolling_log_init(void) { } void rolling_log_roll_log(void) { - f32 sp24; + f32 rollAmount; if (gMarioObject->platform == o) { - sp24 = (gMarioObject->header.gfx.pos[2] - o->oPosZ) * coss(-1*o->oMoveAngleYaw) - - (gMarioObject->header.gfx.pos[0] - o->oPosX) * sins(-1*o->oMoveAngleYaw); - if (sp24 > 0) + rollAmount = (gMarioObject->header.gfx.pos[2] - o->oPosZ) * coss(-o->oMoveAngleYaw) + - (gMarioObject->header.gfx.pos[0] - o->oPosX) * sins(-o->oMoveAngleYaw); + if (rollAmount > 0) o->oAngleVelPitch += 0x10; else o->oAngleVelPitch -= 0x10; diff --git a/src/game/behaviors/rotating_platform.inc.c b/src/game/behaviors/rotating_platform.inc.c index c81aaa80..2d582daf 100644 --- a/src/game/behaviors/rotating_platform.inc.c +++ b/src/game/behaviors/rotating_platform.inc.c @@ -24,12 +24,12 @@ void bhv_wf_rotating_wooden_platform_loop(void) { } void bhv_rotating_platform_loop(void) { - s8 sp1F = o->oBehParams >> 24; + s8 param = o->oBehParams >> 24; if (o->oTimer == 0) { obj_set_collision_data(o, sWFRotatingPlatformData[o->oBehParams2ndByte].collisionData); o->oCollisionDistance = sWFRotatingPlatformData[o->oBehParams2ndByte].collisionDistance; cur_obj_scale(sWFRotatingPlatformData[o->oBehParams2ndByte].scale * 0.01f); } - o->oAngleVelYaw = sp1F << 4; + o->oAngleVelYaw = param << 4; o->oFaceAngleYaw += o->oAngleVelYaw; } diff --git a/src/game/behaviors/scuttlebug.inc.c b/src/game/behaviors/scuttlebug.inc.c index febf64f2..8b480a06 100644 --- a/src/game/behaviors/scuttlebug.inc.c +++ b/src/game/behaviors/scuttlebug.inc.c @@ -25,7 +25,7 @@ s32 update_angle_from_move_flags(s32 *angle) { void bhv_scuttlebug_loop(void) { UNUSED s32 unused; - f32 sp18; + f32 animSpeed; cur_obj_update_floor_and_walls(); if (o->oSubAction != 0 && cur_obj_set_hitbox_and_die_if_attacked(&sScuttlebugHitbox, SOUND_OBJ_DYING_ENEMY1, @@ -101,10 +101,10 @@ void bhv_scuttlebug_loop(void) { break; } if (o->oForwardVel < 10.0f) - sp18 = 1.0f; + animSpeed = 1.0f; else - sp18 = 3.0f; - cur_obj_init_animation_with_accel_and_sound(0, sp18); + animSpeed = 3.0f; + cur_obj_init_animation_with_accel_and_sound(0, animSpeed); if (o->oMoveFlags & OBJ_MOVE_MASK_ON_GROUND) set_obj_anim_with_accel_and_sound(1, 23, SOUND_OBJ2_SCUTTLEBUG_WALK); if (o->parentObj != o) { diff --git a/src/game/behaviors/skeeter.inc.c b/src/game/behaviors/skeeter.inc.c index 6451d4ea..0a60eaaa 100644 --- a/src/game/behaviors/skeeter.inc.c +++ b/src/game/behaviors/skeeter.inc.c @@ -1,6 +1,6 @@ -struct Struct80331C38 { - s16 unk00; - s16 unk02; +struct SkeeterRelPos { + s16 relPosX; + s16 relPosZ; }; struct ObjectHitbox sSkeeterHitbox = { @@ -15,7 +15,7 @@ struct ObjectHitbox sSkeeterHitbox = { /* hurtboxHeight: */ 90, }; -struct Struct80331C38 D_80331C38[] = { +struct SkeeterRelPos sSkeeterRelPositions[] = { { 0xFF7E, 0xFF42 }, { 0x0082, 0xFF42 }, { 0xFF4C, 0x0082 }, @@ -26,7 +26,7 @@ static void skeeter_spawn_waves(void) { s32 i; for (i = 0; i < 4; i++) { - spawn_object_relative_with_scale(0, D_80331C38[i].unk00, 0, D_80331C38[i].unk02, 0.8f, o, + spawn_object_relative_with_scale(0, sSkeeterRelPositions[i].relPosX, 0, sSkeeterRelPositions[i].relPosZ, 0.8f, o, MODEL_IDLE_WATER_WAVE, bhvSkeeterWave); } } @@ -90,15 +90,15 @@ static void skeeter_act_lunge(void) { } static void skeeter_act_walk(void) { - f32 sp24; + f32 accel; if (!(o->oMoveFlags & OBJ_MOVE_MASK_ON_GROUND)) { o->oAction = SKEETER_ACT_IDLE; } else { obj_forward_vel_approach(o->oSkeeterUnkFC, 0.4f); - sp24 = 0.12f * o->oForwardVel; + accel = 0.12f * o->oForwardVel; - cur_obj_init_animation_with_accel_and_sound(2, sp24); + cur_obj_init_animation_with_accel_and_sound(2, accel); cur_obj_play_sound_at_anim_range(3, 13, SOUND_OBJ_SKEETER_WALK); if (o->oSkeeterUnkF8 != 0) { diff --git a/src/game/behaviors/snow_mound.inc.c b/src/game/behaviors/snow_mound.inc.c index b9bfb978..f12bd5de 100644 --- a/src/game/behaviors/snow_mound.inc.c +++ b/src/game/behaviors/snow_mound.inc.c @@ -24,18 +24,18 @@ void bhv_sliding_snow_mound_loop(void) { } void bhv_snow_mound_spawn_loop(void) { - struct Object *sp1C; + struct Object *moundObj; if (!is_point_within_radius_of_mario(o->oPosX, o->oPosY, o->oPosZ, 6000) || o->oPosY + 1000.0f < gMarioObject->header.gfx.pos[1]) return; if (o->oTimer == 64 || o->oTimer == 128 || o->oTimer == 192 || o->oTimer == 224 || o->oTimer == 256) - sp1C = spawn_object(o, MODEL_SL_SNOW_TRIANGLE, bhvSlidingSnowMound); + moundObj = spawn_object(o, MODEL_SL_SNOW_TRIANGLE, bhvSlidingSnowMound); - if (sp1C && o->oTimer == 256) { - sp1C->header.gfx.scale[0] = 2.0f; - sp1C->header.gfx.scale[1] = 2.0f; + if (moundObj && o->oTimer == 256) { + moundObj->header.gfx.scale[0] = 2.0f; + moundObj->header.gfx.scale[1] = 2.0f; } if (o->oTimer >= 256) diff --git a/src/game/behaviors/snowman.inc.c b/src/game/behaviors/snowman.inc.c index 35ed8dd9..e6d73709 100644 --- a/src/game/behaviors/snowman.inc.c +++ b/src/game/behaviors/snowman.inc.c @@ -13,7 +13,7 @@ static struct ObjectHitbox sRollingSphereHitbox = { }; void bhv_snowmans_bottom_init(void) { - struct Object *sp34; + struct Object *headObj; o->oHomeX = o->oPosX; o->oHomeY = o->oPosY; @@ -27,9 +27,9 @@ void bhv_snowmans_bottom_init(void) { o->oForwardVel = 0; o->oSnowmansBottomUnkF4 = 0.4f; - sp34 = cur_obj_nearest_object_with_behavior(bhvSnowmansHead); - if (sp34 != NULL) { - o->parentObj = sp34; + headObj = cur_obj_nearest_object_with_behavior(bhvSnowmansHead); + if (headObj != NULL) { + o->parentObj = headObj; } spawn_object_abs_with_rot(o, 0, MODEL_NONE, bhvSnowmansBodyCheckpoint, -402, 461, -2898, 0, 0, 0); } @@ -51,23 +51,18 @@ void adjust_rolling_face_pitch(f32 f12) { } void snowmans_bottom_act_1(void) { - s32 sp20; - UNUSED s16 sp1E; -#ifdef AVOID_UB - sp20 = 0; -#endif + s32 pathResult = 0; o->oPathedStartWaypoint = segmented_to_virtual(&ccm_seg7_trajectory_snowman); object_step_without_floor_orient(); - sp20 = cur_obj_follow_path(sp20); + pathResult = cur_obj_follow_path(pathResult); o->oSnowmansBottomUnkF8 = o->oPathedTargetYaw; o->oMoveAngleYaw = approach_s16_symmetric(o->oMoveAngleYaw, o->oSnowmansBottomUnkF8, 0x400); if (o->oForwardVel > 70.0) o->oForwardVel = 70.0f; - if (sp20 == -1) { - sp1E = (u16) o->oAngleToMario - (u16) o->oMoveAngleYaw; + if (pathResult == -1) { if (obj_check_if_facing_toward_angle(o->oMoveAngleYaw, o->oAngleToMario, 0x2000) == TRUE && o->oSnowmansBottomUnk1AC == 1) { o->oSnowmansBottomUnkF8 = o->oAngleToMario; @@ -118,14 +113,11 @@ void snowmans_bottom_act_3(void) { } void bhv_snowmans_bottom_loop(void) { - s16 sp1E; - switch (o->oAction) { case 0: if (is_point_within_radius_of_mario(o->oPosX, o->oPosY, o->oPosZ, 400) == 1 && set_mario_npc_dialog(MARIO_DIALOG_LOOK_FRONT) == MARIO_DIALOG_STATUS_SPEAK) { - sp1E = cutscene_object_with_dialog(CUTSCENE_DIALOG, o, DIALOG_110); - if (sp1E) { + if (cutscene_object_with_dialog(CUTSCENE_DIALOG, o, DIALOG_110)) { o->oForwardVel = 10.0f; o->oAction = 1; set_mario_npc_dialog(MARIO_DIALOG_STOP); @@ -161,11 +153,11 @@ void bhv_snowmans_bottom_loop(void) { } void bhv_snowmans_head_init(void) { - u8 sp37; - s8 sp36; + u8 starFlags; + s8 behParams; - sp37 = save_file_get_star_flags(gCurrSaveFileNum - 1, gCurrCourseNum - 1); - sp36 = (o->oBehParams >> 24) & 0xFF; + starFlags = save_file_get_star_flags(gCurrSaveFileNum - 1, gCurrCourseNum - 1); + behParams = (o->oBehParams >> 24) & 0xFF; cur_obj_scale(0.7f); @@ -173,7 +165,7 @@ void bhv_snowmans_head_init(void) { o->oFriction = 0.999f; o->oBuoyancy = 2.0f; - if ((sp37 & (1 << sp36)) && gCurrActNum != sp36 + 1) { + if ((starFlags & (1 << behParams)) && gCurrActNum != behParams + 1) { spawn_object_abs_with_rot(o, 0, MODEL_CCM_SNOWMAN_BASE, bhvBigSnowmanWhole, -4230, -1344, 1813, 0, 0, 0); o->oPosX = -4230.0f; @@ -184,7 +176,6 @@ void bhv_snowmans_head_init(void) { } void bhv_snowmans_head_loop(void) { - UNUSED s16 sp1E; s16 collisionFlags; switch (o->oAction) { diff --git a/src/game/behaviors/sound_spawner.inc.c b/src/game/behaviors/sound_spawner.inc.c index 7f0b27ed..e5e2943d 100644 --- a/src/game/behaviors/sound_spawner.inc.c +++ b/src/game/behaviors/sound_spawner.inc.c @@ -1,6 +1,5 @@ // sound_spawner.c.inc void bhv_sound_spawner_init(void) { - s32 sp1C = o->oSoundEffectUnkF4; - play_sound(sp1C, o->header.gfx.cameraToObject); + play_sound(o->oSoundEffectUnkF4, o->header.gfx.cameraToObject); } diff --git a/src/game/behaviors/sparkle_spawn_star.inc.c b/src/game/behaviors/sparkle_spawn_star.inc.c index b6608708..e433a628 100644 --- a/src/game/behaviors/sparkle_spawn_star.inc.c +++ b/src/game/behaviors/sparkle_spawn_star.inc.c @@ -13,11 +13,11 @@ struct ObjectHitbox sSparkleSpawnStarHitbox = { }; void bhv_spawned_star_init(void) { - s32 sp24; + s32 param; if (!(o->oInteractionSubtype & INT_SUBTYPE_NO_EXIT)) o->oBehParams = o->parentObj->oBehParams; - sp24 = (o->oBehParams >> 24) & 0xFF; - if (bit_shift_left(sp24) & save_file_get_star_flags(gCurrSaveFileNum - 1, gCurrCourseNum - 1)) + param = (o->oBehParams >> 24) & 0xFF; + if (bit_shift_left(param) & save_file_get_star_flags(gCurrSaveFileNum - 1, gCurrCourseNum - 1)) cur_obj_set_model(MODEL_TRANSPARENT_STAR); cur_obj_play_sound_2(SOUND_GENERAL2_STAR_APPEARS); } @@ -31,16 +31,16 @@ void set_sparkle_spawn_star_hitbox(void) { } void set_home_to_mario(void) { - f32 sp1C; - f32 sp18; + f32 dx; + f32 dz; o->oHomeX = gMarioObject->oPosX; o->oHomeZ = gMarioObject->oPosZ; o->oHomeY = gMarioObject->oPosY; o->oHomeY += 250.0f; o->oPosY = o->oHomeY; - sp1C = o->oHomeX - o->oPosX; - sp18 = o->oHomeZ - o->oPosZ; - o->oForwardVel = sqrtf(sp1C * sp1C + sp18 * sp18) / 23.0f; + dx = o->oHomeX - o->oPosX; + dz = o->oHomeZ - o->oPosZ; + o->oForwardVel = sqrtf(dx * dx + dz * dz) / 23.0f; } void set_y_home_to_pos(void) { @@ -110,9 +110,9 @@ void bhv_spawned_star_loop(void) { o->oInteractStatus = 0; } -void bhv_spawn_star_no_level_exit(u32 sp20) { - struct Object *sp1C = spawn_object(o, MODEL_STAR, bhvSpawnedStarNoLevelExit); - sp1C->oBehParams = sp20 << 24; - sp1C->oInteractionSubtype = INT_SUBTYPE_NO_EXIT; - obj_set_angle(sp1C, 0, 0, 0); +void bhv_spawn_star_no_level_exit(u32 params) { + struct Object *starObj = spawn_object(o, MODEL_STAR, bhvSpawnedStarNoLevelExit); + starObj->oBehParams = params << 24; + starObj->oInteractionSubtype = INT_SUBTYPE_NO_EXIT; + obj_set_angle(starObj, 0, 0, 0); } diff --git a/src/game/behaviors/spawn_star.inc.c b/src/game/behaviors/spawn_star.inc.c index 434a48c3..859f6b25 100644 --- a/src/game/behaviors/spawn_star.inc.c +++ b/src/game/behaviors/spawn_star.inc.c @@ -116,62 +116,61 @@ void bhv_star_spawn_loop(void) { } } -struct Object *spawn_star(struct Object *sp30, f32 sp34, f32 sp38, f32 sp3C) { - sp30 = spawn_object_abs_with_rot(o, 0, MODEL_STAR, bhvStarSpawnCoordinates, o->oPosX, o->oPosY, +struct Object *spawn_star(struct Object *starObj, f32 x, f32 y, f32 z) { + starObj = spawn_object_abs_with_rot(o, 0, MODEL_STAR, bhvStarSpawnCoordinates, o->oPosX, o->oPosY, o->oPosZ, 0, 0, 0); - sp30->oBehParams = o->oBehParams; - sp30->oHomeX = sp34; - sp30->oHomeY = sp38; - sp30->oHomeZ = sp3C; - sp30->oFaceAnglePitch = 0; - sp30->oFaceAngleRoll = 0; - return sp30; + starObj->oBehParams = o->oBehParams; + starObj->oHomeX = x; + starObj->oHomeY = y; + starObj->oHomeZ = z; + starObj->oFaceAnglePitch = 0; + starObj->oFaceAngleRoll = 0; + return starObj; } -void spawn_default_star(f32 sp20, f32 sp24, f32 sp28) { - struct Object *sp1C; +void spawn_default_star(f32 x, f32 y, f32 z) { + struct Object *starObj; #ifdef AVOID_UB - sp1C = 0; + starObj = 0; #endif - sp1C = spawn_star(sp1C, sp20, sp24, sp28); - sp1C->oBehParams2ndByte = 0; + starObj = spawn_star(starObj, x, y, z); + starObj->oBehParams2ndByte = 0; } -void spawn_red_coin_cutscene_star(f32 sp20, f32 sp24, f32 sp28) { - struct Object *sp1C; +void spawn_red_coin_cutscene_star(f32 x, f32 y, f32 z) { + struct Object *starObj; #ifdef AVOID_UB - sp1C = 0; + starObj = 0; #endif - sp1C = spawn_star(sp1C, sp20, sp24, sp28); - sp1C->oBehParams2ndByte = 1; + starObj = spawn_star(starObj, x, y, z); + starObj->oBehParams2ndByte = 1; } -void spawn_no_exit_star(f32 sp20, f32 sp24, f32 sp28) { - struct Object *sp1C; +void spawn_no_exit_star(f32 x, f32 y, f32 z) { + struct Object *starObj; #ifdef AVOID_UB - sp1C = 0; + starObj = 0; #endif - sp1C = spawn_star(sp1C, sp20, sp24, sp28); - sp1C->oBehParams2ndByte = 1; - sp1C->oInteractionSubtype |= INT_SUBTYPE_NO_EXIT; + starObj = spawn_star(starObj, x, y, z); + starObj->oBehParams2ndByte = 1; + starObj->oInteractionSubtype |= INT_SUBTYPE_NO_EXIT; } void bhv_hidden_red_coin_star_init(void) { - s16 sp36; - struct Object *sp30; + s16 numRedCoinsRemaining; + struct Object *starObj; if (gCurrCourseNum != COURSE_JRB) spawn_object(o, MODEL_TRANSPARENT_STAR, bhvRedCoinStarMarker); - sp36 = count_objects_with_behavior(bhvRedCoin); - if (sp36 == 0) { - sp30 = - spawn_object_abs_with_rot(o, 0, MODEL_STAR, bhvStar, o->oPosX, o->oPosY, o->oPosZ, 0, 0, 0); - sp30->oBehParams = o->oBehParams; + numRedCoinsRemaining = count_objects_with_behavior(bhvRedCoin); + if (numRedCoinsRemaining == 0) { + starObj = spawn_object_abs_with_rot(o, 0, MODEL_STAR, bhvStar, o->oPosX, o->oPosY, o->oPosZ, 0, 0, 0); + starObj->oBehParams = o->oBehParams; o->activeFlags = ACTIVE_FLAG_DEACTIVATED; } - o->oHiddenStarTriggerCounter = 8 - sp36; + o->oHiddenStarTriggerCounter = 8 - numRedCoinsRemaining; } void bhv_hidden_red_coin_star_loop(void) { diff --git a/src/game/behaviors/spindel.inc.c b/src/game/behaviors/spindel.inc.c index 6cbe3ced..38b4a57a 100644 --- a/src/game/behaviors/spindel.inc.c +++ b/src/game/behaviors/spindel.inc.c @@ -7,8 +7,8 @@ void bhv_spindel_init(void) { } void bhv_spindel_loop(void) { - f32 sp1C; - s32 sp18; + f32 homeYOffset; + s32 shake; if (o->oSpindelUnkF4 == -1) { if (o->oTimer == 32) { @@ -21,16 +21,16 @@ void bhv_spindel_loop(void) { } } - sp18 = 10 - o->oSpindelUnkF4; + shake = 10 - o->oSpindelUnkF4; - if (sp18 < 0) - sp18 *= -1; + if (shake < 0) + shake *= -1; - sp18 -= 6; - if (sp18 < 0) - sp18 = 0; + shake -= 6; + if (shake < 0) + shake = 0; - if (o->oTimer == sp18 + 8) { + if (o->oTimer == shake + 8) { o->oTimer = 0; o->oSpindelUnkF4++; if (o->oSpindelUnkF4 == 20) { @@ -44,20 +44,20 @@ void bhv_spindel_loop(void) { } } - if (sp18 == 4 || sp18 == 3) - sp18 = 4; - else if (sp18 == 2 || sp18 == 1) - sp18 = 2; - else if (sp18 == 0) - sp18 = 1; + if (shake == 4 || shake == 3) + shake = 4; + else if (shake == 2 || shake == 1) + shake = 2; + else if (shake == 0) + shake = 1; - if (o->oTimer < sp18 * 8) { + if (o->oTimer < shake * 8) { if (o->oSpindelUnkF8 == 0) { - o->oVelZ = 20 / sp18; - o->oAngleVelPitch = 1024 / sp18; + o->oVelZ = 20 / shake; + o->oAngleVelPitch = 1024 / shake; } else { - o->oVelZ = -20 / sp18; - o->oAngleVelPitch = -1024 / sp18; + o->oVelZ = -20 / shake; + o->oAngleVelPitch = -1024 / shake; } o->oPosZ += o->oVelZ; @@ -67,13 +67,13 @@ void bhv_spindel_loop(void) { cur_obj_play_sound_2(SOUND_GENERAL2_SPINDEL_ROLL); } - sp1C = sins(o->oMoveAnglePitch * 4) * 23.0; - if (sp1C < 0.0f) - sp1C *= -1.0f; + homeYOffset = sins(o->oMoveAnglePitch * 4) * 23.0; + if (homeYOffset < 0.0f) + homeYOffset *= -1.0f; - o->oPosY = o->oHomeY + sp1C; + o->oPosY = o->oHomeY + homeYOffset; - if (o->oTimer + 1 == sp18 * 8) + if (o->oTimer + 1 == shake * 8) set_camera_shake_from_point(SHAKE_POS_SMALL, o->oPosX, o->oPosY, o->oPosZ); } } diff --git a/src/game/behaviors/star_door.inc.c b/src/game/behaviors/star_door.inc.c index 67f52701..c5b499b9 100644 --- a/src/game/behaviors/star_door.inc.c +++ b/src/game/behaviors/star_door.inc.c @@ -9,14 +9,14 @@ void star_door_update_pos(void) { void bhv_star_door_loop(void) { UNUSED u8 pad[4]; - struct Object *sp18; - sp18 = cur_obj_nearest_object_with_behavior(bhvStarDoor); + struct Object *doorObj; + doorObj = cur_obj_nearest_object_with_behavior(bhvStarDoor); switch (o->oAction) { case 0: cur_obj_become_tangible(); if (0x30000 & o->oInteractStatus) o->oAction = 1; - if (sp18 != NULL && sp18->oAction != 0) + if (doorObj != NULL && doorObj->oAction != 0) o->oAction = 1; break; case 1: diff --git a/src/game/behaviors/sushi.inc.c b/src/game/behaviors/sushi.inc.c index 52282c64..912096e5 100644 --- a/src/game/behaviors/sushi.inc.c +++ b/src/game/behaviors/sushi.inc.c @@ -4,14 +4,14 @@ void bhv_sushi_shark_collision_loop(void) { } void bhv_sushi_shark_loop(void) { - f32 sp1C = find_water_level(o->oPosX, o->oPosZ); + f32 waterLevel = find_water_level(o->oPosX, o->oPosZ); o->oPosX = o->oHomeX + sins(o->oSushiSharkUnkF4) * 1700.0f; o->oPosZ = o->oHomeZ + coss(o->oSushiSharkUnkF4) * 1700.0f; - o->oPosY = sp1C + o->oHomeY + sins(o->oSushiSharkUnkF4) * 200.0f; + o->oPosY = waterLevel + o->oHomeY + sins(o->oSushiSharkUnkF4) * 200.0f; o->oMoveAngleYaw = o->oSushiSharkUnkF4 + 0x4000; o->oSushiSharkUnkF4 += 0x80; - if (gMarioObject->oPosY - sp1C > -500.0f) - if (o->oPosY - sp1C > -200.0f) + if (gMarioObject->oPosY - waterLevel > -500.0f) + if (o->oPosY - waterLevel > -200.0f) spawn_object_with_scale(o, MODEL_WAVE_TRAIL, bhvObjectWaveTrail, 4.0f); if ((o->oTimer & 0xF) == 0) cur_obj_play_sound_2(SOUND_OBJ_SUSHI_SHARK_WATER_SOUND); diff --git a/src/game/behaviors/tower_door.inc.c b/src/game/behaviors/tower_door.inc.c index 70bdf31c..3a988f3f 100644 --- a/src/game/behaviors/tower_door.inc.c +++ b/src/game/behaviors/tower_door.inc.c @@ -3,7 +3,7 @@ void bhv_tower_door_loop(void) { if (o->oTimer == 0) o->oMoveAngleYaw -= 0x4000; - if (check_mario_attacking(0)) { + if (check_mario_attacking()) { obj_explode_and_spawn_coins(80.0f, 0); create_sound_spawner(SOUND_GENERAL_WALL_EXPLOSION); } diff --git a/src/game/behaviors/tower_platform.inc.c b/src/game/behaviors/tower_platform.inc.c index 8103fa5d..5a973dff 100644 --- a/src/game/behaviors/tower_platform.inc.c +++ b/src/game/behaviors/tower_platform.inc.c @@ -35,15 +35,15 @@ void bhv_wf_elevator_tower_platform_loop(void) { } void bhv_wf_sliding_tower_platform_loop(void) { - s32 sp24 = o->oPlatformUnk110 / o->oPlatformUnk10C; + s32 moveTimer = o->oPlatformUnk110 / o->oPlatformUnk10C; switch (o->oAction) { case 0: - if (o->oTimer > sp24) + if (o->oTimer > moveTimer) o->oAction++; o->oForwardVel = -o->oPlatformUnk10C; break; case 1: - if (o->oTimer > sp24) + if (o->oTimer > moveTimer) o->oAction = 0; o->oForwardVel = o->oPlatformUnk10C; break; diff --git a/src/game/behaviors/treasure_chest.inc.c b/src/game/behaviors/treasure_chest.inc.c index 34b855e9..de38ca81 100644 --- a/src/game/behaviors/treasure_chest.inc.c +++ b/src/game/behaviors/treasure_chest.inc.c @@ -101,11 +101,11 @@ void bhv_treasure_chest_bottom_loop(void) { o->oInteractStatus = 0; } -void spawn_treasure_chest(s8 sp3B, s32 sp3C, s32 sp40, s32 sp44, s16 sp4A) { - struct Object *sp34; - sp34 = spawn_object_abs_with_rot(o, 0, MODEL_TREASURE_CHEST_BASE, bhvTreasureChestBottom, sp3C, - sp40, sp44, 0, sp4A, 0); - sp34->oBehParams2ndByte = sp3B; +void spawn_treasure_chest(s8 param, s32 x, s32 y, s32 z, s16 ry) { + struct Object *chestBaseObj; + chestBaseObj = spawn_object_abs_with_rot(o, 0, MODEL_TREASURE_CHEST_BASE, bhvTreasureChestBottom, x, + y, z, 0, ry, 0); + chestBaseObj->oBehParams2ndByte = param; } void bhv_treasure_chest_ship_init(void) { diff --git a/src/game/behaviors/tumbling_bridge.inc.c b/src/game/behaviors/tumbling_bridge.inc.c index 0879e7c4..cd5bdf91 100644 --- a/src/game/behaviors/tumbling_bridge.inc.c +++ b/src/game/behaviors/tumbling_bridge.inc.c @@ -5,7 +5,7 @@ #include "levels/lll/header.h" #include "levels/bitfs/header.h" -struct Struct8032F34C sTumblingBridgeParams[] = { +struct TumblingBridgeParams sTumblingBridgeParams[] = { { 9, -512, 0x80, MODEL_WF_TUMBLING_BRIDGE_PART, wf_seg7_collision_tumbling_bridge }, { 9, -412, 103, MODEL_BBH_TUMBLING_PLATFORM_PART, bbh_seg7_collision_07026B1C }, { 9, -512, 0x80, MODEL_LLL_FALLING_PLATFORM, lll_seg7_collision_0701D21C }, diff --git a/src/game/behaviors/tuxie.inc.c b/src/game/behaviors/tuxie.inc.c index d0713644..a2434251 100644 --- a/src/game/behaviors/tuxie.inc.c +++ b/src/game/behaviors/tuxie.inc.c @@ -12,11 +12,10 @@ void play_penguin_walking_sound(s32 walk) { } void tuxies_mother_act_2(void) { - f32 sp24; - UNUSED s32 unused; - struct Object *sp1C = cur_obj_find_nearest_object_with_behavior(bhvSmallPenguin, &sp24); + f32 dist; + struct Object *smallPenguinObj = cur_obj_find_nearest_object_with_behavior(bhvSmallPenguin, &dist); - if (cur_obj_find_nearby_held_actor(bhvUnused20E0, 1000.0f) != NULL) { + if (cur_obj_find_nearby_held_actor(bhvSmallPenguinReturned, 1000.0f) != NULL) { if (o->oSubAction == 0) { cur_obj_init_animation_with_sound(0); o->oForwardVel = 10.0f; @@ -33,24 +32,23 @@ void tuxies_mother_act_2(void) { o->oForwardVel = 0.0f; cur_obj_init_animation_with_sound(3); } - if (sp1C != NULL && sp24 < 300.0f && sp1C->oHeldState != HELD_FREE) { + if (smallPenguinObj != NULL && dist < 300.0f && smallPenguinObj->oHeldState != HELD_FREE) { o->oAction = 1; - sp1C->oSmallPenguinUnk88 = 1; - o->prevObj = sp1C; + smallPenguinObj->oSmallPenguinUnk88 = 1; + o->prevObj = smallPenguinObj; } } void tuxies_mother_act_1(void) { - s32 sp2C; - s32 sp28; + s32 motherParam, babyParam; s32 dialogID; switch (o->oSubAction) { case 0: cur_obj_init_animation_with_sound(3); if (!cur_obj_is_mario_on_platform()) { - sp2C = (o->oBehParams >> 0x10) & 0xFF; - sp28 = (o->prevObj->oBehParams >> 0x10) & 0xFF; - if (sp2C == sp28) + motherParam = (o->oBehParams >> 0x10) & 0xFF; + babyParam = (o->prevObj->oBehParams >> 0x10) & 0xFF; + if (motherParam == babyParam) dialogID = DIALOG_058; else dialogID = DIALOG_059; @@ -76,7 +74,7 @@ void tuxies_mother_act_1(void) { // which has no effect as o->prevObj->oUnknownUnk88 is always 0 // or 1, which is not affected by the bitwise AND. o->prevObj->OBJECT_FIELD_S32(o->oInteractionSubtype) &= ~INT_SUBTYPE_DROP_IMMEDIATELY; - obj_set_behavior(o->prevObj, bhvUnused20E0); + obj_set_behavior(o->prevObj, bhvSmallPenguinReturned); #ifndef VERSION_JP cur_obj_spawn_star_at_y_offset(3167.0f, -4300.0f, 5108.0f, 200.0f); #else @@ -97,24 +95,23 @@ void tuxies_mother_act_1(void) { } void tuxies_mother_act_0(void) { - s32 sp2C; - f32 sp28; - struct Object *sp24; - sp2C = 0; - sp24 = cur_obj_find_nearest_object_with_behavior(bhvSmallPenguin, &sp28); + struct Object *smallPenguinObj; + s32 nearBaby = FALSE; + f32 dist; + smallPenguinObj = cur_obj_find_nearest_object_with_behavior(bhvSmallPenguin, &dist); cur_obj_scale(4.0f); cur_obj_init_animation_with_sound(3); - if (sp28 < 500.0f) - sp2C = 1; - if (sp24 != NULL && sp28 < 300.0f && sp24->oHeldState != HELD_FREE) { + if (dist < 500.0f) + nearBaby = TRUE; + if (smallPenguinObj != NULL && dist < 300.0f && smallPenguinObj->oHeldState != HELD_FREE) { o->oAction = 1; - sp24->oSmallPenguinUnk88 = 1; - o->prevObj = sp24; + smallPenguinObj->oSmallPenguinUnk88 = 1; + o->prevObj = smallPenguinObj; } else { switch (o->oSubAction) { case 0: if (cur_obj_can_mario_activate_textbox_2(300.0f, 100.0f)) - if (sp2C == 0) + if (!nearBaby) o->oSubAction++; break; case 1: @@ -152,17 +149,17 @@ void small_penguin_dive_with_mario(void) { } void small_penguin_act_2(void) { - s32 sp1C = 0; + s32 nearMother = FALSE; if (o->oTimer == 0) if (cur_obj_dist_to_nearest_object_with_behavior(bhvTuxiesMother) < 1000.0f) - sp1C = 1; + nearMother = TRUE; cur_obj_init_animation_with_sound(0); o->oForwardVel = o->oSmallPenguinUnk104 + 3.0f; cur_obj_rotate_yaw_toward(o->oAngleToMario + 0x8000, o->oSmallPenguinUnk110 + 0x600); if (o->oDistanceToMario > o->oSmallPenguinUnk108 + 500.0f) o->oAction = 0; small_penguin_dive_with_mario(); - if (sp1C) + if (nearMother) o->oAction = 5; } @@ -198,9 +195,7 @@ void small_penguin_act_4(void) { } void small_penguin_act_0(void) { - s32 sp1C; - - sp1C = 0; + s32 nearMother = FALSE; cur_obj_init_animation_with_sound(3); if (o->oTimer == 0) { o->oSmallPenguinUnk110 = (s32)(random_float() * 0x400); @@ -208,33 +203,33 @@ void small_penguin_act_0(void) { o->oSmallPenguinUnk104 = random_float(); o->oForwardVel = 0.0f; if (cur_obj_dist_to_nearest_object_with_behavior(bhvTuxiesMother) < 1000.0f) - sp1C = 1; + nearMother = TRUE; } if (o->oDistanceToMario < 1000.0f && o->oSmallPenguinUnk108 + 600.0f < o->oDistanceToMario) o->oAction = 1; else if (o->oDistanceToMario < o->oSmallPenguinUnk108 + 300.0f) o->oAction = 2; - if (sp1C) + if (nearMother) o->oAction = 5; if (cur_obj_mario_far_away()) cur_obj_set_pos_to_home(); } void small_penguin_act_5(void) { - f32 sp24; - s16 sp22; - struct Object *sp1C = cur_obj_nearest_object_with_behavior(bhvTuxiesMother); - if (sp1C != NULL) { + f32 distToMother; + s16 angleToMother; + struct Object *motherPenguinObj = cur_obj_nearest_object_with_behavior(bhvTuxiesMother); + if (motherPenguinObj != NULL) { if (o->oDistanceToMario < 1000.0f) o->oForwardVel = 2.0f; else o->oForwardVel = 0.0f; - sp24 = dist_between_objects(o, sp1C); - sp22 = obj_angle_to_object(o, sp1C); - if (sp24 > 200.0f) - cur_obj_rotate_yaw_toward(sp22, 0x400); + distToMother = dist_between_objects(o, motherPenguinObj); + angleToMother = obj_angle_to_object(o, motherPenguinObj); + if (distToMother > 200.0f) + cur_obj_rotate_yaw_toward(angleToMother, 0x400); else - cur_obj_rotate_yaw_toward(sp22 + 0x8000, 0x400); + cur_obj_rotate_yaw_toward(angleToMother + 0x8000, 0x400); cur_obj_init_animation_with_sound(0); } small_penguin_dive_with_mario(); diff --git a/src/game/behaviors/unagi.inc.c b/src/game/behaviors/unagi.inc.c index 063ca6c6..da2e036c 100644 --- a/src/game/behaviors/unagi.inc.c +++ b/src/game/behaviors/unagi.inc.c @@ -140,13 +140,13 @@ void unagi_act_3(void) { } void bhv_unagi_loop(void) { - s32 val04; + s32 i; if (o->oUnagiUnk1B2 == 0) { o->oUnagiUnk1AC = 99999.0f; if (o->oDistanceToMario < 3000.0f) { - for (val04 = -4; val04 < 4; val04++) { - spawn_object_relative(val04, 0, 0, 0, o, MODEL_NONE, bhvUnagiSubobject); + for (i = -4; i < 4; i++) { + spawn_object_relative(i, 0, 0, 0, o, MODEL_NONE, bhvUnagiSubobject); } o->oUnagiUnk1B2 = 1; } @@ -174,19 +174,19 @@ void bhv_unagi_loop(void) { } void bhv_unagi_subobject_loop(void) { - f32 val04; + f32 offset; if (o->parentObj->oUnagiUnk1B2 == 0) { obj_mark_for_deletion(o); } else { - val04 = 300.0f * o->oBehParams2ndByte; + offset = 300.0f * o->oBehParams2ndByte; - o->oPosY = o->parentObj->oPosY - val04 * sins(o->parentObj->oFaceAnglePitch) * 1.13f; + o->oPosY = o->parentObj->oPosY - offset * sins(o->parentObj->oFaceAnglePitch) * 1.13f; - val04 = coss(o->parentObj->oFaceAnglePitch / 2) * val04; + offset = coss(o->parentObj->oFaceAnglePitch / 2) * offset; - o->oPosX = o->parentObj->oPosX + val04 * sins(o->parentObj->oFaceAngleYaw); - o->oPosZ = o->parentObj->oPosZ + val04 * coss(o->parentObj->oFaceAngleYaw); + o->oPosX = o->parentObj->oPosX + offset * sins(o->parentObj->oFaceAngleYaw); + o->oPosZ = o->parentObj->oPosZ + offset * coss(o->parentObj->oFaceAngleYaw); if (o->oBehParams2ndByte == -4) { if (o->parentObj->oAnimState != 0 && o->oDistanceToMario < 150.0f) { diff --git a/src/game/behaviors/water_bomb_cannon.inc.c b/src/game/behaviors/water_bomb_cannon.inc.c index 8e9ba33b..66057fd5 100644 --- a/src/game/behaviors/water_bomb_cannon.inc.c +++ b/src/game/behaviors/water_bomb_cannon.inc.c @@ -1,7 +1,7 @@ // water_bomb_cannon.inc.c void bhv_bubble_cannon_barrel_loop(void) { - struct Object *val04; + struct Object *waterBombObj; if (o->parentObj->oAction == 2) { obj_mark_for_deletion(o); @@ -22,10 +22,10 @@ void bhv_bubble_cannon_barrel_loop(void) { if (o->oForwardVel == 0.0f) { o->oForwardVel = 35.0f; - val04 = spawn_object(o, MODEL_WATER_BOMB, bhvWaterBomb); - if (val04 != NULL) { - val04->oForwardVel = -100.0f; - val04->header.gfx.scale[1] = 1.7f; + waterBombObj = spawn_object(o, MODEL_WATER_BOMB, bhvWaterBomb); + if (waterBombObj != NULL) { + waterBombObj->oForwardVel = -100.0f; + waterBombObj->header.gfx.scale[1] = 1.7f; } set_camera_shake_from_point(SHAKE_POS_MEDIUM, o->oPosX, o->oPosY, o->oPosZ); diff --git a/src/game/behaviors/water_mist_particle.inc.c b/src/game/behaviors/water_mist_particle.inc.c index cb9243ae..9b384aa7 100644 --- a/src/game/behaviors/water_mist_particle.inc.c +++ b/src/game/behaviors/water_mist_particle.inc.c @@ -7,15 +7,15 @@ void bhv_water_mist_spawn_loop(void) { } void bhv_water_mist_loop(void) { - f32 sp1C; + f32 scale; if (o->oTimer == 0) { o->oMoveAngleYaw = gMarioObject->oMoveAngleYaw; obj_translate_xz_random(o, 10.0f); } cur_obj_move_using_fvel_and_gravity(); o->oOpacity -= 42; - sp1C = (254 - o->oOpacity) / 254.0 * 1.0 + 0.5; // seen this before - cur_obj_scale(sp1C); + scale = (254 - o->oOpacity) / 254.0 * 1.0 + 0.5; // seen this before + cur_obj_scale(scale); if (o->oOpacity < 2) obj_mark_for_deletion(o); } diff --git a/src/game/behaviors/water_objs.inc.c b/src/game/behaviors/water_objs.inc.c index e907e93e..df729cf4 100644 --- a/src/game/behaviors/water_objs.inc.c +++ b/src/game/behaviors/water_objs.inc.c @@ -55,12 +55,12 @@ void bhv_bubble_maybe_loop(void) { } void bhv_small_water_wave_loop(void) { - f32 sp1C = find_water_level(o->oPosX, o->oPosZ); + f32 waterLevel = find_water_level(o->oPosX, o->oPosZ); o->header.gfx.scale[0] = sins(o->oWaterObjUnkF4) * 0.2 + 1.0; o->oWaterObjUnkF4 += o->oWaterObjUnkFC; o->header.gfx.scale[1] = sins(o->oWaterObjUnkF8) * 0.2 + 1.0; o->oWaterObjUnkF8 += o->oWaterObjUnk100; - if (o->oPosY > sp1C) { + if (o->oPosY > waterLevel) { o->activeFlags = ACTIVE_FLAG_DEACTIVATED; o->oPosY += 5.0f; if (gFreeObjectList.next != NULL) @@ -85,11 +85,11 @@ void bhv_particle_init(void) { } void bhv_particle_loop() { - f32 sp24 = find_water_level(o->oPosX, o->oPosZ); + f32 waterLevel = find_water_level(o->oPosX, o->oPosZ); o->oPosY += 5.0f; obj_translate_xz_random(o, 4.0f); scale_bubble_sin(); - if (o->oPosY > sp24 && o->oTimer) { + if (o->oPosY > waterLevel && o->oTimer) { obj_mark_for_deletion(o); try_to_spawn_object(5, 0, o, MODEL_SMALL_WATER_SPLASH, bhvObjectWaterSplash); } @@ -108,7 +108,7 @@ void bhv_fish_group_loop(void) { } void bhv_water_waves_init(void) { - s32 sp1C; - for (sp1C = 0; sp1C < 3; sp1C++) + s32 i; + for (i = 0; i < 3; i++) spawn_object(o, MODEL_WHITE_PARTICLE_SMALL, bhvSmallParticle); } diff --git a/src/game/behaviors/water_ring.inc.c b/src/game/behaviors/water_ring.inc.c index 68aab7b6..6f272172 100644 --- a/src/game/behaviors/water_ring.inc.c +++ b/src/game/behaviors/water_ring.inc.c @@ -41,9 +41,6 @@ void bhv_jet_stream_water_ring_init(void) { o->oFaceAnglePitch = 0x8000; } -// sp28 = arg0 -// sp2c = ringManager - void water_ring_check_collection(f32 avgScale, struct Object *ringManager) { f32 marioDistInFront = water_ring_calc_mario_dist(); struct Object *ringSpawner; diff --git a/src/game/behaviors/white_puff.inc.c b/src/game/behaviors/white_puff.inc.c index 5bd7872d..8b51c8c2 100644 --- a/src/game/behaviors/white_puff.inc.c +++ b/src/game/behaviors/white_puff.inc.c @@ -1,13 +1,11 @@ // white_puff.c.inc void bhv_white_puff_1_loop(void) { - f32 sp1C = 0.1f; - f32 sp18 = 0.5f; if (o->oTimer == 0) { obj_translate_xz_random(o, 40.0f); o->oPosY += 30.0f; } - cur_obj_scale(o->oTimer * sp18 + sp1C); + cur_obj_scale(o->oTimer * 0.5f + 0.1f); o->oOpacity = 50; cur_obj_move_using_fvel_and_gravity(); if (o->oTimer > 4) diff --git a/src/game/behaviors/white_puff_explode.inc.c b/src/game/behaviors/white_puff_explode.inc.c index 510058ad..0e48c782 100644 --- a/src/game/behaviors/white_puff_explode.inc.c +++ b/src/game/behaviors/white_puff_explode.inc.c @@ -1,7 +1,7 @@ // white_puff_explode.c.inc void bhv_white_puff_exploding_loop(void) { - f32 sp24; + f32 scale; if (o->oTimer == 0) { cur_obj_compute_vel_xz(); o->oWhitePuffUnkF4 = o->header.gfx.scale[0]; @@ -29,9 +29,9 @@ void bhv_white_puff_exploding_loop(void) { if (o->oOpacity < 2) obj_mark_for_deletion(o); if (o->oWhitePuffUnkFC) - sp24 = o->oWhitePuffUnkF4 * ((254 - o->oOpacity) / 254.0); + scale = o->oWhitePuffUnkF4 * ((254 - o->oOpacity) / 254.0); else - sp24 = o->oWhitePuffUnkF4 * (o->oOpacity / 254.0); - cur_obj_scale(sp24); + scale = o->oWhitePuffUnkF4 * (o->oOpacity / 254.0); + cur_obj_scale(scale); } } diff --git a/src/game/behaviors/wind.inc.c b/src/game/behaviors/wind.inc.c index a1c58dd4..16d782ac 100644 --- a/src/game/behaviors/wind.inc.c +++ b/src/game/behaviors/wind.inc.c @@ -10,26 +10,24 @@ void spawn_wind_particles(s16 pitch, s16 yaw) { } void bhv_wind_loop(void) { - s16 sp2E = 500; - f32 sp28 = 1.0f; if (o->oTimer == 0) { o->oOpacity = 100; if (o->oMoveAnglePitch == 0) { obj_translate_xz_random(o, 900.0f); - o->oPosX += sins(o->oMoveAngleYaw + 0x8000) * sp2E; // NOP as Pitch is 0 + o->oPosX += sins(o->oMoveAngleYaw + 0x8000) * 500; // NOP as Pitch is 0 o->oPosY += 80.0f + random_f32_around_zero(200.0f); - o->oPosZ += coss(o->oMoveAngleYaw + 0x8000) * sp2E; // -coss(a) * sp2E + o->oPosZ += coss(o->oMoveAngleYaw + 0x8000) * 500; // -coss(a) * sp2E o->oMoveAngleYaw += random_f32_around_zero(4000.0f); o->oForwardVel = random_float() * 70.0f + 50.0f; } else { obj_translate_xz_random(o, 600.0f); - o->oPosY -= sp2E - 200; // 300 + o->oPosY -= 500 - 200; // 300 o->oVelY = random_float() * 30.0f + 50.0f; o->oMoveAngleYaw = random_u16(); o->oForwardVel = 10.0f; } obj_set_billboard(o); - cur_obj_scale(sp28); + cur_obj_scale(1.0f); //? } if (o->oTimer > 8) obj_mark_for_deletion(o); diff --git a/src/game/behaviors/yoshi.inc.c b/src/game/behaviors/yoshi.inc.c index f2ba6de6..38b26686 100644 --- a/src/game/behaviors/yoshi.inc.c +++ b/src/game/behaviors/yoshi.inc.c @@ -19,7 +19,7 @@ void bhv_yoshi_init(void) { void yoshi_walk_loop(void) { UNUSED s16 collisionFlags; - s16 sp24 = o->header.gfx.animInfo.animFrame; + s16 animFrame = o->header.gfx.animInfo.animFrame; o->oForwardVel = 10.0f; collisionFlags = object_step(); @@ -28,7 +28,7 @@ void yoshi_walk_loop(void) { o->oAction = YOSHI_ACT_IDLE; cur_obj_init_animation(1); - if (sp24 == 0 || sp24 == 15) + if (animFrame == 0 || animFrame == 15) cur_obj_play_sound_2(SOUND_GENERAL_YOSHI_WALK); if (o->oInteractStatus == INT_STATUS_INTERACTED) @@ -42,7 +42,6 @@ void yoshi_walk_loop(void) { void yoshi_idle_loop(void) { s16 chosenHome; - UNUSED s16 sp1C = o->header.gfx.animInfo.animFrame; if (o->oTimer > 90) { chosenHome = random_float() * 3.99; @@ -95,7 +94,7 @@ void yoshi_talk_loop(void) { } void yoshi_walk_and_jump_off_roof_loop(void) { - s16 sp26 = o->header.gfx.animInfo.animFrame; + s16 animFrame = o->header.gfx.animInfo.animFrame; o->oForwardVel = 10.0f; object_step(); @@ -113,7 +112,7 @@ void yoshi_walk_and_jump_off_roof_loop(void) { o->oAction = YOSHI_ACT_FINISH_JUMPING_AND_DESPAWN; } - if (sp26 == 0 || sp26 == 15) { + if (animFrame == 0 || animFrame == 15) { cur_obj_play_sound_2(SOUND_GENERAL_YOSHI_WALK); } } @@ -131,7 +130,7 @@ void yoshi_finish_jumping_and_despawn_loop(void) { } void yoshi_give_present_loop(void) { - s32 sp1C = gGlobalTimer; + s32 timer = gGlobalTimer; if (gHudDisplay.lives == 100) { play_sound(SOUND_GENERAL_COLLECT_1UP, gGlobalSoundSource); @@ -140,7 +139,7 @@ void yoshi_give_present_loop(void) { return; } - if ((sp1C & 0x03) == 0) { + if ((timer & 0x03) == 0) { play_sound(SOUND_MENU_YOSHI_GAIN_LIVES, gGlobalSoundSource); gMarioState->numLives++; } diff --git a/src/game/debug.c b/src/game/debug.c index 060002bb..27a57710 100644 --- a/src/game/debug.c +++ b/src/game/debug.c @@ -325,7 +325,7 @@ void reset_debug_objectinfo(void) { gObjectCounter = 0; sDebugStringArrPrinted = FALSE; D_8035FEE2 = 0; - D_8035FEE4 = 0; + gDoorRenderingTimer = 0; set_print_state_info(gDebugPrintState1, 20, 185, 40, 200, -15); set_print_state_info(gDebugPrintState2, 180, 30, 0, 150, 15); diff --git a/src/game/envfx_bubbles.c b/src/game/envfx_bubbles.c index b67b72fd..a05e6205 100644 --- a/src/game/envfx_bubbles.c +++ b/src/game/envfx_bubbles.c @@ -205,17 +205,15 @@ void envfx_rotate_around_whirlpool(s32 *x, s32 *y, s32 *z) { * low or close to the center. */ s32 envfx_is_whirlpool_bubble_alive(s32 index) { - s32 UNUSED sp4; - if ((gEnvFxBuffer + index)->bubbleY < gEnvFxBubbleConfig[ENVFX_STATE_DEST_Y] - 100) { - return 0; + return FALSE; } if ((gEnvFxBuffer + index)->angleAndDist[1] < 10) { - return 0; + return FALSE; } - return 1; + return TRUE; } /** diff --git a/src/game/level_update.c b/src/game/level_update.c index 24308761..5570d28f 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -580,47 +580,47 @@ void check_instant_warp(void) { } } -s16 music_changed_through_warp(s16 arg) { +s16 music_unchanged_through_warp(s16 arg) { struct ObjectWarpNode *warpNode = area_get_warp_node(arg); s16 levelNum = warpNode->node.destLevel & 0x7F; #if BUGFIX_KOOPA_RACE_MUSIC s16 destArea = warpNode->node.destArea; - s16 val4 = TRUE; - s16 sp2C; + s16 unchanged = TRUE; + s16 currBgMusic; if (levelNum == LEVEL_BOB && levelNum == gCurrLevelNum && destArea == gCurrAreaIndex) { - sp2C = get_current_background_music(); - if (sp2C == SEQUENCE_ARGS(4, SEQ_EVENT_POWERUP | SEQ_VARIATION) - || sp2C == SEQUENCE_ARGS(4, SEQ_EVENT_POWERUP)) { - val4 = 0; + currBgMusic = get_current_background_music(); + if (currBgMusic == SEQUENCE_ARGS(4, SEQ_EVENT_POWERUP | SEQ_VARIATION) + || currBgMusic == SEQUENCE_ARGS(4, SEQ_EVENT_POWERUP)) { + unchanged = FALSE; } } else { - u16 val8 = gAreas[destArea].musicParam; - u16 val6 = gAreas[destArea].musicParam2; + u16 destParam1 = gAreas[destArea].musicParam; + u16 destParam2 = gAreas[destArea].musicParam2; - val4 = levelNum == gCurrLevelNum && val8 == gCurrentArea->musicParam - && val6 == gCurrentArea->musicParam2; + unchanged = levelNum == gCurrLevelNum && destParam1 == gCurrentArea->musicParam + && destParam2 == gCurrentArea->musicParam2; - if (get_current_background_music() != val6) { - val4 = FALSE; + if (get_current_background_music() != destParam2) { + unchanged = FALSE; } } - return val4; + return unchanged; #else - u16 val8 = gAreas[warpNode->node.destArea].musicParam; - u16 val6 = gAreas[warpNode->node.destArea].musicParam2; + u16 destParam1 = gAreas[warpNode->node.destArea].musicParam; + u16 destParam2 = gAreas[warpNode->node.destArea].musicParam2; - s16 val4 = levelNum == gCurrLevelNum && val8 == gCurrentArea->musicParam - && val6 == gCurrentArea->musicParam2; + s16 unchanged = levelNum == gCurrLevelNum && destParam1 == gCurrentArea->musicParam + && destParam2 == gCurrentArea->musicParam2; - if (get_current_background_music() != val6) { - val4 = FALSE; + if (get_current_background_music() != destParam2) { + unchanged = FALSE; } - return val4; + return unchanged; #endif } @@ -738,7 +738,7 @@ void initiate_painting_warp(void) { * Return the time left until the delayed warp is initiated. */ s16 level_trigger_warp(struct MarioState *m, s32 warpOp) { - s32 val04 = TRUE; + s32 fadeMusic = TRUE; if (sDelayedWarpOp == WARP_OP_NONE) { m->invincTimer = -1; @@ -750,14 +750,14 @@ s16 level_trigger_warp(struct MarioState *m, s32 warpOp) { case WARP_OP_DEMO_END: sDelayedWarpTimer = 20; // Must be one line to match on -O2 sSourceWarpNodeId = WARP_NODE_F0; gSavedCourseNum = COURSE_NONE; - val04 = FALSE; + fadeMusic = FALSE; play_transition(WARP_TRANSITION_FADE_INTO_STAR, 0x14, 0x00, 0x00, 0x00); break; case WARP_OP_CREDITS_END: sDelayedWarpTimer = 60; sSourceWarpNodeId = WARP_NODE_F0; - val04 = FALSE; + fadeMusic = FALSE; gSavedCourseNum = COURSE_NONE; play_transition(WARP_TRANSITION_FADE_INTO_COLOR, 0x3C, 0x00, 0x00, 0x00); break; @@ -817,7 +817,7 @@ s16 level_trigger_warp(struct MarioState *m, s32 warpOp) { case WARP_OP_TELEPORT: sDelayedWarpTimer = 20; sSourceWarpNodeId = (m->usedObj->oBehParams & 0x00FF0000) >> 16; - val04 = !music_changed_through_warp(sSourceWarpNodeId); + fadeMusic = !music_unchanged_through_warp(sSourceWarpNodeId); play_transition(WARP_TRANSITION_FADE_INTO_COLOR, 0x14, 0xFF, 0xFF, 0xFF); break; @@ -825,14 +825,14 @@ s16 level_trigger_warp(struct MarioState *m, s32 warpOp) { sDelayedWarpTimer = 20; sDelayedWarpArg = m->actionArg; sSourceWarpNodeId = (m->usedObj->oBehParams & 0x00FF0000) >> 16; - val04 = !music_changed_through_warp(sSourceWarpNodeId); + fadeMusic = !music_unchanged_through_warp(sSourceWarpNodeId); play_transition(WARP_TRANSITION_FADE_INTO_CIRCLE, 0x14, 0x00, 0x00, 0x00); break; case WARP_OP_WARP_OBJECT: sDelayedWarpTimer = 20; sSourceWarpNodeId = (m->usedObj->oBehParams & 0x00FF0000) >> 16; - val04 = !music_changed_through_warp(sSourceWarpNodeId); + fadeMusic = !music_unchanged_through_warp(sSourceWarpNodeId); play_transition(WARP_TRANSITION_FADE_INTO_STAR, 0x14, 0x00, 0x00, 0x00); break; @@ -849,11 +849,11 @@ s16 level_trigger_warp(struct MarioState *m, s32 warpOp) { sDelayedWarpTimer = 20; play_transition(WARP_TRANSITION_FADE_INTO_COLOR, 0x14, 0x00, 0x00, 0x00); } - val04 = FALSE; + fadeMusic = FALSE; break; } - if (val04 && gCurrDemoInput == NULL) { + if (fadeMusic && gCurrDemoInput == NULL) { fadeout_music((3 * sDelayedWarpTimer / 2) * 8 - 2); } } @@ -1207,7 +1207,7 @@ s32 update_level(void) { } s32 init_level(void) { - s32 val4 = 0; + s32 fadeFromColor = FALSE; #if PUPPYPRINT_DEBUG OSTime first = osGetTime(); #endif @@ -1258,13 +1258,13 @@ s32 init_level(void) { set_mario_action(gMarioState, ACT_IDLE, 0); } else { set_mario_action(gMarioState, ACT_INTRO_CUTSCENE, 0); - val4 = 1; + fadeFromColor = TRUE; } } } } #endif - if (val4 != 0) { + if (fadeFromColor) { play_transition(WARP_TRANSITION_FADE_FROM_COLOR, 0x5A, 0xFF, 0xFF, 0xFF); } else { play_transition(WARP_TRANSITION_FADE_FROM_STAR, 0x10, 0xFF, 0xFF, 0xFF); @@ -1291,25 +1291,14 @@ s32 init_level(void) { #if PUPPYPRINT_DEBUG append_puppyprint_log("Level loaded in %dus", (s32)(OS_CYCLES_TO_USEC(osGetTime() - first))); #endif - return 1; + return TRUE; } /** * Initialize the current level if initOrUpdate is 0, or update the level if it is 1. */ s32 lvl_init_or_update(s16 initOrUpdate, UNUSED s32 unused) { - s32 result = 0; - - switch (initOrUpdate) { - case 0: - result = init_level(); - break; - case 1: - result = update_level(); - break; - } - - return result; + return (initOrUpdate ? update_level() : init_level()); } #if MULTILANG diff --git a/src/game/main.h b/src/game/main.h index ddb7d02a..21f196f4 100644 --- a/src/game/main.h +++ b/src/game/main.h @@ -4,21 +4,21 @@ #include "config.h" struct RumbleData { - u8 unk00; - u8 unk01; - s16 unk02; - s16 unk04; + u8 unk00; // comm + u8 unk01; // level + s16 unk02; // time + s16 unk04; // decay }; -struct StructSH8031D9B0 { - s16 unk00; - s16 unk02; - s16 unk04; - s16 unk06; - s16 unk08; - s16 unk0A; - s16 unk0C; - s16 unk0E; +struct RumbleSettings { + s16 unk00; // event + s16 unk02; // level + s16 unk04; // timer + s16 unk06; // count + s16 unk08; // start + s16 unk0A; // slip + s16 unk0C; // vibrate + s16 unk0E; // decay }; extern OSThread D_80339210; @@ -54,7 +54,7 @@ extern OSMesg gRumblePakSchedulerMesgBuf[1]; extern OSMesg gRumbleThreadVIMesgBuf[1]; extern struct RumbleData gRumbleDataQueue[3]; -extern struct StructSH8031D9B0 gCurrRumbleSettings; +extern struct RumbleSettings gCurrRumbleSettings; #endif extern struct VblankHandler *gVblankHandler1; diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c index 5a023eb8..47e62040 100644 --- a/src/game/mario_actions_automatic.c +++ b/src/game/mario_actions_automatic.c @@ -190,7 +190,7 @@ s32 act_holding_pole(struct MarioState *m) { } s32 act_climbing_pole(struct MarioState *m) { - s32 sp24; + s32 animSpeed; struct Object *marioObj = m->marioObj; s16 cameraAngle = m->area->camera->yaw; @@ -217,8 +217,8 @@ s32 act_climbing_pole(struct MarioState *m) { m->faceAngle[1] = cameraAngle - approach_s32((s16)(cameraAngle - m->faceAngle[1]), 0, 0x400, 0x400); if (set_pole_position(m, 0.0f) == POLE_NONE) { - sp24 = m->controller->stickY / 4.0f * 0x10000; - set_mario_anim_with_accel(m, MARIO_ANIM_CLIMB_UP_POLE, sp24); + animSpeed = m->controller->stickY / 4.0f * 0x10000; + set_mario_anim_with_accel(m, MARIO_ANIM_CLIMB_UP_POLE, animSpeed); add_tree_leaf_particles(m); play_climbing_sounds(m, 1); } @@ -522,15 +522,15 @@ void climb_up_ledge(struct MarioState *m) { } void update_ledge_climb_camera(struct MarioState *m) { - f32 sp4; + f32 dist; if (m->actionTimer < 14) { - sp4 = m->actionTimer; + dist = m->actionTimer; } else { - sp4 = 14.0f; + dist = 14.0f; } - m->statusForCamera->pos[0] = m->pos[0] + sp4 * sins(m->faceAngle[1]); - m->statusForCamera->pos[2] = m->pos[2] + sp4 * coss(m->faceAngle[1]); + m->statusForCamera->pos[0] = m->pos[0] + dist * sins(m->faceAngle[1]); + m->statusForCamera->pos[2] = m->pos[2] + dist * coss(m->faceAngle[1]); m->statusForCamera->pos[1] = m->pos[1]; m->actionTimer++; m->flags |= MARIO_UNKNOWN_25; diff --git a/src/game/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c index 07458cff..fb05f35f 100644 --- a/src/game/mario_actions_cutscene.c +++ b/src/game/mario_actions_cutscene.c @@ -1982,18 +1982,16 @@ void generate_yellow_sparkles(s16 x, s16 y, s16 z, f32 radius) { // (animation related?) static f32 end_obj_set_visual_pos(struct Object *o) { struct Surface *surf; - Vec3s sp24; - f32 sp20; - f32 sp1C; - f32 sp18; + Vec3s translation; + f32 x, y, z; - find_mario_anim_flags_and_translation(o, o->header.gfx.angle[1], sp24); + find_mario_anim_flags_and_translation(o, o->header.gfx.angle[1], translation); - sp20 = o->header.gfx.pos[0] + sp24[0]; - sp1C = o->header.gfx.pos[1] + 10.0f; - sp18 = o->header.gfx.pos[2] + sp24[2]; + x = o->header.gfx.pos[0] + translation[0]; + y = o->header.gfx.pos[1] + 10.0f; + z = o->header.gfx.pos[2] + translation[2]; - return find_floor(sp20, sp1C, sp18, &surf); + return find_floor(x, y, z, &surf); } // make Mario fall and soften wing cap gravity diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c index b6248cbb..a24f05dd 100644 --- a/src/game/mario_actions_moving.c +++ b/src/game/mario_actions_moving.c @@ -521,85 +521,83 @@ s32 begin_braking_action(struct MarioState *m) { } void anim_and_audio_for_walk(struct MarioState *m) { - s32 val14; + s32 animSpeed; struct Object *marioObj = m->marioObj; - s32 val0C = TRUE; + s32 inLoop = TRUE; s16 targetPitch = 0; - f32 val04; + f32 intendedSpeed = m->intendedMag > m->forwardVel ? m->intendedMag : m->forwardVel; - val04 = m->intendedMag > m->forwardVel ? m->intendedMag : m->forwardVel; - - if (val04 < 4.0f) { - val04 = 4.0f; + if (intendedSpeed < 4.0f) { + intendedSpeed = 4.0f; } if (m->quicksandDepth > 50.0f) { - val14 = (s32)(val04 / 4.0f * 0x10000); - set_mario_anim_with_accel(m, MARIO_ANIM_MOVE_IN_QUICKSAND, val14); + animSpeed = (s32)(intendedSpeed / 4.0f * 0x10000); + set_mario_anim_with_accel(m, MARIO_ANIM_MOVE_IN_QUICKSAND, animSpeed); play_step_sound(m, 19, 93); m->actionTimer = 0; } else { - while (val0C) { + while (inLoop) { switch (m->actionTimer) { case 0: - if (val04 > 8.0f) { + if (intendedSpeed > 8.0f) { m->actionTimer = 2; } else { //! (Speed Crash) If Mario's speed is more than 2^17. - if ((val14 = (s32)(val04 / 4.0f * 0x10000)) < 0x1000) { - val14 = 0x1000; + if ((animSpeed = (s32)(intendedSpeed / 4.0f * 0x10000)) < 0x1000) { + animSpeed = 0x1000; } - set_mario_anim_with_accel(m, MARIO_ANIM_START_TIPTOE, val14); + set_mario_anim_with_accel(m, MARIO_ANIM_START_TIPTOE, animSpeed); play_step_sound(m, 7, 22); if (is_anim_past_frame(m, 23)) { m->actionTimer = 2; } - val0C = FALSE; + inLoop = FALSE; } break; case 1: - if (val04 > 8.0f) { + if (intendedSpeed > 8.0f) { m->actionTimer = 2; } else { //! (Speed Crash) If Mario's speed is more than 2^17. - if ((val14 = (s32)(val04 * 0x10000)) < 0x1000) { - val14 = 0x1000; + if ((animSpeed = (s32)(intendedSpeed * 0x10000)) < 0x1000) { + animSpeed = 0x1000; } - set_mario_anim_with_accel(m, MARIO_ANIM_TIPTOE, val14); + set_mario_anim_with_accel(m, MARIO_ANIM_TIPTOE, animSpeed); play_step_sound(m, 14, 72); - val0C = FALSE; + inLoop = FALSE; } break; case 2: - if (val04 < 5.0f) { + if (intendedSpeed < 5.0f) { m->actionTimer = 1; - } else if (val04 > 22.0f) { + } else if (intendedSpeed > 22.0f) { m->actionTimer = 3; } else { //! (Speed Crash) If Mario's speed is more than 2^17. - val14 = (s32)(val04 / 4.0f * 0x10000); - set_mario_anim_with_accel(m, MARIO_ANIM_WALKING, val14); + animSpeed = (s32)(intendedSpeed / 4.0f * 0x10000); + set_mario_anim_with_accel(m, MARIO_ANIM_WALKING, animSpeed); play_step_sound(m, 10, 49); - val0C = FALSE; + inLoop = FALSE; } break; case 3: - if (val04 < 18.0f) { + if (intendedSpeed < 18.0f) { m->actionTimer = 2; } else { //! (Speed Crash) If Mario's speed is more than 2^17. - val14 = (s32)(val04 / 4.0f * 0x10000); - set_mario_anim_with_accel(m, MARIO_ANIM_RUNNING, val14); + animSpeed = (s32)(intendedSpeed / 4.0f * 0x10000); + set_mario_anim_with_accel(m, MARIO_ANIM_RUNNING, animSpeed); play_step_sound(m, 9, 45); targetPitch = tilt_body_running(m); - val0C = FALSE; + inLoop = FALSE; } break; } @@ -612,56 +610,54 @@ void anim_and_audio_for_walk(struct MarioState *m) { } void anim_and_audio_for_hold_walk(struct MarioState *m) { - s32 val0C; - s32 val08 = TRUE; - f32 val04; + s32 animSpeed; + s32 inLoop = TRUE; + f32 intendedSpeed = m->intendedMag > m->forwardVel ? m->intendedMag : m->forwardVel; - val04 = m->intendedMag > m->forwardVel ? m->intendedMag : m->forwardVel; - - if (val04 < 2.0f) { - val04 = 2.0f; + if (intendedSpeed < 2.0f) { + intendedSpeed = 2.0f; } - while (val08) { + while (inLoop) { switch (m->actionTimer) { case 0: - if (val04 > 6.0f) { + if (intendedSpeed > 6.0f) { m->actionTimer = 1; } else { //! (Speed Crash) Crashes if Mario's speed exceeds or equals 2^15. - val0C = (s32)(val04 * 0x10000); - set_mario_anim_with_accel(m, MARIO_ANIM_SLOW_WALK_WITH_LIGHT_OBJ, val0C); + animSpeed = (s32)(intendedSpeed * 0x10000); + set_mario_anim_with_accel(m, MARIO_ANIM_SLOW_WALK_WITH_LIGHT_OBJ, animSpeed); play_step_sound(m, 12, 62); - val08 = FALSE; + inLoop = FALSE; } break; case 1: - if (val04 < 3.0f) { + if (intendedSpeed < 3.0f) { m->actionTimer = 0; - } else if (val04 > 11.0f) { + } else if (intendedSpeed > 11.0f) { m->actionTimer = 2; } else { //! (Speed Crash) Crashes if Mario's speed exceeds or equals 2^15. - val0C = (s32)(val04 * 0x10000); - set_mario_anim_with_accel(m, MARIO_ANIM_WALK_WITH_LIGHT_OBJ, val0C); + animSpeed = (s32)(intendedSpeed * 0x10000); + set_mario_anim_with_accel(m, MARIO_ANIM_WALK_WITH_LIGHT_OBJ, animSpeed); play_step_sound(m, 12, 62); - val08 = FALSE; + inLoop = FALSE; } break; case 2: - if (val04 < 8.0f) { + if (intendedSpeed < 8.0f) { m->actionTimer = 1; } else { //! (Speed Crash) Crashes if Mario's speed exceeds or equals 2^16. - val0C = (s32)(val04 / 2.0f * 0x10000); - set_mario_anim_with_accel(m, MARIO_ANIM_RUN_WITH_LIGHT_OBJ, val0C); + animSpeed = (s32)(intendedSpeed / 2.0f * 0x10000); + set_mario_anim_with_accel(m, MARIO_ANIM_RUN_WITH_LIGHT_OBJ, animSpeed); play_step_sound(m, 10, 49); - val08 = FALSE; + inLoop = FALSE; } break; } @@ -669,8 +665,8 @@ void anim_and_audio_for_hold_walk(struct MarioState *m) { } void anim_and_audio_for_heavy_walk(struct MarioState *m) { - s32 val04 = (s32)(m->intendedMag * 0x10000); - set_mario_anim_with_accel(m, MARIO_ANIM_WALK_WITH_HEAVY_OBJ, val04); + s32 animSpeed = (s32)(m->intendedMag * 0x10000); + set_mario_anim_with_accel(m, MARIO_ANIM_WALK_WITH_HEAVY_OBJ, animSpeed); play_step_sound(m, 26, 79); } @@ -681,7 +677,7 @@ void push_or_sidle_wall(struct MarioState *m, Vec3f startPos) { f32 dz = m->pos[2] - startPos[2]; f32 movedDistance = sqrtf(dx * dx + dz * dz); //! (Speed Crash) If a wall is after moving 16384 distance, this crashes. - s32 val04 = (s32)(movedDistance * 2.0f * 0x10000); + s32 animSpeed = (s32)(movedDistance * 2.0f * 0x10000); if (m->forwardVel > 6.0f) { mario_set_forward_vel(m, 6.0f); @@ -698,9 +694,9 @@ void push_or_sidle_wall(struct MarioState *m, Vec3f startPos) { play_step_sound(m, 6, 18); } else { if (dWallAngle < 0) { - set_mario_anim_with_accel(m, MARIO_ANIM_SIDESTEP_RIGHT, val04); + set_mario_anim_with_accel(m, MARIO_ANIM_SIDESTEP_RIGHT, animSpeed); } else { - set_mario_anim_with_accel(m, MARIO_ANIM_SIDESTEP_LEFT, val04); + set_mario_anim_with_accel(m, MARIO_ANIM_SIDESTEP_LEFT, animSpeed); } if (m->marioObj->header.gfx.animInfo.animFrame < 20) { @@ -716,7 +712,7 @@ void push_or_sidle_wall(struct MarioState *m, Vec3f startPos) { } void tilt_body_walking(struct MarioState *m, s16 startYaw) { - struct MarioBodyState *val0C = m->marioBodyState; + struct MarioBodyState *marioBodyState = m->marioBodyState; UNUSED struct Object *marioObj = m->marioObj; s16 animID = m->marioObj->header.gfx.animInfo.animID; @@ -724,60 +720,60 @@ void tilt_body_walking(struct MarioState *m, s16 startYaw) { s16 dYaw = m->faceAngle[1] - startYaw; //! (Speed Crash) These casts can cause a crash if (dYaw * forwardVel / 12) or //! (forwardVel * 170) exceed or equal 2^31. - s16 val02 = -(s16)(dYaw * m->forwardVel / 12.0f); - s16 val00 = (s16)(m->forwardVel * 170.0f); + s16 nextBodyRoll = -(s16)(dYaw * m->forwardVel / 12.0f); + s16 nextBodyPitch = (s16)(m->forwardVel * 170.0f); - if (val02 > 0x1555) { - val02 = 0x1555; + if (nextBodyRoll > 0x1555) { + nextBodyRoll = 0x1555; } - if (val02 < -0x1555) { - val02 = -0x1555; + if (nextBodyRoll < -0x1555) { + nextBodyRoll = -0x1555; } - if (val00 > 0x1555) { - val00 = 0x1555; + if (nextBodyPitch > 0x1555) { + nextBodyPitch = 0x1555; } - if (val00 < 0) { - val00 = 0; + if (nextBodyPitch < 0) { + nextBodyPitch = 0; } - val0C->torsoAngle[2] = approach_s32(val0C->torsoAngle[2], val02, 0x400, 0x400); - val0C->torsoAngle[0] = approach_s32(val0C->torsoAngle[0], val00, 0x400, 0x400); + marioBodyState->torsoAngle[2] = approach_s32(marioBodyState->torsoAngle[2], nextBodyRoll, 0x400, 0x400); + marioBodyState->torsoAngle[0] = approach_s32(marioBodyState->torsoAngle[0], nextBodyPitch, 0x400, 0x400); } else { - val0C->torsoAngle[2] = 0; - val0C->torsoAngle[0] = 0; + marioBodyState->torsoAngle[2] = 0; + marioBodyState->torsoAngle[0] = 0; } } void tilt_body_ground_shell(struct MarioState *m, s16 startYaw) { - struct MarioBodyState *val0C = m->marioBodyState; + struct MarioBodyState *marioBodyState = m->marioBodyState; struct Object *marioObj = m->marioObj; s16 dYaw = m->faceAngle[1] - startYaw; //! (Speed Crash) These casts can cause a crash if (dYaw * forwardVel / 12) or //! (forwardVel * 170) exceed or equal 2^31. Harder (if not impossible to do) //! while on a Koopa Shell making this less of an issue. - s16 val04 = -(s16)(dYaw * m->forwardVel / 12.0f); - s16 val02 = (s16)(m->forwardVel * 170.0f); + s16 nextBodyRoll = -(s16)(dYaw * m->forwardVel / 12.0f); + s16 nextBodyPitch = (s16)(m->forwardVel * 170.0f); - if (val04 > 0x1800) { - val04 = 0x1800; + if (nextBodyRoll > 0x1800) { + nextBodyRoll = 0x1800; } - if (val04 < -0x1800) { - val04 = -0x1800; + if (nextBodyRoll < -0x1800) { + nextBodyRoll = -0x1800; } - if (val02 > 0x1000) { - val02 = 0x1000; + if (nextBodyPitch > 0x1000) { + nextBodyPitch = 0x1000; } - if (val02 < 0) { - val02 = 0; + if (nextBodyPitch < 0) { + nextBodyPitch = 0; } - val0C->torsoAngle[2] = approach_s32(val0C->torsoAngle[2], val04, 0x200, 0x200); - val0C->torsoAngle[0] = approach_s32(val0C->torsoAngle[0], val02, 0x200, 0x200); - val0C->headAngle[2] = -val0C->torsoAngle[2]; + marioBodyState->torsoAngle[2] = approach_s32(marioBodyState->torsoAngle[2], nextBodyRoll, 0x200, 0x200); + marioBodyState->torsoAngle[0] = approach_s32(marioBodyState->torsoAngle[0], nextBodyPitch, 0x200, 0x200); + marioBodyState->headAngle[2] = -marioBodyState->torsoAngle[2]; - marioObj->header.gfx.angle[2] = val0C->torsoAngle[2]; + marioObj->header.gfx.angle[2] = marioBodyState->torsoAngle[2]; marioObj->header.gfx.pos[1] += 45.0f; } @@ -1077,7 +1073,7 @@ s32 act_braking(struct MarioState *m) { } s32 act_decelerating(struct MarioState *m) { - s32 val0C; + s32 animSpeed; s16 slopeClass = mario_get_floor_class(m); if (!(m->input & INPUT_FIRST_PERSON)) { @@ -1127,11 +1123,11 @@ s32 act_decelerating(struct MarioState *m) { m->particleFlags |= PARTICLE_DUST; } else { // (Speed Crash) Crashes if speed exceeds 2^17. - if ((val0C = (s32)(m->forwardVel / 4.0f * 0x10000)) < 0x1000) { - val0C = 0x1000; + if ((animSpeed = (s32)(m->forwardVel / 4.0f * 0x10000)) < 0x1000) { + animSpeed = 0x1000; } - set_mario_anim_with_accel(m, MARIO_ANIM_WALKING, val0C); + set_mario_anim_with_accel(m, MARIO_ANIM_WALKING, animSpeed); play_step_sound(m, 10, 49); } @@ -1139,7 +1135,7 @@ s32 act_decelerating(struct MarioState *m) { } s32 act_hold_decelerating(struct MarioState *m) { - s32 val0C; + s32 animSpeed; s16 slopeClass = mario_get_floor_class(m); if (m->marioObj->oInteractStatus & INT_STATUS_MARIO_DROP_OBJECT) { @@ -1193,11 +1189,11 @@ s32 act_hold_decelerating(struct MarioState *m) { m->particleFlags |= PARTICLE_DUST; } else { //! (Speed Crash) This crashes if Mario has more speed than 2^15 speed. - if ((val0C = (s32)(m->forwardVel * 0x10000)) < 0x1000) { - val0C = 0x1000; + if ((animSpeed = (s32)(m->forwardVel * 0x10000)) < 0x1000) { + animSpeed = 0x1000; } - set_mario_anim_with_accel(m, MARIO_ANIM_WALK_WITH_LIGHT_OBJ, val0C); + set_mario_anim_with_accel(m, MARIO_ANIM_WALK_WITH_LIGHT_OBJ, animSpeed); play_step_sound(m, 12, 62); } @@ -1252,7 +1248,7 @@ s32 act_riding_shell_ground(struct MarioState *m) { } s32 act_crawling(struct MarioState *m) { - s32 val04; + s32 animSpeed; if (should_begin_sliding(m)) { return set_mario_action(m, ACT_BEGIN_SLIDING, 0); @@ -1299,8 +1295,8 @@ s32 act_crawling(struct MarioState *m) { break; } - val04 = (s32)(m->intendedMag * 2.0f * 0x10000); - set_mario_anim_with_accel(m, MARIO_ANIM_CRAWLING, val04); + animSpeed = (s32)(m->intendedMag * 2.0f * 0x10000); + set_mario_anim_with_accel(m, MARIO_ANIM_CRAWLING, animSpeed); play_step_sound(m, 26, 79); return FALSE; } diff --git a/src/game/mario_actions_stationary.c b/src/game/mario_actions_stationary.c index b241c450..163e2d2e 100644 --- a/src/game/mario_actions_stationary.c +++ b/src/game/mario_actions_stationary.c @@ -788,8 +788,8 @@ s32 act_stop_crawling(struct MarioState *m) { } s32 act_shockwave_bounce(struct MarioState *m) { - s16 sp1E; - f32 sp18; + s16 bounceTimer; + f32 bounceAmt; if (m->marioObj->oInteractStatus & INT_STATUS_MARIO_SHOCKWAVE) { #if ENABLE_RUMBLE @@ -811,14 +811,14 @@ s32 act_shockwave_bounce(struct MarioState *m) { return set_mario_action(m, ACT_IDLE, 0); } - sp1E = (m->actionTimer % 16) << 12; - sp18 = (f32)(((f32)(6 - m->actionTimer / 8) * 8.0f) + 4.0f); + bounceTimer = (m->actionTimer % 16) << 12; + bounceAmt = (f32)(((f32)(6 - m->actionTimer / 8) * 8.0f) + 4.0f); mario_set_forward_vel(m, 0); vec3f_set(m->vel, 0.0f, 0.0f, 0.0f); - if (sins(sp1E) >= 0.0f) { - m->pos[1] = sins(sp1E) * sp18 + m->floorHeight; + if (sins(bounceTimer) >= 0.0f) { + m->pos[1] = sins(bounceTimer) * bounceAmt + m->floorHeight; } else { - m->pos[1] = m->floorHeight - sins(sp1E) * sp18; + m->pos[1] = m->floorHeight - sins(bounceTimer) * bounceAmt; } vec3f_copy(m->marioObj->header.gfx.pos, m->pos); @@ -1053,13 +1053,13 @@ s32 act_ground_pound_land(struct MarioState *m) { } s32 act_first_person(struct MarioState *m) { - s32 sp1C = (m->input & (INPUT_OFF_FLOOR | INPUT_ABOVE_SLIDE | INPUT_STOMPED)) != 0; + s32 exit = (m->input & (INPUT_OFF_FLOOR | INPUT_ABOVE_SLIDE | INPUT_STOMPED)) != 0; if (m->actionState == 0) { lower_background_noise(2); set_camera_mode(m->area->camera, CAMERA_MODE_C_UP, 0x10); m->actionState = 1; - } else if (!(m->input & INPUT_FIRST_PERSON) || sp1C) { + } else if (!(m->input & INPUT_FIRST_PERSON) || exit) { raise_background_noise(2); // Go back to the last camera mode set_camera_mode(m->area->camera, -1, 1); @@ -1068,9 +1068,9 @@ s32 act_first_person(struct MarioState *m) { if (m->floor->type == SURFACE_LOOK_UP_WARP && save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_MIN - 1, COURSE_MAX - 1) >= 10) { - s16 sp1A = m->statusForCamera->headRotation[0]; - s16 sp18 = ((m->statusForCamera->headRotation[1] * 4) / 3) + m->faceAngle[1]; - if (sp1A == -0x1800 && (sp18 < -0x6FFF || sp18 >= 0x7000)) { + s16 headRX = m->statusForCamera->headRotation[0]; + s16 totalRY = ((m->statusForCamera->headRotation[1] * 4) / 3) + m->faceAngle[1]; + if (headRX == -0x1800 && (totalRY < -0x6FFF || totalRY >= 0x7000)) { level_trigger_warp(m, WARP_OP_UNKNOWN_01); } } diff --git a/src/game/mario_actions_submerged.c b/src/game/mario_actions_submerged.c index dc0572c1..680ee8d1 100644 --- a/src/game/mario_actions_submerged.c +++ b/src/game/mario_actions_submerged.c @@ -1228,7 +1228,7 @@ static s32 act_hold_metal_water_standing(struct MarioState *m) { } static s32 act_metal_water_walking(struct MarioState *m) { - s32 val04; + s32 animSpeed; if (!(m->flags & MARIO_METAL_CAP)) { return set_mario_action(m, ACT_WATER_IDLE, 0); @@ -1246,11 +1246,11 @@ static s32 act_metal_water_walking(struct MarioState *m) { return set_mario_action(m, ACT_METAL_WATER_STANDING, 0); } - if ((val04 = (s32)(m->forwardVel / 4.0f * 0x10000)) < 0x1000) { - val04 = 0x1000; + if ((animSpeed = (s32)(m->forwardVel / 4.0f * 0x10000)) < 0x1000) { + animSpeed = 0x1000; } - set_mario_anim_with_accel(m, MARIO_ANIM_WALKING, val04); + set_mario_anim_with_accel(m, MARIO_ANIM_WALKING, animSpeed); play_metal_water_walking_sound(m); update_metal_water_walking_speed(m); @@ -1268,7 +1268,7 @@ static s32 act_metal_water_walking(struct MarioState *m) { } static s32 act_hold_metal_water_walking(struct MarioState *m) { - s32 val04; + s32 animSpeed; if (m->marioObj->oInteractStatus & INT_STATUS_MARIO_DROP_OBJECT) { return drop_and_set_mario_action(m, ACT_METAL_WATER_WALKING, 0); @@ -1288,11 +1288,11 @@ static s32 act_hold_metal_water_walking(struct MarioState *m) { m->intendedMag *= 0.4f; - if ((val04 = (s32)(m->forwardVel / 2.0f * 0x10000)) < 0x1000) { - val04 = 0x1000; + if ((animSpeed = (s32)(m->forwardVel / 2.0f * 0x10000)) < 0x1000) { + animSpeed = 0x1000; } - set_mario_anim_with_accel(m, MARIO_ANIM_RUN_WITH_LIGHT_OBJ, val04); + set_mario_anim_with_accel(m, MARIO_ANIM_RUN_WITH_LIGHT_OBJ, animSpeed); play_metal_water_walking_sound(m); update_metal_water_walking_speed(m); diff --git a/src/game/obj_behaviors.h b/src/game/obj_behaviors.h index 02a0567f..975e3c6c 100644 --- a/src/game/obj_behaviors.h +++ b/src/game/obj_behaviors.h @@ -160,6 +160,6 @@ void bhv_free_bowling_ball_roll_loop(void); /* likely unused */ void bhv_free_bowling_ball_loop(void); /* likely unused */ void bhv_rr_cruiser_wing_init(void); void bhv_rr_cruiser_wing_loop(void); -void spawn_default_star(f32 sp20, f32 sp24, f32 sp28); +void spawn_default_star(f32 x, f32 y, f32 z); #endif // OBJ_BEHAVIORS_H diff --git a/src/game/obj_behaviors_2.c b/src/game/obj_behaviors_2.c index c46d7a65..65690b46 100644 --- a/src/game/obj_behaviors_2.c +++ b/src/game/obj_behaviors_2.c @@ -244,58 +244,51 @@ static void platform_on_track_update_pos_or_spawn_ball(s32 ballIndex, f32 x, f32 } } -static void cur_obj_spin_all_dimensions(f32 arg0, f32 arg1) { - f32 val24; - f32 val20; - f32 val1C; - f32 c; - f32 s; - f32 val10; - f32 val0C; - f32 val08; - f32 val04; - f32 val00; +static void cur_obj_spin_all_dimensions(f32 pitchSpeed, f32 rollSpeed) { + f32 pitch, yaw, roll; + f32 c, s; + f32 px, pz, ny, nz, nx; if (o->oForwardVel == 0.0f) { - val24 = val20 = val1C = 0.0f; + roll = yaw = pitch = 0.0f; if (o->oMoveFlags & OBJ_MOVE_IN_AIR) { - val20 = 50.0f; + yaw = 50.0f; } else { if (o->oFaceAnglePitch < 0) { - val1C = -arg0; + pitch = -pitchSpeed; } else if (o->oFaceAnglePitch > 0) { - val1C = arg0; + pitch = pitchSpeed; } if (o->oFaceAngleRoll < 0) { - val24 = -arg1; + roll = -rollSpeed; } else if (o->oFaceAngleRoll > 0) { - val24 = arg1; + roll = rollSpeed; } } c = coss(o->oFaceAnglePitch); s = sins(o->oFaceAnglePitch); - val08 = val1C * c + val20 * s; - val0C = val20 * c - val1C * s; + nz = pitch * c + yaw * s; + ny = yaw * c - pitch * s; c = coss(o->oFaceAngleRoll); s = sins(o->oFaceAngleRoll); - val04 = val24 * c + val0C * s; - val0C = val0C * c - val24 * s; + nx = roll * c + ny * s; + ny = ny * c - roll * s; c = coss(o->oFaceAngleYaw); s = sins(o->oFaceAngleYaw); - val10 = val04 * c - val08 * s; - val08 = val08 * c + val04 * s; + px = nx * c - nz * s; + nz = nz * c + nx * s; - val04 = val24 * c - val1C * s; - val00 = val1C * c + val24 * s; + nx = roll * c - pitch * s; + pz = pitch * c + roll * s; - o->oPosX = o->oHomeX - val04 + val10; - o->oGraphYOffset = val20 - val0C; - o->oPosZ = o->oHomeZ + val00 - val08; + o->oPosX = o->oHomeX - nx + px; + o->oGraphYOffset = yaw - ny; + o->oPosZ = o->oHomeZ + pz - nz; } } @@ -362,14 +355,14 @@ static s32 cur_obj_set_anim_if_at_end(s32 arg0) { return FALSE; } -static s32 cur_obj_play_sound_at_anim_range(s8 arg0, s8 arg1, u32 sound) { - s32 val04; +static s32 cur_obj_play_sound_at_anim_range(s8 startFrame1, s8 startFrame2, u32 sound) { + s32 rangeLength; - if ((val04 = o->header.gfx.animInfo.animAccel / 0x10000) <= 0) { - val04 = 1; + if ((rangeLength = o->header.gfx.animInfo.animAccel / 0x10000) <= 0) { + rangeLength = 1; } - if (cur_obj_check_anim_frame_in_range(arg0, val04) || cur_obj_check_anim_frame_in_range(arg1, val04)) { + if (cur_obj_check_anim_frame_in_range(startFrame1, rangeLength) || cur_obj_check_anim_frame_in_range(startFrame2, rangeLength)) { cur_obj_play_sound_2(sound); return TRUE; } diff --git a/src/game/object_collision.c b/src/game/object_collision.c index cf77768a..8c30859a 100644 --- a/src/game/object_collision.c +++ b/src/game/object_collision.c @@ -8,37 +8,35 @@ #include "spawn_object.h" struct Object *debug_print_obj_collision(struct Object *a) { - struct Object *sp24; - UNUSED s32 unused; + struct Object *currCollidedObj; s32 i; for (i = 0; i < a->numCollidedObjs; i++) { print_debug_top_down_objectinfo("ON", 0); - sp24 = a->collidedObjs[i]; - if (sp24 != gMarioObject) { - return sp24; + currCollidedObj = a->collidedObjs[i]; + if (currCollidedObj != gMarioObject) { + return currCollidedObj; } } return NULL; } s32 detect_object_hitbox_overlap(struct Object *a, struct Object *b) { - f32 sp3C = a->oPosY - a->hitboxDownOffset; - f32 sp38 = b->oPosY - b->hitboxDownOffset; + f32 dya_bottom = a->oPosY - a->hitboxDownOffset; + f32 dyb_bottom = b->oPosY - b->hitboxDownOffset; f32 dx = a->oPosX - b->oPosX; - UNUSED f32 sp30 = sp3C - sp38; f32 dz = a->oPosZ - b->oPosZ; f32 collisionRadius = a->hitboxRadius + b->hitboxRadius; f32 distance = sqrtf(dx * dx + dz * dz); if (collisionRadius > distance) { - f32 sp20 = a->hitboxHeight + sp3C; - f32 sp1C = b->hitboxHeight + sp38; + f32 dya_top = a->hitboxHeight + dya_bottom; + f32 dyb_top = b->hitboxHeight + dyb_bottom; - if (sp3C > sp1C) { + if (dya_bottom > dyb_top) { return 0; } - if (sp20 < sp38) { + if (dya_top < dyb_bottom) { return 0; } if (a->numCollidedObjs >= 4) { @@ -63,26 +61,25 @@ s32 detect_object_hitbox_overlap(struct Object *a, struct Object *b) { } s32 detect_object_hurtbox_overlap(struct Object *a, struct Object *b) { - f32 sp3C = a->oPosY - a->hitboxDownOffset; - f32 sp38 = b->oPosY - b->hitboxDownOffset; - f32 sp34 = a->oPosX - b->oPosX; - UNUSED f32 sp30 = sp3C - sp38; - f32 sp2C = a->oPosZ - b->oPosZ; - f32 sp28 = a->hurtboxRadius + b->hurtboxRadius; - f32 sp24 = sqrtf(sp34 * sp34 + sp2C * sp2C); + f32 dya_bottom = a->oPosY - a->hitboxDownOffset; + f32 dyb_bottom = b->oPosY - b->hitboxDownOffset; + f32 dx = a->oPosX - b->oPosX; + f32 dz = a->oPosZ - b->oPosZ; + f32 collisionRadius = a->hurtboxRadius + b->hurtboxRadius; + f32 distance = sqrtf(dx * dx + dz * dz); if (a == gMarioObject) { b->oInteractionSubtype |= INT_SUBTYPE_DELAY_INVINCIBILITY; } - if (sp28 > sp24) { - f32 sp20 = a->hitboxHeight + sp3C; - f32 sp1C = b->hurtboxHeight + sp38; + if (collisionRadius > distance) { + f32 dya_top = a->hitboxHeight + dya_bottom; + f32 dyb_top = b->hurtboxHeight + dyb_bottom; - if (sp3C > sp1C) { + if (dya_bottom > dyb_top) { return 0; } - if (sp20 < sp38) { + if (dya_top < dyb_bottom) { return 0; } if (a == gMarioObject) { @@ -98,15 +95,15 @@ s32 detect_object_hurtbox_overlap(struct Object *a, struct Object *b) { } void clear_object_collision(struct Object *a) { - struct Object *sp4 = (struct Object *) a->header.next; + struct Object *nextObj = (struct Object *) a->header.next; - while (sp4 != a) { - sp4->numCollidedObjs = 0; - sp4->collidedObjInteractTypes = 0; - if (sp4->oIntangibleTimer > 0) { - sp4->oIntangibleTimer--; + while (nextObj != a) { + nextObj->numCollidedObjs = 0; + nextObj->collidedObjInteractTypes = 0; + if (nextObj->oIntangibleTimer > 0) { + nextObj->oIntangibleTimer--; } - sp4 = (struct Object *) sp4->header.next; + nextObj = (struct Object *) nextObj->header.next; } } @@ -124,52 +121,52 @@ void check_collision_in_list(struct Object *a, struct Object *b, struct Object * } void check_player_object_collision(void) { - struct Object *sp1C = (struct Object *) &gObjectLists[OBJ_LIST_PLAYER]; - struct Object *sp18 = (struct Object *) sp1C->header.next; + struct Object *playerObj = (struct Object *) &gObjectLists[OBJ_LIST_PLAYER]; + struct Object *nextObj = (struct Object *) playerObj->header.next; - while (sp18 != sp1C) { - check_collision_in_list(sp18, (struct Object *) sp18->header.next, sp1C); - check_collision_in_list(sp18, (struct Object *) gObjectLists[OBJ_LIST_POLELIKE].next, + while (nextObj != playerObj) { + check_collision_in_list(nextObj, (struct Object *) nextObj->header.next, playerObj); + check_collision_in_list(nextObj, (struct Object *) gObjectLists[OBJ_LIST_POLELIKE].next, (struct Object *) &gObjectLists[OBJ_LIST_POLELIKE]); - check_collision_in_list(sp18, (struct Object *) gObjectLists[OBJ_LIST_LEVEL].next, + check_collision_in_list(nextObj, (struct Object *) gObjectLists[OBJ_LIST_LEVEL].next, (struct Object *) &gObjectLists[OBJ_LIST_LEVEL]); - check_collision_in_list(sp18, (struct Object *) gObjectLists[OBJ_LIST_GENACTOR].next, + check_collision_in_list(nextObj, (struct Object *) gObjectLists[OBJ_LIST_GENACTOR].next, (struct Object *) &gObjectLists[OBJ_LIST_GENACTOR]); - check_collision_in_list(sp18, (struct Object *) gObjectLists[OBJ_LIST_PUSHABLE].next, + check_collision_in_list(nextObj, (struct Object *) gObjectLists[OBJ_LIST_PUSHABLE].next, (struct Object *) &gObjectLists[OBJ_LIST_PUSHABLE]); - check_collision_in_list(sp18, (struct Object *) gObjectLists[OBJ_LIST_SURFACE].next, + check_collision_in_list(nextObj, (struct Object *) gObjectLists[OBJ_LIST_SURFACE].next, (struct Object *) &gObjectLists[OBJ_LIST_SURFACE]); - check_collision_in_list(sp18, (struct Object *) gObjectLists[OBJ_LIST_DESTRUCTIVE].next, + check_collision_in_list(nextObj, (struct Object *) gObjectLists[OBJ_LIST_DESTRUCTIVE].next, (struct Object *) &gObjectLists[OBJ_LIST_DESTRUCTIVE]); - sp18 = (struct Object *) sp18->header.next; + nextObj = (struct Object *) nextObj->header.next; } } void check_pushable_object_collision(void) { - struct Object *sp1C = (struct Object *) &gObjectLists[OBJ_LIST_PUSHABLE]; - struct Object *sp18 = (struct Object *) sp1C->header.next; + struct Object *pushableObj = (struct Object *) &gObjectLists[OBJ_LIST_PUSHABLE]; + struct Object *nextObj = (struct Object *) pushableObj->header.next; - while (sp18 != sp1C) { - check_collision_in_list(sp18, (struct Object *) sp18->header.next, sp1C); - sp18 = (struct Object *) sp18->header.next; + while (nextObj != pushableObj) { + check_collision_in_list(nextObj, (struct Object *) nextObj->header.next, pushableObj); + nextObj = (struct Object *) nextObj->header.next; } } void check_destructive_object_collision(void) { - struct Object *sp1C = (struct Object *) &gObjectLists[OBJ_LIST_DESTRUCTIVE]; - struct Object *sp18 = (struct Object *) sp1C->header.next; + struct Object *destructiveObj = (struct Object *) &gObjectLists[OBJ_LIST_DESTRUCTIVE]; + struct Object *nextObj = (struct Object *) destructiveObj->header.next; - while (sp18 != sp1C) { - if (sp18->oDistanceToMario < 2000.0f && !(sp18->activeFlags & ACTIVE_FLAG_UNK9)) { - check_collision_in_list(sp18, (struct Object *) sp18->header.next, sp1C); - check_collision_in_list(sp18, (struct Object *) gObjectLists[OBJ_LIST_GENACTOR].next, + while (nextObj != destructiveObj) { + if (nextObj->oDistanceToMario < 2000.0f && !(nextObj->activeFlags & ACTIVE_FLAG_UNK9)) { + check_collision_in_list(nextObj, (struct Object *) nextObj->header.next, destructiveObj); + check_collision_in_list(nextObj, (struct Object *) gObjectLists[OBJ_LIST_GENACTOR].next, (struct Object *) &gObjectLists[OBJ_LIST_GENACTOR]); - check_collision_in_list(sp18, (struct Object *) gObjectLists[OBJ_LIST_PUSHABLE].next, + check_collision_in_list(nextObj, (struct Object *) gObjectLists[OBJ_LIST_PUSHABLE].next, (struct Object *) &gObjectLists[OBJ_LIST_PUSHABLE]); - check_collision_in_list(sp18, (struct Object *) gObjectLists[OBJ_LIST_SURFACE].next, + check_collision_in_list(nextObj, (struct Object *) gObjectLists[OBJ_LIST_SURFACE].next, (struct Object *) &gObjectLists[OBJ_LIST_SURFACE]); } - sp18 = (struct Object *) sp18->header.next; + nextObj = (struct Object *) nextObj->header.next; } } diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c index 902ce4af..c4e4068a 100644 --- a/src/game/object_helpers.c +++ b/src/game/object_helpers.c @@ -29,7 +29,6 @@ #include "puppylights.h" static s8 sBbhStairJiggleOffsets[] = { -8, 8, -4, 4 }; -static s16 sPowersOfTwo[] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }; static s8 sLevelsWithRooms[] = { LEVEL_BBH, LEVEL_CASTLE, LEVEL_HMC, -1 }; static s32 clear_move_flag(u32 *, s32); @@ -37,15 +36,15 @@ static s32 clear_move_flag(u32 *, s32); #define o gCurrentObject Gfx *geo_update_projectile_pos_from_parent(s32 callContext, UNUSED struct GraphNode *node, Mat4 mtx) { - Mat4 sp20; - struct Object *sp1C; + Mat4 mtx2; + struct Object *projObj; if (callContext == GEO_CONTEXT_RENDER) { - sp1C = (struct Object *) gCurGraphNodeObject; // TODO: change global type to Object pointer - if (sp1C->prevObj) { - create_transformation_from_matrices(sp20, mtx, *gCurGraphNodeCamera->matrixPtr); - obj_update_pos_from_parent_transformation(sp20, sp1C->prevObj); - obj_set_gfx_pos_from_pos(sp1C->prevObj); + projObj = (struct Object *) gCurGraphNodeObject; // TODO: change global type to Object pointer + if (projObj->prevObj) { + create_transformation_from_matrices(mtx2, mtx, *gCurGraphNodeCamera->matrixPtr); + obj_update_pos_from_parent_transformation(mtx2, projObj->prevObj); + obj_set_gfx_pos_from_pos(projObj->prevObj); } } return NULL; @@ -55,7 +54,6 @@ Gfx *geo_update_layer_transparency(s32 callContext, struct GraphNode *node, UNUS Gfx *dlStart, *dlHead; struct Object *objectGraphNode; struct GraphNodeGenerated *currentGraphNode; - UNUSED struct GraphNodeGenerated *sp2C; s32 objectOpacity; dlStart = NULL; @@ -63,7 +61,6 @@ Gfx *geo_update_layer_transparency(s32 callContext, struct GraphNode *node, UNUS if (callContext == GEO_CONTEXT_RENDER) { objectGraphNode = (struct Object *) gCurGraphNodeObject; // TODO: change this to object pointer? currentGraphNode = (struct GraphNodeGenerated *) node; - sp2C = (struct GraphNodeGenerated *) node; if (gCurGraphNodeHeldObject) { objectGraphNode = gCurGraphNodeHeldObject->objNode; @@ -172,8 +169,8 @@ Gfx *geo_switch_area(s32 callContext, struct GraphNode *node, UNUSED void *conte #else Gfx *geo_switch_area(s32 callContext, struct GraphNode *node) { #endif - s16 sp26; - struct Surface *sp20; + s16 roomCase; + struct Surface *floor; UNUSED struct Object *sp1C = (struct Object *) gCurGraphNodeObject; // TODO: change global type to Object pointer struct GraphNodeSwitchCase *switchCase = (struct GraphNodeSwitchCase *) node; @@ -184,15 +181,15 @@ Gfx *geo_switch_area(s32 callContext, struct GraphNode *node) { } else { gFindFloorIncludeSurfaceIntangible = TRUE; - find_floor(gMarioObject->oPosX, gMarioObject->oPosY, gMarioObject->oPosZ, &sp20); + find_floor(gMarioObject->oPosX, gMarioObject->oPosY, gMarioObject->oPosZ, &floor); - if (sp20) { - gMarioCurrentRoom = sp20->room; - sp26 = sp20->room - 1; - print_debug_top_down_objectinfo("areainfo %d", sp20->room); + if (floor) { + gMarioCurrentRoom = floor->room; + roomCase = floor->room - 1; + print_debug_top_down_objectinfo("areainfo %d", floor->room); - if (sp26 >= 0) { - switchCase->selectedCase = sp26; + if (roomCase >= 0) { + switchCase->selectedCase = roomCase; } } } @@ -203,14 +200,14 @@ Gfx *geo_switch_area(s32 callContext, struct GraphNode *node) { return NULL; } -void obj_update_pos_from_parent_transformation(Mat4 a0, struct Object *a1) { - f32 spC = a1->oParentRelativePosX; - f32 sp8 = a1->oParentRelativePosY; - f32 sp4 = a1->oParentRelativePosZ; +void obj_update_pos_from_parent_transformation(Mat4 mtx, struct Object *obj) { + f32 parentRelX = obj->oParentRelativePosX; + f32 parentRelY = obj->oParentRelativePosY; + f32 parentRelZ = obj->oParentRelativePosZ; - a1->oPosX = spC * a0[0][0] + sp8 * a0[1][0] + sp4 * a0[2][0] + a0[3][0]; - a1->oPosY = spC * a0[0][1] + sp8 * a0[1][1] + sp4 * a0[2][1] + a0[3][1]; - a1->oPosZ = spC * a0[0][2] + sp8 * a0[1][2] + sp4 * a0[2][2] + a0[3][2]; + obj->oPosX = parentRelX * mtx[0][0] + parentRelY * mtx[1][0] + parentRelZ * mtx[2][0] + mtx[3][0]; + obj->oPosY = parentRelX * mtx[0][1] + parentRelY * mtx[1][1] + parentRelZ * mtx[2][1] + mtx[3][1]; + obj->oPosZ = parentRelX * mtx[0][2] + parentRelY * mtx[1][2] + parentRelZ * mtx[2][2] + mtx[3][2]; } void obj_apply_scale_to_matrix(struct Object *obj, Mat4 dst, Mat4 src) { @@ -235,33 +232,31 @@ void obj_apply_scale_to_matrix(struct Object *obj, Mat4 dst, Mat4 src) { dst[3][3] = src[3][3]; } -void create_transformation_from_matrices(Mat4 a0, Mat4 a1, Mat4 a2) { - f32 spC, sp8, sp4; +void create_transformation_from_matrices(Mat4 dst, Mat4 a1, Mat4 a2) { + f32 x = a2[3][0] * a2[0][0] + a2[3][1] * a2[0][1] + a2[3][2] * a2[0][2]; + f32 y = a2[3][0] * a2[1][0] + a2[3][1] * a2[1][1] + a2[3][2] * a2[1][2]; + f32 z = a2[3][0] * a2[2][0] + a2[3][1] * a2[2][1] + a2[3][2] * a2[2][2]; - spC = a2[3][0] * a2[0][0] + a2[3][1] * a2[0][1] + a2[3][2] * a2[0][2]; - sp8 = a2[3][0] * a2[1][0] + a2[3][1] * a2[1][1] + a2[3][2] * a2[1][2]; - sp4 = a2[3][0] * a2[2][0] + a2[3][1] * a2[2][1] + a2[3][2] * a2[2][2]; + dst[0][0] = a1[0][0] * a2[0][0] + a1[0][1] * a2[0][1] + a1[0][2] * a2[0][2]; + dst[0][1] = a1[0][0] * a2[1][0] + a1[0][1] * a2[1][1] + a1[0][2] * a2[1][2]; + dst[0][2] = a1[0][0] * a2[2][0] + a1[0][1] * a2[2][1] + a1[0][2] * a2[2][2]; - a0[0][0] = a1[0][0] * a2[0][0] + a1[0][1] * a2[0][1] + a1[0][2] * a2[0][2]; - a0[0][1] = a1[0][0] * a2[1][0] + a1[0][1] * a2[1][1] + a1[0][2] * a2[1][2]; - a0[0][2] = a1[0][0] * a2[2][0] + a1[0][1] * a2[2][1] + a1[0][2] * a2[2][2]; + dst[1][0] = a1[1][0] * a2[0][0] + a1[1][1] * a2[0][1] + a1[1][2] * a2[0][2]; + dst[1][1] = a1[1][0] * a2[1][0] + a1[1][1] * a2[1][1] + a1[1][2] * a2[1][2]; + dst[1][2] = a1[1][0] * a2[2][0] + a1[1][1] * a2[2][1] + a1[1][2] * a2[2][2]; - a0[1][0] = a1[1][0] * a2[0][0] + a1[1][1] * a2[0][1] + a1[1][2] * a2[0][2]; - a0[1][1] = a1[1][0] * a2[1][0] + a1[1][1] * a2[1][1] + a1[1][2] * a2[1][2]; - a0[1][2] = a1[1][0] * a2[2][0] + a1[1][1] * a2[2][1] + a1[1][2] * a2[2][2]; + dst[2][0] = a1[2][0] * a2[0][0] + a1[2][1] * a2[0][1] + a1[2][2] * a2[0][2]; + dst[2][1] = a1[2][0] * a2[1][0] + a1[2][1] * a2[1][1] + a1[2][2] * a2[1][2]; + dst[2][2] = a1[2][0] * a2[2][0] + a1[2][1] * a2[2][1] + a1[2][2] * a2[2][2]; - a0[2][0] = a1[2][0] * a2[0][0] + a1[2][1] * a2[0][1] + a1[2][2] * a2[0][2]; - a0[2][1] = a1[2][0] * a2[1][0] + a1[2][1] * a2[1][1] + a1[2][2] * a2[1][2]; - a0[2][2] = a1[2][0] * a2[2][0] + a1[2][1] * a2[2][1] + a1[2][2] * a2[2][2]; + dst[3][0] = a1[3][0] * a2[0][0] + a1[3][1] * a2[0][1] + a1[3][2] * a2[0][2] - x; + dst[3][1] = a1[3][0] * a2[1][0] + a1[3][1] * a2[1][1] + a1[3][2] * a2[1][2] - y; + dst[3][2] = a1[3][0] * a2[2][0] + a1[3][1] * a2[2][1] + a1[3][2] * a2[2][2] - z; - a0[3][0] = a1[3][0] * a2[0][0] + a1[3][1] * a2[0][1] + a1[3][2] * a2[0][2] - spC; - a0[3][1] = a1[3][0] * a2[1][0] + a1[3][1] * a2[1][1] + a1[3][2] * a2[1][2] - sp8; - a0[3][2] = a1[3][0] * a2[2][0] + a1[3][1] * a2[2][1] + a1[3][2] * a2[2][2] - sp4; - - a0[0][3] = 0; - a0[1][3] = 0; - a0[2][3] = 0; - a0[3][3] = 1.0f; + dst[0][3] = 0; + dst[1][3] = 0; + dst[2][3] = 0; + dst[3][3] = 1.0f; } void obj_set_held_state(struct Object *obj, const BehaviorScript *heldBehavior) { @@ -478,10 +473,10 @@ struct Object *spawn_object_rel_with_rot(struct Object *parent, u32 model, const return newObj; } -struct Object *spawn_obj_with_transform_flags(struct Object *sp20, s32 model, const BehaviorScript *sp28) { - struct Object *sp1C = spawn_object(sp20, model, sp28); - sp1C->oFlags |= OBJ_FLAG_UPDATE_TRANSFORM_FOR_THROW_MATRIX | OBJ_FLAG_SET_THROW_MATRIX_FROM_TRANSFORM; - return sp1C; +struct Object *spawn_obj_with_transform_flags(struct Object *parent, s32 model, const BehaviorScript *behavior) { + struct Object *newObj = spawn_object(parent, model, behavior); + newObj->oFlags |= OBJ_FLAG_UPDATE_TRANSFORM_FOR_THROW_MATRIX | OBJ_FLAG_SET_THROW_MATRIX_FROM_TRANSFORM; + return newObj; } struct Object *spawn_water_droplet(struct Object *parent, struct WaterDropletParams *params) { @@ -948,14 +943,14 @@ void cur_obj_change_action(s32 action) { cur_obj_reset_timer_and_subaction(); } -void cur_obj_set_vel_from_mario_vel(f32 f12, f32 f14) { - f32 sp4 = gMarioStates[0].forwardVel; - f32 sp0 = f12 * f14; +void cur_obj_set_vel_from_mario_vel(f32 min, f32 mul) { + f32 marioFwdVel = gMarioStates[0].forwardVel; + f32 minVel = min * mul; - if (sp4 < sp0) { - o->oForwardVel = sp0; + if (marioFwdVel < minVel) { + o->oForwardVel = minVel; } else { - o->oForwardVel = sp4 * f14; + o->oForwardVel = marioFwdVel * mul; } } @@ -966,10 +961,10 @@ BAD_RETURN(s16) cur_obj_reverse_animation(void) { } BAD_RETURN(s32) cur_obj_extend_animation_if_at_end(void) { - s32 sp4 = o->header.gfx.animInfo.animFrame; - s32 sp0 = o->header.gfx.animInfo.curAnim->loopEnd - 2; + s32 animFrame = o->header.gfx.animInfo.animFrame; + s32 nearLoopEnd = o->header.gfx.animInfo.curAnim->loopEnd - 2; - if (sp4 == sp0) o->header.gfx.animInfo.animFrame--; + if (animFrame == nearLoopEnd) o->header.gfx.animInfo.animFrame--; } s32 cur_obj_check_if_near_animation_end(void) { @@ -1593,7 +1588,7 @@ void cur_obj_set_hurtbox_radius_and_height(f32 radius, f32 height) { o->hurtboxHeight = height; } -static void obj_spawn_loot_coins(struct Object *obj, s32 numCoins, f32 sp30, +static void obj_spawn_loot_coins(struct Object *obj, s32 numCoins, f32 baseYVel, const BehaviorScript *coinBehavior, s16 posJitter, s16 model) { s32 i; @@ -1616,16 +1611,16 @@ static void obj_spawn_loot_coins(struct Object *obj, s32 numCoins, f32 sp30, coin = spawn_object(obj, model, coinBehavior); obj_translate_xz_random(coin, posJitter); coin->oPosY = spawnHeight; - coin->oCoinUnk110 = sp30; + coin->oCoinUnk110 = baseYVel; } } -void obj_spawn_loot_blue_coins(struct Object *obj, s32 numCoins, f32 sp28, s16 posJitter) { - obj_spawn_loot_coins(obj, numCoins, sp28, bhvBlueCoinJumping, posJitter, MODEL_BLUE_COIN); +void obj_spawn_loot_blue_coins(struct Object *obj, s32 numCoins, f32 baseYVel, s16 posJitter) { + obj_spawn_loot_coins(obj, numCoins, baseYVel, bhvBlueCoinJumping, posJitter, MODEL_BLUE_COIN); } -void obj_spawn_loot_yellow_coins(struct Object *obj, s32 numCoins, f32 sp28) { - obj_spawn_loot_coins(obj, numCoins, sp28, bhvSingleCoinGetsSpawned, 0, MODEL_YELLOW_COIN); +void obj_spawn_loot_yellow_coins(struct Object *obj, s32 numCoins, f32 baseYVel) { + obj_spawn_loot_coins(obj, numCoins, baseYVel, bhvSingleCoinGetsSpawned, 0, MODEL_YELLOW_COIN); } void cur_obj_spawn_loot_coin_at_mario_pos(void) { @@ -1987,7 +1982,6 @@ s32 cur_obj_follow_path(UNUSED s32 unusedArg) { struct Waypoint *lastWaypoint; struct Waypoint *targetWaypoint; f32 prevToNextX, prevToNextY, prevToNextZ; - UNUSED s32 sp2C; f32 objToNextXZ; f32 objToNextX, objToNextY, objToNextZ; @@ -2196,9 +2190,9 @@ void spawn_mist_particles(void) { spawn_mist_particles_variable(0, 0, 46.0f); } -void spawn_mist_particles_with_sound(u32 sp18) { +void spawn_mist_particles_with_sound(u32 soundMagic) { spawn_mist_particles_variable(0, 0, 46.0f); - create_sound_spawner(sp18); + create_sound_spawner(soundMagic); } void cur_obj_push_mario_away(f32 radius) { @@ -2241,46 +2235,46 @@ void bhv_dust_smoke_loop(void) { UNUSED static void stub_obj_helpers_2(void) { } -s32 cur_obj_set_direction_table(s8 *a0) { - o->oToxBoxMovementPattern = a0; +s32 cur_obj_set_direction_table(s8 *pattern) { + o->oToxBoxMovementPattern = pattern; o->oToxBoxMovementStep = 0; return *(s8 *) o->oToxBoxMovementPattern; } s32 cur_obj_progress_direction_table(void) { - s8 spF; - s8 *sp8 = o->oToxBoxMovementPattern; - s32 sp4 = o->oToxBoxMovementStep + 1; + s8 action; + s8 *pattern = o->oToxBoxMovementPattern; + s32 nextStep = o->oToxBoxMovementStep + 1; - if (sp8[sp4] != -1) { - spF = sp8[sp4]; + if (pattern[nextStep] != -1) { + action = pattern[nextStep]; o->oToxBoxMovementStep++; } else { - spF = sp8[0]; + action = pattern[0]; o->oToxBoxMovementStep = 0; } - return spF; + return action; } void stub_obj_helpers_3(UNUSED s32 sp0, UNUSED s32 sp4) { } -void cur_obj_scale_over_time(s32 a0, s32 a1, f32 sp10, f32 sp14) { - f32 sp4 = sp14 - sp10; - f32 sp0 = (f32) o->oTimer / a1; +void cur_obj_scale_over_time(s32 axis, s32 times, f32 start, f32 end) { + f32 dist = end - start; + f32 curr = (f32) o->oTimer / times; - if (a0 & 0x01) { - o->header.gfx.scale[0] = sp4 * sp0 + sp10; + if (axis & 0x01) { + o->header.gfx.scale[0] = dist * curr + start; } - if (a0 & 0x02) { - o->header.gfx.scale[1] = sp4 * sp0 + sp10; + if (axis & 0x02) { + o->header.gfx.scale[1] = dist * curr + start; } - if (a0 & 0x04) { - o->header.gfx.scale[2] = sp4 * sp0 + sp10; + if (axis & 0x04) { + o->header.gfx.scale[2] = dist * curr + start; } } @@ -2316,12 +2310,12 @@ s32 cur_obj_shake_y_until(s32 cycles, s32 amount) { } } -s32 jiggle_bbh_stair(s32 a0) { - if (a0 >= 4 || a0 < 0) { +s32 jiggle_bbh_stair(s32 index) { + if (index >= 4 || index < 0) { return TRUE; } - o->oPosY += sBbhStairJiggleOffsets[a0]; + o->oPosY += sBbhStairJiggleOffsets[index]; return FALSE; } @@ -2330,13 +2324,13 @@ void cur_obj_call_action_function(void (*actionFunctions[])(void)) { actionFunction(); } -static struct Object *spawn_star_with_no_lvl_exit(s32 sp20, s32 sp24) { - struct Object *sp1C = spawn_object(o, MODEL_STAR, bhvSpawnedStarNoLevelExit); - sp1C->oSparkleSpawnUnk1B0 = sp24; - sp1C->oBehParams = o->oBehParams; - sp1C->oBehParams2ndByte = sp20; +static struct Object *spawn_star_with_no_lvl_exit(s32 param, s32 sp24) { + struct Object *starObj = spawn_object(o, MODEL_STAR, bhvSpawnedStarNoLevelExit); + starObj->oSparkleSpawnUnk1B0 = sp24; + starObj->oBehParams = o->oBehParams; + starObj->oBehParams2ndByte = param; - return sp1C; + return starObj; } // old unused initializer for 2d star spawn behavior. @@ -2346,7 +2340,7 @@ void spawn_base_star_with_no_lvl_exit(void) { } s32 bit_shift_left(s32 a0) { - return sPowersOfTwo[a0]; + return 1 << a0; } s32 cur_obj_mario_far_away(void) { @@ -2465,14 +2459,14 @@ s32 cur_obj_set_hitbox_and_die_if_attacked(struct ObjectHitbox *hitbox, s32 deat } -void obj_explode_and_spawn_coins(f32 sp18, s32 sp1C) { - spawn_mist_particles_variable(0, 0, sp18); +void obj_explode_and_spawn_coins(f32 mistSize, s32 coinType) { + spawn_mist_particles_variable(0, 0, mistSize); spawn_triangle_break_particles(30, MODEL_DIRT_ANIMATION, 3.0f, 4); obj_mark_for_deletion(o); - if (sp1C == 1) { + if (coinType == 1) { obj_spawn_loot_yellow_coins(o, o->oNumLootCoins, 20.0f); - } else if (sp1C == 2) { + } else if (coinType == 2) { obj_spawn_loot_blue_coins(o, o->oNumLootCoins, 20.0f, 150); } } diff --git a/src/game/object_helpers.h b/src/game/object_helpers.h index fa83e8e1..00adcec8 100644 --- a/src/game/object_helpers.h +++ b/src/game/object_helpers.h @@ -153,8 +153,8 @@ s32 cur_obj_check_anim_frame_in_range(s32 startFrame, s32 rangeLength); s32 cur_obj_check_frame_prior_current_frame(s16 *a0); s32 mario_is_in_air_action(void); s32 mario_is_dive_sliding(void); -void cur_obj_set_y_vel_and_animation(f32 sp18, s32 sp1C); -void cur_obj_unrender_set_action_and_anim(s32 sp18, s32 sp1C); +void cur_obj_set_y_vel_and_animation(f32 yVel, s32 animIndex); +void cur_obj_unrender_set_action_and_anim(s32 animIndex, s32 action); void cur_obj_get_thrown_or_placed(f32 forwardVel, f32 velY, s32 thrownAction); void cur_obj_get_dropped(void); void cur_obj_set_model(s32 modelID); @@ -190,8 +190,8 @@ void set_mario_interact_true_if_in_range(UNUSED s32 sp0, UNUSED s32 sp4, f32 sp8 void obj_set_billboard(struct Object *obj); void cur_obj_set_hitbox_radius_and_height(f32 radius, f32 height); void cur_obj_set_hurtbox_radius_and_height(f32 radius, f32 height); -void obj_spawn_loot_blue_coins(struct Object *obj, s32 numCoins, f32 sp28, s16 posJitter); -void obj_spawn_loot_yellow_coins(struct Object *obj, s32 numCoins, f32 sp28); +void obj_spawn_loot_blue_coins(struct Object *obj, s32 numCoins, f32 baseYVel, s16 posJitter); +void obj_spawn_loot_yellow_coins(struct Object *obj, s32 numCoins, f32 baseYVel); void cur_obj_spawn_loot_coin_at_mario_pos(void); s32 cur_obj_advance_looping_anim(void); s32 cur_obj_resolve_wall_collisions(void); @@ -243,16 +243,16 @@ s32 absi(s32 a0); s32 cur_obj_wait_then_blink(s32 timeUntilBlinking, s32 numBlinks); s32 cur_obj_is_mario_ground_pounding_platform(void); void spawn_mist_particles(void); -void spawn_mist_particles_with_sound(u32 sp18); +void spawn_mist_particles_with_sound(u32 soundMagic); void cur_obj_push_mario_away(f32 radius); void cur_obj_push_mario_away_from_cylinder(f32 radius, f32 extentY); s32 cur_obj_set_direction_table(s8 *a0); s32 cur_obj_progress_direction_table(void); void stub_obj_helpers_3(UNUSED s32 sp0, UNUSED s32 sp4); -void cur_obj_scale_over_time(s32 a0, s32 a1, f32 sp10, f32 sp14); +void cur_obj_scale_over_time(s32 axis, s32 times, f32 start, f32 end); void cur_obj_set_pos_to_home_with_debug(void); s32 cur_obj_is_mario_on_platform(void); -s32 jiggle_bbh_stair(s32 a0); +s32 jiggle_bbh_stair(s32 timer); void cur_obj_call_action_function(void (*actionFunctions[])(void)); void spawn_base_star_with_no_lvl_exit(void); s32 bit_shift_left(s32 a0); @@ -261,7 +261,7 @@ s32 is_mario_moving_fast_or_in_air(s32 speedThreshold); s32 is_item_in_array(s8 item, s8 *array); void cur_obj_enable_rendering_if_mario_in_room(void); s32 cur_obj_set_hitbox_and_die_if_attacked(struct ObjectHitbox *hitbox, s32 deathSound, s32 noLootCoins); -void obj_explode_and_spawn_coins(f32 sp18, s32 sp1C); +void obj_explode_and_spawn_coins(f32 mistSize, s32 coinType); void obj_set_collision_data(struct Object *obj, const void *segAddr); void cur_obj_if_hit_wall_bounce_away(void); s32 cur_obj_hide_if_mario_far_away_y(f32 distY); diff --git a/src/game/object_list_processor.c b/src/game/object_list_processor.c index cb66d761..596e71a3 100644 --- a/src/game/object_list_processor.c +++ b/src/game/object_list_processor.c @@ -153,7 +153,7 @@ s32 gEnvironmentLevels[20]; RoomData gDoorAdjacentRooms[60][2]; s16 gMarioCurrentRoom; s16 D_8035FEE2; -s16 D_8035FEE4; +s16 gDoorRenderingTimer; s16 gTHIWaterDrained; s16 gTTCSpeedSetting; s16 gMarioShotFromCannon; diff --git a/src/game/object_list_processor.h b/src/game/object_list_processor.h index f41550fa..0564c30e 100644 --- a/src/game/object_list_processor.h +++ b/src/game/object_list_processor.h @@ -105,7 +105,7 @@ extern s32 gEnvironmentLevels[20]; extern RoomData gDoorAdjacentRooms[60][2]; extern s16 gMarioCurrentRoom; extern s16 D_8035FEE2; -extern s16 D_8035FEE4; +extern s16 gDoorRenderingTimer; extern s16 gTHIWaterDrained; extern s16 gTTCSpeedSetting; extern s16 gMarioShotFromCannon; diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c index e4c96d0e..5c349f4a 100644 --- a/src/game/rendering_graph_node.c +++ b/src/game/rendering_graph_node.c @@ -208,7 +208,6 @@ static void geo_append_display_list(void *displayList, s16 layer) { */ static void geo_process_master_list(struct GraphNodeMasterList *node) { s32 i; - UNUSED s32 sp1C; if (gCurGraphNodeMasterList == NULL && node->node.children != NULL) { gCurGraphNodeMasterList = node; diff --git a/src/game/rumble_init.c b/src/game/rumble_init.c index 89de2368..fc697465 100644 --- a/src/game/rumble_init.c +++ b/src/game/rumble_init.c @@ -20,7 +20,7 @@ OSMesg gRumbleThreadVIMesgBuf[1]; OSMesgQueue gRumbleThreadVIMesgQueue; struct RumbleData gRumbleDataQueue[3]; -struct StructSH8031D9B0 gCurrRumbleSettings; +struct RumbleSettings gCurrRumbleSettings; s32 sRumblePakThreadActive = FALSE; s32 sRumblePakActive = FALSE;