Sync berry.c sym labels from Emerald
This commit is contained in:
+1
-1
@@ -62,7 +62,7 @@ void ObjectEventInteractionPickBerryTree(void);
|
|||||||
void ObjectEventInteractionRemoveBerryTree(void);
|
void ObjectEventInteractionRemoveBerryTree(void);
|
||||||
u8 PlayerHasBerries(void);
|
u8 PlayerHasBerries(void);
|
||||||
void ResetBerryTreeSparkleFlags(void);
|
void ResetBerryTreeSparkleFlags(void);
|
||||||
void sub_809C794(void);
|
void ClearEnigmaBerries(void);
|
||||||
const struct Berry * GetBerryInfo(u8 berryIdx);
|
const struct Berry * GetBerryInfo(u8 berryIdx);
|
||||||
|
|
||||||
extern const struct Berry gBerries[];
|
extern const struct Berry gBerries[];
|
||||||
|
|||||||
+4
-4
@@ -921,7 +921,7 @@ const struct BerryTree gBlankBerryTree = {};
|
|||||||
berries[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX]; \
|
berries[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX]; \
|
||||||
})
|
})
|
||||||
|
|
||||||
void sub_809C718(void)
|
void InitEnigmaBerry(void)
|
||||||
{
|
{
|
||||||
s32 i;
|
s32 i;
|
||||||
|
|
||||||
@@ -933,10 +933,10 @@ void sub_809C718(void)
|
|||||||
gSaveBlock1Ptr->enigmaBerry.checksum = GetEnigmaBerryChecksum(&gSaveBlock1Ptr->enigmaBerry);
|
gSaveBlock1Ptr->enigmaBerry.checksum = GetEnigmaBerryChecksum(&gSaveBlock1Ptr->enigmaBerry);
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_809C794(void)
|
void ClearEnigmaBerries(void)
|
||||||
{
|
{
|
||||||
CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, sizeof(gSaveBlock1Ptr->enigmaBerry));
|
CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, sizeof(gSaveBlock1Ptr->enigmaBerry));
|
||||||
sub_809C718();
|
InitEnigmaBerry();
|
||||||
}
|
}
|
||||||
|
|
||||||
struct ReceivedEnigmaBerry
|
struct ReceivedEnigmaBerry
|
||||||
@@ -954,7 +954,7 @@ void SetEnigmaBerry(u8 * berry)
|
|||||||
struct ReceivedEnigmaBerry * src2;
|
struct ReceivedEnigmaBerry * src2;
|
||||||
s32 i;
|
s32 i;
|
||||||
|
|
||||||
sub_809C794();
|
ClearEnigmaBerries();
|
||||||
|
|
||||||
src2 = (struct ReceivedEnigmaBerry *)berry;
|
src2 = (struct ReceivedEnigmaBerry *)berry;
|
||||||
enigmaBerry = &gSaveBlock1Ptr->enigmaBerry;
|
enigmaBerry = &gSaveBlock1Ptr->enigmaBerry;
|
||||||
|
|||||||
+1
-1
@@ -138,7 +138,7 @@ void NewGameInitData(void)
|
|||||||
gSaveBlock1Ptr->registeredItem = 0;
|
gSaveBlock1Ptr->registeredItem = 0;
|
||||||
ClearBag();
|
ClearBag();
|
||||||
NewGameInitPCItems();
|
NewGameInitPCItems();
|
||||||
sub_809C794();
|
ClearEnigmaBerries();
|
||||||
InitEasyChatPhrases();
|
InitEasyChatPhrases();
|
||||||
ResetTrainerFanClub();
|
ResetTrainerFanClub();
|
||||||
UnionRoomChat_InitializeRegisteredTexts();
|
UnionRoomChat_InitializeRegisteredTexts();
|
||||||
|
|||||||
Reference in New Issue
Block a user