From 0c611fb2c9c2f62c8855d9337a45cb3890d19cb3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 9 Sep 2017 12:01:30 -0400 Subject: SetUpReflection --- include/field_map_obj.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/field_map_obj.h') diff --git a/include/field_map_obj.h b/include/field_map_obj.h index d2a1a9b1f..23763aa1a 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -3,6 +3,8 @@ #include "sprite.h" +const u8 gUnknown_0830FD14[16]; + #define fieldmap_object_cb(setup, callback, table) \ static u8 callback(struct MapObject *, struct Sprite *);\ void setup(struct Sprite *sprite)\ @@ -427,5 +429,6 @@ void sub_80634D0(struct MapObject *, struct Sprite *); u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8); void CameraObjectSetFollowedObjectId(u8); u8 sub_805ADDC(u8); +u8 obj_unfreeze(struct Sprite *, s16, s16, u8); #endif // GUARD_FIELD_MAP_OBJ_H -- cgit v1.2.3 From dd714a763a2c8c6f6fc07743ad16d099fef2037e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 9 Sep 2017 15:05:48 -0400 Subject: npc_pal_op_B --- include/field_map_obj.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/field_map_obj.h') diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 23763aa1a..78cf2c146 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -430,5 +430,6 @@ u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8); void CameraObjectSetFollowedObjectId(u8); u8 sub_805ADDC(u8); u8 obj_unfreeze(struct Sprite *, s16, s16, u8); +u16 npc_paltag_by_palslot(u8); #endif // GUARD_FIELD_MAP_OBJ_H -- cgit v1.2.3 From 1c93f4c4de65f16d1a4dc9ace20dd808ce4290db Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 9 Sep 2017 16:14:01 -0400 Subject: FldEff_TallGrass --- include/field_map_obj.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/field_map_obj.h') diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 78cf2c146..9263604fb 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -431,5 +431,6 @@ void CameraObjectSetFollowedObjectId(u8); u8 sub_805ADDC(u8); u8 obj_unfreeze(struct Sprite *, s16, s16, u8); u16 npc_paltag_by_palslot(u8); +void sub_8060470(s16 *, s16 *, s16, s16); #endif // GUARD_FIELD_MAP_OBJ_H -- cgit v1.2.3 From 4481e60e09ecc135b260b5f98154bb30f08f241a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 9 Sep 2017 17:37:50 -0400 Subject: gUnknown_0202E844 -> gCamera; fix internal compiler error --- include/field_map_obj.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/field_map_obj.h') diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 9263604fb..af52591b0 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -3,7 +3,7 @@ #include "sprite.h" -const u8 gUnknown_0830FD14[16]; +extern const u8 gUnknown_0830FD14[]; #define fieldmap_object_cb(setup, callback, table) \ static u8 callback(struct MapObject *, struct Sprite *);\ -- cgit v1.2.3 From a5bae32031535479d15390a8c19cbaa276d1d70b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 16 Sep 2017 14:02:36 -0400 Subject: Begin to fix state_to_direction memes --- include/field_map_obj.h | 56 ++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 29 deletions(-) (limited to 'include/field_map_obj.h') diff --git a/include/field_map_obj.h b/include/field_map_obj.h index d2a1a9b1f..e394dda8a 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -54,17 +54,15 @@ u8 sub_805CCAC(s16 a0, s16 a1, s16 a2, s16 a3); u8 sub_805CCE8(s16 a0, s16 a1, s16 a2, s16 a3); u8 sub_805CD24(s16 a0, s16 a1, s16 a2, s16 a3); -u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); -u8 sub_805F3F0(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); -u8 sub_805F438(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); -u8 sub_805F4F0(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); -u8 sub_805F5A8(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); -u8 sub_805F660(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); -u8 cph_IM_DIFFERENT(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); -u8 sub_805F760(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); -u8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); -u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); -u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)); +u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8(u8)); +u8 sub_805F3F0(struct MapObject *, struct Sprite *, u8, bool8(u8)); +u8 sub_805F438(struct MapObject *, struct Sprite *, u8, bool8(u8)); +u8 sub_805F4F0(struct MapObject *, struct Sprite *, u8, bool8(u8)); +u8 sub_805F5A8(struct MapObject *, struct Sprite *, u8, bool8(u8)); +u8 sub_805F660(struct MapObject *, struct Sprite *, u8, bool8(u8)); +u8 cph_IM_DIFFERENT(struct MapObject *, struct Sprite *, u8, bool8(u8)); +u8 sub_805F760(struct MapObject *, struct Sprite *, u8, bool8(u8)); +u8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8(u8)); extern struct CameraSomething gUnknown_03004880; extern u16 gUnknown_03004898; @@ -318,7 +316,7 @@ u8 get_go_fast_image_anim_num(u8); u8 get_go_faster_image_anim_num(u8); u8 sub_805FD78(u8); -int state_to_direction(u8, u8, u8); +u32 state_to_direction(u8, u8, u32); void sub_805AA98(); void sub_805AAB0(void); @@ -379,14 +377,14 @@ u8 sub_805FDF8(u8); u8 sub_805FE08(u8); void npc_set_running_behaviour_etc(struct MapObject *, u8); u8 npc_running_behaviour_by_direction(u8); -u8 npc_block_way(struct MapObject *, s16, s16, u8); +u8 npc_block_way(struct MapObject *, s16, s16, u32); u8 sub_8060024(struct MapObject *, s16, s16, u8); u8 sub_8060234(u8, u8, u8); void sub_8060288(u8, u8, u8); void sub_8060388(s16, s16, s16 *, s16 *); void sub_80603CC(s16 x, s16 y, s16 *pInt, s16 *pInt1); void GetFieldObjectMovingCameraOffset(s16 *, s16 *); -void FieldObjectMoveDestCoords(struct MapObject *pObject, u8 unk_19, s16 *pInt, s16 *pInt1); +void FieldObjectMoveDestCoords(struct MapObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *); bool8 FieldObjectIsSpecialAnimActive(struct MapObject *); bool8 FieldObjectSetSpecialAnim(struct MapObject *, u8); @@ -396,21 +394,21 @@ void FieldObjectClearAnim(struct MapObject *); bool8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *); u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *); u8 FieldObjectGetSpecialAnim(struct MapObject *); -u8 GetFaceDirectionAnimId(u8); -u8 GetSimpleGoAnimId(u8); -u8 GetGoSpeed0AnimId(u8 a); -u8 sub_8060744(u8 a); -u8 d2s_08064034(u8 a); -u8 sub_806079C(u8 a); -u8 sub_80607F4(u8 a); -u8 GetJumpLedgeAnimId(u8 a); -u8 sub_806084C(u8); -u8 sub_8060878(u8); -u8 sub_80608D0(u8); -u8 GetStepInPlaceDelay32AnimId(u8 a); -u8 GetStepInPlaceDelay16AnimId(u8); -u8 GetStepInPlaceDelay8AnimId(u8 a); -u8 GetStepInPlaceDelay4AnimId(u8 a); +u8 GetFaceDirectionAnimId(u32); +u8 GetSimpleGoAnimId(u32); +u8 GetGoSpeed0AnimId(u32); +u8 sub_8060744(u32); +u8 d2s_08064034(u32); +u8 sub_806079C(u32); +u8 sub_80607F4(u32); +u8 GetJumpLedgeAnimId(u32); +u8 sub_806084C(u32); +u8 sub_8060878(u32); +u8 sub_80608D0(u32); +u8 GetStepInPlaceDelay32AnimId(u32); +u8 GetStepInPlaceDelay16AnimId(u32); +u8 GetStepInPlaceDelay8AnimId(u32); +u8 GetStepInPlaceDelay4AnimId(u32); u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8); u8 sub_80609D8(u8); u8 sub_8060A04(u8); -- cgit v1.2.3 From 3f86e6c08e1383795899fde800bc335e25667d2d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 16 Sep 2017 14:18:04 -0400 Subject: Matching state_to_direction --- include/field_map_obj.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/field_map_obj.h') diff --git a/include/field_map_obj.h b/include/field_map_obj.h index e394dda8a..170b746a6 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -316,7 +316,7 @@ u8 get_go_fast_image_anim_num(u8); u8 get_go_faster_image_anim_num(u8); u8 sub_805FD78(u8); -u32 state_to_direction(u8, u8, u32); +u32 state_to_direction(u8, u32, u32); void sub_805AA98(); void sub_805AAB0(void); -- cgit v1.2.3 From b3598ee395f43a3ed08b738f73576d5c76f9359f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 16 Sep 2017 14:42:15 -0400 Subject: Finish decompiling field_map_obj.s --- include/field_map_obj.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/field_map_obj.h') diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 170b746a6..d5a6b8b5a 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -400,10 +400,12 @@ u8 GetGoSpeed0AnimId(u32); u8 sub_8060744(u32); u8 d2s_08064034(u32); u8 sub_806079C(u32); +u8 sub_80607C8(u32); u8 sub_80607F4(u32); u8 GetJumpLedgeAnimId(u32); u8 sub_806084C(u32); u8 sub_8060878(u32); +u8 sub_80608A4(u32); u8 sub_80608D0(u32); u8 GetStepInPlaceDelay32AnimId(u32); u8 GetStepInPlaceDelay16AnimId(u32); @@ -425,5 +427,6 @@ void sub_80634D0(struct MapObject *, struct Sprite *); u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8); void CameraObjectSetFollowedObjectId(u8); u8 sub_805ADDC(u8); +void sub_8060320(u32, s16 *, s16 *, s16, s16); #endif // GUARD_FIELD_MAP_OBJ_H -- cgit v1.2.3