mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 18:30:50 +12:00
PokeDex is fixed
This commit is contained in:
emaskyesmogon
parent
384515d3a1
commit
8539b71fc7
|
|
@ -28,7 +28,6 @@
|
|||
const DEX_FEAROW ; 22
|
||||
const DEX_EKANS ; 23
|
||||
const DEX_ARBOK ; 24
|
||||
;const DEX_PICHU
|
||||
const DEX_PIKACHU ; 25
|
||||
const DEX_RAICHU ; 26
|
||||
const DEX_GOROCHU
|
||||
|
|
@ -41,24 +40,19 @@
|
|||
const DEX_NIDORINO ; 33
|
||||
const DEX_NIDOKING ; 34
|
||||
const DEX_NIDOREIGN
|
||||
;const DEX_CLEFFA
|
||||
const DEX_CLEFAIRY ; 35
|
||||
const DEX_CLEFABLE ; 36
|
||||
const DEX_MIKON
|
||||
const DEX_VULPIX ; 37
|
||||
const DEX_NINETALES ; 38
|
||||
;const DEX_IGGLYBUFF
|
||||
const DEX_JIGGLYPUFF ; 39
|
||||
const DEX_WIGGLYTUFF ; 40
|
||||
const DEX_BITTYBAT
|
||||
const DEX_ZUBAT ; 41
|
||||
const DEX_GOLBAT ; 42
|
||||
const DEX_CROBAT
|
||||
const DEX_ODDISH ; 43
|
||||
const DEX_GLOOM ; 44
|
||||
const DEX_VILEPLUME ; 45
|
||||
const DEX_BELLOSSOM
|
||||
const DEX_PARA
|
||||
const DEX_PARAS ; 46
|
||||
const DEX_PARASECT ; 47
|
||||
const DEX_VENONAT ; 48
|
||||
|
|
@ -83,7 +77,6 @@
|
|||
const DEX_POLIWAG ; 60
|
||||
const DEX_POLIWHIRL ; 61
|
||||
const DEX_POLIWRATH ; 62
|
||||
const DEX_POLITOED
|
||||
const DEX_ABRA ; 63
|
||||
const DEX_KADABRA ; 64
|
||||
const DEX_ALAKAZAM ; 65
|
||||
|
|
@ -93,7 +86,6 @@
|
|||
const DEX_BELLSPROUT ; 69
|
||||
const DEX_WEEPINBELL ; 70
|
||||
const DEX_VICTREEBEL ; 71
|
||||
const DEX_TSUBOMITTO
|
||||
const DEX_TENTACOOL ; 72
|
||||
const DEX_TENTACRUEL ; 73
|
||||
const DEX_GEODUDE ; 74
|
||||
|
|
@ -106,22 +98,18 @@
|
|||
const DEX_RAPIDASH ; 78
|
||||
const DEX_SLOWPOKE ; 79
|
||||
const DEX_SLOWBRO ; 80
|
||||
const DEX_SLOWKING
|
||||
const DEX_MAGNEMITE ; 81
|
||||
const DEX_MAGNETITE
|
||||
const DEX_MAGNETON ; 82
|
||||
const DEX_MAGNEZONE
|
||||
const DEX_BARUNDA
|
||||
const DEX_FARFETCHD ; 83
|
||||
const DEX_MADAAMU
|
||||
const DEX_BLASTYKE
|
||||
const DEX_BLASTOISE
|
||||
const DEX_HINAAZU
|
||||
const DEX_DODUO ; 84
|
||||
const DEX_DODRIO ; 85
|
||||
const DEX_SEEL ; 86
|
||||
const DEX_DEWGONG ; 87
|
||||
const DEX_BETOBEBII
|
||||
const DEX_GRIMER ; 88
|
||||
const DEX_MUK ; 89
|
||||
const DEX_SHELLDER ; 90
|
||||
|
|
@ -130,7 +118,6 @@
|
|||
const DEX_HAUNTER ; 93
|
||||
const DEX_GENGAR ; 94
|
||||
const DEX_ONIX ; 95
|
||||
const DEX_STEELIX
|
||||
const DEX_DROWZEE ; 96
|
||||
const DEX_HYPNO ; 97
|
||||
const DEX_KOTORA
|
||||
|
|
@ -149,10 +136,8 @@
|
|||
const DEX_MAROWAK ; 105
|
||||
const DEX_GUARDIA
|
||||
const DEX_KANGASKHAN ; 115
|
||||
;const DEX_TYROGUE
|
||||
const DEX_HITMONLEE ; 106
|
||||
const DEX_HITMONCHAN ; 107
|
||||
const DEX_HITMONTOP
|
||||
const DEX_LICKITUNG ; 108
|
||||
const DEX_LICKILICKY
|
||||
const DEX_KOFFING ; 109
|
||||
|
|
@ -160,18 +145,15 @@
|
|||
const DEX_RHYHORN ; 111
|
||||
const DEX_RHYDON ; 112
|
||||
const DEX_RHYPERIOR
|
||||
;const DEX_HAPPINY
|
||||
const DEX_CHANSEY ; 113
|
||||
const DEX_BLISSEY
|
||||
const DEX_MONJA
|
||||
const DEX_TANGELA ; 114
|
||||
;const DEX_TANGROWTH
|
||||
const DEX_TANGROWTH
|
||||
const DEX_DECILLA
|
||||
const DEX_GYAOON
|
||||
const DEX_OMEGA
|
||||
const DEX_HORSEA ; 116
|
||||
const DEX_SEADRA ; 117
|
||||
const DEX_KINGDRA
|
||||
const DEX_GYOPIN
|
||||
const DEX_GOLDEEN ; 118
|
||||
const DEX_SEAKING ; 119
|
||||
|
|
@ -181,29 +163,22 @@
|
|||
const DEX_STARYU ; 120
|
||||
const DEX_STARMIE ; 121
|
||||
const DEX_JAGG
|
||||
;const DEX_MIMEJR
|
||||
const DEX_MR_MIME ; 122
|
||||
const DEX_SCYTHER ; 123
|
||||
const DEX_SCIZOR
|
||||
;const DEX_KLEAVOR
|
||||
const DEX_KLEAVOR
|
||||
const DEX_PINSIR ; 127
|
||||
const DEX_PURAKKUSU
|
||||
;const DEX_SMOOCHUM
|
||||
const DEX_JYNX ; 124
|
||||
const DEX_BUU
|
||||
;const DEX_ELEKID
|
||||
const DEX_ELECTABUZZ ; 125
|
||||
;const DEX_ELECTIVIRE
|
||||
;const DEX_MAGBY
|
||||
const DEX_MAGMAR ; 126
|
||||
;const DEX_MAGMORTAR
|
||||
const DEX_TRAMPEL ;
|
||||
const DEX_TAUROS ; 128
|
||||
const DEX_MAGIKARP ; 129
|
||||
const DEX_GYARADOS ; 130
|
||||
const DEX_LAPRAS ; 131
|
||||
const DEX_DITTO ; 132
|
||||
const DEX_ANIMON
|
||||
const DEX_EEVEE ; 133
|
||||
const DEX_VAPOREON ; 134
|
||||
const DEX_JOLTEON ; 135
|
||||
|
|
@ -214,18 +189,12 @@
|
|||
const DEX_GLACEON
|
||||
const DEX_SYLVEON
|
||||
const DEX_PORYGON ; 137
|
||||
const DEX_PORYGON2
|
||||
;const DEX_PORYGONZ
|
||||
const DEX_OMANYTE ; 138
|
||||
const DEX_OMASTAR ; 139
|
||||
const DEX_KABUTO ; 140
|
||||
const DEX_KABUTOPS ; 141
|
||||
const DEX_AERODACTYL ; 142
|
||||
;const DEX_MUNCHLAX
|
||||
const DEX_SNORLAX ; 143
|
||||
;const DEX_PERRSERKER
|
||||
;const DEX_SIRFETCHD
|
||||
;const DEX_MRRIME
|
||||
const DEX_ARTICUNO ; 144
|
||||
const DEX_ZAPDOS ; 145
|
||||
const DEX_MOLTRES ; 146
|
||||
|
|
|
|||
|
|
@ -197,14 +197,8 @@
|
|||
const BELLSPROUT ; $BC
|
||||
const WEEPINBELL ; $BD
|
||||
const VICTREEBEL ; $BE
|
||||
const TSUBOMITTO ; $BF (new)
|
||||
const ANIMON ; $C0 (new)
|
||||
const MONJA ; $C1 (new)
|
||||
const PARA ; $C2 (new)
|
||||
const HINAAZU ; $C3 (new)
|
||||
const PUDI ; $C4 (new)
|
||||
const BETOBEBII ; $C5 (new)
|
||||
const BELLOSSOM ; $C6 (new)
|
||||
const SCIZOR ; $C7 (new)
|
||||
const RHYPERIOR ; $C8 (dex expansion starts here)
|
||||
const ESPEON ; $C9
|
||||
|
|
@ -212,55 +206,9 @@
|
|||
const LEAFEON ; $CB
|
||||
const GLACEON ; $CC
|
||||
const SYLVEON ; $CD
|
||||
const CROBAT ; $CE
|
||||
const POLITOED ; $CF
|
||||
const SLOWKING ; $D0
|
||||
const STEELIX ; $D1
|
||||
const HITMONTOP ; $D2
|
||||
const BLISSEY ; $D3
|
||||
const PORYGON2 ; $D4
|
||||
const KINGDRA ; $D5
|
||||
const LICKILICKY ; $D3
|
||||
const MAGNEZONE ; $D4
|
||||
;const TANGROWTH ; $D6
|
||||
;const ELECTIVIRE ; $D8
|
||||
;const MAGMORTAR ; $D9
|
||||
;const PORYGONZ ; $DB
|
||||
;const KLEAVOR ; $DC
|
||||
; const SIRFETCHD ; $DD
|
||||
; const MR_RIME ; $DE
|
||||
; const PERRSERKER ; $DF
|
||||
; const CLEFFA ; $E0
|
||||
; const IGGLYBUFF ; $E1
|
||||
; const SMOOCHUM ; $E2
|
||||
; const HAPPINY ; $E3
|
||||
; const MUNCHLAX ; $E4
|
||||
; const ELEKID ; $E5
|
||||
; const MAGBY ; $E6
|
||||
; const MIME_JR ; $E7
|
||||
; const PICHU ; $E8
|
||||
; const TYROGUE ; $E9
|
||||
; $E9 reserved for ScVi spoiler reasons
|
||||
; vacant $EB
|
||||
; vacant $EC
|
||||
; vacant $ED
|
||||
; vacant $EE
|
||||
; vacant $EF
|
||||
; vacant $F1
|
||||
; vacant $F2
|
||||
; vacant $F3
|
||||
; vacant $F4
|
||||
; vacant $F5
|
||||
; vacant $F6
|
||||
; vacant $F7
|
||||
; vacant $F8
|
||||
; vacant $F9
|
||||
; vacant $FA
|
||||
; vacant $FB
|
||||
; vacant $FC
|
||||
; vacant $FD
|
||||
; vacant $FE
|
||||
; vacant $FF
|
||||
const TANGROWTH ; $D6
|
||||
const KLEAVOR ; $DC
|
||||
|
||||
DEF NUM_POKEMON_INDEXES EQU const_value - 1
|
||||
|
||||
|
|
|
|||
|
|
@ -34,4 +34,4 @@ MonPartySpritePointers:
|
|||
mon_icon_header SnakeIconFrame2, 1, 1, ICONOFFSET + ICON_SNAKE << 2 + 2
|
||||
mon_icon_header QuadrupedIconFrame2, 0, 1, ICONOFFSET + ICON_QUADRUPED << 2
|
||||
mon_icon_header QuadrupedIconFrame2, 1, 1, ICONOFFSET + ICON_QUADRUPED << 2 + 2
|
||||
mon_icon_header TradeBubbleIconGFX, 4, 4, ICONOFFSET + ICON_TRADEBUBBLE << 2
|
||||
mon_icon_header TradeBubbleIconGFX, 4, 4, ICONOFFSET + ICON_TRADEBUBBLE << 2
|
||||
|
|
@ -24,7 +24,6 @@ INCLUDE "data/pokemon/base_stats/spearow.asm"
|
|||
INCLUDE "data/pokemon/base_stats/fearow.asm"
|
||||
INCLUDE "data/pokemon/base_stats/ekans.asm"
|
||||
INCLUDE "data/pokemon/base_stats/arbok.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/pichu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/pikachu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/raichu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gorochu.asm"
|
||||
|
|
@ -37,24 +36,19 @@ INCLUDE "data/pokemon/base_stats/nidoranm.asm"
|
|||
INCLUDE "data/pokemon/base_stats/nidorino.asm"
|
||||
INCLUDE "data/pokemon/base_stats/nidoking.asm"
|
||||
INCLUDE "data/pokemon/base_stats/nidoreign.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/cleffa.asm"
|
||||
INCLUDE "data/pokemon/base_stats/clefairy.asm"
|
||||
INCLUDE "data/pokemon/base_stats/clefable.asm"
|
||||
INCLUDE "data/pokemon/base_stats/mikon.asm"
|
||||
INCLUDE "data/pokemon/base_stats/vulpix.asm"
|
||||
INCLUDE "data/pokemon/base_stats/ninetales.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/igglybuff.asm"
|
||||
INCLUDE "data/pokemon/base_stats/jigglypuff.asm"
|
||||
INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
|
||||
INCLUDE "data/pokemon/base_stats/bittybat.asm"
|
||||
INCLUDE "data/pokemon/base_stats/zubat.asm"
|
||||
INCLUDE "data/pokemon/base_stats/golbat.asm"
|
||||
INCLUDE "data/pokemon/base_stats/crobat.asm"
|
||||
INCLUDE "data/pokemon/base_stats/oddish.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gloom.asm"
|
||||
INCLUDE "data/pokemon/base_stats/vileplume.asm"
|
||||
INCLUDE "data/pokemon/base_stats/bellossom.asm"
|
||||
INCLUDE "data/pokemon/base_stats/para.asm"
|
||||
INCLUDE "data/pokemon/base_stats/paras.asm"
|
||||
INCLUDE "data/pokemon/base_stats/parasect.asm"
|
||||
INCLUDE "data/pokemon/base_stats/venonat.asm"
|
||||
|
|
@ -79,7 +73,6 @@ INCLUDE "data/pokemon/base_stats/arcanine.asm"
|
|||
INCLUDE "data/pokemon/base_stats/poliwag.asm"
|
||||
INCLUDE "data/pokemon/base_stats/poliwhirl.asm"
|
||||
INCLUDE "data/pokemon/base_stats/poliwrath.asm"
|
||||
INCLUDE "data/pokemon/base_stats/politoed.asm"
|
||||
INCLUDE "data/pokemon/base_stats/abra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kadabra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/alakazam.asm"
|
||||
|
|
@ -89,7 +82,6 @@ INCLUDE "data/pokemon/base_stats/machamp.asm"
|
|||
INCLUDE "data/pokemon/base_stats/bellsprout.asm"
|
||||
INCLUDE "data/pokemon/base_stats/weepinbell.asm"
|
||||
INCLUDE "data/pokemon/base_stats/victreebel.asm"
|
||||
INCLUDE "data/pokemon/base_stats/tsubomitto.asm"
|
||||
INCLUDE "data/pokemon/base_stats/tentacool.asm"
|
||||
INCLUDE "data/pokemon/base_stats/tentacruel.asm"
|
||||
INCLUDE "data/pokemon/base_stats/geodude.asm"
|
||||
|
|
@ -102,22 +94,18 @@ INCLUDE "data/pokemon/base_stats/ponyta.asm"
|
|||
INCLUDE "data/pokemon/base_stats/rapidash.asm"
|
||||
INCLUDE "data/pokemon/base_stats/slowpoke.asm"
|
||||
INCLUDE "data/pokemon/base_stats/slowbro.asm"
|
||||
INCLUDE "data/pokemon/base_stats/slowking.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magnemite.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magnetite.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magneton.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magnezone.asm"
|
||||
INCLUDE "data/pokemon/base_stats/barunda.asm"
|
||||
INCLUDE "data/pokemon/base_stats/farfetchd.asm"
|
||||
INCLUDE "data/pokemon/base_stats/madaamu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/blastyke.asm"
|
||||
INCLUDE "data/pokemon/base_stats/blastoise.asm"
|
||||
INCLUDE "data/pokemon/base_stats/hinaazu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/doduo.asm"
|
||||
INCLUDE "data/pokemon/base_stats/dodrio.asm"
|
||||
INCLUDE "data/pokemon/base_stats/seel.asm"
|
||||
INCLUDE "data/pokemon/base_stats/dewgong.asm"
|
||||
INCLUDE "data/pokemon/base_stats/betobebii.asm"
|
||||
INCLUDE "data/pokemon/base_stats/grimer.asm"
|
||||
INCLUDE "data/pokemon/base_stats/muk.asm"
|
||||
INCLUDE "data/pokemon/base_stats/shellder.asm"
|
||||
|
|
@ -126,7 +114,6 @@ INCLUDE "data/pokemon/base_stats/gastly.asm"
|
|||
INCLUDE "data/pokemon/base_stats/haunter.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gengar.asm"
|
||||
INCLUDE "data/pokemon/base_stats/onix.asm"
|
||||
INCLUDE "data/pokemon/base_stats/steelix.asm"
|
||||
INCLUDE "data/pokemon/base_stats/drowzee.asm"
|
||||
INCLUDE "data/pokemon/base_stats/hypno.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kotora.asm"
|
||||
|
|
@ -145,10 +132,8 @@ INCLUDE "data/pokemon/base_stats/cubone.asm"
|
|||
INCLUDE "data/pokemon/base_stats/marowak.asm"
|
||||
INCLUDE "data/pokemon/base_stats/guardia.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kangaskhan.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/tyrogue.asm"
|
||||
INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
|
||||
INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
|
||||
INCLUDE "data/pokemon/base_stats/hitmontop.asm"
|
||||
INCLUDE "data/pokemon/base_stats/lickitung.asm"
|
||||
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
|
||||
INCLUDE "data/pokemon/base_stats/koffing.asm"
|
||||
|
|
@ -156,18 +141,15 @@ INCLUDE "data/pokemon/base_stats/weezing.asm"
|
|||
INCLUDE "data/pokemon/base_stats/rhyhorn.asm"
|
||||
INCLUDE "data/pokemon/base_stats/rhydon.asm"
|
||||
INCLUDE "data/pokemon/base_stats/rhyperior.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/happiny.asm"
|
||||
INCLUDE "data/pokemon/base_stats/chansey.asm"
|
||||
INCLUDE "data/pokemon/base_stats/blissey.asm"
|
||||
INCLUDE "data/pokemon/base_stats/monja.asm"
|
||||
INCLUDE "data/pokemon/base_stats/tangela.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/tangrowth.asm"
|
||||
INCLUDE "data/pokemon/base_stats/tangrowth.asm"
|
||||
INCLUDE "data/pokemon/base_stats/decilla.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gyaoon.asm"
|
||||
INCLUDE "data/pokemon/base_stats/omega.asm"
|
||||
INCLUDE "data/pokemon/base_stats/horsea.asm"
|
||||
INCLUDE "data/pokemon/base_stats/seadra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kingdra.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gyopin.asm"
|
||||
INCLUDE "data/pokemon/base_stats/goldeen.asm"
|
||||
INCLUDE "data/pokemon/base_stats/seaking.asm"
|
||||
|
|
@ -177,29 +159,22 @@ INCLUDE "data/pokemon/base_stats/cryithan.asm"
|
|||
INCLUDE "data/pokemon/base_stats/staryu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/starmie.asm"
|
||||
INCLUDE "data/pokemon/base_stats/jagg.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/mimejr.asm"
|
||||
INCLUDE "data/pokemon/base_stats/mrmime.asm"
|
||||
INCLUDE "data/pokemon/base_stats/scyther.asm"
|
||||
INCLUDE "data/pokemon/base_stats/scizor.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/kleavor.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kleavor.asm"
|
||||
INCLUDE "data/pokemon/base_stats/pinsir.asm"
|
||||
INCLUDE "data/pokemon/base_stats/purakkusu.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/smoochum.asm"
|
||||
INCLUDE "data/pokemon/base_stats/jynx.asm"
|
||||
INCLUDE "data/pokemon/base_stats/buu.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/elekid.asm"
|
||||
INCLUDE "data/pokemon/base_stats/electabuzz.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/electivire.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/magby.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magmar.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/magmortar.asm"
|
||||
INCLUDE "data/pokemon/base_stats/trampel.asm"
|
||||
INCLUDE "data/pokemon/base_stats/tauros.asm"
|
||||
INCLUDE "data/pokemon/base_stats/magikarp.asm"
|
||||
INCLUDE "data/pokemon/base_stats/gyarados.asm"
|
||||
INCLUDE "data/pokemon/base_stats/lapras.asm"
|
||||
INCLUDE "data/pokemon/base_stats/ditto.asm"
|
||||
INCLUDE "data/pokemon/base_stats/animon.asm"
|
||||
INCLUDE "data/pokemon/base_stats/eevee.asm"
|
||||
INCLUDE "data/pokemon/base_stats/vaporeon.asm"
|
||||
INCLUDE "data/pokemon/base_stats/jolteon.asm"
|
||||
|
|
@ -210,18 +185,12 @@ INCLUDE "data/pokemon/base_stats/leafeon.asm"
|
|||
INCLUDE "data/pokemon/base_stats/glaceon.asm"
|
||||
INCLUDE "data/pokemon/base_stats/sylveon.asm"
|
||||
INCLUDE "data/pokemon/base_stats/porygon.asm"
|
||||
INCLUDE "data/pokemon/base_stats/porygon2.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/porygonz.asm"
|
||||
INCLUDE "data/pokemon/base_stats/omanyte.asm"
|
||||
INCLUDE "data/pokemon/base_stats/omastar.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kabuto.asm"
|
||||
INCLUDE "data/pokemon/base_stats/kabutops.asm"
|
||||
INCLUDE "data/pokemon/base_stats/aerodactyl.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/munchlax.asm"
|
||||
INCLUDE "data/pokemon/base_stats/snorlax.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/perrserker.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/sirfetchd.asm"
|
||||
;INCLUDE "data/pokemon/base_stats/mrrime.asm
|
||||
INCLUDE "data/pokemon/base_stats/articuno.asm"
|
||||
INCLUDE "data/pokemon/base_stats/zapdos.asm"
|
||||
INCLUDE "data/pokemon/base_stats/moltres.asm"
|
||||
|
|
|
|||
|
|
@ -196,14 +196,8 @@ CryData::
|
|||
mon_cry SFX_CRY_21, $55, $01 ; Bellsprout
|
||||
mon_cry SFX_CRY_25, $44, $20 ; Weepinbell
|
||||
mon_cry SFX_CRY_25, $66, $CC ; Victreebel
|
||||
mon_cry SFX_CRY_21, $DD, $80 ; Tsubomitto
|
||||
mon_cry SFX_CRY_0E, $50, $FF ; Animon
|
||||
mon_cry SFX_CRY_12, $93, $00 ; Monja
|
||||
mon_cry SFX_CRY_1E, $79, $40 ; Para
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Hinaazu (unfinished)
|
||||
mon_cry SFX_CRY_1F, $40, $01 ; Pudi
|
||||
mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Bellossom (unfinished from this point onward)
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Scizor
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Rhyperior
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Espeon
|
||||
|
|
@ -211,32 +205,7 @@ CryData::
|
|||
mon_cry SFX_CRY_00, $00, $00 ; Leafeon
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Glaceon
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Sylveon
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Crobat
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Politoed
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Slowking
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Steelix
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Hitmontop
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Blissey
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Porygon2
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Kingdra
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Lickilicky
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Magnezone
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Tangrowth
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Electivire
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Magmortar
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; PorygonZ
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Kleavor
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Sirfetchd
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Mr. Rime
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Perrserker
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Cleffa
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Igglybuff
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Smoochum
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Happiny
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Munchlax
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Elekid
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Magby
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Mime Jr
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Pichu
|
||||
;mon_cry SFX_CRY_00, $00, $00 ; Tyrogue
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Tangrowth
|
||||
mon_cry SFX_CRY_00, $00, $00 ; Kleavor
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
|
|
|||
|
|
@ -190,14 +190,8 @@ PokedexEntryPointers:
|
|||
dw BellsproutDexEntry
|
||||
dw WeepinbellDexEntry
|
||||
dw VictreebelDexEntry
|
||||
dw TsubomittoDexEntry
|
||||
dw AnimonDexEntry
|
||||
dw MissingNoDexEntry
|
||||
dw MissingNoDexEntry
|
||||
dw MissingNoDexEntry
|
||||
dw MissingNoDexEntry
|
||||
dw MissingNoDexEntry
|
||||
dw BellossomDexEntry
|
||||
dw MissingNoDexEntry ; Monja
|
||||
dw MissingNoDexEntry ; Pudi
|
||||
dw ScizorDexEntry
|
||||
dw RhyperiorDexEntry
|
||||
dw EspeonDexEntry
|
||||
|
|
@ -205,34 +199,9 @@ PokedexEntryPointers:
|
|||
dw LeafeonDexEntry
|
||||
dw GlaceonDexEntry
|
||||
dw SylveonDexEntry
|
||||
dw CrobatDexEntry
|
||||
dw PolitoedDexEntry
|
||||
dw SlowkingDexEntry
|
||||
dw SteelixDexEntry
|
||||
dw HitmontopDexEntry
|
||||
dw BlisseyDexEntry
|
||||
dw Porygon2DexEntry
|
||||
dw KingdraDexEntry
|
||||
dw LickilickyDexEntry
|
||||
dw MagnezoneDexEntry
|
||||
;dw TangrowthDexEntry
|
||||
;dw ElectivireDexEntry
|
||||
;dw MagmortarDexEntry
|
||||
;dw PorygonZDexEntry
|
||||
;dw KleavorDexEntry
|
||||
; dw SirfetchdDexEntry
|
||||
; dw MrRimeDexEntry
|
||||
; dw PerrserkerDexEntry
|
||||
; dw CleffaDexEntry
|
||||
; dw IgglybuffDexEntry
|
||||
; dw SmoochumDexEntry
|
||||
; dw HappinyDexEntry
|
||||
; dw MunchlaxDexEntry
|
||||
; dw ElekidDexEntry
|
||||
; dw MagbyDexEntry
|
||||
; dw MimeJrDexEntry
|
||||
; dw PichuDexEntry
|
||||
; dw TyrogueDexEntry
|
||||
dw TangrowthDexEntry
|
||||
dw KleavorDexEntry
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
||||
; string: species name
|
||||
|
|
@ -1626,107 +1595,23 @@ SylveonDexEntry:
|
|||
text_far _SylveonDexEntry
|
||||
text_end
|
||||
|
||||
CrobatDexEntry:
|
||||
db "BAT@"
|
||||
db 5,11
|
||||
dw 1650
|
||||
text_far _CrobatDexEntry
|
||||
text_end
|
||||
|
||||
PolitoedDexEntry:
|
||||
db "FROG@"
|
||||
db 3,7
|
||||
dw 750
|
||||
text_far _PolitoedDexEntry
|
||||
text_end
|
||||
|
||||
SlowkingDexEntry:
|
||||
db "ROYAL@"
|
||||
db 6,7
|
||||
dw 1750
|
||||
text_far _SlowkingDexEntry
|
||||
text_end
|
||||
|
||||
SteelixDexEntry:
|
||||
db "IRON SNAKE@"
|
||||
db 30,2
|
||||
dw 8820
|
||||
text_far _SteelixDexEntry
|
||||
text_end
|
||||
|
||||
HitmontopDexEntry:
|
||||
db "HEADSTAND@"
|
||||
db 4,7
|
||||
dw 1060
|
||||
text_far _HitmontopDexEntry
|
||||
text_end
|
||||
|
||||
BlisseyDexEntry:
|
||||
db "HAPPINESS@"
|
||||
db 4,11
|
||||
dw 1030
|
||||
text_far _BlisseyDexEntry
|
||||
text_end
|
||||
|
||||
Porygon2DexEntry:
|
||||
db "VIRTUAL@"
|
||||
db 2,0
|
||||
dw 720
|
||||
text_far _Porygon2DexEntry
|
||||
text_end
|
||||
|
||||
KingdraDexEntry:
|
||||
db "DRAGON@"
|
||||
db 5,11
|
||||
dw 3350
|
||||
text_far _KingdraDexEntry
|
||||
text_end
|
||||
|
||||
LickilickyDexEntry:
|
||||
db "LICKING@"
|
||||
db 5,7
|
||||
dw 3090
|
||||
text_far _LickilickyDexEntry
|
||||
text_end
|
||||
|
||||
MagnezoneDexEntry:
|
||||
db "MAGNETAREA@"
|
||||
db 3,11
|
||||
dw 3970
|
||||
text_far _MagnezoneDexEntry
|
||||
|
||||
TangrowthDexEntry:
|
||||
db "VINE@"
|
||||
db 6,7
|
||||
dw 2840
|
||||
text_far _TangrowthDexEntry
|
||||
text_end
|
||||
|
||||
;TangrowthDexEntry:
|
||||
;db "VINE@"
|
||||
;db 6,7
|
||||
;dw 2840
|
||||
;text_far _TangrowthDexEntry
|
||||
;text_end
|
||||
|
||||
;ElectivireDexEntry:
|
||||
;db "THUNDER@"
|
||||
;db 5,11
|
||||
;dw 3060
|
||||
;text_far _ElectivireDexEntry
|
||||
;text_end
|
||||
|
||||
;MagmortarDexEntry:
|
||||
;db "BLAST@"
|
||||
;db 5,3
|
||||
;dw 1500
|
||||
;text_far _MagmortarDexEntry
|
||||
;text_end
|
||||
|
||||
;PorygonZDexEntry:
|
||||
;db "VIRTUAL@"
|
||||
;db 2,11
|
||||
;dw 750
|
||||
;text_far _PorygonZDexEntry
|
||||
;text_end
|
||||
|
||||
;KleavorDexEntry:
|
||||
;db "AXE@"
|
||||
;db 5,11
|
||||
;dw 1960
|
||||
;text_far _KleavorDexEntry
|
||||
;text_end
|
||||
KleavorDexEntry:
|
||||
db "AXE@"
|
||||
db 5,11
|
||||
dw 1960
|
||||
text_far _KleavorDexEntry
|
||||
text_end
|
||||
|
|
|
|||
|
|
@ -190,14 +190,8 @@ PokedexOrder:
|
|||
db DEX_BELLSPROUT
|
||||
db DEX_WEEPINBELL
|
||||
db DEX_VICTREEBEL
|
||||
db DEX_TSUBOMITTO
|
||||
db DEX_ANIMON
|
||||
db DEX_MONJA
|
||||
db DEX_PARA
|
||||
db DEX_HINAAZU
|
||||
db DEX_PUDI
|
||||
db DEX_BETOBEBII
|
||||
db DEX_BELLOSSOM
|
||||
db DEX_SCIZOR
|
||||
db DEX_RHYPERIOR
|
||||
db DEX_ESPEON
|
||||
|
|
@ -205,32 +199,7 @@ PokedexOrder:
|
|||
db DEX_LEAFEON
|
||||
db DEX_GLACEON
|
||||
db DEX_SYLVEON
|
||||
db DEX_CROBAT
|
||||
db DEX_POLITOED
|
||||
db DEX_SLOWKING
|
||||
db DEX_STEELIX
|
||||
db DEX_HITMONTOP
|
||||
db DEX_BLISSEY
|
||||
db DEX_PORYGON2
|
||||
db DEX_KINGDRA
|
||||
db DEX_LICKILICKY
|
||||
db DEX_MAGNEZONE
|
||||
;db DEX_TANGROWTH
|
||||
;db DEX_ELECTIVIRE
|
||||
;db DEX_MAGMORTAR
|
||||
;db DEX_PORYGONZ
|
||||
;db DEX_KLEAVOR
|
||||
;db DEX_SIRFETCHD
|
||||
;db DEX_MRRIME
|
||||
;db DEX_PERRSERKER
|
||||
;db DEX_CLEFFA
|
||||
;db DEX_IGGLYBUFF
|
||||
;db DEX_SMOOCHUM
|
||||
;db DEX_HAPPINY
|
||||
;db DEX_MUNCHLAX
|
||||
;db DEX_ELEKID
|
||||
;db DEX_MAGBY
|
||||
;db DEX_MIMEJR
|
||||
;db DEX_PICHU
|
||||
;db DEX_TYROGUE
|
||||
db DEX_TANGROWTH
|
||||
db DEX_KLEAVOR
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
|
|
|||
|
|
@ -193,14 +193,8 @@ EvosMovesPointerTable:
|
|||
dw BellsproutEvosMoves
|
||||
dw WeepinbellEvosMoves
|
||||
dw VictreebelEvosMoves
|
||||
dw TsubomittoEvosMoves
|
||||
dw AnimonEvosMoves
|
||||
dw MonjaEvosMoves
|
||||
dw ParaEvosMoves
|
||||
dw HinaazuEvosMoves
|
||||
dw PudiEvosMoves
|
||||
dw BetobebiiEvosMoves
|
||||
dw BellossomEvosMoves
|
||||
dw ScizorEvosMoves
|
||||
dw RhyperiorEvosMoves
|
||||
dw EspeonEvosMoves
|
||||
|
|
@ -208,34 +202,9 @@ EvosMovesPointerTable:
|
|||
dw LeafeonEvosMoves
|
||||
dw GlaceonEvosMoves
|
||||
dw SylveonEvosMoves
|
||||
dw CrobatEvosMoves
|
||||
dw PolitoedEvosMoves
|
||||
dw SlowkingEvosMoves
|
||||
dw SteelixEvosMoves
|
||||
dw HitmontopEvosMoves
|
||||
dw BlisseyEvosMoves
|
||||
dw Porygon2EvosMoves
|
||||
dw KingdraEvosMoves
|
||||
dw LickilickyEvosMoves
|
||||
dw MagnezoneEvosMoves
|
||||
;dw TangrowthEvosMoves
|
||||
;dw ElectivireEvosMoves
|
||||
;dw MagmortarEvosMoves
|
||||
;dw PorygonZEvosMoves
|
||||
;dw KleavorEvosMoves
|
||||
;dw SirfetchdEvosMoves
|
||||
;dw MrRimeEvosMoves
|
||||
;dw PerrserkerEvosMoves
|
||||
;dw CleffaEvosMoves
|
||||
;dw IgglybuffEvosMoves
|
||||
;dw SmoochumEvosMoves
|
||||
;dw HappinyEvosMoves
|
||||
;dw MunchlaxEvosMoves
|
||||
;dw ElekidEvosMoves
|
||||
;dw MagbyEvosMoves
|
||||
;dw MimeJrEvosMoves
|
||||
;dw PichuEvosMoves
|
||||
;dw TyrogueEvosMoves
|
||||
dw TangrowthEvosMoves
|
||||
dw KleavorEvosMoves
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
||||
RhydonEvosMoves:
|
||||
|
|
@ -537,7 +506,7 @@ GastlyEvosMoves:
|
|||
ScytherEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 41, SCIZOR
|
||||
;db EV_ITEM, MOON_STONE, 1, KLEAVOR
|
||||
db EV_ITEM, MOON_STONE, 1, KLEAVOR
|
||||
db 0
|
||||
; Learnset
|
||||
db 17, LEER
|
||||
|
|
@ -591,7 +560,7 @@ PinsirEvosMoves:
|
|||
|
||||
TangelaEvosMoves:
|
||||
; Evolutions
|
||||
;db EV_LEVEL, 34, TANGROWTH
|
||||
db EV_LEVEL, 34, TANGROWTH
|
||||
db 0
|
||||
; Learnset
|
||||
db 24, BIND
|
||||
|
|
@ -635,7 +604,6 @@ GrowlitheEvosMoves:
|
|||
|
||||
OnixEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 30, STEELIX
|
||||
db 0
|
||||
; Learnset
|
||||
db 15, BIND
|
||||
|
|
@ -672,7 +640,6 @@ PidgeyEvosMoves:
|
|||
SlowpokeEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 37, SLOWBRO
|
||||
db EV_ITEM, WATER_STONE, 1, SLOWKING
|
||||
db 0
|
||||
; Learnset
|
||||
db 18, DISABLE
|
||||
|
|
@ -711,7 +678,6 @@ GravelerEvosMoves:
|
|||
|
||||
ChanseyEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 40, BLISSEY
|
||||
db 0
|
||||
; Learnset
|
||||
db 12, DOUBLESLAP
|
||||
|
|
@ -875,7 +841,6 @@ ElectabuzzEvosMoves:
|
|||
|
||||
MagnetonEvosMoves:
|
||||
; Evolutions
|
||||
db EV_ITEM, THUNDER_STONE, 1, MAGNEZONE
|
||||
db 0
|
||||
; Learnset
|
||||
db 21, SONICBOOM
|
||||
|
|
@ -1150,7 +1115,6 @@ ZapdosEvosMoves:
|
|||
|
||||
DittoEvosMoves:
|
||||
; Evolutions
|
||||
db EV_ITEM, MOON_STONE, 1, ANIMON
|
||||
db 0
|
||||
; Learnset
|
||||
db 0
|
||||
|
|
@ -1358,7 +1322,6 @@ HorseaEvosMoves:
|
|||
|
||||
SeadraEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 43, KINGDRA
|
||||
db 0
|
||||
; Learnset
|
||||
db 19, SMOKESCREEN
|
||||
|
|
@ -1568,7 +1531,6 @@ ParasEvosMoves:
|
|||
PoliwhirlEvosMoves:
|
||||
; Evolutions
|
||||
db EV_ITEM, WATER_STONE, 1, POLIWRATH
|
||||
db EV_ITEM, SUN_STONE, 1, POLITOED
|
||||
db 0
|
||||
; Learnset
|
||||
db 16, HYPNOSIS
|
||||
|
|
@ -1791,7 +1753,6 @@ HypnoEvosMoves:
|
|||
|
||||
GolbatEvosMoves:
|
||||
; Evolutions
|
||||
db EV_ITEM, MOON_STONE, 1, CROBAT
|
||||
db 0
|
||||
; Learnset
|
||||
db 10, SUPERSONIC
|
||||
|
|
@ -2247,7 +2208,6 @@ GeodudeEvosMoves:
|
|||
|
||||
PorygonEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 30, PORYGON2
|
||||
db 0
|
||||
; Learnset
|
||||
db 23, PSYBEAM
|
||||
|
|
@ -2426,7 +2386,6 @@ OddishEvosMoves:
|
|||
GloomEvosMoves:
|
||||
; Evolutions
|
||||
db EV_ITEM, LEAF_STONE, 1, VILEPLUME
|
||||
db EV_ITEM, SUN_STONE, 1, BELLOSSOM
|
||||
db 0
|
||||
; Learnset
|
||||
db 15, POISONPOWDER
|
||||
|
|
@ -2463,7 +2422,6 @@ BellsproutEvosMoves:
|
|||
WeepinbellEvosMoves:
|
||||
; Evolutions
|
||||
db EV_ITEM, LEAF_STONE, 1, VICTREEBEL
|
||||
db EV_ITEM, SUN_STONE, 1, TSUBOMITTO
|
||||
db 0
|
||||
; Learnset
|
||||
db 13, WRAP
|
||||
|
|
@ -2484,22 +2442,6 @@ VictreebelEvosMoves:
|
|||
db 18, SLEEP_POWDER
|
||||
db 0
|
||||
|
||||
TsubomittoEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 48, SOLARBEAM
|
||||
db 0
|
||||
|
||||
AnimonEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 30, MIST
|
||||
db 40, LIGHT_SCREEN
|
||||
db 50, REFLECT
|
||||
db 0
|
||||
|
||||
MonjaEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 18, TANGELA
|
||||
|
|
@ -2516,33 +2458,6 @@ MonjaEvosMoves:
|
|||
db 40, NIGHT_SHADE
|
||||
db 0
|
||||
|
||||
ParaEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 12, PARAS
|
||||
db 0
|
||||
; Learnset
|
||||
db 3, STUN_SPORE
|
||||
db 6, LEECH_LIFE
|
||||
db 10, POISONPOWDER
|
||||
db 15, FURY_SWIPES
|
||||
db 21, SPORE
|
||||
db 25, GROWTH
|
||||
db 29, SLASH
|
||||
db 0
|
||||
|
||||
HinaazuEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 18, DODUO
|
||||
db 0
|
||||
; Learnset
|
||||
db 5, QUICK_ATTACK
|
||||
db 11, FURY_ATTACK
|
||||
db 20, DRILL_PECK
|
||||
db 23, RAGE
|
||||
db 27, TRI_ATTACK
|
||||
db 32, AGILITY
|
||||
db 0
|
||||
|
||||
PudiEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 14, GROWLITHE
|
||||
|
|
@ -2555,29 +2470,6 @@ PudiEvosMoves:
|
|||
db 30, FLAMETHROWER
|
||||
db 0
|
||||
|
||||
BetobebiiEvosMoves:
|
||||
; Evolutions
|
||||
db EV_LEVEL, 20, GRIMER
|
||||
db 0
|
||||
; Learnset
|
||||
db 13, POISON_GAS
|
||||
db 16, ACID
|
||||
db 19, MINIMIZE
|
||||
db 22, SLUDGE
|
||||
db 28, HARDEN
|
||||
db 33, SCREECH
|
||||
db 37, ACID_ARMOR
|
||||
db 0
|
||||
|
||||
BellossomEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 15, POISONPOWDER
|
||||
db 17, STUN_SPORE
|
||||
db 19, SLEEP_POWDER
|
||||
db 0
|
||||
|
||||
ScizorEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
|
|
@ -2669,101 +2561,6 @@ SylveonEvosMoves:
|
|||
db 42, TAKE_DOWN
|
||||
db 0
|
||||
|
||||
CrobatEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 7, GUST
|
||||
db 10, SUPERSONIC
|
||||
db 15, BITE
|
||||
db 17, QUICK_ATTACK
|
||||
db 21, CONFUSE_RAY
|
||||
db 26, SLUDGE
|
||||
db 32, WING_ATTACK
|
||||
db 43, HAZE
|
||||
db 50, AGILITY
|
||||
db 0
|
||||
|
||||
PolitoedEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 16, HYPNOSIS
|
||||
db 19, WATER_GUN
|
||||
db 0
|
||||
|
||||
SlowkingEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 18, DISABLE
|
||||
db 22, HEADBUTT
|
||||
db 27, GROWL
|
||||
db 33, WATER_GUN
|
||||
db 44, AMNESIA
|
||||
db 55, PSYCHIC_M
|
||||
db 0
|
||||
|
||||
SteelixEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 8, IRON_DEFENSE
|
||||
db 15, BIND
|
||||
db 19, ROCK_THROW
|
||||
db 25, RAGE
|
||||
db 33, SLAM
|
||||
db 38, IRON_HEAD
|
||||
db 43, HARDEN
|
||||
db 0
|
||||
|
||||
HitmontopEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 7, FOCUS_ENERGY
|
||||
db 33, QUICK_ATTACK
|
||||
db 38, COUNTER
|
||||
db 43, AGILITY
|
||||
db 48, JUMP_KICK
|
||||
db 53, DOUBLE_KICK
|
||||
db 0
|
||||
|
||||
BlisseyEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 12, DOUBLESLAP
|
||||
db 24, SING
|
||||
db 30, GROWL
|
||||
db 38, MINIMIZE
|
||||
db 44, DEFENSE_CURL
|
||||
db 48, LIGHT_SCREEN
|
||||
db 54, DOUBLE_EDGE
|
||||
db 0
|
||||
|
||||
Porygon2EvosMoves:
|
||||
; Evolutions
|
||||
;db EV_LEVEL, 45, PORYGONZ
|
||||
db 0
|
||||
; Learnset
|
||||
db 23, PSYBEAM
|
||||
db 28, RECOVER
|
||||
db 35, AGILITY
|
||||
db 42, TRI_ATTACK
|
||||
db 0
|
||||
|
||||
KingdraEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 19, SMOKESCREEN
|
||||
db 24, LEER
|
||||
db 30, WATER_GUN
|
||||
db 41, AGILITY
|
||||
db 52, HYDRO_PUMP
|
||||
db 0
|
||||
|
||||
LickilickyEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
|
|
@ -2775,18 +2572,6 @@ LickilickyEvosMoves:
|
|||
db 39, SCREECH
|
||||
db 0
|
||||
|
||||
MagnezoneEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 21, SONICBOOM
|
||||
db 25, THUNDERSHOCK
|
||||
db 29, SUPERSONIC
|
||||
db 38, THUNDER_WAVE
|
||||
db 46, SWIFT
|
||||
db 54, SCREECH
|
||||
db 0
|
||||
|
||||
TangrowthEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
|
|
@ -2800,39 +2585,6 @@ TangrowthEvosMoves:
|
|||
db 45, SLAM
|
||||
db 48, GROWTH
|
||||
db 0
|
||||
|
||||
ElectivireEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 34, THUNDERSHOCK
|
||||
db 37, SCREECH
|
||||
db 42, THUNDERPUNCH
|
||||
db 49, LIGHT_SCREEN
|
||||
db 54, THUNDER
|
||||
db 0
|
||||
|
||||
MagmortarEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 36, LEER
|
||||
db 39, CONFUSE_RAY
|
||||
db 43, FIRE_PUNCH
|
||||
db 48, SMOKESCREEN
|
||||
db 52, SMOG
|
||||
db 55, FLAMETHROWER
|
||||
db 0
|
||||
|
||||
PorygonZEvosMoves:
|
||||
; Evolutions
|
||||
db 0
|
||||
; Learnset
|
||||
db 23, PSYBEAM
|
||||
db 28, RECOVER
|
||||
db 35, AGILITY
|
||||
db 42, TRI_ATTACK
|
||||
db 0
|
||||
|
||||
KleavorEvosMoves:
|
||||
; Evolutions
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ MonPartyData:
|
|||
nybble ICON_BIRD ; Fearow
|
||||
nybble ICON_SNAKE ; Ekans
|
||||
nybble ICON_SNAKE ; Arbok
|
||||
;nybble ICON_FAIRY ; Pichu
|
||||
nybble ICON_FAIRY ; Pikachu
|
||||
nybble ICON_FAIRY ; Raichu
|
||||
nybble ICON_FAIRY ; Gorochu
|
||||
|
|
@ -37,24 +36,19 @@ MonPartyData:
|
|||
nybble ICON_MON ; Nidorino
|
||||
nybble ICON_MON ; Nidoking
|
||||
nybble ICON_MON ; Nidoreign
|
||||
;nybble ICON_FAIRY ; Cleffa
|
||||
nybble ICON_FAIRY ; Clefairy
|
||||
nybble ICON_FAIRY ; Clefable
|
||||
nybble ICON_QUADRUPED ; Mikon
|
||||
nybble ICON_QUADRUPED ; Vulpix
|
||||
nybble ICON_QUADRUPED ; Ninetales
|
||||
;nybble ICON_FAIRY ; Igglybuff
|
||||
nybble ICON_FAIRY ; Jigglypuff
|
||||
nybble ICON_FAIRY ; Wigglytuff
|
||||
nybble ICON_MON ; Bittybat
|
||||
nybble ICON_MON ; Zubat
|
||||
nybble ICON_MON ; Golbat
|
||||
nybble ICON_MON ; Crobat
|
||||
nybble ICON_GRASS ; Oddish
|
||||
nybble ICON_GRASS ; Gloom
|
||||
nybble ICON_GRASS ; Vileplume
|
||||
nybble ICON_GRASS ; Bellossom
|
||||
nybble ICON_BUG ; Para
|
||||
nybble ICON_BUG ; Paras
|
||||
nybble ICON_BUG ; Parasect
|
||||
nybble ICON_BUG ; Venonat
|
||||
|
|
@ -79,7 +73,6 @@ MonPartyData:
|
|||
nybble ICON_MON ; Poliwag
|
||||
nybble ICON_MON ; Poliwhirl
|
||||
nybble ICON_MON ; Poliwrath
|
||||
nybble ICON_MON ; Politoed
|
||||
nybble ICON_MON ; Abra
|
||||
nybble ICON_MON ; Kadabra
|
||||
nybble ICON_MON ; Alakazam
|
||||
|
|
@ -89,7 +82,6 @@ MonPartyData:
|
|||
nybble ICON_GRASS ; Bellsprout
|
||||
nybble ICON_GRASS ; Weepinbell
|
||||
nybble ICON_GRASS ; Victreebel
|
||||
nybble ICON_GRASS ; Tsubomitto
|
||||
nybble ICON_WATER ; Tentacool
|
||||
nybble ICON_WATER ; Tentacruel
|
||||
nybble ICON_MON ; Geodude
|
||||
|
|
@ -102,22 +94,18 @@ MonPartyData:
|
|||
nybble ICON_QUADRUPED ; Rapidash
|
||||
nybble ICON_QUADRUPED ; Slowpoke
|
||||
nybble ICON_MON ; Slowbro
|
||||
nybble ICON_MON ; Slowking
|
||||
nybble ICON_BALL ; Magnemite
|
||||
nybble ICON_BALL ; Magnetite
|
||||
nybble ICON_BALL ; Magneton
|
||||
nybble ICON_BALL ; Magnezone
|
||||
nybble ICON_BALL ; Barunda
|
||||
nybble ICON_BIRD ; Farfetch'd
|
||||
nybble ICON_BIRD ; Madaamu
|
||||
nybble ICON_WATER ; Blastyke
|
||||
nybble ICON_WATER ; Blastoise
|
||||
nybble ICON_BIRD ; Hinaazu
|
||||
nybble ICON_BIRD ; Doduo
|
||||
nybble ICON_BIRD ; Dodrio
|
||||
nybble ICON_WATER ; Seel
|
||||
nybble ICON_WATER ; Dewgong
|
||||
nybble ICON_MON ; Betobebii
|
||||
nybble ICON_MON ; Grimer
|
||||
nybble ICON_MON ; Muk
|
||||
nybble ICON_HELIX ; Shellder
|
||||
|
|
@ -126,7 +114,6 @@ MonPartyData:
|
|||
nybble ICON_MON ; Haunter
|
||||
nybble ICON_MON ; Gengar
|
||||
nybble ICON_SNAKE ; Onix
|
||||
nybble ICON_SNAKE ; Steelix
|
||||
nybble ICON_MON ; Drowzee
|
||||
nybble ICON_MON ; Hypno
|
||||
nybble ICON_QUADRUPED ; Kotora
|
||||
|
|
@ -145,10 +132,8 @@ MonPartyData:
|
|||
nybble ICON_MON ; Marowak
|
||||
nybble ICON_MON ; Guardia
|
||||
nybble ICON_MON ; Kangaskhan
|
||||
;nybble ICON_FAIRY ; Tyrogue
|
||||
nybble ICON_MON ; Hitmonlee
|
||||
nybble ICON_MON ; Hitmonchan
|
||||
nybble ICON_MON ; Hitmontop
|
||||
nybble ICON_MON ; Lickitung
|
||||
nybble ICON_MON ; Lickilicky
|
||||
nybble ICON_MON ; Koffing
|
||||
|
|
@ -156,18 +141,15 @@ MonPartyData:
|
|||
nybble ICON_QUADRUPED ; Rhyhorn
|
||||
nybble ICON_MON ; Rhydon
|
||||
nybble ICON_MON ; Rhyperior
|
||||
;nybble ICON_FAIRY ; Happiny
|
||||
nybble ICON_FAIRY ; Chansey
|
||||
nybble ICON_FAIRY ; Blissey
|
||||
nybble ICON_GRASS ; Monja
|
||||
nybble ICON_GRASS ; Tangela
|
||||
;nybble ICON_GRASS ; Tangrowth
|
||||
nybble ICON_GRASS ; Tangrowth
|
||||
nybble ICON_MON ; Decilla
|
||||
nybble ICON_MON ; Gyaoon
|
||||
nybble ICON_MON ; Omega
|
||||
nybble ICON_WATER ; Horsea
|
||||
nybble ICON_WATER ; Seadra
|
||||
nybble ICON_WATER ; Kingdra
|
||||
nybble ICON_WATER ; Gyopin
|
||||
nybble ICON_WATER ; Goldeen
|
||||
nybble ICON_WATER ; Seaking
|
||||
|
|
@ -177,29 +159,22 @@ MonPartyData:
|
|||
nybble ICON_HELIX ; Staryu
|
||||
nybble ICON_HELIX ; Starmie
|
||||
nybble ICON_WATER ; Jagg
|
||||
;nybble ICON_FAIRY ; Mime Jr.
|
||||
nybble ICON_MON ; Mr.Mime
|
||||
nybble ICON_BUG ; Scyther
|
||||
nybble ICON_BUG ; Scizor
|
||||
;nybble ICON_BUG ; Kleavor
|
||||
nybble ICON_BUG ; Kleavor
|
||||
nybble ICON_BUG ; Pinsir
|
||||
nybble ICON_BUG ; Purakkusu
|
||||
;nybble ICON_FAIRY ; Smoochum
|
||||
nybble ICON_MON ; Jynx
|
||||
nybble ICON_MON ; Buu
|
||||
;nybble ICON_FAIRY ; Elekid
|
||||
nybble ICON_MON ; Electabuzz
|
||||
;nybble ICON_MON ; Electivire
|
||||
;nybble ICON_FAIRY ; Magby
|
||||
nybble ICON_MON ; Magmar
|
||||
;nybble ICON_MON ; Magmortar
|
||||
nybble ICON_MON ; Trampel
|
||||
nybble ICON_QUADRUPED ; Tauros
|
||||
nybble ICON_WATER ; Magikarp
|
||||
nybble ICON_SNAKE ; Gyarados
|
||||
nybble ICON_WATER ; Lapras
|
||||
nybble ICON_MON ; Ditto
|
||||
nybble ICON_MON ; Animon
|
||||
nybble ICON_QUADRUPED ; Eevee
|
||||
nybble ICON_QUADRUPED ; Vaporeon
|
||||
nybble ICON_QUADRUPED ; Jolteon
|
||||
|
|
@ -210,17 +185,12 @@ MonPartyData:
|
|||
nybble ICON_QUADRUPED ; Glaceon
|
||||
nybble ICON_QUADRUPED ; Sylveon
|
||||
nybble ICON_MON ; Porygon
|
||||
nybble ICON_MON ; Porygon2
|
||||
;nybble ICON_MON ; PorygonZ
|
||||
nybble ICON_HELIX ; Omanyte
|
||||
nybble ICON_HELIX ; Omastar
|
||||
nybble ICON_HELIX ; Kabuto
|
||||
nybble ICON_HELIX ; Kabutops
|
||||
nybble ICON_BIRD ; Aerodactyl
|
||||
;nybble ICON_FAIRY ; Munchlax
|
||||
nybble ICON_MON ; Snorlax
|
||||
;nybble ICON_MON ; Perrserker
|
||||
;nybble ICON_BIRD ; Mr. Rime
|
||||
nybble ICON_BIRD ; Articuno
|
||||
nybble ICON_BIRD ; Zapdos
|
||||
nybble ICON_BIRD ; Moltres
|
||||
|
|
|
|||
|
|
@ -190,14 +190,8 @@ MonsterNames::
|
|||
db "BELLSPROUT"
|
||||
db "WEEPINBELL"
|
||||
db "VICTREEBEL"
|
||||
db "TSUBOMITTO"
|
||||
db "ANIMON@@@@"
|
||||
db "MONJA@@@@@"
|
||||
db "PARA@@@@@@"
|
||||
db "HINAAZU@@@"
|
||||
db "PUDI@@@@@@"
|
||||
db "BETOBEBII@"
|
||||
db "BELLOSSOM@"
|
||||
db "SCIZOR@@@@"
|
||||
db "RHYPERIOR@"
|
||||
db "ESPEON@@@@"
|
||||
|
|
@ -205,33 +199,8 @@ MonsterNames::
|
|||
db "LEAFEON@@@"
|
||||
db "GLACEON@@@"
|
||||
db "SYLVEON@@@"
|
||||
db "CROBAT@@@@"
|
||||
db "POLITOED@@"
|
||||
db "SLOWKING@@"
|
||||
db "STEELIX@@@"
|
||||
db "HITMONTOP@"
|
||||
db "BLISSEY@@@"
|
||||
db "PORYGON2@@"
|
||||
db "KINGDRA@@@"
|
||||
db "LICKILICKY"
|
||||
db "MAGNEZONE@"
|
||||
;db "TANGROWTH@"
|
||||
;db "ELECTIVIRE"
|
||||
;db "MAGMORTAR@"
|
||||
;db "PORYGONZ@@"
|
||||
;db "KLEAVOR@@@"
|
||||
;db "SIRFETCH'D"
|
||||
;db "MR.RIME@@@"
|
||||
;db "PERRSERKER"
|
||||
;db "CLEFFA@@@@"
|
||||
;db "IGGLYBUFF@"
|
||||
;db "SMOOCHUM@@"
|
||||
;db "HAPPINY@@@"
|
||||
;db "MUNCHLAX@@"
|
||||
;db "ELEKID@@@@"
|
||||
;db "MAGBY@@@@@"
|
||||
;db "MIME JR@@@"
|
||||
;db "PICHU@@@@@"
|
||||
;db "TYROGUE@@@"
|
||||
db "TANGROWTH@"
|
||||
db "KLEAVOR@@@"
|
||||
|
||||
assert_table_length NUM_POKEMON_INDEXES
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ MonsterPalettes:
|
|||
db PAL_BROWNMON ; FEAROW
|
||||
db PAL_PURPLEMON ; EKANS
|
||||
db PAL_PURPLEMON ; ARBOK
|
||||
; db PAL_YELLOWMON ; PICHU
|
||||
db PAL_YELLOWMON ; PIKACHU
|
||||
db PAL_YELLOWMON ; RAICHU
|
||||
db PAL_YELLOWMON ; GOROCHU
|
||||
|
|
@ -38,24 +37,19 @@ MonsterPalettes:
|
|||
db PAL_PURPLEMON ; NIDORINO
|
||||
db PAL_PURPLEMON ; NIDOKING
|
||||
db PAL_GREYMON ; NIDOREIGN
|
||||
; db PAL_PINKMON ; CLEFFA
|
||||
db PAL_PINKMON ; CLEFAIRY
|
||||
db PAL_PINKMON ; CLEFABLE
|
||||
db PAL_REDMON ; MIKON
|
||||
db PAL_REDMON ; VULPIX
|
||||
db PAL_YELLOWMON ; NINETALES
|
||||
; db PAL_PINKMON ; IGGLYBUFF
|
||||
db PAL_PINKMON ; JIGGLYPUFF
|
||||
db PAL_PINKMON ; WIGGLYTUFF
|
||||
db PAL_BLUEMON ; BITTYBAT
|
||||
db PAL_BLUEMON ; ZUBAT
|
||||
db PAL_BLUEMON ; GOLBAT
|
||||
db PAL_PURPLEMON ; CROBAT
|
||||
db PAL_GREENMON ; ODDISH
|
||||
db PAL_REDMON ; GLOOM
|
||||
db PAL_REDMON ; VILEPLUME
|
||||
db PAL_PURPLEMON ; BELLOSSOM
|
||||
db PAL_REDMON ; PARA
|
||||
db PAL_REDMON ; PARAS
|
||||
db PAL_REDMON ; PARASECT
|
||||
db PAL_PURPLEMON ; VENONAT
|
||||
|
|
@ -69,7 +63,6 @@ MonsterPalettes:
|
|||
db PAL_YELLOWMON ; KONYA
|
||||
db PAL_YELLOWMON ; MEOWTH
|
||||
db PAL_YELLOWMON ; PERSIAN
|
||||
;db PAL_GREYMON ; PERRSERKER
|
||||
db PAL_YELLOWMON ; PSYDUCK
|
||||
db PAL_GREENMON ; WEIRDUCK
|
||||
db PAL_CYANMON ; GOLDUCK
|
||||
|
|
@ -81,7 +74,6 @@ MonsterPalettes:
|
|||
db PAL_BLUEMON ; POLIWAG
|
||||
db PAL_BLUEMON ; POLIWHIRL
|
||||
db PAL_BLUEMON ; POLIWRATH
|
||||
db PAL_GREENMON ; POLITOED
|
||||
db PAL_YELLOWMON ; ABRA
|
||||
db PAL_YELLOWMON ; KADABRA
|
||||
db PAL_YELLOWMON ; ALAKAZAM
|
||||
|
|
@ -91,7 +83,6 @@ MonsterPalettes:
|
|||
db PAL_GREENMON ; BELLSPROUT
|
||||
db PAL_GREENMON ; WEEPINBELL
|
||||
db PAL_GREENMON ; VICTREEBEL
|
||||
db PAL_GREENMON ; TSUBOMITTO
|
||||
db PAL_CYANMON ; TENTACOOL
|
||||
db PAL_CYANMON ; TENTACRUEL
|
||||
db PAL_GREYMON ; GEODUDE
|
||||
|
|
@ -104,23 +95,18 @@ MonsterPalettes:
|
|||
db PAL_REDMON ; RAPIDASH
|
||||
db PAL_PINKMON ; SLOWPOKE
|
||||
db PAL_PINKMON ; SLOWBRO
|
||||
db PAL_PINKMON ; SLOWKING
|
||||
db PAL_GREYMON ; MAGNEMITE
|
||||
db PAL_GREYMON ; MAGNETITE
|
||||
db PAL_GREYMON ; MAGNETON
|
||||
db PAL_GREYMON ; MAGNEZONE
|
||||
db PAL_PINKMON ; BARUNDA
|
||||
db PAL_BROWNMON ; FARFETCHD
|
||||
db PAL_BROWNMON ; MADAAMU
|
||||
;db PAL_GREENMON ; SIRFETCHD
|
||||
db PAL_CYANMON ; BLASTYKE
|
||||
db PAL_CYANMON ; BLASTOISE
|
||||
db PAL_BROWNMON ; HINAAZU
|
||||
db PAL_BROWNMON ; DODUO
|
||||
db PAL_BROWNMON ; DODRIO
|
||||
db PAL_BLUEMON ; SEEL
|
||||
db PAL_BLUEMON ; DEWGONG
|
||||
db PAL_PURPLEMON ; BETOBEBII
|
||||
db PAL_PURPLEMON ; GRIMER
|
||||
db PAL_PURPLEMON ; MUK
|
||||
db PAL_PURPLEMON ; SHELLDER
|
||||
|
|
@ -129,7 +115,6 @@ MonsterPalettes:
|
|||
db PAL_PURPLEMON ; HAUNTER
|
||||
db PAL_PURPLEMON ; GENGAR
|
||||
db PAL_GREYMON ; ONIX
|
||||
db PAL_GREYMON ; STEELIX
|
||||
db PAL_YELLOWMON ; DROWZEE
|
||||
db PAL_YELLOWMON ; HYPNO
|
||||
db PAL_YELLOWMON ; KOTORA
|
||||
|
|
@ -148,10 +133,8 @@ MonsterPalettes:
|
|||
db PAL_BROWNMON ; MAROWAK
|
||||
db PAL_BROWNMON ; GUARDIA
|
||||
db PAL_BROWNMON ; KANGASKHAN
|
||||
;db PAL_BROWNMON ; TYROGUE
|
||||
db PAL_BROWNMON ; HITMONLEE
|
||||
db PAL_BROWNMON ; HITMONCHAN
|
||||
db PAL_BROWNMON ; HITMONTOP
|
||||
db PAL_PINKMON ; LICKITUNG
|
||||
db PAL_PINKMON ; LICKILICKY
|
||||
db PAL_PURPLEMON ; KOFFING
|
||||
|
|
@ -159,18 +142,15 @@ MonsterPalettes:
|
|||
db PAL_GREYMON ; RHYHORN
|
||||
db PAL_GREYMON ; RHYDON
|
||||
db PAL_BROWNMON ; RHYPERIOR
|
||||
;db PAL_PINKMON ; HAPPINY
|
||||
db PAL_PINKMON ; CHANSEY
|
||||
db PAL_PINKMON ; BLISSEY
|
||||
db PAL_BLUEMON ; MONJA
|
||||
db PAL_BLUEMON ; TANGELA
|
||||
;db PAL_BLUEMON ; TANGROWTH
|
||||
db PAL_BLUEMON ; TANGROWTH
|
||||
db PAL_GREENMON ; DECILLA
|
||||
db PAL_GREENMON ; GYAOON
|
||||
db PAL_GREYMON ; OMEGA
|
||||
db PAL_CYANMON ; HORSEA
|
||||
db PAL_CYANMON ; SEADRA
|
||||
db PAL_CYANMON ; KINGDRA
|
||||
db PAL_REDMON ; GYOPIN
|
||||
db PAL_REDMON ; GOLDEEN
|
||||
db PAL_REDMON ; SEAKING
|
||||
|
|
@ -180,30 +160,22 @@ MonsterPalettes:
|
|||
db PAL_REDMON ; STARYU
|
||||
db PAL_PURPLEMON ; STARMIE
|
||||
db PAL_BLUEMON ; JAGG
|
||||
;db PAL_PINKMON ; MIME JR
|
||||
db PAL_PINKMON ; MR_MIME
|
||||
;db PAL_BLUEMON ; MR_RIME
|
||||
db PAL_GREENMON ; SCYTHER
|
||||
db PAL_GREENMON ; SCIZOR
|
||||
;db PAL_BROWNMON ; KLEAVOR
|
||||
db PAL_BROWNMON ; KLEAVOR
|
||||
db PAL_BROWNMON ; PINSIR
|
||||
db PAL_BROWNMON ; PURAKKUSU
|
||||
;db PAL_MEWMON ; SMOOCHUM
|
||||
db PAL_REDBAR ; JYNX
|
||||
db PAL_BLUEMON ; BUU
|
||||
;db PAL_YELLOWMON ; ELEKID
|
||||
db PAL_YELLOWMON ; ELECTABUZZ
|
||||
;db PAL_YELLOWMON ; ELECTIVIRE
|
||||
;db PAL_REDMON ; MAGBY
|
||||
db PAL_REDMON ; MAGMAR
|
||||
;db PAL_REDMON ; MAGMORTAR
|
||||
db PAL_GREYMON ; TRAMPEL
|
||||
db PAL_BROWNMON ; TAUROS
|
||||
db PAL_REDMON ; MAGIKARP
|
||||
db PAL_BLUEMON ; GYARADOS
|
||||
db PAL_CYANMON ; LAPRAS
|
||||
db PAL_PURPLEMON ; DITTO
|
||||
db PAL_PURPLEMON ; ANIMON
|
||||
db PAL_BROWNMON ; EEVEE
|
||||
db PAL_CYANMON ; VAPOREON
|
||||
db PAL_YELLOWMON ; JOLTEON
|
||||
|
|
@ -214,14 +186,11 @@ MonsterPalettes:
|
|||
db PAL_CYANMON ; GLACEON
|
||||
db PAL_MEWMON ; SYLVEON
|
||||
db PAL_MEWMON ; PORYGON
|
||||
db PAL_MEWMON ; PORYGON2
|
||||
;db PAL_MEWMON ; PORYGONZ
|
||||
db PAL_BLUEMON ; OMANYTE
|
||||
db PAL_BLUEMON ; OMASTAR
|
||||
db PAL_BROWNMON ; KABUTO
|
||||
db PAL_BROWNMON ; KABUTOPS
|
||||
db PAL_GREYMON ; AERODACTYL
|
||||
;db PAL_MEWMON ; MUNCHLAX
|
||||
db PAL_MEWMON ; SNORLAX
|
||||
db PAL_BLUEMON ; ARTICUNO
|
||||
db PAL_YELLOWMON ; ZAPDOS
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ IF DEF(_RED)
|
|||
db PUDI
|
||||
db MAGNETITE
|
||||
db MONJA
|
||||
db ANIMON
|
||||
db SYLVEON
|
||||
db SCIZOR
|
||||
db BELLOSSOM
|
||||
db SKIMPER
|
||||
db BUU
|
||||
ENDC
|
||||
IF DEF(_BLUE)
|
||||
|
|
@ -33,6 +33,6 @@ IF DEF(_BLUE)
|
|||
db BLOTTLE
|
||||
db MADAAMU
|
||||
db PURAKKUSU
|
||||
db TSUBOMITTO
|
||||
db KLEAVOR
|
||||
db GUARDIA
|
||||
ENDC
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ MtMoon1FWildMons:
|
|||
db 9, BITTYBAT
|
||||
db 8, GEODUDE
|
||||
db 6, BITTYBAT
|
||||
db 10, BETOBEBII
|
||||
db 10, SANDSHREW
|
||||
db 10, GEODUDE
|
||||
db 8, PARA
|
||||
db 8, PARAS
|
||||
db 11, BITTYBAT
|
||||
db 8, CLEFAIRY
|
||||
end_grass_wildmons
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ MtMoonB1FWildMons:
|
|||
db 7, GEODUDE
|
||||
db 8, GEODUDE
|
||||
db 9, GEODUDE
|
||||
db 10, PARA
|
||||
db 10, PARAS
|
||||
db 10, BITTYBAT
|
||||
db 11, BETOBEBII
|
||||
db 11, SANDSHREW
|
||||
db 9, CLEFAIRY
|
||||
db 9, BETOBEBII
|
||||
db 9, SANDSHREW
|
||||
end_grass_wildmons
|
||||
|
||||
def_water_wildmons 0 ; encounter rate
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@ MtMoonB2FWildMons:
|
|||
db 10, BITTYBAT
|
||||
db 10, GEODUDE
|
||||
db 11, BITTYBAT
|
||||
db 10, PARA
|
||||
db 12, PARA
|
||||
db 10, PARAS
|
||||
db 12, PARAS
|
||||
db 10, CLEFAIRY
|
||||
db 12, BETOBEBII
|
||||
db 12, SANDSHREW
|
||||
db 12, ZUBAT
|
||||
end_grass_wildmons
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ IF DEF(_RED)
|
|||
db 11, EKANS
|
||||
db 13, SPEAROW
|
||||
db 15, EKANS
|
||||
db 17, BETOBEBII
|
||||
db 17, CACTUS
|
||||
db 20, FEAROW
|
||||
db 13, SANDSHREW
|
||||
db 17, SANDSHREW
|
||||
|
|
@ -16,7 +16,7 @@ IF DEF(_BLUE)
|
|||
db 11, SANDSHREW
|
||||
db 13, SPEAROW
|
||||
db 15, SANDSHREW
|
||||
db 17, BETOBEBII
|
||||
db 17, CACTUS
|
||||
db 20, FEAROW
|
||||
db 13, EKANS
|
||||
db 17, EKANS
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ Route2WildMons:
|
|||
db 5, PIDGEY
|
||||
db 4, PIDGEY
|
||||
db 4, RATTATA
|
||||
db 5, PARA
|
||||
db 5, MONJA
|
||||
IF DEF(_RED)
|
||||
db 4, WEEDLE
|
||||
db 3, RATTATA
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ ENDC
|
|||
IF DEF(_BLUE)
|
||||
db 41, SANDSLASH
|
||||
ENDC
|
||||
db 43, ANIMON
|
||||
db 40, TANGELA
|
||||
db 38, FEAROW
|
||||
db 38, RHYHORN
|
||||
db 38, EXEGGCUTE
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Route4WildMons:
|
||||
def_grass_wildmons 20 ; encounter rate
|
||||
db 10, RATTATA
|
||||
db 10, HINAAZU
|
||||
db 10, PIDGEY
|
||||
db 8, KONYA
|
||||
IF DEF(_RED)
|
||||
db 6, EKANS
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Route5WildMons:
|
|||
IF DEF(_RED)
|
||||
db 13, ODDISH
|
||||
db 13, KOTORA
|
||||
db 15, BETOBEBII
|
||||
db 15, MONJA
|
||||
db 10, MANKEY
|
||||
db 12, MANKEY
|
||||
db 15, BELLSPROUT
|
||||
|
|
@ -15,7 +15,7 @@ ENDC
|
|||
IF DEF(_BLUE)
|
||||
db 13, BELLSPROUT
|
||||
db 13, KOTORA
|
||||
db 15, BETOBEBII
|
||||
db 15, MONJA
|
||||
db 10, MEOWTH
|
||||
db 12, MEOWTH
|
||||
db 15, ODDISH
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ IF DEF(_RED)
|
|||
db 12, MANKEY
|
||||
db 15, BELLSPROUT
|
||||
db 16, BELLSPROUT
|
||||
db 16, HINAAZU
|
||||
db 16, PSYDUCK
|
||||
db 14, MEOWTH
|
||||
db 16, MEOWTH
|
||||
ENDC
|
||||
|
|
@ -20,7 +20,7 @@ IF DEF(_BLUE)
|
|||
db 12, MEOWTH
|
||||
db 15, ODDISH
|
||||
db 16, ODDISH
|
||||
db 16, HINAAZU
|
||||
db 16, PSYDUCK
|
||||
db 14, MANKEY
|
||||
db 16, MANKEY
|
||||
ENDC
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ IF DEF(_RED)
|
|||
db 19, ODDISH
|
||||
db 17, MANKEY
|
||||
db 22, BELLSPROUT
|
||||
db 19, HINAAZU
|
||||
db 19, EEVEE
|
||||
db 18, MEOWTH
|
||||
db 18, GROWLITHE
|
||||
db 20, GROWLITHE
|
||||
|
|
@ -16,7 +16,7 @@ IF DEF(_BLUE)
|
|||
db 19, BELLSPROUT
|
||||
db 17, MEOWTH
|
||||
db 22, ODDISH
|
||||
db 19, HINAAZU
|
||||
db 19, EEVEE
|
||||
db 18, MANKEY
|
||||
db 18, VULPIX
|
||||
db 20, VULPIX
|
||||
|
|
|
|||
|
|
@ -292,4 +292,4 @@ QuadrupedIconFrame1: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_1
|
|||
SnakeIconFrame2: INCBIN "gfx/icons/snake.2bpp", INC_FRAME_2
|
||||
QuadrupedIconFrame2: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_2
|
||||
|
||||
TradeBubbleIconGFX: INCBIN "gfx/trade/bubble.2bpp"
|
||||
TradeBubbleIconGFX: INCBIN "gfx/trade/bubble.2bpp"
|
||||
|
|
@ -34,6 +34,7 @@ AskName:
|
|||
and a
|
||||
jr nz, .inBattle
|
||||
call ReloadMapSpriteTilePatterns
|
||||
call ReloadMapData
|
||||
.inBattle
|
||||
call LoadScreenTilesFromBuffer1
|
||||
pop hl
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ DrawPartyMenu_::
|
|||
ldh [hAutoBGTransferEnabled], a
|
||||
call ClearScreen
|
||||
call UpdateSprites
|
||||
|
||||
RedrawPartyMenu__:
|
||||
farcall LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics
|
||||
|
||||
RedrawPartyMenu_::
|
||||
|
|
|
|||
|
|
@ -669,7 +669,7 @@ SwitchPartyMon::
|
|||
call SwitchPartyMon_ClearGfx
|
||||
ld a, [wCurrentMenuItem]
|
||||
call SwitchPartyMon_ClearGfx
|
||||
jp RedrawPartyMenu_
|
||||
jp RedrawPartyMenu__
|
||||
|
||||
SwitchPartyMon_ClearGfx:
|
||||
push af
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ WRAM0
|
|||
"Party Data"
|
||||
"Main Data"
|
||||
"Current Box Data"
|
||||
org $df04
|
||||
org $df02
|
||||
"Stack"
|
||||
VRAM
|
||||
"VRAM"
|
||||
|
|
|
|||
Loading…
Reference in a new issue