Merge pull request #1541 from bryanthaboi/dev

tuesday afternoon squashing

src/ui/gen2/BattleState.lua

@@ -746,7 +746,8 @@ function BattleState:drawPic(mon, back)
   -- pokemon.sprite's ctx.trueColor, the same flag Gen 1's Sprites.path hands
   -- back to its own draw site.
   local function paint()
-    if colors and not trueColor and GbcPalette.available() then
+    if colors and not (trueColor and GbcPalette.mode == "gbc")
+       and GbcPalette.available() then
       GbcPalette.with(colors, body)
     else
       body()

src/ui/gen2/OptionsMenu.lua

@@ -355,6 +355,11 @@ function OptionsMenu:cycle(row, delta)
   if next_ < 1 then next_ = #row.values end
   if next_ > #row.values then next_ = 1 end
   self.options[row.key] = row.values[next_]
+  -- MUSIC VOL applies itself as it steps; SOUND has to as well, or the
+  -- pan sits on the current song until the next map change (#1471)
+  if row.key == "sound" then
+    require("src.core.Music").applyOptions(self.options)
+  end
 end
 
 function OptionsMenu:leave_()

src/ui/gen2/TitleState.lua

@@ -169,7 +169,7 @@ function TitleState:update(_dt)
   self.frameCounter = self.frameCounter + 1
   self:advanceHooh()
   if self.frameCounter % self.cloudScrollEvery == 0 then
-    self.cloudScroll = (self.cloudScroll + 1) % 160
+    self.cloudScroll = (self.cloudScroll - 1) % 160
   end
   self:spawnTrail()
   self:stepTrails()