mirror of
https://github.com/pret/pmd-sky.git
synced 2026-08-27 21:25:43 -05:00
merge 238BE4C into 238BDA8
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
1
main.lsf
1
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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
Reference in New Issue
Block a user