From dad6d418e3702e2f69aba0465773c0fa09d78cc9 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sat, 18 Jan 2020 02:41:10 +0100
Subject: [PATCH] [hellfire] Rename item spawn functions

---
 Source/items.cpp              | 14 +++++++-------
 Source/items.h                |  8 ++++----
 Source/towners.cpp            |  6 +++---
 comparer-config/hellfire.toml |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Source/items.cpp b/Source/items.cpp
index ff83356f4..de83e6da7 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -3012,7 +3012,7 @@ void SpawnRock()
 }
 
 #ifdef HELLFIRE
-void items_427DC6(int itemid, int xx, int yy)
+void SpawnRewardItem(int itemid, int xx, int yy)
 {
 	int i;
 
@@ -3033,19 +3033,19 @@ void items_427DC6(int itemid, int xx, int yy)
 	numitems++;
 }
 
-void items_427E61(int xx, int yy)
+void SpawnMapOfDoom(int xx, int yy)
 {
-	items_427DC6(IDI_MAPOFDOOM, xx, yy);
+	SpawnRewardItem(IDI_MAPOFDOOM, xx, yy);
 }
 
-void items_427E6F(int xx, int yy)
+void SpawnRuneBomb(int xx, int yy)
 {
-	items_427DC6(IDI_RUNEBOMB, xx, yy);
+	SpawnRewardItem(IDI_RUNEBOMB, xx, yy);
 }
 
-void items_427E7D(int xx, int yy)
+void SpawnTheodore(int xx, int yy)
 {
-	items_427DC6(IDI_THEODORE, xx, yy);
+	SpawnRewardItem(IDI_THEODORE, xx, yy);
 }
 #endif
 
diff --git a/Source/items.h b/Source/items.h
index fa1195f07..52a9591ef 100644
--- a/Source/items.h
+++ b/Source/items.h
@@ -99,10 +99,10 @@ void items_427ABA(int x, int y);
 void SpawnQuestItem(int itemid, int x, int y, int randarea, int selflag);
 void SpawnRock();
 #ifdef HELLFIRE
-void items_427DC6(int itemid, int xx, int yy);
-void items_427E61(int xx, int yy);
-void items_427E6F(int xx, int yy);
-void items_427E7D(int xx, int yy);
+void SpawnRewardItem(int itemid, int xx, int yy);
+void SpawnMapOfDoom(int xx, int yy);
+void SpawnRuneBomb(int xx, int yy);
+void SpawnTheodore(int xx, int yy);
 #endif
 void RespawnItem(int i, BOOL FlipFlag);
 void DeleteItem(int ii, int i);
diff --git a/Source/towners.cpp b/Source/towners.cpp
index 73d488357..159987e95 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -1108,7 +1108,7 @@ void TalkToTowner(int p, int t)
 				quests[QTYPE_FARMER]._qvar1 = 1;
 				quests[QTYPE_FARMER]._qlog = 1;
 				quests[QTYPE_FARMER]._qmsg = QUEST_FARMER1;
-				items_427E6F(towner[t]._tx + 1, towner[t]._ty);
+				SpawnRuneBomb(towner[t]._tx + 1, towner[t]._ty);
 			}
 			break;
 		case 1:
@@ -1135,7 +1135,7 @@ void TalkToTowner(int p, int t)
 				quests[QTYPE_FARMER]._qvar1 = 1;
 				quests[QTYPE_FARMER]._qlog = 1;
 				quests[QTYPE_FARMER]._qmsg = QUEST_FARMER1;
-				items_427E6F(towner[t]._tx + 1, towner[t]._ty);
+				SpawnRuneBomb(towner[t]._tx + 1, towner[t]._ty);
 			}
 			break;
 		case 2:
@@ -1222,7 +1222,7 @@ void TalkToTowner(int p, int t)
 					quests[QTYPE_JERSEY]._qmsg = QUEST_JERSEY4;
 					quests[QTYPE_JERSEY]._qlog = 1;
 					quests[QTYPE_JERSEY]._qvar1 = 1;
-					items_427E6F(towner[t]._tx + 1, towner[t]._ty);
+					SpawnRuneBomb(towner[t]._tx + 1, towner[t]._ty);
 				}
 				break;
 			default:
diff --git a/comparer-config/hellfire.toml b/comparer-config/hellfire.toml
index 6d7cbca51..220cf3d85 100644
--- a/comparer-config/hellfire.toml
+++ b/comparer-config/hellfire.toml
@@ -3158,22 +3158,22 @@ addr = 0x427CEE
 size = 0xD8
 
 [[func]]
-name = "items_427DC6"
+name = "SpawnItem"
 addr = 0x427DC6
 size = 0x9B
 
 [[func]]
-name = "items_427E61"
+name = "SpawnMapOfDoom"
 addr = 0x427E61
 size = 0xE
 
 [[func]]
-name = "items_427E6F"
+name = "SpawnRuneBomb"
 addr = 0x427E6F
 size = 0xE
 
 [[func]]
-name = "items_427E7D"
+name = "SpawnTheodore"
 addr = 0x427E7D
 size = 0xE