diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc
index 9e3729e8..3fb087d0 100644
--- a/asm/include/overlay_11.inc
+++ b/asm/include/overlay_11.inc
@@ -247,8 +247,6 @@
 .public ov11_022E03F0
 .public ov11_022E0434
 .public ov11_0230DB58
-.public ov13_0238A468
-.public ov13_0238ADFC
 .public ov14_0238B708
 .public ov15_0238AE88
 .public ov15_0238AE98
@@ -312,6 +310,7 @@
 .public ov27_0238BB54
 .public ov27_0238BB80
 .public ov28_0238A140
+.public ov28_0238A468
 .public OverlayIsLoaded
 .public PlayBgmByIdVeneer
 .public PlayBgmByIdVolumeVeneer
@@ -334,6 +333,7 @@
 .public SaveScriptVariableValueAtIndex
 .public SaveScriptVariableValueBytes
 .public SentryRunState
+.public SentryUpdateDisplay
 .public SetActorTalkMain
 .public SetActorTalkMainAndActorTalkSub
 .public SetActorTalkSub
diff --git a/asm/include/overlay_13.inc b/asm/include/overlay_13.inc
index f249bab6..6ca3960e 100644
--- a/asm/include/overlay_13.inc
+++ b/asm/include/overlay_13.inc
@@ -60,6 +60,7 @@
 .public sub_02017C74
 .public sub_02017CB4
 .public sub_0201F2E4
+.public sub_02025304_JP
 .public sub_02027B1C
 .public sub_0202836C
 .public sub_02028770
diff --git a/asm/overlay_11.s b/asm/overlay_11.s
index 73fa887b..cf855b49 100644
--- a/asm/overlay_11.s
+++ b/asm/overlay_11.s
@@ -11988,7 +11988,7 @@ _022E67A4:
 _022E67AC:
 	mov r0, #0
 _022E67B0:
-	bl ov13_0238A468
+	bl ov28_0238A468
 	b _022E68AC
 _022E67B8:
 	mov r0, #0x20
@@ -37812,15 +37812,17 @@ _022FBB20:
 #ifdef JAPAN
 	add r0, sl, #0x18c
 	bl ov11_022F5FE8_JP
