From b698534f286a825a36972364d81271da588f4667 Mon Sep 17 00:00:00 2001
From: Jas Laferriere <Fizzi36@gmail.com>
Date: Thu, 14 Sep 2023 12:37:10 -0400
Subject: [PATCH] fix build issues

---
 External/Debug Inputs/DebugInputs.s    |  16 +-
 External/Debug Inputs/LogFetchTime.asm |   2 +-
 Output/Console/GALE01r2.ini            | 321 +++++++++++++++++++
 Output/Console/g_core.bin              | Bin 5496 -> 8040 bytes
 Output/Console/g_core_porta.bin        | Bin 5496 -> 8040 bytes
 Output/Netplay/GALE01r2.ini            | 409 ++++++++++++++++++++++++-
 Output/Netplay/GALJ01r2.ini            | 409 ++++++++++++++++++++++++-
 7 files changed, 1116 insertions(+), 41 deletions(-)

diff --git a/External/Debug Inputs/DebugInputs.s b/External/Debug Inputs/DebugInputs.s
index 5e295e72..088c0cfa 100644
--- a/External/Debug Inputs/DebugInputs.s	
+++ b/External/Debug Inputs/DebugInputs.s	
@@ -1,3 +1,5 @@
+.ifndef HEADER_DEBUG_INPUTS
+
 ################################################################################
 # Constants
 ################################################################################
@@ -25,15 +27,6 @@
 ################################################################################
 # Macros
 ################################################################################
-.macro incrementByte reg, reg_address, offset, limit
-lbz \reg, \offset(\reg_address)
-addi \reg, \reg, 1
-cmpwi \reg, \limit
-blt 0f
-li \reg, 0
-0:
-stb \reg, \offset(\reg_address)
-.endm
 
 # Calculates us difference from two ticks
 .macro calcDiffUs reg_now, reg_ref
@@ -54,4 +47,7 @@ mulli r4, \reg_idx, 4
 addi r4, r4, DIB_CIRCULAR_BUFFER
 lwzx r4, \reg_dib, r4
 calcDiffUs r3, r4
-.endm
\ No newline at end of file
+.endm
+
+.endif
+.set HEADER_DEBUG_INPUTS, 1
diff --git a/External/Debug Inputs/LogFetchTime.asm b/External/Debug Inputs/LogFetchTime.asm
index 012f5d31..9e736e61 100644
--- a/External/Debug Inputs/LogFetchTime.asm	
+++ b/External/Debug Inputs/LogFetchTime.asm	
@@ -47,7 +47,7 @@ addi r4, r4, DIB_CIRCULAR_BUFFER
 stwx r3, REG_DIB, r4
 
 # Increment index
-incrementByte r3, REG_DIB, DIB_FETCH_INDEX, CIRCULAR_BUFFER_COUNT
+incrementByteInBuf r3, REG_DIB, DIB_FETCH_INDEX, CIRCULAR_BUFFER_COUNT
 
 # Indicate ready, prevents other functions from running first. Only activate if currently inactive
 lbz r3, DIB_ACTIVE_STATE(REG_DIB)
diff --git a/Output/Console/GALE01r2.ini b/Output/Console/GALE01r2.ini
index 98d69bac..b458de8b 100644
--- a/Output/Console/GALE01r2.ini
+++ b/Output/Console/GALE01r2.ini
@@ -702,3 +702,324 @@ C03D000C FC020840
 BA8100B0 800100E4
 382100E0 7C0803A6
 60000000 00000000
