From e0d587d4b1c9ac63ae49d9836dbe8e7758d407e3 Mon Sep 17 00:00:00 2001
From: gelakinetic <gelakinetic@gmail.com>
Date: Wed, 15 Nov 2023 20:46:51 -0500
Subject: [PATCH 1/4] Add 100% portraits, split dialog

---
 assets/ray/HW_PORTRAIT.png       | Bin 0 -> 1614 bytes
 assets/ray/HW_PORTRAIT_S.png     | Bin 0 -> 857 bytes
 main/modes/ray/mode_ray.h        |   4 ++-
 main/modes/ray/ray_dialog.c      |  53 +++++++++++++++++++++++++------
 main/modes/ray/ray_dialog.h      |   2 ++
 main/modes/ray/ray_script.c      |  14 ++------
 main/modes/ray/ray_tex_manager.c |   8 +++--
 7 files changed, 57 insertions(+), 24 deletions(-)
 create mode 100644 assets/ray/HW_PORTRAIT.png
 create mode 100644 assets/ray/HW_PORTRAIT_S.png

diff --git a/assets/ray/HW_PORTRAIT.png b/assets/ray/HW_PORTRAIT.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d4002558d8b8f02a075778a4ffd530221eca1af
GIT binary patch
literal 1614
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
M07*qoM6N<$f^I?fs{jB1

literal 0
HcmV?d00001

diff --git a/assets/ray/HW_PORTRAIT_S.png b/assets/ray/HW_PORTRAIT_S.png
new file mode 100644
index 0000000000000000000000000000000000000000..74ccde1b7ba106af1def8afabbbef1c3aec8b3e5
GIT binary patch
literal 857
zcmV-f1E&0mP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0009ZNkl<Zc-rM#
zTaM!}4AY%-r@j9TJRke9O=DXmO*@@!fnYFb>`1i4=+y}Q(;{+m#o%Js!1o^iv=6(!
zR`H`iyqINW&TjX}$K8Qc9yu-L-e*AAsC*LU{R{{T{-`MFSnCBrFxTkZdva}B0BHZ&
zr35+QFu@0}n+|M*7lXg)^idPXATrk=v@Zalfo6{afH3$-z>&Eo5ihU+^etf^a0S4O
zf#2_8z6<cXC;-mt*(0`B0GKJI0+8S<k#>QLJM>T?H_L`aiwroUbwOB4*X(clj#$zV
zwIz6piqFe&Ko5X2U;s{%DR8W^ePu~m=yG#`02ZMqoRhZz14aV-m0VQ3?Jh1b1p)NC
zBtbymB#AJ3Z%-t`9iH$c6-I)QAS{826%yc<N{{<N0|b=><A)gNQ~^}QDG40bnD4;N
z(v<5XT*9WmNgUczF5u1*S91#Vu<+E_q=Z8;>z+FbBia6By9oC8|5btK`~7>SU+Lb$
zDKozVfcYs)lqdj0Q%CCoqp&!q0E|IkYX^0ZbA4VQfe>62kpSp}kf6W_pv+!g02&6s
zSa44HFznUKZ0WL?(&V@b{(5PN5xW<hsVcpI6e>Y!NNcN_AKgmd*&A5t`70nC>kcJR
z$cSbfcmVe-6Qb3&7;1J~nww-!5jNA0B9SmubQs@e2y`g71VDh5RdF6DP1$9|`ZNHy
z#h@#&=B~Uwf~`4(U<C>Q3JA*h3!O`ZU<F?dKzHG!NRkf%kVvH}NH=)D39ZIDr@qwL
zp(^w(0T?ctoOW&kK^lOlV*kntdS5CX-6)zREC5V9y-I$p05BzJC-J3f0W$!m3&5_h
z(%4XX3MlbTyF(~4Olu3N?W@YOGR%^pZ2+v!_JkoJk^m@gCJ9RI208bHI>ZPwssOk<
zM^*q{b<Rx@+Y=*llH9u@HWx5Tb%~NYe&OkR0f_w}>nDQHoe$VmyZaO{@JjIs0S*>V
z<&k;kfCKxZDf>W$s(c<i*&X|7AQ=5{#k}p@vr~Du&u$~&)yC+F*X53K+tvXomr_T5
jqx5yZ7CXrUzfbueDH3{1Ma~mS00000NkvXXu0mjfSF(NV

literal 0
HcmV?d00001

diff --git a/main/modes/ray/mode_ray.h b/main/modes/ray/mode_ray.h
index 03f81a5a4..08e336ac5 100644
--- a/main/modes/ray/mode_ray.h
+++ b/main/modes/ray/mode_ray.h
@@ -625,7 +625,9 @@ typedef struct
     uint8_t* typeToIdxMap;                                      ///< A map of rayMapCellType_t to respective textures
     wsg_t envTex[NUM_ENVS][NUM_ENV_TEXES];                      ///< The environment textures
     wsg_t guns[NUM_LOADOUTS];                                   ///< Textures for the HUD guns
-    wsg_t portrait;                                             ///< A portrait used for text dialogs
+    wsg_t cho_portrait;                                         ///< A portrait used for text dialogs
+    wsg_t hw_portrait;                                          ///< A portrait used for text dialogs
+    wsg_t hw_s_portrait;                                        ///< A portrait used for text dialogs
     wsg_t missileHUDicon;                                       ///< A missile icon drawn in the HUD
     wsg_t enemyTex[NUM_ENEMIES][E_NUM_STATES][NUM_ANIM_FRAMES]; ///< The enemy textures
     wsg_t hiddenXRTex[E_NUM_STATES][NUM_ANIM_FRAMES];           ///< The textures for X-Ray hidden enemies
diff --git a/main/modes/ray/ray_dialog.c b/main/modes/ray/ray_dialog.c
index 6df760d4f..a925c339e 100644
--- a/main/modes/ray/ray_dialog.c
+++ b/main/modes/ray/ray_dialog.c
@@ -5,6 +5,7 @@
 #include "fill.h"
 #include "ray_dialog.h"
 #include "esp_wifi.h"
+#include "ray_script.h"
 
 //==============================================================================
 // Defines
@@ -22,17 +23,41 @@
 // Constant text
 //==============================================================================
 
+/// @brief Replacement text for the MAC-randomized puzzle
 const char* const macPuzzleText[] = {
-    "WARNING DATA CORRUPTED. Seek other bounty hunters to reconstruct data.\n\n4! is too excited, subtract 12 from "
-    "it\n[=/+._?@\n}+&)(/&?\n+[:&${)}",
-    "WARNING DATA CORRUPTED. Seek other bounty hunters to reconstruct data.\n\n.?%?-}{;\nTake the next answer, like a "
-    "tree find the square\n&,?:)/&:\n:/{#_!&,",
-    "WARNING DATA CORRUPTED. Seek other bounty hunters to reconstruct data.\n\n:#:$/{)]\n{?$-}*].\nArgon's number is "
-    "nice, but in two it must split\n/}%-%?}%",
-    "WARNING DATA CORRUPTED. Seek other bounty hunters to reconstruct data.\n\n{@#??_[!\n#,;{(;-{\n]#_!]=,.\nAverage "
-    "two prior, that's it, almost there",
+    "WARNING DATA CORRUPTED. Seek other bounty hunters to reconstruct data.\n\n"
+    "4! is too excited, subtract 12 from it\n"
+    "[=/+._?@\n"
+    "}+&)(/&?\n"
+    "+[:&${)}",
+    "WARNING DATA CORRUPTED. Seek other bounty hunters to reconstruct data.\n\n"
+    ".?%?-}{;\n"
+    "Take the next answer, like a tree find the square\n"
+    "&,?:)/&:\n"
+    ":/{#_!&,",
+    "WARNING DATA CORRUPTED. Seek other bounty hunters to reconstruct data.\n\n"
+    ":#:$/{)]\n"
+    "{?$-}*].\n"
+    "Argon's number is nice, but in two it must split\n"
+    "/}%-%?}%",
+    "WARNING DATA CORRUPTED. Seek other bounty hunters to reconstruct data.\n\n"
+    "{@#??_[!\n"
+    "#,;{(;-{\n"
+    "]#_!]=,.\n"
+    "Average two prior, that's it, almost there",
 };
 
+/// @brief First part of the 100% dialog
+const char* finalDialog100_0 = "C - cc - chh - CHO - do you read me? Good, glad this channel works.\n\n...";
+
+/// @brief Second part of the 100% dialog
+const char* finalDialog100_1
+    = "Hank Waddle here, your lawyer-turned-ex-lawyer-turned-megalomaniacal super villain. Looks like Meta Studley "
+      "wasn't able to take you out, eh? He should have taken a few more reps at the space gym...\nAnyway, I'm with "
+      "the baddies now. They took my brain and fused it with some supercomputer they were building, which is kinda "
+      "weird, but hey - now I can shoot lasers out of my eyes. What a twist, right? Anyway, nice job getting 100% "
+      "completion, you NERD. I'll get you next time, Cho!";
+
 //==============================================================================
 // Functions
 //==============================================================================
@@ -86,8 +111,16 @@ void rayDialogCheckButtons(ray_t* ray)
                 }
                 else
                 {
-                    // Dialog over, return to game
-                    raySwitchToScreen(RAY_GAME);
+                    // If this is the first part of the 100% dialog, show the second
+                    if (finalDialog100_0 == ray->dialogText)
+                    {
+                        rayShowDialog(ray, finalDialog100_1, &ray->hw_portrait);
+                    }
+                    // Otherwise the dialog is over, return to game mode
+                    else
+                    {
+                        raySwitchToScreen(RAY_GAME);
+                    }
                 }
             }
         }
diff --git a/main/modes/ray/ray_dialog.h b/main/modes/ray/ray_dialog.h
index a4e7b1968..ba7754d25 100644
--- a/main/modes/ray/ray_dialog.h
+++ b/main/modes/ray/ray_dialog.h
@@ -3,6 +3,8 @@
 
 #include "mode_ray.h"
 
+extern const char* finalDialog100_0;
+
 void rayShowDialog(ray_t* ray, const char* dialogText, wsg_t* dialogPortrait);
 void rayDialogCheckButtons(ray_t* ray);
 void rayDialogRender(ray_t* ray, uint32_t elapsedUs);
diff --git a/main/modes/ray/ray_script.c b/main/modes/ray/ray_script.c
index 1ff599b9b..0546e0c22 100644
--- a/main/modes/ray/ray_script.c
+++ b/main/modes/ray/ray_script.c
@@ -519,7 +519,7 @@ static void checkScriptCell(ray_t* ray, list_t* scriptList, int32_t x, int32_t y
             if (shouldExecute)
             {
                 // Do it
-                executeScriptEvent(ray, script, &ray->portrait);
+                executeScriptEvent(ray, script, &ray->cho_portrait);
 
                 // Mark it as inactive if this is a one time script and the reset timer is inactive
                 script->isActive = (ALWAYS == script->ifArgs.cellList.oneTime) && (0 == script->resetTimerSec);
@@ -589,7 +589,7 @@ void checkScriptTime(ray_t* ray, uint32_t elapsedUs)
                 if (script->ifArgs.time <= ray->secondsSinceStart)
                 {
                     // Do it
-                    executeScriptEvent(ray, script, &ray->portrait);
+                    executeScriptEvent(ray, script, &ray->cho_portrait);
 
                     // Mark it as inactive
                     script->isActive = false;
@@ -833,15 +833,7 @@ static void executeScriptEvent(ray_t* ray, rayScript_t* script, wsg_t* portrait)
             // Show bonus dialog for 100%
             if (100 == getItemCompletePct(ray))
             {
-                rayShowDialog(ray,
-                              "\"C - cc - chh - CHO - do you read me? Good, glad this channel works.\n\n...\n\nHank "
-                              "Waddle here, your lawyer-turned-ex-lawyer-turned-megalomaniacal super villain. Looks "
-                              "like Meta Studley wasn't able to take you out, eh? I should have listened to the "
-                              "testers who kept saying to make him harder...\n\nAnyway, I'm with the baddies now. They "
-                              "took my brain and fused it with some supercomputer they were building, which is kinda "
-                              "weird, but hey - now I can shoot lasers out of my eye. What a twist, right? Anyway, "
-                              "nice job getting 100% completion, you NERD. I'll get you next time, Cho!\"",
-                              getTexByType(ray, OBJ_SCENERY_TERMINAL));
+                rayShowDialog(ray, finalDialog100_0, &ray->hw_s_portrait);
             }
             // Jump to credits! This is either immediate or after the aforementioned dialog
             ray->shouldShowCredits = true;
diff --git a/main/modes/ray/ray_tex_manager.c b/main/modes/ray/ray_tex_manager.c
index 3eb0fcb59..48ecc1cb8 100644
--- a/main/modes/ray/ray_tex_manager.c
+++ b/main/modes/ray/ray_tex_manager.c
@@ -33,7 +33,9 @@
 void loadEnvTextures(ray_t* ray)
 {
     // Load a portrait for dialogs
-    loadWsg("CHO_PORTRAIT.wsg", &ray->portrait, true);
+    loadWsg("CHO_PORTRAIT.wsg", &ray->cho_portrait, true);
+    loadWsg("HW_PORTRAIT.wsg", &ray->hw_portrait, true);
+    loadWsg("HW_PORTRAIT_S.wsg", &ray->hw_s_portrait, true);
 
     // Load HUD textures
     loadWsg("GUN_NORMAL.wsg", &ray->guns[LO_NORMAL], true);
@@ -229,7 +231,9 @@ wsg_t* getTexByType(ray_t* ray, rayMapCellType_t type)
  */
 void freeAllTex(ray_t* ray)
 {
-    freeWsg(&ray->portrait);
+    freeWsg(&ray->cho_portrait);
+    freeWsg(&ray->hw_portrait);
+    freeWsg(&ray->hw_s_portrait);
     freeWsg(&ray->guns[LO_NORMAL]);
     freeWsg(&ray->guns[LO_MISSILE]);
     freeWsg(&ray->guns[LO_ICE]);

From 138fb9afdcd2de8e2042578933a6787749cd7469 Mon Sep 17 00:00:00 2001
From: gelakinetic <gelakinetic@gmail.com>
Date: Thu, 16 Nov 2023 22:46:54 -0500
Subject: [PATCH 2/4] Update death dialog Add sub-50 clear dialog

---
 main/modes/ray/ray_death_screen.c |  2 +-
 main/modes/ray/ray_dialog.c       | 26 +++++++++++++++++++++-----
 main/modes/ray/ray_script.c       |  2 +-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/main/modes/ray/ray_death_screen.c b/main/modes/ray/ray_death_screen.c
index cc5fae6ef..8e43e99f8 100644
--- a/main/modes/ray/ray_death_screen.c
+++ b/main/modes/ray/ray_death_screen.c
@@ -11,7 +11,7 @@
 static const char* const deathTexts[] = {
     "GG no re",
     "Skill Issue",
-    "F",
+    "Press F",
     "YOUR HEAD ASPLODE",
     "You may have died, but you are not safe from taxes",
     "Pro Tip: Shoot the enemies until they die",
diff --git a/main/modes/ray/ray_dialog.c b/main/modes/ray/ray_dialog.c
index a925c339e..21aa61c13 100644
--- a/main/modes/ray/ray_dialog.c
+++ b/main/modes/ray/ray_dialog.c
@@ -6,6 +6,7 @@
 #include "ray_dialog.h"
 #include "esp_wifi.h"
 #include "ray_script.h"
+#include "ray_pause.h"
 
 //==============================================================================
 // Defines
@@ -53,10 +54,18 @@ const char* finalDialog100_0 = "C - cc - chh - CHO - do you read me? Good, glad
 /// @brief Second part of the 100% dialog
 const char* finalDialog100_1
     = "Hank Waddle here, your lawyer-turned-ex-lawyer-turned-megalomaniacal super villain. Looks like Meta Studley "
-      "wasn't able to take you out, eh? He should have taken a few more reps at the space gym...\nAnyway, I'm with "
-      "the baddies now. They took my brain and fused it with some supercomputer they were building, which is kinda "
-      "weird, but hey - now I can shoot lasers out of my eyes. What a twist, right? Anyway, nice job getting 100% "
-      "completion, you NERD. I'll get you next time, Cho!";
+      "wasn't able to take you out, eh? He should have taken a few more reps at the space gym...\nAnyway, I'm with the "
+      "baddies now. They took my brain and fused it with some supercomputer they were building, which is kinda weird, "
+      "but hey - now I can shoot lasers out of my eyes. What a twist, right? Anyway, nice job getting 100% completion, "
+      "you NERD. I'll get you next time, Cho!";
+
+/// @brief Second part of the 50% dialog
+const char* finalDialog50_1
+    = "Hank Waddle here, your lawyer-turned-ex-lawyer-turned-megalomaniacal super villain. Looks like Meta Studley "
+      "wasn't able to take you out, eh? He should have taken a few more reps at the space gym...\nAnyway, I'm with the "
+      "baddies now. They took my brain and fused it with some supercomputer they were building, which is kinda weird, "
+      "but hey - now I can shoot lasers out of my eye. What a twist, right? Anyway, nice job getting through the game "
+      "with so few upgrades, you MASOCHIST. I'll get you next time, Cho!";
 
 //==============================================================================
 // Functions
@@ -114,7 +123,14 @@ void rayDialogCheckButtons(ray_t* ray)
                     // If this is the first part of the 100% dialog, show the second
                     if (finalDialog100_0 == ray->dialogText)
                     {
-                        rayShowDialog(ray, finalDialog100_1, &ray->hw_portrait);
+                        if (100 == getItemCompletePct(ray))
+                        {
+                            rayShowDialog(ray, finalDialog100_1, &ray->hw_portrait);
+                        }
+                        else if (50 > getItemCompletePct(ray))
+                        {
+                            rayShowDialog(ray, finalDialog50_1, &ray->hw_portrait);
+                        }
                     }
                     // Otherwise the dialog is over, return to game mode
                     else
diff --git a/main/modes/ray/ray_script.c b/main/modes/ray/ray_script.c
index 0546e0c22..5ee9ccce8 100644
--- a/main/modes/ray/ray_script.c
+++ b/main/modes/ray/ray_script.c
@@ -831,7 +831,7 @@ static void executeScriptEvent(ray_t* ray, rayScript_t* script, wsg_t* portrait)
             // Unlock zip on the menu
             writeNvs32(MAGTROID_UNLOCK_KEY, 1);
             // Show bonus dialog for 100%
-            if (100 == getItemCompletePct(ray))
+            if ((100 == getItemCompletePct(ray)) || (50 > getItemCompletePct(ray)))
             {
                 rayShowDialog(ray, finalDialog100_0, &ray->hw_s_portrait);
             }

From 6f80fca455c30a049570d24d3b985853e489a104 Mon Sep 17 00:00:00 2001
From: gelakinetic <gelakinetic@gmail.com>
Date: Thu, 16 Nov 2023 23:02:36 -0500
Subject: [PATCH 3/4] Speed up jingle 4x Don't stop the fanfare

---
 assets/menu/jingle.mid         | Bin 124 -> 124 bytes
 main/modes/mainMenu/mainMenu.c |  11 +++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/assets/menu/jingle.mid b/assets/menu/jingle.mid
index c980afc050b56b09a35fc06329269a659ce51df9..f119caa38c25e9bf19627cef9e86d2b4866532b5 100644
GIT binary patch
delta 11
Scmb=anV`fhEOcR_YB&HE%mc6h

delta 11
Scmb=anV`h%<Lxj}H5>pI{{xZ$

diff --git a/main/modes/mainMenu/mainMenu.c b/main/modes/mainMenu/mainMenu.c
index 3a6c786b5..771502dee 100644
--- a/main/modes/mainMenu/mainMenu.c
+++ b/main/modes/mainMenu/mainMenu.c
@@ -42,6 +42,7 @@ typedef struct
     int32_t lastSfxVol;
     int32_t cheatCodeIdx;
     bool debugMode;
+    bool fanfarePlaying;
 } mainMenu_t;
 
 //==============================================================================
@@ -222,6 +223,7 @@ static void mainMenuMainLoop(int64_t elapsedUs)
                     mainMenu->cheatCodeIdx = 0;
                     mainMenu->debugMode    = true;
                     bzrPlayBgm(&mainMenu->fanfare, BZR_STEREO);
+                    mainMenu->fanfarePlaying = true;
 
                     // Return to the top level menu
                     while (mainMenu->menu->parentMenu)
@@ -270,8 +272,11 @@ static void mainMenuCb(const char* label, bool selected, uint32_t settingVal)
     // Stop the buzzer first no matter what, so that it turns off
     // if we scroll away from the BGM or SFX settings.
 
-    // Always stop the buzzer unless we're on one of the SFX settings
-    bzrStop(true);
+    // Stop the buzzer when changing volume, not for fanfare
+    if (false == mainMenu->fanfarePlaying)
+    {
+        bzrStop(true);
+    }
 
     if (selected)
     {
@@ -363,6 +368,7 @@ static void mainMenuCb(const char* label, bool selected, uint32_t settingVal)
                 mainMenu->lastBgmVol = settingVal;
                 setBgmVolumeSetting(settingVal);
                 bzrPlayBgm(&mainMenu->jingle, BZR_STEREO);
+                mainMenu->fanfarePlaying = false;
             }
         }
         else if (sfxVolSettingLabel == label)
@@ -372,6 +378,7 @@ static void mainMenuCb(const char* label, bool selected, uint32_t settingVal)
                 mainMenu->lastSfxVol = settingVal;
                 setSfxVolumeSetting(settingVal);
                 bzrPlaySfx(&mainMenu->jingle, BZR_STEREO);
+                mainMenu->fanfarePlaying = false;
             }
         }
         else if (micSettingLabel == label)

From db5508436793f08a031e075937659ded05a77ae0 Mon Sep 17 00:00:00 2001
From: gelakinetic <gelakinetic@gmail.com>
Date: Thu, 16 Nov 2023 23:04:57 -0500
Subject: [PATCH 4/4] Fix pyFlashGui for new partitions

---
 tools/pyFlashGui/pyFlashGui.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/pyFlashGui/pyFlashGui.py b/tools/pyFlashGui/pyFlashGui.py
index e00efc522..214f1916c 100644
--- a/tools/pyFlashGui/pyFlashGui.py
+++ b/tools/pyFlashGui/pyFlashGui.py
@@ -46,9 +46,9 @@ def run(self):
                 "--flash_freq", "80m",
                 "--flash_size", "4MB",
                 "0x1000",   "bootloader.bin",
-                "0x10000",  "swadge2024.bin",
                 "0x8000",   "partition-table.bin",
-                "0x110000", "storage.bin"])
+                "0x10000",  "swadge2024.bin",
+                "0x208000", "storage.bin"])
 
             # It worked! Display a nice green message
             self.labelText = "Flash succeeded on " + str(self.serialPort.device)