Initial Netcode work

config/RMCP01/module/splits.txt

@@ -164,6 +164,23 @@ ui/SectionAutogens.cpp:
 SectionDirector.o:
 	.text       start:0x001247CC end:0x00125B04
 
+net/NetManager.cpp:
+	.text       start:0x00145770 end:0x00149E98
+	.data       start:0x0000DD90 end:0x0000DDC8
+	.bss        start:0x000049F8 end:0x00004A00
+
+net/packets/ROOM.cpp:
+	.text       start:0x0014A6D4 end:0x0014AFA0
+	.bss        start:0x00004A00 end:0x00004A10
+
+net/packets/USER.cpp:
+	.text       start:0x001523C4 end:0x00152DE0
+	.bss        start:0x00004A28 end:0x00004A30
+
+net/packets/RACEHEADER1.cpp:
+	.text       start:0x001536F0 end:0x00155184
+	.bss        start:0x00004A38 end:0x00004A40
+
 ObjKoopaFigure64.o:
 	.text       start:0x001CA560 end:0x001CADD0
 

config/RMCP01/module/symbols.txt

@@ -7184,33 +7184,33 @@ fn_1_145768 = .text:0x00145768; // type:function size:0x8
 RKNetController_initStaticInstance = .text:0x00145770; // type:function size:0x88 scope:global align:4
 fn_1_1457F8 = .text:0x001457F8; // type:function size:0x64
 fn_1_14585C = .text:0x0014585C; // type:function size:0x598
-fn_1_145DF4 = .text:0x00145DF4; // type:function size:0xC
-fn_1_145E00 = .text:0x00145E00; // type:function size:0xBC
-fn_1_145EBC = .text:0x00145EBC; // type:function size:0xBC
-fn_1_145F78 = .text:0x00145F78; // type:function size:0xBC
-fn_1_146034 = .text:0x00146034; // type:function size:0xBC
+scheduleShutdown__Q23Net10NetManagerFv = .text:0x00145DF4; // type:function size:0xC
+startWWVSSearch__Q23Net10NetManagerFUc = .text:0x00145E00; // type:function size:0xBC
+startRegionalVSSearch__Q23Net10NetManagerFUc = .text:0x00145EBC; // type:function size:0xBC
+startWWBattleSearch__Q23Net10NetManagerFUc = .text:0x00145F78; // type:function size:0xBC
+startRegionalBattleSearch__Q23Net10NetManagerFUc = .text:0x00146034; // type:function size:0xBC
 fn_1_1460F0 = .text:0x001460F0; // type:function size:0x130
 fn_1_146220 = .text:0x00146220; // type:function size:0x130
-fn_1_146350 = .text:0x00146350; // type:function size:0xD4
-fn_1_146424 = .text:0x00146424; // type:function size:0xC0
-fn_1_1464E4 = .text:0x001464E4; // type:function size:0x58
-fn_1_14653C = .text:0x0014653C; // type:function size:0x18
-fn_1_146554 = .text:0x00146554; // type:function size:0x18
-fn_1_14656C = .text:0x0014656C; // type:function size:0x94
-fn_1_146600 = .text:0x00146600; // type:function size:0x7C
-fn_1_14667C = .text:0x0014667C; // type:function size:0x5C
-fn_1_1466D8 = .text:0x001466D8; // type:function size:0x60
+joinFriendRoom__Q23Net10NetManagerFUlUc = .text:0x00146350; // type:function size:0xD4
+createFriendRoom__Q23Net10NetManagerFUc = .text:0x00146424; // type:function size:0xC0
+resetRH1andROOM__Q23Net10NetManagerFv = .text:0x001464E4; // type:function size:0x58
+setToMMSuspensionUnk2__Q23Net10NetManagerFv = .text:0x0014653C; // type:function size:0x18
+setToMMSuspensionUnk3__Q23Net10NetManagerFv = .text:0x00146554; // type:function size:0x18
+setDisconnectInfo__Q23Net10NetManagerFQ23Net14DisconnectTypel = .text:0x0014656C; // type:function size:0x94
+getDisconnectInfo__Q23Net10NetManagerFv = .text:0x00146600; // type:function size:0x7C
+resetDisconnectInfo__Q23Net10NetManagerFv = .text:0x0014667C; // type:function size:0x5C
+getTimeDiff__Q23Net10NetManagerFv = .text:0x001466D8; // type:function size:0x60
 fn_1_146738 = .text:0x00146738; // type:function size:0x58
 fn_1_146790 = .text:0x00146790; // type:function size:0x28
 fn_1_1467B8 = .text:0x001467B8; // type:function size:0x134
 fn_1_1468EC = .text:0x001468EC; // type:function size:0xCC
 fn_1_1469B8 = .text:0x001469B8; // type:function size:0x30
