fix console display regressions

writing file text would not clear when game ends, outdated Nintendont version would show up when connecting to a non-outdated Nintendont
project-slippi · May 31, 2021 · 5250143 · 5250143
1 parent 54206bf
commit 5250143
Show file tree

Hide file tree

Showing 4 changed files with 176 additions and 22 deletions.
diff --git a/app/dolphin-dev/overwrite/Sys/GameSettings/GALE01r2.ini b/app/dolphin-dev/overwrite/Sys/GameSettings/GALE01r2.ini
@@ -477,20 +477,20 @@ C21A45A0 00000007 #Playback/Core/Scene/Boot to Playback Scene.asm
 3C808047 60849D30
 98640003 4E800020
 3800000E 00000000
-C21A6348 00000070 #Playback/Core/Scene/SceneThink_Playback.asm
+C21A6348 000000AB #Playback/Core/Scene/SceneThink_Playback.asm
 3C608047 60639D30
 88630000 2C03000E
-40820364 3860000D
+4082053C 3860000D
 3880000E 38A00000
 3D808039 618C01F0
 7D8903A6 4E800421
 48000021 7C8802A6
 38A00000 3D808038
 618CFD54 7D8903A6
-4E800421 48000318
+4E800421 480004F0
 4E800021 7C0802A6
 90010004 9421FF50
-BE810008 48000289
+BE810008 48000461
 7FC802A6 38600000
 3880FFFF 3D80803A
 618C6754 7D8903A6
@@ -501,16 +501,16 @@ C03E0008 D03C0008
 C03E0010 D03C0024
 D03C0028 C03E0000
 C05E0004 7F83E378
-4800025D 7C8802A6
-4800026D 7CA802A6
+48000435 7C8802A6
+48000445 7CA802A6
 3D80803A 618C6B98
 7D8903A6 4E800421
 7C641B78 7F83E378
 C03E000C C05E000C
 3D80803A 618C7548
 7D8903A6 4E800421
 C03E0014 C05E0018
-7F83E378 4800023D
+7F83E378 48000415
 7C8802A6 3D80803A
 618C6B98 7D8903A6
 4E800421 7C641B78
@@ -522,7 +522,7 @@ C05E000C 3D80803A
 7F83E378 38800001
 38A10040 3D80803A
 618C74F0 7D8903A6
-4E800421 38600020
+4E800421 38600221
 3D808037 618CF1E4
 7D8903A6 4E800421
 7C7D1B78 3B600000
@@ -544,10 +544,10 @@ C05E000C 3D80803A
 4E800421 3B7B0001
 2C1B00F0 41800008
 3B600000 3860003C
-7C7B1B96 48000119
+7C7B1B96 480002F1
 7C8802A6 1C630004
 7CC32214 7F83E378
-38800000 480000E9
+38800000 480002C1
 7CA802A6 4CC63182
 3D80803A 618C70A0
 7D8903A6 4E800421
@@ -563,12 +563,71 @@ C05E000C 3D80803A
 4082FEF0 7F83E378
 3D80803A 618C5CC4
 7D8903A6 4E800421
-3D808002 618C4F6C
+38600075 987D0000
+38600000 907D0001
+38600000 907D0005
+38600000 907D0009
+7FA3EB78 3880000D
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 7FA3EB78
+38800221 38A00000
+3D808000 618C55F0
+7D8903A6 4E800421
+887D0000 2C030001
+41820018 3D808034
+618CF314 7D8903A6
+4E800421 4BFFFF8C
+3A9D0005 3C808043
+60842078 88740060
+90640014 88740063
+98640018 88740084
+9064001C 88740087
+98640020 887400A8
+90640024 887400AB
+98640028 887400CC
+9064002C 887400CF
+98640030 A074000E
+9064000C 3D808001
+618C8254 7D8903A6
+4E800421 386000C7
+3D808001 618C8C2C
+7D8903A6 4E800421
+38600004 3D808001
+618C7700 7D8903A6
+4E800421 3860001C
+3D808002 618C6F2C
+7D8903A6 4E800421
+3D808021 618CB2D8
+7D8903A6 4E800421
+3AA00000 1C150024
+7E96A378 7ED60214
+3D808000 618C569C
+7D8903A6 4E800421
+88960060 7C840774
+7C041800 41820028
+38600000 3D808000
+618C56A0 7D8903A6
+4E800421 3D808000
+618C56A8 7D8903A6
+4E800421 3AB50001
+2C150006 3AD60024
+4180FFB0 A074000E
+3D808022 618C519C
+7D8903A6 4E800421
+7C641B78 38600001
+3D808000 618C56A0
+7D8903A6 4E800421
+3D808000 618C56A8
+7D8903A6 4E800421
+3D808002 618C7168
 7D8903A6 4E800421
 8062F240 2C030000
 40820018 38600001
 3D808002 618C4030
 7D8903A6 4E800421
