From 57390fd622b35d210ffdb41ea5fc640e07c7574e Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Wed, 12 Feb 2025 20:47:36 +0100
Subject: [PATCH] fixed issue cause by linkDirection macro

---
 include/global.fieldmap.h | 112 +++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 9854be072..594ade652 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -212,63 +212,65 @@ struct MapHeader
     /* 0x1B */ u8 battleType;
 };
 
+
 struct ObjectEvent
 {
-    /*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;
-             /*28*/ u32 shiny:1; // OW mon shininess
-          /*29-31*/ u32 padding:3;
-    /*0x04*/        u16 graphicsId;
-    /*0x06*/        u8 spriteId;
-    /*0x07*/        u8 movementType;
-    /*0x08*/        u8 trainerType;
-    /*0x09*/        u8 localId;
-    /*0x0A*/        u8 mapNum;
-    /*0x0B*/        u8 mapGroup;
-    /*0x0C*/        u8 currentElevation:4;
-                    u8 previousElevation:4;
-    /*0x0D*/        u8 fieldEffectSpriteId;
-    /*0x0E*/        struct Coords16 initialCoords;
-    /*0x12*/        struct Coords16 currentCoords;
-    /*0x16*/        struct Coords16 previousCoords;
-    /*0x1A*/        u16 facingDirection:4;
-                    u16 movementDirection:4;
-                    u16 rangeX:4;
-                    u16 rangeY:4;
-    /*0x1C*/        u8 warpArrowSpriteId;
-    /*0x1D*/        u8 movementActionId;
-    /*0x1E*/        u8 trainerRange_berryTreeId;
-    /*0x1F*/        u8 currentMetatileBehavior;
-    /*0x20*/        u8 previousMetatileBehavior;
-    /*0x21*/        u8 previousMovementDirection;
-    /*0x22*/        u8 directionSequenceIndex;
-    /*0x23*/        u8 playerCopyableMovement;
+    /*0x00*/ u32 active:1;
+             u32 singleMovementActive:1;
+             u32 triggerGroundEffectsOnMove:1;
+             u32 triggerGroundEffectsOnStop:1;
+             u32 disableCoveringGroundEffects:1;
+             u32 landingJump:1;
+             u32 heldMovementActive:1;
+             u32 heldMovementFinished:1;
+    /*0x01*/ u32 frozen:1;
+             u32 facingDirectionLocked:1;
+             u32 disableAnim:1;
+             u32 enableAnim:1;
+             u32 inanimate:1;
+             u32 invisible:1;
+             u32 offScreen:1;
+             u32 trackedByCamera:1;
+    /*0x02*/ u32 isPlayer:1;
+             u32 hasReflection:1;
+             u32 inShortGrass:1;
+             u32 inShallowFlowingWater:1;
+             u32 inSandPile:1;
+             u32 inHotSprings:1;
+             u32 hasShadow:1;
+             u32 spriteAnimPausedBackup:1;
+    /*0x03*/ u32 spriteAffineAnimPausedBackup:1;
+             u32 disableJumpLandingGroundEffect:1;
+             u32 fixedPriority:1;
+             u32 hideReflection:1;
+             u32 shiny:1; // OW mon shininess
+             u32 padding:3;
+    /*0x04*/ u16 graphicsId; // 12 bits for species; high 4 bits for form
+    /*0x06*/ u8 movementType;
+    /*0x07*/ u8 trainerType;
+    /*0x08*/ u8 localId;
+    /*0x09*/ u8 mapNum;
+    /*0x0A*/ u8 mapGroup;
+    /*0x0B*/ u8 currentElevation:4;
+             u8 previousElevation:4;
+    /*0x0C*/ struct Coords16 initialCoords;
+    /*0x10*/ struct Coords16 currentCoords;
+    /*0x14*/ struct Coords16 previousCoords;
+    /*0x18*/ u16 facingDirection:4; // current direction?
+             u16 movementDirection:4;
+             u16 rangeX:4;
+             u16 rangeY:4;
+    /*0x1A*/ u8 fieldEffectSpriteId;
+    /*0x1B*/ u8 warpArrowSpriteId;
+    /*0x1C*/ u8 movementActionId;
+    /*0x1D*/ u8 trainerRange_berryTreeId;
+    /*0x1E*/ u8 currentMetatileBehavior;
+    /*0x1F*/ u8 previousMetatileBehavior;
+    /*0x20*/ u8 previousMovementDirection:4;
+             u8 directionOverwrite:4;
+    /*0x21*/ u8 directionSequenceIndex;
+    /*0x22*/ u8 playerCopyableMovement; // COPY_MOVE_*
+    /*0x23*/ u8 spriteId;
     /*size = 0x24*/
 };