diff options
Diffstat (limited to 'src/engine/objects/Thwomp.cpp')
| -rw-r--r-- | src/engine/objects/Thwomp.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/engine/objects/Thwomp.cpp b/src/engine/objects/Thwomp.cpp index b597f26ba..324f32cfb 100644 --- a/src/engine/objects/Thwomp.cpp +++ b/src/engine/objects/Thwomp.cpp @@ -26,12 +26,14 @@ extern "C" { #include "code_80005FD0.h" #include "math_util_2.h" #include "collision.h" -#include "assets/bowsers_castle_data.h" +#include "assets/models/tracks/bowsers_castle/bowsers_castle_data.h" +#include "assets/textures/tracks/bowsers_castle/bowsers_castle_data.h" #include "ceremony_and_credits.h" #include "objects.h" #include "update_objects.h" #include "render_objects.h" #include "some_data.h" +#include "assets/models/common_data.h" extern s8 gPlayerCount; } @@ -758,7 +760,7 @@ void OThwomp::Draw(s32 cameraId) { void OThwomp::DrawModel(s32 objectIndex) { if ((gObjectList[objectIndex].state >= 2) && (func_80072354(objectIndex, 0x00000040) != 0)) { - FrameInterpolation_RecordOpenChild("Thwomp_Main", (uintptr_t) TAG_THWOMP(this)); + FrameInterpolation_RecordOpenChild("Thwomp_Main", TAG_THWOMP(this)); func_8004A7AC(objectIndex, 1.75f); rsp_set_matrix_transformation(gObjectList[objectIndex].pos, gObjectList[objectIndex].orientation, gObjectList[objectIndex].sizeScaling); |