falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e_rb equivalent (#2454) 

* erb done

* erb cleanup
This commit is contained in:
TakaRikka 2025-05-23 03:47:26 -07:00 committed by GitHub
parent 0212d1d18e
commit cad890035e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 871 additions and 681 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1686,7 +1686,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_e_pm"),
ActorRel(NonMatching, "d_a_e_po"),
ActorRel(Equivalent, "d_a_e_pz", extra_cflags=['-pragma "nosyminline off"']), # weak func order, inline issue
ActorRel(NonMatching, "d_a_e_rb"),
ActorRel(Equivalent, "d_a_e_rb"), # weak func order
ActorRel(NonMatching, "d_a_e_rdb"),
ActorRel(NonMatching, "d_a_e_rdy"),
ActorRel(NonMatching, "d_a_e_s1"),

58
include/d/actor/d_a_e_rb.h
View File

@ -1,6 +1,10 @@
#ifndef D_A_E_RB_H
#define D_A_E_RB_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_cc_d.h"
#include "d/d_cc_uty.h"
#include "d/d_bg_s_acch.h"
/**
* @ingroup actors-enemies
@ -10,16 +14,62 @@
* @details
*
*/
class e_rb_class : public fopEn_enemy_c {
private:
/* 0x5ac */ u8 field_0x5ac[0xa6c - 0x5ac];
class e_rb_class {
public:
/* 0x000 */ fopEn_enemy_c enemy;
/* 0x5AC */ request_of_phase_process_class phase;
/* 0x5B4 */ fopAc_ac_c* parent;
/* 0x5B8 */ dBgS_AcchCir acchcir;
/* 0x5F8 */ dBgS_ObjAcch acch;
/* 0x7D0 */ dCcD_Stts ccStts;
/* 0x80C */ dCcD_Sph ccSph;
/* 0x944 */ dCcU_AtInfo atInfo;
/* 0x968 */ mDoExt_McaMorfSO* modelMorf;
/* 0x96C */ Z2CreatureEnemy sound;
/* 0xA10 */ cXyz field_0xa10;
/* 0xA1C */ f32 distToPlayer;
/* 0xA20 */ f32 height;
/* 0xA24 */ f32 field_0xa24;
/* 0xA28 */ f32 field_0xa28;
/* 0xA2C */ f32 field_0xa2c;
/* 0xA30 */ f32 field_0xa30;
/* 0xA34 */ int anm;
/* 0xA38 */ s16 timers[4];
/* 0xA40 */ s16 counter;
/* 0xA42 */ s16 action;
/* 0xA44 */ s16 mode;
/* 0xA46 */ u8 field_0xA46[0xA48 - 0xA46];
/* 0xA48 */ s16 angleToPlayer;
/* 0xA4A */ s16 invincibilityTimer;
/* 0xA4C */ s16 field_0xa4c;
/* 0xA4E */ s16 field_0xa4e;
/* 0xA50 */ s16 field_0xa50;
/* 0xA52 */ s16 rot_y;
/* 0xA54 */ s16 rot_x;
/* 0xA56 */ s16 rot_step;
/* 0xA58 */ s16 death_rot_y;
/* 0xA5C */ u32 smokeEmtrID;
/* 0xA60 */ u32 field_0xa60;
/* 0xA64 */ s8 field_0xa64;
/* 0xA65 */ u8 field_0xa65;
/* 0xA66 */ u8 isChild;
/* 0xA67 */ u8 childNum;
/* 0xA68 */ u8 appearRange;
/* 0xA69 */ u8 field_0xa69;
/* 0xA6A */ u8 swbit;
/* 0xA6B */ u8 HIOInit;
};
STATIC_ASSERT(sizeof(e_rb_class) == 0xa6c);
class daE_RB_HIO_c {
public:
/* 8076238C */ daE_RB_HIO_c();
/* 80764838 */ ~daE_RB_HIO_c();
/* 80764838 */ virtual ~daE_RB_HIO_c() {}
/* 0x4 */ s8 id;
/* 0x8 */ f32 base_size;
/* 0xC */ f32 ground_depth;
};

1492
src/d/actor/d_a_e_rb.cpp
View File

File diff suppressed because it is too large Load Diff