forked from HarbourMasters/Shipwright
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into fix-nut-upgrade-retro
- Loading branch information
Showing
101 changed files
with
4,455 additions
and
1,844 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule libultraship
updated
67 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #include <libultraship/bridge.h> | ||
| #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" | ||
| #include "soh/ShipInit.hpp" | ||
|
|
||
| extern "C" { | ||
| #include "macros.h" | ||
| extern PlayState* gPlayState; | ||
| } | ||
|
|
||
| #define CVAR_MOON_JUMP_NAME "gCheats.MoonJumpOnL" | ||
| #define CVAR_MOON_JUMP_DEFAULT 0 | ||
| #define CVAR_MOON_JUMP_VALUE CVarGetInteger(CVAR_MOON_JUMP_NAME, CVAR_MOON_JUMP_DEFAULT) | ||
|
|
||
| void OnPlayerUpdateMoonJump() { | ||
| Player* player = GET_PLAYER(gPlayState); | ||
|
|
||
| if (player != nullptr && CHECK_BTN_ANY(gPlayState->state.input[0].cur.button, BTN_L)) { | ||
| player->actor.velocity.y = 6.34375f; | ||
| } | ||
| } | ||
|
|
||
| void RegisterMoonJump() { | ||
| COND_HOOK(OnPlayerUpdate, CVAR_MOON_JUMP_VALUE, OnPlayerUpdateMoonJump); | ||
| } | ||
|
|
||
| static RegisterShipInitFunc initFunc(RegisterMoonJump, { CVAR_MOON_JUMP_NAME }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| #include "FileSelectEnhancements.h" | ||
|
|
||
| #include "soh/OTRGlobals.h" | ||
|
|
||
| #include <array> | ||
| #include <string> | ||
| #include <vector> | ||
|
|
||
| std::array<std::string, LANGUAGE_MAX> RandomizerSettingsMenuText[RSM_MAX] = { | ||
| { | ||
| // English | ||
| "Start Randomizer", | ||
| // German | ||
| "Start Randomizer", | ||
| // French | ||
| "Start Randomizer", | ||
| }, | ||
| { | ||
| // English | ||
| "Generate New Randomizer Seed", | ||
| // German | ||
| "Generate New Randomizer Seed", | ||
| // French | ||
| "Generate New Randomizer Seed", | ||
| }, | ||
| { | ||
| // English | ||
| "Open Randomizer Settings", | ||
| // German | ||
| "Open Randomizer Settings", | ||
| // French | ||
| "Open Randomizer Settings", | ||
| }, | ||
| { | ||
| // English | ||
| "Generating...", | ||
| // German | ||
| "Generating...", | ||
| // French | ||
| "Generating...", | ||
| }, | ||
| { | ||
| // English | ||
| "No randomizer seed loaded.\nPlease generate one first" | ||
| #if defined(__WIIU__) || defined(__SWITCH__) | ||
| ".", | ||
| #else | ||
| ",\nor drop a spoiler log on the game window.", | ||
| #endif | ||
| // German | ||
| "No randomizer seed loaded.\nPlease generate one first" | ||
| #if defined(__WIIU__) || defined(__SWITCH__) | ||
| ".", | ||
| #else | ||
| ",\nor drop a spoiler log on the game window.", | ||
| #endif | ||
| // French | ||
| "Aucune Seed de Randomizer actuellement disponible.\nGénérez-en une dans les \"Randomizer Settings\"" | ||
| #if (defined(__WIIU__) || defined(__SWITCH__)) | ||
| "." | ||
| #else | ||
| "\nou glissez un spoilerlog sur la fenêtre du jeu." | ||
| #endif | ||
| }, | ||
| }; | ||
|
|
||
| const char* SohFileSelect_GetSettingText(uint8_t optionIndex, uint8_t language) { | ||
| return RandomizerSettingsMenuText[optionIndex][language].c_str(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #ifndef FILE_SELECT_ENHANCEMENTS_H | ||
| #define FILE_SELECT_ENHANCEMENTS_H | ||
|
|
||
| #include "z64.h" | ||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif | ||
| const char* SohFileSelect_GetSettingText(u8 optionIndex, u8 language); | ||
| #ifdef __cplusplus | ||
| }; | ||
| #endif | ||
|
|
||
| typedef enum { | ||
| RSM_START_RANDOMIZER, | ||
| RSM_GENERATE_RANDOMIZER, | ||
| RSM_OPEN_RANDOMIZER_SETTINGS, | ||
| RSM_GENERATING, | ||
| RSM_NO_RANDOMIZER_GENERATED, | ||
| RSM_MAX, | ||
| } RandomizerSettingsMenuEnums; | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.