diff options
Diffstat (limited to 'data')
43 files changed, 1270 insertions, 1556 deletions
diff --git a/data/credit_mons.asm b/data/credit_mons.asm index 6a8bb416..c271db68 100755 --- a/data/credit_mons.asm +++ b/data/credit_mons.asm @@ -14,3 +14,7 @@ CreditsMons: ; 74131 (1d:4131) db VILEPLUME db NIDOKING db PARASECT + +rept 9 + db GENGAR +endr diff --git a/data/credits_order.asm b/data/credits_order.asm index 5a71a26a..e84a2a09 100755 --- a/data/credits_order.asm +++ b/data/credits_order.asm @@ -2,38 +2,37 @@ CreditsOrder: ; 74243 (1d:4243) ; subsequent credits elements will be displayed on separate lines. ; $FF, $FE, $FD, $FC, $FB, and $FA are commands that are used ; to go to the next set of credits texts. - db CRED_MON, CRED_VERSION, $FF - db CRED_DIRECTOR, CRED_TAJIRI, $FF - db CRED_PROGRAMMERS, CRED_TA_OOTA, CRED_MORIMOTO, $FD - db CRED_PROGRAMMERS, CRED_WATANABE, CRED_MASUDE, CRED_TAMADA, $FE - db CRED_CHAR_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, $FF - db CRED_MUSIC, CRED_MASUDE, $FD - db CRED_SOUND_EFFECTS, CRED_MASUDE, $FE - db CRED_GAME_DESIGN, CRED_TAJIRI, $FF - db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_FUZIWARA, $FD - db CRED_MONSTER_DESIGN, CRED_MORIMOTO, CRED_SA_OOTA, CRED_YOSHIKAWA, $FE - db CRED_GAME_SCENE, CRED_TAJIRI, $FD - db CRED_GAME_SCENE, CRED_TANIGUCHI, CRED_NONOMURA, CRED_ZINNAI, $FE - db CRED_PARAM, CRED_NISINO, CRED_TA_NAKAMURA, $FF - db CRED_MAP, CRED_TAJIRI, CRED_NISINO, $FD - db CRED_MAP, CRED_MATSUSIMA, CRED_NONOMURA, CRED_TANIGUCHI, $FE - db CRED_TEST, CRED_KAKEI, CRED_TSUCHIYA, $FD - db CRED_TEST, CRED_TA_NAKAMURA, CRED_YUDA, $FE - db CRED_SPECIAL, CRED_HISHIDA, CRED_SAKAI, $FD - db CRED_SPECIAL, CRED_YAMAGUCHI, CRED_YAMAMOTO, $FC - db CRED_SPECIAL, CRED_TOMISAWA, CRED_KAWAMOTO, CRED_TO_OOTA, $FE - db CRED_PRODUCERS, CRED_MIYAMOTO, $FD - db CRED_PRODUCERS, CRED_KAWAGUCHI, $FC - db CRED_PRODUCERS, CRED_ISHIHARA, $FE - db CRED_US_STAFF, $FD - db CRED_US_COORD, CRED_TILDEN, $FD - db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, $FC - db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, $FC - db CRED_TRANS, CRED_OGASAWARA, $FD - db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, $FD - db CRED_SPECIAL, CRED_IWATA, $FD - db CRED_SPECIAL, CRED_HARADA, $FC - db CRED_TEST, CRED_PAAD, CRED_CLUB, $FD - db CRED_PRODUCER, CRED_IZUSHI, $FD - db CRED_EXECUTIVE, CRED_YAMAUCHI, $FF - db $FB, $FF, $FA + db CRED_POKEMON, CRED_VERSION, CRED_TEXT_FADE_MON + db CRED_DIRECTOR, CRED_TAJIRI, CRED_TEXT_FADE_MON + db CRED_PROGRAMMERS, CRED_OOTA, CRED_MORIMOTO, CRED_WATANABE, CRED_TEXT_FADE + db CRED_PROGRAMMERS, CRED_MASUDA, CRED_TAMADA, CRED_TEXT_MON + db CRED_CHARACTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_TEXT_FADE_MON + db CRED_MUSIC, CRED_MASUDA, CRED_TEXT_FADE + db CRED_SOUND_EFFECTS, CRED_MASUDA, CRED_WATANABE, CRED_TEXT_MON + db CRED_GAME_DESIGN, CRED_TAJIRI, CRED_NISHINO, CRED_TEXT_FADE_MON + db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_YOSHIDA, CRED_TEXT_FADE_MON + db CRED_GAME_SCENARIO, CRED_TAJIRI, CRED_TEXT_FADE + db CRED_GAME_SCENARIO, CRED_MATSUMITA, CRED_TEXT_MON + db CRED_PARAMETRIC_DESIGN, CRED_NISHINO, CRED_TEXT_FADE_MON + db CRED_MAP_DESIGN, CRED_TAJIRI, CRED_NISHINO, CRED_SEYA, CRED_TEXT_FADE_MON + db CRED_TESTING, CRED_SEKINE, CRED_SEYA, CRED_TEXT_FADE + db CRED_TESTING, CRED_SHIMAMURA, CRED_SHIMOYAMADA, CRED_TEXT_MON + db CRED_SPECIAL_THANKS, CRED_SHOGAKUKAN, CRED_TEXT_FADE_MON + db CRED_PIKACHU_VOICE, CRED_OOTANI, CRED_TEXT_FADE_MON + db CRED_PRODUCER, CRED_IZUSHI, CRED_TEXT_FADE + db CRED_PRODUCER, CRED_KAWAGUCHI, CRED_TEXT + db CRED_PRODUCER, CRED_ISHIHARA, CRED_TEXT_MON + db CRED_U_S_STAFF, CRED_TEXT_FADE + db CRED_U_S_COORD, CRED_TILDEN, CRED_TEXT_FADE + db CRED_U_S_COORD, CRED_KAWAKAMI, CRED_NAKAMURA2, CRED_TEXT + db CRED_U_S_COORD, CRED_SHOEMAKE, CRED_OSBORNE, CRED_TEXT + db CRED_TRANSLATION, CRED_OGASAWARA, CRED_TEXT_FADE + db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, CRED_TEXT_FADE + db CRED_CHARACTER_DESIGN, CRED_HOSOKAWA, CRED_TEXT_FADE + db CRED_SPECIAL_THANKS, CRED_OKUBO, CRED_HARADA2, CRED_TEXT_FADE + db CRED_SPECIAL_THANKS, CRED_NAKAMICHI, CRED_YOSHIMURA, CRED_YAMAZAKI, CRED_TEXT + db CRED_TESTING, CRED_PAAD, CRED_SUPER_MARIO_CLUB2, CRED_TEXT_FADE + db CRED_EXECUTIVE_PRODUCER, CRED_YAMAUCHI, CRED_TEXT_FADE_MON + db CRED_COPYRIGHT + db CRED_TEXT_FADE_MON + db CRED_THE_END diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm index 54c785f5..051fdfe5 100755 --- a/data/hidden_item_coords.asm +++ b/data/hidden_item_coords.asm @@ -1,57 +1,58 @@ -HiddenItemCoords: ; 766b8 (1d:66b8) +HiddenItemCoords: ; 75faa (1d:5faa) ; map ID, then coords - db VIRIDIAN_FOREST,$12,$01 - db VIRIDIAN_FOREST,$2a,$10 - db MT_MOON_3,$0c,$12 - db ROUTE_25,$03,$26 - db ROUTE_9,$07,$0e - db SS_ANNE_6,$09,$0d - db SS_ANNE_10,$01,$03 - db ROUTE_10,$11,$09 - db ROUTE_10,$35,$10 - db ROCKET_HIDEOUT_1,$0f,$15 - db ROCKET_HIDEOUT_3,$11,$1b - db ROCKET_HIDEOUT_4,$01,$19 - db POKEMONTOWER_5,$0c,$04 - db ROUTE_13,$0e,$01 - db ROUTE_13,$0d,$10 - db MANSION_4,$09,$01 - db SAFARI_ZONE_ENTRANCE,$01,$0a - db SAFARI_ZONE_WEST,$05,$06 - db SILPH_CO_5F,$03,$0c - db SILPH_CO_9F,$0f,$02 - db COPYCATS_HOUSE_2F,$01,$01 - db UNKNOWN_DUNGEON_1,$0b,$0e - db UNKNOWN_DUNGEON_3,$03,$1b - db POWER_PLANT,$10,$11 - db POWER_PLANT,$01,$0c - db SEAFOAM_ISLANDS_3,$0f,$0f - db SEAFOAM_ISLANDS_5,$11,$19 - db MANSION_1,$10,$08 - db MANSION_3,$09,$01 - db ROUTE_23,$2c,$09 - db ROUTE_23,$46,$13 - db ROUTE_23,$5a,$08 - db VICTORY_ROAD_2,$02,$05 - db VICTORY_ROAD_2,$07,$1a - db $6f,$0b,$0e - db VIRIDIAN_CITY,$04,$0e - db ROUTE_11,$05,$30 - db ROUTE_12,$3f,$02 - db ROUTE_17,$0e,$0f - db ROUTE_17,$2d,$08 - db ROUTE_17,$48,$11 - db ROUTE_17,$5b,$04 - db ROUTE_17,$79,$08 - db UNDERGROUND_PATH_NS,$04,$03 - db UNDERGROUND_PATH_NS,$22,$04 - db UNDERGROUND_PATH_WE,$02,$0c - db UNDERGROUND_PATH_WE,$05,$15 - db CELADON_CITY,$0f,$30 - db ROUTE_25,$01,$0a - db MT_MOON_3,$09,$21 - db SEAFOAM_ISLANDS_4,$10,$09 - db VERMILION_CITY,$0b,$0e - db CERULEAN_CITY,$08,$0f - db ROUTE_4,$03,$28 + db SILPH_CO_5F, $03, $0c + db SILPH_CO_9F, $0f, $02 + db MANSION_3, $09, $01 + db MANSION_4, $09, $01 + db SAFARI_ZONE_WEST, $05, $06 + db UNKNOWN_DUNGEON_2, $0d, $10 + db UNKNOWN_DUNGEON_3, $0e, $08 + db UNUSED_MAP_6F, $0b, $0e + db SEAFOAM_ISLANDS_3, $0f, $0f + db SEAFOAM_ISLANDS_4, $10, $09 + db SEAFOAM_ISLANDS_5, $11, $19 + db VIRIDIAN_FOREST, $12, $01 + db VIRIDIAN_FOREST, $2a, $10 + db MT_MOON_3, $0c, $12 + db MT_MOON_3, $09, $21 + db SS_ANNE_10, $01, $03 + db SS_ANNE_6, $09, $0d + db UNDERGROUND_PATH_NS, $04, $03 + db UNDERGROUND_PATH_NS, $22, $04 + db UNDERGROUND_PATH_WE, $02, $0c + db UNDERGROUND_PATH_WE, $05, $15 + db ROCKET_HIDEOUT_1, $0f, $15 + db ROCKET_HIDEOUT_3, $11, $1b + db ROCKET_HIDEOUT_4, $01, $19 + db ROUTE_10, $11, $09 + db ROUTE_10, $35, $10 + db POWER_PLANT, $10, $11 + db POWER_PLANT, $01, $0c + db ROUTE_11, $05, $30 + db ROUTE_12, $3f, $02 + db ROUTE_13, $0e, $01 + db ROUTE_13, $0d, $10 + db ROUTE_17, $0e, $0f + db ROUTE_17, $2d, $08 + db ROUTE_17, $48, $11 + db ROUTE_17, $5b, $04 + db ROUTE_17, $79, $08 + db ROUTE_23, $2c, $09 + db ROUTE_23, $46, $13 + db ROUTE_23, $5a, $08 + db VICTORY_ROAD_2, $02, $05 + db VICTORY_ROAD_2, $07, $1a + db ROUTE_25, $03, $26 + db ROUTE_25, $01, $0a + db ROUTE_4, $03, $28 + db ROUTE_9, $07, $0e + db COPYCATS_HOUSE_2F, $01, $01 + db VIRIDIAN_CITY, $04, $0e + db CERULEAN_CITY, $08, $0f + db UNKNOWN_DUNGEON_1, $07, $12 + db POKEMONTOWER_5, $0c, $04 + db VERMILION_CITY, $0b, $0e + db CELADON_CITY, $0f, $30 + db SAFARI_ZONE_ENTRANCE, $01, $0a + db MANSION_1, $10, $08 db $ff diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 8170cf5a..ccf32510 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -1,853 +1,547 @@ -HiddenObjectMaps: ; 46a40 (11:6a40) - db REDS_HOUSE_2F - db BLUES_HOUSE - db OAKS_LAB - db VIRIDIAN_POKECENTER - db VIRIDIAN_MART - db VIRIDIAN_SCHOOL - db VIRIDIAN_GYM - db MUSEUM_1F - db PEWTER_GYM - db PEWTER_MART - db PEWTER_POKECENTER - db CERULEAN_POKECENTER - db CERULEAN_GYM - db CERULEAN_MART - db LAVENDER_POKECENTER - db VERMILION_POKECENTER - db VERMILION_GYM - db CELADON_MANSION_2 - db CELADON_POKECENTER - db CELADON_GYM - db GAME_CORNER - db CELADON_HOTEL - db FUCHSIA_POKECENTER - db FUCHSIA_GYM - db CINNABAR_GYM - db CINNABAR_POKECENTER - db SAFFRON_GYM - db MT_MOON_POKECENTER - db ROCK_TUNNEL_POKECENTER - db TRADE_CENTER - db COLOSSEUM - db VIRIDIAN_FOREST - db MT_MOON_3 - db INDIGO_PLATEAU - db ROUTE_25 - db ROUTE_9 - db SS_ANNE_6 - db SS_ANNE_10 - db ROCKET_HIDEOUT_1 - db ROCKET_HIDEOUT_3 - db ROCKET_HIDEOUT_4 - db SAFFRON_POKECENTER - db POKEMONTOWER_5 - db ROUTE_13 - db SAFARI_ZONE_ENTRANCE - db SAFARI_ZONE_WEST - db SILPH_CO_5F - db SILPH_CO_9F - db COPYCATS_HOUSE_2F - db UNKNOWN_DUNGEON_1 - db UNKNOWN_DUNGEON_3 - db POWER_PLANT - db SEAFOAM_ISLANDS_3 - db SEAFOAM_ISLANDS_5 - db MANSION_1 - db MANSION_3 - db ROUTE_23 - db VICTORY_ROAD_2 - db $6F - db BILLS_HOUSE - db VIRIDIAN_CITY - db SAFARI_ZONE_REST_HOUSE_2 - db SAFARI_ZONE_REST_HOUSE_3 - db SAFARI_ZONE_REST_HOUSE_4 - db ROUTE_15_GATE_2F - db LAVENDER_HOUSE_1 - db CELADON_MANSION_5 - db FIGHTING_DOJO - db ROUTE_10 - db INDIGO_PLATEAU_LOBBY - db CINNABAR_LAB_4 - db BIKE_SHOP - db ROUTE_11 - db ROUTE_12 - db MANSION_2 - db MANSION_4 - db SILPH_CO_11F - db ROUTE_17 - db UNDERGROUND_PATH_NS - db UNDERGROUND_PATH_WE - db CELADON_CITY - db SEAFOAM_ISLANDS_4 - db VERMILION_CITY - db CERULEAN_CITY - db ROUTE_4 - db $FF - -HiddenObjectPointers: ; 46a96 (11:6a96) -; each of these pointers is for the corresponding map in HiddenObjectMaps - dw RedsHouse2FHiddenObjects - dw BluesHouseHiddenObjects - dw OaksLabHiddenObjects - dw ViridianPokecenterHiddenObjects - dw ViridianMartHiddenObjects - dw ViridianSchoolHiddenObjects - dw ViridianGymHiddenObjects - dw Museum1FHiddenObjects - dw PewterGymHiddenObjects - dw PewterMartHiddenObjects - dw PewterPokecenterHiddenObjects - dw CeruleanPokecenterHiddenObjects - dw CeruleanGymHiddenObjects - dw CeruleanMartHiddenObjects - dw LavenderPokecenterHiddenObjects - dw VermilionPokecenterHiddenObjects - dw VermilionGymHiddenObjects - dw CeladonMansion2HiddenObjects - dw CeladonPokecenterHiddenObjects - dw CeladonGymHiddenObjects - dw GameCornerHiddenObjects - dw CeladonHotelHiddenObjects - dw FuchsiaPokecenterHiddenObjects - dw FuchsiaGymHiddenObjects - dw CinnabarGymHiddenObjects - dw CinnabarPokecenterHiddenObjects - dw SaffronGymHiddenObjects - dw MtMoonPokecenterHiddenObjects - dw RockTunnelPokecenterHiddenObjects - dw TradeCenterHiddenObjects - dw ColosseumHiddenObjects - dw ViridianForestHiddenObjects - dw MtMoon3HiddenObjects - dw IndigoPlateauHiddenObjects - dw Route25HiddenObjects - dw Route9HiddenObjects - dw SSAnne6HiddenObjects - dw SSAnne10HiddenObjects - dw RocketHideout1HiddenObjects - dw RocketHideout3HiddenObjects - dw RocketHideout4HiddenObjects - dw SaffronPokecenterHiddenObjects - dw PokemonTower5HiddenObjects - dw Route13HiddenObjects - dw SafariZoneEntranceHiddenObjects - dw SafariZoneWestHiddenObjects - dw SilphCo5FHiddenObjects - dw SilphCo9FHiddenObjects - dw CopycatsHouse2FHiddenObjects - dw UnknownDungeon1HiddenObjects - dw UnknownDungeon3HiddenObjects - dw PowerPlantHiddenObjects - dw SeafoamIslands3HiddenObjects - dw SeafoamIslands5HiddenObjects - dw Mansion1HiddenObjects - dw Mansion3HiddenObjects - dw Route23HiddenObjects - dw VictoryRoad2HiddenObjects - dw Unused6FHiddenObjects - dw BillsHouseHiddenObjects - dw ViridianCityHiddenObjects - dw SafariZoneRestHouse2HiddenObjects - dw SafariZoneRestHouse3HiddenObjects - dw SafariZoneRestHouse4HiddenObjects - dw Route15GateUpstairsHiddenObjects - dw LavenderHouse1HiddenObjects - dw CeladonMansion5HiddenObjects - dw FightingDojoHiddenObjects - dw Route10HiddenObjects - dw IndigoPlateauLobbyHiddenObjects - dw CinnabarLab4HiddenObjects - dw BikeShopHiddenObjects - dw Route11HiddenObjects - dw Route12HiddenObjects - dw Mansion2HiddenObjects - dw Mansion4HiddenObjects - dw SilphCo11FHiddenObjects - dw Route17HiddenObjects - dw UndergroundPathNsHiddenObjects - dw UndergroundPathWeHiddenObjects - dw CeladonCityHiddenObjects - dw SeafoamIslands4HiddenObjects - dw VermilionCityHiddenObjects - dw CeruleanCityHiddenObjects - dw Route4HiddenObjects +HiddenObjectMaps: ; f268d (3c:668d) + dbw SILPH_CO_11F, SilphCo11FHiddenObjects + dbw SILPH_CO_5F, SilphCo5FHiddenObjects + dbw SILPH_CO_9F, SilphCo9FHiddenObjects + dbw MANSION_2, Mansion2HiddenObjects + dbw MANSION_3, Mansion3HiddenObjects + dbw MANSION_4, Mansion4HiddenObjects + dbw SAFARI_ZONE_WEST, SafariZoneWestHiddenObjects + dbw UNKNOWN_DUNGEON_2, UnknownDungeon2HiddenObjects + dbw UNKNOWN_DUNGEON_3, UnknownDungeon3HiddenObjects + dbw UNUSED_MAP_6F, UnusedMap6FHiddenObjects + dbw SEAFOAM_ISLANDS_3, SeafoamIslands3HiddenObjects + dbw SEAFOAM_ISLANDS_4, SeafoamIslands4HiddenObjects + dbw SEAFOAM_ISLANDS_5, SeafoamIslands5HiddenObjects + dbw VIRIDIAN_FOREST, ViridianForestHiddenObjects + dbw MT_MOON_3, MtMoon3HiddenObjects + dbw SS_ANNE_10, SSAnne10HiddenObjects + dbw SS_ANNE_6, SSAnne6HiddenObjects + dbw UNDERGROUND_PATH_NS, UndergroundPathNsHiddenObjects + dbw UNDERGROUND_PATH_WE, UndergroundPathWeHiddenObjects + dbw ROCKET_HIDEOUT_1, RocketHideout1HiddenObjects + dbw ROCKET_HIDEOUT_3, RocketHideout3HiddenObjects + dbw ROCKET_HIDEOUT_4, RocketHideout4HiddenObjects + dbw ROUTE_10, Route10HiddenObjects + dbw ROCK_TUNNEL_POKECENTER, RockTunnelPokecenterHiddenObjects + dbw POWER_PLANT, PowerPlantHiddenObjects + dbw ROUTE_11, Route11HiddenObjects + dbw ROUTE_12, Route12HiddenObjects + dbw ROUTE_13, Route13HiddenObjects + dbw ROUTE_15_GATE_2F, Route15Gate2FHiddenObjects + dbw ROUTE_17, Route17HiddenObjects + dbw ROUTE_23, Route23HiddenObjects + dbw VICTORY_ROAD_2, VictoryRoad2HiddenObjects + dbw ROUTE_25, Route25HiddenObjects + dbw BILLS_HOUSE, BillsHouseHiddenObjects + dbw ROUTE_4, Route4HiddenObjects + dbw MT_MOON_POKECENTER, MtMoonPokecenterHiddenObjects + dbw ROUTE_9, Route9HiddenObjects + dbw TRADE_CENTER, TradeCenterHiddenObjects + dbw COLOSSEUM, ColosseumHiddenObjects + dbw INDIGO_PLATEAU, IndigoPlateauHiddenObjects + dbw INDIGO_PLATEAU_LOBBY, IndigoPlateauLobbyHiddenObjects + dbw COPYCATS_HOUSE_2F, CopycatsHouse2FHiddenObjects + dbw FIGHTING_DOJO, FightingDojoHiddenObjects + dbw SAFFRON_GYM, SaffronGymHiddenObjects + dbw SAFFRON_POKECENTER, SaffronPokecenterHiddenObjects + dbw REDS_HOUSE_2F, RedsHouse2FHiddenObjects + dbw BLUES_HOUSE, BluesHouseHiddenObjects + dbw OAKS_LAB, OaksLabHiddenObjects + dbw VIRIDIAN_CITY, ViridianCityHiddenObjects + dbw VIRIDIAN_POKECENTER, ViridianPokecenterHiddenObjects + dbw VIRIDIAN_SCHOOL, ViridianSchoolHiddenObjects + dbw VIRIDIAN_GYM, ViridianGymHiddenObjects + dbw MUSEUM_1F, Museum1FHiddenObjects + dbw PEWTER_GYM, PewterGymHiddenObjects + dbw PEWTER_POKECENTER, PewterPokecenterHiddenObjects + dbw CERULEAN_CITY, CeruleanCityHiddenObjects + dbw CERULEAN_POKECENTER, CeruleanPokecenterHiddenObjects + dbw CERULEAN_GYM, CeruleanGymHiddenObjects + dbw BIKE_SHOP, BikeShopHiddenObjects + dbw UNKNOWN_DUNGEON_1, UnknownDungeon1HiddenObjects + dbw LAVENDER_POKECENTER, LavenderPokecenterHiddenObjects + dbw POKEMONTOWER_5, Pokemontower5HiddenObjects + dbw LAVENDER_HOUSE_1, LavenderHouse1HiddenObjects + dbw VERMILION_CITY, VermilionCityHiddenObjects + dbw VERMILION_POKECENTER, VermilionPokecenterHiddenObjects + dbw POKEMON_FAN_CLUB, PokemonFanClubHiddenObjects + dbw VERMILION_GYM, VermilionGymHiddenObjects + dbw CELADON_CITY, CeladonCityHiddenObjects + dbw CELADON_HOTEL, CeladonHotelHiddenObjects + dbw CELADON_MANSION_2, CeladonMansion2HiddenObjects + dbw CELADON_MANSION_5, CeladonMansion5HiddenObjects + dbw CELADON_POKECENTER, CeladonPokecenterHiddenObjects + dbw CELADON_GYM, CeladonGymHiddenObjects + dbw GAME_CORNER, GameCornerHiddenObjects + dbw FUCHSIA_POKECENTER, FuchsiaPokecenterHiddenObjects + dbw SAFARI_ZONE_ENTRANCE, SafariZoneEntranceHiddenObjects + dbw FUCHSIA_GYM, FuchsiaGymHiddenObjects + dbw MANSION_1, Mansion1HiddenObjects + dbw CINNABAR_GYM, CinnabarGymHiddenObjects + dbw CINNABAR_LAB_4, CinnabarLab4HiddenObjects + dbw CINNABAR_POKECENTER, CinnabarPokecenterHiddenObjects + db $ff ; format: y-coord, x-coord, text id/item id, object routine -TradeCenterHiddenObjects: ; 46b40 (11:6b40) - db $04,$05,$d0 - db BANK(CableClubRightGameboy) - dw CableClubRightGameboy - db $04,$04,$d0 - db BANK(CableClubLeftGameboy) - dw CableClubLeftGameboy - db $FF -ColosseumHiddenObjects: ; 46b4d (11:6b4d) - db $04,$05,$d0 - db BANK(CableClubRightGameboy) - dw CableClubRightGameboy - db $04,$04,$d0 - db BANK(CableClubLeftGameboy) - dw CableClubLeftGameboy - db $FF -RedsHouse2FHiddenObjects: ; 46b5a (11:6b5a) - db $01,$00,$04 - dbw BANK(OpenRedsPC), OpenRedsPC - db $05,$03,$d0 - dbw BANK(PrintRedsNESText), PrintRedsNESText - db $FF -BluesHouseHiddenObjects: ; 46b67 (11:6b67) - db $01,$00,$04 - db BANK(PrintBookcaseText) - dw PrintBookcaseText - db $01,$01,$04 - db BANK(PrintBookcaseText) - dw PrintBookcaseText - db $01,$07,$04 - db BANK(PrintBookcaseText) - dw PrintBookcaseText - db $FF -OaksLabHiddenObjects: ; 46b7a (11:6b7a) - db $00,$04,$04 - db BANK(DisplayOakLabLeftPoster) - dw DisplayOakLabLeftPoster - db $00,$05,$04 - db BANK(DisplayOakLabRightPoster) - dw DisplayOakLabRightPoster - db $01,$00,$04 - db BANK(DisplayOakLabEmailText) - dw DisplayOakLabEmailText - db $01,$01,$04 - db BANK(DisplayOakLabEmailText) - dw DisplayOakLabEmailText - db $FF -ViridianPokecenterHiddenObjects: ; 46b93 (11:6b93) - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -ViridianMartHiddenObjects: ; 46ba0 (11:6ba0) - db $FF -ViridianSchoolHiddenObjects: ; 46ba1 (11:6ba1) - db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1 - db Bank(PrintNotebookText) - dw PrintNotebookText - db $00,$03,(ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1 - db BANK(PrintBlackboardLinkCableText) - dw PrintBlackboardLinkCableText - db $FF -ViridianGymHiddenObjects: ; 46bae (11:6bae) - db $0f,$0f,$04 - dbw BANK(GymStatues),GymStatues - db $0f,$12,$04 - dbw BANK(GymStatues),GymStatues - db $FF -Museum1FHiddenObjects: ; 46bbb (11:6bbb) - db $03,$02,$04 - dbw BANK(AerodactylFossil), AerodactylFossil - db $06,$02,$04 - dbw BANK(KabutopsFossil), KabutopsFossil - db $FF -PewterGymHiddenObjects: ; 46bc8 (11:6bc8) - db $0a,$03,$04 - dbw BANK(GymStatues),GymStatues - db $0a,$06,$04 - dbw BANK(GymStatues),GymStatues - db $FF -PewterMartHiddenObjects: ; 46bd5 (11:6bd5) - db $FF -PewterPokecenterHiddenObjects: ; 46bd6 (11:6bd6) - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -CeruleanPokecenterHiddenObjects: ; 46be3 (11:6be3) - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -CeruleanGymHiddenObjects: ; 46bf0 (11:6bf0) - db $0b,$03,$04 - dbw BANK(GymStatues),GymStatues - db $0b,$06,$04 - dbw BANK(GymStatues),GymStatues - db $FF -CeruleanMartHiddenObjects: ; 46bfd (11:6bfd) - db $FF -LavenderPokecenterHiddenObjects: ; 46bfe (11:6bfe) - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -VermilionPokecenterHiddenObjects: ; 46c0b (11:6c0b) - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $FF -VermilionGymHiddenObjects: ; 46c18 (11:6c18) - db $0e,$03,$04 - dbw BANK(GymStatues), GymStatues - db $0e,$06,$04 - dbw BANK(GymStatues), GymStatues - db $01,$06,$00 - dbw BANK(PrintTrashText), PrintTrashText - db $07,$01,$00 - dbw BANK(GymTrashScript), GymTrashScript - db $09,$01,$01 - dbw BANK(GymTrashScript), GymTrashScript - db $0b,$01,$02 - dbw BANK(GymTrashScript), GymTrashScript - db $07,$03,$03 - dbw BANK(GymTrashScript), GymTrashScript - db $09,$03,$04 - dbw BANK(GymTrashScript), GymTrashScript - db $0b,$03,$05 - dbw BANK(GymTrashScript), GymTrashScript - db $07,$05,$06 - dbw BANK(GymTrashScript), GymTrashScript - db $09,$05,$07 - dbw BANK(GymTrashScript), GymTrashScript - db $0b,$05,$08 - dbw BANK(GymTrashScript), GymTrashScript - db $07,$07,$09 - dbw BANK(GymTrashScript), GymTrashScript - db $09,$07,$0a - dbw BANK(GymTrashScript), GymTrashScript - db $0b,$07,$0b - dbw BANK(GymTrashScript), GymTrashScript - db $07,$09,$0c - dbw BANK(GymTrashScript), GymTrashScript - db $09,$09,$0d - dbw BANK(GymTrashScript), GymTrashScript - db $0b,$09,$0e - dbw BANK(GymTrashScript), GymTrashScript - db $FF -CeladonMansion2HiddenObjects: ; 46c85 (11:6c85) - db $05,$00,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -CeladonPokecenterHiddenObjects: ; 46c8c (11:6c8c) - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -CeladonGymHiddenObjects: ; 46c99 (11:6c99) - db $0f,$03,$04 - dbw BANK(GymStatues),GymStatues - db $0f,$06,$04 - dbw BANK(GymStatues),GymStatues - db $FF -GameCornerHiddenObjects: ; 46ca6 (11:6ca6) - db $0f,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$12,$ff ; "Someone's Keys" - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$0d,$fe ; "Out To Lunch" - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0f,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0f,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0f,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0f,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$06,$fd ; "Out Of Order" - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0f,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $08,$00,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $10,$01,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $0b,$03,COIN+20 - dbw BANK(HiddenCoins),HiddenCoins - db $0e,$03,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $0c,$04,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $0c,$09,COIN+20 - dbw BANK(HiddenCoins),HiddenCoins - db $0f,$09,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $0e,$10,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $10,$0a,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $07,$0b,COIN+40 - dbw BANK(HiddenCoins),HiddenCoins - db $08,$0f,COIN+100 - dbw BANK(HiddenCoins),HiddenCoins - db $0f,$0c,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $FF -CeladonHotelHiddenObjects: ; 46dc7 (11:6dc7) - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $FF -FuchsiaPokecenterHiddenObjects: ; 46dd4 (11:6dd4) - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $FF -FuchsiaGymHiddenObjects: ; 46de1 (11:6de1) - db $0f,$03,$04 - dbw BANK(GymStatues),GymStatues - db $0f,$06,$04 - dbw BANK(GymStatues),GymStatues - db $FF -CinnabarGymHiddenObjects: ; 46dee (11:6dee) - db $0d,$11,$04 - dbw BANK(GymStatues),GymStatues - db $07,$0f,$01 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $01,$0a,$12 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $07,$09,$13 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $0d,$09,$14 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $0d,$01,$05 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $07,$01,$16 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $FF -CinnabarPokecenterHiddenObjects: ; 46e19 (11:6e19) - db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -SaffronGymHiddenObjects: ; 46e26 (11:6e26) - db $0f,$09,$04 - dbw BANK(GymStatues),GymStatues - db $FF -MtMoonPokecenterHiddenObjects: ; 46e2d (11:6e2d) - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -RockTunnelPokecenterHiddenObjects: ; 46e3a (11:6e3a) - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -ViridianForestHiddenObjects: ; 46e47 (11:6e47) - db $12,$01,POTION - dbw BANK(HiddenItems),HiddenItems - db $2a,$10,ANTIDOTE - dbw BANK(HiddenItems),HiddenItems - db $FF -MtMoon3HiddenObjects: ; 46e54 (11:6e54) - db $0c,$12,MOON_STONE - dbw BANK(HiddenItems),HiddenItems - db $09,$21,ETHER - dbw BANK(HiddenItems),HiddenItems - db $FF -IndigoPlateauHiddenObjects: ; 46e61 (11:6e61) - db $0d,$08,$ff - db BANK(PrintIndigoPlateauHQText) - dw PrintIndigoPlateauHQText - db $0d,$0b,$00 - db BANK(PrintIndigoPlateauHQText) - dw PrintIndigoPlateauHQText - db $FF -Route25HiddenObjects: ; 46e6e (11:6e6e) - db $03,$26,ETHER - dbw BANK(HiddenItems),HiddenItems - db $01,$0a,ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -Route9HiddenObjects: ; 46e7b (11:6e7b) - db $07,$0e,ETHER - dbw BANK(HiddenItems),HiddenItems - db $FF -SSAnne6HiddenObjects: ; 46e82 (11:6e82) - db $05,$0d,$00 - dbw BANK(PrintTrashText), PrintTrashText - db $07,$0d,$00 - dbw BANK(PrintTrashText), PrintTrashText - db $09,$0d,GREAT_BALL - dbw BANK(HiddenItems),HiddenItems - db $FF -SSAnne10HiddenObjects: ; 46e95 (11:6e95) - db $01,$03,HYPER_POTION - dbw BANK(HiddenItems),HiddenItems - db $FF -Route10HiddenObjects: ; 46e9c (11:6e9c) - db $11,$09,SUPER_POTION - dbw BANK(HiddenItems),HiddenItems - db $35,$10,MAX_ETHER - dbw BANK(HiddenItems),HiddenItems - db $FF -RocketHideout1HiddenObjects: ; 46ea9 (11:6ea9) - db $0f,$15,PP_UP - dbw BANK(HiddenItems),HiddenItems - db $FF -RocketHideout3HiddenObjects: ; 46eb0 (11:6eb0) - db $11,$1b,NUGGET - dbw BANK(HiddenItems),HiddenItems - db $FF -RocketHideout4HiddenObjects: ; 46eb7 (11:6eb7) - db $01,$19,SUPER_POTION - dbw BANK(HiddenItems),HiddenItems - db $FF -SaffronPokecenterHiddenObjects: ; 46ebe (11:6ebe) - db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -PokemonTower5HiddenObjects: ; 46ecb (11:6ecb) - db $0c,$04,ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -Route13HiddenObjects: ; 46ed2 (11:6ed2) - db $0e,$01,PP_UP - dbw BANK(HiddenItems),HiddenItems - db $0d,$10,CALCIUM - dbw BANK(HiddenItems),HiddenItems - db $FF -SafariZoneEntranceHiddenObjects: ; 46edf (11:6edf) - db $01,$0a,NUGGET - dbw BANK(HiddenItems),HiddenItems - db $FF -SafariZoneWestHiddenObjects: ; 46ee6 (11:6ee6) - db $05,$06,REVIVE - dbw BANK(HiddenItems),HiddenItems - db $FF -SilphCo5FHiddenObjects: ; 46eed (11:6eed) - db $03,$0c,ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -SilphCo9FHiddenObjects: ; 46ef4 (11:6ef4) - db $0f,$02,MAX_POTION - dbw BANK(HiddenItems),HiddenItems - db $FF -CopycatsHouse2FHiddenObjects: ; 46efb (11:6efb) - db $01,$01,NUGGET - dbw BANK(HiddenItems),HiddenItems - db $FF -UnknownDungeon1HiddenObjects: ; 46f02 (11:6f02) - db $0b,$0e,RARE_CANDY - dbw BANK(HiddenItems),HiddenItems - db $FF -UnknownDungeon3HiddenObjects: ; 46f09 (11:6f09) - db $03,$1b,ULTRA_BALL - dbw BANK(HiddenItems),HiddenItems - db $FF -PowerPlantHiddenObjects: ; 46f10 (11:6f10) - db $10,$11,MAX_ELIXER - dbw BANK(HiddenItems),HiddenItems - db $01,$0c,PP_UP - dbw BANK(HiddenItems),HiddenItems - db $FF -SeafoamIslands3HiddenObjects: ; 46f1d (11:6f1d) - db $0f,$0f,NUGGET - dbw BANK(HiddenItems),HiddenItems - db $FF -SeafoamIslands5HiddenObjects: ; 46f24 (11:6f24) - db $11,$19,ULTRA_BALL - dbw BANK(HiddenItems),HiddenItems - db $FF -Mansion1HiddenObjects: ; 46f2b (11:6f2b) - db $10,$08,MOON_STONE - dbw BANK(HiddenItems),HiddenItems - db $05,$02,$04 - db BANK(Mansion1Script_Switches) - dw Mansion1Script_Switches - db $FF -Mansion2HiddenObjects: ; 46f38 (11:6f38) - db $0b,$02,$04 - db BANK(Mansion2Script_Switches) - dw Mansion2Script_Switches - db $FF -Mansion3HiddenObjects: ; 46f3f (11:6f3f) - db $09,$01,MAX_REVIVE - dbw BANK(HiddenItems),HiddenItems - db $05,$0a,$04 - db BANK(Mansion3Script_Switches) - dw Mansion3Script_Switches - db $FF -Mansion4HiddenObjects: ; 46f4c (11:6f4c) - db $09,$01,RARE_CANDY - dbw BANK(HiddenItems),HiddenItems - db $03,$14,$04 - db BANK(Mansion4Script_Switches) - dw Mansion4Script_Switches - db $19,$12,$04 - db BANK(Mansion4Script_Switches) - dw Mansion4Script_Switches - db $FF -Route23HiddenObjects: ; 46f5f (11:6f5f) - db $2c,$09,FULL_RESTORE - dbw BANK(HiddenItems),HiddenItems - db $46,$13,ULTRA_BALL - dbw BANK(HiddenItems),HiddenItems - db $5a,$08,MAX_ETHER - dbw BANK(HiddenItems),HiddenItems - db $FF -VictoryRoad2HiddenObjects: ; 46f72 (11:6f72) - db $02,$05,ULTRA_BALL - dbw BANK(HiddenItems),HiddenItems - db $07,$1a,FULL_RESTORE - dbw BANK(HiddenItems),HiddenItems - db $FF -Unused6FHiddenObjects: ; 46f7f (11:6f7f) - db $0b,$0e,MAX_ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -BillsHouseHiddenObjects: ; 46f86 (11:6f86) - db $04,$01,$04 - dbw BANK(BillsHousePC), BillsHousePC - db $FF -ViridianCityHiddenObjects: ; 46f8d (11:6f8d) - db $04,$0e,POTION - dbw BANK(HiddenItems),HiddenItems - db $FF -SafariZoneRestHouse2HiddenObjects: ; 46f94 (11:6f94) - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -SafariZoneRestHouse3HiddenObjects: ; 46fa1 (11:6fa1) - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -SafariZoneRestHouse4HiddenObjects: ; 46fae (11:6fae) - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -Route15GateUpstairsHiddenObjects: ; 46fbb (11:6fbb) - db $02,$01,$04 - db BANK(Route15GateLeftBinoculars) - dw Route15GateLeftBinoculars - db $FF -LavenderHouse1HiddenObjects: ; 46fc2 (11:6fc2) - db $01,$00,$00 - db BANK(PrintMagazinesText) - dw PrintMagazinesText - db $01,$01,$00 - db BANK(PrintMagazinesText) - dw PrintMagazinesText - db $01,$07,$00 - db BANK(PrintMagazinesText) - dw PrintMagazinesText - db $FF -CeladonMansion5HiddenObjects: ; 46fd5 (11:6fd5) - db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1 - db BANK(PrintBlackboardLinkCableText) - dw PrintBlackboardLinkCableText - db $00,$04,(LinkCableHelp_id - TextPredefs) / 2 + 1 - db BANK(PrintBlackboardLinkCableText) - dw PrintBlackboardLinkCableText - db $04,$03,(TMNotebook_id - TextPredefs) / 2 + 1 - db Bank(PrintNotebookText) - dw PrintNotebookText - db $FF -FightingDojoHiddenObjects: ; 46fe8 (11:6fe8) - db $09,$03,$04 - db BANK(PrintFightingDojoText) - dw PrintFightingDojoText - db $09,$06,$04 - db BANK(PrintFightingDojoText) - dw PrintFightingDojoText - db $00,$04,$04 - db BANK(PrintFightingDojoText2) - dw PrintFightingDojoText2 - db $00,$05,$04 - db BANK(PrintFightingDojoText3) - dw PrintFightingDojoText3 - db $FF -IndigoPlateauLobbyHiddenObjects: ; 47001 (11:7001) - db $07,$0f,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -CinnabarLab4HiddenObjects: ; 47008 (11:7008) - db $04,$00,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $04,$02,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -BikeShopHiddenObjects: ; 47015 (11:7015) - db $00,$01,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $01,$02,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $02,$01,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $02,$03,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $04,$00,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $05,$01,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $FF -Route11HiddenObjects: ; 4703a (11:703a) - db $05,$30,ESCAPE_ROPE - dbw BANK(HiddenItems),HiddenItems - db $FF -Route12HiddenObjects: ; 47041 (11:7041) - db $3f,$02,HYPER_POTION - dbw BANK(HiddenItems),HiddenItems - db $FF -SilphCo11FHiddenObjects: ; 47048 (11:7048) - db $0c,$0a,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -Route17HiddenObjects: ; 4704f (11:704f) - db $0e,$0f,RARE_CANDY - dbw BANK(HiddenItems),HiddenItems - db $2d,$08,FULL_RESTORE - dbw BANK(HiddenItems),HiddenItems - db $48,$11,PP_UP - dbw BANK(HiddenItems),HiddenItems - db $5b,$04,MAX_REVIVE - dbw BANK(HiddenItems),HiddenItems - db $79,$08,MAX_ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -UndergroundPathNsHiddenObjects: ; 4706e (11:706e) - db $04,$03,FULL_RESTORE - dbw BANK(HiddenItems),HiddenItems - db $22,$04,X_SPECIAL - dbw BANK(HiddenItems),HiddenItems - db $FF -UndergroundPathWeHiddenObjects: ; 4707b (11:707b) - db $02,$0c,NUGGET - dbw BANK(HiddenItems),HiddenItems - db $05,$15,ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -CeladonCityHiddenObjects: ; 47088 (11:7088) - db $0f,$30,PP_UP - dbw BANK(HiddenItems),HiddenItems - db $FF -SeafoamIslands4HiddenObjects: ; 4708f (11:708f) - db $10,$09,MAX_ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -VermilionCityHiddenObjects: ; 47096 (11:7096) - db $0b,$0e,MAX_ETHER - dbw BANK(HiddenItems),HiddenItems - db $FF -CeruleanCityHiddenObjects: ; 4709d (11:709d) - db $08,$0f,RARE_CANDY - dbw BANK(HiddenItems),HiddenItems - db $FF -Route4HiddenObjects: ; 470a4 (11:70a4) - db $03,$28,GREAT_BALL - dbw BANK(HiddenItems),HiddenItems - db $FF +hidden_object: macro + db \1, \2, \3 + dba \4 + endm + +SilphCo11FHiddenObjects: + hidden_object 12, 10, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +SilphCo5FHiddenObjects: + hidden_object 3, 12, ELIXER, HiddenItems + db $ff + +SilphCo9FHiddenObjects: + hidden_object 15, 2, MAX_POTION, HiddenItems + db $ff + +Mansion2HiddenObjects: + hidden_object 11, 2, SPRITE_FACING_UP, Mansion2Script_Switches + db $ff + +Mansion3HiddenObjects: + hidden_object 9, 1, MAX_REVIVE, HiddenItems + hidden_object 5, 10, SPRITE_FACING_UP, Mansion3Script_Switches + db $ff + +Mansion4HiddenObjects: + hidden_object 9, 1, RARE_CANDY, HiddenItems + hidden_object 3, 20, SPRITE_FACING_UP, Mansion4Script_Switches + hidden_object 25, 18, SPRITE_FACING_UP, Mansion4Script_Switches + db $ff + +SafariZoneWestHiddenObjects: + hidden_object 5, 6, REVIVE, HiddenItems + db $ff + +UnknownDungeon2HiddenObjects: + hidden_object 13, 16, PP_UP, HiddenItems + db $ff + +UnknownDungeon3HiddenObjects: + hidden_object 14, 8, PP_UP, HiddenItems + db $ff + +UnusedMap6FHiddenObjects: + hidden_object 11, 14, MAX_ELIXER, HiddenItems + db $ff + +SeafoamIslands3HiddenObjects: + hidden_object 15, 15, NUGGET, HiddenItems + db $ff + +SeafoamIslands4HiddenObjects: + hidden_object 16, 9, MAX_ELIXER, HiddenItems + db $ff + +SeafoamIslands5HiddenObjects: + hidden_object 17, 25, ULTRA_BALL, HiddenItems + db $ff + +ViridianForestHiddenObjects: + hidden_object 18, 1, POTION, HiddenItems + hidden_object 42, 16, ANTIDOTE, HiddenItems + db $ff + +MtMoon3HiddenObjects: + hidden_object 12, 18, MOON_STONE, HiddenItems + hidden_object 9, 33, ETHER, HiddenItems + db $ff + +SSAnne10HiddenObjects: + hidden_object 1, 3, HYPER_POTION, HiddenItems + db $ff + +SSAnne6HiddenObjects: + hidden_object 5, 13, SPRITE_FACING_DOWN, PrintTrashText + hidden_object 7, 13, SPRITE_FACING_DOWN, PrintTrashText + hidden_object 9, 13, GREAT_BALL, HiddenItems + db $ff + +UndergroundPathNsHiddenObjects: + hidden_object 4, 3, FULL_RESTORE, HiddenItems + hidden_object 34, 4, X_SPECIAL, HiddenItems + db $ff + +UndergroundPathWeHiddenObjects: + hidden_object 2, 12, NUGGET, HiddenItems + hidden_object 5, 21, ELIXER, HiddenItems + db $ff + +RocketHideout1HiddenObjects: + hidden_object 15, 21, PP_UP, HiddenItems + db $ff + +RocketHideout3HiddenObjects: + hidden_object 17, 27, NUGGET, HiddenItems + db $ff + +RocketHideout4HiddenObjects: + hidden_object 1, 25, SUPER_POTION, HiddenItems + db $ff + +Route10HiddenObjects: + hidden_object 17, 9, SUPER_POTION, HiddenItems + hidden_object 53, 16, MAX_ETHER, HiddenItems + db $ff + +RockTunnelPokecenterHiddenObjects: + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +PowerPlantHiddenObjects: + hidden_object 16, 17, MAX_ELIXER, HiddenItems + hidden_object 1, 12, PP_UP, HiddenItems + db $ff + +Route11HiddenObjects: + hidden_object 5, 48, ESCAPE_ROPE, HiddenItems + db $ff + +Route12HiddenObjects: + hidden_object 63, 2, HYPER_POTION, HiddenItems + db $ff + +Route13HiddenObjects: + hidden_object 14, 1, PP_UP, HiddenItems + hidden_object 13, 16, CALCIUM, HiddenItems + db $ff + +Route15Gate2FHiddenObjects: + hidden_object 2, 1, SPRITE_FACING_UP, Route15GateLeftBinoculars + db $ff + +Route17HiddenObjects: + hidden_object 14, 15, RARE_CANDY, HiddenItems + hidden_object 45, 8, FULL_RESTORE, HiddenItems + hidden_object 72, 17, PP_UP, HiddenItems + hidden_object 91, 4, MAX_REVIVE, HiddenItems + hidden_object 121, 8, MAX_ELIXER, HiddenItems + db $ff + +Route23HiddenObjects: + hidden_object 44, 9, FULL_RESTORE, HiddenItems + hidden_object 70, 19, ULTRA_BALL, HiddenItems + hidden_object 90, 8, MAX_ETHER, HiddenItems + db $ff + +VictoryRoad2HiddenObjects: + hidden_object 2, 5, ULTRA_BALL, HiddenItems + hidden_object 7, 26, FULL_RESTORE, HiddenItems + db $ff + +Route25HiddenObjects: + hidden_object 3, 38, ETHER, HiddenItems + hidden_object 1, 10, ELIXER, HiddenItems + db $ff + +BillsHouseHiddenObjects: + hidden_object 4, 1, SPRITE_FACING_UP, BillsHousePC + db $ff + +Route4HiddenObjects: + hidden_object 3, 40, GREAT_BALL, HiddenItems + db $ff + +MtMoonPokecenterHiddenObjects: + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +Route9HiddenObjects: + hidden_object 7, 14, ETHER, HiddenItems + db $ff + +TradeCenterHiddenObjects: + hidden_object 4, 5, $d0, CableClubRightGameboy + hidden_object 4, 4, $d0, CableClubLeftGameboy + db $ff + +ColosseumHiddenObjects: + hidden_object 4, 5, $d0, CableClubRightGameboy + hidden_object 4, 4, $d0, CableClubLeftGameboy + db $ff + +IndigoPlateauHiddenObjects: + hidden_object 13, 8, $ff, PrintIndigoPlateauHQText + hidden_object 13, 11, SPRITE_FACING_DOWN, PrintIndigoPlateauHQText + db $ff + +IndigoPlateauLobbyHiddenObjects: + hidden_object 7, 15, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +CopycatsHouse2FHiddenObjects: + hidden_object 1, 1, NUGGET, HiddenItems + db $ff + +FightingDojoHiddenObjects: + hidden_object 9, 3, SPRITE_FACING_UP, PrintFightingDojoText + hidden_object 9, 6, SPRITE_FACING_UP, PrintFightingDojoText + hidden_object 0, 4, SPRITE_FACING_UP, PrintFightingDojoText2 + hidden_object 0, 5, SPRITE_FACING_UP, PrintFightingDojoText3 + db $ff + +SaffronGymHiddenObjects: + hidden_object 15, 9, SPRITE_FACING_UP, GymStatues + db $ff + +SaffronPokecenterHiddenObjects: + hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +RedsHouse2FHiddenObjects: + hidden_object 1, 0, SPRITE_FACING_UP, OpenRedsPC + hidden_object 5, 3, $d0, PrintRedsNESText + db $ff + +BluesHouseHiddenObjects: + hidden_object 1, 0, SPRITE_FACING_UP, PrintBookcaseText + hidden_object 1, 1, SPRITE_FACING_UP, PrintBookcaseText + hidden_object 1, 7, SPRITE_FACING_UP, PrintBookcaseText + db $ff + +OaksLabHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_UP, DisplayOakLabLeftPoster + hidden_object 0, 5, SPRITE_FACING_UP, DisplayOakLabRightPoster + hidden_object 1, 0, SPRITE_FACING_UP, DisplayOakLabEmailText + hidden_object 1, 1, SPRITE_FACING_UP, DisplayOakLabEmailText + db $ff + +ViridianCityHiddenObjects: + hidden_object 4, 14, POTION, HiddenItems + db $ff + +ViridianPokecenterHiddenObjects: + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +ViridianSchoolHiddenObjects: + hidden_object 4, 3, (ViridianSchoolNotebook_id - TextPredefs) / 2 + 1, PrintNotebookText + hidden_object 0, 3, (ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1, PrintBlackboardLinkCableText + db $ff + +ViridianGymHiddenObjects: + hidden_object 15, 15, SPRITE_FACING_UP, GymStatues + hidden_object 15, 18, SPRITE_FACING_UP, GymStatues + db $ff + +Museum1FHiddenObjects: + hidden_object 3, 2, SPRITE_FACING_UP, AerodactylFossil + hidden_object 6, 2, SPRITE_FACING_UP, KabutopsFossil + db $ff + +PewterGymHiddenObjects: + hidden_object 10, 3, SPRITE_FACING_UP, GymStatues + hidden_object 10, 6, SPRITE_FACING_UP, GymStatues + db $ff + +PewterPokecenterHiddenObjects: + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +CeruleanCityHiddenObjects: + hidden_object 8, 15, RARE_CANDY, HiddenItems + db $ff + +CeruleanPokecenterHiddenObjects: + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +CeruleanGymHiddenObjects: + hidden_object 11, 3, SPRITE_FACING_UP, GymStatues + hidden_object 11, 6, SPRITE_FACING_UP, GymStatues + db $ff + +BikeShopHiddenObjects: + hidden_object 0, 1, $d0, PrintNewBikeText + hidden_object 1, 2, $d0, PrintNewBikeText + hidden_object 2, 1, $d0, PrintNewBikeText + hidden_object 2, 3, $d0, PrintNewBikeText + hidden_object 4, 0, $d0, PrintNewBikeText + hidden_object 5, 1, $d0, PrintNewBikeText + db $ff + +UnknownDungeon1HiddenObjects: + hidden_object 7, 18, PP_UP, HiddenItems + db $ff + +LavenderPokecenterHiddenObjects: + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +Pokemontower5HiddenObjects: + hidden_object 12, 4, ELIXER, HiddenItems + db $ff + +LavenderHouse1HiddenObjects: + hidden_object 1, 0, SPRITE_FACING_DOWN, PrintMagazinesText + hidden_object 1, 1, SPRITE_FACING_DOWN, PrintMagazinesText + hidden_object 1, 7, SPRITE_FACING_DOWN, PrintMagazinesText + db $ff + +VermilionCityHiddenObjects: + hidden_object 11, 14, MAX_ETHER, HiddenItems + db $ff + +VermilionPokecenterHiddenObjects: + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText + db $ff + +PokemonFanClubHiddenObjects: + hidden_object 0, 1, SPRITE_FACING_UP, FanClubPicture1 + hidden_object 0, 6, SPRITE_FACING_UP, FanClubPicture2 + db $ff + +VermilionGymHiddenObjects: + hidden_object 14, 3, SPRITE_FACING_UP, GymStatues + hidden_object 14, 6, SPRITE_FACING_UP, GymStatues + hidden_object 1, 6, SPRITE_FACING_DOWN, PrintTrashText + hidden_object 7, 1, 0, GymTrashScript + hidden_object 9, 1, 1, GymTrashScript + hidden_object 11, 1, 2, GymTrashScript + hidden_object 7, 3, 3, GymTrashScript + hidden_object 9, 3, 4, GymTrashScript + hidden_object 11, 3, 5, GymTrashScript + hidden_object 7, 5, 6, GymTrashScript + hidden_object 9, 5, 7, GymTrashScript + hidden_object 11, 5, 8, GymTrashScript + hidden_object 7, 7, 9, GymTrashScript + hidden_object 9, 7, 10, GymTrashScript + hidden_object 11, 7, 11, GymTrashScript + hidden_object 7, 9, 12, GymTrashScript + hidden_object 9, 9, 13, GymTrashScript + hidden_object 11, 9, 14, GymTrashScript + db $ff + +CeladonCityHiddenObjects: + hidden_object 15, 48, PP_UP, HiddenItems + db $ff + +CeladonHotelHiddenObjects: + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + db $ff + +CeladonMansion2HiddenObjects: + hidden_object 5, 0, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +CeladonMansion5HiddenObjects: + hidden_object 0, 3, (LinkCableHelp_id - TextPredefs) / 2 + 1, PrintBlackboardLinkCableText + hidden_object 0, 4, (LinkCableHelp_id - TextPredefs) / 2 + 1, PrintBlackboardLinkCableText + hidden_object 4, 3, (TMNotebook_id - TextPredefs) / 2 + 1, PrintNotebookText + db $ff + +CeladonPokecenterHiddenObjects: + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +CeladonGymHiddenObjects: + hidden_object 15, 3, SPRITE_FACING_UP, GymStatues + hidden_object 15, 6, SPRITE_FACING_UP, GymStatues + db $ff + +GameCornerHiddenObjects: + hidden_object 15, 18, $d0, StartSlotMachine + hidden_object 14, 18, $d0, StartSlotMachine + hidden_object 13, 18, $d0, StartSlotMachine + hidden_object 12, 18, $d0, StartSlotMachine + hidden_object 11, 18, $d0, StartSlotMachine + hidden_object 10, 18, $ff, StartSlotMachine ; "Someone's Keys" + hidden_object 10, 13, $d0, StartSlotMachine + hidden_object 11, 13, $d0, StartSlotMachine + hidden_object 12, 13, $fe, StartSlotMachine ; "Out To Lunch" + hidden_object 13, 13, $d0, StartSlotMachine + hidden_object 14, 13, $d0, StartSlotMachine + hidden_object 15, 13, $d0, StartSlotMachine + hidden_object 15, 12, $d0, StartSlotMachine + hidden_object 14, 12, $d0, StartSlotMachine + hidden_object 13, 12, $d0, StartSlotMachine + hidden_object 12, 12, $d0, StartSlotMachine + hidden_object 11, 12, $d0, StartSlotMachine + hidden_object 10, 12, $d0, StartSlotMachine + hidden_object 10, 7, $d0, StartSlotMachine + hidden_object 11, 7, $d0, StartSlotMachine + hidden_object 12, 7, $d0, StartSlotMachine + hidden_object 13, 7, $d0, StartSlotMachine + hidden_object 14, 7, $d0, StartSlotMachine + hidden_object 15, 7, $d0, StartSlotMachine + hidden_object 15, 6, $d0, StartSlotMachine + hidden_object 14, 6, $d0, StartSlotMachine + hidden_object 13, 6, $d0, StartSlotMachine + hidden_object 12, 6, $fd, StartSlotMachine ; "Out Of Order" + hidden_object 11, 6, $d0, StartSlotMachine + hidden_object 10, 6, $d0, StartSlotMachine + hidden_object 10, 1, $d0, StartSlotMachine + hidden_object 11, 1, $d0, StartSlotMachine + hidden_object 12, 1, $d0, StartSlotMachine + hidden_object 13, 1, $d0, StartSlotMachine + hidden_object 14, 1, $d0, StartSlotMachine + hidden_object 15, 1, $d0, StartSlotMachine + hidden_object 8, 0, COIN + 10, HiddenCoins + hidden_object 16, 1, COIN + 10, HiddenCoins + hidden_object 11, 3, COIN + 20, HiddenCoins + hidden_object 14, 3, COIN + 10, HiddenCoins + hidden_object 12, 4, COIN + 10, HiddenCoins + hidden_object 12, 9, COIN + 20, HiddenCoins + hidden_object 15, 9, COIN + 10, HiddenCoins + hidden_object 14, 16, COIN + 10, HiddenCoins + hidden_object 16, 10, COIN + 10, HiddenCoins + hidden_object 7, 11, COIN + 40, HiddenCoins + hidden_object 8, 15, COIN + 100, HiddenCoins + hidden_object 15, 12, COIN + 10, HiddenCoins + db $ff + +FuchsiaPokecenterHiddenObjects: + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText + db $ff + +SafariZoneEntranceHiddenObjects: + hidden_object 1, 10, NUGGET, HiddenItems + db $ff + +FuchsiaGymHiddenObjects: + hidden_object 15, 3, SPRITE_FACING_UP, GymStatues + hidden_object 15, 6, SPRITE_FACING_UP, GymStatues + db $ff + +Mansion1HiddenObjects: + hidden_object 16, 8, MOON_STONE, HiddenItems + hidden_object 5, 2, SPRITE_FACING_UP, Mansion1Script_Switches + db $ff + +CinnabarGymHiddenObjects: + hidden_object 13, 17, SPRITE_FACING_UP, GymStatues + hidden_object 7, 15, (0 << 4) | 1, PrintCinnabarQuiz + hidden_object 1, 10, (1 << 4) | 2, PrintCinnabarQuiz + hidden_object 7, 9, (1 << 4) | 3, PrintCinnabarQuiz + hidden_object 13, 9, (1 << 4) | 4, PrintCinnabarQuiz + hidden_object 13, 1, (0 << 4) | 5, PrintCinnabarQuiz + hidden_object 7, 1, (1 << 4) | 6, PrintCinnabarQuiz + db $ff + +CinnabarLab4HiddenObjects: + hidden_object 4, 0, SPRITE_FACING_UP, OpenPokemonCenterPC + hidden_object 4, 2, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +CinnabarPokecenterHiddenObjects: ; 6cc3 + hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + +; 6cd0 diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 4e3fe2c2..71a76e47 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -343,7 +343,7 @@ MapHS2D: ; c925 (3:4925) MapHS34: ; c92b (3:492b) db MUSEUM_1F,$05,Show MapHS3F: ; c92e (3:492e) ; bulbasaur adoption house - db CERULEAN_HOUSE,$02,Show + db CERULEAN_HOUSE_1,$02,Show MapHSE4: ; c931 (3:4931) db UNKNOWN_DUNGEON_1,$01,Show db UNKNOWN_DUNGEON_1,$02,Show diff --git a/data/mapHeaders/beach_house.asm b/data/mapHeaders/beach_house.asm index 99d237f6..04652643 100644 --- a/data/mapHeaders/beach_house.asm +++ b/data/mapHeaders/beach_house.asm @@ -1,4 +1,4 @@ -BeachHouse_h: +BeachHouse_h: ; f220e (3c:620e) db BEACH_HOUSE_TILESET db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x) diff --git a/data/mapHeaders/route5.asm b/data/mapHeaders/route5.asm index d35a8dab..1b8c3ee1 100755 --- a/data/mapHeaders/route5.asm +++ b/data/mapHeaders/route5.asm @@ -1,4 +1,4 @@ -Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16) +Route5_h: ; 0x54589 to 0x545ab (34 bytes) (id=16) db OVERWORLD ; tileset db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 43ba02e4..3dfce6e1 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -8,9 +8,9 @@ BluesHouseObject: ; 19bce (6:5bce) 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/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index 8c429695..ff0f2c66 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -1,17 +1,17 @@ CeruleanCityObject: ; 0x18786 (size=170) - db $f ; border block + db $a ; border block db $a ; warps db $b, $1b, $0, TRASHED_HOUSE - db $f, $d, $0, CERULEAN_HOUSE + db $f, $d, $0, CERULEAN_HOUSE_1 db $11, $13, $0, CERULEAN_POKECENTER db $13, $1e, $0, CERULEAN_GYM db $19, $d, $0, BIKE_SHOP db $19, $19, $0, CERULEAN_MART db $b, $4, $0, UNKNOWN_DUNGEON_1 db $9, $1b, $2, TRASHED_HOUSE - db $b, $9, $1, CERULEAN_HOUSE_3 - db $9, $9, $0, CERULEAN_HOUSE_3 + db $b, $9, $1, CERULEAN_HOUSE_2 + db $9, $9, $0, CERULEAN_HOUSE_2 db $6 ; signs db $13, $17, $c ; CeruleanCityText12 @@ -27,21 +27,21 @@ CeruleanCityObject: ; 0x18786 (size=170) 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 - EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE + EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE_1 EVENT_DISP CERULEAN_CITY_WIDTH, $11, $13 ; CERULEAN_POKECENTER EVENT_DISP CERULEAN_CITY_WIDTH, $13, $1e ; CERULEAN_GYM EVENT_DISP CERULEAN_CITY_WIDTH, $19, $d ; BIKE_SHOP EVENT_DISP CERULEAN_CITY_WIDTH, $19, $19 ; CERULEAN_MART EVENT_DISP CERULEAN_CITY_WIDTH, $b, $4 ; UNKNOWN_DUNGEON_1 EVENT_DISP CERULEAN_CITY_WIDTH, $9, $1b ; TRASHED_HOUSE - EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_3 - EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_3 + EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_2 + EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_2 diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index db0be014..aa9f66a4 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -7,9 +7,11 @@ CeruleanHouse1Object: ; 0x1d710 (size=32) 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 930995dd..4b92f0d8 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -7,11 +7,12 @@ CeruleanPokecenterObject: ; 0x5c65f (size=44) 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/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index 85f801d9..c64760c0 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -33,7 +33,7 @@ FuchsiaCityObject: ; 0x18bd4 (size=178) 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/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index 4f8f911c..4a9b1946 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -9,16 +9,17 @@ MtMoon3Object: ; 0x49fdb (size=102) 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 d6cd35ba..935c4a40 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -7,13 +7,14 @@ MtMoonPokecenterObject: ; 0x49376 (size=56) 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 53d6b85b..5b9a01d5 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -7,18 +7,16 @@ OaksLabObject: ; 0x1d40a (size=88) 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 4832246f..0d45fea3 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -13,7 +13,7 @@ PalletTownObject: ; 0x182c3 (size=58) 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 86757244..d3f87326 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -7,11 +7,13 @@ PewterPokecenterObject: ; 0x5c60d (size=44) 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/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index d2645165..3cd937cf 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -7,11 +7,12 @@ RockTunnelPokecenterObject: ; 0x493d4 (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_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 4e196b20..d0c9af20 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -3,9 +3,9 @@ Route11Object: ; 0x584e0 (size=127) 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 8ed43ff4..783fd49b 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -3,7 +3,7 @@ Route12Object: ; 0x5869a (size=118) 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 e0d19e5c..bd6283b0 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -3,9 +3,9 @@ Route15Object: ; 0x5894e (size=126) 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 600dbbf1..529b59bf 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -3,13 +3,13 @@ Route16Object: ; 0x58afc (size=136) 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 88547941..40b50b08 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -3,9 +3,9 @@ Route18Object: ; 0x58c5a (size=66) 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/route19.asm b/data/mapObjects/route19.asm index 7377e1e6..ec2b8774 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -9,13 +9,16 @@ Route19Object: ; 0x54e9a (size=87) db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2 - object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3 - object SPRITE_SWIMMER, $9, $d, 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 0e6784b2..9731f450 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -1,13 +1,14 @@ Route2Object: ; 0x54022 (size=72) 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: ; 0x54022 (size=72) 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/route24.asm b/data/mapObjects/route24.asm index f8173c9d..115f08d3 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -5,7 +5,7 @@ Route24Object: ; 0x506a4 (size=67) 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: ; 0x506a4 (size=67) 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/route5.asm b/data/mapObjects/route5.asm index d11f8417..7ace428a 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -1,8 +1,8 @@ -Route5Object: ; 0x545a3 (size=47) +Route5Object: ; 0x545ab (size=47) 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 19ac2a8a..c854c91f 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -11,8 +11,8 @@ Route6Object: ; 0x58022 (size=87) 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 485a8694..b84fa190 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -3,9 +3,9 @@ Route7Object: ; 0x48022 (size=47) 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 8c618fc1..9e80ca39 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -4,7 +4,7 @@ Route7GateObject: ; 0x1e185 (size=42) 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 5863129b..38bcca5e 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -3,9 +3,9 @@ Route8Object: ; 0x5814f (size=119) 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 8c3fb54f..61d70dfc 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -2,9 +2,9 @@ Route8GateObject: ; 0x1e247 (size=42) 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 79d0d5ed..6a759608 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -8,7 +8,7 @@ Route9Object: ; 0x546a8 (size=86) 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 69e76ee7..5980659b 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -1,4 +1,4 @@ -SaffronCityObject: ; 0x509dc (size=188) +SaffronCityObject: ; 0x509e2 (size=188) db $f ; border block db $8 ; warps @@ -23,7 +23,7 @@ SaffronCityObject: ; 0x509dc (size=188) 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: ; 0x509dc (size=188) 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/school.asm b/data/mapObjects/school.asm index b60be6c0..4c802e64 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -7,9 +7,10 @@ SchoolObject: ; 0x1d55d (size=32) 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/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index c5602be1..3bfbc947 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -13,21 +13,22 @@ VermilionCityObject: ; 0x189ba (size=133) 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/viridiancity.asm b/data/mapObjects/viridiancity.asm index a2d2815f..79b177f4 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -9,14 +9,14 @@ ViridianCityObject: ; 0x18384 (size=104) 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: ; 0x18384 (size=104) 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 a1d52cfe..8f5d6b0b 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -3,29 +3,31 @@ ViridianForestObject: ; 0x611da (size=127) 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 fc676a6d..891c0636 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -3,7 +3,7 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48) 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 652efb97..74c27d46 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -7,11 +7,12 @@ ViridianPokecenterObject: ; 0x44277 (size=44) 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 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index eeff1974..40cd151f 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -1,252 +1,251 @@ ; see also MapHeaderPointers MapHeaderBanks:: ; fc3e4 (3f:43e4) - dr $fc3e4,$fc4dd - ;db BANK(PalletTown_h) ;PALLET_TOWN - ;db BANK(ViridianCity_h) ; VIRIDIAN_CITY - ;db BANK(PewterCity_h) ; PEWTER_CITY - ;db BANK(CeruleanCity_h) ; CERULEAN_CITY - ;db BANK(LavenderTown_h) ; LAVENDER_TOWN - ;db BANK(VermilionCity_h) ; VERMILION_CITY - ;db BANK(CeladonCity_h) ; CELADON_CITY - ;db BANK(FuchsiaCity_h) ; FUCHSIA_CITY - ;db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND - ;db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU - ;db BANK(SaffronCity_h) ; SAFFRON_CITY - ;db $1 ; unused - ;db BANK(Route1_h) ; ROUTE_1 - ;db BANK(Route2_h) ; ROUTE_2 - ;db BANK(Route3_h) ; ROUTE_3 - ;db BANK(Route4_h) ; ROUTE_4 - ;db BANK(Route5_h) ; ROUTE_5 - ;db BANK(Route6_h) ; ROUTE_6 - ;db BANK(Route7_h) ; ROUTE_7 - ;db BANK(Route8_h) ; ROUTE_8 - ;db BANK(Route9_h) ; ROUTE_9 - ;db BANK(Route10_h) ; ROUTE_10 - ;db BANK(Route11_h) ; ROUTE_11 - ;db BANK(Route12_h) ; ROUTE_12 - ;db BANK(Route13_h) ; ROUTE_13 - ;db BANK(Route14_h) ; ROUTE_14 - ;db BANK(Route15_h) ; ROUTE_15 - ;db BANK(Route16_h) ; ROUTE_16 - ;db BANK(Route17_h) ; ROUTE_17 - ;db BANK(Route18_h) ; ROUTE_18 - ;db BANK(Route19_h) ; ROUTE_19 - ;db BANK(Route20_h) ; ROUTE_20 - ;db BANK(Route21_h) ; ROUTE_21 - ;db BANK(Route22_h) ; ROUTE_22 - ;db BANK(Route23_h) ; ROUTE_23 - ;db BANK(Route24_h) ; ROUTE_24 - ;db BANK(Route25_h) ; ROUTE_25 - ;db BANK(RedsHouse1F_h) - ;db BANK(RedsHouse2F_h) - ;db BANK(BluesHouse_h) - ;db BANK(OaksLab_h) - ;db BANK(ViridianPokecenter_h) - ;db BANK(ViridianMart_h) - ;db BANK(School_h) - ;db BANK(ViridianHouse_h) - ;db BANK(ViridianGym_h) - ;db BANK(DiglettsCaveRoute2_h) - ;db BANK(ViridianForestExit_h) - ;db BANK(Route2House_h) - ;db BANK(Route2Gate_h) - ;db BANK(ViridianForestEntrance_h) - ;db BANK(ViridianForest_h) - ;db BANK(Museum1F_h) - ;db BANK(Museum2F_h) - ;db BANK(PewterGym_h) - ;db BANK(PewterHouse1_h) - ;db BANK(PewterMart_h) - ;db BANK(PewterHouse2_h) - ;db BANK(PewterPokecenter_h) - ;db BANK(MtMoon1_h) - ;db BANK(MtMoon2_h) - ;db BANK(MtMoon3_h) - ;db BANK(CeruleanHouseTrashed_h) - ;db BANK(CeruleanHouse1_h) - ;db BANK(CeruleanPokecenter_h) - ;db BANK(CeruleanGym_h) - ;db BANK(BikeShop_h) - ;db BANK(CeruleanMart_h) - ;db BANK(MtMoonPokecenter_h) - ;db BANK(CeruleanHouseTrashed_h) - ;db BANK(Route5Gate_h) - ;db BANK(UndergroundPathEntranceRoute5_h) - ;db BANK(DayCareM_h) - ;db BANK(Route6Gate_h) - ;db BANK(UndergroundPathEntranceRoute6_h) - ;db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE - ;db BANK(Route7Gate_h) - ;db BANK(UndergroundPathEntranceRoute7_h) - ;db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE - ;db BANK(Route8Gate_h) - ;db BANK(UndergroundPathEntranceRoute8_h) - ;db BANK(RockTunnelPokecenter_h) - ;db BANK(RockTunnel1_h) - ;db BANK(PowerPlant_h) - ;db BANK(Route11Gate_h) - ;db BANK(DiglettsCaveEntranceRoute11_h) - ;db BANK(Route11GateUpstairs_h) - ;db BANK(Route12Gate_h) - ;db BANK(BillsHouse_h) - ;db BANK(VermilionPokecenter_h) - ;db BANK(FanClub_h) - ;db BANK(VermilionMart_h) - ;db BANK(VermilionGym_h) - ;db BANK(VermilionHouse1_h) - ;db BANK(VermilionDock_h) - ;db BANK(SSAnne1_h) - ;db BANK(SSAnne2_h) - ;db BANK(SSAnne3_h) - ;db BANK(SSAnne4_h) - ;db BANK(SSAnne5_h) - ;db BANK(SSAnne6_h) - ;db BANK(SSAnne7_h) - ;db BANK(SSAnne8_h) - ;db BANK(SSAnne9_h) - ;db BANK(SSAnne10_h) - ;db $1D ;unused - ;db $1D ;unused - ;db $1D ;unused - ;db BANK(VictoryRoad1_h) - ;db $1D ;unused - ;db $1D ;unused - ;db $1D ;unused - ;db $1D ;unused - ;db BANK(Lance_h) - ;db $1D ;unused - ;db $1D ;unused - ;db $1D ;unused - ;db $1D ;unused - ;db BANK(HallofFameRoom_h) - ;db BANK(UndergroundPathNS_h) - ;db BANK(Gary_h) - ;db BANK(UndergroundPathWE_h) - ;db BANK(CeladonMart1_h) - ;db BANK(CeladonMart2_h) - ;db BANK(CeladonMart3_h) - ;db BANK(CeladonMart4_h) - ;db BANK(CeladonMartRoof_h) - ;db BANK(CeladonMartElevator_h) - ;db BANK(CeladonMansion1_h) - ;db BANK(CeladonMansion2_h) - ;db BANK(CeladonMansion3_h) - ;db BANK(CeladonMansion4_h) - ;db BANK(CeladonMansion5_h) - ;db BANK(CeladonPokecenter_h) - ;db BANK(CeladonGym_h) - ;db BANK(CeladonGameCorner_h) - ;db BANK(CeladonMart5_h) - ;db BANK(CeladonPrizeRoom_h) - ;db BANK(CeladonDiner_h) - ;db BANK(CeladonHouse_h) - ;db BANK(CeladonHotel_h) - ;db BANK(LavenderPokecenter_h) - ;db BANK(PokemonTower1_h) - ;db BANK(PokemonTower2_h) - ;db BANK(PokemonTower3_h) - ;db BANK(PokemonTower4_h) - ;db BANK(PokemonTower5_h) - ;db BANK(PokemonTower6_h) - ;db BANK(PokemonTower7_h) - ;db BANK(LavenderHouse1_h) - ;db BANK(LavenderMart_h) - ;db BANK(LavenderHouse2_h) - ;db BANK(FuchsiaMart_h) - ;db BANK(FuchsiaHouse1_h) - ;db BANK(FuchsiaPokecenter_h) - ;db BANK(FuchsiaHouse2_h) - ;db BANK(SafariZoneEntrance_h) - ;db BANK(FuchsiaGym_h) - ;db BANK(FuchsiaMeetingRoom_h) - ;db BANK(SeafoamIslands2_h) - ;db BANK(SeafoamIslands3_h) - ;db BANK(SeafoamIslands4_h) - ;db BANK(SeafoamIslands5_h) - ;db BANK(VermilionHouse2_h) - ;db BANK(FuchsiaHouse3_h) - ;db BANK(Mansion1_h) - ;db BANK(CinnabarGym_h) - ;db BANK(Lab1_h) - ;db BANK(Lab2_h) - ;db BANK(Lab3_h) - ;db BANK(Lab4_h) - ;db BANK(CinnabarPokecenter_h) - ;db BANK(CinnabarMart_h) - ;db BANK(CinnabarMart_h) - ;db BANK(IndigoPlateauLobby_h) - ;db BANK(CopycatsHouse1F_h) - ;db BANK(CopycatsHouse2F_h) - ;db BANK(FightingDojo_h) - ;db BANK(SaffronGym_h) - ;db BANK(SaffronHouse1_h) - ;db BANK(SaffronMart_h) - ;db BANK(SilphCo1_h) - ;db BANK(SaffronPokecenter_h) - ;db BANK(SaffronHouse2_h) - ;db BANK(Route15Gate_h) - ;db BANK(Route15GateUpstairs_h) - ;db BANK(Route16Gate_h) - ;db BANK(Route16GateUpstairs_h) - ;db BANK(Route16House_h) - ;db BANK(Route12House_h) - ;db BANK(Route18Gate_h) - ;db BANK(Route18GateUpstairs_h) - ;db BANK(SeafoamIslands1_h) - ;db BANK(Route22Gate_h) - ;db BANK(VictoryRoad2_h) - ;db BANK(Route12GateUpstairs_h) - ;db BANK(VermilionHouse3_h) - ;db BANK(DiglettsCave_h) - ;db BANK(VictoryRoad3_h) - ;db BANK(RocketHideout1_h) - ;db BANK(RocketHideout2_h) - ;db BANK(RocketHideout3_h) - ;db BANK(RocketHideout4_h) - ;db BANK(RocketHideoutElevator_h) - ;db $01 - ;db $01 - ;db $01 - ;db BANK(SilphCo2_h) - ;db BANK(SilphCo3_h) - ;db BANK(SilphCo4_h) - ;db BANK(SilphCo5_h) - ;db BANK(SilphCo6_h) - ;db BANK(SilphCo7_h) - ;db BANK(SilphCo8_h) - ;db BANK(Mansion2_h) - ;db BANK(Mansion3_h) - ;db BANK(Mansion4_h) - ;db BANK(SafariZoneEast_h) - ;db BANK(SafariZoneNorth_h) - ;db BANK(SafariZoneWest_h) - ;db BANK(SafariZoneCenter_h) - ;db BANK(SafariZoneRestHouse1_h) - ;db BANK(SafariZoneSecretHouse_h) - ;db BANK(SafariZoneRestHouse2_h) - ;db BANK(SafariZoneRestHouse3_h) - ;db BANK(SafariZoneRestHouse4_h) - ;db BANK(UnknownDungeon2_h) - ;db BANK(UnknownDungeon3_h) - ;db BANK(UnknownDungeon1_h) - ;db BANK(NameRater_h) - ;db BANK(CeruleanHouse2_h) - ;db $01 - ;db BANK(RockTunnel2_h) - ;db BANK(SilphCo9_h) - ;db BANK(SilphCo10_h) - ;db BANK(SilphCo11_h) - ;db BANK(SilphCoElevator_h) - ;db $11 - ;db $11 - ;db BANK(BattleCenterM_h) - ;db BANK(TradeCenterM_h) - ;db $11 - ;db $11 - ;db $11 - ;db $11 - ;db BANK(Lorelei_h) - ;db BANK(Bruno_h) - ;db BANK(Agatha_h) - ;db BANK(BeachHouse_h)
\ No newline at end of file + db BANK(PalletTown_h) ;PALLET_TOWN + db BANK(ViridianCity_h) ; VIRIDIAN_CITY + db BANK(PewterCity_h) ; PEWTER_CITY + db BANK(CeruleanCity_h) ; CERULEAN_CITY + db BANK(LavenderTown_h) ; LAVENDER_TOWN + db BANK(VermilionCity_h) ; VERMILION_CITY + db BANK(CeladonCity_h) ; CELADON_CITY + db BANK(FuchsiaCity_h) ; FUCHSIA_CITY + db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND + db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU + db BANK(SaffronCity_h) ; SAFFRON_CITY + db $01 ; unused + db BANK(Route1_h) ; ROUTE_1 + db BANK(Route2_h) ; ROUTE_2 + db BANK(Route3_h) ; ROUTE_3 + db BANK(Route4_h) ; ROUTE_4 + db BANK(Route5_h) ; ROUTE_5 + db BANK(Route6_h) ; ROUTE_6 + db BANK(Route7_h) ; ROUTE_7 + db BANK(Route8_h) ; ROUTE_8 + db BANK(Route9_h) ; ROUTE_9 + db BANK(Route10_h) ; ROUTE_10 + db BANK(Route11_h) ; ROUTE_11 + db BANK(Route12_h) ; ROUTE_12 + db BANK(Route13_h) ; ROUTE_13 + db BANK(Route14_h) ; ROUTE_14 + db BANK(Route15_h) ; ROUTE_15 + db BANK(Route16_h) ; ROUTE_16 + db BANK(Route17_h) ; ROUTE_17 + db BANK(Route18_h) ; ROUTE_18 + db BANK(Route19_h) ; ROUTE_19 + db BANK(Route20_h) ; ROUTE_20 + db BANK(Route21_h) ; ROUTE_21 + db BANK(Route22_h) ; ROUTE_22 + db BANK(Route23_h) ; ROUTE_23 + db BANK(Route24_h) ; ROUTE_24 + db BANK(Route25_h) ; ROUTE_25 + db BANK(RedsHouse1F_h) + db BANK(RedsHouse2F_h) + db BANK(BluesHouse_h) + db BANK(OaksLab_h) + db BANK(ViridianPokecenter_h) + db BANK(ViridianMart_h) + db BANK(School_h) + db BANK(ViridianHouse_h) + db BANK(ViridianGym_h) + db BANK(DiglettsCaveRoute2_h) + db BANK(ViridianForestExit_h) + db BANK(Route2House_h) + db BANK(Route2Gate_h) + db BANK(ViridianForestEntrance_h) + db BANK(ViridianForest_h) + db BANK(Museum1F_h) + db BANK(Museum2F_h) + db BANK(PewterGym_h) + db BANK(PewterHouse1_h) + db BANK(PewterMart_h) + db BANK(PewterHouse2_h) + db BANK(PewterPokecenter_h) + db BANK(MtMoon1_h) + db BANK(MtMoon2_h) + db BANK(MtMoon3_h) + db BANK(CeruleanHouseTrashed_h) + db BANK(CeruleanHouse1_h) + db BANK(CeruleanPokecenter_h) + db BANK(CeruleanGym_h) + db BANK(BikeShop_h) + db BANK(CeruleanMart_h) + db BANK(MtMoonPokecenter_h) + db BANK(CeruleanHouseTrashed_h) + db BANK(Route5Gate_h) + db BANK(UndergroundPathEntranceRoute5_h) + db BANK(DayCareM_h) + db BANK(Route6Gate_h) + db BANK(UndergroundPathEntranceRoute6_h) + db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE + db BANK(Route7Gate_h) + db BANK(UndergroundPathEntranceRoute7_h) + db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE + db BANK(Route8Gate_h) + db BANK(UndergroundPathEntranceRoute8_h) + db BANK(RockTunnelPokecenter_h) + db BANK(RockTunnel1_h) + db BANK(PowerPlant_h) + db $12 ; db BANK(Route11Gate_h) + db BANK(DiglettsCaveEntranceRoute11_h) + db $12 ; db BANK(Route11GateUpstairs_h) + db $12 ; db BANK(Route12Gate_h) + db $07 ; db BANK(BillsHouse_h) + db $17 ; db BANK(VermilionPokecenter_h) + db $16 ; db BANK(FanClub_h) + db $17 ; db BANK(VermilionMart_h) + db $17 ; db BANK(VermilionGym_h) + db $07 ; db BANK(VermilionHouse1_h) + db $07 ; db BANK(VermilionDock_h) + db $18 ; db BANK(SSAnne1_h) + db $18 ; db BANK(SSAnne2_h) + db $11 ; db BANK(SSAnne3_h) + db $18 ; db BANK(SSAnne4_h) + db $18 ; db BANK(SSAnne5_h) + db $18 ; db BANK(SSAnne6_h) + db $18 ; db BANK(SSAnne7_h) + db $18 ; db BANK(SSAnne8_h) + db $18 ; db BANK(SSAnne9_h) + db $18 ; db BANK(SSAnne10_h) + db $1d ; unused + db $1d ; unused + db $1d ; unused + db $17 ; db BANK(VictoryRoad1_h) + db $1d ; unused + db $1d ; unused + db $1d ; unused + db $1d ; unused + db $16 ; db BANK(Lance_h) + db $1d ; unused + db $1d ; unused + db $1d ; unused + db $1d ; unused + db $16 ; db BANK(HallofFameRoom_h) + db $18 ; db BANK(UndergroundPathNS_h) + db $1d ; db BANK(Gary_h) + db $18 ; db BANK(UndergroundPathWE_h) + db $11 ; db BANK(CeladonMart1_h) + db $15 ; db BANK(CeladonMart2_h) + db $12 ; db BANK(CeladonMart3_h) + db $12 ; db BANK(CeladonMart4_h) + db $12 ; db BANK(CeladonMartRoof_h) + db $12 ; db BANK(CeladonMartElevator_h) + db $12 ; db BANK(CeladonMansion1_h) + db $12 ; db BANK(CeladonMansion2_h) + db $12 ; db BANK(CeladonMansion3_h) + db $12 ; db BANK(CeladonMansion4_h) + db $07 ; db BANK(CeladonMansion5_h) + db $12 ; db BANK(CeladonPokecenter_h) + db $12 ; db BANK(CeladonGym_h) + db $12 ; db BANK(CeladonGameCorner_h) + db $12 ; db BANK(CeladonMart5_h) + db $12 ; db BANK(CeladonPrizeRoom_h) + db $12 ; db BANK(CeladonDiner_h) + db $12 ; db BANK(CeladonHouse_h) + db $12 ; db BANK(CeladonHotel_h) + db $17 ; db BANK(LavenderPokecenter_h) + db $18 ; db BANK(PokemonTower1_h) + db $18 ; db BANK(PokemonTower2_h) + db $18 ; db BANK(PokemonTower3_h) + db $18 ; db BANK(PokemonTower4_h) + db $18 ; db BANK(PokemonTower5_h) + db $18 ; db BANK(PokemonTower6_h) + db $18 ; db BANK(PokemonTower7_h) + db $07 ; db BANK(LavenderHouse1_h) + db $17 ; db BANK(LavenderMart_h) + db $07 ; db BANK(LavenderHouse2_h) + db $07 ; db BANK(FuchsiaMart_h) + db $1d ; db BANK(FuchsiaHouse1_h) + db $1d ; db BANK(FuchsiaPokecenter_h) + db $1d ; db BANK(FuchsiaHouse2_h) + db $1d ; db BANK(SafariZoneEntrance_h) + db $1d ; db BANK(FuchsiaGym_h) + db $1d ; db BANK(FuchsiaMeetingRoom_h) + db $11 ; db BANK(SeafoamIslands2_h) + db $11 ; db BANK(SeafoamIslands3_h) + db $11 ; db BANK(SeafoamIslands4_h) + db $11 ; db BANK(SeafoamIslands5_h) + db $15 ; db BANK(VermilionHouse2_h) + db $15 ; db BANK(FuchsiaHouse3_h) + db $11 ; db BANK(Mansion1_h) + db $1d ; db BANK(CinnabarGym_h) + db $1d ; db BANK(Lab1_h) + db $1d ; db BANK(Lab2_h) + db $1d ; db BANK(Lab3_h) + db $1d ; db BANK(Lab4_h) + db $1d ; db BANK(CinnabarPokecenter_h) + db $1d ; db BANK(CinnabarMart_h) + db $1d ; db BANK(CinnabarMart_h) + db $06 ; db BANK(IndigoPlateauLobby_h) + db $1d ; db BANK(CopycatsHouse1F_h) + db $17 ; db BANK(CopycatsHouse2F_h) + db $17 ; db BANK(FightingDojo_h) + db $17 ; db BANK(SaffronGym_h) + db $07 ; db BANK(SaffronHouse1_h) + db $17 ; db BANK(SaffronMart_h) + db $17 ; db BANK(SilphCo1_h) + db $17 ; db BANK(SaffronPokecenter_h) + db $07 ; db BANK(SaffronHouse2_h) + db $12 ; db BANK(Route15Gate_h) + db $12 ; db BANK(Route15GateUpstairs_h) + db $12 ; db BANK(Route16Gate_h) + db $12 ; db BANK(Route16GateUpstairs_h) + db $07 ; db BANK(Route16House_h) + db $15 ; db BANK(Route12House_h) + db $12 ; db BANK(Route18Gate_h) + db $12 ; db BANK(Route18GateUpstairs_h) + db $11 ; db BANK(SeafoamIslands1_h) + db $07 ; db BANK(Route22Gate_h) + db $14 ; db BANK(VictoryRoad2_h) + db $12 ; db BANK(Route12GateUpstairs_h) + db $06 ; db BANK(VermilionHouse3_h) + db $18 ; db BANK(DiglettsCave_h) + db $11 ; db BANK(VictoryRoad3_h) + db $11 ; db BANK(RocketHideout1_h) + db $11 ; db BANK(RocketHideout2_h) + db $11 ; db BANK(RocketHideout3_h) + db $11 ; db BANK(RocketHideout4_h) + db $11 ; db BANK(RocketHideoutElevator_h) + db $01 ; unused + db $01 ; unused + db $01 ; unused + db $16 ; db BANK(SilphCo2_h) + db $16 ; db BANK(SilphCo3_h) + db $06 ; db BANK(SilphCo4_h) + db $06 ; db BANK(SilphCo5_h) + db $06 ; db BANK(SilphCo6_h) + db $14 ; db BANK(SilphCo7_h) + db $15 ; db BANK(SilphCo8_h) + db $14 ; db BANK(Mansion2_h) + db $14 ; db BANK(Mansion3_h) + db $14 ; db BANK(Mansion4_h) + db $11 ; db BANK(SafariZoneEast_h) + db $11 ; db BANK(SafariZoneNorth_h) + db $12 ; db BANK(SafariZoneWest_h) + db $11 ; db BANK(SafariZoneCenter_h) + db $11 ; db BANK(SafariZoneRestHouse1_h) + db $12 ; db BANK(SafariZoneSecretHouse_h) + db $11 ; db BANK(SafariZoneRestHouse2_h) + db $11 ; db BANK(SafariZoneRestHouse3_h) + db $11 ; db BANK(SafariZoneRestHouse4_h) + db $11 ; db BANK(UnknownDungeon2_h) + db $11 ; db BANK(UnknownDungeon3_h) + db $1d ; db BANK(UnknownDungeon1_h) + db $07 ; db BANK(NameRater_h) + db $1d ; db BANK(CeruleanHouse2_h) + db $01 ; unused + db $11 ; db BANK(RockTunnel2_h) + db $17 ; db BANK(SilphCo9_h) + db $16 ; db BANK(SilphCo10_h) + db $18 ; db BANK(SilphCo11_h) + db $11 ; db BANK(SilphCoElevator_h) + db $11 ; unused + db $11 ; unused + db BANK(TradeCenter_h) + db BANK(Colosseum_h) + db $11 ; unused + db $11 ; unused + db $11 ; unused + db $11 ; unused + db $1d ; db BANK(Lorelei_h) + db $1d ; db BANK(Bruno_h) + db $1d ; db BANK(Agatha_h) + db BANK(BeachHouse_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index c7dd0c9f..c8e41d14 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -1,252 +1,251 @@ ; see also MapHeaderBanks MapHeaderPointers:: ; fc1f2 (3f:41f2) - dr $fc1f2,$fc3e4 - ;dw PalletTown_h - ;dw ViridianCity_h - ;dw PewterCity_h - ;dw CeruleanCity_h - ;dw LavenderTown_h - ;dw VermilionCity_h - ;dw CeladonCity_h - ;dw FuchsiaCity_h - ;dw CinnabarIsland_h - ;dw IndigoPlateau_h - ;dw SaffronCity_h - ;dw SaffronCity_h - ;dw Route1_h - ;dw Route2_h - ;dw Route3_h - ;dw Route4_h - ;dw Route5_h - ;dw Route6_h - ;dw Route7_h - ;dw Route8_h - ;dw Route9_h - ;dw Route10_h - ;dw Route11_h - ;dw Route12_h - ;dw Route13_h - ;dw Route14_h - ;dw Route15_h - ;dw Route16_h - ;dw Route17_h - ;dw Route18_h - ;dw Route19_h - ;dw Route20_h - ;dw Route21_h - ;dw Route22_h - ;dw Route23_h - ;dw Route24_h - ;dw Route25_h - ;dw RedsHouse1F_h - ;dw RedsHouse2F_h - ;dw BluesHouse_h - ;dw OaksLab_h ;id=40 - ;dw ViridianPokecenter_h - ;dw ViridianMart_h - ;dw School_h - ;dw ViridianHouse_h - ;dw ViridianGym_h - ;dw DiglettsCaveRoute2_h - ;dw ViridianForestExit_h - ;dw Route2House_h - ;dw Route2Gate_h - ;dw ViridianForestEntrance_h ;id=50 - ;dw ViridianForest_h - ;dw Museum1F_h - ;dw Museum2F_h - ;dw PewterGym_h - ;dw PewterHouse1_h - ;dw PewterMart_h - ;dw PewterHouse2_h - ;dw PewterPokecenter_h - ;dw MtMoon1_h - ;dw MtMoon2_h ;id=60 - ;dw MtMoon3_h - ;dw CeruleanHouseTrashed_h - ;dw CeruleanHouse1_h - ;dw CeruleanPokecenter_h - ;dw CeruleanGym_h - ;dw BikeShop_h - ;dw CeruleanMart_h - ;dw MtMoonPokecenter_h - ;dw CeruleanHouseTrashed_h ; copy - ;dw Route5Gate_h - ;dw UndergroundPathEntranceRoute5_h - ;dw DayCareM_h - ;dw Route6Gate_h - ;dw UndergroundPathEntranceRoute6_h - ;dw UndergroundPathEntranceRoute6_h ; unused - ;dw Route7Gate_h - ;dw UndergroundPathEntranceRoute7_h - ;dw UndergroundPathEntranceRoute7Copy_h - ;dw Route8Gate_h - ;dw UndergroundPathEntranceRoute8_h ;id=80 - ;dw RockTunnelPokecenter_h - ;dw RockTunnel1_h - ;dw PowerPlant_h - ;dw Route11Gate_h - ;dw DiglettsCaveEntranceRoute11_h - ;dw Route11GateUpstairs_h - ;dw Route12Gate_h - ;dw BillsHouse_h - ;dw VermilionPokecenter_h - ;dw FanClub_h ;id=90 - ;dw VermilionMart_h - ;dw VermilionGym_h - ;dw VermilionHouse1_h - ;dw VermilionDock_h - ;dw SSAnne1_h - ;dw SSAnne2_h - ;dw SSAnne3_h - ;dw SSAnne4_h - ;dw SSAnne5_h - ;dw SSAnne6_h ;id=100 - ;dw SSAnne7_h - ;dw SSAnne8_h - ;dw SSAnne9_h - ;dw SSAnne10_h - ;dw Lance_h ; unused - ;dw Lance_h ; unused - ;dw Lance_h ; unused - ;dw VictoryRoad1_h - ;dw Lance_h ; unused - ;dw Lance_h ; unused ;id=110 - ;dw Lance_h ; unused - ;dw Lance_h ; unused - ;dw Lance_h - ;dw Lance_h ; unused - ;dw Lance_h ; unused - ;dw Lance_h ; unused - ;dw Lance_h ; unused - ;dw HallofFameRoom_h - ;dw UndergroundPathNS_h - ;dw Gary_h ;id=120 - ;dw UndergroundPathWE_h - ;dw CeladonMart1_h - ;dw CeladonMart2_h - ;dw CeladonMart3_h - ;dw CeladonMart4_h - ;dw CeladonMartRoof_h - ;dw CeladonMartElevator_h - ;dw CeladonMansion1_h - ;dw CeladonMansion2_h - ;dw CeladonMansion3_h ;id=130 - ;dw CeladonMansion4_h - ;dw CeladonMansion5_h - ;dw CeladonPokecenter_h - ;dw CeladonGym_h - ;dw CeladonGameCorner_h - ;dw CeladonMart5_h - ;dw CeladonPrizeRoom_h - ;dw CeladonDiner_h - ;dw CeladonHouse_h - ;dw CeladonHotel_h ;id=140 - ;dw LavenderPokecenter_h - ;dw PokemonTower1_h - ;dw PokemonTower2_h - ;dw PokemonTower3_h - ;dw PokemonTower4_h - ;dw PokemonTower5_h - ;dw PokemonTower6_h - ;dw PokemonTower7_h - ;dw LavenderHouse1_h - ;dw LavenderMart_h ;id=150 - ;dw LavenderHouse2_h - ;dw FuchsiaMart_h - ;dw FuchsiaHouse1_h - ;dw FuchsiaPokecenter_h - ;dw FuchsiaHouse2_h - ;dw SafariZoneEntrance_h - ;dw FuchsiaGym_h - ;dw FuchsiaMeetingRoom_h - ;dw SeafoamIslands2_h - ;dw SeafoamIslands3_h ;id=160 - ;dw SeafoamIslands4_h - ;dw SeafoamIslands5_h - ;dw VermilionHouse2_h - ;dw FuchsiaHouse3_h - ;dw Mansion1_h - ;dw CinnabarGym_h - ;dw Lab1_h - ;dw Lab2_h - ;dw Lab3_h - ;dw Lab4_h ;id=170 - ;dw CinnabarPokecenter_h - ;dw CinnabarMart_h - ;dw CinnabarMart_h ; unused - ;dw IndigoPlateauLobby_h - ;dw CopycatsHouse1F_h - ;dw CopycatsHouse2F_h - ;dw FightingDojo_h - ;dw SaffronGym_h - ;dw SaffronHouse1_h - ;dw SaffronMart_h ;id=180 - ;dw SilphCo1_h - ;dw SaffronPokecenter_h - ;dw SaffronHouse2_h - ;dw Route15Gate_h - ;dw Route15GateUpstairs_h - ;dw Route16Gate_h - ;dw Route16GateUpstairs_h - ;dw Route16House_h - ;dw Route12House_h - ;dw Route18Gate_h ;id=190 - ;dw Route18GateUpstairs_h - ;dw SeafoamIslands1_h - ;dw Route22Gate_h - ;dw VictoryRoad2_h - ;dw Route12GateUpstairs_h - ;dw VermilionHouse3_h - ;dw DiglettsCave_h - ;dw VictoryRoad3_h - ;dw RocketHideout1_h - ;dw RocketHideout2_h ;200 - ;dw RocketHideout3_h - ;dw RocketHideout4_h - ;dw RocketHideoutElevator_h - ;dw RocketHideoutElevator_h ; unused - ;dw RocketHideoutElevator_h ; unused - ;dw RocketHideoutElevator_h ; unused - ;dw SilphCo2_h - ;dw SilphCo3_h - ;dw SilphCo4_h - ;dw SilphCo5_h ;210 - ;dw SilphCo6_h - ;dw SilphCo7_h - ;dw SilphCo8_h - ;dw Mansion2_h - ;dw Mansion3_h - ;dw Mansion4_h - ;dw SafariZoneEast_h - ;dw SafariZoneNorth_h - ;dw SafariZoneWest_h - ;dw SafariZoneCenter_h ;220 - ;dw SafariZoneRestHouse1_h - ;dw SafariZoneSecretHouse_h - ;dw SafariZoneRestHouse2_h - ;dw SafariZoneRestHouse3_h - ;dw SafariZoneRestHouse4_h - ;dw UnknownDungeon2_h - ;dw UnknownDungeon3_h - ;dw UnknownDungeon1_h - ;dw NameRater_h - ;dw CeruleanHouse2_h - ;dw Route16Gate_h ; unused - ;dw RockTunnel2_h - ;dw SilphCo9_h - ;dw SilphCo10_h - ;dw SilphCo11_h - ;dw SilphCoElevator_h - ;dw SilphCo2_h ; unused - ;dw SilphCo2_h ; unused - ;dw BattleCenterM_h - ;dw TradeCenterM_h - ;dw SilphCo2_h ; unused - ;dw SilphCo2_h ; unused - ;dw SilphCo2_h ; unused - ;dw SilphCo2_h ; unused - ;dw Lorelei_h - ;dw Bruno_h - ;dw Agatha_h ;247 - ;dw BeachHouse_h
\ No newline at end of file + dw PalletTown_h + dw ViridianCity_h + dw PewterCity_h + dw CeruleanCity_h + dw LavenderTown_h + dw VermilionCity_h + dw CeladonCity_h + dw FuchsiaCity_h + dw CinnabarIsland_h + dw IndigoPlateau_h + dw SaffronCity_h + dw SaffronCity_h + dw Route1_h + dw Route2_h + dw Route3_h + dw Route4_h + dw Route5_h + dw Route6_h + dw Route7_h + dw Route8_h + dw Route9_h + dw Route10_h + dw Route11_h + dw Route12_h + dw Route13_h + dw Route14_h + dw Route15_h + dw Route16_h + dw Route17_h + dw Route18_h + dw Route19_h + dw Route20_h + dw Route21_h + dw Route22_h + dw Route23_h + dw Route24_h + dw Route25_h + dw RedsHouse1F_h + dw RedsHouse2F_h + dw BluesHouse_h + dw OaksLab_h ;id=40 + dw ViridianPokecenter_h + dw ViridianMart_h + dw School_h + dw ViridianHouse_h + dw ViridianGym_h + dw DiglettsCaveRoute2_h + dw ViridianForestExit_h + dw Route2House_h + dw Route2Gate_h + dw ViridianForestEntrance_h ;id=50 + dw ViridianForest_h + dw Museum1F_h + dw Museum2F_h + dw PewterGym_h + dw PewterHouse1_h + dw PewterMart_h + dw PewterHouse2_h + dw PewterPokecenter_h + dw MtMoon1_h + dw MtMoon2_h ;id=60 + dw MtMoon3_h + dw CeruleanHouseTrashed_h + dw CeruleanHouse1_h + dw CeruleanPokecenter_h + dw CeruleanGym_h + dw BikeShop_h + dw CeruleanMart_h + dw MtMoonPokecenter_h + dw CeruleanHouseTrashed_h ; copy + dw Route5Gate_h + dw UndergroundPathEntranceRoute5_h + dw DayCareM_h + dw Route6Gate_h + dw UndergroundPathEntranceRoute6_h + dw UndergroundPathEntranceRoute6_h ; unused + dw Route7Gate_h + dw UndergroundPathEntranceRoute7_h + dw UndergroundPathEntranceRoute7Copy_h + dw Route8Gate_h + dw UndergroundPathEntranceRoute8_h ;id=80 + dw RockTunnelPokecenter_h + dw RockTunnel1_h + dw PowerPlant_h + dw $5396 ; dw Route11Gate_h + dw DiglettsCaveEntranceRoute11_h + dw $53de ; dw Route11GateUpstairs_h + dw $548f ; dw Route12Gate_h + dw $606e ; dw BillsHouse_h + dw $4865 ; dw VermilionPokecenter_h + dw $5a00 ; dw FanClub_h ;id=90 + dw $48cb ; dw VermilionMart_h + dw $4910 ; dw VermilionGym_h + dw $53f8 ; dw VermilionHouse1_h + dw $544e ; dw VermilionDock_h + dw $52a4 ; dw SSAnne1_h + dw $53de ; dw SSAnne2_h + dw $49bf ; dw SSAnne3_h + dw $5650 ; dw SSAnne4_h + dw $56d0 ; dw SSAnne5_h + dw $57d5 ; dw SSAnne6_h ;id=100 + dw $58b7 ; dw SSAnne7_h + dw $5993 ; dw SSAnne8_h + dw $5b68 ; dw SSAnne9_h + dw $5d60 ; dw SSAnne10_h + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $5909 ; dw VictoryRoad1_h + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused ;id=110 + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $642d ; dw HallofFameRoom_h + dw $5f31 ; dw UndergroundPathNS_h + dw $57a0 ; dw Gary_h ;id=120 + dw $5f55 ; dw UndergroundPathWE_h + dw $42b7 ; dw CeladonMart1_h + dw $60d9 ; dw CeladonMart2_h + dw $4157 ; dw CeladonMart3_h + dw $4251 ; dw CeladonMart4_h + dw $42d0 ; dw CeladonMartRoof_h + dw $44ff ; dw CeladonMartElevator_h + dw $4593 ; dw CeladonMansion1_h + dw $465a ; dw CeladonMansion2_h + dw $46b0 ; dw CeladonMansion3_h ;id=130 + dw $4861 ; dw CeladonMansion4_h + dw $5636 ; dw CeladonMansion5_h + dw $48af ; dw CeladonPokecenter_h + dw $4915 ; dw CeladonGym_h + dw $4bc8 ; dw CeladonGameCorner_h + dw $507f ; dw CeladonMart5_h + dw $5107 ; dw CeladonPrizeRoom_h + dw $5168 ; dw CeladonDiner_h + dw $51e8 ; dw CeladonHouse_h + dw $5243 ; dw CeladonHotel_h ;id=140 + dw $479c ; dw LavenderPokecenter_h + dw $4420 ; dw PokemonTower1_h + dw $44e7 ; dw PokemonTower2_h + dw $46af ; dw PokemonTower3_h + dw $47d9 ; dw PokemonTower4_h + dw $4915 ; dw PokemonTower5_h + dw $4ad2 ; dw PokemonTower6_h + dw $4ce8 ; dw PokemonTower7_h + dw $51a4 ; dw LavenderHouse1_h + dw $4802 ; dw LavenderMart_h ;id=150 + dw $52aa ; dw LavenderHouse2_h + dw $5685 ; dw FuchsiaMart_h + dw $4851 ; dw FuchsiaHouse1_h + dw $489c ; dw FuchsiaPokecenter_h + dw $4902 ; dw FuchsiaHouse2_h + dw $4a1a ; dw SafariZoneEntrance_h + dw $4bd9 ; dw FuchsiaGym_h + dw $4e7f ; dw FuchsiaMeetingRoom_h + dw $6578 ; dw SeafoamIslands2_h + dw $66b4 ; dw SeafoamIslands3_h ;id=160 + dw $67f0 ; dw SeafoamIslands4_h + dw $69fc ; dw SeafoamIslands5_h + dw $6054 ; dw VermilionHouse2_h + dw $6160 ; dw FuchsiaHouse3_h + dw $4344 ; dw Mansion1_h + dw $4ee6 ; dw CinnabarGym_h + dw $53fb ; dw Lab1_h + dw $5490 ; dw Lab2_h + dw $54f6 ; dw Lab3_h + dw $55a0 ; dw Lab4_h ;id=170 + dw $569b ; dw CinnabarPokecenter_h + dw $5701 ; dw CinnabarMart_h + dw $5701 ; dw CinnabarMart_h ; unused + dw $5d45 ; dw IndigoPlateauLobby_h + dw $5746 ; dw CopycatsHouse1F_h + dw $4b5b ; dw CopycatsHouse2F_h + dw $4c47 ; dw FightingDojo_h + dw $4ef7 ; dw SaffronGym_h + dw $56db ; dw SaffronHouse1_h + dw $52f3 ; dw SaffronMart_h ;id=180 + dw $5338 ; dw SilphCo1_h + dw $541f ; dw SaffronPokecenter_h + dw $573a ; dw SaffronHouse2_h + dw $558d ; dw Route15Gate_h + dw $55d5 ; dw Route15GateUpstairs_h + dw $5649 ; dw Route16Gate_h + dw $5796 ; dw Route16GateUpstairs_h + dw $5ef6 ; dw Route16House_h + dw $64a5 ; dw Route12House_h + dw $5801 ; dw Route18Gate_h ;id=190 + dw $5900 ; dw Route18GateUpstairs_h + dw $487e ; dw SeafoamIslands1_h + dw $5f81 ; dw Route22Gate_h + dw $57cc ; dw VictoryRoad2_h + dw $54eb ; dw Route12GateUpstairs_h + dw $5d05 ; dw VermilionHouse3_h + dw $5f79 ; dw DiglettsCave_h + dw $4a0d ; dw VictoryRoad3_h + dw $4c5e ; dw RocketHideout1_h + dw $4ebb ; dw RocketHideout2_h ;200 + dw $52b9 ; dw RocketHideout3_h + dw $54f1 ; dw RocketHideout4_h + dw $5958 ; dw RocketHideoutElevator_h + dw $5958 ; dw RocketHideoutElevator_h ; unused + dw $5958 ; dw RocketHideoutElevator_h ; unused + dw $5958 ; dw RocketHideoutElevator_h ; unused + dw $5c80 ; dw SilphCo2_h + dw $5eea ; dw SilphCo3_h + dw $5e09 ; dw SilphCo4_h + dw $6035 ; dw SilphCo5_h ;210 + dw $62a7 ; dw SilphCo6_h + dw $5b97 ; dw SilphCo7_h + dw $652a ; dw SilphCo8_h + dw $5ff5 ; dw Mansion2_h + dw $620b ; dw Mansion3_h + dw $63d6 ; dw Mansion4_h + dw $5ab3 ; dw SafariZoneEast_h + dw $5bf3 ; dw SafariZoneNorth_h + dw $635a ; dw SafariZoneWest_h + dw $5dfa ; dw SafariZoneCenter_h ;220 + dw $5f35 ; dw SafariZoneRestHouse1_h + dw $64bc ; dw SafariZoneSecretHouse_h + dw $5f72 ; dw SafariZoneRestHouse2_h + dw $5fbd ; dw SafariZoneRestHouse3_h + dw $6008 ; dw SafariZoneRestHouse4_h + dw $6053 ; dw UnknownDungeon2_h + dw $6141 ; dw UnknownDungeon3_h + dw $453d ; dw UnknownDungeon1_h + dw $530e ; dw NameRater_h + dw $4643 ; dw CeruleanHouse2_h + dw $5649 ; dw Route16Gate_h ; unused + dw $624e ; dw RockTunnel2_h + dw $56ba ; dw SilphCo9_h + dw $60c8 ; dw SilphCo10_h + dw $6105 ; dw SilphCo11_h + dw $5a08 ; dw SilphCoElevator_h + dw $5c80 ; dw SilphCo2_h ; unused + dw $5c80 ; dw SilphCo2_h ; unused + dw TradeCenter_h + dw Colosseum_h + dw $5c80 ; dw SilphCo2_h ; unused + dw $5c80 ; dw SilphCo2_h ; unused + dw $5c80 ; dw SilphCo2_h ; unused + dw $5c80 ; dw SilphCo2_h ; unused + dw $59ef ; dw Lorelei_h + dw $5b4a ; dw Bruno_h + dw $5ca1 ; dw Agatha_h ;247 + dw $620e ; dw BeachHouse_h diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index bb0f31ff..865f14d8 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -94,7 +94,7 @@ InternalMapEntries: ; 7140b (1c:540b) IMAP SAFARI_ZONE_REST_HOUSE_4, $8,$C,SafariZoneName IMAP UNKNOWN_DUNGEON_1, $9,$1,CeruleanCaveName IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName - IMAP CERULEAN_HOUSE_3, $A,$2,CeruleanCityName + IMAP CERULEAN_HOUSE_2, $A,$2,CeruleanCityName IMAP ROCK_TUNNEL_2, $E,$3,RockTunnelName IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName |