diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2025-01-04 14:47:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-04 14:47:22 -0700 |
| commit | 4dfc8a9fef29af9319d7c145ba7190540ccd9d02 (patch) | |
| tree | 81cfb2e009ca3e66db1bb40f14887b014e4786ab /src/engine | |
| parent | 1101dcafb08a1f17b06306ff44a9d869ffeb7862 (diff) | |
| parent | eb8e6abc20117228246653bf5f950caada20537d (diff) | |
Merge pull request #134 from MegaMech/91750
The Big code_80091750.c PR
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/World.cpp | 4 | ||||
| -rw-r--r-- | src/engine/objects/Trophy.cpp | 2 | ||||
| -rw-r--r-- | src/engine/wasm.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/World.cpp b/src/engine/World.cpp index ded60a262..1e68a4b26 100644 --- a/src/engine/World.cpp +++ b/src/engine/World.cpp @@ -60,8 +60,8 @@ u32 World::GetCupIndex() { u32 World::NextCup() { s32 hack = 1; - // Prevent battle mode - if (gModeSelection == GRAND_PRIX) { + // Do not display battle mode on GP, TT, or VS + if (gModeSelection != BATTLE) { hack = 2; } diff --git a/src/engine/objects/Trophy.cpp b/src/engine/objects/Trophy.cpp index c14cc23ca..4de758aab 100644 --- a/src/engine/objects/Trophy.cpp +++ b/src/engine/objects/Trophy.cpp @@ -14,7 +14,7 @@ extern "C" { #include "engine/Matrix.h" #include "render_objects.h" #include "code_80086E70.h" -#include "code_80091750.h" +#include "menu_items.h" } OTrophy::OTrophy(const FVector& pos, TrophyType trophy, Behaviour bhv) { diff --git a/src/engine/wasm.cpp b/src/engine/wasm.cpp index c94e7882b..cef8760dd 100644 --- a/src/engine/wasm.cpp +++ b/src/engine/wasm.cpp @@ -16,7 +16,7 @@ // #include <filesystem> // #include <functional> // #include <main.h> -// #include <code_80091750.h> +// #include <menu_items.h> // #include <common_data.h> // #include <data_segment2.h> // #include <render_objects.h> |