mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-11 06:34:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_coming3 (#813)

Browse Source 
* d_a_coming3

* PR
This commit is contained in:
Maide
2025-07-26 01:28:10 +01:00
committed by GitHub
parent 4c6cde87bf
commit de0a740e70
5 changed files with 426 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_coming3.h
+32 -14
View File
@@ -2,38 +2,56 @@
#define D_A_COMING3_H
#include "f_op/f_op_actor.h"
#include "d/d_cc_d.h"
#include "d/d_com_inf_game.h"
namespace daComing3 {
static void position_is_safety_call_back(void*, void*);
static void position_is_none_obj(cXyz*);
static void* position_is_safety_call_back(void*, void*);
static BOOL position_is_none_obj(cXyz*);
class Act_c : public fopAc_ac_c {
public:
void get_water_height(float*, int*, const cXyz*);
void get_challenge_id();
void get_limit_dist();
void coming_start_init();
virtual ~Act_c() {}
BOOL get_water_height(float*, int*, const cXyz*);
s32 get_challenge_id();
f32 get_limit_dist();
BOOL coming_start_init();
void coming_start_main();
void coming_game_init();
BOOL coming_game_init();
void coming_game_main();
void coming_wait_init();
BOOL coming_wait_init();
void coming_wait_main();
void coming_process_init(short);
bool coming_process_init(short);
void eff_break_tsubo();
void coming_process_main();
void set_mtx();
void collision_init();
void collision_main();
void solidHeapCB(fopAc_ac_c*);
void create_heap();
bool collision_main();
static BOOL solidHeapCB(fopAc_ac_c*);
bool create_heap();
cPhs_State _create();
bool _delete();
bool _execute();
bool _draw();
static char M_arcname[];
public:
/* Place member variables here */
};
/* 0x290 */ // vtbl
/* 0x294 */ dCcD_Stts mStts;
/* 0x2D0 */ dCcD_Cyl mCyl;
/* 0x400 */ fpc_ProcID unk_400;
/* 0x404 */ s32 unk_404;
/* 0x408 */ request_of_phase_process_class mPhase;
/* 0x410 */ Mtx unk_410;
/* 0x440 */ J3DModel* unk_440;
/* 0x444 */ s16 unk_444;
/* 0x446 */ char unk446[0x32];
/* 0x478 */ f32 unk_478;
/* 0x47C */ s16 unk_47C;
/* 0x47E */ s16 unk_47E;
}; // size = 0x480
};
#endif /* D_A_COMING3_H */
include/d/actor/d_a_obj_barrel2.h
+7 -5
View File
@@ -20,15 +20,15 @@ namespace daObjBarrel2 {
void delete_req() {}
void exit_req() {}
void get_item_id() {}
static fpc_ProcID make_coming(cXyz* pos, int flagType, Type_e type, int droppedItem, bool hasFlag, short angleY, daObjBuoyflag::Texture_e arg6) {
static fpc_ProcID make_coming(cXyz* pos, int roomNo, Type_e type, int droppedItem, bool hasFlag, short angleY, daObjBuoyflag::Texture_e arg6) {
csXyz angle(0, angleY, 0);
return fopAcM_create(PROC_Obj_Barrel2, make_prm(type, droppedItem, hasFlag, flagType ? 1 : 0, arg6), pos, -1, &angle);
return fopAcM_create(PROC_Obj_Barrel2, make_prm(type, droppedItem, hasFlag, hasFlag, arg6), pos, roomNo, &angle);
}
static u32 make_prm(Type_e arg0, int droppedItem, bool hasFlag, bool flagType, daObjBuoyflag::Texture_e arg4) {
s32 item = (droppedItem & 0x3F);
s32 tmp = hasFlag ? 0 : 1;
s32 tmp = hasFlag ? 1 : 0;
s32 a6 = arg4;
return (item | (0x7F << 16)) | (arg0 << 24) | (tmp << 8) | (flagType << 10) | (a6 << 28);
return (item | (0x7F << 16)) | (arg0 << 24) | (tmp << 8) | ((hasFlag ? 0 : 1) << 10) | (a6 << 28);
}
void prm_get_buoy() const {}
void prm_get_coming() const {}
@@ -87,7 +87,9 @@ namespace daObjBarrel2 {
bool _draw();
public:
/* 0x290 */ char unk290[0x1E4];
/* 0x290 */ char unk290[0x1C8];
/* 0x458 */ fpc_ProcID unk_458;
/* 0x45C */ char unk45C[0x18];
/* 0x474 */ u8 unk_474;
/* 0x475 */ char unk475[0x1];
/* 0x476 */ u8 unk_476;