diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2024-04-20 19:10:53 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-20 19:10:53 -0600 |
| commit | 7a10ba89f6bf26fd4b659510fefb2ce1cd315f02 (patch) | |
| tree | a06fc0b8288801398c24c96e80b0320cf513c9de /src/actors | |
| parent | 4df64731472064ac5452b62fb867e59a18487852 (diff) | |
Header cleanup and some renames (#616)
* Place macros for addr conversions
* dl renames
* fixes
* changes ok
* Delete types.h
* move enums
Diffstat (limited to 'src/actors')
| -rw-r--r-- | src/actors/green_shell/update.inc.c | 1 | ||||
| -rw-r--r-- | src/actors/paddle_boat/render.inc.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/actors/green_shell/update.inc.c b/src/actors/green_shell/update.inc.c index 891292953..cae0c9470 100644 --- a/src/actors/green_shell/update.inc.c +++ b/src/actors/green_shell/update.inc.c @@ -1,6 +1,5 @@ #include <actors.h> #include <main.h> -#include <types.h> #include <code_800029B0.h> #include <defines.h> #include "collision.h" diff --git a/src/actors/paddle_boat/render.inc.c b/src/actors/paddle_boat/render.inc.c index 40c37b165..379b7455d 100644 --- a/src/actors/paddle_boat/render.inc.c +++ b/src/actors/paddle_boat/render.inc.c @@ -37,8 +37,8 @@ void render_actor_paddle_boat(Camera *arg0, struct PaddleWheelBoat *boat, UNUSED if (render_set_position(spE0, 1) != 0) { // Render the boat - gSPDisplayList(gDisplayListHead++, &d_course_dks_jungle_parkway_dl_E730); - gSPDisplayList(gDisplayListHead++, &d_course_dks_jungle_parkway_dl_E058); + gSPDisplayList(gDisplayListHead++, &d_course_dks_jungle_parkway_boat_dl); + gSPDisplayList(gDisplayListHead++, &d_course_dks_jungle_parkway_railings_dl); mtxf_rotate_x(spE0, boat->wheelRot); vec3f_set(sp120, 0, 16.0f, -255.0f); @@ -47,7 +47,7 @@ void render_actor_paddle_boat(Camera *arg0, struct PaddleWheelBoat *boat, UNUSED if (render_set_position(sp60, 3) != 0) { // Render the paddle wheel gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK); - gSPDisplayList(gDisplayListHead++, &d_course_dks_jungle_parkway_dl_FC28); + gSPDisplayList(gDisplayListHead++, &d_course_dks_jungle_parkway_paddle_wheel_dl); gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); } |