Skip to content

Commit

Permalink
Get rid of wEvosMoves, MAX_EVOLUTIONS, and EVOLUTION_SIZE
Browse files Browse the repository at this point in the history
Fixes #430
  • Loading branch information
Rangi42 committed Nov 22, 2023
1 parent 1307973 commit 0a616ae
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
3 changes: 0 additions & 3 deletions constants/pokemon_data_constants.asm
Expand Up @@ -83,9 +83,6 @@ DEF HOF_TEAM_CAPACITY EQU 50
const EVOLVE_ITEM ; 2
const EVOLVE_TRADE ; 3

DEF MAX_EVOLUTIONS EQU 3
DEF EVOLUTION_SIZE EQU 4


; wMonHGrowthRate values
; GrowthRateTable indexes (see data/growth_rates.asm)
Expand Down
11 changes: 9 additions & 2 deletions data/pokemon/evos_moves.asm
@@ -1,5 +1,12 @@
; See constants/pokemon_data_constants.asm
; The max number of evolutions per monster is MAX_EVOLUTIONS
; Evos+moves data structure:
; - 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:
table_width 2, EvosMovesPointerTable
Expand Down
10 changes: 5 additions & 5 deletions engine/menus/party_menu.asm
Expand Up @@ -121,19 +121,19 @@ RedrawPartyMenu_::
rl b
ld c, a
add hl, bc
ld de, wEvosMoves
ld de, wcd6d
ld a, BANK(EvosMovesPointerTable)
ld bc, 2
call FarCopyData
ld hl, wEvosMoves
ld hl, wcd6d
ld a, [hli]
ld h, [hl]
ld l, a
ld de, wEvosMoves
ld de, wcd6d
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
ld hl, wEvosMoves
ld hl, wcd6d
ld de, .notAbleToEvolveText
; loop through the pokemon's evolution entries
.checkEvolutionsLoop
Expand Down
4 changes: 0 additions & 4 deletions ram/wram.asm
Expand Up @@ -886,10 +886,6 @@ wNumMovesMinusOne:: db
UNION
wcd6d:: ds NAME_BUFFER_LENGTH ; buffer for various data

NEXTU
wEvosMoves:: ds MAX_EVOLUTIONS * EVOLUTION_SIZE + 1
wEvosMovesEnd::

NEXTU
ds 4
; temp variable used to print a move's current PP on the status screen
Expand Down

0 comments on commit 0a616ae

Please sign in to comment.