-fn_1_1469E8 = .text:0x001469E8; // type:function size:0xA8
-fn_1_146A90 = .text:0x00146A90; // type:function size:0x2C
-fn_1_146ABC = .text:0x00146ABC; // type:function size:0x90
-fn_1_146B4C = .text:0x00146B4C; // type:function size:0x40
+isConnectionStateIdleOrInMM__Q23Net10NetManagerFv = .text:0x001469E8; // type:function size:0xA8
+isTaskExist__Q23Net10NetManagerFv = .text:0x00146A90; // type:function size:0x2C
+isConnectionStateIdle__Q23Net10NetManagerFv = .text:0x00146ABC; // type:function size:0x90
+hasFoundMatch__Q23Net10NetManagerFv = .text:0x00146B4C; // type:function size:0x40
 fn_1_146B8C = .text:0x00146B8C; // type:function size:0xB8
-fn_1_146C44 = .text:0x00146C44; // type:function size:0xC
+setConnectionStateIdle__Q23Net10NetManagerFv = .text:0x00146C44; // type:function size:0xC
 RKNetController_construct = .text:0x00146C50; // type:function size:0x3D8 scope:global align:4
 fn_1_147028 = .text:0x00147028; // type:function size:0x40
 fn_1_147068 = .text:0x00147068; // type:function size:0xE4
@@ -7221,15 +7221,15 @@ fn_1_1476FC = .text:0x001476FC; // type:function size:0x380
 RKNetController_trySendNextRACEPacket = .text:0x00147A7C; // type:function size:0x1B4 scope:global align:4
 fn_1_147C30 = .text:0x00147C30; // type:function size:0xE0
 fn_1_147D10 = .text:0x00147D10; // type:function size:0x7C
-fn_1_147D8C = .text:0x00147D8C; // type:function size:0x8
-fn_1_147D94 = .text:0x00147D94; // type:function size:0x84
+setConnectionState__Q23Net10NetManagerFQ33Net10NetManager15ConnectionState = .text:0x00147D8C; // type:function size:0x8
+getConnectionState__Q23Net10NetManagerFv = .text:0x00147D94; // type:function size:0x84
 RKNetController_handleError = .text:0x00147E18; // type:function size:0x160 scope:global align:4
-fn_1_147F78 = .text:0x00147F78; // type:function size:0x88
-fn_1_148000 = .text:0x00148000; // type:function size:0x64
-fn_1_148064 = .text:0x00148064; // type:function size:0x80
-fn_1_1480E4 = .text:0x001480E4; // type:function size:0x68
-fn_1_14814C = .text:0x0014814C; // type:function size:0x8C
-fn_1_1481D8 = .text:0x001481D8; // type:function size:0x68
+alloc__Q23Net10NetManagerFUll = .text:0x00147F78; // type:function size:0x88
+free__Q23Net10NetManagerFPv = .text:0x00148000; // type:function size:0x64
+SOAlloc__Q23Net10NetManagerFUlUl = .text:0x00148064; // type:function size:0x80
+SOFree__Q23Net10NetManagerFUlPv = .text:0x001480E4; // type:function size:0x68
+DWCAlloc__Q23Net10NetManagerFUlUll = .text:0x0014814C; // type:function size:0x8C
+DWCFree__Q23Net10NetManagerFUlPv = .text:0x001481D8; // type:function size:0x68
 fn_1_148240 = .text:0x00148240; // type:function size:0x20
 fn_1_148260 = .text:0x00148260; // type:function size:0x104
 fn_1_148364 = .text:0x00148364; // type:function size:0x50
