From 219eddf056933c6e5f06903caa73d49de3118a60 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 24 May 2016 17:41:33 -0400 Subject: Update hidden object functions and include them in main --- data/hidden_objects.asm | 606 ++++++++++++++++++------------------------------ 1 file changed, 221 insertions(+), 385 deletions(-) (limited to 'data/hidden_objects.asm') diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 8170cf5a..2750a8fa 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -1,244 +1,137 @@ -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 +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 -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 - ; format: y-coord, x-coord, text id/item id, object routine TradeCenterHiddenObjects: ; 46b40 (11:6b40) db $04,$05,$d0 - db BANK(CableClubRightGameboy) - dw CableClubRightGameboy + dba CableClubRightGameboy db $04,$04,$d0 - db BANK(CableClubLeftGameboy) - dw CableClubLeftGameboy + dba CableClubLeftGameboy db $FF ColosseumHiddenObjects: ; 46b4d (11:6b4d) db $04,$05,$d0 - db BANK(CableClubRightGameboy) - dw CableClubRightGameboy + dba CableClubRightGameboy db $04,$04,$d0 - db BANK(CableClubLeftGameboy) - dw CableClubLeftGameboy + dba CableClubLeftGameboy db $FF RedsHouse2FHiddenObjects: ; 46b5a (11:6b5a) db $01,$00,$04 - dbw BANK(OpenRedsPC), OpenRedsPC + dba OpenRedsPC db $05,$03,$d0 - dbw BANK(PrintRedsNESText), PrintRedsNESText + dba PrintRedsNESText db $FF BluesHouseHiddenObjects: ; 46b67 (11:6b67) db $01,$00,$04 - db BANK(PrintBookcaseText) - dw PrintBookcaseText + dba PrintBookcaseText db $01,$01,$04 - db BANK(PrintBookcaseText) - dw PrintBookcaseText + dba PrintBookcaseText db $01,$07,$04 - db BANK(PrintBookcaseText) - dw PrintBookcaseText + dba PrintBookcaseText db $FF OaksLabHiddenObjects: ; 46b7a (11:6b7a) db $00,$04,$04 - db BANK(DisplayOakLabLeftPoster) - dw DisplayOakLabLeftPoster + dba DisplayOakLabLeftPoster db $00,$05,$04 - db BANK(DisplayOakLabRightPoster) - dw DisplayOakLabRightPoster + dba DisplayOakLabRightPoster db $01,$00,$04 - db BANK(DisplayOakLabEmailText) - dw DisplayOakLabEmailText + dba DisplayOakLabEmailText db $01,$01,$04 - db BANK(DisplayOakLabEmailText) - dw DisplayOakLabEmailText + dba DisplayOakLabEmailText db $FF ViridianPokecenterHiddenObjects: ; 46b93 (11:6b93) db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba 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 + dba PrintNotebookText db $00,$03,(ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1 - db BANK(PrintBlackboardLinkCableText) - dw PrintBlackboardLinkCableText + dba PrintBlackboardLinkCableText db $FF ViridianGymHiddenObjects: ; 46bae (11:6bae) db $0f,$0f,$04 @@ -248,9 +141,9 @@ ViridianGymHiddenObjects: ; 46bae (11:6bae) db $FF Museum1FHiddenObjects: ; 46bbb (11:6bbb) db $03,$02,$04 - dbw BANK(AerodactylFossil), AerodactylFossil + dba AerodactylFossil db $06,$02,$04 - dbw BANK(KabutopsFossil), KabutopsFossil + dba KabutopsFossil db $FF PewterGymHiddenObjects: ; 46bc8 (11:6bc8) db $0a,$03,$04 @@ -262,19 +155,15 @@ PewterMartHiddenObjects: ; 46bd5 (11:6bd5) db $FF PewterPokecenterHiddenObjects: ; 46bd6 (11:6bd6) db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF CeruleanPokecenterHiddenObjects: ; 46be3 (11:6be3) db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF CeruleanGymHiddenObjects: ; 46bf0 (11:6bf0) db $0b,$03,$04 @@ -286,70 +175,63 @@ CeruleanMartHiddenObjects: ; 46bfd (11:6bfd) db $FF LavenderPokecenterHiddenObjects: ; 46bfe (11:6bfe) db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF VermilionPokecenterHiddenObjects: ; 46c0b (11:6c0b) db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $FF VermilionGymHiddenObjects: ; 46c18 (11:6c18) db $0e,$03,$04 - dbw BANK(GymStatues), GymStatues + dba GymStatues db $0e,$06,$04 - dbw BANK(GymStatues), GymStatues + dba GymStatues db $01,$06,$00 - dbw BANK(PrintTrashText), PrintTrashText + dba PrintTrashText db $07,$01,$00 - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $09,$01,$01 - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $0b,$01,$02 - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $07,$03,$03 - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $09,$03,$04 - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $0b,$03,$05 - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $07,$05,$06 - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $09,$05,$07 - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $0b,$05,$08 - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $07,$07,$09 - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $09,$07,$0a - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $0b,$07,$0b - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $07,$09,$0c - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $09,$09,$0d - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $0b,$09,$0e - dbw BANK(GymTrashScript), GymTrashScript + dba GymTrashScript db $FF CeladonMansion2HiddenObjects: ; 46c85 (11:6c85) db $05,$00,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF CeladonPokecenterHiddenObjects: ; 46c8c (11:6c8c) db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF CeladonGymHiddenObjects: ; 46c99 (11:6c99) db $0f,$03,$04 @@ -359,77 +241,77 @@ CeladonGymHiddenObjects: ; 46c99 (11:6c99) db $FF GameCornerHiddenObjects: ; 46ca6 (11:6ca6) db $0f,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0e,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0d,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0c,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0b,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0a,$12,$ff ; "Someone's Keys" - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0a,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0b,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0c,$0d,$fe ; "Out To Lunch" - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0d,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0e,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0f,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0f,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0e,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0d,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0c,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0b,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0a,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0a,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0b,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0c,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0d,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0e,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0f,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0f,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0e,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0d,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0c,$06,$fd ; "Out Of Order" - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0b,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0a,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0a,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0b,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0c,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0d,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0e,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $0f,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine + dba StartSlotMachine db $08,$00,COIN+10 dbw BANK(HiddenCoins),HiddenCoins db $10,$01,COIN+10 @@ -457,19 +339,15 @@ GameCornerHiddenObjects: ; 46ca6 (11:6ca6) db $FF CeladonHotelHiddenObjects: ; 46dc7 (11:6dc7) db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $FF FuchsiaPokecenterHiddenObjects: ; 46dd4 (11:6dd4) db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $FF FuchsiaGymHiddenObjects: ; 46de1 (11:6de1) db $0f,$03,$04 @@ -481,31 +359,23 @@ CinnabarGymHiddenObjects: ; 46dee (11:6dee) db $0d,$11,$04 dbw BANK(GymStatues),GymStatues db $07,$0f,$01 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz + dba PrintCinnabarQuiz db $01,$0a,$12 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz + dba PrintCinnabarQuiz db $07,$09,$13 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz + dba PrintCinnabarQuiz db $0d,$09,$14 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz + dba PrintCinnabarQuiz db $0d,$01,$05 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz + dba PrintCinnabarQuiz db $07,$01,$16 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz + dba PrintCinnabarQuiz db $FF CinnabarPokecenterHiddenObjects: ; 46e19 (11:6e19) db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF SaffronGymHiddenObjects: ; 46e26 (11:6e26) db $0f,$09,$04 @@ -513,19 +383,15 @@ SaffronGymHiddenObjects: ; 46e26 (11:6e26) db $FF MtMoonPokecenterHiddenObjects: ; 46e2d (11:6e2d) db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF RockTunnelPokecenterHiddenObjects: ; 46e3a (11:6e3a) db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF ViridianForestHiddenObjects: ; 46e47 (11:6e47) db $12,$01,POTION @@ -541,11 +407,9 @@ MtMoon3HiddenObjects: ; 46e54 (11:6e54) db $FF IndigoPlateauHiddenObjects: ; 46e61 (11:6e61) db $0d,$08,$ff - db BANK(PrintIndigoPlateauHQText) - dw PrintIndigoPlateauHQText + dba PrintIndigoPlateauHQText db $0d,$0b,$00 - db BANK(PrintIndigoPlateauHQText) - dw PrintIndigoPlateauHQText + dba PrintIndigoPlateauHQText db $FF Route25HiddenObjects: ; 46e6e (11:6e6e) db $03,$26,ETHER @@ -559,9 +423,9 @@ Route9HiddenObjects: ; 46e7b (11:6e7b) db $FF SSAnne6HiddenObjects: ; 46e82 (11:6e82) db $05,$0d,$00 - dbw BANK(PrintTrashText), PrintTrashText + dba PrintTrashText db $07,$0d,$00 - dbw BANK(PrintTrashText), PrintTrashText + dba PrintTrashText db $09,$0d,GREAT_BALL dbw BANK(HiddenItems),HiddenItems db $FF @@ -589,11 +453,9 @@ RocketHideout4HiddenObjects: ; 46eb7 (11:6eb7) db $FF SaffronPokecenterHiddenObjects: ; 46ebe (11:6ebe) db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF PokemonTower5HiddenObjects: ; 46ecb (11:6ecb) db $0c,$04,ELIXER @@ -651,30 +513,25 @@ Mansion1HiddenObjects: ; 46f2b (11:6f2b) db $10,$08,MOON_STONE dbw BANK(HiddenItems),HiddenItems db $05,$02,$04 - db BANK(Mansion1Script_Switches) - dw Mansion1Script_Switches + dba Mansion1Script_Switches db $FF Mansion2HiddenObjects: ; 46f38 (11:6f38) db $0b,$02,$04 - db BANK(Mansion2Script_Switches) - dw Mansion2Script_Switches + dba 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 + dba 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 + dba Mansion4Script_Switches db $19,$12,$04 - db BANK(Mansion4Script_Switches) - dw Mansion4Script_Switches + dba Mansion4Script_Switches db $FF Route23HiddenObjects: ; 46f5f (11:6f5f) db $2c,$09,FULL_RESTORE @@ -696,7 +553,7 @@ Unused6FHiddenObjects: ; 46f7f (11:6f7f) db $FF BillsHouseHiddenObjects: ; 46f86 (11:6f86) db $04,$01,$04 - dbw BANK(BillsHousePC), BillsHousePC + dba BillsHousePC db $FF ViridianCityHiddenObjects: ; 46f8d (11:6f8d) db $04,$0e,POTION @@ -704,95 +561,75 @@ ViridianCityHiddenObjects: ; 46f8d (11:6f8d) db $FF SafariZoneRestHouse2HiddenObjects: ; 46f94 (11:6f94) db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF SafariZoneRestHouse3HiddenObjects: ; 46fa1 (11:6fa1) db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF SafariZoneRestHouse4HiddenObjects: ; 46fae (11:6fae) db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText + dba PrintBenchGuyText db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF Route15GateUpstairsHiddenObjects: ; 46fbb (11:6fbb) db $02,$01,$04 - db BANK(Route15GateLeftBinoculars) - dw Route15GateLeftBinoculars + dba Route15GateLeftBinoculars db $FF LavenderHouse1HiddenObjects: ; 46fc2 (11:6fc2) db $01,$00,$00 - db BANK(PrintMagazinesText) - dw PrintMagazinesText + dba PrintMagazinesText db $01,$01,$00 - db BANK(PrintMagazinesText) - dw PrintMagazinesText + dba PrintMagazinesText db $01,$07,$00 - db BANK(PrintMagazinesText) - dw PrintMagazinesText + dba PrintMagazinesText db $FF CeladonMansion5HiddenObjects: ; 46fd5 (11:6fd5) db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1 - db BANK(PrintBlackboardLinkCableText) - dw PrintBlackboardLinkCableText + dba PrintBlackboardLinkCableText db $00,$04,(LinkCableHelp_id - TextPredefs) / 2 + 1 - db BANK(PrintBlackboardLinkCableText) - dw PrintBlackboardLinkCableText + dba PrintBlackboardLinkCableText db $04,$03,(TMNotebook_id - TextPredefs) / 2 + 1 - db Bank(PrintNotebookText) - dw PrintNotebookText + dba PrintNotebookText db $FF FightingDojoHiddenObjects: ; 46fe8 (11:6fe8) db $09,$03,$04 - db BANK(PrintFightingDojoText) - dw PrintFightingDojoText + dba PrintFightingDojoText db $09,$06,$04 - db BANK(PrintFightingDojoText) - dw PrintFightingDojoText + dba PrintFightingDojoText db $00,$04,$04 - db BANK(PrintFightingDojoText2) - dw PrintFightingDojoText2 + dba PrintFightingDojoText2 db $00,$05,$04 - db BANK(PrintFightingDojoText3) - dw PrintFightingDojoText3 + dba PrintFightingDojoText3 db $FF IndigoPlateauLobbyHiddenObjects: ; 47001 (11:7001) db $07,$0f,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF CinnabarLab4HiddenObjects: ; 47008 (11:7008) db $04,$00,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $04,$02,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF BikeShopHiddenObjects: ; 47015 (11:7015) db $00,$01,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText + dba PrintNewBikeText db $01,$02,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText + dba PrintNewBikeText db $02,$01,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText + dba PrintNewBikeText db $02,$03,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText + dba PrintNewBikeText db $04,$00,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText + dba PrintNewBikeText db $05,$01,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText + dba PrintNewBikeText db $FF Route11HiddenObjects: ; 4703a (11:703a) db $05,$30,ESCAPE_ROPE @@ -804,8 +641,7 @@ Route12HiddenObjects: ; 47041 (11:7041) db $FF SilphCo11FHiddenObjects: ; 47048 (11:7048) db $0c,$0a,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC + dba OpenPokemonCenterPC db $FF Route17HiddenObjects: ; 4704f (11:704f) db $0e,$0f,RARE_CANDY -- cgit v1.3.1-sl0p From 87b20762d539888b031aba92b574108f5f817815 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 24 May 2016 18:54:06 -0400 Subject: Numerous changes (see below) * Fix build errors from previous commit * Fix predef text pointers * Disassemble hidden object data and additional accessory functions --- constants/predef_constants.asm | 2 +- constants/tx_pre_constants.asm | 140 +++--- data/hidden_objects.asm | 947 +++++++++++++++++------------------ engine/bank3c.asm | 78 +-- engine/game_corner_slots2.asm | 4 +- engine/hidden_object_functions17.asm | 109 ++-- engine/hidden_object_functions18.asm | 30 +- engine/overworld/hidden_items.asm | 17 +- home.asm | 143 +++--- hram.asm | 2 + macros.asm | 4 +- main.asm | 10 +- 12 files changed, 741 insertions(+), 745 deletions(-) (limited to 'data/hidden_objects.asm') diff --git a/constants/predef_constants.asm b/constants/predef_constants.asm index 14d1029d..d1e81a72 100644 --- a/constants/predef_constants.asm +++ b/constants/predef_constants.asm @@ -98,4 +98,4 @@ const_value = 0 predef_const DrawHP ; 5F predef_const DrawHP2 predef_const Func_1c9c6 - predef_const OaksAideScript \ No newline at end of file + predef_const OaksAideScript diff --git a/constants/tx_pre_constants.asm b/constants/tx_pre_constants.asm index e2bade58..0e06a8e3 100644 --- a/constants/tx_pre_constants.asm +++ b/constants/tx_pre_constants.asm @@ -1,70 +1,72 @@ -const_value = 1 +; const_value = 1 - tx_pre_const CardKeySuccessText ; 01 - tx_pre_const CardKeyFailText ; 02 - tx_pre_const RedBedroomPCText ; 03 - tx_pre_const RedBedroomSNESText ; 04 - tx_pre_const PushStartText ; 05 - tx_pre_const SaveOptionText ; 06 - tx_pre_const StrengthsAndWeaknessesText ; 07 - tx_pre_const OakLabEmailText ; 08 - tx_pre_const AerodactylFossilText ; 09 - tx_pre_const Route15UpstairsBinocularsText ; 0A - tx_pre_const KabutopsFossilText ; 0B - tx_pre_const GymStatueText1 ; 0C - tx_pre_const GymStatueText2 ; 0D - tx_pre_const BookcaseText ; 0E - tx_pre_const ViridianCityPokecenterBenchGuyText ; 0F - tx_pre_const PewterCityPokecenterBenchGuyText ; 10 - tx_pre_const CeruleanCityPokecenterBenchGuyText ; 11 - tx_pre_const LavenderCityPokecenterBenchGuyText ; 12 - tx_pre_const VermilionCityPokecenterBenchGuyText ; 13 - tx_pre_const CeladonCityPokecenterBenchGuyText ; 14 - tx_pre_const CeladonCityHotelText ; 15 - tx_pre_const FuchsiaCityPokecenterBenchGuyText ; 16 - tx_pre_const CinnabarIslandPokecenterBenchGuyText ; 17 - tx_pre_const SaffronCityPokecenterBenchGuyText ; 18 - tx_pre_const MtMoonPokecenterBenchGuyText ; 19 - tx_pre_const RockTunnelPokecenterBenchGuyText ; 1A - tx_pre_const UnusedBenchGuyText1 ; 1B XXX unused - tx_pre_const UnusedBenchGuyText2 ; 1C XXX unused - tx_pre_const UnusedBenchGuyText3 ; 1D XXX unused - tx_pre_const UnusedPredefText ; 1E XXX unused - tx_pre_const PokemonCenterPCText ; 1F - tx_pre_const ViridianSchoolNotebook ; 20 - tx_pre_const ViridianSchoolBlackboard ; 21 - tx_pre_const FakeTextPredef22 - tx_pre_const FakeTextPredef23 - tx_pre_const JustAMomentText ; 22 - tx_pre_const OpenBillsPCText ; 23 - tx_pre_const FoundHiddenItemText ; 24 - tx_pre_const HiddenItemBagFullText ; 25 XXX unused - tx_pre_const VermilionGymTrashText ; 26 - tx_pre_const IndigoPlateauHQText ; 27 - tx_pre_const GameCornerOutOfOrderText ; 28 - tx_pre_const GameCornerOutToLunchText ; 29 - tx_pre_const GameCornerSomeonesKeysText ; 2A - tx_pre_const FoundHiddenCoinsText ; 2B - tx_pre_const DroppedHiddenCoinsText ; 2C - tx_pre_const BillsHouseMonitorText ; 2D - tx_pre_const BillsHouseInitiatedText ; 2E - tx_pre_const BillsHousePokemonList ; 2F - tx_pre_const MagazinesText ; 30 - tx_pre_const CinnabarGymQuiz ; 31 - tx_pre_const GameCornerNoCoinsText ; 32 - tx_pre_const GameCornerCoinCaseText ; 33 - tx_pre_const LinkCableHelp ; 34 - tx_pre_const TMNotebook ; 35 - tx_pre_const FightingDojoText ; 36 - tx_pre_const EnemiesOnEverySideText ; 37 - tx_pre_const WhatGoesAroundComesAroundText ; 38 - tx_pre_const NewBicycleText ; 39 - tx_pre_const IndigoPlateauStatues ; 3A - tx_pre_const VermilionGymTrashSuccesText1 ; 3B - tx_pre_const VermilionGymTrashSuccesText2 ; 3C XXX unused - tx_pre_const VermilionGymTrashSuccesText3 ; 3D - tx_pre_const VermilionGymTrashFailText ; 3E - tx_pre_const TownMapText ; 3F - tx_pre_const BookOrSculptureText ; 40 - tx_pre_const ElevatorText ; 41 - tx_pre_const PokemonStuffText ; 42 \ No newline at end of file + ; tx_pre_const CardKeySuccessText ; 01 + ; tx_pre_const CardKeyFailText ; 02 + ; tx_pre_const RedBedroomPCText ; 03 + ; tx_pre_const RedBedroomSNESText ; 04 + ; tx_pre_const PushStartText ; 05 + ; tx_pre_const SaveOptionText ; 06 + ; tx_pre_const StrengthsAndWeaknessesText ; 07 + ; tx_pre_const OakLabEmailText ; 08 + ; tx_pre_const AerodactylFossilText ; 09 + ; tx_pre_const Route15UpstairsBinocularsText ; 0A + ; tx_pre_const KabutopsFossilText ; 0B + ; tx_pre_const FanClubRapidashText ; 0C + ; tx_pre_const FanClubFearowText ; 0D + ; tx_pre_const GymStatueText1 ; 0E + ; tx_pre_const GymStatueText2 ; 0F + ; tx_pre_const BookcaseText ; 10 + ; tx_pre_const ViridianCityPokecenterBenchGuyText ; 11 + ; tx_pre_const PewterCityPokecenterBenchGuyText ; 12 + ; tx_pre_const CeruleanCityPokecenterBenchGuyText ; 13 + ; tx_pre_const LavenderCityPokecenterBenchGuyText ; 14 + ; tx_pre_const VermilionCityPokecenterBenchGuyText ; 15 + ; tx_pre_const CeladonCityPokecenterBenchGuyText ; 16 + ; tx_pre_const CeladonCityHotelText ; 17 + ; tx_pre_const FuchsiaCityPokecenterBenchGuyText ; 18 + ; tx_pre_const CinnabarIslandPokecenterBenchGuyText ; 19 + ; tx_pre_const SaffronCityPokecenterBenchGuyText ; 1A + ; tx_pre_const MtMoonPokecenterBenchGuyText ; 1B + ; tx_pre_const RockTunnelPokecenterBenchGuyText ; 1C + ; tx_pre_const UnusedBenchGuyText1 ; 1D + ; tx_pre_const UnusedBenchGuyText2 ; 1E + ; tx_pre_const UnusedBenchGuyText3 ; 1F + ; tx_pre_const UnusedPredefText ; 20 + ; tx_pre_const PokemonCenterPCText ; 21 + ; tx_pre_const ViridianSchoolNotebook ; 22 + ; tx_pre_const ViridianSchoolBlackboard ; 23 + ; tx_pre_const FakeTextPredef22 + ; tx_pre_const FakeTextPredef23 + ; tx_pre_const JustAMomentText ; 24 + ; tx_pre_const OpenBillsPCText ; 25 + ; tx_pre_const FoundHiddenItemText ; 26 + ; tx_pre_const HiddenItemBagFullText ; 27 + ; tx_pre_const VermilionGymTrashText ; 28 + ; tx_pre_const IndigoPlateauHQText ; 29 + ; tx_pre_const GameCornerOutOfOrderText ; 2A + ; tx_pre_const GameCornerOutToLunchText ; 2B + ; tx_pre_const GameCornerSomeonesKeysText ; 2C + ; tx_pre_const FoundHiddenCoinsText ; 2D + ; tx_pre_const DroppedHiddenCoinsText ; 2E + ; tx_pre_const BillsHouseMonitorText ; 2F + ; tx_pre_const BillsHouseInitiatedText ; 30 + ; tx_pre_const BillsHousePokemonList ; 31 + ; tx_pre_const MagazinesText ; 32 + ; tx_pre_const CinnabarGymQuiz ; 33 + ; tx_pre_const GameCornerNoCoinsText ; 34 + ; tx_pre_const GameCornerCoinCaseText ; 35 + ; tx_pre_const LinkCableHelp ; 36 + ; tx_pre_const TMNotebook ; 37 + ; tx_pre_const FightingDojoText ; 38 + ; tx_pre_const EnemiesOnEverySideText ; 39 + ; tx_pre_const WhatGoesAroundComesAroundText ; 3A + ; tx_pre_const NewBicycleText ; 3B + ; tx_pre_const IndigoPlateauStatues ; 3C XXX unused + ; tx_pre_const VermilionGymTrashSuccesText1 ; 3D + ; tx_pre_const VermilionGymTrashSuccesText2 ; 3E + ; tx_pre_const VermilionGymTrashSuccesText3 ; 3F + ; tx_pre_const VermilionGymTrashFailText ; 40 + ; tx_pre_const TownMapText ; 41 + ; tx_pre_const BookOrSculptureText ; 42 + ; tx_pre_const ElevatorText ; 43 + ; tx_pre_const PokemonStuffText ; 44 diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 2750a8fa..5b2b27d0 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -83,607 +83,592 @@ HiddenObjectMaps: ; f268d (3c:668d) db $FF ; format: y-coord, x-coord, text id/item id, object routine -TradeCenterHiddenObjects: ; 46b40 (11:6b40) - db $04,$05,$d0 +SilphCo11FHiddenObjects: + db $0c, $0a, $04 + dba OpenPokemonCenterPC + db $FF +SilphCo5FHiddenObjects: + db $03, $0c, $52 + dba HiddenItems + db $FF +SilphCo9FHiddenObjects: + db $0f, $02, $11 + dba HiddenItems + db $FF +Mansion2HiddenObjects: + db $0b, $02, $04 + dba Mansion2Script_Switches + db $FF +Mansion3HiddenObjects: + db $09, $01, $36 + dba HiddenItems + db $05, $0a, $04 + dba Mansion3Script_Switches + db $FF +Mansion4HiddenObjects: + db $09, $01, $28 + dba HiddenItems + db $03, $14, $04 + dba Mansion4Script_Switches + db $19, $12, $04 + dba Mansion4Script_Switches + db $FF +SafariZoneWestHiddenObjects: + db $05, $06, $35 + dba HiddenItems + db $FF +UnknownDungeon2HiddenObjects: + db $0d, $10, $4f + dba HiddenItems + db $FF +UnknownDungeon3HiddenObjects: + db $0e, $08, $4f + dba HiddenItems + db $FF +UnusedMap6FHiddenObjects: + db $0b, $0e, $53 + dba HiddenItems + db $FF +SeafoamIslands3HiddenObjects: + db $0f, $0f, $31 + dba HiddenItems + db $FF +SeafoamIslands4HiddenObjects: + db $10, $09, $53 + dba HiddenItems + db $FF +SeafoamIslands5HiddenObjects: + db $11, $19, $02 + dba HiddenItems + db $FF +ViridianForestHiddenObjects: + db $12, $01, $14 + dba HiddenItems + db $2a, $10, $0b + dba HiddenItems + db $FF +MtMoon3HiddenObjects: + db $0c, $12, $0a + dba HiddenItems + db $09, $21, $50 + dba HiddenItems + db $FF +SSAnne10HiddenObjects: + db $01, $03, $12 + dba HiddenItems + db $FF +SSAnne6HiddenObjects: + db $05, $0d, $00 + dba PrintTrashText + db $07, $0d, $00 + dba PrintTrashText + db $09, $0d, $03 + dba HiddenItems + db $FF +UndergroundPathNsHiddenObjects: + db $04, $03, $10 + dba HiddenItems + db $22, $04, $44 + dba HiddenItems + db $FF +UndergroundPathWeHiddenObjects: + db $02, $0c, $31 + dba HiddenItems + db $05, $15, $52 + dba HiddenItems + db $FF +RocketHideout1HiddenObjects: + db $0f, $15, $4f + dba HiddenItems + db $FF +RocketHideout3HiddenObjects: + db $11, $1b, $31 + dba HiddenItems + db $FF +RocketHideout4HiddenObjects: + db $01, $19, $13 + dba HiddenItems + db $FF +Route10HiddenObjects: + db $11, $09, $13 + dba HiddenItems + db $35, $10, $51 + dba HiddenItems + db $FF +RockTunnelPokecenterHiddenObjects: + db $04, $00, $08 + dba PrintBenchGuyText + db $03, $0d, $04 + dba OpenPokemonCenterPC + db $FF +PowerPlantHiddenObjects: + db $10, $11, $53 + dba HiddenItems + db $01, $0c, $4f + dba HiddenItems + db $FF +Route11HiddenObjects: + db $05, $30, $1d + dba HiddenItems + db $FF +Route12HiddenObjects: + db $3f, $02, $12 + dba HiddenItems + db $FF +Route13HiddenObjects: + db $0e, $01, $4f + dba HiddenItems + db $0d, $10, $27 + dba HiddenItems + db $FF +Route15Gate2FHiddenObjects: + db $02, $01, $04 + dba Route15GateLeftBinoculars + db $FF +Route17HiddenObjects: + db $0e, $0f, $28 + dba HiddenItems + db $2d, $08, $10 + dba HiddenItems + db $48, $11, $4f + dba HiddenItems + db $5b, $04, $36 + dba HiddenItems + db $79, $08, $53 + dba HiddenItems + db $FF +Route23HiddenObjects: + db $2c, $09, $10 + dba HiddenItems + db $46, $13, $02 + dba HiddenItems + db $5a, $08, $51 + dba HiddenItems + db $FF +VictoryRoad2HiddenObjects: + db $02, $05, $02 + dba HiddenItems + db $07, $1a, $10 + dba HiddenItems + db $FF +Route25HiddenObjects: + db $03, $26, $50 + dba HiddenItems + db $01, $0a, $52 + dba HiddenItems + db $FF +BillsHouseHiddenObjects: + db $04, $01, $04 + dba BillsHousePC + db $FF +Route4HiddenObjects: + db $03, $28, $03 + dba HiddenItems + db $FF +MtMoonPokecenterHiddenObjects: + db $04, $00, $08 + dba PrintBenchGuyText + db $03, $0d, $04 + dba OpenPokemonCenterPC + db $FF +Route9HiddenObjects: + db $07, $0e, $50 + dba HiddenItems + db $FF +TradeCenterHiddenObjects: + db $04, $05, $d0 dba CableClubRightGameboy - db $04,$04,$d0 + db $04, $04, $d0 dba CableClubLeftGameboy db $FF -ColosseumHiddenObjects: ; 46b4d (11:6b4d) - db $04,$05,$d0 +ColosseumHiddenObjects: + db $04, $05, $d0 dba CableClubRightGameboy - db $04,$04,$d0 + db $04, $04, $d0 dba CableClubLeftGameboy db $FF -RedsHouse2FHiddenObjects: ; 46b5a (11:6b5a) - db $01,$00,$04 +IndigoPlateauHiddenObjects: + db $0d, $08, $ff + dba PrintIndigoPlateauHQText + db $0d, $0b, $00 + dba PrintIndigoPlateauHQText + db $FF +IndigoPlateauLobbyHiddenObjects: + db $07, $0f, $04 + dba OpenPokemonCenterPC + db $FF +CopycatsHouse2FHiddenObjects: + db $01, $01, $31 + dba HiddenItems + db $FF +FightingDojoHiddenObjects: + db $09, $03, $04 + dba PrintFightingDojoText + db $09, $06, $04 + dba PrintFightingDojoText + db $00, $04, $04 + dba PrintFightingDojoText2 + db $00, $05, $04 + dba PrintFightingDojoText3 + db $FF +SaffronGymHiddenObjects: + db $0f, $09, $04 + dba GymStatues + db $FF +SaffronPokecenterHiddenObjects: + db $04, $00, $04 + dba PrintBenchGuyText + db $03, $0d, $04 + dba OpenPokemonCenterPC + db $FF +RedsHouse2FHiddenObjects: + db $01, $00, $04 dba OpenRedsPC - db $05,$03,$d0 + db $05, $03, $d0 dba PrintRedsNESText db $FF -BluesHouseHiddenObjects: ; 46b67 (11:6b67) - db $01,$00,$04 +BluesHouseHiddenObjects: + db $01, $00, $04 dba PrintBookcaseText - db $01,$01,$04 + db $01, $01, $04 dba PrintBookcaseText - db $01,$07,$04 + db $01, $07, $04 dba PrintBookcaseText db $FF -OaksLabHiddenObjects: ; 46b7a (11:6b7a) - db $00,$04,$04 +OaksLabHiddenObjects: + db $00, $04, $04 dba DisplayOakLabLeftPoster - db $00,$05,$04 + db $00, $05, $04 dba DisplayOakLabRightPoster - db $01,$00,$04 + db $01, $00, $04 dba DisplayOakLabEmailText - db $01,$01,$04 + db $01, $01, $04 dba DisplayOakLabEmailText db $FF -ViridianPokecenterHiddenObjects: ; 46b93 (11:6b93) - db $04,$00,$08 +ViridianCityHiddenObjects: + db $04, $0e, $14 + dba HiddenItems + db $FF +ViridianPokecenterHiddenObjects: + db $04, $00, $08 dba PrintBenchGuyText - db $03,$0d,$04 + db $03, $0d, $04 dba OpenPokemonCenterPC db $FF -ViridianMartHiddenObjects: ; 46ba0 (11:6ba0) - db $FF -ViridianSchoolHiddenObjects: ; 46ba1 (11:6ba1) - db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1 +ViridianSchoolHiddenObjects: + db $04, $03, $22 dba PrintNotebookText - db $00,$03,(ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1 + db $00, $03, $23 dba PrintBlackboardLinkCableText db $FF -ViridianGymHiddenObjects: ; 46bae (11:6bae) - db $0f,$0f,$04 - dbw BANK(GymStatues),GymStatues - db $0f,$12,$04 - dbw BANK(GymStatues),GymStatues +ViridianGymHiddenObjects: + db $0f, $0f, $04 + dba GymStatues + db $0f, $12, $04 + dba GymStatues db $FF -Museum1FHiddenObjects: ; 46bbb (11:6bbb) - db $03,$02,$04 +Museum1FHiddenObjects: + db $03, $02, $04 dba AerodactylFossil - db $06,$02,$04 + db $06, $02, $04 dba 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) +PewterGymHiddenObjects: + db $0a, $03, $04 + dba GymStatues + db $0a, $06, $04 + dba GymStatues db $FF -PewterPokecenterHiddenObjects: ; 46bd6 (11:6bd6) - db $04,$00,$08 +PewterPokecenterHiddenObjects: + db $04, $00, $08 dba PrintBenchGuyText - db $03,$0d,$04 + db $03, $0d, $04 dba OpenPokemonCenterPC db $FF -CeruleanPokecenterHiddenObjects: ; 46be3 (11:6be3) - db $04,$00,$08 +CeruleanCityHiddenObjects: + db $08, $0f, $28 + dba HiddenItems + db $FF +CeruleanPokecenterHiddenObjects: + db $04, $00, $08 dba PrintBenchGuyText - db $03,$0d,$04 + db $03, $0d, $04 dba OpenPokemonCenterPC db $FF -CeruleanGymHiddenObjects: ; 46bf0 (11:6bf0) - db $0b,$03,$04 - dbw BANK(GymStatues),GymStatues - db $0b,$06,$04 - dbw BANK(GymStatues),GymStatues +CeruleanGymHiddenObjects: + db $0b, $03, $04 + dba GymStatues + db $0b, $06, $04 + dba GymStatues db $FF -CeruleanMartHiddenObjects: ; 46bfd (11:6bfd) +BikeShopHiddenObjects: + db $00, $01, $d0 + dba PrintNewBikeText + db $01, $02, $d0 + dba PrintNewBikeText + db $02, $01, $d0 + dba PrintNewBikeText + db $02, $03, $d0 + dba PrintNewBikeText + db $04, $00, $d0 + dba PrintNewBikeText + db $05, $01, $d0 + dba PrintNewBikeText + db $FF +UnknownDungeon1HiddenObjects: + db $07, $12, $4f + dba HiddenItems db $FF -LavenderPokecenterHiddenObjects: ; 46bfe (11:6bfe) - db $04,$00,$08 +LavenderPokecenterHiddenObjects: + db $04, $00, $08 dba PrintBenchGuyText - db $03,$0d,$04 + db $03, $0d, $04 dba OpenPokemonCenterPC db $FF -VermilionPokecenterHiddenObjects: ; 46c0b (11:6c0b) - db $03,$0d,$04 +Pokemontower5HiddenObjects: + db $0c, $04, $52 + dba HiddenItems + db $FF +LavenderHouse1HiddenObjects: + db $01, $00, $00 + dba PrintMagazinesText + db $01, $01, $00 + dba PrintMagazinesText + db $01, $07, $00 + dba PrintMagazinesText + db $FF +VermilionCityHiddenObjects: + db $0b, $0e, $51 + dba HiddenItems + db $FF +VermilionPokecenterHiddenObjects: + db $03, $0d, $04 dba OpenPokemonCenterPC - db $04,$00,$04 + db $04, $00, $04 dba PrintBenchGuyText db $FF -VermilionGymHiddenObjects: ; 46c18 (11:6c18) - db $0e,$03,$04 +PokemonFanClubHiddenObjects: + db $00, $01, $04 + dba FanClubPicture1 + db $00, $06, $04 + dba FanClubPicture2 + db $FF +VermilionGymHiddenObjects: + db $0e, $03, $04 dba GymStatues - db $0e,$06,$04 + db $0e, $06, $04 dba GymStatues - db $01,$06,$00 + db $01, $06, $00 dba PrintTrashText - db $07,$01,$00 + db $07, $01, $00 dba GymTrashScript - db $09,$01,$01 + db $09, $01, $01 dba GymTrashScript - db $0b,$01,$02 + db $0b, $01, $02 dba GymTrashScript - db $07,$03,$03 + db $07, $03, $03 dba GymTrashScript - db $09,$03,$04 + db $09, $03, $04 dba GymTrashScript - db $0b,$03,$05 + db $0b, $03, $05 dba GymTrashScript - db $07,$05,$06 + db $07, $05, $06 dba GymTrashScript - db $09,$05,$07 + db $09, $05, $07 dba GymTrashScript - db $0b,$05,$08 + db $0b, $05, $08 dba GymTrashScript - db $07,$07,$09 + db $07, $07, $09 dba GymTrashScript - db $09,$07,$0a + db $09, $07, $0a dba GymTrashScript - db $0b,$07,$0b + db $0b, $07, $0b dba GymTrashScript - db $07,$09,$0c + db $07, $09, $0c dba GymTrashScript - db $09,$09,$0d + db $09, $09, $0d dba GymTrashScript - db $0b,$09,$0e + db $0b, $09, $0e dba GymTrashScript db $FF -CeladonMansion2HiddenObjects: ; 46c85 (11:6c85) - db $05,$00,$04 +CeladonCityHiddenObjects: + db $0f, $30, $4f + dba HiddenItems + db $FF +CeladonHotelHiddenObjects: + db $04, $00, $08 + dba PrintBenchGuyText + db $FF +CeladonMansion2HiddenObjects: + db $05, $00, $04 dba OpenPokemonCenterPC db $FF -CeladonPokecenterHiddenObjects: ; 46c8c (11:6c8c) - db $04,$00,$08 +CeladonMansion5HiddenObjects: + db $00, $03, $36 + dbw $17, $5c7f + db $00, $04, $36 + dbw $17, $5c7f + db $04, $03, $37 + dbw $14, $68f6 + db $FF +CeladonPokecenterHiddenObjects: + db $04, $00, $08 dba PrintBenchGuyText - db $03,$0d,$04 + db $03, $0d, $04 dba OpenPokemonCenterPC db $FF -CeladonGymHiddenObjects: ; 46c99 (11:6c99) - db $0f,$03,$04 - dbw BANK(GymStatues),GymStatues - db $0f,$06,$04 - dbw BANK(GymStatues),GymStatues +CeladonGymHiddenObjects: + db $0f, $03, $04 + dba GymStatues + db $0f, $06, $04 + dba GymStatues db $FF -GameCornerHiddenObjects: ; 46ca6 (11:6ca6) - db $0f,$12,$d0 +GameCornerHiddenObjects: + db $0f, $12, $d0 dba StartSlotMachine - db $0e,$12,$d0 + db $0e, $12, $d0 dba StartSlotMachine - db $0d,$12,$d0 + db $0d, $12, $d0 dba StartSlotMachine - db $0c,$12,$d0 + db $0c, $12, $d0 dba StartSlotMachine - db $0b,$12,$d0 + db $0b, $12, $d0 dba StartSlotMachine - db $0a,$12,$ff ; "Someone's Keys" + db $0a, $12, $ff dba StartSlotMachine - db $0a,$0d,$d0 + db $0a, $0d, $d0 dba StartSlotMachine - db $0b,$0d,$d0 + db $0b, $0d, $d0 dba StartSlotMachine - db $0c,$0d,$fe ; "Out To Lunch" + db $0c, $0d, $fe dba StartSlotMachine - db $0d,$0d,$d0 + db $0d, $0d, $d0 dba StartSlotMachine - db $0e,$0d,$d0 + db $0e, $0d, $d0 dba StartSlotMachine - db $0f,$0d,$d0 + db $0f, $0d, $d0 dba StartSlotMachine - db $0f,$0c,$d0 + db $0f, $0c, $d0 dba StartSlotMachine - db $0e,$0c,$d0 + db $0e, $0c, $d0 dba StartSlotMachine - db $0d,$0c,$d0 + db $0d, $0c, $d0 dba StartSlotMachine - db $0c,$0c,$d0 + db $0c, $0c, $d0 dba StartSlotMachine - db $0b,$0c,$d0 + db $0b, $0c, $d0 dba StartSlotMachine - db $0a,$0c,$d0 + db $0a, $0c, $d0 dba StartSlotMachine - db $0a,$07,$d0 + db $0a, $07, $d0 dba StartSlotMachine - db $0b,$07,$d0 + db $0b, $07, $d0 dba StartSlotMachine - db $0c,$07,$d0 + db $0c, $07, $d0 dba StartSlotMachine - db $0d,$07,$d0 + db $0d, $07, $d0 dba StartSlotMachine - db $0e,$07,$d0 + db $0e, $07, $d0 dba StartSlotMachine - db $0f,$07,$d0 + db $0f, $07, $d0 dba StartSlotMachine - db $0f,$06,$d0 + db $0f, $06, $d0 dba StartSlotMachine - db $0e,$06,$d0 + db $0e, $06, $d0 dba StartSlotMachine - db $0d,$06,$d0 + db $0d, $06, $d0 dba StartSlotMachine - db $0c,$06,$fd ; "Out Of Order" + db $0c, $06, $fd dba StartSlotMachine - db $0b,$06,$d0 + db $0b, $06, $d0 dba StartSlotMachine - db $0a,$06,$d0 + db $0a, $06, $d0 dba StartSlotMachine - db $0a,$01,$d0 + db $0a, $01, $d0 dba StartSlotMachine - db $0b,$01,$d0 + db $0b, $01, $d0 dba StartSlotMachine - db $0c,$01,$d0 + db $0c, $01, $d0 dba StartSlotMachine - db $0d,$01,$d0 + db $0d, $01, $d0 dba StartSlotMachine - db $0e,$01,$d0 + db $0e, $01, $d0 dba StartSlotMachine - db $0f,$01,$d0 + db $0f, $01, $d0 dba 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 $08, $00, COIN + 10 + dba HiddenCoins + db $10, $01, COIN + 10 + dba HiddenCoins + db $0b, $03, COIN + 20 + dba HiddenCoins + db $0e, $03, COIN + 10 + dba HiddenCoins + db $0c, $04, COIN + 10 + dba HiddenCoins + db $0c, $09, COIN + 20 + dba HiddenCoins + db $0f, $09, COIN + 10 + dba HiddenCoins + db $0e, $10, COIN + 10 + dba HiddenCoins + db $10, $0a, COIN + 10 + dba HiddenCoins + db $07, $0b, COIN + 40 + dba HiddenCoins + db $08, $0f, COIN + 100 + dba HiddenCoins + db $0f, $0c, COIN + 10 + dba HiddenCoins db $FF -CeladonHotelHiddenObjects: ; 46dc7 (11:6dc7) - db $03,$0d,$04 +FuchsiaPokecenterHiddenObjects: + db $03, $0d, $04 dba OpenPokemonCenterPC - db $04,$00,$08 + db $04, $00, $04 dba PrintBenchGuyText db $FF -FuchsiaPokecenterHiddenObjects: ; 46dd4 (11:6dd4) - db $03,$0d,$04 - dba OpenPokemonCenterPC - db $04,$00,$04 - dba PrintBenchGuyText +SafariZoneEntranceHiddenObjects: + db $01, $0a, $31 + dba HiddenItems db $FF -FuchsiaGymHiddenObjects: ; 46de1 (11:6de1) - db $0f,$03,$04 - dbw BANK(GymStatues),GymStatues - db $0f,$06,$04 - dbw BANK(GymStatues),GymStatues +FuchsiaGymHiddenObjects: + db $0f, $03, $04 + dba GymStatues + db $0f, $06, $04 + dba GymStatues db $FF -CinnabarGymHiddenObjects: ; 46dee (11:6dee) - db $0d,$11,$04 - dbw BANK(GymStatues),GymStatues - db $07,$0f,$01 +Mansion1HiddenObjects: + db $10, $08, $0a + dba HiddenItems + db $05, $02, $04 + dba Mansion1Script_Switches + db $FF +CinnabarGymHiddenObjects: + db $0d, $11, $04 + dba GymStatues + db $07, $0f, $01 dba PrintCinnabarQuiz - db $01,$0a,$12 + db $01, $0a, $12 dba PrintCinnabarQuiz - db $07,$09,$13 + db $07, $09, $13 dba PrintCinnabarQuiz - db $0d,$09,$14 + db $0d, $09, $14 dba PrintCinnabarQuiz - db $0d,$01,$05 + db $0d, $01, $05 dba PrintCinnabarQuiz - db $07,$01,$16 + db $07, $01, $16 dba PrintCinnabarQuiz db $FF -CinnabarPokecenterHiddenObjects: ; 46e19 (11:6e19) - db $04,$00,$04 - dba PrintBenchGuyText - db $03,$0d,$04 +CinnabarLab4HiddenObjects: + db $04, $00, $04 dba 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 - dba PrintBenchGuyText - db $03,$0d,$04 + db $04, $02, $04 dba OpenPokemonCenterPC db $FF -RockTunnelPokecenterHiddenObjects: ; 46e3a (11:6e3a) - db $04,$00,$08 - dba PrintBenchGuyText - db $03,$0d,$04 - dba 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 - dba PrintIndigoPlateauHQText - db $0d,$0b,$00 - dba 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 - dba PrintTrashText - db $07,$0d,$00 - dba 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 +CinnabarPokecenterHiddenObjects: ; 6cc3 + db $04, $00, $04 dba PrintBenchGuyText - db $03,$0d,$04 + db $03, $0d, $04 dba 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 - dba Mansion1Script_Switches - db $FF -Mansion2HiddenObjects: ; 46f38 (11:6f38) - db $0b,$02,$04 - dba Mansion2Script_Switches - db $FF -Mansion3HiddenObjects: ; 46f3f (11:6f3f) - db $09,$01,MAX_REVIVE - dbw BANK(HiddenItems),HiddenItems - db $05,$0a,$04 - dba Mansion3Script_Switches - db $FF -Mansion4HiddenObjects: ; 46f4c (11:6f4c) - db $09,$01,RARE_CANDY - dbw BANK(HiddenItems),HiddenItems - db $03,$14,$04 - dba Mansion4Script_Switches - db $19,$12,$04 - dba 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 - dba 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 - dba PrintBenchGuyText - db $03,$0d,$04 - dba OpenPokemonCenterPC - db $FF -SafariZoneRestHouse3HiddenObjects: ; 46fa1 (11:6fa1) - db $04,$00,$08 - dba PrintBenchGuyText - db $03,$0d,$04 - dba OpenPokemonCenterPC - db $FF -SafariZoneRestHouse4HiddenObjects: ; 46fae (11:6fae) - db $04,$00,$08 - dba PrintBenchGuyText - db $03,$0d,$04 - dba OpenPokemonCenterPC - db $FF -Route15GateUpstairsHiddenObjects: ; 46fbb (11:6fbb) - db $02,$01,$04 - dba Route15GateLeftBinoculars - db $FF -LavenderHouse1HiddenObjects: ; 46fc2 (11:6fc2) - db $01,$00,$00 - dba PrintMagazinesText - db $01,$01,$00 - dba PrintMagazinesText - db $01,$07,$00 - dba PrintMagazinesText - db $FF -CeladonMansion5HiddenObjects: ; 46fd5 (11:6fd5) - db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1 - dba PrintBlackboardLinkCableText - db $00,$04,(LinkCableHelp_id - TextPredefs) / 2 + 1 - dba PrintBlackboardLinkCableText - db $04,$03,(TMNotebook_id - TextPredefs) / 2 + 1 - dba PrintNotebookText - db $FF -FightingDojoHiddenObjects: ; 46fe8 (11:6fe8) - db $09,$03,$04 - dba PrintFightingDojoText - db $09,$06,$04 - dba PrintFightingDojoText - db $00,$04,$04 - dba PrintFightingDojoText2 - db $00,$05,$04 - dba PrintFightingDojoText3 - db $FF -IndigoPlateauLobbyHiddenObjects: ; 47001 (11:7001) - db $07,$0f,$04 - dba OpenPokemonCenterPC - db $FF -CinnabarLab4HiddenObjects: ; 47008 (11:7008) - db $04,$00,$04 - dba OpenPokemonCenterPC - db $04,$02,$04 - dba OpenPokemonCenterPC - db $FF -BikeShopHiddenObjects: ; 47015 (11:7015) - db $00,$01,$d0 - dba PrintNewBikeText - db $01,$02,$d0 - dba PrintNewBikeText - db $02,$01,$d0 - dba PrintNewBikeText - db $02,$03,$d0 - dba PrintNewBikeText - db $04,$00,$d0 - dba PrintNewBikeText - db $05,$01,$d0 - dba 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 - dba 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 +; 6cd0 diff --git a/engine/bank3c.asm b/engine/bank3c.asm index cadfe1cf..f5f9d696 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -157,7 +157,7 @@ INCLUDE "engine/overworld/advance_player_sprite.asm" ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) ; Reset player status on blackout. xor a - ld [wd435],a + ld [wd435], a xor a ; gamefreak copypasting functions (double xor a) ld [wBattleResult], a ld [wWalkBikeSurfState], a @@ -204,33 +204,33 @@ ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) predef_jump HealParty Func_f02da:: ; f02da (3c:42da) - ld a,[wCurMap] + ld a, [wCurMap] cp VERMILION_GYM ; ??? new thing about verm gym? - jr z,.asm_f02ee - ld c,a - ld hl,Pointer_f02fa + jr z, .asm_f02ee + ld c, a + ld hl, Pointer_f02fa .asm_f02e5 - ld a,[hli] + ld a, [hli] cp c - jr z,.asm_f02f4 - cp a,$ff - jr nz,.asm_f02e5 + jr z, .asm_f02f4 + cp a, $ff + jr nz, .asm_f02e5 ret .asm_f02ee - ld hl,wd126 - set 6,[hl] + ld hl, wd126 + set 6, [hl] ret .asm_f02f4 - ld hl,wd126 - set 5,[hl] + ld hl, wd126 + set 5, [hl] ret Pointer_f02fa:: ; f02fa (3c:42fa) - db $cf,$d0,$d1,$d2,$d3,$d4 - db $d5,$e9,$ea,$eb,$d6,$d7 - db $d8,$a5,$a6,$87,$c7,$ca - db $c6,$6c,$c2,$71,$f5,$f6 - db $f7,$ff + db $cf, $d0, $d1, $d2, $d3, $d4 + db $d5, $e9, $ea, $eb, $d6, $d7 + db $d8, $a5, $a6, $87, $c7, $ca + db $c6, $6c, $c2, $71, $f5, $f6 + db $f7, $ff BeachHouse_GFX:: ; f0314 (3c:4314) INCBIN "gfx/tilesets/beachhouse.2bpp" @@ -242,40 +242,44 @@ Func_f0a54:: ; f0a54 (3c:4a54) ret Func_f0a55:: ; f0a55 (3c:4a55) - ld hl,Pointer_f0a76 ; 3c:4a76 + ld hl, Pointer_f0a76 ; 3c:4a76 .loop - ld a,[hli] - cp a,$ff + ld a, [hli] + cp a, $ff ret z - ld b,a - ld a,[wCurMap] + ld b, a + ld a, [wCurMap] cp b - jr z,.asm_f0a68 + jr z, .asm_f0a68 inc hl inc hl inc hl jr .loop .asm_f0a68 - ld a,[hli] - ld c,a - ld b,$0 - ld a,[hli] - ld h,[hl] - ld l,a - ld de,wMissableObjectList + ld a, [hli] + ld c, a + ld b, $0 + ld a, [hli] + ld h, [hl] + ld l, a + ld de, wMissableObjectList call CopyData ret Pointer_f0a76:: ; f0a76 (3c:4a76) - db $27,$07,$7b,$4a,$ff - db $01,$ec,$02,$ed,$03,$ee,$ff + db $27, $07, $7b, $4a, $ff + db $01, $ec, $02, $ed, $03, $ee, $ff - dr $f0a82,$f220e + dr $f0a82, $f220e BeachHouse_h: ; f220e (3c:620e) ;INCLUDE "data/mapHeaders/beach_house.asm" - dr $f220e,$f24ae + dr $f220e, $f24ae Func_f24ae: ; f24ae (3c:64ae) - dr $f24ae,$f25f8 + dr $f24ae, $f25f8 CheckForHiddenObject:: ; f25f8 (3c:65f8) - dr $f25f8,$f4000 \ No newline at end of file + dr $f25f8, $f268d +INCLUDE "data/hidden_objects.asm" + dr $f2cd0, $f2d0c +Func_f2d0c: + dr $f2d0c, $f2db8 diff --git a/engine/game_corner_slots2.asm b/engine/game_corner_slots2.asm index 1bcbefb1..3f7c3f71 100755 --- a/engine/game_corner_slots2.asm +++ b/engine/game_corner_slots2.asm @@ -6,13 +6,13 @@ AbleToPlaySlotsCheck: ; 2fdfd (b:7dfd) predef GetQuantityOfItemInBag ld a, b and a - ld b, GameCornerCoinCaseText_id ; - TextPredefs) / 2 + 1 + ld b, (GameCornerCoinCaseText_id - TextPredefs) / 2 + 1 jr z, .printCoinCaseRequired ld hl, wPlayerCoins ld a, [hli] or [hl] jr nz, .done ; able to play - ld b, GameCornerNoCoinsText_id ; - TextPredefs) / 2 + 1 + ld b, (GameCornerNoCoinsText_id - TextPredefs) / 2 + 1 .printCoinCaseRequired call EnableAutoTextBoxDrawing ld a, b diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 90b26578..41f20218 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -1,4 +1,4 @@ -PrintRedsNESText: ; 5db79 (17:5b79) +PrintRedsNESText: ; 5dbae (17:5bae) call EnableAutoTextBoxDrawing tx_pre_jump RedBedroomSNESText @@ -22,7 +22,10 @@ Route15GateLeftBinoculars: ; 5db8f (17:5b8f) ld a, ARTICUNO ld [wcf91], a call PlayCry - jp DisplayMonFrontSpriteInBox + call DisplayMonFrontSpriteInBox + xor a + ld [H_AUTOBGTRANSFERENABLED], a + ret Route15UpstairsBinocularsText: ; 5dba8 (17:5ba8) TX_FAR _Route15UpstairsBinocularsText @@ -52,6 +55,30 @@ KabutopsFossilText: ; 5dbd4 (17:5bd4) TX_FAR _KabutopsFossilText db "@" +FanClubPicture1: ; 5dbad (17:5c12) + ld a, RAPIDASH + ld [wcf91], a + call DisplayMonFrontSpriteInBox + call EnableAutoTextBoxDrawing + tx_pre FanClubPicture1Text + ret + +FanClubPicture1Text: ; 5dbbe (17:5bbe) + TX_FAR _FanClubPicture1Text + db "@" + +FanClubPicture2: ; 5dbad (17:5c28) + ld a, FEAROW + ld [wcf91], a + call DisplayMonFrontSpriteInBox + call EnableAutoTextBoxDrawing + tx_pre FanClubPicture2Text + ret + +FanClubPicture2Text: ; 5dc39 (17:5c39) + TX_FAR _FanClubPicture2Text + db "@" + DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) ; Displays a pokemon's front sprite in a pop-up window. ; [wcf91] = pokemon interal id number @@ -110,8 +137,7 @@ LinkCableHelp: ; 5dc29 (17:5c29) ld hl, wd730 set 6, [hl] coord hl, 0, 0 - ld b, $8 - ld c, $d + lb bc, $8, $d call TextBoxBorder coord hl, 2, 2 ld de, HowToLinkText @@ -339,53 +365,17 @@ GymTrashScript: ; 5ddfc (17:5dfc) .openFirstLock ; Next can is trying for the second switch. SetEvent EVENT_1ST_LOCK_OPENED - - ld hl, GymTrashCans - ld a, [wGymTrashCanIndex] - ; * 5 - ld b, a - add a - add a - add b - - ld d, 0 - ld e, a - add hl, de - ld a, [hli] - -; There is a bug in this code. It should calculate a value in the range [0, 3] -; but if the mask and random number don't have any 1 bits in common, then -; the result of the AND will be 0. When 1 is subtracted from that, the value -; will become $ff. This will result in 255 being added to hl, which will cause -; hl to point to one of the zero bytes that pad the end of the ROM bank. -; Trash can 0 was intended to be able to have the second lock only when the -; first lock was in trash can 1 or 3. However, due to this bug, trash can 0 can -; have the second lock regardless of which trash can had the first lock. - - ld [hGymTrashCanRandNumMask], a - push hl - call Random - swap a - ld b, a - ld a, [hGymTrashCanRandNumMask] - and b - dec a - pop hl - - ld d, 0 - ld e, a - add hl, de - ld a, [hl] - and $f - ld [wSecondLockTrashCanIndex], a - + callab Func_f2d0c tx_pre_id VermilionGymTrashSuccesText1 jr .done .trySecondLock - ld a, [wSecondLockTrashCanIndex] - ld b, a ld a, [wGymTrashCanIndex] + ld b, a + ld a, [wSecondLockTrashCanIndex] + cp b + jr z, .openSecondLock + ld a, [wSecondLockTrashCanIndex + 1] cp b jr z, .openSecondLock @@ -413,25 +403,24 @@ GymTrashScript: ; 5ddfc (17:5dfc) GymTrashCans: ; 5de7d (17:5e7d) ; byte 0: mask for random number ; bytes 1-4: indices of the trash cans that can have the second lock -; (but see the comment above explaining a bug regarding this) ; Note that the mask is simply the number of valid trash can indices that -; follow. The remaining bytes are filled with 0 to pad the length of each entry +; follow. The remaining bytes are filled with -1 to pad the length of each entry ; to 5 bytes. - db 2, 1, 3, 0, 0 ; 0 - db 3, 0, 2, 4, 0 ; 1 - db 2, 1, 5, 0, 0 ; 2 - db 3, 0, 4, 6, 0 ; 3 + db 2, 1, 3, -1, -1 ; 0 + db 3, 0, 2, 4, -1 ; 1 + db 2, 1, 5, -1, -1 ; 2 + db 3, 0, 4, 6, -1 ; 3 db 4, 1, 3, 5, 7 ; 4 - db 3, 2, 4, 8, 0 ; 5 - db 3, 3, 7, 9, 0 ; 6 + db 3, 2, 4, 8, -1 ; 5 + db 3, 3, 7, 9, -1 ; 6 db 4, 4, 6, 8, 10 ; 7 - db 3, 5, 7, 11, 0 ; 8 - db 3, 6, 10, 12, 0 ; 9 + db 3, 5, 7, 11, -1 ; 8 + db 3, 6, 10, 12, -1 ; 9 db 4, 7, 9, 11, 13 ; 10 - db 3, 8, 10, 14, 0 ; 11 - db 2, 9, 13, 0, 0 ; 12 - db 3, 10, 12, 14, 0 ; 13 - db 2, 11, 13, 0, 0 ; 14 + db 3, 8, 10, 14, -1 ; 11 + db 2, 9, 13, -1, -1 ; 12 + db 3, 10, 12, 14, -1 ; 13 + db 2, 11, 13, -1, -1 ; 14 ; 5dec8 VermilionGymTrashSuccesText1: ; 5dec8 (17:5ec8) diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm index 9d19dd7c..443f8369 100755 --- a/engine/hidden_object_functions18.asm +++ b/engine/hidden_object_functions18.asm @@ -73,35 +73,35 @@ PrintBenchGuyText: ; 6245d (18:645d) ; format: db map id, player sprite facing direction, text id of PredefTextIDPointerTable BenchGuyTextPointers: ; 6247e (18:647e) db VIRIDIAN_POKECENTER, SPRITE_FACING_LEFT - db $11 ; (ViridianCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre ViridianCityPokecenterBenchGuyText db PEWTER_POKECENTER, SPRITE_FACING_LEFT - db $12 ; (PewterCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre PewterCityPokecenterBenchGuyText db CERULEAN_POKECENTER, SPRITE_FACING_LEFT - db $13 ; (CeruleanCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre CeruleanCityPokecenterBenchGuyText db LAVENDER_POKECENTER, SPRITE_FACING_LEFT - db $14 ; (LavenderCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre LavenderCityPokecenterBenchGuyText db VERMILION_POKECENTER, SPRITE_FACING_LEFT - db $15 ; (VermilionCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre VermilionCityPokecenterBenchGuyText db CELADON_POKECENTER, SPRITE_FACING_LEFT - db $16 ; (CeladonCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre CeladonCityPokecenterBenchGuyText db CELADON_HOTEL, SPRITE_FACING_LEFT - db $17 ; (CeladonCityHotelText_id - TextPredefs) / 2 + 1 + db_tx_pre CeladonCityHotelText db FUCHSIA_POKECENTER, SPRITE_FACING_LEFT - db $18 ; (FuchsiaCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre FuchsiaCityPokecenterBenchGuyText db CINNABAR_POKECENTER, SPRITE_FACING_LEFT - db $19 ; (CinnabarIslandPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre CinnabarIslandPokecenterBenchGuyText db SAFFRON_POKECENTER, SPRITE_FACING_LEFT - db $1a ; (SaffronCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre SaffronCityPokecenterBenchGuyText db MT_MOON_POKECENTER, SPRITE_FACING_LEFT - db $1b ; (MtMoonPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre MtMoonPokecenterBenchGuyText db ROCK_TUNNEL_POKECENTER, SPRITE_FACING_LEFT - db $1c ; (RockTunnelPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db_tx_pre RockTunnelPokecenterBenchGuyText db SAFARI_ZONE_REST_HOUSE_2,SPRITE_FACING_LEFT - db $1d + db_tx_pre UnusedBenchGuyText1 db SAFARI_ZONE_REST_HOUSE_3,SPRITE_FACING_LEFT - db $1e + db_tx_pre UnusedBenchGuyText2 db SAFARI_ZONE_REST_HOUSE_4,SPRITE_FACING_LEFT - db $1f + db_tx_pre UnusedBenchGuyText3 db $FF ViridianCityPokecenterBenchGuyText: ; 624a3 (18:64a3) diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index f7f81070..39bb385d 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -9,7 +9,7 @@ HiddenItems: ; 76688 (1d:6688) predef FlagActionPredef ld a, c and a - ret nz + jr nz, .asm_75fa5 call EnableAutoTextBoxDrawing ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -18,6 +18,11 @@ HiddenItems: ; 76688 (1d:6688) call GetItemName tx_pre_jump FoundHiddenItemText +.asm_75fa5 + ld a, $ff + ld [hItemAlreadyFound], a + ret + INCLUDE "data/hidden_item_coords.asm" FoundHiddenItemText: ; 7675b (1d:675b) @@ -54,7 +59,7 @@ HiddenCoins: ; 76799 (1d:6799) predef GetQuantityOfItemInBag ld a, b and a - ret z + jr z, .asm_760ce ld hl, HiddenCoinCoords call FindHiddenItemOrCoinsIndex ld [wHiddenItemOrCoinsIndex], a @@ -65,7 +70,7 @@ HiddenCoins: ; 76799 (1d:6799) predef FlagActionPredef ld a, c and a - ret nz + jr nz, .asm_760ce xor a ld [hUnusedCoinsByte], a ld [hCoins], a @@ -79,6 +84,12 @@ HiddenCoins: ; 76799 (1d:6799) cp 40 jr z, .bcd20 jr .bcd100 + +.asm_760ce + ld a, $ff + ld [hItemAlreadyFound], a + ret + .bcd10 ld a, $10 ld [hCoins + 1], a diff --git a/home.asm b/home.asm index 3d8db84f..e5a84d9b 100644 --- a/home.asm +++ b/home.asm @@ -4977,72 +4977,77 @@ SetMapTextPointer:: ; 3f54 (0:3f54) ret TextPredefs:: ; 3f67 (0:3f67) - dr $3f67,$4000 -; add_tx_pre CardKeySuccessText ; 01 -; add_tx_pre CardKeyFailText ; 02 -; add_tx_pre RedBedroomPC ; 03 -; add_tx_pre RedBedroomSNESText ; 04 -; add_tx_pre PushStartText ; 05 -; add_tx_pre SaveOptionText ; 06 -; add_tx_pre StrengthsAndWeaknessesText ; 07 -; add_tx_pre OakLabEmailText ; 08 -; add_tx_pre AerodactylFossilText ; 09 -; add_tx_pre Route15UpstairsBinocularsText ; 0A -; add_tx_pre KabutopsFossilText ; 0B -; add_tx_pre GymStatueText1 ; 0C -; add_tx_pre GymStatueText2 ; 0D -; add_tx_pre BookcaseText ; 0E -; add_tx_pre ViridianCityPokecenterBenchGuyText ; 0F -; add_tx_pre PewterCityPokecenterBenchGuyText ; 10 -; add_tx_pre CeruleanCityPokecenterBenchGuyText ; 11 -; add_tx_pre LavenderCityPokecenterBenchGuyText ; 12 -; add_tx_pre VermilionCityPokecenterBenchGuyText ; 13 -; add_tx_pre CeladonCityPokecenterBenchGuyText ; 14 -; add_tx_pre CeladonCityHotelText ; 15 -; add_tx_pre FuchsiaCityPokecenterBenchGuyText ; 16 -; add_tx_pre CinnabarIslandPokecenterBenchGuyText ; 17 -; add_tx_pre SaffronCityPokecenterBenchGuyText ; 18 -; add_tx_pre MtMoonPokecenterBenchGuyText ; 19 -; add_tx_pre RockTunnelPokecenterBenchGuyText ; 1A -; add_tx_pre UnusedBenchGuyText1 ; 1B -; add_tx_pre UnusedBenchGuyText2 ; 1C -; add_tx_pre UnusedBenchGuyText3 ; 1D -; add_tx_pre TerminatorText_62508 ; 1E -; add_tx_pre PredefText1f ; 1F -; add_tx_pre ViridianSchoolNotebook ; 20 -; add_tx_pre ViridianSchoolBlackboard ; 21 -; add_tx_pre JustAMomentText ; 22 -; add_tx_pre PredefText23 ; 23 -; add_tx_pre FoundHiddenItemText ; 24 -; add_tx_pre HiddenItemBagFullText ; 25 -; add_tx_pre VermilionGymTrashText ; 26 -; add_tx_pre IndigoPlateauHQText ; 27 -; add_tx_pre GameCornerOutOfOrderText ; 28 -; add_tx_pre GameCornerOutToLunchText ; 29 -; add_tx_pre GameCornerSomeonesKeysText ; 2A -; add_tx_pre FoundHiddenCoinsText ; 2B -; add_tx_pre DroppedHiddenCoinsText ; 2C -; add_tx_pre BillsHouseMonitorText ; 2D -; add_tx_pre BillsHouseInitiatedText ; 2E -; add_tx_pre BillsHousePokemonList ; 2F -; add_tx_pre MagazinesText ; 30 -; add_tx_pre CinnabarGymQuiz ; 31 -; add_tx_pre GameCornerNoCoinsText ; 32 -; add_tx_pre GameCornerCoinCaseText ; 33 -; add_tx_pre LinkCableHelp ; 34 -; add_tx_pre TMNotebook ; 35 -; add_tx_pre FightingDojoText ; 36 -; add_tx_pre FightingDojoText_52a10 ; 37 -; add_tx_pre FightingDojoText_52a1d ; 38 -; add_tx_pre NewBicycleText ; 39 -; add_tx_pre IndigoPlateauStatues ; 3A -; add_tx_pre VermilionGymTrashSuccesText1 ; 3B -; add_tx_pre VermilionGymTrashSuccesText2 ; 3C -; add_tx_pre VermilionGymTrashSuccesText3 ; 3D -; add_tx_pre VermilionGymTrashFailText ; 3E -; add_tx_pre TownMapText ; 3F -; add_tx_pre BookOrSculptureText ; 40 -; add_tx_pre ElevatorText ; 41 -; add_tx_pre PokemonStuffText ; 42 -; add_tx_pre $7a9b ; 43 -; add_tx_pre $7ad3 ; 44 +const_value = 1 + + add_tx_pre CardKeySuccessText ; 01 + add_tx_pre CardKeyFailText ; 02 + add_tx_pre RedBedroomPCText ; 03 + add_tx_pre RedBedroomSNESText ; 04 + add_tx_pre PushStartText ; 05 + add_tx_pre SaveOptionText ; 06 + add_tx_pre StrengthsAndWeaknessesText ; 07 + add_tx_pre OakLabEmailText ; 08 + add_tx_pre AerodactylFossilText ; 09 + add_tx_pre Route15UpstairsBinocularsText ; 0A + add_tx_pre KabutopsFossilText ; 0B + add_tx_pre FanClubPicture1Text ; 0C + add_tx_pre FanClubPicture2Text ; 0D + add_tx_pre GymStatueText1 ; 0E + add_tx_pre GymStatueText2 ; 0F + add_tx_pre BookcaseText ; 10 + add_tx_pre ViridianCityPokecenterBenchGuyText ; 11 + add_tx_pre PewterCityPokecenterBenchGuyText ; 12 + add_tx_pre CeruleanCityPokecenterBenchGuyText ; 13 + add_tx_pre LavenderCityPokecenterBenchGuyText ; 14 + add_tx_pre VermilionCityPokecenterBenchGuyText ; 15 + add_tx_pre CeladonCityPokecenterBenchGuyText ; 16 + add_tx_pre CeladonCityHotelText ; 17 + add_tx_pre FuchsiaCityPokecenterBenchGuyText ; 18 + add_tx_pre CinnabarIslandPokecenterBenchGuyText ; 19 + add_tx_pre SaffronCityPokecenterBenchGuyText ; 1A + add_tx_pre MtMoonPokecenterBenchGuyText ; 1B + add_tx_pre RockTunnelPokecenterBenchGuyText ; 1C + add_tx_pre UnusedBenchGuyText1 ; 1D + add_tx_pre UnusedBenchGuyText2 ; 1E + add_tx_pre UnusedBenchGuyText3 ; 1F + add_tx_pre UnusedPredefText ; 20 + add_tx_pre PokemonCenterPCText ; 21 + add_tx_pre ViridianSchoolNotebook ; 22 + add_tx_pre ViridianSchoolBlackboard ; 23 + ; add_tx_pre FakeTextPredef22 + ; add_tx_pre FakeTextPredef23 + add_tx_pre JustAMomentText ; 24 + add_tx_pre OpenBillsPCText ; 25 + add_tx_pre FoundHiddenItemText ; 26 + add_tx_pre HiddenItemBagFullText ; 27 + add_tx_pre VermilionGymTrashText ; 28 + add_tx_pre IndigoPlateauHQText ; 29 + add_tx_pre GameCornerOutOfOrderText ; 2A + add_tx_pre GameCornerOutToLunchText ; 2B + add_tx_pre GameCornerSomeonesKeysText ; 2C + add_tx_pre FoundHiddenCoinsText ; 2D + add_tx_pre DroppedHiddenCoinsText ; 2E + add_tx_pre BillsHouseMonitorText ; 2F + add_tx_pre BillsHouseInitiatedText ; 30 + add_tx_pre BillsHousePokemonList ; 31 + add_tx_pre MagazinesText ; 32 + add_tx_pre CinnabarGymQuiz ; 33 + add_tx_pre GameCornerNoCoinsText ; 34 + add_tx_pre GameCornerCoinCaseText ; 35 + add_tx_pre LinkCableHelp ; 36 + add_tx_pre TMNotebook ; 37 + add_tx_pre FightingDojoText ; 38 + add_tx_pre EnemiesOnEverySideText ; 39 + add_tx_pre WhatGoesAroundComesAroundText ; 3A + add_tx_pre NewBicycleText ; 3B + add_tx_pre IndigoPlateauStatues ; 3C XXX unused + add_tx_pre VermilionGymTrashSuccesText1 ; 3D + add_tx_pre VermilionGymTrashSuccesText2 ; 3E + add_tx_pre VermilionGymTrashSuccesText3 ; 3F + add_tx_pre VermilionGymTrashFailText ; 40 + add_tx_pre TownMapText ; 41 + add_tx_pre BookOrSculptureText ; 42 + add_tx_pre ElevatorText ; 43 + add_tx_pre PokemonStuffText ; 44 + + ; dr $3f67,$4000 diff --git a/hram.asm b/hram.asm index 21dbee05..eeb425f6 100644 --- a/hram.asm +++ b/hram.asm @@ -309,6 +309,8 @@ hCoordsInFrontOfPlayerMatch EQU $FFEA hSpriteAnimFrameCounter EQU $FFEA +hItemAlreadyFound EQU $FFEB + H_WHOSETURN EQU $FFF3 ; 0 on player’s turn, 1 on enemy’s turn hLCDCPointer EQU $FFF4 diff --git a/macros.asm b/macros.asm index c4318278..f153e379 100644 --- a/macros.asm +++ b/macros.asm @@ -342,11 +342,11 @@ add_tx_pre: MACRO ENDM db_tx_pre: MACRO - db \1_id + db (\1_id - TextPredefs) / 2 + 1 ENDM tx_pre_id: MACRO - ld a, \1_id ; - TextPredefs) / 2 + 1 + ld a, (\1_id - TextPredefs) / 2 + 1 ENDM tx_pre: MACRO diff --git a/main.asm b/main.asm index b32935de..a106b3a3 100755 --- a/main.asm +++ b/main.asm @@ -674,7 +674,9 @@ SECTION "bank11",ROMX,BANK[$11] INCLUDE "engine/pokedex_rating.asm" - dr $44251,$45077 + dr $44251,$443b7 +Mansion1Script_Switches: + dr $443b7,$45077 LoadSpinnerArrowTiles: ; 45077 (11:5077) dr $45077,$46bf3 @@ -850,12 +852,8 @@ VendingMachineMenu: ; 74726 (1d:4726) dr $74726,$75dfe PKMNLeaguePC: ; 75dfe (1d:5dfe) dr $75dfe,$75f74 -HiddenItems: ; 75f74 (1d:5f74) - dr $75f74,$75faa -INCLUDE "data/hidden_item_coords.asm" - - dr $76050,$76177 +INCLUDE "engine/overworld/hidden_items.asm" SECTION "bank1E",ROMX,BANK[$1E] -- cgit v1.3.1-sl0p From 436997a5c41f740de52bdce6fbe3044aa33bd317 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 24 May 2016 21:06:48 -0400 Subject: Pretty up the hidden object data --- data/hidden_objects.asm | 342 ++++++++++++++++++++++++------------------------ 1 file changed, 171 insertions(+), 171 deletions(-) (limited to 'data/hidden_objects.asm') diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 5b2b27d0..852d9d82 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -84,463 +84,463 @@ HiddenObjectMaps: ; f268d (3c:668d) ; format: y-coord, x-coord, text id/item id, object routine SilphCo11FHiddenObjects: - db $0c, $0a, $04 + db $0c, $0a, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF SilphCo5FHiddenObjects: - db $03, $0c, $52 + db $03, $0c, ELIXER dba HiddenItems db $FF SilphCo9FHiddenObjects: - db $0f, $02, $11 + db $0f, $02, MAX_POTION dba HiddenItems db $FF Mansion2HiddenObjects: - db $0b, $02, $04 + db $0b, $02, SPRITE_FACING_UP dba Mansion2Script_Switches db $FF Mansion3HiddenObjects: - db $09, $01, $36 + db $09, $01, MAX_REVIVE dba HiddenItems - db $05, $0a, $04 + db $05, $0a, SPRITE_FACING_UP dba Mansion3Script_Switches db $FF Mansion4HiddenObjects: - db $09, $01, $28 + db $09, $01, RARE_CANDY dba HiddenItems - db $03, $14, $04 + db $03, $14, SPRITE_FACING_UP dba Mansion4Script_Switches - db $19, $12, $04 + db $19, $12, SPRITE_FACING_UP dba Mansion4Script_Switches db $FF SafariZoneWestHiddenObjects: - db $05, $06, $35 + db $05, $06, REVIVE dba HiddenItems db $FF UnknownDungeon2HiddenObjects: - db $0d, $10, $4f + db $0d, $10, PP_UP dba HiddenItems db $FF UnknownDungeon3HiddenObjects: - db $0e, $08, $4f + db $0e, $08, PP_UP dba HiddenItems db $FF UnusedMap6FHiddenObjects: - db $0b, $0e, $53 + db $0b, $0e, MAX_ELIXER dba HiddenItems db $FF SeafoamIslands3HiddenObjects: - db $0f, $0f, $31 + db $0f, $0f, NUGGET dba HiddenItems db $FF SeafoamIslands4HiddenObjects: - db $10, $09, $53 + db $10, $09, MAX_ELIXER dba HiddenItems db $FF SeafoamIslands5HiddenObjects: - db $11, $19, $02 + db $11, $19, ULTRA_BALL dba HiddenItems db $FF ViridianForestHiddenObjects: - db $12, $01, $14 + db $12, $01, POTION dba HiddenItems - db $2a, $10, $0b + db $2a, $10, ANTIDOTE dba HiddenItems db $FF MtMoon3HiddenObjects: - db $0c, $12, $0a + db $0c, $12, MOON_STONE dba HiddenItems - db $09, $21, $50 + db $09, $21, ETHER dba HiddenItems db $FF SSAnne10HiddenObjects: - db $01, $03, $12 + db $01, $03, HYPER_POTION dba HiddenItems db $FF SSAnne6HiddenObjects: - db $05, $0d, $00 + db $05, $0d, SPRITE_FACING_DOWN dba PrintTrashText - db $07, $0d, $00 + db $07, $0d, SPRITE_FACING_DOWN dba PrintTrashText - db $09, $0d, $03 + db $09, $0d, GREAT_BALL dba HiddenItems db $FF UndergroundPathNsHiddenObjects: - db $04, $03, $10 + db $04, $03, FULL_RESTORE dba HiddenItems - db $22, $04, $44 + db $22, $04, X_SPECIAL dba HiddenItems db $FF UndergroundPathWeHiddenObjects: - db $02, $0c, $31 + db $02, $0c, NUGGET dba HiddenItems - db $05, $15, $52 + db $05, $15, ELIXER dba HiddenItems db $FF RocketHideout1HiddenObjects: - db $0f, $15, $4f + db $0f, $15, PP_UP dba HiddenItems db $FF RocketHideout3HiddenObjects: - db $11, $1b, $31 + db $11, $1b, NUGGET dba HiddenItems db $FF RocketHideout4HiddenObjects: - db $01, $19, $13 + db $01, $19, SUPER_POTION dba HiddenItems db $FF Route10HiddenObjects: - db $11, $09, $13 + db $11, $09, SUPER_POTION dba HiddenItems - db $35, $10, $51 + db $35, $10, MAX_ETHER dba HiddenItems db $FF RockTunnelPokecenterHiddenObjects: - db $04, $00, $08 + db $04, $00, SPRITE_FACING_LEFT dba PrintBenchGuyText - db $03, $0d, $04 + db $03, $0d, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF PowerPlantHiddenObjects: - db $10, $11, $53 + db $10, $11, MAX_ELIXER dba HiddenItems - db $01, $0c, $4f + db $01, $0c, PP_UP dba HiddenItems db $FF Route11HiddenObjects: - db $05, $30, $1d + db $05, $30, ESCAPE_ROPE dba HiddenItems db $FF Route12HiddenObjects: - db $3f, $02, $12 + db $3f, $02, HYPER_POTION dba HiddenItems db $FF Route13HiddenObjects: - db $0e, $01, $4f + db $0e, $01, PP_UP dba HiddenItems - db $0d, $10, $27 + db $0d, $10, CALCIUM dba HiddenItems db $FF Route15Gate2FHiddenObjects: - db $02, $01, $04 + db $02, $01, SPRITE_FACING_UP dba Route15GateLeftBinoculars db $FF Route17HiddenObjects: - db $0e, $0f, $28 + db $0e, $0f, RARE_CANDY dba HiddenItems - db $2d, $08, $10 + db $2d, $08, FULL_RESTORE dba HiddenItems - db $48, $11, $4f + db $48, $11, PP_UP dba HiddenItems - db $5b, $04, $36 + db $5b, $04, MAX_REVIVE dba HiddenItems - db $79, $08, $53 + db $79, $08, MAX_ELIXER dba HiddenItems db $FF Route23HiddenObjects: - db $2c, $09, $10 + db $2c, $09, FULL_RESTORE dba HiddenItems - db $46, $13, $02 + db $46, $13, ULTRA_BALL dba HiddenItems - db $5a, $08, $51 + db $5a, $08, MAX_ETHER dba HiddenItems db $FF VictoryRoad2HiddenObjects: - db $02, $05, $02 + db $02, $05, ULTRA_BALL dba HiddenItems - db $07, $1a, $10 + db $07, $1a, FULL_RESTORE dba HiddenItems db $FF Route25HiddenObjects: - db $03, $26, $50 + db $03, $26, ETHER dba HiddenItems - db $01, $0a, $52 + db $01, $0a, ELIXER dba HiddenItems db $FF BillsHouseHiddenObjects: - db $04, $01, $04 + db $04, $01, SPRITE_FACING_UP dba BillsHousePC db $FF Route4HiddenObjects: - db $03, $28, $03 + db $03, $28, GREAT_BALL dba HiddenItems db $FF MtMoonPokecenterHiddenObjects: - db $04, $00, $08 + db $04, $00, SPRITE_FACING_LEFT dba PrintBenchGuyText - db $03, $0d, $04 + db $03, $0d, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF Route9HiddenObjects: - db $07, $0e, $50 + db $07, $0e, ETHER dba HiddenItems db $FF TradeCenterHiddenObjects: db $04, $05, $d0 dba CableClubRightGameboy - db $04, $04, $d0 + db $04, $04, $d0 dba CableClubLeftGameboy db $FF ColosseumHiddenObjects: db $04, $05, $d0 dba CableClubRightGameboy - db $04, $04, $d0 + db $04, $04, $d0 dba CableClubLeftGameboy db $FF IndigoPlateauHiddenObjects: db $0d, $08, $ff dba PrintIndigoPlateauHQText - db $0d, $0b, $00 + db $0d, $0b, SPRITE_FACING_DOWN dba PrintIndigoPlateauHQText db $FF IndigoPlateauLobbyHiddenObjects: - db $07, $0f, $04 + db $07, $0f, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF CopycatsHouse2FHiddenObjects: - db $01, $01, $31 + db $01, $01, NUGGET dba HiddenItems db $FF FightingDojoHiddenObjects: - db $09, $03, $04 + db $09, $03, SPRITE_FACING_UP dba PrintFightingDojoText - db $09, $06, $04 + db $09, $06, SPRITE_FACING_UP dba PrintFightingDojoText - db $00, $04, $04 + db $00, $04, SPRITE_FACING_UP dba PrintFightingDojoText2 - db $00, $05, $04 + db $00, $05, SPRITE_FACING_UP dba PrintFightingDojoText3 db $FF SaffronGymHiddenObjects: - db $0f, $09, $04 + db $0f, $09, SPRITE_FACING_UP dba GymStatues db $FF SaffronPokecenterHiddenObjects: - db $04, $00, $04 + db $04, $00, SPRITE_FACING_UP dba PrintBenchGuyText - db $03, $0d, $04 + db $03, $0d, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF RedsHouse2FHiddenObjects: - db $01, $00, $04 + db $01, $00, SPRITE_FACING_UP dba OpenRedsPC - db $05, $03, $d0 + db $05, $03, $d0 dba PrintRedsNESText db $FF BluesHouseHiddenObjects: - db $01, $00, $04 + db $01, $00, SPRITE_FACING_UP dba PrintBookcaseText - db $01, $01, $04 + db $01, $01, SPRITE_FACING_UP dba PrintBookcaseText - db $01, $07, $04 + db $01, $07, SPRITE_FACING_UP dba PrintBookcaseText db $FF OaksLabHiddenObjects: - db $00, $04, $04 + db $00, $04, SPRITE_FACING_UP dba DisplayOakLabLeftPoster - db $00, $05, $04 + db $00, $05, SPRITE_FACING_UP dba DisplayOakLabRightPoster - db $01, $00, $04 + db $01, $00, SPRITE_FACING_UP dba DisplayOakLabEmailText - db $01, $01, $04 + db $01, $01, SPRITE_FACING_UP dba DisplayOakLabEmailText db $FF ViridianCityHiddenObjects: - db $04, $0e, $14 + db $04, $0e, POTION dba HiddenItems db $FF ViridianPokecenterHiddenObjects: - db $04, $00, $08 + db $04, $00, SPRITE_FACING_LEFT dba PrintBenchGuyText - db $03, $0d, $04 + db $03, $0d, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF ViridianSchoolHiddenObjects: - db $04, $03, $22 + db $04, $03, (ViridianSchoolNotebook_id - TextPredefs) / 2 + 1 dba PrintNotebookText - db $00, $03, $23 + db $00, $03, (ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1 dba PrintBlackboardLinkCableText db $FF ViridianGymHiddenObjects: - db $0f, $0f, $04 + db $0f, $0f, SPRITE_FACING_UP dba GymStatues - db $0f, $12, $04 + db $0f, $12, SPRITE_FACING_UP dba GymStatues db $FF Museum1FHiddenObjects: - db $03, $02, $04 + db $03, $02, SPRITE_FACING_UP dba AerodactylFossil - db $06, $02, $04 + db $06, $02, SPRITE_FACING_UP dba KabutopsFossil db $FF PewterGymHiddenObjects: - db $0a, $03, $04 + db $0a, $03, SPRITE_FACING_UP dba GymStatues - db $0a, $06, $04 + db $0a, $06, SPRITE_FACING_UP dba GymStatues db $FF PewterPokecenterHiddenObjects: - db $04, $00, $08 + db $04, $00, SPRITE_FACING_LEFT dba PrintBenchGuyText - db $03, $0d, $04 + db $03, $0d, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF CeruleanCityHiddenObjects: - db $08, $0f, $28 + db $08, $0f, RARE_CANDY dba HiddenItems db $FF CeruleanPokecenterHiddenObjects: - db $04, $00, $08 + db $04, $00, SPRITE_FACING_LEFT dba PrintBenchGuyText - db $03, $0d, $04 + db $03, $0d, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF CeruleanGymHiddenObjects: - db $0b, $03, $04 + db $0b, $03, SPRITE_FACING_UP dba GymStatues - db $0b, $06, $04 + db $0b, $06, SPRITE_FACING_UP dba GymStatues db $FF BikeShopHiddenObjects: db $00, $01, $d0 dba PrintNewBikeText - db $01, $02, $d0 + db $01, $02, $d0 dba PrintNewBikeText - db $02, $01, $d0 + db $02, $01, $d0 dba PrintNewBikeText - db $02, $03, $d0 + db $02, $03, $d0 dba PrintNewBikeText - db $04, $00, $d0 + db $04, $00, $d0 dba PrintNewBikeText - db $05, $01, $d0 + db $05, $01, $d0 dba PrintNewBikeText db $FF UnknownDungeon1HiddenObjects: - db $07, $12, $4f + db $07, $12, PP_UP dba HiddenItems db $FF LavenderPokecenterHiddenObjects: - db $04, $00, $08 + db $04, $00, SPRITE_FACING_LEFT dba PrintBenchGuyText - db $03, $0d, $04 + db $03, $0d, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF Pokemontower5HiddenObjects: - db $0c, $04, $52 + db $0c, $04, ELIXER dba HiddenItems db $FF LavenderHouse1HiddenObjects: - db $01, $00, $00 + db $01, $00, SPRITE_FACING_DOWN dba PrintMagazinesText - db $01, $01, $00 + db $01, $01, SPRITE_FACING_DOWN dba PrintMagazinesText - db $01, $07, $00 + db $01, $07, SPRITE_FACING_DOWN dba PrintMagazinesText db $FF VermilionCityHiddenObjects: - db $0b, $0e, $51 + db $0b, $0e, MAX_ETHER dba HiddenItems db $FF VermilionPokecenterHiddenObjects: - db $03, $0d, $04 + db $03, $0d, SPRITE_FACING_UP dba OpenPokemonCenterPC - db $04, $00, $04 + db $04, $00, SPRITE_FACING_UP dba PrintBenchGuyText db $FF PokemonFanClubHiddenObjects: - db $00, $01, $04 + db $00, $01, SPRITE_FACING_UP dba FanClubPicture1 - db $00, $06, $04 + db $00, $06, SPRITE_FACING_UP dba FanClubPicture2 db $FF VermilionGymHiddenObjects: - db $0e, $03, $04 + db $0e, $03, SPRITE_FACING_UP dba GymStatues - db $0e, $06, $04 + db $0e, $06, SPRITE_FACING_UP dba GymStatues - db $01, $06, $00 + db $01, $06, SPRITE_FACING_DOWN dba PrintTrashText - db $07, $01, $00 + db $07, $01, 0 dba GymTrashScript - db $09, $01, $01 + db $09, $01, 1 dba GymTrashScript - db $0b, $01, $02 + db $0b, $01, 2 dba GymTrashScript - db $07, $03, $03 + db $07, $03, 3 dba GymTrashScript - db $09, $03, $04 + db $09, $03, 4 dba GymTrashScript - db $0b, $03, $05 + db $0b, $03, 5 dba GymTrashScript - db $07, $05, $06 + db $07, $05, 6 dba GymTrashScript - db $09, $05, $07 + db $09, $05, 7 dba GymTrashScript - db $0b, $05, $08 + db $0b, $05, 8 dba GymTrashScript - db $07, $07, $09 + db $07, $07, 9 dba GymTrashScript - db $09, $07, $0a + db $09, $07, 10 dba GymTrashScript - db $0b, $07, $0b + db $0b, $07, 11 dba GymTrashScript - db $07, $09, $0c + db $07, $09, 12 dba GymTrashScript - db $09, $09, $0d + db $09, $09, 13 dba GymTrashScript - db $0b, $09, $0e + db $0b, $09, 14 dba GymTrashScript db $FF CeladonCityHiddenObjects: - db $0f, $30, $4f + db $0f, $30, PP_UP dba HiddenItems db $FF CeladonHotelHiddenObjects: - db $04, $00, $08 + db $04, $00, SPRITE_FACING_LEFT dba PrintBenchGuyText db $FF CeladonMansion2HiddenObjects: - db $05, $00, $04 + db $05, $00, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF CeladonMansion5HiddenObjects: - db $00, $03, $36 - dbw $17, $5c7f - db $00, $04, $36 - dbw $17, $5c7f - db $04, $03, $37 - dbw $14, $68f6 + db $00, $03, (LinkCableHelp_id - TextPredefs) / 2 + 1 + dba PrintBlackboardLinkCableText + db $00, $04, (LinkCableHelp_id - TextPredefs) / 2 + 1 + dba PrintBlackboardLinkCableText + db $04, $03, (TMNotebook_id - TextPredefs) / 2 + 1 + dba PrintNotebookText db $FF CeladonPokecenterHiddenObjects: - db $04, $00, $08 + db $04, $00, SPRITE_FACING_LEFT dba PrintBenchGuyText - db $03, $0d, $04 + db $03, $0d, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF CeladonGymHiddenObjects: - db $0f, $03, $04 + db $0f, $03, SPRITE_FACING_UP dba GymStatues - db $0f, $06, $04 + db $0f, $06, SPRITE_FACING_UP dba GymStatues db $FF GameCornerHiddenObjects: db $0f, $12, $d0 dba StartSlotMachine - db $0e, $12, $d0 + db $0e, $12, $d0 dba StartSlotMachine - db $0d, $12, $d0 + db $0d, $12, $d0 dba StartSlotMachine - db $0c, $12, $d0 + db $0c, $12, $d0 dba StartSlotMachine - db $0b, $12, $d0 + db $0b, $12, $d0 dba StartSlotMachine - db $0a, $12, $ff + db $0a, $12, $ff ; "Someone's Keys" dba StartSlotMachine db $0a, $0d, $d0 dba StartSlotMachine db $0b, $0d, $d0 dba StartSlotMachine - db $0c, $0d, $fe + db $0c, $0d, $fe ; "Out To Lunch" dba StartSlotMachine db $0d, $0d, $d0 dba StartSlotMachine @@ -578,7 +578,7 @@ GameCornerHiddenObjects: dba StartSlotMachine db $0d, $06, $d0 dba StartSlotMachine - db $0c, $06, $fd + db $0c, $06, $fd ; "Out Of Order" dba StartSlotMachine db $0b, $06, $d0 dba StartSlotMachine @@ -622,53 +622,53 @@ GameCornerHiddenObjects: dba HiddenCoins db $FF FuchsiaPokecenterHiddenObjects: - db $03, $0d, $04 + db $03, $0d, SPRITE_FACING_UP dba OpenPokemonCenterPC - db $04, $00, $04 + db $04, $00, SPRITE_FACING_UP dba PrintBenchGuyText db $FF SafariZoneEntranceHiddenObjects: - db $01, $0a, $31 + db $01, $0a, NUGGET dba HiddenItems db $FF FuchsiaGymHiddenObjects: - db $0f, $03, $04 + db $0f, $03, SPRITE_FACING_UP dba GymStatues - db $0f, $06, $04 + db $0f, $06, SPRITE_FACING_UP dba GymStatues db $FF Mansion1HiddenObjects: - db $10, $08, $0a + db $10, $08, MOON_STONE dba HiddenItems - db $05, $02, $04 + db $05, $02, SPRITE_FACING_UP dba Mansion1Script_Switches db $FF CinnabarGymHiddenObjects: - db $0d, $11, $04 + db $0d, $11, SPRITE_FACING_UP dba GymStatues - db $07, $0f, $01 + db $07, $0f, (0 << 4) | 1 dba PrintCinnabarQuiz - db $01, $0a, $12 + db $01, $0a, (1 << 4) | 2 dba PrintCinnabarQuiz - db $07, $09, $13 + db $07, $09, (1 << 4) | 3 dba PrintCinnabarQuiz - db $0d, $09, $14 + db $0d, $09, (1 << 4) | 4 dba PrintCinnabarQuiz - db $0d, $01, $05 + db $0d, $01, (0 << 4) | 5 dba PrintCinnabarQuiz - db $07, $01, $16 + db $07, $01, (1 << 4) | 6 dba PrintCinnabarQuiz db $FF CinnabarLab4HiddenObjects: - db $04, $00, $04 + db $04, $00, SPRITE_FACING_UP dba OpenPokemonCenterPC - db $04, $02, $04 + db $04, $02, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF CinnabarPokecenterHiddenObjects: ; 6cc3 - db $04, $00, $04 + db $04, $00, SPRITE_FACING_UP dba PrintBenchGuyText - db $03, $0d, $04 + db $03, $0d, SPRITE_FACING_UP dba OpenPokemonCenterPC db $FF ; 6cd0 -- cgit v1.3.1-sl0p From 0ad4a73314dc9c8f5a94145d5da0bbe658066529 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 24 May 2016 21:17:43 -0400 Subject: hidden_object macro; coords as dec --- data/hidden_objects.asm | 889 +++++++++++++++++++++--------------------------- 1 file changed, 381 insertions(+), 508 deletions(-) (limited to 'data/hidden_objects.asm') diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 852d9d82..ccf32510 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -80,595 +80,468 @@ HiddenObjectMaps: ; f268d (3c:668d) dbw CINNABAR_GYM, CinnabarGymHiddenObjects dbw CINNABAR_LAB_4, CinnabarLab4HiddenObjects dbw CINNABAR_POKECENTER, CinnabarPokecenterHiddenObjects - db $FF + db $ff ; format: y-coord, x-coord, text id/item id, object routine +hidden_object: macro + db \1, \2, \3 + dba \4 + endm + SilphCo11FHiddenObjects: - db $0c, $0a, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 12, 10, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + SilphCo5FHiddenObjects: - db $03, $0c, ELIXER - dba HiddenItems - db $FF + hidden_object 3, 12, ELIXER, HiddenItems + db $ff + SilphCo9FHiddenObjects: - db $0f, $02, MAX_POTION - dba HiddenItems - db $FF + hidden_object 15, 2, MAX_POTION, HiddenItems + db $ff + Mansion2HiddenObjects: - db $0b, $02, SPRITE_FACING_UP - dba Mansion2Script_Switches - db $FF + hidden_object 11, 2, SPRITE_FACING_UP, Mansion2Script_Switches + db $ff + Mansion3HiddenObjects: - db $09, $01, MAX_REVIVE - dba HiddenItems - db $05, $0a, SPRITE_FACING_UP - dba Mansion3Script_Switches - db $FF + hidden_object 9, 1, MAX_REVIVE, HiddenItems + hidden_object 5, 10, SPRITE_FACING_UP, Mansion3Script_Switches + db $ff + Mansion4HiddenObjects: - db $09, $01, RARE_CANDY - dba HiddenItems - db $03, $14, SPRITE_FACING_UP - dba Mansion4Script_Switches - db $19, $12, SPRITE_FACING_UP - dba Mansion4Script_Switches - db $FF + 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: - db $05, $06, REVIVE - dba HiddenItems - db $FF + hidden_object 5, 6, REVIVE, HiddenItems + db $ff + UnknownDungeon2HiddenObjects: - db $0d, $10, PP_UP - dba HiddenItems - db $FF + hidden_object 13, 16, PP_UP, HiddenItems + db $ff + UnknownDungeon3HiddenObjects: - db $0e, $08, PP_UP - dba HiddenItems - db $FF + hidden_object 14, 8, PP_UP, HiddenItems + db $ff + UnusedMap6FHiddenObjects: - db $0b, $0e, MAX_ELIXER - dba HiddenItems - db $FF + hidden_object 11, 14, MAX_ELIXER, HiddenItems + db $ff + SeafoamIslands3HiddenObjects: - db $0f, $0f, NUGGET - dba HiddenItems - db $FF + hidden_object 15, 15, NUGGET, HiddenItems + db $ff + SeafoamIslands4HiddenObjects: - db $10, $09, MAX_ELIXER - dba HiddenItems - db $FF + hidden_object 16, 9, MAX_ELIXER, HiddenItems + db $ff + SeafoamIslands5HiddenObjects: - db $11, $19, ULTRA_BALL - dba HiddenItems - db $FF + hidden_object 17, 25, ULTRA_BALL, HiddenItems + db $ff + ViridianForestHiddenObjects: - db $12, $01, POTION - dba HiddenItems - db $2a, $10, ANTIDOTE - dba HiddenItems - db $FF + hidden_object 18, 1, POTION, HiddenItems + hidden_object 42, 16, ANTIDOTE, HiddenItems + db $ff + MtMoon3HiddenObjects: - db $0c, $12, MOON_STONE - dba HiddenItems - db $09, $21, ETHER - dba HiddenItems - db $FF + hidden_object 12, 18, MOON_STONE, HiddenItems + hidden_object 9, 33, ETHER, HiddenItems + db $ff + SSAnne10HiddenObjects: - db $01, $03, HYPER_POTION - dba HiddenItems - db $FF + hidden_object 1, 3, HYPER_POTION, HiddenItems + db $ff + SSAnne6HiddenObjects: - db $05, $0d, SPRITE_FACING_DOWN - dba PrintTrashText - db $07, $0d, SPRITE_FACING_DOWN - dba PrintTrashText - db $09, $0d, GREAT_BALL - dba HiddenItems - db $FF + 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: - db $04, $03, FULL_RESTORE - dba HiddenItems - db $22, $04, X_SPECIAL - dba HiddenItems - db $FF + hidden_object 4, 3, FULL_RESTORE, HiddenItems + hidden_object 34, 4, X_SPECIAL, HiddenItems + db $ff + UndergroundPathWeHiddenObjects: - db $02, $0c, NUGGET - dba HiddenItems - db $05, $15, ELIXER - dba HiddenItems - db $FF + hidden_object 2, 12, NUGGET, HiddenItems + hidden_object 5, 21, ELIXER, HiddenItems + db $ff + RocketHideout1HiddenObjects: - db $0f, $15, PP_UP - dba HiddenItems - db $FF + hidden_object 15, 21, PP_UP, HiddenItems + db $ff + RocketHideout3HiddenObjects: - db $11, $1b, NUGGET - dba HiddenItems - db $FF + hidden_object 17, 27, NUGGET, HiddenItems + db $ff + RocketHideout4HiddenObjects: - db $01, $19, SUPER_POTION - dba HiddenItems - db $FF + hidden_object 1, 25, SUPER_POTION, HiddenItems + db $ff + Route10HiddenObjects: - db $11, $09, SUPER_POTION - dba HiddenItems - db $35, $10, MAX_ETHER - dba HiddenItems - db $FF + hidden_object 17, 9, SUPER_POTION, HiddenItems + hidden_object 53, 16, MAX_ETHER, HiddenItems + db $ff + RockTunnelPokecenterHiddenObjects: - db $04, $00, SPRITE_FACING_LEFT - dba PrintBenchGuyText - db $03, $0d, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + PowerPlantHiddenObjects: - db $10, $11, MAX_ELIXER - dba HiddenItems - db $01, $0c, PP_UP - dba HiddenItems - db $FF + hidden_object 16, 17, MAX_ELIXER, HiddenItems + hidden_object 1, 12, PP_UP, HiddenItems + db $ff + Route11HiddenObjects: - db $05, $30, ESCAPE_ROPE - dba HiddenItems - db $FF + hidden_object 5, 48, ESCAPE_ROPE, HiddenItems + db $ff + Route12HiddenObjects: - db $3f, $02, HYPER_POTION - dba HiddenItems - db $FF + hidden_object 63, 2, HYPER_POTION, HiddenItems + db $ff + Route13HiddenObjects: - db $0e, $01, PP_UP - dba HiddenItems - db $0d, $10, CALCIUM - dba HiddenItems - db $FF + hidden_object 14, 1, PP_UP, HiddenItems + hidden_object 13, 16, CALCIUM, HiddenItems + db $ff + Route15Gate2FHiddenObjects: - db $02, $01, SPRITE_FACING_UP - dba Route15GateLeftBinoculars - db $FF + hidden_object 2, 1, SPRITE_FACING_UP, Route15GateLeftBinoculars + db $ff + Route17HiddenObjects: - db $0e, $0f, RARE_CANDY - dba HiddenItems - db $2d, $08, FULL_RESTORE - dba HiddenItems - db $48, $11, PP_UP - dba HiddenItems - db $5b, $04, MAX_REVIVE - dba HiddenItems - db $79, $08, MAX_ELIXER - dba HiddenItems - db $FF + 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: - db $2c, $09, FULL_RESTORE - dba HiddenItems - db $46, $13, ULTRA_BALL - dba HiddenItems - db $5a, $08, MAX_ETHER - dba HiddenItems - db $FF + hidden_object 44, 9, FULL_RESTORE, HiddenItems + hidden_object 70, 19, ULTRA_BALL, HiddenItems + hidden_object 90, 8, MAX_ETHER, HiddenItems + db $ff + VictoryRoad2HiddenObjects: - db $02, $05, ULTRA_BALL - dba HiddenItems - db $07, $1a, FULL_RESTORE - dba HiddenItems - db $FF + hidden_object 2, 5, ULTRA_BALL, HiddenItems + hidden_object 7, 26, FULL_RESTORE, HiddenItems + db $ff + Route25HiddenObjects: - db $03, $26, ETHER - dba HiddenItems - db $01, $0a, ELIXER - dba HiddenItems - db $FF + hidden_object 3, 38, ETHER, HiddenItems + hidden_object 1, 10, ELIXER, HiddenItems + db $ff + BillsHouseHiddenObjects: - db $04, $01, SPRITE_FACING_UP - dba BillsHousePC - db $FF + hidden_object 4, 1, SPRITE_FACING_UP, BillsHousePC + db $ff + Route4HiddenObjects: - db $03, $28, GREAT_BALL - dba HiddenItems - db $FF + hidden_object 3, 40, GREAT_BALL, HiddenItems + db $ff + MtMoonPokecenterHiddenObjects: - db $04, $00, SPRITE_FACING_LEFT - dba PrintBenchGuyText - db $03, $0d, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + Route9HiddenObjects: - db $07, $0e, ETHER - dba HiddenItems - db $FF + hidden_object 7, 14, ETHER, HiddenItems + db $ff + TradeCenterHiddenObjects: - db $04, $05, $d0 - dba CableClubRightGameboy - db $04, $04, $d0 - dba CableClubLeftGameboy - db $FF + hidden_object 4, 5, $d0, CableClubRightGameboy + hidden_object 4, 4, $d0, CableClubLeftGameboy + db $ff + ColosseumHiddenObjects: - db $04, $05, $d0 - dba CableClubRightGameboy - db $04, $04, $d0 - dba CableClubLeftGameboy - db $FF + hidden_object 4, 5, $d0, CableClubRightGameboy + hidden_object 4, 4, $d0, CableClubLeftGameboy + db $ff + IndigoPlateauHiddenObjects: - db $0d, $08, $ff - dba PrintIndigoPlateauHQText - db $0d, $0b, SPRITE_FACING_DOWN - dba PrintIndigoPlateauHQText - db $FF + hidden_object 13, 8, $ff, PrintIndigoPlateauHQText + hidden_object 13, 11, SPRITE_FACING_DOWN, PrintIndigoPlateauHQText + db $ff + IndigoPlateauLobbyHiddenObjects: - db $07, $0f, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 7, 15, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + CopycatsHouse2FHiddenObjects: - db $01, $01, NUGGET - dba HiddenItems - db $FF + hidden_object 1, 1, NUGGET, HiddenItems + db $ff + FightingDojoHiddenObjects: - db $09, $03, SPRITE_FACING_UP - dba PrintFightingDojoText - db $09, $06, SPRITE_FACING_UP - dba PrintFightingDojoText - db $00, $04, SPRITE_FACING_UP - dba PrintFightingDojoText2 - db $00, $05, SPRITE_FACING_UP - dba PrintFightingDojoText3 - db $FF + 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: - db $0f, $09, SPRITE_FACING_UP - dba GymStatues - db $FF + hidden_object 15, 9, SPRITE_FACING_UP, GymStatues + db $ff + SaffronPokecenterHiddenObjects: - db $04, $00, SPRITE_FACING_UP - dba PrintBenchGuyText - db $03, $0d, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + RedsHouse2FHiddenObjects: - db $01, $00, SPRITE_FACING_UP - dba OpenRedsPC - db $05, $03, $d0 - dba PrintRedsNESText - db $FF + hidden_object 1, 0, SPRITE_FACING_UP, OpenRedsPC + hidden_object 5, 3, $d0, PrintRedsNESText + db $ff + BluesHouseHiddenObjects: - db $01, $00, SPRITE_FACING_UP - dba PrintBookcaseText - db $01, $01, SPRITE_FACING_UP - dba PrintBookcaseText - db $01, $07, SPRITE_FACING_UP - dba PrintBookcaseText - db $FF + 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: - db $00, $04, SPRITE_FACING_UP - dba DisplayOakLabLeftPoster - db $00, $05, SPRITE_FACING_UP - dba DisplayOakLabRightPoster - db $01, $00, SPRITE_FACING_UP - dba DisplayOakLabEmailText - db $01, $01, SPRITE_FACING_UP - dba DisplayOakLabEmailText - db $FF + 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: - db $04, $0e, POTION - dba HiddenItems - db $FF + hidden_object 4, 14, POTION, HiddenItems + db $ff + ViridianPokecenterHiddenObjects: - db $04, $00, SPRITE_FACING_LEFT - dba PrintBenchGuyText - db $03, $0d, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + ViridianSchoolHiddenObjects: - db $04, $03, (ViridianSchoolNotebook_id - TextPredefs) / 2 + 1 - dba PrintNotebookText - db $00, $03, (ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1 - dba PrintBlackboardLinkCableText - db $FF + hidden_object 4, 3, (ViridianSchoolNotebook_id - TextPredefs) / 2 + 1, PrintNotebookText + hidden_object 0, 3, (ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1, PrintBlackboardLinkCableText + db $ff + ViridianGymHiddenObjects: - db $0f, $0f, SPRITE_FACING_UP - dba GymStatues - db $0f, $12, SPRITE_FACING_UP - dba GymStatues - db $FF + hidden_object 15, 15, SPRITE_FACING_UP, GymStatues + hidden_object 15, 18, SPRITE_FACING_UP, GymStatues + db $ff + Museum1FHiddenObjects: - db $03, $02, SPRITE_FACING_UP - dba AerodactylFossil - db $06, $02, SPRITE_FACING_UP - dba KabutopsFossil - db $FF + hidden_object 3, 2, SPRITE_FACING_UP, AerodactylFossil + hidden_object 6, 2, SPRITE_FACING_UP, KabutopsFossil + db $ff + PewterGymHiddenObjects: - db $0a, $03, SPRITE_FACING_UP - dba GymStatues - db $0a, $06, SPRITE_FACING_UP - dba GymStatues - db $FF + hidden_object 10, 3, SPRITE_FACING_UP, GymStatues + hidden_object 10, 6, SPRITE_FACING_UP, GymStatues + db $ff + PewterPokecenterHiddenObjects: - db $04, $00, SPRITE_FACING_LEFT - dba PrintBenchGuyText - db $03, $0d, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + CeruleanCityHiddenObjects: - db $08, $0f, RARE_CANDY - dba HiddenItems - db $FF + hidden_object 8, 15, RARE_CANDY, HiddenItems + db $ff + CeruleanPokecenterHiddenObjects: - db $04, $00, SPRITE_FACING_LEFT - dba PrintBenchGuyText - db $03, $0d, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + CeruleanGymHiddenObjects: - db $0b, $03, SPRITE_FACING_UP - dba GymStatues - db $0b, $06, SPRITE_FACING_UP - dba GymStatues - db $FF + hidden_object 11, 3, SPRITE_FACING_UP, GymStatues + hidden_object 11, 6, SPRITE_FACING_UP, GymStatues + db $ff + BikeShopHiddenObjects: - db $00, $01, $d0 - dba PrintNewBikeText - db $01, $02, $d0 - dba PrintNewBikeText - db $02, $01, $d0 - dba PrintNewBikeText - db $02, $03, $d0 - dba PrintNewBikeText - db $04, $00, $d0 - dba PrintNewBikeText - db $05, $01, $d0 - dba PrintNewBikeText - db $FF + 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: - db $07, $12, PP_UP - dba HiddenItems - db $FF + hidden_object 7, 18, PP_UP, HiddenItems + db $ff + LavenderPokecenterHiddenObjects: - db $04, $00, SPRITE_FACING_LEFT - dba PrintBenchGuyText - db $03, $0d, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + Pokemontower5HiddenObjects: - db $0c, $04, ELIXER - dba HiddenItems - db $FF + hidden_object 12, 4, ELIXER, HiddenItems + db $ff + LavenderHouse1HiddenObjects: - db $01, $00, SPRITE_FACING_DOWN - dba PrintMagazinesText - db $01, $01, SPRITE_FACING_DOWN - dba PrintMagazinesText - db $01, $07, SPRITE_FACING_DOWN - dba PrintMagazinesText - db $FF + 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: - db $0b, $0e, MAX_ETHER - dba HiddenItems - db $FF + hidden_object 11, 14, MAX_ETHER, HiddenItems + db $ff + VermilionPokecenterHiddenObjects: - db $03, $0d, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $04, $00, SPRITE_FACING_UP - dba PrintBenchGuyText - db $FF + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText + db $ff + PokemonFanClubHiddenObjects: - db $00, $01, SPRITE_FACING_UP - dba FanClubPicture1 - db $00, $06, SPRITE_FACING_UP - dba FanClubPicture2 - db $FF + hidden_object 0, 1, SPRITE_FACING_UP, FanClubPicture1 + hidden_object 0, 6, SPRITE_FACING_UP, FanClubPicture2 + db $ff + VermilionGymHiddenObjects: - db $0e, $03, SPRITE_FACING_UP - dba GymStatues - db $0e, $06, SPRITE_FACING_UP - dba GymStatues - db $01, $06, SPRITE_FACING_DOWN - dba PrintTrashText - db $07, $01, 0 - dba GymTrashScript - db $09, $01, 1 - dba GymTrashScript - db $0b, $01, 2 - dba GymTrashScript - db $07, $03, 3 - dba GymTrashScript - db $09, $03, 4 - dba GymTrashScript - db $0b, $03, 5 - dba GymTrashScript - db $07, $05, 6 - dba GymTrashScript - db $09, $05, 7 - dba GymTrashScript - db $0b, $05, 8 - dba GymTrashScript - db $07, $07, 9 - dba GymTrashScript - db $09, $07, 10 - dba GymTrashScript - db $0b, $07, 11 - dba GymTrashScript - db $07, $09, 12 - dba GymTrashScript - db $09, $09, 13 - dba GymTrashScript - db $0b, $09, 14 - dba GymTrashScript - db $FF + 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: - db $0f, $30, PP_UP - dba HiddenItems - db $FF + hidden_object 15, 48, PP_UP, HiddenItems + db $ff + CeladonHotelHiddenObjects: - db $04, $00, SPRITE_FACING_LEFT - dba PrintBenchGuyText - db $FF + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + db $ff + CeladonMansion2HiddenObjects: - db $05, $00, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 5, 0, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + CeladonMansion5HiddenObjects: - db $00, $03, (LinkCableHelp_id - TextPredefs) / 2 + 1 - dba PrintBlackboardLinkCableText - db $00, $04, (LinkCableHelp_id - TextPredefs) / 2 + 1 - dba PrintBlackboardLinkCableText - db $04, $03, (TMNotebook_id - TextPredefs) / 2 + 1 - dba PrintNotebookText - db $FF + 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: - db $04, $00, SPRITE_FACING_LEFT - dba PrintBenchGuyText - db $03, $0d, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 4, 0, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + CeladonGymHiddenObjects: - db $0f, $03, SPRITE_FACING_UP - dba GymStatues - db $0f, $06, SPRITE_FACING_UP - dba GymStatues - db $FF + hidden_object 15, 3, SPRITE_FACING_UP, GymStatues + hidden_object 15, 6, SPRITE_FACING_UP, GymStatues + db $ff + GameCornerHiddenObjects: - db $0f, $12, $d0 - dba StartSlotMachine - db $0e, $12, $d0 - dba StartSlotMachine - db $0d, $12, $d0 - dba StartSlotMachine - db $0c, $12, $d0 - dba StartSlotMachine - db $0b, $12, $d0 - dba StartSlotMachine - db $0a, $12, $ff ; "Someone's Keys" - dba StartSlotMachine - db $0a, $0d, $d0 - dba StartSlotMachine - db $0b, $0d, $d0 - dba StartSlotMachine - db $0c, $0d, $fe ; "Out To Lunch" - dba StartSlotMachine - db $0d, $0d, $d0 - dba StartSlotMachine - db $0e, $0d, $d0 - dba StartSlotMachine - db $0f, $0d, $d0 - dba StartSlotMachine - db $0f, $0c, $d0 - dba StartSlotMachine - db $0e, $0c, $d0 - dba StartSlotMachine - db $0d, $0c, $d0 - dba StartSlotMachine - db $0c, $0c, $d0 - dba StartSlotMachine - db $0b, $0c, $d0 - dba StartSlotMachine - db $0a, $0c, $d0 - dba StartSlotMachine - db $0a, $07, $d0 - dba StartSlotMachine - db $0b, $07, $d0 - dba StartSlotMachine - db $0c, $07, $d0 - dba StartSlotMachine - db $0d, $07, $d0 - dba StartSlotMachine - db $0e, $07, $d0 - dba StartSlotMachine - db $0f, $07, $d0 - dba StartSlotMachine - db $0f, $06, $d0 - dba StartSlotMachine - db $0e, $06, $d0 - dba StartSlotMachine - db $0d, $06, $d0 - dba StartSlotMachine - db $0c, $06, $fd ; "Out Of Order" - dba StartSlotMachine - db $0b, $06, $d0 - dba StartSlotMachine - db $0a, $06, $d0 - dba StartSlotMachine - db $0a, $01, $d0 - dba StartSlotMachine - db $0b, $01, $d0 - dba StartSlotMachine - db $0c, $01, $d0 - dba StartSlotMachine - db $0d, $01, $d0 - dba StartSlotMachine - db $0e, $01, $d0 - dba StartSlotMachine - db $0f, $01, $d0 - dba StartSlotMachine - db $08, $00, COIN + 10 - dba HiddenCoins - db $10, $01, COIN + 10 - dba HiddenCoins - db $0b, $03, COIN + 20 - dba HiddenCoins - db $0e, $03, COIN + 10 - dba HiddenCoins - db $0c, $04, COIN + 10 - dba HiddenCoins - db $0c, $09, COIN + 20 - dba HiddenCoins - db $0f, $09, COIN + 10 - dba HiddenCoins - db $0e, $10, COIN + 10 - dba HiddenCoins - db $10, $0a, COIN + 10 - dba HiddenCoins - db $07, $0b, COIN + 40 - dba HiddenCoins - db $08, $0f, COIN + 100 - dba HiddenCoins - db $0f, $0c, COIN + 10 - dba HiddenCoins - db $FF + 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: - db $03, $0d, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $04, $00, SPRITE_FACING_UP - dba PrintBenchGuyText - db $FF + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText + db $ff + SafariZoneEntranceHiddenObjects: - db $01, $0a, NUGGET - dba HiddenItems - db $FF + hidden_object 1, 10, NUGGET, HiddenItems + db $ff + FuchsiaGymHiddenObjects: - db $0f, $03, SPRITE_FACING_UP - dba GymStatues - db $0f, $06, SPRITE_FACING_UP - dba GymStatues - db $FF + hidden_object 15, 3, SPRITE_FACING_UP, GymStatues + hidden_object 15, 6, SPRITE_FACING_UP, GymStatues + db $ff + Mansion1HiddenObjects: - db $10, $08, MOON_STONE - dba HiddenItems - db $05, $02, SPRITE_FACING_UP - dba Mansion1Script_Switches - db $FF + hidden_object 16, 8, MOON_STONE, HiddenItems + hidden_object 5, 2, SPRITE_FACING_UP, Mansion1Script_Switches + db $ff + CinnabarGymHiddenObjects: - db $0d, $11, SPRITE_FACING_UP - dba GymStatues - db $07, $0f, (0 << 4) | 1 - dba PrintCinnabarQuiz - db $01, $0a, (1 << 4) | 2 - dba PrintCinnabarQuiz - db $07, $09, (1 << 4) | 3 - dba PrintCinnabarQuiz - db $0d, $09, (1 << 4) | 4 - dba PrintCinnabarQuiz - db $0d, $01, (0 << 4) | 5 - dba PrintCinnabarQuiz - db $07, $01, (1 << 4) | 6 - dba PrintCinnabarQuiz - db $FF + 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: - db $04, $00, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $04, $02, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 4, 0, SPRITE_FACING_UP, OpenPokemonCenterPC + hidden_object 4, 2, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + CinnabarPokecenterHiddenObjects: ; 6cc3 - db $04, $00, SPRITE_FACING_UP - dba PrintBenchGuyText - db $03, $0d, SPRITE_FACING_UP - dba OpenPokemonCenterPC - db $FF + hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText + hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC + db $ff + ; 6cd0 -- cgit v1.3.1-sl0p