diff options
Diffstat (limited to 'src/cable_club.c')
| -rw-r--r-- | src/cable_club.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/cable_club.c b/src/cable_club.c index 13ae65322..70b372205 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -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; |