summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-03-21 18:55:09 -0400
committeryenatch <yenatch@gmail.com>2018-03-21 18:55:09 -0400
commitc80eddf988523b81c2e26b57a648ee6069c8955c (patch)
treed34f6834e5c39ef2a18e14e0d782ffaff5e21903
parent509ee98219bae35c3edae81ed36f3c40ab9dbd5b (diff)
add wEvosMoves instead of using eevee
-rwxr-xr-xengine/menu/party_menu.asm10
-rwxr-xr-xwram.asm9
2 files changed, 14 insertions, 5 deletions
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index 9b07ebb7..8323d0eb 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -140,19 +140,19 @@ RedrawPartyMenu_:
rl b
ld c, a
add hl, bc
- ld de, wcd6d
+ ld de, wEvosMoves
ld a, BANK(EvosMovesPointerTable)
ld bc, 2
call FarCopyData
- ld hl, wcd6d
+ ld hl, wEvosMoves
ld a, [hli]
ld h, [hl]
ld l, a
- ld de, wcd6d
+ ld de, wEvosMoves
ld a, BANK(EvosMovesPointerTable)
- ld bc, EeveeEvosEnd - EeveeEvosMoves
+ ld bc, wEvosMoves.end - wEvosMoves
call FarCopyData
- ld hl, wcd6d
+ ld hl, wEvosMoves
ld de, .notAbleToEvolveText
; loop through the pokemon's evolution entries
.checkEvolutionsLoop
diff --git a/wram.asm b/wram.asm
index ccd6f06e..824b13d4 100755
--- a/wram.asm
+++ b/wram.asm
@@ -1237,6 +1237,8 @@ wNumMovesMinusOne:: ; cd6c
; FormatMovesString stores the number of moves minus one here
ds 1
+UNION
+
wcd6d:: ds 4 ; buffer for various data
wStatusScreenCurrentPP:: ; cd71
@@ -1249,6 +1251,13 @@ wNormalMaxPPList:: ; cd78
; list of normal max PP (without PP up) values
ds 9
+NEXTU
+
+wEvosMoves:: ds 13
+.end::
+
+ENDU
+
wSerialOtherGameboyRandomNumberListBlock:: ; cd81
; buffer for transferring the random number list generated by the other gameboy