through sub_8128FB8

This commit is contained in:
PikalaxALT
2020-01-24 13:07:41 -05:00
parent 4ff5769f42
commit 14b7ed7a5f
6 changed files with 550 additions and 1203 deletions
File diff suppressed because it is too large Load Diff
+30 -30
View File
@@ -75,64 +75,64 @@ gUnknown_847AA8F::
gUnknown_847AAA8::
.string "{CLEAR 11}{CLEAR 16}{CLEAR 16}{CLEAR 18}{CLEAR 18}'{CLEAR 18} $"
gUnknown_847AAC1::
gText_UnionRoomChatKeyboard_ABCDE::
.string "ABCDE$"
gUnknown_847AAC7::
gText_UnionRoomChatKeyboard_FGHIJ::
.string "FGHIJ$"
gUnknown_847AACD::
gText_UnionRoomChatKeyboard_KLMNO::
.string "KLMNO$"
gUnknown_847AAD3::
gText_UnionRoomChatKeyboard_PQRST::
.string "PQRST$"
gUnknown_847AAD9::
gText_UnionRoomChatKeyboard_UVWXY::
.string "UVWXY$"
gUnknown_847AADF::
gText_UnionRoomChatKeyboard_Z::
.string "Z $"
gUnknown_847AAE5::
gText_UnionRoomChatKeyboard_01234Upper::
.string "01234$"
gUnknown_847AAEB::
gText_UnionRoomChatKeyboard_56789Upper::
.string "56789$"
gUnknown_847AAF1::
gText_UnionRoomChatKeyboard_PunctuationUpper::
.string ".,!? $"
gUnknown_847AAF7::
gText_UnionRoomChatKeyboard_SymbolsUpper::
.string "-/& $"
gUnknown_847AAFD::
gText_UnionRoomChatKeyboard_abcde::
.string "abcde$"
gUnknown_847AB03::
gText_UnionRoomChatKeyboard_fghij::
.string "fghij$"
gUnknown_847AB09::
gText_UnionRoomChatKeyboard_klmno::
.string "klmno$"
gUnknown_847AB0F::
gText_UnionRoomChatKeyboard_pqrst::
.string "pqrst$"
gUnknown_847AB15::
gText_UnionRoomChatKeyboard_uvwxy::
.string "uvwxy$"
gUnknown_847AB1B::
gText_UnionRoomChatKeyboard_z::
.string "z $"
gUnknown_847AB21::
gText_UnionRoomChatKeyboard_01234Lower::
.string "01234$"
gUnknown_847AB27::
gText_UnionRoomChatKeyboard_56789Lower::
.string "56789$"
gUnknown_847AB2D::
gText_UnionRoomChatKeyboard_PunctuationLower::
.string ".,!? $"
gUnknown_847AB33::
gText_UnionRoomChatKeyboard_SymbolsLower::
.string "-/& $"
.string "$"
@@ -144,34 +144,34 @@ gUnknown_847AB33::
.string "$"
.string "$"
gUnknown_847AB41::
gText_UnionRoomChatKeyboard_Emoji1::
.string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$"
gUnknown_847AB4C::
gText_UnionRoomChatKeyboard_Emoji2::
.string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$"
gUnknown_847AB57::
gText_UnionRoomChatKeyboard_Emoji3::
.string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$"
gUnknown_847AB62::
gText_UnionRoomChatKeyboard_Emoji4::
.string "{EXTRA 212}{EXTRA 213}{EXTRA 211}$"
gUnknown_847AB6B::
gText_UnionRoomChatKeyboard_Emoji5::
.string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$"
gUnknown_847AB76::
gText_UnionRoomChatKeyboard_Emoji6::
.string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$"
gUnknown_847AB81::
gText_UnionRoomChatKeyboard_Emoji7::
.string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$"
gUnknown_847AB8C::
gText_UnionRoomChatKeyboard_Emoji8::
.string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$"
gUnknown_847AB97::
gText_UnionRoomChatKeyboard_Emoji9::
.string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$"
gUnknown_847ABA2::
gText_UnionRoomChatKeyboard_Emoji10::
.string "{EXTRA 210}{EXTRA 208}: $"
// trainer_tower (again?)
+30 -30
View File
@@ -44,36 +44,36 @@ gUnknown_845A8AC:: @ 845A8AC
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_845A9AC:: @ 845A9AC
.4byte gUnknown_847AAC1
.4byte gUnknown_847AAC7
.4byte gUnknown_847AACD
.4byte gUnknown_847AAD3
.4byte gUnknown_847AAD9
.4byte gUnknown_847AADF
.4byte gUnknown_847AAE5
.4byte gUnknown_847AAEB
.4byte gUnknown_847AAF1
.4byte gUnknown_847AAF7
.4byte gUnknown_847AAFD
.4byte gUnknown_847AB03
.4byte gUnknown_847AB09
.4byte gUnknown_847AB0F
.4byte gUnknown_847AB15
.4byte gUnknown_847AB1B
.4byte gUnknown_847AB21
.4byte gUnknown_847AB27
.4byte gUnknown_847AB2D
.4byte gUnknown_847AB33
.4byte gUnknown_847AB41
.4byte gUnknown_847AB4C
.4byte gUnknown_847AB57
.4byte gUnknown_847AB62
.4byte gUnknown_847AB6B
.4byte gUnknown_847AB76
.4byte gUnknown_847AB81
.4byte gUnknown_847AB8C
.4byte gUnknown_847AB97
.4byte gUnknown_847ABA2
.4byte gText_UnionRoomChatKeyboard_ABCDE
.4byte gText_UnionRoomChatKeyboard_FGHIJ
.4byte gText_UnionRoomChatKeyboard_KLMNO
.4byte gText_UnionRoomChatKeyboard_PQRST
.4byte gText_UnionRoomChatKeyboard_UVWXY
.4byte gText_UnionRoomChatKeyboard_Z
.4byte gText_UnionRoomChatKeyboard_01234Upper
.4byte gText_UnionRoomChatKeyboard_56789Upper
.4byte gText_UnionRoomChatKeyboard_PunctuationUpper
.4byte gText_UnionRoomChatKeyboard_SymbolsUpper
.4byte gText_UnionRoomChatKeyboard_abcde
.4byte gText_UnionRoomChatKeyboard_fghij
.4byte gText_UnionRoomChatKeyboard_klmno
.4byte gText_UnionRoomChatKeyboard_pqrst
.4byte gText_UnionRoomChatKeyboard_uvwxy
.4byte gText_UnionRoomChatKeyboard_z
.4byte gText_UnionRoomChatKeyboard_01234Lower
.4byte gText_UnionRoomChatKeyboard_56789Lower
.4byte gText_UnionRoomChatKeyboard_PunctuationLower
.4byte gText_UnionRoomChatKeyboard_SymbolsLower
.4byte gText_UnionRoomChatKeyboard_Emoji1
.4byte gText_UnionRoomChatKeyboard_Emoji2
.4byte gText_UnionRoomChatKeyboard_Emoji3
.4byte gText_UnionRoomChatKeyboard_Emoji4
.4byte gText_UnionRoomChatKeyboard_Emoji5
.4byte gText_UnionRoomChatKeyboard_Emoji6
.4byte gText_UnionRoomChatKeyboard_Emoji7
.4byte gText_UnionRoomChatKeyboard_Emoji8
.4byte gText_UnionRoomChatKeyboard_Emoji9
.4byte gText_UnionRoomChatKeyboard_Emoji10
gUnknown_845AA24:: @ 845AA24
.incbin "graphics/union_room_chat/unk_845AA24.gbapal"
+35
View File
@@ -0,0 +1,35 @@
#ifndef GUARD_DATA_8479668_H
#define GUARD_DATA_8479668_H
extern const u8 gText_UnionRoomChatKeyboard_ABCDE[];
extern const u8 gText_UnionRoomChatKeyboard_FGHIJ[];
extern const u8 gText_UnionRoomChatKeyboard_KLMNO[];
extern const u8 gText_UnionRoomChatKeyboard_PQRST[];
extern const u8 gText_UnionRoomChatKeyboard_UVWXY[];
extern const u8 gText_UnionRoomChatKeyboard_Z[];
extern const u8 gText_UnionRoomChatKeyboard_01234Upper[];
extern const u8 gText_UnionRoomChatKeyboard_56789Upper[];
extern const u8 gText_UnionRoomChatKeyboard_PunctuationUpper[];
extern const u8 gText_UnionRoomChatKeyboard_SymbolsUpper[];
extern const u8 gText_UnionRoomChatKeyboard_abcde[];
extern const u8 gText_UnionRoomChatKeyboard_fghij[];
extern const u8 gText_UnionRoomChatKeyboard_klmno[];
extern const u8 gText_UnionRoomChatKeyboard_pqrst[];
extern const u8 gText_UnionRoomChatKeyboard_uvwxy[];
extern const u8 gText_UnionRoomChatKeyboard_z[];
extern const u8 gText_UnionRoomChatKeyboard_01234Lower[];
extern const u8 gText_UnionRoomChatKeyboard_56789Lower[];
extern const u8 gText_UnionRoomChatKeyboard_PunctuationLower[];
extern const u8 gText_UnionRoomChatKeyboard_SymbolsLower[];
extern const u8 gText_UnionRoomChatKeyboard_Emoji1[];
extern const u8 gText_UnionRoomChatKeyboard_Emoji2[];
extern const u8 gText_UnionRoomChatKeyboard_Emoji3[];
extern const u8 gText_UnionRoomChatKeyboard_Emoji4[];
extern const u8 gText_UnionRoomChatKeyboard_Emoji5[];
extern const u8 gText_UnionRoomChatKeyboard_Emoji6[];
extern const u8 gText_UnionRoomChatKeyboard_Emoji7[];
extern const u8 gText_UnionRoomChatKeyboard_Emoji8[];
extern const u8 gText_UnionRoomChatKeyboard_Emoji9[];
extern const u8 gText_UnionRoomChatKeyboard_Emoji10[];
#endif //GUARD_DATA_8479668_H
+1
View File
@@ -326,6 +326,7 @@ bool32 PlayerHasMetTrainerBefore(u16 id, u8 *name);
bool8 sub_80FCC3C(struct GFtgtGname *gname, u8 *uname, u8 idx);
bool8 sub_80FCCF4(struct GFtgtGname *gname, u8 *uname, u8 idx);
bool32 sub_80FBA1C(void);
void sub_80FA4A8(void);
#include "mevent_server.h"
extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];
+454 -3
View File
@@ -4,8 +4,11 @@
#include "link.h"
#include "link_rfu.h"
#include "list_menu.h"
#include "load_save.h"
#include "menu.h"
#include "overworld.h"
#include "quest_log.h"
#include "save.h"
#include "scanline_effect.h"
#include "task.h"
#include "constants/songs.h"
@@ -58,25 +61,35 @@ void sub_8128640(void);
void sub_81286C4(void);
void sub_81287B4(void);
void sub_81288D4(void);
void sub_8128DA4(void);
void sub_8128E78(void);
void sub_8128AA0(void);
void sub_8128C04(void);
void sub_8128CA8(void);
void sub_8128DA4(void);
void sub_8128E78(void);
void sub_8128FB8(void);
void sub_8129218(u16 a0);
bool32 sub_8129228(void);
void sub_81292D8(void);
void sub_81293AC(void);
void sub_81293D8(void);
bool32 sub_8129408(void);
void sub_8129424(void);
void sub_8129454(void);
void sub_8129470(void);
void sub_8129560(u8 *ptr);
void sub_8129568(u8 *ptr);
void sub_8129590(u8 *ptr);
void sub_81295C0(u8 *ptr);
void sub_81295EC(u8 *ptr);
void sub_8129614(u8 *ptr);
void sub_81298F8(u8 taskId);
void sub_8129B14(void);
bool32 sub_8129B78(void);
void sub_8129B88(void);
void sub_8129BFC(void);
void sub_8129C34(u16 a0, u8 a1);
u8 sub_8129C8C(u8 a0);
s8 sub_812A568(void);
static void (*const gUnknown_845A880[])(void) = {
sub_8128640,
@@ -316,7 +329,7 @@ void sub_81287B4(void)
var0 = 0;
break;
case MENU_NOTHING_CHOSEN:
if (gMain.newKeys & SELECT_BUTTON)
if (JOY_NEW(SELECT_BUTTON))
{
PlaySE(SE_SELECT);
Menu_MoveCursor(1);
@@ -350,3 +363,441 @@ void sub_81287B4(void)
break;
}
}
void sub_81288D4(void)
{
s8 input;
switch (gUnknown_203B0E0->unk6)
{
case 0:
sub_8129C34(6, 0);
gUnknown_203B0E0->unk6 = 1;
break;
case 1:
if (!sub_8129C8C(0))
gUnknown_203B0E0->unk6 = 2;
break;
case 2:
input = sub_812A568();
switch (input)
{
case -1:
case 1:
sub_8129C34(7, 0);
gUnknown_203B0E0->unk6 = 3;
break;
case 0:
if (gUnknown_203B0E0->unk13 == 0)
{
sub_8129614(gUnknown_203B0E0->unk190);
sub_8129C34(7, 0);
gUnknown_203B0E0->unk6 = 9;
}
else
{
sub_81295C0(gUnknown_203B0E0->unk190);
gUnknown_203B0E0->unk6 = 4;
}
break;
}
break;
case 3:
if (!sub_8129C8C(0))
sub_8129218(1);
break;
case 9:
if (!sub_8129C8C(0))
{
sub_8129C34(20, 0);
gUnknown_203B0E0->unk6 = 10;
}
break;
case 10:
if (!sub_8129C8C(0))
gUnknown_203B0E0->unk6 = 8;
break;
case 8:
input = sub_812A568();
switch (input)
{
case -1:
case 1:
sub_8129C34(7, 0);
gUnknown_203B0E0->unk6 = 3;
break;
case 0:
sub_80FA4A8();
sub_8129614(gUnknown_203B0E0->unk190);
gUnknown_203B0E0->unk6 = 4;
break;
}
break;
case 4:
if (IsLinkTaskFinished() && !sub_80FBA1C() && SendBlock(0, gUnknown_203B0E0->unk190, sizeof(gUnknown_203B0E0->unk190)))
{
if (!gUnknown_203B0E0->unk13)
gUnknown_203B0E0->unk6 = 6;
else
gUnknown_203B0E0->unk6 = 5;
}
break;
case 5:
if (!gReceivedRemoteLinkPlayers)
{
sub_8129218(9);
}
break;
}
}
void sub_8128AA0(void)
{
switch (gUnknown_203B0E0->unk6)
{
case 0:
if (!FuncIsActiveTask(sub_81298F8))
{
sub_8129C34(7, 0);
gUnknown_203B0E0->unk6++;
}
break;
case 1:
if (!sub_8129C8C(0))
{
sub_8129C34(18, 0);
gUnknown_203B0E0->unk6++;
}
break;
case 2:
if (!sub_8129C8C(0))
{
sub_81295EC(gUnknown_203B0E0->unk190);
gUnknown_203B0E0->unk6++;
}
break;
case 3:
if (IsLinkTaskFinished() && !sub_80FBA1C() && SendBlock(0, gUnknown_203B0E0->unk190, sizeof(gUnknown_203B0E0->unk190)))
gUnknown_203B0E0->unk6++;
break;
case 4:
if ((GetBlockReceivedStatus() & 1) && !sub_80FBA1C())
gUnknown_203B0E0->unk6++;
break;
case 5:
if (IsLinkTaskFinished() && !sub_80FBA1C())
{
sub_800AAC0();
gUnknown_203B0E0->unkA = 0;
gUnknown_203B0E0->unk6++;
}
break;
case 6:
if (gUnknown_203B0E0->unkA < 150)
gUnknown_203B0E0->unkA++;
if (!gReceivedRemoteLinkPlayers)
gUnknown_203B0E0->unk6++;
break;
case 7:
if (gUnknown_203B0E0->unkA >= 150)
sub_8129218(9);
else
gUnknown_203B0E0->unkA++;
break;
}
}
void sub_8128C04(void)
{
switch (gUnknown_203B0E0->unk6)
{
case 0:
if (!FuncIsActiveTask(sub_81298F8))
{
sub_8129C34(7, 0);
gUnknown_203B0E0->unk6++;
}
break;
case 1:
if (!sub_8129C8C(0) && IsLinkTaskFinished() && !sub_80FBA1C())
{
sub_800AAC0();
gUnknown_203B0E0->unkA = 0;
gUnknown_203B0E0->unk6++;
}
break;
case 2:
if (gUnknown_203B0E0->unkA < 150)
gUnknown_203B0E0->unkA++;
if (!gReceivedRemoteLinkPlayers)
gUnknown_203B0E0->unk6++;
break;
case 3:
if (gUnknown_203B0E0->unkA >= 150)
sub_8129218(9);
else
gUnknown_203B0E0->unkA++;
break;
}
}
void sub_8128CA8(void)
{
switch (gUnknown_203B0E0->unk6)
{
case 0:
if (!FuncIsActiveTask(sub_81298F8))
{
if (gUnknown_203B0E0->unk13)
sub_8129C34(7, 0);
gUnknown_203B0E0->unk6++;
}
break;
case 1:
if (!sub_8129C8C(0))
{
if (gUnknown_203B0E0->unk13)
sub_8129C34(19, 0);
gUnknown_203B0E0->unk6++;
}
break;
case 2:
if (sub_8129C8C(0) != TRUE && IsLinkTaskFinished() && !sub_80FBA1C())
{
sub_800AAC0();
gUnknown_203B0E0->unkA = 0;
gUnknown_203B0E0->unk6++;
}
break;
case 3:
if (gUnknown_203B0E0->unkA < 150)
gUnknown_203B0E0->unkA++;
if (!gReceivedRemoteLinkPlayers)
gUnknown_203B0E0->unk6++;
break;
case 4:
if (gUnknown_203B0E0->unkA >= 150)
sub_8129218(9);
else
gUnknown_203B0E0->unkA++;
break;
}
}
void sub_8128DA4(void)
{
switch (gUnknown_203B0E0->unk6)
{
case 0:
if (!gReceivedRemoteLinkPlayers)
{
sub_8129218(1);
break;
}
sub_8129590(gUnknown_203B0E0->unk190);
gUnknown_203B0E0->unk6++;
// fall through
case 1:
if (IsLinkTaskFinished() == TRUE && !sub_80FBA1C() && SendBlock(0, gUnknown_203B0E0->unk190, sizeof(gUnknown_203B0E0->unk190)))
gUnknown_203B0E0->unk6++;
break;
case 2:
sub_8129454();
sub_8129C34(8, 0);
gUnknown_203B0E0->unk6++;
break;
case 3:
if (!sub_8129C8C(0))
gUnknown_203B0E0->unk6++;
break;
case 4:
if (IsLinkTaskFinished())
sub_8129218(1);
break;
}
}
void sub_8128E78(void)
{
switch (gUnknown_203B0E0->unk6)
{
case 0:
if (sub_8129408())
{
sub_8129C34(9, 0);
gUnknown_203B0E0->unk6 = 2;
}
else
{
sub_8129C34(13, 0);
gUnknown_203B0E0->unk6 = 5;
}
break;
case 1:
if (JOY_NEW(A_BUTTON))
{
sub_8129424();
sub_8129C34(11, 0);
gUnknown_203B0E0->unk6 = 3;
}
else if (JOY_NEW(B_BUTTON))
{
sub_8129C34(10, 0);
gUnknown_203B0E0->unk6 = 4;
}
else if (sub_8129228())
{
sub_8129C34(1, 0);
gUnknown_203B0E0->unk6 = 2;
}
break;
case 2:
if (!sub_8129C8C(0))
gUnknown_203B0E0->unk6 = 1;
break;
case 3:
if (!sub_8129C8C(0))
{
sub_8129C34(10, 0);
gUnknown_203B0E0->unk6 = 4;
}
break;
case 4:
if (!sub_8129C8C(0))
sub_8129218(1);
break;
case 5:
if (!sub_8129C8C(0))
gUnknown_203B0E0->unk6 = 6;
break;
case 6:
if (JOY_NEW(A_BUTTON | B_BUTTON))
{
sub_8129C34(7, 0);
gUnknown_203B0E0->unk6 = 4;
}
break;
}
}
void sub_8128FB8(void)
{
s8 input;
switch (gUnknown_203B0E0->unk6)
{
case 0:
if (!gUnknown_203B0E0->unk18)
{
gUnknown_203B0E0->unk6 = 12;
}
else
{
sub_8129C34(7, 0);
gUnknown_203B0E0->unk6 = 1;
}
break;
case 1:
if (!sub_8129C8C(0))
{
sub_8129C34(14, 0);
gUnknown_203B0E0->unk6 = 2;
}
break;
case 2:
input = sub_812A568();
switch (input)
{
case -1:
case 1:
gUnknown_203B0E0->unk6 = 12;
break;
case 0:
sub_8129C34(7, 0);
gUnknown_203B0E0->unk6 = 3;
break;
}
break;
case 3:
if (!sub_8129C8C(0))
{
sub_8129C34(15, 0);
gUnknown_203B0E0->unk6 = 4;
}
break;
case 4:
if (!sub_8129C8C(0))
gUnknown_203B0E0->unk6 = 5;
break;
case 5:
input = sub_812A568();
switch (input)
{
case -1:
case 1:
gUnknown_203B0E0->unk6 = 12;
break;
case 0:
sub_8129C34(7, 0);
gUnknown_203B0E0->unk6 = 6;
break;
}
break;
case 6:
if (!sub_8129C8C(0))
{
sub_8129C34(16, 0);
sub_8129470();
gUnknown_203B0E0->unk6 = 7;
}
break;
case 7:
if (!sub_8129C8C(0))
{
SetContinueGameWarpStatusToDynamicWarp();
TrySavingData(SAVE_NORMAL);
gUnknown_203B0E0->unk6 = 8;
}
break;
case 8:
sub_8129C34(17, 0);
gUnknown_203B0E0->unk6 = 9;
break;
case 9:
if (!sub_8129C8C(0))
{
PlaySE(SE_SAVE);
ClearContinueGameWarpStatus2();
gUnknown_203B0E0->unk6 = 10;
}
break;
case 10:
gUnknown_203B0E0->unk19 = 0;
gUnknown_203B0E0->unk6 = 11;
break;
case 11:
gUnknown_203B0E0->unk19++;
if (gUnknown_203B0E0->unk19 > 120)
gUnknown_203B0E0->unk6 = 12;
break;
case 12:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
gUnknown_203B0E0->unk6 = 13;
break;
case 13:
if (!gPaletteFade.active)
{
sub_812B4B8();
sub_8129B88();
sub_81284BC();
SetMainCallback2(CB2_ReturnToField);
}
break;
}
}