diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 15:50:08 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 15:50:08 -0500 |
| commit | 5e12833b13223ecc6a5a9c91332ed71303358680 (patch) | |
| tree | 46256c02f8d772d76a81c1ec2a9f4bd15fb05b0f | |
| parent | 5a74c0e91354276a92ea01152b76a85462d30d4e (diff) | |
Finish merge
| -rw-r--r-- | include/global.berry.h | 4 | ||||
| -rw-r--r-- | src/pokemon_2.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/global.berry.h b/include/global.berry.h index 4b9ca644c..a77da20ba 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -46,10 +46,6 @@ struct EnigmaBerry u8 holdEffect; u8 holdEffectParam; u32 checksum; - u8 pic[(6 * 6) * TILE_SIZE_4BPP]; - u16 palette[16]; - u8 description1[45]; - u8 description2[45]; }; struct BattleEnigmaBerry diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 9549a6dcd..30e788874 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -32,7 +32,7 @@ extern const union AnimCmd* const * const gUnknown_08309AAC[]; extern const union AnimCmd* const * const gUnknown_08305D0C[]; extern const union AnimCmd* const * const gUnknown_0830536C[]; extern const u8 gBadEggNickname[]; -extern const u8 gEggNickname[]; +extern const u8 gText_EggNickname[]; extern u8 GetBankSide(u8 bank); extern u8 GetBankByPlayerAI(u8 bank); @@ -416,7 +416,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) } else if (boxMon->isEgg) { - StringCopy(data, gEggNickname); + StringCopy(data, gText_EggNickname); retVal = StringLength(data); } else if (boxMon->language == LANGUAGE_JAPANESE) |