summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-03 10:47:05 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-06-03 10:47:05 -0400
commit4c20b3ef1e43ed74300accb563c79523b6afa790 (patch)
tree0acdbe1e6abee6e8fff3e775d81c78c821bd793c
parentf0e5b99495efd355001ce35f97100fd2d139220b (diff)
edit
-rw-r--r--Hard-coded-logic.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/Hard-coded-logic.md b/Hard-coded-logic.md
index b1b5045..9e94818 100644
--- a/Hard-coded-logic.md
+++ b/Hard-coded-logic.md
@@ -135,10 +135,10 @@ This is caused by `InitEnemyTrainer` in [engine/battle/core.asm](../blob/master/
This is caused by `PlayBattleMusic` in [engine/battle/start_battle.asm](../blob/master/engine/battle/start_battle.asm). The routine's logic is:
1. If `[wBattleType]` is `BATTLETYPE_SUICUNE` or `BATTLETYPE_ROAMING`, play `MUSIC_SUICUNE_BATTLE`.
-2. If it's a wild battle...
- 1. ...if we're in Kanto, play `MUSIC_KANTO_WILD_BATTLE`.
- 2. ...if it's night (and we must be in Johto), play `MUSIC_JOHTO_WILD_BATTLE_NIGHT`.
- 3. ...if we must be in Johto during morning or day, play `MUSIC_JOHTO_WILD_BATTLE`.
+2. If it's a wild battle, check the region and time.
+ 1. If we're in Kanto, play `MUSIC_KANTO_WILD_BATTLE`.
+ 2. If it's night (and we must be in Johto), play `MUSIC_JOHTO_WILD_BATTLE_NIGHT`.
+ 3. We must be in Johto during morning or day; play `MUSIC_JOHTO_WILD_BATTLE`.
3. It must be a trainer battle; check the values of `[wOtherTrainerClass]` and `[wOtherTrainerID]`:
1. If `[wOtherTrainerClass]` is `CHAMPION` or `RED`, play `MUSIC_CHAMPION_BATTLE`.
2. If `[wOtherTrainerClass]` is `GRUNTM` or `GRUNTF`, play `MUSIC_ROCKET_BATTLE`. (They should have included `EXECUTIVEM`, `EXECUTIVEF`, and `SCIENTIST` too…)