diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-17 17:09:22 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-17 17:09:48 -0400 |
commit | 33520725b88621ace3c66da55b92f2a83ffb4545 (patch) | |
tree | 941437601503b8663b2877699d05f636223a396f /include | |
parent | 15298927a80f2131a347949bea2cb19577d941f2 (diff) |
Decompile all data in data/graphics/field_objects/*.inc
Diffstat (limited to 'include')
-rw-r--r-- | include/field_effect_helpers.h | 17 | ||||
-rw-r--r-- | include/field_map_obj.h | 11 | ||||
-rw-r--r-- | include/global.fieldmap.h | 6 | ||||
-rw-r--r-- | include/map_object_constants.h | 15 | ||||
-rw-r--r-- | include/sprite.h | 6 |
5 files changed, 51 insertions, 4 deletions
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 62f492bdc..277478222 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -7,5 +7,22 @@ void sub_812869C(struct MapObject *); bool8 sub_81286C4(struct MapObject *); +void oamc_shadow(struct Sprite *); +void sub_8087638(struct Sprite *); +void sub_808788C(struct Sprite *); +void sub_8127334(struct Sprite *); +void sub_8127584(struct Sprite *); +void sub_81276B4(struct Sprite *); +void sub_8127A7C(struct Sprite *); +void sub_8127D84(struct Sprite *); +void sub_8127F7C(struct Sprite *); +void sub_81282E0(struct Sprite *); +void sub_8128410(struct Sprite *); +void sub_81285AC(struct Sprite *); +void sub_8128774(struct Sprite *); +void sub_81287C4(struct Sprite *); +void sub_8128800(struct Sprite *); +void unc_grass_normal(struct Sprite *); +void unc_grass_tall(struct Sprite *); #endif //POKERUBY_FIELD_EFFECT_HELPERS_H diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 1eb28c63f..e1210f16c 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -26,6 +26,17 @@ static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\ return 0;\ } +struct PairedPalettes +{ + u16 tag; + const u16 *data; +}; + +extern const u16 gMapObjectPalette19[]; + +extern const u32 gMapObjectPic_MovingBox[32]; +extern const struct SpriteFrameImage gMapObjectPicTable_PechaBerryTree[]; + void sub_805C058(struct MapObject *mapObject, s16 a, s16 b); void FieldObjectSetDirection(struct MapObject *pObject, u8 unk_18); void MoveCoords(u8 direction, s16 *x, s16 *y); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index b8bab45d8..7589de029 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -312,10 +312,10 @@ struct MapObjectGraphicsInfo u8 inanimate:1; u8 disableReflectionPaletteLoad:1; /*0x0D*/ u8 tracks; - /*0x10*/ struct OamData *oam; - /*0x14*/ struct SubspriteTable *subspriteTables; + /*0x10*/ const struct OamData *oam; + /*0x14*/ const struct SubspriteTable *subspriteTables; /*0x18*/ const union AnimCmd *const *anims; - /*0x1C*/ struct SpriteFrameImage *images; + /*0x1C*/ const struct SpriteFrameImage *images; /*0x20*/ const union AffineAnimCmd *const *affineAnims; }; diff --git a/include/map_object_constants.h b/include/map_object_constants.h index 440b6e97e..79482b54a 100644 --- a/include/map_object_constants.h +++ b/include/map_object_constants.h @@ -223,4 +223,17 @@ enum MAP_OBJ_GFX_LINK_MAY, }; -#endif // GUARD_MAP_OBJECT_CONSTANTS_H
\ No newline at end of file +enum { + SHADOW_SIZE_S, + SHADOW_SIZE_M, + SHADOW_SIZE_L, + SHADOW_SIZE_XL +}; + +enum { + TRACKS_NONE, + TRACKS_FOOT, + TRACKS_BIKE_TIRE +}; + +#endif // GUARD_MAP_OBJECT_CONSTANTS_H diff --git a/include/sprite.h b/include/sprite.h index dd9d5efb7..aa86f9d31 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -60,6 +60,8 @@ union AnimCmd #define ANIMCMD_FRAME(...) \ {.frame = {__VA_ARGS__}} +#define ANIMCMD_LOOP(_count) \ + {.loop = {.type = -3, .count = _count}} #define ANIMCMD_JUMP(_target) \ {.jump = {.type = -2, .target = _target}} #define ANIMCMD_END \ @@ -101,6 +103,10 @@ union AffineAnimCmd {.frame = {.xScale = _xScale, .yScale = _yScale, .rotation = _rotation, .duration = _duration}} #define AFFINEANIMCMD_END \ {.type = AFFINEANIMCMDTYPE_END} +#define AFFINEANIMCMD_LOOP(_count) \ + {.loop = {.type = AFFINEANIMCMDTYPE_LOOP, .count = _count}} +#define AFFINEANIMCMD_JUMP(_target) \ + {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}} struct AffineAnimState { |