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 | |
| parent | 700321a7fb2d6c852ffc91cc0b8867526cb76813 (diff) | |
| parent | 146d12d6e50ed468bcb4866b23483bdebf4e5874 (diff) | |
Merge pull request #352 from FredrIQ/comments
Comments
| -rw-r--r-- | battle/core.asm | 12 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 5 | ||||
| -rwxr-xr-x | engine/breeding/egg.asm | 2 | ||||
| -rw-r--r-- | wram.asm | 4 |
4 files changed, 14 insertions, 9 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 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index c585bae23..8e0c694b3 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -6682,6 +6682,10 @@ BattleCommand_Teleport: ; 36778 srl b srl b cp b + ; This does the wrong thing. What was + ; probably intended was jr c, .failed + ; The way this is made makes enemy use + ; of Teleport always succeed if able jr nc, .run_away .run_away call UpdateBattleMonInParty @@ -9745,6 +9749,7 @@ BattleCommand_ThunderAccuracy: ; 37d94 ret .rain + ; Redundant with CheckHit guranteeing hit ld [hl], 100 percent ret diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index 050fa69af..fa499c071 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -88,7 +88,7 @@ CheckBreedmonCompatibility: ; 16e1d .CheckDVs: ; 16ebc (5:6ebc) ; If Defense DVs match and the lower 3 bits of the Special DVs match, -; maximize the chances of spawning an egg regardless of species. +; avoid breeding ld a, [wBreedMon1DVs] and %1111 ld b, a @@ -414,7 +414,7 @@ AttackMissed:: ; c667 PlayerSubStatus1:: ; c668 ; bit ; 7 attract -; 6 encore +; 6 rollout ; 5 endure ; 4 perish song ; 3 identified @@ -453,7 +453,7 @@ PlayerSubStatus4:: ; c66b ; 3 ; 2 focus energy ; 1 mist -; 0 bide: unleashed energy +; 0 x accuracy ds 1 PlayerSubStatus5:: ; c66c ; bit |