[jak2] better handling of invalid formats (#3171)

see #3143
open-goal · Nov 6, 2023 · 299a25b · 299a25b
1 parent 8179d0a
commit 299a25b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/game/kernel/jak2/kprint.cpp b/game/kernel/jak2/kprint.cpp
@@ -229,7 +229,6 @@ s32 format_impl_jak2(uint64_t* args) {
         case 'w':
         case 'y':
         case 'z':
-        case 1:  // jak 2 japanese encoding
           while (arg_start < format_ptr + 1) {
             *output_ptr = *arg_start;
             arg_start++;
@@ -517,12 +516,15 @@ s32 format_impl_jak2(uint64_t* args) {
         default:
           MsgErr("format: unknown code 0x%02x\n", format_ptr[1]);
           MsgErr("input was %s\n", format_cstring);
-          ASSERT(false);
+          // ASSERT(false);
+          goto copy_char_hack;
           break;
       }
       format_ptr++;
     } else {
-      // got normal char, just copy it
+    // got normal char, just copy it
+    copy_char_hack:  // we goto here if we get a bad code for ~, which sort of backtracks and falls
+                     // back to regular character copying
       *output_ptr = *format_ptr;
       output_ptr++;
     }