Merge pull request #2 from TestRunnerSRL/Dev

Merge 8/30/2020
OoTRandomizer · Aug 31, 2020 · a2938f3 · a2938f3
2 parents 6906792 + 31c3338
commit a2938f3
Show file tree

Hide file tree

Showing 52 changed files with 5,321 additions and 5,154 deletions.
diff --git a/ASM/build/asm_symbols.txt b/ASM/build/asm_symbols.txt
diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o
diff --git a/ASM/build/c_symbols.txt b/ASM/build/c_symbols.txt
diff --git a/ASM/c/item_effects.c b/ASM/c/item_effects.c
@@ -111,3 +111,19 @@ void fill_wallet_upgrade(z64_file_t *save, int16_t arg1, int16_t arg2) {
     if(MAX_RUPEES)
         save->rupees = rupee_cap[arg1];
 }
+
+uint8_t OPEN_KAKARIKO = 0;
+uint8_t COMPLETE_MASK_QUEST = 0;
+void open_mask_shop(z64_file_t *save, int16_t arg1, int16_t arg2) {
+    if (OPEN_KAKARIKO) {
+        save->inf_table[7] = save->inf_table[7] | 0x40; // "Spoke to Gate Guard About Mask Shop"
+        if (!COMPLETE_MASK_QUEST) {
+            save->item_get_inf[2] = save->item_get_inf[2] & 0xFB87; // Unset "Obtained Mask" flags just in case of savewarp before Impa.
+        }
+    }
+    if (COMPLETE_MASK_QUEST) {
+        save->inf_table[7] = save->inf_table[7] | 0x80; // "Soldier Wears Keaton Mask"
+        save->item_get_inf[3] = save->item_get_inf[3] | 0x8F00; // "Sold Masks & Unlocked Masks" / "Obtained Mask of Truth"
+        save->event_chk_inf[8] = save->event_chk_inf[8] | 0xF000; // "Paid Back Mask Fees"
+    }
+}
diff --git a/ASM/c/item_effects.h b/ASM/c/item_effects.h
@@ -21,5 +21,6 @@ void give_song(z64_file_t *save, int16_t quest_bit, int16_t arg2);
 void ice_trap_effect(z64_file_t *save, int16_t arg1, int16_t arg2);
 void give_bean_pack(z64_file_t *save, int16_t arg1, int16_t arg2);
 void fill_wallet_upgrade(z64_file_t *save, int16_t arg1, int16_t arg2);
+void open_mask_shop(z64_file_t *save, int16_t arg1, int16_t arg2);
 
 #endif
diff --git a/ASM/c/item_table.c b/ASM/c/item_table.c
@@ -48,7 +48,7 @@ item_row_t item_table[] = {
     [0x08] = ITEM_ROW(0x53, 0, 0x0A, 0x0036, 0x00DD, 0x2D, no_upgrade, no_effect, -1, -1), // Hookshot
     [0x09] = ITEM_ROW(0x53, 0, 0x0B, 0x004F, 0x00DD, 0x2E, no_upgrade, no_effect, -1, -1), // Longshot
     [0x0A] = ITEM_ROW(0x53, 0, 0x0F, 0x0039, 0x00EA, 0x36, no_upgrade, no_effect, -1, -1), // Lens of Truth
-    [0x0B] = ITEM_ROW(0x53, 0, 0x23, 0x0069, 0x00EF, 0x3B, no_upgrade, no_effect, -1, -1), // Zelda's Letter
+    [0x0B] = ITEM_ROW(0x53, 0, 0x23, 0x0069, 0x00EF, 0x3B, no_upgrade, open_mask_shop, -1, -1), // Zelda's Letter
     [0x0C] = ITEM_ROW(0x53, 0, 0x08, 0x003A, 0x00DE, 0x2F, no_upgrade, no_effect, -1, -1), // Ocarina of Time
     [0x0D] = ITEM_ROW(0x53, 0, 0x11, 0x0038, 0x00F6, 0x41, no_upgrade, no_effect, -1, -1), // Megaton Hammer
     [0x0E] = ITEM_ROW(0x53, 0, 0x2F, 0x0002, 0x0109, 0x5E, no_upgrade, no_effect, -1, -1), // Cojiro

diff --git a/ASM/rom_diff.py b/ASM/rom_diff.py
diff --git a/Cosmetics.py b/Cosmetics.py
@@ -855,7 +855,8 @@ def cosmetics_output(self):
         for key, value in self.sfx.items():
             output += format_string.format(key=key+':', value=value, width=padding)
 
-        if self.settings.background_music == 'random' or self.settings.fanfares == 'random':
+        if self.settings.background_music == 'random' or self.settings.fanfares == 'random' or \
+            self.settings.compress_rom != 'Patch' and (self.settings.background_music == 'random_custom_only' or self.settings.fanfares == 'random_custom_only'):
             #music_padding = 1 + len(max(self.bgm.keys(), key=len))
             music_padding = 40
             output += '\n\nBackground Music:\n'