diff --git a/asm/custom_symbols.yaml b/asm/custom_symbols.yaml
index 15b105f9..43f9c621 100644
--- a/asm/custom_symbols.yaml
+++ b/asm/custom_symbols.yaml
@@ -1,186 +1,187 @@
-beedle_dont_buy_blue_chu: 0x28F9AD4
-big_key_label_safestring: 0x28FA9BC
-big_key_label_str: 0x28FA9A8
-boat_spawn_fallback_check: 0x28F9DD0
-camera_preference: 0x28F8D56
-cap_file_restore_health: 0x28FA820
-cap_game_over_restore_health: 0x28FA838
-check_animate_rainbow_rupee_color: 0x28FA850
-check_barrier_triforce_requirement: 0x28F9D64
-check_buying_beedle_20_item: 0x28F9EA4
-check_can_defend: 0x28F9CAC
-check_entering_door10_forwards: 0x28F9A24
-check_entering_door12_forwards: 0x28F9A3C
-check_ganons_tower_chest_opened: 0x28FA024
-check_give_additional_figurines: 0x28FA3D8
-check_has_next_hint_message: 0x28F9E08
-check_hyrule_warp_unlocked: 0x28FACD0
-check_if_ganondorf: 0x28F9CF4
-check_if_inside_warp: 0x28F9D1C
-check_leaving_cabana: 0x28F9A54
-check_low_health_full: 0x28FADAC
-check_outset_bgm: 0x28FAA00
-check_phantom_ganons_sword_should_disappear: 0x28FA04C
-check_play_special_item_get_music: 0x28FA294
-check_player_in_casual_clothes: 0x28FA9C4
-check_run_new_text_commands: 0x28FA8A4
-check_shop_item_in_bait_bag_slot_sold_out: 0x28F9E74
-check_should_decrement_morth_counter: 0x28F9D88
-check_tingle_statue_owned: 0x28F9964
-convert_progressive_item_id: 0x28F8D8C
-convert_progressive_item_id_for_createDemoItem: 0x28FA6EC
-convert_progressive_item_id_for_dProcGetItem_init_1: 0x28FA744
-convert_progressive_item_id_for_dProcGetItem_init_2: 0x28FA774
-convert_progressive_item_id_for_daItem_create: 0x28FA718
-convert_progressive_item_id_for_shop_item: 0x28FA79C
-create_item_and_set_event_bit_for_townsperson: 0x28FA0AC
-create_item_for_withered_trees_without_setting_speeds: 0x28F9F20
-create_pot_item: 0x28FA358
-create_stone_head_item: 0x28FA3A4
-custom_crawl_check: 0x28F9DA0
-custom_createItem: 0x28F93C4
-custom_createItem_return_check: 0x28F9EF4
-custom_damage_multiplier: 0x28FAB04
-custom_ff_label: 0x28FABEC
-custom_ff_label_safestring: 0x28FABF4
-custom_getSelectItemNo_progressive: 0x28FA7C4
-custom_isTbox_for_unloaded_stage_save_info: 0x28F99F0
-custom_l_objectName: 0x28FAC28
-custom_searchName_loop_check: 0x28FAC34
-custom_warp_button_name: 0x28FABB4
-custom_warp_button_safestring: 0x28FABC4
-custom_warp_pot_env_color: 0x28FAAF0
-custom_warp_pot_prm_color: 0x28FAAEC
-daSwOp_Create: 0x28FADF4
-daSwOp_Delete: 0x28FAEF4
-daSwOp_Draw: 0x28FAEFC
-daSwOp_Execute: 0x28FB2C0
-daSwOp_IsDelete: 0x28FAEEC
-daSwOp__conditionMetCheck: 0x28FB080
-daSwOp__conditionUnmetCheck: 0x28FB26C
-daSwOp__eventEndCheck: 0x28FAF04
-daSwOp__eventStartCheck: 0x28FB1D0
-daSwOp__isCondition: 0x28FAF74
-daSwOp__timerCountdown: 0x28FB11C
-dampa_minigame_item_id: 0x28FA120
-default_molgera_xz_pos: 0x28F9D14
-doc_bandam_blue_potion_slot_item_id: 0x28FA355
-doc_bandam_check_new_potion_and_give_free_item: 0x28FA2F8
-doc_bandam_green_potion_slot_item_id: 0x28FA354
-dragon_tingle_statue_item_get_func: 0x28F9874
-drc_big_key_item_get_func: 0x28F95CC
-drc_compass_item_get_func: 0x28F9784
-drc_dungeon_map_item_get_func: 0x28F9694
-drc_small_key_item_get_func: 0x28F9518
-earth_tingle_statue_item_get_func: 0x28F9904
-et_big_key_item_get_func: 0x28F9644
-et_compass_item_get_func: 0x28F9824
-et_dungeon_map_item_get_func: 0x28F9734
-et_small_key_item_get_func: 0x28F9584
-exec_curr_num_keys_text_command: 0x28FA8D0
-execute_switch_cases_start: 0x28FB2F0
-ff_compass_item_get_func: 0x28F97FC
-ff_dungeon_map_item_get_func: 0x28F970C
-ff_warp_text_check: 0x28FAC10
-first_person_camera_preference: 0x28F8D57
-forbidden_tingle_statue_item_get_func: 0x28F98A4
-force_map_reload: 0x28F9DE8
-fully_refill_magic_meter_on_load_save: 0x28FA804
-fw_big_key_item_get_func: 0x28F95F4
-fw_compass_item_get_func: 0x28F97AC
-fw_dungeon_map_item_get_func: 0x28F96BC
-fw_small_key_item_get_func: 0x28F953C
-g_profile_SwitchOperator: 0x28FB364
-ganondorf_health_check: 0x28F9CDC
-generic_on_dungeon_bit: 0x28F9410
-generic_small_key_item_get_func: 0x28F9478
-get_num_owned_tingle_statues: 0x28FAA28
-give_pearl_and_raise_totg_if_necessary: 0x28FAD10
-give_temporary_sword_during_ganondorf_fight_in_swordless: 0x28FB394
-give_temporary_sword_in_orcas_house_in_swordless: 0x28FB3E8
-goddess_tingle_statue_item_get_func: 0x28F98D4
-gyroscope_preference: 0x28F8D58
-hookshot_sight_failsafe_check: 0x28F9A9C
-hurricane_spin_item_func: 0x28F9394
-increment_custom_loop_counter: 0x28FAC64
-init_extra_button_location: 0x28FAB08
-init_extra_connections: 0x28FAB1C
+beedle_dont_buy_blue_chu: 0x28F9AE4
+big_key_label_safestring: 0x28FA9CC
+big_key_label_str: 0x28FA9B8
+boat_spawn_fallback_check: 0x28F9DE0
+camera_preference: 0x28F8D66
+cap_file_restore_health: 0x28FA830
+cap_game_over_restore_health: 0x28FA848
+check_animate_rainbow_rupee_color: 0x28FA860
+check_barrier_triforce_requirement: 0x28F9D74
+check_buying_beedle_20_item: 0x28F9EB4
+check_can_defend: 0x28F9CBC
+check_entering_door10_forwards: 0x28F9A34
+check_entering_door12_forwards: 0x28F9A4C
+check_ganons_tower_chest_opened: 0x28FA034
+check_give_additional_figurines: 0x28FA3E8
+check_has_next_hint_message: 0x28F9E18
+check_hyrule_warp_unlocked: 0x28FACE0
+check_if_ganondorf: 0x28F9D04
+check_if_inside_warp: 0x28F9D2C
+check_leaving_cabana: 0x28F9A64
+check_low_health_full: 0x28FADBC
+check_outset_bgm: 0x28FAA10
+check_phantom_ganons_sword_should_disappear: 0x28FA05C
+check_play_special_item_get_music: 0x28FA2A4
+check_player_in_casual_clothes: 0x28FA9D4
+check_run_new_text_commands: 0x28FA8B4
+check_shop_item_in_bait_bag_slot_sold_out: 0x28F9E84
+check_should_decrement_morth_counter: 0x28F9D98
+check_tingle_statue_owned: 0x28F9974
+convert_progressive_item_id: 0x28F8D9C
+convert_progressive_item_id_for_createDemoItem: 0x28FA6FC
+convert_progressive_item_id_for_dProcGetItem_init_1: 0x28FA754
+convert_progressive_item_id_for_dProcGetItem_init_2: 0x28FA784
+convert_progressive_item_id_for_daItem_create: 0x28FA728
+convert_progressive_item_id_for_shop_item: 0x28FA7AC
+create_item_and_set_event_bit_for_townsperson: 0x28FA0BC
+create_item_for_withered_trees_without_setting_speeds: 0x28F9F30
+create_pot_item: 0x28FA368
+create_stone_head_item: 0x28FA3B4
+custom_crawl_check: 0x28F9DB0
+custom_createItem: 0x28F93D4
+custom_createItem_return_check: 0x28F9F04
+custom_damage_multiplier: 0x28FAB14
+custom_ff_label: 0x28FABFC
+custom_ff_label_safestring: 0x28FAC04
+custom_getSelectItemNo_progressive: 0x28FA7D4
+custom_isTbox_for_unloaded_stage_save_info: 0x28F9A00
+custom_l_objectName: 0x28FAC38
+custom_searchName_loop_check: 0x28FAC44
+custom_warp_button_name: 0x28FABC4
+custom_warp_button_safestring: 0x28FABD4
+custom_warp_pot_env_color: 0x28FAB00
+custom_warp_pot_prm_color: 0x28FAAFC
+daSwOp_Create: 0x28FAE04
+daSwOp_Delete: 0x28FAF04
+daSwOp_Draw: 0x28FAF0C
+daSwOp_Execute: 0x28FB2D0
+daSwOp_IsDelete: 0x28FAEFC
+daSwOp__conditionMetCheck: 0x28FB090
+daSwOp__conditionUnmetCheck: 0x28FB27C
+daSwOp__eventEndCheck: 0x28FAF14
+daSwOp__eventStartCheck: 0x28FB1E0
+daSwOp__isCondition: 0x28FAF84
+daSwOp__timerCountdown: 0x28FB12C
+dampa_minigame_item_id: 0x28FA130
+default_molgera_xz_pos: 0x28F9D24
+doc_bandam_blue_potion_slot_item_id: 0x28FA365
+doc_bandam_check_new_potion_and_give_free_item: 0x28FA308
+doc_bandam_green_potion_slot_item_id: 0x28FA364
+dragon_tingle_statue_item_get_func: 0x28F9884
+drc_big_key_item_get_func: 0x28F95DC
+drc_compass_item_get_func: 0x28F9794
+drc_dungeon_map_item_get_func: 0x28F96A4
+drc_small_key_item_get_func: 0x28F9528
+earth_tingle_statue_item_get_func: 0x28F9914
+et_big_key_item_get_func: 0x28F9654
+et_compass_item_get_func: 0x28F9834
+et_dungeon_map_item_get_func: 0x28F9744
+et_small_key_item_get_func: 0x28F9594
+exec_curr_num_keys_text_command: 0x28FA8E0
+execute_switch_cases_start: 0x28FB300
+ff_compass_item_get_func: 0x28F980C
+ff_dungeon_map_item_get_func: 0x28F971C
+ff_warp_text_check: 0x28FAC20
+first_person_camera_preference: 0x28F8D67
+forbidden_tingle_statue_item_get_func: 0x28F98B4
+force_map_reload: 0x28F9DF8
+fully_refill_magic_meter_on_load_save: 0x28FA814
+fw_big_key_item_get_func: 0x28F9604
+fw_compass_item_get_func: 0x28F97BC
+fw_dungeon_map_item_get_func: 0x28F96CC
+fw_small_key_item_get_func: 0x28F954C
+g_profile_SwitchOperator: 0x28FB374
+ganondorf_health_check: 0x28F9CEC
+generic_on_dungeon_bit: 0x28F9420
+generic_small_key_item_get_func: 0x28F9488
+get_num_owned_tingle_statues: 0x28FAA38
+give_pearl_and_raise_totg_if_necessary: 0x28FAD20
+give_temporary_sword_during_ganondorf_fight_in_swordless: 0x28FB3A4
+give_temporary_sword_in_orcas_house_in_swordless: 0x28FB3F8
+goddess_tingle_statue_item_get_func: 0x28F98E4
+gyroscope_preference: 0x28F8D68
+hookshot_sight_failsafe_check: 0x28F9AAC
+hurricane_spin_item_func: 0x28F93A4
+increment_custom_loop_counter: 0x28FAC74
+init_extra_button_location: 0x28FAB18
+init_extra_connections: 0x28FAB2C
init_save_with_tweaks: 0x28F87F4
-init_starting_gear: 0x28F8C04
-initialize_actor_id: 0x28F9F10
-isEventBit_wrapper: 0x28F8D5C
-l_daSwOp_Method: 0x28FB344
-last_korl_hint_message_number: 0x28F9E04
-lenzo_set_deluxe_picto_box_event_bit: 0x28FA124
-load_extra_button_part: 0x28FABCC
-maggie_give_item_and_set_event_bit: 0x28FA1FC
-magtail_respawn_when_head_light_arrowed: 0x28F9C34
-makar_possible_wt_spawn_positions: 0x28FA51C
-medli_possible_et_spawn_positions: 0x28FA618
-miniblin_set_death_switch_when_light_arrowed: 0x28F9B34
-molgera_warp_radius: 0x28F9D10
-multiply_damage: 0x28FAAF4
-no_big_key_label_safestring: 0x28FA9B4
-no_big_key_label_str: 0x28FA99C
-normal_magic_meter_item_func: 0x28F9368
-orca_counter_failsafe: 0x28F9AB8
-outset_pig_color: 0x28F8D54
-phantom_ganon_check_link_within_y_diff: 0x28F9C74
-phantom_ganon_maze_stage_name: 0x28FA0A4
-poe_fix_light_arrows_bug: 0x28F9B68
-progressive_bomb_bag_item_func: 0x28F91E8
-progressive_bow_item_func: 0x28F9150
-progressive_magic_always_double: 0x28F8D53
-progressive_magic_meter_item_func: 0x28F9308
-progressive_picto_box_item_func: 0x28F9270
-progressive_quiver_item_func: 0x28F922C
-progressive_sail_item_func: 0x28F92BC
-progressive_shield_item_func: 0x28F9104
-progressive_sword_item_func: 0x28F9098
-progressive_wallet_item_func: 0x28F91AC
-rainbow_rupee_data: 0x28FA898
-read_custom_l_objectName_loop_for_dStage_getName: 0x28FAC70
-remove_low_health_anim_at_full_health: 0x28FADCC
-remove_temporary_sword_when_loading_stage_in_swordless: 0x28FB448
-reset_makar_position_to_start_of_dungeon: 0x28FA490
-reset_medli_position_to_start_of_dungeon: 0x28FA58C
-rito_cafe_postman_start_event_and_set_event_bit: 0x28FA240
-salvage_corp_give_item_and_set_event_bit: 0x28FA1B8
-set_dampa_event_bit: 0x28FA0FC
-set_env_color_for_warp_pot_particles: 0x28FAAC4
-set_ff_warp_msg_index: 0x28FABFC
-set_inactive_servant_when_player_leaves_room: 0x28FA688
-set_item_obtained_from_totg_tablet_event_bit: 0x28FA6AC
-set_prm_color_for_warp_pot_particles: 0x28FAA9C
-set_return_place_as_last_visited_ocean_sector: 0x28F9A84
-set_shop_item_in_bait_bag_slot_sold_out: 0x28F9E40
-set_starting_health: 0x28FA7E8
-set_up_custom_loop_counter: 0x28FAC58
-should_start_with_heros_clothes: 0x28F8C4C
-skip_rematch_bosses: 0x28F8C4E
-spawn_drc_shortcut_warp: 0x28FAC98
-stalfos_kill_lower_body_when_upper_body_light_arrowed: 0x28F9AEC
-starting_gear: 0x28F8C4F
-starting_magic: 0x28F8D52
-starting_quarter_hearts: 0x28F8D50
-stop_sub_bgm_when_unloading_stage: 0x28F9C90
-swordless: 0x28F8C4D
-tag_photo_check_lenzo_flag_order: 0x28FA6C8
-target_type_preference: 0x28F8D55
-totg_big_key_item_get_func: 0x28F961C
-totg_compass_item_get_func: 0x28F97D4
-totg_dungeon_map_item_get_func: 0x28F96E4
-totg_small_key_item_get_func: 0x28F9560
-ui_display_preference: 0x28F8D59
-use_different_korl_hyrule_text: 0x28F9E3C
-wind_tingle_statue_item_get_func: 0x28F9934
-withered_tree_item_speeds: 0x28FA018
-withered_tree_item_try_give_momentum: 0x28F9F4C
-wt_big_key_item_get_func: 0x28F966C
-wt_compass_item_get_func: 0x28F984C
-wt_dungeon_map_item_get_func: 0x28F975C
-wt_small_key_item_get_func: 0x28F95A8
-zero_out_arrow_on_hit_callback: 0x28F9C9C
-zunari_give_item_and_set_magic_armor_event_bit: 0x28FA158
-zunari_magic_armor_slot_item_id: 0x28FA1B4
+init_starting_gear: 0x28F8C14
+initialize_actor_id: 0x28F9F20
+isEventBit_wrapper: 0x28F8D6C
+l_daSwOp_Method: 0x28FB354
+last_korl_hint_message_number: 0x28F9E14
+lenzo_set_deluxe_picto_box_event_bit: 0x28FA134
+load_extra_button_part: 0x28FABDC
+maggie_give_item_and_set_event_bit: 0x28FA20C
+magtail_respawn_when_head_light_arrowed: 0x28F9C44
+makar_possible_wt_spawn_positions: 0x28FA52C
+medli_possible_et_spawn_positions: 0x28FA628
+miniblin_set_death_switch_when_light_arrowed: 0x28F9B44
+molgera_warp_radius: 0x28F9D20
+multiply_damage: 0x28FAB04
+no_big_key_label_safestring: 0x28FA9C4
+no_big_key_label_str: 0x28FA9AC
+normal_magic_meter_item_func: 0x28F9378
+open_drc: 0x28F8D6A
+orca_counter_failsafe: 0x28F9AC8
+outset_pig_color: 0x28F8D64
+phantom_ganon_check_link_within_y_diff: 0x28F9C84
+phantom_ganon_maze_stage_name: 0x28FA0B4
+poe_fix_light_arrows_bug: 0x28F9B78
+progressive_bomb_bag_item_func: 0x28F91F8
+progressive_bow_item_func: 0x28F9160
+progressive_magic_always_double: 0x28F8D63
+progressive_magic_meter_item_func: 0x28F9318
+progressive_picto_box_item_func: 0x28F9280
+progressive_quiver_item_func: 0x28F923C
+progressive_sail_item_func: 0x28F92CC
+progressive_shield_item_func: 0x28F9114
+progressive_sword_item_func: 0x28F90A8
+progressive_wallet_item_func: 0x28F91BC
+rainbow_rupee_data: 0x28FA8A8
+read_custom_l_objectName_loop_for_dStage_getName: 0x28FAC80
+remove_low_health_anim_at_full_health: 0x28FADDC
+remove_temporary_sword_when_loading_stage_in_swordless: 0x28FB458
+reset_makar_position_to_start_of_dungeon: 0x28FA4A0
+reset_medli_position_to_start_of_dungeon: 0x28FA59C
+rito_cafe_postman_start_event_and_set_event_bit: 0x28FA250
+salvage_corp_give_item_and_set_event_bit: 0x28FA1C8
+set_dampa_event_bit: 0x28FA10C
+set_env_color_for_warp_pot_particles: 0x28FAAD4
+set_ff_warp_msg_index: 0x28FAC0C
+set_inactive_servant_when_player_leaves_room: 0x28FA698
+set_item_obtained_from_totg_tablet_event_bit: 0x28FA6BC
+set_prm_color_for_warp_pot_particles: 0x28FAAAC
+set_return_place_as_last_visited_ocean_sector: 0x28F9A94
+set_shop_item_in_bait_bag_slot_sold_out: 0x28F9E50
+set_starting_health: 0x28FA7F8
+set_up_custom_loop_counter: 0x28FAC68
+should_start_with_heros_clothes: 0x28F8C5C
+skip_rematch_bosses: 0x28F8C5E
+spawn_drc_shortcut_warp: 0x28FACA8
+stalfos_kill_lower_body_when_upper_body_light_arrowed: 0x28F9AFC
+starting_gear: 0x28F8C5F
+starting_magic: 0x28F8D62
+starting_quarter_hearts: 0x28F8D60
+stop_sub_bgm_when_unloading_stage: 0x28F9CA0
+swordless: 0x28F8C5D
+tag_photo_check_lenzo_flag_order: 0x28FA6D8
+target_type_preference: 0x28F8D65
+totg_big_key_item_get_func: 0x28F962C
+totg_compass_item_get_func: 0x28F97E4
+totg_dungeon_map_item_get_func: 0x28F96F4
+totg_small_key_item_get_func: 0x28F9570
+ui_display_preference: 0x28F8D69
+use_different_korl_hyrule_text: 0x28F9E4C
+wind_tingle_statue_item_get_func: 0x28F9944
+withered_tree_item_speeds: 0x28FA028
+withered_tree_item_try_give_momentum: 0x28F9F5C
+wt_big_key_item_get_func: 0x28F967C
+wt_compass_item_get_func: 0x28F985C
+wt_dungeon_map_item_get_func: 0x28F976C
+wt_small_key_item_get_func: 0x28F95B8
+zero_out_arrow_on_hit_callback: 0x28F9CAC
+zunari_give_item_and_set_magic_armor_event_bit: 0x28FA168
+zunari_magic_armor_slot_item_id: 0x28FA1C4
diff --git a/asm/patch_diffs/custom_funcs_diff.yaml b/asm/patch_diffs/custom_funcs_diff.yaml
index 6c380d47..0aff9d02 100644
--- a/asm/patch_diffs/custom_funcs_diff.yaml
+++ b/asm/patch_diffs/custom_funcs_diff.yaml
@@ -1,7 +1,7 @@
Data:
0x28F87F4: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x4B, 0xC5, 0x59, 0x19, 0x4B, 0xC5, 0x6D, 0x55, 0x48, 0x00, 0x0A, 0xB5, 0x3C,
- 0xA0, 0x02, 0x90, 0x38, 0xA5, 0x8C, 0x4D, 0x88, 0xA5, 0x00, 0x00, 0x2C, 0x05,
+ 0x4B, 0xC5, 0x59, 0x19, 0x4B, 0xC5, 0x6D, 0x55, 0x48, 0x00, 0x0A, 0xC5, 0x3C,
+ 0xA0, 0x02, 0x90, 0x38, 0xA5, 0x8C, 0x5D, 0x88, 0xA5, 0x00, 0x00, 0x2C, 0x05,
0x00, 0x01, 0x41, 0x82, 0x00, 0x08, 0x48, 0x00, 0x00, 0x20, 0x3C, 0x60, 0x10,
0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80, 0x2C, 0x02,
0x4B, 0xCC, 0x03, 0x35, 0x38, 0x80, 0x3B, 0x08, 0x4B, 0xCC, 0x03, 0x2D, 0x4B,
@@ -9,10 +9,10 @@ Data:
0x00, 0x89, 0x38, 0x80, 0x00, 0x1E, 0x98, 0x83, 0x00, 0x00, 0x98, 0x83, 0x00,
0x01, 0x98, 0x83, 0x00, 0x06, 0x98, 0x83, 0x00, 0x07, 0x3C, 0x60, 0x10, 0x20,
0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x33, 0x3C, 0x80, 0x02, 0x90, 0x38,
- 0x84, 0x8D, 0x52, 0x88, 0x84, 0x00, 0x00, 0x98, 0x83, 0x00, 0x00, 0x98, 0x83,
- 0x00, 0x01, 0x48, 0x00, 0x03, 0x81, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84,
+ 0x84, 0x8D, 0x62, 0x88, 0x84, 0x00, 0x00, 0x98, 0x83, 0x00, 0x00, 0x98, 0x83,
+ 0x00, 0x01, 0x48, 0x00, 0x03, 0x91, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84,
0xDC, 0x38, 0x63, 0x06, 0x44, 0x3C, 0x80, 0x00, 0x01, 0x38, 0x84, 0xBF, 0xFF,
- 0x3C, 0xA0, 0x02, 0x90, 0x38, 0xA5, 0x8D, 0x54, 0x88, 0xA5, 0x00, 0x00, 0x4B,
+ 0x3C, 0xA0, 0x02, 0x90, 0x38, 0xA5, 0x8D, 0x64, 0x88, 0xA5, 0x00, 0x00, 0x4B,
0xCC, 0x02, 0x4D, 0x38, 0x80, 0x35, 0x10, 0x4B, 0xCC, 0x02, 0xB9, 0x38, 0x80,
0x2A, 0x80, 0x4B, 0xCC, 0x02, 0xB1, 0x38, 0x80, 0x02, 0x80, 0x4B, 0xCC, 0x02,
0xA9, 0x38, 0x80, 0x05, 0x20, 0x4B, 0xCC, 0x02, 0xA1, 0x38, 0x80, 0x2E, 0x01,
@@ -41,51 +41,52 @@ Data:
0x40, 0x02, 0x4B, 0xCC, 0x01, 0x79, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84,
0xDC, 0x38, 0x63, 0x11, 0x78, 0x38, 0x80, 0x03, 0x10, 0x4B, 0xCC, 0x01, 0x65,
0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x05, 0x2C, 0x3C,
- 0x80, 0x40, 0x18, 0x38, 0x84, 0x03, 0x8B, 0x90, 0x83, 0x00, 0x04, 0x3C, 0x80,
- 0xC0, 0x00, 0x90, 0x83, 0x00, 0x08, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84,
- 0xDC, 0x38, 0x63, 0x03, 0xA0, 0x3C, 0x80, 0x02, 0x00, 0x90, 0x83, 0x00, 0x04,
- 0x3C, 0x80, 0x80, 0x00, 0x90, 0x83, 0x00, 0x08, 0x3C, 0x80, 0x41, 0x01, 0x38,
- 0x84, 0x00, 0x80, 0x90, 0x83, 0x00, 0x0C, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63,
- 0x84, 0xDC, 0x38, 0x63, 0x04, 0x0C, 0x3C, 0x80, 0x00, 0x10, 0x60, 0x84, 0x02,
- 0x00, 0x90, 0x83, 0x00, 0x04, 0x38, 0x80, 0x00, 0x02, 0x90, 0x83, 0x00, 0x08,
- 0x38, 0x80, 0x00, 0x40, 0x90, 0x83, 0x00, 0x0C, 0x3C, 0x60, 0x10, 0x20, 0x80,
- 0x63, 0x84, 0xDC, 0x38, 0x63, 0x04, 0x30, 0x3C, 0x80, 0x00, 0x40, 0x90, 0x83,
- 0x00, 0x08, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x04,
- 0x54, 0x38, 0x80, 0x20, 0x00, 0x90, 0x83, 0x00, 0x08, 0x38, 0x80, 0x00, 0x08,
- 0x90, 0x83, 0x00, 0x10, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38,
- 0x63, 0x04, 0x78, 0x38, 0x80, 0x04, 0x00, 0x90, 0x83, 0x00, 0x08, 0x3C, 0x60,
- 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x04, 0xE4, 0x3C, 0x80, 0x00,
- 0x04, 0x38, 0x84, 0x00, 0x40, 0x90, 0x83, 0x00, 0x04, 0x3C, 0x60, 0x10, 0x20,
- 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x04, 0xC0, 0x3C, 0x80, 0xF0, 0x04, 0x38,
- 0x84, 0x20, 0x00, 0x90, 0x83, 0x00, 0x04, 0x38, 0x60, 0x00, 0x03, 0x38, 0x80,
- 0x00, 0x05, 0x48, 0x00, 0x09, 0x1D, 0x38, 0x60, 0x00, 0x04, 0x38, 0x80, 0x00,
- 0x05, 0x48, 0x00, 0x09, 0x11, 0x38, 0x60, 0x00, 0x05, 0x38, 0x80, 0x00, 0x05,
- 0x48, 0x00, 0x09, 0x05, 0x38, 0x60, 0x00, 0x06, 0x38, 0x80, 0x00, 0x05, 0x48,
- 0x00, 0x08, 0xF9, 0x38, 0x60, 0x00, 0x07, 0x38, 0x80, 0x00, 0x05, 0x48, 0x00,
- 0x08, 0xED, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00,
- 0xB4, 0x38, 0x80, 0x00, 0xFF, 0x98, 0x83, 0x00, 0x00, 0x98, 0x83, 0x00, 0x01,
- 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x88, 0x63, 0x00, 0xDE, 0x2C,
- 0x03, 0x00, 0xFF, 0x40, 0x82, 0x00, 0x18, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63,
- 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80, 0x3D, 0x04, 0x4B, 0xCC, 0x00,
- 0x05, 0x3C, 0xA0, 0x02, 0x90, 0x38, 0xA5, 0x8C, 0x4E, 0x88, 0xA5, 0x00, 0x00,
- 0x2C, 0x05, 0x00, 0x01, 0x40, 0x82, 0x00, 0x30, 0x3C, 0x60, 0x10, 0x20, 0x80,
- 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80, 0x39, 0x04, 0x4B, 0xCB,
- 0xFF, 0xDD, 0x38, 0x80, 0x39, 0x02, 0x4B, 0xCB, 0xFF, 0xD5, 0x38, 0x80, 0x39,
- 0x01, 0x4B, 0xCB, 0xFF, 0xCD, 0x38, 0x80, 0x3A, 0x80, 0x4B, 0xCB, 0xFF, 0xC5,
- 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x12, 0xF0, 0x3C,
- 0x80, 0x02, 0x90, 0x88, 0x84, 0x8D, 0x55, 0x98, 0x83, 0x00, 0x00, 0x3C, 0x80,
- 0x02, 0x90, 0x88, 0x84, 0x8D, 0x56, 0x98, 0x83, 0x00, 0x01, 0x3C, 0x80, 0x02,
- 0x90, 0x88, 0x84, 0x8D, 0x57, 0x98, 0x83, 0x00, 0x02, 0x3C, 0x80, 0x02, 0x90,
- 0x88, 0x84, 0x8D, 0x58, 0x98, 0x83, 0x00, 0x05, 0x3C, 0x80, 0x02, 0x90, 0x88,
- 0x84, 0x8D, 0x59, 0x98, 0x83, 0x00, 0x07, 0x3D, 0x80, 0x10, 0x20, 0x80, 0x01,
- 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00,
- 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x93, 0xE1, 0x00, 0x0C, 0x3F, 0xE0, 0x02, 0x90, 0x3B, 0xFF, 0x8C, 0x4F, 0x88,
- 0x7F, 0x00, 0x00, 0x48, 0x00, 0x00, 0x10, 0x48, 0x00, 0x01, 0x69, 0x4B, 0xC5,
- 0x4E, 0x11, 0x8C, 0x7F, 0x00, 0x01, 0x28, 0x03, 0x00, 0xFF, 0x40, 0x82, 0xFF,
- 0xF0, 0x83, 0xE1, 0x00, 0x0C, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6,
- 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x01, 0x00, 0x01, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0x80, 0x02, 0x90, 0x38, 0x84, 0x8D, 0x6A, 0x88, 0x84, 0x00, 0x00, 0x54, 0x84,
+ 0x40, 0x2E, 0x3C, 0x84, 0x40, 0x18, 0x38, 0x84, 0x02, 0x8B, 0x90, 0x83, 0x00,
+ 0x04, 0x3C, 0x80, 0xC0, 0x00, 0x90, 0x83, 0x00, 0x08, 0x3C, 0x60, 0x10, 0x20,
+ 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x03, 0xA0, 0x3C, 0x80, 0x02, 0x00, 0x90,
+ 0x83, 0x00, 0x04, 0x3C, 0x80, 0x80, 0x00, 0x90, 0x83, 0x00, 0x08, 0x3C, 0x80,
+ 0x41, 0x01, 0x38, 0x84, 0x00, 0x80, 0x90, 0x83, 0x00, 0x0C, 0x3C, 0x60, 0x10,
+ 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x04, 0x0C, 0x3C, 0x80, 0x00, 0x10,
+ 0x60, 0x84, 0x02, 0x00, 0x90, 0x83, 0x00, 0x04, 0x38, 0x80, 0x00, 0x02, 0x90,
+ 0x83, 0x00, 0x08, 0x38, 0x80, 0x00, 0x40, 0x90, 0x83, 0x00, 0x0C, 0x3C, 0x60,
+ 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x04, 0x30, 0x3C, 0x80, 0x00,
+ 0x40, 0x90, 0x83, 0x00, 0x08, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC,
+ 0x38, 0x63, 0x04, 0x54, 0x38, 0x80, 0x20, 0x00, 0x90, 0x83, 0x00, 0x08, 0x38,
+ 0x80, 0x00, 0x08, 0x90, 0x83, 0x00, 0x10, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63,
+ 0x84, 0xDC, 0x38, 0x63, 0x04, 0x78, 0x38, 0x80, 0x04, 0x00, 0x90, 0x83, 0x00,
+ 0x08, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x04, 0xE4,
+ 0x3C, 0x80, 0x00, 0x04, 0x38, 0x84, 0x00, 0x40, 0x90, 0x83, 0x00, 0x04, 0x3C,
+ 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x04, 0xC0, 0x3C, 0x80,
+ 0xF0, 0x04, 0x38, 0x84, 0x20, 0x00, 0x90, 0x83, 0x00, 0x04, 0x38, 0x60, 0x00,
+ 0x03, 0x38, 0x80, 0x00, 0x05, 0x48, 0x00, 0x09, 0x1D, 0x38, 0x60, 0x00, 0x04,
+ 0x38, 0x80, 0x00, 0x05, 0x48, 0x00, 0x09, 0x11, 0x38, 0x60, 0x00, 0x05, 0x38,
+ 0x80, 0x00, 0x05, 0x48, 0x00, 0x09, 0x05, 0x38, 0x60, 0x00, 0x06, 0x38, 0x80,
+ 0x00, 0x05, 0x48, 0x00, 0x08, 0xF9, 0x38, 0x60, 0x00, 0x07, 0x38, 0x80, 0x00,
+ 0x05, 0x48, 0x00, 0x08, 0xED, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC,
+ 0x38, 0x63, 0x00, 0xB4, 0x38, 0x80, 0x00, 0xFF, 0x98, 0x83, 0x00, 0x00, 0x98,
+ 0x83, 0x00, 0x01, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x88, 0x63,
+ 0x00, 0xDE, 0x2C, 0x03, 0x00, 0xFF, 0x40, 0x82, 0x00, 0x18, 0x3C, 0x60, 0x10,
+ 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80, 0x3D, 0x04,
+ 0x4B, 0xCB, 0xFF, 0xF5, 0x3C, 0xA0, 0x02, 0x90, 0x38, 0xA5, 0x8C, 0x5E, 0x88,
+ 0xA5, 0x00, 0x00, 0x2C, 0x05, 0x00, 0x01, 0x40, 0x82, 0x00, 0x30, 0x3C, 0x60,
+ 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80, 0x39,
+ 0x04, 0x4B, 0xCB, 0xFF, 0xCD, 0x38, 0x80, 0x39, 0x02, 0x4B, 0xCB, 0xFF, 0xC5,
+ 0x38, 0x80, 0x39, 0x01, 0x4B, 0xCB, 0xFF, 0xBD, 0x38, 0x80, 0x3A, 0x80, 0x4B,
+ 0xCB, 0xFF, 0xB5, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63,
+ 0x12, 0xF0, 0x3C, 0x80, 0x02, 0x90, 0x88, 0x84, 0x8D, 0x65, 0x98, 0x83, 0x00,
+ 0x00, 0x3C, 0x80, 0x02, 0x90, 0x88, 0x84, 0x8D, 0x66, 0x98, 0x83, 0x00, 0x01,
+ 0x3C, 0x80, 0x02, 0x90, 0x88, 0x84, 0x8D, 0x67, 0x98, 0x83, 0x00, 0x02, 0x3C,
+ 0x80, 0x02, 0x90, 0x88, 0x84, 0x8D, 0x68, 0x98, 0x83, 0x00, 0x05, 0x3C, 0x80,
+ 0x02, 0x90, 0x88, 0x84, 0x8D, 0x69, 0x98, 0x83, 0x00, 0x07, 0x3D, 0x80, 0x10,
+ 0x20, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10,
+ 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90,
+ 0x01, 0x00, 0x14, 0x93, 0xE1, 0x00, 0x0C, 0x3F, 0xE0, 0x02, 0x90, 0x3B, 0xFF,
+ 0x8C, 0x5F, 0x88, 0x7F, 0x00, 0x00, 0x48, 0x00, 0x00, 0x10, 0x48, 0x00, 0x01,
+ 0x69, 0x4B, 0xC5, 0x4E, 0x01, 0x8C, 0x7F, 0x00, 0x01, 0x28, 0x03, 0x00, 0xFF,
+ 0x40, 0x82, 0xFF, 0xF0, 0x83, 0xE1, 0x00, 0x0C, 0x80, 0x01, 0x00, 0x14, 0x7C,
+ 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x01, 0x00,
+ 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -104,385 +105,387 @@ Data:
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0C, 0x10, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08,
- 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x7C, 0x64, 0x1B, 0x78, 0x3C, 0x60, 0x10,
- 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x4B, 0xCB, 0xFE, 0x1D,
- 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E,
- 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01,
- 0x00, 0x14, 0x2C, 0x03, 0x00, 0x38, 0x41, 0x82, 0x00, 0xB0, 0x2C, 0x03, 0x00,
- 0x39, 0x41, 0x82, 0x00, 0xA8, 0x2C, 0x03, 0x00, 0x3A, 0x41, 0x82, 0x00, 0xA0,
- 0x2C, 0x03, 0x00, 0x3D, 0x41, 0x82, 0x00, 0x98, 0x2C, 0x03, 0x00, 0x3E, 0x41,
- 0x82, 0x00, 0x90, 0x2C, 0x03, 0x00, 0x3B, 0x41, 0x82, 0x00, 0xE0, 0x2C, 0x03,
- 0x00, 0x3C, 0x41, 0x82, 0x00, 0xD8, 0x2C, 0x03, 0x00, 0x27, 0x41, 0x82, 0x01,
- 0x08, 0x2C, 0x03, 0x00, 0x35, 0x41, 0x82, 0x01, 0x00, 0x2C, 0x03, 0x00, 0x36,
- 0x41, 0x82, 0x00, 0xF8, 0x2C, 0x03, 0x00, 0xAB, 0x41, 0x82, 0x01, 0x38, 0x2C,
- 0x03, 0x00, 0xAC, 0x41, 0x82, 0x01, 0x30, 0x2C, 0x03, 0x00, 0xAD, 0x41, 0x82,
- 0x01, 0x60, 0x2C, 0x03, 0x00, 0xAE, 0x41, 0x82, 0x01, 0x58, 0x2C, 0x03, 0x00,
- 0xAF, 0x41, 0x82, 0x01, 0x88, 0x2C, 0x03, 0x00, 0xB0, 0x41, 0x82, 0x01, 0x80,
- 0x2C, 0x03, 0x00, 0x23, 0x41, 0x82, 0x01, 0xB0, 0x2C, 0x03, 0x00, 0x26, 0x41,
- 0x82, 0x01, 0xA8, 0x2C, 0x03, 0x00, 0xB1, 0x41, 0x82, 0x02, 0x10, 0x2C, 0x03,
- 0x00, 0xB2, 0x41, 0x82, 0x02, 0x08, 0x2C, 0x03, 0x00, 0x78, 0x41, 0x82, 0x01,
- 0xC8, 0x2C, 0x03, 0x00, 0x77, 0x41, 0x82, 0x01, 0xC0, 0x48, 0x00, 0x02, 0x40,
- 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0xD4, 0x88,
- 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x24, 0x2C, 0x04,
- 0x00, 0x01, 0x41, 0x82, 0x00, 0x24, 0x2C, 0x04, 0x00, 0x03, 0x41, 0x82, 0x00,
- 0x24, 0x2C, 0x04, 0x00, 0x07, 0x41, 0x82, 0x00, 0x24, 0x38, 0x60, 0x00, 0x38,
- 0x48, 0x00, 0x02, 0x08, 0x38, 0x60, 0x00, 0x38, 0x48, 0x00, 0x02, 0x00, 0x38,
- 0x60, 0x00, 0x39, 0x48, 0x00, 0x01, 0xF8, 0x38, 0x60, 0x00, 0x3A, 0x48, 0x00,
- 0x01, 0xF0, 0x38, 0x60, 0x00, 0x3E, 0x48, 0x00, 0x01, 0xE8, 0x3C, 0x60, 0x10,
- 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0xD5, 0x88, 0x83, 0x00, 0x00,
- 0x2C, 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x14, 0x2C, 0x04, 0x00, 0x01, 0x41,
- 0x82, 0x00, 0x14, 0x38, 0x60, 0x00, 0x3B, 0x48, 0x00, 0x01, 0xC0, 0x38, 0x60,
- 0x00, 0x3B, 0x48, 0x00, 0x01, 0xB8, 0x38, 0x60, 0x00, 0x3C, 0x48, 0x00, 0x01,
- 0xB0, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x7D,
- 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x1C, 0x2C,
- 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x1C, 0x2C, 0x04, 0x00, 0x03, 0x41, 0x82,
- 0x00, 0x1C, 0x38, 0x60, 0x00, 0x27, 0x48, 0x00, 0x01, 0x80, 0x38, 0x60, 0x00,
- 0x27, 0x48, 0x00, 0x01, 0x78, 0x38, 0x60, 0x00, 0x35, 0x48, 0x00, 0x01, 0x70,
- 0x38, 0x60, 0x00, 0x36, 0x48, 0x00, 0x01, 0x68, 0x3C, 0x60, 0x10, 0x20, 0x80,
- 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x32, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04,
- 0x00, 0x00, 0x41, 0x82, 0x00, 0x14, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00,
- 0x14, 0x38, 0x60, 0x00, 0xAB, 0x48, 0x00, 0x01, 0x40, 0x38, 0x60, 0x00, 0xAB,
- 0x48, 0x00, 0x01, 0x38, 0x38, 0x60, 0x00, 0xAC, 0x48, 0x00, 0x01, 0x30, 0x3C,
- 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x8A, 0x88, 0x83,
- 0x00, 0x06, 0x2C, 0x04, 0x00, 0x1E, 0x41, 0x82, 0x00, 0x14, 0x2C, 0x04, 0x00,
- 0x3C, 0x41, 0x82, 0x00, 0x14, 0x38, 0x60, 0x00, 0xAD, 0x48, 0x00, 0x01, 0x08,
- 0x38, 0x60, 0x00, 0xAD, 0x48, 0x00, 0x01, 0x00, 0x38, 0x60, 0x00, 0xAE, 0x48,
- 0x00, 0x00, 0xF8, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63,
- 0x00, 0x89, 0x88, 0x83, 0x00, 0x06, 0x2C, 0x04, 0x00, 0x1E, 0x41, 0x82, 0x00,
- 0x14, 0x2C, 0x04, 0x00, 0x3C, 0x41, 0x82, 0x00, 0x14, 0x38, 0x60, 0x00, 0xAF,
- 0x48, 0x00, 0x00, 0xD0, 0x38, 0x60, 0x00, 0xAF, 0x48, 0x00, 0x00, 0xC8, 0x38,
- 0x60, 0x00, 0xB0, 0x48, 0x00, 0x00, 0xC0, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63,
- 0x84, 0xDC, 0x38, 0x63, 0x00, 0x79, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00,
- 0x00, 0x41, 0x82, 0x00, 0x14, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x14,
- 0x38, 0x60, 0x00, 0x23, 0x48, 0x00, 0x00, 0x98, 0x38, 0x60, 0x00, 0x23, 0x48,
- 0x00, 0x00, 0x90, 0x38, 0x60, 0x00, 0x26, 0x48, 0x00, 0x00, 0x88, 0x3C, 0x60,
- 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x5D, 0x88, 0x83, 0x00,
- 0x00, 0x2C, 0x04, 0x00, 0xFF, 0x41, 0x82, 0x00, 0x14, 0x2C, 0x04, 0x00, 0x78,
- 0x41, 0x82, 0x00, 0x14, 0x38, 0x60, 0x00, 0x78, 0x48, 0x00, 0x00, 0x60, 0x38,
- 0x60, 0x00, 0x78, 0x48, 0x00, 0x00, 0x58, 0x38, 0x60, 0x00, 0x77, 0x48, 0x00,
- 0x00, 0x50, 0x3C, 0x80, 0x02, 0x90, 0x38, 0x84, 0x8D, 0x53, 0x88, 0x84, 0x00,
- 0x00, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x34, 0x3C, 0x60, 0x10, 0x20,
- 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x33, 0x88, 0x83, 0x00, 0x00, 0x2C,
- 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x14, 0x2C, 0x04, 0x00, 0x10, 0x41, 0x82,
- 0x00, 0x14, 0x38, 0x60, 0x00, 0xB1, 0x48, 0x00, 0x00, 0x14, 0x38, 0x60, 0x00,
- 0xB1, 0x48, 0x00, 0x00, 0x0C, 0x38, 0x60, 0x00, 0xB2, 0x48, 0x00, 0x00, 0x04,
- 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E,
- 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01,
- 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00,
- 0xD4, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x20,
- 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x20, 0x2C, 0x04, 0x00, 0x03, 0x41,
- 0x82, 0x00, 0x20, 0x2C, 0x04, 0x00, 0x07, 0x41, 0x82, 0x00, 0x20, 0x48, 0x00,
- 0x00, 0x20, 0x4B, 0xC5, 0x5D, 0x3D, 0x48, 0x00, 0x00, 0x18, 0x4B, 0xC5, 0x5D,
- 0x75, 0x48, 0x00, 0x00, 0x10, 0x4B, 0xC5, 0x5D, 0xAD, 0x48, 0x00, 0x00, 0x08,
- 0x4B, 0xC5, 0x5E, 0xA5, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38,
- 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08,
- 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84,
- 0xDC, 0x38, 0x63, 0x00, 0xD5, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00,
- 0x41, 0x82, 0x00, 0x10, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x10, 0x48,
- 0x00, 0x00, 0x10, 0x4B, 0xC5, 0x5D, 0xA1, 0x48, 0x00, 0x00, 0x08, 0x4B, 0xC5,
- 0x5D, 0xD9, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00,
- 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6,
- 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0C,
+ 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x94, 0x21, 0xFF,
+ 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x7C, 0x64, 0x1B, 0x78,
+ 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x4B,
+ 0xCB, 0xFE, 0x0D, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21,
+ 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02,
+ 0xA6, 0x90, 0x01, 0x00, 0x14, 0x2C, 0x03, 0x00, 0x38, 0x41, 0x82, 0x00, 0xB0,
+ 0x2C, 0x03, 0x00, 0x39, 0x41, 0x82, 0x00, 0xA8, 0x2C, 0x03, 0x00, 0x3A, 0x41,
+ 0x82, 0x00, 0xA0, 0x2C, 0x03, 0x00, 0x3D, 0x41, 0x82, 0x00, 0x98, 0x2C, 0x03,
+ 0x00, 0x3E, 0x41, 0x82, 0x00, 0x90, 0x2C, 0x03, 0x00, 0x3B, 0x41, 0x82, 0x00,
+ 0xE0, 0x2C, 0x03, 0x00, 0x3C, 0x41, 0x82, 0x00, 0xD8, 0x2C, 0x03, 0x00, 0x27,
+ 0x41, 0x82, 0x01, 0x08, 0x2C, 0x03, 0x00, 0x35, 0x41, 0x82, 0x01, 0x00, 0x2C,
+ 0x03, 0x00, 0x36, 0x41, 0x82, 0x00, 0xF8, 0x2C, 0x03, 0x00, 0xAB, 0x41, 0x82,
+ 0x01, 0x38, 0x2C, 0x03, 0x00, 0xAC, 0x41, 0x82, 0x01, 0x30, 0x2C, 0x03, 0x00,
+ 0xAD, 0x41, 0x82, 0x01, 0x60, 0x2C, 0x03, 0x00, 0xAE, 0x41, 0x82, 0x01, 0x58,
+ 0x2C, 0x03, 0x00, 0xAF, 0x41, 0x82, 0x01, 0x88, 0x2C, 0x03, 0x00, 0xB0, 0x41,
+ 0x82, 0x01, 0x80, 0x2C, 0x03, 0x00, 0x23, 0x41, 0x82, 0x01, 0xB0, 0x2C, 0x03,
+ 0x00, 0x26, 0x41, 0x82, 0x01, 0xA8, 0x2C, 0x03, 0x00, 0xB1, 0x41, 0x82, 0x02,
+ 0x10, 0x2C, 0x03, 0x00, 0xB2, 0x41, 0x82, 0x02, 0x08, 0x2C, 0x03, 0x00, 0x78,
+ 0x41, 0x82, 0x01, 0xC8, 0x2C, 0x03, 0x00, 0x77, 0x41, 0x82, 0x01, 0xC0, 0x48,
+ 0x00, 0x02, 0x40, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63,
+ 0x00, 0xD4, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x41, 0x82, 0x00,
+ 0x24, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x24, 0x2C, 0x04, 0x00, 0x03,
+ 0x41, 0x82, 0x00, 0x24, 0x2C, 0x04, 0x00, 0x07, 0x41, 0x82, 0x00, 0x24, 0x38,
+ 0x60, 0x00, 0x38, 0x48, 0x00, 0x02, 0x08, 0x38, 0x60, 0x00, 0x38, 0x48, 0x00,
+ 0x02, 0x00, 0x38, 0x60, 0x00, 0x39, 0x48, 0x00, 0x01, 0xF8, 0x38, 0x60, 0x00,
+ 0x3A, 0x48, 0x00, 0x01, 0xF0, 0x38, 0x60, 0x00, 0x3E, 0x48, 0x00, 0x01, 0xE8,
+ 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0xD5, 0x88,
+ 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x14, 0x2C, 0x04,
+ 0x00, 0x01, 0x41, 0x82, 0x00, 0x14, 0x38, 0x60, 0x00, 0x3B, 0x48, 0x00, 0x01,
+ 0xC0, 0x38, 0x60, 0x00, 0x3B, 0x48, 0x00, 0x01, 0xB8, 0x38, 0x60, 0x00, 0x3C,
+ 0x48, 0x00, 0x01, 0xB0, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38,
0x63, 0x00, 0x7D, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x41, 0x82,
- 0x00, 0x18, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x18, 0x2C, 0x04, 0x00,
- 0x03, 0x41, 0x82, 0x00, 0x18, 0x48, 0x00, 0x00, 0x18, 0x4B, 0xC5, 0x54, 0xA9,
- 0x48, 0x00, 0x00, 0x10, 0x4B, 0xC5, 0x58, 0x05, 0x48, 0x00, 0x00, 0x08, 0x4B,
- 0xC5, 0x5A, 0x3D, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21,
- 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84,
- 0xDC, 0x38, 0x63, 0x00, 0x32, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00,
- 0x41, 0x82, 0x00, 0x10, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x14, 0x48,
- 0x00, 0x00, 0x18, 0x38, 0x80, 0x00, 0x01, 0x98, 0x83, 0x00, 0x00, 0x48, 0x00,
- 0x00, 0x0C, 0x38, 0x80, 0x00, 0x02, 0x98, 0x83, 0x00, 0x00, 0x4E, 0x80, 0x00,
- 0x20, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x8A,
- 0x88, 0x83, 0x00, 0x06, 0x2C, 0x04, 0x00, 0x1E, 0x41, 0x82, 0x00, 0x10, 0x2C,
- 0x04, 0x00, 0x3C, 0x41, 0x82, 0x00, 0x18, 0x48, 0x00, 0x00, 0x20, 0x38, 0x80,
- 0x00, 0x3C, 0x98, 0x83, 0x00, 0x00, 0x98, 0x83, 0x00, 0x06, 0x48, 0x00, 0x00,
- 0x10, 0x38, 0x80, 0x00, 0x63, 0x98, 0x83, 0x00, 0x00, 0x98, 0x83, 0x00, 0x06,
+ 0x00, 0x1C, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x1C, 0x2C, 0x04, 0x00,
+ 0x03, 0x41, 0x82, 0x00, 0x1C, 0x38, 0x60, 0x00, 0x27, 0x48, 0x00, 0x01, 0x80,
+ 0x38, 0x60, 0x00, 0x27, 0x48, 0x00, 0x01, 0x78, 0x38, 0x60, 0x00, 0x35, 0x48,
+ 0x00, 0x01, 0x70, 0x38, 0x60, 0x00, 0x36, 0x48, 0x00, 0x01, 0x68, 0x3C, 0x60,
+ 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x32, 0x88, 0x83, 0x00,
+ 0x00, 0x2C, 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x14, 0x2C, 0x04, 0x00, 0x01,
+ 0x41, 0x82, 0x00, 0x14, 0x38, 0x60, 0x00, 0xAB, 0x48, 0x00, 0x01, 0x40, 0x38,
+ 0x60, 0x00, 0xAB, 0x48, 0x00, 0x01, 0x38, 0x38, 0x60, 0x00, 0xAC, 0x48, 0x00,
+ 0x01, 0x30, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00,
+ 0x8A, 0x88, 0x83, 0x00, 0x06, 0x2C, 0x04, 0x00, 0x1E, 0x41, 0x82, 0x00, 0x14,
+ 0x2C, 0x04, 0x00, 0x3C, 0x41, 0x82, 0x00, 0x14, 0x38, 0x60, 0x00, 0xAD, 0x48,
+ 0x00, 0x01, 0x08, 0x38, 0x60, 0x00, 0xAD, 0x48, 0x00, 0x01, 0x00, 0x38, 0x60,
+ 0x00, 0xAE, 0x48, 0x00, 0x00, 0xF8, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84,
+ 0xDC, 0x38, 0x63, 0x00, 0x89, 0x88, 0x83, 0x00, 0x06, 0x2C, 0x04, 0x00, 0x1E,
+ 0x41, 0x82, 0x00, 0x14, 0x2C, 0x04, 0x00, 0x3C, 0x41, 0x82, 0x00, 0x14, 0x38,
+ 0x60, 0x00, 0xAF, 0x48, 0x00, 0x00, 0xD0, 0x38, 0x60, 0x00, 0xAF, 0x48, 0x00,
+ 0x00, 0xC8, 0x38, 0x60, 0x00, 0xB0, 0x48, 0x00, 0x00, 0xC0, 0x3C, 0x60, 0x10,
+ 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x79, 0x88, 0x83, 0x00, 0x00,
+ 0x2C, 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x14, 0x2C, 0x04, 0x00, 0x01, 0x41,
+ 0x82, 0x00, 0x14, 0x38, 0x60, 0x00, 0x23, 0x48, 0x00, 0x00, 0x98, 0x38, 0x60,
+ 0x00, 0x23, 0x48, 0x00, 0x00, 0x90, 0x38, 0x60, 0x00, 0x26, 0x48, 0x00, 0x00,
+ 0x88, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x5D,
+ 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0xFF, 0x41, 0x82, 0x00, 0x14, 0x2C,
+ 0x04, 0x00, 0x78, 0x41, 0x82, 0x00, 0x14, 0x38, 0x60, 0x00, 0x78, 0x48, 0x00,
+ 0x00, 0x60, 0x38, 0x60, 0x00, 0x78, 0x48, 0x00, 0x00, 0x58, 0x38, 0x60, 0x00,
+ 0x77, 0x48, 0x00, 0x00, 0x50, 0x3C, 0x80, 0x02, 0x90, 0x38, 0x84, 0x8D, 0x63,
+ 0x88, 0x84, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x34, 0x3C,
+ 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x33, 0x88, 0x83,
+ 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x14, 0x2C, 0x04, 0x00,
+ 0x10, 0x41, 0x82, 0x00, 0x14, 0x38, 0x60, 0x00, 0xB1, 0x48, 0x00, 0x00, 0x14,
+ 0x38, 0x60, 0x00, 0xB1, 0x48, 0x00, 0x00, 0x0C, 0x38, 0x60, 0x00, 0xB2, 0x48,
+ 0x00, 0x00, 0x04, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21,
+ 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02,
+ 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC,
+ 0x38, 0x63, 0x00, 0xD4, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x41,
+ 0x82, 0x00, 0x20, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x20, 0x2C, 0x04,
+ 0x00, 0x03, 0x41, 0x82, 0x00, 0x20, 0x2C, 0x04, 0x00, 0x07, 0x41, 0x82, 0x00,
+ 0x20, 0x48, 0x00, 0x00, 0x20, 0x4B, 0xC5, 0x5D, 0x2D, 0x48, 0x00, 0x00, 0x18,
+ 0x4B, 0xC5, 0x5D, 0x65, 0x48, 0x00, 0x00, 0x10, 0x4B, 0xC5, 0x5D, 0x9D, 0x48,
+ 0x00, 0x00, 0x08, 0x4B, 0xC5, 0x5E, 0x95, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
+ 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF,
+ 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20,
+ 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0xD5, 0x88, 0x83, 0x00, 0x00, 0x2C,
+ 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x10, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82,
+ 0x00, 0x10, 0x48, 0x00, 0x00, 0x10, 0x4B, 0xC5, 0x5D, 0x91, 0x48, 0x00, 0x00,
+ 0x08, 0x4B, 0xC5, 0x5D, 0xC9, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6,
+ 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C,
+ 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63,
+ 0x84, 0xDC, 0x38, 0x63, 0x00, 0x7D, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00,
+ 0x00, 0x41, 0x82, 0x00, 0x18, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x18,
+ 0x2C, 0x04, 0x00, 0x03, 0x41, 0x82, 0x00, 0x18, 0x48, 0x00, 0x00, 0x18, 0x4B,
+ 0xC5, 0x54, 0x99, 0x48, 0x00, 0x00, 0x10, 0x4B, 0xC5, 0x57, 0xF5, 0x48, 0x00,
+ 0x00, 0x08, 0x4B, 0xC5, 0x5A, 0x2D, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03,
+ 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x3C, 0x60, 0x10, 0x20,
+ 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x32, 0x88, 0x83, 0x00, 0x00, 0x2C,
+ 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x10, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82,
+ 0x00, 0x14, 0x48, 0x00, 0x00, 0x18, 0x38, 0x80, 0x00, 0x01, 0x98, 0x83, 0x00,
+ 0x00, 0x48, 0x00, 0x00, 0x0C, 0x38, 0x80, 0x00, 0x02, 0x98, 0x83, 0x00, 0x00,
0x4E, 0x80, 0x00, 0x20, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38,
- 0x63, 0x00, 0x89, 0x88, 0x83, 0x00, 0x06, 0x2C, 0x04, 0x00, 0x1E, 0x41, 0x82,
+ 0x63, 0x00, 0x8A, 0x88, 0x83, 0x00, 0x06, 0x2C, 0x04, 0x00, 0x1E, 0x41, 0x82,
0x00, 0x10, 0x2C, 0x04, 0x00, 0x3C, 0x41, 0x82, 0x00, 0x18, 0x48, 0x00, 0x00,
0x20, 0x38, 0x80, 0x00, 0x3C, 0x98, 0x83, 0x00, 0x00, 0x98, 0x83, 0x00, 0x06,
0x48, 0x00, 0x00, 0x10, 0x38, 0x80, 0x00, 0x63, 0x98, 0x83, 0x00, 0x00, 0x98,
- 0x83, 0x00, 0x06, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08,
- 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84,
- 0xDC, 0x38, 0x63, 0x00, 0x79, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00,
- 0x41, 0x82, 0x00, 0x10, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x10, 0x48,
- 0x00, 0x00, 0x10, 0x4B, 0xC5, 0x50, 0x79, 0x48, 0x00, 0x00, 0x08, 0x4B, 0xC5,
- 0x51, 0x49, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00,
- 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6,
- 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38,
- 0x63, 0x00, 0x5D, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00, 0xFF, 0x41, 0x82,
- 0x00, 0x10, 0x2C, 0x04, 0x00, 0x78, 0x41, 0x82, 0x00, 0x10, 0x48, 0x00, 0x00,
- 0x10, 0x4B, 0xC5, 0x64, 0xE5, 0x48, 0x00, 0x00, 0x08, 0x4B, 0xC5, 0x62, 0xDD,
+ 0x83, 0x00, 0x06, 0x4E, 0x80, 0x00, 0x20, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63,
+ 0x84, 0xDC, 0x38, 0x63, 0x00, 0x89, 0x88, 0x83, 0x00, 0x06, 0x2C, 0x04, 0x00,
+ 0x1E, 0x41, 0x82, 0x00, 0x10, 0x2C, 0x04, 0x00, 0x3C, 0x41, 0x82, 0x00, 0x18,
+ 0x48, 0x00, 0x00, 0x20, 0x38, 0x80, 0x00, 0x3C, 0x98, 0x83, 0x00, 0x00, 0x98,
+ 0x83, 0x00, 0x06, 0x48, 0x00, 0x00, 0x10, 0x38, 0x80, 0x00, 0x63, 0x98, 0x83,
+ 0x00, 0x00, 0x98, 0x83, 0x00, 0x06, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF,
+ 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20,
+ 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x79, 0x88, 0x83, 0x00, 0x00, 0x2C,
+ 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x10, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82,
+ 0x00, 0x10, 0x48, 0x00, 0x00, 0x10, 0x4B, 0xC5, 0x50, 0x69, 0x48, 0x00, 0x00,
+ 0x08, 0x4B, 0xC5, 0x51, 0x39, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6,
+ 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C,
+ 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63,
+ 0x84, 0xDC, 0x38, 0x63, 0x00, 0x5D, 0x88, 0x83, 0x00, 0x00, 0x2C, 0x04, 0x00,
+ 0xFF, 0x41, 0x82, 0x00, 0x10, 0x2C, 0x04, 0x00, 0x78, 0x41, 0x82, 0x00, 0x10,
+ 0x48, 0x00, 0x00, 0x10, 0x4B, 0xC5, 0x64, 0xD5, 0x48, 0x00, 0x00, 0x08, 0x4B,
+ 0xC5, 0x62, 0xCD, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21,
+ 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02,
+ 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x80, 0x02, 0x90, 0x38, 0x84, 0x8D, 0x63,
+ 0x88, 0x84, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x30, 0x3C,
+ 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x33, 0x88, 0x83,
+ 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x10, 0x2C, 0x04, 0x00,
+ 0x10, 0x41, 0x82, 0x00, 0x10, 0x48, 0x00, 0x00, 0x10, 0x48, 0x00, 0x00, 0x1D,
+ 0x48, 0x00, 0x00, 0x08, 0x4B, 0xC5, 0x6D, 0xC5, 0x80, 0x01, 0x00, 0x14, 0x7C,
+ 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21,
+ 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x4B, 0xC2, 0x6D,
+ 0x51, 0x38, 0x80, 0x00, 0x10, 0xB0, 0x83, 0x5B, 0x60, 0xB0, 0x83, 0x5B, 0x64,
0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E,
0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01,
- 0x00, 0x14, 0x3C, 0x80, 0x02, 0x90, 0x38, 0x84, 0x8D, 0x53, 0x88, 0x84, 0x00,
- 0x00, 0x2C, 0x04, 0x00, 0x01, 0x41, 0x82, 0x00, 0x30, 0x3C, 0x60, 0x10, 0x20,
- 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x33, 0x88, 0x83, 0x00, 0x00, 0x2C,
- 0x04, 0x00, 0x00, 0x41, 0x82, 0x00, 0x10, 0x2C, 0x04, 0x00, 0x10, 0x41, 0x82,
- 0x00, 0x10, 0x48, 0x00, 0x00, 0x10, 0x48, 0x00, 0x00, 0x1D, 0x48, 0x00, 0x00,
- 0x08, 0x4B, 0xC5, 0x6D, 0xD5, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6,
- 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C,
- 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x4B, 0xC2, 0x6D, 0x61, 0x38, 0x80,
- 0x00, 0x10, 0xB0, 0x83, 0x5B, 0x60, 0xB0, 0x83, 0x5B, 0x64, 0x80, 0x01, 0x00,
- 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20,
- 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C,
- 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x80, 0x69, 0x01, 0x38, 0x63,
- 0x06, 0x44, 0x4B, 0xCB, 0xF7, 0xB9, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03,
- 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0,
- 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x2C, 0x04, 0x00, 0xFF, 0x41,
- 0x82, 0x00, 0x28, 0x7C, 0xA9, 0x2B, 0x78, 0x7D, 0x05, 0x43, 0x78, 0x7C, 0xC8,
- 0x33, 0x78, 0x7D, 0x26, 0x4B, 0x78, 0x7C, 0xEA, 0x3B, 0x78, 0x38, 0xE0, 0x00,
- 0x03, 0x39, 0x20, 0x00, 0x05, 0x4B, 0xCD, 0xF4, 0x7D, 0x48, 0x00, 0x00, 0x08,
- 0x38, 0x60, 0xFF, 0xFF, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38,
- 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08,
- 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x7C, 0x65, 0x1B, 0x78, 0x7C, 0x86, 0x23,
- 0x78, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x07, 0xBC,
- 0x88, 0x83, 0x00, 0x00, 0x7C, 0x04, 0x28, 0x00, 0x41, 0x82, 0x00, 0x1C, 0x3C,
- 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x03, 0xA0, 0x1C, 0x85,
- 0x00, 0x24, 0x7C, 0x63, 0x22, 0x14, 0x48, 0x00, 0x00, 0x10, 0x3C, 0x60, 0x10,
- 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x07, 0x98, 0x7C, 0xC4, 0x33, 0x78,
- 0x4B, 0xCB, 0xFC, 0x35, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38,
- 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08,
- 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x7C, 0x65, 0x1B, 0x78, 0x3C, 0x60, 0x10,
- 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x07, 0xBC, 0x88, 0x83, 0x00, 0x00,
- 0x7C, 0x04, 0x28, 0x00, 0x40, 0x82, 0x00, 0x28, 0x4B, 0xC2, 0x6C, 0x35, 0x85,
- 0x83, 0x51, 0x50, 0x81, 0x8C, 0x01, 0x5C, 0x7D, 0x89, 0x03, 0xA6, 0x4E, 0x80,
- 0x04, 0x21, 0x88, 0x03, 0x00, 0x09, 0x54, 0x00, 0x07, 0xFF, 0x41, 0x82, 0x00,
- 0x2C, 0x48, 0x00, 0x00, 0x44, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC,
- 0x38, 0x63, 0x03, 0xA0, 0x1C, 0x85, 0x00, 0x24, 0x7C, 0x63, 0x22, 0x14, 0x88,
- 0x83, 0x00, 0x20, 0x38, 0x84, 0x00, 0x01, 0x98, 0x83, 0x00, 0x20, 0x48, 0x00,
- 0x00, 0x24, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x07,
- 0x98, 0x88, 0x83, 0x00, 0x20, 0x38, 0x84, 0x00, 0x01, 0x98, 0x83, 0x00, 0x20,
- 0x48, 0x00, 0x00, 0x08, 0x4B, 0xC5, 0x4A, 0xA1, 0x80, 0x01, 0x00, 0x14, 0x7C,
+ 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x80, 0x69,
+ 0x01, 0x38, 0x63, 0x06, 0x44, 0x4B, 0xCB, 0xF7, 0xA9, 0x80, 0x01, 0x00, 0x14,
+ 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94,
+ 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x2C, 0x04,
+ 0x00, 0xFF, 0x41, 0x82, 0x00, 0x28, 0x7C, 0xA9, 0x2B, 0x78, 0x7D, 0x05, 0x43,
+ 0x78, 0x7C, 0xC8, 0x33, 0x78, 0x7D, 0x26, 0x4B, 0x78, 0x7C, 0xEA, 0x3B, 0x78,
+ 0x38, 0xE0, 0x00, 0x03, 0x39, 0x20, 0x00, 0x05, 0x4B, 0xCD, 0xF4, 0x6D, 0x48,
+ 0x00, 0x00, 0x08, 0x38, 0x60, 0xFF, 0xFF, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
+ 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF,
+ 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x7C, 0x65, 0x1B, 0x78,
+ 0x7C, 0x86, 0x23, 0x78, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38,
+ 0x63, 0x07, 0xBC, 0x88, 0x83, 0x00, 0x00, 0x7C, 0x04, 0x28, 0x00, 0x41, 0x82,
+ 0x00, 0x1C, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x03,
+ 0xA0, 0x1C, 0x85, 0x00, 0x24, 0x7C, 0x63, 0x22, 0x14, 0x48, 0x00, 0x00, 0x10,
+ 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x07, 0x98, 0x7C,
+ 0xC4, 0x33, 0x78, 0x4B, 0xCB, 0xFC, 0x25, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
+ 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF,
+ 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x7C, 0x65, 0x1B, 0x78,
+ 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x07, 0xBC, 0x88,
+ 0x83, 0x00, 0x00, 0x7C, 0x04, 0x28, 0x00, 0x40, 0x82, 0x00, 0x28, 0x4B, 0xC2,
+ 0x6C, 0x25, 0x85, 0x83, 0x51, 0x50, 0x81, 0x8C, 0x01, 0x5C, 0x7D, 0x89, 0x03,
+ 0xA6, 0x4E, 0x80, 0x04, 0x21, 0x88, 0x03, 0x00, 0x09, 0x54, 0x00, 0x07, 0xFF,
+ 0x41, 0x82, 0x00, 0x2C, 0x48, 0x00, 0x00, 0x44, 0x3C, 0x60, 0x10, 0x20, 0x80,
+ 0x63, 0x84, 0xDC, 0x38, 0x63, 0x03, 0xA0, 0x1C, 0x85, 0x00, 0x24, 0x7C, 0x63,
+ 0x22, 0x14, 0x88, 0x83, 0x00, 0x20, 0x38, 0x84, 0x00, 0x01, 0x98, 0x83, 0x00,
+ 0x20, 0x48, 0x00, 0x00, 0x24, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC,
+ 0x38, 0x63, 0x07, 0x98, 0x88, 0x83, 0x00, 0x20, 0x38, 0x84, 0x00, 0x01, 0x98,
+ 0x83, 0x00, 0x20, 0x48, 0x00, 0x00, 0x08, 0x4B, 0xC5, 0x4A, 0x91, 0x80, 0x01,
+ 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00,
+ 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x38, 0x60, 0x00, 0x03, 0x4B, 0xFF, 0xFF, 0x51, 0x80, 0x01, 0x00, 0x14, 0x7C,
0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21,
0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00,
- 0x03, 0x4B, 0xFF, 0xFF, 0x51, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6,
+ 0x04, 0x4B, 0xFF, 0xFF, 0x2D, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6,
0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C,
- 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x04, 0x4B, 0xFF,
- 0xFF, 0x2D, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00,
+ 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x05, 0x4B, 0xFF,
+ 0xFF, 0x09, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00,
0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6,
- 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x05, 0x4B, 0xFF, 0xFF, 0x09, 0x80,
+ 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x06, 0x4B, 0xFF, 0xFE, 0xE5, 0x80,
0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80,
0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00,
- 0x14, 0x38, 0x60, 0x00, 0x06, 0x4B, 0xFF, 0xFE, 0xE5, 0x80, 0x01, 0x00, 0x14,
+ 0x14, 0x38, 0x60, 0x00, 0x07, 0x4B, 0xFF, 0xFE, 0xC1, 0x80, 0x01, 0x00, 0x14,
0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94,
0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60,
- 0x00, 0x07, 0x4B, 0xFF, 0xFE, 0xC1, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03,
- 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0,
- 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x03, 0x38,
- 0x80, 0x00, 0x02, 0x4B, 0xFF, 0xFE, 0x31, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
- 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF,
- 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x04,
- 0x38, 0x80, 0x00, 0x02, 0x4B, 0xFF, 0xFE, 0x09, 0x80, 0x01, 0x00, 0x14, 0x7C,
- 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21,
- 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00,
- 0x05, 0x38, 0x80, 0x00, 0x02, 0x4B, 0xFF, 0xFD, 0xE1, 0x80, 0x01, 0x00, 0x14,
- 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94,
- 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60,
- 0x00, 0x06, 0x38, 0x80, 0x00, 0x02, 0x4B, 0xFF, 0xFD, 0xB9, 0x80, 0x01, 0x00,
+ 0x00, 0x03, 0x38, 0x80, 0x00, 0x02, 0x4B, 0xFF, 0xFE, 0x31, 0x80, 0x01, 0x00,
0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20,
0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38,
- 0x60, 0x00, 0x07, 0x38, 0x80, 0x00, 0x02, 0x4B, 0xFF, 0xFD, 0x91, 0x80, 0x01,
+ 0x60, 0x00, 0x04, 0x38, 0x80, 0x00, 0x02, 0x4B, 0xFF, 0xFE, 0x09, 0x80, 0x01,
0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00,
0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x38, 0x60, 0x00, 0x03, 0x38, 0x80, 0x00, 0x00, 0x4B, 0xFF, 0xFD, 0x69, 0x80,
+ 0x38, 0x60, 0x00, 0x05, 0x38, 0x80, 0x00, 0x02, 0x4B, 0xFF, 0xFD, 0xE1, 0x80,
0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80,
0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00,
- 0x14, 0x38, 0x60, 0x00, 0x04, 0x38, 0x80, 0x00, 0x00, 0x4B, 0xFF, 0xFD, 0x41,
+ 0x14, 0x38, 0x60, 0x00, 0x06, 0x38, 0x80, 0x00, 0x02, 0x4B, 0xFF, 0xFD, 0xB9,
0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E,
0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01,
- 0x00, 0x14, 0x38, 0x60, 0x00, 0x05, 0x38, 0x80, 0x00, 0x00, 0x4B, 0xFF, 0xFD,
- 0x19, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10,
+ 0x00, 0x14, 0x38, 0x60, 0x00, 0x07, 0x38, 0x80, 0x00, 0x02, 0x4B, 0xFF, 0xFD,
+ 0x91, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10,
0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90,
- 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x02, 0x38, 0x80, 0x00, 0x00, 0x4B, 0xFF,
- 0xFC, 0xF1, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00,
+ 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x03, 0x38, 0x80, 0x00, 0x00, 0x4B, 0xFF,
+ 0xFD, 0x69, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00,
0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6,
- 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x06, 0x38, 0x80, 0x00, 0x00, 0x4B,
- 0xFF, 0xFC, 0xC9, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21,
+ 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x04, 0x38, 0x80, 0x00, 0x00, 0x4B,
+ 0xFF, 0xFD, 0x41, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21,
0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02,
- 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x07, 0x38, 0x80, 0x00, 0x00,
- 0x4B, 0xFF, 0xFC, 0xA1, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38,
+ 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x05, 0x38, 0x80, 0x00, 0x00,
+ 0x4B, 0xFF, 0xFD, 0x19, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38,
0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08,
- 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x03, 0x38, 0x80, 0x00,
- 0x01, 0x4B, 0xFF, 0xFC, 0x79, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6,
+ 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x02, 0x38, 0x80, 0x00,
+ 0x00, 0x4B, 0xFF, 0xFC, 0xF1, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6,
0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C,
- 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x04, 0x38, 0x80,
- 0x00, 0x01, 0x4B, 0xFF, 0xFC, 0x51, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03,
+ 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x06, 0x38, 0x80,
+ 0x00, 0x00, 0x4B, 0xFF, 0xFC, 0xC9, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03,
0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0,
- 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x05, 0x38,
- 0x80, 0x00, 0x01, 0x4B, 0xFF, 0xFC, 0x29, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
+ 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x07, 0x38,
+ 0x80, 0x00, 0x00, 0x4B, 0xFF, 0xFC, 0xA1, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF,
- 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x02,
- 0x38, 0x80, 0x00, 0x01, 0x4B, 0xFF, 0xFC, 0x01, 0x80, 0x01, 0x00, 0x14, 0x7C,
+ 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00, 0x03,
+ 0x38, 0x80, 0x00, 0x01, 0x4B, 0xFF, 0xFC, 0x79, 0x80, 0x01, 0x00, 0x14, 0x7C,
0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21,
0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60, 0x00,
- 0x06, 0x38, 0x80, 0x00, 0x01, 0x4B, 0xFF, 0xFB, 0xD9, 0x80, 0x01, 0x00, 0x14,
+ 0x04, 0x38, 0x80, 0x00, 0x01, 0x4B, 0xFF, 0xFC, 0x51, 0x80, 0x01, 0x00, 0x14,
0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94,
0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38, 0x60,
- 0x00, 0x07, 0x38, 0x80, 0x00, 0x01, 0x4B, 0xFF, 0xFB, 0xB1, 0x80, 0x01, 0x00,
+ 0x00, 0x05, 0x38, 0x80, 0x00, 0x01, 0x4B, 0xFF, 0xFC, 0x29, 0x80, 0x01, 0x00,
0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20,
- 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C,
- 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80,
- 0x6A, 0x04, 0x4B, 0xCB, 0xF2, 0xD9, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03,
- 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0,
- 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80,
- 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80, 0x6A, 0x08, 0x4B, 0xCB,
- 0xF2, 0xA9, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00,
- 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6,
- 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38,
- 0x63, 0x06, 0x44, 0x38, 0x80, 0x6A, 0x10, 0x4B, 0xCB, 0xF2, 0x79, 0x80, 0x01,
+ 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x38,
+ 0x60, 0x00, 0x02, 0x38, 0x80, 0x00, 0x01, 0x4B, 0xFF, 0xFC, 0x01, 0x80, 0x01,
0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00,
0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38,
- 0x80, 0x6A, 0x20, 0x4B, 0xCB, 0xF2, 0x49, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
- 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF,
- 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20,
- 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80, 0x6A, 0x40, 0x4B,
- 0xCB, 0xF2, 0x19, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21,
- 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02,
- 0xA6, 0x90, 0x01, 0x00, 0x14, 0x2C, 0x04, 0x00, 0x0F, 0x40, 0x82, 0x00, 0x68,
- 0x2C, 0x03, 0x00, 0x03, 0x41, 0x82, 0x00, 0x28, 0x2C, 0x03, 0x00, 0x04, 0x41,
- 0x82, 0x00, 0x28, 0x2C, 0x03, 0x00, 0x05, 0x41, 0x82, 0x00, 0x28, 0x2C, 0x03,
- 0x00, 0x06, 0x41, 0x82, 0x00, 0x28, 0x2C, 0x03, 0x00, 0x07, 0x41, 0x82, 0x00,
- 0x28, 0x48, 0x00, 0x00, 0x3C, 0x38, 0x80, 0x6A, 0x04, 0x48, 0x00, 0x00, 0x20,
- 0x38, 0x80, 0x6A, 0x08, 0x48, 0x00, 0x00, 0x18, 0x38, 0x80, 0x6A, 0x10, 0x48,
- 0x00, 0x00, 0x10, 0x38, 0x80, 0x6A, 0x20, 0x48, 0x00, 0x00, 0x08, 0x38, 0x80,
- 0x6A, 0x40, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06,
- 0x44, 0x4B, 0xCB, 0xF1, 0xC1, 0x48, 0x00, 0x00, 0x08, 0x38, 0x60, 0x00, 0x00,
+ 0x38, 0x60, 0x00, 0x06, 0x38, 0x80, 0x00, 0x01, 0x4B, 0xFF, 0xFB, 0xD9, 0x80,
+ 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80,
+ 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00,
+ 0x14, 0x38, 0x60, 0x00, 0x07, 0x38, 0x80, 0x00, 0x01, 0x4B, 0xFF, 0xFB, 0xB1,
0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E,
0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01,
- 0x00, 0x14, 0x1C, 0x03, 0x00, 0x24, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84,
- 0xDC, 0x38, 0x63, 0x03, 0xA0, 0x7C, 0x63, 0x02, 0x14, 0x4B, 0xCB, 0xF2, 0x65,
- 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E,
- 0x80, 0x00, 0x20]
+ 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06,
+ 0x44, 0x38, 0x80, 0x6A, 0x04, 0x4B, 0xCB, 0xF2, 0xC9, 0x80, 0x01, 0x00, 0x14,
+ 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94,
+ 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60,
+ 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80, 0x6A,
+ 0x08, 0x4B, 0xCB, 0xF2, 0x99, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6,
+ 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C,
+ 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63,
+ 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80, 0x6A, 0x10, 0x4B, 0xCB, 0xF2,
+ 0x69, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10,
+ 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90,
+ 0x01, 0x00, 0x14, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63,
+ 0x06, 0x44, 0x38, 0x80, 0x6A, 0x20, 0x4B, 0xCB, 0xF2, 0x39, 0x80, 0x01, 0x00,
+ 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20,
+ 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x3C,
+ 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80,
+ 0x6A, 0x40, 0x4B, 0xCB, 0xF2, 0x09, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03,
+ 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0,
+ 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x2C, 0x04, 0x00, 0x0F, 0x40,
+ 0x82, 0x00, 0x68, 0x2C, 0x03, 0x00, 0x03, 0x41, 0x82, 0x00, 0x28, 0x2C, 0x03,
+ 0x00, 0x04, 0x41, 0x82, 0x00, 0x28, 0x2C, 0x03, 0x00, 0x05, 0x41, 0x82, 0x00,
+ 0x28, 0x2C, 0x03, 0x00, 0x06, 0x41, 0x82, 0x00, 0x28, 0x2C, 0x03, 0x00, 0x07,
+ 0x41, 0x82, 0x00, 0x28, 0x48, 0x00, 0x00, 0x3C, 0x38, 0x80, 0x6A, 0x04, 0x48,
+ 0x00, 0x00, 0x20, 0x38, 0x80, 0x6A, 0x08, 0x48, 0x00, 0x00, 0x18, 0x38, 0x80,
+ 0x6A, 0x10, 0x48, 0x00, 0x00, 0x10, 0x38, 0x80, 0x6A, 0x20, 0x48, 0x00, 0x00,
+ 0x08, 0x38, 0x80, 0x6A, 0x40, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC,
+ 0x38, 0x63, 0x06, 0x44, 0x4B, 0xCB, 0xF1, 0xB1, 0x48, 0x00, 0x00, 0x08, 0x38,
+ 0x60, 0x00, 0x00, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21,
+ 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02,
+ 0xA6, 0x90, 0x01, 0x00, 0x14, 0x1C, 0x03, 0x00, 0x24, 0x3C, 0x60, 0x10, 0x20,
+ 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x03, 0xA0, 0x7C, 0x63, 0x02, 0x14, 0x4B,
+ 0xCB, 0xF2, 0x55, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21,
+ 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
Relocations:
-- {r_addend: 0x8F8C4D, r_info: 0x106, r_offset: 0x28F880E}
-- {r_addend: 0x8F8C4D, r_info: 0x104, r_offset: 0x28F8812}
+- {r_addend: 0x8F8C5D, r_info: 0x106, r_offset: 0x28F880E}
+- {r_addend: 0x8F8C5D, r_info: 0x104, r_offset: 0x28F8812}
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8826}
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F882A}
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8846}
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F884A}
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8866}
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F886A}
-- {r_addend: 0x8F8D52, r_info: 0x106, r_offset: 0x28F8872}
-- {r_addend: 0x8F8D52, r_info: 0x104, r_offset: 0x28F8876}
+- {r_addend: 0x8F8D62, r_info: 0x106, r_offset: 0x28F8872}
+- {r_addend: 0x8F8D62, r_info: 0x104, r_offset: 0x28F8876}
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F888A}
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F888E}
-- {r_addend: 0x8F8D54, r_info: 0x106, r_offset: 0x28F889E}
-- {r_addend: 0x8F8D54, r_info: 0x104, r_offset: 0x28F88A2}
+- {r_addend: 0x8F8D64, r_info: 0x106, r_offset: 0x28F889E}
+- {r_addend: 0x8F8D64, r_info: 0x104, r_offset: 0x28F88A2}
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F89F6}
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F89FA}
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8A0A}
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8A0E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8A2A}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8A2E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8A52}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8A56}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8A7A}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8A7E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8A8E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8A92}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8AAA}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8AAE}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8ABE}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8AC2}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8AD6}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8ADA}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8B2A}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8B2E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8B42}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8B46}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8B56}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8B5A}
-- {r_addend: 0x8F8C4E, r_info: 0x106, r_offset: 0x28F8B6A}
-- {r_addend: 0x8F8C4E, r_info: 0x104, r_offset: 0x28F8B6E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8B7E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8B82}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8BAA}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8BAE}
-- {r_addend: 0x8F8D55, r_info: 0x106, r_offset: 0x28F8BB6}
-- {r_addend: 0x8F8D55, r_info: 0x104, r_offset: 0x28F8BBA}
-- {r_addend: 0x8F8D56, r_info: 0x106, r_offset: 0x28F8BC2}
-- {r_addend: 0x8F8D56, r_info: 0x104, r_offset: 0x28F8BC6}
-- {r_addend: 0x8F8D57, r_info: 0x106, r_offset: 0x28F8BCE}
-- {r_addend: 0x8F8D57, r_info: 0x104, r_offset: 0x28F8BD2}
-- {r_addend: 0x8F8D58, r_info: 0x106, r_offset: 0x28F8BDA}
-- {r_addend: 0x8F8D58, r_info: 0x104, r_offset: 0x28F8BDE}
-- {r_addend: 0x8F8D59, r_info: 0x106, r_offset: 0x28F8BE6}
-- {r_addend: 0x8F8D59, r_info: 0x104, r_offset: 0x28F8BEA}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8BF2}
-- {r_addend: 0x8F8C4F, r_info: 0x106, r_offset: 0x28F8C16}
-- {r_addend: 0x8F8C4F, r_info: 0x104, r_offset: 0x28F8C1A}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8D6E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8D72}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8E4E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8E52}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8EA6}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8EAA}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8EDE}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8EE2}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8F26}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8F2A}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8F5E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8F62}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8F96}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8F9A}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8FCE}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8FD2}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9006}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F900A}
-- {r_addend: 0x8F8D53, r_info: 0x106, r_offset: 0x28F903E}
-- {r_addend: 0x8F8D53, r_info: 0x104, r_offset: 0x28F9042}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9052}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9056}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F90A6}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F90AA}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9112}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9116}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F915E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9162}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F91AE}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F91B2}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F91EA}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F91EE}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F922E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9232}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F927E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9282}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F92CA}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F92CE}
-- {r_addend: 0x8F8D53, r_info: 0x106, r_offset: 0x28F9316}
-- {r_addend: 0x8F8D53, r_info: 0x104, r_offset: 0x28F931A}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F932A}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F932E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F93A2}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F93A6}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9426}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F942A}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F943E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9442}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9456}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F945A}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F948A}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F948E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F94C6}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F94CA}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F94EA}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F94EE}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9882}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9886}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F98B2}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F98B6}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F98E2}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F98E6}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9912}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9916}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9942}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9946}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F99CA}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F99CE}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9A02}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9A06}
+- {r_addend: 0x8F8D6A, r_info: 0x106, r_offset: 0x28F8A16}
+- {r_addend: 0x8F8D6A, r_info: 0x104, r_offset: 0x28F8A1A}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8A3A}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8A3E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8A62}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8A66}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8A8A}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8A8E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8A9E}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8AA2}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8ABA}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8ABE}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8ACE}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8AD2}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8AE6}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8AEA}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8B3A}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8B3E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8B52}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8B56}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8B66}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8B6A}
+- {r_addend: 0x8F8C5E, r_info: 0x106, r_offset: 0x28F8B7A}
+- {r_addend: 0x8F8C5E, r_info: 0x104, r_offset: 0x28F8B7E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8B8E}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8B92}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8BBA}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8BBE}
+- {r_addend: 0x8F8D65, r_info: 0x106, r_offset: 0x28F8BC6}
+- {r_addend: 0x8F8D65, r_info: 0x104, r_offset: 0x28F8BCA}
+- {r_addend: 0x8F8D66, r_info: 0x106, r_offset: 0x28F8BD2}
+- {r_addend: 0x8F8D66, r_info: 0x104, r_offset: 0x28F8BD6}
+- {r_addend: 0x8F8D67, r_info: 0x106, r_offset: 0x28F8BDE}
+- {r_addend: 0x8F8D67, r_info: 0x104, r_offset: 0x28F8BE2}
+- {r_addend: 0x8F8D68, r_info: 0x106, r_offset: 0x28F8BEA}
+- {r_addend: 0x8F8D68, r_info: 0x104, r_offset: 0x28F8BEE}
+- {r_addend: 0x8F8D69, r_info: 0x106, r_offset: 0x28F8BF6}
+- {r_addend: 0x8F8D69, r_info: 0x104, r_offset: 0x28F8BFA}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8C02}
+- {r_addend: 0x8F8C5F, r_info: 0x106, r_offset: 0x28F8C26}
+- {r_addend: 0x8F8C5F, r_info: 0x104, r_offset: 0x28F8C2A}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8D7E}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8D82}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8E5E}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8E62}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8EB6}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8EBA}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8EEE}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8EF2}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8F36}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8F3A}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8F6E}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8F72}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8FA6}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8FAA}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F8FDE}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F8FE2}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9016}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F901A}
+- {r_addend: 0x8F8D63, r_info: 0x106, r_offset: 0x28F904E}
+- {r_addend: 0x8F8D63, r_info: 0x104, r_offset: 0x28F9052}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9062}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9066}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F90B6}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F90BA}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9122}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9126}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F916E}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9172}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F91BE}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F91C2}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F91FA}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F91FE}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F923E}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9242}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F928E}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9292}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F92DA}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F92DE}
+- {r_addend: 0x8F8D63, r_info: 0x106, r_offset: 0x28F9326}
+- {r_addend: 0x8F8D63, r_info: 0x104, r_offset: 0x28F932A}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F933A}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F933E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F93B2}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F93B6}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9436}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F943A}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F944E}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9452}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9466}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F946A}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F949A}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F949E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F94D6}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F94DA}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F94FA}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F94FE}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9892}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9896}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F98C2}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F98C6}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F98F2}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F98F6}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9922}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9926}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9952}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9956}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F99DA}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F99DE}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9A12}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9A16}
diff --git a/asm/patch_diffs/entrance_rando_features_diff.yaml b/asm/patch_diffs/entrance_rando_features_diff.yaml
index 79314b35..34cec290 100644
--- a/asm/patch_diffs/entrance_rando_features_diff.yaml
+++ b/asm/patch_diffs/entrance_rando_features_diff.yaml
@@ -1,18 +1,18 @@
Data:
- 0x21271A0: [0x48, 0x7D, 0x28, 0x84]
- 0x2129324: [0x48, 0x7D, 0x07, 0x18]
- 0x21A4548: [0x48, 0x75, 0x55, 0x0C]
- 0x25220C4: [0x48, 0x3D, 0x79, 0xC1]
- 0x28F9A24: [0x88, 0x1F, 0x03, 0xBC, 0x2C, 0x00, 0x00, 0x00, 0x41, 0x82, 0x00, 0x08,
- 0x4B, 0x82, 0xD7, 0x7C, 0x88, 0x09, 0x07, 0xB8, 0x4B, 0x82, 0xD7, 0x6C]
- 0x28F9A3C: [0x88, 0x1F, 0x03, 0xBC, 0x2C, 0x00, 0x00, 0x00, 0x41, 0x82, 0x00, 0x08,
- 0x4B, 0x82, 0xF8, 0xE8, 0x89, 0x8C, 0x07, 0xB8, 0x4B, 0x82, 0xF8, 0xD8]
- 0x28F9A54: [0x88, 0x1F, 0x03, 0xBC, 0x2C, 0x00, 0x00, 0x00, 0x41, 0x82, 0x00, 0x20,
+ 0x21271A0: [0x48, 0x7D, 0x28, 0x94]
+ 0x2129324: [0x48, 0x7D, 0x07, 0x28]
+ 0x21A4548: [0x48, 0x75, 0x55, 0x1C]
+ 0x25220C4: [0x48, 0x3D, 0x79, 0xD1]
+ 0x28F9A34: [0x88, 0x1F, 0x03, 0xBC, 0x2C, 0x00, 0x00, 0x00, 0x41, 0x82, 0x00, 0x08,
+ 0x4B, 0x82, 0xD7, 0x6C, 0x88, 0x09, 0x07, 0xB8, 0x4B, 0x82, 0xD7, 0x5C]
+ 0x28F9A4C: [0x88, 0x1F, 0x03, 0xBC, 0x2C, 0x00, 0x00, 0x00, 0x41, 0x82, 0x00, 0x08,
+ 0x4B, 0x82, 0xF8, 0xD8, 0x89, 0x8C, 0x07, 0xB8, 0x4B, 0x82, 0xF8, 0xC8]
+ 0x28F9A64: [0x88, 0x1F, 0x03, 0xBC, 0x2C, 0x00, 0x00, 0x00, 0x41, 0x82, 0x00, 0x20,
0x38, 0x60, 0x00, 0x01, 0x98, 0x7F, 0x05, 0xA4, 0x7F, 0xE3, 0xFB, 0x78, 0x4B,
- 0x8A, 0xA8, 0xAD, 0x38, 0x60, 0x00, 0x08, 0x98, 0x7F, 0x05, 0xA4, 0x4B, 0x8A,
- 0xAA, 0xD8, 0x7F, 0xE3, 0xFB, 0x78, 0x4B, 0x8A, 0xAA, 0xCC]
- 0x28F9A84: [0x3C, 0xA0, 0x10, 0x20, 0x80, 0xA5, 0x83, 0x44, 0x80, 0xA5, 0x02, 0x18,
- 0x88, 0xA5, 0x00, 0x3E, 0x38, 0xA5, 0x00, 0x01, 0x4B, 0xCB, 0xB6, 0x44]
+ 0x8A, 0xA8, 0x9D, 0x38, 0x60, 0x00, 0x08, 0x98, 0x7F, 0x05, 0xA4, 0x4B, 0x8A,
+ 0xAA, 0xC8, 0x7F, 0xE3, 0xFB, 0x78, 0x4B, 0x8A, 0xAA, 0xBC]
+ 0x28F9A94: [0x3C, 0xA0, 0x10, 0x20, 0x80, 0xA5, 0x83, 0x44, 0x80, 0xA5, 0x02, 0x18,
+ 0x88, 0xA5, 0x00, 0x3E, 0x38, 0xA5, 0x00, 0x01, 0x4B, 0xCB, 0xB6, 0x34]
Relocations:
-- {r_addend: 0x1F8344, r_info: 0x206, r_offset: 0x28F9A86}
-- {r_addend: 0x1F8344, r_info: 0x204, r_offset: 0x28F9A8A}
+- {r_addend: 0x1F8344, r_info: 0x206, r_offset: 0x28F9A96}
+- {r_addend: 0x1F8344, r_info: 0x204, r_offset: 0x28F9A9A}
diff --git a/asm/patch_diffs/fix_vanilla_bugs_diff.yaml b/asm/patch_diffs/fix_vanilla_bugs_diff.yaml
index 118a1922..765cec17 100644
--- a/asm/patch_diffs/fix_vanilla_bugs_diff.yaml
+++ b/asm/patch_diffs/fix_vanilla_bugs_diff.yaml
@@ -1,26 +1,26 @@
Data:
- 0x2053BB4: [0x48, 0x8A, 0x61, 0x28]
- 0x2054658: [0x48, 0x8A, 0x56, 0x44]
- 0x2102ED8: [0x48, 0x7F, 0x6E, 0x44]
+ 0x2053BB4: [0x48, 0x8A, 0x61, 0x38]
+ 0x2054658: [0x48, 0x8A, 0x56, 0x54]
+ 0x2102ED8: [0x48, 0x7F, 0x6E, 0x54]
0x210D8C8: [0x60, 0x00, 0x00, 0x00]
- 0x2139B7C: [0x48, 0x7C, 0x00, 0xF8]
- 0x2176D58: [0x48, 0x78, 0x2D, 0x44]
- 0x21A9F04: [0x48, 0x74, 0xFE, 0x84]
- 0x21D90D0: [0x48, 0x72, 0x0B, 0x65]
+ 0x2139B7C: [0x48, 0x7C, 0x01, 0x08]
+ 0x2176D58: [0x48, 0x78, 0x2D, 0x54]
+ 0x21A9F04: [0x48, 0x74, 0xFE, 0x94]
+ 0x21D90D0: [0x48, 0x72, 0x0B, 0x75]
0x21D90D4: [0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00,
0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00]
- 0x2215864: [0x48, 0x6E, 0x42, 0x70]
- 0x225AF14: [0x48, 0x69, 0xEB, 0xA4]
- 0x23238E4: [0x48, 0x5D, 0x64, 0x80]
- 0x23F0A1C: [0x48, 0x50, 0x92, 0x91, 0x2C, 0x03, 0x00, 0x00]
- 0x23FB970: [0x48, 0x4F, 0xE3, 0x3D, 0x2C, 0x03, 0x00, 0x00]
- 0x244706C: [0x48, 0x4B, 0x2A, 0xC9]
+ 0x2215864: [0x48, 0x6E, 0x42, 0x80]
+ 0x225AF14: [0x48, 0x69, 0xEB, 0xB4]
+ 0x23238E4: [0x48, 0x5D, 0x64, 0x90]
+ 0x23F0A1C: [0x48, 0x50, 0x92, 0xA1, 0x2C, 0x03, 0x00, 0x00]
+ 0x23FB970: [0x48, 0x4F, 0xE3, 0x4D, 0x2C, 0x03, 0x00, 0x00]
+ 0x244706C: [0x48, 0x4B, 0x2A, 0xD9]
0x244A694: [0x48, 0x00, 0x00, 0x08]
- 0x244A6B8: [0x48, 0x4A, 0xF4, 0xB1]
+ 0x244A6B8: [0x48, 0x4A, 0xF4, 0xC1]
0x244A6BC: [0x48, 0x00, 0x00, 0x98]
- 0x249421C: [0x48, 0x46, 0x58, 0xD1]
- 0x2519478: [0x48, 0x3E, 0x08, 0x7C]
- 0x25B0AA0: [0x48, 0x34, 0x91, 0xF0]
+ 0x249421C: [0x48, 0x46, 0x58, 0xE1]
+ 0x2519478: [0x48, 0x3E, 0x08, 0x8C]
+ 0x25B0AA0: [0x48, 0x34, 0x92, 0x00]
0x26DD5C8: [0x60, 0x00, 0x00, 0x04, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00]
0x26DD5E0: [0x60, 0x00, 0x00, 0x02, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00]
0x26DD5F4: [0x40, 0x82, 0x00, 0x08, 0x60, 0x00, 0x00, 0x01]
@@ -35,29 +35,29 @@ Data:
0x02, 0x40, 0x82, 0x00, 0x08, 0x39, 0x60, 0x00, 0x04, 0x91, 0x7F, 0x00, 0x60,
0x48, 0x00, 0x00, 0x40]
0x26DDA38: [0x39, 0x60, 0x00, 0x08]
- 0x28F9A9C: [0x28, 0x1E, 0x00, 0x00, 0x41, 0x82, 0x00, 0x08, 0x48, 0x00, 0x00, 0x0C,
- 0x38, 0x00, 0x00, 0x00, 0x4B, 0x87, 0xD2, 0xBC, 0x81, 0x5E, 0x02, 0xE0, 0x4B,
- 0x87, 0xD2, 0xA8]
- 0x28F9AB8: [0x2C, 0x0C, 0x00, 0x38, 0x40, 0x82, 0x00, 0x08, 0x4B, 0x96, 0x14, 0x5C,
- 0x2C, 0x0C, 0x00, 0xFF, 0x40, 0x82, 0x00, 0x08, 0x4B, 0x96, 0x14, 0xE8, 0x4B,
- 0x96, 0x14, 0xB0]
- 0x28F9AD4: [0x40, 0x82, 0x00, 0x0C, 0x3B, 0xE0, 0x0F, 0x75, 0x4B, 0x91, 0xC2, 0xA4,
- 0x41, 0x80, 0x00, 0x08, 0x4B, 0x91, 0xBD, 0x84, 0x4B, 0x91, 0xBD, 0xB0]
- 0x28F9AEC: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x4B, 0xCD, 0xB7, 0x21, 0x28, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00, 0x24, 0x88,
+ 0x28F9AAC: [0x28, 0x1E, 0x00, 0x00, 0x41, 0x82, 0x00, 0x08, 0x48, 0x00, 0x00, 0x0C,
+ 0x38, 0x00, 0x00, 0x00, 0x4B, 0x87, 0xD2, 0xAC, 0x81, 0x5E, 0x02, 0xE0, 0x4B,
+ 0x87, 0xD2, 0x98]
+ 0x28F9AC8: [0x2C, 0x0C, 0x00, 0x38, 0x40, 0x82, 0x00, 0x08, 0x4B, 0x96, 0x14, 0x4C,
+ 0x2C, 0x0C, 0x00, 0xFF, 0x40, 0x82, 0x00, 0x08, 0x4B, 0x96, 0x14, 0xD8, 0x4B,
+ 0x96, 0x14, 0xA0]
+ 0x28F9AE4: [0x40, 0x82, 0x00, 0x0C, 0x3B, 0xE0, 0x0F, 0x75, 0x4B, 0x91, 0xC2, 0x94,
+ 0x41, 0x80, 0x00, 0x08, 0x4B, 0x91, 0xBD, 0x74, 0x4B, 0x91, 0xBD, 0xA0]
+ 0x28F9AFC: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x4B, 0xCD, 0xB7, 0x11, 0x28, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00, 0x24, 0x88,
0x03, 0x21, 0xF6, 0x2C, 0x00, 0x00, 0x00, 0x41, 0x82, 0x00, 0x18, 0x88, 0x1F,
0x21, 0xF6, 0x2C, 0x00, 0x00, 0x00, 0x40, 0x82, 0x00, 0x0C, 0x38, 0x00, 0x00,
0x01, 0x98, 0x1F, 0x21, 0xF6, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6,
0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28F9B34: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x4B, 0xC1, 0xCC, 0x3D, 0x88, 0x1D, 0x03, 0xD0, 0x2C, 0x00, 0x00, 0x00, 0x41,
+ 0x28F9B44: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x4B, 0xC1, 0xCC, 0x2D, 0x88, 0x1D, 0x03, 0xD0, 0x2C, 0x00, 0x00, 0x00, 0x41,
0x82, 0x00, 0x0C, 0x88, 0x1D, 0x03, 0xD4, 0x98, 0x1D, 0x0A, 0xAD, 0x80, 0x01,
0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00,
0x20]
- 0x28F9B68: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28F9B78: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x88, 0x1F, 0x03, 0xA1, 0x7C, 0x00, 0x07, 0x75, 0x40, 0x81, 0x00, 0x14, 0x88,
0x1F, 0x09, 0xA6, 0x2C, 0x00, 0x00, 0x00, 0x41, 0x81, 0x00, 0x08, 0x48, 0x00,
- 0x00, 0x94, 0x4B, 0xCD, 0xB9, 0x35, 0x2C, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00,
+ 0x00, 0x94, 0x4B, 0xCD, 0xB9, 0x25, 0x2C, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00,
0x88, 0x81, 0x81, 0x00, 0x18, 0x28, 0x0C, 0x00, 0x00, 0x41, 0x82, 0x00, 0x7C,
0x28, 0x0C, 0x00, 0x00, 0x41, 0x82, 0x00, 0x74, 0xA9, 0x6C, 0x00, 0x08, 0x2C,
0x0B, 0x00, 0xD3, 0x40, 0x82, 0x00, 0x68, 0xA9, 0x2C, 0x05, 0x62, 0x2C, 0x09,
@@ -70,45 +70,45 @@ Data:
0x39, 0x20, 0x00, 0x00, 0x99, 0x3F, 0x09, 0xA6, 0x38, 0x60, 0x00, 0x01, 0x48,
0x00, 0x00, 0x08, 0x38, 0x60, 0x00, 0x00, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28F9C34: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x4B, 0xC1, 0xC6, 0xC1, 0x39, 0x3F, 0x19, 0x90, 0x90, 0x61, 0x00, 0xD8, 0x91,
+ 0x28F9C44: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x4B, 0xC1, 0xC6, 0xB1, 0x39, 0x3F, 0x19, 0x90, 0x90, 0x61, 0x00, 0xD8, 0x91,
0x21, 0x00, 0xEC, 0x80, 0xA3, 0x00, 0x10, 0x54, 0xA4, 0x02, 0xD7, 0x41, 0x82,
0x00, 0x0C, 0x38, 0x00, 0x00, 0x01, 0x98, 0x1F, 0x1D, 0xD4, 0x80, 0x01, 0x00,
0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28F9C74: [0xC1, 0x41, 0x00, 0x24, 0xC0, 0x29, 0xEF, 0xE8, 0xFC, 0x0A, 0x08, 0x40,
- 0x40, 0x80, 0x00, 0x0C, 0xED, 0x2B, 0x02, 0xF2, 0x4B, 0x83, 0xFE, 0xF8, 0x4B,
- 0x84, 0x01, 0xC0]
- 0x28F9C90: [0x4B, 0xCE, 0x7C, 0x99, 0x4B, 0xC2, 0x64, 0x41, 0x4B, 0xCB, 0x6E, 0x0C]
- 0x28F9C9C: [0x38, 0x00, 0x00, 0x00, 0x90, 0x1E, 0x05, 0x10, 0x38, 0x00, 0x00, 0x02,
- 0x4B, 0x75, 0xA9, 0xB4]
- 0x28F9CAC: [0xA0, 0x7F, 0x69, 0xB0, 0x28, 0x03, 0x00, 0x33, 0x41, 0x82, 0x00, 0x20,
+ 0x28F9C84: [0xC1, 0x41, 0x00, 0x24, 0xC0, 0x29, 0xEF, 0xE8, 0xFC, 0x0A, 0x08, 0x40,
+ 0x40, 0x80, 0x00, 0x0C, 0xED, 0x2B, 0x02, 0xF2, 0x4B, 0x83, 0xFE, 0xE8, 0x4B,
+ 0x84, 0x01, 0xB0]
+ 0x28F9CA0: [0x4B, 0xCE, 0x7C, 0x89, 0x4B, 0xC2, 0x64, 0x31, 0x4B, 0xCB, 0x6D, 0xFC]
+ 0x28F9CAC: [0x38, 0x00, 0x00, 0x00, 0x90, 0x1E, 0x05, 0x10, 0x38, 0x00, 0x00, 0x02,
+ 0x4B, 0x75, 0xA9, 0xA4]
+ 0x28F9CBC: [0xA0, 0x7F, 0x69, 0xB0, 0x28, 0x03, 0x00, 0x33, 0x41, 0x82, 0x00, 0x20,
0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x88, 0x63, 0x00, 0x2F, 0x28,
0x03, 0x00, 0xFF, 0x40, 0x82, 0x00, 0x0C, 0x38, 0x60, 0x00, 0x00, 0x4E, 0x80,
0x00, 0x20, 0x38, 0x60, 0x00, 0x01, 0x4E, 0x80, 0x00, 0x20]
- 0x28F9CDC: [0xC1, 0x2C, 0x03, 0x14, 0x89, 0x4C, 0x03, 0xA1, 0x2C, 0x0A, 0x00, 0x19,
- 0x41, 0x81, 0x00, 0x08, 0x4B, 0x75, 0x9E, 0xCC, 0x4B, 0x75, 0x9F, 0x64]
- 0x28F9CF4: [0xA0, 0x7B, 0x00, 0x08, 0x28, 0x03, 0x00, 0xF6, 0x41, 0x82, 0x00, 0x0C,
- 0x88, 0x7B, 0x03, 0x26, 0x4B, 0xC1, 0xF7, 0x78, 0x3B, 0xA0, 0x00, 0x20, 0x4B,
- 0xC1, 0xF9, 0xF4]
- 0x28F9D10: [0x43, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x42, 0x40, 0x00,
+ 0x28F9CEC: [0xC1, 0x2C, 0x03, 0x14, 0x89, 0x4C, 0x03, 0xA1, 0x2C, 0x0A, 0x00, 0x19,
+ 0x41, 0x81, 0x00, 0x08, 0x4B, 0x75, 0x9E, 0xBC, 0x4B, 0x75, 0x9F, 0x54]
+ 0x28F9D04: [0xA0, 0x7B, 0x00, 0x08, 0x28, 0x03, 0x00, 0xF6, 0x41, 0x82, 0x00, 0x0C,
+ 0x88, 0x7B, 0x03, 0x26, 0x4B, 0xC1, 0xF7, 0x68, 0x3B, 0xA0, 0x00, 0x20, 0x4B,
+ 0xC1, 0xF9, 0xE4]
+ 0x28F9D20: [0x43, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x42, 0x40, 0x00,
0xD1, 0x79, 0x00, 0x08, 0xC0, 0x39, 0x00, 0x00, 0xC0, 0x59, 0x00, 0x08, 0xEC,
0x21, 0x00, 0x72, 0xEC, 0x42, 0x00, 0xB2, 0xEC, 0x21, 0x10, 0x2A, 0x4B, 0xFF,
- 0xA6, 0x51, 0x3C, 0x60, 0x02, 0x90, 0xC0, 0x43, 0x9D, 0x10, 0xFC, 0x01, 0x10,
- 0x40, 0x41, 0x81, 0x00, 0x1C, 0x3C, 0x60, 0x02, 0x90, 0x38, 0x63, 0x9D, 0x14,
+ 0xA6, 0x41, 0x3C, 0x60, 0x02, 0x90, 0xC0, 0x43, 0x9D, 0x20, 0xFC, 0x01, 0x10,
+ 0x40, 0x41, 0x81, 0x00, 0x1C, 0x3C, 0x60, 0x02, 0x90, 0x38, 0x63, 0x9D, 0x24,
0xC0, 0x23, 0x00, 0x00, 0xD0, 0x39, 0x00, 0x00, 0xC0, 0x23, 0x00, 0x04, 0xD0,
- 0x39, 0x00, 0x08, 0x4B, 0x80, 0x91, 0x7C]
- 0x28F9D64: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0xD4,
- 0x4B, 0xCB, 0xE0, 0x91, 0x2C, 0x03, 0x00, 0x08, 0x41, 0x80, 0x00, 0x0C, 0x4B,
- 0xC2, 0x63, 0x59, 0x4B, 0xA2, 0x9B, 0x68, 0x4B, 0xA2, 0x9B, 0xB8]
- 0x28F9D88: [0x88, 0x7F, 0x00, 0x0D, 0x2C, 0x03, 0x00, 0x02, 0x41, 0x82, 0x00, 0x08,
- 0x4B, 0x8B, 0x01, 0x9C, 0x35, 0x6B, 0xFF, 0xFF, 0x4B, 0x8B, 0x01, 0x6C]
+ 0x39, 0x00, 0x08, 0x4B, 0x80, 0x91, 0x6C]
+ 0x28F9D74: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0xD4,
+ 0x4B, 0xCB, 0xE0, 0x81, 0x2C, 0x03, 0x00, 0x08, 0x41, 0x80, 0x00, 0x0C, 0x4B,
+ 0xC2, 0x63, 0x49, 0x4B, 0xA2, 0x9B, 0x58, 0x4B, 0xA2, 0x9B, 0xA8]
+ 0x28F9D98: [0x88, 0x7F, 0x00, 0x0D, 0x2C, 0x03, 0x00, 0x02, 0x41, 0x82, 0x00, 0x08,
+ 0x4B, 0x8B, 0x01, 0x8C, 0x35, 0x6B, 0xFF, 0xFF, 0x4B, 0x8B, 0x01, 0x5C]
Relocations:
-- {r_addend: 0xEFE8, r_info: 0x204, r_offset: 0x28F9C7A}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9CBA}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9CBE}
-- {r_addend: 0x8F9D10, r_info: 0x106, r_offset: 0x28F9D3A}
-- {r_addend: 0x8F9D10, r_info: 0x104, r_offset: 0x28F9D3E}
-- {r_addend: 0x8F9D14, r_info: 0x106, r_offset: 0x28F9D4A}
-- {r_addend: 0x8F9D14, r_info: 0x104, r_offset: 0x28F9D4E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9D66}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9D6A}
+- {r_addend: 0xEFE8, r_info: 0x204, r_offset: 0x28F9C8A}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9CCA}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9CCE}
+- {r_addend: 0x8F9D20, r_info: 0x106, r_offset: 0x28F9D4A}
+- {r_addend: 0x8F9D20, r_info: 0x104, r_offset: 0x28F9D4E}
+- {r_addend: 0x8F9D24, r_info: 0x106, r_offset: 0x28F9D5A}
+- {r_addend: 0x8F9D24, r_info: 0x104, r_offset: 0x28F9D5E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9D76}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9D7A}
diff --git a/asm/patch_diffs/flexible_entrances_diff.yaml b/asm/patch_diffs/flexible_entrances_diff.yaml
index 0a874254..3ae1b287 100644
--- a/asm/patch_diffs/flexible_entrances_diff.yaml
+++ b/asm/patch_diffs/flexible_entrances_diff.yaml
@@ -2,15 +2,15 @@ Data:
0x205CB8C: [0x38, 0x60, 0x00, 0x01, 0x38, 0x80, 0x00, 0x00, 0x38, 0xA0, 0x00, 0x00,
0x38, 0xC6, 0x00, 0x00, 0x48, 0x56, 0x6B, 0xAD, 0x48, 0x4C, 0x35, 0x35, 0x38,
0x80, 0x00, 0x00, 0x98, 0x83, 0x51, 0x4D]
- 0x2411DF4: [0x48, 0x4E, 0x7F, 0xAC]
- 0x24136A8: [0x48, 0x4E, 0x67, 0x28]
- 0x2657F04: [0x48, 0x2A, 0x1E, 0xE4]
- 0x28F9DA0: [0xA0, 0xF8, 0x02, 0xF8, 0x70, 0xE7, 0x00, 0x01, 0x41, 0x82, 0x00, 0x20,
+ 0x2411DF4: [0x48, 0x4E, 0x7F, 0xBC]
+ 0x24136A8: [0x48, 0x4E, 0x67, 0x38]
+ 0x2657F04: [0x48, 0x2A, 0x1E, 0xF4]
+ 0x28F9DB0: [0xA0, 0xF8, 0x02, 0xF8, 0x70, 0xE7, 0x00, 0x01, 0x41, 0x82, 0x00, 0x20,
0x88, 0xE9, 0x11, 0x77, 0x2C, 0x07, 0x00, 0x02, 0x41, 0x82, 0x00, 0x14, 0x2C,
0x07, 0x00, 0x03, 0x41, 0x82, 0x00, 0x0C, 0x38, 0xE0, 0x00, 0x02, 0x98, 0xE9,
- 0x11, 0x77, 0x2C, 0x06, 0x00, 0x0E, 0x4B, 0xB1, 0x80, 0x2C]
- 0x28F9DD0: [0x40, 0x82, 0x00, 0x14, 0x2C, 0x18, 0x00, 0x05, 0x40, 0x82, 0x00, 0x08,
- 0x4B, 0xB1, 0x9A, 0x50, 0x4B, 0xB1, 0x98, 0xCC, 0x4B, 0xB1, 0x98, 0xEC]
- 0x28F9DE8: [0x7C, 0x09, 0x58, 0x2E, 0x81, 0x83, 0x09, 0x20, 0x7C, 0x00, 0x60, 0x00,
+ 0x11, 0x77, 0x2C, 0x06, 0x00, 0x0E, 0x4B, 0xB1, 0x80, 0x1C]
+ 0x28F9DE0: [0x40, 0x82, 0x00, 0x14, 0x2C, 0x18, 0x00, 0x05, 0x40, 0x82, 0x00, 0x08,
+ 0x4B, 0xB1, 0x9A, 0x40, 0x4B, 0xB1, 0x98, 0xBC, 0x4B, 0xB1, 0x98, 0xDC]
+ 0x28F9DF8: [0x7C, 0x09, 0x58, 0x2E, 0x81, 0x83, 0x09, 0x20, 0x7C, 0x00, 0x60, 0x00,
0x41, 0x82, 0x00, 0x0C, 0x39, 0x80, 0x00, 0x00, 0x91, 0x88, 0x00, 0x64, 0x4B,
- 0xD5, 0xE1, 0x08]
+ 0xD5, 0xE0, 0xF8]
diff --git a/asm/patch_diffs/flexible_hint_locations_diff.yaml b/asm/patch_diffs/flexible_hint_locations_diff.yaml
index 9960b7eb..b4f17fec 100644
--- a/asm/patch_diffs/flexible_hint_locations_diff.yaml
+++ b/asm/patch_diffs/flexible_hint_locations_diff.yaml
@@ -6,19 +6,19 @@ Data:
0x21E6900: [0x38, 0x60, 0x00, 0x00]
0x21E6924: [0x38, 0x60, 0x00, 0x00]
0x21E6950: [0x38, 0x60, 0x00, 0x00]
- 0x2473514: [0x3C, 0x80, 0x02, 0x90, 0x88, 0x84, 0x9E, 0x3C, 0x2C, 0x04, 0x00, 0x00,
+ 0x2473514: [0x3C, 0x80, 0x02, 0x90, 0x88, 0x84, 0x9E, 0x4C, 0x2C, 0x04, 0x00, 0x00,
0x41, 0x82, 0x0C, 0xC0]
0x2473540: [0x48, 0x00, 0x0B, 0xEC]
0x2474194: [0x3B, 0xC0, 0x0D, 0x77]
- 0x2481050: [0x48, 0x47, 0x8D, 0xB8]
- 0x28F9E04: [0x00, 0x00, 0x0D, 0x73, 0x81, 0x9F, 0x06, 0x48, 0x2C, 0x0C, 0x0D, 0x73,
- 0x41, 0x80, 0x00, 0x28, 0x3D, 0x60, 0x02, 0x90, 0x81, 0x6B, 0x9E, 0x04, 0x7C,
+ 0x2481050: [0x48, 0x47, 0x8D, 0xC8]
+ 0x28F9E14: [0x00, 0x00, 0x0D, 0x73, 0x81, 0x9F, 0x06, 0x48, 0x2C, 0x0C, 0x0D, 0x73,
+ 0x41, 0x80, 0x00, 0x28, 0x3D, 0x60, 0x02, 0x90, 0x81, 0x6B, 0x9E, 0x14, 0x7C,
0x0C, 0x58, 0x00, 0x41, 0x81, 0x00, 0x18, 0x41, 0x82, 0x00, 0x10, 0x39, 0x8C,
- 0x00, 0x01, 0x91, 0x9F, 0x06, 0x48, 0x4B, 0xB8, 0x76, 0x90, 0x4B, 0xB8, 0x76,
- 0xA8, 0x4B, 0xB8, 0x72, 0x1C]
- 0x28F9E3C: [0x00, 0x00, 0x00, 0x00]
+ 0x00, 0x01, 0x91, 0x9F, 0x06, 0x48, 0x4B, 0xB8, 0x76, 0x80, 0x4B, 0xB8, 0x76,
+ 0x98, 0x4B, 0xB8, 0x72, 0x0C]
+ 0x28F9E4C: [0x00, 0x00, 0x00, 0x00]
Relocations:
-- {r_addend: 0x8F9E04, r_info: 0x106, r_offset: 0x28F9E16}
-- {r_addend: 0x8F9E04, r_info: 0x104, r_offset: 0x28F9E1A}
-- {r_addend: 0x8F9E3C, r_info: 0x106, r_offset: 0x2473516}
-- {r_addend: 0x8F9E3C, r_info: 0x104, r_offset: 0x247351A}
+- {r_addend: 0x8F9E14, r_info: 0x106, r_offset: 0x28F9E26}
+- {r_addend: 0x8F9E14, r_info: 0x104, r_offset: 0x28F9E2A}
+- {r_addend: 0x8F9E4C, r_info: 0x106, r_offset: 0x2473516}
+- {r_addend: 0x8F9E4C, r_info: 0x104, r_offset: 0x247351A}
diff --git a/asm/patch_diffs/flexible_item_locations_diff.yaml b/asm/patch_diffs/flexible_item_locations_diff.yaml
index 85870c45..ab009f35 100644
--- a/asm/patch_diffs/flexible_item_locations_diff.yaml
+++ b/asm/patch_diffs/flexible_item_locations_diff.yaml
@@ -4,106 +4,106 @@ Data:
0x2095B70: [0x28, 0x03, 0x00, 0x04]
0x2097064: [0x60, 0x00, 0x00, 0x00]
0x2097074: [0x60, 0x00, 0x00, 0x00]
- 0x20C1CA0: [0x48, 0x83, 0x83, 0xAD]
+ 0x20C1CA0: [0x48, 0x83, 0x83, 0xBD]
0x20D0AE4: [0x88, 0x9F, 0x00, 0xB2]
0x20D0AF0: [0x39, 0x00, 0x00, 0x01]
0x21031F0: [0x38, 0xC0, 0x00, 0x00]
0x212456C: [0x88, 0x8C, 0x00, 0xB0]
0x2124578: [0x38, 0xE0, 0x00, 0x00]
0x2124580: [0x39, 0x00, 0x00, 0x00]
- 0x213B624: [0x48, 0x7B, 0xEA, 0x01]
+ 0x213B624: [0x48, 0x7B, 0xEA, 0x11]
0x21A5940: [0x60, 0x00, 0x00, 0x00]
0x21FCCD4: [0x38, 0x60, 0x6A, 0x02, 0x60, 0x00, 0x00, 0x00]
- 0x21FCCE0: [0x48, 0x6F, 0xC0, 0x7D]
- 0x2200D54: [0x48, 0x6F, 0x94, 0xEC]
- 0x22022F0: [0x38, 0x60, 0x6A, 0x02, 0x60, 0x00, 0x00, 0x00, 0x48, 0x6F, 0x6A, 0x65]
+ 0x21FCCE0: [0x48, 0x6F, 0xC0, 0x8D]
+ 0x2200D54: [0x48, 0x6F, 0x94, 0xFC]
+ 0x22022F0: [0x38, 0x60, 0x6A, 0x02, 0x60, 0x00, 0x00, 0x00, 0x48, 0x6F, 0x6A, 0x75]
0x2212C64: [0x7E, 0xF4, 0xBB, 0x78, 0x88, 0x7A, 0x09, 0x9F, 0x28, 0x03, 0x00, 0x04,
0x41, 0x82, 0x00, 0x3C, 0x28, 0x03, 0x00, 0x05, 0x41, 0x82, 0x00, 0x34, 0x48,
- 0x6E, 0x71, 0xF9, 0x2C, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00, 0x28, 0x48, 0x00,
+ 0x6E, 0x72, 0x09, 0x2C, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00, 0x28, 0x48, 0x00,
0x00, 0x14]
- 0x221543C: [0x48, 0x6E, 0x4A, 0x69, 0x2C, 0x03, 0x00, 0x01]
- 0x2215450: [0x48, 0x6E, 0x49, 0xF1]
+ 0x221543C: [0x48, 0x6E, 0x4A, 0x79, 0x2C, 0x03, 0x00, 0x01]
+ 0x2215450: [0x48, 0x6E, 0x4A, 0x01]
0x22301DC: [0x48, 0x00, 0x01, 0x64]
- 0x22313A8: [0x48, 0x6C, 0x8F, 0x51]
- 0x2231414: [0x48, 0x6C, 0x8E, 0xE5]
+ 0x22313A8: [0x48, 0x6C, 0x8F, 0x61]
+ 0x2231414: [0x48, 0x6C, 0x8E, 0xF5]
0x22451D8: [0x48, 0x00, 0x00, 0x08]
- 0x227C2B8: [0x48, 0x67, 0xDF, 0x45]
+ 0x227C2B8: [0x48, 0x67, 0xDF, 0x55]
0x227D200: [0x48, 0x00, 0x00, 0x40]
- 0x227D244: [0x38, 0x60, 0x6A, 0x01, 0x60, 0x00, 0x00, 0x00, 0x48, 0x67, 0xBB, 0x11]
+ 0x227D244: [0x38, 0x60, 0x6A, 0x01, 0x60, 0x00, 0x00, 0x00, 0x48, 0x67, 0xBB, 0x21]
0x2299404: [0x48, 0x00, 0x00, 0x6C]
0x2299564: [0x48, 0x00, 0x00, 0x38]
- 0x22BE9D8: [0x38, 0x60, 0x69, 0x04, 0x48, 0x63, 0xA3, 0x81]
- 0x22BEF34: [0x38, 0x60, 0x69, 0x10, 0x48, 0x63, 0x9E, 0x25]
- 0x22BF178: [0x38, 0x60, 0x69, 0x10, 0x48, 0x63, 0x9B, 0xE1]
- 0x22BF310: [0x38, 0x60, 0x69, 0x04, 0x48, 0x63, 0x9A, 0x49]
- 0x22BFD4C: [0x38, 0x60, 0x69, 0x10, 0x48, 0x63, 0x90, 0x0D]
- 0x22C1038: [0x48, 0x63, 0x90, 0x75]
- 0x22C1064: [0x48, 0x63, 0x90, 0x49]
- 0x22C3360: [0x38, 0x60, 0x69, 0x10, 0x48, 0x63, 0x59, 0xF9]
+ 0x22BE9D8: [0x38, 0x60, 0x69, 0x04, 0x48, 0x63, 0xA3, 0x91]
+ 0x22BEF34: [0x38, 0x60, 0x69, 0x10, 0x48, 0x63, 0x9E, 0x35]
+ 0x22BF178: [0x38, 0x60, 0x69, 0x10, 0x48, 0x63, 0x9B, 0xF1]
+ 0x22BF310: [0x38, 0x60, 0x69, 0x04, 0x48, 0x63, 0x9A, 0x59]
+ 0x22BFD4C: [0x38, 0x60, 0x69, 0x10, 0x48, 0x63, 0x90, 0x1D]
+ 0x22C1038: [0x48, 0x63, 0x90, 0x85]
+ 0x22C1064: [0x48, 0x63, 0x90, 0x59]
+ 0x22C3360: [0x38, 0x60, 0x69, 0x10, 0x48, 0x63, 0x5A, 0x09]
0x22C6440: [0x38, 0x60, 0x6A, 0x80]
- 0x22C6448: [0x48, 0x63, 0x29, 0x15]
- 0x22C6454: [0x48, 0x63, 0x3C, 0xA8]
- 0x22C6D94: [0x38, 0x60, 0x69, 0x08, 0x48, 0x63, 0x1F, 0xC5]
+ 0x22C6448: [0x48, 0x63, 0x29, 0x25]
+ 0x22C6454: [0x48, 0x63, 0x3C, 0xB8]
+ 0x22C6D94: [0x38, 0x60, 0x69, 0x08, 0x48, 0x63, 0x1F, 0xD5]
0x22C7AE0: [0x38, 0x60, 0x69, 0x10]
- 0x22C7AE8: [0x48, 0x63, 0x12, 0x75]
- 0x22C7B74: [0x38, 0x60, 0x69, 0x10, 0x48, 0x63, 0x11, 0xE5]
+ 0x22C7AE8: [0x48, 0x63, 0x12, 0x85]
+ 0x22C7B74: [0x38, 0x60, 0x69, 0x10, 0x48, 0x63, 0x11, 0xF5]
0x22CC550: [0x38, 0x60, 0x69, 0x04]
- 0x22CC558: [0x48, 0x62, 0xC8, 0x05]
- 0x22CC578: [0x48, 0x62, 0xC7, 0xE5]
- 0x22CFA80: [0x48, 0x62, 0xA6, 0xA5]
- 0x22D05B4: [0x38, 0x60, 0x69, 0x20, 0x48, 0x62, 0x87, 0xA5]
- 0x22D94E8: [0x38, 0x60, 0x69, 0x40, 0x60, 0x00, 0x00, 0x00, 0x48, 0x61, 0xF8, 0x6D]
- 0x22DA8A4: [0x48, 0x61, 0xF8, 0xB5]
+ 0x22CC558: [0x48, 0x62, 0xC8, 0x15]
+ 0x22CC578: [0x48, 0x62, 0xC7, 0xF5]
+ 0x22CFA80: [0x48, 0x62, 0xA6, 0xB5]
+ 0x22D05B4: [0x38, 0x60, 0x69, 0x20, 0x48, 0x62, 0x87, 0xB5]
+ 0x22D94E8: [0x38, 0x60, 0x69, 0x40, 0x60, 0x00, 0x00, 0x00, 0x48, 0x61, 0xF8, 0x7D]
+ 0x22DA8A4: [0x48, 0x61, 0xF8, 0xC5]
0x22E512C: [0x38, 0x60, 0x69, 0x80]
- 0x22E5154: [0x48, 0x61, 0x3C, 0x09]
- 0x22E5FB0: [0x48, 0x61, 0x42, 0x09]
- 0x22E5FDC: [0x48, 0x61, 0x41, 0xDD]
- 0x22E7B74: [0x48, 0x61, 0x1D, 0xF1]
- 0x22E7B88: [0x48, 0x61, 0x1D, 0xDD]
- 0x22E7B9C: [0x48, 0x61, 0x1D, 0xC9]
- 0x22E7BB0: [0x48, 0x61, 0x1D, 0xB5]
- 0x22E7BC4: [0x48, 0x61, 0x1D, 0xA1]
- 0x22E954C: [0x48, 0x61, 0x04, 0x19]
- 0x22E9748: [0x48, 0x61, 0x02, 0x1D]
- 0x22EAA98: [0x48, 0x60, 0xEE, 0xCD]
- 0x22EAAAC: [0x48, 0x60, 0xEE, 0xB9]
- 0x22EAAC0: [0x48, 0x60, 0xEE, 0xA5]
- 0x22EAAD4: [0x48, 0x60, 0xEE, 0x91]
- 0x22EAAE8: [0x48, 0x60, 0xEE, 0x7D]
- 0x22EAE38: [0x48, 0x60, 0xEB, 0x2D]
- 0x22EAE4C: [0x48, 0x60, 0xEB, 0x19]
- 0x22EAE60: [0x48, 0x60, 0xEB, 0x05]
- 0x22EAE74: [0x48, 0x60, 0xEA, 0xF1]
- 0x22EAE88: [0x48, 0x60, 0xEA, 0xDD]
- 0x22EB690: [0x48, 0x60, 0xE2, 0xD5]
- 0x22EB6BC: [0x48, 0x60, 0xE2, 0xA9]
- 0x22EB6E8: [0x48, 0x60, 0xE2, 0x7D]
- 0x22EB714: [0x48, 0x60, 0xE2, 0x51]
- 0x22EB740: [0x48, 0x60, 0xE2, 0x25]
+ 0x22E5154: [0x48, 0x61, 0x3C, 0x19]
+ 0x22E5FB0: [0x48, 0x61, 0x42, 0x19]
+ 0x22E5FDC: [0x48, 0x61, 0x41, 0xED]
+ 0x22E7B74: [0x48, 0x61, 0x1E, 0x01]
+ 0x22E7B88: [0x48, 0x61, 0x1D, 0xED]
+ 0x22E7B9C: [0x48, 0x61, 0x1D, 0xD9]
+ 0x22E7BB0: [0x48, 0x61, 0x1D, 0xC5]
+ 0x22E7BC4: [0x48, 0x61, 0x1D, 0xB1]
+ 0x22E954C: [0x48, 0x61, 0x04, 0x29]
+ 0x22E9748: [0x48, 0x61, 0x02, 0x2D]
+ 0x22EAA98: [0x48, 0x60, 0xEE, 0xDD]
+ 0x22EAAAC: [0x48, 0x60, 0xEE, 0xC9]
+ 0x22EAAC0: [0x48, 0x60, 0xEE, 0xB5]
+ 0x22EAAD4: [0x48, 0x60, 0xEE, 0xA1]
+ 0x22EAAE8: [0x48, 0x60, 0xEE, 0x8D]
+ 0x22EAE38: [0x48, 0x60, 0xEB, 0x3D]
+ 0x22EAE4C: [0x48, 0x60, 0xEB, 0x29]
+ 0x22EAE60: [0x48, 0x60, 0xEB, 0x15]
+ 0x22EAE74: [0x48, 0x60, 0xEB, 0x01]
+ 0x22EAE88: [0x48, 0x60, 0xEA, 0xED]
+ 0x22EB690: [0x48, 0x60, 0xE2, 0xE5]
+ 0x22EB6BC: [0x48, 0x60, 0xE2, 0xB9]
+ 0x22EB6E8: [0x48, 0x60, 0xE2, 0x8D]
+ 0x22EB714: [0x48, 0x60, 0xE2, 0x61]
+ 0x22EB740: [0x48, 0x60, 0xE2, 0x35]
0x22F42A8: [0x48, 0x00, 0x00, 0xB0]
0x22F50FC: [0x48, 0x00, 0x00, 0x38]
0x2341B0C: [0x38, 0x80, 0x00, 0x05, 0x38, 0x6C, 0x00, 0x20]
0x2341B14: [0x48, 0x27, 0x85, 0xAD]
0x2341B1C: [0x41, 0x82, 0x00, 0x74]
- 0x2346F28: [0x48, 0x5B, 0x2F, 0xE8]
- 0x2347ABC: [0x48, 0x5B, 0x24, 0x65]
+ 0x2346F28: [0x48, 0x5B, 0x2F, 0xF8]
+ 0x2347ABC: [0x48, 0x5B, 0x24, 0x75]
0x2347AC0: [0x2C, 0x03, 0xFF, 0xFF]
0x2347ACC: [0x60, 0x00, 0x00, 0x00]
- 0x2347C34: [0x48, 0x5B, 0x17, 0x91, 0x48, 0x5B, 0x22, 0xBC]
+ 0x2347C34: [0x48, 0x5B, 0x17, 0xA1, 0x48, 0x5B, 0x22, 0xCC]
0x2347C48: [0x60, 0x00, 0x00, 0x00]
0x2347CB4: [0x60, 0x00, 0x00, 0x00]
- 0x2347D18: [0x48, 0x5B, 0x22, 0x35]
+ 0x2347D18: [0x48, 0x5B, 0x22, 0x45]
0x2358A54: [0x60, 0x00, 0x00, 0x00]
- 0x2358A8C: [0x48, 0x5A, 0x19, 0x18]
- 0x23B6390: [0x48, 0x54, 0x35, 0xD5]
- 0x23DBD88: [0x48, 0x51, 0xE5, 0x0C]
+ 0x2358A8C: [0x48, 0x5A, 0x19, 0x28]
+ 0x23B6390: [0x48, 0x54, 0x35, 0xE5]
+ 0x23DBD88: [0x48, 0x51, 0xE5, 0x1C]
0x2442248: [0x38, 0x80, 0x69, 0x01]
0x24675F4: [0x2C, 0x1F, 0x00, 0x01, 0x41, 0x82, 0x00, 0x14, 0x2C, 0x1F, 0x00, 0x03,
0x41, 0x82, 0x00, 0x0C, 0x2C, 0x1F, 0x00, 0x05, 0x40, 0x82, 0x00, 0xAC, 0x3B,
0xFF, 0x00, 0x60]
- 0x24CC08C: [0x48, 0x42, 0xE2, 0xCD]
- 0x24CC134: [0x48, 0x42, 0xE2, 0x25]
- 0x2526490: [0x48, 0x3D, 0x2F, 0x35, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00,
+ 0x24CC08C: [0x48, 0x42, 0xE2, 0xDD]
+ 0x24CC134: [0x48, 0x42, 0xE2, 0x35]
+ 0x2526490: [0x48, 0x3D, 0x2F, 0x45, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00,
0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00]
0x254DCA8: [0x60, 0x00, 0x00, 0x00]
0x254DCD8: [0x60, 0x00, 0x00, 0x00]
@@ -112,165 +112,165 @@ Data:
0x259D780: [0x38, 0x60, 0x00, 0x01]
0x25D8A70: [0x60, 0x00, 0x00, 0x00]
0x25D8A84: [0x38, 0xA0, 0x00, 0x15]
- 0x28F9E40: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x4B, 0xCC, 0x30, 0x81, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38,
- 0x63, 0x06, 0x44, 0x38, 0x80, 0x69, 0x02, 0x4B, 0xCB, 0xED, 0x09, 0x80, 0x01,
+ 0x28F9E50: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x4B, 0xCC, 0x30, 0x71, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38,
+ 0x63, 0x06, 0x44, 0x38, 0x80, 0x69, 0x02, 0x4B, 0xCB, 0xEC, 0xF9, 0x80, 0x01,
0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00,
0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38,
- 0x80, 0x69, 0x02, 0x4B, 0xCB, 0xED, 0x05, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
+ 0x80, 0x69, 0x02, 0x4B, 0xCB, 0xEC, 0xF5, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28F9EA4: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28F9EB4: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0xA8, 0x63, 0x00, 0x00, 0x2C, 0x03, 0x00, 0x00, 0x40, 0x82, 0x00, 0x28, 0x88,
0x7B, 0x09, 0x9F, 0x28, 0x03, 0x00, 0x04, 0x41, 0x82, 0x00, 0x1C, 0x28, 0x03,
0x00, 0x05, 0x41, 0x82, 0x00, 0x14, 0x4B, 0xFF, 0xFF, 0xA5, 0x2C, 0x03, 0x00,
0x00, 0x38, 0x60, 0x00, 0x01, 0x41, 0x82, 0x00, 0x08, 0x38, 0x60, 0x00, 0x00,
0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E,
0x80, 0x00, 0x20]
- 0x28F9EF4: [0x7C, 0x7E, 0x1B, 0x78, 0x2C, 0x1E, 0xFF, 0xFF, 0x41, 0x82, 0x00, 0x10,
- 0x7F, 0xCA, 0xF3, 0x78, 0x91, 0x5F, 0x03, 0xA4, 0x4B, 0xA4, 0xDD, 0x38, 0x4B,
- 0xA4, 0xDD, 0xC8]
- 0x28F9F10: [0x38, 0x60, 0xFF, 0xFF, 0x90, 0x7E, 0x03, 0xA4, 0x7F, 0xC3, 0xF3, 0x78,
- 0x4B, 0xA4, 0xD0, 0x10]
- 0x28F9F20: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28F9F04: [0x7C, 0x7E, 0x1B, 0x78, 0x2C, 0x1E, 0xFF, 0xFF, 0x41, 0x82, 0x00, 0x10,
+ 0x7F, 0xCA, 0xF3, 0x78, 0x91, 0x5F, 0x03, 0xA4, 0x4B, 0xA4, 0xDD, 0x28, 0x4B,
+ 0xA4, 0xDD, 0xB8]
+ 0x28F9F20: [0x38, 0x60, 0xFF, 0xFF, 0x90, 0x7E, 0x03, 0xA4, 0x7F, 0xC3, 0xF3, 0x78,
+ 0x4B, 0xA4, 0xD0, 0x00]
+ 0x28F9F30: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x4B, 0xFF, 0xF4, 0x99, 0x90, 0x7C, 0x03, 0xA4, 0x38, 0xA0, 0x00, 0x01, 0x98,
0xBC, 0x03, 0x2E, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21,
0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28F9F4C: [0x94, 0x21, 0xFF, 0xE0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x24,
+ 0x28F9F5C: [0x94, 0x21, 0xFF, 0xE0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x24,
0x93, 0xC1, 0x00, 0x18, 0x93, 0xE1, 0x00, 0x1C, 0x7C, 0x7E, 0x1B, 0x78, 0x80,
0x7E, 0x03, 0xA4, 0x3C, 0x83, 0x00, 0x01, 0x28, 0x04, 0xFF, 0xFF, 0x41, 0x82,
- 0x00, 0x88, 0x38, 0x81, 0x00, 0x08, 0x4B, 0xCD, 0xB5, 0x4D, 0x2C, 0x03, 0x00,
+ 0x00, 0x88, 0x38, 0x81, 0x00, 0x08, 0x4B, 0xCD, 0xB5, 0x3D, 0x2C, 0x03, 0x00,
0x00, 0x41, 0x82, 0x00, 0x5C, 0x80, 0x81, 0x00, 0x08, 0x2C, 0x04, 0x00, 0x00,
0x41, 0x82, 0x00, 0x6C, 0x81, 0x5E, 0x00, 0x04, 0x91, 0x44, 0x02, 0xE8, 0x88,
0xBE, 0x03, 0x2E, 0x2C, 0x05, 0x00, 0x00, 0x40, 0x82, 0x00, 0x58, 0x3D, 0x40,
- 0x02, 0x90, 0x39, 0x4A, 0xA0, 0x18, 0xC0, 0x0A, 0x00, 0x00, 0xD0, 0x04, 0x03,
+ 0x02, 0x90, 0x39, 0x4A, 0xA0, 0x28, 0xC0, 0x0A, 0x00, 0x00, 0xD0, 0x04, 0x03,
0x70, 0xC0, 0x0A, 0x00, 0x04, 0xD0, 0x04, 0x03, 0x40, 0xC0, 0x0A, 0x00, 0x08,
0xD0, 0x04, 0x03, 0x74, 0x80, 0xA4, 0x02, 0xE0, 0x60, 0xA5, 0x00, 0x40, 0x90,
0xA4, 0x02, 0xE0, 0x38, 0xA0, 0x00, 0x01, 0x98, 0xBE, 0x03, 0x2E, 0x48, 0x00,
0x00, 0x20, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06,
- 0x44, 0x38, 0x80, 0x2E, 0x20, 0x4B, 0xCB, 0xEB, 0x7D, 0x38, 0x00, 0xFF, 0xFF,
- 0x90, 0x1E, 0x03, 0xA4, 0x7F, 0xC3, 0xF3, 0x78, 0x4B, 0xA4, 0xD2, 0xC1, 0x80,
+ 0x44, 0x38, 0x80, 0x2E, 0x20, 0x4B, 0xCB, 0xEB, 0x6D, 0x38, 0x00, 0xFF, 0xFF,
+ 0x90, 0x1E, 0x03, 0xA4, 0x7F, 0xC3, 0xF3, 0x78, 0x4B, 0xA4, 0xD2, 0xB1, 0x80,
0x01, 0x00, 0x24, 0x83, 0xC1, 0x00, 0x18, 0x83, 0xE1, 0x00, 0x1C, 0x7C, 0x08,
0x03, 0xA6, 0x38, 0x21, 0x00, 0x20, 0x4E, 0x80, 0x00, 0x20, 0x3F, 0xE0, 0x00,
0x00, 0x41, 0xF0, 0x00, 0x00, 0xC0, 0x06, 0x66, 0x66]
- 0x28FA024: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x38, 0x60, 0x00, 0x08, 0x38, 0x80, 0x00, 0x00, 0x4B, 0xC2, 0x68, 0x2D, 0x80,
+ 0x28FA034: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x38, 0x60, 0x00, 0x08, 0x38, 0x80, 0x00, 0x00, 0x4B, 0xC2, 0x68, 0x1D, 0x80,
0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80,
0x00, 0x20]
- 0x28FA04C: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x4B, 0xCB, 0xEB, 0x3D, 0x2C, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00, 0x34, 0x4B,
- 0xC2, 0x60, 0x71, 0x38, 0x63, 0x51, 0x33, 0x3C, 0x80, 0x02, 0x90, 0x38, 0x84,
- 0xA0, 0xA4, 0x38, 0x84, 0xFF, 0xFF, 0x8C, 0xA3, 0x00, 0x01, 0x8C, 0xC4, 0x00,
+ 0x28FA05C: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x4B, 0xCB, 0xEB, 0x2D, 0x2C, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00, 0x34, 0x4B,
+ 0xC2, 0x60, 0x61, 0x38, 0x63, 0x51, 0x33, 0x3C, 0x80, 0x02, 0x90, 0x38, 0x84,
+ 0xA0, 0xB4, 0x38, 0x84, 0xFF, 0xFF, 0x8C, 0xA3, 0x00, 0x01, 0x8C, 0xC4, 0x00,
0x01, 0x7C, 0x05, 0x30, 0x40, 0x40, 0x82, 0x00, 0x0C, 0x28, 0x05, 0x00, 0x00,
0x40, 0x82, 0xFF, 0xEC, 0x7C, 0x65, 0x30, 0x51, 0x80, 0x01, 0x00, 0x14, 0x7C,
0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x47, 0x61,
0x6E, 0x6F, 0x6E, 0x4A, 0x00, 0x00]
- 0x28FA0AC: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28FA0BC: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x9F, 0x23, 0x78, 0x54, 0x84, 0x06, 0x3E, 0x4B,
- 0xCD, 0xDD, 0x29, 0x57, 0xE4, 0x84, 0x3F, 0x41, 0x82, 0x00, 0x1C, 0x7C, 0x7F,
+ 0xCD, 0xDD, 0x19, 0x57, 0xE4, 0x84, 0x3F, 0x41, 0x82, 0x00, 0x1C, 0x7C, 0x7F,
0x1B, 0x78, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06,
- 0x44, 0x4B, 0xCB, 0xEA, 0x89, 0x7F, 0xE3, 0xFB, 0x78, 0x83, 0xE1, 0x00, 0x0C,
+ 0x44, 0x4B, 0xCB, 0xEA, 0x79, 0x7F, 0xE3, 0xFB, 0x78, 0x83, 0xE1, 0x00, 0x0C,
0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E,
0x80, 0x00, 0x20]
- 0x28FA0FC: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44,
- 0x38, 0x80, 0x6A, 0x80, 0x4B, 0xCB, 0xEA, 0x5D, 0x3D, 0x80, 0x02, 0x90, 0x39,
- 0x8C, 0xA1, 0x20, 0x89, 0x8C, 0x00, 0x00, 0x4B, 0x9C, 0xC3, 0x3C, 0xFD, 0x00,
+ 0x28FA10C: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44,
+ 0x38, 0x80, 0x6A, 0x80, 0x4B, 0xCB, 0xEA, 0x4D, 0x3D, 0x80, 0x02, 0x90, 0x39,
+ 0x8C, 0xA1, 0x30, 0x89, 0x8C, 0x00, 0x00, 0x4B, 0x9C, 0xC3, 0x2C, 0xFD, 0x00,
0x00, 0x00]
- 0x28FA124: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28FA134: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x99, 0x5F, 0x0B, 0x39, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38,
- 0x63, 0x06, 0x44, 0x38, 0x80, 0x69, 0x20, 0x4B, 0xCB, 0xEA, 0x25, 0x80, 0x01,
+ 0x63, 0x06, 0x44, 0x38, 0x80, 0x69, 0x20, 0x4B, 0xCB, 0xEA, 0x15, 0x80, 0x01,
0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00,
0x20]
- 0x28FA158: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x9F, 0x23, 0x78, 0x4B, 0xCD, 0xDC, 0x81, 0x3C,
- 0x80, 0x02, 0x90, 0x38, 0x84, 0xA1, 0xB4, 0x88, 0x84, 0x00, 0x00, 0x7C, 0x1F,
+ 0x28FA168: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x9F, 0x23, 0x78, 0x4B, 0xCD, 0xDC, 0x71, 0x3C,
+ 0x80, 0x02, 0x90, 0x38, 0x84, 0xA1, 0xC4, 0x88, 0x84, 0x00, 0x00, 0x7C, 0x1F,
0x20, 0x00, 0x40, 0x82, 0x00, 0x20, 0x7C, 0x7F, 0x1B, 0x78, 0x3C, 0x60, 0x10,
0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80, 0x69, 0x40,
- 0x4B, 0xCB, 0xE9, 0xD1, 0x7F, 0xE3, 0xFB, 0x78, 0x83, 0xE1, 0x00, 0x0C, 0x80,
+ 0x4B, 0xCB, 0xE9, 0xC1, 0x7F, 0xE3, 0xFB, 0x78, 0x83, 0xE1, 0x00, 0x0C, 0x80,
0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80,
0x00, 0x20, 0x2A, 0x00, 0x00, 0x00]
- 0x28FA1B8: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x93, 0xE1, 0x00, 0x0C, 0x4B, 0xCD, 0xDC, 0x25, 0x7C, 0x7F, 0x1B, 0x78, 0x3C,
+ 0x28FA1C8: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x93, 0xE1, 0x00, 0x0C, 0x4B, 0xCD, 0xDC, 0x15, 0x7C, 0x7F, 0x1B, 0x78, 0x3C,
0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80,
- 0x69, 0x80, 0x4B, 0xCB, 0xE9, 0x89, 0x7F, 0xE3, 0xFB, 0x78, 0x83, 0xE1, 0x00,
+ 0x69, 0x80, 0x4B, 0xCB, 0xE9, 0x79, 0x7F, 0xE3, 0xFB, 0x78, 0x83, 0xE1, 0x00,
0x0C, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10,
0x4E, 0x80, 0x00, 0x20]
- 0x28FA1FC: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x93, 0xE1, 0x00, 0x0C, 0x4B, 0xCD, 0xDB, 0xE1, 0x7C, 0x7F, 0x1B, 0x78, 0x3C,
+ 0x28FA20C: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x93, 0xE1, 0x00, 0x0C, 0x4B, 0xCD, 0xDB, 0xD1, 0x7C, 0x7F, 0x1B, 0x78, 0x3C,
0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x38, 0x80,
- 0x6A, 0x01, 0x4B, 0xCB, 0xE9, 0x45, 0x7F, 0xE3, 0xFB, 0x78, 0x83, 0xE1, 0x00,
+ 0x6A, 0x01, 0x4B, 0xCB, 0xE9, 0x35, 0x7F, 0xE3, 0xFB, 0x78, 0x83, 0xE1, 0x00,
0x0C, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10,
0x4E, 0x80, 0x00, 0x20]
- 0x28FA240: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x7F, 0x1B, 0x78, 0x4B, 0xCD, 0xD8, 0x05, 0xAB,
+ 0x28FA250: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x7F, 0x1B, 0x78, 0x4B, 0xCD, 0xD7, 0xF5, 0xAB,
0xFF, 0x09, 0xDA, 0x2C, 0x1F, 0x00, 0x00, 0x40, 0x82, 0x00, 0x20, 0x7C, 0x7F,
0x1B, 0x78, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06,
- 0x44, 0x38, 0x80, 0x6A, 0x02, 0x4B, 0xCB, 0xE8, 0xF1, 0x7F, 0xE3, 0xFB, 0x78,
+ 0x44, 0x38, 0x80, 0x6A, 0x02, 0x4B, 0xCB, 0xE8, 0xE1, 0x7F, 0xE3, 0xFB, 0x78,
0x83, 0xE1, 0x00, 0x0C, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38,
0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28FA294: [0x28, 0x04, 0x00, 0x69, 0x41, 0x82, 0x00, 0x48, 0x28, 0x04, 0x00, 0x6A,
+ 0x28FA2A4: [0x28, 0x04, 0x00, 0x69, 0x41, 0x82, 0x00, 0x48, 0x28, 0x04, 0x00, 0x6A,
0x41, 0x82, 0x00, 0x40, 0x28, 0x04, 0x00, 0x6B, 0x41, 0x82, 0x00, 0x38, 0x28,
0x04, 0x00, 0x6D, 0x41, 0x82, 0x00, 0x3C, 0x28, 0x04, 0x00, 0x6E, 0x41, 0x82,
0x00, 0x34, 0x28, 0x04, 0x00, 0x6F, 0x41, 0x82, 0x00, 0x2C, 0x28, 0x04, 0x00,
0x70, 0x41, 0x82, 0x00, 0x24, 0x28, 0x04, 0x00, 0x71, 0x41, 0x82, 0x00, 0x1C,
- 0x28, 0x04, 0x00, 0x72, 0x41, 0x82, 0x00, 0x14, 0x4B, 0xAE, 0x1A, 0xD4, 0x3C,
- 0x60, 0x80, 0x00, 0x38, 0x63, 0x00, 0x4F, 0x4B, 0xAE, 0x1A, 0xC8, 0x3C, 0x60,
- 0x80, 0x00, 0x38, 0x63, 0x00, 0x27, 0x4B, 0xAE, 0x1A, 0xBC]
- 0x28FA2F8: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28, 0x04, 0x00, 0x72, 0x41, 0x82, 0x00, 0x14, 0x4B, 0xAE, 0x1A, 0xC4, 0x3C,
+ 0x60, 0x80, 0x00, 0x38, 0x63, 0x00, 0x4F, 0x4B, 0xAE, 0x1A, 0xB8, 0x3C, 0x60,
+ 0x80, 0x00, 0x38, 0x63, 0x00, 0x27, 0x4B, 0xAE, 0x1A, 0xAC]
+ 0x28FA308: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x80, 0x1E, 0x09, 0x98, 0x2C, 0x00, 0x1D, 0xCB, 0x40, 0x82, 0x00, 0x34, 0x2C,
0x04, 0x00, 0x52, 0x41, 0x82, 0x00, 0x10, 0x2C, 0x04, 0x00, 0x53, 0x41, 0x82,
0x00, 0x18, 0x48, 0x00, 0x00, 0x20, 0x3C, 0x80, 0x02, 0x90, 0x38, 0x84, 0xA3,
- 0x54, 0x88, 0x84, 0x00, 0x00, 0x48, 0x00, 0x00, 0x10, 0x3C, 0x80, 0x02, 0x90,
- 0x38, 0x84, 0xA3, 0x55, 0x88, 0x84, 0x00, 0x00, 0x4B, 0xCD, 0xDA, 0xAD, 0x80,
+ 0x64, 0x88, 0x84, 0x00, 0x00, 0x48, 0x00, 0x00, 0x10, 0x3C, 0x80, 0x02, 0x90,
+ 0x38, 0x84, 0xA3, 0x65, 0x88, 0x84, 0x00, 0x00, 0x4B, 0xCD, 0xDA, 0x9D, 0x80,
0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80,
0x00, 0x20, 0x52, 0x53, 0x00, 0x00]
- 0x28FA358: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28FA368: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0xA1, 0x7B, 0x07, 0x98, 0x55, 0x6B, 0xC6, 0x3E, 0x2C, 0x0B, 0x00, 0xFF, 0x41,
0x82, 0x00, 0x20, 0x2C, 0x0B, 0x00, 0x00, 0x41, 0x82, 0x00, 0x18, 0x7D, 0x64,
0x5B, 0x78, 0x38, 0xE0, 0x00, 0x03, 0x39, 0x20, 0x00, 0x05, 0x4B, 0xCD, 0xE4,
- 0xE9, 0x48, 0x00, 0x00, 0x08, 0x4B, 0xCD, 0xDD, 0x91, 0x80, 0x01, 0x00, 0x14,
+ 0xD9, 0x48, 0x00, 0x00, 0x08, 0x4B, 0xCD, 0xDD, 0x81, 0x80, 0x01, 0x00, 0x14,
0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28FA3A4: [0xA1, 0x7F, 0x02, 0xF8, 0x55, 0x6B, 0x06, 0x3E, 0x2C, 0x0B, 0x00, 0xFF,
+ 0x28FA3B4: [0xA1, 0x7F, 0x02, 0xF8, 0x55, 0x6B, 0x06, 0x3E, 0x2C, 0x0B, 0x00, 0xFF,
0x41, 0x82, 0x00, 0x20, 0x2C, 0x0B, 0x00, 0x00, 0x41, 0x82, 0x00, 0x18, 0x7D,
0x64, 0x5B, 0x78, 0x38, 0xE0, 0x00, 0x03, 0x39, 0x20, 0x00, 0x05, 0x4B, 0xCD,
- 0xE4, 0xA9, 0x4B, 0xA5, 0xE6, 0xC4, 0x4B, 0xCD, 0xDD, 0x51, 0x4B, 0xA5, 0xE6,
- 0xBC]
+ 0xE4, 0x99, 0x4B, 0xA5, 0xE6, 0xB4, 0x4B, 0xCD, 0xDD, 0x41, 0x4B, 0xA5, 0xE6,
+ 0xAC]
0x10190192: [0x6B, 0x01]
0x101BD558: [0x10, 0x1E, 0xB8, 0x50]
0x101C399C: [0x69, 0x04]
0x101C39A0: [0x69, 0x08]
0x101C39AC: [0x69, 0x10]
Relocations:
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9E52}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9E56}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9E82}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9E86}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9E62}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9E66}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9E92}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9E96}
- {r_addend: 0x1EB850, r_info: 0x201, r_offset: 0x101BD558}
-- {r_addend: 0x8FA018, r_info: 0x106, r_offset: 0x28F9FA6}
-- {r_addend: 0x8FA018, r_info: 0x104, r_offset: 0x28F9FAA}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9FDE}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9FE2}
-- {r_addend: 0x8FA0A4, r_info: 0x106, r_offset: 0x28FA06E}
-- {r_addend: 0x8FA0A4, r_info: 0x104, r_offset: 0x28FA072}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA0D6}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA0DA}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA0FE}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA102}
-- {r_addend: 0x8FA120, r_info: 0x106, r_offset: 0x28FA112}
-- {r_addend: 0x8FA120, r_info: 0x104, r_offset: 0x28FA116}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA136}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA13A}
-- {r_addend: 0x8FA1B4, r_info: 0x106, r_offset: 0x28FA172}
-- {r_addend: 0x8FA1B4, r_info: 0x104, r_offset: 0x28FA176}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA18A}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA18E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA1D2}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA1D6}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA216}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA21A}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA26A}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA26E}
-- {r_addend: 0x8FA354, r_info: 0x106, r_offset: 0x28FA326}
-- {r_addend: 0x8FA354, r_info: 0x104, r_offset: 0x28FA32A}
-- {r_addend: 0x8FA355, r_info: 0x106, r_offset: 0x28FA336}
-- {r_addend: 0x8FA355, r_info: 0x104, r_offset: 0x28FA33A}
+- {r_addend: 0x8FA028, r_info: 0x106, r_offset: 0x28F9FB6}
+- {r_addend: 0x8FA028, r_info: 0x104, r_offset: 0x28F9FBA}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28F9FEE}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28F9FF2}
+- {r_addend: 0x8FA0B4, r_info: 0x106, r_offset: 0x28FA07E}
+- {r_addend: 0x8FA0B4, r_info: 0x104, r_offset: 0x28FA082}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA0E6}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA0EA}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA10E}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA112}
+- {r_addend: 0x8FA130, r_info: 0x106, r_offset: 0x28FA122}
+- {r_addend: 0x8FA130, r_info: 0x104, r_offset: 0x28FA126}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA146}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA14A}
+- {r_addend: 0x8FA1C4, r_info: 0x106, r_offset: 0x28FA182}
+- {r_addend: 0x8FA1C4, r_info: 0x104, r_offset: 0x28FA186}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA19A}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA19E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA1E2}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA1E6}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA226}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA22A}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA27A}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA27E}
+- {r_addend: 0x8FA364, r_info: 0x106, r_offset: 0x28FA336}
+- {r_addend: 0x8FA364, r_info: 0x104, r_offset: 0x28FA33A}
+- {r_addend: 0x8FA365, r_info: 0x106, r_offset: 0x28FA346}
+- {r_addend: 0x8FA365, r_info: 0x104, r_offset: 0x28FA34A}
diff --git a/asm/patch_diffs/make_all_figurines_obtainable_diff.yaml b/asm/patch_diffs/make_all_figurines_obtainable_diff.yaml
index f80304ac..a1cd75fb 100644
--- a/asm/patch_diffs/make_all_figurines_obtainable_diff.yaml
+++ b/asm/patch_diffs/make_all_figurines_obtainable_diff.yaml
@@ -1,5 +1,5 @@
Data:
- 0x22A20C8: [0x48, 0x65, 0x83, 0x10]
+ 0x22A20C8: [0x48, 0x65, 0x83, 0x20]
0x22A20F4: [0x38, 0x60, 0x00, 0x88]
0x22A2180: [0x48, 0x00, 0x00, 0x30]
0x22A2194: [0x40, 0x82, 0x00, 0x44]
@@ -12,18 +12,18 @@ Data:
0x22D02B8: [0x38, 0x80, 0x00, 0x01, 0x38, 0x69, 0x00, 0xD4, 0x48, 0x2E, 0x78, 0x51]
0x22D02D4: [0x38, 0x60, 0x00, 0x07, 0x48, 0x25, 0x07, 0xAD, 0x60, 0x00, 0x00, 0x00]
0x22D02F0: [0x38, 0x60, 0x00, 0x06, 0x48, 0x25, 0x07, 0x91, 0x60, 0x00, 0x00, 0x00]
- 0x28FA3D8: [0x38, 0x60, 0x00, 0xBA, 0x4B, 0xCC, 0x32, 0x25, 0x54, 0x63, 0x06, 0x3E,
+ 0x28FA3E8: [0x38, 0x60, 0x00, 0xBA, 0x4B, 0xCC, 0x32, 0x15, 0x54, 0x63, 0x06, 0x3E,
0x7C, 0x1F, 0x18, 0x40, 0x40, 0x82, 0x00, 0x1C, 0x38, 0x60, 0x00, 0xC6, 0x4B,
- 0xCC, 0x32, 0x11, 0x54, 0x64, 0x06, 0x3E, 0x7F, 0xA3, 0xEB, 0x78, 0x4B, 0x9A,
- 0x5B, 0x8D, 0x4B, 0x9A, 0x7D, 0xD8, 0x38, 0x60, 0x00, 0x99, 0x4B, 0xCC, 0x31,
- 0xF9, 0x54, 0x63, 0x06, 0x3E, 0x7C, 0x1F, 0x18, 0x40, 0x40, 0x82, 0x00, 0x1C,
- 0x38, 0x60, 0x00, 0x9A, 0x4B, 0xCC, 0x31, 0xE5, 0x54, 0x64, 0x06, 0x3E, 0x7F,
- 0xA3, 0xEB, 0x78, 0x4B, 0x9A, 0x5B, 0x61, 0x4B, 0x9A, 0x7D, 0xAC, 0x38, 0x60,
- 0x00, 0xCE, 0x4B, 0xCC, 0x31, 0xCD, 0x54, 0x63, 0x06, 0x3E, 0x7C, 0x1F, 0x18,
- 0x40, 0x40, 0x82, 0x00, 0x1C, 0x38, 0x60, 0x00, 0xCA, 0x4B, 0xCC, 0x31, 0xB9,
- 0x54, 0x64, 0x06, 0x3E, 0x7F, 0xA3, 0xEB, 0x78, 0x4B, 0x9A, 0x5B, 0x35, 0x4B,
- 0x9A, 0x7D, 0x80, 0x38, 0x60, 0x00, 0xC4, 0x4B, 0xCC, 0x31, 0xA1, 0x54, 0x63,
+ 0xCC, 0x32, 0x01, 0x54, 0x64, 0x06, 0x3E, 0x7F, 0xA3, 0xEB, 0x78, 0x4B, 0x9A,
+ 0x5B, 0x7D, 0x4B, 0x9A, 0x7D, 0xC8, 0x38, 0x60, 0x00, 0x99, 0x4B, 0xCC, 0x31,
+ 0xE9, 0x54, 0x63, 0x06, 0x3E, 0x7C, 0x1F, 0x18, 0x40, 0x40, 0x82, 0x00, 0x1C,
+ 0x38, 0x60, 0x00, 0x9A, 0x4B, 0xCC, 0x31, 0xD5, 0x54, 0x64, 0x06, 0x3E, 0x7F,
+ 0xA3, 0xEB, 0x78, 0x4B, 0x9A, 0x5B, 0x51, 0x4B, 0x9A, 0x7D, 0x9C, 0x38, 0x60,
+ 0x00, 0xCE, 0x4B, 0xCC, 0x31, 0xBD, 0x54, 0x63, 0x06, 0x3E, 0x7C, 0x1F, 0x18,
+ 0x40, 0x40, 0x82, 0x00, 0x1C, 0x38, 0x60, 0x00, 0xCA, 0x4B, 0xCC, 0x31, 0xA9,
+ 0x54, 0x64, 0x06, 0x3E, 0x7F, 0xA3, 0xEB, 0x78, 0x4B, 0x9A, 0x5B, 0x25, 0x4B,
+ 0x9A, 0x7D, 0x70, 0x38, 0x60, 0x00, 0xC4, 0x4B, 0xCC, 0x31, 0x91, 0x54, 0x63,
0x06, 0x3E, 0x7C, 0x1F, 0x18, 0x40, 0x40, 0x82, 0x00, 0x1C, 0x38, 0x60, 0x00,
- 0xC5, 0x4B, 0xCC, 0x31, 0x8D, 0x54, 0x64, 0x06, 0x3E, 0x7F, 0xA3, 0xEB, 0x78,
- 0x4B, 0x9A, 0x5B, 0x09, 0x4B, 0x9A, 0x7D, 0x54, 0x38, 0x60, 0x00, 0x4A, 0x4B,
- 0x9A, 0x7C, 0x40]
+ 0xC5, 0x4B, 0xCC, 0x31, 0x7D, 0x54, 0x64, 0x06, 0x3E, 0x7F, 0xA3, 0xEB, 0x78,
+ 0x4B, 0x9A, 0x5A, 0xF9, 0x4B, 0x9A, 0x7D, 0x44, 0x38, 0x60, 0x00, 0x4A, 0x4B,
+ 0x9A, 0x7C, 0x30]
diff --git a/asm/patch_diffs/make_game_nonlinear_diff.yaml b/asm/patch_diffs/make_game_nonlinear_diff.yaml
index 0d948cad..e343457d 100644
--- a/asm/patch_diffs/make_game_nonlinear_diff.yaml
+++ b/asm/patch_diffs/make_game_nonlinear_diff.yaml
@@ -21,16 +21,16 @@ Data:
0x220B5CC: [0x38, 0x60, 0x00, 0x01]
0x221F8D8: [0x48, 0x00, 0x00, 0x14]
0x221FAC4: [0x60, 0x00, 0x00, 0x00]
- 0x221FAE8: [0x48, 0x6D, 0xA9, 0xA9]
+ 0x221FAE8: [0x48, 0x6D, 0xA9, 0xB9]
0x2227DA4: [0x3B, 0xE0, 0x00, 0x00, 0x48, 0x00, 0x00, 0x38]
0x222C6D8: [0x38, 0x80, 0x39, 0x40]
0x222C6E8: [0x2C, 0x03, 0x00, 0x01]
0x222C9BC: [0x48, 0x00, 0x00, 0x60]
0x2286314: [0x48, 0x00, 0x00, 0xD4]
0x2286A98: [0x60, 0x00, 0x00, 0x00]
- 0x2286ABC: [0x48, 0x67, 0x3A, 0xD1]
+ 0x2286ABC: [0x48, 0x67, 0x3A, 0xE1]
0x22AC06C: [0x48, 0x00, 0x00, 0x48]
- 0x22AC2B8: [0x48, 0x64, 0xE3, 0xD0]
+ 0x22AC2B8: [0x48, 0x64, 0xE3, 0xE0]
0x22AE9C8: [0x60, 0x00, 0x00, 0x00]
0x22C7A4C: [0x48, 0x00, 0x00, 0x24]
0x22C7D4C: [0x48, 0x00, 0x00, 0x24]
@@ -43,7 +43,7 @@ Data:
0x231987C: [0x48, 0x00, 0x00, 0x38]
0x2339554: [0x38, 0x60, 0x00, 0x00]
0x23465DC: [0x60, 0x00, 0x00, 0x00]
- 0x235BF38: [0x48, 0x59, 0xE7, 0x74]
+ 0x235BF38: [0x48, 0x59, 0xE7, 0x84]
0x2372F74: [0x60, 0x00, 0x00, 0x00]
0x237305C: [0x4B, 0xFF, 0xFF, 0x1C]
0x2374648: [0x60, 0x00, 0x00, 0x00]
@@ -55,7 +55,7 @@ Data:
0x2474B7C: [0x48, 0x00, 0x03, 0x94]
0x2474B9C: [0x48, 0x00, 0x03, 0x74]
0x247A574: [0x48, 0x00, 0x00, 0x58]
- 0x24B22F4: [0x48, 0x44, 0x83, 0xD4]
+ 0x24B22F4: [0x48, 0x44, 0x83, 0xE4]
0x24B2798: [0x48, 0x00, 0x00, 0x1C]
0x24D4F1C: [0x60, 0x00, 0x00, 0x00]
0x25221F0: [0x4E, 0x80, 0x00, 0x20]
@@ -75,16 +75,16 @@ Data:
0x2677D3C: [0x4E, 0x80, 0x00, 0x20]
0x2678B74: [0x4E, 0x80, 0x00, 0x20]
0x26790B0: [0x38, 0x60, 0x00, 0x01]
- 0x28FA490: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x4B, 0xC2, 0x5C, 0x39, 0xA9, 0x03, 0x51, 0x3C, 0x3D, 0x20, 0x02, 0x90, 0x39,
- 0x29, 0xA5, 0x1C, 0x38, 0x00, 0x00, 0x07, 0x7C, 0x09, 0x03, 0xA6, 0x88, 0x09,
+ 0x28FA4A0: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x4B, 0xC2, 0x5C, 0x29, 0xA9, 0x03, 0x51, 0x3C, 0x3D, 0x20, 0x02, 0x90, 0x39,
+ 0x29, 0xA5, 0x2C, 0x38, 0x00, 0x00, 0x07, 0x7C, 0x09, 0x03, 0xA6, 0x88, 0x09,
0x00, 0x00, 0x7C, 0x00, 0x40, 0x00, 0x41, 0x82, 0x00, 0x10, 0x39, 0x29, 0x00,
0x10, 0x42, 0x00, 0xFF, 0xF0, 0x48, 0x00, 0x00, 0x3C, 0x81, 0x09, 0x00, 0x04,
0x91, 0x05, 0x00, 0x00, 0x81, 0x09, 0x00, 0x08, 0x91, 0x05, 0x00, 0x04, 0x81,
0x09, 0x00, 0x0C, 0x91, 0x05, 0x00, 0x08, 0xA9, 0x09, 0x00, 0x02, 0xB1, 0x05,
0x00, 0x0C, 0x7D, 0x06, 0x43, 0x78, 0x7D, 0x19, 0x43, 0x78, 0x89, 0x09, 0x00,
0x01, 0x99, 0x05, 0x00, 0x0E, 0x7D, 0x07, 0x43, 0x78, 0x7D, 0x1A, 0x43, 0x78,
- 0x38, 0x6A, 0x11, 0x48, 0x4B, 0xCB, 0xF3, 0x2D, 0x80, 0x01, 0x00, 0x14, 0x7C,
+ 0x38, 0x6A, 0x11, 0x48, 0x4B, 0xCB, 0xF3, 0x1D, 0x80, 0x01, 0x00, 0x14, 0x7C,
0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x0F, 0x0F,
0x94, 0xA0, 0xC5, 0x64, 0x30, 0x52, 0x44, 0xC2, 0xB5, 0x71, 0x46, 0x4E, 0xCC,
0xCD, 0x16, 0x00, 0x40, 0x00, 0xC5, 0x83, 0x22, 0xA4, 0x44, 0x3C, 0xA1, 0x27,
@@ -95,16 +95,16 @@ Data:
0x14, 0x02, 0x00, 0x00, 0xC2, 0xDE, 0x94, 0x7B, 0xC5, 0x61, 0x00, 0x00, 0xC4,
0xDA, 0x74, 0x7B, 0x46, 0x0C, 0x00, 0x00, 0x46, 0x5C, 0x50, 0x00, 0xC5, 0x9E,
0x33, 0xEC, 0x46, 0x11, 0x50, 0x00]
- 0x28FA58C: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x4B, 0xC2, 0x5B, 0x3D, 0xA9, 0x03, 0x51, 0x3C, 0x3D, 0x20, 0x02, 0x90, 0x39,
- 0x29, 0xA6, 0x18, 0x38, 0x00, 0x00, 0x07, 0x7C, 0x09, 0x03, 0xA6, 0x88, 0x09,
+ 0x28FA59C: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x4B, 0xC2, 0x5B, 0x2D, 0xA9, 0x03, 0x51, 0x3C, 0x3D, 0x20, 0x02, 0x90, 0x39,
+ 0x29, 0xA6, 0x28, 0x38, 0x00, 0x00, 0x07, 0x7C, 0x09, 0x03, 0xA6, 0x88, 0x09,
0x00, 0x00, 0x7C, 0x00, 0x40, 0x00, 0x41, 0x82, 0x00, 0x10, 0x39, 0x29, 0x00,
0x10, 0x42, 0x00, 0xFF, 0xF0, 0x48, 0x00, 0x00, 0x3C, 0x81, 0x09, 0x00, 0x04,
0x91, 0x05, 0x00, 0x00, 0x81, 0x09, 0x00, 0x08, 0x91, 0x05, 0x00, 0x04, 0x81,
0x09, 0x00, 0x0C, 0x91, 0x05, 0x00, 0x08, 0xA9, 0x09, 0x00, 0x02, 0xB1, 0x05,
0x00, 0x0C, 0x7D, 0x06, 0x43, 0x78, 0x7D, 0x1A, 0x43, 0x78, 0x89, 0x09, 0x00,
0x01, 0x99, 0x05, 0x00, 0x0E, 0x7D, 0x07, 0x43, 0x78, 0x7D, 0x1C, 0x43, 0x78,
- 0x38, 0x6A, 0x11, 0x48, 0x4B, 0xCB, 0xF2, 0x31, 0x80, 0x01, 0x00, 0x14, 0x7C,
+ 0x38, 0x6A, 0x11, 0x48, 0x4B, 0xCB, 0xF2, 0x21, 0x80, 0x01, 0x00, 0x14, 0x7C,
0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x00, 0x00,
0x80, 0x00, 0xC5, 0xE1, 0x79, 0xAE, 0xC3, 0x48, 0x00, 0x00, 0x45, 0xA4, 0x56,
0x52, 0x16, 0x02, 0xE0, 0x00, 0xC4, 0xFB, 0xA3, 0x85, 0x43, 0x48, 0x00, 0x00,
@@ -115,23 +115,23 @@ Data:
0x09, 0x07, 0x80, 0x00, 0x45, 0xC4, 0xE8, 0x7B, 0x44, 0xAF, 0x00, 0x00, 0x45,
0x13, 0x34, 0xA4, 0x11, 0x0F, 0x80, 0x00, 0xC5, 0xB4, 0xA0, 0x00, 0xC5, 0x0F,
0xC0, 0x00, 0x46, 0x17, 0x90, 0x00]
- 0x28FA688: [0x3C, 0x60, 0x10, 0x48, 0x88, 0x63, 0xE6, 0xC8, 0x88, 0x9E, 0x03, 0x26,
+ 0x28FA698: [0x3C, 0x60, 0x10, 0x48, 0x88, 0x63, 0xE6, 0xC8, 0x88, 0x9E, 0x03, 0x26,
0x7C, 0x03, 0x20, 0x00, 0x41, 0x82, 0x00, 0x0C, 0x38, 0x60, 0xFF, 0xFF, 0x98,
- 0x7E, 0x02, 0xFE, 0x7F, 0xC3, 0xF3, 0x78, 0x4B, 0x9B, 0x1C, 0x14]
- 0x28FA6AC: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44,
- 0x38, 0x80, 0x25, 0x10, 0x4B, 0xCB, 0xE4, 0xAD, 0x80, 0x01, 0x00, 0x14, 0x4B,
- 0xA6, 0x18, 0x78]
- 0x28FA6C8: [0x38, 0x60, 0x17, 0x01, 0x4B, 0xFF, 0xE6, 0x91, 0x2C, 0x03, 0x00, 0x00,
+ 0x7E, 0x02, 0xFE, 0x7F, 0xC3, 0xF3, 0x78, 0x4B, 0x9B, 0x1C, 0x04]
+ 0x28FA6BC: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44,
+ 0x38, 0x80, 0x25, 0x10, 0x4B, 0xCB, 0xE4, 0x9D, 0x80, 0x01, 0x00, 0x14, 0x4B,
+ 0xA6, 0x18, 0x68]
+ 0x28FA6D8: [0x38, 0x60, 0x17, 0x01, 0x4B, 0xFF, 0xE6, 0x91, 0x2C, 0x03, 0x00, 0x00,
0x41, 0x82, 0x00, 0x14, 0x3D, 0x80, 0x10, 0x20, 0x81, 0x8C, 0x84, 0xDC, 0x38,
- 0x80, 0x16, 0x01, 0x4B, 0xBB, 0x7C, 0x14, 0x4B, 0xBB, 0x7C, 0x18]
+ 0x80, 0x16, 0x01, 0x4B, 0xBB, 0x7C, 0x04, 0x4B, 0xBB, 0x7C, 0x08]
Relocations:
-- {r_addend: 0x8FA51C, r_info: 0x106, r_offset: 0x28FA4A6}
-- {r_addend: 0x8FA51C, r_info: 0x104, r_offset: 0x28FA4AA}
-- {r_addend: 0x8FA618, r_info: 0x106, r_offset: 0x28FA5A2}
-- {r_addend: 0x8FA618, r_info: 0x104, r_offset: 0x28FA5A6}
-- {r_addend: 0x47E6C8, r_info: 0x206, r_offset: 0x28FA68A}
-- {r_addend: 0x47E6C8, r_info: 0x204, r_offset: 0x28FA68E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA6AE}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA6B2}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA6DA}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA6DE}
+- {r_addend: 0x8FA52C, r_info: 0x106, r_offset: 0x28FA4B6}
+- {r_addend: 0x8FA52C, r_info: 0x104, r_offset: 0x28FA4BA}
+- {r_addend: 0x8FA628, r_info: 0x106, r_offset: 0x28FA5B2}
+- {r_addend: 0x8FA628, r_info: 0x104, r_offset: 0x28FA5B6}
+- {r_addend: 0x47E6C8, r_info: 0x206, r_offset: 0x28FA69A}
+- {r_addend: 0x47E6C8, r_info: 0x204, r_offset: 0x28FA69E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA6BE}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA6C2}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA6EA}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA6EE}
diff --git a/asm/patch_diffs/make_items_progressive_diff.yaml b/asm/patch_diffs/make_items_progressive_diff.yaml
index 77a4fe36..347fc405 100644
--- a/asm/patch_diffs/make_items_progressive_diff.yaml
+++ b/asm/patch_diffs/make_items_progressive_diff.yaml
@@ -1,33 +1,33 @@
Data:
- 0x21806FC: [0x48, 0x77, 0xA0, 0x1D]
- 0x2215468: [0x48, 0x6E, 0x53, 0x5D]
- 0x22155CC: [0x48, 0x6E, 0x51, 0xF9]
- 0x2215634: [0x48, 0x6E, 0x51, 0x91]
- 0x24217D8: [0x48, 0x4D, 0x8F, 0x6D]
- 0x2421868: [0x48, 0x4D, 0x8E, 0xDD]
- 0x242188C: [0x48, 0x4D, 0x8E, 0xE9]
- 0x2483900: [0x48, 0x47, 0x6E, 0x9D]
- 0x25D7DAC: [0x48, 0x32, 0x29, 0x41]
- 0x28FA6EC: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x21806FC: [0x48, 0x77, 0xA0, 0x2D]
+ 0x2215468: [0x48, 0x6E, 0x53, 0x6D]
+ 0x22155CC: [0x48, 0x6E, 0x52, 0x09]
+ 0x2215634: [0x48, 0x6E, 0x51, 0xA1]
+ 0x24217D8: [0x48, 0x4D, 0x8F, 0x7D]
+ 0x2421868: [0x48, 0x4D, 0x8E, 0xED]
+ 0x242188C: [0x48, 0x4D, 0x8E, 0xF9]
+ 0x2483900: [0x48, 0x47, 0x6E, 0xAD]
+ 0x25D7DAC: [0x48, 0x32, 0x29, 0x51]
+ 0x28FA6FC: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x7F, 0xE3, 0xFB, 0x78, 0x4B, 0xFF, 0xE6, 0x91, 0x7C, 0x7F, 0x1B, 0x78, 0x57,
0xE4, 0x06, 0x3E, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21,
0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28FA718: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28FA728: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x88, 0x7E, 0x00, 0xB3, 0x4B, 0xFF, 0xE6, 0x65, 0x98, 0x7E, 0x00, 0xB3, 0x7C,
0x60, 0x1B, 0x78, 0x80, 0x61, 0x00, 0x14, 0x7C, 0x68, 0x03, 0xA6, 0x38, 0x21,
0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28FA744: [0x7C, 0x1F, 0x03, 0x78, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6,
+ 0x28FA754: [0x7C, 0x1F, 0x03, 0x78, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6,
0x90, 0x01, 0x00, 0x14, 0x80, 0x7E, 0x04, 0x28, 0x4B, 0xFF, 0xE6, 0x35, 0x7F,
0xE0, 0xFB, 0x78, 0x7C, 0x7F, 0x1B, 0x78, 0x80, 0x61, 0x00, 0x14, 0x7C, 0x68,
0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28FA774: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28FA784: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x88, 0x63, 0x52, 0xA4, 0x4B, 0xFF, 0xE6, 0x09, 0x7C, 0x7F, 0x1B, 0x78, 0x80,
0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80,
0x00, 0x20]
- 0x28FA79C: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28FA7AC: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x88, 0x7E, 0x00, 0xB3, 0x4B, 0xFF, 0xE5, 0xE1, 0x7C, 0x60, 0x1B, 0x78, 0x80,
0x81, 0x00, 0x14, 0x7C, 0x88, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80,
0x00, 0x20]
- 0x28FA7C4: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x4B, 0xCC, 0x2A, 0x5D, 0x4B, 0xFF, 0xE5, 0xB9, 0x80, 0x01, 0x00, 0x14, 0x7C,
+ 0x28FA7D4: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x4B, 0xCC, 0x2A, 0x4D, 0x4B, 0xFF, 0xE5, 0xB9, 0x80, 0x01, 0x00, 0x14, 0x7C,
0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
diff --git a/asm/patch_diffs/misc_rando_features_diff.yaml b/asm/patch_diffs/misc_rando_features_diff.yaml
index 6f0c6d40..fb80abd0 100644
--- a/asm/patch_diffs/misc_rando_features_diff.yaml
+++ b/asm/patch_diffs/misc_rando_features_diff.yaml
@@ -1,67 +1,70 @@
Data:
- 0x20238CC: [0x48, 0x8D, 0x71, 0x35]
- 0x2025200: [0x48, 0x8D, 0x58, 0x01]
+ 0x20238CC: [0x48, 0x8D, 0x71, 0x45]
+ 0x2025200: [0x48, 0x8D, 0x58, 0x11]
0x2026804: [0x38, 0x60, 0x00, 0x01]
- 0x20268C0: [0x48, 0x8D, 0x41, 0x41]
- 0x20268D0: [0x48, 0x8D, 0x41, 0x31]
+ 0x20268C0: [0x48, 0x8D, 0x41, 0x51]
+ 0x20268D0: [0x48, 0x8D, 0x41, 0x41]
0x203F1F8: [0x3C, 0x63, 0x0D, 0x45]
- 0x2083028: [0x48, 0x87, 0x79, 0x9D, 0x2C, 0x03, 0x00, 0x00]
- 0x21836D4: [0x48, 0x77, 0x71, 0x7C]
- 0x21E3210: [0x48, 0x71, 0x7A, 0x88]
+ 0x2083028: [0x48, 0x87, 0x79, 0xAD, 0x2C, 0x03, 0x00, 0x00]
+ 0x21836D4: [0x48, 0x77, 0x71, 0x8C]
+ 0x21E3210: [0x48, 0x71, 0x7A, 0x98]
0x227E5A4: [0x60, 0x00, 0x00, 0x00]
0x22830E0: [0x48, 0x00, 0x00, 0x6C]
0x2330C24: [0x39, 0x88, 0xFF, 0xFE]
- 0x23BA514: [0x48, 0x54, 0x05, 0x88]
- 0x23BA534: [0x48, 0x54, 0x05, 0x90]
+ 0x234D08C: [0xD1, 0xBF, 0x04, 0x90]
+ 0x234D094: [0xD1, 0xBF, 0x04, 0x1C]
+ 0x234D0BC: [0x39, 0x80, 0x00, 0x3E]
+ 0x23BA514: [0x48, 0x54, 0x05, 0x98]
+ 0x23BA534: [0x48, 0x54, 0x05, 0xA0]
0x23E77CC: [0x60, 0x00, 0x00, 0x00]
- 0x23F5218: [0x48, 0x50, 0x58, 0xDC]
- 0x24126B8: [0x48, 0x4E, 0x83, 0x0D, 0x2C, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00, 0x14,
+ 0x23F5218: [0x48, 0x50, 0x58, 0xEC]
+ 0x24126B8: [0x48, 0x4E, 0x83, 0x1D, 0x2C, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00, 0x14,
0x48, 0x00, 0x00, 0x20]
- 0x25499EC: [0x48, 0x3B, 0x0E, 0x4C]
+ 0x25499EC: [0x48, 0x3B, 0x0E, 0x5C]
0x25AECE4: [0x48, 0x34, 0x9B, 0x11]
- 0x25B4DD4: [0x48, 0x34, 0x5A, 0x14]
+ 0x25B4DD4: [0x48, 0x34, 0x5A, 0x24]
0x25B4DDC: [0x60, 0x00, 0x00, 0x00]
0x25B4DE8: [0x60, 0x00, 0x00, 0x00]
- 0x25BA940: [0x48, 0x33, 0xFE, 0xC4]
- 0x25BAA3C: [0x48, 0x33, 0xFD, 0xE4]
+ 0x25BA940: [0x48, 0x33, 0xFE, 0xD4]
+ 0x25BAA3C: [0x48, 0x33, 0xFD, 0xF4]
0x25C10A4: [0x39, 0x40, 0x00, 0x00]
0x25C10D4: [0x39, 0x4A, 0x00, 0x01]
- 0x25C10DC: [0x48, 0x33, 0x9B, 0x58]
- 0x25C10F0: [0x48, 0x33, 0x9B, 0x68]
- 0x25C112C: [0x48, 0x33, 0x9B, 0x38]
- 0x25C1140: [0x48, 0x33, 0x9B, 0x30]
- 0x2600634: [0x48, 0x2F, 0xA2, 0x70]
- 0x263B250: [0x48, 0x2B, 0xF7, 0xD9]
+ 0x25C10DC: [0x48, 0x33, 0x9B, 0x68]
+ 0x25C10F0: [0x48, 0x33, 0x9B, 0x78]
+ 0x25C112C: [0x48, 0x33, 0x9B, 0x48]
+ 0x25C1140: [0x48, 0x33, 0x9B, 0x40]
+ 0x2600634: [0x48, 0x2F, 0xA2, 0x80]
+ 0x263B250: [0x48, 0x2B, 0xF7, 0xE9]
0x2678784: [0x3B, 0xA0, 0x00, 0x0A]
0x267A264: [0x39, 0x20, 0x00, 0x0A]
- 0x267B4FC: [0x48, 0x27, 0xF6, 0x0C]
+ 0x267B4FC: [0x48, 0x27, 0xF6, 0x1C]
0x2681BC8: [0x3B, 0xA0, 0x00, 0x0A]
- 0x2681CE0: [0x48, 0x27, 0x8E, 0x3C]
- 0x26D9CE4: [0x48, 0x22, 0x0F, 0x18]
- 0x26D9D28: [0x48, 0x22, 0x0E, 0xE8]
+ 0x2681CE0: [0x48, 0x27, 0x8E, 0x4C]
+ 0x26D9CE4: [0x48, 0x22, 0x0F, 0x28]
+ 0x26D9D28: [0x48, 0x22, 0x0E, 0xF8]
0x26EF340: [0x3B, 0xA0, 0x00, 0x0A]
- 0x26F0394: [0x48, 0x20, 0xA8, 0x38]
- 0x28FA7E8: [0x3F, 0xE0, 0x02, 0x90, 0x3B, 0xFF, 0x8D, 0x50, 0xA1, 0x7F, 0x00, 0x00,
+ 0x26F0394: [0x48, 0x20, 0xA8, 0x48]
+ 0x28FA7F8: [0x3F, 0xE0, 0x02, 0x90, 0x3B, 0xFF, 0x8D, 0x60, 0xA1, 0x7F, 0x00, 0x00,
0xB1, 0x63, 0x00, 0x00, 0x55, 0x6B, 0x00, 0x3A, 0xB1, 0x63, 0x00, 0x02, 0x4B,
- 0xCB, 0xA5, 0xD8]
- 0x28FA804: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x33,
+ 0xCB, 0xA5, 0xC8]
+ 0x28FA814: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x33,
0x88, 0x83, 0x00, 0x00, 0x98, 0x83, 0x00, 0x01, 0x3B, 0x80, 0x00, 0x00, 0x4B,
- 0xCC, 0x01, 0x28]
- 0x28FA820: [0xA0, 0x1F, 0x00, 0x00, 0x54, 0x00, 0x00, 0x3A, 0x28, 0x00, 0x00, 0x0C,
- 0x40, 0x81, 0x00, 0x08, 0x38, 0x00, 0x00, 0x0C, 0x4B, 0xCC, 0x02, 0x0C]
- 0x28FA838: [0xA0, 0x0C, 0x00, 0x20, 0x54, 0x00, 0x00, 0x3A, 0x28, 0x00, 0x00, 0x0C,
- 0x40, 0x81, 0x00, 0x08, 0x38, 0x00, 0x00, 0x0C, 0x4B, 0xC4, 0xF1, 0xA4]
- 0x28FA850: [0x2C, 0x00, 0x00, 0x07, 0x41, 0x82, 0x00, 0x0C, 0x6C, 0x00, 0x80, 0x00,
- 0x4B, 0x88, 0x8E, 0x7C, 0x6C, 0x00, 0x80, 0x00, 0xC0, 0x1F, 0x03, 0xA0, 0x3D,
- 0x20, 0x02, 0x90, 0x39, 0x29, 0xA8, 0x98, 0xC1, 0xA9, 0x00, 0x00, 0xEC, 0x00,
+ 0xCC, 0x01, 0x18]
+ 0x28FA830: [0xA0, 0x1F, 0x00, 0x00, 0x54, 0x00, 0x00, 0x3A, 0x28, 0x00, 0x00, 0x0C,
+ 0x40, 0x81, 0x00, 0x08, 0x38, 0x00, 0x00, 0x0C, 0x4B, 0xCC, 0x01, 0xFC]
+ 0x28FA848: [0xA0, 0x0C, 0x00, 0x20, 0x54, 0x00, 0x00, 0x3A, 0x28, 0x00, 0x00, 0x0C,
+ 0x40, 0x81, 0x00, 0x08, 0x38, 0x00, 0x00, 0x0C, 0x4B, 0xC4, 0xF1, 0x94]
+ 0x28FA860: [0x2C, 0x00, 0x00, 0x07, 0x41, 0x82, 0x00, 0x0C, 0x6C, 0x00, 0x80, 0x00,
+ 0x4B, 0x88, 0x8E, 0x6C, 0x6C, 0x00, 0x80, 0x00, 0xC0, 0x1F, 0x03, 0xA0, 0x3D,
+ 0x20, 0x02, 0x90, 0x39, 0x29, 0xA8, 0xA8, 0xC1, 0xA9, 0x00, 0x00, 0xEC, 0x00,
0x68, 0x2A, 0xC1, 0xA9, 0x00, 0x04, 0xFC, 0x00, 0x68, 0x40, 0x41, 0x80, 0x00,
0x08, 0xC0, 0x09, 0x00, 0x08, 0xD0, 0x1F, 0x03, 0xA0, 0xFC, 0x00, 0x02, 0x10,
- 0xFC, 0x20, 0x00, 0x18, 0x4B, 0x88, 0x8E, 0x60, 0x3E, 0x19, 0x99, 0x9A, 0x40,
+ 0xFC, 0x20, 0x00, 0x18, 0x4B, 0x88, 0x8E, 0x50, 0x3E, 0x19, 0x99, 0x9A, 0x40,
0xC0, 0x00, 0x00, 0xC0, 0xC0, 0x00, 0x00]
- 0x28FA8A4: [0x28, 0x00, 0x00, 0x07, 0x40, 0x82, 0x00, 0x20, 0xA0, 0x06, 0x00, 0x04,
+ 0x28FA8B4: [0x28, 0x00, 0x00, 0x07, 0x40, 0x82, 0x00, 0x20, 0xA0, 0x06, 0x00, 0x04,
0x28, 0x00, 0x00, 0x4B, 0x41, 0x80, 0x00, 0x14, 0x28, 0x00, 0x00, 0x4F, 0x41,
0x81, 0x00, 0x0C, 0x7C, 0x06, 0x03, 0x78, 0x48, 0x00, 0x00, 0x0C, 0x38, 0x60,
- 0xFF, 0xFF, 0x4B, 0xD0, 0x5D, 0x6C, 0x94, 0x21, 0xFF, 0xE0, 0xBF, 0x61, 0x00,
+ 0xFF, 0xFF, 0x4B, 0xD0, 0x5D, 0x5C, 0x94, 0x21, 0xFF, 0xE0, 0xBF, 0x61, 0x00,
0x0C, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x24, 0x38, 0xC6, 0xFF, 0xB8,
0x7C, 0x7D, 0x1B, 0x78, 0x7C, 0x9E, 0x23, 0x78, 0x7C, 0xBF, 0x2B, 0x78, 0x3D,
0x20, 0x10, 0x20, 0x81, 0x29, 0x84, 0xDC, 0x39, 0x29, 0x07, 0xBC, 0x89, 0x49,
@@ -70,27 +73,27 @@ Data:
0x7D, 0x29, 0x32, 0x14, 0x48, 0x00, 0x00, 0x10, 0x3D, 0x20, 0x10, 0x20, 0x81,
0x29, 0x84, 0xDC, 0x39, 0x29, 0x07, 0x98, 0x88, 0xC9, 0x00, 0x20, 0x7D, 0x3C,
0x4B, 0x78, 0x7F, 0xA3, 0xEB, 0x78, 0x7F, 0xC4, 0xF3, 0x78, 0x7F, 0xE5, 0xFB,
- 0x78, 0x38, 0xE0, 0x00, 0x00, 0x39, 0x00, 0x00, 0x01, 0x4B, 0xD0, 0x22, 0x49,
+ 0x78, 0x38, 0xE0, 0x00, 0x00, 0x39, 0x00, 0x00, 0x01, 0x4B, 0xD0, 0x22, 0x39,
0x7F, 0xFF, 0x1A, 0x14, 0x7C, 0x7B, 0x1B, 0x78, 0x88, 0xDC, 0x00, 0x21, 0x54,
0xC6, 0x07, 0x7B, 0x40, 0x82, 0x00, 0x10, 0x3C, 0xC0, 0x02, 0x90, 0x38, 0xC6,
- 0xA9, 0xB4, 0x48, 0x00, 0x00, 0x0C, 0x3C, 0xC0, 0x02, 0x90, 0x38, 0xC6, 0xA9,
- 0xBC, 0x7F, 0xA3, 0xEB, 0x78, 0x7F, 0xC4, 0xF3, 0x78, 0x7F, 0xE5, 0xFB, 0x78,
- 0x4B, 0xD0, 0x24, 0xDD, 0x7C, 0x7B, 0x1A, 0x14, 0xBB, 0x61, 0x00, 0x0C, 0x80,
+ 0xA9, 0xC4, 0x48, 0x00, 0x00, 0x0C, 0x3C, 0xC0, 0x02, 0x90, 0x38, 0xC6, 0xA9,
+ 0xCC, 0x7F, 0xA3, 0xEB, 0x78, 0x7F, 0xC4, 0xF3, 0x78, 0x7F, 0xE5, 0xFB, 0x78,
+ 0x4B, 0xD0, 0x24, 0xCD, 0x7C, 0x7B, 0x1A, 0x14, 0xBB, 0x61, 0x00, 0x0C, 0x80,
0x01, 0x00, 0x24, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x20, 0x4E, 0x80,
0x00, 0x20, 0x55, 0x6E, 0x69, 0x74, 0x5F, 0x4B, 0x65, 0x79, 0x5F, 0x30, 0x30,
0x00, 0x55, 0x6E, 0x69, 0x74, 0x5F, 0x4B, 0x65, 0x79, 0x5F, 0x30, 0x31, 0x00,
- 0x02, 0x8F, 0xA9, 0x9C, 0x10, 0x10, 0x39, 0x4C, 0x02, 0x8F, 0xA9, 0xA8, 0x10,
+ 0x02, 0x8F, 0xA9, 0xAC, 0x10, 0x10, 0x39, 0x4C, 0x02, 0x8F, 0xA9, 0xB8, 0x10,
0x10, 0x39, 0x4C]
- 0x28FA9C4: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x3C, 0x60, 0x02, 0x90, 0x38, 0x63, 0x8C, 0x4C, 0x88, 0x63, 0x00, 0x00, 0x2C,
+ 0x28FA9D4: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x3C, 0x60, 0x02, 0x90, 0x38, 0x63, 0x8C, 0x5C, 0x88, 0x63, 0x00, 0x00, 0x2C,
0x03, 0x00, 0x01, 0x41, 0x82, 0x00, 0x0C, 0x38, 0x60, 0x00, 0x01, 0x48, 0x00,
0x00, 0x08, 0x38, 0x60, 0x00, 0x00, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03,
0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28FAA00: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28FAA10: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x38, 0x60, 0x00, 0x0D, 0x38, 0x80, 0x00, 0x05, 0x4B, 0xFF, 0xEF, 0xDD, 0x80,
0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80,
0x00, 0x20]
- 0x28FAA28: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28FAA38: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x38, 0xC0, 0x00, 0x00, 0x38, 0x60, 0x00, 0x03, 0x38, 0x80, 0x00, 0x0F, 0x4B,
0xFF, 0xEF, 0x25, 0x7C, 0xC6, 0x1A, 0x14, 0x38, 0x60, 0x00, 0x04, 0x38, 0x80,
0x00, 0x0F, 0x4B, 0xFF, 0xEF, 0x15, 0x7C, 0xC6, 0x1A, 0x14, 0x38, 0x60, 0x00,
@@ -99,98 +102,100 @@ Data:
0xC6, 0x1A, 0x14, 0x38, 0x60, 0x00, 0x07, 0x38, 0x80, 0x00, 0x0F, 0x4B, 0xFF,
0xEE, 0xE5, 0x7C, 0xC6, 0x1A, 0x14, 0x7C, 0xC3, 0x33, 0x78, 0x80, 0x01, 0x00,
0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28FAA9C: [0x7D, 0x8C, 0x02, 0x14, 0x81, 0x5F, 0x03, 0xD4, 0x2C, 0x0A, 0x00, 0x02,
+ 0x28FAAAC: [0x7D, 0x8C, 0x02, 0x14, 0x81, 0x5F, 0x03, 0xD4, 0x2C, 0x0A, 0x00, 0x02,
0x41, 0x82, 0x00, 0x0C, 0x2C, 0x0A, 0x00, 0x05, 0x40, 0x82, 0x00, 0x10, 0x3D,
- 0x80, 0x02, 0x90, 0x39, 0x8C, 0xAA, 0xEC, 0x4B, 0xAB, 0xFA, 0x5C, 0x4B, 0xAB,
- 0xFA, 0x58, 0x7D, 0x4A, 0x02, 0x14, 0x81, 0x7F, 0x03, 0xD4, 0x2C, 0x0B, 0x00,
+ 0x80, 0x02, 0x90, 0x39, 0x8C, 0xAA, 0xFC, 0x4B, 0xAB, 0xFA, 0x4C, 0x4B, 0xAB,
+ 0xFA, 0x48, 0x7D, 0x4A, 0x02, 0x14, 0x81, 0x7F, 0x03, 0xD4, 0x2C, 0x0B, 0x00,
0x02, 0x41, 0x82, 0x00, 0x0C, 0x2C, 0x0B, 0x00, 0x05, 0x40, 0x82, 0x00, 0x10,
- 0x3D, 0x40, 0x02, 0x90, 0x39, 0x4A, 0xAA, 0xF0, 0x4B, 0xAB, 0xFA, 0x54, 0x4B,
- 0xAB, 0xFA, 0x50, 0xE5, 0x10, 0x1B, 0x80, 0x3C, 0x37, 0x9D, 0x80]
- 0x28FAAF4: [0x3D, 0x60, 0x02, 0x90, 0xC0, 0x0B, 0xAB, 0x04, 0xEF, 0xFF, 0x00, 0x32,
- 0x4B, 0xAF, 0xA7, 0x1C, 0x40, 0x00, 0x00, 0x00]
- 0x28FAB08: [0x9B, 0xE6, 0x00, 0x10, 0x3B, 0xE0, 0x00, 0xFD, 0x9B, 0xE6, 0x00, 0x12,
- 0x9B, 0xE6, 0x00, 0x13, 0x4B, 0xD8, 0x09, 0xE8]
- 0x28FAB1C: [0x4B, 0xD8, 0x6F, 0xB5, 0x38, 0x60, 0x00, 0x09, 0x4B, 0xD7, 0xF6, 0xE1,
+ 0x3D, 0x40, 0x02, 0x90, 0x39, 0x4A, 0xAB, 0x00, 0x4B, 0xAB, 0xFA, 0x44, 0x4B,
+ 0xAB, 0xFA, 0x40, 0xE5, 0x10, 0x1B, 0x80, 0x3C, 0x37, 0x9D, 0x80]
+ 0x28FAB04: [0x3D, 0x60, 0x02, 0x90, 0xC0, 0x0B, 0xAB, 0x14, 0xEF, 0xFF, 0x00, 0x32,
+ 0x4B, 0xAF, 0xA7, 0x0C, 0x40, 0x00, 0x00, 0x00]
+ 0x28FAB18: [0x9B, 0xE6, 0x00, 0x10, 0x3B, 0xE0, 0x00, 0xFD, 0x9B, 0xE6, 0x00, 0x12,
+ 0x9B, 0xE6, 0x00, 0x13, 0x4B, 0xD8, 0x09, 0xD8]
+ 0x28FAB2C: [0x4B, 0xD8, 0x6F, 0xA5, 0x38, 0x60, 0x00, 0x09, 0x4B, 0xD7, 0xF6, 0xD1,
0x38, 0x81, 0x00, 0x34, 0x90, 0x61, 0x00, 0x34, 0x7C, 0xC4, 0x14, 0xAA, 0x38,
0xA1, 0x00, 0x1C, 0x7F, 0xC4, 0xF3, 0x78, 0x7F, 0xE3, 0xFB, 0x78, 0x7C, 0xC5,
- 0x15, 0xAA, 0x38, 0xC0, 0x00, 0x01, 0x4B, 0xD8, 0x6F, 0x89, 0x38, 0x60, 0x00,
- 0x09, 0x4B, 0xD7, 0xF6, 0xB5, 0x38, 0x81, 0x00, 0x28, 0x90, 0x61, 0x00, 0x28,
+ 0x15, 0xAA, 0x38, 0xC0, 0x00, 0x01, 0x4B, 0xD8, 0x6F, 0x79, 0x38, 0x60, 0x00,
+ 0x09, 0x4B, 0xD7, 0xF6, 0xA5, 0x38, 0x81, 0x00, 0x28, 0x90, 0x61, 0x00, 0x28,
0x38, 0xA1, 0x00, 0x0A, 0x7C, 0xC4, 0x14, 0xAA, 0x7C, 0xA4, 0x2B, 0x78, 0x7F,
- 0xE3, 0xFB, 0x78, 0x7C, 0xC5, 0x15, 0xAA, 0x4B, 0xD8, 0x62, 0x71, 0x7C, 0x7E,
+ 0xE3, 0xFB, 0x78, 0x7C, 0xC5, 0x15, 0xAA, 0x4B, 0xD8, 0x62, 0x61, 0x7C, 0x7E,
0x1B, 0x79, 0x41, 0x82, 0x00, 0x38, 0x38, 0x60, 0x00, 0x01, 0x98, 0x7E, 0x00,
- 0x9A, 0x38, 0x60, 0x00, 0x00, 0x4B, 0xD7, 0xF6, 0x7D, 0x38, 0x81, 0x00, 0x34,
+ 0x9A, 0x38, 0x60, 0x00, 0x00, 0x4B, 0xD7, 0xF6, 0x6D, 0x38, 0x81, 0x00, 0x34,
0x90, 0x61, 0x00, 0x34, 0x7C, 0xC4, 0x14, 0xAA, 0x38, 0xA1, 0x00, 0x1C, 0x7F,
0xC4, 0xF3, 0x78, 0x7F, 0xE3, 0xFB, 0x78, 0x7C, 0xC5, 0x15, 0xAA, 0x38, 0xC0,
- 0x00, 0x05, 0x4B, 0xD8, 0x6F, 0x25, 0x4B, 0xD8, 0x71, 0x34]
- 0x28FABB4: [0x4C, 0x5F, 0x57, 0x61, 0x72, 0x70, 0x41, 0x72, 0x65, 0x61, 0x5F, 0x30,
- 0x39, 0x00, 0x00, 0x00, 0x02, 0x8F, 0xAB, 0xB4, 0x10, 0x10, 0x39, 0x4C]
- 0x28FABCC: [0x2C, 0x1E, 0x00, 0x0B, 0x40, 0x80, 0x00, 0x14, 0x3A, 0xE0, 0x00, 0x00,
- 0x3F, 0xE0, 0x02, 0x90, 0x33, 0xFF, 0xAB, 0xC4, 0x4B, 0xDF, 0x54, 0x90, 0x38,
- 0x60, 0x00, 0x01, 0x4B, 0xDF, 0x57, 0xB0]
- 0x28FABEC: [0x30, 0x30, 0x30, 0x37, 0x36, 0x00, 0x00, 0x00, 0x02, 0x8F, 0xAB, 0xEC,
+ 0x00, 0x05, 0x4B, 0xD8, 0x6F, 0x15, 0x4B, 0xD8, 0x71, 0x24]
+ 0x28FABC4: [0x4C, 0x5F, 0x57, 0x61, 0x72, 0x70, 0x41, 0x72, 0x65, 0x61, 0x5F, 0x30,
+ 0x39, 0x00, 0x00, 0x00, 0x02, 0x8F, 0xAB, 0xC4, 0x10, 0x10, 0x39, 0x4C]
+ 0x28FABDC: [0x2C, 0x1E, 0x00, 0x0B, 0x40, 0x80, 0x00, 0x14, 0x3A, 0xE0, 0x00, 0x00,
+ 0x3F, 0xE0, 0x02, 0x90, 0x33, 0xFF, 0xAB, 0xD4, 0x4B, 0xDF, 0x54, 0x80, 0x38,
+ 0x60, 0x00, 0x01, 0x4B, 0xDF, 0x57, 0xA0]
+ 0x28FABFC: [0x30, 0x30, 0x30, 0x37, 0x36, 0x00, 0x00, 0x00, 0x02, 0x8F, 0xAB, 0xFC,
0x10, 0x10, 0x39, 0x4C]
- 0x28FABFC: [0x39, 0x2A, 0x00, 0x08, 0x2C, 0x09, 0x00, 0x12, 0x40, 0x82, 0x00, 0x08,
- 0x39, 0x20, 0x00, 0x33, 0x4B, 0xDD, 0xF0, 0xDC]
- 0x28FAC10: [0x38, 0x81, 0x00, 0x08, 0x2C, 0x09, 0x00, 0x33, 0x40, 0x82, 0x00, 0x0C,
- 0x3C, 0xA0, 0x02, 0x90, 0x30, 0xA5, 0xAB, 0xF4, 0x4B, 0xDD, 0xF1, 0x08, 0x53,
+ 0x28FAC0C: [0x39, 0x2A, 0x00, 0x08, 0x2C, 0x09, 0x00, 0x12, 0x40, 0x82, 0x00, 0x08,
+ 0x39, 0x20, 0x00, 0x33, 0x4B, 0xDD, 0xF0, 0xCC]
+ 0x28FAC20: [0x38, 0x81, 0x00, 0x08, 0x2C, 0x09, 0x00, 0x33, 0x40, 0x82, 0x00, 0x0C,
+ 0x3C, 0xA0, 0x02, 0x90, 0x30, 0xA5, 0xAC, 0x04, 0x4B, 0xDD, 0xF0, 0xF8, 0x53,
0x77, 0x4F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x01, 0xE4, 0xFF, 0x00]
- 0x28FAC34: [0x28, 0x0A, 0x03, 0x29, 0x41, 0x80, 0x00, 0x18, 0x41, 0x82, 0x00, 0x0C,
+ 0x28FAC44: [0x28, 0x0A, 0x03, 0x29, 0x41, 0x80, 0x00, 0x18, 0x41, 0x82, 0x00, 0x0C,
0x28, 0x0A, 0x03, 0x2A, 0x40, 0x80, 0x00, 0x10, 0x3C, 0x60, 0x02, 0x90, 0x38,
- 0x63, 0xAC, 0x28, 0x4B, 0xCC, 0x64, 0x5C, 0x4B, 0xCC, 0x64, 0x8C]
- 0x28FAC58: [0x39, 0x60, 0x00, 0x00, 0x39, 0x40, 0x00, 0x00, 0x4B, 0xCC, 0x64, 0x94]
- 0x28FAC64: [0x39, 0x6B, 0x00, 0x01, 0x39, 0x8C, 0x00, 0x0C, 0x4B, 0xCC, 0x64, 0xC4]
- 0x28FAC70: [0x41, 0x82, 0x00, 0x20, 0x28, 0x0B, 0x03, 0x29, 0x41, 0x81, 0x00, 0x1C,
- 0x3D, 0x80, 0x02, 0x90, 0x39, 0x8C, 0xAC, 0x28, 0x38, 0x00, 0x00, 0x01, 0x7C,
- 0x09, 0x03, 0xA6, 0x4B, 0xCC, 0x64, 0x70, 0x4B, 0xCC, 0x64, 0xB4, 0x4B, 0xCC,
- 0x64, 0xB4]
- 0x28FAC98: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x05, 0x2C,
+ 0x63, 0xAC, 0x38, 0x4B, 0xCC, 0x64, 0x4C, 0x4B, 0xCC, 0x64, 0x7C]
+ 0x28FAC68: [0x39, 0x60, 0x00, 0x00, 0x39, 0x40, 0x00, 0x00, 0x4B, 0xCC, 0x64, 0x84]
+ 0x28FAC74: [0x39, 0x6B, 0x00, 0x01, 0x39, 0x8C, 0x00, 0x0C, 0x4B, 0xCC, 0x64, 0xB4]
+ 0x28FAC80: [0x41, 0x82, 0x00, 0x20, 0x28, 0x0B, 0x03, 0x29, 0x41, 0x81, 0x00, 0x1C,
+ 0x3D, 0x80, 0x02, 0x90, 0x39, 0x8C, 0xAC, 0x38, 0x38, 0x00, 0x00, 0x01, 0x7C,
+ 0x09, 0x03, 0xA6, 0x4B, 0xCC, 0x64, 0x60, 0x4B, 0xCC, 0x64, 0xA4, 0x4B, 0xCC,
+ 0x64, 0xA4]
+ 0x28FACA8: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x05, 0x2C,
0x88, 0x83, 0x00, 0x10, 0x70, 0x84, 0x00, 0x80, 0x41, 0x82, 0x00, 0x1C, 0x3C,
0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x07, 0x98, 0x88, 0x83,
0x00, 0x10, 0x60, 0x84, 0x00, 0x40, 0x98, 0x83, 0x00, 0x10, 0x7F, 0xE3, 0xFB,
- 0x78, 0x4B, 0x8E, 0x85, 0x48]
+ 0x78, 0x4B, 0x8E, 0x85, 0x38]
+ 0x10029A30: [0xBF, 0x06, 0xBC, 0xA2, 0x3F, 0x06, 0xBC, 0xA2]
+ 0x10029A40: [0x41, 0x06, 0x38, 0x22]
0x100F7BD0: [0x00, 0x00, 0x00, 0x00]
Relocations:
-- {r_addend: 0x8F8D50, r_info: 0x106, r_offset: 0x28FA7EA}
-- {r_addend: 0x8F8D50, r_info: 0x104, r_offset: 0x28FA7EE}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA806}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA80A}
-- {r_addend: 0x8FA898, r_info: 0x106, r_offset: 0x28FA86A}
-- {r_addend: 0x8FA898, r_info: 0x104, r_offset: 0x28FA86E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA8F2}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA8F6}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA90A}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA90E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA922}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA926}
-- {r_addend: 0x8FA9B4, r_info: 0x106, r_offset: 0x28FA962}
-- {r_addend: 0x8FA9B4, r_info: 0x104, r_offset: 0x28FA966}
-- {r_addend: 0x8FA9BC, r_info: 0x106, r_offset: 0x28FA96E}
-- {r_addend: 0x8FA9BC, r_info: 0x104, r_offset: 0x28FA972}
-- {r_addend: 0x8FA99C, r_info: 0x101, r_offset: 0x28FA9B4}
-- {r_addend: 0x10394C, r_info: 0x201, r_offset: 0x28FA9B8}
-- {r_addend: 0x8FA9A8, r_info: 0x101, r_offset: 0x28FA9BC}
-- {r_addend: 0x10394C, r_info: 0x201, r_offset: 0x28FA9C0}
-- {r_addend: 0x8F8C4C, r_info: 0x106, r_offset: 0x28FA9D2}
-- {r_addend: 0x8F8C4C, r_info: 0x104, r_offset: 0x28FA9D6}
-- {r_addend: 0x8FAAEC, r_info: 0x106, r_offset: 0x28FAAB6}
-- {r_addend: 0x8FAAEC, r_info: 0x104, r_offset: 0x28FAABA}
-- {r_addend: 0x8FAAF0, r_info: 0x106, r_offset: 0x28FAADE}
-- {r_addend: 0x8FAAF0, r_info: 0x104, r_offset: 0x28FAAE2}
-- {r_addend: 0x8FAB04, r_info: 0x106, r_offset: 0x28FAAF6}
-- {r_addend: 0x8FAB04, r_info: 0x104, r_offset: 0x28FAAFA}
-- {r_addend: 0x8FABB4, r_info: 0x101, r_offset: 0x28FABC4}
-- {r_addend: 0x10394C, r_info: 0x201, r_offset: 0x28FABC8}
-- {r_addend: 0x8FABC4, r_info: 0x106, r_offset: 0x28FABDA}
-- {r_addend: 0x8FABC4, r_info: 0x104, r_offset: 0x28FABDE}
-- {r_addend: 0x8FABEC, r_info: 0x101, r_offset: 0x28FABF4}
-- {r_addend: 0x10394C, r_info: 0x201, r_offset: 0x28FABF8}
-- {r_addend: 0x8FABF4, r_info: 0x106, r_offset: 0x28FAC1E}
-- {r_addend: 0x8FABF4, r_info: 0x104, r_offset: 0x28FAC22}
-- {r_addend: 0x8FAC28, r_info: 0x106, r_offset: 0x28FAC4A}
-- {r_addend: 0x8FAC28, r_info: 0x104, r_offset: 0x28FAC4E}
-- {r_addend: 0x8FAC28, r_info: 0x106, r_offset: 0x28FAC7E}
-- {r_addend: 0x8FAC28, r_info: 0x104, r_offset: 0x28FAC82}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAC9A}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAC9E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FACB2}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FACB6}
+- {r_addend: 0x8F8D60, r_info: 0x106, r_offset: 0x28FA7FA}
+- {r_addend: 0x8F8D60, r_info: 0x104, r_offset: 0x28FA7FE}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA816}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA81A}
+- {r_addend: 0x8FA8A8, r_info: 0x106, r_offset: 0x28FA87A}
+- {r_addend: 0x8FA8A8, r_info: 0x104, r_offset: 0x28FA87E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA902}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA906}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA91A}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA91E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FA932}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FA936}
+- {r_addend: 0x8FA9C4, r_info: 0x106, r_offset: 0x28FA972}
+- {r_addend: 0x8FA9C4, r_info: 0x104, r_offset: 0x28FA976}
+- {r_addend: 0x8FA9CC, r_info: 0x106, r_offset: 0x28FA97E}
+- {r_addend: 0x8FA9CC, r_info: 0x104, r_offset: 0x28FA982}
+- {r_addend: 0x8FA9AC, r_info: 0x101, r_offset: 0x28FA9C4}
+- {r_addend: 0x10394C, r_info: 0x201, r_offset: 0x28FA9C8}
+- {r_addend: 0x8FA9B8, r_info: 0x101, r_offset: 0x28FA9CC}
+- {r_addend: 0x10394C, r_info: 0x201, r_offset: 0x28FA9D0}
+- {r_addend: 0x8F8C5C, r_info: 0x106, r_offset: 0x28FA9E2}
+- {r_addend: 0x8F8C5C, r_info: 0x104, r_offset: 0x28FA9E6}
+- {r_addend: 0x8FAAFC, r_info: 0x106, r_offset: 0x28FAAC6}
+- {r_addend: 0x8FAAFC, r_info: 0x104, r_offset: 0x28FAACA}
+- {r_addend: 0x8FAB00, r_info: 0x106, r_offset: 0x28FAAEE}
+- {r_addend: 0x8FAB00, r_info: 0x104, r_offset: 0x28FAAF2}
+- {r_addend: 0x8FAB14, r_info: 0x106, r_offset: 0x28FAB06}
+- {r_addend: 0x8FAB14, r_info: 0x104, r_offset: 0x28FAB0A}
+- {r_addend: 0x8FABC4, r_info: 0x101, r_offset: 0x28FABD4}
+- {r_addend: 0x10394C, r_info: 0x201, r_offset: 0x28FABD8}
+- {r_addend: 0x8FABD4, r_info: 0x106, r_offset: 0x28FABEA}
+- {r_addend: 0x8FABD4, r_info: 0x104, r_offset: 0x28FABEE}
+- {r_addend: 0x8FABFC, r_info: 0x101, r_offset: 0x28FAC04}
+- {r_addend: 0x10394C, r_info: 0x201, r_offset: 0x28FAC08}
+- {r_addend: 0x8FAC04, r_info: 0x106, r_offset: 0x28FAC2E}
+- {r_addend: 0x8FAC04, r_info: 0x104, r_offset: 0x28FAC32}
+- {r_addend: 0x8FAC38, r_info: 0x106, r_offset: 0x28FAC5A}
+- {r_addend: 0x8FAC38, r_info: 0x104, r_offset: 0x28FAC5E}
+- {r_addend: 0x8FAC38, r_info: 0x106, r_offset: 0x28FAC8E}
+- {r_addend: 0x8FAC38, r_info: 0x104, r_offset: 0x28FAC92}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FACAA}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FACAE}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FACC2}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FACC6}
diff --git a/asm/patch_diffs/remove_cutscenes_diff.yaml b/asm/patch_diffs/remove_cutscenes_diff.yaml
index a2a6af74..73e2782f 100644
--- a/asm/patch_diffs/remove_cutscenes_diff.yaml
+++ b/asm/patch_diffs/remove_cutscenes_diff.yaml
@@ -14,43 +14,43 @@ Data:
0x2482764: [0x60, 0x00, 0x00, 0x00]
0x24B7408: [0x48, 0x00, 0x00, 0x54]
0x24B74D4: [0x60, 0x00, 0x00, 0x00]
- 0x24D4EC0: [0x48, 0x42, 0x5E, 0x11]
+ 0x24D4EC0: [0x48, 0x42, 0x5E, 0x21]
0x24D4F28: [0x60, 0x00, 0x00, 0x00]
- 0x24D53D0: [0x48, 0x42, 0x59, 0x01]
+ 0x24D53D0: [0x48, 0x42, 0x59, 0x11]
0x24D602C: [0x38, 0x60, 0x00, 0x01, 0x4E, 0x80, 0x00, 0x20]
- 0x254F52C: [0x48, 0x3A, 0xB7, 0xE4]
- 0x254F540: [0x48, 0x3A, 0xB7, 0xD0]
- 0x254F554: [0x48, 0x3A, 0xB7, 0xBC]
+ 0x254F52C: [0x48, 0x3A, 0xB7, 0xF4]
+ 0x254F540: [0x48, 0x3A, 0xB7, 0xE0]
+ 0x254F554: [0x48, 0x3A, 0xB7, 0xCC]
0x25542E0: [0x38, 0x60, 0x00, 0x02, 0x4B, 0xFC, 0xC7, 0xA1]
0x2554308: [0x38, 0x60, 0x00, 0x02, 0x4B, 0xFC, 0xC7, 0x79]
0x25AEDCC: [0x60, 0x00, 0x00, 0x00]
0x25AEDE0: [0x60, 0x00, 0x00, 0x00]
0x25AEE00: [0x48, 0x00, 0x00, 0x18]
- 0x28FACD0: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28FACE0: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0xD4, 0x4B,
- 0xCB, 0xD1, 0x19, 0x2C, 0x03, 0x00, 0x08, 0x40, 0x80, 0x00, 0x0C, 0x38, 0x60,
+ 0xCB, 0xD1, 0x09, 0x2C, 0x03, 0x00, 0x08, 0x40, 0x80, 0x00, 0x0C, 0x38, 0x60,
0x00, 0x00, 0x48, 0x00, 0x00, 0x08, 0x38, 0x60, 0x00, 0x01, 0x80, 0x01, 0x00,
0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
- 0x28FAD10: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
- 0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x9F, 0x23, 0x78, 0x4B, 0xCB, 0xCF, 0x9D, 0x3C,
+ 0x28FAD20: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x9F, 0x23, 0x78, 0x4B, 0xCB, 0xCF, 0x8D, 0x3C,
0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x2C, 0x1F,
0x00, 0x00, 0x41, 0x82, 0x00, 0x18, 0x2C, 0x1F, 0x00, 0x01, 0x41, 0x82, 0x00,
0x1C, 0x2C, 0x1F, 0x00, 0x02, 0x41, 0x82, 0x00, 0x20, 0x48, 0x00, 0x00, 0x24,
- 0x38, 0x80, 0x14, 0x10, 0x4B, 0xCB, 0xDE, 0x15, 0x48, 0x00, 0x00, 0x18, 0x38,
- 0x80, 0x14, 0x80, 0x4B, 0xCB, 0xDE, 0x09, 0x48, 0x00, 0x00, 0x0C, 0x38, 0x80,
- 0x14, 0x40, 0x4B, 0xCB, 0xDD, 0xFD, 0x3C, 0xA0, 0x10, 0x20, 0x80, 0xA5, 0x84,
+ 0x38, 0x80, 0x14, 0x10, 0x4B, 0xCB, 0xDE, 0x05, 0x48, 0x00, 0x00, 0x18, 0x38,
+ 0x80, 0x14, 0x80, 0x4B, 0xCB, 0xDD, 0xF9, 0x48, 0x00, 0x00, 0x0C, 0x38, 0x80,
+ 0x14, 0x40, 0x4B, 0xCB, 0xDD, 0xED, 0x3C, 0xA0, 0x10, 0x20, 0x80, 0xA5, 0x84,
0xDC, 0x38, 0xA5, 0x00, 0xDF, 0x88, 0x85, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x07,
- 0x40, 0x82, 0x00, 0x14, 0x38, 0x80, 0x1E, 0x40, 0x4B, 0xCB, 0xDD, 0xDD, 0x38,
- 0x80, 0x2E, 0x80, 0x4B, 0xCB, 0xDD, 0xD5, 0x83, 0xE1, 0x00, 0x0C, 0x80, 0x01,
+ 0x40, 0x82, 0x00, 0x14, 0x38, 0x80, 0x1E, 0x40, 0x4B, 0xCB, 0xDD, 0xCD, 0x38,
+ 0x80, 0x2E, 0x80, 0x4B, 0xCB, 0xDD, 0xC5, 0x83, 0xE1, 0x00, 0x0C, 0x80, 0x01,
0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00,
0x20]
0x101D232E: [0x00, 0x09]
0x101D233A: [0x00, 0x09]
0x101D2346: [0x00, 0x09]
Relocations:
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FACDE}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FACE2}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAD2A}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAD2E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAD72}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAD76}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FACEE}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FACF2}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAD3A}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAD3E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAD82}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAD86}
diff --git a/asm/patch_diffs/remove_low_health_effects_diff.yaml b/asm/patch_diffs/remove_low_health_effects_diff.yaml
index c2ebf50b..507ee60d 100644
--- a/asm/patch_diffs/remove_low_health_effects_diff.yaml
+++ b/asm/patch_diffs/remove_low_health_effects_diff.yaml
@@ -1,13 +1,13 @@
Data:
- 0x2024408: [0x48, 0x8D, 0x69, 0xA4]
- 0x23DD1B8: [0x48, 0x51, 0xDC, 0x14]
- 0x28FADAC: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0xA0, 0x63, 0x00, 0x20,
+ 0x2024408: [0x48, 0x8D, 0x69, 0xB4]
+ 0x23DD1B8: [0x48, 0x51, 0xDC, 0x24]
+ 0x28FADBC: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0xA0, 0x63, 0x00, 0x20,
0x28, 0x03, 0x00, 0x08, 0x41, 0x80, 0x00, 0x0C, 0x7F, 0xE3, 0xFB, 0x78, 0x4B,
- 0x72, 0x96, 0x48, 0x4B, 0x72, 0x96, 0x90]
- 0x28FADCC: [0xA0, 0x6C, 0x00, 0x20, 0xA0, 0x8C, 0x00, 0x22, 0x54, 0x63, 0x00, 0x3A,
+ 0x72, 0x96, 0x38, 0x4B, 0x72, 0x96, 0x80]
+ 0x28FADDC: [0xA0, 0x6C, 0x00, 0x20, 0xA0, 0x8C, 0x00, 0x22, 0x54, 0x63, 0x00, 0x3A,
0x7C, 0x64, 0x18, 0x10, 0x2C, 0x03, 0x00, 0x02, 0x40, 0x80, 0x00, 0x0C, 0x38,
- 0x60, 0x00, 0x00, 0x4B, 0xAE, 0x23, 0xD4, 0x38, 0x60, 0x00, 0x01, 0x4B, 0xAE,
- 0x23, 0xCC]
+ 0x60, 0x00, 0x00, 0x4B, 0xAE, 0x23, 0xC4, 0x38, 0x60, 0x00, 0x01, 0x4B, 0xAE,
+ 0x23, 0xBC]
Relocations:
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FADAE}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FADB2}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FADBE}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FADC2}
diff --git a/asm/patch_diffs/switch_op_diff.yaml b/asm/patch_diffs/switch_op_diff.yaml
index fd3e6602..de32f049 100644
--- a/asm/patch_diffs/switch_op_diff.yaml
+++ b/asm/patch_diffs/switch_op_diff.yaml
@@ -1,19 +1,19 @@
Data:
- 0x28FADF4: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
+ 0x28FAE04: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x7F, 0x1B, 0x78, 0x81, 0x3F, 0x02, 0xE4, 0x55,
- 0x29, 0x07, 0x39, 0x40, 0x82, 0x00, 0x14, 0x4B, 0xCD, 0xA0, 0xBD, 0x81, 0x3F,
+ 0x29, 0x07, 0x39, 0x40, 0x82, 0x00, 0x14, 0x4B, 0xCD, 0xA0, 0xAD, 0x81, 0x3F,
0x02, 0xE4, 0x61, 0x29, 0x00, 0x08, 0x91, 0x3F, 0x02, 0xE4, 0x81, 0x23, 0x00,
0xB0, 0x55, 0x2A, 0x07, 0x3E, 0x99, 0x43, 0x03, 0xAD, 0x55, 0x2A, 0xE7, 0xFE,
0x99, 0x43, 0x03, 0xAE, 0x7D, 0x2A, 0x46, 0x70, 0x99, 0x43, 0x03, 0xAF, 0x7D,
0x2A, 0x86, 0x70, 0x99, 0x43, 0x03, 0xB0, 0x55, 0x29, 0x46, 0x3E, 0x99, 0x23,
0x03, 0xB1, 0xA0, 0xA3, 0x02, 0xF8, 0x98, 0xA3, 0x03, 0xB2, 0xA1, 0x23, 0x02,
0xFC, 0x99, 0x23, 0x03, 0xB6, 0x54, 0xA5, 0x06, 0x3E, 0x38, 0x80, 0x00, 0x00,
- 0x4B, 0xC2, 0x52, 0x6D, 0x38, 0x63, 0x52, 0xC4, 0x4B, 0xC4, 0x90, 0xA1, 0xB0,
+ 0x4B, 0xC2, 0x52, 0x5D, 0x38, 0x63, 0x52, 0xC4, 0x4B, 0xC4, 0x90, 0x91, 0xB0,
0x7F, 0x03, 0xB4, 0x89, 0x3F, 0x03, 0xB6, 0x99, 0x3F, 0x03, 0xB7, 0x88, 0x9F,
0x03, 0xAF, 0x2C, 0x04, 0x00, 0xFF, 0x40, 0x82, 0x00, 0x10, 0x39, 0x20, 0x00,
0x05, 0x99, 0x3F, 0x03, 0xAC, 0x48, 0x00, 0x00, 0x40, 0x88, 0xBF, 0x03, 0x26,
0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x20, 0x4B,
- 0xCB, 0xF2, 0x19, 0x2C, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00, 0x1C, 0x89, 0x3F,
+ 0xCB, 0xF2, 0x09, 0x2C, 0x03, 0x00, 0x00, 0x41, 0x82, 0x00, 0x1C, 0x89, 0x3F,
0x03, 0xAE, 0x2C, 0x09, 0x00, 0x00, 0x41, 0x82, 0xFF, 0xD0, 0x39, 0x20, 0x00,
0x04, 0x99, 0x3F, 0x03, 0xAC, 0x48, 0x00, 0x00, 0x0C, 0x39, 0x20, 0x00, 0x00,
0x99, 0x3F, 0x03, 0xAC, 0x38, 0x60, 0x00, 0x04, 0x80, 0x01, 0x00, 0x14, 0x7C,
@@ -22,11 +22,11 @@ Data:
0x01, 0x4E, 0x80, 0x00, 0x20, 0x38, 0x60, 0x00, 0x01, 0x4E, 0x80, 0x00, 0x20,
0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14, 0x93,
0xE1, 0x00, 0x0C, 0x7C, 0x7F, 0x1B, 0x78, 0xA8, 0x83, 0x03, 0xB4, 0x4B, 0xC2,
- 0x51, 0xB9, 0x38, 0x63, 0x52, 0xC4, 0x4B, 0xC4, 0x91, 0xA5, 0x2C, 0x03, 0x00,
+ 0x51, 0xA9, 0x38, 0x63, 0x52, 0xC4, 0x4B, 0xC4, 0x91, 0x95, 0x2C, 0x03, 0x00,
0x00, 0x41, 0x82, 0x00, 0x34, 0x89, 0x3F, 0x03, 0xAE, 0x2C, 0x09, 0x00, 0x00,
0x41, 0x82, 0x00, 0x10, 0x39, 0x20, 0x00, 0x04, 0x99, 0x3F, 0x03, 0xAC, 0x48,
0x00, 0x00, 0x0C, 0x39, 0x20, 0x00, 0x05, 0x99, 0x3F, 0x03, 0xAC, 0x4B, 0xC2,
- 0x51, 0x85, 0xA1, 0x23, 0x52, 0xB8, 0x61, 0x29, 0x00, 0x08, 0xB1, 0x23, 0x52,
+ 0x51, 0x75, 0xA1, 0x23, 0x52, 0xB8, 0x61, 0x29, 0x00, 0x08, 0xB1, 0x23, 0x52,
0xB8, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x83, 0xE1, 0x00, 0x0C,
0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xE0, 0x7C,
0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x24, 0x93, 0x61, 0x00, 0x0C, 0x93, 0x81,
@@ -36,7 +36,7 @@ Data:
0x9C, 0x00, 0x01, 0x3B, 0xFF, 0x00, 0x01, 0x3B, 0xDE, 0x00, 0x01, 0x89, 0x3D,
0x03, 0xB1, 0x7C, 0x1E, 0x48, 0x00, 0x40, 0x80, 0x00, 0x2C, 0x88, 0xBD, 0x03,
0x26, 0x57, 0xE4, 0x06, 0x3E, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC,
- 0x38, 0x63, 0x00, 0x20, 0x4B, 0xCB, 0xF0, 0xE9, 0x2C, 0x03, 0x00, 0x00, 0x41,
+ 0x38, 0x63, 0x00, 0x20, 0x4B, 0xCB, 0xF0, 0xD9, 0x2C, 0x03, 0x00, 0x00, 0x41,
0x82, 0xFF, 0xCC, 0x3B, 0x7B, 0x00, 0x01, 0x4B, 0xFF, 0xFF, 0xC8, 0x38, 0x60,
0x00, 0x00, 0x89, 0x3D, 0x03, 0xAD, 0x2C, 0x09, 0x00, 0x00, 0x40, 0x82, 0x00,
0x0C, 0x2C, 0x1C, 0x00, 0x00, 0x41, 0x82, 0x00, 0x58, 0x2C, 0x09, 0x00, 0x01,
@@ -57,7 +57,7 @@ Data:
0xFF, 0xFF, 0x41, 0x82, 0x00, 0x10, 0x39, 0x20, 0x00, 0x02, 0x99, 0x3F, 0x03,
0xAC, 0x48, 0x00, 0x00, 0x3C, 0x88, 0xBF, 0x03, 0x26, 0x88, 0x9F, 0x03, 0xAF,
0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x20, 0x4B,
- 0xCB, 0xED, 0x55, 0x89, 0x3F, 0x03, 0xAE, 0x2C, 0x09, 0x00, 0x00, 0x41, 0x82,
+ 0xCB, 0xED, 0x45, 0x89, 0x3F, 0x03, 0xAE, 0x2C, 0x09, 0x00, 0x00, 0x41, 0x82,
0x00, 0x10, 0x39, 0x20, 0x00, 0x04, 0x99, 0x3F, 0x03, 0xAC, 0x48, 0x00, 0x00,
0x0C, 0x39, 0x20, 0x00, 0x04, 0x99, 0x3F, 0x03, 0xAC, 0x80, 0x01, 0x00, 0x14,
0x7C, 0x08, 0x03, 0xA6, 0x83, 0xE1, 0x00, 0x0C, 0x38, 0x21, 0x00, 0x10, 0x4E,
@@ -70,7 +70,7 @@ Data:
0x4C, 0xA9, 0x3F, 0x03, 0xB4, 0x2C, 0x09, 0xFF, 0xFF, 0x41, 0x82, 0x00, 0x10,
0x39, 0x20, 0x00, 0x02, 0x99, 0x3F, 0x03, 0xAC, 0x48, 0x00, 0x00, 0x40, 0x88,
0xBF, 0x03, 0x26, 0x88, 0x9F, 0x03, 0xAF, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63,
- 0x84, 0xDC, 0x38, 0x63, 0x00, 0x20, 0x4B, 0xCB, 0xEC, 0xA5, 0x89, 0x3F, 0x03,
+ 0x84, 0xDC, 0x38, 0x63, 0x00, 0x20, 0x4B, 0xCB, 0xEC, 0x95, 0x89, 0x3F, 0x03,
0xAE, 0x2C, 0x09, 0x00, 0x00, 0x41, 0x82, 0x00, 0x1C, 0x39, 0x20, 0x00, 0x05,
0x99, 0x3F, 0x03, 0xAC, 0x48, 0x00, 0x00, 0x10, 0x89, 0x3F, 0x03, 0xB7, 0x39,
0x29, 0xFF, 0xFF, 0x99, 0x3F, 0x03, 0xB7, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
@@ -79,23 +79,23 @@ Data:
0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x7F, 0x1B, 0x78, 0xA1, 0x23, 0x00, 0xF8, 0x2C,
0x09, 0x00, 0x02, 0x40, 0x82, 0x00, 0x28, 0x39, 0x20, 0x00, 0x03, 0x99, 0x23,
0x03, 0xAC, 0x88, 0xA3, 0x03, 0x26, 0x88, 0x83, 0x03, 0xAF, 0x3C, 0x60, 0x10,
- 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x20, 0x4B, 0xCB, 0xEC, 0x2D,
+ 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x20, 0x4B, 0xCB, 0xEC, 0x1D,
0x48, 0x00, 0x00, 0x48, 0x89, 0x23, 0x03, 0xAE, 0x2C, 0x09, 0x00, 0x00, 0x41,
0x82, 0x00, 0x1C, 0x4B, 0xFF, 0xFD, 0x55, 0x2C, 0x03, 0x00, 0x00, 0x40, 0x82,
0x00, 0x10, 0x39, 0x20, 0x00, 0x00, 0x99, 0x23, 0x03, 0xAC, 0x48, 0x00, 0x00,
0x24, 0x39, 0x00, 0x00, 0x01, 0x38, 0xE0, 0x00, 0x00, 0x38, 0xC0, 0x00, 0x00,
0x60, 0xC6, 0xFF, 0xFF, 0x88, 0xBF, 0x03, 0xB2, 0xA0, 0x9F, 0x03, 0xB4, 0x7F,
- 0xE3, 0xFB, 0x78, 0x4B, 0xCD, 0xC8, 0x05, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
+ 0xE3, 0xFB, 0x78, 0x4B, 0xCD, 0xC7, 0xF5, 0x80, 0x01, 0x00, 0x14, 0x7C, 0x08,
0x03, 0xA6, 0x83, 0xE1, 0x00, 0x0C, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00,
0x20, 0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x7F, 0x1B, 0x78, 0x4B, 0xFF, 0xFC, 0xF5, 0x2C,
0x03, 0x00, 0x00, 0x40, 0x82, 0x00, 0x24, 0x39, 0x20, 0x00, 0x00, 0x99, 0x3F,
0x03, 0xAC, 0x88, 0xBF, 0x03, 0x26, 0x88, 0x9F, 0x03, 0xAF, 0x3C, 0x60, 0x10,
- 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x20, 0x4B, 0xCB, 0xEC, 0xD5,
+ 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0x20, 0x4B, 0xCB, 0xEC, 0xC5,
0x80, 0x01, 0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x93, 0xE1, 0x00, 0x0C, 0x38,
0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20, 0x94, 0x21, 0xFF, 0xF8, 0x7C, 0x08,
0x02, 0xA6, 0x90, 0x01, 0x00, 0x0C, 0x89, 0x43, 0x03, 0xAC, 0x28, 0x0A, 0x00,
- 0x04, 0x41, 0x81, 0x00, 0x5C, 0x3D, 0x20, 0x02, 0x90, 0x39, 0x29, 0xB2, 0xF0,
+ 0x04, 0x41, 0x81, 0x00, 0x5C, 0x3D, 0x20, 0x02, 0x90, 0x39, 0x29, 0xB3, 0x00,
0x55, 0x4A, 0x10, 0x3A, 0x7D, 0x2A, 0x4A, 0x14, 0x7D, 0x29, 0x03, 0xA6, 0x4E,
0x80, 0x04, 0x20, 0x48, 0x00, 0x00, 0x18, 0x48, 0x00, 0x00, 0x1C, 0x48, 0x00,
0x00, 0x20, 0x48, 0x00, 0x00, 0x24, 0x48, 0x00, 0x00, 0x28, 0x48, 0x00, 0x00,
@@ -103,35 +103,35 @@ Data:
0x48, 0x00, 0x00, 0x1C, 0x4B, 0xFF, 0xFE, 0xB9, 0x48, 0x00, 0x00, 0x14, 0x4B,
0xFF, 0xFB, 0xE5, 0x48, 0x00, 0x00, 0x0C, 0x4B, 0xFF, 0xFF, 0x45, 0x48, 0x00,
0x00, 0x04, 0x38, 0x60, 0x00, 0x01, 0x80, 0x01, 0x00, 0x0C, 0x7C, 0x08, 0x03,
- 0xA6, 0x38, 0x21, 0x00, 0x08, 0x4E, 0x80, 0x00, 0x20, 0x02, 0x8F, 0xAD, 0xF4,
- 0x02, 0x8F, 0xAE, 0xF4, 0x02, 0x8F, 0xB2, 0xC0, 0x02, 0x8F, 0xAE, 0xEC, 0x02,
- 0x8F, 0xAE, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xA6, 0x38, 0x21, 0x00, 0x08, 0x4E, 0x80, 0x00, 0x20, 0x02, 0x8F, 0xAE, 0x04,
+ 0x02, 0x8F, 0xAF, 0x04, 0x02, 0x8F, 0xB2, 0xD0, 0x02, 0x8F, 0xAE, 0xFC, 0x02,
+ 0x8F, 0xAF, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x07, 0xFF, 0xFD, 0x01, 0xE4, 0x00,
0x00, 0x10, 0x1F, 0x3B, 0xDC, 0x00, 0x00, 0x03, 0xB8, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x10, 0x1F, 0x30, 0x88, 0x00, 0x9F, 0x00, 0x00, 0x02,
- 0x8F, 0xB3, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
- 0x101F4670: [0x02, 0x8F, 0xB3, 0x64]
+ 0x8F, 0xB3, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+ 0x101F4670: [0x02, 0x8F, 0xB3, 0x74]
Relocations:
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAE9E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAEA2}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAFCE}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAFD2}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB0DA}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB0DE}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB18A}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB18E}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB202}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB206}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB29E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB2A2}
-- {r_addend: 0x8FB2F0, r_info: 0x106, r_offset: 0x28FB2DA}
-- {r_addend: 0x8FB2F0, r_info: 0x104, r_offset: 0x28FB2DE}
-- {r_addend: 0x8FADF4, r_info: 0x101, r_offset: 0x28FB344}
-- {r_addend: 0x8FAEF4, r_info: 0x101, r_offset: 0x28FB348}
-- {r_addend: 0x8FB2C0, r_info: 0x101, r_offset: 0x28FB34C}
-- {r_addend: 0x8FAEEC, r_info: 0x101, r_offset: 0x28FB350}
-- {r_addend: 0x8FAEFC, r_info: 0x101, r_offset: 0x28FB354}
-- {r_addend: 0x1F3BDC, r_info: 0x201, r_offset: 0x28FB370}
-- {r_addend: 0x1F3088, r_info: 0x201, r_offset: 0x28FB380}
-- {r_addend: 0x8FB344, r_info: 0x101, r_offset: 0x28FB388}
-- {r_addend: 0x8FB364, r_info: 0x101, r_offset: 0x101F4670}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAEAE}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAEB2}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAFDE}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAFE2}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB0EA}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB0EE}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB19A}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB19E}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB212}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB216}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB2AE}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB2B2}
+- {r_addend: 0x8FB300, r_info: 0x106, r_offset: 0x28FB2EA}
+- {r_addend: 0x8FB300, r_info: 0x104, r_offset: 0x28FB2EE}
+- {r_addend: 0x8FAE04, r_info: 0x101, r_offset: 0x28FB354}
+- {r_addend: 0x8FAF04, r_info: 0x101, r_offset: 0x28FB358}
+- {r_addend: 0x8FB2D0, r_info: 0x101, r_offset: 0x28FB35C}
+- {r_addend: 0x8FAEFC, r_info: 0x101, r_offset: 0x28FB360}
+- {r_addend: 0x8FAF0C, r_info: 0x101, r_offset: 0x28FB364}
+- {r_addend: 0x1F3BDC, r_info: 0x201, r_offset: 0x28FB380}
+- {r_addend: 0x1F3088, r_info: 0x201, r_offset: 0x28FB390}
+- {r_addend: 0x8FB354, r_info: 0x101, r_offset: 0x28FB398}
+- {r_addend: 0x8FB374, r_info: 0x101, r_offset: 0x101F4670}
diff --git a/asm/patch_diffs/swordless_diff.yaml b/asm/patch_diffs/swordless_diff.yaml
index 8dccf8d7..9067cb21 100644
--- a/asm/patch_diffs/swordless_diff.yaml
+++ b/asm/patch_diffs/swordless_diff.yaml
@@ -1,34 +1,34 @@
Data:
0x213AE90: [0x55, 0x48, 0x03, 0xDF]
0x213AEA8: [0x48, 0x00, 0x00, 0x14]
- 0x25B2030: [0x48, 0x34, 0x93, 0x64]
- 0x25B26F4: [0x48, 0x34, 0x8C, 0xF4]
- 0x25B26F8: [0x48, 0x34, 0x8D, 0x50]
- 0x28FB394: [0x4B, 0xC2, 0x4D, 0x41, 0x38, 0x63, 0x51, 0x34, 0x3C, 0x80, 0x10, 0x05,
+ 0x25B2030: [0x48, 0x34, 0x93, 0x74]
+ 0x25B26F4: [0x48, 0x34, 0x8D, 0x04]
+ 0x25B26F8: [0x48, 0x34, 0x8D, 0x60]
+ 0x28FB3A4: [0x4B, 0xC2, 0x4D, 0x31, 0x38, 0x63, 0x51, 0x34, 0x3C, 0x80, 0x10, 0x05,
0x38, 0x84, 0x33, 0x6C, 0x8C, 0xA3, 0x00, 0x01, 0x8C, 0xC4, 0x00, 0x01, 0x7C,
0x05, 0x30, 0x40, 0x40, 0x82, 0x00, 0x0C, 0x28, 0x05, 0x00, 0x00, 0x40, 0x82,
0xFF, 0xEC, 0x7C, 0x65, 0x30, 0x51, 0x40, 0x82, 0x00, 0x20, 0x3F, 0xC0, 0x10,
0x20, 0x83, 0xDE, 0x84, 0xDC, 0x88, 0x1E, 0x00, 0x2E, 0x2C, 0x00, 0x00, 0xFF,
0x40, 0x82, 0x00, 0x0C, 0x38, 0x00, 0x00, 0x3E, 0x98, 0x1E, 0x00, 0x2E, 0x4B,
- 0xC2, 0x4C, 0xF5, 0x4B, 0xCB, 0x6C, 0x50]
- 0x28FB3E8: [0x4B, 0xC2, 0x4C, 0xED, 0x38, 0x63, 0x51, 0x34, 0x3C, 0x80, 0x10, 0x00,
+ 0xC2, 0x4C, 0xE5, 0x4B, 0xCB, 0x6C, 0x40]
+ 0x28FB3F8: [0x4B, 0xC2, 0x4C, 0xDD, 0x38, 0x63, 0x51, 0x34, 0x3C, 0x80, 0x10, 0x00,
0x38, 0x84, 0x3D, 0x28, 0x8C, 0xA3, 0x00, 0x01, 0x8C, 0xC4, 0x00, 0x01, 0x7C,
0x05, 0x30, 0x40, 0x40, 0x82, 0x00, 0x0C, 0x28, 0x05, 0x00, 0x00, 0x40, 0x82,
0xFF, 0xEC, 0x7C, 0x65, 0x30, 0x50, 0x2C, 0x03, 0x00, 0x00, 0x40, 0x82, 0x00,
0x28, 0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x88, 0x03, 0x00, 0x2E,
0x2C, 0x00, 0x00, 0xFF, 0x40, 0x82, 0x00, 0x14, 0x38, 0x00, 0x00, 0x38, 0x98,
- 0x03, 0x00, 0x2E, 0x7C, 0x65, 0x1B, 0x78, 0x4B, 0xCB, 0x72, 0xC0, 0x80, 0x9B,
- 0x84, 0xDC, 0x4B, 0xCB, 0x72, 0xB4]
- 0x28FB448: [0x88, 0x04, 0x00, 0xD4, 0x2C, 0x00, 0x00, 0x00, 0x40, 0x82, 0x00, 0x0C,
+ 0x03, 0x00, 0x2E, 0x7C, 0x65, 0x1B, 0x78, 0x4B, 0xCB, 0x72, 0xB0, 0x80, 0x9B,
+ 0x84, 0xDC, 0x4B, 0xCB, 0x72, 0xA4]
+ 0x28FB458: [0x88, 0x04, 0x00, 0xD4, 0x2C, 0x00, 0x00, 0x00, 0x40, 0x82, 0x00, 0x0C,
0x38, 0x00, 0x00, 0xFF, 0x98, 0x04, 0x00, 0x2E, 0x88, 0xA4, 0x00, 0x68, 0x4B,
- 0xCB, 0x72, 0x9C]
+ 0xCB, 0x72, 0x8C]
Relocations:
-- {r_addend: 0x5336C, r_info: 0x206, r_offset: 0x28FB39E}
-- {r_addend: 0x5336C, r_info: 0x204, r_offset: 0x28FB3A2}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB3C6}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB3CA}
-- {r_addend: 0x3D28, r_info: 0x206, r_offset: 0x28FB3F2}
-- {r_addend: 0x3D28, r_info: 0x204, r_offset: 0x28FB3F6}
-- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB41E}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB422}
-- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB442}
+- {r_addend: 0x5336C, r_info: 0x206, r_offset: 0x28FB3AE}
+- {r_addend: 0x5336C, r_info: 0x204, r_offset: 0x28FB3B2}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB3D6}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB3DA}
+- {r_addend: 0x3D28, r_info: 0x206, r_offset: 0x28FB402}
+- {r_addend: 0x3D28, r_info: 0x204, r_offset: 0x28FB406}
+- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FB42E}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB432}
+- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FB452}
diff --git a/asm/patches/custom_funcs.asm b/asm/patches/custom_funcs.asm
index 841cf8fa..7ba4fb50 100644
--- a/asm/patches/custom_funcs.asm
+++ b/asm/patches/custom_funcs.asm
@@ -160,15 +160,19 @@ bl onEventBit
; Set four switch bits (0x0, 0x1, 0x3, 0x7) for several events that happen in the Fairy Woods on Outset.
; Setting these switches causes the Tetra hanging from a tree and rescuing her from Bokoblins events to be marked as finished.
; Also set the switch (0x9) for having seen the event where you enter the Rito Aerie for the first time and get the Delivery Bag.
-; Also set the switch (0x8) for having unclogged the pond, since that boulder doesn't respond to normal bombs which would be odd.
; Also set the the switch (0x1E) for having seen the intro to the interior of the Forest Haven, where the camera pans up.
; Also set the the switch (0x13) for having seen the camera panning towards the treasure chest in Windfall Town Jail.
; Also set the the switch (0x14) for having seen the camera pan around the Windfall Cafe.
lis r3,gameInfo_ptr@ha
lwz r3,gameInfo_ptr@l(r3)
addi r3,r3, 0x52C
-lis r4, 0x4018
-addi r4, r4, 0x038B
+; Also set the switch (0x8) for having unclogged the pond before DRC if Open DRC is on
+lis r4, open_drc@ha
+addi r4, r4, open_drc@l
+lbz r4, 0 (r4)
+slwi r4, r4, 8
+addis r4, r4, 0x4018
+addi r4, r4, 0x028B
stw r4, 4 (r3)
; Set two switch bits (0x3E and 0x3F) for having unlocked the song tablets in the Earth and Wind Temple entrances.
@@ -420,6 +424,10 @@ gyroscope_preference:
ui_display_preference:
.byte 0 ; By default start as On
+.global open_drc
+open_drc:
+.byte 0 ; By default start as Not Open
+
.align 2 ; Align to the next 4 bytes
diff --git a/asm/patches/misc_rando_features.asm b/asm/patches/misc_rando_features.asm
index 0bbbe622..1f2e75c1 100644
--- a/asm/patches/misc_rando_features.asm
+++ b/asm/patches/misc_rando_features.asm
@@ -871,4 +871,19 @@ spawn_drc_shortcut_warp:
spawn_drc_shortcut_warp_return:
mr r3, r31 ; Replace the line we overwrote to jump here
- b 0x021e3214 ; Return
\ No newline at end of file
+ b 0x021e3214 ; Return
+
+; The puzzle at DRC entrance where the pond fills up with water is very slow
+; (~20s from the boulder breaking to the water reaching max level)
+; This speeds it up by a factor of 5 by modifying the speeds of various animations
+.org 0x10029a30
+.float -0.5263158, 0.5263158 ; Water spread speed
+.org 0x10029a40
+.float 8.388704 ; Water rise speed
+
+.org 0x0234d08c ; in daObjGryw00_c::switch_wait_act_proc
+ stfs f13, 0x490 (r31) ; change arg to mBtk/mBck.setPlaySpeed from 1.0f to 5.0f
+.org 0x0234d094
+ stfs f13, 0x41c (r31) ; Same as above
+.org 0x0234d0bc ;
+ li r12, 62 ; Shorten geyser sound effect length
\ No newline at end of file
diff --git a/gui/desktop/mainwindow.cpp b/gui/desktop/mainwindow.cpp
index 3f20aa4d..0d764549 100644
--- a/gui/desktop/mainwindow.cpp
+++ b/gui/desktop/mainwindow.cpp
@@ -599,6 +599,7 @@ void MainWindow::apply_config_settings()
APPLY_CHECKBOX_SETTING(config, ui, classic_mode);
APPLY_CHECKBOX_SETTING(config, ui, performance);
APPLY_CHECKBOX_SETTING(config, ui, fix_rng);
+ APPLY_CHECKBOX_SETTING(config, ui, open_drc);
APPLY_CHECKBOX_SETTING(config, ui, progressive_magic_always_double);
APPLY_CHECKBOX_SETTING(config, ui, plandomizer);
update_plandomizer_widget_visbility();
@@ -909,6 +910,7 @@ DEFINE_STATE_CHANGE_FUNCTION(random_item_slide_item)
DEFINE_STATE_CHANGE_FUNCTION(classic_mode)
DEFINE_STATE_CHANGE_FUNCTION(performance)
DEFINE_STATE_CHANGE_FUNCTION(fix_rng)
+DEFINE_STATE_CHANGE_FUNCTION(open_drc)
DEFINE_STATE_CHANGE_FUNCTION(progressive_magic_always_double)
void MainWindow::on_plandomizer_stateChanged(int arg1)
{
diff --git a/gui/desktop/mainwindow.hpp b/gui/desktop/mainwindow.hpp
index 7e43f840..d2fa457d 100644
--- a/gui/desktop/mainwindow.hpp
+++ b/gui/desktop/mainwindow.hpp
@@ -234,6 +234,7 @@ private slots:
void on_plandomizer_path_browse_button_clicked();
void on_plandomizer_path_editingFinished();
void on_fix_rng_stateChanged(int arg1);
+ void on_open_drc_stateChanged(int arg1);
void on_progressive_magic_always_double_stateChanged(int arg1);
// Hints
diff --git a/gui/desktop/mainwindow.ui b/gui/desktop/mainwindow.ui
index 03d95b41..d3a56cb1 100644
--- a/gui/desktop/mainwindow.ui
+++ b/gui/desktop/mainwindow.ui
@@ -2109,12 +2109,26 @@
-
+
+
+ Open DRC
+
+
+
+ -
Progressive Magic is Always Double
+ -
+
+
+
+
+
+
@@ -2562,8 +2576,8 @@ font-size: 15px;
0
0
- 360
- 313
+ 100
+ 30
@@ -2835,7 +2849,7 @@ font-size: 15px;
0
0
360
- 265
+ 30
diff --git a/gui/desktop/option_descriptions.hpp b/gui/desktop/option_descriptions.hpp
index c2c7a7ea..4032efa7 100644
--- a/gui/desktop/option_descriptions.hpp
+++ b/gui/desktop/option_descriptions.hpp
@@ -286,6 +286,10 @@ static std::unordered_map optionDescriptions = {
"performance",
"Mostly recommended for console users. Adjusts game code that causes performance issues, but may come at the cost of visual quality. Currently only affects particles."
},
+ {
+ "open_drc",
+ "Allow DRC entrance to be accessed from the beginning of the game with no items."
+ },
{
"progressive_magic_always_double",
"Progressive Magic Meters will always give double magic. Finding a second Progressive Magic Meter will have no effect (i.e., will not quadruple your magic)."
diff --git a/gui/wiiu/OptionActions.cpp b/gui/wiiu/OptionActions.cpp
index e695ef6a..ee8d127d 100644
--- a/gui/wiiu/OptionActions.cpp
+++ b/gui/wiiu/OptionActions.cpp
@@ -698,6 +698,11 @@ namespace OptionCB {
return fromBool(conf.settings.plandomizer);
}
+ std::string toggleOpenDRC() {
+ conf.settings.open_drc = !conf.settings.open_drc;
+ return fromBool(conf.settings.open_drc);
+ }
+
std::string toggleProgressiveMagicAlwaysDouble() {
conf.settings.progressive_magic_always_double = !conf.settings.progressive_magic_always_double;
return fromBool(conf.settings.classic_mode);
@@ -1075,6 +1080,8 @@ std::string getValue(const Option& option) {
return fromBool(conf.settings.plandomizer);
case Option::PlandomizerFile: // Can't return this like everything else, just here as placeholder
return "";
+ case Option::OpenDRC:
+ return fromBool(conf.settings.open_drc);
case Option::ProgressiveMagicAlwaysDouble:
return fromBool(conf.settings.progressive_magic_always_double);
case Option::TargetType:
@@ -1291,6 +1298,8 @@ TriggerCallback getCallback(const Option& option) {
return &togglePlandomizer;
case Option::PlandomizerFile: // Can't return this like everything else, just here as placeholder
return &invalidCB;
+ case Option::OpenDRC:
+ return &toggleOpenDRC;
case Option::ProgressiveMagicAlwaysDouble:
return &toggleProgressiveMagicAlwaysDouble;
case Option::TargetType:
@@ -1375,6 +1384,7 @@ std::pair getNameDesc(const Option& option) {
{RandomItemSlideItem, {"Random Item Sliding Item", "Randomly start with one first-person item to allow item sliding (Grappling Hook, Boomerang, Bow, or Hookshot). This option is aimed at glitch-heavy races where finding one of these items could massively change the outcome. If you already start with one of these items, this setting will *not* add another."}},
{ClassicMode, {"Classic Mode", "Add back behaviors and glitches that were removed in the remake. Currently includes Wind Waker dives and dry storage. Only use these if you know what you are doing!"}},
{Plandomizer, {"Plandomizer", "Allows you to provide a file which manually sets item locations and/or entrances."}},
+ {OpenDRC, {"Open DRC", "Allow DRC entrance to be accessed from the beginning of the game with no items."}},
{ProgressiveMagicAlwaysDouble,{"Magic is Always Double", "Progressive Magic Meters will always give double magic. Finding a second Progressive Magic Meter will have no effect (i.e., will not quadruple your magic)."}},
{HoHoHints, {"Place Hints on Old Man Ho Ho", "Places hints on Old Man Ho Ho. Old Man Ho Ho appears at 10 different islands. Simply talk to Old Man Ho Ho to get hints."}},
diff --git a/gui/wiiu/Page.cpp b/gui/wiiu/Page.cpp
index 205be941..18fdeaaf 100644
--- a/gui/wiiu/Page.cpp
+++ b/gui/wiiu/Page.cpp
@@ -611,6 +611,7 @@ AdvancedPage::AdvancedPage() {
buttonColumns[0].emplace_back(std::make_unique(Option::NoSpoilerLog));
buttonColumns[0].emplace_back(std::make_unique(Option::DamageMultiplier, 250ms, 55ms));
buttonColumns[0].emplace_back(std::make_unique(Option::ClassicMode));
+ buttonColumns[0].emplace_back(std::make_unique(Option::OpenDRC));
buttonColumns[0].emplace_back(std::make_unique(Option::ProgressiveMagicAlwaysDouble));
buttonColumns[1].emplace_back(std::make_unique(Option::CTMC));
diff --git a/logic/LogicTests.cpp b/logic/LogicTests.cpp
index 5a9eef76..4273366c 100644
--- a/logic/LogicTests.cpp
+++ b/logic/LogicTests.cpp
@@ -188,6 +188,7 @@ void runLogicTests(Config& newConfig)
TEST(settings1, settings1.use_always_hints, "use always hints");
TEST(settings1, settings1.clearer_hints, "clearer hints");
TEST(settings1, settings1.hint_importance, "hint importance");
+ TEST(settings1, settings1.open_drc, "open_drc");
TEST(settings1, settings1.randomize_charts, "randomize charts");
TEST(settings1, settings1.randomize_starting_island, "random starting island");
TEST(settings1, settings1.randomize_dungeon_entrances, "randomize dungeon entrances");
@@ -220,6 +221,7 @@ void runLogicTests(Config& newConfig)
TEST(settings2, dummy, "randomize cave entrances");
TEST(settings2, settings2.randomize_dungeon_entrances, "randomize dungeon entrances");
TEST(settings2, settings2.randomize_starting_island, "randomize starting island");
+ TEST(settings2, settings2.open_drc, "open_drc");
TEST(settings2, settings2.randomize_charts, "randomize charts");
TEST(settings2, settings2.hint_importance, "hint importance");
TEST(settings2, settings2.clearer_hints, "clearer hints");
diff --git a/logic/data/world.yaml b/logic/data/world.yaml
index 4f598329..c78fe257 100644
--- a/logic/data/world.yaml
+++ b/logic/data/world.yaml
@@ -810,7 +810,7 @@
- Name: Dragon Roost Pond
Exits:
Dragon Roost Rito Aerie: Nothing
- Dragon Roost Pond Past Statues: Nothing
+ Dragon Roost Pond Past Statues: Open_DRC == true or Bombs or Power_Bracelets or Empty_Bottle or Can_Fly_With_Deku_Leaf_Indoors
- Name: Dragon Roost Pond Past Statues
Exits:
diff --git a/options.cpp b/options.cpp
index deeaa336..22601fb5 100644
--- a/options.cpp
+++ b/options.cpp
@@ -116,6 +116,7 @@ void Settings::resetDefaultSettings() {
classic_mode = false;
plandomizer = false;
+ open_drc = false;
progressive_magic_always_double = false;
return;
@@ -321,6 +322,8 @@ uint8_t Settings::getSetting(const Option& option) const {
return plandomizer;
case Option::PlandomizerFile: // Can't return this like everything else, just here as placeholder
return 0;
+ case Option::OpenDRC:
+ return open_drc;
case Option::ProgressiveMagicAlwaysDouble:
return progressive_magic_always_double;
case Option::TargetType:
@@ -514,6 +517,8 @@ void Settings::setSetting(const Option& option, const size_t& value) {
plandomizer = value; return;
case Option::PlandomizerFile: // Can't set this like everything else, just here as placeholder
return;
+ case Option::OpenDRC:
+ open_drc = value; return;
case Option::ProgressiveMagicAlwaysDouble:
progressive_magic_always_double = value; return;
case Option::TargetType:
@@ -965,6 +970,7 @@ Option nameToSetting(const std::string& name) {
{"Classic Mode", Option::ClassicMode},
{"Plandomizer", Option::Plandomizer},
{"Plandomizer File", Option::PlandomizerFile},
+ {"Open DRC", Option::OpenDRC},
{"Progressive Magic Always Double", Option::ProgressiveMagicAlwaysDouble},
{"Target Type", Option::TargetType},
{"Camera", Option::Camera},
@@ -1069,6 +1075,7 @@ std::string settingToName(const Option& setting) {
{Option::ClassicMode, "Classic Mode"},
{Option::Plandomizer, "Plandomizer"},
{Option::PlandomizerFile, "Plandomizer File"},
+ {Option::OpenDRC, "Open DRC"},
{Option::ProgressiveMagicAlwaysDouble, "Progressive Magic Always Double"},
{Option::TargetType, "Target Type"},
{Option::Camera, "Camera"},
diff --git a/options.hpp b/options.hpp
index 905a2a93..17b4e8f9 100644
--- a/options.hpp
+++ b/options.hpp
@@ -172,6 +172,7 @@ enum struct Option {
PlandomizerFile,
// Logic Tweaks
+ OpenDRC,
ProgressiveMagicAlwaysDouble,
// Hints
@@ -317,6 +318,7 @@ class Settings {
bool plandomizer;
fspath plandomizerFile;
+ bool open_drc;
bool progressive_magic_always_double;
TargetTypePreference target_type;
diff --git a/seedgen/config.cpp b/seedgen/config.cpp
index d3639586..e22e379f 100644
--- a/seedgen/config.cpp
+++ b/seedgen/config.cpp
@@ -236,6 +236,7 @@ ConfigError Config::loadFromFile(const fspath& filePath, const fspath& preferenc
GET_FIELD(root, "classic_mode", settings.classic_mode)
GET_FIELD(root, "plandomizer", settings.plandomizer)
+ GET_FIELD(root, "open_drc", settings.open_drc)
GET_FIELD(root, "progressive_magic_always_double", settings.progressive_magic_always_double)
if(!preferencesRoot["pig_color"]) {
@@ -569,6 +570,7 @@ YAML::Node Config::settingsToYaml() const {
SET_FIELD(root, "classic_mode", settings.classic_mode)
SET_FIELD(root, "plandomizer", settings.plandomizer)
+ SET_FIELD(root, "open_drc", settings.open_drc)
SET_FIELD(root, "progressive_magic_always_double", settings.progressive_magic_always_double)
SET_FIELD(root, "dungeon_small_keys", PlacementOptionToName(settings.dungeon_small_keys))
@@ -806,6 +808,7 @@ static const std::vector