+3D808002 618C4F6C
+7D8903A6 4E800421
 3D80801A 618C4B60
 7D8903A6 4E800421
 48000068 4E800021
@@ -765,6 +824,9 @@ BA810008 800100B4
 BA810008 800100B4
 382100B0 7C0803A6
 2C1A0000 00000000
+C200569C 00000002 #Common/GetFighterNum.asm
+38600021 4E800020
+60000000 00000000
 C20055F8 0000000F #Common/GetIsFollower.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -781,6 +843,14 @@ C20055F8 0000000F #Common/GetIsFollower.asm
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
+C20056A0 00000007 #Common/GetSSMIndex.asm
+2C030001 41820018
+3C60803B 6063B3C0
+1C840010 7C6320AE
+48000018 3C60803B
+6063B6B0 1C840003
+7C6320AE 48000004
+4E800020 00000000
 C216D294 00000006 #Common/IncrementFrameIndex.asm
 987F0008 3C608048
 80639D58 2C030000
@@ -840,6 +910,12 @@ EC2100B2 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
+C20056A8 00000005 #Common/RequestSSMLoad.asm
+2C030037 41820018
+3D808043 618C37C4
+38800001 1C630004
+7C83612E 4E800020
+60000000 00000000
 C20056B4 00000059 #Common/SubtextFunctions.asm
 2C050002 418201F8
 7C0802A6 90010004

diff --git a/app/dolphin-dev/overwrite/Sys/GameSettings/GALJ01r2.ini b/app/dolphin-dev/overwrite/Sys/GameSettings/GALJ01r2.ini
@@ -477,20 +477,20 @@ C21A45A0 00000007 #Playback/Core/Scene/Boot to Playback Scene.asm
 3C808047 60849D30
 98640003 4E800020
 3800000E 00000000
-C21A6348 00000070 #Playback/Core/Scene/SceneThink_Playback.asm
+C21A6348 000000AB #Playback/Core/Scene/SceneThink_Playback.asm
 3C608047 60639D30
 88630000 2C03000E
-40820364 3860000D
+4082053C 3860000D
 3880000E 38A00000
 3D808039 618C01F0
 7D8903A6 4E800421
 48000021 7C8802A6
 38A00000 3D808038
 618CFD54 7D8903A6
-4E800421 48000318
+4E800421 480004F0
 4E800021 7C0802A6
 90010004 9421FF50
-BE810008 48000289
+BE810008 48000461
 7FC802A6 38600000
 3880FFFF 3D80803A
 618C6754 7D8903A6
@@ -501,16 +501,16 @@ C03E0008 D03C0008
 C03E0010 D03C0024
 D03C0028 C03E0000
 C05E0004 7F83E378
-4800025D 7C8802A6
-4800026D 7CA802A6
+48000435 7C8802A6
+48000445 7CA802A6
 3D80803A 618C6B98
 7D8903A6 4E800421
 7C641B78 7F83E378
 C03E000C C05E000C
 3D80803A 618C7548
 7D8903A6 4E800421
 C03E0014 C05E0018
-7F83E378 4800023D
+7F83E378 48000415
 7C8802A6 3D80803A
 618C6B98 7D8903A6
 4E800421 7C641B78
@@ -522,7 +522,7 @@ C05E000C 3D80803A
 7F83E378 38800001
 38A10040 3D80803A
 618C74F0 7D8903A6
-4E800421 38600020
+4E800421 38600221
 3D808037 618CF1E4
 7D8903A6 4E800421
 7C7D1B78 3B600000
@@ -544,10 +544,10 @@ C05E000C 3D80803A
 4E800421 3B7B0001
 2C1B00F0 41800008
 3B600000 3860003C
-7C7B1B96 48000119
+7C7B1B96 480002F1
 7C8802A6 1C630004
 7CC32214 7F83E378
-38800000 480000E9
+38800000 480002C1
 7CA802A6 4CC63182
 3D80803A 618C70A0
 7D8903A6 4E800421
