diff --git a/pokeblue.map b/pokeblue.map index afe9a0547..30b977445 100644 --- a/pokeblue.map +++ b/pokeblue.map @@ -1061,11 +1061,11 @@ ROM0 bank #0: $3e8d = Predef.done $3e94 = GetPredefRegisters $3ead = UpdateCinnabarGymGateTileBlocks - $3eb5 = CheckForHiddenObjectOrBookshelfOrCardKeyDoor - $3eda = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.returnAddress - $3edd = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.hiddenObjectNotFound - $3eea = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.nothingFound - $3eec = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.done + $3eb5 = CheckForHiddenEventOrBookshelfOrCardKeyDoor + $3eda = CheckForHiddenEventOrBookshelfOrCardKeyDoor.returnAddress + $3edd = CheckForHiddenEventOrBookshelfOrCardKeyDoor.hiddenEventNotFound + $3eea = CheckForHiddenEventOrBookshelfOrCardKeyDoor.nothingFound + $3eec = CheckForHiddenEventOrBookshelfOrCardKeyDoor.done $3ef5 = PrintPredefTextID $3f05 = RestoreMapTextPointer $3f0f = SetMapTextPointer @@ -4901,7 +4901,7 @@ ROMX bank #7: $68da = BillsHouseBillCheckOutMyRarePokemonText.Text $68df = BillsHouse_Object $6905 = BillsHouse_Blocks - SECTION: $6915-$6cc1 ($03ad bytes) ["Hidden Objects 1"] + SECTION: $6915-$6cc1 ($03ad bytes) ["Hidden Events 1"] $6915 = OpenOaksPC $6932 = OpenOaksPC.closePC $693b = GetDexRatedText @@ -8386,14 +8386,14 @@ ROMX bank #17: $68b7 = SeafoamIslandsB4FDangerSignText $68bc = SeafoamIslandsB4F_Object $68fa = SeafoamIslandsB4F_Blocks - SECTION: $6981-$70aa ($072a bytes) ["Hidden Objects Core"] + SECTION: $6981-$70aa ($072a bytes) ["Hidden Events Core"] $6981 = IsPlayerOnDungeonWarp - $69a0 = CheckForHiddenObject - $69ae = CheckForHiddenObject.hiddenMapLoop - $69be = CheckForHiddenObject.foundMatchingMap - $69ce = CheckForHiddenObject.hiddenObjectLoop - $69f0 = CheckForHiddenObject.foundMatchingObject - $69fc = CheckForHiddenObject.noMatch + $69a0 = CheckForHiddenEvent + $69ae = CheckForHiddenEvent.hiddenMapLoop + $69be = CheckForHiddenEvent.foundMatchingMap + $69ce = CheckForHiddenEvent.hiddenEventLoop + $69f0 = CheckForHiddenEvent.foundMatchingEvent + $69fc = CheckForHiddenEvent.noMatch $6a01 = CheckIfCoordsInFrontOfPlayerMatch $6a16 = CheckIfCoordsInFrontOfPlayerMatch.facingUp $6a1a = CheckIfCoordsInFrontOfPlayerMatch.upDownCommon @@ -8403,93 +8403,93 @@ ROMX bank #17: $6a38 = CheckIfCoordsInFrontOfPlayerMatch.matched $6a3b = CheckIfCoordsInFrontOfPlayerMatch.didNotMatch $6a3d = CheckIfCoordsInFrontOfPlayerMatch.done - $6a40 = HiddenObjectMaps - $6a96 = HiddenObjectPointers - $6b40 = TradeCenterHiddenObjects - $6b4d = ColosseumHiddenObjects - $6b5a = RedsHouse2FHiddenObjects - $6b67 = BluesHouseHiddenObjects - $6b7a = OaksLabHiddenObjects - $6b93 = ViridianPokecenterHiddenObjects - $6ba0 = ViridianMartHiddenObjects - $6ba1 = ViridianSchoolHiddenObjects - $6bae = ViridianGymHiddenObjects - $6bbb = Museum1FHiddenObjects - $6bc8 = PewterGymHiddenObjects - $6bd5 = PewterMartHiddenObjects - $6bd6 = PewterPokecenterHiddenObjects - $6be3 = CeruleanPokecenterHiddenObjects - $6bf0 = CeruleanGymHiddenObjects - $6bfd = CeruleanMartHiddenObjects - $6bfe = LavenderPokecenterHiddenObjects - $6c0b = VermilionPokecenterHiddenObjects - $6c18 = VermilionGymHiddenObjects - $6c85 = CeladonMansion2HiddenObjects - $6c8c = CeladonPokecenterHiddenObjects - $6c99 = CeladonGymHiddenObjects - $6ca6 = GameCornerHiddenObjects - $6dc7 = CeladonHotelHiddenObjects - $6dd4 = FuchsiaPokecenterHiddenObjects - $6de1 = FuchsiaGymHiddenObjects - $6dee = CinnabarGymHiddenObjects - $6e19 = CinnabarPokecenterHiddenObjects - $6e26 = SaffronGymHiddenObjects - $6e2d = MtMoonPokecenterHiddenObjects - $6e3a = RockTunnelPokecenterHiddenObjects - $6e47 = ViridianForestHiddenObjects - $6e54 = MtMoon3HiddenObjects - $6e61 = IndigoPlateauHiddenObjects - $6e6e = Route25HiddenObjects - $6e7b = Route9HiddenObjects - $6e82 = SSAnne6HiddenObjects - $6e95 = SSAnne10HiddenObjects - $6e9c = Route10HiddenObjects - $6ea9 = RocketHideout1HiddenObjects - $6eb0 = RocketHideout3HiddenObjects - $6eb7 = RocketHideout4HiddenObjects - $6ebe = SaffronPokecenterHiddenObjects - $6ecb = PokemonTower5HiddenObjects - $6ed2 = Route13HiddenObjects - $6edf = SafariZoneEntranceHiddenObjects - $6ee6 = SafariZoneWestHiddenObjects - $6eed = SilphCo5FHiddenObjects - $6ef4 = SilphCo9FHiddenObjects - $6efb = CopycatsHouse2FHiddenObjects - $6f02 = CeruleanCave1HiddenObjects - $6f09 = CeruleanCave3HiddenObjects - $6f10 = PowerPlantHiddenObjects - $6f1d = SeafoamIslands3HiddenObjects - $6f24 = SeafoamIslands5HiddenObjects - $6f2b = Mansion1HiddenObjects - $6f38 = Mansion2HiddenObjects - $6f3f = Mansion3HiddenObjects - $6f4c = Mansion4HiddenObjects - $6f5f = Route23HiddenObjects - $6f72 = VictoryRoad2HiddenObjects - $6f7f = Unused6FHiddenObjects - $6f86 = BillsHouseHiddenObjects - $6f8d = ViridianCityHiddenObjects - $6f94 = SafariZoneRestHouse2HiddenObjects - $6fa1 = SafariZoneRestHouse3HiddenObjects - $6fae = SafariZoneRestHouse4HiddenObjects - $6fbb = Route15GateUpstairsHiddenObjects - $6fc2 = LavenderHouse1HiddenObjects - $6fd5 = CeladonMansion5HiddenObjects - $6fe8 = FightingDojoHiddenObjects - $7001 = IndigoPlateauLobbyHiddenObjects - $7008 = CinnabarLab4HiddenObjects - $7015 = BikeShopHiddenObjects - $703a = Route11HiddenObjects - $7041 = Route12HiddenObjects - $7048 = SilphCo11FHiddenObjects - $704f = Route17HiddenObjects - $706e = UndergroundPathNsHiddenObjects - $707b = UndergroundPathWeHiddenObjects - $7088 = CeladonCityHiddenObjects - $708f = SeafoamIslands4HiddenObjects - $7096 = VermilionCityHiddenObjects - $709d = CeruleanCityHiddenObjects - $70a4 = Route4HiddenObjects + $6a40 = HiddenEventMaps + $6a96 = HiddenEventPointers + $6b40 = HiddenEventsFor_TRADE_CENTER + $6b4d = HiddenEventsFor_COLOSSEUM + $6b5a = HiddenEventsFor_REDS_HOUSE_2F + $6b67 = HiddenEventsFor_BLUES_HOUSE + $6b7a = HiddenEventsFor_OAKS_LAB + $6b93 = HiddenEventsFor_VIRIDIAN_POKECENTER + $6ba0 = HiddenEventsFor_VIRIDIAN_MART + $6ba1 = HiddenEventsFor_VIRIDIAN_SCHOOL_HOUSE + $6bae = HiddenEventsFor_VIRIDIAN_GYM + $6bbb = HiddenEventsFor_MUSEUM_1F + $6bc8 = HiddenEventsFor_PEWTER_GYM + $6bd5 = HiddenEventsFor_PEWTER_MART + $6bd6 = HiddenEventsFor_PEWTER_POKECENTER + $6be3 = HiddenEventsFor_CERULEAN_POKECENTER + $6bf0 = HiddenEventsFor_CERULEAN_GYM + $6bfd = HiddenEventsFor_CERULEAN_MART + $6bfe = HiddenEventsFor_LAVENDER_POKECENTER + $6c0b = HiddenEventsFor_VERMILION_POKECENTER + $6c18 = HiddenEventsFor_VERMILION_GYM + $6c85 = HiddenEventsFor_CELADON_MANSION_2F + $6c8c = HiddenEventsFor_CELADON_POKECENTER + $6c99 = HiddenEventsFor_CELADON_GYM + $6ca6 = HiddenEventsFor_GAME_CORNER + $6dc7 = HiddenEventsFor_CELADON_HOTEL + $6dd4 = HiddenEventsFor_FUCHSIA_POKECENTER + $6de1 = HiddenEventsFor_FUCHSIA_GYM + $6dee = HiddenEventsFor_CINNABAR_GYM + $6e19 = HiddenEventsFor_CINNABAR_POKECENTER + $6e26 = HiddenEventsFor_SAFFRON_GYM + $6e2d = HiddenEventsFor_MT_MOON_POKECENTER + $6e3a = HiddenEventsFor_ROCK_TUNNEL_POKECENTER + $6e47 = HiddenEventsFor_VIRIDIAN_FOREST + $6e54 = HiddenEventsFor_MT_MOON_B2F + $6e61 = HiddenEventsFor_INDIGO_PLATEAU + $6e6e = HiddenEventsFor_ROUTE_25 + $6e7b = HiddenEventsFor_ROUTE_9 + $6e82 = HiddenEventsFor_SS_ANNE_KITCHEN + $6e95 = HiddenEventsFor_SS_ANNE_B1F_ROOMS + $6e9c = HiddenEventsFor_ROUTE_10 + $6ea9 = HiddenEventsFor_ROCKET_HIDEOUT_B1F + $6eb0 = HiddenEventsFor_ROCKET_HIDEOUT_B3F + $6eb7 = HiddenEventsFor_ROCKET_HIDEOUT_B4F + $6ebe = HiddenEventsFor_SAFFRON_POKECENTER + $6ecb = HiddenEventsFor_POKEMON_TOWER_5F + $6ed2 = HiddenEventsFor_ROUTE_13 + $6edf = HiddenEventsFor_SAFARI_ZONE_GATE + $6ee6 = HiddenEventsFor_SAFARI_ZONE_WEST + $6eed = HiddenEventsFor_SILPH_CO_5F + $6ef4 = HiddenEventsFor_SILPH_CO_9F + $6efb = HiddenEventsFor_COPYCATS_HOUSE_2F + $6f02 = HiddenEventsFor_CERULEAN_CAVE_1F + $6f09 = HiddenEventsFor_CERULEAN_CAVE_B1F + $6f10 = HiddenEventsFor_POWER_PLANT + $6f1d = HiddenEventsFor_SEAFOAM_ISLANDS_B2F + $6f24 = HiddenEventsFor_SEAFOAM_ISLANDS_B4F + $6f2b = HiddenEventsFor_POKEMON_MANSION_1F + $6f38 = HiddenEventsFor_POKEMON_MANSION_2F + $6f3f = HiddenEventsFor_POKEMON_MANSION_3F + $6f4c = HiddenEventsFor_POKEMON_MANSION_B1F + $6f5f = HiddenEventsFor_ROUTE_23 + $6f72 = HiddenEventsFor_VICTORY_ROAD_2F + $6f7f = HiddenEventsFor_UNUSED_MAP_6F + $6f86 = HiddenEventsFor_BILLS_HOUSE + $6f8d = HiddenEventsFor_VIRIDIAN_CITY + $6f94 = HiddenEventsFor_SAFARI_ZONE_WEST_REST_HOUSE + $6fa1 = HiddenEventsFor_SAFARI_ZONE_EAST_REST_HOUSE + $6fae = HiddenEventsFor_SAFARI_ZONE_NORTH_REST_HOUSE + $6fbb = HiddenEventsFor_ROUTE_15_GATE_2F + $6fc2 = HiddenEventsFor_MR_FUJIS_HOUSE + $6fd5 = HiddenEventsFor_CELADON_MANSION_ROOF_HOUSE + $6fe8 = HiddenEventsFor_FIGHTING_DOJO + $7001 = HiddenEventsFor_INDIGO_PLATEAU_LOBBY + $7008 = HiddenEventsFor_CINNABAR_LAB_FOSSIL_ROOM + $7015 = HiddenEventsFor_BIKE_SHOP + $703a = HiddenEventsFor_ROUTE_11 + $7041 = HiddenEventsFor_ROUTE_12 + $7048 = HiddenEventsFor_SILPH_CO_11F + $704f = HiddenEventsFor_ROUTE_17 + $706e = HiddenEventsFor_UNDERGROUND_PATH_NORTH_SOUTH + $707b = HiddenEventsFor_UNDERGROUND_PATH_WEST_EAST + $7088 = HiddenEventsFor_CELADON_CITY + $708f = HiddenEventsFor_SEAFOAM_ISLANDS_B3F + $7096 = HiddenEventsFor_VERMILION_CITY + $709d = HiddenEventsFor_CERULEAN_CITY + $70a4 = HiddenEventsFor_ROUTE_4 EMPTY: $70ab-$7fff ($0f55 bytes) TOTAL EMPTY: $0f55 bytes @@ -9233,7 +9233,7 @@ ROMX bank #19: $7ec7 = LearnMoveFromLevelUpPredef $7eca = LearnMovePredef $7ecd = GetQuantityOfItemInBagPredef - $7ed0 = CheckForHiddenObjectOrBookshelfOrCardKeyDoorPredef + $7ed0 = CheckForHiddenEventOrBookshelfOrCardKeyDoorPredef $7ed3 = GiveItemPredef $7ed6 = ChangeBGPalColor0_4FramesPredef $7ed9 = FindPathToPlayerPredef @@ -9823,7 +9823,7 @@ ROMX bank #20: $662a = ParalyzeEffect_.hitTest $6659 = ParalyzeEffect_.didntAffect $6666 = ParalyzeEffect_.doesntAffect - SECTION: $6673-$6a41 ($03cf bytes) ["Hidden Objects 2"] + SECTION: $6673-$6a41 ($03cf bytes) ["Hidden Events 2"] $6673 = PrintCardKeyText $667a = PrintCardKeyText.silphCoMapListLoop $669c = PrintCardKeyText.cardKeyDoorInFrontOfPlayer @@ -11637,7 +11637,7 @@ ROMX bank #23: $5ab3 = VictoryRoad1FCooltrainerMAfterBattleText $5ab8 = VictoryRoad1F_Object $5b04 = VictoryRoad1F_Blocks - SECTION: $5b5e-$5f14 ($03b7 bytes) ["Hidden Objects 3"] + SECTION: $5b5e-$5f14 ($03b7 bytes) ["Hidden Events 3"] $5b5e = SetPartyMonTypes $5b79 = PrintRedSNESText $5b81 = RedBedroomSNESText @@ -12219,7 +12219,7 @@ ROMX bank #24: $637b = SilphCo10FPorygonText.Text $6380 = SilphCo11F_Object $63c8 = SilphCo11F_Blocks - SECTION: $6419-$6529 ($0111 bytes) ["Hidden Objects 4"] + SECTION: $6419-$6529 ($0111 bytes) ["Hidden Events 4"] $6419 = GymStatues $6429 = GymStatues.loop $6433 = GymStatues.match @@ -18755,7 +18755,7 @@ WRAM0 bank #0: $ccf6 = wLowHealthAlarmDisabled $ccf7 = wPlayerMonMinimized $cd05 = wEnemyNumHits - $cd05 = wLuckySlotHiddenObjectIndex + $cd05 = wLuckySlotHiddenEventIndex $cd05 = wEnemyBideAccumulatedDamage $cd0f = wVermilionDockTileMapBufferEnd $cd0f = wInGameTradeGiveMonSpecies @@ -18815,6 +18815,7 @@ WRAM0 bank #0: $cd3d = wOptionsTextSpeedCursorX $cd3d = wTrainerInfoTextBoxWidthPlus1 $cd3d = wPlayerSpinInPlaceAnimFrameDelay + $cd3d = wHiddenEventFunctionArgument $cd3d = wCanPlaySlots $cd3d = wWhichTownMapLocation $cd3d = wFlyAnimUsingCoordList @@ -18836,7 +18837,6 @@ WRAM0 bank #0: $cd3d = wDayCareStartLevel $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel - $cd3d = wHiddenObjectFunctionArgument $cd3d = wFieldMoves $cd3d = wHoFTeamIndex $cd3d = wCoordIndex @@ -18850,7 +18850,7 @@ WRAM0 bank #0: $cd3e = wTrainerEngageDistance $cd3e = wPlayerSpinWhileMovingUpOrDownAnimMaxY $cd3e = wPlayerSpinInPlaceAnimFrameDelayDelta - $cd3e = wHiddenObjectFunctionRomBank + $cd3e = wHiddenEventFunctionRomBank $cd3e = wSlotMachineWheel1Offset $cd3e = wDayCareNumLevelsGrown $cd3e = wHUDPokeballGfxOffsetX @@ -18870,22 +18870,22 @@ WRAM0 bank #0: $cd3f = wTrainerFacingDirection $cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay $cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue + $cd3f = wHiddenEventIndex $cd3f = wSlotMachineWheel2Offset $cd3f = wHUDUnusedTopTile $cd3f = wFlyAnimBirdSpriteImageIndex $cd3f = wHoFMonLevel $cd3f = wDayCareTotalCost $cd3f = wTrainerInfoTextBoxNextRowOffset - $cd3f = wHiddenObjectIndex $cd3f = wNameOfPlayerMonToBeTraded $cd3f = wOptionsBattleStyleCursorX $cd3f = wHUDGraphicsTiles $cd40 = wOptionsCancelCursorX $cd40 = wTrainerScreenY + $cd40 = wHiddenEventY $cd40 = wSlotMachineWheel3Offset $cd40 = wHUDCornerTile $cd40 = wPlayerSpinInPlaceAnimSoundID - $cd40 = wHiddenObjectY $cd40 = wHoFMonOrPlayer $cd41 = wSlotMachineWheel1BottomTile $cd41 = wSlotMachineWinningSymbol @@ -18894,7 +18894,7 @@ WRAM0 bank #0: $cd41 = wNumFieldMoves $cd41 = wDayCarePerLevelCost $cd41 = wTradedPlayerMonOT - $cd41 = wHiddenObjectX + $cd41 = wHiddenEventX $cd41 = wTrainerScreenX $cd41 = wHiddenItemOrCoinsIndex $cd42 = wSlotMachineWheel1MiddleTile @@ -20549,7 +20549,7 @@ HRAM bank #0: $ffec = hSpriteScreenXCoord $ffed = hSpriteMapYCoord $ffee = hSpriteMapXCoord - $ffee = hDidntFindAnyHiddenObject + $ffee = hDidntFindAnyHiddenEvent $fff3 = hWhoseTurn $fff4 = hClearLetterPrintingDelayFlags $fff6 = hUILayoutFlags diff --git a/pokeblue.sym b/pokeblue.sym index 0923206a2..bd551351a 100644 --- a/pokeblue.sym +++ b/pokeblue.sym @@ -1036,11 +1036,11 @@ 00:3e8d Predef.done 00:3e94 GetPredefRegisters 00:3ead UpdateCinnabarGymGateTileBlocks -00:3eb5 CheckForHiddenObjectOrBookshelfOrCardKeyDoor -00:3eda CheckForHiddenObjectOrBookshelfOrCardKeyDoor.returnAddress -00:3edd CheckForHiddenObjectOrBookshelfOrCardKeyDoor.hiddenObjectNotFound -00:3eea CheckForHiddenObjectOrBookshelfOrCardKeyDoor.nothingFound -00:3eec CheckForHiddenObjectOrBookshelfOrCardKeyDoor.done +00:3eb5 CheckForHiddenEventOrBookshelfOrCardKeyDoor +00:3eda CheckForHiddenEventOrBookshelfOrCardKeyDoor.returnAddress +00:3edd CheckForHiddenEventOrBookshelfOrCardKeyDoor.hiddenEventNotFound +00:3eea CheckForHiddenEventOrBookshelfOrCardKeyDoor.nothingFound +00:3eec CheckForHiddenEventOrBookshelfOrCardKeyDoor.done 00:3ef5 PrintPredefTextID 00:3f05 RestoreMapTextPointer 00:3f0f SetMapTextPointer @@ -8251,12 +8251,12 @@ 11:68bc SeafoamIslandsB4F_Object 11:68fa SeafoamIslandsB4F_Blocks 11:6981 IsPlayerOnDungeonWarp -11:69a0 CheckForHiddenObject -11:69ae CheckForHiddenObject.hiddenMapLoop -11:69be CheckForHiddenObject.foundMatchingMap -11:69ce CheckForHiddenObject.hiddenObjectLoop -11:69f0 CheckForHiddenObject.foundMatchingObject -11:69fc CheckForHiddenObject.noMatch +11:69a0 CheckForHiddenEvent +11:69ae CheckForHiddenEvent.hiddenMapLoop +11:69be CheckForHiddenEvent.foundMatchingMap +11:69ce CheckForHiddenEvent.hiddenEventLoop +11:69f0 CheckForHiddenEvent.foundMatchingEvent +11:69fc CheckForHiddenEvent.noMatch 11:6a01 CheckIfCoordsInFrontOfPlayerMatch 11:6a16 CheckIfCoordsInFrontOfPlayerMatch.facingUp 11:6a1a CheckIfCoordsInFrontOfPlayerMatch.upDownCommon @@ -8266,93 +8266,93 @@ 11:6a38 CheckIfCoordsInFrontOfPlayerMatch.matched 11:6a3b CheckIfCoordsInFrontOfPlayerMatch.didNotMatch 11:6a3d CheckIfCoordsInFrontOfPlayerMatch.done -11:6a40 HiddenObjectMaps -11:6a96 HiddenObjectPointers -11:6b40 TradeCenterHiddenObjects -11:6b4d ColosseumHiddenObjects -11:6b5a RedsHouse2FHiddenObjects -11:6b67 BluesHouseHiddenObjects -11:6b7a OaksLabHiddenObjects -11:6b93 ViridianPokecenterHiddenObjects -11:6ba0 ViridianMartHiddenObjects -11:6ba1 ViridianSchoolHiddenObjects -11:6bae ViridianGymHiddenObjects -11:6bbb Museum1FHiddenObjects -11:6bc8 PewterGymHiddenObjects -11:6bd5 PewterMartHiddenObjects -11:6bd6 PewterPokecenterHiddenObjects -11:6be3 CeruleanPokecenterHiddenObjects -11:6bf0 CeruleanGymHiddenObjects -11:6bfd CeruleanMartHiddenObjects -11:6bfe LavenderPokecenterHiddenObjects -11:6c0b VermilionPokecenterHiddenObjects -11:6c18 VermilionGymHiddenObjects -11:6c85 CeladonMansion2HiddenObjects -11:6c8c CeladonPokecenterHiddenObjects -11:6c99 CeladonGymHiddenObjects -11:6ca6 GameCornerHiddenObjects -11:6dc7 CeladonHotelHiddenObjects -11:6dd4 FuchsiaPokecenterHiddenObjects -11:6de1 FuchsiaGymHiddenObjects -11:6dee CinnabarGymHiddenObjects -11:6e19 CinnabarPokecenterHiddenObjects -11:6e26 SaffronGymHiddenObjects -11:6e2d MtMoonPokecenterHiddenObjects -11:6e3a RockTunnelPokecenterHiddenObjects -11:6e47 ViridianForestHiddenObjects -11:6e54 MtMoon3HiddenObjects -11:6e61 IndigoPlateauHiddenObjects -11:6e6e Route25HiddenObjects -11:6e7b Route9HiddenObjects -11:6e82 SSAnne6HiddenObjects -11:6e95 SSAnne10HiddenObjects -11:6e9c Route10HiddenObjects -11:6ea9 RocketHideout1HiddenObjects -11:6eb0 RocketHideout3HiddenObjects -11:6eb7 RocketHideout4HiddenObjects -11:6ebe SaffronPokecenterHiddenObjects -11:6ecb PokemonTower5HiddenObjects -11:6ed2 Route13HiddenObjects -11:6edf SafariZoneEntranceHiddenObjects -11:6ee6 SafariZoneWestHiddenObjects -11:6eed SilphCo5FHiddenObjects -11:6ef4 SilphCo9FHiddenObjects -11:6efb CopycatsHouse2FHiddenObjects -11:6f02 CeruleanCave1HiddenObjects -11:6f09 CeruleanCave3HiddenObjects -11:6f10 PowerPlantHiddenObjects -11:6f1d SeafoamIslands3HiddenObjects -11:6f24 SeafoamIslands5HiddenObjects -11:6f2b Mansion1HiddenObjects -11:6f38 Mansion2HiddenObjects -11:6f3f Mansion3HiddenObjects -11:6f4c Mansion4HiddenObjects -11:6f5f Route23HiddenObjects -11:6f72 VictoryRoad2HiddenObjects -11:6f7f Unused6FHiddenObjects -11:6f86 BillsHouseHiddenObjects -11:6f8d ViridianCityHiddenObjects -11:6f94 SafariZoneRestHouse2HiddenObjects -11:6fa1 SafariZoneRestHouse3HiddenObjects -11:6fae SafariZoneRestHouse4HiddenObjects -11:6fbb Route15GateUpstairsHiddenObjects -11:6fc2 LavenderHouse1HiddenObjects -11:6fd5 CeladonMansion5HiddenObjects -11:6fe8 FightingDojoHiddenObjects -11:7001 IndigoPlateauLobbyHiddenObjects -11:7008 CinnabarLab4HiddenObjects -11:7015 BikeShopHiddenObjects -11:703a Route11HiddenObjects -11:7041 Route12HiddenObjects -11:7048 SilphCo11FHiddenObjects -11:704f Route17HiddenObjects -11:706e UndergroundPathNsHiddenObjects -11:707b UndergroundPathWeHiddenObjects -11:7088 CeladonCityHiddenObjects -11:708f SeafoamIslands4HiddenObjects -11:7096 VermilionCityHiddenObjects -11:709d CeruleanCityHiddenObjects -11:70a4 Route4HiddenObjects +11:6a40 HiddenEventMaps +11:6a96 HiddenEventPointers +11:6b40 HiddenEventsFor_TRADE_CENTER +11:6b4d HiddenEventsFor_COLOSSEUM +11:6b5a HiddenEventsFor_REDS_HOUSE_2F +11:6b67 HiddenEventsFor_BLUES_HOUSE +11:6b7a HiddenEventsFor_OAKS_LAB +11:6b93 HiddenEventsFor_VIRIDIAN_POKECENTER +11:6ba0 HiddenEventsFor_VIRIDIAN_MART +11:6ba1 HiddenEventsFor_VIRIDIAN_SCHOOL_HOUSE +11:6bae HiddenEventsFor_VIRIDIAN_GYM +11:6bbb HiddenEventsFor_MUSEUM_1F +11:6bc8 HiddenEventsFor_PEWTER_GYM +11:6bd5 HiddenEventsFor_PEWTER_MART +11:6bd6 HiddenEventsFor_PEWTER_POKECENTER +11:6be3 HiddenEventsFor_CERULEAN_POKECENTER +11:6bf0 HiddenEventsFor_CERULEAN_GYM +11:6bfd HiddenEventsFor_CERULEAN_MART +11:6bfe HiddenEventsFor_LAVENDER_POKECENTER +11:6c0b HiddenEventsFor_VERMILION_POKECENTER +11:6c18 HiddenEventsFor_VERMILION_GYM +11:6c85 HiddenEventsFor_CELADON_MANSION_2F +11:6c8c HiddenEventsFor_CELADON_POKECENTER +11:6c99 HiddenEventsFor_CELADON_GYM +11:6ca6 HiddenEventsFor_GAME_CORNER +11:6dc7 HiddenEventsFor_CELADON_HOTEL +11:6dd4 HiddenEventsFor_FUCHSIA_POKECENTER +11:6de1 HiddenEventsFor_FUCHSIA_GYM +11:6dee HiddenEventsFor_CINNABAR_GYM +11:6e19 HiddenEventsFor_CINNABAR_POKECENTER +11:6e26 HiddenEventsFor_SAFFRON_GYM +11:6e2d HiddenEventsFor_MT_MOON_POKECENTER +11:6e3a HiddenEventsFor_ROCK_TUNNEL_POKECENTER +11:6e47 HiddenEventsFor_VIRIDIAN_FOREST +11:6e54 HiddenEventsFor_MT_MOON_B2F +11:6e61 HiddenEventsFor_INDIGO_PLATEAU +11:6e6e HiddenEventsFor_ROUTE_25 +11:6e7b HiddenEventsFor_ROUTE_9 +11:6e82 HiddenEventsFor_SS_ANNE_KITCHEN +11:6e95 HiddenEventsFor_SS_ANNE_B1F_ROOMS +11:6e9c HiddenEventsFor_ROUTE_10 +11:6ea9 HiddenEventsFor_ROCKET_HIDEOUT_B1F +11:6eb0 HiddenEventsFor_ROCKET_HIDEOUT_B3F +11:6eb7 HiddenEventsFor_ROCKET_HIDEOUT_B4F +11:6ebe HiddenEventsFor_SAFFRON_POKECENTER +11:6ecb HiddenEventsFor_POKEMON_TOWER_5F +11:6ed2 HiddenEventsFor_ROUTE_13 +11:6edf HiddenEventsFor_SAFARI_ZONE_GATE +11:6ee6 HiddenEventsFor_SAFARI_ZONE_WEST +11:6eed HiddenEventsFor_SILPH_CO_5F +11:6ef4 HiddenEventsFor_SILPH_CO_9F +11:6efb HiddenEventsFor_COPYCATS_HOUSE_2F +11:6f02 HiddenEventsFor_CERULEAN_CAVE_1F +11:6f09 HiddenEventsFor_CERULEAN_CAVE_B1F +11:6f10 HiddenEventsFor_POWER_PLANT +11:6f1d HiddenEventsFor_SEAFOAM_ISLANDS_B2F +11:6f24 HiddenEventsFor_SEAFOAM_ISLANDS_B4F +11:6f2b HiddenEventsFor_POKEMON_MANSION_1F +11:6f38 HiddenEventsFor_POKEMON_MANSION_2F +11:6f3f HiddenEventsFor_POKEMON_MANSION_3F +11:6f4c HiddenEventsFor_POKEMON_MANSION_B1F +11:6f5f HiddenEventsFor_ROUTE_23 +11:6f72 HiddenEventsFor_VICTORY_ROAD_2F +11:6f7f HiddenEventsFor_UNUSED_MAP_6F +11:6f86 HiddenEventsFor_BILLS_HOUSE +11:6f8d HiddenEventsFor_VIRIDIAN_CITY +11:6f94 HiddenEventsFor_SAFARI_ZONE_WEST_REST_HOUSE +11:6fa1 HiddenEventsFor_SAFARI_ZONE_EAST_REST_HOUSE +11:6fae HiddenEventsFor_SAFARI_ZONE_NORTH_REST_HOUSE +11:6fbb HiddenEventsFor_ROUTE_15_GATE_2F +11:6fc2 HiddenEventsFor_MR_FUJIS_HOUSE +11:6fd5 HiddenEventsFor_CELADON_MANSION_ROOF_HOUSE +11:6fe8 HiddenEventsFor_FIGHTING_DOJO +11:7001 HiddenEventsFor_INDIGO_PLATEAU_LOBBY +11:7008 HiddenEventsFor_CINNABAR_LAB_FOSSIL_ROOM +11:7015 HiddenEventsFor_BIKE_SHOP +11:703a HiddenEventsFor_ROUTE_11 +11:7041 HiddenEventsFor_ROUTE_12 +11:7048 HiddenEventsFor_SILPH_CO_11F +11:704f HiddenEventsFor_ROUTE_17 +11:706e HiddenEventsFor_UNDERGROUND_PATH_NORTH_SOUTH +11:707b HiddenEventsFor_UNDERGROUND_PATH_WEST_EAST +11:7088 HiddenEventsFor_CELADON_CITY +11:708f HiddenEventsFor_SEAFOAM_ISLANDS_B3F +11:7096 HiddenEventsFor_VERMILION_CITY +11:709d HiddenEventsFor_CERULEAN_CITY +11:70a4 HiddenEventsFor_ROUTE_4 12:4000 Route7_h 12:4022 Route7_Object 12:4051 Route7_Blocks @@ -9082,7 +9082,7 @@ 13:7ec7 LearnMoveFromLevelUpPredef 13:7eca LearnMovePredef 13:7ecd GetQuantityOfItemInBagPredef -13:7ed0 CheckForHiddenObjectOrBookshelfOrCardKeyDoorPredef +13:7ed0 CheckForHiddenEventOrBookshelfOrCardKeyDoorPredef 13:7ed3 GiveItemPredef 13:7ed6 ChangeBGPalColor0_4FramesPredef 13:7ed9 FindPathToPlayerPredef @@ -18422,7 +18422,7 @@ 00:ccf7 wPlayerMonMinimized 00:cd05 wEnemyBideAccumulatedDamage 00:cd05 wEnemyNumHits -00:cd05 wLuckySlotHiddenObjectIndex +00:cd05 wLuckySlotHiddenEventIndex 00:cd0f wInGameTradeGiveMonSpecies 00:cd0f wMiscBattleDataEnd 00:cd0f wPlayerMonUnmodifiedLevel @@ -18483,7 +18483,7 @@ 00:cd3d wFallingObjectsMovementData 00:cd3d wFieldMoves 00:cd3d wFlyAnimUsingCoordList -00:cd3d wHiddenObjectFunctionArgument +00:cd3d wHiddenEventFunctionArgument 00:cd3d wHoFMonSpecies 00:cd3d wHoFTeamIndex 00:cd3d wInwardSpiralUpdateScreenCounter @@ -18518,7 +18518,7 @@ 00:cd3e wFlyAnimCounter 00:cd3e wFlyLocationsList 00:cd3e wHUDPokeballGfxOffsetX -00:cd3e wHiddenObjectFunctionRomBank +00:cd3e wHiddenEventFunctionRomBank 00:cd3e wHoFPartyMonIndex 00:cd3e wNumCreditsMonsDisplayed 00:cd3e wOptionsBattleAnimCursorX @@ -18536,7 +18536,7 @@ 00:cd3f wFlyAnimBirdSpriteImageIndex 00:cd3f wHUDGraphicsTiles 00:cd3f wHUDUnusedTopTile -00:cd3f wHiddenObjectIndex +00:cd3f wHiddenEventIndex 00:cd3f wHoFMonLevel 00:cd3f wJigglypuffFacingDirections 00:cd3f wNameOfPlayerMonToBeTraded @@ -18547,7 +18547,7 @@ 00:cd3f wTrainerFacingDirection 00:cd3f wTrainerInfoTextBoxNextRowOffset 00:cd40 wHUDCornerTile -00:cd40 wHiddenObjectY +00:cd40 wHiddenEventY 00:cd40 wHoFMonOrPlayer 00:cd40 wOptionsCancelCursorX 00:cd40 wPlayerSpinInPlaceAnimSoundID @@ -18555,8 +18555,8 @@ 00:cd40 wTrainerScreenY 00:cd41 wDayCarePerLevelCost 00:cd41 wHUDTriangleTile +00:cd41 wHiddenEventX 00:cd41 wHiddenItemOrCoinsIndex -00:cd41 wHiddenObjectX 00:cd41 wHoFTeamIndex2 00:cd41 wNumFieldMoves 00:cd41 wSlotMachineWheel1BottomTile @@ -20204,7 +20204,7 @@ 00:ffec hSavedMapTextPtr 00:ffec hSpriteScreenXCoord 00:ffed hSpriteMapYCoord -00:ffee hDidntFindAnyHiddenObject +00:ffee hDidntFindAnyHiddenEvent 00:ffee hSpriteMapXCoord 00:fff3 hWhoseTurn 00:fff4 hClearLetterPrintingDelayFlags diff --git a/pokeblue_debug.map b/pokeblue_debug.map index 6886277a5..b653a4cab 100644 --- a/pokeblue_debug.map +++ b/pokeblue_debug.map @@ -1062,11 +1062,11 @@ ROM0 bank #0: $3ea1 = Predef.done $3ea8 = GetPredefRegisters $3ec1 = UpdateCinnabarGymGateTileBlocks - $3ec9 = CheckForHiddenObjectOrBookshelfOrCardKeyDoor - $3eee = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.returnAddress - $3ef1 = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.hiddenObjectNotFound - $3efe = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.nothingFound - $3f00 = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.done + $3ec9 = CheckForHiddenEventOrBookshelfOrCardKeyDoor + $3eee = CheckForHiddenEventOrBookshelfOrCardKeyDoor.returnAddress + $3ef1 = CheckForHiddenEventOrBookshelfOrCardKeyDoor.hiddenEventNotFound + $3efe = CheckForHiddenEventOrBookshelfOrCardKeyDoor.nothingFound + $3f00 = CheckForHiddenEventOrBookshelfOrCardKeyDoor.done $3f09 = PrintPredefTextID $3f19 = RestoreMapTextPointer $3f23 = SetMapTextPointer @@ -4911,7 +4911,7 @@ ROMX bank #7: $68da = BillsHouseBillCheckOutMyRarePokemonText.Text $68df = BillsHouse_Object $6905 = BillsHouse_Blocks - SECTION: $6915-$6cc5 ($03b1 bytes) ["Hidden Objects 1"] + SECTION: $6915-$6cc5 ($03b1 bytes) ["Hidden Events 1"] $6915 = OpenOaksPC $6932 = OpenOaksPC.closePC $693b = GetDexRatedText @@ -8396,14 +8396,14 @@ ROMX bank #17: $68b7 = SeafoamIslandsB4FDangerSignText $68bc = SeafoamIslandsB4F_Object $68fa = SeafoamIslandsB4F_Blocks - SECTION: $6981-$70aa ($072a bytes) ["Hidden Objects Core"] + SECTION: $6981-$70aa ($072a bytes) ["Hidden Events Core"] $6981 = IsPlayerOnDungeonWarp - $69a0 = CheckForHiddenObject - $69ae = CheckForHiddenObject.hiddenMapLoop - $69be = CheckForHiddenObject.foundMatchingMap - $69ce = CheckForHiddenObject.hiddenObjectLoop - $69f0 = CheckForHiddenObject.foundMatchingObject - $69fc = CheckForHiddenObject.noMatch + $69a0 = CheckForHiddenEvent + $69ae = CheckForHiddenEvent.hiddenMapLoop + $69be = CheckForHiddenEvent.foundMatchingMap + $69ce = CheckForHiddenEvent.hiddenEventLoop + $69f0 = CheckForHiddenEvent.foundMatchingEvent + $69fc = CheckForHiddenEvent.noMatch $6a01 = CheckIfCoordsInFrontOfPlayerMatch $6a16 = CheckIfCoordsInFrontOfPlayerMatch.facingUp $6a1a = CheckIfCoordsInFrontOfPlayerMatch.upDownCommon @@ -8413,93 +8413,93 @@ ROMX bank #17: $6a38 = CheckIfCoordsInFrontOfPlayerMatch.matched $6a3b = CheckIfCoordsInFrontOfPlayerMatch.didNotMatch $6a3d = CheckIfCoordsInFrontOfPlayerMatch.done - $6a40 = HiddenObjectMaps - $6a96 = HiddenObjectPointers - $6b40 = TradeCenterHiddenObjects - $6b4d = ColosseumHiddenObjects - $6b5a = RedsHouse2FHiddenObjects - $6b67 = BluesHouseHiddenObjects - $6b7a = OaksLabHiddenObjects - $6b93 = ViridianPokecenterHiddenObjects - $6ba0 = ViridianMartHiddenObjects - $6ba1 = ViridianSchoolHiddenObjects - $6bae = ViridianGymHiddenObjects - $6bbb = Museum1FHiddenObjects - $6bc8 = PewterGymHiddenObjects - $6bd5 = PewterMartHiddenObjects - $6bd6 = PewterPokecenterHiddenObjects - $6be3 = CeruleanPokecenterHiddenObjects - $6bf0 = CeruleanGymHiddenObjects - $6bfd = CeruleanMartHiddenObjects - $6bfe = LavenderPokecenterHiddenObjects - $6c0b = VermilionPokecenterHiddenObjects - $6c18 = VermilionGymHiddenObjects - $6c85 = CeladonMansion2HiddenObjects - $6c8c = CeladonPokecenterHiddenObjects - $6c99 = CeladonGymHiddenObjects - $6ca6 = GameCornerHiddenObjects - $6dc7 = CeladonHotelHiddenObjects - $6dd4 = FuchsiaPokecenterHiddenObjects - $6de1 = FuchsiaGymHiddenObjects - $6dee = CinnabarGymHiddenObjects - $6e19 = CinnabarPokecenterHiddenObjects - $6e26 = SaffronGymHiddenObjects - $6e2d = MtMoonPokecenterHiddenObjects - $6e3a = RockTunnelPokecenterHiddenObjects - $6e47 = ViridianForestHiddenObjects - $6e54 = MtMoon3HiddenObjects - $6e61 = IndigoPlateauHiddenObjects - $6e6e = Route25HiddenObjects - $6e7b = Route9HiddenObjects - $6e82 = SSAnne6HiddenObjects - $6e95 = SSAnne10HiddenObjects - $6e9c = Route10HiddenObjects - $6ea9 = RocketHideout1HiddenObjects - $6eb0 = RocketHideout3HiddenObjects - $6eb7 = RocketHideout4HiddenObjects - $6ebe = SaffronPokecenterHiddenObjects - $6ecb = PokemonTower5HiddenObjects - $6ed2 = Route13HiddenObjects - $6edf = SafariZoneEntranceHiddenObjects - $6ee6 = SafariZoneWestHiddenObjects - $6eed = SilphCo5FHiddenObjects - $6ef4 = SilphCo9FHiddenObjects - $6efb = CopycatsHouse2FHiddenObjects - $6f02 = CeruleanCave1HiddenObjects - $6f09 = CeruleanCave3HiddenObjects - $6f10 = PowerPlantHiddenObjects - $6f1d = SeafoamIslands3HiddenObjects - $6f24 = SeafoamIslands5HiddenObjects - $6f2b = Mansion1HiddenObjects - $6f38 = Mansion2HiddenObjects - $6f3f = Mansion3HiddenObjects - $6f4c = Mansion4HiddenObjects - $6f5f = Route23HiddenObjects - $6f72 = VictoryRoad2HiddenObjects - $6f7f = Unused6FHiddenObjects - $6f86 = BillsHouseHiddenObjects - $6f8d = ViridianCityHiddenObjects - $6f94 = SafariZoneRestHouse2HiddenObjects - $6fa1 = SafariZoneRestHouse3HiddenObjects - $6fae = SafariZoneRestHouse4HiddenObjects - $6fbb = Route15GateUpstairsHiddenObjects - $6fc2 = LavenderHouse1HiddenObjects - $6fd5 = CeladonMansion5HiddenObjects - $6fe8 = FightingDojoHiddenObjects - $7001 = IndigoPlateauLobbyHiddenObjects - $7008 = CinnabarLab4HiddenObjects - $7015 = BikeShopHiddenObjects - $703a = Route11HiddenObjects - $7041 = Route12HiddenObjects - $7048 = SilphCo11FHiddenObjects - $704f = Route17HiddenObjects - $706e = UndergroundPathNsHiddenObjects - $707b = UndergroundPathWeHiddenObjects - $7088 = CeladonCityHiddenObjects - $708f = SeafoamIslands4HiddenObjects - $7096 = VermilionCityHiddenObjects - $709d = CeruleanCityHiddenObjects - $70a4 = Route4HiddenObjects + $6a40 = HiddenEventMaps + $6a96 = HiddenEventPointers + $6b40 = HiddenEventsFor_TRADE_CENTER + $6b4d = HiddenEventsFor_COLOSSEUM + $6b5a = HiddenEventsFor_REDS_HOUSE_2F + $6b67 = HiddenEventsFor_BLUES_HOUSE + $6b7a = HiddenEventsFor_OAKS_LAB + $6b93 = HiddenEventsFor_VIRIDIAN_POKECENTER + $6ba0 = HiddenEventsFor_VIRIDIAN_MART + $6ba1 = HiddenEventsFor_VIRIDIAN_SCHOOL_HOUSE + $6bae = HiddenEventsFor_VIRIDIAN_GYM + $6bbb = HiddenEventsFor_MUSEUM_1F + $6bc8 = HiddenEventsFor_PEWTER_GYM + $6bd5 = HiddenEventsFor_PEWTER_MART + $6bd6 = HiddenEventsFor_PEWTER_POKECENTER + $6be3 = HiddenEventsFor_CERULEAN_POKECENTER + $6bf0 = HiddenEventsFor_CERULEAN_GYM + $6bfd = HiddenEventsFor_CERULEAN_MART + $6bfe = HiddenEventsFor_LAVENDER_POKECENTER + $6c0b = HiddenEventsFor_VERMILION_POKECENTER + $6c18 = HiddenEventsFor_VERMILION_GYM + $6c85 = HiddenEventsFor_CELADON_MANSION_2F + $6c8c = HiddenEventsFor_CELADON_POKECENTER + $6c99 = HiddenEventsFor_CELADON_GYM + $6ca6 = HiddenEventsFor_GAME_CORNER + $6dc7 = HiddenEventsFor_CELADON_HOTEL + $6dd4 = HiddenEventsFor_FUCHSIA_POKECENTER + $6de1 = HiddenEventsFor_FUCHSIA_GYM + $6dee = HiddenEventsFor_CINNABAR_GYM + $6e19 = HiddenEventsFor_CINNABAR_POKECENTER + $6e26 = HiddenEventsFor_SAFFRON_GYM + $6e2d = HiddenEventsFor_MT_MOON_POKECENTER + $6e3a = HiddenEventsFor_ROCK_TUNNEL_POKECENTER + $6e47 = HiddenEventsFor_VIRIDIAN_FOREST + $6e54 = HiddenEventsFor_MT_MOON_B2F + $6e61 = HiddenEventsFor_INDIGO_PLATEAU + $6e6e = HiddenEventsFor_ROUTE_25 + $6e7b = HiddenEventsFor_ROUTE_9 + $6e82 = HiddenEventsFor_SS_ANNE_KITCHEN + $6e95 = HiddenEventsFor_SS_ANNE_B1F_ROOMS + $6e9c = HiddenEventsFor_ROUTE_10 + $6ea9 = HiddenEventsFor_ROCKET_HIDEOUT_B1F + $6eb0 = HiddenEventsFor_ROCKET_HIDEOUT_B3F + $6eb7 = HiddenEventsFor_ROCKET_HIDEOUT_B4F + $6ebe = HiddenEventsFor_SAFFRON_POKECENTER + $6ecb = HiddenEventsFor_POKEMON_TOWER_5F + $6ed2 = HiddenEventsFor_ROUTE_13 + $6edf = HiddenEventsFor_SAFARI_ZONE_GATE + $6ee6 = HiddenEventsFor_SAFARI_ZONE_WEST + $6eed = HiddenEventsFor_SILPH_CO_5F + $6ef4 = HiddenEventsFor_SILPH_CO_9F + $6efb = HiddenEventsFor_COPYCATS_HOUSE_2F + $6f02 = HiddenEventsFor_CERULEAN_CAVE_1F + $6f09 = HiddenEventsFor_CERULEAN_CAVE_B1F + $6f10 = HiddenEventsFor_POWER_PLANT + $6f1d = HiddenEventsFor_SEAFOAM_ISLANDS_B2F + $6f24 = HiddenEventsFor_SEAFOAM_ISLANDS_B4F + $6f2b = HiddenEventsFor_POKEMON_MANSION_1F + $6f38 = HiddenEventsFor_POKEMON_MANSION_2F + $6f3f = HiddenEventsFor_POKEMON_MANSION_3F + $6f4c = HiddenEventsFor_POKEMON_MANSION_B1F + $6f5f = HiddenEventsFor_ROUTE_23 + $6f72 = HiddenEventsFor_VICTORY_ROAD_2F + $6f7f = HiddenEventsFor_UNUSED_MAP_6F + $6f86 = HiddenEventsFor_BILLS_HOUSE + $6f8d = HiddenEventsFor_VIRIDIAN_CITY + $6f94 = HiddenEventsFor_SAFARI_ZONE_WEST_REST_HOUSE + $6fa1 = HiddenEventsFor_SAFARI_ZONE_EAST_REST_HOUSE + $6fae = HiddenEventsFor_SAFARI_ZONE_NORTH_REST_HOUSE + $6fbb = HiddenEventsFor_ROUTE_15_GATE_2F + $6fc2 = HiddenEventsFor_MR_FUJIS_HOUSE + $6fd5 = HiddenEventsFor_CELADON_MANSION_ROOF_HOUSE + $6fe8 = HiddenEventsFor_FIGHTING_DOJO + $7001 = HiddenEventsFor_INDIGO_PLATEAU_LOBBY + $7008 = HiddenEventsFor_CINNABAR_LAB_FOSSIL_ROOM + $7015 = HiddenEventsFor_BIKE_SHOP + $703a = HiddenEventsFor_ROUTE_11 + $7041 = HiddenEventsFor_ROUTE_12 + $7048 = HiddenEventsFor_SILPH_CO_11F + $704f = HiddenEventsFor_ROUTE_17 + $706e = HiddenEventsFor_UNDERGROUND_PATH_NORTH_SOUTH + $707b = HiddenEventsFor_UNDERGROUND_PATH_WEST_EAST + $7088 = HiddenEventsFor_CELADON_CITY + $708f = HiddenEventsFor_SEAFOAM_ISLANDS_B3F + $7096 = HiddenEventsFor_VERMILION_CITY + $709d = HiddenEventsFor_CERULEAN_CITY + $70a4 = HiddenEventsFor_ROUTE_4 EMPTY: $70ab-$7fff ($0f55 bytes) TOTAL EMPTY: $0f55 bytes @@ -9243,7 +9243,7 @@ ROMX bank #19: $7ec7 = LearnMoveFromLevelUpPredef $7eca = LearnMovePredef $7ecd = GetQuantityOfItemInBagPredef - $7ed0 = CheckForHiddenObjectOrBookshelfOrCardKeyDoorPredef + $7ed0 = CheckForHiddenEventOrBookshelfOrCardKeyDoorPredef $7ed3 = GiveItemPredef $7ed6 = ChangeBGPalColor0_4FramesPredef $7ed9 = FindPathToPlayerPredef @@ -9833,7 +9833,7 @@ ROMX bank #20: $662a = ParalyzeEffect_.hitTest $6659 = ParalyzeEffect_.didntAffect $6666 = ParalyzeEffect_.doesntAffect - SECTION: $6673-$6a41 ($03cf bytes) ["Hidden Objects 2"] + SECTION: $6673-$6a41 ($03cf bytes) ["Hidden Events 2"] $6673 = PrintCardKeyText $667a = PrintCardKeyText.silphCoMapListLoop $669c = PrintCardKeyText.cardKeyDoorInFrontOfPlayer @@ -11647,7 +11647,7 @@ ROMX bank #23: $5ab3 = VictoryRoad1FCooltrainerMAfterBattleText $5ab8 = VictoryRoad1F_Object $5b04 = VictoryRoad1F_Blocks - SECTION: $5b5e-$5f14 ($03b7 bytes) ["Hidden Objects 3"] + SECTION: $5b5e-$5f14 ($03b7 bytes) ["Hidden Events 3"] $5b5e = SetPartyMonTypes $5b79 = PrintRedSNESText $5b81 = RedBedroomSNESText @@ -12229,7 +12229,7 @@ ROMX bank #24: $637f = SilphCo10FPorygonText.Text $6384 = SilphCo11F_Object $63cc = SilphCo11F_Blocks - SECTION: $641d-$652d ($0111 bytes) ["Hidden Objects 4"] + SECTION: $641d-$652d ($0111 bytes) ["Hidden Events 4"] $641d = GymStatues $642d = GymStatues.loop $6437 = GymStatues.match @@ -18765,7 +18765,7 @@ WRAM0 bank #0: $ccf6 = wLowHealthAlarmDisabled $ccf7 = wPlayerMonMinimized $cd05 = wEnemyNumHits - $cd05 = wLuckySlotHiddenObjectIndex + $cd05 = wLuckySlotHiddenEventIndex $cd05 = wEnemyBideAccumulatedDamage $cd0f = wVermilionDockTileMapBufferEnd $cd0f = wInGameTradeGiveMonSpecies @@ -18825,6 +18825,7 @@ WRAM0 bank #0: $cd3d = wOptionsTextSpeedCursorX $cd3d = wTrainerInfoTextBoxWidthPlus1 $cd3d = wPlayerSpinInPlaceAnimFrameDelay + $cd3d = wHiddenEventFunctionArgument $cd3d = wCanPlaySlots $cd3d = wWhichTownMapLocation $cd3d = wFlyAnimUsingCoordList @@ -18846,7 +18847,6 @@ WRAM0 bank #0: $cd3d = wDayCareStartLevel $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel - $cd3d = wHiddenObjectFunctionArgument $cd3d = wFieldMoves $cd3d = wHoFTeamIndex $cd3d = wCoordIndex @@ -18860,7 +18860,7 @@ WRAM0 bank #0: $cd3e = wTrainerEngageDistance $cd3e = wPlayerSpinWhileMovingUpOrDownAnimMaxY $cd3e = wPlayerSpinInPlaceAnimFrameDelayDelta - $cd3e = wHiddenObjectFunctionRomBank + $cd3e = wHiddenEventFunctionRomBank $cd3e = wSlotMachineWheel1Offset $cd3e = wDayCareNumLevelsGrown $cd3e = wHUDPokeballGfxOffsetX @@ -18880,22 +18880,22 @@ WRAM0 bank #0: $cd3f = wTrainerFacingDirection $cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay $cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue + $cd3f = wHiddenEventIndex $cd3f = wSlotMachineWheel2Offset $cd3f = wHUDUnusedTopTile $cd3f = wFlyAnimBirdSpriteImageIndex $cd3f = wHoFMonLevel $cd3f = wDayCareTotalCost $cd3f = wTrainerInfoTextBoxNextRowOffset - $cd3f = wHiddenObjectIndex $cd3f = wNameOfPlayerMonToBeTraded $cd3f = wOptionsBattleStyleCursorX $cd3f = wHUDGraphicsTiles $cd40 = wOptionsCancelCursorX $cd40 = wTrainerScreenY + $cd40 = wHiddenEventY $cd40 = wSlotMachineWheel3Offset $cd40 = wHUDCornerTile $cd40 = wPlayerSpinInPlaceAnimSoundID - $cd40 = wHiddenObjectY $cd40 = wHoFMonOrPlayer $cd41 = wSlotMachineWheel1BottomTile $cd41 = wSlotMachineWinningSymbol @@ -18904,7 +18904,7 @@ WRAM0 bank #0: $cd41 = wNumFieldMoves $cd41 = wDayCarePerLevelCost $cd41 = wTradedPlayerMonOT - $cd41 = wHiddenObjectX + $cd41 = wHiddenEventX $cd41 = wTrainerScreenX $cd41 = wHiddenItemOrCoinsIndex $cd42 = wSlotMachineWheel1MiddleTile @@ -20559,7 +20559,7 @@ HRAM bank #0: $ffec = hSpriteScreenXCoord $ffed = hSpriteMapYCoord $ffee = hSpriteMapXCoord - $ffee = hDidntFindAnyHiddenObject + $ffee = hDidntFindAnyHiddenEvent $fff3 = hWhoseTurn $fff4 = hClearLetterPrintingDelayFlags $fff6 = hUILayoutFlags diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym index bf60c38cc..b48f73fa6 100644 --- a/pokeblue_debug.sym +++ b/pokeblue_debug.sym @@ -1037,11 +1037,11 @@ 00:3ea1 Predef.done 00:3ea8 GetPredefRegisters 00:3ec1 UpdateCinnabarGymGateTileBlocks -00:3ec9 CheckForHiddenObjectOrBookshelfOrCardKeyDoor -00:3eee CheckForHiddenObjectOrBookshelfOrCardKeyDoor.returnAddress -00:3ef1 CheckForHiddenObjectOrBookshelfOrCardKeyDoor.hiddenObjectNotFound -00:3efe CheckForHiddenObjectOrBookshelfOrCardKeyDoor.nothingFound -00:3f00 CheckForHiddenObjectOrBookshelfOrCardKeyDoor.done +00:3ec9 CheckForHiddenEventOrBookshelfOrCardKeyDoor +00:3eee CheckForHiddenEventOrBookshelfOrCardKeyDoor.returnAddress +00:3ef1 CheckForHiddenEventOrBookshelfOrCardKeyDoor.hiddenEventNotFound +00:3efe CheckForHiddenEventOrBookshelfOrCardKeyDoor.nothingFound +00:3f00 CheckForHiddenEventOrBookshelfOrCardKeyDoor.done 00:3f09 PrintPredefTextID 00:3f19 RestoreMapTextPointer 00:3f23 SetMapTextPointer @@ -8261,12 +8261,12 @@ 11:68bc SeafoamIslandsB4F_Object 11:68fa SeafoamIslandsB4F_Blocks 11:6981 IsPlayerOnDungeonWarp -11:69a0 CheckForHiddenObject -11:69ae CheckForHiddenObject.hiddenMapLoop -11:69be CheckForHiddenObject.foundMatchingMap -11:69ce CheckForHiddenObject.hiddenObjectLoop -11:69f0 CheckForHiddenObject.foundMatchingObject -11:69fc CheckForHiddenObject.noMatch +11:69a0 CheckForHiddenEvent +11:69ae CheckForHiddenEvent.hiddenMapLoop +11:69be CheckForHiddenEvent.foundMatchingMap +11:69ce CheckForHiddenEvent.hiddenEventLoop +11:69f0 CheckForHiddenEvent.foundMatchingEvent +11:69fc CheckForHiddenEvent.noMatch 11:6a01 CheckIfCoordsInFrontOfPlayerMatch 11:6a16 CheckIfCoordsInFrontOfPlayerMatch.facingUp 11:6a1a CheckIfCoordsInFrontOfPlayerMatch.upDownCommon @@ -8276,93 +8276,93 @@ 11:6a38 CheckIfCoordsInFrontOfPlayerMatch.matched 11:6a3b CheckIfCoordsInFrontOfPlayerMatch.didNotMatch 11:6a3d CheckIfCoordsInFrontOfPlayerMatch.done -11:6a40 HiddenObjectMaps -11:6a96 HiddenObjectPointers -11:6b40 TradeCenterHiddenObjects -11:6b4d ColosseumHiddenObjects -11:6b5a RedsHouse2FHiddenObjects -11:6b67 BluesHouseHiddenObjects -11:6b7a OaksLabHiddenObjects -11:6b93 ViridianPokecenterHiddenObjects -11:6ba0 ViridianMartHiddenObjects -11:6ba1 ViridianSchoolHiddenObjects -11:6bae ViridianGymHiddenObjects -11:6bbb Museum1FHiddenObjects -11:6bc8 PewterGymHiddenObjects -11:6bd5 PewterMartHiddenObjects -11:6bd6 PewterPokecenterHiddenObjects -11:6be3 CeruleanPokecenterHiddenObjects -11:6bf0 CeruleanGymHiddenObjects -11:6bfd CeruleanMartHiddenObjects -11:6bfe LavenderPokecenterHiddenObjects -11:6c0b VermilionPokecenterHiddenObjects -11:6c18 VermilionGymHiddenObjects -11:6c85 CeladonMansion2HiddenObjects -11:6c8c CeladonPokecenterHiddenObjects -11:6c99 CeladonGymHiddenObjects -11:6ca6 GameCornerHiddenObjects -11:6dc7 CeladonHotelHiddenObjects -11:6dd4 FuchsiaPokecenterHiddenObjects -11:6de1 FuchsiaGymHiddenObjects -11:6dee CinnabarGymHiddenObjects -11:6e19 CinnabarPokecenterHiddenObjects -11:6e26 SaffronGymHiddenObjects -11:6e2d MtMoonPokecenterHiddenObjects -11:6e3a RockTunnelPokecenterHiddenObjects -11:6e47 ViridianForestHiddenObjects -11:6e54 MtMoon3HiddenObjects -11:6e61 IndigoPlateauHiddenObjects -11:6e6e Route25HiddenObjects -11:6e7b Route9HiddenObjects -11:6e82 SSAnne6HiddenObjects -11:6e95 SSAnne10HiddenObjects -11:6e9c Route10HiddenObjects -11:6ea9 RocketHideout1HiddenObjects -11:6eb0 RocketHideout3HiddenObjects -11:6eb7 RocketHideout4HiddenObjects -11:6ebe SaffronPokecenterHiddenObjects -11:6ecb PokemonTower5HiddenObjects -11:6ed2 Route13HiddenObjects -11:6edf SafariZoneEntranceHiddenObjects -11:6ee6 SafariZoneWestHiddenObjects -11:6eed SilphCo5FHiddenObjects -11:6ef4 SilphCo9FHiddenObjects -11:6efb CopycatsHouse2FHiddenObjects -11:6f02 CeruleanCave1HiddenObjects -11:6f09 CeruleanCave3HiddenObjects -11:6f10 PowerPlantHiddenObjects -11:6f1d SeafoamIslands3HiddenObjects -11:6f24 SeafoamIslands5HiddenObjects -11:6f2b Mansion1HiddenObjects -11:6f38 Mansion2HiddenObjects -11:6f3f Mansion3HiddenObjects -11:6f4c Mansion4HiddenObjects -11:6f5f Route23HiddenObjects -11:6f72 VictoryRoad2HiddenObjects -11:6f7f Unused6FHiddenObjects -11:6f86 BillsHouseHiddenObjects -11:6f8d ViridianCityHiddenObjects -11:6f94 SafariZoneRestHouse2HiddenObjects -11:6fa1 SafariZoneRestHouse3HiddenObjects -11:6fae SafariZoneRestHouse4HiddenObjects -11:6fbb Route15GateUpstairsHiddenObjects -11:6fc2 LavenderHouse1HiddenObjects -11:6fd5 CeladonMansion5HiddenObjects -11:6fe8 FightingDojoHiddenObjects -11:7001 IndigoPlateauLobbyHiddenObjects -11:7008 CinnabarLab4HiddenObjects -11:7015 BikeShopHiddenObjects -11:703a Route11HiddenObjects -11:7041 Route12HiddenObjects -11:7048 SilphCo11FHiddenObjects -11:704f Route17HiddenObjects -11:706e UndergroundPathNsHiddenObjects -11:707b UndergroundPathWeHiddenObjects -11:7088 CeladonCityHiddenObjects -11:708f SeafoamIslands4HiddenObjects -11:7096 VermilionCityHiddenObjects -11:709d CeruleanCityHiddenObjects -11:70a4 Route4HiddenObjects +11:6a40 HiddenEventMaps +11:6a96 HiddenEventPointers +11:6b40 HiddenEventsFor_TRADE_CENTER +11:6b4d HiddenEventsFor_COLOSSEUM +11:6b5a HiddenEventsFor_REDS_HOUSE_2F +11:6b67 HiddenEventsFor_BLUES_HOUSE +11:6b7a HiddenEventsFor_OAKS_LAB +11:6b93 HiddenEventsFor_VIRIDIAN_POKECENTER +11:6ba0 HiddenEventsFor_VIRIDIAN_MART +11:6ba1 HiddenEventsFor_VIRIDIAN_SCHOOL_HOUSE +11:6bae HiddenEventsFor_VIRIDIAN_GYM +11:6bbb HiddenEventsFor_MUSEUM_1F +11:6bc8 HiddenEventsFor_PEWTER_GYM +11:6bd5 HiddenEventsFor_PEWTER_MART +11:6bd6 HiddenEventsFor_PEWTER_POKECENTER +11:6be3 HiddenEventsFor_CERULEAN_POKECENTER +11:6bf0 HiddenEventsFor_CERULEAN_GYM +11:6bfd HiddenEventsFor_CERULEAN_MART +11:6bfe HiddenEventsFor_LAVENDER_POKECENTER +11:6c0b HiddenEventsFor_VERMILION_POKECENTER +11:6c18 HiddenEventsFor_VERMILION_GYM +11:6c85 HiddenEventsFor_CELADON_MANSION_2F +11:6c8c HiddenEventsFor_CELADON_POKECENTER +11:6c99 HiddenEventsFor_CELADON_GYM +11:6ca6 HiddenEventsFor_GAME_CORNER +11:6dc7 HiddenEventsFor_CELADON_HOTEL +11:6dd4 HiddenEventsFor_FUCHSIA_POKECENTER +11:6de1 HiddenEventsFor_FUCHSIA_GYM +11:6dee HiddenEventsFor_CINNABAR_GYM +11:6e19 HiddenEventsFor_CINNABAR_POKECENTER +11:6e26 HiddenEventsFor_SAFFRON_GYM +11:6e2d HiddenEventsFor_MT_MOON_POKECENTER +11:6e3a HiddenEventsFor_ROCK_TUNNEL_POKECENTER +11:6e47 HiddenEventsFor_VIRIDIAN_FOREST +11:6e54 HiddenEventsFor_MT_MOON_B2F +11:6e61 HiddenEventsFor_INDIGO_PLATEAU +11:6e6e HiddenEventsFor_ROUTE_25 +11:6e7b HiddenEventsFor_ROUTE_9 +11:6e82 HiddenEventsFor_SS_ANNE_KITCHEN +11:6e95 HiddenEventsFor_SS_ANNE_B1F_ROOMS +11:6e9c HiddenEventsFor_ROUTE_10 +11:6ea9 HiddenEventsFor_ROCKET_HIDEOUT_B1F +11:6eb0 HiddenEventsFor_ROCKET_HIDEOUT_B3F +11:6eb7 HiddenEventsFor_ROCKET_HIDEOUT_B4F +11:6ebe HiddenEventsFor_SAFFRON_POKECENTER +11:6ecb HiddenEventsFor_POKEMON_TOWER_5F +11:6ed2 HiddenEventsFor_ROUTE_13 +11:6edf HiddenEventsFor_SAFARI_ZONE_GATE +11:6ee6 HiddenEventsFor_SAFARI_ZONE_WEST +11:6eed HiddenEventsFor_SILPH_CO_5F +11:6ef4 HiddenEventsFor_SILPH_CO_9F +11:6efb HiddenEventsFor_COPYCATS_HOUSE_2F +11:6f02 HiddenEventsFor_CERULEAN_CAVE_1F +11:6f09 HiddenEventsFor_CERULEAN_CAVE_B1F +11:6f10 HiddenEventsFor_POWER_PLANT +11:6f1d HiddenEventsFor_SEAFOAM_ISLANDS_B2F +11:6f24 HiddenEventsFor_SEAFOAM_ISLANDS_B4F +11:6f2b HiddenEventsFor_POKEMON_MANSION_1F +11:6f38 HiddenEventsFor_POKEMON_MANSION_2F +11:6f3f HiddenEventsFor_POKEMON_MANSION_3F +11:6f4c HiddenEventsFor_POKEMON_MANSION_B1F +11:6f5f HiddenEventsFor_ROUTE_23 +11:6f72 HiddenEventsFor_VICTORY_ROAD_2F +11:6f7f HiddenEventsFor_UNUSED_MAP_6F +11:6f86 HiddenEventsFor_BILLS_HOUSE +11:6f8d HiddenEventsFor_VIRIDIAN_CITY +11:6f94 HiddenEventsFor_SAFARI_ZONE_WEST_REST_HOUSE +11:6fa1 HiddenEventsFor_SAFARI_ZONE_EAST_REST_HOUSE +11:6fae HiddenEventsFor_SAFARI_ZONE_NORTH_REST_HOUSE +11:6fbb HiddenEventsFor_ROUTE_15_GATE_2F +11:6fc2 HiddenEventsFor_MR_FUJIS_HOUSE +11:6fd5 HiddenEventsFor_CELADON_MANSION_ROOF_HOUSE +11:6fe8 HiddenEventsFor_FIGHTING_DOJO +11:7001 HiddenEventsFor_INDIGO_PLATEAU_LOBBY +11:7008 HiddenEventsFor_CINNABAR_LAB_FOSSIL_ROOM +11:7015 HiddenEventsFor_BIKE_SHOP +11:703a HiddenEventsFor_ROUTE_11 +11:7041 HiddenEventsFor_ROUTE_12 +11:7048 HiddenEventsFor_SILPH_CO_11F +11:704f HiddenEventsFor_ROUTE_17 +11:706e HiddenEventsFor_UNDERGROUND_PATH_NORTH_SOUTH +11:707b HiddenEventsFor_UNDERGROUND_PATH_WEST_EAST +11:7088 HiddenEventsFor_CELADON_CITY +11:708f HiddenEventsFor_SEAFOAM_ISLANDS_B3F +11:7096 HiddenEventsFor_VERMILION_CITY +11:709d HiddenEventsFor_CERULEAN_CITY +11:70a4 HiddenEventsFor_ROUTE_4 12:4000 Route7_h 12:4022 Route7_Object 12:4051 Route7_Blocks @@ -9092,7 +9092,7 @@ 13:7ec7 LearnMoveFromLevelUpPredef 13:7eca LearnMovePredef 13:7ecd GetQuantityOfItemInBagPredef -13:7ed0 CheckForHiddenObjectOrBookshelfOrCardKeyDoorPredef +13:7ed0 CheckForHiddenEventOrBookshelfOrCardKeyDoorPredef 13:7ed3 GiveItemPredef 13:7ed6 ChangeBGPalColor0_4FramesPredef 13:7ed9 FindPathToPlayerPredef @@ -18432,7 +18432,7 @@ 00:ccf7 wPlayerMonMinimized 00:cd05 wEnemyBideAccumulatedDamage 00:cd05 wEnemyNumHits -00:cd05 wLuckySlotHiddenObjectIndex +00:cd05 wLuckySlotHiddenEventIndex 00:cd0f wInGameTradeGiveMonSpecies 00:cd0f wMiscBattleDataEnd 00:cd0f wPlayerMonUnmodifiedLevel @@ -18493,7 +18493,7 @@ 00:cd3d wFallingObjectsMovementData 00:cd3d wFieldMoves 00:cd3d wFlyAnimUsingCoordList -00:cd3d wHiddenObjectFunctionArgument +00:cd3d wHiddenEventFunctionArgument 00:cd3d wHoFMonSpecies 00:cd3d wHoFTeamIndex 00:cd3d wInwardSpiralUpdateScreenCounter @@ -18528,7 +18528,7 @@ 00:cd3e wFlyAnimCounter 00:cd3e wFlyLocationsList 00:cd3e wHUDPokeballGfxOffsetX -00:cd3e wHiddenObjectFunctionRomBank +00:cd3e wHiddenEventFunctionRomBank 00:cd3e wHoFPartyMonIndex 00:cd3e wNumCreditsMonsDisplayed 00:cd3e wOptionsBattleAnimCursorX @@ -18546,7 +18546,7 @@ 00:cd3f wFlyAnimBirdSpriteImageIndex 00:cd3f wHUDGraphicsTiles 00:cd3f wHUDUnusedTopTile -00:cd3f wHiddenObjectIndex +00:cd3f wHiddenEventIndex 00:cd3f wHoFMonLevel 00:cd3f wJigglypuffFacingDirections 00:cd3f wNameOfPlayerMonToBeTraded @@ -18557,7 +18557,7 @@ 00:cd3f wTrainerFacingDirection 00:cd3f wTrainerInfoTextBoxNextRowOffset 00:cd40 wHUDCornerTile -00:cd40 wHiddenObjectY +00:cd40 wHiddenEventY 00:cd40 wHoFMonOrPlayer 00:cd40 wOptionsCancelCursorX 00:cd40 wPlayerSpinInPlaceAnimSoundID @@ -18565,8 +18565,8 @@ 00:cd40 wTrainerScreenY 00:cd41 wDayCarePerLevelCost 00:cd41 wHUDTriangleTile +00:cd41 wHiddenEventX 00:cd41 wHiddenItemOrCoinsIndex -00:cd41 wHiddenObjectX 00:cd41 wHoFTeamIndex2 00:cd41 wNumFieldMoves 00:cd41 wSlotMachineWheel1BottomTile @@ -20214,7 +20214,7 @@ 00:ffec hSavedMapTextPtr 00:ffec hSpriteScreenXCoord 00:ffed hSpriteMapYCoord -00:ffee hDidntFindAnyHiddenObject +00:ffee hDidntFindAnyHiddenEvent 00:ffee hSpriteMapXCoord 00:fff3 hWhoseTurn 00:fff4 hClearLetterPrintingDelayFlags diff --git a/pokeblue_vc.map b/pokeblue_vc.map index 3be423222..ab27c1f11 100644 --- a/pokeblue_vc.map +++ b/pokeblue_vc.map @@ -1067,11 +1067,11 @@ ROM0 bank #0: $3e8d = Predef.done $3e94 = GetPredefRegisters $3ead = UpdateCinnabarGymGateTileBlocks - $3eb5 = CheckForHiddenObjectOrBookshelfOrCardKeyDoor - $3eda = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.returnAddress - $3edd = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.hiddenObjectNotFound - $3eea = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.nothingFound - $3eec = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.done + $3eb5 = CheckForHiddenEventOrBookshelfOrCardKeyDoor + $3eda = CheckForHiddenEventOrBookshelfOrCardKeyDoor.returnAddress + $3edd = CheckForHiddenEventOrBookshelfOrCardKeyDoor.hiddenEventNotFound + $3eea = CheckForHiddenEventOrBookshelfOrCardKeyDoor.nothingFound + $3eec = CheckForHiddenEventOrBookshelfOrCardKeyDoor.done $3ef5 = PrintPredefTextID $3f05 = RestoreMapTextPointer $3f0f = SetMapTextPointer @@ -4917,7 +4917,7 @@ ROMX bank #7: $68da = BillsHouseBillCheckOutMyRarePokemonText.Text $68df = BillsHouse_Object $6905 = BillsHouse_Blocks - SECTION: $6915-$6cc1 ($03ad bytes) ["Hidden Objects 1"] + SECTION: $6915-$6cc1 ($03ad bytes) ["Hidden Events 1"] $6915 = OpenOaksPC $6932 = OpenOaksPC.closePC $693b = GetDexRatedText @@ -8413,14 +8413,14 @@ ROMX bank #17: $68b7 = SeafoamIslandsB4FDangerSignText $68bc = SeafoamIslandsB4F_Object $68fa = SeafoamIslandsB4F_Blocks - SECTION: $6981-$70aa ($072a bytes) ["Hidden Objects Core"] + SECTION: $6981-$70aa ($072a bytes) ["Hidden Events Core"] $6981 = IsPlayerOnDungeonWarp - $69a0 = CheckForHiddenObject - $69ae = CheckForHiddenObject.hiddenMapLoop - $69be = CheckForHiddenObject.foundMatchingMap - $69ce = CheckForHiddenObject.hiddenObjectLoop - $69f0 = CheckForHiddenObject.foundMatchingObject - $69fc = CheckForHiddenObject.noMatch + $69a0 = CheckForHiddenEvent + $69ae = CheckForHiddenEvent.hiddenMapLoop + $69be = CheckForHiddenEvent.foundMatchingMap + $69ce = CheckForHiddenEvent.hiddenEventLoop + $69f0 = CheckForHiddenEvent.foundMatchingEvent + $69fc = CheckForHiddenEvent.noMatch $6a01 = CheckIfCoordsInFrontOfPlayerMatch $6a16 = CheckIfCoordsInFrontOfPlayerMatch.facingUp $6a1a = CheckIfCoordsInFrontOfPlayerMatch.upDownCommon @@ -8430,93 +8430,93 @@ ROMX bank #17: $6a38 = CheckIfCoordsInFrontOfPlayerMatch.matched $6a3b = CheckIfCoordsInFrontOfPlayerMatch.didNotMatch $6a3d = CheckIfCoordsInFrontOfPlayerMatch.done - $6a40 = HiddenObjectMaps - $6a96 = HiddenObjectPointers - $6b40 = TradeCenterHiddenObjects - $6b4d = ColosseumHiddenObjects - $6b5a = RedsHouse2FHiddenObjects - $6b67 = BluesHouseHiddenObjects - $6b7a = OaksLabHiddenObjects - $6b93 = ViridianPokecenterHiddenObjects - $6ba0 = ViridianMartHiddenObjects - $6ba1 = ViridianSchoolHiddenObjects - $6bae = ViridianGymHiddenObjects - $6bbb = Museum1FHiddenObjects - $6bc8 = PewterGymHiddenObjects - $6bd5 = PewterMartHiddenObjects - $6bd6 = PewterPokecenterHiddenObjects - $6be3 = CeruleanPokecenterHiddenObjects - $6bf0 = CeruleanGymHiddenObjects - $6bfd = CeruleanMartHiddenObjects - $6bfe = LavenderPokecenterHiddenObjects - $6c0b = VermilionPokecenterHiddenObjects - $6c18 = VermilionGymHiddenObjects - $6c85 = CeladonMansion2HiddenObjects - $6c8c = CeladonPokecenterHiddenObjects - $6c99 = CeladonGymHiddenObjects - $6ca6 = GameCornerHiddenObjects - $6dc7 = CeladonHotelHiddenObjects - $6dd4 = FuchsiaPokecenterHiddenObjects - $6de1 = FuchsiaGymHiddenObjects - $6dee = CinnabarGymHiddenObjects - $6e19 = CinnabarPokecenterHiddenObjects - $6e26 = SaffronGymHiddenObjects - $6e2d = MtMoonPokecenterHiddenObjects - $6e3a = RockTunnelPokecenterHiddenObjects - $6e47 = ViridianForestHiddenObjects - $6e54 = MtMoon3HiddenObjects - $6e61 = IndigoPlateauHiddenObjects - $6e6e = Route25HiddenObjects - $6e7b = Route9HiddenObjects - $6e82 = SSAnne6HiddenObjects - $6e95 = SSAnne10HiddenObjects - $6e9c = Route10HiddenObjects - $6ea9 = RocketHideout1HiddenObjects - $6eb0 = RocketHideout3HiddenObjects - $6eb7 = RocketHideout4HiddenObjects - $6ebe = SaffronPokecenterHiddenObjects - $6ecb = PokemonTower5HiddenObjects - $6ed2 = Route13HiddenObjects - $6edf = SafariZoneEntranceHiddenObjects - $6ee6 = SafariZoneWestHiddenObjects - $6eed = SilphCo5FHiddenObjects - $6ef4 = SilphCo9FHiddenObjects - $6efb = CopycatsHouse2FHiddenObjects - $6f02 = CeruleanCave1HiddenObjects - $6f09 = CeruleanCave3HiddenObjects - $6f10 = PowerPlantHiddenObjects - $6f1d = SeafoamIslands3HiddenObjects - $6f24 = SeafoamIslands5HiddenObjects - $6f2b = Mansion1HiddenObjects - $6f38 = Mansion2HiddenObjects - $6f3f = Mansion3HiddenObjects - $6f4c = Mansion4HiddenObjects - $6f5f = Route23HiddenObjects - $6f72 = VictoryRoad2HiddenObjects - $6f7f = Unused6FHiddenObjects - $6f86 = BillsHouseHiddenObjects - $6f8d = ViridianCityHiddenObjects - $6f94 = SafariZoneRestHouse2HiddenObjects - $6fa1 = SafariZoneRestHouse3HiddenObjects - $6fae = SafariZoneRestHouse4HiddenObjects - $6fbb = Route15GateUpstairsHiddenObjects - $6fc2 = LavenderHouse1HiddenObjects - $6fd5 = CeladonMansion5HiddenObjects - $6fe8 = FightingDojoHiddenObjects - $7001 = IndigoPlateauLobbyHiddenObjects - $7008 = CinnabarLab4HiddenObjects - $7015 = BikeShopHiddenObjects - $703a = Route11HiddenObjects - $7041 = Route12HiddenObjects - $7048 = SilphCo11FHiddenObjects - $704f = Route17HiddenObjects - $706e = UndergroundPathNsHiddenObjects - $707b = UndergroundPathWeHiddenObjects - $7088 = CeladonCityHiddenObjects - $708f = SeafoamIslands4HiddenObjects - $7096 = VermilionCityHiddenObjects - $709d = CeruleanCityHiddenObjects - $70a4 = Route4HiddenObjects + $6a40 = HiddenEventMaps + $6a96 = HiddenEventPointers + $6b40 = HiddenEventsFor_TRADE_CENTER + $6b4d = HiddenEventsFor_COLOSSEUM + $6b5a = HiddenEventsFor_REDS_HOUSE_2F + $6b67 = HiddenEventsFor_BLUES_HOUSE + $6b7a = HiddenEventsFor_OAKS_LAB + $6b93 = HiddenEventsFor_VIRIDIAN_POKECENTER + $6ba0 = HiddenEventsFor_VIRIDIAN_MART + $6ba1 = HiddenEventsFor_VIRIDIAN_SCHOOL_HOUSE + $6bae = HiddenEventsFor_VIRIDIAN_GYM + $6bbb = HiddenEventsFor_MUSEUM_1F + $6bc8 = HiddenEventsFor_PEWTER_GYM + $6bd5 = HiddenEventsFor_PEWTER_MART + $6bd6 = HiddenEventsFor_PEWTER_POKECENTER + $6be3 = HiddenEventsFor_CERULEAN_POKECENTER + $6bf0 = HiddenEventsFor_CERULEAN_GYM + $6bfd = HiddenEventsFor_CERULEAN_MART + $6bfe = HiddenEventsFor_LAVENDER_POKECENTER + $6c0b = HiddenEventsFor_VERMILION_POKECENTER + $6c18 = HiddenEventsFor_VERMILION_GYM + $6c85 = HiddenEventsFor_CELADON_MANSION_2F + $6c8c = HiddenEventsFor_CELADON_POKECENTER + $6c99 = HiddenEventsFor_CELADON_GYM + $6ca6 = HiddenEventsFor_GAME_CORNER + $6dc7 = HiddenEventsFor_CELADON_HOTEL + $6dd4 = HiddenEventsFor_FUCHSIA_POKECENTER + $6de1 = HiddenEventsFor_FUCHSIA_GYM + $6dee = HiddenEventsFor_CINNABAR_GYM + $6e19 = HiddenEventsFor_CINNABAR_POKECENTER + $6e26 = HiddenEventsFor_SAFFRON_GYM + $6e2d = HiddenEventsFor_MT_MOON_POKECENTER + $6e3a = HiddenEventsFor_ROCK_TUNNEL_POKECENTER + $6e47 = HiddenEventsFor_VIRIDIAN_FOREST + $6e54 = HiddenEventsFor_MT_MOON_B2F + $6e61 = HiddenEventsFor_INDIGO_PLATEAU + $6e6e = HiddenEventsFor_ROUTE_25 + $6e7b = HiddenEventsFor_ROUTE_9 + $6e82 = HiddenEventsFor_SS_ANNE_KITCHEN + $6e95 = HiddenEventsFor_SS_ANNE_B1F_ROOMS + $6e9c = HiddenEventsFor_ROUTE_10 + $6ea9 = HiddenEventsFor_ROCKET_HIDEOUT_B1F + $6eb0 = HiddenEventsFor_ROCKET_HIDEOUT_B3F + $6eb7 = HiddenEventsFor_ROCKET_HIDEOUT_B4F + $6ebe = HiddenEventsFor_SAFFRON_POKECENTER + $6ecb = HiddenEventsFor_POKEMON_TOWER_5F + $6ed2 = HiddenEventsFor_ROUTE_13 + $6edf = HiddenEventsFor_SAFARI_ZONE_GATE + $6ee6 = HiddenEventsFor_SAFARI_ZONE_WEST + $6eed = HiddenEventsFor_SILPH_CO_5F + $6ef4 = HiddenEventsFor_SILPH_CO_9F + $6efb = HiddenEventsFor_COPYCATS_HOUSE_2F + $6f02 = HiddenEventsFor_CERULEAN_CAVE_1F + $6f09 = HiddenEventsFor_CERULEAN_CAVE_B1F + $6f10 = HiddenEventsFor_POWER_PLANT + $6f1d = HiddenEventsFor_SEAFOAM_ISLANDS_B2F + $6f24 = HiddenEventsFor_SEAFOAM_ISLANDS_B4F + $6f2b = HiddenEventsFor_POKEMON_MANSION_1F + $6f38 = HiddenEventsFor_POKEMON_MANSION_2F + $6f3f = HiddenEventsFor_POKEMON_MANSION_3F + $6f4c = HiddenEventsFor_POKEMON_MANSION_B1F + $6f5f = HiddenEventsFor_ROUTE_23 + $6f72 = HiddenEventsFor_VICTORY_ROAD_2F + $6f7f = HiddenEventsFor_UNUSED_MAP_6F + $6f86 = HiddenEventsFor_BILLS_HOUSE + $6f8d = HiddenEventsFor_VIRIDIAN_CITY + $6f94 = HiddenEventsFor_SAFARI_ZONE_WEST_REST_HOUSE + $6fa1 = HiddenEventsFor_SAFARI_ZONE_EAST_REST_HOUSE + $6fae = HiddenEventsFor_SAFARI_ZONE_NORTH_REST_HOUSE + $6fbb = HiddenEventsFor_ROUTE_15_GATE_2F + $6fc2 = HiddenEventsFor_MR_FUJIS_HOUSE + $6fd5 = HiddenEventsFor_CELADON_MANSION_ROOF_HOUSE + $6fe8 = HiddenEventsFor_FIGHTING_DOJO + $7001 = HiddenEventsFor_INDIGO_PLATEAU_LOBBY + $7008 = HiddenEventsFor_CINNABAR_LAB_FOSSIL_ROOM + $7015 = HiddenEventsFor_BIKE_SHOP + $703a = HiddenEventsFor_ROUTE_11 + $7041 = HiddenEventsFor_ROUTE_12 + $7048 = HiddenEventsFor_SILPH_CO_11F + $704f = HiddenEventsFor_ROUTE_17 + $706e = HiddenEventsFor_UNDERGROUND_PATH_NORTH_SOUTH + $707b = HiddenEventsFor_UNDERGROUND_PATH_WEST_EAST + $7088 = HiddenEventsFor_CELADON_CITY + $708f = HiddenEventsFor_SEAFOAM_ISLANDS_B3F + $7096 = HiddenEventsFor_VERMILION_CITY + $709d = HiddenEventsFor_CERULEAN_CITY + $70a4 = HiddenEventsFor_ROUTE_4 EMPTY: $70ab-$7fff ($0f55 bytes) TOTAL EMPTY: $0f55 bytes @@ -9260,7 +9260,7 @@ ROMX bank #19: $7ec7 = LearnMoveFromLevelUpPredef $7eca = LearnMovePredef $7ecd = GetQuantityOfItemInBagPredef - $7ed0 = CheckForHiddenObjectOrBookshelfOrCardKeyDoorPredef + $7ed0 = CheckForHiddenEventOrBookshelfOrCardKeyDoorPredef $7ed3 = GiveItemPredef $7ed6 = ChangeBGPalColor0_4FramesPredef $7ed9 = FindPathToPlayerPredef @@ -9850,7 +9850,7 @@ ROMX bank #20: $662a = ParalyzeEffect_.hitTest $6659 = ParalyzeEffect_.didntAffect $6666 = ParalyzeEffect_.doesntAffect - SECTION: $6673-$6a41 ($03cf bytes) ["Hidden Objects 2"] + SECTION: $6673-$6a41 ($03cf bytes) ["Hidden Events 2"] $6673 = PrintCardKeyText $667a = PrintCardKeyText.silphCoMapListLoop $669c = PrintCardKeyText.cardKeyDoorInFrontOfPlayer @@ -11664,7 +11664,7 @@ ROMX bank #23: $5ab3 = VictoryRoad1FCooltrainerMAfterBattleText $5ab8 = VictoryRoad1F_Object $5b04 = VictoryRoad1F_Blocks - SECTION: $5b5e-$5f14 ($03b7 bytes) ["Hidden Objects 3"] + SECTION: $5b5e-$5f14 ($03b7 bytes) ["Hidden Events 3"] $5b5e = SetPartyMonTypes $5b79 = PrintRedSNESText $5b81 = RedBedroomSNESText @@ -12246,7 +12246,7 @@ ROMX bank #24: $637b = SilphCo10FPorygonText.Text $6380 = SilphCo11F_Object $63c8 = SilphCo11F_Blocks - SECTION: $6419-$6529 ($0111 bytes) ["Hidden Objects 4"] + SECTION: $6419-$6529 ($0111 bytes) ["Hidden Events 4"] $6419 = GymStatues $6429 = GymStatues.loop $6433 = GymStatues.match @@ -18807,7 +18807,7 @@ WRAM0 bank #0: $ccf6 = wLowHealthAlarmDisabled $ccf7 = wPlayerMonMinimized $cd05 = wEnemyNumHits - $cd05 = wLuckySlotHiddenObjectIndex + $cd05 = wLuckySlotHiddenEventIndex $cd05 = wEnemyBideAccumulatedDamage $cd0f = wVermilionDockTileMapBufferEnd $cd0f = wInGameTradeGiveMonSpecies @@ -18867,6 +18867,7 @@ WRAM0 bank #0: $cd3d = wOptionsTextSpeedCursorX $cd3d = wTrainerInfoTextBoxWidthPlus1 $cd3d = wPlayerSpinInPlaceAnimFrameDelay + $cd3d = wHiddenEventFunctionArgument $cd3d = wCanPlaySlots $cd3d = wWhichTownMapLocation $cd3d = wFlyAnimUsingCoordList @@ -18888,7 +18889,6 @@ WRAM0 bank #0: $cd3d = wDayCareStartLevel $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel - $cd3d = wHiddenObjectFunctionArgument $cd3d = wFieldMoves $cd3d = wHoFTeamIndex $cd3d = wCoordIndex @@ -18902,7 +18902,7 @@ WRAM0 bank #0: $cd3e = wTrainerEngageDistance $cd3e = wPlayerSpinWhileMovingUpOrDownAnimMaxY $cd3e = wPlayerSpinInPlaceAnimFrameDelayDelta - $cd3e = wHiddenObjectFunctionRomBank + $cd3e = wHiddenEventFunctionRomBank $cd3e = wSlotMachineWheel1Offset $cd3e = wDayCareNumLevelsGrown $cd3e = wHUDPokeballGfxOffsetX @@ -18922,22 +18922,22 @@ WRAM0 bank #0: $cd3f = wTrainerFacingDirection $cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay $cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue + $cd3f = wHiddenEventIndex $cd3f = wSlotMachineWheel2Offset $cd3f = wHUDUnusedTopTile $cd3f = wFlyAnimBirdSpriteImageIndex $cd3f = wHoFMonLevel $cd3f = wDayCareTotalCost $cd3f = wTrainerInfoTextBoxNextRowOffset - $cd3f = wHiddenObjectIndex $cd3f = wNameOfPlayerMonToBeTraded $cd3f = wOptionsBattleStyleCursorX $cd3f = wHUDGraphicsTiles $cd40 = wOptionsCancelCursorX $cd40 = wTrainerScreenY + $cd40 = wHiddenEventY $cd40 = wSlotMachineWheel3Offset $cd40 = wHUDCornerTile $cd40 = wPlayerSpinInPlaceAnimSoundID - $cd40 = wHiddenObjectY $cd40 = wHoFMonOrPlayer $cd41 = wSlotMachineWheel1BottomTile $cd41 = wSlotMachineWinningSymbol @@ -18946,7 +18946,7 @@ WRAM0 bank #0: $cd41 = wNumFieldMoves $cd41 = wDayCarePerLevelCost $cd41 = wTradedPlayerMonOT - $cd41 = wHiddenObjectX + $cd41 = wHiddenEventX $cd41 = wTrainerScreenX $cd41 = wHiddenItemOrCoinsIndex $cd42 = wSlotMachineWheel1MiddleTile @@ -20601,7 +20601,7 @@ HRAM bank #0: $ffec = hSpriteScreenXCoord $ffed = hSpriteMapYCoord $ffee = hSpriteMapXCoord - $ffee = hDidntFindAnyHiddenObject + $ffee = hDidntFindAnyHiddenEvent $fff3 = hWhoseTurn $fff4 = hClearLetterPrintingDelayFlags $fff6 = hUILayoutFlags diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym index c643fdd53..076fdceb1 100644 --- a/pokeblue_vc.sym +++ b/pokeblue_vc.sym @@ -1042,11 +1042,11 @@ 00:3e8d Predef.done 00:3e94 GetPredefRegisters 00:3ead UpdateCinnabarGymGateTileBlocks -00:3eb5 CheckForHiddenObjectOrBookshelfOrCardKeyDoor -00:3eda CheckForHiddenObjectOrBookshelfOrCardKeyDoor.returnAddress -00:3edd CheckForHiddenObjectOrBookshelfOrCardKeyDoor.hiddenObjectNotFound -00:3eea CheckForHiddenObjectOrBookshelfOrCardKeyDoor.nothingFound -00:3eec CheckForHiddenObjectOrBookshelfOrCardKeyDoor.done +00:3eb5 CheckForHiddenEventOrBookshelfOrCardKeyDoor +00:3eda CheckForHiddenEventOrBookshelfOrCardKeyDoor.returnAddress +00:3edd CheckForHiddenEventOrBookshelfOrCardKeyDoor.hiddenEventNotFound +00:3eea CheckForHiddenEventOrBookshelfOrCardKeyDoor.nothingFound +00:3eec CheckForHiddenEventOrBookshelfOrCardKeyDoor.done 00:3ef5 PrintPredefTextID 00:3f05 RestoreMapTextPointer 00:3f0f SetMapTextPointer @@ -8278,12 +8278,12 @@ 11:68bc SeafoamIslandsB4F_Object 11:68fa SeafoamIslandsB4F_Blocks 11:6981 IsPlayerOnDungeonWarp -11:69a0 CheckForHiddenObject -11:69ae CheckForHiddenObject.hiddenMapLoop -11:69be CheckForHiddenObject.foundMatchingMap -11:69ce CheckForHiddenObject.hiddenObjectLoop -11:69f0 CheckForHiddenObject.foundMatchingObject -11:69fc CheckForHiddenObject.noMatch +11:69a0 CheckForHiddenEvent +11:69ae CheckForHiddenEvent.hiddenMapLoop +11:69be CheckForHiddenEvent.foundMatchingMap +11:69ce CheckForHiddenEvent.hiddenEventLoop +11:69f0 CheckForHiddenEvent.foundMatchingEvent +11:69fc CheckForHiddenEvent.noMatch 11:6a01 CheckIfCoordsInFrontOfPlayerMatch 11:6a16 CheckIfCoordsInFrontOfPlayerMatch.facingUp 11:6a1a CheckIfCoordsInFrontOfPlayerMatch.upDownCommon @@ -8293,93 +8293,93 @@ 11:6a38 CheckIfCoordsInFrontOfPlayerMatch.matched 11:6a3b CheckIfCoordsInFrontOfPlayerMatch.didNotMatch 11:6a3d CheckIfCoordsInFrontOfPlayerMatch.done -11:6a40 HiddenObjectMaps -11:6a96 HiddenObjectPointers -11:6b40 TradeCenterHiddenObjects -11:6b4d ColosseumHiddenObjects -11:6b5a RedsHouse2FHiddenObjects -11:6b67 BluesHouseHiddenObjects -11:6b7a OaksLabHiddenObjects -11:6b93 ViridianPokecenterHiddenObjects -11:6ba0 ViridianMartHiddenObjects -11:6ba1 ViridianSchoolHiddenObjects -11:6bae ViridianGymHiddenObjects -11:6bbb Museum1FHiddenObjects -11:6bc8 PewterGymHiddenObjects -11:6bd5 PewterMartHiddenObjects -11:6bd6 PewterPokecenterHiddenObjects -11:6be3 CeruleanPokecenterHiddenObjects -11:6bf0 CeruleanGymHiddenObjects -11:6bfd CeruleanMartHiddenObjects -11:6bfe LavenderPokecenterHiddenObjects -11:6c0b VermilionPokecenterHiddenObjects -11:6c18 VermilionGymHiddenObjects -11:6c85 CeladonMansion2HiddenObjects -11:6c8c CeladonPokecenterHiddenObjects -11:6c99 CeladonGymHiddenObjects -11:6ca6 GameCornerHiddenObjects -11:6dc7 CeladonHotelHiddenObjects -11:6dd4 FuchsiaPokecenterHiddenObjects -11:6de1 FuchsiaGymHiddenObjects -11:6dee CinnabarGymHiddenObjects -11:6e19 CinnabarPokecenterHiddenObjects -11:6e26 SaffronGymHiddenObjects -11:6e2d MtMoonPokecenterHiddenObjects -11:6e3a RockTunnelPokecenterHiddenObjects -11:6e47 ViridianForestHiddenObjects -11:6e54 MtMoon3HiddenObjects -11:6e61 IndigoPlateauHiddenObjects -11:6e6e Route25HiddenObjects -11:6e7b Route9HiddenObjects -11:6e82 SSAnne6HiddenObjects -11:6e95 SSAnne10HiddenObjects -11:6e9c Route10HiddenObjects -11:6ea9 RocketHideout1HiddenObjects -11:6eb0 RocketHideout3HiddenObjects -11:6eb7 RocketHideout4HiddenObjects -11:6ebe SaffronPokecenterHiddenObjects -11:6ecb PokemonTower5HiddenObjects -11:6ed2 Route13HiddenObjects -11:6edf SafariZoneEntranceHiddenObjects -11:6ee6 SafariZoneWestHiddenObjects -11:6eed SilphCo5FHiddenObjects -11:6ef4 SilphCo9FHiddenObjects -11:6efb CopycatsHouse2FHiddenObjects -11:6f02 CeruleanCave1HiddenObjects -11:6f09 CeruleanCave3HiddenObjects -11:6f10 PowerPlantHiddenObjects -11:6f1d SeafoamIslands3HiddenObjects -11:6f24 SeafoamIslands5HiddenObjects -11:6f2b Mansion1HiddenObjects -11:6f38 Mansion2HiddenObjects -11:6f3f Mansion3HiddenObjects -11:6f4c Mansion4HiddenObjects -11:6f5f Route23HiddenObjects -11:6f72 VictoryRoad2HiddenObjects -11:6f7f Unused6FHiddenObjects -11:6f86 BillsHouseHiddenObjects -11:6f8d ViridianCityHiddenObjects -11:6f94 SafariZoneRestHouse2HiddenObjects -11:6fa1 SafariZoneRestHouse3HiddenObjects -11:6fae SafariZoneRestHouse4HiddenObjects -11:6fbb Route15GateUpstairsHiddenObjects -11:6fc2 LavenderHouse1HiddenObjects -11:6fd5 CeladonMansion5HiddenObjects -11:6fe8 FightingDojoHiddenObjects -11:7001 IndigoPlateauLobbyHiddenObjects -11:7008 CinnabarLab4HiddenObjects -11:7015 BikeShopHiddenObjects -11:703a Route11HiddenObjects -11:7041 Route12HiddenObjects -11:7048 SilphCo11FHiddenObjects -11:704f Route17HiddenObjects -11:706e UndergroundPathNsHiddenObjects -11:707b UndergroundPathWeHiddenObjects -11:7088 CeladonCityHiddenObjects -11:708f SeafoamIslands4HiddenObjects -11:7096 VermilionCityHiddenObjects -11:709d CeruleanCityHiddenObjects -11:70a4 Route4HiddenObjects +11:6a40 HiddenEventMaps +11:6a96 HiddenEventPointers +11:6b40 HiddenEventsFor_TRADE_CENTER +11:6b4d HiddenEventsFor_COLOSSEUM +11:6b5a HiddenEventsFor_REDS_HOUSE_2F +11:6b67 HiddenEventsFor_BLUES_HOUSE +11:6b7a HiddenEventsFor_OAKS_LAB +11:6b93 HiddenEventsFor_VIRIDIAN_POKECENTER +11:6ba0 HiddenEventsFor_VIRIDIAN_MART +11:6ba1 HiddenEventsFor_VIRIDIAN_SCHOOL_HOUSE +11:6bae HiddenEventsFor_VIRIDIAN_GYM +11:6bbb HiddenEventsFor_MUSEUM_1F +11:6bc8 HiddenEventsFor_PEWTER_GYM +11:6bd5 HiddenEventsFor_PEWTER_MART +11:6bd6 HiddenEventsFor_PEWTER_POKECENTER +11:6be3 HiddenEventsFor_CERULEAN_POKECENTER +11:6bf0 HiddenEventsFor_CERULEAN_GYM +11:6bfd HiddenEventsFor_CERULEAN_MART +11:6bfe HiddenEventsFor_LAVENDER_POKECENTER +11:6c0b HiddenEventsFor_VERMILION_POKECENTER +11:6c18 HiddenEventsFor_VERMILION_GYM +11:6c85 HiddenEventsFor_CELADON_MANSION_2F +11:6c8c HiddenEventsFor_CELADON_POKECENTER +11:6c99 HiddenEventsFor_CELADON_GYM +11:6ca6 HiddenEventsFor_GAME_CORNER +11:6dc7 HiddenEventsFor_CELADON_HOTEL +11:6dd4 HiddenEventsFor_FUCHSIA_POKECENTER +11:6de1 HiddenEventsFor_FUCHSIA_GYM +11:6dee HiddenEventsFor_CINNABAR_GYM +11:6e19 HiddenEventsFor_CINNABAR_POKECENTER +11:6e26 HiddenEventsFor_SAFFRON_GYM +11:6e2d HiddenEventsFor_MT_MOON_POKECENTER +11:6e3a HiddenEventsFor_ROCK_TUNNEL_POKECENTER +11:6e47 HiddenEventsFor_VIRIDIAN_FOREST +11:6e54 HiddenEventsFor_MT_MOON_B2F +11:6e61 HiddenEventsFor_INDIGO_PLATEAU +11:6e6e HiddenEventsFor_ROUTE_25 +11:6e7b HiddenEventsFor_ROUTE_9 +11:6e82 HiddenEventsFor_SS_ANNE_KITCHEN +11:6e95 HiddenEventsFor_SS_ANNE_B1F_ROOMS +11:6e9c HiddenEventsFor_ROUTE_10 +11:6ea9 HiddenEventsFor_ROCKET_HIDEOUT_B1F +11:6eb0 HiddenEventsFor_ROCKET_HIDEOUT_B3F +11:6eb7 HiddenEventsFor_ROCKET_HIDEOUT_B4F +11:6ebe HiddenEventsFor_SAFFRON_POKECENTER +11:6ecb HiddenEventsFor_POKEMON_TOWER_5F +11:6ed2 HiddenEventsFor_ROUTE_13 +11:6edf HiddenEventsFor_SAFARI_ZONE_GATE +11:6ee6 HiddenEventsFor_SAFARI_ZONE_WEST +11:6eed HiddenEventsFor_SILPH_CO_5F +11:6ef4 HiddenEventsFor_SILPH_CO_9F +11:6efb HiddenEventsFor_COPYCATS_HOUSE_2F +11:6f02 HiddenEventsFor_CERULEAN_CAVE_1F +11:6f09 HiddenEventsFor_CERULEAN_CAVE_B1F +11:6f10 HiddenEventsFor_POWER_PLANT +11:6f1d HiddenEventsFor_SEAFOAM_ISLANDS_B2F +11:6f24 HiddenEventsFor_SEAFOAM_ISLANDS_B4F +11:6f2b HiddenEventsFor_POKEMON_MANSION_1F +11:6f38 HiddenEventsFor_POKEMON_MANSION_2F +11:6f3f HiddenEventsFor_POKEMON_MANSION_3F +11:6f4c HiddenEventsFor_POKEMON_MANSION_B1F +11:6f5f HiddenEventsFor_ROUTE_23 +11:6f72 HiddenEventsFor_VICTORY_ROAD_2F +11:6f7f HiddenEventsFor_UNUSED_MAP_6F +11:6f86 HiddenEventsFor_BILLS_HOUSE +11:6f8d HiddenEventsFor_VIRIDIAN_CITY +11:6f94 HiddenEventsFor_SAFARI_ZONE_WEST_REST_HOUSE +11:6fa1 HiddenEventsFor_SAFARI_ZONE_EAST_REST_HOUSE +11:6fae HiddenEventsFor_SAFARI_ZONE_NORTH_REST_HOUSE +11:6fbb HiddenEventsFor_ROUTE_15_GATE_2F +11:6fc2 HiddenEventsFor_MR_FUJIS_HOUSE +11:6fd5 HiddenEventsFor_CELADON_MANSION_ROOF_HOUSE +11:6fe8 HiddenEventsFor_FIGHTING_DOJO +11:7001 HiddenEventsFor_INDIGO_PLATEAU_LOBBY +11:7008 HiddenEventsFor_CINNABAR_LAB_FOSSIL_ROOM +11:7015 HiddenEventsFor_BIKE_SHOP +11:703a HiddenEventsFor_ROUTE_11 +11:7041 HiddenEventsFor_ROUTE_12 +11:7048 HiddenEventsFor_SILPH_CO_11F +11:704f HiddenEventsFor_ROUTE_17 +11:706e HiddenEventsFor_UNDERGROUND_PATH_NORTH_SOUTH +11:707b HiddenEventsFor_UNDERGROUND_PATH_WEST_EAST +11:7088 HiddenEventsFor_CELADON_CITY +11:708f HiddenEventsFor_SEAFOAM_ISLANDS_B3F +11:7096 HiddenEventsFor_VERMILION_CITY +11:709d HiddenEventsFor_CERULEAN_CITY +11:70a4 HiddenEventsFor_ROUTE_4 12:4000 Route7_h 12:4022 Route7_Object 12:4051 Route7_Blocks @@ -9109,7 +9109,7 @@ 13:7ec7 LearnMoveFromLevelUpPredef 13:7eca LearnMovePredef 13:7ecd GetQuantityOfItemInBagPredef -13:7ed0 CheckForHiddenObjectOrBookshelfOrCardKeyDoorPredef +13:7ed0 CheckForHiddenEventOrBookshelfOrCardKeyDoorPredef 13:7ed3 GiveItemPredef 13:7ed6 ChangeBGPalColor0_4FramesPredef 13:7ed9 FindPathToPlayerPredef @@ -18474,7 +18474,7 @@ 00:ccf7 wPlayerMonMinimized 00:cd05 wEnemyBideAccumulatedDamage 00:cd05 wEnemyNumHits -00:cd05 wLuckySlotHiddenObjectIndex +00:cd05 wLuckySlotHiddenEventIndex 00:cd0f wInGameTradeGiveMonSpecies 00:cd0f wMiscBattleDataEnd 00:cd0f wPlayerMonUnmodifiedLevel @@ -18535,7 +18535,7 @@ 00:cd3d wFallingObjectsMovementData 00:cd3d wFieldMoves 00:cd3d wFlyAnimUsingCoordList -00:cd3d wHiddenObjectFunctionArgument +00:cd3d wHiddenEventFunctionArgument 00:cd3d wHoFMonSpecies 00:cd3d wHoFTeamIndex 00:cd3d wInwardSpiralUpdateScreenCounter @@ -18570,7 +18570,7 @@ 00:cd3e wFlyAnimCounter 00:cd3e wFlyLocationsList 00:cd3e wHUDPokeballGfxOffsetX -00:cd3e wHiddenObjectFunctionRomBank +00:cd3e wHiddenEventFunctionRomBank 00:cd3e wHoFPartyMonIndex 00:cd3e wNumCreditsMonsDisplayed 00:cd3e wOptionsBattleAnimCursorX @@ -18588,7 +18588,7 @@ 00:cd3f wFlyAnimBirdSpriteImageIndex 00:cd3f wHUDGraphicsTiles 00:cd3f wHUDUnusedTopTile -00:cd3f wHiddenObjectIndex +00:cd3f wHiddenEventIndex 00:cd3f wHoFMonLevel 00:cd3f wJigglypuffFacingDirections 00:cd3f wNameOfPlayerMonToBeTraded @@ -18599,7 +18599,7 @@ 00:cd3f wTrainerFacingDirection 00:cd3f wTrainerInfoTextBoxNextRowOffset 00:cd40 wHUDCornerTile -00:cd40 wHiddenObjectY +00:cd40 wHiddenEventY 00:cd40 wHoFMonOrPlayer 00:cd40 wOptionsCancelCursorX 00:cd40 wPlayerSpinInPlaceAnimSoundID @@ -18607,8 +18607,8 @@ 00:cd40 wTrainerScreenY 00:cd41 wDayCarePerLevelCost 00:cd41 wHUDTriangleTile +00:cd41 wHiddenEventX 00:cd41 wHiddenItemOrCoinsIndex -00:cd41 wHiddenObjectX 00:cd41 wHoFTeamIndex2 00:cd41 wNumFieldMoves 00:cd41 wSlotMachineWheel1BottomTile @@ -20256,7 +20256,7 @@ 00:ffec hSavedMapTextPtr 00:ffec hSpriteScreenXCoord 00:ffed hSpriteMapYCoord -00:ffee hDidntFindAnyHiddenObject +00:ffee hDidntFindAnyHiddenEvent 00:ffee hSpriteMapXCoord 00:fff3 hWhoseTurn 00:fff4 hClearLetterPrintingDelayFlags diff --git a/pokered.map b/pokered.map index 482dfeb35..7a5e77acb 100644 --- a/pokered.map +++ b/pokered.map @@ -1061,11 +1061,11 @@ ROM0 bank #0: $3e8d = Predef.done $3e94 = GetPredefRegisters $3ead = UpdateCinnabarGymGateTileBlocks - $3eb5 = CheckForHiddenObjectOrBookshelfOrCardKeyDoor - $3eda = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.returnAddress - $3edd = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.hiddenObjectNotFound - $3eea = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.nothingFound - $3eec = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.done + $3eb5 = CheckForHiddenEventOrBookshelfOrCardKeyDoor + $3eda = CheckForHiddenEventOrBookshelfOrCardKeyDoor.returnAddress + $3edd = CheckForHiddenEventOrBookshelfOrCardKeyDoor.hiddenEventNotFound + $3eea = CheckForHiddenEventOrBookshelfOrCardKeyDoor.nothingFound + $3eec = CheckForHiddenEventOrBookshelfOrCardKeyDoor.done $3ef5 = PrintPredefTextID $3f05 = RestoreMapTextPointer $3f0f = SetMapTextPointer @@ -4901,7 +4901,7 @@ ROMX bank #7: $68da = BillsHouseBillCheckOutMyRarePokemonText.Text $68df = BillsHouse_Object $6905 = BillsHouse_Blocks - SECTION: $6915-$6cc1 ($03ad bytes) ["Hidden Objects 1"] + SECTION: $6915-$6cc1 ($03ad bytes) ["Hidden Events 1"] $6915 = OpenOaksPC $6932 = OpenOaksPC.closePC $693b = GetDexRatedText @@ -8386,14 +8386,14 @@ ROMX bank #17: $68b7 = SeafoamIslandsB4FDangerSignText $68bc = SeafoamIslandsB4F_Object $68fa = SeafoamIslandsB4F_Blocks - SECTION: $6981-$70aa ($072a bytes) ["Hidden Objects Core"] + SECTION: $6981-$70aa ($072a bytes) ["Hidden Events Core"] $6981 = IsPlayerOnDungeonWarp - $69a0 = CheckForHiddenObject - $69ae = CheckForHiddenObject.hiddenMapLoop - $69be = CheckForHiddenObject.foundMatchingMap - $69ce = CheckForHiddenObject.hiddenObjectLoop - $69f0 = CheckForHiddenObject.foundMatchingObject - $69fc = CheckForHiddenObject.noMatch + $69a0 = CheckForHiddenEvent + $69ae = CheckForHiddenEvent.hiddenMapLoop + $69be = CheckForHiddenEvent.foundMatchingMap + $69ce = CheckForHiddenEvent.hiddenEventLoop + $69f0 = CheckForHiddenEvent.foundMatchingEvent + $69fc = CheckForHiddenEvent.noMatch $6a01 = CheckIfCoordsInFrontOfPlayerMatch $6a16 = CheckIfCoordsInFrontOfPlayerMatch.facingUp $6a1a = CheckIfCoordsInFrontOfPlayerMatch.upDownCommon @@ -8403,93 +8403,93 @@ ROMX bank #17: $6a38 = CheckIfCoordsInFrontOfPlayerMatch.matched $6a3b = CheckIfCoordsInFrontOfPlayerMatch.didNotMatch $6a3d = CheckIfCoordsInFrontOfPlayerMatch.done - $6a40 = HiddenObjectMaps - $6a96 = HiddenObjectPointers - $6b40 = TradeCenterHiddenObjects - $6b4d = ColosseumHiddenObjects - $6b5a = RedsHouse2FHiddenObjects - $6b67 = BluesHouseHiddenObjects - $6b7a = OaksLabHiddenObjects - $6b93 = ViridianPokecenterHiddenObjects - $6ba0 = ViridianMartHiddenObjects - $6ba1 = ViridianSchoolHiddenObjects - $6bae = ViridianGymHiddenObjects - $6bbb = Museum1FHiddenObjects - $6bc8 = PewterGymHiddenObjects - $6bd5 = PewterMartHiddenObjects - $6bd6 = PewterPokecenterHiddenObjects - $6be3 = CeruleanPokecenterHiddenObjects - $6bf0 = CeruleanGymHiddenObjects - $6bfd = CeruleanMartHiddenObjects - $6bfe = LavenderPokecenterHiddenObjects - $6c0b = VermilionPokecenterHiddenObjects - $6c18 = VermilionGymHiddenObjects - $6c85 = CeladonMansion2HiddenObjects - $6c8c = CeladonPokecenterHiddenObjects - $6c99 = CeladonGymHiddenObjects - $6ca6 = GameCornerHiddenObjects - $6dc7 = CeladonHotelHiddenObjects - $6dd4 = FuchsiaPokecenterHiddenObjects - $6de1 = FuchsiaGymHiddenObjects - $6dee = CinnabarGymHiddenObjects - $6e19 = CinnabarPokecenterHiddenObjects - $6e26 = SaffronGymHiddenObjects - $6e2d = MtMoonPokecenterHiddenObjects - $6e3a = RockTunnelPokecenterHiddenObjects - $6e47 = ViridianForestHiddenObjects - $6e54 = MtMoon3HiddenObjects - $6e61 = IndigoPlateauHiddenObjects - $6e6e = Route25HiddenObjects - $6e7b = Route9HiddenObjects - $6e82 = SSAnne6HiddenObjects - $6e95 = SSAnne10HiddenObjects - $6e9c = Route10HiddenObjects - $6ea9 = RocketHideout1HiddenObjects - $6eb0 = RocketHideout3HiddenObjects - $6eb7 = RocketHideout4HiddenObjects - $6ebe = SaffronPokecenterHiddenObjects - $6ecb = PokemonTower5HiddenObjects - $6ed2 = Route13HiddenObjects - $6edf = SafariZoneEntranceHiddenObjects - $6ee6 = SafariZoneWestHiddenObjects - $6eed = SilphCo5FHiddenObjects - $6ef4 = SilphCo9FHiddenObjects - $6efb = CopycatsHouse2FHiddenObjects - $6f02 = CeruleanCave1HiddenObjects - $6f09 = CeruleanCave3HiddenObjects - $6f10 = PowerPlantHiddenObjects - $6f1d = SeafoamIslands3HiddenObjects - $6f24 = SeafoamIslands5HiddenObjects - $6f2b = Mansion1HiddenObjects - $6f38 = Mansion2HiddenObjects - $6f3f = Mansion3HiddenObjects - $6f4c = Mansion4HiddenObjects - $6f5f = Route23HiddenObjects - $6f72 = VictoryRoad2HiddenObjects - $6f7f = Unused6FHiddenObjects - $6f86 = BillsHouseHiddenObjects - $6f8d = ViridianCityHiddenObjects - $6f94 = SafariZoneRestHouse2HiddenObjects - $6fa1 = SafariZoneRestHouse3HiddenObjects - $6fae = SafariZoneRestHouse4HiddenObjects - $6fbb = Route15GateUpstairsHiddenObjects - $6fc2 = LavenderHouse1HiddenObjects - $6fd5 = CeladonMansion5HiddenObjects - $6fe8 = FightingDojoHiddenObjects - $7001 = IndigoPlateauLobbyHiddenObjects - $7008 = CinnabarLab4HiddenObjects - $7015 = BikeShopHiddenObjects - $703a = Route11HiddenObjects - $7041 = Route12HiddenObjects - $7048 = SilphCo11FHiddenObjects - $704f = Route17HiddenObjects - $706e = UndergroundPathNsHiddenObjects - $707b = UndergroundPathWeHiddenObjects - $7088 = CeladonCityHiddenObjects - $708f = SeafoamIslands4HiddenObjects - $7096 = VermilionCityHiddenObjects - $709d = CeruleanCityHiddenObjects - $70a4 = Route4HiddenObjects + $6a40 = HiddenEventMaps + $6a96 = HiddenEventPointers + $6b40 = HiddenEventsFor_TRADE_CENTER + $6b4d = HiddenEventsFor_COLOSSEUM + $6b5a = HiddenEventsFor_REDS_HOUSE_2F + $6b67 = HiddenEventsFor_BLUES_HOUSE + $6b7a = HiddenEventsFor_OAKS_LAB + $6b93 = HiddenEventsFor_VIRIDIAN_POKECENTER + $6ba0 = HiddenEventsFor_VIRIDIAN_MART + $6ba1 = HiddenEventsFor_VIRIDIAN_SCHOOL_HOUSE + $6bae = HiddenEventsFor_VIRIDIAN_GYM + $6bbb = HiddenEventsFor_MUSEUM_1F + $6bc8 = HiddenEventsFor_PEWTER_GYM + $6bd5 = HiddenEventsFor_PEWTER_MART + $6bd6 = HiddenEventsFor_PEWTER_POKECENTER + $6be3 = HiddenEventsFor_CERULEAN_POKECENTER + $6bf0 = HiddenEventsFor_CERULEAN_GYM + $6bfd = HiddenEventsFor_CERULEAN_MART + $6bfe = HiddenEventsFor_LAVENDER_POKECENTER + $6c0b = HiddenEventsFor_VERMILION_POKECENTER + $6c18 = HiddenEventsFor_VERMILION_GYM + $6c85 = HiddenEventsFor_CELADON_MANSION_2F + $6c8c = HiddenEventsFor_CELADON_POKECENTER + $6c99 = HiddenEventsFor_CELADON_GYM + $6ca6 = HiddenEventsFor_GAME_CORNER + $6dc7 = HiddenEventsFor_CELADON_HOTEL + $6dd4 = HiddenEventsFor_FUCHSIA_POKECENTER + $6de1 = HiddenEventsFor_FUCHSIA_GYM + $6dee = HiddenEventsFor_CINNABAR_GYM + $6e19 = HiddenEventsFor_CINNABAR_POKECENTER + $6e26 = HiddenEventsFor_SAFFRON_GYM + $6e2d = HiddenEventsFor_MT_MOON_POKECENTER + $6e3a = HiddenEventsFor_ROCK_TUNNEL_POKECENTER + $6e47 = HiddenEventsFor_VIRIDIAN_FOREST + $6e54 = HiddenEventsFor_MT_MOON_B2F + $6e61 = HiddenEventsFor_INDIGO_PLATEAU + $6e6e = HiddenEventsFor_ROUTE_25 + $6e7b = HiddenEventsFor_ROUTE_9 + $6e82 = HiddenEventsFor_SS_ANNE_KITCHEN + $6e95 = HiddenEventsFor_SS_ANNE_B1F_ROOMS + $6e9c = HiddenEventsFor_ROUTE_10 + $6ea9 = HiddenEventsFor_ROCKET_HIDEOUT_B1F + $6eb0 = HiddenEventsFor_ROCKET_HIDEOUT_B3F + $6eb7 = HiddenEventsFor_ROCKET_HIDEOUT_B4F + $6ebe = HiddenEventsFor_SAFFRON_POKECENTER + $6ecb = HiddenEventsFor_POKEMON_TOWER_5F + $6ed2 = HiddenEventsFor_ROUTE_13 + $6edf = HiddenEventsFor_SAFARI_ZONE_GATE + $6ee6 = HiddenEventsFor_SAFARI_ZONE_WEST + $6eed = HiddenEventsFor_SILPH_CO_5F + $6ef4 = HiddenEventsFor_SILPH_CO_9F + $6efb = HiddenEventsFor_COPYCATS_HOUSE_2F + $6f02 = HiddenEventsFor_CERULEAN_CAVE_1F + $6f09 = HiddenEventsFor_CERULEAN_CAVE_B1F + $6f10 = HiddenEventsFor_POWER_PLANT + $6f1d = HiddenEventsFor_SEAFOAM_ISLANDS_B2F + $6f24 = HiddenEventsFor_SEAFOAM_ISLANDS_B4F + $6f2b = HiddenEventsFor_POKEMON_MANSION_1F + $6f38 = HiddenEventsFor_POKEMON_MANSION_2F + $6f3f = HiddenEventsFor_POKEMON_MANSION_3F + $6f4c = HiddenEventsFor_POKEMON_MANSION_B1F + $6f5f = HiddenEventsFor_ROUTE_23 + $6f72 = HiddenEventsFor_VICTORY_ROAD_2F + $6f7f = HiddenEventsFor_UNUSED_MAP_6F + $6f86 = HiddenEventsFor_BILLS_HOUSE + $6f8d = HiddenEventsFor_VIRIDIAN_CITY + $6f94 = HiddenEventsFor_SAFARI_ZONE_WEST_REST_HOUSE + $6fa1 = HiddenEventsFor_SAFARI_ZONE_EAST_REST_HOUSE + $6fae = HiddenEventsFor_SAFARI_ZONE_NORTH_REST_HOUSE + $6fbb = HiddenEventsFor_ROUTE_15_GATE_2F + $6fc2 = HiddenEventsFor_MR_FUJIS_HOUSE + $6fd5 = HiddenEventsFor_CELADON_MANSION_ROOF_HOUSE + $6fe8 = HiddenEventsFor_FIGHTING_DOJO + $7001 = HiddenEventsFor_INDIGO_PLATEAU_LOBBY + $7008 = HiddenEventsFor_CINNABAR_LAB_FOSSIL_ROOM + $7015 = HiddenEventsFor_BIKE_SHOP + $703a = HiddenEventsFor_ROUTE_11 + $7041 = HiddenEventsFor_ROUTE_12 + $7048 = HiddenEventsFor_SILPH_CO_11F + $704f = HiddenEventsFor_ROUTE_17 + $706e = HiddenEventsFor_UNDERGROUND_PATH_NORTH_SOUTH + $707b = HiddenEventsFor_UNDERGROUND_PATH_WEST_EAST + $7088 = HiddenEventsFor_CELADON_CITY + $708f = HiddenEventsFor_SEAFOAM_ISLANDS_B3F + $7096 = HiddenEventsFor_VERMILION_CITY + $709d = HiddenEventsFor_CERULEAN_CITY + $70a4 = HiddenEventsFor_ROUTE_4 EMPTY: $70ab-$7fff ($0f55 bytes) TOTAL EMPTY: $0f55 bytes @@ -9233,7 +9233,7 @@ ROMX bank #19: $7ec7 = LearnMoveFromLevelUpPredef $7eca = LearnMovePredef $7ecd = GetQuantityOfItemInBagPredef - $7ed0 = CheckForHiddenObjectOrBookshelfOrCardKeyDoorPredef + $7ed0 = CheckForHiddenEventOrBookshelfOrCardKeyDoorPredef $7ed3 = GiveItemPredef $7ed6 = ChangeBGPalColor0_4FramesPredef $7ed9 = FindPathToPlayerPredef @@ -9823,7 +9823,7 @@ ROMX bank #20: $662a = ParalyzeEffect_.hitTest $6659 = ParalyzeEffect_.didntAffect $6666 = ParalyzeEffect_.doesntAffect - SECTION: $6673-$6a41 ($03cf bytes) ["Hidden Objects 2"] + SECTION: $6673-$6a41 ($03cf bytes) ["Hidden Events 2"] $6673 = PrintCardKeyText $667a = PrintCardKeyText.silphCoMapListLoop $669c = PrintCardKeyText.cardKeyDoorInFrontOfPlayer @@ -11637,7 +11637,7 @@ ROMX bank #23: $5ab3 = VictoryRoad1FCooltrainerMAfterBattleText $5ab8 = VictoryRoad1F_Object $5b04 = VictoryRoad1F_Blocks - SECTION: $5b5e-$5f14 ($03b7 bytes) ["Hidden Objects 3"] + SECTION: $5b5e-$5f14 ($03b7 bytes) ["Hidden Events 3"] $5b5e = SetPartyMonTypes $5b79 = PrintRedSNESText $5b81 = RedBedroomSNESText @@ -12219,7 +12219,7 @@ ROMX bank #24: $637b = SilphCo10FPorygonText.Text $6380 = SilphCo11F_Object $63c8 = SilphCo11F_Blocks - SECTION: $6419-$6529 ($0111 bytes) ["Hidden Objects 4"] + SECTION: $6419-$6529 ($0111 bytes) ["Hidden Events 4"] $6419 = GymStatues $6429 = GymStatues.loop $6433 = GymStatues.match @@ -18755,7 +18755,7 @@ WRAM0 bank #0: $ccf6 = wLowHealthAlarmDisabled $ccf7 = wPlayerMonMinimized $cd05 = wEnemyNumHits - $cd05 = wLuckySlotHiddenObjectIndex + $cd05 = wLuckySlotHiddenEventIndex $cd05 = wEnemyBideAccumulatedDamage $cd0f = wVermilionDockTileMapBufferEnd $cd0f = wInGameTradeGiveMonSpecies @@ -18815,6 +18815,7 @@ WRAM0 bank #0: $cd3d = wOptionsTextSpeedCursorX $cd3d = wTrainerInfoTextBoxWidthPlus1 $cd3d = wPlayerSpinInPlaceAnimFrameDelay + $cd3d = wHiddenEventFunctionArgument $cd3d = wCanPlaySlots $cd3d = wWhichTownMapLocation $cd3d = wFlyAnimUsingCoordList @@ -18836,7 +18837,6 @@ WRAM0 bank #0: $cd3d = wDayCareStartLevel $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel - $cd3d = wHiddenObjectFunctionArgument $cd3d = wFieldMoves $cd3d = wHoFTeamIndex $cd3d = wCoordIndex @@ -18850,7 +18850,7 @@ WRAM0 bank #0: $cd3e = wTrainerEngageDistance $cd3e = wPlayerSpinWhileMovingUpOrDownAnimMaxY $cd3e = wPlayerSpinInPlaceAnimFrameDelayDelta - $cd3e = wHiddenObjectFunctionRomBank + $cd3e = wHiddenEventFunctionRomBank $cd3e = wSlotMachineWheel1Offset $cd3e = wDayCareNumLevelsGrown $cd3e = wHUDPokeballGfxOffsetX @@ -18870,22 +18870,22 @@ WRAM0 bank #0: $cd3f = wTrainerFacingDirection $cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay $cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue + $cd3f = wHiddenEventIndex $cd3f = wSlotMachineWheel2Offset $cd3f = wHUDUnusedTopTile $cd3f = wFlyAnimBirdSpriteImageIndex $cd3f = wHoFMonLevel $cd3f = wDayCareTotalCost $cd3f = wTrainerInfoTextBoxNextRowOffset - $cd3f = wHiddenObjectIndex $cd3f = wNameOfPlayerMonToBeTraded $cd3f = wOptionsBattleStyleCursorX $cd3f = wHUDGraphicsTiles $cd40 = wOptionsCancelCursorX $cd40 = wTrainerScreenY + $cd40 = wHiddenEventY $cd40 = wSlotMachineWheel3Offset $cd40 = wHUDCornerTile $cd40 = wPlayerSpinInPlaceAnimSoundID - $cd40 = wHiddenObjectY $cd40 = wHoFMonOrPlayer $cd41 = wSlotMachineWheel1BottomTile $cd41 = wSlotMachineWinningSymbol @@ -18894,7 +18894,7 @@ WRAM0 bank #0: $cd41 = wNumFieldMoves $cd41 = wDayCarePerLevelCost $cd41 = wTradedPlayerMonOT - $cd41 = wHiddenObjectX + $cd41 = wHiddenEventX $cd41 = wTrainerScreenX $cd41 = wHiddenItemOrCoinsIndex $cd42 = wSlotMachineWheel1MiddleTile @@ -20549,7 +20549,7 @@ HRAM bank #0: $ffec = hSpriteScreenXCoord $ffed = hSpriteMapYCoord $ffee = hSpriteMapXCoord - $ffee = hDidntFindAnyHiddenObject + $ffee = hDidntFindAnyHiddenEvent $fff3 = hWhoseTurn $fff4 = hClearLetterPrintingDelayFlags $fff6 = hUILayoutFlags diff --git a/pokered.sym b/pokered.sym index 0a25418e4..dbc6c0041 100644 --- a/pokered.sym +++ b/pokered.sym @@ -1036,11 +1036,11 @@ 00:3e8d Predef.done 00:3e94 GetPredefRegisters 00:3ead UpdateCinnabarGymGateTileBlocks -00:3eb5 CheckForHiddenObjectOrBookshelfOrCardKeyDoor -00:3eda CheckForHiddenObjectOrBookshelfOrCardKeyDoor.returnAddress -00:3edd CheckForHiddenObjectOrBookshelfOrCardKeyDoor.hiddenObjectNotFound -00:3eea CheckForHiddenObjectOrBookshelfOrCardKeyDoor.nothingFound -00:3eec CheckForHiddenObjectOrBookshelfOrCardKeyDoor.done +00:3eb5 CheckForHiddenEventOrBookshelfOrCardKeyDoor +00:3eda CheckForHiddenEventOrBookshelfOrCardKeyDoor.returnAddress +00:3edd CheckForHiddenEventOrBookshelfOrCardKeyDoor.hiddenEventNotFound +00:3eea CheckForHiddenEventOrBookshelfOrCardKeyDoor.nothingFound +00:3eec CheckForHiddenEventOrBookshelfOrCardKeyDoor.done 00:3ef5 PrintPredefTextID 00:3f05 RestoreMapTextPointer 00:3f0f SetMapTextPointer @@ -8251,12 +8251,12 @@ 11:68bc SeafoamIslandsB4F_Object 11:68fa SeafoamIslandsB4F_Blocks 11:6981 IsPlayerOnDungeonWarp -11:69a0 CheckForHiddenObject -11:69ae CheckForHiddenObject.hiddenMapLoop -11:69be CheckForHiddenObject.foundMatchingMap -11:69ce CheckForHiddenObject.hiddenObjectLoop -11:69f0 CheckForHiddenObject.foundMatchingObject -11:69fc CheckForHiddenObject.noMatch +11:69a0 CheckForHiddenEvent +11:69ae CheckForHiddenEvent.hiddenMapLoop +11:69be CheckForHiddenEvent.foundMatchingMap +11:69ce CheckForHiddenEvent.hiddenEventLoop +11:69f0 CheckForHiddenEvent.foundMatchingEvent +11:69fc CheckForHiddenEvent.noMatch 11:6a01 CheckIfCoordsInFrontOfPlayerMatch 11:6a16 CheckIfCoordsInFrontOfPlayerMatch.facingUp 11:6a1a CheckIfCoordsInFrontOfPlayerMatch.upDownCommon @@ -8266,93 +8266,93 @@ 11:6a38 CheckIfCoordsInFrontOfPlayerMatch.matched 11:6a3b CheckIfCoordsInFrontOfPlayerMatch.didNotMatch 11:6a3d CheckIfCoordsInFrontOfPlayerMatch.done -11:6a40 HiddenObjectMaps -11:6a96 HiddenObjectPointers -11:6b40 TradeCenterHiddenObjects -11:6b4d ColosseumHiddenObjects -11:6b5a RedsHouse2FHiddenObjects -11:6b67 BluesHouseHiddenObjects -11:6b7a OaksLabHiddenObjects -11:6b93 ViridianPokecenterHiddenObjects -11:6ba0 ViridianMartHiddenObjects -11:6ba1 ViridianSchoolHiddenObjects -11:6bae ViridianGymHiddenObjects -11:6bbb Museum1FHiddenObjects -11:6bc8 PewterGymHiddenObjects -11:6bd5 PewterMartHiddenObjects -11:6bd6 PewterPokecenterHiddenObjects -11:6be3 CeruleanPokecenterHiddenObjects -11:6bf0 CeruleanGymHiddenObjects -11:6bfd CeruleanMartHiddenObjects -11:6bfe LavenderPokecenterHiddenObjects -11:6c0b VermilionPokecenterHiddenObjects -11:6c18 VermilionGymHiddenObjects -11:6c85 CeladonMansion2HiddenObjects -11:6c8c CeladonPokecenterHiddenObjects -11:6c99 CeladonGymHiddenObjects -11:6ca6 GameCornerHiddenObjects -11:6dc7 CeladonHotelHiddenObjects -11:6dd4 FuchsiaPokecenterHiddenObjects -11:6de1 FuchsiaGymHiddenObjects -11:6dee CinnabarGymHiddenObjects -11:6e19 CinnabarPokecenterHiddenObjects -11:6e26 SaffronGymHiddenObjects -11:6e2d MtMoonPokecenterHiddenObjects -11:6e3a RockTunnelPokecenterHiddenObjects -11:6e47 ViridianForestHiddenObjects -11:6e54 MtMoon3HiddenObjects -11:6e61 IndigoPlateauHiddenObjects -11:6e6e Route25HiddenObjects -11:6e7b Route9HiddenObjects -11:6e82 SSAnne6HiddenObjects -11:6e95 SSAnne10HiddenObjects -11:6e9c Route10HiddenObjects -11:6ea9 RocketHideout1HiddenObjects -11:6eb0 RocketHideout3HiddenObjects -11:6eb7 RocketHideout4HiddenObjects -11:6ebe SaffronPokecenterHiddenObjects -11:6ecb PokemonTower5HiddenObjects -11:6ed2 Route13HiddenObjects -11:6edf SafariZoneEntranceHiddenObjects -11:6ee6 SafariZoneWestHiddenObjects -11:6eed SilphCo5FHiddenObjects -11:6ef4 SilphCo9FHiddenObjects -11:6efb CopycatsHouse2FHiddenObjects -11:6f02 CeruleanCave1HiddenObjects -11:6f09 CeruleanCave3HiddenObjects -11:6f10 PowerPlantHiddenObjects -11:6f1d SeafoamIslands3HiddenObjects -11:6f24 SeafoamIslands5HiddenObjects -11:6f2b Mansion1HiddenObjects -11:6f38 Mansion2HiddenObjects -11:6f3f Mansion3HiddenObjects -11:6f4c Mansion4HiddenObjects -11:6f5f Route23HiddenObjects -11:6f72 VictoryRoad2HiddenObjects -11:6f7f Unused6FHiddenObjects -11:6f86 BillsHouseHiddenObjects -11:6f8d ViridianCityHiddenObjects -11:6f94 SafariZoneRestHouse2HiddenObjects -11:6fa1 SafariZoneRestHouse3HiddenObjects -11:6fae SafariZoneRestHouse4HiddenObjects -11:6fbb Route15GateUpstairsHiddenObjects -11:6fc2 LavenderHouse1HiddenObjects -11:6fd5 CeladonMansion5HiddenObjects -11:6fe8 FightingDojoHiddenObjects -11:7001 IndigoPlateauLobbyHiddenObjects -11:7008 CinnabarLab4HiddenObjects -11:7015 BikeShopHiddenObjects -11:703a Route11HiddenObjects -11:7041 Route12HiddenObjects -11:7048 SilphCo11FHiddenObjects -11:704f Route17HiddenObjects -11:706e UndergroundPathNsHiddenObjects -11:707b UndergroundPathWeHiddenObjects -11:7088 CeladonCityHiddenObjects -11:708f SeafoamIslands4HiddenObjects -11:7096 VermilionCityHiddenObjects -11:709d CeruleanCityHiddenObjects -11:70a4 Route4HiddenObjects +11:6a40 HiddenEventMaps +11:6a96 HiddenEventPointers +11:6b40 HiddenEventsFor_TRADE_CENTER +11:6b4d HiddenEventsFor_COLOSSEUM +11:6b5a HiddenEventsFor_REDS_HOUSE_2F +11:6b67 HiddenEventsFor_BLUES_HOUSE +11:6b7a HiddenEventsFor_OAKS_LAB +11:6b93 HiddenEventsFor_VIRIDIAN_POKECENTER +11:6ba0 HiddenEventsFor_VIRIDIAN_MART +11:6ba1 HiddenEventsFor_VIRIDIAN_SCHOOL_HOUSE +11:6bae HiddenEventsFor_VIRIDIAN_GYM +11:6bbb HiddenEventsFor_MUSEUM_1F +11:6bc8 HiddenEventsFor_PEWTER_GYM +11:6bd5 HiddenEventsFor_PEWTER_MART +11:6bd6 HiddenEventsFor_PEWTER_POKECENTER +11:6be3 HiddenEventsFor_CERULEAN_POKECENTER +11:6bf0 HiddenEventsFor_CERULEAN_GYM +11:6bfd HiddenEventsFor_CERULEAN_MART +11:6bfe HiddenEventsFor_LAVENDER_POKECENTER +11:6c0b HiddenEventsFor_VERMILION_POKECENTER +11:6c18 HiddenEventsFor_VERMILION_GYM +11:6c85 HiddenEventsFor_CELADON_MANSION_2F +11:6c8c HiddenEventsFor_CELADON_POKECENTER +11:6c99 HiddenEventsFor_CELADON_GYM +11:6ca6 HiddenEventsFor_GAME_CORNER +11:6dc7 HiddenEventsFor_CELADON_HOTEL +11:6dd4 HiddenEventsFor_FUCHSIA_POKECENTER +11:6de1 HiddenEventsFor_FUCHSIA_GYM +11:6dee HiddenEventsFor_CINNABAR_GYM +11:6e19 HiddenEventsFor_CINNABAR_POKECENTER +11:6e26 HiddenEventsFor_SAFFRON_GYM +11:6e2d HiddenEventsFor_MT_MOON_POKECENTER +11:6e3a HiddenEventsFor_ROCK_TUNNEL_POKECENTER +11:6e47 HiddenEventsFor_VIRIDIAN_FOREST +11:6e54 HiddenEventsFor_MT_MOON_B2F +11:6e61 HiddenEventsFor_INDIGO_PLATEAU +11:6e6e HiddenEventsFor_ROUTE_25 +11:6e7b HiddenEventsFor_ROUTE_9 +11:6e82 HiddenEventsFor_SS_ANNE_KITCHEN +11:6e95 HiddenEventsFor_SS_ANNE_B1F_ROOMS +11:6e9c HiddenEventsFor_ROUTE_10 +11:6ea9 HiddenEventsFor_ROCKET_HIDEOUT_B1F +11:6eb0 HiddenEventsFor_ROCKET_HIDEOUT_B3F +11:6eb7 HiddenEventsFor_ROCKET_HIDEOUT_B4F +11:6ebe HiddenEventsFor_SAFFRON_POKECENTER +11:6ecb HiddenEventsFor_POKEMON_TOWER_5F +11:6ed2 HiddenEventsFor_ROUTE_13 +11:6edf HiddenEventsFor_SAFARI_ZONE_GATE +11:6ee6 HiddenEventsFor_SAFARI_ZONE_WEST +11:6eed HiddenEventsFor_SILPH_CO_5F +11:6ef4 HiddenEventsFor_SILPH_CO_9F +11:6efb HiddenEventsFor_COPYCATS_HOUSE_2F +11:6f02 HiddenEventsFor_CERULEAN_CAVE_1F +11:6f09 HiddenEventsFor_CERULEAN_CAVE_B1F +11:6f10 HiddenEventsFor_POWER_PLANT +11:6f1d HiddenEventsFor_SEAFOAM_ISLANDS_B2F +11:6f24 HiddenEventsFor_SEAFOAM_ISLANDS_B4F +11:6f2b HiddenEventsFor_POKEMON_MANSION_1F +11:6f38 HiddenEventsFor_POKEMON_MANSION_2F +11:6f3f HiddenEventsFor_POKEMON_MANSION_3F +11:6f4c HiddenEventsFor_POKEMON_MANSION_B1F +11:6f5f HiddenEventsFor_ROUTE_23 +11:6f72 HiddenEventsFor_VICTORY_ROAD_2F +11:6f7f HiddenEventsFor_UNUSED_MAP_6F +11:6f86 HiddenEventsFor_BILLS_HOUSE +11:6f8d HiddenEventsFor_VIRIDIAN_CITY +11:6f94 HiddenEventsFor_SAFARI_ZONE_WEST_REST_HOUSE +11:6fa1 HiddenEventsFor_SAFARI_ZONE_EAST_REST_HOUSE +11:6fae HiddenEventsFor_SAFARI_ZONE_NORTH_REST_HOUSE +11:6fbb HiddenEventsFor_ROUTE_15_GATE_2F +11:6fc2 HiddenEventsFor_MR_FUJIS_HOUSE +11:6fd5 HiddenEventsFor_CELADON_MANSION_ROOF_HOUSE +11:6fe8 HiddenEventsFor_FIGHTING_DOJO +11:7001 HiddenEventsFor_INDIGO_PLATEAU_LOBBY +11:7008 HiddenEventsFor_CINNABAR_LAB_FOSSIL_ROOM +11:7015 HiddenEventsFor_BIKE_SHOP +11:703a HiddenEventsFor_ROUTE_11 +11:7041 HiddenEventsFor_ROUTE_12 +11:7048 HiddenEventsFor_SILPH_CO_11F +11:704f HiddenEventsFor_ROUTE_17 +11:706e HiddenEventsFor_UNDERGROUND_PATH_NORTH_SOUTH +11:707b HiddenEventsFor_UNDERGROUND_PATH_WEST_EAST +11:7088 HiddenEventsFor_CELADON_CITY +11:708f HiddenEventsFor_SEAFOAM_ISLANDS_B3F +11:7096 HiddenEventsFor_VERMILION_CITY +11:709d HiddenEventsFor_CERULEAN_CITY +11:70a4 HiddenEventsFor_ROUTE_4 12:4000 Route7_h 12:4022 Route7_Object 12:4051 Route7_Blocks @@ -9082,7 +9082,7 @@ 13:7ec7 LearnMoveFromLevelUpPredef 13:7eca LearnMovePredef 13:7ecd GetQuantityOfItemInBagPredef -13:7ed0 CheckForHiddenObjectOrBookshelfOrCardKeyDoorPredef +13:7ed0 CheckForHiddenEventOrBookshelfOrCardKeyDoorPredef 13:7ed3 GiveItemPredef 13:7ed6 ChangeBGPalColor0_4FramesPredef 13:7ed9 FindPathToPlayerPredef @@ -18422,7 +18422,7 @@ 00:ccf7 wPlayerMonMinimized 00:cd05 wEnemyBideAccumulatedDamage 00:cd05 wEnemyNumHits -00:cd05 wLuckySlotHiddenObjectIndex +00:cd05 wLuckySlotHiddenEventIndex 00:cd0f wInGameTradeGiveMonSpecies 00:cd0f wMiscBattleDataEnd 00:cd0f wPlayerMonUnmodifiedLevel @@ -18483,7 +18483,7 @@ 00:cd3d wFallingObjectsMovementData 00:cd3d wFieldMoves 00:cd3d wFlyAnimUsingCoordList -00:cd3d wHiddenObjectFunctionArgument +00:cd3d wHiddenEventFunctionArgument 00:cd3d wHoFMonSpecies 00:cd3d wHoFTeamIndex 00:cd3d wInwardSpiralUpdateScreenCounter @@ -18518,7 +18518,7 @@ 00:cd3e wFlyAnimCounter 00:cd3e wFlyLocationsList 00:cd3e wHUDPokeballGfxOffsetX -00:cd3e wHiddenObjectFunctionRomBank +00:cd3e wHiddenEventFunctionRomBank 00:cd3e wHoFPartyMonIndex 00:cd3e wNumCreditsMonsDisplayed 00:cd3e wOptionsBattleAnimCursorX @@ -18536,7 +18536,7 @@ 00:cd3f wFlyAnimBirdSpriteImageIndex 00:cd3f wHUDGraphicsTiles 00:cd3f wHUDUnusedTopTile -00:cd3f wHiddenObjectIndex +00:cd3f wHiddenEventIndex 00:cd3f wHoFMonLevel 00:cd3f wJigglypuffFacingDirections 00:cd3f wNameOfPlayerMonToBeTraded @@ -18547,7 +18547,7 @@ 00:cd3f wTrainerFacingDirection 00:cd3f wTrainerInfoTextBoxNextRowOffset 00:cd40 wHUDCornerTile -00:cd40 wHiddenObjectY +00:cd40 wHiddenEventY 00:cd40 wHoFMonOrPlayer 00:cd40 wOptionsCancelCursorX 00:cd40 wPlayerSpinInPlaceAnimSoundID @@ -18555,8 +18555,8 @@ 00:cd40 wTrainerScreenY 00:cd41 wDayCarePerLevelCost 00:cd41 wHUDTriangleTile +00:cd41 wHiddenEventX 00:cd41 wHiddenItemOrCoinsIndex -00:cd41 wHiddenObjectX 00:cd41 wHoFTeamIndex2 00:cd41 wNumFieldMoves 00:cd41 wSlotMachineWheel1BottomTile @@ -20204,7 +20204,7 @@ 00:ffec hSavedMapTextPtr 00:ffec hSpriteScreenXCoord 00:ffed hSpriteMapYCoord -00:ffee hDidntFindAnyHiddenObject +00:ffee hDidntFindAnyHiddenEvent 00:ffee hSpriteMapXCoord 00:fff3 hWhoseTurn 00:fff4 hClearLetterPrintingDelayFlags diff --git a/pokered_vc.map b/pokered_vc.map index dd1d93530..6dd663a96 100644 --- a/pokered_vc.map +++ b/pokered_vc.map @@ -1067,11 +1067,11 @@ ROM0 bank #0: $3e8d = Predef.done $3e94 = GetPredefRegisters $3ead = UpdateCinnabarGymGateTileBlocks - $3eb5 = CheckForHiddenObjectOrBookshelfOrCardKeyDoor - $3eda = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.returnAddress - $3edd = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.hiddenObjectNotFound - $3eea = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.nothingFound - $3eec = CheckForHiddenObjectOrBookshelfOrCardKeyDoor.done + $3eb5 = CheckForHiddenEventOrBookshelfOrCardKeyDoor + $3eda = CheckForHiddenEventOrBookshelfOrCardKeyDoor.returnAddress + $3edd = CheckForHiddenEventOrBookshelfOrCardKeyDoor.hiddenEventNotFound + $3eea = CheckForHiddenEventOrBookshelfOrCardKeyDoor.nothingFound + $3eec = CheckForHiddenEventOrBookshelfOrCardKeyDoor.done $3ef5 = PrintPredefTextID $3f05 = RestoreMapTextPointer $3f0f = SetMapTextPointer @@ -4917,7 +4917,7 @@ ROMX bank #7: $68da = BillsHouseBillCheckOutMyRarePokemonText.Text $68df = BillsHouse_Object $6905 = BillsHouse_Blocks - SECTION: $6915-$6cc1 ($03ad bytes) ["Hidden Objects 1"] + SECTION: $6915-$6cc1 ($03ad bytes) ["Hidden Events 1"] $6915 = OpenOaksPC $6932 = OpenOaksPC.closePC $693b = GetDexRatedText @@ -8415,14 +8415,14 @@ ROMX bank #17: $68b7 = SeafoamIslandsB4FDangerSignText $68bc = SeafoamIslandsB4F_Object $68fa = SeafoamIslandsB4F_Blocks - SECTION: $6981-$70aa ($072a bytes) ["Hidden Objects Core"] + SECTION: $6981-$70aa ($072a bytes) ["Hidden Events Core"] $6981 = IsPlayerOnDungeonWarp - $69a0 = CheckForHiddenObject - $69ae = CheckForHiddenObject.hiddenMapLoop - $69be = CheckForHiddenObject.foundMatchingMap - $69ce = CheckForHiddenObject.hiddenObjectLoop - $69f0 = CheckForHiddenObject.foundMatchingObject - $69fc = CheckForHiddenObject.noMatch + $69a0 = CheckForHiddenEvent + $69ae = CheckForHiddenEvent.hiddenMapLoop + $69be = CheckForHiddenEvent.foundMatchingMap + $69ce = CheckForHiddenEvent.hiddenEventLoop + $69f0 = CheckForHiddenEvent.foundMatchingEvent + $69fc = CheckForHiddenEvent.noMatch $6a01 = CheckIfCoordsInFrontOfPlayerMatch $6a16 = CheckIfCoordsInFrontOfPlayerMatch.facingUp $6a1a = CheckIfCoordsInFrontOfPlayerMatch.upDownCommon @@ -8432,93 +8432,93 @@ ROMX bank #17: $6a38 = CheckIfCoordsInFrontOfPlayerMatch.matched $6a3b = CheckIfCoordsInFrontOfPlayerMatch.didNotMatch $6a3d = CheckIfCoordsInFrontOfPlayerMatch.done - $6a40 = HiddenObjectMaps - $6a96 = HiddenObjectPointers - $6b40 = TradeCenterHiddenObjects - $6b4d = ColosseumHiddenObjects - $6b5a = RedsHouse2FHiddenObjects - $6b67 = BluesHouseHiddenObjects - $6b7a = OaksLabHiddenObjects - $6b93 = ViridianPokecenterHiddenObjects - $6ba0 = ViridianMartHiddenObjects - $6ba1 = ViridianSchoolHiddenObjects - $6bae = ViridianGymHiddenObjects - $6bbb = Museum1FHiddenObjects - $6bc8 = PewterGymHiddenObjects - $6bd5 = PewterMartHiddenObjects - $6bd6 = PewterPokecenterHiddenObjects - $6be3 = CeruleanPokecenterHiddenObjects - $6bf0 = CeruleanGymHiddenObjects - $6bfd = CeruleanMartHiddenObjects - $6bfe = LavenderPokecenterHiddenObjects - $6c0b = VermilionPokecenterHiddenObjects - $6c18 = VermilionGymHiddenObjects - $6c85 = CeladonMansion2HiddenObjects - $6c8c = CeladonPokecenterHiddenObjects - $6c99 = CeladonGymHiddenObjects - $6ca6 = GameCornerHiddenObjects - $6dc7 = CeladonHotelHiddenObjects - $6dd4 = FuchsiaPokecenterHiddenObjects - $6de1 = FuchsiaGymHiddenObjects - $6dee = CinnabarGymHiddenObjects - $6e19 = CinnabarPokecenterHiddenObjects - $6e26 = SaffronGymHiddenObjects - $6e2d = MtMoonPokecenterHiddenObjects - $6e3a = RockTunnelPokecenterHiddenObjects - $6e47 = ViridianForestHiddenObjects - $6e54 = MtMoon3HiddenObjects - $6e61 = IndigoPlateauHiddenObjects - $6e6e = Route25HiddenObjects - $6e7b = Route9HiddenObjects - $6e82 = SSAnne6HiddenObjects - $6e95 = SSAnne10HiddenObjects - $6e9c = Route10HiddenObjects - $6ea9 = RocketHideout1HiddenObjects - $6eb0 = RocketHideout3HiddenObjects - $6eb7 = RocketHideout4HiddenObjects - $6ebe = SaffronPokecenterHiddenObjects - $6ecb = PokemonTower5HiddenObjects - $6ed2 = Route13HiddenObjects - $6edf = SafariZoneEntranceHiddenObjects - $6ee6 = SafariZoneWestHiddenObjects - $6eed = SilphCo5FHiddenObjects - $6ef4 = SilphCo9FHiddenObjects - $6efb = CopycatsHouse2FHiddenObjects - $6f02 = CeruleanCave1HiddenObjects - $6f09 = CeruleanCave3HiddenObjects - $6f10 = PowerPlantHiddenObjects - $6f1d = SeafoamIslands3HiddenObjects - $6f24 = SeafoamIslands5HiddenObjects - $6f2b = Mansion1HiddenObjects - $6f38 = Mansion2HiddenObjects - $6f3f = Mansion3HiddenObjects - $6f4c = Mansion4HiddenObjects - $6f5f = Route23HiddenObjects - $6f72 = VictoryRoad2HiddenObjects - $6f7f = Unused6FHiddenObjects - $6f86 = BillsHouseHiddenObjects - $6f8d = ViridianCityHiddenObjects - $6f94 = SafariZoneRestHouse2HiddenObjects - $6fa1 = SafariZoneRestHouse3HiddenObjects - $6fae = SafariZoneRestHouse4HiddenObjects - $6fbb = Route15GateUpstairsHiddenObjects - $6fc2 = LavenderHouse1HiddenObjects - $6fd5 = CeladonMansion5HiddenObjects - $6fe8 = FightingDojoHiddenObjects - $7001 = IndigoPlateauLobbyHiddenObjects - $7008 = CinnabarLab4HiddenObjects - $7015 = BikeShopHiddenObjects - $703a = Route11HiddenObjects - $7041 = Route12HiddenObjects - $7048 = SilphCo11FHiddenObjects - $704f = Route17HiddenObjects - $706e = UndergroundPathNsHiddenObjects - $707b = UndergroundPathWeHiddenObjects - $7088 = CeladonCityHiddenObjects - $708f = SeafoamIslands4HiddenObjects - $7096 = VermilionCityHiddenObjects - $709d = CeruleanCityHiddenObjects - $70a4 = Route4HiddenObjects + $6a40 = HiddenEventMaps + $6a96 = HiddenEventPointers + $6b40 = HiddenEventsFor_TRADE_CENTER + $6b4d = HiddenEventsFor_COLOSSEUM + $6b5a = HiddenEventsFor_REDS_HOUSE_2F + $6b67 = HiddenEventsFor_BLUES_HOUSE + $6b7a = HiddenEventsFor_OAKS_LAB + $6b93 = HiddenEventsFor_VIRIDIAN_POKECENTER + $6ba0 = HiddenEventsFor_VIRIDIAN_MART + $6ba1 = HiddenEventsFor_VIRIDIAN_SCHOOL_HOUSE + $6bae = HiddenEventsFor_VIRIDIAN_GYM + $6bbb = HiddenEventsFor_MUSEUM_1F + $6bc8 = HiddenEventsFor_PEWTER_GYM + $6bd5 = HiddenEventsFor_PEWTER_MART + $6bd6 = HiddenEventsFor_PEWTER_POKECENTER + $6be3 = HiddenEventsFor_CERULEAN_POKECENTER + $6bf0 = HiddenEventsFor_CERULEAN_GYM + $6bfd = HiddenEventsFor_CERULEAN_MART + $6bfe = HiddenEventsFor_LAVENDER_POKECENTER + $6c0b = HiddenEventsFor_VERMILION_POKECENTER + $6c18 = HiddenEventsFor_VERMILION_GYM + $6c85 = HiddenEventsFor_CELADON_MANSION_2F + $6c8c = HiddenEventsFor_CELADON_POKECENTER + $6c99 = HiddenEventsFor_CELADON_GYM + $6ca6 = HiddenEventsFor_GAME_CORNER + $6dc7 = HiddenEventsFor_CELADON_HOTEL + $6dd4 = HiddenEventsFor_FUCHSIA_POKECENTER + $6de1 = HiddenEventsFor_FUCHSIA_GYM + $6dee = HiddenEventsFor_CINNABAR_GYM + $6e19 = HiddenEventsFor_CINNABAR_POKECENTER + $6e26 = HiddenEventsFor_SAFFRON_GYM + $6e2d = HiddenEventsFor_MT_MOON_POKECENTER + $6e3a = HiddenEventsFor_ROCK_TUNNEL_POKECENTER + $6e47 = HiddenEventsFor_VIRIDIAN_FOREST + $6e54 = HiddenEventsFor_MT_MOON_B2F + $6e61 = HiddenEventsFor_INDIGO_PLATEAU + $6e6e = HiddenEventsFor_ROUTE_25 + $6e7b = HiddenEventsFor_ROUTE_9 + $6e82 = HiddenEventsFor_SS_ANNE_KITCHEN + $6e95 = HiddenEventsFor_SS_ANNE_B1F_ROOMS + $6e9c = HiddenEventsFor_ROUTE_10 + $6ea9 = HiddenEventsFor_ROCKET_HIDEOUT_B1F + $6eb0 = HiddenEventsFor_ROCKET_HIDEOUT_B3F + $6eb7 = HiddenEventsFor_ROCKET_HIDEOUT_B4F + $6ebe = HiddenEventsFor_SAFFRON_POKECENTER + $6ecb = HiddenEventsFor_POKEMON_TOWER_5F + $6ed2 = HiddenEventsFor_ROUTE_13 + $6edf = HiddenEventsFor_SAFARI_ZONE_GATE + $6ee6 = HiddenEventsFor_SAFARI_ZONE_WEST + $6eed = HiddenEventsFor_SILPH_CO_5F + $6ef4 = HiddenEventsFor_SILPH_CO_9F + $6efb = HiddenEventsFor_COPYCATS_HOUSE_2F + $6f02 = HiddenEventsFor_CERULEAN_CAVE_1F + $6f09 = HiddenEventsFor_CERULEAN_CAVE_B1F + $6f10 = HiddenEventsFor_POWER_PLANT + $6f1d = HiddenEventsFor_SEAFOAM_ISLANDS_B2F + $6f24 = HiddenEventsFor_SEAFOAM_ISLANDS_B4F + $6f2b = HiddenEventsFor_POKEMON_MANSION_1F + $6f38 = HiddenEventsFor_POKEMON_MANSION_2F + $6f3f = HiddenEventsFor_POKEMON_MANSION_3F + $6f4c = HiddenEventsFor_POKEMON_MANSION_B1F + $6f5f = HiddenEventsFor_ROUTE_23 + $6f72 = HiddenEventsFor_VICTORY_ROAD_2F + $6f7f = HiddenEventsFor_UNUSED_MAP_6F + $6f86 = HiddenEventsFor_BILLS_HOUSE + $6f8d = HiddenEventsFor_VIRIDIAN_CITY + $6f94 = HiddenEventsFor_SAFARI_ZONE_WEST_REST_HOUSE + $6fa1 = HiddenEventsFor_SAFARI_ZONE_EAST_REST_HOUSE + $6fae = HiddenEventsFor_SAFARI_ZONE_NORTH_REST_HOUSE + $6fbb = HiddenEventsFor_ROUTE_15_GATE_2F + $6fc2 = HiddenEventsFor_MR_FUJIS_HOUSE + $6fd5 = HiddenEventsFor_CELADON_MANSION_ROOF_HOUSE + $6fe8 = HiddenEventsFor_FIGHTING_DOJO + $7001 = HiddenEventsFor_INDIGO_PLATEAU_LOBBY + $7008 = HiddenEventsFor_CINNABAR_LAB_FOSSIL_ROOM + $7015 = HiddenEventsFor_BIKE_SHOP + $703a = HiddenEventsFor_ROUTE_11 + $7041 = HiddenEventsFor_ROUTE_12 + $7048 = HiddenEventsFor_SILPH_CO_11F + $704f = HiddenEventsFor_ROUTE_17 + $706e = HiddenEventsFor_UNDERGROUND_PATH_NORTH_SOUTH + $707b = HiddenEventsFor_UNDERGROUND_PATH_WEST_EAST + $7088 = HiddenEventsFor_CELADON_CITY + $708f = HiddenEventsFor_SEAFOAM_ISLANDS_B3F + $7096 = HiddenEventsFor_VERMILION_CITY + $709d = HiddenEventsFor_CERULEAN_CITY + $70a4 = HiddenEventsFor_ROUTE_4 EMPTY: $70ab-$7fff ($0f55 bytes) TOTAL EMPTY: $0f55 bytes @@ -9262,7 +9262,7 @@ ROMX bank #19: $7ec7 = LearnMoveFromLevelUpPredef $7eca = LearnMovePredef $7ecd = GetQuantityOfItemInBagPredef - $7ed0 = CheckForHiddenObjectOrBookshelfOrCardKeyDoorPredef + $7ed0 = CheckForHiddenEventOrBookshelfOrCardKeyDoorPredef $7ed3 = GiveItemPredef $7ed6 = ChangeBGPalColor0_4FramesPredef $7ed9 = FindPathToPlayerPredef @@ -9852,7 +9852,7 @@ ROMX bank #20: $662a = ParalyzeEffect_.hitTest $6659 = ParalyzeEffect_.didntAffect $6666 = ParalyzeEffect_.doesntAffect - SECTION: $6673-$6a41 ($03cf bytes) ["Hidden Objects 2"] + SECTION: $6673-$6a41 ($03cf bytes) ["Hidden Events 2"] $6673 = PrintCardKeyText $667a = PrintCardKeyText.silphCoMapListLoop $669c = PrintCardKeyText.cardKeyDoorInFrontOfPlayer @@ -11666,7 +11666,7 @@ ROMX bank #23: $5ab3 = VictoryRoad1FCooltrainerMAfterBattleText $5ab8 = VictoryRoad1F_Object $5b04 = VictoryRoad1F_Blocks - SECTION: $5b5e-$5f14 ($03b7 bytes) ["Hidden Objects 3"] + SECTION: $5b5e-$5f14 ($03b7 bytes) ["Hidden Events 3"] $5b5e = SetPartyMonTypes $5b79 = PrintRedSNESText $5b81 = RedBedroomSNESText @@ -12248,7 +12248,7 @@ ROMX bank #24: $637b = SilphCo10FPorygonText.Text $6380 = SilphCo11F_Object $63c8 = SilphCo11F_Blocks - SECTION: $6419-$6529 ($0111 bytes) ["Hidden Objects 4"] + SECTION: $6419-$6529 ($0111 bytes) ["Hidden Events 4"] $6419 = GymStatues $6429 = GymStatues.loop $6433 = GymStatues.match @@ -18810,7 +18810,7 @@ WRAM0 bank #0: $ccf6 = wLowHealthAlarmDisabled $ccf7 = wPlayerMonMinimized $cd05 = wEnemyNumHits - $cd05 = wLuckySlotHiddenObjectIndex + $cd05 = wLuckySlotHiddenEventIndex $cd05 = wEnemyBideAccumulatedDamage $cd0f = wVermilionDockTileMapBufferEnd $cd0f = wInGameTradeGiveMonSpecies @@ -18870,6 +18870,7 @@ WRAM0 bank #0: $cd3d = wOptionsTextSpeedCursorX $cd3d = wTrainerInfoTextBoxWidthPlus1 $cd3d = wPlayerSpinInPlaceAnimFrameDelay + $cd3d = wHiddenEventFunctionArgument $cd3d = wCanPlaySlots $cd3d = wWhichTownMapLocation $cd3d = wFlyAnimUsingCoordList @@ -18891,7 +18892,6 @@ WRAM0 bank #0: $cd3d = wDayCareStartLevel $cd3d = wMoveDownSmallStarsOAMCount $cd3d = wStoppingWhichSlotMachineWheel - $cd3d = wHiddenObjectFunctionArgument $cd3d = wFieldMoves $cd3d = wHoFTeamIndex $cd3d = wCoordIndex @@ -18905,7 +18905,7 @@ WRAM0 bank #0: $cd3e = wTrainerEngageDistance $cd3e = wPlayerSpinWhileMovingUpOrDownAnimMaxY $cd3e = wPlayerSpinInPlaceAnimFrameDelayDelta - $cd3e = wHiddenObjectFunctionRomBank + $cd3e = wHiddenEventFunctionRomBank $cd3e = wSlotMachineWheel1Offset $cd3e = wDayCareNumLevelsGrown $cd3e = wHUDPokeballGfxOffsetX @@ -18925,22 +18925,22 @@ WRAM0 bank #0: $cd3f = wTrainerFacingDirection $cd3f = wPlayerSpinWhileMovingUpOrDownAnimFrameDelay $cd3f = wPlayerSpinInPlaceAnimFrameDelayEndValue + $cd3f = wHiddenEventIndex $cd3f = wSlotMachineWheel2Offset $cd3f = wHUDUnusedTopTile $cd3f = wFlyAnimBirdSpriteImageIndex $cd3f = wHoFMonLevel $cd3f = wDayCareTotalCost $cd3f = wTrainerInfoTextBoxNextRowOffset - $cd3f = wHiddenObjectIndex $cd3f = wNameOfPlayerMonToBeTraded $cd3f = wOptionsBattleStyleCursorX $cd3f = wHUDGraphicsTiles $cd40 = wOptionsCancelCursorX $cd40 = wTrainerScreenY + $cd40 = wHiddenEventY $cd40 = wSlotMachineWheel3Offset $cd40 = wHUDCornerTile $cd40 = wPlayerSpinInPlaceAnimSoundID - $cd40 = wHiddenObjectY $cd40 = wHoFMonOrPlayer $cd41 = wSlotMachineWheel1BottomTile $cd41 = wSlotMachineWinningSymbol @@ -18949,7 +18949,7 @@ WRAM0 bank #0: $cd41 = wNumFieldMoves $cd41 = wDayCarePerLevelCost $cd41 = wTradedPlayerMonOT - $cd41 = wHiddenObjectX + $cd41 = wHiddenEventX $cd41 = wTrainerScreenX $cd41 = wHiddenItemOrCoinsIndex $cd42 = wSlotMachineWheel1MiddleTile @@ -20604,7 +20604,7 @@ HRAM bank #0: $ffec = hSpriteScreenXCoord $ffed = hSpriteMapYCoord $ffee = hSpriteMapXCoord - $ffee = hDidntFindAnyHiddenObject + $ffee = hDidntFindAnyHiddenEvent $fff3 = hWhoseTurn $fff4 = hClearLetterPrintingDelayFlags $fff6 = hUILayoutFlags diff --git a/pokered_vc.sym b/pokered_vc.sym index 820a889f5..d7b5d72aa 100644 --- a/pokered_vc.sym +++ b/pokered_vc.sym @@ -1042,11 +1042,11 @@ 00:3e8d Predef.done 00:3e94 GetPredefRegisters 00:3ead UpdateCinnabarGymGateTileBlocks -00:3eb5 CheckForHiddenObjectOrBookshelfOrCardKeyDoor -00:3eda CheckForHiddenObjectOrBookshelfOrCardKeyDoor.returnAddress -00:3edd CheckForHiddenObjectOrBookshelfOrCardKeyDoor.hiddenObjectNotFound -00:3eea CheckForHiddenObjectOrBookshelfOrCardKeyDoor.nothingFound -00:3eec CheckForHiddenObjectOrBookshelfOrCardKeyDoor.done +00:3eb5 CheckForHiddenEventOrBookshelfOrCardKeyDoor +00:3eda CheckForHiddenEventOrBookshelfOrCardKeyDoor.returnAddress +00:3edd CheckForHiddenEventOrBookshelfOrCardKeyDoor.hiddenEventNotFound +00:3eea CheckForHiddenEventOrBookshelfOrCardKeyDoor.nothingFound +00:3eec CheckForHiddenEventOrBookshelfOrCardKeyDoor.done 00:3ef5 PrintPredefTextID 00:3f05 RestoreMapTextPointer 00:3f0f SetMapTextPointer @@ -8280,12 +8280,12 @@ 11:68bc SeafoamIslandsB4F_Object 11:68fa SeafoamIslandsB4F_Blocks 11:6981 IsPlayerOnDungeonWarp -11:69a0 CheckForHiddenObject -11:69ae CheckForHiddenObject.hiddenMapLoop -11:69be CheckForHiddenObject.foundMatchingMap -11:69ce CheckForHiddenObject.hiddenObjectLoop -11:69f0 CheckForHiddenObject.foundMatchingObject -11:69fc CheckForHiddenObject.noMatch +11:69a0 CheckForHiddenEvent +11:69ae CheckForHiddenEvent.hiddenMapLoop +11:69be CheckForHiddenEvent.foundMatchingMap +11:69ce CheckForHiddenEvent.hiddenEventLoop +11:69f0 CheckForHiddenEvent.foundMatchingEvent +11:69fc CheckForHiddenEvent.noMatch 11:6a01 CheckIfCoordsInFrontOfPlayerMatch 11:6a16 CheckIfCoordsInFrontOfPlayerMatch.facingUp 11:6a1a CheckIfCoordsInFrontOfPlayerMatch.upDownCommon @@ -8295,93 +8295,93 @@ 11:6a38 CheckIfCoordsInFrontOfPlayerMatch.matched 11:6a3b CheckIfCoordsInFrontOfPlayerMatch.didNotMatch 11:6a3d CheckIfCoordsInFrontOfPlayerMatch.done -11:6a40 HiddenObjectMaps -11:6a96 HiddenObjectPointers -11:6b40 TradeCenterHiddenObjects -11:6b4d ColosseumHiddenObjects -11:6b5a RedsHouse2FHiddenObjects -11:6b67 BluesHouseHiddenObjects -11:6b7a OaksLabHiddenObjects -11:6b93 ViridianPokecenterHiddenObjects -11:6ba0 ViridianMartHiddenObjects -11:6ba1 ViridianSchoolHiddenObjects -11:6bae ViridianGymHiddenObjects -11:6bbb Museum1FHiddenObjects -11:6bc8 PewterGymHiddenObjects -11:6bd5 PewterMartHiddenObjects -11:6bd6 PewterPokecenterHiddenObjects -11:6be3 CeruleanPokecenterHiddenObjects -11:6bf0 CeruleanGymHiddenObjects -11:6bfd CeruleanMartHiddenObjects -11:6bfe LavenderPokecenterHiddenObjects -11:6c0b VermilionPokecenterHiddenObjects -11:6c18 VermilionGymHiddenObjects -11:6c85 CeladonMansion2HiddenObjects -11:6c8c CeladonPokecenterHiddenObjects -11:6c99 CeladonGymHiddenObjects -11:6ca6 GameCornerHiddenObjects -11:6dc7 CeladonHotelHiddenObjects -11:6dd4 FuchsiaPokecenterHiddenObjects -11:6de1 FuchsiaGymHiddenObjects -11:6dee CinnabarGymHiddenObjects -11:6e19 CinnabarPokecenterHiddenObjects -11:6e26 SaffronGymHiddenObjects -11:6e2d MtMoonPokecenterHiddenObjects -11:6e3a RockTunnelPokecenterHiddenObjects -11:6e47 ViridianForestHiddenObjects -11:6e54 MtMoon3HiddenObjects -11:6e61 IndigoPlateauHiddenObjects -11:6e6e Route25HiddenObjects -11:6e7b Route9HiddenObjects -11:6e82 SSAnne6HiddenObjects -11:6e95 SSAnne10HiddenObjects -11:6e9c Route10HiddenObjects -11:6ea9 RocketHideout1HiddenObjects -11:6eb0 RocketHideout3HiddenObjects -11:6eb7 RocketHideout4HiddenObjects -11:6ebe SaffronPokecenterHiddenObjects -11:6ecb PokemonTower5HiddenObjects -11:6ed2 Route13HiddenObjects -11:6edf SafariZoneEntranceHiddenObjects -11:6ee6 SafariZoneWestHiddenObjects -11:6eed SilphCo5FHiddenObjects -11:6ef4 SilphCo9FHiddenObjects -11:6efb CopycatsHouse2FHiddenObjects -11:6f02 CeruleanCave1HiddenObjects -11:6f09 CeruleanCave3HiddenObjects -11:6f10 PowerPlantHiddenObjects -11:6f1d SeafoamIslands3HiddenObjects -11:6f24 SeafoamIslands5HiddenObjects -11:6f2b Mansion1HiddenObjects -11:6f38 Mansion2HiddenObjects -11:6f3f Mansion3HiddenObjects -11:6f4c Mansion4HiddenObjects -11:6f5f Route23HiddenObjects -11:6f72 VictoryRoad2HiddenObjects -11:6f7f Unused6FHiddenObjects -11:6f86 BillsHouseHiddenObjects -11:6f8d ViridianCityHiddenObjects -11:6f94 SafariZoneRestHouse2HiddenObjects -11:6fa1 SafariZoneRestHouse3HiddenObjects -11:6fae SafariZoneRestHouse4HiddenObjects -11:6fbb Route15GateUpstairsHiddenObjects -11:6fc2 LavenderHouse1HiddenObjects -11:6fd5 CeladonMansion5HiddenObjects -11:6fe8 FightingDojoHiddenObjects -11:7001 IndigoPlateauLobbyHiddenObjects -11:7008 CinnabarLab4HiddenObjects -11:7015 BikeShopHiddenObjects -11:703a Route11HiddenObjects -11:7041 Route12HiddenObjects -11:7048 SilphCo11FHiddenObjects -11:704f Route17HiddenObjects -11:706e UndergroundPathNsHiddenObjects -11:707b UndergroundPathWeHiddenObjects -11:7088 CeladonCityHiddenObjects -11:708f SeafoamIslands4HiddenObjects -11:7096 VermilionCityHiddenObjects -11:709d CeruleanCityHiddenObjects -11:70a4 Route4HiddenObjects +11:6a40 HiddenEventMaps +11:6a96 HiddenEventPointers +11:6b40 HiddenEventsFor_TRADE_CENTER +11:6b4d HiddenEventsFor_COLOSSEUM +11:6b5a HiddenEventsFor_REDS_HOUSE_2F +11:6b67 HiddenEventsFor_BLUES_HOUSE +11:6b7a HiddenEventsFor_OAKS_LAB +11:6b93 HiddenEventsFor_VIRIDIAN_POKECENTER +11:6ba0 HiddenEventsFor_VIRIDIAN_MART +11:6ba1 HiddenEventsFor_VIRIDIAN_SCHOOL_HOUSE +11:6bae HiddenEventsFor_VIRIDIAN_GYM +11:6bbb HiddenEventsFor_MUSEUM_1F +11:6bc8 HiddenEventsFor_PEWTER_GYM +11:6bd5 HiddenEventsFor_PEWTER_MART +11:6bd6 HiddenEventsFor_PEWTER_POKECENTER +11:6be3 HiddenEventsFor_CERULEAN_POKECENTER +11:6bf0 HiddenEventsFor_CERULEAN_GYM +11:6bfd HiddenEventsFor_CERULEAN_MART +11:6bfe HiddenEventsFor_LAVENDER_POKECENTER +11:6c0b HiddenEventsFor_VERMILION_POKECENTER +11:6c18 HiddenEventsFor_VERMILION_GYM +11:6c85 HiddenEventsFor_CELADON_MANSION_2F +11:6c8c HiddenEventsFor_CELADON_POKECENTER +11:6c99 HiddenEventsFor_CELADON_GYM +11:6ca6 HiddenEventsFor_GAME_CORNER +11:6dc7 HiddenEventsFor_CELADON_HOTEL +11:6dd4 HiddenEventsFor_FUCHSIA_POKECENTER +11:6de1 HiddenEventsFor_FUCHSIA_GYM +11:6dee HiddenEventsFor_CINNABAR_GYM +11:6e19 HiddenEventsFor_CINNABAR_POKECENTER +11:6e26 HiddenEventsFor_SAFFRON_GYM +11:6e2d HiddenEventsFor_MT_MOON_POKECENTER +11:6e3a HiddenEventsFor_ROCK_TUNNEL_POKECENTER +11:6e47 HiddenEventsFor_VIRIDIAN_FOREST +11:6e54 HiddenEventsFor_MT_MOON_B2F +11:6e61 HiddenEventsFor_INDIGO_PLATEAU +11:6e6e HiddenEventsFor_ROUTE_25 +11:6e7b HiddenEventsFor_ROUTE_9 +11:6e82 HiddenEventsFor_SS_ANNE_KITCHEN +11:6e95 HiddenEventsFor_SS_ANNE_B1F_ROOMS +11:6e9c HiddenEventsFor_ROUTE_10 +11:6ea9 HiddenEventsFor_ROCKET_HIDEOUT_B1F +11:6eb0 HiddenEventsFor_ROCKET_HIDEOUT_B3F +11:6eb7 HiddenEventsFor_ROCKET_HIDEOUT_B4F +11:6ebe HiddenEventsFor_SAFFRON_POKECENTER +11:6ecb HiddenEventsFor_POKEMON_TOWER_5F +11:6ed2 HiddenEventsFor_ROUTE_13 +11:6edf HiddenEventsFor_SAFARI_ZONE_GATE +11:6ee6 HiddenEventsFor_SAFARI_ZONE_WEST +11:6eed HiddenEventsFor_SILPH_CO_5F +11:6ef4 HiddenEventsFor_SILPH_CO_9F +11:6efb HiddenEventsFor_COPYCATS_HOUSE_2F +11:6f02 HiddenEventsFor_CERULEAN_CAVE_1F +11:6f09 HiddenEventsFor_CERULEAN_CAVE_B1F +11:6f10 HiddenEventsFor_POWER_PLANT +11:6f1d HiddenEventsFor_SEAFOAM_ISLANDS_B2F +11:6f24 HiddenEventsFor_SEAFOAM_ISLANDS_B4F +11:6f2b HiddenEventsFor_POKEMON_MANSION_1F +11:6f38 HiddenEventsFor_POKEMON_MANSION_2F +11:6f3f HiddenEventsFor_POKEMON_MANSION_3F +11:6f4c HiddenEventsFor_POKEMON_MANSION_B1F +11:6f5f HiddenEventsFor_ROUTE_23 +11:6f72 HiddenEventsFor_VICTORY_ROAD_2F +11:6f7f HiddenEventsFor_UNUSED_MAP_6F +11:6f86 HiddenEventsFor_BILLS_HOUSE +11:6f8d HiddenEventsFor_VIRIDIAN_CITY +11:6f94 HiddenEventsFor_SAFARI_ZONE_WEST_REST_HOUSE +11:6fa1 HiddenEventsFor_SAFARI_ZONE_EAST_REST_HOUSE +11:6fae HiddenEventsFor_SAFARI_ZONE_NORTH_REST_HOUSE +11:6fbb HiddenEventsFor_ROUTE_15_GATE_2F +11:6fc2 HiddenEventsFor_MR_FUJIS_HOUSE +11:6fd5 HiddenEventsFor_CELADON_MANSION_ROOF_HOUSE +11:6fe8 HiddenEventsFor_FIGHTING_DOJO +11:7001 HiddenEventsFor_INDIGO_PLATEAU_LOBBY +11:7008 HiddenEventsFor_CINNABAR_LAB_FOSSIL_ROOM +11:7015 HiddenEventsFor_BIKE_SHOP +11:703a HiddenEventsFor_ROUTE_11 +11:7041 HiddenEventsFor_ROUTE_12 +11:7048 HiddenEventsFor_SILPH_CO_11F +11:704f HiddenEventsFor_ROUTE_17 +11:706e HiddenEventsFor_UNDERGROUND_PATH_NORTH_SOUTH +11:707b HiddenEventsFor_UNDERGROUND_PATH_WEST_EAST +11:7088 HiddenEventsFor_CELADON_CITY +11:708f HiddenEventsFor_SEAFOAM_ISLANDS_B3F +11:7096 HiddenEventsFor_VERMILION_CITY +11:709d HiddenEventsFor_CERULEAN_CITY +11:70a4 HiddenEventsFor_ROUTE_4 12:4000 Route7_h 12:4022 Route7_Object 12:4051 Route7_Blocks @@ -9111,7 +9111,7 @@ 13:7ec7 LearnMoveFromLevelUpPredef 13:7eca LearnMovePredef 13:7ecd GetQuantityOfItemInBagPredef -13:7ed0 CheckForHiddenObjectOrBookshelfOrCardKeyDoorPredef +13:7ed0 CheckForHiddenEventOrBookshelfOrCardKeyDoorPredef 13:7ed3 GiveItemPredef 13:7ed6 ChangeBGPalColor0_4FramesPredef 13:7ed9 FindPathToPlayerPredef @@ -18477,7 +18477,7 @@ 00:ccf7 wPlayerMonMinimized 00:cd05 wEnemyBideAccumulatedDamage 00:cd05 wEnemyNumHits -00:cd05 wLuckySlotHiddenObjectIndex +00:cd05 wLuckySlotHiddenEventIndex 00:cd0f wInGameTradeGiveMonSpecies 00:cd0f wMiscBattleDataEnd 00:cd0f wPlayerMonUnmodifiedLevel @@ -18538,7 +18538,7 @@ 00:cd3d wFallingObjectsMovementData 00:cd3d wFieldMoves 00:cd3d wFlyAnimUsingCoordList -00:cd3d wHiddenObjectFunctionArgument +00:cd3d wHiddenEventFunctionArgument 00:cd3d wHoFMonSpecies 00:cd3d wHoFTeamIndex 00:cd3d wInwardSpiralUpdateScreenCounter @@ -18573,7 +18573,7 @@ 00:cd3e wFlyAnimCounter 00:cd3e wFlyLocationsList 00:cd3e wHUDPokeballGfxOffsetX -00:cd3e wHiddenObjectFunctionRomBank +00:cd3e wHiddenEventFunctionRomBank 00:cd3e wHoFPartyMonIndex 00:cd3e wNumCreditsMonsDisplayed 00:cd3e wOptionsBattleAnimCursorX @@ -18591,7 +18591,7 @@ 00:cd3f wFlyAnimBirdSpriteImageIndex 00:cd3f wHUDGraphicsTiles 00:cd3f wHUDUnusedTopTile -00:cd3f wHiddenObjectIndex +00:cd3f wHiddenEventIndex 00:cd3f wHoFMonLevel 00:cd3f wJigglypuffFacingDirections 00:cd3f wNameOfPlayerMonToBeTraded @@ -18602,7 +18602,7 @@ 00:cd3f wTrainerFacingDirection 00:cd3f wTrainerInfoTextBoxNextRowOffset 00:cd40 wHUDCornerTile -00:cd40 wHiddenObjectY +00:cd40 wHiddenEventY 00:cd40 wHoFMonOrPlayer 00:cd40 wOptionsCancelCursorX 00:cd40 wPlayerSpinInPlaceAnimSoundID @@ -18610,8 +18610,8 @@ 00:cd40 wTrainerScreenY 00:cd41 wDayCarePerLevelCost 00:cd41 wHUDTriangleTile +00:cd41 wHiddenEventX 00:cd41 wHiddenItemOrCoinsIndex -00:cd41 wHiddenObjectX 00:cd41 wHoFTeamIndex2 00:cd41 wNumFieldMoves 00:cd41 wSlotMachineWheel1BottomTile @@ -20259,7 +20259,7 @@ 00:ffec hSavedMapTextPtr 00:ffec hSpriteScreenXCoord 00:ffed hSpriteMapYCoord -00:ffee hDidntFindAnyHiddenObject +00:ffee hDidntFindAnyHiddenEvent 00:ffee hSpriteMapXCoord 00:fff3 hWhoseTurn 00:fff4 hClearLetterPrintingDelayFlags