diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-10-28 22:12:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-28 22:12:17 -0700 |
| commit | 51bad5a606d7b2e8f72638a3c688e9792ca60944 (patch) | |
| tree | cc2bb6c2efc3196f423e10c28fc2700803b73854 /battle/core.asm | |
| parent | 700321a7fb2d6c852ffc91cc0b8867526cb76813 (diff) | |
| parent | 146d12d6e50ed468bcb4866b23483bdebf4e5874 (diff) | |
Merge pull request #352 from FredrIQ/comments
Comments
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/battle/core.asm b/battle/core.asm index 015bf3edd..81376edc6 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -4676,21 +4676,21 @@ HandleStatBoostingHeldItems: ; 3de97 ld a, [hLinkPlayerNumber] cp $1 jr z, .player_1 - call .DoEnemy - jp .DoPlayer - -.player_1 call .DoPlayer jp .DoEnemy + +.player_1 + call .DoEnemy + jp .DoPlayer ; 3dea9 -.DoEnemy: ; 3dea9 +.DoPlayer: ; 3dea9 call GetPartymonItem ld a, $0 jp .HandleItem ; 3deb1 -.DoPlayer: ; 3deb1 +.DoEnemy: ; 3deb1 call GetOTPartymonItem ld a, $1 .HandleItem: ; 3deb6 |