From 3021ae9077992f3682512c50c18d3a14e332813a Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 2 Dec 2021 22:11:56 -0800 Subject: all data moved except questions --- include/constants/personality_test.h | 3 ++- include/personality_test.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/constants/personality_test.h b/include/constants/personality_test.h index cfb9c3d..5582fe4 100644 --- a/include/constants/personality_test.h +++ b/include/constants/personality_test.h @@ -15,11 +15,12 @@ enum NaturePersonalities { RELAXED, LONELY, QUIRKY, - NUM_PERSONALITIES + MISC, }; #define NUM_PARTNERS 10 #define NUM_QUIZ_QUESTIONS 55 #define MAX_ASKED_QUESTIONS 8 +#define NUM_PERSONALITIES MISC #endif diff --git a/include/personality_test.h b/include/personality_test.h index 71d7bf9..0351bd1 100644 --- a/include/personality_test.h +++ b/include/personality_test.h @@ -42,7 +42,6 @@ struct PersonalityStruct_203B400 u32 unkb8; u32 unkbc; }; -EWRAM_DATA struct PersonalityStruct_203B400 *gUnknown_203B400; struct PersonalityStruct_203B404 { @@ -62,7 +61,6 @@ struct PersonalityStruct_203B404 /* 0x54 */ struct UnkTextStruct2 unk54[4]; /* 0xB4 */ u8 unkb4[4]; }; -EWRAM_DATA struct PersonalityStruct_203B404 *gUnknown_203B404; void InitializeTestStats(void); void GenerateNewQuestionOrGender(void); -- cgit v1.2.3 From 2ec7cc5badbbf9081ae8ec4efbd20450edba1ae3 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 19 Dec 2021 13:16:25 -0800 Subject: fix nonmatch and move question references --- include/constants/personality_test.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/constants/personality_test.h b/include/constants/personality_test.h index 5582fe4..b2c9a92 100644 --- a/include/constants/personality_test.h +++ b/include/constants/personality_test.h @@ -23,4 +23,6 @@ enum NaturePersonalities { #define MAX_ASKED_QUESTIONS 8 #define NUM_PERSONALITIES MISC +#define BRAVE_2B_TRIGGER 99 + #endif -- cgit v1.2.3