CLOSES #1275, CLOSES #1295, CLOSES #1384, CLOSES #1628, CLOSES #1677, CLOSES #1682, CLOSES #1691, CLOSES #1813, CLOSES #1822, CLOSES #1861, CLOSES #1867, CLOSES #1868, CLOSES #1869, CLOSES #1870, CLOSES #1871, CLOSES #1872, CLOSES #1874, CLOSES #1876, CLOSES #1878, CLOSES #1880, CLOSES #1881, CLOSES #1882, CLOSES #1884, CLOSES #1885, CLOSES #1886, CLOSES #1887, CLOSES #1888, CLOSES #1889, CLOSES #1890, CLOSES #1891, CLOSES #1892, CLOSES #1893, CLOSES #1894, CLOSES #1895, CLOSES #1896, CLOSES #1899, CLOSES #1900, CLOSES #1901

2026-10-01 15:41:29 -04:00 · 2026-08-28 12:15:36 -04:00
parent 4849a5c9f6
commit a9ce423bdc
142 changed files with 7348 additions and 682 deletions
@@ -731,14 +731,7 @@ function PartyMenu:update(dt)
  end
 end

-- The bottom-of-screen context message for the current menu state
-- (pokered engine/menus/party_menu.asm PartyMenuMessage / RedrawPartyMenu_):
-- the party menu always prints a message in the bottom text box.  With the
-- normal message id that is PartyMenuBattleText ("Bring out which POKéMON?")
-- when IsInBattle else PartyMenuNormalText ("Choose a POKéMON."); the swap /
-- item / TM-HM ids print their own strings, and EVO_STONE shares
-- PartyMenuItemUseText (party_menu.asm:229 PartyMenuMessagePointers).
-- Pure (no side effects) so drivers can assert it. #147 #1610
+-- engine/menus/party_menu.asm:229 (#147 #1610 #1901)
 function PartyMenu:bottomMessage()
  if self.swapFrom then
    return self.game.data.text._PartyMenuSwapMonText
@@ -749,7 +742,7 @@ function PartyMenu:bottomMessage()
  elseif self.softboiledFrom or self.itemUse then
    return self.game.data.text._PartyMenuItemUseText
      or Strings("Use item on which\nPOKéMON?")
-  elseif self.battle then
+  elseif self.forceSwitch then
    return self.game.data.text._PartyMenuBattleText
      or Strings("Bring out which\nPOKéMON?")
  else