ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Populate header, label as static whatever won't break things

Browse Source
This commit is contained in:
PikalaxALT 2017-09-20 21:03:57 -04:00
parent d263750f19
commit 942fbe87d4
5 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
asm/lilycove_lady.s
View File

@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.align 2, 0 @ Don't pad with nop.

1
include/easy_chat.h
View File

@ -31,5 +31,6 @@ enum
void InitEasyChatPhrases(void); void InitEasyChatPhrases(void);
void easy_chat_input_maybe(void); void easy_chat_input_maybe(void);
void CopyEasyChatWord(u8 *, u16); void CopyEasyChatWord(u8 *, u16);
bool32 sub_811F8D8(u16);
#endif // GUARD_EASYCHAT_H #endif // GUARD_EASYCHAT_H

11
include/lilycove_lady.h
View File

@ -1,6 +1,17 @@
#ifndef GUARD_LILYCOVE_LADY_H #ifndef GUARD_LILYCOVE_LADY_H
#define GUARD_LILYCOVE_LADY_H #define GUARD_LILYCOVE_LADY_H
u8 GetLilycoveLadyId(void);
void SetLilycoveLady(void); void SetLilycoveLady(void);
void sub_818DA78(void);
void sub_818DEF4(void);
void sub_818E564(void);
void sub_818E570(const struct LilycoveLadyQuiz *quiz);
bool8 sub_818E704(struct Pokeblock *pokeblock);
void sub_818E7E0(u8 *dest1, u8 *dest2);
void sub_818E81C(u8 *dest);
void sub_818E848(u8 *dest);
void sub_818E868(u8 *dest, u8 category);
u8 sub_818E880(void);
#endif //GUARD_LILYCOVE_LADY_H #endif //GUARD_LILYCOVE_LADY_H

67
src/lilycove_lady.c
View File

