Move lots of data tables into individual data/ files

(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
2025-09-08 08:13:02 -07:00 · 2017-12-11 13:47:58 -05:00
parent c2ad79c4f2
commit 31cce83e9b
86 changed files with 3238 additions and 3154 deletions
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -11,7 +11,7 @@ BlackthornEmysHouse_MapScriptHeader:
 Emy:
 	faceplayer
 	opentext
-	trade $3
+	trade NPCTRADE_EMY
 	waitbutton
 	closetext
 	end
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -126,7 +126,7 @@ LassScript_0x56130:
 Mike:
 	faceplayer
 	opentext
-	trade $0
+	trade NPCTRADE_MIKE
 	waitbutton
 	closetext
 	end
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -11,7 +11,7 @@ OlivineTimsHouse_MapScriptHeader:
 Tim:
 	faceplayer
 	opentext
-	trade $2
+	trade NPCTRADE_TIM
 	waitbutton
 	closetext
 	end
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -32,7 +32,7 @@ BugCatcherScript_0x1a2ef7:
 Chris:
 	faceplayer
 	opentext
-	trade $4
+	trade NPCTRADE_CHRIS
 	waitbutton
 	closetext
 	end
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -191,7 +191,7 @@ UnknownScript_0x188ec5:
 Forest:
 	faceplayer
 	opentext
-	trade $6
+	trade NPCTRADE_FOREST
 	waitbutton
 	closetext
 	end
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -14,7 +14,7 @@ Route14_MapScriptHeader:
 Kim:
 	faceplayer
 	opentext
-	trade $5
+	trade NPCTRADE_KIM
 	waitbutton
 	closetext
 	end
--- a/maps/VioletOnixTradeHouse.asm
+++ b/maps/VioletOnixTradeHouse.asm
@@ -15,7 +15,7 @@ PokefanMScript_0x6998d:
 Kyle:
 	faceplayer
 	opentext
-	trade $1
+	trade NPCTRADE_KYLE
 	waitbutton
 	closetext
 	end