+
+$Optional: Debug Game-Side Latency [Fizzi]
+*Shows latency information on screen while in-game
+C216E774 00000093 #External/Debug Inputs/InitOnGameStart.asm
+48000410 4E800021
+00000000 43480000
+41C80000 000000FF
+000000B4 E2E2E2FF
+41200000 41880000
+546F7461 6C204761
+6D65204C 61673A20
+25752075 730A0A00
+506F6C6C 20436F75
+6E743A20 25750A00
+4D696E20 506F6C6C
+20446966 663A2025
+75207573 0A004D61
+7820506F 6C6C2044
+6966663A 20257520
+75730A00 46657463
+682D4665 7463683A
+20257520 75730A00
+506F6C6C 2D466574
+63683A20 25752075
+730A0050 6F6C6C2D
+456E6769 6E653A20
+25752075 730A0000
+4E800021 4E800020
+4E800021 7C0802A6
+90010004 9421FF20
+BE8100B0 4BFFFF31
+7FE802A6 83DF0000
+83BE0006 887E0000
+2C030001 40820128
+7FA3EB78 3D808030
+618C2BB0 7D8903A6
+4E800421 7FA3EB78
+38800000 38A00000
+3D808030 618C2A3C
+7D8903A6 4E800421
+7FA3EB78 389F0020
+80BE0056 3D808030
+618C2D4C 7D8903A6
+4E800421 7FA3EB78
+389F0038 80BE006E
+3D808030 618C2D4C
+7D8903A6 4E800421
+7FA3EB78 389F0048
+80BE005A 3D808030
+618C2D4C 7D8903A6
+4E800421 7FA3EB78
+389F005E 80BE005E
+3D808030 618C2D4C
+7D8903A6 4E800421
+7FA3EB78 389F0074
+80BE0062 3D808030
+618C2D4C 7D8903A6
+4E800421 7FA3EB78
+389F0088 80BE0066
+3D808030 618C2D4C
+7D8903A6 4E800421
+7FA3EB78 389F009B
+80BE006A 3D808030
+618C2D4C 7D8903A6
+4E800421 3C608046
+6063B6A0 88630008
+2C030000 41820020
+807E0012 3D808034
+618C9CBC 7D8903A6
+4E800421 38600002
+987E0000 BA8100B0
+800100E4 382100E0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF20 BE8100B0
+4BFFFDCD 7FE802A6
+38600020 3D808037
+618CF1E4 7D8903A6
+4E800421 7C681B78
+3860001E 3880FF2E
+38A0FFD8 38C00001
+38E00001 3D808030
+618C2834 7D8903A6
+4E800421 7C7E1B78
+806DB77C 7FC4F378
+3D808030 618C2810
+7D8903A6 4E800421
+38600000 987E0026
+7FC3F378 389F000C
+3D808030 618C2B90
+7D8903A6 4E800421
+C03F0004 D03E0008
+C03F0008 D03E000C
+807F0000 93C30002
+BA8100B0 800100E4
+382100E0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF20
+BE8100B0 4BFFFD11
+7FE802A6 386003E8
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C681B78 3860001F
+38800000 38A00000
+38C0001D 38E00009
+3D808030 618C2834
+7D8903A6 4E800421
+7C7E1B78 806DB77C
+7FC4F378 3D808030
+618C2810 7D8903A6
+4E800421 38600000
+987E0026 7FC3F378
+389F0010 3D808030
+618C2B90 7D8903A6
+4E800421 7FC3F378
+C03F0018 C05F001C
+3D808030 618C2B10
+7D8903A6 4E800421
+7FC3F378 389F0014
+3D808030 618C2B64
+7D8903A6 4E800421
+7FC3F378 3D808030
+618C2AF0 7D8903A6
+4E800421 807F0000
+93C30006 38600013
+38800014 38A00000
+3D808039 618C01F0
+7D8903A6 4E800421
+4BFFFCE1 7C8802A6
+38A00007 3D808038
+618CFD54 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF20 BE8100B0
+38600072 3D808037
+618CF1E4 7D8903A6
+4E800421 4BFFFBD1
+7C8802A6 90640000
+7C7E1B78 38800072
+3D808000 618CC160
+7D8903A6 4E800421
+4BFFFDD1 4BFFFE89
+4BFFFC59 7C6802A6
+907E0012 3D808034
+618C9BF0 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 C022A8C8
+60000000 00000000
+C21A4DEC 00000028 #External/Debug Inputs/LogEngineTime.asm
+3C608048 80639D30
+5463443E 2C030202
+40820124 3C608048
+80639D60 2C030000
+40810114 7C0802A6
+90010004 9421FF20
+BE8100B0 3D808034
+618C7364 7D8903A6
+4E800421 7C7E1B78
+3C608016 6063E774
+80830000 5485863E
+7CA50774 54A5801E
+5484043A 7C842B78
+7C632214 83E30008
+887F0000 2C030000
+41820098 3C80804C
+60841FAC 80640000
+547C073E 54630036
+90640000 3D808034
+618CC408 7D8903A6
+4E800421 1C9C0004
+38840016 7C9F202E
+7C641850 1C63000C
+3C808000 608400FC
+80840000 38A003E8
+7C842B96 7C842B96
+7C632396 7C7D1B78
+93BF006A 807F0002
+9B810008 9B810009
+9B81000A 80810008
+54842026 608400FF
+90810008 38810008
+3D808030 618C2B90
+7D8903A6 4E800421
+7FC3F378 3D808034
+618C738C 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 800D9368
+60000000 00000000
+C2376A88 0000002D #External/Debug Inputs/LogFetchTime.asm
+3C608048 80639D30
+5463443E 2C030202
+40820150 3C608047
+60639D64 80630000
+2C030000 4082013C
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808034 618C7364
+7D8903A6 4E800421
+7C7E1B78 3C608016
+6063E774 80830000
+5485863E 7CA50774
+54A5801E 5484043A
+7C842B78 7C632214
+83E30008 806100DC
+54638036 889F0001
+7C632378 5463803E
+906100DC 807F000A
+889F0001 1C840004
+38840016 7C7F212E
+887F0001 38630001
+2C030010 41800008
+38600000 987F0001
+887F0000 2C030000
+4082000C 38600001
+987F0000 3D808034
+618CC408 7D8903A6
+4E800421 7C7D1B78
+809F000E 93BF000E
+7C64E850 1C63000C
+3C808000 608400FC
+80840000 38A003E8
+7C842B96 7C842B96
+7C632396 907F0062
+807F000A 7C63E850
+1C63000C 3C808000
+608400FC 80840000
+38A003E8 7C842B96
+7C842B96 7C632396
+907F0066 7FC3F378
+3D808034 618C738C
+7D8903A6 4E800421
+BA8100B0 800100E4
+382100E0 7C0803A6
+881F0002 00000000
+C2349A28 00000025 #External/Debug Inputs/LogPollTime.asm
+3C608048 80639D30
+5463443E 2C030202
+4082010C 3C608047
+60639D64 80630000
+2C030000 408200F8
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808034 618C7364
+7D8903A6 4E800421
+7C7E1B78 3C608016
+6063E774 80830000
+5485863E 7CA50774
+54A5801E 5484043A
+7C842B78 7C632214
+83E30008 807F006E
+38630001 907F006E
+3D808034 618CC408
+7D8903A6 4E800421
+809F000A 907F000A
+7C641850 1C63000C
+3C808000 608400FC
+80840000 38A003E8
+7C842B96 7C842B96
+7C632396 7C7D1B78
+807F006E 5463063F
+41820028 807F005A
+7C1D1800 40800008
+93BF005A 807F005E
+7C1D1800 40810008
+93BF005E 4800000C
+93BF005A 93BF005E
+7FC3F378 3D808034
+618C738C 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 80B80000
+60000000 00000000
+C2375C14 0000002C #External/Debug Inputs/LogScanoutTime.asm
+48000034 5464C63E
+5463463E 7C032000
+4182000C 3860FFFF
+48000018 3863FFF1
+1C630006 38800005
+7C632396 5463E73E
+4E800020 3C608048
+80639D30 5463443E
+2C030202 40820110
+3C608047 60639D64
+80630000 2C030000
+408200FC 7C0802A6
+90010004 9421FF20
+BE8100B0 3D808034
+618C7364 7D8903A6
+4E800421 7C7E1B78
+3C608016 6063E774
+80830000 5485863E
+7CA50774 54A5801E
+5484043A 7C842B78
+7C632214 83E30008
+887F0000 2C030000
+41820080 3C60804A
+60638B10 80630000
+38800000 7C0323AC
+7C0004AC 4C00012C
+83430000 7F43D378
+4BFFFF2D 2C030000
+41800050 7C7C1B78
+3D808034 618CC408
+7D8903A6 4E800421
+1C9C0004 38840016
+7C9F202E 7C641850
+1C63000C 3C808000
+608400FC 80840000
+38A003E8 7C842B96
+7C842B96 7C632396
+7C7D1B78 93BF0056
+7FC3F378 3D808034
+618C738C 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 80010024
+60000000 00000000
diff --git a/Output/Console/g_core.bin b/Output/Console/g_core.bin
index b01d8c0a3c01dd7db538c562c82fe0dcef90c322..1a1e9fea60562aa73ae5839346637f045e54af09 100644
GIT binary patch
delta 2367
zcmb_dUr1Y582@gPX&Ta!)=XsDdaZ3q{YM8<?}|%xb~atK_;A-T8SbVxS`{0|8X*s-
z-lJwCWqAl>h|HD<qtXW-d>C6FhI6)zz6@6OvWLMoH&ECfTKZC$-QDjbxlvPPrEB2i
zp7Z;C-#y>=`@VDT<GOYKV(evOrF<<)MCkxIJm)#pU``zYqV{`YMkdA=tE;PKy9_Kr
zq>e^IBl6kM<$k#<bm^3QbW9$*;&M^X=*WoNF*+8B3d}{_LlHTPof#S!u*|4C6x)uT
z6W-L>AJqpNv;PHC;k*;{X5`XPq`zQBB4`Xbz3lQDLDPKIShvkj{X#UgL?wxFq6Rxj
zZIhDE`25e<>ztnmCF>WjUbD}i=Z+eIDV#`|Bg%1gt=qT^$$W_}<haJJB2EDp*}@r{
zFU?Q@WbYPoE7u3EZx=2K?&2<70^GnZ+$>*ugNBRAR*iRR`j>MFot#jD+9#3GI30jp
zb0~TJYbzr~BijtrN`C+unbS6(lF0FCjVUip&|=Vh^1YB1Mlu{*Ldl1JSdMJ4G6wvR
z!p$aS&iqMPCQ12~q+B4r=7QaLWsG0`iWzqw<;&pnSRDKbn;$doJc=n9I_}On*QYFl
z<<sQ&!B0*+op`#rfk^L=ZMSIm=c2W*?-FgbRdhsq5Yg`WAJH0~;%G%0h_qt)eX7cH
zg;et?dh>YL%241rtnPt@<+Ch-JY@*joA1)sLP@D$6EqKO{KgWf%^a2D1xhISL``dD
zRpH_y;w>M-U|aEm=HK^)b1F>4P$29gY$%lcR<oi&@$U!Cf35}1jd$4~Yzy5p`v4nN
z7|Vxm-9rJhzm-?I|H8zFwhM6m#tBtF<8QFrY&d{N@|Y&tux&!}76*up(UMmRl8Aud
zQ?BW2Q9gyM=cAAP>}F|Hy~z)$amOhZua7bPu;HEhotz1DM83agS~>61;?)ZrS*fhl
zuj+JCWSHCFuG7k_>N+`;IF+-E+{D5aJykln;Y(VaHh5gz3ifquGMycI?KHbu8B2dd
z!>EgGc7mK3duAt&lZ#`a#^qyhG*g%>7}!i)HH8*Nfz$7l)fjwldQi)WMJp}CxKgQc
z2eo>Doz?UkVXo&AgMzIuKrur|mQ{?0=x0^uCleWxm|h#h+@Au5>|6q?is#iaYMP*~
zr066;VNW|pg2-S7n5BB#B)Ne}z@AcBsKzt256bOh;kVcSQ|6RG7ex?Ee<s@jOW8y<
z*@Unw&7b-3IJ$$X?x$6y$1gzD%|1ln5up^45MKr~^k%<71s8DFv-X;Jm#UYX#+~iM
zyq6uUpf;!vC3~^%%dXLCSoZ~JFS!LF7M3FXHW4b7{jIdT=f$KUK-8>;zr&&E^fS9G
zJ_snCX#%fMbn_t&K?$ybm(UW^s=nqI-_{+J^z5MIMv;=n;&UG9;uFoW*;|_aiANj;
zadk6$?E)jmLKj+cs)NYr_%ViWe`EFr;MBudC2rGm+vR`G<9;EprkhK2M9XSP^e?uz
B7{LGl

delta 7
OcmaE1_d{z#g(v_JXaj}-

diff --git a/Output/Console/g_core_porta.bin b/Output/Console/g_core_porta.bin
index b9b03399eb1ef21c420a91fdc356925cfffa2831..bfb2c09f5e8af8d0e4a8a6cb7728fd4a60b2ef0c 100644
GIT binary patch
delta 2367
zcmb_dUr1Y582@gPX&Ta!)=XsDdaZ3q{YM8<?}|%xb~atK_;A-T8SbVxS`{0|8X*s-
z-lJwCWqAl>h|HD<qtXW-d>C6FhI6)zz6@6OvWLMoH&ECfTKZC$-QDjbxlvPPrEB2i
zp7Z;C-#y>=`@VDT<GOYKV(evOrF<<)MCkxIJm)#pU``zYqV{`YMkdA=tE;PKy9_Kr
zq>e^IBl6kM<$k#<bm^3QbW9$*;&M^X=*WoNF*+8B3d}{_LlHTPof#S!u*|4C6x)uT
z6W-L>AJqpNv;PHC;k*;{X5`XPq`zQBB4`Xbz3lQDLDPKIShvkj{X#UgL?wxFq6Rxj
zZIhDE`25e<>ztnmCF>WjUbD}i=Z+eIDV#`|Bg%1gt=qT^$$W_}<haJJB2EDp*}@r{
zFU?Q@WbYPoE7u3EZx=2K?&2<70^GnZ+$>*ugNBRAR*iRR`j>MFot#jD+9#3GI30jp
zb0~TJYbzr~BijtrN`C+unbS6(lF0FCjVUip&|=Vh^1YB1Mlu{*Ldl1JSdMJ4G6wvR
z!p$aS&iqMPCQ12~q+B4r=7QaLWsG0`iWzqw<;&pnSRDKbn;$doJc=n9I_}On*QYFl
z<<sQ&!B0*+op`#rfk^L=ZMSIm=c2W*?-FgbRdhsq5Yg`WAJH0~;%G%0h_qt)eX7cH
zg;et?dh>YL%241rtnPt@<+Ch-JY@*joA1)sLP@D$6EqKO{KgWf%^a2D1xhISL``dD
zRpH_y;w>M-U|aEm=HK^)b1F>4P$29gY$%lcR<oi&@$U!Cf35}1jd$4~Yzy5p`v4nN
z7|Vxm-9rJhzm-?I|H8zFwhM6m#tBtF<8QFrY&d{N@|Y&tux&!}76*up(UMmRl8Aud
zQ?BW2Q9gyM=cAAP>}F|Hy~z)$amOhZua7bPu;HEhotz1DM83agS~>61;?)ZrS*fhl
zuj+JCWSHCFuG7k_>N+`;IF+-E+{D5aJykln;Y(VaHh5gz3ifquGMycI?KHbu8B2dd
z!>EgGc7mK3duAt&lZ#`a#^qyhG*g%>7}!i)HH8*Nfz$7l)fjwldQi)WMJp}CxKgQc
z2eo>Doz?UkVXo&AgMzIuKrur|mQ{?0=x0^uCleWxm|h#h+@Au5>|6q?is#iaYMP*~
zr066;VNW|pg2-S7n5BB#B)Ne}z@AcBsKzt256bOh;kVcSQ|6RG7ex?Ee<s@jOW8y<
z*@Unw&7b-3IJ$$X?x$6y$1gzD%|1ln5up^45MKr~^k%<71s8DFv-X;Jm#UYX#+~iM
zyq6uUpf;!vC3~^%%dXLCSoZ~JFS!LF7M3FXHW4b7{jIdT=f$KUK-8>;zr&&E^fS9G
zJ_snCX#%fMbn_t&K?$ybm(UW^s=nqI-_{+J^z5MIMv;=n;&UG9;uFoW*;|_aiANj;
zadk6$?E)jmLKj+cs)NYr_%ViWe`EFr;MBudC2rGm+vR`G<9;EprkhK2M9XSP^e?uz
B7{LGl

delta 7
OcmaE1_d{z#g(v_JXaj}-

diff --git a/Output/Netplay/GALE01r2.ini b/Output/Netplay/GALE01r2.ini
index d377db37..db599beb 100644
--- a/Output/Netplay/GALE01r2.ini
+++ b/Output/Netplay/GALE01r2.ini
@@ -4665,7 +4665,7 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm
 60631360 906400A0
 3D80801B 618C136C
 7D8903A6 4E800420
-38600001 00000000
+38600002 00000000
 C21A45B8 000001FF #Online/Slippi Online Scene/main.asm
 3BA30004 7C0802A6
 90010004 9421FF20
@@ -5622,20 +5622,6 @@ BE8100B0 4BFFFCA9
 7C0803A6 4E800020
 60000000 00000000
 043775B0 7C600775 #Online/Debugging/LogInputOnCopy.asm
-041A4C24 C0429A7C #Polling Drift Fix + VB [tauKhan]
-0401985C 3C60804C
-04019860 91231F5C
-C2376200 00000003
-2C1DFFFF 41820008
-48000008 93A2C150
-60000000 00000000
-C21A5018 00000005
-3B5A0001 8002C150
-2C00FFFF 38000000
-9002C150 3D80801A
-618C5078 7D8903A6
-4D820420 00000000
-04218D68 C8228000
 C209E090 00000011 #Common/FastForward/DynamicsFix.asm
 807E0000 80630028
 48000009 48000074
@@ -6953,3 +6939,396 @@ C0230064 BA810008
 BA810008 800100B4
 382100B0 7C0803A6
 60000000 00000000
+
+$Optional: Debug Game-Side Latency [Fizzi]
+*Shows latency information on screen while in-game
+C216E774 00000093 #External/Debug Inputs/InitOnGameStart.asm
+48000410 4E800021
+00000000 43480000
+41C80000 000000FF
+000000B4 E2E2E2FF
+41200000 41880000
+546F7461 6C204761
+6D65204C 61673A20
+25752075 730A0A00
+506F6C6C 20436F75
+6E743A20 25750A00
+4D696E20 506F6C6C
+20446966 663A2025
+75207573 0A004D61
+7820506F 6C6C2044
+6966663A 20257520
+75730A00 46657463
+682D4665 7463683A
+20257520 75730A00
+506F6C6C 2D466574
+63683A20 25752075
+730A0050 6F6C6C2D
+456E6769 6E653A20
+25752075 730A0000
+4E800021 4E800020
+4E800021 7C0802A6
+90010004 9421FF20
+BE8100B0 4BFFFF31
+7FE802A6 83DF0000
+83BE0006 887E0000
+2C030001 40820128
+7FA3EB78 3D808030
+618C2BB0 7D8903A6
+4E800421 7FA3EB78
+38800000 38A00000
+3D808030 618C2A3C
+7D8903A6 4E800421
+7FA3EB78 389F0020
+80BE0056 3D808030
+618C2D4C 7D8903A6
+4E800421 7FA3EB78
+389F0038 80BE006E
+3D808030 618C2D4C
+7D8903A6 4E800421
+7FA3EB78 389F0048
+80BE005A 3D808030
+618C2D4C 7D8903A6
+4E800421 7FA3EB78
+389F005E 80BE005E
+3D808030 618C2D4C
+7D8903A6 4E800421
+7FA3EB78 389F0074
+80BE0062 3D808030
+618C2D4C 7D8903A6
+4E800421 7FA3EB78
+389F0088 80BE0066
+3D808030 618C2D4C
+7D8903A6 4E800421
+7FA3EB78 389F009B
+80BE006A 3D808030
+618C2D4C 7D8903A6
+4E800421 3C608046
+6063B6A0 88630008
+2C030000 41820020
+807E0012 3D808034
+618C9CBC 7D8903A6
+4E800421 38600002
+987E0000 BA8100B0
+800100E4 382100E0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF20 BE8100B0
+4BFFFDCD 7FE802A6
+38600020 3D808037
+618CF1E4 7D8903A6
+4E800421 7C681B78
+3860001E 3880FF2E
+38A0FFD8 38C00001
+38E00001 3D808030
+618C2834 7D8903A6
+4E800421 7C7E1B78
+806DB77C 7FC4F378
+3D808030 618C2810
+7D8903A6 4E800421
+38600000 987E0026
+7FC3F378 389F000C
+3D808030 618C2B90
+7D8903A6 4E800421
+C03F0004 D03E0008
+C03F0008 D03E000C
+807F0000 93C30002
+BA8100B0 800100E4
+382100E0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF20
+BE8100B0 4BFFFD11
+7FE802A6 386003E8
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C681B78 3860001F
+38800000 38A00000
+38C0001D 38E00009
+3D808030 618C2834
+7D8903A6 4E800421
+7C7E1B78 806DB77C
+7FC4F378 3D808030
+618C2810 7D8903A6
+4E800421 38600000
+987E0026 7FC3F378
+389F0010 3D808030
+618C2B90 7D8903A6
+4E800421 7FC3F378
+C03F0018 C05F001C
+3D808030 618C2B10
+7D8903A6 4E800421
+7FC3F378 389F0014
+3D808030 618C2B64
+7D8903A6 4E800421
+7FC3F378 3D808030
+618C2AF0 7D8903A6
+4E800421 807F0000
+93C30006 38600013
+38800014 38A00000
+3D808039 618C01F0
+7D8903A6 4E800421
+4BFFFCE1 7C8802A6
+38A00007 3D808038
+618CFD54 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF20 BE8100B0
+38600072 3D808037
+618CF1E4 7D8903A6
+4E800421 4BFFFBD1
+7C8802A6 90640000
+7C7E1B78 38800072
+3D808000 618CC160
+7D8903A6 4E800421
+4BFFFDD1 4BFFFE89
+4BFFFC59 7C6802A6
+907E0012 3D808034
+618C9BF0 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 C022A8C8
+60000000 00000000
+C21A4DEC 00000028 #External/Debug Inputs/LogEngineTime.asm
+3C608048 80639D30
+5463443E 2C030202
+40820124 3C608048
+80639D60 2C030000
+40810114 7C0802A6
+90010004 9421FF20
+BE8100B0 3D808034
+618C7364 7D8903A6
+4E800421 7C7E1B78
+3C608016 6063E774
+80830000 5485863E
+7CA50774 54A5801E
+5484043A 7C842B78
+7C632214 83E30008
+887F0000 2C030000
+41820098 3C80804C
+60841FAC 80640000
+547C073E 54630036
+90640000 3D808034
+618CC408 7D8903A6
+4E800421 1C9C0004
+38840016 7C9F202E
+7C641850 1C63000C
+3C808000 608400FC
+80840000 38A003E8
+7C842B96 7C842B96
+7C632396 7C7D1B78
+93BF006A 807F0002
+9B810008 9B810009
+9B81000A 80810008
+54842026 608400FF
+90810008 38810008
+3D808030 618C2B90
+7D8903A6 4E800421
+7FC3F378 3D808034
+618C738C 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 800D9368
+60000000 00000000
+C2376A88 0000002D #External/Debug Inputs/LogFetchTime.asm
+3C608048 80639D30
+5463443E 2C030202
+40820150 3C608047
+60639D64 80630000
+2C030000 4082013C
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808034 618C7364
+7D8903A6 4E800421
+7C7E1B78 3C608016
+6063E774 80830000
+5485863E 7CA50774
+54A5801E 5484043A
+7C842B78 7C632214
+83E30008 806100DC
+54638036 889F0001
+7C632378 5463803E
+906100DC 807F000A
+889F0001 1C840004
+38840016 7C7F212E
+887F0001 38630001
+2C030010 41800008
+38600000 987F0001
+887F0000 2C030000
+4082000C 38600001
+987F0000 3D808034
+618CC408 7D8903A6
+4E800421 7C7D1B78
+809F000E 93BF000E
+7C64E850 1C63000C
+3C808000 608400FC
+80840000 38A003E8
+7C842B96 7C842B96
+7C632396 907F0062
+807F000A 7C63E850
+1C63000C 3C808000
+608400FC 80840000
+38A003E8 7C842B96
+7C842B96 7C632396
+907F0066 7FC3F378
+3D808034 618C738C
+7D8903A6 4E800421
+BA8100B0 800100E4
+382100E0 7C0803A6
+881F0002 00000000
+C2349A28 00000025 #External/Debug Inputs/LogPollTime.asm
+3C608048 80639D30
+5463443E 2C030202
+4082010C 3C608047
+60639D64 80630000
+2C030000 408200F8
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808034 618C7364
+7D8903A6 4E800421
+7C7E1B78 3C608016
+6063E774 80830000
+5485863E 7CA50774
+54A5801E 5484043A
+7C842B78 7C632214
+83E30008 807F006E
+38630001 907F006E
+3D808034 618CC408
+7D8903A6 4E800421
+809F000A 907F000A
+7C641850 1C63000C
+3C808000 608400FC
+80840000 38A003E8
+7C842B96 7C842B96
+7C632396 7C7D1B78
+807F006E 5463063F
+41820028 807F005A
+7C1D1800 40800008
+93BF005A 807F005E
+7C1D1800 40810008
+93BF005E 4800000C
+93BF005A 93BF005E
+7FC3F378 3D808034
+618C738C 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 80B80000
+60000000 00000000
+C2375C14 0000002C #External/Debug Inputs/LogScanoutTime.asm
+48000034 5464C63E
+5463463E 7C032000
+4182000C 3860FFFF
+48000018 3863FFF1
+1C630006 38800005
+7C632396 5463E73E
+4E800020 3C608048
+80639D30 5463443E
+2C030202 40820110
+3C608047 60639D64
+80630000 2C030000
+408200FC 7C0802A6
+90010004 9421FF20
+BE8100B0 3D808034
+618C7364 7D8903A6
+4E800421 7C7E1B78
+3C608016 6063E774
+80830000 5485863E
+7CA50774 54A5801E
+5484043A 7C842B78
+7C632214 83E30008
+887F0000 2C030000
+41820080 3C60804A
+60638B10 80630000
+38800000 7C0323AC
+7C0004AC 4C00012C
+83430000 7F43D378
+4BFFFF2D 2C030000
+41800050 7C7C1B78
+3D808034 618CC408
+7D8903A6 4E800421
+1C9C0004 38840016
+7C9F202E 7C641850
+1C63000C 3C808000
+608400FC 80840000
+38A003E8 7C842B96
+7C842B96 7C632396
+7C7D1B78 93BF0056
+7FC3F378 3D808034
+618C738C 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 80010024
+60000000 00000000
+041BFA20 38600002 #External/Boot to CSS/Boot To CSS.asm
+
+$Optional: PD+VB [taukhan]
+*PD+VB
+C21A4D98 00000007 #Polling Drift Fix + VB [tauKhan]
+8062A6F4 2C030001
+40820028 8062A6F0
+2C030002 4182001C
+386DBD88 3D808034
+618CBA14 7D8803A6
+4E800021 4BFFFFD4
+60000000 00000000
+C21A5050 0000000B
+8062A6F4 2C030001
+40820044 8062A6F0
+2C030002 40820038
+4800001C 8062A6F0
+2C030002 41820028
+8062A6F4 2C030001
+4082001C 386DBD88
+3D808034 618CBA14
+7D8803A6 4E800021
+4BFFFFD4 38600000
+60000000 00000000
+C21A4BEC 00000015
+4800007D 7C0802A6
+90010004 9421FFF8
+386DBD88 8082A6F0
+38840001 9082A6F0
+2C040001 40820014
+3D808001 618C95FC
+7D8803A6 4E800021
+8082A6F0 2C040002
+40820014 3D808034
+618CBB00 7D8803A6
+4E800021 38600001
+9062A6F4 38604000
+38635624 3C808043
+B0642A42 8001000C
+38210008 7C0803A6
+4E800020 7C6802A6
+3D808034 618CE894
+7D8803A6 4E800021
+3C608048 3C80801A
+380446F4 38800000
+60000000 00000000
+04158268 C82280A0
+C234EB60 00000007
+8062A6F0 2C030001
+4080001C 38600000
+9062A6F4 3C608043
+38804000 388455FC
+B0832A42 38600000
+9062A6F0 386DBD88
+60000000 00000000
+04397878 4800020C
+
+$Optional: PD [Dan Salvato]
+*PD
+C21A4DA0 00000003 #Polling Drift Fix [Dan Salvato]
+901C0000 3D808001
+618C95FC 7D8903A6
+4E800421 00000000
+041A4DB4 60000000
+04019860 4BFFFD9D
+
+$Optional: 59.94Hz Engine [Fizzi]
+*Attempts to fix polling drift
+044DA2A8 3C88AB85 #External/59.94Hz Engine/InGameSpeed.asm
+044DA9E8 3C88AB85 #External/59.94Hz Engine/MenuSpeed.asm
+044D7CA0 3C88AB85 #External/59.94Hz Engine/SetSpeedOnBoot.asm
+044DA5F8 3C88AB85 #External/59.94Hz Engine/TrainingModeSpeed.asm
diff --git a/Output/Netplay/GALJ01r2.ini b/Output/Netplay/GALJ01r2.ini
index 7cfef3f3..2046ffbc 100644
--- a/Output/Netplay/GALJ01r2.ini
+++ b/Output/Netplay/GALJ01r2.ini
@@ -4664,7 +4664,7 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm
 60631360 906400A0
 3D80801B 618C136C
 7D8903A6 4E800420
-38600001 00000000
+38600002 00000000
 C21A45B8 000001FF #Online/Slippi Online Scene/main.asm
 3BA30004 7C0802A6
 90010004 9421FF20
@@ -5621,20 +5621,6 @@ BE8100B0 4BFFFCA9
 7C0803A6 4E800020
 60000000 00000000
 043775B0 7C600775 #Online/Debugging/LogInputOnCopy.asm
-041A4C24 C0429A7C #Polling Drift Fix + VB [tauKhan]
-0401985C 3C60804C
-04019860 91231F5C
-C2376200 00000003
-2C1DFFFF 41820008
-48000008 93A2C150
-60000000 00000000
-C21A5018 00000005
-3B5A0001 8002C150
-2C00FFFF 38000000
-9002C150 3D80801A
-618C5078 7D8903A6
-4D820420 00000000
-04218D68 C8228000
 C209E090 00000011 #Common/FastForward/DynamicsFix.asm
 807E0000 80630028
 48000009 48000074
@@ -6952,3 +6938,396 @@ C0230064 BA810008
 BA810008 800100B4
 382100B0 7C0803A6
 60000000 00000000
+
+$Optional: Debug Game-Side Latency [Fizzi]
+*Shows latency information on screen while in-game
+C216E774 00000093 #External/Debug Inputs/InitOnGameStart.asm
+48000410 4E800021
+00000000 43480000
+41C80000 000000FF
+000000B4 E2E2E2FF
+41200000 41880000
+546F7461 6C204761
+6D65204C 61673A20
+25752075 730A0A00
+506F6C6C 20436F75
+6E743A20 25750A00
+4D696E20 506F6C6C
+20446966 663A2025
+75207573 0A004D61
+7820506F 6C6C2044
+6966663A 20257520
+75730A00 46657463
+682D4665 7463683A
+20257520 75730A00
+506F6C6C 2D466574
+63683A20 25752075
+730A0050 6F6C6C2D
+456E6769 6E653A20
+25752075 730A0000
+4E800021 4E800020
+4E800021 7C0802A6
+90010004 9421FF20
+BE8100B0 4BFFFF31
+7FE802A6 83DF0000
+83BE0006 887E0000
+2C030001 40820128
+7FA3EB78 3D808030
+618C2BB0 7D8903A6
+4E800421 7FA3EB78
+38800000 38A00000
+3D808030 618C2A3C
+7D8903A6 4E800421
+7FA3EB78 389F0020
+80BE0056 3D808030
+618C2D4C 7D8903A6
+4E800421 7FA3EB78
+389F0038 80BE006E
+3D808030 618C2D4C
+7D8903A6 4E800421
+7FA3EB78 389F0048
+80BE005A 3D808030
+618C2D4C 7D8903A6
+4E800421 7FA3EB78
+389F005E 80BE005E
+3D808030 618C2D4C
+7D8903A6 4E800421
+7FA3EB78 389F0074
+80BE0062 3D808030
+618C2D4C 7D8903A6
+4E800421 7FA3EB78
+389F0088 80BE0066
+3D808030 618C2D4C
+7D8903A6 4E800421
+7FA3EB78 389F009B
+80BE006A 3D808030
+618C2D4C 7D8903A6
+4E800421 3C608046
+6063B6A0 88630008
+2C030000 41820020
+807E0012 3D808034
+618C9CBC 7D8903A6
+4E800421 38600002
+987E0000 BA8100B0
+800100E4 382100E0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF20 BE8100B0
+4BFFFDCD 7FE802A6
+38600020 3D808037
+618CF1E4 7D8903A6
+4E800421 7C681B78
+3860001E 3880FF2E
+38A0FFD8 38C00001
+38E00001 3D808030
+618C2834 7D8903A6
+4E800421 7C7E1B78
+806DB77C 7FC4F378
+3D808030 618C2810
+7D8903A6 4E800421
+38600000 987E0026
+7FC3F378 389F000C
+3D808030 618C2B90
+7D8903A6 4E800421
+C03F0004 D03E0008
+C03F0008 D03E000C
+807F0000 93C30002
+BA8100B0 800100E4
+382100E0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF20
+BE8100B0 4BFFFD11
+7FE802A6 386003E8
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C681B78 3860001F
+38800000 38A00000
+38C0001D 38E00009
+3D808030 618C2834
+7D8903A6 4E800421
+7C7E1B78 806DB77C
+7FC4F378 3D808030
+618C2810 7D8903A6
+4E800421 38600000
+987E0026 7FC3F378
+389F0010 3D808030
+618C2B90 7D8903A6
+4E800421 7FC3F378
+C03F0018 C05F001C
+3D808030 618C2B10
+7D8903A6 4E800421
+7FC3F378 389F0014
+3D808030 618C2B64
+7D8903A6 4E800421
+7FC3F378 3D808030
+618C2AF0 7D8903A6
+4E800421 807F0000
+93C30006 38600013
+38800014 38A00000
+3D808039 618C01F0
+7D8903A6 4E800421
+4BFFFCE1 7C8802A6
+38A00007 3D808038
+618CFD54 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF20 BE8100B0
+38600072 3D808037
+618CF1E4 7D8903A6
+4E800421 4BFFFBD1
+7C8802A6 90640000
+7C7E1B78 38800072
+3D808000 618CC160
+7D8903A6 4E800421
+4BFFFDD1 4BFFFE89
+4BFFFC59 7C6802A6
+907E0012 3D808034
+618C9BF0 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 C022A8C8
+60000000 00000000
+C21A4DEC 00000028 #External/Debug Inputs/LogEngineTime.asm
+3C608048 80639D30
+5463443E 2C030202
+40820124 3C608048
+80639D60 2C030000
+40810114 7C0802A6
+90010004 9421FF20
+BE8100B0 3D808034
+618C7364 7D8903A6
+4E800421 7C7E1B78
+3C608016 6063E774
+80830000 5485863E
+7CA50774 54A5801E
+5484043A 7C842B78
+7C632214 83E30008
+887F0000 2C030000
+41820098 3C80804C
+60841FAC 80640000
+547C073E 54630036
+90640000 3D808034
+618CC408 7D8903A6
+4E800421 1C9C0004
+38840016 7C9F202E
+7C641850 1C63000C
+3C808000 608400FC
+80840000 38A003E8
+7C842B96 7C842B96
+7C632396 7C7D1B78
+93BF006A 807F0002
+9B810008 9B810009
+9B81000A 80810008
+54842026 608400FF
+90810008 38810008
+3D808030 618C2B90
+7D8903A6 4E800421
+7FC3F378 3D808034
+618C738C 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 800D9368
+60000000 00000000
+C2376A88 0000002D #External/Debug Inputs/LogFetchTime.asm
+3C608048 80639D30
+5463443E 2C030202
+40820150 3C608047
+60639D64 80630000
+2C030000 4082013C
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808034 618C7364
+7D8903A6 4E800421
+7C7E1B78 3C608016
+6063E774 80830000
+5485863E 7CA50774
+54A5801E 5484043A
+7C842B78 7C632214
+83E30008 806100DC
+54638036 889F0001
+7C632378 5463803E
+906100DC 807F000A
+889F0001 1C840004
+38840016 7C7F212E
+887F0001 38630001
+2C030010 41800008
+38600000 987F0001
+887F0000 2C030000
+4082000C 38600001
+987F0000 3D808034
+618CC408 7D8903A6
+4E800421 7C7D1B78
+809F000E 93BF000E
+7C64E850 1C63000C
+3C808000 608400FC
+80840000 38A003E8
+7C842B96 7C842B96
+7C632396 907F0062
+807F000A 7C63E850
+1C63000C 3C808000
+608400FC 80840000
+38A003E8 7C842B96
+7C842B96 7C632396
+907F0066 7FC3F378
+3D808034 618C738C
+7D8903A6 4E800421
+BA8100B0 800100E4
+382100E0 7C0803A6
+881F0002 00000000
+C2349A28 00000025 #External/Debug Inputs/LogPollTime.asm
+3C608048 80639D30
+5463443E 2C030202
+4082010C 3C608047
+60639D64 80630000
+2C030000 408200F8
+7C0802A6 90010004
+9421FF20 BE8100B0
+3D808034 618C7364
+7D8903A6 4E800421
+7C7E1B78 3C608016
+6063E774 80830000
+5485863E 7CA50774
+54A5801E 5484043A
+7C842B78 7C632214
+83E30008 807F006E
+38630001 907F006E
+3D808034 618CC408
+7D8903A6 4E800421
+809F000A 907F000A
+7C641850 1C63000C
+3C808000 608400FC
+80840000 38A003E8
+7C842B96 7C842B96
+7C632396 7C7D1B78
+807F006E 5463063F
+41820028 807F005A
+7C1D1800 40800008
+93BF005A 807F005E
+7C1D1800 40810008
+93BF005E 4800000C
+93BF005A 93BF005E
+7FC3F378 3D808034
+618C738C 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 80B80000
+60000000 00000000
+C2375C14 0000002C #External/Debug Inputs/LogScanoutTime.asm
+48000034 5464C63E
+5463463E 7C032000
+4182000C 3860FFFF
+48000018 3863FFF1
+1C630006 38800005
+7C632396 5463E73E
+4E800020 3C608048
+80639D30 5463443E
+2C030202 40820110
+3C608047 60639D64
+80630000 2C030000
+408200FC 7C0802A6
+90010004 9421FF20
+BE8100B0 3D808034
+618C7364 7D8903A6
+4E800421 7C7E1B78
+3C608016 6063E774
+80830000 5485863E
+7CA50774 54A5801E
+5484043A 7C842B78
+7C632214 83E30008
+887F0000 2C030000
+41820080 3C60804A
+60638B10 80630000
+38800000 7C0323AC
+7C0004AC 4C00012C
+83430000 7F43D378
+4BFFFF2D 2C030000
+41800050 7C7C1B78
+3D808034 618CC408
+7D8903A6 4E800421
+1C9C0004 38840016
+7C9F202E 7C641850
+1C63000C 3C808000
+608400FC 80840000
+38A003E8 7C842B96
+7C842B96 7C632396
+7C7D1B78 93BF0056
+7FC3F378 3D808034
+618C738C 7D8903A6
+4E800421 BA8100B0
+800100E4 382100E0
+7C0803A6 80010024
+60000000 00000000
+041BFA20 38600002 #External/Boot to CSS/Boot To CSS.asm
+
+$Optional: PD+VB [taukhan]
+*PD+VB
+C21A4D98 00000007 #Polling Drift Fix + VB [tauKhan]
+8062A6F4 2C030001
+40820028 8062A6F0
+2C030002 4182001C
+386DBD88 3D808034
+618CBA14 7D8803A6
+4E800021 4BFFFFD4
+60000000 00000000
+C21A5050 0000000B
+8062A6F4 2C030001
+40820044 8062A6F0
+2C030002 40820038
+4800001C 8062A6F0
+2C030002 41820028
+8062A6F4 2C030001
+4082001C 386DBD88
+3D808034 618CBA14
+7D8803A6 4E800021
+4BFFFFD4 38600000
+60000000 00000000
+C21A4BEC 00000015
+4800007D 7C0802A6
+90010004 9421FFF8
+386DBD88 8082A6F0
+38840001 9082A6F0
+2C040001 40820014
+3D808001 618C95FC
+7D8803A6 4E800021
+8082A6F0 2C040002
+40820014 3D808034
+618CBB00 7D8803A6
+4E800021 38600001
+9062A6F4 38604000
+38635624 3C808043
+B0642A42 8001000C
+38210008 7C0803A6
+4E800020 7C6802A6
+3D808034 618CE894
+7D8803A6 4E800021
+3C608048 3C80801A
+380446F4 38800000
+60000000 00000000
+04158268 C82280A0
+C234EB60 00000007
+8062A6F0 2C030001
+4080001C 38600000
+9062A6F4 3C608043
+38804000 388455FC
+B0832A42 38600000
+9062A6F0 386DBD88
+60000000 00000000
+04397878 4800020C
+
+$Optional: PD [Dan Salvato]
+*PD
+C21A4DA0 00000003 #Polling Drift Fix [Dan Salvato]
+901C0000 3D808001
+618C95FC 7D8903A6
+4E800421 00000000
+041A4DB4 60000000
+04019860 4BFFFD9D
+
+$Optional: 59.94Hz Engine [Fizzi]
+*Attempts to fix polling drift
+044DA2A8 3C88AB85 #External/59.94Hz Engine/InGameSpeed.asm
+044DA9E8 3C88AB85 #External/59.94Hz Engine/MenuSpeed.asm
+044D7CA0 3C88AB85 #External/59.94Hz Engine/SetSpeedOnBoot.asm
+044DA5F8 3C88AB85 #External/59.94Hz Engine/TrainingModeSpeed.asm