1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
#include <libultraship/bridge/consolevariablebridge.h>
#include "2s2h/GameInteractor/GameInteractor.h"
#include "2s2h/ShipInit.hpp"
extern "C" {
#include "variables.h"
}
#define CVAR_NAME "gModes.TimeMovesWhenYouMove"
#define CVAR CVarGetInteger(CVAR_NAME, 0)
// Arbitrary speed to determine the offset is unset
#define DEFAULT_TIME_OFFSET -12345
static s32 sStoredTimeOffset = DEFAULT_TIME_OFFSET;
static void UpdateTimeSpeedOffset(PauseContext* pauseCtx) {
Player* player = GET_PLAYER(gPlayState);
// Time is considered to be moving when any of the following is true:
// - The player is moving (since that's the basis of this enhancement)
// - The player is playing the Ocarina (so that Inverted SoT still works properly)
// - The player is choosing whether to save at an Owl Statue (so that it doesn't save the wrong time speed)
// - The pause menu save prompt is open (so that Pause Save doesn't either)
// - The Game Over save prompt is open (not reachable right now, but there for future-proofing)
bool timeShouldMove =
(player->stateFlags2 & PLAYER_STATE2_USING_OCARINA) || player->speedXZ != 0.0f ||
(Message_GetState(&gPlayState->msgCtx) == TEXT_STATE_CHOICE && gPlayState->msgCtx.currentTextId == 0xC01) ||
pauseCtx->state == PAUSE_STATE_SAVEPROMPT || pauseCtx->state == PAUSE_STATE_GAMEOVER_SAVE_PROMPT;
if (timeShouldMove && sStoredTimeOffset != DEFAULT_TIME_OFFSET) {
gSaveContext.save.timeSpeedOffset = sStoredTimeOffset;
sStoredTimeOffset = DEFAULT_TIME_OFFSET;
// This is for the section above, lets arrows continue flying after they were fired with time frozen
// player->unk_D57 = 4;
} else if (!timeShouldMove && sStoredTimeOffset == DEFAULT_TIME_OFFSET) {
sStoredTimeOffset = gSaveContext.save.timeSpeedOffset;
gSaveContext.save.timeSpeedOffset = -R_TIME_SPEED;
}
}
static void RegisterTimeMovesWhenYouMove() {
if (!CVAR && sStoredTimeOffset != DEFAULT_TIME_OFFSET) {
gSaveContext.save.timeSpeedOffset = sStoredTimeOffset;
sStoredTimeOffset = DEFAULT_TIME_OFFSET;
}
// This is WIP code, sort of turns this enhancement into a "Super Hot" mode where
// actors update functions are also halted when not moving. The problem is this breaks
// many situations, like opening a chest or talking to actors. So it needs more time in the oven
// COND_HOOK(ShouldActorUpdate, CVAR, [](Actor* actor, bool* should) {
// static bool hookIsFiring = false;
// if (actor->id == ACTOR_ARMS_HOOK) {
// ArmsHook* hook = (ArmsHook*)actor;
// if (hook->actionFunc == ArmsHook_Shoot) {
// hookIsFiring = true;
// } else {
// hookIsFiring = false;
// }
// }
// if (actor->id != ACTOR_EN_ARROW &&
// (actor->id == ACTOR_PLAYER || actor->category == ACTORCAT_BG || actor->category == ACTORCAT_DOOR ||
// actor->category == ACTORCAT_SWITCH || actor->category == ACTORCAT_ITEMACTION)) {
// return;
// }
// Player* player = GET_PLAYER(gPlayState);
// static Actor* lastTalkActor = NULL;
// if (player->talkActor != NULL && player->talkActor != lastTalkActor) {
// lastTalkActor = player->talkActor;
// }
// if (player->speedXZ == 0 &&
// lastTalkActor != actor && !(player->stateFlags1 & PLAYER_STATE1_1) &&
// !(player->stateFlags1 & PLAYER_STATE1_2) && !(player->stateFlags1 & PLAYER_STATE1_20) &&
// !(player->stateFlags1 & PLAYER_STATE1_TALKING) && !(player->stateFlags1 & PLAYER_STATE1_80) &&
// !(player->stateFlags1 & PLAYER_STATE1_100) && !(player->stateFlags1 & PLAYER_STATE1_400) &&
// !(player->stateFlags1 & PLAYER_STATE1_1000) && !(player->stateFlags1 & PLAYER_STATE1_2000000) &&
// !(player->stateFlags1 & PLAYER_STATE1_10000000) && !(player->stateFlags1 & PLAYER_STATE1_20000000) &&
// !(player->stateFlags2 & PLAYER_STATE2_8) && !(player->stateFlags3 & PLAYER_STATE3_8) &&
// !(player->stateFlags3 & PLAYER_STATE3_2000000) && (!hookIsFiring)) {
// *should = false;
// }
// });
COND_ID_HOOK(OnActorUpdate, ACTOR_PLAYER, CVAR, [](Actor* actor) { UpdateTimeSpeedOffset(&gPlayState->pauseCtx); });
COND_HOOK(OnKaleidoUpdate, CVAR, UpdateTimeSpeedOffset);
}
static void RegisterTimeSpeedOffsetRepair() {
COND_HOOK(OnSaveLoad, true, [](s16) {
sStoredTimeOffset = DEFAULT_TIME_OFFSET;
if (gSaveContext.save.timeSpeedOffset < -2) {
gSaveContext.save.timeSpeedOffset = 0;
}
});
}
static RegisterShipInitFunc initFunc_Repair(RegisterTimeSpeedOffsetRepair);
static RegisterShipInitFunc initFunc(RegisterTimeMovesWhenYouMove, { CVAR_NAME });
|
