From c0e3ce1a7dbbf2f169f2db499e77521def49f832 Mon Sep 17 00:00:00 2001 From: Nomura Date: Tue, 29 Aug 2023 20:10:47 +0200 Subject: [PATCH] Label some NitroDWC functions --- lib/gds/asm/include/ov61_0222D498.inc | 2 +- lib/gds/asm/ov61_0222D498.s | 2 +- .../gamespy/libraries/chat/asm/chathandlers.s | 8 +- .../gamespy/libraries/chat/asm/chatmain.s | 110 +++++++++--------- .../gamespy/libraries/chat/asm/chatsocket.s | 2 +- .../chat/asm/include/chathandlers.inc | 4 +- .../libraries/chat/asm/include/chatmain.inc | 2 +- .../libraries/chat/asm/include/chatsocket.inc | 2 +- .../gamespy/libraries/common/asm/available.s | 6 +- .../common/asm/include/available.inc | 4 +- .../gamespy/libraries/common/asm/nonport.s | 12 +- .../gamespy/libraries/ghttp/asm/ghttpcommon.s | 2 +- .../libraries/ghttp/asm/ghttpprocess.s | 6 +- .../ghttp/asm/include/ghttpcommon.inc | 2 +- .../ghttp/asm/include/ghttpprocess.inc | 4 +- subprojects/gamespy/libraries/gp/asm/gpi.s | 2 +- .../gamespy/libraries/gp/asm/include/gpi.inc | 2 +- .../gamespy/libraries/gt2/asm/gt2auth.s | 2 +- .../gamespy/libraries/gt2/asm/gt2connection.s | 2 +- .../gamespy/libraries/gt2/asm/gt2message.s | 10 +- .../gamespy/libraries/gt2/asm/gt2socket.s | 4 +- .../gamespy/libraries/gt2/asm/gt2utility.s | 2 +- .../libraries/gt2/asm/include/gt2auth.inc | 2 +- .../gt2/asm/include/gt2connection.inc | 2 +- .../libraries/gt2/asm/include/gt2message.inc | 2 +- .../libraries/gt2/asm/include/gt2socket.inc | 2 +- .../libraries/gt2/asm/include/gt2utility.inc | 2 +- .../libraries/natneg/asm/include/natneg.inc | 4 +- .../gamespy/libraries/natneg/asm/natneg.s | 16 +-- .../gamespy/libraries/qr2/asm/include/qr2.inc | 4 +- subprojects/gamespy/libraries/qr2/asm/qr2.s | 12 +- .../asm/include/sb_queryengine.inc | 2 +- .../asm/include/sb_serverbrowsing.inc | 2 +- .../asm/include/sb_serverlist.inc | 4 +- .../serverbrowsing/asm/sb_queryengine.s | 8 +- .../serverbrowsing/asm/sb_serverbrowsing.s | 4 +- .../serverbrowsing/asm/sb_serverlist.s | 6 +- .../libraries/ilobby/asm/dwci_lobbydata.s | 2 +- .../ilobby/asm/dwci_lobbynewhandler.s | 2 +- .../ilobby/asm/include/dwci_lobbydata.inc | 2 +- .../ilobby/asm/include/dwci_lobbynewha.inc | 2 +- .../libraries/ppwlobby/asm/dwci_lobby.s | 48 ++++---- .../ppwlobby/asm/include/dwci_lobby.inc | 36 +++--- .../ppwlobby/asm/include/ppw_lobby.inc | 2 +- .../libraries/ppwlobby/asm/ppw_lobby.s | 4 +- 45 files changed, 181 insertions(+), 181 deletions(-) diff --git a/lib/gds/asm/include/ov61_0222D498.inc b/lib/gds/asm/include/ov61_0222D498.inc index e8ab1bf2c7..e5f420cb03 100644 --- a/lib/gds/asm/include/ov61_0222D498.inc +++ b/lib/gds/asm/include/ov61_0222D498.inc @@ -14,7 +14,7 @@ .public DWC_Free .public DWC_SVLGetTokenAsync .public DWC_SVLProcess -.public ov4_021EAF1C +.public inet_addr .public SOC_Socket .public SOC_Connect .public SOC_Recv diff --git a/lib/gds/asm/ov61_0222D498.s b/lib/gds/asm/ov61_0222D498.s index 050445e209..ec9fc136e9 100644 --- a/lib/gds/asm/ov61_0222D498.s +++ b/lib/gds/asm/ov61_0222D498.s @@ -250,7 +250,7 @@ _0222D720: ldmia sp!, {r3, pc} _0222D74C: add r0, sp, #0 - bl ov4_021EAF1C + bl inet_addr ldr r1, _0222D768 ; =0x0222E764 str r0, [r1, #0x264] mov r0, #1 diff --git a/subprojects/gamespy/libraries/chat/asm/chathandlers.s b/subprojects/gamespy/libraries/chat/asm/chathandlers.s index 5190d924de..adc91431ae 100644 --- a/subprojects/gamespy/libraries/chat/asm/chathandlers.s +++ b/subprojects/gamespy/libraries/chat/asm/chathandlers.s @@ -93,7 +93,7 @@ _0224D6A8: cmp r0, #0 bne _0224D6F0 _0224D6D8: - bl ov4_021EA840 + bl current_time add r0, r0, #0xa60 add r1, r0, #0xe000 mov r0, r8 @@ -1081,7 +1081,7 @@ ov66_0224E474: ; 0x0224E474 ldr r3, _0224E4DC ; =0x0000031A bl __msl_assertion_failed _0224E494: - bl ov4_021EA840 + bl current_time ldr r1, [r6, #0x814] mov r5, r0 cmp r1, #0 @@ -1223,7 +1223,7 @@ _0224E630: mov r2, #0x28 bl memset str r8, [r4] - bl ov4_021EA840 + bl current_time add r0, r0, #0xa60 add r0, r0, #0xe000 str r0, [r4, #4] @@ -5203,7 +5203,7 @@ _02251DB4: cmpne r1, #0 beq _02251E24 add r0, r0, #1 - bl ov4_021EAF1C + bl inet_addr mov r1, r0 ldr r3, [r4, #0x18] ldr ip, [r4, #0x10] diff --git a/subprojects/gamespy/libraries/chat/asm/chatmain.s b/subprojects/gamespy/libraries/chat/asm/chatmain.s index fd45d22703..ba17f9ef01 100644 --- a/subprojects/gamespy/libraries/chat/asm/chatmain.s +++ b/subprojects/gamespy/libraries/chat/asm/chatmain.s @@ -909,7 +909,7 @@ _022540FC: cmp r0, #0 bne _02254134 mov r0, r4 - bl ov66_022543DC + bl chatDisconnect mov r4, #0 _02254134: mov r0, r4 @@ -953,8 +953,8 @@ _022541C4: .word Unk_ov66_0225ACB8 _022541C8: .word Unk_ov66_0225ACC8 arm_func_end ov66_022539B8 - arm_func_start ov66_022541CC -ov66_022541CC: ; 0x022541CC + arm_func_start chatConnectSecureA +chatConnectSecureA: ; 0x022541CC stmfd sp!, {r3, r4, lr} sub sp, sp, #0x44 mov ip, r0 @@ -990,10 +990,10 @@ ov66_022541CC: ; 0x022541CC bl ov66_022539B8 add sp, sp, #0x44 ldmia sp!, {r3, r4, pc} - arm_func_end ov66_022541CC + arm_func_end chatConnectSecureA - arm_func_start ov66_02254258 -ov66_02254258: ; 0x02254258 + arm_func_start chatRetryWithNickA +chatRetryWithNickA: ; 0x02254258 stmfd sp!, {r3, r4, r5, lr} movs r5, r0 mov r4, r1 @@ -1048,10 +1048,10 @@ _02254310: .word Unk_ov66_0225AA94 _02254314: .word Unk_ov66_0225A968 _02254318: .word 0x00000385 _0225431C: .word Unk_ov66_0225ACD0 - arm_func_end ov66_02254258 + arm_func_end chatRetryWithNickA - arm_func_start ov66_02254320 -ov66_02254320: ; 0x02254320 + arm_func_start chatRegisterUniqueNickA +chatRegisterUniqueNickA: ; 0x02254320 stmfd sp!, {r3, r4, r5, r6, r7, lr} movs r7, r0 mov r6, r1 @@ -1102,10 +1102,10 @@ _022543CC: .word Unk_ov66_0225AA3C _022543D0: .word 0x000003BD _022543D4: .word Unk_ov66_0225AB2C _022543D8: .word Unk_ov66_0225ACDC - arm_func_end ov66_02254320 + arm_func_end chatRegisterUniqueNickA - arm_func_start ov66_022543DC -ov66_022543DC: ; 0x022543DC + arm_func_start chatDisconnect +chatDisconnect: ; 0x022543DC stmfd sp!, {r4, lr} movs r4, r0 bne _022543FC @@ -1154,19 +1154,19 @@ _0225447C: .word Unk_ov66_0225A8E8 _02254480: .word 0x000003EF _02254484: .word Unk_ov66_0225AB2C _02254488: .word Unk_ov66_0225ACF4 - arm_func_end ov66_022543DC + arm_func_end chatDisconnect - arm_func_start ov66_0225448C -ov66_0225448C: ; 0x0225448C + arm_func_start chatThink +chatThink: ; 0x0225448C ldr ip, _02254498 ; =ov66_0225366C mov r1, #0 bx ip ; .align 2, 0 _02254498: .word ov66_0225366C - arm_func_end ov66_0225448C + arm_func_end chatThink - arm_func_start ov66_0225449C -ov66_0225449C: ; 0x0225449C + arm_func_start chatEnumChannelsA +chatEnumChannelsA: ; 0x0225449C stmfd sp!, {r3, r4, r5, r6, r7, lr} movs r4, r0 mov r7, r1 @@ -1229,10 +1229,10 @@ _02254574: .word Unk_ov66_0225AD64 _02254578: .word 0x00000591 _0225457C: .word Unk_ov66_0225AB2C _02254580: .word Unk_ov66_0225AD94 - arm_func_end ov66_0225449C + arm_func_end chatEnumChannelsA - arm_func_start ov66_02254584 -ov66_02254584: ; 0x02254584 + arm_func_start chatEnterChannelA +chatEnterChannelA: ; 0x02254584 stmfd sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 movs r4, r0 @@ -1323,10 +1323,10 @@ _022546C4: .word Unk_ov66_0225AB48 _022546C8: .word 0x000005B7 _022546CC: .word Unk_ov66_0225AB2C _022546D0: .word Unk_ov66_0225ADC0 - arm_func_end ov66_02254584 + arm_func_end chatEnterChannelA - arm_func_start ov66_022546D4 -ov66_022546D4: ; 0x022546D4 + arm_func_start chatLeaveChannelA +chatLeaveChannelA: ; 0x022546D4 stmfd sp!, {r4, r5, r6, lr} movs r6, r0 mov r5, r1 @@ -1380,10 +1380,10 @@ _02254788: .word 0x000005DE _0225478C: .word Unk_ov66_0225ADAC _02254790: .word Unk_ov66_0225AB2C _02254794: .word Unk_ov66_0225ADCC - arm_func_end ov66_022546D4 + arm_func_end chatLeaveChannelA - arm_func_start ov66_02254798 -ov66_02254798: ; 0x02254798 + arm_func_start chatSendChannelMessageA +chatSendChannelMessageA: ; 0x02254798 stmfd sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x20 movs r7, r0 @@ -1515,10 +1515,10 @@ _0225496C: .word Unk_ov66_0225AE60 _02254970: .word Unk_ov66_0225AE78 _02254974: .word Unk_ov66_0225AE88 _02254978: .word Unk_ov66_0225AE94 - arm_func_end ov66_02254798 + arm_func_end chatSendChannelMessageA - arm_func_start ov66_0225497C -ov66_0225497C: ; 0x0225497C + arm_func_start chatSetChannelModeA +chatSetChannelModeA: ; 0x0225497C stmfd sp!, {r4, r5, r6, lr} sub sp, sp, #0x40 movs r6, r0 @@ -1654,10 +1654,10 @@ _02254B6C: .word 0x00000683 _02254B70: .word Unk_ov66_0225AEC4 _02254B74: .word Unk_ov66_0225AED8 _02254B78: .word Unk_ov66_0225AEDC - arm_func_end ov66_0225497C + arm_func_end chatSetChannelModeA - arm_func_start ov66_02254B7C -ov66_02254B7C: ; 0x02254B7C + arm_func_start chatGetChannelModeA +chatGetChannelModeA: ; 0x02254B7C stmfd sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0x3c movs r8, r0 @@ -1789,10 +1789,10 @@ _02254D58: .word Unk_ov66_0225ADAC _02254D5C: .word Unk_ov66_0225AEA0 _02254D60: .word 0x000006C6 _02254D64: .word Unk_ov66_0225AEE8 - arm_func_end ov66_02254B7C + arm_func_end chatGetChannelModeA - arm_func_start ov66_02254D68 -ov66_02254D68: ; 0x02254D68 + arm_func_start chatSetChannelLimitA +chatSetChannelLimitA: ; 0x02254D68 stmfd sp!, {r4, r5, r6, lr} movs r6, r0 mov r5, r1 @@ -1859,10 +1859,10 @@ _02254E48: .word Unk_ov66_0225AEF0 _02254E4C: .word 0x00000752 _02254E50: .word Unk_ov66_0225AEFC _02254E54: .word Unk_ov66_0225AF0C - arm_func_end ov66_02254D68 + arm_func_end chatSetChannelLimitA - arm_func_start ov66_02254E58 -ov66_02254E58: ; 0x02254E58 + arm_func_start chatGetChannelNumUsersA +chatGetChannelNumUsersA: ; 0x02254E58 stmfd sp!, {r3, r4, r5, lr} movs r5, r0 mov r4, r1 @@ -1917,10 +1917,10 @@ _02254F10: .word 0x000007D6 _02254F14: .word Unk_ov66_0225AD9C _02254F18: .word 0x000007DA _02254F1C: .word Unk_ov66_0225ADAC - arm_func_end ov66_02254E58 + arm_func_end chatGetChannelNumUsersA - arm_func_start ov66_02254F20 -ov66_02254F20: ; 0x02254F20 + arm_func_start chatInChannelA +chatInChannelA: ; 0x02254F20 stmfd sp!, {r3, r4, r5, lr} movs r5, r0 mov r4, r1 @@ -1969,7 +1969,7 @@ _02254FC0: .word 0x000007F4 _02254FC4: .word Unk_ov66_0225AD9C _02254FC8: .word 0x000007F8 _02254FCC: .word Unk_ov66_0225ADAC - arm_func_end ov66_02254F20 + arm_func_end chatInChannelA arm_func_start ov66_02254FD0 ov66_02254FD0: ; 0x02254FD0 @@ -2059,8 +2059,8 @@ _022550FC: .word Unk_ov66_0225AF38 _02255100: .word 0x0000082C arm_func_end ov66_02254FD0 - arm_func_start ov66_02255104 -ov66_02255104: ; 0x02255104 + arm_func_start chatEnumUsersA +chatEnumUsersA: ; 0x02255104 stmfd sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 movs r4, r0 @@ -2148,10 +2148,10 @@ _0225523C: .word 0x0000084B _02255240: .word Unk_ov66_0225AB2C _02255244: .word ov66_02254FD0 _02255248: .word Unk_ov66_0225AF50 - arm_func_end ov66_02255104 + arm_func_end chatEnumUsersA - arm_func_start ov66_0225524C -ov66_0225524C: ; 0x0225524C + arm_func_start chatSendUserMessageA +chatSendUserMessageA: ; 0x0225524C stmfd sp!, {r3, r4, r5, r6, r7, lr} movs r7, r0 mov r6, r1 @@ -2267,7 +2267,7 @@ _022553E0: .word Unk_ov66_0225AE60 _022553E4: .word Unk_ov66_0225AE78 _022553E8: .word Unk_ov66_0225AE88 _022553EC: .word Unk_ov66_0225AE94 - arm_func_end ov66_0225524C + arm_func_end chatSendUserMessageA arm_func_start ov66_022553F0 ov66_022553F0: ; 0x022553F0 @@ -2298,8 +2298,8 @@ _02255448: .word Unk_ov66_0225AF9C _0225544C: .word 0x10624DD3 arm_func_end ov66_022553F0 - arm_func_start ov66_02255450 -ov66_02255450: ; 0x02255450 + arm_func_start chatSetChannelKeysA +chatSetChannelKeysA: ; 0x02255450 stmfd sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x200 movs sl, r0 @@ -2369,7 +2369,7 @@ _0225553C: .word Unk_ov66_0225AFC4 _02255540: .word Unk_ov66_0225AFD4 _02255544: .word Unk_ov66_0225AB2C _02255548: .word Unk_ov66_0225AF94 - arm_func_end ov66_02255450 + arm_func_end chatSetChannelKeysA arm_func_start ov66_0225554C ov66_0225554C: ; 0x0225554C @@ -2557,8 +2557,8 @@ _022557E4: .word Unk_ov66_0225B040 _022557E8: .word Unk_ov66_0225AAC0 arm_func_end ov66_0225554C - arm_func_start ov66_022557EC -ov66_022557EC: ; 0x022557EC + arm_func_start chatGetChannelKeysA +chatGetChannelKeysA: ; 0x022557EC stmfd sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x10 movs sb, r0 @@ -2669,7 +2669,7 @@ _02255978: .word 0x00000B72 _0225597C: .word Unk_ov66_0225AFFC _02255980: .word 0x00000B73 _02255984: .word Unk_ov66_0225AAC0 - arm_func_end ov66_022557EC + arm_func_end chatGetChannelKeysA arm_func_start ov66_02255988 ov66_02255988: ; 0x02255988 diff --git a/subprojects/gamespy/libraries/chat/asm/chatsocket.s b/subprojects/gamespy/libraries/chat/asm/chatsocket.s index 824ea7c52a..81b0fd41d7 100644 --- a/subprojects/gamespy/libraries/chat/asm/chatsocket.s +++ b/subprojects/gamespy/libraries/chat/asm/chatsocket.s @@ -432,7 +432,7 @@ _0225607C: mov r1, #0 mov r0, r5 strb r1, [r6, #0x106] - bl ov4_021EAF1C + bl inet_addr mvn r1, #0 cmp r0, r1 bne _022560CC diff --git a/subprojects/gamespy/libraries/chat/asm/include/chathandlers.inc b/subprojects/gamespy/libraries/chat/asm/include/chathandlers.inc index 87ade5f70e..7643bf12b2 100644 --- a/subprojects/gamespy/libraries/chat/asm/include/chathandlers.inc +++ b/subprojects/gamespy/libraries/chat/asm/include/chathandlers.inc @@ -12,9 +12,9 @@ .public DWCi_GsMalloc .public DWCi_GsRealloc .public DWCi_GsFree -.public ov4_021EA840 +.public current_time .public ov4_021EA8AC -.public ov4_021EAF1C +.public inet_addr .public ov66_02248C2C .public ov66_0224B9DC .public ov66_0224BA90 diff --git a/subprojects/gamespy/libraries/chat/asm/include/chatmain.inc b/subprojects/gamespy/libraries/chat/asm/include/chatmain.inc index b1bc101ec9..025b9d82d7 100644 --- a/subprojects/gamespy/libraries/chat/asm/include/chatmain.inc +++ b/subprojects/gamespy/libraries/chat/asm/include/chatmain.inc @@ -45,7 +45,7 @@ .public ov66_02253830 .public ov66_0225389C .public ov66_022539B8 -.public ov66_022543DC +.public chatDisconnect .public ov66_02254FD0 .public ov66_022553F0 .public ov66_0225554C diff --git a/subprojects/gamespy/libraries/chat/asm/include/chatsocket.inc b/subprojects/gamespy/libraries/chat/asm/include/chatsocket.inc index d21861c351..89c2ccb4f9 100644 --- a/subprojects/gamespy/libraries/chat/asm/include/chatsocket.inc +++ b/subprojects/gamespy/libraries/chat/asm/include/chatsocket.inc @@ -18,7 +18,7 @@ .public ov4_021EAD78 .public ov4_021EAE04 .public ov4_021EAE48 -.public ov4_021EAF1C +.public inet_addr .public SOC_GetHostByName .public ov66_0224D4D8 .public ov66_02255ADC diff --git a/subprojects/gamespy/libraries/common/asm/available.s b/subprojects/gamespy/libraries/common/asm/available.s index 34e3f78dca..c9cb2b7890 100644 --- a/subprojects/gamespy/libraries/common/asm/available.s +++ b/subprojects/gamespy/libraries/common/asm/available.s @@ -19,7 +19,7 @@ ov4_021E963C: ; 0x021E963C orr r1, r2, r1 mov r5, r0 strh r1, [r4, #2] - bl ov4_021EAF1C + bl inet_addr mvn r1, #0 str r0, [r4, #4] cmp r0, r1 @@ -52,7 +52,7 @@ ov4_021E96B0: ; 0x021E96B0 ldr r1, _021E96FC ; =0x0221AE60 mov r3, #0 bl ov4_021EAE5C - bl ov4_021EA840 + bl current_time ldr r1, _021E96F8 ; =0x0221AE50 str r0, [r1, #0x54] add sp, sp, #8 @@ -241,7 +241,7 @@ _021E9978: ldr r0, [r0, #0] ldmia sp!, {r3, pc} _021E9988: - bl ov4_021EA840 + bl current_time ldr r1, _021E99E8 ; =0x0221AE50 ldr r2, [r1, #0x54] add r2, r2, #0x7d0 diff --git a/subprojects/gamespy/libraries/common/asm/include/available.inc b/subprojects/gamespy/libraries/common/asm/include/available.inc index 928b71d16c..894558092f 100644 --- a/subprojects/gamespy/libraries/common/asm/include/available.inc +++ b/subprojects/gamespy/libraries/common/asm/include/available.inc @@ -6,12 +6,12 @@ .public ov4_021E963C .public ov4_021E96B0 .public ov4_021E97F8 -.public ov4_021EA840 +.public current_time .public ov4_021EA8A4 .public ov4_021EAB6C .public ov4_021EACDC .public ov4_021EACF0 .public ov4_021EAE18 .public ov4_021EAE5C -.public ov4_021EAF1C +.public inet_addr .public SOC_GetHostByName diff --git a/subprojects/gamespy/libraries/common/asm/nonport.s b/subprojects/gamespy/libraries/common/asm/nonport.s index 7d51bb7da0..0232791a69 100644 --- a/subprojects/gamespy/libraries/common/asm/nonport.s +++ b/subprojects/gamespy/libraries/common/asm/nonport.s @@ -6,8 +6,8 @@ .text - arm_func_start ov4_021EA840 -ov4_021EA840: ; 0x021EA840 + arm_func_start current_time +current_time: ; 0x021EA840 stmfd sp!, {r3, lr} bl OS_IsTickAvailable cmp r0, #1 @@ -32,7 +32,7 @@ _021EA888: .word Unk_ov4_02217914 _021EA88C: .word Unk_ov4_022178E4 _021EA890: .word 0x00000109 _021EA894: .word 0x000082EA - arm_func_end ov4_021EA840 + arm_func_end current_time arm_func_start ov4_021EA898 ov4_021EA898: ; 0x021EA898 @@ -593,8 +593,8 @@ ov4_021EAEF0: ; 0x021EAEF0 ldmia sp!, {r3, r4, r5, pc} arm_func_end ov4_021EAEF0 - arm_func_start ov4_021EAF1C -ov4_021EAF1C: ; 0x021EAF1C + arm_func_start inet_addr +inet_addr: ; 0x021EAF1C stmfd sp!, {r3, lr} add r1, sp, #0 bl SOC_InetAtoN @@ -602,7 +602,7 @@ ov4_021EAF1C: ; 0x021EAF1C mvneq r0, #0 ldrne r0, [sp] ldmia sp!, {r3, pc} - arm_func_end ov4_021EAF1C + arm_func_end inet_addr arm_func_start GOAGetLastError GOAGetLastError: ; 0x021EAF38 diff --git a/subprojects/gamespy/libraries/ghttp/asm/ghttpcommon.s b/subprojects/gamespy/libraries/ghttp/asm/ghttpcommon.s index cde33b5974..5123430150 100644 --- a/subprojects/gamespy/libraries/ghttp/asm/ghttpcommon.s +++ b/subprojects/gamespy/libraries/ghttp/asm/ghttpcommon.s @@ -119,7 +119,7 @@ ov60_0222097C: ; 0x0222097C cmp r0, #0 sub r4, r2, #1 beq _022209D0 - bl ov4_021EA840 + bl current_time ldr r1, _02220B8C ; =0x0222911C ldr r3, [r7, #0x138] ldr r2, [r1, #0] diff --git a/subprojects/gamespy/libraries/ghttp/asm/ghttpprocess.s b/subprojects/gamespy/libraries/ghttp/asm/ghttpprocess.s index 3885752d61..8d9570c7ef 100644 --- a/subprojects/gamespy/libraries/ghttp/asm/ghttpprocess.s +++ b/subprojects/gamespy/libraries/ghttp/asm/ghttpprocess.s @@ -158,7 +158,7 @@ _022229EC: ldreq r5, [r4, #0x18] _02222A08: mov r0, r5 - bl ov4_021EAF1C + bl inet_addr mvn r1, #0 str r0, [r4, #0x1c] cmp r0, r1 @@ -1508,7 +1508,7 @@ _02223CA4: .word Unk_ov60_02229B04 ov60_02223CA8: ; 0x02223CA8 stmfd sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov sb, r0 - bl ov4_021EA840 + bl current_time mov r7, r0 mov r0, #0x2000 mov r8, #0 @@ -1551,7 +1551,7 @@ _02223D38: bl ov60_02223614 cmp r0, #0 beq _02223D70 - bl ov4_021EA840 + bl current_time sub r8, r0, r7 _02223D58: ldr r0, [sb, #0xfc] diff --git a/subprojects/gamespy/libraries/ghttp/asm/include/ghttpcommon.inc b/subprojects/gamespy/libraries/ghttp/asm/include/ghttpcommon.inc index b0be02ce6f..35ee856977 100644 --- a/subprojects/gamespy/libraries/ghttp/asm/include/ghttpcommon.inc +++ b/subprojects/gamespy/libraries/ghttp/asm/include/ghttpcommon.inc @@ -1,5 +1,5 @@ .public memmove -.public ov4_021EA840 +.public current_time .public ov4_021EAE04 .public ov4_021EAE48 .public GOAGetLastError diff --git a/subprojects/gamespy/libraries/ghttp/asm/include/ghttpprocess.inc b/subprojects/gamespy/libraries/ghttp/asm/include/ghttpprocess.inc index f254171d77..5175c8051c 100644 --- a/subprojects/gamespy/libraries/ghttp/asm/include/ghttpprocess.inc +++ b/subprojects/gamespy/libraries/ghttp/asm/include/ghttpprocess.inc @@ -11,7 +11,7 @@ .public atoi .public DWCi_GsMalloc .public DWCi_GsFree -.public ov4_021EA840 +.public current_time .public ov4_021EA8A4 .public ov4_021EA8AC .public ov4_021EA924 @@ -19,7 +19,7 @@ .public ov4_021EAA74 .public ov4_021EACDC .public ov4_021EAD78 -.public ov4_021EAF1C +.public inet_addr .public GOAGetLastError .public SOC_GetHostByName .public ov60_02220130 diff --git a/subprojects/gamespy/libraries/gp/asm/gpi.s b/subprojects/gamespy/libraries/gp/asm/gpi.s index b9d3c6f184..0f672d8c57 100644 --- a/subprojects/gamespy/libraries/gp/asm/gpi.s +++ b/subprojects/gamespy/libraries/gp/asm/gpi.s @@ -85,7 +85,7 @@ _021EBE94: ldmia sp!, {r3, r4, r5, r6, pc} _021EBEF0: bl ov4_021EA8A4 - bl ov4_021EA840 + bl current_time bl srand ldr r1, [sp] mov r0, #0 diff --git a/subprojects/gamespy/libraries/gp/asm/include/gpi.inc b/subprojects/gamespy/libraries/gp/asm/include/gpi.inc index 10f14e272f..1939062f4c 100644 --- a/subprojects/gamespy/libraries/gp/asm/include/gpi.inc +++ b/subprojects/gamespy/libraries/gp/asm/include/gpi.inc @@ -10,7 +10,7 @@ .public DWCi_GsRealloc .public DWCi_GsFree .public ov4_021EA364 -.public ov4_021EA840 +.public current_time .public ov4_021EA898 .public ov4_021EA8A4 .public ov4_021EBF14 diff --git a/subprojects/gamespy/libraries/gt2/asm/gt2auth.s b/subprojects/gamespy/libraries/gt2/asm/gt2auth.s index 35e6b89c02..aaaf535859 100644 --- a/subprojects/gamespy/libraries/gt2/asm/gt2auth.s +++ b/subprojects/gamespy/libraries/gt2/asm/gt2auth.s @@ -64,7 +64,7 @@ ov4_021F71C4: ; 0x021F71C4 mov r3, #0x2b bl __msl_assertion_failed _021F71E4: - bl ov4_021EA840 + bl current_time bl srand bl rand ldr r5, _021F72DC ; =0x2C0B02C1 diff --git a/subprojects/gamespy/libraries/gt2/asm/gt2connection.s b/subprojects/gamespy/libraries/gt2/asm/gt2connection.s index 5d6654c83d..aba60cf8fa 100644 --- a/subprojects/gamespy/libraries/gt2/asm/gt2connection.s +++ b/subprojects/gamespy/libraries/gt2/asm/gt2connection.s @@ -153,7 +153,7 @@ ov4_021F8110: ; 0x021F8110 addeq sp, sp, #4 moveq r0, #0 ldmeqia sp!, {r3, r4, pc} - bl ov4_021EA840 + bl current_time str r0, [r4, #0x88] mov r0, #1 add sp, sp, #4 diff --git a/subprojects/gamespy/libraries/gt2/asm/gt2message.s b/subprojects/gamespy/libraries/gt2/asm/gt2message.s index 695e53e371..e84e202430 100644 --- a/subprojects/gamespy/libraries/gt2/asm/gt2message.s +++ b/subprojects/gamespy/libraries/gt2/asm/gt2message.s @@ -433,7 +433,7 @@ _021F8D3C: _021F8D78: mov r0, #4 str r0, [r6, #0xc] - bl ov4_021EA840 + bl current_time ldr r2, [r6, #0x8c] add r1, r5, #0x20 sub r0, r0, r2 @@ -822,7 +822,7 @@ ov4_021F928C: ; 0x021F928C ldmneia sp!, {r4, pc} mov r0, #1 str r0, [r4, #0x90] - bl ov4_021EA840 + bl current_time str r0, [r4, #0x94] ldmia sp!, {r4, pc} arm_func_end ov4_021F928C @@ -1042,7 +1042,7 @@ ov4_021F9534: ; 0x021F9534 ldrb r0, [r5, #7] strb r1, [r2, #2] strb r0, [r2, #3] - bl ov4_021EA840 + bl current_time mov r2, r0 ldr r1, [sp] mov r0, r4 @@ -1360,7 +1360,7 @@ _021F99CC: ldr r0, [r4, #0x20] cmp r0, #0 beq _021F9A0C - bl ov4_021EA840 + bl current_time ldr r2, [r4, #0x1c] ldr r1, [r4, #0x20] sub r0, r0, r2 @@ -1496,7 +1496,7 @@ ov4_021F9B98: ; 0x021F9B98 str r0, [sp] str r2, [sp, #4] strh r1, [sp, #8] - bl ov4_021EA840 + bl current_time str r0, [sp, #0xc] ldr r0, [r5, #0x60] bl ov4_021E9BBC diff --git a/subprojects/gamespy/libraries/gt2/asm/gt2socket.s b/subprojects/gamespy/libraries/gt2/asm/gt2socket.s index 7019e3c8b2..c5b732f8a6 100644 --- a/subprojects/gamespy/libraries/gt2/asm/gt2socket.s +++ b/subprojects/gamespy/libraries/gt2/asm/gt2socket.s @@ -271,7 +271,7 @@ ov4_021FA678: ; 0x021FA678 strh r4, [r0, #4] ldr r0, [sp] str r7, [r0, #8] - bl ov4_021EA840 + bl current_time ldr r2, [sp] mov r1, #0 str r0, [r2, #0x1c] @@ -587,7 +587,7 @@ ov4_021FAB4C: ; 0x021FAB4C stmfd sp!, {r3, r4, lr} sub sp, sp, #4 mov r4, r0 - bl ov4_021EA840 + bl current_time str r0, [sp] ldr r0, [r4, #0xc] ldr r1, _021FAB84 ; =ov4_021FAAF4 diff --git a/subprojects/gamespy/libraries/gt2/asm/gt2utility.s b/subprojects/gamespy/libraries/gt2/asm/gt2utility.s index 233595ce49..d4f93d0694 100644 --- a/subprojects/gamespy/libraries/gt2/asm/gt2utility.s +++ b/subprojects/gamespy/libraries/gt2/asm/gt2utility.s @@ -142,7 +142,7 @@ _021FADBC: cmp r8, #0 beq _021FAE00 mov r0, r8 - bl ov4_021EAF1C + bl inet_addr mov r4, r0 mvn r0, #0 cmp r4, r0 diff --git a/subprojects/gamespy/libraries/gt2/asm/include/gt2auth.inc b/subprojects/gamespy/libraries/gt2/asm/include/gt2auth.inc index b1537acf68..7b09fb0cd6 100644 --- a/subprojects/gamespy/libraries/gt2/asm/include/gt2auth.inc +++ b/subprojects/gamespy/libraries/gt2/asm/include/gt2auth.inc @@ -4,5 +4,5 @@ .public srand .public strlen .public _s32_div_f -.public ov4_021EA840 +.public current_time .public ov4_021F7128 diff --git a/subprojects/gamespy/libraries/gt2/asm/include/gt2connection.inc b/subprojects/gamespy/libraries/gt2/asm/include/gt2connection.inc index c5f85b5dda..50a6f00e38 100644 --- a/subprojects/gamespy/libraries/gt2/asm/include/gt2connection.inc +++ b/subprojects/gamespy/libraries/gt2/asm/include/gt2connection.inc @@ -6,7 +6,7 @@ .public ov4_021E9BC4 .public ov4_021E9C2C .public ov4_021EA4F4 -.public ov4_021EA840 +.public current_time .public ov4_021F71C4 .public ov4_021F72E0 .public ov4_021F77F4 diff --git a/subprojects/gamespy/libraries/gt2/asm/include/gt2message.inc b/subprojects/gamespy/libraries/gt2/asm/include/gt2message.inc index 8598ed2579..5ed77831fd 100644 --- a/subprojects/gamespy/libraries/gt2/asm/include/gt2message.inc +++ b/subprojects/gamespy/libraries/gt2/asm/include/gt2message.inc @@ -6,7 +6,7 @@ .public ov4_021E9C2C .public ov4_021E9D30 .public ov4_021E9E40 -.public ov4_021EA840 +.public current_time .public ov4_021EAB6C .public ov4_021EAE18 .public GOAGetLastError diff --git a/subprojects/gamespy/libraries/gt2/asm/include/gt2socket.inc b/subprojects/gamespy/libraries/gt2/asm/include/gt2socket.inc index e9100ddec4..e48cd878b1 100644 --- a/subprojects/gamespy/libraries/gt2/asm/include/gt2socket.inc +++ b/subprojects/gamespy/libraries/gt2/asm/include/gt2socket.inc @@ -13,7 +13,7 @@ .public ov4_021EA4F4 .public ov4_021EA598 .public ov4_021EA73C -.public ov4_021EA840 +.public current_time .public ov4_021EA8A4 .public ov4_021EA8A8 .public ov4_021EAB94 diff --git a/subprojects/gamespy/libraries/gt2/asm/include/gt2utility.inc b/subprojects/gamespy/libraries/gt2/asm/include/gt2utility.inc index 7cb5cff7d9..a6be7a8daf 100644 --- a/subprojects/gamespy/libraries/gt2/asm/include/gt2utility.inc +++ b/subprojects/gamespy/libraries/gt2/asm/include/gt2utility.inc @@ -4,6 +4,6 @@ .public strlen .public strchr .public atoi -.public ov4_021EAF1C +.public inet_addr .public SOC_GetHostByName .public SOC_InetNtoA diff --git a/subprojects/gamespy/libraries/natneg/asm/include/natneg.inc b/subprojects/gamespy/libraries/natneg/asm/include/natneg.inc index 1f100e26c6..d31b371ab3 100644 --- a/subprojects/gamespy/libraries/natneg/asm/include/natneg.inc +++ b/subprojects/gamespy/libraries/natneg/asm/include/natneg.inc @@ -8,7 +8,7 @@ .public ov4_021E9BC4 .public ov4_021E9C2C .public ov4_021E9DB0 -.public ov4_021EA840 +.public current_time .public ov4_021EAB6C .public ov4_021EABBC .public ov4_021EAC48 @@ -17,7 +17,7 @@ .public ov4_021EAE18 .public ov4_021EAE5C .public ov4_021EAEF0 -.public ov4_021EAF1C +.public inet_addr .public ov4_021FAE80 .public ov4_021FAEE8 .public ov4_021FAF18 diff --git a/subprojects/gamespy/libraries/natneg/asm/natneg.s b/subprojects/gamespy/libraries/natneg/asm/natneg.s index 16eacc6da6..c005d0d45a 100644 --- a/subprojects/gamespy/libraries/natneg/asm/natneg.s +++ b/subprojects/gamespy/libraries/natneg/asm/natneg.s @@ -378,7 +378,7 @@ _021FB2EC: mov r3, r5 bl ov4_021FB068 _021FB370: - bl ov4_021EA840 + bl current_time add r0, r0, #0x1f4 str r0, [r6, #0x28] mov r0, #0x1e @@ -454,7 +454,7 @@ ov4_021FB39C: ; 0x021FB39C ldrh r2, [r4, #0x30] ldr r1, [r4, #0x2c] bl ov4_021FB068 - bl ov4_021EA840 + bl current_time add r0, r0, #0x2bc str r0, [r4, #0x28] mov r0, #0xc @@ -473,7 +473,7 @@ _021FB4B8: .word NNMagicData ov4_021FB4BC: ; 0x021FB4BC stmfd sp!, {r4, lr} mov r4, r0 - bl ov4_021EAF1C + bl inet_addr mvn r1, #0 cmp r0, r1 ldmneia sp!, {r4, pc} @@ -672,7 +672,7 @@ _021FB754: cmp r0, #0 cmpne r0, #2 bne _021FB7CC - bl ov4_021EA840 + bl current_time ldr r1, [sb, #0x28] cmp r0, r1 bls _021FB7CC @@ -704,7 +704,7 @@ _021FB7CC: ldr r0, [sb, #0x10] cmp r0, #3 bne _021FB84C - bl ov4_021EA840 + bl current_time ldr r1, [sb, #0x28] cmp r0, r1 bls _021FB84C @@ -739,7 +739,7 @@ _021FB84C: cmp r0, #1 addne sp, sp, #0x1c ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} - bl ov4_021EA840 + bl current_time ldr r1, [sb, #0x28] cmp r0, r1 addls sp, sp, #0x1c @@ -926,7 +926,7 @@ _021FBAC0: _021FBADC: mov r0, #3 str r0, [r5, #0x10] - bl ov4_021EA840 + bl current_time add r0, r0, #0x388 add r0, r0, #0x1000 str r0, [r5, #0x28] @@ -990,7 +990,7 @@ _021FBB5C: _021FBBC0: mov r0, #1 str r0, [r4, #0x10] - bl ov4_021EA840 + bl current_time add r0, r0, #0x710 add r0, r0, #0x2000 str r0, [r4, #0x28] diff --git a/subprojects/gamespy/libraries/qr2/asm/include/qr2.inc b/subprojects/gamespy/libraries/qr2/asm/include/qr2.inc index fd0028e568..a84a9ea8fa 100644 --- a/subprojects/gamespy/libraries/qr2/asm/include/qr2.inc +++ b/subprojects/gamespy/libraries/qr2/asm/include/qr2.inc @@ -9,14 +9,14 @@ .public _s32_div_f .public DWCi_GsMalloc .public DWCi_GsFree -.public ov4_021EA840 +.public current_time .public ov4_021EA8A8 .public ov4_021EAB6C .public ov4_021EABBC .public ov4_021EACF0 .public ov4_021EAE18 .public ov4_021EAE5C -.public ov4_021EAF1C +.public inet_addr .public ov4_021FBFD4 .public ov4_021FC080 .public qr2_buffer_add_int diff --git a/subprojects/gamespy/libraries/qr2/asm/qr2.s b/subprojects/gamespy/libraries/qr2/asm/qr2.s index 1f7f336337..a6cf7a7330 100644 --- a/subprojects/gamespy/libraries/qr2/asm/qr2.s +++ b/subprojects/gamespy/libraries/qr2/asm/qr2.s @@ -22,7 +22,7 @@ qr2_init_socketA: ; 0x021FBD94 mov r6, r0 str r0, [r5, #0] _021FBDC4: - bl ov4_021EA840 + bl current_time bl srand mov r1, r7 add r0, r6, #4 @@ -238,7 +238,7 @@ _021FC07C: .word Unk_ov4_0221B650 ov4_021FC080: ; 0x021FC080 stmfd sp!, {r3, r4, r5, lr} mov r5, r0 - bl ov4_021EA840 + bl current_time ldr r2, [r5, #0] mvn r1, #0 mov r4, r0 @@ -322,7 +322,7 @@ qr2_send_statechanged: ; 0x021FC194 ldr r0, [r4, #0xbc] cmp r0, #0 ldmeqia sp!, {r4, pc} - bl ov4_021EA840 + bl current_time ldr r2, [r4, #0xac] ldr r1, _021FC1EC ; =0x00002710 sub r0, r0, r2 @@ -496,7 +496,7 @@ ov4_021FC3A4: ; 0x021FC3A4 mov r5, r3 streq r4, [r6, #4] beq _021FC3F0 - bl ov4_021EAF1C + bl inet_addr str r0, [r6, #4] _021FC3F0: ldr r1, [r6, #4] @@ -1567,7 +1567,7 @@ ov4_021FD274: ; 0x021FD274 add r1, sp, #8 mov r3, #0 bl ov4_021EAE5C - bl ov4_021EA840 + bl current_time str r0, [r4, #0xb0] add sp, sp, #0xc add sp, sp, #0x800 @@ -1693,7 +1693,7 @@ _021FD46C: add r1, sp, #0x24 mov r3, #0 bl ov4_021EAE5C - bl ov4_021EA840 + bl current_time str r0, [sl, #0xac] str r0, [sl, #0xb0] cmp sb, #0 diff --git a/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_queryengine.inc b/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_queryengine.inc index 403e0bc790..54a2652ad1 100644 --- a/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_queryengine.inc +++ b/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_queryengine.inc @@ -1,5 +1,5 @@ .public strstr -.public ov4_021EA840 +.public current_time .public ov4_021EA8A4 .public ov4_021EAB6C .public ov4_021EACDC diff --git a/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_serverbrowsing.inc b/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_serverbrowsing.inc index a29e579d84..02948809c7 100644 --- a/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_serverbrowsing.inc +++ b/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_serverbrowsing.inc @@ -4,7 +4,7 @@ .public DWCi_GsFree .public ov4_021E9BBC .public ov4_021EA898 -.public ov4_021EAF1C +.public inet_addr .public ov4_021FDABC .public ov4_021FDB30 .public ov4_021FDB38 diff --git a/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_serverlist.inc b/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_serverlist.inc index 37f996c0b9..092b9b2bfa 100644 --- a/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_serverlist.inc +++ b/subprojects/gamespy/libraries/serverbrowsing/asm/include/sb_serverlist.inc @@ -29,7 +29,7 @@ .public ov4_021EA44C .public ov4_021EA4F4 .public ov4_021EA598 -.public ov4_021EA840 +.public current_time .public ov4_021EA8A4 .public ov4_021EA8AC .public ov4_021EAB6C @@ -39,7 +39,7 @@ .public ov4_021EAE04 .public ov4_021EAE18 .public ov4_021EAE48 -.public ov4_021EAF1C +.public inet_addr .public ov4_021FD5FC .public ov4_021FD790 .public ov4_021FE0E0 diff --git a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_queryengine.s b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_queryengine.s index 48e09fd870..3f5a0a371c 100644 --- a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_queryengine.s +++ b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_queryengine.s @@ -107,7 +107,7 @@ ov4_021FD8DC: ; 0x021FD8DC mov r4, r1 add r0, r5, #8 bl ov4_021FD7CC - bl ov4_021EA840 + bl current_time str r0, [r4, #0x1c] mov r0, #2 strb r0, [sp, #9] @@ -396,7 +396,7 @@ _021FDCB4: ldrb r0, [sb, #0x14] and r0, r0, #0xf3 strb r0, [sb, #0x14] - bl ov4_021EA840 + bl current_time ldr r2, [sb, #0x1c] mov r1, sb sub r0, r0, r2 @@ -439,7 +439,7 @@ ov4_021FDCFC: ; 0x021FDCFC ldrb r0, [r4, #0x14] and r0, r0, #0xf3 strb r0, [r4, #0x14] - bl ov4_021EA840 + bl current_time ldr r2, [r4, #0x1c] mov r1, r4 sub r0, r0, r2 @@ -582,7 +582,7 @@ _021FDF2C: .word 0x000007FF ov4_021FDF30: ; 0x021FDF30 stmfd sp!, {r3, r4, r5, r6, r7, lr} mov r6, r0 - bl ov4_021EA840 + bl current_time ldr r3, [r6, #8] mov r5, r0 cmp r3, #0 diff --git a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverbrowsing.s b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverbrowsing.s index 2e374d043c..9a6a26b78a 100644 --- a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverbrowsing.s +++ b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverbrowsing.s @@ -367,7 +367,7 @@ ServerBrowserSendMessageToServerA: ; 0x021FED44 mov r6, r2 mov r0, r1 mov r4, r3 - bl ov4_021EAF1C + bl inet_addr mov r3, r6, asr #8 mov r2, r6, lsl #8 ldr ip, [sp, #0x18] @@ -392,7 +392,7 @@ ServerBrowserSendNatNegotiateCookieToServerA: ; 0x021FED9C mov r6, r2 mov r0, r1 mov r4, r3 - bl ov4_021EAF1C + bl inet_addr mov r3, r6, asr #8 mov r2, r6, lsl #8 mov r1, r0 diff --git a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverlist.s b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverlist.s index 51b706311f..9d6138141d 100644 --- a/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverlist.s +++ b/subprojects/gamespy/libraries/serverbrowsing/asm/sb_serverlist.s @@ -568,7 +568,7 @@ _021FF58C: bl ov4_02200534 mov r0, #0 str r0, [r7, #0x5cc] - bl ov4_021EA840 + bl current_time bl srand bl ov4_021EA8A4 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -691,7 +691,7 @@ _021FF760: add r0, sp, #8 strb r2, [sp, #1] strh r1, [sp, #2] - bl ov4_021EAF1C + bl inet_addr mvn r1, #0 str r0, [sp, #4] cmp r0, r1 @@ -2774,7 +2774,7 @@ _0220144C: cmp r0, #0 bne _022013D0 _0220145C: - bl ov4_021EA840 + bl current_time ldr r1, [sl, #0x4b4] sub r0, r0, r1 cmp r0, #0x7d0 diff --git a/subprojects/ppwlobby/libraries/ilobby/asm/dwci_lobbydata.s b/subprojects/ppwlobby/libraries/ilobby/asm/dwci_lobbydata.s index 6e837201bc..eb2c235811 100644 --- a/subprojects/ppwlobby/libraries/ilobby/asm/dwci_lobbydata.s +++ b/subprojects/ppwlobby/libraries/ilobby/asm/dwci_lobbydata.s @@ -253,7 +253,7 @@ ov66_022468DC: ; 0x022468DC stmfd sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl ov4_021EA840 + bl current_time ldr r1, _02246920 ; =0x10624DD3 mov r3, #0x3e8 umull r1, ip, r0, r1 diff --git a/subprojects/ppwlobby/libraries/ilobby/asm/dwci_lobbynewhandler.s b/subprojects/ppwlobby/libraries/ilobby/asm/dwci_lobbynewhandler.s index d3b21c01e1..462150ee5d 100644 --- a/subprojects/ppwlobby/libraries/ilobby/asm/dwci_lobbynewhandler.s +++ b/subprojects/ppwlobby/libraries/ilobby/asm/dwci_lobbynewhandler.s @@ -12,7 +12,7 @@ ov66_022462DC: ; 0x022462DC ldr r0, _02246300 ; =0x0225B6E8 ldr r0, [r0, #0] ldr r0, [r0, #0] - bl ov66_022543DC + bl chatDisconnect ldr r0, _02246304 ; =0x0225B6E4 mov r1, #0 str r1, [r0, #0] diff --git a/subprojects/ppwlobby/libraries/ilobby/asm/include/dwci_lobbydata.inc b/subprojects/ppwlobby/libraries/ilobby/asm/include/dwci_lobbydata.inc index 391b7f2d81..7c8b60c037 100644 --- a/subprojects/ppwlobby/libraries/ilobby/asm/include/dwci_lobbydata.inc +++ b/subprojects/ppwlobby/libraries/ilobby/asm/include/dwci_lobbydata.inc @@ -2,7 +2,7 @@ .public printf .public atoi .public DWC_Free -.public ov4_021EA840 +.public current_time .public ov66_02236A38 .public ov66_02237908 .public ov66_022379D0 diff --git a/subprojects/ppwlobby/libraries/ilobby/asm/include/dwci_lobbynewha.inc b/subprojects/ppwlobby/libraries/ilobby/asm/include/dwci_lobbynewha.inc index 48cded7d8f..55b633fa2f 100644 --- a/subprojects/ppwlobby/libraries/ilobby/asm/include/dwci_lobbynewha.inc +++ b/subprojects/ppwlobby/libraries/ilobby/asm/include/dwci_lobbynewha.inc @@ -2,4 +2,4 @@ .public DWC_Free .public ov66_022462DC .public ov66_02246308 -.public ov66_022543DC +.public chatDisconnect diff --git a/subprojects/ppwlobby/libraries/ppwlobby/asm/dwci_lobby.s b/subprojects/ppwlobby/libraries/ppwlobby/asm/dwci_lobby.s index a26959f758..c162703ac1 100644 --- a/subprojects/ppwlobby/libraries/ppwlobby/asm/dwci_lobby.s +++ b/subprojects/ppwlobby/libraries/ppwlobby/asm/dwci_lobby.s @@ -486,7 +486,7 @@ _02243264: mov r1, r5 ldr r0, [r0, #0] ldr r0, [r0, #0] - bl ov66_02254E58 + bl chatGetChannelNumUsersA cmp r0, r6 addgt sp, sp, #0xa8 ldmgtia sp!, {r3, r4, r5, r6, r7, pc} @@ -1015,7 +1015,7 @@ _02243970: addeq r1, sp, #0x49 ldrne r1, [sp, #0x50] mov r0, r4 - bl ov66_02254258 + bl chatRetryWithNickA add r0, sp, #0x48 bl ov66_0223BADC add sp, sp, #0x60 @@ -1045,7 +1045,7 @@ _022439E4: addeq r1, sp, #0x31 ldrne r1, [sp, #0x38] mov r0, r4 - bl ov66_02254258 + bl chatRetryWithNickA add r0, sp, #0x30 bl ov66_0223BADC add sp, sp, #0x60 @@ -1078,7 +1078,7 @@ _02243A58: ldrne r2, [sp, #0x20] mov r0, r4 mov r1, #2 - bl ov66_02254320 + bl chatRegisterUniqueNickA add r0, sp, #0x18 bl ov66_0223BADC add sp, sp, #0x60 @@ -1112,7 +1112,7 @@ _02243AD8: addeq r1, sp, #1 ldrne r1, [sp, #8] mov r0, r4 - bl ov66_02254258 + bl chatRetryWithNickA add r0, sp, #0 bl ov66_0223BADC add sp, sp, #0x60 @@ -1590,7 +1590,7 @@ _02244174: mov r1, r6 ldr r0, [r0, #0] ldr r0, [r0, #0] - bl ov66_02254E58 + bl chatGetChannelNumUsersA mvn r1, #0 cmp r4, r1 moveq r5, #0 @@ -1610,7 +1610,7 @@ _022441F0: ldr r0, [r0, #0] mov r2, r4 ldr r0, [r0, #0] - bl ov66_02254D68 + bl chatSetChannelLimitA _02244208: cmp r5, #1 bne _02244274 @@ -1636,7 +1636,7 @@ _02244208: ldr r3, [sp, #0x88] mov r0, r8 mov r1, r6 - bl ov66_02255104 + bl chatEnumUsersA add sp, sp, #0x6c ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} _02244274: @@ -2011,7 +2011,7 @@ _022447B4: ldr r0, [r1, #0] cmp r0, #0 beq _022447C4 - bl ov66_0225448C + bl chatThink _022447C4: ldr r2, _0224495C ; =0x0225B6DC add r0, sp, #0xc @@ -2175,7 +2175,7 @@ ov66_02244988: ; 0x02244988 ldr r0, [r0, #0] ldrne r1, [sp, #8] ldr r0, [r0, #0] - bl ov66_02254F20 + bl chatInChannelA cmp r0, #1 moveq r4, #1 add r0, sp, #0 @@ -2355,7 +2355,7 @@ _02244B3C: str r4, [sp, #0x18] mov r4, #0 str r4, [sp, #0x1c] - bl ov66_022541CC + bl chatConnectSecureA mov r4, r0 add r0, sp, #0x98 bl ov66_0223BADC @@ -2524,7 +2524,7 @@ ov66_02244E98: ; 0x02244E98 cmp r1, #0 beq _02244F24 ldr r0, [r2, #0] - bl ov66_022543DC + bl chatDisconnect ldr r0, _02244F40 ; =0x0225B6DC ldr r4, [r0, #0] cmp r4, #0 @@ -2548,7 +2548,7 @@ _02244F24: str r1, [r2, #4] ldr r0, [r0, #0] ldr r0, [r0, #0] - bl ov66_022543DC + bl chatDisconnect _02244F38: mov r0, #0 ldmia sp!, {r4, pc} @@ -2697,7 +2697,7 @@ _02245004: mov r2, r7 ldr r0, [r0, #0] ldr r0, [r0, #0] - bl ov66_02254584 + bl chatEnterChannelA add r0, sp, #0x1c bl ov66_0223BADC add r0, sp, #0x28 @@ -2774,7 +2774,7 @@ _02245228: ldr r0, [r0, #0] ldrne r1, [sp, #0x20] ldr r0, [r0, #0] - bl ov66_022546D4 + bl chatLeaveChannelA add r0, sp, #0x18 bl ov66_0223BADC add r0, sp, #0x24 @@ -2856,7 +2856,7 @@ _02245334: ldrne r1, [sp, #8] ldr r0, [r0, #0] mov r3, #3 - bl ov66_02254798 + bl chatSendChannelMessageA add r0, sp, #0 bl ov66_0223BADC add r0, sp, #0xc @@ -2932,7 +2932,7 @@ _02245480: ldrne r1, [sp, #8] ldr r0, [r0, #0] mov r3, #3 - bl ov66_0225524C + bl chatSendUserMessageA add r0, sp, #0 bl ov66_0223BADC mov r0, #0 @@ -3059,7 +3059,7 @@ _02245610: mov r3, #1 ldr r0, [r0, #0] ldr r0, [r0, #0] - bl ov66_02255450 + bl chatSetChannelKeysA add r0, sp, #8 bl ov66_0223BADC add r0, sp, #0x14 @@ -3220,7 +3220,7 @@ _02245830: mov r3, #1 ldr r0, [r0, #0] ldr r0, [r0, #0] - bl ov66_022557EC + bl chatGetChannelKeysA add r0, sp, #0x20 bl ov66_0223BADC add r0, sp, #0x2c @@ -3321,7 +3321,7 @@ _022459C0: ldr r2, _02245A78 ; =ov66_02243D28 ldr r0, [r0, #0] ldr r3, _02245A7C ; =ov66_02243B74 - bl ov66_0225449C + bl chatEnumChannelsA add r0, sp, #0x18 bl ov66_0223BADC add r0, sp, #0x24 @@ -3384,7 +3384,7 @@ _02245AE8: ldr r0, [r0, #0] ldrne r1, [sp, #0x34] ldr r0, [r0, #0] - bl ov66_02254F20 + bl chatInChannelA cmp r0, #0 moveq r4, #1 add r0, sp, #0x2c @@ -3447,7 +3447,7 @@ _02245B9C: ldr r2, _02245C50 ; =ov66_02243D30 ldr r0, [r0, #0] mov r3, r4 - bl ov66_02255104 + bl chatEnumUsersA add r0, sp, #0x14 bl ov66_0223BADC add r0, sp, #0x20 @@ -3509,7 +3509,7 @@ _02245CB8: ldr r0, [r0, #0] ldrne r1, [sp, #8] ldr r0, [r0, #0] - bl ov66_0225497C + bl chatSetChannelModeA add r0, sp, #0 bl ov66_0223BADC add r0, sp, #0xc @@ -3600,7 +3600,7 @@ _02245DC4: ldr r2, _02245E78 ; =ov66_02244620 ldr r0, [r0, #0] mov r3, r4 - bl ov66_02254B7C + bl chatGetChannelModeA add r0, sp, #0x14 bl ov66_0223BADC add r0, sp, #0x20 diff --git a/subprojects/ppwlobby/libraries/ppwlobby/asm/include/dwci_lobby.inc b/subprojects/ppwlobby/libraries/ppwlobby/asm/include/dwci_lobby.inc index e6ed43ab88..f1ae4133ef 100644 --- a/subprojects/ppwlobby/libraries/ppwlobby/asm/include/dwci_lobby.inc +++ b/subprojects/ppwlobby/libraries/ppwlobby/asm/include/dwci_lobby.inc @@ -94,21 +94,21 @@ .public ov66_02247690 .public ov66_022476C8 .public ov66_02247704 -.public ov66_022541CC -.public ov66_02254258 -.public ov66_02254320 -.public ov66_022543DC -.public ov66_0225448C -.public ov66_0225449C -.public ov66_02254584 -.public ov66_022546D4 -.public ov66_02254798 -.public ov66_0225497C -.public ov66_02254B7C -.public ov66_02254D68 -.public ov66_02254E58 -.public ov66_02254F20 -.public ov66_02255104 -.public ov66_0225524C -.public ov66_02255450 -.public ov66_022557EC +.public chatConnectSecureA +.public chatRetryWithNickA +.public chatRegisterUniqueNickA +.public chatDisconnect +.public chatThink +.public chatEnumChannelsA +.public chatEnterChannelA +.public chatLeaveChannelA +.public chatSendChannelMessageA +.public chatSetChannelModeA +.public chatGetChannelModeA +.public chatSetChannelLimitA +.public chatGetChannelNumUsersA +.public chatInChannelA +.public chatEnumUsersA +.public chatSendUserMessageA +.public chatSetChannelKeysA +.public chatGetChannelKeysA diff --git a/subprojects/ppwlobby/libraries/ppwlobby/asm/include/ppw_lobby.inc b/subprojects/ppwlobby/libraries/ppwlobby/asm/include/ppw_lobby.inc index 5a93ed1bf9..743a1cd788 100644 --- a/subprojects/ppwlobby/libraries/ppwlobby/asm/include/ppw_lobby.inc +++ b/subprojects/ppwlobby/libraries/ppwlobby/asm/include/ppw_lobby.inc @@ -21,7 +21,7 @@ .public DWC_GetDateTime .public DWC_Base64Encode .public DWC_Base64Decode -.public ov4_021EA840 +.public current_time .public ov66_02235058 .public PPW_LobbyShutdownAsync .public ov66_02235B8C diff --git a/subprojects/ppwlobby/libraries/ppwlobby/asm/ppw_lobby.s b/subprojects/ppwlobby/libraries/ppwlobby/asm/ppw_lobby.s index 66bab0f79b..2171f4ad9f 100644 --- a/subprojects/ppwlobby/libraries/ppwlobby/asm/ppw_lobby.s +++ b/subprojects/ppwlobby/libraries/ppwlobby/asm/ppw_lobby.s @@ -1827,7 +1827,7 @@ _02236860: strb r0, [r3, #1] add r3, r3, #2 bne _02236860 - bl ov4_021EA840 + bl current_time ldr r1, _022369F0 ; =0x10624DD3 mov r3, #0x3e8 umull r1, r2, r0, r1 @@ -3123,7 +3123,7 @@ ov66_02237A88: ; 0x02237A88 mov r5, r0 ldr r0, [r1, #0] ldr r4, [r0, #0x4c] - bl ov4_021EA840 + bl current_time mov ip, r0 ldr r0, _02237AD4 ; =0x10624DD3 mov r1, #0x3e8