diff options
| author | IIMarckus <iimarckus@gmail.com> | 2019-10-14 03:23:18 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2019-10-14 03:23:18 -0600 |
| commit | 3ed059f6505975133a9b7fca745dd6b2ec6ccf4c (patch) | |
| tree | 8483dd8cc29d3e7a3c8bf28372165fe79c95e0e5 /main.asm | |
| parent | c01ed32c8b274f4d2312e70782071d68dea91f97 (diff) | |
| parent | 351f50a454b7b37521f9a1c6dad3db7a302a89da (diff) | |
Merge branch 'base_stats' of iihub:rtandy/pokegold
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1101,8 +1101,12 @@ GetTrainerPic:: DecompressPredef:: dr $518fa, $51b0b -BaseData:: ; 51b0b - dr $51b0b, $53a83 + +INCLUDE "data/pokemon/base_stats.asm" + +Unknown53a6b: + dr $53a6b, $53a83 + UnknownEggPic:: ; 53a83 dr $53a83, $54000 |