d_a_tag_volcano OK

This commit is contained in:
LagoLunatic
2024-02-25 14:34:51 -05:00
parent b13eb4e2ce
commit 9f90f998ac
2 changed files with 7 additions and 3 deletions
+1 -1
View File
@@ -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"),
+6 -2
View File
@@ -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);