summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-03-22 23:09:49 -0400
committeryenatch <yenatch@gmail.com>2018-03-22 23:09:49 -0400
commitbd35b37262fd80b355f6b1d942e5e936871be1ec (patch)
tree67072cfeeed8ee8a286d6b174b52bd33f9078df1
parentc80eddf988523b81c2e26b57a648ee6069c8955c (diff)
use constants for wEvosMoves size
-rwxr-xr-xconstants/evolution_constants.asm5
-rwxr-xr-xdata/evos_moves.asm4
-rwxr-xr-xwram.asm2
3 files changed, 9 insertions, 2 deletions
diff --git a/constants/evolution_constants.asm b/constants/evolution_constants.asm
index 2e3f3613..86c466d8 100755
--- a/constants/evolution_constants.asm
+++ b/constants/evolution_constants.asm
@@ -1,4 +1,9 @@
+; See data/evos_moves.asm
+
; Evolution types
EV_LEVEL EQU 1
EV_ITEM EQU 2
EV_TRADE EQU 3
+
+MAX_EVOLUTIONS EQU 3
+EVOLUTION_SIZE EQU 4
diff --git a/data/evos_moves.asm b/data/evos_moves.asm
index 4c14e4bb..c8e4b6f4 100755
--- a/data/evos_moves.asm
+++ b/data/evos_moves.asm
@@ -1,3 +1,6 @@
+; See constants/evolution_constants.asm
+; The max number of evolutions per monster is MAX_EVOLUTIONS
+
EvosMovesPointerTable:
dw RhydonEvosMoves
dw KangaskhanEvosMoves
@@ -1243,7 +1246,6 @@ EeveeEvosMoves:
db EV_ITEM,THUNDER_STONE,1,JOLTEON
db EV_ITEM,WATER_STONE,1,VAPOREON
db 0
-EeveeEvosEnd:
;Learnset
db 27,QUICK_ATTACK
db 31,TAIL_WHIP
diff --git a/wram.asm b/wram.asm
index 824b13d4..baab1cf7 100755
--- a/wram.asm
+++ b/wram.asm
@@ -1253,7 +1253,7 @@ wNormalMaxPPList:: ; cd78
NEXTU
-wEvosMoves:: ds 13
+wEvosMoves:: ds MAX_EVOLUTIONS * EVOLUTION_SIZE + 1
.end::
ENDU