mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-08-13 17:03:47 -04:00
9c162fc0ec
* First test of gathering some gameplay stats * timer changes and other stuff * Move code to new files + rename * Name change - gamePlayStats * Finish rename, remove n64ddFlag checks * Improve item get times * Better time tracking, more stats, * Put button under Enhancements * Fix merge conflict * Add pauseCount, fix bug with rando items * Adjust inits/declarations * step counter * Name change: "itemGetTime" to "timestamp" * Tidying + CI test * Set up array for stat counts * Macro #define GAMEPLAYSTAT_TOTAL_TIME (gSaveContext.gameplayStats.playTimer / 2 + gSaveContext.gameplayStats.pauseTimer / 3) * Add boss defeat timestamps * Add sword swings, pots broken, bushes cut * fix int type * Add counts for enemies defeated Broken down by enemy, with a total * Add ammo used * Hide breakdowns until count > 0 * Forgot Big Octo * Count chests opened * Update after LUS submodule * Enemy count spacing * Comments * Count 3 mini Floormasters as 1 Floormaster + some cleanup * Comments * Colour coding for timestamps on quest items i.e. medallions/stones/songs * Move stat into the sohStats struct + rearrange the counts enum for easier addition of future counts * Some documentation + count button presses * Stop counting button presses when Ganon defeated * Couple bugfixes Add count for Gerudo Thief, fix step counter counting in some situations where it shouldn't * Fix comment
138 lines
4.8 KiB
C
138 lines
4.8 KiB
C
#include "global.h"
|
|
#include "vt.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;
|
|
|
|
if (!gSaveContext.sohStats.gameComplete) {
|
|
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);
|
|
}
|
|
}
|
|
}
|
|
}
|