Skip to content

Commit de7fbfb

Browse files
committed
Fix OoT Redux Damage Taken Multiplier Calculations
1 parent e4c5274 commit de7fbfb

File tree

3 files changed

+143
-143
lines changed

3 files changed

+143
-143
lines changed
-88 Bytes
Binary file not shown.

Files/Games/Ocarina of Time/symbols.json

Lines changed: 141 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"AUDIO_THREAD_INFO": "03681CB0",
33
"AUDIO_THREAD_INFO_MEM_SIZE": "03681CCC",
44
"AUDIO_THREAD_INFO_MEM_START": "03681CC8",
5-
"AUDIO_THREAD_MEM_START": "0369E580",
5+
"AUDIO_THREAD_MEM_START": "0369E570",
66
"AUTO_TRACKER_CONTEXT": "03680DA8",
77
"AUTO_TRACKER_VERSION": "03680DA8",
88
"BOMBCHUS_IN_LOGIC": "03680D8C",
@@ -95,44 +95,44 @@
9595
"CFG_TUNIC_SHADOW": "036808CE",
9696
"CFG_TYCOON_WALLET": "036808BF",
9797
"CFG_WS": "036808BE",
98-
"COMPLETE_MASK_QUEST": "03696550",
98+
"COMPLETE_MASK_QUEST": "03696540",
9999
"COOP_CONTEXT": "03680020",
100100
"COOP_VERSION": "03680020",
101101
"COSMETIC_CONTEXT": "03680834",
102102
"COSMETIC_FORMAT_VERSION": "03680834",
103103
"DISABLE_TIMERS": "03680DA0",
104-
"DPAD_TEXTURE": "03698A80",
104+
"DPAD_TEXTURE": "03698A70",
105105
"DUNGEONS_SHUFFLED": "03680DA1",
106106
"EXTENDED_OBJECT_TABLE": "03680D6C",
107107
"EXTERN_DAMAGE_MULTIPLYER": "03681C49",
108108
"FAST_BUNNY_HOOD_ENABLED": "03680DA3",
109109
"FAST_CHESTS": "03680D9A",
110-
"FONT_TEXTURE": "036975B8",
110+
"FONT_TEXTURE": "036975A8",
111111
"FREE_SCARECROW_ENABLED": "03680D94",
112112
"GET_ITEM_TRIGGERED": "036812E8",
113113
"GOSSIP_HINT_CONDITION": "03680D90",
114114
"INCOMING_ITEM": "03680028",
115115
"INCOMING_PLAYER": "03680026",
116116
"INITIAL_SAVE_DATA": "0368096C",
117117
"JABU_ELEVATOR_ENABLE": "03680D98",
118-
"KEY_CHEST_BASE_TEXTURE": "0369DD80",
119-
"KEY_CHEST_FRONT_TEXTURE": "0369CD80",
118+
"KEY_CHEST_BASE_TEXTURE": "0369DD70",
119+
"KEY_CHEST_FRONT_TEXTURE": "0369CD70",
120120
"LACS_CONDITION": "03680DE4",
121121
"LACS_CONDITION_COUNT": "03680DEA",
122-
"LEATHER_CHEST_BASE_TEXTURE": "0369AD80",
123-
"LEATHER_CHEST_FRONT_TEXTURE": "03699D80",
124-
"LEATHER_SYEO_CHEST_BASE_TEXTURE": "0369C580",
125-
"LEATHER_SYEO_CHEST_FRONT_TEXTURE": "0369B580",
126-
"L_BUTTON_PAUSE_SCREEN_TEXTURE": "03699A80",
122+
"LEATHER_CHEST_BASE_TEXTURE": "0369AD70",
123+
"LEATHER_CHEST_FRONT_TEXTURE": "03699D70",
124+
"LEATHER_SYEO_CHEST_BASE_TEXTURE": "0369C570",
125+
"LEATHER_SYEO_CHEST_FRONT_TEXTURE": "0369B570",
126+
"L_BUTTON_PAUSE_SCREEN_TEXTURE": "03699A70",
127127
"MALON_TEXT_ID": "03680D9F",
128-
"MAX_RUPEES": "03696552",
128+
"MAX_RUPEES": "03696542",
129129
"OCARINAS_SHUFFLED": "03680D99",
130-
"OPEN_KAKARIKO": "03696551",
130+
"OPEN_KAKARIKO": "03696541",
131131
"OUTGOING_ITEM": "03680030",
132132
"OUTGOING_KEY": "0368002C",
133133
"OUTGOING_PLAYER": "03680032",
134134
"OVERWORLD_SHUFFLED": "03680DA2",
135-
"PAYLOAD_END": "0369E580",
135+
"PAYLOAD_END": "0369E570",
136136
"PAYLOAD_START": "03680000",
137137
"PLANDOMIZER_USED": "03680DA5",
138138
"PLAYED_WARP_SONG": "036810EC",
@@ -151,137 +151,137 @@
151151
"START_TWINROVA_FIGHT": "03681CEC",
152152
"TIME_STRING_TXT": "03680948",
153153
"TRIFORCE_HUNT_ENABLED": "03680DEC",
154-
"TRIFORCE_ICON_TEXTURE": "03699A80",
154+
"TRIFORCE_ICON_TEXTURE": "03699A70",
155155
"TRIFORCE_PIECES_REQUIRED": "03680DEE",
156156
"TWINROVA_ACTION_TIMER": "03681CF0",
157157
"VERSION_STRING_TXT": "03680914",
158158
"WINDMILL_SONG_ID": "03680D9D",
159159
"WINDMILL_TEXT_ID": "03680D9E",
160160
"WORLD_STRING_TXT": "03680938",
161-
"a_button": "036964B0",
162-
"a_note_b": "0369649C",
163-
"a_note_font_glow_base": "03696484",
164-
"a_note_font_glow_max": "03696480",
165-
"a_note_g": "036964A0",
166-
"a_note_glow_base": "0369648C",
167-
"a_note_glow_max": "03696488",
168-
"a_note_r": "036964A4",
169-
"active_item_action_id": "03696534",
170-
"active_item_fast_chest": "03696524",
171-
"active_item_graphic_id": "03696528",
172-
"active_item_object_id": "0369652C",
173-
"active_item_row": "03696538",
174-
"active_item_text_id": "03696530",
175-
"active_override": "03696540",
176-
"active_override_is_outgoing": "0369653C",
177-
"actorBackup": "03694D18",
178-
"ammo_digit_sprite": "03694E98",
179-
"b_button": "036964AC",
180-
"beating_dd": "036964B8",
181-
"beating_no_dd": "036964C0",
182-
"block_r": "036964F9",
183-
"block_z": "036964F8",
184-
"button_sprite": "03694EB8",
185-
"c_button": "036964A8",
186-
"c_note_b": "03696490",
187-
"c_note_font_glow_base": "03696474",
188-
"c_note_font_glow_max": "03696470",
189-
"c_note_g": "03696494",
190-
"c_note_glow_base": "0369647C",
191-
"c_note_glow_max": "03696478",
192-
"c_note_r": "03696498",
193-
"cfg_file_select_hash": "03696514",
194-
"cfg_item_overrides": "036965B4",
195-
"checked_tunics": "036964EB",
196-
"compare_frames": "036964FC",
197-
"counter_digit_sprite": "03694EA8",
198-
"currentHealth": "036964D4",
199-
"damage_frames_timer_switch": "0369651C",
200-
"defaultDDHeart": "036964C4",
201-
"defaultHeart": "036964CC",
202-
"deku_stick_timer_switch": "0369651E",
203-
"dpad_sprite": "03694F38",
204-
"dpad_x": "03696504",
205-
"dpad_y": "03696502",
206-
"dummy_actor": "03696548",
207-
"dungeon_count": "0369643C",
208-
"dungeons": "03694D44",
209-
"empty_dlist": "03696458",
210-
"extern_ctxt": "03694DF0",
211-
"font_sprite": "03694F48",
212-
"fps_switch": "03696450",
213-
"freecam_modes": "03693E2C",
214-
"had_fairy_ocarina": "0369650F",
215-
"had_hookshot": "0369650D",
216-
"had_longshot": "0369650C",
217-
"had_ocarina_of_time": "0369650E",
218-
"hash_sprites": "03696448",
219-
"hash_symbols": "03694E04",
220-
"heap_next": "0369656C",
221-
"heart_sprite": "03694EC8",
222-
"holding_stick": "03696559",
223-
"hud_counter": "036964FA",
224-
"hud_hearts_hide": "03696438",
225-
"icon_sprites": "03693FF0",
226-
"item_digit_sprite": "03694EE8",
227-
"item_name_sprite": "03694E78",
228-
"item_overrides_count": "0369654C",
229-
"item_table": "03694FDC",
230-
"items_sprite": "03694F68",
231-
"key_counts": "03694FC0",
232-
"key_rupee_clock_sprite": "03694EF8",
233-
"l_button_pause_screen_sprite": "03694F18",
234-
"last_fog_distance": "03696440",
235-
"last_scene": "036964D2",
236-
"last_time": "0369651A",
237-
"linkhead_skull_sprite": "03694ED8",
238-
"magic_frames": "036964EE",
239-
"magic_secs": "036964ED",
240-
"medal_colors": "03694D30",
241-
"medallion_ability": "03696308",
242-
"medallion_item": "03696398",
243-
"medals_sprite": "03694F78",
244-
"moved_axis_option": "0369655B",
245-
"name_panel_sprite": "03694E48",
246-
"nayrus_love_timer_switch": "0369651D",
247-
"normal_dd": "036964B4",
248-
"normal_no_dd": "036964BC",
249-
"options": "036960B4",
250-
"options_alpha": "036964FD",
251-
"options_cursor": "03696558",
252-
"options_frames": "0369655A",
253-
"options_max": "03696090",
254-
"options_recenter": "0369606C",
255-
"original_damage": "03696500",
256-
"pending_item_queue": "0369659C",
257-
"play_sfx": "036964FE",
258-
"pressed_dpad": "036964F4",
259-
"pressed_r": "036964F7",
260-
"pressed_stick": "036964F5",
261-
"pressed_z": "036964F6",
262-
"quest_items_sprite": "03694F58",
263-
"restore_frames": "036964F0",
264-
"restore_health": "036964EC",
265-
"restore_secs": "036964EF",
266-
"rupee_colors": "03693FFC",
267-
"rupee_drain_frames": "036964F2",
268-
"rupee_drain_secs": "036964F1",
269-
"satisified_pending_frames": "03696520",
270-
"scene_fog_distance": "03696444",
271-
"setup_db": "03694F98",
272-
"song_note_sprite": "03694F08",
273-
"started_timer": "03696518",
274-
"stones_sprite": "03694F88",
275-
"subscreen_sprite": "03694E88",
276-
"text_cursor_border_base": "03696464",
277-
"text_cursor_border_max": "03696460",
278-
"text_cursor_inner_base": "0369646C",
279-
"text_cursor_inner_max": "03696468",
280-
"timer_holding_l": "036964F3",
281-
"title_sprite": "03694E68",
282-
"title_text_sprite": "03694E58",
283-
"triforce_sprite": "03694F28",
284-
"tunic_goron": "036964E4",
285-
"tunic_kokiri": "036964E8",
286-
"tunic_zora": "036964E0"
161+
"a_button": "036964A0",
162+
"a_note_b": "0369648C",
163+
"a_note_font_glow_base": "03696474",
164+
"a_note_font_glow_max": "03696470",
165+
"a_note_g": "03696490",
166+
"a_note_glow_base": "0369647C",
167+
"a_note_glow_max": "03696478",
168+
"a_note_r": "03696494",
169+
"active_item_action_id": "03696524",
170+
"active_item_fast_chest": "03696514",
171+
"active_item_graphic_id": "03696518",
172+
"active_item_object_id": "0369651C",
173+
"active_item_row": "03696528",
174+
"active_item_text_id": "03696520",
175+
"active_override": "03696530",
176+
"active_override_is_outgoing": "0369652C",
177+
"actorBackup": "03694D08",
178+
"ammo_digit_sprite": "03694E88",
179+
"b_button": "0369649C",
180+
"beating_dd": "036964A8",
181+
"beating_no_dd": "036964B0",
182+
"block_r": "036964E9",
183+
"block_z": "036964E8",
184+
"button_sprite": "03694EA8",
185+
"c_button": "03696498",
186+
"c_note_b": "03696480",
187+
"c_note_font_glow_base": "03696464",
188+
"c_note_font_glow_max": "03696460",
189+
"c_note_g": "03696484",
190+
"c_note_glow_base": "0369646C",
191+
"c_note_glow_max": "03696468",
192+
"c_note_r": "03696488",
193+
"cfg_file_select_hash": "03696504",
194+
"cfg_item_overrides": "036965A4",
195+
"checked_tunics": "036964DB",
196+
"compare_frames": "036964EC",
197+
"counter_digit_sprite": "03694E98",
198+
"currentHealth": "036964C4",
199+
"damage_frames_timer_switch": "0369650C",
200+
"defaultDDHeart": "036964B4",
201+
"defaultHeart": "036964BC",
202+
"deku_stick_timer_switch": "0369650E",
203+
"dpad_sprite": "03694F28",
204+
"dpad_x": "036964F4",
205+
"dpad_y": "036964F2",
206+
"dummy_actor": "03696538",
207+
"dungeon_count": "0369642C",
208+
"dungeons": "03694D34",
209+
"empty_dlist": "03696448",
210+
"extern_ctxt": "03694DE0",
211+
"font_sprite": "03694F38",
212+
"fps_switch": "03696440",
213+
"freecam_modes": "03693E1C",
214+
"had_fairy_ocarina": "036964FF",
215+
"had_hookshot": "036964FD",
216+
"had_longshot": "036964FC",
217+
"had_ocarina_of_time": "036964FE",
218+
"hash_sprites": "03696438",
219+
"hash_symbols": "03694DF4",
220+
"heap_next": "0369655C",
221+
"heart_sprite": "03694EB8",
222+
"holding_stick": "03696549",
223+
"hud_counter": "036964EA",
224+
"hud_hearts_hide": "03696428",
225+
"icon_sprites": "03693FE0",
226+
"item_digit_sprite": "03694ED8",
227+
"item_name_sprite": "03694E68",
228+
"item_overrides_count": "0369653C",
229+
"item_table": "03694FCC",
230+
"items_sprite": "03694F58",
231+
"key_counts": "03694FB0",
232+
"key_rupee_clock_sprite": "03694EE8",
233+
"l_button_pause_screen_sprite": "03694F08",
234+
"last_fog_distance": "03696430",
235+
"last_scene": "036964C2",
236+
"last_time": "0369650A",
237+
"linkhead_skull_sprite": "03694EC8",
238+
"magic_frames": "036964DE",
239+
"magic_secs": "036964DD",
240+
"medal_colors": "03694D20",
241+
"medallion_ability": "036962F8",
242+
"medallion_item": "03696388",
243+
"medals_sprite": "03694F68",
244+
"moved_axis_option": "0369654B",
245+
"name_panel_sprite": "03694E38",
246+
"nayrus_love_timer_switch": "0369650D",
247+
"normal_dd": "036964A4",
248+
"normal_no_dd": "036964AC",
249+
"options": "036960A4",
250+
"options_alpha": "036964ED",
251+
"options_cursor": "03696548",
252+
"options_frames": "0369654A",
253+
"options_max": "03696080",
254+
"options_recenter": "0369605C",
255+
"original_damage": "036964F0",
256+
"pending_item_queue": "0369658C",
257+
"play_sfx": "036964EE",
258+
"pressed_dpad": "036964E4",
259+
"pressed_r": "036964E7",
260+
"pressed_stick": "036964E5",
261+
"pressed_z": "036964E6",
262+
"quest_items_sprite": "03694F48",
263+
"restore_frames": "036964E0",
264+
"restore_health": "036964DC",
265+
"restore_secs": "036964DF",
266+
"rupee_colors": "03693FEC",
267+
"rupee_drain_frames": "036964E2",
268+
"rupee_drain_secs": "036964E1",
269+
"satisified_pending_frames": "03696510",
270+
"scene_fog_distance": "03696434",
271+
"setup_db": "03694F88",
272+
"song_note_sprite": "03694EF8",
273+
"started_timer": "03696508",
274+
"stones_sprite": "03694F78",
275+
"subscreen_sprite": "03694E78",
276+
"text_cursor_border_base": "03696454",
277+
"text_cursor_border_max": "03696450",
278+
"text_cursor_inner_base": "0369645C",
279+
"text_cursor_inner_max": "03696458",
280+
"timer_holding_l": "036964E3",
281+
"title_sprite": "03694E58",
282+
"title_text_sprite": "03694E48",
283+
"triforce_sprite": "03694F18",
284+
"tunic_goron": "036964D4",
285+
"tunic_kokiri": "036964D8",
286+
"tunic_zora": "036964D0"
287287
}

Files/version.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
23.4.3
2-
2024-07-31
3-
3
2+
2024-08-06
3+
4

0 commit comments

Comments
 (0)