Merge pull request #145 from gymnast86/progressive-magic-always-double

Add option for progressive magic always being double

Author: gymnast86

asm/custom_symbols.yaml

@@ -1,184 +1,185 @@
-beedle_dont_buy_blue_chu: 0x28F9AAC
-big_key_label_safestring: 0x28FA990
-big_key_label_str: 0x28FA97C
-boat_spawn_fallback_check: 0x28F9DA8
-camera_preference: 0x28F8D55
-cap_file_restore_health: 0x28FA7F4
-cap_game_over_restore_health: 0x28FA80C
-check_animate_rainbow_rupee_color: 0x28FA824
-check_barrier_triforce_requirement: 0x28F9D3C
-check_buying_beedle_20_item: 0x28F9E78
-check_can_defend: 0x28F9C84
-check_entering_door10_forwards: 0x28F99FC
-check_entering_door12_forwards: 0x28F9A14
-check_ganons_tower_chest_opened: 0x28F9FF8
-check_give_additional_figurines: 0x28FA3AC
-check_has_next_hint_message: 0x28F9DE0
-check_hyrule_warp_unlocked: 0x28FACA4
-check_if_ganondorf: 0x28F9CCC
-check_if_inside_warp: 0x28F9CF4
-check_leaving_cabana: 0x28F9A2C
-check_low_health_full: 0x28FAD80
-check_outset_bgm: 0x28FA9D4
-check_phantom_ganons_sword_should_disappear: 0x28FA020
-check_play_special_item_get_music: 0x28FA268
-check_player_in_casual_clothes: 0x28FA998
-check_run_new_text_commands: 0x28FA878
-check_shop_item_in_bait_bag_slot_sold_out: 0x28F9E48
-check_should_decrement_morth_counter: 0x28F9D60
-check_tingle_statue_owned: 0x28F993C
+beedle_dont_buy_blue_chu: 0x28F9AD4
+big_key_label_safestring: 0x28FA9B8
+big_key_label_str: 0x28FA9A4
+boat_spawn_fallback_check: 0x28F9DD0
+camera_preference: 0x28F8D56
+cap_file_restore_health: 0x28FA81C
+cap_game_over_restore_health: 0x28FA834
+check_animate_rainbow_rupee_color: 0x28FA84C
+check_barrier_triforce_requirement: 0x28F9D64
+check_buying_beedle_20_item: 0x28F9EA0
+check_can_defend: 0x28F9CAC
+check_entering_door10_forwards: 0x28F9A24
+check_entering_door12_forwards: 0x28F9A3C
+check_ganons_tower_chest_opened: 0x28FA020
+check_give_additional_figurines: 0x28FA3D4
+check_has_next_hint_message: 0x28F9E08
+check_hyrule_warp_unlocked: 0x28FACCC
+check_if_ganondorf: 0x28F9CF4
+check_if_inside_warp: 0x28F9D1C
+check_leaving_cabana: 0x28F9A54
+check_low_health_full: 0x28FADA8
+check_outset_bgm: 0x28FA9FC
+check_phantom_ganons_sword_should_disappear: 0x28FA048
+check_play_special_item_get_music: 0x28FA290
+check_player_in_casual_clothes: 0x28FA9C0
+check_run_new_text_commands: 0x28FA8A0
+check_shop_item_in_bait_bag_slot_sold_out: 0x28F9E70
+check_should_decrement_morth_counter: 0x28F9D88
+check_tingle_statue_owned: 0x28F9964
 convert_progressive_item_id: 0x28F8D8C
