diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-02 12:29:31 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-02 12:29:31 -0600 |
commit | ee05197eba782b9796b042f153890be10c4b492c (patch) | |
tree | 27237fe3953d40ad24866563d497639ac914b45e /src | |
parent | 145047d4389c68052ed8a5f4c1760238112004f3 (diff) | |
parent | d137ebc7a9e0f4f73a1379ab667d90fbce859876 (diff) |
Merge pull request #418 from DizzyEggg/link_rfu
Finish Link rfu
Diffstat (limited to 'src')
-rw-r--r-- | src/librfu_stwi.c | 34 | ||||
-rw-r--r-- | src/link_rfu.c | 905 | ||||
-rw-r--r-- | src/rom_8011DC0.c | 327 |
3 files changed, 1109 insertions, 157 deletions
diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c index 21d38bb38..556b79bf8 100644 --- a/src/librfu_stwi.c +++ b/src/librfu_stwi.c @@ -246,7 +246,7 @@ void STWI_send_SystemConfigREQ(u16 unk1, u8 unk2, u8 unk3) if (!STWI_init(RFU_SYSTEM_CONFIG)) { u8 *packetBytes; - + gRfuState->txParams = 1; packetBytes = gRfuState->txPacket->rfuPacket8.data; @@ -348,7 +348,7 @@ void STWI_send_DataTxREQ(void *in, u8 size) u8 txParams = (size / sizeof(u32)); if (size & (sizeof(u32) - 1)) txParams += 1; - + gRfuState->txParams = txParams; CpuCopy32(in, gRfuState->txPacket->rfuPacket32.data, gRfuState->txParams * sizeof(u32)); STWI_start_Command(); @@ -469,11 +469,11 @@ void STWI_send_CPR_StartREQ(u16 unk0, u16 unk1, u8 unk2) { u32 *packetData; u32 arg1; - + if (!STWI_init(RFU_CPR_START)) { gRfuState->txParams = 2; - + arg1 = unk1 | (unk0 << 16); packetData = gRfuState->txPacket->rfuPacket32.data; packetData[0] = arg1; @@ -569,7 +569,7 @@ void STWI_set_timer(u8 unk) void STWI_stop_timer(void) { gRfuState->timerState = 0; - + REG_TMCNT_L(gRfuState->timerSelect) = 0; REG_TMCNT_H(gRfuState->timerSelect) = 0; } @@ -612,7 +612,7 @@ u16 STWI_init(u8 request) gRfuState->timerActive = 0; gRfuState->unk_12 = 0; gRfuState->unk_15 = 0; - + REG_RCNT = 0x100; REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS; return FALSE; @@ -622,22 +622,22 @@ u16 STWI_init(u8 request) int STWI_start_Command() { u16 imeTemp; - + // Yes, it matters that it's casted to a u32... *(u32*)gRfuState->txPacket->rfuPacket8.data = 0x99660000 | (gRfuState->txParams << 8) | gRfuState->activeCommand; REG_SIODATA32 = gRfuState->txPacket->rfuPacket32.command; - + gRfuState->unk_0 = 0; gRfuState->unk_5 = 1; - + imeTemp = REG_IME; REG_IME = 0; REG_IE |= (INTR_FLAG_TIMER0 << gRfuState->timerSelect); REG_IE |= INTR_FLAG_SERIAL; REG_IME = imeTemp; - + REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_MULTI_BUSY | SIO_115200_BPS; - + return 0; } @@ -654,7 +654,7 @@ int STWI_restart_Command(void) { gRfuState->unk_12 = 1; gRfuState->unk_2c = 0; - + if (gRfuState->callbackM) gRfuState->callbackM(gRfuState->activeCommand, gRfuState->unk_12); } @@ -662,18 +662,18 @@ int STWI_restart_Command(void) { gRfuState->unk_12 = 1; gRfuState->unk_2c = 0; - + if (gRfuState->callbackM) gRfuState->callbackM(gRfuState->activeCommand, gRfuState->unk_12); - + gRfuState->unk_0 = 4; //TODO: what's 4 } } - + return 0; } -int STWI_reset_ClockCounter() +int STWI_reset_ClockCounter(void) { gRfuState->unk_0 = 5; //TODO: what is 5 gRfuState->txParams = 0; @@ -682,6 +682,6 @@ int STWI_reset_ClockCounter() REG_SIOCNT = 0; REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS; REG_SIOCNT = (SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS) + 0x7F; - + return 0; } diff --git a/src/link_rfu.c b/src/link_rfu.c index e85cc7dc3..308ad615c 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -1,26 +1,24 @@ - -// Includes #include "global.h" -#include "malloc.h" #include "battle.h" #include "berry_blender.h" -#include "task.h" -#include "random.h" #include "decompress.h" -#include "text.h" -#include "string_util.h" #include "event_data.h" -#include "overworld.h" -#include "link.h" +#include "gpu_regs.h" #include "librfu.h" -#include "rom_8011DC0.h" +#include "link.h" #include "link_rfu.h" +#include "malloc.h" +#include "overworld.h" +#include "random.h" +#include "palette.h" +#include "rom_8011DC0.h" +#include "string_util.h" +#include "task.h" +#include "text.h" +#include "constants/species.h" extern u16 gUnknown_03005DA8; - -// Static type declarations - -// Static RAM declarations +extern void nullsub_89(u8 taskId); struct UnkRfuStruct_1 gUnknown_03004140; struct UnkRfuStruct_2 gUnknown_03005000; @@ -32,12 +30,11 @@ IWRAM_DATA u16 gUnknown_03000D90[8]; EWRAM_DATA u8 gWirelessStatusIndicatorSpriteId = 0; EWRAM_DATA ALIGNED(4) struct UnkLinkRfuStruct_02022B14 gUnknown_02022B14 = {}; -EWRAM_DATA ALIGNED(2) u8 gUnknown_02022B22[8] = {}; +EWRAM_DATA ALIGNED(2) u8 gUnknown_02022B22[PLAYER_NAME_LENGTH + 1] = {}; EWRAM_DATA struct UnkLinkRfuStruct_02022B2C gUnknown_02022B2C = {}; EWRAM_DATA struct UnkLinkRfuStruct_02022B44 gUnknown_02022B44 = {}; // Static ROM declarations - static void sub_800C000(void); static void sub_800C7B4(u16 r8, u16 r6); static void sub_800C744(u32 a0); @@ -68,18 +65,21 @@ static void rfufunc_80FA020(void); bool32 sub_8010454(u32 a0); static void sub_8010528(void); void sub_8010750(void); -int sub_80107A0(void); +s32 sub_80107A0(void); void sub_801084C(u8 taskId); void sub_80109E8(u16 a0); void sub_8010A70(void *a0); void sub_8010AAC(u8 taskId); void sub_8010D0C(u8 taskId); -void sub_80115EC(u16 a0); +void sub_80115EC(s32 a0); u8 sub_8011CE4(const u8 *a0, u16 a1); -void sub_8011D6C(u8 a0); -void sub_8011E94(u8 a0, u8 a1); -u8 sub_8012224(void); +void sub_8011D6C(u32 a0); +void sub_8011E94(u32 a0, u32 a1); +bool8 sub_8012224(void); void sub_801227C(void); +void sub_801209C(u8 taskId); +void sub_8011BF8(void); +void sub_8011BA4(void); // .rodata @@ -308,6 +308,11 @@ const char gUnknown_082ED7EC[] = "PokemonSioInfo"; const char gUnknown_082ED7FC[] = "LINK LOSS DISCONNECT!"; const char gUnknown_082ED814[] = "LINK LOSS RECOVERY NOW"; +extern const char gUnknown_082ED82C[]; +extern const char gUnknown_082ED84B[]; +extern const char gUnknown_082ED85B[]; +extern const char gUnknown_082ED868[]; + // .text u32 sub_800BEC0(void) @@ -352,7 +357,7 @@ void rfu_REQ_sendData_wrapper(u8 r2) rfu_REQ_sendData(r2); } -int sub_800BF4C(void (*func1)(u8, u8), void (*func2)(u16)) +s32 sub_800BF4C(void (*func1)(u8, u8), void (*func2)(u16)) { if (func1 == NULL) { @@ -474,7 +479,6 @@ u8 sub_800C054(u8 r5, u16 r7, u16 r8, const u16 *r6) u8 sub_800C12C(u16 r6, u16 r8) { u8 i; - struct RfuUnk5 *tmp; if (gUnknown_03004140.unk_04 != 0 && (gUnknown_03004140.unk_04 < 9 || gUnknown_03004140.unk_04 > 11)) { @@ -1685,8 +1689,8 @@ void sub_800D658(void) void sub_800D6C8(struct UnkRfuStruct_2_Sub_124 *ptr) { - int i; - int j; + s32 i; + s32 j; for (i = 0; i < 32; i++) { @@ -1703,8 +1707,8 @@ void sub_800D6C8(struct UnkRfuStruct_2_Sub_124 *ptr) void sub_800D724(struct UnkRfuStruct_2_Sub_9e8 *ptr) { - int i; - int j; + s32 i; + s32 j; for (i = 0; i < 40; i++) { @@ -1721,8 +1725,8 @@ void sub_800D724(struct UnkRfuStruct_2_Sub_9e8 *ptr) void sub_800D780(struct UnkRfuStruct_Sub_Unused *ptr) { - int i; - int j; + s32 i; + s32 j; for (i = 0; i < 2; i++) { @@ -1739,7 +1743,7 @@ void sub_800D780(struct UnkRfuStruct_Sub_Unused *ptr) void sub_800D7D8(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2) { - int i; + s32 i; u16 imeBak; u8 count; @@ -1779,7 +1783,7 @@ void sub_800D7D8(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2) void sub_800D888(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2) { - int i; + s32 i; u16 imeBak; if (q1->unk_232 < 40) @@ -1818,7 +1822,7 @@ void sub_800D888(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2) bool8 sub_800D934(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2) { u16 imeBak; - int i; + s32 i; imeBak = REG_IME; REG_IME = 0; @@ -1844,7 +1848,7 @@ bool8 sub_800D934(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2) bool8 sub_800D9DC(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2) { - int i; + s32 i; u16 imeBak; if (q1->unk_230 == q1->unk_231 || q1->unk_233 != 0) @@ -1866,7 +1870,7 @@ bool8 sub_800D9DC(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2) void sub_800DA68(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2) { - int i; + s32 i; if (q2[1] == 0) { @@ -1893,7 +1897,7 @@ void sub_800DA68(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2) static bool8 sub_800DAC8(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2) { - int i; + s32 i; if (q1->unk_1e == 0) { @@ -1914,7 +1918,7 @@ static bool8 sub_800DAC8(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2) void sub_800DB18(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2) { - int i; + s32 i; if (q1->unk_202 < 2) { @@ -1934,7 +1938,7 @@ void sub_800DB18(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2) bool8 sub_800DB84(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2) { - int i; + s32 i; if (q1->unk_200 == q1->unk_201 || q1->unk_203) { @@ -1952,7 +1956,7 @@ bool8 sub_800DB84(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2) void sub_800DBF8(u8 *q1, u8 mode) { - int i; + s32 i; u8 rval; u16 r5 = 0; switch (mode) @@ -1996,7 +2000,7 @@ void sub_800DBF8(u8 *q1, u8 mode) void PkmnStrToASCII(u8 *q1, const u8 *q2) { - int i; + s32 i; for (i = 0; q2[i] != EOS; i++) { @@ -2007,7 +2011,7 @@ void PkmnStrToASCII(u8 *q1, const u8 *q2) void ASCIIToPkmnStr(u8 *q1, const u8 *q2) { - int i; + s32 i; for (i = 0; q2[i] != 0; i++) { @@ -2115,9 +2119,9 @@ NAKED u8 sub_800DD1C(u8 maxFlags) } #endif -void sub_800DD94(struct UnkLinkRfuStruct_02022B14 *data, u8 r9, bool32 r2, int r3) +void sub_800DD94(struct UnkLinkRfuStruct_02022B14 *data, u8 r9, bool32 r2, s32 r3) { - int i; + s32 i; for (i = 0; i < 2; i++) { @@ -2151,12 +2155,12 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx) if (sub_8010454(gUnknown_03007890->unk_14[idx].unk_04) && ((gUnknown_03007890->unk_07 >> idx) & 1)) { memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, 0xD); - memcpy(buff2, gUnknown_03007890->unk_14[idx].unk_15, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); + memcpy(buff2, gUnknown_03007890->unk_14[idx].playerName, PLAYER_NAME_LENGTH + 1); } else { memset(buff1, 0, 0xD); - memset(buff2, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); + memset(buff2, 0, sizeof(gUnknown_03007890->unk_14[idx].playerName)); } } else @@ -2165,12 +2169,12 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx) if (sub_8010454(gUnknown_03007890->unk_14[idx].unk_04)) { memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, 0xD); - memcpy(buff2, gUnknown_03007890->unk_14[idx].unk_15, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); + memcpy(buff2, gUnknown_03007890->unk_14[idx].playerName, PLAYER_NAME_LENGTH + 1); } else { memset(buff1, 0, 0xD); - memset(buff2, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); + memset(buff2, 0, PLAYER_NAME_LENGTH + 1); } } return retVal; @@ -2181,13 +2185,13 @@ bool8 sub_800DF34(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx) bool8 retVal = FALSE; if (gUnknown_03007890->unk_14[idx].unk_04 == 0x7F7D) { - *buff1 = gUnknown_03007890->unk_14[idx].unk_06; - memcpy(buff2, gUnknown_03007890->unk_14[idx].unk_15, 8); + memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, 0xD); + memcpy(buff2, gUnknown_03007890->unk_14[idx].playerName, 8); retVal = TRUE; } else { - *buff1 = (struct UnkLinkRfuStruct_02022B14){}; + memset(buff1, 0, 0xD); memset(buff2, 0, 8); } return retVal; @@ -2195,7 +2199,7 @@ bool8 sub_800DF34(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx) void sub_800DF90(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2) { - *buff1 = gUnknown_02022B14; + memcpy(buff1, &gUnknown_02022B14, 0xD); memcpy(buff2, gUnknown_02022B22, 8); } @@ -2261,7 +2265,7 @@ u8 sub_800E124(void) return 0; } -void sub_800E15C(struct Sprite *sprite, int signalStrengthAnimNum) +void sub_800E15C(struct Sprite *sprite, s32 signalStrengthAnimNum) { if (sprite->data[2] != signalStrengthAnimNum) { @@ -2351,7 +2355,7 @@ void sub_800E378(struct UnkSaveSubstruct_3b98 *dest, u32 trainerId, const u8 *na bool32 sub_800E388(const u8 *name) { - int i; + s32 i; for (i = 0; i < 8; i++) { @@ -2367,10 +2371,10 @@ void sub_800E3A8(void) { if (gWirelessCommType != 0) { - int i; - int j; - int cnt; - int sp0[5]; + s32 i; + s32 j; + s32 cnt; + s32 sp0[5]; struct UnkSaveSubstruct_3b98 *sp14 = calloc(20, sizeof(struct UnkSaveSubstruct_3b98)); for (i = 0; i < GetLinkPlayerCount(); i++) { @@ -2414,7 +2418,7 @@ void sub_800E3A8(void) bool32 sub_800E540(u16 id, u8 *name) { - int i; + s32 i; for (i = 0; i < 20; i++) { @@ -2432,7 +2436,7 @@ bool32 sub_800E540(u16 id, u8 *name) void sub_800E5AC(void) { - int i; + s32 i; for (i = 0; i < 20; i++) { @@ -2441,19 +2445,19 @@ void sub_800E5AC(void) } } -void nullsub_5(void *unused_0, u8 unused_1, u8 unused_2) +void nullsub_5(const char *unused_0, u8 unused_1, u8 unused_2) { // debug? } -void nullsub_13(u8 unused_0, u8 unused_1, u8 unused_2, u8 unused_3) +void nullsub_13(u16 unused_0, u8 unused_1, u8 unused_2, u8 unused_3) { } void sub_800E604(void) { - int i; + s32 i; u8 unk_ee_bak = gUnknown_03005000.unk_ee; CpuFill16(0, &gUnknown_03005000, sizeof gUnknown_03005000); gUnknown_03005000.unk_ee = unk_ee_bak; @@ -2537,17 +2541,17 @@ void sub_800E748(u8 taskId) } } -u8 sub_800E87C(u8 idx) +s32 sub_800E87C(u8 idx) { return gUnknown_082ED6A5[idx]; } -void sub_800E88C(int r2, int r5) +void sub_800E88C(s32 r2, s32 r5) { u8 i; u8 r4 = 1; - int r1 = r2; - int r6 = 0; + s32 r1 = r2; + s32 r6 = 0; if (r5 == -1) { for (i = 0; i < 4; r2 >>= 1, i++) @@ -2738,7 +2742,7 @@ void sub_800ED28(void) void sub_800ED34(u16 unused) { - int i; + s32 i; for (i = 0; i < 14; i++) { @@ -2815,7 +2819,7 @@ bool8 sub_800EE94(void) return FALSE; } -bool8 sub_800EEBC(void) +bool32 sub_800EEBC(void) { if (gUnknown_03005000.unk_04 == 7 && !sub_800C12C(gUnknown_03007890->unk_14[gUnknown_03005000.unk_c3d].unk_00, 240)) { @@ -2880,7 +2884,7 @@ void sub_800EF88(u8 a0) // FIXME: gRecvCmds should be in r6 and r7 void sub_800EFB0(void) { - int i, j; + s32 i, j; for (i = 0; i < 5; i++) { for (j = 0; j < 7; j++) @@ -2942,7 +2946,7 @@ NAKED void sub_800EFB0(void) void sub_800F014(void) { - int i; + s32 i; for (i = 0; i < 7; i++) { gRecvCmds[0][i] = gSendCmd[i]; @@ -2976,8 +2980,8 @@ static void sub_800F048(void) bool32 sub_800F0B8(void) { - int i; - int j; + s32 i; + s32 j; if (gUnknown_03007890->unk_06 == 0) { @@ -3132,7 +3136,7 @@ bool32 sub_800F1E0(void) void sub_800F498(u16 *a0, u8 *a1) { - int i; + s32 i; if (a0[0]) { @@ -3200,7 +3204,7 @@ bool32 sub_800F4F0(void) void sub_800F638(u8 unused, u32 flags) { - int i, j; + s32 i, j; const u8 *r10 = gUnknown_03005000.unk_6c.unk_04; for (i = 0; i < gUnknown_03005000.unk_6c.unk_02; i++) @@ -3405,7 +3409,7 @@ static void sub_800F86C(u8 unused) bool8 sub_800FC60(void) { - int i; + s32 i; for (i = 0; i < 5; i++) { @@ -3417,7 +3421,7 @@ bool8 sub_800FC60(void) bool8 sub_800FC88(void) { - int i; + s32 i; for (i = 0; i < gUnknown_03005000.playerCount; i++) { @@ -3441,7 +3445,7 @@ static void sub_800FCC4(struct UnkRfuStruct_2_Sub_6c *data) u8 sub_800FCD8(void) { u8 flags = 0; - int i; + s32 i; for (i = 0; i < 5; i++) { @@ -3503,7 +3507,7 @@ void sub_800FD14(u16 command) void sub_800FE50(u16 *a0) { - if (gSendCmd[0] == 0 && sub_8011A80() == 0) + if (gSendCmd[0] == 0 && !sub_8011A80()) { memcpy(gUnknown_03005000.unk_f2, a0, sizeof(gUnknown_03005000.unk_f2)); sub_800FD14(0x2f00); @@ -3561,7 +3565,7 @@ static void rfufunc_80F9F44(void) static void sub_800FFB0(void) { - int i; + s32 i; const u8 *src = gUnknown_03005000.unk_6c.unk_04; gSendCmd[0] = 0x8900 | gUnknown_03005000.unk_6c.unk_00; for (i = 0; i < 7; i++) @@ -3578,7 +3582,7 @@ static void rfufunc_80FA020(void) { const u8 *src = gUnknown_03005000.unk_6c.unk_04; u8 mpId = GetMultiplayerId(); - int i; + s32 i; if (gUnknown_03005000.unk_0c == 0) { gSendCmd[0] = (~0x76ff) | (gUnknown_03005000.unk_6c.unk_02 - 1); @@ -3642,9 +3646,9 @@ void sub_8010198(void) void sub_80101CC(void) { - int i; + s32 i; u8 playerCount = gUnknown_03005000.playerCount; - int count = 0; + s32 count = 0; for (i = 0; i < MAX_RFU_PLAYERS; i++) { @@ -3771,7 +3775,7 @@ void sub_8010434(void) bool32 sub_8010454(u32 a0) { - int i; + s32 i; for (i = 0; gUnknown_082ED6E0[i] != a0; i++) { if (gUnknown_082ED6E0[i] == 0xffff) @@ -3821,7 +3825,7 @@ static void sub_8010528(void) bool8 sub_8010540(void) { - int i; + s32 i; bool8 retval = FALSE; for (i = 0; i < 4; i++) { @@ -3852,7 +3856,7 @@ bool8 sub_8010540(void) bool32 sub_80105EC(void) { u8 flags = 0; - int i; + s32 i; for (i = 0; i < 4; i++) { if (gUnknown_03005000.unk_cd5[i] == 11) @@ -3911,7 +3915,7 @@ u32 sub_8010714(u16 a0, const u8 *a1) void sub_8010750(void) { - int i; + s32 i; sub_8010540(); for (i = 0; i < 4; i++) @@ -3925,9 +3929,9 @@ void sub_8010750(void) } } -int sub_80107A0(void) +s32 sub_80107A0(void) { - int retval = 0; + s32 retval = 0; if (gUnknown_03005000.unk_c85 == 8) { if (gUnknown_03007880[gUnknown_03005000.unk_c3e]->unk_0 == 0x26 || gUnknown_03007880[gUnknown_03005000.unk_c3e]->unk_0 == 0x27) @@ -3949,7 +3953,7 @@ int sub_80107A0(void) void sub_801084C(u8 taskId) { - int i; + s32 i; if (gUnknown_03005000.unk_f1 == 1 || gUnknown_03005000.unk_f1 == 2) { @@ -4033,7 +4037,7 @@ void sub_801084C(u8 taskId) void sub_80109E8(u16 a0) { - int i; + s32 i; for (i = 0; i < 4; i++) { @@ -4044,7 +4048,7 @@ void sub_80109E8(u16 a0) void sub_8010A14(const struct UnkRfuStruct_8010A14 *a0) { - int i; + s32 i; gUnknown_03005000.playerCount = a0->unk_0f; for (i = 0; i < 4; i++) gUnknown_03005000.unk_cde[i] = a0->unk_10[i]; @@ -4067,7 +4071,7 @@ void sub_8010A70(void *a0) void sub_8010AAC(u8 taskId) { - int i; + s32 i; struct LinkPlayerBlock *r2; struct UnkRfuStruct_8010A14 *r5; u8 r4 = gUnknown_03005000.unk_cde[gUnknown_082ED68C[gUnknown_03005000.unk_ce9]]; @@ -4246,7 +4250,7 @@ void sub_8010F48(void) void sub_8010F60(void) { - gUnknown_02022B14 = (struct UnkLinkRfuStruct_02022B14){}; + memset(&gUnknown_02022B14, 0, 0xD); sub_800DD94(&gUnknown_02022B14, 0, 0, 0); } @@ -4268,7 +4272,7 @@ void sub_8010FCC(u32 a0, u32 a1, u32 a2) gUnknown_02022B14.unk_0b_1 = a2; } -u8 sub_801100C(int a0) +u8 sub_801100C(s32 a0) { u8 retval = 0x80; retval |= (gLinkPlayers[a0].gender << 3); @@ -4279,7 +4283,7 @@ u8 sub_801100C(int a0) void sub_801103C(void) { struct UnkLinkRfuStruct_02022B14 *r5 = &gUnknown_02022B14; - int i; + s32 i; for (i = 1; i < GetLinkPlayerCount(); i++) r5->unk_04[i - 1] = sub_801100C(i); @@ -4300,10 +4304,10 @@ void sub_8011090(u8 a0, u32 a1, u32 a2) void sub_80110B8(u32 a0) { - int i; + s32 i; u32 r5; u32 r7; - int r8; + s32 r8; if (sub_800F7DC()->unk_0a_0 == 0x45) { @@ -4359,7 +4363,7 @@ void sub_80111FC(void) gUnknown_03005000.unk_00 = sub_80111DC; } -void sub_801120C(u8 a0) +void sub_801120C(u8 a0, u8 unused1) { u8 i; u8 r6 = 0; @@ -4443,3 +4447,710 @@ void sub_801120C(u8 a0) break; } } + +void sub_8011404(u8 a0, u8 unused1) +{ + switch (a0) + { + case 0x00: + gUnknown_03005000.unk_04 = 6; + break; + case 0x20: + gUnknown_03005000.unk_ccd = gUnknown_03004140.unk_14; + break; + case 0x21: + break; + case 0x22: + gUnknown_03005000.unk_c3e = gUnknown_03004140.unk_14; + break; + case 0x23: + sub_8011A64(2, a0); + break; + case 0x24: + gUnknown_03005000.unk_04 = 11; + gUnknown_03005000.unk_c85 = 0; + gUnknown_03005000.unk_c86 = 0; + rfu_setRecvBuffer(0x20, gUnknown_03005000.unk_c3e, &gUnknown_03005000.unk_c86, 1); + rfu_setRecvBuffer(0x10, gUnknown_03005000.unk_c3e, gUnknown_03005000.unk_c3f, 70); + break; + case 0x25: + sub_8011A64(2, 0x25); + break; + case 0x30: + gUnknown_03005000.unk_f0 = 2; + if (gUnknown_03005000.unk_c86 == 6) + break; + case 0x33: + if (gUnknown_03005000.unk_f0 != 2) + gUnknown_03005000.unk_f0 = 4; + if (gUnknown_03005000.unk_c86 != 9) + sub_8011A64(2, a0); + nullsub_5(gUnknown_082ED7FC, 5, 5); + if (gReceivedRemoteLinkPlayers == 1) + sub_8011170(a0); + break; + case 0x31: + gUnknown_03005000.unk_f0 = 1; + nullsub_5(gUnknown_082ED814, 5, 5); + break; + case 0x32: + gUnknown_03005000.unk_f0 = 3; + gUnknown_03005000.unk_c3c = 1; + break; + case 0x34: + break; + case 0x42 ... 0x44: + break; + case 0xF3: + sub_8011A64(1, a0); + sub_8011170(a0); + gUnknown_03005000.unk_ef = 1; + break; + case 0xF0 ... 0xF2: + case 0xFF: + sub_8011A64(1, a0); + sub_8011170(a0); + gUnknown_03005000.unk_cdb = 1; + break; + } +} + +void sub_80115EC(s32 a0) +{ + s32 i; + + for (i = 0; i < 4; i++) + { + if ((a0 >> i) & 1) + { + gUnknown_03005000.unk_cea[i] = 0; + gUnknown_03005000.unk_cee[i] |= 0xFF; + } + } +} + +u8 sub_8011628(s32 a0) +{ + u8 ret = 0; + u8 i; + + for (i = 0; i < 4; i++) + { + if ((a0 >> i) & 1) + { + struct UnkLinkRfuStruct_02022B14 *structPtr = &gUnknown_03007890->unk_14[i].unk_06; + if (structPtr->unk_0a_0 == 0x45) + ret |= (1 << i); + } + } + + return ret; +} + +void sub_8011674(u8 a0, u8 unused1) +{ + u8 r1; + + switch (a0) + { + case 0x00: + gUnknown_03005000.unk_04 = 0x11; + break; + case 0x10: + sub_8011A64(4, 0); + break; + case 0x11: + if (sub_800F7DC()->unk_0a_0 == 0x45 && gUnknown_03005000.unk_cd9 == 0) + { + u8 idx = sub_8011628(gUnknown_03004140.unk_14); + if (idx != 0) + { + r1 = 1 << sub_800E87C(idx); + if (gUnknown_03005000.unk_ce6 == 0 && gUnknown_03005000.unk_ce8 == 0) + { + gUnknown_03005000.unk_ce5 = r1; + gUnknown_03005000.unk_ce6 |= (r1 ^ idx); + gUnknown_03005000.unk_ce8 = 1; + } + else + { + gUnknown_03005000.unk_ce6 |= idx; + } + } + if (idx != gUnknown_03004140.unk_14) + { + gUnknown_03005000.unk_ce3 |= (idx ^ gUnknown_03004140.unk_14); + gUnknown_03005000.unk_ce4 = 2; + } + } + else if (sub_800F7DC()->unk_0a_0 == 0x54) + { + rfu_REQ_disconnect(gUnknown_03004140.unk_00); + rfu_waitREQComplete(); + } + sub_80115EC(gUnknown_03004140.unk_14); + break; + case 0x12: + break; + case 0x13: + break; + case 0x14: + if (sub_800F7DC()->unk_0a_0 != 0x45 && gUnknown_03004140.unk_01 > 1) + { + r1 = 1 << sub_800E87C(gUnknown_03004140.unk_14); + rfu_REQ_disconnect(gUnknown_03004140.unk_00 ^ r1); + rfu_waitREQComplete(); + } + if (gUnknown_03005000.unk_04 == 0xF) + gUnknown_03005000.unk_04 = 0x10; + break; + break; + case 0x20: + gUnknown_03005000.unk_ccd = gUnknown_03004140.unk_14; + break; + case 0x21: + break; + case 0x22: + gUnknown_03005000.unk_c3e = gUnknown_03004140.unk_14; + break; + case 0x23: + gUnknown_03005000.unk_04 = 0x12; + if (gUnknown_03005000.unk_ccf < 2) + { + gUnknown_03005000.unk_ccf++; + CreateTask(sub_801209C, 2); + } + else + { + sub_8011A64(2, a0); + } + break; + case 0x24: + gUnknown_03005000.unk_04 = 0xD; + sub_8011A64(3, 0); + rfu_setRecvBuffer(0x10, gUnknown_03005000.unk_c3e, gUnknown_03005000.unk_c3f, 70); + break; + case 0x25: + sub_8011A64(2, a0); + break; + case 0x31: + if (gUnknown_03004140.unk_00 & gUnknown_03004140.unk_14) + gUnknown_03005000.unk_f0 = 1; + break; + case 0x32: + gUnknown_03005000.unk_f0 = 3; + if (gUnknown_03007890->unk_00 == 0) + gUnknown_03005000.unk_c3c = 1; + break; + case 0x30: + gUnknown_03005000.unk_f0 = 2; + case 0x33: + if (gUnknown_03005000.unk_f0 != 2) + gUnknown_03005000.unk_f0 = 4; + if (gUnknown_03005000.unk_0c == 1) + { + if (gReceivedRemoteLinkPlayers == 1) + { + gUnknown_03005000.unk_ce2 &= ~(gUnknown_03004140.unk_14); + if (gUnknown_03005000.unk_ce2 == 0) + sub_8011170(a0); + else + sub_80111FC(); + } + } + else if (gUnknown_03005000.unk_ce4 != 2 && gReceivedRemoteLinkPlayers == 1) + { + sub_8011170(a0); + sub_800C27C(0); + } + + if (gUnknown_03007890->unk_00 == 0xFF && gUnknown_03004140.unk_07 == 0 && FuncIsActiveTask(sub_800EB44) == TRUE) + gUnknown_03005000.unk_04 = 0x11; + + sub_8011A64(2, a0); + break; + case 0x40: + gUnknown_03005000.unk_ce3 = 0; + break; + case 0x42 ... 0x44: + break; + case 0xF3: + sub_8011A64(1, a0); + sub_8011170(a0); + gUnknown_03005000.unk_ef = 1; + break; + case 0xF0 ... 0xF2: + case 0xFF: + sub_8011170(a0); + sub_8011A64(1, a0); + gUnknown_03005000.unk_cdb = 0; + break; + } +} + +void sub_8011A50(void) +{ + gUnknown_03005000.unk_ce4 = 2; +} + +void sub_8011A64(u8 a0, u16 a1) +{ + gUnknown_03005000.unk_f1 = a0; + gUnknown_03005000.unk_0a = a1; +} + +u8 sub_8011A74(void) +{ + return gUnknown_03005000.unk_f1; +} + +bool32 sub_8011A80(void) +{ + u32 var = sub_8011A74() - 1; + if (var < 2) + return TRUE; + else + return FALSE; +} + +u8 sub_8011A9C(void) +{ + return gUnknown_03005000.unk_ce8; +} + +bool8 Rfu_IsMaster(void) +{ + return gUnknown_03005000.unk_0c; +} + +void RfuVSync(void) +{ + rfu_syncVBlank_(); +} + +void sub_8011AC8(void) +{ + CpuFill32(0, gRecvCmds, sizeof(gRecvCmds)); +} + +void sub_8011AE8(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +void sub_8011AFC(void) +{ + s32 i; + + ResetSpriteData(); + FreeAllSpritePalettes(); + ResetTasks(); + ResetPaletteFade(); + SetVBlankCallback(sub_8011AE8); + if (IsWirelessAdapterConnected()) + { + gLinkType = 0x1111; + sub_800B488(); + OpenLink(); + SeedRng(gMain.vblankCounter2); + for (i = 0; i < 4; i++) + gSaveBlock2Ptr->playerTrainerId[i] = Random() % 256; + + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_1D_MAP); + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); + sub_8011BA4(); + SetMainCallback2(sub_8011BF8); + } +} + +bool32 sub_8011B90(void) +{ + return FuncIsActiveTask(sub_800EB44); +} + +void sub_8011BA4(void) +{ + if (!FuncIsActiveTask(nullsub_89)) + gUnknown_03005000.unk_66 = CreateTask(nullsub_89, 0); +} + +void sub_8011BD0(void) +{ + if (FuncIsActiveTask(nullsub_89) == TRUE) + DestroyTask(gUnknown_03005000.unk_66); +} + +void sub_8011BF8(void) +{ + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); +} + +void sub_8011C10(u32 a0) +{ + gUnknown_03005000.unk_0c = 1; + sub_8010F48(); + sub_800BF4C(sub_801120C, NULL); + gUnknown_02022B2C = gUnknown_082ED608; + gUnknown_02022B2C.unk_02 = gUnknown_082ED620[a0 - 1]; + sub_800EE78(); +} + +void sub_8011C5C(void) +{ + gUnknown_03005000.unk_0c = 0; + sub_8010F48(); + sub_800BF4C(sub_8011404, sub_800ED34); + sub_800EF00(); +} + +void sub_8011C84(void) +{ + gUnknown_03005000.unk_0c = 2; + sub_8010F48(); + sub_800BF4C(sub_8011674, NULL); + gUnknown_02022B2C = gUnknown_082ED608; + gUnknown_02022B2C.unk_11 = 0; + gUnknown_02022B2C.unk_12 = 0x258; + gUnknown_03005000.unk_67 = CreateTask(sub_800EB44, 1); +} + +static u16 ReadU16(const void *ptr) +{ + const u8 *ptr_ = ptr; + return (ptr_[1] << 8) | (ptr_[0]); +} + +u8 sub_8011CE4(const u8 *a0, u16 a1) +{ + u8 i; + u8 ret = 0xFF; + + for (i = 0; i < 4; i++) + { + u16 trainerId = ReadU16(gUnknown_03007890->unk_14[i].unk_06.unk_00.playerTrainerId); + if (sub_8010454(gUnknown_03007890->unk_14[i].unk_04) + && !StringCompare(a0, gUnknown_03007890->unk_14[i].playerName) + && a1 == trainerId) + { + ret = i; + if (gUnknown_03007890->unk_14[i].unk_02 != 0xFF) + break; + } + } + + return ret; +} + +void sub_8011D6C(u32 a0) +{ + rfu_REQ_disconnect(a0); + rfu_waitREQComplete(); + gUnknown_03005000.unk_ce2 &= ~(a0); + rfu_clearSlot(1, gUnknown_03005000.unk_cda); + rfu_UNI_setSendData(gUnknown_03005000.unk_ce2, gUnknown_03005000.unk_c87, 70); + gUnknown_03005000.unk_cda = sub_800E87C(gUnknown_03005000.unk_ce2); +} + +void sub_8011DC0(const u8 *ptr, u16 a1) +{ + u8 var = sub_8011CE4(ptr, a1); + if (var != 0xFF) + sub_8011D6C(1 << var); +} + +void sub_8011DE0(u32 a0) +{ + if (a0 != 0) + { + s32 i; + u8 var = 0; + + for (i = 0; i < 4; i++) + { + if (gUnknown_03005000.unk_cde[i] == a0 && (gUnknown_03005000.unk_ce2 >> i) & 1) + var |= 1 << i; + } + if (var) + sub_8011E94(var, 2); + } +} + +void sub_8011E2C(u8 taskId) +{ + if (gSendCmd[0] == 0 && gUnknown_03005000.unk_ce8 == 0) + { + sub_800FD14(0xED00); + gSendCmd[1] = gTasks[taskId].data[0]; + gSendCmd[2] = gTasks[taskId].data[1]; + gUnknown_03005000.playerCount -= gUnknown_082ED695[gTasks[taskId].data[0]]; + gSendCmd[3] = gUnknown_03005000.playerCount; + DestroyTask(taskId); + } +} + +void sub_8011E94(u32 a0, u32 a1) +{ + u8 taskId = FindTaskIdByFunc(sub_8011E2C); + if (taskId == 0xFF) + { + taskId = CreateTask(sub_8011E2C, 5); + gTasks[taskId].data[0] = a0; + } + else + { + gTasks[taskId].data[0] |= a0; + } + + gTasks[taskId].data[1] = a1; +} + +void sub_8011EF4(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + if (sub_800EE94()) + { + u8 id = sub_8011CE4((u8*)data, ReadU16(&data[8])); + if (id != 0xFF) + { + if (gUnknown_03007890->unk_14[id].unk_02 != 0xFF) + { + gUnknown_03005000.unk_c3d = id; + if (sub_800EEBC()) + DestroyTask(taskId); + } + else if (sub_800F7DC()->unk_0a_0 == 0x15 || sub_800F7DC()->unk_0a_0 == 0x16) + { + data[15]++; + } + else + { + sub_8011A64(2, 0x7000); + DestroyTask(taskId); + } + } + else + { + data[15]++; + gUnknown_03005000.unk_c3d = id; + } + } + else + { + data[15]++; + } + + if (data[15] > 240) + { + sub_8011A64(2, 0x7000); + DestroyTask(taskId); + } +} + +void sub_8011FC8(const u8 *src, u16 trainerId) +{ + u8 taskId; + s16 *data; + + gUnknown_03005000.unk_f1 = 0; + taskId = CreateTask(sub_8011EF4, 3); + data = gTasks[taskId].data; + StringCopy((u8*)(data), src); + data[8] = trainerId; +} + +bool32 sub_801200C(s16 a1, struct UnkLinkRfuStruct_02022B14 *structPtr) +{ + if (sub_800F7DC()->unk_0a_0 == 0x45) + { + if (structPtr->unk_0a_0 != 0x45) + return TRUE; + } + else if (structPtr->unk_0a_0 != 0x40) + { + return TRUE; + } + else if (a1 == 0x44) + { + struct UnkLinkRfuStruct_02022B14 *structPtr2 = &gUnknown_03005000.unk_10A; + if (structPtr2->species == SPECIES_EGG) + { + if (structPtr->species == structPtr2->species) + return FALSE; + else + return TRUE; + } + else if (structPtr->species != structPtr2->species + || structPtr->unk_0b_1 != structPtr2->unk_0b_1 + || structPtr->type != structPtr2->type) + { + return TRUE; + } + } + + return FALSE; +} + +void sub_801209C(u8 taskId) +{ + if (gUnknown_03005000.unk_f1 == 4) + DestroyTask(taskId); + + if (++gTasks[taskId].data[0] > 300) + { + sub_8011A64(2, 0x7000); + DestroyTask(taskId); + } + + if (gUnknown_03005000.unk_ccd != 0 && gUnknown_03004140.unk_06 == 0) + { + u16 trainerId = ReadU16(gUnknown_03005000.unk_10A.unk_00.playerTrainerId); + u8 id = sub_8011CE4(gUnknown_03005000.playerName, trainerId); + if (id != 0xFF) + { + if (!sub_801200C(gTasks[taskId].data[1], &gUnknown_03007890->unk_14[id].unk_06)) + { + if (gUnknown_03007890->unk_14[id].unk_02 != 0xFF && !sub_800C12C(gUnknown_03007890->unk_14[id].unk_00, 0x5A)) + { + gUnknown_03005000.unk_04 = 0xA; + DestroyTask(taskId); + } + } + else + { + sub_8011A64(2, 0x7000); + DestroyTask(taskId); + } + } + } +} + +void sub_8012188(const u8 *name, struct UnkLinkRfuStruct_02022B14 *structPtr, u8 a2) +{ + u8 taskId, taskId2; + + gUnknown_03005000.unk_ccf = 0; + gUnknown_03005000.unk_f1 = 0; + StringCopy(gUnknown_03005000.playerName, name); + memcpy(&gUnknown_03005000.unk_10A, structPtr, 0xD); + sub_800D658(); + taskId = CreateTask(sub_801209C, 2); + gTasks[taskId].data[1] = a2; + taskId2 = FindTaskIdByFunc(sub_800EB44); + if (a2 == 0x45) + { + if (taskId2 != 0xFF) + gTasks[taskId2].data[7] = 1; + } + else + { + if (taskId2 != 0xFF) + gTasks[taskId2].data[7] = 0; + } +} + +bool8 sub_8012224(void) +{ + if (gUnknown_03005000.unk_f0 == 1) + return TRUE; + else + return FALSE; +} + +bool32 sub_8012240(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + { + if ((gUnknown_03004140.unk_00 >> i) & 1 && gUnknown_03005000.unk_cd1[i] == 0) + return FALSE; + } + + return TRUE; +} + +void sub_801227C(void) +{ + s32 i; + + for (i = 0; i < 20; i++) + nullsub_5(gUnknown_082ED82C, 0, i); +} + +void sub_801229C(void) +{ + s32 i, j; + + nullsub_13(GetBlockReceivedStatus(), 0x1C, 0x13, 2); + nullsub_13(gUnknown_03007890->unk_02, 0x14, 1, 1); + nullsub_13(gUnknown_03007890->unk_03, 0x17, 1, 1); + if (gUnknown_03005000.unk_0c == 1) + { + for (i = 0; i < 4; i++) + { + if ((gUnknown_03007890->unk_07 >> i) & 1) + { + nullsub_13(gUnknown_03007890->unk_14[i].unk_04, 1, i + 3, 4); + nullsub_5((void*) &gUnknown_03007890->unk_14[i].unk_06, 6, i + 3); + nullsub_5(gUnknown_03007890->unk_14[i].playerName, 0x16, i + 3); + } + } + for (i = 0; i < 4; i++) + { + for (j = 0; j < 14; j++) + { + nullsub_13(gUnknown_03005000.unk_14[i][j], j * 2, i + 11, 2); + } + } + nullsub_5(gUnknown_082ED868, 1, 0xF); + } + else if (gUnknown_03007890->unk_02 != 0 && gUnknown_03007890->unk_07 != 0) + { + for (i = 0; i < 4; i++) + { + nullsub_13(0, 1, i + 3, 4); + nullsub_5(gUnknown_082ED84B, 6, i + 3); + nullsub_5(gUnknown_082ED85B, 0x16, i + 3); + } + nullsub_13(gUnknown_03007890->unk_14[gUnknown_03005000.unk_c3e].unk_04, 1, 3, 4); + nullsub_5((void*) &gUnknown_03007890->unk_14[gUnknown_03005000.unk_c3e].unk_06, 6, 3); + nullsub_5(gUnknown_03007890->unk_14[gUnknown_03005000.unk_c3e].playerName, 0x16, 3); + } + else + { + for (i = 0; i < gUnknown_03007890->unk_08; i++) + { + if (gUnknown_03007890->unk_14[i].unk_02 != 0xFF) + { + nullsub_13(gUnknown_03007890->unk_14[i].unk_04, 1, i + 3, 4); + nullsub_13(gUnknown_03007890->unk_14[i].unk_00, 6, i + 3, 4); + nullsub_5(gUnknown_03007890->unk_14[i].playerName, 0x16, i + 3); + } + } + for (; i < 4; i++) + { + nullsub_13(0, 1, i + 3, 4); + nullsub_5(gUnknown_082ED84B, 6, i + 3); + nullsub_5(gUnknown_082ED85B, 0x16, i + 3); + } + } +} + +u32 sub_80124C0(void) +{ + return gUnknown_03005000.unk_9e8.unk_232; +} + +u32 sub_80124D4(void) +{ + return gUnknown_03005000.unk_124.unk_8c2; +} diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index b7ca087fd..a197598de 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -39,7 +39,7 @@ extern void HealPlayerParty(void); struct UnkStruct_Shared { struct UnkLinkRfuStruct_02022B14 field_0; - u8 needingPadding[3]; + u8 needingPadding[2]; u8 playerName[PLAYER_NAME_LENGTH + 1]; }; @@ -63,7 +63,7 @@ struct UnkStruct_x20 struct UnkStruct_Main0 { - struct UnkStruct_x20 arr[5]; + struct UnkStruct_x20 arr[8]; }; struct UnkStruct_Main4 @@ -153,9 +153,7 @@ struct UnkStruct_URoom u16 field_4C[6]; u8 field_58[0x98 - 0x58]; u16 field_98; - u16 field_9A; - u16 field_9C; - u16 field_9E; + u16 field_9A[3]; struct UnkStruct_8019BA8 field_A0[8]; }; @@ -182,17 +180,18 @@ struct TradeUnkStruct }; extern struct TradeUnkStruct gUnknown_02022C40; - +extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38; extern union UnkUnion_Main gUnknown_02022C30; - extern u8 gUnknown_02022C2C; extern u8 gUnknown_02022C2D; extern u8 gUnknown_02022C3E; extern u16 gUnknown_02022C3C; -extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38; - +extern u8 gUnknown_02022C20[]; extern u8 gFieldLinkPlayerCount; extern u8 gUnknown_03005DB4; +extern u8 gSelectedOrderFromParty[]; +extern struct MailStruct gUnknown_020321C0[PARTY_SIZE]; +extern u8 gUnknown_02032298[2]; // IWRAM vars IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; @@ -212,7 +211,7 @@ void sub_8014F48(u8 taskId); void sub_80152F4(u8 taskId); void sub_80156E0(u8 taskId); void sub_80175EC(struct UnkStruct_Main4 *arg0, u8 count); -void sub_8017580(struct UnkStruct_Main0 *arg0, u8 count); +void sub_8017580(struct UnkStruct_x20 *arg0, u8 count); u8 sub_8016FC0(struct UnkStruct_Main4 *arg0, u32 arg1); u8 sub_8016FF0(struct UnkStruct_Main4 *arg0, u32 arg1); bool8 PrintOnTextbox(u8 *textState, const u8 *str); @@ -265,7 +264,7 @@ void sub_801689C(struct UnkStruct_URoom *arg0); u8 sub_80181DC(struct UnkStruct_URoom *arg0); bool32 sub_80168DC(struct UnkStruct_URoom *arg0); bool32 sub_801704C(void); -u32 sub_8017CF8(u32 arg1, struct UnkStruct_Main0 *arg0); +s32 sub_8017CF8(s32 arg1, struct UnkStruct_Main0 *arg0); s32 sub_80179D4(struct UnkStruct_Main0 *arg0, u8 arg1, u8 arg2, u32 playerGender); void sub_801818C(bool32 arg0); void sub_801A3D0(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2); @@ -282,7 +281,10 @@ void sub_8019E3C(void); void sub_80173B0(void); s32 sub_8017D04(u32 type, u32 species); void sub_8017020(const u8 *src); -void sub_8019BA8(); +void sub_8019BA8(void *); +s32 sub_8017EA0(u8 *dst, u32 gender, u16 *arg2, struct UnkStruct_URoom *arg3); +void sub_801697C(u8 taskId); +bool8 sub_8017630(struct UnkStruct_Shared* arg0, const struct UnkStruct_Shared* arg1); // const rom data extern const u8 *const gUnknown_082EDB60[][5]; @@ -376,7 +378,9 @@ extern const u8 *const gUnknown_082EE82C[][4]; extern const u8 *const gUnknown_082EE24C[][2]; -extern const struct UnkStruct_Shared gUnknown_082F045C[]; +extern const struct UnkStruct_Shared gUnknown_082F045C; + +extern const u8 *const gUnknown_082F04D8[22]; // code void nullsub_89(void) @@ -484,7 +488,7 @@ void sub_8012780(u8 taskId) data->field_0 = AllocZeroed(0xA0); data->field_8 = AllocZeroed(0xA0); sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 5); + sub_8017580(data->field_0->arr, 5); sub_800DF90(&data->field_0->arr[0].unk.field_0, data->field_0->arr[0].unk.playerName); data->field_0->arr[0].field_18 = 0; data->field_0->arr[0].field_1A_0 = 1; @@ -1008,7 +1012,7 @@ u8 sub_8013398(struct UnkStruct_Main0 *arg0) ret = copiedCount; for (; copiedCount < 5; copiedCount++) { - data->field_0->arr[copiedCount].unk = gUnknown_082F045C[0]; + data->field_0->arr[copiedCount].unk = gUnknown_082F045C; data->field_0->arr[copiedCount].field_18 = 0; data->field_0->arr[copiedCount].field_1A_0 = 0; data->field_0->arr[copiedCount].field_1A_1 = 0; @@ -1068,7 +1072,7 @@ void sub_80134E8(u8 taskId) break; case 2: sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 16); + sub_8017580(data->field_0->arr, 16); data->field_11 = sub_8016FC0(data->field_4, gSpecialVar_0x8004); data->field_C = AddWindow(&gUnknown_082F00BC); data->listWindowId = AddWindow(&gUnknown_082F0174); @@ -1370,7 +1374,7 @@ void sub_8013C7C(u8 taskId) break; case 2: sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 16); + sub_8017580(data->field_0->arr, 16); data->field_11 = sub_8016FC0(data->field_4, 0xFF); data->field_F = 0; data->state = 3; @@ -1395,8 +1399,6 @@ void sub_8013C7C(u8 taskId) } } -extern const u8 *const gUnknown_082F04D8[22]; - bool32 sub_8013D88(u32 arg0, u32 id) { if (id == 0xFF) @@ -1518,9 +1520,6 @@ u8 sub_8013F78(void) return taskId; } -extern struct MailStruct gUnknown_020321C0[PARTY_SIZE]; -extern u8 gUnknown_02032298[2]; - void sub_8013F90(u8 taskId) { u32 monId = sub_8018120(&gUnknown_02022C40, GetMultiplayerId()); @@ -1784,8 +1783,6 @@ void sub_801440C(u8 taskId) ScriptContext2_Disable(); } -extern u8 gSelectedOrderFromParty[]; - void sub_8014790(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -1934,7 +1931,7 @@ void sub_8014A40(u8 taskId) data->field_0 = AllocZeroed(0xA0); data->field_8 = AllocZeroed(0xA0); sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 5); + sub_8017580(data->field_0->arr, 5); sub_800DF90(&data->field_0->arr[0].unk.field_0, data->field_0->arr[0].unk.playerName); data->field_0->arr[0].field_18 = 0; data->field_0->arr[0].field_1A_0 = 1; @@ -2143,7 +2140,7 @@ void sub_8014F48(u8 taskId) break; case 2: sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 16); + sub_8017580(data->field_0->arr, 16); data->field_11 = sub_8016FC0(data->field_4, data->field_12 + 7); winTemplate1 = gUnknown_082F0174; @@ -2312,7 +2309,7 @@ void sub_80152F4(u8 taskId) break; case 2: sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 16); + sub_8017580(data->field_0->arr, 16); data->field_11 = sub_8016FF0(data->field_4, data->field_12 + 7); if (data->field_13 != 0) @@ -2510,13 +2507,11 @@ void sub_80156C8(struct UnkStruct_URoom *data) memcpy(data->field_0, &gDecompressionBuffer[0x3F00], 0x100); } -// Cannot match, please fix later. -/* void sub_80156E0(u8 taskId) { u32 id = 0; s32 var5 = 0; - u32 playerGender = 0; + s32 playerGender = 0; struct UnkStruct_URoom *data = gUnknown_02022C30.uRoom; s16 *taskData = gTasks[taskId].data; @@ -2527,7 +2522,7 @@ void sub_80156E0(u8 taskId) data->field_C = AllocZeroed(0x70); data->field_0 = AllocZeroed(0x100); data->field_8 = AllocZeroed(0x20); - sub_8017580(data->field_0, 8); + sub_8017580(data->field_0->arr, 8); gUnknown_02022C2C = 0x40; data->field_20 = sub_8016DF0(data->field_C, data->field_4, 9); sub_8019BA8(data->field_A0); @@ -2545,7 +2540,7 @@ void sub_80156E0(u8 taskId) sub_800B488(); OpenLink(); sub_8011C84(); - sub_8017580(data->field_8, 1); + sub_8017580(&data->field_8->arr[0], 1); sub_80175EC(data->field_4, 4); sub_80175EC(data->field_C, 4); gSpecialVar_Result = 0; @@ -2679,7 +2674,7 @@ void sub_80156E0(u8 taskId) break; case 1: sub_8012188(data->field_0->arr[taskData[1]].unk.playerName, &data->field_0->arr[taskData[1]].unk.field_0, gUnknown_02022C2C); - data->field_12 = id; + data->field_12 = id; // Should be just 0, but won't match any other way. data->state = 25; break; case 2: @@ -2730,6 +2725,11 @@ void sub_80156E0(u8 taskId) data->state = 2; } break; + case 5: + id = sub_80179AC(&data->field_0->arr[taskData[1]]); + playerGender = sub_8017CF8(taskData[1], data->field_0); + sub_8015664(6, gUnknown_082EE24C[id][playerGender]); + break; case 6: var5 = sub_8017178(&data->textState, &data->field_1B, &data->field_1C, &gUnknown_082F021C, &gUnknown_082F0244); if (var5 != -1) @@ -2742,16 +2742,15 @@ void sub_80156E0(u8 taskId) { data->field_98 = 0; playerGender = sub_8017CF8(taskData[1], data->field_0); - switch (var5) + if (var5 == -2 || var5 == 0x40) { - case -2: - case 0x40: data->field_4C[0] = 0x40; sub_800FE50(data->field_4C); StringCopy(gStringVar4, gUnknown_082EEB80[gLinkPlayers[0].gender]); data->state = 32; - break; - default: + } + else + { gUnknown_02022C2C = var5; gUnknown_02022C2D = (u32)(var5) >> 8; if (gUnknown_02022C2C == 0x41 && !sub_8018024()) @@ -2764,7 +2763,6 @@ void sub_80156E0(u8 taskId) sub_800FE50(data->field_4C); data->state = 27; } - break; } } } @@ -2823,7 +2821,7 @@ void sub_80156E0(u8 taskId) } } break; - case 5: + case 7: id = sub_80179AC(&data->field_0->arr[taskData[1]]); playerGender = sub_8017CF8(taskData[1], data->field_0); @@ -2835,7 +2833,7 @@ void sub_80156E0(u8 taskId) data->state = 41; sub_800ADF8(); data->field_98 = 0; - data->field_9A = 0; + data->field_9A[0] = 0; } break; case 41: @@ -2919,7 +2917,7 @@ void sub_80156E0(u8 taskId) PlaySE(SE_PINPON); sub_800EF7C(); data->state = 12; - data->field_9A = 0; + data->field_9A[0] = 0; break; case 12: if (sub_8011A80()) @@ -3019,7 +3017,7 @@ void sub_80156E0(u8 taskId) gUnknown_02022C2C = 0x40; sub_8015664(0x25, gStringVar4); memset(data->field_4C, 0, sizeof(data->field_4C)); - data->field_9A = 0; + data->field_9A[0] = 0; data->field_98 = 0; } break; @@ -3262,4 +3260,247 @@ void var_800D_set_xB(void) gSpecialVar_Result = 11; } +void sub_801689C(struct UnkStruct_URoom *arg0) +{ + if (gRecvCmds[1][1] != 0 && (gRecvCmds[1][0] & 0xFF00) == 0x2F00) + { + arg0->field_9A[0] = gRecvCmds[1][1]; + if (gRecvCmds[1][1] == 0x44) + { + arg0->field_9A[1] = gRecvCmds[1][2]; + arg0->field_9A[2] = gRecvCmds[1][3]; + } + } +} + +bool32 sub_80168DC(struct UnkStruct_URoom *arg0) +{ + if (arg0->field_9A[0] != 0) + { + s32 var = sub_8017EA0(gStringVar4, gLinkPlayers[1].gender, &arg0->field_9A[0], arg0); + if (var == 0) + { + return TRUE; + } + else if (var == 1) + { + arg0->state = 35; + gUnknown_02022C2C = arg0->field_9A[0]; + return FALSE; + } + else if (var == 2) + { + arg0->state = 36; + sub_800AC34(); + return FALSE; + } + } + + return TRUE; +} + +void sub_8016934(void) +{ + struct UnkStruct_URoom *ptr; + + gUnknown_02022C20[0] = EOS; + CreateTask(sub_801697C, 0); + gUnknown_02022C30.uRoom = gUnknown_02022C30.uRoom; // Needed to match. + gUnknown_02022C30.uRoom = ptr = AllocZeroed(0x26C); + gUnknown_03000DA8 = gUnknown_02022C30.uRoom; + ptr->state = 0; + ptr->textState = 0; + ptr->field_10 = 0; + ptr->field_12 = 0; + gUnknown_02022C20[0] = EOS; +} + +void sub_801697C(u8 taskId) +{ + s32 i; + u8 text[32]; + struct UnkStruct_URoom *structPtr = gUnknown_02022C30.uRoom; + + switch (structPtr->state) + { + case 0: + structPtr->state = 1; + break; + case 1: + sub_8010F84(0xC, 0, 0); + sub_800B488(); + OpenLink(); + sub_8011C84(); + sub_80111B0(1); + structPtr->state = 2; + break; + case 2: + structPtr->field_4 = AllocZeroed(0x70); + sub_80175EC(structPtr->field_4, 4); + structPtr->field_C = AllocZeroed(0x70); + sub_80175EC(structPtr->field_C, 4); + structPtr->field_0 = AllocZeroed(0x100); + sub_8017580(structPtr->field_0->arr, 8); + structPtr->field_8 = AllocZeroed(0x20); + sub_8017580(&structPtr->field_8->arr[0], 1); + structPtr->field_20 = sub_8016DF0(structPtr->field_C, structPtr->field_4, 10); + structPtr->state = 3; + break; + case 3: + switch (sub_8016B00()) + { + case 1: + case 2: + if (gUnknown_02022C20[0] == EOS) + { + for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++) + { + if (structPtr->field_0->arr[i].field_1A_0 == 1) + { + sub_8018404(text, &structPtr->field_0->arr[i]); + if (sub_800E540(ReadAsU16(structPtr->field_0->arr[i].unk.field_0.unk_00.playerTrainerId), text)) + { + StringCopy(gUnknown_02022C20, text); + break; + } + } + } + } + break; + case 3: + break; + } + break; + case 4: + free(structPtr->field_8); + free(structPtr->field_0); + free(structPtr->field_C); + free(structPtr->field_4); + DestroyTask(structPtr->field_20); + free(gUnknown_02022C30.uRoom); + sub_800EDD4(); + DestroyTask(taskId); + break; + } +} + +bool16 sp182_move_string(void) +{ + if (gUnknown_02022C20[0] != EOS) + { + StringCopy(gStringVar1, gUnknown_02022C20); + gUnknown_02022C20[0] = EOS; + return TRUE; + } + else + { + return FALSE; + } +} + +u8 sub_8016B00(void) +{ + s32 i; + u8 j; + struct UnkStruct_URoom *structPtr = gUnknown_02022C30.uRoom; + s32 r7 = 0; + + for (i = 0; i < 4; i++) + { + if (sub_8017630(&structPtr->field_C->arr[i].unk0, &gUnknown_082F045C) == TRUE) + { + structPtr->field_8->arr[0].unk = structPtr->field_C->arr[i].unk0; + structPtr->field_8->arr[0].field_18 = 0; + structPtr->field_8->arr[0].field_1A_0 = 1; + structPtr->field_8->arr[0].field_1B = 1; + return 4; + } + } + for (j = 0; j < 8; j++) + { + if (structPtr->field_0->arr[j].field_1A_0 != 0) + { + i = sub_80176E4(&structPtr->field_0->arr[j], &structPtr->field_4->arr[0]); + if (i != 0xFF) + { + if (structPtr->field_0->arr[j].field_1A_0 == 1) + { + if (sub_8017678(&structPtr->field_0->arr[j], &structPtr->field_4->arr[i])) + { + structPtr->field_0->arr[j].unk = structPtr->field_4->arr[i].unk0; + structPtr->field_0->arr[j].field_1B = 0x40; + r7 = 1; + } + else if (structPtr->field_0->arr[j].field_1B != 0) + { + structPtr->field_0->arr[j].field_1B--; + if (structPtr->field_0->arr[j].field_1B == 0) + r7 = 2; + } + } + else + { + structPtr->field_0->arr[j].field_1A_0 = 1; + structPtr->field_0->arr[j].field_1B = 0; + r7 = 2; + } + structPtr->field_0->arr[j].field_18 = 0; + } + else if (structPtr->field_0->arr[j].field_1A_0 != 2) + { + structPtr->field_0->arr[j].field_18++; + if (structPtr->field_0->arr[j].field_18 >= 600) + { + structPtr->field_0->arr[j].field_1A_0 = 2; + r7 = 2; + } + } + else if (structPtr->field_0->arr[j].field_1A_0 == 2) + { + structPtr->field_0->arr[j].field_18++; + if (structPtr->field_0->arr[j].field_18 >= 900) + { + sub_8017580(&structPtr->field_0->arr[j], 1); + } + } + } + } + for (i = 0; i < 4; i++) + { + if (sub_8017734(&structPtr->field_0->arr[0], &structPtr->field_4->arr[i].unk0, 8) != 0xFF) + r7 = 1; + } + + return r7; +} + +/* +void sub_8016CA0(u8 taskId) +{ + s32 i, j; + struct UnkLinkRfuStruct_02022B14 sp0; + u8 text[10]; + struct UnkStruct_Main4 *ptr = (void*) gTasks[taskId].data; + + for (i = 0; i < 4; i++) + { + j = sub_800DE7C(&sp0, text, i); + if (!sub_8013D88(sp0.unk_0a_0, gTasks[taskId].data[4])) + sp0 = gUnknown_082F045C.field_0; + if (sp0.unk_00.unk_00_0 == 1) + sp0 = gUnknown_082F045C.field_0; + + if (!j) + { + for (j = 0; j < i; j++) + { + if (sub_8017630()) + } + } + else + { + + } + } +} */ |