merge 238BE4C into 238BDA8

This commit is contained in:
Chesyon
2026-07-10 23:25:29 +03:00
parent 5db0d433e0
commit 6329817b62
5 changed files with 6 additions and 17 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

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

View File

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