mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-22 06:44:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_tag_bottle_item OK, d_a_tag_chgrestart work (#1878)

Browse Source 
* d_a_tag_chgrestart

* d_a_tag_bottle_item

* deps fix
This commit is contained in:
Pheenoh
2023-08-13 05:03:43 -06:00
committed by GitHub
parent 08fa2f03fc
commit 91d04c794d
34 changed files with 345 additions and 1042 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/com/d_com_inf_game.h
+6
View File
@@ -1811,6 +1811,12 @@ inline void dComIfGp_att_LookRequest(fopAc_ac_c* param_0, f32 i_horizontalDist,
param_5);
}
inline void dComIfGp_att_CatchRequest(fopAc_ac_c* param_0, u8 param_1, f32 i_horizontalDist, f32 i_upDist,
f32 i_downDist, s16 i_angle, int param_5) {
dComIfGp_getAttention().getCatghTarget().request(param_0, param_1, i_horizontalDist, i_upDist, i_downDist, i_angle,
param_5);
}
inline J2DGrafContext* dComIfGp_getCurrentGrafPort() {
return g_dComIfG_gameInfo.play.getCurrentGrafPort();
}
include/d/d_item.h
+1
View File
@@ -388,5 +388,6 @@ BOOL isHeart(u8 item_no);
s32 isBomb(u8);
s32 isArrow(u8);
int addBombCount(u8, u8);
BOOL isBottleItem(u8 item_no);
#endif /* D_D_ITEM_H */
include/f_op/f_op_actor.h
+1
View File
@@ -64,6 +64,7 @@ public:
bool checkCommandItem() { return mCommand == 4; }
BOOL i_checkCommandDoor() { return mCommand == 3; }
bool i_checkCommandDemoAccrpt() { return mCommand == 2; }
bool i_checkCommandCatch() { return mCommand == 6; }
void suspendProc(void* actor) {
if (field_0x10 != NULL) {
include/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.h
+31 -1
View File
@@ -1,6 +1,36 @@
#ifndef D_A_TAG_BOTTLE_ITEM_H
#define D_A_TAG_BOTTLE_ITEM_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daTag_BottleItem_c;
typedef int (daTag_BottleItem_c::*ProcessFunc)(void*);
class daTag_BottleItem_c : public fopAc_ac_c {
private:
/* 0x0568 */ ProcessFunc mProcessFunc;
/* 0x056C */ u16 mEventType;
/* 0x0576 */ u8 mBottleItemType;
public:
/* 80D55FD8 */ s32 create();
/* 80D5605C */ s32 Delete();
/* 80D56064 */ s32 Execute();
/* 80D560D0 */ s32 Draw();
/* 80D560D8 */ void setTypeFromParam();
/* 80D56100 */ void restart();
/* 80D56170 */ void initialize();
/* 80D561E8 */ int checkProcess(ProcessFunc);
/* 80D56214 */ int setProcess(ProcessFunc);
/* 80D56300 */ void setAttnPos();
/* 80D56334 */ s32 chkEvent();
/* 80D56384 */ s32 orderEvent();
/* 80D56418 */ void makeSoup();
/* 80D564A0 */ int wait(void*);
/* 80D565F0 */ virtual ~daTag_BottleItem_c();
};
STATIC_ASSERT(sizeof(daTag_BottleItem_c) == 0x57C);
#endif /* D_A_TAG_BOTTLE_ITEM_H */
include/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.h
+19 -1
View File
@@ -1,6 +1,24 @@
#ifndef D_A_TAG_CHGRESTART_H
#define D_A_TAG_CHGRESTART_H
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daTagChgRestart_c : public fopAc_ac_c {
public:
daTagChgRestart_c() {}
/* 80D56758 */ s32 Create();
/* 80D567E4 */ s32 create();
/* 80D568B8 */ s32 execute();
/* 80D56A84 */ s32 _delete();
/* 0x0568 */ cXyz field_0x568[4];
};
STATIC_ASSERT(sizeof(daTagChgRestart_c) == 0x598);
namespace daTagChgRestart_prm {
inline u8 getSwNo(daTagChgRestart_c* p_chgRestart) { return fopAcM_GetParam(p_chgRestart) >> 8; }
inline u8 getPlayerNo(daTagChgRestart_c* p_chgRestart) { return fopAcM_GetParam(p_chgRestart); }
}; // namespace daTagChgRestart_prm
#endif /* D_A_TAG_CHGRESTART_H */