Matched overlays 29/30 JP

asm/include/overlay_29_0234DDF4.inc

@@ -55,6 +55,7 @@
 .public ov31_02387688
 .public OverlayIsLoaded
 .public RestMenu
+.public StrcpySimple
 .public StrncpySimple
 .public sub_0200B330
 .public sub_0200B3D4

asm/overlay_29_0231EDFC.s

@@ -516,7 +516,7 @@ _0231F53C:
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
 #ifdef JAPAN
-#define OV29_0231EDFC_OFFSET -0xA4
+#define OV29_0231EDFC_OFFSET -0x2BF
 #else
 #define OV29_0231EDFC_OFFSET 0
 #endif

asm/overlay_29_0232145C.s

@@ -890,11 +890,11 @@ _02321FF8:
 	mov r2, #1
 	bl TryInflictFrozenStatus
 _02322030:
-	ldr r0, [r4, #0x18c]
+	ldr r0, [r4, #0x18c + TRY_ACTIVATE_NONDAMAGING_DEFENDER_EXCLUSIVE_ITEM_OFFSET]
 	tst r0, #0x1000
 	beq _0232206C
 	add r0, r4, #0x100
-	ldrsh r1, [r0, #0x90]
+	ldrsh r1, [r0, #0x90 + TRY_ACTIVATE_NONDAMAGING_DEFENDER_EXCLUSIVE_ITEM_OFFSET]
 	mov r0, #0
 	bl ov29_02344B9C
 	ldr r1, _02322284 ; =0x00000E9B
@@ -2939,7 +2939,11 @@ _02323C30: .word DIRECTIONS_XY
 _02323C34: .word ov29_0235171E
 _02323C38: .word ov29_02352A8C
 _02323C3C: .word DUNGEON_PTR
+#ifdef JAPAN
+_02323C40: .word 0x0001A182
+#else
 _02323C40: .word 0x0001A226
+#endif
 _02323C44: .word 0x00000232
 	arm_func_end ov29_0232393C
 

asm/overlay_29_02328030.s

@@ -628,7 +628,6 @@ DoMoveSketch: ; 0x02328794
 #else
 #define DO_MOVE_SKETCH_OFFSET 0
 #endif
-
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	sub sp, sp, #8
 	mov r4, #0
@@ -652,7 +651,7 @@ _023287CC:
 	tst r0, #0xff
 	beq _0232881C
 	ldr r1, [sp, #4]
-	add r0, r5, #0x124
+	add r0, r5, #0x124 + DO_MOVE_SKETCH_OFFSET
 	add r1, r1, r7, lsl #3
 	bl IsSameMove
 	cmp r0, #0
@@ -827,7 +826,7 @@ DoMoveSandstorm: ; 0x023289F8
 	mov r5, r0
 	mov r4, r1
 #ifdef JAPAN
-	add r2, r2, #0xcd00
+	add r2, r2, #0xcc00
 	mov r0, #1
 	mov r1, #0
 	strh r3, [r2, #0x9a]

asm/overlay_29_0232A3FC.s

@@ -1010,7 +1010,7 @@ DoMoveBeatUp: ; 0x0232B024
 	addne r0, r0, #0x294
 	ldreq r0, _0232B110 ; =DUNGEON_PTR
 	ldreq r0, [r0]
-	addeq r0, r0, #0x294
+	addeq r0, r0, #0x284
 #else
 	addne r0, r0, #0x338
 	ldreq r0, _0232B110 ; =DUNGEON_PTR

asm/overlay_29_0232C524.s

@@ -1373,7 +1373,7 @@ _0232D4FC:
 #ifdef JAPAN
 	add r2, r1, #0xcc00
 	mov r1, #0
-	strh r3, [r2, #0x36]
+	strh r3, [r2, #0x96]
 #else
 	add r2, r1, #0xcd00
 	mov r1, #0

asm/overlay_29_0232E864.s

@@ -738,10 +738,10 @@ _0232F270:
 	cmpne r1, r0
 	mov r0, sb
 	mov r1, r4
-	mov r3, #1
 #ifndef JAPAN
-	moveq sl, #0
+	mov r3, #1
 #endif
+	moveq sl, #0
 	bl DefenderAbilityIsActive__02332A0C
 	cmp r0, #0
 	beq _0232F2F0

asm/overlay_29_02333FD0.s

@@ -6,7 +6,7 @@
 	arm_func_start ov29_02333FD0
 ov29_02333FD0: ; 0x02333FD0
 #ifdef JAPAN
-#define OV29_02333FD0_OFFSET -0xA4
+#define OV29_02333FD0_OFFSET -4
 #else
 #define OV29_02333FD0_OFFSET 0
 #endif
@@ -1056,7 +1056,6 @@ ov29_02334DA8: ; 0x02334DA8
 #else
 #define OV29_02334DA8_OFFSET 0
 #endif
-
 	ldr r3, _02334E6C ; =DUNGEON_PTR
 	mov r1, #0
 	ldr r2, [r3]
@@ -1074,8 +1073,8 @@ _02334DDC:
 	ldr r2, [r3]
 	add r2, r2, r1, lsl #1
 #ifdef JAPAN
-	add r2, r2, #0xcd00
-	strh r0, [r2, #0x3a]
+	add r2, r2, #0xcc00
+	strh r0, [r2, #0x96]
 	ldr r2, [r3]
 	add r2, r2, r1, lsl #1
 	add r2, r2, #0xcc00

asm/overlay_29_023350FC.s

@@ -1809,7 +1809,7 @@ IsCurrentTilesetBackground: ; 0x02336204
 	ldr r0, [r0]
 	add r0, r0, #0x4000
 #ifdef JAPAN
-	ldrsh r0, [r0, #0x36]
+	ldrsh r0, [r0, #0x30]
 #else
 	ldrsh r0, [r0, #0xd4]
 #endif

asm/overlay_29_02337CCC.s

@@ -9751,13 +9751,13 @@ _0233FE64:
 	ldr r0, [r8, #0xd14 + GENERATE_KECLEON_SHOP_OFFSET]
 	cmp r0, r4
 	strgt r4, [r8, #0xd14 + GENERATE_KECLEON_SHOP_OFFSET]
-	ldr r0, [r8, #0xd18]
+	ldr r0, [r8, #0xd18 + GENERATE_KECLEON_SHOP_OFFSET]
 	cmp r0, r5
 	strgt r5, [r8, #0xd18 + GENERATE_KECLEON_SHOP_OFFSET]
-	ldr r0, [r8, #0xd1c]
+	ldr r0, [r8, #0xd1c + GENERATE_KECLEON_SHOP_OFFSET]
 	cmp r0, r4
 	strlt r4, [r8, #0xd1c + GENERATE_KECLEON_SHOP_OFFSET]
-	ldr r0, [r8, #0xd20]
+	ldr r0, [r8, #0xd20 + GENERATE_KECLEON_SHOP_OFFSET]
 	cmp r0, r5
 	strlt r5, [r8, #0xd20 + GENERATE_KECLEON_SHOP_OFFSET]
 	add r5, r5, #1
@@ -12739,7 +12739,7 @@ _02342648:
 _02342714:
 	ldr r0, [sp, #0x14]
 	strb ip, [r7, #7]
-	strb ip, [r0, #0x2e0]
+	strb ip, [r0, #0x2e0 + OV29_02342594_OFFSET]
 	add r5, r5, #1
 	add r4, r4, #1
 _02342728:

asm/overlay_29_023456BC.s

@@ -2712,7 +2712,11 @@ _02347824:
 	bl ItemIsActive__02347B50
 	cmp r0, #0
 	bne _0234786C
+#ifdef JAPAN
+	ldr r0, [r6, #0xc]
+#else
 	ldr r0, [r7, #0xc]
+#endif
 	mov r1, #0x54
 	bl ExclusiveItemEffectIsActive__02347B80
 	cmp r0, #0

asm/overlay_29_02347BC8.s

@@ -515,7 +515,11 @@ ExclusiveItemEffectIsActive__023482B0: ; 0x023482B0
 	cmp r0, #0
 	movne r0, #0
 	ldmneia sp!, {r3, pc}
+#ifdef JAPAN
+	add r0, r2, #0x224
+#else
 	add r0, r2, #0x228
+#endif
 	bl ExclusiveItemEffectFlagTest
 	ldmia sp!, {r3, pc}
 	arm_func_end ExclusiveItemEffectIsActive__023482B0
@@ -654,6 +658,11 @@ _0234849C: .word ov29_0237C694
 
 	arm_func_start ov29_023484A0
 ov29_023484A0: ; 0x023484A0
+#ifdef JAPAN
+#define OV29_023484A0_OFFSET -0xA4
+#else
+#define OV29_023484A0_OFFSET 0
+#endif
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	ldr r0, _02348804 ; =DUNGEON_PTR
 	ldr r0, [r0]
@@ -904,13 +913,13 @@ _023487D4:
 	ldrb r2, [r4, #0x776]
 	ldr r0, [r1]
 	add r0, r0, #0x4000
-	strb r2, [r0, #0xda]
+	strb r2, [r0, #0xda + OV29_023484A0_OFFSET]
 	ldr r0, [r1]
 	add r0, r0, #0x4000
-	ldrb r1, [r0, #0xda]
+	ldrb r1, [r0, #0xda + OV29_023484A0_OFFSET]
 	cmp r1, #0x95
 	moveq r1, #0xc6
-	streqh r1, [r0, #0xd4]
+	streqh r1, [r0, #0xd4 + OV29_023484A0_OFFSET]
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
 _02348804: .word DUNGEON_PTR

asm/overlay_29_0234DDF4.s

@@ -1027,12 +1027,13 @@ ov29_0234EBAC: ; 0x0234EBAC
 #ifdef JAPAN
 	add r0, r5, #0x10
 	mov r4, r2
+	bl StrcpySimple
 #else
 	mov r4, r2
 	add r0, r5, #0x10
 	mov r2, #0xa
-#endif
 	bl StrncpySimple
+#endif
 	strb r4, [r5, #0x1a]
 	ldmia sp!, {r3, r4, r5, pc}
 	arm_func_end ov29_0234EBAC