diff options
Diffstat (limited to 'data/mapObjects')
62 files changed, 203 insertions, 160 deletions
diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm new file mode 100644 index 00000000..847883d1 --- /dev/null +++ b/data/mapObjects/beach_house.asm @@ -0,0 +1,20 @@ +BeachHouseObjects: ; 0xf23a4 + db $a ; border block + + db 2 ; warps + db 7,2,0,$ff + db 7,3,0,$ff + + db 4 ; signs + db 0,3,3 + db 0,7,4 + db 0,$b,5 + db 1,$d,6 + + db 2 ; objects + object SPRITE_FISHER, 2, 3, STAY, DOWN, 1 ; surfin' dude + object $3d, 5, 3, WALK, $01, 2 ; pikachu + + ; warp-to + EVENT_DISP BEACH_HOUSE_WIDTH,7,2 + EVENT_DISP BEACH_HOUSE_WIDTH,7,3 diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 231e852d..08b11853 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -8,9 +8,9 @@ BluesHouseObject: db $0 ; signs db $3 ; objects - object SPRITE_DAISY, $2, $3, STAY, RIGHT, $1 ; Daisy, sitting by map - object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around - object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table + object SPRITE_DAISY, $2, $3, STAY, RIGHT, $81, $0 ; Daisy, sitting by map + object SPRITE_DAISY, $6, $4, WALK, $1, $82, $0 ; Daisy, walking around + object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $83, $0 ; map on table ; warp-to EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index 46b1c906..af59d2b1 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -18,8 +18,8 @@ CeladonGameCornerObject: 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/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index 41054371..45f12b2c 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -22,9 +22,9 @@ CeladonMart3Object: db $5 ; objects object SPRITE_MART_GUY, $10, $5, STAY, NONE, $1 ; person - object SPRITE_GAMEBOY_KID_COPY, $b, $6, STAY, RIGHT, $2 ; person - object SPRITE_GAMEBOY_KID_COPY, $7, $2, STAY, DOWN, $3 ; person - object SPRITE_GAMEBOY_KID_COPY, $8, $2, STAY, DOWN, $4 ; person + object SPRITE_GAMEBOY_KID, $b, $6, STAY, RIGHT, $2 ; person + object SPRITE_GAMEBOY_KID, $7, $2, STAY, DOWN, $3 ; person + object SPRITE_GAMEBOY_KID, $8, $2, STAY, DOWN, $4 ; person object SPRITE_YOUNG_BOY, $2, $5, STAY, UP, $5 ; person ; warp-to diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index c4ce1700..6691eaaa 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -7,11 +7,12 @@ CeladonPokecenterObject: 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/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index b6317e2c..318f03b9 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -1,5 +1,5 @@ CeruleanCityObject: - db $f ; border block + db $a ; border block db $a ; warps db $b, $1b, $0, TRASHED_HOUSE @@ -27,12 +27,12 @@ CeruleanCityObject: object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, STAY, DOWN, $3 ; person object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person - object SPRITE_GUARD, $1c, $c, STAY, DOWN, $6 ; person + object SPRITE_OFFICER_JENNY, $1c, $c, STAY, DOWN, $6 ; person object SPRITE_LASS, $1d, $1a, STAY, LEFT, $7 ; person - object SPRITE_SLOWBRO, $1c, $1a, STAY, DOWN, $8 ; person + object SPRITE_BALL, $1c, $1a, STAY, DOWN, $8 ; person object SPRITE_LASS, $9, $1b, WALK, $2, $9 ; person object SPRITE_BLACK_HAIR_BOY_2, $4, $c, STAY, DOWN, $a ; person - object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person + object SPRITE_OFFICER_JENNY, $1b, $c, STAY, DOWN, $b ; person ; warp-to EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index 27373825..97e5b52d 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -7,9 +7,11 @@ CeruleanHouse1Object: db $0 ; signs - db $2 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, $5, $4, STAY, LEFT, $1 ; person - object SPRITE_GAMBLER, $1, $2, STAY, NONE, $2 ; person + db $4 ; objects + object SPRITE_GIRL, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_BULBASAUR, $4, $1, STAY, DOWN, $2 ; person + object SPRITE_ODDISH, $1, $4, STAY, NONE, $3 ; person + object SPRITE_SANDSHREW, $5, $3, STAY, LEFT, $4 ; person ; warp-to EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index 1e92ec07..a8ad26d4 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -7,11 +7,12 @@ CeruleanPokecenterObject: db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_BLACK_HAIR_BOY_2, $a, $5, WALK, $0, $2 ; person - object SPRITE_GENTLEMAN, $4, $3, STAY, DOWN, $3 ; person + object SPRITE_GENTLEMAN, $4, $3, STAY, UP, $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 CERULEAN_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index 24bdba3d..28960150 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -8,7 +8,7 @@ CinnabarGymObject: 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 7d15f050..b9779eb5 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -7,11 +7,12 @@ CinnabarPokecenterObject: 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/colosseum.asm b/data/mapObjects/colosseum.asm index 91fea6b9..91fea6b9 100755..100644 --- a/data/mapObjects/colosseum.asm +++ b/data/mapObjects/colosseum.asm diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index 7d842cad..c6702cfa 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -11,7 +11,7 @@ CopycatsHouse1FObject: 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 f0f544ef..1dbb2dca 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -5,14 +5,12 @@ FanClubObject: 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/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index bcca4004..f4bb842b 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -33,7 +33,7 @@ FuchsiaCityObject: object SPRITE_GAMBLER, $1c, $11, WALK, $2, $2 ; person object SPRITE_FISHER2, $1e, $e, STAY, DOWN, $3 ; person object SPRITE_BUG_CATCHER, $18, $8, STAY, UP, $4 ; person - object SPRITE_CLEFAIRY, $1f, $5, WALK, $0, $5 ; person + object SPRITE_CHANSEY, $1f, $5, STAY, DOWN, $5 ; person object SPRITE_BALL, $19, $6, STAY, NONE, $6 ; person object SPRITE_SLOWBRO, $c, $6, WALK, $2, $7 ; person object SPRITE_SLOWBRO, $1e, $c, WALK, $2, $8 ; person diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index 023c23d3..86f62d21 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -8,7 +8,7 @@ FuchsiaGymObject: 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 8cf103fa..bf9abe99 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -7,11 +7,12 @@ FuchsiaPokecenterObject: 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 13438153..dbeaa85b 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -8,12 +8,13 @@ IndigoPlateauLobbyObject: 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 617e7fb8..f98cede4 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -7,11 +7,12 @@ LavenderPokecenterObject: 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/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index 7fe29180..43891ec3 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -9,16 +9,17 @@ MtMoon3Object: db $0 ; signs - db $9 ; objects + db $a ; objects object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, OPP_SUPER_NERD, $2 - object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, OPP_ROCKET, $1 + object SPRITE_JESSIE, $9, $3, STAY, LEFT, $2 object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, OPP_ROCKET, $2 object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, OPP_ROCKET, $3 - object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $4 - object SPRITE_OMANYTE, $c, $6, STAY, NONE, $6 ; person - object SPRITE_OMANYTE, $d, $6, STAY, NONE, $7 ; person - object SPRITE_BALL, $19, $15, STAY, NONE, $8, HP_UP - object SPRITE_BALL, $1d, $5, STAY, NONE, $9, TM_01 + object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $1 + object SPRITE_JAMES, $9, $4, STAY, LEFT, $6 + object SPRITE_OMANYTE, $c, $6, STAY, NONE, $7 ; person + object SPRITE_OMANYTE, $d, $6, STAY, NONE, $8 ; person + object SPRITE_BALL, $19, $15, STAY, NONE, $9, HP_UP + object SPRITE_BALL, $1d, $5, STAY, NONE, $a, TM_01 ; warp-to EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2 diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index 1e168895..d1ac34fb 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -7,13 +7,14 @@ MtMoonPokecenterObject: db $0 ; signs - db $6 ; objects + db $7 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_BUG_CATCHER, $4, $3, STAY, UP, $2 ; person object SPRITE_GENTLEMAN, $7, $3, STAY, UP, $3 ; person object SPRITE_FAT_BALD_GUY, $a, $6, WALK, $2, $4 ; person object SPRITE_CLIPBOARD, $7, $2, STAY, NONE, $5 ; person object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $6 ; person + object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $7 ; person ; warp-to EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 3834c49a..1efb1e72 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -7,18 +7,16 @@ OaksLabObject: db $0 ; signs - db $b ; objects + db $9 ; objects object SPRITE_BLUE, $4, $3, STAY, NONE, $1, OPP_SONY1, $1 - object SPRITE_BALL, $6, $3, STAY, NONE, $2 ; person - object SPRITE_BALL, $7, $3, STAY, NONE, $3 ; person - object SPRITE_BALL, $8, $3, STAY, NONE, $4 ; person - object SPRITE_OAK, $5, $2, STAY, DOWN, $5 ; person - object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $6 ; person - object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $7 ; person - object SPRITE_OAK, $5, $a, STAY, UP, $8 ; person - object SPRITE_GIRL, $1, $9, WALK, $1, $9 ; person - object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $a ; person - object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $b ; person + object SPRITE_BALL, $7, $3, STAY, NONE, $2 ; person + object SPRITE_OAK, $5, $2, STAY, DOWN, $3 ; person + object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $4 ; person + object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $5 ; person + object SPRITE_OAK, $5, $a, STAY, UP, $6 ; person + object SPRITE_GIRL, $1, $9, WALK, $1, $7 ; person + object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $8 ; person + object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $9 ; person ; warp-to EVENT_DISP OAKS_LAB_WIDTH, $b, $4 diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index d02cbae2..e22f79a6 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -13,7 +13,7 @@ PalletTownObject: db $5, $b, $7 ; PalletTownText7 db $3 ; objects - object SPRITE_OAK, $8, $5, STAY, NONE, $1 ; person + object SPRITE_OAK, $a, $4, STAY, NONE, $1 ; person object SPRITE_GIRL, $3, $8, WALK, $0, $2 ; person object SPRITE_FISHER2, $b, $e, WALK, $0, $3 ; person diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index 44e10ed6..4c7444bb 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -7,11 +7,13 @@ PewterPokecenterObject: db $0 ; signs - db $4 ; objects + db $6 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_GENTLEMAN, $b, $7, STAY, LEFT, $2 ; person - object SPRITE_CLEFAIRY, $1, $3, STAY, DOWN, $3 ; person + object SPRITE_JIGGLYPUFF, $1, $3, STAY, DOWN, $3 ; person object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + object SPRITE_LASS, $4, $3, STAY, UP, $5 ; person + object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $6 ; person ; warp-to EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index 6ee1e8fd..76435c04 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -6,11 +6,10 @@ PokemonTower7Object: db $0 ; signs - db 4 ; objects - object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, OPP_ROCKET, $13 - object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, OPP_ROCKET, $14 - object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, OPP_ROCKET, $15 - object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person + 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 b4e98d04..42e58b23 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -10,8 +10,8 @@ RocketHideout4Object: 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/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index 90efc3ea..06a2e39d 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -7,11 +7,12 @@ RockTunnelPokecenterObject: 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_FISHER2, $2, $5, 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 ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 0c7828f2..8b6b5d3f 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -3,9 +3,9 @@ Route11Object: db $5 ; warps db $8, $31, $0, ROUTE_11_GATE_1F - db $9, $31, $1, ROUTE_11_GATE_1F + db $9, $31, $0, ROUTE_11_GATE_1F db $8, $3a, $2, ROUTE_11_GATE_1F - db $9, $3a, $3, ROUTE_11_GATE_1F + db $9, $3a, $2, ROUTE_11_GATE_1F db $5, $4, $0, DIGLETTS_CAVE_ENTRANCE db $1 ; signs diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index dd461e6c..2dc7f9e7 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -3,7 +3,7 @@ Route12Object: db $4 ; warps db $f, $a, $0, ROUTE_12_GATE_1F - db $f, $b, $1, ROUTE_12_GATE_1F + db $f, $b, $0, ROUTE_12_GATE_1F db $15, $a, $2, ROUTE_12_GATE_1F db $4d, $b, $0, ROUTE_12_HOUSE diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 1d83b20d..30fc39c4 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -3,9 +3,9 @@ Route15Object: db $4 ; warps db $8, $7, $0, ROUTE_15_GATE_1F - db $9, $7, $1, ROUTE_15_GATE_1F + db $9, $7, $0, ROUTE_15_GATE_1F db $8, $e, $2, ROUTE_15_GATE_1F - db $9, $e, $3, ROUTE_15_GATE_1F + db $9, $e, $2, ROUTE_15_GATE_1F db $1 ; signs db $9, $27, $c ; Route15Text12 diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index a342d106..b7da1dbb 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -3,13 +3,13 @@ Route16Object: db $9 ; warps db $a, $11, $0, ROUTE_16_GATE_1F - db $b, $11, $1, ROUTE_16_GATE_1F + db $b, $11, $0, ROUTE_16_GATE_1F db $a, $18, $2, ROUTE_16_GATE_1F - db $b, $18, $3, ROUTE_16_GATE_1F + db $b, $18, $2, ROUTE_16_GATE_1F db $4, $11, $4, ROUTE_16_GATE_1F - db $5, $11, $5, ROUTE_16_GATE_1F + db $5, $11, $4, ROUTE_16_GATE_1F db $4, $18, $6, ROUTE_16_GATE_1F - db $5, $18, $7, ROUTE_16_GATE_1F + db $5, $18, $6, ROUTE_16_GATE_1F db $5, $7, $0, ROUTE_16_HOUSE db $2 ; signs diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index 8b36ab7c..41b971b0 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -3,9 +3,9 @@ Route18Object: db $4 ; warps db $8, $21, $0, ROUTE_18_GATE_1F - db $9, $21, $1, ROUTE_18_GATE_1F + db $9, $21, $0, ROUTE_18_GATE_1F db $8, $28, $2, ROUTE_18_GATE_1F - db $9, $28, $3, ROUTE_18_GATE_1F + db $9, $28, $2, ROUTE_18_GATE_1F db $2 ; signs db $7, $2b, $4 ; Route18Text4 diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index 671b3215..1ad911e8 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -9,7 +9,7 @@ Route18GateUpstairsObject: 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/route19.asm b/data/mapObjects/route19.asm index 956caa6e..0f963cfd 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,21 +1,24 @@ Route19Object: db $43 ; border block - db $0 ; warps + db $1 ; warps + db $9, $5, $0, BEACH_HOUSE db $1 ; signs - db $9, $b, $b ; Route19Text11 + db $b,$b,$b db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, OPP_SWIMMER, 2 - object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, OPP_SWIMMER, 3 - object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4 - object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5 - object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6 - object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, OPP_SWIMMER, $7 - object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c - object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d - object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8 - object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e + + object SPRITE_BLACK_HAIR_BOY_1, $09, $07, STAY, RIGHT, $1, OPP_SWIMMER, $2 + object SPRITE_BLACK_HAIR_BOY_1, $0c, $09, STAY, LEFT, $2, OPP_SWIMMER, $3 + object SPRITE_SWIMMER, $0d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4 + object SPRITE_SWIMMER, $04, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5 + object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6 + object SPRITE_SWIMMER, $09, $0d, STAY, DOWN, $6, OPP_SWIMMER, $7 + object SPRITE_SWIMMER, $08, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c + object SPRITE_SWIMMER, $0b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d + object SPRITE_SWIMMER, $09, $2a, STAY, UP, $9, OPP_SWIMMER, $8 + object SPRITE_SWIMMER, $0a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e ; warp-to + EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index 7db8fe09..a8b0a7a5 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -1,13 +1,14 @@ Route2Object: db $f ; border block - db $6 ; warps + db $7 ; warps db $9, $c, $0, DIGLETTS_CAVE_EXIT db $b, $3, $1, VIRIDIAN_FOREST_EXIT db $13, $f, $0, ROUTE_2_HOUSE db $23, $10, $1, ROUTE_2_GATE db $27, $f, $2, ROUTE_2_GATE db $2b, $3, $2, VIRIDIAN_FOREST_ENTRANCE + db $23, $11, $1, ROUTE_2_GATE db $2 ; signs db $41, $5, $3 ; Route2Text3 @@ -24,10 +25,12 @@ Route2Object: EVENT_DISP ROUTE_2_WIDTH, $23, $10 ; ROUTE_2_GATE EVENT_DISP ROUTE_2_WIDTH, $27, $f ; ROUTE_2_GATE EVENT_DISP ROUTE_2_WIDTH, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE + EVENT_DISP ROUTE_2_WIDTH, $23, $11 ; ROUTE_2_GATE ; unused EVENT_DISP $4, $7, $2 - db $12, $c7, $9, $7 + dw $c712 + db $9, $7 EVENT_DISP $4, $7, $2 EVENT_DISP $4, $7, $2 EVENT_DISP $4, $7, $2 diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index 2798311b..e75c4d50 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -5,7 +5,7 @@ Route22GateObject: 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/route24.asm b/data/mapObjects/route24.asm index 5af90a4b..78a4d573 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -5,7 +5,7 @@ Route24Object: db $0 ; signs - db $8 ; objects + db $9 ; objects object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6 object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR_TRAINER_M, $2 object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR_TRAINER_M, $3 @@ -14,3 +14,4 @@ Route24Object: object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8 object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, OPP_BUG_CATCHER, $9 object SPRITE_BALL, $a, $5, STAY, NONE, $8, TM_45 + object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9 diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index d6665020..7d1d224d 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -9,7 +9,7 @@ Route2HouseObject: db $2 ; objects object SPRITE_OAK_AIDE, $2, $4, STAY, RIGHT, $1 ; person - object SPRITE_GAMEBOY_KID_COPY, $4, $1, STAY, DOWN, $2 ; person + object SPRITE_GAMEBOY_KID, $4, $1, STAY, DOWN, $2 ; person ; warp-to EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index 6065f599..eefcaa92 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -2,7 +2,7 @@ Route5Object: db $a ; border block db $5 ; warps - db $1d, $a, $3, ROUTE_5_GATE + db $1d, $a, $2, ROUTE_5_GATE db $1d, $9, $2, ROUTE_5_GATE db $21, $a, $0, ROUTE_5_GATE db $1b, $11, $0, PATH_ENTRANCE_ROUTE_5 diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index bfd88fac..6ab90621 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -11,8 +11,8 @@ Route6Object: db $f, $13, $7 ; Route6Text7 db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4 - object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $2 + object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $a + object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $19 object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR_TRAINER_M, $5 object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR_TRAINER_F, $3 diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index d039cb3c..3f753830 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -3,9 +3,9 @@ Route7Object: db $5 ; warps db $9, $12, $2, ROUTE_7_GATE - db $a, $12, $3, ROUTE_7_GATE + db $a, $12, $2, ROUTE_7_GATE db $9, $b, $0, ROUTE_7_GATE - db $a, $b, $1, ROUTE_7_GATE + db $a, $b, $0, ROUTE_7_GATE db $d, $5, $0, PATH_ENTRANCE_ROUTE_7 db $1 ; signs diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 3aea6a88..8f65891b 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -4,7 +4,7 @@ Route7GateObject: db $4 ; warps db $3, $0, $3, $ff db $4, $0, $3, $ff - db $3, $5, $0, $ff + db $3, $5, $1, $ff db $4, $5, $1, $ff db $0 ; signs diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 8aa16b82..8f336e03 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -3,9 +3,9 @@ Route8Object: db $5 ; warps db $9, $1, $0, ROUTE_8_GATE - db $a, $1, $1, ROUTE_8_GATE + db $a, $1, $0, ROUTE_8_GATE db $9, $8, $2, ROUTE_8_GATE - db $a, $8, $3, ROUTE_8_GATE + db $a, $8, $2, ROUTE_8_GATE db $3, $d, $0, PATH_ENTRANCE_ROUTE_8 db $1 ; signs diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index b059fb36..a3e21618 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -2,9 +2,9 @@ Route8GateObject: db $a ; border block db $4 ; warps - db $3, $0, $0, $ff + db $3, $0, $1, $ff db $4, $0, $1, $ff - db $3, $5, $2, $ff + db $3, $5, $3, $ff db $4, $5, $3, $ff db $0 ; signs diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 9e079eab..cdfd801c 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -8,7 +8,7 @@ Route9Object: db $a ; objects object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5 - object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR_TRAINER_M, $7 + object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_YOUNGSTER, $e object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR_TRAINER_M, $8 object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $6 object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 7275800a..730d8be5 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -23,7 +23,7 @@ SaffronCityObject: db $1d, $1b, $18 ; SaffronCityText24 db $13, $1, $19 ; SaffronCityText25 - db $f ; objects + db $e ; objects object SPRITE_ROCKET, $7, $6, STAY, NONE, $1 ; person object SPRITE_ROCKET, $14, $8, WALK, $2, $2 ; person object SPRITE_ROCKET, $22, $4, STAY, NONE, $3 ; person @@ -38,7 +38,6 @@ SaffronCityObject: object SPRITE_BIRD, $1f, $c, STAY, DOWN, $c ; person object SPRITE_ROCKER, $12, $8, STAY, UP, $d ; person object SPRITE_ROCKET, $12, $16, STAY, DOWN, $e ; person - object SPRITE_ROCKET, $13, $16, STAY, DOWN, $f ; person ; warp-to EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 6a770fdc..629ab760 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -38,7 +38,7 @@ SaffronGymObject: 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 896b550a..b82be083 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -7,11 +7,12 @@ SaffronPokecenterObject: 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/school.asm b/data/mapObjects/school.asm index 53f7fc00..3fe629da 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -7,9 +7,10 @@ SchoolObject: db $0 ; signs - db $2 ; objects + db $3 ; objects object SPRITE_BRUNETTE_GIRL, $3, $5, STAY, UP, $1 ; person object SPRITE_LASS, $4, $1, STAY, DOWN, $2 ; person + object SPRITE_LITTLE_GIRL, $4, $5, STAY, UP, $3 ; person ; warp-to EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2 diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index 4f7f7a8e..eaa9036e 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -24,7 +24,3 @@ SeafoamIslands1Object: 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/silphco11.asm b/data/mapObjects/silphco11.asm index 95712629..a1bb5d81 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -9,12 +9,13 @@ SilphCo11Object: db $0 ; signs - db $5 ; objects + db $6 ; objects object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, OPP_GIOVANNI, $2 - object SPRITE_ROCKET, $3, $10, STAY, UP, $4, OPP_ROCKET, $29 + object SPRITE_JAMES, $2, $8, STAY, UP, $4 object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28 + object SPRITE_JESSIE, $3, $8, STAY, UP, $6 ; warp-to EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index 37c8cf61..0d1ea2f3 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -19,7 +19,7 @@ SSAnne8Object: 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/tradecenter.asm b/data/mapObjects/tradecenter.asm index f482fc4f..f482fc4f 100755..100644 --- a/data/mapObjects/tradecenter.asm +++ b/data/mapObjects/tradecenter.asm diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index e0393f2e..5348dab8 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -14,10 +14,11 @@ UnknownDungeon1Object: db $0 ; signs - db $3 ; objects - object SPRITE_BALL, $7, $d, STAY, NONE, $1, FULL_RESTORE - object SPRITE_BALL, $13, $3, STAY, NONE, $2, MAX_ELIXER - object SPRITE_BALL, $5, $0, STAY, NONE, $3, NUGGET + db $4 ; objects + object SPRITE_BALL, $1d, $10, STAY, NONE, $1, RARE_CANDY + object SPRITE_BALL, $7, $b, STAY, NONE, $2, MAX_ELIXER + object SPRITE_BALL, $1d, $9, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $12, $3, STAY, NONE, $4, ULTRA_BALL ; warp-to EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18 diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index e1a443bb..8e696462 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -11,10 +11,11 @@ UnknownDungeon2Object: db $0 ; signs - db $3 ; objects - object SPRITE_BALL, $1d, $9, STAY, NONE, $1, PP_UP - object SPRITE_BALL, $4, $f, STAY, NONE, $2, ULTRA_BALL - object SPRITE_BALL, $d, $6, STAY, NONE, $3, FULL_RESTORE + db $4 ; objects + object SPRITE_BALL, $0, $b, STAY, NONE, $1, RARE_CANDY + object SPRITE_BALL, $10, $7, STAY, NONE, $2, ULTRA_BALL + object SPRITE_BALL, $13, $b, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $1b, $9, STAY, NONE, $4, FULL_RESTORE ; warp-to EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index 84fe5e5d..18439368 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -6,10 +6,12 @@ UnknownDungeon3Object: db $0 ; signs - db $3 ; objects + db $5 ; objects object SPRITE_SLOWBRO, $1b, $d, STAY, DOWN, $1, MEWTWO, 70 - object SPRITE_BALL, $10, $9, STAY, NONE, $2, ULTRA_BALL - object SPRITE_BALL, $12, $1, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $1a, $1, STAY, NONE, $2, ULTRA_BALL + object SPRITE_BALL, $2, $d, STAY, NONE, $3, ULTRA_BALL + object SPRITE_BALL, $3, $d, STAY, NONE, $4, MAX_REVIVE + object SPRITE_BALL, $f, $3, STAY, NONE, $5, MAX_ELIXER ; warp-to EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index 8f64e894..8342a2a6 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -13,21 +13,22 @@ VermilionCityObject: db $3, $7, $0, VERMILION_HOUSE_2 db $7 ; signs - db $3, $1b, $7 ; VermilionCityText7 - db $d, $25, $8 ; VermilionCityText8 - db $d, $18, $9 ; MartSignText - db $3, $c, $a ; PokeCenterSignText - db $d, $7, $b ; VermilionCityText11 - db $13, $7, $c ; VermilionCityText12 - db $f, $1d, $d ; VermilionCityText13 + db $3, $1b, $8 ; VermilionCityText7 + db $d, $25, $9 ; VermilionCityText8 + db $d, $18, $a ; MartSignText + db $3, $c, $b ; PokeCenterSignText + db $d, $7, $c ; VermilionCityText11 + db $13, $7, $d ; VermilionCityText12 + db $f, $1d, $e ; VermilionCityText13 - db $6 ; objects - object SPRITE_FOULARD_WOMAN, $13, $7, WALK, $2, $1 ; person + db $7 ; objects + object SPRITE_LASS, $13, $7, WALK, $2, $1 ; person object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person object SPRITE_SAILOR, $13, $1e, STAY, UP, $3 ; person object SPRITE_GAMBLER, $1e, $7, STAY, NONE, $4 ; person object SPRITE_SLOWBRO, $1d, $9, WALK, $1, $5 ; person object SPRITE_SAILOR, $19, $1b, WALK, $2, $6 ; person + object SPRITE_OFFICER_JENNY, $13, $f, STAY, NONE, $7 ; person ; warp-to EVENT_DISP VERMILION_CITY_WIDTH, $3, $b ; VERMILION_POKECENTER diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index 2b8e007b..3d269364 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/vermilionhouse3.asm @@ -8,7 +8,7 @@ VermilionHouse3Object: 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 727af039..1440531f 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/vermilionpokecenter.asm @@ -7,11 +7,12 @@ VermilionPokecenterObject: 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 diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index ca40cc4f..465d53bc 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -9,14 +9,14 @@ ViridianCityObject: db $7, $20, $0, VIRIDIAN_GYM db $6 ; signs - db $11, $11, $8 ; ViridianCityText8 - db $1, $13, $9 ; ViridianCityText9 - db $1d, $15, $a ; ViridianCityText10 - db $13, $1e, $b ; MartSignText - db $19, $18, $c ; PokeCenterSignText - db $7, $1b, $d ; ViridianCityText13 + db $11, $11, $9 ; ViridianCityText8 + db $1, $13, $a ; ViridianCityText9 + db $1d, $15, $b ; ViridianCityText10 + db $13, $1e, $c ; MartSignText + db $19, $18, $d ; PokeCenterSignText + db $7, $1b, $e ; ViridianCityText13 - db $7 ; objects + db $8 ; objects object SPRITE_BUG_CATCHER, $d, $14, WALK, $0, $1 ; person object SPRITE_GAMBLER, $1e, $8, STAY, NONE, $2 ; person object SPRITE_BUG_CATCHER, $1e, $19, WALK, $0, $3 ; person @@ -24,6 +24,7 @@ ViridianCityObject: object SPRITE_LYING_OLD_MAN, $12, $9, STAY, NONE, $5 ; person object SPRITE_FISHER2, $6, $17, STAY, DOWN, $6 ; person object SPRITE_GAMBLER, $11, $5, WALK, $2, $7 ; person + object SPRITE_GAMBLER, $12, $9, STAY, NONE, $8 ; warp-to EVENT_DISP VIRIDIAN_CITY_WIDTH, $19, $17 ; VIRIDIAN_POKECENTER diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 0e466a70..0bb67f82 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -3,29 +3,31 @@ ViridianForestObject: db $6 ; warps db $0, $1, $2, VIRIDIAN_FOREST_EXIT - db $0, $2, $3, VIRIDIAN_FOREST_EXIT + db $0, $2, $2, VIRIDIAN_FOREST_EXIT db $2f, $f, $1, VIRIDIAN_FOREST_ENTRANCE db $2f, $10, $1, VIRIDIAN_FOREST_ENTRANCE db $2f, $11, $1, VIRIDIAN_FOREST_ENTRANCE db $2f, $12, $1, VIRIDIAN_FOREST_ENTRANCE db $6 ; signs - db $28, $18, $9 ; ViridianForestText9 - db $20, $10, $a ; ViridianForestText10 - db $11, $1a, $b ; ViridianForestText11 - db $18, $4, $c ; ViridianForestText12 - db $2d, $12, $d ; ViridianForestText13 - db $1, $2, $e ; ViridianForestText14 + db $28, $18, $b ; ViridianForestText9 + db $20, $10, $c ; ViridianForestText10 + db $11, $1a, $d ; ViridianForestText11 + db $18, $4, $e ; ViridianForestText12 + db $2d, $12, $f ; ViridianForestText13 + db $1, $2, $10 ; ViridianForestText14 - db $8 ; objects + db $a ; objects object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, OPP_BUG_CATCHER, $1 object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, OPP_BUG_CATCHER, $2 object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, OPP_BUG_CATCHER, $3 - object SPRITE_BALL, $19, $b, STAY, NONE, $5, ANTIDOTE - object SPRITE_BALL, $c, $1d, STAY, NONE, $6, POTION - object SPRITE_BALL, $1, $1f, STAY, NONE, $7, POKE_BALL - object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $8 ; person + object SPRITE_LASS, $2, $29, STAY, NONE, $5, OPP_LASS, $13 + object SPRITE_BUG_CATCHER, $d, $11, STAY, RIGHT, $6, OPP_BUG_CATCHER, $f + object SPRITE_BALL, $19, $b, STAY, NONE, $7, POTION + object SPRITE_BALL, $c, $1d, STAY, NONE, $8, POTION + object SPRITE_BALL, $1, $1f, STAY, NONE, $9, POKE_BALL + object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $a ; person ; warp-to EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $1 ; VIRIDIAN_FOREST_EXIT diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index 06faad72..8fe934ae 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -3,7 +3,7 @@ ViridianForestEntranceObject: db $4 ; warps db $0, $4, $3, VIRIDIAN_FOREST - db $0, $5, $4, VIRIDIAN_FOREST + db $0, $5, $3, VIRIDIAN_FOREST db $7, $4, $5, $ff db $7, $5, $5, $ff diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 2e96ca58..39432c17 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -7,11 +7,12 @@ ViridianPokecenterObject: db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_GENTLEMAN, $a, $5, WALK, $1, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, NONE, $3 ; person + object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, UP, $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 VIRIDIAN_POKECENTER_WIDTH, $7, $3 |