diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:34:05 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:34:05 -0500 |
| commit | 4efb3e307cd6b4bf267ab0d509f8e5ab498f798e (patch) | |
| tree | cd405b6d1ca27c14bfbed4fd3c2fefe91be7ee33 /engine | |
| parent | 5db3bdd6551fad07066b669db1e44a6151aaa0b4 (diff) | |
Sync more with pokered
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/core.asm | 14 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index abb1c9b4..01074b74 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1171,22 +1171,22 @@ ChooseNextMon: HandlePlayerBlackOut: ld a, [wLinkState] cp LINK_STATE_BATTLING - jr z, .notSony1Battle + jr z, .notRival1Battle ld a, [wCurOpponent] cp OPP_RIVAL1 - jr nz, .notSony1Battle - hlcoord 0, 0 ; sony 1 battle + jr nz, .notRival1Battle + hlcoord 0, 0 ; rival 1 battle lb bc, 8, 21 call ClearScreenArea call ScrollTrainerPicAfterBattle ld c, 40 call DelayFrames - ld hl, Sony1WinText + ld hl, Rival1WinText call PrintText ld a, [wCurMap] cp OAKS_LAB ret z ; starter battle in oak's lab: don't black out -.notSony1Battle +.notRival1Battle ld b, SET_PAL_BATTLE_BLACK call RunPaletteCommand ld hl, PlayerBlackedOutText2 @@ -1203,8 +1203,8 @@ HandlePlayerBlackOut: scf ret -Sony1WinText: - text_far _Sony1WinText +Rival1WinText: + text_far _Rival1WinText text_end PlayerBlackedOutText2: diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 94e427a1..a2c5e5fb 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -403,7 +403,7 @@ SabrinaAI: ret nc jp AIUseXDefend -Sony2AI: +Rival2AI: cp 13 percent - 1 ret nc ld a, 5 @@ -411,7 +411,7 @@ Sony2AI: ret nc jp AIUsePotion -Sony3AI: +Rival3AI: cp 13 percent - 1 ret nc ld a, 5 |