Skip to content

Commit

Permalink
modify playback/recording to work simultaneously
Browse files Browse the repository at this point in the history
  • Loading branch information
JLaferri committed Nov 13, 2023
1 parent 676c8a0 commit 708531b
Show file tree
Hide file tree
Showing 29 changed files with 1,075 additions and 94 deletions.
3 changes: 2 additions & 1 deletion Common/Common.s
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ lbz \reg, -0x62D0(\reg) # Load byte from 0x80479D30 (major ID)

.macro loadGlobalFrame reg
lis \reg, 0x8048
lwz \reg, -0x62A0(\reg)
lwz \reg, -0x62A0(\reg) # 80479D60
.endm

# This macro takes in an address that is expected to have a branch instruction. It will set
Expand Down Expand Up @@ -603,6 +603,7 @@ add \reg, r3, r4
# Offsets from r13
################################################################################
.set primaryDataBuffer,-0x49b4
.set playbackDataBuffer,-0x5040 # From tournament mode line 8019b9d4, seems to be only used in one place
.set secondaryDmaBuffer,-0x49b0
.set archiveDataBuffer, -0x4AE8
.set bufferOffset,-0x49b0
Expand Down
15 changes: 8 additions & 7 deletions Output/Console/GALE01r2.ini
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ A07F2088 B07D0053
800100E4 382100E0
7C0803A6 8001001C
60000000 00000000
C206B0DC 0000002C #Recording/SendGamePreFrame.asm
C206B0E0 0000002C #Recording/SendGamePreFrame.asm
7C0802A6 90010004
9421FF20 BE8100B0
3D808000 618C5604
Expand Down Expand Up @@ -500,14 +500,15 @@ B07D0031 80640030
938DB650 BA8100B0
800100E4 382100E0
7C0803A6 881F2219
60000000 00000000
C2005604 0000000A #Recording/ShouldRecord.asm
807F065C 00000000
C2005604 0000000B #Recording/ShouldRecord.asm
3C608048 80639D30
5463443E 2C030202
4182002C 2C030302
41820024 2C030208
4182001C 2C03010F
41820014 2C030120
41820034 2C030302
4182002C 2C030208
41820024 2C03010F
4182001C 2C030120
41820014 2C03010E
4182000C 38600000
4800000C 38600001
48000004 4E800020
Expand Down
Binary file modified Output/Console/g_core.bin
Binary file not shown.
Binary file modified Output/Console/g_core_porta.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion Output/InjectionLists/list_console_core.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"Tags": ""
},
{
"InjectionAddress": "8006B0DC",
"InjectionAddress": "8006B0E0",
"Name": "Slippi Recording",
"Codetype": "Auto",
"Annotation": "Recording/SendGamePreFrame.asm",
Expand Down
2 changes: 1 addition & 1 deletion Output/InjectionLists/list_netplay.json
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@
"Tags": ""
},
{
"InjectionAddress": "8006B0DC",
"InjectionAddress": "8006B0E0",
"Name": "Required: Slippi Recording",
"Codetype": "Auto",
"Annotation": "Recording/SendGamePreFrame.asm",
Expand Down
15 changes: 8 additions & 7 deletions Output/Netplay/GALE01r2.ini
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ A07F2088 B07D0053
800100E4 382100E0
7C0803A6 8001001C
60000000 00000000
C206B0DC 0000002C #Recording/SendGamePreFrame.asm
C206B0E0 0000002C #Recording/SendGamePreFrame.asm
7C0802A6 90010004
9421FF20 BE8100B0
3D808000 618C5604
Expand Down Expand Up @@ -1003,14 +1003,15 @@ B07D0031 80640030
938DB650 BA8100B0
800100E4 382100E0
7C0803A6 881F2219
60000000 00000000
C2005604 0000000A #Recording/ShouldRecord.asm
807F065C 00000000
C2005604 0000000B #Recording/ShouldRecord.asm
3C608048 80639D30
5463443E 2C030202
4182002C 2C030302
41820024 2C030208
4182001C 2C03010F
41820014 2C030120
41820034 2C030302
4182002C 2C030208
41820024 2C03010F
4182001C 2C030120
41820014 2C03010E
4182000C 38600000
4800000C 38600001
48000004 4E800020
Expand Down
15 changes: 8 additions & 7 deletions Output/Netplay/GALJ01r2.ini
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ A07F2088 B07D0053
800100E4 382100E0
7C0803A6 8001001C
60000000 00000000
C206B0DC 0000002C #Recording/SendGamePreFrame.asm
C206B0E0 0000002C #Recording/SendGamePreFrame.asm
7C0802A6 90010004
9421FF20 BE8100B0
3D808000 618C5604
Expand Down Expand Up @@ -1002,14 +1002,15 @@ B07D0031 80640030
938DB650 BA8100B0
800100E4 382100E0
7C0803A6 881F2219
60000000 00000000
C2005604 0000000A #Recording/ShouldRecord.asm
807F065C 00000000
C2005604 0000000B #Recording/ShouldRecord.asm
3C608048 80639D30
5463443E 2C030202
4182002C 2C030302
41820024 2C030208
4182001C 2C03010F
41820014 2C030120
41820034 2C030302
4182002C 2C030208
41820024 2C03010F
4182001C 2C030120
41820014 2C03010E
4182000C 38600000
4800000C 38600001
48000004 4E800020
Expand Down
Loading

0 comments on commit 708531b

Please sign in to comment.