diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-07-17 17:30:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 17:30:53 -0500 |
| commit | 36597a7917144bbf5d9ae63a0f9d537f6f58eb74 (patch) | |
| tree | e478588912070f759c95b8c276c03dc7a296c9d2 /engine/battle | |
| parent | 8addeffe6fb5012113e695b17680734933076e8e (diff) | |
| parent | 092be231ccec12904d189092270b792c7f1fd68e (diff) | |
Merge pull request #220 from Rangi42/master
Replace some hard-coded values with constants
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/battle_transitions.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/read_trainer_party.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 1967d33b..436e38b5 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -82,7 +82,7 @@ BattleTransitions: GetBattleTransitionID_WildOrTrainer: ld a, [wCurOpponent] - cp 200 + cp OPP_ID_OFFSET jr nc, .trainer res 0, c ret diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 056a9588..04336810 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6867,7 +6867,7 @@ InitBattleCommon: res 1, [hl] callab InitBattleVariables ld a, [wEnemyMonSpecies2] - sub 200 + sub OPP_ID_OFFSET jp c, InitWildBattle ld [wTrainerClass], a call GetTrainerInformation diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index ba00083b..ba4f6f8e 100755 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -101,7 +101,7 @@ ReadTrainer: ; get trainer class number ld a, [wCurOpponent] - sub 200 + sub OPP_ID_OFFSET ld b, a ld hl, TeamMoves |