diff options
Diffstat (limited to 'data/mapObjects')
62 files changed, 193 insertions, 151 deletions
diff --git a/data/mapObjects/BeachHouse.asm b/data/mapObjects/BeachHouse.asm new file mode 100644 index 00000000..02bd8037 --- /dev/null +++ b/data/mapObjects/BeachHouse.asm @@ -0,0 +1,20 @@ +BeachHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2,7,0,-1 + warp 3,7,0,-1 + + db 4 ; signs + sign 3,0,3 + sign 7,0,4 + sign 11,0,5 + sign 13,1,6 + + db 2 ; objects + object SPRITE_FISHER, 2, 3, STAY, DOWN, 1 ; surfin' dude + object $3d, 5, 3, WALK, $01, 2 ; pikachu + + ; warp-to + warp_to 2,7, BEACH_HOUSE_WIDTH + warp_to 3,7, BEACH_HOUSE_WIDTH diff --git a/data/mapObjects/BluesHouse.asm b/data/mapObjects/BluesHouse.asm index 45ca1286..24c5baab 100755 --- a/data/mapObjects/BluesHouse.asm +++ b/data/mapObjects/BluesHouse.asm @@ -8,7 +8,7 @@ BluesHouse_Object: db 0 ; signs db 3 ; objects - object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map + object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1, 0 ; 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 diff --git a/data/mapObjects/CeladonMart3F.asm b/data/mapObjects/CeladonMart3F.asm index 6dfce535..6c6adfd4 100755 --- a/data/mapObjects/CeladonMart3F.asm +++ b/data/mapObjects/CeladonMart3F.asm @@ -22,9 +22,9 @@ CeladonMart3F_Object: db 5 ; objects object SPRITE_MART_GUY, 16, 5, STAY, NONE, 1 ; person - object SPRITE_GAMEBOY_KID_COPY, 11, 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, 11, 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 da5d595f..91698e34 100755 --- a/data/mapObjects/CeladonPokecenter.asm +++ b/data/mapObjects/CeladonPokecenter.asm @@ -7,11 +7,12 @@ CeladonPokecenter_Object: 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, 10, 5, WALK, 0, 3 ; person object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person ; warp-to warp_to 3, 7, CELADON_POKECENTER_WIDTH diff --git a/data/mapObjects/CeruleanCave1F.asm b/data/mapObjects/CeruleanCave1F.asm index f9670482..a7f72b34 100755 --- a/data/mapObjects/CeruleanCave1F.asm +++ b/data/mapObjects/CeruleanCave1F.asm @@ -14,10 +14,11 @@ CeruleanCave1F_Object: db 0 ; signs - db 3 ; objects - object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE - object SPRITE_BALL, 19, 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 warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH diff --git a/data/mapObjects/CeruleanCave2F.asm b/data/mapObjects/CeruleanCave2F.asm index f8312da0..9a15eef8 100755 --- a/data/mapObjects/CeruleanCave2F.asm +++ b/data/mapObjects/CeruleanCave2F.asm @@ -11,10 +11,11 @@ CeruleanCave2F_Object: db 0 ; signs - db 3 ; objects - object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP - object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL - object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE + db 4 ; objects + object SPRITE_BALL, 0, 11, STAY, NONE, 1, RARE_CANDY + object SPRITE_BALL, 16, 7, STAY, NONE, 2, ULTRA_BALL + object SPRITE_BALL, 19, 11, STAY, NONE, 3, MAX_REVIVE + object SPRITE_BALL, 27, 9, STAY, NONE, 4, FULL_RESTORE ; warp-to warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/mapObjects/CeruleanCaveB1F.asm b/data/mapObjects/CeruleanCaveB1F.asm index 461f77aa..193d674b 100755 --- a/data/mapObjects/CeruleanCaveB1F.asm +++ b/data/mapObjects/CeruleanCaveB1F.asm @@ -6,10 +6,12 @@ CeruleanCaveB1F_Object: db 0 ; signs - db 3 ; objects + db 5 ; objects object SPRITE_SLOWBRO, 27, 13, STAY, DOWN, 1, MEWTWO, 70 - object SPRITE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL - object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE + object SPRITE_BALL, 26, 1, STAY, NONE, 2, ULTRA_BALL + object SPRITE_BALL, 2, 13, STAY, NONE, 3, ULTRA_BALL + object SPRITE_BALL, 3, 13, STAY, NONE, 4, MAX_REVIVE + object SPRITE_BALL, 15, 3, STAY, NONE, 5, MAX_ELIXER ; warp-to warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/mapObjects/CeruleanCity.asm b/data/mapObjects/CeruleanCity.asm index d5adcfd7..ca05e65f 100755 --- a/data/mapObjects/CeruleanCity.asm +++ b/data/mapObjects/CeruleanCity.asm @@ -1,5 +1,5 @@ CeruleanCity_Object: - db $f ; border block + db $a ; border block db 10 ; warps warp 27, 11, 0, CERULEAN_TRASHED_HOUSE @@ -27,12 +27,12 @@ CeruleanCity_Object: object SPRITE_BLACK_HAIR_BOY_1, 31, 20, STAY, DOWN, 3 ; person object SPRITE_BLACK_HAIR_BOY_2, 15, 18, WALK, 1, 4 ; person object SPRITE_BLACK_HAIR_BOY_2, 9, 21, WALK, 2, 5 ; person - object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person + object SPRITE_OFFICER_JENNY, 28, 12, STAY, DOWN, 6 ; person object SPRITE_LASS, 29, 26, STAY, LEFT, 7 ; person - object SPRITE_SLOWBRO, 28, 26, STAY, DOWN, 8 ; person + object SPRITE_BALL, 28, 26, STAY, DOWN, 8 ; person object SPRITE_LASS, 9, 27, WALK, 2, 9 ; person object SPRITE_BLACK_HAIR_BOY_2, 4, 12, STAY, DOWN, 10 ; person - object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person + object SPRITE_OFFICER_JENNY, 27, 12, STAY, DOWN, 11 ; person ; warp-to warp_to 27, 11, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE diff --git a/data/mapObjects/CeruleanPokecenter.asm b/data/mapObjects/CeruleanPokecenter.asm index f65db52c..78b2330e 100755 --- a/data/mapObjects/CeruleanPokecenter.asm +++ b/data/mapObjects/CeruleanPokecenter.asm @@ -7,11 +7,12 @@ CeruleanPokecenter_Object: db 0 ; signs - db 4 ; objects + db 5 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_BLACK_HAIR_BOY_2, 10, 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, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person ; warp-to warp_to 3, 7, CERULEAN_POKECENTER_WIDTH diff --git a/data/mapObjects/CeruleanTradeHouse.asm b/data/mapObjects/CeruleanTradeHouse.asm index a4a46e9b..e51f9544 100755 --- a/data/mapObjects/CeruleanTradeHouse.asm +++ b/data/mapObjects/CeruleanTradeHouse.asm @@ -7,9 +7,11 @@ CeruleanTradeHouse_Object: 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 warp_to 2, 7, CERULEAN_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/CinnabarGym.asm b/data/mapObjects/CinnabarGym.asm index ab204d43..1a6e96cd 100755 --- a/data/mapObjects/CinnabarGym.asm +++ b/data/mapObjects/CinnabarGym.asm @@ -8,7 +8,7 @@ CinnabarGym_Object: 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, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9 object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4 object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10 diff --git a/data/mapObjects/CinnabarPokecenter.asm b/data/mapObjects/CinnabarPokecenter.asm index 9583ef2a..3c9efb34 100755 --- a/data/mapObjects/CinnabarPokecenter.asm +++ b/data/mapObjects/CinnabarPokecenter.asm @@ -7,11 +7,12 @@ CinnabarPokecenter_Object: 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, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person ; warp-to warp_to 3, 7, CINNABAR_POKECENTER_WIDTH diff --git a/data/mapObjects/Colosseum.asm b/data/mapObjects/Colosseum.asm index 18762584..18762584 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 cb4dbb0b..8bde12fe 100755 --- a/data/mapObjects/CopycatsHouse1F.asm +++ b/data/mapObjects/CopycatsHouse1F.asm @@ -11,7 +11,7 @@ CopycatsHouse1F_Object: 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 warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH diff --git a/data/mapObjects/FuchsiaCity.asm b/data/mapObjects/FuchsiaCity.asm index 09c97b02..0368905c 100755 --- a/data/mapObjects/FuchsiaCity.asm +++ b/data/mapObjects/FuchsiaCity.asm @@ -33,7 +33,7 @@ FuchsiaCity_Object: object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person object SPRITE_FISHER2, 30, 14, STAY, DOWN, 3 ; person object SPRITE_BUG_CATCHER, 24, 8, STAY, UP, 4 ; person - object SPRITE_CLEFAIRY, 31, 5, WALK, 0, 5 ; person + object SPRITE_CHANSEY, 31, 5, STAY, DOWN, 5 ; person object SPRITE_BALL, 25, 6, STAY, NONE, 6 ; person object SPRITE_SLOWBRO, 12, 6, WALK, 2, 7 ; person object SPRITE_SLOWBRO, 30, 12, WALK, 2, 8 ; person diff --git a/data/mapObjects/FuchsiaGym.asm b/data/mapObjects/FuchsiaGym.asm index 5d707d53..4e717086 100755 --- a/data/mapObjects/FuchsiaGym.asm +++ b/data/mapObjects/FuchsiaGym.asm @@ -8,7 +8,7 @@ FuchsiaGym_Object: db 0 ; signs db 8 ; objects - object SPRITE_BLACKBELT, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 + object SPRITE_LAPRAS_GIVER, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7 object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3 object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8 diff --git a/data/mapObjects/FuchsiaPokecenter.asm b/data/mapObjects/FuchsiaPokecenter.asm index 73dc529d..b0056acd 100755 --- a/data/mapObjects/FuchsiaPokecenter.asm +++ b/data/mapObjects/FuchsiaPokecenter.asm @@ -7,11 +7,12 @@ FuchsiaPokecenter_Object: 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, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person ; warp-to warp_to 3, 7, FUCHSIA_POKECENTER_WIDTH diff --git a/data/mapObjects/GameCorner.asm b/data/mapObjects/GameCorner.asm index 2704f6ab..afac025e 100755 --- a/data/mapObjects/GameCorner.asm +++ b/data/mapObjects/GameCorner.asm @@ -18,8 +18,8 @@ GameCorner_Object: object SPRITE_MOM_GEISHA, 8, 11, STAY, LEFT, 6 ; person object SPRITE_GYM_HELPER, 8, 14, STAY, LEFT, 7 ; person object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person - object SPRITE_MART_GUY, 14, 11, STAY, LEFT, 9 ; person - object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person + object SPRITE_FAT_BALD_GUY, 14, 11, STAY, LEFT, 9 ; person + object SPRITE_FISHER, 17, 13, STAY, RIGHT, 10 ; person object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7 ; warp-to diff --git a/data/mapObjects/IndigoPlateauLobby.asm b/data/mapObjects/IndigoPlateauLobby.asm index ea113a16..d7de23a7 100755 --- a/data/mapObjects/IndigoPlateauLobby.asm +++ b/data/mapObjects/IndigoPlateauLobby.asm @@ -8,12 +8,13 @@ IndigoPlateauLobby_Object: 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, 13, 6, STAY, DOWN, 5 ; person + object SPRITE_CHANSEY, 8, 5, STAY, DOWN, 6 ; person ; warp-to warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH diff --git a/data/mapObjects/LavenderPokecenter.asm b/data/mapObjects/LavenderPokecenter.asm index 89e25571..6e38a8e9 100755 --- a/data/mapObjects/LavenderPokecenter.asm +++ b/data/mapObjects/LavenderPokecenter.asm @@ -7,11 +7,12 @@ LavenderPokecenter_Object: 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, 10, 5, WALK, 2, 3 ; person object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person ; warp-to warp_to 3, 7, LAVENDER_POKECENTER_WIDTH diff --git a/data/mapObjects/MtMoonB2F.asm b/data/mapObjects/MtMoonB2F.asm index 27b2383f..a4c9869a 100755 --- a/data/mapObjects/MtMoonB2F.asm +++ b/data/mapObjects/MtMoonB2F.asm @@ -9,16 +9,17 @@ MtMoonB2F_Object: db 0 ; signs - db 9 ; objects + db 10 ; objects object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 - object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1 + object SPRITE_JESSIE, 9, 3, STAY, LEFT, 2 object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2 object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3 - object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4 - object SPRITE_OMANYTE, 12, 6, STAY, NONE, 6 ; person - object SPRITE_OMANYTE, 13, 6, STAY, NONE, 7 ; person - object SPRITE_BALL, 25, 21, STAY, NONE, 8, HP_UP - object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_01 + object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 1 + object SPRITE_JAMES, 9, 4, STAY, LEFT, 6 + object SPRITE_OMANYTE, 12, 6, STAY, NONE, 7 ; person + object SPRITE_OMANYTE, 13, 6, STAY, NONE, 8 ; person + object SPRITE_BALL, 25, 21, STAY, NONE, 9, HP_UP + object SPRITE_BALL, 29, 5, STAY, NONE, 10, TM_01 ; warp-to warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/MtMoonPokecenter.asm b/data/mapObjects/MtMoonPokecenter.asm index b23703e6..1027f88a 100755 --- a/data/mapObjects/MtMoonPokecenter.asm +++ b/data/mapObjects/MtMoonPokecenter.asm @@ -7,13 +7,14 @@ MtMoonPokecenter_Object: 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, 10, 6, WALK, 2, 4 ; person object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 6 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 7 ; person ; warp-to warp_to 3, 7, MT_MOON_POKECENTER_WIDTH diff --git a/data/mapObjects/OaksLab.asm b/data/mapObjects/OaksLab.asm index fa78ccdf..cf48bec9 100755 --- a/data/mapObjects/OaksLab.asm +++ b/data/mapObjects/OaksLab.asm @@ -7,18 +7,16 @@ OaksLab_Object: db 0 ; signs - db 11 ; 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, 10, STAY, UP, 8 ; person - object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person - object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 10 ; person - object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 11 ; 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, 10, STAY, UP, 6 ; person + object SPRITE_GIRL, 1, 9, WALK, 1, 7 ; person + object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 8 ; person + object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 9 ; person ; warp-to warp_to 4, 11, OAKS_LAB_WIDTH diff --git a/data/mapObjects/PalletTown.asm b/data/mapObjects/PalletTown.asm index 68b01175..93807688 100755 --- a/data/mapObjects/PalletTown.asm +++ b/data/mapObjects/PalletTown.asm @@ -13,7 +13,7 @@ PalletTown_Object: sign 11, 5, 7 ; PalletTownText7 db 3 ; objects - object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person + object SPRITE_OAK, 10, 4, STAY, NONE, 1 ; person object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person object SPRITE_FISHER2, 11, 14, WALK, 0, 3 ; person diff --git a/data/mapObjects/PewterPokecenter.asm b/data/mapObjects/PewterPokecenter.asm index 2b375bf9..4d460747 100755 --- a/data/mapObjects/PewterPokecenter.asm +++ b/data/mapObjects/PewterPokecenter.asm @@ -7,11 +7,13 @@ PewterPokecenter_Object: db 0 ; signs - db 4 ; objects + db 6 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_GENTLEMAN, 11, 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, 11, 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 warp_to 3, 7, PEWTER_POKECENTER_WIDTH diff --git a/data/mapObjects/PokemonFanClub.asm b/data/mapObjects/PokemonFanClub.asm index e1f175f0..588ebdc2 100755 --- a/data/mapObjects/PokemonFanClub.asm +++ b/data/mapObjects/PokemonFanClub.asm @@ -5,14 +5,12 @@ PokemonFanClub_Object: warp 2, 7, 1, -1 warp 3, 7, 1, -1 - db 2 ; signs - sign 1, 0, 7 ; FanClubText7 - sign 6, 0, 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/PokemonTower7F.asm b/data/mapObjects/PokemonTower7F.asm index 79cb5b0d..ccd4f23c 100755 --- a/data/mapObjects/PokemonTower7F.asm +++ b/data/mapObjects/PokemonTower7F.asm @@ -6,11 +6,10 @@ PokemonTower7F_Object: db 0 ; signs - db 4 ; objects - object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19 - object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20 - object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21 - object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person + db 3 ; objects + object SPRITE_JESSIE, 10, 8, STAY, DOWN, 1 + object SPRITE_JAMES, 11, 8, STAY, DOWN, 2 + object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 3 ; warp-to warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F diff --git a/data/mapObjects/RockTunnelPokecenter.asm b/data/mapObjects/RockTunnelPokecenter.asm index a7619f7f..dfd08017 100755 --- a/data/mapObjects/RockTunnelPokecenter.asm +++ b/data/mapObjects/RockTunnelPokecenter.asm @@ -7,11 +7,12 @@ RockTunnelPokecenter_Object: 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, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person ; warp-to warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH diff --git a/data/mapObjects/RocketHideoutB4F.asm b/data/mapObjects/RocketHideoutB4F.asm index be353f25..ba746951 100755 --- a/data/mapObjects/RocketHideoutB4F.asm +++ b/data/mapObjects/RocketHideoutB4F.asm @@ -10,8 +10,8 @@ RocketHideoutB4F_Object: db 9 ; objects object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1 - object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16 - object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17 + object SPRITE_JAMES, 25, 10, STAY, DOWN, 2 + object SPRITE_JESSIE, 24, 10, STAY, DOWN, 3 object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18 object SPRITE_BALL, 10, 12, STAY, NONE, 5, HP_UP object SPRITE_BALL, 9, 4, STAY, NONE, 6, TM_02 diff --git a/data/mapObjects/Route11.asm b/data/mapObjects/Route11.asm index 5ed232f5..a72bf347 100755 --- a/data/mapObjects/Route11.asm +++ b/data/mapObjects/Route11.asm @@ -3,9 +3,9 @@ Route11_Object: db 5 ; warps warp 49, 8, 0, ROUTE_11_GATE_1F - warp 49, 9, 1, ROUTE_11_GATE_1F + warp 49, 9, 0, ROUTE_11_GATE_1F warp 58, 8, 2, ROUTE_11_GATE_1F - warp 58, 9, 3, ROUTE_11_GATE_1F + warp 58, 9, 2, ROUTE_11_GATE_1F warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11 db 1 ; signs diff --git a/data/mapObjects/Route12.asm b/data/mapObjects/Route12.asm index a9d84cf0..8043b5db 100755 --- a/data/mapObjects/Route12.asm +++ b/data/mapObjects/Route12.asm @@ -3,7 +3,7 @@ Route12_Object: db 4 ; warps warp 10, 15, 0, ROUTE_12_GATE_1F - warp 11, 15, 1, ROUTE_12_GATE_1F + warp 11, 15, 0, ROUTE_12_GATE_1F warp 10, 21, 2, ROUTE_12_GATE_1F warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE diff --git a/data/mapObjects/Route15.asm b/data/mapObjects/Route15.asm index f52cc1b8..10cd8090 100755 --- a/data/mapObjects/Route15.asm +++ b/data/mapObjects/Route15.asm @@ -3,9 +3,9 @@ Route15_Object: db 4 ; warps warp 7, 8, 0, ROUTE_15_GATE_1F - warp 7, 9, 1, ROUTE_15_GATE_1F + warp 7, 9, 0, ROUTE_15_GATE_1F warp 14, 8, 2, ROUTE_15_GATE_1F - warp 14, 9, 3, ROUTE_15_GATE_1F + warp 14, 9, 2, ROUTE_15_GATE_1F db 1 ; signs sign 39, 9, 12 ; Route15Text12 diff --git a/data/mapObjects/Route16.asm b/data/mapObjects/Route16.asm index fb23e6ca..93531d13 100755 --- a/data/mapObjects/Route16.asm +++ b/data/mapObjects/Route16.asm @@ -3,13 +3,13 @@ Route16_Object: db 9 ; warps warp 17, 10, 0, ROUTE_16_GATE_1F - warp 17, 11, 1, ROUTE_16_GATE_1F + warp 17, 11, 0, ROUTE_16_GATE_1F warp 24, 10, 2, ROUTE_16_GATE_1F - warp 24, 11, 3, ROUTE_16_GATE_1F + warp 24, 11, 2, ROUTE_16_GATE_1F warp 17, 4, 4, ROUTE_16_GATE_1F - warp 17, 5, 5, ROUTE_16_GATE_1F + warp 17, 5, 4, ROUTE_16_GATE_1F warp 24, 4, 6, ROUTE_16_GATE_1F - warp 24, 5, 7, ROUTE_16_GATE_1F + warp 24, 5, 6, ROUTE_16_GATE_1F warp 7, 5, 0, ROUTE_16_FLY_HOUSE db 2 ; signs diff --git a/data/mapObjects/Route18.asm b/data/mapObjects/Route18.asm index 8bacd6c0..dc6cc6b6 100755 --- a/data/mapObjects/Route18.asm +++ b/data/mapObjects/Route18.asm @@ -3,9 +3,9 @@ Route18_Object: db 4 ; warps warp 33, 8, 0, ROUTE_18_GATE_1F - warp 33, 9, 1, ROUTE_18_GATE_1F + warp 33, 9, 0, ROUTE_18_GATE_1F warp 40, 8, 2, ROUTE_18_GATE_1F - warp 40, 9, 3, ROUTE_18_GATE_1F + warp 40, 9, 2, ROUTE_18_GATE_1F db 2 ; signs sign 43, 7, 4 ; Route18Text4 diff --git a/data/mapObjects/Route18Gate2F.asm b/data/mapObjects/Route18Gate2F.asm index e48ec3b8..1981a7f0 100755 --- a/data/mapObjects/Route18Gate2F.asm +++ b/data/mapObjects/Route18Gate2F.asm @@ -9,7 +9,7 @@ Route18Gate2F_Object: sign 6, 2, 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 warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/Route19.asm b/data/mapObjects/Route19.asm index 9b39618e..d1b3034b 100755 --- a/data/mapObjects/Route19.asm +++ b/data/mapObjects/Route19.asm @@ -1,21 +1,23 @@ Route19_Object: db $43 ; border block - db 0 ; warps + db 1 ; warps + warp 5, 9, 0, BEACH_HOUSE db 1 ; signs - sign 11, 9, 11 ; Route19Text11 + sign 11, 11, 11 db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2 - object SPRITE_BLACK_HAIR_BOY_1, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3 + object SPRITE_BLACK_HAIR_BOY_1, 9, 7, STAY, RIGHT, 1, OPP_SWIMMER, 2 + object SPRITE_BLACK_HAIR_BOY_1, 12, 9, STAY, LEFT, 2, OPP_SWIMMER, 3 object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4 object SPRITE_SWIMMER, 4, 27, STAY, RIGHT, 4, OPP_SWIMMER, 5 object SPRITE_SWIMMER, 16, 31, STAY, UP, 5, OPP_SWIMMER, 6 - object SPRITE_SWIMMER, 9, 11, STAY, DOWN, 6, OPP_SWIMMER, 7 + object SPRITE_SWIMMER, 9, 13, STAY, DOWN, 6, OPP_SWIMMER, 7 object SPRITE_SWIMMER, 8, 43, STAY, LEFT, 7, OPP_BEAUTY, 12 object SPRITE_SWIMMER, 11, 43, STAY, RIGHT, 8, OPP_BEAUTY, 13 object SPRITE_SWIMMER, 9, 42, STAY, UP, 9, OPP_SWIMMER, 8 object SPRITE_SWIMMER, 10, 44, STAY, DOWN, 10, OPP_BEAUTY, 14 ; warp-to + warp_to 5, 9, ROUTE_19_WIDTH ; BEACH_HOUSE diff --git a/data/mapObjects/Route2.asm b/data/mapObjects/Route2.asm index b27ad199..9595fec0 100755 --- a/data/mapObjects/Route2.asm +++ b/data/mapObjects/Route2.asm @@ -1,13 +1,14 @@ Route2_Object: db $f ; border block - db 6 ; warps + db 7 ; warps warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2 warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE warp 15, 19, 0, ROUTE_2_TRADE_HOUSE warp 16, 35, 1, ROUTE_2_GATE warp 15, 39, 2, ROUTE_2_GATE warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE + warp 17, 35, 1, ROUTE_2_GATE db 2 ; signs sign 5, 65, 3 ; Route2Text3 @@ -24,10 +25,12 @@ Route2_Object: warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE + warp_to 17, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE ; unused warp_to 2, 7, 4 - db $12, $c7, $9, $7 + dw $c712 + db $9, $7 warp_to 2, 7, 4 warp_to 2, 7, 4 warp_to 2, 7, 4 diff --git a/data/mapObjects/Route22Gate.asm b/data/mapObjects/Route22Gate.asm index 3f693c7f..e59ca6cf 100755 --- a/data/mapObjects/Route22Gate.asm +++ b/data/mapObjects/Route22Gate.asm @@ -5,7 +5,7 @@ Route22Gate_Object: warp 4, 7, 0, -1 warp 5, 7, 0, -1 warp 4, 0, 0, -1 - warp 5, 0, 1, -1 + warp 5, 0, 0, -1 db 0 ; signs diff --git a/data/mapObjects/Route24.asm b/data/mapObjects/Route24.asm index 8ef0d2b9..5f41c519 100755 --- a/data/mapObjects/Route24.asm +++ b/data/mapObjects/Route24.asm @@ -5,7 +5,7 @@ Route24_Object: db 0 ; signs - db 8 ; objects + db 9 ; objects object SPRITE_BLACK_HAIR_BOY_1, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6 object SPRITE_BLACK_HAIR_BOY_1, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2 object SPRITE_BLACK_HAIR_BOY_1, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 @@ -14,3 +14,4 @@ Route24_Object: object SPRITE_LASS, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8 object SPRITE_BUG_CATCHER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 object SPRITE_BALL, 10, 5, STAY, NONE, 8, TM_45 + object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9 diff --git a/data/mapObjects/Route2TradeHouse.asm b/data/mapObjects/Route2TradeHouse.asm index 89ece3ea..29948d6b 100755 --- a/data/mapObjects/Route2TradeHouse.asm +++ b/data/mapObjects/Route2TradeHouse.asm @@ -9,7 +9,7 @@ Route2TradeHouse_Object: 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 warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/Route5.asm b/data/mapObjects/Route5.asm index df2c8c03..fd74edf6 100755 --- a/data/mapObjects/Route5.asm +++ b/data/mapObjects/Route5.asm @@ -2,7 +2,7 @@ Route5_Object: db $a ; border block db 5 ; warps - warp 10, 29, 3, ROUTE_5_GATE + warp 10, 29, 2, ROUTE_5_GATE warp 9, 29, 2, ROUTE_5_GATE warp 10, 33, 0, ROUTE_5_GATE warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5 diff --git a/data/mapObjects/Route6.asm b/data/mapObjects/Route6.asm index fc2d7e24..13825be1 100755 --- a/data/mapObjects/Route6.asm +++ b/data/mapObjects/Route6.asm @@ -11,8 +11,8 @@ Route6_Object: sign 19, 15, 7 ; Route6Text7 db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 - object SPRITE_LASS, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 + object SPRITE_BLACK_HAIR_BOY_1, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 10 + object SPRITE_LASS, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 25 object SPRITE_BUG_CATCHER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 object SPRITE_BLACK_HAIR_BOY_1, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 object SPRITE_LASS, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 diff --git a/data/mapObjects/Route7.asm b/data/mapObjects/Route7.asm index 182904ef..3da2fd4b 100755 --- a/data/mapObjects/Route7.asm +++ b/data/mapObjects/Route7.asm @@ -3,9 +3,9 @@ Route7_Object: db 5 ; warps warp 18, 9, 2, ROUTE_7_GATE - warp 18, 10, 3, ROUTE_7_GATE + warp 18, 10, 2, ROUTE_7_GATE warp 11, 9, 0, ROUTE_7_GATE - warp 11, 10, 1, ROUTE_7_GATE + warp 11, 10, 0, ROUTE_7_GATE warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7 db 1 ; signs diff --git a/data/mapObjects/Route7Gate.asm b/data/mapObjects/Route7Gate.asm index 7f1afe0a..c9dc8dca 100755 --- a/data/mapObjects/Route7Gate.asm +++ b/data/mapObjects/Route7Gate.asm @@ -4,7 +4,7 @@ Route7Gate_Object: db 4 ; warps warp 0, 3, 3, -1 warp 0, 4, 3, -1 - warp 5, 3, 0, -1 + warp 5, 3, 1, -1 warp 5, 4, 1, -1 db 0 ; signs diff --git a/data/mapObjects/Route8.asm b/data/mapObjects/Route8.asm index 137d70a0..2fc0045c 100755 --- a/data/mapObjects/Route8.asm +++ b/data/mapObjects/Route8.asm @@ -3,9 +3,9 @@ Route8_Object: db 5 ; warps warp 1, 9, 0, ROUTE_8_GATE - warp 1, 10, 1, ROUTE_8_GATE + warp 1, 10, 0, ROUTE_8_GATE warp 8, 9, 2, ROUTE_8_GATE - warp 8, 10, 3, ROUTE_8_GATE + warp 8, 10, 2, ROUTE_8_GATE warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8 db 1 ; signs diff --git a/data/mapObjects/Route8Gate.asm b/data/mapObjects/Route8Gate.asm index 3bba95a0..008a0fcb 100755 --- a/data/mapObjects/Route8Gate.asm +++ b/data/mapObjects/Route8Gate.asm @@ -2,9 +2,9 @@ Route8Gate_Object: db $a ; border block db 4 ; warps - warp 0, 3, 0, -1 + warp 0, 3, 1, -1 warp 0, 4, 1, -1 - warp 5, 3, 2, -1 + warp 5, 3, 3, -1 warp 5, 4, 3, -1 db 0 ; signs diff --git a/data/mapObjects/Route9.asm b/data/mapObjects/Route9.asm index a991c0c7..c531cf7a 100755 --- a/data/mapObjects/Route9.asm +++ b/data/mapObjects/Route9.asm @@ -8,7 +8,7 @@ Route9_Object: db 10 ; objects object SPRITE_LASS, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 - object SPRITE_BLACK_HAIR_BOY_1, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 + object SPRITE_BLACK_HAIR_BOY_1, 24, 7, STAY, LEFT, 2, OPP_YOUNGSTER, 14 object SPRITE_BLACK_HAIR_BOY_1, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 object SPRITE_LASS, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11 diff --git a/data/mapObjects/SSAnne1FRooms.asm b/data/mapObjects/SSAnne1FRooms.asm index 617d2a55..fcd36532 100755 --- a/data/mapObjects/SSAnne1FRooms.asm +++ b/data/mapObjects/SSAnne1FRooms.asm @@ -19,7 +19,7 @@ SSAnne1FRooms_Object: object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person object SPRITE_FAT_BALD_GUY, 0, 14, STAY, NONE, 6 ; person object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person - object SPRITE_CLEFAIRY, 3, 11, STAY, DOWN, 8 ; person + object SPRITE_JIGGLYPUFF, 3, 11, STAY, DOWN, 8 ; person object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person object SPRITE_BALL, 12, 15, STAY, NONE, 10, TM_08 object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person diff --git a/data/mapObjects/SaffronCity.asm b/data/mapObjects/SaffronCity.asm index b8d3a9cf..fd8ed6b1 100755 --- a/data/mapObjects/SaffronCity.asm +++ b/data/mapObjects/SaffronCity.asm @@ -23,7 +23,7 @@ SaffronCity_Object: sign 27, 29, 24 ; SaffronCityText24 sign 1, 19, 25 ; SaffronCityText25 - db 15 ; objects + db 14 ; objects object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person object SPRITE_ROCKET, 20, 8, WALK, 2, 2 ; person object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person @@ -38,7 +38,6 @@ SaffronCity_Object: object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person - object SPRITE_ROCKET, 19, 22, STAY, DOWN, 15 ; person ; warp-to warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/SaffronGym.asm b/data/mapObjects/SaffronGym.asm index 1869421a..4cb80bcd 100755 --- a/data/mapObjects/SaffronGym.asm +++ b/data/mapObjects/SaffronGym.asm @@ -38,7 +38,7 @@ SaffronGym_Object: 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, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22 object SPRITE_BUG_CATCHER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 object SPRITE_MEDIUM, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23 diff --git a/data/mapObjects/SaffronPokecenter.asm b/data/mapObjects/SaffronPokecenter.asm index e54fd76b..db28f048 100755 --- a/data/mapObjects/SaffronPokecenter.asm +++ b/data/mapObjects/SaffronPokecenter.asm @@ -7,11 +7,12 @@ SaffronPokecenter_Object: 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, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person ; warp-to warp_to 3, 7, SAFFRON_POKECENTER_WIDTH diff --git a/data/mapObjects/SeafoamIslands1F.asm b/data/mapObjects/SeafoamIslands1F.asm index 8707ee0a..67b3f0e5 100755 --- a/data/mapObjects/SeafoamIslands1F.asm +++ b/data/mapObjects/SeafoamIslands1F.asm @@ -24,7 +24,3 @@ SeafoamIslands1F_Object: warp_to 7, 5, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F warp_to 25, 3, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F warp_to 23, 15, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F - - ; holes - warp_to 17, 6, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 24, 6, SEAFOAM_ISLANDS_1F_WIDTH diff --git a/data/mapObjects/SilphCo11F.asm b/data/mapObjects/SilphCo11F.asm index 7a1dff73..ec6331b2 100755 --- a/data/mapObjects/SilphCo11F.asm +++ b/data/mapObjects/SilphCo11F.asm @@ -9,12 +9,13 @@ SilphCo11F_Object: db 0 ; signs - db 5 ; objects + db 6 ; objects object SPRITE_MR_MASTERBALL, 7, 5, STAY, DOWN, 1 ; person object SPRITE_FOULARD_WOMAN, 10, 5, STAY, DOWN, 2 ; person object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2 - object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41 + object SPRITE_JAMES, 2, 8, STAY, UP, 4 object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40 + object SPRITE_JESSIE, 3, 8, STAY, UP, 6 ; warp-to warp_to 9, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F diff --git a/data/mapObjects/TradeCenter.asm b/data/mapObjects/TradeCenter.asm index e6df8087..e6df8087 100755..100644 --- a/data/mapObjects/TradeCenter.asm +++ b/data/mapObjects/TradeCenter.asm diff --git a/data/mapObjects/VermilionCity.asm b/data/mapObjects/VermilionCity.asm index b1e1a005..646f126a 100755 --- a/data/mapObjects/VermilionCity.asm +++ b/data/mapObjects/VermilionCity.asm @@ -13,21 +13,22 @@ VermilionCity_Object: warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE db 7 ; signs - sign 27, 3, 7 ; VermilionCityText7 - sign 37, 13, 8 ; VermilionCityText8 - sign 24, 13, 9 ; MartSignText - sign 12, 3, 10 ; PokeCenterSignText - sign 7, 13, 11 ; VermilionCityText11 - sign 7, 19, 12 ; VermilionCityText12 - sign 29, 15, 13 ; VermilionCityText13 + sign 27, 3, 8 ; VermilionCityText7 + sign 37, 13, 9 ; VermilionCityText8 + sign 24, 13, 10 ; MartSignText + sign 12, 3, 11 ; PokeCenterSignText + sign 7, 13, 12 ; VermilionCityText11 + sign 7, 19, 13 ; VermilionCityText12 + sign 29, 15, 14 ; VermilionCityText13 - db 6 ; objects - object SPRITE_FOULARD_WOMAN, 19, 7, WALK, 2, 1 ; person + db 7 ; objects + object SPRITE_LASS, 19, 7, WALK, 2, 1 ; person object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person object SPRITE_SLOWBRO, 29, 9, WALK, 1, 5 ; person object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person + object SPRITE_OFFICER_JENNY, 19, 15, STAY, NONE, 7 ; person ; warp-to warp_to 11, 3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER diff --git a/data/mapObjects/VermilionPokecenter.asm b/data/mapObjects/VermilionPokecenter.asm index d2142045..a99bdf28 100755 --- a/data/mapObjects/VermilionPokecenter.asm +++ b/data/mapObjects/VermilionPokecenter.asm @@ -7,11 +7,12 @@ VermilionPokecenter_Object: db 0 ; signs - db 4 ; objects + db 5 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_FISHER, 10, 5, STAY, NONE, 2 ; person object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person ; warp-to warp_to 3, 7, VERMILION_POKECENTER_WIDTH diff --git a/data/mapObjects/VermilionTradeHouse.asm b/data/mapObjects/VermilionTradeHouse.asm index 30212b2a..fcf8a8e9 100755 --- a/data/mapObjects/VermilionTradeHouse.asm +++ b/data/mapObjects/VermilionTradeHouse.asm @@ -8,7 +8,7 @@ VermilionTradeHouse_Object: 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 warp_to 2, 7, VERMILION_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/ViridianCity.asm b/data/mapObjects/ViridianCity.asm index 32fe8d3a..9a2a554d 100755 --- a/data/mapObjects/ViridianCity.asm +++ b/data/mapObjects/ViridianCity.asm @@ -9,14 +9,14 @@ ViridianCity_Object: warp 32, 7, 0, VIRIDIAN_GYM db 6 ; signs - sign 17, 17, 8 ; ViridianCityText8 - sign 19, 1, 9 ; ViridianCityText9 - sign 21, 29, 10 ; ViridianCityText10 - sign 30, 19, 11 ; MartSignText - sign 24, 25, 12 ; PokeCenterSignText - sign 27, 7, 13 ; ViridianCityText13 + sign 17, 17, 9 ; ViridianCityText8 + sign 19, 1, 10 ; ViridianCityText9 + sign 21, 29, 11 ; ViridianCityText10 + sign 30, 19, 12 ; MartSignText + sign 24, 25, 13 ; PokeCenterSignText + sign 27, 7, 14 ; ViridianCityText13 - db 7 ; objects + db 8 ; objects object SPRITE_BUG_CATCHER, 13, 20, WALK, 0, 1 ; person object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person object SPRITE_BUG_CATCHER, 30, 25, WALK, 0, 3 ; person @@ -24,6 +24,7 @@ ViridianCity_Object: object SPRITE_LYING_OLD_MAN, 18, 9, STAY, NONE, 5 ; person object SPRITE_FISHER2, 6, 23, STAY, DOWN, 6 ; person object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person + object SPRITE_GAMBLER, 18, 9, STAY, NONE, 8 ; warp-to warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER diff --git a/data/mapObjects/ViridianForest.asm b/data/mapObjects/ViridianForest.asm index cbcb6ff8..94f74b96 100755 --- a/data/mapObjects/ViridianForest.asm +++ b/data/mapObjects/ViridianForest.asm @@ -3,29 +3,31 @@ ViridianForest_Object: db 6 ; warps warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE - warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE + warp 2, 0, 2, VIRIDIAN_FOREST_NORTH_GATE warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE db 6 ; signs - sign 24, 40, 9 ; ViridianForestText9 - sign 16, 32, 10 ; ViridianForestText10 - sign 26, 17, 11 ; ViridianForestText11 - sign 4, 24, 12 ; ViridianForestText12 - sign 18, 45, 13 ; ViridianForestText13 - sign 2, 1, 14 ; ViridianForestText14 + sign 24, 40, 11 ; ViridianForestText9 + sign 16, 32, 12 ; ViridianForestText10 + sign 26, 17, 13 ; ViridianForestText11 + sign 4, 24, 14 ; ViridianForestText12 + sign 18, 45, 15 ; ViridianForestText13 + sign 2, 1, 16 ; ViridianForestText14 - db 8 ; objects + db 10 ; objects object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 - object SPRITE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE - object SPRITE_BALL, 12, 29, STAY, NONE, 6, POTION - object SPRITE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL - object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person + object SPRITE_LASS, 2, 41, STAY, NONE, 5, OPP_LASS, 19 + object SPRITE_BUG_CATCHER, 13, 17, STAY, RIGHT, 6, OPP_BUG_CATCHER, 15 + object SPRITE_BALL, 25, 11, STAY, NONE, 7, POTION + object SPRITE_BALL, 12, 29, STAY, NONE, 8, POTION + object SPRITE_BALL, 1, 31, STAY, NONE, 9, POKE_BALL + object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 10 ; person ; warp-to warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE diff --git a/data/mapObjects/ViridianForestSouthGate.asm b/data/mapObjects/ViridianForestSouthGate.asm index 76f87e51..47432513 100755 --- a/data/mapObjects/ViridianForestSouthGate.asm +++ b/data/mapObjects/ViridianForestSouthGate.asm @@ -3,7 +3,7 @@ ViridianForestSouthGate_Object: db 4 ; warps warp 4, 0, 3, VIRIDIAN_FOREST - warp 5, 0, 4, VIRIDIAN_FOREST + warp 5, 0, 3, VIRIDIAN_FOREST warp 4, 7, 5, -1 warp 5, 7, 5, -1 diff --git a/data/mapObjects/ViridianPokecenter.asm b/data/mapObjects/ViridianPokecenter.asm index 43b73e68..70024ede 100755 --- a/data/mapObjects/ViridianPokecenter.asm +++ b/data/mapObjects/ViridianPokecenter.asm @@ -7,11 +7,12 @@ ViridianPokecenter_Object: db 0 ; signs - db 4 ; objects + db 5 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_GENTLEMAN, 10, 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, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person ; warp-to warp_to 3, 7, VIRIDIAN_POKECENTER_WIDTH diff --git a/data/mapObjects/ViridianSchoolHouse.asm b/data/mapObjects/ViridianSchoolHouse.asm index 01f2465d..29b0614c 100755 --- a/data/mapObjects/ViridianSchoolHouse.asm +++ b/data/mapObjects/ViridianSchoolHouse.asm @@ -7,9 +7,10 @@ ViridianSchoolHouse_Object: 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 warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH |