diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/decoration.h | 69 | ||||
-rw-r--r-- | include/menu.h | 6 | ||||
-rw-r--r-- | include/script.h | 1 | ||||
-rw-r--r-- | include/task.h | 12 |
4 files changed, 82 insertions, 6 deletions
diff --git a/include/decoration.h b/include/decoration.h index d041a8007..663fd5183 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -1,6 +1,17 @@ #ifndef GUARD_DECORATION_H #define GUARD_DECORATION_H +enum { + DECOCAT_DESK, + DECOCAT_CHAIR, + DECOCAT_PLANT, + DECOCAT_ORNAMENT, + DECOCAT_MAT, + DECOCAT_POSTER, + DECOCAT_DOLL, + DECOCAT_CUSHION +}; + struct Decoration { /*0x00*/ u8 id; @@ -13,7 +24,65 @@ struct Decoration /*0x1c*/ u16 *tiles; }; +struct DecoPCPointers +{ + /* 0x00 */ u8 *items; + /* 0x04 */ u8 *pos; + /* 0x08 */ u8 size; + /* 0x09 */ u8 isPlayerRoom; +}; + +struct DecorationInventory +{ + u8 *items; + u8 size; +}; + +extern u8 ewram[]; +#define ewram_1f000 (*(struct DecoPCPointers *)(ewram + 0x1f000)) + extern struct Decoration gDecorations[0x77]; extern void sub_80FF394(u16 unkr0, u16 unkr1, u16 unkr2); +extern Script gUnknown_0815F399; +extern u8 *gUnknown_020388D0; +extern u8 gUnknown_020388D4; +extern u8 gUnknown_020388D5; +extern u8 gUnknown_020388F2; +extern u8 gUnknown_020388F3; +extern u8 gUnknown_020388F4; +extern u8 gUnknown_020388F6; + +extern const u16 gUnknown_083EC654[3]; +extern const struct DecorationInventory gDecorationInventories[]; +extern const u8 *gUnknown_083EC5E4[]; +extern const u8 *gUnknown_083EC624[]; +extern u8 *gUnknown_020388F7[]; +extern const struct MenuAction2 gUnknown_083EC604[]; + +extern void sub_80B3068(u8); // src/shop +extern u8 sub_8134194(u8); // src/decoration_inventory +extern void sub_8134104(u8); // src/decoration_inventory +extern void sub_80F944C(void); // src/menu_helpers +extern void sub_80F9480(u8 *[], u8); // src/menu_helpers +extern void LoadScrollIndicatorPalette(void); // src/menu_helpers +extern void DisplayItemMessageOnField(u8, const u8 *, TaskFunc, u16); // src/menu_helpers +extern void ReshowPlayerPC(u8); // src/player_pc + +void sub_80FE2B4(void); +void Task_DecorationPCProcessMenuInput(u8); +void sub_80FE394(void); +void gpu_pal_decompress_alloc_tag_and_upload(u8); +void sub_80FE5AC(u8); +void sub_80FE604(u8); +void sub_80FE728(u8); +void sub_80FE758(u8); +void sub_80FE868(u8); +void sub_80FE948(u8); +void sub_80FEC94(u8); +void sub_80FECB8(u8); +void sub_80FECE0(u8); +void sub_80FEF50(u8); +void sub_8109DAC(u8); + #endif // GUARD_DECORATION_H diff --git a/include/menu.h b/include/menu.h index cb5efa448..7fce7ef1a 100644 --- a/include/menu.h +++ b/include/menu.h @@ -9,6 +9,12 @@ struct MenuAction u8 (*func)(); }; +struct MenuAction2 +{ + const u8 *text; + u8 (*func)(u8); +}; + void CloseMenu(void); void AppendToList(u8 *list, u8 *pindex, u32 value); void InitMenuWindow(const struct WindowConfig *); diff --git a/include/script.h b/include/script.h index a4c7dd575..5e13e8e74 100644 --- a/include/script.h +++ b/include/script.h @@ -4,6 +4,7 @@ struct ScriptContext; typedef bool8 (*ScrCmdFunc)(struct ScriptContext *); +typedef u8 Script[]; struct ScriptContext { diff --git a/include/task.h b/include/task.h index d2b2302cf..6c6efdf4f 100644 --- a/include/task.h +++ b/include/task.h @@ -5,12 +5,12 @@ typedef void (*TaskFunc)(u8 taskId); struct Task { - TaskFunc func; - bool8 isActive; - u8 prev; - u8 next; - u8 priority; - s16 data[16]; + /*0x00*/ TaskFunc func; + /*0x04*/ bool8 isActive; + /*0x05*/ u8 prev; + /*0x06*/ u8 next; + /*0x07*/ u8 priority; + /*0x08*/ s16 data[16]; }; extern struct Task gTasks[]; |