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 /home.asm | |
| parent | Merge pull request #201 from SatoMew/master (diff) | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| download | pokeyellow-36597a7917144bbf5d9ae63a0f9d537f6f58eb74.tar.gz pokeyellow-36597a7917144bbf5d9ae63a0f9d537f6f58eb74.tar.xz pokeyellow-36597a7917144bbf5d9ae63a0f9d537f6f58eb74.zip | |
Merge pull request #220 from Rangi42/master
Replace some hard-coded values with constants
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2390,7 +2390,7 @@ EndTrainerBattle:: ld b, FLAG_SET call TrainerFlagAction ; flag trainer as fought ld a, [wEnemyMonOrTrainerClass] - cp 200 + cp OPP_ID_OFFSET jr nc, .skipRemoveSprite ; test if trainer was fought (in that case skip removing the corresponding sprite) ld hl, wMissableObjectList ld de, $2 @@ -2424,7 +2424,7 @@ InitBattleEnemyParameters:: ld a, [wEngagedTrainerClass] ld [wCurOpponent], a ld [wEnemyMonOrTrainerClass], a - cp 200 + cp OPP_ID_OFFSET ld a, [wEngagedTrainerSet] jr c, .noTrainer ld [wTrainerNo], a |