Skip to content

Commit b72f7fe

Browse files
gymnast86gymnast86
authored
Merge pull request #141 from gymnast86/drc-light-warp
Add DRI dungeon warp
2 parents c7772ac + 6eed7c8 commit b72f7fe

File tree

9 files changed

+229
-112
lines changed

9 files changed

+229
-112
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ logic/out/*
1111
*data.qrc
1212
CMakeLists.txt.user
1313
build-*
14+
.venv

‎asm/custom_symbols.yaml‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ check_entering_door12_forwards: 0x28F9A14
1414
check_ganons_tower_chest_opened: 0x28F9FF8
1515
check_give_additional_figurines: 0x28FA3AC
1616
check_has_next_hint_message: 0x28F9DE0
17-
check_hyrule_warp_unlocked: 0x28FAC6C
17+
check_hyrule_warp_unlocked: 0x28FACA4
1818
check_if_ganondorf: 0x28F9CCC
1919
check_if_inside_warp: 0x28F9CF4
2020
check_leaving_cabana: 0x28F9A2C
21-
check_low_health_full: 0x28FAD48
21+
check_low_health_full: 0x28FAD80
2222
check_outset_bgm: 0x28FA9D4
2323
check_phantom_ganons_sword_should_disappear: 0x28FA020
2424
check_play_special_item_get_music: 0x28FA268
@@ -51,17 +51,17 @@ custom_warp_button_name: 0x28FAB88
5151
custom_warp_button_safestring: 0x28FAB98
5252
custom_warp_pot_env_color: 0x28FAAC4
5353
custom_warp_pot_prm_color: 0x28FAAC0
54-
daSwOp_Create: 0x28FAD90
55-
daSwOp_Delete: 0x28FAE90
56-
daSwOp_Draw: 0x28FAE98
57-
daSwOp_Execute: 0x28FB25C
58-
daSwOp_IsDelete: 0x28FAE88
59-
daSwOp__conditionMetCheck: 0x28FB01C
60-
daSwOp__conditionUnmetCheck: 0x28FB208
61-
daSwOp__eventEndCheck: 0x28FAEA0
62-
daSwOp__eventStartCheck: 0x28FB16C
63-
daSwOp__isCondition: 0x28FAF10
64-
daSwOp__timerCountdown: 0x28FB0B8
54+
daSwOp_Create: 0x28FADC8
55+
daSwOp_Delete: 0x28FAEC8
56+
daSwOp_Draw: 0x28FAED0
57+
daSwOp_Execute: 0x28FB294
58+
daSwOp_IsDelete: 0x28FAEC0
59+
daSwOp__conditionMetCheck: 0x28FB054
60+
daSwOp__conditionUnmetCheck: 0x28FB240
61+
daSwOp__eventEndCheck: 0x28FAED8
62+
daSwOp__eventStartCheck: 0x28FB1A4
63+
daSwOp__isCondition: 0x28FAF48
64+
daSwOp__timerCountdown: 0x28FB0F0
6565
dampa_minigame_item_id: 0x28FA0F4
6666
default_molgera_xz_pos: 0x28F9CEC
6767
doc_bandam_blue_potion_slot_item_id: 0x28FA329
@@ -78,7 +78,7 @@ et_compass_item_get_func: 0x28F97FC
7878
et_dungeon_map_item_get_func: 0x28F970C
7979
et_small_key_item_get_func: 0x28F955C
8080
exec_curr_num_keys_text_command: 0x28FA8A4
81-
execute_switch_cases_start: 0x28FB28C
81+
execute_switch_cases_start: 0x28FB2C4
8282
ff_compass_item_get_func: 0x28F97D4
8383
ff_dungeon_map_item_get_func: 0x28F96E4
8484
ff_warp_text_check: 0x28FABE4
@@ -90,14 +90,14 @@ fw_big_key_item_get_func: 0x28F95CC
9090
fw_compass_item_get_func: 0x28F9784
9191
fw_dungeon_map_item_get_func: 0x28F9694
9292
fw_small_key_item_get_func: 0x28F9514
93-
g_profile_SwitchOperator: 0x28FB300
93+
g_profile_SwitchOperator: 0x28FB338
9494
ganondorf_health_check: 0x28F9CB4
9595
generic_on_dungeon_bit: 0x28F93E8
9696
generic_small_key_item_get_func: 0x28F9450
9797
get_num_owned_tingle_statues: 0x28FA9FC
98-
give_pearl_and_raise_totg_if_necessary: 0x28FACAC
99-
give_temporary_sword_during_ganondorf_fight_in_swordless: 0x28FB330
100-
give_temporary_sword_in_orcas_house_in_swordless: 0x28FB384
98+
give_pearl_and_raise_totg_if_necessary: 0x28FACE4
99+
give_temporary_sword_during_ganondorf_fight_in_swordless: 0x28FB368
100+
give_temporary_sword_in_orcas_house_in_swordless: 0x28FB3BC
101101
goddess_tingle_statue_item_get_func: 0x28F98AC
102102
gyroscope_preference: 0x28F8D57
103103
hookshot_sight_failsafe_check: 0x28F9A74
@@ -109,7 +109,7 @@ init_save_with_tweaks: 0x28F87F4
109109
init_starting_gear: 0x28F8C04
110110
initialize_actor_id: 0x28F9EE4
111111
isEventBit_wrapper: 0x28F8D5C
112-
l_daSwOp_Method: 0x28FB2E0
112+
l_daSwOp_Method: 0x28FB318
113113
last_korl_hint_message_number: 0x28F9DDC
114114
lenzo_set_deluxe_picto_box_event_bit: 0x28FA0F8
115115
load_extra_button_part: 0x28FABA0
@@ -139,8 +139,8 @@ progressive_sword_item_func: 0x28F9084
139139
progressive_wallet_item_func: 0x28F9198
140140
rainbow_rupee_data: 0x28FA86C
141141
read_custom_l_objectName_loop_for_dStage_getName: 0x28FAC44
142-
remove_low_health_anim_at_full_health: 0x28FAD68
143-
remove_temporary_sword_when_loading_stage_in_swordless: 0x28FB3E4
142+
remove_low_health_anim_at_full_health: 0x28FADA0
143+
remove_temporary_sword_when_loading_stage_in_swordless: 0x28FB41C
144144
reset_makar_position_to_start_of_dungeon: 0x28FA464
145145
reset_medli_position_to_start_of_dungeon: 0x28FA560
146146
rito_cafe_postman_start_event_and_set_event_bit: 0x28FA214
@@ -157,6 +157,7 @@ set_starting_health: 0x28FA7BC
157157
set_up_custom_loop_counter: 0x28FAC2C
158158
should_start_with_heros_clothes: 0x28F8C4C
159159
skip_rematch_bosses: 0x28F8C4E
160+
spawn_drc_shortcut_warp: 0x28FAC6C
160161
stalfos_kill_lower_body_when_upper_body_light_arrowed: 0x28F9AC4
161162
starting_gear: 0x28F8C4F
162163
starting_magic: 0x28F8D52

‎asm/patch_diffs/misc_rando_features_diff.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Data:
77
0x203F1F8: [0x3C, 0x63, 0x0D, 0x45]
88
0x2083028: [0x48, 0x87, 0x79, 0x71, 0x2C, 0x03, 0x00, 0x00]
99
0x21836D4: [0x48, 0x77, 0x71, 0x50]
10+
0x21E3210: [0x48, 0x71, 0x7A, 0x5C]
1011
0x227E5A4: [0x60, 0x00, 0x00, 0x00]
1112
0x22830E0: [0x48, 0x00, 0x00, 0x6C]
1213
0x2330C24: [0x39, 0x88, 0xFF, 0xFE]
@@ -142,6 +143,11 @@ Data:
142143
0x3D, 0x80, 0x02, 0x90, 0x39, 0x8C, 0xAB, 0xFC, 0x38, 0x00, 0x00, 0x01, 0x7C,
143144
0x09, 0x03, 0xA6, 0x4B, 0xCC, 0x64, 0x9C, 0x4B, 0xCC, 0x64, 0xE0, 0x4B, 0xCC,
144145
0x64, 0xE0]
146+
0x28FAC6C: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x05, 0x2C,
147+
0x88, 0x83, 0x00, 0x10, 0x70, 0x84, 0x00, 0x80, 0x41, 0x82, 0x00, 0x1C, 0x3C,
148+
0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x07, 0x98, 0x88, 0x83,
149+
0x00, 0x10, 0x60, 0x84, 0x00, 0x40, 0x98, 0x83, 0x00, 0x10, 0x7F, 0xE3, 0xFB,
150+
0x78, 0x4B, 0x8E, 0x85, 0x74]
145151
0x100F7BD0: [0x00, 0x00, 0x00, 0x00]
146152
Relocations:
147153
- {r_addend: 0x8F8D50, r_info: 0x106, r_offset: 0x28FA7BE}
@@ -184,3 +190,7 @@ Relocations:
184190
- {r_addend: 0x8FABFC, r_info: 0x104, r_offset: 0x28FAC22}
185191
- {r_addend: 0x8FABFC, r_info: 0x106, r_offset: 0x28FAC52}
186192
- {r_addend: 0x8FABFC, r_info: 0x104, r_offset: 0x28FAC56}
193+
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAC6E}
194+
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAC72}
195+
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAC86}
196+
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAC8A}

‎asm/patch_diffs/remove_cutscenes_diff.yaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,43 @@ Data:
1414
0x2482764: [0x60, 0x00, 0x00, 0x00]
1515
0x24B7408: [0x48, 0x00, 0x00, 0x54]
1616
0x24B74D4: [0x60, 0x00, 0x00, 0x00]
17-
0x24D4EC0: [0x48, 0x42, 0x5D, 0xAD]
17+
0x24D4EC0: [0x48, 0x42, 0x5D, 0xE5]
1818
0x24D4F28: [0x60, 0x00, 0x00, 0x00]
19-
0x24D53D0: [0x48, 0x42, 0x58, 0x9D]
19+
0x24D53D0: [0x48, 0x42, 0x58, 0xD5]
2020
0x24D602C: [0x38, 0x60, 0x00, 0x01, 0x4E, 0x80, 0x00, 0x20]
21-
0x254F52C: [0x48, 0x3A, 0xB7, 0x80]
22-
0x254F540: [0x48, 0x3A, 0xB7, 0x6C]
23-
0x254F554: [0x48, 0x3A, 0xB7, 0x58]
21+
0x254F52C: [0x48, 0x3A, 0xB7, 0xB8]
22+
0x254F540: [0x48, 0x3A, 0xB7, 0xA4]
23+
0x254F554: [0x48, 0x3A, 0xB7, 0x90]
2424
0x25542E0: [0x38, 0x60, 0x00, 0x02, 0x4B, 0xFC, 0xC7, 0xA1]
2525
0x2554308: [0x38, 0x60, 0x00, 0x02, 0x4B, 0xFC, 0xC7, 0x79]
2626
0x25AEDCC: [0x60, 0x00, 0x00, 0x00]
2727
0x25AEDE0: [0x60, 0x00, 0x00, 0x00]
2828
0x25AEE00: [0x48, 0x00, 0x00, 0x18]
29-
0x28FAC6C: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
29+
0x28FACA4: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
3030
0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x00, 0xD4, 0x4B,
31-
0xCB, 0xD1, 0x7D, 0x2C, 0x03, 0x00, 0x08, 0x40, 0x80, 0x00, 0x0C, 0x38, 0x60,
31+
0xCB, 0xD1, 0x45, 0x2C, 0x03, 0x00, 0x08, 0x40, 0x80, 0x00, 0x0C, 0x38, 0x60,
3232
0x00, 0x00, 0x48, 0x00, 0x00, 0x08, 0x38, 0x60, 0x00, 0x01, 0x80, 0x01, 0x00,
3333
0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00, 0x20]
34-
0x28FACAC: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
35-
0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x9F, 0x23, 0x78, 0x4B, 0xCB, 0xD0, 0x01, 0x3C,
34+
0x28FACE4: [0x94, 0x21, 0xFF, 0xF0, 0x7C, 0x08, 0x02, 0xA6, 0x90, 0x01, 0x00, 0x14,
35+
0x93, 0xE1, 0x00, 0x0C, 0x7C, 0x9F, 0x23, 0x78, 0x4B, 0xCB, 0xCF, 0xC9, 0x3C,
3636
0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0x38, 0x63, 0x06, 0x44, 0x2C, 0x1F,
3737
0x00, 0x00, 0x41, 0x82, 0x00, 0x18, 0x2C, 0x1F, 0x00, 0x01, 0x41, 0x82, 0x00,
3838
0x1C, 0x2C, 0x1F, 0x00, 0x02, 0x41, 0x82, 0x00, 0x20, 0x48, 0x00, 0x00, 0x24,
39-
0x38, 0x80, 0x14, 0x10, 0x4B, 0xCB, 0xDE, 0x79, 0x48, 0x00, 0x00, 0x18, 0x38,
40-
0x80, 0x14, 0x80, 0x4B, 0xCB, 0xDE, 0x6D, 0x48, 0x00, 0x00, 0x0C, 0x38, 0x80,
41-
0x14, 0x40, 0x4B, 0xCB, 0xDE, 0x61, 0x3C, 0xA0, 0x10, 0x20, 0x80, 0xA5, 0x84,
39+
0x38, 0x80, 0x14, 0x10, 0x4B, 0xCB, 0xDE, 0x41, 0x48, 0x00, 0x00, 0x18, 0x38,
40+
0x80, 0x14, 0x80, 0x4B, 0xCB, 0xDE, 0x35, 0x48, 0x00, 0x00, 0x0C, 0x38, 0x80,
41+
0x14, 0x40, 0x4B, 0xCB, 0xDE, 0x29, 0x3C, 0xA0, 0x10, 0x20, 0x80, 0xA5, 0x84,
4242
0xDC, 0x38, 0xA5, 0x00, 0xDF, 0x88, 0x85, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x07,
43-
0x40, 0x82, 0x00, 0x14, 0x38, 0x80, 0x1E, 0x40, 0x4B, 0xCB, 0xDE, 0x41, 0x38,
44-
0x80, 0x2E, 0x80, 0x4B, 0xCB, 0xDE, 0x39, 0x83, 0xE1, 0x00, 0x0C, 0x80, 0x01,
43+
0x40, 0x82, 0x00, 0x14, 0x38, 0x80, 0x1E, 0x40, 0x4B, 0xCB, 0xDE, 0x09, 0x38,
44+
0x80, 0x2E, 0x80, 0x4B, 0xCB, 0xDE, 0x01, 0x83, 0xE1, 0x00, 0x0C, 0x80, 0x01,
4545
0x00, 0x14, 0x7C, 0x08, 0x03, 0xA6, 0x38, 0x21, 0x00, 0x10, 0x4E, 0x80, 0x00,
4646
0x20]
4747
0x101D232E: [0x00, 0x09]
4848
0x101D233A: [0x00, 0x09]
4949
0x101D2346: [0x00, 0x09]
5050
Relocations:
51-
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAC7A}
52-
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAC7E}
53-
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FACC6}
54-
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FACCA}
55-
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAD0E}
56-
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAD12}
51+
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FACB2}
52+
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FACB6}
53+
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FACFE}
54+
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAD02}
55+
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAD46}
56+
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAD4A}

‎asm/patch_diffs/remove_low_health_effects_diff.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Data:
2-
0x2024408: [0x48, 0x8D, 0x69, 0x40]
3-
0x23DD1B8: [0x48, 0x51, 0xDB, 0xB0]
4-
0x28FAD48: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0xA0, 0x63, 0x00, 0x20,
2+
0x2024408: [0x48, 0x8D, 0x69, 0x78]
3+
0x23DD1B8: [0x48, 0x51, 0xDB, 0xE8]
4+
0x28FAD80: [0x3C, 0x60, 0x10, 0x20, 0x80, 0x63, 0x84, 0xDC, 0xA0, 0x63, 0x00, 0x20,
55
0x28, 0x03, 0x00, 0x08, 0x41, 0x80, 0x00, 0x0C, 0x7F, 0xE3, 0xFB, 0x78, 0x4B,
6-
0x72, 0x96, 0xAC, 0x4B, 0x72, 0x96, 0xF4]
7-
0x28FAD68: [0xA0, 0x6C, 0x00, 0x20, 0xA0, 0x8C, 0x00, 0x22, 0x54, 0x63, 0x00, 0x3A,
6+
0x72, 0x96, 0x74, 0x4B, 0x72, 0x96, 0xBC]
7+
0x28FADA0: [0xA0, 0x6C, 0x00, 0x20, 0xA0, 0x8C, 0x00, 0x22, 0x54, 0x63, 0x00, 0x3A,
88
0x7C, 0x64, 0x18, 0x10, 0x2C, 0x03, 0x00, 0x02, 0x40, 0x80, 0x00, 0x0C, 0x38,
9-
0x60, 0x00, 0x00, 0x4B, 0xAE, 0x24, 0x38, 0x38, 0x60, 0x00, 0x01, 0x4B, 0xAE,
10-
0x24, 0x30]
9+
0x60, 0x00, 0x00, 0x4B, 0xAE, 0x24, 0x00, 0x38, 0x60, 0x00, 0x01, 0x4B, 0xAE,
10+
0x23, 0xF8]
1111
Relocations:
12-
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAD4A}
13-
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAD4E}
12+
- {r_addend: 0x1F84DC, r_info: 0x206, r_offset: 0x28FAD82}
13+
- {r_addend: 0x1F84DC, r_info: 0x204, r_offset: 0x28FAD86}

0 commit comments

Comments
 (0)