Skip to content

Commit 31ff0bc

Browse files
actually match shit???
1 parent 8c7c082 commit 31ff0bc

File tree

8 files changed

+219
-151
lines changed

8 files changed

+219
-151
lines changed

config/B5RE/arm9/delinks.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,12 @@
99

1010
src/gfx3d/Renderable.cpp:
1111
.text start:0x0201a36c end:0x0201a3a4
12-
.data start:0x02135798 end:0x021357b0
12+
.data start:0x02135790 end:0x021357b0
13+
14+
src/network/MessageParams.cpp:
15+
.text start:0x020335dc end:0x02033654
16+
.data start:0x02136a34 end:0x02136a5c
17+
18+
src/network/CommData.cpp:
19+
.text start:0x02033654 end:0x020339f8
20+
.data start:0x02136a5c end:0x02136af4

config/B5RE/arm9/relocs.txt

Lines changed: 39 additions & 39 deletions
Large diffs are not rendered by default.

config/B5RE/arm9/symbols.txt

Lines changed: 118 additions & 108 deletions
Large diffs are not rendered by default.

src/network/CommData.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#include "CommData.h"
2+
3+
CommData::CommData() {
4+
unk_0x8 = 0;
5+
Virt_0xc();
6+
}
7+
8+
void CommData::Virt_0x8() {}
9+
10+
PacketCommData::PacketCommData() { Virt_0xc(); }

src/network/CommData.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#pragma once
2+
3+
#include <types.h>
4+
5+
class CommData {
6+
public:
7+
CommData();
8+
u32 unk_0x4;
9+
u32 unk_0x8;
10+
11+
virtual void Virt_0x0() {}
12+
virtual ~CommData() {}
13+
virtual void Virt_0x8();
14+
virtual void Virt_0xc();
15+
};
16+
17+
class PacketCommData : public CommData {
18+
public:
19+
PacketCommData();
20+
21+
virtual void Virt_0x0() {}
22+
virtual ~PacketCommData() {}
23+
virtual void Virt_0xc();
24+
};

src/network/MessageParams.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "MessageParams.h"
2+
3+
MessageParams::MessageParams(u32 r0) : unk_0x4(r0) {}

src/network/MessageParams.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#pragma once
2+
3+
#include <types.h>
4+
5+
class MessageParams {
6+
u32 unk_0x4;
7+
8+
public:
9+
MessageParams(u32);
10+
11+
virtual void Virt_0x0() {}
12+
virtual ~MessageParams() {}
13+
};

tools/configure.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
DSD_VERSION = "v0.10.2"
5454
WIBO_VERSION = "0.7.0"
5555
OBJDIFF_VERSION = "v3.0.0"
56-
MWCC_VERSION = "2.0/sp1p5"
56+
MWCC_VERSION = "2.0/sp2p2"
5757
DECOMP_ME_COMPILER = "mwcc_30_131"
5858

5959
CC_FLAGS = " ".join(
6060
[
61-
"-O4,p", # Optimize maximally for performance
61+
"-O4",
6262
"-enum int", # Use int-sized enums
6363
"-char signed", # Char type is signed
6464
"-str reuse", # Equivalent strings are the same objects
@@ -68,7 +68,7 @@
6868
"-inline noauto", # Inline only functions marked with 'inline'
6969
"-lang=c99", # Set language to C99
7070
"-Cpp_exceptions off", # Disable C++ exceptions
71-
"-RTTI off", # Disable runtime type information
71+
"-RTTI on", # Disable runtime type information
7272
"-interworking", # Enable ARM/Thumb interworking
7373
"-w off", # Disable warnings
7474
"-sym on", # Debug info, including line numbers

0 commit comments

Comments
 (0)