Skip to content

Commit 31ad641

Browse files
authored
d_a_e_rd and d_a_e_rdy equivalent (#2520)
* d_a_e_rd equivalent * mark e_rd as equivalent in configure py * Change pointer names * d_a_e_rdy: e_rdy_tkusa equivalent * d_a_e_rdy: demo_camera and daE_RDY_Execute matching * Forgot to remove NONMATCHING from daE_RDY_Execute * d_a_e_rdy equivalent Thanks very much, Hyenate!
1 parent 2a8e8eb commit 31ad641

File tree

4 files changed

+299
-281
lines changed

4 files changed

+299
-281
lines changed

configure.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,7 +1542,7 @@ def MatchingFor(*versions) -> bool:
15421542
ActorRel(MatchingFor("GZ2E01"), "d_a_e_ga"),
15431543
ActorRel(NonMatching, "d_a_e_hb"),
15441544
ActorRel(MatchingFor("GZ2E01"), "d_a_e_nest"),
1545-
ActorRel(NonMatching, "d_a_e_rd"),
1545+
ActorRel(Equivalent, "d_a_e_rd"),
15461546
ActorRel(MatchingFor("GZ2E01"), "d_a_econt"),
15471547
ActorRel(NonMatching, "d_a_fr"),
15481548
ActorRel(NonMatching, "d_a_grass"),
@@ -1697,7 +1697,7 @@ def MatchingFor(*versions) -> bool:
16971697
ActorRel(Equivalent, "d_a_e_pz", extra_cflags=['-pragma "nosyminline off"']), # weak func order, inline issue
16981698
ActorRel(Equivalent, "d_a_e_rb"), # weak func order
16991699
ActorRel(Equivalent, "d_a_e_rdb"), # weak func order
1700-
ActorRel(NonMatching, "d_a_e_rdy"),
1700+
ActorRel(Equivalent, "d_a_e_rdy"), # weak func order
17011701
ActorRel(NonMatching, "d_a_e_s1"),
17021702
ActorRel(NonMatching, "d_a_e_sb"),
17031703
ActorRel(NonMatching, "d_a_e_sf"),

include/d/actor/d_a_e_rd.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ class e_rd_class {
5858
/* 0x071C */ cXyz field_0x71c[14];
5959
/* 0x07C4 */ cXyz field_0x7c4[14];
6060
/* 0x086C */ csXyz field_0x86c[14];
61-
/* 0x08C0 */ u32 field_0x8c0[3];
62-
/* 0x08CC */ u8 field_0x8cc[0x968 - 0x8cc];
61+
/* 0x08C0 */ u32 field_0x8c0[14][3];
6362
/* 0x0968 */ s8 field_0x968;
6463
/* 0x096C */ f32 field_0x96c;
6564
/* 0x0970 */ s16 field_0x970;

0 commit comments

Comments
 (0)