summaryrefslogtreecommitdiff
path: root/include/global.fieldmap.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/global.fieldmap.h')
-rw-r--r--include/global.fieldmap.h108
1 files changed, 52 insertions, 56 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 01cd992ec..e0053fe88 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -168,62 +168,58 @@ struct MapHeader
struct ObjectEvent
{
- /*0x00*/ u32 active:1;
- u32 mapobj_bit_1:1;
- u32 mapobj_bit_2:1;
- u32 mapobj_bit_3:1;
- u32 mapobj_bit_4:1;
- u32 mapobj_bit_5:1;
- u32 mapobj_bit_6:1;
- u32 mapobj_bit_7:1;
- /*0x01*/ u32 mapobj_bit_8:1;
- u32 mapobj_bit_9:1;
- u32 mapobj_bit_10:1;
- u32 mapobj_bit_11:1;
- u32 mapobj_bit_12:1;
- u32 mapobj_bit_13:1;
- u32 mapobj_bit_14:1;
- u32 mapobj_bit_15:1;
- /*0x02*/ u32 mapobj_bit_16:1;
- u32 mapobj_bit_17:1;
- u32 mapobj_bit_18:1;
- u32 mapobj_bit_19:1;
- u32 mapobj_bit_20:1;
- u32 mapobj_bit_21:1;
- u32 mapobj_bit_22:1;
- u32 mapobj_bit_23:1;
- /*0x03*/ u32 mapobj_bit_24:1;
- u32 mapobj_bit_25:1;
- u32 mapobj_bit_26:1;
- u32 mapobj_bit_27:1;
- u32 mapobj_bit_28:1;
- u32 mapobj_bit_29:1;
- u32 mapobj_bit_30:1;
- u32 mapobj_bit_31:1;
- /*0x04*/ u8 spriteId;
- /*0x05*/ u8 graphicsId;
- /*0x06*/ u8 animPattern;
- /*0x07*/ u8 trainerType;
- /*0x08*/ u8 localId;
- /*0x09*/ u8 mapNum;
- /*0x0A*/ u8 mapGroup;
- /*0x0B*/ u8 mapobj_unk_0B_0:4;
- u8 elevation:4;
- /*0x0C*/ struct Coords16 coords1;
- /*0x10*/ struct Coords16 coords2;
- /*0x14*/ struct Coords16 coords3;
- /*0x18*/ u8 facingDirection:4; //current direction?
- /*0x18*/ u8 placeholder18:4;
- /*0x19*/ union ObjectEventRange range;
- /*0x1A*/ u8 mapobj_unk_1A;
- /*0x1B*/ u8 mapobj_unk_1B;
- /*0x1C*/ u8 mapobj_unk_1C;
- /*0x1D*/ u8 trainerRange_berryTreeId;
- /*0x1E*/ u8 mapobj_unk_1E;
- /*0x1F*/ u8 mapobj_unk_1F;
- /*0x20*/ u8 mapobj_unk_20;
- /*0x21*/ u8 mapobj_unk_21;
- /*0x22*/ u8 animId;
+ /*0x00*/ /* 0*/ u32 active:1;
+ /* 1*/ u32 singleMovementActive:1;
+ /* 2*/ u32 triggerGroundEffectsOnMove:1;
+ /* 3*/ u32 triggerGroundEffectsOnStop:1;
+ /* 4*/ u32 disableCoveringGroundEffects:1;
+ /* 5*/ u32 landingJump:1;
+ /* 6*/ u32 heldMovementActive:1;
+ /* 7*/ u32 heldMovementFinished:1;
+ /*0x01*/ /* 8*/ u32 frozen:1;
+ /* 9*/ u32 facingDirectionLocked:1;
+ /*10*/ u32 disableAnim:1;
+ /*11*/ u32 enableAnim:1;
+ /*12*/ u32 inanimate:1;
+ /*13*/ u32 invisible:1;
+ /*14*/ u32 offScreen:1;
+ /*15*/ u32 trackedByCamera:1;
+ /*0x02*/ /*16*/ u32 isPlayer:1;
+ /*17*/ u32 hasReflection:1;
+ /*18*/ u32 inShortGrass:1;
+ /*19*/ u32 inShallowFlowingWater:1;
+ /*20*/ u32 inSandPile:1;
+ /*21*/ u32 inHotSprings:1;
+ /*22*/ u32 hasShadow:1;
+ /*23*/ u32 spriteAnimPausedBackup:1;
+ /*0x03*/ /*24*/ u32 spriteAffineAnimPausedBackup:1;
+ /*25*/ u32 disableJumpLandingGroundEffect:1;
+ /*26*/ u32 fixedPriority:1;
+ /*27*/ u32 hideReflection:1;
+ /*0x04*/ u8 spriteId;
+ /*0x05*/ u8 graphicsId;
+ /*0x06*/ u8 animPattern;
+ /*0x07*/ u8 trainerType;
+ /*0x08*/ u8 localId;
+ /*0x09*/ u8 mapNum;
+ /*0x0A*/ u8 mapGroup;
+ /*0x0B*/ u8 mapobj_unk_0B_0:4;
+ u8 elevation:4;
+ /*0x0C*/ struct Coords16 coords1;
+ /*0x10*/ struct Coords16 coords2;
+ /*0x14*/ struct Coords16 coords3;
+ /*0x18*/ u8 facingDirection:4; //current direction?
+ /*0x18*/ u8 placeholder18:4;
+ /*0x19*/ union ObjectEventRange range;
+ /*0x1A*/ u8 mapobj_unk_1A;
+ /*0x1B*/ u8 mapobj_unk_1B;
+ /*0x1C*/ u8 mapobj_unk_1C;
+ /*0x1D*/ u8 trainerRange_berryTreeId;
+ /*0x1E*/ u8 mapobj_unk_1E;
+ /*0x1F*/ u8 mapobj_unk_1F;
+ /*0x20*/ u8 mapobj_unk_20;
+ /*0x21*/ u8 mapobj_unk_21;
+ /*0x22*/ u8 animId;
/*size = 0x24*/
};