summaryrefslogtreecommitdiff
path: root/data/mapObjects
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects')
-rwxr-xr-xdata/mapObjects/celadongamecorner.asm4
-rwxr-xr-xdata/mapObjects/celadonpokecenter.asm5
-rwxr-xr-xdata/mapObjects/cinnabargym.asm2
-rwxr-xr-xdata/mapObjects/cinnabarpokecenter.asm3
-rwxr-xr-xdata/mapObjects/copycatshouse1f.asm2
-rwxr-xr-xdata/mapObjects/fanclub.asm6
-rwxr-xr-xdata/mapObjects/fuchsiagym.asm2
-rwxr-xr-xdata/mapObjects/fuchsiapokecenter.asm5
-rwxr-xr-xdata/mapObjects/indigoplateaulobby.asm3
-rwxr-xr-xdata/mapObjects/lavenderpokecenter.asm5
-rwxr-xr-xdata/mapObjects/pokemontower7.asm8
-rwxr-xr-xdata/mapObjects/rockethideout4.asm4
-rwxr-xr-xdata/mapObjects/route18gateupstairs.asm2
-rwxr-xr-xdata/mapObjects/route22gate.asm2
-rwxr-xr-xdata/mapObjects/saffrongym.asm2
-rwxr-xr-xdata/mapObjects/saffronpokecenter.asm3
-rwxr-xr-xdata/mapObjects/seafoamislands1.asm4
-rwxr-xr-xdata/mapObjects/ssanne8.asm2
-rwxr-xr-xdata/mapObjects/vermilionhouse3.asm2
-rwxr-xr-xdata/mapObjects/vermilionpokecenter.asm3
20 files changed, 35 insertions, 34 deletions
diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm
index 1169e1da..a44cf0a6 100755
--- a/data/mapObjects/celadongamecorner.asm
+++ b/data/mapObjects/celadongamecorner.asm
@@ -18,8 +18,8 @@ CeladonGameCornerObject: ; 0x48fa0 (size=99)
object SPRITE_MOM_GEISHA, $8, $b, STAY, LEFT, $6 ; person
object SPRITE_GYM_HELPER, $8, $e, STAY, LEFT, $7 ; person
object SPRITE_GAMBLER, $b, $f, STAY, RIGHT, $8 ; person
- object SPRITE_MART_GUY, $e, $b, STAY, LEFT, $9 ; person
- object SPRITE_GENTLEMAN, $11, $d, STAY, RIGHT, $a ; person
+ object SPRITE_FAT_BALD_GUY, $e, $b, STAY, LEFT, $9 ; person
+ object SPRITE_FISHER, $11, $d, STAY, RIGHT, $a ; person
object SPRITE_ROCKET, $9, $5, STAY, UP, $b, OPP_ROCKET, $7
; warp-to
diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm
index ccc30ce7..7429c190 100755
--- a/data/mapObjects/celadonpokecenter.asm
+++ b/data/mapObjects/celadonpokecenter.asm
@@ -7,11 +7,12 @@ CeladonPokecenterObject: ; 0x488d2 (size=44)
db $0 ; signs
- db $4 ; objects
+ db $5 ; objects
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
- object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person
+ object SPRITE_GENTLEMAN, $7, $3, STAY, DOWN, $2 ; person
object SPRITE_FOULARD_WOMAN, $a, $5, WALK, $0, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+ object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person
; warp-to
EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $3
diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm
index d9b69192..2b9f34cb 100755
--- a/data/mapObjects/cinnabargym.asm
+++ b/data/mapObjects/cinnabargym.asm
@@ -8,7 +8,7 @@ CinnabarGymObject: ; 0x75acc (size=90)
db $0 ; signs
db $9 ; objects
- object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1
+ object SPRITE_MR_MASTERBALL, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1
object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, OPP_SUPER_NERD, $9
object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, OPP_BURGLAR, $4
object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, OPP_SUPER_NERD, $a
diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm
index f144db96..b855464e 100755
--- a/data/mapObjects/cinnabarpokecenter.asm
+++ b/data/mapObjects/cinnabarpokecenter.asm
@@ -7,11 +7,12 @@ CinnabarPokecenterObject: ; 0x75e46 (size=44)
db $0 ; signs
- db $4 ; objects
+ db $5 ; objects
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_LASS, $9, $4, WALK, $0, $2 ; person
object SPRITE_GENTLEMAN, $2, $6, STAY, NONE, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+ object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person
; warp-to
EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $3
diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm
index 96787714..983baa99 100755
--- a/data/mapObjects/copycatshouse1f.asm
+++ b/data/mapObjects/copycatshouse1f.asm
@@ -11,7 +11,7 @@ CopycatsHouse1FObject: ; 0x75ee3 (size=46)
db $3 ; objects
object SPRITE_MOM_GEISHA, $2, $2, STAY, DOWN, $1 ; person
object SPRITE_FAT_BALD_GUY, $5, $4, STAY, LEFT, $2 ; person
- object SPRITE_CLEFAIRY, $1, $4, WALK, $1, $3 ; person
+ object SPRITE_CHANSEY, $1, $4, STAY, NONE, $3 ; person
; warp-to
EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $2
diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm
index 6f65b287..cbe0cb31 100755
--- a/data/mapObjects/fanclub.asm
+++ b/data/mapObjects/fanclub.asm
@@ -5,14 +5,12 @@ FanClubObject: ; 0x59c97 (size=62)
db $7, $2, $1, $ff
db $7, $3, $1, $ff
- db $2 ; signs
- db $0, $1, $7 ; FanClubText7
- db $0, $6, $8 ; FanClubText8
+ db $0 ; signs
db $6 ; objects
object SPRITE_FISHER2, $6, $3, STAY, LEFT, $1 ; person
object SPRITE_GIRL, $1, $3, STAY, RIGHT, $2 ; person
- object SPRITE_CLEFAIRY, $6, $4, STAY, LEFT, $3 ; person
+ object SPRITE_CLEFAIRY_2, $6, $4, STAY, LEFT, $3 ; person
object SPRITE_SEEL, $1, $4, STAY, RIGHT, $4 ; person
object SPRITE_GENTLEMAN, $3, $1, STAY, DOWN, $5 ; person
object SPRITE_CABLE_CLUB_WOMAN, $5, $1, STAY, DOWN, $6 ; person
diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm
index ded17031..c7fc3799 100755
--- a/data/mapObjects/fuchsiagym.asm
+++ b/data/mapObjects/fuchsiagym.asm
@@ -8,7 +8,7 @@ FuchsiaGymObject: ; 0x75658 (size=82)
db $0 ; signs
db $8 ; objects
- object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, OPP_KOGA, $1
+ object SPRITE_LAPRAS_GIVER, $4, $a, STAY, DOWN, $1, OPP_KOGA, $1
object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, OPP_JUGGLER, $7
object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, OPP_JUGGLER, $3
object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, OPP_JUGGLER, $8
diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm
index 19b2c950..8a1c392b 100755
--- a/data/mapObjects/fuchsiapokecenter.asm
+++ b/data/mapObjects/fuchsiapokecenter.asm
@@ -7,11 +7,12 @@ FuchsiaPokecenterObject: ; 0x7507d (size=44)
db $0 ; signs
- db $4 ; objects
+ db $5 ; objects
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
- object SPRITE_ROCKER, $2, $3, STAY, NONE, $2 ; person
+ object SPRITE_ROCKER, $4, $3, STAY, UP, $2 ; person
object SPRITE_LASS, $6, $5, WALK, $2, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+ object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person
; warp-to
EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $3
diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm
index dfcd97b7..c41e2cfc 100755
--- a/data/mapObjects/indigoplateaulobby.asm
+++ b/data/mapObjects/indigoplateaulobby.asm
@@ -8,12 +8,13 @@ IndigoPlateauLobbyObject: ; 0x19c95 (size=58)
db $0 ; signs
- db $5 ; objects
+ db $6 ; objects
object SPRITE_NURSE, $7, $5, STAY, DOWN, $1 ; person
object SPRITE_GYM_HELPER, $4, $9, STAY, RIGHT, $2 ; person
object SPRITE_LASS, $5, $1, STAY, DOWN, $3 ; person
object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $4 ; person
object SPRITE_CABLE_CLUB_WOMAN, $d, $6, STAY, DOWN, $5 ; person
+ object SPRITE_CHANSEY, $8, $5, STAY, DOWN, $6 ; person
; warp-to
EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7
diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm
index b421c3a4..702e67b7 100755
--- a/data/mapObjects/lavenderpokecenter.asm
+++ b/data/mapObjects/lavenderpokecenter.asm
@@ -7,11 +7,12 @@ LavenderPokecenterObject: ; 0x5c8f4 (size=44)
db $0 ; signs
- db $4 ; objects
+ db $5 ; objects
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_GENTLEMAN, $5, $3, STAY, NONE, $2 ; person
- object SPRITE_LITTLE_GIRL, $2, $6, WALK, $1, $3 ; person
+ object SPRITE_LITTLE_GIRL, $a, $5, WALK, $2, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+ object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person
; warp-to
EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $3
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm
index a77d1d1e..4d1e26c2 100755
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -6,10 +6,10 @@ PokemonTower7Object: ; 0x60ef6 (size=42)
db $0 ; signs
- db 3 ; objects
- object SPRITE_JESSIE, $a 8, 8, STAY, DOWN, 1
- object SPRITE_JAMES, $b, 8, STAY, DOWN, 2
- object SPRITE_MR_FUJI, $a, 3, STAY, DOWN, 3
+ db $3 ; objects
+ object SPRITE_JESSIE, $a, $8, STAY, DOWN, $1
+ object SPRITE_JAMES, $b, $8, STAY, DOWN, $2
+ object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $3
; warp-to
EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6
diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm
index 5441f9cd..616f5a75 100755
--- a/data/mapObjects/rockethideout4.asm
+++ b/data/mapObjects/rockethideout4.asm
@@ -10,8 +10,8 @@ RocketHideout4Object: ; 0x455f1 (size=95)
db $9 ; objects
object SPRITE_GIOVANNI, $19, $3, STAY, DOWN, $1, OPP_GIOVANNI, $1
- object SPRITE_ROCKET, $17, $c, STAY, DOWN, $2, OPP_ROCKET, $10
- object SPRITE_ROCKET, $1a, $c, STAY, DOWN, $3, OPP_ROCKET, $11
+ object SPRITE_JAMES, $19, $a, STAY, DOWN, $2
+ object SPRITE_JESSIE, $18, $a, STAY, DOWN, $3
object SPRITE_ROCKET, $b, $2, STAY, DOWN, $4, OPP_ROCKET, $12
object SPRITE_BALL, $a, $c, STAY, NONE, $5, HP_UP
object SPRITE_BALL, $9, $4, STAY, NONE, $6, TM_02
diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm
index c611e0c3..93438044 100755
--- a/data/mapObjects/route18gateupstairs.asm
+++ b/data/mapObjects/route18gateupstairs.asm
@@ -9,7 +9,7 @@ Route18GateUpstairsObject: ; 0x499a4 (size=24)
db $2, $6, $3 ; Route18GateUpstairsText3
db $1 ; objects
- object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person
+ object SPRITE_COOK, $4, $2, WALK, $2, $1 ; person
; warp-to
EVENT_DISP ROUTE_18_GATE_2F_WIDTH, $7, $7 ; ROUTE_18_GATE_1F
diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm
index 604a8730..02f11d58 100755
--- a/data/mapObjects/route22gate.asm
+++ b/data/mapObjects/route22gate.asm
@@ -5,7 +5,7 @@ Route22GateObject: ; 0x1e720 (size=42)
db $7, $4, $0, $ff
db $7, $5, $0, $ff
db $0, $4, $0, $ff
- db $0, $5, $1, $ff
+ db $0, $5, $0, $ff
db $0 ; signs
diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm
index 63676905..20d91991 100755
--- a/data/mapObjects/saffrongym.asm
+++ b/data/mapObjects/saffrongym.asm
@@ -38,7 +38,7 @@ SaffronGymObject: ; 0x5d259 (size=330)
db $0 ; signs
db $9 ; objects
- object SPRITE_GIRL, $9, $8, STAY, DOWN, $1, OPP_SABRINA, $1
+ object SPRITE_LASS, $9, $8, STAY, DOWN, $1, OPP_SABRINA, $1
object SPRITE_MEDIUM, $a, $1, STAY, DOWN, $2, OPP_CHANNELER, $16
object SPRITE_BUG_CATCHER, $11, $1, STAY, DOWN, $3, OPP_PSYCHIC_TR, $1
object SPRITE_MEDIUM, $3, $7, STAY, DOWN, $4, OPP_CHANNELER, $17
diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm
index 8487bb01..bda46343 100755
--- a/data/mapObjects/saffronpokecenter.asm
+++ b/data/mapObjects/saffronpokecenter.asm
@@ -7,11 +7,12 @@ SaffronPokecenterObject: ; 0x5d54f (size=44)
db $0 ; signs
- db $4 ; objects
+ db $5 ; objects
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_FOULARD_WOMAN, $5, $5, STAY, NONE, $2 ; person
object SPRITE_GENTLEMAN, $8, $3, STAY, DOWN, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+ object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person
; warp-to
EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $3
diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm
index 287f67ce..3b3d4f7a 100755
--- a/data/mapObjects/seafoamislands1.asm
+++ b/data/mapObjects/seafoamislands1.asm
@@ -24,7 +24,3 @@ SeafoamIslands1Object: ; 0x4484f (size=72)
EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_2
EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_2
EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_2
-
- ; holes
- EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $11
- EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $18
diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm
index 992230d8..f089b35d 100755
--- a/data/mapObjects/ssanne8.asm
+++ b/data/mapObjects/ssanne8.asm
@@ -19,7 +19,7 @@ SSAnne8Object: ; 0x61a60 (size=127)
object SPRITE_GIRL, $16, $3, WALK, $1, $5 ; person
object SPRITE_FAT_BALD_GUY, $0, $e, STAY, NONE, $6 ; person
object SPRITE_LITTLE_GIRL, $2, $b, STAY, DOWN, $7 ; person
- object SPRITE_CLEFAIRY, $3, $b, STAY, DOWN, $8 ; person
+ object SPRITE_JIGGLYPUFF, $3, $b, STAY, DOWN, $8 ; person
object SPRITE_GIRL, $a, $d, STAY, RIGHT, $9 ; person
object SPRITE_BALL, $c, $f, STAY, NONE, $a, TM_08
object SPRITE_GENTLEMAN, $15, $d, WALK, $2, $b ; person
diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm
index ab955a20..161ad090 100755
--- a/data/mapObjects/vermilionhouse3.asm
+++ b/data/mapObjects/vermilionhouse3.asm
@@ -8,7 +8,7 @@ VermilionHouse3Object: ; 0x19c25 (size=26)
db $0 ; signs
db $1 ; objects
- object SPRITE_LITTLE_GIRL, $3, $5, STAY, UP, $1 ; person
+ object SPRITE_GENTLEMAN, $3, $5, STAY, UP, $1 ; person
; warp-to
EVENT_DISP VERMILION_HOUSE_3_WIDTH, $7, $2
diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm
index e5d1d147..cd11d653 100755
--- a/data/mapObjects/vermilionpokecenter.asm
+++ b/data/mapObjects/vermilionpokecenter.asm
@@ -7,11 +7,12 @@ VermilionPokecenterObject: ; 0x5c9a9 (size=44)
db $0 ; signs
- db $4 ; objects
+ db $5 ; objects
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_FISHER, $a, $5, STAY, NONE, $2 ; person
object SPRITE_SAILOR, $5, $4, STAY, NONE, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+ object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person
; warp-to
EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $3