Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/RSBE01_02/splits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,10 @@ sora/ft/ft_system.cpp:
.bss start:0x8049EA20 end:0x8049EA30
.sbss start:0x805A0380 end:0x805A0388

sora/nt/nt_offline.cpp:
.text start:0x8014C004 end:0x8014C180
.data start:0x80460D40 end:0x80460D4C

sora/nt/d_net_connect.cpp:
.text start:0x8014CC40 end:0x8014CD5C
.data start:0x80460DC8 end:0x80460E00
Expand Down
12 changes: 6 additions & 6 deletions config/RSBE01_02/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6191,24 +6191,24 @@ fn_8014BC24 = .text:0x8014BC24; // type:function size:0xC
fn_8014BC30 = .text:0x8014BC30; // type:function size:0x300
fn_8014BF30 = .text:0x8014BF30; // type:function size:0x38
fn_8014BF68 = .text:0x8014BF68; // type:function size:0x9C
fn_8014C004 = .text:0x8014C004; // type:function size:0x18
fn_8014C01C = .text:0x8014C01C; // type:function size:0x40
fn_8014C05C = .text:0x8014C05C; // type:function size:0x124
__ct__9NtOfflineFv = .text:0x8014C004; // type:function size:0x18
__dt__9NtOfflineFv = .text:0x8014C01C; // type:function size:0x40
getFriendIndexHaveWiiID__9NtOfflineFUx = .text:0x8014C05C; // type:function size:0x124
fn_8014C180 = .text:0x8014C180; // type:function size:0x6C
fn_8014C1EC = .text:0x8014C1EC; // type:function size:0x80
fn_8014C26C = .text:0x8014C26C; // type:function size:0x344
fn_8014C5B0 = .text:0x8014C5B0; // type:function size:0x6C
fn_8014C61C = .text:0x8014C61C; // type:function size:0x138
fn_8014C754 = .text:0x8014C754; // type:function size:0x8
fn_8014C75C = .text:0x8014C75C; // type:function size:0x170
fn_8014C8CC = .text:0x8014C8CC; // type:function size:0x94
getInstance__12ntFriendInfoFv = .text:0x8014C8CC; // type:function size:0x94
fn_8014C960 = .text:0x8014C960; // type:function size:0x4
fn_8014C964 = .text:0x8014C964; // type:function size:0xC
fn_8014C970 = .text:0x8014C970; // type:function size:0xC
fn_8014C97C = .text:0x8014C97C; // type:function size:0xF0
fn_8014CA6C = .text:0x8014CA6C; // type:function size:0xB0
fn_8014CB1C = .text:0x8014CB1C; // type:function size:0x8
fn_8014CB24 = .text:0x8014CB24; // type:function size:0x1C
getFriendInfo__12ntFriendInfoFv = .text:0x8014CB24; // type:function size:0x1C
fn_8014CB40 = .text:0x8014CB40; // type:function size:0xC
fn_8014CB4C = .text:0x8014CB4C; // type:function size:0x30
fn_8014CB7C = .text:0x8014CB7C; // type:function size:0x7C
Expand Down Expand Up @@ -26176,7 +26176,7 @@ jumptable_80460848 = .data:0x80460848; // type:object size:0x28 scope:local
lbl_80460870 = .data:0x80460870; // type:object size:0x480
lbl_80460CF0 = .data:0x80460CF0; // type:object size:0x2C
lbl_80460D1C = .data:0x80460D1C; // type:object size:0x24
lbl_80460D40 = .data:0x80460D40; // type:object size:0x10
__vt__9NtOffline = .data:0x80460D40; // type:object size:0xC
lbl_80460D50 = .data:0x80460D50; // type:object size:0x11 data:string
lbl_80460D64 = .data:0x80460D64; // type:object size:0x64
lbl_80460DC8 = .data:0x80460DC8; // type:object size:0xA data:string
Expand Down
1 change: 1 addition & 0 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ def MatchingFor(*versions):
Object(Matching, "sora/ac/ac_anim_cmd_impl.cpp"),
Object(Matching, "sora/ac/ac_null.cpp"),
Object(Matching, "sora/ft/ft_system.cpp"),
Object(Matching, "sora/nt/nt_offline.cpp", extra_cflags=["-RTTI off"]),
Object(Matching, "sora/nt/d_net_connect.cpp"),
Object(Matching, "sora/nt/nt_etc_dwc.cpp", extra_cflags=["-RTTI off"]),
Object(Matching, "sora/ad/ad_static_data.cpp"),
Expand Down
2 changes: 1 addition & 1 deletion include/lib/BrawlHeaders
26 changes: 26 additions & 0 deletions src/sora/nt/nt_offline.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#include <nt/nt_offline.h>
#include <types.h>

NtOffline::NtOffline() : unk4(0) { }

NtOffline::~NtOffline() { }

u32 NtOffline::getFriendIndexHaveWiiID(u64 id) {
UnkFriendInfo* p = ntFriendInfo::getInstance()->getFriendInfo();

for (u32 i = 0; i < UnkFriendInfo::FriendRosterLimit; i++) {
if (p->unk350[i].unk0 && p->unk350[i].unk1) {
u64 x = (static_cast<u64>(p->unk5B3[i].unk0) << 56) +
(static_cast<u64>(p->unk5B3[i].unk1) << 48) +
(static_cast<u64>(p->unk5B3[i].unk2) << 40) +
(static_cast<u64>(p->unk5B3[i].unk3) << 32) +
(static_cast<u64>(p->unk5B3[i].unk4) << 24) +
(static_cast<u64>(p->unk5B3[i].unk5) << 16) +
(static_cast<u64>(p->unk5B3[i].unk6) << 8) +
(static_cast<u64>(p->unk5B3[i].unk7) << 0);
if (x == id)
return i;
}
}
return 0xFF;
}
Loading