CLOSES #941, CLOSES #1081, CLOSES #1349, CLOSES #1602, CLOSES #1618, CLOSES #1624, CLOSES #1630, CLOSES #1633, CLOSES #1661, CLOSES #1669, CLOSES #1676, CLOSES #1731, CLOSES #1739, CLOSES #1740, CLOSES #1742, CLOSES #1744, CLOSES #1753, CLOSES #1757, CLOSES #1758, CLOSES #1760, CLOSES #1761, CLOSES #1762, CLOSES #1763, CLOSES #1765, CLOSES #1770, CLOSES #1777, CLOSES #1781, CLOSES #1783, CLOSES #1784, CLOSES #1785, CLOSES #1787, CLOSES #1788, CLOSES #1789, CLOSES #1790, CLOSES #1792, CLOSES #1797, CLOSES #1803

tests/drivers/fill_extended_auto_menu_test.lua

@@ -23,10 +23,10 @@ return function(game)
 
   fitRow.step(game, 1)
   assert(options.battleFit == "fill", "battle size switched to FILL")
-  assert(options.battleBg == "white", "FILL + EXTENDED normalized background to WHITE")
-  assert(bgRow.value(game) == "AUTO", "adaptive background is labeled AUTO")
+  assert(options.battleBg == "black", "FILL + EXTENDED preserves the stored background")
+  assert(bgRow.value(game) == "AUTO (FILL HUD)", "adaptive background is labeled AUTO")
   assert(bgRow.step(game, 1) == false, "AUTO background row is locked")
-  assert(options.battleBg == "white", "locked AUTO retains the WHITE value")
+  assert(options.battleBg == "black", "locked AUTO does not overwrite the stored value")
 
   menu.index = bgIndex
   menu.scroll = math.max(0, bgIndex - 5)
@@ -37,11 +37,11 @@ return function(game)
 
   fitRow.step(game, -1)
   assert(options.battleFit == "fixed", "battle size switched back to FIXED")
-  assert(bgRow.value(game) == "WHITE", "FIXED exposes the stored WHITE choice")
-  assert(bgRow.step(game, 1) == true and options.battleBg == "black",
-    "FIXED can select BLACK")
+  assert(bgRow.value(game) == "BLACK", "FIXED exposes the stored BLACK choice")
   assert(bgRow.step(game, 1) == true and options.battleBg == "world",
     "FIXED can select WORLD")
+  assert(bgRow.step(game, 1) == true and options.battleBg == "white",
+    "FIXED can select WHITE")
   U.wait(2)
   local fixedPath = DIR .. "/fixed_extended_background_choices.png"
   os.remove(fixedPath)

tests/engine/exp_traded_ot_survives_reload_bug1265.lua

@@ -48,7 +48,7 @@ end
 
 -- #1461: saves that passed through 0.1.82-0.1.9x already have the player's
 -- own id written onto traded mons, so stamping correctly from now on does
--- not help them.  The repair runs on every load, not behind a format gate.
+-- not help them.  The repair is a one-shot pre-format-5 migration.
 do
   local SaveData = require("src.core.SaveData")
   local save = newSave()

tests/parity_trade_gift.lua

@@ -229,16 +229,16 @@ check(runScript("VERMILION_TRADE_HOUSE", "TEXT_VERMILIONTRADEHOUSE_LITTLE_GIRL")
       "DUX post-trade script completes")
 shownIs({ "_AfterTrade3Text" }, "DUX uses the happy dialogset")
 
