summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-03-19 15:51:50 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-03-19 15:51:50 -0400
commitf8932775cd9cc52d3d86c6ef11648d5204e7582d (patch)
tree21fbb6cfb4af392c2a1fe4a94448252ca3e83adc
parentb5d9fb3c7ecf13f37bb0bbb8cf3a4f8bb8995c4a (diff)
Sync berry.c sym labels from Emerald
-rw-r--r--include/berry.h2
-rw-r--r--src/berry.c8
-rw-r--r--src/new_game.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/include/berry.h b/include/berry.h
index ec0caf11b..abbd20fc7 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -62,7 +62,7 @@ void ObjectEventInteractionPickBerryTree(void);
void ObjectEventInteractionRemoveBerryTree(void);
u8 PlayerHasBerries(void);
void ResetBerryTreeSparkleFlags(void);
-void sub_809C794(void);
+void ClearEnigmaBerries(void);
const struct Berry * GetBerryInfo(u8 berryIdx);
extern const struct Berry gBerries[];
diff --git a/src/berry.c b/src/berry.c
index 5a9264f54..c5b8af7f8 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -921,7 +921,7 @@ const struct BerryTree gBlankBerryTree = {};
berries[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX]; \
})
-void sub_809C718(void)
+void InitEnigmaBerry(void)
{
s32 i;
@@ -933,10 +933,10 @@ void sub_809C718(void)
gSaveBlock1Ptr->enigmaBerry.checksum = GetEnigmaBerryChecksum(&gSaveBlock1Ptr->enigmaBerry);
}
-void sub_809C794(void)
+void ClearEnigmaBerries(void)
{
CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, sizeof(gSaveBlock1Ptr->enigmaBerry));
- sub_809C718();
+ InitEnigmaBerry();
}
struct ReceivedEnigmaBerry
@@ -954,7 +954,7 @@ void SetEnigmaBerry(u8 * berry)
struct ReceivedEnigmaBerry * src2;
s32 i;
- sub_809C794();
+ ClearEnigmaBerries();
src2 = (struct ReceivedEnigmaBerry *)berry;
enigmaBerry = &gSaveBlock1Ptr->enigmaBerry;
diff --git a/src/new_game.c b/src/new_game.c
index 30508cd9a..f96dca32e 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -138,7 +138,7 @@ void NewGameInitData(void)
gSaveBlock1Ptr->registeredItem = 0;
ClearBag();
NewGameInitPCItems();
- sub_809C794();
+ ClearEnigmaBerries();
InitEasyChatPhrases();
ResetTrainerFanClub();
UnionRoomChat_InitializeRegisteredTexts();