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; -}