diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/decoration.h | 15 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/sprite.h | 4 |
2 files changed, 15 insertions, 4 deletions
diff --git a/include/decoration.h b/include/decoration.h index 0f64662be..761e49e70 100755 --- a/include/decoration.h +++ b/include/decoration.h @@ -179,8 +179,8 @@ struct UnkStruct_02038900 { /*0x000; 0x02038900*/ const struct Decoration *decoration; /*0x004; 0x02038904*/ u16 unk_004[0x40]; - /*0x084; 0x02038984*/ u8 unk_084[0x800]; - /*0x884; 0x02039184*/ u16 unk_884[16]; + /*0x084; 0x02038984*/ u8 image[0x800]; + /*0x884; 0x02039184*/ u16 palette[16]; }; struct UnkStruct_083EC900 @@ -235,7 +235,7 @@ extern u8 gUnknown_020391A9; extern u8 gUnknown_020391AA; extern u8 gUnknown_02039234; extern void (*gUnknown_0300485C)(void); -extern void (*gUnknown_083EC96C[2][2])(u8); +const struct YesNoFuncTable gUnknown_083EC96C[]; extern struct UnkStruct_020391B4 gUnknown_020391B4[16]; extern const u16 gUnknown_083EC654[3]; @@ -334,4 +334,13 @@ void sub_8101700(u8); void sub_81017A0(u8); void sub_8109D04(u8); +void sub_81000C4(u8); +void sub_810026C(u8); +void sub_80FFAB0(u8); +void sub_80FFB08(u8); +void sub_8100F88(u8); +void sub_8100FB4(u8); +void sub_810153C(u8); +void sub_8101590(u8); + #endif // GUARD_DECORATION_H diff --git a/include/sprite.h b/include/sprite.h index bda635885..13c03ab51 100644..100755 --- a/include/sprite.h +++ b/include/sprite.h @@ -16,6 +16,8 @@ struct SpriteFrameImage u16 size; }; +#define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr} + struct SpritePalette { const u16 *data; @@ -142,7 +144,7 @@ struct SpriteTemplate u16 paletteTag; const struct OamData *oam; const union AnimCmd *const *anims; - struct SpriteFrameImage *images; + const struct SpriteFrameImage *images; const union AffineAnimCmd *const *affineAnims; void (*callback)(struct Sprite *); }; |