Convert chrdata.BITFIELD to actual bitfield

* Match chraiExecute
* Match ai01b3
* Match aiToggleP1P2
* Match ai01b5
This commit is contained in:
Ryan Dwyer
2019-12-16 21:56:31 +10:00
parent 13527755de
commit 452d86aec3
6 changed files with 185 additions and 641 deletions
+1 -1
View File
@@ -398,7 +398,7 @@
/*0x01af*/ bool aiChrGrabObject(void);
/*0x01b1*/ bool ai01b1(void);
/*0x01b2*/ bool ai01b2(void);
/*0x01b3*/ bool ai01b3(void);
/*0x01b3*/ bool aiToggleP1P2(void);
/*0x01b4*/ bool ai01b4(void);
/*0x01b5*/ bool ai01b5(void);
/*0x01b6*/ bool aiConfigureSnow(void);
+13 -17
View File
@@ -78,14 +78,6 @@ struct pad {
/*0x50*/ u32 unk50;
};
struct bitfield {
union {
u8 bytes[4];
u16 shorts[2];
u32 word;
};
};
struct chrdata {
/*0x000*/ s16 chrnum;
/*0x002*/ s8 accuracyrating;
@@ -261,15 +253,19 @@ struct chrdata {
/*0x31c*/ u32 onladder;
/*0x320*/ struct coord laddernormal;
/**
* ........ .mmm..d. pp...... aaaaaaaa
*
* m = related to miniskedar pouncing
* d = related to dark rooms
* p = P1/P2 chr ID (0-3)
* a = special death animation
*/
/*0x32c*/ struct bitfield BITFIELD;
/*0x32c*/
u8 unk32c_00 : 8;
u8 unk32c_08 : 1;
u8 pouncebits : 3;
u8 unk32c_12 : 2;
u8 darkroomthing : 1;
u8 unk32c_15 : 1;
u8 p1p2 : 2;
u8 unk32c_18 : 6;
u8 specialdie : 8;
/*0x330*/ u16 roomtosearch;
/*0x332*/ u8 propsoundcount;