@ -17,16 +17,15 @@
#include "easy_chat.h" #include "easy_chat.h"
#include "lilycove_lady.h" #include "lilycove_lady.h"
void SetLilycoveQuizLady(void); static void SetLilycoveQuizLady(void);
void SetLilycoveFavourLady(void); static void SetLilycoveFavourLady(void);
void SetLilycoveContestLady(void); static void SetLilycoveContestLady(void);
void sub_818E004(void); static void sub_818E004(void);
void sub_818DBC4(void); static void sub_818DBC4(void);
void sub_818E674(void); static void sub_818E674(void);
bool32 sub_811F8D8(u16); static u8 sub_818E13C(void);
u8 sub_818E13C(void); static bool8 sub_818E1F4(void);
bool8 sub_818E1F4(void); static u8 sub_818E258(const u8 *);
u8 sub_818E258(const u8 *);
extern const u8 gUnknown_085EEB7E[8]; extern const u8 gUnknown_085EEB7E[8];
extern const u16 gUnknown_0860B074[5]; extern const u16 gUnknown_0860B074[5];
@ -42,9 +41,9 @@ extern const u8 *const gUnknown_0860B324[5];
extern const u8 *const gUnknown_0860B338[5]; extern const u8 *const gUnknown_0860B338[5];
extern const u16 gUnknown_0860B34C[5]; extern const u16 gUnknown_0860B34C[5];
EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL; static EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL;
EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL; static EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;
EWRAM_DATA struct LilycoveLadyContest *gUnknown_0203CD6C = NULL; static EWRAM_DATA struct LilycoveLadyContest *gUnknown_0203CD6C = NULL;
extern EWRAM_DATA u16 gScriptItemId; extern EWRAM_DATA u16 gScriptItemId;
@ -131,7 +130,7 @@ void sub_818DAEC(void)
gScriptResult = GetLilycoveLadyId(); gScriptResult = GetLilycoveLadyId();
} }
u8 sub_818DB04(const u16 *data) static u8 sub_818DB04(const u16 *data)
{ {
u8 len; u8 len;
@ -139,7 +138,7 @@ u8 sub_818DB04(const u16 *data)
return len; return len;
} }
void sub_818DB20(void) static void sub_818DB20(void)
{ {
u8 size; u8 size;
u8 idx; u8 idx;
@ -150,7 +149,7 @@ void sub_818DB20(void)
gUnknown_0203CD64->unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c][idx]; gUnknown_0203CD64->unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c][idx];
} }
void SetLilycoveFavourLady(void) static void SetLilycoveFavourLady(void)
{ {
gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR; gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR;
@ -163,7 +162,7 @@ void SetLilycoveFavourLady(void)
sub_818DB20(); sub_818DB20();
} }
void sub_818DBC4(void) static void sub_818DBC4(void)
{ {
gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR; gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR;
@ -187,7 +186,7 @@ u8 sub_818DBE8(void)
} }
} }
const u8 *sub_818DC1C(u8 idx) static const u8 *sub_818DC1C(u8 idx)
{ {
return gUnknown_0860B224[idx]; return gUnknown_0860B224[idx];
} }
@ -210,7 +209,7 @@ bool8 sub_818DC60(void)
return FALSE; return FALSE;
} }
void sub_818DCAC(u8 *dest, u16 itemId) static void sub_818DCAC(u8 *dest, u16 itemId)
{ {
StringCopy(dest, ItemId_GetItem(itemId)->name); StringCopy(dest, ItemId_GetItem(itemId)->name);
} }
@ -221,7 +220,7 @@ void sub_818DCC8(void)
sub_818DCAC(gStringVar2, gUnknown_0203CD64->itemId); sub_818DCAC(gStringVar2, gUnknown_0203CD64->itemId);
} }
void sub_818DCF4(const u8 *src, u8 *dest) static void sub_818DCF4(const u8 *src, u8 *dest)
{ {
memset(dest, 0xFF, 8); memset(dest, 0xFF, 8);
StringCopy7(dest, src); StringCopy7(dest, src);
@ -245,7 +244,7 @@ void sub_818DD78(void)
sub_81AAC50(); sub_81AAC50();
} }
bool8 sub_818DD84(u16 itemId) static bool8 sub_818DD84(u16 itemId)
{ {
u8 len; u8 len;
u8 i; u8 i;
@ -291,7 +290,7 @@ bool8 sub_818DE5C(void)
return checkval < 5 ? FALSE : TRUE; return checkval < 5 ? FALSE : TRUE;
} }
void sub_818DE88(u16 itemId) static void sub_818DE88(u16 itemId)
{ {
sub_818DCAC(gStringVar2, itemId); sub_818DCAC(gStringVar2, itemId);
} }
@ -318,7 +317,7 @@ void sub_818DEF4(void)
EnableBothScriptContexts(); EnableBothScriptContexts();
} }
void sub_818DF00(void) static void sub_818DF00(void)
{ {
u8 v0; u8 v0;
u8 i; u8 i;
@ -334,7 +333,7 @@ void sub_818DF00(void)
gUnknown_0203CD68->playerName[0] = EOS; gUnknown_0203CD68->playerName[0] = EOS;
} }
void SetLilycoveQuizLady(void) static void SetLilycoveQuizLady(void)
{ {
u8 i; u8 i;
@ -358,7 +357,7 @@ void SetLilycoveQuizLady(void)
sub_818DF00(); sub_818DF00();
} }
void sub_818E004(void) static void sub_818E004(void)
{ {
gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ; gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ;
@ -427,7 +426,7 @@ u8 sub_818E06C(void)
} }
#ifdef NONMATCHING #ifdef NONMATCHING
u8 sub_818E13C(void) static u8 sub_818E13C(void)
{ {
u8 retval; u8 retval;
u8 len; u8 len;
@ -461,7 +460,7 @@ u8 sub_818E13C(void)
return retval; return retval;
} }
#else #else
__attribute__((naked)) u8 sub_818E13C(void) __attribute__((naked)) static u8 sub_818E13C(void)
{ {
asm_unified("\tpush {r4-r7,lr}\n" asm_unified("\tpush {r4-r7,lr}\n"
"\tmovs r7, 0x1\n" "\tmovs r7, 0x1\n"
@ -540,7 +539,7 @@ __attribute__((naked)) u8 sub_818E13C(void)
} }
#endif #endif
u8 sub_818E1F4(void) static u8 sub_818E1F4(void)
{ {
bool8 response; bool8 response;
u8 i; u8 i;
@ -558,7 +557,7 @@ u8 sub_818E1F4(void)
return response; return response;
} }
u8 sub_818E258(const u8 *str) static u8 sub_818E258(const u8 *str)
{ {
u8 len; u8 len;
const u8 *ptr; const u8 *ptr;
@ -722,7 +721,7 @@ void sub_818E570(const struct LilycoveLadyQuiz *quiz)
} }
} }
void sub_818E604(void) static void sub_818E604(void)
{ {
gUnknown_0203CD6C->playerName[0] = EOS; gUnknown_0203CD6C->playerName[0] = EOS;
gUnknown_0203CD6C->fave_pkblk = 0; gUnknown_0203CD6C->fave_pkblk = 0;
@ -731,7 +730,7 @@ void sub_818E604(void)
gUnknown_0203CD6C->category = Random() % 5; gUnknown_0203CD6C->category = Random() % 5;
} }
void SetLilycoveContestLady(void) static void SetLilycoveContestLady(void)
{ {
gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST; gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST;
@ -740,7 +739,7 @@ void SetLilycoveContestLady(void)
gUnknown_0203CD6C->language = gGameLanguage; gUnknown_0203CD6C->language = gGameLanguage;
} }
void sub_818E674(void) static void sub_818E674(void)
{ {
gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST; gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST;
@ -751,7 +750,7 @@ void sub_818E674(void)
} }
} }
void sub_818E6B0(u8 sheen) static void sub_818E6B0(u8 sheen)
{ {
gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
if (gUnknown_0203CD6C->max_sheen <= sheen) if (gUnknown_0203CD6C->max_sheen <= sheen)
@ -821,7 +820,7 @@ bool8 sub_818E704(struct Pokeblock *pokeblock)
return response; return response;
} }
void sub_818E794(u8 *dest1, u8 *dest2) static void sub_818E794(u8 *dest1, u8 *dest2)
{ {
gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
StringCopy(dest1, gUnknown_0860B324[gUnknown_0203CD6C->category]); StringCopy(dest1, gUnknown_0860B324[gUnknown_0203CD6C->category]);

9
sym_ewram.txt
View File

@ -1768,14 +1768,7 @@ gUnknown_0203CCEC: @ 203CCEC
gUnknown_0203CD04: @ 203CD04 gUnknown_0203CD04: @ 203CD04
.space 0x60 .space 0x60
gUnknown_0203CD64: @ 203CD64 .include "src/lilycove_lady.o"
.space 0x4
gUnknown_0203CD68: @ 203CD68
.space 0x4
gUnknown_0203CD6C: @ 203CD6C
.space 0x4
gUnknown_0203CD70: @ 203CD70 gUnknown_0203CD70: @ 203CD70
.space 0x4 .space 0x4