Merge pull request #150 from gymnast86/required-bosses-rework

Rework Required Bosses

Author: gymnast86

asm/custom_symbols.yaml

@@ -1,134 +1,137 @@
-beedle_dont_buy_blue_chu: 0x28F9AE4
-big_key_label_safestring: 0x28FA9CC
-big_key_label_str: 0x28FA9B8
-boat_spawn_fallback_check: 0x28F9DE0
+beedle_dont_buy_blue_chu: 0x28F9B24
+big_key_label_safestring: 0x28FAA0C
+big_key_label_str: 0x28FA9F8
+boat_spawn_fallback_check: 0x28F9E20
 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
+cap_file_restore_health: 0x28FA870
+cap_game_over_restore_health: 0x28FA888
+check_and_set_required_bosses_defeated: 0x28FAE60
+check_animate_rainbow_rupee_color: 0x28FA8A0
+check_barrier_triforce_requirement: 0x28F9DB4
+check_buying_beedle_20_item: 0x28F9EF4
+check_can_defend: 0x28F9CFC
+check_entering_door10_forwards: 0x28F9A74
+check_entering_door12_forwards: 0x28F9A8C
+check_ganons_tower_chest_opened: 0x28FA074
+check_give_additional_figurines: 0x28FA428
+check_has_next_hint_message: 0x28F9E58
+check_hyrule_warp_unlocked: 0x28FAD20
+check_if_ganondorf: 0x28F9D44
+check_if_inside_warp: 0x28F9D6C
+check_leaving_cabana: 0x28F9AA4
+check_low_health_full: 0x28FADFC
+check_outset_bgm: 0x28FAA50
+check_phantom_ganons_sword_should_disappear: 0x28FA09C
+check_play_special_item_get_music: 0x28FA2E4
+check_player_in_casual_clothes: 0x28FAA14
+check_required_bosses: 0x28FAE54
+check_run_new_text_commands: 0x28FA8F4
+check_shop_item_in_bait_bag_slot_sold_out: 0x28F9EC4
+check_should_decrement_morth_counter: 0x28F9DD8
+check_tingle_statue_owned: 0x28F99B4
 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
+convert_progressive_item_id_for_createDemoItem: 0x28FA73C
+convert_progressive_item_id_for_dProcGetItem_init_1: 0x28FA794
+convert_progressive_item_id_for_dProcGetItem_init_2: 0x28FA7C4
+convert_progressive_item_id_for_daItem_create: 0x28FA768
+convert_progressive_item_id_for_shop_item: 0x28FA7EC
+create_item_and_set_event_bit_for_townsperson: 0x28FA0FC
+create_item_for_withered_trees_without_setting_speeds: 0x28F9F70
+create_pot_item: 0x28FA3A8
+create_stone_head_item: 0x28FA3F4
+custom_crawl_check: 0x28F9DF0
 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
