From df1c3c6a1685f85f3437e95231282716f1824399 Mon Sep 17 00:00:00 2001
From: End45 <71291438+End45@users.noreply.github.com>
Date: Sun, 26 Jun 2022 19:22:31 +0200
Subject: [PATCH 1/2] Fix some fixed room properties descriptions

---
 .../module/dungeon/controller/fixed.glade     | 25 ++++++++++++++++---
 skytemple/module/dungeon/controller/fixed.py  |  9 +++++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/skytemple/module/dungeon/controller/fixed.glade b/skytemple/module/dungeon/controller/fixed.glade
index b6b969735..3374657b7 100644
--- a/skytemple/module/dungeon/controller/fixed.glade
+++ b/skytemple/module/dungeon/controller/fixed.glade
@@ -1671,7 +1671,7 @@ if dungeon is cleared:</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Prevent "Item Stealing"</property>
+                <property name="label" translatable="yes">Allow "Item Stealing"</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1683,7 +1683,7 @@ if dungeon is cleared:</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Disable all warp effects:</property>
+                <property name="label" translatable="yes">Allow warp effects:</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1695,7 +1695,7 @@ if dungeon is cleared:</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="halign">end</property>
-                <property name="label" translatable="yes">Disable some traps:</property>
+                <property name="label" translatable="yes">Allow certain traps:</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -1779,7 +1779,24 @@ Please check the help for each setting for more information.</property>
               </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkButton" id="btn_help_unk5">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="valign">center</property>
+                <signal name="clicked" handler="on_btn_help_unk5_clicked" swapped="no"/>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="icon-name">skytemple-help-about-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">6</property>
+              </packing>
             </child>
             <child>
               <placeholder/>
diff --git a/skytemple/module/dungeon/controller/fixed.py b/skytemple/module/dungeon/controller/fixed.py
index ed9101e5f..03cbb3bd6 100644
--- a/skytemple/module/dungeon/controller/fixed.py
+++ b/skytemple/module/dungeon/controller/fixed.py
@@ -445,11 +445,16 @@ def on_btn_help_orbs_clicked(self, *args):
     def on_btn_help_defeat_enemies_clicked(self, *args):
         self._help(_("If enabled, the floor is exited after all the enemies have been defeated"))
 
+    def on_btn_help_unk5_clicked(self, *args):
+        self._help(_("If disabled, certain traps (Summon, Pitfall and Pokémon) will be disabled."
+                     "\nIf ChangeFixedFloorProperties is not applied and the fixed floor ID is 0 or >= 165 this setting is ignored. It is always enabled."))
+
     def on_btn_help_unk8_clicked(self, *args):
-        self._help(_("If ChangeFixedFloorProperties is not applied and the fixed floor ID is 0 or >= 165 this setting is ignored. It is always enabled."))
+        self._help(_("If disabled, warping, being blown away and leaping effects will be disabled."
+                     "\nIf ChangeFixedFloorProperties is not applied and the fixed floor ID is 0 or >= 165 this setting is ignored. It is always enabled."))
 
     def on_btn_help_unk9_clicked(self, *args):
-        self._help(_("Prevents any kind of item pulling (such as with the Trawl Orb)."
+        self._help(_("If disabled, prevents any kind of item pulling (such as with the Trawl Orb)."
                      "\nIf ChangeFixedFloorProperties is not applied and the fixed floor ID is 0 or >= 165 this setting is ignored. It is always enabled."))
     
     def on_btn_help_complete_clicked(self, *args):

From e0ad7e49f6fea4a580820645410ad9e7a088f9b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jun 2022 16:17:05 +0000
Subject: [PATCH 2/2] Bump pypresence from 4.2.0 to 4.2.1

Bumps [pypresence](https://github.com/qwertyquerty/pypresence) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/qwertyquerty/pypresence/releases)
- [Commits](https://github.com/qwertyquerty/pypresence/compare/4.2.0...4.2.1)

---
updated-dependencies:
- dependency-name: pypresence
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements-mac-windows.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-mac-windows.txt b/requirements-mac-windows.txt
index bee152aa3..b1aba0c0f 100644
--- a/requirements-mac-windows.txt
+++ b/requirements-mac-windows.txt
@@ -8,7 +8,7 @@ natsort==8.1.0
 tilequant==0.4.0.post0
 skytemple-ssb-debugger==1.3.8.post2
 skytemple-eventserver==1.0.0
-pypresence==4.2.0
+pypresence==4.2.1
 pygal==3.0.0
 CairoSVG==2.5.2
 gbulb==0.6.3