diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-12-21 15:05:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 15:05:05 -0600 |
| commit | 7a1956f51d3bbba5f49f97526b79efafa85792bb (patch) | |
| tree | 42fea349311c47f61dd3d6c0823210368f7feef8 /include | |
| parent | 4fd4208364fcaf71ef0ff35d0c49ce3d9149e98b (diff) | |
| parent | 3a1307e9078214a7757f37f35b807ea54c77bfad (diff) | |
Merge pull request #87 from SethBarberee/personality_test_data_2
Personality test data 2
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/personality_test.h | 5 | ||||
| -rw-r--r-- | include/personality_test.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/constants/personality_test.h b/include/constants/personality_test.h index cfb9c3d..b2c9a92 100644 --- a/include/constants/personality_test.h +++ b/include/constants/personality_test.h @@ -15,11 +15,14 @@ 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 + +#define BRAVE_2B_TRIGGER 99 #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); |