diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2023-08-22 19:12:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-22 19:12:51 -0600 |
| commit | 6e3f6aee638adfaee3ccbd72dc0d18f10d9f4ef6 (patch) | |
| tree | 5e02a7a8f34a17d14d07fc6ee2f94ebe287a0804 /src/code_800029B0.c | |
| parent | 6e5663895009a556afd7320aa4663434ddd46822 (diff) | |
Matched some funcs (#378)
* Matched code
Diffstat (limited to 'src/code_800029B0.c')
| -rw-r--r-- | src/code_800029B0.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/code_800029B0.c b/src/code_800029B0.c index 61720662b..5d9f1dc0d 100644 --- a/src/code_800029B0.c +++ b/src/code_800029B0.c @@ -10,7 +10,7 @@ #include "audio/external.h" #include "code_800029B0.h" #include <defines.h> -#include "code_802AAA70.h" +#include "collision.h" #include "memory.h" #include "code_80091750.h" #include "skybox_and_splitscreen.h" @@ -230,10 +230,10 @@ void func_80003040(void) { place_segment_06(D_06009570); break; case COURSE_BOWSER_CASTLE: - func_802AF8BC(0x7001350, 0x32, 0, 0, 0); + find_vtx_and_set_colours(0x7001350, 0x32, 0, 0, 0); break; case COURSE_BANSHEE_BOARDWALK: - func_802AF8BC(0x7000878, -0x80, 0, 0, 0); + find_vtx_and_set_colours(0x7000878, -0x80, 0, 0, 0); break; case COURSE_YOSHI_VALLEY: vec3f_set(position, -2300.0f, 0.0f, 634.0f); @@ -256,13 +256,13 @@ void func_80003040(void) { place_segment_06(D_06014330); break; case COURSE_SHERBET_LAND: - func_802AF8BC(0x7001EB8, -0x4C, 0xFF, 0xFF, 0xFF); - func_802AF8BC(0x7002308, -0x6A, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7001EB8, -0x4C, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7002308, -0x6A, 0xFF, 0xFF, 0xFF); break; case COURSE_RAINBOW_ROAD: - func_802AF8BC(0x7002068, -0x6A, 0xFF, 0xFF, 0xFF); - func_802AF8BC(0x7001E18, -0x6A, 0xFF, 0xFF, 0xFF); - func_802AF8BC(0x7001318, -1, 0xFF, 0xFF, 0); + find_vtx_and_set_colours(0x7002068, -0x6A, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7001E18, -0x6A, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7001318, -1, 0xFF, 0xFF, 0); break; case COURSE_WARIO_STADIUM: vec3f_set(position, -131.0f, 83.0f, 286.0f); @@ -271,17 +271,17 @@ void func_80003040(void) { addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_STADIUM_SIGN); vec3f_set(position, -2622.0f, 79.0f, 739.0f); addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_STADIUM_SIGN); - func_802AF8BC(0x7000C50, 0x64, 0xFF, 0xFF, 0xFF); - func_802AF8BC(0x7000BD8, 0x64, 0xFF, 0xFF, 0xFF); - func_802AF8BC(0x7000B60, 0x64, 0xFF, 0xFF, 0xFF); - func_802AF8BC(0x7000AE8, 0x64, 0xFF, 0xFF, 0xFF); - func_802AF8BC(0x7000CC8, 0x64, 0xFF, 0xFF, 0xFF); - func_802AF8BC(0x7000D50, 0x64, 0xFF, 0xFF, 0xFF); - func_802AF8BC(0x7000DD0, 0x64, 0xFF, 0xFF, 0xFF); - func_802AF8BC(0x7000E48, 0x64, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7000C50, 0x64, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7000BD8, 0x64, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7000B60, 0x64, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7000AE8, 0x64, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7000CC8, 0x64, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7000D50, 0x64, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7000DD0, 0x64, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7000E48, 0x64, 0xFF, 0xFF, 0xFF); break; case COURSE_DK_JUNGLE: - func_802AF8BC(0x7003FA8, 0x78, 0xFF, 0xFF, 0xFF); + find_vtx_and_set_colours(0x7003FA8, 0x78, 0xFF, 0xFF, 0xFF); break; default: break; |