japan: match subgame loader

data/build_info.s

@@ -3,4 +3,8 @@
 mSectionRodata
 
 RomBuildInfo:
+#ifdef JAPAN
+    .ascii "0.93 Thu Oct 25 00:00:00  2002\r\n"
+#else
     .ascii "0.94 Thu Oct 25 00:00:00  2002\r\n"
+#endif

multi_boot/programs/subgame_loader/data/data.s

@@ -1,5 +1,6 @@
 	.section .rodata
-
+@; TODO: this data needs to be extracted properly
+@; it's mostly VRAM data
     .global gUnknown_0203c2a4
 gUnknown_0203c2a4:
     .incbin "data/rom_data.bin", 0x000012a4, 0x200
@@ -10,7 +11,11 @@ gUnknown_0203C4A4:
 
     .global gUnknown_0203E844
 gUnknown_0203E844:
+#ifdef JAPAN
+    .incbin "data/rom_data_japan.bin", 0x0000384C, 0x37C
+#else
     .incbin "data/rom_data.bin", 0x00003844, 0x37C
+#endif
 
     .global gUnknown_0203EBC0
 gUnknown_0203EBC0:
@@ -20,7 +25,11 @@ gUnknown_0203EBC0:
 gUnknown_0203EDC0:
     .incbin "data/rom_data.bin", 0x00003DC0, 0x4A0
 
+
     .global gUnknown_0203F260
 gUnknown_0203F260:
+#ifdef JAPAN
+    .incbin "data/rom_data_japan.bin", 0x00004268, 0x4CC
+#else
     .incbin "data/rom_data.bin", 0x00004260, 0x4CC
-
+#endif

multi_boot/programs/subgame_loader/src/main.c

@@ -272,7 +272,11 @@ static void sub_0203b610(Loader *loader)
             REG_BG1VOFS = ((loader->unk13 - 1) * 0x18) - 0x30;
         } else {
             REG_BG1HOFS = 0xFFE8;
+#ifdef JAPAN
+            REG_BG1VOFS = 0xFFD0;
+#else
             REG_BG1VOFS = 0xFFE8;
+#endif
         }
 
         CpuCopy16(gUnknown_0203C4A4, (void *)VRAM + 0xC000, 0x23A0);

multi_boot/programs/subgame_loader/subgame_loader_japan.sha1

@@ -1 +1 @@
-b40b844bba9136f4b5d2feece41fcc9e2419007d  subgame_loader.bin
+51cad1964d0f792e4a4fca77c18e5da093c08e4c  subgame_loader.bin

multi_boot/roms/subgame_loader/subgame_loader_japan.sha1

@@ -1 +1 @@
-f703254852b906331beb06081aa2e22cf5ec507c  subgame_loader.gba
+187509cf13fadea274ad6f8bd51eb28a9511cc4a  subgame_loader.gba

multi_boot/subgame_bootstrap/subgame_bootstrap_japan.sha1

@@ -1 +1 @@
-8737fa7c61c9df372dc33dc6dafb1e03ab87a37e  subgame_bootstrap.gba
+1b687d969a283bda11d735e8a91c0aed8fd52ec4  subgame_bootstrap.gba

src/game/multiboot/connection.c

@@ -199,7 +199,7 @@ void LinkCommunicationError(void)
     gBgScrollRegs[1][1] = 0;
     switch (gMultiplayerLanguage) {
         case 0:
-#if JAPAN
+#ifdef JAPAN
             gBgScrollRegs[1][1] = -56;
 #else
             gBgScrollRegs[1][1] = -8;