monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pokémon R/B: Fix Pokémon Tower 7F crash (#1362)

This commit is contained in:
Alchav 2023-01-02 14:29:44 -05:00 committed by GitHub
parent d4e2b75520
commit 428f643b07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
worlds/pokemon_rb/basepatch_blue.bsdiff4
View File

Binary file not shown.

BIN
worlds/pokemon_rb/basepatch_red.bsdiff4
View File

Binary file not shown.

80
worlds/pokemon_rb/rom_addresses.py
View File

@ -838,46 +838,46 @@ rom_addresses = {
"Ghost_Battle2": 0x60c5c, "Ghost_Battle2": 0x60c5c,
"Missable_Pokemon_Tower_6F_Item_1": 0x60cd7, "Missable_Pokemon_Tower_6F_Item_1": 0x60cd7,
"Missable_Pokemon_Tower_6F_Item_2": 0x60cde, "Missable_Pokemon_Tower_6F_Item_2": 0x60cde,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_0_ITEM": 0x60ea6, "Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_0_ITEM": 0x60eb2,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_1_ITEM": 0x60eb4, "Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_1_ITEM": 0x60ec0,
"Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_2_ITEM": 0x60ec2, "Trainersanity_EVENT_BEAT_POKEMONTOWER_7_TRAINER_2_ITEM": 0x60ece,
"Gift_Aerodactyl": 0x610bc, "Gift_Aerodactyl": 0x610c8,
"Gift_Omanyte": 0x610c0, "Gift_Omanyte": 0x610cc,
"Gift_Kabuto": 0x610c4, "Gift_Kabuto": 0x610d0,
"Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0_ITEM": 0x611a7, "Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0_ITEM": 0x611b3,
"Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1_ITEM": 0x611b5, "Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1_ITEM": 0x611c1,
"Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2_ITEM": 0x611c3, "Trainersanity_EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2_ITEM": 0x611cf,
"Missable_Viridian_Forest_Item_1": 0x6128a, "Missable_Viridian_Forest_Item_1": 0x61296,
"Missable_Viridian_Forest_Item_2": 0x61291, "Missable_Viridian_Forest_Item_2": 0x6129d,
"Missable_Viridian_Forest_Item_3": 0x61298, "Missable_Viridian_Forest_Item_3": 0x612a4,
"Starter2_M": 0x614ae, "Starter2_M": 0x614ba,
"Starter3_M": 0x614b6, "Starter3_M": 0x614c2,
"Trainersanity_EVENT_BEAT_SS_ANNE_5_TRAINER_0_ITEM": 0x6173c, "Trainersanity_EVENT_BEAT_SS_ANNE_5_TRAINER_0_ITEM": 0x61748,
"Trainersanity_EVENT_BEAT_SS_ANNE_5_TRAINER_1_ITEM": 0x6174a, "Trainersanity_EVENT_BEAT_SS_ANNE_5_TRAINER_1_ITEM": 0x61756,
"Event_SS_Anne_Captain": 0x61925, "Event_SS_Anne_Captain": 0x61931,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_0_ITEM": 0x61a14, "Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_0_ITEM": 0x61a20,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_1_ITEM": 0x61a22, "Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_1_ITEM": 0x61a2e,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_2_ITEM": 0x61a30, "Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_2_ITEM": 0x61a3c,
"Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_3_ITEM": 0x61a3e, "Trainersanity_EVENT_BEAT_SS_ANNE_8_TRAINER_3_ITEM": 0x61a4a,
"Missable_SS_Anne_1F_Item": 0x61b2a, "Missable_SS_Anne_1F_Item": 0x61b36,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_0_ITEM": 0x61bfb, "Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_0_ITEM": 0x61c07,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_1_ITEM": 0x61c09, "Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_1_ITEM": 0x61c15,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_2_ITEM": 0x61c17, "Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_2_ITEM": 0x61c23,
"Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_3_ITEM": 0x61c25, "Trainersanity_EVENT_BEAT_SS_ANNE_9_TRAINER_3_ITEM": 0x61c31,
"Missable_SS_Anne_2F_Item_1": 0x61d5f, "Missable_SS_Anne_2F_Item_1": 0x61d6b,
"Missable_SS_Anne_2F_Item_2": 0x61d72, "Missable_SS_Anne_2F_Item_2": 0x61d7e,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_0_ITEM": 0x61e03, "Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_0_ITEM": 0x61e0f,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_1_ITEM": 0x61e11, "Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_1_ITEM": 0x61e1d,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_2_ITEM": 0x61e1f, "Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_2_ITEM": 0x61e2b,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_3_ITEM": 0x61e2d, "Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_3_ITEM": 0x61e39,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_4_ITEM": 0x61e3b, "Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_4_ITEM": 0x61e47,
"Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_5_ITEM": 0x61e49, "Trainersanity_EVENT_BEAT_SS_ANNE_10_TRAINER_5_ITEM": 0x61e55,
"Missable_SS_Anne_B1F_Item_1": 0x61f61, "Missable_SS_Anne_B1F_Item_1": 0x61f6d,
"Missable_SS_Anne_B1F_Item_2": 0x61f68, "Missable_SS_Anne_B1F_Item_2": 0x61f74,
"Missable_SS_Anne_B1F_Item_3": 0x61f6f, "Missable_SS_Anne_B1F_Item_3": 0x61f7b,
"Trainersanity_EVENT_BEAT_SILPH_CO_11F_TRAINER_0_ITEM": 0x62330, "Trainersanity_EVENT_BEAT_SILPH_CO_11F_TRAINER_0_ITEM": 0x6233c,
"Trainersanity_EVENT_BEAT_SILPH_CO_11F_TRAINER_1_ITEM": 0x6233e, "Trainersanity_EVENT_BEAT_SILPH_CO_11F_TRAINER_1_ITEM": 0x6234a,
"Event_Silph_Co_President": 0x62351, "Event_Silph_Co_President": 0x6235d,
"Ghost_Battle4": 0x708e1, "Ghost_Battle4": 0x708e1,
"Badge_Viridian_Gym": 0x749f7, "Badge_Viridian_Gym": 0x749f7,
"Event_Viridian_Gym": 0x74a0b, "Event_Viridian_Gym": 0x74a0b,