Fix typo; use constants in some data/field_player_avatar arrays

8 files changed, 52 insertions, 37 deletions

diff --git a/asm/field_effect.s b/asm/field_effect.s
index e93220c19..64ef0ae18 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -7130,7 +7130,7 @@ sub_8086AB4: @ 8086AB4
 	ldr r0, _08086B28 @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x2
-	bl sub_805C808
+	bl GetPlayerAvatarGraphicsIdByStateId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -7361,7 +7361,7 @@ _08086CA4:
 	beq _08086CC0
 	movs r0, 0x2
 _08086CAE:
-	bl sub_805C808
+	bl GetPlayerAvatarGraphicsIdByStateId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -7370,7 +7370,7 @@ _08086CAE:
 	b _08086CD2
 _08086CC0:
 	movs r0, 0
-	bl sub_805C808
+	bl GetPlayerAvatarGraphicsIdByStateId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -7804,7 +7804,7 @@ sub_8086FFC: @ 8086FFC
 	ldr r0, _08087064 @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x2
-	bl sub_805C808
+	bl GetPlayerAvatarGraphicsIdByStateId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -8463,7 +8463,7 @@ _080874F2:
 	bl sub_80DC44C
 _0808751A:
 	movs r0, 0x2
-	bl sub_805C808
+	bl GetPlayerAvatarGraphicsIdByStateId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -8790,7 +8790,7 @@ fishE: @ 8087780
 	bl sub_80DC44C
 _080877B4:
 	adds r0, r7, 0
-	bl sub_805C808
+	bl GetPlayerAvatarGraphicsIdByStateId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index 09aeeabea..5510caceb 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -2759,8 +2759,8 @@ GetPlayerAvatarGraphicsIdByStateIdAndGender: @ 805C7E0
 _0805C7F4: .4byte gUnknown_835B874
 	thumb_func_end GetPlayerAvatarGraphicsIdByStateIdAndGender
 
-	thumb_func_start sub_805C7F8
-sub_805C7F8: @ 805C7F8
+	thumb_func_start GetHoennLinkPartnerGraphicsIdByGender
+GetHoennLinkPartnerGraphicsIdByGender: @ 805C7F8
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, _0805C804 @ =gUnknown_835B880
@@ -2769,10 +2769,10 @@ sub_805C7F8: @ 805C7F8
 	bx lr
 	.align 2, 0
 _0805C804: .4byte gUnknown_835B880
-	thumb_func_end sub_805C7F8
+	thumb_func_end GetHoennLinkPartnerGraphicsIdByGender
 
-	thumb_func_start sub_805C808
-sub_805C808: @ 805C808
+	thumb_func_start GetPlayerAvatarGraphicsIdByStateId
+GetPlayerAvatarGraphicsIdByStateId: @ 805C808
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2785,7 +2785,7 @@ sub_805C808: @ 805C808
 	bx r1
 	.align 2, 0
 _0805C820: .4byte gPlayerAvatar
-	thumb_func_end sub_805C808
+	thumb_func_end GetPlayerAvatarGraphicsIdByStateId
 
 	thumb_func_start sub_805C824
 sub_805C824: @ 805C824
@@ -3252,7 +3252,7 @@ sub_805CB70: @ 805CB70
 	ldr r0, _0805CBB0 @ =gObjectEvents
 	adds r4, r0
 	movs r0, 0x3
-	bl sub_805C808
+	bl GetPlayerAvatarGraphicsIdByStateId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -3285,7 +3285,7 @@ sub_805CBB8: @ 805CBB8
 	cmp r0, 0
 	bne _0805CBD8
 	movs r0, 0x5
-	bl sub_805C808
+	bl GetPlayerAvatarGraphicsIdByStateId
 	lsls r0, 24
 	lsrs r0, 24
 	b _0805CBE0
@@ -4129,7 +4129,7 @@ sub_805D240: @ 805D240
 	cmp r0, 0
 	beq _0805D2AE
 	movs r0, 0
-	bl sub_805C808
+	bl GetPlayerAvatarGraphicsIdByStateId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
diff --git a/asm/overworld.s b/asm/overworld.s
index 6de308f40..f18086650 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -7880,7 +7880,7 @@ _080588BC:
 	ldrb r0, [r4]
 	lsls r0, 30
 	lsrs r0, 31
-	bl sub_805C7F8
+	bl GetHoennLinkPartnerGraphicsIdByGender
 _080588C6:
 	lsls r0, 24
 	lsrs r0, 24
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s
index d89daa03c..c209c8501 100644
--- a/data/field_player_avatar.s
+++ b/data/field_player_avatar.s
@@ -1,3 +1,4 @@
+#include "constants/object_events.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 	.section .rodata
@@ -36,11 +37,11 @@ gUnknown_835B820:: @ 835B820
 
 	.align 2
 gUnknown_835B828:: @ 835B828
