enum for gender

3 files changed, 14 insertions, 6 deletions

diff --git a/arm9/modules/59/include/mod59_021D74E0.h b/arm9/modules/59/include/mod59_021D74E0.h
index a33e34fc..112512d8 100644
--- a/arm9/modules/59/include/mod59_021D74E0.h
+++ b/arm9/modules/59/include/mod59_021D74E0.h
@@ -5,11 +5,12 @@
 #include "options.h"
 #include "save_block_2.h"
 #include "main.h"
+#include "player_data.h"
 
 struct MOD59_UnkPlayerStruct
 {
     u8 padding[0x4];
-    u32 gender;
+    GenderEnum gender;
     u8 padding2[0x10];
     struct String *name;
 };
@@ -22,7 +23,8 @@ typedef struct MOD59_OverlayData
     u32 Unk0C;
     u32 Unk10;
     struct UnkStruct_02006234 *Unk14;
-    u8 padding[0x58];
+    struct UnkStruct_02016B94_2 *Unk18;
+    u8 padding[0x54];
     struct MOD59_UnkPlayerStruct *playerStruct;
     struct MOD59_UnkPlayerStruct *rivalStruct;
     u8 padding2[0x10];
diff --git a/arm9/src/player_data.c b/arm9/src/player_data.c
index be2fe7f4..182e99e8 100644
--- a/arm9/src/player_data.c
+++ b/arm9/src/player_data.c
@@ -111,12 +111,12 @@ u16 PlayerProfile_GetTrainerID_VisibleHalf(struct PlayerData * data)
     return (u16)data->playerId;
 }
 
-void PlayerProfile_SetTrainerGender(struct PlayerData * data, u32 gender)
+void PlayerProfile_SetTrainerGender(struct PlayerData * data, GenderEnum gender)
 {
     data->gender = gender;
 }
 
-u32 PlayerProfile_GetTrainerGender(struct PlayerData * data)
+GenderEnum PlayerProfile_GetTrainerGender(struct PlayerData * data)
 {
     return data->gender;
 }
diff --git a/include/player_data.h b/include/player_data.h
index c86db1c1..132eb6ae 100644
--- a/include/player_data.h
+++ b/include/player_data.h
@@ -7,6 +7,12 @@
 
 struct SaveBlock2;
 
+typedef enum
+{
+    Male = 0,
+    Female = 1
+} GenderEnum;
+
 struct PlayerData
 {
     /* 0x00 */ u16 playerName[OT_NAME_LENGTH + 1];
@@ -51,8 +57,8 @@ struct String * PlayerProfile_GetPlayerName_NewString(struct PlayerData * data,
 void PlayerProfile_SetTrainerID(struct PlayerData * data, u32 otid);
 u32 PlayerProfile_GetTrainerID(struct PlayerData * data);
 u16 PlayerProfile_GetTrainerID_VisibleHalf(struct PlayerData * data);
-void PlayerProfile_SetTrainerGender(struct PlayerData * data, u32 gender);
-u32 PlayerProfile_GetTrainerGender(struct PlayerData * data);
+void PlayerProfile_SetTrainerGender(struct PlayerData * data, GenderEnum gender);
+GenderEnum PlayerProfile_GetTrainerGender(struct PlayerData * data);
 BOOL PlayerProfile_TestBadgeFlag(struct PlayerData * data, u32 badgeno);
 void PlayerProfile_SetBadgeFlag(struct PlayerData * data, u32 badgeno);
 u32 PlayerProfile_CountBadges(struct PlayerData * data);