diff options
| author | yenatch <yenatch@gmail.com> | 2017-09-26 18:16:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 18:16:52 -0400 |
| commit | 3c8091393ca12b8eeb26f236a997b70eea5688c6 (patch) | |
| tree | 4140bab7968e1f0d726adf8fdce180a186212940 /src | |
| parent | 701d53be8dc98d33d73536ac00ebe8db5d506f04 (diff) | |
| parent | def827fcd48353d8a0292db249d26ac7a85b54ef (diff) | |
Merge pull request #47 from PikalaxALT/split_data3
Split data3
Diffstat (limited to 'src')
| -rw-r--r-- | src/berry.c | 49 | ||||
| -rw-r--r-- | src/new_game.c | 6 |
2 files changed, 53 insertions, 2 deletions
diff --git a/src/berry.c b/src/berry.c index e9d6994f8..98cf7d932 100644 --- a/src/berry.c +++ b/src/berry.c @@ -17,7 +17,6 @@ extern bool8 sub_8092E9C(u8, u8, u8); extern u16 gScriptItemId; extern const u8 BerryTreeScript[]; -extern const struct BerryTree gBlankBerryTree; #define BERRY_NAME_LENGTH 6 @@ -804,6 +803,54 @@ const struct Berry gBerries[] = }, }; +const struct UnkStruct_0858AB24 gUnknown_0858AB24[] = { + { 50, 20}, + { 50, 20}, + { 50, 20}, + { 50, 20}, + { 50, 20}, + { 50, 30}, + { 50, 30}, + { 50, 30}, + { 50, 30}, + { 50, 30}, + { 60, 50}, + { 60, 50}, + { 60, 50}, + { 60, 50}, + { 60, 50}, + { 80, 70}, + { 80, 70}, + { 80, 70}, + { 80, 70}, + { 80, 70}, + {100, 100}, + {100, 100}, + {100, 100}, + {100, 100}, + {100, 100}, + {130, 150}, + {130, 150}, + {130, 150}, + {130, 150}, + {130, 150}, + {160, 250}, + {160, 250}, + {160, 250}, + {160, 250}, + {160, 250}, + {180, 500}, + {180, 500}, + {180, 500}, + {180, 500}, + {180, 500}, + {200, 750}, + {200, 750}, + {150, 200} +}; + +const struct BerryTree gBlankBerryTree = {}; + // unused void ClearEnigmaBerries(void) { diff --git a/src/new_game.c b/src/new_game.c index 2bf774c69..5a482c593 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -18,6 +18,7 @@ #include "event_data.h" #include "money.h" #include "coins.h" +#include "text.h" extern u8 gPlayerPartyCount; extern u8 gDifferentSaveFile; @@ -104,7 +105,10 @@ void ClearPokedexFlags(void) memset(&gSaveBlock2Ptr->pokedex.seen, 0, sizeof(gSaveBlock2Ptr->pokedex.seen)); } -extern const struct ContestWinner gContestWinnerPicDummy; +const struct ContestWinner gContestWinnerPicDummy = { + .monName = _(""), + .trainerName = _("") +}; void ClearAllContestWinnerPics(void) { |