From 55afd6d0dc2bfe08b9c12fe6fd5b8e231ecd7122 Mon Sep 17 00:00:00 2001 From: Arceveti <73617174+Arceveti@users.noreply.github.com> Date: Tue, 21 Sep 2021 15:43:29 -0700 Subject: [PATCH] Some more names --- include/object_fields.h | 8 ++-- src/engine/graph_node.h | 8 ++-- src/engine/surface_collision.h | 4 +- src/game/behaviors/bub.inc.c | 14 +++---- src/game/behaviors/chuckya.inc.c | 40 ++++++++++--------- .../behaviors/switch_hidden_objects.inc.c | 16 ++++---- src/game/object_helpers.c | 4 +- 7 files changed, 46 insertions(+), 48 deletions(-) diff --git a/include/object_fields.h b/include/object_fields.h index 02bb5872..99f0e719 100644 --- a/include/object_fields.h +++ b/include/object_fields.h @@ -720,13 +720,13 @@ #define /*0x100*/ oIntroLakituDistToBirdsX OBJECT_FIELD_F32(0x1E) #define /*0x104*/ oIntroLakituDistToBirdsZ OBJECT_FIELD_F32(0x1F) #define /*0x108*/ O_INTRO_LAKITU_END_BIRDS_DEST_INDEX 0x20 -#define /*0x108*/ O_INTRO_LAKITU_END_BIRDS_DEST_Z_INDEX (O_INTRO_LAKITU_END_BIRDS_DEST_INDEX + 0) // 0x20 +#define /*0x108*/ O_INTRO_LAKITU_END_BIRDS_DEST_X_INDEX (O_INTRO_LAKITU_END_BIRDS_DEST_INDEX + 0) // 0x20 #define /*0x10C*/ O_INTRO_LAKITU_END_BIRDS_DEST_Y_INDEX (O_INTRO_LAKITU_END_BIRDS_DEST_INDEX + 1) // 0x21 -#define /*0x110*/ O_INTRO_LAKITU_END_BIRDS_DEST_X_INDEX (O_INTRO_LAKITU_END_BIRDS_DEST_INDEX + 2) // 0x22 +#define /*0x110*/ O_INTRO_LAKITU_END_BIRDS_DEST_Z_INDEX (O_INTRO_LAKITU_END_BIRDS_DEST_INDEX + 2) // 0x22 #define /*0x108*/ oIntroLakituEndBirds1DestVec OBJECT_FIELD_F32(O_INTRO_LAKITU_END_BIRDS_DEST_INDEX) -#define /*0x108*/ oIntroLakituEndBirds1DestZ OBJECT_FIELD_F32(O_INTRO_LAKITU_END_BIRDS_DEST_Z_INDEX) -#define /*0x10C*/ oIntroLakituEndBirds1DestY OBJECT_FIELD_F32(O_INTRO_LAKITU_END_BIRDS_DEST_Y_INDEX) #define /*0x110*/ oIntroLakituEndBirds1DestX OBJECT_FIELD_F32(O_INTRO_LAKITU_END_BIRDS_DEST_X_INDEX) +#define /*0x10C*/ oIntroLakituEndBirds1DestY OBJECT_FIELD_F32(O_INTRO_LAKITU_END_BIRDS_DEST_Y_INDEX) +#define /*0x108*/ oIntroLakituEndBirds1DestZ OBJECT_FIELD_F32(O_INTRO_LAKITU_END_BIRDS_DEST_Z_INDEX) #define /*0x1AC*/ oIntroLakituCloud OBJECT_FIELD_OBJ(0x49) /* Main Menu Button */ diff --git a/src/engine/graph_node.h b/src/engine/graph_node.h index 51d77a25..20466df1 100644 --- a/src/engine/graph_node.h +++ b/src/engine/graph_node.h @@ -409,13 +409,13 @@ struct GraphNodeDisplayList *init_graph_node_display_list(struct AllocOnlyPool * s32 drawingLayer, void *displayList); struct GraphNodeShadow *init_graph_node_shadow(struct AllocOnlyPool *pool, struct GraphNodeShadow *graphNode, s16 shadowScale, u8 shadowSolidity, u8 shadowType); -struct GraphNodeObjectParent *init_graph_node_object_parent(struct AllocOnlyPool *pool, struct GraphNodeObjectParent *sp1c, +struct GraphNodeObjectParent *init_graph_node_object_parent(struct AllocOnlyPool *pool, struct GraphNodeObjectParent *graphNode, struct GraphNode *sharedChild); -struct GraphNodeGenerated *init_graph_node_generated(struct AllocOnlyPool *pool, struct GraphNodeGenerated *sp1c, +struct GraphNodeGenerated *init_graph_node_generated(struct AllocOnlyPool *pool, struct GraphNodeGenerated *graphNode, GraphNodeFunc gfxFunc, s32 parameter); -struct GraphNodeBackground *init_graph_node_background(struct AllocOnlyPool *pool, struct GraphNodeBackground *sp1c, +struct GraphNodeBackground *init_graph_node_background(struct AllocOnlyPool *pool, struct GraphNodeBackground *graphNode, u16 background, GraphNodeFunc backgroundFunc, s32 zero); -struct GraphNodeHeldObject *init_graph_node_held_object(struct AllocOnlyPool *pool, struct GraphNodeHeldObject *sp1c, +struct GraphNodeHeldObject *init_graph_node_held_object(struct AllocOnlyPool *pool, struct GraphNodeHeldObject *graphNode, struct Object *objNode, Vec3s translation, GraphNodeFunc nodeFunc, s32 playerIndex); struct GraphNode *geo_add_child(struct GraphNode *parent, struct GraphNode *childNode); diff --git a/src/engine/surface_collision.h b/src/engine/surface_collision.h index cfa87987..c5f062cf 100644 --- a/src/engine/surface_collision.h +++ b/src/engine/surface_collision.h @@ -13,9 +13,9 @@ // same as FLOOR_LOWER_LIMIT_MISC, explicitly for shadow.c #define FLOOR_LOWER_LIMIT_SHADOW (FLOOR_LOWER_LIMIT + 1000) -#define is_outside_level_bounds(x, z) (((x) <= -LEVEL_BOUNDARY_MAX) || ((x) >= LEVEL_BOUNDARY_MAX) || ((z) <= -LEVEL_BOUNDARY_MAX) || ((z) >= LEVEL_BOUNDARY_MAX)) +#define is_outside_level_bounds(xPos, zPos) (((xPos) <= -LEVEL_BOUNDARY_MAX) || ((xPos) >= LEVEL_BOUNDARY_MAX) || ((zPos) <= -LEVEL_BOUNDARY_MAX) || ((zPos) >= LEVEL_BOUNDARY_MAX)) -#define get_surface_height_at_location(x, z, surf) (-((x) * (surf)->normal.x + (surf)->normal.z * (z) + (surf)->originOffset) / (surf)->normal.y); +#define get_surface_height_at_location(xPos, zPos, surf) (-((xPos) * (surf)->normal.x + (surf)->normal.z * (zPos) + (surf)->originOffset) / (surf)->normal.y) #define SURFACE_YAW(s) (atan2s(((s)->normal.z), ((s)->normal.x))) diff --git a/src/game/behaviors/bub.inc.c b/src/game/behaviors/bub.inc.c index b208625f..8ee5f28f 100644 --- a/src/game/behaviors/bub.inc.c +++ b/src/game/behaviors/bub.inc.c @@ -7,9 +7,9 @@ // TODO: Rename these. These have nothing to do with birds. void bub_spawner_act_0(void) { s32 i; - s32 sp18 = o->oCheepCheepSpawnerSpawnAmount; + s32 amt = o->oCheepCheepSpawnerSpawnAmount; if (o->oDistanceToMario < 1500.0f) { - for (i = 0; i < sp18; i++) + for (i = 0; i < amt; i++) spawn_object(o, MODEL_BUB, bhvBub); o->oAction = 1; } @@ -35,12 +35,10 @@ void bhv_bub_spawner_loop(void) { cur_obj_call_action_function(sBirdChirpChirpActions); } -void bub_move_vertically(s32 a0) { - f32 sp1C = o->parentObj->oPosY; - if (sp1C - 100.0f - o->oCheepCheepMaxYOffset < o->oPosY - && o->oPosY < sp1C + 1000.0f + o->oCheepCheepMaxYOffset) - o->oPosY = approach_f32_symmetric(o->oPosY, o->oCheepCheepTargetY, a0); - else { +void bub_move_vertically(s32 ySpeed) { + f32 parentY = o->parentObj->oPosY; + if (parentY - 100.0f - o->oCheepCheepMaxYOffset < o->oPosY && o->oPosY < parentY + 1000.0f + o->oCheepCheepMaxYOffset) { + o->oPosY = approach_f32_symmetric(o->oPosY, o->oCheepCheepTargetY, ySpeed); } } diff --git a/src/game/behaviors/chuckya.inc.c b/src/game/behaviors/chuckya.inc.c index abafa416..8e70e957 100644 --- a/src/game/behaviors/chuckya.inc.c +++ b/src/game/behaviors/chuckya.inc.c @@ -26,8 +26,7 @@ void common_anchor_mario_behavior(f32 forwardVel, f32 yVel, s32 flag) { o->parentObj->oCommonAnchorAction = 0; break; case 3: - gMarioObject->oInteractStatus |= - (INT_STATUS_MARIO_UNK2 + INT_STATUS_MARIO_UNK6); // loads 2 interactions at once? + gMarioObject->oInteractStatus |= (INT_STATUS_MARIO_UNK2 + INT_STATUS_MARIO_UNK6); // loads 2 interactions at once? gMarioStates[0].forwardVel = 10.0f; gMarioStates[0].vel[1] = 10.0f; o->parentObj->oCommonAnchorAction = 0; @@ -42,29 +41,32 @@ void bhv_chuckya_anchor_mario_loop(void) { common_anchor_mario_behavior(40.0f, 40.0f, 64); } -s32 unknown_chuckya_function(s32 sp20, f32 sp24, f32 sp28, s32 sp2C) { - s32 sp1C = 0; +s32 unknown_chuckya_function(s32 updateAngle, f32 latDist, f32 dist, s32 time) { + s32 ret = 0; if (o->oChuckyaUnused != 4) { - if (sp24 < cur_obj_lateral_dist_from_mario_to_home()) { - if (cur_obj_lateral_dist_to_home() < 200.0f) - sp1C = 0; - else { - sp1C = 1; + if (latDist < cur_obj_lateral_dist_from_mario_to_home()) { + if (cur_obj_lateral_dist_to_home() < 200.0f) { + ret = 0; + } else { + ret = 1; o->oAngleToMario = cur_obj_angle_to_home(); } - } else if (o->oDistanceToMario > sp28) { - if (gGlobalTimer % (s16) sp2C == 0) + } else if (o->oDistanceToMario > dist) { + if ((gGlobalTimer % (s16) time) == 0) { o->oAngleToMario = obj_angle_to_object(o, gMarioObject); - sp1C = 2; - } else - sp1C = 3; - if (sp20 && update_angle_from_move_flags(&o->oAngleToMario)) { - sp1C = 4; + } + ret = 2; + } else { + ret = 3; + } + if (updateAngle && update_angle_from_move_flags(&o->oAngleToMario)) { + ret = 4; o->oChuckyaUnused = 4; } - } else - sp1C = 4; - return sp1C; + } else { + ret = 4; + } + return ret; } s32 approach_forward_vel(f32 *arr, f32 target, f32 inc) { diff --git a/src/game/behaviors/switch_hidden_objects.inc.c b/src/game/behaviors/switch_hidden_objects.inc.c index 0bf7cd6d..cc06c53a 100644 --- a/src/game/behaviors/switch_hidden_objects.inc.c +++ b/src/game/behaviors/switch_hidden_objects.inc.c @@ -32,7 +32,7 @@ void breakable_box_init(void) { } void hidden_breakable_box_actions(void) { - struct Object *sp1C; + struct Object *switchObj; obj_set_hitbox(o, &sBreakableBoxHitbox); cur_obj_set_model(MODEL_BREAKABLE_BOX_SMALL); if (o->oAction == 0) { @@ -42,8 +42,8 @@ void hidden_breakable_box_actions(void) { breakable_box_init(); if (o->oHiddenObjectSwitchObj == NULL) o->oHiddenObjectSwitchObj = cur_obj_nearest_object_with_behavior(bhvFloorSwitchHiddenObjects); - if ((sp1C = o->oHiddenObjectSwitchObj) != NULL) - if (sp1C->oAction == 2) { + if ((switchObj = o->oHiddenObjectSwitchObj) != NULL) + if (switchObj->oAction == 2) { o->oAction++; cur_obj_enable_rendering(); cur_obj_unhide(); @@ -63,22 +63,22 @@ void hidden_breakable_box_actions(void) { cur_obj_become_intangible(); cur_obj_disable_rendering(); o->oInteractStatus = 0; - if ((sp1C = o->oHiddenObjectSwitchObj) != NULL) - if (sp1C->oAction == 0) + if ((switchObj = o->oHiddenObjectSwitchObj) != NULL) + if (switchObj->oAction == 0) o->oAction = 0; } } void hidden_unbreakable_box_actions(void) { - struct Object *sp1C; + struct Object *switchObj; obj_set_collision_data(o, wdw_seg7_collision_07018528); if (o->oAction == 0) { cur_obj_disable_rendering(); cur_obj_become_intangible(); if (o->oHiddenObjectSwitchObj == NULL) o->oHiddenObjectSwitchObj = cur_obj_nearest_object_with_behavior(bhvFloorSwitchHiddenObjects); - if ((sp1C = o->oHiddenObjectSwitchObj) != NULL) - if (sp1C->oAction == 2) { + if ((switchObj = o->oHiddenObjectSwitchObj) != NULL) + if (switchObj->oAction == 2) { o->oAction++; cur_obj_enable_rendering(); cur_obj_unhide(); diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c index 37aa9c4c..f0412cfa 100644 --- a/src/game/object_helpers.c +++ b/src/game/object_helpers.c @@ -171,8 +171,7 @@ Gfx *geo_switch_area(s32 callContext, struct GraphNode *node) { #endif s16 roomCase; struct Surface *floor; - UNUSED struct Object *sp1C = - (struct Object *) gCurGraphNodeObject; // TODO: change global type to Object pointer + UNUSED struct Object *obj = (struct Object *) gCurGraphNodeObject; // TODO: change global type to Object pointer struct GraphNodeSwitchCase *switchCase = (struct GraphNodeSwitchCase *) node; if (callContext == GEO_CONTEXT_RENDER) { @@ -2059,7 +2058,6 @@ static void obj_build_vel_from_transform(struct Object *obj) { f32 left = obj->oLeftVel; f32 forward = obj->oForwardVel; - //! Typo, up and left should be swapped obj->oVelX = obj->transform[0][0] * left + obj->transform[1][0] * up + obj->transform[2][0] * forward; obj->oVelY = obj->transform[0][1] * left + obj->transform[1][1] * up + obj->transform[2][1] * forward; obj->oVelZ = obj->transform[0][2] * left + obj->transform[1][2] * up + obj->transform[2][2] * forward;