diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-19 15:51:50 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-19 15:51:50 -0400 |
commit | f8932775cd9cc52d3d86c6ef11648d5204e7582d (patch) | |
tree | 21fbb6cfb4af392c2a1fe4a94448252ca3e83adc /src | |
parent | b5d9fb3c7ecf13f37bb0bbb8cf3a4f8bb8995c4a (diff) |
Sync berry.c sym labels from Emerald
Diffstat (limited to 'src')
-rw-r--r-- | src/berry.c | 8 | ||||
-rw-r--r-- | src/new_game.c | 2 |
2 files changed, 5 insertions, 5 deletions
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(); |