Skip to content

Commit f8bd412

Browse files
ThiconZThiconZ
committed
V1962 - Added a lot of NaturalMotion Morpheme names
V1297 - Added SetFloatFromString, AddConsoleVariable, RenderLog_Info
1 parent ace087a commit f8bd412

2 files changed

Lines changed: 358 additions & 92 deletions

File tree

‎production/beta/FF_DISASM_V1297.json‎

Lines changed: 113 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
[
55
{
66
"Category": "fsDataPaths",
7-
"Address": "0x8F7600",
8-
"Name": "fsDataPaths::GetWorkingDirectory",
9-
"Status": 1,
7+
"Address": "0x8F1350",
8+
"Name": "fsDataPaths::OpenFile",
9+
"Status": 0,
1010
"Comment": ""
1111
},
1212
{
@@ -18,16 +18,9 @@
1818
},
1919
{
2020
"Category": "fsDataPaths",
21-
"Address": "0x8F1350",
22-
"Name": "fsDataPaths::OpenFile",
23-
"Status": 0,
24-
"Comment": ""
25-
},
26-
{
27-
"Category": "GlobalVariables",
28-
"Address": "0x15F6BA0",
29-
"Name": "g_oConsoleSystem",
30-
"Status": 0,
21+
"Address": "0x8F7600",
22+
"Name": "fsDataPaths::GetWorkingDirectory",
23+
"Status": 1,
3124
"Comment": ""
3225
},
3326
{
@@ -39,10 +32,17 @@
3932
},
4033
{
4134
"Category": "GlobalVariables",
42-
"Address": "0x19DFC10",
43-
"Name": "g_sl_console_log_instance_loglevel",
35+
"Address": "0x1510A70",
36+
"Name": "g_oConsole_LastExecutedConsoleCommand",
37+
"Status": 2,
38+
"Comment": ""
39+
},
40+
{
41+
"Category": "GlobalVariables",
42+
"Address": "0x15B9520",
43+
"Name": "g_sl_consoleEnabled",
4444
"Status": 0,
45-
"Comment": "int"
45+
"Comment": ""
4646
},
4747
{
4848
"Category": "GlobalVariables",
@@ -60,17 +60,17 @@
6060
},
6161
{
6262
"Category": "GlobalVariables",
63-
"Address": "0x15B9520",
64-
"Name": "g_sl_consoleEnabled",
63+
"Address": "0x15F6BA0",
64+
"Name": "g_oConsoleSystem",
6565
"Status": 0,
6666
"Comment": ""
6767
},
6868
{
6969
"Category": "GlobalVariables",
70-
"Address": "0x1510A70",
71-
"Name": "g_oConsole_LastExecutedConsoleCommand",
72-
"Status": 2,
73-
"Comment": ""
70+
"Address": "0x19DFC10",
71+
"Name": "g_sl_console_log_instance_loglevel",
72+
"Status": 0,
73+
"Comment": "int"
7474
},
7575
{
7676
"Category": "oConsoleSystem",
@@ -107,11 +107,18 @@
107107
"Status": 0,
108108
"Comment": ""
109109
},
110+
{
111+
"Category": "sl::Math::MathHelpers",
112+
"Address": "0x628AF0",
113+
"Name": "sl::Math::MathHelpers::SetFloatFromString",
114+
"Status": 0,
115+
"Comment": "(float, string, size)"
116+
},
110117
{
111118
"Category": "sl::oBuffer",
112-
"Address": "0xAF5270",
113-
"Name": "sl::oBuffer::Write",
114-
"Status": 1,
119+
"Address": "0xAF5130",
120+
"Name": "sl::oBuffer::sub_AF5130",
121+
"Status": 3,
115122
"Comment": ""
116123
},
117124
{
@@ -123,9 +130,9 @@
123130
},
124131
{
125132
"Category": "sl::oBuffer",
126-
"Address": "0xAF5130",
127-
"Name": "sl::oBuffer::sub_AF5130",
128-
"Status": 3,
133+
"Address": "0xAF5270",
134+
"Name": "sl::oBuffer::Write",
135+
"Status": 1,
129136
"Comment": ""
130137
},
131138
{
@@ -135,6 +142,13 @@
135142
"Status": 0,
136143
"Comment": ""
137144
},
145+
{
146+
"Category": "slConsole",
147+
"Address": "0xA9E200",
148+
"Name": "slConsole::AddConsoleVariable",
149+
"Status": 0,
150+
"Comment": "Returns reference to added cvar"
151+
},
138152
{
139153
"Category": "slConsole",
140154
"Address": "0xB16C60",
@@ -163,13 +177,6 @@
163177
"Status": 0,
164178
"Comment": ""
165179
},
166-
{
167-
"Category": "slini",
168-
"Address": "0x8EC910",
169-
"Name": "slini::ConvertToBool",
170-
"Status": 0,
171-
"Comment": ""
172-
},
173180
{
174181
"Category": "slini",
175182
"Address": "0x8EC410",
@@ -178,10 +185,10 @@
178185
"Comment": ""
179186
},
180187
{
181-
"Category": "slLog",
182-
"Address": "0x8D6D30",
183-
"Name": "slLog::GetLogLevelFromString",
184-
"Status": 1,
188+
"Category": "slini",
189+
"Address": "0x8EC910",
190+
"Name": "slini::ConvertToBool",
191+
"Status": 0,
185192
"Comment": ""
186193
},
187194
{
@@ -193,23 +200,30 @@
193200
},
194201
{
195202
"Category": "slLog",
196-
"Address": "0x8D7270",
197-
"Name": "slLog::GetInstance",
203+
"Address": "0x404AB0",
204+
"Name": "slLog::ApplyLogLevel",
198205
"Status": 0,
199206
"Comment": ""
200207
},
201208
{
202209
"Category": "slLog",
203-
"Address": "0x8DFD90",
204-
"Name": "slLog::GetInstance_ConsoleLog",
205-
"Status": 1,
210+
"Address": "0x421D60",
211+
"Name": "slLog::Error",
212+
"Status": 0,
206213
"Comment": ""
207214
},
208215
{
209216
"Category": "slLog",
210-
"Address": "0x8D7400",
211-
"Name": "slLog::Log",
212-
"Status": 2,
217+
"Address": "0x421D90",
218+
"Name": "slLog::Info2",
219+
"Status": 0,
220+
"Comment": ""
221+
},
222+
{
223+
"Category": "slLog",
224+
"Address": "0x8D6D30",
225+
"Name": "slLog::GetLogLevelFromString",
226+
"Status": 1,
213227
"Comment": ""
214228
},
215229
{
@@ -221,23 +235,23 @@
221235
},
222236
{
223237
"Category": "slLog",
224-
"Address": "0x421D90",
225-
"Name": "slLog::Info2",
238+
"Address": "0x8D7270",
239+
"Name": "slLog::GetInstance",
226240
"Status": 0,
227241
"Comment": ""
228242
},
229243
{
230244
"Category": "slLog",
231-
"Address": "0x421D60",
232-
"Name": "slLog::Error",
233-
"Status": 0,
245+
"Address": "0x8D7400",
246+
"Name": "slLog::Log",
247+
"Status": 2,
234248
"Comment": ""
235249
},
236250
{
237251
"Category": "slLog",
238-
"Address": "0x404AB0",
239-
"Name": "slLog::ApplyLogLevel",
240-
"Status": 0,
252+
"Address": "0x8DFD90",
253+
"Name": "slLog::GetInstance_ConsoleLog",
254+
"Status": 1,
241255
"Comment": ""
242256
},
243257
{
@@ -247,6 +261,13 @@
247261
"Status": 1,
248262
"Comment": ""
249263
},
264+
{
265+
"Category": "slLog",
266+
"Address": "0x421160",
267+
"Name": "slLog::RenderLog_Info",
268+
"Status": 0,
269+
"Comment": ""
270+
},
250271
{
251272
"Category": "slParser",
252273
"Address": "0x8F5050",
@@ -256,16 +277,16 @@
256277
},
257278
{
258279
"Category": "slString",
259-
"Address": "0x8E41A0",
260-
"Name": "slString::Format",
261-
"Status": 1,
280+
"Address": "0x423110",
281+
"Name": "slString::ctor_2",
282+
"Status": 2,
262283
"Comment": ""
263284
},
264285
{
265286
"Category": "slString",
266-
"Address": "0x8E4710",
267-
"Name": "slString::ToLower",
268-
"Status": 0,
287+
"Address": "0x423C20",
288+
"Name": "slString::ctor",
289+
"Status": 2,
269290
"Comment": ""
270291
},
271292
{
@@ -277,16 +298,9 @@
277298
},
278299
{
279300
"Category": "slString",
280-
"Address": "0x423110",
281-
"Name": "slString::ctor_2",
282-
"Status": 2,
283-
"Comment": ""
284-
},
285-
{
286-
"Category": "slString",
287-
"Address": "0x423C20",
288-
"Name": "slString::ctor",
289-
"Status": 2,
301+
"Address": "0x8E41A0",
302+
"Name": "slString::Format",
303+
"Status": 1,
290304
"Comment": ""
291305
},
292306
{
@@ -297,16 +311,16 @@
297311
"Comment": ""
298312
},
299313
{
300-
"Category": "slSystem",
301-
"Address": "0x909F80",
302-
"Name": "slSystem::SafeAssert",
314+
"Category": "slString",
315+
"Address": "0x8E4710",
316+
"Name": "slString::ToLower",
303317
"Status": 0,
304318
"Comment": ""
305319
},
306320
{
307321
"Category": "slSystem",
308-
"Address": "0x909C80",
309-
"Name": "slSystem::Assert",
322+
"Address": "0x8F4C90",
323+
"Name": "shell_process_command_line_arguments",
310324
"Status": 0,
311325
"Comment": ""
312326
},
@@ -317,6 +331,13 @@
317331
"Status": 1,
318332
"Comment": ""
319333
},
334+
{
335+
"Category": "slSystem",
336+
"Address": "0x909C80",
337+
"Name": "slSystem::Assert",
338+
"Status": 0,
339+
"Comment": ""
340+
},
320341
{
321342
"Category": "slSystem",
322343
"Address": "0x909DE4",
@@ -347,8 +368,8 @@
347368
},
348369
{
349370
"Category": "slSystem",
350-
"Address": "0x8F4C90",
351-
"Name": "shell_process_command_line_arguments",
371+
"Address": "0x909F80",
372+
"Name": "slSystem::SafeAssert",
352373
"Status": 0,
353374
"Comment": ""
354375
},
@@ -368,44 +389,44 @@
368389
},
369390
{
370391
"Category": "tfApplication",
371-
"Address": "0x405870",
372-
"Name": "tfApplication::Initialize",
392+
"Address": "0x403EE0",
393+
"Name": "tfApplication::NotifyShutdownEvent",
373394
"Status": 0,
374395
"Comment": ""
375396
},
376397
{
377398
"Category": "tfApplication",
378-
"Address": "0x407200",
379-
"Name": "tfApplication::Start",
399+
"Address": "0x404110",
400+
"Name": "tfApplication::ShowErrorMessageBox",
380401
"Status": 0,
381402
"Comment": ""
382403
},
383404
{
384405
"Category": "tfApplication",
385-
"Address": "0x440650",
386-
"Name": "tfApplication::EnsureDebuggerOrDumptruckWrapper",
387-
"Status": 1,
406+
"Address": "0x405190",
407+
"Name": "tfApplication::LoadConfigs",
408+
"Status": 0,
388409
"Comment": ""
389410
},
390411
{
391412
"Category": "tfApplication",
392-
"Address": "0x405190",
393-
"Name": "tfApplication::LoadConfigs",
413+
"Address": "0x405870",
414+
"Name": "tfApplication::Initialize",
394415
"Status": 0,
395416
"Comment": ""
396417
},
397418
{
398419
"Category": "tfApplication",
399-
"Address": "0x404110",
400-
"Name": "tfApplication::ShowErrorMessageBox",
420+
"Address": "0x407200",
421+
"Name": "tfApplication::Start",
401422
"Status": 0,
402423
"Comment": ""
403424
},
404425
{
405426
"Category": "tfApplication",
406-
"Address": "0x403EE0",
407-
"Name": "tfApplication::NotifyShutdownEvent",
408-
"Status": 0,
427+
"Address": "0x440650",
428+
"Name": "tfApplication::EnsureDebuggerOrDumptruckWrapper",
429+
"Status": 1,
409430
"Comment": ""
410431
},
411432
{

0 commit comments

Comments
 (0)