summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-11-17 16:27:44 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2020-11-17 16:27:44 -0500
commit47cd734276eade428671f720e8d01a45c4fd2bc2 (patch)
tree6682f4d72db6a49af4e542324068aefd2530905f
parent66377fca32c63ca9e362d2d2ce15f0692260ce53 (diff)
Use assert to ensure correct base data size
-rw-r--r--data/pokemon/base_stats.asm2
-rw-r--r--wram.asm3
2 files changed, 4 insertions, 1 deletions
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index 809ae8eb..91ccbe08 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -151,3 +151,5 @@ INCLUDE "data/pokemon/base_stats/dratini.asm"
INCLUDE "data/pokemon/base_stats/dragonair.asm"
INCLUDE "data/pokemon/base_stats/dragonite.asm"
INCLUDE "data/pokemon/base_stats/mewtwo.asm"
+BaseStatsEnd::
+ assert BaseStatsEnd - BaseStats == (wMonHeaderEnd - wMonHeader) * (NUM_POKEMON - 1) ; discount Mew
diff --git a/wram.asm b/wram.asm
index 9444084e..c005a3a3 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1996,8 +1996,9 @@ wMonHGrowthRate::
wMonHLearnset::
; bit field
- flag_array 50 + 5
+ flag_array NUM_TMS + NUM_HMS
ds 1
+wMonHeaderEnd::
wSavedTilesetType::
; saved at the start of a battle and then written back at the end of the battle