From 9c748199862bbd575dc217713d8e42b3c0658513 Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Mon, 1 Oct 2018 07:27:26 +0800
Subject: update player fields

---
 csrc/player_info.h |  4 ++--
 csrc/players.c     | 48 ++++++++++++++++++++++++------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/csrc/player_info.h b/csrc/player_info.h
index c83440f..584a108 100644
--- a/csrc/player_info.h
+++ b/csrc/player_info.h
@@ -7,7 +7,7 @@
 
 typedef struct
 {
-	uint32_t name_ptr;
+	const char *name_ptr;
 	uint32_t f4;
 	uint16_t xpos; /* 0x496b70 */
 	uint16_t ypos; /* 0x496b72 */
@@ -18,7 +18,7 @@ typedef struct
 	uint8_t traffic_method; /* 0x496b79 */
 	uint8_t ndices; /* 0x496b7a */
 	uint8_t character;
-	uint8_t f20;
+	uint8_t sex; /* 0: female, 1: male */
 	uint8_t who_plays; /* 0: not alive, 1: human, 2: computer @0x496b7d */
 	uint8_t f22;
 	uint8_t f23;
diff --git a/csrc/players.c b/csrc/players.c
index 3c10c43..af87486 100644
--- a/csrc/players.c
+++ b/csrc/players.c
@@ -12,12 +12,12 @@ int current_player;
 
 player_info rich4_players[12] = {
 	{
-		.name_ptr = 0x004665c4,
+		.name_ptr = "\xac\xf9 \xbf\xab \xb3\xec", /* 约翰乔 */
 		.f4 = 0x00946126,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 0,
-		.f20 = 1,
+		.sex = 1,
 		.f22 = 3,
 		.f23 = 2,
 		.f24 = 60,
@@ -25,12 +25,12 @@ player_info rich4_players[12] = {
 		.f26 = 30,
 	},
 	{
-		.name_ptr = 0x004665cd,
+		.name_ptr = "\xa8\x46\xb6\xa9\xa4\xda\xb4\xb5", /* 沙隆巴斯 */
 		.f4 = 0x00bdc3c6,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 1,
-		.f20 = 1,
+		.sex = 1,
 		.f22 = 3,
 		.f23 = 1,
 		.f24 = 100,
@@ -38,12 +38,12 @@ player_info rich4_players[12] = {
 		.f26 = 45,
 	},
 	{
-		.name_ptr = 0x004665d6,
+		.name_ptr = "\xa7\xd4 \xa4\xd3 \xad\xa6", /* 忍太郎 */
 		.f4 = 0x0041323b,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 2,
-		.f20 = 1,
+		.sex = 1,
 		.f22 = 3,
 		.f23 = 2,
 		.f24 = 0,
@@ -51,12 +51,12 @@ player_info rich4_players[12] = {
 		.f26 = 0,
 	},
 	{
-		.name_ptr = 0x004665df,
+		.name_ptr = "\xbf\xfa \xa4\xd2 \xa4H", /* 钱夫人 */
 		.f4 = 0x00c626c3,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 3,
-		.f20 = 0,
+		.sex = 0,
 		.f22 = 3,
 		.f23 = 2,
 		.f24 = 100,
@@ -64,12 +64,12 @@ player_info rich4_players[12] = {
 		.f26 = 30,
 	},
 	{
-		.name_ptr = 0x004665e8,
+		.name_ptr = "\xaa\xfc \xa4g \xa7\x42", /* 阿土伯 */
 		.f4 = 0x00c5b830,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 4,
-		.f20 = 1,
+		.sex = 1,
 		.f22 = 3,
 		.f23 = 1,
 		.f24 = 50,
@@ -77,12 +77,12 @@ player_info rich4_players[12] = {
 		.f26 = 25,
 	},
 	{
-		.name_ptr = 0x004665f1,
+		.name_ptr = "\xb2\xef\xa9\xd4\xa4\xbd\xa5\x44", /* 莎拉公主 */
 		.f4 = 0x00ed9d9d,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 5,
-		.f20 = 0,
+		.sex = 0,
 		.f22 = 3,
 		.f23 = 1,
 		.f24 = 75,
@@ -90,12 +90,12 @@ player_info rich4_players[12] = {
 		.f26 = 30,
 	},
 	{
-		.name_ptr = 0x004665fa,
+		.name_ptr = "\xae\x63\xa5\xbb\xc4_\xc2\xc3", /* 宫本宝藏 */
 		.f4 = 0x0000f038,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 6,
-		.f20 = 1,
+		.sex = 1,
 		.f22 = 3,
 		.f23 = 1,
 		.f24 = 100,
@@ -103,12 +103,12 @@ player_info rich4_players[12] = {
 		.f26 = 20,
 	},
 	{
-		.name_ptr = 0x00466603,
+		.name_ptr = "\xbf}  \xbf}", /* 糖糖 */
 		.f4 = 0x00ffffa0,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 7,
-		.f20 = 0,
+		.sex = 0,
 		.f22 = 3,
 		.f23 = 0,
 		.f24 = 0,
@@ -116,12 +116,12 @@ player_info rich4_players[12] = {
 		.f26 = 35,
 	},
 	{
-		.name_ptr = 0x0046660a,
+		.name_ptr = "\xafQ  \xab}", /* 乌咪 */
 		.f4 = 0x00e77c08,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 8,
-		.f20 = 0,
+		.sex = 0,
 		.f22 = 3,
 		.f23 = 0,
 		.f24 = 0,
@@ -129,12 +129,12 @@ player_info rich4_players[12] = {
 		.f26 = 20,
 	},
 	{
-		.name_ptr = 0x00466611,
+		.name_ptr = "\xae] \xa4p \xac\xfc", /* 孙小美 */
 		.f4 = 0x00cc1a20,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 9,
-		.f20 = 0,
+		.sex = 0,
 		.f22 = 3,
 		.f23 = 0,
 		.f24 = 50,
@@ -142,12 +142,12 @@ player_info rich4_players[12] = {
 		.f26 = 0,
 	},
 	{
-		.name_ptr = 0x0046661a,
+		.name_ptr = "\xa4p \xa4\xa6 \xa5\xa7", /* 小丹尼 */
 		.f4 = 0x002017fe,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 10,
-		.f20 = 1,
+		.sex = 1,
 		.f22 = 3,
 		.f23 = 1,
 		.f24 = 30,
@@ -155,12 +155,12 @@ player_info rich4_players[12] = {
 		.f26 = 15,
 	},
 	{
-		.name_ptr = 0x00466623,
+		.name_ptr = "\xaa\xf7 \xa8\xa9 \xa8\xa9", /* 金贝贝 */
 		.f4 = 0x000ebdbd,
 		.traffic_method = 0,
 		.ndices = 1,
 		.character = 11,
-		.f20 = 0,
+		.sex = 0,
 		.f22 = 3,
 		.f23 = 2,
 		.f24 = 80,
-- 
cgit v1.2.3