Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix typo actor #657

Merged
merged 2 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/actors/banana/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

/**
* @brief Render the banana actor
*
* @param camera
* @param arg1
* @param banana
*
* @param camera
* @param arg1
* @param banana
*/
void render_actor_banana(Camera *camera, UNUSED Mat4 arg1, struct BananaActor *banana) {
UNUSED s32 pad[2];
Expand Down
16 changes: 8 additions & 8 deletions src/actors/blue_and_red_shells/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

/**
* @brief Render the red shell actor
*
* @param camera
* @param matrix
* @param shell
*
* @param camera
* @param matrix
* @param shell
*/
void render_actor_red_shell(Camera *camera, Mat4 matrix, struct ShellActor *shell) {
gDPLoadTLUT_pal256(gDisplayListHead++, &gTLUTRedShell); // set texture
Expand All @@ -15,10 +15,10 @@ void render_actor_red_shell(Camera *camera, Mat4 matrix, struct ShellActor *shel

/**
* @brief Render the blue shell actor
*
* @param camera
* @param matrix
* @param shell
*
* @param camera
* @param matrix
* @param shell
*/
void render_actor_blue_shell(Camera *camera, Mat4 matrix, struct ShellActor *shell) {
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_blue_shell); // set texture
Expand Down
6 changes: 3 additions & 3 deletions src/actors/box_truck/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
* @brief Renders the box truck actor.
* Actor used in Toad's Turnpike.
* His update are made in vehicle.
*
* @param arg0
* @param arg1
*
* @param arg0
* @param arg1
*/
void render_actor_box_truck(Camera *arg0, struct Actor *arg1) {
UNUSED s32 pad[6];
Expand Down
8 changes: 4 additions & 4 deletions src/actors/cow/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
/**
* @brief Renders the cow actor.
* Actor used in Moo Moo Farm.
*
* @param camera
* @param arg1
* @param arg2
*
* @param camera
* @param arg1
* @param arg2
*/
void render_actor_cow(Camera *camera, Mat4 arg1, struct Actor *arg2) {
if (is_within_render_distance(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f) < 0) { return; }
Expand Down
6 changes: 3 additions & 3 deletions src/actors/fake_item_box/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

/**
* @brief Renders the fake item box actor.
*
* @param camera
* @param fakeItemBox
*
* @param camera
* @param fakeItemBox
*/
void render_actor_fake_item_box(Camera *camera, struct FakeItemBox *fakeItemBox) {
Vec3s someRot;
Expand Down
8 changes: 4 additions & 4 deletions src/actors/falling_rock/update.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ void func_8029CF0C(struct ActorSpawnData *spawnData, struct FallingRock *rock) {
/**
* @brief Spawns falling rocks.
* Used in Choco Mountain.
*
* @param spawnData
*
* @param spawnData
*/
void spawn_falling_rocks(struct ActorSpawnData *spawnData) {
s32 addr = SEGMENT_NUMBER2(spawnData);
Expand Down Expand Up @@ -52,8 +52,8 @@ void spawn_falling_rocks(struct ActorSpawnData *spawnData) {
/**
* @brief Updates the falling rock actor.
* Actor used in Choco Mountain.
*
* @param rock
*
* @param rock
*/
void update_actor_falling_rocks(struct FallingRock *rock) {
Vec3f unkVec;
Expand Down
8 changes: 4 additions & 4 deletions src/actors/green_shell/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

/**
* @brief Renders the green shell actor.
*
* @param camera
* @param matrix
* @param shell
*
* @param camera
* @param matrix
* @param shell
*/
void render_actor_green_shell(Camera *camera, Mat4 matrix, struct ShellActor *shell) {
gDPLoadTLUT_pal256(gDisplayListHead++, common_tlut_green_shell); // set texture
Expand Down
8 changes: 4 additions & 4 deletions src/actors/kiwano_fruit/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
/**
* @brief Renders the kiwano fruit actor.
* Actor used in DK's Jungle Parkway.
*
* @param camera
* @param arg1
* @param actor
*
* @param camera
* @param arg1
* @param actor
*/
void render_actor_kiwano_fruit(UNUSED Camera *camera, Mat4 arg1, struct Actor *actor) {
uintptr_t addr;
Expand Down
12 changes: 6 additions & 6 deletions src/actors/paddle_boat/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
/**
* @brief Renders the paddle boat actor.
* Actor used in DK's Jungle Parkway.
*
* @param arg0
* @param boat
* @param arg2
* @param pathCounter
*
* @param arg0
* @param boat
* @param arg2
* @param pathCounter
*/
void render_actor_paddle_boat(Camera *arg0, struct PaddleWheelBoat *boat, UNUSED Mat4 arg2, u16 pathCounter) {
UNUSED s32 pad[3];
Expand All @@ -25,7 +25,7 @@ void render_actor_paddle_boat(Camera *arg0, struct PaddleWheelBoat *boat, UNUSED
f32 temp;

if ((pathCounter > 20) && (pathCounter < 25)) { return; }

temp = is_within_render_distance(arg0->pos, boat->pos, arg0->rot[1], 90000.0f, gCameraZoom[arg0 - camera1], 9000000.0f);

if (temp < 0.0f) { return; }
Expand Down
4 changes: 2 additions & 2 deletions src/actors/paddle_boat/update.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* @brief Updates the paddle boat actor.
* Actor used in DK's Jungle Parkway.
* Rotate only the paddle wheel, for position and rotation of the boat it's in vehicle.
*
* @param boat
*
* @param boat
*/
void update_actor_paddle_boat(struct PaddleWheelBoat *boat) {
boat->wheelRot += 0x38E;
Expand Down
8 changes: 4 additions & 4 deletions src/actors/piranha_plant/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
/**
* @brief Renders the piranha plant actor.
* Actor used in Mario Raceway and Royal Raceway.
*
* @param arg0
* @param arg1
* @param arg2
*
* @param arg0
* @param arg1
* @param arg2
*/
void render_actor_piranha_plant(Camera *arg0, Mat4 arg1, struct PiranhaPlant *arg2) {
UNUSED s32 pad;
Expand Down
6 changes: 3 additions & 3 deletions src/actors/railroad_crossing/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
/**
* @brief Renders the railroad crossing actor.
* Actor used in Kalimari Desert.
*
* @param arg0
* @param rr_crossing
*
* @param arg0
* @param rr_crossing
*/
void render_actor_railroad_crossing(Camera *arg0, struct RailroadCrossing *rr_crossing) {
UNUSED Vec3s sp80 = {0, 0, 0};
Expand Down
6 changes: 3 additions & 3 deletions src/actors/school_bus/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
* @brief Renders the school bus actor.
* Actor used in Toad's Turnpike.
* His update are made in vehicle.
*
* @param arg0
* @param arg1
*
* @param arg0
* @param arg1
*/
void render_actor_school_bus(Camera *arg0, struct Actor *arg1) {
UNUSED s32 pad[6];
Expand Down
6 changes: 3 additions & 3 deletions src/actors/train/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
* @brief Renders the train engine actor.
* Actor used in Kalimari Desert.
* His update position are made in vehicle.
*
* @param camera
* @param actor
*
* @param camera
* @param actor
*/
void render_actor_train_engine(Camera *camera, struct TrainCar *actor) {
UNUSED s32 pad[2];
Expand Down
8 changes: 4 additions & 4 deletions src/actors/trees/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

/**
* @brief Renders the tree actor in Mario rawceay.
*
* @param camera
* @param arg1
* @param arg2
*
* @param camera
* @param arg1
* @param arg2
*/
void render_actor_tree_mario_raceway(Camera *camera, Mat4 arg1, struct Actor *arg2) {
f32 temp_f0;
Expand Down
6 changes: 3 additions & 3 deletions src/actors/wario_sign/render.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
/**
* @brief Renders the Wario sign actor.
* Used in Wario Stadium.
*
* @param arg0
* @param arg1
*
* @param arg0
* @param arg1
*/
void render_actor_wario_sign(Camera *arg0, struct Actor *arg1) {
Mat4 sp38;
Expand Down
Loading