-	.4byte MetatileBehavior_ReturnFalse_14
-	.4byte MetatileBehavior_ReturnFalse_15
-	.4byte MetatileBehavior_ReturnFalse_16
-	.4byte MetatileBehavior_ReturnFalse_17
-	.4byte MetatileBehavior_ReturnFalse_18
+	.4byte MetatileBehavior_ReturnFalse_14 // Related to Acro Bike
+	.4byte MetatileBehavior_ReturnFalse_15 // Related to Acro Bike
+	.4byte MetatileBehavior_ReturnFalse_16 // Related to Acro Bike
+	.4byte MetatileBehavior_ReturnFalse_17 // Related to Acro Bike
+	.4byte MetatileBehavior_ReturnFalse_18 // Related to Acro Bike
 
 gUnknown_835B83C:: @ 835B83C
 	.byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d
@@ -63,16 +64,30 @@ gUnknown_835B864:: @ 835B864
 	.4byte MetatileBehavior_IsEastArrowWarp
 
 gUnknown_835B874:: @ 835B874
-	.byte 0x00, 0x07, 0x01, 0x08, 0x02, 0x09, 0x03, 0x0a, 0x04, 0x0b, 0x05, 0x0c
+	.byte OBJECT_EVENT_GFX_RED_NORMAL,    OBJECT_EVENT_GFX_GREEN_NORMAL
+	.byte OBJECT_EVENT_GFX_RED_BIKE,      OBJECT_EVENT_GFX_GREEN_BIKE
+	.byte OBJECT_EVENT_GFX_RED_SURF,      OBJECT_EVENT_GFX_GREEN_SURF
+	.byte OBJECT_EVENT_GFX_RED_ITEM,      OBJECT_EVENT_GFX_GREEN_ITEM
+	.byte OBJECT_EVENT_GFX_RED_FISH,      OBJECT_EVENT_GFX_GREEN_FISH
+	.byte OBJECT_EVENT_GFX_RED_ITEM_COPY, OBJECT_EVENT_GFX_GREEN_ITEM_COPY
 
 gUnknown_835B880:: @ 835B880
-	.byte 0x0e, 0x0f
+	.byte OBJECT_EVENT_GFX_RS_BRENDAN
+	.byte OBJECT_EVENT_GFX_RS_MAY
 
 gUnknown_835B882:: @ 835B882
-	.byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x08, 0x07, 0x01, 0x08, 0x02, 0x09, 0x08
+	@ Male
+	.byte OBJECT_EVENT_GFX_RED_NORMAL, 0x01
+	.byte OBJECT_EVENT_GFX_RED_BIKE, 0x02
+	.byte OBJECT_EVENT_GFX_RED_SURF, 0x08
+	@ Female
+	.byte OBJECT_EVENT_GFX_GREEN_NORMAL, 0x01
+	.byte OBJECT_EVENT_GFX_GREEN_BIKE, 0x02
+	.byte OBJECT_EVENT_GFX_GREEN_SURF, 0x08
 
 gUnknown_835B88E:: @ 835B88E
-	.byte 0x06, 0x0d
+	.byte OBJECT_EVENT_GFX_RED_VS_SEEKER
+	.byte OBJECT_EVENT_GFX_GREEN_VS_SEEKER
 
 gUnknown_835B890:: @ 835B890
 	.4byte MetatileBehavior_IsSouthArrowWarp
diff --git a/include/constants/object_events.h b/include/constants/object_events.h
index d6f33b33c..89dd75b5f 100644
--- a/include/constants/object_events.h
+++ b/include/constants/object_events.h
@@ -3,14 +3,14 @@
 
 #define OBJECT_EVENT_GFX_RED_NORMAL 0
 #define OBJECT_EVENT_GFX_RED_BIKE 1
-#define OBJECT_EVENT_GFX_RED_RUN 2
+#define OBJECT_EVENT_GFX_RED_SURF 2
 #define OBJECT_EVENT_GFX_RED_ITEM 3
 #define OBJECT_EVENT_GFX_RED_FISH 4
 #define OBJECT_EVENT_GFX_RED_ITEM_COPY 5
 #define OBJECT_EVENT_GFX_RED_VS_SEEKER 6
 #define OBJECT_EVENT_GFX_GREEN_NORMAL 7
 #define OBJECT_EVENT_GFX_GREEN_BIKE 8
-#define OBJECT_EVENT_GFX_GREEN_RUN 9
+#define OBJECT_EVENT_GFX_GREEN_SURF 9
 #define OBJECT_EVENT_GFX_GREEN_ITEM 10
 #define OBJECT_EVENT_GFX_GREEN_FISH 11
 #define OBJECT_EVENT_GFX_GREEN_ITEM_COPY 12
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index a69ec6155..e9553025c 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -16,7 +16,7 @@ void sub_808D074(u8);
 void sub_805C270(void);
 void sub_805C780(void);
 void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
