From 6329817b62f5e23cfea951d3dbefadb9521171d7 Mon Sep 17 00:00:00 2001
From: Chesyon <55322011+Chesyon@users.noreply.github.com>
Date: Fri, 10 Jul 2026 23:25:29 +0300
Subject: [PATCH] merge 238BE4C into 238BDA8

---
 include/overlay_13_0238BDA8.h | 1 +
 include/overlay_13_0238BE4C.h | 7 -------
 main.lsf                      | 1 -
 src/overlay_13_0238BDA8.c     | 5 +++++
 src/overlay_13_0238BE4C.c     | 9 ---------
 5 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 include/overlay_13_0238BE4C.h
 delete mode 100644 src/overlay_13_0238BE4C.c

diff --git a/include/overlay_13_0238BDA8.h b/include/overlay_13_0238BDA8.h
index 6f5d3faa..7881032e 100644
--- a/include/overlay_13_0238BDA8.h
+++ b/include/overlay_13_0238BDA8.h
@@ -121,5 +121,6 @@ struct personality_test
 // return: Personality (0-15)
 s32 GetPersonality(void);
 char* GetPartnerOptionString(char* output, s32 option_id);
+void WaitForNextStep(enum personality_test_state state);
 
 #endif //PMDSKY_OVERLAY_13_0238BDA8_H
diff --git a/include/overlay_13_0238BE4C.h b/include/overlay_13_0238BE4C.h
deleted file mode 100644
index e887b2a3..00000000
--- a/include/overlay_13_0238BE4C.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef PMDSKY_OVERLAY_13_0238BE4C_H
-#define PMDSKY_OVERLAY_13_0238BE4C_H
-
-// state: switch_case
-void WaitForNextStep(enum personality_test_state state);
-
-#endif //PMDSKY_OVERLAY_13_0238BE4C_H
diff --git a/main.lsf b/main.lsf
index 167510e0..86109c51 100644
--- a/main.lsf
+++ b/main.lsf
@@ -438,7 +438,6 @@ Overlay OVY_13
 	Object src/overlay_13_EntryOverlay13.o
 	Object asm/overlay_13.o
 	Object src/overlay_13_0238BDA8.o
-	Object src/overlay_13_0238BE4C.o
 	Object asm/overlay_13_0238BE6C.o
 }
 Overlay OVY_14
diff --git a/src/overlay_13_0238BDA8.c b/src/overlay_13_0238BDA8.c
index ca37fe77..fd24d444 100644
--- a/src/overlay_13_0238BDA8.c
+++ b/src/overlay_13_0238BDA8.c
@@ -31,3 +31,8 @@ char* GetPartnerOptionString(char* output, s32 option_id)
     PreprocessString(output, 0x400, (char*)&ov13_0238CE70, 0xC402, &args);
     return output;
 }
+
+void WaitForNextStep(enum personality_test_state state) {
+    PERSONALITY_TEST_PTR->state = QUIZ_WAIT_NEXT_STEP;
+    PERSONALITY_TEST_PTR->future_state = state;
+}
diff --git a/src/overlay_13_0238BE4C.c b/src/overlay_13_0238BE4C.c
deleted file mode 100644
index 28dff49f..00000000
--- a/src/overlay_13_0238BE4C.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "overlay_13_0238BDA8.h"
-#include "overlay_13_0238BE4C.h"
-
-extern struct personality_test *PERSONALITY_TEST_PTR;
-
-void WaitForNextStep(enum personality_test_state state) {
-    PERSONALITY_TEST_PTR->state = QUIZ_WAIT_NEXT_STEP;
-    PERSONALITY_TEST_PTR->future_state = state;
-}