revert changes

project-slippi · Sep 14, 2023 · 5673286 · 5673286
1 parent 45ddce7
commit 5673286
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 1,207 deletions.
diff --git a/Binary/LagReduction/PD+VB.bin b/Binary/LagReduction/PD+VB.bin
diff --git a/Common/EXILogging/AllocLoggingBuffer.asm b/Common/EXILogging/AllocLoggingBuffer.asm
diff --git a/Online/Core/ForceEngineOnRollback.asm b/Online/Core/ForceEngineOnRollback.asm
@@ -64,7 +64,7 @@ beq RESTORE_AND_EXIT
 li r4, 0
 stb r4, ODB_SHOULD_FORCE_PAD_RENEW(r5)
 branchl r12, RenewInputs_Prefunction
-#exilogf LOG_LEVEL_NOTICE, "Forced a pad renew..."
+#logf LOG_LEVEL_NOTICE, "Forced a pad renew..."
 
 RESTORE_AND_EXIT:
 mr r3, r26 # We will set r26 to 0 later so it's fine to use here

diff --git a/Online/Core/Hacks/ForceNoVideoAssert.asm b/Online/Core/Hacks/ForceNoVideoAssert.asm
@@ -5,7 +5,7 @@
 .include "Common/Common.s"
 .include "Online/Online.s"
 
-#exilogf LOG_LEVEL_NOTICE, "XFB Status is not 4. Value: %d", "mr r5, 0"
+#logf LOG_LEVEL_NOTICE, "XFB Status is not 4. Value: %d", "mr r5, 0"
 
 # Log XFB status value
 bl STRING

diff --git a/Online/Core/Sound/PreventDuplicateSounds.asm b/Online/Core/Sound/PreventDuplicateSounds.asm
@@ -36,7 +36,7 @@ li REG_IS_SOUND_ACTIVE, 0
 li REG_SOUND_INSTANCE_ID, 0
 rlwinm REG_SOUND_ID, r23, 0, 0xFFFF # Extract half word from sound ID input
 
-#exilogf LOG_LEVEL_WARN, "Play SFX %x, Frame: %d, Rollback: %d", "mr r5, REG_SOUND_ID", "loadGlobalFrame r6", "lbz r7, ODB_STABLE_ROLLBACK_IS_ACTIVE(REG_ODB_ADDRESS)"
+#logf LOG_LEVEL_WARN, "Play SFX %x, Frame: %d, Rollback: %d", "mr r5, REG_SOUND_ID", "loadGlobalFrame r6", "lbz r7, ODB_STABLE_ROLLBACK_IS_ACTIVE(REG_ODB_ADDRESS)"
 
 lbz REG_WRITE_INDEX, SFXDB_WRITE_INDEX(REG_SFXDB_ADDRESS)
 loadGlobalFrame r3
@@ -84,11 +84,11 @@ lbz r3, SFXS_LOG_INDEX(r6)
 cmpw r8, r3
 blt FIND_SOUND_LOOP_START
 
-#exilogf LOG_LEVEL_ERROR, "SFX %x NOT found. End frame: %d", "mr r5, REG_SOUND_ID", "lwz r6, ODB_STABLE_ROLLBACK_END_FRAME(REG_ODB_ADDRESS)"
+#logf LOG_LEVEL_ERROR, "SFX %x NOT found. End frame: %d", "mr r5, REG_SOUND_ID", "lwz r6, ODB_STABLE_ROLLBACK_END_FRAME(REG_ODB_ADDRESS)"
 b STORE_SOUND
 
 SOUND_ALREADY_PLAYED:
-#exilogf LOG_LEVEL_WARN, "SFX %x found. End frame: %d", "mr r5, REG_SOUND_ID", "lwz r6, ODB_STABLE_ROLLBACK_END_FRAME(REG_ODB_ADDRESS)"
+#logf LOG_LEVEL_WARN, "SFX %x found. End frame: %d", "mr r5, REG_SOUND_ID", "lwz r6, ODB_STABLE_ROLLBACK_END_FRAME(REG_ODB_ADDRESS)"
 lwz REG_SOUND_INSTANCE_ID, SFXS_ENTRY_INSTANCE_ID(r5)
 li REG_IS_SOUND_ACTIVE, 1
 

diff --git a/Online/Menus/CSS/Teams/AnimateCursorPort.asm b/Online/Menus/CSS/Teams/AnimateCursorPort.asm
@@ -37,7 +37,7 @@ mulli r6, r6, 0x4
 add REG_TEAM_IDX, REG_TEAM_IDX, r6
 
 mr r3, REG_TEAM_IDX
-#exilogf LOG_LEVEL_NOTICE, "CURSOR COLOR r3: %d", "mr r5, 3", "mr r6, 6"
+#logf LOG_LEVEL_NOTICE, "CURSOR COLOR r3: %d", "mr r5, 3", "mr r6, 6"
 branchl r12, FN_IntToFloat
 
 b EXIT

diff --git a/Online/Menus/CSS/Teams/InitTeamToggleButton.asm b/Online/Menus/CSS/Teams/InitTeamToggleButton.asm
@@ -354,7 +354,7 @@ lbz r3, 0x70(REG_PORT_SELECTIONS_ADDR)
 mr REG_INTERNAL_CHAR_ID, r3
 
 lbz REG_TEAM_IDX, CSSDT_TEAM_IDX(REG_CSSDT_ADDR)
-# exilogf LOG_LEVEL_NOTICE, "TEAM INDEX %d", "mr r5, 25"
+# logf LOG_LEVEL_NOTICE, "TEAM INDEX %d", "mr r5, 25"
 
 # Animate the team icon based on team index
 cmpwi REG_TEAM_IDX, 3

diff --git a/Online/Slippi Online Scene/boot.asm b/Online/Slippi Online Scene/boot.asm
@@ -56,4 +56,4 @@ branch r12, 0x801b136c
 # Code end
 ################################################################################
 EXIT:
-li r3, 0x2 # Load menu first
+li r3, 0x1 # Load menu first