diff options
| author | yenatch <yenatch@gmail.com> | 2017-05-23 21:29:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 21:29:35 -0400 |
| commit | 53e1526631ce2b801e8e6bd0e4bd0caca8d8cb25 (patch) | |
| tree | 369cb2702f9b5946382c1379c74dd84ef9055ef8 /include/asm.inc.h | |
| parent | 9640df02dd8651d5b05cf3767f6c7e16a697db3b (diff) | |
| parent | 46a3ee4ae04764e9ad37c8ed7fdf760832eb0175 (diff) | |
Merge pull request #304 from PikalaxALT/field_map_obj
Field map obj
Diffstat (limited to 'include/asm.inc.h')
| -rw-r--r-- | include/asm.inc.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 3db79b128..9bd8324ad 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -1,6 +1,14 @@ // src/rom3.o void sub_800C35C(void); +struct UnkStruct8060024 { + u8 outsideMovementRect:1; + u8 tileIsImpassable:1; + u8 elevationMismatch:1; + u8 pathBlockedByObject:1; + u8 pad_04:4; +}; + // asm/battle_2.o void sub_800E7C4(void); u8 b_first_side(u8, u8, u8); @@ -120,7 +128,7 @@ u8 sub_80608D0(u8); u8 GetStepInPlaceDelay32AnimId(u8 a); u8 GetStepInPlaceDelay16AnimId(u8); u8 GetStepInPlaceDelay8AnimId(u8 a); -u8 FieldObjectFaceOppositeDirection(void *, u8); +u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8); u8 sub_80609D8(u8); u8 sub_8060A04(u8); u8 sub_8060A30(u8); |