+	cmp r0, #0
+	beq _022FBB54
 #else
 	add r0, sl, #0x200
 	ldrsh r1, [r0, #0x1e]
 	cmp r1, #0
 	bge _022FBB54
 	ldrsh r0, [r0, #0x18]
-#endif
 	cmp r0, #0
 	ble _022FBB54
+#endif
 	strb fp, [sl, #0x174]
 	add r0, sl, #0x100
 	ldrsh r1, [r0, #0x80]
@@ -42391,7 +42393,7 @@ _022FF558:
 	strb r0, [r2], #1
 	bne _022FF558
 #ifdef JAPAN
-	ldr r1, _022FF57C ; =ov11_02324D14
+	ldr r0, _022FF57C ; =ov11_02324D14
 	mov r1, #0x1b4
 	strh r1, [r0, #2]
 	mov r0, #1
@@ -43443,7 +43445,7 @@ _02300340:
 	strh r0, [r1, #2]
 	bl DungeonSwapIdxToId
 #ifdef JAPAN
-	ldr r1, _0230057C ; =ov11_02324D1C
+	ldr r2, _0230057C ; =ov11_02324D1C
 	ldr r1, _02300590 ; =0x00000408
 	ldr r2, [r2, #4]
 	str r0, [sp, #0x18]
@@ -45028,7 +45030,11 @@ _0230180C:
 	add r0, r1, #0x6e
 	add r0, r0, #0x100
 	add r1, r1, #0x5a
+#ifdef JAPAN
+	bl sub_02025304_JP
+#else
 	bl StrcpyName
+#endif
 	ldr r0, _02301A10 ; =ov11_02324D48
 	mov r2, #0
 	ldr r0, [r0]
@@ -45069,7 +45075,11 @@ _0230187C:
 	add r0, r1, #0x6e
 	add r0, r0, #0x100
 	add r1, r1, #0x5a
+#ifdef JAPAN
+	bl sub_02025304_JP
+#else
 	bl StrcpyName
+#endif
 	ldr r0, _02301A10 ; =ov11_02324D48
 	mov r2, #0
 	ldr r0, [r0]
@@ -45428,7 +45438,11 @@ _02301D88:
 	add r0, r1, #0x6e
 	add r0, r0, #0x100
 	add r1, r1, #0x5a
+#ifdef JAPAN
+	bl sub_02025304_JP
+#else
 	bl StrcpyName
+#endif
 	ldr r0, _02301F8C ; =ov11_02324D48
 	mov r2, #0
 	ldr r0, [r0]
@@ -45469,7 +45483,11 @@ _02301DF8:
 	add r0, r1, #0x6e
 	add r0, r0, #0x100
 	add r1, r1, #0x5a
+#ifdef JAPAN
+	bl sub_02025304_JP
+#else
 	bl StrcpyName
+#endif
 	ldr r0, _02301F8C ; =ov11_02324D48
 	mov r2, #0
 	ldr r0, [r0]
@@ -45766,7 +45784,11 @@ _0230221C:
 	add r0, r1, #0x6e
 	add r0, r0, #0x100
 	add r1, r1, #0x5a
+#ifdef JAPAN
+	bl sub_02025304_JP
+#else
 	bl StrcpyName
+#endif
 	ldr r0, _023025E4 ; =ov11_02324D48
 	mov r2, #0
 	ldr r0, [r0]
@@ -48051,7 +48073,11 @@ _02303FD0:
 	bl GetNameRaw
 	add r0, sp, #0x94
 	mov r1, r0
+#ifdef JAPAN
+	bl sub_02025304_JP
+#else
 	bl StrcpyName
+#endif
 	mov r3, #0
 	ldr r0, _02304298 ; =ov11_02324D58
 	str r3, [sp]
@@ -49642,11 +49668,13 @@ _02305460: .word ov11_02322BA8
 _02305464: .word 0x00001013
 #ifdef JAPAN
 _02305468: .word 0x00001D3C
+_0230546C: .word 0x00002FB3
+_02305470: .word 0x00002FCA
 #else
 _02305468: .word 0x000008E4
+_0230546C: .word 0x000002DF
+_02305470: .word 0x000002D6
 #endif
-_0230546C: .word 0x000002DF + OV11_02304DC8_OFFSET
-_02305470: .word 0x000002D6 + OV11_02304DC8_OFFSET
 _02305474: .word 0x000002DE + OV11_02304DC8_OFFSET
 _02305478: .word ov11_02322BB8
 _0230547C: .word ov11_02322BE0
@@ -50139,11 +50167,13 @@ _02305B18: .word ov11_02322BA8
 _02305B1C: .word 0x00001013
 #ifdef JAPAN
 _02305B20: .word 0x00001D3C
+_02305B24: .word 0x00002FB3
+_02305B28: .word 0x00002FCA
 #else
 _02305B20: .word 0x000008E4
+_02305B24: .word 0x000002DF
+_02305B28: .word 0x000002D6
 #endif
-_02305B24: .word 0x000002DF + OV11_02305488_OFFSET
-_02305B28: .word 0x000002D6 + OV11_02305488_OFFSET
 _02305B2C: .word 0x000002DE + OV11_02305488_OFFSET
 _02305B30: .word ov11_02322BB8
 _02305B34: .word ov11_02322BE0
@@ -50949,7 +50979,7 @@ _02306538:
 	str r3, [ip, #0x30 + OV11_023062BC_OFFSET]
 	ldr r3, [r0]
 	ldrsb r0, [r3, #0x21]
-	add r3, r3, #0x30
+	add r3, r3, #0x30 + OV11_023062BC_OFFSET
 	bl ShowStringIdInDialogueBox
 	ldr r0, _02306768 ; =ov11_02324D88
 	ldr r0, [r0]
@@ -51402,7 +51432,7 @@ _02306B0C:
 	b _02306C30
 _02306B3C:
 #ifdef JAPAN
-	ldr r0, _02306C38 ; =ov11_02324D88
+	ldr r0, _02306C5C ; =TEAM_MEMBER_TABLE_PTR
 	ldrsh r2, [r2, #0xc]
 	ldr r1, [r0]
 	mov r0, #0x44
@@ -53461,11 +53491,13 @@ _023087A0:
 	ldr r0, _023082B4 ; =ov11_02324D8C
 #ifdef JAPAN
 	ldr r2, _0230A2B0_JP ; =0x0000248F
+	ldr r0, [r0]
+	mov r1, #0x18
 #else
 	mov r1, #0x18
-#endif
 	ldr r0, [r0]
 	add r2, r1, #0xf10
+#endif
 	ldrsb r0, [r0, #8]
 	mov r3, #0
 	bl ShowStringIdInDialogueBox
@@ -54137,7 +54169,11 @@ ov11_02309040: ; 0x02309040
 	movne r0, #1
 	ldmia sp!, {r4, pc}
 	.align 2, 0
+#ifdef JAPAN
+_0230907C: .word 0x00000774
+#else
 _0230907C: .word 0x00000794
+#endif
 _02309080: .word ov11_02324D90
 	arm_func_end ov11_02309040
 
@@ -54173,7 +54209,11 @@ ov11_02309084: ; 0x02309084
 #endif
 	ldmia sp!, {r4, pc}
 	.align 2, 0
+#ifdef JAPAN
+_023090D4: .word 0x00000774
+#else
 _023090D4: .word 0x00000794
+#endif
 _023090D8: .word ov11_02324D90
 	arm_func_end ov11_02309084
 
@@ -65583,7 +65623,11 @@ ov11_02312398: ; 0x02312398
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _02312414: .word ov11_02324E18
+#ifdef JAPAN
+_02312418: .word ov11_02323BD8
+#else
 _02312418: .word ov11_02323BE0
+#endif
 	arm_func_end ov11_02312398
 
 	arm_func_start ov11_0231241C
@@ -65818,7 +65862,11 @@ _0231271C: .word EVENTS
 _02312720: .word ov11_02323C54
 _02312724: .word ov11_02323BD0
 _02312728: .word ov11_02323CAC
+#ifdef JAPAN
+_0231272C: .word ov11_02323BE0
+#else
 _0231272C: .word ov11_02323BD0
+#endif
 	arm_func_end ov11_02312540
 
 	arm_func_start ov11_02312730
@@ -66853,7 +66901,7 @@ _02313518:
 	beq _023135DC
 	b _02313784
 _02313534:
-	bl ov13_0238ADFC
+	bl SentryUpdateDisplay
 	b _02313784
 _0231353C:
 	bl ov11_0231474C
diff --git a/asm/overlay_13.s b/asm/overlay_13.s
index 0daa39b0..1f81ae8d 100644
--- a/asm/overlay_13.s
+++ b/asm/overlay_13.s
@@ -230,10 +230,6 @@ _0238A45C:
 	bl ov11_022E6EC8
 	cmp r0, #0
 	beq _0238A568
-	arm_func_end Overlay13SwitchFunctionNa238A1C8
-
-	arm_func_start ov13_0238A468
-ov13_0238A468: ; 0x0238A468
 	mov r0, #2
 	bl ov11_022E6E8C
 	ldr r0, _0238A570 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
@@ -309,7 +305,7 @@ _0238A568:
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0238A570: .word OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
-	arm_func_end ov13_0238A468
+	arm_func_end Overlay13SwitchFunctionNa238A1C8
 
 	arm_func_start Overlay13SwitchFunctionNa238A574
 Overlay13SwitchFunctionNa238A574: ; 0x0238A574
@@ -447,9 +443,15 @@ _0238A73C:
 	ldmia r1, {r1, r2}
 	bl sub_02028770
 	ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
+#ifdef JAPAN
+	ldr r2, _0238CA60 ; =0x000031C4
+	ldr r0, [r0]
+	mov r1, #8
+#else
 	mov r1, #8
 	ldr r0, [r0]
 	add r2, r1, #0x6c0
+#endif
 	ldrsb r0, [r0, #2]
 	mov r3, #0
 	bl ShowStringIdInDialogueBox
@@ -890,10 +892,6 @@ _0238ADD4:
 	b _0238BD74
 _0238ADF8:
 	ldrsb r0, [r0, #2]
-	arm_func_end Overlay13SwitchFunctionNa238A574
-
-	arm_func_start ov13_0238ADFC
-ov13_0238ADFC: ; 0x0238ADFC
 	bl sub_0202F2C4
 	mov r0, #0xb4
 	bl sub_02017B7C
@@ -1041,9 +1039,15 @@ _0238AFF8:
 	ldrsb r0, [r0, #2]
 	bl ShowDialogueBox
 	ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
+#ifdef JAPAN
+	mov r1, #8
+	ldr r0, [r0]
+	add r2, r1, #0x30c0
+#else
 	ldr r2, _0238B538 ; =0x000005CC
 	ldr r0, [r0]
 	mov r1, #8
+#endif
 	ldrsb r0, [r0, #2]
 	mov r3, #0
 	bl ShowStringIdInDialogueBox
@@ -1123,9 +1127,15 @@ _0238B13C:
 	ldrsb r0, [r0, #4]
 	bl ShowDialogueBox
 	ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
+#ifdef JAPAN
+	ldr r2, _0238CAB0 ; =0x000031AC
+	ldr r0, [r0]
+	mov r1, #8
+#else
 	mov r1, #8
 	ldr r0, [r0]
 	mov r2, #0x6b0
+#endif
 	ldrsb r0, [r0, #4]
 	mov r3, #0
 	bl ShowStringIdInDialogueBox
@@ -1161,8 +1171,13 @@ _0238B1B4:
 	add r0, r4, #0x400
 	ldrh r2, [r0, #0x26]
 	ldrsb r0, [r4, #4]
+#ifdef JAPAN
+	add r2, r2, #0xae
+	add r2, r2, #0x3100
+#else
 	add r2, r2, #0xb2
 	add r2, r2, #0x600
+#endif
 	mov r2, r2, lsl #0x10
 	mov r2, r2, lsr #0x10
 	bl ShowStringIdInDialogueBox
@@ -1193,13 +1208,21 @@ _0238B230:
 	add r1, sp, #0x70
 	ldr r0, [r0]
 	add r0, r0, #0x3e4
+#ifdef JAPAN
+	bl sub_02025304_JP
+#else
 	bl StrcpyName
+#endif
 	ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
 	add r1, sp, #0x70
 	ldr r0, [r0]
 	add r0, r0, #4
 	add r0, r0, #0x400
+#ifdef JAPAN
+	bl sub_02025304_JP
+#else
 	bl StrcpyName
+#endif
 	ldr r1, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
 	mov r0, #3
 	ldr r3, [r1]
@@ -1373,8 +1396,16 @@ _0238B4C0:
 	str r0, [r1, #0x20]
 	b _0238BD74
 	.align 2, 0
+#ifdef JAPAN
+#define OV13_238A574_OFFSET 0x2AFC
+#else
+#define OV13_238A574_OFFSET 0
+#endif
 _0238B4F8: .word OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
 _0238B4FC: .word QUIZ_WINDOW_PARAMS_4
+#ifdef JAPAN
+_0238CA60: .word 0x000031C4
+#endif
 _0238B500: .word QUIZ_WINDOW_PARAMS_1
 _0238B504: .word QUIZ_WINDOW_PARAMS_3
 _0238B508: .word ov13_0238BE6C
@@ -1389,14 +1420,19 @@ _0238B528: .word QUIZ_ANSWER_POINTS
 _0238B52C: .word STARTERS_STRINGS
 _0238B530: .word STARTERS_HERO_IDS
 _0238B534: .word 0x00002208
+#ifndef JAPAN
 _0238B538: .word 0x000005CC
+#endif
 _0238B53C: .word QUIZ_BORDER_COLOR_TABLE
 _0238B540: .word QUIZ_WINDOW_PARAMS_2
-_0238B544: .word 0x000006AD
-_0238B548: .word 0x000006AE
-_0238B54C: .word 0x000006AF
-_0238B550: .word 0x000006B1
-_0238B554: .word 0x000006C9
+_0238B544: .word 0x000006AD + OV13_238A574_OFFSET
+_0238B548: .word 0x000006AE + OV13_238A574_OFFSET
+_0238B54C: .word 0x000006AF + OV13_238A574_OFFSET
+#ifdef JAPAN
+_0238CAB0: .word 0x000031AC
+#endif
+_0238B550: .word 0x000006B1 + OV13_238A574_OFFSET
+_0238B554: .word 0x000006C9 + OV13_238A574_OFFSET
 _0238B558:
 	ldrh r1, [sp, #0xb0]
 	tst r1, #1
@@ -1516,11 +1552,19 @@ _0238B6E8:
 	ldrsb r0, [r1, #2]
 	bl ShowDialogueBox
 	ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
+#ifdef JAPAN
+	add r3, sp, #0x128
+	ldr r0, [r0]
+	mov r1, #4
+	ldrsb r0, [r0, #2]
+	mov r2, #0x31c0
+#else
 	mov r1, #4
 	ldr r0, [r0]
 	add r3, sp, #0x128
 	ldrsb r0, [r0, #2]
 	add r2, r1, #0x6c0
+#endif
 	bl ShowStringIdInDialogueBox
 	ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
 	mov r1, #0x3b
@@ -1944,9 +1988,9 @@ _0238BD74:
 	add sp, sp, #0x178
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
-_0238BD7C: .word 0x000006C2
-_0238BD80: .word 0x000006C3
-_0238BD84: .word 0x000006C5
+_0238BD7C: .word 0x000006C2 + OV13_238A574_OFFSET
+_0238BD80: .word 0x000006C3 + OV13_238A574_OFFSET
+_0238BD84: .word 0x000006C5 + OV13_238A574_OFFSET
 _0238BD88: .word 0x00300013
 _0238BD8C: .word QUIZ_MENU_ITEMS_1
 _0238BD90: .word STARTERS_TYPE_INCOMPATIBILITY_TABLE
@@ -1955,7 +1999,7 @@ _0238BD98: .word QUIZ_WINDOW_PARAMS_6
 _0238BD9C: .word 0x00001011
 _0238BDA0: .word GetOptionStringFromID
 _0238BDA4: .word PORTRAIT_ATTRIBUTES
-	arm_func_end ov13_0238ADFC
+	arm_func_end Overlay13SwitchFunctionNa238A574
 
 	arm_func_start GetPersonality
 GetPersonality: ; 0x0238BDA8
@@ -2075,6 +2119,15 @@ ov13_0238BE6C: ; 0x0238BE6C
 	mov r2, #0xc
 	add r3, sp, #0x54
 	bl DrawTextInWindow
+#ifdef JAPAN
+	ldr r0, _0238BFFC ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
+	mov ip, r5
+	ldr r5, [r0]
+	ldr r2, _0238D570 ; =0x000031C8
+	ldrb r3, [r5, #0x3c]
+	add r0, sp, #0x54
+	mov r1, #0x400
+#else
 	mov r1, #0x400
 	ldr r0, _0238BFFC ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
 	mov ip, r5
@@ -2082,6 +2135,7 @@ ov13_0238BE6C: ; 0x0238BE6C
 	add r0, sp, #0x54
 	ldrb r3, [r5, #0x3c]
 	add r2, r1, #0x2cc
+#endif
 	str r3, [sp, #0x28]
 	ldrb lr, [r5, #0x3d]
 	ldr r3, _0238C004 ; =0x0000C402
@@ -2125,11 +2179,19 @@ ov13_0238BE6C: ; 0x0238BE6C
 	add sp, sp, #0x400
 	ldmia sp!, {r4, r5, pc}
 	.align 2, 0
+#ifdef JAPAN
+#define OV13_0238BE6C_OFFSET 0x2AFC
+#else
+#define OV13_0238BE6C_OFFSET 0
+#endif
 _0238BFFC: .word OVERLAY13_UNKNOWN_POINTER__NA_238CEA0
-_0238C000: .word 0x000006CA
+_0238C000: .word 0x000006CA + OV13_0238BE6C_OFFSET
 _0238C004: .word 0x0000C402
-_0238C008: .word 0x000006CB
-_0238C00C: .word 0x000006CD
+_0238C008: .word 0x000006CB + OV13_0238BE6C_OFFSET
+#ifdef JAPAN
+_0238D570: .word 0x000031C8
+#endif
+_0238C00C: .word 0x000006CD + OV13_0238BE6C_OFFSET
 	arm_func_end ov13_0238BE6C
 	; 0x0238C010
 
@@ -2166,7 +2228,14 @@ QUIZ_WINDOW_PARAMS_4:
 	.byte 0x00, 0x00, 0x00, 0x00
 	.global QUIZ_MENU_ITEMS_1
 QUIZ_MENU_ITEMS_1:
-	.byte 0xC6, 0x06, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC7, 0x06, 0x00, 0x00
+#ifdef JAPAN
+#define OV13_DATA_OFFSET 0x2AFC
+#else
+#define OV13_DATA_OFFSET 0
+#endif
+	.word 0x6C6 + OV13_DATA_OFFSET
+	.byte 0x01, 0x00, 0x00, 0x00
+	.word 0x6C7 + OV13_DATA_OFFSET
 	.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
 	.global STARTERS_PARTNER_IDS
 STARTERS_PARTNER_IDS:
@@ -2191,48 +2260,48 @@ STARTERS_TYPE_INCOMPATIBILITY_TABLE:
 	.byte 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00
 	.global STARTERS_STRINGS
 STARTERS_STRINGS:
-	.byte 0x7D, 0x06, 0x7E, 0x06
-	.byte 0x7F, 0x06, 0x80, 0x06, 0x81, 0x06, 0x82, 0x06, 0x83, 0x06, 0x84, 0x06, 0x85, 0x06, 0x86, 0x06
-	.byte 0x87, 0x06, 0x88, 0x06, 0x89, 0x06, 0x8A, 0x06, 0x8B, 0x06, 0x8C, 0x06, 0x8D, 0x06, 0x8E, 0x06
-	.byte 0x8F, 0x06, 0x90, 0x06, 0x91, 0x06, 0x92, 0x06, 0x93, 0x06, 0x94, 0x06, 0x95, 0x06, 0x96, 0x06
-	.byte 0x97, 0x06, 0x98, 0x06, 0x99, 0x06, 0x9A, 0x06, 0x9B, 0x06, 0x9C, 0x06, 0x9D, 0x06, 0x9E, 0x06
-	.byte 0x9F, 0x06, 0xA0, 0x06, 0xA1, 0x06, 0xA2, 0x06, 0xA3, 0x06, 0xA4, 0x06, 0xA5, 0x06, 0xA6, 0x06
-	.byte 0xA7, 0x06, 0xA8, 0x06, 0xA9, 0x06, 0xAA, 0x06, 0xAB, 0x06, 0xAC, 0x06
+	.hword 0x67D + OV13_DATA_OFFSET, 0x67E + OV13_DATA_OFFSET
+	.hword 0x67F + OV13_DATA_OFFSET, 0x680 + OV13_DATA_OFFSET, 0x681 + OV13_DATA_OFFSET, 0x682 + OV13_DATA_OFFSET, 0x683 +  + OV13_DATA_OFFSET, 0x684 + OV13_DATA_OFFSET, 0x685 + OV13_DATA_OFFSET, 0x686 + OV13_DATA_OFFSET
+	.hword 0x687 + OV13_DATA_OFFSET, 0x688 + OV13_DATA_OFFSET, 0x689 + OV13_DATA_OFFSET, 0x68A + OV13_DATA_OFFSET, 0x68B +  + OV13_DATA_OFFSET, 0x68C + OV13_DATA_OFFSET, 0x68D + OV13_DATA_OFFSET, 0x68E + OV13_DATA_OFFSET
+	.hword 0x68F + OV13_DATA_OFFSET, 0x690 + OV13_DATA_OFFSET, 0x691 + OV13_DATA_OFFSET, 0x692 + OV13_DATA_OFFSET, 0x693 +  + OV13_DATA_OFFSET, 0x694 + OV13_DATA_OFFSET, 0x695 + OV13_DATA_OFFSET, 0x696 + OV13_DATA_OFFSET
+	.hword 0x697 + OV13_DATA_OFFSET, 0x698 + OV13_DATA_OFFSET, 0x699 + OV13_DATA_OFFSET, 0x69A + OV13_DATA_OFFSET, 0x69B +  + OV13_DATA_OFFSET, 0x69C + OV13_DATA_OFFSET, 0x69D + OV13_DATA_OFFSET, 0x69E + OV13_DATA_OFFSET
+	.hword 0x69F + OV13_DATA_OFFSET, 0x6A0 + OV13_DATA_OFFSET, 0x6A1 + OV13_DATA_OFFSET, 0x6A2 + OV13_DATA_OFFSET, 0x6A3 +  + OV13_DATA_OFFSET, 0x6A4 + OV13_DATA_OFFSET, 0x6A5 + OV13_DATA_OFFSET, 0x6A6 + OV13_DATA_OFFSET
+	.hword 0x6A7 + OV13_DATA_OFFSET, 0x6A8 + OV13_DATA_OFFSET, 0x6A9 + OV13_DATA_OFFSET, 0x6AA + OV13_DATA_OFFSET, 0x6AB +  + OV13_DATA_OFFSET, 0x6AC + OV13_DATA_OFFSET
 	.global QUIZ_QUESTION_STRINGS
 QUIZ_QUESTION_STRINGS:
-	.byte 0x8B, 0x05, 0x8C, 0x05
-	.byte 0x8D, 0x05, 0x8E, 0x05, 0x8F, 0x05, 0x90, 0x05, 0x91, 0x05, 0x92, 0x05, 0x93, 0x05, 0x94, 0x05
-	.byte 0x95, 0x05, 0x96, 0x05, 0x97, 0x05, 0x98, 0x05, 0x99, 0x05, 0x9A, 0x05, 0x9B, 0x05, 0x9C, 0x05
-	.byte 0x9D, 0x05, 0x9E, 0x05, 0x9F, 0x05, 0xA0, 0x05, 0xA1, 0x05, 0xA2, 0x05, 0xA3, 0x05, 0xA4, 0x05
-	.byte 0xA5, 0x05, 0xA6, 0x05, 0xA7, 0x05, 0xA8, 0x05, 0xA9, 0x05, 0xAA, 0x05, 0xAB, 0x05, 0xAC, 0x05
-	.byte 0xAD, 0x05, 0xAE, 0x05, 0xAF, 0x05, 0xB0, 0x05, 0xB1, 0x05, 0xB2, 0x05, 0xB3, 0x05, 0xB4, 0x05
-	.byte 0xB5, 0x05, 0xB6, 0x05, 0xB7, 0x05, 0xB8, 0x05, 0xB9, 0x05, 0xBA, 0x05, 0xBB, 0x05, 0xBC, 0x05
-	.byte 0xBD, 0x05, 0xBE, 0x05, 0xBF, 0x05, 0xC0, 0x05, 0xC1, 0x05, 0xC2, 0x05, 0xC3, 0x05, 0xC4, 0x05
-	.byte 0xC5, 0x05, 0xC6, 0x05, 0xC7, 0x05, 0xC8, 0x05, 0xC9, 0x05, 0xCA, 0x05, 0xCB, 0x05, 0xCD, 0x05
+	.hword 0x58B + OV13_DATA_OFFSET, 0x58C + OV13_DATA_OFFSET
+	.hword 0x58D + OV13_DATA_OFFSET, 0x58E + OV13_DATA_OFFSET, 0x58F + OV13_DATA_OFFSET, 0x590 + OV13_DATA_OFFSET, 0x591 + OV13_DATA_OFFSET, 0x592 + OV13_DATA_OFFSET, 0x593 + OV13_DATA_OFFSET, 0x594 + OV13_DATA_OFFSET
+	.hword 0x595 + OV13_DATA_OFFSET, 0x596 + OV13_DATA_OFFSET, 0x597 + OV13_DATA_OFFSET, 0x598 + OV13_DATA_OFFSET, 0x599 + OV13_DATA_OFFSET, 0x59A + OV13_DATA_OFFSET, 0x59B + OV13_DATA_OFFSET, 0x59C + OV13_DATA_OFFSET
+	.hword 0x59D + OV13_DATA_OFFSET, 0x59E + OV13_DATA_OFFSET, 0x59F + OV13_DATA_OFFSET, 0x5A0 + OV13_DATA_OFFSET, 0x5A1 + OV13_DATA_OFFSET, 0x5A2 + OV13_DATA_OFFSET, 0x5A3 + OV13_DATA_OFFSET, 0x5A4 + OV13_DATA_OFFSET
+	.hword 0x5A5 + OV13_DATA_OFFSET, 0x5A6 + OV13_DATA_OFFSET, 0x5A7 + OV13_DATA_OFFSET, 0x5A8 + OV13_DATA_OFFSET, 0x5A9 + OV13_DATA_OFFSET, 0x5AA + OV13_DATA_OFFSET, 0x5AB + OV13_DATA_OFFSET, 0x5AC + OV13_DATA_OFFSET
+	.hword 0x5AD + OV13_DATA_OFFSET, 0x5AE + OV13_DATA_OFFSET, 0x5AF + OV13_DATA_OFFSET, 0x5B0 + OV13_DATA_OFFSET, 0x5B1 + OV13_DATA_OFFSET, 0x5B2 + OV13_DATA_OFFSET, 0x5B3 + OV13_DATA_OFFSET, 0x5B4 + OV13_DATA_OFFSET
+	.hword 0x5B5 + OV13_DATA_OFFSET, 0x5B6 + OV13_DATA_OFFSET, 0x5B7 + OV13_DATA_OFFSET, 0x5B8 + OV13_DATA_OFFSET, 0x5B9 + OV13_DATA_OFFSET, 0x5BA + OV13_DATA_OFFSET, 0x5BB + OV13_DATA_OFFSET, 0x5BC + OV13_DATA_OFFSET
+	.hword 0x5BD + OV13_DATA_OFFSET, 0x5BE + OV13_DATA_OFFSET, 0x5BF + OV13_DATA_OFFSET, 0x5C0 + OV13_DATA_OFFSET, 0x5C1 + OV13_DATA_OFFSET, 0x5C2 + OV13_DATA_OFFSET, 0x5C3 + OV13_DATA_OFFSET, 0x5C4 + OV13_DATA_OFFSET
+	.hword 0x5C5 + OV13_DATA_OFFSET, 0x5C6 + OV13_DATA_OFFSET, 0x5C7 + OV13_DATA_OFFSET, 0x5C8 + OV13_DATA_OFFSET, 0x5C9 + OV13_DATA_OFFSET, 0x5CA + OV13_DATA_OFFSET, 0x5CB + OV13_DATA_OFFSET, 0x5CD + OV13_DATA_OFFSET
 	.global QUIZ_ANSWER_STRINGS
 QUIZ_ANSWER_STRINGS:
-	.byte 0xCE, 0x05, 0xCF, 0x05, 0xD0, 0x05, 0xD1, 0x05, 0xD2, 0x05, 0xD3, 0x05, 0xD4, 0x05, 0xD5, 0x05
-	.byte 0xD6, 0x05, 0xD7, 0x05, 0xD8, 0x05, 0xD9, 0x05, 0xDA, 0x05, 0xDB, 0x05, 0xDC, 0x05, 0xDD, 0x05
-	.byte 0xDE, 0x05, 0xDF, 0x05, 0xE0, 0x05, 0xE1, 0x05, 0xE2, 0x05, 0xE3, 0x05, 0xE4, 0x05, 0xE5, 0x05
-	.byte 0xE6, 0x05, 0xE7, 0x05, 0xE8, 0x05, 0xE9, 0x05, 0xEA, 0x05, 0xEB, 0x05, 0xEC, 0x05, 0xED, 0x05
-	.byte 0xEE, 0x05, 0xEF, 0x05, 0xF0, 0x05, 0xF1, 0x05, 0xF2, 0x05, 0xF3, 0x05, 0xF4, 0x05, 0xF5, 0x05
-	.byte 0xF6, 0x05, 0xF7, 0x05, 0xF8, 0x05, 0xF9, 0x05, 0xFA, 0x05, 0xFB, 0x05, 0xFC, 0x05, 0xFD, 0x05
-	.byte 0xFE, 0x05, 0xFF, 0x05, 0x00, 0x06, 0x01, 0x06, 0x02, 0x06, 0x03, 0x06, 0x04, 0x06, 0x05, 0x06
-	.byte 0x06, 0x06, 0x07, 0x06, 0x08, 0x06, 0x09, 0x06, 0x0A, 0x06, 0x0B, 0x06, 0x0C, 0x06, 0x0D, 0x06
-	.byte 0x0E, 0x06, 0x0F, 0x06, 0x10, 0x06, 0x11, 0x06, 0x12, 0x06, 0x13, 0x06, 0x14, 0x06, 0x15, 0x06
-	.byte 0x16, 0x06, 0x17, 0x06, 0x18, 0x06, 0x19, 0x06, 0x1A, 0x06, 0x1B, 0x06, 0x1C, 0x06, 0x1D, 0x06
-	.byte 0x1E, 0x06, 0x1F, 0x06, 0x20, 0x06, 0x21, 0x06, 0x22, 0x06, 0x23, 0x06, 0x24, 0x06, 0x25, 0x06
-	.byte 0x26, 0x06, 0x27, 0x06, 0x28, 0x06, 0x29, 0x06, 0x2A, 0x06, 0x2B, 0x06, 0x2C, 0x06, 0x2D, 0x06
-	.byte 0x2E, 0x06, 0x2F, 0x06, 0x30, 0x06, 0x31, 0x06, 0x32, 0x06, 0x33, 0x06, 0x34, 0x06, 0x35, 0x06
-	.byte 0x36, 0x06, 0x37, 0x06, 0x38, 0x06, 0x39, 0x06, 0x3A, 0x06, 0x3B, 0x06, 0x3C, 0x06, 0x3D, 0x06
-	.byte 0x3E, 0x06, 0x3F, 0x06, 0x40, 0x06, 0x41, 0x06, 0x42, 0x06, 0x43, 0x06, 0x44, 0x06, 0x45, 0x06
-	.byte 0x46, 0x06, 0x47, 0x06, 0x48, 0x06, 0x49, 0x06, 0x4A, 0x06, 0x4B, 0x06, 0x4C, 0x06, 0x4D, 0x06
-	.byte 0x4E, 0x06, 0x4F, 0x06, 0x50, 0x06, 0x51, 0x06, 0x52, 0x06, 0x53, 0x06, 0x54, 0x06, 0x55, 0x06
-	.byte 0x56, 0x06, 0x57, 0x06, 0x58, 0x06, 0x59, 0x06, 0x5A, 0x06, 0x5B, 0x06, 0x5C, 0x06, 0x5D, 0x06
-	.byte 0x5E, 0x06, 0x5F, 0x06, 0x60, 0x06, 0x61, 0x06, 0x62, 0x06, 0x63, 0x06, 0x64, 0x06, 0x65, 0x06
-	.byte 0x66, 0x06, 0x67, 0x06, 0x68, 0x06, 0x69, 0x06, 0x6A, 0x06, 0x6B, 0x06, 0x6C, 0x06, 0x6D, 0x06
-	.byte 0x6E, 0x06, 0x6F, 0x06, 0x70, 0x06, 0x71, 0x06, 0x72, 0x06, 0x73, 0x06, 0x74, 0x06, 0x75, 0x06
-	.byte 0x76, 0x06, 0x77, 0x06, 0x78, 0x06, 0x79, 0x06, 0x7A, 0x06, 0x7B, 0x06, 0x7C, 0x06, 0x00, 0x00
+	.hword 0x5CE + OV13_DATA_OFFSET, 0x5CF + OV13_DATA_OFFSET, 0x5D0 + OV13_DATA_OFFSET, 0x5D1 + OV13_DATA_OFFSET, 0x5D2 + OV13_DATA_OFFSET, 0x5D3 + OV13_DATA_OFFSET, 0x5D4 + OV13_DATA_OFFSET, 0x5D5 + OV13_DATA_OFFSET
+	.hword 0x5D6 + OV13_DATA_OFFSET, 0x5D7 + OV13_DATA_OFFSET, 0x5D8 + OV13_DATA_OFFSET, 0x5D9 + OV13_DATA_OFFSET, 0x5DA + OV13_DATA_OFFSET, 0x5DB + OV13_DATA_OFFSET, 0x5DC + OV13_DATA_OFFSET, 0x5DD + OV13_DATA_OFFSET
+	.hword 0x5DE + OV13_DATA_OFFSET, 0x5DF + OV13_DATA_OFFSET, 0x5E0 + OV13_DATA_OFFSET, 0x5E1 + OV13_DATA_OFFSET, 0x5E2 + OV13_DATA_OFFSET, 0x5E3 + OV13_DATA_OFFSET, 0x5E4 + OV13_DATA_OFFSET, 0x5E5 + OV13_DATA_OFFSET
+	.hword 0x5E6 + OV13_DATA_OFFSET, 0x5E7 + OV13_DATA_OFFSET, 0x5E8 + OV13_DATA_OFFSET, 0x5E9 + OV13_DATA_OFFSET, 0x5EA + OV13_DATA_OFFSET, 0x5EB + OV13_DATA_OFFSET, 0x5EC + OV13_DATA_OFFSET, 0x5ED + OV13_DATA_OFFSET
+	.hword 0x5EE + OV13_DATA_OFFSET, 0x5EF + OV13_DATA_OFFSET, 0x5F0 + OV13_DATA_OFFSET, 0x5F1 + OV13_DATA_OFFSET, 0x5F2 + OV13_DATA_OFFSET, 0x5F3 + OV13_DATA_OFFSET, 0x5F4 + OV13_DATA_OFFSET, 0x5F5 + OV13_DATA_OFFSET
+	.hword 0x5F6 + OV13_DATA_OFFSET, 0x5F7 + OV13_DATA_OFFSET, 0x5F8 + OV13_DATA_OFFSET, 0x5F9 + OV13_DATA_OFFSET, 0x5FA + OV13_DATA_OFFSET, 0x5FB + OV13_DATA_OFFSET, 0x5FC + OV13_DATA_OFFSET, 0x5FD + OV13_DATA_OFFSET
+	.hword 0x5FE + OV13_DATA_OFFSET, 0x5FF + OV13_DATA_OFFSET, 0x600 + OV13_DATA_OFFSET, 0x601 + OV13_DATA_OFFSET, 0x602 + OV13_DATA_OFFSET, 0x603 + OV13_DATA_OFFSET, 0x604 + OV13_DATA_OFFSET, 0x605 + OV13_DATA_OFFSET
+	.hword 0x606 + OV13_DATA_OFFSET, 0x607 + OV13_DATA_OFFSET, 0x608 + OV13_DATA_OFFSET, 0x609 + OV13_DATA_OFFSET, 0x60A + OV13_DATA_OFFSET, 0x60B + OV13_DATA_OFFSET, 0x60C + OV13_DATA_OFFSET, 0x60D + OV13_DATA_OFFSET
+	.hword 0x60E + OV13_DATA_OFFSET, 0x60F + OV13_DATA_OFFSET, 0x610 + OV13_DATA_OFFSET, 0x611 + OV13_DATA_OFFSET, 0x612 + OV13_DATA_OFFSET, 0x613 + OV13_DATA_OFFSET, 0x614 + OV13_DATA_OFFSET, 0x615 + OV13_DATA_OFFSET
+	.hword 0x616 + OV13_DATA_OFFSET, 0x617 + OV13_DATA_OFFSET, 0x618 + OV13_DATA_OFFSET, 0x619 + OV13_DATA_OFFSET, 0x61A + OV13_DATA_OFFSET, 0x61B + OV13_DATA_OFFSET, 0x61C + OV13_DATA_OFFSET, 0x61D + OV13_DATA_OFFSET
+	.hword 0x61E + OV13_DATA_OFFSET, 0x61F + OV13_DATA_OFFSET, 0x620 + OV13_DATA_OFFSET, 0x621 + OV13_DATA_OFFSET, 0x622 + OV13_DATA_OFFSET, 0x623 + OV13_DATA_OFFSET, 0x624 + OV13_DATA_OFFSET, 0x625 + OV13_DATA_OFFSET
+	.hword 0x626 + OV13_DATA_OFFSET, 0x627 + OV13_DATA_OFFSET, 0x628 + OV13_DATA_OFFSET, 0x629 + OV13_DATA_OFFSET, 0x62A + OV13_DATA_OFFSET, 0x62B + OV13_DATA_OFFSET, 0x62C + OV13_DATA_OFFSET, 0x62D + OV13_DATA_OFFSET
+	.hword 0x62E + OV13_DATA_OFFSET, 0x62F + OV13_DATA_OFFSET, 0x630 + OV13_DATA_OFFSET, 0x631 + OV13_DATA_OFFSET, 0x632 + OV13_DATA_OFFSET, 0x633 + OV13_DATA_OFFSET, 0x634 + OV13_DATA_OFFSET, 0x635 + OV13_DATA_OFFSET
+	.hword 0x636 + OV13_DATA_OFFSET, 0x637 + OV13_DATA_OFFSET, 0x638 + OV13_DATA_OFFSET, 0x639 + OV13_DATA_OFFSET, 0x63A + OV13_DATA_OFFSET, 0x63B + OV13_DATA_OFFSET, 0x63C + OV13_DATA_OFFSET, 0x63D + OV13_DATA_OFFSET
+	.hword 0x63E + OV13_DATA_OFFSET, 0x63F + OV13_DATA_OFFSET, 0x640 + OV13_DATA_OFFSET, 0x641 + OV13_DATA_OFFSET, 0x642 + OV13_DATA_OFFSET, 0x643 + OV13_DATA_OFFSET, 0x644 + OV13_DATA_OFFSET, 0x645 + OV13_DATA_OFFSET
+	.hword 0x646 + OV13_DATA_OFFSET, 0x647 + OV13_DATA_OFFSET, 0x648 + OV13_DATA_OFFSET, 0x649 + OV13_DATA_OFFSET, 0x64A + OV13_DATA_OFFSET, 0x64B + OV13_DATA_OFFSET, 0x64C + OV13_DATA_OFFSET, 0x64D + OV13_DATA_OFFSET
+	.hword 0x64E + OV13_DATA_OFFSET, 0x64F + OV13_DATA_OFFSET, 0x650 + OV13_DATA_OFFSET, 0x651 + OV13_DATA_OFFSET, 0x652 + OV13_DATA_OFFSET, 0x653 + OV13_DATA_OFFSET, 0x654 + OV13_DATA_OFFSET, 0x655 + OV13_DATA_OFFSET
+	.hword 0x656 + OV13_DATA_OFFSET, 0x657 + OV13_DATA_OFFSET, 0x658 + OV13_DATA_OFFSET, 0x659 + OV13_DATA_OFFSET, 0x65A + OV13_DATA_OFFSET, 0x65B + OV13_DATA_OFFSET, 0x65C + OV13_DATA_OFFSET, 0x65D + OV13_DATA_OFFSET
+	.hword 0x65E + OV13_DATA_OFFSET, 0x65F + OV13_DATA_OFFSET, 0x660 + OV13_DATA_OFFSET, 0x661 + OV13_DATA_OFFSET, 0x662 + OV13_DATA_OFFSET, 0x663 + OV13_DATA_OFFSET, 0x664 + OV13_DATA_OFFSET, 0x665 + OV13_DATA_OFFSET
+	.hword 0x666 + OV13_DATA_OFFSET, 0x667 + OV13_DATA_OFFSET, 0x668 + OV13_DATA_OFFSET, 0x669 + OV13_DATA_OFFSET, 0x66A + OV13_DATA_OFFSET, 0x66B + OV13_DATA_OFFSET, 0x66C + OV13_DATA_OFFSET, 0x66D + OV13_DATA_OFFSET
+	.hword 0x66E + OV13_DATA_OFFSET, 0x66F + OV13_DATA_OFFSET, 0x670 + OV13_DATA_OFFSET, 0x671 + OV13_DATA_OFFSET, 0x672 + OV13_DATA_OFFSET, 0x673 + OV13_DATA_OFFSET, 0x674 + OV13_DATA_OFFSET, 0x675 + OV13_DATA_OFFSET
+	.hword 0x676 + OV13_DATA_OFFSET, 0x677 + OV13_DATA_OFFSET, 0x678 + OV13_DATA_OFFSET, 0x679 + OV13_DATA_OFFSET, 0x67A + OV13_DATA_OFFSET, 0x67B + OV13_DATA_OFFSET, 0x67C + OV13_DATA_OFFSET, 0
 	.global QUIZ_ANSWER_POINTS
 QUIZ_ANSWER_POINTS:
 	.byte 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -2428,11 +2497,27 @@ QUIZ_WINDOW_PARAMS_6:
 	.byte 0x02, 0x02, 0x0B, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.global QUIZ_DEBUG_MENU_ITEMS
 QUIZ_DEBUG_MENU_ITEMS:
-	.byte 0xB9, 0x01, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0xB7, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xB5, 0x01, 0x00, 0x00
-	.byte 0x02, 0x00, 0x00, 0x00, 0xD7, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xB9, 0x01, 0x00, 0x00
-	.byte 0x04, 0x00, 0x00, 0x00, 0xB7, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xB5, 0x01, 0x00, 0x00
-	.byte 0x06, 0x00, 0x00, 0x00, 0xD7, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+#ifdef JAPAN
+#define OV13_DATA_OFFSET_2 0x228
+#else
+#define OV13_DATA_OFFSET_2 0
+#endif
+	.word 0x1B9 + OV13_DATA_OFFSET_2
+	.byte 0x00, 0x00, 0x00, 0x00
+	.word 0x1B7 + OV13_DATA_OFFSET_2
+	.byte 0x01, 0x00, 0x00, 0x00
+	.word 0x1B5 + OV13_DATA_OFFSET_2
+	.byte 0x02, 0x00, 0x00, 0x00
+	.word 0x1D7 + OV13_DATA_OFFSET_2
+	.byte 0x03, 0x00, 0x00, 0x00
+	.word 0x1B9 + OV13_DATA_OFFSET_2
+	.byte 0x04, 0x00, 0x00, 0x00
+	.word 0x1B7 + OV13_DATA_OFFSET_2
+	.byte 0x05, 0x00, 0x00, 0x00
+	.word 0x1B5 + OV13_DATA_OFFSET_2
+	.byte 0x06, 0x00, 0x00, 0x00
+	.word 0x1D7 + OV13_DATA_OFFSET_2
+	.byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.global QUIZ_QUESTION_ANSWER_ASSOCIATIONS
diff --git a/asm/overlay_14.s b/asm/overlay_14.s
index d921027b..e11966bd 100644
--- a/asm/overlay_14.s
+++ b/asm/overlay_14.s
@@ -218,10 +218,6 @@ _0238A3E8:
 	bl InitAnimDataFromOtherAnimDataVeneer
 	ldr r0, [r4]
 	mov r1, r5
-	arm_func_end SentrySetupState
-
-	arm_func_start ov14_0238A468
-ov14_0238A468: ; 0x0238A468
 	add r0, r0, #0x3ec
 	add r0, r0, #0x1800
 	add r0, r0, r8
@@ -268,7 +264,7 @@ _0238A504: .word 0x000038D4
 _0238A508: .word SENTRY_DUTY_PTR
 _0238A50C: .word 0x88080000
 _0238A510: .word 0xC8100000
-	arm_func_end ov14_0238A468
+	arm_func_end SentrySetupState
 
 	arm_func_start ov14_0238A514
 ov14_0238A514: ; 0x0238A514
diff --git a/asm/overlay_15.s b/asm/overlay_15.s
index dba013a4..b772728e 100644
--- a/asm/overlay_15.s
+++ b/asm/overlay_15.s
@@ -920,10 +920,6 @@ ov15_0238ADC4: ; 0x0238ADC4
 	add r0, sp, #4
 	mov r1, #0x100
 	str ip, [sp]
-	arm_func_end ov15_0238ADC4
-
-	arm_func_start ov15_0238ADFC
-ov15_0238ADFC: ; 0x0238ADFC
 	bl PreprocessStringFromId
 	add r3, sp, #4
 	mov r0, r4
@@ -953,7 +949,7 @@ ov15_0238ADFC: ; 0x0238ADFC
 	.align 2, 0
 _0238AE64: .word 0x00000373
 _0238AE68: .word 0x0000C402
-	arm_func_end ov15_0238ADFC
+	arm_func_end ov15_0238ADC4
 
 	arm_func_start ov15_0238AE6C
 ov15_0238AE6C: ; 0x0238AE6C
diff --git a/asm/overlay_17.s b/asm/overlay_17.s
index 48fda735..19af3d01 100644
--- a/asm/overlay_17.s
+++ b/asm/overlay_17.s
@@ -226,10 +226,6 @@ _0238A438:
 	beq _0238A494
 	bl IsSimpleMenuActive
 	cmp r0, #0
-	arm_func_end ov17_0238A364
-
-	arm_func_start ov17_0238A468
-ov17_0238A468: ; 0x0238A468
 	movne r2, #0
 	bne _0238A494
 	ldr r0, _0238A718 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00
@@ -419,7 +415,7 @@ _0238A710:
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0238A718: .word OVERLAY17_UNKNOWN_POINTER__NA_238BE00
-	arm_func_end ov17_0238A468
+	arm_func_end ov17_0238A364
 
 	arm_func_start ov17_0238A71C
 ov17_0238A71C: ; 0x0238A71C
@@ -929,10 +925,6 @@ _0238ADDC:
 	ldrsb r1, [r1, #6]
 	mvn r0, #1
 	cmp r1, r0
-	arm_func_end ov17_0238A754
-
-	arm_func_start ov17_0238ADFC
-ov17_0238ADFC: ; 0x0238ADFC
 	bne _0238AE20
 	mov r1, #0
 	mov r2, r1
@@ -1053,9 +1045,9 @@ _0238AF94:
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
 	.align 2, 0
 #ifdef JAPAN
-#define OV17_0238ADFC_OFFSET 0x38E2
+#define OV17_0238A754_OFFSET 0x38E2
 #else
-#define OV17_0238ADFC_OFFSET 0
+#define OV17_0238A754_OFFSET 0
 #endif
 _0238AF9C: .word OVERLAY17_UNKNOWN_POINTER__NA_238BE00
 _0238AFA0: .word OVERLAY17_FUNCTION_POINTER_TABLE
@@ -1064,21 +1056,21 @@ _0238AFA8: .word ASSEMBLY_WINDOW_PARAMS_4
 #ifndef JAPAN
 _0238AFAC: .word 0x0000041E
 #endif
-_0238AFB0: .word 0x0000041F + OV17_0238ADFC_OFFSET
-_0238AFB4: .word 0x00000425 + OV17_0238ADFC_OFFSET
+_0238AFB0: .word 0x0000041F + OV17_0238A754_OFFSET
+_0238AFB4: .word 0x00000425 + OV17_0238A754_OFFSET
 _0238AFB8: .word 0x00003018
-_0238AFBC: .word 0x00000426 + OV17_0238ADFC_OFFSET
-_0238AFC0: .word 0x00000427 + OV17_0238ADFC_OFFSET
-_0238AFC4: .word 0x00000428 + OV17_0238ADFC_OFFSET
-_0238AFC8: .word 0x00000429 + OV17_0238ADFC_OFFSET
+_0238AFBC: .word 0x00000426 + OV17_0238A754_OFFSET
+_0238AFC0: .word 0x00000427 + OV17_0238A754_OFFSET
+_0238AFC4: .word 0x00000428 + OV17_0238A754_OFFSET
+_0238AFC8: .word 0x00000429 + OV17_0238A754_OFFSET
 #ifdef JAPAN
 _0238C528: .word 0x00003D02
 #endif
-_0238AFCC: .word 0x00000422 + OV17_0238ADFC_OFFSET
-_0238AFD0: .word 0x00000421 + OV17_0238ADFC_OFFSET
-_0238AFD4: .word 0x00000423 + OV17_0238ADFC_OFFSET
-_0238AFD8: .word 0x00000424 + OV17_0238ADFC_OFFSET
-_0238AFDC: .word 0x0000042A + OV17_0238ADFC_OFFSET
+_0238AFCC: .word 0x00000422 + OV17_0238A754_OFFSET
+_0238AFD0: .word 0x00000421 + OV17_0238A754_OFFSET
+_0238AFD4: .word 0x00000423 + OV17_0238A754_OFFSET
+_0238AFD8: .word 0x00000424 + OV17_0238A754_OFFSET
+_0238AFDC: .word 0x0000042A + OV17_0238A754_OFFSET
 _0238AFE0: .word 0x00000186
 _0238AFE4: .word ASSEMBLY_WINDOW_PARAMS_1
 _0238AFE8: .word 0x00300013
@@ -1097,7 +1089,7 @@ _0238B018: .word ASSEMBLY_WINDOW_PARAMS_2
 _0238B01C: .word 0x00000213
 _0238B020: .word ASSEMBLY_WINDOW_PARAMS_5
 _0238B024: .word ASSEMBLY_MAIN_MENU_ITEMS_1
-	arm_func_end ov17_0238ADFC
+	arm_func_end ov17_0238A754
 
 	arm_func_start ov17_0238B028
 ov17_0238B028: ; 0x0238B028
diff --git a/asm/overlay_18.s b/asm/overlay_18.s
index 185d62e3..153668c2 100644
--- a/asm/overlay_18.s
+++ b/asm/overlay_18.s
@@ -226,10 +226,6 @@ ov18_0238A42C: ; 0x0238A42C
 	cmp r0, #0
 	movne r2, #0
 	bne _0238A48C
-	arm_func_end ov18_0238A42C
-
-	arm_func_start ov18_0238A468
-ov18_0238A468: ; 0x0238A468
 	ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620
 	ldr r0, [r0]
 	ldrsb r0, [r0]
@@ -670,7 +666,7 @@ _0238AAB4:
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0238AABC: .word OVERLAY18_UNKNOWN_POINTER__NA_238D620
-	arm_func_end ov18_0238A468
+	arm_func_end ov18_0238A42C
 
 	arm_func_start ov18_0238AAC0
 ov18_0238AAC0: ; 0x0238AAC0
@@ -915,10 +911,6 @@ _0238ADD0:
 _0238ADF4:
 	mla r3, r1, r5, r8
 	ldrb r2, [r3, #0x22]
-	arm_func_end ov18_0238ADA8
-
-	arm_func_start ov18_0238ADFC
-ov18_0238ADFC: ; 0x0238ADFC
 	tst r2, #1
 	beq _0238AE24
 	ldrh r2, [r3, #0x24]
@@ -986,7 +978,7 @@ _0238AEE0:
 	.align 2, 0
 _0238AEE8: .word TEAM_MEMBER_TABLE_PTR
 _0238AEEC: .word 0x00000216
-	arm_func_end ov18_0238ADFC
+	arm_func_end ov18_0238ADA8
 
 	arm_func_start ov18_0238AEF0
 ov18_0238AEF0: ; 0x0238AEF0
diff --git a/asm/overlay_19.s b/asm/overlay_19.s
index 083c0f7f..723e7e86 100644
--- a/asm/overlay_19.s
+++ b/asm/overlay_19.s
@@ -938,10 +938,6 @@ _0238ADE4:
 	bne _0238AE14
 	ldrsh r2, [r8, #0xd8]
 	add r0, r8, #0xda
-	arm_func_end ov19_0238A4A4
-
-	arm_func_start ov19_0238ADFC
-ov19_0238ADFC: ; 0x0238ADFC
 	mov r1, #4
 	mov r3, #1
 	bl sub_020417A8
@@ -2613,7 +2609,7 @@ _0238C59C:
 	add sp, sp, #0x308
 	add sp, sp, #0x800
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
-	arm_func_end ov19_0238ADFC
+	arm_func_end ov19_0238A4A4
 
 	arm_func_start ov19_0238C5A8
 ov19_0238C5A8: ; 0x0238C5A8
diff --git a/asm/overlay_20.s b/asm/overlay_20.s
index 9e5e5554..9a730837 100644
--- a/asm/overlay_20.s
+++ b/asm/overlay_20.s
@@ -939,10 +939,6 @@ _0238ADDC:
 	str r0, [sb, #0xc]
 	bl sub_02046D20
 	bl sub_020037A4
-	arm_func_end ov20_0238A1B0
-
-	arm_func_start ov20_0238ADFC
-ov20_0238ADFC: ; 0x0238ADFC
 	add r0, r0, #0xa
 	str r0, [sb, #0xac]
 	b _0238B05C
@@ -1295,7 +1291,7 @@ _0238B288:
 _0238B28C:
 	add sp, sp, #0xb0
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
-	arm_func_end ov20_0238ADFC
+	arm_func_end ov20_0238A1B0
 
 	arm_func_start ov20_0238B294
 ov20_0238B294: ; 0x0238B294
diff --git a/asm/overlay_21.s b/asm/overlay_21.s
index ed00d5ff..528751fd 100644
--- a/asm/overlay_21.s
+++ b/asm/overlay_21.s
@@ -213,10 +213,6 @@ _0238A44C:
 	mov r2, #0
 	str r4, [sp]
 	bl CreateSimpleMenuFromStringIds
-	arm_func_end ov21_0238A140
-
-	arm_func_start ov21_0238A468
-ov21_0238A468: ; 0x0238A468
 	ldr r1, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40
 	ldr r1, [r1]
 	strb r0, [r1, #0x83]
@@ -862,10 +858,6 @@ _0238ADE4:
 	cmp r0, #0
 	movne r0, #0x19
 	strne r0, [r1, #4]
-	arm_func_end ov21_0238A468
-
-	arm_func_start ov21_0238ADFC
-ov21_0238ADFC: ; 0x0238ADFC
 	moveq r0, #1
 	streq r0, [r1, #4]
 	b _0238B7B8
@@ -1547,7 +1539,7 @@ _0238B7D0: .word 0x000003CB
 _0238B7D4: .word SWAP_SHOP_SUBMENU_ITEMS_1
 _0238B7D8: .word 0x000003B9
 _0238B7DC: .word 0x000003C9
-	arm_func_end ov21_0238ADFC
+	arm_func_end ov21_0238A140
 
 	arm_func_start ov21_0238B7E0
 ov21_0238B7E0: ; 0x0238B7E0
diff --git a/asm/overlay_22.s b/asm/overlay_22.s
index 87ea083a..f82138d3 100644
--- a/asm/overlay_22.s
+++ b/asm/overlay_22.s
@@ -245,10 +245,6 @@ _0238A40C:
 	strb r0, [r1, #0x368]
 _0238A464:
 	ldr r2, [r4, #4]
-	arm_func_end ov22_0238A320
-
-	arm_func_start ov22_0238A468
-ov22_0238A468: ; 0x0238A468
 	add r0, r2, #0xe8
 	add r1, r0, sb
 	add r0, r2, sl, lsl #3
@@ -276,7 +272,7 @@ _0238A488:
 _0238A4C0: .word OVERLAY22_UNKNOWN_POINTER__NA_238EC60
 _0238A4C4: .word ov22_0238E82C
 _0238A4C8: .word ov22_0238E834
-	arm_func_end ov22_0238A468
+	arm_func_end ov22_0238A320
 
 	arm_func_start ov22_0238A4CC
 ov22_0238A4CC: ; 0x0238A4CC
@@ -1020,10 +1016,6 @@ ov22_0238ADD8: ; 0x0238ADD8
 	ldr r0, [r2, #0x10]
 	cmp r0, #0x30
 	addls pc, pc, r0, lsl #2
-	arm_func_end ov22_0238ADD8
-
-	arm_func_start ov22_0238ADFC
-ov22_0238ADFC: ; 0x0238ADFC
 	b _0238C16C
 _0238AE00: ; jump table
 	b _0238AEC4 ; case 0
@@ -2349,7 +2341,7 @@ _0238C174: .word ov22_0238EC00
 _0238C178: .word ov22_0238EC10
 _0238C17C: .word ov22_0238EC24
 _0238C180: .word ov22_0238EC38
-	arm_func_end ov22_0238ADFC
+	arm_func_end ov22_0238ADD8
 
 	arm_func_start ov22_0238C184
 ov22_0238C184: ; 0x0238C184
diff --git a/asm/overlay_24.s b/asm/overlay_24.s
index 941acd95..6a32f60d 100644
--- a/asm/overlay_24.s
+++ b/asm/overlay_24.s
@@ -227,10 +227,6 @@ _0238A43C:
 	b _0238A604
 _0238A464:
 	cmp r0, #1
-	arm_func_end ov24_0238A140
-
-	arm_func_start ov24_0238A468
-ov24_0238A468: ; 0x0238A468
 	bne _0238A604
 	ldr r0, _0238A60C ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600
 	mov r2, #0x21
@@ -349,7 +345,7 @@ _0238A604:
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0238A60C: .word OVERLAY24_UNKNOWN_POINTER__NA_238C600
-	arm_func_end ov24_0238A468
+	arm_func_end ov24_0238A140
 
 	arm_func_start ov24_0238A610
 ov24_0238A610: ; 0x0238A610
@@ -882,10 +878,6 @@ _0238ADB8:
 	ldr r0, [r2]
 	strb r4, [r0, #0x1be]
 	ldr r0, [r2]
-	arm_func_end ov24_0238A610
-
-	arm_func_start ov24_0238ADFC
-ov24_0238ADFC: ; 0x0238ADFC
 	str r3, [r0, #0x1c4]
 	bl sub_0201077C
 	mov r1, r0
@@ -1287,7 +1279,7 @@ _0238B3E8: .word EGG_STAT_BONUSES
 _0238B3EC: .word _020A18E0
 _0238B3F0: .word 0x00000399
 _0238B3F4: .word 0x000003A3
-	arm_func_end ov24_0238ADFC
+	arm_func_end ov24_0238A610
 
 	arm_func_start ov24_0238B3F8
 ov24_0238B3F8: ; 0x0238B3F8
diff --git a/asm/overlay_25.s b/asm/overlay_25.s
index 77a6f7b3..6e4696ce 100644
--- a/asm/overlay_25.s
+++ b/asm/overlay_25.s
@@ -224,10 +224,6 @@ _0238A404:
 	b _0238A674
 _0238A464:
 	add r0, r2, #0x100
-	arm_func_end ov25_0238A140
-
-	arm_func_start ov25_0238A468
-ov25_0238A468: ; 0x0238A468
 	ldrsb r0, [r0, #0x3a]
 	bl GetSimpleMenuResult
 	cmp r0, #1
@@ -382,7 +378,7 @@ _0238A684: .word 0x00001308
 _0238A688: .word 0x00003008
 _0238A68C: .word 0x000003E2
 _0238A690: .word 0x00003018
-	arm_func_end ov25_0238A468
+	arm_func_end ov25_0238A140
 
 	arm_func_start ov25_0238A694
 ov25_0238A694: ; 0x0238A694
@@ -878,10 +874,6 @@ _0238ADC0:
 	add ip, r0, #0x28
 	add r0, r0, #0x78
 	str ip, [sp]
-	arm_func_end ov25_0238A694
-
-	arm_func_start ov25_0238ADFC
-ov25_0238ADFC: ; 0x0238ADFC
 	bl PreprocessString
 	add r0, sp, #0x18
 	bl InitPreprocessorArgs
@@ -1102,7 +1094,7 @@ _0238B124: .word APPRAISAL_WINDOW_PARAMS_7
 _0238B128: .word 0x0000018F
 _0238B12C: .word OVERLAY25_UNKNOWN_STRUCT__NA_238B498
 _0238B130: .word 0x000003E1
-	arm_func_end ov25_0238ADFC
+	arm_func_end ov25_0238A694
 
 	arm_func_start ov25_0238B134
 ov25_0238B134: ; 0x0238B134
diff --git a/asm/overlay_26.s b/asm/overlay_26.s
index b26dbda6..a11cfed3 100644
--- a/asm/overlay_26.s
+++ b/asm/overlay_26.s
@@ -223,10 +223,6 @@ _0238A458:
 _0238A460:
 	ldr r0, _0238A530 ; =OVERLAY26_UNKNOWN_POINTER__NA_238AF60
 	mov r1, #0
-	arm_func_end ov26_0238A140
-
-	arm_func_start ov26_0238A468
-ov26_0238A468: ; 0x0238A468
 	ldr r0, [r0]
 	ldr r0, [r0, #0x90]
 	ldrsh r0, [r0, #0xe]
@@ -297,7 +293,7 @@ _0238A558: .word ov26_0238AE9E
 _0238A55C: .word OVERLAY26_UNKNOWN_TABLE__NA_238AE20
 _0238A560: .word 0x000001E3
 _0238A564: .word ov26_0238AE26
-	arm_func_end ov26_0238A468
+	arm_func_end ov26_0238A140
 
 	arm_func_start ov26_0238A568
 ov26_0238A568: ; 0x0238A568
diff --git a/asm/overlay_27.s b/asm/overlay_27.s
index aeffcb4d..40e24342 100644
--- a/asm/overlay_27.s
+++ b/asm/overlay_27.s
@@ -235,10 +235,6 @@ _0238A448:
 	str r2, [sp]
 	ldr r0, [r0]
 	add r2, r1, #0xb8
-	arm_func_end ov27_0238A3A4
-
-	arm_func_start ov27_0238A468
-ov27_0238A468: ; 0x0238A468
 	add r0, r0, #0x38
 	bl PreprocessStringFromId
 	ldr r0, _0238A8DC ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE80
@@ -557,6 +553,7 @@ _0238A8DC: .word OVERLAY27_UNKNOWN_POINTER__NA_238CE80
 _0238A8E0: .word 0x00000408
 _0238A8E4: .word 0x00000618
 _0238A8E8: .word ov11_02324DB8
+	arm_func_end ov27_0238A3A4
 
 	arm_func_start ov27_0238A8EC
 ov27_0238A8EC: ; 0x0238A8EC
@@ -911,10 +908,6 @@ _0238AD8C:
 	ldrsb r0, [r3, #0x8d]
 	add r3, r3, #0x94
 	bl ShowStringIdInDialogueBox
-	arm_func_end ov27_0238A998
-
-	arm_func_start ov27_0238ADFC
-ov27_0238ADFC: ; 0x0238ADFC
 	b _0238BA74
 _0238AE00:
 	ldr r0, _0238B968 ; =ov27_0238CB64
@@ -1759,7 +1752,7 @@ _0238BA2C:
 _0238BA74:
 	add sp, sp, #0x30c
 	ldmia sp!, {r3, r4, pc}
-	arm_func_end ov27_0238ADFC
+	arm_func_end ov27_0238A998
 
 	arm_func_start ov27_0238BA7C
 ov27_0238BA7C: ; 0x0238BA7C