@@ -563,12 +563,71 @@ C05E000C 3D80803A
 4082FEF0 7F83E378
 3D80803A 618C5CC4
 7D8903A6 4E800421
-3D808002 618C4F6C
+38600075 987D0000
+38600000 907D0001
+38600000 907D0005
+38600000 907D0009
+7FA3EB78 3880000D
+38A00001 3D808000
+618C55F0 7D8903A6
+4E800421 7FA3EB78
+38800221 38A00000
+3D808000 618C55F0
+7D8903A6 4E800421
+887D0000 2C030001
+41820018 3D808034
+618CF314 7D8903A6
+4E800421 4BFFFF8C
+3A9D0005 3C808043
+60842078 88740060
+90640014 88740063
+98640018 88740084
+9064001C 88740087
+98640020 887400A8
+90640024 887400AB
+98640028 887400CC
+9064002C 887400CF
+98640030 A074000E
+9064000C 3D808001
+618C8254 7D8903A6
+4E800421 386000C7
+3D808001 618C8C2C
+7D8903A6 4E800421
+38600004 3D808001
+618C7700 7D8903A6
+4E800421 3860001C
+3D808002 618C6F2C
+7D8903A6 4E800421
+3D808021 618CB2D8
+7D8903A6 4E800421
+3AA00000 1C150024
+7E96A378 7ED60214
+3D808000 618C569C
+7D8903A6 4E800421
+88960060 7C840774
+7C041800 41820028
+38600000 3D808000
+618C56A0 7D8903A6
+4E800421 3D808000
+618C56A8 7D8903A6
+4E800421 3AB50001
+2C150006 3AD60024
+4180FFB0 A074000E
+3D808022 618C519C
+7D8903A6 4E800421
+7C641B78 38600001
+3D808000 618C56A0
+7D8903A6 4E800421
+3D808000 618C56A8
+7D8903A6 4E800421
+3D808002 618C7168
 7D8903A6 4E800421
 8062F240 2C030000
 40820018 38600001
 3D808002 618C4030
 7D8903A6 4E800421
+3D808002 618C4F6C
+7D8903A6 4E800421
 3D80801A 618C4B60
 7D8903A6 4E800421
 48000068 4E800021
@@ -765,6 +824,9 @@ BA810008 800100B4
 BA810008 800100B4
 382100B0 7C0803A6
 2C1A0000 00000000
+C200569C 00000002 #Common/GetFighterNum.asm
+38600021 4E800020
+60000000 00000000
 C20055F8 0000000F #Common/GetIsFollower.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -781,6 +843,14 @@ C20055F8 0000000F #Common/GetIsFollower.asm
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
+C20056A0 00000007 #Common/GetSSMIndex.asm
+2C030001 41820018
+3C60803B 6063B3C0
+1C840010 7C6320AE
+48000018 3C60803B
+6063B6B0 1C840003
+7C6320AE 48000004
+4E800020 00000000
 C216D294 00000006 #Common/IncrementFrameIndex.asm
 987F0008 3C608048
 80639D58 2C030000
@@ -840,6 +910,12 @@ EC2100B2 BA810008
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
+C20056A8 00000005 #Common/RequestSSMLoad.asm
+2C030037 41820018
+3D808043 618C37C4
+38800001 1C630004
+7C83612E 4E800020
+60000000 00000000
 C20056B4 00000059 #Common/SubtextFunctions.asm
 2C050002 418201F8
 7C0802A6 90010004

diff --git a/app/domain/SlpFileWriter.js b/app/domain/SlpFileWriter.js
@@ -138,6 +138,7 @@ export default class SlpFileWriter extends EventEmitter {
     this.slpStream.on(SlpFileWriterEvent.FILE_COMPLETE, () => {
       console.log('Finished writing file.');
       // Update file state
+      this.currentFile = this.getClearedCurrentFile();
       this.onFileStateChange();
     });
 

diff --git a/app/domain/SlpNetworking.js b/app/domain/SlpNetworking.js
@@ -149,6 +149,7 @@ export default class SlpNetworking {
         console.log(details);
         this.connDetails = {...this.connDetails, ...details};
         console.log(this.connDetails);
+        this.forceConsoleUiUpdate();
       });
       conn.on("statusChange", (status) => this.setStatus(status));
       conn.on("data", (data) => this.handleReplayData(data));