From bd35b37262fd80b355f6b1d942e5e936871be1ec Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 22 Mar 2018 23:09:49 -0400 Subject: use constants for wEvosMoves size --- constants/evolution_constants.asm | 5 +++++ data/evos_moves.asm | 4 +++- wram.asm | 2 +- 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 -- cgit v1.2.3