summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-11 13:47:58 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-11 14:23:18 -0500
commit31cce83e9b3bab01d8a605b170549fbd25ca5fee (patch)
treea9fdeec61aea1be07a7bc71b65b9d71adc2b1eef /maps
parentc2ad79c4f21b5f4dd661d69a7a81b69506be8821 (diff)
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.)
Diffstat (limited to 'maps')
-rw-r--r--maps/BlackthornEmysHouse.asm2
-rw-r--r--maps/GoldenrodDeptStore5F.asm2
-rw-r--r--maps/OlivineTimsHouse.asm2
-rw-r--r--maps/PewterPokecenter1F.asm2
-rw-r--r--maps/PowerPlant.asm2
-rw-r--r--maps/Route14.asm2
-rw-r--r--maps/VioletOnixTradeHouse.asm2
7 files changed, 7 insertions, 7 deletions
diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm
index 9869fe720..bb69914d4 100644
--- 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
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index 247322ea6..0c33b44a3 100644
--- 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
diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm
index 0d9a2862c..bde18bee1 100644
--- 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
diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm
index b0ef93e16..e9ddbbd32 100644
--- 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
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 193bc7434..f96f0aef5 100644
--- 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
diff --git a/maps/Route14.asm b/maps/Route14.asm
index 0b4372bd6..841ee2c97 100644
--- 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
diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm
index 8e6e44426..feb5b10af 100644
--- 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