diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-02-03 09:30:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 09:30:58 -0800 |
| commit | 6a66bda6c1fd80360fa21ff5658550cd5c92edfe (patch) | |
| tree | 203bd83f34e24d4c9bc50814835017e976376055 /include/asm.inc.h | |
| parent | c22eb152ced1fe3bc8f9f0342a47d429bfa4c5a0 (diff) | |
| parent | 2c66ef8ef361de78f1b6529f177e299207d2006e (diff) | |
Merge pull request #229 from camthesaxman/field_map_obj
decompile more of field_map_obj
Diffstat (limited to 'include/asm.inc.h')
| -rw-r--r-- | include/asm.inc.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index f556fe4e5..53b2f1cb8 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -53,12 +53,13 @@ u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8); bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); u8 GetFieldObjectIdByXY(s16, s16); void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8); -u8 SpawnSpecialFieldObject(struct UnknownStruct_FPA *); +u8 SpawnSpecialFieldObject(struct MapObjectTemplate *); u8 show_sprite(u8, u8, u8); -u8 AddPseudoFieldObject(u8 val, void (*player)(struct Sprite *), int i, int i1, int i2); +u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 c, s16 d, u8 subpriority); u8 sub_805B410(u8, u8, s16, s16, u8, u8); -void sub_805B55C(int i, int i1); -void sub_805B710(int i, int i1); +//void sub_805B55C(int i, int i1); +void sub_805B55C(s16 a, s16 b); +void sub_805B710(u16 i, u16 i1); void sub_805B980(struct MapObject *, u8); void FieldObjectTurn(struct MapObject *, u8); void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8); |