Skip to content

Commit 51c85ee

Browse files
IWILLCRAFT-M0dIWILLCRAFT-M0d
committed
New split: Console.cpp 
1 parent 50fe47c commit 51c85ee

12 files changed

Lines changed: 2504 additions & 2624 deletions

File tree

‎configs/main.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ segments:
5353
subsegments:
5454
- [0x1000, cpp, text]
5555
- [0x51120, cpp, text_00150120]
56-
- [0xA1020, cpp, text_001A0020]
56+
- [0xA0570, cpp, Dogs/Code/Console]
57+
- [0xAC700, cpp, text_001AB700]
5758
- [0xE24F8, cpp, text_001E14F8]
5859
- [0x1411D8, cpp, text_002401D8]
59-
6060
- [0x17FD98, cpp, FGDK3/Code/Playstation2/Music] # -O0
6161
- [0x189B30, cpp, text_00288B30] # Sound.c?
6262
- [0x1D3D80, cpp, FGDK3/Code/Playstation2/GameShell] # -O0 - Guessed filepath and name
@@ -66,13 +66,13 @@ segments:
6666
- [0x20A778, cpp, text_00309778]
6767
- [0x211BE8, cpp, text_00310BE8]
6868
- [0x216F28, cpp, text_00315F28]
69-
7069
- [0x24D300, textbin, vutext]
7170
- [0x25A680, data, text]
7271
- [0x290EC0, data, vudata]
7372
- [0x290F00, .rodata, text]
7473
- [0x2B2DB0, .rodata, text_00150120]
75-
- [0x2D6600, .rodata, text_001A0020]
74+
- [0x2D5B18, .rodata, Dogs/Code/Console]
75+
- [0x2D7AA0, .rodata, text_001AB700]
7676
- [0x2E6400, .rodata, text_001E14F8]
7777
- [0x333BB0, .rodata, text_002401D8]
7878
- [0x33DA50, .rodata, FGDK3/Code/Playstation2/Music]

‎configs/sym.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ func_00275288 = 0x00275288; // type:func
2323
func_002963F8 = 0x002963F8; // type:func
2424
InterfaceError = 0x00296818; // type:func
2525
DDE_FatalError = 0x002d5c78; // type:func
26-
func_001A8320__3FogPv = 0x001A8320; // type:func
26+
func_001A8320__7ConsolePv = 0x001A8320; // type:func
2727
Thread_InternalInitialise = 0x0026BE00; // type:func
2828
Create__Q29Semaphore14Implementationii = 0x0026BB40; // type:func
29+
__tf17Controller_Device = 0x002FCF00;
30+
__tf12ConsoleLayer = 0x001AB658;
2931

3032
// TODO: replace with properly mangled counterparts. From game strings leftovers.
3133
// void Music_Piece::Music_Piece(Music_Piece *this) = 0x0027f988; // type:func
@@ -58,4 +60,6 @@ _vt$11Music_Piece = 0x0043CE18;
5860
_vt$11Music_Track = 0x0043CE90;
5961
_vt$13Music_Channel = 0x0043CF98;
6062
_vt$12CreateAction = 0x0043CF78;
63+
_vt$18InputDevice_Device = 0x00447148;
64+
_vt$17Controller_Device = 0x00447338;
6165
TheGame = 0x0044EB68;

