This commit is contained in:
Marijn van der Werf 2017-06-24 20:00:37 +02:00
parent a7bc5ccde7
commit fc27155b0e
3 changed files with 54 additions and 0 deletions

View File

@ -1,4 +1,5 @@
#include "global.h"
#include "easy_chat.h"
struct BardSound
{
@ -44,12 +45,25 @@ static s16 sub_814A2B8(u32 arg0, u32 arg1)
return gUnknown_08417068[arg0][arg1];
}
#if ENGLISH
struct BardSound *sub_814A2D0(u16 arg0, u16 arg1)
{
struct BardSound *sounds = gBardMusicTable[arg0];
return &sounds[arg1];
}
#elif GERMAN
struct BardSound *sub_814A2D0(u16 arg0, u16 arg1)
{
u32 index;
struct BardSound *sounds;
sounds = gBardMusicTable[arg0];
index = de_sub_80EB748(arg0, arg1);
return &sounds[index];
}
#endif
s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2)
{

View File

@ -13,6 +13,7 @@
extern u16 gScriptResult;
extern struct TrainerCard gTrainerCards[4];
extern struct LinkPlayer gLinkPlayers[];
extern u8 gUnknown_03004860;
extern u8 gFieldLinkPlayerCount;
@ -46,6 +47,7 @@ void sub_808303C(u8 taskId) {
return;
}
#if ENGLISH
if (linkPlayerCount < taskData[1])
{
return;
@ -56,6 +58,17 @@ void sub_808303C(u8 taskId) {
ConvertIntToDecimalStringN(gStringVar1, linkPlayerCount, STR_CONV_MODE_LEFT_ALIGN, 1); // r5
ShowFieldAutoScrollMessage((u8 *) gUnknown_081A4975);
gTasks[taskId].func = sub_80830E4;
#elif GERMAN
if ((gLinkType == 0x2255 && (u32) linkPlayerCount > 1) ||
(gLinkType != 0x2255 && taskData[1] <= linkPlayerCount))
{
sub_80081C8(linkPlayerCount);
sub_8082D4C();
ConvertIntToDecimalStringN(gStringVar1, linkPlayerCount, STR_CONV_MODE_LEFT_ALIGN, 1); // r5
ShowFieldAutoScrollMessage((u8 *) gUnknown_081A4975);
gTasks[taskId].func = sub_80830E4;
}
#endif
}
#ifdef NONMATCHING
@ -280,9 +293,21 @@ static void sub_8083314(u8 taskId) {
if (gScriptResult == 1)
{
#if ENGLISH
u16 linkType;
linkType = gLinkType;
// FIXME: sub_8082D4C doesn't take any arguments
sub_8082D4C(0x00004411, linkType);
#elif GERMAN
if (gLinkType != 0x4411)
{
if (gLinkType == 0x6601)
{
deUnkValue2 = 1;
}
}
sub_8082D4C();
#endif
EnableBothScriptContexts();
DestroyTask(taskId);
return;

View File

@ -1929,6 +1929,7 @@ static const struct NamingScreenTemplate *const sNamingScreenTemplates[] =
static const u8 sKeyboardCharacters[][4][20] =
{
#if ENGLISH
{
_(" A B C D E F . "),
_(" G H I J K L , "),
@ -1941,6 +1942,20 @@ static const u8 sKeyboardCharacters[][4][20] =
_(" m n o p q r s "),
_(" t u v w x y z "),
},
#elif GERMAN
{
_(" ABCD EFGH . "),
_(" IJKL MNOP , "),
_(" QRST UVWX "),
_(" YZ ÄÖÜ "),
},
{
_(" abcd efgh . "),
_(" ijkl mnop , "),
_(" qrst uvwx "),
_(" yz äöü "),
},
#endif
{
_(" 0 1 2 3 4 "),
_(" 5 6 7 8 9 "),