Skip to content

Commit 3232fe7

Browse files
Merge branch 'main' into math_decomp
2 parents 7164a6f + 5f763a6 commit 3232fe7

File tree

6 files changed

+21
-4
lines changed

6 files changed

+21
-4
lines changed

mods/Tests/TasRecorder/buildList.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ common, exe, GAMEPAD_ProcessTapRelease, 0x8, src/GAMEPAD_ProcessTapRelease.c
88
common, exe, Timer_GetTime_Elapsed, 0x0, src/Timer_GetTime_Elapsed.c
99
common, exe, LOAD_LangFile, 0x0, src/LOAD_A33_LangFile.c
1010

11-
926, 225, 0x8009f6fc, 0x0, src/dataTAS.bin
11+
//926, 225, 0x8009f6fc, 0x0, src/dataTAS.bin

mods/Tests/TasRecorder/src/GAMEPAD_ProcessTapRelease.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ void DECOMP_GAMEPAD_ProcessTapRelease(struct GamepadSystem *gGamepads)
2525

2626
int hold;
2727

28+
*(int*)0x8000fff4 = 0;
29+
2830
// RECORD mode
2931
if(*(int*)0x8000fff4 == 0)
3032
{
@@ -44,6 +46,12 @@ void DECOMP_GAMEPAD_ProcessTapRelease(struct GamepadSystem *gGamepads)
4446
// replay
4547
pad->buttonsHeldCurrFrame = hold;
4648

49+
if(currIndex > 0)
50+
{
51+
pad->buttonsHeldPrevFrame =
52+
buttonArr[currIndex - 1];
53+
}
54+
4755
// In this order: Up, Down, Left, Right
4856
if ((hold & 1) != 0) pad->stickLY = 0;
4957
if ((hold & 2) != 0) pad->stickLY = 0xFF;

mods/Tests/TasRecorder/src/LOAD_A33_LangFile.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ void DECOMP_LOAD_LangFile(int bigfilePtr, int lang)
5454
DECOMP_CDSYS_SetXAToLang(lang);
5555
#endif
5656

57+
#if 0
5758
// ===== For TAS ====
5859
LOAD_ReadFile(
59-
bigfilePtr, LT_RAW, BI_LANGUAGEFILE + lang,
60+
bigfilePtr, LT_RAW, 225,
6061
0x80200000, &size, 0);
62+
#endif
6163
}

mods/Windows/TasRecorder_Release/Directions.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Enable "Export Shared Memory"
66
Close Settings
77
Close DuckStation
88

9+
Also, enable 8mb RAM expansion
10+
911
Recording a TAS:
1012
Open the modded ROM in DuckStation
1113
Play any 1P mode (multiplayer comes later)
@@ -23,4 +25,9 @@ Open TasRecorder.exe
2325
Press 2 to Load
2426
Type NewTAS.bin or whatever name
2527
Wait for completion message
26-
Resume the emulator
28+
Resume the emulator
29+
30+
TODO: I put a 0xFFFFFFFF at the end of the tas file,
31+
Should make the recorder do that automatically
32+
33+
ALWAYS record/replay with no memcard inserted
950 Bytes
Binary file not shown.

rewrite/src/tests/test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,4 +227,4 @@ void TEST_RNG_Random(RNGSeed* seed, const RNGSeed* ret)
227227
PatchFunction_End(index);
228228
}
229229

230-
#endif // TEST_RNG_IMPL
230+
#endif // TEST_RNG_IMPL

0 commit comments

Comments
 (0)