correctly write memory address for Song from Composers Grave so it's always recognized by client

This commit is contained in:
espeon65536 2021-09-17 10:00:59 -05:00 committed by Fabian Dill
parent 4ea80f34fa
commit 895d259589
3 changed files with 11109 additions and 11105 deletions
worlds/oot

View File

@ -1332,9 +1332,9 @@ def patch_rom(world, rom):
# requiem of spirit
rom.write_int32s(0xAC9ABC, [0x3C010001, 0x00300821])
# sun song
rom.write_int32(0xE09F68, 0x8C6F00A4)
rom.write_int32(0xE09F74, 0x01CFC024)
rom.write_int32(0xE09FB0, 0x240F0001)
# rom.write_int32(0xE09F68, 0x8C6F00A4)
# rom.write_int32(0xE09F74, 0x01CFC024)
# rom.write_int32(0xE09FB0, 0x240F0001)
# song of time
rom.write_int32(0xDB532C, 0x24050003)

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,11 @@
{
"ADULT_INIT_ITEMS": "03481D2C",
"ADULT_VALID_ITEMS": "03481D34",
"ADULT_INIT_ITEMS": "03481D40",
"ADULT_VALID_ITEMS": "03481D48",
"AP_PLAYER_NAME": "03480834",
"AUDIO_THREAD_INFO": "03482FAC",
"AUDIO_THREAD_INFO_MEM_SIZE": "03482FCC",
"AUDIO_THREAD_INFO_MEM_START": "03482FC8",
"AUDIO_THREAD_MEM_START": "0348EF40",
"AUDIO_THREAD_INFO": "03482FC0",
"AUDIO_THREAD_INFO_MEM_SIZE": "03482FDC",
"AUDIO_THREAD_INFO_MEM_START": "03482FD8",
"AUDIO_THREAD_MEM_START": "0348EF50",
"BOMBCHUS_IN_LOGIC": "03480CBC",
"CFG_A_BUTTON_COLOR": "03480854",
"CFG_A_NOTE_COLOR": "03480872",
@ -16,7 +16,7 @@
"CFG_B_BUTTON_COLOR": "0348085A",
"CFG_C_BUTTON_COLOR": "03480860",
"CFG_C_NOTE_COLOR": "03480878",
"CFG_DAMAGE_MULTIPLYER": "03482C9C",
"CFG_DAMAGE_MULTIPLYER": "03482CB0",
"CFG_DISPLAY_DPAD": "0348088A",
"CFG_HEART_COLOR": "0348084E",
"CFG_MAGIC_COLOR": "03480848",
@ -36,148 +36,148 @@
"CFG_RAINBOW_SWORD_OUTER_ENABLED": "0348088C",
"CFG_SHOP_CURSOR_COLOR": "0348086C",
"CFG_TEXT_CURSOR_COLOR": "03480866",
"CHAIN_HBA_REWARDS": "03483940",
"CHEST_SIZE_MATCH_CONTENTS": "034826DC",
"COMPLETE_MASK_QUEST": "0348B1B9",
"CHAIN_HBA_REWARDS": "03483950",
"CHEST_SIZE_MATCH_CONTENTS": "034826F0",
"COMPLETE_MASK_QUEST": "0348B1C9",
"COOP_CONTEXT": "03480020",
"COOP_VERSION": "03480020",
"COSMETIC_CONTEXT": "03480844",
"COSMETIC_FORMAT_VERSION": "03480844",
"CURRENT_GROTTO_ID": "03482E6E",
"DEBUG_OFFSET": "0348288C",
"CURRENT_GROTTO_ID": "03482E82",
"DEBUG_OFFSET": "034828A0",
"DISABLE_TIMERS": "03480CDC",
"DPAD_TEXTURE": "0348D738",
"DPAD_TEXTURE": "0348D748",
"DUNGEONS_SHUFFLED": "03480CDE",
"EXTENDED_OBJECT_TABLE": "03480C9C",
"EXTERN_DAMAGE_MULTIPLYER": "03482C9D",
"EXTERN_DAMAGE_MULTIPLYER": "03482CB1",
"FAST_BUNNY_HOOD_ENABLED": "03480CE0",
"FAST_CHESTS": "03480CD6",
"FONT_TEXTURE": "0348C270",
"FONT_TEXTURE": "0348C280",
"FREE_SCARECROW_ENABLED": "03480CCC",
"GET_CHEST_OVERRIDE_COLOR_WRAPPER": "0348270C",
"GET_CHEST_OVERRIDE_SIZE_WRAPPER": "034826E0",
"GET_ITEM_TRIGGERED": "034813F8",
"GET_CHEST_OVERRIDE_COLOR_WRAPPER": "03482720",
"GET_CHEST_OVERRIDE_SIZE_WRAPPER": "034826F4",
"GET_ITEM_TRIGGERED": "0348140C",
"GOSSIP_HINT_CONDITION": "03480CC8",
"GROTTO_EXIT_LIST": "03482E2C",
"GROTTO_LOAD_TABLE": "03482DA8",
"GROTTO_EXIT_LIST": "03482E40",
"GROTTO_LOAD_TABLE": "03482DBC",
"INCOMING_ITEM": "03480028",
"INCOMING_PLAYER": "03480026",
"INITIAL_SAVE_DATA": "0348089C",
"JABU_ELEVATOR_ENABLE": "03480CD4",
"LACS_CONDITION": "03480CC4",
"LACS_CONDITION_COUNT": "03480CD2",
"MALON_GAVE_ICETRAP": "0348367C",
"MALON_GAVE_ICETRAP": "0348368C",
"MALON_TEXT_ID": "03480CDB",
"MAX_RUPEES": "0348B1BB",
"MOVED_ADULT_KING_ZORA": "03482FEC",
"NO_ESCAPE_SEQUENCE": "0348B184",
"MAX_RUPEES": "0348B1CB",
"MOVED_ADULT_KING_ZORA": "03482FFC",
"NO_ESCAPE_SEQUENCE": "0348B194",
"NO_FOG_STATE": "03480CDD",
"OCARINAS_SHUFFLED": "03480CD5",
"OPEN_KAKARIKO": "0348B1BA",
"OPEN_KAKARIKO": "0348B1CA",
"OUTGOING_ITEM": "03480030",
"OUTGOING_KEY": "0348002C",
"OUTGOING_PLAYER": "03480032",
"OVERWORLD_SHUFFLED": "03480CDF",
"PAYLOAD_END": "0348EF40",
"PAYLOAD_END": "0348EF50",
"PAYLOAD_START": "03480000",
"PLAYED_WARP_SONG": "034811FC",
"PLAYED_WARP_SONG": "03481210",
"PLAYER_ID": "03480024",
"PLAYER_NAMES": "03480034",
"PLAYER_NAME_ID": "03480025",
"RAINBOW_BRIDGE_CONDITION": "03480CC0",
"RAINBOW_BRIDGE_COUNT": "03480CD0",
"RANDO_CONTEXT": "03480000",
"SHUFFLE_BEANS": "03482D04",
"SHUFFLE_CARPET_SALESMAN": "034839F8",
"SHUFFLE_BEANS": "03482D18",
"SHUFFLE_CARPET_SALESMAN": "03483A08",
"SHUFFLE_COWS": "03480CD7",
"SHUFFLE_MEDIGORON": "03483A54",
"SHUFFLE_MEDIGORON": "03483A64",
"SONGS_AS_ITEMS": "03480CD8",
"SOS_ITEM_GIVEN": "034814C4",
"SPEED_MULTIPLIER": "0348274C",
"START_TWINROVA_FIGHT": "0348306C",
"TIME_TRAVEL_SAVED_EQUIPS": "03481A50",
"TRIFORCE_ICON_TEXTURE": "0348DF38",
"TWINROVA_ACTION_TIMER": "03483070",
"SOS_ITEM_GIVEN": "034814D8",
"SPEED_MULTIPLIER": "03482760",
"START_TWINROVA_FIGHT": "0348307C",
"TIME_TRAVEL_SAVED_EQUIPS": "03481A64",
"TRIFORCE_ICON_TEXTURE": "0348DF48",
"TWINROVA_ACTION_TIMER": "03483080",
"WINDMILL_SONG_ID": "03480CD9",
"WINDMILL_TEXT_ID": "03480CDA",
"a_button": "0348B148",
"a_note_b": "0348B134",
"a_note_font_glow_base": "0348B11C",
"a_note_font_glow_max": "0348B118",
"a_note_g": "0348B138",
"a_note_glow_base": "0348B124",
"a_note_glow_max": "0348B120",
"a_note_r": "0348B13C",
"active_item_action_id": "0348B19C",
"active_item_fast_chest": "0348B18C",
"active_item_graphic_id": "0348B190",
"active_item_object_id": "0348B194",
"active_item_row": "0348B1A0",
"active_item_text_id": "0348B198",
"active_override": "0348B1A8",
"active_override_is_outgoing": "0348B1A4",
"b_button": "0348B144",
"beating_dd": "0348B150",
"beating_no_dd": "0348B158",
"c_button": "0348B140",
"c_note_b": "0348B128",
"c_note_font_glow_base": "0348B10C",
"c_note_font_glow_max": "0348B108",
"c_note_g": "0348B12C",
"c_note_glow_base": "0348B114",
"c_note_glow_max": "0348B110",
"c_note_r": "0348B130",
"cfg_dungeon_info_enable": "0348B0D4",
"cfg_dungeon_info_mq_enable": "0348B178",
"cfg_dungeon_info_mq_need_map": "0348B174",
"cfg_dungeon_info_reward_enable": "0348B0D0",
"cfg_dungeon_info_reward_need_altar": "0348B16C",
"cfg_dungeon_info_reward_need_compass": "0348B170",
"cfg_dungeon_is_mq": "0348B1D8",
"cfg_dungeon_rewards": "03489ECC",
"cfg_file_select_hash": "0348B180",
"cfg_item_overrides": "0348B22C",
"defaultDDHeart": "0348B15C",
"defaultHeart": "0348B164",
"dpad_sprite": "0348A040",
"dummy_actor": "0348B1B0",
"dungeon_count": "0348B0D8",
"dungeons": "03489EF0",
"empty_dlist": "0348B0F0",
"extern_ctxt": "03489F8C",
"font_sprite": "0348A050",
"freecam_modes": "03489C4C",
"hash_sprites": "0348B0E4",
"hash_symbols": "03489FA0",
"heap_next": "0348B1D4",
"heart_sprite": "03489FE0",
"icon_sprites": "03489E10",
"item_digit_sprite": "0348A000",
"item_overrides_count": "0348B1B4",
"item_table": "0348A0C8",
"items_sprite": "0348A070",
"key_rupee_clock_sprite": "0348A010",
"last_fog_distance": "0348B0DC",
"linkhead_skull_sprite": "03489FF0",
"medal_colors": "03489EDC",
"medals_sprite": "0348A080",
"normal_dd": "0348B14C",
"normal_no_dd": "0348B154",
"object_slots": "0348C22C",
"pending_freezes": "0348B1B8",
"pending_item_queue": "0348B214",
"quest_items_sprite": "0348A060",
"rupee_colors": "03489E1C",
"satisified_pending_frames": "0348B188",
"scene_fog_distance": "0348B0E0",
"setup_db": "0348A0A0",
"song_note_sprite": "0348A020",
"stones_sprite": "0348A090",
"text_cursor_border_base": "0348B0FC",
"text_cursor_border_max": "0348B0F8",
"text_cursor_inner_base": "0348B104",
"text_cursor_inner_max": "0348B100",
"triforce_hunt_enabled": "0348B1C8",
"triforce_pieces_requied": "0348B16A",
"triforce_sprite": "0348A030"
"a_button": "0348B158",
"a_note_b": "0348B144",
"a_note_font_glow_base": "0348B12C",
"a_note_font_glow_max": "0348B128",
"a_note_g": "0348B148",
"a_note_glow_base": "0348B134",
"a_note_glow_max": "0348B130",
"a_note_r": "0348B14C",
"active_item_action_id": "0348B1AC",
"active_item_fast_chest": "0348B19C",
"active_item_graphic_id": "0348B1A0",
"active_item_object_id": "0348B1A4",
"active_item_row": "0348B1B0",
"active_item_text_id": "0348B1A8",
"active_override": "0348B1B8",
"active_override_is_outgoing": "0348B1B4",
"b_button": "0348B154",
"beating_dd": "0348B160",
"beating_no_dd": "0348B168",
"c_button": "0348B150",
"c_note_b": "0348B138",
"c_note_font_glow_base": "0348B11C",
"c_note_font_glow_max": "0348B118",
"c_note_g": "0348B13C",
"c_note_glow_base": "0348B124",
"c_note_glow_max": "0348B120",
"c_note_r": "0348B140",
"cfg_dungeon_info_enable": "0348B0E4",
"cfg_dungeon_info_mq_enable": "0348B188",
"cfg_dungeon_info_mq_need_map": "0348B184",
"cfg_dungeon_info_reward_enable": "0348B0E0",
"cfg_dungeon_info_reward_need_altar": "0348B17C",
"cfg_dungeon_info_reward_need_compass": "0348B180",
"cfg_dungeon_is_mq": "0348B1E8",
"cfg_dungeon_rewards": "03489EDC",
"cfg_file_select_hash": "0348B190",
"cfg_item_overrides": "0348B23C",
"defaultDDHeart": "0348B16C",
"defaultHeart": "0348B174",
"dpad_sprite": "0348A050",
"dummy_actor": "0348B1C0",
"dungeon_count": "0348B0E8",
"dungeons": "03489F00",
"empty_dlist": "0348B100",
"extern_ctxt": "03489F9C",
"font_sprite": "0348A060",
"freecam_modes": "03489C5C",
"hash_sprites": "0348B0F4",
"hash_symbols": "03489FB0",
"heap_next": "0348B1E4",
"heart_sprite": "03489FF0",
"icon_sprites": "03489E20",
"item_digit_sprite": "0348A010",
"item_overrides_count": "0348B1C4",
"item_table": "0348A0D8",
"items_sprite": "0348A080",
"key_rupee_clock_sprite": "0348A020",
"last_fog_distance": "0348B0EC",
"linkhead_skull_sprite": "0348A000",
"medal_colors": "03489EEC",
"medals_sprite": "0348A090",
"normal_dd": "0348B15C",
"normal_no_dd": "0348B164",
"object_slots": "0348C23C",
"pending_freezes": "0348B1C8",
"pending_item_queue": "0348B224",
"quest_items_sprite": "0348A070",
"rupee_colors": "03489E2C",
"satisified_pending_frames": "0348B198",
"scene_fog_distance": "0348B0F0",
"setup_db": "0348A0B0",
"song_note_sprite": "0348A030",
"stones_sprite": "0348A0A0",
"text_cursor_border_base": "0348B10C",
"text_cursor_border_max": "0348B108",
"text_cursor_inner_base": "0348B114",
"text_cursor_inner_max": "0348B110",
"triforce_hunt_enabled": "0348B1D8",
"triforce_pieces_requied": "0348B17A",
"triforce_sprite": "0348A040"
}