mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-02-07 19:00:37 -05:00
![mckinlee](/assets/img/avatar_default.png)
* Pause Warp Enhancement
This commit introduces the PauseWarp mod, a feature that allows players to warp to different locations in the game directly from the pause menu.
- Add PauseWarpState structure to manage flags and cooldowns for the pause warp feature.
- Implement IsStateValid function for state validation.
- Implement ResetStateFlags function to reset all state flags to default values.
- Add InitiateWarp function to handle the initiation of warp sequences.
- Implement HandleWarpConfirmation function to confirm and execute warp actions.
- Implement HandleCooldowns function to manage various cooldown timers.
- Add PauseWarp_Main function as the main logic, called every frame to handle pause warp functionality.
- Map warp song messages to in-game text messages.
* Warp Song Check
-Now if you do not have a warp song you won't be able to select the empty slot and still teleport.
* Added Audio Fanfares and Changed stateFlag1 to PLAYER_STATE1_IN_CUTSCENE
-When selecting a warp song the audio for the applicable warp song will now play for a extra vanilla feel.
-Changed the stateFlag1 because previously it just disabled input allowing enemies to harm you. Now that won't happen because the game is put into a cutscene state.
* Feedback Update
-A new hook was created 'OnPauseMenu' so now PauseWarp_Main is only called when the pause menu is open
-Moved pauswarp.c to the Enhancements folder
-Removed from graph.c
PR Change:
Changing to the main branch instead of sulu
* Feedback Update #2
-Introduced new function 'PauseWarp_Idle' now that 'PauseWarp_Main' is no longer called every frame
-Added C wrapper to access 'GameInteractor::IsSaveLoaded' and scrapped the 'IsStateValid' function
-Added 'PauseWarp_Idle' to the the 'RegisterPauseWarp' function
-Refactored the code some
* Linux Compile Issue
-Added a missing header that was causing a compile issue for linux
-Hopefully, it won't crash
* Minor Bug Fix
-Now link won't get soft locked when warping to the same location twice
* Update libultraship
* Revert "Update libultraship"
This reverts commit 746fc23479
.
* Bug Fix
-Added more checks to ensure vanilla behavior when a Ocarina is not in the players inventory.
* WIP
* Done unless I'm missing headers
* now we done
* clean up, these arn't needed anymore
* Rename OnPauseMenu to OnKaleidoUpdate
142 lines
5.0 KiB
C
142 lines
5.0 KiB
C
#include "global.h"
|
|
#include "vt.h"
|
|
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
|
|
|
|
void (*sKaleidoScopeUpdateFunc)(PlayState* play);
|
|
void (*sKaleidoScopeDrawFunc)(PlayState* play);
|
|
f32 gBossMarkScale;
|
|
u32 D_8016139C;
|
|
PauseMapMarksData* gLoadedPauseMarkDataTable;
|
|
|
|
extern void KaleidoScope_Update(PlayState* play);
|
|
extern void KaleidoScope_Draw(PlayState* play);
|
|
|
|
void KaleidoScopeCall_LoadPlayer() {
|
|
KaleidoMgrOverlay* playerActorOvl = &gKaleidoMgrOverlayTable[KALEIDO_OVL_PLAYER_ACTOR];
|
|
|
|
if (gKaleidoMgrCurOvl != playerActorOvl) {
|
|
if (gKaleidoMgrCurOvl != NULL) {
|
|
osSyncPrintf(VT_FGCOL(GREEN));
|
|
osSyncPrintf("カレイド領域 強制排除\n"); // "Kaleido area forced exclusion"
|
|
osSyncPrintf(VT_RST);
|
|
|
|
KaleidoManager_ClearOvl(gKaleidoMgrCurOvl);
|
|
}
|
|
|
|
osSyncPrintf(VT_FGCOL(GREEN));
|
|
osSyncPrintf("プレイヤーアクター搬入\n"); // "Player actor import"
|
|
osSyncPrintf(VT_RST);
|
|
|
|
KaleidoManager_LoadOvl(playerActorOvl);
|
|
}
|
|
}
|
|
|
|
void KaleidoScopeCall_Init(PlayState* play) {
|
|
// "Kaleidoscope replacement construction"
|
|
osSyncPrintf("カレイド・スコープ入れ替え コンストラクト \n");
|
|
|
|
sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(KaleidoScope_Update);
|
|
sKaleidoScopeDrawFunc = KaleidoManager_GetRamAddr(KaleidoScope_Draw);
|
|
|
|
LOG_ADDRESS("kaleido_scope_move", KaleidoScope_Update);
|
|
LOG_ADDRESS("kaleido_scope_move_func", sKaleidoScopeUpdateFunc);
|
|
LOG_ADDRESS("kaleido_scope_draw", KaleidoScope_Draw);
|
|
LOG_ADDRESS("kaleido_scope_draw_func", sKaleidoScopeDrawFunc);
|
|
|
|
KaleidoSetup_Init(play);
|
|
}
|
|
|
|
void KaleidoScopeCall_Destroy(PlayState* play) {
|
|
// "Kaleidoscope replacement destruction"
|
|
osSyncPrintf("カレイド・スコープ入れ替え デストラクト \n");
|
|
|
|
KaleidoSetup_Destroy(play);
|
|
}
|
|
|
|
void KaleidoScopeCall_Update(PlayState* play) {
|
|
KaleidoMgrOverlay* kaleidoScopeOvl = &gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE];
|
|
PauseContext* pauseCtx = &play->pauseCtx;
|
|
|
|
GameInteractor_ExecuteOnKaleidoUpdate();
|
|
|
|
if (!gSaveContext.sohStats.gameComplete &&
|
|
(!IS_BOSS_RUSH || !gSaveContext.isBossRushPaused)) {
|
|
gSaveContext.sohStats.pauseTimer++;
|
|
}
|
|
|
|
if ((pauseCtx->state != 0) || (pauseCtx->debugState != 0)) {
|
|
if (pauseCtx->state == 1) {
|
|
if (ShrinkWindow_GetCurrentVal() == 0) {
|
|
HREG(80) = 7;
|
|
HREG(82) = 3;
|
|
R_PAUSE_MENU_MODE = 3;
|
|
pauseCtx->unk_1E4 = 0;
|
|
pauseCtx->unk_1EC = 0;
|
|
pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1;
|
|
gSaveContext.sohStats.count[COUNT_PAUSES]++;
|
|
}
|
|
} else if (pauseCtx->state == 8) {
|
|
HREG(80) = 7;
|
|
HREG(82) = 3;
|
|
R_PAUSE_MENU_MODE = 1;
|
|
pauseCtx->unk_1E4 = 0;
|
|
pauseCtx->unk_1EC = 0;
|
|
pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1;
|
|
} else if ((pauseCtx->state == 2) || (pauseCtx->state == 9)) {
|
|
osSyncPrintf("PR_KAREIDOSCOPE_MODE=%d\n", R_PAUSE_MENU_MODE);
|
|
|
|
if (R_PAUSE_MENU_MODE >= 3) {
|
|
pauseCtx->state++;
|
|
}
|
|
} else if (pauseCtx->state != 0) {
|
|
if (gKaleidoMgrCurOvl != kaleidoScopeOvl)
|
|
{
|
|
if (gKaleidoMgrCurOvl != NULL) {
|
|
osSyncPrintf(VT_FGCOL(GREEN));
|
|
// "Kaleido area Player Forced Elimination"
|
|
osSyncPrintf("カレイド領域 プレイヤー 強制排除\n");
|
|
osSyncPrintf(VT_RST);
|
|
|
|
KaleidoManager_ClearOvl(gKaleidoMgrCurOvl);
|
|
}
|
|
|
|
osSyncPrintf(VT_FGCOL(GREEN));
|
|
// "Kaleido area Kaleidoscope loading"
|
|
osSyncPrintf("カレイド領域 カレイドスコープ搬入\n");
|
|
osSyncPrintf(VT_RST);
|
|
|
|
KaleidoManager_LoadOvl(kaleidoScopeOvl);
|
|
}
|
|
|
|
if (gKaleidoMgrCurOvl == kaleidoScopeOvl)
|
|
{
|
|
sKaleidoScopeUpdateFunc(play);
|
|
|
|
if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0)) {
|
|
osSyncPrintf(VT_FGCOL(GREEN));
|
|
// "Kaleido area Kaleidoscope Emission"
|
|
osSyncPrintf("カレイド領域 カレイドスコープ排出\n");
|
|
osSyncPrintf(VT_RST);
|
|
|
|
KaleidoManager_ClearOvl(kaleidoScopeOvl);
|
|
KaleidoScopeCall_LoadPlayer();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void KaleidoScopeCall_Draw(PlayState* play) {
|
|
KaleidoMgrOverlay* kaleidoScopeOvl = &gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE];
|
|
|
|
if (R_PAUSE_MENU_MODE >= 3) {
|
|
if (((play->pauseCtx.state >= 4) && (play->pauseCtx.state <= 7)) ||
|
|
((play->pauseCtx.state >= 11) && (play->pauseCtx.state <= 18))) {
|
|
if (gKaleidoMgrCurOvl == kaleidoScopeOvl)
|
|
{
|
|
sKaleidoScopeDrawFunc(play);
|
|
}
|
|
}
|
|
}
|
|
}
|