summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorRyan Tandy <ryan@nardis.ca>2019-10-12 12:10:39 -0700
committerRyan Tandy <ryan@nardis.ca>2019-10-12 12:10:39 -0700
commit351f50a454b7b37521f9a1c6dad3db7a302a89da (patch)
treed3ce0d27e34fd5584e23520b36130753ab76d69a /main.asm
parent242428c722a9d92ba20f33389f4a940b04e98568 (diff)
Sync base_stats from pokecrystal and include in the build
Remaining differences: - Move tutor is Crystal exclusive - Kept hard-coded pic dimensions for now as front pics have not been extracted yet
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm8
1 files changed, 6 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index 58b6efc9..1791cb57 100644
--- a/main.asm
+++ b/main.asm
@@ -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