diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2024-04-03 20:44:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 12:44:44 -0600 |
| commit | 12f332614ed9ee8b684d4b0fdae91e5ef14568ff (patch) | |
| tree | a8684cb916aae03d41b35a57d07b4c70fd4da909 /src/code_800029B0.c | |
| parent | 705fb6d91579ca6661869ff14a58f7b4145c4104 (diff) | |
move actors code in actors folder and rename thing related to actor (#584)
* Move actors into their folders
* Renamings and documentation
Diffstat (limited to 'src/code_800029B0.c')
| -rw-r--r-- | src/code_800029B0.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/code_800029B0.c b/src/code_800029B0.c index ec8cc038e..86acf4c63 100644 --- a/src/code_800029B0.c +++ b/src/code_800029B0.c @@ -83,13 +83,15 @@ s32 D_8015F5A0; s32 D_8015F5A4; s32 code_800029B0_bss_pad[48]; Vtx *vtxBuffer[32]; -s16 D_8015F6E8; -s16 D_8015F6EA; -s16 D_8015F6EC; // s16 or u16? -s16 D_8015F6EE; -s16 D_8015F6F0; -s16 D_8015F6F2; +s16 gCourseMaxX; +s16 gCourseMinX; + +s16 gCourseMaxY; // s16 or u16? +s16 gCourseMinY; + +s16 gCourseMaxZ; +s16 gCourseMinZ; s16 D_8015F6F4; s16 D_8015F6F6; @@ -210,7 +212,7 @@ void setup_race(void) { func_802A74BC(); func_802A4D18(); func_80091FA4(); - func_8029E158(); + init_actors_and_load_textures(); if (gModeSelection != BATTLE) { D_8015F8D0[1] = (f32) (D_80164490->posY - 15);; @@ -320,7 +322,7 @@ void func_80003040(void) { case COURSE_YOSHI_VALLEY: vec3f_set(position, -2300.0f, 0.0f, 634.0f); position[0] *= gCourseDirection; - addActorToEmptySlot(position, rotation, velocity, ACTOR_YOSHI_VALLEY_EGG); + add_actor_to_empty_slot(position, rotation, velocity, ACTOR_YOSHI_EGG); break; case COURSE_MOO_MOO_FARM: dma_textures(gTextureTrees4Left, 0x3E8, 0x800); @@ -353,11 +355,11 @@ void func_80003040(void) { break; case COURSE_WARIO_STADIUM: vec3f_set(position, -131.0f, 83.0f, 286.0f); - addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_SIGN); + add_actor_to_empty_slot(position, rotation, velocity, ACTOR_WARIO_SIGN); vec3f_set(position, -2353.0f, 72.0f, -1608.0f); - addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_SIGN); + add_actor_to_empty_slot(position, rotation, velocity, ACTOR_WARIO_SIGN); vec3f_set(position, -2622.0f, 79.0f, 739.0f); - addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_SIGN); + add_actor_to_empty_slot(position, rotation, velocity, ACTOR_WARIO_SIGN); // d_course_wario_stadium_packed_dl_C50 find_vtx_and_set_colours(0x07000C50, 0x64, 0xFF, 0xFF, 0xFF); // d_course_wario_stadium_packed_dl_BD8 |