diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-02 14:11:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 14:11:32 -0500 |
| commit | f5011a27d6c15bb6e3fbb24b680bf5175baffe0e (patch) | |
| tree | 0fc5c1ca8df7787c55ce7cb928923123792e9b0a /include/global.fieldmap.h | |
| parent | 40af0d130236cccd5127c2f175006168466b405d (diff) | |
| parent | e2a29e9db964881034f5c1c0507924e2e0fb7840 (diff) | |
Merge pull request #282 from PikalaxALT/field_effect_helpers
port field_effect_helpers from emerald
Diffstat (limited to 'include/global.fieldmap.h')
| -rw-r--r-- | include/global.fieldmap.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index b3f5b1d42..9c380d993 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -217,17 +217,17 @@ struct ObjectEvent /*0x0C*/ struct Coords16 initialCoords; /*0x10*/ struct Coords16 currentCoords; /*0x14*/ struct Coords16 previousCoords; - /*0x18*/ u8 facingDirection:4; //current direction? - /*0x18*/ u8 placeholder18:4; + /*0x18*/ u8 facingDirection:4; + /*0x18*/ u8 movementDirection:4; /*0x19*/ union ObjectEventRange range; - /*0x1A*/ u8 mapobj_unk_1A; + /*0x1A*/ u8 fieldEffectSpriteId; /*0x1B*/ u8 mapobj_unk_1B; /*0x1C*/ u8 mapobj_unk_1C; /*0x1D*/ u8 trainerRange_berryTreeId; - /*0x1E*/ u8 mapobj_unk_1E; - /*0x1F*/ u8 mapobj_unk_1F; + /*0x1E*/ u8 currentMetatileBehavior; + /*0x1F*/ u8 previousMetatileBehavior; /*0x20*/ u8 mapobj_unk_20; - /*0x21*/ u8 mapobj_unk_21; + /*0x21*/ u8 directionSequenceIndex; /*0x22*/ u8 animId; /*size = 0x24*/ }; |