pokemon/gen1recomp
1
0
Fork 0
mirror of https://github.com/bryanthaboi/gen1recomp.git synced 2026-08-16 08:11:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 20e0692486 cef286b170
commit 241c3345bd
7 changed files with 376 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/world/OverworldController.lua
+4 -3
View File
@@ -453,9 +453,10 @@ function OverworldState:setMap(mapId, x, y, facing, opts)
-- walks out of the warp, not beside him (#863)
require("src.world.PikachuFollower").onMapEntered(Game, self, opts, true)
-- opts.keepMusic: the Oak-escort warp keeps MUSIC_MEET_PROF_OAK
-- playing into the lab (BIT_NO_MAP_MUSIC in wStatusFlags7);
-- keepMusicOnce is the play_music opts.keep one-shot of the same bit
-- opts.keepMusic preserves the Oak-escort song across the lab warp,
-- matching BIT_NO_MAP_MUSIC: MUSIC_MUSEUM_GUY in Yellow and
-- MUSIC_MEET_PROF_OAK in Red/Blue. keepMusicOnce is the equivalent
-- one-shot set by play_music opts.keep.
local keepMusic = (opts and opts.keepMusic) or self.keepMusicOnce
self.keepMusicOnce = nil
if not keepMusic then