-u8 sub_805C808(u8);
+u8 GetPlayerAvatarGraphicsIdByStateId(u8);
 void SetPlayerAvatarStateMask(u8 mask);
 void sub_805D9C4(struct Sprite *sprite);
 void sub_805D154(u8 direction);
diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c
index 678feb8c6..20e7258d3 100644
--- a/src/dynamic_placeholder_text_util.c
+++ b/src/dynamic_placeholder_text_util.c
@@ -9,10 +9,10 @@ static const u8 sTextColorTable[] =
 {
  // [LOW_NYBBLE / 2]                               = 0xXY, // HIGH_NYBBLE
     [OBJECT_EVENT_GFX_RED_NORMAL / 2]              = 0x00, // OBJECT_EVENT_GFX_RED_BIKE
-    [OBJECT_EVENT_GFX_RED_RUN / 2]                 = 0x00, // OBJECT_EVENT_GFX_RED_ITEM
+    [OBJECT_EVENT_GFX_RED_SURF / 2]                 = 0x00, // OBJECT_EVENT_GFX_RED_ITEM
     [OBJECT_EVENT_GFX_RED_FISH / 2]                = 0x00, // OBJECT_EVENT_GFX_RED_ITEM_COPY
     [OBJECT_EVENT_GFX_RED_VS_SEEKER / 2]           = 0x10, // OBJECT_EVENT_GFX_GREEN_NORMAL
-    [OBJECT_EVENT_GFX_GREEN_BIKE / 2]              = 0x11, // OBJECT_EVENT_GFX_GREEN_RUN
+    [OBJECT_EVENT_GFX_GREEN_BIKE / 2]              = 0x11, // OBJECT_EVENT_GFX_GREEN_SURF
     [OBJECT_EVENT_GFX_GREEN_ITEM / 2]              = 0x11, // OBJECT_EVENT_GFX_GREEN_FISH
     [OBJECT_EVENT_GFX_GREEN_ITEM_COPY / 2]         = 0x11, // OBJECT_EVENT_GFX_GREEN_VS_SEEKER
     [OBJECT_EVENT_GFX_RS_BRENDAN / 2]              = 0x10, // OBJECT_EVENT_GFX_RS_MAY
diff --git a/src/quest_log_player.c b/src/quest_log_player.c
index d66c677d8..b6167a7bf 100644
--- a/src/quest_log_player.c
+++ b/src/quest_log_player.c
@@ -57,7 +57,7 @@ void sub_8150498(u8 a0)
 static void sub_81504A8(void)
 {
     struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
-    sub_81507BC(objectEvent, sub_805C808(0));
+    sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0));
     ObjectEventTurn(objectEvent, objectEvent->placeholder18);
     SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT);
 }
@@ -65,7 +65,7 @@ static void sub_81504A8(void)
 static void sub_81504E8(void)
 {
     struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
-    sub_81507BC(objectEvent, sub_805C808(1));
+    sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(1));
     ObjectEventTurn(objectEvent, objectEvent->placeholder18);
     SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE);
     sub_80BD620(0, 0);
@@ -86,7 +86,7 @@ static void sub_8150530(void)
     }
     else
     {
-        sub_81507BC(objectEvent, sub_805C808(4));
+        sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4));
         StartSpriteAnim(sprite, sub_80634F0(objectEvent->facingDirection));
     }
 }
@@ -101,7 +101,7 @@ static void sub_81505C4(u8 taskId)
         case 0:
             ObjectEventClearAnimIfSpecialAnimActive(objectEvent);
             objectEvent->enableAnim = TRUE;
-            sub_81507BC(objectEvent, sub_805C808(4));
+            sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(4));
             StartSpriteAnim(sprite, sub_80634F0(objectEvent->facingDirection));
             gTasks[taskId].data[0]++;
             gTasks[taskId].data[1] = 0;
@@ -122,9 +122,9 @@ static void sub_81505C4(u8 taskId)
             if (sprite->animEnded)
             {
                 if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING))
-                    sub_81507BC(objectEvent, sub_805C808(0));
+                    sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0));
                 else
-                    sub_81507BC(objectEvent, sub_805C808(2));
+                    sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(2));
                 ObjectEventTurn(objectEvent, objectEvent->placeholder18);
                 sprite->pos2.x = 0;
                 sprite->pos2.y = 0;
@@ -142,7 +142,7 @@ static void sub_8150708(void)
 
     if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING))
     {
-        sub_81507BC(objectEvent, sub_805C808(2));
+        sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(2));
         ObjectEventTurn(objectEvent, objectEvent->placeholder18);
         SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING);
         gFieldEffectArguments[0] = objectEvent->currentCoords.x;