Merge pull request #180 from yenatch/fix-wevosmoves

add wEvosMoves instead of using eevee
This commit is contained in:
Daniel Harding 2018-03-24 13:25:15 -05:00 committed by GitHub
commit 91e55dbe0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1202 additions and 1186 deletions

View file

@ -1,4 +1,9 @@
; See data/evos_moves.asm
; Evolution types ; Evolution types
EV_LEVEL EQU 1 EV_LEVEL EQU 1
EV_ITEM EQU 2 EV_ITEM EQU 2
EV_TRADE EQU 3 EV_TRADE EQU 3
MAX_EVOLUTIONS EQU 3
EVOLUTION_SIZE EQU 4

View file

@ -1,3 +1,6 @@
; See constants/evolution_constants.asm
; The max number of evolutions per monster is MAX_EVOLUTIONS
EvosMovesPointerTable: EvosMovesPointerTable:
dw RhydonEvosMoves dw RhydonEvosMoves
dw KangaskhanEvosMoves dw KangaskhanEvosMoves
@ -1243,7 +1246,6 @@ EeveeEvosMoves:
db EV_ITEM, THUNDER_STONE, 1, JOLTEON db EV_ITEM, THUNDER_STONE, 1, JOLTEON
db EV_ITEM, WATER_STONE, 1, VAPOREON db EV_ITEM, WATER_STONE, 1, VAPOREON
db 0 db 0
EeveeEvosEnd:
; Learnset ; Learnset
db 27, QUICK_ATTACK db 27, QUICK_ATTACK
db 31, TAIL_WHIP db 31, TAIL_WHIP

View file

@ -140,19 +140,19 @@ RedrawPartyMenu_:
rl b rl b
ld c, a ld c, a
add hl, bc add hl, bc
ld de, wcd6d ld de, wEvosMoves
ld a, BANK(EvosMovesPointerTable) ld a, BANK(EvosMovesPointerTable)
ld bc, 2 ld bc, 2
call FarCopyData call FarCopyData
ld hl, wcd6d ld hl, wEvosMoves
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, wcd6d ld de, wEvosMoves
ld a, BANK(EvosMovesPointerTable) ld a, BANK(EvosMovesPointerTable)
ld bc, EeveeEvosEnd - EeveeEvosMoves ld bc, wEvosMoves.end - wEvosMoves
call FarCopyData call FarCopyData
ld hl, wcd6d ld hl, wEvosMoves
ld de, .notAbleToEvolveText ld de, .notAbleToEvolveText
; loop through the pokemon's evolution entries ; loop through the pokemon's evolution entries
.checkEvolutionsLoop .checkEvolutionsLoop

View file

@ -1237,6 +1237,8 @@ wNumMovesMinusOne:: ; cd6c
; FormatMovesString stores the number of moves minus one here ; FormatMovesString stores the number of moves minus one here
ds 1 ds 1
UNION
wcd6d:: ds 4 ; buffer for various data wcd6d:: ds 4 ; buffer for various data
wStatusScreenCurrentPP:: ; cd71 wStatusScreenCurrentPP:: ; cd71
@ -1249,6 +1251,13 @@ wNormalMaxPPList:: ; cd78
; list of normal max PP (without PP up) values ; list of normal max PP (without PP up) values
ds 9 ds 9
NEXTU
wEvosMoves:: ds MAX_EVOLUTIONS * EVOLUTION_SIZE + 1
.end::
ENDU
wSerialOtherGameboyRandomNumberListBlock:: ; cd81 wSerialOtherGameboyRandomNumberListBlock:: ; cd81
; buffer for transferring the random number list generated by the other gameboy ; buffer for transferring the random number list generated by the other gameboy