‎include/Dogs/Console.h‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
#ifndef CONSOLE_H
2+
#define CONSOLE_H
3+
4+
#include <stdarg.h>
5+
#include <eekernel.h>
6+
7+
#ifdef __cplusplus
8+
extern "C" {
9+
#endif
10+
11+
void func_001A0D80(int, int, int);
12+
void func_001A0B90(int, char*, int);
13+
14+
15+
void func_001A12A0(char arg0, int arg1);
16+
void func_001A12D8(char arg0, int arg1);
17+
void func_001A1310(char arg0, int arg1);
18+
void func_001A1348(char arg0, int arg1);
19+
void func_001A1380(char arg0, int arg1);
20+
void func_001A13B8(char arg0, int arg1);
21+
void func_001A13F0(char arg0, int arg1);
22+
void func_001A1428(char arg0, int arg1);
23+
void func_001A1460(char arg0, int arg1);
24+
void func_001A1498(char arg0, int arg1);
25+
void func_001A14D0(char arg0, int arg1);
26+
void func_001A1508(char arg0, int arg1);
27+
void func_001A1540(char arg0, int arg1);
28+
void func_001A1578(char arg0, int arg1);
29+
void func_001A15B0(char arg0, int arg1);
30+
void func_001A15E8(char arg0, int arg1);
31+
void func_001A1620(char arg0, int arg1);
32+
void func_001A1658(char arg0, int arg1);
33+
void func_001A1690(char arg0, int arg1);
34+
void func_001A16C8(char arg0, int arg1);
35+
void func_001A1700(char arg0, int arg1);
36+
void func_001A1738(char arg0, int arg1);
37+
void func_001A1770(char arg0, int arg1);
38+
void func_001A17A8(char arg0, int arg1);
39+
void func_001A17E0(char arg0, int arg1);
40+
void func_001A1818(char arg0, int arg1);
41+
void func_001A1850(char arg0, int arg1);
42+
void func_001A1888(char arg0, int arg1);
43+
void func_001A18C0(char arg0, int arg1);
44+
void func_001A18F8(char arg0, int arg1);
45+
void func_001A1930(char arg0, int arg1);
46+
void func_001A1968(char arg0, int arg1);
47+
void func_001A19A0(char arg0, int arg1);
48+
void func_001A19D8(char arg0, int arg1);
49+
void func_001A1A10(char arg0, int arg1);
50+
void func_001A1A48(char arg0, int arg1);
51+
void func_001A1A80(char arg0, int arg1);
52+
void func_001A1AB8(char arg0, int arg1);
53+
void func_001A1AF0(char arg0, int arg1);
54+
void func_001A1B28(char arg0, int arg1);
55+
void func_001A1B60(char arg0, int arg1);
56+
57+
58+
void func_001A1B98(char arg0, int arg1);
59+
void func_001A1BC8(char arg0, int arg1);
60+
void func_001A1BF8(char arg0, int arg1);
61+
void func_001A1C28(char arg0, int arg1);
62+
void func_001A1C58(char arg0, int arg1);
63+
void func_001A1C88(char arg0, int arg1);
64+
void func_001A1CB8(char arg0, int arg1);
65+
void func_001A1CE8(char arg0, int arg1);
66+
void func_001A1D18(char arg0, int arg1);
67+
void func_001A1D48(char arg0, int arg1);
68+
void func_001A1D78(char arg0, int arg1);
69+
void func_001A1DA8(char arg0, int arg1);
70+
void func_001A1DD8(char arg0, int arg1);
71+
void func_001A1E08(char arg0, int arg1);
72+
void func_001A1E38(char arg0, int arg1);
73+
void func_001A1E68(char arg0, int arg1);
74+
void func_001A1E98(char arg0, int arg1);
75+
76+
77+
#ifdef __cplusplus
78+
}
79+
#endif
80+
81+
class Console {
82+
public:
83+
void Break();
84+
void Parse();
85+
void Patch();
86+
int RenderActorName();
87+
int RenderHoldingPoints();
88+
int RenderCarryHandles();
89+
void Quit();
90+
void func_001A8320(void* arg0);
91+
};
92+
93+
#endif

‎include/FGDK3/Fog.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,5 @@ int func_001A0250(void*, float*);
1111
}
1212
#endif
1313

14-
// Likely part of the `Console` class instead.
15-
class Fog {
16-
public:
17-
void func_001A8320(void* arg0);
18-
};
19-
2014

2115
#endif

‎include/debug.h‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,5 @@ void DDE_FatalError(char* message,...);
1818
}
1919
#endif
2020

21-
class Console {
22-
public:
23-
void Break();
24-
void Parse();
25-
void Patch();
26-
int RenderActorName();
27-
int RenderHoldingPoints();
28-
int RenderCarryHandles();
29-
void Quit();
30-
};
3121

3222
#endif

‎include/unk.h‎

