@@ -39,7 +39,7 @@ class CelesteScanner {
39
39
func findHeader( ) throws {
40
40
print ( " Scanning for the AutoSplitterData object header " )
41
41
42
- extendedInfo = try process. findPointer ( by: " 11efbeadde11 " )
42
+ extendedInfo = try process. findPointer ( by: " 1100efbeadde0011 " )
43
43
if let info = extendedInfo {
44
44
try Mono . debugMemory ( around: info, before: 64 , after: 64 )
45
45
}
@@ -59,11 +59,11 @@ class CelesteScanner {
59
59
60
60
}
61
61
62
- func readExtended ( ) throws -> ExtendedAutoSplitterData ? {
62
+ func getExtendedInfo ( ) throws -> ExtendedAutoSplitterInfo ? {
63
63
guard let extendedInfo = extendedInfo else {
64
64
return nil
65
65
}
66
- return try ExtendedAutoSplitterData ( from: extendedInfo)
66
+ return try ExtendedAutoSplitterInfo ( from: extendedInfo)
67
67
}
68
68
69
69
func getInfo( ) throws -> AutoSplitterInfo ? {
@@ -251,27 +251,21 @@ class AutoSplitterInfo {
251
251
}
252
252
}
253
253
254
- struct ExtendedAutoSplitterData {
255
- var madelineX : Float
256
- var madelineY : Float
257
- var fileDeaths : Int32
254
+ struct ExtendedAutoSplitterInfo {
255
+ var chapterDeaths : Int32
258
256
var levelDeaths : Int32
259
257
var areaName : String
260
258
var areaSID : String
261
259
var levelSet : String
262
- var completeScreenName : String
263
260
264
261
init ( from pointer: RmaPointer ) throws {
265
- // offset to skip the `11deadbeef11`
266
- let body = try pointer. offset ( by: 8 ) . preload ( size: 48 )
267
- madelineX = body. value ( at: 0 )
268
- madelineY = body. value ( at: 4 )
269
- fileDeaths = body. value ( at: 8 )
270
- levelDeaths = body. value ( at: 12 )
271
- areaName = try Mono . readString ( at: body. value ( at: 16 ) ) ?? " "
272
- areaSID = try Mono . readString ( at: body. value ( at: 24 ) ) ?? " "
273
- levelSet = try Mono . readString ( at: body. value ( at: 32 ) ) ?? " "
274
- completeScreenName = try Mono . readString ( at: body. value ( at: 40 ) ) ?? " "
262
+ // offset to skip the `1100deadbeef0011`
263
+ let body = try pointer. offset ( by: 8 ) . preload ( size: 40 )
264
+ chapterDeaths = body. value ( at: 0 )
265
+ levelDeaths = body. value ( at: 4 )
266
+ areaName = try Mono . readString ( at: body. value ( at: 8 ) ) ?? " "
267
+ areaSID = try Mono . readString ( at: body. value ( at: 16 ) ) ?? " "
268
+ levelSet = try Mono . readString ( at: body. value ( at: 24 ) ) ?? " "
275
269
}
276
270
}
277
271
0 commit comments