diff --git a/subprojects/gamespy/libraries/chat/asm/chathandlers.s b/subprojects/gamespy/libraries/chat/asm/chathandlers.s index 98f6096c2d..3229c6bc3b 100644 --- a/subprojects/gamespy/libraries/chat/asm/chathandlers.s +++ b/subprojects/gamespy/libraries/chat/asm/chathandlers.s @@ -6931,8 +6931,8 @@ Unk_ov66_02259C98: ; 0x02259C98 Unk_ov66_02259C9C: ; 0x02259C9C .incbin "incbin/overlay66_data.bin", 0xF7C, 0xF80 - 0xF7C - .global Unk_ov66_02259CA0 -Unk_ov66_02259CA0: ; 0x02259CA0 + .global numServerMessageTypes +numServerMessageTypes: ; 0x02259CA0 .incbin "incbin/overlay66_data.bin", 0xF80, 0xF84 - 0xF80 .global Unk_ov66_02259CA4 @@ -7347,8 +7347,8 @@ Unk_ov66_0225A2D0: ; 0x0225A2D0 Unk_ov66_0225A2F0: ; 0x0225A2F0 .incbin "incbin/overlay66_data.bin", 0x15D0, 0x15F0 - 0x15D0 - .global Unk_ov66_0225A310 -Unk_ov66_0225A310: ; 0x0225A310 + .global serverMessageTypes +serverMessageTypes: ; 0x0225A310 .incbin "incbin/overlay66_data.bin", 0x15F0, 0x17A0 - 0x15F0 .global Unk_ov66_0225A4C0 diff --git a/subprojects/gamespy/libraries/chat/asm/chatmain.s b/subprojects/gamespy/libraries/chat/asm/chatmain.s index b4a95d98ab..9509d39f83 100644 --- a/subprojects/gamespy/libraries/chat/asm/chatmain.s +++ b/subprojects/gamespy/libraries/chat/asm/chatmain.s @@ -3,8 +3,8 @@ - .extern Unk_ov66_02259CA0 - .extern Unk_ov66_0225A310 + .extern numServerMessageTypes + .extern serverMessageTypes .text @@ -54,8 +54,8 @@ _0225353C: _02253544: .word Unk_ov66_0225AA84 _02253548: .word Unk_ov66_0225AA94 _0225354C: .word Unk_ov66_0225AA24 -_02253550: .word Unk_ov66_02259CA0 -_02253554: .word Unk_ov66_0225A310 +_02253550: .word numServerMessageTypes +_02253554: .word serverMessageTypes _02253558: .word 0x0225A314 arm_func_end ciProcessServerMessage @@ -948,7 +948,7 @@ _022541B0: .word Unk_ov66_0225AC84 _022541B4: .word 0x00000191 _022541B8: .word Unk_ov66_0225AC9C _022541BC: .word 0x000008B4 -_022541C0: .word Unk_ov66_0225A89C +_022541C0: .word ciVersionID _022541C4: .word Unk_ov66_0225ACB8 _022541C8: .word Unk_ov66_0225ACC8 arm_func_end chatConnectDoit @@ -2772,8 +2772,8 @@ _02255AD8: .word 0x00000BC9 .data - .global Unk_ov66_0225A89C -Unk_ov66_0225A89C: ; 0x0225A89C + .global ciVersionID +ciVersionID: ; 0x0225A89C .incbin "incbin/overlay66_data.bin", 0x1B7C, 0x1B80 - 0x1B7C .global Unk_ov66_0225A8A0 diff --git a/subprojects/gamespy/libraries/common/asm/available.s b/subprojects/gamespy/libraries/common/asm/available.s index 5b01d6d40d..7ad6b93b86 100644 --- a/subprojects/gamespy/libraries/common/asm/available.s +++ b/subprojects/gamespy/libraries/common/asm/available.s @@ -59,7 +59,7 @@ SendPacket: ; 0x021E96B0 ldmia sp!, {r3, pc} ; .align 2, 0 _021E96F4: .word 0x0221AE58 -_021E96F8: .word Unk_ov4_0221AE50 +_021E96F8: .word __GSIACResult _021E96FC: .word 0x0221AE60 arm_func_end SendPacket @@ -123,8 +123,8 @@ _021E9748: ldmia sp!, {r3, r4, r5, pc} ; .align 2, 0 _021E97DC: .word 0x0221AEEC -_021E97E0: .word Unk_ov4_0221AE50 -_021E97E4: .word Unk_ov4_0221AEAC +_021E97E0: .word __GSIACResult +_021E97E4: .word GSIACHostname _021E97E8: .word Unk_ov4_022176A4 _021E97EC: .word 0x00006CFC _021E97F0: .word 0x0221AE58 @@ -178,7 +178,7 @@ HandlePacket: ; 0x021E97F8 ldmia sp!, {r4, r5, r6, pc} ; .align 2, 0 _021E98A4: .word 0x0221AE5C -_021E98A8: .word Unk_ov4_0221AE50 +_021E98A8: .word __GSIACResult _021E98AC: .word Unk_ov4_022176C8 arm_func_end HandlePacket @@ -268,7 +268,7 @@ _021E99DC: add sp, sp, #0x58 ldmia sp!, {r3, pc} ; .align 2, 0 -_021E99E8: .word Unk_ov4_0221AE50 +_021E99E8: .word __GSIACResult arm_func_end GSIAvailableCheckThink .data @@ -288,19 +288,19 @@ Unk_ov4_022176C8: ; 0x022176C8 .bss - .global Unk_ov4_0221AE50 -Unk_ov4_0221AE50: ; 0x0221AE50 + .global __GSIACResult +__GSIACResult: ; 0x0221AE50 .space 0x4 .global Unk_ov4_0221AE54 Unk_ov4_0221AE54: ; 0x0221AE54 .space 0x58 - .global Unk_ov4_0221AEAC -Unk_ov4_0221AEAC: ; 0x0221AEAC + .global GSIACHostname +GSIACHostname: ; 0x0221AEAC .space 0x40 - .global Unk_ov4_0221AEEC -Unk_ov4_0221AEEC: ; 0x0221AEEC + .global __GSIACGamename +__GSIACGamename: ; 0x0221AEEC .space 0x40 diff --git a/subprojects/gamespy/libraries/common/asm/nonport.s b/subprojects/gamespy/libraries/common/asm/nonport.s index 7df2752e4b..fceb405f67 100644 --- a/subprojects/gamespy/libraries/common/asm/nonport.s +++ b/subprojects/gamespy/libraries/common/asm/nonport.s @@ -678,7 +678,7 @@ longrand: ; 0x021EAFF8 str r0, [r1, #0] ldmia sp!, {r3, pc} ; .align 2, 0 -_021EB014: .word Unk_ov4_022178D8 +_021EB014: .word randomnum arm_func_end longrand arm_func_start Util_RandSeed @@ -690,7 +690,7 @@ Util_RandSeed: ; 0x021EB018 str r1, [r0, #0] bx lr ; .align 2, 0 -_021EB030: .word Unk_ov4_022178D8 +_021EB030: .word randomnum arm_func_end Util_RandSeed arm_func_start Util_RandInt @@ -838,25 +838,25 @@ _021EB20C: bhi _021EB1A8 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} ; .align 2, 0 -_021EB218: .word Unk_ov4_02215980 -_021EB21C: .word Unk_ov4_02215984 -_021EB220: .word Unk_ov4_02215988 +_021EB218: .word alternateEncoding +_021EB21C: .word urlSafeEncodeing +_021EB220: .word defaultEncoding _021EB224: .word 0x55555556 arm_func_end B64Encode .rodata - .global Unk_ov4_02215980 -Unk_ov4_02215980: ; 0x02215980 + .global alternateEncoding +alternateEncoding: ; 0x02215980 .asciz "[]_" - .global Unk_ov4_02215984 -Unk_ov4_02215984: ; 0x02215984 + .global urlSafeEncodeing +urlSafeEncodeing: ; 0x02215984 .asciz "-_=" - .global Unk_ov4_02215988 -Unk_ov4_02215988: ; 0x02215988 + .global defaultEncoding +defaultEncoding: ; 0x02215988 .asciz "+/=" @@ -864,8 +864,8 @@ Unk_ov4_02215988: ; 0x02215988 .data - .global Unk_ov4_022178D8 -Unk_ov4_022178D8: ; 0x022178D8 + .global randomnum +randomnum: ; 0x022178D8 .word 0x1 .global Unk_ov4_022178DC @@ -901,8 +901,8 @@ Unk_ov4_02217920: ; 0x02217920 Unk_ov4_0221AF2C: ; 0x0221AF2C .space 0x4 - .global Unk_ov4_0221AF30 -Unk_ov4_0221AF30: ; 0x0221AF30 + .global GSINitroErrno +GSINitroErrno: ; 0x0221AF30 .space 0x4 .global Unk_ov4_0221AF34 diff --git a/subprojects/gamespy/libraries/ghttp/asm/ghttpcommon.s b/subprojects/gamespy/libraries/ghttp/asm/ghttpcommon.s index b010dd14f7..3c130f270f 100644 --- a/subprojects/gamespy/libraries/ghttp/asm/ghttpcommon.s +++ b/subprojects/gamespy/libraries/ghttp/asm/ghttpcommon.s @@ -252,7 +252,7 @@ _02220B6C: movle r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} ; .align 2, 0 -_02220B8C: .word Unk_ov60_0222911C +_02220B8C: .word ghiThrottleTimeDelay arm_func_end ghiDoReceive arm_func_start ghiDoSend @@ -324,12 +324,12 @@ _02220C50: .data - .global Unk_ov60_0222911C -Unk_ov60_0222911C: ; 0x0222911C + .global ghiThrottleTimeDelay +ghiThrottleTimeDelay: ; 0x0222911C .incbin "incbin/overlay60_data.bin", 0x2DC, 0x2E0 - 0x2DC - .global Unk_ov60_02229120 -Unk_ov60_02229120: ; 0x02229120 + .global ghiThrottleBufferSize +ghiThrottleBufferSize: ; 0x02229120 .incbin "incbin/overlay60_data.bin", 0x2E0, 0x4 diff --git a/subprojects/gamespy/libraries/ghttp/asm/ghttpconnection.s b/subprojects/gamespy/libraries/ghttp/asm/ghttpconnection.s index 91a80926cf..e4b56cfa14 100644 --- a/subprojects/gamespy/libraries/ghttp/asm/ghttpconnection.s +++ b/subprojects/gamespy/libraries/ghttp/asm/ghttpconnection.s @@ -296,7 +296,7 @@ _02221074: ldr r0, [r4, #0x13c] cmp r0, #0 beq _0222109C - bl ov60_02221900 + bl ghiIsPostAutoFree cmp r0, #0 beq _0222109C ldr r0, [r4, #0x13c] diff --git a/subprojects/gamespy/libraries/ghttp/asm/ghttpmain.s b/subprojects/gamespy/libraries/ghttp/asm/ghttpmain.s index 6258bb2a1b..705cceca3f 100644 --- a/subprojects/gamespy/libraries/ghttp/asm/ghttpmain.s +++ b/subprojects/gamespy/libraries/ghttp/asm/ghttpmain.s @@ -3,8 +3,8 @@ .extern Unk_ov60_02229E28 - .extern Unk_ov60_0222911C - .extern Unk_ov60_02229120 + .extern ghiThrottleTimeDelay + .extern ghiThrottleBufferSize .text @@ -200,8 +200,8 @@ _022215F4: ldmia sp!, {r3, pc} ; .align 2, 0 _022215FC: .word Unk_ov60_02229E3C -_02221600: .word Unk_ov60_0222911C -_02221604: .word Unk_ov60_02229120 +_02221600: .word ghiThrottleTimeDelay +_02221604: .word ghiThrottleBufferSize arm_func_end ghttpStartup arm_func_start ghttpCleanup diff --git a/subprojects/gamespy/libraries/ghttp/asm/ghttppost.s b/subprojects/gamespy/libraries/ghttp/asm/ghttppost.s index ea802ae46a..c66a13089d 100644 --- a/subprojects/gamespy/libraries/ghttp/asm/ghttppost.s +++ b/subprojects/gamespy/libraries/ghttp/asm/ghttppost.s @@ -6,11 +6,11 @@ .text - arm_func_start ov60_02221900 -ov60_02221900: ; 0x02221900 + arm_func_start ghiIsPostAutoFree +ghiIsPostAutoFree: ; 0x02221900 ldr r0, [r0, #0x10] bx lr - arm_func_end ov60_02221900 + arm_func_end ghiIsPostAutoFree arm_func_start ghiFreePost ghiFreePost: ; 0x02221908 diff --git a/subprojects/gamespy/libraries/ghttp/asm/ghttpprocess.s b/subprojects/gamespy/libraries/ghttp/asm/ghttpprocess.s index faab854213..2c4fc3f7d9 100644 --- a/subprojects/gamespy/libraries/ghttp/asm/ghttpprocess.s +++ b/subprojects/gamespy/libraries/ghttp/asm/ghttpprocess.s @@ -4,7 +4,7 @@ .extern Unk_ov60_02229E28 .extern Unk_ov60_02229E24 - .extern Unk_ov60_02229120 + .extern ghiThrottleBufferSize .text @@ -346,7 +346,7 @@ _02222C88: add sp, sp, #0x10 ldmia sp!, {r4, pc} ; .align 2, 0 -_02222CB8: .word Unk_ov60_02229120 +_02222CB8: .word ghiThrottleBufferSize _02222CBC: .word Unk_ov60_02229E28 _02222CC0: .word Unk_ov60_02229E24 arm_func_end ghiDoConnecting diff --git a/subprojects/gamespy/libraries/ghttp/asm/include/ghttpconnection.inc b/subprojects/gamespy/libraries/ghttp/asm/include/ghttpconnection.inc index b01d18a477..5ec299f874 100644 --- a/subprojects/gamespy/libraries/ghttp/asm/include/ghttpconnection.inc +++ b/subprojects/gamespy/libraries/ghttp/asm/include/ghttpconnection.inc @@ -13,6 +13,6 @@ .public ghiFindFreeSlot .public ghiFreeConnection .public ghiEnumConnections -.public ov60_02221900 +.public ghiIsPostAutoFree .public ghiFreePost .public ghiPostCleanupState diff --git a/subprojects/gamespy/libraries/gp/asm/gp.s b/subprojects/gamespy/libraries/gp/asm/gp.s index 8e75776573..75f4dbacf0 100644 --- a/subprojects/gamespy/libraries/gp/asm/gp.s +++ b/subprojects/gamespy/libraries/gp/asm/gp.s @@ -1,7 +1,7 @@ .include "macros/function.inc" .include "include/gp.inc" - .extern Unk_ov4_0221AE50 + .extern __GSIACResult .text @@ -20,7 +20,7 @@ gpInitialize: ; 0x021EB228 bl gpiInitialize ldmia sp!, {r3, pc} ; .align 2, 0 -_021EB254: .word Unk_ov4_0221AE50 +_021EB254: .word __GSIACResult arm_func_end gpInitialize arm_func_start gpDestroy diff --git a/subprojects/gamespy/libraries/gp/asm/gpiconnect.s b/subprojects/gamespy/libraries/gp/asm/gpiconnect.s index ecf51f97b5..cc1dff791d 100644 --- a/subprojects/gamespy/libraries/gp/asm/gpiconnect.s +++ b/subprojects/gamespy/libraries/gp/asm/gpiconnect.s @@ -268,7 +268,7 @@ _021EE690: .word Unk_ov4_022181D4 _021EE694: .word Unk_ov4_02218208 _021EE698: .word Unk_ov4_02218230 _021EE69C: .word Unk_ov4_0221825C -_021EE6A0: .word Unk_ov4_0221812C +_021EE6A0: .word GPConnectionManagerHostname _021EE6A4: .word Unk_ov4_0221828C _021EE6A8: .word Unk_ov4_022182C0 _021EE6AC: .word Unk_ov4_022182E0 @@ -1561,8 +1561,8 @@ Unk_ov4_0221810C: ; 0x0221810C Unk_ov4_0221811C: ; 0x0221811C .incbin "incbin/overlay4_data.bin", 0x229C, 0x22AC - 0x229C - .global Unk_ov4_0221812C -Unk_ov4_0221812C: ; 0x0221812C + .global GPConnectionManagerHostname +GPConnectionManagerHostname: ; 0x0221812C .incbin "incbin/overlay4_data.bin", 0x22AC, 0x22EC - 0x22AC .global Unk_ov4_0221816C diff --git a/subprojects/gamespy/libraries/gp/asm/gpisearch.s b/subprojects/gamespy/libraries/gp/asm/gpisearch.s index c8e19a2974..e9b6a06200 100644 --- a/subprojects/gamespy/libraries/gp/asm/gpisearch.s +++ b/subprojects/gamespy/libraries/gp/asm/gpisearch.s @@ -136,7 +136,7 @@ _021F368C: _021F36A0: .word Unk_ov4_02218DA8 _021F36A4: .word Unk_ov4_02218DB8 _021F36A8: .word Unk_ov4_02218DE0 -_021F36AC: .word Unk_ov4_02218D68 +_021F36AC: .word GPSearchManagerHostname _021F36B0: .word Unk_ov4_02218E14 _021F36B4: .word Unk_ov4_02218E44 _021F36B8: .word Unk_ov4_02218E64 @@ -2308,8 +2308,8 @@ Unk_ov4_02218D3C: ; 0x02218D3C Unk_ov4_02218D50: ; 0x02218D50 .incbin "incbin/overlay4_data.bin", 0x2ED0, 0x2EE8 - 0x2ED0 - .global Unk_ov4_02218D68 -Unk_ov4_02218D68: ; 0x02218D68 + .global GPSearchManagerHostname +GPSearchManagerHostname: ; 0x02218D68 .incbin "incbin/overlay4_data.bin", 0x2EE8, 0x2F28 - 0x2EE8 .global Unk_ov4_02218DA8 diff --git a/subprojects/gamespy/libraries/gstats/asm/gbucket.s b/subprojects/gamespy/libraries/gstats/asm/gbucket.s index 2a663abddf..17c854b740 100644 --- a/subprojects/gamespy/libraries/gstats/asm/gbucket.s +++ b/subprojects/gamespy/libraries/gstats/asm/gbucket.s @@ -494,8 +494,8 @@ Unk_ov4_0221933C: ; 0x0221933C Unk_ov4_0221AF70: ; 0x0221AF70 .space 0x4 - .global Unk_ov4_0221AF74 -Unk_ov4_0221AF74: ; 0x0221AF74 + .global g_buckets +g_buckets: ; 0x0221AF74 .space 0x4 .global Unk_ov4_0221AF78 diff --git a/subprojects/gamespy/libraries/gstats/asm/gstats.s b/subprojects/gamespy/libraries/gstats/asm/gstats.s index b06b2e64c3..e8d3c39b3f 100644 --- a/subprojects/gamespy/libraries/gstats/asm/gstats.s +++ b/subprojects/gamespy/libraries/gstats/asm/gstats.s @@ -36,8 +36,8 @@ _021F6364: str r1, [r0, #0] ldmia sp!, {r3, pc} ; .align 2, 0 -_021F63A0: .word Unk_ov4_02219358 -_021F63A4: .word Unk_ov4_0221AF80 +_021F63A0: .word sock +_021F63A4: .word rcvlen arm_func_end CloseStatsConnection arm_func_start IsStatsConnected @@ -50,7 +50,7 @@ IsStatsConnected: ; 0x021F63A8 moveq r0, #0 bx lr ; .align 2, 0 -_021F63C4: .word Unk_ov4_02219358 +_021F63C4: .word sock arm_func_end IsStatsConnected arm_func_start PersistThink @@ -143,8 +143,8 @@ _021F64F4: movne r0, #1 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} ; .align 2, 0 -_021F6510: .word Unk_ov4_02219358 -_021F6514: .word Unk_ov4_0221AF80 +_021F6510: .word sock +_021F6514: .word rcvlen arm_func_end PersistThink arm_func_start xcode_buf @@ -168,7 +168,7 @@ _021F6530: blt _021F6530 ldmia sp!, {r4, pc} ; .align 2, 0 -_021F655C: .word Unk_ov4_02219358 +_021F655C: .word sock arm_func_end xcode_buf arm_func_start value_for_key @@ -227,7 +227,7 @@ _021F6604: ldmia sp!, {r4, pc} ; .align 2, 0 _021F6624: .word Unk_ov4_02215B27 -_021F6628: .word Unk_ov4_0221AF80 +_021F6628: .word rcvlen _021F662C: .word Unk_ov4_022193C8 _021F6630: .word Unk_ov4_0221AFB0 arm_func_end value_for_key @@ -320,7 +320,7 @@ _021F6738: mvn r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, pc} ; .align 2, 0 -_021F6740: .word Unk_ov4_0221AF80 +_021F6740: .word rcvlen arm_func_end FindRequest arm_func_start ProcessPlayerAuth @@ -369,7 +369,7 @@ ProcessPlayerAuth: ; 0x021F6744 _021F67E4: .word Unk_ov4_022193CC _021F67E8: .word Unk_ov4_022193D4 _021F67EC: .word Unk_ov4_022193D8 -_021F67F0: .word Unk_ov4_0221AF80 +_021F67F0: .word rcvlen arm_func_end ProcessPlayerAuth arm_func_start ProcessGetPid @@ -409,7 +409,7 @@ ProcessGetPid: ; 0x021F67F4 ; .align 2, 0 _021F6874: .word Unk_ov4_022193E0 _021F6878: .word Unk_ov4_022193D4 -_021F687C: .word Unk_ov4_0221AF80 +_021F687C: .word rcvlen arm_func_end ProcessGetPid arm_func_start ProcessGetData @@ -622,8 +622,8 @@ _021F6B5C: sub r0, r7, sb ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} ; .align 2, 0 -_021F6B64: .word Unk_ov4_022193A4 -_021F6B68: .word Unk_ov4_02219358 +_021F6B64: .word enc1 +_021F6B68: .word sock arm_func_end ProcessInBuffer arm_func_start CallReqCallback @@ -699,7 +699,7 @@ _021F6C54: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, pc} ; .align 2, 0 -_021F6C6C: .word Unk_ov4_0221AF80 +_021F6C6C: .word rcvlen arm_func_end CallReqCallback arm_func_start ClosePendingCallbacks @@ -766,10 +766,10 @@ _021F6D34: add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} ; .align 2, 0 -_021F6D54: .word Unk_ov4_0221AF80 +_021F6D54: .word rcvlen _021F6D58: .word Unk_ov4_022159A4 -_021F6D5C: .word Unk_ov4_022193B4 -_021F6D60: .word Unk_ov4_02219358 +_021F6D5C: .word enc3 +_021F6D60: .word sock arm_func_end ClosePendingCallbacks arm_func_start GetTeamIndex @@ -786,7 +786,7 @@ GetTeamIndex: ; 0x021F6D64 ldr r0, [r0, #0] ldmia sp!, {r3, pc} ; .align 2, 0 -_021F6D90: .word Unk_ov4_0221AF80 +_021F6D90: .word rcvlen arm_func_end GetTeamIndex arm_func_start GetPlayerIndex @@ -803,7 +803,7 @@ GetPlayerIndex: ; 0x021F6D94 ldr r0, [r0, #0] ldmia sp!, {r3, pc} ; .align 2, 0 -_021F6DC0: .word Unk_ov4_0221AF80 +_021F6DC0: .word rcvlen arm_func_end GetPlayerIndex arm_func_start ServerOpInt @@ -835,7 +835,7 @@ _021F6E18: add sp, sp, #0x10 bx lr ; .align 2, 0 -_021F6E28: .word Unk_ov4_0221AF80 +_021F6E28: .word rcvlen arm_func_end ServerOpInt arm_func_start ServerOpFloat @@ -869,7 +869,7 @@ _021F6E80: add sp, sp, #0x10 bx lr ; .align 2, 0 -_021F6E98: .word Unk_ov4_0221AF80 +_021F6E98: .word rcvlen arm_func_end ServerOpFloat arm_func_start ServerOpString @@ -897,7 +897,7 @@ ServerOpString: ; 0x021F6E9C bl BucketNew ldmia sp!, {r4, r5, r6, pc} ; .align 2, 0 -_021F6EF4: .word Unk_ov4_0221AF80 +_021F6EF4: .word rcvlen arm_func_end ServerOpString arm_func_start TeamOpInt @@ -1130,21 +1130,21 @@ Unk_ov4_02215B27: ; 0x02215B27 .data - .global Unk_ov4_02219358 -Unk_ov4_02219358: ; 0x02219358 + .global sock +sock: ; 0x02219358 .word 0xFFFFFFFF - .global Unk_ov4_0221935C -Unk_ov4_0221935C: ; 0x0221935C + .global inittimeout +inittimeout: ; 0x0221935C .ascii " N" .space 0x2 - .global Unk_ov4_02219360 -Unk_ov4_02219360: ; 0x02219360 - .word Unk_ov4_022193A4 + .global enc +enc: ; 0x02219360 + .word enc1 - .global Unk_ov4_02219364 -Unk_ov4_02219364: ; 0x02219364 + .global bucketfuncs +bucketfuncs: ; 0x02219364 .word BucketSet .word BucketAdd .word BucketSub @@ -1153,8 +1153,8 @@ Unk_ov4_02219364: ; 0x02219364 .word BucketConcat .word BucketAvg - .global Unk_ov4_02219380 -Unk_ov4_02219380: ; 0x02219380 + .global bopfuncs +bopfuncs: ; 0x02219380 .word ServerOpInt .word ServerOpFloat .word ServerOpString @@ -1165,14 +1165,14 @@ Unk_ov4_02219380: ; 0x02219380 .word PlayerOpFloat .word PlayerOpString - .global Unk_ov4_022193A4 -Unk_ov4_022193A4: ; 0x022193A4 + .global enc1 +enc1: ; 0x022193A4 .space 0x1 .asciz "ameSpy3D" .space 0x6 - .global Unk_ov4_022193B4 -Unk_ov4_022193B4: ; 0x022193B4 + .global enc3 +enc3: ; 0x022193B4 .space 0x1 .ascii "rojectAphex" .space 0x4 @@ -1266,52 +1266,52 @@ Unk_ov4_02219448: ; 0x02219448 .bss - .global Unk_ov4_0221AF80 -Unk_ov4_0221AF80: ; 0x0221AF80 + .global rcvlen +rcvlen: ; 0x0221AF80 .space 0x4 - .global Unk_ov4_0221AF84 -Unk_ov4_0221AF84: ; 0x0221AF84 + .global serverreqs +serverreqs: ; 0x0221AF84 .space 0x4 - .global Unk_ov4_0221AF88 -Unk_ov4_0221AF88: ; 0x0221AF88 + .global initstart +initstart: ; 0x0221AF88 .space 0x4 - .global Unk_ov4_0221AF8C -Unk_ov4_0221AF8C: ; 0x0221AF8C + .global rcvbuffer +rcvbuffer: ; 0x0221AF8C .space 0x4 - .global Unk_ov4_0221AF90 -Unk_ov4_0221AF90: ; 0x0221AF90 + .global stats_initstate +stats_initstate: ; 0x0221AF90 .space 0x4 - .global Unk_ov4_0221AF94 -Unk_ov4_0221AF94: ; 0x0221AF94 + .global gameport +gameport: ; 0x0221AF94 .space 0x4 - .global Unk_ov4_0221AF98 -Unk_ov4_0221AF98: ; 0x0221AF98 + .global sesskey +sesskey: ; 0x0221AF98 .space 0x4 - .global Unk_ov4_0221AF9C -Unk_ov4_0221AF9C: ; 0x0221AF9C + .global internal_init +internal_init: ; 0x0221AF9C .space 0x4 - .global Unk_ov4_0221AFA0 -Unk_ov4_0221AFA0: ; 0x0221AFA0 + .global connid +connid: ; 0x0221AFA0 .space 0x4 .global Unk_ov4_0221AFA4 Unk_ov4_0221AFA4: ; 0x0221AFA4 .space 0x4 - .global Unk_ov4_0221AFA8 -Unk_ov4_0221AFA8: ; 0x0221AFA8 + .global g_statsgame +g_statsgame: ; 0x0221AFA8 .space 0x4 - .global Unk_ov4_0221AFAC -Unk_ov4_0221AFAC: ; 0x0221AFAC + .global rcvmax +rcvmax: ; 0x0221AFAC .space 0x4 .global Unk_ov4_0221AFB0 diff --git a/subprojects/gamespy/libraries/gt2/asm/gt2auth.s b/subprojects/gamespy/libraries/gt2/asm/gt2auth.s index 176c0508ce..8029332ad8 100644 --- a/subprojects/gamespy/libraries/gt2/asm/gt2auth.s +++ b/subprojects/gamespy/libraries/gt2/asm/gt2auth.s @@ -204,7 +204,7 @@ _021F73C0: mov r0, r5 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ; .align 2, 0 -_021F73E0: .word Unk_ov4_02219464 +_021F73E0: .word GT2ChallengeKey _021F73E4: .word 0x2C0B02C1 arm_func_end gti2GetResponse @@ -234,8 +234,8 @@ Unk_ov4_02219450: ; 0x02219450 .ascii "gti2GetChallenge" .space 0x4 - .global Unk_ov4_02219464 -Unk_ov4_02219464: ; 0x02219464 + .global GT2ChallengeKey +GT2ChallengeKey: ; 0x02219464 .ascii "3b8dd8995f7c40a9a5c5b7dd5b481341" .space 0x4 diff --git a/subprojects/gamespy/libraries/natneg/asm/natneg.s b/subprojects/gamespy/libraries/natneg/asm/natneg.s index 44788f368b..31df3d963b 100644 --- a/subprojects/gamespy/libraries/natneg/asm/natneg.s +++ b/subprojects/gamespy/libraries/natneg/asm/natneg.s @@ -1,7 +1,7 @@ .include "macros/function.inc" .include "include/natneg.inc" - .extern Unk_ov4_0221AE50 + .extern __GSIACResult .text @@ -36,7 +36,7 @@ _021FAEDC: mov r0, #0 ldmia sp!, {r4, r5, r6, pc} ; .align 2, 0 -_021FAEE4: .word Unk_ov4_0221B3E4 +_021FAEE4: .word Matchup2Hostname arm_func_end FindNegotiatorForCookie arm_func_start NegotiatorFree @@ -96,7 +96,7 @@ _021FAF74: add sp, sp, #0x40 ldmia sp!, {r3, pc} ; .align 2, 0 -_021FAFA8: .word Unk_ov4_0221B3E4 +_021FAFA8: .word Matchup2Hostname _021FAFAC: .word NegotiatorFree arm_func_end AddNegotiator @@ -130,7 +130,7 @@ _021FAFFC: blt _021FAFD4 ldmia sp!, {r4, r5, r6, pc} ; .align 2, 0 -_021FB014: .word Unk_ov4_0221B3E4 +_021FB014: .word Matchup2Hostname arm_func_end RemoveNegotiator arm_func_start NNFreeNegotiateList @@ -146,7 +146,7 @@ NNFreeNegotiateList: ; 0x021FB018 str r1, [r0, #0x10] ldmia sp!, {r3, pc} ; .align 2, 0 -_021FB040: .word Unk_ov4_0221B3E4 +_021FB040: .word Matchup2Hostname arm_func_end NNFreeNegotiateList arm_func_start CheckMagic @@ -388,7 +388,7 @@ _021FB370: ; .align 2, 0 _021FB38C: .word NNMagicData _021FB390: .word 0x0221AEEC -_021FB394: .word Unk_ov4_0221B3E4 +_021FB394: .word Matchup2Hostname _021FB398: .word 0x00006CFD arm_func_end SendInitPackets @@ -541,7 +541,7 @@ _021FB580: movne r0, #1 ldmia sp!, {r3, pc} ; .align 2, 0 -_021FB5A0: .word Unk_ov4_0221B3E4 +_021FB5A0: .word Matchup2Hostname _021FB5A4: .word Unk_ov4_022197B8 _021FB5A8: .word Unk_ov4_022197D4 arm_func_end ResolveServers @@ -599,7 +599,7 @@ _021FB664: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, pc} ; .align 2, 0 -_021FB670: .word Unk_ov4_0221AE50 +_021FB670: .word __GSIACResult arm_func_end NNBeginNegotiationWithSocket arm_func_start NNCancel @@ -778,7 +778,7 @@ _021FB8C0: bpl _021FB8C0 ldmia sp!, {r3, r4, r5, pc} ; .align 2, 0 -_021FB8DC: .word Unk_ov4_0221B3E4 +_021FB8DC: .word Matchup2Hostname arm_func_end NNThink arm_func_start SendConnectAck @@ -1142,24 +1142,24 @@ Unk_ov4_022197D4: ; 0x022197D4 .bss - .global Unk_ov4_0221B3E4 -Unk_ov4_0221B3E4: ; 0x0221B3E4 + .global Matchup2Hostname +Matchup2Hostname: ; 0x0221B3E4 .space 0x4 - .global Unk_ov4_0221B3E8 -Unk_ov4_0221B3E8: ; 0x0221B3E8 + .global Matchup1Hostname +Matchup1Hostname: ; 0x0221B3E8 .space 0x4 - .global Unk_ov4_0221B3EC -Unk_ov4_0221B3EC: ; 0x0221B3EC + .global matchup2ip +matchup2ip: ; 0x0221B3EC .space 0x4 - .global Unk_ov4_0221B3F0 -Unk_ov4_0221B3F0: ; 0x0221B3F0 + .global matchup1ip +matchup1ip: ; 0x0221B3F0 .space 0x4 - .global Unk_ov4_0221B3F4 -Unk_ov4_0221B3F4: ; 0x0221B3F4 + .global negotiateList +negotiateList: ; 0x0221B3F4 .space 0x4 .global Unk_ov4_0221B3F8 diff --git a/subprojects/gamespy/libraries/qr2/asm/qr2.s b/subprojects/gamespy/libraries/qr2/asm/qr2.s index 594fc901ee..b556ec4904 100644 --- a/subprojects/gamespy/libraries/qr2/asm/qr2.s +++ b/subprojects/gamespy/libraries/qr2/asm/qr2.s @@ -3,7 +3,7 @@ - .extern Unk_ov4_02219B38 + .extern qr2_registered_key_list .text @@ -975,7 +975,7 @@ _021FCA64: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ; .align 2, 0 _021FCA7C: .word Unk_ov4_0221997C -_021FCA80: .word Unk_ov4_02219B38 +_021FCA80: .word qr2_registered_key_list _021FCA84: .word Unk_ov4_02219984 arm_func_end qr_build_partial_query_reply @@ -1181,7 +1181,7 @@ _021FCD3C: add sp, sp, #0x188 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ; .align 2, 0 -_021FCD60: .word Unk_ov4_02219B38 +_021FCD60: .word qr2_registered_key_list _021FCD64: .word Unk_ov4_0221997C _021FCD68: .word Unk_ov4_02219984 _021FCD6C: .word Unk_ov4_02219988 diff --git a/subprojects/gamespy/libraries/qr2/asm/qr2regkeys.s b/subprojects/gamespy/libraries/qr2/asm/qr2regkeys.s index 67a15ed01c..b0f04a6f79 100644 --- a/subprojects/gamespy/libraries/qr2/asm/qr2regkeys.s +++ b/subprojects/gamespy/libraries/qr2/asm/qr2regkeys.s @@ -13,7 +13,7 @@ qr2_register_keyA: ; 0x021FD4E0 str r1, [r2, r0, lsl #2] bx lr ; .align 2, 0 -_021FD4FC: .word Unk_ov4_02219B38 +_021FD4FC: .word qr2_registered_key_list arm_func_end qr2_register_keyA .data @@ -160,8 +160,8 @@ Unk_ov4_02219B28: ; 0x02219B28 .asciz "teamfraglimit" .space 0x2 - .global Unk_ov4_02219B38 -Unk_ov4_02219B38: ; 0x02219B38 + .global qr2_registered_key_list +qr2_registered_key_list: ; 0x02219B38 .word Unk_ov4_02219A00 .word Unk_ov4_02219AB8 .word Unk_ov4_02219A64 diff --git a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_queryengine.s b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_queryengine.s index 98122b3bff..65827fa036 100644 --- a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_queryengine.s +++ b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_queryengine.s @@ -1,9 +1,9 @@ .include "macros/function.inc" .include "include/sb_queryengine.inc" - .extern Unk_ov4_0221AE50 + .extern __GSIACResult - .extern Unk_ov4_02219B38 + .extern qr2_registered_key_list .text @@ -266,7 +266,7 @@ _021FDAE4: bl FIFOClear ldmia sp!, {r4, r5, r6, pc} ; .align 2, 0 -_021FDB2C: .word Unk_ov4_0221AE50 +_021FDB2C: .word __GSIACResult arm_func_end SBQueryEngineInit arm_func_start SBQueryEngineSetPublicIP @@ -411,7 +411,7 @@ _021FDCB4: blx r4 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} ; .align 2, 0 -_021FDCF8: .word Unk_ov4_02219B38 +_021FDCF8: .word qr2_registered_key_list arm_func_end ParseSingleQR2Reply arm_func_start ParseSingleGOAReply diff --git a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverbrowsing.s b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverbrowsing.s index 6db04d4984..ac684ba69a 100644 --- a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverbrowsing.s +++ b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverbrowsing.s @@ -2,9 +2,9 @@ .include "include/sb_serverbrowsing.inc" - .extern Unk_ov4_0221AE50 + .extern __GSIACResult - .extern Unk_ov4_02219B38 + .extern qr2_registered_key_list .text @@ -237,7 +237,7 @@ _021FEB24: add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, pc} ; .align 2, 0 -_021FEBAC: .word Unk_ov4_0221AE50 +_021FEBAC: .word __GSIACResult _021FEBB0: .word 0x00000638 _021FEBB4: .word ListCallback _021FEBB8: .word EngineCallback @@ -338,7 +338,7 @@ _021FECDC: add sp, sp, #0x108 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ; .align 2, 0 -_021FED08: .word Unk_ov4_02219B38 +_021FED08: .word qr2_registered_key_list _021FED0C: .word Unk_ov4_02219FA8 arm_func_end ServerBrowserBeginUpdate2 diff --git a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverlist.s b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverlist.s index 306afec024..85e6df5f1a 100644 --- a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverlist.s +++ b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverlist.s @@ -2,7 +2,7 @@ .include "include/sb_serverlist.inc" .extern __lower_mapC - .extern Unk_ov4_0221AE50 + .extern __GSIACResult .extern Unk_ov4_0221B754 .text @@ -576,7 +576,7 @@ _021FF58C: _021FF5EC: .word Unk_ov4_0221A058 _021FF5F0: .word Unk_ov4_0221A048 _021FF5F4: .word Unk_ov4_02219FE0 -_021FF5F8: .word Unk_ov4_0221AE50 +_021FF5F8: .word __GSIACResult _021FF5FC: .word Unk_ov4_0221A068 _021FF600: .word 0x00000132 _021FF604: .word Unk_ov4_0221A038