+custom_createItem_return_check: 0x28F9F44
+custom_damage_multiplier: 0x28FAB54
+custom_ff_label: 0x28FAC3C
+custom_ff_label_safestring: 0x28FAC44
+custom_getSelectItemNo_progressive: 0x28FA814
+custom_isTbox_for_unloaded_stage_save_info: 0x28F9A40
+custom_l_objectName: 0x28FAC78
+custom_searchName_loop_check: 0x28FAC84
+custom_warp_button_name: 0x28FAC04
+custom_warp_button_safestring: 0x28FAC14
+custom_warp_pot_env_color: 0x28FAB40
+custom_warp_pot_prm_color: 0x28FAB3C
+daSwOp_Create: 0x28FAF00
+daSwOp_Delete: 0x28FB000
+daSwOp_Draw: 0x28FB008
+daSwOp_Execute: 0x28FB3CC
+daSwOp_IsDelete: 0x28FAFF8
+daSwOp__conditionMetCheck: 0x28FB18C
+daSwOp__conditionUnmetCheck: 0x28FB378
+daSwOp__eventEndCheck: 0x28FB010
+daSwOp__eventStartCheck: 0x28FB2DC
+daSwOp__isCondition: 0x28FB080
+daSwOp__timerCountdown: 0x28FB228
+dampa_minigame_item_id: 0x28FA170
+default_molgera_xz_pos: 0x28F9D64
+doc_bandam_blue_potion_slot_item_id: 0x28FA3A5
+doc_bandam_check_new_potion_and_give_free_item: 0x28FA348
+doc_bandam_green_potion_slot_item_id: 0x28FA3A4
+dragon_tingle_statue_item_get_func: 0x28F98C4
+drc_big_key_item_get_func: 0x28F961C
+drc_compass_item_get_func: 0x28F97D4
+drc_dungeon_map_item_get_func: 0x28F96E4
+drc_small_key_item_get_func: 0x28F9568
+earth_tingle_statue_item_get_func: 0x28F9954
+et_big_key_item_get_func: 0x28F9694
+et_compass_item_get_func: 0x28F9874
+et_dungeon_map_item_get_func: 0x28F9784
+et_small_key_item_get_func: 0x28F95D4
+exec_curr_num_keys_text_command: 0x28FA920
+execute_switch_cases_start: 0x28FB3FC
+ff_compass_item_get_func: 0x28F984C
+ff_dungeon_map_item_get_func: 0x28F975C
+ff_warp_text_check: 0x28FAC60
 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
+forbidden_tingle_statue_item_get_func: 0x28F98F4
+force_map_reload: 0x28F9E38
+fully_refill_magic_meter_on_load_save: 0x28FA854
+fw_big_key_item_get_func: 0x28F9644
+fw_compass_item_get_func: 0x28F97FC
+fw_dungeon_map_item_get_func: 0x28F970C
+fw_small_key_item_get_func: 0x28F958C
+g_profile_SwitchOperator: 0x28FB470
+ganondorf_health_check: 0x28F9D2C
+generic_is_dungeon_bit: 0x28F9488
 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
+generic_small_key_item_get_func: 0x28F94C8
+get_num_owned_tingle_statues: 0x28FAA78
+give_pearl_and_raise_totg_if_necessary: 0x28FAD60
+give_temporary_sword_during_ganondorf_fight_in_swordless: 0x28FB4A0
+give_temporary_sword_in_orcas_house_in_swordless: 0x28FB4F4
+goddess_tingle_statue_item_get_func: 0x28F9924
 gyroscope_preference: 0x28F8D68
-hookshot_sight_failsafe_check: 0x28F9AAC
+hookshot_sight_failsafe_check: 0x28F9AEC
 hurricane_spin_item_func: 0x28F93A4
-increment_custom_loop_counter: 0x28FAC74
-init_extra_button_location: 0x28FAB18
-init_extra_connections: 0x28FAB2C
+increment_custom_loop_counter: 0x28FACB4
+init_extra_button_location: 0x28FAB58
+init_extra_connections: 0x28FAB6C
 init_save_with_tweaks: 0x28F87F4
 init_starting_gear: 0x28F8C14
-initialize_actor_id: 0x28F9F20
+initialize_actor_id: 0x28F9F60
 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
+l_daSwOp_Method: 0x28FB450
+last_korl_hint_message_number: 0x28F9E54
+lenzo_set_deluxe_picto_box_event_bit: 0x28FA174
+load_extra_button_part: 0x28FAC1C
+maggie_give_item_and_set_event_bit: 0x28FA24C
+magtail_respawn_when_head_light_arrowed: 0x28F9C84
+makar_possible_wt_spawn_positions: 0x28FA56C
+medli_possible_et_spawn_positions: 0x28FA668
+miniblin_set_death_switch_when_light_arrowed: 0x28F9B84
+molgera_warp_radius: 0x28F9D60
+multiply_damage: 0x28FAB44
+no_big_key_label_safestring: 0x28FAA04
+no_big_key_label_str: 0x28FA9EC
 normal_magic_meter_item_func: 0x28F9378
 open_drc: 0x28F8D6A
-orca_counter_failsafe: 0x28F9AC8
+orca_counter_failsafe: 0x28F9B08
 outset_pig_color: 0x28F8D64
