Skip to content

Commit e00b87b

Browse files
ItsNiklasmeintte
authored andcommitted
d_a_e_rdb Equivalent (zeldaret#2459)
* d_a_e_rdb equivalent * d_a_e_rdb fmt
1 parent 5de2ffc commit e00b87b

File tree

3 files changed

+862
-829
lines changed

3 files changed

+862
-829
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1687,7 +1687,7 @@ def MatchingFor(*versions) -> bool:
16871687
ActorRel(NonMatching, "d_a_e_po"),
16881688
ActorRel(Equivalent, "d_a_e_pz", extra_cflags=['-pragma "nosyminline off"']), # weak func order, inline issue
16891689
ActorRel(Equivalent, "d_a_e_rb"), # weak func order
1690-
ActorRel(NonMatching, "d_a_e_rdb"),
1690+
ActorRel(Equivalent, "d_a_e_rdb"), # weak func order
16911691
ActorRel(NonMatching, "d_a_e_rdy"),
16921692
ActorRel(NonMatching, "d_a_e_s1"),
16931693
ActorRel(NonMatching, "d_a_e_sb"),

include/d/actor/d_a_e_rdb.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
#ifndef D_A_E_RDB_H
22
#define D_A_E_RDB_H
3+
4+
#include "JSystem/JHostIO/JORReflexible.h"
35
#include "d/d_bg_s_acch.h"
46
#include "d/d_cc_d.h"
57
#include "d/d_cc_uty.h"
68
#include "d/d_msg_flow.h"
7-
#include "f_op/f_op_actor_mng.h"
9+
#include "f_op/f_op_actor.h"
810

911
/**
1012
* @ingroup actors-enemies
1113
* @class e_rdb_class
1214
* @brief King Bulblin
13-
*
14-
* @details
15-
*
15+
*
16+
* @details
17+
*
1618
*/
1719
class e_rdb_class {
1820
public:
@@ -106,15 +108,14 @@ class e_rdb_class {
106108

107109
STATIC_ASSERT(sizeof(e_rdb_class) == 0x1154);
108110

109-
class daE_RDB_HIO_c: public JORReflexible {
111+
class daE_RDB_HIO_c : public JORReflexible {
110112
public:
111113
/* 807650CC */ daE_RDB_HIO_c();
112114
/* 8076AF64 */ virtual ~daE_RDB_HIO_c() {};
113115

114116
void genMessage(JORMContext*);
115-
/* 0x04 */ s8 field_0x4;
117+
/* 0x04 */ s8 mID;
116118
/* 0x08 */ f32 field_0x8;
117119
};
118120

119-
120121
#endif /* D_A_E_RDB_H */

0 commit comments

Comments
 (0)