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

Merge pull request #955 from ShaneMcGovernIE/shanemcgovernie-issue-945-cannot-edit-trainer-class-s-battle-theme-ad701b

Browse Source 
Honor trainer battleTheme override (fixes #945)
This commit is contained in:
bryanthaboi
2026-08-07 12:40:55 -04:00
committed by GitHub
parent 59ac27971a ed8a89c5ce
commit 1992fdf398
5 changed files with 220 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/world/OverworldController.lua
+2 -2
View File
@@ -764,8 +764,8 @@ function OverworldState:pushBattle(battle)
local enemyLevel = battle.enemy and battle.enemy.mon and battle.enemy.mon.level or 0
-- the battle theme starts with the wipe, not after it
-- (audio/play_battle_music.asm runs before the transition)
if battle.computeMusicKind then
require("src.core.Music").playBattle(Game.data, battle:computeMusicKind())
if battle.playBattleTheme then
battle:playBattleTheme()
end
-- The fade back in from white on the way out is BattleState:finish()'s