thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync more with pokeyellow

Browse source
This commit is contained in:
Rangi 2020-11-06 10:33:58 -05:00
parent d3f1352875
commit 13d4d533f7
19 changed files with 35 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engine/battle/core.asm
View file

@ -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:

4
engine/battle/trainer_ai.asm
View file

@ -394,7 +394,7 @@ SabrinaAI:
ret nc
jp AIUseHyperPotion
Sony2AI:
Rival2AI:
cp 13 percent - 1
ret nc
ld a, 5
@ -402,7 +402,7 @@ Sony2AI:
ret nc
jp AIUsePotion
Sony3AI:
Rival3AI:
cp 13 percent - 1
ret nc
ld a, 5