@@ -7243,7 +7243,7 @@ fn_1_148568 = .text:0x00148568; // type:function size:0xC
 fn_1_148574 = .text:0x00148574; // type:function size:0x68
 fn_1_1485DC = .text:0x001485DC; // type:function size:0x20C
 NetManager_connect = .text:0x001487E8; // type:function size:0x1A0 scope:global align:4
-fn_1_148988 = .text:0x00148988; // type:function size:0xA4
+initMMInfos__Q23Net10NetManagerFv = .text:0x00148988; // type:function size:0xA4
 fn_1_148A2C = .text:0x00148A2C; // type:function size:0x1A0
 fn_1_148BCC = .text:0x00148BCC; // type:function size:0xC4
 fn_1_148C90 = .text:0x00148C90; // type:function size:0x12C
@@ -7275,8 +7275,8 @@ fn_1_14A520 = .text:0x0014A520; // type:function size:0xA0
 fn_1_14A5C0 = .text:0x0014A5C0; // type:function size:0x114
 fn_1_14A6D4 = .text:0x0014A6D4; // type:function size:0xC4
 fn_1_14A798 = .text:0x0014A798; // type:function size:0x40
-fn_1_14A7D8 = .text:0x0014A7D8; // type:function size:0x108
-fn_1_14A8E0 = .text:0x0014A8E0; // type:function size:0x84
+init__Q23Net11ROOMHandlerFQ23Net8RoomRole = .text:0x0014A7D8; // type:function size:0x108
+reset__Q23Net11ROOMHandlerFv = .text:0x0014A8E0; // type:function size:0x84
 fn_1_14A964 = .text:0x0014A964; // type:function size:0x158
 fn_1_14AABC = .text:0x0014AABC; // type:function size:0xF4
 fn_1_14ABB0 = .text:0x0014ABB0; // type:function size:0x10
@@ -7406,7 +7406,7 @@ fn_1_1523C4 = .text:0x001523C4; // type:function size:0x80
 fn_1_152444 = .text:0x00152444; // type:function size:0x54
 fn_1_152498 = .text:0x00152498; // type:function size:0xF8
 fn_1_152590 = .text:0x00152590; // type:function size:0x7C
-fn_1_15260C = .text:0x0015260C; // type:function size:0xFC
+update__Q23Net11USERHandlerFv = .text:0x0015260C; // type:function size:0xFC
 fn_1_152708 = .text:0x00152708; // type:function size:0x40
 fn_1_152748 = .text:0x00152748; // type:function size:0x4
 fn_1_15274C = .text:0x0015274C; // type:function size:0xEC
@@ -7443,8 +7443,8 @@ fn_1_15358C = .text:0x0015358C; // type:function size:0x60
 fn_1_1535EC = .text:0x001535EC; // type:function size:0x104
 fn_1_1536F0 = .text:0x001536F0; // type:function size:0x194
 fn_1_153884 = .text:0x00153884; // type:function size:0x44
-fn_1_1538C8 = .text:0x001538C8; // type:function size:0xC
-fn_1_1538D4 = .text:0x001538D4; // type:function size:0x14C
+setPrepared__Q23Net18RACEHEADER1HandlerFv = .text:0x001538C8; // type:function size:0xC
+reset__Q23Net18RACEHEADER1HandlerFv = .text:0x001538D4; // type:function size:0x14C
 fn_1_153A20 = .text:0x00153A20; // type:function size:0x338
 fn_1_153D58 = .text:0x00153D58; // type:function size:0xA4
 fn_1_153DFC = .text:0x00153DFC; // type:function size:0x210
@@ -24514,15 +24514,15 @@ lbl_1_bss_4868 = .bss:0x00004868; // type:object size:0x8
 lbl_1_bss_4870 = .bss:0x00004870; // type:object size:0x8 data:4byte
 lbl_1_bss_4878 = .bss:0x00004878; // type:object size:0x80 data:4byte
 lbl_1_bss_48F8 = .bss:0x000048F8; // type:object size:0x100