-convert_progressive_item_id_for_createDemoItem: 0x28FA6C0
-convert_progressive_item_id_for_dProcGetItem_init_1: 0x28FA718
-convert_progressive_item_id_for_dProcGetItem_init_2: 0x28FA748
-convert_progressive_item_id_for_daItem_create: 0x28FA6EC
-convert_progressive_item_id_for_shop_item: 0x28FA770
-create_item_and_set_event_bit_for_townsperson: 0x28FA080
-create_item_for_withered_trees_without_setting_speeds: 0x28F9EF4
-create_pot_item: 0x28FA32C
-create_stone_head_item: 0x28FA378
-custom_crawl_check: 0x28F9D78
-custom_createItem: 0x28F939C
-custom_createItem_return_check: 0x28F9EC8
-custom_damage_multiplier: 0x28FAAD8
-custom_ff_label: 0x28FABC0
-custom_ff_label_safestring: 0x28FABC8
-custom_getSelectItemNo_progressive: 0x28FA798
-custom_isTbox_for_unloaded_stage_save_info: 0x28F99C8
-custom_l_objectName: 0x28FABFC
-custom_searchName_loop_check: 0x28FAC08
-custom_warp_button_name: 0x28FAB88
-custom_warp_button_safestring: 0x28FAB98
-custom_warp_pot_env_color: 0x28FAAC4
-custom_warp_pot_prm_color: 0x28FAAC0
-daSwOp_Create: 0x28FADC8
-daSwOp_Delete: 0x28FAEC8
-daSwOp_Draw: 0x28FAED0
-daSwOp_Execute: 0x28FB294
-daSwOp_IsDelete: 0x28FAEC0
-daSwOp__conditionMetCheck: 0x28FB054
-daSwOp__conditionUnmetCheck: 0x28FB240
-daSwOp__eventEndCheck: 0x28FAED8
-daSwOp__eventStartCheck: 0x28FB1A4
-daSwOp__isCondition: 0x28FAF48
-daSwOp__timerCountdown: 0x28FB0F0
-dampa_minigame_item_id: 0x28FA0F4
-default_molgera_xz_pos: 0x28F9CEC
-doc_bandam_blue_potion_slot_item_id: 0x28FA329
-doc_bandam_check_new_potion_and_give_free_item: 0x28FA2CC
-doc_bandam_green_potion_slot_item_id: 0x28FA328
-dragon_tingle_statue_item_get_func: 0x28F984C
-drc_big_key_item_get_func: 0x28F95A4
-drc_compass_item_get_func: 0x28F975C
-drc_dungeon_map_item_get_func: 0x28F966C
-drc_small_key_item_get_func: 0x28F94F0
-earth_tingle_statue_item_get_func: 0x28F98DC
-et_big_key_item_get_func: 0x28F961C
-et_compass_item_get_func: 0x28F97FC
-et_dungeon_map_item_get_func: 0x28F970C
-et_small_key_item_get_func: 0x28F955C
-exec_curr_num_keys_text_command: 0x28FA8A4
-execute_switch_cases_start: 0x28FB2C4
-ff_compass_item_get_func: 0x28F97D4
-ff_dungeon_map_item_get_func: 0x28F96E4
-ff_warp_text_check: 0x28FABE4
-first_person_camera_preference: 0x28F8D56
-forbidden_tingle_statue_item_get_func: 0x28F987C
-force_map_reload: 0x28F9DC0
-fully_refill_magic_meter_on_load_save: 0x28FA7D8
-fw_big_key_item_get_func: 0x28F95CC
-fw_compass_item_get_func: 0x28F9784
-fw_dungeon_map_item_get_func: 0x28F9694
-fw_small_key_item_get_func: 0x28F9514
-g_profile_SwitchOperator: 0x28FB338
-ganondorf_health_check: 0x28F9CB4
-generic_on_dungeon_bit: 0x28F93E8
-generic_small_key_item_get_func: 0x28F9450
-get_num_owned_tingle_statues: 0x28FA9FC
-give_pearl_and_raise_totg_if_necessary: 0x28FACE4
-give_temporary_sword_during_ganondorf_fight_in_swordless: 0x28FB368
-give_temporary_sword_in_orcas_house_in_swordless: 0x28FB3BC
-goddess_tingle_statue_item_get_func: 0x28F98AC
-gyroscope_preference: 0x28F8D57
-hookshot_sight_failsafe_check: 0x28F9A74
-hurricane_spin_item_func: 0x28F936C
-increment_custom_loop_counter: 0x28FAC38
-init_extra_button_location: 0x28FAADC
-init_extra_connections: 0x28FAAF0
+convert_progressive_item_id_for_createDemoItem: 0x28FA6E8
+convert_progressive_item_id_for_dProcGetItem_init_1: 0x28FA740
+convert_progressive_item_id_for_dProcGetItem_init_2: 0x28FA770
+convert_progressive_item_id_for_daItem_create: 0x28FA714
+convert_progressive_item_id_for_shop_item: 0x28FA798
+create_item_and_set_event_bit_for_townsperson: 0x28FA0A8
+create_item_for_withered_trees_without_setting_speeds: 0x28F9F1C
+create_pot_item: 0x28FA354
+create_stone_head_item: 0x28FA3A0
+custom_crawl_check: 0x28F9DA0
+custom_createItem: 0x28F93C4
+custom_createItem_return_check: 0x28F9EF0
+custom_damage_multiplier: 0x28FAB00
+custom_ff_label: 0x28FABE8
+custom_ff_label_safestring: 0x28FABF0
+custom_getSelectItemNo_progressive: 0x28FA7C0
+custom_isTbox_for_unloaded_stage_save_info: 0x28F99F0
+custom_l_objectName: 0x28FAC24
+custom_searchName_loop_check: 0x28FAC30
+custom_warp_button_name: 0x28FABB0
+custom_warp_button_safestring: 0x28FABC0
+custom_warp_pot_env_color: 0x28FAAEC
+custom_warp_pot_prm_color: 0x28FAAE8
+daSwOp_Create: 0x28FADF0
+daSwOp_Delete: 0x28FAEF0
+daSwOp_Draw: 0x28FAEF8
+daSwOp_Execute: 0x28FB2BC
+daSwOp_IsDelete: 0x28FAEE8
+daSwOp__conditionMetCheck: 0x28FB07C
+daSwOp__conditionUnmetCheck: 0x28FB268
+daSwOp__eventEndCheck: 0x28FAF00
+daSwOp__eventStartCheck: 0x28FB1CC
+daSwOp__isCondition: 0x28FAF70
+daSwOp__timerCountdown: 0x28FB118
+dampa_minigame_item_id: 0x28FA11C
+default_molgera_xz_pos: 0x28F9D14
+doc_bandam_blue_potion_slot_item_id: 0x28FA351
+doc_bandam_check_new_potion_and_give_free_item: 0x28FA2F4
+doc_bandam_green_potion_slot_item_id: 0x28FA350
+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: 0x28FA8CC
+execute_switch_cases_start: 0x28FB2EC
+ff_compass_item_get_func: 0x28F97FC
+ff_dungeon_map_item_get_func: 0x28F970C
+ff_warp_text_check: 0x28FAC0C
+first_person_camera_preference: 0x28F8D57
+forbidden_tingle_statue_item_get_func: 0x28F98A4
+force_map_reload: 0x28F9DE8
+fully_refill_magic_meter_on_load_save: 0x28FA800
+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: 0x28FB360
+ganondorf_health_check: 0x28F9CDC
+generic_on_dungeon_bit: 0x28F9410
+generic_small_key_item_get_func: 0x28F9478
+get_num_owned_tingle_statues: 0x28FAA24
+give_pearl_and_raise_totg_if_necessary: 0x28FAD0C
+give_temporary_sword_during_ganondorf_fight_in_swordless: 0x28FB390
+give_temporary_sword_in_orcas_house_in_swordless: 0x28FB3E4
+goddess_tingle_statue_item_get_func: 0x28F98D4
+gyroscope_preference: 0x28F8D58
+hookshot_sight_failsafe_check: 0x28F9A9C
+hurricane_spin_item_func: 0x28F9394
+increment_custom_loop_counter: 0x28FAC60
+init_extra_button_location: 0x28FAB04
+init_extra_connections: 0x28FAB18
 init_save_with_tweaks: 0x28F87F4
 init_starting_gear: 0x28F8C04
