mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-06-25 18:14:49 -04:00
Name ScreenContext, Refactor Course class to Track (#583)
* Rename Screen Contexts * typedef ScreenContext struct * Fix Compile * Rename Course.cpp to Track.cpp * Refactor Course to Track * A few renames * General Cleanup * More Rename * More names * Move TrackSections struct to Track.h --------- Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
This commit is contained in:
@@ -44,7 +44,7 @@
|
||||
#include "port/Game.h"
|
||||
#include "port/Engine.h"
|
||||
|
||||
#include "engine/courses/Course.h"
|
||||
#include "engine/tracks/Track.h"
|
||||
#include "engine/Matrix.h"
|
||||
|
||||
#include "port/interpolation/FrameInterpolation.h"
|
||||
@@ -2761,9 +2761,9 @@ void func_8004EF9C(s32 arg0) {
|
||||
s16 temp_t0;
|
||||
s16 temp_v0;
|
||||
|
||||
temp_v0 = CM_GetPropsCourseId(arg0)->Minimap.Width;
|
||||
temp_t0 = CM_GetPropsCourseId(arg0)->Minimap.Height;
|
||||
func_8004D37C(0x00000104, 0x0000003C, CM_GetPropsCourseId(arg0)->Minimap.Texture, 0x000000FF, 0x000000FF,
|
||||
temp_v0 = CM_GetPropsTrackId(arg0)->Minimap.Width;
|
||||
temp_t0 = CM_GetPropsTrackId(arg0)->Minimap.Height;
|
||||
func_8004D37C(0x00000104, 0x0000003C, CM_GetPropsTrackId(arg0)->Minimap.Texture, 0x000000FF, 0x000000FF,
|
||||
0x000000FF, 0x000000FF, temp_v0, temp_t0, temp_v0, temp_t0);
|
||||
}
|
||||
|
||||
@@ -3603,13 +3603,13 @@ void func_80051C60(s16 arg0, s32 arg1) {
|
||||
}
|
||||
|
||||
void func_80051EBC(void) {
|
||||
func_80051ABC(240 - D_800DC5EC->cameraHeight, 0); // 28
|
||||
func_80051ABC(240 - gScreenOneCtx->cameraHeight, 0); // 28
|
||||
}
|
||||
|
||||
void func_80051EF8(void) {
|
||||
s16 temp_a0;
|
||||
|
||||
temp_a0 = 0xF0 - D_800DC5EC->cameraHeight;
|
||||
temp_a0 = 0xF0 - gScreenOneCtx->cameraHeight;
|
||||
if (IsKoopaTroopaBeach()) {
|
||||
temp_a0 = temp_a0 - 0x30;
|
||||
} else if (IsMooMooFarm()) {
|
||||
@@ -3625,7 +3625,7 @@ void func_80051EF8(void) {
|
||||
void func_80051F9C(void) {
|
||||
s16 temp_a0;
|
||||
|
||||
temp_a0 = 0xF0 - D_800DC5F0->cameraHeight;
|
||||
temp_a0 = 0xF0 - gScreenTwoCtx->cameraHeight;
|
||||
if (IsKoopaTroopaBeach()) {
|
||||
temp_a0 = temp_a0 - 0x30;
|
||||
} else if (IsMooMooFarm()) {
|
||||
@@ -3639,11 +3639,11 @@ void func_80051F9C(void) {
|
||||
}
|
||||
|
||||
void func_80052044(void) {
|
||||
func_80051C60(240 - D_800DC5EC->cameraHeight, 0);
|
||||
func_80051C60(240 - gScreenOneCtx->cameraHeight, 0);
|
||||
}
|
||||
|
||||
void func_80052080(void) {
|
||||
func_80051C60(240 - D_800DC5F0->cameraHeight, D_8018D1F0);
|
||||
func_80051C60(240 - gScreenTwoCtx->cameraHeight, D_8018D1F0);
|
||||
}
|
||||
|
||||
void func_800520C0(s32 arg0) {
|
||||
|
||||
Reference in New Issue
Block a user