-lbl_1_bss_49F8 = .bss:0x000049F8; // type:object size:0x8 data:4byte
-lbl_1_bss_4A00 = .bss:0x00004A00; // type:object size:0x8 data:4byte
+spInstance__Q23Net10NetManager = .bss:0x000049F8; // type:object size:0x8 data:4byte
+spInstance__Q23Net11ROOMHandler = .bss:0x00004A00; // type:object size:0x8 data:4byte
 lbl_1_bss_4A08 = .bss:0x00004A08; // type:object size:0x8 data:4byte
 lbl_1_bss_4A10 = .bss:0x00004A10; // type:object size:0x8 data:4byte
 lbl_1_bss_4A18 = .bss:0x00004A18; // type:object size:0x8 data:4byte
 lbl_1_bss_4A20 = .bss:0x00004A20; // type:object size:0x8 data:4byte
-lbl_1_bss_4A28 = .bss:0x00004A28; // type:object size:0x8 data:4byte
+spInstance__Q23Net11USERHandler = .bss:0x00004A28; // type:object size:0x8 data:4byte
 lbl_1_bss_4A30 = .bss:0x00004A30; // type:object size:0x8 data:4byte
-lbl_1_bss_4A38 = .bss:0x00004A38; // type:object size:0x8 data:4byte
+spInstance__Q23Net18RACEHEADER1Handler = .bss:0x00004A38; // type:object size:0x8 data:4byte
 lbl_1_bss_4A40 = .bss:0x00004A40; // type:object size:0x4 data:4byte
 lbl_1_bss_4A44 = .bss:0x00004A44; // type:object size:0x4
 lbl_1_bss_4A48 = .bss:0x00004A48; // type:object size:0x8

configure.py

@@ -792,6 +792,11 @@ def MatchingFor(*versions):
 
             Object(Matching, "geo/BoxColManager.cpp"),
             Object(Matching, "geo/BoxColUnit.cpp"),
+
+            Object(NonMatching, "net/NetManager.cpp"),
+            Object(NonMatching, "net/packets/USER.cpp"),
+            Object(NonMatching, "net/packets/RACEHEADER1.cpp"),
+            Object(NonMatching, "net/packets/ROOM.cpp"),
         ],
     },
     {

lib/dwc/common/dwc_error.c

@@ -17,7 +17,7 @@ int DWC_GetLastError(int* errorCode) {
   return stDwcLastError;
 }
 
-int DWC_GetLastErrorEx(int* errorCode, int* errorType) {
+s32 DWC_GetLastErrorEx(s32* errorCode, u32* errorType) {
   if (errorCode)
     *errorCode = stDwcErrorCode;
   if (errorType) {

lib/dwc/common/dwc_error.h

@@ -1,11 +1,13 @@
 #pragma once
 
+#include <rk_types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 int DWC_GetLastError(int* errorCode);
-int DWC_GetLastErrorEx(int* errorCode, int* errorType);
+s32 DWC_GetLastErrorEx(s32* errorCode, u32* errorType);
 void DWC_ClearError();
 
 #ifdef __cplusplus

src/net/DisconnectInfo.hpp

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <rk_types.h>
+
+namespace Net {
+
+// Each value yields a different error screen
+enum DisconnectType {
+  DISCONNECT_TYPE_NONE = 0x0,
+  DISCONNECT_TYPE_ERROR_CODE = 0x1, // standard error code screen
+  DISCONNECT_TYPE_BAD_MII_NAME = 0x2,
+  DISCONNECT_TYPE_CANT_JOIN_FRIEND = 0x3,    // sends user back to friend roster
+  DISCONNECT_TYPE_DISK_EJECTED = 0x4,        // user ejected disk during login
+  DISCONNECT_TYPE_UNRECOVERABLE_ERROR = 0x5, // informs user to reboot
+};
+
+struct DisconnectInfo {
+  DisconnectType type;
+  s32 code;
+
+  // reset() 805e3f4c
+};
+
+} // namespace Net