Add frame count to menu state

project-slippi · Jun 19, 2020 · 0868375 · 0868375
1 parent 2df4c9b
commit 0868375
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/Output/Console/g_core.bin b/Output/Console/g_core.bin
diff --git a/Output/Console/g_core_porta.bin b/Output/Console/g_core_porta.bin
diff --git a/Output/Netplay/GALE01r2.ini b/Output/Netplay/GALE01r2.ini
@@ -1217,14 +1217,14 @@ A0640002 B07D0031
 BA810008 800100B4
 382100B0 7C0803A6
 881F2219 00000000
-C21A4FA4 00000048 #Recording/SendMenuFrame.asm
+C21A4FA4 0000004A #Recording/SendMenuFrame.asm
 7C0802A6 90010004
-9421FF6F BE810008
+9421FF6A BE810008
 38610038 3863001F
 54630034 3D808000
 618C5604 7D8903A6
 4E800421 2C030001
-418201F4 3880003E
+41820204 3880003E
 98830000 3C808048
 80849D30 5484443E
 B0830001 3C808111
@@ -1283,11 +1283,13 @@ B0830001 3C808111
 6084A810 80840000
 38840028 80840000
 3884003C 80840000
-90830035 38800039
+90830035 3C808047
+60849D60 80840000
+90830039 3880003E
 38A00001 3D808000
 618C55F0 7D8903A6
 4E800421 BA810008
-80010095 38210091
+8001009A 38210096
 7C0803A6 80790000
 60000000 00000000
 C2005604 00000007 #Recording/ShouldRecord.asm

diff --git a/Output/Netplay/GALJ01r2.ini b/Output/Netplay/GALJ01r2.ini
@@ -1217,14 +1217,14 @@ A0640002 B07D0031
 BA810008 800100B4
 382100B0 7C0803A6
 881F2219 00000000
-C21A4FA4 00000048 #Recording/SendMenuFrame.asm
+C21A4FA4 0000004A #Recording/SendMenuFrame.asm
 7C0802A6 90010004
-9421FF6F BE810008
+9421FF6A BE810008
 38610038 3863001F
 54630034 3D808000
 618C5604 7D8903A6
 4E800421 2C030001
-418201F4 3880003E
+41820204 3880003E
 98830000 3C808048
 80849D30 5484443E
 B0830001 3C808111
@@ -1283,11 +1283,13 @@ B0830001 3C808111
 6084A810 80840000
 38840028 80840000
 3884003C 80840000
-90830035 38800039
+90830035 3C808047
+60849D60 80840000
+90830039 3880003E
 38A00001 3D808000
 618C55F0 7D8903A6
 4E800421 BA810008
-80010095 38210091
+8001009A 38210096
 7C0803A6 80790000
 60000000 00000000
 C2005604 00000007 #Recording/ShouldRecord.asm

diff --git a/Recording/SendMenuFrame.asm b/Recording/SendMenuFrame.asm
@@ -11,7 +11,7 @@
 .include "Common/Common.s"
 .include "Recording/Recording.s"
 
-.set PAYLOAD_LEN, 0x38
+.set PAYLOAD_LEN, 0x3D
 .set EXI_BUF_LEN, PAYLOAD_LEN + 1
 
 .set STACK_FREE_SPACE, EXI_BUF_LEN + 0x20 # Add 0x20 to deal with byte alignment
@@ -177,6 +177,11 @@ addi r4, r4, 0x3C
 lwz r4, 0(r4)
 stw r4, 0x35(r3)
 
+# Frame count
+load r4 0x80479D60
+lwz r4, 0(r4)
+stw r4, 0x39(r3)
+
 #------------- Transfer Buffer ------------
 # r3 is the buffer arg, but it's already set
 li r4, EXI_BUF_LEN