mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-10-31 15:45:06 -04:00
3187564f5b
* 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
93 lines
2.8 KiB
C
93 lines
2.8 KiB
C
#include "custom-message/CustomMessageTypes.h"
|
|
#include "global.h"
|
|
#include "z64.h"
|
|
#include "game-interactor/GameInteractor.h"
|
|
|
|
static const int songMessageMap[] = {
|
|
TEXT_WARP_MINUET_OF_FOREST,
|
|
TEXT_WARP_BOLERO_OF_FIRE,
|
|
TEXT_WARP_SERENADE_OF_WATER,
|
|
TEXT_WARP_REQUIEM_OF_SPIRIT,
|
|
TEXT_WARP_NOCTURNE_OF_SHADOW,
|
|
TEXT_WARP_PRELUDE_OF_LIGHT
|
|
};
|
|
|
|
static const int ocarinaSongMap[] = {
|
|
OCARINA_SONG_MINUET,
|
|
OCARINA_SONG_BOLERO,
|
|
OCARINA_SONG_SERENADE,
|
|
OCARINA_SONG_REQUIEM,
|
|
OCARINA_SONG_NOCTURNE,
|
|
OCARINA_SONG_PRELUDE
|
|
};
|
|
|
|
static const int entranceIndexMap[] = {
|
|
ENTR_SACRED_FOREST_MEADOW_2, // Minuet
|
|
ENTR_DEATH_MOUNTAIN_CRATER_4, // Bolero
|
|
ENTR_LAKE_HYLIA_8, // Serenade
|
|
ENTR_DESERT_COLOSSUS_5, // Requiem
|
|
ENTR_GRAVEYARD_7, // Nocturne
|
|
ENTR_TEMPLE_OF_TIME_7 // Prelude
|
|
};
|
|
|
|
static const int songAudioMap[] = {
|
|
NA_BGM_OCA_MINUET,
|
|
NA_BGM_OCA_BOLERO,
|
|
NA_BGM_OCA_SERENADE,
|
|
NA_BGM_OCA_REQUIEM,
|
|
NA_BGM_OCA_NOCTURNE,
|
|
NA_BGM_OCA_LIGHT
|
|
};
|
|
|
|
static bool isWarpActive = false;
|
|
|
|
void PauseWarp_Execute() {
|
|
if (!isWarpActive || gPlayState->msgCtx.msgMode != MSGMODE_NONE) {
|
|
return;
|
|
}
|
|
isWarpActive = false;
|
|
GET_PLAYER(gPlayState)->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE;
|
|
if (gPlayState->msgCtx.choiceIndex != 0) {
|
|
return;
|
|
}
|
|
if (IS_RANDO) {
|
|
Entrance_SetWarpSongEntrance();
|
|
return;
|
|
}
|
|
gPlayState->transitionTrigger = TRANS_TRIGGER_START;
|
|
gPlayState->transitionType = TRANS_TYPE_FADE_WHITE_FAST;
|
|
for (int i = 0; i < ARRAY_COUNT(ocarinaSongMap); i++) {
|
|
if (gPlayState->msgCtx.lastPlayedSong == ocarinaSongMap[i]) {
|
|
gPlayState->nextEntranceIndex = entranceIndexMap[i];
|
|
return;
|
|
}
|
|
}
|
|
gPlayState->transitionTrigger = TRANS_TRIGGER_OFF;
|
|
}
|
|
|
|
void ActivateWarp(PauseContext* pauseCtx, int song) {
|
|
Audio_OcaSetInstrument(0);
|
|
Interface_SetDoAction(gPlayState, DO_ACTION_NONE);
|
|
pauseCtx->state = 0x12;
|
|
WREG(2) = -6240;
|
|
func_800F64E0(0);
|
|
pauseCtx->unk_1E4 = 0;
|
|
int idx = song - QUEST_SONG_MINUET;
|
|
gPlayState->msgCtx.lastPlayedSong = ocarinaSongMap[idx];
|
|
Audio_SetSoundBanksMute(0x20);
|
|
Audio_PlayFanfare(songAudioMap[idx]);
|
|
Message_StartTextbox(gPlayState, songMessageMap[idx], NULL);
|
|
GET_PLAYER(gPlayState)->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
|
|
isWarpActive = true;
|
|
}
|
|
|
|
void PauseWarp_HandleSelection() {
|
|
if (gSaveContext.inventory.items[SLOT_OCARINA] != ITEM_NONE) {
|
|
int aButtonPressed = CHECK_BTN_ALL(gPlayState->state.input->press.button, BTN_A);
|
|
int song = gPlayState->pauseCtx.cursorPoint[PAUSE_QUEST];
|
|
if (aButtonPressed && CHECK_QUEST_ITEM(song) && song >= QUEST_SONG_MINUET && song <= QUEST_SONG_PRELUDE) {
|
|
ActivateWarp(&gPlayState->pauseCtx, song);
|
|
}
|
|
}
|
|
}
|