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

OoT: update ASM to version 6.2

This commit is contained in:
espeon65536 2022-05-01 13:27:53 -05:00
parent e711490f6c
commit c102d602b3
3 changed files with 12332 additions and 12088 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/oot/Patches.py
View File

@ -826,10 +826,6 @@ def patch_rom(world, rom):
exit_table = generate_exit_lookup_table() exit_table = generate_exit_lookup_table()
if world.entrance_shuffle:
# Disable the fog state entirely to avoid fog glitches
rom.write_byte(rom.sym('NO_FOG_STATE'), 1)
if world.disable_trade_revert: if world.disable_trade_revert:
# Disable trade quest timers and prevent trade items from ever reverting # Disable trade quest timers and prevent trade items from ever reverting
rom.write_byte(rom.sym('DISABLE_TIMERS'), 0x01) rom.write_byte(rom.sym('DISABLE_TIMERS'), 0x01)

24174
worlds/oot/data/generated/rom_patch.txt
View File

File diff suppressed because it is too large Load Diff

242
worlds/oot/data/generated/symbols.json
View File

@ -1,11 +1,11 @@
{ {
"ADULT_INIT_ITEMS": "03481D40", "ADULT_INIT_ITEMS": "03481D3C",
"ADULT_VALID_ITEMS": "03481D48", "ADULT_VALID_ITEMS": "03481D44",
"AP_PLAYER_NAME": "03480834", "AP_PLAYER_NAME": "03480834",
"AUDIO_THREAD_INFO": "03482FC0", "AUDIO_THREAD_INFO": "03482F98",
"AUDIO_THREAD_INFO_MEM_SIZE": "03482FDC", "AUDIO_THREAD_INFO_MEM_SIZE": "03482FB4",
"AUDIO_THREAD_INFO_MEM_START": "03482FD8", "AUDIO_THREAD_INFO_MEM_START": "03482FB0",
"AUDIO_THREAD_MEM_START": "0348EF80", "AUDIO_THREAD_MEM_START": "0348F310",
"BOMBCHUS_IN_LOGIC": "03480CBC", "BOMBCHUS_IN_LOGIC": "03480CBC",
"CFG_A_BUTTON_COLOR": "03480854", "CFG_A_BUTTON_COLOR": "03480854",
"CFG_A_NOTE_COLOR": "03480872", "CFG_A_NOTE_COLOR": "03480872",
@ -16,7 +16,7 @@
"CFG_B_BUTTON_COLOR": "0348085A", "CFG_B_BUTTON_COLOR": "0348085A",
"CFG_C_BUTTON_COLOR": "03480860", "CFG_C_BUTTON_COLOR": "03480860",
"CFG_C_NOTE_COLOR": "03480878", "CFG_C_NOTE_COLOR": "03480878",
"CFG_DAMAGE_MULTIPLYER": "03482CB0", "CFG_DAMAGE_MULTIPLYER": "03482C88",
"CFG_DISPLAY_DPAD": "0348088A", "CFG_DISPLAY_DPAD": "0348088A",
"CFG_HEART_COLOR": "0348084E", "CFG_HEART_COLOR": "0348084E",
"CFG_MAGIC_COLOR": "03480848", "CFG_MAGIC_COLOR": "03480848",
@ -36,149 +36,151 @@
"CFG_RAINBOW_SWORD_OUTER_ENABLED": "0348088C", "CFG_RAINBOW_SWORD_OUTER_ENABLED": "0348088C",
"CFG_SHOP_CURSOR_COLOR": "0348086C", "CFG_SHOP_CURSOR_COLOR": "0348086C",
"CFG_TEXT_CURSOR_COLOR": "03480866", "CFG_TEXT_CURSOR_COLOR": "03480866",
"CHAIN_HBA_REWARDS": "03483950", "CHAIN_HBA_REWARDS": "03483928",
"CHEST_SIZE_MATCH_CONTENTS": "034826F0", "CHEST_SIZE_MATCH_CONTENTS": "034826EC",
"COMPLETE_MASK_QUEST": "0348B201", "COMPLETE_MASK_QUEST": "0348B585",
"COOP_CONTEXT": "03480020", "COOP_CONTEXT": "03480020",
"COOP_VERSION": "03480020", "COOP_VERSION": "03480020",
"COSMETIC_CONTEXT": "03480844", "COSMETIC_CONTEXT": "03480844",
"COSMETIC_FORMAT_VERSION": "03480844", "COSMETIC_FORMAT_VERSION": "03480844",
"CURRENT_GROTTO_ID": "03482E82", "CURRENT_GROTTO_ID": "03482E5A",
"DEATH_LINK": "0348002A", "DEATH_LINK": "0348002A",
"DEBUG_OFFSET": "034828A0", "DEBUG_OFFSET": "03482878",
"DISABLE_TIMERS": "03480CDC", "DISABLE_TIMERS": "03480CDC",
"DPAD_TEXTURE": "0348D780", "DPAD_TEXTURE": "0348DB08",
"DUNGEONS_SHUFFLED": "03480CDE", "DUNGEONS_SHUFFLED": "03480CDD",
"EXTENDED_OBJECT_TABLE": "03480C9C", "EXTENDED_OBJECT_TABLE": "03480C9C",
"EXTERN_DAMAGE_MULTIPLYER": "03482CB1", "EXTERN_DAMAGE_MULTIPLYER": "03482C89",
"FAST_BUNNY_HOOD_ENABLED": "03480CE0", "FAST_BUNNY_HOOD_ENABLED": "03480CDF",
"FAST_CHESTS": "03480CD6", "FAST_CHESTS": "03480CD6",
"FONT_TEXTURE": "0348C2B8", "FONT_TEXTURE": "0348C640",
"FREE_SCARECROW_ENABLED": "03480CCC", "FREE_SCARECROW_ENABLED": "03480CCC",
"GET_CHEST_OVERRIDE_COLOR_WRAPPER": "03482720", "GANON_BOSS_KEY_CONDITION": "0348B550",
"GET_CHEST_OVERRIDE_SIZE_WRAPPER": "034826F4", "GANON_BOSS_KEY_CONDITION_COUNT": "0348B54E",
"GET_ITEM_TRIGGERED": "0348140C", "GET_CHEST_OVERRIDE_WRAPPER": "034826F0",
"GET_ITEM_TRIGGERED": "03481408",
"GOSSIP_HINT_CONDITION": "03480CC8", "GOSSIP_HINT_CONDITION": "03480CC8",
"GROTTO_EXIT_LIST": "03482E40", "GROTTO_EXIT_LIST": "03482E18",
"GROTTO_LOAD_TABLE": "03482DBC", "GROTTO_LOAD_TABLE": "03482D94",
"INCOMING_ITEM": "03480028", "INCOMING_ITEM": "03480028",
"INCOMING_PLAYER": "03480026", "INCOMING_PLAYER": "03480026",
"INITIAL_SAVE_DATA": "0348089C", "INITIAL_SAVE_DATA": "0348089C",
"JABU_ELEVATOR_ENABLE": "03480CD4", "JABU_ELEVATOR_ENABLE": "03480CD4",
"KAKARIKO_WEATHER_FORECAST": "0348B5A4",
"LACS_CONDITION": "03480CC4", "LACS_CONDITION": "03480CC4",
"LACS_CONDITION_COUNT": "03480CD2", "LACS_CONDITION_COUNT": "03480CD2",
"MALON_GAVE_ICETRAP": "0348368C", "MALON_GAVE_ICETRAP": "03483664",
"MALON_TEXT_ID": "03480CDB", "MALON_TEXT_ID": "03480CDB",
"MAX_RUPEES": "0348B203", "MAX_RUPEES": "0348B587",
"MOVED_ADULT_KING_ZORA": "03482FFC", "MOVED_ADULT_KING_ZORA": "03482FD4",
"NO_ESCAPE_SEQUENCE": "0348B1CC", "NO_ESCAPE_SEQUENCE": "0348B54C",
"NO_FOG_STATE": "03480CDD",
"OCARINAS_SHUFFLED": "03480CD5", "OCARINAS_SHUFFLED": "03480CD5",
"OPEN_KAKARIKO": "0348B202", "OPEN_KAKARIKO": "0348B586",
"OUTGOING_ITEM": "03480030", "OUTGOING_ITEM": "03480030",
"OUTGOING_KEY": "0348002C", "OUTGOING_KEY": "0348002C",
"OUTGOING_PLAYER": "03480032", "OUTGOING_PLAYER": "03480032",
"OVERWORLD_SHUFFLED": "03480CDF", "OVERWORLD_SHUFFLED": "03480CDE",
"PAYLOAD_END": "0348EF80", "PAYLOAD_END": "0348F310",
"PAYLOAD_START": "03480000", "PAYLOAD_START": "03480000",
"PLAYED_WARP_SONG": "03481210", "PLAYED_WARP_SONG": "0348120C",
"PLAYER_ID": "03480024", "PLAYER_ID": "03480024",
"PLAYER_NAMES": "03480034", "PLAYER_NAMES": "03480034",
"PLAYER_NAME_ID": "03480025", "PLAYER_NAME_ID": "03480025",
"RAINBOW_BRIDGE_CONDITION": "03480CC0", "RAINBOW_BRIDGE_CONDITION": "03480CC0",
"RAINBOW_BRIDGE_COUNT": "03480CD0", "RAINBOW_BRIDGE_COUNT": "03480CD0",
"RANDO_CONTEXT": "03480000", "RANDO_CONTEXT": "03480000",
"SHUFFLE_BEANS": "03482D18", "SHUFFLE_BEANS": "03482CF0",
"SHUFFLE_CARPET_SALESMAN": "03483A08", "SHUFFLE_CARPET_SALESMAN": "034839E0",
"SHUFFLE_COWS": "03480CD7", "SHUFFLE_COWS": "03480CD7",
"SHUFFLE_MEDIGORON": "03483A64", "SHUFFLE_MEDIGORON": "03483A3C",
"SONGS_AS_ITEMS": "03480CD8", "SONGS_AS_ITEMS": "03480CD8",
"SOS_ITEM_GIVEN": "034814D8", "SOS_ITEM_GIVEN": "034814D4",
"SPEED_MULTIPLIER": "03482760", "SPEED_MULTIPLIER": "03482738",
"START_TWINROVA_FIGHT": "0348307C", "START_TWINROVA_FIGHT": "03483054",
"TIME_TRAVEL_SAVED_EQUIPS": "03481A64", "TIME_TRAVEL_SAVED_EQUIPS": "03481A60",
"TRIFORCE_ICON_TEXTURE": "0348DF80", "TRIFORCE_ICON_TEXTURE": "0348E308",
"TWINROVA_ACTION_TIMER": "03483080", "TWINROVA_ACTION_TIMER": "03483058",
"WINDMILL_SONG_ID": "03480CD9", "WINDMILL_SONG_ID": "03480CD9",
"WINDMILL_TEXT_ID": "03480CDA", "WINDMILL_TEXT_ID": "03480CDA",
"a_button": "0348B190", "a_button": "0348B510",
"a_note_b": "0348B17C", "a_note_b": "0348B4FC",
"a_note_font_glow_base": "0348B164", "a_note_font_glow_base": "0348B4E4",
"a_note_font_glow_max": "0348B160", "a_note_font_glow_max": "0348B4E0",
"a_note_g": "0348B180", "a_note_g": "0348B500",
"a_note_glow_base": "0348B16C", "a_note_glow_base": "0348B4EC",
"a_note_glow_max": "0348B168", "a_note_glow_max": "0348B4E8",
"a_note_r": "0348B184", "a_note_r": "0348B504",
"active_item_action_id": "0348B1E4", "active_item_action_id": "0348B568",
"active_item_fast_chest": "0348B1D4", "active_item_fast_chest": "0348B558",
"active_item_graphic_id": "0348B1D8", "active_item_graphic_id": "0348B55C",
"active_item_object_id": "0348B1DC", "active_item_object_id": "0348B560",
"active_item_row": "0348B1E8", "active_item_row": "0348B56C",
"active_item_text_id": "0348B1E0", "active_item_text_id": "0348B564",
"active_override": "0348B1F0", "active_override": "0348B574",
"active_override_is_outgoing": "0348B1EC", "active_override_is_outgoing": "0348B570",
"b_button": "0348B18C", "b_button": "0348B50C",
"beating_dd": "0348B198", "beating_dd": "0348B518",
"beating_no_dd": "0348B1A0", "beating_no_dd": "0348B520",
"c_button": "0348B188", "c_button": "0348B508",
"c_note_b": "0348B170", "c_note_b": "0348B4F0",
"c_note_font_glow_base": "0348B154", "c_note_font_glow_base": "0348B4D4",
"c_note_font_glow_max": "0348B150", "c_note_font_glow_max": "0348B4D0",
"c_note_g": "0348B174", "c_note_g": "0348B4F4",
"c_note_glow_base": "0348B15C", "c_note_glow_base": "0348B4DC",
"c_note_glow_max": "0348B158", "c_note_glow_max": "0348B4D8",
"c_note_r": "0348B178", "c_note_r": "0348B4F8",
"cfg_dungeon_info_enable": "0348B11C", "cfg_dungeon_info_enable": "0348B49C",
"cfg_dungeon_info_mq_enable": "0348B1C0", "cfg_dungeon_info_mq_enable": "0348B540",
"cfg_dungeon_info_mq_need_map": "0348B1BC", "cfg_dungeon_info_mq_need_map": "0348B53C",
"cfg_dungeon_info_reward_enable": "0348B118", "cfg_dungeon_info_reward_enable": "0348B498",
"cfg_dungeon_info_reward_need_altar": "0348B1B4", "cfg_dungeon_info_reward_need_altar": "0348B534",
"cfg_dungeon_info_reward_need_compass": "0348B1B8", "cfg_dungeon_info_reward_need_compass": "0348B538",
"cfg_dungeon_is_mq": "0348B220", "cfg_dungeon_is_mq": "0348B5A8",
"cfg_dungeon_rewards": "03489F14", "cfg_dungeon_rewards": "0348A254",
"cfg_file_select_hash": "0348B1C8", "cfg_file_select_hash": "0348B548",
"cfg_item_overrides": "0348B274", "cfg_item_overrides": "0348B5FC",
"defaultDDHeart": "0348B1A4", "defaultDDHeart": "0348B524",
"defaultHeart": "0348B1AC", "defaultHeart": "0348B52C",
"dpad_sprite": "0348A088", "dpad_sprite": "0348A408",
"dummy_actor": "0348B1F8", "dummy_actor": "0348B57C",
"dungeon_count": "0348B120", "dungeon_count": "0348B4A0",
"dungeons": "03489F38", "dungeons": "0348A278",
"empty_dlist": "0348B138", "empty_dlist": "0348B4B8",
"extern_ctxt": "03489FD4", "extern_ctxt": "0348A314",
"font_sprite": "0348A098", "font_sprite": "0348A418",
"freecam_modes": "03489C90", "freecam_modes": "03489FD0",
"hash_sprites": "0348B12C", "hash_sprites": "0348B4AC",
"hash_symbols": "03489FE8", "hash_symbols": "0348A328",
"heap_next": "0348B21C", "heap_next": "0348B5A0",
"heart_sprite": "0348A028", "heart_sprite": "0348A3A8",
"icon_sprites": "03489E54", "icon_sprites": "0348A194",
"item_digit_sprite": "0348A048", "item_digit_sprite": "0348A3C8",
"item_overrides_count": "0348B1FC", "item_overrides_count": "0348B580",
"item_table": "0348A110", "item_table": "0348A490",
"items_sprite": "0348A0B8", "items_sprite": "0348A438",
"key_rupee_clock_sprite": "0348A058", "key_rupee_clock_sprite": "0348A3D8",
"last_fog_distance": "0348B124", "last_fog_distance": "0348B4A4",
"linkhead_skull_sprite": "0348A038", "linkhead_skull_sprite": "0348A3B8",
"medal_colors": "03489F24", "medal_colors": "0348A264",
"medals_sprite": "0348A0C8", "medals_sprite": "0348A448",
"normal_dd": "0348B194", "normal_dd": "0348B514",
"normal_no_dd": "0348B19C", "normal_no_dd": "0348B51C",
"object_slots": "0348C274", "num_to_bits": "0348A368",
"pending_freezes": "0348B200", "object_slots": "0348C5FC",
"pending_item_queue": "0348B25C", "pending_freezes": "0348B584",
"quest_items_sprite": "0348A0A8", "pending_item_queue": "0348B5E4",
"rupee_colors": "03489E60", "quest_items_sprite": "0348A428",
"satisified_pending_frames": "0348B1D0", "rupee_colors": "0348A1A0",
"scene_fog_distance": "0348B128", "satisified_pending_frames": "0348B554",
"setup_db": "0348A0E8", "scene_fog_distance": "0348B4A8",
"song_note_sprite": "0348A068", "setup_db": "0348A468",
"stones_sprite": "0348A0D8", "song_note_sprite": "0348A3E8",
"text_cursor_border_base": "0348B144", "stones_sprite": "0348A458",
"text_cursor_border_max": "0348B140", "text_cursor_border_base": "0348B4C4",
"text_cursor_inner_base": "0348B14C", "text_cursor_border_max": "0348B4C0",
"text_cursor_inner_max": "0348B148", "text_cursor_inner_base": "0348B4CC",
"triforce_hunt_enabled": "0348B210", "text_cursor_inner_max": "0348B4C8",
"triforce_pieces_requied": "0348B1B2", "triforce_hunt_enabled": "0348B594",
"triforce_sprite": "0348A078" "triforce_pieces_requied": "0348B532",
"triforce_sprite": "0348A3F8"
} }