diff options
| author | yenatch <yenatch@gmail.com> | 2018-07-19 00:46:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 00:46:59 -0400 |
| commit | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (patch) | |
| tree | d2ac10a6cc7f70e839f393706e1a3261cf95c2ae /engine/battle | |
| parent | 3e14c1f26e91b1fc1d18eed389518ae8454e938f (diff) | |
| parent | 1cb364cc1825d1b149eb4e0fe09d1cab21006208 (diff) | |
Merge pull request #542 from mid-kid/master
Miscellaneous fixes
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/ai/scoring.asm | 2 | ||||
| -rw-r--r-- | engine/battle/core.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm index 6928a3a83..3cd0e56c4 100644 --- a/engine/battle/ai/scoring.asm +++ b/engine/battle/ai/scoring.asm @@ -1550,7 +1550,7 @@ AI_Smart_Spite: dec [hl] ret -Function_0x38d16 +Function_0x38d16: jp AIDiscourageMove AI_Smart_DestinyBond: diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 57c0d7990..d1bd41b84 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8578,7 +8578,7 @@ ReadAndPrintLinkBattleRecord: db " 0 0 0@" .Format: - db " --- <LNBRK>" + db " --- <LF>" db " - - -@" .Record: db "<PLAYER>'s RECORD@" |