From 0dd3db7061165f990f386546304d4d90331d6cd0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 22 Oct 2017 20:13:31 -0400 Subject: Rename some functions and all RAM objects in decoration.c --- include/decoration.h | 4 ++-- include/strings.h | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'include') diff --git a/include/decoration.h b/include/decoration.h index c426a479a..adefb2fd1 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -187,8 +187,8 @@ struct DecorPCPointers }; extern const struct Decoration gDecorations[]; -extern EWRAM_DATA u8 *gUnknown_0203A14C; -extern EWRAM_DATA u8 gUnknown_0203A172; +extern EWRAM_DATA u8 *gCurDecorInventoryItems; +extern EWRAM_DATA u8 gCurDecorationIndex; void sub_8126968(void); diff --git a/include/strings.h b/include/strings.h index 33c8984d2..191b1809a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -56,19 +56,19 @@ extern const u8 gText_NoDecorationHere[]; extern const u8 gText_DecorationWillBeDiscarded[]; extern const u8 gText_CantThrowAwayInUse[]; extern const u8 gText_DecorationThrownAway[]; -extern const u8 gUnknown_085EA859[]; -extern const u8 gUnknown_085EA85E[]; -extern const u8 gUnknown_085EA864[]; -extern const u8 gUnknown_085EA86A[]; -extern const u8 gUnknown_085EA873[]; -extern const u8 gUnknown_085EA877[]; -extern const u8 gUnknown_085EA7CF[]; -extern const u8 gUnknown_085EA7F5[]; -extern const u8 gUnknown_085EA81C[]; -extern const u8 gUnknown_085EA87E[]; -extern const u8 gUnknown_085EA883[]; -extern const u8 gUnknown_085EA7B1[]; -extern const u8 gUnknown_085EA7BA[]; -extern const u8 gUnknown_085EA7C3[]; +extern const u8 gText_Desk[]; +extern const u8 gText_Chair[]; +extern const u8 gText_Plant[]; +extern const u8 gText_Ornament[]; +extern const u8 gText_Mat[]; +extern const u8 gText_Poster[]; +extern const u8 gText_PutOutSelectedDecorItem[]; +extern const u8 gText_StoreChosenDecorInPC[]; +extern const u8 gText_ThrowAwayUnwantedDecors[]; +extern const u8 gText_Doll[]; +extern const u8 gText_Cushion[]; +extern const u8 gText_Decorate[]; +extern const u8 gText_PutAway[]; +extern const u8 gText_Toss2[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 1ef4dbe691af72bec7fbe2d57f094c335f6de3a3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 22 Oct 2017 20:43:03 -0400 Subject: Fix global declarations of libc fns --- include/global.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index d8547d9c3..8860b4ae3 100644 --- a/include/global.h +++ b/include/global.h @@ -12,8 +12,10 @@ #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") #if defined (__APPLE__) || defined (__CYGWIN__) -void memset(void *, int, size_t); -void memcpy(void *, const void *, size_t); +void *memset(void *, int, size_t); +void *memcpy(void *, const void *, size_t); +int strcmp(const char *s1, const char *s2); +char* strcpy(char *dst0, const char *src0); #endif // __APPLE__ #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) -- cgit v1.2.3