From f661567c027f74d768451c5af72644d83ab80dc9 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Mon, 21 May 2018 09:56:19 -0700
Subject: Define PLAYER_AVATAR_STATE_ enum, and label things related to it

---
 include/field_player_avatar.h | 13 ++++++++++++-
 include/naming_screen.h       |  6 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 1b25aad24..b62782c8d 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -3,6 +3,17 @@
 
 #include "task.h"
 
+enum {
+    PLAYER_AVATAR_STATE_NORMAL,
+    PLAYER_AVATAR_STATE_MACH_BIKE,
+    PLAYER_AVATAR_STATE_ACRO_BIKE,
+    PLAYER_AVATAR_STATE_SURFING,
+    PLAYER_AVATAR_STATE_UNDERWATER,
+    PLAYER_AVATAR_STATE_FIELD_MOVE,
+    PLAYER_AVATAR_STATE_FISHING,
+    PLAYER_AVATAR_STATE_WATERING,
+};
+
 // sub_80587B4
 void player_step(u8 a, u16 b, u16 c);
 u8 ForcedMovement_None(void);
@@ -69,7 +80,7 @@ u8 GetPlayerAvatarObjectId(void);
 void sub_80597E8(void);
 void sub_80597F4(void);
 u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 a, u8 b);
-u8 GetPlayerAvatarGraphicsIdByStateId(u8 a);
+u8 GetPlayerAvatarGraphicsIdByStateId(u8);
 u8 GetPlayerAvatarGenderByGraphicsId(u8 gfxId);
 bool8 PartyHasMonWithSurf(void);
 bool8 IsPlayerSurfingNorth(void);
diff --git a/include/naming_screen.h b/include/naming_screen.h
index d136417ba..f22f7dc78 100644
--- a/include/naming_screen.h
+++ b/include/naming_screen.h
@@ -48,9 +48,9 @@ struct NamingScreenData
             const struct NamingScreenTemplate *template;
  /*0x38*/ u8 *destBuffer;
  /*0x3C*/ u16 unk3C;  //savedKeyRepeatStartDelay
- /*0x3E*/ u16 unk3E;
- /*0x40*/ u16 unk40;
- /*0x42*/ u32 unk42;
+ /*0x3E*/ u16 speciesOrPlayerGender;
+ /*0x40*/ u16 monGender;
+ /*0x42*/ u32 monPersonality;
  /*0x46*/ MainCallback returnCallback;
 };
 
-- 
cgit v1.2.3