Import s19br

README.md

@@ -577,7 +577,7 @@ Individual overlay progress:
             <td><b>s19br</b></td>
             <td>110 KB</td>
             <td>Escape Route (Tunnel) (RED)</td>
-            <td>❌ Work not started</td>
+            <td>🚧 Work in progress</td>
         </tr>
         <tr>
             <td><b>s20a</b></td>

build/build.py

@@ -451,7 +451,7 @@ def gen_build_target(targetName):
         "s13a",
         "s08a",
         "d18a", "d18ar",
-        "s19b",
+        "s19b", "s19br"
     ]
 
     if args.variant == 'vr_exe' or args.variant == 'dev_exe':

build/linker_command_file.txt

@@ -3232,8 +3232,8 @@ overlay_bss group   file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin")
     include "{{PSYQ_SDK}}\psyq_4.4\LIB\libpress\LIBPRESS.OBJ", overlay
     include "{{PSYQ_SDK}}\psyq_4.4\LIB\libpress\VLC_C.OBJ", overlay
     include "{{PSYQ_SDK}}\psyq_4.4\LIB\libpress\BUILD.OBJ", overlay
-{% elif OVERLAY == "s19b" %}
-    include "{{OBJ_DIR}}\overlays\s19b\overlay.obj"
+{% elif OVERLAY == "s19b" or OVERLAY == "s19br" %}
+    include "{{OBJ_DIR}}\overlays\{{OVERLAY}}\overlay.obj"
     include "{{OBJ_DIR}}\overlays\s19b\s19b_800C3B14.obj"
     include "{{OBJ_DIR}}\overlays\s19b\s19b_800C3C14.obj"
     include "{{OBJ_DIR}}\overlays\s19b\s19b_800C3C90.obj"

src/overlays/s19b/overlay.c

@@ -1,6 +1,6 @@
 #include "libgcl/libgcl.h"
 
-GCL_ActorTableEntry s19bOverlayCharas[] = 
+GCL_ActorTableEntry s19bOverlayCharas[] =
 {
     { 0xECED, (TGCL_ActorCreateFn)0x800C4268 },
     { 0x51C6, (TGCL_ActorCreateFn)0x800DCECC },
@@ -587,7 +587,9 @@ const char s19b_dword_800DD620[] = {0x0, 0x8, 0x0, 0x0};
 const char s19b_dword_800DD624[] = {0x0, 0x8, 0x0, 0x0};
 const char s19b_dword_800DD628[] = {0x0, 0x8, 0x0, 0x0};
 const char s19b_dword_800DD62C[] = {0x0, 0x0, 0x0, 0x0};
-const char s19b_aJeepemyc_800DD630[] = "jeep_emy.c";
+const char s19b_dword_800DD630[] = {'j', 'e', 'e', 'p'};
+const char s19b_dword_800DD634[] = {'_', 'e', 'm', 'y'};
+const char s19b_dword_800DD638[] = {'.', 'c', 0x0, 0x0};
 const char s19b_dword_800DD63C[] = {0x1, 'V', 0x4, 0x0};
 const char s19b_dword_800DD640[] = {0xb, 0x0, '^', 0x0};
 const char s19b_dword_800DD644[] = {0xb1, 0x1, 0x9, 0x1};
@@ -979,8 +981,12 @@ const char s19b_aJdrumc_800DDC60[] = "jdrum.c";
 const char s19b_dword_800DDC68[] = {'j', 'b', 'l', 'a'};
 const char s19b_dword_800DDC6C[] = {'s', 't', '.', 'c'};
 const char s19b_dword_800DDC70[] = {0x0, 0x80, 0x1, '<'};
-const char s19b_aJdrumsmkc_800DDC74[] = "jdrumsmk.c";
-const char s19b_aJdrumfirc_800DDC80[] = "jdrumfir.c";
+const char s19b_dword_800DDC74[] = {'j', 'd', 'r', 'u'};
+const char s19b_dword_800DDC78[] = {'m', 's', 'm', 'k'};
+const char s19b_dword_800DDC7C[] = {'.', 'c', 0x0, 0x0};
+const char s19b_dword_800DDC80[] = {'j', 'd', 'r', 'u'};
+const char s19b_dword_800DDC84[] = {'m', 'f', 'i', 'r'};
+const char s19b_dword_800DDC88[] = {'.', 'c', 0x0, 0x0};
 const char s19b_dword_800DDC8C[] = {'f', 'o', 'g', '.'};
 const char s19b_dword_800DDC90[] = {'c', 0x0, 0xa3, 0xa7};
 const char s19b_aLightoverjeepsrlc_800DDC94[] = "<<<<< light over !!!!!!!(jeep.srl.c) >>>>>\n";
@@ -1005,7 +1011,9 @@ const char s19b_aBoa_800DDD2C[] = "19b_o3a";
 const char s19b_dword_800DDD34[] = {'j', 'e', 'e', 'p'};
 const char s19b_dword_800DDD38[] = {'_', 'g', 't', 'e'};
 const char s19b_dword_800DDD3C[] = {'.', 'c', 0x0, 0x14};
-const char s19b_aGsplashc_800DDD40[] = "gsplash3.c";
+const char s19b_dword_800DDD40[] = {'g', 's', 'p', 'l'};
+const char s19b_dword_800DDD44[] = {'a', 's', 'h', '3'};
+const char s19b_dword_800DDD48[] = {'.', 'c', 0x0, 0x0};
 const char s19b_dword_800DDD4C[] = {0xe4, 0xfd, 0xbe, 0x4};
 const char s19b_dword_800DDD50[] = {'=', 0xfc, 0x0, 0x0};
 const char s19b_dword_800DDD54[] = {0xac, 0x1, 'U', 0x2};