Get rid of wEvosMoves, MAX_EVOLUTIONS, and EVOLUTION_SIZE

Fixes #430
This commit is contained in:
Rangi42 2023-11-21 20:33:03 -05:00
parent 13079730ac
commit 0a616ae560
4 changed files with 14 additions and 14 deletions

View file

@ -83,9 +83,6 @@ DEF HOF_TEAM_CAPACITY EQU 50
const EVOLVE_ITEM ; 2 const EVOLVE_ITEM ; 2
const EVOLVE_TRADE ; 3 const EVOLVE_TRADE ; 3
DEF MAX_EVOLUTIONS EQU 3
DEF EVOLUTION_SIZE EQU 4
; wMonHGrowthRate values ; wMonHGrowthRate values
; GrowthRateTable indexes (see data/growth_rates.asm) ; GrowthRateTable indexes (see data/growth_rates.asm)

View file

@ -1,5 +1,12 @@
; See constants/pokemon_data_constants.asm ; Evos+moves data structure:
; The max number of evolutions per monster is MAX_EVOLUTIONS ; - Evolution methods:
; * db EVOLVE_LEVEL, level, species
; * db EVOLVE_ITEM, used item, min level (1), species
; * db EVOLVE_TRADE, min level (1), species
; - db 0 ; no more evolutions
; - Learnset (in increasing level order):
; * db level, move
; - db 0 ; no more level-up moves
EvosMovesPointerTable: EvosMovesPointerTable:
table_width 2, EvosMovesPointerTable table_width 2, EvosMovesPointerTable

View file

@ -121,19 +121,19 @@ RedrawPartyMenu_::
rl b rl b
ld c, a ld c, a
add hl, bc add hl, bc
ld de, wEvosMoves ld de, wcd6d
ld a, BANK(EvosMovesPointerTable) ld a, BANK(EvosMovesPointerTable)
ld bc, 2 ld bc, 2
call FarCopyData call FarCopyData
ld hl, wEvosMoves ld hl, wcd6d
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, wEvosMoves ld de, wcd6d
ld a, BANK(EvosMovesPointerTable) ld a, BANK(EvosMovesPointerTable)
ld bc, wEvosMovesEnd - wEvosMoves ld bc, 4 * 3 + 1 ; enough for Eevee's three 4-byte evolutions and 0 terminator
call FarCopyData call FarCopyData
ld hl, wEvosMoves ld hl, wcd6d
ld de, .notAbleToEvolveText ld de, .notAbleToEvolveText
; loop through the pokemon's evolution entries ; loop through the pokemon's evolution entries
.checkEvolutionsLoop .checkEvolutionsLoop

View file

@ -886,10 +886,6 @@ wNumMovesMinusOne:: db
UNION UNION
wcd6d:: ds NAME_BUFFER_LENGTH ; buffer for various data wcd6d:: ds NAME_BUFFER_LENGTH ; buffer for various data
NEXTU
wEvosMoves:: ds MAX_EVOLUTIONS * EVOLUTION_SIZE + 1
wEvosMovesEnd::
NEXTU NEXTU
ds 4 ds 4
; temp variable used to print a move's current PP on the status screen ; temp variable used to print a move's current PP on the status screen