dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into sub_81700F8

Browse Source
This commit is contained in:
PikalaxALT
2017-09-17 23:42:43 -04:00
committed by GitHub
parent 16f2e40576 74bda5b680
commit abe72dca47
205 changed files with 137622 additions and 132138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/coins.c
View File

@@ -14,14 +14,14 @@ extern void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority
extern void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, s16 tileStart, s8 palette);
extern void sub_819746C(u8 windowId, bool8 copyToVram);
extern const u8 gOtherText_Coins2[];
extern const u8 gText_Coins[];
void PrintCoinsString(u32 coinAmount)
{
u32 xAlign;
ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4);
StringExpandPlaceholders(gStringVar4, gOtherText_Coins2);
StringExpandPlaceholders(gStringVar4, gText_Coins);
xAlign = GetStringRightAlignXOffset(1, gStringVar4, 0x40);
PrintTextOnWindow(sCoinsWindowId, 1, gStringVar4, xAlign, 1, 0, NULL);

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_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)