--- === 9) Celadon Eevee: no confirm prompt, AskName then GotMonText,
---         ball hidden (GivePokemon -> AddPartyMon AskName; script still
---         prints GotMonText after the silent give_pokemon row) ===
+-- === 9) Celadon Eevee: no confirm prompt, GotMonText then AskName,
+--         ball hidden (GivePokemon -> SetPokedexOwnedFlag prints GotMonText
+--         before AddPartyMon's AskName) ===
 local EEVEE_MAP, EEVEE_BALL =
   "CELADON_MANSION_ROOF_HOUSE", "CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL"
 local EEVEE_TEXT = "TEXT_CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL"
 Game.save = SaveData.newGame()
 check(runScript(EEVEE_MAP, EEVEE_TEXT), "Eevee ball script completes")
-shownIs({ "_DoYouWantToNicknameText", "_GotMonText" },
-        "Eevee gives immediately (nickname ask, then GotMonText)")
+shownIs({ "_GotMonText", "_DoYouWantToNicknameText" },
+        "Eevee gives immediately (GotMonText, then nickname ask)")
 eq(#Game.save.party, 1, "Eevee joins the party")
 eq(Game.save.party[1].species, "EEVEE", "gift species is EEVEE")
 eq(Game.save.party[1].level, 25, "Eevee is level 25")
@@ -261,13 +261,13 @@ shownIs({}, "old save: silent")
 eq(#Game.save.party, 0, "old save: no Eevee re-gift")
 eq(toggleOf(EEVEE_MAP, EEVEE_BALL), false, "old save: leftover ball hidden")
 
--- === 11) GivePokemon party full, box has room: AskName + SentToBoxText
---         (SendNewMonToBox), then script GotMonText; ball hidden ===
+-- === 11) GivePokemon party full, box has room: GotMonText, then AskName
+--         + SentToBoxText (SendNewMonToBox); ball hidden ===
 Game.save = SaveData.newGame()
 for i = 1, 6 do Game.save.party[i] = Pokemon.new(Data, "PIDGEY", 5) end
 check(runScript(EEVEE_MAP, EEVEE_TEXT), "full-party Eevee script completes")
-shownIs({ "_DoYouWantToNicknameText", "_SentToBoxText", "_GotMonText" },
-        "full-party gift: nickname, sent-to-box, then GotMonText")
+shownIs({ "_GotMonText", "_DoYouWantToNicknameText", "_SentToBoxText" },
+        "full-party gift: GotMonText, nickname, then sent-to-box")
 eq(#Game.save.party, 6, "full-party gift leaves party size at 6")
 local Boxes = require("src.pokemon.Boxes")
 local boxed = false

tests/pet_cries_test.lua

@@ -20,7 +20,8 @@ local yellow = GameVersion.isYellow()
 -- pokered/scripts/*.asm, PlayCry line in brackets:
 --   SSAnne1FRooms.asm:66 [:70], SSAnneB1FRooms.asm:82 [:86],
 --   VermilionPidgeyHouse.asm:15 [:19], VermilionCity.asm:224 [:228],
---   PokemonFanClub.asm:71 [:76] and :84 [:89].
+--   PokemonFanClub.asm:71 [:76] and :84 [:89],
+--   MrFujisHouse.asm:56 [:60] and :63 [:67], LavenderCuboneHouse.asm:10 [:14].
 local PETS = {
   { map = "SS_ANNE_1F_ROOMS", const = "TEXT_SSANNE1FROOMS_WIGGLYTUFF",
     object = "SSANNE1FROOMS_WIGGLYTUFF", species = "WIGGLYTUFF",
@@ -40,6 +41,15 @@ local PETS = {
   { map = "POKEMON_FAN_CLUB", const = "TEXT_POKEMONFANCLUB_SEEL",
     object = "POKEMONFANCLUB_SEEL", species = "SEEL",
     label = "_PokemonFanClubSeelText" },
+  { map = "MR_FUJIS_HOUSE", const = "TEXT_MRFUJISHOUSE_PSYDUCK",
+    object = "MRFUJISHOUSE_PSYDUCK", species = "PSYDUCK",
+    label = "_MrFujisHousePsyduckText" },
+  { map = "MR_FUJIS_HOUSE", const = "TEXT_MRFUJISHOUSE_NIDORINO",
+    object = "MRFUJISHOUSE_NIDORINO", species = "NIDORINO",
+    label = "_MrFujisHouseNidorinoText" },
+  { map = "LAVENDER_CUBONE_HOUSE", const = "TEXT_LAVENDERCUBONEHOUSE_CUBONE",
+    object = "LAVENDERCUBONEHOUSE_CUBONE", species = "CUBONE",
+    label = "_LavenderCuboneHouseCuboneText" },
 }
 
 if yellow then