Pokemon R/B: Version 5 Update (#3566)

* Quiz updates

* Enable Partial Trainersanity

* Losable Key Items Still Count

* New options api

* Type Chart Seed

* Continue switching to new options API

* Level Scaling and Quiz fixes

* Level Scaling and Quiz fixes

* Clarify that palettes are only for Super Gameboy

* Type chart seed groups use one random players' options

* remove goal option again

* Text updates

* Trainersanity Trainers ignore Blind Trainers setting

* Re-order simple connecting interiors so that directions are preserved when possible

* Dexsanity exact number

* Year update

* Dexsanity Doc update

* revert accidental file deletion

* Fixes

* Add world parameter to logic calls

* restore correct seeded random object

* missing world.options changes

* Trainersanity table bug fix

* delete entrances as well as exits when restarting door shuffle

* Do not collect route 25 item for level scaling if trainer is trainersanity

* world.options in level_scaling.py

* Update worlds/pokemon_rb/level_scaling.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update worlds/pokemon_rb/encounters.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Update worlds/pokemon_rb/encounters.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* world -> multiworld

* Fix Cerulean Cave Hidden Item Center Rocks region

* Fix Cerulean Cave Hidden Item Center Rocks region for real

* Remove "self-locking" rules

* Update worlds/pokemon_rb/regions.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Fossil events

* Update worlds/pokemon_rb/level_scaling.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

---------

Co-authored-by: alchav <alchav@jalchavware.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
This commit is contained in:
Alchav
2024-09-18 14:37:17 -04:00
committed by GitHub
parent 51a6dc150c
commit db5d9fbf70
15 changed files with 1435 additions and 1335 deletions

View File

@@ -1,10 +1,9 @@
rom_addresses = {
"Option_Encounter_Minimum_Steps": 0x3c1,
"Option_Pitch_Black_Rock_Tunnel": 0x76a,
"Option_Blind_Trainers": 0x30d5,
"Option_Trainersanity1": 0x3165,
"Option_Split_Card_Key": 0x3e1e,
"Option_Fix_Combat_Bugs": 0x3e1f,
"Option_Blind_Trainers": 0x32f0,
"Option_Split_Card_Key": 0x3e19,
"Option_Fix_Combat_Bugs": 0x3e1a,
"Option_Lose_Money": 0x40d4,
"Base_Stats_Mew": 0x4260,
"Title_Mon_First": 0x4373,
@@ -115,9 +114,10 @@ rom_addresses = {
"HM_Strength_Badge_b": 0x131ed,
"HM_Flash_Badge_a": 0x131fc,
"HM_Flash_Badge_b": 0x13201,
"Trainer_Screen_Total_Key_Items": 0x135dc,
"TM_Moves": 0x137b1,
"Encounter_Chances": 0x13950,
"Tea_Key_Item_A": 0x135ac,
"Trainer_Screen_Total_Key_Items": 0x1361b,
"TM_Moves": 0x137f0,
"Encounter_Chances": 0x1398f,
"Warps_CeladonCity": 0x18026,
"Warps_PalletTown": 0x182c7,
"Warps_ViridianCity": 0x18388,
@@ -128,52 +128,54 @@ rom_addresses = {
"Option_Viridian_Gym_Badges": 0x1901d,
"Event_Sleepy_Guy": 0x191d1,
"Option_Route3_Guard_B": 0x1928a,
"Starter2_K": 0x19611,
"Starter3_K": 0x19619,
"Event_Rocket_Thief": 0x19733,
"Option_Cerulean_Cave_Badges": 0x19861,
"Option_Cerulean_Cave_Key_Items": 0x19868,
"Text_Cerulean_Cave_Badges": 0x198d7,
"Text_Cerulean_Cave_Key_Items": 0x198e5,
"Event_Stranded_Man": 0x19b3c,
"Event_Rivals_Sister": 0x19d0f,
"Warps_BluesHouse": 0x19d65,
"Warps_VermilionTradeHouse": 0x19dbc,
"Require_Pokedex_D": 0x19e53,
"Option_Elite_Four_Key_Items": 0x19e9d,
"Option_Elite_Four_Pokedex": 0x19ea4,
"Option_Elite_Four_Badges": 0x19eab,
"Text_Elite_Four_Badges": 0x19f47,
"Text_Elite_Four_Key_Items": 0x19f51,
"Text_Elite_Four_Pokedex": 0x19f64,
"Shop10": 0x1a018,
"Warps_IndigoPlateauLobby": 0x1a044,
"Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_0_ITEM": 0x1a16c,
"Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_1_ITEM": 0x1a17a,
"Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_2_ITEM": 0x1a188,
"Event_SKC4F": 0x1a19b,
"Warps_SilphCo4F": 0x1a21d,
"Missable_Silph_Co_4F_Item_1": 0x1a25d,
"Missable_Silph_Co_4F_Item_2": 0x1a264,
"Missable_Silph_Co_4F_Item_3": 0x1a26b,
"Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_0_ITEM": 0x1a3c3,
"Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_1_ITEM": 0x1a3d1,
"Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_2_ITEM": 0x1a3df,
"Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_3_ITEM": 0x1a3ed,
"Event_SKC5F": 0x1a400,
"Warps_SilphCo5F": 0x1a4aa,
"Missable_Silph_Co_5F_Item_1": 0x1a4f2,
"Missable_Silph_Co_5F_Item_2": 0x1a4f9,
"Missable_Silph_Co_5F_Item_3": 0x1a500,
"Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_0_ITEM": 0x1a630,
"Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_1_ITEM": 0x1a63e,
"Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_2_ITEM": 0x1a64c,
"Event_SKC6F": 0x1a66d,
"Warps_SilphCo6F": 0x1a74b,
"Missable_Silph_Co_6F_Item_1": 0x1a79b,
"Missable_Silph_Co_6F_Item_2": 0x1a7a2,
"Path_Pallet_Oak": 0x1a928,
"Path_Pallet_Player": 0x1a935,
"Starter2_K": 0x19618,
"Starter3_K": 0x19620,
"Event_Rocket_Thief": 0x1973a,
"Tea_Key_Item_C": 0x1988f,
"Option_Cerulean_Cave_Badges": 0x198a0,
"Option_Cerulean_Cave_Key_Items": 0x198a7,
"Text_Cerulean_Cave_Badges": 0x19916,
"Text_Cerulean_Cave_Key_Items": 0x19924,
"Event_Stranded_Man": 0x19b7b,
"Event_Rivals_Sister": 0x19d4e,
"Warps_BluesHouse": 0x19da4,
"Warps_VermilionTradeHouse": 0x19dfb,
"Require_Pokedex_D": 0x19e99,
"Tea_Key_Item_B": 0x19f13,
"Option_Elite_Four_Key_Items": 0x19f1b,
"Option_Elite_Four_Pokedex": 0x19f22,
"Option_Elite_Four_Badges": 0x19f29,
"Text_Elite_Four_Badges": 0x19fc5,
"Text_Elite_Four_Key_Items": 0x19fcf,
"Text_Elite_Four_Pokedex": 0x19fe2,
"Shop10": 0x1a096,
"Warps_IndigoPlateauLobby": 0x1a0c2,
"Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_0_ITEM": 0x1a1ea,
"Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_1_ITEM": 0x1a1f8,
"Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_2_ITEM": 0x1a206,
"Event_SKC4F": 0x1a219,
"Warps_SilphCo4F": 0x1a29b,
"Missable_Silph_Co_4F_Item_1": 0x1a2db,
"Missable_Silph_Co_4F_Item_2": 0x1a2e2,
"Missable_Silph_Co_4F_Item_3": 0x1a2e9,
"Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_0_ITEM": 0x1a441,
"Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_1_ITEM": 0x1a44f,
"Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_2_ITEM": 0x1a45d,
"Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_3_ITEM": 0x1a46b,
"Event_SKC5F": 0x1a47e,
"Warps_SilphCo5F": 0x1a528,
"Missable_Silph_Co_5F_Item_1": 0x1a570,
"Missable_Silph_Co_5F_Item_2": 0x1a577,
"Missable_Silph_Co_5F_Item_3": 0x1a57e,
"Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_0_ITEM": 0x1a6ae,
"Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_1_ITEM": 0x1a6bc,
"Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_2_ITEM": 0x1a6ca,
"Event_SKC6F": 0x1a6eb,
"Warps_SilphCo6F": 0x1a7c9,
"Missable_Silph_Co_6F_Item_1": 0x1a819,
"Missable_Silph_Co_6F_Item_2": 0x1a820,
"Path_Pallet_Oak": 0x1a9a6,
"Path_Pallet_Player": 0x1a9b3,
"Warps_CinnabarIsland": 0x1c026,
"Warps_Route1": 0x1c0e9,
"Option_Extra_Key_Items_B": 0x1ca46,
@@ -191,75 +193,75 @@ rom_addresses = {
"Starter2_E": 0x1d2f7,
"Starter3_E": 0x1d2ff,
"Event_Pokedex": 0x1d363,
"Event_Oaks_Gift": 0x1d393,
"Starter2_P": 0x1d481,
"Starter3_P": 0x1d489,
"Warps_OaksLab": 0x1d6af,
"Event_Pokemart_Quest": 0x1d76b,
"Shop1": 0x1d795,
"Warps_ViridianMart": 0x1d7d8,
"Warps_ViridianSchoolHouse": 0x1d82b,
"Warps_ViridianNicknameHouse": 0x1d889,
"Warps_PewterNidoranHouse": 0x1d8e4,
"Warps_PewterSpeechHouse": 0x1d927,
"Warps_CeruleanTrashedHouse": 0x1d98d,
"Warps_CeruleanTradeHouse": 0x1d9de,
"Event_Bicycle_Shop": 0x1da2f,
"Bike_Shop_Item_Display": 0x1da8a,
"Warps_BikeShop": 0x1db45,
"Event_Fuji": 0x1dbfd,
"Warps_MrFujisHouse": 0x1dc44,
"Warps_LavenderCuboneHouse": 0x1dcc0,
"Warps_NameRatersHouse": 0x1ddae,
"Warps_VermilionPidgeyHouse": 0x1ddf8,
"Trainersanity_EVENT_BEAT_MEW_ITEM": 0x1de4e,
"Warps_VermilionDock": 0x1de70,
"Static_Encounter_Mew": 0x1de7e,
"Gift_Eevee": 0x1def7,
"Warps_CeladonMansionRoofHouse": 0x1df0e,
"Shop7": 0x1df49,
"Warps_FuchsiaMart": 0x1df74,
"Warps_SaffronPidgeyHouse": 0x1dfdd,
"Event_Mr_Psychic": 0x1e020,
"Warps_MrPsychicsHouse": 0x1e05d,
"Warps_DiglettsCaveRoute2": 0x1e092,
"Warps_Route2TradeHouse": 0x1e0da,
"Warps_Route5Gate": 0x1e1db,
"Warps_Route6Gate": 0x1e2ad,
"Warps_Route7Gate": 0x1e383,
"Warps_Route8Gate": 0x1e454,
"Warps_UndergroundPathRoute8": 0x1e4a5,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_0_ITEM": 0x1e511,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_1_ITEM": 0x1e51f,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_2_ITEM": 0x1e52d,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_3_ITEM": 0x1e53b,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_4_ITEM": 0x1e549,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_5_ITEM": 0x1e557,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_6_ITEM": 0x1e565,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_7_ITEM": 0x1e573,
"Trainersanity_EVENT_BEAT_ZAPDOS_ITEM": 0x1e581,
"Warps_PowerPlant": 0x1e5de,
"Static_Encounter_Voltorb_A": 0x1e5f0,
"Static_Encounter_Voltorb_B": 0x1e5f8,
"Static_Encounter_Voltorb_C": 0x1e600,
"Static_Encounter_Electrode_A": 0x1e608,
"Static_Encounter_Voltorb_D": 0x1e610,
"Static_Encounter_Voltorb_E": 0x1e618,
"Static_Encounter_Electrode_B": 0x1e620,
"Static_Encounter_Voltorb_F": 0x1e628,
"Static_Encounter_Zapdos": 0x1e630,
"Missable_Power_Plant_Item_1": 0x1e638,
"Missable_Power_Plant_Item_2": 0x1e63f,
"Missable_Power_Plant_Item_3": 0x1e646,
"Missable_Power_Plant_Item_4": 0x1e64d,
"Missable_Power_Plant_Item_5": 0x1e654,
"Warps_DiglettsCaveRoute11": 0x1e7e9,
"Event_Rt16_House_Woman": 0x1e827,
"Warps_Route16FlyHouse": 0x1e870,
"Option_Victory_Road_Badges": 0x1e8f3,
"Warps_Route22Gate": 0x1e9e3,
"Event_Bill": 0x1eb24,
"Warps_BillsHouse": 0x1eb83,
"Event_Oaks_Gift": 0x1d398,
"Starter2_P": 0x1d486,
"Starter3_P": 0x1d48e,
"Warps_OaksLab": 0x1d6b4,
"Event_Pokemart_Quest": 0x1d770,
"Shop1": 0x1d79a,
"Warps_ViridianMart": 0x1d7dd,
"Warps_ViridianSchoolHouse": 0x1d830,
"Warps_ViridianNicknameHouse": 0x1d88e,
"Warps_PewterNidoranHouse": 0x1d8e9,
"Warps_PewterSpeechHouse": 0x1d92c,
"Warps_CeruleanTrashedHouse": 0x1d992,
"Warps_CeruleanTradeHouse": 0x1d9e3,
"Event_Bicycle_Shop": 0x1da34,
"Bike_Shop_Item_Display": 0x1da8f,
"Warps_BikeShop": 0x1db4a,
"Event_Fuji": 0x1dc02,
"Warps_MrFujisHouse": 0x1dc49,
"Warps_LavenderCuboneHouse": 0x1dcc5,
"Warps_NameRatersHouse": 0x1ddb3,
"Warps_VermilionPidgeyHouse": 0x1ddfd,
"Trainersanity_EVENT_BEAT_MEW_ITEM": 0x1de53,
"Warps_VermilionDock": 0x1de75,
"Static_Encounter_Mew": 0x1de83,
"Gift_Eevee": 0x1defc,
"Warps_CeladonMansionRoofHouse": 0x1df13,
"Shop7": 0x1df4e,
"Warps_FuchsiaMart": 0x1df79,
"Warps_SaffronPidgeyHouse": 0x1dfe2,
"Event_Mr_Psychic": 0x1e025,
"Warps_MrPsychicsHouse": 0x1e062,
"Warps_DiglettsCaveRoute2": 0x1e097,
"Warps_Route2TradeHouse": 0x1e0df,
"Warps_Route5Gate": 0x1e1e0,
"Warps_Route6Gate": 0x1e2b2,
"Warps_Route7Gate": 0x1e388,
"Warps_Route8Gate": 0x1e459,
"Warps_UndergroundPathRoute8": 0x1e4aa,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_0_ITEM": 0x1e516,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_1_ITEM": 0x1e524,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_2_ITEM": 0x1e532,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_3_ITEM": 0x1e540,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_4_ITEM": 0x1e54e,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_5_ITEM": 0x1e55c,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_6_ITEM": 0x1e56a,
"Trainersanity_EVENT_BEAT_POWER_PLANT_VOLTORB_7_ITEM": 0x1e578,
"Trainersanity_EVENT_BEAT_ZAPDOS_ITEM": 0x1e586,
"Warps_PowerPlant": 0x1e5e3,
"Static_Encounter_Voltorb_A": 0x1e5f5,
"Static_Encounter_Voltorb_B": 0x1e5fd,
"Static_Encounter_Voltorb_C": 0x1e605,
"Static_Encounter_Electrode_A": 0x1e60d,
"Static_Encounter_Voltorb_D": 0x1e615,
"Static_Encounter_Voltorb_E": 0x1e61d,
"Static_Encounter_Electrode_B": 0x1e625,
"Static_Encounter_Voltorb_F": 0x1e62d,
"Static_Encounter_Zapdos": 0x1e635,
"Missable_Power_Plant_Item_1": 0x1e63d,
"Missable_Power_Plant_Item_2": 0x1e644,
"Missable_Power_Plant_Item_3": 0x1e64b,
"Missable_Power_Plant_Item_4": 0x1e652,
"Missable_Power_Plant_Item_5": 0x1e659,
"Warps_DiglettsCaveRoute11": 0x1e7ee,
"Event_Rt16_House_Woman": 0x1e82c,
"Warps_Route16FlyHouse": 0x1e875,
"Option_Victory_Road_Badges": 0x1e8f8,
"Warps_Route22Gate": 0x1e9e8,
"Event_Bill": 0x1eb29,
"Warps_BillsHouse": 0x1eb88,
"Starter1_O": 0x372b0,
"Starter2_O": 0x372b4,
"Starter3_O": 0x372b8,
@@ -1470,74 +1472,73 @@ rom_addresses = {
"Trainersanity_EVENT_BEAT_POKEMONTOWER_5_TRAINER_3_ITEM": 0x609ea,
"Warps_PokemonTower5F": 0x60a5e,
"Missable_Pokemon_Tower_5F_Item": 0x60a92,
"Option_Trainersanity2": 0x60b2a,
"Ghost_Battle1": 0x60b83,
"Ghost_Battle_Level": 0x60b88,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_6_TRAINER_0_ITEM": 0x60c25,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_6_TRAINER_1_ITEM": 0x60c33,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_6_TRAINER_2_ITEM": 0x60c41,
"Ghost_Battle2": 0x60c69,
"Warps_PokemonTower6F": 0x60cbe,
"Missable_Pokemon_Tower_6F_Item_1": 0x60ce4,
"Missable_Pokemon_Tower_6F_Item_2": 0x60ceb,
"Entrance_Shuffle_Fuji_Warp": 0x60deb,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_0_ITEM": 0x60edf,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_1_ITEM": 0x60eed,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_2_ITEM": 0x60efb,
"Warps_PokemonTower7F": 0x60f8b,
"Warps_CeladonMart1F": 0x61033,
"Gift_Aerodactyl": 0x610f5,
"Gift_Omanyte": 0x610f9,
"Gift_Kabuto": 0x610fd,
"Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0_ITEM": 0x611de,
"Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1_ITEM": 0x611ec,
"Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2_ITEM": 0x611fa,
"Warps_ViridianForest": 0x61273,
"Missable_Viridian_Forest_Item_1": 0x612c1,
"Missable_Viridian_Forest_Item_2": 0x612c8,
"Missable_Viridian_Forest_Item_3": 0x612cf,
"Warps_SSAnne1F": 0x61310,
"Starter2_M": 0x614e5,
"Starter3_M": 0x614ed,
"Warps_SSAnne2F": 0x615ab,
"Warps_SSAnneB1F": 0x616c9,
"Trainersanity_EVENT_BEAT_SS_ANNE_5_TRAINER_0_ITEM": 0x61771,
"Trainersanity_EVENT_BEAT_SS_ANNE_5_TRAINER_1_ITEM": 0x6177f,
"Warps_SSAnneBow": 0x617c6,
"Warps_SSAnneKitchen": 0x618b6,
"Event_SS_Anne_Captain": 0x6194e,
"Warps_SSAnneCaptainsRoom": 0x619d5,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_0_ITEM": 0x61a3d,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_1_ITEM": 0x61a4b,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_2_ITEM": 0x61a59,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_3_ITEM": 0x61a67,
"Warps_SSAnne1FRooms": 0x61af7,
"Missable_SS_Anne_1F_Item": 0x61b53,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_0_ITEM": 0x61c24,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_1_ITEM": 0x61c32,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_2_ITEM": 0x61c40,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_3_ITEM": 0x61c4e,
"Warps_SSAnne2FRooms": 0x61d2c,
"Missable_SS_Anne_2F_Item_1": 0x61d88,
"Missable_SS_Anne_2F_Item_2": 0x61d9b,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_0_ITEM": 0x61e2c,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_1_ITEM": 0x61e3a,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_2_ITEM": 0x61e48,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_3_ITEM": 0x61e56,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_4_ITEM": 0x61e64,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_5_ITEM": 0x61e72,
"Warps_SSAnneB1FRooms": 0x61f20,
"Missable_SS_Anne_B1F_Item_1": 0x61f8a,
"Missable_SS_Anne_B1F_Item_2": 0x61f91,
"Missable_SS_Anne_B1F_Item_3": 0x61f98,
"Warps_UndergroundPathNorthSouth": 0x61fd5,
"Warps_UndergroundPathWestEast": 0x61ff9,
"Warps_DiglettsCave": 0x6201d,
"Trainersanity_EVENT_BEAT_SILPH_CO_11F_TRAINER_0_ITEM": 0x62358,
"Trainersanity_EVENT_BEAT_SILPH_CO_11F_TRAINER_1_ITEM": 0x62366,
"Event_Silph_Co_President": 0x62373,
"Event_SKC11F": 0x623bd,
"Warps_SilphCo11F": 0x62446,
"Ghost_Battle1": 0x60b93,
"Ghost_Battle_Level": 0x60b98,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_6_TRAINER_0_ITEM": 0x60c35,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_6_TRAINER_1_ITEM": 0x60c43,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_6_TRAINER_2_ITEM": 0x60c51,
"Ghost_Battle2": 0x60c79,
"Warps_PokemonTower6F": 0x60cce,
"Missable_Pokemon_Tower_6F_Item_1": 0x60cf4,
"Missable_Pokemon_Tower_6F_Item_2": 0x60cfb,
"Entrance_Shuffle_Fuji_Warp": 0x60dfb,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_0_ITEM": 0x60eef,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_1_ITEM": 0x60efd,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_2_ITEM": 0x60f0b,
"Warps_PokemonTower7F": 0x60f9b,
"Warps_CeladonMart1F": 0x61043,
"Gift_Aerodactyl": 0x61105,
"Gift_Omanyte": 0x61109,
"Gift_Kabuto": 0x6110d,
"Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0_ITEM": 0x61209,
"Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1_ITEM": 0x61217,
"Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2_ITEM": 0x61225,
"Warps_ViridianForest": 0x6129e,
"Missable_Viridian_Forest_Item_1": 0x612ec,
"Missable_Viridian_Forest_Item_2": 0x612f3,
"Missable_Viridian_Forest_Item_3": 0x612fa,
"Warps_SSAnne1F": 0x6133b,
"Starter2_M": 0x61510,
"Starter3_M": 0x61518,
"Warps_SSAnne2F": 0x615d6,
"Warps_SSAnneB1F": 0x616f4,
"Trainersanity_EVENT_BEAT_SS_ANNE_5_TRAINER_0_ITEM": 0x6179c,
"Trainersanity_EVENT_BEAT_SS_ANNE_5_TRAINER_1_ITEM": 0x617aa,
"Warps_SSAnneBow": 0x617f1,
"Warps_SSAnneKitchen": 0x618e1,
"Event_SS_Anne_Captain": 0x61979,
"Warps_SSAnneCaptainsRoom": 0x61a00,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_0_ITEM": 0x61a68,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_1_ITEM": 0x61a76,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_2_ITEM": 0x61a84,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_3_ITEM": 0x61a92,
"Warps_SSAnne1FRooms": 0x61b22,
"Missable_SS_Anne_1F_Item": 0x61b7e,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_0_ITEM": 0x61c4f,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_1_ITEM": 0x61c5d,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_2_ITEM": 0x61c6b,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_3_ITEM": 0x61c79,
"Warps_SSAnne2FRooms": 0x61d57,
"Missable_SS_Anne_2F_Item_1": 0x61db3,
"Missable_SS_Anne_2F_Item_2": 0x61dc6,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_0_ITEM": 0x61e57,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_1_ITEM": 0x61e65,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_2_ITEM": 0x61e73,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_3_ITEM": 0x61e81,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_4_ITEM": 0x61e8f,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_5_ITEM": 0x61e9d,
"Warps_SSAnneB1FRooms": 0x61f4b,
"Missable_SS_Anne_B1F_Item_1": 0x61fb5,
"Missable_SS_Anne_B1F_Item_2": 0x61fbc,
"Missable_SS_Anne_B1F_Item_3": 0x61fc3,
"Warps_UndergroundPathNorthSouth": 0x62000,
"Warps_UndergroundPathWestEast": 0x62024,
"Warps_DiglettsCave": 0x62048,
"Trainersanity_EVENT_BEAT_SILPH_CO_11F_TRAINER_0_ITEM": 0x62383,
"Trainersanity_EVENT_BEAT_SILPH_CO_11F_TRAINER_1_ITEM": 0x62391,
"Event_Silph_Co_President": 0x6239e,
"Event_SKC11F": 0x623e8,
"Warps_SilphCo11F": 0x62471,
"Ghost_Battle4": 0x708e1,
"Town_Map_Order": 0x70f0f,
"Town_Map_Coords": 0x71381,
@@ -1589,44 +1590,37 @@ rom_addresses = {
"Warps_FuchsiaMeetingRoom": 0x75879,
"Badge_Cinnabar_Gym": 0x759de,
"Event_Cinnabar_Gym": 0x759f2,
"Option_Trainersanity4": 0x75ace,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_B_ITEM": 0x75ada,
"Option_Trainersanity3": 0x75b1e,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_A_ITEM": 0x75b2a,
"Option_Trainersanity5": 0x75b85,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_2_ITEM": 0x75b91,
"Option_Trainersanity6": 0x75bd5,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_3_ITEM": 0x75be1,
"Option_Trainersanity7": 0x75c25,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_4_ITEM": 0x75c31,
"Option_Trainersanity8": 0x75c75,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_5_ITEM": 0x75c81,
"Option_Trainersanity9": 0x75cc5,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_6_ITEM": 0x75cd1,
"Warps_CinnabarGym": 0x75d1b,
"Warps_CinnabarLab": 0x75e02,
"Warps_CinnabarLabTradeRoom": 0x75e94,
"Event_Lab_Scientist": 0x75ee9,
"Warps_CinnabarLabMetronomeRoom": 0x75f35,
"Fossils_Needed_For_Second_Item": 0x75fb6,
"Fossil_Level": 0x76017,
"Event_Dome_Fossil_B": 0x76031,
"Event_Helix_Fossil_B": 0x76051,
"Warps_CinnabarLabFossilRoom": 0x760d2,
"Warps_CinnabarPokecenter": 0x76128,
"Shop8": 0x7616f,
"Warps_CinnabarMart": 0x7619b,
"Warps_CopycatsHouse1F": 0x761ed,
"Starter2_N": 0x762a2,
"Starter3_N": 0x762aa,
"Warps_ChampionsRoom": 0x764d5,
"Trainersanity_EVENT_BEAT_LORELEIS_ROOM_TRAINER_0_ITEM": 0x76604,
"Warps_LoreleisRoom": 0x76628,
"Trainersanity_EVENT_BEAT_BRUNOS_ROOM_TRAINER_0_ITEM": 0x7675d,
"Warps_BrunosRoom": 0x76781,
"Trainersanity_EVENT_BEAT_AGATHAS_ROOM_TRAINER_0_ITEM": 0x768bc,
"Warps_AgathasRoom": 0x768e0,
"Option_Itemfinder": 0x76a33,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_B_ITEM": 0x75adc,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_A_ITEM": 0x75b2e,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_2_ITEM": 0x75b97,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_3_ITEM": 0x75be9,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_4_ITEM": 0x75c3b,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_5_ITEM": 0x75c8d,
"Trainersanity_EVENT_BEAT_CINNABAR_GYM_TRAINER_6_ITEM": 0x75cdf,
"Warps_CinnabarGym": 0x75d29,
"Warps_CinnabarLab": 0x75e10,
"Warps_CinnabarLabTradeRoom": 0x75ea2,
"Event_Lab_Scientist": 0x75ef7,
"Warps_CinnabarLabMetronomeRoom": 0x75f43,
"Fossils_Needed_For_Second_Item": 0x75fc4,
"Fossil_Level": 0x76025,
"Event_Dome_Fossil_B": 0x7603f,
"Event_Helix_Fossil_B": 0x7605f,
"Warps_CinnabarLabFossilRoom": 0x760e0,
"Warps_CinnabarPokecenter": 0x76136,
"Shop8": 0x7617d,
"Warps_CinnabarMart": 0x761a9,
"Warps_CopycatsHouse1F": 0x761fb,
"Starter2_N": 0x762b0,
"Starter3_N": 0x762b8,
"Warps_ChampionsRoom": 0x764e3,
"Trainersanity_EVENT_BEAT_LORELEIS_ROOM_TRAINER_0_ITEM": 0x76612,
"Warps_LoreleisRoom": 0x76636,
"Trainersanity_EVENT_BEAT_BRUNOS_ROOM_TRAINER_0_ITEM": 0x7676b,
"Warps_BrunosRoom": 0x7678f,
"Trainersanity_EVENT_BEAT_AGATHAS_ROOM_TRAINER_0_ITEM": 0x768ca,
"Warps_AgathasRoom": 0x768ee,
"Option_Itemfinder": 0x76a41,
"Text_Quiz_A": 0x88806,
"Text_Quiz_B": 0x8893a,
"Text_Quiz_C": 0x88a6e,