diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 13:23:47 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 15:15:37 -0500 |
| commit | 472f5824a65eaa76f6c92e66bfabb1a1eac66442 (patch) | |
| tree | 14b4ba61b32f85c88011ad636f323e1da49b1212 /engine/pokemon | |
| parent | e37300a446f6c5c9612e489305c96515cf88a5ca (diff) | |
Sync more with pokered
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/add_mon.asm | 6 | ||||
| -rwxr-xr-x | engine/pokemon/evos_moves.asm | 35 |
2 files changed, 4 insertions, 37 deletions
diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index d3d08e99..52230099 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -172,10 +172,10 @@ _AddPartyMon:: ld [de], a ld a, [wcf91] cp KADABRA - jr nz, .skipGivingTwistedSpoon - ld a, $60 ; twistedspoon in gen 2 + jr nz, .notKadabra + ld a, TWISTEDSPOON_GSC ld [de], a -.skipGivingTwistedSpoon +.notKadabra ld hl, wMonHMoves ld a, [hli] inc de diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index 4e48fe30..3df780c1 100755 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -452,40 +452,7 @@ Func_3b0a2: scf ret -Pointer_3b0ee: - db NIDOKING - db IVYSAUR - db EXEGGUTOR - db GENGAR - db NIDOQUEEN - db ARCANINE - db GYARADOS - db BLASTOISE - db GOLEM - db DRAGONITE - db NINETALES - db DRAGONAIR - db KABUTOPS - db OMASTAR - db JIGGLYPUFF - db FLAREON - db JOLTEON - db VAPOREON - db BEEDRILL - db BUTTERFREE - db MACHAMP - db CLOYSTER - db CLEFABLE - db ALAKAZAM - db STARMIE - db VENUSAUR - db TENTACRUEL - db CHARMELEON - db WARTORTLE - db CHARIZARD - db VILEPLUME - db VICTREEBEL - db $ff +INCLUDE "data/pokemon/unknown_list.asm" Func_3b10f: ld c, $0 |