From 68e202010cde8203e31b33adf759c7313e07a47e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 28 Dec 2020 15:03:50 +1000
Subject: [PATCH] Replace some head/body numbers with constants

---
 src/game/data/data_0083d0.c | 88 +++++++++++++++++++++++++++++++------
 1 file changed, 74 insertions(+), 14 deletions(-)

diff --git a/src/game/data/data_0083d0.c b/src/game/data/data_0083d0.c
index 63c314dc7..589ea837e 100644
--- a/src/game/data/data_0083d0.c
+++ b/src/game/data/data_0083d0.c
@@ -135,34 +135,94 @@ s32 var80062b10 = 0;
 u32 var80062b14 = 0;
 u32 var80062b18 = 0;
 
-// These arrays are head/body numbers
 s32 var80062b1c[] = {
-	0x00, 0x01, 0x02, 0x03, -1, -1, -1, -1,
-	-1,   -1,   -1,   -1,   -1, -1, -1, -1,
-	-1,   -1,   -1,
+	BODY_DJBOND,
+	BODY_CONNERY,
+	BODY_DALTON,
+	BODY_MOORE,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 };
 
 s32 var80062b68[] = {
-	0x18, 0x13, 0x16, 0x11, 0x06, 0x14, 0x12, 0x1b,
-	0x1c, 0x1a, 0x3b, 0x37, 0x42, 0x43, 0x48, 0x54,
-	0x0b, 0x2a, 0x1e, 0x1f, 0x22, 0x23, 0x25, 0x26,
-	0x27, 0x2d, 0x2e, 0x49, 0x4a, 0x4b, 0x4c, 0x4d,
-	0x4e, 0x4f, 0x50, 0x51, 0x52, 0x55, 0x3f, 0x40,
-	0x41, 0x44, -1,
+	HEAD_BEAU1,
+	HEAD_CHRIST,
+	HEAD_DARLING,
+	HEAD_JON,
+	HEAD_ROSS,
+	HEAD_RUSS,
+	HEAD_MARK2,
+	HEAD_JAMIE,
+	HEAD_DUNCAN2,
+	HEAD_BRIAN,
+	HEAD_STEVEM,
+	HEAD_KEITH,
+	HEAD_GRANT,
+	HEAD_PENNY,
+	HEAD_DAVEC,
+	HEAD_JONES,
+	HEAD_GRAHAM,
+	HEAD_SHAUN,
+	HEAD_NEIL2,
+	HEAD_EDMCG,
+	HEAD_MATT_C,
+	HEAD_PEER_S,
+	HEAD_ANDY_R,
+	HEAD_BEN_R,
+	HEAD_STEVE_K,
+	HEAD_SCOTT_H,
+	HEAD_SANCHEZ,
+	HEAD_COOK,
+	HEAD_PRYCE,
+	HEAD_SILKE,
+	HEAD_SMITH,
+	HEAD_GARETH,
+	HEAD_MURCHIE,
+	HEAD_WONG,
+	HEAD_CARTER,
+	HEAD_TINTIN,
+	HEAD_MUNTON,
+	HEAD_PHELPS,
+	HEAD_KEN,
+	HEAD_JOEL,
+	HEAD_TIM,
+	HEAD_ROBIN,
+	-1,
 };
 
 s32 var80062c14[] = {
-	0x18, 0x13, 0x16, 0x11, 0x06, 0x14, 0x12, 0x1b,
-	0x1c, 0x1a, 0x3b, 0x37, 0x42, 0x43, 0x48, 0x54,
+	HEAD_BEAU1,
+	HEAD_CHRIST,
+	HEAD_DARLING,
+	HEAD_JON,
+	HEAD_ROSS,
+	HEAD_RUSS,
+	HEAD_MARK2,
+	HEAD_JAMIE,
+	HEAD_DUNCAN2,
+	HEAD_BRIAN,
+	HEAD_STEVEM,
+	HEAD_KEITH,
+	HEAD_GRANT,
+	HEAD_PENNY,
+	HEAD_DAVEC,
+	HEAD_JONES,
 	-1,
 };
 
 s32 var80062c58[] = {
-	0x21, 0x20, 0x24, 0x2c, -1,
+	HEAD_LESLIE_S,
+	HEAD_ANKA,
+	HEAD_EILEEN_T,
+	HEAD_EILEEN_H,
+	-1,
 };
 
 s32 var80062c6c[] = {
-	0x21, 0x20, 0x24, 0x2c, -1,
+	HEAD_LESLIE_S,
+	HEAD_ANKA,
+	HEAD_EILEEN_T,
+	HEAD_EILEEN_H,
+	-1,
 };
 
 s32 var80062c80 = 0;