diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:33:58 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:33:58 -0500 |
| commit | 13d4d533f7c5904391309e72f4b7937210b1c476 (patch) | |
| tree | 12af6219abc245f24a8931684c3240c95970b21d /engine/battle/core.asm | |
| parent | d3f13528754b985e892385dbd88c3c9a95681f1b (diff) | |
Sync more with pokeyellow
Diffstat (limited to 'engine/battle/core.asm')
| -rwxr-xr-x | engine/battle/core.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 30ff68bc..c524d111 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1132,22 +1132,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 @@ -1164,8 +1164,8 @@ HandlePlayerBlackOut: scf ret -Sony1WinText: - text_far _Sony1WinText +Rival1WinText: + text_far _Rival1WinText text_end PlayerBlackedOutText2: |