-initialize_actor_id: 0x28F9EE4
+initialize_actor_id: 0x28F9F0C
 isEventBit_wrapper: 0x28F8D5C
-l_daSwOp_Method: 0x28FB318
-last_korl_hint_message_number: 0x28F9DDC
-lenzo_set_deluxe_picto_box_event_bit: 0x28FA0F8
-load_extra_button_part: 0x28FABA0
-maggie_give_item_and_set_event_bit: 0x28FA1D0
-magtail_respawn_when_head_light_arrowed: 0x28F9C0C
-makar_possible_wt_spawn_positions: 0x28FA4F0
-medli_possible_et_spawn_positions: 0x28FA5EC
-miniblin_set_death_switch_when_light_arrowed: 0x28F9B0C
-molgera_warp_radius: 0x28F9CE8
-multiply_damage: 0x28FAAC8
-no_big_key_label_safestring: 0x28FA988
-no_big_key_label_str: 0x28FA970
-normal_magic_meter_item_func: 0x28F9340
-orca_counter_failsafe: 0x28F9A90
-outset_pig_color: 0x28F8D53
-phantom_ganon_check_link_within_y_diff: 0x28F9C4C
-phantom_ganon_maze_stage_name: 0x28FA078
-poe_fix_light_arrows_bug: 0x28F9B40
-progressive_bomb_bag_item_func: 0x28F91D4
-progressive_bow_item_func: 0x28F913C
-progressive_magic_meter_item_func: 0x28F92F4
-progressive_picto_box_item_func: 0x28F925C
-progressive_quiver_item_func: 0x28F9218
-progressive_sail_item_func: 0x28F92A8
-progressive_shield_item_func: 0x28F90F0
-progressive_sword_item_func: 0x28F9084
-progressive_wallet_item_func: 0x28F9198
-rainbow_rupee_data: 0x28FA86C
-read_custom_l_objectName_loop_for_dStage_getName: 0x28FAC44
-remove_low_health_anim_at_full_health: 0x28FADA0
-remove_temporary_sword_when_loading_stage_in_swordless: 0x28FB41C
-reset_makar_position_to_start_of_dungeon: 0x28FA464
-reset_medli_position_to_start_of_dungeon: 0x28FA560
-rito_cafe_postman_start_event_and_set_event_bit: 0x28FA214
-salvage_corp_give_item_and_set_event_bit: 0x28FA18C
-set_dampa_event_bit: 0x28FA0D0
-set_env_color_for_warp_pot_particles: 0x28FAA98
-set_ff_warp_msg_index: 0x28FABD0
-set_inactive_servant_when_player_leaves_room: 0x28FA65C
-set_item_obtained_from_totg_tablet_event_bit: 0x28FA680
-set_prm_color_for_warp_pot_particles: 0x28FAA70
-set_return_place_as_last_visited_ocean_sector: 0x28F9A5C
-set_shop_item_in_bait_bag_slot_sold_out: 0x28F9E14
-set_starting_health: 0x28FA7BC
-set_up_custom_loop_counter: 0x28FAC2C
+l_daSwOp_Method: 0x28FB340
+last_korl_hint_message_number: 0x28F9E04
+lenzo_set_deluxe_picto_box_event_bit: 0x28FA120
+load_extra_button_part: 0x28FABC8
+maggie_give_item_and_set_event_bit: 0x28FA1F8
+magtail_respawn_when_head_light_arrowed: 0x28F9C34
+makar_possible_wt_spawn_positions: 0x28FA518
+medli_possible_et_spawn_positions: 0x28FA614
+miniblin_set_death_switch_when_light_arrowed: 0x28F9B34
+molgera_warp_radius: 0x28F9D10
+multiply_damage: 0x28FAAF0
+no_big_key_label_safestring: 0x28FA9B0
+no_big_key_label_str: 0x28FA998
+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: 0x28FA0A0
+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: 0x28FA894
+read_custom_l_objectName_loop_for_dStage_getName: 0x28FAC6C
+remove_low_health_anim_at_full_health: 0x28FADC8
+remove_temporary_sword_when_loading_stage_in_swordless: 0x28FB444
+reset_makar_position_to_start_of_dungeon: 0x28FA48C
+reset_medli_position_to_start_of_dungeon: 0x28FA588
+rito_cafe_postman_start_event_and_set_event_bit: 0x28FA23C
+salvage_corp_give_item_and_set_event_bit: 0x28FA1B4
+set_dampa_event_bit: 0x28FA0F8
+set_env_color_for_warp_pot_particles: 0x28FAAC0
+set_ff_warp_msg_index: 0x28FABF8
+set_inactive_servant_when_player_leaves_room: 0x28FA684
+set_item_obtained_from_totg_tablet_event_bit: 0x28FA6A8
+set_prm_color_for_warp_pot_particles: 0x28FAA98
+set_return_place_as_last_visited_ocean_sector: 0x28F9A84
+set_shop_item_in_bait_bag_slot_sold_out: 0x28F9E3C
+set_starting_health: 0x28FA7E4
+set_up_custom_loop_counter: 0x28FAC54
 should_start_with_heros_clothes: 0x28F8C4C
 skip_rematch_bosses: 0x28F8C4E
