summaryrefslogtreecommitdiff
path: root/src/update_objects.c
diff options
context:
space:
mode:
authorcoco875 <59367621+coco875@users.noreply.github.com>2024-08-25 02:39:52 +0200
committerGitHub <noreply@github.com>2024-08-24 18:39:52 -0600
commit848b31c01eed7b88a2d17b20a33de47f34c161b5 (patch)
treecbe75dc66864f83dd2ce148f3e7a7a8889dc33e4 /src/update_objects.c
parente135178097f416bc54e36058e10d9b1c013929fd (diff)
Update decomp (#63)
* update libultra asm (#648) * update libultra asm * fix gcc __osThreadTail --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * Document Vehicles (#641) * start doc collision * fix merge * finish rename fonction related to vehicle * document around waypoint of vehicle * make some modification * make some change and rename one * copy_ to oldPos * doc smoke ferry and train * some rename * fix some renaming * precise index * rename a funciton * simplify waypoint_vehicles * change some name * change some name * rename move_to_point_direction * fix some conflict * Update code_80005FD0.c * Update code_80005FD0.h --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * Label a save info loop (#645) * save info * more gcc progress * fix a value and do a rename (#669) * fix error of compilation --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/update_objects.c')
-rw-r--r--src/update_objects.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/update_objects.c b/src/update_objects.c
index 33474c201..f50e6e2b2 100644
--- a/src/update_objects.c
+++ b/src/update_objects.c
@@ -1526,31 +1526,31 @@ void func_8007542C(s32 arg0) {
}
}
-void func_80075574(s32 objectIndex, Vec3f arg1, f32 arg2) {
+void init_train_smoke(s32 objectIndex, Vec3f pos, f32 velocity) {
Object *object;
UNUSED s32 pad[2];
init_object(objectIndex, 0);
object = &gObjectList[objectIndex];
- object->origin_pos[0] = arg1[0];
- object->origin_pos[1] = arg1[1];
- object->origin_pos[2] = arg1[2];
- object->velocity[1] = arg2;
+ object->origin_pos[0] = pos[0];
+ object->origin_pos[1] = pos[1];
+ object->origin_pos[2] = pos[2];
+ object->velocity[1] = velocity;
object->type = random_int(0x0064U) + 0x1E;
}
-s32 func_800755FC(s32 arg0, Vec3f arg1, f32 arg2) {
+s32 spawn_train_smoke(s32 trainIndex, Vec3f pos, f32 velocity) {
s32 objectIndex;
- if (arg0 == 0) {
+ if (trainIndex == 0) {
objectIndex = add_unused_obj_index(gObjectParticle2, &gNextFreeObjectParticle2, gObjectParticle2_SIZE);
if (objectIndex != NULL_OBJECT_ID) {
- func_80075574(objectIndex, arg1, arg2);
+ init_train_smoke(objectIndex, pos, velocity);
}
} else {
objectIndex = add_unused_obj_index(gObjectParticle3, &gNextFreeObjectParticle3, gObjectParticle3_SIZE);
if (objectIndex != NULL_OBJECT_ID) {
- func_80075574(objectIndex, arg1, arg2);
+ init_train_smoke(objectIndex, pos, velocity);
}
}
return objectIndex;
@@ -1646,31 +1646,31 @@ void update_train_smoke(void) {
}
}
-void func_800759EC(s32 objectIndex, Vec3f arg1, f32 arg2) {
+void init_ferry_smoke(s32 objectIndex, Vec3f pos, f32 velocity) {
Object *object;
init_object(objectIndex, 0);
object = &gObjectList[objectIndex];
- object->origin_pos[0] = arg1[0];
- object->origin_pos[1] = arg1[1];
- object->origin_pos[2] = arg1[2];
- object->velocity[1] = arg2;
+ object->origin_pos[0] = pos[0];
+ object->origin_pos[1] = pos[1];
+ object->origin_pos[2] = pos[2];
+ object->velocity[1] = velocity;
object->type = 0x00FF;
object->unk_0A2 = 0x0096;
}
-s32 func_80075A6C(s32 arg0, Vec3f arg1, f32 arg2) {
+s32 spawn_ferry_smoke(s32 ferryIndex, Vec3f pos, f32 velocity) {
s32 objectIndex;
- if (arg0 == 0) {
+ if (ferryIndex == 0) {
objectIndex = add_unused_obj_index(gObjectParticle2, &gNextFreeObjectParticle2, gObjectParticle2_SIZE);
if (objectIndex != NULL_OBJECT_ID) {
- func_800759EC(objectIndex, arg1, arg2);
+ init_ferry_smoke(objectIndex, pos, velocity);
}
} else {
objectIndex = add_unused_obj_index(gObjectParticle3, &gNextFreeObjectParticle3, gObjectParticle3_SIZE);
if (objectIndex != NULL_OBJECT_ID) {
- func_800759EC(objectIndex, arg1, arg2);
+ init_ferry_smoke(objectIndex, pos, velocity);
}
}