summaryrefslogtreecommitdiff
path: root/data/maps/objects
diff options
context:
space:
mode:
authorjd-0 <44876081+jd-0@users.noreply.github.com>2020-11-13 08:14:34 -0800
committerGitHub <noreply@github.com>2020-11-13 11:14:34 -0500
commitfbf7fd06549bc67a2d13f735d8338072fa6ea70a (patch)
tree2943ec811236cd6fae10132497239a354f7bc781 /data/maps/objects
parent110e21a1d846669919bc0cf3bf4d459274fe7975 (diff)
Kanto Mon Names (#79)
Rename Kanto mons to English
Diffstat (limited to 'data/maps/objects')
-rw-r--r--data/maps/objects/Fonto.asm2
-rw-r--r--data/maps/objects/FontoRocketHouse.asm2
-rw-r--r--data/maps/objects/Haiteku.asm2
-rw-r--r--data/maps/objects/KantoCeladonMart5F.asm4
-rw-r--r--data/maps/objects/KantoGamefreakHQ1.asm6
-rw-r--r--data/maps/objects/PlayerHouse2F.asm2
-rw-r--r--data/maps/objects/SilentHillPokecenter.asm2
-rw-r--r--data/maps/objects/South.asm2
-rw-r--r--data/maps/objects/Stand.asm10
-rw-r--r--data/maps/objects/West.asm2
-rw-r--r--data/maps/objects/WestHouse1.asm2
-rw-r--r--data/maps/objects/WestMart5F.asm2
-rw-r--r--data/maps/objects/WestMart6F.asm4
-rw-r--r--data/maps/objects/WestRadioTower5F.asm4
14 files changed, 23 insertions, 23 deletions
diff --git a/data/maps/objects/Fonto.asm b/data/maps/objects/Fonto.asm
index 09fcf84..69c1cd2 100644
--- a/data/maps/objects/Fonto.asm
+++ b/data/maps/objects/Fonto.asm
@@ -26,7 +26,7 @@ Fonto_MapEvents::
def_object_events
object_event 2, 4, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 2, 5, SPRITE_SIDON, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 2, 5, SPRITE_RHYDON, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 14, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 16, 8, SPRITE_TWIN, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
diff --git a/data/maps/objects/FontoRocketHouse.asm b/data/maps/objects/FontoRocketHouse.asm
index d7db86f..1f45e0d 100644
--- a/data/maps/objects/FontoRocketHouse.asm
+++ b/data/maps/objects/FontoRocketHouse.asm
@@ -17,7 +17,7 @@ FontoRocketHouse_MapEvents::
object_event 5, 4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 2, SPRITE_ROCKET_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 14, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 12, 2, SPRITE_POPPO, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 12, 2, SPRITE_PIDGEY, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
FontoRocketHouse_Blocks::
INCBIN "maps/FontoRocketHouse.blk"
diff --git a/data/maps/objects/Haiteku.asm b/data/maps/objects/Haiteku.asm
index dbae101..7195303 100644
--- a/data/maps/objects/Haiteku.asm
+++ b/data/maps/objects/Haiteku.asm
@@ -31,7 +31,7 @@ Haiteku_MapEvents::
def_object_events
object_event 22, 15, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 23, 14, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 23, 14, SPRITE_CLEFAIRY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 23, 24, SPRITE_SAILOR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 26, 10, SPRITE_SAILOR, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 10, 14, SPRITE_GENTLEMAN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
diff --git a/data/maps/objects/KantoCeladonMart5F.asm b/data/maps/objects/KantoCeladonMart5F.asm
index 01ddf4d..fd7d46f 100644
--- a/data/maps/objects/KantoCeladonMart5F.asm
+++ b/data/maps/objects/KantoCeladonMart5F.asm
@@ -15,8 +15,8 @@ KantoCeladonMart5F_MapEvents::
def_object_events
object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 8, 3, SPRITE_SIDON, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 2, 5, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 8, 3, SPRITE_RHYDON, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 2, 5, SPRITE_PIDGEY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
KantoCeladonMart5F_Blocks::
INCBIN "maps/KantoCeladonMart5F.blk"
diff --git a/data/maps/objects/KantoGamefreakHQ1.asm b/data/maps/objects/KantoGamefreakHQ1.asm
index 055b82b..070561b 100644
--- a/data/maps/objects/KantoGamefreakHQ1.asm
+++ b/data/maps/objects/KantoGamefreakHQ1.asm
@@ -18,9 +18,9 @@ KantoGamefreakHQ1_MapEvents::
def_object_events
object_event 1, 5, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 4, 5, SPRITE_SIDON, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 0, 8, SPRITE_PIPPI, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 2, 7, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 4, 5, SPRITE_RHYDON, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 0, 8, SPRITE_CLEFAIRY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 2, 7, SPRITE_PIDGEY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
KantoGamefreakHQ1_Blocks::
INCBIN "maps/KantoGamefreakHQ1.blk"
diff --git a/data/maps/objects/PlayerHouse2F.asm b/data/maps/objects/PlayerHouse2F.asm
index 0c2a394..84c9ffb 100644
--- a/data/maps/objects/PlayerHouse2F.asm
+++ b/data/maps/objects/PlayerHouse2F.asm
@@ -19,7 +19,7 @@ PlayerHouse2F_MapEvents::
def_object_events
object_event 8, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 6, 1, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 6, 1, SPRITE_CLEFAIRY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
PlayerHouse2F_Blocks::
INCBIN "maps/PlayerHouse2F.blk"
diff --git a/data/maps/objects/SilentHillPokecenter.asm b/data/maps/objects/SilentHillPokecenter.asm
index 97b21d6..63608fd 100644
--- a/data/maps/objects/SilentHillPokecenter.asm
+++ b/data/maps/objects/SilentHillPokecenter.asm
@@ -19,7 +19,7 @@ SilentHillPokecenter_MapEvents::
object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 4, SPRITE_24, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 9, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 10, 1, SPRITE_SIDON, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 10, 1, SPRITE_RHYDON, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
SilentHillPokecenter_Blocks::
INCBIN "maps/SilentHillPokecenter.blk"
diff --git a/data/maps/objects/South.asm b/data/maps/objects/South.asm
index 0c57e06..18e7f6e 100644
--- a/data/maps/objects/South.asm
+++ b/data/maps/objects/South.asm
@@ -30,7 +30,7 @@ South_MapEvents::
def_object_events
object_event 25, 21, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 24, 21, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 24, 21, SPRITE_CLEFAIRY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 22, 16, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 30, 11, SPRITE_FISHING_GURU, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
diff --git a/data/maps/objects/Stand.asm b/data/maps/objects/Stand.asm
index 899a41c..477e781 100644
--- a/data/maps/objects/Stand.asm
+++ b/data/maps/objects/Stand.asm
@@ -38,11 +38,11 @@ Stand_MapEvents::
object_event 14, 17, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 28, 19, SPRITE_ROCKER, FACE_RIGHT, 0, 3, -1, -1, 0, 0, 0, 0, 0, 0
object_event 30, 31, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 21, 8, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 13, 6, SPRITE_PIPPI, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 6, 6, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 14, 15, SPRITE_POPPO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 6, 21, SPRITE_SIDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 21, 8, SPRITE_RHYDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 13, 6, SPRITE_CLEFAIRY, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 6, 6, SPRITE_RHYDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 14, 15, SPRITE_PIDGEY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 6, 21, SPRITE_RHYDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
Stand_Blocks::
INCBIN "maps/Stand.blk"
diff --git a/data/maps/objects/West.asm b/data/maps/objects/West.asm
index 8f65773..a8036ac 100644
--- a/data/maps/objects/West.asm
+++ b/data/maps/objects/West.asm
@@ -37,7 +37,7 @@ West_MapEvents::
object_event 12, 7, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 26, 10, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 30, 14, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 29, 14, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 29, 14, SPRITE_CLEFAIRY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 22, 19, SPRITE_COOLTRAINER_F, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0
object_event 18, 13, SPRITE_36, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
diff --git a/data/maps/objects/WestHouse1.asm b/data/maps/objects/WestHouse1.asm
index 80eb8e2..306a9b8 100644
--- a/data/maps/objects/WestHouse1.asm
+++ b/data/maps/objects/WestHouse1.asm
@@ -20,7 +20,7 @@ WestHouse1_MapEvents::
def_object_events
object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 1, 6, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 1, 4, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 1, 4, SPRITE_PIDGEY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
WestHouse1_Blocks::
INCBIN "maps/WestHouse1.blk"
diff --git a/data/maps/objects/WestMart5F.asm b/data/maps/objects/WestMart5F.asm
index bc84abd..fa955ce 100644
--- a/data/maps/objects/WestMart5F.asm
+++ b/data/maps/objects/WestMart5F.asm
@@ -19,7 +19,7 @@ WestMart5F_MapEvents::
def_object_events
object_event 8, 5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 13, 5, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 13, 4, SPRITE_NYOROBON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 13, 4, SPRITE_POLIWRATH, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
WestMart5F_Blocks::
INCBIN "maps/WestMart5F.blk"
diff --git a/data/maps/objects/WestMart6F.asm b/data/maps/objects/WestMart6F.asm
index 6a6af8b..8c44311 100644
--- a/data/maps/objects/WestMart6F.asm
+++ b/data/maps/objects/WestMart6F.asm
@@ -19,8 +19,8 @@ WestMart6F_MapEvents::
def_object_events
object_event 12, 3, SPRITE_OFFICER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 6, 4, SPRITE_SIDON, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 3, 6, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 6, 4, SPRITE_RHYDON, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 3, 6, SPRITE_PIDGEY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
WestMart6F_Blocks::
INCBIN "maps/WestMart6F.blk"
diff --git a/data/maps/objects/WestRadioTower5F.asm b/data/maps/objects/WestRadioTower5F.asm
index 3409300..d1a6294 100644
--- a/data/maps/objects/WestRadioTower5F.asm
+++ b/data/maps/objects/WestRadioTower5F.asm
@@ -18,8 +18,8 @@ WestRadioTower5F_MapEvents::
def_object_events
object_event 6, 6, SPRITE_SCIENTIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 5, 2, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 2, 6, SPRITE_PIPPI, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
- object_event 1, 5, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 2, 6, SPRITE_CLEFAIRY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ object_event 1, 5, SPRITE_CLEFAIRY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 3, 7, SPRITE_SAKAKI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 4, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
object_event 2, 4, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-22 09:54:47 +0000