mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-03 02:03:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_Y_taihou equivalent (#2303)

Browse Source 
* Transfer of Y_taihou work to cleaner and newer branch

* d_a_obj_Y_taihou nearly equivalent except for 2 functions

* Functionally correct d_a_obj_Y_taihou, but some issues remain

* d_a_obj_Y_taihou equivalent now; many thanks hatal!

* Update configure(dot)py and the config files for Y_taihou
This commit is contained in:
YunataSavior
2025-02-17 21:00:03 -08:00
committed by GitHub
parent 036b67cb7e
commit c40e25577b
8 changed files with 379 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_obj_Y_taihou.h
+29 -12
View File
@@ -1,8 +1,9 @@
#ifndef D_A_OBJ_Y_TAIHOU_H
#define D_A_OBJ_Y_TAIHOU_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/actor/d_a_obj_carry.h"
#include "d/d_event_lib.h"
/**
* @ingroup actors-objects
@@ -12,27 +13,43 @@
* @details
*
*/
class daObjYtaihou_c : public fopAc_ac_c {
class daObjYtaihou_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c {
public:
/* 80B9FDE8 */ void create1st();
daObjYtaihou_c() : dEvLib_callback_c(this) { mIronBallId = -1; }
/* 80B9FDE8 */ int create1st();
/* 80B9FEB0 */ void setIronBall(daObjCarry_c*);
/* 80B9FF08 */ void getEvent(u8);
/* 80B9FF08 */ int getEvent(u8);
/* 80B9FF1C */ void loadAngle();
/* 80B9FFAC */ void saveAngle();
/* 80BA0060 */ void setNextAngle();
/* 80BA0084 */ void setMtx();
/* 80BA0208 */ void rotateCheck();
/* 80BA045C */ void shotCheck();
/* 80BA0964 */ void eventStart();
/* 80BA0974 */ void CreateHeap();
/* 80BA09E4 */ void Create();
/* 80BA0A94 */ void Execute(f32 (**)[3][4]);
/* 80BA0B4C */ void Draw();
/* 80BA0C1C */ void Delete();
/* 80BA0FA4 */ ~daObjYtaihou_c();
/* 80BA0964 */ virtual BOOL eventStart();
/* 80BA0974 */ int CreateHeap();
/* 80BA09E4 */ int Create();
/* 80BA0A94 */ int Execute(Mtx** i_mtx);
/* 80BA0B4C */ int Draw();
/* 80BA0C1C */ int Delete();
/* 80BA0FA4 */ ~daObjYtaihou_c() {}
void setAddAngle(s8 add_angle) { mAddAngle = add_angle; }
s32 getIronBallId() { return mIronBallId; }
void startBomb() { mStartBomb = 0xffff; }
private:
/* 0x568 */ u8 field_0x568[0x778 - 0x568];
/* 0x5b8 */ Mtx mMtx;
/* 0x5e8 */ J3DModel* mpModel;
/* 0x5ec */ dCcD_Stts mStts;
/* 0x628 */ dCcD_Cyl mCyl;
/* 0x764 */ s32 mIronBallId;
/* 0x768 */ u32 mParticleKeys[2];
/* 0x770 */ s16 mStartBomb;
/* 0x772 */ s16 field_0x772;
/* 0x774 */ s8 field_0x774;
/* 0x775 */ u8 field_0x775;
/* 0x776 */ s8 mAddAngle;
/* 0x777 */ s8 mOldAddAngle;
};
STATIC_ASSERT(sizeof(daObjYtaihou_c) == 0x778);
include/d/actor/d_a_obj_carry.h
+10 -1
View File
@@ -274,9 +274,18 @@ public:
void startCtrl() { mCtrl = 1; }
void endCtrl() { mCtrl = 0; }
void setDrop() { field_0xcf2 = 3; }
void offDraw() { mDraw = 1; }
void onDraw() { mDraw = 0; }
bool isDraw() { return mDraw == false; }
void setPower(fopAc_ac_c* cannon_actor, f32 my_0xde0, f32 my_0xde4, s16 my_0xde8) {
mpCannonActor = cannon_actor;
field_0xde0 = my_0xde0;
field_0xde4 = my_0xde4;
field_0xde8 = my_0xde8;
field_0xdea = 1;
}
static void make_prm(csXyz* param_1, u8 param_2, u8 param_3, u8 param_4, u8 param_5,
u8 param_6 = 0) {
param_1->x = (param_4 << 8) | param_3;
include/d/actor/d_a_player.h
+1
View File
@@ -1026,6 +1026,7 @@ public:
void onForceGameOver() { onNoResetFlg2(FLG2_FORCE_GAMEOVER); }
void onForceWolfChange() { onEndResetFlg0(ERFLG0_UNK_2); }
void onDoPutEmphasys() { onEndResetFlg1(ERFLG1_UNK_10000000); }
void onDoExchangePutIn() { onEndResetFlg1(ERFLG1_UNK_4000000); }
void onNsScream() { onEndResetFlg1(ERFLG1_UNK_1); }
void onNsScreamAnm() { onEndResetFlg1(daPy_ERFLG1(ERFLG1_UNK_1 | ERFLG1_UNK_2)); }
void onNeckSearchWide() { onEndResetFlg0(ERFLG0_UNK_400); }
include/d/d_bg_w_base.h
+1
View File
@@ -29,6 +29,7 @@ public:
PPLABEL_NONE = 0,
PPLABEL_PUSH = 1,
PPLABEL_PULL = 2,
PPLABEL_3 = 3,
PPLABEL_4 = 4,
PPLABEL_HEAVY = 8,
};