-phantom_ganon_check_link_within_y_diff: 0x28F9C84
-phantom_ganon_maze_stage_name: 0x28FA0B4
-poe_fix_light_arrows_bug: 0x28F9B78
+phantom_ganon_check_link_within_y_diff: 0x28F9CC4
+phantom_ganon_maze_stage_name: 0x28FA0F4
+poe_fix_light_arrows_bug: 0x28F9BB8
 progressive_bomb_bag_item_func: 0x28F91F8
 progressive_bow_item_func: 0x28F9160
 progressive_magic_always_double: 0x28F8D63
@@ -139,49 +142,51 @@ 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
+rainbow_rupee_data: 0x28FA8E8
+read_custom_l_objectName_loop_for_dStage_getName: 0x28FACC0
+remove_low_health_anim_at_full_health: 0x28FAE1C
+remove_temporary_sword_when_loading_stage_in_swordless: 0x28FB554
+required_bosses: 0x28FAE44
+reset_makar_position_to_start_of_dungeon: 0x28FA4E0
+reset_medli_position_to_start_of_dungeon: 0x28FA5DC
+rito_cafe_postman_start_event_and_set_event_bit: 0x28FA290
+salvage_corp_give_item_and_set_event_bit: 0x28FA208
+set_dampa_event_bit: 0x28FA14C
+set_env_color_for_warp_pot_particles: 0x28FAB14
+set_ff_warp_msg_index: 0x28FAC4C
+set_inactive_servant_when_player_leaves_room: 0x28FA6D8
+set_item_obtained_from_totg_tablet_event_bit: 0x28FA6FC
+set_prm_color_for_warp_pot_particles: 0x28FAAEC
+set_return_place_as_last_visited_ocean_sector: 0x28F9AD4
+set_shop_item_in_bait_bag_slot_sold_out: 0x28F9E90
+set_starting_health: 0x28FA838
+set_up_custom_loop_counter: 0x28FACA8
 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
+spawn_drc_shortcut_warp: 0x28FACE8
+staircase_to_puppet_ganon_stage_name: 0x28FAE4C
+stalfos_kill_lower_body_when_upper_body_light_arrowed: 0x28F9B3C
 starting_gear: 0x28F8C5F
 starting_magic: 0x28F8D62
 starting_quarter_hearts: 0x28F8D60
-stop_sub_bgm_when_unloading_stage: 0x28F9CA0
+stop_sub_bgm_when_unloading_stage: 0x28F9CE0
 swordless: 0x28F8C5D
-tag_photo_check_lenzo_flag_order: 0x28FA6D8
+tag_photo_check_lenzo_flag_order: 0x28FA718
 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
+totg_big_key_item_get_func: 0x28F966C
+totg_compass_item_get_func: 0x28F9824
+totg_dungeon_map_item_get_func: 0x28F9734
+totg_small_key_item_get_func: 0x28F95B0
 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
+use_different_korl_hyrule_text: 0x28F9E8C
+wind_tingle_statue_item_get_func: 0x28F9984
+withered_tree_item_speeds: 0x28FA068
+withered_tree_item_try_give_momentum: 0x28F9F9C
+wt_big_key_item_get_func: 0x28F96BC
+wt_compass_item_get_func: 0x28F989C
+wt_dungeon_map_item_get_func: 0x28F97AC
+wt_small_key_item_get_func: 0x28F95F8
+zero_out_arrow_on_hit_callback: 0x28F9CEC
+zunari_give_item_and_set_magic_armor_event_bit: 0x28FA1A8
+zunari_magic_armor_slot_item_id: 0x28FA204
 

asm/linker.ld

@@ -48,6 +48,7 @@ onSwitch = 0x025b9e38;
 offSwitch = 0x025b9f7c;
 dSv_membit_c_isSwitch = 0x025b8dc8; /* dSv_memBit_c::isSwitch */
 onDungeonItem = 0x025b9098;
+isDungeonItem = 0x025b9100;
 onSymbol = 0x025b7cc0;
 isCollect = 0x025b7a2c;
 onCollect = 0x025b7944;