From dd8653fe6fa0544e757fad416ccbb4582ec008f0 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Wed, 22 Oct 2014 23:08:51 +0200 Subject: [PATCH] More AI commentary/labels --- battle/ai/scoring.asm | 217 +++++++++++++++++++++++++++--------------- 1 file changed, 138 insertions(+), 79 deletions(-) diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index f12da12aa..bf4b660e5 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -126,7 +126,7 @@ AIScoring_RedStatMods: ; 385e0 jr nz, .discourage .encourage - call Function39527 + call AIRandom2 jr c, .checkmove dec [hl] @@ -411,7 +411,7 @@ AIScoring_Sleep: ; 387e3 ret nc .asm_387f0 - call Function39527 + call AIRandom2 ret c dec [hl] dec [hl] @@ -439,7 +439,7 @@ AIScoring_LeechHit: ; 387f7 ret c ; 80% chance to encourage this move otherwise. - call Function39521 + call AIRandom1 ret c dec [hl] ret @@ -521,7 +521,7 @@ AIScoring_LockOn: ; 3881d .asm_3887a pop hl - call Function39527 + call AIRandom2 ret c dec [hl] @@ -654,13 +654,13 @@ AIScoring_EvasionUp: ; 388d4 jr nc, .asm_3890a ; If enemy's HP is above 50% but not full, 20% chance to greatly encourage this move. - call Function39521 + call AIRandom1 jr c, .asm_388ef jr .asm_38911 .asm_3890a ; ...50% chance to greatly discourage this move. - call Function39527 + call AIRandom2 jr c, .asm_38911 .asm_3890f @@ -717,7 +717,7 @@ AIScoring_EvasionUp: ; 388d4 ; 50% chance to encourage this move. ; This would partly counter any previous discouragement. .asm_38941 - call Function39527 + call AIRandom2 ret c dec [hl] @@ -739,7 +739,7 @@ AIScoring_AlwaysHit: ; 38947 ret c .asm_38954 - call Function39521 + call AIRandom1 ret c dec [hl] @@ -774,7 +774,7 @@ AIScoring_MirrorMove: ; 3895b ret nc ; If he did, 50% chance to encourage this move... - call Function39527 + call AIRandom2 ret c dec [hl] @@ -832,13 +832,13 @@ AIScoring_AccuracyDown: ; 38985 jr nc, .asm_389b8 ; If player's HP is above 50% but not full, 20% chance to greatly encourage this move. - call Function39521 + call AIRandom1 jr c, .asm_3899d jr .asm_389bf ; ...50% chance to greatly discourage this move. .asm_389b8 - call Function39527 + call AIRandom2 jr c, .asm_389bf .asm_389bd @@ -890,7 +890,7 @@ AIScoring_AccuracyDown: ; 38985 ; 50% chance to encourage this move. ; This would partly counter any previous discouragement. .asm_389ef - call Function39527 + call AIRandom2 ret c dec [hl] @@ -1024,7 +1024,7 @@ AIScoring_Reflect: ; 38a54 AIScoring_Ohko: ; 38a60 ; Dismiss this move if player's level is higher than enemy's level. -; Otherwise, discourage this move is player's HP is below 50%. +; Else, discourage this move is player's HP is below 50%. ld a, [BattleMonLevel] ld b, a @@ -1041,10 +1041,13 @@ AIScoring_Ohko: ; 38a60 AIScoring_Bind: ; 38a71 ; Bind, Wrap, Fire Spin, Clamp +; 50% chance to discourage this move if the player is already trapped. ld a, [$c730] and a jr nz, .asm_38a8b +; 50% chance to greatly encourage this move if player is either +; badly poisoned, in love, identified, stuck in Rollout, or has a Nightmare. ld a, [PlayerSubStatus5] bit SUBSTATUS_TOXIC, a jr nz, .asm_38a91 @@ -1053,12 +1056,14 @@ AIScoring_Bind: ; 38a71 and 1<