Impl new intro (#193)

* Update menus

* Update CMakeLists.txt

* Add Ship

* Impl hm ship actors

* Update HM course

* Impl new intro

* Finish intro scene

* Rename

* Start Editor Work

* raycast works

* Fix ScreenRayTrace in widescreen

* Basic Actor Picking

* wip

* Editor use vtx collision

* gizmo work

* otr works for object picking

* Impl objects for editor

* actor init

* Update

* Add all axis move (freemove)

* Docking Windows works here

* Setup imgui layout for editor

* Editor Snap to Ground works

* Basic Scene Explorer Works

* Editor get actor names

* Impl editor object names

* impl Editor Play and Pause buttons

* Editor translate works while paused

* Fix freecam lighting

* Added adjustable track properties to editor

* Editor matrix, icons, rotation, impl light

* Setup Track Properties 1

* Editor tooling wip

* Load modded o2rs

* Don't enable hud if editor is enabled

* Updates

* SceneManager nearly working

* Fix mario kart 64 intro logo sizing

* Fix Rotator

* Finish new matrix translation code

* Cleanup headers

* Cleanup

* Cleanup 2

* Cleanup 3

* Prevent divize by zero crash

* Add visible circle for translate in all axis

* Editor scaling/rot works properly now

* Scale All_Axis evenly

* Fixes to includes to work on Linux.

* Removed overfilled arguments in gfx_create_framebuffer()

* Added missing function definitions to Game.h

* Editor sun face the camera

* Add rotation model to gizmo

* Add new handles

* Failed attempt at transforming collision

* Impl water volume

* Import fast64 paths

* water surface

* Scene Setup 1

* Custom Track O2R almost working needs testing

* Custom Track Load path O2r

* Render custom track. Wip collision

* Add missing function

* Debug Spawning Custom O2R Track

* Import courses working now

* Fix memory leak

* Remove New Track Button

* Engine.cpp more consistent with sf64

* Fix Editor Enable Button

* Editor Accurate mouse click drag objects

* Editor selects closest object and cleanup

* Gizmo rot and scale collision working

* Remove constexpr from IRotator

* Impl properties for location/rot/scale

* Better Properties display, swap rot handles

* Fix content browser dock and editor now disabled by default

* Remove GameInfoWindow, Multiplayer Button, and FPS Slider

* Disable Editor when its disabled

* Add new logo to hm intro

* Fix pause menu item box cursor

* Remove minimap from Course::from_json and to_json

* Impl Import Minimap

* Fix custom minimap rendering

* minimap uses extension .png

* Refactor minimap

* Freecam only for player 1

* GrandPrix Balloons work in custom track

* Track Id is now std::string and outside of Props

* Moved editor assets to be included in ship.o2r

* Fixed GenerateO2R to package the correct folder and save to the correct filename

* Linux specific changes.

* Added "#include <stdio.h>" that required them
* Changed how the "ship.o2r" file is loaded to allow it to load the file from within appimages.
* Changed the Linuxdeploy version to avoid errors later when the Github Actions creates appimages(same fix applied to other ports.)

* Revert "Moved editor assets to be included in ship.o2r"

This reverts commit 05704c01f761baa67a83e357d9765f5c6b5e3fdb.

* Added back files(this time without LUS changes)

* Changed workflow file to use correct filename for assets file.

* Missed a few spots in the workflow file.

* Added .desktop file and made corrections to the main workflow.

* Added the rest of upstream CMakeLists.txt

* disabled USE_NETWORKING

* New InverseMatrix

* Renamed both .o2r files to be more accurate to its contents.

* Reverted CmakeList.txt

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>

1 files changed, 6 insertions, 15 deletions

diff --git a/src/code_80057C60.h b/src/code_80057C60.h
index 483d7cbb2..515378aa1 100644
--- a/src/code_80057C60.h
+++ b/src/code_80057C60.h
@@ -274,7 +274,6 @@ extern s32 D_801655B4;
 extern s32 D_801655BC;
 extern s32 D_801655C0;
 extern s32 D_801655C4;
-extern s32 D_801655C8;
 extern s32 D_801655CC;
 extern s32 D_801655D8;
 extern s32 D_801655E8;
@@ -300,9 +299,6 @@ extern s16 D_80165710;
 
 extern s16 D_80165740;
 extern s16 D_80165748;
-extern s16 D_80165718;
-extern s16 D_80165720;
-extern s16 D_80165728;
 
 // extern s16 gNumActiveThwomps; -> objects.h
 
@@ -358,7 +354,6 @@ extern s32 D_80165860;
 extern s32 D_8016586C;
 extern s32 D_80165878;
 extern s32 D_8016587C;
-extern u8* D_80165880;
 extern s8 D_80165888;
 extern s8 D_80165890;
 extern s8 D_80165898;
@@ -535,7 +530,7 @@ extern s16 D_8018D210;
 extern bool D_8018D214;
 extern s16 D_8018D218;
 extern s32 D_8018D21C;
-extern u8 (*D_8018D220)[1024];
+extern u8 (*gCloudTexture)[1024];
 extern s32 D_8018D224;
 extern u8 D_8018D228;
 extern s32 D_8018D22C;
@@ -543,23 +538,19 @@ extern s32 D_8018D22C;
 
 extern uintptr_t D_8018D240;
 extern u8* D_8018D248[];
-extern f32 D_8018D2A0;
+extern f32 gMinimapPlayerScale;
 extern s32 D_8018D2A4;
 extern s32 D_8018D2AC;
 extern s16 gMinimapWidth;
 extern s32 D_8018D2B4;
 extern s16 gMinimapHeight;
 extern s32 D_8018D2BC;
-extern s16 D_8018D2C0[];
+extern s16 gMinimapX[];
 extern s32 D_8018D2C8[];
-extern s16 D_8018D2D8[];
-extern s16 D_8018D2E0;
-extern s16 D_8018D2E8;
-extern u16 D_8018D300;
-extern u16 D_8018D308;
-extern u16 D_8018D310;
+extern s16 gMinimapY[];
+extern s16 gMinimapPlayerX;
+extern s16 gMinimapPlayerY;
 extern s32 D_8018D314;
-extern u16 D_8018D318;
 extern s32 D_8018D320;
 extern s32 D_8018D380;
 extern s32 D_8018D384;