diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/international_string_util.h | 4 | ||||
| -rw-r--r-- | include/mail_data.h | 12 | ||||
| -rw-r--r-- | include/menu.h | 5 | ||||
| -rw-r--r-- | include/menu_helpers.h | 11 | ||||
| -rw-r--r-- | include/overworld.h | 1 | ||||
| -rw-r--r-- | include/pokemon_icon.h | 5 | ||||
| -rw-r--r-- | include/strings.h | 13 |
7 files changed, 46 insertions, 5 deletions
diff --git a/include/international_string_util.h b/include/international_string_util.h index 11b5c633c..1c2836132 100644 --- a/include/international_string_util.h +++ b/include/international_string_util.h @@ -1,6 +1,9 @@ #ifndef GUARD_INTERNATIONAL_STRING_UTIL_H #define GUARD_INTERNATIONAL_STRING_UTIL_H +void sub_81DB52C(const u8 *src); +void TVShowConvertInternationalString(u8 *dest, const u8 *src, u8 language); +u32 sub_81DB604(const u8 *); s32 GetStringCenterAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth); s32 GetStringRightAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth); s32 GetStringCenterAlignXOffsetWithLetterSpacing(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing); @@ -14,7 +17,6 @@ s32 sub_81DB3D8(const u8 **str, u8* arg1, s32 arg2); // sub_81DB52C // sub_81DB554 // sub_81DB5AC -void TVShowConvertInternationalString(u8 *dest, const u8 *src, u8 language); u32 sub_81DB604(const u8 *); // sub_81DB620 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/menu.h b/include/menu.h index 66ac73e03..480ffd1ce 100644 --- a/include/menu.h +++ b/include/menu.h @@ -19,6 +19,9 @@ 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 sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns something but it isn't used, fix when menu.s is decomp'd +void reset_temp_tile_data_buffers(void); +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); +u64 sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns something but it isn't used, fix when menu.s is decomp'd #endif // GUARD_MENU_H 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 diff --git a/include/overworld.h b/include/overworld.h index 0475e8e8c..1869222b0 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -53,6 +53,7 @@ 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); void c2_exit_to_overworld_1_continue_scripts_restart_music(void); #endif //GUARD_ROM4_H diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index b82334355..b6d21823e 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -3,5 +3,10 @@ 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); +void sub_80D2FF0(u16 iconId); +void sub_80D2EF8(struct Sprite *sprite); #endif // GUARD_POKEMON_ICON_H diff --git a/include/strings.h b/include/strings.h index 5d1a9bba0..e45f3c87d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1,6 +1,13 @@ -#ifndef GUARD_strings_H -#define GUARD_strings_H +#ifndef GUARD_STRINGS_H +#define GUARD_STRINGS_H +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations + +extern const u8 gText_FromSpace[]; extern const u8 gText_Lv50[]; extern const u8 gText_OpenLevel[]; extern const u8 gText_Mom[]; @@ -30,4 +37,4 @@ extern const u8 gText_First[]; extern const u8 gText_Second[]; extern const u8 gText_Third[]; -#endif //GUARD_strings_H +#endif //GUARD_STRINGS_H |