Lines changed: 4 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -58,82 +58,17 @@ extern s_0044EB68* TheGame;
5858
extern "C" {
5959
#endif
6060

61-
void func_001A0B90(int, char*, int);
62-
void func_001A0D80(int, int, int);
63-
64-
65-
void func_001A12A0(char arg0, int arg1);
66-
void func_001A12D8(char arg0, int arg1);
67-
void func_001A1310(char arg0, int arg1);
68-
void func_001A1348(char arg0, int arg1);
69-
void func_001A1380(char arg0, int arg1);
70-
void func_001A13B8(char arg0, int arg1);
71-
void func_001A13F0(char arg0, int arg1);
72-
void func_001A1428(char arg0, int arg1);
73-
void func_001A1460(char arg0, int arg1);
74-
void func_001A1498(char arg0, int arg1);
75-
void func_001A14D0(char arg0, int arg1);
76-
void func_001A1508(char arg0, int arg1);
77-
void func_001A1540(char arg0, int arg1);
78-
void func_001A1578(char arg0, int arg1);
79-
void func_001A15B0(char arg0, int arg1);
80-
void func_001A15E8(char arg0, int arg1);
81-
void func_001A1620(char arg0, int arg1);
82-
void func_001A1658(char arg0, int arg1);
83-
void func_001A1690(char arg0, int arg1);
84-
void func_001A16C8(char arg0, int arg1);
85-
void func_001A1700(char arg0, int arg1);
86-
void func_001A1738(char arg0, int arg1);
87-
void func_001A1770(char arg0, int arg1);
88-
void func_001A17A8(char arg0, int arg1);
89-
void func_001A17E0(char arg0, int arg1);
90-
void func_001A1818(char arg0, int arg1);
91-
void func_001A1850(char arg0, int arg1);
92-
void func_001A1888(char arg0, int arg1);
93-
void func_001A18C0(char arg0, int arg1);
94-
void func_001A18F8(char arg0, int arg1);
95-
void func_001A1930(char arg0, int arg1);
96-
void func_001A1968(char arg0, int arg1);
97-
void func_001A19A0(char arg0, int arg1);
98-
void func_001A19D8(char arg0, int arg1);
99-
void func_001A1A10(char arg0, int arg1);
100-
void func_001A1A48(char arg0, int arg1);
101-
void func_001A1A80(char arg0, int arg1);
102-
void func_001A1AB8(char arg0, int arg1);
103-
void func_001A1AF0(char arg0, int arg1);
104-
void func_001A1B28(char arg0, int arg1);
105-
void func_001A1B60(char arg0, int arg1);
106-
107-
108-
void func_001A1B98(char arg0, int arg1);
109-
void func_001A1BC8(char arg0, int arg1);
110-
void func_001A1BF8(char arg0, int arg1);
111-
void func_001A1C28(char arg0, int arg1);
112-
void func_001A1C58(char arg0, int arg1);
113-
void func_001A1C88(char arg0, int arg1);
114-
void func_001A1CB8(char arg0, int arg1);
115-
void func_001A1CE8(char arg0, int arg1);
116-
void func_001A1D18(char arg0, int arg1);
117-
void func_001A1D48(char arg0, int arg1);
118-
void func_001A1D78(char arg0, int arg1);
119-
void func_001A1DA8(char arg0, int arg1);
120-
void func_001A1DD8(char arg0, int arg1);
121-
void func_001A1E08(char arg0, int arg1);
122-
void func_001A1E38(char arg0, int arg1);
123-
void func_001A1E68(char arg0, int arg1);
124-
void func_001A1E98(char arg0, int arg1);
125-
12661

12762
void func_001ACFC8(void);
12863
void func_001AD180(void);
12964
void func_001AD560(void);
130-
void func_001D6A10(void);
13165
void func_001C8120(void);
132-
void func_001DD518(void);
66+
void func_001D4650(void);
67+
void func_001D6A10(void);
13368
void func_001DA1B8(void);
134-
void func_001DEF10(void);
13569
void func_001DA3E8(void);
136-
void func_001D4650(void);
70+
void func_001DD518(void);
71+
void func_001DEF10(void);
13772

13873
int func_002C8358(s_func_002C8358* arg0);
13974
void func_002967C8(int* arg0, int arg1);

0 commit comments

Comments
 (0)