From b439a7259fa8b653938bfff1ac874582aae3ecab Mon Sep 17 00:00:00 2001 From: Fredrik Ljungdahl Date: Sat, 29 Oct 2016 01:52:13 +0200 Subject: [PATCH 1/4] Fix an incorrect comment regarding breeding If Defense DV match and lower 3 DVs match father+mother, breeding chance isn't maximized, but prevented. Possibly done to combat in-breeding --- engine/breeding/egg.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f6cfccd1ff34d5f82f289060d3fa79ec9f8933c6 Mon Sep 17 00:00:00 2001 From: Fredrik Ljungdahl Date: Sat, 29 Oct 2016 01:57:58 +0200 Subject: [PATCH 2/4] Fix some wrong comments regarding battle substatuses --- wram.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wram.asm b/wram.asm index f17e916bd..65d1b1aa7 100644 --- a/wram.asm +++ b/wram.asm @@ -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 From 64e4300f4decc52681fbb4346f99ac648e4c11c7 Mon Sep 17 00:00:00 2001 From: Fredrik Ljungdahl Date: Sat, 29 Oct 2016 02:03:10 +0200 Subject: [PATCH 3/4] Fix inverted labels for HandleStatBoostingHeldItems --- battle/core.asm | 12 ++++++------ 1 file 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 From 146d12d6e50ed468bcb4866b23483bdebf4e5874 Mon Sep 17 00:00:00 2001 From: Fredrik Ljungdahl Date: Sat, 29 Oct 2016 02:08:18 +0200 Subject: [PATCH 4/4] Point out a bug with enemy usage of Teleport Also point out a redundancy in ThunderAccuracy --- battle/effect_commands.asm | 5 +++++ 1 file changed, 5 insertions(+) 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