through NamingScreen_CreateRivalIcon

include/event_object_movement.h

@@ -128,6 +128,7 @@ void SetSpritePosToMapCoords(s16 x, s16 y, s16 *x2, s16 *y2);
 void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible);
 u8 ZCoordToPriority(u8 z);
 void SetObjectSubpriorityByZCoord(u8 z, struct Sprite * sprite, u8 offset);
+void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables);
 
 // Exported data declarations
 

include/field_player_avatar.h

@@ -37,5 +37,6 @@ bool8 PartyHasMonWithSurf(void);
 bool8 IsPlayerSurfingNorth(void);
 void player_get_pos_including_state_based_drift(s16 *x, s16 *y);
 void sub_805CBE8(void);
+u8 sub_805C7C8(u8 state, u8 gender);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H

include/graphics.h

@@ -4899,5 +4899,6 @@ extern const u32 gEasyChatModeIcons_Tiles[];
 extern const u32 gUnknown_8E982BC[];
 extern const u32 gUnknown_8E98458[];
 extern const u32 gUnknown_8E98398[];
+extern const u16 gUnknown_8E98004[];
 
 #endif //GUARD_GRAPHICS_H

include/naming_screen.h

@@ -6,8 +6,8 @@
 #define NAMING_SCREEN_PLAYER        0
 #define NAMING_SCREEN_BOX           1
 #define NAMING_SCREEN_CAUGHT_MON    2
-#define NAMING_SCREEN_3             3
-#define NAMING_SCREEN_WALDA         4 // Wrong name?
+#define NAMING_SCREEN_NAME_RATER    3
+#define NAMING_SCREEN_RIVAL         4
 
 void DoNamingScreen(u8 templateNum, u8 *destBuffer, u16 monSpecies, u16 monGender, u32 monPersonality, MainCallback returnCallback);