From 9f90f998acd5e54d3dba02ed52a9011193791d5b Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 25 Feb 2024 14:34:51 -0500 Subject: [PATCH] d_a_tag_volcano OK --- configure.py | 2 +- include/d/d_com_inf_game.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index 1bc76c583..a5cbc087e 100644 --- a/configure.py +++ b/configure.py @@ -1609,7 +1609,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_tag_island"), ActorRel(NonMatching, "d_a_tag_kf1"), ActorRel(Matching, "d_a_tag_ret", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(NonMatching, "d_a_tag_volcano"), + ActorRel(Matching, "d_a_tag_volcano"), ActorRel(NonMatching, "d_a_title"), ActorRel(NonMatching, "d_a_tn"), ActorRel(NonMatching, "d_a_toge"), diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 13eed3a2f..7b163d377 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -3152,13 +3152,17 @@ inline u32 dComIfG_getTimerNowTimeMs() { return g_dComIfG_gameInfo.play.getTimer inline void dComIfGp_setWaveFrame(u16 frame) { g_dComIfG_gameInfo.play.setWaveFrame(frame); } inline u16 dComIfGp_getWaveFrame() { return g_dComIfG_gameInfo.play.getWaveFrame(); } -inline s32 dComIfG_getTimerRestTimeMs() { return g_dComIfG_gameInfo.play.getTimerLimitTimeMs() - g_dComIfG_gameInfo.play.getTimerNowTimeMs(); } +inline s32 dComIfG_getTimerRestTimeMs() { + s32 limit = g_dComIfG_gameInfo.play.getTimerLimitTimeMs(); + s32 now = g_dComIfG_gameInfo.play.getTimerNowTimeMs(); + return limit - now; +} inline void dComIfG_TimerDeleteRequest() { if (dComIfG_getTimerPtr() != NULL) dComIfG_getTimerPtr()->deleteRequest(); } -inline bool dComIfG_TimerStart(s32 timer, s16 mode) { +inline void dComIfG_TimerStart(s32 timer, s16 mode) { if (dComIfG_getTimerMode() == mode && dComIfG_getTimerPtr() != NULL) if (timer != 0) dComIfG_getTimerPtr()->start(timer);