mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 21:30:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_tag_volcano 99%

Browse Source
This commit is contained in:
Jasper St. Pierre
2024-02-25 10:52:58 -08:00
parent 43afdf878e
commit b13eb4e2ce
6 changed files with 269 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_tag_volcano.h
+27 -9
View File
@@ -2,23 +2,41 @@
#define D_A_TAG_VOLCANO_H
#include "f_op/f_op_actor.h"
#include "d/d_a_obj.h"
namespace daTagvolcano {
class Act_c : public fopAc_ac_c {
public:
void prm_get_bitTRB() const {}
void prm_get_swSave() const {}
void prm_get_timer() const {}
void prm_get_type() const {}
enum Prm_e {
PRM_TRB_W = 0x06,
PRM_TRB_S = 0x00,
PRM_TYPE_W = 0x02,
PRM_TYPE_S = 0x06,
PRM_SWSAVE_W = 0x08,
PRM_SWSAVE_S = 0x08,
PRM_TIMER_W = 0x08,
PRM_TIMER_S = 0x10,
};
u32 prm_get_bitTRB() const { return daObj::PrmAbstract<Prm_e>(this, PRM_TRB_W, PRM_TRB_S); }
u32 prm_get_swSave() const { return daObj::PrmAbstract<Prm_e>(this, PRM_SWSAVE_W, PRM_SWSAVE_S); }
u32 prm_get_timer() const { return daObj::PrmAbstract<Prm_e>(this, PRM_TIMER_W, PRM_TIMER_S); }
u32 prm_get_type() const { return daObj::PrmAbstract<Prm_e>(this, PRM_TYPE_W, PRM_TYPE_S); }
s32 _create();
void check_timer_clear();
BOOL _delete();
BOOL _execute();
BOOL _draw();
bool check_timer_clear();
bool _delete();
bool _execute();
bool _draw();
public:
/* Place member variables here */
/* 0x290 */ u32 field_0x290;
/* 0x294 */ u32 field_0x294;
/* 0x298 */ u8 field_0x298;
/* 0x299 */ u8 field_0x299;
/* 0x29C */ s32 mType;
/* 0x2A0 */ s32 field_0x2a0;
/* 0x2A4 */ u8 field_0x2a4;
};
};
include/d/d_com_inf_game.h
+24 -2
View File
@@ -988,6 +988,10 @@ inline void dComIfGs_offTmpBit(u16 id) {
g_dComIfG_gameInfo.save.getTmp().offEventBit(id);
}
inline s16 dComIfGs_getStartPoint() {
return g_dComIfG_gameInfo.save.getRestart().getStartPoint();
}
inline void dComIfGs_setRestartRoomParam(u32 i_param) {
g_dComIfG_gameInfo.save.getRestart().setRoomParam(i_param);
}
@@ -3148,9 +3152,27 @@ 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 u32 dComIfG_getTimerRestTimeMs() { return g_dComIfG_gameInfo.play.getTimerLimitTimeMs() - g_dComIfG_gameInfo.play.getTimerNowTimeMs(); }
inline s32 dComIfG_getTimerRestTimeMs() { return g_dComIfG_gameInfo.play.getTimerLimitTimeMs() - g_dComIfG_gameInfo.play.getTimerNowTimeMs(); }
inline void dComIfG_TimerDeleteRequest() { dComIfG_getTimerPtr()->deleteRequest(); }
inline void dComIfG_TimerDeleteRequest() {
if (dComIfG_getTimerPtr() != NULL)
dComIfG_getTimerPtr()->deleteRequest();
}
inline bool dComIfG_TimerStart(s32 timer, s16 mode) {
if (dComIfG_getTimerMode() == mode && dComIfG_getTimerPtr() != NULL)
if (timer != 0)
dComIfG_getTimerPtr()->start(timer);
else
dComIfG_getTimerPtr()->start();
}
inline void dComIfG_TimerReStart(s32 timer) {
if (dComIfG_getTimerPtr() != NULL)
dComIfG_getTimerPtr()->restart(timer);
}
inline void dComIfG_TimerStop(s32 timer) {
if (dComIfG_getTimerPtr() != NULL)
dComIfG_getTimerPtr()->stop(timer);
}
inline u8 dComIfG_getBrightness() { return g_dComIfG_gameInfo.mBrightness; }
inline void dComIfG_setBrightness(u8 v) { g_dComIfG_gameInfo.mBrightness = v; }
include/f_op/f_op_actor_mng.h
+3 -1
View File
@@ -637,6 +637,8 @@ inline void fopAcM_offDraw(fopAc_ac_c* actor) {
inline void fopAcM_monsSeStart(fopAc_ac_c*, unsigned long, Vec*, unsigned long) {}
inline void fopAcM_getNameString(fopAc_ac_c*, char*) {}
inline void fopAcM_orderOtherEvent(fopAc_ac_c*, char*, unsigned short) {}
inline void fopAcM_orderOtherEvent(fopAc_ac_c* ac, char* event, u16 flag) {
fopAcM_orderOtherEvent2(ac, event, flag);
}
#endif