Merge branch 'Dev' into dev-fenhl

# Conflicts:
#	ASM/build/asm_symbols.txt
#	ASM/build/bundle.o
#	ASM/build/c_symbols.txt
#	data/generated/patch_symbols.json
#	data/generated/rom_patch.txt
#	data/generated/symbols.json

Author: fenhl

ASM/build/asm_symbols.txt

@@ -31,7 +31,7 @@ void draw_triforce_count(z64_disp_buf_t* db) {
         frames = frames % (TRIFORCE_SPRITE_FRAMES * FRAMES_PER_CYCLE);
     } else {
         // Do a fade in/out effect if not in pause screen
-        if ( frames <= TRIFORCE_FRAMES_FADE_INTO ) {
+        if (frames <= TRIFORCE_FRAMES_FADE_INTO) {
             alpha = frames * 255 / TRIFORCE_FRAMES_FADE_INTO;
         } else if (frames <= TRIFORCE_FRAMES_FADE_INTO + TRIFORCE_FRAMES_VISIBLE ) {
             alpha = 255;
@@ -69,9 +69,14 @@ void draw_triforce_count(z64_disp_buf_t* db) {
     // Setup draw location
     int str_len = required_digits + pieces_digits + 1;
     int total_w = str_len * font_sprite.tile_w + triforce_sprite.tile_w;
+    // Draw the counter centered horizontally and at the bottom of CRT safe screen space.
     int draw_x = Z64_SCREEN_WIDTH / 2 - total_w / 2;
-    int draw_y_text = Z64_SCREEN_HEIGHT - (font_sprite.tile_h * 1.5) + 1;
-    int draw_y_triforce = Z64_SCREEN_HEIGHT - (triforce_sprite.tile_h * 1.5) + 3 + 1;
+    // And on pause screen, keep the height but move it on the right, symmetric to the rupee icon.
+    if (z64_game.pause_ctxt.state > PAUSE_STATE_OFF) {
+        draw_x = (Z64_SCREEN_WIDTH - 26) - total_w;
+    }
+    int draw_y_text = 206;
+    int draw_y_triforce = 206;
 
     // Create collected/required string
     char text[str_len + 1];

ASM/build/bundle.o

@@ -12,6 +12,7 @@
 ## Bug fixes
 * The Deku Shield pot in the Spirit Temple is no longer shuffled when both `Fix Broken Drops` and `Include Empty Pots` are off.
 * For consistency with other location types, excluded pot/crate/beehive/wonderitem/etc. locations no longer behave as if their shuffle setting was off.
+* The Triforce Piece counter display has been moved to a CRT-safe position.
 
 ## Other changes
 * Big poe souls can now be collected while riding Epona.

ASM/build/c_symbols.txt

@@ -14,7 +14,6 @@ Differences between `dev-fenhl` and [`Dev-R`](https://github.com/Roman971/OoT-Ra
 
 * New settings and options:
   * More options for “Open Door of Time” setting ([#2423](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2423))
-  * New “Shuffle 100 Skulltula Reward” setting ([#2325](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2325))
   * New plando-only “Chest, Pot, Crate, & Beehive Appearance Does Not Match Contents” setting which makes each chest etc. randomly choose any appearance except the correct one ([#1950](https://github.com/OoTRandomizer/OoT-Randomizer/pull/1950))
   * New “Vanilla Locations” option for the “Shuffle Songs” setting ([#1882](https://github.com/OoTRandomizer/OoT-Randomizer/pull/1882))
   * New “Bosses” option for the “Mix Entrance Pools” setting (based on [#1820](https://github.com/OoTRandomizer/OoT-Randomizer/pull/1820))