Merge pull request #352 from FredrIQ/comments

Comments
This commit is contained in:
YamaArashi
2016-10-28 22:12:17 -07:00
committed by GitHub
4 changed files with 14 additions and 9 deletions

View File

@@ -4676,21 +4676,21 @@ HandleStatBoostingHeldItems: ; 3de97
ld a, [hLinkPlayerNumber] ld a, [hLinkPlayerNumber]
cp $1 cp $1
jr z, .player_1 jr z, .player_1
call .DoEnemy
jp .DoPlayer
.player_1
call .DoPlayer call .DoPlayer
jp .DoEnemy jp .DoEnemy
.player_1
call .DoEnemy
jp .DoPlayer
; 3dea9 ; 3dea9
.DoEnemy: ; 3dea9 .DoPlayer: ; 3dea9
call GetPartymonItem call GetPartymonItem
ld a, $0 ld a, $0
jp .HandleItem jp .HandleItem
; 3deb1 ; 3deb1
.DoPlayer: ; 3deb1 .DoEnemy: ; 3deb1
call GetOTPartymonItem call GetOTPartymonItem
ld a, $1 ld a, $1
.HandleItem: ; 3deb6 .HandleItem: ; 3deb6

View File

@@ -6682,6 +6682,10 @@ BattleCommand_Teleport: ; 36778
srl b srl b
srl b srl b
cp 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 jr nc, .run_away
.run_away .run_away
call UpdateBattleMonInParty call UpdateBattleMonInParty
@@ -9745,6 +9749,7 @@ BattleCommand_ThunderAccuracy: ; 37d94
ret ret
.rain .rain
; Redundant with CheckHit guranteeing hit
ld [hl], 100 percent ld [hl], 100 percent
ret ret

View File

@@ -88,7 +88,7 @@ CheckBreedmonCompatibility: ; 16e1d
.CheckDVs: ; 16ebc (5:6ebc) .CheckDVs: ; 16ebc (5:6ebc)
; If Defense DVs match and the lower 3 bits of the Special DVs match, ; 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] ld a, [wBreedMon1DVs]
and %1111 and %1111
ld b, a ld b, a

View File

@@ -414,7 +414,7 @@ AttackMissed:: ; c667
PlayerSubStatus1:: ; c668 PlayerSubStatus1:: ; c668
; bit ; bit
; 7 attract ; 7 attract
; 6 encore ; 6 rollout
; 5 endure ; 5 endure
; 4 perish song ; 4 perish song
; 3 identified ; 3 identified
@@ -453,7 +453,7 @@ PlayerSubStatus4:: ; c66b
; 3 ; 3
; 2 focus energy ; 2 focus energy
; 1 mist ; 1 mist
; 0 bide: unleashed energy ; 0 x accuracy
ds 1 ds 1
PlayerSubStatus5:: ; c66c PlayerSubStatus5:: ; c66c
; bit ; bit