ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finish merge

Browse Source
This commit is contained in:
Diegoisawesome 2017-09-16 15:50:08 -05:00
parent 5a74c0e913
commit 5e12833b13
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/global.berry.h
View File

@ -46,10 +46,6 @@ struct EnigmaBerry
u8 holdEffect; u8 holdEffect;
u8 holdEffectParam; u8 holdEffectParam;
u32 checksum; u32 checksum;
u8 pic[(6 * 6) * TILE_SIZE_4BPP];
u16 palette[16];
u8 description1[45];
u8 description2[45];
}; };
struct BattleEnigmaBerry struct BattleEnigmaBerry

4
src/pokemon_2.c
View File

@ -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_08305D0C[];
extern const union AnimCmd* const * const gUnknown_0830536C[]; extern const union AnimCmd* const * const gUnknown_0830536C[];
extern const u8 gBadEggNickname[]; extern const u8 gBadEggNickname[];
extern const u8 gEggNickname[]; extern const u8 gText_EggNickname[];
extern u8 GetBankSide(u8 bank); extern u8 GetBankSide(u8 bank);
extern u8 GetBankByPlayerAI(u8 bank); extern u8 GetBankByPlayerAI(u8 bank);
@ -416,7 +416,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
} }
else if (boxMon->isEgg) else if (boxMon->isEgg)
{ {
StringCopy(data, gEggNickname); StringCopy(data, gText_EggNickname);
retVal = StringLength(data); retVal = StringLength(data);
} }
else if (boxMon->language == LANGUAGE_JAPANESE) else if (boxMon->language == LANGUAGE_JAPANESE)