From 3f64d749da09af1db4c154ffc56a331671c71c07 Mon Sep 17 00:00:00 2001
From: AnonymousRandomPerson <chenghanngan.us@gmail.com>
Date: Sat, 22 Jun 2024 14:17:40 -0500
Subject: [PATCH] Matched overlay 26 JP

---
 asm/overlay_26.s | 50 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/asm/overlay_26.s b/asm/overlay_26.s
index a11cfed3..273056e7 100644
--- a/asm/overlay_26.s
+++ b/asm/overlay_26.s
@@ -558,7 +558,11 @@ _0238A8F0:
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
 _0238A8F8: .word OVERLAY26_UNKNOWN_POINTER__NA_238AF60
+#ifdef JAPAN
+_0238A8FC: .word 0x0000050D
+#else
 _0238A8FC: .word 0x0000026D
+#endif
 _0238A900: .word 0x0001003C
 _0238A904: .word 0x0001003D
 _0238A908: .word 0x0001003F
@@ -990,45 +994,69 @@ OVERLAY26_UNKNOWN_TABLE__NA_238AE20:
 	.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
 	.global ov26_0238AE26
 ov26_0238AE26:
-	.byte 0x03, 0x00, 0x18, 0x32, 0x61, 0x02
+#ifdef JAPAN
+#define OV26_DATA_OFFSET 0x2A0
+#else
+#define OV26_DATA_OFFSET 0
+#endif
+	.byte 0x03, 0x00, 0x18, 0x32
+	.hword 0x261 + OV26_DATA_OFFSET
 	.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
 	.global ov26_0238AE32
 ov26_0238AE32:
-	.byte 0x03, 0x00, 0x18, 0x32, 0x6C, 0x02, 0xFF, 0x00, 0x18, 0x02
+	.byte 0x03, 0x00, 0x18, 0x32
+	.hword 0x26C + OV26_DATA_OFFSET
+	.byte 0xFF, 0x00, 0x18, 0x02
 	.byte 0x00, 0x00
 	.global ov26_0238AE3E
 ov26_0238AE3E:
-	.byte 0x03, 0x00, 0x18, 0x32, 0x6B, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
+	.byte 0x03, 0x00, 0x18, 0x32
+	.hword 0x26B + OV26_DATA_OFFSET
+	.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
 	.global ov26_0238AE4A
 ov26_0238AE4A:
 	.byte 0x03, 0x00
-	.byte 0x18, 0x32, 0x6A, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
+	.byte 0x18, 0x32
+	.hword 0x26A + OV26_DATA_OFFSET
+	.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
 	.global ov26_0238AE56
 ov26_0238AE56:
-	.byte 0x03, 0x00, 0x18, 0x32, 0x68, 0x02
+	.byte 0x03, 0x00, 0x18, 0x32
+	.hword 0x268 + OV26_DATA_OFFSET
 	.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
 	.global ov26_0238AE62
 ov26_0238AE62:
-	.byte 0x03, 0x00, 0x18, 0x32, 0x69, 0x02, 0xFF, 0x00, 0x18, 0x02
+	.byte 0x03, 0x00, 0x18, 0x32
+	.hword 0x269 + OV26_DATA_OFFSET
+	.byte 0xFF, 0x00, 0x18, 0x02
 	.byte 0x00, 0x00
 	.global ov26_0238AE6E
 ov26_0238AE6E:
-	.byte 0x03, 0x00, 0x18, 0x32, 0x65, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
+	.byte 0x03, 0x00, 0x18, 0x32
+	.hword 0x265 + OV26_DATA_OFFSET
+	.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
 	.global ov26_0238AE7A
 ov26_0238AE7A:
 	.byte 0x03, 0x00
-	.byte 0x18, 0x32, 0x64, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
+	.byte 0x18, 0x32
+	.hword 0x264 + OV26_DATA_OFFSET
+	.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
 	.global ov26_0238AE86
 ov26_0238AE86:
-	.byte 0x03, 0x00, 0x18, 0x32, 0x63, 0x02
+	.byte 0x03, 0x00, 0x18, 0x32
+	.hword 0x263 + OV26_DATA_OFFSET
 	.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
 	.global ov26_0238AE92
 ov26_0238AE92:
-	.byte 0x03, 0x00, 0x18, 0x32, 0x62, 0x02, 0xFF, 0x00, 0x18, 0x02
+	.byte 0x03, 0x00, 0x18, 0x32
+	.hword 0x262 + OV26_DATA_OFFSET
+	.byte 0xFF, 0x00, 0x18, 0x02
 	.byte 0x00, 0x00
 	.global ov26_0238AE9E
 ov26_0238AE9E:
-	.byte 0x03, 0x00, 0x18, 0x32, 0x6D, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x00, 0x00
+	.byte 0x03, 0x00, 0x18, 0x32
+	.hword 0x26D + OV26_DATA_OFFSET
+	.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x00, 0x00
 	.global ov26_0238AEAC
 ov26_0238AEAC:
 	.byte 0x55, 0x4E, 0x49, 0x54, 0x20, 0x52, 0x45, 0x54, 0x55, 0x52, 0x4E, 0x20, 0x25, 0x33, 0x64, 0x20