thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 08:35:23 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Three Island and properly implement nihon region check for the trainer battle theme (double check this doesnt accidentally also effect sevii)

Browse source
This commit is contained in:
Zeta_Null 2024-10-12 17:52:52 -04:00
parent 59787cbecb
commit 8b9927bc6f
12 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engine/battle/start_battle.asm
View file

@ -78,12 +78,13 @@ PlayBattleMusic:
ld de, MUSIC_JOHTO_WILD_BATTLE
ld a, [wTimeOfDay]
cp NITE_F
jr nz, .done
jr nz, .gotodone
ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT
jr .done
.kantowild
ld de, MUSIC_KANTO_WILD_BATTLE
.gotodone
jr .done
.trainermusic
@ -140,6 +141,8 @@ PlayBattleMusic:
farcall RegionCheck
ld a, e
jr nc, .nihontrainer
; ld a, e
and a
jr nz, .kantotrainer
@ -147,6 +150,10 @@ PlayBattleMusic:
ld de, MUSIC_JOHTO_TRAINER_BATTLE
jr .done
.nihontrainer
ld de, MUSIC_NIHONTRAINERBATTLE
jr .done
.kantotrainer
ld de, MUSIC_KANTO_TRAINER_BATTLE