diff --git a/worlds/pokemon_rb/basepatch_blue.bsdiff4 b/worlds/pokemon_rb/basepatch_blue.bsdiff4 index 18e77fc2..6932762f 100644 Binary files a/worlds/pokemon_rb/basepatch_blue.bsdiff4 and b/worlds/pokemon_rb/basepatch_blue.bsdiff4 differ diff --git a/worlds/pokemon_rb/basepatch_red.bsdiff4 b/worlds/pokemon_rb/basepatch_red.bsdiff4 index 6520ae39..cd380e1f 100644 Binary files a/worlds/pokemon_rb/basepatch_red.bsdiff4 and b/worlds/pokemon_rb/basepatch_red.bsdiff4 differ diff --git a/worlds/pokemon_rb/rom_addresses.py b/worlds/pokemon_rb/rom_addresses.py index 8128f318..30c38fa2 100644 --- a/worlds/pokemon_rb/rom_addresses.py +++ b/worlds/pokemon_rb/rom_addresses.py @@ -113,27 +113,27 @@ rom_addresses = { "Event_Rocket_Thief": 0x196cc, "Option_Cerulean_Cave_Condition": 0x1986c, "Event_Stranded_Man": 0x19b1f, - "Event_Rivals_Sister": 0x19ced, - "Option_Pokemon_League_Badges": 0x19e0a, - "Shop10": 0x19ee1, - "Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_0_ITEM": 0x1a035, - "Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_1_ITEM": 0x1a043, - "Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_2_ITEM": 0x1a051, - "Missable_Silph_Co_4F_Item_1": 0x1a0f9, - "Missable_Silph_Co_4F_Item_2": 0x1a100, - "Missable_Silph_Co_4F_Item_3": 0x1a107, - "Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_0_ITEM": 0x1a25f, - "Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_1_ITEM": 0x1a26d, - "Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_2_ITEM": 0x1a27b, - "Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_3_ITEM": 0x1a289, - "Missable_Silph_Co_5F_Item_1": 0x1a361, - "Missable_Silph_Co_5F_Item_2": 0x1a368, - "Missable_Silph_Co_5F_Item_3": 0x1a36f, - "Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_0_ITEM": 0x1a49f, - "Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_1_ITEM": 0x1a4ad, - "Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_2_ITEM": 0x1a4bb, - "Missable_Silph_Co_6F_Item_1": 0x1a5dd, - "Missable_Silph_Co_6F_Item_2": 0x1a5e4, + "Event_Rivals_Sister": 0x19cf2, + "Option_Pokemon_League_Badges": 0x19e0f, + "Shop10": 0x19ee6, + "Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_0_ITEM": 0x1a03a, + "Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_1_ITEM": 0x1a048, + "Trainersanity_EVENT_BEAT_SILPH_CO_4F_TRAINER_2_ITEM": 0x1a056, + "Missable_Silph_Co_4F_Item_1": 0x1a0fe, + "Missable_Silph_Co_4F_Item_2": 0x1a105, + "Missable_Silph_Co_4F_Item_3": 0x1a10c, + "Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_0_ITEM": 0x1a264, + "Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_1_ITEM": 0x1a272, + "Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_2_ITEM": 0x1a280, + "Trainersanity_EVENT_BEAT_SILPH_CO_5F_TRAINER_3_ITEM": 0x1a28e, + "Missable_Silph_Co_5F_Item_1": 0x1a366, + "Missable_Silph_Co_5F_Item_2": 0x1a36d, + "Missable_Silph_Co_5F_Item_3": 0x1a374, + "Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_0_ITEM": 0x1a4a4, + "Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_1_ITEM": 0x1a4b2, + "Trainersanity_EVENT_BEAT_SILPH_CO_6F_TRAINER_2_ITEM": 0x1a4c0, + "Missable_Silph_Co_6F_Item_1": 0x1a5e2, + "Missable_Silph_Co_6F_Item_2": 0x1a5e9, "Event_Free_Sample": 0x1cad6, "Starter1_F": 0x1cca2, "Starter2_F": 0x1cca6,