diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-02-04 21:47:11 -0600 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-02-04 19:47:11 -0800 |
| commit | 2afc20150b1cf5e9bcc8008c0323ac57af353718 (patch) | |
| tree | bdc26fa8435b11ddb3aae11f282a45a3385b5a39 /include/asm.inc.h | |
| parent | 27dc855202a2531914c83d15d5a9c3745c0ca88a (diff) | |
decompile more of field_map_obj (#231)
* decompile more code
* decompile more of field_map_obj
* decompile more of field_map_obj
Diffstat (limited to 'include/asm.inc.h')
| -rw-r--r-- | include/asm.inc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 53b2f1cb8..8189914fa 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -63,7 +63,7 @@ void sub_805B710(u16 i, u16 i1); void sub_805B980(struct MapObject *, u8); void FieldObjectTurn(struct MapObject *, u8); void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8); +const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *); void sub_805BCF0(u8, u8, u8, u8); @@ -73,7 +73,7 @@ void gpu_pal_allocator_reset__manage_upper_four(void); void npc_coords_shift(struct MapObject *pObject, s16 x, s16 y); void sub_805C0F8(u8, u8, u8, s16, s16); void npc_coords_shift_still(struct MapObject *pObject); -u8 GetFieldObjectIdByXYZ(u16, u16, int); +u8 GetFieldObjectIdByXYZ(u16, u16, u8); void UpdateFieldObjectsForCameraUpdate(s16, s16); u8 AddCameraObject(u8); u8 * GetFieldObjectScriptPointerByFieldObjectId(u8); @@ -81,7 +81,7 @@ u8 FieldObjectGetBerryTreeId(u8); void sub_805C754(struct MapObject *pObject); void sub_805C774(struct MapObject *, u8); void sub_805C78C(u8, u8, u8); -void sub_805C7C4(int i); +void sub_805C7C4(u8 i); u8 FieldObjectDirectionToImageAnimId(u8); u8 get_go_image_anim_num(u8 unk_19); u8 sub_805FD98(u8); |