From 8d31a46c6fbc2dedd39ec9e9687f372ac102303d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 12 Oct 2017 15:59:43 -0400 Subject: sub_8121478 --- include/easy_chat.h | 3 ++- include/mail_data.h | 12 ++++++++++++ include/malloc.h | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 include/mail_data.h (limited to 'include') diff --git a/include/easy_chat.h b/include/easy_chat.h index fc44b6a8a..c9ba81c6d 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -30,7 +30,8 @@ enum void InitEasyChatPhrases(void); void easy_chat_input_maybe(void); -void CopyEasyChatWord(u8 *, u16); +void CopyEasyChatWord(u8 *dest, u16 word); +void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2); bool32 sub_811F8D8(u16); #endif // GUARD_EASYCHAT_H diff --git a/include/mail_data.h b/include/mail_data.h new file mode 100644 index 000000000..bf6540bad --- /dev/null +++ b/include/mail_data.h @@ -0,0 +1,12 @@ +#ifndef GUARD_MAIL_DATA_H +#define GUARD_MAIL_DATA_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations + +u16 sub_80D45E8(u16, u16 *); + +#endif //GUARD_MAIL_DATA_H diff --git a/include/malloc.h b/include/malloc.h index 4568e244a..f3a731797 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -2,7 +2,7 @@ #define GUARD_MALLOC_H #define malloc Alloc -#define calloc AllocZeroed +#define calloc(ct, sz) AllocZeroed((ct) * (sz)) #define free Free extern u8 gHeap[]; -- cgit v1.2.3 From 52af334b89e6549aea04614b7e9eccbc084b6eb8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 12 Oct 2017 22:59:01 -0400 Subject: sub_81215EC --- include/menu.h | 3 +++ include/pokemon_icon.h | 3 +++ include/rom4.h | 1 + 3 files changed, 7 insertions(+) (limited to 'include') diff --git a/include/menu.h b/include/menu.h index 766aa9d39..d143c8a7c 100644 --- a/include/menu.h +++ b/include/menu.h @@ -19,5 +19,8 @@ void box_print(u8, u8, u8, u8, const void *, s8, const u8 *); void sub_8198070(u8 windowId, bool8 copyToVram); void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock); void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette); +void reset_temp_tile_data_buffers(void); +int decompress_and_copy_tile_data_to_vram(u8 bg_id, void *src, int size, u16 offset, u8 mode); +bool8 free_temp_tile_data_buffers_if_possible(void); #endif // GUARD_MENU_H diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index b82334355..1863f9f7a 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -3,5 +3,8 @@ const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo); const u16 *GetValidMonIconPalettePtr(u16 speciesId); +u16 sub_80D2E84(u16 speciesId); +void sub_80D2F68(u16 iconId); +u8 sub_80D2D78(u16 iconId, void callback(struct Sprite *), u16 x, u16 y, u16 a4, u8 a5); #endif // GUARD_POKEMON_ICON_H diff --git a/include/rom4.h b/include/rom4.h index e19d277a6..80a050c77 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -29,5 +29,6 @@ const struct MapHeader *get_mapheader_by_bank_and_number(u8, u8); void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *); void sub_8086230(void); void c2_exit_to_overworld_2_switch(void); +bool32 sub_8087598(void); #endif //GUARD_ROM4_H -- cgit v1.2.3 From aa3af7a3a7106a14033c574977c082361f24907a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 12 Oct 2017 23:05:36 -0400 Subject: sub_81219F0 --- include/menu_helpers.h | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 include/menu_helpers.h (limited to 'include') diff --git a/include/menu_helpers.h b/include/menu_helpers.h new file mode 100644 index 000000000..45ee95de5 --- /dev/null +++ b/include/menu_helpers.h @@ -0,0 +1,11 @@ +#ifndef GUARD_MENU_HELPERS_H +#define GUARD_MENU_HELPERS_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations +bool8 sub_81221AC(void); + +#endif //GUARD_MENU_HELPERS_H -- cgit v1.2.3 From 3c4478b370e5ad472c38b8c31ae17c5b49cb8083 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 13 Oct 2017 00:11:55 -0400 Subject: Decompile data --- include/menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/menu.h b/include/menu.h index d143c8a7c..957bed9b4 100644 --- a/include/menu.h +++ b/include/menu.h @@ -20,7 +20,7 @@ void sub_8198070(u8 windowId, bool8 copyToVram); void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock); void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette); void reset_temp_tile_data_buffers(void); -int decompress_and_copy_tile_data_to_vram(u8 bg_id, void *src, int size, u16 offset, u8 mode); +int decompress_and_copy_tile_data_to_vram(u8 bg_id, const void *src, int size, u16 offset, u8 mode); bool8 free_temp_tile_data_buffers_if_possible(void); #endif // GUARD_MENU_H -- cgit v1.2.3 From 74c59af856216332b6c73cbc382edff3518a0eab Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 13 Oct 2017 08:47:26 -0400 Subject: sub_8121A1C --- include/international_string_util.h | 11 +++++++++++ include/strings.h | 12 ++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 include/international_string_util.h create mode 100644 include/strings.h (limited to 'include') diff --git a/include/international_string_util.h b/include/international_string_util.h new file mode 100644 index 000000000..4adc21224 --- /dev/null +++ b/include/international_string_util.h @@ -0,0 +1,11 @@ +#ifndef GUARD_INTERNATIONAL_STRING_UTIL_H +#define GUARD_INTERNATIONAL_STRING_UTIL_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations +void sub_81DB52C(const u8 *src); + +#endif //GUARD_INTERNATIONAL_STRING_UTIL_H diff --git a/include/strings.h b/include/strings.h new file mode 100644 index 000000000..68e5c9d35 --- /dev/null +++ b/include/strings.h @@ -0,0 +1,12 @@ +#ifndef GUARD_STRINGS_H +#define GUARD_STRINGS_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations + +extern const u8 gText_FromSpace[]; + +#endif //GUARD_STRINGS_H -- cgit v1.2.3 From cc847132496af6034a56838e6e8e7575bbda7648 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 13 Oct 2017 11:47:17 -0400 Subject: sub_8121B1C --- include/international_string_util.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/international_string_util.h b/include/international_string_util.h index a2891aeb7..412e71de2 100644 --- a/include/international_string_util.h +++ b/include/international_string_util.h @@ -10,5 +10,6 @@ void sub_81DB52C(const u8 *src); void TVShowConvertInternationalString(void *dest, const void *src, u8 language); u32 sub_81DB604(const u8 *); +s32 GetStringCenterAlignXOffset(u8 fontId, const u8 *str, s32 totalWidth); #endif //GUARD_INTERNATIONAL_STRING_UTIL_H -- cgit v1.2.3 From 32168adbc884f49da522b77900ea9a131df96f15 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 13 Oct 2017 12:03:15 -0400 Subject: Remaining functions --- include/pokemon_icon.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 1863f9f7a..b6d21823e 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -6,5 +6,7 @@ const u16 *GetValidMonIconPalettePtr(u16 speciesId); u16 sub_80D2E84(u16 speciesId); void sub_80D2F68(u16 iconId); u8 sub_80D2D78(u16 iconId, void callback(struct Sprite *), u16 x, u16 y, u16 a4, u8 a5); +void sub_80D2FF0(u16 iconId); +void sub_80D2EF8(struct Sprite *sprite); #endif // GUARD_POKEMON_ICON_H -- cgit v1.2.3