-spawn_drc_shortcut_warp: 0x28FAC6C
-stalfos_kill_lower_body_when_upper_body_light_arrowed: 0x28F9AC4
+spawn_drc_shortcut_warp: 0x28FAC94
+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: 0x28F9C68
+stop_sub_bgm_when_unloading_stage: 0x28F9C90
 swordless: 0x28F8C4D
-tag_photo_check_lenzo_flag_order: 0x28FA69C
-target_type_preference: 0x28F8D54
-totg_big_key_item_get_func: 0x28F95F4
-totg_compass_item_get_func: 0x28F97AC
-totg_dungeon_map_item_get_func: 0x28F96BC
-totg_small_key_item_get_func: 0x28F9538
-ui_display_preference: 0x28F8D58
-wind_tingle_statue_item_get_func: 0x28F990C
-withered_tree_item_speeds: 0x28F9FEC
-withered_tree_item_try_give_momentum: 0x28F9F20
-wt_big_key_item_get_func: 0x28F9644
-wt_compass_item_get_func: 0x28F9824
-wt_dungeon_map_item_get_func: 0x28F9734
-wt_small_key_item_get_func: 0x28F9580
-zero_out_arrow_on_hit_callback: 0x28F9C74
-zunari_give_item_and_set_magic_armor_event_bit: 0x28FA12C
-zunari_magic_armor_slot_item_id: 0x28FA188
+tag_photo_check_lenzo_flag_order: 0x28FA6C4
+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
+wind_tingle_statue_item_get_func: 0x28F9934
+withered_tree_item_speeds: 0x28FA014
+withered_tree_item_try_give_momentum: 0x28F9F48
+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: 0x28FA154
+zunari_magic_armor_slot_item_id: 0x28FA1B0