Merge pull request #1086 from thibautbus/fix/yellow-pallet-oak-music

Bring Oak's Pallet Town cutscene in line with the original Yellow game
This commit is contained in:
bryanthaboi
2026-08-11 21:21:36 -04:00
committed by GitHub
7 changed files with 376 additions and 33 deletions
+6 -1
View File
@@ -2203,8 +2203,13 @@ function BattleState:openOldManBag()
self.afterQueue = "menu"
self:ui(function()
local list
-- The canned bag (POKE_BALL, not read from the player's real
-- inventory) differs by version: pokered's OldManItemList has 50
-- POKé BALLs; pokeyellow's SimulatedInputBattleItemList, shared by
-- the Viridian tutorial and Oak's catch, has one.
local qty = require("src.core.GameVersion").isYellow() and "x1" or "x50"
list = ListMenu.new(game, "ITEMS", {
{ value = "POKE_BALL", label = Strings("POKé BALL"), right = "x50" },
{ value = "POKE_BALL", label = Strings("POKé BALL"), right = qty },
}, {
script = function(l)
l.scriptTimer = (l.scriptTimer or 0) + 1